From 0520f30975a547409a374697bb00dd737862e96e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Fri, 11 Nov 2022 16:10:35 +0100
Subject: [PATCH 0001/1114] Misc cleanups in error validators

---
 org.lflang/src/org/lflang/ErrorReporter.java  | 16 +++-
 .../HumanReadableReportingStrategy.java       | 12 +--
 .../LanguageServerErrorReporter.java          | 38 ++++-----
 .../src/org/lflang/generator/Validator.java   | 10 +--
 .../src/org/lflang/generator/c/CCompiler.java | 18 ++---
 .../src/org/lflang/generator/c/CUtil.java     |  4 +-
 .../generator/cpp/CppStandaloneGenerator.kt   |  4 +-
 .../generator/python/PythonValidator.java     | 68 +++++++++-------
 .../lflang/generator/rust/RustGenerator.kt    |  2 +-
 .../org/lflang/generator/rust/RustModel.kt    | 50 +++++++++++-
 .../lflang/generator/rust/RustValidator.kt    | 79 +++++++++++--------
 .../org/lflang/generator/ts/TSGenerator.kt    |  4 +-
 .../org/lflang/generator/ts/TSValidator.kt    | 61 +++++++-------
 org.lflang/src/org/lflang/util/LFCommand.java |  4 +-
 14 files changed, 225 insertions(+), 145 deletions(-)

diff --git a/org.lflang/src/org/lflang/ErrorReporter.java b/org.lflang/src/org/lflang/ErrorReporter.java
index 3d9273adf6..3590e7f945 100644
--- a/org.lflang/src/org/lflang/ErrorReporter.java
+++ b/org.lflang/src/org/lflang/ErrorReporter.java
@@ -6,6 +6,7 @@
 import org.eclipse.lsp4j.DiagnosticSeverity;
 
 import org.lflang.generator.Position;
+import org.lflang.generator.Range;
 
 /**
  * Interface for reporting errors.
@@ -161,7 +162,20 @@ default String report(Path file, DiagnosticSeverity severity, String message, in
      * @return a string that describes the diagnostic
      */
     default String report(Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
-        return report(file, severity, message, startPos.getOneBasedLine());
+        return report(file, severity, message, new Range(startPos, endPos));
+    }
+
+    /**
+     * Report a message of severity {@code severity} that
+     * pertains to the given range of an LF source file.
+     * @param file The file to which the message pertains, or {@code null} if the file is unknown.
+     * @param severity the severity of the message
+     * @param message the message to send to the IDE
+     * @param range range of code in the file
+     * @return a string that describes the diagnostic
+     */
+    default String report(Path file, DiagnosticSeverity severity, String message, Range range) {
+        return report(file, severity, message, range.getStartInclusive().getOneBasedLine());
     }
 
     /**
diff --git a/org.lflang/src/org/lflang/generator/HumanReadableReportingStrategy.java b/org.lflang/src/org/lflang/generator/HumanReadableReportingStrategy.java
index 95617d6e8b..4c72374148 100644
--- a/org.lflang/src/org/lflang/generator/HumanReadableReportingStrategy.java
+++ b/org.lflang/src/org/lflang/generator/HumanReadableReportingStrategy.java
@@ -4,12 +4,12 @@
 import java.nio.file.Paths;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure0;
-import org.eclipse.xtext.xbase.lib.Procedures.Procedure2;
 
 import org.lflang.ErrorReporter;
 
@@ -117,7 +117,7 @@ private void reportErrorLine(String line, Iterator<String> it, ErrorReporter err
                 Position lfFilePosition = map.adjusted(srcFile, generatedFilePosition);
                 if (matcher.group("column") != null) {
                     reportAppropriateRange(
-                        (p0, p1) -> errorReporter.report(srcFile, severity, message, p0, p1), lfFilePosition, it
+                        range -> errorReporter.report(srcFile, severity, message, range), lfFilePosition, it
                     );
                 } else {
                     errorReporter.report(srcFile, severity, message, lfFilePosition.getOneBasedLine());
@@ -138,9 +138,9 @@ private void reportErrorLine(String line, Iterator<String> it, ErrorReporter err
      *           following a diagnostic message.
      */
     private void reportAppropriateRange(
-        Procedure2<Position, Position> report, Position lfFilePosition, Iterator<String> it
+        Consumer<Range> report, Position lfFilePosition, Iterator<String> it
     ) {
-        Procedure0 failGracefully = () -> report.apply(lfFilePosition, lfFilePosition.plus(" "));
+        Procedure0 failGracefully = () -> report.accept(new Range(lfFilePosition, lfFilePosition.plus(" ")));
         if (!it.hasNext()) {
             failGracefully.apply();
             return;
@@ -148,13 +148,13 @@ private void reportAppropriateRange(
         String line = it.next();
         Matcher labelMatcher = labelPattern.matcher(line);
         if (labelMatcher.find()) {
-            report.apply(
+            report.accept(new Range(
                 Position.fromZeroBased(
                     lfFilePosition.getZeroBasedLine(),
                     lfFilePosition.getZeroBasedColumn() - labelMatcher.group(1).length()
                 ),
                 lfFilePosition.plus(labelMatcher.group(2))
-            );
+            ));
             return;
         }
         if (diagnosticMessagePattern.matcher(line).find()) {
diff --git a/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java b/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java
index 945a55ce9e..1302491c30 100644
--- a/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java
+++ b/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java
@@ -12,9 +12,8 @@
 import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.lsp4j.PublishDiagnosticsParams;
-import org.eclipse.lsp4j.Range;
-import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.lsp4j.services.LanguageClient;
+import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 
 import org.lflang.ErrorReporter;
 
@@ -117,23 +116,28 @@ public String report(Path file, DiagnosticSeverity severity, String message, int
             file,
             severity,
             message,
-            Position.fromOneBased(line, 1),
-            Position.fromOneBased(line, 1 + (text.isEmpty() ? 0 : text.get().length()))
+            new Range(
+                Position.fromOneBased(line, 1),
+                Position.fromOneBased(line, 1 + (text.isEmpty() ? 0 : text.get().length()))
+            )
         );
     }
 
     @Override
-    public String report(Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
-        if (file == null) file = getMainFile();
-        diagnostics.putIfAbsent(file, new ArrayList<>());
-        diagnostics.get(file).add(new Diagnostic(
-            toRange(startPos, endPos), message, severity, "LF Language Server"
-        ));
+    public String report(Path file, DiagnosticSeverity severity, String message, Range range) {
+        if (file == null) {
+            file = getMainFile();
+        }
+        diagnostics.computeIfAbsent(file, k -> new ArrayList<>())
+            .add(new Diagnostic(
+                toEclipseRange(range), message, severity, "LF Language Server"
+            ));
         return "" + severity + ": " + message;
     }
 
     /**
      * Save a reference to the language client.
+     *
      * @param client the language client
      */
     public static void setClient(LanguageClient client) {
@@ -187,15 +191,13 @@ private Optional<String> getLine(int line) {
     }
 
     /**
-     * Return the Range that starts at {@code p0} and ends
-     * at {@code p1}.
-     * @param p0 an arbitrary Position
-     * @param p1 a Position that is greater than {@code p0}
-     * @return the Range that starts at {@code p0} and ends
-     * at {@code p1}
+     * Convert an instance of our range class to the equivalent
+     * eclipse class.
      */
-    private Range toRange(Position p0, Position p1) {
-        return new Range(
+    private org.eclipse.lsp4j.Range toEclipseRange(Range range) {
+        Position p0 = range.getStartInclusive();
+        Position p1 = range.getEndExclusive();
+        return new org.eclipse.lsp4j.Range(
             new org.eclipse.lsp4j.Position(p0.getZeroBasedLine(), p0.getZeroBasedColumn()),
             new org.eclipse.lsp4j.Position(p1.getZeroBasedLine(), p1.getZeroBasedColumn())
         );
diff --git a/org.lflang/src/org/lflang/generator/Validator.java b/org.lflang/src/org/lflang/generator/Validator.java
index 0ad83f9c35..37767bf17b 100644
--- a/org.lflang/src/org/lflang/generator/Validator.java
+++ b/org.lflang/src/org/lflang/generator/Validator.java
@@ -68,8 +68,8 @@ public final void doValidate(LFGeneratorContext context) throws ExecutionExcepti
             }
         ).collect(Collectors.toList());
         for (Future<Pair<ValidationStrategy, LFCommand>> f : getFutures(tasks)) {
-            f.get().first.getErrorReportingStrategy().report(f.get().second.getErrors().toString(), errorReporter, codeMaps);
-            f.get().first.getOutputReportingStrategy().report(f.get().second.getOutput().toString(), errorReporter, codeMaps);
+            f.get().first.getErrorReportingStrategy().report(f.get().second.getErrors(), errorReporter, codeMaps);
+            f.get().first.getOutputReportingStrategy().report(f.get().second.getOutput(), errorReporter, codeMaps);
         }
     }
 
@@ -125,8 +125,8 @@ private static <T> List<Future<T>> getFutures(List<Callable<T>> tasks) throws In
      */
     public final int run(LFCommand command, CancelIndicator cancelIndicator) {
         final int returnCode = command.run(cancelIndicator);
-        getBuildReportingStrategies().first.report(command.getErrors().toString(), errorReporter, codeMaps);
-        getBuildReportingStrategies().second.report(command.getOutput().toString(), errorReporter, codeMaps);
+        getBuildReportingStrategies().first.report(command.getErrors(), errorReporter, codeMaps);
+        getBuildReportingStrategies().second.report(command.getOutput(), errorReporter, codeMaps);
         return returnCode;
     }
 
@@ -161,7 +161,7 @@ private List<Pair<ValidationStrategy, LFCommand>> getValidationStrategies() {
      */
     private Pair<ValidationStrategy, LFCommand> getValidationStrategy(Path generatedFile) {
         List<ValidationStrategy> sorted = getPossibleStrategies().stream()
-            .sorted(Comparator.comparingInt(vs -> -vs.getPriority())).collect(Collectors.toList());
+            .sorted(Comparator.comparingInt(vs -> -vs.getPriority())).toList();
         for (ValidationStrategy strategy : sorted) {
             LFCommand validateCommand = strategy.getCommand(generatedFile);
             if (validateCommand != null) {
diff --git a/org.lflang/src/org/lflang/generator/c/CCompiler.java b/org.lflang/src/org/lflang/generator/c/CCompiler.java
index e2084cd5e2..45601a0f85 100644
--- a/org.lflang/src/org/lflang/generator/c/CCompiler.java
+++ b/org.lflang/src/org/lflang/generator/c/CCompiler.java
@@ -140,16 +140,16 @@ public boolean runCCompiler(
 
         if (cMakeReturnCode != 0 &&
                 context.getMode() == LFGeneratorContext.Mode.STANDALONE &&
-                !outputContainsKnownCMakeErrors(compile.getErrors().toString())) {
+                !outputContainsKnownCMakeErrors(compile.getErrors())) {
             errorReporter.reportError(targetConfig.compiler + " failed with error code " + cMakeReturnCode);
         }
 
         // For warnings (vs. errors), the return code is 0.
         // But we still want to mark the IDE.
-        if (compile.getErrors().toString().length() > 0 &&
+        if (compile.getErrors().length() > 0 &&
                 context.getMode() != LFGeneratorContext.Mode.STANDALONE &&
-                !outputContainsKnownCMakeErrors(compile.getErrors().toString())) {
-            generator.reportCommandErrors(compile.getErrors().toString());
+                !outputContainsKnownCMakeErrors(compile.getErrors())) {
+            generator.reportCommandErrors(compile.getErrors());
         }
 
         int makeReturnCode = 0;
@@ -161,20 +161,20 @@ public boolean runCCompiler(
 
             if (makeReturnCode != 0 &&
                     context.getMode() == LFGeneratorContext.Mode.STANDALONE &&
-                    !outputContainsKnownCMakeErrors(build.getErrors().toString())) {
+                    !outputContainsKnownCMakeErrors(build.getErrors())) {
                 errorReporter.reportError(targetConfig.compiler + " failed with error code " + makeReturnCode);
             }
 
             // For warnings (vs. errors), the return code is 0.
             // But we still want to mark the IDE.
-            if (build.getErrors().toString().length() > 0 &&
+            if (build.getErrors().length() > 0 &&
                     context.getMode() != LFGeneratorContext.Mode.STANDALONE &&
-                    !outputContainsKnownCMakeErrors(build.getErrors().toString())) {
-                generator.reportCommandErrors(build.getErrors().toString());
+                    !outputContainsKnownCMakeErrors(build.getErrors())) {
+                generator.reportCommandErrors(build.getErrors());
             }
 
 
-            if (makeReturnCode == 0 && build.getErrors().toString().length() == 0) {
+            if (makeReturnCode == 0 && build.getErrors().length() == 0) {
                 errorReporter.reportInfo("SUCCESS: Compiling generated code for " + fileConfig.name + " finished with no errors.");
             }
 
diff --git a/org.lflang/src/org/lflang/generator/c/CUtil.java b/org.lflang/src/org/lflang/generator/c/CUtil.java
index 9ecd016a2a..0d57ffd29c 100644
--- a/org.lflang/src/org/lflang/generator/c/CUtil.java
+++ b/org.lflang/src/org/lflang/generator/c/CUtil.java
@@ -709,8 +709,8 @@ public static void runBuildCommand(
             }
             // For warnings (vs. errors), the return code is 0.
             // But we still want to mark the IDE.
-            if (!cmd.getErrors().toString().isEmpty() && mode == LFGeneratorContext.Mode.EPOCH) {
-                reportCommandErrors.report(cmd.getErrors().toString());
+            if (!cmd.getErrors().isEmpty() && mode == LFGeneratorContext.Mode.EPOCH) {
+                reportCommandErrors.report(cmd.getErrors());
                 return; // FIXME: Why do we return here? Even if there are warnings, the build process should proceed.
             }
         }
diff --git a/org.lflang/src/org/lflang/generator/cpp/CppStandaloneGenerator.kt b/org.lflang/src/org/lflang/generator/cpp/CppStandaloneGenerator.kt
index c6899f5388..0164d78360 100644
--- a/org.lflang/src/org/lflang/generator/cpp/CppStandaloneGenerator.kt
+++ b/org.lflang/src/org/lflang/generator/cpp/CppStandaloneGenerator.kt
@@ -89,7 +89,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
         var version: String? = null
         if (cmd != null && cmd.run() == 0) {
             val regex = "\\d+(\\.\\d+)+".toRegex()
-            version = regex.find(cmd.output.toString())?.value
+            version = regex.find(cmd.output)?.value
         }
         if (version == null || version.compareVersion("3.5.0") < 0) {
             errorReporter.reportError(
@@ -173,4 +173,4 @@ class CppStandaloneGenerator(generator: CppGenerator) :
         }
         return cmd
     }
-}
\ No newline at end of file
+}
diff --git a/org.lflang/src/org/lflang/generator/python/PythonValidator.java b/org.lflang/src/org/lflang/generator/python/PythonValidator.java
index 746e4dfdb3..6bba840973 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonValidator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonValidator.java
@@ -6,6 +6,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
+import java.util.function.UnaryOperator;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -17,6 +18,7 @@
 import org.lflang.generator.DiagnosticReporting;
 import org.lflang.generator.DiagnosticReporting.Strategy;
 import org.lflang.generator.Position;
+import org.lflang.generator.Range;
 import org.lflang.generator.ValidationStrategy;
 import org.lflang.util.LFCommand;
 
@@ -256,40 +258,48 @@ public Strategy getErrorReportingStrategy() {
             @Override
             public Strategy getOutputReportingStrategy() {
                 return (validationOutput, errorReporter, codeMaps) -> {
-                    if (validationOutput.isBlank()) return;
+                    if (validationOutput.isBlank()) {
+                        return;
+                    }
+                    PylintMessage[] pylintMessages;
                     try {
-                        for (PylintMessage message : mapper.readValue(validationOutput, PylintMessage[].class)) {
-                            if (shouldIgnore(message)) continue;
-                            CodeMap map = codeMaps.get(message.getPath(fileConfig.getSrcGenPath()));
-                            if (map != null) {
-                                for (Path lfFile : map.lfSourcePaths()) {
-                                    Function<Position, Position> adjust = p -> map.adjusted(lfFile, p);
-                                    String humanMessage = DiagnosticReporting.messageOf(
-                                        message.message,
-                                        message.getPath(fileConfig.getSrcGenPath()),
-                                        message.getStart()
-                                    );
-                                    Position lfStart = adjust.apply(message.getStart());
-                                    Position lfEnd = adjust.apply(message.getEnd());
-                                    bestEffortReport(
-                                        errorReporter,
-                                        adjust,
-                                        lfStart,
-                                        lfEnd,
-                                        lfFile,
-                                        message.getSeverity(),
-                                        humanMessage
-                                    );
-                                }
-                            }
-                        }
+                        pylintMessages = mapper.readValue(validationOutput, PylintMessage[].class);
                     } catch (JsonProcessingException e) {
                         System.err.printf("Failed to parse \"%s\":%n", validationOutput);
                         e.printStackTrace();
                         errorReporter.reportWarning(
                             "Failed to parse linter output. The Lingua Franca code generator is tested with Pylint "
-                             + "version 2.12.2. Consider updating Pylint if you have an older version."
+                                + "version 2.12.2. Consider updating Pylint if you have an older version."
                         );
+                        return;
+                    }
+                    for (PylintMessage message : pylintMessages) {
+                        if (shouldIgnore(message)) {
+                            continue;
+                        }
+                        CodeMap map = codeMaps.get(message.getPath(fileConfig.getSrcGenPath()));
+                        if (map == null) {
+                            continue;
+                        }
+                        for (Path lfFile : map.lfSourcePaths()) {
+                            UnaryOperator<Position> adjust = p -> map.adjusted(lfFile, p);
+                            String humanMessage = DiagnosticReporting.messageOf(
+                                message.message,
+                                message.getPath(fileConfig.getSrcGenPath()),
+                                message.getStart()
+                            );
+                            Position lfStart = adjust.apply(message.getStart());
+                            Position lfEnd = adjust.apply(message.getEnd());
+                            bestEffortReport(
+                                errorReporter,
+                                adjust,
+                                lfStart,
+                                lfEnd,
+                                lfFile,
+                                message.getSeverity(),
+                                humanMessage
+                            );
+                        }
                     }
                 };
             }
@@ -312,7 +322,7 @@ private boolean shouldIgnore(PylintMessage message) {
             /** Make a best-effort attempt to place the diagnostic on the correct line. */
             private void bestEffortReport(
                 ErrorReporter errorReporter,
-                Function<Position, Position> adjust,
+                UnaryOperator<Position> adjust,
                 Position lfStart,
                 Position lfEnd,
                 Path file,
@@ -320,7 +330,7 @@ private void bestEffortReport(
                 String humanMessage
             ) {
                 if (!lfEnd.equals(Position.ORIGIN) && !lfStart.equals(Position.ORIGIN)) { // Ideal case
-                    errorReporter.report(file, severity, humanMessage, lfStart, lfEnd);
+                    errorReporter.report(file, severity, humanMessage, new Range(lfStart, lfEnd));
                 } else {  // Fallback: Try to report on the correct line, or failing that, just line 1.
                     if (lfStart.equals(Position.ORIGIN)) lfStart = adjust.apply(
                         Position.fromZeroBased(lfStart.getZeroBasedLine(), Integer.MAX_VALUE)
diff --git a/org.lflang/src/org/lflang/generator/rust/RustGenerator.kt b/org.lflang/src/org/lflang/generator/rust/RustGenerator.kt
index 5e93fc92d3..2e723392d0 100644
--- a/org.lflang/src/org/lflang/generator/rust/RustGenerator.kt
+++ b/org.lflang/src/org/lflang/generator/rust/RustGenerator.kt
@@ -143,7 +143,7 @@ class RustGenerator(
             }
 
             val buildType = targetConfig.rust.buildType
-            var binaryPath = validator.getMetadata()?.targetDirectory!!
+            val binaryPath = validator.metadata?.targetDirectory!!
                 .resolve(buildType.cargoProfileName)
                 .resolve(localizedExecName)
             val destPath = fileConfig.binPath.resolve(localizedExecName)
diff --git a/org.lflang/src/org/lflang/generator/rust/RustModel.kt b/org.lflang/src/org/lflang/generator/rust/RustModel.kt
index d05ebe03c5..ecf32986dd 100644
--- a/org.lflang/src/org/lflang/generator/rust/RustModel.kt
+++ b/org.lflang/src/org/lflang/generator/rust/RustModel.kt
@@ -25,12 +25,55 @@
 
 package org.lflang.generator.rust
 
-import org.lflang.*
+import org.lflang.ASTUtils
+import org.lflang.AttributeUtils
+import org.lflang.ErrorReporter
+import org.lflang.IDENT_REGEX
+import org.lflang.InferredType
+import org.lflang.TargetConfig
 import org.lflang.TargetProperty.BuildType
-import org.lflang.generator.*
+import org.lflang.TimeUnit
+import org.lflang.TimeValue
+import org.lflang.allComponents
+import org.lflang.camelToSnakeCase
+import org.lflang.generator.CodeMap
+import org.lflang.generator.InvalidLfSourceException
+import org.lflang.generator.LocationInfo
+import org.lflang.generator.TargetCode
+import org.lflang.generator.UnsupportedGeneratorFeatureException
 import org.lflang.generator.cpp.toCppCode
-import org.lflang.lf.*
+import org.lflang.generator.locationInfo
+import org.lflang.inBlock
+import org.lflang.indexInContainer
+import org.lflang.inferredType
+import org.lflang.isBank
+import org.lflang.isInitWithBraces
+import org.lflang.isInput
+import org.lflang.isLogical
+import org.lflang.isMultiport
+import org.lflang.lf.Action
+import org.lflang.lf.BuiltinTrigger
+import org.lflang.lf.BuiltinTriggerRef
+import org.lflang.lf.Code
+import org.lflang.lf.Connection
+import org.lflang.lf.Expression
+import org.lflang.lf.Input
+import org.lflang.lf.Instantiation
+import org.lflang.lf.Literal
+import org.lflang.lf.ParameterReference
+import org.lflang.lf.Port
+import org.lflang.lf.Reaction
+import org.lflang.lf.Reactor
+import org.lflang.lf.Time
 import org.lflang.lf.Timer
+import org.lflang.lf.TypeParm
+import org.lflang.lf.VarRef
+import org.lflang.lf.Variable
+import org.lflang.lf.WidthSpec
+import org.lflang.reactor
+import org.lflang.toPath
+import org.lflang.toText
+import org.lflang.toTimeValue
 import java.nio.file.Path
 import java.util.*
 
@@ -698,6 +741,7 @@ val BuildType.cargoProfileName: String
         BuildType.RELEASE           -> "release"
         BuildType.REL_WITH_DEB_INFO -> "release-with-debug-info"
         BuildType.MIN_SIZE_REL      -> "release-with-min-size"
+        BuildType.TEST              -> "debug" // todo
     }
 
 /** Just the constructor of [CargoDependencySpec], but allows using named arguments. */
diff --git a/org.lflang/src/org/lflang/generator/rust/RustValidator.kt b/org.lflang/src/org/lflang/generator/rust/RustValidator.kt
index 637a8f7475..bf7a4db9b2 100644
--- a/org.lflang/src/org/lflang/generator/rust/RustValidator.kt
+++ b/org.lflang/src/org/lflang/generator/rust/RustValidator.kt
@@ -10,6 +10,7 @@ import org.lflang.FileConfig
 import org.lflang.generator.CodeMap
 import org.lflang.generator.DiagnosticReporting
 import org.lflang.generator.Position
+import org.lflang.generator.Range
 import org.lflang.generator.ValidationStrategy
 import org.lflang.generator.Validator
 import org.lflang.util.LFCommand
@@ -32,7 +33,7 @@ class RustValidator(
         private const val COMPILER_MESSAGE_REASON = "compiler-message"
     }
     // See the following reference for details on cargo metadata: https://doc.rust-lang.org/cargo/commands/cargo-metadata.html
-    public data class RustMetadata(
+    data class RustMetadata(
         // Other fields exist, but we don't need them. The mapper is configured not to fail on unknown properties.
         @JsonProperty("workspace_root") private val _workspaceRoot: String,
         @JsonProperty("target_directory") private val _targetDirectory: String
@@ -42,6 +43,7 @@ class RustValidator(
         val targetDirectory: Path
             get() = Paths.get(_targetDirectory)
     }
+
     // See the following references for details on these data classes:
     //  * https://doc.rust-lang.org/cargo/reference/external-tools.html#json-messages
     //  * https://doc.rust-lang.org/rustc/json.html
@@ -103,39 +105,43 @@ class RustValidator(
         @JsonProperty("expansion") val expansion: RustSpanExpansion?
     ) {
         val start: Position
-            get() = Position.fromOneBased(lineStart, columnStart)
+            get() = Position.fromZeroBased(lineStart, columnStart)
         val end: Position
-            get() = Position.fromOneBased(lineEnd, columnEnd)
+            get() = Position.fromZeroBased(lineEnd, columnEnd)
+        val range: Range get() = Range(start, end)
     }
     private data class RustSpanExpansion(
         @JsonProperty("span") val span: RustSpan,
         @JsonProperty("macro_decl_name") val macroDeclName: String,
         @JsonProperty("def_site_span") val defSiteSpan: RustSpan?
     )
+
     private data class RustSpanText(
         @JsonProperty("text") val text: String,
         @JsonProperty("highlight_start") val highlightStart: Int,
         @JsonProperty("highlight_end") val highlightEnd: Int
     )
 
-    private var _metadata: RustMetadata? = null
 
-    public fun getMetadata(): RustMetadata? {
-        val nullableCommand = LFCommand.get("cargo", listOf("metadata", "--format-version", "1"), true, fileConfig.srcGenPkgPath)
-        _metadata = _metadata ?: nullableCommand?.let { command ->
-            command.run { false }
-            command.output.toString().lines().filter { it.startsWith("{") }.mapNotNull {
+    val metadata: RustMetadata? by lazy {
+        val command =
+            LFCommand.get("cargo", listOf("metadata", "--format-version", "1"), true, fileConfig.srcGenPkgPath)
+                ?: return@lazy null
+
+        command.run { false }
+        command.output.toString()
+            .lines()
+            .filter { it.startsWith("{") }
+            .firstNotNullOfOrNull {
                 try {
                     mapper.readValue(it, RustMetadata::class.java)
                 } catch (e: JsonProcessingException) {
                     null
                 }
-            }.firstOrNull()
-        }
-        return _metadata
+            }
     }
 
-    override fun getPossibleStrategies(): Collection<ValidationStrategy> = listOf(object: ValidationStrategy {
+    private val rustValidationStrategy = object : ValidationStrategy {
         override fun getCommand(generatedFile: Path?): LFCommand {
             return LFCommand.get(
                 "cargo",
@@ -147,36 +153,41 @@ class RustValidator(
 
         override fun getErrorReportingStrategy() = DiagnosticReporting.Strategy { _, _, _ -> }
 
-        override fun getOutputReportingStrategy() = DiagnosticReporting.Strategy {
-            validationOutput, errorReporter, map -> validationOutput.lines().forEach { messageLine ->
-                if (messageLine.isNotBlank() && mapper.readValue(messageLine, RustOutput::class.java).reason == COMPILER_MESSAGE_REASON) {
-                    val message = mapper.readValue(messageLine, RustCompilerMessage::class.java).message
-                    if (message.spans.isEmpty()) errorReporter.report(null, message.severity, message.message)
-                    for (s: RustSpan in message.spans) {
-                        val p: Path? = getMetadata()?.workspaceRoot?.resolve(s.fileName)
-                        map[p]?.let {
-                            for (lfSourcePath: Path in it.lfSourcePaths()) {
-                                errorReporter.report(
-                                    lfSourcePath,
-                                    message.severity,
-                                    DiagnosticReporting.messageOf(message.message, p, s.start),
-                                    it.adjusted(lfSourcePath, s.start),
-                                    it.adjusted(lfSourcePath, s.end),
-                                )
-                            }
-                        }
+        override fun getOutputReportingStrategy() = DiagnosticReporting.Strategy { validationOutput, errorReporter, map ->
+            for (messageLine in validationOutput.lines()) {
+                if (messageLine.isBlank()
+                    || mapper.readValue(messageLine, RustOutput::class.java).reason != COMPILER_MESSAGE_REASON
+                ) continue
+
+                val message = mapper.readValue(messageLine, RustCompilerMessage::class.java).message
+
+                if (message.spans.isEmpty()) errorReporter.report(null, message.severity, message.message)
+                for (span in message.spans) {
+                    val genFilePath = metadata?.workspaceRoot?.resolve(span.fileName)
+                    val codeMap = map[genFilePath] ?: continue
+
+                    for (lfSourcePath in codeMap.lfSourcePaths()) { // fixme error is reported several times
+                        errorReporter.report(
+                            lfSourcePath,
+                            message.severity,
+                            DiagnosticReporting.messageOf(message.message, genFilePath, span.start),
+                            codeMap.adjusted(lfSourcePath, span.range),
+                        )
                     }
-                    message.rendered?.let { println(it) }
                 }
+                message.rendered?.let { println(it) }
             }
         }
 
         override fun getPriority(): Int = 0
 
         override fun isFullBatch(): Boolean = true
-    })
+    }
+
+    override fun getPossibleStrategies(): Collection<ValidationStrategy> = listOf(rustValidationStrategy)
 
     override fun getBuildReportingStrategies(): Pair<DiagnosticReporting.Strategy, DiagnosticReporting.Strategy> = Pair(
-        possibleStrategies.first().errorReportingStrategy, possibleStrategies.first().outputReportingStrategy
+        rustValidationStrategy.errorReportingStrategy,
+        rustValidationStrategy.outputReportingStrategy
     )
 }
diff --git a/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt b/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
index 04f00cc788..a4fd3b0bb6 100644
--- a/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
+++ b/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
@@ -353,7 +353,7 @@ class TSGenerator(
         if (pnpmInstall != null) {
             val ret = pnpmInstall.run(context.cancelIndicator)
             if (ret != 0) {
-                val errors: String = pnpmInstall.errors.toString()
+                val errors: String = pnpmInstall.errors
                 errorReporter.reportError(
                     GeneratorUtils.findTarget(resource),
                     "ERROR: pnpm install command failed" + if (errors.isBlank()) "." else ":\n$errors")
@@ -372,7 +372,7 @@ class TSGenerator(
             if (npmInstall.run(context.cancelIndicator) != 0) {
                 errorReporter.reportError(
                     GeneratorUtils.findTarget(resource),
-                    "ERROR: npm install command failed: " + npmInstall.errors.toString())
+                    "ERROR: npm install command failed: " + npmInstall.errors)
                 errorReporter.reportError(
                     GeneratorUtils.findTarget(resource), "ERROR: npm install command failed." +
                         "\nFor installation instructions, see: https://www.npmjs.com/get-npm")
diff --git a/org.lflang/src/org/lflang/generator/ts/TSValidator.kt b/org.lflang/src/org/lflang/generator/ts/TSValidator.kt
index aa861ce800..dfc15720d4 100644
--- a/org.lflang/src/org/lflang/generator/ts/TSValidator.kt
+++ b/org.lflang/src/org/lflang/generator/ts/TSValidator.kt
@@ -11,6 +11,7 @@ import org.lflang.generator.DiagnosticReporting
 import org.lflang.generator.HumanReadableReportingStrategy
 import org.lflang.generator.LFGeneratorContext
 import org.lflang.generator.Position
+import org.lflang.generator.Range
 import org.lflang.generator.ValidationStrategy
 import org.lflang.generator.Validator
 import org.lflang.util.LFCommand
@@ -82,39 +83,37 @@ class TSValidator(
         )
 
         override fun getPossibleStrategies(): Collection<ValidationStrategy> = listOf(object: ValidationStrategy {
-            override fun getCommand(generatedFile: Path?): LFCommand? {
-                return generatedFile?.let {
-                    LFCommand.get(
-                        "npx",
-                        listOf("eslint", "--format", "json", fileConfig.srcGenPkgPath.relativize(it).toString()),
-                        true,
-                        fileConfig.srcGenPkgPath
-                    )
-                }
-            }
+            override fun getCommand(generatedFile: Path): LFCommand =
+                LFCommand.get(
+                    "npx",
+                    listOf("eslint", "--format", "json", fileConfig.srcGenPkgPath.relativize(generatedFile).toString()),
+                    true,
+                    fileConfig.srcGenPkgPath
+                )
 
             override fun getErrorReportingStrategy() = DiagnosticReporting.Strategy { _, _, _ -> }
 
-            override fun getOutputReportingStrategy() = DiagnosticReporting.Strategy {
-                validationOutput, errorReporter, map -> validationOutput.lines().filter { it.isNotBlank() }.forEach {
-                    line: String -> mapper.readValue(line, Array<ESLintOutput>::class.java).forEach {
-                        output: ESLintOutput -> output.messages.forEach {
-                            message: ESLintMessage ->
-                            val genPath: Path = fileConfig.srcGenPkgPath.resolve(output.filePath)
-                            map[genPath]?.let {
-                                codeMap ->
-                                codeMap.lfSourcePaths().forEach {
-                                    val lfStart = codeMap.adjusted(it, message.start)
-                                    val lfEnd = codeMap.adjusted(it, message.end)
-                                    if (!lfStart.equals(Position.ORIGIN)) {  // Ignore linting errors in non-user-supplied code.
-                                        errorReporter.report(
-                                            it,
-                                            message.severity,
-                                            DiagnosticReporting.messageOf(message.message, genPath, message.start),
+            override fun getOutputReportingStrategy() = DiagnosticReporting.Strategy { validationOutput, errorReporter, map ->
+                for (line in validationOutput.lines().filter { it.isNotBlank() }) {
+                    for (output in mapper.readValue(line, Array<ESLintOutput>::class.java)) {
+                        for (message in output.messages) {
+
+                            val genPath = fileConfig.srcGenPkgPath.resolve(output.filePath)
+                            val codeMap = map[genPath] ?: continue
+
+                            for (path in codeMap.lfSourcePaths()) {
+                                val lfStart = codeMap.adjusted(path, message.start)
+                                val lfEnd = codeMap.adjusted(path, message.end)
+                                if (lfStart != Position.ORIGIN) {  // Ignore linting errors in non-user-supplied code.
+                                    errorReporter.report(
+                                        path,
+                                        message.severity,
+                                        DiagnosticReporting.messageOf(message.message, genPath, message.start),
+                                        Range(
                                             lfStart,
-                                            if (lfEnd > lfStart) lfEnd else lfStart.plus(" "),
+                                            if (lfEnd > lfStart) lfEnd else lfStart + " ",
                                         )
-                                    }
+                                    )
                                 }
                             }
                         }
@@ -133,9 +132,9 @@ class TSValidator(
 
     override fun getPossibleStrategies(): Collection<ValidationStrategy>
         = listOf(object: ValidationStrategy {
-            override fun getCommand(generatedFile: Path?): LFCommand? {  // FIXME: Add "--incremental" argument if we update to TypeScript 4
-                return LFCommand.get("npx", listOf("tsc", "--pretty", "--noEmit"), true, fileConfig.srcGenPkgPath)
-            }
+        override fun getCommand(generatedFile: Path): LFCommand {  // FIXME: Add "--incremental" argument if we update to TypeScript 4
+            return LFCommand.get("npx", listOf("tsc", "--pretty", "--noEmit"), true, fileConfig.srcGenPkgPath)
+        }
 
             override fun getErrorReportingStrategy() = DiagnosticReporting.Strategy { _, _, _ -> }
 
diff --git a/org.lflang/src/org/lflang/util/LFCommand.java b/org.lflang/src/org/lflang/util/LFCommand.java
index 37610803f4..8fd4feb3ad 100644
--- a/org.lflang/src/org/lflang/util/LFCommand.java
+++ b/org.lflang/src/org/lflang/util/LFCommand.java
@@ -83,13 +83,13 @@ protected LFCommand(ProcessBuilder pb, boolean quiet) {
     /**
      * Get the output collected during command execution
      */
-    public OutputStream getOutput() { return output; }
+    public String getOutput() { return output.toString(); }
 
 
     /**
      * Get the error output collected during command execution
      */
-    public OutputStream getErrors() { return errors; }
+    public String getErrors() { return errors.toString(); }
 
     /** Get this command's program and arguments. */
     public List<String> command() { return processBuilder.command(); }

From f03bf86d56f91d4a28ec957a3d6a5f70a36127f2 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sun, 19 Jun 2022 12:18:19 -0700
Subject: [PATCH 0002/1114] Begin the Java port of the UclidGenerator

---
 org.lflang/src/org/lflang/Target.java         |   6 +
 .../src/org/lflang/generator/LFGenerator.java |   2 +
 .../generator/uclid/UclidGenerator.java       | 217 ++++++++++++++++++
 3 files changed, 225 insertions(+)
 create mode 100644 org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java

diff --git a/org.lflang/src/org/lflang/Target.java b/org.lflang/src/org/lflang/Target.java
index 84a2711311..9b759425c3 100644
--- a/org.lflang/src/org/lflang/Target.java
+++ b/org.lflang/src/org/lflang/Target.java
@@ -350,6 +350,10 @@ public enum Target {
          // are those that are a valid expression. Others may be escaped
          // with the syntax r#keyword.
          Arrays.asList("self", "true", "false")
+    ),
+    Uclid("Uclid", true,
+         // Use an empty list as a placeholder.
+         Arrays.asList("")
     );
 
     /**
@@ -474,6 +478,7 @@ public boolean supportsMultiports() {
         case Python:
         case Rust:
         case TS:
+        case Uclid:
             return true;
         }
         return false;
@@ -493,6 +498,7 @@ public boolean supportsParameterizedWidths() {
         case Python:
         case Rust:
         case TS:
+        case Uclid:
             return true;
         }
         return false;
diff --git a/org.lflang/src/org/lflang/generator/LFGenerator.java b/org.lflang/src/org/lflang/generator/LFGenerator.java
index ac0c462c84..c8763a19ec 100644
--- a/org.lflang/src/org/lflang/generator/LFGenerator.java
+++ b/org.lflang/src/org/lflang/generator/LFGenerator.java
@@ -18,6 +18,7 @@
 import org.lflang.Target;
 import org.lflang.generator.c.CGenerator;
 import org.lflang.generator.python.PythonGenerator;
+import org.lflang.generator.uclid.UclidGenerator;
 import org.lflang.scoping.LFGlobalScopeProvider;
 
 import com.google.inject.Inject;
@@ -92,6 +93,7 @@ private GeneratorBase createGenerator(Target target, FileConfig fileConfig, Erro
         case TS:
         case Rust:
             return createKotlinBaseGenerator(target, fileConfig, errorReporter);
+        case Uclid: return new UclidGenerator(fileConfig, errorReporter);
         }
         // If no case matched, then throw a runtime exception.
         throw new RuntimeException("Unexpected target!");
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
new file mode 100644
index 0000000000..19bae48edf
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -0,0 +1,217 @@
+/*************
+Copyright (c) 2021, The University of California at Berkeley.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+***************/
+
+/** 
+ * Generator for Uclid models.
+ * 
+ * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ */
+package org.lflang.generator.uclid;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.generator.IFileSystemAccess2;
+import org.eclipse.xtext.generator.IGeneratorContext;
+import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
+import org.eclipse.xtext.xbase.lib.Exceptions;
+
+import org.lflang.generator.CodeBuilder;
+import org.lflang.generator.GeneratorBase;
+import org.lflang.generator.LFGeneratorContext;
+import org.lflang.generator.PortInstance;
+import org.lflang.generator.ReactorInstance;
+import org.lflang.generator.TargetTypes;
+import org.lflang.ErrorReporter;
+import org.lflang.FileConfig;
+import org.lflang.Target;
+import org.lflang.TimeUnit;
+import org.lflang.TimeValue;
+import org.lflang.lf.Action;
+import org.lflang.lf.VarRef;
+
+import static org.lflang.ASTUtils.*;
+
+public class UclidGenerator extends GeneratorBase {
+
+    ////////////////////////////////////////////
+    //// Private variables
+
+    // Data structures for storing properties
+    List<String> properties  = new ArrayList<String>();
+
+    ////////////////////////////////////////////
+    //// Protected fields
+
+    /** The main place to put generated code. */
+    protected CodeBuilder code = new CodeBuilder();
+
+    // Constructor
+    public UclidGenerator(FileConfig fileConfig, ErrorReporter errorReporter) {
+        super(fileConfig, errorReporter);
+    }
+
+    ////////////////////////////////////////////////////////////
+    //// Public methods
+    public void doGenerate(Resource resource, LFGeneratorContext context) {
+        
+        // The following generates code needed by all the reactors.
+        super.doGenerate(resource, context);
+
+        // Check for the specified k-induction steps, otherwise defaults to 1.
+        // FIXME: To enable.
+        // this.k = this.targetConfig.verification.steps;
+        // this.tactic = this.targetConfig.verification.tactic;
+        
+        System.out.println("*** Start generating Uclid code.");
+
+        // Create the main reactor instance if there is a main reactor.
+        createMainReactorInstance();
+
+        // FIXME: Build reaction instance graph and causality graph
+        // populateGraphsAndLists()
+
+        // Create the src-gen directory
+        setUpDirectories();
+
+        // FIXME: Identify properties in the attributes.
+
+        // Generate a Uclid model for each property.
+        // for (String prop : this.properties) {
+        //     generateUclidFile(prop);
+        // }
+        generateUclidFile("test", "bmc");
+
+        // FIXME:
+        // Generate runner script
+        // code = new StringBuilder()
+        // var filename = outputDir.resolve("run.sh").toString
+        // generateRunnerScript()
+        // JavaGeneratorUtils.writeSourceCodeToFile(getCode, filename)
+    }
+
+    ////////////////////////////////////////////////////////////
+    //// Protected methods
+
+    /**
+     * Generate the Uclid model and a runner script.
+     */
+    protected void generateUclidFile(String property, String tactic) {   
+        try {  
+            // Generate main.ucl and print to file
+            code = new CodeBuilder();
+            String filename = this.fileConfig.getSrcGenPath()
+                                .resolve(tactic + "_" + property + ".ucl").toString();
+            // generateUclidCode(property); // FIXME
+            code.writeToFile(filename);
+        } catch (IOException e) {
+            Exceptions.sneakyThrow(e);
+        }
+    }
+
+    ////////////////////////////////////////////////////////////
+    //// Private methods
+
+    /**
+     * If a main or federated reactor has been declared, create a ReactorInstance
+     * for this top level. This will also assign levels to reactions, then,
+     * if the program is federated, perform an AST transformation to disconnect
+     * connections between federates.
+     */
+    private void createMainReactorInstance() {
+        if (this.mainDef != null) {
+            if (this.main == null) {
+                // Recursively build instances. This is done once because
+                // it is the same for all federates.
+                this.main = new ReactorInstance(toDefinition(mainDef.getReactorClass()), errorReporter,
+                    this.unorderedReactions);
+                var reactionInstanceGraph = this.main.assignLevels();
+                if (reactionInstanceGraph.nodeCount() > 0) {
+                    errorReporter.reportError("Main reactor has causality cycles. Skipping code generation.");
+                    return;
+                }
+            }
+
+            // Force reconstruction of dependence information.
+            if (isFederated) {
+                // Avoid compile errors by removing disconnected network ports.
+                // This must be done after assigning levels.
+                removeRemoteFederateConnectionPorts(main);
+                // There will be AST transformations that invalidate some info
+                // cached in ReactorInstance.
+                this.main.clearCaches(false);
+            }
+        }
+    }
+
+    private void setUpDirectories() {
+        // Make sure the target directory exists.
+        var targetDir = this.fileConfig.getSrcGenPath();
+        try {
+            Files.createDirectories(targetDir);
+        } catch (IOException e) {
+            Exceptions.sneakyThrow(e);
+        }
+        System.out.println("The models will be located in: " + targetDir);
+    }
+
+    /////////////////////////////////////////////////
+    //// Functions from generatorBase
+    
+    @Override
+    public Target getTarget() {
+        return Target.C; // FIXME: How to make this target independent? Target.ALL does not work.
+    }
+     
+    @Override
+    public TargetTypes getTargetTypes() {
+        throw new UnsupportedOperationException("TODO: auto-generated method stub");
+    }   
+
+    @Override
+    public String generateDelayBody(Action action, VarRef port) {
+        throw new UnsupportedOperationException("TODO: auto-generated method stub");
+    }
+
+    @Override
+    public String generateForwardBody(Action action, VarRef port) {
+        throw new UnsupportedOperationException("TODO: auto-generated method stub");
+    }
+
+    @Override
+    public String generateDelayGeneric() {
+        throw new UnsupportedOperationException("TODO: auto-generated method stub");
+    }
+}
\ No newline at end of file

From 905bbcc4cc87b4b32da9856ee90b290976b667d5 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 23 Jun 2022 23:40:35 -0700
Subject: [PATCH 0003/1114] Do some more porting

---
 .../generator/uclid/UclidGenerator.java       | 209 +++++++++++++++++-
 1 file changed, 208 insertions(+), 1 deletion(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 19bae48edf..2b6f2bbc0a 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -134,13 +134,220 @@ protected void generateUclidFile(String property, String tactic) {
             code = new CodeBuilder();
             String filename = this.fileConfig.getSrcGenPath()
                                 .resolve(tactic + "_" + property + ".ucl").toString();
-            // generateUclidCode(property); // FIXME
+            generateUclidCode();
             code.writeToFile(filename);
         } catch (IOException e) {
             Exceptions.sneakyThrow(e);
         }
     }
 
+    /**
+     * The main function that generates Uclid code.
+     */
+    protected void generateUclidCode() {
+        code.pr(String.join("\n", 
+            "/*******************************",
+            " * Auto-generated UCLID5 model *",
+            " ******************************/"
+        ));
+
+        code.pr("module main {");
+        code.indent();
+
+        // Timing semantics
+        generateTimingSemantics();
+
+        // Trace definition
+        generateTraceDefinition();
+
+        // Reaction IDs and state variables
+        generateReactionIdsAndStateVars();
+
+        // Reactor semantics
+        generateReactorSemantics();
+
+        // Connections
+        generateConnectionsAndActions();
+
+        // Topology
+        generateTopologicalMacros();
+        generateTopology();
+
+        // Initial Condition
+        generateInitialConditions();
+
+        // Abstractions (i.e. contracts)
+        generateReactorAbstractions();
+        generateReactionAbstractions();
+
+        // FIXME: Properties
+
+        // Control block
+        generateControlBlock();
+
+        code.unindent();
+        code.pr("}");
+    }
+
+    /**
+     * FIXME
+     */
+    protected void generateTimingSemantics() {
+        code.pr(String.join("\n", 
+            "/*******************************",
+            " * Time and Related Operations *",
+            " ******************************/",
+            "type timestamp_t = integer;                     // The unit is nanoseconds",
+            "type microstep_t = integer;",
+            "type tag_t = {",
+            "    timestamp_t,",
+            "    microstep_t",
+            "};",
+            "type interval_t  = tag_t;",
+            "",
+            "// Projection macros",
+            "define pi1(t : tag_t) : timestamp_t = t._1;     // Get timestamp from tag",
+            "define pi2(t : tag_t) : microstep_t = t._2;     // Get microstep from tag",
+            "",
+            "// Interval constructor",
+            "define zero() : interval_t",
+            "= {0, 0};",
+            "define startup() : interval_t",
+            "= zero();",
+            "define mstep() : interval_t",
+            "= {0, 1};",
+            "define nsec(t : integer) : interval_t",
+            "= {t, 0};",
+            "define usec(t : integer) : interval_t",
+            "= {t * 1000, 0};",
+            "define msec(t : integer) : interval_t",
+            "= {t * 1000000, 0};",
+            "define sec(t : integer) : interval_t",
+            "= {t * 1000000000, 0};",
+            "define inf() : interval_t",
+            "= {-1, 0};",
+            "",
+            "// Helper function",
+            "define isInf(i : interval_t) : boolean",
+            "= pi1(i) < 0;",
+            "",
+            "// Tag comparison",
+            "define tag_later(t1 : tag_t, t2 : tag_t) : boolean",
+            "= pi1(t1) > pi1(t2)",
+            "    || (pi1(t1) == pi1(t2) && pi2(t1) > pi2(t2))",
+            "    || (isInf(t1) && !isInf(t2));",
+            "",
+            "define tag_same(t1 : tag_t, t2 : tag_t) : boolean",
+            "= t1 == t2;",
+            "",
+            "define tag_earlier(t1 : tag_t, t2 : tag_t) : boolean",
+            "= pi1(t1) < pi1(t2)",
+            "    || (pi1(t1) == pi1(t2) && pi2(t1) < pi2(t2))",
+            "    || (!isInf(t1) && isInf(t2));",
+            "",
+            "// mstep() produces a mstep delay. zero() produces no delay.",
+            "define tag_schedule(t : tag_t, i : interval_t) : tag_t",
+            "= if (!isInf(t) && !isInf(i) && pi1(i) == 0 && pi2(i) == 1)",
+            "    then { pi1(t), pi2(t) + 1 } // microstep delay",
+            "    else ( if (!isInf(t) && !isInf(i) && pi1(i) == 0 && pi2(i) == 0)",
+            "            then t // no delay",
+            "            else (",
+            "                if (!isInf(t) && pi1(i) > 0 && !isInf(i))",
+            "                then { pi1(t) + pi1(i), 0 }",
+            "                else inf()",
+            "            ));",
+            "",
+            "// Deprecated.",
+            "define tag_delay(t : tag_t, i : interval_t) : tag_t",
+            "= if (!isInf(t) && !isInf(i))",
+            "    then { pi1(t) + pi1(i), pi2(t) + pi2(i) }",
+            "    else inf();",
+            "",
+            "// Only consider timestamp for now.",
+            "define tag_diff(t1, t2: tag_t) : interval_t",
+            "= if (!isInf(t1) && !isInf(t2))",
+            "    then { pi1(t1) - pi1(t2), pi2(t1) - pi2(t2) }",
+            "    else inf();",
+            ""
+        ));
+    }
+
+    /**
+     * FIXME
+     */
+    protected void generateTraceDefinition() {
+        code.pr(String.join("\n", 
+            "/********************",
+            " * Trace Definition *",
+            " *******************/",
+            "const START : integer = 0;",
+            "const END : integer = «traceLength-1»;" // FIXME
+        ));
+    }
+
+    /**
+     * FIXME
+     */
+    protected void generateReactionIdsAndStateVars() {
+
+    }
+
+    /**
+     * FIXME
+     */
+    protected void generateReactorSemantics() {
+
+    }
+
+    /**
+     * FIXME
+     */
+    protected void generateConnectionsAndActions() {
+
+    }
+
+    /**
+     * FIXME
+     */
+    protected void generateTopologicalMacros() {
+
+    }
+
+    /**
+     * FIXME
+     */
+    protected void generateTopology() {
+
+    }
+
+    /**
+     * FIXME
+     */
+    protected void generateInitialConditions() {
+
+    }
+
+    /**
+     * FIXME
+     */
+    protected void generateReactorAbstractions() {
+
+    }
+
+    /**
+     * FIXME
+     */
+    protected void generateReactionAbstractions() {
+
+    }
+
+    /**
+     * FIXME
+     */
+    protected void generateControlBlock() {
+
+    }
+
     ////////////////////////////////////////////////////////////
     //// Private methods
 

From e8fe270c63f6a502cbf31ec3b351a38d9fb4d4e0 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 24 Jun 2022 11:37:05 -0700
Subject: [PATCH 0004/1114] Finish generating traces

---
 .../generator/uclid/UclidGenerator.java       | 117 ++++++++++++++++--
 1 file changed, 108 insertions(+), 9 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 2b6f2bbc0a..c257bdb9d2 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -69,8 +69,13 @@ public class UclidGenerator extends GeneratorBase {
     ////////////////////////////////////////////
     //// Private variables
 
+    // String lists storing variable names of different types
+    List<String> variableNames      = new LinkedList<String>();
+    List<String> triggerNames       = new LinkedList<String>();
+    List<String> triggerPresence    = new LinkedList<String>();
+
     // Data structures for storing properties
-    List<String> properties  = new ArrayList<String>();
+    List<String> properties         = new ArrayList<String>();
 
     ////////////////////////////////////////////
     //// Protected fields
@@ -107,12 +112,14 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         setUpDirectories();
 
         // FIXME: Identify properties in the attributes.
+        // FIXME: Calculate the completeness threshold for each property.
+        int CT = 5; // Placeholder
 
         // Generate a Uclid model for each property.
         // for (String prop : this.properties) {
         //     generateUclidFile(prop);
         // }
-        generateUclidFile("test", "bmc");
+        generateUclidFile("test", "bmc", CT);
 
         // FIXME:
         // Generate runner script
@@ -128,13 +135,13 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     /**
      * Generate the Uclid model and a runner script.
      */
-    protected void generateUclidFile(String property, String tactic) {   
+    protected void generateUclidFile(String property, String tactic, int CT) {   
         try {  
             // Generate main.ucl and print to file
             code = new CodeBuilder();
             String filename = this.fileConfig.getSrcGenPath()
                                 .resolve(tactic + "_" + property + ".ucl").toString();
-            generateUclidCode();
+            generateUclidCode(CT);
             code.writeToFile(filename);
         } catch (IOException e) {
             Exceptions.sneakyThrow(e);
@@ -144,7 +151,7 @@ protected void generateUclidFile(String property, String tactic) {
     /**
      * The main function that generates Uclid code.
      */
-    protected void generateUclidCode() {
+    protected void generateUclidCode(int CT) {
         code.pr(String.join("\n", 
             "/*******************************",
             " * Auto-generated UCLID5 model *",
@@ -158,7 +165,7 @@ protected void generateUclidCode() {
         generateTimingSemantics();
 
         // Trace definition
-        generateTraceDefinition();
+        generateTraceDefinition(CT);
 
         // Reaction IDs and state variables
         generateReactionIdsAndStateVars();
@@ -268,20 +275,112 @@ protected void generateTimingSemantics() {
             "= if (!isInf(t1) && !isInf(t2))",
             "    then { pi1(t1) - pi1(t2), pi2(t1) - pi2(t2) }",
             "    else inf();",
-            ""
+            "\n"
         ));
     }
 
     /**
      * FIXME
      */
-    protected void generateTraceDefinition() {
+    protected void generateTraceDefinition(int CT) {
+        // Define various constants.
         code.pr(String.join("\n", 
             "/********************",
             " * Trace Definition *",
             " *******************/",
             "const START : integer = 0;",
-            "const END : integer = «traceLength-1»;" // FIXME
+            "const END : integer = «traceLength-1»;", // FIXME
+            "",
+            "// trace length = k + N",
+            "const k : integer = 1;    // 1-induction should be enough.",
+            "const N : integer = " + String.valueOf(CT) +  "// The property bound",
+            "\n"
+        ));
+
+        // Define trace indices as a group,
+        // so that we can use finite quantifiers.
+        code.pr("group indices : integer = {");
+        code.indent();
+        for (int i = 0; i < CT; i++) {
+            code.pr(String.valueOf(i) + (i == CT-1? "" : ","));
+        }
+        code.unindent();
+        code.pr("};\n\n");
+
+        // FIXME: Let's see if in_range() can be removed altogether.
+        // define in_range(num : integer) : boolean
+        // = num >= START && num <= END;
+
+        // Define step, event, and trace types.
+        code.pr(String.join("\n",
+            "// Define step and event types.",
+            "type step_t = integer;",
+            "type event_t = { rxn_t, tag_t, state_t, trigger_t };",
+            "",
+            "// Create a bounded trace with length " + String.valueOf(CT)
+        ));
+        code.pr("type trace_t = {");
+        code.indent();
+        for (int i = 0; i < CT; i++) {
+            code.pr("event_t" + (i == CT-1? "" : ","));
+        }
+        code.unindent();
+        code.pr("};\n");
+
+        // Declare start time and trace.
+        code.pr(String.join("\n", 
+            "// Declare start time.",
+            "var start_time : timestamp_t;",
+            "",
+            "// Declare trace.",
+            "var trace : trace_t;"
+        ));
+
+        // Start generating helper macros.
+        code.pr(String.join("\n", 
+            "/*****************",
+            " * Helper Macros *",
+            " ****************/"
+        ));
+
+        // Define a tuple getter.
+        // FIXME: Support this in Uclid.
+        String initialStates = "";
+        String initialTriggers = "";
+        if (this.variableNames.size() > 0) {
+            initialStates = "0, ".repeat(this.variableNames.size());
+            initialStates = initialStates.substring(0, initialStates.length() - 2);
+        } else {
+            // Initialize a dummy variable just to make the code compile.
+            initialStates = "0";
+        }
+        if (this.triggerNames.size() > 0) {
+            initialTriggers = "false, ".repeat(this.triggerNames.size());
+            initialTriggers = initialTriggers.substring(0, initialTriggers.length() - 2);
+        } else {
+            // Initialize a dummy variable just to make the code compile.
+            initialTriggers = "false";
+        }
+        code.pr("// Helper macro that returns an element based on index.");
+        code.pr("define get(tr : trace_t, i : step_t) : event_t =");
+        for (int i = 0; i < CT; i++) {
+            code.pr("if (i == " + String.valueOf(i) + ") then tr._" + String.valueOf(i+1) + " else (");
+        }
+        code.pr("{ NULL, inf(), { " + initialStates + " }, { " + initialTriggers + " } }");
+        code.pr(")".repeat(CT) + ";\n");
+
+        // Define an event getter from the trace.
+        code.pr(String.join("\n", 
+            "define elem(i : step_t) : event_t",
+            "= get(trace, i);",
+            "",
+            "// projection macros",
+            "define rxn      (i : step_t) : rxn_t        = elem(i)._1;",
+            "define g        (i : step_t) : tag_t        = elem(i)._2;",
+            "define s        (i : step_t) : state_t      = elem(i)._3;",
+            "define t        (i : step_t) : trigger_t    = elem(i)._4;",
+            "define isNULL   (i : step_t) : boolean      = rxn(i) == NULL;",
+            ""
         ));
     }
 

From b09633ffd77705a75e297ec82daa34ab7af79bfe Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 24 Jun 2022 11:42:06 -0700
Subject: [PATCH 0005/1114] Minor fixes

---
 org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index c257bdb9d2..4a4f4cea60 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -289,11 +289,11 @@ protected void generateTraceDefinition(int CT) {
             " * Trace Definition *",
             " *******************/",
             "const START : integer = 0;",
-            "const END : integer = «traceLength-1»;", // FIXME
+            "const END : integer = " + String.valueOf(CT-1) + ";",
             "",
             "// trace length = k + N",
             "const k : integer = 1;    // 1-induction should be enough.",
-            "const N : integer = " + String.valueOf(CT) +  "// The property bound",
+            "const N : integer = " + String.valueOf(CT) + ";" + "// The property bound",
             "\n"
         ));
 

From 9a73349fe6417f7e6ac28564b187492c9117ff65 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 24 Jun 2022 12:20:21 -0700
Subject: [PATCH 0006/1114] Start to generate reaction and state variable
 declarations

---
 .../org/lflang/generator/NamedInstance.java   | 41 ++++++++---------
 .../generator/ReactionInstanceGraph.java      |  7 +++
 .../generator/uclid/UclidGenerator.java       | 45 ++++++++++++++++++-
 3 files changed, 70 insertions(+), 23 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/NamedInstance.java b/org.lflang/src/org/lflang/generator/NamedInstance.java
index 78f357159c..72e7dbfee3 100644
--- a/org.lflang/src/org/lflang/generator/NamedInstance.java
+++ b/org.lflang/src/org/lflang/generator/NamedInstance.java
@@ -265,6 +265,25 @@ public ModeInstance getMode(boolean direct) {
         return mode;
     }
 
+    /**
+     * Return a string of the form
+     * "a.b.c", where "." is replaced by the specified joiner,
+     * "c" is the name of this instance, "b" is the name
+     * of its container, and "a" is the name of its container, stopping
+     * at the container in main.
+     * @return A string representing this instance.
+     */
+    public String getFullNameWithJoiner(String joiner) {
+        // This is not cached because _uniqueID is cached.
+        if (parent == null) {
+            return this.getName();
+        } else if (getMode(true) != null) {
+            return parent.getFullNameWithJoiner(joiner) + joiner + getMode(true).getName() + joiner + this.getName();
+        } else {
+            return parent.getFullNameWithJoiner(joiner) + joiner + this.getName();
+        }
+    }
+
     //////////////////////////////////////////////////////
     //// Protected fields.
 
@@ -290,28 +309,6 @@ public ModeInstance getMode(boolean direct) {
      */
     int width = 1;
 
-    //////////////////////////////////////////////////////
-    //// Protected methods.
-
-    /**
-     * Return a string of the form
-     * "a.b.c", where "." is replaced by the specified joiner,
-     * "c" is the name of this instance, "b" is the name
-     * of its container, and "a" is the name of its container, stopping
-     * at the container in main.
-     * @return A string representing this instance.
-     */
-    protected String getFullNameWithJoiner(String joiner) {
-        // This is not cached because _uniqueID is cached.
-        if (parent == null) {
-            return this.getName();
-        } else if (getMode(true) != null) {
-            return parent.getFullNameWithJoiner(joiner) + joiner + getMode(true).getName() + joiner + this.getName();
-        } else {
-            return parent.getFullNameWithJoiner(joiner) + joiner + this.getName();
-        }
-    }
-
     //////////////////////////////////////////////////////
     //// Protected fields.
 
diff --git a/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java b/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
index 72c20bb63a..1b0b16efbf 100644
--- a/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
+++ b/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
@@ -115,6 +115,13 @@ public int getBreadth() {
         return maxBreadth;
     }
 
+    /**
+     * Return a set of reaction runtime instances.
+     */
+    public Set<ReactionInstance.Runtime> getNodes() {
+        return this.nodes();
+    }
+
     ///////////////////////////////////////////////////////////
     //// Protected methods
         
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 4a4f4cea60..87a89bd762 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -52,6 +52,8 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.generator.GeneratorBase;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.PortInstance;
+import org.lflang.generator.ReactionInstance;
+import org.lflang.generator.ReactionInstanceGraph;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.generator.TargetTypes;
 import org.lflang.ErrorReporter;
@@ -69,6 +71,12 @@ public class UclidGenerator extends GeneratorBase {
     ////////////////////////////////////////////
     //// Private variables
 
+    // Data structures for storing info about the runtime instances.
+    Set<ReactionInstance.Runtime> reactionInstances;
+
+    // The reaction graph upon which the causality graph is built
+    ReactionInstanceGraph reactionInstanceGraph;
+
     // String lists storing variable names of different types
     List<String> variableNames      = new LinkedList<String>();
     List<String> triggerNames       = new LinkedList<String>();
@@ -106,7 +114,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         createMainReactorInstance();
 
         // FIXME: Build reaction instance graph and causality graph
-        // populateGraphsAndLists()
+        populateDataStructures();
 
         // Create the src-gen directory
         setUpDirectories();
@@ -388,7 +396,31 @@ protected void generateTraceDefinition(int CT) {
      * FIXME
      */
     protected void generateReactionIdsAndStateVars() {
+        // Encode the components and the logical delays
+        // present in a reactor system.
+        code.pr(String.join("\n",
+            "/**********************************",
+            " * Reaction IDs & State Variables *",
+            " *********************************/",
+            "",
+            "//////////////////////////",
+            "// Application Specific"
+        ));
 
+        // Enumerate over all reactions.
+        code.pr(String.join("\n",
+            "// Reaction ids",
+            "type rxn_t = enum {"
+        ));
+        code.indent();
+        for (ReactionInstance.Runtime rxn : this.reactionInstances) {
+            // Print a list of reaction IDs.
+            // Add a comma if not last.
+            // FIXME: getFullNameWithJoiner does not exist.
+            // code.pr(rxn.getFullNameWithJoiner("_") + ",");
+        }
+        code.unindent();
+        code.pr("};\n\n");
     }
 
     /**
@@ -493,6 +525,17 @@ private void setUpDirectories() {
         System.out.println("The models will be located in: " + targetDir);
     }
 
+    /**
+     * Populate the data structures.
+     */
+    private void populateDataStructures() {
+        // Construct graphs
+        this.reactionInstanceGraph = new ReactionInstanceGraph(this.main);
+    
+        // Collect reactions from the reaction graph.
+        this.reactionInstances = this.reactionInstanceGraph.getNodes();
+    }
+
     /////////////////////////////////////////////////
     //// Functions from generatorBase
     

From 7b31537cee56a47e113c5eaf5485a39208dc52bc Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sun, 26 Jun 2022 16:08:32 -0400
Subject: [PATCH 0007/1114] Ensure that when building the reaction instance
 graph, nodes are not being removed.

---
 .../generator/ReactionInstanceGraph.java      | 36 +++++++++----------
 .../org/lflang/generator/ReactorInstance.java |  2 +-
 .../generator/uclid/UclidGenerator.java       | 13 ++++---
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java b/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
index 1b0b16efbf..2fad54b360 100644
--- a/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
+++ b/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
@@ -60,9 +60,9 @@ public class ReactionInstanceGraph extends PrecedenceGraph<ReactionInstance.Runt
      * Create a new graph by traversing the maps in the named instances 
      * embedded in the hierarchy of the program. 
      */
-    public ReactionInstanceGraph(ReactorInstance main) {
+    public ReactionInstanceGraph(ReactorInstance main, boolean doAssignLevel) {
         this.main = main;
-        rebuild();
+        rebuild(doAssignLevel);
     }
 
     ///////////////////////////////////////////////////////////
@@ -75,22 +75,27 @@ public ReactionInstanceGraph(ReactorInstance main) {
     
     ///////////////////////////////////////////////////////////
     //// Public methods
-    
+
     /**
      * Rebuild this graph by clearing and repeating the traversal that 
      * adds all the nodes and edges.
+     * 
+     * @param doAssignLevel If true, assign levels and detect causality loops. 
      */
-    public void rebuild() {
+    public void rebuild(boolean doAssignLevel) {
         this.clear();
         addNodesAndEdges(main);
-        // Assign a level to each reaction. 
-        // If there are cycles present in the graph, it will be detected here.
-        assignLevels();
-        if (nodeCount() != 0) {
-            // The graph has cycles.
-            // main.reporter.reportError("Reactions form a cycle! " + toString());
-            // Do not throw an exception so that cycle visualization can proceed.
-            // throw new InvalidSourceException("Reactions form a cycle!");
+
+        if (doAssignLevel) {
+            // Assign a level to each reaction. 
+            // If there are cycles present in the graph, it will be detected here.
+            assignLevels();
+            if (nodeCount() != 0) {
+                // The graph has cycles.
+                // main.reporter.reportError("Reactions form a cycle! " + toString());
+                // Do not throw an exception so that cycle visualization can proceed.
+                // throw new InvalidSourceException("Reactions form a cycle!");
+            }
         }
     }
     
@@ -115,13 +120,6 @@ public int getBreadth() {
         return maxBreadth;
     }
 
-    /**
-     * Return a set of reaction runtime instances.
-     */
-    public Set<ReactionInstance.Runtime> getNodes() {
-        return this.nodes();
-    }
-
     ///////////////////////////////////////////////////////////
     //// Protected methods
         
diff --git a/org.lflang/src/org/lflang/generator/ReactorInstance.java b/org.lflang/src/org/lflang/generator/ReactorInstance.java
index ae953e9370..754a3cd8d7 100644
--- a/org.lflang/src/org/lflang/generator/ReactorInstance.java
+++ b/org.lflang/src/org/lflang/generator/ReactorInstance.java
@@ -185,7 +185,7 @@ public ReactorInstance(Reactor reactor, ReactorInstance parent, ErrorReporter re
     public ReactionInstanceGraph assignLevels() {
         if (depth != 0) return root().assignLevels();
         if (cachedReactionLoopGraph == null) {
-            cachedReactionLoopGraph = new ReactionInstanceGraph(this);
+            cachedReactionLoopGraph = new ReactionInstanceGraph(this, true);
         }
         return cachedReactionLoopGraph;
     }
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 87a89bd762..39ae4b458e 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -413,11 +413,12 @@ protected void generateReactionIdsAndStateVars() {
             "type rxn_t = enum {"
         ));
         code.indent();
+        System.out.println(this.reactionInstances);
         for (ReactionInstance.Runtime rxn : this.reactionInstances) {
             // Print a list of reaction IDs.
             // Add a comma if not last.
             // FIXME: getFullNameWithJoiner does not exist.
-            // code.pr(rxn.getFullNameWithJoiner("_") + ",");
+            code.pr(rxn.getReaction().getFullNameWithJoiner("_") + "_" + String.valueOf(rxn.id) + ",");
         }
         code.unindent();
         code.pr("};\n\n");
@@ -501,7 +502,8 @@ private void createMainReactorInstance() {
                     return;
                 }
             }
-
+            
+            // FIXME: Is this needed?
             // Force reconstruction of dependence information.
             if (isFederated) {
                 // Avoid compile errors by removing disconnected network ports.
@@ -529,11 +531,12 @@ private void setUpDirectories() {
      * Populate the data structures.
      */
     private void populateDataStructures() {
+        // System.out.println(this.main.children);
         // Construct graphs
-        this.reactionInstanceGraph = new ReactionInstanceGraph(this.main);
-    
+        this.reactionInstanceGraph = new ReactionInstanceGraph(this.main, false);
+        
         // Collect reactions from the reaction graph.
-        this.reactionInstances = this.reactionInstanceGraph.getNodes();
+        this.reactionInstances = this.reactionInstanceGraph.nodes();
     }
 
     /////////////////////////////////////////////////

From f3d9cc8cada92f646d186fe9278a97e866ecb861 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sun, 26 Jun 2022 16:34:48 -0400
Subject: [PATCH 0008/1114] Generate state variables and triggers

---
 .../generator/uclid/UclidGenerator.java       | 45 +++++++++++++++++--
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 39ae4b458e..ddae4f05de 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -414,14 +414,54 @@ protected void generateReactionIdsAndStateVars() {
         ));
         code.indent();
         System.out.println(this.reactionInstances);
-        for (ReactionInstance.Runtime rxn : this.reactionInstances) {
+        for (var rxn : this.reactionInstances) {
             // Print a list of reaction IDs.
             // Add a comma if not last.
-            // FIXME: getFullNameWithJoiner does not exist.
             code.pr(rxn.getReaction().getFullNameWithJoiner("_") + "_" + String.valueOf(rxn.id) + ",");
         }
+        code.pr("NULL");
         code.unindent();
         code.pr("};\n\n");
+
+        // State variables and triggers
+        // FIXME: expand to data types other than integer
+        code.pr("type state_t = {");
+        code.indent();
+        if (this.variableNames.size() > 0) {
+            for (var i = 0 ; i < this.variableNames.size(); i++) {
+                code.pr("integer" + ((i++ == this.variableNames.size() - 1) ? "" : ",") + "// " + this.variableNames.get(i));
+            }
+        } else {
+            code.pr(String.join("\n", 
+                "// There are no ports or state variables.",
+                "// Insert a dummy integer to make the model compile.",
+                "integer"
+            ));            
+        }
+        code.unindent();
+        code.pr("};");
+        code.pr("// State variable projection macros");
+        for (var i = 0; i < this.variableNames.size(); i++) {
+            code.pr("define " + this.variableNames.get(i) + "(s : state_t) : integer = s._" + i + ";");
+        }
+        code.pr("\n"); // Newline
+
+        // A boolean tuple indicating whether triggers are present.
+        code.pr("type trigger_t = {");
+        code.indent();
+        if (this.triggerNames.size() > 0) {
+            for (var i = 0 ; i < this.triggerNames.size(); i++) {
+                code.pr("boolean" + ((i++ == this.triggerNames.size() - 1) ? "" : ",") + "// " + this.variableNames.get(i));
+            }
+        } else {
+            code.pr(String.join("\n", 
+                "// There are no triggers.",
+                "// Insert a dummy boolean to make the model compile.",
+                "boolean"
+            ));            
+        }
+        code.unindent();
+        code.pr("};");
     }
 
     /**
@@ -531,7 +571,6 @@ private void setUpDirectories() {
      * Populate the data structures.
      */
     private void populateDataStructures() {
-        // System.out.println(this.main.children);
         // Construct graphs
         this.reactionInstanceGraph = new ReactionInstanceGraph(this.main, false);
         

From 21d17189b6f5ea1b526ce3c283accc113bf2b1ab Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 27 Jun 2022 01:28:12 -0400
Subject: [PATCH 0009/1114] Generate up to reactor semantics

---
 .../lflang/generator/ReactionInstance.java    |  5 ++
 .../generator/uclid/UclidGenerator.java       | 79 ++++++++++++++++++-
 2 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/ReactionInstance.java b/org.lflang/src/org/lflang/generator/ReactionInstance.java
index f20962d70d..b347023835 100644
--- a/org.lflang/src/org/lflang/generator/ReactionInstance.java
+++ b/org.lflang/src/org/lflang/generator/ReactionInstance.java
@@ -539,6 +539,11 @@ public class Runtime {
         public ReactionInstance getReaction() {
             return ReactionInstance.this;
         }
+
+        public String getFullNameWithJoiner(String joiner) {
+            return this.getReaction().getFullNameWithJoiner(joiner) + joiner + "rid" + joiner + String.valueOf(this.id);
+        }
+
         @Override
         public String toString() {
             String result = ReactionInstance.this + "(level: " + level;
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index ddae4f05de..7615ac8859 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -417,7 +417,7 @@ protected void generateReactionIdsAndStateVars() {
         for (var rxn : this.reactionInstances) {
             // Print a list of reaction IDs.
             // Add a comma if not last.
-            code.pr(rxn.getReaction().getFullNameWithJoiner("_") + "_" + String.valueOf(rxn.id) + ",");
+            code.pr(rxn.getFullNameWithJoiner("_") + ",");
         }
         code.pr("NULL");
         code.unindent();
@@ -462,13 +462,57 @@ protected void generateReactionIdsAndStateVars() {
         }
         code.unindent();
         code.pr("};");
+        code.pr("// Trigger presence projection macros");
+        for (var i = 0; i < this.triggerPresence.size(); i++) {
+            code.pr("define " + this.triggerPresence.get(i) + "(t : trigger_t) : boolean = t._" + i + ";");
+        }
     }
 
     /**
      * FIXME
      */
     protected void generateReactorSemantics() {
-
+        code.pr(String.join("\n", 
+            "/*********************",
+            " * Reactor Semantics *",
+            " *********************/",
+            "/** transition relation **/",
+            "// transition relation constrains future states",
+            "// based on previous states.",
+            "",
+            "// Events are ordered by \"happened-before\" relation.",
+            "axiom(finite_forall (i : integer) in indices :: (finite_forall (j : integer) in indices :: (in_range(i) && in_range(j))",
+            "    ==> (hb(elem(i), elem(j)) ==> i < j)));",
+            "",
+            "// the same event can only trigger once in a logical instant",
+            "axiom(finite_forall (i : integer) in indices :: (finite_forall (j : integer) in indices :: (in_range(i) && in_range(j))",
+            "    ==> ((rxn(i) == rxn(j) && i != j)",
+            "        ==> !tag_same(g(i), g(j)))));",
+            "",
+            "// Tags should be positive",
+            "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END)",
+            "    ==> pi1(g(i)) >= 0);",
+            "",
+            "// Microsteps should be positive",
+            "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END)",
+            "    ==> pi2(g(i)) >= 0);",
+            "",
+            "// Begin the frame at the start time specified.",
+            "define start_frame(i : step_t) : boolean =",
+            "    (tag_same(g(i), {start, 0}) || tag_later(g(i), {start, 0}));",
+            "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END)",
+            "    ==> start_frame(i));",
+            "",
+            "// NULL events should appear in the suffix, except for START.",
+            "axiom(finite_forall (j : integer) in indices :: (j > START && j <= END) ==> (",
+            "    (rxn(j)) != NULL) ==> ",
+            "        (finite_forall (i : integer) in indices :: (i > START && i < j) ==> (rxn(i) != NULL)));",
+            "",
+            "// When a NULL event occurs, the state stays the same.",
+            "axiom(finite_forall (j : integer) in indices :: (j > START && j <= END) ==> (",
+            "    (rxn(j) == NULL) ==> (s(j) == s(j-1))",
+            "));"
+        ));
     }
 
     /**
@@ -482,7 +526,38 @@ protected void generateConnectionsAndActions() {
      * FIXME
      */
     protected void generateTopologicalMacros() {
+        code.pr(String.join("\n", 
+            "/***************************",
+            " * Topological Abstraction *",
+            " ***************************/"
+        ));
+        // Non-federated "happened-before"
+        code.pr(String.join("\n", 
+            "// Non-federated \"happened-before\"",
+            "define hb(e1, e2 : event_t) : boolean",
+            "= tag_earlier(e1._2, e2._2)"
+        ));
+        code.indent();
+        // Get happen-before relation between two reactions.
+        // FIXME: Can we get this from the reaction instance graph?
+        code.pr("|| (tag_same(e1._2, e2._2) && ( false");
+        // Iterate over every pair of reactions.
+        for (var upstream : this.reactionInstanceGraph.nodes()) {
+            var downstreamList = this.reactionInstanceGraph
+                                    .getDownstreamAdjacentNodes(upstream);
+            for (var downstream : downstreamList) {
+                code.pr("|| (e1._1 == " + upstream.getFullNameWithJoiner("_") + " && e2._1 == " + downstream.getFullNameWithJoiner("_") + ")");
+            }
+        }
+        code.unindent();
+        code.pr("));");
 
+        code.pr(String.join("\n", 
+            "define startup_triggers(n : rxn_t) : boolean",
+            "=   // if startup is within frame, put the events in the trace.",
+            "    ((start_time == 0) ==> (finite_exists (i : integer) in indices :: in_range(i)",
+            "        && rxn(i) == n && tag_same(g(i), zero())));"
+        ));
     }
 
     /**

From c5bc4114a92b3f3db1af1ec8ad028321e4bda881 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 27 Jun 2022 12:06:00 -0400
Subject: [PATCH 0010/1114] Generate runner script and refactor a few things.
 TODO: Triggers, reactions, and DSL-related things.

---
 .../generator/uclid/UclidGenerator.java       | 145 ++++++++++++------
 1 file changed, 96 insertions(+), 49 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 7615ac8859..1a2c716269 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -129,19 +129,15 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         // }
         generateUclidFile("test", "bmc", CT);
 
-        // FIXME:
         // Generate runner script
-        // code = new StringBuilder()
-        // var filename = outputDir.resolve("run.sh").toString
-        // generateRunnerScript()
-        // JavaGeneratorUtils.writeSourceCodeToFile(getCode, filename)
+        generateRunnerScript();
     }
 
     ////////////////////////////////////////////////////////////
     //// Protected methods
 
     /**
-     * Generate the Uclid model and a runner script.
+     * Generate the Uclid model.
      */
     protected void generateUclidFile(String property, String tactic, int CT) {   
         try {  
@@ -156,6 +152,37 @@ protected void generateUclidFile(String property, String tactic, int CT) {
         }
     }
 
+    /**
+     * Generate the Uclid model.
+     */
+    protected void generateRunnerScript() {
+        try {  
+            // Generate main.ucl and print to file
+            var script = new CodeBuilder();
+            String filename = this.fileConfig.getSrcGenPath()
+                                .resolve("run.sh").toString();
+            script.pr(String.join("\n", 
+                "#!/bin/bash",
+                "set -e # Terminate on error",
+                "",
+                "echo '*** Setting up smt directory'",
+                "rm -rf ./smt/ && mkdir -p smt",
+                "",
+                "echo '*** Generating SMT files from UCLID5'",
+                "time uclid --verbosity 3 -g \"smt/output\" $1",
+                "",
+                "echo '*** Append (get-model) to each file'",
+                "ls smt | xargs -I {} bash -c 'echo \"(get-model)\" >> smt/{}'",
+                "",
+                "echo '*** Running Z3'",
+                "ls smt | xargs -I {} bash -c 'echo \"Checking {}\" && z3 parallel.enable=true -T:300 -v:1 ./smt/{}'"
+            ));
+            script.writeToFile(filename);
+        } catch (IOException e) {
+            Exceptions.sneakyThrow(e);
+        }
+    }
+
     /**
      * The main function that generates Uclid code.
      */
@@ -182,20 +209,18 @@ protected void generateUclidCode(int CT) {
         generateReactorSemantics();
 
         // Connections
-        generateConnectionsAndActions();
-
-        // Topology
-        generateTopologicalMacros();
-        generateTopology();
+        generateTriggersAndReactions();
 
         // Initial Condition
         generateInitialConditions();
 
+        // FIXME: To support once the DSL is available.
         // Abstractions (i.e. contracts)
-        generateReactorAbstractions();
-        generateReactionAbstractions();
+        // generateReactorAbstractions();
+        // generateReactionAbstractions();
 
         // FIXME: Properties
+        // generateProperties();
 
         // Control block
         generateControlBlock();
@@ -481,13 +506,13 @@ protected void generateReactorSemantics() {
             "// based on previous states.",
             "",
             "// Events are ordered by \"happened-before\" relation.",
-            "axiom(finite_forall (i : integer) in indices :: (finite_forall (j : integer) in indices :: (in_range(i) && in_range(j))",
-            "    ==> (hb(elem(i), elem(j)) ==> i < j)));",
+            "axiom(finite_forall (i : integer) in indices :: (finite_forall (j : integer) in indices ::",
+            "    hb(elem(i), elem(j)) ==> i < j));",
             "",
             "// the same event can only trigger once in a logical instant",
-            "axiom(finite_forall (i : integer) in indices :: (finite_forall (j : integer) in indices :: (in_range(i) && in_range(j))",
-            "    ==> ((rxn(i) == rxn(j) && i != j)",
-            "        ==> !tag_same(g(i), g(j)))));",
+            "axiom(finite_forall (i : integer) in indices :: (finite_forall (j : integer) in indices ::",
+            "    ((rxn(i) == rxn(j) && i != j)",
+            "        ==> !tag_same(g(i), g(j))));",
             "",
             "// Tags should be positive",
             "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END)",
@@ -513,24 +538,7 @@ protected void generateReactorSemantics() {
             "    (rxn(j) == NULL) ==> (s(j) == s(j-1))",
             "));"
         ));
-    }
 
-    /**
-     * FIXME
-     */
-    protected void generateConnectionsAndActions() {
-
-    }
-
-    /**
-     * FIXME
-     */
-    protected void generateTopologicalMacros() {
-        code.pr(String.join("\n", 
-            "/***************************",
-            " * Topological Abstraction *",
-            " ***************************/"
-        ));
         // Non-federated "happened-before"
         code.pr(String.join("\n", 
             "// Non-federated \"happened-before\"",
@@ -551,48 +559,87 @@ protected void generateTopologicalMacros() {
         }
         code.unindent();
         code.pr("));");
-
-        code.pr(String.join("\n", 
-            "define startup_triggers(n : rxn_t) : boolean",
-            "=   // if startup is within frame, put the events in the trace.",
-            "    ((start_time == 0) ==> (finite_exists (i : integer) in indices :: in_range(i)",
-            "        && rxn(i) == n && tag_same(g(i), zero())));"
-        ));
     }
 
     /**
      * FIXME
      */
-    protected void generateTopology() {
+    // Previously called pr_connections_and_actions()
+    protected void generateTriggersAndReactions() {
+        code.pr(String.join("\n", 
+            "/***************************",
+            " * Connections and Actions *",
+            " ***************************/"
+        ));
+        // For each reaction, generate axioms for its triggers.
+        // for (var rxn : this.reactionInstances) {}
+
+        // FIXME: Factor the startup trigger here as well.
+        // code.pr(String.join("\n", 
+        //     "define startup_triggers(n : rxn_t) : boolean",
+        //     "=   // if startup is within frame, put the events in the trace.",
+        //     "    ((start_time == 0) ==> (finite_exists (i : integer) in indices :: in_range(i)",
+        //     "        && rxn(i) == n && tag_same(g(i), zero())));"
+        // ));
 
+        code.pr(String.join("\n", 
+            "/********************************",
+            " * Reactions and Their Triggers *",
+            " ********************************/"
+        ));
     }
 
     /**
      * FIXME
      */
     protected void generateInitialConditions() {
-
+        code.pr(String.join("\n", 
+            "/*********************",
+            " * Initial Condition *",
+            " *********************/",
+            "// FIXME: add template",
+            "define initial_condition() : boolean",
+            "= start == 0",
+            "    && rxn(0) == NULL",
+            "    && g(0) == {0, 0}"
+        ));
+        code.indent();
+        for (var v : this.variableNames) {
+            code.pr("&& " + v + "(s(0)) == 0");
+        }
+        for (var t : this.triggerPresence) {
+            code.pr("&& !" + t + "(t(0))");
+        }
+        code.pr(";");
+        code.unindent();
     }
 
     /**
      * FIXME
      */
-    protected void generateReactorAbstractions() {
+    // protected void generateReactorAbstractions() {
 
-    }
+    // }
 
     /**
      * FIXME
      */
-    protected void generateReactionAbstractions() {
+    // protected void generateReactionAbstractions() {
 
-    }
+    // }
 
     /**
      * FIXME
      */
     protected void generateControlBlock() {
-
+        code.pr(String.join("\n", 
+            "control {",
+            "    v = bmc(0);",
+            "    check;",
+            "    print_results;",
+            "    v.print_cex;",
+            "}"
+        ));
     }
 
     ////////////////////////////////////////////////////////////

From d704e514b523c855d5c87a1a2bb0dcac674c3495 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 27 Jun 2022 22:20:13 -0400
Subject: [PATCH 0011/1114] Uclid bug fixes

---
 .../src/org/lflang/generator/uclid/UclidGenerator.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 1a2c716269..4d9082280e 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -438,7 +438,6 @@ protected void generateReactionIdsAndStateVars() {
             "type rxn_t = enum {"
         ));
         code.indent();
-        System.out.println(this.reactionInstances);
         for (var rxn : this.reactionInstances) {
             // Print a list of reaction IDs.
             // Add a comma if not last.
@@ -512,7 +511,7 @@ protected void generateReactorSemantics() {
             "// the same event can only trigger once in a logical instant",
             "axiom(finite_forall (i : integer) in indices :: (finite_forall (j : integer) in indices ::",
             "    ((rxn(i) == rxn(j) && i != j)",
-            "        ==> !tag_same(g(i), g(j))));",
+            "        ==> !tag_same(g(i), g(j)))));",
             "",
             "// Tags should be positive",
             "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END)",
@@ -524,7 +523,7 @@ protected void generateReactorSemantics() {
             "",
             "// Begin the frame at the start time specified.",
             "define start_frame(i : step_t) : boolean =",
-            "    (tag_same(g(i), {start, 0}) || tag_later(g(i), {start, 0}));",
+            "    (tag_same(g(i), {start_time, 0}) || tag_later(g(i), {start_time, 0}));",
             "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END)",
             "    ==> start_frame(i));",
             "",
@@ -599,7 +598,7 @@ protected void generateInitialConditions() {
             " *********************/",
             "// FIXME: add template",
             "define initial_condition() : boolean",
-            "= start == 0",
+            "= start_time == 0",
             "    && rxn(0) == NULL",
             "    && g(0) == {0, 0}"
         ));

From 7e1a726ec8ac0fa29a5f7cef0216f74905392ba2 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Tue, 28 Jun 2022 18:34:38 -0400
Subject: [PATCH 0012/1114] Start to generate reactions and triggers

---
 .../lflang/generator/uclid/UclidGenerator.java  | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 4d9082280e..4f525e74aa 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -121,7 +121,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
 
         // FIXME: Identify properties in the attributes.
         // FIXME: Calculate the completeness threshold for each property.
-        int CT = 5; // Placeholder
+        int CT = 10; // Placeholder. Currently up to ~50.
 
         // Generate a Uclid model for each property.
         // for (String prop : this.properties) {
@@ -208,7 +208,7 @@ protected void generateUclidCode(int CT) {
         // Reactor semantics
         generateReactorSemantics();
 
-        // Connections
+        // Triggers and reactions
         generateTriggersAndReactions();
 
         // Initial Condition
@@ -586,6 +586,19 @@ protected void generateTriggersAndReactions() {
             " * Reactions and Their Triggers *",
             " ********************************/"
         ));
+        // Iterate over all reactions, generate conditions for them
+        // to be triggered.
+        for (var rxn : this.reactionInstances) {
+            code.pr(String.join("\n", 
+                "// " + rxn.getFullNameWithJoiner("_") + " is invoked when any of it triggers are present.",
+                "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> ((",
+                "    false"
+            ));
+            code.indent();
+
+            // Iterate over the triggers of the reaction.
+
+        }
     }
 
     /**

From f3a54c663697e8719f75fda46f3a74983ac7a233 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 29 Jun 2022 23:37:56 -0400
Subject: [PATCH 0013/1114] Continue generating reactions

---
 .../org/lflang/generator/TriggerInstance.java |  2 +-
 .../generator/uclid/UclidGenerator.java       | 51 ++++++++++++++++++-
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/TriggerInstance.java b/org.lflang/src/org/lflang/generator/TriggerInstance.java
index 11260e662a..2636915861 100644
--- a/org.lflang/src/org/lflang/generator/TriggerInstance.java
+++ b/org.lflang/src/org/lflang/generator/TriggerInstance.java
@@ -143,7 +143,7 @@ public boolean isBuiltinTrigger() {
     BuiltinTrigger builtinTriggerType = null;
     
     /** 
-     * Reaction instances that are triggered or read by this trigger.
+     * Reaction instances that are triggered by or read this trigger.
      * If this port is an output, then the reaction instances
      * belong to the parent of the port's parent. If the port
      * is an input, then the reaction instances belong to the
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 4f525e74aa..b78df4a241 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -56,12 +56,15 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.generator.ReactionInstanceGraph;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.generator.TargetTypes;
+import org.lflang.generator.TriggerInstance;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.Target;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.lf.Action;
+import org.lflang.lf.Reaction;
+import org.lflang.lf.TriggerRef;
 import org.lflang.lf.VarRef;
 
 import static org.lflang.ASTUtils.*;
@@ -588,16 +591,60 @@ protected void generateTriggersAndReactions() {
         ));
         // Iterate over all reactions, generate conditions for them
         // to be triggered.
-        for (var rxn : this.reactionInstances) {
+        for (ReactionInstance.Runtime reaction : this.reactionInstances) {
             code.pr(String.join("\n", 
-                "// " + rxn.getFullNameWithJoiner("_") + " is invoked when any of it triggers are present.",
+                "// " + reaction.getFullNameWithJoiner("_") + " is invoked when any of it triggers are present.",
                 "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> ((",
                 "    false"
             ));
             code.indent();
 
             // Iterate over the triggers of the reaction.
+            for (TriggerInstance trigger : reaction.getReaction().triggers) {
+                String triggerPresentStr = "";
+                
+                if (trigger.isBuiltinTrigger()) {
+                    // Check if this trigger is a built-in trigger (startup or shutdown).
+                    if (trigger.isStartup()) {
+                        // FIXME: Treat startup as a variable.
+                        triggerPresentStr = "g(i) == zero()";
+                    } else if (trigger.isShutdown()) {
+                        // FIXME: For a future version.
+                    } else {
+                        // Unreachable.
+                    }
+                }
+                else {
+                    // If the trigger is a port/action/timer.
+                    triggerPresentStr = trigger.getFullNameWithJoiner("_") + "_is_present(t(i))";
+                }
+
+                // Check if the trigger triggers other reactions.
+                // If so, we need to assert in the axioms that
+                // the other reactions are excluded (not invoked),
+                // to preserve the interleaving semantics.
+                String exclusion = "";
+
+                // If the current reaction is in a bank, then we need to
+                // exclude other bank member reactions. We are still deadling
+                // with once ReactionInstance here.
+                if (reaction.getReaction().getParent().isBank()) {
+                    // Exclude other bank member reactions triggered by this trigger.
+                }
+
+                // And if the trigger triggers another ReactionInstance,
+                // then we need to retrieve all runtime instances in that
+                // ReactionInstance and exclude them.
+                if (trigger.getDependentReactions().size() > 1) {
+                    // Exclude all reactions from other dependent reactions.
+                }
+                
+                code.pr("|| (" + triggerPresentStr + exclusion + ")");
+            }
 
+            // If any of the above trigger is present, then trigger the reaction.
+            code.unindent();
+            code.pr(") <==> (rxn(i) == " + reaction.getFullNameWithJoiner("_") + ")));");
         }
     }
 

From 5d8d9a465d10ff0fd8d1bb5ec4cec50c3b4a796f Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 30 Jun 2022 16:31:07 -0400
Subject: [PATCH 0014/1114] Start populating state variables and triggers

---
 .../org/lflang/generator/ReactorInstance.java | 13 +++-
 .../generator/uclid/UclidGenerator.java       | 67 ++++++++++---------
 2 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/ReactorInstance.java b/org.lflang/src/org/lflang/generator/ReactorInstance.java
index 754a3cd8d7..0dcd23827a 100644
--- a/org.lflang/src/org/lflang/generator/ReactorInstance.java
+++ b/org.lflang/src/org/lflang/generator/ReactorInstance.java
@@ -54,6 +54,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.lf.Reaction;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.ReactorDecl;
+import org.lflang.lf.StateVar;
 import org.lflang.lf.Timer;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
@@ -144,6 +145,9 @@ public ReactorInstance(Reactor reactor, ReactorInstance parent, ErrorReporter re
     /** The output port instances belonging to this reactor instance. */
     public final List<PortInstance> outputs = new ArrayList<>();
 
+    /** The state variable instances belonging to this reactor instance. */
+    public final List<StateVariableInstance> states = new ArrayList<>();
+
     /** The parameters of this instance. */
     public final List<ParameterInstance> parameters = new ArrayList<>();
 
@@ -788,16 +792,21 @@ private ReactorInstance(
             this.parameters.add(new ParameterInstance(parameter, this));
         }
 
-        // Instantiate inputs for this reactor instance
+        // Instantiate inputs for this reactor instance.
         for (Input inputDecl : ASTUtils.allInputs(reactorDefinition)) {
             this.inputs.add(new PortInstance(inputDecl, this, reporter));
         }
 
-        // Instantiate outputs for this reactor instance
+        // Instantiate outputs for this reactor instance.
         for (Output outputDecl : ASTUtils.allOutputs(reactorDefinition)) {
             this.outputs.add(new PortInstance(outputDecl, this, reporter));
         }
 
+        // Instantiate state variables for this reactor instance.
+        for (StateVar state : ASTUtils.allStateVars(reactorDefinition)) {
+            this.states.add(new StateVariableInstance(state, this, reporter));
+        }
+
         // Do not process content (except interface above) if recursive
         if (!recursive && (desiredDepth < 0 || this.depth < desiredDepth)) {
             // Instantiate children for this reactor instance.
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index b78df4a241..ba2b4ad227 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -31,40 +31,28 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.generator.IFileSystemAccess2;
-import org.eclipse.xtext.generator.IGeneratorContext;
-import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.xbase.lib.Exceptions;
 
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.GeneratorBase;
 import org.lflang.generator.LFGeneratorContext;
-import org.lflang.generator.PortInstance;
 import org.lflang.generator.ReactionInstance;
 import org.lflang.generator.ReactionInstanceGraph;
 import org.lflang.generator.ReactorInstance;
+import org.lflang.generator.StateVariableInstance;
 import org.lflang.generator.TargetTypes;
 import org.lflang.generator.TriggerInstance;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.Target;
-import org.lflang.TimeUnit;
-import org.lflang.TimeValue;
 import org.lflang.lf.Action;
-import org.lflang.lf.Reaction;
-import org.lflang.lf.TriggerRef;
 import org.lflang.lf.VarRef;
 
 import static org.lflang.ASTUtils.*;
@@ -80,9 +68,10 @@ public class UclidGenerator extends GeneratorBase {
     // The reaction graph upon which the causality graph is built
     ReactionInstanceGraph reactionInstanceGraph;
 
+    // FIXME: How to elegantly populate them?
     // String lists storing variable names of different types
-    List<String> variableNames      = new LinkedList<String>();
-    List<String> triggerNames       = new LinkedList<String>();
+    List<StateVariableInstance> stateVariables = new LinkedList<StateVariableInstance>();
+    List<TriggerInstance> triggerNames       = new LinkedList<TriggerInstance>();
     List<String> triggerPresence    = new LinkedList<String>();
 
     // Data structures for storing properties
@@ -383,8 +372,8 @@ protected void generateTraceDefinition(int CT) {
         // FIXME: Support this in Uclid.
         String initialStates = "";
         String initialTriggers = "";
-        if (this.variableNames.size() > 0) {
-            initialStates = "0, ".repeat(this.variableNames.size());
+        if (this.stateVarNames.size() > 0) {
+            initialStates = "0, ".repeat(this.stateVarNames.size());
             initialStates = initialStates.substring(0, initialStates.length() - 2);
         } else {
             // Initialize a dummy variable just to make the code compile.
@@ -454,9 +443,9 @@ protected void generateReactionIdsAndStateVars() {
         // FIXME: expand to data types other than integer
         code.pr("type state_t = {");
         code.indent();
-        if (this.variableNames.size() > 0) {
-            for (var i = 0 ; i < this.variableNames.size(); i++) {
-                code.pr("integer" + ((i++ == this.variableNames.size() - 1) ? "" : ",") + "// " + this.variableNames.get(i));
+        if (this.stateVarNames.size() > 0) {
+            for (var i = 0 ; i < this.stateVarNames.size(); i++) {
+                code.pr("integer" + ((i++ == this.stateVarNames.size() - 1) ? "" : ",") + "// " + this.stateVarNames.get(i));
             }
         } else {
             code.pr(String.join("\n", 
@@ -468,8 +457,8 @@ protected void generateReactionIdsAndStateVars() {
         code.unindent();
         code.pr("};");
         code.pr("// State variable projection macros");
-        for (var i = 0; i < this.variableNames.size(); i++) {
-            code.pr("define " + this.variableNames.get(i) + "(s : state_t) : integer = s._" + i + ";");
+        for (var i = 0; i < this.stateVarNames.size(); i++) {
+            code.pr("define " + this.stateVarNames.get(i) + "(s : state_t) : integer = s._" + i + ";");
         }
         code.pr("\n"); // Newline
 
@@ -478,7 +467,7 @@ protected void generateReactionIdsAndStateVars() {
         code.indent();
         if (this.triggerNames.size() > 0) {
             for (var i = 0 ; i < this.triggerNames.size(); i++) {
-                code.pr("boolean" + ((i++ == this.triggerNames.size() - 1) ? "" : ",") + "// " + this.variableNames.get(i));
+                code.pr("boolean" + ((i++ == this.triggerNames.size() - 1) ? "" : ",") + "// " + this.stateVarNames.get(i));
             }
         } else {
             code.pr(String.join("\n", 
@@ -628,16 +617,27 @@ protected void generateTriggersAndReactions() {
                 // If the current reaction is in a bank, then we need to
                 // exclude other bank member reactions. We are still deadling
                 // with once ReactionInstance here.
-                if (reaction.getReaction().getParent().isBank()) {
-                    // Exclude other bank member reactions triggered by this trigger.
-                }
-
+                // if (reaction.getReaction().getParent().isBank()) {
+                //     // Exclude other bank member reactions triggered by this trigger.
+                //     for (var runtime : reaction.getReaction().getRuntimeInstances()) {
+                //         if (runtime == reaction) continue; // Skip the current reaction.
+                //         exclusion += " && rxn(i) != " + runtime.getFullNameWithJoiner("_");
+                //     }
+                // }
+
+                // FIXME: Check if the case above can be merged into the case below.
                 // And if the trigger triggers another ReactionInstance,
                 // then we need to retrieve all runtime instances in that
                 // ReactionInstance and exclude them.
-                if (trigger.getDependentReactions().size() > 1) {
-                    // Exclude all reactions from other dependent reactions.
+                // if (trigger.getDependentReactions().size() > 1) {
+                // Exclude all reactions from other dependent reactions.
+                for (var instance : trigger.getDependentReactions()) {
+                    for (var runtime : ((ReactionInstance)instance).getRuntimeInstances()) {
+                        if (runtime == reaction) continue; // Skip the current reaction.
+                        exclusion += " && rxn(i) != " + runtime.getFullNameWithJoiner("_");
+                    }
                 }
+                // }
                 
                 code.pr("|| (" + triggerPresentStr + exclusion + ")");
             }
@@ -663,7 +663,7 @@ protected void generateInitialConditions() {
             "    && g(0) == {0, 0}"
         ));
         code.indent();
-        for (var v : this.variableNames) {
+        for (var v : this.stateVarNames) {
             code.pr("&& " + v + "(s(0)) == 0");
         }
         for (var t : this.triggerPresence) {
@@ -759,6 +759,13 @@ private void populateDataStructures() {
         this.reactionInstances = this.reactionInstanceGraph.nodes();
     }
 
+    private void populateStateVarsAndTriggers(ReactorInstance reactor) {
+        for (var state : reactor.states) {
+            this.stateVariables.add(state);
+        }
+        // ... ports, actions, timers
+    }
+
     /////////////////////////////////////////////////
     //// Functions from generatorBase
     

From c2bccb52c07eeadfb5ff001f72d5bffc8f231a52 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 1 Jul 2022 00:41:28 -0400
Subject: [PATCH 0015/1114] Keep generating lists

---
 .../org/lflang/generator/ReactorInstance.java |  2 +-
 .../generator/uclid/UclidGenerator.java       | 73 +++++++++++++------
 2 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/ReactorInstance.java b/org.lflang/src/org/lflang/generator/ReactorInstance.java
index 0dcd23827a..787e0fea17 100644
--- a/org.lflang/src/org/lflang/generator/ReactorInstance.java
+++ b/org.lflang/src/org/lflang/generator/ReactorInstance.java
@@ -129,7 +129,7 @@ public ReactorInstance(Reactor reactor, ReactorInstance parent, ErrorReporter re
     //// Public fields.
 
     /** The action instances belonging to this reactor instance. */
-    public List<ActionInstance> actions = new ArrayList<>();
+    public final List<ActionInstance> actions = new ArrayList<>();
 
     /**
      * The contained reactor instances, in order of declaration.
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index ba2b4ad227..6cc7d68704 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -43,6 +43,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.GeneratorBase;
 import org.lflang.generator.LFGeneratorContext;
+import org.lflang.generator.NamedInstance;
 import org.lflang.generator.ReactionInstance;
 import org.lflang.generator.ReactionInstanceGraph;
 import org.lflang.generator.ReactorInstance;
@@ -71,8 +72,8 @@ public class UclidGenerator extends GeneratorBase {
     // FIXME: How to elegantly populate them?
     // String lists storing variable names of different types
     List<StateVariableInstance> stateVariables = new LinkedList<StateVariableInstance>();
-    List<TriggerInstance> triggerNames       = new LinkedList<TriggerInstance>();
-    List<String> triggerPresence    = new LinkedList<String>();
+    List<TriggerInstance> triggers = new LinkedList<TriggerInstance>();
+    List<NamedInstance> stateVarsAndTriggers;
 
     // Data structures for storing properties
     List<String> properties         = new ArrayList<String>();
@@ -105,8 +106,10 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         // Create the main reactor instance if there is a main reactor.
         createMainReactorInstance();
 
-        // FIXME: Build reaction instance graph and causality graph
+        // Extract information from the named instances.
         populateDataStructures();
+        System.out.println(this.stateVariables);
+        System.out.println(this.triggers);
 
         // Create the src-gen directory
         setUpDirectories();
@@ -372,15 +375,15 @@ protected void generateTraceDefinition(int CT) {
         // FIXME: Support this in Uclid.
         String initialStates = "";
         String initialTriggers = "";
-        if (this.stateVarNames.size() > 0) {
-            initialStates = "0, ".repeat(this.stateVarNames.size());
+        if (this.stateVarsAndTriggers.size() > 0) {
+            initialStates = "0, ".repeat(this.stateVarsAndTriggers.size());
             initialStates = initialStates.substring(0, initialStates.length() - 2);
         } else {
             // Initialize a dummy variable just to make the code compile.
             initialStates = "0";
         }
-        if (this.triggerNames.size() > 0) {
-            initialTriggers = "false, ".repeat(this.triggerNames.size());
+        if (this.stateVarsAndTriggers.size() > 0) {
+            initialTriggers = "false, ".repeat(this.stateVarsAndTriggers.size());
             initialTriggers = initialTriggers.substring(0, initialTriggers.length() - 2);
         } else {
             // Initialize a dummy variable just to make the code compile.
@@ -443,9 +446,9 @@ protected void generateReactionIdsAndStateVars() {
         // FIXME: expand to data types other than integer
         code.pr("type state_t = {");
         code.indent();
-        if (this.stateVarNames.size() > 0) {
-            for (var i = 0 ; i < this.stateVarNames.size(); i++) {
-                code.pr("integer" + ((i++ == this.stateVarNames.size() - 1) ? "" : ",") + "// " + this.stateVarNames.get(i));
+        if (this.stateVarsAndTriggers.size() > 0) {
+            for (var i = 0 ; i < this.stateVarsAndTriggers.size(); i++) {
+                code.pr("integer" + ((i == this.stateVarsAndTriggers.size() - 1) ? "" : ",") + "\t// " + this.stateVarsAndTriggers.get(i));
             }
         } else {
             code.pr(String.join("\n", 
@@ -457,17 +460,17 @@ protected void generateReactionIdsAndStateVars() {
         code.unindent();
         code.pr("};");
         code.pr("// State variable projection macros");
-        for (var i = 0; i < this.stateVarNames.size(); i++) {
-            code.pr("define " + this.stateVarNames.get(i) + "(s : state_t) : integer = s._" + i + ";");
+        for (var i = 0; i < this.stateVarsAndTriggers.size(); i++) {
+            code.pr("define " + this.stateVarsAndTriggers.get(i).getFullNameWithJoiner("_") + "(s : state_t) : integer = s._" + (i+1) + ";");
         }
         code.pr("\n"); // Newline
 
         // A boolean tuple indicating whether triggers are present.
         code.pr("type trigger_t = {");
         code.indent();
-        if (this.triggerNames.size() > 0) {
-            for (var i = 0 ; i < this.triggerNames.size(); i++) {
-                code.pr("boolean" + ((i++ == this.triggerNames.size() - 1) ? "" : ",") + "// " + this.stateVarNames.get(i));
+        if (this.triggers.size() > 0) {
+            for (var i = 0 ; i < this.triggers.size(); i++) {
+                code.pr("boolean" + ((i == this.triggers.size() - 1) ? "" : ",") + "\t// " + this.triggers.get(i));
             }
         } else {
             code.pr(String.join("\n", 
@@ -479,8 +482,8 @@ protected void generateReactionIdsAndStateVars() {
         code.unindent();
         code.pr("};");
         code.pr("// Trigger presence projection macros");
-        for (var i = 0; i < this.triggerPresence.size(); i++) {
-            code.pr("define " + this.triggerPresence.get(i) + "(t : trigger_t) : boolean = t._" + i + ";");
+        for (var i = 0; i < this.triggers.size(); i++) {
+            code.pr("define " + this.triggers.get(i).getFullNameWithJoiner("_") + "_is_present" + "(t : trigger_t) : boolean = t._" + (i+1) + ";");
         }
     }
 
@@ -656,21 +659,20 @@ protected void generateInitialConditions() {
             "/*********************",
             " * Initial Condition *",
             " *********************/",
-            "// FIXME: add template",
             "define initial_condition() : boolean",
             "= start_time == 0",
             "    && rxn(0) == NULL",
             "    && g(0) == {0, 0}"
         ));
         code.indent();
-        for (var v : this.stateVarNames) {
+        for (var v : this.stateVariables) {
             code.pr("&& " + v + "(s(0)) == 0");
         }
-        for (var t : this.triggerPresence) {
-            code.pr("&& !" + t + "(t(0))");
+        for (var t : this.triggers) {
+            code.pr("&& !" + t.getFullNameWithJoiner("_") + "_is_present" + "(t(0))");
         }
-        code.pr(";");
         code.unindent();
+        code.pr(";\n");
     }
 
     /**
@@ -757,13 +759,36 @@ private void populateDataStructures() {
         
         // Collect reactions from the reaction graph.
         this.reactionInstances = this.reactionInstanceGraph.nodes();
+
+        // Populate lists
+        populateLists(this.main);
+
+        // Join state variables and triggers
+        this.stateVarsAndTriggers = new ArrayList<NamedInstance>(this.stateVariables);
+        stateVarsAndTriggers.addAll(this.triggers);
     }
 
-    private void populateStateVarsAndTriggers(ReactorInstance reactor) {
+    private void populateLists(ReactorInstance reactor) {
+        // State variables, actions, ports, timers.
         for (var state : reactor.states) {
             this.stateVariables.add(state);
         }
-        // ... ports, actions, timers
+        for (var action : reactor.actions) {
+            this.triggers.add(action);
+        }
+        for (var port : reactor.inputs) {
+            this.triggers.add(port);
+        }
+        for (var port : reactor.outputs) {
+            this.triggers.add(port);
+        }
+        for (var timer : reactor.timers) {
+            this.triggers.add(timer);
+        }
+        // Recursion
+        for (var child : reactor.children) {
+            populateLists(child);
+        }
     }
 
     /////////////////////////////////////////////////

From 7bba94a3271c9722687c9271be0389436424c5ca Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 1 Jul 2022 00:44:59 -0400
Subject: [PATCH 0016/1114] Remove dead code

---
 .../generator/uclid/UclidGenerator.java       | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 6cc7d68704..3e93606d83 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -616,31 +616,12 @@ protected void generateTriggersAndReactions() {
                 // the other reactions are excluded (not invoked),
                 // to preserve the interleaving semantics.
                 String exclusion = "";
-
-                // If the current reaction is in a bank, then we need to
-                // exclude other bank member reactions. We are still deadling
-                // with once ReactionInstance here.
-                // if (reaction.getReaction().getParent().isBank()) {
-                //     // Exclude other bank member reactions triggered by this trigger.
-                //     for (var runtime : reaction.getReaction().getRuntimeInstances()) {
-                //         if (runtime == reaction) continue; // Skip the current reaction.
-                //         exclusion += " && rxn(i) != " + runtime.getFullNameWithJoiner("_");
-                //     }
-                // }
-
-                // FIXME: Check if the case above can be merged into the case below.
-                // And if the trigger triggers another ReactionInstance,
-                // then we need to retrieve all runtime instances in that
-                // ReactionInstance and exclude them.
-                // if (trigger.getDependentReactions().size() > 1) {
-                // Exclude all reactions from other dependent reactions.
                 for (var instance : trigger.getDependentReactions()) {
                     for (var runtime : ((ReactionInstance)instance).getRuntimeInstances()) {
                         if (runtime == reaction) continue; // Skip the current reaction.
                         exclusion += " && rxn(i) != " + runtime.getFullNameWithJoiner("_");
                     }
                 }
-                // }
                 
                 code.pr("|| (" + triggerPresentStr + exclusion + ")");
             }

From 1e8e401475f683f5e260a75f12e30db68d471c3a Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 1 Jul 2022 11:33:57 -0400
Subject: [PATCH 0017/1114] Finish generating actions

---
 .../generator/uclid/UclidGenerator.java       | 142 ++++++++++++------
 1 file changed, 100 insertions(+), 42 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 3e93606d83..20d906f4ac 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -39,20 +39,23 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.Exceptions;
-
+import org.lflang.generator.ActionInstance;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.GeneratorBase;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.NamedInstance;
+import org.lflang.generator.PortInstance;
 import org.lflang.generator.ReactionInstance;
 import org.lflang.generator.ReactionInstanceGraph;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.generator.StateVariableInstance;
 import org.lflang.generator.TargetTypes;
+import org.lflang.generator.TimerInstance;
 import org.lflang.generator.TriggerInstance;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.Target;
+import org.lflang.TimeValue;
 import org.lflang.lf.Action;
 import org.lflang.lf.VarRef;
 
@@ -69,20 +72,27 @@ public class UclidGenerator extends GeneratorBase {
     // The reaction graph upon which the causality graph is built
     ReactionInstanceGraph reactionInstanceGraph;
 
-    // FIXME: How to elegantly populate them?
-    // String lists storing variable names of different types
-    List<StateVariableInstance> stateVariables = new LinkedList<StateVariableInstance>();
-    List<TriggerInstance> triggers = new LinkedList<TriggerInstance>();
-    List<NamedInstance> stateVarsAndTriggers;
+    // State variables in the system
+    List<StateVariableInstance> stateVariables      = new ArrayList<StateVariableInstance>();
+    
+    // Triggers in the system
+    List<ActionInstance>        actionInstances     = new ArrayList<ActionInstance>();
+    List<PortInstance>          portInstances       = new ArrayList<PortInstance>();
+    List<TimerInstance>         timerInstances      = new ArrayList<TimerInstance>();
+    
+    // Joint lists of the lists above.
+    // FIXME: This approach currently creates duplications in memory.
+    List<TriggerInstance>       triggerInstances;   // Triggers = ports + actions + timers
+    List<NamedInstance>         namedInstances;     // Named instances = triggers + state variables
 
     // Data structures for storing properties
-    List<String> properties         = new ArrayList<String>();
+    List<String> properties     = new ArrayList<String>();
 
     ////////////////////////////////////////////
     //// Protected fields
 
     /** The main place to put generated code. */
-    protected CodeBuilder code = new CodeBuilder();
+    protected CodeBuilder code  = new CodeBuilder();
 
     // Constructor
     public UclidGenerator(FileConfig fileConfig, ErrorReporter errorReporter) {
@@ -109,7 +119,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         // Extract information from the named instances.
         populateDataStructures();
         System.out.println(this.stateVariables);
-        System.out.println(this.triggers);
+        System.out.println(this.triggerInstances);
 
         // Create the src-gen directory
         setUpDirectories();
@@ -372,29 +382,29 @@ protected void generateTraceDefinition(int CT) {
         ));
 
         // Define a tuple getter.
-        // FIXME: Support this in Uclid.
+        // FIXME: Support this feature in Uclid.
         String initialStates = "";
-        String initialTriggers = "";
-        if (this.stateVarsAndTriggers.size() > 0) {
-            initialStates = "0, ".repeat(this.stateVarsAndTriggers.size());
-            initialStates = initialStates.substring(0, initialStates.length() - 2);
+        String initialTriggerPresence = "";
+        if (this.namedInstances.size() > 0) {
+            initialStates = "0, ".repeat(this.namedInstances.size());
+            initialStates = initialStates.substring(0, initialStates.length()-2);
         } else {
             // Initialize a dummy variable just to make the code compile.
             initialStates = "0";
         }
-        if (this.stateVarsAndTriggers.size() > 0) {
-            initialTriggers = "false, ".repeat(this.stateVarsAndTriggers.size());
-            initialTriggers = initialTriggers.substring(0, initialTriggers.length() - 2);
+        if (this.triggerInstances.size() > 0) {
+            initialTriggerPresence = "false, ".repeat(this.triggerInstances.size());
+            initialTriggerPresence = initialTriggerPresence.substring(0, initialTriggerPresence.length()-2);
         } else {
             // Initialize a dummy variable just to make the code compile.
-            initialTriggers = "false";
+            initialTriggerPresence = "false";
         }
         code.pr("// Helper macro that returns an element based on index.");
         code.pr("define get(tr : trace_t, i : step_t) : event_t =");
         for (int i = 0; i < CT; i++) {
             code.pr("if (i == " + String.valueOf(i) + ") then tr._" + String.valueOf(i+1) + " else (");
         }
-        code.pr("{ NULL, inf(), { " + initialStates + " }, { " + initialTriggers + " } }");
+        code.pr("{ NULL, inf(), { " + initialStates + " }, { " + initialTriggerPresence + " } }");
         code.pr(")".repeat(CT) + ";\n");
 
         // Define an event getter from the trace.
@@ -446,9 +456,9 @@ protected void generateReactionIdsAndStateVars() {
         // FIXME: expand to data types other than integer
         code.pr("type state_t = {");
         code.indent();
-        if (this.stateVarsAndTriggers.size() > 0) {
-            for (var i = 0 ; i < this.stateVarsAndTriggers.size(); i++) {
-                code.pr("integer" + ((i == this.stateVarsAndTriggers.size() - 1) ? "" : ",") + "\t// " + this.stateVarsAndTriggers.get(i));
+        if (this.namedInstances.size() > 0) {
+            for (var i = 0 ; i < this.namedInstances.size(); i++) {
+                code.pr("integer" + ((i == this.namedInstances.size() - 1) ? "" : ",") + "\t// " + this.namedInstances.get(i));
             }
         } else {
             code.pr(String.join("\n", 
@@ -460,17 +470,17 @@ protected void generateReactionIdsAndStateVars() {
         code.unindent();
         code.pr("};");
         code.pr("// State variable projection macros");
-        for (var i = 0; i < this.stateVarsAndTriggers.size(); i++) {
-            code.pr("define " + this.stateVarsAndTriggers.get(i).getFullNameWithJoiner("_") + "(s : state_t) : integer = s._" + (i+1) + ";");
+        for (var i = 0; i < this.namedInstances.size(); i++) {
+            code.pr("define " + this.namedInstances.get(i).getFullNameWithJoiner("_") + "(s : state_t) : integer = s._" + (i+1) + ";");
         }
         code.pr("\n"); // Newline
 
         // A boolean tuple indicating whether triggers are present.
         code.pr("type trigger_t = {");
         code.indent();
-        if (this.triggers.size() > 0) {
-            for (var i = 0 ; i < this.triggers.size(); i++) {
-                code.pr("boolean" + ((i == this.triggers.size() - 1) ? "" : ",") + "\t// " + this.triggers.get(i));
+        if (this.triggerInstances.size() > 0) {
+            for (var i = 0 ; i < this.triggerInstances.size(); i++) {
+                code.pr("boolean" + ((i == this.triggerInstances.size() - 1) ? "" : ",") + "\t// " + this.triggerInstances.get(i));
             }
         } else {
             code.pr(String.join("\n", 
@@ -482,8 +492,8 @@ protected void generateReactionIdsAndStateVars() {
         code.unindent();
         code.pr("};");
         code.pr("// Trigger presence projection macros");
-        for (var i = 0; i < this.triggers.size(); i++) {
-            code.pr("define " + this.triggers.get(i).getFullNameWithJoiner("_") + "_is_present" + "(t : trigger_t) : boolean = t._" + (i+1) + ";");
+        for (var i = 0; i < this.triggerInstances.size(); i++) {
+            code.pr("define " + this.triggerInstances.get(i).getFullNameWithJoiner("_") + "_is_present" + "(t : trigger_t) : boolean = t._" + (i+1) + ";");
         }
     }
 
@@ -561,12 +571,55 @@ protected void generateReactorSemantics() {
     // Previously called pr_connections_and_actions()
     protected void generateTriggersAndReactions() {
         code.pr(String.join("\n", 
-            "/***************************",
-            " * Connections and Actions *",
-            " ***************************/"
+            "/***************",
+            " * Connections *",
+            " ***************/"
         ));
-        // For each reaction, generate axioms for its triggers.
-        // for (var rxn : this.reactionInstances) {}
+
+        if (this.actionInstances.size() > 0) {
+            code.pr(String.join("\n", 
+            "/***********",
+            " * Actions *",
+            " ***********/"
+            ));
+            for (var action : this.actionInstances) {
+                Set<ReactionInstance> dependsOnReactions = action.getDependsOnReactions();
+                String comment = "If " + action.getFullNameWithJoiner("_")
+                                    + " is present, these reactions could schedule it: ";
+                String triggerStr = "";
+                for (var reaction : dependsOnReactions) {
+                    comment += reaction.getFullNameWithJoiner("_") + ", ";
+                    triggerStr += String.join("\n", 
+                        "// " + reaction.getFullNameWithJoiner("_"),
+                        "&& (" + action.getFullNameWithJoiner("_") + "_is_present(t(i)) ==> (",
+                        "    finite_exists (j : integer) in indices :: j >= START && j < i",
+                        "    && rxn(j) == " + reaction.getFullNameWithJoiner("_"),
+                        "    && g(i) == tag_schedule(g(j), "
+                            + (action.getMinDelay() == TimeValue.ZERO ? "mstep()" : "nsec(" + action.getMinDelay().toNanoSeconds() + ")") + ")"
+                    );
+                }
+
+                // After populating the string segments,
+                // print the generated code string.
+                code.pr(String.join("\n", 
+                    comment,
+                    "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> ( true",
+                    triggerStr,
+                    "))"
+                ));
+
+                // If the action is not present, then its value resets to 0.
+                // FIXME: Check if this works in practice.
+                code.pr(String.join("\n", 
+                    "// If " + action.getFullNameWithJoiner("_") + "  is not present, then its value resets to 0.",
+                    "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
+                    "    (!" + action.getFullNameWithJoiner("_") + "_is_present(t(i)) ==> (",
+                    "        " + action.getFullNameWithJoiner("_") + "(s(i)) == 0",
+                    "    ))",
+                    "))"
+                ));
+            }
+        }
 
         // FIXME: Factor the startup trigger here as well.
         // code.pr(String.join("\n", 
@@ -649,7 +702,7 @@ protected void generateInitialConditions() {
         for (var v : this.stateVariables) {
             code.pr("&& " + v + "(s(0)) == 0");
         }
-        for (var t : this.triggers) {
+        for (var t : this.triggerInstances) {
             code.pr("&& !" + t.getFullNameWithJoiner("_") + "_is_present" + "(t(0))");
         }
         code.unindent();
@@ -741,12 +794,17 @@ private void populateDataStructures() {
         // Collect reactions from the reaction graph.
         this.reactionInstances = this.reactionInstanceGraph.nodes();
 
-        // Populate lists
+        // Populate lists of state variables, actions, ports, and timers.
         populateLists(this.main);
 
+        // Join actions, ports, and timers into a list of triggers.
+        this.triggerInstances = new ArrayList<TriggerInstance>(this.actionInstances);
+        this.triggerInstances.addAll(portInstances);
+        this.triggerInstances.addAll(timerInstances);
+
         // Join state variables and triggers
-        this.stateVarsAndTriggers = new ArrayList<NamedInstance>(this.stateVariables);
-        stateVarsAndTriggers.addAll(this.triggers);
+        this.namedInstances = new ArrayList<NamedInstance>(this.stateVariables);
+        namedInstances.addAll(this.triggerInstances);
     }
 
     private void populateLists(ReactorInstance reactor) {
@@ -755,16 +813,16 @@ private void populateLists(ReactorInstance reactor) {
             this.stateVariables.add(state);
         }
         for (var action : reactor.actions) {
-            this.triggers.add(action);
+            this.actionInstances.add(action);
         }
         for (var port : reactor.inputs) {
-            this.triggers.add(port);
+            this.portInstances.add(port);
         }
         for (var port : reactor.outputs) {
-            this.triggers.add(port);
+            this.portInstances.add(port);
         }
         for (var timer : reactor.timers) {
-            this.triggers.add(timer);
+            this.timerInstances.add(timer);
         }
         // Recursion
         for (var child : reactor.children) {

From 49d11e3157fc570452660457def8bcb0dff903ba Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 1 Jul 2022 15:53:20 -0400
Subject: [PATCH 0018/1114] Deprecate reaction instance graph

---
 .../generator/uclid/UclidGenerator.java       | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 20d906f4ac..283d3ca6f5 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -67,10 +67,8 @@ public class UclidGenerator extends GeneratorBase {
     //// Private variables
 
     // Data structures for storing info about the runtime instances.
-    Set<ReactionInstance.Runtime> reactionInstances;
-
-    // The reaction graph upon which the causality graph is built
-    ReactionInstanceGraph reactionInstanceGraph;
+    List<ReactorInstance> reactorInstances           = new ArrayList<ReactorInstance>();
+    List<ReactionInstance.Runtime> reactionInstances = new ArrayList<ReactionInstance.Runtime>();
 
     // State variables in the system
     List<StateVariableInstance> stateVariables      = new ArrayList<StateVariableInstance>();
@@ -551,14 +549,15 @@ protected void generateReactorSemantics() {
         ));
         code.indent();
         // Get happen-before relation between two reactions.
-        // FIXME: Can we get this from the reaction instance graph?
         code.pr("|| (tag_same(e1._2, e2._2) && ( false");
         // Iterate over every pair of reactions.
-        for (var upstream : this.reactionInstanceGraph.nodes()) {
-            var downstreamList = this.reactionInstanceGraph
-                                    .getDownstreamAdjacentNodes(upstream);
-            for (var downstream : downstreamList) {
-                code.pr("|| (e1._1 == " + upstream.getFullNameWithJoiner("_") + " && e2._1 == " + downstream.getFullNameWithJoiner("_") + ")");
+        for (var upstreamRuntime : this.reactionInstances) {
+            var downstreamReactions = upstreamRuntime.getReaction().dependentReactions();
+            for (var downstream : downstreamReactions) {
+                for (var downstreamRuntime : downstream.getRuntimeInstances()) {
+                    code.pr("|| (e1._1 == " + upstreamRuntime.getFullNameWithJoiner("_")
+                            + " && e2._1 == " + downstreamRuntime.getFullNameWithJoiner("_") + ")");
+                }
             }
         }
         code.unindent();
@@ -575,6 +574,11 @@ protected void generateTriggersAndReactions() {
             " * Connections *",
             " ***************/"
         ));
+        // Generate a set of constraints for each pair of ports connected.
+        // Iterate over the list of reactors, find the set of all pairs of
+        // port instances that are connected, and produce an axiom for each pair.
+        // FIXME: Support banks and multiports. Figure out how to work with ranges.
+
 
         if (this.actionInstances.size() > 0) {
             code.pr(String.join("\n", 
@@ -789,12 +793,13 @@ private void setUpDirectories() {
      */
     private void populateDataStructures() {
         // Construct graphs
-        this.reactionInstanceGraph = new ReactionInstanceGraph(this.main, false);
+        // this.reactionInstanceGraph = new ReactionInstanceGraph(this.main, false);
         
         // Collect reactions from the reaction graph.
-        this.reactionInstances = this.reactionInstanceGraph.nodes();
+        // this.reactionInstances = this.reactionInstanceGraph.nodes();
 
-        // Populate lists of state variables, actions, ports, and timers.
+        // Populate lists of reactor/reaction instances,
+        // state variables, actions, ports, and timers.
         populateLists(this.main);
 
         // Join actions, ports, and timers into a list of triggers.
@@ -808,6 +813,12 @@ private void populateDataStructures() {
     }
 
     private void populateLists(ReactorInstance reactor) {
+        // Reactor and reaction instances
+        this.reactorInstances.add(reactor);
+        for (var reaction : reactor.reactions) {
+            this.reactionInstances.addAll(reaction.getRuntimeInstances());
+        }
+
         // State variables, actions, ports, timers.
         for (var state : reactor.states) {
             this.stateVariables.add(state);

From 646ba727a4f7a89ed788b28051401e23df289f0f Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 1 Jul 2022 20:05:13 -0400
Subject: [PATCH 0019/1114] Generate connections

---
 .../generator/uclid/UclidGenerator.java       | 96 ++++++++++++++++---
 1 file changed, 85 insertions(+), 11 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 283d3ca6f5..5499ab8511 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -33,6 +33,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.nio.file.Files;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -48,15 +49,22 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.generator.ReactionInstance;
 import org.lflang.generator.ReactionInstanceGraph;
 import org.lflang.generator.ReactorInstance;
+import org.lflang.generator.RuntimeRange;
+import org.lflang.generator.SendRange;
 import org.lflang.generator.StateVariableInstance;
 import org.lflang.generator.TargetTypes;
 import org.lflang.generator.TimerInstance;
 import org.lflang.generator.TriggerInstance;
+import org.lflang.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.Target;
+import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.lf.Action;
+import org.lflang.lf.Connection;
+import org.lflang.lf.Expression;
+import org.lflang.lf.Time;
 import org.lflang.lf.VarRef;
 
 import static org.lflang.ASTUtils.*;
@@ -574,11 +582,83 @@ protected void generateTriggersAndReactions() {
             " * Connections *",
             " ***************/"
         ));
-        // Generate a set of constraints for each pair of ports connected.
-        // Iterate over the list of reactors, find the set of all pairs of
-        // port instances that are connected, and produce an axiom for each pair.
         // FIXME: Support banks and multiports. Figure out how to work with ranges.
+        // Iterate over all the ports. Generate an axiom for each connection
+        // (i.e. a pair of input-output ports).
+        // A "range" holds the connection information.
+        // See connectPortInstances() in ReactorInstance.java for more details.
+        for (var port : this.portInstances) {
+            for (SendRange range : port.getDependentPorts()) {
+                PortInstance source = range.instance;
+                Connection connection = range.connection;
+                List<RuntimeRange<PortInstance>> destinations = range.destinations;
+                
+                // Extract delay value
+                long delay = 0;
+                if (connection.getDelay() != null) {
+                    // Somehow delay is an Expression,
+                    // which makes it hard to convert to nanoseconds.
+                    Expression delayExpr = connection.getDelay();
+                    if (delayExpr instanceof Time) {
+                        long interval = ((Time) delayExpr).getInterval();
+                        String unit = ((Time) delayExpr).getUnit();
+                        TimeValue timeValue = new TimeValue(interval, TimeUnit.fromName(unit));
+                        delay = timeValue.toNanoSeconds();
+                    }
+                }
 
+                for (var portRange : destinations) {
+                    var destination = portRange.instance;
+
+                    // We have extracted the source, destination, and connection AST node.
+                    // Now we are ready to generate an axiom for this triple.
+                    code.pr("// " + source.getFullNameWithJoiner("_") + " "
+                        + (connection.isPhysical() ? "~>" : "->") + " " 
+                        + destination.getFullNameWithJoiner("_"));
+                    code.pr("axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (");
+                    code.pr(String.join("\n", 
+                        "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
+                        "// If " + source.getFullNameWithJoiner("_") + " is present, then "
+                            + destination.getFullNameWithJoiner("_") + " will be present.",
+                        "// with the same value after some fixed delay of " + delay + " nanoseconds.",
+                        "(" + source.getFullNameWithJoiner("_") + "(t(i)) ==> ((",
+                        "    finite_exists (j : integer) in indices :: j > i && j <= END",
+                        "    && " + destination.getFullNameWithJoiner("_") + "_is_present(t(j))",
+                        "    && " + destination.getFullNameWithJoiner("_") + "(s(j)) == " + source.getFullNameWithJoiner("_") + "(s(i))",
+                        connection.isPhysical() ? "" : "&& g(j) == tag_schedule(g(i), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")",
+                        ")||(",
+                        // Relaxation axioms: a port presence can not produce a downstream presence
+                        // but it needs to guarantee that there are no trailing NULL events.
+                        // FIXME: !«downstreamPortIsPresent»(t(k)) makes the solver timeout.
+                        "(finite_forall (k : integer) in indices :: (k > i && k <= END) ==> (rxn(k) != NULL",
+                        "    && " + destination.getFullNameWithJoiner("_") + "(s(k)) == " + source.getFullNameWithJoiner("_") + "(s(i))",
+                        connection.isPhysical() ? "" : "    && (tag_same(g(k), tag_schedule(g(i), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")) || tag_earlier(g(k), tag_schedule(g(i), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")))",
+                        ")) // Closes forall.",
+                        ")  // Closes ||",
+                        ")) // Closes (" + source.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> ((.",
+                        "// If " + destination.getFullNameWithJoiner("_") + " is present, there exists an " + source.getFullNameWithJoiner("_") + " in prior steps.",
+                        "// This additional term establishes a one-to-one relationship between two ports' signals.",
+                        "&& (" + destination.getFullNameWithJoiner("_") + "(t(i)) ==> (",
+                        "    finite_exists (j : integer) in indices :: j >= START && j < i",
+                        "    && " + source.getFullNameWithJoiner("_") + "(t(j))",
+                        connection.isPhysical() ? "" : "    && g(i) == tag_schedule(g(j), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")",
+                        ")) // Closes the one-to-one relationship.",
+                        "));"
+                    ));
+
+                    // If destination is not present, then its value resets to 0.
+                    // FIXME: Check if this works in practice.
+                    code.pr(String.join("\n", 
+                        "// If " + destination.getFullNameWithJoiner("_") + "  is not present, then its value resets to 0.",
+                        "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
+                        "    (!" + destination.getFullNameWithJoiner("_") + "_is_present(t(i)) ==> (",
+                        "        " + destination.getFullNameWithJoiner("_") + "(s(i)) == 0",
+                        "    ))",
+                        "));"
+                    ));
+                }
+            }
+        }
 
         if (this.actionInstances.size() > 0) {
             code.pr(String.join("\n", 
@@ -609,7 +689,7 @@ protected void generateTriggersAndReactions() {
                     comment,
                     "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> ( true",
                     triggerStr,
-                    "))"
+                    "));"
                 ));
 
                 // If the action is not present, then its value resets to 0.
@@ -620,7 +700,7 @@ protected void generateTriggersAndReactions() {
                     "    (!" + action.getFullNameWithJoiner("_") + "_is_present(t(i)) ==> (",
                     "        " + action.getFullNameWithJoiner("_") + "(s(i)) == 0",
                     "    ))",
-                    "))"
+                    "));"
                 ));
             }
         }
@@ -792,12 +872,6 @@ private void setUpDirectories() {
      * Populate the data structures.
      */
     private void populateDataStructures() {
-        // Construct graphs
-        // this.reactionInstanceGraph = new ReactionInstanceGraph(this.main, false);
-        
-        // Collect reactions from the reaction graph.
-        // this.reactionInstances = this.reactionInstanceGraph.nodes();
-
         // Populate lists of reactor/reaction instances,
         // state variables, actions, ports, and timers.
         populateLists(this.main);

From 13db2db16f6d71e11fe5ce859934c0ab8f04c670 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sat, 2 Jul 2022 13:08:25 -0400
Subject: [PATCH 0020/1114] Bug fix

---
 .../generator/uclid/UclidGenerator.java       | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 5499ab8511..1b318b6ffc 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -615,15 +615,14 @@ protected void generateTriggersAndReactions() {
                     code.pr("// " + source.getFullNameWithJoiner("_") + " "
                         + (connection.isPhysical() ? "~>" : "->") + " " 
                         + destination.getFullNameWithJoiner("_"));
-                    code.pr("axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (");
                     code.pr(String.join("\n", 
                         "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
                         "// If " + source.getFullNameWithJoiner("_") + " is present, then "
                             + destination.getFullNameWithJoiner("_") + " will be present.",
                         "// with the same value after some fixed delay of " + delay + " nanoseconds.",
-                        "(" + source.getFullNameWithJoiner("_") + "(t(i)) ==> ((",
+                        "(" + source.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> ((",
                         "    finite_exists (j : integer) in indices :: j > i && j <= END",
-                        "    && " + destination.getFullNameWithJoiner("_") + "_is_present(t(j))",
+                        "    && " + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(j))",
                         "    && " + destination.getFullNameWithJoiner("_") + "(s(j)) == " + source.getFullNameWithJoiner("_") + "(s(i))",
                         connection.isPhysical() ? "" : "&& g(j) == tag_schedule(g(i), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")",
                         ")||(",
@@ -638,9 +637,9 @@ protected void generateTriggersAndReactions() {
                         ")) // Closes (" + source.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> ((.",
                         "// If " + destination.getFullNameWithJoiner("_") + " is present, there exists an " + source.getFullNameWithJoiner("_") + " in prior steps.",
                         "// This additional term establishes a one-to-one relationship between two ports' signals.",
-                        "&& (" + destination.getFullNameWithJoiner("_") + "(t(i)) ==> (",
+                        "&& (" + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
                         "    finite_exists (j : integer) in indices :: j >= START && j < i",
-                        "    && " + source.getFullNameWithJoiner("_") + "(t(j))",
+                        "    && " + source.getFullNameWithJoiner("_") + "_is_present" + "(t(j))",
                         connection.isPhysical() ? "" : "    && g(i) == tag_schedule(g(j), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")",
                         ")) // Closes the one-to-one relationship.",
                         "));"
@@ -649,9 +648,9 @@ protected void generateTriggersAndReactions() {
                     // If destination is not present, then its value resets to 0.
                     // FIXME: Check if this works in practice.
                     code.pr(String.join("\n", 
-                        "// If " + destination.getFullNameWithJoiner("_") + "  is not present, then its value resets to 0.",
+                        "// If " + destination.getFullNameWithJoiner("_") + " is not present, then its value resets to 0.",
                         "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
-                        "    (!" + destination.getFullNameWithJoiner("_") + "_is_present(t(i)) ==> (",
+                        "    (!" + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
                         "        " + destination.getFullNameWithJoiner("_") + "(s(i)) == 0",
                         "    ))",
                         "));"
@@ -675,7 +674,7 @@ protected void generateTriggersAndReactions() {
                     comment += reaction.getFullNameWithJoiner("_") + ", ";
                     triggerStr += String.join("\n", 
                         "// " + reaction.getFullNameWithJoiner("_"),
-                        "&& (" + action.getFullNameWithJoiner("_") + "_is_present(t(i)) ==> (",
+                        "&& (" + action.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
                         "    finite_exists (j : integer) in indices :: j >= START && j < i",
                         "    && rxn(j) == " + reaction.getFullNameWithJoiner("_"),
                         "    && g(i) == tag_schedule(g(j), "
@@ -697,7 +696,7 @@ protected void generateTriggersAndReactions() {
                 code.pr(String.join("\n", 
                     "// If " + action.getFullNameWithJoiner("_") + "  is not present, then its value resets to 0.",
                     "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
-                    "    (!" + action.getFullNameWithJoiner("_") + "_is_present(t(i)) ==> (",
+                    "    (!" + action.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
                     "        " + action.getFullNameWithJoiner("_") + "(s(i)) == 0",
                     "    ))",
                     "));"
@@ -745,7 +744,7 @@ protected void generateTriggersAndReactions() {
                 }
                 else {
                     // If the trigger is a port/action/timer.
-                    triggerPresentStr = trigger.getFullNameWithJoiner("_") + "_is_present(t(i))";
+                    triggerPresentStr = trigger.getFullNameWithJoiner("_") + "_is_present" + "(t(i))";
                 }
 
                 // Check if the trigger triggers other reactions.

From 60c57009e2571d5a8227e80b4ea905e34b104604 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sat, 2 Jul 2022 15:24:52 -0400
Subject: [PATCH 0021/1114] Start a C subset target

---
 org.lflang/src/org/lflang/Target.java               |  6 +++---
 .../src/org/lflang/generator/LFGenerator.java       |  2 +-
 .../org/lflang/generator/uclid/UclidGenerator.java  | 13 +++++++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/org.lflang/src/org/lflang/Target.java b/org.lflang/src/org/lflang/Target.java
index 9b759425c3..fad20495bb 100644
--- a/org.lflang/src/org/lflang/Target.java
+++ b/org.lflang/src/org/lflang/Target.java
@@ -351,7 +351,7 @@ public enum Target {
          // with the syntax r#keyword.
          Arrays.asList("self", "true", "false")
     ),
-    Uclid("Uclid", true,
+    CS("CS", true,
          // Use an empty list as a placeholder.
          Arrays.asList("")
     );
@@ -478,7 +478,7 @@ public boolean supportsMultiports() {
         case Python:
         case Rust:
         case TS:
-        case Uclid:
+        case CS:
             return true;
         }
         return false;
@@ -498,7 +498,7 @@ public boolean supportsParameterizedWidths() {
         case Python:
         case Rust:
         case TS:
-        case Uclid:
+        case CS:
             return true;
         }
         return false;
diff --git a/org.lflang/src/org/lflang/generator/LFGenerator.java b/org.lflang/src/org/lflang/generator/LFGenerator.java
index c8763a19ec..069940d745 100644
--- a/org.lflang/src/org/lflang/generator/LFGenerator.java
+++ b/org.lflang/src/org/lflang/generator/LFGenerator.java
@@ -93,7 +93,7 @@ private GeneratorBase createGenerator(Target target, FileConfig fileConfig, Erro
         case TS:
         case Rust:
             return createKotlinBaseGenerator(target, fileConfig, errorReporter);
-        case Uclid: return new UclidGenerator(fileConfig, errorReporter);
+        case CS: return new UclidGenerator(fileConfig, errorReporter);
         }
         // If no case matched, then throw a runtime exception.
         throw new RuntimeException("Unexpected target!");
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 1b318b6ffc..b3c51e2f2a 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -231,7 +231,7 @@ protected void generateUclidCode(int CT) {
         // generateReactionAbstractions();
 
         // FIXME: Properties
-        // generateProperties();
+        generateProperty();
 
         // Control block
         generateControlBlock();
@@ -806,6 +806,15 @@ protected void generateInitialConditions() {
 
     // }
 
+    protected void generateProperty() {
+        code.pr(String.join("\n", 
+            "/************",
+            " * Property *",
+            " ************/"
+        ));
+
+    }
+
     /**
      * FIXME
      */
@@ -919,7 +928,7 @@ private void populateLists(ReactorInstance reactor) {
     
     @Override
     public Target getTarget() {
-        return Target.C; // FIXME: How to make this target independent? Target.ALL does not work.
+        return Target.CS; // CS stands for "C Subset."
     }
      
     @Override

From 8baa6689666ad47d3936da862abdbc1a3b3a028c Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sat, 2 Jul 2022 15:53:14 -0400
Subject: [PATCH 0022/1114] Remove the super.doGenerate() call.

---
 .../src/org/lflang/generator/GeneratorBase.java      |  2 +-
 .../org/lflang/generator/uclid/UclidGenerator.java   | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/GeneratorBase.java b/org.lflang/src/org/lflang/generator/GeneratorBase.java
index debfcd8334..ec9a6085f4 100644
--- a/org.lflang/src/org/lflang/generator/GeneratorBase.java
+++ b/org.lflang/src/org/lflang/generator/GeneratorBase.java
@@ -269,7 +269,7 @@ public Reactor findDelayClass(String className) {
      * If there is a main or federated reactor, then create a synthetic Instantiation
      * for that top-level reactor and set the field mainDef to refer to it.
      */
-    private void createMainInstantiation() {
+    protected void createMainInstantiation() {
         // Find the main reactor and create an AST node for its instantiation.
         Iterable<EObject> nodes = IteratorExtensions.toIterable(fileConfig.resource.getAllContents());
         for (Reactor reactor : Iterables.filter(nodes, Reactor.class)) {
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index b3c51e2f2a..191e03d178 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -43,6 +43,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.GeneratorBase;
+import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.NamedInstance;
 import org.lflang.generator.PortInstance;
@@ -109,8 +110,15 @@ public UclidGenerator(FileConfig fileConfig, ErrorReporter errorReporter) {
     //// Public methods
     public void doGenerate(Resource resource, LFGeneratorContext context) {
         
-        // The following generates code needed by all the reactors.
-        super.doGenerate(resource, context);
+        // Inherit parts from super.doGenerate() to instantiate the main instance.
+        GeneratorUtils.setTargetConfig(
+            context, GeneratorUtils.findTarget(fileConfig.resource), targetConfig, errorReporter
+        );
+        super.cleanIfNeeded(context);
+        super.printInfo(context.getMode());
+        ASTUtils.setMainName(fileConfig.resource, fileConfig.name);
+        super.createMainInstantiation();
+        ////////////////////////////////////////
 
         // Check for the specified k-induction steps, otherwise defaults to 1.
         // FIXME: To enable.

From faa52031eed907e92bcfacbad8e0a3e6a8dafdfb Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sat, 2 Jul 2022 17:24:52 -0400
Subject: [PATCH 0023/1114] Remove the new target. Invoke the uclid generator
 when @property is in use.

---
 org.lflang/src/org/lflang/ASTUtils.java         | 14 ++++++++++++++
 org.lflang/src/org/lflang/Target.java           |  6 ------
 .../src/org/lflang/generator/LFGenerator.java   | 17 ++++++++++++++++-
 .../lflang/generator/uclid/UclidGenerator.java  |  2 +-
 .../org/lflang/validation/AttributeSpec.java    |  7 +++++++
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/org.lflang/src/org/lflang/ASTUtils.java b/org.lflang/src/org/lflang/ASTUtils.java
index dc15877879..45d466670a 100644
--- a/org.lflang/src/org/lflang/ASTUtils.java
+++ b/org.lflang/src/org/lflang/ASTUtils.java
@@ -144,6 +144,20 @@ public static Iterable<Reactor> getAllReactors(Resource resource) {
                      .collect(Collectors.toList());
     }
 
+    /**
+     * Get the main reactor defined in the given resource.
+     * @param resource the resource to extract reactors from
+     * @return An iterable over all reactors found in the resource
+     */
+    public static Reactor getMainReactor(Resource resource) {
+        return StreamSupport.stream(IteratorExtensions.toIterable(resource.getAllContents()).spliterator(), false)
+                    .filter(Reactor.class::isInstance)
+                    .map(Reactor.class::cast)
+                    .filter(it -> it.isMain())
+                    .findFirst()
+                    .get(); 
+    }
+
     /**
      * Find connections in the given resource that have a delay associated with them, 
      * and reroute them via a generated delay reactor.
diff --git a/org.lflang/src/org/lflang/Target.java b/org.lflang/src/org/lflang/Target.java
index fad20495bb..84a2711311 100644
--- a/org.lflang/src/org/lflang/Target.java
+++ b/org.lflang/src/org/lflang/Target.java
@@ -350,10 +350,6 @@ public enum Target {
          // are those that are a valid expression. Others may be escaped
          // with the syntax r#keyword.
          Arrays.asList("self", "true", "false")
-    ),
-    CS("CS", true,
-         // Use an empty list as a placeholder.
-         Arrays.asList("")
     );
 
     /**
@@ -478,7 +474,6 @@ public boolean supportsMultiports() {
         case Python:
         case Rust:
         case TS:
-        case CS:
             return true;
         }
         return false;
@@ -498,7 +493,6 @@ public boolean supportsParameterizedWidths() {
         case Python:
         case Rust:
         case TS:
-        case CS:
             return true;
         }
         return false;
diff --git a/org.lflang/src/org/lflang/generator/LFGenerator.java b/org.lflang/src/org/lflang/generator/LFGenerator.java
index 069940d745..6d2318099d 100644
--- a/org.lflang/src/org/lflang/generator/LFGenerator.java
+++ b/org.lflang/src/org/lflang/generator/LFGenerator.java
@@ -4,8 +4,10 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Path;
+import java.util.List;
 import java.util.Objects;
 
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.AbstractGenerator;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
@@ -13,12 +15,15 @@
 import org.eclipse.xtext.util.RuntimeIOException;
 
 import org.lflang.ASTUtils;
+import org.lflang.AttributeUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.Target;
 import org.lflang.generator.c.CGenerator;
 import org.lflang.generator.python.PythonGenerator;
 import org.lflang.generator.uclid.UclidGenerator;
+import org.lflang.lf.Attribute;
+import org.lflang.lf.Reactor;
 import org.lflang.scoping.LFGlobalScopeProvider;
 
 import com.google.inject.Inject;
@@ -93,7 +98,6 @@ private GeneratorBase createGenerator(Target target, FileConfig fileConfig, Erro
         case TS:
         case Rust:
             return createKotlinBaseGenerator(target, fileConfig, errorReporter);
-        case CS: return new UclidGenerator(fileConfig, errorReporter);
         }
         // If no case matched, then throw a runtime exception.
         throw new RuntimeException("Unexpected target!");
@@ -162,6 +166,17 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa,
         final ErrorReporter errorReporter = lfContext.constructErrorReporter(fileConfig);
         final GeneratorBase generator = createGenerator(target, fileConfig, errorReporter);
 
+        // Check if @property is used. If so, include UclidGenerator.
+        Reactor main = ASTUtils.getMainReactor(resource);
+        List<Attribute> attributes = AttributeUtils.getAttributes(main);
+        boolean propertyFound = 
+            attributes.stream()
+            .anyMatch(attr -> attr.getAttrName().equals("property"));
+        if (propertyFound) {
+            UclidGenerator uclidGenerator = new UclidGenerator(fileConfig, errorReporter);
+            uclidGenerator.doGenerate(resource, lfContext);
+        }
+
         if (generator != null) {
             generator.doGenerate(resource, lfContext);
             generatorErrorsOccurred = generator.errorsOccurred();
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 191e03d178..bc1c0c60a2 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -936,7 +936,7 @@ private void populateLists(ReactorInstance reactor) {
     
     @Override
     public Target getTarget() {
-        return Target.CS; // CS stands for "C Subset."
+        return Target.C; // Works with a C subset.
     }
      
     @Override
diff --git a/org.lflang/src/org/lflang/validation/AttributeSpec.java b/org.lflang/src/org/lflang/validation/AttributeSpec.java
index 766621e595..f64c678248 100644
--- a/org.lflang/src/org/lflang/validation/AttributeSpec.java
+++ b/org.lflang/src/org/lflang/validation/AttributeSpec.java
@@ -213,6 +213,13 @@ enum AttrParamType {
         // @icon("value")
         ATTRIBUTE_SPECS_BY_NAME.put("icon", new AttributeSpec(
             List.of(new AttrParamSpec(AttributeSpec.VALUE_ATTR, AttrParamType.STRING, null))
+        // @property(name="<property_name>", tactic="<induction|bmc>", spec="<LTLu_spec>")
+        ATTRIBUTE_SPECS_BY_NAME.put("property", new AttributeSpec(
+            List.of(
+                new AttrParamSpec("name", AttrParamType.STRING, null),
+                new AttrParamSpec("tactic", AttrParamType.STRING, null),
+                new AttrParamSpec("spec", AttrParamType.STRING, null)
+            )
         ));
     }
 }

From 7d79196c33b116fa99f9f0826dbe9e0141f23b0e Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sat, 2 Jul 2022 17:25:07 -0400
Subject: [PATCH 0024/1114] Add an instance class for state variables

---
 .../generator/StateVariableInstance.java      | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 org.lflang/src/org/lflang/generator/StateVariableInstance.java

diff --git a/org.lflang/src/org/lflang/generator/StateVariableInstance.java b/org.lflang/src/org/lflang/generator/StateVariableInstance.java
new file mode 100644
index 0000000000..9ec7163cac
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/StateVariableInstance.java
@@ -0,0 +1,79 @@
+/** A data structure for a state variable. */
+
+/*************
+Copyright (c) 2019-2022, The University of California at Berkeley.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+***************/
+package org.lflang.generator;
+
+import org.lflang.ErrorReporter;
+import org.lflang.lf.StateVar;
+
+/** 
+ * Representation of a compile-time instance of a state variable.
+ *  
+ * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ */
+public class StateVariableInstance extends NamedInstance<StateVar> {
+
+    /**
+     * Create a runtime instance from the specified definition
+     * and with the specified parent that instantiated it.
+     * @param definition The declaration in the AST.
+     * @param parent The parent.
+     */
+    public StateVariableInstance(StateVar definition, ReactorInstance parent) {
+        this(definition, parent, null);
+    }
+
+    /**
+     * Create a port instance from the specified definition
+     * and with the specified parent that instantiated it.
+     * @param definition The declaration in the AST.
+     * @param parent The parent.
+     * @param errorReporter An error reporter, or null to throw exceptions.
+     */
+    public StateVariableInstance(StateVar definition, ReactorInstance parent, ErrorReporter errorReporter) {
+        super(definition, parent);
+        
+        if (parent == null) {
+            throw new NullPointerException("Cannot create a StateVariableInstance with no parent.");
+        }        
+    }
+
+    //////////////////////////////////////////////////////
+    //// Public methods
+
+    /** 
+     * Return the name of this trigger. 
+     * @return The name of this trigger.
+     */
+    @Override
+    public String getName() {
+        return definition.getName();
+    }
+
+    @Override
+    public String toString() {
+        return "StateVariableInstance " + getFullName();
+    }
+}

From f194a0102100df433240563cb51420e96e84356d Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 6 Jul 2022 12:43:54 -0400
Subject: [PATCH 0025/1114] Add Antlr4 to the gradle project

---
 build.gradle                            | 11 +++-
 org.lflang/build.gradle                 | 18 ++++++
 org.lflang/src/main/antlr4/MTLLexer.g4  | 81 +++++++++++++++++++++++++
 org.lflang/src/main/antlr4/MTLParser.g4 | 55 +++++++++++++++++
 4 files changed, 164 insertions(+), 1 deletion(-)
 create mode 100644 org.lflang/src/main/antlr4/MTLLexer.g4
 create mode 100644 org.lflang/src/main/antlr4/MTLParser.g4

diff --git a/build.gradle b/build.gradle
index 6155f298d7..c011eb2c8c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,7 +43,6 @@ subprojects {
         implementation group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlinVersion
     }
 
-
     apply plugin: 'org.xtext.xtend'
     apply from: "${rootDir}/gradle/source-layout.gradle"
     apply plugin: 'eclipse'
@@ -63,6 +62,16 @@ subprojects {
         project.logger.info("Deleting ${projectDir}/src-gen")
         delete "${projectDir}/src-gen/"
     }
+
+    // Antlr4
+    configurations {
+        antlr4
+    }
+
+    dependencies {
+        antlr4 'org.antlr:antlr4:4.7.2'
+        implementation 'org.antlr:antlr4-runtime:4.7.2'
+    }
 }
 
 // Our CI uses --tests filters, which fails if some
diff --git a/org.lflang/build.gradle b/org.lflang/build.gradle
index a76e26f6fc..09bde4cb64 100644
--- a/org.lflang/build.gradle
+++ b/org.lflang/build.gradle
@@ -133,3 +133,21 @@ task runLff(type: JavaExec) {
     mainClass = 'org.lflang.cli.Lff'
     workingDir = '..'
 }
+
+// Add Antlr4 for various DSLs, including MTL for verification.
+task runAntlr4(type:JavaExec) {
+   //see incremental task api, prevents rerun if nothing has changed.
+   inputs.dir "$projectDir/src/main/antlr4/"
+   outputs.dir "$projectDir/build/generated/antlr/main/"
+
+   classpath = configurations.antlr4
+
+   main = "org.antlr.v4.Tool" 
+
+   args = [ "-visitor", 
+            "-o",  "$projectDir/build/generated/antlr/main/",  
+            "-package", "org.lflang",
+            "$projectDir/src/main/antlr4/MTLLexer.g4",
+            "$projectDir/src/main/antlr4/MTLParser.g4"]
+}
+compileJava.dependsOn(runAntlr4)
diff --git a/org.lflang/src/main/antlr4/MTLLexer.g4 b/org.lflang/src/main/antlr4/MTLLexer.g4
new file mode 100644
index 0000000000..c858809044
--- /dev/null
+++ b/org.lflang/src/main/antlr4/MTLLexer.g4
@@ -0,0 +1,81 @@
+lexer grammar MTLLexer;
+
+COMMA
+    : ','
+    ;
+
+LPAREN
+    : '('
+    ;
+
+RPAREN
+    : ')'
+    ;
+
+LBRACKET
+    : '['
+    ;
+
+RBRACKET
+    : ']'
+    ;
+
+LAND
+    : '&&'
+    ;
+
+LOR
+    : '||'
+    ;
+
+EQUI
+    : '<==>'
+    ;
+
+IMPL
+    : '==>'
+    ;
+
+UNTIL
+    : 'U'
+    ;
+
+NEGATION
+    : '!'
+    ;
+
+NEXT
+    : 'X'
+    ;
+
+GLOBALLY
+    : 'G'
+    ;
+
+FINALLY
+    : 'F'
+    ;
+
+WS
+    : [ \t\r\n]+ -> skip
+    ;
+
+TRUE
+    : 'true'
+    ;
+
+FALSE
+    : 'false'
+    ;
+
+ZERO
+    : '0'
+    ;
+
+INTEGER
+    : [0-9][0-9]*
+    ;
+
+ID
+    : ([a-zA-Z0-9]|'_')+
+    ;
\ No newline at end of file
diff --git a/org.lflang/src/main/antlr4/MTLParser.g4 b/org.lflang/src/main/antlr4/MTLParser.g4
new file mode 100644
index 0000000000..a9b84c04d2
--- /dev/null
+++ b/org.lflang/src/main/antlr4/MTLParser.g4
@@ -0,0 +1,55 @@
+parser grammar MTLParser;
+
+options { tokenVocab=MTLLexer; }
+
+mtl
+    : equivalence
+    ;
+
+equivalence
+    : left=implication ( EQUI right=implication )?
+    ;
+
+implication
+    : left=disjunction ( IMPL right=disjunction )?
+    ;
+
+disjunction
+    : terms+=conjunction ( LOR terms+=conjunction )*
+    ;
+
+conjunction
+    : terms+=binaryOp ( LAND terms+=binaryOp )*
+    ;
+
+binaryOp
+    : left=unaryOp (UNTIL timeInterval=interval right=unaryOp)?
+    ;
+
+unaryOp
+    : formula=primary # NoUnaryOp
+    | NEGATION formula=primary # Negation
+    | NEXT timeInterval=interval formula=primary # Next
+    | GLOBALLY timeInterval=interval formula=primary # Globally
+    | FINALLY timeInterval=interval formula=primary # Finally
+    ;
+
+primary
+    : atom=atomicProp
+    | id=ID
+    | LPAREN formula=mtl RPAREN
+    ;
+
+atomicProp
+    : primitive=TRUE
+    | primitive=FALSE
+    ;
+
+interval
+    : (LPAREN|LBRACKET) lowerbound=time COMMA upperbound=time (RPAREN|RBRACKET) # Range
+    | LBRACKET instant=time RBRACKET # Singleton
+    ;
+
+time
+    : (ZERO | value=INTEGER unit=ID)
+    ;

From 7c9274cf651f0c448a8864152c473c84b5c67ab1 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 6 Jul 2022 15:54:56 -0400
Subject: [PATCH 0026/1114] Move Antlr grammar

---
 org.lflang/build.gradle                              | 12 ++++++------
 .../src/{main => org/lflang/dsl}/antlr4/MTLLexer.g4  |  0
 .../src/{main => org/lflang/dsl}/antlr4/MTLParser.g4 |  0
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename org.lflang/src/{main => org/lflang/dsl}/antlr4/MTLLexer.g4 (100%)
 rename org.lflang/src/{main => org/lflang/dsl}/antlr4/MTLParser.g4 (100%)

diff --git a/org.lflang/build.gradle b/org.lflang/build.gradle
index 09bde4cb64..58724e9ead 100644
--- a/org.lflang/build.gradle
+++ b/org.lflang/build.gradle
@@ -137,17 +137,17 @@ task runLff(type: JavaExec) {
 // Add Antlr4 for various DSLs, including MTL for verification.
 task runAntlr4(type:JavaExec) {
    //see incremental task api, prevents rerun if nothing has changed.
-   inputs.dir "$projectDir/src/main/antlr4/"
-   outputs.dir "$projectDir/build/generated/antlr/main/"
+   inputs.dir "$projectDir/src/org/lflang/dsl/antlr4/"
+   outputs.dir "$projectDir/build/generated/antlr4/main/"
 
    classpath = configurations.antlr4
 
    main = "org.antlr.v4.Tool" 
 
    args = [ "-visitor", 
-            "-o",  "$projectDir/build/generated/antlr/main/",  
-            "-package", "org.lflang",
-            "$projectDir/src/main/antlr4/MTLLexer.g4",
-            "$projectDir/src/main/antlr4/MTLParser.g4"]
+            "-o",  "$projectDir/build/generated/antlr4/main/",  
+            "-package", "org.lflang.dsl",
+            "$projectDir/src/org/lflang/dsl/antlr4/MTLLexer.g4",
+            "$projectDir/src/org/lflang/dsl/antlr4/MTLParser.g4"]
 }
 compileJava.dependsOn(runAntlr4)
diff --git a/org.lflang/src/main/antlr4/MTLLexer.g4 b/org.lflang/src/org/lflang/dsl/antlr4/MTLLexer.g4
similarity index 100%
rename from org.lflang/src/main/antlr4/MTLLexer.g4
rename to org.lflang/src/org/lflang/dsl/antlr4/MTLLexer.g4
diff --git a/org.lflang/src/main/antlr4/MTLParser.g4 b/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4
similarity index 100%
rename from org.lflang/src/main/antlr4/MTLParser.g4
rename to org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4

From 301ed166660394842be7393fa97a22faed160b99 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 6 Jul 2022 16:10:38 -0400
Subject: [PATCH 0027/1114] Fix Antlr generated file location, start MTL
 transpiler

---
 .gitignore                                    |  4 +
 org.lflang/build.gradle                       |  8 +-
 .../lflang/generator/uclid/MTLTranspiler.java | 78 +++++++++++++++++++
 3 files changed, 88 insertions(+), 2 deletions(-)
 create mode 100644 org.lflang/src/org/lflang/generator/uclid/MTLTranspiler.java

diff --git a/.gitignore b/.gitignore
index 5d10393cdb..15b59f18b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -149,4 +149,8 @@ gradle-app.setting
 ### Gradle Patch ###
 **/build/
 
+### Antlr 4 ###
+**/.antlr/
+**/generated/
+
 # End of https://www.toptal.com/developers/gitignore/api/intellij,gradle,eclipse,maven,visualstudiocode
diff --git a/org.lflang/build.gradle b/org.lflang/build.gradle
index 58724e9ead..867660cdf9 100644
--- a/org.lflang/build.gradle
+++ b/org.lflang/build.gradle
@@ -138,16 +138,20 @@ task runLff(type: JavaExec) {
 task runAntlr4(type:JavaExec) {
    //see incremental task api, prevents rerun if nothing has changed.
    inputs.dir "$projectDir/src/org/lflang/dsl/antlr4/"
-   outputs.dir "$projectDir/build/generated/antlr4/main/"
+   outputs.dir "$projectDir/src/org/lflang/dsl/generated/antlr4/main/"
 
    classpath = configurations.antlr4
 
    main = "org.antlr.v4.Tool" 
 
    args = [ "-visitor", 
-            "-o",  "$projectDir/build/generated/antlr4/main/",  
+            "-o",  "$projectDir/src/org/lflang/dsl/generated/antlr4/main/",  
             "-package", "org.lflang.dsl",
             "$projectDir/src/org/lflang/dsl/antlr4/MTLLexer.g4",
             "$projectDir/src/org/lflang/dsl/antlr4/MTLParser.g4"]
 }
 compileJava.dependsOn(runAntlr4)
+
+clean {
+    delete file("${projectDir}/src/org/lflang/dsl/generated")
+}
diff --git a/org.lflang/src/org/lflang/generator/uclid/MTLTranspiler.java b/org.lflang/src/org/lflang/generator/uclid/MTLTranspiler.java
new file mode 100644
index 0000000000..48aceda73f
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/uclid/MTLTranspiler.java
@@ -0,0 +1,78 @@
+package org.lflang.generator.uclid;
+
+import org.lflang.dsl.MTLParser;
+import org.lflang.dsl.MTLParserBaseListener;
+
+public class MTLTranspiler extends MTLParserBaseListener {
+
+    @Override
+    public void enterMtl(MTLParser.MtlContext ctx) {
+        System.out.println("Formula: " + ctx.getText());
+    }
+
+    @Override
+    public void enterEquivalence(MTLParser.EquivalenceContext ctx) {
+        System.out.println("Equivalence: " + ctx.getText());
+    }
+    
+    @Override
+    public void enterImplication(MTLParser.ImplicationContext ctx) {
+        System.out.println("Implication: " + ctx.getText());
+    }
+
+    @Override
+    public void enterDisjunction(MTLParser.DisjunctionContext ctx) {
+        System.out.println("Disjunction: " + ctx.getText());
+    }
+
+    @Override
+    public void enterConjunction(MTLParser.ConjunctionContext ctx) {
+        System.out.println("Conjunction: " + ctx.getText());
+    }
+
+    @Override
+    public void enterBinaryOp(MTLParser.BinaryOpContext ctx) {
+        System.out.println("BinaryOp: " + ctx.getText());
+    }
+
+    @Override
+    public void enterNoUnaryOp(MTLParser.NoUnaryOpContext ctx) {
+        System.out.println("NoUnaryOp: " + ctx.getText());
+        System.out.println("formula within NoUnaryOp: " + ctx.formula.getText());
+    }
+
+    @Override
+    public void enterNegation(MTLParser.NegationContext ctx) {
+        System.out.println("Negation: " + ctx.getText());
+    }
+
+    @Override
+    public void enterNext(MTLParser.NextContext ctx) {
+        System.out.println("Next: " + ctx.getText());
+    }
+
+    @Override
+    public void enterGlobally(MTLParser.GloballyContext ctx) {
+        System.out.println("Globally: " + ctx.getText());
+    }
+
+    @Override
+    public void enterFinally(MTLParser.FinallyContext ctx) {
+        System.out.println("Finally: " + ctx.getText());
+    }
+
+    @Override
+    public void enterPrimary(MTLParser.PrimaryContext ctx) {
+        System.out.println("Primary: " + ctx.getText());
+    }
+
+    @Override
+    public void enterAtomicProp(MTLParser.AtomicPropContext ctx) {
+        System.out.println("AtomicProp: " + ctx.getText());
+    }
+
+    @Override
+    public void enterRange(MTLParser.RangeContext ctx) {
+        System.out.println("Range: " + ctx.getText());
+    }
+}
\ No newline at end of file

From 52040d0cf32b68948590e4665d3058bc613c21e7 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 7 Jul 2022 00:01:39 -0400
Subject: [PATCH 0028/1114] Start to generate properties based on property
 attributes

---
 .../src/org/lflang/generator/LFGenerator.java | 13 ++--
 .../generator/uclid/UclidGenerator.java       | 63 ++++++++++++-------
 2 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/LFGenerator.java b/org.lflang/src/org/lflang/generator/LFGenerator.java
index 6d2318099d..1fbcf99552 100644
--- a/org.lflang/src/org/lflang/generator/LFGenerator.java
+++ b/org.lflang/src/org/lflang/generator/LFGenerator.java
@@ -6,6 +6,7 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -168,12 +169,12 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa,
 
         // Check if @property is used. If so, include UclidGenerator.
         Reactor main = ASTUtils.getMainReactor(resource);
-        List<Attribute> attributes = AttributeUtils.getAttributes(main);
-        boolean propertyFound = 
-            attributes.stream()
-            .anyMatch(attr -> attr.getAttrName().equals("property"));
-        if (propertyFound) {
-            UclidGenerator uclidGenerator = new UclidGenerator(fileConfig, errorReporter);
+        List<Attribute> properties = AttributeUtils.getAttributes(main)
+                                    .stream()
+                                    .filter(attr -> attr.getAttrName().equals("property"))
+                                    .collect(Collectors.toList());
+        if (properties.size() > 0) {
+            UclidGenerator uclidGenerator = new UclidGenerator(fileConfig, errorReporter, properties);
             uclidGenerator.doGenerate(resource, lfContext);
         }
 
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index bc1c0c60a2..499c75a237 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -29,15 +29,18 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  */
 package org.lflang.generator.uclid;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.lflang.generator.ActionInstance;
@@ -63,10 +66,12 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.lf.Action;
+import org.lflang.lf.Attribute;
 import org.lflang.lf.Connection;
 import org.lflang.lf.Expression;
 import org.lflang.lf.Time;
 import org.lflang.lf.VarRef;
+import org.w3c.dom.Attr;
 
 import static org.lflang.ASTUtils.*;
 
@@ -76,7 +81,7 @@ public class UclidGenerator extends GeneratorBase {
     //// Private variables
 
     // Data structures for storing info about the runtime instances.
-    List<ReactorInstance> reactorInstances           = new ArrayList<ReactorInstance>();
+    List<ReactorInstance>       reactorInstances    = new ArrayList<ReactorInstance>();
     List<ReactionInstance.Runtime> reactionInstances = new ArrayList<ReactionInstance.Runtime>();
 
     // State variables in the system
@@ -92,8 +97,11 @@ public class UclidGenerator extends GeneratorBase {
     List<TriggerInstance>       triggerInstances;   // Triggers = ports + actions + timers
     List<NamedInstance>         namedInstances;     // Named instances = triggers + state variables
 
-    // Data structures for storing properties
-    List<String> properties     = new ArrayList<String>();
+    // A list of MTL properties represented in Attributes.
+    List<Attribute> properties;
+
+    // The directory where the generated files are placed
+    Path outputDir;
 
     ////////////////////////////////////////////
     //// Protected fields
@@ -102,8 +110,9 @@ public class UclidGenerator extends GeneratorBase {
     protected CodeBuilder code  = new CodeBuilder();
 
     // Constructor
-    public UclidGenerator(FileConfig fileConfig, ErrorReporter errorReporter) {
+    public UclidGenerator(FileConfig fileConfig, ErrorReporter errorReporter, List<Attribute> properties) {
         super(fileConfig, errorReporter);
+        this.properties = properties;
     }
 
     ////////////////////////////////////////////////////////////
@@ -140,13 +149,11 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
 
         // FIXME: Identify properties in the attributes.
         // FIXME: Calculate the completeness threshold for each property.
-        int CT = 10; // Placeholder. Currently up to ~50.
-
         // Generate a Uclid model for each property.
-        // for (String prop : this.properties) {
-        //     generateUclidFile(prop);
-        // }
-        generateUclidFile("test", "bmc", CT);
+        for (Attribute prop : this.properties) {
+            int CT = computeCT(prop);
+            generateUclidFile(prop, CT);
+        }
 
         // Generate runner script
         generateRunnerScript();
@@ -158,13 +165,15 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     /**
      * Generate the Uclid model.
      */
-    protected void generateUclidFile(String property, String tactic, int CT) {   
+    protected void generateUclidFile(Attribute property, int CT) {
+        String name = property.getAttrParms().get(0).getValue().getStr();
+        String tactic = property.getAttrParms().get(1).getValue().getStr();
         try {  
             // Generate main.ucl and print to file
             code = new CodeBuilder();
-            String filename = this.fileConfig.getSrcGenPath()
-                                .resolve(tactic + "_" + property + ".ucl").toString();
-            generateUclidCode(CT);
+            String filename = this.outputDir
+                            .resolve(tactic + "_" + name + ".ucl").toString();
+            generateUclidCode(property, CT);
             code.writeToFile(filename);
         } catch (IOException e) {
             Exceptions.sneakyThrow(e);
@@ -178,7 +187,7 @@ protected void generateRunnerScript() {
         try {  
             // Generate main.ucl and print to file
             var script = new CodeBuilder();
-            String filename = this.fileConfig.getSrcGenPath()
+            String filename = this.outputDir
                                 .resolve("run.sh").toString();
             script.pr(String.join("\n", 
                 "#!/bin/bash",
@@ -205,7 +214,7 @@ protected void generateRunnerScript() {
     /**
      * The main function that generates Uclid code.
      */
-    protected void generateUclidCode(int CT) {
+    protected void generateUclidCode(Attribute property, int CT) {
         code.pr(String.join("\n", 
             "/*******************************",
             " * Auto-generated UCLID5 model *",
@@ -238,8 +247,8 @@ protected void generateUclidCode(int CT) {
         // generateReactorAbstractions();
         // generateReactionAbstractions();
 
-        // FIXME: Properties
-        generateProperty();
+        // Properties
+        generateProperty(property, CT);
 
         // Control block
         generateControlBlock();
@@ -814,7 +823,7 @@ protected void generateInitialConditions() {
 
     // }
 
-    protected void generateProperty() {
+    protected void generateProperty(Attribute property, int CT) {
         code.pr(String.join("\n", 
             "/************",
             " * Property *",
@@ -875,13 +884,14 @@ private void createMainReactorInstance() {
 
     private void setUpDirectories() {
         // Make sure the target directory exists.
-        var targetDir = this.fileConfig.getSrcGenPath();
+        Path srcgenDir = this.fileConfig.getSrcGenPath();
+        this.outputDir = Paths.get(srcgenDir.toString() + File.separator + "model");
         try {
-            Files.createDirectories(targetDir);
+            Files.createDirectories(outputDir);
         } catch (IOException e) {
             Exceptions.sneakyThrow(e);
         }
-        System.out.println("The models will be located in: " + targetDir);
+        System.out.println("The models will be located in: " + outputDir);
     }
 
     /**
@@ -931,6 +941,13 @@ private void populateLists(ReactorInstance reactor) {
         }
     }
 
+    /**
+     * Compute a completeness threadhold for each property.
+     */
+    private int computeCT(Attribute property) {
+        return 10; // FIXME
+    }
+
     /////////////////////////////////////////////////
     //// Functions from generatorBase
     

From 21efab8273caa25058984f908ef144444f44621b Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 7 Jul 2022 00:23:28 -0400
Subject: [PATCH 0029/1114] Use the MTLParser to generate parse trees

---
 .../generator/uclid/UclidGenerator.java       | 38 +++++++++++++++----
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 499c75a237..1c1ad2bac3 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -40,6 +40,11 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.List;
 import java.util.Set;
 
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.ParseTreeWalker;
+
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.Exceptions;
@@ -65,6 +70,8 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.Target;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
+import org.lflang.dsl.MTLLexer;
+import org.lflang.dsl.MTLParser;
 import org.lflang.lf.Action;
 import org.lflang.lf.Attribute;
 import org.lflang.lf.Connection;
@@ -128,11 +135,6 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         ASTUtils.setMainName(fileConfig.resource, fileConfig.name);
         super.createMainInstantiation();
         ////////////////////////////////////////
-
-        // Check for the specified k-induction steps, otherwise defaults to 1.
-        // FIXME: To enable.
-        // this.k = this.targetConfig.verification.steps;
-        // this.tactic = this.targetConfig.verification.tactic;
         
         System.out.println("*** Start generating Uclid code.");
 
@@ -166,8 +168,18 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
      * Generate the Uclid model.
      */
     protected void generateUclidFile(Attribute property, int CT) {
-        String name = property.getAttrParms().get(0).getValue().getStr();
-        String tactic = property.getAttrParms().get(1).getValue().getStr();
+        String name = property.getAttrParms().stream()
+                        .filter(attr -> attr.getName().equals("name"))
+                        .findFirst()
+                        .get()
+                        .getValue()
+                        .getStr();
+        String tactic = property.getAttrParms().stream()
+                        .filter(attr -> attr.getName().equals("tactic"))
+                        .findFirst()
+                        .get()
+                        .getValue()
+                        .getStr();
         try {  
             // Generate main.ucl and print to file
             code = new CodeBuilder();
@@ -830,6 +842,18 @@ protected void generateProperty(Attribute property, int CT) {
             " ************/"
         ));
 
+        String spec = property.getAttrParms().stream()
+                        .filter(attr -> attr.getName().equals("spec"))
+                        .findFirst()
+                        .get()
+                        .getValue()
+                        .getStr();
+        MTLLexer lexer = new MTLLexer(CharStreams.fromString(spec));
+        CommonTokenStream tokens = new CommonTokenStream(lexer);
+        MTLParser parser = new MTLParser(tokens);
+        ParseTree parseTree = parser.mtl();
+        ParseTreeWalker walker = new ParseTreeWalker();
+        walker.walk(new MTLTranspiler(), parseTree);
     }
 
     /**

From 38a31ff451eecd2f25b69b637c23212d4bd84048 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 7 Jul 2022 01:11:03 -0400
Subject: [PATCH 0030/1114] Update syntax to include expressions

---
 .../src/org/lflang/dsl/antlr4/MTLLexer.g4     | 40 +++++++++++++++++++
 .../src/org/lflang/dsl/antlr4/MTLParser.g4    | 27 +++++++++++++
 .../generator/uclid/UclidGenerator.java       |  3 +-
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/org.lflang/src/org/lflang/dsl/antlr4/MTLLexer.g4 b/org.lflang/src/org/lflang/dsl/antlr4/MTLLexer.g4
index c858809044..138aa7742d 100644
--- a/org.lflang/src/org/lflang/dsl/antlr4/MTLLexer.g4
+++ b/org.lflang/src/org/lflang/dsl/antlr4/MTLLexer.g4
@@ -72,6 +72,46 @@ ZERO
     : '0'
     ;
 
+PLUS
+    : '+'
+    ;
+
+MINUS
+    : '-'
+    ;
+
+TIMES
+    : '*'
+    ;
+
+DIV
+    : '/'
+    ;
+
+EQ
+    : '=='
+    ;
+
+NEQ
+    : '!='
+    ;
+
+LT
+    : '<'
+    ;
+
+LE
+    : '<='
+    ;
+
+GT
+    : '>'
+    ;
+
+GE
+    : '>='
+    ;
+
 INTEGER
     : [0-9][0-9]*
     ;
diff --git a/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4 b/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4
index a9b84c04d2..3be2126710 100644
--- a/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4
+++ b/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4
@@ -43,6 +43,7 @@ primary
 atomicProp
     : primitive=TRUE
     | primitive=FALSE
+    | left=expr op=relOp right=expr
     ;
 
 interval
@@ -53,3 +54,29 @@ interval
 time
     : (ZERO | value=INTEGER unit=ID)
     ;
+
+sum 
+    : terms+=difference (PLUS terms+=difference)*
+    ;
+
+difference
+    : terms+=product (MINUS terms+=product)*
+    ;
+
+product
+    : terms+=quotient (TIMES terms+=quotient)*
+    ;
+
+quotient
+    : terms+=expr (DIV terms+=expr)*
+    ;
+
+relOp
+    : EQ | NEQ | LT | LE | GT | GE
+    ;
+
+expr
+    : ID
+    | LPAREN sum RPAREN
+    | INTEGER
+    ;
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 1c1ad2bac3..51e2c7eb6b 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -853,7 +853,8 @@ protected void generateProperty(Attribute property, int CT) {
         MTLParser parser = new MTLParser(tokens);
         ParseTree parseTree = parser.mtl();
         ParseTreeWalker walker = new ParseTreeWalker();
-        walker.walk(new MTLTranspiler(), parseTree);
+        MTLTranspiler transpiler = new MTLTranspiler();
+        walker.walk(transpiler, parseTree);
     }
 
     /**

From 47ab69656a713e660a38267e08376d533aee4832 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 7 Jul 2022 11:51:50 -0400
Subject: [PATCH 0031/1114] Start to transpile MTL using a visitor

---
 org.lflang/build.gradle                       |  1 +
 .../lflang/generator/uclid/MTLTranspiler.java | 78 -------------------
 .../lflang/generator/uclid/MTLVisitor.java    | 71 +++++++++++++++++
 .../generator/uclid/UclidGenerator.java       | 36 ++++-----
 4 files changed, 90 insertions(+), 96 deletions(-)
 delete mode 100644 org.lflang/src/org/lflang/generator/uclid/MTLTranspiler.java
 create mode 100644 org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java

diff --git a/org.lflang/build.gradle b/org.lflang/build.gradle
index 867660cdf9..e7c8ca559a 100644
--- a/org.lflang/build.gradle
+++ b/org.lflang/build.gradle
@@ -150,6 +150,7 @@ task runAntlr4(type:JavaExec) {
             "$projectDir/src/org/lflang/dsl/antlr4/MTLLexer.g4",
             "$projectDir/src/org/lflang/dsl/antlr4/MTLParser.g4"]
 }
+processResources.dependsOn(runAntlr4)
 compileJava.dependsOn(runAntlr4)
 
 clean {
diff --git a/org.lflang/src/org/lflang/generator/uclid/MTLTranspiler.java b/org.lflang/src/org/lflang/generator/uclid/MTLTranspiler.java
deleted file mode 100644
index 48aceda73f..0000000000
--- a/org.lflang/src/org/lflang/generator/uclid/MTLTranspiler.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.lflang.generator.uclid;
-
-import org.lflang.dsl.MTLParser;
-import org.lflang.dsl.MTLParserBaseListener;
-
-public class MTLTranspiler extends MTLParserBaseListener {
-
-    @Override
-    public void enterMtl(MTLParser.MtlContext ctx) {
-        System.out.println("Formula: " + ctx.getText());
-    }
-
-    @Override
-    public void enterEquivalence(MTLParser.EquivalenceContext ctx) {
-        System.out.println("Equivalence: " + ctx.getText());
-    }
-    
-    @Override
-    public void enterImplication(MTLParser.ImplicationContext ctx) {
-        System.out.println("Implication: " + ctx.getText());
-    }
-
-    @Override
-    public void enterDisjunction(MTLParser.DisjunctionContext ctx) {
-        System.out.println("Disjunction: " + ctx.getText());
-    }
-
-    @Override
-    public void enterConjunction(MTLParser.ConjunctionContext ctx) {
-        System.out.println("Conjunction: " + ctx.getText());
-    }
-
-    @Override
-    public void enterBinaryOp(MTLParser.BinaryOpContext ctx) {
-        System.out.println("BinaryOp: " + ctx.getText());
-    }
-
-    @Override
-    public void enterNoUnaryOp(MTLParser.NoUnaryOpContext ctx) {
-        System.out.println("NoUnaryOp: " + ctx.getText());
-        System.out.println("formula within NoUnaryOp: " + ctx.formula.getText());
-    }
-
-    @Override
-    public void enterNegation(MTLParser.NegationContext ctx) {
-        System.out.println("Negation: " + ctx.getText());
-    }
-
-    @Override
-    public void enterNext(MTLParser.NextContext ctx) {
-        System.out.println("Next: " + ctx.getText());
-    }
-
-    @Override
-    public void enterGlobally(MTLParser.GloballyContext ctx) {
-        System.out.println("Globally: " + ctx.getText());
-    }
-
-    @Override
-    public void enterFinally(MTLParser.FinallyContext ctx) {
-        System.out.println("Finally: " + ctx.getText());
-    }
-
-    @Override
-    public void enterPrimary(MTLParser.PrimaryContext ctx) {
-        System.out.println("Primary: " + ctx.getText());
-    }
-
-    @Override
-    public void enterAtomicProp(MTLParser.AtomicPropContext ctx) {
-        System.out.println("AtomicProp: " + ctx.getText());
-    }
-
-    @Override
-    public void enterRange(MTLParser.RangeContext ctx) {
-        System.out.println("Range: " + ctx.getText());
-    }
-}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
new file mode 100644
index 0000000000..632ecaa82a
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
@@ -0,0 +1,71 @@
+/*************
+Copyright (c) 2021, The University of California at Berkeley.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+***************/
+
+/** 
+ * Transpiler from an MTL specification to a Uclid axiom.
+ * 
+ * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ */
+package org.lflang.generator.uclid;
+
+import org.lflang.dsl.MTLParser;
+import org.lflang.dsl.MTLParserBaseVisitor;
+import org.lflang.generator.CodeBuilder;
+
+public class MTLVisitor extends MTLParserBaseVisitor<String> {
+
+    ////////////////////////////////////////////
+    //// Protected fields
+
+    /** The main place to put generated code. */
+    protected CodeBuilder code  = new CodeBuilder();
+
+    ////////////////////////////////////////////
+    //// Public methods
+    public String visitMtl(MTLParser.MtlContext ctx,
+        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+
+        return visitEquivalence(ctx.equivalence(),
+            QFPrefix, QFIdx, prevQFIdx, horizon);
+    }
+
+    public String visitEquivalence(MTLParser.EquivalenceContext ctx,
+        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+
+        if (ctx.right == null) {
+            return visitImplication(ctx.left,
+            QFPrefix, QFIdx, prevQFIdx, horizon);
+        }
+        return "(" + visitImplication(ctx.left,
+            QFPrefix, QFIdx, prevQFIdx, horizon) 
+            + ")"
+            + " <==> " 
+            + "(" + visitImplication(ctx.right) + ")";
+    }
+
+    public String visitImplication(MTLParser.ImplicationContext ctx,
+        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        return "";
+    }
+}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 51e2c7eb6b..4ea22cdd9c 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -72,6 +72,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.TimeValue;
 import org.lflang.dsl.MTLLexer;
 import org.lflang.dsl.MTLParser;
+import org.lflang.dsl.MTLParser.MtlContext;
 import org.lflang.lf.Action;
 import org.lflang.lf.Attribute;
 import org.lflang.lf.Connection;
@@ -85,33 +86,30 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 public class UclidGenerator extends GeneratorBase {
 
     ////////////////////////////////////////////
-    //// Private variables
+    //// Protected fields
 
     // Data structures for storing info about the runtime instances.
-    List<ReactorInstance>       reactorInstances    = new ArrayList<ReactorInstance>();
-    List<ReactionInstance.Runtime> reactionInstances = new ArrayList<ReactionInstance.Runtime>();
+    protected List<ReactorInstance>       reactorInstances    = new ArrayList<ReactorInstance>();
+    protected List<ReactionInstance.Runtime> reactionInstances = new ArrayList<ReactionInstance.Runtime>();
 
     // State variables in the system
-    List<StateVariableInstance> stateVariables      = new ArrayList<StateVariableInstance>();
+    protected List<StateVariableInstance> stateVariables      = new ArrayList<StateVariableInstance>();
     
     // Triggers in the system
-    List<ActionInstance>        actionInstances     = new ArrayList<ActionInstance>();
-    List<PortInstance>          portInstances       = new ArrayList<PortInstance>();
-    List<TimerInstance>         timerInstances      = new ArrayList<TimerInstance>();
+    protected List<ActionInstance>        actionInstances     = new ArrayList<ActionInstance>();
+    protected List<PortInstance>          portInstances       = new ArrayList<PortInstance>();
+    protected List<TimerInstance>         timerInstances      = new ArrayList<TimerInstance>();
     
     // Joint lists of the lists above.
     // FIXME: This approach currently creates duplications in memory.
-    List<TriggerInstance>       triggerInstances;   // Triggers = ports + actions + timers
-    List<NamedInstance>         namedInstances;     // Named instances = triggers + state variables
+    protected List<TriggerInstance>       triggerInstances;   // Triggers = ports + actions + timers
+    protected List<NamedInstance>         namedInstances;     // Named instances = triggers + state variables
 
     // A list of MTL properties represented in Attributes.
-    List<Attribute> properties;
+    protected List<Attribute> properties;
 
     // The directory where the generated files are placed
-    Path outputDir;
-
-    ////////////////////////////////////////////
-    //// Protected fields
+    protected Path outputDir;
 
     /** The main place to put generated code. */
     protected CodeBuilder code  = new CodeBuilder();
@@ -851,10 +849,12 @@ protected void generateProperty(Attribute property, int CT) {
         MTLLexer lexer = new MTLLexer(CharStreams.fromString(spec));
         CommonTokenStream tokens = new CommonTokenStream(lexer);
         MTLParser parser = new MTLParser(tokens);
-        ParseTree parseTree = parser.mtl();
-        ParseTreeWalker walker = new ParseTreeWalker();
-        MTLTranspiler transpiler = new MTLTranspiler();
-        walker.walk(transpiler, parseTree);
+        MtlContext mtlCtx = parser.mtl();
+        MTLVisitor visitor = new MTLVisitor();
+
+        // The visitor transpiles the MTL into a Uclid axiom.
+        String transpiled = visitor.visitMtl(mtlCtx, "i", 0, "0", 0);
+        code.pr(transpiled);
     }
 
     /**

From 511d3a8fe84a2d5bcd34b87c78576710fc7a1a1f Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 8 Jul 2022 00:19:06 -0400
Subject: [PATCH 0032/1114] Keep working on transpiling

---
 .../src/org/lflang/dsl/antlr4/MTLParser.g4    |   2 +-
 .../lflang/generator/uclid/MTLVisitor.java    | 148 +++++++++++++++++-
 .../generator/uclid/UclidGenerator.java       |  14 +-
 3 files changed, 161 insertions(+), 3 deletions(-)

diff --git a/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4 b/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4
index 3be2126710..8347b6fbae 100644
--- a/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4
+++ b/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4
@@ -23,7 +23,7 @@ conjunction
     ;
 
 binaryOp
-    : left=unaryOp (UNTIL timeInterval=interval right=unaryOp)?
+    : left=unaryOp (UNTIL timeInterval=interval right=unaryOp)? # Until
     ;
 
 unaryOp
diff --git a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
index 632ecaa82a..ca520c1851 100644
--- a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
@@ -29,6 +29,8 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  */
 package org.lflang.generator.uclid;
 
+import org.lflang.TimeUnit;
+import org.lflang.TimeValue;
 import org.lflang.dsl.MTLParser;
 import org.lflang.dsl.MTLParserBaseVisitor;
 import org.lflang.generator.CodeBuilder;
@@ -41,6 +43,14 @@ public class MTLVisitor extends MTLParserBaseVisitor<String> {
     /** The main place to put generated code. */
     protected CodeBuilder code  = new CodeBuilder();
 
+    /** Tactic to be used to prove the property. */
+    protected String tactic;
+
+    // Constructor
+    public MTLVisitor(String tactic) {
+        this.tactic = tactic;
+    }
+
     ////////////////////////////////////////////
     //// Public methods
     public String visitMtl(MTLParser.MtlContext ctx,
@@ -61,11 +71,147 @@ public String visitEquivalence(MTLParser.EquivalenceContext ctx,
             QFPrefix, QFIdx, prevQFIdx, horizon) 
             + ")"
             + " <==> " 
-            + "(" + visitImplication(ctx.right) + ")";
+            + "(" + visitImplication(ctx.right,
+            QFPrefix, QFIdx, prevQFIdx, horizon)
+            + ")";
     }
 
     public String visitImplication(MTLParser.ImplicationContext ctx,
         String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        
+        if (ctx.right == null) {
+            return visitDisjunction(ctx.left,
+            QFPrefix, QFIdx, prevQFIdx, horizon);
+        }
+        return "(" + visitDisjunction(ctx.left,
+            QFPrefix, QFIdx, prevQFIdx, horizon) 
+            + ")"
+            + " ==> " 
+            + "(" + visitDisjunction(ctx.right,
+            QFPrefix, QFIdx, prevQFIdx, horizon)
+            + ")";
+    }
+
+    public String visitDisjunction(MTLParser.DisjunctionContext ctx,
+        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        
+        String str = "";
+        for (int i = 0; i < ctx.terms.size(); i++) {
+            str += "("
+                + visitConjunction(ctx.terms.get(i),
+                QFPrefix, QFIdx, prevQFIdx, horizon)
+                + ")"
+                + (i == ctx.terms.size()-1 ? "" : "||");
+        }
+        return str;
+    }
+
+    public String visitConjunction(MTLParser.ConjunctionContext ctx,
+        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        
+        String str = "";
+        for (int i = 0; i < ctx.terms.size(); i++) {
+            str += "("
+                + visitUntil((MTLParser.UntilContext)ctx.terms.get(i),
+                    QFPrefix, QFIdx, prevQFIdx, horizon)
+                + ")"
+                + (i == ctx.terms.size()-1 ? "" : "&&");
+        }
+        return str;
+    }
+
+    // A custom dispatch function
+    public String _visitUnaryOp(MTLParser.UnaryOpContext ctx,
+        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+
+        // FIXME: Is there a more "antlr" way to do dispatch here?
+        if (ctx instanceof MTLParser.NoUnaryOpContext) {
+            return visitNoUnaryOp((MTLParser.NoUnaryOpContext)ctx, 
+                QFPrefix, QFIdx, prevQFIdx, horizon);
+        }
+        if (ctx instanceof MTLParser.NegationContext) {
+            return visitNegation((MTLParser.NegationContext)ctx,
+                QFPrefix, QFIdx, prevQFIdx, horizon);
+        }
+        if (ctx instanceof MTLParser.NextContext) {
+            return visitNext((MTLParser.NextContext)ctx,
+                QFPrefix, QFIdx, prevQFIdx, horizon);
+        }
+        if (ctx instanceof MTLParser.GloballyContext) {
+            return visitGlobally((MTLParser.GloballyContext)ctx,
+                QFPrefix, QFIdx, prevQFIdx, horizon);
+        }
+        if (ctx instanceof MTLParser.FinallyContext) {
+            return visitFinally((MTLParser.FinallyContext)ctx,
+                QFPrefix, QFIdx, prevQFIdx, horizon);
+        }
+
+        // FIXME: Throw an exception.
+        return "";
+    }
+
+    public String visitUntil(MTLParser.UntilContext ctx,
+        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+
+        // If right is null, continue recursion.
+        if (ctx.right == null) {
+            return _visitUnaryOp(ctx.left,
+                QFPrefix, QFIdx, prevQFIdx, horizon);
+        }
+
+        String end;
+        if (this.tactic.equals("induction")) {
+            end = "(" + QFPrefix + " + N)";
+        } else {
+            end = "END";
+        }
+
+        // Otherwise, create the Until formula.
+        // Check if the time interval is a range or a singleton.
+        if (ctx.timeInterval instanceof MTLParser.SingletonContext) {
+            return "";
+        } else {
+            String predicate = "";
+            String upperBoundTimeValue = ((MTLParser.RangeContext)ctx.timeInterval).upperbound.value.getText();
+            String upperBoundTimeUnit = ((MTLParser.RangeContext)ctx.timeInterval).upperbound.unit.getText();
+            TimeValue timeValue = new TimeValue(
+                Integer.valueOf(upperBoundTimeValue), 
+                TimeUnit.fromName(upperBoundTimeUnit));
+            long maxTimeBound = timeValue.toNanoSeconds();
+            long currentHorizon = horizon + maxTimeBound;
+            return "finite_exists (j" + QFIdx + " : integer) in indices :: "
+                + "j" + QFIdx + " >= " + QFPrefix + " && j" + QFIdx + " <= " + end
+                + " && (" + _visitUnaryOp(ctx.right, QFPrefix, QFIdx+1, ("j"+QFIdx), currentHorizon) + ")";
+        }
+    }
+
+    public String visitNoUnaryOp(MTLParser.NoUnaryOpContext ctx,
+        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+
+        return "";
+    }
+
+    public String visitNegation(MTLParser.NegationContext ctx,
+        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+
+        return "";
+    }
+
+    public String visitNext(MTLParser.NextContext ctx,
+        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+
+        return "";
+    }
+
+    public String visitGlobally(MTLParser.GloballyContext ctx,
+        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+
+        return "";
+    }
+
+    public String visitFinally(MTLParser.FinallyContext ctx,
+        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+
         return "";
     }
 }
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 4ea22cdd9c..212d2de23d 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -840,6 +840,18 @@ protected void generateProperty(Attribute property, int CT) {
             " ************/"
         ));
 
+        String name = property.getAttrParms().stream()
+                        .filter(attr -> attr.getName().equals("name"))
+                        .findFirst()
+                        .get()
+                        .getValue()
+                        .getStr();
+        String tactic = property.getAttrParms().stream()
+                        .filter(attr -> attr.getName().equals("tactic"))
+                        .findFirst()
+                        .get()
+                        .getValue()
+                        .getStr();
         String spec = property.getAttrParms().stream()
                         .filter(attr -> attr.getName().equals("spec"))
                         .findFirst()
@@ -850,7 +862,7 @@ protected void generateProperty(Attribute property, int CT) {
         CommonTokenStream tokens = new CommonTokenStream(lexer);
         MTLParser parser = new MTLParser(tokens);
         MtlContext mtlCtx = parser.mtl();
-        MTLVisitor visitor = new MTLVisitor();
+        MTLVisitor visitor = new MTLVisitor(tactic);
 
         // The visitor transpiles the MTL into a Uclid axiom.
         String transpiled = visitor.visitMtl(mtlCtx, "i", 0, "0", 0);

From 59b23f5a1003e07132933015b97400cd535f90b5 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 8 Jul 2022 10:42:31 -0400
Subject: [PATCH 0033/1114] Transpile Until

---
 .../src/org/lflang/dsl/antlr4/MTLLexer.g4     |  6 +-
 .../src/org/lflang/dsl/antlr4/MTLParser.g4    |  4 +-
 .../lflang/generator/uclid/MTLVisitor.java    | 98 ++++++++++++++++---
 3 files changed, 88 insertions(+), 20 deletions(-)

diff --git a/org.lflang/src/org/lflang/dsl/antlr4/MTLLexer.g4 b/org.lflang/src/org/lflang/dsl/antlr4/MTLLexer.g4
index 138aa7742d..b8fe9c118d 100644
--- a/org.lflang/src/org/lflang/dsl/antlr4/MTLLexer.g4
+++ b/org.lflang/src/org/lflang/dsl/antlr4/MTLLexer.g4
@@ -68,10 +68,6 @@ FALSE
     : 'false'
     ;
 
-ZERO
-    : '0'
-    ;
-
 PLUS
     : '+'
     ;
@@ -113,7 +109,7 @@ GE
     ;
 
 INTEGER
-    : [0-9][0-9]*
+    : [0-9]+
     ;
 
 ID
diff --git a/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4 b/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4
index 8347b6fbae..1a5d39b9b4 100644
--- a/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4
+++ b/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4
@@ -23,7 +23,7 @@ conjunction
     ;
 
 binaryOp
-    : left=unaryOp (UNTIL timeInterval=interval right=unaryOp)? # Until
+    : left=unaryOp ( UNTIL timeInterval=interval right=unaryOp )? # Until
     ;
 
 unaryOp
@@ -52,7 +52,7 @@ interval
     ;
 
 time
-    : (ZERO | value=INTEGER unit=ID)
+    : value=INTEGER (unit=ID)?
     ;
 
 sum 
diff --git a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
index ca520c1851..23d069c055 100644
--- a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
@@ -169,19 +169,91 @@ public String visitUntil(MTLParser.UntilContext ctx,
         // Otherwise, create the Until formula.
         // Check if the time interval is a range or a singleton.
         if (ctx.timeInterval instanceof MTLParser.SingletonContext) {
-            return "";
-        } else {
-            String predicate = "";
-            String upperBoundTimeValue = ((MTLParser.RangeContext)ctx.timeInterval).upperbound.value.getText();
-            String upperBoundTimeUnit = ((MTLParser.RangeContext)ctx.timeInterval).upperbound.unit.getText();
-            TimeValue timeValue = new TimeValue(
-                Integer.valueOf(upperBoundTimeValue), 
-                TimeUnit.fromName(upperBoundTimeUnit));
-            long maxTimeBound = timeValue.toNanoSeconds();
-            long currentHorizon = horizon + maxTimeBound;
-            return "finite_exists (j" + QFIdx + " : integer) in indices :: "
-                + "j" + QFIdx + " >= " + QFPrefix + " && j" + QFIdx + " <= " + end
-                + " && (" + _visitUnaryOp(ctx.right, QFPrefix, QFIdx+1, ("j"+QFIdx), currentHorizon) + ")";
+            MTLParser.SingletonContext singletonCtx = (MTLParser.SingletonContext)ctx.timeInterval;
+            String timeInstantValue = singletonCtx.instant.value.getText();
+            String timeInstantUnit = "";
+            long timeInstantNanoSec = 0;
+            if (!timeInstantValue.equals("0")) {
+                timeInstantUnit = singletonCtx.instant.unit.getText();
+                TimeValue timeValue = new TimeValue(
+                    Integer.valueOf(timeInstantValue), 
+                    TimeUnit.fromName(timeInstantUnit));
+                timeInstantNanoSec = timeValue.toNanoSeconds();
+            }
+
+            String timePredicate = "tag_same(g(" + QFPrefix + "), "
+                + "tag_schedule(g(" + prevQFIdx + "), nsec(" + timeInstantNanoSec + ")))";
+            long currentHorizon = horizon + timeInstantNanoSec;
+
+            return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
+                + "j" + QFIdx + " >= " + QFPrefix + " && " + "j" + QFIdx + " <= " + end
+                + " && " + "(" + _visitUnaryOp(ctx.right, ("j"+QFIdx), QFIdx+1, QFPrefix, currentHorizon) + ")"
+                + " && " + "(" + "\n" 
+                + "// Time Predicate\n"
+                + timePredicate + "\n"
+                + ")" + " && " + "(" + "finite_forall " + "(" + "i" + QFIdx + " : integer) in indices :: "
+                + "(" + "i" + QFIdx + " >= " + QFPrefix + " && " + "i" + QFIdx + " < " + "j" + QFIdx + ")"
+                + " ==> " + "(" + _visitUnaryOp(ctx.left, ("i"+QFIdx), QFIdx+1, ("j"+QFIdx), currentHorizon) + ")" + ")";
+        } 
+        else {
+            MTLParser.RangeContext rangeCtx = (MTLParser.RangeContext)ctx.timeInterval;
+            String lowerBoundTimeValue = rangeCtx.lowerbound.value.getText();
+            String lowerBoundTimeUnit = "";
+            long lowerBoundNanoSec = 0;
+            if (!lowerBoundTimeValue.equals("0")) {
+                lowerBoundTimeUnit = rangeCtx.lowerbound.unit.getText();
+                TimeValue lowerTimeValue = new TimeValue(
+                    Integer.valueOf(lowerBoundTimeValue), 
+                    TimeUnit.fromName(lowerBoundTimeUnit));
+                lowerBoundNanoSec = lowerTimeValue.toNanoSeconds();
+            }
+            
+            String upperBoundTimeValue = rangeCtx.upperbound.value.getText();
+            String upperBoundTimeUnit = "";
+            long upperBoundNanoSec = 0;
+            if (!upperBoundTimeValue.equals("0")) {
+                upperBoundTimeUnit = rangeCtx.upperbound.unit.getText();
+                TimeValue upperTimeValue = new TimeValue(
+                    Integer.valueOf(upperBoundTimeValue), 
+                    TimeUnit.fromName(upperBoundTimeUnit));
+                upperBoundNanoSec = upperTimeValue.toNanoSeconds();
+            }
+
+            String timePredicate = "";
+            timePredicate += "(";
+            if (rangeCtx.LPAREN() != null) {
+                timePredicate += "tag_later(g(" + QFPrefix + "), "
+                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + lowerBoundNanoSec + ")))";
+            } else {
+                // FIXME: Check if this can be replaced by a !tag_earlier.
+                timePredicate += "tag_later(g(" + QFPrefix + "), "
+                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + lowerBoundNanoSec + ")))"
+                    + " || " + "tag_same(g(" + QFPrefix + "), "
+                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + lowerBoundNanoSec + ")))";
+            }
+            timePredicate += ") && (";
+            if (rangeCtx.RPAREN() != null) {
+                timePredicate += "tag_earlier(g(" + QFPrefix + "), "
+                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))";
+            } else {
+                timePredicate += "tag_earlier(g(" + QFPrefix + "), "
+                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))"
+                    + " || " + "tag_same(g(" + QFPrefix + "), "
+                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))";
+            }
+            timePredicate += ")";
+                        
+            long currentHorizon = horizon + upperBoundNanoSec;
+
+            return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
+                + "j" + QFIdx + " >= " + QFPrefix + " && " + "j" + QFIdx + " <= " + end
+                + " && " + "(" + _visitUnaryOp(ctx.right, ("j"+QFIdx), QFIdx+1, QFPrefix, currentHorizon) + ")"
+                + " && " + "(" + "\n" 
+                + "// Time Predicate\n"
+                + timePredicate + "\n"
+                + ")" + " && " + "(" + "finite_forall " + "(" + "i" + QFIdx + " : integer) in indices :: "
+                + "(" + "i" + QFIdx + " >= " + QFPrefix + " && " + "i" + QFIdx + " < " + "j" + QFIdx + ")"
+                + " ==> " + "(" + _visitUnaryOp(ctx.left, ("i"+QFIdx), QFIdx+1, ("j"+QFIdx), currentHorizon) + ")" + ")";
         }
     }
 

From 66edad493d8283aebe195d4e0892ab55069bdf52 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 8 Jul 2022 15:08:43 -0400
Subject: [PATCH 0034/1114] Refactor timing related visitor helper functions

---
 .../lflang/generator/uclid/MTLVisitor.java    | 199 ++++++++++++------
 1 file changed, 133 insertions(+), 66 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
index 23d069c055..968d195e5b 100644
--- a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
@@ -169,22 +169,9 @@ public String visitUntil(MTLParser.UntilContext ctx,
         // Otherwise, create the Until formula.
         // Check if the time interval is a range or a singleton.
         if (ctx.timeInterval instanceof MTLParser.SingletonContext) {
-            MTLParser.SingletonContext singletonCtx = (MTLParser.SingletonContext)ctx.timeInterval;
-            String timeInstantValue = singletonCtx.instant.value.getText();
-            String timeInstantUnit = "";
-            long timeInstantNanoSec = 0;
-            if (!timeInstantValue.equals("0")) {
-                timeInstantUnit = singletonCtx.instant.unit.getText();
-                TimeValue timeValue = new TimeValue(
-                    Integer.valueOf(timeInstantValue), 
-                    TimeUnit.fromName(timeInstantUnit));
-                timeInstantNanoSec = timeValue.toNanoSeconds();
-            }
-
-            String timePredicate = "tag_same(g(" + QFPrefix + "), "
-                + "tag_schedule(g(" + prevQFIdx + "), nsec(" + timeInstantNanoSec + ")))";
+            long timeInstantNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
             long currentHorizon = horizon + timeInstantNanoSec;
-
+            String timePredicate = generateTimePredicate(timeInstantNanoSec, QFPrefix, prevQFIdx);
             return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
                 + "j" + QFIdx + " >= " + QFPrefix + " && " + "j" + QFIdx + " <= " + end
                 + " && " + "(" + _visitUnaryOp(ctx.right, ("j"+QFIdx), QFIdx+1, QFPrefix, currentHorizon) + ")"
@@ -196,55 +183,11 @@ public String visitUntil(MTLParser.UntilContext ctx,
                 + " ==> " + "(" + _visitUnaryOp(ctx.left, ("i"+QFIdx), QFIdx+1, ("j"+QFIdx), currentHorizon) + ")" + ")";
         } 
         else {
-            MTLParser.RangeContext rangeCtx = (MTLParser.RangeContext)ctx.timeInterval;
-            String lowerBoundTimeValue = rangeCtx.lowerbound.value.getText();
-            String lowerBoundTimeUnit = "";
-            long lowerBoundNanoSec = 0;
-            if (!lowerBoundTimeValue.equals("0")) {
-                lowerBoundTimeUnit = rangeCtx.lowerbound.unit.getText();
-                TimeValue lowerTimeValue = new TimeValue(
-                    Integer.valueOf(lowerBoundTimeValue), 
-                    TimeUnit.fromName(lowerBoundTimeUnit));
-                lowerBoundNanoSec = lowerTimeValue.toNanoSeconds();
-            }
-            
-            String upperBoundTimeValue = rangeCtx.upperbound.value.getText();
-            String upperBoundTimeUnit = "";
-            long upperBoundNanoSec = 0;
-            if (!upperBoundTimeValue.equals("0")) {
-                upperBoundTimeUnit = rangeCtx.upperbound.unit.getText();
-                TimeValue upperTimeValue = new TimeValue(
-                    Integer.valueOf(upperBoundTimeValue), 
-                    TimeUnit.fromName(upperBoundTimeUnit));
-                upperBoundNanoSec = upperTimeValue.toNanoSeconds();
-            }
-
-            String timePredicate = "";
-            timePredicate += "(";
-            if (rangeCtx.LPAREN() != null) {
-                timePredicate += "tag_later(g(" + QFPrefix + "), "
-                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + lowerBoundNanoSec + ")))";
-            } else {
-                // FIXME: Check if this can be replaced by a !tag_earlier.
-                timePredicate += "tag_later(g(" + QFPrefix + "), "
-                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + lowerBoundNanoSec + ")))"
-                    + " || " + "tag_same(g(" + QFPrefix + "), "
-                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + lowerBoundNanoSec + ")))";
-            }
-            timePredicate += ") && (";
-            if (rangeCtx.RPAREN() != null) {
-                timePredicate += "tag_earlier(g(" + QFPrefix + "), "
-                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))";
-            } else {
-                timePredicate += "tag_earlier(g(" + QFPrefix + "), "
-                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))"
-                    + " || " + "tag_same(g(" + QFPrefix + "), "
-                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))";
-            }
-            timePredicate += ")";
-                        
+            long lowerBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
+            long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
             long currentHorizon = horizon + upperBoundNanoSec;
-
+            String timePredicate = generateTimePredicate((MTLParser.RangeContext)ctx.timeInterval,
+                lowerBoundNanoSec, upperBoundNanoSec, QFPrefix, prevQFIdx);           
             return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
                 + "j" + QFIdx + " >= " + QFPrefix + " && " + "j" + QFIdx + " <= " + end
                 + " && " + "(" + _visitUnaryOp(ctx.right, ("j"+QFIdx), QFIdx+1, QFPrefix, currentHorizon) + ")"
@@ -260,30 +203,154 @@ public String visitUntil(MTLParser.UntilContext ctx,
     public String visitNoUnaryOp(MTLParser.NoUnaryOpContext ctx,
         String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
 
-        return "";
+        return visitPrimary(ctx.formula, QFPrefix, QFIdx, prevQFIdx, horizon);
     }
 
     public String visitNegation(MTLParser.NegationContext ctx,
         String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
 
-        return "";
+        return "!(" + visitPrimary(ctx.formula, QFPrefix, QFIdx, prevQFIdx, horizon) + ")";
     }
 
     public String visitNext(MTLParser.NextContext ctx,
         String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
 
-        return "";
+        return visitPrimary(ctx.formula, ("(" + QFPrefix + "+1)"), QFIdx, prevQFIdx, horizon);
     }
 
     public String visitGlobally(MTLParser.GloballyContext ctx,
         String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
 
+        String end;
+        if (this.tactic.equals("induction")) {
+            end = "(" + QFPrefix + " + N)";
+        } else {
+            end = "END";
+        }
         return "";
     }
 
     public String visitFinally(MTLParser.FinallyContext ctx,
         String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
 
+        String end;
+        if (this.tactic.equals("induction")) {
+            end = "(" + QFPrefix + " + N)";
+        } else {
+            end = "END";
+        }
+
+        if (ctx.timeInterval instanceof MTLParser.SingletonContext) {
+
+        }
+        else {
+
+        }
+
+        return "";
+    }
+
+    public String visitPrimary(MTLParser.PrimaryContext ctx,
+        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+
         return "";
     }
+
+    ///////////////////////////////////////
+    //// Private methods
+
+    /**
+     * Return a time value in nanoseconds from an IntervalContext.
+     * 
+     * @param ctx
+     * @param getUpper
+     * @return
+     */
+    private long getNanoSecFromIntervalContext(MTLParser.IntervalContext ctx, boolean getUpper) {
+        if (ctx instanceof MTLParser.SingletonContext) {
+            MTLParser.SingletonContext singletonCtx = (MTLParser.SingletonContext)ctx;
+            String timeInstantValue = singletonCtx.instant.value.getText();
+            String timeInstantUnit = "";
+            long timeInstantNanoSec = 0;
+            if (!timeInstantValue.equals("0")) {
+                timeInstantUnit = singletonCtx.instant.unit.getText();
+                TimeValue timeValue = new TimeValue(
+                    Integer.valueOf(timeInstantValue), 
+                    TimeUnit.fromName(timeInstantUnit));
+                timeInstantNanoSec = timeValue.toNanoSeconds();
+            }
+            return timeInstantNanoSec;
+        }
+        
+        MTLParser.RangeContext rangeCtx = (MTLParser.RangeContext)ctx;
+        if (!getUpper) {
+            String lowerBoundTimeValue = rangeCtx.lowerbound.value.getText();
+            String lowerBoundTimeUnit = "";
+            long lowerBoundNanoSec = 0;
+            if (!lowerBoundTimeValue.equals("0")) {
+                lowerBoundTimeUnit = rangeCtx.lowerbound.unit.getText();
+                TimeValue lowerTimeValue = new TimeValue(
+                    Integer.valueOf(lowerBoundTimeValue), 
+                    TimeUnit.fromName(lowerBoundTimeUnit));
+                lowerBoundNanoSec = lowerTimeValue.toNanoSeconds();
+            }
+            return lowerBoundNanoSec;
+        }
+        
+        String upperBoundTimeValue = rangeCtx.upperbound.value.getText();
+        String upperBoundTimeUnit = "";
+        long upperBoundNanoSec = 0;
+        if (!upperBoundTimeValue.equals("0")) {
+            upperBoundTimeUnit = rangeCtx.upperbound.unit.getText();
+            TimeValue upperTimeValue = new TimeValue(
+                Integer.valueOf(upperBoundTimeValue), 
+                TimeUnit.fromName(upperBoundTimeUnit));
+            upperBoundNanoSec = upperTimeValue.toNanoSeconds();
+        }
+        return upperBoundNanoSec;
+    }
+
+    /**
+     * Generate a time predicate from a range.
+     * 
+     * @param ctx
+     * @param lowerBoundNanoSec
+     * @param upperBoundNanoSec
+     * @return
+     */
+    private String generateTimePredicate(MTLParser.RangeContext ctx,
+        long lowerBoundNanoSec, long upperBoundNanoSec,
+        String QFPrefix, String prevQFIdx) {
+        String timePredicate = "";
+        timePredicate += "(";
+        if (ctx.LBRACKET() != null) {
+            // FIXME: Check if this can be replaced by a !tag_earlier.
+            timePredicate += "tag_later(g(" + QFPrefix + "), "
+                + "tag_schedule(g(" + prevQFIdx + "), nsec(" + lowerBoundNanoSec + ")))"
+                + " || " + "tag_same(g(" + QFPrefix + "), "
+                + "tag_schedule(g(" + prevQFIdx + "), nsec(" + lowerBoundNanoSec + ")))";
+        } else {
+            timePredicate += "tag_later(g(" + QFPrefix + "), "
+                + "tag_schedule(g(" + prevQFIdx + "), nsec(" + lowerBoundNanoSec + ")))";
+        }
+        timePredicate += ") && (";
+        if (ctx.RBRACKET() != null) {
+            timePredicate += "tag_earlier(g(" + QFPrefix + "), "
+                + "tag_schedule(g(" + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))"
+                + " || " + "tag_same(g(" + QFPrefix + "), "
+                + "tag_schedule(g(" + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))";
+        } else {
+            timePredicate += "tag_earlier(g(" + QFPrefix + "), "
+                + "tag_schedule(g(" + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))";
+        }
+        timePredicate += ")";
+
+        return timePredicate;
+    }
+
+    private String generateTimePredicate(long timeInstantNanoSec,
+        String QFPrefix, String prevQFIdx) {
+        return "tag_same(g(" + QFPrefix + "), "
+                + "tag_schedule(g(" + prevQFIdx + "), nsec(" + timeInstantNanoSec + ")))";
+    }
 }
\ No newline at end of file

From 666e70f43445496e99d48cb5993f41029c198247 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 8 Jul 2022 15:55:46 -0400
Subject: [PATCH 0035/1114] Checkpoint. Transpile up to Expr.

---
 .../lflang/generator/uclid/MTLVisitor.java    | 185 +++++++++++-------
 1 file changed, 116 insertions(+), 69 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
index 968d195e5b..632eec320e 100644
--- a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
@@ -168,11 +168,24 @@ public String visitUntil(MTLParser.UntilContext ctx,
 
         // Otherwise, create the Until formula.
         // Check if the time interval is a range or a singleton.
-        if (ctx.timeInterval instanceof MTLParser.SingletonContext) {
-            long timeInstantNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
-            long currentHorizon = horizon + timeInstantNanoSec;
-            String timePredicate = generateTimePredicate(timeInstantNanoSec, QFPrefix, prevQFIdx);
-            return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
+        long lowerBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
+        long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
+        long currentHorizon = horizon + upperBoundNanoSec;
+        String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
+                                                    upperBoundNanoSec, QFPrefix, prevQFIdx);
+        // if (ctx.timeInterval instanceof MTLParser.SingletonContext) {
+        //     long timeInstantNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
+        //     currentHorizon = horizon + timeInstantNanoSec;
+        //     timePredicate = generateTimePredicate(timeInstantNanoSec, QFPrefix, prevQFIdx);
+        // } 
+        // else {
+        //     long lowerBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
+        //     long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
+        //     currentHorizon = horizon + upperBoundNanoSec;
+        //     timePredicate = generateTimePredicate((MTLParser.RangeContext)ctx.timeInterval,
+        //         lowerBoundNanoSec, upperBoundNanoSec, QFPrefix, prevQFIdx);           
+        // }
+        return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
                 + "j" + QFIdx + " >= " + QFPrefix + " && " + "j" + QFIdx + " <= " + end
                 + " && " + "(" + _visitUnaryOp(ctx.right, ("j"+QFIdx), QFIdx+1, QFPrefix, currentHorizon) + ")"
                 + " && " + "(" + "\n" 
@@ -181,23 +194,6 @@ public String visitUntil(MTLParser.UntilContext ctx,
                 + ")" + " && " + "(" + "finite_forall " + "(" + "i" + QFIdx + " : integer) in indices :: "
                 + "(" + "i" + QFIdx + " >= " + QFPrefix + " && " + "i" + QFIdx + " < " + "j" + QFIdx + ")"
                 + " ==> " + "(" + _visitUnaryOp(ctx.left, ("i"+QFIdx), QFIdx+1, ("j"+QFIdx), currentHorizon) + ")" + ")";
-        } 
-        else {
-            long lowerBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
-            long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
-            long currentHorizon = horizon + upperBoundNanoSec;
-            String timePredicate = generateTimePredicate((MTLParser.RangeContext)ctx.timeInterval,
-                lowerBoundNanoSec, upperBoundNanoSec, QFPrefix, prevQFIdx);           
-            return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
-                + "j" + QFIdx + " >= " + QFPrefix + " && " + "j" + QFIdx + " <= " + end
-                + " && " + "(" + _visitUnaryOp(ctx.right, ("j"+QFIdx), QFIdx+1, QFPrefix, currentHorizon) + ")"
-                + " && " + "(" + "\n" 
-                + "// Time Predicate\n"
-                + timePredicate + "\n"
-                + ")" + " && " + "(" + "finite_forall " + "(" + "i" + QFIdx + " : integer) in indices :: "
-                + "(" + "i" + QFIdx + " >= " + QFPrefix + " && " + "i" + QFIdx + " < " + "j" + QFIdx + ")"
-                + " ==> " + "(" + _visitUnaryOp(ctx.left, ("i"+QFIdx), QFIdx+1, ("j"+QFIdx), currentHorizon) + ")" + ")";
-        }
     }
 
     public String visitNoUnaryOp(MTLParser.NoUnaryOpContext ctx,
@@ -227,7 +223,19 @@ public String visitGlobally(MTLParser.GloballyContext ctx,
         } else {
             end = "END";
         }
-        return "";
+        
+        long lowerBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
+        long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
+        long currentHorizon = horizon + upperBoundNanoSec;
+        String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
+                                                    upperBoundNanoSec, QFPrefix, prevQFIdx);        
+        return "!(" + "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
+                + "j" + QFIdx + " >= " + QFPrefix + " && " + "j" + QFIdx + " <= " + end
+                + " && " + "!" + "(" + visitPrimary(ctx.formula, ("j"+QFIdx), QFIdx+1, QFPrefix, currentHorizon) + ")"
+                + " && " + "(" + "\n" 
+                + "// Time Predicate\n"
+                + timePredicate + "\n"
+                + "))";
     }
 
     public String visitFinally(MTLParser.FinallyContext ctx,
@@ -240,19 +248,55 @@ public String visitFinally(MTLParser.FinallyContext ctx,
             end = "END";
         }
 
-        if (ctx.timeInterval instanceof MTLParser.SingletonContext) {
+        long lowerBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
+        long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
+        long currentHorizon = horizon + upperBoundNanoSec;
+        String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
+                                                    upperBoundNanoSec, QFPrefix, prevQFIdx);        
+        return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
+                + "j" + QFIdx + " >= " + QFPrefix + " && " + "j" + QFIdx + " <= " + end
+                + " && " + "(" + visitPrimary(ctx.formula, ("j"+QFIdx), QFIdx+1, QFPrefix, currentHorizon) + ")"
+                + " && " + "(" + "\n" 
+                + "// Time Predicate\n"
+                + timePredicate + "\n"
+                + ")";
+    }
 
-        }
-        else {
+    public String visitPrimary(MTLParser.PrimaryContext ctx,
+        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
 
-        }
+        if (ctx.atom != null)
+            return visitAtomicProp(ctx.atom, QFPrefix, QFIdx, prevQFIdx, horizon);
+        else if (ctx.id != null)
+            return ctx.id.getText();
+        else
+            return visitMtl(ctx.formula, QFPrefix, QFIdx, prevQFIdx, horizon);
+    }
 
-        return "";
+    public String visitAtomicProp(MTLParser.AtomicPropContext ctx,
+        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+
+        if (ctx.primitive != null)
+            return ctx.primitive.getText();
+        else
+            return visitExpr(ctx.left, QFPrefix, QFIdx, prevQFIdx, horizon)
+                    + " " + ctx.op.getText() + " "
+                    + visitExpr(ctx.right, QFPrefix, QFIdx, prevQFIdx, horizon);
     }
 
-    public String visitPrimary(MTLParser.PrimaryContext ctx,
+    public String visitExpr(MTLParser.ExprContext ctx,
         String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
 
+        if (ctx.ID() != null)
+            return ctx.ID().getText();
+        else if (ctx.INTEGER() != null)
+            return ctx.INTEGER().getText();
+        else
+            return visitSum(ctx.sum(), QFPrefix, QFIdx, prevQFIdx, horizon);
+    }
+
+    public String visitSum(MTLParser.SumContext ctx,
+        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
         return "";
     }
 
@@ -267,6 +311,7 @@ public String visitPrimary(MTLParser.PrimaryContext ctx,
      * @return
      */
     private long getNanoSecFromIntervalContext(MTLParser.IntervalContext ctx, boolean getUpper) {
+        // If we have a singleton, the return value is the same regardless of getUpper.
         if (ctx instanceof MTLParser.SingletonContext) {
             MTLParser.SingletonContext singletonCtx = (MTLParser.SingletonContext)ctx;
             String timeInstantValue = singletonCtx.instant.value.getText();
@@ -295,19 +340,19 @@ private long getNanoSecFromIntervalContext(MTLParser.IntervalContext ctx, boolea
                 lowerBoundNanoSec = lowerTimeValue.toNanoSeconds();
             }
             return lowerBoundNanoSec;
+        } else {
+            String upperBoundTimeValue = rangeCtx.upperbound.value.getText();
+            String upperBoundTimeUnit = "";
+            long upperBoundNanoSec = 0;
+            if (!upperBoundTimeValue.equals("0")) {
+                upperBoundTimeUnit = rangeCtx.upperbound.unit.getText();
+                TimeValue upperTimeValue = new TimeValue(
+                    Integer.valueOf(upperBoundTimeValue), 
+                    TimeUnit.fromName(upperBoundTimeUnit));
+                upperBoundNanoSec = upperTimeValue.toNanoSeconds();
+            }
+            return upperBoundNanoSec;
         }
-        
-        String upperBoundTimeValue = rangeCtx.upperbound.value.getText();
-        String upperBoundTimeUnit = "";
-        long upperBoundNanoSec = 0;
-        if (!upperBoundTimeValue.equals("0")) {
-            upperBoundTimeUnit = rangeCtx.upperbound.unit.getText();
-            TimeValue upperTimeValue = new TimeValue(
-                Integer.valueOf(upperBoundTimeValue), 
-                TimeUnit.fromName(upperBoundTimeUnit));
-            upperBoundNanoSec = upperTimeValue.toNanoSeconds();
-        }
-        return upperBoundNanoSec;
     }
 
     /**
@@ -318,39 +363,41 @@ private long getNanoSecFromIntervalContext(MTLParser.IntervalContext ctx, boolea
      * @param upperBoundNanoSec
      * @return
      */
-    private String generateTimePredicate(MTLParser.RangeContext ctx,
+    private String generateTimePredicate(MTLParser.IntervalContext ctx,
         long lowerBoundNanoSec, long upperBoundNanoSec,
         String QFPrefix, String prevQFIdx) {
         String timePredicate = "";
-        timePredicate += "(";
-        if (ctx.LBRACKET() != null) {
-            // FIXME: Check if this can be replaced by a !tag_earlier.
-            timePredicate += "tag_later(g(" + QFPrefix + "), "
-                + "tag_schedule(g(" + prevQFIdx + "), nsec(" + lowerBoundNanoSec + ")))"
-                + " || " + "tag_same(g(" + QFPrefix + "), "
-                + "tag_schedule(g(" + prevQFIdx + "), nsec(" + lowerBoundNanoSec + ")))";
-        } else {
-            timePredicate += "tag_later(g(" + QFPrefix + "), "
-                + "tag_schedule(g(" + prevQFIdx + "), nsec(" + lowerBoundNanoSec + ")))";
-        }
-        timePredicate += ") && (";
-        if (ctx.RBRACKET() != null) {
-            timePredicate += "tag_earlier(g(" + QFPrefix + "), "
-                + "tag_schedule(g(" + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))"
-                + " || " + "tag_same(g(" + QFPrefix + "), "
-                + "tag_schedule(g(" + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))";
+
+        if (ctx instanceof MTLParser.SingletonContext) {
+            MTLParser.SingletonContext singletonCtx = (MTLParser.SingletonContext)ctx;
+            timePredicate += "tag_same(g(" + QFPrefix + "), " + "tag_schedule(g(" 
+                                + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))";
         } else {
-            timePredicate += "tag_earlier(g(" + QFPrefix + "), "
-                + "tag_schedule(g(" + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))";
+            MTLParser.RangeContext rangeCtx = (MTLParser.RangeContext)ctx;
+            timePredicate += "(";
+            if (rangeCtx.LBRACKET() != null) {
+                // FIXME: Check if this can be replaced by a !tag_earlier.
+                timePredicate += "tag_later(g(" + QFPrefix + "), "
+                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + lowerBoundNanoSec + ")))"
+                    + " || " + "tag_same(g(" + QFPrefix + "), "
+                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + lowerBoundNanoSec + ")))";
+            } else {
+                timePredicate += "tag_later(g(" + QFPrefix + "), "
+                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + lowerBoundNanoSec + ")))";
+            }
+            timePredicate += ") && (";
+            if (rangeCtx.RBRACKET() != null) {
+                timePredicate += "tag_earlier(g(" + QFPrefix + "), "
+                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))"
+                    + " || " + "tag_same(g(" + QFPrefix + "), "
+                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))";
+            } else {
+                timePredicate += "tag_earlier(g(" + QFPrefix + "), "
+                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))";
+            }
+            timePredicate += ")";
         }
-        timePredicate += ")";
 
         return timePredicate;
     }
-
-    private String generateTimePredicate(long timeInstantNanoSec,
-        String QFPrefix, String prevQFIdx) {
-        return "tag_same(g(" + QFPrefix + "), "
-                + "tag_schedule(g(" + prevQFIdx + "), nsec(" + timeInstantNanoSec + ")))";
-    }
-}
\ No newline at end of file
+}

From 6e2a180c71318db37bdeb9643e97199e1d4f458a Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 8 Jul 2022 16:08:42 -0400
Subject: [PATCH 0036/1114] Transpile up to Quotient

---
 .../lflang/generator/uclid/MTLVisitor.java    | 66 +++++++++++++++----
 1 file changed, 53 insertions(+), 13 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
index 632eec320e..070e7f340c 100644
--- a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
@@ -173,18 +173,7 @@ public String visitUntil(MTLParser.UntilContext ctx,
         long currentHorizon = horizon + upperBoundNanoSec;
         String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
                                                     upperBoundNanoSec, QFPrefix, prevQFIdx);
-        // if (ctx.timeInterval instanceof MTLParser.SingletonContext) {
-        //     long timeInstantNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
-        //     currentHorizon = horizon + timeInstantNanoSec;
-        //     timePredicate = generateTimePredicate(timeInstantNanoSec, QFPrefix, prevQFIdx);
-        // } 
-        // else {
-        //     long lowerBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
-        //     long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
-        //     currentHorizon = horizon + upperBoundNanoSec;
-        //     timePredicate = generateTimePredicate((MTLParser.RangeContext)ctx.timeInterval,
-        //         lowerBoundNanoSec, upperBoundNanoSec, QFPrefix, prevQFIdx);           
-        // }
+
         return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
                 + "j" + QFIdx + " >= " + QFPrefix + " && " + "j" + QFIdx + " <= " + end
                 + " && " + "(" + _visitUnaryOp(ctx.right, ("j"+QFIdx), QFIdx+1, QFPrefix, currentHorizon) + ")"
@@ -297,7 +286,58 @@ else if (ctx.INTEGER() != null)
 
     public String visitSum(MTLParser.SumContext ctx,
         String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
-        return "";
+        
+        String str = "";
+        for (int i = 0; i < ctx.terms.size(); i++) {
+            str += "("
+                + visitDifference(ctx.terms.get(i),
+                QFPrefix, QFIdx, prevQFIdx, horizon)
+                + ")"
+                + (i == ctx.terms.size()-1 ? "" : "+");
+        }
+        return str;
+    }
+
+    public String visitDifference(MTLParser.DifferenceContext ctx,
+        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        
+        String str = "";
+        for (int i = 0; i < ctx.terms.size(); i++) {
+            str += "("
+                + visitProduct(ctx.terms.get(i),
+                QFPrefix, QFIdx, prevQFIdx, horizon)
+                + ")"
+                + (i == ctx.terms.size()-1 ? "" : "-");
+        }
+        return str;
+    }
+
+    public String visitProduct(MTLParser.ProductContext ctx,
+        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        
+        String str = "";
+        for (int i = 0; i < ctx.terms.size(); i++) {
+            str += "("
+                + visitQuotient(ctx.terms.get(i),
+                QFPrefix, QFIdx, prevQFIdx, horizon)
+                + ")"
+                + (i == ctx.terms.size()-1 ? "" : "*");
+        }
+        return str;
+    }
+
+    public String visitQuotient(MTLParser.QuotientContext ctx,
+        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        
+        String str = "";
+        for (int i = 0; i < ctx.terms.size(); i++) {
+            str += "("
+                + visitExpr(ctx.terms.get(i),
+                QFPrefix, QFIdx, prevQFIdx, horizon)
+                + ")"
+                + (i == ctx.terms.size()-1 ? "" : "/");
+        }
+        return str;
     }
 
     ///////////////////////////////////////

From a5311234c8c978f5af48d3b800ac3cd79e264913 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 8 Jul 2022 23:42:19 -0400
Subject: [PATCH 0037/1114] Generate properties

---
 .../lflang/generator/ReactionInstance.java    |   4 -
 .../lflang/generator/uclid/MTLVisitor.java    | 163 +++++++++---------
 .../generator/uclid/UclidGenerator.java       |  45 ++++-
 3 files changed, 122 insertions(+), 90 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/ReactionInstance.java b/org.lflang/src/org/lflang/generator/ReactionInstance.java
index b347023835..0ee81cd824 100644
--- a/org.lflang/src/org/lflang/generator/ReactionInstance.java
+++ b/org.lflang/src/org/lflang/generator/ReactionInstance.java
@@ -540,10 +540,6 @@ public ReactionInstance getReaction() {
             return ReactionInstance.this;
         }
 
-        public String getFullNameWithJoiner(String joiner) {
-            return this.getReaction().getFullNameWithJoiner(joiner) + joiner + "rid" + joiner + String.valueOf(this.id);
-        }
-
         @Override
         public String toString() {
             String result = ReactionInstance.this + "(level: " + level;
diff --git a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
index 070e7f340c..66676ed236 100644
--- a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
@@ -54,52 +54,52 @@ public MTLVisitor(String tactic) {
     ////////////////////////////////////////////
     //// Public methods
     public String visitMtl(MTLParser.MtlContext ctx,
-        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
 
         return visitEquivalence(ctx.equivalence(),
-            QFPrefix, QFIdx, prevQFIdx, horizon);
+            prefixIdx, QFIdx, prevPrefixIdx, horizon);
     }
 
     public String visitEquivalence(MTLParser.EquivalenceContext ctx,
-        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
 
         if (ctx.right == null) {
             return visitImplication(ctx.left,
-            QFPrefix, QFIdx, prevQFIdx, horizon);
+            prefixIdx, QFIdx, prevPrefixIdx, horizon);
         }
         return "(" + visitImplication(ctx.left,
-            QFPrefix, QFIdx, prevQFIdx, horizon) 
+            prefixIdx, QFIdx, prevPrefixIdx, horizon) 
             + ")"
             + " <==> " 
             + "(" + visitImplication(ctx.right,
-            QFPrefix, QFIdx, prevQFIdx, horizon)
+            prefixIdx, QFIdx, prevPrefixIdx, horizon)
             + ")";
     }
 
     public String visitImplication(MTLParser.ImplicationContext ctx,
-        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
         
         if (ctx.right == null) {
             return visitDisjunction(ctx.left,
-            QFPrefix, QFIdx, prevQFIdx, horizon);
+            prefixIdx, QFIdx, prevPrefixIdx, horizon);
         }
         return "(" + visitDisjunction(ctx.left,
-            QFPrefix, QFIdx, prevQFIdx, horizon) 
+            prefixIdx, QFIdx, prevPrefixIdx, horizon) 
             + ")"
             + " ==> " 
             + "(" + visitDisjunction(ctx.right,
-            QFPrefix, QFIdx, prevQFIdx, horizon)
+            prefixIdx, QFIdx, prevPrefixIdx, horizon)
             + ")";
     }
 
     public String visitDisjunction(MTLParser.DisjunctionContext ctx,
-        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
         
         String str = "";
         for (int i = 0; i < ctx.terms.size(); i++) {
             str += "("
                 + visitConjunction(ctx.terms.get(i),
-                QFPrefix, QFIdx, prevQFIdx, horizon)
+                prefixIdx, QFIdx, prevPrefixIdx, horizon)
                 + ")"
                 + (i == ctx.terms.size()-1 ? "" : "||");
         }
@@ -107,13 +107,13 @@ public String visitDisjunction(MTLParser.DisjunctionContext ctx,
     }
 
     public String visitConjunction(MTLParser.ConjunctionContext ctx,
-        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
         
         String str = "";
         for (int i = 0; i < ctx.terms.size(); i++) {
             str += "("
                 + visitUntil((MTLParser.UntilContext)ctx.terms.get(i),
-                    QFPrefix, QFIdx, prevQFIdx, horizon)
+                    prefixIdx, QFIdx, prevPrefixIdx, horizon)
                 + ")"
                 + (i == ctx.terms.size()-1 ? "" : "&&");
         }
@@ -122,28 +122,28 @@ public String visitConjunction(MTLParser.ConjunctionContext ctx,
 
     // A custom dispatch function
     public String _visitUnaryOp(MTLParser.UnaryOpContext ctx,
-        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
 
         // FIXME: Is there a more "antlr" way to do dispatch here?
         if (ctx instanceof MTLParser.NoUnaryOpContext) {
             return visitNoUnaryOp((MTLParser.NoUnaryOpContext)ctx, 
-                QFPrefix, QFIdx, prevQFIdx, horizon);
+                prefixIdx, QFIdx, prevPrefixIdx, horizon);
         }
         if (ctx instanceof MTLParser.NegationContext) {
             return visitNegation((MTLParser.NegationContext)ctx,
-                QFPrefix, QFIdx, prevQFIdx, horizon);
+                prefixIdx, QFIdx, prevPrefixIdx, horizon);
         }
         if (ctx instanceof MTLParser.NextContext) {
             return visitNext((MTLParser.NextContext)ctx,
-                QFPrefix, QFIdx, prevQFIdx, horizon);
+                prefixIdx, QFIdx, prevPrefixIdx, horizon);
         }
         if (ctx instanceof MTLParser.GloballyContext) {
             return visitGlobally((MTLParser.GloballyContext)ctx,
-                QFPrefix, QFIdx, prevQFIdx, horizon);
+                prefixIdx, QFIdx, prevPrefixIdx, horizon);
         }
         if (ctx instanceof MTLParser.FinallyContext) {
             return visitFinally((MTLParser.FinallyContext)ctx,
-                QFPrefix, QFIdx, prevQFIdx, horizon);
+                prefixIdx, QFIdx, prevPrefixIdx, horizon);
         }
 
         // FIXME: Throw an exception.
@@ -151,17 +151,17 @@ public String _visitUnaryOp(MTLParser.UnaryOpContext ctx,
     }
 
     public String visitUntil(MTLParser.UntilContext ctx,
-        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
 
         // If right is null, continue recursion.
         if (ctx.right == null) {
             return _visitUnaryOp(ctx.left,
-                QFPrefix, QFIdx, prevQFIdx, horizon);
+                prefixIdx, QFIdx, prevPrefixIdx, horizon);
         }
 
         String end;
         if (this.tactic.equals("induction")) {
-            end = "(" + QFPrefix + " + N)";
+            end = "(" + prefixIdx + " + CT)";
         } else {
             end = "END";
         }
@@ -172,43 +172,43 @@ public String visitUntil(MTLParser.UntilContext ctx,
         long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
         long currentHorizon = horizon + upperBoundNanoSec;
         String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
-                                                    upperBoundNanoSec, QFPrefix, prevQFIdx);
+                                                    upperBoundNanoSec, prefixIdx, prevPrefixIdx);
 
         return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
-                + "j" + QFIdx + " >= " + QFPrefix + " && " + "j" + QFIdx + " <= " + end
-                + " && " + "(" + _visitUnaryOp(ctx.right, ("j"+QFIdx), QFIdx+1, QFPrefix, currentHorizon) + ")"
+                + "j" + QFIdx + " >= " + prefixIdx + " && " + "j" + QFIdx + " <= " + end
+                + " && " + "(" + _visitUnaryOp(ctx.right, ("j"+QFIdx), QFIdx+1, prefixIdx, currentHorizon) + ")"
                 + " && " + "(" + "\n" 
                 + "// Time Predicate\n"
                 + timePredicate + "\n"
                 + ")" + " && " + "(" + "finite_forall " + "(" + "i" + QFIdx + " : integer) in indices :: "
-                + "(" + "i" + QFIdx + " >= " + QFPrefix + " && " + "i" + QFIdx + " < " + "j" + QFIdx + ")"
+                + "(" + "i" + QFIdx + " >= " + prefixIdx + " && " + "i" + QFIdx + " < " + "j" + QFIdx + ")"
                 + " ==> " + "(" + _visitUnaryOp(ctx.left, ("i"+QFIdx), QFIdx+1, ("j"+QFIdx), currentHorizon) + ")" + ")";
     }
 
     public String visitNoUnaryOp(MTLParser.NoUnaryOpContext ctx,
-        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
 
-        return visitPrimary(ctx.formula, QFPrefix, QFIdx, prevQFIdx, horizon);
+        return visitPrimary(ctx.formula, prefixIdx, QFIdx, prevPrefixIdx, horizon);
     }
 
     public String visitNegation(MTLParser.NegationContext ctx,
-        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
 
-        return "!(" + visitPrimary(ctx.formula, QFPrefix, QFIdx, prevQFIdx, horizon) + ")";
+        return "!(" + visitPrimary(ctx.formula, prefixIdx, QFIdx, prevPrefixIdx, horizon) + ")";
     }
 
     public String visitNext(MTLParser.NextContext ctx,
-        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
 
-        return visitPrimary(ctx.formula, ("(" + QFPrefix + "+1)"), QFIdx, prevQFIdx, horizon);
+        return visitPrimary(ctx.formula, ("(" + prefixIdx + "+1)"), QFIdx, prevPrefixIdx, horizon);
     }
 
     public String visitGlobally(MTLParser.GloballyContext ctx,
-        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
 
         String end;
         if (this.tactic.equals("induction")) {
-            end = "(" + QFPrefix + " + N)";
+            end = "(" + prefixIdx + " + CT)";
         } else {
             end = "END";
         }
@@ -217,10 +217,10 @@ public String visitGlobally(MTLParser.GloballyContext ctx,
         long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
         long currentHorizon = horizon + upperBoundNanoSec;
         String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
-                                                    upperBoundNanoSec, QFPrefix, prevQFIdx);        
+                                                    upperBoundNanoSec, prefixIdx, prevPrefixIdx);        
         return "!(" + "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
-                + "j" + QFIdx + " >= " + QFPrefix + " && " + "j" + QFIdx + " <= " + end
-                + " && " + "!" + "(" + visitPrimary(ctx.formula, ("j"+QFIdx), QFIdx+1, QFPrefix, currentHorizon) + ")"
+                + "j" + QFIdx + " >= " + prefixIdx + " && " + "j" + QFIdx + " <= " + end
+                + " && " + "!" + "(" + visitPrimary(ctx.formula, ("j"+QFIdx), QFIdx+1, prefixIdx, currentHorizon) + ")"
                 + " && " + "(" + "\n" 
                 + "// Time Predicate\n"
                 + timePredicate + "\n"
@@ -228,11 +228,11 @@ public String visitGlobally(MTLParser.GloballyContext ctx,
     }
 
     public String visitFinally(MTLParser.FinallyContext ctx,
-        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
 
         String end;
         if (this.tactic.equals("induction")) {
-            end = "(" + QFPrefix + " + N)";
+            end = "(" + prefixIdx + " + CT)";
         } else {
             end = "END";
         }
@@ -241,10 +241,10 @@ public String visitFinally(MTLParser.FinallyContext ctx,
         long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
         long currentHorizon = horizon + upperBoundNanoSec;
         String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
-                                                    upperBoundNanoSec, QFPrefix, prevQFIdx);        
+                                                    upperBoundNanoSec, prefixIdx, prevPrefixIdx);        
         return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
-                + "j" + QFIdx + " >= " + QFPrefix + " && " + "j" + QFIdx + " <= " + end
-                + " && " + "(" + visitPrimary(ctx.formula, ("j"+QFIdx), QFIdx+1, QFPrefix, currentHorizon) + ")"
+                + "j" + QFIdx + " >= " + prefixIdx + " && " + "j" + QFIdx + " <= " + end
+                + " && " + "(" + visitPrimary(ctx.formula, ("j"+QFIdx), QFIdx+1, prefixIdx, currentHorizon) + ")"
                 + " && " + "(" + "\n" 
                 + "// Time Predicate\n"
                 + timePredicate + "\n"
@@ -252,46 +252,55 @@ public String visitFinally(MTLParser.FinallyContext ctx,
     }
 
     public String visitPrimary(MTLParser.PrimaryContext ctx,
-        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
 
         if (ctx.atom != null)
-            return visitAtomicProp(ctx.atom, QFPrefix, QFIdx, prevQFIdx, horizon);
-        else if (ctx.id != null)
-            return ctx.id.getText();
+            return visitAtomicProp(ctx.atom, prefixIdx, QFIdx, prevPrefixIdx, horizon);
+        else if (ctx.id != null) {
+            // Check if the ID is a reaction.
+            // FIXME: Not robust.
+            if (ctx.id.getText().contains("_reaction_")) {
+                return "rxn(" + prefixIdx + ") == " + ctx.id.getText();
+            } else if (ctx.id.getText().contains("_is_present")) { 
+                return ctx.id.getText() + "(" + "t(" + prefixIdx + ")" + ")";
+            } else {
+                return ctx.id.getText() + "(" + "s(" + prefixIdx + ")" + ")";
+            }
+        }
         else
-            return visitMtl(ctx.formula, QFPrefix, QFIdx, prevQFIdx, horizon);
+            return visitMtl(ctx.formula, prefixIdx, QFIdx, prevPrefixIdx, horizon);
     }
 
     public String visitAtomicProp(MTLParser.AtomicPropContext ctx,
-        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
 
         if (ctx.primitive != null)
             return ctx.primitive.getText();
         else
-            return visitExpr(ctx.left, QFPrefix, QFIdx, prevQFIdx, horizon)
+            return visitExpr(ctx.left, prefixIdx, QFIdx, prevPrefixIdx, horizon)
                     + " " + ctx.op.getText() + " "
-                    + visitExpr(ctx.right, QFPrefix, QFIdx, prevQFIdx, horizon);
+                    + visitExpr(ctx.right, prefixIdx, QFIdx, prevPrefixIdx, horizon);
     }
 
     public String visitExpr(MTLParser.ExprContext ctx,
-        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
 
         if (ctx.ID() != null)
-            return ctx.ID().getText();
+            return ctx.ID().getText() + "(" + "s(" + prefixIdx + ")" + ")";
         else if (ctx.INTEGER() != null)
             return ctx.INTEGER().getText();
         else
-            return visitSum(ctx.sum(), QFPrefix, QFIdx, prevQFIdx, horizon);
+            return visitSum(ctx.sum(), prefixIdx, QFIdx, prevPrefixIdx, horizon);
     }
 
     public String visitSum(MTLParser.SumContext ctx,
-        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
         
         String str = "";
         for (int i = 0; i < ctx.terms.size(); i++) {
             str += "("
                 + visitDifference(ctx.terms.get(i),
-                QFPrefix, QFIdx, prevQFIdx, horizon)
+                prefixIdx, QFIdx, prevPrefixIdx, horizon)
                 + ")"
                 + (i == ctx.terms.size()-1 ? "" : "+");
         }
@@ -299,13 +308,13 @@ public String visitSum(MTLParser.SumContext ctx,
     }
 
     public String visitDifference(MTLParser.DifferenceContext ctx,
-        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
         
         String str = "";
         for (int i = 0; i < ctx.terms.size(); i++) {
             str += "("
                 + visitProduct(ctx.terms.get(i),
-                QFPrefix, QFIdx, prevQFIdx, horizon)
+                prefixIdx, QFIdx, prevPrefixIdx, horizon)
                 + ")"
                 + (i == ctx.terms.size()-1 ? "" : "-");
         }
@@ -313,13 +322,13 @@ public String visitDifference(MTLParser.DifferenceContext ctx,
     }
 
     public String visitProduct(MTLParser.ProductContext ctx,
-        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
         
         String str = "";
         for (int i = 0; i < ctx.terms.size(); i++) {
             str += "("
                 + visitQuotient(ctx.terms.get(i),
-                QFPrefix, QFIdx, prevQFIdx, horizon)
+                prefixIdx, QFIdx, prevPrefixIdx, horizon)
                 + ")"
                 + (i == ctx.terms.size()-1 ? "" : "*");
         }
@@ -327,13 +336,13 @@ public String visitProduct(MTLParser.ProductContext ctx,
     }
 
     public String visitQuotient(MTLParser.QuotientContext ctx,
-        String QFPrefix, int QFIdx, String prevQFIdx, long horizon) {
+        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
         
         String str = "";
         for (int i = 0; i < ctx.terms.size(); i++) {
             str += "("
                 + visitExpr(ctx.terms.get(i),
-                QFPrefix, QFIdx, prevQFIdx, horizon)
+                prefixIdx, QFIdx, prevPrefixIdx, horizon)
                 + ")"
                 + (i == ctx.terms.size()-1 ? "" : "/");
         }
@@ -405,35 +414,35 @@ private long getNanoSecFromIntervalContext(MTLParser.IntervalContext ctx, boolea
      */
     private String generateTimePredicate(MTLParser.IntervalContext ctx,
         long lowerBoundNanoSec, long upperBoundNanoSec,
-        String QFPrefix, String prevQFIdx) {
+        String prefixIdx, String prevPrefixIdx) {
         String timePredicate = "";
 
         if (ctx instanceof MTLParser.SingletonContext) {
             MTLParser.SingletonContext singletonCtx = (MTLParser.SingletonContext)ctx;
-            timePredicate += "tag_same(g(" + QFPrefix + "), " + "tag_schedule(g(" 
-                                + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))";
+            timePredicate += "tag_same(g(" + prefixIdx + "), " + "tag_schedule(g(" 
+                                + prevPrefixIdx + "), nsec(" + upperBoundNanoSec + ")))";
         } else {
             MTLParser.RangeContext rangeCtx = (MTLParser.RangeContext)ctx;
             timePredicate += "(";
             if (rangeCtx.LBRACKET() != null) {
                 // FIXME: Check if this can be replaced by a !tag_earlier.
-                timePredicate += "tag_later(g(" + QFPrefix + "), "
-                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + lowerBoundNanoSec + ")))"
-                    + " || " + "tag_same(g(" + QFPrefix + "), "
-                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + lowerBoundNanoSec + ")))";
+                timePredicate += "tag_later(g(" + prefixIdx + "), "
+                    + "tag_schedule(g(" + prevPrefixIdx + "), nsec(" + lowerBoundNanoSec + ")))"
+                    + " || " + "tag_same(g(" + prefixIdx + "), "
+                    + "tag_schedule(g(" + prevPrefixIdx + "), nsec(" + lowerBoundNanoSec + ")))";
             } else {
-                timePredicate += "tag_later(g(" + QFPrefix + "), "
-                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + lowerBoundNanoSec + ")))";
+                timePredicate += "tag_later(g(" + prefixIdx + "), "
+                    + "tag_schedule(g(" + prevPrefixIdx + "), nsec(" + lowerBoundNanoSec + ")))";
             }
             timePredicate += ") && (";
             if (rangeCtx.RBRACKET() != null) {
-                timePredicate += "tag_earlier(g(" + QFPrefix + "), "
-                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))"
-                    + " || " + "tag_same(g(" + QFPrefix + "), "
-                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))";
+                timePredicate += "tag_earlier(g(" + prefixIdx + "), "
+                    + "tag_schedule(g(" + prevPrefixIdx + "), nsec(" + upperBoundNanoSec + ")))"
+                    + " || " + "tag_same(g(" + prefixIdx + "), "
+                    + "tag_schedule(g(" + prevPrefixIdx + "), nsec(" + upperBoundNanoSec + ")))";
             } else {
-                timePredicate += "tag_earlier(g(" + QFPrefix + "), "
-                    + "tag_schedule(g(" + prevQFIdx + "), nsec(" + upperBoundNanoSec + ")))";
+                timePredicate += "tag_earlier(g(" + prefixIdx + "), "
+                    + "tag_schedule(g(" + prevPrefixIdx + "), nsec(" + upperBoundNanoSec + ")))";
             }
             timePredicate += ")";
         }
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 212d2de23d..2e1877c778 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -362,9 +362,9 @@ protected void generateTraceDefinition(int CT) {
             "const START : integer = 0;",
             "const END : integer = " + String.valueOf(CT-1) + ";",
             "",
-            "// trace length = k + N",
+            "// trace length = k + CT",
             "const k : integer = 1;    // 1-induction should be enough.",
-            "const N : integer = " + String.valueOf(CT) + ";" + "// The property bound",
+            "const CT : integer = " + String.valueOf(CT) + ";" + "// The completeness threshold",
             "\n"
         ));
 
@@ -479,7 +479,7 @@ protected void generateReactionIdsAndStateVars() {
         for (var rxn : this.reactionInstances) {
             // Print a list of reaction IDs.
             // Add a comma if not last.
-            code.pr(rxn.getFullNameWithJoiner("_") + ",");
+            code.pr(rxn.getReaction().getFullNameWithJoiner("_") + ",");
         }
         code.pr("NULL");
         code.unindent();
@@ -590,8 +590,8 @@ protected void generateReactorSemantics() {
             var downstreamReactions = upstreamRuntime.getReaction().dependentReactions();
             for (var downstream : downstreamReactions) {
                 for (var downstreamRuntime : downstream.getRuntimeInstances()) {
-                    code.pr("|| (e1._1 == " + upstreamRuntime.getFullNameWithJoiner("_")
-                            + " && e2._1 == " + downstreamRuntime.getFullNameWithJoiner("_") + ")");
+                    code.pr("|| (e1._1 == " + upstreamRuntime.getReaction().getFullNameWithJoiner("_")
+                            + " && e2._1 == " + downstreamRuntime.getReaction().getFullNameWithJoiner("_") + ")");
                 }
             }
         }
@@ -748,7 +748,7 @@ protected void generateTriggersAndReactions() {
         // to be triggered.
         for (ReactionInstance.Runtime reaction : this.reactionInstances) {
             code.pr(String.join("\n", 
-                "// " + reaction.getFullNameWithJoiner("_") + " is invoked when any of it triggers are present.",
+                "// " + reaction.getReaction().getFullNameWithJoiner("_") + " is invoked when any of it triggers are present.",
                 "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> ((",
                 "    false"
             ));
@@ -782,7 +782,7 @@ protected void generateTriggersAndReactions() {
                 for (var instance : trigger.getDependentReactions()) {
                     for (var runtime : ((ReactionInstance)instance).getRuntimeInstances()) {
                         if (runtime == reaction) continue; // Skip the current reaction.
-                        exclusion += " && rxn(i) != " + runtime.getFullNameWithJoiner("_");
+                        exclusion += " && rxn(i) != " + runtime.getReaction().getFullNameWithJoiner("_");
                     }
                 }
                 
@@ -791,7 +791,7 @@ protected void generateTriggersAndReactions() {
 
             // If any of the above trigger is present, then trigger the reaction.
             code.unindent();
-            code.pr(") <==> (rxn(i) == " + reaction.getFullNameWithJoiner("_") + ")));");
+            code.pr(") <==> (rxn(i) == " + reaction.getReaction().getFullNameWithJoiner("_") + ")));");
         }
     }
 
@@ -866,7 +866,34 @@ protected void generateProperty(Attribute property, int CT) {
 
         // The visitor transpiles the MTL into a Uclid axiom.
         String transpiled = visitor.visitMtl(mtlCtx, "i", 0, "0", 0);
-        code.pr(transpiled);
+        
+        code.pr("// The FOL property translated from user-defined MTL property:");
+        code.pr("// " + spec);
+        code.pr("define p(i : step_t) : boolean =");
+        code.indent();
+        code.pr(transpiled + ";");
+        code.unindent();
+
+        // FIXME: No need for this since we are doing 1-induction.
+        // code.pr(String.join("\n", 
+        //     "// Helper macro for temporal induction",
+        //     "define Globally_p(start, end : step_t) : boolean =",
+        //     "    (finite_forall (i : integer) in indices :: (i >= start && i <= end) ==> p(i));"
+        // ));
+
+        if (tactic.equals("bmc")) {
+            code.pr(String.join("\n", 
+                "// BMC",
+                "property " + "bmc_" + name + " : " + "initial_condition() ==> p(0);"
+            ));
+        } else {
+            code.pr(String.join("\n", 
+                "// Induction: initiation step",
+                "property " + "initiation_" + name + " : " + "initial_condition() ==> p(0);",
+                "// Induction: consecution step",
+                "property " + "consecution_" + name + " : " + "p(0) ==> p(1);"
+            ));
+        }
     }
 
     /**

From ba15655e6d5f3eb568f0ec3c90d8cbf0379b7901 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Tue, 19 Jul 2022 17:00:13 -0700
Subject: [PATCH 0038/1114] Add C grammar and AST visitors

---
 org.lflang/src/org/lflang/dsl/antlr4/C.g4     | 908 ++++++++++++++++++
 .../uclid/ast/AbstractAstVisitor.java         |  17 +
 .../generator/uclid/ast/AstVisitor.java       |  25 +
 .../uclid/ast/BuildAstParseTreeVisitor.java   | 642 +++++++++++++
 .../org/lflang/generator/uclid/ast/CAst.java  | 341 +++++++
 .../generator/uclid/ast/CAstVisitor.java      |  74 ++
 .../generator/uclid/ast/CBaseAstVisitor.java  | 381 ++++++++
 .../uclid/ast/IfNormalFormAstVisitor.java     | 111 +++
 .../lflang/generator/uclid/ast/Visitable.java |  12 +
 9 files changed, 2511 insertions(+)
 create mode 100644 org.lflang/src/org/lflang/dsl/antlr4/C.g4
 create mode 100644 org.lflang/src/org/lflang/generator/uclid/ast/AbstractAstVisitor.java
 create mode 100644 org.lflang/src/org/lflang/generator/uclid/ast/AstVisitor.java
 create mode 100644 org.lflang/src/org/lflang/generator/uclid/ast/BuildAstParseTreeVisitor.java
 create mode 100644 org.lflang/src/org/lflang/generator/uclid/ast/CAst.java
 create mode 100644 org.lflang/src/org/lflang/generator/uclid/ast/CAstVisitor.java
 create mode 100644 org.lflang/src/org/lflang/generator/uclid/ast/CBaseAstVisitor.java
 create mode 100644 org.lflang/src/org/lflang/generator/uclid/ast/IfNormalFormAstVisitor.java
 create mode 100644 org.lflang/src/org/lflang/generator/uclid/ast/Visitable.java

diff --git a/org.lflang/src/org/lflang/dsl/antlr4/C.g4 b/org.lflang/src/org/lflang/dsl/antlr4/C.g4
new file mode 100644
index 0000000000..2fd6c3aedf
--- /dev/null
+++ b/org.lflang/src/org/lflang/dsl/antlr4/C.g4
@@ -0,0 +1,908 @@
+/*
+ [The "BSD licence"]
+ Copyright (c) 2013 Sam Harwell
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/** C 2011 grammar built from the C11 Spec */
+grammar C;
+
+
+primaryExpression
+    :   Identifier
+    |   Constant
+    |   StringLiteral+
+    |   '(' expression ')'
+    |   genericSelection
+    |   '__extension__'? '(' compoundStatement ')' // Blocks (GCC extension)
+    |   '__builtin_va_arg' '(' unaryExpression ',' typeName ')'
+    |   '__builtin_offsetof' '(' typeName ',' unaryExpression ')'
+    ;
+
+genericSelection
+    :   '_Generic' '(' assignmentExpression ',' genericAssocList ')'
+    ;
+
+genericAssocList
+    :   genericAssociation (',' genericAssociation)*
+    ;
+
+genericAssociation
+    :   (typeName | 'default') ':' assignmentExpression
+    ;
+
+postfixExpression
+    :
+    (   primaryExpression
+    |   '__extension__'? '(' typeName ')' '{' initializerList ','? '}'
+    )
+    ('[' expression ']'
+    | '(' argumentExpressionList? ')'
+    | ('.' | '->') Identifier
+    | ('++' | '--')
+    )*
+    ;
+
+argumentExpressionList
+    :   assignmentExpression (',' assignmentExpression)*
+    ;
+
+unaryExpression
+    :
+    ('++' |  '--' |  'sizeof')*
+    (postfixExpression
+    |   unaryOperator castExpression
+    |   ('sizeof' | '_Alignof') '(' typeName ')'
+    |   '&&' Identifier // GCC extension address of label
+    )
+    ;
+
+unaryOperator
+    :   '&' | '*' | '+' | '-' | '~' | '!'
+    ;
+
+castExpression
+    :   '__extension__'? '(' typeName ')' castExpression
+    |   unaryExpression
+    |   DigitSequence // for
+    ;
+
+multiplicativeExpression
+    :   castExpression (('*'|'/'|'%') castExpression)*
+    ;
+
+additiveExpression
+    :   multiplicativeExpression (('+'|'-') multiplicativeExpression)*
+    ;
+
+shiftExpression
+    :   additiveExpression (('<<'|'>>') additiveExpression)*
+    ;
+
+relationalExpression
+    :   shiftExpression (('<'|'>'|'<='|'>=') shiftExpression)*
+    ;
+
+equalityExpression
+    :   relationalExpression (('=='| '!=') relationalExpression)*
+    ;
+
+andExpression
+    :   equalityExpression ( '&' equalityExpression)*
+    ;
+
+exclusiveOrExpression
+    :   andExpression ('^' andExpression)*
+    ;
+
+inclusiveOrExpression
+    :   exclusiveOrExpression ('|' exclusiveOrExpression)*
+    ;
+
+logicalAndExpression
+    :   inclusiveOrExpression ('&&' inclusiveOrExpression)*
+    ;
+
+logicalOrExpression
+    :   logicalAndExpression ( '||' logicalAndExpression)*
+    ;
+
+conditionalExpression
+    :   logicalOrExpression ('?' expression ':' conditionalExpression)?
+    ;
+
+assignmentExpression
+    :   conditionalExpression
+    |   unaryExpression assignmentOperator assignmentExpression
+    |   DigitSequence // for
+    ;
+
+assignmentOperator
+    :   '=' | '*=' | '/=' | '%=' | '+=' | '-=' | '<<=' | '>>=' | '&=' | '^=' | '|='
+    ;
+
+expression
+    :   assignmentExpression (',' assignmentExpression)*
+    ;
+
+constantExpression
+    :   conditionalExpression
+    ;
+
+declaration
+    :   declarationSpecifiers initDeclaratorList? ';'
+    |   staticAssertDeclaration
+    ;
+
+declarationSpecifiers
+    :   declarationSpecifier+
+    ;
+
+declarationSpecifiers2
+    :   declarationSpecifier+
+    ;
+
+declarationSpecifier
+    :   storageClassSpecifier
+    |   typeSpecifier
+    |   typeQualifier
+    |   functionSpecifier
+    |   alignmentSpecifier
+    ;
+
+initDeclaratorList
+    :   initDeclarator (',' initDeclarator)*
+    ;
+
+initDeclarator
+    :   declarator ('=' initializer)?
+    ;
+
+storageClassSpecifier
+    :   'typedef'
+    |   'extern'
+    |   'static'
+    |   '_Thread_local'
+    |   'auto'
+    |   'register'
+    ;
+
+typeSpecifier
+    :   ('void'
+    |   'char'
+    |   'short'
+    |   'int'
+    |   'long'
+    |   'float'
+    |   'double'
+    |   'signed'
+    |   'unsigned'
+    |   '_Bool'
+    |   '_Complex'
+    |   '__m128'
+    |   '__m128d'
+    |   '__m128i')
+    |   '__extension__' '(' ('__m128' | '__m128d' | '__m128i') ')'
+    |   atomicTypeSpecifier
+    |   structOrUnionSpecifier
+    |   enumSpecifier
+    |   typedefName
+    |   '__typeof__' '(' constantExpression ')' // GCC extension
+    ;
+
+structOrUnionSpecifier
+    :   structOrUnion Identifier? '{' structDeclarationList '}'
+    |   structOrUnion Identifier
+    ;
+
+structOrUnion
+    :   'struct'
+    |   'union'
+    ;
+
+structDeclarationList
+    :   structDeclaration+
+    ;
+
+structDeclaration // The first two rules have priority order and cannot be simplified to one expression.
+    :   specifierQualifierList structDeclaratorList ';'
+    |   specifierQualifierList ';'
+    |   staticAssertDeclaration
+    ;
+
+specifierQualifierList
+    :   (typeSpecifier| typeQualifier) specifierQualifierList?
+    ;
+
+structDeclaratorList
+    :   structDeclarator (',' structDeclarator)*
+    ;
+
+structDeclarator
+    :   declarator
+    |   declarator? ':' constantExpression
+    ;
+
+enumSpecifier
+    :   'enum' Identifier? '{' enumeratorList ','? '}'
+    |   'enum' Identifier
+    ;
+
+enumeratorList
+    :   enumerator (',' enumerator)*
+    ;
+
+enumerator
+    :   enumerationConstant ('=' constantExpression)?
+    ;
+
+enumerationConstant
+    :   Identifier
+    ;
+
+atomicTypeSpecifier
+    :   '_Atomic' '(' typeName ')'
+    ;
+
+typeQualifier
+    :   'const'
+    |   'restrict'
+    |   'volatile'
+    |   '_Atomic'
+    ;
+
+functionSpecifier
+    :   ('inline'
+    |   '_Noreturn'
+    |   '__inline__' // GCC extension
+    |   '__stdcall')
+    |   gccAttributeSpecifier
+    |   '__declspec' '(' Identifier ')'
+    ;
+
+alignmentSpecifier
+    :   '_Alignas' '(' (typeName | constantExpression) ')'
+    ;
+
+declarator
+    :   pointer? directDeclarator gccDeclaratorExtension*
+    ;
+
+directDeclarator
+    :   Identifier
+    |   '(' declarator ')'
+    |   directDeclarator '[' typeQualifierList? assignmentExpression? ']'
+    |   directDeclarator '[' 'static' typeQualifierList? assignmentExpression ']'
+    |   directDeclarator '[' typeQualifierList 'static' assignmentExpression ']'
+    |   directDeclarator '[' typeQualifierList? '*' ']'
+    |   directDeclarator '(' parameterTypeList ')'
+    |   directDeclarator '(' identifierList? ')'
+    |   Identifier ':' DigitSequence  // bit field
+    |   vcSpecificModifer Identifier // Visual C Extension
+    |   '(' vcSpecificModifer declarator ')' // Visual C Extension
+    ;
+
+vcSpecificModifer
+    :   ('__cdecl' 
+    |   '__clrcall' 
+    |   '__stdcall' 
+    |   '__fastcall' 
+    |   '__thiscall' 
+    |   '__vectorcall') 
+    ;
+
+
+gccDeclaratorExtension
+    :   '__asm' '(' StringLiteral+ ')'
+    |   gccAttributeSpecifier
+    ;
+
+gccAttributeSpecifier
+    :   '__attribute__' '(' '(' gccAttributeList ')' ')'
+    ;
+
+gccAttributeList
+    :   gccAttribute? (',' gccAttribute?)*
+    ;
+
+gccAttribute
+    :   ~(',' | '(' | ')') // relaxed def for "identifier or reserved word"
+        ('(' argumentExpressionList? ')')?
+    ;
+
+nestedParenthesesBlock
+    :   (   ~('(' | ')')
+        |   '(' nestedParenthesesBlock ')'
+        )*
+    ;
+
+pointer
+    :  (('*'|'^') typeQualifierList?)+ // ^ - Blocks language extension
+    ;
+
+typeQualifierList
+    :   typeQualifier+
+    ;
+
+parameterTypeList
+    :   parameterList (',' '...')?
+    ;
+
+parameterList
+    :   parameterDeclaration (',' parameterDeclaration)*
+    ;
+
+parameterDeclaration
+    :   declarationSpecifiers declarator
+    |   declarationSpecifiers2 abstractDeclarator?
+    ;
+
+identifierList
+    :   Identifier (',' Identifier)*
+    ;
+
+typeName
+    :   specifierQualifierList abstractDeclarator?
+    ;
+
+abstractDeclarator
+    :   pointer
+    |   pointer? directAbstractDeclarator gccDeclaratorExtension*
+    ;
+
+directAbstractDeclarator
+    :   '(' abstractDeclarator ')' gccDeclaratorExtension*
+    |   '[' typeQualifierList? assignmentExpression? ']'
+    |   '[' 'static' typeQualifierList? assignmentExpression ']'
+    |   '[' typeQualifierList 'static' assignmentExpression ']'
+    |   '[' '*' ']'
+    |   '(' parameterTypeList? ')' gccDeclaratorExtension*
+    |   directAbstractDeclarator '[' typeQualifierList? assignmentExpression? ']'
+    |   directAbstractDeclarator '[' 'static' typeQualifierList? assignmentExpression ']'
+    |   directAbstractDeclarator '[' typeQualifierList 'static' assignmentExpression ']'
+    |   directAbstractDeclarator '[' '*' ']'
+    |   directAbstractDeclarator '(' parameterTypeList? ')' gccDeclaratorExtension*
+    ;
+
+typedefName
+    :   Identifier
+    ;
+
+initializer
+    :   assignmentExpression
+    |   '{' initializerList ','? '}'
+    ;
+
+initializerList
+    :   designation? initializer (',' designation? initializer)*
+    ;
+
+designation
+    :   designatorList '='
+    ;
+
+designatorList
+    :   designator+
+    ;
+
+designator
+    :   '[' constantExpression ']'
+    |   '.' Identifier
+    ;
+
+staticAssertDeclaration
+    :   '_Static_assert' '(' constantExpression ',' StringLiteral+ ')' ';'
+    ;
+
+statement
+    :   labeledStatement
+    |   compoundStatement
+    |   expressionStatement
+    |   selectionStatement
+    |   iterationStatement
+    |   jumpStatement
+    |   ('__asm' | '__asm__') ('volatile' | '__volatile__') '(' (logicalOrExpression (',' logicalOrExpression)*)? (':' (logicalOrExpression (',' logicalOrExpression)*)?)* ')' ';'
+    ;
+
+labeledStatement
+    :   Identifier ':' statement
+    |   'case' constantExpression ':' statement
+    |   'default' ':' statement
+    ;
+
+compoundStatement
+    :   '{' blockItemList? '}'
+    ;
+
+blockItemList
+    :   blockItem+
+    ;
+
+// Reaction body is a blockItem.
+blockItem
+    :   statement
+    |   declaration
+    ;
+
+expressionStatement
+    :   expression? ';'
+    ;
+
+selectionStatement
+    :   'if' '(' expression ')' statement ('else' statement)?
+    |   'switch' '(' expression ')' statement
+    ;
+
+iterationStatement
+    :   While '(' expression ')' statement
+    |   Do statement While '(' expression ')' ';'
+    |   For '(' forCondition ')' statement
+    ;
+
+//    |   'for' '(' expression? ';' expression?  ';' forUpdate? ')' statement
+//    |   For '(' declaration  expression? ';' expression? ')' statement
+
+forCondition
+	:   (forDeclaration | expression?) ';' forExpression? ';' forExpression?
+	;
+
+forDeclaration
+    :   declarationSpecifiers initDeclaratorList?
+    ;
+
+forExpression
+    :   assignmentExpression (',' assignmentExpression)*
+    ;
+
+jumpStatement
+    :   ('goto' Identifier
+    |   ('continue'| 'break')
+    |   'return' expression?
+    |   'goto' unaryExpression // GCC extension
+    )
+    ';'
+    ;
+
+compilationUnit
+    :   translationUnit? EOF
+    ;
+
+translationUnit
+    :   externalDeclaration+
+    ;
+
+externalDeclaration
+    :   functionDefinition
+    |   declaration
+    |   ';' // stray ;
+    ;
+
+functionDefinition
+    :   declarationSpecifiers? declarator declarationList? compoundStatement
+    ;
+
+declarationList
+    :   declaration+
+    ;
+
+Auto : 'auto';
+Break : 'break';
+Case : 'case';
+Char : 'char';
+Const : 'const';
+Continue : 'continue';
+Default : 'default';
+Do : 'do';
+Double : 'double';
+Else : 'else';
+Enum : 'enum';
+Extern : 'extern';
+Float : 'float';
+For : 'for';
+Goto : 'goto';
+If : 'if';
+Inline : 'inline';
+Int : 'int';
+Long : 'long';
+Register : 'register';
+Restrict : 'restrict';
+Return : 'return';
+Short : 'short';
+Signed : 'signed';
+Sizeof : 'sizeof';
+Static : 'static';
+Struct : 'struct';
+Switch : 'switch';
+Typedef : 'typedef';
+Union : 'union';
+Unsigned : 'unsigned';
+Void : 'void';
+Volatile : 'volatile';
+While : 'while';
+
+Alignas : '_Alignas';
+Alignof : '_Alignof';
+Atomic : '_Atomic';
+Bool : '_Bool';
+Complex : '_Complex';
+Generic : '_Generic';
+Imaginary : '_Imaginary';
+Noreturn : '_Noreturn';
+StaticAssert : '_Static_assert';
+ThreadLocal : '_Thread_local';
+
+LeftParen : '(';
+RightParen : ')';
+LeftBracket : '[';
+RightBracket : ']';
+LeftBrace : '{';
+RightBrace : '}';
+
+Less : '<';
+LessEqual : '<=';
+Greater : '>';
+GreaterEqual : '>=';
+LeftShift : '<<';
+RightShift : '>>';
+
+Plus : '+';
+PlusPlus : '++';
+Minus : '-';
+MinusMinus : '--';
+Star : '*';
+Div : '/';
+Mod : '%';
+
+And : '&';
+Or : '|';
+AndAnd : '&&';
+OrOr : '||';
+Caret : '^';
+Not : '!';
+Tilde : '~';
+
+Question : '?';
+Colon : ':';
+Semi : ';';
+Comma : ',';
+
+Assign : '=';
+// '*=' | '/=' | '%=' | '+=' | '-=' | '<<=' | '>>=' | '&=' | '^=' | '|='
+StarAssign : '*=';
+DivAssign : '/=';
+ModAssign : '%=';
+PlusAssign : '+=';
+MinusAssign : '-=';
+LeftShiftAssign : '<<=';
+RightShiftAssign : '>>=';
+AndAssign : '&=';
+XorAssign : '^=';
+OrAssign : '|=';
+
+Equal : '==';
+NotEqual : '!=';
+
+Arrow : '->';
+Dot : '.';
+Ellipsis : '...';
+
+Identifier
+    :   IdentifierNondigit
+        (   IdentifierNondigit
+        |   Digit
+        )*
+    ;
+
+fragment
+IdentifierNondigit
+    :   Nondigit
+    |   UniversalCharacterName
+    //|   // other implementation-defined characters...
+    ;
+
+fragment
+Nondigit
+    :   [a-zA-Z_]
+    ;
+
+fragment
+Digit
+    :   [0-9]
+    ;
+
+fragment
+UniversalCharacterName
+    :   '\\u' HexQuad
+    |   '\\U' HexQuad HexQuad
+    ;
+
+fragment
+HexQuad
+    :   HexadecimalDigit HexadecimalDigit HexadecimalDigit HexadecimalDigit
+    ;
+
+Constant
+    :   IntegerConstant
+    |   FloatingConstant
+    //|   EnumerationConstant
+    |   CharacterConstant
+    ;
+
+fragment
+IntegerConstant
+    :   DecimalConstant IntegerSuffix?
+    |   OctalConstant IntegerSuffix?
+    |   HexadecimalConstant IntegerSuffix?
+    |	BinaryConstant
+    ;
+
+fragment
+BinaryConstant
+	:	'0' [bB] [0-1]+
+	;
+
+fragment
+DecimalConstant
+    :   NonzeroDigit Digit*
+    ;
+
+fragment
+OctalConstant
+    :   '0' OctalDigit*
+    ;
+
+fragment
+HexadecimalConstant
+    :   HexadecimalPrefix HexadecimalDigit+
+    ;
+
+fragment
+HexadecimalPrefix
+    :   '0' [xX]
+    ;
+
+fragment
+NonzeroDigit
+    :   [1-9]
+    ;
+
+fragment
+OctalDigit
+    :   [0-7]
+    ;
+
+fragment
+HexadecimalDigit
+    :   [0-9a-fA-F]
+    ;
+
+fragment
+IntegerSuffix
+    :   UnsignedSuffix LongSuffix?
+    |   UnsignedSuffix LongLongSuffix
+    |   LongSuffix UnsignedSuffix?
+    |   LongLongSuffix UnsignedSuffix?
+    ;
+
+fragment
+UnsignedSuffix
+    :   [uU]
+    ;
+
+fragment
+LongSuffix
+    :   [lL]
+    ;
+
+fragment
+LongLongSuffix
+    :   'll' | 'LL'
+    ;
+
+fragment
+FloatingConstant
+    :   DecimalFloatingConstant
+    |   HexadecimalFloatingConstant
+    ;
+
+fragment
+DecimalFloatingConstant
+    :   FractionalConstant ExponentPart? FloatingSuffix?
+    |   DigitSequence ExponentPart FloatingSuffix?
+    ;
+
+fragment
+HexadecimalFloatingConstant
+    :   HexadecimalPrefix (HexadecimalFractionalConstant | HexadecimalDigitSequence) BinaryExponentPart FloatingSuffix?
+    ;
+
+fragment
+FractionalConstant
+    :   DigitSequence? '.' DigitSequence
+    |   DigitSequence '.'
+    ;
+
+fragment
+ExponentPart
+    :   [eE] Sign? DigitSequence
+    ;
+
+fragment
+Sign
+    :   [+-]
+    ;
+
+DigitSequence
+    :   Digit+
+    ;
+
+fragment
+HexadecimalFractionalConstant
+    :   HexadecimalDigitSequence? '.' HexadecimalDigitSequence
+    |   HexadecimalDigitSequence '.'
+    ;
+
+fragment
+BinaryExponentPart
+    :   [pP] Sign? DigitSequence
+    ;
+
+fragment
+HexadecimalDigitSequence
+    :   HexadecimalDigit+
+    ;
+
+fragment
+FloatingSuffix
+    :   [flFL]
+    ;
+
+fragment
+CharacterConstant
+    :   '\'' CCharSequence '\''
+    |   'L\'' CCharSequence '\''
+    |   'u\'' CCharSequence '\''
+    |   'U\'' CCharSequence '\''
+    ;
+
+fragment
+CCharSequence
+    :   CChar+
+    ;
+
+fragment
+CChar
+    :   ~['\\\r\n]
+    |   EscapeSequence
+    ;
+
+fragment
+EscapeSequence
+    :   SimpleEscapeSequence
+    |   OctalEscapeSequence
+    |   HexadecimalEscapeSequence
+    |   UniversalCharacterName
+    ;
+
+fragment
+SimpleEscapeSequence
+    :   '\\' ['"?abfnrtv\\]
+    ;
+
+fragment
+OctalEscapeSequence
+    :   '\\' OctalDigit OctalDigit? OctalDigit?
+    ;
+
+fragment
+HexadecimalEscapeSequence
+    :   '\\x' HexadecimalDigit+
+    ;
+
+StringLiteral
+    :   EncodingPrefix? '"' SCharSequence? '"'
+    ;
+
+fragment
+EncodingPrefix
+    :   'u8'
+    |   'u'
+    |   'U'
+    |   'L'
+    ;
+
+fragment
+SCharSequence
+    :   SChar+
+    ;
+
+fragment
+SChar
+    :   ~["\\\r\n]
+    |   EscapeSequence
+    |   '\\\n'   // Added line
+    |   '\\\r\n' // Added line
+    ;
+
+ComplexDefine
+    :   '#' Whitespace? 'define'  ~[#\r\n]*
+        -> skip
+    ;
+
+IncludeDirective
+    :   '#' Whitespace? 'include' Whitespace? (('"' ~[\r\n]* '"') | ('<' ~[\r\n]* '>' )) Whitespace? Newline
+        -> skip
+    ;
+
+// ignore the following asm blocks:
+/*
+    asm
+    {
+        mfspr x, 286;
+    }
+ */
+AsmBlock
+    :   'asm' ~'{'* '{' ~'}'* '}'
+	-> skip
+    ;
+
+// ignore the lines generated by c preprocessor
+// sample line : '#line 1 "/home/dm/files/dk1.h" 1'
+LineAfterPreprocessing
+    :   '#line' Whitespace* ~[\r\n]*
+        -> skip
+    ;
+
+LineDirective
+    :   '#' Whitespace? DecimalConstant Whitespace? StringLiteral ~[\r\n]*
+        -> skip
+    ;
+
+PragmaDirective
+    :   '#' Whitespace? 'pragma' Whitespace ~[\r\n]*
+        -> skip
+    ;
+
+Whitespace
+    :   [ \t]+
+        -> skip
+    ;
+
+Newline
+    :   (   '\r' '\n'?
+        |   '\n'
+        )
+        -> skip
+    ;
+
+BlockComment
+    :   '/*' .*? '*/'
+        -> skip
+    ;
+
+LineComment
+    :   '//' ~[\r\n]*
+        -> skip
+    ;
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/AbstractAstVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/AbstractAstVisitor.java
new file mode 100644
index 0000000000..a31a61b199
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/AbstractAstVisitor.java
@@ -0,0 +1,17 @@
+package org.lflang.generator.uclid.ast;
+
+import java.util.List;
+
+/** Modeled after AbstractParseTreeVisitor.class */
+public abstract class AbstractAstVisitor<T> implements AstVisitor<T> {
+    
+    @Override
+    public T visit(CAst.AstNode tree) {
+      return tree.accept(this);
+    }
+
+    @Override
+    public T visit(CAst.AstNode tree, List<CAst.AstNode> nodeList) {
+      return tree.accept(this, nodeList);
+    }
+}
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/AstVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/AstVisitor.java
new file mode 100644
index 0000000000..bc6910a670
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/AstVisitor.java
@@ -0,0 +1,25 @@
+package org.lflang.generator.uclid.ast;
+
+import java.util.List;
+
+/** Modeled after ParseTreeVisitor.class */
+public interface AstVisitor<T> {
+    
+    /** 
+     * Visit an AST, and return a user-defined result of the operation.
+     * 
+     * @param tree The {@link CAst.AstNode} to visit.
+	 * @return The result of visiting the parse tree.
+     */
+    T visit(CAst.AstNode tree);
+
+    /** 
+     * Visit an AST with a list of other AST nodes holding some information,
+     * and return a user-defined result of the operation.
+     * 
+     * @param tree The {@link CAst.AstNode} to visit.
+     * @param nodeList A list of {@link CAst.AstNode} passed down the recursive call.
+	 * @return The result of visiting the parse tree.
+     */
+    T visit(CAst.AstNode tree, List<CAst.AstNode> nodeList);
+}
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/BuildAstParseTreeVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/BuildAstParseTreeVisitor.java
new file mode 100644
index 0000000000..bec3381cd5
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/BuildAstParseTreeVisitor.java
@@ -0,0 +1,642 @@
+package org.lflang.generator.uclid.ast;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.lflang.dsl.CBaseVisitor;
+import org.lflang.dsl.CParser.*;
+
+public class BuildAstParseTreeVisitor extends CBaseVisitor<CAst.AstNode> {
+
+    @Override
+    public CAst.AstNode visitBlockItemList(BlockItemListContext ctx) {
+        CAst.StatementSequenceNode stmtSeq = new CAst.StatementSequenceNode();
+        
+        // Populate the children.
+        for (BlockItemContext blockItem : ctx.blockItem()) {
+            // System.out.println(blockItem);
+            stmtSeq.children.add(visit(blockItem));
+        }
+
+        System.out.println(stmtSeq.children);
+
+        return stmtSeq;
+    }
+
+    @Override
+    public CAst.AstNode visitBlockItem(BlockItemContext ctx) {
+        if (ctx.statement() != null)
+            return visit(ctx.statement());
+        else
+            return visit(ctx.declaration());
+    }
+
+    @Override
+    public CAst.AstNode visitDeclaration(DeclarationContext ctx) {
+        if (ctx.declarationSpecifiers() != null 
+            && ctx.initDeclaratorList() != null) {
+            //// Extract type from declarationSpecifiers.
+            List<DeclarationSpecifierContext> declSpecList 
+                = ctx.declarationSpecifiers().declarationSpecifier();
+            
+            // Cannot handle more than 1 specifiers, e.g. static const int.
+            // We can augment the analytical capability later.
+            if (declSpecList.size() > 1) {
+                System.out.println(String.join(" ", 
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "the analyzer cannot handle more than 1 specifiers,",
+                    "e.g. static const int.",
+                    "Marking the declaration as opaque."
+                ));
+                return new CAst.OpaqueNode();
+            }
+            
+            // Check if the declaration specifier is a type specifier: e.g. int or long.
+            DeclarationSpecifierContext declSpec = declSpecList.get(0);
+            if (declSpec.typeSpecifier() == null) {
+                System.out.println(String.join(" ", 
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "only type specifiers are supported.",
+                    "e.g. \"static const int\" is not analyzable.",
+                    "Marking the declaration as opaque."
+                ));
+                return new CAst.OpaqueNode();
+            }
+            
+            // Check if the type specifier is what we currently support.
+            // Right now we only support int, long, & double.
+            CAst.VariableNode.Type type;
+            ArrayList<String> supportedTypes = new ArrayList<String>(
+                Arrays.asList(
+                    "int",
+                    "long",
+                    "double",
+                    "_Bool"
+                )
+            );
+            if (declSpec.typeSpecifier().Int() != null
+                || declSpec.typeSpecifier().Long() != null
+                || declSpec.typeSpecifier().Double() != null) 
+                type = CAst.VariableNode.Type.INT;
+            else if (declSpec.typeSpecifier().Bool() != null)
+                type = CAst.VariableNode.Type.BOOLEAN;
+            // Mark the declaration unanalyzable if the type is unsupported.
+            else {
+                System.out.println(String.join(" ", 
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "unsupported type detected at " + declSpec.typeSpecifier(),
+                    "Only " + supportedTypes + " are supported.",
+                    "Marking the declaration as opaque."
+                ));
+                return new CAst.OpaqueNode();
+            }
+
+            //// Extract variable name and value from initDeclaratorList.
+            List<InitDeclaratorContext> initDeclList
+                = ctx.initDeclaratorList().initDeclarator();
+            
+            // Cannot handle more than 1 initDeclarator: e.g. x = 1, y = 2;
+            // We can augment the analytical capability later.
+            if (initDeclList.size() > 1) {
+                System.out.println(String.join(" ", 
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "more than 1 declarators are detected on a single line,",
+                    "e.g. \"int x = 1, y = 2;\" is not yet analyzable.",
+                    "Marking the declaration as opaque."
+                ));
+                return new CAst.OpaqueNode();
+            }
+
+            // Get the variable name from the declarator.
+            DeclaratorContext decl = initDeclList.get(0).declarator();
+            if (decl.pointer() != null) {
+                System.out.println(String.join(" ", 
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "pointers are currently not supported,",
+                    "e.g. \"int *x;\" is not yet analyzable.",
+                    "Marking the declaration as opaque."
+                ));
+                return new CAst.OpaqueNode();
+            }
+            if (decl.gccDeclaratorExtension().size() > 0) {
+                System.out.println(String.join(" ", 
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "GCC declarator extensions are currently not supported,",
+                    "e.g. \"__asm\" and \"__attribute__\" are not yet analyzable.",
+                    "Marking the declaration as opaque."
+                ));
+                return new CAst.OpaqueNode();
+            }
+            DirectDeclaratorContext directDecl = decl.directDeclarator();
+            if (directDecl.Identifier() == null) {
+                System.out.println(String.join(" ", 
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "the variable identifier is missing.",
+                    "Marking the declaration as opaque."
+                ));
+                return new CAst.OpaqueNode();
+            }
+
+            // Extract the name of the variable.
+            String name = directDecl.Identifier().getText();             
+            // Create a variable Ast node.
+            CAst.VariableNode variable = new CAst.VariableNode(type, name);
+
+
+            //// Convert the initializer to a value.
+
+            // Make sure that there is an initializer.
+            InitDeclaratorContext initDecl = initDeclList.get(0);
+            if (initDecl.initializer() == null) {
+                System.out.println(String.join(" ", 
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "the initializer is missing,",
+                    "e.g. \"int x;\" is not yet analyzable.",
+                    "Marking the declaration as opaque."
+                ));
+                return new CAst.OpaqueNode();
+
+                // FIXME: Use UninitCAst.VariableNode to perform special encoding.
+                // return new UninitCAst.VariableNode(type, name);
+            }
+
+            // Extract the primaryExpression from the initializer.
+            if (initDecl.initializer().assignmentExpression() == null
+                || initDecl.initializer().assignmentExpression()
+                    .conditionalExpression() == null) {
+                System.out.println(String.join(" ", 
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "assignmentExpression or conditionalExpression is missing.",
+                    "Marking the declaration as opaque."
+                ));
+                return new CAst.OpaqueNode();
+            }
+
+            // Finally return the assignment node.
+            CAst.AssignmentNode assignmentNode = new CAst.AssignmentNode();
+            CAst.AstNode initNode = visitAssignmentExpression(initDecl.initializer().assignmentExpression());
+            assignmentNode.left = variable;
+            assignmentNode.right = initNode;
+            return assignmentNode;
+        }
+        // Return OpaqueNode as default.
+        return new CAst.OpaqueNode();
+    }
+
+    /**
+     * This visit function builds StatementSequenceNode, AssignmentNode,
+     * OpaqueNode, IfBlockNode,
+     * AdditionNode, SubtractionNode, MultiplicationNode, DivisionNode,
+     * EqualNode, NotEqualNode, LessThanNode, GreaterThanNode, LessEqualNode, GreaterEqualNode,
+     * SetPortNode, ScheduleNode.
+     * 
+     * @param ctx
+     * @return
+     */
+    @Override
+    public CAst.AstNode visitStatement(StatementContext ctx) {
+        if (ctx.compoundStatement() != null) {
+            BlockItemListContext bilCtx = ctx.compoundStatement().blockItemList();
+            if (bilCtx != null) {
+                return visitBlockItemList(bilCtx);
+            }
+        } else if (ctx.expressionStatement() != null) {
+            ExpressionContext exprCtx = ctx.expressionStatement().expression();
+            if (exprCtx != null) {
+                return visitExpression(exprCtx);
+            }
+        } else if (ctx.selectionStatement() != null) {
+            return visitSelectionStatement(ctx.selectionStatement());
+        }
+        return new CAst.OpaqueNode();
+    }
+
+    @Override
+    public CAst.AstNode visitExpression(ExpressionContext ctx) {
+        if (ctx.assignmentExpression().size() == 1) {
+            return visitAssignmentExpression(ctx.assignmentExpression().get(0));
+        }
+        System.out.println(String.join(" ", 
+            "Warning (line " + ctx.getStart().getLine() + "):",
+            "only one assignmentExpression in an expression is currently supported.",
+            "Marking the statement as opaque."
+        ));
+        return new CAst.OpaqueNode();
+    }
+
+    @Override
+    public CAst.AstNode visitPrimaryExpression(PrimaryExpressionContext ctx) {
+        if (ctx.Identifier() != null) {
+            return new CAst.VariableNode(ctx.Identifier().getText());
+        } else if (ctx.Constant() != null) {
+            return new CAst.LiteralNode(ctx.Constant().getText());
+        }  else if (ctx.expression() != null) {
+            return visitExpression(ctx.expression());
+        }
+        System.out.println(String.join(" ", 
+            "Warning (line " + ctx.getStart().getLine() + "):",
+            "only identifier, constant, and expressions are supported in a primary expression.",
+            "Marking the declaration as opaque."
+        ));
+        return new CAst.OpaqueNode();
+    }
+
+    // FIXME: More checks needed. This implementation currently silently omit
+    // certain cases, such as arr[1].
+    @Override
+    public CAst.AstNode visitPostfixExpression(PostfixExpressionContext ctx) {
+        if (ctx.PlusPlus().size() > 0
+            || ctx.MinusMinus().size() > 0
+            || ctx.Dot().size() > 0
+            || (ctx.LeftBracket().size() > 0 && ctx.RightBracket().size() > 0)) {
+            System.out.println(String.join(" ", 
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "Postfix '++', '--', '.', '[]' are currently not supported.",
+                "Marking the statement as opaque."
+            ));
+            return new CAst.OpaqueNode();
+        }
+        // State variables on the self struct, ports and actions.
+        if (ctx.primaryExpression() != null
+            && ctx.Identifier().size() == 1
+            && ctx.Arrow().size() == 1) {
+            CAst.AstNode primaryExprNode = visitPrimaryExpression(ctx.primaryExpression());
+            if (primaryExprNode instanceof CAst.LiteralNode) {
+                // Unreachable.
+                System.out.println("Unreachable!");
+                return new CAst.OpaqueNode(); // FIXME: Throw an exception instead.
+            }
+            CAst.VariableNode varNode = (CAst.VariableNode) primaryExprNode;
+            if (varNode.name.equals("self")) {
+                // return a state variable node.
+                return new CAst.StateVarNode(ctx.Identifier().get(0).getText());
+            } else if (ctx.Identifier().get(0).getText().equals("is_present")) {
+                // return a trigger present node.
+                return new CAst.TriggerValueNode(varNode.name);
+            } else if (ctx.Identifier().get(0).getText().equals("value")) {
+                // return a trigger value node.
+                return new CAst.TriggerIsPresentNode(varNode.name);
+            } else {
+                // Generic pointer dereference, unanalyzable.
+                System.out.println(String.join(" ", 
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "Generic pointer dereference is not supported in a postfix expression.",
+                    "Marking the declaration as opaque."
+                ));
+                return new CAst.OpaqueNode();
+            }
+        }
+        // LF built-in function calls (set or schedule)
+        if (ctx.primaryExpression() != null
+            && ctx.argumentExpressionList().size() == 1
+            && ctx.LeftParen() != null && ctx.RightParen() != null) {
+            CAst.AstNode primaryExprNode = visitPrimaryExpression(ctx.primaryExpression());
+            List<AssignmentExpressionContext> params = ctx.argumentExpressionList().get(0).assignmentExpression();
+            if (primaryExprNode instanceof CAst.LiteralNode) {
+                // Unreachable.
+                System.out.println("Unreachable!");
+                return new CAst.OpaqueNode(); // FIXME: Throw an exception instead.
+            }
+            CAst.VariableNode varNode = (CAst.VariableNode) primaryExprNode;
+            if (varNode.name.equals("lf_set")) {
+                // return a set port node.
+                if (params.size() != 2) {
+                    System.out.println(String.join(" ", 
+                        "Warning (line " + ctx.getStart().getLine() + "):",
+                        "lf_set must have 2 arguments. Detected " + ctx.argumentExpressionList().size(),
+                        "Marking the function call as opaque."
+                    ));
+                    return new CAst.OpaqueNode();
+                }
+                CAst.SetPortNode node = new CAst.SetPortNode();
+                node.left = visitAssignmentExpression(params.get(0));
+                node.right = visitAssignmentExpression(params.get(1));
+                return node;
+            } else if (varNode.name.equals("lf_schedule")) {
+                // return a set port node.
+                if (params.size() != 2
+                    && params.size() != 3) {
+                    System.out.println(String.join(" ", 
+                        "Warning (line " + ctx.getStart().getLine() + "):",
+                        "lf_schedule must have 2 or 3 arguments. Detected " + ctx.argumentExpressionList().size(),
+                        "Marking the function call as opaque."
+                    ));
+                    return new CAst.OpaqueNode();
+                }
+                CAst.ScheduleActionNode node = new CAst.ScheduleActionNode();
+                for (AssignmentExpressionContext param : params) {
+                    node.children.add(visitAssignmentExpression(param));
+                }
+                return node;
+            } else {
+                // Generic pointer dereference, unanalyzable.
+                System.out.println(String.join(" ", 
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "Generic pointer dereference is not supported in a postfix expression.",
+                    "Marking the declaration as opaque."
+                ));
+                return new CAst.OpaqueNode();
+            }
+        }
+        // Variable or literal
+        if (ctx.primaryExpression() != null) {
+            return visitPrimaryExpression(ctx.primaryExpression());
+        }
+        System.out.println(String.join(" ", 
+            "Warning (line " + ctx.getStart().getLine() + "):",
+            "only an identifier, constant, state variable, port, and action are supported in a primary expression.",
+            "Marking the declaration as opaque."
+        ));
+        return new CAst.OpaqueNode();
+    }
+
+    @Override
+    public CAst.AstNode visitUnaryExpression(UnaryExpressionContext ctx) {
+        if (ctx.PlusPlus().size() > 0
+            || ctx.MinusMinus().size() > 0
+            || ctx.Sizeof().size() > 0) {
+            System.out.println(String.join(" ", 
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "Prefix '++', '--', and 'sizeof' are currently not supported.",
+                "Marking the statement as opaque."
+            ));
+            return new CAst.OpaqueNode();
+        }
+        if (ctx.postfixExpression() != null) {
+            return visitPostfixExpression(ctx.postfixExpression());
+        }
+        if (ctx.unaryOperator() != null
+            && ctx.unaryOperator().Not() != null
+            && ctx.castExpression() != null) {
+            CAst.LogicalNotNode node = new CAst.LogicalNotNode();
+            node.child = visitCastExpression(ctx.castExpression());
+            return node;
+        }
+        System.out.println(String.join(" ", 
+            "Warning (line " + ctx.getStart().getLine() + "):",
+            "only postfixExpression and '!' in a unaryExpression is currently supported.",
+            "Marking the statement as opaque."
+        ));
+        return new CAst.OpaqueNode();
+    }
+
+    @Override
+    public CAst.AstNode visitCastExpression(CastExpressionContext ctx) {
+        if (ctx.unaryExpression() != null) {
+            return visitUnaryExpression(ctx.unaryExpression());
+        }
+        System.out.println(String.join(" ", 
+            "Warning (line " + ctx.getStart().getLine() + "):",
+            "only unaryExpression in a castExpression is currently supported.",
+            "Marking the statement as opaque."
+        ));
+        return new CAst.OpaqueNode();
+    }
+
+    @Override
+    public CAst.AstNode visitMultiplicativeExpression(MultiplicativeExpressionContext ctx) {
+        if (ctx.castExpression().size() > 1) {
+            CAst.AstNodeBinary node;
+            if (ctx.Star() != null) {
+                node = new CAst.MultiplicationNode();
+            } else if (ctx.Div() != null) {
+                node = new CAst.DivisionNode();
+            } else if (ctx.Mod() != null) {
+                System.out.println(String.join(" ", 
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "Mod expression '%' is currently unsupported.",
+                    "Marking the expression as opaque."
+                ));
+                return new CAst.OpaqueNode();
+            } else {
+                node = new CAst.AstNodeBinary();
+            }
+            node.left = visitCastExpression(ctx.castExpression().get(0));
+            node.right = visitCastExpression(ctx.castExpression().get(1));
+            return node;
+        }
+        return visitCastExpression(ctx.castExpression().get(0));
+    }
+
+    @Override
+    public CAst.AstNode visitAdditiveExpression(AdditiveExpressionContext ctx) {
+        if (ctx.multiplicativeExpression().size() > 1) {
+            CAst.AstNodeBinary node;
+            if (ctx.Plus() != null) {
+                node = new CAst.AdditionNode();
+            } else if (ctx.Minus() != null) {
+                node = new CAst.SubtractionNode();
+            } else {
+                node = new CAst.AstNodeBinary();
+            }
+            node.left = visitMultiplicativeExpression(ctx.multiplicativeExpression().get(0));
+            node.right = visitMultiplicativeExpression(ctx.multiplicativeExpression().get(1));
+            return node;
+        }
+        return visitMultiplicativeExpression(ctx.multiplicativeExpression().get(0));
+    }
+
+    @Override
+    public CAst.AstNode visitShiftExpression(ShiftExpressionContext ctx) {
+        if (ctx.additiveExpression().size() > 1) {
+            System.out.println(String.join(" ", 
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "Shift expression '<<' or '>>' is currently unsupported.",
+                "Marking the expression as opaque."
+            ));
+            return new CAst.OpaqueNode();
+        }
+        return visitAdditiveExpression(ctx.additiveExpression().get(0));
+    }
+
+    @Override
+    public CAst.AstNode visitRelationalExpression(RelationalExpressionContext ctx) {
+        if (ctx.shiftExpression().size() > 1) {
+            CAst.AstNodeBinary node;
+            if (ctx.Less() != null) {
+                node = new CAst.LessThanNode();
+            } else if (ctx.LessEqual() != null) {
+                node = new CAst.LessEqualNode();
+            } else if (ctx.Greater() != null) { 
+                node = new CAst.GreaterThanNode();
+            } else if (ctx.GreaterEqual() != null) {
+                node = new CAst.GreaterEqualNode();
+            } else {
+                node = new CAst.AstNodeBinary();
+            }
+            node.left = visitShiftExpression(ctx.shiftExpression().get(0));
+            node.right = visitShiftExpression(ctx.shiftExpression().get(1));
+            return node;
+        }
+        return visitShiftExpression(ctx.shiftExpression().get(0));
+    }
+
+    @Override
+    public CAst.AstNode visitEqualityExpression(EqualityExpressionContext ctx) {
+        if (ctx.relationalExpression().size() > 1) {
+            CAst.AstNodeBinary node;
+            if (ctx.Equal().size() > 0) {
+                node = new CAst.EqualNode();
+            }
+            else if (ctx.NotEqual().size() > 0) {
+                node = new CAst.NotEqualNode();
+            } else {
+                node = new CAst.AstNodeBinary();
+            }
+            node.left = visitRelationalExpression(ctx.relationalExpression().get(0));
+            node.right = visitRelationalExpression(ctx.relationalExpression().get(1));
+            return node;
+        }
+        return visitRelationalExpression(ctx.relationalExpression().get(0));
+    }
+
+    @Override
+    public CAst.AstNode visitAndExpression(AndExpressionContext ctx) {
+        if (ctx.equalityExpression().size() > 1) {
+            System.out.println(String.join(" ", 
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "And expression '&' is currently unsupported.",
+                "Marking the expression as opaque."
+            ));
+            return new CAst.OpaqueNode();
+        }
+        return visitEqualityExpression(ctx.equalityExpression().get(0));
+    }
+
+    @Override
+    public CAst.AstNode visitExclusiveOrExpression(ExclusiveOrExpressionContext ctx) {
+        if (ctx.andExpression().size() > 1) {
+            System.out.println(String.join(" ", 
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "Exclusive Or '^' is currently unsupported.",
+                "Marking the expression as opaque."
+            ));
+            return new CAst.OpaqueNode();
+        }
+        return visitAndExpression(ctx.andExpression().get(0));
+    }
+
+    @Override
+    public CAst.AstNode visitInclusiveOrExpression(InclusiveOrExpressionContext ctx) {
+        if (ctx.exclusiveOrExpression().size() > 1) {
+            System.out.println(String.join(" ", 
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "Inclusive Or '|' is currently unsupported.",
+                "Marking the expression as opaque."
+            ));
+            return new CAst.OpaqueNode();
+        }
+        return visitExclusiveOrExpression(ctx.exclusiveOrExpression().get(0));
+    }
+
+    @Override
+    public CAst.AstNode visitLogicalAndExpression(LogicalAndExpressionContext ctx) {
+        if (ctx.inclusiveOrExpression().size() > 1) {
+            CAst.LogicalAndNode node = new CAst.LogicalAndNode();
+            node.left = visitInclusiveOrExpression(ctx.inclusiveOrExpression().get(0));
+            node.right = visitInclusiveOrExpression(ctx.inclusiveOrExpression().get(1));
+            return node;
+        }
+        return visitInclusiveOrExpression(ctx.inclusiveOrExpression().get(0));
+    }
+
+    @Override
+    public CAst.AstNode visitLogicalOrExpression(LogicalOrExpressionContext ctx) {
+        if (ctx.logicalAndExpression().size() > 1) {
+            CAst.LogicalOrNode node = new CAst.LogicalOrNode();
+            node.left = visitLogicalAndExpression(ctx.logicalAndExpression().get(0));
+            node.right = visitLogicalAndExpression(ctx.logicalAndExpression().get(1));
+            return node;
+        }
+        return visitLogicalAndExpression(ctx.logicalAndExpression().get(0));
+    }
+
+    @Override
+    public CAst.AstNode visitConditionalExpression(ConditionalExpressionContext ctx) {
+        if (ctx.expression() != null) {
+            System.out.println(String.join(" ", 
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "Currently do not support inline conditional expression.",
+                "Marking the expression as opaque."
+            ));
+            return new CAst.OpaqueNode();
+        }
+        return visitLogicalOrExpression(ctx.logicalOrExpression());
+    }
+
+    @Override
+    public CAst.AstNode visitAssignmentExpression(AssignmentExpressionContext ctx) {
+        if (ctx.conditionalExpression() != null) {
+            return visitConditionalExpression(ctx.conditionalExpression());
+        }
+        if (ctx.unaryExpression() != null
+            && ctx.assignmentExpression() != null) {
+            CAst.AstNodeBinary assignmentNode = new CAst.AssignmentNode();
+            assignmentNode.left = visitUnaryExpression(ctx.unaryExpression());
+            if (ctx.assignmentOperator().getText().equals("=")) {
+                assignmentNode.right = visitAssignmentExpression(ctx.assignmentExpression());
+            }
+            else if (ctx.assignmentOperator().getText().equals("+=")) {
+                CAst.AdditionNode subnode = new CAst.AdditionNode();
+                subnode.left = visitUnaryExpression(ctx.unaryExpression());
+                subnode.right = visitAssignmentExpression(ctx.assignmentExpression());
+                assignmentNode.right = subnode;
+            }
+            else if (ctx.assignmentOperator().getText().equals("-=")) {
+                CAst.SubtractionNode subnode = new CAst.SubtractionNode();
+                subnode.left = visitUnaryExpression(ctx.unaryExpression());
+                subnode.right = visitAssignmentExpression(ctx.assignmentExpression());
+                assignmentNode.right = subnode;
+            }
+            else if (ctx.assignmentOperator().getText().equals("*=")) {
+                CAst.MultiplicationNode subnode = new CAst.MultiplicationNode();
+                subnode.left = visitUnaryExpression(ctx.unaryExpression());
+                subnode.right = visitAssignmentExpression(ctx.assignmentExpression());
+                assignmentNode.right = subnode;
+            }
+            else if (ctx.assignmentOperator().getText().equals("/=")) {
+                CAst.DivisionNode subnode = new CAst.DivisionNode();
+                subnode.left = visitUnaryExpression(ctx.unaryExpression());
+                subnode.right = visitAssignmentExpression(ctx.assignmentExpression());
+                assignmentNode.right = subnode;
+            }
+            else {
+                System.out.println(String.join(" ", 
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "Only '=', '+=', '-=', '*=', '/=' assignment operators are supported.",
+                    "Marking the expression as opaque."
+                ));
+                return new CAst.OpaqueNode();
+            }
+            return assignmentNode;
+        }
+        System.out.println(String.join(" ", 
+            "Warning (line " + ctx.getStart().getLine() + "):",
+            "DigitSequence in an assignmentExpression is currently not supported.",
+            "Marking the expression as opaque."
+        ));
+        return new CAst.OpaqueNode();
+    }
+
+    @Override
+    public CAst.AstNode visitSelectionStatement(SelectionStatementContext ctx) {
+        if (ctx.Switch() != null) {
+            System.out.println(String.join(" ", 
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "Switch case statement is currently not supported.",
+                "Marking the expression as opaque."
+            ));
+            return new CAst.OpaqueNode();
+        }
+        CAst.IfBlockNode ifBlockNode =  new CAst.IfBlockNode();
+        CAst.IfBodyNode ifBodyNode =  new CAst.IfBodyNode();
+        ifBlockNode.left = visitExpression(ctx.expression());
+        ifBlockNode.right = ifBodyNode;
+        ifBodyNode.left = visitStatement(ctx.statement().get(0));
+        if (ctx.statement().size() > 1) {
+            ifBodyNode.right = visitStatement(ctx.statement().get(1));
+        }
+        return ifBlockNode;
+    }
+}
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CAst.java b/org.lflang/src/org/lflang/generator/uclid/ast/CAst.java
new file mode 100644
index 0000000000..95c0927311
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/CAst.java
@@ -0,0 +1,341 @@
+package org.lflang.generator.uclid.ast;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CAst {
+    
+    public static class AstNode implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitAstNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitAstNode(this, nodeList);
+        }
+    }
+
+    public static class AstNodeUnary extends AstNode implements Visitable {
+        public AstNode child;
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitAstNodeUnary(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitAstNodeUnary(this, nodeList);
+        }
+    }
+    
+    public static class AstNodeBinary extends AstNode implements Visitable {
+        public AstNode left;
+        public AstNode right;
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitAstNodeBinary(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitAstNodeBinary(this, nodeList);
+        }
+    }
+
+    public static class AstNodeDynamic extends AstNode implements Visitable {
+        public ArrayList<AstNode> children = new ArrayList<>();
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitAstNodeDynamic(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitAstNodeDynamic(this, nodeList);
+        }
+    }
+
+    public static class AssignmentNode extends AstNodeBinary implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitAssignmentNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitAssignmentNode(this, nodeList);
+        }
+    }
+
+    /**
+     * AST node for an if block.
+     * The left node is the condition.
+     * The right node is the if body.
+     */
+    public static class IfBlockNode extends AstNodeBinary implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitIfBlockNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitIfBlockNode(this, nodeList);
+        }
+    }
+
+    /**
+     * AST node for an if block.
+     * The left node is the then branch.
+     * The right node is the else branch.
+     */
+    public static class IfBodyNode extends AstNodeBinary implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitIfBodyNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitIfBodyNode(this, nodeList);
+        }
+    }
+
+    public static class LiteralNode extends AstNode implements Visitable {
+        public String literal;      
+        public LiteralNode(String literal) {
+            super();
+            this.literal = literal;
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitLiteralNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitLiteralNode(this, nodeList);
+        }
+    }
+
+    public static class LogicalNotNode extends AstNodeUnary implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitLogicalNotNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitLogicalNotNode(this, nodeList);
+        }
+    }
+
+    public static class LogicalAndNode extends AstNodeBinary implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitLogicalAndNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitLogicalAndNode(this, nodeList);
+        }
+    }
+
+    public static class LogicalOrNode extends AstNodeBinary implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitLogicalOrNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitLogicalOrNode(this, nodeList);
+        }
+    }
+
+    /**
+     * An Ast node that indicates the code
+     * represented by this node is unanalyzable.
+     */
+    public static class OpaqueNode extends AstNode implements Visitable {  
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitOpaqueNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitOpaqueNode(this, nodeList);
+        }
+    }
+
+    public static class StatementSequenceNode extends AstNodeDynamic implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitStatementSequenceNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitStatementSequenceNode(this, nodeList);
+        }
+    }
+
+    public static class VariableNode extends AstNode implements Visitable {
+        public enum Type {
+            UNKNOWN, INT, BOOLEAN
+        }
+        public Type type;
+        public String name;
+        public VariableNode(String name) {
+            super();
+            this.type = Type.UNKNOWN;
+            this.name = name;
+        }
+        public VariableNode(Type type, String name) {
+            super();
+            this.type = type;
+            this.name = name;
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitVariableNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitVariableNode(this, nodeList);
+        }
+    }
+
+    /** Arithmetic operations */
+
+    public static class AdditionNode extends AstNodeBinary implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitAdditionNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitAdditionNode(this, nodeList);
+        }
+    }
+
+    public static class SubtractionNode extends AstNodeBinary implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitSubtractionNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitSubtractionNode(this, nodeList);
+        }
+    }
+
+    public static class MultiplicationNode extends AstNodeBinary implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitMultiplicationNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitMultiplicationNode(this, nodeList);
+        }
+    }
+
+    public static class DivisionNode extends AstNodeBinary implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitDivisionNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitDivisionNode(this, nodeList);
+        }
+    }
+
+    /** Comparison operators */
+
+    public static class EqualNode extends AstNodeBinary implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitEqualNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitEqualNode(this, nodeList);
+        }
+    }
+
+    public static class NotEqualNode extends AstNodeBinary implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitNotEqualNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitNotEqualNode(this, nodeList);
+        }
+    }
+
+    public static class LessThanNode extends AstNodeBinary implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitLessThanNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitLessThanNode(this, nodeList);
+        }
+    }
+
+    public static class LessEqualNode extends AstNodeBinary implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitLessEqualNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitLessEqualNode(this, nodeList);
+        }
+    }
+
+    public static class GreaterThanNode extends AstNodeBinary implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitGreaterThanNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitGreaterThanNode(this, nodeList);
+        }
+    }
+
+    public static class GreaterEqualNode extends AstNodeBinary implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitGreaterEqualNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitGreaterEqualNode(this, nodeList);
+        }
+    }
+
+    /** LF built-in operations */
+    /**
+     * AST node for an lf_set call. The left child is the port being set.
+     * The right node is the value of the port.
+     */
+    public static class SetPortNode extends AstNodeBinary implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitSetPortNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitSetPortNode(this, nodeList);
+        }
+    }
+
+    /**
+     * action; // self struct variable access is a postfixExpression.
+     * value; // Could be literal, variable, or pointer.
+     * additionalDelay;
+     */
+    public static class ScheduleActionNode extends AstNodeDynamic implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitScheduleActionNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitScheduleActionNode(this, nodeList);
+        }
+    }
+
+    /**
+     * Handle state variables appearing as self-><name>
+     */
+    public static class StateVarNode extends AstNode implements Visitable {
+        public String name;
+        public StateVarNode(String name) {
+            this.name = name;
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitStateVarNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitStateVarNode(this, nodeList);
+        }
+    }
+
+    /**
+     * Handle trigger values appearing as <name>->value
+     */
+    public static class TriggerValueNode extends AstNode implements Visitable {
+        public String name;
+        public TriggerValueNode(String name) {
+            this.name = name;
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitTriggerValueNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitTriggerValueNode(this, nodeList);
+        }
+    }
+
+    /**
+     * Handle trigger presence appearing as <name>->is_present
+     */
+    public static class TriggerIsPresentNode extends AstNode implements Visitable {
+        public String name;
+        public TriggerIsPresentNode(String name) {
+            this.name = name;
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitTriggerIsPresentNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitTriggerIsPresentNode(this, nodeList);
+        }
+    }
+}
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CAstVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/CAstVisitor.java
new file mode 100644
index 0000000000..f6efbb7946
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/CAstVisitor.java
@@ -0,0 +1,74 @@
+package org.lflang.generator.uclid.ast;
+
+import java.util.List;
+
+/** Modeled after CVisitor.java */
+public interface CAstVisitor<T> extends AstVisitor<T> {
+    
+	T visitAstNode(CAst.AstNode node);
+	T visitAstNodeUnary(CAst.AstNodeUnary node);
+	T visitAstNodeBinary(CAst.AstNodeBinary node);
+	T visitAstNodeDynamic(CAst.AstNodeDynamic node);
+    T visitAssignmentNode(CAst.AssignmentNode node);
+	T visitIfBlockNode(CAst.IfBlockNode node);
+	T visitIfBodyNode(CAst.IfBodyNode node);
+	T visitLiteralNode(CAst.LiteralNode node);
+	T visitLogicalNotNode(CAst.LogicalNotNode node);
+	T visitLogicalAndNode(CAst.LogicalAndNode node);
+	T visitLogicalOrNode(CAst.LogicalOrNode node);
+	T visitOpaqueNode(CAst.OpaqueNode node);
+	T visitStatementSequenceNode(CAst.StatementSequenceNode node);
+	T visitVariableNode(CAst.VariableNode node);
+
+	T visitAdditionNode(CAst.AdditionNode node);
+	T visitSubtractionNode(CAst.SubtractionNode node);
+	T visitMultiplicationNode(CAst.MultiplicationNode node);
+	T visitDivisionNode(CAst.DivisionNode node);
+
+	T visitEqualNode(CAst.EqualNode node);
+	T visitNotEqualNode(CAst.NotEqualNode node);
+	T visitLessThanNode(CAst.LessThanNode node);
+	T visitLessEqualNode(CAst.LessEqualNode node);
+	T visitGreaterThanNode(CAst.GreaterThanNode node);
+	T visitGreaterEqualNode(CAst.GreaterEqualNode node);
+
+	T visitSetPortNode(CAst.SetPortNode node);
+	T visitScheduleActionNode(CAst.ScheduleActionNode node);
+	T visitStateVarNode(CAst.StateVarNode node);
+	T visitTriggerValueNode(CAst.TriggerValueNode node);
+	T visitTriggerIsPresentNode(CAst.TriggerIsPresentNode node);
+
+	/** Used for converting an AST into If Normal Form. */
+	T visitAstNode(CAst.AstNode node, List<CAst.AstNode> nodeList);
+	T visitAstNodeUnary(CAst.AstNodeUnary node, List<CAst.AstNode> nodeList);
+	T visitAstNodeBinary(CAst.AstNodeBinary node, List<CAst.AstNode> nodeList);
+	T visitAstNodeDynamic(CAst.AstNodeDynamic node, List<CAst.AstNode> nodeList);
+    T visitAssignmentNode(CAst.AssignmentNode node, List<CAst.AstNode> nodeList);
+	T visitIfBlockNode(CAst.IfBlockNode node, List<CAst.AstNode> nodeList);
+	T visitIfBodyNode(CAst.IfBodyNode node, List<CAst.AstNode> nodeList);
+	T visitLiteralNode(CAst.LiteralNode node, List<CAst.AstNode> nodeList);
+	T visitLogicalNotNode(CAst.LogicalNotNode node, List<CAst.AstNode> nodeList);
+	T visitLogicalAndNode(CAst.LogicalAndNode node, List<CAst.AstNode> nodeList);
+	T visitLogicalOrNode(CAst.LogicalOrNode node, List<CAst.AstNode> nodeList);
+	T visitOpaqueNode(CAst.OpaqueNode node, List<CAst.AstNode> nodeList);
+	T visitStatementSequenceNode(CAst.StatementSequenceNode node, List<CAst.AstNode> nodeList);
+	T visitVariableNode(CAst.VariableNode node, List<CAst.AstNode> nodeList);
+
+	T visitAdditionNode(CAst.AdditionNode node, List<CAst.AstNode> nodeList);
+	T visitSubtractionNode(CAst.SubtractionNode node, List<CAst.AstNode> nodeList);
+	T visitMultiplicationNode(CAst.MultiplicationNode node, List<CAst.AstNode> nodeList);
+	T visitDivisionNode(CAst.DivisionNode node, List<CAst.AstNode> nodeList);
+
+	T visitEqualNode(CAst.EqualNode node, List<CAst.AstNode> nodeList);
+	T visitNotEqualNode(CAst.NotEqualNode node, List<CAst.AstNode> nodeList);
+	T visitLessThanNode(CAst.LessThanNode node, List<CAst.AstNode> nodeList);
+	T visitLessEqualNode(CAst.LessEqualNode node, List<CAst.AstNode> nodeList);
+	T visitGreaterThanNode(CAst.GreaterThanNode node, List<CAst.AstNode> nodeList);
+	T visitGreaterEqualNode(CAst.GreaterEqualNode node, List<CAst.AstNode> nodeList);
+
+	T visitSetPortNode(CAst.SetPortNode node, List<CAst.AstNode> nodeList);
+	T visitScheduleActionNode(CAst.ScheduleActionNode node, List<CAst.AstNode> nodeList);
+	T visitStateVarNode(CAst.StateVarNode node, List<CAst.AstNode> nodeList);
+	T visitTriggerValueNode(CAst.TriggerValueNode node, List<CAst.AstNode> nodeList);
+	T visitTriggerIsPresentNode(CAst.TriggerIsPresentNode node, List<CAst.AstNode> nodeList);
+}
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CBaseAstVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/CBaseAstVisitor.java
new file mode 100644
index 0000000000..fa55848d70
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/CBaseAstVisitor.java
@@ -0,0 +1,381 @@
+package org.lflang.generator.uclid.ast;
+
+import java.util.List;
+
+/** Modeled after CBaseVisitor.java */
+public class CBaseAstVisitor<T> extends AbstractAstVisitor<T> implements CAstVisitor<T> {
+    
+	/** 
+	 * These default implementations are not meant to be used.
+	 * They should be overriden by the child class.
+	 * In theory, this base visitor can be deleted?
+	 * Let's keep it here for now for consistency.
+	 */
+	@Override
+	public T visitAstNode(CAst.AstNode node) {
+		System.out.print("[visitAstNode] ");
+		System.out.println("Hi, I am " + node);
+		return null;
+	}
+
+	@Override
+	public T visitAstNodeUnary(CAst.AstNodeUnary node) {
+		System.out.print("[visitAstNodeUnary] ");
+		System.out.println("Hi, I am " + node);
+		if (node.child != null) {
+			T result = visit(node.child);
+		} else {
+			System.out.println("*** Child is empty in " + node + "!");
+		}
+		return null;
+	}
+
+	@Override
+	public T visitAstNodeBinary(CAst.AstNodeBinary node) {
+		System.out.print("[visitAstNodeBinary] ");
+		System.out.println("Hi, I am " + node);
+		if (node.left != null) {
+			T leftResult = visit(node.left);
+		} else System.out.println("*** Left child is empty in " + node + "!");
+		if (node.right != null) {
+			T rightResult = visit(node.right);
+		} else System.out.println("*** Right child is empty in " + node + "!");
+		// Aggregate results...
+		return null;
+	}
+
+	@Override
+	public T visitAstNodeDynamic(CAst.AstNodeDynamic node) {
+		System.out.print("[visitAstNodeDynamic] ");
+		System.out.println("Hi, I am " + node);
+		for (CAst.AstNode n : node.children) {
+			T result = visit(n);
+		}
+		return null;
+	}
+
+    @Override
+	public T visitAssignmentNode(CAst.AssignmentNode node) {
+		// The default implementation reuses visitAstNodeBinary(node).
+		System.out.print("[visitAssignmentNode] ");
+		return visitAstNodeBinary(node);
+	}
+
+	@Override
+	public T visitIfBlockNode(CAst.IfBlockNode node) {
+		System.out.print("[visitIfBlockNode] ");
+		return visitAstNodeBinary(node);
+	}
+
+	@Override
+	public T visitIfBodyNode(CAst.IfBodyNode node) {
+		System.out.print("[visitIfBodyNode] ");
+		return visitAstNodeBinary(node);
+	}
+
+	@Override
+	public T visitLiteralNode(CAst.LiteralNode node) {
+		System.out.print("[visitLiteralNode] ");
+		System.out.println("Hi, I am " + node + " with literal " + node.literal);
+		return null;
+	}
+
+	@Override
+	public T visitLogicalNotNode(CAst.LogicalNotNode node) {
+		System.out.print("[visitLogicalNotNode] ");
+		return visitAstNodeUnary(node);
+	}
+
+	@Override
+	public T visitLogicalAndNode(CAst.LogicalAndNode node) {
+		System.out.print("[visitLogicalAndNode] ");
+		return visitAstNodeBinary(node);
+	}
+
+	@Override
+	public T visitLogicalOrNode(CAst.LogicalOrNode node) {
+		System.out.print("[visitLogicalOrNode] ");
+		return visitAstNodeBinary(node);
+	}
+
+	@Override
+	public T visitOpaqueNode(CAst.OpaqueNode node) {
+		System.out.print("[visitOpaqueNode] ");
+		return visitAstNode(node);
+	}
+
+	@Override
+	public T visitStatementSequenceNode(CAst.StatementSequenceNode node) {
+		System.out.print("[visitStatementSequenceNode] ");
+		return visitAstNodeDynamic(node);
+	}
+
+	@Override
+	public T visitVariableNode(CAst.VariableNode node) {
+		System.out.print("[visitVariableNode] ");
+		System.out.println("Hi, I am " + node + ": (" + node.type + ", " + node.name + ")");
+		return null;
+	}
+
+	/** Arithmetic operators */
+
+	@Override
+	public T visitAdditionNode(CAst.AdditionNode node) {
+		// The default implementation reuses visitAstNodeBinary(node).
+		System.out.print("[visitAdditionNode] ");
+		return visitAstNodeBinary(node);
+	}
+
+	@Override
+	public T visitSubtractionNode(CAst.SubtractionNode node) {
+		// The default implementation reuses visitAstNodeBinary(node).
+		System.out.print("[visitSubtractionNode] ");
+		return visitAstNodeBinary(node);
+	}
+
+	@Override
+	public T visitMultiplicationNode(CAst.MultiplicationNode node) {
+		// The default implementation reuses visitAstNodeBinary(node).
+		System.out.print("[visitMultiplicationNode] ");
+		return visitAstNodeBinary(node);
+	}
+
+	@Override
+	public T visitDivisionNode(CAst.DivisionNode node) {
+		// The default implementation reuses visitAstNodeBinary(node).
+		System.out.print("[visitDivisionNode] ");
+		return visitAstNodeBinary(node);
+	}
+
+	/** Comparison operators */
+
+	@Override
+	public T visitEqualNode(CAst.EqualNode node) {
+		// The default implementation reuses visitAstNodeBinary(node).
+		System.out.print("[visitEqualNode] ");
+		return visitAstNodeBinary(node);
+	}
+
+	@Override
+	public T visitNotEqualNode(CAst.NotEqualNode node) {
+		// The default implementation reuses visitAstNodeBinary(node).
+		System.out.print("[visitNotEqualNode] ");
+		return visitAstNodeBinary(node);
+	}
+
+	@Override
+	public T visitLessThanNode(CAst.LessThanNode node) {
+		// The default implementation reuses visitAstNodeBinary(node).
+		System.out.print("[visitLessThanNode] ");
+		return visitAstNodeBinary(node);
+	}
+
+	@Override
+	public T visitLessEqualNode(CAst.LessEqualNode node) {
+		// The default implementation reuses visitAstNodeBinary(node).
+		System.out.print("[visitLessEqualNode] ");
+		return visitAstNodeBinary(node);
+	}
+
+	@Override
+	public T visitGreaterThanNode(CAst.GreaterThanNode node) {
+		// The default implementation reuses visitAstNodeBinary(node).
+		System.out.print("[visitGreaterThanNode] ");
+		return visitAstNodeBinary(node);
+	}
+
+	@Override
+	public T visitGreaterEqualNode(CAst.GreaterEqualNode node) {
+		// The default implementation reuses visitAstNodeBinary(node).
+		System.out.print("[visitGreaterEqualNode] ");
+		return visitAstNodeBinary(node);
+	}
+
+	/** LF built-in operations */
+
+	@Override
+	public T visitSetPortNode(CAst.SetPortNode node) {
+		System.out.print("[visitSetPortNode] ");
+		return visitAstNodeBinary(node);
+	}
+
+	@Override
+	public T visitScheduleActionNode(CAst.ScheduleActionNode node) {
+		System.out.print("[visitScheduleActionNode] ");
+		return visitAstNodeDynamic(node);
+	}
+
+	@Override
+	public T visitStateVarNode(CAst.StateVarNode node) {
+		System.out.print("[visitStateVarNode] ");
+		System.out.println("Hi, I am " + node + ": (" + node.name + ")");
+		return null;
+	}
+
+	@Override
+	public T visitTriggerValueNode(CAst.TriggerValueNode node) {
+		System.out.print("[visitTriggerValueNode] ");
+		System.out.println("Hi, I am " + node + ": (" + node.name + ")");
+		return null;
+	}
+
+	@Override
+	public T visitTriggerIsPresentNode(CAst.TriggerIsPresentNode node) {
+		System.out.print("[visitTriggerIsPresentNode] ");
+		System.out.println("Hi, I am " + node + ": (" + node.name + ")");
+		return null;
+	}
+
+	//// With one more parameter.
+	@Override
+	public T visitAstNode(CAst.AstNode node, List<CAst.AstNode> nodeList) {
+		return visitAstNode(node);
+	}
+
+	@Override
+	public T visitAstNodeUnary(CAst.AstNodeUnary node, List<CAst.AstNode> nodeList) {
+		return visitAstNodeUnary(node);
+	}
+
+	@Override
+	public T visitAstNodeBinary(CAst.AstNodeBinary node, List<CAst.AstNode> nodeList) {
+		return visitAstNodeBinary(node);
+	}
+
+	@Override
+	public T visitAstNodeDynamic(CAst.AstNodeDynamic node, List<CAst.AstNode> nodeList) {
+		return visitAstNodeDynamic(node);
+	}
+
+	@Override
+	public T visitAssignmentNode(CAst.AssignmentNode node, List<CAst.AstNode> nodeList) {
+		return visitAssignmentNode(node);
+	}
+
+	@Override
+	public T visitIfBlockNode(CAst.IfBlockNode node, List<CAst.AstNode> nodeList) {
+		return visitIfBlockNode(node);
+	}
+
+	@Override
+	public T visitIfBodyNode(CAst.IfBodyNode node, List<CAst.AstNode> nodeList) {
+		return visitIfBodyNode(node);
+	}
+
+	@Override
+	public T visitLiteralNode(CAst.LiteralNode node, List<CAst.AstNode> nodeList) {
+		return visitLiteralNode(node);
+	}
+
+	@Override
+	public T visitLogicalNotNode(CAst.LogicalNotNode node, List<CAst.AstNode> nodeList) {
+		return visitLogicalNotNode(node);
+	}
+
+	@Override
+	public T visitLogicalAndNode(CAst.LogicalAndNode node, List<CAst.AstNode> nodeList) {
+		return visitLogicalAndNode(node);
+	}
+
+	@Override
+	public T visitLogicalOrNode(CAst.LogicalOrNode node, List<CAst.AstNode> nodeList) {
+		return visitLogicalOrNode(node);
+	}
+
+	@Override
+	public T visitOpaqueNode(CAst.OpaqueNode node, List<CAst.AstNode> nodeList) {
+		return visitOpaqueNode(node);
+	}
+
+	@Override
+	public T visitStatementSequenceNode(CAst.StatementSequenceNode node, List<CAst.AstNode> nodeList) {
+		return visitStatementSequenceNode(node);
+	}
+
+	@Override
+	public T visitVariableNode(CAst.VariableNode node, List<CAst.AstNode> nodeList) {
+		return visitVariableNode(node);
+	}
+
+	/** Arithmetic operators */
+	
+	@Override
+	public T visitAdditionNode(CAst.AdditionNode node, List<CAst.AstNode> nodeList) {
+		return visitAdditionNode(node);
+	}
+
+	@Override
+	public T visitSubtractionNode(CAst.SubtractionNode node, List<CAst.AstNode> nodeList) {
+		return visitSubtractionNode(node);
+	}
+
+	@Override
+	public T visitMultiplicationNode(CAst.MultiplicationNode node, List<CAst.AstNode> nodeList) {
+		return visitMultiplicationNode(node);
+	}
+
+	@Override
+	public T visitDivisionNode(CAst.DivisionNode node, List<CAst.AstNode> nodeList) {
+		return visitDivisionNode(node);
+	}
+
+	/** Comparison operators */
+	
+	@Override
+	public T visitEqualNode(CAst.EqualNode node, List<CAst.AstNode> nodeList) {
+		return visitEqualNode(node);
+	}
+
+	@Override
+	public T visitNotEqualNode(CAst.NotEqualNode node, List<CAst.AstNode> nodeList) {
+		return visitNotEqualNode(node);
+	}
+
+	@Override
+	public T visitLessThanNode(CAst.LessThanNode node, List<CAst.AstNode> nodeList) {
+		return visitLessThanNode(node);
+	}
+
+	@Override
+	public T visitLessEqualNode(CAst.LessEqualNode node, List<CAst.AstNode> nodeList) {
+		return visitLessEqualNode(node);
+	}
+
+	@Override
+	public T visitGreaterThanNode(CAst.GreaterThanNode node, List<CAst.AstNode> nodeList) {
+		return visitGreaterThanNode(node);
+	}
+
+	@Override
+	public T visitGreaterEqualNode(CAst.GreaterEqualNode node, List<CAst.AstNode> nodeList) {
+		return visitGreaterEqualNode(node);
+	}
+
+	/** LF built-in operations */
+
+	@Override
+	public T visitSetPortNode(CAst.SetPortNode node, List<CAst.AstNode> nodeList) {
+		return visitSetPortNode(node);
+	}
+
+	@Override
+	public T visitScheduleActionNode(CAst.ScheduleActionNode node, List<CAst.AstNode> nodeList) {
+		return visitScheduleActionNode(node);
+	}
+
+	@Override
+	public T visitStateVarNode(CAst.StateVarNode node, List<CAst.AstNode> nodeList) {
+		return visitStateVarNode(node);
+	}
+
+	@Override
+	public T visitTriggerValueNode(CAst.TriggerValueNode node, List<CAst.AstNode> nodeList) {
+		return visitTriggerValueNode(node);
+	}
+
+	@Override
+	public T visitTriggerIsPresentNode(CAst.TriggerIsPresentNode node, List<CAst.AstNode> nodeList) {
+		return visitTriggerIsPresentNode(node);
+	}
+
+}
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/IfNormalFormAstVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/IfNormalFormAstVisitor.java
new file mode 100644
index 0000000000..a6bb4ae29b
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/IfNormalFormAstVisitor.java
@@ -0,0 +1,111 @@
+package org.lflang.generator.uclid.ast;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * An AST visitor that converts an original AST into the If Normal Form.
+ * See "Bounded Model Checking of Software using SMT Solvers instead of
+ * SAT Solvers" for details about the If Normal Form 
+ * (https://link.springer.com/chapter/10.1007/11691617_9).
+ * 
+ * There are several requirements for an AST to be in INF:
+ * 1. There should be a single StatementSequence (SS) root node;
+ * 2. Each child of the SS node should be an IfBlockNode;
+ * 3. Variables in a subsequent child should be marked as "primed"
+ *    versions of those in the previous child.
+ * 
+ * Limitations:
+ * 1. The implementation does not take the scope into account.
+ *    E.g. "int i = 0; { int j = 0; }" is treated the same as
+ *    "int i = 0; int j = 0;".
+ * 2. Due to the above limitation, the implementation assumes
+ *    that each variable has a unique name.
+ *    E.g. "{ int i = 0; }{ int i = 0; }" is an ill-formed program.
+ * 
+ * In this program, visit() is the normalise() in the paper.
+ */
+public class IfNormalFormAstVisitor extends CBaseAstVisitor<Void> {
+
+    public CAst.StatementSequenceNode INF = new CAst.StatementSequenceNode();
+    
+    @Override
+    public Void visitStatementSequenceNode(CAst.StatementSequenceNode node, List<CAst.AstNode> conditions) {
+        // Create a new StatementSequenceNode.        
+        for (CAst.AstNode child : node.children) {
+            visit(child, conditions);
+        }
+        return null;
+    }
+
+    @Override
+    public Void visitAssignmentNode(CAst.AssignmentNode node, List<CAst.AstNode> conditions) {
+        this.INF.children.add(generateIfBlock(node, conditions));
+        return null;
+    }
+
+    @Override
+    public Void visitSetPortNode(CAst.SetPortNode node, List<CAst.AstNode> conditions) {
+        this.INF.children.add(generateIfBlock(node, conditions));
+        return null;
+    }
+
+	@Override
+	public Void visitScheduleActionNode(CAst.ScheduleActionNode node, List<CAst.AstNode> conditions) {
+		this.INF.children.add(generateIfBlock(node, conditions));
+        return null;
+	}
+
+    @Override
+    public Void visitIfBlockNode(CAst.IfBlockNode node, List<CAst.AstNode> conditions) {
+        List<CAst.AstNode> leftConditions = new ArrayList<>(conditions);
+        leftConditions.add(node.left);
+        visit(((CAst.IfBodyNode)node.right).left, leftConditions);
+        if (((CAst.IfBodyNode)node.right).right != null) {
+            List<CAst.AstNode> rightConditions = new ArrayList<>(conditions);
+            // Add a not node.
+            CAst.LogicalNotNode notNode = new CAst.LogicalNotNode();
+            notNode.child = node.left; // Negate the condition.
+            rightConditions.add(notNode);
+            visit(((CAst.IfBodyNode)node.right).right, rightConditions);
+        }
+        return null;
+    }
+
+    private CAst.AstNode takeConjunction(List<CAst.AstNode> conditions) {
+        if (conditions.size() == 0) {
+            return new CAst.LiteralNode("true");
+        } else if (conditions.size() == 1) {
+            return conditions.get(0);
+        } else {
+            // Take the conjunction of all the conditions.
+            CAst.LogicalAndNode top = new CAst.LogicalAndNode();
+            CAst.LogicalAndNode cur = top;
+            for (int i = 0; i < conditions.size()-1; i++) {
+                cur.left = conditions.get(i);
+                if (i == conditions.size()-2) {
+                    cur.right = conditions.get(i+1);
+                } else {
+                    cur.right = new CAst.LogicalAndNode();
+                    cur =(CAst.LogicalAndNode)cur.right;
+                }
+            }
+            return top;
+        }
+    }
+
+    private CAst.IfBlockNode generateIfBlock(CAst.AstNode node, List<CAst.AstNode> conditions) {
+        // Create an If Block node.
+        CAst.IfBlockNode ifNode = new CAst.IfBlockNode();
+        // Set the condition of the if block node.
+        CAst.AstNode conjunction = takeConjunction(conditions);
+        ifNode.left = conjunction;
+        // Create a new body node.
+        CAst.IfBodyNode body = new CAst.IfBodyNode();
+        ifNode.right = body;
+        // Set the then branch to the assignment.
+        body.left = node;
+
+        return ifNode;
+    }
+}
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/Visitable.java b/org.lflang/src/org/lflang/generator/uclid/ast/Visitable.java
new file mode 100644
index 0000000000..c7735057e0
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/Visitable.java
@@ -0,0 +1,12 @@
+package org.lflang.generator.uclid.ast;
+
+import java.util.List;
+
+public interface Visitable {
+    
+    /** The {@link AstVisitor} needs a double dispatch method. */
+    <T> T accept(AstVisitor<? extends T> visitor);
+
+    /** The {@link AstVisitor} needs a double dispatch method. */
+    <T> T accept(AstVisitor<? extends T> visitor, List<CAst.AstNode> nodeList);
+}

From 4f8c27e3216cf03393225edf5a6cff4d1d521f21 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Tue, 19 Jul 2022 17:25:08 -0700
Subject: [PATCH 0039/1114] Integrate C parser with the UclidGenerator

---
 org.lflang/build.gradle                       |  3 +-
 .../generator/uclid/UclidGenerator.java       | 64 +++++++++++++------
 2 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/org.lflang/build.gradle b/org.lflang/build.gradle
index e7c8ca559a..f11790ac16 100644
--- a/org.lflang/build.gradle
+++ b/org.lflang/build.gradle
@@ -148,7 +148,8 @@ task runAntlr4(type:JavaExec) {
             "-o",  "$projectDir/src/org/lflang/dsl/generated/antlr4/main/",  
             "-package", "org.lflang.dsl",
             "$projectDir/src/org/lflang/dsl/antlr4/MTLLexer.g4",
-            "$projectDir/src/org/lflang/dsl/antlr4/MTLParser.g4"]
+            "$projectDir/src/org/lflang/dsl/antlr4/MTLParser.g4",
+            "$projectDir/src/org/lflang/dsl/antlr4/C.g4"]
 }
 processResources.dependsOn(runAntlr4)
 compileJava.dependsOn(runAntlr4)
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 2e1877c778..dbaac032c5 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -64,19 +64,28 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.generator.TargetTypes;
 import org.lflang.generator.TimerInstance;
 import org.lflang.generator.TriggerInstance;
+import org.lflang.generator.uclid.ast.BuildAstParseTreeVisitor;
+import org.lflang.generator.uclid.ast.CAst;
+import org.lflang.generator.uclid.ast.CBaseAstVisitor;
+import org.lflang.generator.uclid.ast.IfNormalFormAstVisitor;
 import org.lflang.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.Target;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
+import org.lflang.dsl.CLexer;
+import org.lflang.dsl.CParser;
 import org.lflang.dsl.MTLLexer;
 import org.lflang.dsl.MTLParser;
+import org.lflang.dsl.CParser.BlockItemListContext;
 import org.lflang.dsl.MTLParser.MtlContext;
 import org.lflang.lf.Action;
 import org.lflang.lf.Attribute;
+import org.lflang.lf.Code;
 import org.lflang.lf.Connection;
 import org.lflang.lf.Expression;
+import org.lflang.lf.Reaction;
 import org.lflang.lf.Time;
 import org.lflang.lf.VarRef;
 import org.w3c.dom.Attr;
@@ -252,10 +261,8 @@ protected void generateUclidCode(Attribute property, int CT) {
         // Initial Condition
         generateInitialConditions();
 
-        // FIXME: To support once the DSL is available.
-        // Abstractions (i.e. contracts)
-        // generateReactorAbstractions();
-        // generateReactionAbstractions();
+        // Reaction bodies
+        generateReactionAxioms();
 
         // Properties
         generateProperty(property, CT);
@@ -551,11 +558,11 @@ protected void generateReactorSemantics() {
             "    ((rxn(i) == rxn(j) && i != j)",
             "        ==> !tag_same(g(i), g(j)))));",
             "",
-            "// Tags should be positive",
+            "// Tags should be non-negative.",
             "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END)",
             "    ==> pi1(g(i)) >= 0);",
             "",
-            "// Microsteps should be positive",
+            "// Microsteps should be non-negative.",
             "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END)",
             "    ==> pi2(g(i)) >= 0);",
             "",
@@ -820,18 +827,39 @@ protected void generateInitialConditions() {
     }
 
     /**
-     * FIXME
-     */
-    // protected void generateReactorAbstractions() {
-
-    // }
-
-    /**
-     * FIXME
+     * Lift reaction bodies into Uclid axioms.
      */
-    // protected void generateReactionAbstractions() {
-
-    // }
+    protected void generateReactionAxioms() {
+        for (ReactionInstance.Runtime reaction : this.reactionInstances) {
+            System.out.println("Printing reaction body of " + reaction);
+            String code = reaction.getReaction().getDefinition().getCode().getBody();
+            System.out.println(code);
+
+            // Generate a parse tree.
+            CLexer lexer = new CLexer(CharStreams.fromString(code));
+            CommonTokenStream tokens = new CommonTokenStream(lexer);
+            CParser parser = new CParser(tokens);
+            BlockItemListContext parseTree = parser.blockItemList();
+
+            // Build an AST.
+            BuildAstParseTreeVisitor buildAstVisitor = new BuildAstParseTreeVisitor();
+            CAst.AstNode ast = buildAstVisitor.visitBlockItemList(parseTree);
+
+            // Traverse and print.
+            CBaseAstVisitor baseVisitor = new CBaseAstVisitor<>(); // For pretty printing.
+            System.out.println("***** Printing the original AST.");
+            baseVisitor.visit(ast);
+
+            // Convert the AST to If Normal Form (INF).
+            IfNormalFormAstVisitor infVisitor = new IfNormalFormAstVisitor();
+            System.out.println("***** Convert to If Normal Form.");
+            infVisitor.visit(ast, new ArrayList<CAst.AstNode>());
+            CAst.StatementSequenceNode inf = infVisitor.INF;
+            System.out.println(inf);
+            System.out.println("***** Printing the AST in If Normal Form.");
+            baseVisitor.visit(inf);
+        }
+    }
 
     protected void generateProperty(Attribute property, int CT) {
         code.pr(String.join("\n", 
@@ -1009,7 +1037,7 @@ private void populateLists(ReactorInstance reactor) {
      * Compute a completeness threadhold for each property.
      */
     private int computeCT(Attribute property) {
-        return 10; // FIXME
+        return 35; // FIXME
     }
 
     /////////////////////////////////////////////////

From 6bedfcc632ac6a9e196f194e09d272691d7b67c3 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Tue, 19 Jul 2022 18:24:50 -0700
Subject: [PATCH 0040/1114] Start generating uclid axioms. Generate up to
 TriggerValue.

---
 .../uclid/ast/BuildAstParseTreeVisitor.java   |  4 +-
 .../generator/uclid/ast/CToUclidVisitor.java  | 62 +++++++++++++++++++
 2 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java

diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/BuildAstParseTreeVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/BuildAstParseTreeVisitor.java
index bec3381cd5..05628093ac 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/BuildAstParseTreeVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/BuildAstParseTreeVisitor.java
@@ -271,10 +271,10 @@ public CAst.AstNode visitPostfixExpression(PostfixExpressionContext ctx) {
             if (varNode.name.equals("self")) {
                 // return a state variable node.
                 return new CAst.StateVarNode(ctx.Identifier().get(0).getText());
-            } else if (ctx.Identifier().get(0).getText().equals("is_present")) {
+            } else if (ctx.Identifier().get(0).getText().equals("value")) {
                 // return a trigger present node.
                 return new CAst.TriggerValueNode(varNode.name);
-            } else if (ctx.Identifier().get(0).getText().equals("value")) {
+            } else if (ctx.Identifier().get(0).getText().equals("is_present")) {
                 // return a trigger value node.
                 return new CAst.TriggerIsPresentNode(varNode.name);
             } else {
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
new file mode 100644
index 0000000000..8baab95e20
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
@@ -0,0 +1,62 @@
+package org.lflang.generator.uclid.ast;
+
+import java.util.List;
+
+import org.lflang.generator.NamedInstance;
+import org.lflang.generator.PortInstance;
+import org.lflang.generator.ReactionInstance;
+import org.lflang.generator.ReactorInstance;
+import org.lflang.generator.uclid.UclidGenerator;
+import org.lflang.generator.uclid.ast.CAst.*;
+
+public class CToUclidVisitor extends CBaseAstVisitor<String> {
+
+    // The reaction instance for the generated axiom
+    protected ReactionInstance.Runtime reaction;
+    // The reactor that contains the reaction
+    protected ReactorInstance reactor;
+
+    public CToUclidVisitor(ReactionInstance.Runtime reaction) {
+        this.reaction = reaction;
+        this.reactor = reaction.getReaction().getParent();
+    }
+
+    @Override
+    public String visitStatementSequenceNode(StatementSequenceNode node) {
+        String axiom = "";
+        for (int i = 0; i < node.children.size(); i++) {
+            axiom += visit(node.children.get(i));
+            if (i != node.children.size() - 1) axiom += " && ";
+        }
+        return axiom;
+    }
+
+    @Override
+    public String visitIfBlockNode(IfBlockNode node) {
+        String antecedent = visit(node.left); // Process if condition
+        String consequent = visit(((IfBodyNode)node.right).left);
+        return "(" + antecedent + ")" + " ==> " + "(" + consequent + ")";
+    }
+    
+    @Override
+    public String visitLiteralNode(LiteralNode node) {
+        return node.literal;
+    }
+
+    @Override
+    public String visitTriggerValueNode(TriggerValueNode node) {
+        // Find the trigger instance by name.
+        NamedInstance instance;
+        System.out.println("*** Printing all the port names.");
+        for (PortInstance p : this.reactor.inputs) {
+            System.out.println(p.getDefinition().getName());
+        }
+        instance = this.reactor.inputs.stream().filter(ins -> ins.getDefinition()
+            .getName().equals(node.name)).findFirst().get();
+        if (instance != null) {
+            System.out.println(instance + " returned.");
+            return instance.getFullNameWithJoiner("_");
+        }
+        return "";
+    }
+}

From aeb98679d8890911ab71175693f5fcb7bee0faba Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Tue, 19 Jul 2022 22:40:45 -0700
Subject: [PATCH 0041/1114] Lift more AST nodes to Uclid

---
 .../generator/uclid/UclidGenerator.java       |  45 ++++--
 .../generator/uclid/ast/CToUclidVisitor.java  | 129 +++++++++++++++---
 2 files changed, 143 insertions(+), 31 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index dbaac032c5..1afcbc3c0d 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -67,6 +67,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.generator.uclid.ast.BuildAstParseTreeVisitor;
 import org.lflang.generator.uclid.ast.CAst;
 import org.lflang.generator.uclid.ast.CBaseAstVisitor;
+import org.lflang.generator.uclid.ast.CToUclidVisitor;
 import org.lflang.generator.uclid.ast.IfNormalFormAstVisitor;
 import org.lflang.ASTUtils;
 import org.lflang.ErrorReporter;
@@ -95,19 +96,21 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 public class UclidGenerator extends GeneratorBase {
 
     ////////////////////////////////////////////
-    //// Protected fields
-
+    //// Public fields
     // Data structures for storing info about the runtime instances.
-    protected List<ReactorInstance>       reactorInstances    = new ArrayList<ReactorInstance>();
-    protected List<ReactionInstance.Runtime> reactionInstances = new ArrayList<ReactionInstance.Runtime>();
+    public List<ReactorInstance>       reactorInstances    = new ArrayList<ReactorInstance>();
+    public List<ReactionInstance.Runtime> reactionInstances = new ArrayList<ReactionInstance.Runtime>();
 
     // State variables in the system
-    protected List<StateVariableInstance> stateVariables      = new ArrayList<StateVariableInstance>();
+    public List<StateVariableInstance> stateVariables      = new ArrayList<StateVariableInstance>();
     
     // Triggers in the system
-    protected List<ActionInstance>        actionInstances     = new ArrayList<ActionInstance>();
-    protected List<PortInstance>          portInstances       = new ArrayList<PortInstance>();
-    protected List<TimerInstance>         timerInstances      = new ArrayList<TimerInstance>();
+    public List<ActionInstance>        actionInstances     = new ArrayList<ActionInstance>();
+    public List<PortInstance>          portInstances       = new ArrayList<PortInstance>();
+    public List<TimerInstance>         timerInstances      = new ArrayList<TimerInstance>();
+
+    ////////////////////////////////////////////
+    //// Protected fields
     
     // Joint lists of the lists above.
     // FIXME: This approach currently creates duplications in memory.
@@ -817,7 +820,7 @@ protected void generateInitialConditions() {
         ));
         code.indent();
         for (var v : this.stateVariables) {
-            code.pr("&& " + v + "(s(0)) == 0");
+            code.pr("&& " + v.getFullNameWithJoiner("_") + "(s(0)) == 0");
         }
         for (var t : this.triggerInstances) {
             code.pr("&& !" + t.getFullNameWithJoiner("_") + "_is_present" + "(t(0))");
@@ -830,13 +833,18 @@ protected void generateInitialConditions() {
      * Lift reaction bodies into Uclid axioms.
      */
     protected void generateReactionAxioms() {
+        code.pr(String.join("\n", 
+            "/*************",
+            " * Reactions *",
+            " *************/"
+        ));
         for (ReactionInstance.Runtime reaction : this.reactionInstances) {
             System.out.println("Printing reaction body of " + reaction);
-            String code = reaction.getReaction().getDefinition().getCode().getBody();
-            System.out.println(code);
+            String body = reaction.getReaction().getDefinition().getCode().getBody();
+            System.out.println(body);
 
             // Generate a parse tree.
-            CLexer lexer = new CLexer(CharStreams.fromString(code));
+            CLexer lexer = new CLexer(CharStreams.fromString(body));
             CommonTokenStream tokens = new CommonTokenStream(lexer);
             CParser parser = new CParser(tokens);
             BlockItemListContext parseTree = parser.blockItemList();
@@ -858,6 +866,17 @@ protected void generateReactionAxioms() {
             System.out.println(inf);
             System.out.println("***** Printing the AST in If Normal Form.");
             baseVisitor.visit(inf);
+
+            // Generate Uclid axiom for the C AST.
+            CToUclidVisitor c2uVisitor = new CToUclidVisitor(reaction);
+            System.out.println("***** Generating axioms from AST.");
+            String axiom = c2uVisitor.visit(inf);
+            code.pr(String.join("\n", 
+                "// Reaction body of " + reaction,
+                "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
+                "    " + axiom,
+                "));"
+            ));
         }
     }
 
@@ -1037,7 +1056,7 @@ private void populateLists(ReactorInstance reactor) {
      * Compute a completeness threadhold for each property.
      */
     private int computeCT(Attribute property) {
-        return 35; // FIXME
+        return 5; // FIXME
     }
 
     /////////////////////////////////////////////////
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
index 8baab95e20..a8c57ad598 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
@@ -1,62 +1,155 @@
 package org.lflang.generator.uclid.ast;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import org.lflang.generator.ActionInstance;
 import org.lflang.generator.NamedInstance;
 import org.lflang.generator.PortInstance;
 import org.lflang.generator.ReactionInstance;
 import org.lflang.generator.ReactorInstance;
-import org.lflang.generator.uclid.UclidGenerator;
+import org.lflang.generator.StateVariableInstance;
 import org.lflang.generator.uclid.ast.CAst.*;
 
 public class CToUclidVisitor extends CBaseAstVisitor<String> {
 
     // The reaction instance for the generated axiom
     protected ReactionInstance.Runtime reaction;
+    
     // The reactor that contains the reaction
     protected ReactorInstance reactor;
 
+    // A list of all the named instances
+    protected List<NamedInstance> instances = new ArrayList<NamedInstance>();
+
+    // Quantified variable
+    protected String qv = "i";
+
     public CToUclidVisitor(ReactionInstance.Runtime reaction) {
         this.reaction = reaction;
         this.reactor = reaction.getReaction().getParent();
+        instances.addAll(this.reactor.inputs);
+        instances.addAll(this.reactor.outputs);
+        instances.addAll(this.reactor.actions);
+        instances.addAll(this.reactor.states);
     }
 
     @Override
-    public String visitStatementSequenceNode(StatementSequenceNode node) {
-        String axiom = "";
-        for (int i = 0; i < node.children.size(); i++) {
-            axiom += visit(node.children.get(i));
-            if (i != node.children.size() - 1) axiom += " && ";
-        }
-        return axiom;
+    public String visitAssignmentNode(AssignmentNode node) {
+        String lhs = visit(node.left);
+        String rhs = visit(node.right);
+        return "(" + lhs + " == " + rhs + ")";
     }
 
     @Override
     public String visitIfBlockNode(IfBlockNode node) {
         String antecedent = visit(node.left); // Process if condition
         String consequent = visit(((IfBodyNode)node.right).left);
-        return "(" + antecedent + ")" + " ==> " + "(" + consequent + ")";
+        return "(" + antecedent + " ==> " + consequent + ")";
     }
-    
+
     @Override
     public String visitLiteralNode(LiteralNode node) {
         return node.literal;
     }
 
+    @Override
+    public String visitLogicalNotNode(LogicalNotNode node) {
+        return "!" + visit(node.child);
+    }
+
+    @Override
+    public String visitNotEqualNode(NotEqualNode node) {
+        String lhs = visit(node.left);
+        String rhs = visit(node.right);
+        return "(" + lhs + " != " + rhs + ")";
+    }
+
+    @Override
+    public String visitSetPortNode(SetPortNode node) {
+        String port = visit(node.left);
+        String value = visit(node.right);
+        return "(" + port + " == " + value + ")";
+    }
+
+    @Override
+    public String visitStateVarNode(StateVarNode node) {
+        NamedInstance instance = getInstanceByName(node.name);
+        if (instance != null) {
+            System.out.println(instance + " returned.");
+            return instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
+        }
+        // FIXME: Throw exception
+        return "";
+    }
+
+    @Override
+    public String visitStatementSequenceNode(StatementSequenceNode node) {
+        String axiom = "";
+        for (int i = 0; i < node.children.size(); i++) {
+            axiom += visit(node.children.get(i));
+            if (i != node.children.size() - 1) axiom += " && ";
+        }
+        return axiom;
+    }
+
+    @Override
+    public String visitTriggerIsPresentNode(TriggerIsPresentNode node) {
+        // Find the trigger instance by name.
+        NamedInstance instance = getInstanceByName(node.name);
+        if (instance != null) {
+            return instance.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv + ")" + ")";
+        }
+        // FIXME: Throw exception
+        return "";
+    }
+
     @Override
     public String visitTriggerValueNode(TriggerValueNode node) {
         // Find the trigger instance by name.
-        NamedInstance instance;
-        System.out.println("*** Printing all the port names.");
-        for (PortInstance p : this.reactor.inputs) {
-            System.out.println(p.getDefinition().getName());
+        NamedInstance instance = getInstanceByName(node.name);
+        if (instance != null) {
+            return instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
         }
-        instance = this.reactor.inputs.stream().filter(ins -> ins.getDefinition()
-            .getName().equals(node.name)).findFirst().get();
+        // FIXME: Throw exception
+        return "";
+    }
+
+    @Override
+    public String visitVariableNode(VariableNode node) {
+        NamedInstance instance = getInstanceByName(node.name);
         if (instance != null) {
-            System.out.println(instance + " returned.");
-            return instance.getFullNameWithJoiner("_");
+            return instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
         }
+        // FIXME: Throw exception
         return "";
     }
+
+    /////////////////////////////
+    //// Private functions
+
+    private NamedInstance getInstanceByName(String name) {
+        
+        // For some reason, the following one liner doesn't work.
+        // return this.instances.stream().filter(i -> i.getDefinition()
+        //     .getName().equals(name)).findFirst().get();
+
+        for (NamedInstance i : this.instances) {
+            if (i instanceof ActionInstance) {
+                if (((ActionInstance)i).getDefinition().getName().equals(name)) {
+                    return i;
+                }
+            } else if (i instanceof PortInstance) {
+                if (((PortInstance)i).getDefinition().getName().equals(name)) {
+                    return i;
+                }
+            } else if (i instanceof StateVariableInstance) {
+                if (((StateVariableInstance)i).getDefinition().getName().equals(name)) {
+                    return i;
+                }
+            }
+        }
+        System.out.println("Named instance" + "not found.");
+        return null;
+    }
 }

From 4fc71474a23bdaab5fd6b15f869e27dba3fd76b9 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 20 Jul 2022 02:14:26 -0700
Subject: [PATCH 0042/1114] Generate more Uclid axioms from C

---
 .../generator/uclid/UclidGenerator.java       |  21 ++--
 .../generator/uclid/ast/CToUclidVisitor.java  | 114 ++++++++++++++++--
 2 files changed, 118 insertions(+), 17 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 1afcbc3c0d..9787d206cf 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -109,13 +109,12 @@ public class UclidGenerator extends GeneratorBase {
     public List<PortInstance>          portInstances       = new ArrayList<PortInstance>();
     public List<TimerInstance>         timerInstances      = new ArrayList<TimerInstance>();
 
+    // Joint lists of the lists above.
+    public List<TriggerInstance>       triggerInstances;   // Triggers = ports + actions + timers
+    public List<NamedInstance>         namedInstances;     // Named instances = triggers + state variables
+
     ////////////////////////////////////////////
     //// Protected fields
-    
-    // Joint lists of the lists above.
-    // FIXME: This approach currently creates duplications in memory.
-    protected List<TriggerInstance>       triggerInstances;   // Triggers = ports + actions + timers
-    protected List<NamedInstance>         namedInstances;     // Named instances = triggers + state variables
 
     // A list of MTL properties represented in Attributes.
     protected List<Attribute> properties;
@@ -225,7 +224,7 @@ protected void generateRunnerScript() {
                 "ls smt | xargs -I {} bash -c 'echo \"(get-model)\" >> smt/{}'",
                 "",
                 "echo '*** Running Z3'",
-                "ls smt | xargs -I {} bash -c 'echo \"Checking {}\" && z3 parallel.enable=true -T:300 -v:1 ./smt/{}'"
+                "ls smt | xargs -I {} bash -c 'z3 parallel.enable=true -T:300 -v:1 ./smt/{}'"
             ));
             script.writeToFile(filename);
         } catch (IOException e) {
@@ -820,7 +819,10 @@ protected void generateInitialConditions() {
         ));
         code.indent();
         for (var v : this.stateVariables) {
-            code.pr("&& " + v.getFullNameWithJoiner("_") + "(s(0)) == 0");
+            code.pr("&& " + v.getFullNameWithJoiner("_") + "(s(0))" + " == " + "0");
+        }
+        for (var t : this.triggerInstances) {
+            code.pr("&& " + t.getFullNameWithJoiner("_") + "(s(0))" + " == " + "0");
         }
         for (var t : this.triggerInstances) {
             code.pr("&& !" + t.getFullNameWithJoiner("_") + "_is_present" + "(t(0))");
@@ -868,13 +870,14 @@ protected void generateReactionAxioms() {
             baseVisitor.visit(inf);
 
             // Generate Uclid axiom for the C AST.
-            CToUclidVisitor c2uVisitor = new CToUclidVisitor(reaction);
+            CToUclidVisitor c2uVisitor = new CToUclidVisitor(this, reaction);
             System.out.println("***** Generating axioms from AST.");
             String axiom = c2uVisitor.visit(inf);
             code.pr(String.join("\n", 
                 "// Reaction body of " + reaction,
                 "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
-                "    " + axiom,
+                "    (rxn(i) == " + reaction.getReaction().getFullNameWithJoiner("_") + ")",
+                "        ==> " + axiom,
                 "));"
             ));
         }
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
index a8c57ad598..fafe7d83fc 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
@@ -9,10 +9,15 @@
 import org.lflang.generator.ReactionInstance;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.generator.StateVariableInstance;
+import org.lflang.generator.TriggerInstance;
+import org.lflang.generator.uclid.UclidGenerator;
 import org.lflang.generator.uclid.ast.CAst.*;
 
 public class CToUclidVisitor extends CBaseAstVisitor<String> {
 
+    // The Uclid generator instance
+    protected UclidGenerator generator;
+
     // The reaction instance for the generated axiom
     protected ReactionInstance.Runtime reaction;
     
@@ -25,7 +30,17 @@ public class CToUclidVisitor extends CBaseAstVisitor<String> {
     // Quantified variable
     protected String qv = "i";
 
-    public CToUclidVisitor(ReactionInstance.Runtime reaction) {
+    // Unchanged variables and triggers
+    protected List<StateVariableInstance> unchangedStates;
+    protected List<TriggerInstance> unchangedTriggers;
+
+    // FIXME: Make this more flexible and infer value from program.
+    // Default reset value
+    String defaultValue = "0";
+    String defaultPresence = "false";
+
+    public CToUclidVisitor(UclidGenerator generator, ReactionInstance.Runtime reaction) {
+        this.generator = generator;
         this.reaction = reaction;
         this.reactor = reaction.getReaction().getParent();
         instances.addAll(this.reactor.inputs);
@@ -36,16 +51,90 @@ public CToUclidVisitor(ReactionInstance.Runtime reaction) {
 
     @Override
     public String visitAssignmentNode(AssignmentNode node) {
-        String lhs = visit(node.left);
+        // String lhs = visit(node.left);
+        String lhs = "";
+        if (node.left instanceof StateVarNode) {
+            NamedInstance instance = getInstanceByName(((StateVarNode)node.left).name);
+            lhs = instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
+            this.unchangedStates.remove(instance); // Remove instance from the unchanged list.
+        } else {
+            System.out.println("Unreachable!"); // FIXME: Throw exception.
+        }
         String rhs = visit(node.right);
         return "(" + lhs + " == " + rhs + ")";
     }
 
     @Override
     public String visitIfBlockNode(IfBlockNode node) {
+
+        String formula = "";
+
+        // In INF, there are no nested if blocks, so we can use a field
+        // to keep track of unchanged variables.
+        this.unchangedStates = new ArrayList<>(this.generator.stateVariables);
+        this.unchangedTriggers = new ArrayList<>(this.generator.triggerInstances);
+
         String antecedent = visit(node.left); // Process if condition
         String consequent = visit(((IfBodyNode)node.right).left);
-        return "(" + antecedent + " ==> " + consequent + ")";
+
+        formula += "(" + antecedent + " ==> " + "(" + consequent;
+
+        formula += "\n//// Unchanged variables";
+        // State variables retain their previous states.
+        formula += "\n// State variables retain their previous states.";
+        for (StateVariableInstance s : this.unchangedStates) {
+            formula += "\n&& " + s.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")"
+                        + " == "
+                        + s.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + "-1" + ")" + ")";
+        }
+        // Triggers resets to their default states if time advances.
+        formula += "\n// Triggers resets to their default states if time advances.";
+        for (TriggerInstance t : this.unchangedTriggers) {
+            // formula += "\n&& " 
+            //             + "(" + "(" 
+            //             + "tag_same(" + "g(" + this.qv + ")" + "," + "g(" + this.qv + "-1" + ")" + ")" + ")"
+            //             + " ==> " + "(" + " true"
+            //             // Retain value
+            //             + "\n&& " + t.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")"
+            //             + " == "
+            //             + t.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + "-1" + ")" + ")"
+            //             // Retain presence
+            //             + "\n&& " + t.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv + ")" + ")"
+            //             + " == "
+            //             + t.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv + "-1" + ")" + ")"
+            //             + ")" + ")"
+            //             // If time advances.
+            //             + "\n&& " 
+            //             + "(" + "("
+            //             + "tag_later(" + "g(" + this.qv + ")" + "," + "g(" + this.qv + "-1" + ")" + ")" + ")"
+            //             + " ==> " + "(" + " true"
+            //             // Reset value
+            //             + "\n&& " + t.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")"
+            //             + " == "
+            //             + this.defaultValue
+            //             // Reset presence
+            //             + "\n&& " + t.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv + ")" + ")"
+            //             + " == "
+            //             + this.defaultPresence
+            //             + ")" + ")";
+
+            formula += "\n&& " 
+                        + "("
+                        + " true"
+                        // Reset value
+                        + "\n&& " + t.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")"
+                        + " == "
+                        + this.defaultValue
+                        // Reset presence
+                        + "\n&& " + t.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv + ")" + ")"
+                        + " == "
+                        + this.defaultPresence
+                        + ")";
+        }
+
+        formula += "\n))";
+
+        return formula;
     }
 
     @Override
@@ -67,16 +156,24 @@ public String visitNotEqualNode(NotEqualNode node) {
 
     @Override
     public String visitSetPortNode(SetPortNode node) {
-        String port = visit(node.left);
+        NamedInstance port = getInstanceByName(((VariableNode)node.left).name);
         String value = visit(node.right);
-        return "(" + port + " == " + value + ")";
+        // Remove this port from the unchanged list.
+        this.unchangedTriggers.remove(port);
+        return "("
+            + "("
+            + port.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")"
+            + " == " + value
+            + ")"
+            + " && "
+            + "(" + port.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv + ")" + ")" + ")"
+            + ")";
     }
 
     @Override
     public String visitStateVarNode(StateVarNode node) {
         NamedInstance instance = getInstanceByName(node.name);
         if (instance != null) {
-            System.out.println(instance + " returned.");
             return instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
         }
         // FIXME: Throw exception
@@ -88,7 +185,7 @@ public String visitStatementSequenceNode(StatementSequenceNode node) {
         String axiom = "";
         for (int i = 0; i < node.children.size(); i++) {
             axiom += visit(node.children.get(i));
-            if (i != node.children.size() - 1) axiom += " && ";
+            if (i != node.children.size() - 1) axiom += "\n" + "        " + "&& ";
         }
         return axiom;
     }
@@ -130,7 +227,8 @@ public String visitVariableNode(VariableNode node) {
 
     private NamedInstance getInstanceByName(String name) {
         
-        // For some reason, the following one liner doesn't work.
+        // For some reason, the following one liner doesn't work:
+        //
         // return this.instances.stream().filter(i -> i.getDefinition()
         //     .getName().equals(name)).findFirst().get();
 

From be621d5233b03cf5ab2be3a3906bc8b9f7d4335b Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 20 Jul 2022 16:39:33 -0700
Subject: [PATCH 0043/1114] Removed the relaxation fragment in the connection
 axiom. Add dedicated axioms that resets an input port to default value.
 Reactions only reset state variables and output ports.

---
 .../generator/uclid/UclidGenerator.java       | 68 +++++++++++++------
 .../generator/uclid/ast/CToUclidVisitor.java  | 18 ++++-
 2 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 9787d206cf..73e66e6d3e 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -106,6 +106,8 @@ public class UclidGenerator extends GeneratorBase {
     
     // Triggers in the system
     public List<ActionInstance>        actionInstances     = new ArrayList<ActionInstance>();
+    public List<PortInstance>          inputInstances      = new ArrayList<PortInstance>();
+    public List<PortInstance>          outputInstances     = new ArrayList<PortInstance>();
     public List<PortInstance>          portInstances       = new ArrayList<PortInstance>();
     public List<TimerInstance>         timerInstances      = new ArrayList<TimerInstance>();
 
@@ -579,10 +581,11 @@ protected void generateReactorSemantics() {
             "    (rxn(j)) != NULL) ==> ",
             "        (finite_forall (i : integer) in indices :: (i > START && i < j) ==> (rxn(i) != NULL)));",
             "",
+            "// FIXME: This axiom appears to be buggy.",
             "// When a NULL event occurs, the state stays the same.",
-            "axiom(finite_forall (j : integer) in indices :: (j > START && j <= END) ==> (",
-            "    (rxn(j) == NULL) ==> (s(j) == s(j-1))",
-            "));"
+            "// axiom(finite_forall (j : integer) in indices :: (j > START && j <= END) ==> (",
+            "//     (rxn(j) == NULL) ==> (s(j) == s(j-1))",
+            "// ));"
         ));
 
         // Non-federated "happened-before"
@@ -661,15 +664,7 @@ protected void generateTriggersAndReactions() {
                         "    && " + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(j))",
                         "    && " + destination.getFullNameWithJoiner("_") + "(s(j)) == " + source.getFullNameWithJoiner("_") + "(s(i))",
                         connection.isPhysical() ? "" : "&& g(j) == tag_schedule(g(i), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")",
-                        ")||(",
-                        // Relaxation axioms: a port presence can not produce a downstream presence
-                        // but it needs to guarantee that there are no trailing NULL events.
-                        // FIXME: !«downstreamPortIsPresent»(t(k)) makes the solver timeout.
-                        "(finite_forall (k : integer) in indices :: (k > i && k <= END) ==> (rxn(k) != NULL",
-                        "    && " + destination.getFullNameWithJoiner("_") + "(s(k)) == " + source.getFullNameWithJoiner("_") + "(s(i))",
-                        connection.isPhysical() ? "" : "    && (tag_same(g(k), tag_schedule(g(i), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")) || tag_earlier(g(k), tag_schedule(g(i), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")))",
-                        ")) // Closes forall.",
-                        ")  // Closes ||",
+                        ")",
                         ")) // Closes (" + source.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> ((.",
                         "// If " + destination.getFullNameWithJoiner("_") + " is present, there exists an " + source.getFullNameWithJoiner("_") + " in prior steps.",
                         "// This additional term establishes a one-to-one relationship between two ports' signals.",
@@ -680,12 +675,41 @@ protected void generateTriggersAndReactions() {
                         ")) // Closes the one-to-one relationship.",
                         "));"
                     ));
+                    // code.pr(String.join("\n", 
+                    //     "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
+                    //     "// If " + source.getFullNameWithJoiner("_") + " is present, then "
+                    //         + destination.getFullNameWithJoiner("_") + " will be present.",
+                    //     "// with the same value after some fixed delay of " + delay + " nanoseconds.",
+                    //     "(" + source.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> ((",
+                    //     "    finite_exists (j : integer) in indices :: j > i && j <= END",
+                    //     "    && " + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(j))",
+                    //     "    && " + destination.getFullNameWithJoiner("_") + "(s(j)) == " + source.getFullNameWithJoiner("_") + "(s(i))",
+                    //     connection.isPhysical() ? "" : "&& g(j) == tag_schedule(g(i), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")",
+                    //     ")||(",
+                    //     // Relaxation axioms: a port presence can not produce a downstream presence
+                    //     // but it needs to guarantee that there are no trailing NULL events.
+                    //     // FIXME: !«downstreamPortIsPresent»(t(k)) makes the solver timeout.
+                    //     "(finite_forall (k : integer) in indices :: (k > i && k <= END) ==> (rxn(k) != NULL",
+                    //     "    && " + destination.getFullNameWithJoiner("_") + "(s(k)) == " + source.getFullNameWithJoiner("_") + "(s(i))",
+                    //     connection.isPhysical() ? "" : "    && (tag_same(g(k), tag_schedule(g(i), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")) || tag_earlier(g(k), tag_schedule(g(i), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")))",
+                    //     ")) // Closes forall.",
+                    //     ")  // Closes ||",
+                    //     ")) // Closes (" + source.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> ((.",
+                    //     "// If " + destination.getFullNameWithJoiner("_") + " is present, there exists an " + source.getFullNameWithJoiner("_") + " in prior steps.",
+                    //     "// This additional term establishes a one-to-one relationship between two ports' signals.",
+                    //     "&& (" + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
+                    //     "    finite_exists (j : integer) in indices :: j >= START && j < i",
+                    //     "    && " + source.getFullNameWithJoiner("_") + "_is_present" + "(t(j))",
+                    //     connection.isPhysical() ? "" : "    && g(i) == tag_schedule(g(j), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")",
+                    //     ")) // Closes the one-to-one relationship.",
+                    //     "));"
+                    // ));
 
                     // If destination is not present, then its value resets to 0.
                     // FIXME: Check if this works in practice.
                     code.pr(String.join("\n", 
                         "// If " + destination.getFullNameWithJoiner("_") + " is not present, then its value resets to 0.",
-                        "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
+                        "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END && rxn(i) != NULL) ==> (",
                         "    (!" + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
                         "        " + destination.getFullNameWithJoiner("_") + "(s(i)) == 0",
                         "    ))",
@@ -729,14 +753,14 @@ protected void generateTriggersAndReactions() {
 
                 // If the action is not present, then its value resets to 0.
                 // FIXME: Check if this works in practice.
-                code.pr(String.join("\n", 
-                    "// If " + action.getFullNameWithJoiner("_") + "  is not present, then its value resets to 0.",
-                    "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
-                    "    (!" + action.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
-                    "        " + action.getFullNameWithJoiner("_") + "(s(i)) == 0",
-                    "    ))",
-                    "));"
-                ));
+                // code.pr(String.join("\n", 
+                //     "// If " + action.getFullNameWithJoiner("_") + "  is not present, then its value resets to 0.",
+                //     "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
+                //     "    (!" + action.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
+                //     "        " + action.getFullNameWithJoiner("_") + "(s(i)) == 0",
+                //     "    ))",
+                //     "));"
+                // ));
             }
         }
 
@@ -1041,9 +1065,11 @@ private void populateLists(ReactorInstance reactor) {
             this.actionInstances.add(action);
         }
         for (var port : reactor.inputs) {
+            this.inputInstances.add(port);
             this.portInstances.add(port);
         }
         for (var port : reactor.outputs) {
+            this.outputInstances.add(port);
             this.portInstances.add(port);
         }
         for (var timer : reactor.timers) {
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
index fafe7d83fc..5c3350250d 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
@@ -64,6 +64,13 @@ public String visitAssignmentNode(AssignmentNode node) {
         return "(" + lhs + " == " + rhs + ")";
     }
 
+    @Override
+    public String visitEqualNode(EqualNode node) {
+        String lhs = visit(node.left);
+        String rhs = visit(node.right);
+        return "(" + lhs + " == " + rhs + ")";
+    }
+
     @Override
     public String visitIfBlockNode(IfBlockNode node) {
 
@@ -72,7 +79,9 @@ public String visitIfBlockNode(IfBlockNode node) {
         // In INF, there are no nested if blocks, so we can use a field
         // to keep track of unchanged variables.
         this.unchangedStates = new ArrayList<>(this.generator.stateVariables);
-        this.unchangedTriggers = new ArrayList<>(this.generator.triggerInstances);
+        this.unchangedTriggers = new ArrayList<>();
+        this.unchangedTriggers.addAll(this.generator.outputInstances);
+        this.unchangedTriggers.addAll(this.generator.actionInstances);
 
         String antecedent = visit(node.left); // Process if condition
         String consequent = visit(((IfBodyNode)node.right).left);
@@ -147,6 +156,13 @@ public String visitLogicalNotNode(LogicalNotNode node) {
         return "!" + visit(node.child);
     }
 
+    @Override
+    public String visitMultiplicationNode(MultiplicationNode node) {
+        String lhs = visit(node.left);
+        String rhs = visit(node.right);
+        return "(" + lhs + " * " + rhs + ")";
+    }
+
     @Override
     public String visitNotEqualNode(NotEqualNode node) {
         String lhs = visit(node.left);

From d9e2b4ba272e1358454302db32729e22fadce3d2 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 20 Jul 2022 18:39:54 -0700
Subject: [PATCH 0044/1114] Bug fixes

---
 org.lflang/build.gradle                       |  1 +
 .../lflang/generator/uclid/MTLVisitor.java    |  3 ++
 .../generator/uclid/UclidGenerator.java       |  5 ++--
 .../generator/uclid/ast/CToUclidVisitor.java  | 28 +++++++++++++++++++
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/org.lflang/build.gradle b/org.lflang/build.gradle
index f11790ac16..d0b9730aaa 100644
--- a/org.lflang/build.gradle
+++ b/org.lflang/build.gradle
@@ -152,6 +152,7 @@ task runAntlr4(type:JavaExec) {
             "$projectDir/src/org/lflang/dsl/antlr4/C.g4"]
 }
 processResources.dependsOn(runAntlr4)
+compileKotlin.dependsOn(runAntlr4)
 compileJava.dependsOn(runAntlr4)
 
 clean {
diff --git a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
index 66676ed236..46bc4655fc 100644
--- a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
@@ -176,6 +176,7 @@ public String visitUntil(MTLParser.UntilContext ctx,
 
         return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
                 + "j" + QFIdx + " >= " + prefixIdx + " && " + "j" + QFIdx + " <= " + end
+                + " && " + "rxn" + "(" + "j" + QFIdx + ")" + " != " + "NULL"
                 + " && " + "(" + _visitUnaryOp(ctx.right, ("j"+QFIdx), QFIdx+1, prefixIdx, currentHorizon) + ")"
                 + " && " + "(" + "\n" 
                 + "// Time Predicate\n"
@@ -220,6 +221,7 @@ public String visitGlobally(MTLParser.GloballyContext ctx,
                                                     upperBoundNanoSec, prefixIdx, prevPrefixIdx);        
         return "!(" + "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
                 + "j" + QFIdx + " >= " + prefixIdx + " && " + "j" + QFIdx + " <= " + end
+                + " && " + "rxn" + "(" + "j" + QFIdx + ")" + " != " + "NULL"
                 + " && " + "!" + "(" + visitPrimary(ctx.formula, ("j"+QFIdx), QFIdx+1, prefixIdx, currentHorizon) + ")"
                 + " && " + "(" + "\n" 
                 + "// Time Predicate\n"
@@ -244,6 +246,7 @@ public String visitFinally(MTLParser.FinallyContext ctx,
                                                     upperBoundNanoSec, prefixIdx, prevPrefixIdx);        
         return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
                 + "j" + QFIdx + " >= " + prefixIdx + " && " + "j" + QFIdx + " <= " + end
+                + " && " + "rxn" + "(" + "j" + QFIdx + ")" + " != " + "NULL"
                 + " && " + "(" + visitPrimary(ctx.formula, ("j"+QFIdx), QFIdx+1, prefixIdx, currentHorizon) + ")"
                 + " && " + "(" + "\n" 
                 + "// Time Predicate\n"
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 73e66e6d3e..551d1455aa 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -738,14 +738,15 @@ protected void generateTriggersAndReactions() {
                         "    finite_exists (j : integer) in indices :: j >= START && j < i",
                         "    && rxn(j) == " + reaction.getFullNameWithJoiner("_"),
                         "    && g(i) == tag_schedule(g(j), "
-                            + (action.getMinDelay() == TimeValue.ZERO ? "mstep()" : "nsec(" + action.getMinDelay().toNanoSeconds() + ")") + ")"
+                            + (action.getMinDelay() == TimeValue.ZERO ? "mstep()" : "nsec(" + action.getMinDelay().toNanoSeconds() + ")") + ")",
+                        "))"
                     );
                 }
 
                 // After populating the string segments,
                 // print the generated code string.
                 code.pr(String.join("\n", 
-                    comment,
+                    "// " + comment,
                     "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> ( true",
                     triggerStr,
                     "));"
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
index 5c3350250d..f5317266b9 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
@@ -71,6 +71,20 @@ public String visitEqualNode(EqualNode node) {
         return "(" + lhs + " == " + rhs + ")";
     }
 
+    @Override
+    public String visitGreaterEqualNode(GreaterEqualNode node) {
+        String lhs = visit(node.left);
+        String rhs = visit(node.right);
+        return "(" + lhs + " >= " + rhs + ")";
+    }
+
+    @Override
+    public String visitGreaterThanNode(GreaterThanNode node) {
+        String lhs = visit(node.left);
+        String rhs = visit(node.right);
+        return "(" + lhs + " > " + rhs + ")";
+    }
+
     @Override
     public String visitIfBlockNode(IfBlockNode node) {
 
@@ -146,6 +160,20 @@ public String visitIfBlockNode(IfBlockNode node) {
         return formula;
     }
 
+    @Override
+    public String visitLessEqualNode(LessEqualNode node) {
+        String lhs = visit(node.left);
+        String rhs = visit(node.right);
+        return "(" + lhs + " <= " + rhs + ")";
+    }
+
+    @Override
+    public String visitLessThanNode(LessThanNode node) {
+        String lhs = visit(node.left);
+        String rhs = visit(node.right);
+        return "(" + lhs + " < " + rhs + ")";
+    }
+
     @Override
     public String visitLiteralNode(LiteralNode node) {
         return node.literal;

From f29cf78ad38025aeea30298c6bdb31dce8dfae99 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 20 Jul 2022 23:29:36 -0700
Subject: [PATCH 0045/1114] Fix bugs and generate more axioms

---
 .../lflang/generator/uclid/MTLVisitor.java    |  6 +--
 .../generator/uclid/UclidGenerator.java       | 19 ++++-----
 .../uclid/ast/BuildAstParseTreeVisitor.java   |  2 +-
 .../generator/uclid/ast/CToUclidVisitor.java  | 39 +++++++++++++++++--
 4 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
index 46bc4655fc..c569b8ddc9 100644
--- a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
@@ -172,7 +172,7 @@ public String visitUntil(MTLParser.UntilContext ctx,
         long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
         long currentHorizon = horizon + upperBoundNanoSec;
         String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
-                                                    upperBoundNanoSec, prefixIdx, prevPrefixIdx);
+                                                    upperBoundNanoSec, "j" + QFIdx, prefixIdx);
 
         return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
                 + "j" + QFIdx + " >= " + prefixIdx + " && " + "j" + QFIdx + " <= " + end
@@ -218,7 +218,7 @@ public String visitGlobally(MTLParser.GloballyContext ctx,
         long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
         long currentHorizon = horizon + upperBoundNanoSec;
         String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
-                                                    upperBoundNanoSec, prefixIdx, prevPrefixIdx);        
+                                                    upperBoundNanoSec, "j" + QFIdx, prefixIdx);        
         return "!(" + "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
                 + "j" + QFIdx + " >= " + prefixIdx + " && " + "j" + QFIdx + " <= " + end
                 + " && " + "rxn" + "(" + "j" + QFIdx + ")" + " != " + "NULL"
@@ -243,7 +243,7 @@ public String visitFinally(MTLParser.FinallyContext ctx,
         long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
         long currentHorizon = horizon + upperBoundNanoSec;
         String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
-                                                    upperBoundNanoSec, prefixIdx, prevPrefixIdx);        
+                                                    upperBoundNanoSec, "j" + QFIdx, prefixIdx);        
         return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
                 + "j" + QFIdx + " >= " + prefixIdx + " && " + "j" + QFIdx + " <= " + end
                 + " && " + "rxn" + "(" + "j" + QFIdx + ")" + " != " + "NULL"
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 551d1455aa..bc6235aae2 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -666,6 +666,7 @@ protected void generateTriggersAndReactions() {
                         connection.isPhysical() ? "" : "&& g(j) == tag_schedule(g(i), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")",
                         ")",
                         ")) // Closes (" + source.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> ((.",
+                        //// Separator
                         "// If " + destination.getFullNameWithJoiner("_") + " is present, there exists an " + source.getFullNameWithJoiner("_") + " in prior steps.",
                         "// This additional term establishes a one-to-one relationship between two ports' signals.",
                         "&& (" + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
@@ -706,7 +707,6 @@ protected void generateTriggersAndReactions() {
                     // ));
 
                     // If destination is not present, then its value resets to 0.
-                    // FIXME: Check if this works in practice.
                     code.pr(String.join("\n", 
                         "// If " + destination.getFullNameWithJoiner("_") + " is not present, then its value resets to 0.",
                         "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END && rxn(i) != NULL) ==> (",
@@ -734,6 +734,7 @@ protected void generateTriggersAndReactions() {
                     comment += reaction.getFullNameWithJoiner("_") + ", ";
                     triggerStr += String.join("\n", 
                         "// " + reaction.getFullNameWithJoiner("_"),
+                        // FIXME: Should this be an OR?
                         "&& (" + action.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
                         "    finite_exists (j : integer) in indices :: j >= START && j < i",
                         "    && rxn(j) == " + reaction.getFullNameWithJoiner("_"),
@@ -754,14 +755,14 @@ protected void generateTriggersAndReactions() {
 
                 // If the action is not present, then its value resets to 0.
                 // FIXME: Check if this works in practice.
-                // code.pr(String.join("\n", 
-                //     "// If " + action.getFullNameWithJoiner("_") + "  is not present, then its value resets to 0.",
-                //     "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
-                //     "    (!" + action.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
-                //     "        " + action.getFullNameWithJoiner("_") + "(s(i)) == 0",
-                //     "    ))",
-                //     "));"
-                // ));
+                code.pr(String.join("\n", 
+                    "// If " + action.getFullNameWithJoiner("_") + "  is not present, then its value resets to 0.",
+                    "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END && rxn(i) != NULL) ==> (",
+                    "    (!" + action.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
+                    "        " + action.getFullNameWithJoiner("_") + "(s(i)) == 0",
+                    "    ))",
+                    "));"
+                ));
             }
         }
 
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/BuildAstParseTreeVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/BuildAstParseTreeVisitor.java
index 05628093ac..da9cc4f33d 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/BuildAstParseTreeVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/BuildAstParseTreeVisitor.java
@@ -333,7 +333,7 @@ public CAst.AstNode visitPostfixExpression(PostfixExpressionContext ctx) {
                 // Generic pointer dereference, unanalyzable.
                 System.out.println(String.join(" ", 
                     "Warning (line " + ctx.getStart().getLine() + "):",
-                    "Generic pointer dereference is not supported in a postfix expression.",
+                    "Generic pointer dereference and function calls are not supported in a postfix expression.",
                     "Marking the declaration as opaque."
                 ));
                 return new CAst.OpaqueNode();
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
index f5317266b9..5cc21ad862 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
@@ -3,6 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.swing.Action;
+
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.NamedInstance;
 import org.lflang.generator.PortInstance;
@@ -29,6 +31,7 @@ public class CToUclidVisitor extends CBaseAstVisitor<String> {
 
     // Quantified variable
     protected String qv = "i";
+    protected String qv2 = "j";
 
     // Unchanged variables and triggers
     protected List<StateVariableInstance> unchangedStates;
@@ -93,9 +96,7 @@ public String visitIfBlockNode(IfBlockNode node) {
         // In INF, there are no nested if blocks, so we can use a field
         // to keep track of unchanged variables.
         this.unchangedStates = new ArrayList<>(this.generator.stateVariables);
-        this.unchangedTriggers = new ArrayList<>();
-        this.unchangedTriggers.addAll(this.generator.outputInstances);
-        this.unchangedTriggers.addAll(this.generator.actionInstances);
+        this.unchangedTriggers = new ArrayList<>(this.generator.outputInstances);
 
         String antecedent = visit(node.left); // Process if condition
         String consequent = visit(((IfBodyNode)node.right).left);
@@ -179,11 +180,25 @@ public String visitLiteralNode(LiteralNode node) {
         return node.literal;
     }
 
+    @Override
+    public String visitLogicalAndNode(LogicalAndNode node) {
+        String lhs = visit(node.left);
+        String rhs = visit(node.right);
+        return "(" + lhs + " && " + rhs + ")";
+    }
+
     @Override
     public String visitLogicalNotNode(LogicalNotNode node) {
         return "!" + visit(node.child);
     }
 
+    @Override
+    public String visitLogicalOrNode(LogicalOrNode node) {
+        String lhs = visit(node.left);
+        String rhs = visit(node.right);
+        return "(" + lhs + " || " + rhs + ")";
+    }
+
     @Override
     public String visitMultiplicationNode(MultiplicationNode node) {
         String lhs = visit(node.left);
@@ -198,6 +213,24 @@ public String visitNotEqualNode(NotEqualNode node) {
         return "(" + lhs + " != " + rhs + ")";
     }
 
+    @Override
+    public String visitScheduleActionNode(ScheduleActionNode node) {
+        String name = ((VariableNode)node.children.get(0)).name;
+        NamedInstance instance = getInstanceByName(name);
+        ActionInstance action = (ActionInstance)instance;
+        String delay = visit(node.children.get(1));
+        String str = "\n(" 
+            + "finite_exists (" + this.qv2 + " : integer) in indices :: (i > START && i <= END) && ("
+            + "\n    " + action.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv2 + ")" + ")"
+            + "\n    " + "&& " + "tag_same" + "(" + "g(" + this.qv2 + ")" + ", " + "tag_schedule" + "(" + "g" + "(" + this.qv + ")" + ", " + "nsec" + "(" + action.getMinDelay().toNanoSeconds() + ")" + ")" + ")";
+        if (node.children.size() == 3) {
+            String value = visit(node.children.get(2));
+            str += "\n    " + "&& " + action.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv2 + ")" + ")" + " == " + value;
+        }
+        str += "\n))";
+        return str;
+    }
+
     @Override
     public String visitSetPortNode(SetPortNode node) {
         NamedInstance port = getInstanceByName(((VariableNode)node.left).name);

From 60df7cefe65b5617383ee82761de774ed8a853bf Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 21 Jul 2022 09:38:58 -0700
Subject: [PATCH 0046/1114] Fix bugs on setting a port while scheduling an
 action, reset unused ports, and maintain unused state variables

---
 .../generator/uclid/UclidGenerator.java       | 101 +++++++++++++++++-
 .../generator/uclid/ast/CToUclidVisitor.java  |  54 +++++-----
 .../uclid/ast/IfNormalFormAstVisitor.java     |  24 +----
 3 files changed, 127 insertions(+), 52 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index bc6235aae2..13099d1bfa 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -35,6 +35,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -66,6 +67,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.generator.TriggerInstance;
 import org.lflang.generator.uclid.ast.BuildAstParseTreeVisitor;
 import org.lflang.generator.uclid.ast.CAst;
+import org.lflang.generator.uclid.ast.CAstUtils;
 import org.lflang.generator.uclid.ast.CBaseAstVisitor;
 import org.lflang.generator.uclid.ast.CToUclidVisitor;
 import org.lflang.generator.uclid.ast.IfNormalFormAstVisitor;
@@ -895,6 +897,39 @@ protected void generateReactionAxioms() {
             System.out.println("***** Printing the AST in If Normal Form.");
             baseVisitor.visit(inf);
 
+            // For the variables that are used, extract the conditions
+            // for setting them, and take the negation of their conjunction
+            // to get the condition for resetting them.
+            List<StateVariableInstance> unusedStates = new ArrayList<>(
+                reaction.getReaction().getParent().states);
+            List<PortInstance> unusedOutputs = new ArrayList<>(
+                reaction.getReaction().getParent().outputs);
+            HashMap<NamedInstance, List<CAst.AstNode>> resetConditions = new HashMap<>();
+            for (CAst.AstNode node : inf.children) {
+                CAst.IfBlockNode ifBlockNode = (CAst.IfBlockNode)node;
+                CAst.AstNode ifBody = ((CAst.IfBodyNode)ifBlockNode.right).left;
+                NamedInstance instance = null;
+                if ((ifBody instanceof CAst.AssignmentNode 
+                    && ((CAst.AssignmentNode)ifBody).left instanceof CAst.StateVarNode)) {
+                    CAst.StateVarNode n = (CAst.StateVarNode)((CAst.AssignmentNode)ifBody).left;
+                    instance = reaction.getReaction().getParent().states.stream()
+                                .filter(s -> s.getName().equals(n.name)).findFirst().get();
+                    unusedStates.remove(instance);
+                } else if (ifBody instanceof CAst.SetPortNode) {
+                    CAst.SetPortNode n = (CAst.SetPortNode)ifBody;
+                    String name = ((CAst.VariableNode)n.left).name;
+                    instance = reaction.getReaction().getParent().outputs.stream()
+                                .filter(s -> s.getName().equals(name)).findFirst().get();
+                    unusedOutputs.remove(instance);
+                } else continue;
+                // Create a new entry in the list if there isn't one yet.
+                if (resetConditions.get(instance) == null) {
+                    resetConditions.put(instance, new ArrayList<CAst.AstNode>());
+                }
+                resetConditions.get(instance).add(ifBlockNode.left);
+                System.out.println("!!! Added another reset condition: " + ifBlockNode.left);
+            }
+
             // Generate Uclid axiom for the C AST.
             CToUclidVisitor c2uVisitor = new CToUclidVisitor(this, reaction);
             System.out.println("***** Generating axioms from AST.");
@@ -903,9 +938,71 @@ protected void generateReactionAxioms() {
                 "// Reaction body of " + reaction,
                 "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
                 "    (rxn(i) == " + reaction.getReaction().getFullNameWithJoiner("_") + ")",
-                "        ==> " + axiom,
-                "));"
+                "        ==> " + "(" + "(" + axiom + ")",
+                "            && " + "( " + "true",
+                "            // Default behavior"
             ));
+    
+            for (NamedInstance key : resetConditions.keySet()) {
+                CAst.AstNode disjunction = CAstUtils.takeDisjunction(resetConditions.get(key));
+                System.out.println("!!! Reset conditions: " + resetConditions.get(key));
+                CAst.LogicalNotNode notNode = new CAst.LogicalNotNode();
+                notNode.child = disjunction;
+                String resetCondition = c2uVisitor.visit(notNode);
+                System.out.println("!!! Str: " + resetCondition);
+                code.pr("&& " + "(" + "(" + resetCondition + ")" + " ==> " + "(");
+                if (key instanceof StateVariableInstance) {
+                    StateVariableInstance n = (StateVariableInstance)key;
+                    code.pr(n.getFullNameWithJoiner("_") + "(" + "s" + "(" + "i" + ")" + ")"
+                    + " == "
+                    + n.getFullNameWithJoiner("_") + "(" + "s" + "(" + "i" + "-1" + ")" + ")");
+                } else if (key instanceof PortInstance) {
+                    PortInstance n = (PortInstance)key;
+                    code.pr(
+                        "("
+                        + " true"
+                        // Reset value
+                        + "\n&& " + n.getFullNameWithJoiner("_") + "(" + "s" + "(" + "i" + ")" + ")"
+                        + " == "
+                        + "0" // Default value
+                        // Reset presence
+                        + "\n&& " + n.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + "i" + ")" + ")"
+                        + " == "
+                        + false // default presence
+                        + ")"
+                    );
+                } else {    
+                    System.out.println("Unreachable!");
+                }
+                code.pr("))");
+            }
+            // Unused state variables and ports reset by default.
+            code.pr("// Unused state variables and ports reset by default.");
+            for (StateVariableInstance s : unusedStates) {
+                code.pr("&& (true ==> (");
+                code.pr(s.getFullNameWithJoiner("_") + "(" + "s" + "(" + "i" + ")" + ")"
+                    + " == "
+                    + s.getFullNameWithJoiner("_") + "(" + "s" + "(" + "i" + "-1" + ")" + ")");
+                code.pr("))");
+            }
+            for (PortInstance p : unusedOutputs) {
+                code.pr("&& (true ==> (");
+                code.pr(
+                        "("
+                        + " true"
+                        // Reset value
+                        + "\n&& " + p.getFullNameWithJoiner("_") + "(" + "s" + "(" + "i" + ")" + ")"
+                        + " == "
+                        + "0" // Default value
+                        // Reset presence
+                        + "\n&& " + p.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + "i" + ")" + ")"
+                        + " == "
+                        + false // default presence
+                        + ")"
+                    );
+                code.pr("))");
+            }
+            code.pr("))));");
         }
     }
 
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
index 5cc21ad862..5aeb51fe5c 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
@@ -59,7 +59,7 @@ public String visitAssignmentNode(AssignmentNode node) {
         if (node.left instanceof StateVarNode) {
             NamedInstance instance = getInstanceByName(((StateVarNode)node.left).name);
             lhs = instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
-            this.unchangedStates.remove(instance); // Remove instance from the unchanged list.
+            // this.unchangedStates.remove(instance); // Remove instance from the unchanged list.
         } else {
             System.out.println("Unreachable!"); // FIXME: Throw exception.
         }
@@ -95,25 +95,25 @@ public String visitIfBlockNode(IfBlockNode node) {
 
         // In INF, there are no nested if blocks, so we can use a field
         // to keep track of unchanged variables.
-        this.unchangedStates = new ArrayList<>(this.generator.stateVariables);
-        this.unchangedTriggers = new ArrayList<>(this.generator.outputInstances);
+        // this.unchangedStates = new ArrayList<>(this.generator.stateVariables);
+        // this.unchangedTriggers = new ArrayList<>(this.generator.outputInstances);
 
         String antecedent = visit(node.left); // Process if condition
         String consequent = visit(((IfBodyNode)node.right).left);
 
         formula += "(" + antecedent + " ==> " + "(" + consequent;
 
-        formula += "\n//// Unchanged variables";
-        // State variables retain their previous states.
-        formula += "\n// State variables retain their previous states.";
-        for (StateVariableInstance s : this.unchangedStates) {
-            formula += "\n&& " + s.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")"
-                        + " == "
-                        + s.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + "-1" + ")" + ")";
-        }
+        // formula += "\n//// Unchanged variables";
+        // // State variables retain their previous states.
+        // formula += "\n// State variables retain their previous states.";
+        // for (StateVariableInstance s : this.unchangedStates) {
+        //     formula += "\n&& " + s.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")"
+        //                 + " == "
+        //                 + s.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + "-1" + ")" + ")";
+        // }
         // Triggers resets to their default states if time advances.
-        formula += "\n// Triggers resets to their default states if time advances.";
-        for (TriggerInstance t : this.unchangedTriggers) {
+        // formula += "\n// Triggers resets to their default states if time advances.";
+        // for (TriggerInstance t : this.unchangedTriggers) {
             // formula += "\n&& " 
             //             + "(" + "(" 
             //             + "tag_same(" + "g(" + this.qv + ")" + "," + "g(" + this.qv + "-1" + ")" + ")" + ")"
@@ -142,19 +142,19 @@ public String visitIfBlockNode(IfBlockNode node) {
             //             + this.defaultPresence
             //             + ")" + ")";
 
-            formula += "\n&& " 
-                        + "("
-                        + " true"
-                        // Reset value
-                        + "\n&& " + t.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")"
-                        + " == "
-                        + this.defaultValue
-                        // Reset presence
-                        + "\n&& " + t.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv + ")" + ")"
-                        + " == "
-                        + this.defaultPresence
-                        + ")";
-        }
+            // formula += "\n&& " 
+            //             + "("
+            //             + " true"
+            //             // Reset value
+            //             + "\n&& " + t.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")"
+            //             + " == "
+            //             + this.defaultValue
+            //             // Reset presence
+            //             + "\n&& " + t.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv + ")" + ")"
+            //             + " == "
+            //             + this.defaultPresence
+            //             + ")";
+        // }
 
         formula += "\n))";
 
@@ -236,7 +236,7 @@ public String visitSetPortNode(SetPortNode node) {
         NamedInstance port = getInstanceByName(((VariableNode)node.left).name);
         String value = visit(node.right);
         // Remove this port from the unchanged list.
-        this.unchangedTriggers.remove(port);
+        // this.unchangedTriggers.remove(port);
         return "("
             + "("
             + port.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")"
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/IfNormalFormAstVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/IfNormalFormAstVisitor.java
index a6bb4ae29b..18bfe0313d 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/IfNormalFormAstVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/IfNormalFormAstVisitor.java
@@ -72,33 +72,11 @@ public Void visitIfBlockNode(CAst.IfBlockNode node, List<CAst.AstNode> condition
         return null;
     }
 
-    private CAst.AstNode takeConjunction(List<CAst.AstNode> conditions) {
-        if (conditions.size() == 0) {
-            return new CAst.LiteralNode("true");
-        } else if (conditions.size() == 1) {
-            return conditions.get(0);
-        } else {
-            // Take the conjunction of all the conditions.
-            CAst.LogicalAndNode top = new CAst.LogicalAndNode();
-            CAst.LogicalAndNode cur = top;
-            for (int i = 0; i < conditions.size()-1; i++) {
-                cur.left = conditions.get(i);
-                if (i == conditions.size()-2) {
-                    cur.right = conditions.get(i+1);
-                } else {
-                    cur.right = new CAst.LogicalAndNode();
-                    cur =(CAst.LogicalAndNode)cur.right;
-                }
-            }
-            return top;
-        }
-    }
-
     private CAst.IfBlockNode generateIfBlock(CAst.AstNode node, List<CAst.AstNode> conditions) {
         // Create an If Block node.
         CAst.IfBlockNode ifNode = new CAst.IfBlockNode();
         // Set the condition of the if block node.
-        CAst.AstNode conjunction = takeConjunction(conditions);
+        CAst.AstNode conjunction = CAstUtils.takeConjunction(conditions);
         ifNode.left = conjunction;
         // Create a new body node.
         CAst.IfBodyNode body = new CAst.IfBodyNode();

From 965eca54f901b57452581a078607fc2ac663116d Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 21 Jul 2022 09:45:36 -0700
Subject: [PATCH 0047/1114] Prune dead code, attach value to action

---
 .../generator/uclid/ast/CToUclidVisitor.java  | 88 +++----------------
 1 file changed, 12 insertions(+), 76 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
index 5aeb51fe5c..1f6b689acc 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
@@ -54,15 +54,15 @@ public CToUclidVisitor(UclidGenerator generator, ReactionInstance.Runtime reacti
 
     @Override
     public String visitAssignmentNode(AssignmentNode node) {
-        // String lhs = visit(node.left);
-        String lhs = "";
-        if (node.left instanceof StateVarNode) {
-            NamedInstance instance = getInstanceByName(((StateVarNode)node.left).name);
-            lhs = instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
-            // this.unchangedStates.remove(instance); // Remove instance from the unchanged list.
-        } else {
-            System.out.println("Unreachable!"); // FIXME: Throw exception.
-        }
+        String lhs = visit(node.left);
+        // String lhs = "";
+        // if (node.left instanceof StateVarNode) {
+        //     NamedInstance instance = getInstanceByName(((StateVarNode)node.left).name);
+        //     lhs = instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
+        //     // this.unchangedStates.remove(instance); // Remove instance from the unchanged list.
+        // } else {
+        //     System.out.println("Unreachable!"); // FIXME: Throw exception.
+        // }
         String rhs = visit(node.right);
         return "(" + lhs + " == " + rhs + ")";
     }
@@ -90,75 +90,9 @@ public String visitGreaterThanNode(GreaterThanNode node) {
 
     @Override
     public String visitIfBlockNode(IfBlockNode node) {
-
-        String formula = "";
-
-        // In INF, there are no nested if blocks, so we can use a field
-        // to keep track of unchanged variables.
-        // this.unchangedStates = new ArrayList<>(this.generator.stateVariables);
-        // this.unchangedTriggers = new ArrayList<>(this.generator.outputInstances);
-
         String antecedent = visit(node.left); // Process if condition
         String consequent = visit(((IfBodyNode)node.right).left);
-
-        formula += "(" + antecedent + " ==> " + "(" + consequent;
-
-        // formula += "\n//// Unchanged variables";
-        // // State variables retain their previous states.
-        // formula += "\n// State variables retain their previous states.";
-        // for (StateVariableInstance s : this.unchangedStates) {
-        //     formula += "\n&& " + s.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")"
-        //                 + " == "
-        //                 + s.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + "-1" + ")" + ")";
-        // }
-        // Triggers resets to their default states if time advances.
-        // formula += "\n// Triggers resets to their default states if time advances.";
-        // for (TriggerInstance t : this.unchangedTriggers) {
-            // formula += "\n&& " 
-            //             + "(" + "(" 
-            //             + "tag_same(" + "g(" + this.qv + ")" + "," + "g(" + this.qv + "-1" + ")" + ")" + ")"
-            //             + " ==> " + "(" + " true"
-            //             // Retain value
-            //             + "\n&& " + t.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")"
-            //             + " == "
-            //             + t.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + "-1" + ")" + ")"
-            //             // Retain presence
-            //             + "\n&& " + t.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv + ")" + ")"
-            //             + " == "
-            //             + t.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv + "-1" + ")" + ")"
-            //             + ")" + ")"
-            //             // If time advances.
-            //             + "\n&& " 
-            //             + "(" + "("
-            //             + "tag_later(" + "g(" + this.qv + ")" + "," + "g(" + this.qv + "-1" + ")" + ")" + ")"
-            //             + " ==> " + "(" + " true"
-            //             // Reset value
-            //             + "\n&& " + t.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")"
-            //             + " == "
-            //             + this.defaultValue
-            //             // Reset presence
-            //             + "\n&& " + t.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv + ")" + ")"
-            //             + " == "
-            //             + this.defaultPresence
-            //             + ")" + ")";
-
-            // formula += "\n&& " 
-            //             + "("
-            //             + " true"
-            //             // Reset value
-            //             + "\n&& " + t.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")"
-            //             + " == "
-            //             + this.defaultValue
-            //             // Reset presence
-            //             + "\n&& " + t.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv + ")" + ")"
-            //             + " == "
-            //             + this.defaultPresence
-            //             + ")";
-        // }
-
-        formula += "\n))";
-
-        return formula;
+        return "(" + antecedent + " ==> " + "(" + consequent + "\n))";
     }
 
     @Override
@@ -226,6 +160,8 @@ public String visitScheduleActionNode(ScheduleActionNode node) {
         if (node.children.size() == 3) {
             String value = visit(node.children.get(2));
             str += "\n    " + "&& " + action.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv2 + ")" + ")" + " == " + value;
+        } else {
+            str += "\n    " + "&& " + action.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv2 + ")" + ")" + " == " + "0";
         }
         str += "\n))";
         return str;

From 712efb9752710cbf7d17fdca90bbf8bc7e643c38 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 21 Jul 2022 10:33:30 -0700
Subject: [PATCH 0048/1114] Add CAst utils

---
 .../generator/uclid/UclidGenerator.java       |  4 +-
 .../lflang/generator/uclid/ast/CAstUtils.java | 50 +++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 org.lflang/src/org/lflang/generator/uclid/ast/CAstUtils.java

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 13099d1bfa..7f0925b169 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -939,8 +939,8 @@ protected void generateReactionAxioms() {
                 "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
                 "    (rxn(i) == " + reaction.getReaction().getFullNameWithJoiner("_") + ")",
                 "        ==> " + "(" + "(" + axiom + ")",
-                "            && " + "( " + "true",
-                "            // Default behavior"
+                "&& " + "( " + "true",
+                "// Default behavior"
             ));
     
             for (NamedInstance key : resetConditions.keySet()) {
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CAstUtils.java b/org.lflang/src/org/lflang/generator/uclid/ast/CAstUtils.java
new file mode 100644
index 0000000000..ac40caed23
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/CAstUtils.java
@@ -0,0 +1,50 @@
+package org.lflang.generator.uclid.ast;
+
+import java.util.List;
+
+public class CAstUtils {
+    
+    public static CAst.AstNode takeConjunction(List<CAst.AstNode> conditions) {
+        if (conditions.size() == 0) {
+            return new CAst.LiteralNode("true");
+        } else if (conditions.size() == 1) {
+            return conditions.get(0);
+        } else {
+            // Take the conjunction of all the conditions.
+            CAst.LogicalAndNode top = new CAst.LogicalAndNode();
+            CAst.LogicalAndNode cur = top;
+            for (int i = 0; i < conditions.size()-1; i++) {
+                cur.left = conditions.get(i);
+                if (i == conditions.size()-2) {
+                    cur.right = conditions.get(i+1);
+                } else {
+                    cur.right = new CAst.LogicalAndNode();
+                    cur =(CAst.LogicalAndNode)cur.right;
+                }
+            }
+            return top;
+        }
+    }
+
+    public static CAst.AstNode takeDisjunction(List<CAst.AstNode> conditions) {
+        if (conditions.size() == 0) {
+            return new CAst.LiteralNode("true");
+        } else if (conditions.size() == 1) {
+            return conditions.get(0);
+        } else {
+            // Take the conjunction of all the conditions.
+            CAst.LogicalOrNode top = new CAst.LogicalOrNode();
+            CAst.LogicalOrNode cur = top;
+            for (int i = 0; i < conditions.size()-1; i++) {
+                cur.left = conditions.get(i);
+                if (i == conditions.size()-2) {
+                    cur.right = conditions.get(i+1);
+                } else {
+                    cur.right = new CAst.LogicalOrNode();
+                    cur =(CAst.LogicalOrNode)cur.right;
+                }
+            }
+            return top;
+        }
+    }
+}
\ No newline at end of file

From f5915f36d3882443779fd56f7b02974d674295de Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 21 Jul 2022 20:34:49 -0700
Subject: [PATCH 0049/1114] Fix tag_schedule, action one-to-one correspondence,
 and startup axioms

---
 .../lflang/generator/uclid/MTLVisitor.java    |  14 +-
 .../generator/uclid/UclidGenerator.java       | 182 ++++++++++--------
 .../generator/uclid/ast/CToUclidVisitor.java  |  19 +-
 3 files changed, 112 insertions(+), 103 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
index c569b8ddc9..5e38ce18f0 100644
--- a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
@@ -423,29 +423,29 @@ private String generateTimePredicate(MTLParser.IntervalContext ctx,
         if (ctx instanceof MTLParser.SingletonContext) {
             MTLParser.SingletonContext singletonCtx = (MTLParser.SingletonContext)ctx;
             timePredicate += "tag_same(g(" + prefixIdx + "), " + "tag_schedule(g(" 
-                                + prevPrefixIdx + "), nsec(" + upperBoundNanoSec + ")))";
+                                + prevPrefixIdx + "), " + upperBoundNanoSec + "))";
         } else {
             MTLParser.RangeContext rangeCtx = (MTLParser.RangeContext)ctx;
             timePredicate += "(";
             if (rangeCtx.LBRACKET() != null) {
                 // FIXME: Check if this can be replaced by a !tag_earlier.
                 timePredicate += "tag_later(g(" + prefixIdx + "), "
-                    + "tag_schedule(g(" + prevPrefixIdx + "), nsec(" + lowerBoundNanoSec + ")))"
+                    + "tag_schedule(g(" + prevPrefixIdx + "), " + lowerBoundNanoSec + "))"
                     + " || " + "tag_same(g(" + prefixIdx + "), "
-                    + "tag_schedule(g(" + prevPrefixIdx + "), nsec(" + lowerBoundNanoSec + ")))";
+                    + "tag_schedule(g(" + prevPrefixIdx + "), " + lowerBoundNanoSec + "))";
             } else {
                 timePredicate += "tag_later(g(" + prefixIdx + "), "
-                    + "tag_schedule(g(" + prevPrefixIdx + "), nsec(" + lowerBoundNanoSec + ")))";
+                    + "tag_schedule(g(" + prevPrefixIdx + "), " + lowerBoundNanoSec + "))";
             }
             timePredicate += ") && (";
             if (rangeCtx.RBRACKET() != null) {
                 timePredicate += "tag_earlier(g(" + prefixIdx + "), "
-                    + "tag_schedule(g(" + prevPrefixIdx + "), nsec(" + upperBoundNanoSec + ")))"
+                    + "tag_schedule(g(" + prevPrefixIdx + "), " + upperBoundNanoSec + "))"
                     + " || " + "tag_same(g(" + prefixIdx + "), "
-                    + "tag_schedule(g(" + prevPrefixIdx + "), nsec(" + upperBoundNanoSec + ")))";
+                    + "tag_schedule(g(" + prevPrefixIdx + "), " + upperBoundNanoSec + "))";
             } else {
                 timePredicate += "tag_earlier(g(" + prefixIdx + "), "
-                    + "tag_schedule(g(" + prevPrefixIdx + "), nsec(" + upperBoundNanoSec + ")))";
+                    + "tag_schedule(g(" + prevPrefixIdx + "), " + upperBoundNanoSec + "))";
             }
             timePredicate += ")";
         }
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 7f0925b169..01f048b3ba 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -336,23 +336,8 @@ protected void generateTimingSemantics() {
             "    || (pi1(t1) == pi1(t2) && pi2(t1) < pi2(t2))",
             "    || (!isInf(t1) && isInf(t2));",
             "",
-            "// mstep() produces a mstep delay. zero() produces no delay.",
-            "define tag_schedule(t : tag_t, i : interval_t) : tag_t",
-            "= if (!isInf(t) && !isInf(i) && pi1(i) == 0 && pi2(i) == 1)",
-            "    then { pi1(t), pi2(t) + 1 } // microstep delay",
-            "    else ( if (!isInf(t) && !isInf(i) && pi1(i) == 0 && pi2(i) == 0)",
-            "            then t // no delay",
-            "            else (",
-            "                if (!isInf(t) && pi1(i) > 0 && !isInf(i))",
-            "                then { pi1(t) + pi1(i), 0 }",
-            "                else inf()",
-            "            ));",
-            "",
-            "// Deprecated.",
-            "define tag_delay(t : tag_t, i : interval_t) : tag_t",
-            "= if (!isInf(t) && !isInf(i))",
-            "    then { pi1(t) + pi1(i), pi2(t) + pi2(i) }",
-            "    else inf();",
+            "define tag_schedule(t : tag_t, i : integer) : tag_t",
+            "= if (i == 0) then { pi1(t), pi2(t)+1 } else { pi1(t)+i, 0 };",
             "",
             "// Only consider timestamp for now.",
             "define tag_diff(t1, t2: tag_t) : interval_t",
@@ -391,15 +376,11 @@ protected void generateTraceDefinition(int CT) {
         code.unindent();
         code.pr("};\n\n");
 
-        // FIXME: Let's see if in_range() can be removed altogether.
-        // define in_range(num : integer) : boolean
-        // = num >= START && num <= END;
-
         // Define step, event, and trace types.
         code.pr(String.join("\n",
             "// Define step and event types.",
             "type step_t = integer;",
-            "type event_t = { rxn_t, tag_t, state_t, trigger_t };",
+            "type event_t = { rxn_t, tag_t, state_t, trigger_t, sched_t };",
             "",
             "// Create a bounded trace with length " + String.valueOf(CT)
         ));
@@ -430,7 +411,6 @@ protected void generateTraceDefinition(int CT) {
         // Define a tuple getter.
         // FIXME: Support this feature in Uclid.
         String initialStates = "";
-        String initialTriggerPresence = "";
         if (this.namedInstances.size() > 0) {
             initialStates = "0, ".repeat(this.namedInstances.size());
             initialStates = initialStates.substring(0, initialStates.length()-2);
@@ -438,6 +418,7 @@ protected void generateTraceDefinition(int CT) {
             // Initialize a dummy variable just to make the code compile.
             initialStates = "0";
         }
+        String initialTriggerPresence = "";
         if (this.triggerInstances.size() > 0) {
             initialTriggerPresence = "false, ".repeat(this.triggerInstances.size());
             initialTriggerPresence = initialTriggerPresence.substring(0, initialTriggerPresence.length()-2);
@@ -445,12 +426,20 @@ protected void generateTraceDefinition(int CT) {
             // Initialize a dummy variable just to make the code compile.
             initialTriggerPresence = "false";
         }
+        String initialActionsScheduled = "";
+        if (this.actionInstances.size() > 0) {
+            initialActionsScheduled = "false, ".repeat(this.actionInstances.size());
+            initialActionsScheduled = initialActionsScheduled.substring(0, initialActionsScheduled.length()-2);
+        } else {
+            // Initialize a dummy variable just to make the code compile.
+            initialActionsScheduled = "false";
+        }
         code.pr("// Helper macro that returns an element based on index.");
         code.pr("define get(tr : trace_t, i : step_t) : event_t =");
         for (int i = 0; i < CT; i++) {
             code.pr("if (i == " + String.valueOf(i) + ") then tr._" + String.valueOf(i+1) + " else (");
         }
-        code.pr("{ NULL, inf(), { " + initialStates + " }, { " + initialTriggerPresence + " } }");
+        code.pr("{ NULL, inf(), { " + initialStates + " }, { " + initialTriggerPresence + " }, {" + initialActionsScheduled + "} }");
         code.pr(")".repeat(CT) + ";\n");
 
         // Define an event getter from the trace.
@@ -463,6 +452,7 @@ protected void generateTraceDefinition(int CT) {
             "define g        (i : step_t) : tag_t        = elem(i)._2;",
             "define s        (i : step_t) : state_t      = elem(i)._3;",
             "define t        (i : step_t) : trigger_t    = elem(i)._4;",
+            "define d        (i : step_t) : sched_t      = elem(i)._5;",
             "define isNULL   (i : step_t) : boolean      = rxn(i) == NULL;",
             ""
         ));
@@ -500,6 +490,7 @@ protected void generateReactionIdsAndStateVars() {
 
         // State variables and triggers
         // FIXME: expand to data types other than integer
+        code.pr("// State variables and triggers");
         code.pr("type state_t = {");
         code.indent();
         if (this.namedInstances.size() > 0) {
@@ -522,6 +513,7 @@ protected void generateReactionIdsAndStateVars() {
         code.pr("\n"); // Newline
 
         // A boolean tuple indicating whether triggers are present.
+        code.pr("// A boolean tuple indicating whether triggers are present.");
         code.pr("type trigger_t = {");
         code.indent();
         if (this.triggerInstances.size() > 0) {
@@ -541,6 +533,32 @@ protected void generateReactionIdsAndStateVars() {
         for (var i = 0; i < this.triggerInstances.size(); i++) {
             code.pr("define " + this.triggerInstances.get(i).getFullNameWithJoiner("_") + "_is_present" + "(t : trigger_t) : boolean = t._" + (i+1) + ";");
         }
+
+        // A boolean tuple indicating whether actions are scheduled by reactions
+        // at the instant when reactions are triggered.
+        code.pr(String.join("\n",
+            "// A boolean tuple indicating whether actions are scheduled by reactions",
+            "// at the instant when reactions are triggered."
+        ));
+        code.pr("type sched_t = {");
+        code.indent();
+        if (this.actionInstances.size() > 0) {
+            for (var i = 0 ; i < this.actionInstances.size(); i++) {
+                code.pr("boolean" + ((i == this.actionInstances.size() - 1) ? "" : ",") + "\t// " + this.actionInstances.get(i));
+            }
+        } else {
+            code.pr(String.join("\n", 
+                "// There are no actions.",
+                "// Insert a dummy boolean to make the model compile.",
+                "boolean"
+            ));            
+        }
+        code.unindent();
+        code.pr("};");
+        code.pr("// Projection macros for action schedule flag");
+        for (var i = 0; i < this.actionInstances.size(); i++) {
+            code.pr("define " + this.actionInstances.get(i).getFullNameWithJoiner("_") + "_scheduled" + "(d : sched_t) : boolean = d._" + (i+1) + ";");
+        }
     }
 
     /**
@@ -582,12 +600,7 @@ protected void generateReactorSemantics() {
             "axiom(finite_forall (j : integer) in indices :: (j > START && j <= END) ==> (",
             "    (rxn(j)) != NULL) ==> ",
             "        (finite_forall (i : integer) in indices :: (i > START && i < j) ==> (rxn(i) != NULL)));",
-            "",
-            "// FIXME: This axiom appears to be buggy.",
-            "// When a NULL event occurs, the state stays the same.",
-            "// axiom(finite_forall (j : integer) in indices :: (j > START && j <= END) ==> (",
-            "//     (rxn(j) == NULL) ==> (s(j) == s(j-1))",
-            "// ));"
+            ""
         ));
 
         // Non-federated "happened-before"
@@ -665,7 +678,7 @@ protected void generateTriggersAndReactions() {
                         "    finite_exists (j : integer) in indices :: j > i && j <= END",
                         "    && " + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(j))",
                         "    && " + destination.getFullNameWithJoiner("_") + "(s(j)) == " + source.getFullNameWithJoiner("_") + "(s(i))",
-                        connection.isPhysical() ? "" : "&& g(j) == tag_schedule(g(i), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")",
+                        connection.isPhysical() ? "" : "&& g(j) == tag_schedule(g(i), " + delay + ")",
                         ")",
                         ")) // Closes (" + source.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> ((.",
                         //// Separator
@@ -674,39 +687,10 @@ protected void generateTriggersAndReactions() {
                         "&& (" + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
                         "    finite_exists (j : integer) in indices :: j >= START && j < i",
                         "    && " + source.getFullNameWithJoiner("_") + "_is_present" + "(t(j))",
-                        connection.isPhysical() ? "" : "    && g(i) == tag_schedule(g(j), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")",
+                        connection.isPhysical() ? "" : "    && g(i) == tag_schedule(g(j), " + delay + ")",
                         ")) // Closes the one-to-one relationship.",
                         "));"
                     ));
-                    // code.pr(String.join("\n", 
-                    //     "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
-                    //     "// If " + source.getFullNameWithJoiner("_") + " is present, then "
-                    //         + destination.getFullNameWithJoiner("_") + " will be present.",
-                    //     "// with the same value after some fixed delay of " + delay + " nanoseconds.",
-                    //     "(" + source.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> ((",
-                    //     "    finite_exists (j : integer) in indices :: j > i && j <= END",
-                    //     "    && " + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(j))",
-                    //     "    && " + destination.getFullNameWithJoiner("_") + "(s(j)) == " + source.getFullNameWithJoiner("_") + "(s(i))",
-                    //     connection.isPhysical() ? "" : "&& g(j) == tag_schedule(g(i), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")",
-                    //     ")||(",
-                    //     // Relaxation axioms: a port presence can not produce a downstream presence
-                    //     // but it needs to guarantee that there are no trailing NULL events.
-                    //     // FIXME: !«downstreamPortIsPresent»(t(k)) makes the solver timeout.
-                    //     "(finite_forall (k : integer) in indices :: (k > i && k <= END) ==> (rxn(k) != NULL",
-                    //     "    && " + destination.getFullNameWithJoiner("_") + "(s(k)) == " + source.getFullNameWithJoiner("_") + "(s(i))",
-                    //     connection.isPhysical() ? "" : "    && (tag_same(g(k), tag_schedule(g(i), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")) || tag_earlier(g(k), tag_schedule(g(i), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")))",
-                    //     ")) // Closes forall.",
-                    //     ")  // Closes ||",
-                    //     ")) // Closes (" + source.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> ((.",
-                    //     "// If " + destination.getFullNameWithJoiner("_") + " is present, there exists an " + source.getFullNameWithJoiner("_") + " in prior steps.",
-                    //     "// This additional term establishes a one-to-one relationship between two ports' signals.",
-                    //     "&& (" + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
-                    //     "    finite_exists (j : integer) in indices :: j >= START && j < i",
-                    //     "    && " + source.getFullNameWithJoiner("_") + "_is_present" + "(t(j))",
-                    //     connection.isPhysical() ? "" : "    && g(i) == tag_schedule(g(j), " + (delay==0 ? "zero()" : "nsec(" + delay + ")") + ")",
-                    //     ")) // Closes the one-to-one relationship.",
-                    //     "));"
-                    // ));
 
                     // If destination is not present, then its value resets to 0.
                     code.pr(String.join("\n", 
@@ -740,8 +724,8 @@ protected void generateTriggersAndReactions() {
                         "&& (" + action.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
                         "    finite_exists (j : integer) in indices :: j >= START && j < i",
                         "    && rxn(j) == " + reaction.getFullNameWithJoiner("_"),
-                        "    && g(i) == tag_schedule(g(j), "
-                            + (action.getMinDelay() == TimeValue.ZERO ? "mstep()" : "nsec(" + action.getMinDelay().toNanoSeconds() + ")") + ")",
+                        "    && g(i) == tag_schedule(g(j), " + action.getMinDelay().toNanoSeconds() + ")",
+                        "    && " + action.getFullNameWithJoiner("_") + "_scheduled" + "(d(j))",
                         "))"
                     );
                 }
@@ -768,14 +752,6 @@ protected void generateTriggersAndReactions() {
             }
         }
 
-        // FIXME: Factor the startup trigger here as well.
-        // code.pr(String.join("\n", 
-        //     "define startup_triggers(n : rxn_t) : boolean",
-        //     "=   // if startup is within frame, put the events in the trace.",
-        //     "    ((start_time == 0) ==> (finite_exists (i : integer) in indices :: in_range(i)",
-        //     "        && rxn(i) == n && tag_same(g(i), zero())));"
-        // ));
-
         code.pr(String.join("\n", 
             "/********************************",
             " * Reactions and Their Triggers *",
@@ -783,13 +759,13 @@ protected void generateTriggersAndReactions() {
         ));
         // Iterate over all reactions, generate conditions for them
         // to be triggered.
+        outerLoop:
         for (ReactionInstance.Runtime reaction : this.reactionInstances) {
-            code.pr(String.join("\n", 
+            String str = String.join("\n", 
                 "// " + reaction.getReaction().getFullNameWithJoiner("_") + " is invoked when any of it triggers are present.",
                 "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> ((",
                 "    false"
-            ));
-            code.indent();
+            );
 
             // Iterate over the triggers of the reaction.
             for (TriggerInstance trigger : reaction.getReaction().triggers) {
@@ -799,11 +775,31 @@ protected void generateTriggersAndReactions() {
                     // Check if this trigger is a built-in trigger (startup or shutdown).
                     if (trigger.isStartup()) {
                         // FIXME: Treat startup as a variable.
-                        triggerPresentStr = "g(i) == zero()";
+                        // triggerPresentStr = "g(i) == zero()";
+                        
+                        // Handle startup.
+                        code.pr(String.join("\n", 
+                            "// If startup is within frame (and all variables have default values),",
+                            "// " + reaction.getReaction().getFullNameWithJoiner("_") + " must be invoked.",
+                            "axiom(",
+                            "    ((start_time == 0) ==> (",
+                            "        finite_exists (i : integer) in indices :: i > START && i <= END",
+                            "            && rxn(i) == " + reaction.getReaction().getFullNameWithJoiner("_") + " && tag_same(g(i), zero())",
+                            "            && !(",
+                            "            finite_exists (j : integer) in indices :: j > START && j <= END",
+                            "            && rxn(j) == " + reaction.getReaction().getFullNameWithJoiner("_") ,
+                            "            && j != i",
+                            "            )",
+                            "    ))",
+                            ");"
+                        ));
+                        continue outerLoop;
                     } else if (trigger.isShutdown()) {
                         // FIXME: For a future version.
+                        System.out.println("Not implemented!");
                     } else {
                         // Unreachable.
+                        System.out.println("Unreachable!");
                     }
                 }
                 else {
@@ -823,12 +819,13 @@ protected void generateTriggersAndReactions() {
                     }
                 }
                 
-                code.pr("|| (" + triggerPresentStr + exclusion + ")");
+                // code.pr("|| (" + triggerPresentStr + exclusion + ")");
+                str += "\n|| (" + triggerPresentStr + exclusion + ")";
             }
 
             // If any of the above trigger is present, then trigger the reaction.
-            code.unindent();
-            code.pr(") <==> (rxn(i) == " + reaction.getReaction().getFullNameWithJoiner("_") + ")));");
+            str += "\n) <==> (rxn(i) == " + reaction.getReaction().getFullNameWithJoiner("_") + ")));";
+            code.pr(str);
         }
     }
 
@@ -855,6 +852,9 @@ protected void generateInitialConditions() {
         for (var t : this.triggerInstances) {
             code.pr("&& !" + t.getFullNameWithJoiner("_") + "_is_present" + "(t(0))");
         }
+        for (var d : this.actionInstances) {
+            code.pr("&& !" + d.getFullNameWithJoiner("_") + "_scheduled" + "(d(0))");
+        }
         code.unindent();
         code.pr(";\n");
     }
@@ -900,10 +900,9 @@ protected void generateReactionAxioms() {
             // For the variables that are used, extract the conditions
             // for setting them, and take the negation of their conjunction
             // to get the condition for resetting them.
-            List<StateVariableInstance> unusedStates = new ArrayList<>(
-                reaction.getReaction().getParent().states);
-            List<PortInstance> unusedOutputs = new ArrayList<>(
-                reaction.getReaction().getParent().outputs);
+            List<StateVariableInstance> unusedStates = new ArrayList<>(this.stateVariables);
+            List<PortInstance> unusedOutputs = new ArrayList<>(this.outputInstances);
+            List<ActionInstance> unusedActions = new ArrayList<>(this.actionInstances);
             HashMap<NamedInstance, List<CAst.AstNode>> resetConditions = new HashMap<>();
             for (CAst.AstNode node : inf.children) {
                 CAst.IfBlockNode ifBlockNode = (CAst.IfBlockNode)node;
@@ -921,6 +920,12 @@ protected void generateReactionAxioms() {
                     instance = reaction.getReaction().getParent().outputs.stream()
                                 .filter(s -> s.getName().equals(name)).findFirst().get();
                     unusedOutputs.remove(instance);
+                } else if (ifBody instanceof CAst.ScheduleActionNode) {
+                    CAst.ScheduleActionNode n = (CAst.ScheduleActionNode)ifBody;
+                    String name = ((CAst.VariableNode)n.children.get(0)).name;
+                    instance = reaction.getReaction().getParent().actions.stream()
+                                .filter(s -> s.getName().equals(name)).findFirst().get();
+                    unusedActions.remove(instance);
                 } else continue;
                 // Create a new entry in the list if there isn't one yet.
                 if (resetConditions.get(instance) == null) {
@@ -940,9 +945,8 @@ protected void generateReactionAxioms() {
                 "    (rxn(i) == " + reaction.getReaction().getFullNameWithJoiner("_") + ")",
                 "        ==> " + "(" + "(" + axiom + ")",
                 "&& " + "( " + "true",
-                "// Default behavior"
+                "// Default behavior of the used variables"
             ));
-    
             for (NamedInstance key : resetConditions.keySet()) {
                 CAst.AstNode disjunction = CAstUtils.takeDisjunction(resetConditions.get(key));
                 System.out.println("!!! Reset conditions: " + resetConditions.get(key));
@@ -968,9 +972,12 @@ protected void generateReactionAxioms() {
                         // Reset presence
                         + "\n&& " + n.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + "i" + ")" + ")"
                         + " == "
-                        + false // default presence
+                        + "false" // default presence
                         + ")"
                     );
+                } else if (key instanceof ActionInstance) {
+                    ActionInstance n = (ActionInstance)key;
+                    code.pr(n.getFullNameWithJoiner("_") + "_scheduled" + "(" + "d" + "(" + "i" + ")" + ")" + " == " + "false");
                 } else {    
                     System.out.println("Unreachable!");
                 }
@@ -1002,6 +1009,11 @@ protected void generateReactionAxioms() {
                     );
                 code.pr("))");
             }
+            for (ActionInstance a : unusedActions) {
+                code.pr("&& (true ==> (");
+                code.pr(a.getFullNameWithJoiner("_") + "_scheduled" + "(" + "d" + "(" + "i" + ")" + ")" + " == " + "false");
+                code.pr("))");
+            }
             code.pr("))));");
         }
     }
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
index 1f6b689acc..097a8e7c41 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
@@ -123,7 +123,7 @@ public String visitLogicalAndNode(LogicalAndNode node) {
 
     @Override
     public String visitLogicalNotNode(LogicalNotNode node) {
-        return "!" + visit(node.child);
+        return "!" + "(" + visit(node.child) + ")";
     }
 
     @Override
@@ -152,18 +152,15 @@ public String visitScheduleActionNode(ScheduleActionNode node) {
         String name = ((VariableNode)node.children.get(0)).name;
         NamedInstance instance = getInstanceByName(name);
         ActionInstance action = (ActionInstance)instance;
-        String delay = visit(node.children.get(1));
+        String additionalDelay = visit(node.children.get(1)); // FIXME: Suppport this.
         String str = "\n(" 
-            + "finite_exists (" + this.qv2 + " : integer) in indices :: (i > START && i <= END) && ("
+            + "(finite_exists (" + this.qv2 + " : integer) in indices :: (i > START && i <= END) && ("
             + "\n    " + action.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv2 + ")" + ")"
-            + "\n    " + "&& " + "tag_same" + "(" + "g(" + this.qv2 + ")" + ", " + "tag_schedule" + "(" + "g" + "(" + this.qv + ")" + ", " + "nsec" + "(" + action.getMinDelay().toNanoSeconds() + ")" + ")" + ")";
-        if (node.children.size() == 3) {
-            String value = visit(node.children.get(2));
-            str += "\n    " + "&& " + action.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv2 + ")" + ")" + " == " + value;
-        } else {
-            str += "\n    " + "&& " + action.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv2 + ")" + ")" + " == " + "0";
-        }
-        str += "\n))";
+            + "\n    " + "&& " + "tag_same" + "(" + "g(" + this.qv2 + ")" + ", " + "tag_schedule" + "(" + "g" + "(" + this.qv + ")" + ", " + action.getMinDelay().toNanoSeconds() + ")" + ")"
+            + "\n    " + "&& " + action.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv2 + ")" + ")" + " == " + "0"
+            + "\n)) // Closes finite_exists"
+            + "\n&& " + action.getFullNameWithJoiner("_") + "_scheduled" + "(" + "d" + "(" + this.qv + ")" + ")"
+            + "\n)";
         return str;
     }
 

From 4d20a641c3022b47f21b20c8fef939edbee5bb15 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 21 Jul 2022 23:34:38 -0700
Subject: [PATCH 0050/1114] Add a (temporary) fix for variable precedence.

---
 .../generator/uclid/UclidGenerator.java       |  5 ++++
 .../org/lflang/generator/uclid/ast/CAst.java  |  1 +
 .../generator/uclid/ast/CToUclidVisitor.java  | 23 ++++++++++++++++++-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 01f048b3ba..5e91531f6c 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -71,6 +71,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.generator.uclid.ast.CBaseAstVisitor;
 import org.lflang.generator.uclid.ast.CToUclidVisitor;
 import org.lflang.generator.uclid.ast.IfNormalFormAstVisitor;
+import org.lflang.generator.uclid.ast.VariablePrecedenceVisitor;
 import org.lflang.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
@@ -883,6 +884,10 @@ protected void generateReactionAxioms() {
             BuildAstParseTreeVisitor buildAstVisitor = new BuildAstParseTreeVisitor();
             CAst.AstNode ast = buildAstVisitor.visitBlockItemList(parseTree);
 
+            // VariablePrecedenceVisitor
+            VariablePrecedenceVisitor precVisitor = new VariablePrecedenceVisitor();
+            precVisitor.visit(ast);
+
             // Traverse and print.
             CBaseAstVisitor baseVisitor = new CBaseAstVisitor<>(); // For pretty printing.
             System.out.println("***** Printing the original AST.");
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CAst.java b/org.lflang/src/org/lflang/generator/uclid/ast/CAst.java
index 95c0927311..56526901e3 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/CAst.java
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/CAst.java
@@ -296,6 +296,7 @@ public static class ScheduleActionNode extends AstNodeDynamic implements Visitab
      */
     public static class StateVarNode extends AstNode implements Visitable {
         public String name;
+        public boolean prev = false; // By default, this is not a previous state.
         public StateVarNode(String name) {
             this.name = name;
         }
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
index 097a8e7c41..efd8526167 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
@@ -52,6 +52,13 @@ public CToUclidVisitor(UclidGenerator generator, ReactionInstance.Runtime reacti
         instances.addAll(this.reactor.states);
     }
 
+    @Override
+    public String visitAdditionNode(AdditionNode node) {
+        String lhs = visit(node.left);
+        String rhs = visit(node.right);
+        return "(" + lhs + " + " + rhs + ")";
+    }
+
     @Override
     public String visitAssignmentNode(AssignmentNode node) {
         String lhs = visit(node.left);
@@ -67,6 +74,13 @@ public String visitAssignmentNode(AssignmentNode node) {
         return "(" + lhs + " == " + rhs + ")";
     }
 
+    @Override
+    public String visitDivisionNode(DivisionNode node) {
+        String lhs = visit(node.left);
+        String rhs = visit(node.right);
+        return "(" + lhs + " / " + rhs + ")";
+    }
+
     @Override
     public String visitEqualNode(EqualNode node) {
         String lhs = visit(node.left);
@@ -184,7 +198,7 @@ public String visitSetPortNode(SetPortNode node) {
     public String visitStateVarNode(StateVarNode node) {
         NamedInstance instance = getInstanceByName(node.name);
         if (instance != null) {
-            return instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
+            return instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + (node.prev ? "-1" : "") + ")" + ")";
         }
         // FIXME: Throw exception
         return "";
@@ -200,6 +214,13 @@ public String visitStatementSequenceNode(StatementSequenceNode node) {
         return axiom;
     }
 
+    @Override
+    public String visitSubtractionNode(SubtractionNode node) {
+        String lhs = visit(node.left);
+        String rhs = visit(node.right);
+        return "(" + lhs + " - " + rhs + ")";
+    }
+
     @Override
     public String visitTriggerIsPresentNode(TriggerIsPresentNode node) {
         // Find the trigger instance by name.

From b64e3f4fc582cd333a8abe48cadab2d567758fde Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 21 Jul 2022 23:35:14 -0700
Subject: [PATCH 0051/1114] Add precedence visitor

---
 .../uclid/ast/VariablePrecedenceVisitor.java  | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 org.lflang/src/org/lflang/generator/uclid/ast/VariablePrecedenceVisitor.java

diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/VariablePrecedenceVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/VariablePrecedenceVisitor.java
new file mode 100644
index 0000000000..749c368655
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/VariablePrecedenceVisitor.java
@@ -0,0 +1,48 @@
+package org.lflang.generator.uclid.ast;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.lflang.generator.uclid.ast.CAst.*;
+
+/**
+ * This visitor marks certain variable node as "previous."
+ */
+public class VariablePrecedenceVisitor extends CBaseAstVisitor<Void> {
+
+    // This is a temporary solution and cannot handle,
+    // e.g., self->s = (self->s + 1) - (2 * 2).
+    @Override
+    public Void visitAssignmentNode(AssignmentNode node) {
+        System.out.println("******* In assignment!!!");
+        if (node.left instanceof StateVarNode) {
+            if (node.right instanceof AstNodeBinary) {
+                AstNodeBinary n = (AstNodeBinary)node.right;
+                if (n.left instanceof StateVarNode) {
+                    ((StateVarNode)n.left).prev = true;
+                }
+                if (n.right instanceof StateVarNode) {
+                    ((StateVarNode)n.right).prev = true;
+                }
+            }
+        } else {
+            System.out.println("Unreachable!"); // FIXME: Throw exception.
+        }
+        return null;
+    }
+
+    @Override
+    public Void visitIfBlockNode(IfBlockNode node) {
+        visit(((IfBodyNode)node.right).left);
+        visit(((IfBodyNode)node.right).right);
+        return null;
+    }
+
+    @Override
+    public Void visitStatementSequenceNode(StatementSequenceNode node) {
+        for (int i = 0; i < node.children.size(); i++) {
+            visit(node.children.get(i));
+        }
+        return null;
+    }
+}

From 5a1a2b37225eee64a224f0befb64a08a78bb2b60 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 22 Jul 2022 16:43:45 -0700
Subject: [PATCH 0052/1114] Update schedule action mechanism and variable
 precedence. Verifier v0.1.

---
 .../src/org/lflang/generator/uclid/UclidGenerator.java      | 6 +++---
 .../src/org/lflang/generator/uclid/ast/CToUclidVisitor.java | 2 +-
 .../generator/uclid/ast/VariablePrecedenceVisitor.java      | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 5e91531f6c..e5962f922f 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -721,8 +721,8 @@ protected void generateTriggersAndReactions() {
                     comment += reaction.getFullNameWithJoiner("_") + ", ";
                     triggerStr += String.join("\n", 
                         "// " + reaction.getFullNameWithJoiner("_"),
-                        // FIXME: Should this be an OR?
-                        "&& (" + action.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
+                        // OR because only any present trigger can trigger the reaction.
+                        "|| (" + action.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
                         "    finite_exists (j : integer) in indices :: j >= START && j < i",
                         "    && rxn(j) == " + reaction.getFullNameWithJoiner("_"),
                         "    && g(i) == tag_schedule(g(j), " + action.getMinDelay().toNanoSeconds() + ")",
@@ -735,7 +735,7 @@ protected void generateTriggersAndReactions() {
                 // print the generated code string.
                 code.pr(String.join("\n", 
                     "// " + comment,
-                    "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> ( true",
+                    "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> ( false",
                     triggerStr,
                     "));"
                 ));
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
index efd8526167..457a8795c8 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
@@ -168,7 +168,7 @@ public String visitScheduleActionNode(ScheduleActionNode node) {
         ActionInstance action = (ActionInstance)instance;
         String additionalDelay = visit(node.children.get(1)); // FIXME: Suppport this.
         String str = "\n(" 
-            + "(finite_exists (" + this.qv2 + " : integer) in indices :: (i > START && i <= END) && ("
+            + "(finite_exists (" + this.qv2 + " : integer) in indices :: (" + this.qv2 + " > " + this.qv + " && " + this.qv2 + " <= END) && ("
             + "\n    " + action.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv2 + ")" + ")"
             + "\n    " + "&& " + "tag_same" + "(" + "g(" + this.qv2 + ")" + ", " + "tag_schedule" + "(" + "g" + "(" + this.qv + ")" + ", " + action.getMinDelay().toNanoSeconds() + ")" + ")"
             + "\n    " + "&& " + action.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv2 + ")" + ")" + " == " + "0"
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/VariablePrecedenceVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/VariablePrecedenceVisitor.java
index 749c368655..9ae7b9447a 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/VariablePrecedenceVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/VariablePrecedenceVisitor.java
@@ -33,8 +33,10 @@ public Void visitAssignmentNode(AssignmentNode node) {
 
     @Override
     public Void visitIfBlockNode(IfBlockNode node) {
-        visit(((IfBodyNode)node.right).left);
-        visit(((IfBodyNode)node.right).right);
+        if (((IfBodyNode)node.right).left != null)
+            visit(((IfBodyNode)node.right).left);
+        if (((IfBodyNode)node.right).right != null)
+            visit(((IfBodyNode)node.right).right);
         return null;
     }
 

From 4bcb0cf8f79f84b8854fbde4686ec0aa1cc09065 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 22 Jul 2022 23:18:52 -0700
Subject: [PATCH 0053/1114] Update benchmarks

---
 org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index e5962f922f..08c344547a 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -1201,7 +1201,7 @@ private void populateLists(ReactorInstance reactor) {
      * Compute a completeness threadhold for each property.
      */
     private int computeCT(Attribute property) {
-        return 5; // FIXME
+        return 10; // FIXME
     }
 
     /////////////////////////////////////////////////

From a4d373ef68a26190143e5b4110fb11ddacae13de Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Tue, 9 Aug 2022 00:03:59 +0200
Subject: [PATCH 0054/1114] Update comments

---
 .../src/org/lflang/generator/uclid/UclidGenerator.java     | 7 -------
 org.lflang/src/org/lflang/validation/AttributeSpec.java    | 4 +++-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 08c344547a..e5263cb079 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -1064,13 +1064,6 @@ protected void generateProperty(Attribute property, int CT) {
         code.pr(transpiled + ";");
         code.unindent();
 
-        // FIXME: No need for this since we are doing 1-induction.
-        // code.pr(String.join("\n", 
-        //     "// Helper macro for temporal induction",
-        //     "define Globally_p(start, end : step_t) : boolean =",
-        //     "    (finite_forall (i : integer) in indices :: (i >= start && i <= end) ==> p(i));"
-        // ));
-
         if (tactic.equals("bmc")) {
             code.pr(String.join("\n", 
                 "// BMC",
diff --git a/org.lflang/src/org/lflang/validation/AttributeSpec.java b/org.lflang/src/org/lflang/validation/AttributeSpec.java
index f64c678248..b1373b8323 100644
--- a/org.lflang/src/org/lflang/validation/AttributeSpec.java
+++ b/org.lflang/src/org/lflang/validation/AttributeSpec.java
@@ -213,7 +213,9 @@ enum AttrParamType {
         // @icon("value")
         ATTRIBUTE_SPECS_BY_NAME.put("icon", new AttributeSpec(
             List.of(new AttrParamSpec(AttributeSpec.VALUE_ATTR, AttrParamType.STRING, null))
-        // @property(name="<property_name>", tactic="<induction|bmc>", spec="<LTLu_spec>")
+        ));
+        // @property(name="<property_name>", tactic="<induction|bmc>", spec="<SMTL_spec>")
+        // SMTL is the safety fragment of Metric Temporal Logic (MTL).
         ATTRIBUTE_SPECS_BY_NAME.put("property", new AttributeSpec(
             List.of(
                 new AttrParamSpec("name", AttrParamType.STRING, null),

From 70511bf735052a3d11edbf37db307e4c3f05384a Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Tue, 9 Aug 2022 00:12:39 +0200
Subject: [PATCH 0055/1114] Add comments

---
 .../lflang/generator/uclid/UclidGenerator.java  | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index e5263cb079..d1bd95c536 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -163,7 +163,6 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         // Create the src-gen directory
         setUpDirectories();
 
-        // FIXME: Identify properties in the attributes.
         // FIXME: Calculate the completeness threshold for each property.
         // Generate a Uclid model for each property.
         for (Attribute prop : this.properties) {
@@ -282,7 +281,7 @@ protected void generateUclidCode(Attribute property, int CT) {
     }
 
     /**
-     * FIXME
+     * Macros for timing semantics
      */
     protected void generateTimingSemantics() {
         code.pr(String.join("\n", 
@@ -350,7 +349,7 @@ protected void generateTimingSemantics() {
     }
 
     /**
-     * FIXME
+     * Macros, type definitions, and variable declarations for trace (path)
      */
     protected void generateTraceDefinition(int CT) {
         // Define various constants.
@@ -460,7 +459,7 @@ protected void generateTraceDefinition(int CT) {
     }
 
     /**
-     * FIXME
+     * Type definitions for runtime reaction Ids and state variables
      */
     protected void generateReactionIdsAndStateVars() {
         // Encode the components and the logical delays
@@ -563,7 +562,7 @@ protected void generateReactionIdsAndStateVars() {
     }
 
     /**
-     * FIXME
+     * Axioms for reactor semantics
      */
     protected void generateReactorSemantics() {
         code.pr(String.join("\n", 
@@ -628,9 +627,8 @@ protected void generateReactorSemantics() {
     }
 
     /**
-     * FIXME
+     * Axioms for the trigger mechanism
      */
-    // Previously called pr_connections_and_actions()
     protected void generateTriggersAndReactions() {
         code.pr(String.join("\n", 
             "/***************",
@@ -741,7 +739,6 @@ protected void generateTriggersAndReactions() {
                 ));
 
                 // If the action is not present, then its value resets to 0.
-                // FIXME: Check if this works in practice.
                 code.pr(String.join("\n", 
                     "// If " + action.getFullNameWithJoiner("_") + "  is not present, then its value resets to 0.",
                     "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END && rxn(i) != NULL) ==> (",
@@ -831,7 +828,7 @@ protected void generateTriggersAndReactions() {
     }
 
     /**
-     * FIXME
+     * Macros for initial conditions
      */
     protected void generateInitialConditions() {
         code.pr(String.join("\n", 
@@ -1080,7 +1077,7 @@ protected void generateProperty(Attribute property, int CT) {
     }
 
     /**
-     * FIXME
+     * Uclid5 control block
      */
     protected void generateControlBlock() {
         code.pr(String.join("\n", 

From 07a8c8ddccd5824ce777ec2c36a56045fc43c605 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Tue, 9 Aug 2022 10:56:43 -0700
Subject: [PATCH 0056/1114] Minor update

---
 .../generator/uclid/UclidGenerator.java       | 89 +++++++++----------
 1 file changed, 43 insertions(+), 46 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index d1bd95c536..a7b890e3d5 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -130,6 +130,11 @@ public class UclidGenerator extends GeneratorBase {
     /** The main place to put generated code. */
     protected CodeBuilder code  = new CodeBuilder();
 
+    /** Strings from the property attribute */
+    protected String name;
+    protected String tactic;
+    protected String spec;
+
     // Constructor
     public UclidGenerator(FileConfig fileConfig, ErrorReporter errorReporter, List<Attribute> properties) {
         super(fileConfig, errorReporter);
@@ -147,6 +152,8 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         super.cleanIfNeeded(context);
         super.printInfo(context.getMode());
         ASTUtils.setMainName(fileConfig.resource, fileConfig.name);
+        // FIXME: Perform an analysis on the property and remove unrelevant components.
+        // FIXME: Support multiple properties here too. We might need to have a UclidGenerator for each attribute.
         super.createMainInstantiation();
         ////////////////////////////////////////
         
@@ -166,8 +173,26 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         // FIXME: Calculate the completeness threshold for each property.
         // Generate a Uclid model for each property.
         for (Attribute prop : this.properties) {
-            int CT = computeCT(prop);
-            generateUclidFile(prop, CT);
+            this.name = prop.getAttrParms().stream()
+                        .filter(attr -> attr.getName().equals("name"))
+                        .findFirst()
+                        .get()
+                        .getValue()
+                        .getStr();
+            this.tactic = prop.getAttrParms().stream()
+                        .filter(attr -> attr.getName().equals("tactic"))
+                        .findFirst()
+                        .get()
+                        .getValue()
+                        .getStr();
+            this.spec = prop.getAttrParms().stream()
+                        .filter(attr -> attr.getName().equals("spec"))
+                        .findFirst()
+                        .get()
+                        .getValue()
+                        .getStr();
+            int CT = computeCT();
+            generateUclidFile(CT);
         }
 
         // Generate runner script
@@ -180,25 +205,13 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     /**
      * Generate the Uclid model.
      */
-    protected void generateUclidFile(Attribute property, int CT) {
-        String name = property.getAttrParms().stream()
-                        .filter(attr -> attr.getName().equals("name"))
-                        .findFirst()
-                        .get()
-                        .getValue()
-                        .getStr();
-        String tactic = property.getAttrParms().stream()
-                        .filter(attr -> attr.getName().equals("tactic"))
-                        .findFirst()
-                        .get()
-                        .getValue()
-                        .getStr();
+    protected void generateUclidFile(int CT) {
         try {  
             // Generate main.ucl and print to file
             code = new CodeBuilder();
             String filename = this.outputDir
-                            .resolve(tactic + "_" + name + ".ucl").toString();
-            generateUclidCode(property, CT);
+                            .resolve(this.tactic + "_" + this.name + ".ucl").toString();
+            generateUclidCode(CT);
             code.writeToFile(filename);
         } catch (IOException e) {
             Exceptions.sneakyThrow(e);
@@ -239,7 +252,7 @@ protected void generateRunnerScript() {
     /**
      * The main function that generates Uclid code.
      */
-    protected void generateUclidCode(Attribute property, int CT) {
+    protected void generateUclidCode(int CT) {
         code.pr(String.join("\n", 
             "/*******************************",
             " * Auto-generated UCLID5 model *",
@@ -271,7 +284,7 @@ protected void generateUclidCode(Attribute property, int CT) {
         generateReactionAxioms();
 
         // Properties
-        generateProperty(property, CT);
+        generateProperty(CT);
 
         // Control block
         generateControlBlock();
@@ -1020,58 +1033,40 @@ protected void generateReactionAxioms() {
         }
     }
 
-    protected void generateProperty(Attribute property, int CT) {
+    protected void generateProperty(int CT) {
         code.pr(String.join("\n", 
             "/************",
             " * Property *",
             " ************/"
         ));
 
-        String name = property.getAttrParms().stream()
-                        .filter(attr -> attr.getName().equals("name"))
-                        .findFirst()
-                        .get()
-                        .getValue()
-                        .getStr();
-        String tactic = property.getAttrParms().stream()
-                        .filter(attr -> attr.getName().equals("tactic"))
-                        .findFirst()
-                        .get()
-                        .getValue()
-                        .getStr();
-        String spec = property.getAttrParms().stream()
-                        .filter(attr -> attr.getName().equals("spec"))
-                        .findFirst()
-                        .get()
-                        .getValue()
-                        .getStr();
-        MTLLexer lexer = new MTLLexer(CharStreams.fromString(spec));
+        MTLLexer lexer = new MTLLexer(CharStreams.fromString(this.spec));
         CommonTokenStream tokens = new CommonTokenStream(lexer);
         MTLParser parser = new MTLParser(tokens);
         MtlContext mtlCtx = parser.mtl();
-        MTLVisitor visitor = new MTLVisitor(tactic);
+        MTLVisitor visitor = new MTLVisitor(this.tactic);
 
         // The visitor transpiles the MTL into a Uclid axiom.
         String transpiled = visitor.visitMtl(mtlCtx, "i", 0, "0", 0);
         
         code.pr("// The FOL property translated from user-defined MTL property:");
-        code.pr("// " + spec);
+        code.pr("// " + this.spec);
         code.pr("define p(i : step_t) : boolean =");
         code.indent();
         code.pr(transpiled + ";");
         code.unindent();
 
-        if (tactic.equals("bmc")) {
+        if (this.tactic.equals("bmc")) {
             code.pr(String.join("\n", 
                 "// BMC",
-                "property " + "bmc_" + name + " : " + "initial_condition() ==> p(0);"
+                "property " + "bmc_" + this.name + " : " + "initial_condition() ==> p(0);"
             ));
         } else {
             code.pr(String.join("\n", 
                 "// Induction: initiation step",
-                "property " + "initiation_" + name + " : " + "initial_condition() ==> p(0);",
+                "property " + "initiation_" + this.name + " : " + "initial_condition() ==> p(0);",
                 "// Induction: consecution step",
-                "property " + "consecution_" + name + " : " + "p(0) ==> p(1);"
+                "property " + "consecution_" + this.name + " : " + "p(0) ==> p(1);"
             ));
         }
     }
@@ -1190,7 +1185,9 @@ private void populateLists(ReactorInstance reactor) {
     /**
      * Compute a completeness threadhold for each property.
      */
-    private int computeCT(Attribute property) {
+    private int computeCT() {
+        // if (this.spec.equals("bmc")) {
+        // }
         return 10; // FIXME
     }
 

From f53d45d7cd870426bca77c4a6c9c147fbec2f769 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 21 Nov 2022 20:55:01 -0800
Subject: [PATCH 0057/1114] Generate verification models in a "model-gen"
 directory.

---
 org.lflang/src/org/lflang/FileConfig.java     | 37 ++++++++++
 .../org/lflang/generator/GeneratorBase.java   | 16 -----
 .../src/org/lflang/generator/LFGenerator.java | 17 +++++
 .../generator/uclid/UclidGenerator.java       | 69 ++++++++++---------
 4 files changed, 89 insertions(+), 50 deletions(-)

diff --git a/org.lflang/src/org/lflang/FileConfig.java b/org.lflang/src/org/lflang/FileConfig.java
index dd31182c07..08c877e065 100644
--- a/org.lflang/src/org/lflang/FileConfig.java
+++ b/org.lflang/src/org/lflang/FileConfig.java
@@ -37,6 +37,11 @@ public class FileConfig {
      */
     public static final String DEFAULT_SRC_GEN_DIR = "src-gen";
 
+    /**
+     * Default name of the directory to store generated verification models in.
+     */
+    public static final String DEFAULT_MODEL_GEN_DIR = "model-gen";
+
     // Public fields.
 
     /**
@@ -110,6 +115,16 @@ public class FileConfig {
      */
     protected Path srcGenPath;
 
+    /**
+     * Path representation of the root directory for generated
+     * verification models.
+     */
+    protected Path modelGenBasePath;
+
+    /**
+     * The directory in which to put the generated verification models.
+     */
+    protected Path modelGenPath;
 
     // private fields
 
@@ -150,6 +165,9 @@ public FileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchica
         Path binRoot = outPath.resolve(DEFAULT_BIN_DIR);
         this.binPath = useHierarchicalBin ? binRoot.resolve(getSubPkgPath(srcPath)) : binRoot;
 
+        this.modelGenBasePath = outPath.resolve(DEFAULT_MODEL_GEN_DIR);
+        this.modelGenPath = modelGenBasePath.resolve(getSubPkgPath(srcPath)).resolve(name);
+
         this.iResource = FileUtil.getIResource(resource);
     }
     
@@ -238,6 +256,24 @@ protected Path getSubPkgPath(Path srcPath) {
         return relSrcPath;
     }
 
+    /**
+     * Path representation of the root directory for generated
+     * verification models.
+     * This is the root, meaning that if the source file is x/y/Z.lf
+     * relative to the package root, then the generated sources will be put in x/y/Z
+     * relative to this URI.
+     */
+    public Path getModelGenBasePath() {
+        return modelGenBasePath;
+    }
+
+    /**
+     * The directory in which to put the generated verification models.
+     */
+    public Path getModelGenPath() {
+        return modelGenPath;
+    }
+
     /**
      * Clean any artifacts produced by the code generator and target compilers.
      * 
@@ -250,6 +286,7 @@ protected Path getSubPkgPath(Path srcPath) {
     public void doClean() throws IOException {
         FileUtil.deleteDirectory(binPath);
         FileUtil.deleteDirectory(srcGenBasePath);
+        FileUtil.deleteDirectory(modelGenBasePath);
     }
 
     private static Path getPkgPath(Resource resource) throws IOException {
diff --git a/org.lflang/src/org/lflang/generator/GeneratorBase.java b/org.lflang/src/org/lflang/generator/GeneratorBase.java
index ec9a6085f4..98e40197c0 100644
--- a/org.lflang/src/org/lflang/generator/GeneratorBase.java
+++ b/org.lflang/src/org/lflang/generator/GeneratorBase.java
@@ -300,8 +300,6 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
             context, GeneratorUtils.findTarget(fileConfig.resource), targetConfig, errorReporter
         );
 
-        cleanIfNeeded(context);
-
         printInfo(context.getMode());
 
         // Clear any IDE markers that may have been created by a previous build.
@@ -376,20 +374,6 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         enableSupportForSerializationIfApplicable(context.getCancelIndicator());
     }
 
-    /**
-     * Check if a clean was requested from the standalone compiler and perform
-     * the clean step.
-     */
-    protected void cleanIfNeeded(LFGeneratorContext context) {
-        if (context.getArgs().containsKey("clean")) {
-            try {
-                fileConfig.doClean();
-            } catch (IOException e) {
-                System.err.println("WARNING: IO Error during clean");
-            }
-        }
-    }
-
     /**
      * Create a new instantiation graph. This is a graph where each node is a Reactor (not a ReactorInstance)
      * and an arc from Reactor A to Reactor B means that B contains an instance of A, constructed with a statement
diff --git a/org.lflang/src/org/lflang/generator/LFGenerator.java b/org.lflang/src/org/lflang/generator/LFGenerator.java
index 1fbcf99552..95e0cedc38 100644
--- a/org.lflang/src/org/lflang/generator/LFGenerator.java
+++ b/org.lflang/src/org/lflang/generator/LFGenerator.java
@@ -167,6 +167,9 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa,
         final ErrorReporter errorReporter = lfContext.constructErrorReporter(fileConfig);
         final GeneratorBase generator = createGenerator(target, fileConfig, errorReporter);
 
+        // If "-c" or "--clean" is specified, delete any existing generated directories.
+        cleanIfNeeded(lfContext, fileConfig);
+
         // Check if @property is used. If so, include UclidGenerator.
         Reactor main = ASTUtils.getMainReactor(resource);
         List<Attribute> properties = AttributeUtils.getAttributes(main)
@@ -191,4 +194,18 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa,
     public boolean errorsOccurred() {
         return generatorErrorsOccurred;
     }
+
+    /**
+     * Check if a clean was requested from the standalone compiler and perform
+     * the clean step.
+     */
+    protected void cleanIfNeeded(LFGeneratorContext context, FileConfig fileConfig) {
+        if (context.getArgs().containsKey("clean")) {
+            try {
+                fileConfig.doClean();
+            } catch (IOException e) {
+                System.err.println("WARNING: IO Error during clean");
+            }
+        }
+    }
 }
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index a7b890e3d5..6903507ab8 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -49,6 +49,19 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.Exceptions;
+
+import org.lflang.ASTUtils;
+import org.lflang.ErrorReporter;
+import org.lflang.FileConfig;
+import org.lflang.Target;
+import org.lflang.TimeUnit;
+import org.lflang.TimeValue;
+import org.lflang.dsl.CLexer;
+import org.lflang.dsl.CParser;
+import org.lflang.dsl.MTLLexer;
+import org.lflang.dsl.MTLParser;
+import org.lflang.dsl.CParser.BlockItemListContext;
+import org.lflang.dsl.MTLParser.MtlContext;
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.GeneratorBase;
@@ -72,18 +85,6 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.generator.uclid.ast.CToUclidVisitor;
 import org.lflang.generator.uclid.ast.IfNormalFormAstVisitor;
 import org.lflang.generator.uclid.ast.VariablePrecedenceVisitor;
-import org.lflang.ASTUtils;
-import org.lflang.ErrorReporter;
-import org.lflang.FileConfig;
-import org.lflang.Target;
-import org.lflang.TimeUnit;
-import org.lflang.TimeValue;
-import org.lflang.dsl.CLexer;
-import org.lflang.dsl.CParser;
-import org.lflang.dsl.MTLLexer;
-import org.lflang.dsl.MTLParser;
-import org.lflang.dsl.CParser.BlockItemListContext;
-import org.lflang.dsl.MTLParser.MtlContext;
 import org.lflang.lf.Action;
 import org.lflang.lf.Attribute;
 import org.lflang.lf.Code;
@@ -92,7 +93,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.lf.Reaction;
 import org.lflang.lf.Time;
 import org.lflang.lf.VarRef;
-import org.w3c.dom.Attr;
+import org.lflang.util.StringUtil;
 
 import static org.lflang.ASTUtils.*;
 
@@ -149,7 +150,6 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         GeneratorUtils.setTargetConfig(
             context, GeneratorUtils.findTarget(fileConfig.resource), targetConfig, errorReporter
         );
-        super.cleanIfNeeded(context);
         super.printInfo(context.getMode());
         ASTUtils.setMainName(fileConfig.resource, fileConfig.name);
         // FIXME: Perform an analysis on the property and remove unrelevant components.
@@ -173,24 +173,25 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         // FIXME: Calculate the completeness threshold for each property.
         // Generate a Uclid model for each property.
         for (Attribute prop : this.properties) {
-            this.name = prop.getAttrParms().stream()
-                        .filter(attr -> attr.getName().equals("name"))
-                        .findFirst()
-                        .get()
-                        .getValue()
-                        .getStr();
-            this.tactic = prop.getAttrParms().stream()
-                        .filter(attr -> attr.getName().equals("tactic"))
-                        .findFirst()
-                        .get()
-                        .getValue()
-                        .getStr();
-            this.spec = prop.getAttrParms().stream()
-                        .filter(attr -> attr.getName().equals("spec"))
-                        .findFirst()
-                        .get()
-                        .getValue()
-                        .getStr();
+            this.name = StringUtil.removeQuotes(
+                            prop.getAttrParms().stream()
+                            .filter(attr -> attr.getName().equals("name"))
+                            .findFirst()
+                            .get()
+                            .getValue());
+            this.tactic = StringUtil.removeQuotes(
+                            prop.getAttrParms().stream()
+                            .filter(attr -> attr.getName().equals("tactic"))
+                            .findFirst()
+                            .get()
+                            .getValue());
+            this.spec = StringUtil.removeQuotes(
+                            prop.getAttrParms().stream()
+                            .filter(attr -> attr.getName().equals("spec"))
+                            .findFirst()
+                            .get()
+                            .getValue());
+
             int CT = computeCT();
             generateUclidFile(CT);
         }
@@ -1123,8 +1124,8 @@ private void createMainReactorInstance() {
 
     private void setUpDirectories() {
         // Make sure the target directory exists.
-        Path srcgenDir = this.fileConfig.getSrcGenPath();
-        this.outputDir = Paths.get(srcgenDir.toString() + File.separator + "model");
+        Path modelGenDir = this.fileConfig.getModelGenPath();
+        this.outputDir = Paths.get(modelGenDir.toString());
         try {
             Files.createDirectories(outputDir);
         } catch (IOException e) {

From 984579757ab2683c2d3dcbe97538b8cc62219d4f Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 21 Nov 2022 21:40:27 -0800
Subject: [PATCH 0058/1114] Use arrays instead of tuples to represent traces

---
 .../generator/uclid/UclidGenerator.java       | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 6903507ab8..73f7c87325 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -236,7 +236,7 @@ protected void generateRunnerScript() {
                 "rm -rf ./smt/ && mkdir -p smt",
                 "",
                 "echo '*** Generating SMT files from UCLID5'",
-                "time uclid --verbosity 3 -g \"smt/output\" $1",
+                "time uclid -g \"smt/output\" $1",
                 "",
                 "echo '*** Append (get-model) to each file'",
                 "ls smt | xargs -I {} bash -c 'echo \"(get-model)\" >> smt/{}'",
@@ -384,9 +384,11 @@ protected void generateTraceDefinition(int CT) {
         // so that we can use finite quantifiers.
         code.pr("group indices : integer = {");
         code.indent();
+        String indices = "";
         for (int i = 0; i < CT; i++) {
-            code.pr(String.valueOf(i) + (i == CT-1? "" : ","));
+            indices += String.valueOf(i) + (i == CT-1? "" : ", ");
         }
+        code.pr(indices);
         code.unindent();
         code.pr("};\n\n");
 
@@ -398,13 +400,8 @@ protected void generateTraceDefinition(int CT) {
             "",
             "// Create a bounded trace with length " + String.valueOf(CT)
         ));
-        code.pr("type trace_t = {");
-        code.indent();
-        for (int i = 0; i < CT; i++) {
-            code.pr("event_t" + (i == CT-1? "" : ","));
-        }
-        code.unindent();
-        code.pr("};\n");
+        code.pr("// Potentially unbounded trace, we bound this later.");
+        code.pr("type trace_t  = [integer]event_t;");
 
         // Declare start time and trace.
         code.pr(String.join("\n", 
@@ -450,11 +447,8 @@ protected void generateTraceDefinition(int CT) {
         }
         code.pr("// Helper macro that returns an element based on index.");
         code.pr("define get(tr : trace_t, i : step_t) : event_t =");
-        for (int i = 0; i < CT; i++) {
-            code.pr("if (i == " + String.valueOf(i) + ") then tr._" + String.valueOf(i+1) + " else (");
-        }
-        code.pr("{ NULL, inf(), { " + initialStates + " }, { " + initialTriggerPresence + " }, {" + initialActionsScheduled + "} }");
-        code.pr(")".repeat(CT) + ";\n");
+        code.pr("if (i >= START || i <= END) then tr[i] else");
+        code.pr("{ NULL, inf(), { " + initialStates + " }, { " + initialTriggerPresence + " }, {" + initialActionsScheduled + "} };");
 
         // Define an event getter from the trace.
         code.pr(String.join("\n", 
@@ -1189,7 +1183,7 @@ private void populateLists(ReactorInstance reactor) {
     private int computeCT() {
         // if (this.spec.equals("bmc")) {
         // }
-        return 10; // FIXME
+        return 30; // FIXME
     }
 
     /////////////////////////////////////////////////

From cb667aa9f8a74c508474d2bd3adda3df9c3cf806 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 30 Nov 2022 18:50:39 -0800
Subject: [PATCH 0059/1114] Start to work on a state space explorer

---
 .../src/org/lflang/generator/LFGenerator.java |   3 +
 .../lflang/generator/ReactionInstance.java    |   5 +-
 .../lflang/generator/uclid/MTLVisitor.java    |  13 +
 .../generator/uclid/UclidGenerator.java       |  96 +++++--
 .../generator/uclid/ast/CBaseAstVisitor.java  |  86 +++---
 org.lflang/src/org/lflang/sim/Event.java      |  37 +++
 .../src/org/lflang/sim/StateSpaceDiagram.java |  49 ++++
 .../org/lflang/sim/StateSpaceExplorer.java    | 271 ++++++++++++++++++
 .../src/org/lflang/sim/StateSpaceNode.java    |  46 +++
 org.lflang/src/org/lflang/sim/Tag.java        |  62 ++++
 10 files changed, 595 insertions(+), 73 deletions(-)
 create mode 100644 org.lflang/src/org/lflang/sim/Event.java
 create mode 100644 org.lflang/src/org/lflang/sim/StateSpaceDiagram.java
 create mode 100644 org.lflang/src/org/lflang/sim/StateSpaceExplorer.java
 create mode 100644 org.lflang/src/org/lflang/sim/StateSpaceNode.java
 create mode 100644 org.lflang/src/org/lflang/sim/Tag.java

diff --git a/org.lflang/src/org/lflang/generator/LFGenerator.java b/org.lflang/src/org/lflang/generator/LFGenerator.java
index 95e0cedc38..cba9f39188 100644
--- a/org.lflang/src/org/lflang/generator/LFGenerator.java
+++ b/org.lflang/src/org/lflang/generator/LFGenerator.java
@@ -171,6 +171,8 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa,
         cleanIfNeeded(lfContext, fileConfig);
 
         // Check if @property is used. If so, include UclidGenerator.
+        // The verification model needs to be generated before the target code
+        // since code generation changes LF program (desugar connections, etc.).
         Reactor main = ASTUtils.getMainReactor(resource);
         List<Attribute> properties = AttributeUtils.getAttributes(main)
                                     .stream()
@@ -181,6 +183,7 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa,
             uclidGenerator.doGenerate(resource, lfContext);
         }
 
+        // Generate target code from the LF program.
         if (generator != null) {
             generator.doGenerate(resource, lfContext);
             generatorErrorsOccurred = generator.errorsOccurred();
diff --git a/org.lflang/src/org/lflang/generator/ReactionInstance.java b/org.lflang/src/org/lflang/generator/ReactionInstance.java
index 0ee81cd824..ead58438c6 100644
--- a/org.lflang/src/org/lflang/generator/ReactionInstance.java
+++ b/org.lflang/src/org/lflang/generator/ReactionInstance.java
@@ -128,7 +128,10 @@ public ReactionInstance(
                     this.sources.add(timerInstance);
                 }
             } else if (trigger instanceof BuiltinTriggerRef) {
-                this.triggers.add(parent.getOrCreateBuiltinTrigger((BuiltinTriggerRef) trigger));
+                var builtinTriggerInstance
+                    = parent.getOrCreateBuiltinTrigger((BuiltinTriggerRef) trigger);
+                this.triggers.add(builtinTriggerInstance);
+                builtinTriggerInstance.dependentReactions.add(this);
             }
         }
         // Next handle the ports that this reaction reads.
diff --git a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
index 5e38ce18f0..73eaadb452 100644
--- a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
@@ -46,6 +46,9 @@ public class MTLVisitor extends MTLParserBaseVisitor<String> {
     /** Tactic to be used to prove the property. */
     protected String tactic;
 
+    /** Time horizon (in nanoseconds) of the property */
+    protected long horizon = 0;
+
     // Constructor
     public MTLVisitor(String tactic) {
         this.tactic = tactic;
@@ -171,6 +174,7 @@ public String visitUntil(MTLParser.UntilContext ctx,
         long lowerBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
         long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
         long currentHorizon = horizon + upperBoundNanoSec;
+        this.horizon = currentHorizon;
         String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
                                                     upperBoundNanoSec, "j" + QFIdx, prefixIdx);
 
@@ -217,6 +221,7 @@ public String visitGlobally(MTLParser.GloballyContext ctx,
         long lowerBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
         long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
         long currentHorizon = horizon + upperBoundNanoSec;
+        this.horizon = currentHorizon;
         String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
                                                     upperBoundNanoSec, "j" + QFIdx, prefixIdx);        
         return "!(" + "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
@@ -242,6 +247,7 @@ public String visitFinally(MTLParser.FinallyContext ctx,
         long lowerBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
         long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
         long currentHorizon = horizon + upperBoundNanoSec;
+        this.horizon = currentHorizon;
         String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
                                                     upperBoundNanoSec, "j" + QFIdx, prefixIdx);        
         return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
@@ -452,4 +458,11 @@ private String generateTimePredicate(MTLParser.IntervalContext ctx,
 
         return timePredicate;
     }
+
+    /**
+     * Get the time horizon (in nanoseconds) of the property.
+     */
+    public long getHorizon() {
+        return this.horizon;
+    }
 }
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 73f7c87325..3dec037d8f 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -47,7 +47,9 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.xbase.lib.Exceptions;
 
 import org.lflang.ASTUtils;
@@ -78,6 +80,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.generator.TargetTypes;
 import org.lflang.generator.TimerInstance;
 import org.lflang.generator.TriggerInstance;
+import org.lflang.generator.c.CGenerator;
 import org.lflang.generator.uclid.ast.BuildAstParseTreeVisitor;
 import org.lflang.generator.uclid.ast.CAst;
 import org.lflang.generator.uclid.ast.CAstUtils;
@@ -93,6 +96,11 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.lf.Reaction;
 import org.lflang.lf.Time;
 import org.lflang.lf.VarRef;
+import org.lflang.sim.Event;
+import org.lflang.sim.StateSpaceDiagram;
+import org.lflang.sim.StateSpaceExplorer;
+import org.lflang.sim.StateSpaceNode;
+import org.lflang.sim.Tag;
 import org.lflang.util.StringUtil;
 
 import static org.lflang.ASTUtils.*;
@@ -134,7 +142,18 @@ public class UclidGenerator extends GeneratorBase {
     /** Strings from the property attribute */
     protected String name;
     protected String tactic;
-    protected String spec;
+    protected String spec; // SMTL
+
+    /** 
+     * The horizon (the total time interval required for evaluating
+     * an MTL property, which is derived from the MTL spec),
+     * the completeness threshold (CT) (the number of transitions
+     * required for evaluating the FOL spec in the trace),
+     * and the transpiled FOL spec.
+     */
+    protected long horizon = 0; // in nanoseconds
+    protected String FOLSpec = "";
+    protected int CT = 0;
 
     // Constructor
     public UclidGenerator(FileConfig fileConfig, ErrorReporter errorReporter, List<Attribute> properties) {
@@ -155,6 +174,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         // FIXME: Perform an analysis on the property and remove unrelevant components.
         // FIXME: Support multiple properties here too. We might need to have a UclidGenerator for each attribute.
         super.createMainInstantiation();
+        
         ////////////////////////////////////////
         
         System.out.println("*** Start generating Uclid code.");
@@ -170,7 +190,6 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         // Create the src-gen directory
         setUpDirectories();
 
-        // FIXME: Calculate the completeness threshold for each property.
         // Generate a Uclid model for each property.
         for (Attribute prop : this.properties) {
             this.name = StringUtil.removeQuotes(
@@ -192,8 +211,9 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
                             .get()
                             .getValue());
 
-            int CT = computeCT();
-            generateUclidFile(CT);
+            processMTLSpec();
+            computeCT();
+            generateUclidFile();
         }
 
         // Generate runner script
@@ -206,13 +226,13 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     /**
      * Generate the Uclid model.
      */
-    protected void generateUclidFile(int CT) {
+    protected void generateUclidFile() {
         try {  
             // Generate main.ucl and print to file
             code = new CodeBuilder();
             String filename = this.outputDir
                             .resolve(this.tactic + "_" + this.name + ".ucl").toString();
-            generateUclidCode(CT);
+            generateUclidCode();
             code.writeToFile(filename);
         } catch (IOException e) {
             Exceptions.sneakyThrow(e);
@@ -253,7 +273,7 @@ protected void generateRunnerScript() {
     /**
      * The main function that generates Uclid code.
      */
-    protected void generateUclidCode(int CT) {
+    protected void generateUclidCode() {
         code.pr(String.join("\n", 
             "/*******************************",
             " * Auto-generated UCLID5 model *",
@@ -267,7 +287,7 @@ protected void generateUclidCode(int CT) {
         generateTimingSemantics();
 
         // Trace definition
-        generateTraceDefinition(CT);
+        generateTraceDefinition();
 
         // Reaction IDs and state variables
         generateReactionIdsAndStateVars();
@@ -285,7 +305,7 @@ protected void generateUclidCode(int CT) {
         generateReactionAxioms();
 
         // Properties
-        generateProperty(CT);
+        generateProperty();
 
         // Control block
         generateControlBlock();
@@ -365,18 +385,18 @@ protected void generateTimingSemantics() {
     /**
      * Macros, type definitions, and variable declarations for trace (path)
      */
-    protected void generateTraceDefinition(int CT) {
+    protected void generateTraceDefinition() {
         // Define various constants.
         code.pr(String.join("\n", 
             "/********************",
             " * Trace Definition *",
             " *******************/",
             "const START : integer = 0;",
-            "const END : integer = " + String.valueOf(CT-1) + ";",
+            "const END : integer = " + String.valueOf(this.CT-1) + ";",
             "",
             "// trace length = k + CT",
             "const k : integer = 1;    // 1-induction should be enough.",
-            "const CT : integer = " + String.valueOf(CT) + ";" + "// The completeness threshold",
+            "const CT : integer = " + String.valueOf(this.CT) + ";" + "// The completeness threshold",
             "\n"
         ));
 
@@ -385,8 +405,8 @@ protected void generateTraceDefinition(int CT) {
         code.pr("group indices : integer = {");
         code.indent();
         String indices = "";
-        for (int i = 0; i < CT; i++) {
-            indices += String.valueOf(i) + (i == CT-1? "" : ", ");
+        for (int i = 0; i < this.CT; i++) {
+            indices += String.valueOf(i) + (i == this.CT-1? "" : ", ");
         }
         code.pr(indices);
         code.unindent();
@@ -398,7 +418,7 @@ protected void generateTraceDefinition(int CT) {
             "type step_t = integer;",
             "type event_t = { rxn_t, tag_t, state_t, trigger_t, sched_t };",
             "",
-            "// Create a bounded trace with length " + String.valueOf(CT)
+            "// Create a bounded trace with length " + String.valueOf(this.CT)
         ));
         code.pr("// Potentially unbounded trace, we bound this later.");
         code.pr("type trace_t  = [integer]event_t;");
@@ -1028,27 +1048,18 @@ protected void generateReactionAxioms() {
         }
     }
 
-    protected void generateProperty(int CT) {
+    protected void generateProperty() {
         code.pr(String.join("\n", 
             "/************",
             " * Property *",
             " ************/"
         ));
-
-        MTLLexer lexer = new MTLLexer(CharStreams.fromString(this.spec));
-        CommonTokenStream tokens = new CommonTokenStream(lexer);
-        MTLParser parser = new MTLParser(tokens);
-        MtlContext mtlCtx = parser.mtl();
-        MTLVisitor visitor = new MTLVisitor(this.tactic);
-
-        // The visitor transpiles the MTL into a Uclid axiom.
-        String transpiled = visitor.visitMtl(mtlCtx, "i", 0, "0", 0);
         
         code.pr("// The FOL property translated from user-defined MTL property:");
         code.pr("// " + this.spec);
         code.pr("define p(i : step_t) : boolean =");
         code.indent();
-        code.pr(transpiled + ";");
+        code.pr(this.FOLSpec + ";");
         code.unindent();
 
         if (this.tactic.equals("bmc")) {
@@ -1171,6 +1182,7 @@ private void populateLists(ReactorInstance reactor) {
         for (var timer : reactor.timers) {
             this.timerInstances.add(timer);
         }
+
         // Recursion
         for (var child : reactor.children) {
             populateLists(child);
@@ -1178,12 +1190,34 @@ private void populateLists(ReactorInstance reactor) {
     }
 
     /**
-     * Compute a completeness threadhold for each property.
+     * Compute a completeness threadhold for each property
+     * by simulating a worst-case execution by traversing
+     * the reactor instance graph and building a
+     * state space diagram.
+     */
+    private void computeCT() {
+        
+        StateSpaceExplorer explorer = new StateSpaceExplorer(this.main);
+        explorer.explore(new Tag(this.horizon, 0, false), false);
+        StateSpaceDiagram diagram = explorer.diagram;
+        diagram.display();  
+
+        this.CT = 10;
+    }
+
+    /**
+     * Process an MTL property.
      */
-    private int computeCT() {
-        // if (this.spec.equals("bmc")) {
-        // }
-        return 30; // FIXME
+    private void processMTLSpec() {
+        MTLLexer lexer = new MTLLexer(CharStreams.fromString(this.spec));
+        CommonTokenStream tokens = new CommonTokenStream(lexer);
+        MTLParser parser = new MTLParser(tokens);
+        MtlContext mtlCtx = parser.mtl();
+        MTLVisitor visitor = new MTLVisitor(this.tactic);
+
+        // The visitor transpiles the MTL into a Uclid axiom.
+        this.FOLSpec = visitor.visitMtl(mtlCtx, "i", 0, "0", 0);
+        this.horizon = visitor.getHorizon();
     }
 
     /////////////////////////////////////////////////
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CBaseAstVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/CBaseAstVisitor.java
index fa55848d70..210bf06537 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/CBaseAstVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/CBaseAstVisitor.java
@@ -13,41 +13,45 @@ public class CBaseAstVisitor<T> extends AbstractAstVisitor<T> implements CAstVis
 	 */
 	@Override
 	public T visitAstNode(CAst.AstNode node) {
-		System.out.print("[visitAstNode] ");
-		System.out.println("Hi, I am " + node);
+		// System.out.print("[visitAstNode] ");
+		// System.out.println("Hi, I am " + node);
 		return null;
 	}
 
 	@Override
 	public T visitAstNodeUnary(CAst.AstNodeUnary node) {
-		System.out.print("[visitAstNodeUnary] ");
-		System.out.println("Hi, I am " + node);
+		// System.out.print("[visitAstNodeUnary] ");
+		// System.out.println("Hi, I am " + node);
 		if (node.child != null) {
 			T result = visit(node.child);
 		} else {
-			System.out.println("*** Child is empty in " + node + "!");
+			// System.out.println("*** Child is empty in " + node + "!");
 		}
 		return null;
 	}
 
 	@Override
 	public T visitAstNodeBinary(CAst.AstNodeBinary node) {
-		System.out.print("[visitAstNodeBinary] ");
-		System.out.println("Hi, I am " + node);
+		// System.out.print("[visitAstNodeBinary] ");
+		// System.out.println("Hi, I am " + node);
 		if (node.left != null) {
 			T leftResult = visit(node.left);
-		} else System.out.println("*** Left child is empty in " + node + "!");
+		} else {
+			// System.out.println("*** Left child is empty in " + node + "!");
+		}
 		if (node.right != null) {
 			T rightResult = visit(node.right);
-		} else System.out.println("*** Right child is empty in " + node + "!");
+		} else {
+			// System.out.println("*** Right child is empty in " + node + "!");
+		}
 		// Aggregate results...
 		return null;
 	}
 
 	@Override
 	public T visitAstNodeDynamic(CAst.AstNodeDynamic node) {
-		System.out.print("[visitAstNodeDynamic] ");
-		System.out.println("Hi, I am " + node);
+		// System.out.print("[visitAstNodeDynamic] ");
+		// System.out.println("Hi, I am " + node);
 		for (CAst.AstNode n : node.children) {
 			T result = visit(n);
 		}
@@ -57,63 +61,63 @@ public T visitAstNodeDynamic(CAst.AstNodeDynamic node) {
     @Override
 	public T visitAssignmentNode(CAst.AssignmentNode node) {
 		// The default implementation reuses visitAstNodeBinary(node).
-		System.out.print("[visitAssignmentNode] ");
+		// System.out.print("[visitAssignmentNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitIfBlockNode(CAst.IfBlockNode node) {
-		System.out.print("[visitIfBlockNode] ");
+		// System.out.print("[visitIfBlockNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitIfBodyNode(CAst.IfBodyNode node) {
-		System.out.print("[visitIfBodyNode] ");
+		// System.out.print("[visitIfBodyNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitLiteralNode(CAst.LiteralNode node) {
-		System.out.print("[visitLiteralNode] ");
-		System.out.println("Hi, I am " + node + " with literal " + node.literal);
+		// System.out.print("[visitLiteralNode] ");
+		// System.out.println("Hi, I am " + node + " with literal " + node.literal);
 		return null;
 	}
 
 	@Override
 	public T visitLogicalNotNode(CAst.LogicalNotNode node) {
-		System.out.print("[visitLogicalNotNode] ");
+		// System.out.print("[visitLogicalNotNode] ");
 		return visitAstNodeUnary(node);
 	}
 
 	@Override
 	public T visitLogicalAndNode(CAst.LogicalAndNode node) {
-		System.out.print("[visitLogicalAndNode] ");
+		// System.out.print("[visitLogicalAndNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitLogicalOrNode(CAst.LogicalOrNode node) {
-		System.out.print("[visitLogicalOrNode] ");
+		// System.out.print("[visitLogicalOrNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitOpaqueNode(CAst.OpaqueNode node) {
-		System.out.print("[visitOpaqueNode] ");
+		// System.out.print("[visitOpaqueNode] ");
 		return visitAstNode(node);
 	}
 
 	@Override
 	public T visitStatementSequenceNode(CAst.StatementSequenceNode node) {
-		System.out.print("[visitStatementSequenceNode] ");
+		// System.out.print("[visitStatementSequenceNode] ");
 		return visitAstNodeDynamic(node);
 	}
 
 	@Override
 	public T visitVariableNode(CAst.VariableNode node) {
-		System.out.print("[visitVariableNode] ");
-		System.out.println("Hi, I am " + node + ": (" + node.type + ", " + node.name + ")");
+		// System.out.print("[visitVariableNode] ");
+		// System.out.println("Hi, I am " + node + ": (" + node.type + ", " + node.name + ")");
 		return null;
 	}
 
@@ -122,28 +126,28 @@ public T visitVariableNode(CAst.VariableNode node) {
 	@Override
 	public T visitAdditionNode(CAst.AdditionNode node) {
 		// The default implementation reuses visitAstNodeBinary(node).
-		System.out.print("[visitAdditionNode] ");
+		// System.out.print("[visitAdditionNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitSubtractionNode(CAst.SubtractionNode node) {
 		// The default implementation reuses visitAstNodeBinary(node).
-		System.out.print("[visitSubtractionNode] ");
+		// System.out.print("[visitSubtractionNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitMultiplicationNode(CAst.MultiplicationNode node) {
 		// The default implementation reuses visitAstNodeBinary(node).
-		System.out.print("[visitMultiplicationNode] ");
+		// System.out.print("[visitMultiplicationNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitDivisionNode(CAst.DivisionNode node) {
 		// The default implementation reuses visitAstNodeBinary(node).
-		System.out.print("[visitDivisionNode] ");
+		// System.out.print("[visitDivisionNode] ");
 		return visitAstNodeBinary(node);
 	}
 
@@ -152,42 +156,42 @@ public T visitDivisionNode(CAst.DivisionNode node) {
 	@Override
 	public T visitEqualNode(CAst.EqualNode node) {
 		// The default implementation reuses visitAstNodeBinary(node).
-		System.out.print("[visitEqualNode] ");
+		// System.out.print("[visitEqualNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitNotEqualNode(CAst.NotEqualNode node) {
 		// The default implementation reuses visitAstNodeBinary(node).
-		System.out.print("[visitNotEqualNode] ");
+		// System.out.print("[visitNotEqualNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitLessThanNode(CAst.LessThanNode node) {
 		// The default implementation reuses visitAstNodeBinary(node).
-		System.out.print("[visitLessThanNode] ");
+		// System.out.print("[visitLessThanNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitLessEqualNode(CAst.LessEqualNode node) {
 		// The default implementation reuses visitAstNodeBinary(node).
-		System.out.print("[visitLessEqualNode] ");
+		// System.out.print("[visitLessEqualNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitGreaterThanNode(CAst.GreaterThanNode node) {
 		// The default implementation reuses visitAstNodeBinary(node).
-		System.out.print("[visitGreaterThanNode] ");
+		// System.out.print("[visitGreaterThanNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitGreaterEqualNode(CAst.GreaterEqualNode node) {
 		// The default implementation reuses visitAstNodeBinary(node).
-		System.out.print("[visitGreaterEqualNode] ");
+		// System.out.print("[visitGreaterEqualNode] ");
 		return visitAstNodeBinary(node);
 	}
 
@@ -195,34 +199,34 @@ public T visitGreaterEqualNode(CAst.GreaterEqualNode node) {
 
 	@Override
 	public T visitSetPortNode(CAst.SetPortNode node) {
-		System.out.print("[visitSetPortNode] ");
+		// System.out.print("[visitSetPortNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitScheduleActionNode(CAst.ScheduleActionNode node) {
-		System.out.print("[visitScheduleActionNode] ");
+		// System.out.print("[visitScheduleActionNode] ");
 		return visitAstNodeDynamic(node);
 	}
 
 	@Override
 	public T visitStateVarNode(CAst.StateVarNode node) {
-		System.out.print("[visitStateVarNode] ");
-		System.out.println("Hi, I am " + node + ": (" + node.name + ")");
+		// System.out.print("[visitStateVarNode] ");
+		// System.out.println("Hi, I am " + node + ": (" + node.name + ")");
 		return null;
 	}
 
 	@Override
 	public T visitTriggerValueNode(CAst.TriggerValueNode node) {
-		System.out.print("[visitTriggerValueNode] ");
-		System.out.println("Hi, I am " + node + ": (" + node.name + ")");
+		// System.out.print("[visitTriggerValueNode] ");
+		// System.out.println("Hi, I am " + node + ": (" + node.name + ")");
 		return null;
 	}
 
 	@Override
 	public T visitTriggerIsPresentNode(CAst.TriggerIsPresentNode node) {
-		System.out.print("[visitTriggerIsPresentNode] ");
-		System.out.println("Hi, I am " + node + ": (" + node.name + ")");
+		// System.out.print("[visitTriggerIsPresentNode] ");
+		// System.out.println("Hi, I am " + node + ": (" + node.name + ")");
 		return null;
 	}
 
diff --git a/org.lflang/src/org/lflang/sim/Event.java b/org.lflang/src/org/lflang/sim/Event.java
new file mode 100644
index 0000000000..6f48d23c24
--- /dev/null
+++ b/org.lflang/src/org/lflang/sim/Event.java
@@ -0,0 +1,37 @@
+/** 
+ * A node in the state space diagram representing a step
+ * in the execution of an LF program.
+ * 
+ * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ */
+package org.lflang.sim;
+
+import org.lflang.generator.TriggerInstance;
+
+public class Event implements Comparable<Event> {
+
+    public TriggerInstance trigger;
+    public Tag tag;
+
+    public Event(TriggerInstance trigger, Tag tag) {
+        this.trigger = trigger;
+        this.tag = tag;
+    }
+    
+    @Override
+    public int compareTo(Event e) {
+        return this.tag.compareTo(e.tag);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o instanceof Event) {
+            Event e = (Event) o;
+            if (this.trigger.equals(e.trigger)
+                && this.tag.equals(e.tag))
+                return true;
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/sim/StateSpaceDiagram.java b/org.lflang/src/org/lflang/sim/StateSpaceDiagram.java
new file mode 100644
index 0000000000..2ca5b4caef
--- /dev/null
+++ b/org.lflang/src/org/lflang/sim/StateSpaceDiagram.java
@@ -0,0 +1,49 @@
+/** 
+ * A directed graph representing the state space of an LF program.
+ * 
+ * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ */
+package org.lflang.sim;
+
+import java.util.Set;
+
+import org.lflang.graph.DirectedGraph;
+
+public class StateSpaceDiagram extends DirectedGraph<StateSpaceNode> {
+
+    /**
+     * The first node of the state space diagram.
+     */
+    public StateSpaceNode head;
+
+    /**
+     * The last node of the state space diagram.
+     */
+    public StateSpaceNode tail;
+
+    /**
+     * The previously encountered node which the tail node
+     * goes back to, i.e. the location where the back loop happens.
+     */
+    public StateSpaceNode loopNode;
+
+    /**
+     * Pretty print the diagram.
+     */
+    public void display() {
+        System.out.println("Pretty printing state space diagram:");
+        StateSpaceNode node = this.head;
+        int count = 0;
+        while (node != null) {
+            System.out.print("State " + count++ + ": ");
+            node.display();
+            if (!node.equals(this.tail)) {
+                // Assume a unique next state.
+                Set<StateSpaceNode> downstream = this.getDownstreamAdjacentNodes(node);
+                if (downstream == null || downstream.size() == 0) break;
+                node = (StateSpaceNode)downstream.toArray()[0];
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/sim/StateSpaceExplorer.java b/org.lflang/src/org/lflang/sim/StateSpaceExplorer.java
new file mode 100644
index 0000000000..59a4026d39
--- /dev/null
+++ b/org.lflang/src/org/lflang/sim/StateSpaceExplorer.java
@@ -0,0 +1,271 @@
+/**
+ * Explores the state space of an LF program.
+ */
+package org.lflang.sim;
+
+import java.util.ArrayList;
+import java.util.PriorityQueue;
+import java.util.Set;
+
+import org.lflang.TimeUnit;
+import org.lflang.TimeValue;
+
+import org.lflang.generator.ActionInstance;
+import org.lflang.generator.PortInstance;
+import org.lflang.generator.ReactionInstance;
+import org.lflang.generator.ReactorInstance;
+import org.lflang.generator.RuntimeRange;
+import org.lflang.generator.SendRange;
+import org.lflang.generator.TimerInstance;
+import org.lflang.generator.TriggerInstance;
+
+import org.lflang.lf.Expression;
+import org.lflang.lf.Time;
+import org.lflang.lf.Variable;
+
+public class StateSpaceExplorer {
+
+    // Instantiate an empty state space diagram.
+    public StateSpaceDiagram diagram = new StateSpaceDiagram();
+
+    // Indicate whether a back loop is found in the state space.
+    // A back loop suggests periodic behavior.
+    public boolean loopFound = false;
+
+    /**
+     * Instantiate a global event queue.
+     * We will use this event queue to symbolically simulate
+     * the logical timeline. This simulation is also valid
+     * for runtime implementations that are federated or relax
+     * global barrier synchronization, since an LF program
+     * defines a unique logical timeline (assuming all reactions
+     * behave _consistently_ throughout the execution).
+     */
+    public PriorityQueue<Event> eventQ = new PriorityQueue<Event>();
+
+    /**
+     * The main reactor instance based on which the state space
+     * is explored.
+     */
+    public ReactorInstance main;
+
+    // Constructor
+    public StateSpaceExplorer(ReactorInstance main) {
+        this.main = main;
+    }
+
+    /**
+     * Recursively add the first events to the event queue.
+     */
+    public void addInitialEvents(ReactorInstance reactor) {
+        // Add the startup trigger, if exists.
+        var startup = reactor.getStartupTrigger();
+        if (startup != null) {
+            eventQ.add(new Event(startup, new Tag(0, 0, false)));
+        }
+
+        // Add the initial timer firings, if exist.
+        for (TimerInstance timer : reactor.timers) {
+            eventQ.add(
+                new Event(
+                    timer,
+                    new Tag(timer.getOffset().toNanoSeconds(), 0, false)
+                )
+            );
+        }
+
+        // Recursion
+        for (var child : reactor.children) {
+            addInitialEvents(child);
+        }
+    } 
+
+    /**
+     * Explore the state space and populate the state space diagram
+     * until the specified horizon (i.e. the end tag) is reached
+     * OR until the event queue is empty.
+     * 
+     * As an optimization, if findLoop is true, the algorithm
+     * tries to find a loop in the state space during exploration.
+     * If a loop is found (i.e. a previously encountered state
+     * is reached again) during exploration, the function returns early.
+     * 
+     * TODOs:
+     * 1. Handle action with 0 min delay.
+     * 2. Check if zero-delay connection works.
+     */
+    public void explore(Tag horizon, boolean findLoop) {
+        // Traverse the main reactor instance recursively to find
+        // the known initial events (startup and timers' first firings).
+        // FIXME: It seems that we need to handle shutdown triggers 
+        // separately, because they could break the back loop.
+        addInitialEvents(this.main);
+        System.out.println(this.eventQ);
+        
+        Tag             previous_tag = null; // Tag in the previous loop ITERATION
+        Tag             current_tag  = null;  // Tag in the current  loop ITERATION
+        StateSpaceNode  current_node = null;
+        boolean         stop         = true;
+        if (this.eventQ.size() > 0) {
+            stop = false;
+            current_tag = (eventQ.peek()).tag;
+            // System.out.println(current_tag);
+        }
+
+        // A list of reactions invoked at the current logical tag
+        ArrayList<ReactionInstance> reactions_invoked;
+        // A temporary list of reactions processed in the current LOOP ITERATION
+        ArrayList<ReactionInstance> reactions_temp;
+
+        while (!stop) {
+            // Pop the events from the earliest tag off the event queue.
+            ArrayList<Event> current_events = new ArrayList<Event>();
+            // FIXME: Use stream methods here?
+            while (eventQ.size() > 0 && eventQ.peek().tag.compareTo(current_tag) == 0) {
+                Event e = eventQ.poll();
+                current_events.add(e);
+                // System.out.println("Adding event to current_events: " + e);
+            }
+            System.out.println(current_events);
+
+            // Collect all the reactions invoked in this current LOOP ITERATION.
+            reactions_temp = new ArrayList<ReactionInstance>();
+            for (Event e : current_events) {
+                Set<ReactionInstance> dependent_reactions
+                    = e.trigger.getDependentReactions();
+                // System.out.println("Dependent reactions:");
+                // for (ReactionInstance reaction : dependent_reactions)
+                //     System.out.println(reaction);
+                // System.out.println(dependent_reactions);
+                reactions_temp.addAll(dependent_reactions);
+            }
+
+            // For each reaction invoked, compute the new events produced.
+            for (ReactionInstance reaction : reactions_temp) {
+                // Iterate over all the effects produced by this reaction.
+                // If the effect is a port, obtain the downstream port along
+                // a connection and enqueue a future event for that port.
+                // If the effect is an action, enqueue a future event for
+                // this action.
+                for (TriggerInstance<? extends Variable> effect : reaction.effects) {
+                    if (effect instanceof PortInstance) {
+
+                        // System.out.println("Effect: " + effect);
+                        // System.out.print("Eventual destinations: ");
+                        // System.out.println(((PortInstance)effect).getDependentPorts());
+                        
+                        for (SendRange senderRange
+                                : ((PortInstance)effect).getDependentPorts()) {
+
+                            // System.out.print("Sender range: ");
+                            // System.out.println(senderRange.destinations);
+
+                            for (RuntimeRange<PortInstance> destinationRange
+                                    : senderRange.destinations) {
+                                PortInstance downstreamPort = destinationRange.instance;
+                                // System.out.println("Located a destination port: " + downstreamPort);
+
+                                // Getting delay from connection
+                                // FIXME: Is there a more concise way to do this?
+                                long delay = 0;
+                                Expression delayExpr = senderRange.connection.getDelay();
+                                if (delayExpr instanceof Time) {
+                                    long interval = ((Time) delayExpr).getInterval();
+                                    String unit = ((Time) delayExpr).getUnit();
+                                    TimeValue timeValue = new TimeValue(interval, TimeUnit.fromName(unit));
+                                    delay = timeValue.toNanoSeconds();
+                                }
+
+                                // Create and enqueue a new event.
+                                Event e = new Event(
+                                    downstreamPort,
+                                    new Tag(current_tag.timestamp + delay, 0, false)
+                                );
+                                eventQ.add(e);
+                            }
+                        }
+                    }
+                    else if (effect instanceof ActionInstance) {
+                        // Get the minimum delay of this action.
+                        long min_delay = ((ActionInstance)effect).getMinDelay().toNanoSeconds();
+                        // Create and enqueue a new event.
+                        Event e = new Event(
+                            effect,
+                            new Tag(current_tag.timestamp + min_delay, 0, false)
+                        );
+                        eventQ.add(e);
+                    }
+                }
+            }
+
+            // When we first advance to a new tag, create a new node in the state space diagram.
+            if (
+                previous_tag == null // The first iteration
+                || current_tag.compareTo(previous_tag) > 0
+            ) {
+                // Copy the reactions in reactions_temp.
+                reactions_invoked = new ArrayList<ReactionInstance>(reactions_temp);
+
+                // Create a new state in the SSD for the current tag,
+                // add the reactions triggered to the state,
+                // and add a snapshot of the event queue (with new events
+                // generated by reaction invocations in the curren tag)
+                // to the state.
+                StateSpaceNode node = new StateSpaceNode(
+                    current_tag,                    // Current tag
+                    reactions_invoked,              // Reactions invoked at this tag
+                    new ArrayList<Event>(eventQ)    // A snapshot of the event queue
+                );
+
+                // If findLoop is true, check for loops.
+                if (findLoop && diagram.hasNode(node)) {
+                    loopFound = true;
+                    // Mark the loop in the diagram.
+                    // FIXME: Get the existing (loop) node in the graph by content matching.
+                    // this.diagram.loopNode = ...;
+                    // this.diagram.tail = current_node;
+                    // this.diagram.addEdge(this.diagram.loopNode, this.diagram.tail);
+                    break; // Exit the while loop early.
+                }
+
+                // Add the new node to the state space diagram.
+                this.diagram.addNode(node);
+                System.out.println("Adding a new node to the diagram.");
+                node.display();
+                
+                // If the head is not empty, add an edge from the previous state
+                // to the next state. Otherwise initialize the head to the new node.
+                if (this.diagram.head != null && current_node != null) {
+                    // System.out.println("--- Add a new edge between " + current_node + " and " + node);
+                    this.diagram.addEdge(node, current_node); // Sink first, then source
+                }
+                else
+                    this.diagram.head = node; // Initialize the head.
+                
+                // Update the current node.
+                current_node = node;
+            }
+            // Time does not advance because we are processing
+            // connections with zero delay.
+            else {
+                // Add reactions explored in the current loop iteration
+                // to the existing state space node.
+                current_node.reactions_invoked.addAll(reactions_temp);
+            }
+
+            // Update the current tag for the next iteration.
+            if (eventQ.size() > 0) {
+                previous_tag = current_tag;
+                current_tag = eventQ.peek().tag;
+            }
+
+            // Stop if:
+            // 1. the event queue is empty, or
+            // 2. the horizon is reached.
+            if (eventQ.size() == 0 
+                || current_tag.compareTo(horizon) > 0)
+                stop = true;
+        }
+        return;
+    }
+}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/sim/StateSpaceNode.java b/org.lflang/src/org/lflang/sim/StateSpaceNode.java
new file mode 100644
index 0000000000..68955b3b39
--- /dev/null
+++ b/org.lflang/src/org/lflang/sim/StateSpaceNode.java
@@ -0,0 +1,46 @@
+/** 
+ * A node in the state space diagram representing a step
+ * in the execution of an LF program.
+ * 
+ * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ */
+package org.lflang.sim;
+
+import java.util.ArrayList;
+
+import org.lflang.generator.ReactionInstance;
+
+public class StateSpaceNode {
+
+    public Tag tag;
+    public ArrayList<ReactionInstance> reactions_invoked;
+    public ArrayList<Event> eventQ;
+
+    public StateSpaceNode(
+        Tag tag,
+        ArrayList<ReactionInstance> reactions_invoked,
+        ArrayList<Event> eventQ
+    ) {
+        this.tag = tag;
+        this.reactions_invoked = reactions_invoked;
+        this.eventQ = eventQ;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o instanceof StateSpaceNode) {
+            StateSpaceNode node = (StateSpaceNode) o;
+            if (this.tag.equals(node.tag)
+                && this.reactions_invoked.equals(node.reactions_invoked)
+                && this.eventQ.equals(node.eventQ))
+                return true;
+        }
+        return false;
+    }
+
+    public void display() {
+        System.out.println("(" + tag + ", " + reactions_invoked + ", " + eventQ + ")");
+    }
+    
+}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/sim/Tag.java b/org.lflang/src/org/lflang/sim/Tag.java
new file mode 100644
index 0000000000..648acc9b70
--- /dev/null
+++ b/org.lflang/src/org/lflang/sim/Tag.java
@@ -0,0 +1,62 @@
+/** 
+ * Class representing a logical time tag,
+ * which is a pair that consists of a
+ * timestamp (type long) and a microstep (type long).
+ * 
+ * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ */
+package org.lflang.sim;
+
+public class Tag implements Comparable<Tag> {
+
+    public long timestamp;
+    public long microstep;
+    public boolean forever; // Whether the tag is FOREVER into the future.
+
+    public Tag(long timestamp, long microstep, boolean forever) {
+        this.timestamp = timestamp;
+        this.microstep = microstep;
+        this.forever   = forever;
+    }
+    
+    @Override
+    public int compareTo(Tag t) {
+        // If one tag is forever, and the other is not,
+        // then forever tag is later. If both tags are
+        // forever, then they are equal.
+        if (this.forever && !t.forever) return 1;
+        else if (!this.forever && t.forever) return -1;
+        else if (this.forever && t.forever) return 0;
+
+        // Compare the timestamps if they are not equal.
+        if (this.timestamp != t.timestamp) {
+            if (this.timestamp > t.timestamp) return 1;
+            else if (this.timestamp < t.timestamp) return -1;
+            else return 0;
+        }
+
+        // Otherwise, compare the microsteps.
+        if (this.microstep > t.microstep) return 1;
+        else if (this.microstep < t.microstep) return -1;
+        else return 0;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o instanceof Tag) {
+            Tag t = (Tag) o;
+            if (this.timestamp == t.timestamp
+                && this.microstep == t.microstep
+                && this.forever == t.forever)
+                return true;
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        if (this.forever) return "(FOREVER, " + this.microstep + ")";
+        else return "(" + this.timestamp + ", " + this.microstep + ")";
+    }
+}
\ No newline at end of file

From 80f7c090d7d0754a8607cd9f7cc9c455bacb1629 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 30 Nov 2022 23:17:17 -0800
Subject: [PATCH 0060/1114] Detect back loop in the state space diagram.

---
 .../generator/uclid/UclidGenerator.java       | 31 +++++++++++++-
 org.lflang/src/org/lflang/sim/Event.java      |  9 ++--
 .../src/org/lflang/sim/StateSpaceDiagram.java | 29 +++++++++++--
 .../org/lflang/sim/StateSpaceExplorer.java    | 42 ++++++++++++++-----
 .../src/org/lflang/sim/StateSpaceNode.java    | 14 ++++---
 5 files changed, 102 insertions(+), 23 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 3dec037d8f..d9eb1c23f1 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -1198,11 +1198,38 @@ private void populateLists(ReactorInstance reactor) {
     private void computeCT() {
         
         StateSpaceExplorer explorer = new StateSpaceExplorer(this.main);
-        explorer.explore(new Tag(this.horizon, 0, false), false);
+        explorer.explore(
+            new Tag(this.horizon, 0, false),
+            true // findLoop
+        );
         StateSpaceDiagram diagram = explorer.diagram;
         diagram.display();  
 
-        this.CT = 10;
+        if (!explorer.loopFound) {
+            this.CT = diagram.length;
+            System.out.println("*** A loop is NOT found.");
+            System.out.println("CT: " + this.CT);
+        } 
+        // Over-approximate CT by estimating the number of loop iterations required.
+        else {
+            // Subtract the non-periodic logical time
+            // interval from the total horizon.
+            long horizonRemained =
+                this.horizon - diagram.loopNode.tag.timestamp;
+            
+            // Check how many loop iteration is required
+            // to check the remaining horizon.
+            int loopIterations = (int) Math.ceil(
+                (double) horizonRemained / diagram.loopPeriod);
+            
+            // CT = steps required for the non-periodic part
+            //      + steps required for the periodic part
+            this.CT = (diagram.loopNode.index + 1)
+                + (diagram.tail.index - diagram.loopNode.index + 1) * loopIterations;
+
+            System.out.println("*** A loop is found!");
+            System.out.println("CT: " + this.CT);
+        }
     }
 
     /**
diff --git a/org.lflang/src/org/lflang/sim/Event.java b/org.lflang/src/org/lflang/sim/Event.java
index 6f48d23c24..ff96b4d3c2 100644
--- a/org.lflang/src/org/lflang/sim/Event.java
+++ b/org.lflang/src/org/lflang/sim/Event.java
@@ -23,13 +23,16 @@ public int compareTo(Event e) {
         return this.tag.compareTo(e.tag);
     }
 
+    /**
+     * This equals() method does NOT compare tags,
+     * only compares triggers.
+     */
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
+        if (o == null) return false;
         if (o instanceof Event) {
             Event e = (Event) o;
-            if (this.trigger.equals(e.trigger)
-                && this.tag.equals(e.tag))
+            if (this.trigger.equals(e.trigger))
                 return true;
         }
         return false;
diff --git a/org.lflang/src/org/lflang/sim/StateSpaceDiagram.java b/org.lflang/src/org/lflang/sim/StateSpaceDiagram.java
index 2ca5b4caef..02bc33cf78 100644
--- a/org.lflang/src/org/lflang/sim/StateSpaceDiagram.java
+++ b/org.lflang/src/org/lflang/sim/StateSpaceDiagram.java
@@ -27,15 +27,36 @@ public class StateSpaceDiagram extends DirectedGraph<StateSpaceNode> {
      */
     public StateSpaceNode loopNode;
 
+    /**
+     * The logical time elapsed for each loop iteration.
+     */
+    public long loopPeriod;
+
+    /**
+     * The length of the state space diagram (not counting the loop)
+     */
+    public int length;
+
+    /**
+     * Before adding the node, assign it an index.
+     */
+    @Override
+    public void addNode(StateSpaceNode node) {
+        node.index = this.length;
+        this.length++;
+        super.addNode(node);
+    }
+
     /**
      * Pretty print the diagram.
      */
     public void display() {
-        System.out.println("Pretty printing state space diagram:");
+        System.out.println("*************************************************");
+        System.out.println("* Pretty printing worst-case state space diagram:");
         StateSpaceNode node = this.head;
-        int count = 0;
         while (node != null) {
-            System.out.print("State " + count++ + ": ");
+            System.out.print("* ");
+            System.out.print("State " + node.index + ": ");
             node.display();
             if (!node.equals(this.tail)) {
                 // Assume a unique next state.
@@ -43,7 +64,9 @@ public void display() {
                 if (downstream == null || downstream.size() == 0) break;
                 node = (StateSpaceNode)downstream.toArray()[0];
             }
+            else break;
         }
+        System.out.println("*************************************************");
     }
 
 }
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/sim/StateSpaceExplorer.java b/org.lflang/src/org/lflang/sim/StateSpaceExplorer.java
index 59a4026d39..70a370f535 100644
--- a/org.lflang/src/org/lflang/sim/StateSpaceExplorer.java
+++ b/org.lflang/src/org/lflang/sim/StateSpaceExplorer.java
@@ -128,7 +128,8 @@ public void explore(Tag horizon, boolean findLoop) {
             }
             System.out.println(current_events);
 
-            // Collect all the reactions invoked in this current LOOP ITERATION.
+            // Collect all the reactions invoked in this current LOOP ITERATION
+            // triggered by the earliest events.
             reactions_temp = new ArrayList<ReactionInstance>();
             for (Event e : current_events) {
                 Set<ReactionInstance> dependent_reactions
@@ -138,6 +139,19 @@ public void explore(Tag horizon, boolean findLoop) {
                 //     System.out.println(reaction);
                 // System.out.println(dependent_reactions);
                 reactions_temp.addAll(dependent_reactions);
+
+                // If the event is a timer firing, enqueue the next firing.
+                if (e.trigger instanceof TimerInstance) {
+                    TimerInstance timer = (TimerInstance) e.trigger;
+                    eventQ.add(new Event(
+                        timer,
+                        new Tag(
+                            current_tag.timestamp + timer.getPeriod().toNanoSeconds(),
+                            0, // A time advancement resets microstep to 0.
+                            false
+                        ))
+                    );
+                }
             }
 
             // For each reaction invoked, compute the new events produced.
@@ -218,15 +232,23 @@ else if (effect instanceof ActionInstance) {
                 );
 
                 // If findLoop is true, check for loops.
-                if (findLoop && diagram.hasNode(node)) {
-                    loopFound = true;
-                    // Mark the loop in the diagram.
-                    // FIXME: Get the existing (loop) node in the graph by content matching.
-                    // this.diagram.loopNode = ...;
-                    // this.diagram.tail = current_node;
-                    // this.diagram.addEdge(this.diagram.loopNode, this.diagram.tail);
-                    break; // Exit the while loop early.
-                }
+                // FIXME: For some reason, the below doesn't work.
+                // if (findLoop && diagram.hasNode(node)) {
+                if (findLoop) {
+                    for (StateSpaceNode n : diagram.nodes()) {
+                        if (n.equals(node)) {
+                            loopFound = true;
+                            System.out.println("*** A loop is found!");
+                            // Mark the loop in the diagram.
+                            this.diagram.loopNode = n;
+                            this.diagram.tail = current_node;
+                            this.diagram.loopPeriod = current_tag.timestamp
+                                                        - this.diagram.loopNode.tag.timestamp;
+                            this.diagram.addEdge(this.diagram.loopNode, this.diagram.tail);
+                            return; // Exit the while loop early.
+                        }
+                    }
+                } 
 
                 // Add the new node to the state space diagram.
                 this.diagram.addNode(node);
diff --git a/org.lflang/src/org/lflang/sim/StateSpaceNode.java b/org.lflang/src/org/lflang/sim/StateSpaceNode.java
index 68955b3b39..1bf59f7ed6 100644
--- a/org.lflang/src/org/lflang/sim/StateSpaceNode.java
+++ b/org.lflang/src/org/lflang/sim/StateSpaceNode.java
@@ -12,6 +12,7 @@
 
 public class StateSpaceNode {
 
+    public int index;
     public Tag tag;
     public ArrayList<ReactionInstance> reactions_invoked;
     public ArrayList<Event> eventQ;
@@ -21,18 +22,21 @@ public StateSpaceNode(
         ArrayList<ReactionInstance> reactions_invoked,
         ArrayList<Event> eventQ
     ) {
-        this.tag = tag;
-        this.reactions_invoked = reactions_invoked;
+        this.tag    = tag;
         this.eventQ = eventQ;
+        this.reactions_invoked = reactions_invoked;
     }
 
+    /**
+     * This equals method does NOT compare tags,
+     * only compares reactions_invoked and eventQ.
+     */
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
+        if (o == null) return false;
         if (o instanceof StateSpaceNode) {
             StateSpaceNode node = (StateSpaceNode) o;
-            if (this.tag.equals(node.tag)
-                && this.reactions_invoked.equals(node.reactions_invoked)
+            if (this.reactions_invoked.equals(node.reactions_invoked)
                 && this.eventQ.equals(node.eventQ))
                 return true;
         }

From b69209e50899b45d5211560b3144a0053bef1b74 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 1 Dec 2022 17:43:22 -0800
Subject: [PATCH 0061/1114] Add trace padding to account for partial trace

---
 .../generator/uclid/UclidGenerator.java       | 61 ++++++++++++-------
 .../generator/uclid/ast/CToUclidVisitor.java  |  2 +-
 .../uclid/ast/VariablePrecedenceVisitor.java  |  2 +-
 3 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index d9eb1c23f1..0f98462eb9 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -386,17 +386,36 @@ protected void generateTimingSemantics() {
      * Macros, type definitions, and variable declarations for trace (path)
      */
     protected void generateTraceDefinition() {
+        //// Why do we have a padding at the end of the trace?
+        //
+        // To handle bounded traces for a potentially unbounded execution
+        // (due to, for example, timers or systems forming a loop),
+        // we need to let certain axioms "terminate" the execution and
+        // put any "spilled-over" states in the trace padding.
+        //
+        // For example, an axiom could say "if a reaction is triggered
+        // at step i, it schedules an action that appears 1 sec later
+        // in some future step." Assuming our completeness threshold is 10,
+        // this axiom can block the model (i.e. returns TRIVIALLY true)
+        // at step 10 because there are not any more steps in the bounded trace.
+        // To avoid this, a padding of the size of the number of reactions
+        // is added to the trace. In addition, an antecedent of the form
+        // "i >= START && i <= END" is added to all the axioms. The padding
+        // will store all the spilled-over states in order to prevent
+        // model blocking.
+        int traceEndIndex = this.CT + this.reactionInstances.size();
+
         // Define various constants.
         code.pr(String.join("\n", 
             "/********************",
             " * Trace Definition *",
             " *******************/",
-            "const START : integer = 0;",
-            "const END : integer = " + String.valueOf(this.CT-1) + ";",
-            "",
-            "// trace length = k + CT",
-            "const k : integer = 1;    // 1-induction should be enough.",
-            "const CT : integer = " + String.valueOf(this.CT) + ";" + "// The completeness threshold",
+            "const START : integer = 0; // The start index of the trace.",
+            "const END : integer = " + String.valueOf(this.CT)
+                + "; // The end index of the trace (without padding)",
+            "const END_TRACE : integer = "
+                + String.valueOf(traceEndIndex)
+                + "; // The end index of the trace with padding",
             "\n"
         ));
 
@@ -405,8 +424,8 @@ protected void generateTraceDefinition() {
         code.pr("group indices : integer = {");
         code.indent();
         String indices = "";
-        for (int i = 0; i < this.CT; i++) {
-            indices += String.valueOf(i) + (i == this.CT-1? "" : ", ");
+        for (int i = 0; i <= traceEndIndex; i++) {
+            indices += String.valueOf(i) + (i == traceEndIndex ? "" : ", ");
         }
         code.pr(indices);
         code.unindent();
@@ -467,7 +486,7 @@ protected void generateTraceDefinition() {
         }
         code.pr("// Helper macro that returns an element based on index.");
         code.pr("define get(tr : trace_t, i : step_t) : event_t =");
-        code.pr("if (i >= START || i <= END) then tr[i] else");
+        code.pr("if (i >= START || i <= END_TRACE) then tr[i] else");
         code.pr("{ NULL, inf(), { " + initialStates + " }, { " + initialTriggerPresence + " }, {" + initialActionsScheduled + "} };");
 
         // Define an event getter from the trace.
@@ -602,12 +621,12 @@ protected void generateReactorSemantics() {
             "// based on previous states.",
             "",
             "// Events are ordered by \"happened-before\" relation.",
-            "axiom(finite_forall (i : integer) in indices :: (finite_forall (j : integer) in indices ::",
-            "    hb(elem(i), elem(j)) ==> i < j));",
+            "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (finite_forall (j : integer) in indices ::",
+            "    (j >= START && j <= END) ==> (hb(elem(i), elem(j)) ==> i < j)));",
             "",
             "// the same event can only trigger once in a logical instant",
-            "axiom(finite_forall (i : integer) in indices :: (finite_forall (j : integer) in indices ::",
-            "    ((rxn(i) == rxn(j) && i != j)",
+            "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (finite_forall (j : integer) in indices ::",
+            "    (j >= START && j <= END) ==> ((rxn(i) == rxn(j) && i != j)",
             "        ==> !tag_same(g(i), g(j)))));",
             "",
             "// Tags should be non-negative.",
@@ -915,16 +934,16 @@ protected void generateReactionAxioms() {
 
             // Traverse and print.
             CBaseAstVisitor baseVisitor = new CBaseAstVisitor<>(); // For pretty printing.
-            System.out.println("***** Printing the original AST.");
+            // System.out.println("***** Printing the original AST.");
             baseVisitor.visit(ast);
 
             // Convert the AST to If Normal Form (INF).
             IfNormalFormAstVisitor infVisitor = new IfNormalFormAstVisitor();
-            System.out.println("***** Convert to If Normal Form.");
+            // System.out.println("***** Convert to If Normal Form.");
             infVisitor.visit(ast, new ArrayList<CAst.AstNode>());
             CAst.StatementSequenceNode inf = infVisitor.INF;
-            System.out.println(inf);
-            System.out.println("***** Printing the AST in If Normal Form.");
+            // System.out.println(inf);
+            // System.out.println("***** Printing the AST in If Normal Form.");
             baseVisitor.visit(inf);
 
             // For the variables that are used, extract the conditions
@@ -962,12 +981,12 @@ protected void generateReactionAxioms() {
                     resetConditions.put(instance, new ArrayList<CAst.AstNode>());
                 }
                 resetConditions.get(instance).add(ifBlockNode.left);
-                System.out.println("!!! Added another reset condition: " + ifBlockNode.left);
+                // System.out.println("!!! Added another reset condition: " + ifBlockNode.left);
             }
 
             // Generate Uclid axiom for the C AST.
             CToUclidVisitor c2uVisitor = new CToUclidVisitor(this, reaction);
-            System.out.println("***** Generating axioms from AST.");
+            // System.out.println("***** Generating axioms from AST.");
             String axiom = c2uVisitor.visit(inf);
             code.pr(String.join("\n", 
                 "// Reaction body of " + reaction,
@@ -979,11 +998,11 @@ protected void generateReactionAxioms() {
             ));
             for (NamedInstance key : resetConditions.keySet()) {
                 CAst.AstNode disjunction = CAstUtils.takeDisjunction(resetConditions.get(key));
-                System.out.println("!!! Reset conditions: " + resetConditions.get(key));
+                // System.out.println("!!! Reset conditions: " + resetConditions.get(key));
                 CAst.LogicalNotNode notNode = new CAst.LogicalNotNode();
                 notNode.child = disjunction;
                 String resetCondition = c2uVisitor.visit(notNode);
-                System.out.println("!!! Str: " + resetCondition);
+                // System.out.println("!!! Str: " + resetCondition);
                 code.pr("&& " + "(" + "(" + resetCondition + ")" + " ==> " + "(");
                 if (key instanceof StateVariableInstance) {
                     StateVariableInstance n = (StateVariableInstance)key;
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
index 457a8795c8..b0bb4e9230 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
@@ -168,7 +168,7 @@ public String visitScheduleActionNode(ScheduleActionNode node) {
         ActionInstance action = (ActionInstance)instance;
         String additionalDelay = visit(node.children.get(1)); // FIXME: Suppport this.
         String str = "\n(" 
-            + "(finite_exists (" + this.qv2 + " : integer) in indices :: (" + this.qv2 + " > " + this.qv + " && " + this.qv2 + " <= END) && ("
+            + "(finite_exists (" + this.qv2 + " : integer) in indices :: (" + this.qv2 + " > " + this.qv + " && " + this.qv2 + " <= END_TRACE) && ("
             + "\n    " + action.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv2 + ")" + ")"
             + "\n    " + "&& " + "tag_same" + "(" + "g(" + this.qv2 + ")" + ", " + "tag_schedule" + "(" + "g" + "(" + this.qv + ")" + ", " + action.getMinDelay().toNanoSeconds() + ")" + ")"
             + "\n    " + "&& " + action.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv2 + ")" + ")" + " == " + "0"
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/VariablePrecedenceVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/VariablePrecedenceVisitor.java
index 9ae7b9447a..104a871d78 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/VariablePrecedenceVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/VariablePrecedenceVisitor.java
@@ -14,7 +14,7 @@ public class VariablePrecedenceVisitor extends CBaseAstVisitor<Void> {
     // e.g., self->s = (self->s + 1) - (2 * 2).
     @Override
     public Void visitAssignmentNode(AssignmentNode node) {
-        System.out.println("******* In assignment!!!");
+        // System.out.println("******* In assignment!!!");
         if (node.left instanceof StateVarNode) {
             if (node.right instanceof AstNodeBinary) {
                 AstNodeBinary n = (AstNodeBinary)node.right;

From 5baf0c789ae3c143657a3f7ee86138e2ac82c0c9 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sat, 3 Dec 2022 00:37:00 -0800
Subject: [PATCH 0062/1114] Add UclidRunner that runs uclid models and parses
 CEX traces

---
 build.gradle                                  |   5 +
 .../src/org/lflang/generator/LFGenerator.java |   4 +
 .../org/lflang/generator/uclid/StateInfo.java |  29 +++
 .../generator/uclid/UclidGenerator.java       |  58 +++---
 .../lflang/generator/uclid/UclidRunner.java   | 170 ++++++++++++++++++
 5 files changed, 240 insertions(+), 26 deletions(-)
 create mode 100644 org.lflang/src/org/lflang/generator/uclid/StateInfo.java
 create mode 100644 org.lflang/src/org/lflang/generator/uclid/UclidRunner.java

diff --git a/build.gradle b/build.gradle
index c011eb2c8c..3dda3f15f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -72,6 +72,11 @@ subprojects {
         antlr4 'org.antlr:antlr4:4.7.2'
         implementation 'org.antlr:antlr4-runtime:4.7.2'
     }
+
+    // JSON
+    dependencies {
+        implementation 'org.json:json:20200518'
+    }
 }
 
 // Our CI uses --tests filters, which fails if some
diff --git a/org.lflang/src/org/lflang/generator/LFGenerator.java b/org.lflang/src/org/lflang/generator/LFGenerator.java
index cba9f39188..8be0731a62 100644
--- a/org.lflang/src/org/lflang/generator/LFGenerator.java
+++ b/org.lflang/src/org/lflang/generator/LFGenerator.java
@@ -23,6 +23,7 @@
 import org.lflang.generator.c.CGenerator;
 import org.lflang.generator.python.PythonGenerator;
 import org.lflang.generator.uclid.UclidGenerator;
+import org.lflang.generator.uclid.UclidRunner;
 import org.lflang.lf.Attribute;
 import org.lflang.lf.Reactor;
 import org.lflang.scoping.LFGlobalScopeProvider;
@@ -180,7 +181,10 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa,
                                     .collect(Collectors.toList());
         if (properties.size() > 0) {
             UclidGenerator uclidGenerator = new UclidGenerator(fileConfig, errorReporter, properties);
+            // Generate uclid files.
             uclidGenerator.doGenerate(resource, lfContext);
+            // Invoke the generated uclid files.
+            uclidGenerator.runner.run();
         }
 
         // Generate target code from the LF program.
diff --git a/org.lflang/src/org/lflang/generator/uclid/StateInfo.java b/org.lflang/src/org/lflang/generator/uclid/StateInfo.java
new file mode 100644
index 0000000000..0f2f4f3008
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/uclid/StateInfo.java
@@ -0,0 +1,29 @@
+/** 
+ * A class that represents information in a step
+ * in a counterexample trace
+ * 
+ * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ */
+package org.lflang.generator.uclid;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.lflang.sim.Tag;
+
+public class StateInfo {
+
+    public ArrayList<String>        reactions   = new ArrayList<>();
+    public Tag                      tag;
+    public HashMap<String, String>  variables   = new HashMap<>();
+    public HashMap<String, String>  triggers    = new HashMap<>();
+    public HashMap<String, String>  scheduled   = new HashMap<>();
+
+    public void display() {
+        System.out.println("reactions: " + reactions);
+        System.out.println("tag: " + tag);
+        System.out.println("variables: " + variables);
+        System.out.println("triggers: " + triggers);
+        System.out.println("scheduled: " + scheduled);
+    }
+}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 0f98462eb9..e241374279 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -110,39 +110,45 @@ public class UclidGenerator extends GeneratorBase {
     ////////////////////////////////////////////
     //// Public fields
     // Data structures for storing info about the runtime instances.
-    public List<ReactorInstance>       reactorInstances    = new ArrayList<ReactorInstance>();
+    public List<ReactorInstance>        reactorInstances    = new ArrayList<ReactorInstance>();
     public List<ReactionInstance.Runtime> reactionInstances = new ArrayList<ReactionInstance.Runtime>();
 
     // State variables in the system
-    public List<StateVariableInstance> stateVariables      = new ArrayList<StateVariableInstance>();
+    public List<StateVariableInstance>  stateVariables      = new ArrayList<StateVariableInstance>();
     
     // Triggers in the system
-    public List<ActionInstance>        actionInstances     = new ArrayList<ActionInstance>();
-    public List<PortInstance>          inputInstances      = new ArrayList<PortInstance>();
-    public List<PortInstance>          outputInstances     = new ArrayList<PortInstance>();
-    public List<PortInstance>          portInstances       = new ArrayList<PortInstance>();
-    public List<TimerInstance>         timerInstances      = new ArrayList<TimerInstance>();
+    public List<ActionInstance>         actionInstances     = new ArrayList<ActionInstance>();
+    public List<PortInstance>           inputInstances      = new ArrayList<PortInstance>();
+    public List<PortInstance>           outputInstances     = new ArrayList<PortInstance>();
+    public List<PortInstance>           portInstances       = new ArrayList<PortInstance>();
+    public List<TimerInstance>          timerInstances      = new ArrayList<TimerInstance>();
 
     // Joint lists of the lists above.
-    public List<TriggerInstance>       triggerInstances;   // Triggers = ports + actions + timers
-    public List<NamedInstance>         namedInstances;     // Named instances = triggers + state variables
+    public List<TriggerInstance>        triggerInstances;   // Triggers = ports + actions + timers
+    public List<NamedInstance>          namedInstances;     // Named instances = triggers + state variables
+
+    // A list of paths to the uclid files generated
+    public List<Path>                   generatedFiles      = new ArrayList<Path>();
+
+    // The directory where the generated files are placed
+    public Path                         outputDir;
+
+    // A runner for the generated Uclid files
+    public UclidRunner                  runner;
 
     ////////////////////////////////////////////
     //// Protected fields
 
     // A list of MTL properties represented in Attributes.
-    protected List<Attribute> properties;
-
-    // The directory where the generated files are placed
-    protected Path outputDir;
+    protected List<Attribute>           properties;
 
     /** The main place to put generated code. */
-    protected CodeBuilder code  = new CodeBuilder();
+    protected CodeBuilder               code                = new CodeBuilder();
 
     /** Strings from the property attribute */
-    protected String name;
-    protected String tactic;
-    protected String spec; // SMTL
+    protected String                    name;
+    protected String                    tactic;
+    protected String                    spec; // SMTL
 
     /** 
      * The horizon (the total time interval required for evaluating
@@ -151,14 +157,15 @@ public class UclidGenerator extends GeneratorBase {
      * required for evaluating the FOL spec in the trace),
      * and the transpiled FOL spec.
      */
-    protected long horizon = 0; // in nanoseconds
-    protected String FOLSpec = "";
-    protected int CT = 0;
+    protected long                      horizon             = 0; // in nanoseconds
+    protected String                    FOLSpec             = "";
+    protected int                       CT                  = 0;
 
     // Constructor
     public UclidGenerator(FileConfig fileConfig, ErrorReporter errorReporter, List<Attribute> properties) {
         super(fileConfig, errorReporter);
         this.properties = properties;
+        this.runner = new UclidRunner(this, fileConfig, errorReporter);
     }
 
     ////////////////////////////////////////////////////////////
@@ -184,8 +191,6 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
 
         // Extract information from the named instances.
         populateDataStructures();
-        System.out.println(this.stateVariables);
-        System.out.println(this.triggerInstances);
 
         // Create the src-gen directory
         setUpDirectories();
@@ -217,7 +222,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         }
 
         // Generate runner script
-        generateRunnerScript();
+        // generateRunnerScript();
     }
 
     ////////////////////////////////////////////////////////////
@@ -230,10 +235,11 @@ protected void generateUclidFile() {
         try {  
             // Generate main.ucl and print to file
             code = new CodeBuilder();
-            String filename = this.outputDir
-                            .resolve(this.tactic + "_" + this.name + ".ucl").toString();
+            Path file = this.outputDir.resolve(this.tactic + "_" + this.name + ".ucl");
+            String filename = file.toString();
             generateUclidCode();
             code.writeToFile(filename);
+            this.generatedFiles.add(file);
         } catch (IOException e) {
             Exceptions.sneakyThrow(e);
         }
@@ -1105,7 +1111,7 @@ protected void generateControlBlock() {
             "    v = bmc(0);",
             "    check;",
             "    print_results;",
-            "    v.print_cex;",
+            "    v.print_cex_json;",
             "}"
         ));
     }
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidRunner.java b/org.lflang/src/org/lflang/generator/uclid/UclidRunner.java
new file mode 100644
index 0000000000..995fddea33
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidRunner.java
@@ -0,0 +1,170 @@
+/** 
+ * Runner for Uclid models.
+ * 
+ * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ */
+package org.lflang.generator.uclid;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import org.lflang.ErrorReporter;
+import org.lflang.FileConfig;
+import org.lflang.generator.GeneratorCommandFactory;
+import org.lflang.sim.Tag;
+import org.lflang.util.LFCommand;
+
+public class UclidRunner {
+
+    /**
+     * A list of paths to the generated files
+     */
+    List<Path> filePaths;
+
+    /**
+     * The directory where the generated files are placed
+     */
+    public Path outputDir;
+
+    /**
+     * A factory for compiler commands.
+     */
+    GeneratorCommandFactory commandFactory;
+
+    /**
+     * A UclidGenerator instance
+     */
+    UclidGenerator generator;
+
+    // Constructor
+    public UclidRunner(
+        UclidGenerator generator,
+        FileConfig fileConfig,
+        ErrorReporter errorReporter
+    ) {
+        this.generator = generator;
+        this.commandFactory =
+            new GeneratorCommandFactory(errorReporter, fileConfig);
+    }
+
+    /**
+     * Parse information from an SMT model
+     * for a step in the trace.
+     */
+    public StateInfo parseStateInfo(String smtStr) {
+        StateInfo info = new StateInfo();
+
+        // Reactions
+        Pattern p = Pattern.compile("\\(_tuple_0([^\\)]+)\\(");
+        Matcher m = p.matcher(smtStr);
+        m.find();
+        String[] splited = m.group(1).split("\\s+");
+        info.reactions.addAll(Arrays.asList(splited));
+
+        // Time tag
+        p = Pattern.compile("\\(_tuple_1([^\\)]+)\\)");
+        m = p.matcher(smtStr);
+        m.find();
+        splited = m.group(1).strip().split("\\s+");
+        info.tag = new Tag(
+            Long.parseLong(splited[0]),
+            Long.parseLong(splited[1]), false);
+
+        // Variables
+        p = Pattern.compile("\\(_tuple_2([^\\)]+)\\)");
+        m = p.matcher(smtStr);
+        m.find();
+        splited = m.group(1).strip().split("\\s+");
+        for (int i = 1; i < splited.length; i++) {
+            info.variables.put(generator.namedInstances.get(i).getFullName(), splited[i]);
+        }
+
+        // Triggers
+        p = Pattern.compile("\\(_tuple_3([^\\)]+)\\)");
+        m = p.matcher(smtStr);
+        m.find();
+        splited = m.group(1).strip().split("\\s+");
+        for (int i = 1; i < splited.length; i++) {
+            info.triggers.put(generator.triggerInstances.get(i).getFullName(), splited[i]);
+        }
+
+        return info;
+    }
+
+    /**
+     * Run all the generated Uclid models, report outputs,
+     * and generate counterexample trace diagrams.
+     */
+    public void run() {
+        for (Path path : generator.generatedFiles) {
+            // Execute uclid for each property.
+            LFCommand command = commandFactory.createCommand(
+                "uclid", List.of(
+                    path.toString(),
+                    // Any counterexample will be in <path.toString()>.json
+                    "--json-cex", path.toString()),
+                generator.outputDir);
+            command.run();
+            
+            String output = command.getOutput().toString();
+            boolean failed = output.contains("FAILED");
+            if (failed) {
+                System.out.println("Not valid!");
+                try {
+                    // Read from the JSON counterexample (cex).
+                    String cexJSONStr = Files.readString(
+                        Paths.get(path.toString() + ".json"),
+                        StandardCharsets.UTF_8);
+                    System.out.println(cexJSONStr);
+                    JSONObject cexJSON = new JSONObject(cexJSONStr);
+
+                    //// Extract the counterexample trace from JSON.
+                    // Get the first key "property_*"
+                    Iterator<String> keys = cexJSON.keys();
+                    String firstKey = keys.next();
+                    JSONObject propertyObj = cexJSON.getJSONObject(firstKey);
+
+                    // Get Uclid trace.
+                    JSONArray uclidTrace = propertyObj.getJSONArray("trace");
+                    
+                    // Get the first step of the Uclid trace.
+                    JSONObject uclidTraceStepOne = uclidTrace.getJSONObject(0);
+
+                    // Get the actual trace defined in the verification model.
+                    JSONObject trace = uclidTraceStepOne.getJSONArray("trace").getJSONObject(0);
+
+                    String stepStr = "";
+                    for (int i = 0; i <= generator.CT; i++) {
+                        try {
+                            stepStr = trace.getString(String.valueOf(i));
+                        } catch(JSONException e) {
+                            stepStr = trace.getString("-");
+                        }
+                        System.out.println("============ Step " + i + " ============");
+                        StateInfo info = parseStateInfo(stepStr);
+                        info.display();
+                    }
+                } catch (IOException e) {
+                    System.out.println("ERROR: Not able to read from " + path.toString());
+                }
+            } else {
+                System.out.println("Valid!");
+            }
+        }
+    }
+}
\ No newline at end of file

From 66da9c7ee738c5dbbcbe3c6c583df0c66e73a9bb Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sun, 4 Dec 2022 18:54:51 -0800
Subject: [PATCH 0063/1114] Start to work on the logical time based semantics.

---
 .../lflang/generator/uclid/MTLVisitor.java    |   8 +-
 .../org/lflang/generator/uclid/StateInfo.java |   2 +-
 .../generator/uclid/UclidGenerator.java       | 329 ++++++++++++------
 .../lflang/generator/uclid/UclidRunner.java   |  44 +--
 .../src/org/lflang/sim/StateSpaceDiagram.java |   1 +
 .../org/lflang/sim/StateSpaceExplorer.java    |  76 ++--
 .../src/org/lflang/sim/StateSpaceNode.java    |  12 +-
 7 files changed, 295 insertions(+), 177 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
index 73eaadb452..e10cf6eec6 100644
--- a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
@@ -180,7 +180,7 @@ public String visitUntil(MTLParser.UntilContext ctx,
 
         return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
                 + "j" + QFIdx + " >= " + prefixIdx + " && " + "j" + QFIdx + " <= " + end
-                + " && " + "rxn" + "(" + "j" + QFIdx + ")" + " != " + "NULL"
+                + " && " + "!" + "isNULL" + "(" + "j" + QFIdx + ")"
                 + " && " + "(" + _visitUnaryOp(ctx.right, ("j"+QFIdx), QFIdx+1, prefixIdx, currentHorizon) + ")"
                 + " && " + "(" + "\n" 
                 + "// Time Predicate\n"
@@ -226,7 +226,7 @@ public String visitGlobally(MTLParser.GloballyContext ctx,
                                                     upperBoundNanoSec, "j" + QFIdx, prefixIdx);        
         return "!(" + "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
                 + "j" + QFIdx + " >= " + prefixIdx + " && " + "j" + QFIdx + " <= " + end
-                + " && " + "rxn" + "(" + "j" + QFIdx + ")" + " != " + "NULL"
+                + " && " + "!" + "isNULL" + "(" + "j" + QFIdx + ")"
                 + " && " + "!" + "(" + visitPrimary(ctx.formula, ("j"+QFIdx), QFIdx+1, prefixIdx, currentHorizon) + ")"
                 + " && " + "(" + "\n" 
                 + "// Time Predicate\n"
@@ -252,7 +252,7 @@ public String visitFinally(MTLParser.FinallyContext ctx,
                                                     upperBoundNanoSec, "j" + QFIdx, prefixIdx);        
         return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
                 + "j" + QFIdx + " >= " + prefixIdx + " && " + "j" + QFIdx + " <= " + end
-                + " && " + "rxn" + "(" + "j" + QFIdx + ")" + " != " + "NULL"
+                + " && " + "!" + "isNULL" + "(" + "j" + QFIdx + ")"
                 + " && " + "(" + visitPrimary(ctx.formula, ("j"+QFIdx), QFIdx+1, prefixIdx, currentHorizon) + ")"
                 + " && " + "(" + "\n" 
                 + "// Time Predicate\n"
@@ -269,7 +269,7 @@ else if (ctx.id != null) {
             // Check if the ID is a reaction.
             // FIXME: Not robust.
             if (ctx.id.getText().contains("_reaction_")) {
-                return "rxn(" + prefixIdx + ") == " + ctx.id.getText();
+                return ctx.id.getText() + "(" + "rxn(" + prefixIdx + ")" + ")";
             } else if (ctx.id.getText().contains("_is_present")) { 
                 return ctx.id.getText() + "(" + "t(" + prefixIdx + ")" + ")";
             } else {
diff --git a/org.lflang/src/org/lflang/generator/uclid/StateInfo.java b/org.lflang/src/org/lflang/generator/uclid/StateInfo.java
index 0f2f4f3008..c01841ea14 100644
--- a/org.lflang/src/org/lflang/generator/uclid/StateInfo.java
+++ b/org.lflang/src/org/lflang/generator/uclid/StateInfo.java
@@ -24,6 +24,6 @@ public void display() {
         System.out.println("tag: " + tag);
         System.out.println("variables: " + variables);
         System.out.println("triggers: " + triggers);
-        System.out.println("scheduled: " + scheduled);
+        // System.out.println("scheduled: " + scheduled);
     }
 }
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index e241374279..9915cb1cf9 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -136,6 +136,11 @@ public class UclidGenerator extends GeneratorBase {
     // A runner for the generated Uclid files
     public UclidRunner                  runner;
 
+    // If true, use logical time-based semantics;
+    // otherwise, use event-based semantics,
+    // as described in Sirjani et. al (2020).
+    public boolean                      logicalTimeBased    = false;
+
     ////////////////////////////////////////////
     //// Protected fields
 
@@ -464,8 +469,16 @@ protected void generateTraceDefinition() {
             " ****************/"
         ));
 
-        // Define a tuple getter.
-        // FIXME: Support this feature in Uclid.
+        // Define a getter for uclid arrays.
+        String initialReactions = "";
+        if (this.reactionInstances.size() > 0) {
+            initialReactions = "false, ".repeat(this.reactionInstances.size());
+            initialReactions = initialReactions.substring(0, initialReactions.length()-2);
+        } else {
+            // Initialize a dummy variable just to make the code compile.
+            initialReactions = "false";
+        }
+        initialReactions = "{" + initialReactions + "}";
         String initialStates = "";
         if (this.namedInstances.size() > 0) {
             initialStates = "0, ".repeat(this.namedInstances.size());
@@ -493,7 +506,8 @@ protected void generateTraceDefinition() {
         code.pr("// Helper macro that returns an element based on index.");
         code.pr("define get(tr : trace_t, i : step_t) : event_t =");
         code.pr("if (i >= START || i <= END_TRACE) then tr[i] else");
-        code.pr("{ NULL, inf(), { " + initialStates + " }, { " + initialTriggerPresence + " }, {" + initialActionsScheduled + "} };");
+        code.pr("{ " + initialReactions + ", inf(), { " + initialStates + " }, { " + initialTriggerPresence
+            + " }, {" + initialActionsScheduled + "} };");
 
         // Define an event getter from the trace.
         code.pr(String.join("\n", 
@@ -506,8 +520,7 @@ protected void generateTraceDefinition() {
             "define s        (i : step_t) : state_t      = elem(i)._3;",
             "define t        (i : step_t) : trigger_t    = elem(i)._4;",
             "define d        (i : step_t) : sched_t      = elem(i)._5;",
-            "define isNULL   (i : step_t) : boolean      = rxn(i) == NULL;",
-            ""
+            "define isNULL   (i : step_t) : boolean      = rxn(i) == " + initialReactions + ";"
         ));
     }
 
@@ -528,18 +541,26 @@ protected void generateReactionIdsAndStateVars() {
 
         // Enumerate over all reactions.
         code.pr(String.join("\n",
-            "// Reaction ids",
-            "type rxn_t = enum {"
+            "// Reactions",
+            "type rxn_t = {"
         ));
         code.indent();
-        for (var rxn : this.reactionInstances) {
+        for (var i = 0 ; i < this.reactionInstances.size(); i++) {
             // Print a list of reaction IDs.
             // Add a comma if not last.
-            code.pr(rxn.getReaction().getFullNameWithJoiner("_") + ",");
+            code.pr("boolean" + ((i == this.reactionInstances.size() - 1) ? "" : ",")
+                + "\t// " + this.reactionInstances.get(i));
         }
-        code.pr("NULL");
         code.unindent();
-        code.pr("};\n\n");
+        code.pr("};\n");
+
+        // Generate projection macros.
+        code.pr("// Reaction projection macros");
+        for (var i = 0 ; i < this.reactionInstances.size(); i++) {
+            code.pr("define " + this.reactionInstances.get(i).getReaction().getFullNameWithJoiner("_")
+                + "(n : rxn_t) : boolean = n._" + (i+1) + ";");
+        }
+        code.pr("\n"); // Newline
 
         // State variables and triggers
         // FIXME: expand to data types other than integer
@@ -548,7 +569,8 @@ protected void generateReactionIdsAndStateVars() {
         code.indent();
         if (this.namedInstances.size() > 0) {
             for (var i = 0 ; i < this.namedInstances.size(); i++) {
-                code.pr("integer" + ((i == this.namedInstances.size() - 1) ? "" : ",") + "\t// " + this.namedInstances.get(i));
+                code.pr("integer" + ((i == this.namedInstances.size() - 1) ? "" : ",")
+                    + "\t// " + this.namedInstances.get(i));
             }
         } else {
             code.pr(String.join("\n", 
@@ -561,7 +583,8 @@ protected void generateReactionIdsAndStateVars() {
         code.pr("};");
         code.pr("// State variable projection macros");
         for (var i = 0; i < this.namedInstances.size(); i++) {
-            code.pr("define " + this.namedInstances.get(i).getFullNameWithJoiner("_") + "(s : state_t) : integer = s._" + (i+1) + ";");
+            code.pr("define " + this.namedInstances.get(i).getFullNameWithJoiner("_")
+                + "(s : state_t) : integer = s._" + (i+1) + ";");
         }
         code.pr("\n"); // Newline
 
@@ -571,7 +594,8 @@ protected void generateReactionIdsAndStateVars() {
         code.indent();
         if (this.triggerInstances.size() > 0) {
             for (var i = 0 ; i < this.triggerInstances.size(); i++) {
-                code.pr("boolean" + ((i == this.triggerInstances.size() - 1) ? "" : ",") + "\t// " + this.triggerInstances.get(i));
+                code.pr("boolean" + ((i == this.triggerInstances.size() - 1) ? "" : ",")
+                    + "\t// " + this.triggerInstances.get(i));
             }
         } else {
             code.pr(String.join("\n", 
@@ -584,7 +608,8 @@ protected void generateReactionIdsAndStateVars() {
         code.pr("};");
         code.pr("// Trigger presence projection macros");
         for (var i = 0; i < this.triggerInstances.size(); i++) {
-            code.pr("define " + this.triggerInstances.get(i).getFullNameWithJoiner("_") + "_is_present" + "(t : trigger_t) : boolean = t._" + (i+1) + ";");
+            code.pr("define " + this.triggerInstances.get(i).getFullNameWithJoiner("_")
+                + "_is_present" + "(t : trigger_t) : boolean = t._" + (i+1) + ";");
         }
 
         // A boolean tuple indicating whether actions are scheduled by reactions
@@ -597,7 +622,8 @@ protected void generateReactionIdsAndStateVars() {
         code.indent();
         if (this.actionInstances.size() > 0) {
             for (var i = 0 ; i < this.actionInstances.size(); i++) {
-                code.pr("boolean" + ((i == this.actionInstances.size() - 1) ? "" : ",") + "\t// " + this.actionInstances.get(i));
+                code.pr("boolean" + ((i == this.actionInstances.size() - 1) ? "" : ",")
+                    + "\t// " + this.actionInstances.get(i));
             }
         } else {
             code.pr(String.join("\n", 
@@ -610,7 +636,8 @@ protected void generateReactionIdsAndStateVars() {
         code.pr("};");
         code.pr("// Projection macros for action schedule flag");
         for (var i = 0; i < this.actionInstances.size(); i++) {
-            code.pr("define " + this.actionInstances.get(i).getFullNameWithJoiner("_") + "_scheduled" + "(d : sched_t) : boolean = d._" + (i+1) + ";");
+            code.pr("define " + this.actionInstances.get(i).getFullNameWithJoiner("_")
+                + "_scheduled" + "(d : sched_t) : boolean = d._" + (i+1) + ";");
         }
     }
 
@@ -622,61 +649,75 @@ protected void generateReactorSemantics() {
             "/*********************",
             " * Reactor Semantics *",
             " *********************/",
+            ""
+        ));
+
+        // Non-federated "happened-before"
+        code.pr(String.join("\n", 
+            "// Non-federated \"happened-before\"",
+            "define hb(e1, e2 : event_t) : boolean",
+            "= tag_earlier(e1._2, e2._2)"
+        ));
+        if (!this.logicalTimeBased) {
+            code.indent();
+            // Get happen-before relation between two reactions.
+            code.pr("|| (tag_same(e1._2, e2._2) && ( false");
+            // Iterate over every pair of reactions.
+            for (var upstreamRuntime : this.reactionInstances) {
+                var downstreamReactions = upstreamRuntime.getReaction().dependentReactions();
+                for (var downstream : downstreamReactions) {
+                    for (var downstreamRuntime : downstream.getRuntimeInstances()) {
+                        code.pr("|| (" + upstreamRuntime.getReaction().getFullNameWithJoiner("_") + "(e1._1)"
+                            + " && " + downstreamRuntime.getReaction().getFullNameWithJoiner("_") + "(e2._1)" + ")");
+                    }
+                }
+            }
+            code.unindent();
+            code.pr("))");
+        }
+        code.pr(";");
+
+        code.pr(String.join("\n", 
             "/** transition relation **/",
             "// transition relation constrains future states",
             "// based on previous states.",
             "",
             "// Events are ordered by \"happened-before\" relation.",
-            "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (finite_forall (j : integer) in indices ::",
-            "    (j >= START && j <= END) ==> (hb(elem(i), elem(j)) ==> i < j)));",
-            "",
-            "// the same event can only trigger once in a logical instant",
-            "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (finite_forall (j : integer) in indices ::",
-            "    (j >= START && j <= END) ==> ((rxn(i) == rxn(j) && i != j)",
-            "        ==> !tag_same(g(i), g(j)))));",
+            "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END_TRACE) ==> (finite_forall (j : integer) in indices ::",
+            "    (j >= START && j <= END_TRACE) ==> (hb(elem(i), elem(j)) ==> i < j)));",
             "",
             "// Tags should be non-negative.",
-            "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END)",
+            "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END_TRACE)",
             "    ==> pi1(g(i)) >= 0);",
             "",
             "// Microsteps should be non-negative.",
-            "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END)",
+            "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END_TRACE)",
             "    ==> pi2(g(i)) >= 0);",
             "",
             "// Begin the frame at the start time specified.",
             "define start_frame(i : step_t) : boolean =",
             "    (tag_same(g(i), {start_time, 0}) || tag_later(g(i), {start_time, 0}));",
-            "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END)",
+            "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END_TRACE)",
             "    ==> start_frame(i));",
             "",
             "// NULL events should appear in the suffix, except for START.",
-            "axiom(finite_forall (j : integer) in indices :: (j > START && j <= END) ==> (",
-            "    (rxn(j)) != NULL) ==> ",
-            "        (finite_forall (i : integer) in indices :: (i > START && i < j) ==> (rxn(i) != NULL)));",
+            "axiom(finite_forall (j : integer) in indices :: (j > START && j <= END_TRACE) ==> (",
+            "    !isNULL(j)) ==> ",
+            "        (finite_forall (i : integer) in indices :: (i > START && i < j) ==> (!isNULL(i))));",
             ""
         ));
 
-        // Non-federated "happened-before"
-        code.pr(String.join("\n", 
-            "// Non-federated \"happened-before\"",
-            "define hb(e1, e2 : event_t) : boolean",
-            "= tag_earlier(e1._2, e2._2)"
-        ));
-        code.indent();
-        // Get happen-before relation between two reactions.
-        code.pr("|| (tag_same(e1._2, e2._2) && ( false");
-        // Iterate over every pair of reactions.
-        for (var upstreamRuntime : this.reactionInstances) {
-            var downstreamReactions = upstreamRuntime.getReaction().dependentReactions();
-            for (var downstream : downstreamReactions) {
-                for (var downstreamRuntime : downstream.getRuntimeInstances()) {
-                    code.pr("|| (e1._1 == " + upstreamRuntime.getReaction().getFullNameWithJoiner("_")
-                            + " && e2._1 == " + downstreamRuntime.getReaction().getFullNameWithJoiner("_") + ")");
-                }
-            }
+        // For logical time-based semantics, there is no need for this since each logical instant
+        // will only happen once in the trace.
+        if (!this.logicalTimeBased) {
+            code.pr(String.join("\n",
+                "// the same event can only trigger once in a logical instant",
+                "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (finite_forall (j : integer) in indices ::",
+                "    (j >= START && j <= END) ==> ((rxn(i) == rxn(j) && i != j)",
+                "        ==> !tag_same(g(i), g(j)))));",
+                ""
+            ));
         }
-        code.unindent();
-        code.pr("));");
     }
 
     /**
@@ -747,7 +788,7 @@ protected void generateTriggersAndReactions() {
                     // If destination is not present, then its value resets to 0.
                     code.pr(String.join("\n", 
                         "// If " + destination.getFullNameWithJoiner("_") + " is not present, then its value resets to 0.",
-                        "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END && rxn(i) != NULL) ==> (",
+                        "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END && !isNULL(i)) ==> (",
                         "    (!" + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
                         "        " + destination.getFullNameWithJoiner("_") + "(s(i)) == 0",
                         "    ))",
@@ -775,7 +816,7 @@ protected void generateTriggersAndReactions() {
                         // OR because only any present trigger can trigger the reaction.
                         "|| (" + action.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
                         "    finite_exists (j : integer) in indices :: j >= START && j < i",
-                        "    && rxn(j) == " + reaction.getFullNameWithJoiner("_"),
+                        "    && " + reaction.getFullNameWithJoiner("_") + "(rxn(j))",
                         "    && g(i) == tag_schedule(g(j), " + action.getMinDelay().toNanoSeconds() + ")",
                         "    && " + action.getFullNameWithJoiner("_") + "_scheduled" + "(d(j))",
                         "))"
@@ -794,7 +835,7 @@ protected void generateTriggersAndReactions() {
                 // If the action is not present, then its value resets to 0.
                 code.pr(String.join("\n", 
                     "// If " + action.getFullNameWithJoiner("_") + "  is not present, then its value resets to 0.",
-                    "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END && rxn(i) != NULL) ==> (",
+                    "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END && !isNULL(i)) ==> (",
                     "    (!" + action.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
                     "        " + action.getFullNameWithJoiner("_") + "(s(i)) == 0",
                     "    ))",
@@ -835,10 +876,10 @@ protected void generateTriggersAndReactions() {
                             "axiom(",
                             "    ((start_time == 0) ==> (",
                             "        finite_exists (i : integer) in indices :: i > START && i <= END",
-                            "            && rxn(i) == " + reaction.getReaction().getFullNameWithJoiner("_") + " && tag_same(g(i), zero())",
+                            "            && " + reaction.getReaction().getFullNameWithJoiner("_") + "(rxn(i))" + " && tag_same(g(i), zero())",
                             "            && !(",
                             "            finite_exists (j : integer) in indices :: j > START && j <= END",
-                            "            && rxn(j) == " + reaction.getReaction().getFullNameWithJoiner("_") ,
+                            "            && " + reaction.getReaction().getFullNameWithJoiner("_") + "(rxn(j))",
                             "            && j != i",
                             "            )",
                             "    ))",
@@ -866,7 +907,7 @@ protected void generateTriggersAndReactions() {
                 for (var instance : trigger.getDependentReactions()) {
                     for (var runtime : ((ReactionInstance)instance).getRuntimeInstances()) {
                         if (runtime == reaction) continue; // Skip the current reaction.
-                        exclusion += " && rxn(i) != " + runtime.getReaction().getFullNameWithJoiner("_");
+                        exclusion += " && !" + runtime.getReaction().getFullNameWithJoiner("_") + "(rxn(i))";
                     }
                 }
                 
@@ -875,7 +916,7 @@ protected void generateTriggersAndReactions() {
             }
 
             // If any of the above trigger is present, then trigger the reaction.
-            str += "\n) <==> (rxn(i) == " + reaction.getReaction().getFullNameWithJoiner("_") + ")));";
+            str += "\n) <==> (" + reaction.getReaction().getFullNameWithJoiner("_") + "(rxn(i))" + ")));";
             code.pr(str);
         }
     }
@@ -890,7 +931,7 @@ protected void generateInitialConditions() {
             " *********************/",
             "define initial_condition() : boolean",
             "= start_time == 0",
-            "    && rxn(0) == NULL",
+            "    && isNULL(0)",
             "    && g(0) == {0, 0}"
         ));
         code.indent();
@@ -919,6 +960,7 @@ protected void generateReactionAxioms() {
             " * Reactions *",
             " *************/"
         ));
+
         for (ReactionInstance.Runtime reaction : this.reactionInstances) {
             System.out.println("Printing reaction body of " + reaction);
             String body = reaction.getReaction().getDefinition().getCode().getBody();
@@ -952,13 +994,13 @@ protected void generateReactionAxioms() {
             // System.out.println("***** Printing the AST in If Normal Form.");
             baseVisitor.visit(inf);
 
-            // For the variables that are used, extract the conditions
+            // For the variables that are USED inside this reaction, extract the conditions
             // for setting them, and take the negation of their conjunction
-            // to get the condition for resetting them.
+            // to get the condition for maintaining their values.
             List<StateVariableInstance> unusedStates = new ArrayList<>(this.stateVariables);
             List<PortInstance> unusedOutputs = new ArrayList<>(this.outputInstances);
             List<ActionInstance> unusedActions = new ArrayList<>(this.actionInstances);
-            HashMap<NamedInstance, List<CAst.AstNode>> resetConditions = new HashMap<>();
+            HashMap<NamedInstance, List<CAst.AstNode>> defaultBehaviorConditions = new HashMap<>();
             for (CAst.AstNode node : inf.children) {
                 CAst.IfBlockNode ifBlockNode = (CAst.IfBlockNode)node;
                 CAst.AstNode ifBody = ((CAst.IfBodyNode)ifBlockNode.right).left;
@@ -983,10 +1025,10 @@ protected void generateReactionAxioms() {
                     unusedActions.remove(instance);
                 } else continue;
                 // Create a new entry in the list if there isn't one yet.
-                if (resetConditions.get(instance) == null) {
-                    resetConditions.put(instance, new ArrayList<CAst.AstNode>());
+                if (defaultBehaviorConditions.get(instance) == null) {
+                    defaultBehaviorConditions.put(instance, new ArrayList<CAst.AstNode>());
                 }
-                resetConditions.get(instance).add(ifBlockNode.left);
+                defaultBehaviorConditions.get(instance).add(ifBlockNode.left);
                 // System.out.println("!!! Added another reset condition: " + ifBlockNode.left);
             }
 
@@ -997,14 +1039,14 @@ protected void generateReactionAxioms() {
             code.pr(String.join("\n", 
                 "// Reaction body of " + reaction,
                 "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
-                "    (rxn(i) == " + reaction.getReaction().getFullNameWithJoiner("_") + ")",
+                "    (" + reaction.getReaction().getFullNameWithJoiner("_") + "(rxn(i))" + ")",
                 "        ==> " + "(" + "(" + axiom + ")",
                 "&& " + "( " + "true",
-                "// Default behavior of the used variables"
+                "// By default, the value of the variables used in this reaction stay the same."
             ));
-            for (NamedInstance key : resetConditions.keySet()) {
-                CAst.AstNode disjunction = CAstUtils.takeDisjunction(resetConditions.get(key));
-                // System.out.println("!!! Reset conditions: " + resetConditions.get(key));
+            for (NamedInstance key : defaultBehaviorConditions.keySet()) {
+                CAst.AstNode disjunction = CAstUtils.takeDisjunction(defaultBehaviorConditions.get(key));
+                // System.out.println("!!! Reset conditions: " + defaultBehaviorConditions.get(key));
                 CAst.LogicalNotNode notNode = new CAst.LogicalNotNode();
                 notNode.child = disjunction;
                 String resetCondition = c2uVisitor.visit(notNode);
@@ -1038,38 +1080,71 @@ protected void generateReactionAxioms() {
                 }
                 code.pr("))");
             }
-            // Unused state variables and ports reset by default.
-            code.pr("// Unused state variables and ports reset by default.");
-            for (StateVariableInstance s : unusedStates) {
-                code.pr("&& (true ==> (");
-                code.pr(s.getFullNameWithJoiner("_") + "(" + "s" + "(" + "i" + ")" + ")"
-                    + " == "
-                    + s.getFullNameWithJoiner("_") + "(" + "s" + "(" + "i" + "-1" + ")" + ")");
-                code.pr("))");
-            }
-            for (PortInstance p : unusedOutputs) {
-                code.pr("&& (true ==> (");
-                code.pr(
-                        "("
-                        + " true"
-                        // Reset value
-                        + "\n&& " + p.getFullNameWithJoiner("_") + "(" + "s" + "(" + "i" + ")" + ")"
-                        + " == "
-                        + "0" // Default value
-                        // Reset presence
-                        + "\n&& " + p.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + "i" + ")" + ")"
+
+            // For state variables and ports that are NOT used in this reaction,
+            // their values stay the same by default.
+            code.pr("// Unused state variables and ports are reset by default.");
+            if (this.logicalTimeBased) {
+                // If all other reactions that can modify the SAME state variable
+                // are not triggered, then the state variable stay the same.
+                //
+                // FIXME: What if two reactions modifying the same state variable
+                // are triggered at the same time?
+                // How to use axioms to model reaction priority?
+                // The main difficulty of logical time based semantics is composing
+                // the effect of simultaneous reactions.
+                //
+                // A path way to implement it in the future:
+                // 1. For each variable, port, and action, determine a list of
+                //    reactions that can modify/schedule it.
+                // 2. Reaction axioms should be generated wrt each reactor.
+                //    For example, assuming a reactor with two input ports,
+                //    each triggering a distinct reaction. The axioms will need
+                //    to handle four cases: i. reaction 1 gets triggered and 2
+                //    does not; ii. reaction 2 gets triggered and 1 does not;
+                //    iii. both reactions get triggered; iv. none of them get
+                //    triggered. Since it is hard to specify in an independent way,
+                //    due to reaction priorities,
+                //    what happens when two reactions (modifying the same state var.)
+                //    get triggered simultaneously, some combinatorial blowup will
+                //    be incurred. In this example, four axioms (instead of two),
+                //    each handling one case, seems needed. The good news is that
+                //    axioms across reactors may be specified independently.
+                //    For example, if there is another reactor of the same class,
+                //    Only four more axioms need to be added (in total 2^2 + 2^2),
+                //    instead of 16 axioms (2^4).
+            } else {
+                for (StateVariableInstance s : unusedStates) {
+                    code.pr("&& (true ==> (");
+                    code.pr(s.getFullNameWithJoiner("_") + "(" + "s" + "(" + "i" + ")" + ")"
                         + " == "
-                        + false // default presence
-                        + ")"
-                    );
-                code.pr("))");
-            }
-            for (ActionInstance a : unusedActions) {
-                code.pr("&& (true ==> (");
-                code.pr(a.getFullNameWithJoiner("_") + "_scheduled" + "(" + "d" + "(" + "i" + ")" + ")" + " == " + "false");
-                code.pr("))");
+                        + s.getFullNameWithJoiner("_") + "(" + "s" + "(" + "i" + "-1" + ")" + ")");
+                    code.pr("))");
+                }
+                for (PortInstance p : unusedOutputs) {
+                    code.pr("&& (true ==> (");
+                    code.pr(
+                            "("
+                            + " true"
+                            // Reset value
+                            + "\n&& " + p.getFullNameWithJoiner("_") + "(" + "s" + "(" + "i" + ")" + ")"
+                            + " == "
+                            + "0" // Default value
+                            // Reset presence
+                            + "\n&& " + p.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + "i" + ")" + ")"
+                            + " == "
+                            + false // default presence
+                            + ")"
+                        );
+                    code.pr("))");
+                }
+                for (ActionInstance a : unusedActions) {
+                    code.pr("&& (true ==> (");
+                    code.pr(a.getFullNameWithJoiner("_") + "_scheduled" + "(" + "d" + "(" + "i" + ")" + ")" + " == " + "false");
+                    code.pr("))");
+                }
+                code.pr("))));");
             }
-            code.pr("))));");
         }
     }
 
@@ -1231,7 +1306,21 @@ private void computeCT() {
         diagram.display();  
 
         if (!explorer.loopFound) {
-            this.CT = diagram.length;
+            if (this.logicalTimeBased)
+                this.CT = diagram.length;
+            else {
+                // FIXME: This could be much more efficient with a linkedlist implementation.
+                StateSpaceNode node = diagram.head;
+                this.CT = diagram.head.reactionsInvoked.size();
+                while (diagram.getDownstreamAdjacentNodes(node).size() != 0) {
+                    Set<StateSpaceNode> downstreamNodes = diagram.getDownstreamAdjacentNodes(node);
+                    for (StateSpaceNode n : downstreamNodes) {
+                        node = n; // Go to the next node.
+                        break;
+                    }
+                    this.CT += node.reactionsInvoked.size();
+                }
+            }
             System.out.println("*** A loop is NOT found.");
             System.out.println("CT: " + this.CT);
         } 
@@ -1241,17 +1330,45 @@ private void computeCT() {
             // interval from the total horizon.
             long horizonRemained =
                 this.horizon - diagram.loopNode.tag.timestamp;
-            
+        
             // Check how many loop iteration is required
             // to check the remaining horizon.
             int loopIterations = (int) Math.ceil(
                 (double) horizonRemained / diagram.loopPeriod);
-            
-            // CT = steps required for the non-periodic part
-            //      + steps required for the periodic part
-            this.CT = (diagram.loopNode.index + 1)
-                + (diagram.tail.index - diagram.loopNode.index + 1) * loopIterations;
 
+            if (this.logicalTimeBased) {
+                // CT = steps required for the non-periodic part
+                //      + steps required for the periodic part
+                this.CT = (diagram.loopNode.index + 1)
+                    + (diagram.tail.index - diagram.loopNode.index + 1) * loopIterations;
+            } else {
+                // Get the number of events before the loop.
+                // This stops right before the loopNode is encountered.
+                StateSpaceNode node = diagram.head;
+                int numReactionInvocationsBeforeLoop = 0;
+                while (node != diagram.loopNode) {
+                    numReactionInvocationsBeforeLoop += node.reactionsInvoked.size();
+                    Set<StateSpaceNode> downstreamNodes = diagram.getDownstreamAdjacentNodes(node);
+                    for (StateSpaceNode n : downstreamNodes) {
+                        node = n; // Go to the next node.
+                        break;
+                    }
+                }
+                int numReactionInvocationsInsideLoop = node.reactionsInvoked.size();
+                while (node != diagram.loopNode) {
+                    Set<StateSpaceNode> downstreamNodes = diagram.getDownstreamAdjacentNodes(node);
+                    for (StateSpaceNode n : downstreamNodes) {
+                        node = n; // Go to the next node.
+                        break;
+                    }
+                    numReactionInvocationsInsideLoop += node.reactionsInvoked.size();
+                }
+
+                // CT = steps required for the non-periodic part
+                //      + steps required for the periodic part
+                this.CT = numReactionInvocationsBeforeLoop
+                    + numReactionInvocationsInsideLoop * loopIterations;
+            }
             System.out.println("*** A loop is found!");
             System.out.println("CT: " + this.CT);
         }
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidRunner.java b/org.lflang/src/org/lflang/generator/uclid/UclidRunner.java
index 995fddea33..aa2698fead 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidRunner.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidRunner.java
@@ -69,38 +69,42 @@ public UclidRunner(
     public StateInfo parseStateInfo(String smtStr) {
         StateInfo info = new StateInfo();
 
+        // Split the counterexample string by newline.
+        String[] splitedSmtStr = smtStr.split("\\r?\\n");
+
         // Reactions
-        Pattern p = Pattern.compile("\\(_tuple_0([^\\)]+)\\(");
-        Matcher m = p.matcher(smtStr);
+        Pattern p = Pattern.compile("\\(_tuple_\\d+ \\(_tuple_\\d+ ([^\\)]+)\\)");
+        Matcher m = p.matcher(splitedSmtStr[0].strip());
         m.find();
-        String[] splited = m.group(1).split("\\s+");
-        info.reactions.addAll(Arrays.asList(splited));
+        String[] reactions = m.group(1).strip().split("\\s+");
+        for (int i = 0; i < reactions.length; i++) {
+            if (reactions[i].equals("true"))
+                info.reactions.add(generator.reactionInstances.get(i).getReaction().getFullName());
+        }
 
         // Time tag
-        p = Pattern.compile("\\(_tuple_1([^\\)]+)\\)");
-        m = p.matcher(smtStr);
+        p = Pattern.compile("\\(_tuple_\\d+([^\\)]+)\\)");
+        m = p.matcher(splitedSmtStr[1].strip());
         m.find();
-        splited = m.group(1).strip().split("\\s+");
+        String[] tag = m.group(1).strip().split("\\s+");
         info.tag = new Tag(
-            Long.parseLong(splited[0]),
-            Long.parseLong(splited[1]), false);
+            Long.parseLong(tag[0]),
+            Long.parseLong(tag[1]), false);
 
         // Variables
-        p = Pattern.compile("\\(_tuple_2([^\\)]+)\\)");
-        m = p.matcher(smtStr);
+        m = p.matcher(splitedSmtStr[2].strip());
         m.find();
-        splited = m.group(1).strip().split("\\s+");
-        for (int i = 1; i < splited.length; i++) {
-            info.variables.put(generator.namedInstances.get(i).getFullName(), splited[i]);
+        String[] variables = m.group(1).strip().split("\\s+");
+        for (int i = 0; i < variables.length; i++) {
+            info.variables.put(generator.namedInstances.get(i).getFullName(), variables[i]);
         }
 
         // Triggers
-        p = Pattern.compile("\\(_tuple_3([^\\)]+)\\)");
-        m = p.matcher(smtStr);
+        m = p.matcher(splitedSmtStr[3].strip());
         m.find();
-        splited = m.group(1).strip().split("\\s+");
-        for (int i = 1; i < splited.length; i++) {
-            info.triggers.put(generator.triggerInstances.get(i).getFullName(), splited[i]);
+        String[] triggers = m.group(1).strip().split("\\s+");
+        for (int i = 0; i < triggers.length; i++) {
+            info.triggers.put(generator.triggerInstances.get(i).getFullName(), triggers[i]);
         }
 
         return info;
@@ -130,7 +134,7 @@ public void run() {
                     String cexJSONStr = Files.readString(
                         Paths.get(path.toString() + ".json"),
                         StandardCharsets.UTF_8);
-                    System.out.println(cexJSONStr);
+                    // System.out.println(cexJSONStr);
                     JSONObject cexJSON = new JSONObject(cexJSONStr);
 
                     //// Extract the counterexample trace from JSON.
diff --git a/org.lflang/src/org/lflang/sim/StateSpaceDiagram.java b/org.lflang/src/org/lflang/sim/StateSpaceDiagram.java
index 02bc33cf78..10bcccb505 100644
--- a/org.lflang/src/org/lflang/sim/StateSpaceDiagram.java
+++ b/org.lflang/src/org/lflang/sim/StateSpaceDiagram.java
@@ -9,6 +9,7 @@
 
 import org.lflang.graph.DirectedGraph;
 
+// FIXME: Use a linkedlist instead.
 public class StateSpaceDiagram extends DirectedGraph<StateSpaceNode> {
 
     /**
diff --git a/org.lflang/src/org/lflang/sim/StateSpaceExplorer.java b/org.lflang/src/org/lflang/sim/StateSpaceExplorer.java
index 70a370f535..623a2c40a1 100644
--- a/org.lflang/src/org/lflang/sim/StateSpaceExplorer.java
+++ b/org.lflang/src/org/lflang/sim/StateSpaceExplorer.java
@@ -102,43 +102,39 @@ public void explore(Tag horizon, boolean findLoop) {
         addInitialEvents(this.main);
         System.out.println(this.eventQ);
         
-        Tag             previous_tag = null; // Tag in the previous loop ITERATION
-        Tag             current_tag  = null;  // Tag in the current  loop ITERATION
-        StateSpaceNode  current_node = null;
+        Tag             previousTag = null; // Tag in the previous loop ITERATION
+        Tag             currentTag  = null;  // Tag in the current  loop ITERATION
+        StateSpaceNode  currentNode = null;
         boolean         stop         = true;
         if (this.eventQ.size() > 0) {
             stop = false;
-            current_tag = (eventQ.peek()).tag;
-            // System.out.println(current_tag);
+            currentTag = (eventQ.peek()).tag;
+            // System.out.println(currentTag);
         }
 
         // A list of reactions invoked at the current logical tag
-        ArrayList<ReactionInstance> reactions_invoked;
+        ArrayList<ReactionInstance> reactionsInvoked;
         // A temporary list of reactions processed in the current LOOP ITERATION
-        ArrayList<ReactionInstance> reactions_temp;
+        ArrayList<ReactionInstance> reactionsTemp;
 
         while (!stop) {
             // Pop the events from the earliest tag off the event queue.
-            ArrayList<Event> current_events = new ArrayList<Event>();
+            ArrayList<Event> currentEvents = new ArrayList<Event>();
             // FIXME: Use stream methods here?
-            while (eventQ.size() > 0 && eventQ.peek().tag.compareTo(current_tag) == 0) {
+            while (eventQ.size() > 0 && eventQ.peek().tag.compareTo(currentTag) == 0) {
                 Event e = eventQ.poll();
-                current_events.add(e);
-                // System.out.println("Adding event to current_events: " + e);
+                currentEvents.add(e);
+                // System.out.println("Adding event to currentEvents: " + e);
             }
-            System.out.println(current_events);
+            System.out.println(currentEvents);
 
             // Collect all the reactions invoked in this current LOOP ITERATION
             // triggered by the earliest events.
-            reactions_temp = new ArrayList<ReactionInstance>();
-            for (Event e : current_events) {
-                Set<ReactionInstance> dependent_reactions
+            reactionsTemp = new ArrayList<ReactionInstance>();
+            for (Event e : currentEvents) {
+                Set<ReactionInstance> dependentReactions
                     = e.trigger.getDependentReactions();
-                // System.out.println("Dependent reactions:");
-                // for (ReactionInstance reaction : dependent_reactions)
-                //     System.out.println(reaction);
-                // System.out.println(dependent_reactions);
-                reactions_temp.addAll(dependent_reactions);
+                reactionsTemp.addAll(dependentReactions);
 
                 // If the event is a timer firing, enqueue the next firing.
                 if (e.trigger instanceof TimerInstance) {
@@ -146,7 +142,7 @@ public void explore(Tag horizon, boolean findLoop) {
                     eventQ.add(new Event(
                         timer,
                         new Tag(
-                            current_tag.timestamp + timer.getPeriod().toNanoSeconds(),
+                            currentTag.timestamp + timer.getPeriod().toNanoSeconds(),
                             0, // A time advancement resets microstep to 0.
                             false
                         ))
@@ -155,7 +151,7 @@ public void explore(Tag horizon, boolean findLoop) {
             }
 
             // For each reaction invoked, compute the new events produced.
-            for (ReactionInstance reaction : reactions_temp) {
+            for (ReactionInstance reaction : reactionsTemp) {
                 // Iterate over all the effects produced by this reaction.
                 // If the effect is a port, obtain the downstream port along
                 // a connection and enqueue a future event for that port.
@@ -193,7 +189,7 @@ public void explore(Tag horizon, boolean findLoop) {
                                 // Create and enqueue a new event.
                                 Event e = new Event(
                                     downstreamPort,
-                                    new Tag(current_tag.timestamp + delay, 0, false)
+                                    new Tag(currentTag.timestamp + delay, 0, false)
                                 );
                                 eventQ.add(e);
                             }
@@ -205,7 +201,7 @@ else if (effect instanceof ActionInstance) {
                         // Create and enqueue a new event.
                         Event e = new Event(
                             effect,
-                            new Tag(current_tag.timestamp + min_delay, 0, false)
+                            new Tag(currentTag.timestamp + min_delay, 0, false)
                         );
                         eventQ.add(e);
                     }
@@ -214,11 +210,11 @@ else if (effect instanceof ActionInstance) {
 
             // When we first advance to a new tag, create a new node in the state space diagram.
             if (
-                previous_tag == null // The first iteration
-                || current_tag.compareTo(previous_tag) > 0
+                previousTag == null // The first iteration
+                || currentTag.compareTo(previousTag) > 0
             ) {
-                // Copy the reactions in reactions_temp.
-                reactions_invoked = new ArrayList<ReactionInstance>(reactions_temp);
+                // Copy the reactions in reactionsTemp.
+                reactionsInvoked = new ArrayList<ReactionInstance>(reactionsTemp);
 
                 // Create a new state in the SSD for the current tag,
                 // add the reactions triggered to the state,
@@ -226,8 +222,8 @@ else if (effect instanceof ActionInstance) {
                 // generated by reaction invocations in the curren tag)
                 // to the state.
                 StateSpaceNode node = new StateSpaceNode(
-                    current_tag,                    // Current tag
-                    reactions_invoked,              // Reactions invoked at this tag
+                    currentTag,                    // Current tag
+                    reactionsInvoked,              // Reactions invoked at this tag
                     new ArrayList<Event>(eventQ)    // A snapshot of the event queue
                 );
 
@@ -241,8 +237,8 @@ else if (effect instanceof ActionInstance) {
                             System.out.println("*** A loop is found!");
                             // Mark the loop in the diagram.
                             this.diagram.loopNode = n;
-                            this.diagram.tail = current_node;
-                            this.diagram.loopPeriod = current_tag.timestamp
+                            this.diagram.tail = currentNode;
+                            this.diagram.loopPeriod = currentTag.timestamp
                                                         - this.diagram.loopNode.tag.timestamp;
                             this.diagram.addEdge(this.diagram.loopNode, this.diagram.tail);
                             return; // Exit the while loop early.
@@ -257,35 +253,35 @@ else if (effect instanceof ActionInstance) {
                 
                 // If the head is not empty, add an edge from the previous state
                 // to the next state. Otherwise initialize the head to the new node.
-                if (this.diagram.head != null && current_node != null) {
-                    // System.out.println("--- Add a new edge between " + current_node + " and " + node);
-                    this.diagram.addEdge(node, current_node); // Sink first, then source
+                if (this.diagram.head != null && currentNode != null) {
+                    // System.out.println("--- Add a new edge between " + currentNode + " and " + node);
+                    this.diagram.addEdge(node, currentNode); // Sink first, then source
                 }
                 else
                     this.diagram.head = node; // Initialize the head.
                 
                 // Update the current node.
-                current_node = node;
+                currentNode = node;
             }
             // Time does not advance because we are processing
             // connections with zero delay.
             else {
                 // Add reactions explored in the current loop iteration
                 // to the existing state space node.
-                current_node.reactions_invoked.addAll(reactions_temp);
+                currentNode.reactionsInvoked.addAll(reactionsTemp);
             }
 
             // Update the current tag for the next iteration.
             if (eventQ.size() > 0) {
-                previous_tag = current_tag;
-                current_tag = eventQ.peek().tag;
+                previousTag = currentTag;
+                currentTag = eventQ.peek().tag;
             }
 
             // Stop if:
             // 1. the event queue is empty, or
             // 2. the horizon is reached.
             if (eventQ.size() == 0 
-                || current_tag.compareTo(horizon) > 0)
+                || currentTag.compareTo(horizon) > 0)
                 stop = true;
         }
         return;
diff --git a/org.lflang/src/org/lflang/sim/StateSpaceNode.java b/org.lflang/src/org/lflang/sim/StateSpaceNode.java
index 1bf59f7ed6..d33fd99e41 100644
--- a/org.lflang/src/org/lflang/sim/StateSpaceNode.java
+++ b/org.lflang/src/org/lflang/sim/StateSpaceNode.java
@@ -14,29 +14,29 @@ public class StateSpaceNode {
 
     public int index;
     public Tag tag;
-    public ArrayList<ReactionInstance> reactions_invoked;
+    public ArrayList<ReactionInstance> reactionsInvoked;
     public ArrayList<Event> eventQ;
 
     public StateSpaceNode(
         Tag tag,
-        ArrayList<ReactionInstance> reactions_invoked,
+        ArrayList<ReactionInstance> reactionsInvoked,
         ArrayList<Event> eventQ
     ) {
         this.tag    = tag;
         this.eventQ = eventQ;
-        this.reactions_invoked = reactions_invoked;
+        this.reactionsInvoked = reactionsInvoked;
     }
 
     /**
      * This equals method does NOT compare tags,
-     * only compares reactions_invoked and eventQ.
+     * only compares reactionsInvoked and eventQ.
      */
     @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (o instanceof StateSpaceNode) {
             StateSpaceNode node = (StateSpaceNode) o;
-            if (this.reactions_invoked.equals(node.reactions_invoked)
+            if (this.reactionsInvoked.equals(node.reactionsInvoked)
                 && this.eventQ.equals(node.eventQ))
                 return true;
         }
@@ -44,7 +44,7 @@ public boolean equals(Object o) {
     }
 
     public void display() {
-        System.out.println("(" + tag + ", " + reactions_invoked + ", " + eventQ + ")");
+        System.out.println("(" + tag + ", " + reactionsInvoked + ", " + eventQ + ")");
     }
     
 }
\ No newline at end of file

From 0c8ab2ddb2a566bede7754492cb6bf9da6a2c387 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 5 Dec 2022 12:25:48 -0800
Subject: [PATCH 0064/1114] More robust CEX parsing, fix an axiom bug related
 to END_TRACE.

---
 .../org/lflang/generator/uclid/StateInfo.java |  2 +-
 .../generator/uclid/UclidGenerator.java       |  2 +-
 .../lflang/generator/uclid/UclidRunner.java   | 22 ++++++++++++-------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/StateInfo.java b/org.lflang/src/org/lflang/generator/uclid/StateInfo.java
index c01841ea14..0f2f4f3008 100644
--- a/org.lflang/src/org/lflang/generator/uclid/StateInfo.java
+++ b/org.lflang/src/org/lflang/generator/uclid/StateInfo.java
@@ -24,6 +24,6 @@ public void display() {
         System.out.println("tag: " + tag);
         System.out.println("variables: " + variables);
         System.out.println("triggers: " + triggers);
-        // System.out.println("scheduled: " + scheduled);
+        System.out.println("scheduled: " + scheduled);
     }
 }
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 9915cb1cf9..ff408268cb 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -855,7 +855,7 @@ protected void generateTriggersAndReactions() {
         for (ReactionInstance.Runtime reaction : this.reactionInstances) {
             String str = String.join("\n", 
                 "// " + reaction.getReaction().getFullNameWithJoiner("_") + " is invoked when any of it triggers are present.",
-                "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> ((",
+                "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END_TRACE) ==> ((",
                 "    false"
             );
 
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidRunner.java b/org.lflang/src/org/lflang/generator/uclid/UclidRunner.java
index aa2698fead..81bc78b433 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidRunner.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidRunner.java
@@ -69,12 +69,15 @@ public UclidRunner(
     public StateInfo parseStateInfo(String smtStr) {
         StateInfo info = new StateInfo();
 
-        // Split the counterexample string by newline.
-        String[] splitedSmtStr = smtStr.split("\\r?\\n");
+        // Remove the outer tuple layer.
+        Pattern p = Pattern.compile("^\\(_tuple_\\d+((.|\\n)*)\\)$");
+        Matcher m = p.matcher(smtStr.strip());
+        m.find();
+        String itemized = m.group(1).strip();
 
         // Reactions
-        Pattern p = Pattern.compile("\\(_tuple_\\d+ \\(_tuple_\\d+ ([^\\)]+)\\)");
-        Matcher m = p.matcher(splitedSmtStr[0].strip());
+        p = Pattern.compile("\\(_tuple_\\d+([^\\)]+)\\)");
+        m = p.matcher(itemized);
         m.find();
         String[] reactions = m.group(1).strip().split("\\s+");
         for (int i = 0; i < reactions.length; i++) {
@@ -83,8 +86,6 @@ public StateInfo parseStateInfo(String smtStr) {
         }
 
         // Time tag
-        p = Pattern.compile("\\(_tuple_\\d+([^\\)]+)\\)");
-        m = p.matcher(splitedSmtStr[1].strip());
         m.find();
         String[] tag = m.group(1).strip().split("\\s+");
         info.tag = new Tag(
@@ -92,7 +93,6 @@ public StateInfo parseStateInfo(String smtStr) {
             Long.parseLong(tag[1]), false);
 
         // Variables
-        m = p.matcher(splitedSmtStr[2].strip());
         m.find();
         String[] variables = m.group(1).strip().split("\\s+");
         for (int i = 0; i < variables.length; i++) {
@@ -100,13 +100,19 @@ public StateInfo parseStateInfo(String smtStr) {
         }
 
         // Triggers
-        m = p.matcher(splitedSmtStr[3].strip());
         m.find();
         String[] triggers = m.group(1).strip().split("\\s+");
         for (int i = 0; i < triggers.length; i++) {
             info.triggers.put(generator.triggerInstances.get(i).getFullName(), triggers[i]);
         }
 
+        // Actions scheduled
+        m.find();
+        String[] scheduled = m.group(1).strip().split("\\s+");
+        for (int i = 0; i < scheduled.length; i++) {
+            info.scheduled.put(generator.actionInstances.get(i).getFullName(), scheduled[i]);
+        }
+
         return info;
     }
 

From 8d9d091ee6657fafce0f55752ba8060f428220ce Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 7 Dec 2022 15:24:51 -0800
Subject: [PATCH 0065/1114] Support timers

---
 .../generator/uclid/UclidGenerator.java       | 112 ++++++++++++++++++
 .../lflang/generator/uclid/UclidRunner.java   |  10 +-
 2 files changed, 118 insertions(+), 4 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index ff408268cb..33d9cc743e 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -844,6 +844,118 @@ protected void generateTriggersAndReactions() {
             }
         }
 
+        if (this.timerInstances.size() > 0) {
+            code.pr(String.join("\n", 
+            "/**********",
+            " * Timers *",
+            " **********/"
+            ));
+            /**
+             * The timer axioms take the following form:
+             * 
+            // An initial firing at {offset, 0}
+            axiom(
+                ((g(END)._1 >= 500000000) ==> (
+                    finite_exists (j : integer) in indices :: (j > START && j <= END)
+                        && Timer_t_is_present(t(j))
+                        && tag_same(g(j), {500000000, 0})
+                ))
+                && ((g(END)._1 < 500000000) ==> (
+                    finite_forall (i : integer) in indices :: (i > START && i <= END)
+                        ==> (!isNULL(i))
+                ))
+            );
+            // Schedule subsequent firings.
+            axiom(
+                finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (
+                    Timer_t_is_present(t(i)) ==> (
+                        (
+                            finite_exists (j : integer) in indices :: (j >= START && j > i)
+                                && Timer_t_is_present(t(j))
+                                && (g(j) == tag_schedule(g(i), 1000000000))
+                        )
+                    )
+                )
+            );
+            // All firings must be evenly spaced out.
+            axiom(
+                finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (
+                    Timer_t_is_present(t(i)) ==> (
+                        // Timestamp must be offset + n * period
+                        (
+                            exists (n : integer) :: (
+                                n >= 0 &&
+                                g(i)._1 == 500000000 + n * 1000000000
+                            )
+                        )
+                        // Microstep must be 0
+                        && (
+                            g(i)._2 == 0
+                        )
+                    )
+                )
+            );
+             */
+            for (var timer : this.timerInstances) {
+                long offset = timer.getOffset().toNanoSeconds();
+                long period = timer.getPeriod().toNanoSeconds();
+
+                code.pr("//// Axioms for " + timer.getFullName());
+                
+                // An initial firing at {offset, 0}
+                code.pr(String.join("\n", 
+                    "// " + timer.getFullName() + ": an initial firing at (" + offset + ", 0)",
+                    "axiom(",
+                    "    ((pi1(g(END)) >= " + offset + ") ==> (",
+                    "        finite_exists (j : integer) in indices :: (j > START && j <= END)",
+                    "            && " + timer.getFullNameWithJoiner("_") + "_is_present(t(j))",
+                    "            && tag_same(g(j), {" + offset + ", 0})",
+                    "     ))",
+                    "     && ((pi1(g(END)) < " + offset + ") ==> (",
+                    "        finite_forall (i : integer) in indices :: (i > START && i <= END)",
+                    "            ==> (!isNULL(i))",
+                    "     ))",
+                    ");"
+                ));
+
+                // Schedule subsequent firings.
+                code.pr(String.join("\n", 
+                    "// " + timer.getFullName() + ": schedule subsequent firings every " + period + " ns",
+                    "axiom(",
+                    "    finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (",
+                    "        " + timer.getFullNameWithJoiner("_") + "_is_present(t(i)) ==> (",
+                    "            (",
+                    "                finite_exists (j : integer) in indices :: (j >= START && j > i)",
+                    "                    && " + timer.getFullNameWithJoiner("_") + "_is_present(t(j))",
+                    "                    && (g(j) == tag_schedule(g(i), " + period + "))",
+                    "            )",
+                    "        )",
+                    "    )",
+                    ");"
+                ));
+
+                // All firings must be evenly spaced out.
+                code.pr(String.join("\n", 
+                    "// " + timer.getFullName() + ": all firings must be evenly spaced out.",
+                    "axiom(",
+                    "    finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (",
+                    "        " + timer.getFullNameWithJoiner("_") + "_is_present(t(i)) ==> (",
+                    "            // Timestamp must be offset + n * period.",
+                    "            (",
+                    "                exists (n : integer) :: (",
+                    "                    n >= 0 &&",
+                    "                    pi1(g(i)) == " + offset + " + n * " + period,
+                    "                )",
+                    "            )",
+                    "            // Microstep must be 0.",
+                    "            && (pi2(g(i)) == 0)",
+                    "        )",
+                    "    )",
+                    ");"
+                ));
+            }
+        }
+
         code.pr(String.join("\n", 
             "/********************************",
             " * Reactions and Their Triggers *",
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidRunner.java b/org.lflang/src/org/lflang/generator/uclid/UclidRunner.java
index 81bc78b433..99dd20baa7 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidRunner.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidRunner.java
@@ -80,7 +80,9 @@ public StateInfo parseStateInfo(String smtStr) {
         m = p.matcher(itemized);
         m.find();
         String[] reactions = m.group(1).strip().split("\\s+");
-        for (int i = 0; i < reactions.length; i++) {
+        // Iterating over generator lists avoids accounting for
+        // the single dummy Uclid variable inserted earlier.
+        for (int i = 0; i < generator.reactionInstances.size(); i++) {
             if (reactions[i].equals("true"))
                 info.reactions.add(generator.reactionInstances.get(i).getReaction().getFullName());
         }
@@ -95,21 +97,21 @@ public StateInfo parseStateInfo(String smtStr) {
         // Variables
         m.find();
         String[] variables = m.group(1).strip().split("\\s+");
-        for (int i = 0; i < variables.length; i++) {
+        for (int i = 0; i < generator.namedInstances.size(); i++) {
             info.variables.put(generator.namedInstances.get(i).getFullName(), variables[i]);
         }
 
         // Triggers
         m.find();
         String[] triggers = m.group(1).strip().split("\\s+");
-        for (int i = 0; i < triggers.length; i++) {
+        for (int i = 0; i < generator.triggerInstances.size(); i++) {
             info.triggers.put(generator.triggerInstances.get(i).getFullName(), triggers[i]);
         }
 
         // Actions scheduled
         m.find();
         String[] scheduled = m.group(1).strip().split("\\s+");
-        for (int i = 0; i < scheduled.length; i++) {
+        for (int i = 0; i < generator.actionInstances.size(); i++) {
             info.scheduled.put(generator.actionInstances.get(i).getFullName(), scheduled[i]);
         }
 

From 57eda6f2cb47bb0b9ca0dc7720eb896228010f65 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Tue, 13 Dec 2022 23:31:34 -0800
Subject: [PATCH 0066/1114] Update CT estimation, clean up println.

---
 .../generator/uclid/UclidGenerator.java       | 37 +++++++++++--------
 .../uclid/ast/BuildAstParseTreeVisitor.java   |  2 +-
 org.lflang/src/org/lflang/sim/Event.java      |  5 +++
 .../org/lflang/sim/StateSpaceExplorer.java    | 11 +++---
 .../src/org/lflang/sim/StateSpaceNode.java    | 27 +++++++++++++-
 5 files changed, 58 insertions(+), 24 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
index 33d9cc743e..33faf9487e 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
@@ -1074,9 +1074,9 @@ protected void generateReactionAxioms() {
         ));
 
         for (ReactionInstance.Runtime reaction : this.reactionInstances) {
-            System.out.println("Printing reaction body of " + reaction);
             String body = reaction.getReaction().getDefinition().getCode().getBody();
-            System.out.println(body);
+            // System.out.println("Printing reaction body of " + reaction);
+            // System.out.println(body);
 
             // Generate a parse tree.
             CLexer lexer = new CLexer(CharStreams.fromString(body));
@@ -1454,27 +1454,22 @@ private void computeCT() {
                 this.CT = (diagram.loopNode.index + 1)
                     + (diagram.tail.index - diagram.loopNode.index + 1) * loopIterations;
             } else {
-                // Get the number of events before the loop.
+                // Get the number of events before the loop starts.
                 // This stops right before the loopNode is encountered.
                 StateSpaceNode node = diagram.head;
                 int numReactionInvocationsBeforeLoop = 0;
                 while (node != diagram.loopNode) {
                     numReactionInvocationsBeforeLoop += node.reactionsInvoked.size();
-                    Set<StateSpaceNode> downstreamNodes = diagram.getDownstreamAdjacentNodes(node);
-                    for (StateSpaceNode n : downstreamNodes) {
-                        node = n; // Go to the next node.
-                        break;
-                    }
+                    node = getDownstreamNode(diagram, node);
                 }
-                int numReactionInvocationsInsideLoop = node.reactionsInvoked.size();
-                while (node != diagram.loopNode) {
-                    Set<StateSpaceNode> downstreamNodes = diagram.getDownstreamAdjacentNodes(node);
-                    for (StateSpaceNode n : downstreamNodes) {
-                        node = n; // Go to the next node.
-                        break;
-                    }
+                
+                // Count the events from the loop node until
+                // loop node is reached again.
+                int numReactionInvocationsInsideLoop = 0;
+                do {
+                    node = getDownstreamNode(diagram, node);
                     numReactionInvocationsInsideLoop += node.reactionsInvoked.size();
-                }
+                } while (node != diagram.loopNode);
 
                 // CT = steps required for the non-periodic part
                 //      + steps required for the periodic part
@@ -1501,6 +1496,16 @@ private void processMTLSpec() {
         this.horizon = visitor.getHorizon();
     }
 
+    /**
+     * Get the immediately downstream node.
+     * FIXME: Check if there are multiple downstream nodes.
+     */
+    private StateSpaceNode getDownstreamNode(StateSpaceDiagram diagram, StateSpaceNode node) {
+        Set<StateSpaceNode> downstreamNodes = diagram.getDownstreamAdjacentNodes(node);
+        Iterator<StateSpaceNode> iterator = downstreamNodes.iterator();
+        return iterator.next();
+    }
+
     /////////////////////////////////////////////////
     //// Functions from generatorBase
     
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/BuildAstParseTreeVisitor.java b/org.lflang/src/org/lflang/generator/uclid/ast/BuildAstParseTreeVisitor.java
index da9cc4f33d..18fc25e2f4 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/BuildAstParseTreeVisitor.java
+++ b/org.lflang/src/org/lflang/generator/uclid/ast/BuildAstParseTreeVisitor.java
@@ -19,7 +19,7 @@ public CAst.AstNode visitBlockItemList(BlockItemListContext ctx) {
             stmtSeq.children.add(visit(blockItem));
         }
 
-        System.out.println(stmtSeq.children);
+        // System.out.println(stmtSeq.children);
 
         return stmtSeq;
     }
diff --git a/org.lflang/src/org/lflang/sim/Event.java b/org.lflang/src/org/lflang/sim/Event.java
index ff96b4d3c2..7e2cee20da 100644
--- a/org.lflang/src/org/lflang/sim/Event.java
+++ b/org.lflang/src/org/lflang/sim/Event.java
@@ -37,4 +37,9 @@ public boolean equals(Object o) {
         }
         return false;
     }
+
+    @Override
+    public String toString() {
+        return "(" + trigger.getFullName() + ", " + tag + ")";
+    }
 }
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/sim/StateSpaceExplorer.java b/org.lflang/src/org/lflang/sim/StateSpaceExplorer.java
index 623a2c40a1..58d6363de8 100644
--- a/org.lflang/src/org/lflang/sim/StateSpaceExplorer.java
+++ b/org.lflang/src/org/lflang/sim/StateSpaceExplorer.java
@@ -100,7 +100,7 @@ public void explore(Tag horizon, boolean findLoop) {
         // FIXME: It seems that we need to handle shutdown triggers 
         // separately, because they could break the back loop.
         addInitialEvents(this.main);
-        System.out.println(this.eventQ);
+        // System.out.println(this.eventQ);
         
         Tag             previousTag = null; // Tag in the previous loop ITERATION
         Tag             currentTag  = null;  // Tag in the current  loop ITERATION
@@ -126,7 +126,7 @@ public void explore(Tag horizon, boolean findLoop) {
                 currentEvents.add(e);
                 // System.out.println("Adding event to currentEvents: " + e);
             }
-            System.out.println(currentEvents);
+            // System.out.println(currentEvents);
 
             // Collect all the reactions invoked in this current LOOP ITERATION
             // triggered by the earliest events.
@@ -230,11 +230,14 @@ else if (effect instanceof ActionInstance) {
                 // If findLoop is true, check for loops.
                 // FIXME: For some reason, the below doesn't work.
                 // if (findLoop && diagram.hasNode(node)) {
+                //
+                // The current implementation does not scale!
+                // Perhaps there exists a faster implementation
+                // using hashmaps.
                 if (findLoop) {
                     for (StateSpaceNode n : diagram.nodes()) {
                         if (n.equals(node)) {
                             loopFound = true;
-                            System.out.println("*** A loop is found!");
                             // Mark the loop in the diagram.
                             this.diagram.loopNode = n;
                             this.diagram.tail = currentNode;
@@ -248,8 +251,6 @@ else if (effect instanceof ActionInstance) {
 
                 // Add the new node to the state space diagram.
                 this.diagram.addNode(node);
-                System.out.println("Adding a new node to the diagram.");
-                node.display();
                 
                 // If the head is not empty, add an edge from the previous state
                 // to the next state. Otherwise initialize the head to the new node.
diff --git a/org.lflang/src/org/lflang/sim/StateSpaceNode.java b/org.lflang/src/org/lflang/sim/StateSpaceNode.java
index d33fd99e41..11cfa9e109 100644
--- a/org.lflang/src/org/lflang/sim/StateSpaceNode.java
+++ b/org.lflang/src/org/lflang/sim/StateSpaceNode.java
@@ -12,7 +12,7 @@
 
 public class StateSpaceNode {
 
-    public int index;
+    public int index; // Set in StateSpaceDiagram.java
     public Tag tag;
     public ArrayList<ReactionInstance> reactionsInvoked;
     public ArrayList<Event> eventQ;
@@ -27,6 +27,25 @@ public StateSpaceNode(
         this.reactionsInvoked = reactionsInvoked;
     }
 
+    /**
+     * Assuming both eventQs have the same length,
+     * for each pair of events in eventQ1 and eventQ2,
+     * check if the time distances between the node's tag
+     * and the two events' tags are equal.
+     */
+    private boolean equidistant(StateSpaceNode n1,
+                                StateSpaceNode n2) {
+        if (n1.eventQ.size() != n2.eventQ.size())
+            return false;
+        for (int i = 0; i < n1.eventQ.size(); i++) {
+            if (n1.eventQ.get(i).tag.timestamp - n1.tag.timestamp
+                != n2.eventQ.get(i).tag.timestamp - n2.tag.timestamp) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     /**
      * This equals method does NOT compare tags,
      * only compares reactionsInvoked and eventQ.
@@ -37,7 +56,8 @@ public boolean equals(Object o) {
         if (o instanceof StateSpaceNode) {
             StateSpaceNode node = (StateSpaceNode) o;
             if (this.reactionsInvoked.equals(node.reactionsInvoked)
-                && this.eventQ.equals(node.eventQ))
+                && this.eventQ.equals(node.eventQ)
+                && equidistant(this, node))
                 return true;
         }
         return false;
@@ -47,4 +67,7 @@ public void display() {
         System.out.println("(" + tag + ", " + reactionsInvoked + ", " + eventQ + ")");
     }
     
+    public String toString() {
+        return "(" + tag + ", " + reactionsInvoked + ", " + eventQ + ")";
+    }
 }
\ No newline at end of file

From 942321293c0e4664002e061f780ec03240d69420 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 14 Dec 2022 08:30:27 -0800
Subject: [PATCH 0067/1114] Refactor uclid, C ast, and state space into an
 analyses package.

---
 .../cast}/AbstractAstVisitor.java             |  2 +-
 .../ast => analyses/cast}/AstVisitor.java     |  2 +-
 .../cast}/BuildAstParseTreeVisitor.java       |  2 +-
 .../uclid/ast => analyses/cast}/CAst.java     |  2 +-
 .../ast => analyses/cast}/CAstUtils.java      |  2 +-
 .../ast => analyses/cast}/CAstVisitor.java    |  2 +-
 .../cast}/CBaseAstVisitor.java                |  2 +-
 .../cast}/CToUclidVisitor.java                |  8 +++---
 .../cast}/IfNormalFormAstVisitor.java         |  2 +-
 .../cast}/VariablePrecedenceVisitor.java      |  4 +--
 .../ast => analyses/cast}/Visitable.java      |  2 +-
 .../{sim => analyses/statespace}/Event.java   |  2 +-
 .../statespace}/StateInfo.java                |  4 +--
 .../statespace}/StateSpaceDiagram.java        |  2 +-
 .../statespace}/StateSpaceExplorer.java       |  5 ++--
 .../statespace}/StateSpaceNode.java           |  2 +-
 .../{sim => analyses/statespace}/Tag.java     |  2 +-
 .../uclid/MTLVisitor.java                     |  2 +-
 .../uclid/UclidGenerator.java                 | 26 +++++++++----------
 .../uclid/UclidRunner.java                    |  5 ++--
 .../src/org/lflang/generator/LFGenerator.java |  4 +--
 21 files changed, 41 insertions(+), 43 deletions(-)
 rename org.lflang/src/org/lflang/{generator/uclid/ast => analyses/cast}/AbstractAstVisitor.java (90%)
 rename org.lflang/src/org/lflang/{generator/uclid/ast => analyses/cast}/AstVisitor.java (94%)
 rename org.lflang/src/org/lflang/{generator/uclid/ast => analyses/cast}/BuildAstParseTreeVisitor.java (99%)
 rename org.lflang/src/org/lflang/{generator/uclid/ast => analyses/cast}/CAst.java (99%)
 rename org.lflang/src/org/lflang/{generator/uclid/ast => analyses/cast}/CAstUtils.java (97%)
 rename org.lflang/src/org/lflang/{generator/uclid/ast => analyses/cast}/CAstVisitor.java (98%)
 rename org.lflang/src/org/lflang/{generator/uclid/ast => analyses/cast}/CBaseAstVisitor.java (99%)
 rename org.lflang/src/org/lflang/{generator/uclid/ast => analyses/cast}/CToUclidVisitor.java (98%)
 rename org.lflang/src/org/lflang/{generator/uclid/ast => analyses/cast}/IfNormalFormAstVisitor.java (98%)
 rename org.lflang/src/org/lflang/{generator/uclid/ast => analyses/cast}/VariablePrecedenceVisitor.java (94%)
 rename org.lflang/src/org/lflang/{generator/uclid/ast => analyses/cast}/Visitable.java (89%)
 rename org.lflang/src/org/lflang/{sim => analyses/statespace}/Event.java (96%)
 rename org.lflang/src/org/lflang/{generator/uclid => analyses/statespace}/StateInfo.java (92%)
 rename org.lflang/src/org/lflang/{sim => analyses/statespace}/StateSpaceDiagram.java (98%)
 rename org.lflang/src/org/lflang/{sim => analyses/statespace}/StateSpaceExplorer.java (98%)
 rename org.lflang/src/org/lflang/{sim => analyses/statespace}/StateSpaceNode.java (98%)
 rename org.lflang/src/org/lflang/{sim => analyses/statespace}/Tag.java (97%)
 rename org.lflang/src/org/lflang/{generator => analyses}/uclid/MTLVisitor.java (99%)
 rename org.lflang/src/org/lflang/{generator => analyses}/uclid/UclidGenerator.java (99%)
 rename org.lflang/src/org/lflang/{generator => analyses}/uclid/UclidRunner.java (97%)

diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/AbstractAstVisitor.java b/org.lflang/src/org/lflang/analyses/cast/AbstractAstVisitor.java
similarity index 90%
rename from org.lflang/src/org/lflang/generator/uclid/ast/AbstractAstVisitor.java
rename to org.lflang/src/org/lflang/analyses/cast/AbstractAstVisitor.java
index a31a61b199..c3483e2d3e 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/AbstractAstVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/AbstractAstVisitor.java
@@ -1,4 +1,4 @@
-package org.lflang.generator.uclid.ast;
+package org.lflang.analyses.cast;
 
 import java.util.List;
 
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/AstVisitor.java b/org.lflang/src/org/lflang/analyses/cast/AstVisitor.java
similarity index 94%
rename from org.lflang/src/org/lflang/generator/uclid/ast/AstVisitor.java
rename to org.lflang/src/org/lflang/analyses/cast/AstVisitor.java
index bc6910a670..47861e303b 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/AstVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/AstVisitor.java
@@ -1,4 +1,4 @@
-package org.lflang.generator.uclid.ast;
+package org.lflang.analyses.cast;
 
 import java.util.List;
 
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/BuildAstParseTreeVisitor.java b/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
similarity index 99%
rename from org.lflang/src/org/lflang/generator/uclid/ast/BuildAstParseTreeVisitor.java
rename to org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
index 18fc25e2f4..af3f02d26c 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/BuildAstParseTreeVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
@@ -1,4 +1,4 @@
-package org.lflang.generator.uclid.ast;
+package org.lflang.analyses.cast;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CAst.java b/org.lflang/src/org/lflang/analyses/cast/CAst.java
similarity index 99%
rename from org.lflang/src/org/lflang/generator/uclid/ast/CAst.java
rename to org.lflang/src/org/lflang/analyses/cast/CAst.java
index 56526901e3..1da9b3994a 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/CAst.java
+++ b/org.lflang/src/org/lflang/analyses/cast/CAst.java
@@ -1,4 +1,4 @@
-package org.lflang.generator.uclid.ast;
+package org.lflang.analyses.cast;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CAstUtils.java b/org.lflang/src/org/lflang/analyses/cast/CAstUtils.java
similarity index 97%
rename from org.lflang/src/org/lflang/generator/uclid/ast/CAstUtils.java
rename to org.lflang/src/org/lflang/analyses/cast/CAstUtils.java
index ac40caed23..36b749e397 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/CAstUtils.java
+++ b/org.lflang/src/org/lflang/analyses/cast/CAstUtils.java
@@ -1,4 +1,4 @@
-package org.lflang.generator.uclid.ast;
+package org.lflang.analyses.cast;
 
 import java.util.List;
 
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CAstVisitor.java b/org.lflang/src/org/lflang/analyses/cast/CAstVisitor.java
similarity index 98%
rename from org.lflang/src/org/lflang/generator/uclid/ast/CAstVisitor.java
rename to org.lflang/src/org/lflang/analyses/cast/CAstVisitor.java
index f6efbb7946..1fadea44d5 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/CAstVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/CAstVisitor.java
@@ -1,4 +1,4 @@
-package org.lflang.generator.uclid.ast;
+package org.lflang.analyses.cast;
 
 import java.util.List;
 
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CBaseAstVisitor.java b/org.lflang/src/org/lflang/analyses/cast/CBaseAstVisitor.java
similarity index 99%
rename from org.lflang/src/org/lflang/generator/uclid/ast/CBaseAstVisitor.java
rename to org.lflang/src/org/lflang/analyses/cast/CBaseAstVisitor.java
index 210bf06537..5273a0bc0d 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/CBaseAstVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/CBaseAstVisitor.java
@@ -1,4 +1,4 @@
-package org.lflang.generator.uclid.ast;
+package org.lflang.analyses.cast;
 
 import java.util.List;
 
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java b/org.lflang/src/org/lflang/analyses/cast/CToUclidVisitor.java
similarity index 98%
rename from org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
rename to org.lflang/src/org/lflang/analyses/cast/CToUclidVisitor.java
index b0bb4e9230..88d73b3278 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/CToUclidVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/CToUclidVisitor.java
@@ -1,10 +1,8 @@
-package org.lflang.generator.uclid.ast;
+package org.lflang.analyses.cast;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.swing.Action;
-
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.NamedInstance;
 import org.lflang.generator.PortInstance;
@@ -12,8 +10,8 @@
 import org.lflang.generator.ReactorInstance;
 import org.lflang.generator.StateVariableInstance;
 import org.lflang.generator.TriggerInstance;
-import org.lflang.generator.uclid.UclidGenerator;
-import org.lflang.generator.uclid.ast.CAst.*;
+import org.lflang.analyses.uclid.UclidGenerator;
+import org.lflang.analyses.cast.CAst.*;
 
 public class CToUclidVisitor extends CBaseAstVisitor<String> {
 
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/IfNormalFormAstVisitor.java b/org.lflang/src/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
similarity index 98%
rename from org.lflang/src/org/lflang/generator/uclid/ast/IfNormalFormAstVisitor.java
rename to org.lflang/src/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
index 18bfe0313d..bde7337565 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/IfNormalFormAstVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
@@ -1,4 +1,4 @@
-package org.lflang.generator.uclid.ast;
+package org.lflang.analyses.cast;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/VariablePrecedenceVisitor.java b/org.lflang/src/org/lflang/analyses/cast/VariablePrecedenceVisitor.java
similarity index 94%
rename from org.lflang/src/org/lflang/generator/uclid/ast/VariablePrecedenceVisitor.java
rename to org.lflang/src/org/lflang/analyses/cast/VariablePrecedenceVisitor.java
index 104a871d78..bada1be519 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/VariablePrecedenceVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/VariablePrecedenceVisitor.java
@@ -1,9 +1,9 @@
-package org.lflang.generator.uclid.ast;
+package org.lflang.analyses.cast;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.lflang.generator.uclid.ast.CAst.*;
+import org.lflang.analyses.cast.CAst.*;
 
 /**
  * This visitor marks certain variable node as "previous."
diff --git a/org.lflang/src/org/lflang/generator/uclid/ast/Visitable.java b/org.lflang/src/org/lflang/analyses/cast/Visitable.java
similarity index 89%
rename from org.lflang/src/org/lflang/generator/uclid/ast/Visitable.java
rename to org.lflang/src/org/lflang/analyses/cast/Visitable.java
index c7735057e0..835894f06b 100644
--- a/org.lflang/src/org/lflang/generator/uclid/ast/Visitable.java
+++ b/org.lflang/src/org/lflang/analyses/cast/Visitable.java
@@ -1,4 +1,4 @@
-package org.lflang.generator.uclid.ast;
+package org.lflang.analyses.cast;
 
 import java.util.List;
 
diff --git a/org.lflang/src/org/lflang/sim/Event.java b/org.lflang/src/org/lflang/analyses/statespace/Event.java
similarity index 96%
rename from org.lflang/src/org/lflang/sim/Event.java
rename to org.lflang/src/org/lflang/analyses/statespace/Event.java
index 7e2cee20da..0ef60fad49 100644
--- a/org.lflang/src/org/lflang/sim/Event.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/Event.java
@@ -4,7 +4,7 @@
  * 
  * @author{Shaokai Lin <shaokai@berkeley.edu>}
  */
-package org.lflang.sim;
+package org.lflang.analyses.statespace;
 
 import org.lflang.generator.TriggerInstance;
 
diff --git a/org.lflang/src/org/lflang/generator/uclid/StateInfo.java b/org.lflang/src/org/lflang/analyses/statespace/StateInfo.java
similarity index 92%
rename from org.lflang/src/org/lflang/generator/uclid/StateInfo.java
rename to org.lflang/src/org/lflang/analyses/statespace/StateInfo.java
index 0f2f4f3008..badbf25355 100644
--- a/org.lflang/src/org/lflang/generator/uclid/StateInfo.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateInfo.java
@@ -4,13 +4,11 @@
  * 
  * @author{Shaokai Lin <shaokai@berkeley.edu>}
  */
-package org.lflang.generator.uclid;
+package org.lflang.analyses.statespace;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.lflang.sim.Tag;
-
 public class StateInfo {
 
     public ArrayList<String>        reactions   = new ArrayList<>();
diff --git a/org.lflang/src/org/lflang/sim/StateSpaceDiagram.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
similarity index 98%
rename from org.lflang/src/org/lflang/sim/StateSpaceDiagram.java
rename to org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
index 10bcccb505..d1fc5bc0be 100644
--- a/org.lflang/src/org/lflang/sim/StateSpaceDiagram.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
@@ -3,7 +3,7 @@
  * 
  * @author{Shaokai Lin <shaokai@berkeley.edu>}
  */
-package org.lflang.sim;
+package org.lflang.analyses.statespace;
 
 import java.util.Set;
 
diff --git a/org.lflang/src/org/lflang/sim/StateSpaceExplorer.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
similarity index 98%
rename from org.lflang/src/org/lflang/sim/StateSpaceExplorer.java
rename to org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
index 58d6363de8..c48a9a6fbc 100644
--- a/org.lflang/src/org/lflang/sim/StateSpaceExplorer.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
@@ -1,7 +1,7 @@
 /**
  * Explores the state space of an LF program.
  */
-package org.lflang.sim;
+package org.lflang.analyses.statespace;
 
 import java.util.ArrayList;
 import java.util.PriorityQueue;
@@ -9,7 +9,8 @@
 
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
-
+import org.lflang.analyses.statespace.Event;
+import org.lflang.analyses.statespace.Tag;
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.PortInstance;
 import org.lflang.generator.ReactionInstance;
diff --git a/org.lflang/src/org/lflang/sim/StateSpaceNode.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
similarity index 98%
rename from org.lflang/src/org/lflang/sim/StateSpaceNode.java
rename to org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
index 11cfa9e109..5dcaaa011e 100644
--- a/org.lflang/src/org/lflang/sim/StateSpaceNode.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
@@ -4,7 +4,7 @@
  * 
  * @author{Shaokai Lin <shaokai@berkeley.edu>}
  */
-package org.lflang.sim;
+package org.lflang.analyses.statespace;
 
 import java.util.ArrayList;
 
diff --git a/org.lflang/src/org/lflang/sim/Tag.java b/org.lflang/src/org/lflang/analyses/statespace/Tag.java
similarity index 97%
rename from org.lflang/src/org/lflang/sim/Tag.java
rename to org.lflang/src/org/lflang/analyses/statespace/Tag.java
index 648acc9b70..dcf3103903 100644
--- a/org.lflang/src/org/lflang/sim/Tag.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/Tag.java
@@ -5,7 +5,7 @@
  * 
  * @author{Shaokai Lin <shaokai@berkeley.edu>}
  */
-package org.lflang.sim;
+package org.lflang.analyses.statespace;
 
 public class Tag implements Comparable<Tag> {
 
diff --git a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
similarity index 99%
rename from org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
rename to org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
index e10cf6eec6..43c546a097 100644
--- a/org.lflang/src/org/lflang/generator/uclid/MTLVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
@@ -27,7 +27,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * 
  * @author{Shaokai Lin <shaokai@berkeley.edu>}
  */
-package org.lflang.generator.uclid;
+package org.lflang.analyses.uclid;
 
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
similarity index 99%
rename from org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
rename to org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
index 33faf9487e..6d0692cae5 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
@@ -27,7 +27,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * 
  * @author{Shaokai Lin <shaokai@berkeley.edu>}
  */
-package org.lflang.generator.uclid;
+package org.lflang.analyses.uclid;
 
 import java.io.File;
 import java.io.IOException;
@@ -58,6 +58,18 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.Target;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
+import org.lflang.analyses.cast.BuildAstParseTreeVisitor;
+import org.lflang.analyses.cast.CAst;
+import org.lflang.analyses.cast.CAstUtils;
+import org.lflang.analyses.cast.CBaseAstVisitor;
+import org.lflang.analyses.cast.CToUclidVisitor;
+import org.lflang.analyses.cast.IfNormalFormAstVisitor;
+import org.lflang.analyses.cast.VariablePrecedenceVisitor;
+import org.lflang.analyses.statespace.Event;
+import org.lflang.analyses.statespace.StateSpaceDiagram;
+import org.lflang.analyses.statespace.StateSpaceExplorer;
+import org.lflang.analyses.statespace.StateSpaceNode;
+import org.lflang.analyses.statespace.Tag;
 import org.lflang.dsl.CLexer;
 import org.lflang.dsl.CParser;
 import org.lflang.dsl.MTLLexer;
@@ -81,13 +93,6 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.generator.TimerInstance;
 import org.lflang.generator.TriggerInstance;
 import org.lflang.generator.c.CGenerator;
-import org.lflang.generator.uclid.ast.BuildAstParseTreeVisitor;
-import org.lflang.generator.uclid.ast.CAst;
-import org.lflang.generator.uclid.ast.CAstUtils;
-import org.lflang.generator.uclid.ast.CBaseAstVisitor;
-import org.lflang.generator.uclid.ast.CToUclidVisitor;
-import org.lflang.generator.uclid.ast.IfNormalFormAstVisitor;
-import org.lflang.generator.uclid.ast.VariablePrecedenceVisitor;
 import org.lflang.lf.Action;
 import org.lflang.lf.Attribute;
 import org.lflang.lf.Code;
@@ -96,11 +101,6 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.lf.Reaction;
 import org.lflang.lf.Time;
 import org.lflang.lf.VarRef;
-import org.lflang.sim.Event;
-import org.lflang.sim.StateSpaceDiagram;
-import org.lflang.sim.StateSpaceExplorer;
-import org.lflang.sim.StateSpaceNode;
-import org.lflang.sim.Tag;
 import org.lflang.util.StringUtil;
 
 import static org.lflang.ASTUtils.*;
diff --git a/org.lflang/src/org/lflang/generator/uclid/UclidRunner.java b/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
similarity index 97%
rename from org.lflang/src/org/lflang/generator/uclid/UclidRunner.java
rename to org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
index 99dd20baa7..f3646245e0 100644
--- a/org.lflang/src/org/lflang/generator/uclid/UclidRunner.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
@@ -3,7 +3,7 @@
  * 
  * @author{Shaokai Lin <shaokai@berkeley.edu>}
  */
-package org.lflang.generator.uclid;
+package org.lflang.analyses.uclid;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -25,8 +25,9 @@
 
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
+import org.lflang.analyses.statespace.StateInfo;
+import org.lflang.analyses.statespace.Tag;
 import org.lflang.generator.GeneratorCommandFactory;
-import org.lflang.sim.Tag;
 import org.lflang.util.LFCommand;
 
 public class UclidRunner {
diff --git a/org.lflang/src/org/lflang/generator/LFGenerator.java b/org.lflang/src/org/lflang/generator/LFGenerator.java
index 8be0731a62..0c17297173 100644
--- a/org.lflang/src/org/lflang/generator/LFGenerator.java
+++ b/org.lflang/src/org/lflang/generator/LFGenerator.java
@@ -20,10 +20,10 @@
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.Target;
+import org.lflang.analyses.uclid.UclidGenerator;
+import org.lflang.analyses.uclid.UclidRunner;
 import org.lflang.generator.c.CGenerator;
 import org.lflang.generator.python.PythonGenerator;
-import org.lflang.generator.uclid.UclidGenerator;
-import org.lflang.generator.uclid.UclidRunner;
 import org.lflang.lf.Attribute;
 import org.lflang.lf.Reactor;
 import org.lflang.scoping.LFGlobalScopeProvider;

From 72eb050c1516660f30d7807459e9516b0cf50f56 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 15 Dec 2022 14:53:27 -0800
Subject: [PATCH 0068/1114] Make loop detection more efficient

---
 .../org/lflang/analyses/statespace/Event.java |  4 +
 .../statespace/StateSpaceDiagram.java         |  2 +
 .../statespace/StateSpaceExplorer.java        | 83 ++++++++++---------
 .../analyses/statespace/StateSpaceNode.java   | 47 +++++++++--
 .../lflang/analyses/uclid/UclidGenerator.java | 26 +++---
 5 files changed, 107 insertions(+), 55 deletions(-)

diff --git a/org.lflang/src/org/lflang/analyses/statespace/Event.java b/org.lflang/src/org/lflang/analyses/statespace/Event.java
index 0ef60fad49..ef0f004e4f 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/Event.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/Event.java
@@ -17,6 +17,10 @@ public Event(TriggerInstance trigger, Tag tag) {
         this.trigger = trigger;
         this.tag = tag;
     }
+
+    public TriggerInstance getTrigger() {
+        return this.trigger;
+    }
     
     @Override
     public int compareTo(Event e) {
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
index d1fc5bc0be..9fd0c1e8b9 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
@@ -67,6 +67,8 @@ public void display() {
             }
             else break;
         }
+        if (this.loopNode != null)
+            System.out.println("* Loop node: state " + this.loopNode.index);
         System.out.println("*************************************************");
     }
 
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
index c48a9a6fbc..0a87b6bece 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
@@ -3,7 +3,10 @@
  */
 package org.lflang.analyses.statespace;
 
+import java.lang.Integer;
+
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.PriorityQueue;
 import java.util.Set;
 
@@ -103,9 +106,11 @@ public void explore(Tag horizon, boolean findLoop) {
         addInitialEvents(this.main);
         // System.out.println(this.eventQ);
         
-        Tag             previousTag = null; // Tag in the previous loop ITERATION
-        Tag             currentTag  = null;  // Tag in the current  loop ITERATION
-        StateSpaceNode  currentNode = null;
+        Tag             previousTag  = null; // Tag in the previous loop ITERATION
+        Tag             currentTag   = null;  // Tag in the current  loop ITERATION
+        StateSpaceNode  currentNode  = null;
+        StateSpaceNode  previousNode = null;
+        HashMap<Integer,StateSpaceNode> uniqueNodes = new HashMap<>();
         boolean         stop         = true;
         if (this.eventQ.size() > 0) {
             stop = false;
@@ -214,6 +219,42 @@ else if (effect instanceof ActionInstance) {
                 previousTag == null // The first iteration
                 || currentTag.compareTo(previousTag) > 0
             ) {
+                if (previousTag != null) {
+                    // Whenever we finish a tag, check for loops fist.
+                    // If currentNode matches an existing node in uniqueNodes,
+                    // duplicate is set to the existing node.
+                    StateSpaceNode duplicate;
+                    if (findLoop &&
+                        (duplicate = uniqueNodes.put(
+                            currentNode.hashCode(), currentNode)) != null) {
+
+                        // Mark the loop in the diagram.
+                        loopFound = true;
+                        this.diagram.loopNode = duplicate;
+                        this.diagram.tail = previousNode;
+                        this.diagram.loopPeriod = this.diagram.tail.tag.timestamp
+                                                    - this.diagram.loopNode.tag.timestamp;
+                        this.diagram.addEdge(this.diagram.loopNode, this.diagram.tail);
+                        System.out.println("LoopNode index " + this.diagram.loopNode.index); // Why is this 5?
+                        return; // Exit the while loop early.
+                    }
+
+                    // Now we are at a new tag, and a loop is not found,
+                    // add the node to the state space diagram.
+                    this.diagram.addNode(currentNode);
+                    
+                    // If the head is not empty, add an edge from the previous state
+                    // to the next state. Otherwise initialize the head to the new node.
+                    if (this.diagram.head != null && currentNode != null) {
+                        // System.out.println("--- Add a new edge between " + currentNode + " and " + node);
+                        this.diagram.addEdge(currentNode, previousNode); // Sink first, then source
+                    }
+                    else
+                        this.diagram.head = currentNode; // Initialize the head.
+                }
+
+                //// Now we are done with the node at the previous tag,
+                //// work on the new node at the current timestamp.
                 // Copy the reactions in reactionsTemp.
                 reactionsInvoked = new ArrayList<ReactionInstance>(reactionsTemp);
 
@@ -227,41 +268,9 @@ else if (effect instanceof ActionInstance) {
                     reactionsInvoked,              // Reactions invoked at this tag
                     new ArrayList<Event>(eventQ)    // A snapshot of the event queue
                 );
-
-                // If findLoop is true, check for loops.
-                // FIXME: For some reason, the below doesn't work.
-                // if (findLoop && diagram.hasNode(node)) {
-                //
-                // The current implementation does not scale!
-                // Perhaps there exists a faster implementation
-                // using hashmaps.
-                if (findLoop) {
-                    for (StateSpaceNode n : diagram.nodes()) {
-                        if (n.equals(node)) {
-                            loopFound = true;
-                            // Mark the loop in the diagram.
-                            this.diagram.loopNode = n;
-                            this.diagram.tail = currentNode;
-                            this.diagram.loopPeriod = currentTag.timestamp
-                                                        - this.diagram.loopNode.tag.timestamp;
-                            this.diagram.addEdge(this.diagram.loopNode, this.diagram.tail);
-                            return; // Exit the while loop early.
-                        }
-                    }
-                } 
-
-                // Add the new node to the state space diagram.
-                this.diagram.addNode(node);
-                
-                // If the head is not empty, add an edge from the previous state
-                // to the next state. Otherwise initialize the head to the new node.
-                if (this.diagram.head != null && currentNode != null) {
-                    // System.out.println("--- Add a new edge between " + currentNode + " and " + node);
-                    this.diagram.addEdge(node, currentNode); // Sink first, then source
-                }
-                else
-                    this.diagram.head = node; // Initialize the head.
                 
+                // Update the previous node.
+                previousNode = currentNode;
                 // Update the current node.
                 currentNode = node;
             }
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
index 5dcaaa011e..2ac3ef1533 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
@@ -7,8 +7,11 @@
 package org.lflang.analyses.statespace;
 
 import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import org.lflang.generator.ReactionInstance;
+import org.lflang.generator.TriggerInstance;
 
 public class StateSpaceNode {
 
@@ -46,9 +49,20 @@ private boolean equidistant(StateSpaceNode n1,
         return true;
     }
 
+    /**
+     * Two methods for pretty printing
+     */
+    public void display() {
+        System.out.println("(" + tag + ", " + reactionsInvoked + ", " + eventQ + ")");
+    }
+    public String toString() {
+        return "(" + tag + ", " + reactionsInvoked + ", " + eventQ + ")";
+    }
+
     /**
      * This equals method does NOT compare tags,
-     * only compares reactionsInvoked and eventQ.
+     * only compares reactionsInvoked, eventQ,
+     * and whether future events are equally distant.
      */
     @Override
     public boolean equals(Object o) {
@@ -63,11 +77,30 @@ && equidistant(this, node))
         return false;
     }
 
-    public void display() {
-        System.out.println("(" + tag + ", " + reactionsInvoked + ", " + eventQ + ")");
-    }
-    
-    public String toString() {
-        return "(" + tag + ", " + reactionsInvoked + ", " + eventQ + ")";
+    /**
+     * Generate hash code for the node.
+     */
+    @Override
+    public int hashCode() {
+        // Initial value
+        int result = 17;
+
+        // Generate hash for the reactions invoked.
+        result = 31 * result + reactionsInvoked.hashCode();
+
+        // Generate hash for the triggers in the queued events.
+        List<String> eventNames = this.eventQ.stream()
+                                    .map(Event::getTrigger)
+                                    .map(TriggerInstance::getFullName)
+                                    .collect(Collectors.toList());
+        result = 31 * result + eventNames.hashCode();
+
+        // Generate hash for the time differences.
+        List<Long> timeDiff = this.eventQ.stream().map(e -> {
+            return e.tag.timestamp - this.tag.timestamp;
+        }).collect(Collectors.toList());
+        result = 31 * result + timeDiff.hashCode();
+
+        return result;
     }
 }
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
index 6d0692cae5..8ba5605a33 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
@@ -165,6 +165,7 @@ public class UclidGenerator extends GeneratorBase {
     protected long                      horizon             = 0; // in nanoseconds
     protected String                    FOLSpec             = "";
     protected int                       CT                  = 0;
+    protected static final int          CT_MAX_SUPPORTED    = 20;
 
     // Constructor
     public UclidGenerator(FileConfig fileConfig, ErrorReporter errorReporter, List<Attribute> properties) {
@@ -184,7 +185,6 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         super.printInfo(context.getMode());
         ASTUtils.setMainName(fileConfig.resource, fileConfig.name);
         // FIXME: Perform an analysis on the property and remove unrelevant components.
-        // FIXME: Support multiple properties here too. We might need to have a UclidGenerator for each attribute.
         super.createMainInstantiation();
         
         ////////////////////////////////////////
@@ -198,7 +198,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         populateDataStructures();
 
         // Create the src-gen directory
-        setUpDirectories();
+        setupDirectories();
 
         // Generate a Uclid model for each property.
         for (Attribute prop : this.properties) {
@@ -222,12 +222,17 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
                             .getValue());
 
             processMTLSpec();
+            
             computeCT();
+            if (this.CT > CT_MAX_SUPPORTED) {
+                System.out.println("ERROR: The maximum steps supported is " + CT_MAX_SUPPORTED
+                    + " but checking this property requires " + this.CT + " steps. "
+                    + "This property will NOT be checked.");
+                continue;
+            }
+
             generateUclidFile();
         }
-
-        // Generate runner script
-        // generateRunnerScript();
     }
 
     ////////////////////////////////////////////////////////////
@@ -1339,7 +1344,7 @@ private void createMainReactorInstance() {
         }
     }
 
-    private void setUpDirectories() {
+    private void setupDirectories() {
         // Make sure the target directory exists.
         Path modelGenDir = this.fileConfig.getModelGenPath();
         this.outputDir = Paths.get(modelGenDir.toString());
@@ -1433,7 +1438,6 @@ private void computeCT() {
                     this.CT += node.reactionsInvoked.size();
                 }
             }
-            System.out.println("*** A loop is NOT found.");
             System.out.println("CT: " + this.CT);
         } 
         // Over-approximate CT by estimating the number of loop iterations required.
@@ -1476,7 +1480,6 @@ private void computeCT() {
                 this.CT = numReactionInvocationsBeforeLoop
                     + numReactionInvocationsInsideLoop * loopIterations;
             }
-            System.out.println("*** A loop is found!");
             System.out.println("CT: " + this.CT);
         }
     }
@@ -1501,9 +1504,10 @@ private void processMTLSpec() {
      * FIXME: Check if there are multiple downstream nodes.
      */
     private StateSpaceNode getDownstreamNode(StateSpaceDiagram diagram, StateSpaceNode node) {
-        Set<StateSpaceNode> downstreamNodes = diagram.getDownstreamAdjacentNodes(node);
-        Iterator<StateSpaceNode> iterator = downstreamNodes.iterator();
-        return iterator.next();
+        Set<StateSpaceNode> downstream = diagram.getDownstreamAdjacentNodes(node);
+        if (downstream == null || downstream.size() == 0)
+            System.out.println("There are no downstream nodes!");
+        return (StateSpaceNode)downstream.toArray()[0];
     }
 
     /////////////////////////////////////////////////

From 65560abae56eb633b258e36eb5cf9914d5284ada Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 15 Dec 2022 23:30:57 -0800
Subject: [PATCH 0069/1114] Fix loop period, generate dot file from state space
 diagram.

---
 .../statespace/StateSpaceDiagram.java         | 98 ++++++++++++++++---
 .../statespace/StateSpaceExplorer.java        |  6 +-
 .../lflang/analyses/uclid/UclidGenerator.java | 30 +++---
 3 files changed, 107 insertions(+), 27 deletions(-)

diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
index 9fd0c1e8b9..958231844b 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
@@ -7,6 +7,7 @@
 
 import java.util.Set;
 
+import org.lflang.generator.CodeBuilder;
 import org.lflang.graph.DirectedGraph;
 
 // FIXME: Use a linkedlist instead.
@@ -28,26 +29,42 @@ public class StateSpaceDiagram extends DirectedGraph<StateSpaceNode> {
      */
     public StateSpaceNode loopNode;
 
+    /**
+     * Store the state when the loop node is reached for
+     * the 2nd time. This is used to calculate the elapsed
+     * logical time on the back loop edge.
+     */
+    public StateSpaceNode loopNodeNext;
+
     /**
      * The logical time elapsed for each loop iteration.
      */
     public long loopPeriod;
 
     /**
-     * The length of the state space diagram (not counting the loop)
+     * A dot file that represents the diagram
      */
-    public int length;
+    private CodeBuilder dot;
 
     /**
      * Before adding the node, assign it an index.
      */
     @Override
     public void addNode(StateSpaceNode node) {
-        node.index = this.length;
-        this.length++;
+        node.index = this.nodeCount();
         super.addNode(node);
     }
 
+    /**
+     * Get the immediately downstream node.
+     */
+    public StateSpaceNode getDownstreamNode(StateSpaceNode node) {
+        Set<StateSpaceNode> downstream = this.getDownstreamAdjacentNodes(node);
+        if (downstream == null || downstream.size() == 0)
+            return null;
+        return (StateSpaceNode)downstream.toArray()[0];
+    }
+
     /**
      * Pretty print the diagram.
      */
@@ -55,21 +72,80 @@ public void display() {
         System.out.println("*************************************************");
         System.out.println("* Pretty printing worst-case state space diagram:");
         StateSpaceNode node = this.head;
+        long timestamp;
+        long microstep;
         while (node != null) {
-            System.out.print("* ");
-            System.out.print("State " + node.index + ": ");
+            System.out.print("* State " + node.index + ": ");
             node.display();
+
+            // Store the tag of the prior step.
+            timestamp = node.tag.timestamp;
+            microstep = node.tag.microstep;
+
             if (!node.equals(this.tail)) {
                 // Assume a unique next state.
-                Set<StateSpaceNode> downstream = this.getDownstreamAdjacentNodes(node);
-                if (downstream == null || downstream.size() == 0) break;
-                node = (StateSpaceNode)downstream.toArray()[0];
+                node = getDownstreamNode(node);
+
+                // Compute time difference
+                if (node != null) {
+                    timestamp = node.tag.timestamp - timestamp;
+                    microstep = node.tag.microstep - microstep;
+                    System.out.println("*     => Advance time by (" + timestamp + ", " + microstep + ")");
+                }
             }
             else break;
         }
-        if (this.loopNode != null)
-            System.out.println("* Loop node: state " + this.loopNode.index);
+        if (this.loopNode != null) {
+            // Compute time difference
+            timestamp = loopNodeNext.tag.timestamp - tail.tag.timestamp;
+            microstep = loopNodeNext.tag.microstep - tail.tag.microstep;
+            System.out.println("*     => Advance time by (" + timestamp + ", " + microstep + ")");
+
+            System.out.println("* Goes back to loop node: state " + this.loopNode.index);
+            System.out.print("* Loop node reached 2nd time: ");
+            this.loopNodeNext.display();
+        }
         System.out.println("*************************************************");
     }
 
+    /**
+     * Generate a dot file from the state space diagram.
+     * 
+     * @return a CodeBuilder with the generated code
+     */
+    public CodeBuilder generateDot() {
+        if (dot == null) {
+            dot = new CodeBuilder();
+            dot.pr("digraph G {");
+            dot.indent();
+            dot.pr("rankdir=\"LR\";");
+            dot.pr("node [shape=Mrecord]");
+
+            // Generate a node for each state.
+            for (StateSpaceNode n : this.nodes()) {
+                dot.pr("S" + n.index + " [" + "label = \"" + "S" + n.index + " | " + n.tag + "\"" + "]");
+            }
+
+            StateSpaceNode current = this.head;
+            StateSpaceNode next = getDownstreamNode(this.head);
+            while (current != null && next != null && current != this.tail) {
+                long tsDiff = next.tag.timestamp - current.tag.timestamp;
+                long msDiff = next.tag.microstep - current.tag.microstep;
+                dot.pr("S" + current.index + " -> " + "S" + next.index + " [label = " + "\"" + "+(" + tsDiff + ", " + msDiff + ")" + "\"" + "]");
+                current = next;
+                next = getDownstreamNode(next);
+            }
+
+            if (loopNode != null) {
+                long tsDiff = loopNodeNext.tag.timestamp - tail.tag.timestamp;
+                long msDiff = loopNodeNext.tag.microstep - tail.tag.microstep;
+                dot.pr("S" + current.index + " -> " + "S" + next.index
+                    + " [label = " + "\"" + "+(" + tsDiff + ", " + msDiff + ")" + "\"" + " weight = 0 " + "]");
+            }
+
+            dot.unindent();
+            dot.pr("}");
+        }
+        return this.dot;
+    }
 }
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
index 0a87b6bece..da62b9842e 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
@@ -15,6 +15,7 @@
 import org.lflang.analyses.statespace.Event;
 import org.lflang.analyses.statespace.Tag;
 import org.lflang.generator.ActionInstance;
+import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.PortInstance;
 import org.lflang.generator.ReactionInstance;
 import org.lflang.generator.ReactorInstance;
@@ -231,8 +232,11 @@ else if (effect instanceof ActionInstance) {
                         // Mark the loop in the diagram.
                         loopFound = true;
                         this.diagram.loopNode = duplicate;
+                        this.diagram.loopNodeNext = currentNode;
                         this.diagram.tail = previousNode;
-                        this.diagram.loopPeriod = this.diagram.tail.tag.timestamp
+                        // Loop period is the time difference between the 1st time
+                        // the node is reached and the 2nd time the node is reached.
+                        this.diagram.loopPeriod = this.diagram.loopNodeNext.tag.timestamp
                                                     - this.diagram.loopNode.tag.timestamp;
                         this.diagram.addEdge(this.diagram.loopNode, this.diagram.tail);
                         System.out.println("LoopNode index " + this.diagram.loopNode.index); // Why is this 5?
diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
index 8ba5605a33..4ffa7290ee 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
@@ -1420,11 +1420,22 @@ private void computeCT() {
             true // findLoop
         );
         StateSpaceDiagram diagram = explorer.diagram;
-        diagram.display();  
+        diagram.display();
 
+        // Generate a dot file.
+        try {
+            CodeBuilder dot = diagram.generateDot();
+            Path file = this.outputDir.resolve(this.tactic + "_" + this.name + ".dot");
+            String filename = file.toString();
+            dot.writeToFile(filename);
+        } catch (IOException e) {
+            Exceptions.sneakyThrow(e);
+        }
+
+        //// Compute CT
         if (!explorer.loopFound) {
             if (this.logicalTimeBased)
-                this.CT = diagram.length;
+                this.CT = diagram.nodeCount();
             else {
                 // FIXME: This could be much more efficient with a linkedlist implementation.
                 StateSpaceNode node = diagram.head;
@@ -1464,14 +1475,14 @@ private void computeCT() {
                 int numReactionInvocationsBeforeLoop = 0;
                 while (node != diagram.loopNode) {
                     numReactionInvocationsBeforeLoop += node.reactionsInvoked.size();
-                    node = getDownstreamNode(diagram, node);
+                    node = diagram.getDownstreamNode(node);
                 }
                 
                 // Count the events from the loop node until
                 // loop node is reached again.
                 int numReactionInvocationsInsideLoop = 0;
                 do {
-                    node = getDownstreamNode(diagram, node);
+                    node = diagram.getDownstreamNode(node);
                     numReactionInvocationsInsideLoop += node.reactionsInvoked.size();
                 } while (node != diagram.loopNode);
 
@@ -1499,17 +1510,6 @@ private void processMTLSpec() {
         this.horizon = visitor.getHorizon();
     }
 
-    /**
-     * Get the immediately downstream node.
-     * FIXME: Check if there are multiple downstream nodes.
-     */
-    private StateSpaceNode getDownstreamNode(StateSpaceDiagram diagram, StateSpaceNode node) {
-        Set<StateSpaceNode> downstream = diagram.getDownstreamAdjacentNodes(node);
-        if (downstream == null || downstream.size() == 0)
-            System.out.println("There are no downstream nodes!");
-        return (StateSpaceNode)downstream.toArray()[0];
-    }
-
     /////////////////////////////////////////////////
     //// Functions from generatorBase
     

From 4f5e4169794cdd9e7d8dbb34e4dfb83656f04219 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sat, 17 Dec 2022 00:26:27 -0800
Subject: [PATCH 0070/1114] Update dot formatting

---
 org.lflang/src/org/lflang/TimeValue.java      | 32 ++++++++++++++
 .../statespace/StateSpaceDiagram.java         | 43 ++++++++++++-------
 .../analyses/statespace/StateSpaceNode.java   |  9 ++--
 .../org/lflang/analyses/statespace/Tag.java   |  7 ++-
 4 files changed, 72 insertions(+), 19 deletions(-)

diff --git a/org.lflang/src/org/lflang/TimeValue.java b/org.lflang/src/org/lflang/TimeValue.java
index 95d18145e1..6c93c4e1cc 100644
--- a/org.lflang/src/org/lflang/TimeValue.java
+++ b/org.lflang/src/org/lflang/TimeValue.java
@@ -25,6 +25,8 @@
 
 package org.lflang;
 
+import java.sql.Time;
+
 /**
  * Represents an amount of time (a duration).
  *
@@ -152,6 +154,36 @@ public long toNanoSeconds() {
         return makeNanosecs(time, unit);
     }
 
+    /**
+     * Return a TimeValue based on a nanosecond value.
+     */
+    public static TimeValue fromNanoSeconds(long ns) {
+        if (ns == 0) return ZERO;
+        long time;
+        if ((time = ns / 604_800_016_558_522L) > 0 && ns % 604_800_016_558_522L == 0) {
+            return new TimeValue(time, TimeUnit.WEEK);
+        }
+        if ((time = ns / 86_400_000_000_000L) > 0 && ns % 86_400_000_000_000L == 0) {
+            return new TimeValue(time, TimeUnit.DAY);
+        }
+        if ((time = ns / 3_600_000_000_000L) > 0 && ns % 3_600_000_000_000L == 0) {
+            return new TimeValue(time, TimeUnit.HOUR);
+        }
+        if ((time = ns / 60_000_000_000L) > 0 && ns % 60_000_000_000L == 0) {
+            return new TimeValue(time, TimeUnit.MINUTE);
+        }
+        if ((time = ns / 1_000_000_000) > 0 && ns % 1_000_000_000 == 0) {
+            return new TimeValue(time, TimeUnit.SECOND);
+        }
+        if ((time = ns / 1_000_000) > 0 && ns % 1_000_000 == 0) {
+            return new TimeValue(time, TimeUnit.MILLI);
+        }
+        if ((time = ns / 1000) > 0 && ns % 1000 == 0) {
+            return new TimeValue(time, TimeUnit.MICRO);
+        }
+        return new TimeValue(ns, TimeUnit.NANO);
+    }
+
     /**
      * Return a string representation of this time value.
      */
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
index 958231844b..d7c9c5b578 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
@@ -5,9 +5,14 @@
  */
 package org.lflang.analyses.statespace;
 
+import java.util.List;
 import java.util.Set;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
+import org.lflang.TimeValue;
 import org.lflang.generator.CodeBuilder;
+import org.lflang.generator.ReactionInstance;
 import org.lflang.graph.DirectedGraph;
 
 // FIXME: Use a linkedlist instead.
@@ -73,14 +78,12 @@ public void display() {
         System.out.println("* Pretty printing worst-case state space diagram:");
         StateSpaceNode node = this.head;
         long timestamp;
-        long microstep;
         while (node != null) {
             System.out.print("* State " + node.index + ": ");
             node.display();
 
             // Store the tag of the prior step.
             timestamp = node.tag.timestamp;
-            microstep = node.tag.microstep;
 
             if (!node.equals(this.tail)) {
                 // Assume a unique next state.
@@ -88,18 +91,16 @@ public void display() {
 
                 // Compute time difference
                 if (node != null) {
-                    timestamp = node.tag.timestamp - timestamp;
-                    microstep = node.tag.microstep - microstep;
-                    System.out.println("*     => Advance time by (" + timestamp + ", " + microstep + ")");
+                    TimeValue tsDiff = TimeValue.fromNanoSeconds(node.tag.timestamp - timestamp);
+                    System.out.println("*     => Advance time by " + tsDiff + " ns");
                 }
             }
             else break;
         }
         if (this.loopNode != null) {
             // Compute time difference
-            timestamp = loopNodeNext.tag.timestamp - tail.tag.timestamp;
-            microstep = loopNodeNext.tag.microstep - tail.tag.microstep;
-            System.out.println("*     => Advance time by (" + timestamp + ", " + microstep + ")");
+            TimeValue tsDiff = TimeValue.fromNanoSeconds(loopNodeNext.tag.timestamp - tail.tag.timestamp);
+            System.out.println("*     => Advance time by " + tsDiff + " ns");
 
             System.out.println("* Goes back to loop node: state " + this.loopNode.index);
             System.out.print("* Loop node reached 2nd time: ");
@@ -118,29 +119,41 @@ public CodeBuilder generateDot() {
             dot = new CodeBuilder();
             dot.pr("digraph G {");
             dot.indent();
+            if (this.loopNode != null) {
+                dot.pr("layout=\"circo\";");
+                dot.pr("mindist=\"2.5\";");
+            }
             dot.pr("rankdir=\"LR\";");
             dot.pr("node [shape=Mrecord]");
 
             // Generate a node for each state.
             for (StateSpaceNode n : this.nodes()) {
-                dot.pr("S" + n.index + " [" + "label = \"" + "S" + n.index + " | " + n.tag + "\"" + "]");
+                List<String> reactions = n.reactionsInvoked.stream()
+                    .map(ReactionInstance::getFullName).collect(Collectors.toList());
+                String reactionsStr = String.join("\\n", reactions);
+                dot.pr("S" + n.index + " [" + "label = \"" + "S" + n.index
+                    + " | " + n.tag
+                    + " | " + reactionsStr
+                    // + " | " + "Reactions: " + n.reactionsInvoked.size() // Simplified version
+                    + " | " + "Pending events: " + n.eventQ.size()
+                    + "\"" + "]");
             }
 
             StateSpaceNode current = this.head;
             StateSpaceNode next = getDownstreamNode(this.head);
             while (current != null && next != null && current != this.tail) {
-                long tsDiff = next.tag.timestamp - current.tag.timestamp;
-                long msDiff = next.tag.microstep - current.tag.microstep;
-                dot.pr("S" + current.index + " -> " + "S" + next.index + " [label = " + "\"" + "+(" + tsDiff + ", " + msDiff + ")" + "\"" + "]");
+                TimeValue tsDiff = TimeValue.fromNanoSeconds(next.tag.timestamp - current.tag.timestamp);
+                dot.pr("S" + current.index + " -> " + "S" + next.index + " [label = " + "\"" + "+" + tsDiff + "\"" + "]");
                 current = next;
                 next = getDownstreamNode(next);
             }
 
             if (loopNode != null) {
-                long tsDiff = loopNodeNext.tag.timestamp - tail.tag.timestamp;
-                long msDiff = loopNodeNext.tag.microstep - tail.tag.microstep;
+                TimeValue tsDiff = TimeValue.fromNanoSeconds(loopNodeNext.tag.timestamp - tail.tag.timestamp);
+                TimeValue period = TimeValue.fromNanoSeconds(loopPeriod);
                 dot.pr("S" + current.index + " -> " + "S" + next.index
-                    + " [label = " + "\"" + "+(" + tsDiff + ", " + msDiff + ")" + "\"" + " weight = 0 " + "]");
+                    + " [label = " + "\"" + "+" + tsDiff + " -" + period + "\""
+                    + " weight = 0 " + "]");
             }
 
             dot.unindent();
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
index 2ac3ef1533..abfc1d5c48 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
@@ -10,13 +10,15 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.lflang.TimeValue;
 import org.lflang.generator.ReactionInstance;
 import org.lflang.generator.TriggerInstance;
 
 public class StateSpaceNode {
 
-    public int index; // Set in StateSpaceDiagram.java
+    public int index;       // Set in StateSpaceDiagram.java
     public Tag tag;
+    public TimeValue time;  // Readable representation of tag.timestamp
     public ArrayList<ReactionInstance> reactionsInvoked;
     public ArrayList<Event> eventQ;
 
@@ -28,6 +30,7 @@ public StateSpaceNode(
         this.tag    = tag;
         this.eventQ = eventQ;
         this.reactionsInvoked = reactionsInvoked;
+        this.time   = TimeValue.fromNanoSeconds(tag.timestamp);
     }
 
     /**
@@ -53,10 +56,10 @@ private boolean equidistant(StateSpaceNode n1,
      * Two methods for pretty printing
      */
     public void display() {
-        System.out.println("(" + tag + ", " + reactionsInvoked + ", " + eventQ + ")");
+        System.out.println("(" + this.time + ", " + reactionsInvoked + ", " + eventQ + ")");
     }
     public String toString() {
-        return "(" + tag + ", " + reactionsInvoked + ", " + eventQ + ")";
+        return "(" + this.time + ", " + reactionsInvoked + ", " + eventQ + ")";
     }
 
     /**
diff --git a/org.lflang/src/org/lflang/analyses/statespace/Tag.java b/org.lflang/src/org/lflang/analyses/statespace/Tag.java
index dcf3103903..99210ae622 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/Tag.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/Tag.java
@@ -7,6 +7,8 @@
  */
 package org.lflang.analyses.statespace;
 
+import org.lflang.TimeValue;
+
 public class Tag implements Comparable<Tag> {
 
     public long timestamp;
@@ -57,6 +59,9 @@ public boolean equals(Object o) {
     @Override
     public String toString() {
         if (this.forever) return "(FOREVER, " + this.microstep + ")";
-        else return "(" + this.timestamp + ", " + this.microstep + ")";
+        else {
+            TimeValue time = TimeValue.fromNanoSeconds(this.timestamp);
+            return "(" + time + ", " + this.microstep + ")";
+        }
     }
 }
\ No newline at end of file

From b2fddc14e606c3aa8326d9778b454f4b1ec7500d Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 28 Dec 2022 14:32:03 +0800
Subject: [PATCH 0071/1114] Add an option to generate compact state space
 diagrams

---
 .../statespace/StateSpaceDiagram.java         | 48 +++++++++++++------
 .../statespace/StateSpaceExplorer.java        |  4 +-
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
index d7c9c5b578..2573b9841e 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
@@ -51,6 +51,11 @@ public class StateSpaceDiagram extends DirectedGraph<StateSpaceNode> {
      */
     private CodeBuilder dot;
 
+    /**
+     * 
+     */
+    private final boolean compactDot = true;
+
     /**
      * Before adding the node, assign it an index.
      */
@@ -120,23 +125,36 @@ public CodeBuilder generateDot() {
             dot.pr("digraph G {");
             dot.indent();
             if (this.loopNode != null) {
-                dot.pr("layout=\"circo\";");
-                dot.pr("mindist=\"2.5\";");
+                dot.pr("layout=circo;");
+            }
+            dot.pr("rankdir=LR;");
+            if (this.compactDot) {
+                dot.pr("mindist=1.5;");
+                dot.pr("overlap=false");
+                dot.pr("node [shape=Mrecord fontsize=40]");
+                dot.pr("edge [fontsize=40 penwidth=3 arrowsize=2]");
+            } else {
+                dot.pr("node [shape=Mrecord]");
             }
-            dot.pr("rankdir=\"LR\";");
-            dot.pr("node [shape=Mrecord]");
-
             // Generate a node for each state.
-            for (StateSpaceNode n : this.nodes()) {
-                List<String> reactions = n.reactionsInvoked.stream()
-                    .map(ReactionInstance::getFullName).collect(Collectors.toList());
-                String reactionsStr = String.join("\\n", reactions);
-                dot.pr("S" + n.index + " [" + "label = \"" + "S" + n.index
-                    + " | " + n.tag
-                    + " | " + reactionsStr
-                    // + " | " + "Reactions: " + n.reactionsInvoked.size() // Simplified version
-                    + " | " + "Pending events: " + n.eventQ.size()
-                    + "\"" + "]");
+            if (this.compactDot) {
+                for (StateSpaceNode n : this.nodes()) {
+                    dot.pr("S" + n.index + " [" + "label = \" {" + "S" + n.index
+                        + " | " + n.reactionsInvoked.size() + " | " + n.eventQ.size() + "}"
+                        + " | " + n.tag
+                        + "\"" + "]");
+                }
+            } else {
+                for (StateSpaceNode n : this.nodes()) {
+                    List<String> reactions = n.reactionsInvoked.stream()
+                        .map(ReactionInstance::getFullName).collect(Collectors.toList());
+                    String reactionsStr = String.join("\\n", reactions);
+                    dot.pr("S" + n.index + " [" + "label = \"" + "S" + n.index
+                        + " | " + n.tag
+                        + " | " + reactionsStr
+                        + " | " + "Pending events: " + n.eventQ.size()
+                        + "\"" + "]");
+                }
             }
 
             StateSpaceNode current = this.head;
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
index da62b9842e..3a4af46ad1 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
@@ -215,7 +215,9 @@ else if (effect instanceof ActionInstance) {
                 }
             }
 
-            // When we first advance to a new tag, create a new node in the state space diagram.
+            // When we advance to a new tag,
+            // create a new node in the state space diagram
+            // for everything processed in the previous tag.
             if (
                 previousTag == null // The first iteration
                 || currentTag.compareTo(previousTag) > 0

From cd7fda89740593eadc5b71ee29698de38439ed15 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 28 Dec 2022 14:33:11 +0800
Subject: [PATCH 0072/1114] Support negative numbers in C code

---
 .../cast/{CAstUtils.java => AstUtils.java}    | 32 ++++++++-
 .../cast/BuildAstParseTreeVisitor.java        | 38 ++++++++--
 .../src/org/lflang/analyses/cast/CAst.java    |  9 +++
 .../org/lflang/analyses/cast/CAstVisitor.java |  2 +
 .../lflang/analyses/cast/CBaseAstVisitor.java | 71 +++++--------------
 .../lflang/analyses/cast/CToUclidVisitor.java |  5 ++
 .../analyses/cast/IfNormalFormAstVisitor.java |  2 +-
 .../lflang/analyses/uclid/UclidGenerator.java | 34 ++++-----
 8 files changed, 118 insertions(+), 75 deletions(-)
 rename org.lflang/src/org/lflang/analyses/cast/{CAstUtils.java => AstUtils.java} (59%)

diff --git a/org.lflang/src/org/lflang/analyses/cast/CAstUtils.java b/org.lflang/src/org/lflang/analyses/cast/AstUtils.java
similarity index 59%
rename from org.lflang/src/org/lflang/analyses/cast/CAstUtils.java
rename to org.lflang/src/org/lflang/analyses/cast/AstUtils.java
index 36b749e397..a42198cb4b 100644
--- a/org.lflang/src/org/lflang/analyses/cast/CAstUtils.java
+++ b/org.lflang/src/org/lflang/analyses/cast/AstUtils.java
@@ -2,7 +2,12 @@
 
 import java.util.List;
 
-public class CAstUtils {
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.misc.Interval;
+
+import org.eclipse.xtext.xbase.lib.Exceptions;
+
+public class AstUtils {
     
     public static CAst.AstNode takeConjunction(List<CAst.AstNode> conditions) {
         if (conditions.size() == 0) {
@@ -47,4 +52,29 @@ public static CAst.AstNode takeDisjunction(List<CAst.AstNode> conditions) {
             return top;
         }
     }
+
+    // A handy function for debugging ASTs.
+    // It prints the stack trace of the visitor functions
+    // and shows the text matched by the ANTLR rules.
+    public static void printStackTraceAndMatchedText(ParserRuleContext ctx) {
+        System.out.println("========== AST DEBUG ==========");
+
+        // Print matched text
+        int a = ctx.start.getStartIndex();
+        int b = ctx.stop.getStopIndex();
+        Interval interval = new Interval(a,b);
+        String matchedText = ctx.start.getInputStream().getText(interval);
+        System.out.println("Matched text: " + matchedText);
+
+        // Print stack trace
+        StackTraceElement[] cause = Thread.currentThread().getStackTrace();
+        System.out.print("Stack trace: ");
+        for (int i = 0; i < cause.length; i++) {
+            System.out.print(cause[i].getMethodName());
+            if (i != cause.length - 1) System.out.print(", ");
+        }
+        System.out.println(".");
+
+        System.out.println("===============================");
+    }
 }
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java b/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
index af3f02d26c..3653296e88 100644
--- a/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
@@ -353,6 +353,7 @@ public CAst.AstNode visitPostfixExpression(PostfixExpressionContext ctx) {
 
     @Override
     public CAst.AstNode visitUnaryExpression(UnaryExpressionContext ctx) {
+        // Check for prefixes and mark them as opaque (unsupported for now).
         if (ctx.PlusPlus().size() > 0
             || ctx.MinusMinus().size() > 0
             || ctx.Sizeof().size() > 0) {
@@ -361,23 +362,52 @@ public CAst.AstNode visitUnaryExpression(UnaryExpressionContext ctx) {
                 "Prefix '++', '--', and 'sizeof' are currently not supported.",
                 "Marking the statement as opaque."
             ));
+            AstUtils.printStackTraceAndMatchedText(ctx);
             return new CAst.OpaqueNode();
         }
+        // Handle the postfixExpression rule
+        // (look up the grammar in C.g4 to get more details).
         if (ctx.postfixExpression() != null) {
             return visitPostfixExpression(ctx.postfixExpression());
         }
+        // Handle the unary operators '!' (logical not)
+        // and '-' (negative).
         if (ctx.unaryOperator() != null
-            && ctx.unaryOperator().Not() != null
             && ctx.castExpression() != null) {
-            CAst.LogicalNotNode node = new CAst.LogicalNotNode();
-            node.child = visitCastExpression(ctx.castExpression());
-            return node;
+            CAst.AstNodeUnary node;
+            if (ctx.unaryOperator().Not() != null) {
+                // Handle the logical not expression.
+                node = new CAst.LogicalNotNode();
+                node.child = visitCastExpression(ctx.castExpression());
+                return node;
+            }
+            else if (ctx.unaryOperator().Minus() != null) {
+                // Handle negative numbers.
+                // -5 will be translated as -1 * (5)
+                // which is a NegativeNode with a
+                // LiteralNode inside.
+                //
+                // FIXME: Need to perform precise error handling
+                // because we will go from a castExpression to
+                // a Constant under primaryExpression and anything
+                // else matching besides Constant could be problematic.
+                // For example, we cannot have a NegativeNode with
+                // a StringLiteralNode inside. This can be caught by
+                // the GCC, but if compilation is not involved, it
+                // would be useful to catch it here ourselves.
+                node = new CAst.NegativeNode();
+                node.child = visitCastExpression(ctx.castExpression());
+                return node;
+            }
         }
+        
+        // Mark all the remaining cases as opaque.
         System.out.println(String.join(" ", 
             "Warning (line " + ctx.getStart().getLine() + "):",
             "only postfixExpression and '!' in a unaryExpression is currently supported.",
             "Marking the statement as opaque."
         ));
+        AstUtils.printStackTraceAndMatchedText(ctx);
         return new CAst.OpaqueNode();
     }
 
diff --git a/org.lflang/src/org/lflang/analyses/cast/CAst.java b/org.lflang/src/org/lflang/analyses/cast/CAst.java
index 1da9b3994a..e42f066311 100644
--- a/org.lflang/src/org/lflang/analyses/cast/CAst.java
+++ b/org.lflang/src/org/lflang/analyses/cast/CAst.java
@@ -227,6 +227,15 @@ public static class NotEqualNode extends AstNodeBinary implements Visitable {
         }
     }
 
+    public static class NegativeNode extends AstNodeUnary implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitNegativeNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitNegativeNode(this, nodeList);
+        }
+    }
+
     public static class LessThanNode extends AstNodeBinary implements Visitable {
         @Override public <T> T accept(AstVisitor<? extends T> visitor) {
             return ((CAstVisitor<? extends T>)visitor).visitLessThanNode(this);
diff --git a/org.lflang/src/org/lflang/analyses/cast/CAstVisitor.java b/org.lflang/src/org/lflang/analyses/cast/CAstVisitor.java
index 1fadea44d5..f615f6bbb7 100644
--- a/org.lflang/src/org/lflang/analyses/cast/CAstVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/CAstVisitor.java
@@ -27,6 +27,7 @@ public interface CAstVisitor<T> extends AstVisitor<T> {
 
 	T visitEqualNode(CAst.EqualNode node);
 	T visitNotEqualNode(CAst.NotEqualNode node);
+	T visitNegativeNode(CAst.NegativeNode node);
 	T visitLessThanNode(CAst.LessThanNode node);
 	T visitLessEqualNode(CAst.LessEqualNode node);
 	T visitGreaterThanNode(CAst.GreaterThanNode node);
@@ -61,6 +62,7 @@ public interface CAstVisitor<T> extends AstVisitor<T> {
 
 	T visitEqualNode(CAst.EqualNode node, List<CAst.AstNode> nodeList);
 	T visitNotEqualNode(CAst.NotEqualNode node, List<CAst.AstNode> nodeList);
+	T visitNegativeNode(CAst.NegativeNode node, List<CAst.AstNode> nodeList);
 	T visitLessThanNode(CAst.LessThanNode node, List<CAst.AstNode> nodeList);
 	T visitLessEqualNode(CAst.LessEqualNode node, List<CAst.AstNode> nodeList);
 	T visitGreaterThanNode(CAst.GreaterThanNode node, List<CAst.AstNode> nodeList);
diff --git a/org.lflang/src/org/lflang/analyses/cast/CBaseAstVisitor.java b/org.lflang/src/org/lflang/analyses/cast/CBaseAstVisitor.java
index 5273a0bc0d..117f1a8536 100644
--- a/org.lflang/src/org/lflang/analyses/cast/CBaseAstVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/CBaseAstVisitor.java
@@ -2,7 +2,11 @@
 
 import java.util.List;
 
-/** Modeled after CBaseVisitor.java */
+/** 
+ * A base class that provides default implementations
+ * of the visit functions. Other C AST visitors extend
+ * this class.
+ */
 public class CBaseAstVisitor<T> extends AbstractAstVisitor<T> implements CAstVisitor<T> {
     
 	/** 
@@ -13,36 +17,30 @@ public class CBaseAstVisitor<T> extends AbstractAstVisitor<T> implements CAstVis
 	 */
 	@Override
 	public T visitAstNode(CAst.AstNode node) {
-		// System.out.print("[visitAstNode] ");
-		// System.out.println("Hi, I am " + node);
 		return null;
 	}
 
 	@Override
 	public T visitAstNodeUnary(CAst.AstNodeUnary node) {
-		// System.out.print("[visitAstNodeUnary] ");
-		// System.out.println("Hi, I am " + node);
 		if (node.child != null) {
 			T result = visit(node.child);
 		} else {
-			// System.out.println("*** Child is empty in " + node + "!");
+			System.out.println("*** Child is empty in " + node + "!");
 		}
 		return null;
 	}
 
 	@Override
 	public T visitAstNodeBinary(CAst.AstNodeBinary node) {
-		// System.out.print("[visitAstNodeBinary] ");
-		// System.out.println("Hi, I am " + node);
 		if (node.left != null) {
 			T leftResult = visit(node.left);
 		} else {
-			// System.out.println("*** Left child is empty in " + node + "!");
+			System.out.println("*** Left child is empty in " + node + "!");
 		}
 		if (node.right != null) {
 			T rightResult = visit(node.right);
 		} else {
-			// System.out.println("*** Right child is empty in " + node + "!");
+			System.out.println("*** Right child is empty in " + node + "!");
 		}
 		// Aggregate results...
 		return null;
@@ -50,8 +48,6 @@ public T visitAstNodeBinary(CAst.AstNodeBinary node) {
 
 	@Override
 	public T visitAstNodeDynamic(CAst.AstNodeDynamic node) {
-		// System.out.print("[visitAstNodeDynamic] ");
-		// System.out.println("Hi, I am " + node);
 		for (CAst.AstNode n : node.children) {
 			T result = visit(n);
 		}
@@ -60,64 +56,51 @@ public T visitAstNodeDynamic(CAst.AstNodeDynamic node) {
 
     @Override
 	public T visitAssignmentNode(CAst.AssignmentNode node) {
-		// The default implementation reuses visitAstNodeBinary(node).
-		// System.out.print("[visitAssignmentNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitIfBlockNode(CAst.IfBlockNode node) {
-		// System.out.print("[visitIfBlockNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitIfBodyNode(CAst.IfBodyNode node) {
-		// System.out.print("[visitIfBodyNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitLiteralNode(CAst.LiteralNode node) {
-		// System.out.print("[visitLiteralNode] ");
-		// System.out.println("Hi, I am " + node + " with literal " + node.literal);
 		return null;
 	}
 
 	@Override
 	public T visitLogicalNotNode(CAst.LogicalNotNode node) {
-		// System.out.print("[visitLogicalNotNode] ");
 		return visitAstNodeUnary(node);
 	}
 
 	@Override
 	public T visitLogicalAndNode(CAst.LogicalAndNode node) {
-		// System.out.print("[visitLogicalAndNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitLogicalOrNode(CAst.LogicalOrNode node) {
-		// System.out.print("[visitLogicalOrNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitOpaqueNode(CAst.OpaqueNode node) {
-		// System.out.print("[visitOpaqueNode] ");
 		return visitAstNode(node);
 	}
 
 	@Override
 	public T visitStatementSequenceNode(CAst.StatementSequenceNode node) {
-		// System.out.print("[visitStatementSequenceNode] ");
 		return visitAstNodeDynamic(node);
 	}
 
 	@Override
 	public T visitVariableNode(CAst.VariableNode node) {
-		// System.out.print("[visitVariableNode] ");
-		// System.out.println("Hi, I am " + node + ": (" + node.type + ", " + node.name + ")");
 		return null;
 	}
 
@@ -125,29 +108,21 @@ public T visitVariableNode(CAst.VariableNode node) {
 
 	@Override
 	public T visitAdditionNode(CAst.AdditionNode node) {
-		// The default implementation reuses visitAstNodeBinary(node).
-		// System.out.print("[visitAdditionNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitSubtractionNode(CAst.SubtractionNode node) {
-		// The default implementation reuses visitAstNodeBinary(node).
-		// System.out.print("[visitSubtractionNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitMultiplicationNode(CAst.MultiplicationNode node) {
-		// The default implementation reuses visitAstNodeBinary(node).
-		// System.out.print("[visitMultiplicationNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitDivisionNode(CAst.DivisionNode node) {
-		// The default implementation reuses visitAstNodeBinary(node).
-		// System.out.print("[visitDivisionNode] ");
 		return visitAstNodeBinary(node);
 	}
 
@@ -155,43 +130,36 @@ public T visitDivisionNode(CAst.DivisionNode node) {
 
 	@Override
 	public T visitEqualNode(CAst.EqualNode node) {
-		// The default implementation reuses visitAstNodeBinary(node).
-		// System.out.print("[visitEqualNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitNotEqualNode(CAst.NotEqualNode node) {
-		// The default implementation reuses visitAstNodeBinary(node).
-		// System.out.print("[visitNotEqualNode] ");
 		return visitAstNodeBinary(node);
 	}
 
+	@Override
+	public T visitNegativeNode(CAst.NegativeNode node) {
+		return visitNegativeNode(node);
+	}
+
 	@Override
 	public T visitLessThanNode(CAst.LessThanNode node) {
-		// The default implementation reuses visitAstNodeBinary(node).
-		// System.out.print("[visitLessThanNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitLessEqualNode(CAst.LessEqualNode node) {
-		// The default implementation reuses visitAstNodeBinary(node).
-		// System.out.print("[visitLessEqualNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitGreaterThanNode(CAst.GreaterThanNode node) {
-		// The default implementation reuses visitAstNodeBinary(node).
-		// System.out.print("[visitGreaterThanNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitGreaterEqualNode(CAst.GreaterEqualNode node) {
-		// The default implementation reuses visitAstNodeBinary(node).
-		// System.out.print("[visitGreaterEqualNode] ");
 		return visitAstNodeBinary(node);
 	}
 
@@ -199,34 +167,26 @@ public T visitGreaterEqualNode(CAst.GreaterEqualNode node) {
 
 	@Override
 	public T visitSetPortNode(CAst.SetPortNode node) {
-		// System.out.print("[visitSetPortNode] ");
 		return visitAstNodeBinary(node);
 	}
 
 	@Override
 	public T visitScheduleActionNode(CAst.ScheduleActionNode node) {
-		// System.out.print("[visitScheduleActionNode] ");
 		return visitAstNodeDynamic(node);
 	}
 
 	@Override
 	public T visitStateVarNode(CAst.StateVarNode node) {
-		// System.out.print("[visitStateVarNode] ");
-		// System.out.println("Hi, I am " + node + ": (" + node.name + ")");
 		return null;
 	}
 
 	@Override
 	public T visitTriggerValueNode(CAst.TriggerValueNode node) {
-		// System.out.print("[visitTriggerValueNode] ");
-		// System.out.println("Hi, I am " + node + ": (" + node.name + ")");
 		return null;
 	}
 
 	@Override
 	public T visitTriggerIsPresentNode(CAst.TriggerIsPresentNode node) {
-		// System.out.print("[visitTriggerIsPresentNode] ");
-		// System.out.println("Hi, I am " + node + ": (" + node.name + ")");
 		return null;
 	}
 
@@ -335,6 +295,11 @@ public T visitNotEqualNode(CAst.NotEqualNode node, List<CAst.AstNode> nodeList)
 		return visitNotEqualNode(node);
 	}
 
+	@Override
+	public T visitNegativeNode(CAst.NegativeNode node, List<CAst.AstNode> nodeList) {
+		return visitNegativeNode(node);
+	}
+
 	@Override
 	public T visitLessThanNode(CAst.LessThanNode node, List<CAst.AstNode> nodeList) {
 		return visitLessThanNode(node);
diff --git a/org.lflang/src/org/lflang/analyses/cast/CToUclidVisitor.java b/org.lflang/src/org/lflang/analyses/cast/CToUclidVisitor.java
index 88d73b3278..248eeeab91 100644
--- a/org.lflang/src/org/lflang/analyses/cast/CToUclidVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/CToUclidVisitor.java
@@ -159,6 +159,11 @@ public String visitNotEqualNode(NotEqualNode node) {
         return "(" + lhs + " != " + rhs + ")";
     }
 
+    @Override
+    public String visitNegativeNode(NegativeNode node) {
+        return "(" + "-1*(" + visit(node.child) + "))";
+    }
+
     @Override
     public String visitScheduleActionNode(ScheduleActionNode node) {
         String name = ((VariableNode)node.children.get(0)).name;
diff --git a/org.lflang/src/org/lflang/analyses/cast/IfNormalFormAstVisitor.java b/org.lflang/src/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
index bde7337565..a8a5e8931d 100644
--- a/org.lflang/src/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
@@ -76,7 +76,7 @@ private CAst.IfBlockNode generateIfBlock(CAst.AstNode node, List<CAst.AstNode> c
         // Create an If Block node.
         CAst.IfBlockNode ifNode = new CAst.IfBlockNode();
         // Set the condition of the if block node.
-        CAst.AstNode conjunction = CAstUtils.takeConjunction(conditions);
+        CAst.AstNode conjunction = AstUtils.takeConjunction(conditions);
         ifNode.left = conjunction;
         // Create a new body node.
         CAst.IfBodyNode body = new CAst.IfBodyNode();
diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
index 4ffa7290ee..d2f18062ee 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
@@ -58,9 +58,9 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.Target;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
+import org.lflang.analyses.cast.AstUtils;
 import org.lflang.analyses.cast.BuildAstParseTreeVisitor;
 import org.lflang.analyses.cast.CAst;
-import org.lflang.analyses.cast.CAstUtils;
 import org.lflang.analyses.cast.CBaseAstVisitor;
 import org.lflang.analyses.cast.CToUclidVisitor;
 import org.lflang.analyses.cast.IfNormalFormAstVisitor;
@@ -1080,8 +1080,8 @@ protected void generateReactionAxioms() {
 
         for (ReactionInstance.Runtime reaction : this.reactionInstances) {
             String body = reaction.getReaction().getDefinition().getCode().getBody();
-            // System.out.println("Printing reaction body of " + reaction);
-            // System.out.println(body);
+            System.out.println("Printing reaction body of " + reaction);
+            System.out.println(body);
 
             // Generate a parse tree.
             CLexer lexer = new CLexer(CharStreams.fromString(body));
@@ -1097,19 +1097,10 @@ protected void generateReactionAxioms() {
             VariablePrecedenceVisitor precVisitor = new VariablePrecedenceVisitor();
             precVisitor.visit(ast);
 
-            // Traverse and print.
-            CBaseAstVisitor baseVisitor = new CBaseAstVisitor<>(); // For pretty printing.
-            // System.out.println("***** Printing the original AST.");
-            baseVisitor.visit(ast);
-
             // Convert the AST to If Normal Form (INF).
             IfNormalFormAstVisitor infVisitor = new IfNormalFormAstVisitor();
-            // System.out.println("***** Convert to If Normal Form.");
             infVisitor.visit(ast, new ArrayList<CAst.AstNode>());
             CAst.StatementSequenceNode inf = infVisitor.INF;
-            // System.out.println(inf);
-            // System.out.println("***** Printing the AST in If Normal Form.");
-            baseVisitor.visit(inf);
 
             // For the variables that are USED inside this reaction, extract the conditions
             // for setting them, and take the negation of their conjunction
@@ -1151,7 +1142,6 @@ protected void generateReactionAxioms() {
 
             // Generate Uclid axiom for the C AST.
             CToUclidVisitor c2uVisitor = new CToUclidVisitor(this, reaction);
-            // System.out.println("***** Generating axioms from AST.");
             String axiom = c2uVisitor.visit(inf);
             code.pr(String.join("\n", 
                 "// Reaction body of " + reaction,
@@ -1162,12 +1152,24 @@ protected void generateReactionAxioms() {
                 "// By default, the value of the variables used in this reaction stay the same."
             ));
             for (NamedInstance key : defaultBehaviorConditions.keySet()) {
-                CAst.AstNode disjunction = CAstUtils.takeDisjunction(defaultBehaviorConditions.get(key));
-                // System.out.println("!!! Reset conditions: " + defaultBehaviorConditions.get(key));
+                CAst.AstNode disjunction = AstUtils.takeDisjunction(defaultBehaviorConditions.get(key));
                 CAst.LogicalNotNode notNode = new CAst.LogicalNotNode();
                 notNode.child = disjunction;
                 String resetCondition = c2uVisitor.visit(notNode);
-                // System.out.println("!!! Str: " + resetCondition);
+                
+                // Check for invalid reset conditions.
+                // If found, stop the execution.
+                // FIXME: A more systematic check is needed
+                // to ensure that the generated Uclid file
+                // is valid.
+                try {
+                    if (resetCondition.contains("null")) {
+                        throw new Exception("Null detected in a reset condition. Stop.");
+                    }
+                } catch (Exception e) {
+                    Exceptions.sneakyThrow(e);
+                }
+
                 code.pr("&& " + "(" + "(" + resetCondition + ")" + " ==> " + "(");
                 if (key instanceof StateVariableInstance) {
                     StateVariableInstance n = (StateVariableInstance)key;

From 83a4f482a70968b041ef4332f9ba5f59d62791bc Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 28 Dec 2022 17:18:13 +0800
Subject: [PATCH 0073/1114] Address the case when the state space diagram only
 has one node.

---
 .../statespace/StateSpaceExplorer.java        | 128 ++++++++++--------
 .../lflang/analyses/uclid/UclidGenerator.java |   4 +-
 2 files changed, 77 insertions(+), 55 deletions(-)

diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
index 3a4af46ad1..3d5e32d04d 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
@@ -10,6 +10,8 @@
 import java.util.PriorityQueue;
 import java.util.Set;
 
+import org.eclipse.xtext.xbase.lib.Exceptions;
+
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.analyses.statespace.Event;
@@ -65,9 +67,8 @@ public StateSpaceExplorer(ReactorInstance main) {
     public void addInitialEvents(ReactorInstance reactor) {
         // Add the startup trigger, if exists.
         var startup = reactor.getStartupTrigger();
-        if (startup != null) {
+        if (startup != null)
             eventQ.add(new Event(startup, new Tag(0, 0, false)));
-        }
 
         // Add the initial timer firings, if exist.
         for (TimerInstance timer : reactor.timers) {
@@ -105,7 +106,6 @@ public void explore(Tag horizon, boolean findLoop) {
         // FIXME: It seems that we need to handle shutdown triggers 
         // separately, because they could break the back loop.
         addInitialEvents(this.main);
-        // System.out.println(this.eventQ);
         
         Tag             previousTag  = null; // Tag in the previous loop ITERATION
         Tag             currentTag   = null;  // Tag in the current  loop ITERATION
@@ -116,7 +116,6 @@ public void explore(Tag horizon, boolean findLoop) {
         if (this.eventQ.size() > 0) {
             stop = false;
             currentTag = (eventQ.peek()).tag;
-            // System.out.println(currentTag);
         }
 
         // A list of reactions invoked at the current logical tag
@@ -131,9 +130,7 @@ public void explore(Tag horizon, boolean findLoop) {
             while (eventQ.size() > 0 && eventQ.peek().tag.compareTo(currentTag) == 0) {
                 Event e = eventQ.poll();
                 currentEvents.add(e);
-                // System.out.println("Adding event to currentEvents: " + e);
             }
-            // System.out.println(currentEvents);
 
             // Collect all the reactions invoked in this current LOOP ITERATION
             // triggered by the earliest events.
@@ -166,21 +163,13 @@ public void explore(Tag horizon, boolean findLoop) {
                 // this action.
                 for (TriggerInstance<? extends Variable> effect : reaction.effects) {
                     if (effect instanceof PortInstance) {
-
-                        // System.out.println("Effect: " + effect);
-                        // System.out.print("Eventual destinations: ");
-                        // System.out.println(((PortInstance)effect).getDependentPorts());
                         
                         for (SendRange senderRange
                                 : ((PortInstance)effect).getDependentPorts()) {
 
-                            // System.out.print("Sender range: ");
-                            // System.out.println(senderRange.destinations);
-
                             for (RuntimeRange<PortInstance> destinationRange
                                     : senderRange.destinations) {
                                 PortInstance downstreamPort = destinationRange.instance;
-                                // System.out.println("Located a destination port: " + downstreamPort);
 
                                 // Getting delay from connection
                                 // FIXME: Is there a more concise way to do this?
@@ -215,50 +204,70 @@ else if (effect instanceof ActionInstance) {
                 }
             }
 
+            // We are at the first iteration.
+            // Initialize currentNode.
+            if (previousTag == null) {
+                //// Now we are done with the node at the previous tag,
+                //// work on the new node at the current timestamp.
+                // Copy the reactions in reactionsTemp.
+                reactionsInvoked = new ArrayList<ReactionInstance>(reactionsTemp);
+
+                // Create a new state in the SSD for the current tag,
+                // add the reactions triggered to the state,
+                // and add a snapshot of the event queue (with new events
+                // generated by reaction invocations in the curren tag)
+                // to the state.
+                StateSpaceNode node = new StateSpaceNode(
+                    currentTag,                    // Current tag
+                    reactionsInvoked,              // Reactions invoked at this tag
+                    new ArrayList<Event>(eventQ)    // A snapshot of the event queue
+                );
+
+                // Initialize currentNode.
+                currentNode = node;
+            }
             // When we advance to a new tag,
             // create a new node in the state space diagram
             // for everything processed in the previous tag.
-            if (
-                previousTag == null // The first iteration
-                || currentTag.compareTo(previousTag) > 0
+            else if (
+                previousTag != null
+                && currentTag.compareTo(previousTag) > 0
             ) {
-                if (previousTag != null) {
-                    // Whenever we finish a tag, check for loops fist.
-                    // If currentNode matches an existing node in uniqueNodes,
-                    // duplicate is set to the existing node.
-                    StateSpaceNode duplicate;
-                    if (findLoop &&
-                        (duplicate = uniqueNodes.put(
-                            currentNode.hashCode(), currentNode)) != null) {
-
-                        // Mark the loop in the diagram.
-                        loopFound = true;
-                        this.diagram.loopNode = duplicate;
-                        this.diagram.loopNodeNext = currentNode;
-                        this.diagram.tail = previousNode;
-                        // Loop period is the time difference between the 1st time
-                        // the node is reached and the 2nd time the node is reached.
-                        this.diagram.loopPeriod = this.diagram.loopNodeNext.tag.timestamp
-                                                    - this.diagram.loopNode.tag.timestamp;
-                        this.diagram.addEdge(this.diagram.loopNode, this.diagram.tail);
-                        System.out.println("LoopNode index " + this.diagram.loopNode.index); // Why is this 5?
-                        return; // Exit the while loop early.
-                    }
+                // Whenever we finish a tag, check for loops fist.
+                // If currentNode matches an existing node in uniqueNodes,
+                // duplicate is set to the existing node.
+                StateSpaceNode duplicate;
+                if (findLoop &&
+                    (duplicate = uniqueNodes.put(
+                        currentNode.hashCode(), currentNode)) != null) {
 
-                    // Now we are at a new tag, and a loop is not found,
-                    // add the node to the state space diagram.
-                    this.diagram.addNode(currentNode);
-                    
-                    // If the head is not empty, add an edge from the previous state
-                    // to the next state. Otherwise initialize the head to the new node.
-                    if (this.diagram.head != null && currentNode != null) {
-                        // System.out.println("--- Add a new edge between " + currentNode + " and " + node);
-                        this.diagram.addEdge(currentNode, previousNode); // Sink first, then source
-                    }
-                    else
-                        this.diagram.head = currentNode; // Initialize the head.
+                    // Mark the loop in the diagram.
+                    loopFound = true;
+                    this.diagram.loopNode = duplicate;
+                    this.diagram.loopNodeNext = currentNode;
+                    this.diagram.tail = previousNode;
+                    // Loop period is the time difference between the 1st time
+                    // the node is reached and the 2nd time the node is reached.
+                    this.diagram.loopPeriod = this.diagram.loopNodeNext.tag.timestamp
+                                                - this.diagram.loopNode.tag.timestamp;
+                    this.diagram.addEdge(this.diagram.loopNode, this.diagram.tail);
+                    System.out.println("LoopNode index " + this.diagram.loopNode.index); // Why is this 5?
+                    return; // Exit the while loop early.
                 }
 
+                // Now we are at a new tag, and a loop is not found,
+                // add the node to the state space diagram.
+                this.diagram.addNode(currentNode);
+                
+                // If the head is not empty, add an edge from the previous state
+                // to the next state. Otherwise initialize the head to the new node.
+                if (this.diagram.head != null) {
+                    // System.out.println("--- Add a new edge between " + currentNode + " and " + node);
+                    this.diagram.addEdge(currentNode, previousNode); // Sink first, then source
+                }
+                else
+                    this.diagram.head = currentNode; // Initialize the head.
+
                 //// Now we are done with the node at the previous tag,
                 //// work on the new node at the current timestamp.
                 // Copy the reactions in reactionsTemp.
@@ -277,16 +286,23 @@ else if (effect instanceof ActionInstance) {
                 
                 // Update the previous node.
                 previousNode = currentNode;
-                // Update the current node.
+                // Update the current node to the new (potentially incomplete) node.
                 currentNode = node;
             }
             // Time does not advance because we are processing
             // connections with zero delay.
-            else {
+            else if (
+                previousTag != null
+                && currentTag.compareTo(previousTag) == 0
+            ) {
                 // Add reactions explored in the current loop iteration
                 // to the existing state space node.
                 currentNode.reactionsInvoked.addAll(reactionsTemp);
             }
+            else {
+                // Unreachable
+                Exceptions.sneakyThrow(new Exception("Reached an unreachable part."));
+            }
 
             // Update the current tag for the next iteration.
             if (eventQ.size() > 0) {
@@ -301,6 +317,12 @@ else if (effect instanceof ActionInstance) {
                 || currentTag.compareTo(horizon) > 0)
                 stop = true;
         }
+        // When we exit and we still don't have a head,
+        // that means there is only one node in the diagram.
+        // Set the current node as the head.
+        if (this.diagram.head == null)
+            this.diagram.head = currentNode;
+        
         return;
     }
 }
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
index d2f18062ee..5ef2a2dd53 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
@@ -1080,8 +1080,8 @@ protected void generateReactionAxioms() {
 
         for (ReactionInstance.Runtime reaction : this.reactionInstances) {
             String body = reaction.getReaction().getDefinition().getCode().getBody();
-            System.out.println("Printing reaction body of " + reaction);
-            System.out.println(body);
+            // System.out.println("Printing reaction body of " + reaction);
+            // System.out.println(body);
 
             // Generate a parse tree.
             CLexer lexer = new CLexer(CharStreams.fromString(body));

From 03ae1662236f81c72e03889d32d788f43a2b4008 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 28 Dec 2022 20:24:38 +0800
Subject: [PATCH 0074/1114] Update comments

---
 .../src/org/lflang/analyses/cast/CAst.java    | 10 +++++-----
 .../lflang/analyses/uclid/UclidGenerator.java | 19 +++++++++++--------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/org.lflang/src/org/lflang/analyses/cast/CAst.java b/org.lflang/src/org/lflang/analyses/cast/CAst.java
index e42f066311..3704406940 100644
--- a/org.lflang/src/org/lflang/analyses/cast/CAst.java
+++ b/org.lflang/src/org/lflang/analyses/cast/CAst.java
@@ -55,9 +55,9 @@ public static class AssignmentNode extends AstNodeBinary implements Visitable {
     }
 
     /**
-     * AST node for an if block.
+     * AST node for an IF block.
      * The left node is the condition.
-     * The right node is the if body.
+     * The right node is the IF body.
      */
     public static class IfBlockNode extends AstNodeBinary implements Visitable {
         @Override public <T> T accept(AstVisitor<? extends T> visitor) {
@@ -69,9 +69,9 @@ public static class IfBlockNode extends AstNodeBinary implements Visitable {
     }
 
     /**
-     * AST node for an if block.
-     * The left node is the then branch.
-     * The right node is the else branch.
+     * AST node for the body of an IF block.
+     * The left node is the THEN branch.
+     * The right node is the ELSE branch.
      */
     public static class IfBodyNode extends AstNodeBinary implements Visitable {
         @Override public <T> T accept(AstVisitor<? extends T> visitor) {
diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
index 5ef2a2dd53..4144cb3126 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
@@ -1111,22 +1111,25 @@ protected void generateReactionAxioms() {
             HashMap<NamedInstance, List<CAst.AstNode>> defaultBehaviorConditions = new HashMap<>();
             for (CAst.AstNode node : inf.children) {
                 CAst.IfBlockNode ifBlockNode = (CAst.IfBlockNode)node;
-                CAst.AstNode ifBody = ((CAst.IfBodyNode)ifBlockNode.right).left;
+                // Under the INF form, a C statement is
+                // the THEN branch of an IF block.
+                CAst.AstNode stmt = ((CAst.IfBodyNode)ifBlockNode.right).left;
                 NamedInstance instance = null;
-                if ((ifBody instanceof CAst.AssignmentNode 
-                    && ((CAst.AssignmentNode)ifBody).left instanceof CAst.StateVarNode)) {
-                    CAst.StateVarNode n = (CAst.StateVarNode)((CAst.AssignmentNode)ifBody).left;
+                // Match stmt with different cases
+                if ((stmt instanceof CAst.AssignmentNode 
+                    && ((CAst.AssignmentNode)stmt).left instanceof CAst.StateVarNode)) {
+                    CAst.StateVarNode n = (CAst.StateVarNode)((CAst.AssignmentNode)stmt).left;
                     instance = reaction.getReaction().getParent().states.stream()
                                 .filter(s -> s.getName().equals(n.name)).findFirst().get();
                     unusedStates.remove(instance);
-                } else if (ifBody instanceof CAst.SetPortNode) {
-                    CAst.SetPortNode n = (CAst.SetPortNode)ifBody;
+                } else if (stmt instanceof CAst.SetPortNode) {
+                    CAst.SetPortNode n = (CAst.SetPortNode)stmt;
                     String name = ((CAst.VariableNode)n.left).name;
                     instance = reaction.getReaction().getParent().outputs.stream()
                                 .filter(s -> s.getName().equals(name)).findFirst().get();
                     unusedOutputs.remove(instance);
-                } else if (ifBody instanceof CAst.ScheduleActionNode) {
-                    CAst.ScheduleActionNode n = (CAst.ScheduleActionNode)ifBody;
+                } else if (stmt instanceof CAst.ScheduleActionNode) {
+                    CAst.ScheduleActionNode n = (CAst.ScheduleActionNode)stmt;
                     String name = ((CAst.VariableNode)n.children.get(0)).name;
                     instance = reaction.getReaction().getParent().actions.stream()
                                 .filter(s -> s.getName().equals(name)).findFirst().get();

From 0a55dda01ac63c2ce712f5cea05862d5dad656e1 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 28 Dec 2022 20:36:07 +0800
Subject: [PATCH 0075/1114] Differentiate how tags increment for actions and
 connections

---
 .../src/org/lflang/analyses/uclid/UclidGenerator.java    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
index 4144cb3126..7ecb19f17f 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
@@ -386,9 +386,14 @@ protected void generateTimingSemantics() {
             "    || (pi1(t1) == pi1(t2) && pi2(t1) < pi2(t2))",
             "    || (!isInf(t1) && isInf(t2));",
             "",
+            "// Used for incrementing a tag through an action",
             "define tag_schedule(t : tag_t, i : integer) : tag_t",
             "= if (i == 0) then { pi1(t), pi2(t)+1 } else { pi1(t)+i, 0 };",
             "",
+            "// Used for incrementing a tag along a connection",
+            "define tag_delay(t : tag_t, i : integer) : tag_t",
+            "= if (i == 0) then { pi1(t), pi2(t) } else { pi1(t)+i, 0 };",
+            "",
             "// Only consider timestamp for now.",
             "define tag_diff(t1, t2: tag_t) : interval_t",
             "= if (!isInf(t1) && !isInf(t2))",
@@ -776,7 +781,7 @@ protected void generateTriggersAndReactions() {
                         "    finite_exists (j : integer) in indices :: j > i && j <= END",
                         "    && " + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(j))",
                         "    && " + destination.getFullNameWithJoiner("_") + "(s(j)) == " + source.getFullNameWithJoiner("_") + "(s(i))",
-                        connection.isPhysical() ? "" : "&& g(j) == tag_schedule(g(i), " + delay + ")",
+                        connection.isPhysical() ? "" : "&& g(j) == tag_delay(g(i), " + delay + ")",
                         ")",
                         ")) // Closes (" + source.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> ((.",
                         //// Separator
@@ -785,7 +790,7 @@ protected void generateTriggersAndReactions() {
                         "&& (" + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
                         "    finite_exists (j : integer) in indices :: j >= START && j < i",
                         "    && " + source.getFullNameWithJoiner("_") + "_is_present" + "(t(j))",
-                        connection.isPhysical() ? "" : "    && g(i) == tag_schedule(g(j), " + delay + ")",
+                        connection.isPhysical() ? "" : "    && g(i) == tag_delay(g(j), " + delay + ")",
                         ")) // Closes the one-to-one relationship.",
                         "));"
                     ));

From 185f6f275897734c87c9bb0d9b23f3741dae7df1 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Tue, 3 Jan 2023 15:20:54 +0800
Subject: [PATCH 0076/1114] Fix CT calculation, fix state space node insertion,
 support manually specified CT, support the --no-verify flag

---
 org.lflang/src/org/lflang/TargetConfig.java   |   6 +
 org.lflang/src/org/lflang/TargetProperty.java |   9 +
 .../statespace/StateSpaceDiagram.java         |  41 +++--
 .../statespace/StateSpaceExplorer.java        |  76 ++++++--
 .../analyses/statespace/StateSpaceNode.java   |  10 +-
 .../lflang/analyses/uclid/UclidGenerator.java | 174 +++++++++++-------
 org.lflang/src/org/lflang/cli/Lfc.java        |   1 +
 .../org/lflang/generator/GeneratorUtils.java  |   3 +
 .../src/org/lflang/generator/LFGenerator.java |  10 +-
 .../lflang/generator/LFGeneratorContext.java  |   1 +
 .../org/lflang/validation/AttributeSpec.java  |   7 +-
 11 files changed, 232 insertions(+), 106 deletions(-)

diff --git a/org.lflang/src/org/lflang/TargetConfig.java b/org.lflang/src/org/lflang/TargetConfig.java
index 7409cd4b27..31c02742be 100644
--- a/org.lflang/src/org/lflang/TargetConfig.java
+++ b/org.lflang/src/org/lflang/TargetConfig.java
@@ -182,6 +182,12 @@ public class TargetConfig {
      */
     public boolean noRuntimeValidation = false;
 
+    /**
+     * If true, do not check the generated verification model.
+     * The default is false.
+     */
+    public boolean noVerify = false;
+
     /**
      * Set the target platform config.
      * This tells the build system what platform-specific support
diff --git a/org.lflang/src/org/lflang/TargetProperty.java b/org.lflang/src/org/lflang/TargetProperty.java
index 71f6060c19..22308111c1 100644
--- a/org.lflang/src/org/lflang/TargetProperty.java
+++ b/org.lflang/src/org/lflang/TargetProperty.java
@@ -291,6 +291,15 @@ public enum TargetProperty {
                 config.noRuntimeValidation = ASTUtils.toBoolean(value);
             }),
 
+    /**
+     * Directive to not check the generated verification model.
+     */
+    NO_VERIFY("no-verify", PrimitiveType.BOOLEAN,
+            Arrays.asList(Target.C),
+            (config, value, err) -> {
+                config.noVerify = ASTUtils.toBoolean(value);
+            }),
+
     /**
      * Directive to specify the platform for cross code generation. This is either a string of the platform
      * or a dictionary of options that includes the string name.
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
index 2573b9841e..6f25bb60d1 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
@@ -54,7 +54,7 @@ public class StateSpaceDiagram extends DirectedGraph<StateSpaceNode> {
     /**
      * 
      */
-    private final boolean compactDot = true;
+    private final boolean compactDot = false;
 
     /**
      * Before adding the node, assign it an index.
@@ -81,31 +81,38 @@ public StateSpaceNode getDownstreamNode(StateSpaceNode node) {
     public void display() {
         System.out.println("*************************************************");
         System.out.println("* Pretty printing worst-case state space diagram:");
-        StateSpaceNode node = this.head;
         long timestamp;
-        while (node != null) {
+        StateSpaceNode node = this.head;
+        if (node == null) {
+            System.out.println("* EMPTY");
+            System.out.println("*************************************************");
+            return;
+        }
+        while(node != this.tail) {
             System.out.print("* State " + node.index + ": ");
             node.display();
 
             // Store the tag of the prior step.
             timestamp = node.tag.timestamp;
 
-            if (!node.equals(this.tail)) {
-                // Assume a unique next state.
-                node = getDownstreamNode(node);
+            // Assume a unique next state.
+            node = getDownstreamNode(node);
 
-                // Compute time difference
-                if (node != null) {
-                    TimeValue tsDiff = TimeValue.fromNanoSeconds(node.tag.timestamp - timestamp);
-                    System.out.println("*     => Advance time by " + tsDiff + " ns");
-                }
+            // Compute time difference
+            if (node != null) {
+                TimeValue tsDiff = TimeValue.fromNanoSeconds(node.tag.timestamp - timestamp);
+                System.out.println("*     => Advance time by " + tsDiff);
             }
-            else break;
         }
+
+        // Print tail node
+        System.out.print("* (Tail) state " + node.index + ": ");
+        node.display();
+
         if (this.loopNode != null) {
             // Compute time difference
             TimeValue tsDiff = TimeValue.fromNanoSeconds(loopNodeNext.tag.timestamp - tail.tag.timestamp);
-            System.out.println("*     => Advance time by " + tsDiff + " ns");
+            System.out.println("*     => Advance time by " + tsDiff);
 
             System.out.println("* Goes back to loop node: state " + this.loopNode.index);
             System.out.print("* Loop node reached 2nd time: ");
@@ -145,14 +152,18 @@ public CodeBuilder generateDot() {
                         + "\"" + "]");
                 }
             } else {
+                System.out.println("***** nodes: " + this.nodes());
                 for (StateSpaceNode n : this.nodes()) {
                     List<String> reactions = n.reactionsInvoked.stream()
                         .map(ReactionInstance::getFullName).collect(Collectors.toList());
                     String reactionsStr = String.join("\\n", reactions);
+                    List<String> events = n.eventQ.stream()
+                        .map(Event::toString).collect(Collectors.toList());
+                    String eventsStr = String.join("\\n", events);
                     dot.pr("S" + n.index + " [" + "label = \"" + "S" + n.index
                         + " | " + n.tag
-                        + " | " + reactionsStr
-                        + " | " + "Pending events: " + n.eventQ.size()
+                        + " | " + "Reactions invoked:\\n" + reactionsStr
+                        + " | " + "Pending events:\\n" + eventsStr
                         + "\"" + "]");
                 }
             }
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
index 3d5e32d04d..e9a3d5e0ec 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
@@ -124,11 +124,16 @@ public void explore(Tag horizon, boolean findLoop) {
         ArrayList<ReactionInstance> reactionsTemp;
 
         while (!stop) {
+
             // Pop the events from the earliest tag off the event queue.
             ArrayList<Event> currentEvents = new ArrayList<Event>();
             // FIXME: Use stream methods here?
-            while (eventQ.size() > 0 && eventQ.peek().tag.compareTo(currentTag) == 0) {
+            while (
+                eventQ.size() > 0 
+                && eventQ.peek().tag.compareTo(currentTag) == 0
+            ) {
                 Event e = eventQ.poll();
+                // System.out.println("DEBUG: Popped an event: " + e);
                 currentEvents.add(e);
             }
 
@@ -139,6 +144,7 @@ public void explore(Tag horizon, boolean findLoop) {
                 Set<ReactionInstance> dependentReactions
                     = e.trigger.getDependentReactions();
                 reactionsTemp.addAll(dependentReactions);
+                // System.out.println("DEBUG: ReactionTemp: " + reactionsTemp);
 
                 // If the event is a timer firing, enqueue the next firing.
                 if (e.trigger instanceof TimerInstance) {
@@ -146,7 +152,7 @@ public void explore(Tag horizon, boolean findLoop) {
                     eventQ.add(new Event(
                         timer,
                         new Tag(
-                            currentTag.timestamp + timer.getPeriod().toNanoSeconds(),
+                            e.tag.timestamp + timer.getPeriod().toNanoSeconds(),
                             0, // A time advancement resets microstep to 0.
                             false
                         ))
@@ -187,6 +193,7 @@ public void explore(Tag horizon, boolean findLoop) {
                                     downstreamPort,
                                     new Tag(currentTag.timestamp + delay, 0, false)
                                 );
+                                // System.out.println("DEBUG: Added a port event: " + e);
                                 eventQ.add(e);
                             }
                         }
@@ -194,11 +201,16 @@ public void explore(Tag horizon, boolean findLoop) {
                     else if (effect instanceof ActionInstance) {
                         // Get the minimum delay of this action.
                         long min_delay = ((ActionInstance)effect).getMinDelay().toNanoSeconds();
+                        long microstep = 0;
+                        if (min_delay == 0) {
+                            microstep = currentTag.microstep + 1;
+                        }
                         // Create and enqueue a new event.
                         Event e = new Event(
                             effect,
-                            new Tag(currentTag.timestamp + min_delay, 0, false)
+                            new Tag(currentTag.timestamp + min_delay, microstep, false)
                         );
+                        // System.out.println("DEBUG: Added an action event: " + e);
                         eventQ.add(e);
                     }
                 }
@@ -207,6 +219,7 @@ else if (effect instanceof ActionInstance) {
             // We are at the first iteration.
             // Initialize currentNode.
             if (previousTag == null) {
+                // System.out.println("DEBUG: Case 1");
                 //// Now we are done with the node at the previous tag,
                 //// work on the new node at the current timestamp.
                 // Copy the reactions in reactionsTemp.
@@ -226,20 +239,24 @@ else if (effect instanceof ActionInstance) {
                 // Initialize currentNode.
                 currentNode = node;
             }
-            // When we advance to a new tag,
+            // When we advance to a new TIMESTAMP (not a new tag),
             // create a new node in the state space diagram
-            // for everything processed in the previous tag.
+            // for everything processed in the previous timestamp.
+            // This makes sure that the granularity of nodes is
+            // at the timestamp-level, so that we don't have to
+            // worry about microsteps.
             else if (
                 previousTag != null
-                && currentTag.compareTo(previousTag) > 0
+                && currentTag.timestamp > previousTag.timestamp
             ) {
+                // System.out.println("DEBUG: Case 2");
                 // Whenever we finish a tag, check for loops fist.
                 // If currentNode matches an existing node in uniqueNodes,
                 // duplicate is set to the existing node.
                 StateSpaceNode duplicate;
                 if (findLoop &&
                     (duplicate = uniqueNodes.put(
-                        currentNode.hashCode(), currentNode)) != null) {
+                        currentNode.hash(), currentNode)) != null) {
 
                     // Mark the loop in the diagram.
                     loopFound = true;
@@ -251,19 +268,24 @@ else if (
                     this.diagram.loopPeriod = this.diagram.loopNodeNext.tag.timestamp
                                                 - this.diagram.loopNode.tag.timestamp;
                     this.diagram.addEdge(this.diagram.loopNode, this.diagram.tail);
-                    System.out.println("LoopNode index " + this.diagram.loopNode.index); // Why is this 5?
                     return; // Exit the while loop early.
                 }
 
                 // Now we are at a new tag, and a loop is not found,
                 // add the node to the state space diagram.
+                // Adding a node to the graph once it is finalized
+                // because this makes checking duplicate nodes easier.
+                // We don't have to remove a node from the graph.
                 this.diagram.addNode(currentNode);
+                this.diagram.tail = currentNode; // Update the current tail.
                 
                 // If the head is not empty, add an edge from the previous state
                 // to the next state. Otherwise initialize the head to the new node.
-                if (this.diagram.head != null) {
+                if (previousNode != null) {
                     // System.out.println("--- Add a new edge between " + currentNode + " and " + node);
-                    this.diagram.addEdge(currentNode, previousNode); // Sink first, then source
+                    // this.diagram.addEdge(currentNode, previousNode); // Sink first, then source
+                    if (previousNode != currentNode)
+                        this.diagram.addEdge(currentNode, previousNode);
                 }
                 else
                     this.diagram.head = currentNode; // Initialize the head.
@@ -289,16 +311,18 @@ else if (
                 // Update the current node to the new (potentially incomplete) node.
                 currentNode = node;
             }
-            // Time does not advance because we are processing
+            // Timestamp does not advance because we are processing
             // connections with zero delay.
             else if (
                 previousTag != null
-                && currentTag.compareTo(previousTag) == 0
+                && currentTag.timestamp == previousTag.timestamp
             ) {
+                // System.out.println("DEBUG: Case 3");
                 // Add reactions explored in the current loop iteration
                 // to the existing state space node.
                 currentNode.reactionsInvoked.addAll(reactionsTemp);
-            }
+                // Update the eventQ snapshot.
+                currentNode.eventQ = new ArrayList<Event>(eventQ);            }
             else {
                 // Unreachable
                 Exceptions.sneakyThrow(new Exception("Reached an unreachable part."));
@@ -313,10 +337,32 @@ else if (
             // Stop if:
             // 1. the event queue is empty, or
             // 2. the horizon is reached.
-            if (eventQ.size() == 0 
-                || currentTag.compareTo(horizon) > 0)
+            if (eventQ.size() == 0) {
+                // System.out.println("DEBUG: Stopping because eventQ is empty!");
+                stop = true;
+            }
+            else if (currentTag.timestamp > horizon.timestamp) {
+                // System.out.println("DEBUG: Stopping because horizon is reached! Horizon: " + horizon + " Current Tag: " + currentTag);
+                // System.out.println("DEBUG: EventQ: " + eventQ);
                 stop = true;
+            }
         }
+
+        // Check if the last current node is added to the graph yet.
+        // If not, add it now.
+        // This could happen when condition (previousTag == null)
+        // or (previousTag != null
+        // && currentTag.compareTo(previousTag) > 0) is true and then
+        // the simulation ends, leaving a new node dangling.
+        if (previousNode == null 
+            || previousNode.tag.timestamp < currentNode.tag.timestamp) {
+            this.diagram.addNode(currentNode);
+            this.diagram.tail = currentNode; // Update the current tail.
+            if (previousNode != null) {
+                this.diagram.addEdge(currentNode, previousNode);
+            }
+        }
+
         // When we exit and we still don't have a head,
         // that means there is only one node in the diagram.
         // Set the current node as the head.
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
index abfc1d5c48..f1556c70e3 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
@@ -81,10 +81,14 @@ && equidistant(this, node))
     }
 
     /**
-     * Generate hash code for the node.
+     * Generate hash for the node.
+     * This hash function is used for checking
+     * the uniqueness of nodes.
+     * It is not meant to be used as a hashCode()
+     * because doing so interferes with node
+     * insertion in the state space diagram.
      */
-    @Override
-    public int hashCode() {
+    public int hash() {
         // Initial value
         int result = 17;
 
diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
index 7ecb19f17f..dafaae2e0e 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
@@ -39,6 +39,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
 import org.antlr.v4.runtime.CharStreams;
@@ -94,6 +95,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.generator.TriggerInstance;
 import org.lflang.generator.c.CGenerator;
 import org.lflang.lf.Action;
+import org.lflang.lf.AttrParm;
 import org.lflang.lf.Attribute;
 import org.lflang.lf.Code;
 import org.lflang.lf.Connection;
@@ -165,7 +167,7 @@ public class UclidGenerator extends GeneratorBase {
     protected long                      horizon             = 0; // in nanoseconds
     protected String                    FOLSpec             = "";
     protected int                       CT                  = 0;
-    protected static final int          CT_MAX_SUPPORTED    = 20;
+    protected static final int          CT_MAX_SUPPORTED    = 100;
 
     // Constructor
     public UclidGenerator(FileConfig fileConfig, ErrorReporter errorReporter, List<Attribute> properties) {
@@ -189,8 +191,6 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         
         ////////////////////////////////////////
         
-        System.out.println("*** Start generating Uclid code.");
-
         // Create the main reactor instance if there is a main reactor.
         createMainReactorInstance();
 
@@ -223,7 +223,14 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
 
             processMTLSpec();
             
-            computeCT();
+            Optional<AttrParm> CTattr = prop.getAttrParms().stream()
+                            .filter(attr -> attr.getName().equals("CT"))
+                            .findFirst();
+            if (CTattr.isPresent()) {
+                this.CT = Integer.parseInt(CTattr.get().getValue());
+            } else {
+                computeCT();
+            }   
             if (this.CT > CT_MAX_SUPPORTED) {
                 System.out.println("ERROR: The maximum steps supported is " + CT_MAX_SUPPORTED
                     + " but checking this property requires " + this.CT + " steps. "
@@ -863,48 +870,48 @@ protected void generateTriggersAndReactions() {
             /**
              * The timer axioms take the following form:
              * 
-            // An initial firing at {offset, 0}
-            axiom(
-                ((g(END)._1 >= 500000000) ==> (
-                    finite_exists (j : integer) in indices :: (j > START && j <= END)
-                        && Timer_t_is_present(t(j))
-                        && tag_same(g(j), {500000000, 0})
-                ))
-                && ((g(END)._1 < 500000000) ==> (
-                    finite_forall (i : integer) in indices :: (i > START && i <= END)
-                        ==> (!isNULL(i))
-                ))
-            );
-            // Schedule subsequent firings.
-            axiom(
-                finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (
-                    Timer_t_is_present(t(i)) ==> (
-                        (
-                            finite_exists (j : integer) in indices :: (j >= START && j > i)
-                                && Timer_t_is_present(t(j))
-                                && (g(j) == tag_schedule(g(i), 1000000000))
-                        )
-                    )
-                )
-            );
-            // All firings must be evenly spaced out.
-            axiom(
-                finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (
-                    Timer_t_is_present(t(i)) ==> (
-                        // Timestamp must be offset + n * period
-                        (
-                            exists (n : integer) :: (
-                                n >= 0 &&
-                                g(i)._1 == 500000000 + n * 1000000000
-                            )
-                        )
-                        // Microstep must be 0
-                        && (
-                            g(i)._2 == 0
-                        )
-                    )
-                )
-            );
+             * // An initial firing at {offset, 0}
+             * axiom(
+             *     ((g(END)._1 >= 500000000) ==> (
+             *         finite_exists (j : integer) in indices :: (j > START && j <= END)
+             *             && Timer_t_is_present(t(j))
+             *             && tag_same(g(j), {500000000, 0})
+             *     ))
+             *     && ((g(END)._1 < 500000000) ==> (
+             *         finite_forall (i : integer) in indices :: (i > START && i <= END)
+             *             ==> (!isNULL(i))
+             *     ))
+             * );
+             * // Schedule subsequent firings.
+             * axiom(
+             *     finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (
+             *         Timer_t_is_present(t(i)) ==> (
+             *             (
+             *                 finite_exists (j : integer) in indices :: (j >= START && j > i)
+             *                     && Timer_t_is_present(t(j))
+             *                     && (g(j) == tag_schedule(g(i), 1000000000))
+             *             )
+             *         )
+             *     )
+             * );
+             * // All firings must be evenly spaced out.
+             * axiom(
+             *     finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (
+             *         Timer_t_is_present(t(i)) ==> (
+             *             // Timestamp must be offset + n * period
+             *             (
+             *                 exists (n : integer) :: (
+             *                     n >= 0 &&
+             *                     g(i)._1 == 500000000 + n * 1000000000
+             *                 )
+             *             )
+             *             // Microstep must be 0
+             *             && (
+             *                 g(i)._2 == 0
+             *             )
+             *         )
+             *     )
+             * );
              */
             for (var timer : this.timerInstances) {
                 long offset = timer.getOffset().toNanoSeconds();
@@ -1085,7 +1092,7 @@ protected void generateReactionAxioms() {
 
         for (ReactionInstance.Runtime reaction : this.reactionInstances) {
             String body = reaction.getReaction().getDefinition().getCode().getBody();
-            // System.out.println("Printing reaction body of " + reaction);
+            // System.out.println("DEBUG: Printing reaction body of " + reaction);
             // System.out.println(body);
 
             // Generate a parse tree.
@@ -1145,7 +1152,7 @@ protected void generateReactionAxioms() {
                     defaultBehaviorConditions.put(instance, new ArrayList<CAst.AstNode>());
                 }
                 defaultBehaviorConditions.get(instance).add(ifBlockNode.left);
-                // System.out.println("!!! Added another reset condition: " + ifBlockNode.left);
+                // System.out.println("DEBUG: Added a reset condition: " + ifBlockNode.left);
             }
 
             // Generate Uclid axiom for the C AST.
@@ -1447,15 +1454,13 @@ private void computeCT() {
             if (this.logicalTimeBased)
                 this.CT = diagram.nodeCount();
             else {
-                // FIXME: This could be much more efficient with a linkedlist implementation.
+                // FIXME: This could be much more efficient with
+                // a linkedlist implementation. We can go straight
+                // to the next node.
                 StateSpaceNode node = diagram.head;
                 this.CT = diagram.head.reactionsInvoked.size();
-                while (diagram.getDownstreamAdjacentNodes(node).size() != 0) {
-                    Set<StateSpaceNode> downstreamNodes = diagram.getDownstreamAdjacentNodes(node);
-                    for (StateSpaceNode n : downstreamNodes) {
-                        node = n; // Go to the next node.
-                        break;
-                    }
+                while (node != diagram.tail) {
+                    node = diagram.getDownstreamNode(node);
                     this.CT += node.reactionsInvoked.size();
                 }
             }
@@ -1466,18 +1471,41 @@ private void computeCT() {
             // Subtract the non-periodic logical time
             // interval from the total horizon.
             long horizonRemained =
-                this.horizon - diagram.loopNode.tag.timestamp;
+                Math.subtractExact(this.horizon, diagram.loopNode.tag.timestamp);
         
             // Check how many loop iteration is required
             // to check the remaining horizon.
-            int loopIterations = (int) Math.ceil(
-                (double) horizonRemained / diagram.loopPeriod);
+            int loopIterations = 0; 
+            if (diagram.loopPeriod == 0 && horizonRemained != 0)
+                Exceptions.sneakyThrow(new Exception(
+                    "ERROR: Zeno behavior detected while the horizon is non-zero. The program has no finite CT."));
+            else if (diagram.loopPeriod == 0 && horizonRemained == 0) {
+                // Handle this edge case.
+                Exceptions.sneakyThrow(new Exception(
+                    "Unhandled case: both the horizon and period are 0!"));
+            }
+            else {
+                loopIterations = (int) Math.ceil(
+                    (double) horizonRemained / diagram.loopPeriod);
+            }
+            
 
             if (this.logicalTimeBased) {
-                // CT = steps required for the non-periodic part
-                //      + steps required for the periodic part
+                /*
+                CT = steps required for the non-periodic part
+                     + steps required for the periodic part
+                
                 this.CT = (diagram.loopNode.index + 1)
                     + (diagram.tail.index - diagram.loopNode.index + 1) * loopIterations;
+                
+                An overflow-safe version of the line above
+                */
+                int t0 = Math.addExact(diagram.loopNode.index, 1);
+                int t1 = Math.subtractExact(diagram.tail.index, diagram.loopNode.index);
+                int t2 = Math.addExact(t1, 1);
+                int t3 = Math.multiplyExact(t2, loopIterations);
+                this.CT = Math.addExact(t0, t3);
+                
             } else {
                 // Get the number of events before the loop starts.
                 // This stops right before the loopNode is encountered.
@@ -1487,6 +1515,8 @@ private void computeCT() {
                     numReactionInvocationsBeforeLoop += node.reactionsInvoked.size();
                     node = diagram.getDownstreamNode(node);
                 }
+                // Account for the loop node in numReactionInvocationsBeforeLoop.
+                numReactionInvocationsBeforeLoop += node.reactionsInvoked.size();
                 
                 // Count the events from the loop node until
                 // loop node is reached again.
@@ -1496,10 +1526,20 @@ private void computeCT() {
                     numReactionInvocationsInsideLoop += node.reactionsInvoked.size();
                 } while (node != diagram.loopNode);
 
-                // CT = steps required for the non-periodic part
-                //      + steps required for the periodic part
+                /*
+                CT = steps required for the non-periodic part
+                     + steps required for the periodic part
+                
                 this.CT = numReactionInvocationsBeforeLoop
                     + numReactionInvocationsInsideLoop * loopIterations;
+                
+                An overflow-safe version of the line above
+                */
+                // System.out.println("DEBUG: numReactionInvocationsBeforeLoop: " + numReactionInvocationsBeforeLoop);
+                // System.out.println("DEBUG: numReactionInvocationsInsideLoop: " + numReactionInvocationsInsideLoop);
+                // System.out.println("DEBUG: loopIterations: " + loopIterations);
+                int t0 = Math.multiplyExact(numReactionInvocationsInsideLoop, loopIterations);
+                this.CT = Math.addExact(numReactionInvocationsBeforeLoop, t0);
             }
             System.out.println("CT: " + this.CT);
         }
@@ -1509,11 +1549,11 @@ private void computeCT() {
      * Process an MTL property.
      */
     private void processMTLSpec() {
-        MTLLexer lexer = new MTLLexer(CharStreams.fromString(this.spec));
-        CommonTokenStream tokens = new CommonTokenStream(lexer);
-        MTLParser parser = new MTLParser(tokens);
-        MtlContext mtlCtx = parser.mtl();
-        MTLVisitor visitor = new MTLVisitor(this.tactic);
+        MTLLexer            lexer   = new MTLLexer(CharStreams.fromString(this.spec));
+        CommonTokenStream   tokens  = new CommonTokenStream(lexer);
+        MTLParser           parser  = new MTLParser(tokens);
+        MtlContext          mtlCtx  = parser.mtl();
+        MTLVisitor          visitor = new MTLVisitor(this.tactic);
 
         // The visitor transpiles the MTL into a Uclid axiom.
         this.FOLSpec = visitor.visitMtl(mtlCtx, "i", 0, "0", 0);
diff --git a/org.lflang/src/org/lflang/cli/Lfc.java b/org.lflang/src/org/lflang/cli/Lfc.java
index c403d1580e..428e3195d2 100644
--- a/org.lflang/src/org/lflang/cli/Lfc.java
+++ b/org.lflang/src/org/lflang/cli/Lfc.java
@@ -69,6 +69,7 @@ enum CLIOption {
         LOGGING(BuildParm.LOGGING, null, true, false, true),
         LINT(BuildParm.LINT, "l",false, false,  true),
         NO_COMPILE(BuildParm.NO_COMPILE, "n", false, false, true),
+        NO_VERIFY(BuildParm.NO_VERIFY, null, false, false, true),
         OUTPUT_PATH(BuildParm.OUTPUT_PATH, "o", true, false, false),
         QUIET(BuildParm.QUIET, "q", false, false,  true),
         RTI(BuildParm.RTI, "r", true, false, true),
diff --git a/org.lflang/src/org/lflang/generator/GeneratorUtils.java b/org.lflang/src/org/lflang/generator/GeneratorUtils.java
index d0f6978010..2c675753fd 100644
--- a/org.lflang/src/org/lflang/generator/GeneratorUtils.java
+++ b/org.lflang/src/org/lflang/generator/GeneratorUtils.java
@@ -85,6 +85,9 @@ public static void setTargetConfig(
         if (context.getArgs().containsKey("no-compile")) {
             targetConfig.noCompile = true;
         }
+        if (context.getArgs().containsKey("no-verify")) {
+            targetConfig.noVerify = true;
+        }
         if (context.getArgs().containsKey("build-type")) {
             targetConfig.cmakeBuildType = (BuildType) UnionType.BUILD_TYPE_UNION.forName(context.getArgs().getProperty("build-type"));
         }
diff --git a/org.lflang/src/org/lflang/generator/LFGenerator.java b/org.lflang/src/org/lflang/generator/LFGenerator.java
index 0c17297173..d6f97a281f 100644
--- a/org.lflang/src/org/lflang/generator/LFGenerator.java
+++ b/org.lflang/src/org/lflang/generator/LFGenerator.java
@@ -171,7 +171,7 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa,
         // If "-c" or "--clean" is specified, delete any existing generated directories.
         cleanIfNeeded(lfContext, fileConfig);
 
-        // Check if @property is used. If so, include UclidGenerator.
+        // Check if @property is used. If so, instantiate a UclidGenerator.
         // The verification model needs to be generated before the target code
         // since code generation changes LF program (desugar connections, etc.).
         Reactor main = ASTUtils.getMainReactor(resource);
@@ -183,8 +183,12 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa,
             UclidGenerator uclidGenerator = new UclidGenerator(fileConfig, errorReporter, properties);
             // Generate uclid files.
             uclidGenerator.doGenerate(resource, lfContext);
-            // Invoke the generated uclid files.
-            uclidGenerator.runner.run();
+            if (uclidGenerator.targetConfig.noVerify == false) {
+                // Invoke the generated uclid files.
+                uclidGenerator.runner.run();
+            } else {
+                System.out.println("\"no-verify\" is set to true. Skip checking the verification model.");
+            }
         }
 
         // Generate target code from the LF program.
diff --git a/org.lflang/src/org/lflang/generator/LFGeneratorContext.java b/org.lflang/src/org/lflang/generator/LFGeneratorContext.java
index f1f2a49ac8..10dae5f70e 100644
--- a/org.lflang/src/org/lflang/generator/LFGeneratorContext.java
+++ b/org.lflang/src/org/lflang/generator/LFGeneratorContext.java
@@ -33,6 +33,7 @@ public enum BuildParm {
         LOGGING("The logging level to use by the generated binary"),
         LINT("Enable or disable linting of generated code."),
         NO_COMPILE("Do not invoke target compiler."),
+        NO_VERIFY("Do not check the generated verification model."),
         OUTPUT_PATH("Specify the root output directory."),
         QUIET("Suppress output of the target compiler and other commands"),
         RTI("Specify the location of the RTI."),
diff --git a/org.lflang/src/org/lflang/validation/AttributeSpec.java b/org.lflang/src/org/lflang/validation/AttributeSpec.java
index b1373b8323..bacd73f23c 100644
--- a/org.lflang/src/org/lflang/validation/AttributeSpec.java
+++ b/org.lflang/src/org/lflang/validation/AttributeSpec.java
@@ -218,9 +218,10 @@ enum AttrParamType {
         // SMTL is the safety fragment of Metric Temporal Logic (MTL).
         ATTRIBUTE_SPECS_BY_NAME.put("property", new AttributeSpec(
             List.of(
-                new AttrParamSpec("name", AttrParamType.STRING, null),
-                new AttrParamSpec("tactic", AttrParamType.STRING, null),
-                new AttrParamSpec("spec", AttrParamType.STRING, null)
+                new AttrParamSpec("name", AttrParamType.STRING, "test"),
+                new AttrParamSpec("tactic", AttrParamType.STRING, "bmc"),
+                new AttrParamSpec("spec", AttrParamType.STRING, "false"),
+                new AttrParamSpec("CT", AttrParamType.INT, null)
             )
         ));
     }

From a1b27eae52db9d41db40f57a40e84227ee0cb38b Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 4 Jan 2023 23:00:11 +0800
Subject: [PATCH 0077/1114] Compare timestamps only to match MTL semantics.

---
 .../statespace/StateSpaceDiagram.java         |  1 -
 .../org/lflang/analyses/uclid/MTLVisitor.java | 24 ++++++++-----------
 .../lflang/analyses/uclid/UclidGenerator.java |  7 +++---
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
index 6f25bb60d1..7a0f4eff5e 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
@@ -152,7 +152,6 @@ public CodeBuilder generateDot() {
                         + "\"" + "]");
                 }
             } else {
-                System.out.println("***** nodes: " + this.nodes());
                 for (StateSpaceNode n : this.nodes()) {
                     List<String> reactions = n.reactionsInvoked.stream()
                         .map(ReactionInstance::getFullName).collect(Collectors.toList());
diff --git a/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
index 43c546a097..5a3e492263 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
@@ -428,30 +428,26 @@ private String generateTimePredicate(MTLParser.IntervalContext ctx,
 
         if (ctx instanceof MTLParser.SingletonContext) {
             MTLParser.SingletonContext singletonCtx = (MTLParser.SingletonContext)ctx;
-            timePredicate += "tag_same(g(" + prefixIdx + "), " + "tag_schedule(g(" 
+            timePredicate += "tag_same(g(" + prefixIdx + "), " + "tag_delay(g(" 
                                 + prevPrefixIdx + "), " + upperBoundNanoSec + "))";
         } else {
+            // Since MTL doesn't include microsteps, we only compare timestamps here.
             MTLParser.RangeContext rangeCtx = (MTLParser.RangeContext)ctx;
             timePredicate += "(";
             if (rangeCtx.LBRACKET() != null) {
-                // FIXME: Check if this can be replaced by a !tag_earlier.
-                timePredicate += "tag_later(g(" + prefixIdx + "), "
-                    + "tag_schedule(g(" + prevPrefixIdx + "), " + lowerBoundNanoSec + "))"
-                    + " || " + "tag_same(g(" + prefixIdx + "), "
-                    + "tag_schedule(g(" + prevPrefixIdx + "), " + lowerBoundNanoSec + "))";
+                timePredicate += "pi1(g(" + prefixIdx + "))" + " >= "
+                    + "(" + "pi1(g(" + prevPrefixIdx + "))" + " + " + lowerBoundNanoSec + ")";
             } else {
-                timePredicate += "tag_later(g(" + prefixIdx + "), "
-                    + "tag_schedule(g(" + prevPrefixIdx + "), " + lowerBoundNanoSec + "))";
+                timePredicate += "pi1(g(" + prefixIdx + "))" + " > "
+                    + "(" + "pi1(g(" + prevPrefixIdx + "))" + " + " + lowerBoundNanoSec + ")";
             }
             timePredicate += ") && (";
             if (rangeCtx.RBRACKET() != null) {
-                timePredicate += "tag_earlier(g(" + prefixIdx + "), "
-                    + "tag_schedule(g(" + prevPrefixIdx + "), " + upperBoundNanoSec + "))"
-                    + " || " + "tag_same(g(" + prefixIdx + "), "
-                    + "tag_schedule(g(" + prevPrefixIdx + "), " + upperBoundNanoSec + "))";
+                timePredicate += "pi1(g(" + prefixIdx + "))" + " <= "
+                    + "(" + "pi1(g(" + prevPrefixIdx + "))" + " + " + lowerBoundNanoSec + ")";
             } else {
-                timePredicate += "tag_earlier(g(" + prefixIdx + "), "
-                    + "tag_schedule(g(" + prevPrefixIdx + "), " + upperBoundNanoSec + "))";
+                timePredicate += "pi1(g(" + prefixIdx + "))" + " < "
+                    + "(" + "pi1(g(" + prevPrefixIdx + "))" + " + " + lowerBoundNanoSec + ")";
             }
             timePredicate += ")";
         }
diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
index dafaae2e0e..f3ec063c0f 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
@@ -230,7 +230,9 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
                 this.CT = Integer.parseInt(CTattr.get().getValue());
             } else {
                 computeCT();
-            }   
+            }
+            // For automating data collection, print the CT to stderr.
+            System.err.println("CT: " + this.CT);
             if (this.CT > CT_MAX_SUPPORTED) {
                 System.out.println("ERROR: The maximum steps supported is " + CT_MAX_SUPPORTED
                     + " but checking this property requires " + this.CT + " steps. "
@@ -1464,7 +1466,6 @@ private void computeCT() {
                     this.CT += node.reactionsInvoked.size();
                 }
             }
-            System.out.println("CT: " + this.CT);
         } 
         // Over-approximate CT by estimating the number of loop iterations required.
         else {
@@ -1489,7 +1490,6 @@ else if (diagram.loopPeriod == 0 && horizonRemained == 0) {
                     (double) horizonRemained / diagram.loopPeriod);
             }
             
-
             if (this.logicalTimeBased) {
                 /*
                 CT = steps required for the non-periodic part
@@ -1541,7 +1541,6 @@ else if (diagram.loopPeriod == 0 && horizonRemained == 0) {
                 int t0 = Math.multiplyExact(numReactionInvocationsInsideLoop, loopIterations);
                 this.CT = Math.addExact(numReactionInvocationsBeforeLoop, t0);
             }
-            System.out.println("CT: " + this.CT);
         }
     }
 

From cf691238bd16e1a38013355ee13fa54306eadd5b Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 12 Jan 2023 15:38:52 +0100
Subject: [PATCH 0078/1114] Ensure uniqueness of reactions and events during
 state space exploration

---
 .../analyses/statespace/EventQueue.java       | 24 +++++++++++++++++++
 .../statespace/StateSpaceExplorer.java        | 20 +++++++++-------
 .../analyses/statespace/StateSpaceNode.java   |  5 ++--
 3 files changed, 38 insertions(+), 11 deletions(-)
 create mode 100644 org.lflang/src/org/lflang/analyses/statespace/EventQueue.java

diff --git a/org.lflang/src/org/lflang/analyses/statespace/EventQueue.java b/org.lflang/src/org/lflang/analyses/statespace/EventQueue.java
new file mode 100644
index 0000000000..44bb371f14
--- /dev/null
+++ b/org.lflang/src/org/lflang/analyses/statespace/EventQueue.java
@@ -0,0 +1,24 @@
+/**
+ * An event queue implementation that
+ * sorts events by time tag order
+ *
+ * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ */
+package org.lflang.analyses.statespace;
+
+import java.util.PriorityQueue;
+
+public class EventQueue extends PriorityQueue<Event> {
+
+    /**
+     * Modify the original add() by enforcing uniqueness.
+     * There cannot be duplicate events in the event queue.
+     */
+    @Override
+    public boolean add(Event e) {
+        if (this.contains(e))
+            return false;
+        super.add(e);
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
index e9a3d5e0ec..df708228de 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
@@ -7,7 +7,7 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.PriorityQueue;
+import java.util.HashSet;
 import java.util.Set;
 
 import org.eclipse.xtext.xbase.lib.Exceptions;
@@ -25,7 +25,6 @@
 import org.lflang.generator.SendRange;
 import org.lflang.generator.TimerInstance;
 import org.lflang.generator.TriggerInstance;
-
 import org.lflang.lf.Expression;
 import org.lflang.lf.Time;
 import org.lflang.lf.Variable;
@@ -48,7 +47,7 @@ public class StateSpaceExplorer {
      * defines a unique logical timeline (assuming all reactions
      * behave _consistently_ throughout the execution).
      */
-    public PriorityQueue<Event> eventQ = new PriorityQueue<Event>();
+    public EventQueue eventQ = new EventQueue();
 
     /**
      * The main reactor instance based on which the state space
@@ -119,9 +118,9 @@ public void explore(Tag horizon, boolean findLoop) {
         }
 
         // A list of reactions invoked at the current logical tag
-        ArrayList<ReactionInstance> reactionsInvoked;
+        Set<ReactionInstance> reactionsInvoked;
         // A temporary list of reactions processed in the current LOOP ITERATION
-        ArrayList<ReactionInstance> reactionsTemp;
+        Set<ReactionInstance> reactionsTemp;
 
         while (!stop) {
 
@@ -139,7 +138,10 @@ public void explore(Tag horizon, boolean findLoop) {
 
             // Collect all the reactions invoked in this current LOOP ITERATION
             // triggered by the earliest events.
-            reactionsTemp = new ArrayList<ReactionInstance>();
+            // Using a hash set here to make sure the reactions invoked
+            // are unique. Sometimes multiple events can trigger the same reaction,
+            // and we do not want to record duplicate reaction invocations.
+            reactionsTemp = new HashSet<ReactionInstance>();
             for (Event e : currentEvents) {
                 Set<ReactionInstance> dependentReactions
                     = e.trigger.getDependentReactions();
@@ -223,7 +225,7 @@ else if (effect instanceof ActionInstance) {
                 //// Now we are done with the node at the previous tag,
                 //// work on the new node at the current timestamp.
                 // Copy the reactions in reactionsTemp.
-                reactionsInvoked = new ArrayList<ReactionInstance>(reactionsTemp);
+                reactionsInvoked = new HashSet<ReactionInstance>(reactionsTemp);
 
                 // Create a new state in the SSD for the current tag,
                 // add the reactions triggered to the state,
@@ -233,7 +235,7 @@ else if (effect instanceof ActionInstance) {
                 StateSpaceNode node = new StateSpaceNode(
                     currentTag,                    // Current tag
                     reactionsInvoked,              // Reactions invoked at this tag
-                    new ArrayList<Event>(eventQ)    // A snapshot of the event queue
+                    new ArrayList<Event>(eventQ)   // A snapshot of the event queue
                 );
 
                 // Initialize currentNode.
@@ -293,7 +295,7 @@ else if (
                 //// Now we are done with the node at the previous tag,
                 //// work on the new node at the current timestamp.
                 // Copy the reactions in reactionsTemp.
-                reactionsInvoked = new ArrayList<ReactionInstance>(reactionsTemp);
+                reactionsInvoked = new HashSet<ReactionInstance>(reactionsTemp);
 
                 // Create a new state in the SSD for the current tag,
                 // add the reactions triggered to the state,
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
index f1556c70e3..2c20f05cdd 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
@@ -8,6 +8,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.lflang.TimeValue;
@@ -19,12 +20,12 @@ public class StateSpaceNode {
     public int index;       // Set in StateSpaceDiagram.java
     public Tag tag;
     public TimeValue time;  // Readable representation of tag.timestamp
-    public ArrayList<ReactionInstance> reactionsInvoked;
+    public Set<ReactionInstance> reactionsInvoked;
     public ArrayList<Event> eventQ;
 
     public StateSpaceNode(
         Tag tag,
-        ArrayList<ReactionInstance> reactionsInvoked,
+        Set<ReactionInstance> reactionsInvoked,
         ArrayList<Event> eventQ
     ) {
         this.tag    = tag;

From 1794136ad04827ed8290f285f113756da4934e0b Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sat, 4 Feb 2023 11:00:24 -0800
Subject: [PATCH 0079/1114] Fix the FOL encoding of Globally.

---
 org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
index 5a3e492263..c1f782d16f 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
@@ -224,10 +224,10 @@ public String visitGlobally(MTLParser.GloballyContext ctx,
         this.horizon = currentHorizon;
         String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
                                                     upperBoundNanoSec, "j" + QFIdx, prefixIdx);        
-        return "!(" + "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
+        return "(" + "finite_forall " + "(" + "j" + QFIdx + " : integer) in indices :: "
                 + "j" + QFIdx + " >= " + prefixIdx + " && " + "j" + QFIdx + " <= " + end
                 + " && " + "!" + "isNULL" + "(" + "j" + QFIdx + ")"
-                + " && " + "!" + "(" + visitPrimary(ctx.formula, ("j"+QFIdx), QFIdx+1, prefixIdx, currentHorizon) + ")"
+                + " && " + "(" + visitPrimary(ctx.formula, ("j"+QFIdx), QFIdx+1, prefixIdx, currentHorizon) + ")"
                 + " && " + "(" + "\n" 
                 + "// Time Predicate\n"
                 + timePredicate + "\n"

From 78baf934842b7236c9cd85f475263bdea31c9f6a Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sun, 5 Feb 2023 00:00:25 -0800
Subject: [PATCH 0080/1114] Support lf_schedule_int()

---
 .../cast/BuildAstParseTreeVisitor.java        | 22 +++++--
 .../src/org/lflang/analyses/cast/CAst.java    | 16 ++++-
 .../org/lflang/analyses/cast/CAstVisitor.java |  2 +
 .../lflang/analyses/cast/CBaseAstVisitor.java | 10 ++++
 .../lflang/analyses/cast/CToUclidVisitor.java | 22 ++++++-
 .../analyses/cast/IfNormalFormAstVisitor.java |  6 ++
 .../lflang/analyses/statespace/StateInfo.java |  2 +
 .../org/lflang/analyses/uclid/MTLVisitor.java |  4 +-
 .../lflang/analyses/uclid/UclidGenerator.java | 60 ++++++++++++++++---
 .../lflang/analyses/uclid/UclidRunner.java    |  7 +++
 10 files changed, 132 insertions(+), 19 deletions(-)

diff --git a/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java b/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
index 3653296e88..3ab9de9cd8 100644
--- a/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
@@ -189,7 +189,7 @@ else if (declSpec.typeSpecifier().Bool() != null)
      * OpaqueNode, IfBlockNode,
      * AdditionNode, SubtractionNode, MultiplicationNode, DivisionNode,
      * EqualNode, NotEqualNode, LessThanNode, GreaterThanNode, LessEqualNode, GreaterEqualNode,
-     * SetPortNode, ScheduleNode.
+     * SetPortNode, ScheduleActionNode.
      * 
      * @param ctx
      * @return
@@ -315,11 +315,10 @@ public CAst.AstNode visitPostfixExpression(PostfixExpressionContext ctx) {
                 return node;
             } else if (varNode.name.equals("lf_schedule")) {
                 // return a set port node.
-                if (params.size() != 2
-                    && params.size() != 3) {
+                if (params.size() != 2) {
                     System.out.println(String.join(" ", 
                         "Warning (line " + ctx.getStart().getLine() + "):",
-                        "lf_schedule must have 2 or 3 arguments. Detected " + ctx.argumentExpressionList().size(),
+                        "lf_schedule must have two arguments. Detected " + ctx.argumentExpressionList().size(),
                         "Marking the function call as opaque."
                     ));
                     return new CAst.OpaqueNode();
@@ -329,6 +328,21 @@ public CAst.AstNode visitPostfixExpression(PostfixExpressionContext ctx) {
                     node.children.add(visitAssignmentExpression(param));
                 }
                 return node;
+            } else if (varNode.name.equals("lf_schedule_int")) {
+                // return a set port node.
+                if (params.size() != 3) {
+                    System.out.println(String.join(" ", 
+                        "Warning (line " + ctx.getStart().getLine() + "):",
+                        "lf_schedule_int must have three arguments. Detected " + ctx.argumentExpressionList().size(),
+                        "Marking the function call as opaque."
+                    ));
+                    return new CAst.OpaqueNode();
+                }
+                CAst.ScheduleActionIntNode node = new CAst.ScheduleActionIntNode();
+                for (AssignmentExpressionContext param : params) {
+                    node.children.add(visitAssignmentExpression(param));
+                }
+                return node;
             } else {
                 // Generic pointer dereference, unanalyzable.
                 System.out.println(String.join(" ", 
diff --git a/org.lflang/src/org/lflang/analyses/cast/CAst.java b/org.lflang/src/org/lflang/analyses/cast/CAst.java
index 3704406940..d5ce1ee896 100644
--- a/org.lflang/src/org/lflang/analyses/cast/CAst.java
+++ b/org.lflang/src/org/lflang/analyses/cast/CAst.java
@@ -287,9 +287,7 @@ public static class SetPortNode extends AstNodeBinary implements Visitable {
     }
 
     /**
-     * action; // self struct variable access is a postfixExpression.
-     * value; // Could be literal, variable, or pointer.
-     * additionalDelay;
+     * AST node for a `lf_schedule(action, additional_delay)` call.
      */
     public static class ScheduleActionNode extends AstNodeDynamic implements Visitable {
         @Override public <T> T accept(AstVisitor<? extends T> visitor) {
@@ -300,6 +298,18 @@ public static class ScheduleActionNode extends AstNodeDynamic implements Visitab
         }
     }
 
+    /**
+     * AST node for a `lf_schedule_int(action, additional_delay, integer)` call.
+     */
+    public static class ScheduleActionIntNode extends AstNodeDynamic implements Visitable {
+        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
+            return ((CAstVisitor<? extends T>)visitor).visitScheduleActionIntNode(this);
+        }
+        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+            return ((CAstVisitor<? extends T>)visitor).visitScheduleActionIntNode(this, nodeList);
+        }
+    }
+
     /**
      * Handle state variables appearing as self-><name>
      */
diff --git a/org.lflang/src/org/lflang/analyses/cast/CAstVisitor.java b/org.lflang/src/org/lflang/analyses/cast/CAstVisitor.java
index f615f6bbb7..0f4f0763dd 100644
--- a/org.lflang/src/org/lflang/analyses/cast/CAstVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/CAstVisitor.java
@@ -35,6 +35,7 @@ public interface CAstVisitor<T> extends AstVisitor<T> {
 
 	T visitSetPortNode(CAst.SetPortNode node);
 	T visitScheduleActionNode(CAst.ScheduleActionNode node);
+	T visitScheduleActionIntNode(CAst.ScheduleActionIntNode node);
 	T visitStateVarNode(CAst.StateVarNode node);
 	T visitTriggerValueNode(CAst.TriggerValueNode node);
 	T visitTriggerIsPresentNode(CAst.TriggerIsPresentNode node);
@@ -70,6 +71,7 @@ public interface CAstVisitor<T> extends AstVisitor<T> {
 
 	T visitSetPortNode(CAst.SetPortNode node, List<CAst.AstNode> nodeList);
 	T visitScheduleActionNode(CAst.ScheduleActionNode node, List<CAst.AstNode> nodeList);
+	T visitScheduleActionIntNode(CAst.ScheduleActionIntNode node, List<CAst.AstNode> nodeList);
 	T visitStateVarNode(CAst.StateVarNode node, List<CAst.AstNode> nodeList);
 	T visitTriggerValueNode(CAst.TriggerValueNode node, List<CAst.AstNode> nodeList);
 	T visitTriggerIsPresentNode(CAst.TriggerIsPresentNode node, List<CAst.AstNode> nodeList);
diff --git a/org.lflang/src/org/lflang/analyses/cast/CBaseAstVisitor.java b/org.lflang/src/org/lflang/analyses/cast/CBaseAstVisitor.java
index 117f1a8536..d30d4f75e2 100644
--- a/org.lflang/src/org/lflang/analyses/cast/CBaseAstVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/CBaseAstVisitor.java
@@ -175,6 +175,11 @@ public T visitScheduleActionNode(CAst.ScheduleActionNode node) {
 		return visitAstNodeDynamic(node);
 	}
 
+	@Override
+	public T visitScheduleActionIntNode(CAst.ScheduleActionIntNode node) {
+		return visitAstNodeDynamic(node);
+	}
+
 	@Override
 	public T visitStateVarNode(CAst.StateVarNode node) {
 		return null;
@@ -332,6 +337,11 @@ public T visitScheduleActionNode(CAst.ScheduleActionNode node, List<CAst.AstNode
 		return visitScheduleActionNode(node);
 	}
 
+	@Override
+	public T visitScheduleActionIntNode(CAst.ScheduleActionIntNode node, List<CAst.AstNode> nodeList) {
+		return visitScheduleActionIntNode(node);
+	}
+
 	@Override
 	public T visitStateVarNode(CAst.StateVarNode node, List<CAst.AstNode> nodeList) {
 		return visitStateVarNode(node);
diff --git a/org.lflang/src/org/lflang/analyses/cast/CToUclidVisitor.java b/org.lflang/src/org/lflang/analyses/cast/CToUclidVisitor.java
index 248eeeab91..015a71b3f2 100644
--- a/org.lflang/src/org/lflang/analyses/cast/CToUclidVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/CToUclidVisitor.java
@@ -169,11 +169,11 @@ public String visitScheduleActionNode(ScheduleActionNode node) {
         String name = ((VariableNode)node.children.get(0)).name;
         NamedInstance instance = getInstanceByName(name);
         ActionInstance action = (ActionInstance)instance;
-        String additionalDelay = visit(node.children.get(1)); // FIXME: Suppport this.
+        String additionalDelay = visit(node.children.get(1));
         String str = "\n(" 
             + "(finite_exists (" + this.qv2 + " : integer) in indices :: (" + this.qv2 + " > " + this.qv + " && " + this.qv2 + " <= END_TRACE) && ("
             + "\n    " + action.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv2 + ")" + ")"
-            + "\n    " + "&& " + "tag_same" + "(" + "g(" + this.qv2 + ")" + ", " + "tag_schedule" + "(" + "g" + "(" + this.qv + ")" + ", " + action.getMinDelay().toNanoSeconds() + ")" + ")"
+            + "\n    " + "&& " + "tag_same" + "(" + "g(" + this.qv2 + ")" + ", " + "tag_schedule" + "(" + "g" + "(" + this.qv + ")" + ", " + "(" + action.getMinDelay().toNanoSeconds() + "+" + additionalDelay + ")" + ")" + ")"
             + "\n    " + "&& " + action.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv2 + ")" + ")" + " == " + "0"
             + "\n)) // Closes finite_exists"
             + "\n&& " + action.getFullNameWithJoiner("_") + "_scheduled" + "(" + "d" + "(" + this.qv + ")" + ")"
@@ -181,6 +181,24 @@ public String visitScheduleActionNode(ScheduleActionNode node) {
         return str;
     }
 
+    @Override
+    public String visitScheduleActionIntNode(ScheduleActionIntNode node) {
+        String name = ((VariableNode)node.children.get(0)).name;
+        NamedInstance instance = getInstanceByName(name);
+        ActionInstance action = (ActionInstance)instance;
+        String additionalDelay = visit(node.children.get(1));
+        String intValue = visit(node.children.get(2));
+        String str = "\n(" 
+            + "(finite_exists (" + this.qv2 + " : integer) in indices :: (" + this.qv2 + " > " + this.qv + " && " + this.qv2 + " <= END_TRACE) && ("
+            + "\n    " + action.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv2 + ")" + ")"
+            + "\n    " + "&& " + "tag_same" + "(" + "g(" + this.qv2 + ")" + ", " + "tag_schedule" + "(" + "g" + "(" + this.qv + ")" + ", " + "(" + action.getMinDelay().toNanoSeconds() + "+" + additionalDelay + ")" + ")" + ")"
+            + "\n)) // Closes finite_exists"
+            + "\n&& " + action.getFullNameWithJoiner("_") + "_scheduled" + "(" + "d" + "(" + this.qv + ")" + ")"
+            + "\n&& " + action.getFullNameWithJoiner("_") + "_scheduled_payload" + "(" + "pl" + "(" + this.qv + ")" + ")" + " == " + intValue
+            + "\n)";
+        return str;
+    }
+
     @Override
     public String visitSetPortNode(SetPortNode node) {
         NamedInstance port = getInstanceByName(((VariableNode)node.left).name);
diff --git a/org.lflang/src/org/lflang/analyses/cast/IfNormalFormAstVisitor.java b/org.lflang/src/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
index a8a5e8931d..31b2f4c5a7 100644
--- a/org.lflang/src/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
@@ -56,6 +56,12 @@ public Void visitScheduleActionNode(CAst.ScheduleActionNode node, List<CAst.AstN
         return null;
 	}
 
+    @Override
+	public Void visitScheduleActionIntNode(CAst.ScheduleActionIntNode node, List<CAst.AstNode> conditions) {
+		this.INF.children.add(generateIfBlock(node, conditions));
+        return null;
+	}
+
     @Override
     public Void visitIfBlockNode(CAst.IfBlockNode node, List<CAst.AstNode> conditions) {
         List<CAst.AstNode> leftConditions = new ArrayList<>(conditions);
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateInfo.java b/org.lflang/src/org/lflang/analyses/statespace/StateInfo.java
index badbf25355..84cf25d5f2 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateInfo.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateInfo.java
@@ -16,6 +16,7 @@ public class StateInfo {
     public HashMap<String, String>  variables   = new HashMap<>();
     public HashMap<String, String>  triggers    = new HashMap<>();
     public HashMap<String, String>  scheduled   = new HashMap<>();
+    public HashMap<String, String>  payloads    = new HashMap<>();
 
     public void display() {
         System.out.println("reactions: " + reactions);
@@ -23,5 +24,6 @@ public void display() {
         System.out.println("variables: " + variables);
         System.out.println("triggers: " + triggers);
         System.out.println("scheduled: " + scheduled);
+        System.out.println("payloads: " + payloads);
     }
 }
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
index c1f782d16f..187caeab63 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
@@ -444,10 +444,10 @@ private String generateTimePredicate(MTLParser.IntervalContext ctx,
             timePredicate += ") && (";
             if (rangeCtx.RBRACKET() != null) {
                 timePredicate += "pi1(g(" + prefixIdx + "))" + " <= "
-                    + "(" + "pi1(g(" + prevPrefixIdx + "))" + " + " + lowerBoundNanoSec + ")";
+                    + "(" + "pi1(g(" + prevPrefixIdx + "))" + " + " + upperBoundNanoSec + ")";
             } else {
                 timePredicate += "pi1(g(" + prefixIdx + "))" + " < "
-                    + "(" + "pi1(g(" + prevPrefixIdx + "))" + " + " + lowerBoundNanoSec + ")";
+                    + "(" + "pi1(g(" + prevPrefixIdx + "))" + " + " + upperBoundNanoSec + ")";
             }
             timePredicate += ")";
         }
diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
index f3ec063c0f..c9b4df6d50 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
@@ -465,7 +465,7 @@ protected void generateTraceDefinition() {
         code.pr(String.join("\n",
             "// Define step and event types.",
             "type step_t = integer;",
-            "type event_t = { rxn_t, tag_t, state_t, trigger_t, sched_t };",
+            "type event_t = { rxn_t, tag_t, state_t, trigger_t, sched_t, payload_t };",
             "",
             "// Create a bounded trace with length " + String.valueOf(this.CT)
         ));
@@ -522,11 +522,19 @@ protected void generateTraceDefinition() {
             // Initialize a dummy variable just to make the code compile.
             initialActionsScheduled = "false";
         }
+        String initialActionsScheduledPayload = "";
+        if (this.actionInstances.size() > 0) {
+            initialActionsScheduledPayload = "0, ".repeat(this.actionInstances.size());
+            initialActionsScheduledPayload = initialActionsScheduledPayload.substring(0, initialActionsScheduledPayload.length()-2);
+        } else {
+            // Initialize a dummy variable just to make the code compile.
+            initialActionsScheduledPayload = "0";
+        }
         code.pr("// Helper macro that returns an element based on index.");
         code.pr("define get(tr : trace_t, i : step_t) : event_t =");
         code.pr("if (i >= START || i <= END_TRACE) then tr[i] else");
         code.pr("{ " + initialReactions + ", inf(), { " + initialStates + " }, { " + initialTriggerPresence
-            + " }, {" + initialActionsScheduled + "} };");
+            + " }, {" + initialActionsScheduled + " }, {" + initialActionsScheduledPayload + "} };");
 
         // Define an event getter from the trace.
         code.pr(String.join("\n", 
@@ -539,6 +547,7 @@ protected void generateTraceDefinition() {
             "define s        (i : step_t) : state_t      = elem(i)._3;",
             "define t        (i : step_t) : trigger_t    = elem(i)._4;",
             "define d        (i : step_t) : sched_t      = elem(i)._5;",
+            "define pl       (i : step_t) : payload_t    = elem(i)._6;",
             "define isNULL   (i : step_t) : boolean      = rxn(i) == " + initialReactions + ";"
         ));
     }
@@ -632,10 +641,10 @@ protected void generateReactionIdsAndStateVars() {
         }
 
         // A boolean tuple indicating whether actions are scheduled by reactions
-        // at the instant when reactions are triggered.
+        // at the instant when they are triggered.
         code.pr(String.join("\n",
             "// A boolean tuple indicating whether actions are scheduled by reactions",
-            "// at the instant when reactions are triggered."
+            "// at the instant when they are triggered."
         ));
         code.pr("type sched_t = {");
         code.indent();
@@ -658,6 +667,34 @@ protected void generateReactionIdsAndStateVars() {
             code.pr("define " + this.actionInstances.get(i).getFullNameWithJoiner("_")
                 + "_scheduled" + "(d : sched_t) : boolean = d._" + (i+1) + ";");
         }
+
+        // A integer tuple indicating the integer payloads scheduled by reactions
+        // at the instant when they are triggered.
+        code.pr(String.join("\n",
+            "// A integer tuple indicating the integer payloads scheduled by reactions",
+            "// at the instant when they are triggered."
+        ));
+        code.pr("type payload_t = {");
+        code.indent();
+        if (this.actionInstances.size() > 0) {
+            for (var i = 0 ; i < this.actionInstances.size(); i++) {
+                code.pr("integer" + ((i == this.actionInstances.size() - 1) ? "" : ",")
+                    + "\t// " + this.actionInstances.get(i));
+            }
+        } else {
+            code.pr(String.join("\n", 
+                "// There are no actions.",
+                "// Insert a dummy integer to make the model compile.",
+                "integer"
+            ));            
+        }
+        code.unindent();
+        code.pr("};");
+        code.pr("// Projection macros for scheduled payloads");
+        for (var i = 0; i < this.actionInstances.size(); i++) {
+            code.pr("define " + this.actionInstances.get(i).getFullNameWithJoiner("_")
+                + "_scheduled_payload" + "(payload : payload_t) : integer = payload._" + (i+1) + ";");
+        }
     }
 
     /**
@@ -838,6 +875,7 @@ protected void generateTriggersAndReactions() {
                         "    && " + reaction.getFullNameWithJoiner("_") + "(rxn(j))",
                         "    && g(i) == tag_schedule(g(j), " + action.getMinDelay().toNanoSeconds() + ")",
                         "    && " + action.getFullNameWithJoiner("_") + "_scheduled" + "(d(j))",
+                        "    && " + action.getFullNameWithJoiner("_") + "(s(i))" + " == " + action.getFullNameWithJoiner("_") + "_scheduled_payload" + "(pl(j))",
                         "))"
                     );
                 }
@@ -1148,6 +1186,13 @@ protected void generateReactionAxioms() {
                     instance = reaction.getReaction().getParent().actions.stream()
                                 .filter(s -> s.getName().equals(name)).findFirst().get();
                     unusedActions.remove(instance);
+                } else if (stmt instanceof CAst.ScheduleActionIntNode) {
+                    CAst.ScheduleActionIntNode n = (CAst.ScheduleActionIntNode)stmt;
+                    String name = ((CAst.VariableNode)n.children.get(0)).name;
+                    instance = reaction.getReaction().getParent().actions.stream()
+                                .filter(s -> s.getName().equals(name)).findFirst().get();
+                    unusedStates.remove(instance);
+                    unusedActions.remove(instance);
                 } else continue;
                 // Create a new entry in the list if there isn't one yet.
                 if (defaultBehaviorConditions.get(instance) == null) {
@@ -1165,8 +1210,7 @@ protected void generateReactionAxioms() {
                 "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
                 "    (" + reaction.getReaction().getFullNameWithJoiner("_") + "(rxn(i))" + ")",
                 "        ==> " + "(" + "(" + axiom + ")",
-                "&& " + "( " + "true",
-                "// By default, the value of the variables used in this reaction stay the same."
+                "&& " + "( " + "true"
             ));
             for (NamedInstance key : defaultBehaviorConditions.keySet()) {
                 CAst.AstNode disjunction = AstUtils.takeDisjunction(defaultBehaviorConditions.get(key));
@@ -1186,7 +1230,7 @@ protected void generateReactionAxioms() {
                 } catch (Exception e) {
                     Exceptions.sneakyThrow(e);
                 }
-
+                code.pr("// Unused state variables and ports are reset by default.");
                 code.pr("&& " + "(" + "(" + resetCondition + ")" + " ==> " + "(");
                 if (key instanceof StateVariableInstance) {
                     StateVariableInstance n = (StateVariableInstance)key;
@@ -1219,7 +1263,7 @@ protected void generateReactionAxioms() {
 
             // For state variables and ports that are NOT used in this reaction,
             // their values stay the same by default.
-            code.pr("// Unused state variables and ports are reset by default.");
+            code.pr("// By default, the value of the variables used in this reaction stay the same.");
             if (this.logicalTimeBased) {
                 // If all other reactions that can modify the SAME state variable
                 // are not triggered, then the state variable stay the same.
diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java b/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
index f3646245e0..ae928772be 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
@@ -116,6 +116,13 @@ public StateInfo parseStateInfo(String smtStr) {
             info.scheduled.put(generator.actionInstances.get(i).getFullName(), scheduled[i]);
         }
 
+        // Scheduled payloads
+        m.find();
+        String[] payloads = m.group(1).strip().split("\\s+");
+        for (int i = 0; i < generator.actionInstances.size(); i++) {
+            info.payloads.put(generator.actionInstances.get(i).getFullName(), payloads[i]);
+        }
+
         return info;
     }
 

From 344c34af8854f198cde82e497eb61d96478cbdd2 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 6 Feb 2023 19:07:19 -0800
Subject: [PATCH 0081/1114] Add a uniqueness axiom, update CEX parser to
 support let bindings

---
 .../lflang/analyses/uclid/UclidGenerator.java | 23 ++++-
 .../lflang/analyses/uclid/UclidRunner.java    | 88 ++++++++++++++++---
 2 files changed, 97 insertions(+), 14 deletions(-)

diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
index c9b4df6d50..53e43a8250 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
@@ -763,9 +763,11 @@ protected void generateReactorSemantics() {
             ""
         ));
 
-        // For logical time-based semantics, there is no need for this since each logical instant
-        // will only happen once in the trace.
+        //// Axioms for the event-based semantics
         if (!this.logicalTimeBased) {
+            code.pr("//// Axioms for the event-based semantics");
+
+            // the same event can only trigger once in a logical instant
             code.pr(String.join("\n",
                 "// the same event can only trigger once in a logical instant",
                 "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (finite_forall (j : integer) in indices ::",
@@ -773,6 +775,23 @@ protected void generateReactorSemantics() {
                 "        ==> !tag_same(g(i), g(j)))));",
                 ""
             ));
+
+            // Only one reaction gets triggered at a time.
+            ArrayList<String> reactionsStatus = new ArrayList<>();
+            for (int i = 0; i < this.reactionInstances.size(); i++)
+                reactionsStatus.add("false");
+            code.pr(String.join("\n",
+                "// Only one reaction gets triggered at a time.",
+                "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (",
+                "    isNULL(i)"));
+            code.indent();
+            for (int i = 0; i < this.reactionInstances.size(); i++) {
+                String[] li = reactionsStatus.toArray(String[]::new);
+                li[i] = "true";
+                code.pr("|| rxn(i) == " + "{" + String.join(", ", li) + "}");
+            }
+            code.unindent();
+            code.pr("));");
         }
     }
 
diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java b/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
index ae928772be..05d4485826 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
@@ -14,6 +14,7 @@
 import java.nio.file.Paths;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -70,17 +71,43 @@ public UclidRunner(
     public StateInfo parseStateInfo(String smtStr) {
         StateInfo info = new StateInfo();
 
-        // Remove the outer tuple layer.
-        Pattern p = Pattern.compile("^\\(_tuple_\\d+((.|\\n)*)\\)$");
+        // Check for any let bindings.
+        Pattern p = Pattern.compile("\\(let \\(\\((a!\\d+) \\(_tuple_\\d+ ((.)+?)\\)\\)\\)(\\\\n|\\s)+\\(_tuple_\\d+ ((.|\\n)+)\\)");
+        HashMap<String, String> symbolTable = new HashMap<>();
         Matcher m = p.matcher(smtStr.strip());
-        m.find();
-        String itemized = m.group(1).strip();
+        String itemized = "";
+        if (m.find()) {
+            // FIXME: Handle multiple let bindings.
+            String symbol = m.group(1).strip();
+            String value  = m.group(2).strip();
+            symbolTable.put(symbol, value);
+            itemized = m.group(5).strip();
+        }
+        else {
+            // Remove the outer tuple layer.
+            p = Pattern.compile("\\(_tuple_\\d+((.|\\n)*)\\)");
+            m = p.matcher(smtStr.strip());
+            m.find();
+            itemized = m.group(1).strip();
+        }
 
-        // Reactions
-        p = Pattern.compile("\\(_tuple_\\d+([^\\)]+)\\)");
+        // Process each sub-tuple by matching (_tuple_n ...)
+        // or matching a!n, where n is an integer.
+        p = Pattern.compile("(a!\\d+)|\\(_tuple_\\d+((\\s|\\\\n|\\d|\\(- \\d+\\)|true|false)+)\\)");
         m = p.matcher(itemized);
+
+        // Reactions
         m.find();
-        String[] reactions = m.group(1).strip().split("\\s+");
+        String reactionsStr = "";
+        // Found a let binding.
+        if (m.group(1) != null) {
+            reactionsStr = symbolTable.get(m.group(1)).strip();
+        }
+        // The rest falls into group 2.
+        else {
+            reactionsStr = m.group(2).strip();
+        }
+        String[] reactions = reactionsStr.split("\\s+");
         // Iterating over generator lists avoids accounting for
         // the single dummy Uclid variable inserted earlier.
         for (int i = 0; i < generator.reactionInstances.size(); i++) {
@@ -90,35 +117,72 @@ public StateInfo parseStateInfo(String smtStr) {
 
         // Time tag
         m.find();
-        String[] tag = m.group(1).strip().split("\\s+");
+        String tagStr = "";
+        // Found a let binding.
+        if (m.group(1) != null)
+            tagStr = symbolTable.get(m.group(1)).strip();
+        // The rest falls into group 2.
+        else tagStr = m.group(2).strip();
+        String[] tag = tagStr.split("\\s+");
         info.tag = new Tag(
             Long.parseLong(tag[0]),
             Long.parseLong(tag[1]), false);
 
         // Variables
+        // Currently all integers.
+        // Negative numbers could appear.
         m.find();
-        String[] variables = m.group(1).strip().split("\\s+");
+        String variablesStr = "";
+        // Found a let binding.
+        if (m.group(1) != null)
+            variablesStr = symbolTable.get(m.group(1)).strip();
+        // The rest falls into group 2.
+        else variablesStr = m.group(2).strip();
+        String[] variables = variablesStr.replaceAll("\\(-\\s(.*?)\\)", "-$1")
+                            .split("\\s+");
         for (int i = 0; i < generator.namedInstances.size(); i++) {
             info.variables.put(generator.namedInstances.get(i).getFullName(), variables[i]);
         }
 
         // Triggers
         m.find();
-        String[] triggers = m.group(1).strip().split("\\s+");
+        String triggersStr = "";
+        // Found a let binding.
+        if (m.group(1) != null)
+            triggersStr = symbolTable.get(m.group(1)).strip();
+        // The rest falls into group 2.
+        else triggersStr = m.group(2).strip();
+        String[] triggers = triggersStr.split("\\s+");
         for (int i = 0; i < generator.triggerInstances.size(); i++) {
             info.triggers.put(generator.triggerInstances.get(i).getFullName(), triggers[i]);
         }
 
         // Actions scheduled
         m.find();
-        String[] scheduled = m.group(1).strip().split("\\s+");
+        String scheduledStr = "";
+        // Found a let binding.
+        if (m.group(1) != null)
+            scheduledStr = symbolTable.get(m.group(1)).strip();
+        // The rest falls into group 2.
+        else scheduledStr = m.group(2).strip();
+        String[] scheduled = scheduledStr.split("\\s+");
         for (int i = 0; i < generator.actionInstances.size(); i++) {
             info.scheduled.put(generator.actionInstances.get(i).getFullName(), scheduled[i]);
         }
 
         // Scheduled payloads
+        // Currently all integers.
+        // Negative numbers could appear.
         m.find();
-        String[] payloads = m.group(1).strip().split("\\s+");
+        String payloadsStr = "";
+        // Found a let binding.
+        if (m.group(1) != null)
+            payloadsStr = symbolTable.get(m.group(1)).strip();
+        // The rest falls into group 2.
+        else payloadsStr = m.group(2).strip();
+        String[] payloads = payloadsStr
+                            .replaceAll("\\(-\\s(.*?)\\)", "-$1")
+                            .split("\\s+");
         for (int i = 0; i < generator.actionInstances.size(); i++) {
             info.payloads.put(generator.actionInstances.get(i).getFullName(), payloads[i]);
         }

From 2b99656493affba5d3805fcb3ad68a15ee2b3c22 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 6 Feb 2023 22:19:59 -0800
Subject: [PATCH 0082/1114] Add happen-before relations based on priorities,
 fix C AST generation.

---
 .../cast/BuildAstParseTreeVisitor.java         | 18 +++++++++---------
 .../lflang/analyses/uclid/UclidGenerator.java  | 15 ++++++++++++++-
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java b/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
index 3ab9de9cd8..4807713e83 100644
--- a/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
@@ -442,11 +442,11 @@ public CAst.AstNode visitCastExpression(CastExpressionContext ctx) {
     public CAst.AstNode visitMultiplicativeExpression(MultiplicativeExpressionContext ctx) {
         if (ctx.castExpression().size() > 1) {
             CAst.AstNodeBinary node;
-            if (ctx.Star() != null) {
+            if (ctx.Star().size() > 0) {
                 node = new CAst.MultiplicationNode();
-            } else if (ctx.Div() != null) {
+            } else if (ctx.Div().size() > 0) {
                 node = new CAst.DivisionNode();
-            } else if (ctx.Mod() != null) {
+            } else if (ctx.Mod().size() > 0) {
                 System.out.println(String.join(" ", 
                     "Warning (line " + ctx.getStart().getLine() + "):",
                     "Mod expression '%' is currently unsupported.",
@@ -467,9 +467,9 @@ public CAst.AstNode visitMultiplicativeExpression(MultiplicativeExpressionContex
     public CAst.AstNode visitAdditiveExpression(AdditiveExpressionContext ctx) {
         if (ctx.multiplicativeExpression().size() > 1) {
             CAst.AstNodeBinary node;
-            if (ctx.Plus() != null) {
+            if (ctx.Plus().size() > 0) {
                 node = new CAst.AdditionNode();
-            } else if (ctx.Minus() != null) {
+            } else if (ctx.Minus().size() > 0) {
                 node = new CAst.SubtractionNode();
             } else {
                 node = new CAst.AstNodeBinary();
@@ -498,13 +498,13 @@ public CAst.AstNode visitShiftExpression(ShiftExpressionContext ctx) {
     public CAst.AstNode visitRelationalExpression(RelationalExpressionContext ctx) {
         if (ctx.shiftExpression().size() > 1) {
             CAst.AstNodeBinary node;
-            if (ctx.Less() != null) {
+            if (ctx.Less().size() > 0) {
                 node = new CAst.LessThanNode();
-            } else if (ctx.LessEqual() != null) {
+            } else if (ctx.LessEqual().size() > 0) {
                 node = new CAst.LessEqualNode();
-            } else if (ctx.Greater() != null) { 
+            } else if (ctx.Greater().size() > 0) { 
                 node = new CAst.GreaterThanNode();
-            } else if (ctx.GreaterEqual() != null) {
+            } else if (ctx.GreaterEqual().size() > 0) {
                 node = new CAst.GreaterEqualNode();
             } else {
                 node = new CAst.AstNodeBinary();
diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
index 53e43a8250..6b961bdc8e 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
@@ -718,16 +718,29 @@ protected void generateReactorSemantics() {
             code.indent();
             // Get happen-before relation between two reactions.
             code.pr("|| (tag_same(e1._2, e2._2) && ( false");
-            // Iterate over every pair of reactions.
+            // Iterate over reactions based on upstream/downstream relations.
             for (var upstreamRuntime : this.reactionInstances) {
                 var downstreamReactions = upstreamRuntime.getReaction().dependentReactions();
                 for (var downstream : downstreamReactions) {
+                    // If the downstream reaction and the upstream
+                    // reaction are in the same reactor, skip, since
+                    // they will be accounted for in the for loop below.
+                    if (downstream.getParent().equals(upstreamRuntime.getReaction().getParent())) continue;
                     for (var downstreamRuntime : downstream.getRuntimeInstances()) {
                         code.pr("|| (" + upstreamRuntime.getReaction().getFullNameWithJoiner("_") + "(e1._1)"
                             + " && " + downstreamRuntime.getReaction().getFullNameWithJoiner("_") + "(e2._1)" + ")");
                     }
                 }
             }
+            // Iterate over reactions based on priorities.
+            for (var reactor : this.reactorInstances) {
+                for (int i = 0; i < reactor.reactions.size(); i++) {
+                    for (int j = i+1; j < reactor.reactions.size(); j++) {
+                        code.pr("|| (" + reactor.reactions.get(i).getFullNameWithJoiner("_") + "(e1._1)"
+                            + " && " + reactor.reactions.get(j).getFullNameWithJoiner("_") + "(e2._1)" + ")");
+                    }
+                }
+            }
             code.unindent();
             code.pr("))");
         }

From f5e12dae3633a2abf171ff4a7c922677857d550a Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 17 Feb 2023 17:07:38 -0800
Subject: [PATCH 0083/1114] Add preliminary github action workflow

---
 .github/workflows/ci.yml                     |  7 +++
 .github/workflows/uclid-verifier-c-tests.yml | 56 ++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 .github/workflows/uclid-verifier-c-tests.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f339b9aa9e..44e04aba48 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -107,3 +107,10 @@ jobs:
   serialization-tests:
     uses: lf-lang/lingua-franca/.github/workflows/serialization-tests.yml@master
     needs: cancel
+
+  # Run the Uclid benchmark tests.
+  uclid-verifier-c-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/uclid-verifier-c-tests.yml@master
+    with:
+      target: 'C'
+    needs: cancel
diff --git a/.github/workflows/uclid-verifier-c-tests.yml b/.github/workflows/uclid-verifier-c-tests.yml
new file mode 100644
index 0000000000..f9ee060c06
--- /dev/null
+++ b/.github/workflows/uclid-verifier-c-tests.yml
@@ -0,0 +1,56 @@
+name: Uclid5-based Verifier Tests
+
+on:
+  workflow_call:
+
+env:
+  ACTIONS_STEP_DEBUG: TRUE
+  ACTIONS_RUNNER_DEBUG: TRUE
+
+jobs:
+  run:
+    strategy:
+      matrix:
+        platform: [ubuntu-latest]
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: Check out lingua-franca repository
+        uses: actions/checkout@v3
+      - name: Check out lf-verifer-benchmarks repository
+        uses: actions/checkout@v3
+        with:
+          repository: lsk567/lf-verifer-benchmarks
+          path: ./lf-verifer-benchmarks
+      - name: Check out Uclid5 repository
+        uses: actions/checkout@v3
+        with:
+          repository: uclid-org/uclid
+          path: ./uclid
+      - name: See where we are
+        run: |
+          echo "Where am I?"
+          pwd
+          ls
+      - name: Install Z3
+        run: |
+          cd uclid
+          ./get-z3-linux.sh
+          ./setup-z3-linux.sh
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+          cache: 'sbt'
+      - name: Test sbt
+        run: |
+          sbt --version
+      - name: Install Uclid5
+        run: |
+          sbt compile universal:packageBin
+          cd target/universal/
+          unzip uclid-0.9.5.zip
+          export PATH="$(pwd)/uclid-0.9.5/bin:$PATH"
+
+
+      
\ No newline at end of file

From ff47ed03a05cf785c7aa561e6aac735fc2b39496 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sat, 18 Feb 2023 12:10:17 -0800
Subject: [PATCH 0084/1114] Try to trigger CI

---
 .github/workflows/ci.yml                     | 2 +-
 .github/workflows/uclid-verifier-c-tests.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e78fabb39a..70c772ae0d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -131,7 +131,7 @@ jobs:
 
   # Run the Uclid benchmark tests.
   uclid-verifier-c-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/uclid-verifier-c-tests.yml@master
+    uses: ./.github/workflows/uclid-verifier-c-tests.yml
     with:
       target: 'C'
     needs: cancel
diff --git a/.github/workflows/uclid-verifier-c-tests.yml b/.github/workflows/uclid-verifier-c-tests.yml
index f9ee060c06..3dd62e36dc 100644
--- a/.github/workflows/uclid-verifier-c-tests.yml
+++ b/.github/workflows/uclid-verifier-c-tests.yml
@@ -25,6 +25,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: uclid-org/uclid
+          ref: 4fd5e566c5f87b052f92e9b23723a85e1c4d8c1c
           path: ./uclid
       - name: See where we are
         run: |

From fdff6b55b417c7b39f3842ff3151141db8c69db8 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sat, 18 Feb 2023 12:11:36 -0800
Subject: [PATCH 0085/1114] Try again

---
 .github/workflows/ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 70c772ae0d..0404b47d65 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -132,6 +132,4 @@ jobs:
   # Run the Uclid benchmark tests.
   uclid-verifier-c-tests:
     uses: ./.github/workflows/uclid-verifier-c-tests.yml
-    with:
-      target: 'C'
     needs: cancel

From 5a13516c361689452c46f661a813ac24d0c15c62 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sun, 19 Feb 2023 11:06:38 -0800
Subject: [PATCH 0086/1114] Debug workflows

---
 .github/workflows/ci.yml                     | 178 +++++++++----------
 .github/workflows/uclid-verifier-c-tests.yml |   5 +-
 2 files changed, 93 insertions(+), 90 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0404b47d65..132f443520 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,114 +20,114 @@ jobs:
   cancel:
     uses: lf-lang/lingua-franca/.github/workflows/cancel.yml@master
 
-  # Test the Gradle and Maven build.
-  build:
-    uses: lf-lang/lingua-franca/.github/workflows/build.yml@master
-    needs: cancel
-
-  # Build the tools used for processing execution traces
-  build-tracing-tools:
-    uses: lf-lang/lingua-franca/.github/workflows/build-trace-tools.yml@master
-    needs: cancel
+  # # Test the Gradle and Maven build.
+  # build:
+  #   uses: lf-lang/lingua-franca/.github/workflows/build.yml@master
+  #   needs: cancel
 
-  # Check that automatic code formatting works.
-  # TODO: Uncomment after fed-gen is merged.
-  # format:
-  #   uses: lf-lang/lingua-franca/.github/workflows/format.yml@master
+  # # Build the tools used for processing execution traces
+  # build-tracing-tools:
+  #   uses: lf-lang/lingua-franca/.github/workflows/build-trace-tools.yml@master
   #   needs: cancel
 
-  # Run the unit tests.
-  unit-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/unit-tests.yml@master
-    needs: cancel
+  # # Check that automatic code formatting works.
+  # # TODO: Uncomment after fed-gen is merged.
+  # # format:
+  # #   uses: lf-lang/lingua-franca/.github/workflows/format.yml@master
+  # #   needs: cancel
 
-  # Run tests for the standalone compiler.
-  cli-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/cli-tests.yml@master
-    needs: cancel
+  # # Run the unit tests.
+  # unit-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/unit-tests.yml@master
+  #   needs: cancel
 
-  # Run the C benchmark tests.
-  c-benchmark-tests:
-    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
-    with:
-      target: 'C'
-    needs: cancel
+  # # Run tests for the standalone compiler.
+  # cli-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/cli-tests.yml@master
+  #   needs: cancel
 
-  # Run tests for Eclipse.
-  eclipse-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/eclipse-tests.yml@master
-    needs: cancel
+  # # Run the C benchmark tests.
+  # c-benchmark-tests:
+  #   uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
+  #   with:
+  #     target: 'C'
+  #   needs: cancel
 
-  # Run language server tests.
-  lsp-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/lsp-tests.yml@master
-    needs: cancel
+  # # Run tests for Eclipse.
+  # eclipse-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/eclipse-tests.yml@master
+  #   needs: cancel
 
-  # Run the C integration tests.
-  c-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
-    needs: cancel
+  # # Run language server tests.
+  # lsp-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/lsp-tests.yml@master
+  #   needs: cancel
+
+  # # Run the C integration tests.
+  # c-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
+  #   needs: cancel
   
-  # Run the C Arduino integration tests.
-  c-arduino-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/c-arduino-tests.yml@master
-    needs: cancel
+  # # Run the C Arduino integration tests.
+  # c-arduino-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/c-arduino-tests.yml@master
+  #   needs: cancel
   
-  # Run the C Zephyr integration tests.
-  c-zephyr-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/c-zephyr-tests.yml@master
-    needs: cancel
+  # # Run the C Zephyr integration tests.
+  # c-zephyr-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/c-zephyr-tests.yml@master
+  #   needs: cancel
 
-  # Run the CCpp integration tests.
-  ccpp-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
-    with:
-      use-cpp: true
-    needs: cancel
+  # # Run the CCpp integration tests.
+  # ccpp-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
+  #   with:
+  #     use-cpp: true
+  #   needs: cancel
 
-  # Run the C++ benchmark tests.
-  cpp-benchmark-tests:
-    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
-    with:
-      target: 'Cpp'
-    needs: cancel
+  # # Run the C++ benchmark tests.
+  # cpp-benchmark-tests:
+  #   uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
+  #   with:
+  #     target: 'Cpp'
+  #   needs: cancel
 
-  # Run the C++ integration tests.
-  cpp-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/cpp-tests.yml@master
-    needs: cancel
+  # # Run the C++ integration tests.
+  # cpp-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/cpp-tests.yml@master
+  #   needs: cancel
 
-  # Run the C++ integration tests on ROS2.
-  cpp-ros2-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/cpp-ros2-tests.yml@master
-    needs: cancel
+  # # Run the C++ integration tests on ROS2.
+  # cpp-ros2-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/cpp-ros2-tests.yml@master
+  #   needs: cancel
 
-  # Run the Python integration tests.
-  py-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/py-tests.yml@master
-    needs: cancel
+  # # Run the Python integration tests.
+  # py-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/py-tests.yml@master
+  #   needs: cancel
 
-  # Run the Rust integration tests.
-  rs-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/rs-tests.yml@master
-    needs: cancel
+  # # Run the Rust integration tests.
+  # rs-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/rs-tests.yml@master
+  #   needs: cancel
 
-  # Run the Rust benchmark tests.
-  rs-benchmark-tests:
-    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
-    with:
-      target: 'Rust'
-    needs: cancel
+  # # Run the Rust benchmark tests.
+  # rs-benchmark-tests:
+  #   uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
+  #   with:
+  #     target: 'Rust'
+  #   needs: cancel
 
-  # Run the TypeScript integration tests.
-  ts-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/ts-tests.yml@master
-    needs: cancel
+  # # Run the TypeScript integration tests.
+  # ts-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/ts-tests.yml@master
+  #   needs: cancel
 
-  # Run the serialization tests
-  serialization-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/serialization-tests.yml@master
-    needs: cancel
+  # # Run the serialization tests
+  # serialization-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/serialization-tests.yml@master
+  #   needs: cancel
 
   # Run the Uclid benchmark tests.
   uclid-verifier-c-tests:
diff --git a/.github/workflows/uclid-verifier-c-tests.yml b/.github/workflows/uclid-verifier-c-tests.yml
index 3dd62e36dc..e694e74d34 100644
--- a/.github/workflows/uclid-verifier-c-tests.yml
+++ b/.github/workflows/uclid-verifier-c-tests.yml
@@ -16,6 +16,8 @@ jobs:
     steps:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3
+      - name: Setup upterm session
+        uses: lhotari/action-upterm@v1
       - name: Check out lf-verifer-benchmarks repository
         uses: actions/checkout@v3
         with:
@@ -48,7 +50,8 @@ jobs:
           sbt --version
       - name: Install Uclid5
         run: |
-          sbt compile universal:packageBin
+          sbt update clean compile
+          sbt universal:packageBin
           cd target/universal/
           unzip uclid-0.9.5.zip
           export PATH="$(pwd)/uclid-0.9.5/bin:$PATH"

From a23224478f29addf7bffa081de58807b399bcab0 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sun, 19 Feb 2023 11:14:18 -0800
Subject: [PATCH 0087/1114] Setup ssh after installing sbt

---
 .github/workflows/uclid-verifier-c-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/uclid-verifier-c-tests.yml b/.github/workflows/uclid-verifier-c-tests.yml
index e694e74d34..6638c68600 100644
--- a/.github/workflows/uclid-verifier-c-tests.yml
+++ b/.github/workflows/uclid-verifier-c-tests.yml
@@ -16,8 +16,6 @@ jobs:
     steps:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3
-      - name: Setup upterm session
-        uses: lhotari/action-upterm@v1
       - name: Check out lf-verifer-benchmarks repository
         uses: actions/checkout@v3
         with:
@@ -48,6 +46,8 @@ jobs:
       - name: Test sbt
         run: |
           sbt --version
+      - name: Setup upterm session
+        uses: lhotari/action-upterm@v1
       - name: Install Uclid5
         run: |
           sbt update clean compile

From 22ec9ff44eff4652b9a4294996a80d3447e9aeb5 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sun, 19 Feb 2023 11:44:54 -0800
Subject: [PATCH 0088/1114] Attempt to fix a directory issue

---
 .github/workflows/uclid-verifier-c-tests.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/uclid-verifier-c-tests.yml b/.github/workflows/uclid-verifier-c-tests.yml
index 6638c68600..b82be05460 100644
--- a/.github/workflows/uclid-verifier-c-tests.yml
+++ b/.github/workflows/uclid-verifier-c-tests.yml
@@ -27,16 +27,6 @@ jobs:
           repository: uclid-org/uclid
           ref: 4fd5e566c5f87b052f92e9b23723a85e1c4d8c1c
           path: ./uclid
-      - name: See where we are
-        run: |
-          echo "Where am I?"
-          pwd
-          ls
-      - name: Install Z3
-        run: |
-          cd uclid
-          ./get-z3-linux.sh
-          ./setup-z3-linux.sh
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
@@ -48,8 +38,16 @@ jobs:
           sbt --version
       - name: Setup upterm session
         uses: lhotari/action-upterm@v1
-      - name: Install Uclid5
+      - name: See where we are
+        run: |
+          echo "Where am I?"
+          pwd
+          ls
+      - name: Install Z3 and Uclid5
         run: |
+          cd uclid
+          ./get-z3-linux.sh
+          ./setup-z3-linux.sh
           sbt update clean compile
           sbt universal:packageBin
           cd target/universal/

From d208f4cbded2e9984dec36471deecf589fbad7cb Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 20 Feb 2023 17:21:12 -0800
Subject: [PATCH 0089/1114] Add an 'expect' field to @property

---
 .../lflang/analyses/uclid/UclidGenerator.java | 19 ++++++++++++----
 .../lflang/analyses/uclid/UclidRunner.java    | 22 ++++++++++++++-----
 .../org/lflang/validation/AttributeSpec.java  |  3 ++-
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
index 07f9feccae..1d8d76276d 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
@@ -39,6 +39,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
@@ -130,7 +131,8 @@ public class UclidGenerator extends GeneratorBase {
     public List<NamedInstance>          namedInstances;     // Named instances = triggers + state variables
 
     // A list of paths to the uclid files generated
-    public List<Path>                   generatedFiles      = new ArrayList<Path>();
+    public List<Path>                   generatedFiles      = new ArrayList<>();
+    public Map<Path, String>            expectations        = new HashMap<>();
 
     // The directory where the generated files are placed
     public Path                         outputDir;
@@ -156,6 +158,7 @@ public class UclidGenerator extends GeneratorBase {
     protected String                    name;
     protected String                    tactic;
     protected String                    spec; // SMTL
+    protected String                    expect;
 
     /** 
      * The horizon (the total time interval required for evaluating
@@ -222,11 +225,11 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
 
             processMTLSpec();
             
-            Optional<AttrParm> CTattr = prop.getAttrParms().stream()
+            Optional<AttrParm> CTAttr = prop.getAttrParms().stream()
                             .filter(attr -> attr.getName().equals("CT"))
                             .findFirst();
-            if (CTattr.isPresent()) {
-                this.CT = Integer.parseInt(CTattr.get().getValue());
+            if (CTAttr.isPresent()) {
+                this.CT = Integer.parseInt(CTAttr.get().getValue());
             } else {
                 computeCT();
             }
@@ -239,6 +242,12 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
                 continue;
             }
 
+            Optional<AttrParm> ExpectAttr = prop.getAttrParms().stream()
+                            .filter(attr -> attr.getName().equals("expect"))
+                            .findFirst();
+            if (ExpectAttr.isPresent())
+                this.expect = ExpectAttr.get().getValue();
+
             generateUclidFile();
         }
     }
@@ -258,6 +267,8 @@ protected void generateUclidFile() {
             generateUclidCode();
             code.writeToFile(filename);
             this.generatedFiles.add(file);
+            if (this.expect != null)
+                this.expectations.put(file, this.expect);
         } catch (IOException e) {
             Exceptions.sneakyThrow(e);
         }
diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java b/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
index fc334336e6..be28c77665 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
@@ -204,15 +204,16 @@ public void run() {
             command.run();
             
             String output = command.getOutput().toString();
-            boolean failed = output.contains("FAILED");
-            if (failed) {
+            boolean valid = !output.contains("FAILED");
+            if (valid) {
+                System.out.println("Valid!");
+            } else {
                 System.out.println("Not valid!");
                 try {
                     // Read from the JSON counterexample (cex).
                     String cexJSONStr = Files.readString(
                         Paths.get(path.toString() + ".json"),
                         StandardCharsets.UTF_8);
-                    // System.out.println(cexJSONStr);
                     JSONObject cexJSON = new JSONObject(cexJSONStr);
 
                     //// Extract the counterexample trace from JSON.
@@ -244,8 +245,19 @@ public void run() {
                 } catch (IOException e) {
                     System.out.println("ERROR: Not able to read from " + path.toString());
                 }
-            } else {
-                System.out.println("Valid!");
+            }
+
+            // If "expect" is set, check if the result matches it.
+            // If not, exit with error code 1.
+            String expect = generator.expectations.get(path);
+            if (expect != null) {
+                boolean expectValid = Boolean.parseBoolean(expect);
+                if (expectValid != valid) {
+                    System.out.println(
+                        "ERROR: The expected result does not match the actual result. Expected: "
+                        + expectValid + ", Result: " + valid);
+                    System.exit(1);
+                }
             }
         }
     }
diff --git a/org.lflang/src/org/lflang/validation/AttributeSpec.java b/org.lflang/src/org/lflang/validation/AttributeSpec.java
index 93950c2788..006e6c228c 100644
--- a/org.lflang/src/org/lflang/validation/AttributeSpec.java
+++ b/org.lflang/src/org/lflang/validation/AttributeSpec.java
@@ -222,7 +222,8 @@ enum AttrParamType {
                 new AttrParamSpec("name", AttrParamType.STRING, false),
                 new AttrParamSpec("tactic", AttrParamType.STRING, false),
                 new AttrParamSpec("spec", AttrParamType.STRING, false),
-                new AttrParamSpec("CT", AttrParamType.INT, true)
+                new AttrParamSpec("CT", AttrParamType.INT, true),
+                new AttrParamSpec("expect", AttrParamType.BOOLEAN, true)
             )
         ));
         // @enclave(each=boolean)

From 6b760c8ff1cea5663374947c096ad2e614e3ae26 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 20 Feb 2023 17:21:30 -0800
Subject: [PATCH 0090/1114] Update CI to run the test script

---
 .github/workflows/uclid-verifier-c-tests.yml | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/uclid-verifier-c-tests.yml b/.github/workflows/uclid-verifier-c-tests.yml
index b82be05460..762bf6765a 100644
--- a/.github/workflows/uclid-verifier-c-tests.yml
+++ b/.github/workflows/uclid-verifier-c-tests.yml
@@ -33,16 +33,8 @@ jobs:
           distribution: 'temurin'
           java-version: '11'
           cache: 'sbt'
-      - name: Test sbt
-        run: |
-          sbt --version
       - name: Setup upterm session
         uses: lhotari/action-upterm@v1
-      - name: See where we are
-        run: |
-          echo "Where am I?"
-          pwd
-          ls
       - name: Install Z3 and Uclid5
         run: |
           cd uclid
@@ -53,6 +45,8 @@ jobs:
           cd target/universal/
           unzip uclid-0.9.5.zip
           export PATH="$(pwd)/uclid-0.9.5/bin:$PATH"
-
-
-      
\ No newline at end of file
+          uclid --version
+      - name: Run the test script
+        run: |
+          cd ../lf-verifer-benchmarks
+          ./scripts/test-lf-verifier
\ No newline at end of file

From d23906f367dbcdc6c0af1c880447e8494a44ea6b Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 20 Feb 2023 18:29:52 -0800
Subject: [PATCH 0091/1114] Relocate the CI script.

---
 .github/workflows/ci.yml                     | 180 +++++++++----------
 .github/workflows/uclid-verifier-c-tests.yml |  52 ------
 2 files changed, 90 insertions(+), 142 deletions(-)
 delete mode 100644 .github/workflows/uclid-verifier-c-tests.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 132f443520..9f67aed00d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,116 +20,116 @@ jobs:
   cancel:
     uses: lf-lang/lingua-franca/.github/workflows/cancel.yml@master
 
-  # # Test the Gradle and Maven build.
-  # build:
-  #   uses: lf-lang/lingua-franca/.github/workflows/build.yml@master
-  #   needs: cancel
-
-  # # Build the tools used for processing execution traces
-  # build-tracing-tools:
-  #   uses: lf-lang/lingua-franca/.github/workflows/build-trace-tools.yml@master
-  #   needs: cancel
+  # Test the Gradle and Maven build.
+  build:
+    uses: lf-lang/lingua-franca/.github/workflows/build.yml@master
+    needs: cancel
 
-  # # Check that automatic code formatting works.
-  # # TODO: Uncomment after fed-gen is merged.
-  # # format:
-  # #   uses: lf-lang/lingua-franca/.github/workflows/format.yml@master
-  # #   needs: cancel
+  # Build the tools used for processing execution traces
+  build-tracing-tools:
+    uses: lf-lang/lingua-franca/.github/workflows/build-trace-tools.yml@master
+    needs: cancel
 
-  # # Run the unit tests.
-  # unit-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/unit-tests.yml@master
+  # Check that automatic code formatting works.
+  # TODO: Uncomment after fed-gen is merged.
+  # format:
+  #   uses: lf-lang/lingua-franca/.github/workflows/format.yml@master
   #   needs: cancel
 
-  # # Run tests for the standalone compiler.
-  # cli-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/cli-tests.yml@master
-  #   needs: cancel
+  # Run the unit tests.
+  unit-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/unit-tests.yml@master
+    needs: cancel
 
-  # # Run the C benchmark tests.
-  # c-benchmark-tests:
-  #   uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
-  #   with:
-  #     target: 'C'
-  #   needs: cancel
+  # Run tests for the standalone compiler.
+  cli-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/cli-tests.yml@master
+    needs: cancel
 
-  # # Run tests for Eclipse.
-  # eclipse-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/eclipse-tests.yml@master
-  #   needs: cancel
+  # Run the C benchmark tests.
+  c-benchmark-tests:
+    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
+    with:
+      target: 'C'
+    needs: cancel
 
-  # # Run language server tests.
-  # lsp-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/lsp-tests.yml@master
-  #   needs: cancel
+  # Run tests for Eclipse.
+  eclipse-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/eclipse-tests.yml@master
+    needs: cancel
 
-  # # Run the C integration tests.
-  # c-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
-  #   needs: cancel
+  # Run language server tests.
+  lsp-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/lsp-tests.yml@master
+    needs: cancel
+
+  # Run the C integration tests.
+  c-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
+    needs: cancel
   
-  # # Run the C Arduino integration tests.
-  # c-arduino-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/c-arduino-tests.yml@master
-  #   needs: cancel
+  # Run the C Arduino integration tests.
+  c-arduino-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/c-arduino-tests.yml@master
+    needs: cancel
   
-  # # Run the C Zephyr integration tests.
-  # c-zephyr-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/c-zephyr-tests.yml@master
-  #   needs: cancel
+  # Run the C Zephyr integration tests.
+  c-zephyr-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/c-zephyr-tests.yml@master
+    needs: cancel
 
-  # # Run the CCpp integration tests.
-  # ccpp-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
-  #   with:
-  #     use-cpp: true
-  #   needs: cancel
+  # Run the CCpp integration tests.
+  ccpp-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
+    with:
+      use-cpp: true
+    needs: cancel
 
-  # # Run the C++ benchmark tests.
-  # cpp-benchmark-tests:
-  #   uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
-  #   with:
-  #     target: 'Cpp'
-  #   needs: cancel
+  # Run the C++ benchmark tests.
+  cpp-benchmark-tests:
+    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
+    with:
+      target: 'Cpp'
+    needs: cancel
 
-  # # Run the C++ integration tests.
-  # cpp-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/cpp-tests.yml@master
-  #   needs: cancel
+  # Run the C++ integration tests.
+  cpp-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/cpp-tests.yml@master
+    needs: cancel
 
-  # # Run the C++ integration tests on ROS2.
-  # cpp-ros2-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/cpp-ros2-tests.yml@master
-  #   needs: cancel
+  # Run the C++ integration tests on ROS2.
+  cpp-ros2-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/cpp-ros2-tests.yml@master
+    needs: cancel
 
-  # # Run the Python integration tests.
-  # py-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/py-tests.yml@master
-  #   needs: cancel
+  # Run the Python integration tests.
+  py-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/py-tests.yml@master
+    needs: cancel
 
-  # # Run the Rust integration tests.
-  # rs-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/rs-tests.yml@master
-  #   needs: cancel
+  # Run the Rust integration tests.
+  rs-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/rs-tests.yml@master
+    needs: cancel
 
-  # # Run the Rust benchmark tests.
-  # rs-benchmark-tests:
-  #   uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
-  #   with:
-  #     target: 'Rust'
-  #   needs: cancel
+  # Run the Rust benchmark tests.
+  rs-benchmark-tests:
+    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
+    with:
+      target: 'Rust'
+    needs: cancel
 
-  # # Run the TypeScript integration tests.
-  # ts-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/ts-tests.yml@master
-  #   needs: cancel
+  # Run the TypeScript integration tests.
+  ts-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/ts-tests.yml@master
+    needs: cancel
 
-  # # Run the serialization tests
-  # serialization-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/serialization-tests.yml@master
-  #   needs: cancel
+  # Run the serialization tests
+  serialization-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/serialization-tests.yml@master
+    needs: cancel
 
   # Run the Uclid benchmark tests.
   uclid-verifier-c-tests:
-    uses: ./.github/workflows/uclid-verifier-c-tests.yml
+    uses: lsk567/lf-verifer-benchmarks/.github/workflows/uclid-verifier-c-tests.yml
     needs: cancel
diff --git a/.github/workflows/uclid-verifier-c-tests.yml b/.github/workflows/uclid-verifier-c-tests.yml
deleted file mode 100644
index 762bf6765a..0000000000
--- a/.github/workflows/uclid-verifier-c-tests.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: Uclid5-based Verifier Tests
-
-on:
-  workflow_call:
-
-env:
-  ACTIONS_STEP_DEBUG: TRUE
-  ACTIONS_RUNNER_DEBUG: TRUE
-
-jobs:
-  run:
-    strategy:
-      matrix:
-        platform: [ubuntu-latest]
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - name: Check out lingua-franca repository
-        uses: actions/checkout@v3
-      - name: Check out lf-verifer-benchmarks repository
-        uses: actions/checkout@v3
-        with:
-          repository: lsk567/lf-verifer-benchmarks
-          path: ./lf-verifer-benchmarks
-      - name: Check out Uclid5 repository
-        uses: actions/checkout@v3
-        with:
-          repository: uclid-org/uclid
-          ref: 4fd5e566c5f87b052f92e9b23723a85e1c4d8c1c
-          path: ./uclid
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '11'
-          cache: 'sbt'
-      - name: Setup upterm session
-        uses: lhotari/action-upterm@v1
-      - name: Install Z3 and Uclid5
-        run: |
-          cd uclid
-          ./get-z3-linux.sh
-          ./setup-z3-linux.sh
-          sbt update clean compile
-          sbt universal:packageBin
-          cd target/universal/
-          unzip uclid-0.9.5.zip
-          export PATH="$(pwd)/uclid-0.9.5/bin:$PATH"
-          uclid --version
-      - name: Run the test script
-        run: |
-          cd ../lf-verifer-benchmarks
-          ./scripts/test-lf-verifier
\ No newline at end of file

From ac43a76f99a46071ddb2fb1e8d50c8270dcf17fe Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 20 Feb 2023 18:31:25 -0800
Subject: [PATCH 0092/1114] Specify version

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9f67aed00d..64095e8363 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -131,5 +131,5 @@ jobs:
 
   # Run the Uclid benchmark tests.
   uclid-verifier-c-tests:
-    uses: lsk567/lf-verifer-benchmarks/.github/workflows/uclid-verifier-c-tests.yml
+    uses: lsk567/lf-verifer-benchmarks/.github/workflows/uclid-verifier-c-tests.yml@master
     needs: cancel

From e77e60ca5d0645af6ee53da28e301d9effaee994 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 20 Feb 2023 18:34:45 -0800
Subject: [PATCH 0093/1114] Fix version

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 64095e8363..3733768bf4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -131,5 +131,5 @@ jobs:
 
   # Run the Uclid benchmark tests.
   uclid-verifier-c-tests:
-    uses: lsk567/lf-verifer-benchmarks/.github/workflows/uclid-verifier-c-tests.yml@master
+    uses: lsk567/lf-verifer-benchmarks/.github/workflows/uclid-verifier-c-tests.yml@main
     needs: cancel

From 489a563f374744bb263fd638c99a0ad6cdff42f3 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 20 Feb 2023 22:01:03 -0800
Subject: [PATCH 0094/1114] Fix typo

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3733768bf4..65abbd7751 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -131,5 +131,5 @@ jobs:
 
   # Run the Uclid benchmark tests.
   uclid-verifier-c-tests:
-    uses: lsk567/lf-verifer-benchmarks/.github/workflows/uclid-verifier-c-tests.yml@main
+    uses: lsk567/lf-verifier-benchmarks/.github/workflows/uclid-verifier-c-tests.yml@main
     needs: cancel

From 11d985f603b2954731d9de231b33623cb31a65a0 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 20 Feb 2023 23:13:07 -0800
Subject: [PATCH 0095/1114] Relocate the yml file.

---
 .github/workflows/ci.yml                     | 180 +++++++++----------
 .github/workflows/uclid-verifier-c-tests.yml |  76 ++++++++
 2 files changed, 166 insertions(+), 90 deletions(-)
 create mode 100644 .github/workflows/uclid-verifier-c-tests.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 65abbd7751..ee3fa6ef18 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,116 +20,116 @@ jobs:
   cancel:
     uses: lf-lang/lingua-franca/.github/workflows/cancel.yml@master
 
-  # Test the Gradle and Maven build.
-  build:
-    uses: lf-lang/lingua-franca/.github/workflows/build.yml@master
-    needs: cancel
-
-  # Build the tools used for processing execution traces
-  build-tracing-tools:
-    uses: lf-lang/lingua-franca/.github/workflows/build-trace-tools.yml@master
-    needs: cancel
+  # # Test the Gradle and Maven build.
+  # build:
+  #   uses: lf-lang/lingua-franca/.github/workflows/build.yml@master
+  #   needs: cancel
 
-  # Check that automatic code formatting works.
-  # TODO: Uncomment after fed-gen is merged.
-  # format:
-  #   uses: lf-lang/lingua-franca/.github/workflows/format.yml@master
+  # # Build the tools used for processing execution traces
+  # build-tracing-tools:
+  #   uses: lf-lang/lingua-franca/.github/workflows/build-trace-tools.yml@master
   #   needs: cancel
 
-  # Run the unit tests.
-  unit-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/unit-tests.yml@master
-    needs: cancel
+  # # Check that automatic code formatting works.
+  # # TODO: Uncomment after fed-gen is merged.
+  # # format:
+  # #   uses: lf-lang/lingua-franca/.github/workflows/format.yml@master
+  # #   needs: cancel
 
-  # Run tests for the standalone compiler.
-  cli-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/cli-tests.yml@master
-    needs: cancel
+  # # Run the unit tests.
+  # unit-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/unit-tests.yml@master
+  #   needs: cancel
 
-  # Run the C benchmark tests.
-  c-benchmark-tests:
-    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
-    with:
-      target: 'C'
-    needs: cancel
+  # # Run tests for the standalone compiler.
+  # cli-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/cli-tests.yml@master
+  #   needs: cancel
 
-  # Run tests for Eclipse.
-  eclipse-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/eclipse-tests.yml@master
-    needs: cancel
+  # # Run the C benchmark tests.
+  # c-benchmark-tests:
+  #   uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
+  #   with:
+  #     target: 'C'
+  #   needs: cancel
 
-  # Run language server tests.
-  lsp-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/lsp-tests.yml@master
-    needs: cancel
+  # # Run tests for Eclipse.
+  # eclipse-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/eclipse-tests.yml@master
+  #   needs: cancel
 
-  # Run the C integration tests.
-  c-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
-    needs: cancel
+  # # Run language server tests.
+  # lsp-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/lsp-tests.yml@master
+  #   needs: cancel
+
+  # # Run the C integration tests.
+  # c-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
+  #   needs: cancel
   
-  # Run the C Arduino integration tests.
-  c-arduino-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/c-arduino-tests.yml@master
-    needs: cancel
+  # # Run the C Arduino integration tests.
+  # c-arduino-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/c-arduino-tests.yml@master
+  #   needs: cancel
   
-  # Run the C Zephyr integration tests.
-  c-zephyr-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/c-zephyr-tests.yml@master
-    needs: cancel
+  # # Run the C Zephyr integration tests.
+  # c-zephyr-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/c-zephyr-tests.yml@master
+  #   needs: cancel
 
-  # Run the CCpp integration tests.
-  ccpp-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
-    with:
-      use-cpp: true
-    needs: cancel
+  # # Run the CCpp integration tests.
+  # ccpp-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
+  #   with:
+  #     use-cpp: true
+  #   needs: cancel
 
-  # Run the C++ benchmark tests.
-  cpp-benchmark-tests:
-    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
-    with:
-      target: 'Cpp'
-    needs: cancel
+  # # Run the C++ benchmark tests.
+  # cpp-benchmark-tests:
+  #   uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
+  #   with:
+  #     target: 'Cpp'
+  #   needs: cancel
 
-  # Run the C++ integration tests.
-  cpp-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/cpp-tests.yml@master
-    needs: cancel
+  # # Run the C++ integration tests.
+  # cpp-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/cpp-tests.yml@master
+  #   needs: cancel
 
-  # Run the C++ integration tests on ROS2.
-  cpp-ros2-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/cpp-ros2-tests.yml@master
-    needs: cancel
+  # # Run the C++ integration tests on ROS2.
+  # cpp-ros2-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/cpp-ros2-tests.yml@master
+  #   needs: cancel
 
-  # Run the Python integration tests.
-  py-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/py-tests.yml@master
-    needs: cancel
+  # # Run the Python integration tests.
+  # py-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/py-tests.yml@master
+  #   needs: cancel
 
-  # Run the Rust integration tests.
-  rs-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/rs-tests.yml@master
-    needs: cancel
+  # # Run the Rust integration tests.
+  # rs-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/rs-tests.yml@master
+  #   needs: cancel
 
-  # Run the Rust benchmark tests.
-  rs-benchmark-tests:
-    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
-    with:
-      target: 'Rust'
-    needs: cancel
+  # # Run the Rust benchmark tests.
+  # rs-benchmark-tests:
+  #   uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
+  #   with:
+  #     target: 'Rust'
+  #   needs: cancel
 
-  # Run the TypeScript integration tests.
-  ts-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/ts-tests.yml@master
-    needs: cancel
+  # # Run the TypeScript integration tests.
+  # ts-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/ts-tests.yml@master
+  #   needs: cancel
 
-  # Run the serialization tests
-  serialization-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/serialization-tests.yml@master
-    needs: cancel
+  # # Run the serialization tests
+  # serialization-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/serialization-tests.yml@master
+  #   needs: cancel
 
   # Run the Uclid benchmark tests.
   uclid-verifier-c-tests:
-    uses: lsk567/lf-verifier-benchmarks/.github/workflows/uclid-verifier-c-tests.yml@main
+    uses: .github/workflows/uclid-verifier-c-tests.yml
     needs: cancel
diff --git a/.github/workflows/uclid-verifier-c-tests.yml b/.github/workflows/uclid-verifier-c-tests.yml
new file mode 100644
index 0000000000..f23bcd8545
--- /dev/null
+++ b/.github/workflows/uclid-verifier-c-tests.yml
@@ -0,0 +1,76 @@
+name: Uclid5-based Verifier Tests
+
+on:
+  # Trigger this workflow also on workflow_call events.
+  workflow_call:
+
+env:
+  ACTIONS_STEP_DEBUG: TRUE
+  ACTIONS_RUNNER_DEBUG: TRUE
+
+jobs:
+  run:
+    strategy:
+      matrix:
+        platform: [ubuntu-latest]
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: Check out lingua-franca repository
+        uses: actions/checkout@v3
+        with:
+          path: lingua-franca
+      - name: Check out lf-verifier-benchmarks repository
+        uses: actions/checkout@v3
+        with:
+          repository: lsk567/lf-verifier-benchmarks
+          ref: master
+          path: lf-verifier-benchmarks
+      - name: Check out Uclid5 repository
+        uses: actions/checkout@v3
+        with:
+          repository: uclid-org/uclid
+          ref: 4fd5e566c5f87b052f92e9b23723a85e1c4d8c1c
+          path: uclid
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - name: Install Lingua Franca
+        working-directory: lingua-franca/
+        run: |
+          ./bin/build-lf-cli
+          ./bin/lfc --version
+          echo "$(pwd)/bin" >> $GITHUB_PATH
+      - name: Cache Z3
+        working-directory: uclid/
+        id: cache-z3
+        uses: actions/cache@v3
+        with:
+          path: z3/
+          key: ${{ runner.os }}-z3-${{ hashFiles('get-z3-linux.sh') }}-1
+      - name: Download Z3
+        working-directory: uclid/
+        if: steps.cache-z3.outputs.cache-hit != 'true'
+        run: ./get-z3-linux.sh
+      - name: Add Z3 to Path
+        working-directory: uclid/
+        run: |
+          echo "$(pwd)/z3/bin/" >> $GITHUB_PATH
+          echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/z3/bin/" >> $GITHUB_ENV
+      - name: Print Z3 Version
+        run: z3 --version
+      - name: Install Uclid5
+        working-directory: uclid/
+        run: |
+          sbt update clean compile
+          sbt universal:packageBin
+          cd target/universal/
+          unzip uclid-0.9.5.zip
+          ./uclid-0.9.5/bin/uclid --help
+          echo "$(pwd)/uclid-0.9.5/bin" >> $GITHUB_PATH
+      - name: Setup upterm session
+        uses: lhotari/action-upterm@v1
+      - name: Run the test script
+        working-directory: lf-verifier-benchmarks/
+        run: ./scripts/test-lf-verifier
\ No newline at end of file

From c02b3b11d2a748225fe0a2783bec73c310edcd21 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 20 Feb 2023 23:17:57 -0800
Subject: [PATCH 0096/1114] Emphasize local workflow

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ee3fa6ef18..132f443520 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -131,5 +131,5 @@ jobs:
 
   # Run the Uclid benchmark tests.
   uclid-verifier-c-tests:
-    uses: .github/workflows/uclid-verifier-c-tests.yml
+    uses: ./.github/workflows/uclid-verifier-c-tests.yml
     needs: cancel

From 5c725d898bce3ab6d13ec5598d0b62de0748f5fb Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 20 Feb 2023 23:19:52 -0800
Subject: [PATCH 0097/1114] Remove caching

---
 .github/workflows/uclid-verifier-c-tests.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/uclid-verifier-c-tests.yml b/.github/workflows/uclid-verifier-c-tests.yml
index f23bcd8545..37b647aefa 100644
--- a/.github/workflows/uclid-verifier-c-tests.yml
+++ b/.github/workflows/uclid-verifier-c-tests.yml
@@ -42,13 +42,6 @@ jobs:
           ./bin/build-lf-cli
           ./bin/lfc --version
           echo "$(pwd)/bin" >> $GITHUB_PATH
-      - name: Cache Z3
-        working-directory: uclid/
-        id: cache-z3
-        uses: actions/cache@v3
-        with:
-          path: z3/
-          key: ${{ runner.os }}-z3-${{ hashFiles('get-z3-linux.sh') }}-1
       - name: Download Z3
         working-directory: uclid/
         if: steps.cache-z3.outputs.cache-hit != 'true'

From 276811b1c9fbcc36736bb1271dfca368187b6924 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 20 Feb 2023 23:23:30 -0800
Subject: [PATCH 0098/1114] Fix branch name

---
 .github/workflows/uclid-verifier-c-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/uclid-verifier-c-tests.yml b/.github/workflows/uclid-verifier-c-tests.yml
index 37b647aefa..e6e2ff4ad9 100644
--- a/.github/workflows/uclid-verifier-c-tests.yml
+++ b/.github/workflows/uclid-verifier-c-tests.yml
@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: lsk567/lf-verifier-benchmarks
-          ref: master
+          ref: main
           path: lf-verifier-benchmarks
       - name: Check out Uclid5 repository
         uses: actions/checkout@v3

From 662867e1b60553388cea5c51bb823abf0fc3d67d Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 20 Feb 2023 23:26:43 -0800
Subject: [PATCH 0099/1114] Fetch history

---
 .github/workflows/uclid-verifier-c-tests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/uclid-verifier-c-tests.yml b/.github/workflows/uclid-verifier-c-tests.yml
index e6e2ff4ad9..fafb19c9de 100644
--- a/.github/workflows/uclid-verifier-c-tests.yml
+++ b/.github/workflows/uclid-verifier-c-tests.yml
@@ -19,6 +19,8 @@ jobs:
         uses: actions/checkout@v3
         with:
           path: lingua-franca
+          submodules: true
+          fetch-depth: 0
       - name: Check out lf-verifier-benchmarks repository
         uses: actions/checkout@v3
         with:

From 6ad8f4bf0d6fb941282a70799add17356718904f Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 20 Feb 2023 23:37:52 -0800
Subject: [PATCH 0100/1114] Remove SSH and update CI

---
 .github/workflows/ci.yml                     | 178 +++++++++----------
 .github/workflows/uclid-verifier-c-tests.yml |   2 -
 2 files changed, 89 insertions(+), 91 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 132f443520..0404b47d65 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,114 +20,114 @@ jobs:
   cancel:
     uses: lf-lang/lingua-franca/.github/workflows/cancel.yml@master
 
-  # # Test the Gradle and Maven build.
-  # build:
-  #   uses: lf-lang/lingua-franca/.github/workflows/build.yml@master
-  #   needs: cancel
-
-  # # Build the tools used for processing execution traces
-  # build-tracing-tools:
-  #   uses: lf-lang/lingua-franca/.github/workflows/build-trace-tools.yml@master
-  #   needs: cancel
+  # Test the Gradle and Maven build.
+  build:
+    uses: lf-lang/lingua-franca/.github/workflows/build.yml@master
+    needs: cancel
 
-  # # Check that automatic code formatting works.
-  # # TODO: Uncomment after fed-gen is merged.
-  # # format:
-  # #   uses: lf-lang/lingua-franca/.github/workflows/format.yml@master
-  # #   needs: cancel
+  # Build the tools used for processing execution traces
+  build-tracing-tools:
+    uses: lf-lang/lingua-franca/.github/workflows/build-trace-tools.yml@master
+    needs: cancel
 
-  # # Run the unit tests.
-  # unit-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/unit-tests.yml@master
+  # Check that automatic code formatting works.
+  # TODO: Uncomment after fed-gen is merged.
+  # format:
+  #   uses: lf-lang/lingua-franca/.github/workflows/format.yml@master
   #   needs: cancel
 
-  # # Run tests for the standalone compiler.
-  # cli-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/cli-tests.yml@master
-  #   needs: cancel
+  # Run the unit tests.
+  unit-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/unit-tests.yml@master
+    needs: cancel
 
-  # # Run the C benchmark tests.
-  # c-benchmark-tests:
-  #   uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
-  #   with:
-  #     target: 'C'
-  #   needs: cancel
+  # Run tests for the standalone compiler.
+  cli-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/cli-tests.yml@master
+    needs: cancel
 
-  # # Run tests for Eclipse.
-  # eclipse-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/eclipse-tests.yml@master
-  #   needs: cancel
+  # Run the C benchmark tests.
+  c-benchmark-tests:
+    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
+    with:
+      target: 'C'
+    needs: cancel
 
-  # # Run language server tests.
-  # lsp-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/lsp-tests.yml@master
-  #   needs: cancel
+  # Run tests for Eclipse.
+  eclipse-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/eclipse-tests.yml@master
+    needs: cancel
 
-  # # Run the C integration tests.
-  # c-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
-  #   needs: cancel
+  # Run language server tests.
+  lsp-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/lsp-tests.yml@master
+    needs: cancel
+
+  # Run the C integration tests.
+  c-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
+    needs: cancel
   
-  # # Run the C Arduino integration tests.
-  # c-arduino-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/c-arduino-tests.yml@master
-  #   needs: cancel
+  # Run the C Arduino integration tests.
+  c-arduino-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/c-arduino-tests.yml@master
+    needs: cancel
   
-  # # Run the C Zephyr integration tests.
-  # c-zephyr-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/c-zephyr-tests.yml@master
-  #   needs: cancel
+  # Run the C Zephyr integration tests.
+  c-zephyr-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/c-zephyr-tests.yml@master
+    needs: cancel
 
-  # # Run the CCpp integration tests.
-  # ccpp-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
-  #   with:
-  #     use-cpp: true
-  #   needs: cancel
+  # Run the CCpp integration tests.
+  ccpp-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
+    with:
+      use-cpp: true
+    needs: cancel
 
-  # # Run the C++ benchmark tests.
-  # cpp-benchmark-tests:
-  #   uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
-  #   with:
-  #     target: 'Cpp'
-  #   needs: cancel
+  # Run the C++ benchmark tests.
+  cpp-benchmark-tests:
+    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
+    with:
+      target: 'Cpp'
+    needs: cancel
 
-  # # Run the C++ integration tests.
-  # cpp-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/cpp-tests.yml@master
-  #   needs: cancel
+  # Run the C++ integration tests.
+  cpp-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/cpp-tests.yml@master
+    needs: cancel
 
-  # # Run the C++ integration tests on ROS2.
-  # cpp-ros2-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/cpp-ros2-tests.yml@master
-  #   needs: cancel
+  # Run the C++ integration tests on ROS2.
+  cpp-ros2-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/cpp-ros2-tests.yml@master
+    needs: cancel
 
-  # # Run the Python integration tests.
-  # py-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/py-tests.yml@master
-  #   needs: cancel
+  # Run the Python integration tests.
+  py-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/py-tests.yml@master
+    needs: cancel
 
-  # # Run the Rust integration tests.
-  # rs-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/rs-tests.yml@master
-  #   needs: cancel
+  # Run the Rust integration tests.
+  rs-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/rs-tests.yml@master
+    needs: cancel
 
-  # # Run the Rust benchmark tests.
-  # rs-benchmark-tests:
-  #   uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
-  #   with:
-  #     target: 'Rust'
-  #   needs: cancel
+  # Run the Rust benchmark tests.
+  rs-benchmark-tests:
+    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
+    with:
+      target: 'Rust'
+    needs: cancel
 
-  # # Run the TypeScript integration tests.
-  # ts-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/ts-tests.yml@master
-  #   needs: cancel
+  # Run the TypeScript integration tests.
+  ts-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/ts-tests.yml@master
+    needs: cancel
 
-  # # Run the serialization tests
-  # serialization-tests:
-  #   uses: lf-lang/lingua-franca/.github/workflows/serialization-tests.yml@master
-  #   needs: cancel
+  # Run the serialization tests
+  serialization-tests:
+    uses: lf-lang/lingua-franca/.github/workflows/serialization-tests.yml@master
+    needs: cancel
 
   # Run the Uclid benchmark tests.
   uclid-verifier-c-tests:
diff --git a/.github/workflows/uclid-verifier-c-tests.yml b/.github/workflows/uclid-verifier-c-tests.yml
index fafb19c9de..cb1c9e7e1b 100644
--- a/.github/workflows/uclid-verifier-c-tests.yml
+++ b/.github/workflows/uclid-verifier-c-tests.yml
@@ -64,8 +64,6 @@ jobs:
           unzip uclid-0.9.5.zip
           ./uclid-0.9.5/bin/uclid --help
           echo "$(pwd)/uclid-0.9.5/bin" >> $GITHUB_PATH
-      - name: Setup upterm session
-        uses: lhotari/action-upterm@v1
       - name: Run the test script
         working-directory: lf-verifier-benchmarks/
         run: ./scripts/test-lf-verifier
\ No newline at end of file

From 4a38b8f9262c30c82ef53f2fd4e8a012dc6a40e4 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Tue, 21 Feb 2023 10:28:32 -0800
Subject: [PATCH 0101/1114] Fix Globally

---
 org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
index 187caeab63..0f40df73d8 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
@@ -225,13 +225,14 @@ public String visitGlobally(MTLParser.GloballyContext ctx,
         String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
                                                     upperBoundNanoSec, "j" + QFIdx, prefixIdx);        
         return "(" + "finite_forall " + "(" + "j" + QFIdx + " : integer) in indices :: "
-                + "j" + QFIdx + " >= " + prefixIdx + " && " + "j" + QFIdx + " <= " + end
+                + "(" + "j" + QFIdx + " >= " + prefixIdx + " && " + "j" + QFIdx + " <= " + end
                 + " && " + "!" + "isNULL" + "(" + "j" + QFIdx + ")"
-                + " && " + "(" + visitPrimary(ctx.formula, ("j"+QFIdx), QFIdx+1, prefixIdx, currentHorizon) + ")"
                 + " && " + "(" + "\n" 
                 + "// Time Predicate\n"
                 + timePredicate + "\n"
-                + "))";
+                + ")" + ")"
+                + " ==> " + "(" + visitPrimary(ctx.formula, ("j"+QFIdx), QFIdx+1, prefixIdx, currentHorizon) + ")"
+                + ")";
     }
 
     public String visitFinally(MTLParser.FinallyContext ctx,

From 17828a2d5f2cc4c172cbcacfd0d0b72762e06d24 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 3 Mar 2023 11:45:36 -0800
Subject: [PATCH 0102/1114] Let the event queue sort based on both tags and
 trigger names

---
 org.lflang/src/org/lflang/analyses/statespace/Event.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/org.lflang/src/org/lflang/analyses/statespace/Event.java b/org.lflang/src/org/lflang/analyses/statespace/Event.java
index ef0f004e4f..cea24280ac 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/Event.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/Event.java
@@ -24,7 +24,13 @@ public TriggerInstance getTrigger() {
     
     @Override
     public int compareTo(Event e) {
-        return this.tag.compareTo(e.tag);
+        // Compare tags first.
+        int ret = this.tag.compareTo(e.tag);
+        // If tags match, compare trigger names.
+        if (ret == 0)
+            ret = this.trigger.getFullName()
+                              .compareTo(e.trigger.getFullName());
+        return ret;
     }
 
     /**

From 22a7b113aad5bc4cec610d2c69c2ed5f2b71d855 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 3 Mar 2023 12:08:03 -0800
Subject: [PATCH 0103/1114] Prune dead code

---
 .../org/lflang/analyses/cast/AstUtils.java    |  2 --
 .../cast/BuildAstParseTreeVisitor.java        |  5 ---
 .../lflang/analyses/cast/CToUclidVisitor.java | 14 --------
 .../org/lflang/analyses/uclid/MTLVisitor.java |  2 +-
 .../lflang/analyses/uclid/UclidGenerator.java | 33 +------------------
 .../lflang/analyses/uclid/UclidRunner.java    |  2 +-
 6 files changed, 3 insertions(+), 55 deletions(-)

diff --git a/org.lflang/src/org/lflang/analyses/cast/AstUtils.java b/org.lflang/src/org/lflang/analyses/cast/AstUtils.java
index a42198cb4b..bed532e424 100644
--- a/org.lflang/src/org/lflang/analyses/cast/AstUtils.java
+++ b/org.lflang/src/org/lflang/analyses/cast/AstUtils.java
@@ -5,8 +5,6 @@
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.misc.Interval;
 
-import org.eclipse.xtext.xbase.lib.Exceptions;
-
 public class AstUtils {
     
     public static CAst.AstNode takeConjunction(List<CAst.AstNode> conditions) {
diff --git a/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java b/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
index 4807713e83..450a4798e4 100644
--- a/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
@@ -12,15 +12,10 @@ public class BuildAstParseTreeVisitor extends CBaseVisitor<CAst.AstNode> {
     @Override
     public CAst.AstNode visitBlockItemList(BlockItemListContext ctx) {
         CAst.StatementSequenceNode stmtSeq = new CAst.StatementSequenceNode();
-        
         // Populate the children.
         for (BlockItemContext blockItem : ctx.blockItem()) {
-            // System.out.println(blockItem);
             stmtSeq.children.add(visit(blockItem));
         }
-
-        // System.out.println(stmtSeq.children);
-
         return stmtSeq;
     }
 
diff --git a/org.lflang/src/org/lflang/analyses/cast/CToUclidVisitor.java b/org.lflang/src/org/lflang/analyses/cast/CToUclidVisitor.java
index 015a71b3f2..c794186cbe 100644
--- a/org.lflang/src/org/lflang/analyses/cast/CToUclidVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/cast/CToUclidVisitor.java
@@ -60,14 +60,6 @@ public String visitAdditionNode(AdditionNode node) {
     @Override
     public String visitAssignmentNode(AssignmentNode node) {
         String lhs = visit(node.left);
-        // String lhs = "";
-        // if (node.left instanceof StateVarNode) {
-        //     NamedInstance instance = getInstanceByName(((StateVarNode)node.left).name);
-        //     lhs = instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
-        //     // this.unchangedStates.remove(instance); // Remove instance from the unchanged list.
-        // } else {
-        //     System.out.println("Unreachable!"); // FIXME: Throw exception.
-        // }
         String rhs = visit(node.right);
         return "(" + lhs + " == " + rhs + ")";
     }
@@ -278,12 +270,6 @@ public String visitVariableNode(VariableNode node) {
     //// Private functions
 
     private NamedInstance getInstanceByName(String name) {
-        
-        // For some reason, the following one liner doesn't work:
-        //
-        // return this.instances.stream().filter(i -> i.getDefinition()
-        //     .getName().equals(name)).findFirst().get();
-
         for (NamedInstance i : this.instances) {
             if (i instanceof ActionInstance) {
                 if (((ActionInstance)i).getDefinition().getName().equals(name)) {
diff --git a/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
index 0f40df73d8..79e7e4e2fc 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
@@ -23,7 +23,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 ***************/
 
 /** 
- * Transpiler from an MTL specification to a Uclid axiom.
+ * (EXPERIMENTAL) Transpiler from an MTL specification to a Uclid axiom.
  * 
  * @author{Shaokai Lin <shaokai@berkeley.edu>}
  */
diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
index 1d8d76276d..7ba6c9a8af 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
@@ -23,7 +23,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 ***************/
 
 /** 
- * Generator for Uclid models.
+ * (EXPERIMENTAL) Generator for Uclid5 models.
  * 
  * @author{Shaokai Lin <shaokai@berkeley.edu>}
  */
@@ -274,37 +274,6 @@ protected void generateUclidFile() {
         }
     }
 
-    /**
-     * Generate the Uclid model.
-     */
-    protected void generateRunnerScript() {
-        try {  
-            // Generate main.ucl and print to file
-            var script = new CodeBuilder();
-            String filename = this.outputDir
-                                .resolve("run.sh").toString();
-            script.pr(String.join("\n", 
-                "#!/bin/bash",
-                "set -e # Terminate on error",
-                "",
-                "echo '*** Setting up smt directory'",
-                "rm -rf ./smt/ && mkdir -p smt",
-                "",
-                "echo '*** Generating SMT files from UCLID5'",
-                "time uclid -g \"smt/output\" $1",
-                "",
-                "echo '*** Append (get-model) to each file'",
-                "ls smt | xargs -I {} bash -c 'echo \"(get-model)\" >> smt/{}'",
-                "",
-                "echo '*** Running Z3'",
-                "ls smt | xargs -I {} bash -c 'z3 parallel.enable=true -T:300 -v:1 ./smt/{}'"
-            ));
-            script.writeToFile(filename);
-        } catch (IOException e) {
-            Exceptions.sneakyThrow(e);
-        }
-    }
-
     /**
      * The main function that generates Uclid code.
      */
diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java b/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
index be28c77665..85ad15361f 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
@@ -1,5 +1,5 @@
 /** 
- * Runner for Uclid models.
+ * (EXPERIMENTAL) Runner for Uclid5 models.
  * 
  * @author{Shaokai Lin <shaokai@berkeley.edu>}
  */

From 46e84c6be6b1556f317cd112b17bc5d5b0aa750f Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 23 Mar 2023 10:29:18 -0700
Subject: [PATCH 0104/1114] Temporarily remove the author tag for Shaokai.

---
 org.lflang/src/org/lflang/analyses/statespace/Event.java        | 2 +-
 org.lflang/src/org/lflang/analyses/statespace/EventQueue.java   | 2 +-
 org.lflang/src/org/lflang/analyses/statespace/StateInfo.java    | 2 +-
 .../src/org/lflang/analyses/statespace/StateSpaceDiagram.java   | 2 +-
 .../src/org/lflang/analyses/statespace/StateSpaceNode.java      | 2 +-
 org.lflang/src/org/lflang/analyses/statespace/Tag.java          | 2 +-
 org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java        | 2 +-
 org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java    | 2 +-
 org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java       | 2 +-
 org.lflang/src/org/lflang/generator/StateVariableInstance.java  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/org.lflang/src/org/lflang/analyses/statespace/Event.java b/org.lflang/src/org/lflang/analyses/statespace/Event.java
index cea24280ac..dc8613af92 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/Event.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/Event.java
@@ -2,7 +2,7 @@
  * A node in the state space diagram representing a step
  * in the execution of an LF program.
  * 
- * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ * 
  */
 package org.lflang.analyses.statespace;
 
diff --git a/org.lflang/src/org/lflang/analyses/statespace/EventQueue.java b/org.lflang/src/org/lflang/analyses/statespace/EventQueue.java
index 44bb371f14..4c809d091a 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/EventQueue.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/EventQueue.java
@@ -2,7 +2,7 @@
  * An event queue implementation that
  * sorts events by time tag order
  *
- * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ * 
  */
 package org.lflang.analyses.statespace;
 
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateInfo.java b/org.lflang/src/org/lflang/analyses/statespace/StateInfo.java
index 84cf25d5f2..7930336d7e 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateInfo.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateInfo.java
@@ -2,7 +2,7 @@
  * A class that represents information in a step
  * in a counterexample trace
  * 
- * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ * 
  */
 package org.lflang.analyses.statespace;
 
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
index 7a0f4eff5e..4615dececd 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
@@ -1,7 +1,7 @@
 /** 
  * A directed graph representing the state space of an LF program.
  * 
- * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ * 
  */
 package org.lflang.analyses.statespace;
 
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
index 2c20f05cdd..35c588bcbc 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
@@ -2,7 +2,7 @@
  * A node in the state space diagram representing a step
  * in the execution of an LF program.
  * 
- * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ * 
  */
 package org.lflang.analyses.statespace;
 
diff --git a/org.lflang/src/org/lflang/analyses/statespace/Tag.java b/org.lflang/src/org/lflang/analyses/statespace/Tag.java
index 99210ae622..362632ea3d 100644
--- a/org.lflang/src/org/lflang/analyses/statespace/Tag.java
+++ b/org.lflang/src/org/lflang/analyses/statespace/Tag.java
@@ -3,7 +3,7 @@
  * which is a pair that consists of a
  * timestamp (type long) and a microstep (type long).
  * 
- * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ * 
  */
 package org.lflang.analyses.statespace;
 
diff --git a/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
index 79e7e4e2fc..381a98a49b 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
@@ -25,7 +25,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 /** 
  * (EXPERIMENTAL) Transpiler from an MTL specification to a Uclid axiom.
  * 
- * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ * 
  */
 package org.lflang.analyses.uclid;
 
diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
index 7ba6c9a8af..e484cf606e 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
@@ -25,7 +25,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 /** 
  * (EXPERIMENTAL) Generator for Uclid5 models.
  * 
- * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ * 
  */
 package org.lflang.analyses.uclid;
 
diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java b/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
index 85ad15361f..2469e2da8c 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
@@ -1,7 +1,7 @@
 /** 
  * (EXPERIMENTAL) Runner for Uclid5 models.
  * 
- * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ * 
  */
 package org.lflang.analyses.uclid;
 
diff --git a/org.lflang/src/org/lflang/generator/StateVariableInstance.java b/org.lflang/src/org/lflang/generator/StateVariableInstance.java
index 9ec7163cac..661602b01c 100644
--- a/org.lflang/src/org/lflang/generator/StateVariableInstance.java
+++ b/org.lflang/src/org/lflang/generator/StateVariableInstance.java
@@ -31,7 +31,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 /** 
  * Representation of a compile-time instance of a state variable.
  *  
- * @author{Shaokai Lin <shaokai@berkeley.edu>}
+ * 
  */
 public class StateVariableInstance extends NamedInstance<StateVar> {
 

From 8ba0f961265ef8e47b938c25e2eeafb1f4f71ad9 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 23 Mar 2023 10:29:43 -0700
Subject: [PATCH 0105/1114] Minor MTL grammar update

---
 org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4 b/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4
index 1a5d39b9b4..f22a6a2696 100644
--- a/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4
+++ b/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4
@@ -47,7 +47,7 @@ atomicProp
     ;
 
 interval
-    : (LPAREN|LBRACKET) lowerbound=time COMMA upperbound=time (RPAREN|RBRACKET) # Range
+    : LBRACKET lowerbound=time COMMA upperbound=time RBRACKET # Range
     | LBRACKET instant=time RBRACKET # Singleton
     ;
 

From 7802314f17ecddd1b39d8d1e666e8850640d8bf2 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 23 Mar 2023 16:51:19 -0700
Subject: [PATCH 0106/1114] Minor update

---
 org.lflang/src/org/lflang/cli/Lfc.java               | 2 +-
 org.lflang/src/org/lflang/generator/LFGenerator.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.lflang/src/org/lflang/cli/Lfc.java b/org.lflang/src/org/lflang/cli/Lfc.java
index 7a73a10204..e04b84ce5b 100644
--- a/org.lflang/src/org/lflang/cli/Lfc.java
+++ b/org.lflang/src/org/lflang/cli/Lfc.java
@@ -113,7 +113,7 @@ public Lfc() {
     @Option(
         names = {"--no-verify"},
         arity = "0",
-        description = "Do not generate verification models.")
+        description = "Do not run the generated verification models.")
     private boolean noVerify;
 
     @Option(
diff --git a/org.lflang/src/org/lflang/generator/LFGenerator.java b/org.lflang/src/org/lflang/generator/LFGenerator.java
index dd5ab47a2d..c96dfa95cc 100644
--- a/org.lflang/src/org/lflang/generator/LFGenerator.java
+++ b/org.lflang/src/org/lflang/generator/LFGenerator.java
@@ -196,7 +196,7 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa,
                 UclidGenerator uclidGenerator = new UclidGenerator(lfContext, properties);
                 // Generate uclid files.
                 uclidGenerator.doGenerate(resource, lfContext);
-                if (uclidGenerator.targetConfig.noVerify == false) {
+                if (!uclidGenerator.targetConfig.noVerify) {
                     // Invoke the generated uclid files.
                     uclidGenerator.runner.run();
                 } else {

From 7672fb22d3fb4008382a7d749875926d28ba56b9 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 23 Mar 2023 17:18:26 -0700
Subject: [PATCH 0107/1114] Make --no-verify work again

---
 org.lflang/src/org/lflang/TargetConfig.java   |  3 ++
 .../lflang/analyses/uclid/UclidGenerator.java | 54 +++++++++----------
 org.lflang/src/org/lflang/cli/Lfc.java        |  3 ++
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/org.lflang/src/org/lflang/TargetConfig.java b/org.lflang/src/org/lflang/TargetConfig.java
index 33db77dff3..3f401427fb 100644
--- a/org.lflang/src/org/lflang/TargetConfig.java
+++ b/org.lflang/src/org/lflang/TargetConfig.java
@@ -86,6 +86,9 @@ public TargetConfig(
         if (cliArgs.containsKey("no-compile")) {
             this.noCompile = true;
         }
+        if (cliArgs.containsKey("no-verify")) {
+            this.noVerify = true;
+        }
         if (cliArgs.containsKey("docker")) {
             var arg = cliArgs.getProperty("docker");
             if (Boolean.parseBoolean(arg)) {
diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
index e484cf606e..2b3ec21dfc 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
@@ -1043,36 +1043,30 @@ protected void generateTriggersAndReactions() {
             for (TriggerInstance trigger : reaction.getReaction().triggers) {
                 String triggerPresentStr = "";
                 
-                if (trigger.isBuiltinTrigger()) {
-                    // Check if this trigger is a built-in trigger (startup or shutdown).
-                    if (trigger.isStartup()) {
-                        // FIXME: Treat startup as a variable.
-                        // triggerPresentStr = "g(i) == zero()";
-                        
-                        // Handle startup.
-                        code.pr(String.join("\n", 
-                            "// If startup is within frame (and all variables have default values),",
-                            "// " + reaction.getReaction().getFullNameWithJoiner("_") + " must be invoked.",
-                            "axiom(",
-                            "    ((start_time == 0) ==> (",
-                            "        finite_exists (i : integer) in indices :: i > START && i <= END",
-                            "            && " + reaction.getReaction().getFullNameWithJoiner("_") + "(rxn(i))" + " && tag_same(g(i), zero())",
-                            "            && !(",
-                            "            finite_exists (j : integer) in indices :: j > START && j <= END",
-                            "            && " + reaction.getReaction().getFullNameWithJoiner("_") + "(rxn(j))",
-                            "            && j != i",
-                            "            )",
-                            "    ))",
-                            ");"
-                        ));
-                        continue outerLoop;
-                    } else if (trigger.isShutdown()) {
-                        // FIXME: For a future version.
-                        System.out.println("Not implemented!");
-                    } else {
-                        // Unreachable.
-                        System.out.println("Unreachable!");
-                    }
+                if (trigger.isStartup()) {
+                    // FIXME: Treat startup as a variable.
+                    // triggerPresentStr = "g(i) == zero()";
+                    
+                    // Handle startup.
+                    code.pr(String.join("\n", 
+                        "// If startup is within frame (and all variables have default values),",
+                        "// " + reaction.getReaction().getFullNameWithJoiner("_") + " must be invoked.",
+                        "axiom(",
+                        "    ((start_time == 0) ==> (",
+                        "        finite_exists (i : integer) in indices :: i > START && i <= END",
+                        "            && " + reaction.getReaction().getFullNameWithJoiner("_") + "(rxn(i))" + " && tag_same(g(i), zero())",
+                        "            && !(",
+                        "            finite_exists (j : integer) in indices :: j > START && j <= END",
+                        "            && " + reaction.getReaction().getFullNameWithJoiner("_") + "(rxn(j))",
+                        "            && j != i",
+                        "            )",
+                        "    ))",
+                        ");"
+                    ));
+                    continue outerLoop;
+                } else if (trigger.isShutdown()) {
+                    // FIXME: For a future version.
+                    System.out.println("Not implemented!");
                 }
                 else {
                     // If the trigger is a port/action/timer.
diff --git a/org.lflang/src/org/lflang/cli/Lfc.java b/org.lflang/src/org/lflang/cli/Lfc.java
index d5a90c7ec9..adf04be4e5 100644
--- a/org.lflang/src/org/lflang/cli/Lfc.java
+++ b/org.lflang/src/org/lflang/cli/Lfc.java
@@ -256,6 +256,9 @@ protected Properties filterPassOnProps() {
         if (noCompile) {
             props.setProperty(BuildParm.NO_COMPILE.getKey(), "true");
         }
+        if (noVerify) {
+            props.setProperty(BuildParm.NO_VERIFY.getKey(), "true");
+        }
         if (targetCompiler != null) {
             props.setProperty(BuildParm.TARGET_COMPILER.getKey(), targetCompiler);
         }

From c07932721872f41ccfccaf65a5248838e31fc20d Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 23 Mar 2023 17:20:51 -0700
Subject: [PATCH 0108/1114] Remove unused lib

---
 org.lflang/src/org/lflang/TimeValue.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/org.lflang/src/org/lflang/TimeValue.java b/org.lflang/src/org/lflang/TimeValue.java
index 3d511aa5ad..9eab5aa68b 100644
--- a/org.lflang/src/org/lflang/TimeValue.java
+++ b/org.lflang/src/org/lflang/TimeValue.java
@@ -25,8 +25,6 @@
 
 package org.lflang;
 
-import java.sql.Time;
-
 /**
  * Represents an amount of time (a duration).
  *

From 95e87433523d17e84e8976eaed39c8eb30ef364a Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 23 Mar 2023 18:09:00 -0700
Subject: [PATCH 0109/1114] Revert "Minor MTL grammar update"

This reverts commit 8ba0f961265ef8e47b938c25e2eeafb1f4f71ad9.
---
 org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4 b/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4
index f22a6a2696..1a5d39b9b4 100644
--- a/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4
+++ b/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4
@@ -47,7 +47,7 @@ atomicProp
     ;
 
 interval
-    : LBRACKET lowerbound=time COMMA upperbound=time RBRACKET # Range
+    : (LPAREN|LBRACKET) lowerbound=time COMMA upperbound=time (RPAREN|RBRACKET) # Range
     | LBRACKET instant=time RBRACKET # Singleton
     ;
 

From 7717121bbc71c476e17df143a1f060bb68b1785e Mon Sep 17 00:00:00 2001
From: Anirudh Rengarajan <44007330+arengarajan99@users.noreply.github.com>
Date: Wed, 29 Mar 2023 20:40:28 -0700
Subject: [PATCH 0110/1114] Remove unordered attribute from code generation

---
 org.lflang/src/lib/c/reactor-c                |  2 +-
 org.lflang/src/org/lflang/AttributeUtils.java | 10 ------
 .../federated/extensions/CExtension.java      | 15 ---------
 .../federated/extensions/PythonExtension.java |  8 -----
 .../federated/generator/FedASTUtils.java      |  9 ------
 .../org/lflang/generator/GeneratorBase.java   | 32 -------------------
 .../lflang/generator/ReactionInstance.java    | 32 +++----------------
 .../generator/ReactionInstanceGraph.java      | 32 ++++++++-----------
 .../org/lflang/generator/ReactorInstance.java | 16 +---------
 .../src/org/lflang/graph/TopologyGraph.java   | 14 +++-----
 .../org/lflang/validation/AttributeSpec.java  |  2 --
 11 files changed, 25 insertions(+), 147 deletions(-)

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index d43e973780..37293c04ba 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit d43e9737804f2d984d52a99cac20d8e57adad543
+Subproject commit 37293c04bafdd630341df82fc02ddf37a45a06f3
diff --git a/org.lflang/src/org/lflang/AttributeUtils.java b/org.lflang/src/org/lflang/AttributeUtils.java
index ec5edc4b9d..adcd30022e 100644
--- a/org.lflang/src/org/lflang/AttributeUtils.java
+++ b/org.lflang/src/org/lflang/AttributeUtils.java
@@ -191,16 +191,6 @@ public static boolean isSparse(EObject node) {
         return findAttributeByName(node, "sparse") != null;
     }
 
-    /**
-     * Return true if the reaction is unordered.
-     *
-     * Currently, this is only used for synthesized reactions in the context of
-     * federated execution.
-     */
-    public static boolean isUnordered(Reaction reaction) {
-        return findAttributeByName(reaction, "_unordered") != null;
-    }
-
     /**
      * Return true if the reactor is marked to be a federate.
      */
diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtension.java b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
index fda727d735..e2a991e0de 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
@@ -137,9 +137,6 @@ public String generateNetworkReceiverBody(
     ) {
         var receiveRef = CUtil.portRefInReaction(receivingPort, connection.getDstBank(), connection.getDstChannel());
         var result = new CodeBuilder();
-        // We currently have no way to mark a reaction "unordered"
-        // in the AST, so we use a magic string at the start of the body.
-        result.pr("// " + ReactionInstance.UNORDERED_REACTION_MARKER);
         // Transfer the physical time of arrival from the action to the port
         result.pr(receiveRef+"->physical_time_of_arrival = self->_lf__"+action.getName()+".physical_time_of_arrival;");
         if (coordinationType == CoordinationType.DECENTRALIZED && !connection.getDefinition().isPhysical()) {
@@ -255,10 +252,6 @@ public String generateNetworkSenderBody(
         // of the action in this list.
         int receivingPortID = connection.getDstFederate().networkMessageActions.size();
 
-        // We currently have no way to mark a reaction "unordered"
-        // in the AST, so we use a magic string at the start of the body.
-        result.pr("// " + ReactionInstance.UNORDERED_REACTION_MARKER + "\n");
-
         result.pr("// Sending from " + sendRef + " in federate "
                       + connection.getSrcFederate().name + " to " + receiveRef
                       + " in federate " + connection.getDstFederate().name);
@@ -416,10 +409,6 @@ public String generateNetworkInputControlReactionBody(
     ) {
         // Store the code
         var result = new CodeBuilder();
-
-        // We currently have no way to mark a reaction "unordered"
-        // in the AST, so we use a magic string at the start of the body.
-        result.pr("// " + ReactionInstance.UNORDERED_REACTION_MARKER + "\n");
         result.pr("interval_t max_STP = 0LL;");
 
         // Find the maximum STP for decentralized coordination
@@ -447,10 +436,6 @@ public String generateNetworkOutputControlReactionBody(
         // The ID of the receiving port (rightPort) is the position
         // of the networkAction (see below) in this list.
         int receivingPortID = connection.getDstFederate().networkMessageActions.size();
-
-        // We currently have no way to mark a reaction "unordered"
-        // in the AST, so we use a magic string at the start of the body.
-        result.pr("// " + ReactionInstance.UNORDERED_REACTION_MARKER + "\n");
         var sendRef = CUtil.portRefInReaction(srcOutputPort, connection.getSrcBank(), connection.getSrcChannel());
         // Get the delay literal
         var additionalDelayString = CExtensionUtils.getNetworkDelayLiteral(connection.getDefinition().getDelay());
diff --git a/org.lflang/src/org/lflang/federated/extensions/PythonExtension.java b/org.lflang/src/org/lflang/federated/extensions/PythonExtension.java
index 73bed06f7b..8cdc7eeb7a 100644
--- a/org.lflang/src/org/lflang/federated/extensions/PythonExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/PythonExtension.java
@@ -86,10 +86,6 @@ public String generateNetworkSenderBody(
         ErrorReporter errorReporter
     ) {
         var result = new CodeBuilder();
-
-        // We currently have no way to mark a reaction "unordered"
-        // in the AST, so we use a magic string at the start of the body.
-        result.pr("// " + ReactionInstance.UNORDERED_REACTION_MARKER + "\n");
         result.pr(PyUtil.generateGILAcquireCode() + "\n");
         result.pr(
             super.generateNetworkSenderBody(
@@ -116,10 +112,6 @@ public String generateNetworkReceiverBody(
         ErrorReporter errorReporter
     ) {
         var result = new CodeBuilder();
-
-        // We currently have no way to mark a reaction "unordered"
-        // in the AST, so we use a magic string at the start of the body.
-        result.pr("// " + ReactionInstance.UNORDERED_REACTION_MARKER + "\n");
         result.pr(PyUtil.generateGILAcquireCode() + "\n");
         result.pr(
             super.generateNetworkReceiverBody(
diff --git a/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java b/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
index 7a7eb1f183..bbbc063ca9 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
@@ -308,9 +308,6 @@ private static void addNetworkReceiverReaction(
                     errorReporter
             ));
 
-
-        ASTUtils.addReactionAttribute(networkReceiverReaction, "_unordered");
-
         // Add the receiver reaction to the parent
         parent.getReactions().add(networkReceiverReaction);
 
@@ -405,8 +402,6 @@ private static void addNetworkInputControlReaction(
                         )
                 );
 
-        ASTUtils.addReactionAttribute(reaction, "_unordered");
-
         // Insert the reaction
         top.getReactions().add(reaction);
 
@@ -760,8 +755,6 @@ private static void addNetworkSenderReaction(
                                    errorReporter
                                ));
 
-        ASTUtils.addReactionAttribute(networkSenderReaction, "_unordered");
-
         // Add the sending reaction to the parent.
         parent.getReactions().add(networkSenderReaction);
 
@@ -848,8 +841,6 @@ private static void addNetworkOutputControlReaction(FedConnectionInstance connec
             FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
                                      .generateNetworkOutputControlReactionBody(newPortRef, connection));
 
-        ASTUtils.addReactionAttribute(reaction, "_unordered");
-
 
         // Insert the newly generated reaction after the generated sender and
         // receiver top-level reactions.
diff --git a/org.lflang/src/org/lflang/generator/GeneratorBase.java b/org.lflang/src/org/lflang/generator/GeneratorBase.java
index ef35d22be1..a6853ec9b1 100644
--- a/org.lflang/src/org/lflang/generator/GeneratorBase.java
+++ b/org.lflang/src/org/lflang/generator/GeneratorBase.java
@@ -139,19 +139,6 @@ public abstract class GeneratorBase extends AbstractLFValidator {
      */
     protected InstantiationGraph instantiationGraph;
 
-    /**
-     * The set of unordered reactions. An unordered reaction is one that does
-     * not have any dependency on other reactions in the containing reactor,
-     * and where no other reaction in the containing reactor depends on it.
-     * There is currently no way in the syntax of LF to make a reaction
-     * unordered, deliberately, because it can introduce unexpected
-     * nondeterminacy. However, certain automatically generated reactions are
-     * known to be safe to be unordered because they do not interact with the
-     * state of the containing reactor. To make a reaction unordered, when
-     * the Reaction instance is created, add that instance to this set.
-     */
-    protected Set<Reaction> unorderedReactions = null;
-
     /**
      * Map from reactions to bank indices
      */
@@ -368,25 +355,6 @@ public boolean errorsOccurred() {
      */
     public abstract TargetTypes getTargetTypes();
 
-    /**
-     * Mark the reaction unordered. An unordered reaction is one that does not
-     * have any dependency on other reactions in the containing reactor, and
-     * where no other reaction in the containing reactor depends on it. There
-     * is currently no way in the syntax of LF to make a reaction unordered,
-     * deliberately, because it can introduce unexpected nondeterminacy.
-     * However, certain automatically generated reactions are known to be safe
-     * to be unordered because they do not interact with the state of the
-     * containing reactor. To make a reaction unordered, when the Reaction
-     * instance is created, add that instance to this set.
-     * @param reaction The reaction to make unordered.
-     */
-    public void makeUnordered(Reaction reaction) {
-        if (unorderedReactions == null) {
-            unorderedReactions = new LinkedHashSet<>();
-        }
-        unorderedReactions.add(reaction);
-    }
-
     /**
      * Mark the specified reaction to belong to only the specified
      * bank index. This is needed because reactions cannot declare
diff --git a/org.lflang/src/org/lflang/generator/ReactionInstance.java b/org.lflang/src/org/lflang/generator/ReactionInstance.java
index cf9dce7013..ec9ced971f 100644
--- a/org.lflang/src/org/lflang/generator/ReactionInstance.java
+++ b/org.lflang/src/org/lflang/generator/ReactionInstance.java
@@ -64,27 +64,18 @@ public class ReactionInstance extends NamedInstance<Reaction> {
      * only by the ReactorInstance class, but it is public to enable unit tests.
      * @param definition A reaction definition.
      * @param parent The parent reactor instance, which cannot be null.
-     * @param isUnordered Indicator that this reaction is unordered w.r.t. other reactions.
      * @param index The index of the reaction within the reactor (0 for the
      * first reaction, 1 for the second, etc.).
      */
     public ReactionInstance(
             Reaction definition, 
             ReactorInstance parent, 
-            boolean isUnordered, 
             int index
     ) {
         super(definition, parent);
         this.index = index;
-        this.isUnordered = isUnordered;
         
-        // If the reaction body starts with the magic string
-        // UNORDERED_REACTION_MARKER, then mark it unordered,
-        // overriding the argument.
         String body = ASTUtils.toText(definition.getCode());
-        if (body.contains(UNORDERED_REACTION_MARKER)) {
-            this.isUnordered = true;
-        }
         
         // Identify the dependencies for this reaction.
         // First handle the triggers.
@@ -222,26 +213,12 @@ public ReactionInstance(
      */
     public DeadlineInstance declaredDeadline;
 
-    /**
-     * Sadly, we have no way to mark reaction "unordered" in the AST,
-     * so instead, we use a magic comment at the start of the reaction body.
-     * This is that magic comment.
-     */
-    public static String UNORDERED_REACTION_MARKER
-            = "**** This reaction is unordered.";
-
     /**
      * Index of order of occurrence within the reactor definition.
      * The first reaction has index 0, the second index 1, etc.
      */
     public int index;
 
-    /**
-     * Whether or not this reaction is ordered with respect to other
-     * reactions in the same reactor.
-     */
-    public boolean isUnordered;
-
     /**
      * The ports that this reaction reads but that do not trigger it.
      */
@@ -274,7 +251,7 @@ public void clearCaches(boolean includingRuntimes) {
      * Return the set of immediate downstream reactions, which are reactions
      * that receive data produced by this reaction plus
      * at most one reaction in the same reactor whose definition
-     * lexically follows this one (unless this reaction is unordered).
+     * lexically follows this one.
      */
     public Set<ReactionInstance> dependentReactions() {
         // Cache the result.
@@ -282,7 +259,7 @@ public Set<ReactionInstance> dependentReactions() {
         dependentReactionsCache = new LinkedHashSet<>();
         
         // First, add the next lexical reaction, if appropriate.
-        if (!isUnordered && parent.reactions.size() > index + 1) {
+        if (parent.reactions.size() > index + 1) {
             // Find the next reaction in the parent's reaction list.
             dependentReactionsCache.add(parent.reactions.get(index + 1));
         }
@@ -307,7 +284,6 @@ public Set<ReactionInstance> dependentReactions() {
      * Return the set of immediate upstream reactions, which are reactions
      * that send data to this one plus at most one reaction in the same
      * reactor whose definition immediately precedes the definition of this one
-     * (unless this reaction is unordered).
      */
     public Set<ReactionInstance> dependsOnReactions() {
         // Cache the result.
@@ -315,11 +291,11 @@ public Set<ReactionInstance> dependsOnReactions() {
         dependsOnReactionsCache = new LinkedHashSet<>();
         
         // First, add the previous lexical reaction, if appropriate.
-        if (!isUnordered && index > 0) {
+        if (index > 0) {
             // Find the previous ordered reaction in the parent's reaction list.
             int earlierIndex = index - 1;
             ReactionInstance earlierOrderedReaction = parent.reactions.get(earlierIndex);
-            while (earlierOrderedReaction.isUnordered && --earlierIndex >= 0) {
+            while (--earlierIndex >= 0) {
                 earlierOrderedReaction = parent.reactions.get(earlierIndex);
             }
             if (earlierIndex >= 0) {
diff --git a/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java b/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
index 116cbf3046..8e87f6db4e 100644
--- a/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
+++ b/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
@@ -182,8 +182,7 @@ protected void addDownstreamReactions(PortInstance port, ReactionInstance reacti
                         // If another upstream reaction shows up, then this will be
                         // reset to null.
                         if (this.getUpstreamAdjacentNodes(dstRuntime).size() == 1
-                                && (dstRuntime.getReaction().isUnordered
-                                        || dstRuntime.getReaction().index == 0)) {
+                                && (dstRuntime.getReaction().index == 0)) {
                             dstRuntime.dominating = srcRuntime;
                         } else {
                             dstRuntime.dominating = null;
@@ -217,25 +216,22 @@ protected void addNodesAndEdges(ReactorInstance reactor) {
                 this.addNode(runtime);                
             }
             
-            // If this is not an unordered reaction, then create a dependency
-            // on any previously defined reaction.
-            if (!reaction.isUnordered) {
-                // If there is an earlier reaction in this same reactor, then
-                // create a link in the reaction graph for all runtime instances.
-                if (previousReaction != null) {
-                    List<Runtime> previousRuntimes = previousReaction.getRuntimeInstances();
-                    int count = 0;
-                    for (Runtime runtime : runtimes) {
-                        // Only add the reaction order edge if previous reaction is outside of a mode or both are in the same mode
-                        // This allows modes to break cycles since modes are always mutually exclusive.
-                        if (runtime.getReaction().getMode(true) == null || runtime.getReaction().getMode(true) == reaction.getMode(true)) {
-                            this.addEdge(runtime, previousRuntimes.get(count));
-                            count++;
-                        }
+            // If there is an earlier reaction in this same reactor, then
+            // create a link in the reaction graph for all runtime instances.
+            if (previousReaction != null) {
+                List<Runtime> previousRuntimes = previousReaction.getRuntimeInstances();
+                int count = 0;
+                for (Runtime runtime : runtimes) {
+                    // Only add the reaction order edge if previous reaction is outside of a mode or both are in the same mode
+                    // This allows modes to break cycles since modes are always mutually exclusive.
+                    if (runtime.getReaction().getMode(true) == null || runtime.getReaction().getMode(true) == reaction.getMode(true)) {
+                        this.addEdge(runtime, previousRuntimes.get(count));
+                        count++;
                     }
                 }
-                previousReaction = reaction;
             }
+            previousReaction = reaction;
+            
 
             // Add downstream reactions. Note that this is sufficient.
             // We don't need to also add upstream reactions because this reaction
diff --git a/org.lflang/src/org/lflang/generator/ReactorInstance.java b/org.lflang/src/org/lflang/generator/ReactorInstance.java
index c7f59211f7..7c485b0a81 100644
--- a/org.lflang/src/org/lflang/generator/ReactorInstance.java
+++ b/org.lflang/src/org/lflang/generator/ReactorInstance.java
@@ -700,15 +700,6 @@ public TimeValue getTimeValue(Expression expr) {
     /** The map of used built-in triggers. */
     protected Map<BuiltinTrigger, TriggerInstance<BuiltinTriggerVariable>> builtinTriggers = new HashMap<>();
 
-    /**
-     * The LF syntax does not currently support declaring reactions unordered,
-     * but unordered reactions are created in the AST transformations handling
-     * federated communication and after delays. Unordered reactions can execute
-     * in any order and concurrently even though they are in the same reactor.
-     * FIXME: Remove this when the language provides syntax.
-     */
-    protected Set<Reaction> unorderedReactions = new LinkedHashSet<>();
-
     /** The nested list of instantiations that created this reactor instance. */
     protected List<Instantiation> _instantiations;
 
@@ -729,13 +720,8 @@ protected void createReactionInstances() {
 
             // Check for startup and shutdown triggers.
             for (Reaction reaction : reactions) {
-                if (AttributeUtils.isUnordered(reaction)) {
-                    unorderedReactions.add(reaction);
-                }
                 // Create the reaction instance.
-                var reactionInstance = new ReactionInstance(reaction, this,
-                    unorderedReactions.contains(reaction), count++);
-                
+                var reactionInstance = new ReactionInstance(reaction, this, count++);
                 // Add the reaction instance to the map of reactions for this
                 // reactor.
                 this.reactions.add(reactionInstance);
diff --git a/org.lflang/src/org/lflang/graph/TopologyGraph.java b/org.lflang/src/org/lflang/graph/TopologyGraph.java
index f790de65a7..c680c5f7e1 100644
--- a/org.lflang/src/org/lflang/graph/TopologyGraph.java
+++ b/org.lflang/src/org/lflang/graph/TopologyGraph.java
@@ -86,16 +86,12 @@ public void collectNodesFrom(ReactorInstance reactor) {
             this.addSources(reaction);
             this.addEffects(reaction);
 
-            // If this is not an unordered reaction, then create a dependency
-            // on any previously defined reaction.
-            if (!reaction.isUnordered) {
-                // If there is an earlier reaction in this same reactor, then
-                // create a link in the reaction graph.
-                if (previousReaction != null) {
-                    this.addEdge(reaction, previousReaction);
-                }
-                previousReaction = reaction;
+            // If there is an earlier reaction in this same reactor, then
+            // create a link in the reaction graph.
+            if (previousReaction != null) {
+                this.addEdge(reaction, previousReaction);
             }
+            previousReaction = reaction;
         }
         // Recursively add nodes and edges from contained reactors.
         for (var child : reactor.children) {
diff --git a/org.lflang/src/org/lflang/validation/AttributeSpec.java b/org.lflang/src/org/lflang/validation/AttributeSpec.java
index c5a530581b..a7a95e852c 100644
--- a/org.lflang/src/org/lflang/validation/AttributeSpec.java
+++ b/org.lflang/src/org/lflang/validation/AttributeSpec.java
@@ -220,8 +220,6 @@ enum AttrParamType {
             List.of(new AttrParamSpec(EACH_ATTR, AttrParamType.BOOLEAN, true))
         ));
 
-        // attributes that are used internally only by the federated code generation
-        ATTRIBUTE_SPECS_BY_NAME.put("_unordered", new AttributeSpec(null));
         ATTRIBUTE_SPECS_BY_NAME.put("_fed_config", new AttributeSpec(
             List.of(new AttrParamSpec(AttributeSpec.NETWORK_MESSAGE_ACTIONS,
                                       AttrParamType.STRING, false))));

From ebba81f8d1a6f23ff00668ace8060dee5440e5b4 Mon Sep 17 00:00:00 2001
From: Anirudh Rengarajan <44007330+arengarajan99@users.noreply.github.com>
Date: Thu, 30 Mar 2023 23:34:52 -0700
Subject: [PATCH 0111/1114] Added AST transformations for network reactions to
 be contained in their own reactors

---
 .../federated/extensions/CExtension.java      |   5 +-
 .../federated/extensions/CExtensionUtils.java |   9 +-
 .../federated/generator/FedASTUtils.java      | 217 ++++++++++++------
 .../federated/generator/FedEmitter.java       |   1 +
 .../federated/generator/FedGenerator.java     |  23 +-
 .../federated/generator/FedMainEmitter.java   |   4 +-
 .../federated/generator/FederateInstance.java |  34 ++-
 7 files changed, 210 insertions(+), 83 deletions(-)

diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtension.java b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
index e2a991e0de..93c661e3c9 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
@@ -542,9 +542,8 @@ private String generateInitializeTriggers(FederateInstance federate, ErrorReport
         var federatedReactor = FedASTUtils.findFederatedReactor(federate.instantiation.eResource());
         var oldFederatedReactorName = federatedReactor.getName();
         federatedReactor.setName(federate.name);
-        var main = new ReactorInstance(federatedReactor, errorReporter, 1);
-        code.pr(CExtensionUtils.initializeTriggersForNetworkActions(federate, main));
-        code.pr(CExtensionUtils.initializeTriggerForControlReactions(main, main, federate));
+        code.pr(CExtensionUtils.initializeTriggersForNetworkActions(federate, errorReporter));
+        //code.pr(CExtensionUtils.initializeTriggerForControlReactions(main, main, federate));
         federatedReactor.setName(oldFederatedReactorName);
         
         return """
diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
index aabc77ecd5..9992302b88 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
@@ -9,6 +9,7 @@
 import java.util.regex.Pattern;
 
 import org.lflang.ASTUtils;
+import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig.ClockSyncOptions;
 import org.lflang.TargetProperty;
@@ -82,7 +83,7 @@ public static String allocateTriggersForFederate(
      * @param main The main reactor that contains the federate (used to lookup references).
      * @return
      */
-    public static String initializeTriggersForNetworkActions(FederateInstance federate, ReactorInstance main) {
+    public static String initializeTriggersForNetworkActions(FederateInstance federate, ErrorReporter errorReporter) {
         CodeBuilder code = new CodeBuilder();
         if (federate.networkMessageActions.size() > 0) {
             // Create a static array of trigger_t pointers.
@@ -91,9 +92,11 @@ public static String initializeTriggersForNetworkActions(FederateInstance federa
             // There should be exactly one ActionInstance in the
             // main reactor for each Action.
             var triggers = new LinkedList<String>();
-            for (Action action : federate.networkMessageActions) {
+            for (int i = 0; i < federate.networkMessageActions.size(); ++i) {
                 // Find the corresponding ActionInstance.
-                var actionInstance = main.lookupActionInstance(action);
+                Action action = federate.networkMessageActions.get(i);
+                var reactor = new ReactorInstance(federate.networkMessageActionReactors.get(i), errorReporter, 1);
+                var actionInstance = reactor.lookupActionInstance(action);
                 triggers.add(CUtil.actionRef(actionInstance, null));
             }
             var actionTableCount = 0;
diff --git a/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java b/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
index bbbc063ca9..4ad3fca0f2 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
@@ -39,6 +39,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
@@ -58,9 +59,11 @@
 import org.lflang.lf.BuiltinTriggerRef;
 import org.lflang.lf.Connection;
 import org.lflang.lf.Expression;
+import org.lflang.lf.Input;
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.Model;
+import org.lflang.lf.Output;
 import org.lflang.lf.ParameterReference;
 import org.lflang.lf.Reaction;
 import org.lflang.lf.Reactor;
@@ -132,55 +135,51 @@ public static Reactor findFederatedReactor(Resource resource) {
      * Replace the specified connection with communication between federates.
      *
      * @param connection   Network connection between two federates.
+     * @param resource
+     * @param mainDef
      * @param coordination One of CoordinationType.DECENTRALIZED or
      *                     CoordinationType.CENTRALIZED.
      * @param errorReporter Used to report errors encountered.
      */
     public static void makeCommunication(
         FedConnectionInstance connection,
-        CoordinationType coordination,
+        Resource resource, CoordinationType coordination,
         ErrorReporter errorReporter
     ) {
 
-        // Add the sender reaction.
-        addNetworkSenderReaction(
+        // Add the sender reactor.
+        addNetworkSenderReactor(
             connection,
             coordination,
+            resource,
             errorReporter
         );
 
         // Next, generate control reactions
-        if (
-            !connection.getDefinition().isPhysical() &&
-                // Connections that are physical don't need control reactions
-                connection.getDefinition().getDelay()
-                    == null // Connections that have delays don't need control reactions
-        ) {
-            // Add the network output control reaction to the parent
-            FedASTUtils.addNetworkOutputControlReaction(connection);
-
-            // Add the network input control reaction to the parent
-            FedASTUtils.addNetworkInputControlReaction(connection, coordination, errorReporter);
-        }
-
-        // Create the network action (@see createNetworkAction)
-        Action networkAction = createNetworkAction(connection);
-
-        // Keep track of this action in the destination federate.
-        connection.dstFederate.networkMessageActions.add(networkAction);
-
-        // Add the action definition to the parent reactor.
-        ((Reactor) connection.getDefinition().eContainer()).getActions().add(networkAction);
-
-        // Add the network receiver reaction in the destinationFederate
-        addNetworkReceiverReaction(
-            networkAction,
+        // if (
+        //     !connection.getDefinition().isPhysical() &&
+        //         // Connections that are physical don't need control reactions
+        //         connection.getDefinition().getDelay()
+        //             == null // Connections that have delays don't need control reactions
+        // ) {
+        //     // Add the network output control reaction to the parent
+        //     FedASTUtils.addNetworkOutputControlReaction(connection);
+
+        //     // Add the network input control reaction to the parent
+        //     FedASTUtils.addNetworkInputControlReaction(connection, coordination, errorReporter);
+        // }
+
+        // Add the network receiver reactor in the destinationFederate
+        addNetworkReceiverReactor(
             connection,
             coordination,
+            resource,
             errorReporter
         );
     }
 
+    public static int networkMessageActionID = 0;
+
     /**
      * Create a "network action" in the reactor that contains the given
      * connection and return it.
@@ -196,12 +195,12 @@ public static void makeCommunication(
      * @return The newly created action.
      */
     private static Action createNetworkAction(FedConnectionInstance connection) {
-        Reactor top = (Reactor) connection.getDefinition().eContainer();
+        //Reactor top = (Reactor) connection.getDefinition().eContainer();
         LfFactory factory = LfFactory.eINSTANCE;
 
         Action action = factory.createAction();
         // Name the newly created action; set its delay and type.
-        action.setName(ASTUtils.getUniqueIdentifier(top, "networkMessage"));
+        action.setName("networkMessage_" + networkMessageActionID++);
         if (connection.serializer == SupportedSerializers.NATIVE) {
             action.setType(EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getType()));
         } else {
@@ -232,7 +231,7 @@ private static Action createNetworkAction(FedConnectionInstance connection) {
     }
 
     /**
-     * Add a network receiver reaction for a given input port 'destination' to
+     * Add a network receiver reactor for a given input port 'destination' to
      * destination's parent reactor. This reaction will react to a generated
      * 'networkAction' (triggered asynchronously, e.g., by federate.c). This
      * 'networkAction' will contain the actual message that is sent by the
@@ -241,24 +240,64 @@ private static Action createNetworkAction(FedConnectionInstance connection) {
      * network
      * receiver reaction.
      *
-     * @param networkAction       The network action (also, @see createNetworkAction)
      * @param connection          FIXME
      * @param coordination        One of CoordinationType.DECENTRALIZED or
      *                            CoordinationType.CENTRALIZED.
+     * @param resource
      * @note: Used in federated execution
      */
-    private static void addNetworkReceiverReaction(
-        Action networkAction,
+    private static void addNetworkReceiverReactor(
         FedConnectionInstance connection,
+
         CoordinationType coordination,
-        ErrorReporter errorReporter
+        Resource resource, ErrorReporter errorReporter
     ) {
         LfFactory factory = LfFactory.eINSTANCE;
-        VarRef sourceRef = factory.createVarRef();
-        VarRef destRef = factory.createVarRef();
-        Reactor parent = (Reactor) connection.getDefinition().eContainer();
+        Type type = EcoreUtil.copy(connection.getDestinationPortInstance().getDefinition().getType());
+        
+        VarRef sourceRef = factory.createVarRef(); //source fed
+        VarRef instRef = factory.createVarRef(); //instantiation connection
+        VarRef destRef = factory.createVarRef(); //destination connection
+
+        Reactor receiver = factory.createReactor();
         Reaction networkReceiverReaction = factory.createReaction();
 
+
+        Output out = factory.createOutput();
+        VarRef outRef = factory.createVarRef(); //out port
+        Connection receiverFromReaction = factory.createConnection();
+        Instantiation networkInstance = factory.createInstantiation();
+
+        Reactor top = connection.getSourcePortInstance()
+                                .getParent()
+                                .getParent().reactorDefinition; // Top-level reactor.
+
+        receiver.getReactions().add(networkReceiverReaction);
+        receiver.getOutputs().add(out);
+        EObject node = IteratorExtensions.findFirst(resource.getAllContents(), Model.class::isInstance);
+        ((Model) node).getReactors().add(receiver);
+        receiver.setName("NetworkReceiver_" + networkIDReceiver++);
+
+
+        networkInstance.setReactorClass(receiver);
+        networkInstance.setName(ASTUtils.getUniqueIdentifier(top, "nr_" + connection.getDstFederate().name));
+        top.getInstantiations().add(networkInstance);
+
+        receiverFromReaction.getLeftPorts().add(instRef);
+        receiverFromReaction.getRightPorts().add(destRef);
+
+        // Create the network action (@see createNetworkAction)
+        Action networkAction = createNetworkAction(connection);
+
+        // Keep track of this action in the destination federate.
+        connection.dstFederate.networkMessageActions.add(networkAction);
+
+        // Keep track of the  in the destination federate.
+        connection.dstFederate.networkMessageActionReactors.add(receiver);
+
+        // Add the action definition to the parent reactor.
+        receiver.getActions().add(networkAction);
+
         // If the sender or receiver is in a bank of reactors, then we want
         // these reactions to appear only in the federate whose bank ID matches.
         setReactionBankIndex(networkReceiverReaction, connection.getDstBank());
@@ -284,15 +323,23 @@ private static void addNetworkReceiverReaction(
         sourceRef.setVariable(connection.getSourcePortInstance().getDefinition());
         destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
         destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
+        instRef.setContainer(networkInstance);
+        instRef.setVariable(out);
+
+        out.setName("msg");
+        out.setType(type);
+        out.setWidthSpec(EcoreUtil.copy(connection.getDestinationPortInstance().getDefinition().getWidthSpec()));
+        outRef.setVariable(out);
 
-        // Add the input port at the receiver federate reactor as an effect
-        networkReceiverReaction.getEffects().add(destRef);
+        // Add the output port at the receiver reactor as an effect
+        //networkReceiverReaction.getEffects().add(outRef);
 
         VarRef triggerRef = factory.createVarRef();
         // Establish references to the action.
         triggerRef.setVariable(networkAction);
         // Add the action as a trigger to the receiver reaction
         networkReceiverReaction.getTriggers().add(triggerRef);
+        networkReceiverReaction.getEffects().add(outRef);
 
         // Generate code for the network receiver reaction
         networkReceiverReaction.setCode(factory.createCode());
@@ -301,7 +348,7 @@ private static void addNetworkReceiverReaction(
                 connection.dstFederate.targetConfig.target).generateNetworkReceiverBody(
                     networkAction,
                     sourceRef,
-                    destRef,
+                    outRef,
                     connection,
                     ASTUtils.getInferredType(networkAction),
                     coordination,
@@ -309,23 +356,26 @@ private static void addNetworkReceiverReaction(
             ));
 
         // Add the receiver reaction to the parent
-        parent.getReactions().add(networkReceiverReaction);
+        // parent.getReactions().add(networkReceiverReaction);
 
         // Add the network receiver reaction to the federate instance's list
         // of network reactions
         connection.dstFederate.networkReactions.add(networkReceiverReaction);
-
-
-        if (
-            !connection.getDefinition().isPhysical() &&
-                // Connections that are physical don't need control reactions
-                connection.getDefinition().getDelay()
-                    == null // Connections that have delays don't need control reactions
-        ) {
-            // Add necessary dependencies to reaction to ensure that it executes correctly
-            // relative to other network input control reactions in the federate.
-            addRelativeDependency(connection, networkReceiverReaction, errorReporter);
-        }
+        connection.dstFederate.networkReactors.add(receiver);
+        connection.dstFederate.networkConnections.add(receiverFromReaction);
+        connection.dstFederate.networkInstantiations.add(networkInstance);
+
+
+        // if (
+        //     !connection.getDefinition().isPhysical() &&
+        //         // Connections that are physical don't need control reactions
+        //         connection.getDefinition().getDelay()
+        //             == null // Connections that have delays don't need control reactions
+        // ) {
+        //     // Add necessary dependencies to reaction to ensure that it executes correctly
+        //     // relative to other network input control reactions in the federate.
+        //     //addRelativeDependency(connection, networkReceiverReaction, errorReporter);
+        // }
     }
 
     /**
@@ -415,7 +465,7 @@ private static void addNetworkInputControlReaction(
 
         // Add necessary dependencies to reaction to ensure that it executes correctly
         // relative to other network input control reactions in the federate.
-        addRelativeDependency(connection, reaction, errorReporter);
+        // addRelativeDependency(connection, reaction, errorReporter);
     }
 
     /**
@@ -690,8 +740,11 @@ public static <E> List<E> safe(List<E> list) {
         return list == null ? Collections.emptyList() : list;
     }
 
+    public static int networkIDSender = 0;
+    public static int networkIDReceiver = 0;
+
     /**
-     * Add a network sender reaction for a given input port 'source' to
+     * Add a network sender reactor for a given input port 'source' to
      * source's parent reactor. This reaction will react to the 'source'
      * and then send a message on the network destined for the
      * destinationFederate.
@@ -699,21 +752,46 @@ public static <E> List<E> safe(List<E> list) {
      * @param connection   Network connection between two federates.
      * @param coordination One of CoordinationType.DECENTRALIZED or
      *                     CoordinationType.CENTRALIZED.
+     * @param resource
+     * @param mainDef
      * @param errorReporter FIXME
      * @note Used in federated execution
      */
-    private static void addNetworkSenderReaction(
+    private static void addNetworkSenderReactor(
         FedConnectionInstance connection,
         CoordinationType coordination,
-        ErrorReporter errorReporter
+        Resource resource, ErrorReporter errorReporter
     ) {
         LfFactory factory = LfFactory.eINSTANCE;
         // Assume all the types are the same, so just use the first on the right.
         Type type = EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getType());
-        VarRef sourceRef = factory.createVarRef();
-        VarRef destRef = factory.createVarRef();
-        Reactor parent = (Reactor) connection.getDefinition().eContainer();
+        VarRef sourceRef = factory.createVarRef(); //out connection
+        VarRef instRef = factory.createVarRef(); //instantiation connection
+        VarRef destRef = factory.createVarRef(); //destination fed
+        Reactor sender = factory.createReactor();
         Reaction networkSenderReaction = factory.createReaction();
+        Input in = factory.createInput();
+        VarRef inRef = factory.createVarRef(); //in port
+        Connection senderToReaction = factory.createConnection();
+        Instantiation networkInstance = factory.createInstantiation();
+
+        Reactor top = connection.getSourcePortInstance()
+                                .getParent()
+                                .getParent().reactorDefinition; // Top-level reactor.
+
+
+        sender.getReactions().add(networkSenderReaction);
+        sender.getInputs().add(in);
+        EObject node = IteratorExtensions.findFirst(resource.getAllContents(), Model.class::isInstance);
+        ((Model) node).getReactors().add(sender);
+        sender.setName("NetworkSender_" + networkIDSender++);
+
+        networkInstance.setReactorClass(sender);
+        networkInstance.setName(ASTUtils.getUniqueIdentifier(top, "ns_" + connection.getDstFederate().name));
+        top.getInstantiations().add(networkInstance);
+
+        senderToReaction.getLeftPorts().add(sourceRef);
+        senderToReaction.getRightPorts().add(instRef);
 
         // FIXME: do not create a new extension every time it is used
         FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
@@ -738,16 +816,24 @@ private static void addNetworkSenderReaction(
         // Establish references to the involved ports.
         sourceRef.setContainer(connection.getSourcePortInstance().getParent().getDefinition());
         sourceRef.setVariable(connection.getSourcePortInstance().getDefinition());
+        instRef.setContainer(networkInstance);
+        instRef.setVariable(in);
         destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
         destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
 
+        in.setName("msg");
+        in.setType(type);
+        in.setWidthSpec(EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getWidthSpec()));
+        inRef.setVariable(in);
+
+
         // Configure the sending reaction.
-        networkSenderReaction.getTriggers().add(sourceRef);
+        networkSenderReaction.getTriggers().add(inRef);
         networkSenderReaction.setCode(factory.createCode());
         networkSenderReaction.getCode().setBody(
             FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
                                      .generateNetworkSenderBody(
-                                   sourceRef,
+                                   inRef,
                                    destRef,
                                    connection,
                                    InferredType.fromAST(type),
@@ -756,11 +842,14 @@ private static void addNetworkSenderReaction(
                                ));
 
         // Add the sending reaction to the parent.
-        parent.getReactions().add(networkSenderReaction);
+        //networkSenderReaction.getTriggers().add(inRef);
 
         // Add the network sender reaction to the federate instance's list
         // of network reactions
         connection.srcFederate.networkReactions.add(networkSenderReaction);
+        connection.srcFederate.networkReactors.add(sender);
+        connection.srcFederate.networkConnections.add(senderToReaction);
+        connection.srcFederate.networkInstantiations.add(networkInstance);
     }
 
     /**
diff --git a/org.lflang/src/org/lflang/federated/generator/FedEmitter.java b/org.lflang/src/org/lflang/federated/generator/FedEmitter.java
index 9ae5c9d2cc..6b24debe67 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedEmitter.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedEmitter.java
@@ -11,6 +11,7 @@
 import org.lflang.federated.launcher.RtiConfig;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.LFGeneratorContext;
+import org.lflang.lf.Model;
 import org.lflang.lf.Reactor;
 
 /**
diff --git a/org.lflang/src/org/lflang/federated/generator/FedGenerator.java b/org.lflang/src/org/lflang/federated/generator/FedGenerator.java
index 18d5770165..d846113e79 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedGenerator.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedGenerator.java
@@ -148,7 +148,7 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
         // AST with an action (which inherits the delay) and four reactions.
         // The action will be physical for physical connections and logical
         // for logical connections.
-        replaceFederateConnectionsWithProxies(federation);
+        replaceFederateConnectionsWithProxies(federation, resource);
 
         FedEmitter fedEmitter = new FedEmitter(
             fileConfig,
@@ -479,8 +479,9 @@ private List<FederateInstance> getFederateInstances(Instantiation instantiation,
      * handle sending and receiving data.
      *
      * @param federation Reactor class of the federation.
+     * @param resource
      */
-    private void replaceFederateConnectionsWithProxies(Reactor federation) {
+    private void replaceFederateConnectionsWithProxies(Reactor federation, Resource resource) {
         // Each connection in the AST may represent more than one connection between
         // federation instances because of banks and multiports. We need to generate communication
         // for each of these. To do this, we create a ReactorInstance so that we don't have
@@ -491,7 +492,7 @@ private void replaceFederateConnectionsWithProxies(Reactor federation) {
 
         for (ReactorInstance child : mainInstance.children) {
             for (PortInstance output : child.outputs) {
-                replaceConnectionFromOutputPort(output);
+                replaceConnectionFromOutputPort(output, resource);
             }
         }
 
@@ -507,8 +508,9 @@ private void replaceFederateConnectionsWithProxies(Reactor federation) {
      * Replace the connections from the specified output port.
      *
      * @param output The output port instance.
+     * @param resource
      */
-    private void replaceConnectionFromOutputPort(PortInstance output) {
+    private void replaceConnectionFromOutputPort(PortInstance output, Resource resource) {
         // Iterate through ranges of the output port
         for (SendRange srcRange : output.getDependentPorts()) {
             if (srcRange.connection == null) {
@@ -523,7 +525,8 @@ private void replaceConnectionFromOutputPort(PortInstance output) {
             for (RuntimeRange<PortInstance> dstRange : srcRange.destinations) {
                 replaceOneToManyConnection(
                     srcRange,
-                    dstRange
+                    dstRange,
+                    resource
                 );
             }
         }
@@ -536,10 +539,11 @@ private void replaceConnectionFromOutputPort(PortInstance output) {
      * @param srcRange A range of an output port that sources data for this
      *                 connection.
      * @param dstRange A range of input ports that receive the data.
+     * @param resource
      */
     private void replaceOneToManyConnection(
         SendRange srcRange,
-        RuntimeRange<PortInstance> dstRange
+        RuntimeRange<PortInstance> dstRange, Resource resource
     ) {
         MixedRadixInt srcID = srcRange.startMR();
         MixedRadixInt dstID = dstRange.startMR();
@@ -575,7 +579,7 @@ private void replaceOneToManyConnection(
                 FedUtils.getSerializer(srcRange.connection, srcFederate, dstFederate)
             );
 
-            replaceFedConnection(fedConnection);
+            replaceFedConnection(fedConnection, resource);
 
             dstID.increment();
             srcID.increment();
@@ -590,8 +594,9 @@ private void replaceOneToManyConnection(
      * Replace a one-to-one federated connection with proxies.
      *
      * @param connection A connection between two federates.
+     * @param resource
      */
-    private void replaceFedConnection(FedConnectionInstance connection) {
+    private void replaceFedConnection(FedConnectionInstance connection, Resource resource) {
         if (!connection.getDefinition().isPhysical()
             && targetConfig.coordination != CoordinationType.DECENTRALIZED) {
             // Map the delays on connections between federates.
@@ -621,6 +626,6 @@ private void replaceFedConnection(FedConnectionInstance connection) {
             }
         }
 
-        FedASTUtils.makeCommunication(connection, targetConfig.coordination, errorReporter);
+        FedASTUtils.makeCommunication(connection, resource, targetConfig.coordination, errorReporter);
     }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java b/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java
index 54e215264f..43c1b14eb8 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java
@@ -54,7 +54,9 @@ String generateMainReactor(FederateInstance federate, Reactor originalMainReacto
                    ASTUtils.allActions(originalMainReactor).stream().filter(federate::contains).map(renderer).collect(Collectors.joining("\n")),
                    ASTUtils.allTimers(originalMainReactor).stream().filter(federate::contains).map(renderer).collect(Collectors.joining("\n")),
                    ASTUtils.allMethods(originalMainReactor).stream().filter(federate::contains).map(renderer).collect(Collectors.joining("\n")),
-                   ASTUtils.allReactions(originalMainReactor).stream().filter(federate::contains).map(renderer).collect(Collectors.joining("\n"))
+                   ASTUtils.allReactions(originalMainReactor).stream().filter(federate::contains).map(renderer).collect(Collectors.joining("\n")),
+                   federate.networkInstantiations.stream().map(renderer).collect(Collectors.joining("\n")),
+                   federate.networkConnections.stream().map(renderer).collect(Collectors.joining("\n"))
                ).indent(4).stripTrailing(),
                "}"
             );
diff --git a/org.lflang/src/org/lflang/federated/generator/FederateInstance.java b/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
index 92faefe400..c805ae097f 100644
--- a/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
+++ b/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
@@ -40,8 +40,6 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 
 import org.lflang.ASTUtils;
 import org.lflang.ErrorReporter;
-import org.lflang.FileConfig;
-import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TimeValue;
 import org.lflang.federated.serialization.SupportedSerializers;
@@ -54,6 +52,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.generator.TriggerInstance;
 import org.lflang.lf.Action;
 import org.lflang.lf.ActionOrigin;
+import org.lflang.lf.Connection;
 import org.lflang.lf.Expression;
 import org.lflang.lf.Import;
 import org.lflang.lf.ImportedReactor;
@@ -202,6 +201,12 @@ public Instantiation getInstantiation() {
      *  The sending federate needs to specify this ID.
      */
     public List<Action> networkMessageActions = new ArrayList<>();
+
+
+    /**
+     * List of networkMessage reactors corresponding to actions.
+     */
+    public List<Reactor> networkMessageActionReactors = new ArrayList<>();
     
     /**
      * A set of federates with which this federate has an inbound connection
@@ -250,6 +255,26 @@ public Instantiation getInstantiation() {
      */
     public List<Reaction> networkReactions = new ArrayList<>();
 
+    /**
+     * List of generated network reactors (network input and outputs) that
+     * belong to this federate instance.
+     */
+    public List<Reactor> networkReactors = new ArrayList<>();
+
+
+    /**
+     * List of generated network connections (network input and outputs) that
+     * belong to this federate instance.
+     */
+    public List<Connection> networkConnections = new ArrayList<>();
+
+
+    /**
+     * List of generated network instantiations (network input and outputs) that
+     * belong to this federate instance.
+     */
+    public List<Instantiation> networkInstantiations = new ArrayList<>();
+
     /**
      * Parsed target config of the federate.
      */
@@ -295,18 +320,21 @@ private boolean contains(
         Instantiation instantiation,
         ReactorDecl reactor
     ) {
+
         if (instantiation.getReactorClass().equals(ASTUtils.toDefinition(reactor))) {
             return true;
         }
 
         boolean instantiationsCheck = false;
+        if (networkReactors.contains(ASTUtils.toDefinition(reactor))){
+            return true;
+        }
         // For a federate, we don't need to look inside imported reactors.
         if (instantiation.getReactorClass() instanceof Reactor reactorDef) {
             for (Instantiation child : reactorDef.getInstantiations()) {
                 instantiationsCheck |= contains(child, reactor);
             }
         }
-
         return instantiationsCheck;
     }
 

From d713aeb8758426f22448f8f326f4c7642c7028cc Mon Sep 17 00:00:00 2001
From: Anirudh Rengarajan <44007330+arengarajan99@users.noreply.github.com>
Date: Sat, 1 Apr 2023 10:55:13 -0700
Subject: [PATCH 0112/1114] Fix LFC to pass compilation stage

---
 .../federated/extensions/CExtension.java      |   3 +-
 .../federated/extensions/CExtensionUtils.java |   4 +-
 .../federated/generator/FedASTUtils.java      | 147 +++++++++++-------
 .../federated/generator/FedMainEmitter.java   |   3 +-
 .../federated/generator/FederateInstance.java |   7 +-
 5 files changed, 99 insertions(+), 65 deletions(-)

diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtension.java b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
index 93c661e3c9..bdebae8cd0 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
@@ -542,7 +542,8 @@ private String generateInitializeTriggers(FederateInstance federate, ErrorReport
         var federatedReactor = FedASTUtils.findFederatedReactor(federate.instantiation.eResource());
         var oldFederatedReactorName = federatedReactor.getName();
         federatedReactor.setName(federate.name);
-        code.pr(CExtensionUtils.initializeTriggersForNetworkActions(federate, errorReporter));
+        var main = new ReactorInstance(federatedReactor, errorReporter, -1);
+        code.pr(CExtensionUtils.initializeTriggersForNetworkActions(federate, main, errorReporter));
         //code.pr(CExtensionUtils.initializeTriggerForControlReactions(main, main, federate));
         federatedReactor.setName(oldFederatedReactorName);
         
diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
index 9992302b88..5f287be6c5 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
@@ -83,7 +83,7 @@ public static String allocateTriggersForFederate(
      * @param main The main reactor that contains the federate (used to lookup references).
      * @return
      */
-    public static String initializeTriggersForNetworkActions(FederateInstance federate, ErrorReporter errorReporter) {
+    public static String initializeTriggersForNetworkActions(FederateInstance federate, ReactorInstance main, ErrorReporter errorReporter) {
         CodeBuilder code = new CodeBuilder();
         if (federate.networkMessageActions.size() > 0) {
             // Create a static array of trigger_t pointers.
@@ -95,7 +95,7 @@ public static String initializeTriggersForNetworkActions(FederateInstance federa
             for (int i = 0; i < federate.networkMessageActions.size(); ++i) {
                 // Find the corresponding ActionInstance.
                 Action action = federate.networkMessageActions.get(i);
-                var reactor = new ReactorInstance(federate.networkMessageActionReactors.get(i), errorReporter, 1);
+                var reactor = main.lookupReactorInstance(federate.networkReceiverInstantiations.get(i));
                 var actionInstance = reactor.lookupActionInstance(action);
                 triggers.add(CUtil.actionRef(actionInstance, null));
             }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java b/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
index 4ad3fca0f2..f5fc841be6 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
@@ -29,6 +29,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
@@ -363,7 +364,7 @@ private static void addNetworkReceiverReactor(
         connection.dstFederate.networkReactions.add(networkReceiverReaction);
         connection.dstFederate.networkReactors.add(receiver);
         connection.dstFederate.networkConnections.add(receiverFromReaction);
-        connection.dstFederate.networkInstantiations.add(networkInstance);
+        connection.dstFederate.networkReceiverInstantiations.add(networkInstance);
 
 
         // if (
@@ -743,6 +744,76 @@ public static <E> List<E> safe(List<E> list) {
     public static int networkIDSender = 0;
     public static int networkIDReceiver = 0;
 
+    private static Map<FederateInstance, Reactor> networkSenderReactors = new HashMap<>();
+    private static Map<FederateInstance, Instantiation> networkSenderInstantiations  = new HashMap<>();
+
+
+    private static Reactor getNetworkSenderReactor(FedConnectionInstance connection, 
+    CoordinationType coordination, Resource resource, ErrorReporter errorReporter) {
+        LfFactory factory = LfFactory.eINSTANCE;
+        // Reactor classDef = networkSenderReactors.getOrDefault(connection.srcFederate, null);
+        // if (classDef != null) {
+        //     return classDef;
+        // }
+        Type type = EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getType());
+
+        //Initialize Reactor and Reaction AST Nodes
+        Reactor sender = factory.createReactor();
+        Reaction networkSenderReaction = factory.createReaction();
+
+        VarRef inRef = factory.createVarRef(); //in port to network reaction
+        VarRef destRef = factory.createVarRef(); //destination fed
+
+        Input in = factory.createInput();
+
+        sender.getReactions().add(networkSenderReaction);
+        sender.getInputs().add(in);
+
+        EObject node = IteratorExtensions.findFirst(resource.getAllContents(), Model.class::isInstance);
+        ((Model) node).getReactors().add(sender);
+        sender.setName("NetworkSender_" + networkIDSender++);
+
+        // FIXME: do not create a new extension every time it is used
+        FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
+                                 .annotateReaction(networkSenderReaction);
+
+        // If the sender or receiver is in a bank of reactors, then we want
+        // these reactions to appear only in the federate whose bank ID matches.
+        setReactionBankIndex(networkSenderReaction, connection.getSrcBank());
+
+
+        in.setName("msg");
+        in.setType(type);
+        in.setWidthSpec(EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getWidthSpec()));
+        inRef.setVariable(in);
+
+        destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
+        destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
+        
+        // Configure the sending reaction.
+        networkSenderReaction.getTriggers().add(inRef);
+        networkSenderReaction.setCode(factory.createCode());
+        networkSenderReaction.getCode().setBody(
+            FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
+                                     .generateNetworkSenderBody(
+                                   inRef,
+                                   destRef,
+                                   connection,
+                                   InferredType.fromAST(type),
+                                   coordination,
+                                   errorReporter
+                               ));
+        
+        // Add the network sender reaction to the federate instance's list
+        // of network reactions
+        connection.srcFederate.networkReactions.add(networkSenderReaction);
+        connection.srcFederate.networkReactors.add(sender);
+
+        networkSenderReactors.put(connection.srcFederate, sender);
+        return sender;
+                               
+    }
+
     /**
      * Add a network sender reactor for a given input port 'source' to
      * source's parent reactor. This reaction will react to the 'source'
@@ -764,42 +835,33 @@ private static void addNetworkSenderReactor(
     ) {
         LfFactory factory = LfFactory.eINSTANCE;
         // Assume all the types are the same, so just use the first on the right.
-        Type type = EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getType());
-        VarRef sourceRef = factory.createVarRef(); //out connection
-        VarRef instRef = factory.createVarRef(); //instantiation connection
-        VarRef destRef = factory.createVarRef(); //destination fed
-        Reactor sender = factory.createReactor();
-        Reaction networkSenderReaction = factory.createReaction();
-        Input in = factory.createInput();
-        VarRef inRef = factory.createVarRef(); //in port
-        Connection senderToReaction = factory.createConnection();
+        
+        Reactor sender = getNetworkSenderReactor(connection, coordination, resource, errorReporter);
+        
         Instantiation networkInstance = factory.createInstantiation();
 
+        VarRef sourceRef = factory.createVarRef(); //out port from federate
+        VarRef instRef = factory.createVarRef(); //out port from federate
+
         Reactor top = connection.getSourcePortInstance()
                                 .getParent()
                                 .getParent().reactorDefinition; // Top-level reactor.
 
 
-        sender.getReactions().add(networkSenderReaction);
-        sender.getInputs().add(in);
-        EObject node = IteratorExtensions.findFirst(resource.getAllContents(), Model.class::isInstance);
-        ((Model) node).getReactors().add(sender);
-        sender.setName("NetworkSender_" + networkIDSender++);
-
         networkInstance.setReactorClass(sender);
         networkInstance.setName(ASTUtils.getUniqueIdentifier(top, "ns_" + connection.getDstFederate().name));
         top.getInstantiations().add(networkInstance);
 
-        senderToReaction.getLeftPorts().add(sourceRef);
-        senderToReaction.getRightPorts().add(instRef);
+        Connection senderToReaction = factory.createConnection();
 
-        // FIXME: do not create a new extension every time it is used
-        FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
-                                 .annotateReaction(networkSenderReaction);
+        // Establish references to the involved ports.
+        sourceRef.setContainer(connection.getSourcePortInstance().getParent().getDefinition());
+        sourceRef.setVariable(connection.getSourcePortInstance().getDefinition());
+        instRef.setContainer(networkInstance);
+        instRef.setVariable(sender.getInputs().get(0));
 
-        // If the sender or receiver is in a bank of reactors, then we want
-        // these reactions to appear only in the federate whose bank ID matches.
-        setReactionBankIndex(networkSenderReaction, connection.getSrcBank());
+        senderToReaction.getLeftPorts().add(sourceRef);
+        senderToReaction.getRightPorts().add(instRef);
 
         // The connection is 'physical' if it uses the ~> notation.
         if (connection.getDefinition().isPhysical()) {
@@ -813,43 +875,8 @@ private static void addNetworkSenderReactor(
             }
         }
 
-        // Establish references to the involved ports.
-        sourceRef.setContainer(connection.getSourcePortInstance().getParent().getDefinition());
-        sourceRef.setVariable(connection.getSourcePortInstance().getDefinition());
-        instRef.setContainer(networkInstance);
-        instRef.setVariable(in);
-        destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
-        destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
-
-        in.setName("msg");
-        in.setType(type);
-        in.setWidthSpec(EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getWidthSpec()));
-        inRef.setVariable(in);
-
-
-        // Configure the sending reaction.
-        networkSenderReaction.getTriggers().add(inRef);
-        networkSenderReaction.setCode(factory.createCode());
-        networkSenderReaction.getCode().setBody(
-            FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
-                                     .generateNetworkSenderBody(
-                                   inRef,
-                                   destRef,
-                                   connection,
-                                   InferredType.fromAST(type),
-                                   coordination,
-                                   errorReporter
-                               ));
-
-        // Add the sending reaction to the parent.
-        //networkSenderReaction.getTriggers().add(inRef);
-
-        // Add the network sender reaction to the federate instance's list
-        // of network reactions
-        connection.srcFederate.networkReactions.add(networkSenderReaction);
-        connection.srcFederate.networkReactors.add(sender);
         connection.srcFederate.networkConnections.add(senderToReaction);
-        connection.srcFederate.networkInstantiations.add(networkInstance);
+        connection.srcFederate.networkSenderInstantiations.add(networkInstance);
     }
 
     /**
diff --git a/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java b/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java
index 43c1b14eb8..fec90b6992 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java
@@ -55,7 +55,8 @@ String generateMainReactor(FederateInstance federate, Reactor originalMainReacto
                    ASTUtils.allTimers(originalMainReactor).stream().filter(federate::contains).map(renderer).collect(Collectors.joining("\n")),
                    ASTUtils.allMethods(originalMainReactor).stream().filter(federate::contains).map(renderer).collect(Collectors.joining("\n")),
                    ASTUtils.allReactions(originalMainReactor).stream().filter(federate::contains).map(renderer).collect(Collectors.joining("\n")),
-                   federate.networkInstantiations.stream().map(renderer).collect(Collectors.joining("\n")),
+                   federate.networkSenderInstantiations.stream().map(renderer).collect(Collectors.joining("\n")),
+                   federate.networkReceiverInstantiations.stream().map(renderer).collect(Collectors.joining("\n")),
                    federate.networkConnections.stream().map(renderer).collect(Collectors.joining("\n"))
                ).indent(4).stripTrailing(),
                "}"
diff --git a/org.lflang/src/org/lflang/federated/generator/FederateInstance.java b/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
index c805ae097f..1a912d06ae 100644
--- a/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
+++ b/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
@@ -273,7 +273,12 @@ public Instantiation getInstantiation() {
      * List of generated network instantiations (network input and outputs) that
      * belong to this federate instance.
      */
-    public List<Instantiation> networkInstantiations = new ArrayList<>();
+    public List<Instantiation> networkSenderInstantiations = new ArrayList<>();
+    /**
+     * List of generated network instantiations (network input and outputs) that
+     * belong to this federate instance.
+     */
+    public List<Instantiation> networkReceiverInstantiations = new ArrayList<>();
 
     /**
      * Parsed target config of the federate.

From a47b795d04233fa7fd5fb6a79b514b6941a57264 Mon Sep 17 00:00:00 2001
From: Anirudh Rengarajan <44007330+arengarajan99@users.noreply.github.com>
Date: Sat, 1 Apr 2023 23:16:09 -0700
Subject: [PATCH 0113/1114] Added support for referencing upstream reactors for
 port statuses

---
 .../federated/extensions/CExtension.java      | 10 ++++++--
 .../federated/generator/FedASTUtils.java      | 11 +++-----
 .../federated/generator/FederateInstance.java | 25 +++++++++----------
 .../lflang/generator/c/CCmakeGenerator.java   |  1 +
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtension.java b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
index bdebae8cd0..7e9828e01f 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
@@ -508,10 +508,16 @@ protected String makePreamble(
         size_t _lf_action_table_size = %1$s;
         """.formatted(numOfNetworkActions));
 
+        int numOfNetworkReactions = federate.networkReceiverReactions.size();
+        code.pr("""
+        reaction_t* upstreamPortReactions[%1$s];
+        size_t num_upstream_port_dependencies = %1$s;
+        """.formatted(numOfNetworkReactions));
+
         code.pr(generateSerializationPreamble(federate, fileConfig));
 
         code.pr(generateExecutablePreamble(federate, rtiConfig, errorReporter));
-
+        
         code.pr(generateInitializeTriggers(federate, errorReporter));
 
         code.pr(CExtensionUtils.generateFederateNeighborStructure(federate));
@@ -544,7 +550,7 @@ private String generateInitializeTriggers(FederateInstance federate, ErrorReport
         federatedReactor.setName(federate.name);
         var main = new ReactorInstance(federatedReactor, errorReporter, -1);
         code.pr(CExtensionUtils.initializeTriggersForNetworkActions(federate, main, errorReporter));
-        //code.pr(CExtensionUtils.initializeTriggerForControlReactions(main, main, federate));
+        code.pr(CExtensionUtils.upstreamPortReactions(federate, main));
         federatedReactor.setName(oldFederatedReactorName);
         
         return """
diff --git a/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java b/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
index f5fc841be6..3d0b2731fd 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
@@ -293,9 +293,6 @@ private static void addNetworkReceiverReactor(
         // Keep track of this action in the destination federate.
         connection.dstFederate.networkMessageActions.add(networkAction);
 
-        // Keep track of the  in the destination federate.
-        connection.dstFederate.networkMessageActionReactors.add(receiver);
-
         // Add the action definition to the parent reactor.
         receiver.getActions().add(networkAction);
 
@@ -361,7 +358,7 @@ private static void addNetworkReceiverReactor(
 
         // Add the network receiver reaction to the federate instance's list
         // of network reactions
-        connection.dstFederate.networkReactions.add(networkReceiverReaction);
+        connection.dstFederate.networkReceiverReactions.add(networkReceiverReaction);
         connection.dstFederate.networkReactors.add(receiver);
         connection.dstFederate.networkConnections.add(receiverFromReaction);
         connection.dstFederate.networkReceiverInstantiations.add(networkInstance);
@@ -462,7 +459,7 @@ private static void addNetworkInputControlReaction(
 
         // Add the network input control reaction to the federate instance's list
         // of network reactions
-        connection.dstFederate.networkReactions.add(reaction);
+        //connection.dstFederate.networkReactions.add(reaction);
 
         // Add necessary dependencies to reaction to ensure that it executes correctly
         // relative to other network input control reactions in the federate.
@@ -806,7 +803,7 @@ private static Reactor getNetworkSenderReactor(FedConnectionInstance connection,
         
         // Add the network sender reaction to the federate instance's list
         // of network reactions
-        connection.srcFederate.networkReactions.add(networkSenderReaction);
+        connection.srcFederate.networkSenderReactions.add(networkSenderReaction);
         connection.srcFederate.networkReactors.add(sender);
 
         networkSenderReactors.put(connection.srcFederate, sender);
@@ -964,6 +961,6 @@ private static void addNetworkOutputControlReaction(FedConnectionInstance connec
 
         // Add the network output control reaction to the federate instance's list
         // of network reactions
-        connection.srcFederate.networkReactions.add(reaction);
+        //connection.srcFederate.networkReactions.add(reaction);
     }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FederateInstance.java b/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
index 1a912d06ae..e76f465796 100644
--- a/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
+++ b/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
@@ -201,12 +201,6 @@ public Instantiation getInstantiation() {
      *  The sending federate needs to specify this ID.
      */
     public List<Action> networkMessageActions = new ArrayList<>();
-
-
-    /**
-     * List of networkMessage reactors corresponding to actions.
-     */
-    public List<Reactor> networkMessageActionReactors = new ArrayList<>();
     
     /**
      * A set of federates with which this federate has an inbound connection
@@ -249,11 +243,14 @@ public Instantiation getInstantiation() {
     public boolean isRemote = false;
     
     /**
-     * List of generated network reactions (network receivers,
-     * network input control reactions, network senders, and network output control
-     * reactions) that belong to this federate instance.
+     * List of generated network reactions (network receivers) that belong to this federate instance.
      */
-    public List<Reaction> networkReactions = new ArrayList<>();
+    public List<Reaction> networkReceiverReactions = new ArrayList<>();
+
+    /**
+     * List of generated network reactions (network sender) that belong to this federate instance.
+     */
+    public List<Reaction> networkSenderReactions = new ArrayList<>();
 
     /**
      * List of generated network reactors (network input and outputs) that
@@ -378,7 +375,7 @@ private boolean contains(Parameter param) {
         // the parameters, so we need to include the parameter.
         var topLevelUserDefinedReactions = ((Reactor) instantiation.eContainer())
             .getReactions().stream().filter(
-                r -> !networkReactions.contains(r) && contains(r)
+                r -> !networkReceiverReactions.contains(r) && !networkSenderReactions.contains(r) && contains(r)
             ).collect(Collectors.toCollection(ArrayList::new));
         returnValue |= !topLevelUserDefinedReactions.isEmpty();
         return returnValue;
@@ -445,11 +442,12 @@ private boolean contains(Reaction reaction) {
         assert reactor != null;
         if (!reactor.getReactions().contains(reaction)) return false;
         
-        if (networkReactions.contains(reaction)) {
+        if (networkReceiverReactions.contains(reaction) || networkSenderReactions.contains(reaction)) {
             // Reaction is a network reaction that belongs to this federate
             return true;
         }
 
+
         int reactionBankIndex = FedASTUtils.getReactionBankIndex(reaction);
         if (reactionBankIndex >= 0 && this.bankIndex >= 0 && reactionBankIndex != this.bankIndex) {
             return false;
@@ -543,7 +541,8 @@ private void indexExcludedTopLevelReactions(Reactor federatedReactor) {
         // Construct the set of excluded reactions for this federate.
         // If a reaction is a network reaction that belongs to this federate, we
         // don't need to perform this analysis.
-        Iterable<Reaction> reactions = ASTUtils.allReactions(federatedReactor).stream().filter(it -> !networkReactions.contains(it)).collect(Collectors.toList());
+        Iterable<Reaction> reactions = ASTUtils.allReactions(federatedReactor).stream().filter(it -> !networkReceiverReactions.contains(it))
+            .filter(it -> !networkSenderReactions.contains(it)).collect(Collectors.toList());
         for (Reaction react : reactions) {
             // Create a collection of all the VarRefs (i.e., triggers, sources, and effects) in the react
             // signature that are ports that reference federates.
diff --git a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java
index f5e7187233..75a04ad9b5 100644
--- a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java
@@ -218,6 +218,7 @@ CodeBuilder generateCMakeCode(
         cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/platform)");
         cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/modal_models)");
         cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/utils)");
+        
 
         if(targetConfig.auth) {
             // If security is requested, add the auth option.

From 37d1dbf2e00b2ce6715c30197547cc713a40e0cf Mon Sep 17 00:00:00 2001
From: Anirudh Rengarajan <44007330+arengarajan99@users.noreply.github.com>
Date: Sat, 1 Apr 2023 23:21:54 -0700
Subject: [PATCH 0114/1114] Add generation of upstream port reactor array
 generation for checking upstream dependencies using chain id

---
 .../federated/extensions/CExtensionUtils.java | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
index 5f287be6c5..7e0d68cc25 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
@@ -582,4 +582,28 @@ public static String generateSerializationCMakeExtension(
         }
         return code.getCode();
     }
+
+    public static CharSequence upstreamPortReactions(FederateInstance federate, ReactorInstance main) {
+        CodeBuilder code = new CodeBuilder();
+        if (!federate.networkMessageActions.isEmpty()) {
+            // Create a static array of trigger_t pointers.
+            // networkMessageActions is a list of Actions, but we
+            // need a list of trigger struct names for ActionInstances.
+            // There should be exactly one ActionInstance in the
+            // main reactor for each Action.
+            var reactions = new LinkedList<String>();
+            for (int i = 0; i < federate.networkMessageActions.size(); ++i) {
+                // Find the corresponding ActionInstance.
+                var reaction = federate.networkReceiverReactions.get(i);
+                var reactor = main.lookupReactorInstance(federate.networkReceiverInstantiations.get(i));
+                var reactionInstance = reactor.lookupReactionInstance(reaction);
+                reactions.add(CUtil.reactionRef(reactionInstance));
+            }
+            var tableCount = 0;
+            for (String react: reactions) {
+                code.pr("upstreamPortReactions[" + (tableCount++) + "] = (reaction_t*)&" + react + "; \\");
+            }
+        }
+        return code.getCode();
+    }
 }

From e66f37dbe894b19e9cdd90292ea4a1812dbb9425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Thu, 20 Apr 2023 13:51:24 +0200
Subject: [PATCH 0115/1114] Format

---
 org.lflang/src/org/lflang/ErrorReporter.java  |  24 +-
 .../src/org/lflang/generator/Validator.java   |  42 ++--
 .../src/org/lflang/generator/c/CCompiler.java | 205 ++++++++---------
 .../src/org/lflang/generator/c/CUtil.java     | 213 +++++++++---------
 org.lflang/src/org/lflang/util/LFCommand.java |  44 ++--
 5 files changed, 248 insertions(+), 280 deletions(-)

diff --git a/org.lflang/src/org/lflang/ErrorReporter.java b/org.lflang/src/org/lflang/ErrorReporter.java
index 23baded772..715ac6b5e9 100644
--- a/org.lflang/src/org/lflang/ErrorReporter.java
+++ b/org.lflang/src/org/lflang/ErrorReporter.java
@@ -170,16 +170,16 @@ default String report(Path file, DiagnosticSeverity severity, String message, Ra
     return report(file, severity, message, range.getStartInclusive().getOneBasedLine());
   }
 
-    /**
-     * Check if errors where reported.
-     *
-     * @return true if errors where reported
-     */
-    boolean getErrorsOccurred();
-
-    /**
-     * Clear error history, if exists.
-     * This is usually only the case for error markers in Epoch (Eclipse).
-     */
-    default void clearHistory() {}
+  /**
+   * Check if errors where reported.
+   *
+   * @return true if errors where reported
+   */
+  boolean getErrorsOccurred();
+
+  /**
+   * Clear error history, if exists. This is usually only the case for error markers in Epoch
+   * (Eclipse).
+   */
+  default void clearHistory() {}
 }
diff --git a/org.lflang/src/org/lflang/generator/Validator.java b/org.lflang/src/org/lflang/generator/Validator.java
index 61c2dde97d..53efd6412e 100644
--- a/org.lflang/src/org/lflang/generator/Validator.java
+++ b/org.lflang/src/org/lflang/generator/Validator.java
@@ -1,5 +1,6 @@
 package org.lflang.generator;
 
+import com.google.common.collect.ImmutableMap;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -13,14 +14,10 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
-
 import org.eclipse.xtext.util.CancelIndicator;
-
 import org.lflang.ErrorReporter;
 import org.lflang.util.LFCommand;
 
-import com.google.common.collect.ImmutableMap;
-
 /**
  * Validate generated code.
  *
@@ -170,25 +167,26 @@ private List<Pair<ValidationStrategy, LFCommand>> getValidationStrategies() {
     return commands;
   }
 
-    /**
-     * Return the validation strategy and command
-     * corresponding to the given file if such a strategy
-     * and command are available.
-     * @return the validation strategy and command
-     * corresponding to the given file if such a strategy
-     * and command are available
-     */
-    private Pair<ValidationStrategy, LFCommand> getValidationStrategy(Path generatedFile) {
-        List<ValidationStrategy> sorted = getPossibleStrategies().stream()
-            .sorted(Comparator.comparingInt(vs -> -vs.getPriority())).toList();
-        for (ValidationStrategy strategy : sorted) {
-            LFCommand validateCommand = strategy.getCommand(generatedFile);
-            if (validateCommand != null) {
-                return new Pair<>(strategy, validateCommand);
-            }
-        }
-        return new Pair<>(null, null);
+  /**
+   * Return the validation strategy and command corresponding to the given file if such a strategy
+   * and command are available.
+   *
+   * @return the validation strategy and command corresponding to the given file if such a strategy
+   *     and command are available
+   */
+  private Pair<ValidationStrategy, LFCommand> getValidationStrategy(Path generatedFile) {
+    List<ValidationStrategy> sorted =
+        getPossibleStrategies().stream()
+            .sorted(Comparator.comparingInt(vs -> -vs.getPriority()))
+            .toList();
+    for (ValidationStrategy strategy : sorted) {
+      LFCommand validateCommand = strategy.getCommand(generatedFile);
+      if (validateCommand != null) {
+        return new Pair<>(strategy, validateCommand);
+      }
     }
+    return new Pair<>(null, null);
+  }
 
   /**
    * List all validation strategies that exist for the implementor without filtering by platform or
diff --git a/org.lflang/src/org/lflang/generator/c/CCompiler.java b/org.lflang/src/org/lflang/generator/c/CCompiler.java
index d62ee7ba7b..609b3614b6 100644
--- a/org.lflang/src/org/lflang/generator/c/CCompiler.java
+++ b/org.lflang/src/org/lflang/generator/c/CCompiler.java
@@ -167,25 +167,27 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
         generator.reportCommandErrors(build.getErrors());
       }
 
+      if (makeReturnCode == 0 && build.getErrors().isEmpty()) {
+        errorReporter.reportInfo(
+            "SUCCESS: Compiling generated code for "
+                + fileConfig.name
+                + " finished with no errors.");
+      }
 
-            if (makeReturnCode == 0 && build.getErrors().isEmpty()) {
-                errorReporter.reportInfo("SUCCESS: Compiling generated code for " + fileConfig.name + " finished with no errors.");
-            }
-
-            if (targetConfig.platformOptions.platform == Platform.ZEPHYR && targetConfig.platformOptions.flash) {
-                errorReporter.reportInfo("Invoking flash command for Zephyr");
-                LFCommand flash = buildWestFlashCommand();
-                int flashRet = flash.run();
-                if (flashRet != 0) {
-                    errorReporter.reportError("West flash command failed with error code " + flashRet);
-                } else {
-                    errorReporter.reportInfo("SUCCESS: Flashed application with west");
-                }
-            }
-
+      if (targetConfig.platformOptions.platform == Platform.ZEPHYR
+          && targetConfig.platformOptions.flash) {
+        errorReporter.reportInfo("Invoking flash command for Zephyr");
+        LFCommand flash = buildWestFlashCommand();
+        int flashRet = flash.run();
+        if (flashRet != 0) {
+          errorReporter.reportError("West flash command failed with error code " + flashRet);
+        } else {
+          errorReporter.reportInfo("SUCCESS: Flashed application with west");
         }
-        return cMakeReturnCode == 0 && makeReturnCode == 0;
+      }
     }
+    return cMakeReturnCode == 0 && makeReturnCode == 0;
+  }
 
   /**
    * Return a command to compile the specified C file using CMake. This produces a C-specific
@@ -222,13 +224,9 @@ private static List<String> cmakeOptions(TargetConfig targetConfig, FileConfig f
                     ? targetConfig.cmakeBuildType.toString()
                     : "Release"),
             "-DCMAKE_INSTALL_PREFIX=" + FileUtil.toUnixString(fileConfig.getOutPath()),
-            "-DCMAKE_INSTALL_BINDIR=" + FileUtil.toUnixString(
-                fileConfig.getOutPath().relativize(
-                    fileConfig.binPath
-                )
-            ),
-            FileUtil.toUnixString(fileConfig.getSrcGenPath())
-        ));
+            "-DCMAKE_INSTALL_BINDIR="
+                + FileUtil.toUnixString(fileConfig.getOutPath().relativize(fileConfig.binPath)),
+            FileUtil.toUnixString(fileConfig.getSrcGenPath())));
 
     if (GeneratorUtils.isHostWindows()) {
       arguments.add("-DCMAKE_SYSTEM_VERSION=\"10.0\"");
@@ -281,80 +279,68 @@ public LFCommand buildCmakeCommand() {
     return command;
   }
 
-    /**
-     * Return a flash/emulate command using west.
-     * If board is null (defaults to qemu_cortex_m3) or qemu_*
-     * Return a flash command which runs the target as an emulation
-     * If ordinary target, return `west flash`
-     */
-    public LFCommand buildWestFlashCommand() {
-        // Set the build directory to be "build"
-        Path buildPath = fileConfig.getSrcGenPath().resolve("build");
-        String board = targetConfig.platformOptions.board;
-        LFCommand cmd;
-        if (board == null || board.startsWith("qemu")) {
-            cmd = commandFactory.createCommand(
-                "west", List.of("build", "-t", "run"), buildPath);
-        } else {
-            cmd = commandFactory.createCommand(
-                "west", List.of("flash"), buildPath);
-        }
-        if (cmd == null) {
-            errorReporter.reportError(
-                "Could not create west flash command."
-            );
-        }
-
-        return cmd;
+  /**
+   * Return a flash/emulate command using west. If board is null (defaults to qemu_cortex_m3) or
+   * qemu_* Return a flash command which runs the target as an emulation If ordinary target, return
+   * `west flash`
+   */
+  public LFCommand buildWestFlashCommand() {
+    // Set the build directory to be "build"
+    Path buildPath = fileConfig.getSrcGenPath().resolve("build");
+    String board = targetConfig.platformOptions.board;
+    LFCommand cmd;
+    if (board == null || board.startsWith("qemu")) {
+      cmd = commandFactory.createCommand("west", List.of("build", "-t", "run"), buildPath);
+    } else {
+      cmd = commandFactory.createCommand("west", List.of("flash"), buildPath);
+    }
+    if (cmd == null) {
+      errorReporter.reportError("Could not create west flash command.");
     }
 
-    /**
-     * Check if the output produced by CMake has any known and common errors.
-     * If a known error is detected, a specialized, more informative message
-     * is shown.
-     *
-     * Errors currently detected:
-     * - C++ compiler used to compile C files: This error shows up as
-     *  '#error "The CMAKE_C_COMPILER is set to a C++ compiler"' in
-     *  the 'CMakeOutput' string.
-     *
-     * @param CMakeOutput The captured output from CMake.
-     * @return true if the provided 'CMakeOutput' contains a known error.
-     *  false otherwise.
-     */
-    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-    private boolean outputContainsKnownCMakeErrors(String CMakeOutput) {
-        // Check if the error thrown is due to the wrong compiler
-        if (CMakeOutput.contains("The CMAKE_C_COMPILER is set to a C++ compiler")) {
-            // If so, print an appropriate error message
-            if (targetConfig.compiler != null) {
-                errorReporter.reportError(
-                        "A C++ compiler was requested in the compiler target property."
-                                + " Use the CCpp or the Cpp target instead.");
-            } else {
-                errorReporter.reportError("\"A C++ compiler was detected."
-                       + " The C target works best with a C compiler."
-                       + " Use the CCpp or the Cpp target instead.\"");
-            }
-            return true;
-        }
-        return false;
+    return cmd;
+  }
+
+  /**
+   * Check if the output produced by CMake has any known and common errors. If a known error is
+   * detected, a specialized, more informative message is shown.
+   *
+   * <p>Errors currently detected: - C++ compiler used to compile C files: This error shows up as
+   * '#error "The CMAKE_C_COMPILER is set to a C++ compiler"' in the 'CMakeOutput' string.
+   *
+   * @param CMakeOutput The captured output from CMake.
+   * @return true if the provided 'CMakeOutput' contains a known error. false otherwise.
+   */
+  @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+  private boolean outputContainsKnownCMakeErrors(String CMakeOutput) {
+    // Check if the error thrown is due to the wrong compiler
+    if (CMakeOutput.contains("The CMAKE_C_COMPILER is set to a C++ compiler")) {
+      // If so, print an appropriate error message
+      if (targetConfig.compiler != null) {
+        errorReporter.reportError(
+            "A C++ compiler was requested in the compiler target property."
+                + " Use the CCpp or the Cpp target instead.");
+      } else {
+        errorReporter.reportError(
+            "\"A C++ compiler was detected."
+                + " The C target works best with a C compiler."
+                + " Use the CCpp or the Cpp target instead.\"");
+      }
+      return true;
     }
+    return false;
+  }
 
-    /**
-     * Return a command to compile the specified C file using a native compiler
-     * (generally gcc unless overridden by the user).
-     * This produces a C specific compile command.
-     *
-     * @param fileToCompile The C filename without the .c extension.
-     * @param noBinary If true, the compiler will create a .o output instead of a binary.
-     *  If false, the compile command will produce a binary.
-     */
-    public LFCommand compileCCommand(
-        String fileToCompile,
-        boolean noBinary
-    ) {
-        String cFilename = getTargetFileName(fileToCompile, cppMode, targetConfig);
+  /**
+   * Return a command to compile the specified C file using a native compiler (generally gcc unless
+   * overridden by the user). This produces a C specific compile command.
+   *
+   * @param fileToCompile The C filename without the .c extension.
+   * @param noBinary If true, the compiler will create a .o output instead of a binary. If false,
+   *     the compile command will produce a binary.
+   */
+  public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
+    String cFilename = getTargetFileName(fileToCompile, cppMode, targetConfig);
 
     Path relativeSrcPath =
         fileConfig
@@ -412,22 +398,21 @@ public LFCommand compileCCommand(
     return command;
   }
 
-    /**
-     * Produces the filename including the target-specific extension
-     *
-     * @param fileName The base name of the file without any extensions
-     * @param cppMode  Indicate whether the compiler is in C++ mode
-     * In C++ mode, the compiler produces .cpp files instead
-     * of .c files and uses a C++ compiler to compiler the code.
-     */
-    static String getTargetFileName(String fileName, boolean cppMode, TargetConfig targetConfig) {
-        if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
-            return fileName + ".ino";
-        }
-        if (cppMode) {
-            // If the C++ mode is enabled, use a .cpp extension
-            return fileName + ".cpp";
-        }
-        return fileName + ".c";
+  /**
+   * Produces the filename including the target-specific extension
+   *
+   * @param fileName The base name of the file without any extensions
+   * @param cppMode Indicate whether the compiler is in C++ mode In C++ mode, the compiler produces
+   *     .cpp files instead of .c files and uses a C++ compiler to compiler the code.
+   */
+  static String getTargetFileName(String fileName, boolean cppMode, TargetConfig targetConfig) {
+    if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
+      return fileName + ".ino";
     }
+    if (cppMode) {
+      // If the C++ mode is enabled, use a .cpp extension
+      return fileName + ".cpp";
+    }
+    return fileName + ".c";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CUtil.java b/org.lflang/src/org/lflang/generator/c/CUtil.java
index 92ceaa0c8f..0808d97c28 100644
--- a/org.lflang/src/org/lflang/generator/c/CUtil.java
+++ b/org.lflang/src/org/lflang/generator/c/CUtil.java
@@ -37,13 +37,11 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-
 import org.lflang.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig;
-
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.GeneratorCommandFactory;
 import org.lflang.generator.LFGeneratorContext;
@@ -54,7 +52,6 @@
 import org.lflang.lf.Parameter;
 import org.lflang.lf.Port;
 import org.lflang.lf.Reactor;
-import org.lflang.lf.ReactorDecl;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
 import org.lflang.lf.WidthTerm;
@@ -62,9 +59,9 @@
 import org.lflang.util.LFCommand;
 
 /**
- * A collection of utilities for C code generation.
- * This class codifies the coding conventions for the C target code generator.
- * I.e., it defines how variables are named and referenced.
+ * A collection of utilities for C code generation. This class codifies the coding conventions for
+ * the C target code generator. I.e., it defines how variables are named and referenced.
+ *
  * @author Edward A. Lee
  */
 public class CUtil {
@@ -84,30 +81,29 @@ public class CUtil {
   //////////////////////////////////////////////////////
   //// Public methods.
 
-    /**
-     * Return a reference to the action struct of the specified
-     * action instance. This action_base_t struct is on the self struct.
-     * @param instance The action instance.
-     * @param runtimeIndex An optional index variable name to use to address runtime instances.
-     */
-    public static String actionRef(ActionInstance instance, String runtimeIndex) {
-        return reactorRef(instance.getParent(), runtimeIndex)
-                + "->_lf_"
-                + instance.getName();
-    }
+  /**
+   * Return a reference to the action struct of the specified action instance. This action_base_t
+   * struct is on the self struct.
+   *
+   * @param instance The action instance.
+   * @param runtimeIndex An optional index variable name to use to address runtime instances.
+   */
+  public static String actionRef(ActionInstance instance, String runtimeIndex) {
+    return reactorRef(instance.getParent(), runtimeIndex) + "->_lf_" + instance.getName();
+  }
 
-    /**
-     * Return a default name of a variable to refer to the bank index of a reactor
-     * in a bank. This is has the form uniqueID_i where uniqueID
-     * is an identifier for the instance that is guaranteed to be different
-     * from the ID of any other instance in the program.
-     * If the instance is not a bank, return "0".
-     * @param instance A reactor instance.
-     */
-    public static String bankIndex(ReactorInstance instance) {
-        if (!instance.isBank()) return "0";
-        return bankIndexName(instance);
-    }
+  /**
+   * Return a default name of a variable to refer to the bank index of a reactor in a bank. This is
+   * has the form uniqueID_i where uniqueID is an identifier for the instance that is guaranteed to
+   * be different from the ID of any other instance in the program. If the instance is not a bank,
+   * return "0".
+   *
+   * @param instance A reactor instance.
+   */
+  public static String bankIndex(ReactorInstance instance) {
+    if (!instance.isBank()) return "0";
+    return bankIndexName(instance);
+  }
 
   /**
    * Return a default name of a variable to refer to the bank index of a reactor in a bank. This is
@@ -140,72 +136,68 @@ public static String channelIndexName(PortInstance port) {
     return port.uniqueID() + "_c";
   }
 
-    /**
-     * Return the name of the reactor. A '_main` is appended to the name if the
-     * reactor is main (to allow for instantiations that have the same name as
-     * the main reactor or the .lf file).
-     */
-    public static String getName(Reactor reactor) {
-        String name = reactor.getName().toLowerCase() + reactor.hashCode();
-        if (reactor.isMain()) {
-            return name + "_main";
-        }
-        return name;
+  /**
+   * Return the name of the reactor. A '_main` is appended to the name if the reactor is main (to
+   * allow for instantiations that have the same name as the main reactor or the .lf file).
+   */
+  public static String getName(Reactor reactor) {
+    String name = reactor.getName().toLowerCase() + reactor.hashCode();
+    if (reactor.isMain()) {
+      return name + "_main";
     }
+    return name;
+  }
 
-    /**
-     * Return a reference to the specified port.
-     *
-     * The returned string will have one of the following forms:
-     *
-     * * selfStructs[k]->_lf_portName
-     * * selfStructs[k]->_lf_portName
-     * * selfStructs[k]->_lf_portName[i]
-     * * selfStructs[k]->_lf_parent.portName
-     * * selfStructs[k]->_lf_parent.portName[i]
-     * * selfStructs[k]->_lf_parent[j].portName
-     * * selfStructs[k]->_lf_parent[j].portName[i]
-     *
-     * where k is the runtime index of either the port's parent
-     * or the port's parent's parent, the latter when isNested is true.
-     * The index j is present if the parent is a bank, and
-     * the index i is present if the port is a multiport.
-     *
-     * The first two forms are used if isNested is false,
-     * and the remaining four are used if isNested is true.
-     * Set isNested to true when referencing a port belonging
-     * to a contained reactor.
-     *
-     * @param port The port.
-     * @param isNested True to return a reference relative to the parent's parent.
-     * @param includeChannelIndex True to include the channel index at the end.
-     * @param runtimeIndex A variable name to use to index the runtime instance or
-     *  null to use the default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
-     * @param bankIndex A variable name to use to index the bank or null to use the
-     *  default, the string returned by {@link CUtil#bankIndex(ReactorInstance)}.
-     * @param channelIndex A variable name to use to index the channel or null to
-     *  use the default, the string returned by {@link CUtil#channelIndex(PortInstance)}.
-     */
-    public static String portRef(
-            PortInstance port,
-            boolean isNested,
-            boolean includeChannelIndex,
-            String runtimeIndex,
-            String bankIndex,
-            String channelIndex
-    ) {
-        String channel = "";
-        if (channelIndex == null) channelIndex = channelIndex(port);
-        if (port.isMultiport() && includeChannelIndex) {
-            channel = "[" + channelIndex + "]";
-        }
-        if (isNested) {
-            return reactorRefNested(port.getParent(), runtimeIndex, bankIndex) + "." + port.getName() + channel;
-        } else {
-            String sourceStruct = CUtil.reactorRef(port.getParent(), runtimeIndex);
-            return sourceStruct + "->_lf_" + port.getName() + channel;
-        }
+  /**
+   * Return a reference to the specified port.
+   *
+   * <p>The returned string will have one of the following forms:
+   *
+   * <p>* selfStructs[k]->_lf_portName * selfStructs[k]->_lf_portName *
+   * selfStructs[k]->_lf_portName[i] * selfStructs[k]->_lf_parent.portName *
+   * selfStructs[k]->_lf_parent.portName[i] * selfStructs[k]->_lf_parent[j].portName *
+   * selfStructs[k]->_lf_parent[j].portName[i]
+   *
+   * <p>where k is the runtime index of either the port's parent or the port's parent's parent, the
+   * latter when isNested is true. The index j is present if the parent is a bank, and the index i
+   * is present if the port is a multiport.
+   *
+   * <p>The first two forms are used if isNested is false, and the remaining four are used if
+   * isNested is true. Set isNested to true when referencing a port belonging to a contained
+   * reactor.
+   *
+   * @param port The port.
+   * @param isNested True to return a reference relative to the parent's parent.
+   * @param includeChannelIndex True to include the channel index at the end.
+   * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
+   *     default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
+   * @param bankIndex A variable name to use to index the bank or null to use the default, the
+   *     string returned by {@link CUtil#bankIndex(ReactorInstance)}.
+   * @param channelIndex A variable name to use to index the channel or null to use the default, the
+   *     string returned by {@link CUtil#channelIndex(PortInstance)}.
+   */
+  public static String portRef(
+      PortInstance port,
+      boolean isNested,
+      boolean includeChannelIndex,
+      String runtimeIndex,
+      String bankIndex,
+      String channelIndex) {
+    String channel = "";
+    if (channelIndex == null) channelIndex = channelIndex(port);
+    if (port.isMultiport() && includeChannelIndex) {
+      channel = "[" + channelIndex + "]";
     }
+    if (isNested) {
+      return reactorRefNested(port.getParent(), runtimeIndex, bankIndex)
+          + "."
+          + port.getName()
+          + channel;
+    } else {
+      String sourceStruct = CUtil.reactorRef(port.getParent(), runtimeIndex);
+      return sourceStruct + "->_lf_" + port.getName() + channel;
+    }
+  }
 
   /**
    * Return a reference to the port on the self struct of the port's parent. This is used when an
@@ -494,23 +486,24 @@ public static String runtimeIndex(ReactorInstance reactor) {
     return result.toString();
   }
 
-    /**
-     * Return a unique type for the "self" struct of the specified
-     * reactor class from the reactor class.
-     * @param reactor The reactor class.
-     * @return The type of a self struct for the specified reactor class.
-     */
-    public static String selfType(Reactor reactor) {
-        if (reactor.isMain()) {
-            return "_" + CUtil.getName(reactor) + "_main_self_t";
-        }
-        return "_" + CUtil.getName(reactor) + "_self_t";
+  /**
+   * Return a unique type for the "self" struct of the specified reactor class from the reactor
+   * class.
+   *
+   * @param reactor The reactor class.
+   * @return The type of a self struct for the specified reactor class.
+   */
+  public static String selfType(Reactor reactor) {
+    if (reactor.isMain()) {
+      return "_" + CUtil.getName(reactor) + "_main_self_t";
     }
+    return "_" + CUtil.getName(reactor) + "_self_t";
+  }
 
-    /** Construct a unique type for the "self" struct of the class of the given reactor. */
-    public static String selfType(ReactorInstance instance) {
-        return selfType(ASTUtils.toDefinition(instance.getDefinition().getReactorClass()));
-    }
+  /** Construct a unique type for the "self" struct of the class of the given reactor. */
+  public static String selfType(ReactorInstance instance) {
+    return selfType(ASTUtils.toDefinition(instance.getDefinition().getReactorClass()));
+  }
 
   /**
    * Return a reference to the trigger_t struct of the specified trigger instance (input port or
@@ -849,9 +842,9 @@ public static boolean isTokenType(InferredType type, CTypes types) {
     return type.isVariableSizeList || targetType.trim().endsWith("*");
   }
 
-    public static String generateWidthVariable(String var) {
-        return var + "_width";
-    }
+  public static String generateWidthVariable(String var) {
+    return var + "_width";
+  }
 
   /**
    * If the type specification of the form {@code type[]}, {@code type*}, or {@code type}, return
diff --git a/org.lflang/src/org/lflang/util/LFCommand.java b/org.lflang/src/org/lflang/util/LFCommand.java
index a6be4cb690..749c150748 100644
--- a/org.lflang/src/org/lflang/util/LFCommand.java
+++ b/org.lflang/src/org/lflang/util/LFCommand.java
@@ -145,32 +145,24 @@ private void poll(Process process, CancelIndicator cancelIndicator) {
     }
   }
 
-
-    /**
-     * Execute the command.
-     * <p>
-     * Executing a process directly with `processBuilder.start()` could
-     * lead to a deadlock as the subprocess blocks when output or error
-     * buffers are full. This method ensures that output and error messages
-     * are continuously read and forwards them to the system output and
-     * error streams as well as to the output and error streams hold in
-     * this class.
-     * </p>
-     * <p>
-     * If the current operation is cancelled (as indicated
-     * by <code>cancelIndicator</code>), the subprocess
-     * is destroyed. Output and error streams until that
-     * point are still collected.
-     * </p>
-     *
-     * @param cancelIndicator The indicator of whether the underlying process
-     * should be terminated.
-     * @return the process' return code
-     * @author Christian Menard
-     */
-    public int run(CancelIndicator cancelIndicator) {
-        assert !didRun;
-        didRun = true;
+  /**
+   * Execute the command.
+   *
+   * <p>Executing a process directly with `processBuilder.start()` could lead to a deadlock as the
+   * subprocess blocks when output or error buffers are full. This method ensures that output and
+   * error messages are continuously read and forwards them to the system output and error streams
+   * as well as to the output and error streams hold in this class.
+   *
+   * <p>If the current operation is cancelled (as indicated by <code>cancelIndicator</code>), the
+   * subprocess is destroyed. Output and error streams until that point are still collected.
+   *
+   * @param cancelIndicator The indicator of whether the underlying process should be terminated.
+   * @return the process' return code
+   * @author Christian Menard
+   */
+  public int run(CancelIndicator cancelIndicator) {
+    assert !didRun;
+    didRun = true;
 
     System.out.println("--- Current working directory: " + processBuilder.directory().toString());
     System.out.println("--- Executing command: " + String.join(" ", processBuilder.command()));

From 67ee262ae5b575f674635fe33ec7475edafae0b1 Mon Sep 17 00:00:00 2001
From: Anirudh Rengarajan <44007330+arengarajan99@users.noreply.github.com>
Date: Thu, 4 May 2023 21:14:48 -0700
Subject: [PATCH 0116/1114] Add pair class to prevent reliance on Kotlin

---
 org.lflang/src/lib/c/reactor-c           |  2 +-
 org.lflang/src/org/lflang/util/Pair.java | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 org.lflang/src/org/lflang/util/Pair.java

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index 06f40da4b4..c25cd601c8 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 06f40da4b4f89ea5695c3f2970e6342c4af8426a
+Subproject commit c25cd601c817596cc24d75e365820d1bf5f3e32d
diff --git a/org.lflang/src/org/lflang/util/Pair.java b/org.lflang/src/org/lflang/util/Pair.java
new file mode 100644
index 0000000000..2de5923a30
--- /dev/null
+++ b/org.lflang/src/org/lflang/util/Pair.java
@@ -0,0 +1,21 @@
+package org.lflang.util;
+
+public class Pair<F, S> {
+    private final F first; 
+    private final S second; 
+
+    public Pair(F first, S second) {
+        this.first = first;
+        this.second = second;
+    }
+
+    public F getFirst() {
+        return first;
+    }
+
+    public S getSecond() {
+        return second;
+    }
+}
+
+//TimeValue maxSTP = findMaxSTP(connection, coordination);
\ No newline at end of file

From 10d6103940567afe3a3ead09563e855694048449 Mon Sep 17 00:00:00 2001
From: Anirudh Rengarajan <44007330+arengarajan99@users.noreply.github.com>
Date: Thu, 4 May 2023 21:15:00 -0700
Subject: [PATCH 0117/1114] Add attributespec for dependency pairs

---
 org.lflang/src/org/lflang/validation/AttributeSpec.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/org.lflang/src/org/lflang/validation/AttributeSpec.java b/org.lflang/src/org/lflang/validation/AttributeSpec.java
index a7a95e852c..78f8624a63 100644
--- a/org.lflang/src/org/lflang/validation/AttributeSpec.java
+++ b/org.lflang/src/org/lflang/validation/AttributeSpec.java
@@ -49,6 +49,7 @@ public class AttributeSpec {
 
     public static final String VALUE_ATTR = "value";
     public static final String NETWORK_MESSAGE_ACTIONS = "network_message_actions";
+    public static final String DEPENDENCY_PAIRS = "dependencyPairs";
     public static final String EACH_ATTR = "each";
 
     /** A map from a string to a supported AttributeSpec */
@@ -222,7 +223,9 @@ enum AttrParamType {
 
         ATTRIBUTE_SPECS_BY_NAME.put("_fed_config", new AttributeSpec(
             List.of(new AttrParamSpec(AttributeSpec.NETWORK_MESSAGE_ACTIONS,
-                                      AttrParamType.STRING, false))));
+                                      AttrParamType.STRING, false),
+                    new AttrParamSpec(AttributeSpec.DEPENDENCY_PAIRS, 
+                    AttrParamType.STRING, false))));
         ATTRIBUTE_SPECS_BY_NAME.put("_c_body", new AttributeSpec(null));
     }
 }

From 0d95385b6fada94e4a16a1b3e2f45935789e74ca Mon Sep 17 00:00:00 2001
From: Anirudh Rengarajan <44007330+arengarajan99@users.noreply.github.com>
Date: Thu, 4 May 2023 21:15:27 -0700
Subject: [PATCH 0118/1114] Add support for creating phantom edges for
 intrafederate dependencies through the network

---
 .../generator/ReactionInstanceGraph.java      | 44 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java b/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
index 2012b7f53b..a43e5a7eda 100644
--- a/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
+++ b/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
@@ -27,15 +27,21 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 package org.lflang.generator;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.eclipse.xtend.lib.macro.services.UpstreamTypeLookup;
+import org.lflang.AttributeUtils;
 import org.lflang.generator.ReactionInstance.Runtime;
 import org.lflang.generator.c.CUtil;
 import org.lflang.graph.PrecedenceGraph;
+import org.lflang.lf.Attribute;
 import org.lflang.lf.Variable;
+import org.lflang.validation.AttributeSpec;
 
 /**
  * This class analyzes the dependencies between reaction runtime instances.
@@ -86,8 +92,10 @@ public void rebuild() {
         this.clear();
         addNodesAndEdges(main);
 
+
         // FIXME: Use {@link TargetProperty#EXPORT_DEPENDENCY_GRAPH}.
         // System.out.println(toDOT());
+        addDependentNetworkEdges(main);
 
         // Assign a level to each reaction.
         // If there are cycles present in the graph, it will be detected here.
@@ -99,6 +107,39 @@ public void rebuild() {
             // throw new InvalidSourceException("Reactions form a cycle!");
         }
     }
+    /**
+     * Adds manually a set of dependent network edges as needed to nudge the level assignment
+     * algorithm into creating a correct level assignment.
+     * @param main
+     */
+    private void addDependentNetworkEdges(ReactorInstance main) {
+
+        Attribute attribute = AttributeUtils.findAttributeByName(main.definition.getReactorClass(), "_fed_config");
+        String actionsStr = AttributeUtils.getAttributeParameter(attribute, AttributeSpec.DEPENDENCY_PAIRS);
+        if (actionsStr == null) return; //No dependent network edges, the levels algorithm has enough information
+        List<String> dependencies = List.of(actionsStr.split(";", -1));
+        // Recursively add nodes and edges from contained reactors.
+        Map<String, ReactorInstance> m = new HashMap<>();
+        for (ReactorInstance child : main.children) {
+            m.put(child.getName(), child);
+        }
+        for(String dependency: dependencies){
+            List<String> dep = List.of(dependency.split(",", 2));
+            ReactorInstance downStream = m.getOrDefault(dep.get(0), null);
+            ReactorInstance upStream = m.getOrDefault(dep.get(1), null);
+            if(downStream == null || upStream == null) {
+                System.out.println("Downstream or Upstream reaction pair is undefined. Continuing.");
+                continue;
+            }
+            ReactionInstance down = downStream.reactions.get(0);
+            Runtime downRuntime = down.getRuntimeInstances().get(0);
+            for(ReactionInstance up: upStream.reactions){
+                Runtime upRuntime = up.getRuntimeInstances().get(0);
+                addEdge(downRuntime, upRuntime);
+            }
+        }
+        
+    }
     /**
      * This function rebuilds the graph and propagates and assigns deadlines
      * to all reactions.
@@ -106,6 +147,7 @@ public void rebuild() {
     public void rebuildAndAssignDeadlines() {
         this.clear();
         addNodesAndEdges(main);
+        addDependentNetworkEdges(main);
         assignInferredDeadlines();
         this.clear();
     }
@@ -298,7 +340,7 @@ private void assignLevels() {
                 removeEdge(effect, origin);
                 // If the effect node has no more incoming edges,
                 // then move it in the start set.
-                if (getUpstreamAdjacentNodes(effect).size() == 0) {
+                if (getUpstreamAdjacentNodes(effect).isEmpty()) {
                     start.add(effect);
                 }
             }

From 627c21a99069019bd08f0575e071a40cc712de7c Mon Sep 17 00:00:00 2001
From: Anirudh Rengarajan <44007330+arengarajan99@users.noreply.github.com>
Date: Thu, 4 May 2023 21:16:00 -0700
Subject: [PATCH 0119/1114] Add support for annotating the dependency list into
 the emitter

---
 .../federated/generator/FedMainEmitter.java   | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java b/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java
index fec90b6992..bed2379f52 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java
@@ -15,11 +15,15 @@
 import org.lflang.ErrorReporter;
 import org.lflang.ast.FormattingUtils;
 import org.lflang.generator.CodeBuilder;
+import org.lflang.generator.PortInstance;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.Variable;
 
+import org.lflang.util.Pair;
+
+
 /**
  * Helper class to generate a main reactor
  */
@@ -61,6 +65,26 @@ String generateMainReactor(FederateInstance federate, Reactor originalMainReacto
                ).indent(4).stripTrailing(),
                "}"
             );
+    }
+
+    private static String getDependencyList(FederateInstance federate, Pair<PortInstance, PortInstance> p){
+        //StringBuilder lst = new StringBuilder();
+        var inputPort = p.getFirst();
+        var outputPort = p.getSecond();
+        var inputPortInstance = federate.networkPortToInstantiation.getOrDefault(inputPort, null);
+        var outputPortInstance = federate.networkPortToInstantiation.getOrDefault(outputPort, null);
+        //var outputPortControlReaction = federate.networkPortToInstantiation.getOrDefault(outputPort, null);
+        if(inputPortInstance == null) return "";
+        //System.out.println("IP: " + inputPortReaction.getCode());
+        if(outputPortInstance != null){
+            //System.out.println("OP: " + outputPortReaction.toString());
+            return inputPortInstance.getName() + "," + outputPortInstance.getName();
+        }
+        return "";
+
+
+
+        
     }
 
     /**
@@ -85,12 +109,19 @@ private CharSequence generateMainSignature(FederateInstance federate, Reactor or
             .stream()
             .map(Variable::getName)
             .collect(Collectors.joining(","));
+        
+        List<String> vals = new ArrayList<>();
+        for (var pair: federate.networkReactionDependencyPairs){
+            vals.add(getDependencyList(federate, pair));
+        }
 
+        String intraDependencies = String.join(";", vals);
         return
         """
-        @_fed_config(network_message_actions="%s")
+        @_fed_config(network_message_actions="%s", dependencyPairs="%s")
         main reactor %s {
         """.formatted(networkMessageActionsListString,
+                      intraDependencies,
                       paramList.equals("()") ? "" : paramList);
     }
 }

From a28ee7f78b66f6d14a5e56d2261ffc817abeb761 Mon Sep 17 00:00:00 2001
From: Anirudh Rengarajan <44007330+arengarajan99@users.noreply.github.com>
Date: Thu, 4 May 2023 21:16:39 -0700
Subject: [PATCH 0120/1114] Clean up triggers and add additional pointers for
 network reactions

---
 .../federated/extensions/CExtension.java      |  19 ++-
 .../federated/extensions/CExtensionUtils.java | 143 +++++++++++-------
 2 files changed, 106 insertions(+), 56 deletions(-)

diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtension.java b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
index 3800ec6628..29230663d7 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
@@ -523,10 +523,16 @@ protected String makePreamble(
 
         int numOfNetworkReactions = federate.networkReceiverReactions.size();
         code.pr("""
-        reaction_t* upstreamPortReactions[%1$s];
-        size_t num_upstream_port_dependencies = %1$s;
+        reaction_t* networkInputReactions[%1$s];
+        size_t numNetworkInputReactions = %1$s;
         """.formatted(numOfNetworkReactions));
 
+        int numOfNetworkSenderControlReactions = federate.networkSenderControlReactions.size();
+        code.pr("""
+        reaction_t* portAbsentReaction[%1$s];
+        size_t numSenderReactions = %1$s;
+        """.formatted(numOfNetworkSenderControlReactions));
+
         code.pr(generateSerializationPreamble(federate, fileConfig));
 
         code.pr(generateExecutablePreamble(federate, rtiConfig, errorReporter));
@@ -563,7 +569,9 @@ private String generateInitializeTriggers(FederateInstance federate, ErrorReport
         federatedReactor.setName(federate.name);
         var main = new ReactorInstance(federatedReactor, errorReporter, -1);
         code.pr(CExtensionUtils.initializeTriggersForNetworkActions(federate, main, errorReporter));
-        code.pr(CExtensionUtils.upstreamPortReactions(federate, main));
+        //code.pr(CExtensionUtils.initializeTriggersForControlReactions(federate, main, errorReporter));
+        //code.pr(CExtensionUtils.networkInputReactions(federate, main));
+        //code.pr(CExtensionUtils.portAbsentReaction(federate, main));
         federatedReactor.setName(oldFederatedReactorName);
 
         return """
@@ -586,7 +594,7 @@ private String generateExecutablePreamble(FederateInstance federate, RtiConfig r
 
         code.pr(generateCodeToInitializeFederate(federate, rtiConfig));
 
-        code.pr(CExtensionUtils.allocateTriggersForFederate(federate));
+        //code.pr(CExtensionUtils.allocateTriggersForFederate(federate));
 
         return """
             void _lf_executable_preamble() {
@@ -606,7 +614,8 @@ private String generateCodeToInitializeFederate(FederateInstance federate, RtiCo
         code.pr(String.join("\n",
                             "// Initialize the socket mutex",
                             "lf_mutex_init(&outbound_socket_mutex);",
-                            "lf_cond_init(&port_status_changed, &mutex);"
+                            "lf_cond_init(&port_status_changed, &mutex);",
+                            CExtensionUtils.surroundWithIfFederatedDecentralized("lf_cond_init(&logical_time_changed, &mutex);")
         ));
 
         // Find the STA (A.K.A. the global STP offset) for this federate.
diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
index 2c762cfef8..d05c563755 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
@@ -122,59 +122,75 @@ public static String initializeTriggersForNetworkActions(FederateInstance federa
      *
      * @param instance  The reactor instance that is at any level of the
      *                  hierarchy within the federate.
-     * @param federate  The top-level federate
+     * @param errorReporter  The top-level federate
      * @return A string that initializes the aforementioned three structures.
      */
-    public static String initializeTriggerForControlReactions(
-            ReactorInstance instance,
-            ReactorInstance main,
-            FederateInstance federate
-    ) {
-        CodeBuilder builder = new CodeBuilder();
-        // The network control reactions are always in the main federated
-        // reactor
-        if (instance != main) {
-            return "";
-        }
-
-        ReactorDecl reactorClass = instance.getDefinition().getReactorClass();
-        Reactor reactor = ASTUtils.toDefinition(reactorClass);
-        String nameOfSelfStruct = CUtil.reactorRef(instance);
-
-        // Initialize triggers for network input control reactions
-        for (Action trigger : federate.networkInputControlReactionsTriggers) {
-            // Check if the trigger belongs to this reactor instance
-            if (ASTUtils.allReactions(reactor).stream().anyMatch(r -> {
-                return r.getTriggers().stream().anyMatch(t -> {
-                    if (t instanceof VarRef) {
-                        return ((VarRef) t).getVariable().equals(trigger);
-                    } else {
-                        return false;
-                    }
-                });
-            })) {
-                // Initialize the triggers_for_network_input_control_reactions for the input
-                builder.pr(
-                    String.join("\n",
-                        "/* Add trigger " + nameOfSelfStruct + "->_lf__"+trigger.getName()+" to the global list of network input ports. */ \\",
-                        "_fed.triggers_for_network_input_control_reactions["+federate.networkInputControlReactionsTriggers.indexOf(trigger)+"]= \\",
-                        "    &"+nameOfSelfStruct+"->_lf__"+trigger.getName()+"; \\"
-                    )
-                );
-            }
-        }
-
-        nameOfSelfStruct = CUtil.reactorRef(instance);
-
-        // Initialize the trigger for network output control reactions if it doesn't exist.
-        if (federate.networkOutputControlReactionsTrigger != null) {
-            builder.pr("_fed.trigger_for_network_output_control_reactions=&"
-                    + nameOfSelfStruct
-                    + "->_lf__outputControlReactionTrigger; \\");
-        }
-
-        return builder.getCode();
-    }
+    // public static String initializeTriggersForControlReactions(
+    //         FederateInstance instance,
+    //         ReactorInstance main,
+    //         ErrorReporter errorReporter
+    // ) {
+    //     CodeBuilder builder = new CodeBuilder();
+
+    //     if (federate.networkSenderControlReactions.size() > 0) {
+    //         // Create a static array of trigger_t pointers.
+    //         // networkMessageActions is a list of Actions, but we
+    //         // need a list of trigger struct names for ActionInstances.
+    //         // There should be exactly one ActionInstance in the
+    //         // main reactor for each Action.
+    //         var triggers = new LinkedList<String>();
+    //         for (int i = 0; i < federate.networkSenderControlReactions.size(); ++i) {
+    //             // Find the corresponding ActionInstance.
+    //             Action action = federate.networkMessageActions.get(i);
+    //             var reactor = main.lookupReactorInstance(federate.networkReceiverInstantiations.get(i));
+    //             var actionInstance = reactor.lookupActionInstance(action);
+    //             triggers.add(CUtil.actionRef(actionInstance, null));
+    //         }
+    //         var actionTableCount = 0;
+    //         for (String trigger : triggers) {
+    //             code.pr("_lf_action_table[" + (actionTableCount++) + "] = (lf_action_base_t*)&"
+    //                         + trigger + "; \\");
+    //         }
+    //     }
+
+    //     ReactorDecl reactorClass = instance.getDefinition().getReactorClass();
+    //     Reactor reactor = ASTUtils.toDefinition(reactorClass);
+    //     String nameOfSelfStruct = CUtil.reactorRef(instance);
+
+    //     // Initialize triggers for network input control reactions
+    //     for (Action trigger : errorReporter.networkInputControlReactionsTriggers) {
+    //         // Check if the trigger belongs to this reactor instance
+    //         if (ASTUtils.allReactions(reactor).stream().anyMatch(r -> {
+    //             return r.getTriggers().stream().anyMatch(t -> {
+    //                 if (t instanceof VarRef) {
+    //                     return ((VarRef) t).getVariable().equals(trigger);
+    //                 } else {
+    //                     return false;
+    //                 }
+    //             });
+    //         })) {
+    //             // Initialize the triggers_for_network_input_control_reactions for the input
+    //             builder.pr(
+    //                 String.join("\n",
+    //                     "/* Add trigger " + nameOfSelfStruct + "->_lf__"+trigger.getName()+" to the global list of network input ports. */ \\",
+    //                     "_fed.triggers_for_network_input_control_reactions["+errorReporter.networkInputControlReactionsTriggers.indexOf(trigger)+"]= \\",
+    //                     "    &"+nameOfSelfStruct+"->_lf__"+trigger.getName()+"; \\"
+    //                 )
+    //             );
+    //         }
+    //     }
+
+    //     nameOfSelfStruct = CUtil.reactorRef(instance);
+
+    //     // Initialize the trigger for network output control reactions if it doesn't exist.
+    //     if (errorReporter.networkOutputControlReactionsTrigger != null) {
+    //         builder.pr("_fed.trigger_for_network_output_control_reactions=&"
+    //                 + nameOfSelfStruct
+    //                 + "->_lf__outputControlReactionTrigger; \\");
+    //     }
+
+    //     return builder.getCode();
+    // }
 
     /**
      * Create a port status field variable for a network input port "input" in
@@ -606,4 +622,29 @@ public static CharSequence upstreamPortReactions(FederateInstance federate, Reac
         }
         return code.getCode();
     }
+
+    public static CharSequence downstreamControlPortReactions(FederateInstance federate, ReactorInstance main) {
+        CodeBuilder code = new CodeBuilder();
+        if (!federate.networkSenderControlReactions.isEmpty()) {
+            // Create a static array of trigger_t pointers.
+            // networkMessageActions is a list of Actions, but we
+            // need a list of trigger struct names for ActionInstances.
+            // There should be exactly one ActionInstance in the
+            // main reactor for each Action.
+            var reactions = new LinkedList<String>();
+            for (int i = 0; i < federate.networkSenderControlReactions.size(); ++i) {
+                // Find the corresponding ActionInstance.
+                var reaction = federate.networkSenderControlReactions.get(i);
+                var reactor = main.lookupReactorInstance(federate.networkSenderInstantiations.get(i));
+                var reactionInstance = reactor.lookupReactionInstance(reaction);
+                reactions.add(CUtil.reactionRef(reactionInstance));
+            }
+            var tableCount = 0;
+            for (String react: reactions) {
+                code.pr("downstreamControlPortReactions[" + (tableCount++) + "] = (reaction_t*)&" + react + "; \\");
+            }
+        }
+        return code.getCode();
+    }
 }
+

From 4185b3ccda0c781608af0bf39ee2f9398a15c440 Mon Sep 17 00:00:00 2001
From: Anirudh Rengarajan <44007330+arengarajan99@users.noreply.github.com>
Date: Sat, 6 May 2023 20:30:56 -0700
Subject: [PATCH 0121/1114] Add additional maps to support adding phantom
 dependencies in the level assignment

---
 .../federated/generator/FedASTUtils.java      | 153 ++++++++++--------
 .../federated/generator/FederateInstance.java |  26 ++-
 2 files changed, 107 insertions(+), 72 deletions(-)

diff --git a/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java b/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
index 3d0b2731fd..65fc968968 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
@@ -71,9 +71,11 @@
 import org.lflang.lf.Type;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
+import org.lflang.util.Pair;
 
 import com.google.common.collect.Iterators;
 
+
 /**
  * A helper class for AST transformations needed for federated
  * execution.
@@ -163,12 +165,12 @@ public static void makeCommunication(
         //         connection.getDefinition().getDelay()
         //             == null // Connections that have delays don't need control reactions
         // ) {
-        //     // Add the network output control reaction to the parent
-        //     FedASTUtils.addNetworkOutputControlReaction(connection);
+            // Add the network output control reaction to the parent
+        FedASTUtils.addNetworkOutputControlReaction(connection);
 
-        //     // Add the network input control reaction to the parent
-        //     FedASTUtils.addNetworkInputControlReaction(connection, coordination, errorReporter);
-        // }
+            // Add the network input control reaction to the parent
+            //FedASTUtils.addNetworkInputControlReaction(connection, coordination, errorReporter);
+        //}
 
         // Add the network receiver reactor in the destinationFederate
         addNetworkReceiverReactor(
@@ -177,6 +179,8 @@ public static void makeCommunication(
             resource,
             errorReporter
         );
+
+        TimeValue maxSTP = findMaxSTP(connection, coordination);
     }
 
     public static int networkMessageActionID = 0;
@@ -278,6 +282,7 @@ private static void addNetworkReceiverReactor(
         EObject node = IteratorExtensions.findFirst(resource.getAllContents(), Model.class::isInstance);
         ((Model) node).getReactors().add(receiver);
         receiver.setName("NetworkReceiver_" + networkIDReceiver++);
+        //networkReceiverReaction.setName("NetworkReceiverReaction_" + networkIDReceiver++);
 
 
         networkInstance.setReactorClass(receiver);
@@ -362,18 +367,19 @@ private static void addNetworkReceiverReactor(
         connection.dstFederate.networkReactors.add(receiver);
         connection.dstFederate.networkConnections.add(receiverFromReaction);
         connection.dstFederate.networkReceiverInstantiations.add(networkInstance);
-
-
-        // if (
-        //     !connection.getDefinition().isPhysical() &&
-        //         // Connections that are physical don't need control reactions
-        //         connection.getDefinition().getDelay()
-        //             == null // Connections that have delays don't need control reactions
-        // ) {
-        //     // Add necessary dependencies to reaction to ensure that it executes correctly
-        //     // relative to other network input control reactions in the federate.
-        //     //addRelativeDependency(connection, networkReceiverReaction, errorReporter);
-        // }
+        connection.dstFederate.networkPortToInstantiation.put(connection.getDestinationPortInstance(), networkInstance);
+        //System.out.println(connection.getSourcePortInstance());
+
+        if (
+            !connection.getDefinition().isPhysical() &&
+                // Connections that are physical don't need control reactions
+                connection.getDefinition().getDelay()
+                    == null // Connections that have delays don't need control reactions
+        ) {
+            // Add necessary dependency annotations to federate to ensure the level 
+            // assigner has enough information to correctly assign levels without introducing deadlock
+            addRelativeDependencyAnnotation(connection, networkReceiverReaction, errorReporter);
+        }
     }
 
     /**
@@ -475,7 +481,7 @@ private static void addNetworkInputControlReaction(
      * zero-delay cycle inside the federate by adding an artificial dependency from the output port of this federate
      * that is involved in the cycle to the signature of {@code networkInputReaction} as a source.
      */
-    private static void addRelativeDependency(
+    private static void addRelativeDependencyAnnotation(
         FedConnectionInstance connection,
         Reaction networkInputReaction,
         ErrorReporter errorReporter) {
@@ -489,21 +495,25 @@ private static void addRelativeDependency(
 
         ModelInfo info = new ModelInfo();
         for (var port: upstreamOutputPortsInFederate) {
-            VarRef sourceRef = ASTUtils.factory.createVarRef();
-
-            sourceRef.setContainer(port.getParent().getDefinition());
-            sourceRef.setVariable(port.getDefinition());
-            networkInputReaction.getSources().add(sourceRef);
+            //VarRef sourceRef = ASTUtils.factory.createVarRef();
+            connection.dstFederate.networkReactionDependencyPairs.add(
+                new Pair<PortInstance, PortInstance>(connection.getDestinationPortInstance(), port)
+            );
 
-            // Remove the port if it introduces cycles
-            info.update(
-                   (Model)networkInputReaction.eContainer().eContainer(),
-                    errorReporter
-                    );
-            if (!info.topologyCycles().isEmpty()) {
-                    networkInputReaction.getSources().remove(sourceRef);
-                }
+            //sourceRef.setContainer(port.getParent().getDefinition());
+            //sourceRef.setVariable(port.getDefinition());
+            // networkInputReaction.getSources().add(sourceRef);
+
+            // // Remove the port if it introduces cycles
+            // info.update(
+            //        (Model)networkInputReaction.eContainer().eContainer(),
+            //         errorReporter
+            //         );
+            // if (!info.topologyCycles().isEmpty()) {
+            //         networkInputReaction.getSources().remove(sourceRef);
+            //     }
         }
+        //System.out.println(connection.dstFederate.networkReactionDependencyPairs);
 
     }
 
@@ -741,17 +751,13 @@ public static <E> List<E> safe(List<E> list) {
     public static int networkIDSender = 0;
     public static int networkIDReceiver = 0;
 
-    private static Map<FederateInstance, Reactor> networkSenderReactors = new HashMap<>();
+    private static Map<FedConnectionInstance, Reactor> networkSenderReactors = new HashMap<>();
     private static Map<FederateInstance, Instantiation> networkSenderInstantiations  = new HashMap<>();
 
 
     private static Reactor getNetworkSenderReactor(FedConnectionInstance connection, 
     CoordinationType coordination, Resource resource, ErrorReporter errorReporter) {
         LfFactory factory = LfFactory.eINSTANCE;
-        // Reactor classDef = networkSenderReactors.getOrDefault(connection.srcFederate, null);
-        // if (classDef != null) {
-        //     return classDef;
-        // }
         Type type = EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getType());
 
         //Initialize Reactor and Reaction AST Nodes
@@ -769,6 +775,7 @@ private static Reactor getNetworkSenderReactor(FedConnectionInstance connection,
         EObject node = IteratorExtensions.findFirst(resource.getAllContents(), Model.class::isInstance);
         ((Model) node).getReactors().add(sender);
         sender.setName("NetworkSender_" + networkIDSender++);
+        //networkSenderReaction.setName("NetworkSenderReaction_" + networkIDSender++);
 
         // FIXME: do not create a new extension every time it is used
         FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
@@ -806,7 +813,7 @@ private static Reactor getNetworkSenderReactor(FedConnectionInstance connection,
         connection.srcFederate.networkSenderReactions.add(networkSenderReaction);
         connection.srcFederate.networkReactors.add(sender);
 
-        networkSenderReactors.put(connection.srcFederate, sender);
+        networkSenderReactors.put(connection, sender);
         return sender;
                                
     }
@@ -874,6 +881,7 @@ private static void addNetworkSenderReactor(
 
         connection.srcFederate.networkConnections.add(senderToReaction);
         connection.srcFederate.networkSenderInstantiations.add(networkInstance);
+        connection.srcFederate.networkPortToInstantiation.put(connection.getSourcePortInstance(), networkInstance);
     }
 
     /**
@@ -887,15 +895,12 @@ private static void addNetworkSenderReactor(
     private static void addNetworkOutputControlReaction(FedConnectionInstance connection) {
         LfFactory factory = LfFactory.eINSTANCE;
         Reaction reaction = factory.createReaction();
-        Reactor top = connection.getSourcePortInstance()
-                                .getParent()
-                                .getParent().reactorDefinition; // Top-level reactor.
-
+        Reactor top = networkSenderReactors.getOrDefault(connection, null);
+        
         // Add the output from the contained reactor as a source to
         // the reaction to preserve precedence order.
         VarRef newPortRef = factory.createVarRef();
-        newPortRef.setContainer(connection.getSourcePortInstance().getParent().getDefinition());
-        newPortRef.setVariable(connection.getSourcePortInstance().getDefinition());
+        newPortRef.setVariable(top.getInputs().get(0));
         reaction.getSources().add(newPortRef);
 
         // If the sender or receiver is in a bank of reactors, then we want
@@ -910,42 +915,44 @@ private static void addNetworkOutputControlReaction(FedConnectionInstance connec
         // trigger output control reactions. That action is created once
         // and recorded in the federate instance.
         // Check whether the action already has been created.
-        if (connection.srcFederate.networkOutputControlReactionsTrigger == null) {
-            // The port has not been created.
-            String triggerName = "outputControlReactionTrigger";
-
-            // Find the trigger definition in the reactor definition, which could have been
-            // generated for another federate instance if there are multiple instances
-            // of the same reactor that are each distinct federates.
-            Optional<Action> optTriggerInput
-                = top.getActions().stream().filter(
-                I -> I.getName().equals(triggerName)).findFirst();
-
-            if (optTriggerInput.isEmpty()) {
+        // if (connection.srcFederate.networkOutputControlReactionsTrigger == null) {
+        //     // The port has not been created.
+        //     String triggerName = "outputControlReactionTrigger";
+
+        //     // Find the trigger definition in the reactor definition, which could have been
+        //     // generated for another federate instance if there are multiple instances
+        //     // of the same reactor that are each distinct federates.
+        //     Optional<Action> optTriggerInput
+        //         = top.getActions().stream().filter(
+        //         I -> I.getName().equals(triggerName)).findFirst();
+
+            // if (optTriggerInput.isEmpty()) {
                 // If no trigger with the name "outputControlReactionTrigger" is
                 // already added to the reactor definition, we need to create it
                 // for the first time. The trigger is a logical action.
-                Action newTriggerForControlReactionVariable = factory.createAction();
-                newTriggerForControlReactionVariable.setName(triggerName);
-                newTriggerForControlReactionVariable.setOrigin(ActionOrigin.LOGICAL);
-                top.getActions().add(newTriggerForControlReactionVariable);
-
-                // Now that the variable is created, store it in the federate instance
-                connection.srcFederate.networkOutputControlReactionsTrigger
-                    = newTriggerForControlReactionVariable;
-            } else {
+        Action newTriggerForControlReactionVariable = factory.createAction();
+        newTriggerForControlReactionVariable.setName("outputControlReactionTrigger");
+        newTriggerForControlReactionVariable.setOrigin(ActionOrigin.LOGICAL);
+        top.getActions().add(newTriggerForControlReactionVariable);
+
+                // // Now that the variable is created, store it in the federate instance
+                // connection.srcFederate.networkOutputControlReactionsTrigger
+            //         = newTriggerForControlReactionVariable;
+            // } else {
                 // If the "outputControlReactionTrigger" trigger is already
                 // there, we can re-use it for this new reaction since a single trigger
                 // will trigger
-                // all network output control reactions.
-                connection.srcFederate.networkOutputControlReactionsTrigger = optTriggerInput.get();
-            }
-        }
+            //     // all network output control reactions.
+            //     connection.srcFederate.networkOutputControlReactionsTrigger = optTriggerInput.get();
+            // }
+        //}
 
         // Add the trigger for all output control reactions to the list of triggers
         VarRef triggerRef = factory.createVarRef();
-        triggerRef.setVariable(connection.srcFederate.networkOutputControlReactionsTrigger);
+        triggerRef.setVariable(newTriggerForControlReactionVariable);
         reaction.getTriggers().add(triggerRef);
+        //int val = networkIDSender-1;
+        //reaction.setName("NetworkSenderControlReaction_" + val);
 
         // Generate the code
         reaction.setCode(factory.createCode());
@@ -961,6 +968,12 @@ private static void addNetworkOutputControlReaction(FedConnectionInstance connec
 
         // Add the network output control reaction to the federate instance's list
         // of network reactions
-        //connection.srcFederate.networkReactions.add(reaction);
+        connection.srcFederate.networkSenderReactions.add(reaction);
+        connection.srcFederate.networkSenderControlReactions.add(reaction);
+
+        //connection.srcFederate.networkPortToControlReaction.put(connection.getSourcePortInstance(), reaction);
+        //connection.srcFederate.networkOutputControlReactionsTriggers.add(newTriggerForControlReactionVariable);
+
+
     }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FederateInstance.java b/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
index d44fcc5f62..f0197083bc 100644
--- a/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
+++ b/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
@@ -27,6 +27,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -69,10 +70,12 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.lf.TriggerRef;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
+import org.lflang.util.Pair;
 
 import com.google.common.base.Objects;
 
 
+
 /**
  * Instance of a federate, or marker that no federation has been defined
  * (if isSingleton() returns true) FIXME: this comment makes no sense.
@@ -227,7 +230,7 @@ public Instantiation getInstantiation() {
     public List<Action> networkInputControlReactionsTriggers = new ArrayList<>();
     
     /**
-     * The trigger that triggers the output control reaction of this
+     * The triggers that trigger the output control reactions of this
      * federate.
      * 
      * The network output control reactions send a PORT_ABSENT message for a network output port,
@@ -235,7 +238,7 @@ public Instantiation getInstantiation() {
      * be present on the given network port, allowing input control reactions on those federates
      * to stop blocking.
      */
-    public Variable networkOutputControlReactionsTrigger = null;
+    public List<Action> networkOutputControlReactionsTriggers = new ArrayList<>();
     
     /**
      * Indicates whether the federate is remote or local
@@ -252,6 +255,12 @@ public Instantiation getInstantiation() {
      */
     public List<Reaction> networkSenderReactions = new ArrayList<>();
 
+    /**
+     * List of generated network control reactions (network sender) that belong to this federate instance.
+     */
+    public List<Reaction> networkSenderControlReactions = new ArrayList<>();
+    
+
     /**
      * List of generated network reactors (network input and outputs) that
      * belong to this federate instance.
@@ -259,6 +268,18 @@ public Instantiation getInstantiation() {
     public List<Reactor> networkReactors = new ArrayList<>();
 
 
+    /**
+     * List of relative dependencies between network input and output reactions belonging to
+     * the same federate that have zero logical delay between them.
+     */
+    public List<Pair<PortInstance, PortInstance>> networkReactionDependencyPairs = new ArrayList<>();
+
+    /**
+     * Mapping from a port instance of a connection to its associated network reaction. We populate
+     * this map as we process connections as a means of annotating intra-federate dependencies
+     */
+    public Map<PortInstance, Instantiation> networkPortToInstantiation = new HashMap<>();
+
     /**
      * List of generated network connections (network input and outputs) that
      * belong to this federate instance.
@@ -271,6 +292,7 @@ public Instantiation getInstantiation() {
      * belong to this federate instance.
      */
     public List<Instantiation> networkSenderInstantiations = new ArrayList<>();
+
     /**
      * List of generated network instantiations (network input and outputs) that
      * belong to this federate instance.

From 58d86a188d20462584eae764712dc3214ae2125d Mon Sep 17 00:00:00 2001
From: Anirudh Rengarajan <44007330+arengarajan99@users.noreply.github.com>
Date: Sat, 6 May 2023 20:31:00 -0700
Subject: [PATCH 0122/1114] Fixed comment

---
 org.lflang/src/org/lflang/federated/generator/FedGenerator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/org/lflang/federated/generator/FedGenerator.java b/org.lflang/src/org/lflang/federated/generator/FedGenerator.java
index c0627a3b77..2142804f0e 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedGenerator.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedGenerator.java
@@ -145,7 +145,7 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
 
         // Find all the connections between federates.
         // For each connection between federates, replace it in the
-        // AST with an action (which inherits the delay) and four reactions.
+        // AST with an action (which inherits the delay) and three reactions.
         // The action will be physical for physical connections and logical
         // for logical connections.
         replaceFederateConnectionsWithProxies(federation, resource);

From 37f9641ff1482ed49a8679afd60a299ccf957030 Mon Sep 17 00:00:00 2001
From: Anirudh Rengarajan <44007330+arengarajan99@users.noreply.github.com>
Date: Sat, 6 May 2023 22:45:59 -0700
Subject: [PATCH 0123/1114] Add STAA support in LFC

---
 .../federated/extensions/CExtension.java      | 28 +++++++++++++
 .../federated/extensions/CExtensionUtils.java | 40 +++++++++++++++++++
 .../federated/generator/FedASTUtils.java      | 21 +++++++++-
 .../federated/generator/FederateInstance.java | 18 +++++++++
 4 files changed, 106 insertions(+), 1 deletion(-)

diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtension.java b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
index 29230663d7..3f84050ee9 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
@@ -533,10 +533,20 @@ protected String makePreamble(
         size_t numSenderReactions = %1$s;
         """.formatted(numOfNetworkSenderControlReactions));
 
+
+        int numOfSTAAOffsets = federate.stpOffsets.size();
+        code.pr(CExtensionUtils.surroundWithIfFederatedDecentralized("""
+            staa_t* staa_lst[%1$s];
+            size_t staa_lst_size = %1$s;
+        """.formatted(numOfSTAAOffsets)));
+        
+
         code.pr(generateSerializationPreamble(federate, fileConfig));
 
         code.pr(generateExecutablePreamble(federate, rtiConfig, errorReporter));
         
+        code.pr(generateSTAAInitialization(federate, rtiConfig, errorReporter));
+
         code.pr(generateInitializeTriggers(federate, errorReporter));
 
         code.pr(CExtensionUtils.generateFederateNeighborStructure(federate));
@@ -569,6 +579,7 @@ private String generateInitializeTriggers(FederateInstance federate, ErrorReport
         federatedReactor.setName(federate.name);
         var main = new ReactorInstance(federatedReactor, errorReporter, -1);
         code.pr(CExtensionUtils.initializeTriggersForNetworkActions(federate, main, errorReporter));
+        code.pr("staa_initialization(); \\");
         //code.pr(CExtensionUtils.initializeTriggersForControlReactions(federate, main, errorReporter));
         //code.pr(CExtensionUtils.networkInputReactions(federate, main));
         //code.pr(CExtensionUtils.portAbsentReaction(federate, main));
@@ -603,6 +614,23 @@ void _lf_executable_preamble() {
             """.formatted(code.toString().indent(4).stripTrailing());
     }
 
+     /**
+     * Generate code for an executed preamble.
+     *
+     */
+    private String generateSTAAInitialization(FederateInstance federate, RtiConfig rtiConfig, ErrorReporter errorReporter) {
+        CodeBuilder code = new CodeBuilder();
+        code.pr(CExtensionUtils.surroundWithIfFederatedDecentralized(CExtensionUtils.stpStructs(federate, errorReporter)));
+        
+        //code.pr(CExtensionUtils.allocateTriggersForFederate(federate));
+
+        return """
+            void staa_initialization() {
+            %s
+            }
+            """.formatted(code.toString().indent(4).stripTrailing());
+    }
+
     /**
      * Generate code to initialize the {@code federate}.
      * @param rtiConfig
diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
index d05c563755..67442c0cd2 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -108,6 +109,45 @@ public static String initializeTriggersForNetworkActions(FederateInstance federa
         return code.getCode();
     }
 
+    /**
+     * Generate C code that holds a sorted list of STP structs by time.
+     *
+     * For decentralized execution, on every logical timestep, a thread will iterate through 
+     * each staa struct, wait for the designated offset time, and set the associated port status to absent
+     * if it isn't known.
+     * @param federate The federate.
+     * @param main The main reactor that contains the federate (used to lookup references).
+     * @return
+     */
+    public static String stpStructs(FederateInstance federate, ErrorReporter errorReporter) {
+        CodeBuilder code = new CodeBuilder();
+        Collections.sort(federate.stpOffsets, (d1, d2) -> {
+            return (int) (d1.time - d2.time);
+        });
+        if (!federate.stpOffsets.isEmpty()) {
+            // Create a static array of trigger_t pointers.
+            // networkMessageActions is a list of Actions, but we
+            // need a list of trigger struct names for ActionInstances.
+            // There should be exactly one ActionInstance in the
+            // main reactor for each Action.
+            for (int i = 0; i < federate.stpOffsets.size(); ++i) {
+                // Find the corresponding ActionInstance.
+                List<Action> networkActions = federate.stpToNetworkActionMap.get(federate.stpOffsets.get(i));
+                
+                code.pr("staa_lst[" + i + "] = (staa_t*) malloc(sizeof(staa_t));");
+                code.pr("staa_lst[" + i + "]->STAA = " + CTypes.getInstance().getTargetTimeExpr(federate.stpOffsets.get(i)) + ";");
+                code.pr("staa_lst[" + i + "]->numActions = " + networkActions.size() + ";");
+                code.pr("staa_lst[" + i + "]->actions = (lf_action_base_t**) malloc(sizeof(lf_action_base_t*) * " + networkActions.size() + ");");
+                var tableCount = 0;
+                for(Action action: networkActions){
+                    code.pr("staa_lst[" + i + "]->actions[" + (tableCount++) + "] = _lf_action_table["
+                            + federate.networkMessageActions.indexOf(action) + "];");
+                }
+            }
+        }
+        return code.getCode();
+    }
+
     /**
      * Generate C code that initializes three critical structures that support
      * network control reactions:
diff --git a/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java b/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
index 65fc968968..11d6b53350 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
@@ -180,7 +180,6 @@ public static void makeCommunication(
             errorReporter
         );
 
-        TimeValue maxSTP = findMaxSTP(connection, coordination);
     }
 
     public static int networkMessageActionID = 0;
@@ -298,6 +297,25 @@ private static void addNetworkReceiverReactor(
         // Keep track of this action in the destination federate.
         connection.dstFederate.networkMessageActions.add(networkAction);
 
+
+        TimeValue maxSTP = findMaxSTP(connection, coordination);
+
+        if(!connection.dstFederate.currentSTPOffsets.contains(maxSTP.time)) {
+            connection.dstFederate.currentSTPOffsets.add(maxSTP.time);
+            connection.dstFederate.stpOffsets.add(maxSTP);
+            connection.dstFederate.stpToNetworkActionMap.put(maxSTP, new ArrayList<>());
+        } else {
+            // TODO: Find more efficient way to reuse timevalues
+            for(var offset: connection.dstFederate.stpOffsets){
+                if(maxSTP.time == offset.time) {
+                    maxSTP = offset;
+                    break;
+                }
+            }
+        }
+
+        connection.dstFederate.stpToNetworkActionMap.get(maxSTP).add(networkAction);
+
         // Add the action definition to the parent reactor.
         receiver.getActions().add(networkAction);
 
@@ -368,6 +386,7 @@ private static void addNetworkReceiverReactor(
         connection.dstFederate.networkConnections.add(receiverFromReaction);
         connection.dstFederate.networkReceiverInstantiations.add(networkInstance);
         connection.dstFederate.networkPortToInstantiation.put(connection.getDestinationPortInstance(), networkInstance);
+        connection.dstFederate.networkActionToInstantiation.put(networkAction, networkInstance);
         //System.out.println(connection.getSourcePortInstance());
 
         if (
diff --git a/org.lflang/src/org/lflang/federated/generator/FederateInstance.java b/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
index f0197083bc..101ebf4766 100644
--- a/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
+++ b/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
@@ -309,6 +309,23 @@ public Instantiation getInstantiation() {
      */
     public HashSet<SupportedSerializers> enabledSerializers = new HashSet<>();
 
+    /**
+     * Keep a unique list of enabled serializers
+     */
+    public List<TimeValue> stpOffsets = new ArrayList<>();
+
+    public Set<Long> currentSTPOffsets = new HashSet<>();
+
+    /**
+     * Keep a map of STP values to a list of network actions
+     */
+    public HashMap<TimeValue, List<Action>> stpToNetworkActionMap = new HashMap<>(); 
+
+    /**
+     * Keep a map of network actions to their associated instantiations
+     */
+    public HashMap<Action, Instantiation> networkActionToInstantiation = new HashMap<>(); 
+
     /**
      * Return true if the specified EObject should be included in the code
      * generated for this federate.
@@ -669,6 +686,7 @@ public String toString() {
      * An error reporter
      */
     private final ErrorReporter errorReporter;
+
     
     /**
      * Find the nearest (shortest) path to a physical action trigger from this

From 214211a803005219ed890b78d005ea1e2c1857c6 Mon Sep 17 00:00:00 2001
From: Anirudh Rengarajan <44007330+arengarajan99@users.noreply.github.com>
Date: Sun, 7 May 2023 19:01:23 -0700
Subject: [PATCH 0124/1114] Change ref of reactor-c

---
 org.lflang/src/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index c25cd601c8..366c6d4fa3 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit c25cd601c817596cc24d75e365820d1bf5f3e32d
+Subproject commit 366c6d4fa3067b7d15f2c846e190d29d7582bae9

From 45e757fb754f28a5c5d64735614207571ef1de8d Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Tue, 16 May 2023 17:44:16 -0700
Subject: [PATCH 0125/1114] Point to reactor-c enclaves branch

---
 org.lflang/src/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index f762f01902..bdbc406b02 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit f762f01902745dff40b9170dce273d29b6df5212
+Subproject commit bdbc406b0223d8a1e443ee8e902306d1909152d6

From 08bc2a3bb4d628d66265af1b3d234c33208f55cb Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 17 May 2023 18:10:33 -0700
Subject: [PATCH 0126/1114] Add code-generator support for initial environment
 porting

---
 org.lflang/src/lib/c/reactor-c                              | 2 +-
 org.lflang/src/org/lflang/generator/c/CActionGenerator.java | 6 ++++--
 org.lflang/src/org/lflang/generator/c/CGenerator.java       | 2 ++
 .../src/org/lflang/generator/c/CReactionGenerator.java      | 4 ++--
 org.lflang/src/org/lflang/generator/c/CTimerGenerator.java  | 3 ++-
 .../org/lflang/generator/c/CTriggerObjectsGenerator.java    | 5 +++--
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index bdbc406b02..0d57bf9937 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit bdbc406b0223d8a1e443ee8e902306d1909152d6
+Subproject commit 0d57bf9937d917f762438b6aee8bee56ca0b1525
diff --git a/org.lflang/src/org/lflang/generator/c/CActionGenerator.java b/org.lflang/src/org/lflang/generator/c/CActionGenerator.java
index af41440641..2409c55365 100644
--- a/org.lflang/src/org/lflang/generator/c/CActionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CActionGenerator.java
@@ -43,10 +43,12 @@ public static String generateInitializers(
                 var periodInitializer = triggerStructName+".period = " + (minSpacing != null ?
                     CTypes.getInstance().getTargetTimeExpr(minSpacing) :
                                                                          CGenerator.UNDEFINED_MIN_SPACING) + ";";
+                var parentInitializer = triggerStructName+".parent = (void *) " + CUtil.reactorRef(action.getParent()) + ";";
                 code.addAll(List.of(
                     "// Initializing action "+action.getFullName(),
                     offsetInitializer,
-                    periodInitializer
+                    periodInitializer,
+                    parentInitializer
                 ));
 
                 var mode = action.getMode(false);
@@ -80,7 +82,7 @@ public static String generateTokenInitializer(
         String payloadSize
     ) {
         return String.join("\n",
-                "_lf_initialize_template((token_template_t*)",
+                "_lf_initialize_template(&_lf_environment, (token_template_t*)", //FIXME: Enclaves step 1 hack
                 "        &("+selfStruct+"->_lf__"+actionName+"),",
                          payloadSize+");",
             selfStruct+"->_lf__"+actionName+".status = absent;"
diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
index be931153f8..7f31674ecd 100644
--- a/org.lflang/src/org/lflang/generator/c/CGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -1683,6 +1683,8 @@ public void generateReactorInstance(ReactorInstance instance) {
         // Generate the instance self struct containing parameters, state variables,
         // and outputs (the "self" struct).
         initializeTriggerObjects.pr(CUtil.reactorRefName(instance)+"["+CUtil.runtimeIndex(instance)+"] = new_"+CUtil.getName(reactorClass)+"();");
+        // FIXME: Following line is a temporary hack for enclaves while we use a single global environment.
+        initializeTriggerObjects.pr(CUtil.reactorRefName(instance)+"["+CUtil.runtimeIndex(instance)+"]->base.environment = &_lf_environment;");
         // Generate code to initialize the "self" struct in the
         // _lf_initialize_trigger_objects function.
         generateTraceTableEntries(instance);
diff --git a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
index 100f3deaa4..e25a9b6e76 100644
--- a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
@@ -323,7 +323,7 @@ public static String generateForwardBody(String outputName, String targetType, S
                 String.join("\n",
                     DISABLE_REACTION_INITIALIZATION_MARKER,
                     "self->_lf_"+outputName+".value = ("+targetType+")self->_lf__"+actionName+".tmplt.token->value;",
-                    "_lf_replace_template_token((token_template_t*)&self->_lf_"+outputName+", (lf_token_t*)self->_lf__"+actionName+".tmplt.token);",
+                    "_lf_replace_template_token(&_lf_environment, (token_template_t*)&self->_lf_"+outputName+", (lf_token_t*)self->_lf__"+actionName+".tmplt.token);", //FIXME: Enclaves step1 hack
                     "self->_lf_"+outputName+".is_present = true;"
                 ) :
                 "lf_set("+outputName+", "+actionName+"->value);";
@@ -492,7 +492,7 @@ private static String generateActionVariablesInReaction(
             "// Set the fields of the action struct to match the current trigger.",
             action.getName()+"->is_present = (bool)self->_lf__"+action.getName()+".status;",
             action.getName()+"->has_value = ("+tokenPointer+" != NULL && "+tokenPointer+"->value != NULL);",
-            "_lf_replace_template_token((token_template_t*)"+action.getName()+", "+tokenPointer+");")
+            "_lf_replace_template_token(self->base.environment, (token_template_t*)"+action.getName()+", "+tokenPointer+");") //FIXME: Enclaves step1 hack
         );
         // Set the value field only if there is a type.
         if (!type.isUndefined()) {
diff --git a/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java b/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
index 75623fdfe7..703ac23c63 100644
--- a/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
@@ -54,6 +54,7 @@ public static String generateDeclarations(int timerCount) {
      *
      * @param timerCount The total number of timers in the program
      */
+    //FIXME: The _lf_environment parameter is added as a hack to get step1 of enclaves support working
     public static String generateLfInitializeTimer(int timerCount) {
         return String.join("\n",
             "void _lf_initialize_timers() {",
@@ -61,7 +62,7 @@ public static String generateLfInitializeTimer(int timerCount) {
             """
                 for (int i = 0; i < _lf_timer_triggers_size; i++) {
                     if (_lf_timer_triggers[i] != NULL) {
-                        _lf_initialize_timer(_lf_timer_triggers[i]);
+                        _lf_initialize_timer(&_lf_environment, _lf_timer_triggers[i]);
                     }
                 }""".indent(4).stripTrailing() :
             "",
diff --git a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
index f653d3f997..f63babdecd 100644
--- a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -171,6 +171,7 @@ public static String generateSchedulerInitializer(
             "                        .num_reactions_per_level = &num_reactions_per_level[0],",
             "                        .num_reactions_per_level_size = (size_t) "+numReactionsPerLevel.length+"};",
             "lf_sched_init(",
+            "    &_lf_environment,", // FIXME: Hack for enclaves step1
             "    (size_t)_lf_number_of_workers,",
             "    &sched_params",
             ");"
@@ -679,7 +680,7 @@ private static String deferredInputNumDestinations(
                             var indirection = (port.isMultiport())? "" : "&";
                             code.startChannelIteration(port);
                             code.pr(String.join("\n",
-                                    "_lf_initialize_template((token_template_t*)",
+                                    "_lf_initialize_template(&_lf_environment, (token_template_t*)", //FIXME: enclaves step 1 hack
                                     "        "+indirection+"("+CUtil.portRefNested(port, sr, sb, sc)+"),",
                                              size+");"
                             ));
@@ -798,7 +799,7 @@ private static String deferredCreateTemplateTokens(
                 var size = (rootType.equals("void")) ? "0" : "sizeof("+rootType+")";
                 code.startChannelIteration(output);
                 code.pr(String.join("\n",
-                        "_lf_initialize_template((token_template_t*)",
+                        "_lf_initialize_template(&_lf_environment, (token_template_t*)", // FIXME: Enclaves step1 hack
                         "        &("+CUtil.portRef(output)+"),",
                                  size+");"
                 ));

From 3b5e0a751be1c05914e6ba64d733eaa1e8035bb9 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Thu, 18 May 2023 08:48:18 -0700
Subject: [PATCH 0127/1114] Add env pointer to code generated functions

---
 .../org/lflang/generator/c/CReactionGenerator.java | 14 +++++++-------
 .../org/lflang/generator/c/CTimerGenerator.java    |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
index e25a9b6e76..6af5a55c3f 100644
--- a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
@@ -923,7 +923,7 @@ public static String generateBuiltinTriggersTable(int reactionCount, String name
      */
     public static String generateLfTriggerStartupReactions(int startupReactionCount, boolean hasModalReactors) {
         var s = new StringBuilder();
-        s.append("void _lf_trigger_startup_reactions() {");
+        s.append("void _lf_trigger_startup_reactions(environment_t *env) {");
         if (startupReactionCount > 0) {
             s.append("\n");
             if (hasModalReactors) {
@@ -934,7 +934,7 @@ public static String generateLfTriggerStartupReactions(int startupReactionCount,
                     "                // Skip reactions in modes",
                     "                continue;",
                     "            }",
-                    "            _lf_trigger_reaction(_lf_startup_reactions[i], -1);",
+                    "            _lf_trigger_reaction(env, _lf_startup_reactions[i], -1);",
                     "        }",
                     "    }",
                     "    _lf_handle_mode_startup_reset_reactions(",
@@ -946,7 +946,7 @@ public static String generateLfTriggerStartupReactions(int startupReactionCount,
                 s.append(String.join("\n",
                     "    for (int i = 0; i < _lf_startup_reactions_size; i++) {",
                     "        if (_lf_startup_reactions[i] != NULL) {",
-                    "            _lf_trigger_reaction(_lf_startup_reactions[i], -1);",
+                    "            _lf_trigger_reaction(env, _lf_startup_reactions[i], -1);",
                     "        }",
                     "    }"
                 ));
@@ -962,7 +962,7 @@ public static String generateLfTriggerStartupReactions(int startupReactionCount,
      */
     public static String generateLfTriggerShutdownReactions(int shutdownReactionCount, boolean hasModalReactors) {
         var s = new StringBuilder();
-        s.append("bool _lf_trigger_shutdown_reactions() {\n");
+        s.append("bool _lf_trigger_shutdown_reactions(environment_t *env) {\n");
         if (shutdownReactionCount > 0) {
             if (hasModalReactors) {
                 s.append(String.join("\n",
@@ -972,17 +972,17 @@ public static String generateLfTriggerShutdownReactions(int shutdownReactionCoun
                     "                // Skip reactions in modes",
                     "                continue;",
                     "            }",
-                    "            _lf_trigger_reaction(_lf_shutdown_reactions[i], -1);",
+                    "            _lf_trigger_reaction(env, _lf_shutdown_reactions[i], -1);", // FIXME: Enclaves hack
                     "        }",
                     "    }",
-                    "    _lf_handle_mode_shutdown_reactions(_lf_shutdown_reactions, _lf_shutdown_reactions_size);",
+                    "    _lf_handle_mode_shutdown_reactions(env, _lf_shutdown_reactions_size);",
                     "    return true;"
                 ));
             } else {
                 s.append(String.join("\n",
                     "    for (int i = 0; i < _lf_shutdown_reactions_size; i++) {",
                     "        if (_lf_shutdown_reactions[i] != NULL) {",
-                    "            _lf_trigger_reaction(_lf_shutdown_reactions[i], -1);",
+                    "            _lf_trigger_reaction(env, _lf_shutdown_reactions[i], -1);", //FIXME: Enclaves hack
                     "        }",
                     "    }",
                     "    return true;"
diff --git a/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java b/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
index 703ac23c63..5492610806 100644
--- a/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
@@ -57,12 +57,12 @@ public static String generateDeclarations(int timerCount) {
     //FIXME: The _lf_environment parameter is added as a hack to get step1 of enclaves support working
     public static String generateLfInitializeTimer(int timerCount) {
         return String.join("\n",
-            "void _lf_initialize_timers() {",
+            "void _lf_initialize_timers(environment_t *env) {",
             timerCount > 0 ?
             """
                 for (int i = 0; i < _lf_timer_triggers_size; i++) {
                     if (_lf_timer_triggers[i] != NULL) {
-                        _lf_initialize_timer(&_lf_environment, _lf_timer_triggers[i]);
+                        _lf_initialize_timer(env, _lf_timer_triggers[i]);
                     }
                 }""".indent(4).stripTrailing() :
             "",

From 8b74e8645be5aa12e2a65cab6119a9d4e9f18e99 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 18 May 2023 13:31:50 -0700
Subject: [PATCH 0128/1114] Bump reactor-ts to v0.3.3

---
 .github/workflows/ts-tests.yml     | 3 ++-
 org.lflang/src/lib/ts/package.json | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ts-tests.yml b/.github/workflows/ts-tests.yml
index 83c04d8cf7..f76c93d770 100644
--- a/.github/workflows/ts-tests.yml
+++ b/.github/workflows/ts-tests.yml
@@ -28,7 +28,8 @@ jobs:
         if: ${{ runner.os == 'macOS' }}
       - name: Perform TypeScript tests
         run: |
-          ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.* -Druntime="git://github.com/lf-lang/reactor-ts.git#master"
+          ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.*
+        #-Druntime="git://github.com/lf-lang/reactor-ts.git#master"
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
diff --git a/org.lflang/src/lib/ts/package.json b/org.lflang/src/lib/ts/package.json
index fc063d791e..d81ea5c1e5 100644
--- a/org.lflang/src/lib/ts/package.json
+++ b/org.lflang/src/lib/ts/package.json
@@ -2,7 +2,7 @@
     "name": "LinguaFrancaDefault",
     "type": "commonjs",
     "dependencies": {
-        "@lf-lang/reactor-ts": "git://github.com/lf-lang/reactor-ts.git#master",
+        "@lf-lang/reactor-ts": "^0.3.3",
         "command-line-args": "^5.1.1",
         "command-line-usage": "^6.1.3"
     },

From 845dd74be38c5b60a3e1828cd7315abb08818abd Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 18 May 2023 16:49:18 -0700
Subject: [PATCH 0129/1114] Bump reactor-ts to v0.3.4

---
 org.lflang/src/lib/ts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/lib/ts/package.json b/org.lflang/src/lib/ts/package.json
index d81ea5c1e5..322542b535 100644
--- a/org.lflang/src/lib/ts/package.json
+++ b/org.lflang/src/lib/ts/package.json
@@ -2,7 +2,7 @@
     "name": "LinguaFrancaDefault",
     "type": "commonjs",
     "dependencies": {
-        "@lf-lang/reactor-ts": "^0.3.3",
+        "@lf-lang/reactor-ts": "^0.3.4",
         "command-line-args": "^5.1.1",
         "command-line-usage": "^6.1.3"
     },

From 467e553adefd072415804f8af7b7e4e09d8aebfa Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Thu, 18 May 2023 17:06:35 -0700
Subject: [PATCH 0130/1114] Code-generate more of the enclaves stuff

---
 .../src/org/lflang/generator/c/CGenerator.java   |  8 ++++----
 .../lflang/generator/c/CReactionGenerator.java   |  6 +++---
 .../generator/c/CTriggerObjectsGenerator.java    | 16 ++++++++--------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
index 7f31674ecd..2474f674c6 100644
--- a/org.lflang/src/org/lflang/generator/c/CGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -1493,11 +1493,11 @@ private void generateStartTimeStep(ReactorInstance instance) {
                     var portRef = CUtil.portRefNested(port);
                     var con = (port.isMultiport()) ? "->" : ".";
 
-                    temp.pr("_lf_is_present_fields["+startTimeStepIsPresentCount+" + count] = &"+portRef+con+"is_present;");
+                    temp.pr("env->_lf_is_present_fields["+startTimeStepIsPresentCount+" + count] = &"+portRef+con+"is_present;");
                     // Intended_tag is only applicable to ports in federated execution.
                     temp.pr(
                         CExtensionUtils.surroundWithIfFederatedDecentralized(
-                        "_lf_intended_tag_fields["+startTimeStepIsPresentCount+" + count] = &"+portRef+con+"intended_tag;"
+                        "env->_lf_intended_tag_fields["+startTimeStepIsPresentCount+" + count] = &"+portRef+con+"intended_tag;"
                         )
                     );
 
@@ -1524,7 +1524,7 @@ private void generateStartTimeStep(ReactorInstance instance) {
 
             temp.pr(String.join("\n",
                 "// Add action "+action.getFullName()+" to array of is_present fields.",
-                "_lf_is_present_fields["+startTimeStepIsPresentCount+"] ",
+                "env->_lf_is_present_fields["+startTimeStepIsPresentCount+"] ",
                 "        = &"+containerSelfStructName+"->_lf_"+action.getName()+".is_present;"
             ));
 
@@ -1562,7 +1562,7 @@ private void generateStartTimeStep(ReactorInstance instance) {
                         foundOne = true;
                         temp.pr("// Add port "+output.getFullName()+" to array of is_present fields.");
                         temp.startChannelIteration(output);
-                        temp.pr("_lf_is_present_fields["+startTimeStepIsPresentCount+" + count] = &"+CUtil.portRef(output)+".is_present;");
+                        temp.pr("env->_lf_is_present_fields["+startTimeStepIsPresentCount+" + count] = &"+CUtil.portRef(output)+".is_present;");
 
                         // Intended_tag is only applicable to ports in federated execution with decentralized coordination.
                         temp.pr(
diff --git a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
index 6af5a55c3f..80c9aa1546 100644
--- a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
@@ -323,7 +323,7 @@ public static String generateForwardBody(String outputName, String targetType, S
                 String.join("\n",
                     DISABLE_REACTION_INITIALIZATION_MARKER,
                     "self->_lf_"+outputName+".value = ("+targetType+")self->_lf__"+actionName+".tmplt.token->value;",
-                    "_lf_replace_template_token(&_lf_environment, (token_template_t*)&self->_lf_"+outputName+", (lf_token_t*)self->_lf__"+actionName+".tmplt.token);", //FIXME: Enclaves step1 hack
+                    "_lf_replace_template_token(selv->base.environment, (token_template_t*)&self->_lf_"+outputName+", (lf_token_t*)self->_lf__"+actionName+".tmplt.token);", //FIXME: Enclaves step1 hack
                     "self->_lf_"+outputName+".is_present = true;"
                 ) :
                 "lf_set("+outputName+", "+actionName+"->value);";
@@ -567,7 +567,7 @@ private static String generateInputVariablesInReaction(
                 inputName+"->value = NULL;", // Prevent payload from being freed.
                 "if ("+inputName+"->is_present) {",
                 "    "+inputName+"->length = "+inputName+"->token->length;",
-                "    "+inputName+"->token = lf_writable_copy((lf_port_base_t*)self->_lf_"+inputName+");",
+                "    "+inputName+"->token = lf_writable_copy(self->base.environment, (lf_port_base_t*)self->_lf_"+inputName+");",
                 "    "+inputName+"->value = ("+types.getTargetType(inputType)+")"+inputName+"->token->value;",
                 "} else {",
                 "    "+inputName+"->length = 0;",
@@ -590,7 +590,7 @@ private static String generateInputVariablesInReaction(
                 "    if ("+inputName+"[i]->is_present) {",
                 "        "+inputName+"[i]->length = "+inputName+"[i]->token->length;",
                 "        token_template_t* _lf_input = (token_template_t*)self->_lf_"+inputName+"[i];",
-                "        "+inputName+"[i]->token = lf_writable_copy((lf_port_base_t*)_lf_input);",
+                "        "+inputName+"[i]->token = lf_writable_copy(self->base.environment, (lf_port_base_t*)_lf_input);",
                 "        "+inputName+"[i]->value = ("+types.getTargetType(inputType)+")"+inputName+"[i]->token->value;",
                 "    } else {",
                 "        "+inputName+"[i]->length = 0;",
diff --git a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
index f63babdecd..f1e09f334e 100644
--- a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -49,7 +49,7 @@ public static String generateInitializeTriggerObjects(
         int startTimeStepIsPresentCount
     ) {
         var code = new CodeBuilder();
-        code.pr("void _lf_initialize_trigger_objects() {");
+        code.pr("void _lf_initialize_trigger_objects(environment_t* env) {");
         code.indent();
         // Initialize the LF clock.
         code.pr(String.join("\n",
@@ -74,12 +74,12 @@ public static String generateInitializeTriggerObjects(
             // Allocate the initial (before mutations) array of pointers to _is_present fields.
             code.pr(String.join("\n",
                 "// Create the array that will contain pointers to is_present fields to reset on each step.",
-                "_lf_is_present_fields_size = "+startTimeStepIsPresentCount+";",
-                "_lf_is_present_fields = (bool**)calloc("+startTimeStepIsPresentCount+", sizeof(bool*));",
-                "if (_lf_is_present_fields == NULL) lf_print_error_and_exit(" + addDoubleQuotes("Out of memory!") + ");",
-                "_lf_is_present_fields_abbreviated = (bool**)calloc("+startTimeStepIsPresentCount+", sizeof(bool*));",
-                "if (_lf_is_present_fields_abbreviated == NULL) lf_print_error_and_exit(" + addDoubleQuotes("Out of memory!") + ");",
-                "_lf_is_present_fields_abbreviated_size = 0;"
+                "env->_lf_is_present_fields_size = "+startTimeStepIsPresentCount+";",
+                "env->_lf_is_present_fields = (bool**)calloc("+startTimeStepIsPresentCount+", sizeof(bool*));",
+                "if (env->_lf_is_present_fields == NULL) lf_print_error_and_exit(" + addDoubleQuotes("Out of memory!") + ");",
+                "env->_lf_is_present_fields_abbreviated = (bool**)calloc("+startTimeStepIsPresentCount+", sizeof(bool*));",
+                "if (env->_lf_is_present_fields_abbreviated == NULL) lf_print_error_and_exit(" + addDoubleQuotes("Out of memory!") + ");",
+                "env->_lf_is_present_fields_abbreviated_size = 0;"
             ));
         }
 
@@ -171,7 +171,7 @@ public static String generateSchedulerInitializer(
             "                        .num_reactions_per_level = &num_reactions_per_level[0],",
             "                        .num_reactions_per_level_size = (size_t) "+numReactionsPerLevel.length+"};",
             "lf_sched_init(",
-            "    &_lf_environment,", // FIXME: Hack for enclaves step1
+            "    env,", // FIXME: Hack for enclaves step1
             "    (size_t)_lf_number_of_workers,",
             "    &sched_params",
             ");"

From 57cf0653de4a4b70c3368297dbf1ae708fed733f Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 19 May 2023 22:35:34 -0700
Subject: [PATCH 0131/1114] Bump reactor-ts to 0.3.5

---
 org.lflang/src/lib/ts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/lib/ts/package.json b/org.lflang/src/lib/ts/package.json
index 322542b535..cce1b96f9f 100644
--- a/org.lflang/src/lib/ts/package.json
+++ b/org.lflang/src/lib/ts/package.json
@@ -2,7 +2,7 @@
     "name": "LinguaFrancaDefault",
     "type": "commonjs",
     "dependencies": {
-        "@lf-lang/reactor-ts": "^0.3.4",
+        "@lf-lang/reactor-ts": "^0.3.5",
         "command-line-args": "^5.1.1",
         "command-line-usage": "^6.1.3"
     },

From d77916de6e3a5b49eb49121629ea61268e67e4e7 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Sat, 20 May 2023 14:28:28 -0700
Subject: [PATCH 0132/1114] Revert some premature enclave changes. Also, add
 example enclaves programs

---
 .../lflang/generator/c/CActionGenerator.java  |  2 +-
 .../org/lflang/generator/c/CGenerator.java    |  7 ++--
 .../lflang/generator/c/CTimerGenerator.java   | 21 ++---------
 .../generator/c/CTriggerObjectsGenerator.java |  6 +--
 test/C/src/enclaves/DelayedCommunication.lf   | 37 +++++++++++++++++++
 test/C/src/enclaves/NonCommunicating.lf       | 26 +++++++++++++
 6 files changed, 73 insertions(+), 26 deletions(-)
 create mode 100644 test/C/src/enclaves/DelayedCommunication.lf
 create mode 100644 test/C/src/enclaves/NonCommunicating.lf

diff --git a/org.lflang/src/org/lflang/generator/c/CActionGenerator.java b/org.lflang/src/org/lflang/generator/c/CActionGenerator.java
index 2409c55365..2f80dbd678 100644
--- a/org.lflang/src/org/lflang/generator/c/CActionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CActionGenerator.java
@@ -82,7 +82,7 @@ public static String generateTokenInitializer(
         String payloadSize
     ) {
         return String.join("\n",
-                "_lf_initialize_template(&_lf_environment, (token_template_t*)", //FIXME: Enclaves step 1 hack
+                "_lf_initialize_template(env, (token_template_t*)",
                 "        &("+selfStruct+"->_lf__"+actionName+"),",
                          payloadSize+");",
             selfStruct+"->_lf__"+actionName+".status = absent;"
diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
index 2474f674c6..e7053c9227 100644
--- a/org.lflang/src/org/lflang/generator/c/CGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -376,6 +376,8 @@ protected CGenerator(
         // Register the delayed connection transformation to be applied by GeneratorBase.
         // transform both after delays and physical connections
         registerTransformation(new DelayedConnectionTransformation(delayBodyGenerator, types, fileConfig.resource, true, true));
+
+        // TODO: Register the enclaved connection transformation to be applied by generatorBase
     }
 
     public CGenerator(LFGeneratorContext context, boolean ccppMode) {
@@ -660,9 +662,6 @@ private void generateCodeFor(
                 if (targetLanguageIsCpp()) code.pr("}");
             }
 
-            // If there are timers, create a table of timers to be initialized.
-            code.pr(CTimerGenerator.generateDeclarations(timerCount));
-
             // If there are startup reactions, create a table of triggers.
             code.pr(CReactionGenerator.generateBuiltinTriggersTable(startupReactionCount, "startup"));
 
@@ -1684,7 +1683,7 @@ public void generateReactorInstance(ReactorInstance instance) {
         // and outputs (the "self" struct).
         initializeTriggerObjects.pr(CUtil.reactorRefName(instance)+"["+CUtil.runtimeIndex(instance)+"] = new_"+CUtil.getName(reactorClass)+"();");
         // FIXME: Following line is a temporary hack for enclaves while we use a single global environment.
-        initializeTriggerObjects.pr(CUtil.reactorRefName(instance)+"["+CUtil.runtimeIndex(instance)+"]->base.environment = &_lf_environment;");
+        // initializeTriggerObjects.pr(CUtil.reactorRefName(instance)+"["+CUtil.runtimeIndex(instance)+"]->base.environment = env;");
         // Generate code to initialize the "self" struct in the
         // _lf_initialize_trigger_objects function.
         generateTraceTableEntries(instance);
diff --git a/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java b/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
index 5492610806..df071ef72b 100644
--- a/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
@@ -34,21 +34,6 @@ public static String generateInitializer(TimerInstance timer) {
         ));
     }
 
-    /**
-     * Generate code to declare the timer table.
-     *
-     * @param timerCount The total number of timers in the program
-     */
-    public static String generateDeclarations(int timerCount) {
-        return String.join("\n", List.of(
-                    "// Array of pointers to timer triggers to be scheduled in _lf_initialize_timers().",
-                    (timerCount > 0 ?
-                    "trigger_t* _lf_timer_triggers["+timerCount+"]" :
-                    "trigger_t** _lf_timer_triggers = NULL") + ";",
-                    "int _lf_timer_triggers_size = "+timerCount+";"
-                ));
-    }
-
     /**
      * Generate code to call `_lf_initialize_timer` on each timer.
      *
@@ -60,9 +45,9 @@ public static String generateLfInitializeTimer(int timerCount) {
             "void _lf_initialize_timers(environment_t *env) {",
             timerCount > 0 ?
             """
-                for (int i = 0; i < _lf_timer_triggers_size; i++) {
-                    if (_lf_timer_triggers[i] != NULL) {
-                        _lf_initialize_timer(env, _lf_timer_triggers[i]);
+                for (int i = 0; i < env->_lf_timer_triggers_size; i++) {
+                    if (env->_lf_timer_triggers[i] != NULL) {
+                        _lf_initialize_timer(env, env->_lf_timer_triggers[i]);
                     }
                 }""".indent(4).stripTrailing() :
             "",
diff --git a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
index f1e09f334e..14526fb62d 100644
--- a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -172,7 +172,7 @@ public static String generateSchedulerInitializer(
             "                        .num_reactions_per_level_size = (size_t) "+numReactionsPerLevel.length+"};",
             "lf_sched_init(",
             "    env,", // FIXME: Hack for enclaves step1
-            "    (size_t)_lf_number_of_workers,",
+            "    env->num_workers,", // FIXME: Need better way of setting this
             "    &sched_params",
             ");"
         ));
@@ -680,7 +680,7 @@ private static String deferredInputNumDestinations(
                             var indirection = (port.isMultiport())? "" : "&";
                             code.startChannelIteration(port);
                             code.pr(String.join("\n",
-                                    "_lf_initialize_template(&_lf_environment, (token_template_t*)", //FIXME: enclaves step 1 hack
+                                    "_lf_initialize_template(env, (token_template_t*)",
                                     "        "+indirection+"("+CUtil.portRefNested(port, sr, sb, sc)+"),",
                                              size+");"
                             ));
@@ -799,7 +799,7 @@ private static String deferredCreateTemplateTokens(
                 var size = (rootType.equals("void")) ? "0" : "sizeof("+rootType+")";
                 code.startChannelIteration(output);
                 code.pr(String.join("\n",
-                        "_lf_initialize_template(&_lf_environment, (token_template_t*)", // FIXME: Enclaves step1 hack
+                        "_lf_initialize_template(env, (token_template_t*)",
                         "        &("+CUtil.portRef(output)+"),",
                                  size+");"
                 ));
diff --git a/test/C/src/enclaves/DelayedCommunication.lf b/test/C/src/enclaves/DelayedCommunication.lf
new file mode 100644
index 0000000000..65d48255a0
--- /dev/null
+++ b/test/C/src/enclaves/DelayedCommunication.lf
@@ -0,0 +1,37 @@
+target C;
+
+reactor Sender {
+    output out:int
+
+    timer t(0, 50 msec)
+    state cnt:int(0)
+    reaction(t) -> out {=
+        lf_set(out, self->cnt++);
+    =}
+}
+
+reactor Receiver {
+    input in: int
+    state last:time_t(0)
+    state cnt:int(0)
+
+    reaction(in) {=
+        time_t now = lf_time_logical_elapsed();
+        if (now - self->last != MSEC(50)) {
+            lf_print_error_and_exit("now=%lli last=%lli", now, self->last);
+        } 
+        if (self->cnt++ != in->value) {
+            lf_print_error_and_exit("recv=%u exp=%u", in->value, self->cnt);
+        }
+
+        self->last = now;
+    =}
+}
+
+
+main reactor {
+    sender = new Sender()
+    receiver = new Receiver()
+
+    sender.out -> receiver.in after 50 msec
+}
\ No newline at end of file
diff --git a/test/C/src/enclaves/NonCommunicating.lf b/test/C/src/enclaves/NonCommunicating.lf
new file mode 100644
index 0000000000..1532479f19
--- /dev/null
+++ b/test/C/src/enclaves/NonCommunicating.lf
@@ -0,0 +1,26 @@
+target C {
+    scheduler: NP
+};
+
+reactor Slow {
+    timer t(0, 100 msec)
+
+    reaction(t) {=
+        lf_sleep(MSEC(50));
+    =}
+}
+
+reactor Fast {
+    timer t(0, 20 msec)
+
+    reaction(t) {=
+
+    =} deadline(10 msec) {=
+        lf_print_error_and_exit("Fast Reactor was stalled");
+    =}
+}
+
+main reactor {
+    s = new Slow()
+    f = new Fast()
+}
\ No newline at end of file

From b12a79d92823ca5313ec547d346b41b60a0dc9cc Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Mon, 22 May 2023 11:50:44 -0700
Subject: [PATCH 0133/1114] Align to reactor-c enclaves branch

---
 org.lflang/src/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index 0d57bf9937..8949d66182 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 0d57bf9937d917f762438b6aee8bee56ca0b1525
+Subproject commit 8949d6618213fd47265635ceafccde6b4f355804

From 0322afbeae27a1bc5cc953190687b7e4ed39adad Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Mon, 22 May 2023 12:07:58 -0700
Subject: [PATCH 0134/1114] Merge with mater

---
 .../ast/EnclavedConnectionTransformation.java | 213 ++++++++++++++++++
 .../lflang/generator/c/CActionGenerator.java  |   2 +-
 .../c/CEnclavedConnectionBodyGenerator.java   |  62 +++++
 .../org/lflang/generator/c/CGenerator.java    |  10 +-
 .../generator/c/CReactionGenerator.java       |  20 ++
 .../generator/c/CTriggerObjectsGenerator.java |   2 +-
 .../generator/python/PythonGenerator.java     |   2 +-
 7 files changed, 305 insertions(+), 6 deletions(-)
 create mode 100644 org.lflang/src/org/lflang/ast/EnclavedConnectionTransformation.java
 create mode 100644 org.lflang/src/org/lflang/generator/c/CEnclavedConnectionBodyGenerator.java

diff --git a/org.lflang/src/org/lflang/ast/EnclavedConnectionTransformation.java b/org.lflang/src/org/lflang/ast/EnclavedConnectionTransformation.java
new file mode 100644
index 0000000000..36c1181ae8
--- /dev/null
+++ b/org.lflang/src/org/lflang/ast/EnclavedConnectionTransformation.java
@@ -0,0 +1,213 @@
+package org.lflang.ast;
+
+import static org.lflang.AttributeUtils.isEnclave;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.IteratorExtensions;
+
+import org.lflang.ASTUtils;
+import org.lflang.InferredType;
+import org.lflang.generator.DelayBodyGenerator;
+import org.lflang.generator.TargetTypes;
+import org.lflang.lf.Action;
+import org.lflang.lf.ActionOrigin;
+import org.lflang.lf.Assignment;
+import org.lflang.lf.Attribute;
+import org.lflang.lf.Code;
+import org.lflang.lf.CodeExpr;
+import org.lflang.lf.Connection;
+import org.lflang.lf.Expression;
+import org.lflang.lf.Initializer;
+import org.lflang.lf.Input;
+import org.lflang.lf.Instantiation;
+import org.lflang.lf.LfFactory;
+import org.lflang.lf.Mode;
+import org.lflang.lf.Model;
+import org.lflang.lf.Output;
+import org.lflang.lf.Parameter;
+import org.lflang.lf.ParameterReference;
+import org.lflang.lf.Port;
+import org.lflang.lf.Reaction;
+import org.lflang.lf.Reactor;
+import org.lflang.lf.ReactorDecl;
+import org.lflang.lf.StateVar;
+import org.lflang.lf.Time;
+import org.lflang.lf.Type;
+import org.lflang.lf.TypeParm;
+import org.lflang.lf.VarRef;
+import org.lflang.lf.WidthSpec;
+import org.lflang.lf.WidthTerm;
+
+import com.fasterxml.jackson.databind.deser.impl.CreatorCandidate.Param;
+
+/**
+ This class implements AST transformations for enclaved connections.
+ There are three types of enclaved connections:
+ 1) Zero-delay connections
+ 2) Delayed connections
+ 3) Physical connections
+ */
+public class EnclavedConnectionTransformation implements AstTransformation {
+
+    /**
+     * The Lingua Franca factory for creating new AST nodes.
+     */
+    public static final LfFactory factory = ASTUtils.factory;
+
+    /**
+     * A code generator used to insert reaction bodies for the generated delay reactors.
+     */
+    private final DelayBodyGenerator generator;
+
+    /**
+     * A target type instance that is used during the transformation to manage target specific types
+     */
+    private final TargetTypes targetTypes;
+
+    /**
+     * The Eclipse eCore view of the main LF file.
+     */
+    private final Resource mainResource;
+
+    /**
+     * Collection of generated delay classes.
+     */
+    private final LinkedHashSet<Reactor> delayClasses = new LinkedHashSet<>();
+
+    private final LinkedHashSet<Reactor> wrapperClasses = new LinkedHashSet<>();
+    private final LinkedHashSet<Reactor> connectionClasses = new LinkedHashSet<>();
+
+
+    /**
+     *
+     * @param generator
+     * @param targetTypes
+     * @param mainResource
+     */
+
+    public EnclavedConnectionTransformation(DelayBodyGenerator generator, TargetTypes targetTypes, Resource mainResource) {
+        this.generator = generator;
+        this.targetTypes = targetTypes;
+        this.mainResource = mainResource;
+    }
+
+    /**
+     * Transform all after delay connections by inserting generated delay reactors.
+     */
+    @Override
+    public void applyTransformation(List<Reactor> reactors) {
+        insertGeneratedEnclavedConnections(reactors);
+    }
+
+    /**
+     * Find connections in the given resource that have a delay associated with them,
+     * and reroute them via a generated delay reactor.
+     * @param reactors A list of reactors to apply the transformation to.
+     */
+    private void insertGeneratedEnclavedConnections(List<Reactor> reactors) {
+        // The resulting changes to the AST are performed _after_ iterating
+        // in order to avoid concurrent modification problems.
+        List<Connection> oldConnections = new ArrayList<>();
+        Map<EObject, List<Connection>> newConnections = new LinkedHashMap<>();
+        Map<EObject, List<Instantiation>> delayInstances = new LinkedHashMap<>();
+
+        Map<ReactorDecl, Reactor> enclaveWrappers = new LinkedHashMap<>();
+
+        // Iterate over all reactor instances, and find any enclaves
+        for (Reactor container: reactors) {
+            for (Instantiation inst : container.getInstantiations()) {
+                if (isEnclave(inst)) {
+                    Reactor r = ASTUtils.toDefinition(inst.getReactorClass());
+                    if (!enclaveWrappers.containsKey(r)) {
+
+                    }
+                }
+            }
+        }
+    }
+
+    // Create an enclave wrapper class for a particular enclave
+    private Reactor createEnclaveWrapperClass(Instantiation enclave) {
+
+        Reactor enclaveClass = ASTUtils.toDefinition(enclave.getReactorClass());
+        Reactor wrapperClass = factory.createReactor();
+        for (int i = 0; i<enclaveClass.getInputs().size(); i++) {
+            Input in = factory.createInput();
+            VarRef topInRef = factory.createVarRef();
+            VarRef connInRef = factory.createVarRef();
+            VarRef connOutRef = factory.createVarRef();
+            VarRef encInRef = factory.createVarRef();
+            Reactor connClass = createEnclaveConnectionClass(enclaveClass.getInputs().get(i));
+            Instantiation connInst = createEnclaveConnectionInstance(connClass);
+            Connection topConn= factory.createConnection();
+            Connection connEnc = factory.createConnection();
+
+            // Connect top port with input port of ConnectionReactor
+            topInRef.setVariable(in);
+            connInRef.setContainer(connInst);
+            connInRef.setVariable(connClass.getInputs().get(0));
+            topConn.getLeftPorts().add(topInRef);
+            topConn.getRightPorts().add(connInRef);
+
+            // Connect output port of ConnectionReactor with the enclaved reactor
+            encInRef.setContainer(enclave);
+            encInRef.setVariable(enclaveClass.getInputs().get(i));
+            connOutRef.setContainer(connInst);
+            connOutRef.setVariable(connClass.getOutputs().get(0));
+            connEnc.getLeftPorts().add(connOutRef);
+            connEnc.getRightPorts().add(encInRef);
+
+            // Create parameters for the delay on the connection
+            Parameter topDelay = createDelayParameter(enclaveClass.getInputs().get(0).getName() + "_delay");
+            ParameterReference paramRef = factory.createParameterReference();
+            paramRef.setParameter(topDelay);
+            connInst.getParameters().add(paramRef);
+
+
+            topDelay.setName("delay");
+            topConn.getLeftPorts().add(inRef);
+            topConn.getRightPorts().add(connInst.get);
+
+        }
+    }
+
+    private Reactor createEnclaveConnectionClass(Input input) {
+        Reactor enclaveConn = factory.createReactor();
+        Parameter delayParam = createDelayParameter("delay");
+        return enclaveConn;
+    }
+    private Instantiation createEnclaveConnectionInstance(Reactor conn) {
+        Instantiation inst = factory.createInstantiation();
+        return inst;
+    }
+
+    private Parameter createDelayParameter(String name) {
+        Parameter delay = factory.createParameter();
+        delay.setType(factory.createType());
+        delay.getType().setId("time");
+        delay.getType().setTime(true);
+        delay.setName(name);
+        Time defaultTime = factory.createTime();
+        defaultTime.setUnit(null);
+        defaultTime.setInterval(0);
+        Initializer init = factory.createInitializer();
+        init.setParens(true);
+        init.setBraces(false);
+        init.getExprs().add(defaultTime);
+        delay.setInit(init);
+        return delay;
+    }
+
+}
diff --git a/org.lflang/src/org/lflang/generator/c/CActionGenerator.java b/org.lflang/src/org/lflang/generator/c/CActionGenerator.java
index 2f80dbd678..6916fd4d7e 100644
--- a/org.lflang/src/org/lflang/generator/c/CActionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CActionGenerator.java
@@ -82,7 +82,7 @@ public static String generateTokenInitializer(
         String payloadSize
     ) {
         return String.join("\n",
-                "_lf_initialize_template(env, (token_template_t*)",
+                "_lf_initialize_template((token_template_t*)",
                 "        &("+selfStruct+"->_lf__"+actionName+"),",
                          payloadSize+");",
             selfStruct+"->_lf__"+actionName+".status = absent;"
diff --git a/org.lflang/src/org/lflang/generator/c/CEnclavedConnectionBodyGenerator.java b/org.lflang/src/org/lflang/generator/c/CEnclavedConnectionBodyGenerator.java
new file mode 100644
index 0000000000..4b613c03d8
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/c/CEnclavedConnectionBodyGenerator.java
@@ -0,0 +1,62 @@
+package org.lflang.generator.c;
+
+import static org.lflang.ASTUtils.getInferredType;
+
+import org.lflang.ASTUtils;
+import org.lflang.generator.DelayBodyGenerator;
+import org.lflang.lf.Action;
+import org.lflang.lf.VarRef;
+
+public class CEnclavedConnectionBodyGenerator implements DelayBodyGenerator {
+
+    protected CTypes types;
+
+    public CEnclavedConnectionBodyGenerator(CTypes types) {
+        this.types = types;
+    }
+
+    /**
+     * Generate code for the body of a reaction that takes an input and
+     * schedules an action with the value of that input.
+     * @param action The action to schedule
+     * @param port The port to read from
+     */
+    @Override
+    public String generateDelayBody(Action action, VarRef port) {
+        var ref = ASTUtils.generateVarRef(port);
+        return CReactionGenerator.generateEnclavedConnectionDelayBody(
+            ref,
+            action.getName(),
+            CUtil.isTokenType(getInferredType(action), types)
+        );
+    }
+
+    /**
+     * Generate code for the body of a reaction that is triggered by the
+     * given action and writes its value to the given port. This realizes
+     * the receiving end of a logical delay specified with the 'after'
+     * keyword.
+     * @param action The action that triggers the reaction
+     * @param port The port to write to.
+     */
+    @Override
+    public String generateForwardBody(Action action, VarRef port) {
+        var outputName = ASTUtils.generateVarRef(port);
+        return CReactionGenerator.generateForwardBody(
+            outputName,
+            types.getTargetType(action),
+            action.getName(),
+            CUtil.isTokenType(getInferredType(action), types)
+        );
+    }
+
+    @Override
+    public String generateDelayGeneric() {
+        throw new UnsupportedOperationException("TODO: auto-generated method stub");
+    }
+
+    @Override
+    public boolean generateAfterDelaysWithVariableWidth() {
+        return true;
+    }
+}
diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
index e7053c9227..199dd0a73c 100644
--- a/org.lflang/src/org/lflang/generator/c/CGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -51,6 +51,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.eclipse.xtext.xbase.lib.StringExtensions;
 
 import org.lflang.ASTUtils;
+import org.lflang.ast.EnclavedConnectionTransformation;
 import org.lflang.generator.DockerComposeGenerator;
 import org.lflang.FileConfig;
 import org.lflang.Target;
@@ -365,7 +366,8 @@ protected CGenerator(
         boolean CCppMode,
         CTypes types,
         CCmakeGenerator cmakeGenerator,
-        DelayBodyGenerator delayBodyGenerator
+        DelayBodyGenerator delayConnectionBodyGenerator,
+        DelayBodyGenerator enclavedConnectionBodyGenerator
     ) {
         super(context);
         this.fileConfig = (CFileConfig) context.getFileConfig();
@@ -375,7 +377,8 @@ protected CGenerator(
 
         // Register the delayed connection transformation to be applied by GeneratorBase.
         // transform both after delays and physical connections
-        registerTransformation(new DelayedConnectionTransformation(delayBodyGenerator, types, fileConfig.resource, true, true));
+        registerTransformation(new EnclavedConnectionTransformation(enclavedConnectionBodyGenerator, types, fileConfig.resource, true, true));
+        registerTransformation(new DelayedConnectionTransformation(delayConnectionBodyGenerator, types, fileConfig.resource, true, true));
 
         // TODO: Register the enclaved connection transformation to be applied by generatorBase
     }
@@ -386,7 +389,8 @@ public CGenerator(LFGeneratorContext context, boolean ccppMode) {
             ccppMode,
             new CTypes(),
             new CCmakeGenerator(context.getFileConfig(), List.of()),
-            new CDelayBodyGenerator(new CTypes())
+            new CDelayBodyGenerator(new CTypes()),
+            new CEnclavedConnectionBodyGenerator(new CTypes())
         );
     }
 
diff --git a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
index 80c9aa1546..749e289532 100644
--- a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
@@ -318,6 +318,26 @@ public static String generateDelayBody(String ref, String actionName, boolean is
                 "lf_schedule_copy("+actionName+", 0, &"+ref+"->value, 1);  // Length is 1.";
     }
 
+    public static String generateEnclavedConnectionDelayBody(String ref, String actionName, boolean isTokenType) {
+        // Note that the action.type set by the base class is actually
+        // the port type.
+        return isTokenType ?
+            "lf_print_error_and_exit(\"Enclaved connection not implemented for token types\")"
+             :
+            String.join("\n",
+            "// Calculate the tag at which the event shall be inserted in the destination environment",
+            "tag_t target_tag = lf_delay_tag(self->source_environment->curren_tag, act->trigger->offset);",
+                "token_template_t* template = (token_template_t*)action;",
+                "lf_critical_section_enter(self->destination_environment);",
+                "lf_token_t* token = _lf_initialize_token(template, length);",
+                "memcpy(token->value, value, template->type.element_size * length);",
+                "// Schedule event to the destination environment.",
+                "trigger_handle_t result = _lf_schedule_at_tag(self->destination_environment, action->trigger, tag, token);",
+                "// Notify the main thread in case it is waiting for physical time to elapse.",
+                "lf_notify_of_event(env);",
+                "lf_critical_section_exit(self->destination_length);");
+    }
+
     public static String generateForwardBody(String outputName, String targetType, String actionName, boolean isTokenType) {
         return isTokenType ?
                 String.join("\n",
diff --git a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 14526fb62d..7473a3b6f7 100644
--- a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -680,7 +680,7 @@ private static String deferredInputNumDestinations(
                             var indirection = (port.isMultiport())? "" : "&";
                             code.startChannelIteration(port);
                             code.pr(String.join("\n",
-                                    "_lf_initialize_template(env, (token_template_t*)",
+                                "_lf_initialize_template((token_template_t*)",
                                     "        "+indirection+"("+CUtil.portRefNested(port, sr, sb, sc)+"),",
                                              size+");"
                             ));
diff --git a/org.lflang/src/org/lflang/generator/python/PythonGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
index 2686c98539..1a3e1ebfa8 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
@@ -113,7 +113,7 @@ public PythonGenerator(LFGeneratorContext context) {
 
 
     private PythonGenerator(LFGeneratorContext context, PythonTypes types, CCmakeGenerator cmakeGenerator) {
-        super(context, false, types, cmakeGenerator, new PythonDelayBodyGenerator(types));
+        super(context, false, types, cmakeGenerator, new PythonDelayBodyGenerator(types), null); // FIXME: What to pass to Pyhton?
         this.targetConfig.compiler = "gcc";
         this.targetConfig.compilerFlags = new ArrayList<>();
         this.targetConfig.linkerFlags = "";

From c83430d40ffddc3b942136f8751c8b83133b99d9 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Mon, 22 May 2023 19:11:23 -0700
Subject: [PATCH 0135/1114] More work towards introducing an environment struct
 for all C programs

---
 org.lflang/src/org/lflang/ASTUtils.java       |  3 +
 .../ast/EnclavedConnectionTransformation.java |  7 +-
 .../c/CEnvironmentFunctionGenerator.java      | 83 +++++++++++++++++++
 .../org/lflang/generator/c/CGenerator.java    | 30 +++----
 .../generator/c/CReactionGenerator.java       |  4 +-
 .../lflang/generator/c/CTimerGenerator.java   |  7 +-
 .../generator/c/CTriggerObjectsGenerator.java | 70 +++++++---------
 .../src/org/lflang/generator/c/CUtil.java     | 51 ++++++++++++
 8 files changed, 191 insertions(+), 64 deletions(-)
 create mode 100644 org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java

diff --git a/org.lflang/src/org/lflang/ASTUtils.java b/org.lflang/src/org/lflang/ASTUtils.java
index 2cb9dad397..77b06383f8 100644
--- a/org.lflang/src/org/lflang/ASTUtils.java
+++ b/org.lflang/src/org/lflang/ASTUtils.java
@@ -25,6 +25,8 @@
 
 package org.lflang;
 
+import static org.lflang.AttributeUtils.isEnclave;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -1880,4 +1882,5 @@ public static void addReactionAttribute(Reaction reaction, String name) {
         fedAttr.setAttrName(name);
         reaction.getAttributes().add(fedAttr);
     }
+
 }
diff --git a/org.lflang/src/org/lflang/ast/EnclavedConnectionTransformation.java b/org.lflang/src/org/lflang/ast/EnclavedConnectionTransformation.java
index 36c1181ae8..8681755efc 100644
--- a/org.lflang/src/org/lflang/ast/EnclavedConnectionTransformation.java
+++ b/org.lflang/src/org/lflang/ast/EnclavedConnectionTransformation.java
@@ -173,14 +173,15 @@ private Reactor createEnclaveWrapperClass(Instantiation enclave) {
             Parameter topDelay = createDelayParameter(enclaveClass.getInputs().get(0).getName() + "_delay");
             ParameterReference paramRef = factory.createParameterReference();
             paramRef.setParameter(topDelay);
-            connInst.getParameters().add(paramRef);
+//            connInst.getParameters().add(paramRef);
 
 
             topDelay.setName("delay");
-            topConn.getLeftPorts().add(inRef);
-            topConn.getRightPorts().add(connInst.get);
+//            topConn.getLeftPorts().add(inRef);
+//            topConn.getRightPorts().add(connInst.get);
 
         }
+        return enclaveClass;
     }
 
     private Reactor createEnclaveConnectionClass(Input input) {
diff --git a/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
new file mode 100644
index 0000000000..2e6ab8aa32
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -0,0 +1,83 @@
+package org.lflang.generator.c;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.lflang.generator.CodeBuilder;
+import org.lflang.generator.ReactorInstance;
+
+public class CEnvironmentFunctionGenerator {
+
+
+    public String generateCode(ReactorInstance main) {
+        this.enclaves = CUtil.getEnclaves(main);
+
+        CodeBuilder code = new CodeBuilder();
+        code.pr(generateEnvironmentInclude());
+        code.pr(generateEnvironmentEnum());
+        code.pr(generateEnvironmentArray());
+        code.pr(generateCreateEnvironments());
+        code.pr(generateGetEnvironments());
+        return code.toString();
+    }
+
+    private List<ReactorInstance> enclaves = new ArrayList<>();
+
+    private String generateEnvironmentInclude() {
+        return "#include \"environment.h\"";
+    }
+
+    private String generateEnvironmentArray() {
+        return String.join("\n",
+            "// The global array of environments associated with each enclave",
+            "environment_t envs[_num_enclaves];");
+    }
+    private String generateGetEnvironments() {
+        return String.join("\n",
+            "// Update the pointer argument to point to the beginning of the environment array",
+            "// and return the size of that array",
+            "int _lf_get_environments(environment_t ** return_envs) {",
+            "   (*return_envs) = (environment_t *) envs;",
+            "   return _num_enclaves;",
+            "}"
+            );
+    }
+
+    private String generateEnvironmentEnum() {
+        CodeBuilder code = new CodeBuilder();
+        code.pr("typedef enum {");
+        code.indent();
+        for (ReactorInstance enclave: enclaves) {
+            code.pr(CUtil.getEnvironmentId(enclave) +",");
+        }
+        code.pr("_num_enclaves");
+        code.unindent();
+        code.pr("} _enclave_id;");
+
+        return code.toString();
+    }
+
+
+    private String generateCreateEnvironments() {
+        CodeBuilder code = new CodeBuilder();
+        code.pr("// 'Create' and initialize the environments in the program");
+        code.pr("void _lf_create_environments() {");
+        code.indent();
+        for (ReactorInstance enclave: enclaves) {
+            code.pr(
+                "environment_init(&"+CUtil.getEnvironmentStruct(enclave) +
+                    ","+CUtil.getEnvironmentId(enclave) +
+                    ","+CUtil.numWorkersInEnclave(enclave) +
+                    ","+CUtil.numTimerTriggersInEnclave(enclave) +
+                    ","+CUtil.numStartupReactionsInEnclave(enclave) +
+                    ","+CUtil.numShutdownReactionsInEnclave(enclave) +
+                    ","+CUtil.numResetReactionsInEnclave(enclave)+
+                    ","+CUtil.numIsPresentFieldsInEnclave(enclave)+
+                    ");"
+            );
+        }
+        code.unindent();
+        code.pr("}");
+        return code.toString();
+    }
+}
diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
index 199dd0a73c..e1574e9119 100644
--- a/org.lflang/src/org/lflang/generator/c/CGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -377,7 +377,7 @@ protected CGenerator(
 
         // Register the delayed connection transformation to be applied by GeneratorBase.
         // transform both after delays and physical connections
-        registerTransformation(new EnclavedConnectionTransformation(enclavedConnectionBodyGenerator, types, fileConfig.resource, true, true));
+//        registerTransformation(new EnclavedConnectionTransformation(enclavedConnectionBodyGenerator, types, fileConfig.resource, true, true));
         registerTransformation(new DelayedConnectionTransformation(delayConnectionBodyGenerator, types, fileConfig.resource, true, true));
 
         // TODO: Register the enclaved connection transformation to be applied by generatorBase
@@ -637,15 +637,8 @@ private void generateCodeFor(
         // Note that any main reactors in imported files are ignored.
         // Skip generation if there are cycles.
         if (main != null) {
+            code.pr(new CEnvironmentFunctionGenerator().generateCode(main));
             initializeTriggerObjects.pr(String.join("\n",
-                "int _lf_startup_reactions_count = 0;",
-                "SUPPRESS_UNUSED_WARNING(_lf_startup_reactions_count);",
-                "int _lf_shutdown_reactions_count = 0;",
-                "SUPPRESS_UNUSED_WARNING(_lf_shutdown_reactions_count);",
-                "int _lf_reset_reactions_count = 0;",
-                "SUPPRESS_UNUSED_WARNING(_lf_reset_reactions_count);",
-                "int _lf_timer_triggers_count = 0;",
-                "SUPPRESS_UNUSED_WARNING(_lf_timer_triggers_count);",
                 "int bank_index;",
                 "SUPPRESS_UNUSED_WARNING(bank_index);"
             ));
@@ -689,8 +682,7 @@ private void generateCodeFor(
                 initializeTriggerObjects,
                 startTimeStep,
                 types,
-                lfModuleName,
-                startTimeStepIsPresentCount
+                lfModuleName
             ));
 
             // Generate function to trigger startup reactions for all reactors.
@@ -1496,11 +1488,15 @@ private void generateStartTimeStep(ReactorInstance instance) {
                     var portRef = CUtil.portRefNested(port);
                     var con = (port.isMultiport()) ? "->" : ".";
 
-                    temp.pr("env->_lf_is_present_fields["+startTimeStepIsPresentCount+" + count] = &"+portRef+con+"is_present;");
+                    temp.pr(
+                        CUtil.getEnvironmentStruct(instance)+
+                            "._lf_is_present_fields[] = &"+portRef+con+"is_present;");
                     // Intended_tag is only applicable to ports in federated execution.
                     temp.pr(
                         CExtensionUtils.surroundWithIfFederatedDecentralized(
-                        "env->_lf_intended_tag_fields["+startTimeStepIsPresentCount+" + count] = &"+portRef+con+"intended_tag;"
+                            CUtil.getEnvironmentStruct(instance) +
+                        "._lf_intended_tag_fields[is_present_fields_count["+CUtil.getEnvironmentId(instance)+"]++] = &"+portRef+con+"intended_tag;"
+
                         )
                     );
 
@@ -1527,7 +1523,7 @@ private void generateStartTimeStep(ReactorInstance instance) {
 
             temp.pr(String.join("\n",
                 "// Add action "+action.getFullName()+" to array of is_present fields.",
-                "env->_lf_is_present_fields["+startTimeStepIsPresentCount+"] ",
+                CUtil.getEnvironmentStruct(instance) + "._lf_is_present_fields[is_present_fields_count["+CUtil.getEnvironmentId(instance)+"]++] ",
                 "        = &"+containerSelfStructName+"->_lf_"+action.getName()+".is_present;"
             ));
 
@@ -1538,13 +1534,12 @@ private void generateStartTimeStep(ReactorInstance instance) {
                                 "// Add action " + action.getFullName()
                                     + " to array of intended_tag fields.",
                                 "_lf_intended_tag_fields["
-                                    + startTimeStepIsPresentCount + "] ",
+                                    + "is_present_fields_count["+CUtil.getEnvironmentId(instance)+"]++]",
                                 "        = &" + containerSelfStructName
                                     + "->_lf_" + action.getName()
                                     + ".intended_tag;"
                     )));
 
-            startTimeStepIsPresentCount += action.getParent().getTotalWidth();
             temp.endScopedBlock();
         }
         if (foundOne) startTimeStep.pr(temp.toString());
@@ -1686,8 +1681,7 @@ public void generateReactorInstance(ReactorInstance instance) {
         // Generate the instance self struct containing parameters, state variables,
         // and outputs (the "self" struct).
         initializeTriggerObjects.pr(CUtil.reactorRefName(instance)+"["+CUtil.runtimeIndex(instance)+"] = new_"+CUtil.getName(reactorClass)+"();");
-        // FIXME: Following line is a temporary hack for enclaves while we use a single global environment.
-        // initializeTriggerObjects.pr(CUtil.reactorRefName(instance)+"["+CUtil.runtimeIndex(instance)+"]->base.environment = env;");
+         initializeTriggerObjects.pr(CUtil.reactorRefName(instance)+"["+CUtil.runtimeIndex(instance)+"]->base.environment = &envs["+CUtil.getEnvironmentId(instance)+"];");
         // Generate code to initialize the "self" struct in the
         // _lf_initialize_trigger_objects function.
         generateTraceTableEntries(instance);
diff --git a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
index 749e289532..12e282f2fd 100644
--- a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
@@ -343,7 +343,7 @@ public static String generateForwardBody(String outputName, String targetType, S
                 String.join("\n",
                     DISABLE_REACTION_INITIALIZATION_MARKER,
                     "self->_lf_"+outputName+".value = ("+targetType+")self->_lf__"+actionName+".tmplt.token->value;",
-                    "_lf_replace_template_token(selv->base.environment, (token_template_t*)&self->_lf_"+outputName+", (lf_token_t*)self->_lf__"+actionName+".tmplt.token);", //FIXME: Enclaves step1 hack
+                    "_lf_replace_template_token((token_template_t*)&self->_lf_"+outputName+", (lf_token_t*)self->_lf__"+actionName+".tmplt.token);", //FIXME: Enclaves step1 hack
                     "self->_lf_"+outputName+".is_present = true;"
                 ) :
                 "lf_set("+outputName+", "+actionName+"->value);";
@@ -512,7 +512,7 @@ private static String generateActionVariablesInReaction(
             "// Set the fields of the action struct to match the current trigger.",
             action.getName()+"->is_present = (bool)self->_lf__"+action.getName()+".status;",
             action.getName()+"->has_value = ("+tokenPointer+" != NULL && "+tokenPointer+"->value != NULL);",
-            "_lf_replace_template_token(self->base.environment, (token_template_t*)"+action.getName()+", "+tokenPointer+");") //FIXME: Enclaves step1 hack
+            "_lf_replace_template_token((token_template_t*)"+action.getName()+", "+tokenPointer+");") //FIXME: Enclaves step1 hack
         );
         // Set the value field only if there is a type.
         if (!type.isUndefined()) {
diff --git a/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java b/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
index df071ef72b..97506debfb 100644
--- a/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
@@ -21,15 +21,17 @@ public static String generateInitializer(TimerInstance timer) {
         var offset = CTypes.getInstance().getTargetTimeExpr(timer.getOffset());
         var period = CTypes.getInstance().getTargetTimeExpr(timer.getPeriod());
         var mode = timer.getMode(false);
+        var envId = CUtil.getEnvironmentId(timer.getParent());
         var modeRef = mode != null ?
             "&"+CUtil.reactorRef(mode.getParent())+"->_lf__modes["+mode.getParent().modes.indexOf(mode)+"];" :
             "NULL";
 
         return String.join("\n", List.of(
-            "// Initializing timer "+timer.getFullName()+".",
+            "// Initiaizing timer "+timer.getFullName()+".",
             triggerStructName+".offset = "+offset+";",
             triggerStructName+".period = "+period+";",
-            "_lf_timer_triggers[_lf_timer_triggers_count++] = &"+triggerStructName+";",
+            "// Associate timer with the environment of its parent",
+            "envs["+envId+"]._lf_timer_triggers[timer_triggers_count["+envId+"]++] = &"+triggerStructName+";",
             triggerStructName+".mode = "+modeRef+";"
         ));
     }
@@ -39,7 +41,6 @@ public static String generateInitializer(TimerInstance timer) {
      *
      * @param timerCount The total number of timers in the program
      */
-    //FIXME: The _lf_environment parameter is added as a hack to get step1 of enclaves support working
     public static String generateLfInitializeTimer(int timerCount) {
         return String.join("\n",
             "void _lf_initialize_timers(environment_t *env) {",
diff --git a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 7473a3b6f7..a4eb5d78aa 100644
--- a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -11,6 +11,7 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.stream.Collectors;
 
 import org.lflang.ASTUtils;
@@ -45,11 +46,10 @@ public static String generateInitializeTriggerObjects(
         CodeBuilder initializeTriggerObjects,
         CodeBuilder startTimeStep,
         CTypes types,
-        String lfModuleName,
-        int startTimeStepIsPresentCount
+        String lfModuleName
     ) {
         var code = new CodeBuilder();
-        code.pr("void _lf_initialize_trigger_objects(environment_t* env) {");
+        code.pr("void _lf_initialize_trigger_objects() {");
         code.indent();
         // Initialize the LF clock.
         code.pr(String.join("\n",
@@ -69,38 +69,17 @@ public static String generateInitializeTriggerObjects(
             )); // .lft is for Lingua Franca trace
         }
 
-        // Create the table to initialize is_present fields to false between time steps.
-        if (startTimeStepIsPresentCount > 0) {
-            // Allocate the initial (before mutations) array of pointers to _is_present fields.
-            code.pr(String.join("\n",
-                "// Create the array that will contain pointers to is_present fields to reset on each step.",
-                "env->_lf_is_present_fields_size = "+startTimeStepIsPresentCount+";",
-                "env->_lf_is_present_fields = (bool**)calloc("+startTimeStepIsPresentCount+", sizeof(bool*));",
-                "if (env->_lf_is_present_fields == NULL) lf_print_error_and_exit(" + addDoubleQuotes("Out of memory!") + ");",
-                "env->_lf_is_present_fields_abbreviated = (bool**)calloc("+startTimeStepIsPresentCount+", sizeof(bool*));",
-                "if (env->_lf_is_present_fields_abbreviated == NULL) lf_print_error_and_exit(" + addDoubleQuotes("Out of memory!") + ");",
-                "env->_lf_is_present_fields_abbreviated_size = 0;"
+        // Create arrays of counters for managing pointer arrays of startup, shutdown, reset and triggers
+        code.pr(String.join("\n",
+            "int startup_reaction_count[_num_enclaves] = {0};",
+            "int shutdown_reaction_count[_num_enclaves] = {0};",
+            "int reset_reaction_count[_num_enclaves] = {0};",
+            "int timer_triggers_count[_num_enclaves] = {0};",
+            "int is_present_fields_count[_num_enclaves] = {0};"
             ));
-        }
 
         // Create the table to initialize intended tag fields to 0 between time
         // steps.
-        if (startTimeStepIsPresentCount > 0) {
-            // Allocate the initial (before mutations) array of pointers to
-            // intended_tag fields.
-            // There is a 1-1 map between structs containing is_present and
-            // intended_tag fields,
-            // thus, we reuse startTimeStepIsPresentCount as the counter.
-            code.pr(String.join("\n",
-                                CExtensionUtils.surroundWithIfFederatedDecentralized("""
-                                // Create the array that will contain pointers to intended_tag fields to reset on each step.
-                                _lf_intended_tag_fields_size = %s;
-                                _lf_intended_tag_fields = (tag_t**)malloc(_lf_intended_tag_fields_size * sizeof(tag_t*));
-                                """.formatted(startTimeStepIsPresentCount)
-                                )
-            ));
-        }
-
 
         code.pr(initializeTriggerObjects.toString());
 
@@ -129,7 +108,7 @@ public static String generateInitializeTriggerObjects(
         code.pr(setReactionPriorities(
             main
         ));
-        code.pr(generateSchedulerInitializer(
+        code.pr(generateSchedulerInitializerMain(
             main,
             targetConfig
         ));
@@ -151,7 +130,7 @@ public static String generateInitializeTriggerObjects(
     /**
     * Generate code to initialize the scheduler for the threaded C runtime.
     */
-    public static String generateSchedulerInitializer(
+    public static String generateSchedulerInitializerMain(
         ReactorInstance main,
         TargetConfig targetConfig
     ) {
@@ -163,20 +142,35 @@ public static String generateSchedulerInitializer(
         var numReactionsPerLevelJoined = Arrays.stream(numReactionsPerLevel)
                 .map(String::valueOf)
                 .collect(Collectors.joining(", "));
+        // FIXME: We want to calculate levels for each enclave independently
         code.pr(String.join("\n",
             "// Initialize the scheduler",
             "size_t num_reactions_per_level["+numReactionsPerLevel.length+"] = ",
             "    {" + numReactionsPerLevelJoined + "};",
             "sched_params_t sched_params = (sched_params_t) {",
             "                        .num_reactions_per_level = &num_reactions_per_level[0],",
-            "                        .num_reactions_per_level_size = (size_t) "+numReactionsPerLevel.length+"};",
+            "                        .num_reactions_per_level_size = (size_t) "+numReactionsPerLevel.length+"};"
+        ));
+
+        for (ReactorInstance enclave: CUtil.getEnclaves(main)) {
+            code.pr(generateSchedulerInitializerEnclave(enclave, targetConfig));
+        }
+
+        return code.toString();
+    }
+
+    // FIXME: Probably we want some enclaveConfig handed off
+    public static String generateSchedulerInitializerEnclave(
+        ReactorInstance enclave,
+        TargetConfig targetConfig
+    ) {
+        return String.join("\n",
             "lf_sched_init(",
-            "    env,", // FIXME: Hack for enclaves step1
-            "    env->num_workers,", // FIXME: Need better way of setting this
+            "    &"+CUtil.getEnvironmentStruct(enclave)+",", // FIXME: Hack for enclaves step1
+            "    "+CUtil.getEnvironmentStruct(enclave)+".num_workers,", // FIXME: Need better way of setting this
             "    &sched_params",
             ");"
-        ));
-        return code.toString();
+        );
     }
 
     /**
diff --git a/org.lflang/src/org/lflang/generator/c/CUtil.java b/org.lflang/src/org/lflang/generator/c/CUtil.java
index b5949f660b..439f451b6f 100644
--- a/org.lflang/src/org/lflang/generator/c/CUtil.java
+++ b/org.lflang/src/org/lflang/generator/c/CUtil.java
@@ -26,6 +26,8 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 
 package org.lflang.generator.c;
 
+import static org.lflang.AttributeUtils.isEnclave;
+
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -800,4 +802,53 @@ public static String getShortenedName(ReactorInstance instance) {
         }
         return description;
     }
+
+    // Returns the ReactorInstance of the closest enclave in the containment hierarchy.
+    // FIXME: Does this work, is a ReactorInstance == an instantiation which can be enclaved?
+    public static ReactorInstance getClosestEnclave(ReactorInstance inst) {
+        if (inst.isMainOrFederated() || isEnclave(inst.getDefinition())) {
+            return inst;
+        }
+        return getClosestEnclave(inst.getParent());
+    }
+
+    public static String getEnvironmentId(ReactorInstance inst) {
+        ReactorInstance enclave = getClosestEnclave(inst);
+        return enclave.uniqueID();
+    }
+
+    // Returns a string which represents a C literal which points to the struct of the environment
+    // of the ReactorInstance inst.
+    public static String getEnvironmentStruct(ReactorInstance inst) {
+        return "envs["+getEnvironmentId(inst)+"]";
+    }
+
+    // Given an instance, e.g. the main reactor, return a list of all enclaves in the program
+    public static List<ReactorInstance> getEnclaves(ReactorInstance inst) {
+        List<ReactorInstance> enclaves = new ArrayList<>();
+        if (inst.isMainOrFederated() || isEnclave(inst.getDefinition())) {
+            enclaves.add(inst);
+        }
+        return enclaves;
+    }
+
+    // FIXME: All the functions below needs to be implemented, somehow
+    public static int numStartupReactionsInEnclave(ReactorInstance enclave) {
+        return 1;
+    }
+    public static int numShutdownReactionsInEnclave(ReactorInstance enclave) {
+        return 1;
+    }
+    public static int numResetReactionsInEnclave(ReactorInstance enclave) {
+        return 1;
+    }
+    public static int numWorkersInEnclave(ReactorInstance enclave) {
+        return 1;
+    }
+    public static int numTimerTriggersInEnclave(ReactorInstance enclave) {
+        return 1;
+    }
+    public static int numIsPresentFieldsInEnclave(ReactorInstance enclave) {
+        return 3;
+    }
 }

From 703ff11c9acb86e93b29993e062889c10081b9e8 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Mon, 22 May 2023 23:11:41 -0700
Subject: [PATCH 0136/1114] Remove startup,shutdown and reset trigger table
 generation

---
 .../src/org/lflang/generator/c/CGenerator.java   | 13 ++-----------
 .../lflang/generator/c/CReactionGenerator.java   | 16 ++++++++--------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
index 0ba19e2332..fc0c7dd03a 100644
--- a/org.lflang/src/org/lflang/generator/c/CGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -685,15 +685,6 @@ private void generateCodeFor(
                 if (targetLanguageIsCpp()) code.pr("}");
             }
 
-            // If there are startup reactions, create a table of triggers.
-            code.pr(CReactionGenerator.generateBuiltinTriggersTable(startupReactionCount, "startup"));
-
-            // If there are shutdown reactions, create a table of triggers.
-            code.pr(CReactionGenerator.generateBuiltinTriggersTable(shutdownReactionCount, "shutdown"));
-
-            // If there are reset reactions, create a table of triggers.
-            code.pr(CReactionGenerator.generateBuiltinTriggersTable(resetReactionCount, "reset"));
-
             // If there are watchdogs, create a table of triggers.
             code.pr(CWatchdogGenerator.generateWatchdogTable(watchdogCount));
 
@@ -1536,7 +1527,7 @@ private void generateStartTimeStep(ReactorInstance instance) {
 
                     startTimeStepIsPresentCount += port.getWidth() * port.getParent().getTotalWidth();
 
-                    if (!Objects.equal(port.getParent(), instance)) {
+                    if (port.getParent() != instance) {
                         temp.pr("count++;");
                         temp.endScopedBlock();
                         temp.endScopedBlock();
@@ -1568,7 +1559,7 @@ private void generateStartTimeStep(ReactorInstance instance) {
                                 "// Add action " + action.getFullName()
                                     + " to array of intended_tag fields.",
                                 "_lf_intended_tag_fields["
-                                    + "is_present_fields_count["+CUtil.getEnvironmentId(instance)+"]++]",
+                                    + "is_present_fields_count["+CUtil.getEnvironmentId(instance)+"]]",
                                 "        = &" + containerSelfStructName
                                     + "->_lf_" + action.getName()
                                     + ".intended_tag;"
diff --git a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
index 8de6db7630..e1d19184f1 100644
--- a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
@@ -971,25 +971,25 @@ public static String generateLfTriggerStartupReactions(int startupReactionCount,
             s.append("\n");
             if (hasModalReactors) {
                 s.append(String.join("\n",
-                    "    for (int i = 0; i < _lf_startup_reactions_size; i++) {",
-                    "        if (_lf_startup_reactions[i] != NULL) {",
-                    "            if (_lf_startup_reactions[i]->mode != NULL) {",
+                    "    for (int i = 0; i < env->_lf_startup_reactions_size; i++) {",
+                    "        if (env->_lf_startup_reactions[i] != NULL) {",
+                    "            if (env->_lf_startup_reactions[i]->mode != NULL) {",
                     "                // Skip reactions in modes",
                     "                continue;",
                     "            }",
-                    "            _lf_trigger_reaction(env, _lf_startup_reactions[i], -1);",
+                    "            _lf_trigger_reaction(env, env->_lf_startup_reactions[i], -1);",
                     "        }",
                     "    }",
                     "    _lf_handle_mode_startup_reset_reactions(",
-                    "        _lf_startup_reactions, _lf_startup_reactions_size,",
+                    "        env->_lf_startup_reactions, env->_lf_startup_reactions_size,",
                     "        NULL, 0,",
                     "        _lf_modal_reactor_states, _lf_modal_reactor_states_size);"
                 ));
             } else {
                 s.append(String.join("\n",
-                    "    for (int i = 0; i < _lf_startup_reactions_size; i++) {",
-                    "        if (_lf_startup_reactions[i] != NULL) {",
-                    "            _lf_trigger_reaction(env, _lf_startup_reactions[i], -1);",
+                    "    for (int i = 0; i < env->_lf_startup_reactions_size; i++) {",
+                    "        if (env->_lf_startup_reactions[i] != NULL) {",
+                    "            _lf_trigger_reaction(env, env->_lf_startup_reactions[i], -1);",
                     "        }",
                     "    }"
                 ));

From db75f89e352c611bda3232fe5c57b97ef4f40610 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 23 May 2023 00:07:06 -0700
Subject: [PATCH 0137/1114] Create EnclaveInfo which holds, among other things,
 the number of isPresent fields in the enclave. Will move more info about the
 enclaves there

---
 .../src/org/lflang/generator/EnclaveInfo.java | 16 ++++++
 .../org/lflang/generator/ReactorInstance.java |  8 ++-
 .../c/CEnvironmentFunctionGenerator.java      | 12 ++--
 .../org/lflang/generator/c/CGenerator.java    | 55 ++++++++++---------
 .../generator/c/CTriggerObjectsGenerator.java |  3 +-
 5 files changed, 59 insertions(+), 35 deletions(-)
 create mode 100644 org.lflang/src/org/lflang/generator/EnclaveInfo.java

diff --git a/org.lflang/src/org/lflang/generator/EnclaveInfo.java b/org.lflang/src/org/lflang/generator/EnclaveInfo.java
new file mode 100644
index 0000000000..d704ad8312
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/EnclaveInfo.java
@@ -0,0 +1,16 @@
+package org.lflang.generator;
+
+public class EnclaveInfo {
+    public int numIsPresentFields = 0;
+    public int numStartupReactions = 0;
+    public int numShutdownReactions = 0;
+    public int numTimerTriggers = 0;
+    public int numResetReactions = 0;
+    public int numWorkers = 1;
+
+    private ReactorInstance instance;
+
+    public EnclaveInfo(ReactorInstance inst) {
+        instance = inst;
+    }
+}
diff --git a/org.lflang/src/org/lflang/generator/ReactorInstance.java b/org.lflang/src/org/lflang/generator/ReactorInstance.java
index 39528a703b..d651ce825b 100644
--- a/org.lflang/src/org/lflang/generator/ReactorInstance.java
+++ b/org.lflang/src/org/lflang/generator/ReactorInstance.java
@@ -28,6 +28,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 
 import static org.lflang.ASTUtils.belongsTo;
 import static org.lflang.ASTUtils.getLiteralTimeValue;
+import static org.lflang.AttributeUtils.isEnclave;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -53,7 +54,6 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.lf.Initializer;
 import org.lflang.lf.Input;
 import org.lflang.lf.Instantiation;
-import org.lflang.lf.LfFactory;
 import org.lflang.lf.Mode;
 import org.lflang.lf.Output;
 import org.lflang.lf.Parameter;
@@ -166,6 +166,8 @@ public ReactorInstance(Reactor reactor, ReactorInstance parent, ErrorReporter re
     /** Indicator that this reactor has itself as a parent, an error condition. */
     public final boolean recursive;
 
+    // An enclave object if this ReactorInstance is an enclave. null if not
+    public EnclaveInfo enclaveInfo = null;
     //////////////////////////////////////////////////////
     //// Public methods.
 
@@ -809,6 +811,10 @@ private ReactorInstance(
         this.reactorDeclaration = definition.getReactorClass();
         this.reactorDefinition = ASTUtils.toDefinition(reactorDeclaration);
 
+        if (isEnclave(definition)) {
+            enclaveInfo = new EnclaveInfo(this);
+        }
+
         // check for recursive instantiation
         var currentParent = parent;
         var foundSelfAsParent = false;
diff --git a/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
index 2e6ab8aa32..6b07da67bf 100644
--- a/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -67,12 +67,12 @@ private String generateCreateEnvironments() {
             code.pr(
                 "environment_init(&"+CUtil.getEnvironmentStruct(enclave) +
                     ","+CUtil.getEnvironmentId(enclave) +
-                    ","+CUtil.numWorkersInEnclave(enclave) +
-                    ","+CUtil.numTimerTriggersInEnclave(enclave) +
-                    ","+CUtil.numStartupReactionsInEnclave(enclave) +
-                    ","+CUtil.numShutdownReactionsInEnclave(enclave) +
-                    ","+CUtil.numResetReactionsInEnclave(enclave)+
-                    ","+CUtil.numIsPresentFieldsInEnclave(enclave)+
+                    ","+enclave.enclaveInfo.numWorkers +
+                    ","+enclave.enclaveInfo.numTimerTriggers+
+                    ","+enclave.enclaveInfo.numStartupReactions +
+                    ","+enclave.enclaveInfo.numShutdownReactions +
+                    ","+enclave.enclaveInfo.numResetReactions +
+                    ","+enclave.enclaveInfo.numIsPresentFields +
                     ");"
             );
         }
diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
index fc0c7dd03a..168dccba68 100644
--- a/org.lflang/src/org/lflang/generator/c/CGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -28,7 +28,6 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import static org.lflang.ASTUtils.allPorts;
 import static org.lflang.ASTUtils.allReactions;
 import static org.lflang.ASTUtils.allStateVars;
-import static org.lflang.ASTUtils.convertToEmptyListIfNull;
 import static org.lflang.ASTUtils.getInferredType;
 import static org.lflang.ASTUtils.isInitialized;
 import static org.lflang.ASTUtils.toDefinition;
@@ -39,9 +38,11 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -52,7 +53,6 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.eclipse.xtext.xbase.lib.StringExtensions;
 
 import org.lflang.ASTUtils;
-import org.lflang.ast.EnclavedConnectionTransformation;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.DockerComposeGenerator;
 import org.lflang.FileConfig;
@@ -88,7 +88,6 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.lf.Input;
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.Mode;
-import org.lflang.lf.Model;
 import org.lflang.lf.Port;
 import org.lflang.lf.Preamble;
 import org.lflang.lf.Reaction;
@@ -99,6 +98,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.util.ArduinoUtil;
 import org.lflang.util.FileUtil;
 
+import com.google.common.base.Objects;
 import com.google.common.collect.Iterables;
 
 /**
@@ -334,7 +334,6 @@ public class CGenerator extends GeneratorBase {
      * Count of the number of is_present fields of the self struct that
      * need to be reinitialized in _lf_start_time_step().
      */
-    protected int startTimeStepIsPresentCount = 0;
 
     ////////////////////////////////////////////
     //// Private fields
@@ -652,7 +651,6 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     private void generateCodeFor(
         String lfModuleName
     ) throws IOException {
-        startTimeStepIsPresentCount = 0;
         code.pr(generateDirectives());
         code.pr(new CMainFunctionGenerator(targetConfig).generateCode());
         // Generate code for each reactor.
@@ -1471,6 +1469,11 @@ private void recordBuiltinTriggers(ReactorInstance instance) {
         }
     }
 
+    /**
+     * Generate code to set up the tables used in _lf_start_time_step to decrement reference
+     * counts and mark outputs absent between time steps. This function puts the code
+     * into startTimeStep.
+     */
     /**
      * Generate code to set up the tables used in _lf_start_time_step to decrement reference
      * counts and mark outputs absent between time steps. This function puts the code
@@ -1481,6 +1484,9 @@ private void generateStartTimeStep(ReactorInstance instance) {
         var foundOne = false;
         var temp = new CodeBuilder();
         var containerSelfStructName = CUtil.reactorRef(instance);
+        var enclave = CUtil.getClosestEnclave(instance);
+        var enclaveInfo = enclave.enclaveInfo;
+        var enclaveStruct = CUtil.getEnvironmentStruct(enclave);
 
         // Handle inputs that get sent data from a reaction rather than from
         // another contained reactor and reactions that are triggered by an
@@ -1500,7 +1506,7 @@ private void generateStartTimeStep(ReactorInstance instance) {
 
                     temp.pr("// Add port "+port.getFullName()+" to array of is_present fields.");
 
-                    if (!instance.equals(port.getParent())) {
+                    if (!Objects.equal(port.getParent(), instance)) {
                         // The port belongs to contained reactor, so we also have
                         // iterate over the instance bank members.
                         temp.startScopedBlock();
@@ -1513,21 +1519,17 @@ private void generateStartTimeStep(ReactorInstance instance) {
                     var portRef = CUtil.portRefNested(port);
                     var con = (port.isMultiport()) ? "->" : ".";
 
-                    temp.pr(
-                        CUtil.getEnvironmentStruct(instance)+
-                            "._lf_is_present_fields[] = &"+portRef+con+"is_present;");
+                    temp.pr(enclaveStruct+"._lf_is_present_fields["+enclaveInfo.numIsPresentFields+" + count] = &"+portRef+con+"is_present;");
                     // Intended_tag is only applicable to ports in federated execution.
                     temp.pr(
                         CExtensionUtils.surroundWithIfFederatedDecentralized(
-                            CUtil.getEnvironmentStruct(instance) +
-                        "._lf_intended_tag_fields[is_present_fields_count["+CUtil.getEnvironmentId(instance)+"]++] = &"+portRef+con+"intended_tag;"
-
+                            enclaveStruct+"._lf_intended_tag_fields["+enclaveInfo.numIsPresentFields+" + count] = &"+portRef+con+"intended_tag;"
                         )
                     );
 
-                    startTimeStepIsPresentCount += port.getWidth() * port.getParent().getTotalWidth();
+                    enclaveInfo.numIsPresentFields += port.getWidth() * port.getParent().getTotalWidth();
 
-                    if (port.getParent() != instance) {
+                    if (!Objects.equal(port.getParent(), instance)) {
                         temp.pr("count++;");
                         temp.endScopedBlock();
                         temp.endScopedBlock();
@@ -1548,7 +1550,7 @@ private void generateStartTimeStep(ReactorInstance instance) {
 
             temp.pr(String.join("\n",
                 "// Add action "+action.getFullName()+" to array of is_present fields.",
-                CUtil.getEnvironmentStruct(instance) + "._lf_is_present_fields[is_present_fields_count["+CUtil.getEnvironmentId(instance)+"]++] ",
+                enclaveStruct+"._lf_is_present_fields["+enclaveInfo.numIsPresentFields+"] ",
                 "        = &"+containerSelfStructName+"->_lf_"+action.getName()+".is_present;"
             ));
 
@@ -1556,15 +1558,16 @@ private void generateStartTimeStep(ReactorInstance instance) {
             temp.pr(
                 CExtensionUtils.surroundWithIfFederatedDecentralized(
                     String.join("\n",
-                                "// Add action " + action.getFullName()
-                                    + " to array of intended_tag fields.",
-                                "_lf_intended_tag_fields["
-                                    + "is_present_fields_count["+CUtil.getEnvironmentId(instance)+"]]",
-                                "        = &" + containerSelfStructName
-                                    + "->_lf_" + action.getName()
-                                    + ".intended_tag;"
+                        "// Add action " + action.getFullName()
+                            + " to array of intended_tag fields.",
+                        enclaveStruct+"._lf_intended_tag_fields["
+                            + enclaveInfo.numIsPresentFields + "] ",
+                        "        = &" + containerSelfStructName
+                            + "->_lf_" + action.getName()
+                            + ".intended_tag;"
                     )));
 
+            enclaveInfo.numIsPresentFields += action.getParent().getTotalWidth();
             temp.endScopedBlock();
         }
         if (foundOne) startTimeStep.pr(temp.toString());
@@ -1585,14 +1588,14 @@ private void generateStartTimeStep(ReactorInstance instance) {
                         foundOne = true;
                         temp.pr("// Add port "+output.getFullName()+" to array of is_present fields.");
                         temp.startChannelIteration(output);
-                        temp.pr("env->_lf_is_present_fields["+startTimeStepIsPresentCount+" + count] = &"+CUtil.portRef(output)+".is_present;");
+                        temp.pr(enclaveStruct+"._lf_is_present_fields["+enclaveInfo.numIsPresentFields+" + count] = &"+CUtil.portRef(output)+".is_present;");
 
                         // Intended_tag is only applicable to ports in federated execution with decentralized coordination.
                         temp.pr(
                             CExtensionUtils.surroundWithIfFederatedDecentralized(
                                 String.join("\n",
-                                            "// Add port "+output.getFullName()+" to array of intended_tag fields.",
-                                                "_lf_intended_tag_fields["+startTimeStepIsPresentCount+" + count] = &"+CUtil.portRef(output)+".intended_tag;"
+                                    "// Add port "+output.getFullName()+" to array of intended_tag fields.",
+                                    enclaveStruct+"._lf_intended_tag_fields["+enclaveInfo.numIsPresentFields+" + count] = &"+CUtil.portRef(output)+".intended_tag;"
                                 )));
 
                         temp.pr("count++;");
@@ -1600,7 +1603,7 @@ private void generateStartTimeStep(ReactorInstance instance) {
                         temp.endChannelIteration(output);
                     }
                 }
-                startTimeStepIsPresentCount += channelCount * child.getTotalWidth();
+                enclaveInfo.numIsPresentFields += channelCount * child.getTotalWidth();
                 temp.endScopedBlock();
                 temp.endScopedBlock();
             }
diff --git a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
index a4eb5d78aa..3a80d15ca6 100644
--- a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -74,8 +74,7 @@ public static String generateInitializeTriggerObjects(
             "int startup_reaction_count[_num_enclaves] = {0};",
             "int shutdown_reaction_count[_num_enclaves] = {0};",
             "int reset_reaction_count[_num_enclaves] = {0};",
-            "int timer_triggers_count[_num_enclaves] = {0};",
-            "int is_present_fields_count[_num_enclaves] = {0};"
+            "int timer_triggers_count[_num_enclaves] = {0};"
             ));
 
         // Create the table to initialize intended tag fields to 0 between time

From fdbd1e942e16da1dccf6515cb067dc1370c4dc8d Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 23 May 2023 00:39:01 -0700
Subject: [PATCH 0138/1114] Use EnclaveInfo to generate environment functions

---
 .../src/org/lflang/generator/ReactorInstance.java      |  2 +-
 .../generator/c/CEnvironmentFunctionGenerator.java     | 10 ++++++++--
 org.lflang/src/org/lflang/generator/c/CGenerator.java  |  9 +++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/ReactorInstance.java b/org.lflang/src/org/lflang/generator/ReactorInstance.java
index d651ce825b..5b1b584d9d 100644
--- a/org.lflang/src/org/lflang/generator/ReactorInstance.java
+++ b/org.lflang/src/org/lflang/generator/ReactorInstance.java
@@ -811,7 +811,7 @@ private ReactorInstance(
         this.reactorDeclaration = definition.getReactorClass();
         this.reactorDefinition = ASTUtils.toDefinition(reactorDeclaration);
 
-        if (isEnclave(definition)) {
+        if (isEnclave(definition) || this.isMainOrFederated()) {
             enclaveInfo = new EnclaveInfo(this);
         }
 
diff --git a/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
index 6b07da67bf..e97c390e4a 100644
--- a/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -9,13 +9,19 @@
 public class CEnvironmentFunctionGenerator {
 
 
-    public String generateCode(ReactorInstance main) {
+    public CEnvironmentFunctionGenerator(ReactorInstance main) {
         this.enclaves = CUtil.getEnclaves(main);
-
+    }
+    public String generateDeclarations() {
         CodeBuilder code = new CodeBuilder();
         code.pr(generateEnvironmentInclude());
         code.pr(generateEnvironmentEnum());
         code.pr(generateEnvironmentArray());
+        return code.toString();
+    }
+
+    public String generateDefinitions() {
+        CodeBuilder code = new CodeBuilder();
         code.pr(generateCreateEnvironments());
         code.pr(generateGetEnvironments());
         return code.toString();
diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
index 168dccba68..2642a1b4c4 100644
--- a/org.lflang/src/org/lflang/generator/c/CGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -660,14 +660,17 @@ private void generateCodeFor(
         // Note that any main reactors in imported files are ignored.
         // Skip generation if there are cycles.
         if (main != null) {
-            code.pr(new CEnvironmentFunctionGenerator().generateCode(main));
+            initializeTriggerObjects.pr(CModesGenerator.generateModalInitalizationCounters(hasModalReactors));
+            var envFuncGen = new CEnvironmentFunctionGenerator(main);
+
+
+            code.pr(envFuncGen.generateDeclarations());
             initializeTriggerObjects.pr(String.join("\n",
                 "int bank_index;",
                 "SUPPRESS_UNUSED_WARNING(bank_index);",
                 "int watchdog_number = 0;",
                 "SUPPRESS_UNUSED_WARNING(watchdog_number);"));
             // Add counters for modal initialization
-            initializeTriggerObjects.pr(CModesGenerator.generateModalInitalizationCounters(hasModalReactors));
 
             // Create an array of arrays to store all self structs.
             // This is needed because connections cannot be established until
@@ -677,6 +680,8 @@ private void generateCodeFor(
             generateSelfStructs(main);
             generateReactorInstance(main);
 
+            code.pr(envFuncGen.generateDefinitions());
+
             if (targetConfig.fedSetupPreamble != null) {
                 if (targetLanguageIsCpp()) code.pr("extern \"C\" {");
                 code.pr("#include \"" + targetConfig.fedSetupPreamble + "\"");

From cc9438b4667f5554bad8e56c3ac65534e6e21b02 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 23 May 2023 00:56:24 -0700
Subject: [PATCH 0139/1114] Update Startup, Shutdown and Reset reactions to use
 the EnclaveInfo

---
 .../org/lflang/generator/c/CGenerator.java    | 25 +++----
 .../generator/c/CReactionGenerator.java       | 69 ++++++++-----------
 .../lflang/generator/c/CTimerGenerator.java   | 15 ++--
 3 files changed, 48 insertions(+), 61 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
index 2642a1b4c4..73e64492b1 100644
--- a/org.lflang/src/org/lflang/generator/c/CGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -348,8 +348,6 @@ public class CGenerator extends GeneratorBase {
     /** Count of the number of token pointers that need to have their
      *  reference count decremented in _lf_start_time_step().
      */
-    private int timerCount = 0;
-    private int startupReactionCount = 0;
     private int shutdownReactionCount = 0;
     private int resetReactionCount = 0;
     private int modalReactorCount = 0;
@@ -709,10 +707,10 @@ private void generateCodeFor(
             ));
 
             // Generate function to trigger startup reactions for all reactors.
-            code.pr(CReactionGenerator.generateLfTriggerStartupReactions(startupReactionCount, hasModalReactors));
+            code.pr(CReactionGenerator.generateLfTriggerStartupReactions(hasModalReactors));
 
             // Generate function to schedule timers for all reactors.
-            code.pr(CTimerGenerator.generateLfInitializeTimer(timerCount));
+            code.pr(CTimerGenerator.generateLfInitializeTimer());
 
             // Generate a function that will either do nothing
             // (if there is only one federate or the coordination
@@ -752,7 +750,6 @@ void terminate_execution() {}
                 modalStateResetCount
             ));
             code.pr(CReactionGenerator.generateLfModeTriggeredReactions(
-                startupReactionCount,
                 resetReactionCount,
                 hasModalReactors
             ));
@@ -1437,6 +1434,10 @@ protected void generateReaction(CodeBuilder src, Reaction reaction, Reactor r, i
     private void recordBuiltinTriggers(ReactorInstance instance) {
         // For each reaction instance, allocate the arrays that will be used to
         // trigger downstream reactions.
+
+        var enclaveInfo = CUtil.getClosestEnclave(instance).enclaveInfo;
+        var enclaveStruct = CUtil.getEnvironmentStruct(instance);
+        var enclaveId = CUtil.getEnvironmentId(instance);
         for (ReactionInstance reaction : instance.reactions) {
             var reactor = reaction.getParent();
             var temp = new CodeBuilder();
@@ -1448,13 +1449,13 @@ private void recordBuiltinTriggers(ReactorInstance instance) {
             // of a contained reactor.  Also, handle startup and shutdown triggers.
             for (TriggerInstance<?> trigger : reaction.triggers) {
                 if (trigger.isStartup()) {
-                    temp.pr("_lf_startup_reactions[_lf_startup_reactions_count++] = &"+reactionRef+";");
-                    startupReactionCount += reactor.getTotalWidth();
+                    temp.pr(enclaveStruct+"._lf_startup_reactions[startup_reactions_count["+enclaveId+"]++] = &"+reactionRef+";");
+                    enclaveInfo.numStartupReactions+= reactor.getTotalWidth();
                     foundOne = true;
                 } else if (trigger.isShutdown()) {
-                    temp.pr("_lf_shutdown_reactions[_lf_shutdown_reactions_count++] = &"+reactionRef+";");
+                    temp.pr(enclaveStruct+"._lf_shutdown_reactions[shutdown_reactions_count["+enclaveId+"]++] = &"+reactionRef+";");
                     foundOne = true;
-                    shutdownReactionCount += reactor.getTotalWidth();
+                    enclaveInfo.numShutdownReactions += reactor.getTotalWidth();
 
                     if (targetConfig.tracing != null) {
                         var description = CUtil.getShortenedName(reactor);
@@ -1465,8 +1466,8 @@ private void recordBuiltinTriggers(ReactorInstance instance) {
                         ));
                     }
                 } else if (trigger.isReset()) {
-                    temp.pr("_lf_reset_reactions[_lf_reset_reactions_count++] = &"+reactionRef+";");
-                    resetReactionCount += reactor.getTotalWidth();
+                    temp.pr(enclaveStruct+"._lf_reset_reactions[reset_reactions_count["+enclaveId+"]++] = &"+reactionRef+";");
+                    enclaveInfo.numResetReactions += reactor.getTotalWidth();
                     foundOne = true;
                 }
             }
@@ -1629,7 +1630,7 @@ private void generateTimerInitializations(ReactorInstance instance) {
         for (TimerInstance timer : instance.timers) {
             if (!timer.isStartup()) {
                 initializeTriggerObjects.pr(CTimerGenerator.generateInitializer(timer));
-                timerCount += timer.getParent().getTotalWidth();
+                CUtil.getClosestEnclave(instance).enclaveInfo.numTimerTriggers += timer.getParent().getTotalWidth();
             }
         }
     }
diff --git a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
index e1d19184f1..23703186f3 100644
--- a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
@@ -964,38 +964,36 @@ public static String generateBuiltinTriggersTable(int reactionCount, String name
     /**
      * Generate the _lf_trigger_startup_reactions function.
      */
-    public static String generateLfTriggerStartupReactions(int startupReactionCount, boolean hasModalReactors) {
+    public static String generateLfTriggerStartupReactions(boolean hasModalReactors) {
         var s = new StringBuilder();
         s.append("void _lf_trigger_startup_reactions(environment_t *env) {");
-        if (startupReactionCount > 0) {
-            s.append("\n");
-            if (hasModalReactors) {
-                s.append(String.join("\n",
-                    "    for (int i = 0; i < env->_lf_startup_reactions_size; i++) {",
-                    "        if (env->_lf_startup_reactions[i] != NULL) {",
-                    "            if (env->_lf_startup_reactions[i]->mode != NULL) {",
-                    "                // Skip reactions in modes",
-                    "                continue;",
-                    "            }",
-                    "            _lf_trigger_reaction(env, env->_lf_startup_reactions[i], -1);",
-                    "        }",
-                    "    }",
-                    "    _lf_handle_mode_startup_reset_reactions(",
-                    "        env->_lf_startup_reactions, env->_lf_startup_reactions_size,",
-                    "        NULL, 0,",
-                    "        _lf_modal_reactor_states, _lf_modal_reactor_states_size);"
-                ));
-            } else {
-                s.append(String.join("\n",
-                    "    for (int i = 0; i < env->_lf_startup_reactions_size; i++) {",
-                    "        if (env->_lf_startup_reactions[i] != NULL) {",
-                    "            _lf_trigger_reaction(env, env->_lf_startup_reactions[i], -1);",
-                    "        }",
-                    "    }"
-                ));
-            }
-            s.append("\n");
+        s.append("\n");
+        if (hasModalReactors) {
+            s.append(String.join("\n",
+                "    for (int i = 0; i < env->_lf_startup_reactions_size; i++) {",
+                "        if (env->_lf_startup_reactions[i] != NULL) {",
+                "            if (env->_lf_startup_reactions[i]->mode != NULL) {",
+                "                // Skip reactions in modes",
+                "                continue;",
+                "            }",
+                "            _lf_trigger_reaction(env, env->_lf_startup_reactions[i], -1);",
+                "        }",
+                "    }",
+                "    _lf_handle_mode_startup_reset_reactions(",
+                "        env->_lf_startup_reactions, env->_lf_startup_reactions_size,",
+                "        NULL, 0,",
+                "        _lf_modal_reactor_states, _lf_modal_reactor_states_size);"
+            ));
+        } else {
+            s.append(String.join("\n",
+                "    for (int i = 0; i < env->_lf_startup_reactions_size; i++) {",
+                "        if (env->_lf_startup_reactions[i] != NULL) {",
+                "            _lf_trigger_reaction(env, env->_lf_startup_reactions[i], -1);",
+                "        }",
+                "    }"
+            ));
         }
+        s.append("\n");
         s.append("}\n");
         return s.toString();
     }
@@ -1043,7 +1041,6 @@ public static String generateLfTriggerShutdownReactions(int shutdownReactionCoun
      * Generate the _lf_handle_mode_triggered_reactions function.
      */
     public static String generateLfModeTriggeredReactions(
-            int startupReactionCount,
             int resetReactionCount,
             boolean hasModalReactors
     ) {
@@ -1053,16 +1050,8 @@ public static String generateLfModeTriggeredReactions(
         var s = new StringBuilder();
         s.append("void _lf_handle_mode_triggered_reactions() {\n");
         s.append("    _lf_handle_mode_startup_reset_reactions(\n");
-        if (startupReactionCount > 0) {
-            s.append("        _lf_startup_reactions, _lf_startup_reactions_size,\n");
-        } else {
-            s.append("        NULL, 0,\n");
-        }
-        if (resetReactionCount > 0) {
-            s.append("        _lf_reset_reactions, _lf_reset_reactions_size,\n");
-        } else {
-            s.append("        NULL, 0,\n");
-        }
+        s.append("        _lf_startup_reactions, _lf_startup_reactions_size,\n");
+        s.append("        _lf_reset_reactions, _lf_reset_reactions_size,\n");
         s.append("        _lf_modal_reactor_states, _lf_modal_reactor_states_size);\n");
         s.append("}\n");
         return s.toString();
diff --git a/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java b/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
index 97506debfb..1348ff5929 100644
--- a/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
@@ -41,17 +41,14 @@ public static String generateInitializer(TimerInstance timer) {
      *
      * @param timerCount The total number of timers in the program
      */
-    public static String generateLfInitializeTimer(int timerCount) {
+    public static String generateLfInitializeTimer() {
         return String.join("\n",
             "void _lf_initialize_timers(environment_t *env) {",
-            timerCount > 0 ?
-            """
-                for (int i = 0; i < env->_lf_timer_triggers_size; i++) {
-                    if (env->_lf_timer_triggers[i] != NULL) {
-                        _lf_initialize_timer(env, env->_lf_timer_triggers[i]);
-                    }
-                }""".indent(4).stripTrailing() :
-            "",
+            "   for (int i = 0; i < env->_lf_timer_triggers_size; i++) {",
+            "       if (env->_lf_timer_triggers[i] != NULL) {",
+            "            _lf_initialize_timer(env, env->_lf_timer_triggers[i]);",
+            "        }",
+            "    }",
             "}"
         );
     }

From 14c887235bb08ea6f6e60021153135d74d00861e Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 23 May 2023 13:41:20 -0700
Subject: [PATCH 0140/1114] Fix getEnclaves function

---
 .../src/org/lflang/generator/c/CUtil.java       | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/c/CUtil.java b/org.lflang/src/org/lflang/generator/c/CUtil.java
index 439f451b6f..d280dba8fd 100644
--- a/org.lflang/src/org/lflang/generator/c/CUtil.java
+++ b/org.lflang/src/org/lflang/generator/c/CUtil.java
@@ -33,6 +33,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Queue;
 import java.util.stream.Collectors;
 
 import org.lflang.ASTUtils;
@@ -824,10 +825,20 @@ public static String getEnvironmentStruct(ReactorInstance inst) {
     }
 
     // Given an instance, e.g. the main reactor, return a list of all enclaves in the program
-    public static List<ReactorInstance> getEnclaves(ReactorInstance inst) {
+    public static List<ReactorInstance> getEnclaves(ReactorInstance root) {
         List<ReactorInstance> enclaves = new ArrayList<>();
-        if (inst.isMainOrFederated() || isEnclave(inst.getDefinition())) {
-            enclaves.add(inst);
+        Queue<ReactorInstance> queue = new LinkedList<>();
+        queue.add(root);
+
+        while (!queue.isEmpty()) {
+            ReactorInstance inst = queue.poll();
+            if (inst.isMainOrFederated() || isEnclave(inst.getDefinition())) {
+                enclaves.add(inst);
+            }
+
+            for (ReactorInstance child : inst.children) {
+                queue.add(child);
+            }
         }
         return enclaves;
     }

From 67279535d76831349955f9e4642b62704ef877ab Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 23 May 2023 14:22:14 -0700
Subject: [PATCH 0141/1114] Apply formatter.

---
 .../src/org/lflang/tests/Configurators.java   |  107 +-
 .../src/org/lflang/tests/LFParsingTest.java   |  227 +-
 .../src/org/lflang/tests/LFTest.java          |  480 +-
 .../src/org/lflang/tests/LfParsingUtil.java   |  129 +-
 .../org/lflang/tests/RunSingleTestMain.java   |   77 +-
 .../src/org/lflang/tests/RuntimeTest.java     |  391 +-
 .../src/org/lflang/tests/TestBase.java        | 1193 ++---
 .../src/org/lflang/tests/TestError.java       |   44 +-
 .../src/org/lflang/tests/TestRegistry.java    |  647 ++-
 .../src/org/lflang/tests/TestUtils.java       |  242 +-
 .../lflang/tests/cli/CliToolTestFixture.java  |  186 +-
 .../src/org/lflang/tests/cli/LfcCliTest.java  |  439 +-
 .../src/org/lflang/tests/cli/LffCliTest.java  |  167 +-
 .../tests/compiler/EquivalenceUnitTests.java  |   97 +-
 .../tests/compiler/FormattingUnitTests.java   |   89 +-
 .../tests/compiler/LetInferenceTests.java     |  205 +-
 .../compiler/LinguaFrancaASTUtilsTest.java    |  301 +-
 .../LinguaFrancaDependencyAnalysisTest.java   |  206 +-
 .../compiler/LinguaFrancaParsingTest.java     |  126 +-
 .../compiler/LinguaFrancaScopingTest.java     |  302 +-
 .../compiler/LinguaFrancaValidationTest.java  | 2665 ++++++-----
 .../tests/compiler/MixedRadixIntTest.java     |  191 +-
 .../tests/compiler/PortInstanceTests.java     |  398 +-
 .../org/lflang/tests/compiler/RangeTests.java |  169 +-
 .../lflang/tests/compiler/RoundTripTests.java |   74 +-
 .../tests/compiler/TargetConfigTests.java     |  125 +-
 .../org/lflang/tests/lsp/ErrorInserter.java   |  616 +--
 .../src/org/lflang/tests/lsp/LspTests.java    |  385 +-
 .../lflang/tests/lsp/MockLanguageClient.java  |   79 +-
 .../lflang/tests/lsp/MockReportProgress.java  |   43 +-
 .../lflang/tests/runtime/CArduinoTest.java    |   28 +-
 .../org/lflang/tests/runtime/CCppTest.java    |   64 +-
 .../lflang/tests/runtime/CSchedulerTest.java  |  103 +-
 .../src/org/lflang/tests/runtime/CTest.java   |  230 +-
 .../org/lflang/tests/runtime/CZephyrTest.java |   99 +-
 .../org/lflang/tests/runtime/CppRos2Test.java |   35 +-
 .../src/org/lflang/tests/runtime/CppTest.java |  138 +-
 .../org/lflang/tests/runtime/PythonTest.java  |  213 +-
 .../org/lflang/tests/runtime/RustTest.java    |   20 +-
 .../lflang/tests/runtime/TypeScriptTest.java  |  110 +-
 .../serialization/SerializationTest.java      |   59 +-
 .../org/lflang/tests/util/StringUtilTest.java |   38 +-
 org.lflang/src/org/lflang/AttributeUtils.java |  365 +-
 .../src/org/lflang/DefaultErrorReporter.java  |  104 +-
 org.lflang/src/org/lflang/ErrorReporter.java  |  311 +-
 org.lflang/src/org/lflang/FileConfig.java     |  545 ++-
 org.lflang/src/org/lflang/InferredType.java   |  349 +-
 .../lflang/LFResourceDescriptionStrategy.java |  118 +-
 .../src/org/lflang/LFResourceProvider.java    |   30 +-
 .../src/org/lflang/LFRuntimeModule.java       |   72 +-
 .../src/org/lflang/LFStandaloneSetup.java     |   31 +-
 .../lflang/LFSyntaxErrorMessageProvider.java  |  124 +-
 org.lflang/src/org/lflang/LocalStrings.java   |    8 +-
 .../src/org/lflang/MainConflictChecker.java   |  147 +-
 org.lflang/src/org/lflang/ModelInfo.java      |  422 +-
 org.lflang/src/org/lflang/Target.java         | 1131 +++--
 org.lflang/src/org/lflang/TargetConfig.java   |  716 ++-
 org.lflang/src/org/lflang/TargetProperty.java | 3332 +++++++-------
 org.lflang/src/org/lflang/TimeUnit.java       |  127 +-
 org.lflang/src/org/lflang/TimeValue.java      |  340 +-
 org.lflang/src/org/lflang/ast/ASTUtils.java   | 3471 ++++++++-------
 .../src/org/lflang/ast/AstTransformation.java |   11 +-
 .../ast/DelayedConnectionTransformation.java  |  690 +--
 .../ast/EnclavedConnectionTransformation.java |  315 +-
 .../src/org/lflang/ast/FormattingUtils.java   |  427 +-
 org.lflang/src/org/lflang/ast/IsEqual.java    | 1201 +++--
 org.lflang/src/org/lflang/ast/ToLf.java       |    7 +-
 org.lflang/src/org/lflang/ast/ToText.java     |  204 +-
 org.lflang/src/org/lflang/cli/CliBase.java    |  582 ++-
 .../org/lflang/cli/LFStandaloneModule.java    |   58 +-
 org.lflang/src/org/lflang/cli/Lfc.java        |  515 +--
 org.lflang/src/org/lflang/cli/Lff.java        |  306 +-
 .../lflang/cli/StandaloneErrorReporter.java   |  143 +-
 .../lflang/cli/StandaloneIssueAcceptor.java   |  186 +-
 .../src/org/lflang/cli/VersionProvider.java   |   30 +-
 .../lflang/diagram/lsp/LFLanguageServer.java  |   36 +-
 .../lsp/LFLanguageServerExtension.java        |  196 +-
 .../diagram/lsp/LanguageDiagramServer.java    |  162 +-
 .../src/org/lflang/diagram/lsp/Progress.java  |  156 +-
 .../AbstractSynthesisExtensions.java          |   98 +-
 .../synthesis/LinguaFrancaSynthesis.java      | 2773 ++++++------
 .../ReactorParameterDisplayModes.java         |   76 +-
 .../synthesis/SynthesisRegistration.java      |   69 +-
 .../synthesis/action/AbstractAction.java      |   79 +-
 .../action/CollapseAllReactorsAction.java     |   88 +-
 .../action/ExpandAllReactorsAction.java       |   84 +-
 .../synthesis/action/FilterCycleAction.java   |  238 +-
 .../MemorizingExpandCollapseAction.java       |  204 +-
 .../synthesis/action/ShowCycleAction.java     |  131 +-
 .../postprocessor/ReactionPortAdjustment.java |  315 +-
 .../styles/LinguaFrancaShapeExtensions.java   | 2091 +++++----
 .../styles/LinguaFrancaStyleExtensions.java   |  862 ++--
 .../styles/ReactorFigureComponents.java       |  170 +-
 .../synthesis/util/CycleVisualization.java    |  243 +-
 .../InterfaceDependenciesVisualization.java   |  340 +-
 .../synthesis/util/LayoutPostProcessing.java  |  697 +--
 .../diagram/synthesis/util/ModeDiagrams.java  | 1206 ++---
 .../synthesis/util/NamedInstanceUtil.java     |   78 +-
 .../diagram/synthesis/util/ReactorIcons.java  |  254 +-
 .../util/SynthesisErrorReporter.java          |  138 +-
 .../synthesis/util/UtilityExtensions.java     |  311 +-
 .../federated/extensions/CExtension.java      | 1348 +++---
 .../federated/extensions/CExtensionUtils.java | 1043 ++---
 .../extensions/FedTargetExtension.java        |  199 +-
 .../extensions/FedTargetExtensionFactory.java |   26 +-
 .../federated/extensions/PythonExtension.java |  279 +-
 .../federated/extensions/TSExtension.java     |  277 +-
 .../federated/generator/FedASTUtils.java      | 1436 +++---
 .../generator/FedConnectionInstance.java      |  140 +-
 .../federated/generator/FedEmitter.java       |  104 +-
 .../federated/generator/FedFileConfig.java    |  196 +-
 .../federated/generator/FedGenerator.java     | 1049 +++--
 .../federated/generator/FedImportEmitter.java |   77 +-
 .../federated/generator/FedMainEmitter.java   |  131 +-
 .../generator/FedPreambleEmitter.java         |   62 +-
 .../generator/FedReactorEmitter.java          |   20 +-
 .../federated/generator/FedTargetConfig.java  |  104 +-
 .../federated/generator/FedTargetEmitter.java |   48 +-
 .../lflang/federated/generator/FedUtils.java  |   46 +-
 .../federated/generator/FederateInstance.java | 1123 +++--
 .../generator/LineAdjustingErrorReporter.java |  210 +-
 .../generator/SynchronizedErrorReporter.java  |  144 +-
 .../federated/launcher/BuildConfig.java       |   93 +-
 .../federated/launcher/CBuildConfig.java      |   68 +-
 .../launcher/FedLauncherGenerator.java        |  898 ++--
 .../federated/launcher/PyBuildConfig.java     |   37 +-
 .../lflang/federated/launcher/RtiConfig.java  |  115 +-
 .../federated/launcher/TsBuildConfig.java     |   64 +-
 .../FedNativePythonSerialization.java         |  172 +-
 .../FedROS2CPPSerialization.java              |  348 +-
 .../serialization/FedSerialization.java       |  133 +-
 .../serialization/SupportedSerializers.java   |   32 +-
 .../federated/validation/FedValidator.java    |   95 +-
 .../org/lflang/formatting2/LFFormatter.java   |   48 +-
 .../org/lflang/generator/ActionInstance.java  |  150 +-
 .../src/org/lflang/generator/CodeBuilder.java | 1018 ++---
 .../src/org/lflang/generator/CodeMap.java     |  554 ++-
 .../lflang/generator/DeadlineInstance.java    |  100 +-
 .../lflang/generator/DelayBodyGenerator.java  |   93 +-
 .../lflang/generator/DiagnosticReporting.java |   89 +-
 .../generator/DockerComposeGenerator.java     |  156 +-
 .../src/org/lflang/generator/DockerData.java  |   55 +-
 .../org/lflang/generator/DockerGenerator.java |   82 +-
 .../src/org/lflang/generator/EnclaveInfo.java |   20 +-
 .../generator/FedDockerComposeGenerator.java  |   79 +-
 .../lflang/generator/GenerationException.java |   68 +-
 .../org/lflang/generator/GeneratorBase.java   | 1150 +++--
 .../generator/GeneratorCommandFactory.java    |  260 +-
 .../org/lflang/generator/GeneratorResult.java |  188 +-
 .../org/lflang/generator/GeneratorUtils.java  |  299 +-
 .../HumanReadableReportingStrategy.java       |  282 +-
 .../lflang/generator/IntegratedBuilder.java   |  248 +-
 .../generator/InvalidLfSourceException.java   |   37 +-
 .../generator/InvalidSourceException.java     |   18 +-
 .../src/org/lflang/generator/LFGenerator.java |  320 +-
 .../lflang/generator/LFGeneratorContext.java  |  258 +-
 .../src/org/lflang/generator/LFResource.java  |   65 +-
 .../LanguageServerErrorReporter.java          |  349 +-
 .../lflang/generator/LfExpressionVisitor.java |  209 +-
 .../src/org/lflang/generator/MainContext.java |  290 +-
 .../org/lflang/generator/MixedRadixInt.java   |  418 +-
 .../org/lflang/generator/ModeInstance.java    |  365 +-
 .../org/lflang/generator/NamedInstance.java   |  600 ++-
 .../lflang/generator/ParameterInstance.java   |  193 +-
 .../org/lflang/generator/PortInstance.java    |  801 ++--
 .../src/org/lflang/generator/Position.java    |  435 +-
 .../src/org/lflang/generator/Range.java       |  223 +-
 .../lflang/generator/ReactionInstance.java    | 1033 +++--
 .../generator/ReactionInstanceGraph.java      |  755 ++--
 .../org/lflang/generator/ReactorInstance.java | 2115 +++++----
 .../org/lflang/generator/RuntimeRange.java    |  839 ++--
 .../src/org/lflang/generator/SendRange.java   |  491 +-
 .../src/org/lflang/generator/SubContext.java  |  148 +-
 .../src/org/lflang/generator/TargetTypes.java |  457 +-
 .../org/lflang/generator/TimerInstance.java   |  129 +-
 .../org/lflang/generator/TriggerInstance.java |  299 +-
 .../UnsupportedGeneratorFeatureException.java |   17 +-
 .../lflang/generator/ValidationStrategy.java  |   67 +-
 .../src/org/lflang/generator/Validator.java   |  329 +-
 .../lflang/generator/WatchdogInstance.java    |    4 +-
 .../lflang/generator/c/CActionGenerator.java  |  295 +-
 .../lflang/generator/c/CCmakeGenerator.java   |  672 +--
 .../src/org/lflang/generator/c/CCompiler.java |  729 ++-
 .../generator/c/CConstructorGenerator.java    |   52 +-
 .../lflang/generator/c/CCoreFilesUtils.java   |   34 +-
 .../generator/c/CDelayBodyGenerator.java      |   97 +-
 .../lflang/generator/c/CDockerGenerator.java  |  112 +-
 .../c/CEnclavedConnectionBodyGenerator.java   |  101 +-
 .../c/CEnvironmentFunctionGenerator.java      |  143 +-
 .../org/lflang/generator/c/CFileConfig.java   |   33 +-
 .../org/lflang/generator/c/CGenerator.java    | 3932 +++++++++--------
 .../generator/c/CMainFunctionGenerator.java   |  203 +-
 .../lflang/generator/c/CMethodGenerator.java  |  280 +-
 .../generator/c/CMixedRadixGenerator.java     |   24 +-
 .../lflang/generator/c/CModesGenerator.java   |  386 +-
 .../generator/c/CParameterGenerator.java      |   61 +-
 .../lflang/generator/c/CPortGenerator.java    |  496 ++-
 .../generator/c/CPreambleGenerator.java       |  137 +-
 .../generator/c/CReactionGenerator.java       | 2345 +++++-----
 .../c/CReactorHeaderFileGenerator.java        |  376 +-
 .../lflang/generator/c/CStateGenerator.java   |  213 +-
 .../lflang/generator/c/CTimerGenerator.java   |  119 +-
 .../lflang/generator/c/CTracingGenerator.java |   92 +-
 .../generator/c/CTriggerObjectsGenerator.java | 1988 +++++----
 .../src/org/lflang/generator/c/CTypes.java    |  286 +-
 .../src/org/lflang/generator/c/CUtil.java     | 1633 ++++---
 .../generator/c/CWatchdogGenerator.java       |   98 +-
 .../c/InteractingContainedReactors.java       |  229 +-
 .../generator/c/TypeParameterizedReactor.java |  111 +-
 .../lflang/generator/python/PyFileConfig.java |   38 +-
 .../org/lflang/generator/python/PyUtil.java   |  262 +-
 .../python/PythonActionGenerator.java         |   15 +-
 .../python/PythonDelayBodyGenerator.java      |  126 +-
 .../python/PythonDockerGenerator.java         |   41 +-
 .../generator/python/PythonGenerator.java     | 1148 +++--
 .../generator/python/PythonInfoGenerator.java |   90 +-
 .../python/PythonMainFunctionGenerator.java   |   37 +-
 .../python/PythonMethodGenerator.java         |   58 +-
 .../generator/python/PythonModeGenerator.java |  147 +-
 .../python/PythonParameterGenerator.java      |  170 +-
 .../generator/python/PythonPortGenerator.java |  443 +-
 .../python/PythonPreambleGenerator.java       |   71 +-
 .../python/PythonReactionGenerator.java       | 1100 ++---
 .../python/PythonReactorGenerator.java        |  273 +-
 .../python/PythonStateGenerator.java          |   50 +-
 .../lflang/generator/python/PythonTypes.java  |  104 +-
 .../generator/python/PythonValidator.java     |  647 +--
 .../generator/rust/CargoDependencySpec.java   |   16 +-
 .../generator/rust/RustTargetConfig.java      |  142 +-
 .../generator/ts/TSDockerGenerator.java       |   21 +-
 .../src/org/lflang/generator/ts/TSTypes.java  |  118 +-
 .../src/org/lflang/graph/DirectedGraph.java   |  556 ++-
 org.lflang/src/org/lflang/graph/Graph.java    |  101 +-
 .../org/lflang/graph/InstantiationGraph.java  |  251 +-
 .../src/org/lflang/graph/NodeAnnotation.java  |  100 +-
 .../src/org/lflang/graph/NodeAnnotations.java |   52 +-
 .../src/org/lflang/graph/PrecedenceGraph.java |  413 +-
 .../src/org/lflang/graph/TopologyGraph.java   |  244 +-
 .../src/org/lflang/ide/LFIdeModule.java       |    8 +-
 org.lflang/src/org/lflang/ide/LFIdeSetup.java |   17 +-
 .../lflang/scoping/LFGlobalScopeProvider.java |  207 +-
 .../org/lflang/scoping/LFScopeProvider.java   |   11 +-
 .../lflang/scoping/LFScopeProviderImpl.java   |  425 +-
 .../src/org/lflang/util/ArduinoUtil.java      |  224 +-
 org.lflang/src/org/lflang/util/Averager.java  |   33 +-
 .../src/org/lflang/util/CollectionUtil.java   |  307 +-
 org.lflang/src/org/lflang/util/FileUtil.java  | 1744 ++++----
 .../src/org/lflang/util/IteratorUtil.java     |   96 +-
 org.lflang/src/org/lflang/util/LFCommand.java |  715 ++-
 .../src/org/lflang/util/StringUtil.java       |  234 +-
 .../util/TargetResourceNotFoundException.java |   13 +-
 .../org/lflang/validation/AttributeSpec.java  |  345 +-
 .../lflang/validation/BaseLFValidator.java    |   64 +-
 .../LFNamesAreUniqueValidationHelper.java     |   33 +-
 .../org/lflang/validation/LFValidator.java    | 3325 +++++++-------
 .../validation/ValidatorErrorReporter.java    |  297 +-
 256 files changed, 48068 insertions(+), 47511 deletions(-)

diff --git a/org.lflang.tests/src/org/lflang/tests/Configurators.java b/org.lflang.tests/src/org/lflang/tests/Configurators.java
index e3fe6c5508..24ee6f38f3 100644
--- a/org.lflang.tests/src/org/lflang/tests/Configurators.java
+++ b/org.lflang.tests/src/org/lflang/tests/Configurators.java
@@ -26,7 +26,6 @@
 
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.Platform;
-import org.lflang.generator.LFGeneratorContext.BuildParm;
 import org.lflang.tests.TestRegistry.TestCategory;
 
 /**
@@ -37,62 +36,60 @@
  */
 public class Configurators {
 
-    /** Test configuration function. */
-    @FunctionalInterface
-    public interface Configurator {
-
-        /**
-         * Apply a side effect to the given test case to change its default configuration.
-         * Return true if configuration succeeded, false otherwise.
-         */
-        boolean configure(LFTest test);
-    }
+  /** Test configuration function. */
+  @FunctionalInterface
+  public interface Configurator {
 
     /**
-     * Configure the given test to use single-threaded execution.
-     *
-     * For targets that provide a threaded and an unthreaded runtime,
-     * this configures using the unthreaded runtime. For targets that
-     * do not distinguish threaded and unthreaded runtime, the number
-     * of workers is set to 1.
-     *
-     * @param test The test to configure.
-     * @return True if successful, false otherwise.
+     * Apply a side effect to the given test case to change its default configuration. Return true
+     * if configuration succeeded, false otherwise.
      */
-    public static boolean disableThreading(LFTest test) {
-        test.getContext().getArgs().setProperty("threading", "false");
-        test.getContext().getArgs().setProperty("workers", "1");
-        return true;
-    }
+    boolean configure(LFTest test);
+  }
 
-    public static boolean makeZephyrCompatible(LFTest test) {
-        test.getContext().getArgs().setProperty("tracing", "false");
-        test.getContext().getTargetConfig().threading = false;
-        test.getContext().getTargetConfig().setByUser.add(TargetProperty.THREADING);
-        test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
-        test.getContext().getTargetConfig().platformOptions.flash = false;
-        test.getContext().getTargetConfig().platformOptions.board = "qemu_cortex_a53";
-        return true;
-    }
-    /**
-     * Make no changes to the configuration.
-     *
-     * @param ignoredTest The test to configure.
-     * @return True
-     */
-    public static boolean noChanges(LFTest ignoredTest) {
-        return true;
-    }
+  /**
+   * Configure the given test to use single-threaded execution.
+   *
+   * <p>For targets that provide a threaded and an unthreaded runtime, this configures using the
+   * unthreaded runtime. For targets that do not distinguish threaded and unthreaded runtime, the
+   * number of workers is set to 1.
+   *
+   * @param test The test to configure.
+   * @return True if successful, false otherwise.
+   */
+  public static boolean disableThreading(LFTest test) {
+    test.getContext().getArgs().setProperty("threading", "false");
+    test.getContext().getArgs().setProperty("workers", "1");
+    return true;
+  }
 
-    /**
-     * Given a test category, return true if it is compatible with single-threaded execution.
-     */
-    public static boolean compatibleWithThreadingOff(TestCategory category) {
+  public static boolean makeZephyrCompatible(LFTest test) {
+    test.getContext().getArgs().setProperty("tracing", "false");
+    test.getContext().getTargetConfig().threading = false;
+    test.getContext().getTargetConfig().setByUser.add(TargetProperty.THREADING);
+    test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
+    test.getContext().getTargetConfig().platformOptions.flash = false;
+    test.getContext().getTargetConfig().platformOptions.board = "qemu_cortex_a53";
+    return true;
+  }
+  /**
+   * Make no changes to the configuration.
+   *
+   * @param ignoredTest The test to configure.
+   * @return True
+   */
+  public static boolean noChanges(LFTest ignoredTest) {
+    return true;
+  }
+
+  /** Given a test category, return true if it is compatible with single-threaded execution. */
+  public static boolean compatibleWithThreadingOff(TestCategory category) {
 
-        // CONCURRENT, FEDERATED, DOCKER_FEDERATED, DOCKER
-        // are not compatible with single-threaded execution.
-        // ARDUINO and ZEPHYR have their own test suites, so we don't need to rerun.
-        boolean excluded = category == TestCategory.CONCURRENT
+    // CONCURRENT, FEDERATED, DOCKER_FEDERATED, DOCKER
+    // are not compatible with single-threaded execution.
+    // ARDUINO and ZEPHYR have their own test suites, so we don't need to rerun.
+    boolean excluded =
+        category == TestCategory.CONCURRENT
             || category == TestCategory.SERIALIZATION
             || category == TestCategory.FEDERATED
             || category == TestCategory.DOCKER_FEDERATED
@@ -100,8 +97,8 @@ public static boolean compatibleWithThreadingOff(TestCategory category) {
             || category == TestCategory.ARDUINO
             || category == TestCategory.ZEPHYR;
 
-        // SERIALIZATION and TARGET tests are excluded on Windows.
-        excluded |= TestBase.isWindows() && (category == TestCategory.TARGET);
-        return !excluded;
-    }
+    // SERIALIZATION and TARGET tests are excluded on Windows.
+    excluded |= TestBase.isWindows() && (category == TestCategory.TARGET);
+    return !excluded;
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/LFParsingTest.java b/org.lflang.tests/src/org/lflang/tests/LFParsingTest.java
index 487c3b21e5..f0e96ee7d0 100644
--- a/org.lflang.tests/src/org/lflang/tests/LFParsingTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/LFParsingTest.java
@@ -3,8 +3,8 @@
  */
 package org.lflang.tests;
 
+import com.google.inject.Inject;
 import java.util.List;
-
 import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
@@ -13,127 +13,118 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.lflang.lf.Model;
 
-import com.google.inject.Inject;
-
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
 public class LFParsingTest {
 
-    @Inject
-    private ParseHelper<Model> parseHelper;
-
-
-    @Test
-    public void testLexingEmptyTargetProperties() throws Exception {
-        assertNoParsingErrorsIn("target C { };      \nreactor Foo {}");
-        assertNoParsingErrorsIn("target C {a:b,};   \nreactor Foo {}");
-        expectParsingErrorIn("target C {,};      \nreactor Foo {}");
-
-        // array elements
-        // assertNoParsingErrorsIn("target C {x:[ ]};  \nreactor Foo {}");
-        // assertNoParsingErrorsIn("target C {x:[]};   \nreactor Foo {}");
-        // assertNoParsingErrorsIn("target C {x:[,]};  \nreactor Foo {}");
-    }
-
-    @Test
-    public void testLexingLifetimeAnnots() throws Exception {
-        assertNoParsingErrorsIn(makeLfTargetCode("Rust",
-                                                 "        struct Hello<'a> { \n"
-                                                     + "            r: &'a str,\n"
-                                                     + "            r2: &'a Box<Hello<'a>>,\n"
-                                                     + "        }"));
-    }
-
-
-    @Test
-    public void testLexingSingleLifetimeAnnot() throws Exception {
-        // just to be sure, have a single lifetime annot.
-        assertNoParsingErrorsIn(makeLfTargetCode("Rust",
-                                                 "        struct Hello { \n"
-                                                     + "            r: &'static str,\n"
-                                                     + "        }"));
-    }
-
-
-    @Test
-    public void testLexingNewlineCont() throws Exception {
-        /*
-        This example looks like this:
-        "a\
-        bcde"
-
-        This is valid C++ to escape a newline.
-         */
-
-        assertNoParsingErrorsIn(makeLfTargetCode("Cpp",
-                                                 "        \"a\\\n"
-                                                     + "        bcde\"\n"
-        ));
-    }
-
-
-    @Test
-    public void testLexingSquotedString() throws Exception {
-        // we can't do that anymore
-        expectParsingErrorIn(makeLfTargetCode("Python", "a = ' a string '"));
-    }
-
-
-    @Test
-    public void testLexingDquotedString() throws Exception {
-        assertNoParsingErrorsIn(makeLfTargetCode("Python", "a = \" a string \""));
-    }
-
-    @Test
-    public void testLexingMultilineString() throws Exception {
-        assertNoParsingErrorsIn(makeLfTargetCode("Python", "a = \"\"\" a 'string' \"\"\""));
-        assertNoParsingErrorsIn(makeLfTargetCode("Python", "a = \"\"\" a 'strin\ng' \"\"\""));
-        assertNoParsingErrorsIn(makeLfTargetCode("Python", "a = \"\"\" \na 'string'\n \"\"\""));
-    }
-
-    @Test
-    public void testLexingDquotedStringWithEscape() throws Exception {
-        assertNoParsingErrorsIn(makeLfTargetCode("C", "printf(\"Hello World.\\n\");\n"));
-    }
-
-
-    @Test
-    public void testLexingCharLiteral() throws Exception {
-        assertNoParsingErrorsIn(makeLfTargetCode("C", "char c0 = 'c';"));
-    }
-
-    @Test
-    public void testLexingEscapedCharLiteral() throws Exception {
-        assertNoParsingErrorsIn(makeLfTargetCode("C", "char c0 = '\\n';"));
-    }
-
-    private String makeLfTargetCode(final String target, final String code) {
-        return "target " + target + ";\n"
-            + "reactor Foo {\n"
-            + "    preamble {=\n"
-            + "       " + code + "\n"
-            + "    =}\n"
-            + "}";
-    }
-
-    private void assertNoParsingErrorsIn(String source) throws Exception {
-        List<Diagnostic> errors = doParse(source);
-        Assertions.assertTrue(errors.isEmpty(), "Unexpected errors: " + IterableExtensions.join(errors, ", "));
-    }
-
-
-    private void expectParsingErrorIn(String source) throws Exception {
-        List<Diagnostic> errors = doParse(source);
-        Assertions.assertFalse(errors.isEmpty(), "Expected a parsing error, none occurred");
-    }
-
-
-    private List<Diagnostic> doParse(String source) throws Exception {
-        Model result = parseHelper.parse(source);
-        Assertions.assertNotNull(result);
-        return result.eResource().getErrors();
-    }
+  @Inject private ParseHelper<Model> parseHelper;
+
+  @Test
+  public void testLexingEmptyTargetProperties() throws Exception {
+    assertNoParsingErrorsIn("target C { };      \nreactor Foo {}");
+    assertNoParsingErrorsIn("target C {a:b,};   \nreactor Foo {}");
+    expectParsingErrorIn("target C {,};      \nreactor Foo {}");
+
+    // array elements
+    // assertNoParsingErrorsIn("target C {x:[ ]};  \nreactor Foo {}");
+    // assertNoParsingErrorsIn("target C {x:[]};   \nreactor Foo {}");
+    // assertNoParsingErrorsIn("target C {x:[,]};  \nreactor Foo {}");
+  }
+
+  @Test
+  public void testLexingLifetimeAnnots() throws Exception {
+    assertNoParsingErrorsIn(
+        makeLfTargetCode(
+            "Rust",
+            "        struct Hello<'a> { \n"
+                + "            r: &'a str,\n"
+                + "            r2: &'a Box<Hello<'a>>,\n"
+                + "        }"));
+  }
+
+  @Test
+  public void testLexingSingleLifetimeAnnot() throws Exception {
+    // just to be sure, have a single lifetime annot.
+    assertNoParsingErrorsIn(
+        makeLfTargetCode(
+            "Rust", "        struct Hello { \n" + "            r: &'static str,\n" + "        }"));
+  }
+
+  @Test
+  public void testLexingNewlineCont() throws Exception {
+    /*
+    This example looks like this:
+    "a\
+    bcde"
+
+    This is valid C++ to escape a newline.
+     */
+
+    assertNoParsingErrorsIn(makeLfTargetCode("Cpp", "        \"a\\\n" + "        bcde\"\n"));
+  }
+
+  @Test
+  public void testLexingSquotedString() throws Exception {
+    // we can't do that anymore
+    expectParsingErrorIn(makeLfTargetCode("Python", "a = ' a string '"));
+  }
+
+  @Test
+  public void testLexingDquotedString() throws Exception {
+    assertNoParsingErrorsIn(makeLfTargetCode("Python", "a = \" a string \""));
+  }
+
+  @Test
+  public void testLexingMultilineString() throws Exception {
+    assertNoParsingErrorsIn(makeLfTargetCode("Python", "a = \"\"\" a 'string' \"\"\""));
+    assertNoParsingErrorsIn(makeLfTargetCode("Python", "a = \"\"\" a 'strin\ng' \"\"\""));
+    assertNoParsingErrorsIn(makeLfTargetCode("Python", "a = \"\"\" \na 'string'\n \"\"\""));
+  }
+
+  @Test
+  public void testLexingDquotedStringWithEscape() throws Exception {
+    assertNoParsingErrorsIn(makeLfTargetCode("C", "printf(\"Hello World.\\n\");\n"));
+  }
+
+  @Test
+  public void testLexingCharLiteral() throws Exception {
+    assertNoParsingErrorsIn(makeLfTargetCode("C", "char c0 = 'c';"));
+  }
+
+  @Test
+  public void testLexingEscapedCharLiteral() throws Exception {
+    assertNoParsingErrorsIn(makeLfTargetCode("C", "char c0 = '\\n';"));
+  }
+
+  private String makeLfTargetCode(final String target, final String code) {
+    return "target "
+        + target
+        + ";\n"
+        + "reactor Foo {\n"
+        + "    preamble {=\n"
+        + "       "
+        + code
+        + "\n"
+        + "    =}\n"
+        + "}";
+  }
+
+  private void assertNoParsingErrorsIn(String source) throws Exception {
+    List<Diagnostic> errors = doParse(source);
+    Assertions.assertTrue(
+        errors.isEmpty(), "Unexpected errors: " + IterableExtensions.join(errors, ", "));
+  }
+
+  private void expectParsingErrorIn(String source) throws Exception {
+    List<Diagnostic> errors = doParse(source);
+    Assertions.assertFalse(errors.isEmpty(), "Expected a parsing error, none occurred");
+  }
+
+  private List<Diagnostic> doParse(String source) throws Exception {
+    Model result = parseHelper.parse(source);
+    Assertions.assertNotNull(result);
+    return result.eResource().getErrors();
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/LFTest.java b/org.lflang.tests/src/org/lflang/tests/LFTest.java
index cc69dea77a..58b3cbf846 100644
--- a/org.lflang.tests/src/org/lflang/tests/LFTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/LFTest.java
@@ -8,286 +8,286 @@
 import java.io.Reader;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-
 import org.eclipse.xtext.util.RuntimeIOException;
-
 import org.lflang.FileConfig;
 import org.lflang.Target;
 import org.lflang.generator.LFGeneratorContext;
 
 /**
  * Information about an indexed Lingua Franca test program.
- * 
- * @author Marten Lohstroh
  *
+ * @author Marten Lohstroh
  */
 public class LFTest implements Comparable<LFTest> {
 
-    /** The path to the test. */
-    private final Path srcPath;
-
-    /** The name of the test. */
-    private final String name;
-
-    /** The result of the test. */
-    private Result result = Result.UNKNOWN;
-
-    /** Context provided to the code generators */
-    private LFGeneratorContext context;
-
-    /** Path of the test program relative to the package root. */
-    private final Path relativePath;
-
-    /** Records compilation stdout/stderr. */
-    private final ByteArrayOutputStream compilationLog = new ByteArrayOutputStream();
-
-    /** Specialized object for capturing output streams while executing the test. */
-    private final ExecutionLogger execLog = new ExecutionLogger();
-
-    /** String builder for collecting issues encountered during test execution. */
-    private final StringBuilder issues = new StringBuilder();
-
-    /** The target of the test program. */
-    private final Target target;
-
-    /**
-     * Create a new test.
-     *
-     * @param target The target of the test program.
-     * @param srcFile The path to the file of the test program.
-     */
-    public LFTest(Target target, Path srcFile) {
-        this.target = target;
-        this.srcPath = srcFile;
-        this.name = FileConfig.findPackageRoot(srcFile, s -> {}).relativize(srcFile).toString();
-        this.relativePath = Paths.get(name);
+  /** The path to the test. */
+  private final Path srcPath;
+
+  /** The name of the test. */
+  private final String name;
+
+  /** The result of the test. */
+  private Result result = Result.UNKNOWN;
+
+  /** Context provided to the code generators */
+  private LFGeneratorContext context;
+
+  /** Path of the test program relative to the package root. */
+  private final Path relativePath;
+
+  /** Records compilation stdout/stderr. */
+  private final ByteArrayOutputStream compilationLog = new ByteArrayOutputStream();
+
+  /** Specialized object for capturing output streams while executing the test. */
+  private final ExecutionLogger execLog = new ExecutionLogger();
+
+  /** String builder for collecting issues encountered during test execution. */
+  private final StringBuilder issues = new StringBuilder();
+
+  /** The target of the test program. */
+  private final Target target;
+
+  /**
+   * Create a new test.
+   *
+   * @param target The target of the test program.
+   * @param srcFile The path to the file of the test program.
+   */
+  public LFTest(Target target, Path srcFile) {
+    this.target = target;
+    this.srcPath = srcFile;
+    this.name = FileConfig.findPackageRoot(srcFile, s -> {}).relativize(srcFile).toString();
+    this.relativePath = Paths.get(name);
+  }
+
+  /** Copy constructor */
+  public LFTest(LFTest test) {
+    this(test.target, test.srcPath);
+  }
+
+  /** Stream object for capturing standard and error output. */
+  public OutputStream getOutputStream() {
+    return compilationLog;
+  }
+
+  public FileConfig getFileConfig() {
+    return context.getFileConfig();
+  }
+
+  public LFGeneratorContext getContext() {
+    return context;
+  }
+
+  public Path getSrcPath() {
+    return srcPath;
+  }
+
+  /**
+   * Comparison implementation to allow for tests to be sorted (e.g., when added to a tree set)
+   * based on their path (relative to the root of the test directory).
+   */
+  public int compareTo(LFTest t) {
+    return this.relativePath.compareTo(t.relativePath);
+  }
+
+  /**
+   * Return true if the given object is an LFTest instance with a name identical to this test.
+   *
+   * @param o The object to test for equality with respect to this one.
+   * @return True if the given object is equal to this one, false otherwise.
+   */
+  @Override
+  public boolean equals(Object o) {
+    return o instanceof LFTest && ((LFTest) o).name.equals(this.name);
+  }
+
+  /**
+   * Return a string representing the name of this test.
+   *
+   * @return The name of this test.
+   */
+  @Override
+  public String toString() {
+    return this.name;
+  }
+
+  /**
+   * Identify tests uniquely on the basis of their name.
+   *
+   * @return The hash code of the name of this test.
+   */
+  @Override
+  public int hashCode() {
+    return this.name.hashCode();
+  }
+
+  /**
+   * Report whether this test has failed.
+   *
+   * @return True if the test has failed, false otherwise.
+   */
+  public boolean hasFailed() {
+    return result != Result.TEST_PASS;
+  }
+
+  public boolean hasPassed() {
+    return result == Result.TEST_PASS;
+  }
+
+  /**
+   * Compile a string that contains all collected errors and return it.
+   *
+   * @return A string that contains all collected errors.
+   */
+  public void reportErrors() {
+    if (this.hasFailed()) {
+      System.out.println(
+          "+---------------------------------------------------------------------------+");
+      System.out.println("Failed: " + this);
+      System.out.println(
+          "-----------------------------------------------------------------------------");
+      System.out.println("Reason: " + this.result.message);
+      printIfNotEmpty("Reported issues", this.issues.toString());
+      printIfNotEmpty("Compilation output", this.compilationLog.toString());
+      printIfNotEmpty("Execution output", this.execLog.toString());
+      System.out.println(
+          "+---------------------------------------------------------------------------+");
     }
+  }
 
-    /** Copy constructor */
-    public LFTest(LFTest test) {
-        this(test.target, test.srcPath);
+  public void handleTestError(TestError e) {
+    result = e.getResult();
+    if (e.getMessage() != null) {
+      issues.append(e.getMessage());
     }
-
-    /** Stream object for capturing standard and error output. */
-    public OutputStream getOutputStream() {
-        return compilationLog;
+    if (e.getException() != null) {
+      issues.append(System.lineSeparator());
+      issues.append(TestBase.stackTraceToString(e.getException()));
     }
-
-    public FileConfig getFileConfig() { return context.getFileConfig(); }
-
-    public LFGeneratorContext getContext() { return context; }
-
-    public Path getSrcPath() { return srcPath; }
-
-    /**
-     * Comparison implementation to allow for tests to be sorted (e.g., when added to a
-     * tree set) based on their path (relative to the root of the test directory).
-     */
-    public int compareTo(LFTest t) {
-        return this.relativePath.compareTo(t.relativePath);
+  }
+
+  public void markPassed() {
+    result = Result.TEST_PASS;
+    // clear the execution log to free memory
+    execLog.clear();
+  }
+
+  void configure(LFGeneratorContext context) {
+    this.context = context;
+  }
+
+  /**
+   * Print the message to the system output, but only if the message is not empty.
+   *
+   * @param header Header for the message to be printed.
+   * @param message The log message to print.
+   */
+  private static void printIfNotEmpty(String header, String message) {
+    if (!message.isEmpty()) {
+      System.out.println(header + ":");
+      System.out.println(message);
     }
+  }
+
+  /** Enumeration of test outcomes. */
+  public enum Result {
+    UNKNOWN("No information available."),
+    CONFIG_FAIL("Could not apply configuration."),
+    PARSE_FAIL("Unable to parse test."),
+    VALIDATE_FAIL("Unable to validate test."),
+    CODE_GEN_FAIL("Error while generating code for test."),
+    NO_EXEC_FAIL("Did not execute test."),
+    TEST_FAIL("Test did not pass."),
+    TEST_EXCEPTION("Test exited with an exception."),
+    TEST_TIMEOUT("Test timed out."),
+    TEST_PASS("Test passed.");
+
+    /** Description of the outcome. */
+    public final String message;
 
     /**
-     * Return true if the given object is an LFTest instance with a name identical to this test.
-     * @param o The object to test for equality with respect to this one.
-     * @return True if the given object is equal to this one, false otherwise.
-     */
-    @Override
-    public boolean equals(Object o) {
-        return o instanceof LFTest && ((LFTest) o).name.equals(this.name);
-    }
-
-    /**
-     * Return a string representing the name of this test.
-     * @return The name of this test.
-     */
-    @Override
-    public String toString() {
-        return this.name;
-    }
-
-    /**
-     * Identify tests uniquely on the basis of their name.
+     * Private constructor.
      *
-     * @return The hash code of the name of this test.
+     * @param message Description of the test outcome.
      */
-    @Override
-    public int hashCode() {
-        return this.name.hashCode();
+    Result(String message) {
+      this.message = message;
     }
+  }
 
-    /**
-     * Report whether this test has failed.
-     * @return True if the test has failed, false otherwise.
-     */
-    public boolean hasFailed() {
-        return result != Result.TEST_PASS;
-    }
-
-    public boolean hasPassed() {
-        return result == Result.TEST_PASS;
-    }
+  /**
+   * Inner class for capturing streams during execution of a test, capable of recording output
+   * streams up until the moment that a test is interrupted upon timing out.
+   *
+   * @author Marten Lohstroh
+   */
+  public static final class ExecutionLogger {
 
     /**
-     * Compile a string that contains all collected errors and return it.
-     * @return A string that contains all collected errors.
+     * String buffer used to record the standard output and error streams from the input process.
      */
-    public void reportErrors() {
-        if (this.hasFailed()) {
-            System.out.println("+---------------------------------------------------------------------------+");
-            System.out.println("Failed: " + this);
-            System.out.println("-----------------------------------------------------------------------------");
-            System.out.println("Reason: " + this.result.message);
-            printIfNotEmpty("Reported issues", this.issues.toString());
-            printIfNotEmpty("Compilation output", this.compilationLog.toString());
-            printIfNotEmpty("Execution output", this.execLog.toString());
-            System.out.println("+---------------------------------------------------------------------------+");
-        }
-    }
-
-    public void handleTestError(TestError e) {
-        result = e.getResult();
-        if (e.getMessage() != null) {
-            issues.append(e.getMessage());
-        }
-        if (e.getException() != null) {
-            issues.append(System.lineSeparator());
-            issues.append(TestBase.stackTraceToString(e.getException()));
-        }
-    }
-
-    public void markPassed() {
-        result = Result.TEST_PASS;
-        // clear the execution log to free memory
-        execLog.clear();
-    }
-
-    void configure(LFGeneratorContext context) {
-        this.context = context;
-    }
+    StringBuffer buffer = new StringBuffer();
 
     /**
-     * Print the message to the system output, but only if the message is not empty.
-     *
-     * @param header Header for the message to be printed.
-     * @param message The log message to print.
+     * Return a thread responsible for recording the standard output stream of the given process. A
+     * separate thread is used so that the activity can be preempted.
      */
-    private static void printIfNotEmpty(String header, String message) {
-        if (!message.isEmpty()) {
-            System.out.println(header + ":");
-            System.out.println(message);
-        }
+    public Thread recordStdOut(Process process) {
+      return recordStream(buffer, process.getInputStream());
     }
 
     /**
-     * Enumeration of test outcomes.
+     * Return a thread responsible for recording the error stream of the given process. A separate
+     * thread is used so that the activity can be preempted.
      */
-    public enum Result {
-        UNKNOWN("No information available."),
-        CONFIG_FAIL("Could not apply configuration."),
-        PARSE_FAIL("Unable to parse test."),
-        VALIDATE_FAIL("Unable to validate test."),
-        CODE_GEN_FAIL("Error while generating code for test."),
-        NO_EXEC_FAIL("Did not execute test."),
-        TEST_FAIL("Test did not pass."),
-        TEST_EXCEPTION("Test exited with an exception."),
-        TEST_TIMEOUT("Test timed out."),
-        TEST_PASS("Test passed.");
-
-        /**
-         * Description of the outcome.
-         */
-        public final String message;
-
-        /**
-         * Private constructor.
-         * @param message Description of the test outcome.
-         */
-        Result(String message) {
-            this.message = message;
-        }
+    public Thread recordStdErr(Process process) {
+      return recordStream(buffer, process.getErrorStream());
     }
 
-
     /**
-     * Inner class for capturing streams during execution of a test, capable of
-     * recording output streams up until the moment that a test is interrupted
-     * upon timing out.
-     *
-     * @author Marten Lohstroh
+     * Return a thread responsible for recording the given stream.
      *
+     * @param builder The builder to append to.
+     * @param inputStream The stream to read from.
      */
-    public static final class ExecutionLogger {
-
-        /**
-         * String buffer used to record the standard output and error
-         * streams from the input process.
-         */
-        StringBuffer buffer = new StringBuffer();
-
-        /**
-         * Return a thread responsible for recording the standard output stream
-         * of the given process.
-         * A separate thread is used so that the activity can be preempted.
-         */
-        public Thread recordStdOut(Process process) {
-            return recordStream(buffer, process.getInputStream());
-        }
-
-        /**
-         * Return a thread responsible for recording the error stream of the
-         * given process.
-         * A separate thread is used so that the activity can be preempted.
-         */
-        public Thread recordStdErr(Process process) {
-            return recordStream(buffer, process.getErrorStream());
-        }
-
-        /**
-         * Return a thread responsible for recording the given stream.
-         *
-         * @param builder     The builder to append to.
-         * @param inputStream The stream to read from.
-         */
-        private Thread recordStream(StringBuffer builder, InputStream inputStream) {
-            return new Thread(() -> {
-                try (Reader reader = new InputStreamReader(inputStream)) {
-                    int len;
-                    char[] buf = new char[1024];
-                    while ((len = reader.read(buf)) > 0) {
-                        builder.append(buf, 0, len);
-                    }
-                } catch (IOException e) {
-                    throw new RuntimeIOException(e);
-                }
-
-            });
-        }
-
-        @Override
-        public String toString() {
-            return buffer.toString();
-        }
-
-        public void clear() {
-            buffer = null;
-        }
+    private Thread recordStream(StringBuffer builder, InputStream inputStream) {
+      return new Thread(
+          () -> {
+            try (Reader reader = new InputStreamReader(inputStream)) {
+              int len;
+              char[] buf = new char[1024];
+              while ((len = reader.read(buf)) > 0) {
+                builder.append(buf, 0, len);
+              }
+            } catch (IOException e) {
+              throw new RuntimeIOException(e);
+            }
+          });
     }
 
-
-    /**
-     * Return a thread responsible for recording the standard output stream of the given process.
-     * A separate thread is used so that the activity can be preempted.
-     */
-    public Thread recordStdOut(Process process) {
-        return execLog.recordStdOut(process);
+    @Override
+    public String toString() {
+      return buffer.toString();
     }
 
-    /**
-     * Return a thread responsible for recording the error stream of the given process.
-     * A separate thread is used so that the activity can be preempted.
-     */
-    public Thread recordStdErr(Process process) {
-        return execLog.recordStdErr(process);
+    public void clear() {
+      buffer = null;
     }
+  }
+
+  /**
+   * Return a thread responsible for recording the standard output stream of the given process. A
+   * separate thread is used so that the activity can be preempted.
+   */
+  public Thread recordStdOut(Process process) {
+    return execLog.recordStdOut(process);
+  }
+
+  /**
+   * Return a thread responsible for recording the error stream of the given process. A separate
+   * thread is used so that the activity can be preempted.
+   */
+  public Thread recordStdErr(Process process) {
+    return execLog.recordStdErr(process);
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/LfParsingUtil.java b/org.lflang.tests/src/org/lflang/tests/LfParsingUtil.java
index fd9ffa2a2e..ae45bf4e7c 100644
--- a/org.lflang.tests/src/org/lflang/tests/LfParsingUtil.java
+++ b/org.lflang.tests/src/org/lflang/tests/LfParsingUtil.java
@@ -1,100 +1,87 @@
 package org.lflang.tests;
 
+import com.google.inject.Injector;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.resource.XtextResourceSet;
 import org.junit.jupiter.api.Assertions;
-
 import org.lflang.LFStandaloneSetup;
 import org.lflang.lf.Model;
 
-import com.google.inject.Injector;
-
 /**
  * @author Clément Fournier
  */
 public class LfParsingUtil {
 
-    /**
-     * Parse the given file, asserts that there are no parsing errors.
-     */
-    public static Model parseValidModel(
-        String fileName,
-        String reformattedTestCase
-    ) {
-        Model resultingModel = parse(reformattedTestCase);
-        checkValid(fileName, resultingModel);
-        return resultingModel;
-    }
+  /** Parse the given file, asserts that there are no parsing errors. */
+  public static Model parseValidModel(String fileName, String reformattedTestCase) {
+    Model resultingModel = parse(reformattedTestCase);
+    checkValid(fileName, resultingModel);
+    return resultingModel;
+  }
 
-    private static void checkValid(String fileName, Model resultingModel) {
-        Assertions.assertNotNull(resultingModel);
-        if (!resultingModel.eResource().getErrors().isEmpty()) {
-            resultingModel.eResource().getErrors().forEach(System.err::println);
-            Assertions.assertTrue(resultingModel.eResource().getErrors().isEmpty(),
-                "Parsing errors in " + fileName);
-        }
+  private static void checkValid(String fileName, Model resultingModel) {
+    Assertions.assertNotNull(resultingModel);
+    if (!resultingModel.eResource().getErrors().isEmpty()) {
+      resultingModel.eResource().getErrors().forEach(System.err::println);
+      Assertions.assertTrue(
+          resultingModel.eResource().getErrors().isEmpty(), "Parsing errors in " + fileName);
     }
+  }
 
-    public static Model parseSourceAsIfInDirectory(
-        Path directory,
-        String sourceText
-    ) {
-        int num = 0;
-        while (Files.exists(directory.resolve("file" + num + ".lf"))) {
-            num++;
-        }
-        Path file = directory.resolve("file" + num + ".lf");
-        try {
-            Files.writeString(file, sourceText);
-            Model resultingModel = parse(file);
-            checkValid("file in " + directory, resultingModel);
-            return resultingModel;
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        } finally {
-            try {
-                Files.deleteIfExists(file);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
+  public static Model parseSourceAsIfInDirectory(Path directory, String sourceText) {
+    int num = 0;
+    while (Files.exists(directory.resolve("file" + num + ".lf"))) {
+      num++;
+    }
+    Path file = directory.resolve("file" + num + ".lf");
+    try {
+      Files.writeString(file, sourceText);
+      Model resultingModel = parse(file);
+      checkValid("file in " + directory, resultingModel);
+      return resultingModel;
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    } finally {
+      try {
+        Files.deleteIfExists(file);
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
     }
+  }
 
-    public static Model parse(String fileContents) {
-        Path file = null;
+  public static Model parse(String fileContents) {
+    Path file = null;
+    try {
+      file = Files.createTempFile("lftests", ".lf");
+      Files.writeString(file, fileContents);
+      return parse(file);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    } finally {
+      if (file != null) {
         try {
-            file = Files.createTempFile("lftests", ".lf");
-            Files.writeString(file, fileContents);
-            return parse(file);
+          Files.deleteIfExists(file);
         } catch (IOException e) {
-            throw new RuntimeException(e);
-        } finally {
-            if (file != null) {
-                try {
-                    Files.deleteIfExists(file);
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            }
+          throw new RuntimeException(e);
         }
+      }
     }
+  }
 
-    public static Model parse(Path file) {
-        // Source: https://wiki.eclipse.org/Xtext/FAQ#How_do_I_load_my_model_in_a_standalone_Java_application_.3F
-        Injector injector = new LFStandaloneSetup().createInjectorAndDoEMFRegistration();
-        XtextResourceSet resourceSet = injector.getInstance(XtextResourceSet.class);
-        resourceSet.addLoadOption(XtextResource.OPTION_RESOLVE_ALL, Boolean.TRUE);
-        Resource resource = resourceSet.getResource(
-            URI.createFileURI(file.toFile().getAbsolutePath()),
-            true
-        );
-        return (Model) resource.getContents().get(0);
-    }
+  public static Model parse(Path file) {
+    // Source:
+    // https://wiki.eclipse.org/Xtext/FAQ#How_do_I_load_my_model_in_a_standalone_Java_application_.3F
+    Injector injector = new LFStandaloneSetup().createInjectorAndDoEMFRegistration();
+    XtextResourceSet resourceSet = injector.getInstance(XtextResourceSet.class);
+    resourceSet.addLoadOption(XtextResource.OPTION_RESOLVE_ALL, Boolean.TRUE);
+    Resource resource =
+        resourceSet.getResource(URI.createFileURI(file.toFile().getAbsolutePath()), true);
+    return (Model) resource.getContents().get(0);
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/RunSingleTestMain.java b/org.lflang.tests/src/org/lflang/tests/RunSingleTestMain.java
index 0f7e919174..fdb26de7f5 100644
--- a/org.lflang.tests/src/org/lflang/tests/RunSingleTestMain.java
+++ b/org.lflang.tests/src/org/lflang/tests/RunSingleTestMain.java
@@ -29,7 +29,6 @@
 import java.nio.file.Paths;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.lflang.Target;
 import org.lflang.tests.runtime.CCppTest;
 import org.lflang.tests.runtime.CTest;
@@ -39,55 +38,55 @@
 import org.lflang.tests.runtime.TypeScriptTest;
 
 /**
- * Execute a single test case. Use it with the gradle task
- * {@code gradle runSingleTest --args test/Python/src/Minimal.lf}
+ * Execute a single test case. Use it with the gradle task {@code gradle runSingleTest --args
+ * test/Python/src/Minimal.lf}
  *
  * @author Clément Fournier
  */
 public class RunSingleTestMain {
 
+  private static final Pattern TEST_FILE_PATTERN =
+      Pattern.compile("(test/(\\w+))/src/([^/]++/)*(\\w+.lf)");
 
-    private static final Pattern TEST_FILE_PATTERN = Pattern.compile("(test/(\\w+))/src/([^/]++/)*(\\w+.lf)");
-
-    public static void main(String[] args) throws FileNotFoundException {
-        if (args.length != 1) {
-            throw new IllegalArgumentException("Expected 1 path to an LF file");
-        }
-        var path = Paths.get(args[0]);
-        if (!Files.exists(path)) {
-            throw new FileNotFoundException("No such test file: " + path);
-        }
+  public static void main(String[] args) throws FileNotFoundException {
+    if (args.length != 1) {
+      throw new IllegalArgumentException("Expected 1 path to an LF file");
+    }
+    var path = Paths.get(args[0]);
+    if (!Files.exists(path)) {
+      throw new FileNotFoundException("No such test file: " + path);
+    }
 
-        Matcher matcher = TEST_FILE_PATTERN.matcher(args[0]);
-        if (!matcher.matches()) {
-            throw new FileNotFoundException("Not a test: " + path);
-        }
+    Matcher matcher = TEST_FILE_PATTERN.matcher(args[0]);
+    if (!matcher.matches()) {
+      throw new FileNotFoundException("Not a test: " + path);
+    }
 
-        Target target = Target.forName(matcher.group(2)).get();
+    Target target = Target.forName(matcher.group(2)).get();
 
-        Class<? extends TestBase> testClass = getTestInstance(target);
+    Class<? extends TestBase> testClass = getTestInstance(target);
 
-        LFTest testCase = new LFTest(target, path.toAbsolutePath());
+    LFTest testCase = new LFTest(target, path.toAbsolutePath());
 
-        TestBase.runSingleTestAndPrintResults(testCase, testClass, TestBase.pathToLevel(path));
-    }
+    TestBase.runSingleTestAndPrintResults(testCase, testClass, TestBase.pathToLevel(path));
+  }
 
-    private static Class<? extends TestBase> getTestInstance(Target target) {
-        switch (target) {
-        case C:
-            return CTest.class;
-        case CCPP:
-            return CCppTest.class;
-        case CPP:
-            return CppTest.class;
-        case TS:
-            return TypeScriptTest.class;
-        case Python:
-            return PythonTest.class;
-        case Rust:
-            return RustTest.class;
-        default:
-            throw new IllegalArgumentException();
-        }
+  private static Class<? extends TestBase> getTestInstance(Target target) {
+    switch (target) {
+      case C:
+        return CTest.class;
+      case CCPP:
+        return CCppTest.class;
+      case CPP:
+        return CppTest.class;
+      case TS:
+        return TypeScriptTest.class;
+      case Python:
+        return PythonTest.class;
+      case Rust:
+        return RustTest.class;
+      default:
+        throw new IllegalArgumentException();
     }
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/RuntimeTest.java b/org.lflang.tests/src/org/lflang/tests/RuntimeTest.java
index 77bc6d8034..2dfd42d38b 100644
--- a/org.lflang.tests/src/org/lflang/tests/RuntimeTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/RuntimeTest.java
@@ -2,207 +2,216 @@
 
 import java.util.EnumSet;
 import java.util.List;
-
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
-import org.lflang.ast.ASTUtils;
 import org.lflang.Target;
+import org.lflang.ast.ASTUtils;
 import org.lflang.tests.TestRegistry.TestCategory;
 
 /**
  * A collection of JUnit tests to perform on a given set of targets.
  *
  * @author Marten Lohstroh
- *
  */
 public abstract class RuntimeTest extends TestBase {
 
-    /**
-     * Construct a test instance that runs tests for a single target.
-     *
-     * @param target The target to run tests for.
-     */
-    protected RuntimeTest(Target target) {
-        super(target);
-    }
-
-    /**
-     * Construct a test instance that runs tests for a list of targets.
-     * @param targets The targets to run tests for.
-     */
-    protected RuntimeTest(List<Target> targets) {
-        super(targets);
-    }
-
-    /**
-     * Whether to enable {@link #runEnclaveTests()}.
-     */
-    protected boolean supportsEnclaves() { return false; }
-
-    /**
-     * Whether to enable {@link #runFederatedTests()}.
-     */
-    protected boolean supportsFederatedExecution() {
-        return false;
-    }
-
-    /**
-     * Whether to enable {@link #runTypeParameterTests()}.
-     */
-    protected boolean supportsGenericTypes() {
-        return false;
-    }
-
-    /**
-     * Whether to enable {@link #runDockerTests()} and {@link #runDockerFederatedTests()}.
-     */
-    protected boolean supportsDockerOption() {
-        return false;
-    }
-
-    @Test
-    public void runGenericTests() {
-        runTestsForTargets(Message.DESC_GENERIC,
-                           TestCategory.GENERIC::equals, Configurators::noChanges,
-                            TestLevel.EXECUTION,
-                           false);
-    }
-
-    @Test
-    public void runTargetSpecificTests() {
-        runTestsForTargets(Message.DESC_TARGET_SPECIFIC,
-                           TestCategory.TARGET::equals, Configurators::noChanges,
-                            TestLevel.EXECUTION,
-                           false);
-    }
-
-    @Test
-    public void runMultiportTests() {
-        runTestsForTargets(Message.DESC_MULTIPORT,
-                           TestCategory.MULTIPORT::equals, Configurators::noChanges,
-                           TestLevel.EXECUTION,
-                           false);
-    }
-
-    @Test
-    public void runTypeParameterTests() {
-        Assumptions.assumeTrue(supportsGenericTypes(), Message.NO_GENERICS_SUPPORT);
-        runTestsForTargets(Message.DESC_TYPE_PARMS,
-                           TestCategory.GENERICS::equals, Configurators::noChanges,
-                           TestLevel.EXECUTION,
-                           false);
-    }
-
-    @Test
-    public void runAsFederated() {
-        Assumptions.assumeTrue(supportsFederatedExecution(), Message.NO_FEDERATION_SUPPORT);
-
-        EnumSet<TestCategory> categories = EnumSet.allOf(TestCategory.class);
-        categories.removeAll(EnumSet.of(TestCategory.CONCURRENT,
-                                        TestCategory.FEDERATED,
-                                        // FIXME: also run the multiport tests once these are supported.
-                                        TestCategory.MULTIPORT));
-
-        runTestsFor(List.of(Target.C),
-                    Message.DESC_AS_FEDERATED,
-                    categories::contains,
-                    it -> ASTUtils.makeFederated(it.getFileConfig().resource),
-                    TestLevel.EXECUTION,
-                    true);
-    }
-
-    @Test
-    public void runConcurrentTests() {
-        runTestsForTargets(Message.DESC_CONCURRENT,
-                           TestCategory.CONCURRENT::equals, Configurators::noChanges,
-                           TestLevel.EXECUTION,
-                           false);
-
-    }
-
-    @Test
-    public void runFederatedTests() {
-        Assumptions.assumeTrue(supportsFederatedExecution(), Message.NO_FEDERATION_SUPPORT);
-        runTestsForTargets(Message.DESC_FEDERATED,
-                           TestCategory.FEDERATED::equals, Configurators::noChanges,
-                           TestLevel.EXECUTION,
-                           false);
-    }
-
-    /**
-     * Run the tests for modal reactors.
-     */
-    @Test
-    public void runModalTests() {
-        runTestsForTargets(Message.DESC_MODAL,
-            TestCategory.MODAL_MODELS::equals, Configurators::noChanges,
-            TestLevel.EXECUTION,
-            false);
-    }
-
-    /**
-     * Run the tests for non-inlined reaction bodies.
-     */
-    @Test
-    public void runNoInliningTests() {
-        runTestsForTargets(Message.DESC_MODAL,
-            TestCategory.NO_INLINING::equals, Configurators::noChanges,
-            TestLevel.EXECUTION,
-            false);
-    }
-
-    /**
-      * Run docker tests, provided that the platform is Linux and the target supports Docker.
-      * Skip if platform is not Linux or target does not support Docker.
-      */
-    @Test
-    public void runDockerTests() {
-        Assumptions.assumeTrue(isLinux(), Message.NO_DOCKER_TEST_SUPPORT);
-        Assumptions.assumeTrue(supportsDockerOption(), Message.NO_DOCKER_SUPPORT);
-        runTestsForTargets(Message.DESC_DOCKER,
-                           TestCategory.DOCKER::equals, Configurators::noChanges,
-                            TestLevel.EXECUTION,
-                           false);
-    }
-
-    /**
-      * Run federated docker tests, provided that the platform is Linux, the target supports Docker,
-      * and the target supports federated execution. If any of these requirements are not met, skip
-      * the tests.
-      */
-    @Test
-    public void runDockerFederatedTests() {
-        Assumptions.assumeTrue(isLinux(), Message.NO_DOCKER_TEST_SUPPORT);
-        Assumptions.assumeTrue(supportsDockerOption(), Message.NO_DOCKER_SUPPORT);
-        Assumptions.assumeTrue(supportsFederatedExecution(), Message.NO_FEDERATION_SUPPORT);
-        runTestsForTargets(Message.DESC_DOCKER_FEDERATED,
-                           TestCategory.DOCKER_FEDERATED::equals, Configurators::noChanges,
-                           TestLevel.EXECUTION,
-                           false);
-    }
-
-    @Test
-    public void runWithThreadingOff() {
-        Assumptions.assumeTrue(supportsSingleThreadedExecution(), Message.NO_SINGLE_THREADED_SUPPORT);
-        this.runTestsForTargets(
-            Message.DESC_SINGLE_THREADED,
-            Configurators::compatibleWithThreadingOff,
-            Configurators::disableThreading,
-            TestLevel.EXECUTION,
-            true
-        );
-    }
-
-    /**
-     * Run enclave tests if the target supports enclaves.
-     */
-    @Test
-    public void runEnclaveTests() {
-        Assumptions.assumeTrue(supportsEnclaves(), Message.NO_ENCLAVE_SUPPORT);
-        runTestsForTargets(Message.DESC_ENCLAVE,
-            TestCategory.ENCLAVE::equals, Configurators::noChanges,
-            TestLevel.EXECUTION,
-            false);
-    }
-
+  /**
+   * Construct a test instance that runs tests for a single target.
+   *
+   * @param target The target to run tests for.
+   */
+  protected RuntimeTest(Target target) {
+    super(target);
+  }
+
+  /**
+   * Construct a test instance that runs tests for a list of targets.
+   *
+   * @param targets The targets to run tests for.
+   */
+  protected RuntimeTest(List<Target> targets) {
+    super(targets);
+  }
+
+  /** Whether to enable {@link #runEnclaveTests()}. */
+  protected boolean supportsEnclaves() {
+    return false;
+  }
+
+  /** Whether to enable {@link #runFederatedTests()}. */
+  protected boolean supportsFederatedExecution() {
+    return false;
+  }
+
+  /** Whether to enable {@link #runTypeParameterTests()}. */
+  protected boolean supportsGenericTypes() {
+    return false;
+  }
+
+  /** Whether to enable {@link #runDockerTests()} and {@link #runDockerFederatedTests()}. */
+  protected boolean supportsDockerOption() {
+    return false;
+  }
+
+  @Test
+  public void runGenericTests() {
+    runTestsForTargets(
+        Message.DESC_GENERIC,
+        TestCategory.GENERIC::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  @Test
+  public void runTargetSpecificTests() {
+    runTestsForTargets(
+        Message.DESC_TARGET_SPECIFIC,
+        TestCategory.TARGET::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  @Test
+  public void runMultiportTests() {
+    runTestsForTargets(
+        Message.DESC_MULTIPORT,
+        TestCategory.MULTIPORT::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  @Test
+  public void runTypeParameterTests() {
+    Assumptions.assumeTrue(supportsGenericTypes(), Message.NO_GENERICS_SUPPORT);
+    runTestsForTargets(
+        Message.DESC_TYPE_PARMS,
+        TestCategory.GENERICS::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  @Test
+  public void runAsFederated() {
+    Assumptions.assumeTrue(supportsFederatedExecution(), Message.NO_FEDERATION_SUPPORT);
+
+    EnumSet<TestCategory> categories = EnumSet.allOf(TestCategory.class);
+    categories.removeAll(
+        EnumSet.of(
+            TestCategory.CONCURRENT,
+            TestCategory.FEDERATED,
+            // FIXME: also run the multiport tests once these are supported.
+            TestCategory.MULTIPORT));
+
+    runTestsFor(
+        List.of(Target.C),
+        Message.DESC_AS_FEDERATED,
+        categories::contains,
+        it -> ASTUtils.makeFederated(it.getFileConfig().resource),
+        TestLevel.EXECUTION,
+        true);
+  }
+
+  @Test
+  public void runConcurrentTests() {
+    runTestsForTargets(
+        Message.DESC_CONCURRENT,
+        TestCategory.CONCURRENT::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  @Test
+  public void runFederatedTests() {
+    Assumptions.assumeTrue(supportsFederatedExecution(), Message.NO_FEDERATION_SUPPORT);
+    runTestsForTargets(
+        Message.DESC_FEDERATED,
+        TestCategory.FEDERATED::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  /** Run the tests for modal reactors. */
+  @Test
+  public void runModalTests() {
+    runTestsForTargets(
+        Message.DESC_MODAL,
+        TestCategory.MODAL_MODELS::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  /** Run the tests for non-inlined reaction bodies. */
+  @Test
+  public void runNoInliningTests() {
+    runTestsForTargets(
+        Message.DESC_MODAL,
+        TestCategory.NO_INLINING::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  /**
+   * Run docker tests, provided that the platform is Linux and the target supports Docker. Skip if
+   * platform is not Linux or target does not support Docker.
+   */
+  @Test
+  public void runDockerTests() {
+    Assumptions.assumeTrue(isLinux(), Message.NO_DOCKER_TEST_SUPPORT);
+    Assumptions.assumeTrue(supportsDockerOption(), Message.NO_DOCKER_SUPPORT);
+    runTestsForTargets(
+        Message.DESC_DOCKER,
+        TestCategory.DOCKER::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  /**
+   * Run federated docker tests, provided that the platform is Linux, the target supports Docker,
+   * and the target supports federated execution. If any of these requirements are not met, skip the
+   * tests.
+   */
+  @Test
+  public void runDockerFederatedTests() {
+    Assumptions.assumeTrue(isLinux(), Message.NO_DOCKER_TEST_SUPPORT);
+    Assumptions.assumeTrue(supportsDockerOption(), Message.NO_DOCKER_SUPPORT);
+    Assumptions.assumeTrue(supportsFederatedExecution(), Message.NO_FEDERATION_SUPPORT);
+    runTestsForTargets(
+        Message.DESC_DOCKER_FEDERATED,
+        TestCategory.DOCKER_FEDERATED::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  @Test
+  public void runWithThreadingOff() {
+    Assumptions.assumeTrue(supportsSingleThreadedExecution(), Message.NO_SINGLE_THREADED_SUPPORT);
+    this.runTestsForTargets(
+        Message.DESC_SINGLE_THREADED,
+        Configurators::compatibleWithThreadingOff,
+        Configurators::disableThreading,
+        TestLevel.EXECUTION,
+        true);
+  }
+
+  /** Run enclave tests if the target supports enclaves. */
+  @Test
+  public void runEnclaveTests() {
+    Assumptions.assumeTrue(supportsEnclaves(), Message.NO_ENCLAVE_SUPPORT);
+    runTestsForTargets(
+        Message.DESC_ENCLAVE,
+        TestCategory.ENCLAVE::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/TestBase.java b/org.lflang.tests/src/org/lflang/tests/TestBase.java
index 192a531828..9ae075780a 100644
--- a/org.lflang.tests/src/org/lflang/tests/TestBase.java
+++ b/org.lflang.tests/src/org/lflang/tests/TestBase.java
@@ -3,7 +3,11 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.io.FileWriter;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.Provider;
+import java.io.BufferedWriter;
+import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.PrintWriter;
@@ -12,8 +16,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.io.File;
-import java.io.BufferedWriter;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -24,7 +26,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
 import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -37,7 +38,6 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.lflang.DefaultErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.LFRuntimeModule;
@@ -48,18 +48,11 @@
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.LFGeneratorContext.BuildParm;
 import org.lflang.generator.MainContext;
-import org.lflang.generator.GeneratorCommandFactory;
 import org.lflang.tests.Configurators.Configurator;
 import org.lflang.tests.LFTest.Result;
 import org.lflang.tests.TestRegistry.TestCategory;
 import org.lflang.util.FileUtil;
 import org.lflang.util.LFCommand;
-import org.lflang.util.ArduinoUtil;
-
-
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.Provider;
 
 /**
  * Base class for test classes that define JUnit tests.
@@ -70,501 +63,518 @@
 @InjectWith(LFInjectorProvider.class)
 public abstract class TestBase {
 
-    @Inject
-    IResourceValidator validator;
-    @Inject
-    LFGenerator generator;
-    @Inject
-    JavaIoFileSystemAccess fileAccess;
-    @Inject
-    Provider<ResourceSet> resourceSetProvider;
-
-
-    /** Reference to System.out. */
-    private static final PrintStream out = System.out;
-
-    /** Reference to System.err. */
-    private static final PrintStream err = System.err;
-
-    /** Execution timeout enforced for all tests. */
-    private static final long MAX_EXECUTION_TIME_SECONDS = 180;
-
-    /** Content separator used in test output, 78 characters wide. */
-    public static final String THIN_LINE =
-        "------------------------------------------------------------------------------" +
-            System.lineSeparator();
-
-    /** Content separator used in test output, 78 characters wide. */
-    public static final String THICK_LINE =
-        "==============================================================================" +
-            System.lineSeparator();
-
-    /** The targets for which to run the tests. */
-    private final List<Target> targets;
-
-    /**
-     * An enumeration of test levels.
-     * @author Marten Lohstroh
-     *
-     */
-    public enum TestLevel {VALIDATION, CODE_GEN, BUILD, EXECUTION}
-
-    /**
-     * Static function for converting a path to its associated test level.
-     * @author Anirudh Rengarajan
-     */
-    public static TestLevel pathToLevel(Path path) {
-        while(path.getParent() != null) {
-            String name = path.getFileName().toString();
-            for (var category: TestCategory.values()) {
-                if (category.name().equalsIgnoreCase(name)) {
-                    return category.level;
-                }
-            }
-            path = path.getParent();
+  @Inject IResourceValidator validator;
+  @Inject LFGenerator generator;
+  @Inject JavaIoFileSystemAccess fileAccess;
+  @Inject Provider<ResourceSet> resourceSetProvider;
+
+  /** Reference to System.out. */
+  private static final PrintStream out = System.out;
+
+  /** Reference to System.err. */
+  private static final PrintStream err = System.err;
+
+  /** Execution timeout enforced for all tests. */
+  private static final long MAX_EXECUTION_TIME_SECONDS = 180;
+
+  /** Content separator used in test output, 78 characters wide. */
+  public static final String THIN_LINE =
+      "------------------------------------------------------------------------------"
+          + System.lineSeparator();
+
+  /** Content separator used in test output, 78 characters wide. */
+  public static final String THICK_LINE =
+      "=============================================================================="
+          + System.lineSeparator();
+
+  /** The targets for which to run the tests. */
+  private final List<Target> targets;
+
+  /**
+   * An enumeration of test levels.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum TestLevel {
+    VALIDATION,
+    CODE_GEN,
+    BUILD,
+    EXECUTION
+  }
+
+  /**
+   * Static function for converting a path to its associated test level.
+   *
+   * @author Anirudh Rengarajan
+   */
+  public static TestLevel pathToLevel(Path path) {
+    while (path.getParent() != null) {
+      String name = path.getFileName().toString();
+      for (var category : TestCategory.values()) {
+        if (category.name().equalsIgnoreCase(name)) {
+          return category.level;
         }
-        return TestLevel.EXECUTION;
+      }
+      path = path.getParent();
     }
-
-    /**
-     * A collection messages often used throughout the test package.
-     *
-     * @author Marten Lohstroh
-     *
-     */
-    public static class Message {
-        /* Reasons for not running tests. */
-        public static final String NO_WINDOWS_SUPPORT = "Not (yet) supported on Windows.";
-        public static final String NO_SINGLE_THREADED_SUPPORT = "Target does not support single-threaded execution.";
-        public static final String NO_FEDERATION_SUPPORT = "Target does not support federated execution.";
-        public static final String NO_ENCLAVE_SUPPORT = "Targeet does not support the enclave feature.";
-        public static final String NO_DOCKER_SUPPORT = "Target does not support the 'docker' property.";
-        public static final String NO_DOCKER_TEST_SUPPORT = "Docker tests are only supported on Linux.";
-        public static final String NO_GENERICS_SUPPORT = "Target does not support generic types.";
-
-        /* Descriptions of collections of tests. */
-        public static final String DESC_SERIALIZATION = "Run serialization tests.";
-        public static final String DESC_GENERIC = "Run generic tests.";
-        public static final String DESC_TYPE_PARMS = "Run tests for reactors with type parameters.";
-        public static final String DESC_MULTIPORT = "Run multiport tests.";
-        public static final String DESC_AS_FEDERATED = "Run non-federated tests in federated mode.";
-        public static final String DESC_FEDERATED = "Run federated tests.";
-        public static final String DESC_DOCKER = "Run docker tests.";
-        public static final String DESC_DOCKER_FEDERATED = "Run docker federated tests.";
-        public static final String DESC_ENCLAVE = "Run enclave tests.";
-        public static final String DESC_CONCURRENT = "Run concurrent tests.";
-        public static final String DESC_TARGET_SPECIFIC = "Run target-specific tests";
-        public static final String DESC_ARDUINO = "Running Arduino tests.";
-        public static final String DESC_ZEPHYR = "Running Zephyr tests.";
-        public static final String DESC_AS_CCPP = "Running C tests as CCpp.";
-        public static final String DESC_SINGLE_THREADED = "Run non-concurrent and non-federated tests with threading = off.";
-        public static final String DESC_SCHED_SWAPPING = "Running with non-default runtime scheduler ";
-        public static final String DESC_ROS2 = "Running tests using ROS2.";
-        public static final String DESC_MODAL = "Run modal reactor tests.";
-
-        /* Missing dependency messages */
-        public static final String MISSING_DOCKER = "Executable 'docker' not found or 'docker' daemon thread not running";
-        public static final String MISSING_ARDUINO_CLI = "Executable 'arduino-cli' not found";
+    return TestLevel.EXECUTION;
+  }
+
+  /**
+   * A collection messages often used throughout the test package.
+   *
+   * @author Marten Lohstroh
+   */
+  public static class Message {
+    /* Reasons for not running tests. */
+    public static final String NO_WINDOWS_SUPPORT = "Not (yet) supported on Windows.";
+    public static final String NO_SINGLE_THREADED_SUPPORT =
+        "Target does not support single-threaded execution.";
+    public static final String NO_FEDERATION_SUPPORT =
+        "Target does not support federated execution.";
+    public static final String NO_ENCLAVE_SUPPORT = "Targeet does not support the enclave feature.";
+    public static final String NO_DOCKER_SUPPORT = "Target does not support the 'docker' property.";
+    public static final String NO_DOCKER_TEST_SUPPORT = "Docker tests are only supported on Linux.";
+    public static final String NO_GENERICS_SUPPORT = "Target does not support generic types.";
+
+    /* Descriptions of collections of tests. */
+    public static final String DESC_SERIALIZATION = "Run serialization tests.";
+    public static final String DESC_GENERIC = "Run generic tests.";
+    public static final String DESC_TYPE_PARMS = "Run tests for reactors with type parameters.";
+    public static final String DESC_MULTIPORT = "Run multiport tests.";
+    public static final String DESC_AS_FEDERATED = "Run non-federated tests in federated mode.";
+    public static final String DESC_FEDERATED = "Run federated tests.";
+    public static final String DESC_DOCKER = "Run docker tests.";
+    public static final String DESC_DOCKER_FEDERATED = "Run docker federated tests.";
+    public static final String DESC_ENCLAVE = "Run enclave tests.";
+    public static final String DESC_CONCURRENT = "Run concurrent tests.";
+    public static final String DESC_TARGET_SPECIFIC = "Run target-specific tests";
+    public static final String DESC_ARDUINO = "Running Arduino tests.";
+    public static final String DESC_ZEPHYR = "Running Zephyr tests.";
+    public static final String DESC_AS_CCPP = "Running C tests as CCpp.";
+    public static final String DESC_SINGLE_THREADED =
+        "Run non-concurrent and non-federated tests with threading = off.";
+    public static final String DESC_SCHED_SWAPPING = "Running with non-default runtime scheduler ";
+    public static final String DESC_ROS2 = "Running tests using ROS2.";
+    public static final String DESC_MODAL = "Run modal reactor tests.";
+
+    /* Missing dependency messages */
+    public static final String MISSING_DOCKER =
+        "Executable 'docker' not found or 'docker' daemon thread not running";
+    public static final String MISSING_ARDUINO_CLI = "Executable 'arduino-cli' not found";
+  }
+
+  /** Constructor for test classes that test a single target. */
+  protected TestBase(Target first) {
+    this(Collections.singletonList(first));
+  }
+
+  /** Special ctor for the code coverage test */
+  protected TestBase(List<Target> targets) {
+    assertFalse(targets.isEmpty(), "empty target list");
+    this.targets = Collections.unmodifiableList(targets);
+    TestRegistry.initialize();
+  }
+
+  /**
+   * Run selected tests for a given target and configurator up to the specified level.
+   *
+   * @param target The target to run tests for.
+   * @param selected A predicate that given a test category returns whether it should be included in
+   *     this test run or not.
+   * @param configurator A procedure for configuring the tests.
+   * @param copy Whether or not to work on copies of tests in the test. registry.
+   */
+  protected final void runTestsAndPrintResults(
+      Target target,
+      Predicate<TestCategory> selected,
+      TestLevel level,
+      Configurator configurator,
+      boolean copy) {
+    var categories = Arrays.stream(TestCategory.values()).filter(selected).toList();
+    for (var category : categories) {
+      System.out.println(category.getHeader());
+      var tests = TestRegistry.getRegisteredTests(target, category, copy);
+      try {
+        validateAndRun(tests, configurator, level);
+      } catch (IOException e) {
+        throw new RuntimeIOException(e);
+      }
+      System.out.println(TestRegistry.getCoverageReport(target, category));
+      checkAndReportFailures(tests);
     }
-
-    /** Constructor for test classes that test a single target. */
-    protected TestBase(Target first) {
-        this(Collections.singletonList(first));
+  }
+
+  /**
+   * Run tests in the given selection for all targets enabled in this class.
+   *
+   * @param description A string that describes the collection of tests.
+   * @param selected A predicate that given a test category returns whether it should be included in
+   *     this test run or not.
+   * @param configurator A procedure for configuring the tests.
+   * @param copy Whether or not to work on copies of tests in the test. registry.
+   */
+  protected void runTestsForTargets(
+      String description,
+      Predicate<TestCategory> selected,
+      Configurator configurator,
+      TestLevel level,
+      boolean copy) {
+    for (Target target : this.targets) {
+      runTestsFor(List.of(target), description, selected, configurator, level, copy);
     }
-
-    /** Special ctor for the code coverage test */
-    protected TestBase(List<Target> targets) {
-        assertFalse(targets.isEmpty(), "empty target list");
-        this.targets = Collections.unmodifiableList(targets);
-        TestRegistry.initialize();
+  }
+
+  /**
+   * Run tests in the given selection for a subset of given targets.
+   *
+   * @param subset The subset of targets to run the selected tests for.
+   * @param description A string that describes the collection of tests.
+   * @param selected A predicate that given a test category returns whether it should be included in
+   *     this test run or not.
+   * @param configurator A procedure for configuring the tests.
+   * @param copy Whether to work on copies of tests in the test. registry.
+   */
+  protected void runTestsFor(
+      List<Target> subset,
+      String description,
+      Predicate<TestCategory> selected,
+      Configurator configurator,
+      TestLevel level,
+      boolean copy) {
+    for (Target target : subset) {
+      printTestHeader(target, description);
+      runTestsAndPrintResults(target, selected, level, configurator, copy);
     }
-
-    /**
-     * Run selected tests for a given target and configurator up to the specified level.
-     *
-     * @param target The target to run tests for.
-     * @param selected A predicate that given a test category returns whether
-     * it should be included in this test run or not.
-     * @param configurator  A procedure for configuring the tests.
-     * @param copy Whether or not to work on copies of tests in the test.
-     * registry.
-     */
-    protected final void runTestsAndPrintResults(Target target,
-                                                 Predicate<TestCategory> selected,
-                                                 TestLevel level,
-                                                 Configurator configurator,
-                                                 boolean copy) {
-        var categories = Arrays.stream(TestCategory.values()).filter(selected).toList();
-        for (var category : categories) {
-            System.out.println(category.getHeader());
-            var tests = TestRegistry.getRegisteredTests(target, category, copy);
-            try {
-                validateAndRun(tests, configurator, level);
-            } catch (IOException e) {
-                throw new RuntimeIOException(e);
-            }
-            System.out.println(TestRegistry.getCoverageReport(target, category));
-            checkAndReportFailures(tests);
-        }
+  }
+
+  /** Whether to enable threading. */
+  protected boolean supportsSingleThreadedExecution() {
+    return false;
+  }
+
+  /**
+   * Determine whether the current platform is Windows.
+   *
+   * @return true if the current platform is Windwos, false otherwise.
+   */
+  protected static boolean isWindows() {
+    String OS = System.getProperty("os.name").toLowerCase();
+    return OS.contains("win");
+  }
+
+  /**
+   * Determine whether the current platform is MacOS.
+   *
+   * @return true if the current platform is MacOS, false otherwise.
+   */
+  protected static boolean isMac() {
+    String OS = System.getProperty("os.name").toLowerCase();
+    return OS.contains("mac");
+  }
+
+  /**
+   * Determine whether the current platform is Linux.
+   *
+   * @return true if the current platform is Linux, false otherwise.
+   */
+  protected static boolean isLinux() {
+    String OS = System.getProperty("os.name").toLowerCase();
+    return OS.contains("linux");
+  }
+
+  /** End output redirection. */
+  private static void restoreOutputs() {
+    System.out.flush();
+    System.err.flush();
+    System.setOut(out);
+    System.setErr(err);
+  }
+
+  /**
+   * Redirect outputs to the given tests for recording.
+   *
+   * @param test The test to redirect outputs to.
+   */
+  private static void redirectOutputs(LFTest test) {
+    System.setOut(new PrintStream(test.getOutputStream()));
+    System.setErr(new PrintStream(test.getOutputStream()));
+  }
+
+  /**
+   * Run a test, print results on stderr.
+   *
+   * @param test Test case.
+   * @param testClass The test class that will execute the test. This is target-specific, it may
+   *     provide some target-specific configuration. We pass a class and not a new instance because
+   *     this method needs to ensure the object is properly injected, and so, it needs to control
+   *     its entire lifecycle.
+   * @param level Level to which to run the test.
+   */
+  public static void runSingleTestAndPrintResults(
+      LFTest test, Class<? extends TestBase> testClass, TestLevel level) {
+    Injector injector =
+        new LFStandaloneSetup(new LFRuntimeModule()).createInjectorAndDoEMFRegistration();
+    TestBase runner;
+    try {
+      @SuppressWarnings("unchecked")
+      Constructor<? extends TestBase> constructor =
+          (Constructor<? extends TestBase>) testClass.getConstructors()[0];
+      runner = constructor.newInstance();
+    } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+      throw new IllegalStateException(e);
     }
+    injector.injectMembers(runner);
 
-    /**
-     * Run tests in the given selection for all targets enabled in this class.
-     *
-     * @param description A string that describes the collection of tests.
-     * @param selected A predicate that given a test category returns whether
-     * it should be included in this test run or not.
-     * @param configurator A procedure for configuring the tests.
-     * @param copy Whether or not to work on copies of tests in the test.
-     * registry.
-     */
-    protected void runTestsForTargets(String description,
-                                      Predicate<TestCategory> selected,
-                                      Configurator configurator,
-                                      TestLevel level,
-                                      boolean copy) {
-        for (Target target : this.targets) {
-            runTestsFor(List.of(target), description, selected,
-                        configurator, level, copy);
-        }
+    Set<LFTest> tests = Set.of(test);
+    try {
+      runner.validateAndRun(tests, t -> true, level);
+    } catch (IOException e) {
+      throw new RuntimeIOException(e);
     }
-
-    /**
-     * Run tests in the given selection for a subset of given targets.
-     *
-     * @param subset The subset of targets to run the selected tests for.
-     * @param description A string that describes the collection of tests.
-     * @param selected A predicate that given a test category returns whether
-     * it should be included in this test run or not.
-     * @param configurator A procedure for configuring the tests.
-     * @param copy Whether to work on copies of tests in the test.
-     * registry.
-     */
-    protected void runTestsFor(List<Target> subset,
-                               String description,
-                               Predicate<TestCategory> selected,
-                               Configurator configurator,
-                               TestLevel level,
-                               boolean copy) {
-        for (Target target : subset) {
-            printTestHeader(target, description);
-            runTestsAndPrintResults(target, selected, level, configurator, copy);
-        }
+    checkAndReportFailures(tests);
+  }
+
+  /**
+   * Print a header that describes a collection of tests.
+   *
+   * @param target The target for which the tests are being performed.
+   * @param description A string the describes the collection of tests.
+   */
+  protected static void printTestHeader(Target target, String description) {
+    System.out.print(TestBase.THICK_LINE);
+    System.out.println("Target: " + target);
+    if (description.startsWith("Description: ")) {
+      System.out.println(description);
+    } else {
+      System.out.println("Description: " + description);
     }
-
-    /**
-     * Whether to enable threading.
-     */
-    protected boolean supportsSingleThreadedExecution() {
-        return false;
+    System.out.println(TestBase.THICK_LINE);
+  }
+
+  /**
+   * Iterate over given tests and evaluate their outcome, report errors if there are any.
+   *
+   * @param tests The tests to inspect the results of.
+   */
+  private static void checkAndReportFailures(Set<LFTest> tests) {
+    var passed = tests.stream().filter(it -> it.hasPassed()).collect(Collectors.toList());
+    var s = new StringBuffer();
+    s.append(THIN_LINE);
+    s.append("Passing: " + passed.size() + "/" + tests.size() + "\n");
+    s.append(THIN_LINE);
+    passed.forEach(test -> s.append("Passed: ").append(test).append("\n"));
+    s.append(THIN_LINE);
+    System.out.print(s.toString());
+
+    for (var test : tests) {
+      test.reportErrors();
     }
-
-    /**
-     * Determine whether the current platform is Windows.
-     * @return true if the current platform is Windwos, false otherwise.
-     */
-    protected static boolean isWindows() {
-        String OS = System.getProperty("os.name").toLowerCase();
-        return OS.contains("win");
-    }
-
-     /**
-     * Determine whether the current platform is MacOS.
-     * @return true if the current platform is MacOS, false otherwise.
-     */
-    protected static boolean isMac() {
-        String OS = System.getProperty("os.name").toLowerCase();
-        return OS.contains("mac");
-    }
-
-    /**
-     * Determine whether the current platform is Linux.
-     * @return true if the current platform is Linux, false otherwise.
-     */
-    protected static boolean isLinux() {
-        String OS = System.getProperty("os.name").toLowerCase();
-        return OS.contains("linux");
+    for (LFTest lfTest : tests) {
+      assertTrue(lfTest.hasPassed());
     }
-
-    /**
-     * End output redirection.
-     */
-    private static void restoreOutputs() {
-        System.out.flush();
-        System.err.flush();
-        System.setOut(out);
-        System.setErr(err);
+  }
+
+  /**
+   * Configure a test by applying the given configurator and return a generator context. Also, if
+   * the given level is less than {@code TestLevel.BUILD}, add a {@code no-compile} flag to the
+   * generator context. If the configurator was not applied successfully, throw an AssertionError.
+   *
+   * @param test the test to configure.
+   * @param configurator The configurator to apply to the test.
+   * @param level The level of testing in which the generator context will be used.
+   */
+  private void configure(LFTest test, Configurator configurator, TestLevel level)
+      throws IOException, TestError {
+    var props = new Properties();
+    props.setProperty("hierarchical-bin", "true");
+    addExtraLfcArgs(props);
+
+    var sysProps = System.getProperties();
+    // Set the external-runtime-path property if it was specified.
+    if (sysProps.containsKey("runtime")) {
+      var rt = sysProps.get("runtime").toString();
+      if (!rt.isEmpty()) {
+        props.setProperty(BuildParm.EXTERNAL_RUNTIME_PATH.getKey(), rt);
+        System.out.println("Using runtime: " + sysProps.get("runtime").toString());
+      }
+    } else {
+      System.out.println("Using default runtime.");
     }
 
-    /**
-     * Redirect outputs to the given tests for recording.
-     *
-     * @param test The test to redirect outputs to.
-     */
-    private static void redirectOutputs(LFTest test) {
-        System.setOut(new PrintStream(test.getOutputStream()));
-        System.setErr(new PrintStream(test.getOutputStream()));
+    var r =
+        resourceSetProvider
+            .get()
+            .getResource(URI.createFileURI(test.getSrcPath().toFile().getAbsolutePath()), true);
+
+    if (r.getErrors().size() > 0) {
+      String message =
+          r.getErrors().stream()
+              .map(Diagnostic::toString)
+              .collect(Collectors.joining(System.lineSeparator()));
+      throw new TestError(message, Result.PARSE_FAIL);
     }
 
-
-    /**
-     * Run a test, print results on stderr.
-     *
-     * @param test      Test case.
-     * @param testClass The test class that will execute the test. This is target-specific,
-     *                  it may provide some target-specific configuration. We pass a class
-     *                  and not a new instance because this method needs to ensure the object
-     *                  is properly injected, and so, it needs to control its entire lifecycle.
-     * @param level     Level to which to run the test.
-     */
-    public static void runSingleTestAndPrintResults(LFTest test, Class<? extends TestBase> testClass, TestLevel level) {
-        Injector injector = new LFStandaloneSetup(new LFRuntimeModule()).createInjectorAndDoEMFRegistration();
-        TestBase runner;
-        try {
-            @SuppressWarnings("unchecked")
-            Constructor<? extends TestBase> constructor = (Constructor<? extends TestBase>) testClass.getConstructors()[0];
-            runner = constructor.newInstance();
-        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
-            throw new IllegalStateException(e);
-        }
-        injector.injectMembers(runner);
-
-        Set<LFTest> tests = Set.of(test);
-        try {
-            runner.validateAndRun(tests, t -> true, level);
-        } catch (IOException e) {
-            throw new RuntimeIOException(e);
-        }
-        checkAndReportFailures(tests);
+    fileAccess.setOutputPath(
+        FileConfig.findPackageRoot(test.getSrcPath(), s -> {})
+            .resolve(FileConfig.DEFAULT_SRC_GEN_DIR)
+            .toString());
+    var context =
+        new MainContext(
+            LFGeneratorContext.Mode.STANDALONE,
+            CancelIndicator.NullImpl,
+            (m, p) -> {},
+            props,
+            r,
+            fileAccess,
+            fileConfig -> new DefaultErrorReporter());
+
+    test.configure(context);
+
+    // Set the no-compile flag the test is not supposed to reach the build stage.
+    if (level.compareTo(TestLevel.BUILD) < 0) {
+      context.getArgs().setProperty("no-compile", "");
     }
 
-    /**
-     * Print a header that describes a collection of tests.
-     * @param target The target for which the tests are being performed.
-     * @param description A string the describes the collection of tests.
-     */
-    protected static void printTestHeader(Target target, String description) {
-        System.out.print(TestBase.THICK_LINE);
-        System.out.println("Target: " + target);
-        if (description.startsWith("Description: ")) {
-            System.out.println(description);
-        } else {
-            System.out.println("Description: " + description);
-        }
-        System.out.println(TestBase.THICK_LINE);
+    // Reload in case target properties have changed.
+    context.loadTargetConfig();
+    // Update the test by applying the configuration. E.g., to carry out an AST transformation.
+    if (configurator != null) {
+      if (!configurator.configure(test)) {
+        throw new TestError("Test configuration unsuccessful.", Result.CONFIG_FAIL);
+      }
     }
-
-    /**
-     * Iterate over given tests and evaluate their outcome, report errors if
-     * there are any.
-     *
-     * @param tests The tests to inspect the results of.
-     */
-    private static void checkAndReportFailures(Set<LFTest> tests) {
-        var passed = tests.stream().filter(it -> it.hasPassed()).collect(Collectors.toList());
-        var s = new StringBuffer();
-        s.append(THIN_LINE);
-        s.append("Passing: " + passed.size() + "/" + tests.size() + "\n");
-        s.append(THIN_LINE);
-        passed.forEach(test -> s.append("Passed: ").append(test).append("\n"));
-        s.append(THIN_LINE);
-        System.out.print(s.toString());
-
-        for (var test : tests) {
-            test.reportErrors();
-        }
-        for (LFTest lfTest : tests) {
-            assertTrue(lfTest.hasPassed());
+  }
+
+  /** Validate the given test. Throw an TestError if validation failed. */
+  private void validate(LFTest test) throws TestError {
+    // Validate the resource and store issues in the test object.
+    try {
+      var context = test.getContext();
+      var issues =
+          validator.validate(
+              context.getFileConfig().resource, CheckMode.ALL, context.getCancelIndicator());
+      if (issues != null && !issues.isEmpty()) {
+        if (issues.stream().anyMatch(it -> it.getSeverity() == Severity.ERROR)) {
+          String message =
+              issues.stream()
+                  .map(Objects::toString)
+                  .collect(Collectors.joining(System.lineSeparator()));
+          throw new TestError(message, Result.VALIDATE_FAIL);
         }
+      }
+    } catch (TestError e) {
+      throw e;
+    } catch (Throwable e) {
+      throw new TestError("Exception during validation.", Result.VALIDATE_FAIL, e);
     }
-
-    /**
-     * Configure a test by applying the given configurator and return a
-     * generator context. Also, if the given level is less than
-     * {@code TestLevel.BUILD}, add a {@code no-compile} flag to the generator context. If
-     * the configurator was not applied successfully, throw an AssertionError.
-     *
-     * @param test the test to configure.
-     * @param configurator The configurator to apply to the test.
-     * @param level The level of testing in which the generator context will be
-     * used.
-     */
-    private void configure(LFTest test, Configurator configurator, TestLevel level) throws IOException, TestError {
-        var props = new Properties();
-        props.setProperty("hierarchical-bin", "true");
-        addExtraLfcArgs(props);
-
-        var sysProps = System.getProperties();
-        // Set the external-runtime-path property if it was specified.
-        if (sysProps.containsKey("runtime")) {
-            var rt = sysProps.get("runtime").toString();
-            if (!rt.isEmpty()) {
-                props.setProperty(BuildParm.EXTERNAL_RUNTIME_PATH.getKey(), rt);
-                System.out.println("Using runtime: " + sysProps.get("runtime").toString());
-            }
-        } else {
-            System.out.println("Using default runtime.");
-        }
-
-        var r = resourceSetProvider.get().getResource(
-            URI.createFileURI(test.getSrcPath().toFile().getAbsolutePath()),
-            true);
-
-        if (r.getErrors().size() > 0) {
-            String message = r.getErrors().stream().map(Diagnostic::toString).collect(Collectors.joining(System.lineSeparator()));
-            throw new TestError(message, Result.PARSE_FAIL);
-        }
-
-        fileAccess.setOutputPath(FileConfig.findPackageRoot(test.getSrcPath(), s -> {}).resolve(FileConfig.DEFAULT_SRC_GEN_DIR).toString());
-        var context = new MainContext(
-            LFGeneratorContext.Mode.STANDALONE, CancelIndicator.NullImpl, (m, p) -> {}, props, r, fileAccess,
-            fileConfig -> new DefaultErrorReporter()
-        );
-
-        test.configure(context);
-
-        // Set the no-compile flag the test is not supposed to reach the build stage.
-        if (level.compareTo(TestLevel.BUILD) < 0) {
-            context.getArgs().setProperty("no-compile", "");
-        }
-        
-        // Reload in case target properties have changed.
-        context.loadTargetConfig();
-        // Update the test by applying the configuration. E.g., to carry out an AST transformation.
-        if (configurator != null) {
-            if (!configurator.configure(test)) {
-                throw new TestError("Test configuration unsuccessful.", Result.CONFIG_FAIL);
-            }
-        }
+  }
+
+  /** Override to add some LFC arguments to all runs of this test class. */
+  protected void addExtraLfcArgs(Properties args) {
+    args.setProperty("build-type", "Test");
+    args.setProperty("logging", "Debug");
+  }
+
+  /**
+   * Invoke the code generator for the given test.
+   *
+   * @param test The test to generate code for.
+   */
+  private GeneratorResult generateCode(LFTest test) throws TestError {
+    if (test.getFileConfig().resource == null) {
+      return GeneratorResult.NOTHING;
     }
-
-    /**
-     * Validate the given test. Throw an TestError if validation failed.
-     */
-    private void validate(LFTest test) throws TestError {
-        // Validate the resource and store issues in the test object.
-        try {
-            var context = test.getContext();
-            var issues = validator.validate(context.getFileConfig().resource,
-                                            CheckMode.ALL, context.getCancelIndicator());
-            if (issues != null && !issues.isEmpty()) {
-                if (issues.stream().anyMatch(it -> it.getSeverity() == Severity.ERROR)) {
-                    String message = issues.stream().map(Objects::toString).collect(Collectors.joining(System.lineSeparator()));
-                    throw new TestError(message, Result.VALIDATE_FAIL);
-                }
-            }
-        } catch (TestError e) {
-            throw e;
-        } catch (Throwable e) {
-            throw new TestError("Exception during validation.", Result.VALIDATE_FAIL, e);
-        }
+    try {
+      generator.doGenerate(test.getFileConfig().resource, fileAccess, test.getContext());
+    } catch (Throwable e) {
+      throw new TestError("Code generation unsuccessful.", Result.CODE_GEN_FAIL, e);
     }
-
-
-    /**
-     * Override to add some LFC arguments to all runs of this test class.
-     */
-    protected void addExtraLfcArgs(Properties args) {
-        args.setProperty("build-type", "Test");
-        args.setProperty("logging", "Debug");
+    if (generator.errorsOccurred()) {
+      throw new TestError("Code generation unsuccessful.", Result.CODE_GEN_FAIL);
     }
 
-    /**
-     * Invoke the code generator for the given test.
-     *
-     * @param test The test to generate code for.
-     */
-    private GeneratorResult generateCode(LFTest test) throws TestError {
-        if (test.getFileConfig().resource == null) {
-            return GeneratorResult.NOTHING;
-        }
-        try {
-            generator.doGenerate(test.getFileConfig().resource, fileAccess, test.getContext());
-        } catch (Throwable e) {
-            throw new TestError("Code generation unsuccessful.", Result.CODE_GEN_FAIL, e);
-        }
-        if (generator.errorsOccurred()) {
-            throw new TestError("Code generation unsuccessful.", Result.CODE_GEN_FAIL);
+    return test.getContext().getResult();
+  }
+
+  /**
+   * Given an indexed test, execute it and label the test as failing if it did not execute, took too
+   * long to execute, or executed but exited with an error code.
+   */
+  private void execute(LFTest test) throws TestError {
+    final var pb = getExecCommand(test);
+    try {
+      var p = pb.start();
+      var stdout = test.recordStdOut(p);
+      var stderr = test.recordStdErr(p);
+
+      var stdoutException = new AtomicReference<Throwable>(null);
+      var stderrException = new AtomicReference<Throwable>(null);
+
+      stdout.setUncaughtExceptionHandler((thread, throwable) -> stdoutException.set(throwable));
+      stderr.setUncaughtExceptionHandler((thread, throwable) -> stderrException.set(throwable));
+
+      stderr.start();
+      stdout.start();
+
+      if (!p.waitFor(MAX_EXECUTION_TIME_SECONDS, TimeUnit.SECONDS)) {
+        stdout.interrupt();
+        stderr.interrupt();
+        p.destroyForcibly();
+        throw new TestError(Result.TEST_TIMEOUT);
+      } else {
+        if (stdoutException.get() != null || stderrException.get() != null) {
+          StringBuffer sb = new StringBuffer();
+          if (stdoutException.get() != null) {
+            sb.append("Error during stdout handling:" + System.lineSeparator());
+            sb.append(stackTraceToString(stdoutException.get()));
+          }
+          if (stderrException.get() != null) {
+            sb.append("Error during stderr handling:" + System.lineSeparator());
+            sb.append(stackTraceToString(stderrException.get()));
+          }
+          throw new TestError(sb.toString(), Result.TEST_EXCEPTION);
         }
-
-        return test.getContext().getResult();
-    }
-
-
-    /**
-     * Given an indexed test, execute it and label the test as failing if it
-     * did not execute, took too long to execute, or executed but exited with
-     * an error code.
-     */
-    private void execute(LFTest test) throws TestError {
-        final var pb = getExecCommand(test);
-        try {
-            var p = pb.start();
-            var stdout = test.recordStdOut(p);
-            var stderr = test.recordStdErr(p);
-
-            var stdoutException = new AtomicReference<Throwable>(null);
-            var stderrException = new AtomicReference<Throwable>(null);
-
-            stdout.setUncaughtExceptionHandler((thread, throwable) -> stdoutException.set(throwable));
-            stderr.setUncaughtExceptionHandler((thread, throwable) -> stderrException.set(throwable));
-
-            stderr.start();
-            stdout.start();
-
-            if (!p.waitFor(MAX_EXECUTION_TIME_SECONDS, TimeUnit.SECONDS)) {
-                stdout.interrupt();
-                stderr.interrupt();
-                p.destroyForcibly();
-                throw new TestError(Result.TEST_TIMEOUT);
-            } else {
-                if (stdoutException.get() != null || stderrException.get() != null) {
-                    StringBuffer sb = new StringBuffer();
-                    if (stdoutException.get() != null) {
-                        sb.append("Error during stdout handling:" + System.lineSeparator());
-                        sb.append(stackTraceToString(stdoutException.get()));
-                    }
-                    if (stderrException.get() != null) {
-                        sb.append("Error during stderr handling:" + System.lineSeparator());
-                        sb.append(stackTraceToString(stderrException.get()));
-                    }
-                    throw new TestError(sb.toString(), Result.TEST_EXCEPTION);
-                }
-                if (p.exitValue() != 0) {
-                    String message = "Exit code: " + p.exitValue();
-                    if (p.exitValue() == 139) {
-                        // The java ProcessBuilder and Process interface does not allow us to reliably retrieve stderr and stdout
-                        // from a process that segfaults. We can only print a message indicating that the putput is incomplete.
-                        message += System.lineSeparator() +
-                            "This exit code typically indicates a segfault. In this case, the execution output is likely missing or incomplete.";
-                    }
-                    throw new TestError(message, Result.TEST_FAIL);
-                }
-            }
-        } catch (TestError e) {
-            throw e;
-        } catch (Throwable e) {
-            e.printStackTrace();
-            throw new TestError("Exception during test execution.", Result.TEST_EXCEPTION, e);
+        if (p.exitValue() != 0) {
+          String message = "Exit code: " + p.exitValue();
+          if (p.exitValue() == 139) {
+            // The java ProcessBuilder and Process interface does not allow us to reliably retrieve
+            // stderr and stdout
+            // from a process that segfaults. We can only print a message indicating that the putput
+            // is incomplete.
+            message +=
+                System.lineSeparator()
+                    + "This exit code typically indicates a segfault. In this case, the execution"
+                    + " output is likely missing or incomplete.";
+          }
+          throw new TestError(message, Result.TEST_FAIL);
         }
+      }
+    } catch (TestError e) {
+      throw e;
+    } catch (Throwable e) {
+      e.printStackTrace();
+      throw new TestError("Exception during test execution.", Result.TEST_EXCEPTION, e);
     }
-
-    static public String stackTraceToString(Throwable t) {
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = new PrintWriter(sw);
-        t.printStackTrace(pw);
-        pw.flush();
-        pw.close();
-        return sw.toString();
-    }
-
-    /** Bash script that is used to execute docker tests. */
-    static private String DOCKER_RUN_SCRIPT = """
+  }
+
+  public static String stackTraceToString(Throwable t) {
+    StringWriter sw = new StringWriter();
+    PrintWriter pw = new PrintWriter(sw);
+    t.printStackTrace(pw);
+    pw.flush();
+    pw.close();
+    return sw.toString();
+  }
+
+  /** Bash script that is used to execute docker tests. */
+  private static String DOCKER_RUN_SCRIPT =
+      """
             #!/bin/bash
 
             # exit when any command fails
             set -e
-            
+
             docker compose -f "$1" rm -f
             docker compose -f "$1" up --build | tee docker_log.txt
             docker compose -f "$1" down --rmi local
@@ -583,129 +593,128 @@ static public String stackTraceToString(Throwable t) {
             exit 0
             """;
 
-    /**
-     * Path to a bash script containing DOCKER_RUN_SCRIPT.
-     */
-    private static Path dockerRunScript = null;
-
-    /**
-     * Return the path to a bash script containing DOCKER_RUN_SCRIPT.
-     *
-     * If the script does not yet exist, it is created.
-     */
-    private Path getDockerRunScript() throws TestError {
-        if (dockerRunScript != null) {
-            return dockerRunScript;
-        }
-
-        try {
-            var file = File.createTempFile("run_docker_test", "sh");
-            file.deleteOnExit();
-            file.setExecutable(true);
-            var path = file.toPath();
-            try (BufferedWriter writer = Files.newBufferedWriter(path)) {
-                writer.write(DOCKER_RUN_SCRIPT);
-            }
-            dockerRunScript = path;
-        } catch (IOException e) {
-            throw new TestError("IO Error during test preparation.", Result.TEST_EXCEPTION, e);
-        }
-
-        return dockerRunScript;
+  /** Path to a bash script containing DOCKER_RUN_SCRIPT. */
+  private static Path dockerRunScript = null;
+
+  /**
+   * Return the path to a bash script containing DOCKER_RUN_SCRIPT.
+   *
+   * <p>If the script does not yet exist, it is created.
+   */
+  private Path getDockerRunScript() throws TestError {
+    if (dockerRunScript != null) {
+      return dockerRunScript;
     }
 
-    /**
-     * Throws TestError if docker does not exist. Does nothing otherwise.
-     */
-    private void checkDockerExists() throws TestError {
-        if (LFCommand.get("docker", List.of()) == null) {
-            throw new TestError("Executable 'docker' not found" , Result.NO_EXEC_FAIL);
-        }
-        if (LFCommand.get("docker-compose", List.of()) == null) {
-            throw new TestError("Executable 'docker-compose' not found" , Result.NO_EXEC_FAIL);
-        }
+    try {
+      var file = File.createTempFile("run_docker_test", "sh");
+      file.deleteOnExit();
+      file.setExecutable(true);
+      var path = file.toPath();
+      try (BufferedWriter writer = Files.newBufferedWriter(path)) {
+        writer.write(DOCKER_RUN_SCRIPT);
+      }
+      dockerRunScript = path;
+    } catch (IOException e) {
+      throw new TestError("IO Error during test preparation.", Result.TEST_EXCEPTION, e);
     }
 
-    /**
-     * Return a ProcessBuilder used to test the docker execution.
-     * @param test The test to get the execution command for.
-     */
-    private ProcessBuilder getDockerExecCommand(LFTest test) throws TestError {
-        checkDockerExists();
-        var srcGenPath = test.getFileConfig().getSrcGenPath();
-        var dockerComposeFile = FileUtil.globFilesEndsWith(srcGenPath, "docker-compose.yml").get(0);
-        return new ProcessBuilder(getDockerRunScript().toString(), dockerComposeFile.toString());
-    }
+    return dockerRunScript;
+  }
 
-    /**
-     * Return a preconfigured ProcessBuilder for executing the test program.
-     * @param test The test to get the execution command for.
-     */
-    private ProcessBuilder getExecCommand(LFTest test) throws TestError {
-
-        var srcBasePath = test.getFileConfig().srcPkgPath.resolve("src");
-        var relativePathName = srcBasePath.relativize(test.getFileConfig().srcPath).toString();
-
-        // special case to test docker file generation
-        if (relativePathName.equalsIgnoreCase(TestCategory.DOCKER.getPath()) ||
-            relativePathName.equalsIgnoreCase(TestCategory.DOCKER_FEDERATED.getPath())) {
-            return getDockerExecCommand(test);
-        } else {
-            LFCommand command = test.getFileConfig().getCommand();
-            if (command == null) {
-                throw new TestError("File: " + test.getFileConfig().getExecutable(), Result.NO_EXEC_FAIL);
-            }
-            return new ProcessBuilder(command.command()).directory(command.directory());
-        }
+  /** Throws TestError if docker does not exist. Does nothing otherwise. */
+  private void checkDockerExists() throws TestError {
+    if (LFCommand.get("docker", List.of()) == null) {
+      throw new TestError("Executable 'docker' not found", Result.NO_EXEC_FAIL);
     }
-
-    /**
-     * Validate and run the given tests, using the specified configuratator and level.
-     *
-     * While performing tests, this method prints a header that reaches completion
-     * once all tests have been run.
-     *
-     * @param tests A set of tests to run.
-     * @param configurator A procedure for configuring the tests.
-     * @param level The level of testing.
-     * @throws IOException If initial file configuration fails
-     */
-    private void validateAndRun(Set<LFTest> tests, Configurator configurator, TestLevel level) throws IOException {
-        final var x = 78f / tests.size();
-        var marks = 0;
-        var done = 0;
-
-        for (var test : tests) {
-            try {
-                redirectOutputs(test);
-                configure(test, configurator, level);
-                validate(test);
-                if (level.compareTo(TestLevel.CODE_GEN) >= 0) {
-                    generateCode(test);
-                }
-                if (level == TestLevel.EXECUTION) {
-                    execute(test);
-                }
-                test.markPassed();
-            } catch (TestError e) {
-                test.handleTestError(e);
-            } catch (Throwable e) {
-                test.handleTestError(new TestError(
-                    "Unknown exception during test execution", Result.TEST_EXCEPTION, e));
-            } finally {
-                restoreOutputs();
-            }
-            done++;
-            while (Math.floor(done * x) >= marks && marks < 78) {
-                System.out.print("=");
-                marks++;
-            }
+    if (LFCommand.get("docker-compose", List.of()) == null) {
+      throw new TestError("Executable 'docker-compose' not found", Result.NO_EXEC_FAIL);
+    }
+  }
+
+  /**
+   * Return a ProcessBuilder used to test the docker execution.
+   *
+   * @param test The test to get the execution command for.
+   */
+  private ProcessBuilder getDockerExecCommand(LFTest test) throws TestError {
+    checkDockerExists();
+    var srcGenPath = test.getFileConfig().getSrcGenPath();
+    var dockerComposeFile = FileUtil.globFilesEndsWith(srcGenPath, "docker-compose.yml").get(0);
+    return new ProcessBuilder(getDockerRunScript().toString(), dockerComposeFile.toString());
+  }
+
+  /**
+   * Return a preconfigured ProcessBuilder for executing the test program.
+   *
+   * @param test The test to get the execution command for.
+   */
+  private ProcessBuilder getExecCommand(LFTest test) throws TestError {
+
+    var srcBasePath = test.getFileConfig().srcPkgPath.resolve("src");
+    var relativePathName = srcBasePath.relativize(test.getFileConfig().srcPath).toString();
+
+    // special case to test docker file generation
+    if (relativePathName.equalsIgnoreCase(TestCategory.DOCKER.getPath())
+        || relativePathName.equalsIgnoreCase(TestCategory.DOCKER_FEDERATED.getPath())) {
+      return getDockerExecCommand(test);
+    } else {
+      LFCommand command = test.getFileConfig().getCommand();
+      if (command == null) {
+        throw new TestError("File: " + test.getFileConfig().getExecutable(), Result.NO_EXEC_FAIL);
+      }
+      return new ProcessBuilder(command.command()).directory(command.directory());
+    }
+  }
+
+  /**
+   * Validate and run the given tests, using the specified configuratator and level.
+   *
+   * <p>While performing tests, this method prints a header that reaches completion once all tests
+   * have been run.
+   *
+   * @param tests A set of tests to run.
+   * @param configurator A procedure for configuring the tests.
+   * @param level The level of testing.
+   * @throws IOException If initial file configuration fails
+   */
+  private void validateAndRun(Set<LFTest> tests, Configurator configurator, TestLevel level)
+      throws IOException {
+    final var x = 78f / tests.size();
+    var marks = 0;
+    var done = 0;
+
+    for (var test : tests) {
+      try {
+        redirectOutputs(test);
+        configure(test, configurator, level);
+        validate(test);
+        if (level.compareTo(TestLevel.CODE_GEN) >= 0) {
+          generateCode(test);
         }
-        while (marks < 78) {
-            System.out.print("=");
-            marks++;
+        if (level == TestLevel.EXECUTION) {
+          execute(test);
         }
-
-        System.out.print(System.lineSeparator());
+        test.markPassed();
+      } catch (TestError e) {
+        test.handleTestError(e);
+      } catch (Throwable e) {
+        test.handleTestError(
+            new TestError("Unknown exception during test execution", Result.TEST_EXCEPTION, e));
+      } finally {
+        restoreOutputs();
+      }
+      done++;
+      while (Math.floor(done * x) >= marks && marks < 78) {
+        System.out.print("=");
+        marks++;
+      }
     }
+    while (marks < 78) {
+      System.out.print("=");
+      marks++;
+    }
+
+    System.out.print(System.lineSeparator());
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/TestError.java b/org.lflang.tests/src/org/lflang/tests/TestError.java
index 0c261c6865..efb7d50048 100644
--- a/org.lflang.tests/src/org/lflang/tests/TestError.java
+++ b/org.lflang.tests/src/org/lflang/tests/TestError.java
@@ -5,24 +5,28 @@
 /// Indicates an error during test execution
 public class TestError extends Exception {
 
-    private Throwable exception;
-    private Result result;
-
-    public TestError(String errorMessage, Result result, Throwable exception) {
-        super(errorMessage);
-        this.exception = exception;
-        this.result = result;
-    }
-
-    public TestError(String errorMessage, Result result) {
-        this(errorMessage, result, null);
-    }
-
-    public TestError(Result result) {
-        this(null, result, null);
-    }
-
-    public Result getResult() {return result;}
-
-    public Throwable getException() {return exception;}
+  private Throwable exception;
+  private Result result;
+
+  public TestError(String errorMessage, Result result, Throwable exception) {
+    super(errorMessage);
+    this.exception = exception;
+    this.result = result;
+  }
+
+  public TestError(String errorMessage, Result result) {
+    this(errorMessage, result, null);
+  }
+
+  public TestError(Result result) {
+    this(null, result, null);
+  }
+
+  public Result getResult() {
+    return result;
+  }
+
+  public Throwable getException() {
+    return exception;
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/TestRegistry.java b/org.lflang.tests/src/org/lflang/tests/TestRegistry.java
index 1249ea25be..2c59740e0a 100644
--- a/org.lflang.tests/src/org/lflang/tests/TestRegistry.java
+++ b/org.lflang.tests/src/org/lflang/tests/TestRegistry.java
@@ -18,12 +18,10 @@
 import java.util.Set;
 import java.util.Stack;
 import java.util.TreeSet;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-
 import org.lflang.LFResourceProvider;
 import org.lflang.LFStandaloneSetup;
 import org.lflang.Target;
@@ -37,378 +35,349 @@
  */
 public class TestRegistry {
 
-    static class TestMap {
-        /**
-         * Registry that maps targets to maps from categories to sets of tests.
-         */
-        protected final Map<Target,
-                Map<TestCategory, Set<LFTest>>> map = new HashMap<>();
-
-        /**
-         * Create a new test map.
-         */
-        public TestMap() {
-            // Populate the internal datastructures.
-            for (Target target : Target.values()) {
-                Map<TestCategory, Set<LFTest>> categories = new HashMap<>();
-                for (TestCategory cat : TestCategory.values()) {
-                    categories.put(cat, new TreeSet<>());
-                }
-                map.put(target, categories);
-            }
-        }
-
-        /**
-         * Return a set of tests given a target and test category.
-         * @param t The target.
-         * @param c The test category.
-         * @return A set of tests for the given target and test category.
-         */
-        public Set<LFTest> getTests(Target t, TestCategory c) {
-            return this.map.get(t).get(c);
+  static class TestMap {
+    /** Registry that maps targets to maps from categories to sets of tests. */
+    protected final Map<Target, Map<TestCategory, Set<LFTest>>> map = new HashMap<>();
+
+    /** Create a new test map. */
+    public TestMap() {
+      // Populate the internal datastructures.
+      for (Target target : Target.values()) {
+        Map<TestCategory, Set<LFTest>> categories = new HashMap<>();
+        for (TestCategory cat : TestCategory.values()) {
+          categories.put(cat, new TreeSet<>());
         }
+        map.put(target, categories);
+      }
     }
 
     /**
-     * List of directories that should be skipped when indexing test files. Any
-     * test file that has a directory in its path that matches an entry in this
-     * array will not be discovered.
-     */
-    public static final String[] IGNORED_DIRECTORIES = {"failing", "knownfailed", "failed", "fed-gen"};
-
-    /**
-     * Path to the root of the repository.
-     */
-    public static final Path LF_REPO_PATH = Paths.get("").toAbsolutePath();
-
-    /**
-     * Path to the test directory in the repository.
+     * Return a set of tests given a target and test category.
+     *
+     * @param t The target.
+     * @param c The test category.
+     * @return A set of tests for the given target and test category.
      */
-    public static final Path LF_TEST_PATH = LF_REPO_PATH.resolve("test");
+    public Set<LFTest> getTests(Target t, TestCategory c) {
+      return this.map.get(t).get(c);
+    }
+  }
+
+  /**
+   * List of directories that should be skipped when indexing test files. Any test file that has a
+   * directory in its path that matches an entry in this array will not be discovered.
+   */
+  public static final String[] IGNORED_DIRECTORIES = {
+    "failing", "knownfailed", "failed", "fed-gen"
+  };
+
+  /** Path to the root of the repository. */
+  public static final Path LF_REPO_PATH = Paths.get("").toAbsolutePath();
+
+  /** Path to the test directory in the repository. */
+  public static final Path LF_TEST_PATH = LF_REPO_PATH.resolve("test");
+
+  /** Internal data structure that stores registered tests. */
+  protected static final TestMap registered = new TestMap();
+
+  /**
+   * Internal data structure that stores ignored tests. For instance, source files with no main
+   * reactor are indexed here.
+   */
+  protected static final TestMap ignored = new TestMap();
+
+  /**
+   * A map from each test category to a set of tests that is the union of all registered tests in
+   * that category across all targets.
+   */
+  protected static final Map<TestCategory, Set<LFTest>> allTargets = new HashMap<>();
+
+  /**
+   * Enumeration of test categories, used to map tests to categories. The nearest containing
+   * directory that matches any of the categories will determine the category that the test is
+   * mapped to. Matching is case insensitive.
+   *
+   * <p>For example, the following files will all map to THREADED:
+   *
+   * <ul>
+   *   <li>C/threaded/Foo.lf
+   *   <li>C/THREADED/Foo.lf
+   *   <li>C/Threaded/Foo.lf
+   *   <li>C/foo/threaded/Bar.lf
+   *   <li>C/foo/bar/threaded/Threaded.lf
+   *   <li>C/federated/threaded/bar.lf but the following will not:
+   *   <li>C/Foo.lf (maps to COMMON)
+   *   <li>C/Threaded.lf (maps to COMMON)
+   *   <li>C/threaded/federated/foo.lf (maps to FEDERATED)
+   * </ul>
+   *
+   * @author Marten Lohstroh
+   */
+  public enum TestCategory {
+    /** Tests about concurrent execution. */
+    CONCURRENT(true),
+    /** Test about enclaves */
+    ENCLAVE(false),
+    /** Generic tests, ie, tests that all targets are supposed to implement. */
+    GENERIC(true),
+    /** Tests about generics, not to confuse with {@link #GENERIC}. */
+    GENERICS(true),
+    /** Tests about multiports and banks of reactors. */
+    MULTIPORT(true),
+    /** Tests about federated execution. */
+    FEDERATED(true),
+    /** Tests about specific target properties. */
+    PROPERTIES(true),
+    /** Tests concerning modal reactors */
+    MODAL_MODELS(true),
+    NO_INLINING(false),
+    // non-shared tests
+    DOCKER(true),
+    DOCKER_FEDERATED(true, "docker" + File.separator + "federated"),
+    SERIALIZATION(false),
+    ARDUINO(false, TestLevel.BUILD),
+    ZEPHYR(false, TestLevel.BUILD),
+    TARGET(false);
+
+    /** Whether we should compare coverage against other targets. */
+    public final boolean isCommon;
+
+    public final String path;
+    public final TestLevel level;
+
+    /** Create a new test category. */
+    TestCategory(boolean isCommon) {
+      this.isCommon = isCommon;
+      this.path = this.name().toLowerCase();
+      this.level = TestLevel.EXECUTION;
+    }
 
-    /**
-     * Internal data structure that stores registered tests.
-     */
-    protected static final TestMap registered = new TestMap();
+    /** Create a new test category. */
+    TestCategory(boolean isCommon, TestLevel level) {
+      this.isCommon = isCommon;
+      this.path = this.name().toLowerCase();
+      this.level = level;
+    }
 
-    /**
-     * Internal data structure that stores ignored tests. For instance,
-     * source files with no main reactor are indexed here.
-     */
-    protected static final TestMap ignored = new TestMap();
+    /** Create a new test category. */
+    TestCategory(boolean isCommon, String path) {
+      this.isCommon = isCommon;
+      this.path = path;
+      this.level = TestLevel.EXECUTION;
+    }
 
-    /**
-     * A map from each test category to a set of tests that is the union of
-     * all registered tests in that category across all targets.
-     */
-    protected static final Map<TestCategory, Set<LFTest>> allTargets = new HashMap<>();
+    public String getPath() {
+      return path;
+    }
 
     /**
-     * Enumeration of test categories, used to map tests to categories. The
-     * nearest containing directory that matches any of the categories will
-     * determine the category that the test is mapped to. Matching is case
-     * insensitive.
-     *
-     * For example, the following files will all map to THREADED:
-     * <ul>
-     * <li>C/threaded/Foo.lf</li>
-     * <li>C/THREADED/Foo.lf</li>
-     * <li>C/Threaded/Foo.lf</li>
-     * <li>C/foo/threaded/Bar.lf</li>
-     * <li>C/foo/bar/threaded/Threaded.lf</li>
-     * <li>C/federated/threaded/bar.lf
-     * but the following will not:</li>
-     * <li>C/Foo.lf (maps to COMMON)</li>
-     * <li>C/Threaded.lf (maps to COMMON)</li>
-     * <li>C/threaded/federated/foo.lf (maps to FEDERATED)</li>
-     * </ul>
+     * Return a header associated with the category.
      *
-     * @author Marten Lohstroh
+     * @return A header to print in the test report.
      */
-    public enum TestCategory {
-        /** Tests about concurrent execution. */
-        CONCURRENT(true),
-        /** Test about enclaves */
-        ENCLAVE(false),
-        /** Generic tests, ie, tests that all targets are supposed to implement. */
-        GENERIC(true),
-        /** Tests about generics, not to confuse with {@link #GENERIC}. */
-        GENERICS(true),
-        /** Tests about multiports and banks of reactors. */
-        MULTIPORT(true),
-        /** Tests about federated execution. */
-        FEDERATED(true),
-        /** Tests about specific target properties. */
-        PROPERTIES(true),
-        /** Tests concerning modal reactors */
-        MODAL_MODELS(true),
-        NO_INLINING(false),
-        // non-shared tests
-        DOCKER(true),
-        DOCKER_FEDERATED(true, "docker" + File.separator + "federated"),
-        SERIALIZATION(false),
-        ARDUINO(false, TestLevel.BUILD),
-        ZEPHYR(false, TestLevel.BUILD),
-        TARGET(false);
-
-        /**
-         * Whether we should compare coverage against other targets.
-         */
-        public final boolean isCommon;
-        public final String path;
-        public final TestLevel level ;
-
-        /**
-         * Create a new test category.
-         */
-        TestCategory(boolean isCommon) {
-            this.isCommon = isCommon;
-            this.path = this.name().toLowerCase();
-            this.level = TestLevel.EXECUTION;
-        }
-
-        /**
-         * Create a new test category.
-         */
-        TestCategory(boolean isCommon, TestLevel level) {
-            this.isCommon = isCommon;
-            this.path = this.name().toLowerCase();
-            this.level = level;
-        }
-
-        /**
-         * Create a new test category.
-         */
-        TestCategory(boolean isCommon, String path) {
-            this.isCommon = isCommon;
-            this.path = path;
-            this.level = TestLevel.EXECUTION;
-        }
-
-        public String getPath() {
-            return path;
-        }
-
-        /**
-         * Return a header associated with the category.
-         *
-         * @return A header to print in the test report.
-         */
-        public String getHeader() {
-            return TestBase.THICK_LINE + "Category: " + this.name();
-        }
+    public String getHeader() {
+      return TestBase.THICK_LINE + "Category: " + this.name();
     }
-
-    // Static code that performs the file system traversal and discovers
-    // all .lf files to be included in the registry.
-    static {
-        System.out.println("Indexing...");
-        ResourceSet rs = new LFStandaloneSetup()
+  }
+
+  // Static code that performs the file system traversal and discovers
+  // all .lf files to be included in the registry.
+  static {
+    System.out.println("Indexing...");
+    ResourceSet rs =
+        new LFStandaloneSetup()
             .createInjectorAndDoEMFRegistration()
-            .getInstance(LFResourceProvider.class).getResourceSet();
+            .getInstance(LFResourceProvider.class)
+            .getResourceSet();
 
-        // Prepare for the collection of tests per category.
-        for (TestCategory t: TestCategory.values()) {
-            allTargets.put(t, new TreeSet<>());
-        }
-        // Populate the registry.
-        for (Target target : Target.values()) {
-
-            // Walk the tree.
-            try {
-                Path dir = LF_TEST_PATH.resolve(target.getDirectoryName()).resolve("src");
-                if (Files.exists(dir)) {
-                    new TestDirVisitor(rs, target, dir).walk();
-                } else {
-                    System.out.println("WARNING: No test directory for target " + target + "\n");
-                }
-
-            } catch (IOException e) {
-                System.err.println(
-                        "ERROR: Caught exception while indexing tests for target " + target);
-                e.printStackTrace();
-            }
-            // Record the tests for later use when reporting coverage.
-            Arrays.asList(TestCategory.values()).forEach(
-                    c -> allTargets.get(c).addAll(getRegisteredTests(target, c, false)));
+    // Prepare for the collection of tests per category.
+    for (TestCategory t : TestCategory.values()) {
+      allTargets.put(t, new TreeSet<>());
+    }
+    // Populate the registry.
+    for (Target target : Target.values()) {
+
+      // Walk the tree.
+      try {
+        Path dir = LF_TEST_PATH.resolve(target.getDirectoryName()).resolve("src");
+        if (Files.exists(dir)) {
+          new TestDirVisitor(rs, target, dir).walk();
+        } else {
+          System.out.println("WARNING: No test directory for target " + target + "\n");
         }
+
+      } catch (IOException e) {
+        System.err.println("ERROR: Caught exception while indexing tests for target " + target);
+        e.printStackTrace();
+      }
+      // Record the tests for later use when reporting coverage.
+      Arrays.asList(TestCategory.values())
+          .forEach(c -> allTargets.get(c).addAll(getRegisteredTests(target, c, false)));
+    }
+  }
+
+  /**
+   * Calling this function forces the lazy initialization of the static code that indexes all files.
+   * It is advisable to do this prior to executing other code that prints to standard out so that
+   * any error messages printed while indexing are printed first.
+   */
+  public static void initialize() {}
+
+  /**
+   * Return the tests that were indexed for a given target and category.
+   *
+   * @param target The target to get indexed tests for.
+   * @param category The category of tests to include in the returned tests.
+   * @param copy Whether to return copies of the indexed tests instead of the indexed tests
+   *     themselves.
+   * @return A set of tests for the given target/category.
+   */
+  public static Set<LFTest> getRegisteredTests(Target target, TestCategory category, boolean copy) {
+    if (copy) {
+      Set<LFTest> copies = new TreeSet<>();
+      for (LFTest test : registered.getTests(target, category)) {
+        copies.add(new LFTest(test));
+      }
+      return copies;
+    } else {
+      return registered.getTests(target, category);
+    }
+  }
+
+  /** Return the test that were found but not indexed because they did not have a main reactor. */
+  public static Set<LFTest> getIgnoredTests(Target target, TestCategory category) {
+    return ignored.getTests(target, category);
+  }
+
+  public static String getCoverageReport(Target target, TestCategory category) {
+    StringBuilder s = new StringBuilder();
+    Set<LFTest> ignored = TestRegistry.getIgnoredTests(target, category);
+    s.append(TestBase.THIN_LINE);
+    s.append("Ignored: ").append(ignored.size()).append("\n");
+    s.append(TestBase.THIN_LINE);
+
+    for (LFTest test : ignored) {
+      s.append("No main reactor in: ").append(test).append("\n");
     }
 
-    /**
-     * Calling this function forces the lazy initialization of the static code
-     * that indexes all files. It is advisable to do this prior to executing
-     * other code that prints to standard out so that any error messages
-     * printed while indexing are printed first.
-     */
-    public static void initialize() {}
+    Set<LFTest> own = getRegisteredTests(target, category, false);
+    if (category.isCommon) {
+      Set<LFTest> all = allTargets.get(category);
+      s.append("\n").append(TestBase.THIN_LINE);
+      s.append("Covered: ").append(own.size()).append("/").append(all.size()).append("\n");
+      s.append(TestBase.THIN_LINE);
+      int missing = all.size() - own.size();
+      if (missing > 0) {
+        all.stream()
+            .filter(test -> !own.contains(test))
+            .forEach(test -> s.append("Missing: ").append(test).append("\n"));
+      }
+    } else {
+      s.append("\n").append(TestBase.THIN_LINE);
+      s.append("Covered: ").append(own.size()).append("/").append(own.size()).append("\n");
+      s.append(TestBase.THIN_LINE);
+    }
+    return s.toString();
+  }
+
+  /**
+   * FileVisitor implementation that maintains a stack to map found tests to the appropriate
+   * category and excludes directories that are listed as "ignored" from walks.
+   *
+   * <p>Specifically, when a directory is encountered that matches a category, this category is
+   * pushed onto the stack. Similarly, when the DFS leaves such a directory, its corresponding
+   * category is popped from the stack. Any test (*.lf) file that is encountered will be mapped to
+   * the category that is on top of the stack. Initially, the stack has one element that is
+   * TestCategory.COMMON, meaning that test files in the top-level test directory for a given target
+   * will be mapped to that category.
+   *
+   * @author Marten Lohstroh
+   */
+  public static class TestDirVisitor extends SimpleFileVisitor<Path> {
+
+    /** The stack of which the top element indicates the "current" category. */
+    protected Stack<TestCategory> stack = new Stack<>();
+
+    /** The target that all encountered tests belong to. */
+    protected Target target;
+
+    protected ResourceSet rs;
+
+    protected Path srcBasePath;
 
     /**
-     * Return the tests that were indexed for a given target and category.
+     * Create a new file visitor based on a given target.
      *
-     * @param target The target to get indexed tests for.
-     * @param category The category of tests to include in the returned tests.
-     * @param copy Whether to return copies of the indexed tests instead of the indexed tests themselves.
-     * @return A set of tests for the given target/category.
+     * @param target The target that all encountered tests belong to.
+     * @param srcBasePath The test sources directory
      */
-    public static Set<LFTest> getRegisteredTests(Target target,
-            TestCategory category, boolean copy) {
-        if (copy) {
-            Set<LFTest> copies = new TreeSet<>();
-            for (LFTest test : registered.getTests(target, category)) {
-                copies.add(new LFTest(test));
-            }
-            return copies;
-        } else {
-            return registered.getTests(target, category);
-        }
+    public TestDirVisitor(ResourceSet rs, Target target, Path srcBasePath) {
+      stack.push(TestCategory.GENERIC);
+      this.rs = rs;
+      this.target = target;
+      this.srcBasePath = srcBasePath;
     }
 
     /**
-     * Return the test that were found but not indexed because they did not
-     * have a main reactor.
+     * Push categories onto the stack as appropriate and skip directories that should be ignored.
      */
-    public static Set<LFTest> getIgnoredTests(Target target, TestCategory category) {
-        return ignored.getTests(target, category);
-    }
-
-    public static String getCoverageReport(Target target, TestCategory category) {
-        StringBuilder s = new StringBuilder();
-        Set<LFTest> ignored = TestRegistry.getIgnoredTests(target, category);
-        s.append(TestBase.THIN_LINE);
-        s.append("Ignored: ").append(ignored.size()).append("\n");
-        s.append(TestBase.THIN_LINE);
-
-        for (LFTest test : ignored) {
-            s.append("No main reactor in: ").append(test).append("\n");
+    @Override
+    public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
+      for (String ignored : IGNORED_DIRECTORIES) {
+        if (dir.getFileName().toString().equalsIgnoreCase(ignored)) {
+          return SKIP_SUBTREE;
         }
+      }
+      for (TestCategory category : TestCategory.values()) {
+        var relativePathName = srcBasePath.relativize(dir).toString();
+        if (relativePathName.equalsIgnoreCase(category.getPath())) {
+          stack.push(category);
+        }
+      }
+      return CONTINUE;
+    }
 
-        Set<LFTest> own = getRegisteredTests(target, category, false);
-        if (category.isCommon) {
-            Set<LFTest> all = allTargets.get(category);
-            s.append("\n").append(TestBase.THIN_LINE);
-            s.append("Covered: ").append(own.size()).append("/").append(all.size()).append("\n");
-            s.append(TestBase.THIN_LINE);
-            int missing = all.size() - own.size();
-            if (missing > 0) {
-                all.stream().filter(test -> !own.contains(test))
-                        .forEach(test -> s.append("Missing: ").append(test).append("\n"));
-            }
-        } else {
-            s.append("\n").append(TestBase.THIN_LINE);
-            s.append("Covered: ").append(own.size()).append("/").append(own.size()).append("\n");
-            s.append(TestBase.THIN_LINE);
+    /** Pop categories from the stack as appropriate. */
+    @Override
+    public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
+      for (TestCategory category : TestCategory.values()) {
+        var relativePathName = srcBasePath.relativize(dir).toString();
+        if (relativePathName.equalsIgnoreCase(category.getPath())) {
+          this.stack.pop();
         }
-        return s.toString();
+      }
+      return CONTINUE;
     }
 
     /**
-     * FileVisitor implementation that maintains a stack to map found tests to
-     * the appropriate category and excludes directories that are listed as
-     * "ignored" from walks.
-     *
-     * Specifically, when a directory is encountered that matches a category,
-     * this category is pushed onto the stack. Similarly, when the DFS leaves
-     * such a directory, its corresponding category is popped from the stack.
-     * Any test (*.lf) file that is encountered will be mapped to the category
-     * that is on top of the stack. Initially, the stack has one element that
-     * is TestCategory.COMMON, meaning that test files in the top-level test
-     * directory for a given target will be mapped to that category.
-     *
-     * @author Marten Lohstroh
+     * Add test files to the registry if they end with ".lf", but only if they have a main reactor.
      */
-    public static class TestDirVisitor extends SimpleFileVisitor<Path> {
-
-        /**
-         * The stack of which the top element indicates the "current" category.
-         */
-        protected Stack<TestCategory> stack = new Stack<>();
-
-        /**
-         * The target that all encountered tests belong to.
-         */
-        protected Target target;
-
-        protected ResourceSet rs;
-
-        protected Path srcBasePath;
-
-        /**
-         * Create a new file visitor based on a given target.
-         *
-         * @param target The target that all encountered tests belong to.
-         * @param srcBasePath The test sources directory
-         */
-        public TestDirVisitor(ResourceSet rs, Target target, Path srcBasePath) {
-            stack.push(TestCategory.GENERIC);
-            this.rs = rs;
-            this.target = target;
-            this.srcBasePath = srcBasePath;
+    @Override
+    public FileVisitResult visitFile(Path path, BasicFileAttributes attr) {
+      if (attr.isRegularFile() && path.toString().endsWith(".lf")) {
+        // Try to parse the file.
+        Resource r = rs.getResource(URI.createFileURI(path.toFile().getAbsolutePath()), true);
+        // FIXME: issue warning if target doesn't match!
+        LFTest test = new LFTest(target, path);
+
+        Iterator<Reactor> reactors = IteratorExtensions.filter(r.getAllContents(), Reactor.class);
+
+        if (r.getErrors().isEmpty()
+            && !IteratorExtensions.exists(reactors, it -> it.isMain() || it.isFederated())) {
+          // If the test compiles but doesn't have a main reactor,
+          // _do not add the file_. We assume it is a library
+          // file.
+          ignored.getTests(this.target, this.stack.peek()).add(test);
+          return CONTINUE;
         }
 
-        /**
-         * Push categories onto the stack as appropriate and skip directories
-         * that should be ignored.
-         */
-        @Override
-        public FileVisitResult preVisitDirectory(Path dir,
-                BasicFileAttributes attrs) {
-            for (String ignored : IGNORED_DIRECTORIES) {
-                if (dir.getFileName().toString().equalsIgnoreCase(ignored)) {
-                    return SKIP_SUBTREE;
-                }
-            }
-            for (TestCategory category : TestCategory.values()) {
-                var relativePathName = srcBasePath.relativize(dir).toString();
-                if (relativePathName.equalsIgnoreCase(category.getPath())) {
-                    stack.push(category);
-                }
-            }
-            return CONTINUE;
-        }
-
-        /**
-         * Pop categories from the stack as appropriate.
-         */
-        @Override
-        public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
-            for (TestCategory category : TestCategory.values()) {
-                var relativePathName = srcBasePath.relativize(dir).toString();
-                if (relativePathName.equalsIgnoreCase(category.getPath())) {
-                    this.stack.pop();
-                }
-            }
-            return CONTINUE;
-        }
-
-        /**
-         * Add test files to the registry if they end with ".lf", but only if they have a main reactor.
-         */
-        @Override
-        public FileVisitResult visitFile(Path path, BasicFileAttributes attr) {
-            if (attr.isRegularFile() && path.toString().endsWith(".lf")) {
-                // Try to parse the file.
-                Resource r = rs.getResource(URI.createFileURI(path.toFile().getAbsolutePath()),true);
-                // FIXME: issue warning if target doesn't match!
-                LFTest test = new LFTest(target, path);
-
-                Iterator<Reactor> reactors = IteratorExtensions.filter(r.getAllContents(), Reactor.class);
-
-                if (r.getErrors().isEmpty() && !IteratorExtensions.exists(reactors,
-                    it -> it.isMain() || it.isFederated())) {
-                    // If the test compiles but doesn't have a main reactor,
-                    // _do not add the file_. We assume it is a library
-                    // file.
-                    ignored.getTests(this.target, this.stack.peek()).add(test);
-                    return CONTINUE;
-                }
-
-                registered.getTests(this.target, this.stack.peek()).add(test);
-            }
-            return CONTINUE;
-        }
+        registered.getTests(this.target, this.stack.peek()).add(test);
+      }
+      return CONTINUE;
+    }
 
-        public void walk() throws IOException {
-            Files.walkFileTree(srcBasePath, this);
-        }
+    public void walk() throws IOException {
+      Files.walkFileTree(srcBasePath, this);
     }
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/TestUtils.java b/org.lflang.tests/src/org/lflang/tests/TestUtils.java
index c868acb771..9e7cb4218a 100644
--- a/org.lflang.tests/src/org/lflang/tests/TestUtils.java
+++ b/org.lflang.tests/src/org/lflang/tests/TestUtils.java
@@ -31,7 +31,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.function.Predicate;
-
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
@@ -41,139 +40,136 @@
  */
 public class TestUtils {
 
-    private static Matcher<Path> pathMatcher(String description, Predicate<Path> predicate) {
-        return new BaseMatcher<>() {
-            @Override
-            public boolean matches(Object item) {
-                return item instanceof Path && predicate.test((Path) item);
-            }
-
-            @Override
-            public void describeTo(Description describer) {
-                describer.appendText(description);
-            }
-        };
+  private static Matcher<Path> pathMatcher(String description, Predicate<Path> predicate) {
+    return new BaseMatcher<>() {
+      @Override
+      public boolean matches(Object item) {
+        return item instanceof Path && predicate.test((Path) item);
+      }
+
+      @Override
+      public void describeTo(Description describer) {
+        describer.appendText(description);
+      }
+    };
+  }
+
+  public static Matcher<Path> isDirectory() {
+    return pathMatcher("is a directory", Files::isDirectory);
+  }
+
+  public static Matcher<Path> isRegularFile() {
+    return pathMatcher("is a regular file", Files::isRegularFile);
+  }
+
+  public static Matcher<Path> exists() {
+    return pathMatcher("exists", Files::exists);
+  }
+
+  /** Builder for a directory. Useful to create a fake LF project. */
+  public static class TempDirBuilder {
+
+    private final Path curDir;
+
+    private TempDirBuilder(Path path) {
+      this.curDir = path;
+      if (!Files.isDirectory(path)) {
+        throw new IllegalArgumentException("Not a directory: " + path);
+      }
     }
 
-    public static Matcher<Path> isDirectory() {
-        return pathMatcher("is a directory", Files::isDirectory);
+    public static TempDirBuilder dirBuilder(Path path) {
+      return new TempDirBuilder(path);
     }
 
-    public static Matcher<Path> isRegularFile() {
-        return pathMatcher("is a regular file", Files::isRegularFile);
+    /** Create a directory at the given path. Return a new temp dir builder for that subdir. */
+    public TempDirBuilder cd(String relativePath) throws IOException {
+      Path relPath = Paths.get(relativePath);
+      if (relPath.isAbsolute()) {
+        throw new IllegalArgumentException("Should be a relative path: " + relativePath);
+      }
+      Path dir = curDir.resolve(relPath);
+      Files.createDirectories(dir);
+      return new TempDirBuilder(dir);
     }
 
-    public static Matcher<Path> exists() {
-        return pathMatcher("exists", Files::exists);
+    /** Create a directory at the given path. Return this instance. */
+    public TempDirBuilder mkdirs(String relativePath) throws IOException {
+      Path relPath = Paths.get(relativePath);
+      if (relPath.isAbsolute()) {
+        throw new IllegalArgumentException("Should be a relative path: " + relativePath);
+      }
+      Path dir = curDir.resolve(relPath);
+      Files.createDirectories(dir);
+      return this;
     }
 
-    /**
-     * Builder for a directory. Useful to create a fake LF project.
-     */
-    public static class TempDirBuilder {
-
-        private final Path curDir;
-
-        private TempDirBuilder(Path path) {
-            this.curDir = path;
-            if (!Files.isDirectory(path)) {
-                throw new IllegalArgumentException("Not a directory: " + path);
-            }
-        }
-
-        public static TempDirBuilder dirBuilder(Path path) {
-            return new TempDirBuilder(path);
-        }
-
-        /** Create a directory at the given path. Return a new temp dir builder for that subdir. */
-        public TempDirBuilder cd(String relativePath) throws IOException {
-            Path relPath = Paths.get(relativePath);
-            if (relPath.isAbsolute()) {
-                throw new IllegalArgumentException("Should be a relative path: " + relativePath);
-            }
-            Path dir = curDir.resolve(relPath);
-            Files.createDirectories(dir);
-            return new TempDirBuilder(dir);
-        }
-
-        /** Create a directory at the given path. Return this instance. */
-        public TempDirBuilder mkdirs(String relativePath) throws IOException {
-            Path relPath = Paths.get(relativePath);
-            if (relPath.isAbsolute()) {
-                throw new IllegalArgumentException("Should be a relative path: " + relativePath);
-            }
-            Path dir = curDir.resolve(relPath);
-            Files.createDirectories(dir);
-            return this;
-        }
-
-        /** Create a file in the given subpath. Return this instance. */
-        public TempDirBuilder file(String relativePath, String contents) throws IOException {
-            Path relPath = Paths.get(relativePath);
-            if (relPath.isAbsolute()) {
-                throw new IllegalArgumentException("Should be a relative path: " + relativePath);
-            }
-            Path filePath = curDir.resolve(relPath);
-            Files.createDirectories(filePath.getParent());
-            Files.writeString(filePath, contents);
-            return this;
-        }
+    /** Create a file in the given subpath. Return this instance. */
+    public TempDirBuilder file(String relativePath, String contents) throws IOException {
+      Path relPath = Paths.get(relativePath);
+      if (relPath.isAbsolute()) {
+        throw new IllegalArgumentException("Should be a relative path: " + relativePath);
+      }
+      Path filePath = curDir.resolve(relPath);
+      Files.createDirectories(filePath.getParent());
+      Files.writeString(filePath, contents);
+      return this;
+    }
+  }
+
+  /** Builder for a directory. Useful to create a fake LF project. */
+  public static class TempDirChecker {
+
+    private final Path curDir;
+
+    private TempDirChecker(Path path) {
+      this.curDir = path;
+      if (!Files.isDirectory(path)) {
+        throw new IllegalArgumentException("Not a directory: " + path);
+      }
+    }
+
+    public static TempDirChecker dirChecker(Path path) {
+      return new TempDirChecker(path);
+    }
+
+    /** Create a directory at the given path. Return a new temp dir builder for that subdir. */
+    public TempDirBuilder cd(String relativePath) throws IOException {
+      Path relPath = Paths.get(relativePath);
+      if (relPath.isAbsolute()) {
+        throw new IllegalArgumentException("Should be a relative path: " + relativePath);
+      }
+      Path dir = curDir.resolve(relPath);
+      Files.createDirectories(dir);
+      return new TempDirBuilder(dir);
     }
 
     /**
-     * Builder for a directory. Useful to create a fake LF project.
+     * Check the contents of the file match the matcher. The file should be a UTF-8 encoded text
+     * file. Return this instance.
      */
-    public static class TempDirChecker {
-
-        private final Path curDir;
-
-        private TempDirChecker(Path path) {
-            this.curDir = path;
-            if (!Files.isDirectory(path)) {
-                throw new IllegalArgumentException("Not a directory: " + path);
-            }
-        }
-
-        public static TempDirChecker dirChecker(Path path) {
-            return new TempDirChecker(path);
-        }
-
-        /** Create a directory at the given path. Return a new temp dir builder for that subdir. */
-        public TempDirBuilder cd(String relativePath) throws IOException {
-            Path relPath = Paths.get(relativePath);
-            if (relPath.isAbsolute()) {
-                throw new IllegalArgumentException("Should be a relative path: " + relativePath);
-            }
-            Path dir = curDir.resolve(relPath);
-            Files.createDirectories(dir);
-            return new TempDirBuilder(dir);
-        }
-
-        /**
-         * Check the contents of the file match the matcher.
-         * The file should be a UTF-8 encoded text file. Return
-         * this instance.
-         */
-        public TempDirChecker checkContentsOf(String relativePath, Matcher<? super String> contentsMatcher) throws IOException {
-            Path relPath = Paths.get(relativePath);
-            if (relPath.isAbsolute()) {
-                throw new IllegalArgumentException("Should be a relative path: " + relativePath);
-            }
-            Path filePath = curDir.resolve(relPath);
-
-            assertThat(Files.readString(filePath), contentsMatcher);
-            return this;
-        }
-
-        public TempDirChecker check(String relativePath, Matcher<? super Path> pathMatcher) throws IOException {
-            Path relPath = Paths.get(relativePath);
-            if (relPath.isAbsolute()) {
-                throw new IllegalArgumentException("Should be a relative path: " + relativePath);
-            }
-            Path filePath = curDir.resolve(relPath);
-
-            assertThat(filePath, pathMatcher);
-            return this;
-        }
+    public TempDirChecker checkContentsOf(
+        String relativePath, Matcher<? super String> contentsMatcher) throws IOException {
+      Path relPath = Paths.get(relativePath);
+      if (relPath.isAbsolute()) {
+        throw new IllegalArgumentException("Should be a relative path: " + relativePath);
+      }
+      Path filePath = curDir.resolve(relPath);
+
+      assertThat(Files.readString(filePath), contentsMatcher);
+      return this;
+    }
+
+    public TempDirChecker check(String relativePath, Matcher<? super Path> pathMatcher)
+        throws IOException {
+      Path relPath = Paths.get(relativePath);
+      if (relPath.isAbsolute()) {
+        throw new IllegalArgumentException("Should be a relative path: " + relativePath);
+      }
+      Path filePath = curDir.resolve(relPath);
+
+      assertThat(filePath, pathMatcher);
+      return this;
     }
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/cli/CliToolTestFixture.java b/org.lflang.tests/src/org/lflang/tests/cli/CliToolTestFixture.java
index 83e7817618..257da7ad06 100644
--- a/org.lflang.tests/src/org/lflang/tests/cli/CliToolTestFixture.java
+++ b/org.lflang.tests/src/org/lflang/tests/cli/CliToolTestFixture.java
@@ -32,130 +32,108 @@
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.nio.file.Path;
-import java.util.concurrent.Callable;
-import java.util.function.Consumer;
-
 import org.hamcrest.Matcher;
-import org.opentest4j.AssertionFailedError;
-
 import org.lflang.cli.Io;
+import org.opentest4j.AssertionFailedError;
 
 /**
- * Test utilities for a CLI tool, eg {@link org.lflang.cli.Lfc},
- * {@link org.lflang.cli.Lff}.
+ * Test utilities for a CLI tool, eg {@link org.lflang.cli.Lfc}, {@link org.lflang.cli.Lff}.
  *
  * @author Clément Fournier
  */
 abstract class CliToolTestFixture {
 
-    /**
-     * Override to call the relevant main.
-     */
-    protected abstract void runCliProgram(Io io, String[] args);
-
-
-    /**
-     * Run the tool with the given arguments, in the system
-     * working directory.
-     *
-     * @param args Arguments
-     * @return The execution result
-     */
-    public ExecutionResult run(String... args) {
-        return run(Io.SYSTEM.getWd(), args);
+  /** Override to call the relevant main. */
+  protected abstract void runCliProgram(Io io, String[] args);
+
+  /**
+   * Run the tool with the given arguments, in the system working directory.
+   *
+   * @param args Arguments
+   * @return The execution result
+   */
+  public ExecutionResult run(String... args) {
+    return run(Io.SYSTEM.getWd(), args);
+  }
+
+  /**
+   * Run the tool with the given arguments, in the given working directory.
+   *
+   * @param wd working directory
+   * @param args Arguments
+   * @return The execution result
+   */
+  public ExecutionResult run(Path wd, String... args) {
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    ByteArrayOutputStream err = new ByteArrayOutputStream();
+
+    Io testIo = new Io(new PrintStream(err), new PrintStream(out), wd);
+    int exitCode = testIo.fakeSystemExit(io -> runCliProgram(io, args));
+
+    return new ExecutionResult(out, err, exitCode);
+  }
+
+  /**
+   * The result of an execution of a CLI program like LFC.
+   *
+   * @param out Output stream
+   * @param err Error stream
+   * @param exitCode Exit code of the process
+   */
+  record ExecutionResult(ByteArrayOutputStream out, ByteArrayOutputStream err, int exitCode) {
+
+    public String getOut() {
+      return out.toString();
     }
 
-    /**
-     * Run the tool with the given arguments, in the given
-     * working directory.
-     *
-     * @param wd working directory
-     * @param args Arguments
-     * @return The execution result
-     */
-    public ExecutionResult run(Path wd, String... args) {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ByteArrayOutputStream err = new ByteArrayOutputStream();
-
-        Io testIo = new Io(
-            new PrintStream(err),
-            new PrintStream(out),
-            wd
-        );
-        int exitCode = testIo.fakeSystemExit(io -> runCliProgram(io, args));
-
-        return new ExecutionResult(out, err, exitCode);
+    public String getErr() {
+      return err.toString();
     }
 
-    /**
-     * The result of an execution of a CLI program like LFC.
-     *
-     * @param out Output stream
-     * @param err Error stream
-     * @param exitCode Exit code of the process
-     */
-    record ExecutionResult(
-        ByteArrayOutputStream out,
-        ByteArrayOutputStream err,
-        int exitCode
-    ) {
-
-        public String getOut() {
-            return out.toString();
-        }
-
-        public String getErr() {
-            return err.toString();
-        }
-
-
-        public void checkOk() {
-            assertEquals(0, exitCode);
-        }
+    public void checkOk() {
+      assertEquals(0, exitCode);
+    }
 
-        public void checkFailed() {
-            assertTrue(exitCode > 0);
-        }
+    public void checkFailed() {
+      assertTrue(exitCode > 0);
+    }
 
-        public void checkNoErrorOutput() {
-            checkStdErr(equalTo(""));
-        }
+    public void checkNoErrorOutput() {
+      checkStdErr(equalTo(""));
+    }
 
-        public void checkStdOut(Matcher<? super String> matcher) {
-            assertThat(getOut(), matcher);
-        }
+    public void checkStdOut(Matcher<? super String> matcher) {
+      assertThat(getOut(), matcher);
+    }
 
-        public void checkStdErr(Matcher<? super String> matcher) {
-            assertThat(getErr(), matcher);
-        }
+    public void checkStdErr(Matcher<? super String> matcher) {
+      assertThat(getErr(), matcher);
+    }
 
-        /**
-         * Use this method to wrap assertions.
-         */
-        public void verify(ThrowingConsumer<ExecutionResult> actions) {
-            try {
-                actions.accept(this);
-            } catch (Exception | AssertionFailedError e) {
-                System.out.println("TEST FAILED");
-                System.out.println("> Return code: " + exitCode);
-                System.out.println("> Standard output -------------------------");
-                System.err.println(out.toString());
-                System.out.println("> Standard error --------------------------");
-                System.err.println(err.toString());
-                System.out.println("> -----------------------------------------");
-
-                if (e instanceof Exception) {
-                    throw new AssertionFailedError("Expected no exception to be thrown", e);
-                }
-                throw (AssertionFailedError) e;
-            }
+    /** Use this method to wrap assertions. */
+    public void verify(ThrowingConsumer<ExecutionResult> actions) {
+      try {
+        actions.accept(this);
+      } catch (Exception | AssertionFailedError e) {
+        System.out.println("TEST FAILED");
+        System.out.println("> Return code: " + exitCode);
+        System.out.println("> Standard output -------------------------");
+        System.err.println(out.toString());
+        System.out.println("> Standard error --------------------------");
+        System.err.println(err.toString());
+        System.out.println("> -----------------------------------------");
+
+        if (e instanceof Exception) {
+          throw new AssertionFailedError("Expected no exception to be thrown", e);
         }
+        throw (AssertionFailedError) e;
+      }
+    }
 
+    @FunctionalInterface
+    interface ThrowingConsumer<T> {
 
-        @FunctionalInterface
-        interface ThrowingConsumer<T> {
-
-            void accept(T t) throws Exception;
-        }
+      void accept(T t) throws Exception;
     }
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/cli/LfcCliTest.java b/org.lflang.tests/src/org/lflang/tests/cli/LfcCliTest.java
index d16193faad..d9e81a0e68 100644
--- a/org.lflang.tests/src/org/lflang/tests/cli/LfcCliTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/cli/LfcCliTest.java
@@ -33,15 +33,12 @@
 import static org.lflang.tests.TestUtils.isRegularFile;
 
 import com.google.inject.Injector;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Properties;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
-
 import org.lflang.LocalStrings;
 import org.lflang.cli.Io;
 import org.lflang.cli.Lfc;
@@ -54,16 +51,18 @@
  */
 public class LfcCliTest {
 
-    LfcTestFixture lfcTester = new LfcTestFixture();
+  LfcTestFixture lfcTester = new LfcTestFixture();
 
-    static final String LF_PYTHON_FILE = """
+  static final String LF_PYTHON_FILE =
+      """
         target Python
         main reactor {
             reaction(startup) {==}
         }
         """;
 
-    static final String JSON_STRING = """
+  static final String JSON_STRING =
+      """
         {
             "src": "src/File.lf",
             "out": "src",
@@ -87,230 +86,262 @@ public class LfcCliTest {
         }
         """;
 
-    @Test
-    public void testHelpArg() {
-        lfcTester.run("--help", "--version")
-            .verify(result -> {
-                result.checkOk();
-                result.checkNoErrorOutput();
-                result.checkStdOut(containsString("Usage: lfc"));
+  @Test
+  public void testHelpArg() {
+    lfcTester
+        .run("--help", "--version")
+        .verify(
+            result -> {
+              result.checkOk();
+              result.checkNoErrorOutput();
+              result.checkStdOut(containsString("Usage: lfc"));
             });
-    }
-
-    @Test
-    public void testMutuallyExclusiveCliArgs() {
-        lfcTester.run("File.lf", "--json", JSON_STRING)
-            .verify(result -> {
-                result.checkStdErr(containsString(
-                            "are mutually exclusive (specify only one)"));
-                result.checkFailed();
+  }
+
+  @Test
+  public void testMutuallyExclusiveCliArgs() {
+    lfcTester
+        .run("File.lf", "--json", JSON_STRING)
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("are mutually exclusive (specify only one)"));
+              result.checkFailed();
             });
 
-        lfcTester.run("File.lf", "--json-file", "test.json")
-            .verify(result -> {
-                result.checkStdErr(containsString(
-                            "are mutually exclusive (specify only one)"));
-                result.checkFailed();
+    lfcTester
+        .run("File.lf", "--json-file", "test.json")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("are mutually exclusive (specify only one)"));
+              result.checkFailed();
             });
 
-        lfcTester.run("--json", JSON_STRING, "--json-file", "test.json")
-            .verify(result -> {
-                result.checkStdErr(containsString(
-                            "are mutually exclusive (specify only one)"));
-                result.checkFailed();
+    lfcTester
+        .run("--json", JSON_STRING, "--json-file", "test.json")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("are mutually exclusive (specify only one)"));
+              result.checkFailed();
             });
-    }
-
-    @Test
-    public void testVersion() {
-        lfcTester.run("--version")
-            .verify(result -> {
-                result.checkOk();
-                result.checkNoErrorOutput();
-                result.checkStdOut(equalTo(
-                    "lfc " + LocalStrings.VERSION + System.lineSeparator()));
+  }
+
+  @Test
+  public void testVersion() {
+    lfcTester
+        .run("--version")
+        .verify(
+            result -> {
+              result.checkOk();
+              result.checkNoErrorOutput();
+              result.checkStdOut(equalTo("lfc " + LocalStrings.VERSION + System.lineSeparator()));
             });
-    }
-
-
-    @Test
-    public void testWrongCliArg() {
-        lfcTester.run("--notanargument", "File.lf")
-            .verify(result -> {
-                result.checkStdErr(containsString("Unknown option: '--notanargument'"));
-                result.checkFailed();
+  }
+
+  @Test
+  public void testWrongCliArg() {
+    lfcTester
+        .run("--notanargument", "File.lf")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("Unknown option: '--notanargument'"));
+              result.checkFailed();
             });
-    }
-
-    @Test
-    public void testInvalidArgs(@TempDir Path tempDir) throws IOException {
-        dirBuilder(tempDir).file("src/File.lf", LF_PYTHON_FILE);
-        LfcOneShotTestFixture fixture = new LfcOneShotTestFixture();
-
-        // Invalid src file.
-        fixture.run(tempDir, "unknown.lf")
-            .verify(result -> {
-                result.checkStdErr(containsString("No such file or directory."));
-                result.checkFailed();
+  }
+
+  @Test
+  public void testInvalidArgs(@TempDir Path tempDir) throws IOException {
+    dirBuilder(tempDir).file("src/File.lf", LF_PYTHON_FILE);
+    LfcOneShotTestFixture fixture = new LfcOneShotTestFixture();
+
+    // Invalid src file.
+    fixture
+        .run(tempDir, "unknown.lf")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("No such file or directory."));
+              result.checkFailed();
             });
 
-        // Invalid output path.
-        fixture.run(tempDir, "--output-path", "unknown/output/path", "src/File.lf")
-            .verify(result -> {
-                result.checkStdErr(containsString("Output location does not exist."));
-                result.checkFailed();
+    // Invalid output path.
+    fixture
+        .run(tempDir, "--output-path", "unknown/output/path", "src/File.lf")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("Output location does not exist."));
+              result.checkFailed();
             });
 
-        // Invalid build type.
-        fixture.run(tempDir, "--build-type", "unknown-build-type", "src/File.lf")
-            .verify(result -> {
-                result.checkStdErr(containsString("Invalid build type."));
-                result.checkFailed();
+    // Invalid build type.
+    fixture
+        .run(tempDir, "--build-type", "unknown-build-type", "src/File.lf")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("Invalid build type."));
+              result.checkFailed();
             });
 
-        // Invalid logging level.
-        fixture.run(tempDir, "--logging", "unknown_level", "src/File.lf")
-            .verify(result -> {
-                result.checkStdErr(containsString("Invalid log level."));
-                result.checkFailed();
+    // Invalid logging level.
+    fixture
+        .run(tempDir, "--logging", "unknown_level", "src/File.lf")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("Invalid log level."));
+              result.checkFailed();
             });
 
-        // Invalid RTI path.
-        fixture.run(tempDir, "--rti", "unknown/rti/path", "src/File.lf")
-            .verify(result -> {
-                result.checkStdErr(containsString("Invalid RTI path."));
-                result.checkFailed();
+    // Invalid RTI path.
+    fixture
+        .run(tempDir, "--rti", "unknown/rti/path", "src/File.lf")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("Invalid RTI path."));
+              result.checkFailed();
             });
 
-        // Invalid scheduler.
-        fixture.run(tempDir, "--scheduler", "unknown-scheduler", "src/File.lf")
-            .verify(result -> {
-                result.checkStdErr(containsString("Invalid scheduler."));
-                result.checkFailed();
+    // Invalid scheduler.
+    fixture
+        .run(tempDir, "--scheduler", "unknown-scheduler", "src/File.lf")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("Invalid scheduler."));
+              result.checkFailed();
             });
 
-        // Invalid workers.
-        fixture.run(tempDir, "--workers", "notaninteger", "src/File.lf")
-            .verify(result -> {
-                result.checkStdErr(containsString("Invalid value for option '--workers'"));
-                result.checkStdErr(containsString("is not an int"));
-                result.checkFailed();
+    // Invalid workers.
+    fixture
+        .run(tempDir, "--workers", "notaninteger", "src/File.lf")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("Invalid value for option '--workers'"));
+              result.checkStdErr(containsString("is not an int"));
+              result.checkFailed();
             });
-
-    }
-
-    @Test
-    public void testGenInSrcDir(@TempDir Path tempDir) throws IOException {
-        dirBuilder(tempDir).file("src/File.lf", LF_PYTHON_FILE);
-
-        lfcTester.run(tempDir, "src/File.lf", "--no-compile")
-            .verify(result -> {
-                result.checkOk();
-                dirChecker(tempDir)
-                    .check("src-gen", isDirectory())
-                    .check("bin", isDirectory())
-                    .check("src-gen/File/File.py", isRegularFile());
+  }
+
+  @Test
+  public void testGenInSrcDir(@TempDir Path tempDir) throws IOException {
+    dirBuilder(tempDir).file("src/File.lf", LF_PYTHON_FILE);
+
+    lfcTester
+        .run(tempDir, "src/File.lf", "--no-compile")
+        .verify(
+            result -> {
+              result.checkOk();
+              dirChecker(tempDir)
+                  .check("src-gen", isDirectory())
+                  .check("bin", isDirectory())
+                  .check("src-gen/File/File.py", isRegularFile());
             });
-    }
-
-    // Helper method for comparing argument values in tests testGeneratorArgs,
-    // testGeneratorArgsJsonString and testGeneratorArgsJsonFile.
-    public void verifyGeneratorArgs(Path tempDir, String[] args) {
-        LfcOneShotTestFixture fixture = new LfcOneShotTestFixture();
-
-        fixture.run(tempDir, args)
-            .verify(result -> {
-                // Don't validate execution because args are dummy args.
-                Properties properties = fixture.lfc.getGeneratorArgs();
-                assertEquals(properties.getProperty(BuildParm.BUILD_TYPE.getKey()), "Release");
-                assertEquals(properties.getProperty(BuildParm.CLEAN.getKey()), "true");
-                assertEquals(properties.getProperty(BuildParm.TARGET_COMPILER.getKey()), "gcc");
-                assertEquals(properties.getProperty(BuildParm.EXTERNAL_RUNTIME_PATH.getKey()), "src");
-                assertEquals(properties.getProperty(BuildParm.LOGGING.getKey()), "info");
-                assertEquals(properties.getProperty(BuildParm.LINT.getKey()), "true");
-                assertEquals(properties.getProperty(BuildParm.NO_COMPILE.getKey()), "true");
-                assertEquals(properties.getProperty(BuildParm.PRINT_STATISTICS.getKey()), "true");
-                assertEquals(properties.getProperty(BuildParm.QUIET.getKey()), "true");
-                assertEquals(properties.getProperty(BuildParm.RTI.getKey()),
-                        "path" + File.separator + "to" + File.separator + "rti");
-                assertEquals(properties.getProperty(BuildParm.RUNTIME_VERSION.getKey()), "rs");
-                assertEquals(properties.getProperty(BuildParm.SCHEDULER.getKey()), "GEDF_NP");
-                assertEquals(properties.getProperty(BuildParm.THREADING.getKey()), "false");
-                assertEquals(properties.getProperty(BuildParm.WORKERS.getKey()), "1");
+  }
+
+  // Helper method for comparing argument values in tests testGeneratorArgs,
+  // testGeneratorArgsJsonString and testGeneratorArgsJsonFile.
+  public void verifyGeneratorArgs(Path tempDir, String[] args) {
+    LfcOneShotTestFixture fixture = new LfcOneShotTestFixture();
+
+    fixture
+        .run(tempDir, args)
+        .verify(
+            result -> {
+              // Don't validate execution because args are dummy args.
+              Properties properties = fixture.lfc.getGeneratorArgs();
+              assertEquals(properties.getProperty(BuildParm.BUILD_TYPE.getKey()), "Release");
+              assertEquals(properties.getProperty(BuildParm.CLEAN.getKey()), "true");
+              assertEquals(properties.getProperty(BuildParm.TARGET_COMPILER.getKey()), "gcc");
+              assertEquals(properties.getProperty(BuildParm.EXTERNAL_RUNTIME_PATH.getKey()), "src");
+              assertEquals(properties.getProperty(BuildParm.LOGGING.getKey()), "info");
+              assertEquals(properties.getProperty(BuildParm.LINT.getKey()), "true");
+              assertEquals(properties.getProperty(BuildParm.NO_COMPILE.getKey()), "true");
+              assertEquals(properties.getProperty(BuildParm.PRINT_STATISTICS.getKey()), "true");
+              assertEquals(properties.getProperty(BuildParm.QUIET.getKey()), "true");
+              assertEquals(
+                  properties.getProperty(BuildParm.RTI.getKey()),
+                  "path" + File.separator + "to" + File.separator + "rti");
+              assertEquals(properties.getProperty(BuildParm.RUNTIME_VERSION.getKey()), "rs");
+              assertEquals(properties.getProperty(BuildParm.SCHEDULER.getKey()), "GEDF_NP");
+              assertEquals(properties.getProperty(BuildParm.THREADING.getKey()), "false");
+              assertEquals(properties.getProperty(BuildParm.WORKERS.getKey()), "1");
             });
+  }
+
+  @Test
+  public void testGeneratorArgs(@TempDir Path tempDir) throws IOException {
+    TempDirBuilder dir = dirBuilder(tempDir);
+    dir.file("src/File.lf", LF_PYTHON_FILE);
+    dir.mkdirs("path//to/rti");
+
+    String[] args = {
+      "src/File.lf",
+      "--output-path",
+      "src",
+      "--build-type",
+      "Release",
+      "--clean",
+      "--target-compiler",
+      "gcc",
+      "--external-runtime-path",
+      "src",
+      "--federated",
+      "--logging",
+      "info",
+      "--lint",
+      "--no-compile",
+      "--print-statistics",
+      "--quiet",
+      "--rti",
+      "path/to/rti",
+      "--runtime-version",
+      "rs",
+      "--scheduler",
+      "GEDF_NP",
+      "--threading",
+      "false",
+      "--workers",
+      "1",
+    };
+    verifyGeneratorArgs(tempDir, args);
+  }
+
+  @Test
+  public void testGeneratorArgsJsonString(@TempDir Path tempDir) throws IOException {
+    TempDirBuilder dir = dirBuilder(tempDir);
+    dir.file("src/File.lf", LF_PYTHON_FILE);
+    dir.mkdirs("path/to/rti");
+
+    String[] args = {"--json", JSON_STRING};
+    verifyGeneratorArgs(tempDir, args);
+  }
+
+  @Test
+  public void testGeneratorArgsJsonFile(@TempDir Path tempDir) throws IOException {
+    TempDirBuilder dir = dirBuilder(tempDir);
+    dir.file("src/File.lf", LF_PYTHON_FILE);
+    dir.file("src/test.json", JSON_STRING);
+    dir.mkdirs("path/to/rti");
+
+    String[] args = {"--json-file", "src/test.json"};
+    verifyGeneratorArgs(tempDir, args);
+  }
+
+  static class LfcTestFixture extends CliToolTestFixture {
+
+    @Override
+    protected void runCliProgram(Io io, String[] args) {
+      Lfc.main(io, args);
     }
+  }
 
-    @Test
-    public void testGeneratorArgs(@TempDir Path tempDir)
-            throws IOException {
-        TempDirBuilder dir = dirBuilder(tempDir);
-        dir.file("src/File.lf", LF_PYTHON_FILE);
-        dir.mkdirs("path//to/rti");
-
-        String[] args = {
-            "src/File.lf",
-            "--output-path", "src",
-            "--build-type", "Release",
-            "--clean",
-            "--target-compiler", "gcc",
-            "--external-runtime-path", "src",
-            "--federated",
-            "--logging", "info",
-            "--lint",
-            "--no-compile",
-            "--print-statistics",
-            "--quiet",
-            "--rti", "path/to/rti",
-            "--runtime-version", "rs",
-            "--scheduler", "GEDF_NP",
-            "--threading", "false",
-            "--workers", "1",
-        };
-        verifyGeneratorArgs(tempDir, args);
-    }
-
-    @Test
-    public void testGeneratorArgsJsonString(@TempDir Path tempDir)
-            throws IOException {
-        TempDirBuilder dir = dirBuilder(tempDir);
-        dir.file("src/File.lf", LF_PYTHON_FILE);
-        dir.mkdirs("path/to/rti");
+  static class LfcOneShotTestFixture extends CliToolTestFixture {
 
-        String[] args = {"--json", JSON_STRING};
-        verifyGeneratorArgs(tempDir, args);
-    }
-
-    @Test
-    public void testGeneratorArgsJsonFile(@TempDir Path tempDir)
-            throws IOException {
-        TempDirBuilder dir = dirBuilder(tempDir);
-        dir.file("src/File.lf", LF_PYTHON_FILE);
-        dir.file("src/test.json", JSON_STRING);
-        dir.mkdirs("path/to/rti");
-
-        String[] args = {"--json-file", "src/test.json"};
-        verifyGeneratorArgs(tempDir, args);
-    }
+    private Lfc lfc;
 
-    static class LfcTestFixture extends CliToolTestFixture {
-
-        @Override
-        protected void runCliProgram(Io io, String[] args) {
-            Lfc.main(io, args);
-        }
-    }
-
-    static class LfcOneShotTestFixture extends CliToolTestFixture {
-
-        private Lfc lfc;
-
-        @Override
-        protected void runCliProgram(Io io, String[] args) {
-            // Injector used to obtain Main instance.
-            final Injector injector = Lfc.getInjector("lfc", io);
-            // Main instance.
-            this.lfc = injector.getInstance(Lfc.class);
-            lfc.doExecute(io, args);
-        }
+    @Override
+    protected void runCliProgram(Io io, String[] args) {
+      // Injector used to obtain Main instance.
+      final Injector injector = Lfc.getInjector("lfc", io);
+      // Main instance.
+      this.lfc = injector.getInstance(Lfc.class);
+      lfc.doExecute(io, args);
     }
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/cli/LffCliTest.java b/org.lflang.tests/src/org/lflang/tests/cli/LffCliTest.java
index 16a4e9b32d..a9da20239f 100644
--- a/org.lflang.tests/src/org/lflang/tests/cli/LffCliTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/cli/LffCliTest.java
@@ -26,153 +26,136 @@
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.lflang.tests.TestUtils.TempDirBuilder.dirBuilder;
 import static org.lflang.tests.TestUtils.TempDirChecker.dirChecker;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
-
 import org.lflang.LocalStrings;
-import org.lflang.tests.cli.CliToolTestFixture.ExecutionResult;
 import org.lflang.cli.Io;
 import org.lflang.cli.Lff;
+import org.lflang.tests.cli.CliToolTestFixture.ExecutionResult;
 
 /**
  * @author Clément Fournier
  */
 public class LffCliTest {
 
-    private static final String FILE_BEFORE_REFORMAT = """
+  private static final String FILE_BEFORE_REFORMAT =
+      """
         target Python;
         main   reactor {
             reaction(startup) {=
                =}
         }
         """;
-    private static final String FILE_AFTER_REFORMAT = """
+  private static final String FILE_AFTER_REFORMAT =
+      """
         target Python
-            
+
         main reactor {
             reaction(startup) {=  =}
         }
         """;
-    LffTestFixture lffTester = new LffTestFixture();
+  LffTestFixture lffTester = new LffTestFixture();
 
+  @Test
+  public void testHelpArg() {
+    ExecutionResult result = lffTester.run("--help", "--version");
+    result.checkOk();
+    result.checkNoErrorOutput();
+    result.checkStdOut(containsString("Usage: lff"));
+  }
 
-    @Test
-    public void testHelpArg() {
-        ExecutionResult result = lffTester.run("--help", "--version");
-        result.checkOk();
-        result.checkNoErrorOutput();
-        result.checkStdOut(containsString("Usage: lff"));
-    }
+  @Test
+  public void testVersion() {
+    ExecutionResult result = lffTester.run("--version");
+    result.checkOk();
+    result.checkNoErrorOutput();
+    result.checkStdOut(equalTo("lff " + LocalStrings.VERSION + System.lineSeparator()));
+  }
 
-    @Test
-    public void testVersion() {
-        ExecutionResult result = lffTester.run("--version");
-        result.checkOk();
-        result.checkNoErrorOutput();
-        result.checkStdOut(
-            equalTo("lff " + LocalStrings.VERSION + System.lineSeparator()));
-    }
+  @Test
+  public void testWrongCliArg() {
+    ExecutionResult result = lffTester.run("--notanargument", "File.lf");
+    result.checkStdErr(containsString("Unknown option: '--notanargument'"));
+    result.checkFailed();
+  }
 
+  @Test
+  public void testFormatSingleFileInPlace(@TempDir Path tempDir) throws IOException {
+    dirBuilder(tempDir).file("src/File.lf", FILE_BEFORE_REFORMAT);
 
-    @Test
-    public void testWrongCliArg() {
-        ExecutionResult result = lffTester.run("--notanargument", "File.lf");
-        result.checkStdErr(containsString("Unknown option: '--notanargument'"));
-        result.checkFailed();
-    }
+    ExecutionResult result = lffTester.run(tempDir, "src/File.lf");
 
-    @Test
-    public void testFormatSingleFileInPlace(@TempDir Path tempDir) throws IOException {
-        dirBuilder(tempDir).file("src/File.lf", FILE_BEFORE_REFORMAT);
+    result.checkOk();
 
-        ExecutionResult result = lffTester.run(tempDir, "src/File.lf");
+    dirChecker(tempDir).checkContentsOf("src/File.lf", equalTo(FILE_AFTER_REFORMAT));
+  }
 
-        result.checkOk();
+  @Test
+  public void testFormatDirectory(@TempDir Path tempDir) throws IOException {
+    dirBuilder(tempDir).file("src/File.lf", FILE_BEFORE_REFORMAT);
 
-        dirChecker(tempDir).checkContentsOf("src/File.lf", equalTo(FILE_AFTER_REFORMAT));
-    }
+    ExecutionResult result = lffTester.run(tempDir, "src");
 
+    result.checkOk();
 
-    @Test
-    public void testFormatDirectory(@TempDir Path tempDir) throws IOException {
-        dirBuilder(tempDir).file("src/File.lf", FILE_BEFORE_REFORMAT);
+    dirChecker(tempDir).checkContentsOf("src/File.lf", equalTo(FILE_AFTER_REFORMAT));
+  }
 
-        ExecutionResult result = lffTester.run(tempDir, "src");
+  @Test
+  public void testFormatDirectoryVerbose(@TempDir Path tempDir) throws IOException {
+    dirBuilder(tempDir).file("src/File.lf", FILE_BEFORE_REFORMAT);
 
-        result.checkOk();
+    ExecutionResult result = lffTester.run(tempDir, "-v", "src");
 
-        dirChecker(tempDir).checkContentsOf("src/File.lf", equalTo(FILE_AFTER_REFORMAT));
-    }
+    result.checkOk();
 
+    result.checkStdOut(containsString("Formatted src" + File.separator + "File.lf"));
+    dirChecker(tempDir).checkContentsOf("src/File.lf", equalTo(FILE_AFTER_REFORMAT));
+  }
 
-    @Test
-    public void testFormatDirectoryVerbose(@TempDir Path tempDir) throws IOException {
-        dirBuilder(tempDir).file("src/File.lf", FILE_BEFORE_REFORMAT);
+  @Test
+  public void testNoSuchFile(@TempDir Path tempDir) {
+    ExecutionResult result = lffTester.run(tempDir, "-v", "nosuchdir");
 
-        ExecutionResult result = lffTester.run(tempDir, "-v", "src");
+    result.checkFailed();
 
-        result.checkOk();
+    result.checkStdErr(
+        containsString(tempDir.resolve("nosuchdir") + ": No such file or directory."));
+  }
 
-        result.checkStdOut(containsString(
-            "Formatted src" + File.separator + "File.lf"));
-        dirChecker(tempDir).checkContentsOf("src/File.lf", equalTo(FILE_AFTER_REFORMAT));
-    }
+  @Test
+  public void testOutputPathWithDirArg(@TempDir Path tempDir) throws IOException {
+    dirBuilder(tempDir).file("src/a/File.lf", FILE_BEFORE_REFORMAT).mkdirs("out/");
 
-    @Test
-    public void testNoSuchFile(@TempDir Path tempDir) {
-        ExecutionResult result = lffTester.run(tempDir, "-v", "nosuchdir");
+    ExecutionResult result = lffTester.run(tempDir, "src", "--output-path", "out");
 
-        result.checkFailed();
+    result.checkOk();
 
-        result.checkStdErr(containsString(
-            tempDir.resolve("nosuchdir") + ": No such file or directory."));
-    }
+    dirChecker(tempDir).checkContentsOf("out/a/File.lf", equalTo(FILE_AFTER_REFORMAT));
+  }
 
+  @Test
+  public void testOutputPathWithFileArg(@TempDir Path tempDir) throws IOException {
+    dirBuilder(tempDir).file("src/a/File.lf", FILE_BEFORE_REFORMAT).mkdirs("out/");
 
-    @Test
-    public void testOutputPathWithDirArg(@TempDir Path tempDir) throws IOException {
-        dirBuilder(tempDir)
-            .file("src/a/File.lf", FILE_BEFORE_REFORMAT)
-            .mkdirs("out/");
+    ExecutionResult result = lffTester.run(tempDir, "src/a/File.lf", "--output-path", "out");
 
-        ExecutionResult result = lffTester.run(tempDir, "src", "--output-path", "out");
+    result.checkOk();
 
-        result.checkOk();
+    dirChecker(tempDir).checkContentsOf("out/File.lf", equalTo(FILE_AFTER_REFORMAT));
+  }
 
-        dirChecker(tempDir)
-            .checkContentsOf("out/a/File.lf", equalTo(FILE_AFTER_REFORMAT));
-    }
-
-    @Test
-    public void testOutputPathWithFileArg(@TempDir Path tempDir) throws IOException {
-        dirBuilder(tempDir)
-            .file("src/a/File.lf", FILE_BEFORE_REFORMAT)
-            .mkdirs("out/");
-
-        ExecutionResult result = lffTester.run(tempDir, "src/a/File.lf", "--output-path", "out");
+  static class LffTestFixture extends CliToolTestFixture {
 
-        result.checkOk();
-
-        dirChecker(tempDir)
-            .checkContentsOf("out/File.lf", equalTo(FILE_AFTER_REFORMAT));
+    @Override
+    protected void runCliProgram(Io io, String[] args) {
+      Lff.main(io, args);
     }
-
-
-    static class LffTestFixture extends CliToolTestFixture {
-
-
-        @Override
-        protected void runCliProgram(Io io, String[] args) {
-            Lff.main(io, args);
-        }
-    }
-
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/EquivalenceUnitTests.java b/org.lflang.tests/src/org/lflang/tests/compiler/EquivalenceUnitTests.java
index 931a0edae0..5d4fe9940c 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/EquivalenceUnitTests.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/EquivalenceUnitTests.java
@@ -5,7 +5,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.lflang.ast.IsEqual;
 import org.lflang.lf.Model;
 import org.lflang.tests.LFInjectorProvider;
@@ -15,10 +14,10 @@
 @InjectWith(LFInjectorProvider.class)
 public class EquivalenceUnitTests {
 
-    @Test
-    public void testSimple() {
-        assertSelfEquivalence(
-            """
+  @Test
+  public void testSimple() {
+    assertSelfEquivalence(
+        """
                 target C
 
                 reactor Destination {
@@ -26,14 +25,13 @@ public void testSimple() {
                     input in: int
                     state last_invoked: tag_t({= NEVER_TAG_INITIALIZER =})
                 }
-                """
-        );
-    }
+                """);
+  }
 
-    @Test
-    public void testCodeExprEqItselfModuloIndent() {
-        assertEquivalent(
-            """
+  @Test
+  public void testCodeExprEqItselfModuloIndent() {
+    assertEquivalent(
+        """
                 target C
                 reactor Destination {
                     state s: tag_t({=
@@ -41,67 +39,56 @@ public void testCodeExprEqItselfModuloIndent() {
                     =})
                 }
                 """,
-            """
+        """
                 target C
                 reactor Destination {
                     state s: tag_t({= NEVER_TAG_INITIALIZER =})
                 }
-                """
-        );
-    }
+                """);
+  }
 
-    @Test
-    public void testInitializerParensAreIrrelevantInAssignment() {
-        assertEquivalent(
-            """
+  @Test
+  public void testInitializerParensAreIrrelevantInAssignment() {
+    assertEquivalent(
+        """
                 target C
                 reactor A(a: int(0)) {}
                 main reactor {
                     a = new A(a = 1)
                 }
                 """,
-            """
+        """
                 target C
                 reactor A(a: int(0)) {}
                 main reactor {
                     a = new A(a = (1)) // mind the parens here.
                 }
-                """
-        );
-    }
-
-    private void assertSelfEquivalence(String input) {
-        Model inputModel = LfParsingUtil.parseValidModel("test input", input);
-        // need to parse twice otherwise they are trivially equivalent
-        // because they're the same object.
-        Model otherModel = LfParsingUtil.parseValidModel("other", input);
-
-        // test equivalence of the models.
-        Assertions.assertTrue(
-            new IsEqual(inputModel).doSwitch(otherModel),
-            String.format(
-                "Model is not equivalent to itself. Source:%n%s",
-                input
-            )
-        );
-    }
+                """);
+  }
 
-    private void assertEquivalent(String input, String other) {
-        Model inputModel = LfParsingUtil.parseValidModel("test input", input);
-        Model outputModel = LfParsingUtil.parseValidModel("other", other);
+  private void assertSelfEquivalence(String input) {
+    Model inputModel = LfParsingUtil.parseValidModel("test input", input);
+    // need to parse twice otherwise they are trivially equivalent
+    // because they're the same object.
+    Model otherModel = LfParsingUtil.parseValidModel("other", input);
 
-        // test equivalence of the models.
-        Assertions.assertTrue(
-            new IsEqual(inputModel).doSwitch(outputModel),
-            String.format(
-                "The reformatted model is not equivalent to the original file.%n"
-                    + "Input file:%n%s%n%n"
-                    + "Comparand file:%n%s%n%n",
-                input,
-                other
-            )
-        );
-    }
+    // test equivalence of the models.
+    Assertions.assertTrue(
+        new IsEqual(inputModel).doSwitch(otherModel),
+        String.format("Model is not equivalent to itself. Source:%n%s", input));
+  }
 
+  private void assertEquivalent(String input, String other) {
+    Model inputModel = LfParsingUtil.parseValidModel("test input", input);
+    Model outputModel = LfParsingUtil.parseValidModel("other", other);
 
+    // test equivalence of the models.
+    Assertions.assertTrue(
+        new IsEqual(inputModel).doSwitch(outputModel),
+        String.format(
+            "The reformatted model is not equivalent to the original file.%n"
+                + "Input file:%n%s%n%n"
+                + "Comparand file:%n%s%n%n",
+            input, other));
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/FormattingUnitTests.java b/org.lflang.tests/src/org/lflang/tests/compiler/FormattingUnitTests.java
index d7862e5d25..79aa6ac1f2 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/FormattingUnitTests.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/FormattingUnitTests.java
@@ -5,9 +5,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.lflang.ast.FormattingUtils;
-import org.lflang.ast.IsEqual;
 import org.lflang.lf.Model;
 import org.lflang.tests.LFInjectorProvider;
 import org.lflang.tests.LfParsingUtil;
@@ -16,26 +14,25 @@
 @InjectWith(LFInjectorProvider.class)
 public class FormattingUnitTests {
 
-    @Test
-    public void testSimple() {
-        assertFormatsTo(
-            """
+  @Test
+  public void testSimple() {
+    assertFormatsTo(
+        """
                 target C
                 reactor Main{ }
                 """,
-            """
+        """
                 target C
-                            
+
                 reactor Main {
                 }
-                """
-        );
-    }
+                """);
+  }
 
-    @Test
-    public void testAssignments() {
-        assertFormatsTo(
-            """
+  @Test
+  public void testAssignments() {
+    assertFormatsTo(
+        """
                 target C
 
                 reactor Destination {
@@ -44,7 +41,7 @@ public void testAssignments() {
                     state last_invoked: tag_t({= NEVER_TAG_INITIALIZER =})
                 }
                 """,
-            """
+        """
                 target C
 
                 reactor Destination {
@@ -52,14 +49,13 @@ public void testAssignments() {
                     input in: int
                     state last_invoked: tag_t = {= NEVER_TAG_INITIALIZER =}
                 }
-                """
-        );
-    }
+                """);
+  }
 
-    @Test
-    public void testState() {
-        assertFormatsTo(
-            """
+  @Test
+  public void testState() {
+    assertFormatsTo(
+        """
                 target Python
 
                 reactor Destination {
@@ -68,7 +64,7 @@ public void testState() {
                      state list_init(1,2) // this syntax is deprecated
                 }
                 """,
-            """
+        """
                 target Python
 
                 reactor Destination {
@@ -76,14 +72,13 @@ state list_init(1,2) // this syntax is deprecated
                     state no_init: tag_t
                     state list_init(1, 2)  # this syntax is deprecated
                 }
-                """
-        );
-    }
+                """);
+  }
 
-    @Test
-    public void testCppInits() {
-        assertIsFormatted(
-            """
+  @Test
+  public void testCppInits() {
+    assertIsFormatted(
+        """
                 target Cpp
 
                 reactor Destination {
@@ -94,23 +89,17 @@ public void testCppInits() {
                     state brace: std::vector<int>{1, 2}
                     state paren_list: std::vector<int>(1, 2)
                 }
-                """
-        );
-    }
-
-    private void assertIsFormatted(String input) {
-        assertFormatsTo(input, input);
-    }
-
-    private void assertFormatsTo(String input, String expectedOutput) {
-        Model inputModel = LfParsingUtil.parseValidModel("test input", input);
-        String formattedString = FormattingUtils.render(inputModel);
-        Assertions.assertEquals(
-            expectedOutput,
-            formattedString,
-            "Formatted output is different from what was expected"
-        );
-    }
-
-
+                """);
+  }
+
+  private void assertIsFormatted(String input) {
+    assertFormatsTo(input, input);
+  }
+
+  private void assertFormatsTo(String input, String expectedOutput) {
+    Model inputModel = LfParsingUtil.parseValidModel("test input", input);
+    String formattedString = FormattingUtils.render(inputModel);
+    Assertions.assertEquals(
+        expectedOutput, formattedString, "Formatted output is different from what was expected");
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/LetInferenceTests.java b/org.lflang.tests/src/org/lflang/tests/compiler/LetInferenceTests.java
index b3e7814f96..38387ac8a4 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/LetInferenceTests.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/LetInferenceTests.java
@@ -1,34 +1,33 @@
-package org.lflang.tests.compiler;/* Parsing unit tests. */
+package org.lflang.tests.compiler; /* Parsing unit tests. */
 
 /*************
- Copyright (c) 2022, The University of California at Berkeley.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) 2022, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
 
 import static org.lflang.ast.ASTUtils.toDefinition;
 
 import javax.inject.Inject;
-
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.testing.InjectWith;
@@ -37,11 +36,10 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.DefaultErrorReporter;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.ast.DelayedConnectionTransformation;
 import org.lflang.generator.ReactionInstance;
 import org.lflang.generator.ReactorInstance;
@@ -49,7 +47,6 @@
 import org.lflang.generator.c.CTypes;
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.LfFactory;
-
 import org.lflang.lf.Model;
 import org.lflang.lf.Reactor;
 import org.lflang.tests.LFInjectorProvider;
@@ -58,89 +55,93 @@
 @InjectWith(LFInjectorProvider.class)
 
 /**
- * Test for getting minimum delay in reactions.
- * Checking the actions and port's delay,then get the minimum reaction delay.
+ * Test for getting minimum delay in reactions. Checking the actions and port's delay,then get the
+ * minimum reaction delay.
+ *
  * @author Wonseo Choi
  * @author Yunsang Cho
  * @author Marten Lohstroh
  * @author Hokeun Kim
  */
-class LetInferenceTest  {
-
-    @Inject
-    ParseHelper<Model> parser;
-
-
-    @Test
-    public void testLet() throws Exception {
-        Model model = parser.parse(String.join(
-            System.getProperty("line.separator"),
-            "target C;",
-            "main reactor {",
-            "    ramp = new Ramp();",
-            "    print = new Print();",
-            "    print2 = new Print();",
-            "    ramp.y -> print.x after 20 msec;",
-            "    ramp.y -> print2.x after 30 msec;",
-            "}",
-            "reactor Ramp {",
-            "    logical action a(60 msec):int;",
-            "    logical action b(100 msec):int;",
-            "    input x:int;",
-            "    output y:int;",
-            "    output z:int;",
-            "    reaction(startup) -> y, z, a, b{=",
-            "    =}",
-            "}",
-            "reactor Print {",
-            "    input x:int;",
-            "    output z:int;",
-            "    reaction(x) -> z {=",
-            "    =}",
-            "}"
-        ));
-
-        Assertions.assertNotNull(model);
-        final var ctypes = CTypes.getInstance();
-        final var resource = model.eResource();
-        final var transformation = new DelayedConnectionTransformation(new CDelayBodyGenerator(ctypes), ctypes, resource, true, true);
-        transformation.applyTransformation(ASTUtils.getAllReactors(resource));
-
-        Assertions.assertTrue(model.eResource().getErrors().isEmpty(),
-                              "Encountered unexpected error while parsing: " +
-                                  model.eResource().getErrors());
+class LetInferenceTest {
+
+  @Inject ParseHelper<Model> parser;
+
+  @Test
+  public void testLet() throws Exception {
+    Model model =
+        parser.parse(
+            String.join(
+                System.getProperty("line.separator"),
+                "target C;",
+                "main reactor {",
+                "    ramp = new Ramp();",
+                "    print = new Print();",
+                "    print2 = new Print();",
+                "    ramp.y -> print.x after 20 msec;",
+                "    ramp.y -> print2.x after 30 msec;",
+                "}",
+                "reactor Ramp {",
+                "    logical action a(60 msec):int;",
+                "    logical action b(100 msec):int;",
+                "    input x:int;",
+                "    output y:int;",
+                "    output z:int;",
+                "    reaction(startup) -> y, z, a, b{=",
+                "    =}",
+                "}",
+                "reactor Print {",
+                "    input x:int;",
+                "    output z:int;",
+                "    reaction(x) -> z {=",
+                "    =}",
+                "}"));
+
+    Assertions.assertNotNull(model);
+    final var ctypes = CTypes.getInstance();
+    final var resource = model.eResource();
+    final var transformation =
+        new DelayedConnectionTransformation(
+            new CDelayBodyGenerator(ctypes), ctypes, resource, true, true);
+    transformation.applyTransformation(ASTUtils.getAllReactors(resource));
+
+    Assertions.assertTrue(
+        model.eResource().getErrors().isEmpty(),
+        "Encountered unexpected error while parsing: " + model.eResource().getErrors());
+
+    Instantiation mainDef = null;
+
+    TreeIterator<EObject> it = model.eResource().getAllContents();
+    while (it.hasNext()) {
+      EObject obj = it.next();
+      if (!(obj instanceof Reactor reactor)) {
+        continue;
+      }
+      if (reactor.isMain()) {
+        mainDef = LfFactory.eINSTANCE.createInstantiation();
+        mainDef.setName(reactor.getName());
+        mainDef.setReactorClass(reactor);
+      }
+    }
 
-        Instantiation mainDef = null;
+    ReactorInstance mainInstance =
+        new ReactorInstance(toDefinition(mainDef.getReactorClass()), new DefaultErrorReporter());
 
-        TreeIterator<EObject> it = model.eResource().getAllContents();
-        while (it.hasNext()) {
-            EObject obj = it.next();
-            if (!(obj instanceof Reactor reactor)) {
-                continue;
-            }
-            if (reactor.isMain()) {
-                mainDef = LfFactory.eINSTANCE.createInstantiation();
-                mainDef.setName(reactor.getName());
-                mainDef.setReactorClass(reactor);
-            }
+    for (ReactorInstance reactorInstance : mainInstance.children) {
+      if (reactorInstance.isGeneratedDelay()) {
+        for (ReactionInstance reactionInstance : reactorInstance.reactions) {
+          Assertions.assertEquals(reactionInstance.assignLogicalExecutionTime(), TimeValue.ZERO);
         }
-
-        ReactorInstance mainInstance = new ReactorInstance(toDefinition(mainDef.getReactorClass()), new DefaultErrorReporter());
-
-        for (ReactorInstance reactorInstance : mainInstance.children) {
-            if (reactorInstance.isGeneratedDelay()) {
-                for (ReactionInstance reactionInstance : reactorInstance.reactions) {
-                    Assertions.assertEquals(reactionInstance.assignLogicalExecutionTime(), TimeValue.ZERO);
-                }
-            } else if (reactorInstance.getName().contains("ramp")) {
-                for (ReactionInstance reactionInstance : reactorInstance.reactions) {
-                    Assertions.assertEquals(new TimeValue(20L, TimeUnit.MILLI), reactionInstance.assignLogicalExecutionTime());
-                }
-            } else if (reactorInstance.getName().contains("print")) {
-                for (ReactionInstance reactionInstance : reactorInstance.reactions) {
-                    Assertions.assertEquals(TimeValue.ZERO, reactionInstance.assignLogicalExecutionTime());
-                }
-            }
+      } else if (reactorInstance.getName().contains("ramp")) {
+        for (ReactionInstance reactionInstance : reactorInstance.reactions) {
+          Assertions.assertEquals(
+              new TimeValue(20L, TimeUnit.MILLI), reactionInstance.assignLogicalExecutionTime());
+        }
+      } else if (reactorInstance.getName().contains("print")) {
+        for (ReactionInstance reactionInstance : reactorInstance.reactions) {
+          Assertions.assertEquals(TimeValue.ZERO, reactionInstance.assignLogicalExecutionTime());
         }
+      }
     }
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaASTUtilsTest.java b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaASTUtilsTest.java
index 0122e03d8d..61fcf74328 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaASTUtilsTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaASTUtilsTest.java
@@ -1,29 +1,29 @@
 /* ASTUtils Unit Tests. */
 
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.tests.compiler;
 
@@ -34,14 +34,12 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
-
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.eclipse.xtext.testing.util.ParseHelper;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.Literal;
@@ -55,20 +53,17 @@
  *
  * @author Christian Menard
  */
-
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
-
 class LinguaFrancaASTUtilsTest {
-    @Inject
-    ParseHelper<Model> parser;
-
-    /**
-     * Test that isInititialized returns true for inititialized state variables
-     */
-    @Test
-    public void initializedState() throws Exception {
-        Model model = parser.parse("""
+  @Inject ParseHelper<Model> parser;
+
+  /** Test that isInititialized returns true for inititialized state variables */
+  @Test
+  public void initializedState() throws Exception {
+    Model model =
+        parser.parse(
+            """
             target Cpp;
             main reactor Foo {
                 state a();
@@ -79,26 +74,27 @@ public void initializedState() throws Exception {
             }
         """);
 
-
-
-        Assertions.assertNotNull(model);
-        Assertions.assertTrue(model.eResource().getErrors().isEmpty(),
-            "Encountered unexpected error while parsing: " +
-                model.eResource().getErrors());
-
-        model.eAllContents().forEachRemaining((obj) -> {
-            if (obj instanceof StateVar) {
-                Assertions.assertTrue(isInitialized((StateVar)obj));
-            }
-        });
-    }
-
-    /**
-     * Test that isInititialized returns false for uninititialized state variables
-     */
-    @Test
-    public void uninitializedState() throws Exception {
-        Model model = parser.parse("""
+    Assertions.assertNotNull(model);
+    Assertions.assertTrue(
+        model.eResource().getErrors().isEmpty(),
+        "Encountered unexpected error while parsing: " + model.eResource().getErrors());
+
+    model
+        .eAllContents()
+        .forEachRemaining(
+            (obj) -> {
+              if (obj instanceof StateVar) {
+                Assertions.assertTrue(isInitialized((StateVar) obj));
+              }
+            });
+  }
+
+  /** Test that isInititialized returns false for uninititialized state variables */
+  @Test
+  public void uninitializedState() throws Exception {
+    Model model =
+        parser.parse(
+            """
             target Cpp;
             main reactor Foo {
                 state a;
@@ -109,39 +105,42 @@ public void uninitializedState() throws Exception {
             }
         """);
 
-        Assertions.assertNotNull(model);
-        Assertions.assertTrue(model.eResource().getErrors().isEmpty(),
-            "Encountered unexpected error while parsing: " +
-                model.eResource().getErrors());
-
-        model.eAllContents().forEachRemaining((obj) -> {
-            if (obj instanceof StateVar) {
-                Assertions.assertFalse(isInitialized((StateVar)obj));
-            }
-        });
-
-    }
-    /**
-     * Return a map from strings to instantiations given a model.
-     *
-     * @param model The model to discover instantiations in.
-     */
-    private Map<String, Instantiation> getInsts(Model model) {
-       return asStream(model.eAllContents())
-                .filter(obj -> obj instanceof Instantiation)
-                .map(obj -> (Instantiation) obj)
-                .collect(Collectors.toMap(Instantiation::getName, it -> it));
-    }
-
-    /**
-     * Test reading initial values of parameters.
-     * This checks that the example given in the documentation of the
-     * ASTUtils.initialValue() function behaves as stated in the docs.
-     */
-     @Test
-     public void initialValue() throws Exception {
-
-       Model model = parser.parse("""
+    Assertions.assertNotNull(model);
+    Assertions.assertTrue(
+        model.eResource().getErrors().isEmpty(),
+        "Encountered unexpected error while parsing: " + model.eResource().getErrors());
+
+    model
+        .eAllContents()
+        .forEachRemaining(
+            (obj) -> {
+              if (obj instanceof StateVar) {
+                Assertions.assertFalse(isInitialized((StateVar) obj));
+              }
+            });
+  }
+  /**
+   * Return a map from strings to instantiations given a model.
+   *
+   * @param model The model to discover instantiations in.
+   */
+  private Map<String, Instantiation> getInsts(Model model) {
+    return asStream(model.eAllContents())
+        .filter(obj -> obj instanceof Instantiation)
+        .map(obj -> (Instantiation) obj)
+        .collect(Collectors.toMap(Instantiation::getName, it -> it));
+  }
+
+  /**
+   * Test reading initial values of parameters. This checks that the example given in the
+   * documentation of the ASTUtils.initialValue() function behaves as stated in the docs.
+   */
+  @Test
+  public void initialValue() throws Exception {
+
+    Model model =
+        parser.parse(
+            """
            target C;
            reactor A(x:int(1)) {}
            reactor B(y:int(2)) {
@@ -154,76 +153,80 @@ reactor C(z:int(3)) {
            }
        """);
 
-        Assertions.assertNotNull(model);
-        Assertions.assertTrue(model.eResource().getErrors().isEmpty(),
-                "Encountered unexpected error while parsing: " +
-                model.eResource().getErrors());
-
-        var map = getInsts(model);
-
-        /* Check for this:
-         *     initialValue(x, null) returns 1
-         *     initialValue(x, [a1]) returns 2
-         *     initialValue(x, [a2]) returns -1
-         *     initialValue(x, [a1, b1]) returns 3
-         *     initialValue(x, [a2, b1]) returns -1
-         *     initialValue(x, [a1, b2]) returns -2
-         *     initialValue(x, [a2, b2]) returns -1
-         *
-         *     initialValue(y, null) returns 2
-         *     initialValue(y, [a1]) throws an IllegalArgumentException
-         *     initialValue(y, [b1]) returns 3
-         *     initialValue(y, [b2]) returns -2
-         */
-
-        model.eAllContents().forEachRemaining((obj) -> {
-            if (obj instanceof Parameter) {
-                Parameter parameter = (Parameter)obj;
+    Assertions.assertNotNull(model);
+    Assertions.assertTrue(
+        model.eResource().getErrors().isEmpty(),
+        "Encountered unexpected error while parsing: " + model.eResource().getErrors());
+
+    var map = getInsts(model);
+
+    /* Check for this:
+     *     initialValue(x, null) returns 1
+     *     initialValue(x, [a1]) returns 2
+     *     initialValue(x, [a2]) returns -1
+     *     initialValue(x, [a1, b1]) returns 3
+     *     initialValue(x, [a2, b1]) returns -1
+     *     initialValue(x, [a1, b2]) returns -2
+     *     initialValue(x, [a2, b2]) returns -1
+     *
+     *     initialValue(y, null) returns 2
+     *     initialValue(y, [a1]) throws an IllegalArgumentException
+     *     initialValue(y, [b1]) returns 3
+     *     initialValue(y, [b2]) returns -2
+     */
+
+    model
+        .eAllContents()
+        .forEachRemaining(
+            (obj) -> {
+              if (obj instanceof Parameter) {
+                Parameter parameter = (Parameter) obj;
                 if (parameter.getName() == "x") {
-                    var values = ASTUtils.initialValue(parameter, null);
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "1");
+                  var values = ASTUtils.initialValue(parameter, null);
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "1");
 
-                    values = ASTUtils.initialValue(parameter, List.of(map.get("a1")));
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "2");
+                  values = ASTUtils.initialValue(parameter, List.of(map.get("a1")));
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "2");
 
-                    values = ASTUtils.initialValue(parameter, List.of(map.get("a2")));
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "-1");
+                  values = ASTUtils.initialValue(parameter, List.of(map.get("a2")));
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "-1");
 
-                    values = ASTUtils.initialValue(parameter, List.of(map.get("a1"), map.get("b1")));
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "3");
+                  values = ASTUtils.initialValue(parameter, List.of(map.get("a1"), map.get("b1")));
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "3");
 
-                    values = ASTUtils.initialValue(parameter, List.of(map.get("a2"), map.get("b1")));
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "-1");
+                  values = ASTUtils.initialValue(parameter, List.of(map.get("a2"), map.get("b1")));
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "-1");
 
-                    values = ASTUtils.initialValue(parameter, List.of(map.get("a1"), map.get("b2")));
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "-2");
+                  values = ASTUtils.initialValue(parameter, List.of(map.get("a1"), map.get("b2")));
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "-2");
 
-                    values = ASTUtils.initialValue(parameter, List.of(map.get("a2"), map.get("b2")));
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "-1");
+                  values = ASTUtils.initialValue(parameter, List.of(map.get("a2"), map.get("b2")));
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "-1");
                 } else if (parameter.getName() == "y") {
-                    var values = ASTUtils.initialValue(parameter, null);
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "2");
+                  var values = ASTUtils.initialValue(parameter, null);
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "2");
 
-                    Assertions.assertThrows(IllegalArgumentException.class,
-                                            () -> ASTUtils.initialValue(parameter, List.of(map.get("a1"))));
+                  Assertions.assertThrows(
+                      IllegalArgumentException.class,
+                      () -> ASTUtils.initialValue(parameter, List.of(map.get("a1"))));
 
-                    values = ASTUtils.initialValue(parameter, List.of(map.get("b1")));
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "3");
+                  values = ASTUtils.initialValue(parameter, List.of(map.get("b1")));
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "3");
 
-                    values = ASTUtils.initialValue(parameter, List.of(map.get("b2")));
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "-2");
+                  values = ASTUtils.initialValue(parameter, List.of(map.get("b2")));
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "-2");
                 }
-            }
-        });
-    }
+              }
+            });
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaDependencyAnalysisTest.java b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaDependencyAnalysisTest.java
index d7e2af48fc..516c712498 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaDependencyAnalysisTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaDependencyAnalysisTest.java
@@ -1,33 +1,34 @@
 /* Dependency analysis unit tests. */
 
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.tests.compiler;
 
-import com.google.inject.Inject;
+import static org.lflang.ast.ASTUtils.*;
 
+import com.google.inject.Inject;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.testing.InjectWith;
@@ -44,57 +45,56 @@
 import org.lflang.lf.Model;
 import org.lflang.lf.Reactor;
 import org.lflang.tests.LFInjectorProvider;
-import static org.lflang.ast.ASTUtils.*;
 
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
 
 /**
  * A collection of tests to ensure dependency analysis is done correctly.
+ *
  * @author Marten Lohstroh
  */
 class LinguaFrancaDependencyAnalysisTest {
-	@Inject
-    ParseHelper<Model> parser;
-
-    /**
-     * Check that circular dependencies between reactions are detected.
-     */
-    @Test
-    public void cyclicDependency() throws Exception {
-        // Java 17:
-//         String testCase = """
-//             target C;
-//
-//             reactor Clock {
-//                 timer t(0, 10 msec);
-//                 input x:int;
-//                 output y:int;
-//                 reaction(t) -> y {=
-//
-//                 =}
-//                 reaction(x) -> y {=
-//
-//                 =}
-//             }
-//
-//             reactor A {
-//                 input x:int;
-//                 output y:int;
-//                 reaction(x) -> y {=
-//
-//                 =}
-//             }
-//
-//             main reactor Loop {
-//                 c = new Clock();
-//                 a = new A();
-//                 c.y -> a.x;
-//                 a.y -> c.x;
-//             }
-//         """
-// Java 11:
-        String testCase = String.join(System.getProperty("line.separator"),
+  @Inject ParseHelper<Model> parser;
+
+  /** Check that circular dependencies between reactions are detected. */
+  @Test
+  public void cyclicDependency() throws Exception {
+    // Java 17:
+    //         String testCase = """
+    //             target C;
+    //
+    //             reactor Clock {
+    //                 timer t(0, 10 msec);
+    //                 input x:int;
+    //                 output y:int;
+    //                 reaction(t) -> y {=
+    //
+    //                 =}
+    //                 reaction(x) -> y {=
+    //
+    //                 =}
+    //             }
+    //
+    //             reactor A {
+    //                 input x:int;
+    //                 output y:int;
+    //                 reaction(x) -> y {=
+    //
+    //                 =}
+    //             }
+    //
+    //             main reactor Loop {
+    //                 c = new Clock();
+    //                 a = new A();
+    //                 c.y -> a.x;
+    //                 a.y -> c.x;
+    //             }
+    //         """
+    // Java 11:
+    String testCase =
+        String.join(
+            System.getProperty("line.separator"),
             "target C;",
             "",
             "reactor Clock {",
@@ -122,38 +122,37 @@ public void cyclicDependency() throws Exception {
             "    a = new A();",
             "    c.y -> a.x;",
             "    a.y -> c.x;",
-            "}"
-        );
-        Model model = parser.parse(testCase);
-
-        Assertions.assertNotNull(model);
-        Instantiation mainDef = null;
-        TreeIterator<EObject> it = model.eResource().getAllContents();
-        while (it.hasNext()) {
-            EObject obj = it.next();
-            if (!(obj instanceof Reactor)) {
-                continue;
-            }
-            Reactor reactor = (Reactor) obj;
-            if (reactor.isMain()) {
-                // Creating an definition for the main reactor because
-                // there isn't one.
-                mainDef = LfFactory.eINSTANCE.createInstantiation();
-                mainDef.setName(reactor.getName());
-                mainDef.setReactorClass(reactor);
-            }
-        }
-
-        ReactorInstance instance = new ReactorInstance(toDefinition(mainDef.getReactorClass()), new DefaultErrorReporter());
-        Assertions.assertFalse(instance.getCycles().isEmpty());
+            "}");
+    Model model = parser.parse(testCase);
+
+    Assertions.assertNotNull(model);
+    Instantiation mainDef = null;
+    TreeIterator<EObject> it = model.eResource().getAllContents();
+    while (it.hasNext()) {
+      EObject obj = it.next();
+      if (!(obj instanceof Reactor)) {
+        continue;
+      }
+      Reactor reactor = (Reactor) obj;
+      if (reactor.isMain()) {
+        // Creating an definition for the main reactor because
+        // there isn't one.
+        mainDef = LfFactory.eINSTANCE.createInstantiation();
+        mainDef.setName(reactor.getName());
+        mainDef.setReactorClass(reactor);
+      }
     }
 
-    /**
-     * Check that circular instantiations are detected.
-     */
-    @Test
-    public void circularInstantiation() throws Exception {
-        String testCase = """
+    ReactorInstance instance =
+        new ReactorInstance(toDefinition(mainDef.getReactorClass()), new DefaultErrorReporter());
+    Assertions.assertFalse(instance.getCycles().isEmpty());
+  }
+
+  /** Check that circular instantiations are detected. */
+  @Test
+  public void circularInstantiation() throws Exception {
+    String testCase =
+        """
              target C;
 
              reactor X {
@@ -167,14 +166,13 @@ public void circularInstantiation() throws Exception {
                  q = new X();
              }
          """;
-        Model model = parser.parse(testCase);
-
-        Assertions.assertNotNull(model);
+    Model model = parser.parse(testCase);
 
-		ModelInfo info = new ModelInfo();
-		info.update(model, new DefaultErrorReporter());
-		Assertions.assertTrue(info.instantiationGraph.hasCycles() == true,
-        	"Did not detect cyclic instantiation.");
-    }
+    Assertions.assertNotNull(model);
 
+    ModelInfo info = new ModelInfo();
+    info.update(model, new DefaultErrorReporter());
+    Assertions.assertTrue(
+        info.instantiationGraph.hasCycles() == true, "Did not detect cyclic instantiation.");
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaParsingTest.java b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaParsingTest.java
index fc66c7ed57..377e3e7a32 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaParsingTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaParsingTest.java
@@ -1,66 +1,63 @@
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.tests.compiler;
 
+import com.google.inject.Inject;
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.eclipse.xtext.testing.util.ParseHelper;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.lflang.lf.Model;
 import org.lflang.tests.LFInjectorProvider;
 
-import com.google.inject.Inject;
-
-/**
- * Test harness for ensuring that grammar captures
- * all corner cases.
- */
+/** Test harness for ensuring that grammar captures all corner cases. */
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
 class LinguaFrancaParsingTest {
-    @Inject
-    ParseHelper<Model> parser;
+  @Inject ParseHelper<Model> parser;
 
-    @Test
-    public void checkForTarget() throws Exception {
-        String testCase = """
+  @Test
+  public void checkForTarget() throws Exception {
+    String testCase =
+        """
             targett C;
             reactor Foo {
             }
         """;
-        Model result = parser.parse(testCase);
-        Assertions.assertNotNull(result);
-        Assertions.assertFalse(result.eResource().getErrors().isEmpty(), "Failed to catch misspelled target keyword.");
-    }
+    Model result = parser.parse(testCase);
+    Assertions.assertNotNull(result);
+    Assertions.assertFalse(
+        result.eResource().getErrors().isEmpty(), "Failed to catch misspelled target keyword.");
+  }
 
-    @Test
-    public void testAttributes() throws Exception {
-        String testCase = """
+  @Test
+  public void testAttributes() throws Exception {
+    String testCase =
+        """
                 target C;
                 @label("somethign", "else")
                 @ohio()
@@ -74,16 +71,17 @@ public void testAttributes() throws Exception {
 
                 }
             """;
-        parseWithoutError(testCase);
-    }
+    parseWithoutError(testCase);
+  }
 
-    @Test
-    public void testAttributeContexts() throws Exception {
-        String testCase = """
+  @Test
+  public void testAttributeContexts() throws Exception {
+    String testCase =
+        """
                 target C;
                 @a
                 main reactor(@b parm: int) {
-                
+
                     @ohio reaction() {==}
                     @ohio logical action f;
                     @ohio timer t;
@@ -91,28 +89,28 @@ main reactor(@b parm: int) {
                     @ohio output q2: int;
                 }
             """;
-        parseWithoutError(testCase);
-    }
+    parseWithoutError(testCase);
+  }
 
-    @Test
-    public void testTokenizeEmptyWidth() throws Exception {
-        String testCase = """
+  @Test
+  public void testTokenizeEmptyWidth() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     state foo: int[];
                     state foo: int[   ]; //spaces are allowed
                 }
             """;
-        parseWithoutError(testCase);
-    }
-
-    private Model parseWithoutError(String s) throws Exception {
-        Model model = parser.parse(s);
-        Assertions.assertNotNull(model);
-        Assertions.assertTrue(model.eResource().getErrors().isEmpty(),
-                              "Encountered unexpected error while parsing: " +
-                                  model.eResource().getErrors());
-        return model;
-    }
+    parseWithoutError(testCase);
+  }
 
+  private Model parseWithoutError(String s) throws Exception {
+    Model model = parser.parse(s);
+    Assertions.assertNotNull(model);
+    Assertions.assertTrue(
+        model.eResource().getErrors().isEmpty(),
+        "Encountered unexpected error while parsing: " + model.eResource().getErrors());
+    return model;
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaScopingTest.java b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaScopingTest.java
index 8587675479..404d948264 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaScopingTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaScopingTest.java
@@ -1,129 +1,125 @@
 /* Scoping unit tests. */
 
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.tests.compiler;
 
 import com.google.inject.Inject;
+import com.google.inject.Provider;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
+import org.eclipse.xtext.linking.impl.XtextLinkingDiagnostic;
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.eclipse.xtext.testing.util.ParseHelper;
-import org.lflang.lf.Model;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Assertions;
 import org.eclipse.xtext.testing.validation.ValidationTestHelper;
-import org.lflang.lf.LfPackage;
-import org.eclipse.xtext.linking.impl.XtextLinkingDiagnostic;
-import org.lflang.tests.LFInjectorProvider;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.lflang.generator.LFGenerator;
-import com.google.inject.Provider;
+import org.lflang.lf.LfPackage;
+import org.lflang.lf.Model;
+import org.lflang.tests.LFInjectorProvider;
 
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
 
 /**
- * Test harness for ensuring that cross-references are 
- * established correctly and reported when faulty.
+ * Test harness for ensuring that cross-references are established correctly and reported when
+ * faulty.
  */
 public class LinguaFrancaScopingTest {
-    @Inject 
-    ParseHelper<Model> parser;
-    
-    @Inject
-    LFGenerator generator;
-    
-    @Inject
-    JavaIoFileSystemAccess fileAccess;
-    
-    @Inject
-    Provider<ResourceSet> resourceSetProvider;
-    
-    @Inject
-    ValidationTestHelper validator;
-    
-    /**
-     * Ensure that invalid references to contained reactors are reported.
-     */
-    @Test
-    public void unresolvedReactorReference() throws Exception {
-// Java 17:
-//        Model model = """
-//            target C;
-//            reactor From {
-//                output y:int;
-//            }
-//            reactor To {
-//                input x:int;
-//            }
-//            
-//            main reactor {
-//                a = new From();
-//                d = new To();
-//                s.y -> d.x;
-//            }
-//        """;
-// Java 11:
-        Model model = parser.parse(String.join(
-            System.getProperty("line.separator"),
-            "target C;", 
-            "reactor From {",
-            "    output y:int;",
-            "}",
-            "reactor To {",
-            "    input x:int;",
-            "}",
-            "",
-            "main reactor {",
-            "    a = new From();",
-            "    d = new To();",
-            "    s.y -> d.x;",
-            "}"
-        ));
-                
-        Assertions.assertNotNull(model);
-        Assertions.assertTrue(model.eResource().getErrors().isEmpty(),
-            "Encountered unexpected error while parsing.");
-        validator.assertError(model, LfPackage.eINSTANCE.getVarRef(),
-            XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
-            "Couldn't resolve reference to Instantiation 's'");
-        validator.assertError(model, LfPackage.eINSTANCE.getVarRef(),
-            XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
-            "Couldn't resolve reference to Variable 'y'");
-    }
-    
-    
-    /**
-     * Ensure that invalid references to ports
-     * of contained reactors are reported.
-     */
-    @Test
-    public void unresolvedHierarchicalPortReference() throws Exception {
-        Model model = parser.parse("""
+  @Inject ParseHelper<Model> parser;
+
+  @Inject LFGenerator generator;
+
+  @Inject JavaIoFileSystemAccess fileAccess;
+
+  @Inject Provider<ResourceSet> resourceSetProvider;
+
+  @Inject ValidationTestHelper validator;
+
+  /** Ensure that invalid references to contained reactors are reported. */
+  @Test
+  public void unresolvedReactorReference() throws Exception {
+    // Java 17:
+    //        Model model = """
+    //            target C;
+    //            reactor From {
+    //                output y:int;
+    //            }
+    //            reactor To {
+    //                input x:int;
+    //            }
+    //
+    //            main reactor {
+    //                a = new From();
+    //                d = new To();
+    //                s.y -> d.x;
+    //            }
+    //        """;
+    // Java 11:
+    Model model =
+        parser.parse(
+            String.join(
+                System.getProperty("line.separator"),
+                "target C;",
+                "reactor From {",
+                "    output y:int;",
+                "}",
+                "reactor To {",
+                "    input x:int;",
+                "}",
+                "",
+                "main reactor {",
+                "    a = new From();",
+                "    d = new To();",
+                "    s.y -> d.x;",
+                "}"));
+
+    Assertions.assertNotNull(model);
+    Assertions.assertTrue(
+        model.eResource().getErrors().isEmpty(), "Encountered unexpected error while parsing.");
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getVarRef(),
+        XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
+        "Couldn't resolve reference to Instantiation 's'");
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getVarRef(),
+        XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
+        "Couldn't resolve reference to Variable 'y'");
+  }
+
+  /** Ensure that invalid references to ports of contained reactors are reported. */
+  @Test
+  public void unresolvedHierarchicalPortReference() throws Exception {
+    Model model =
+        parser.parse(
+            """
             target C;
             reactor From {
                 output y:int;
@@ -138,59 +134,73 @@ public void unresolvedHierarchicalPortReference() throws Exception {
                 a.x -> d.y;
             }
         """);
-        
-        Assertions.assertNotNull(model);
-        Assertions.assertTrue(model.eResource().getErrors().isEmpty(),
-            "Encountered unexpected error while parsing.");
-        validator.assertError(model, LfPackage.eINSTANCE.getVarRef(),
-            XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
-            "Couldn't resolve reference to Variable 'x'");
-        validator.assertError(model, LfPackage.eINSTANCE.getVarRef(),
-            XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
-            "Couldn't resolve reference to Variable 'y'");
-    }
-
-    @Test
-    public void unresolvedReferenceInTriggerClause() throws Exception {
-        Model model = parser.parse("""
+
+    Assertions.assertNotNull(model);
+    Assertions.assertTrue(
+        model.eResource().getErrors().isEmpty(), "Encountered unexpected error while parsing.");
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getVarRef(),
+        XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
+        "Couldn't resolve reference to Variable 'x'");
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getVarRef(),
+        XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
+        "Couldn't resolve reference to Variable 'y'");
+  }
+
+  @Test
+  public void unresolvedReferenceInTriggerClause() throws Exception {
+    Model model =
+        parser.parse(
+            """
             target C;
             main reactor {
                 reaction(unknown) {==}
             }
         """);
-        
-    validator.assertError(model, LfPackage.eINSTANCE.getVarRef(),
-            XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
-            "Couldn't resolve reference to Variable 'unknown'.");
-    }
-
-    @Test
-    public void unresolvedReferenceInUseClause() throws Exception {
-        Model model = parser.parse("""
+
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getVarRef(),
+        XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
+        "Couldn't resolve reference to Variable 'unknown'.");
+  }
+
+  @Test
+  public void unresolvedReferenceInUseClause() throws Exception {
+    Model model =
+        parser.parse(
+            """
             target C;
             main reactor {
                 reaction() unknown {==}
             }
         """);
-        
-        
-        validator.assertError(model, LfPackage.eINSTANCE.getVarRef(),
-            XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
-            "Couldn't resolve reference to Variable 'unknown'.");
-    }
-
-    @Test
-    public void unresolvedReferenceInEffectsClause() throws Exception {
-        Model model = parser.parse("""
+
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getVarRef(),
+        XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
+        "Couldn't resolve reference to Variable 'unknown'.");
+  }
+
+  @Test
+  public void unresolvedReferenceInEffectsClause() throws Exception {
+    Model model =
+        parser.parse(
+            """
             target C;
             main reactor {
                 reaction() -> unknown {==}
             }
         """);
 
-        validator.assertError(model, LfPackage.eINSTANCE.getVarRef(),
-            XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
-            "Couldn't resolve reference to Variable 'unknown'.");
-    }
-
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getVarRef(),
+        XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
+        "Couldn't resolve reference to Variable 'unknown'.");
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index aa285a2e32..72e3574b33 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -1,36 +1,36 @@
 /* Scoping unit tests. */
 
 /*************
- Copyright (c) 2019, The University of California at Berkeley.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
 
 package org.lflang.tests.compiler;
 
+import com.google.inject.Inject;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.eclipse.xtext.testing.util.ParseHelper;
@@ -39,7 +39,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.ArrayType;
@@ -56,12 +55,9 @@
 import org.lflang.tests.LFInjectorProvider;
 import org.lflang.util.StringUtil;
 
-import com.google.inject.Inject;
-
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
 
-
 /**
  * Collection of unit tests to ensure validation is done correctly.
  *
@@ -73,75 +69,76 @@
  */
 public class LinguaFrancaValidationTest {
 
-    @Inject
-    ParseHelper<Model> parser;
-
-    @Inject
-    ValidationTestHelper validator;
-
-    /**
-     * Helper function to parse a Lingua Franca program and expect no errors.
-     *
-     * @return A model representing the parsed string.
-     */
-    private Model parseWithoutError(String s) throws Exception {
-        Model model = parser.parse(s);
-        Assertions.assertNotNull(model);
-        Assertions.assertTrue(model.eResource().getErrors().isEmpty(),
-            "Encountered unexpected error while parsing: " +
-                model.eResource().getErrors());
-        return model;
-    }
-
-    /**
-     * Helper function to parse a Lingua Franca program and expect errors.
-     *
-     * @return A model representing the parsed string.
-     */
-    private Model parseWithError(String s) throws Exception {
-        Model model = parser.parse(s);
-        Assertions.assertNotNull(model);
-        Assertions.assertFalse(model.eResource().getErrors().isEmpty());
-        return model;
-    }
-
-    /**
-     * Ensure that duplicate identifiers for actions reported.
-     */
-    @Test
-    public void duplicateVariable() throws Exception {
-        String testCase = """
+  @Inject ParseHelper<Model> parser;
+
+  @Inject ValidationTestHelper validator;
+
+  /**
+   * Helper function to parse a Lingua Franca program and expect no errors.
+   *
+   * @return A model representing the parsed string.
+   */
+  private Model parseWithoutError(String s) throws Exception {
+    Model model = parser.parse(s);
+    Assertions.assertNotNull(model);
+    Assertions.assertTrue(
+        model.eResource().getErrors().isEmpty(),
+        "Encountered unexpected error while parsing: " + model.eResource().getErrors());
+    return model;
+  }
+
+  /**
+   * Helper function to parse a Lingua Franca program and expect errors.
+   *
+   * @return A model representing the parsed string.
+   */
+  private Model parseWithError(String s) throws Exception {
+    Model model = parser.parse(s);
+    Assertions.assertNotNull(model);
+    Assertions.assertFalse(model.eResource().getErrors().isEmpty());
+    return model;
+  }
+
+  /** Ensure that duplicate identifiers for actions reported. */
+  @Test
+  public void duplicateVariable() throws Exception {
+    String testCase =
+        """
                 target TypeScript;
                 main reactor Foo {
                     logical action bar;
                     physical action bar;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase),
-            LfPackage.eINSTANCE.getAction(),
-            null,
-            "Duplicate Variable 'bar' in Reactor 'Foo'");
-    }
-
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getAction(),
+        null,
+        "Duplicate Variable 'bar' in Reactor 'Foo'");
+  }
 
-    /**
-     * Check that reactors in C++ cannot be named preamble
-     */
-    @Test
-    public void disallowReactorCalledPreamble() throws Exception {
-        Model model_no_errors = parser.parse("""
+  /** Check that reactors in C++ cannot be named preamble */
+  @Test
+  public void disallowReactorCalledPreamble() throws Exception {
+    Model model_no_errors =
+        parser.parse(
+            """
                 target Cpp;
                 main reactor {
                 }
             """);
 
-        Model model_error_1 = parser.parse("""
+    Model model_error_1 =
+        parser.parse(
+            """
                 target Cpp;
                 reactor Preamble {
                 }
             """);
 
-        Model model_error_2 = parser.parse("""
+    Model model_error_2 =
+        parser.parse(
+            """
                 target Cpp;
                 reactor Preamble {
                 }
@@ -149,151 +146,177 @@ public void disallowReactorCalledPreamble() throws Exception {
                 }
             """);
 
-        Assertions.assertNotNull(model_no_errors);
-        Assertions.assertNotNull(model_error_1);
-        Assertions.assertNotNull(model_error_2);
-        Assertions.assertTrue(model_no_errors.eResource().getErrors().isEmpty(),
-            "Encountered unexpected error while parsing: "
-                + model_no_errors.eResource().getErrors());
-        Assertions.assertTrue(model_error_1.eResource().getErrors().isEmpty(),
-            "Encountered unexpected error while parsing: " + model_error_1.eResource().getErrors());
-        Assertions.assertTrue(model_error_2.eResource().getErrors().isEmpty(),
-            "Encountered unexpected error while parsing: " + model_error_2.eResource().getErrors());
-
-        validator.assertNoIssues(model_no_errors);
-        validator.assertError(model_error_1,
-            LfPackage.eINSTANCE.getReactor(),
-            null,
-            "Reactor cannot be named 'Preamble'");
-        validator.assertError(model_error_2,
-            LfPackage.eINSTANCE.getReactor(),
-            null,
-            "Reactor cannot be named 'Preamble'");
-    }
-
-
-    /**
-     * Ensure that "__" is not allowed at the start of an input name.
-     */
-    @Test
-    public void disallowUnderscoreInputs() throws Exception {
-        String testCase = """
+    Assertions.assertNotNull(model_no_errors);
+    Assertions.assertNotNull(model_error_1);
+    Assertions.assertNotNull(model_error_2);
+    Assertions.assertTrue(
+        model_no_errors.eResource().getErrors().isEmpty(),
+        "Encountered unexpected error while parsing: " + model_no_errors.eResource().getErrors());
+    Assertions.assertTrue(
+        model_error_1.eResource().getErrors().isEmpty(),
+        "Encountered unexpected error while parsing: " + model_error_1.eResource().getErrors());
+    Assertions.assertTrue(
+        model_error_2.eResource().getErrors().isEmpty(),
+        "Encountered unexpected error while parsing: " + model_error_2.eResource().getErrors());
+
+    validator.assertNoIssues(model_no_errors);
+    validator.assertError(
+        model_error_1,
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Reactor cannot be named 'Preamble'");
+    validator.assertError(
+        model_error_2,
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Reactor cannot be named 'Preamble'");
+  }
+
+  /** Ensure that "__" is not allowed at the start of an input name. */
+  @Test
+  public void disallowUnderscoreInputs() throws Exception {
+    String testCase =
+        """
                 target TypeScript;
                 main reactor {
                     input __bar;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getInput(), null,
-            "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor definitions, and reactor instantiation) may not start with \"__\": __bar");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getInput(),
+        null,
+        "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor"
+            + " definitions, and reactor instantiation) may not start with \"__\": __bar");
+  }
 
-    @Test
-    public void disallowMainWithDifferentNameThanFile() throws Exception {
-        String testCase = """
+  @Test
+  public void disallowMainWithDifferentNameThanFile() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor Foo {}
             """;
 
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getReactor(), null,
-            "Name of main reactor must match the file name (or be omitted)");
-    }
-
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Name of main reactor must match the file name (or be omitted)");
+  }
 
-    /**
-     * Ensure that "__" is not allowed at the start of an output name.
-     */
-    @Test
-    public void disallowUnderscoreOutputs() throws Exception {
-        String testCase = """
+  /** Ensure that "__" is not allowed at the start of an output name. */
+  @Test
+  public void disallowUnderscoreOutputs() throws Exception {
+    String testCase =
+        """
             target TypeScript;
                 main reactor Foo {
                     output __bar;
                 }
             """;
 
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getOutput(), null,
-            "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor definitions, and reactor instantiation) may not start with \"__\": __bar");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getOutput(),
+        null,
+        "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor"
+            + " definitions, and reactor instantiation) may not start with \"__\": __bar");
+  }
 
-    /**
-     * Ensure that "__" is not allowed at the start of an action name.
-     */
-    @Test
-    public void disallowUnderscoreActions() throws Exception {
-        String testCase = """
+  /** Ensure that "__" is not allowed at the start of an action name. */
+  @Test
+  public void disallowUnderscoreActions() throws Exception {
+    String testCase =
+        """
                 target TypeScript;
                 main reactor Foo {
                     logical action __bar;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getAction(), null,
-            "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor definitions, and reactor instantiation) may not start with \"__\": __bar");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getAction(),
+        null,
+        "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor"
+            + " definitions, and reactor instantiation) may not start with \"__\": __bar");
+  }
 
-    /**
-     * Ensure that "__" is not allowed at the start of a timer name.
-     */
-    @Test
-    public void disallowUnderscoreTimers() throws Exception {
-        String testCase = """
+  /** Ensure that "__" is not allowed at the start of a timer name. */
+  @Test
+  public void disallowUnderscoreTimers() throws Exception {
+    String testCase =
+        """
                 target TypeScript;
                 main reactor Foo {
                     timer __bar(0);
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getTimer(), null,
-            "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor definitions, and reactor instantiation) may not start with \"__\": __bar");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getTimer(),
+        null,
+        "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor"
+            + " definitions, and reactor instantiation) may not start with \"__\": __bar");
+  }
 
-    /**
-     * Ensure that "__" is not allowed at the start of a parameter name.
-     */
-    @Test
-    public void disallowUnderscoreParameters() throws Exception {
-        String testCase = """
+  /** Ensure that "__" is not allowed at the start of a parameter name. */
+  @Test
+  public void disallowUnderscoreParameters() throws Exception {
+    String testCase =
+        """
                 target TypeScript;
                 main reactor Foo(__bar) {
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getParameter(), null,
-            "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor definitions, and reactor instantiation) may not start with \"__\": __bar");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getParameter(),
+        null,
+        "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor"
+            + " definitions, and reactor instantiation) may not start with \"__\": __bar");
+  }
 
-    /**
-     * Ensure that "__" is not allowed at the start of an state name.
-     */
-    @Test
-    public void disallowUnderscoreStates() throws Exception {
-        String testCase = """
+  /** Ensure that "__" is not allowed at the start of an state name. */
+  @Test
+  public void disallowUnderscoreStates() throws Exception {
+    String testCase =
+        """
                 target TypeScript;
                 main reactor Foo {
                     state __bar;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getStateVar(), null,
-            "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor definitions, and reactor instantiation) may not start with \"__\": __bar");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getStateVar(),
+        null,
+        "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor"
+            + " definitions, and reactor instantiation) may not start with \"__\": __bar");
+  }
 
-    /**
-     * Ensure that "__" is not allowed at the start of a reactor definition name.
-     */
-    @Test
-    public void disallowUnderscoreReactorDef() throws Exception {
-        String testCase = """
+  /** Ensure that "__" is not allowed at the start of a reactor definition name. */
+  @Test
+  public void disallowUnderscoreReactorDef() throws Exception {
+    String testCase =
+        """
                 target TypeScript;
                 reactor __Foo {
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getReactor(), null,
-            "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor definitions, and reactor instantiation) may not start with \"__\": __Foo");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor"
+            + " definitions, and reactor instantiation) may not start with \"__\": __Foo");
+  }
 
-    /**
-     * Ensure that "__" is not allowed at the start of a reactor instantiation name.
-     */
-    @Test
-    public void disallowUnderscoreReactorInstantiation() throws Exception {
-        String testCase = """
+  /** Ensure that "__" is not allowed at the start of a reactor instantiation name. */
+  @Test
+  public void disallowUnderscoreReactorInstantiation() throws Exception {
+    String testCase =
+        """
                 target TypeScript;
                 reactor Foo {
                 }
@@ -301,16 +324,19 @@ public void disallowUnderscoreReactorInstantiation() throws Exception {
                     __x = new Foo();
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getInstantiation(), null,
-            "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor definitions, and reactor instantiation) may not start with \"__\": __x");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getInstantiation(),
+        null,
+        "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor"
+            + " definitions, and reactor instantiation) may not start with \"__\": __x");
+  }
 
-    /**
-     * Disallow connection to port that is effect of reaction.
-     */
-    @Test
-    public void connectionToEffectPort() throws Exception {
-        String testCase = """
+  /** Disallow connection to port that is effect of reaction. */
+  @Test
+  public void connectionToEffectPort() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor Foo {
                     output out:int;
@@ -319,20 +345,22 @@ public void connectionToEffectPort() throws Exception {
                     output out:int;
                     x = new Foo();
                     x.out -> out;
-                    reaction(startup) -> out {=                    
+                    reaction(startup) -> out {=
                     =}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getConnection(), null,
-            "Cannot connect: Port named 'out' is already effect of a reaction.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getConnection(),
+        null,
+        "Cannot connect: Port named 'out' is already effect of a reaction.");
+  }
 
-    /**
-     * Disallow connection to port that is effect of reaction.
-     */
-    @Test
-    public void connectionToEffectPort2() throws Exception {
-        String testCase = """
+  /** Disallow connection to port that is effect of reaction. */
+  @Test
+  public void connectionToEffectPort2() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor Foo {
                     input inp:int;
@@ -344,21 +372,25 @@ public void connectionToEffectPort2() throws Exception {
                     y = new Foo();
 
                     y.out -> x.inp;
-                    reaction(startup) -> x.inp {=                    
+                    reaction(startup) -> x.inp {=
                     =}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getConnection(), null,
-            "Cannot connect: Port named 'inp' is already effect of a reaction.");
-    }
-
-    /**
-     * Allow connection to the port of a contained reactor if another port with same name is effect
-     * of a reaction.
-     */
-    @Test
-    public void connectionToEffectPort3() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getConnection(),
+        null,
+        "Cannot connect: Port named 'inp' is already effect of a reaction.");
+  }
+
+  /**
+   * Allow connection to the port of a contained reactor if another port with same name is effect of
+   * a reaction.
+   */
+  @Test
+  public void connectionToEffectPort3() throws Exception {
+    String testCase =
+        """
                 target C;
 
                 reactor Foo {
@@ -373,16 +405,17 @@ public void connectionToEffectPort3() throws Exception {
                     =}
                 }
             """;
-        validator.assertNoErrors(parseWithoutError(testCase));
-    }
+    validator.assertNoErrors(parseWithoutError(testCase));
+  }
 
-    /**
-     * Allow connection to the port of a contained reactor if another port with same name is effect
-     * of a reaction.
-     */
-    @Test
-    public void connectionToEffectPort3_5() throws Exception {
-        String testCase = """
+  /**
+   * Allow connection to the port of a contained reactor if another port with same name is effect of
+   * a reaction.
+   */
+  @Test
+  public void connectionToEffectPort3_5() throws Exception {
+    String testCase =
+        """
                 target C;
 
                 reactor Foo {
@@ -397,19 +430,23 @@ public void connectionToEffectPort3_5() throws Exception {
                     =}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getVariable(), null,
-            "Main reactor cannot have inputs.");
-    }
-
-    /**
-     * Disallow connection to the port of a contained reactor if the same port is effect of a
-     * reaction.
-     */
-    @Test
-    public void connectionToEffectPort4() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getVariable(),
+        null,
+        "Main reactor cannot have inputs.");
+  }
+
+  /**
+   * Disallow connection to the port of a contained reactor if the same port is effect of a
+   * reaction.
+   */
+  @Test
+  public void connectionToEffectPort4() throws Exception {
+    String testCase =
+        """
                 target C;
-                   
+
                 reactor Foo {
                     input in:int;
                 }
@@ -421,16 +458,18 @@ public void connectionToEffectPort4() throws Exception {
                     =}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getConnection(), null,
-            "Cannot connect: Port named 'in' is already effect of a reaction.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getConnection(),
+        null,
+        "Cannot connect: Port named 'in' is already effect of a reaction.");
+  }
 
-    /**
-     * Disallow connection of multiple ports to the same input port.
-     */
-    @Test
-    public void multipleConnectionsToInputTest() throws Exception {
-        String testCase = """
+  /** Disallow connection of multiple ports to the same input port. */
+  @Test
+  public void multipleConnectionsToInputTest() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor Source {
                     output out:int;
@@ -446,32 +485,35 @@ public void multipleConnectionsToInputTest() throws Exception {
                     src.out -> sink.in;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getConnection(), null,
-            "Cannot connect: Port named 'in' may only appear once on the right side of a connection.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getConnection(),
+        null,
+        "Cannot connect: Port named 'in' may only appear once on the right side of a connection.");
+  }
 
-    /**
-     * Detect cycles in the instantiation graph.
-     */
-    @Test
-    public void detectInstantiationCycle() throws Exception {
-        String testCase = """
+  /** Detect cycles in the instantiation graph. */
+  @Test
+  public void detectInstantiationCycle() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor Contained {
                     x = new Contained();
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getInstantiation(),
-            null, "Instantiation is part of a cycle: Contained");
-    }
-
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getInstantiation(),
+        null,
+        "Instantiation is part of a cycle: Contained");
+  }
 
-    /**
-     * Detect cycles in the instantiation graph.
-     */
-    @Test
-    public void detectInstantiationCycle2() throws Exception {
-        String testCase = """
+  /** Detect cycles in the instantiation graph. */
+  @Test
+  public void detectInstantiationCycle2() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor Intermediate {
                     x = new Contained();
@@ -481,20 +523,25 @@ public void detectInstantiationCycle2() throws Exception {
                 }
             """;
 
-        Model model = parseWithoutError(testCase);
-        validator.assertError(model, LfPackage.eINSTANCE.getInstantiation(),
-            null, "Instantiation is part of a cycle: Intermediate, Contained.");
-        validator.assertError(model, LfPackage.eINSTANCE.getInstantiation(),
-            null, "Instantiation is part of a cycle: Intermediate, Contained.");
-    }
+    Model model = parseWithoutError(testCase);
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getInstantiation(),
+        null,
+        "Instantiation is part of a cycle: Intermediate, Contained.");
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getInstantiation(),
+        null,
+        "Instantiation is part of a cycle: Intermediate, Contained.");
+  }
 
-    /**
-     * Detect causality loop.
-     */
-    @Test
-    public void detectCausalityLoop() throws Exception {
+  /** Detect causality loop. */
+  @Test
+  public void detectCausalityLoop() throws Exception {
 
-        String testCase = """
+    String testCase =
+        """
                 target C;
 
                 reactor X {
@@ -511,19 +558,24 @@ public void detectCausalityLoop() throws Exception {
                     b.y -> a.x
                 }
             """;
-        Model model = parseWithoutError(testCase);
-        validator.assertError(model, LfPackage.eINSTANCE.getReaction(),
-            null, "Reaction triggers involved in cyclic dependency in reactor X: x.");
-        validator.assertError(model, LfPackage.eINSTANCE.getReaction(),
-            null, "Reaction effects involved in cyclic dependency in reactor X: y.");
-    }
-
-    /**
-     * Let cyclic dependencies be broken by "after" clauses.
-     */
-    @Test
-    public void afterBreaksCycle() throws Exception {
-        String testCase = """
+    Model model = parseWithoutError(testCase);
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getReaction(),
+        null,
+        "Reaction triggers involved in cyclic dependency in reactor X: x.");
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getReaction(),
+        null,
+        "Reaction effects involved in cyclic dependency in reactor X: y.");
+  }
+
+  /** Let cyclic dependencies be broken by "after" clauses. */
+  @Test
+  public void afterBreaksCycle() throws Exception {
+    String testCase =
+        """
                 target C
 
                 reactor X {
@@ -541,16 +593,14 @@ public void afterBreaksCycle() throws Exception {
                 }
             """;
 
-        validator.assertNoErrors(parseWithoutError(testCase));
-    }
-
+    validator.assertNoErrors(parseWithoutError(testCase));
+  }
 
-    /**
-     * Let cyclic dependencies be broken by "after" clauses with zero delay.
-     */
-    @Test
-    public void afterBreaksCycle2() throws Exception {
-        String testCase = """
+  /** Let cyclic dependencies be broken by "after" clauses with zero delay. */
+  @Test
+  public void afterBreaksCycle2() throws Exception {
+    String testCase =
+        """
                 target C
 
                 reactor X {
@@ -567,16 +617,14 @@ public void afterBreaksCycle2() throws Exception {
                     b.y -> a.x
                 }
             """;
-        validator.assertNoErrors(parseWithoutError(testCase));
-    }
+    validator.assertNoErrors(parseWithoutError(testCase));
+  }
 
-
-    /**
-     * Let cyclic dependencies be broken by "after" clauses with zero delay and no units.
-     */
-    @Test
-    public void afterBreaksCycle3() throws Exception {
-        String testCase = """
+  /** Let cyclic dependencies be broken by "after" clauses with zero delay and no units. */
+  @Test
+  public void afterBreaksCycle3() throws Exception {
+    String testCase =
+        """
                 target C
 
                 reactor X {
@@ -593,15 +641,14 @@ public void afterBreaksCycle3() throws Exception {
                     b.y -> a.x
                 }
             """;
-        validator.assertNoErrors(parseWithoutError(testCase));
-    }
+    validator.assertNoErrors(parseWithoutError(testCase));
+  }
 
-    /**
-     * Detect missing units in "after" clauses with delay greater than zero.
-     */
-    @Test
-    public void nonzeroAfterMustHaveUnits() throws Exception {
-        String testCase = """
+  /** Detect missing units in "after" clauses with delay greater than zero. */
+  @Test
+  public void nonzeroAfterMustHaveUnits() throws Exception {
+    String testCase =
+        """
                 target C
 
                 reactor X {
@@ -617,17 +664,18 @@ public void nonzeroAfterMustHaveUnits() throws Exception {
                     a.y -> b.x after 1
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getConnection(),
-            null, "Missing time unit.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getConnection(),
+        null,
+        "Missing time unit.");
+  }
 
-
-    /**
-     * Report non-zero time value without units.
-     */
-    @Test
-    public void nonZeroTimeValueWithoutUnits() throws Exception {
-        String testCase = """
+  /** Report non-zero time value without units. */
+  @Test
+  public void nonZeroTimeValueWithoutUnits() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     timer t(42, 1 sec);
@@ -636,15 +684,15 @@ public void nonZeroTimeValueWithoutUnits() throws Exception {
                     =}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getTimer(), null, "Missing time unit.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase), LfPackage.eINSTANCE.getTimer(), null, "Missing time unit.");
+  }
 
-    /**
-     * Report reference to non-time parameter in time argument.
-     */
-    @Test
-    public void parameterTypeMismatch() throws Exception {
-        String testCase = """
+  /** Report reference to non-time parameter in time argument. */
+  @Test
+  public void parameterTypeMismatch() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor (p:int(0)) {
                     timer t(p, 1 sec);
@@ -653,16 +701,18 @@ main reactor (p:int(0)) {
                     =}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getTimer(),
-            null, "Referenced parameter is not of time type.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getTimer(),
+        null,
+        "Referenced parameter is not of time type.");
+  }
 
-    /**
-     * Report inappropriate literal in time argument.
-     */
-    @Test
-    public void targetCodeInTimeArgument() throws Exception {
-        String testCase = """
+  /** Report inappropriate literal in time argument. */
+  @Test
+  public void targetCodeInTimeArgument() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     timer t({=foo()=}, 1 sec);
@@ -671,17 +721,15 @@ public void targetCodeInTimeArgument() throws Exception {
                     =}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getTimer(),
-            null, "Invalid time value.");
-    }
-
+    validator.assertError(
+        parseWithoutError(testCase), LfPackage.eINSTANCE.getTimer(), null, "Invalid time value.");
+  }
 
-    /**
-     * Report overflowing deadline.
-     */
-    @Test
-    public void overflowingDeadlineC() throws Exception {
-        String testCase = """
+  /** Report overflowing deadline. */
+  @Test
+  public void overflowingDeadlineC() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                 timer t;
@@ -691,18 +739,18 @@ public void overflowingDeadlineC() throws Exception {
                     =}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getDeadline(), null,
-            "Deadline exceeds the maximum of " + TimeValue.MAX_LONG_DEADLINE +
-                " nanoseconds.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getDeadline(),
+        null,
+        "Deadline exceeds the maximum of " + TimeValue.MAX_LONG_DEADLINE + " nanoseconds.");
+  }
 
-
-    /**
-     * Report overflowing parameter.
-     */
-    @Test
-    public void overflowingParameterC() throws Exception {
-        String testCase = """
+  /** Report overflowing parameter. */
+  @Test
+  public void overflowingParameterC() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor(d:time(40 hours)) {
                 timer t;
@@ -712,18 +760,20 @@ main reactor(d:time(40 hours)) {
                     =}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getParameter(), null,
-            "Time value used to specify a deadline exceeds the maximum of " +
-                TimeValue.MAX_LONG_DEADLINE + " nanoseconds.");
-    }
-
-
-    /**
-     * Report overflowing assignment.
-     */
-    @Test
-    public void overflowingAssignmentC() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getParameter(),
+        null,
+        "Time value used to specify a deadline exceeds the maximum of "
+            + TimeValue.MAX_LONG_DEADLINE
+            + " nanoseconds.");
+  }
+
+  /** Report overflowing assignment. */
+  @Test
+  public void overflowingAssignmentC() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor Print(d:time(39 hours)) {
                     timer t;
@@ -736,17 +786,20 @@ reactor Print(d:time(39 hours)) {
                     p = new Print(d=40 hours);
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getAssignment(), null,
-            "Time value used to specify a deadline exceeds the maximum of " +
-                TimeValue.MAX_LONG_DEADLINE + " nanoseconds.");
-    }
-
-    /**
-     * Report missing trigger.
-     */
-    @Test
-    public void missingTrigger() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getAssignment(),
+        null,
+        "Time value used to specify a deadline exceeds the maximum of "
+            + TimeValue.MAX_LONG_DEADLINE
+            + " nanoseconds.");
+  }
+
+  /** Report missing trigger. */
+  @Test
+  public void missingTrigger() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor X {
                     reaction() {=
@@ -754,112 +807,148 @@ public void missingTrigger() throws Exception {
                     =}
                 }
             """;
-        validator.assertWarning(parseWithoutError(testCase), LfPackage.eINSTANCE.getReaction(), null,
-            "Reaction has no trigger.");
-    }
+    validator.assertWarning(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReaction(),
+        null,
+        "Reaction has no trigger.");
+  }
 
-    /**
-     * Test warnings and errors for the target dependent preamble visibility qualifiers
-     */
-    @Test
-    public void testPreambleVisibility() throws Exception {
-        for (Target target : Target.values()) {
-            for (Visibility visibility : Visibility.values()) {
-                Model model_reactor_scope = parseWithoutError("""
+  /** Test warnings and errors for the target dependent preamble visibility qualifiers */
+  @Test
+  public void testPreambleVisibility() throws Exception {
+    for (Target target : Target.values()) {
+      for (Visibility visibility : Visibility.values()) {
+        Model model_reactor_scope =
+            parseWithoutError(
+                """
                         target %s;
                         reactor Foo {
                             %spreamble {==}
                         }
-                    """.formatted(target, visibility != Visibility.NONE ? visibility + " " : ""));
+                    """
+                    .formatted(target, visibility != Visibility.NONE ? visibility + " " : ""));
 
-                Model model_file_scope = parseWithoutError("""
+        Model model_file_scope =
+            parseWithoutError(
+                """
                         target %s;
                         %spreamble {==}
                         reactor Foo {
                         }
-                    """.formatted(target, visibility != Visibility.NONE ? visibility + " " : ""));
+                    """
+                    .formatted(target, visibility != Visibility.NONE ? visibility + " " : ""));
 
-                Model model_no_preamble = parseWithoutError("""
+        Model model_no_preamble =
+            parseWithoutError(
+                """
                         target %s;
                         reactor Foo {
                         }
-                    """.formatted(target));
-
-                validator.assertNoIssues(model_no_preamble);
-
-                if (target == Target.CPP) {
-                    if (visibility == Visibility.NONE) {
-                        validator.assertError(model_file_scope, LfPackage.eINSTANCE.getPreamble(), null,
-                            "Preambles for the C++ target need a visibility qualifier (private or public)!");
-                        validator.assertError(model_reactor_scope, LfPackage.eINSTANCE.getPreamble(), null,
-                            "Preambles for the C++ target need a visibility qualifier (private or public)!");
-                    } else {
-                        validator.assertNoIssues(model_file_scope);
-                        validator.assertNoIssues(model_reactor_scope);
-                    }
-                } else {
-                    if (visibility == Visibility.NONE) {
-                        validator.assertNoIssues(model_file_scope);
-                        validator.assertNoIssues(model_reactor_scope);
-                    } else {
-                        validator.assertWarning(model_file_scope, LfPackage.eINSTANCE.getPreamble(), null,
-                            String.format("The %s qualifier has no meaning for the %s target. It should be removed.", visibility, target.name()));
-                        validator.assertWarning(model_reactor_scope, LfPackage.eINSTANCE.getPreamble(), null,
-                            String.format("The %s qualifier has no meaning for the %s target. It should be removed.", visibility, target.name()));
-                    }
-                }
-            }
+                    """
+                    .formatted(target));
+
+        validator.assertNoIssues(model_no_preamble);
+
+        if (target == Target.CPP) {
+          if (visibility == Visibility.NONE) {
+            validator.assertError(
+                model_file_scope,
+                LfPackage.eINSTANCE.getPreamble(),
+                null,
+                "Preambles for the C++ target need a visibility qualifier (private or public)!");
+            validator.assertError(
+                model_reactor_scope,
+                LfPackage.eINSTANCE.getPreamble(),
+                null,
+                "Preambles for the C++ target need a visibility qualifier (private or public)!");
+          } else {
+            validator.assertNoIssues(model_file_scope);
+            validator.assertNoIssues(model_reactor_scope);
+          }
+        } else {
+          if (visibility == Visibility.NONE) {
+            validator.assertNoIssues(model_file_scope);
+            validator.assertNoIssues(model_reactor_scope);
+          } else {
+            validator.assertWarning(
+                model_file_scope,
+                LfPackage.eINSTANCE.getPreamble(),
+                null,
+                String.format(
+                    "The %s qualifier has no meaning for the %s target. It should be removed.",
+                    visibility, target.name()));
+            validator.assertWarning(
+                model_reactor_scope,
+                LfPackage.eINSTANCE.getPreamble(),
+                null,
+                String.format(
+                    "The %s qualifier has no meaning for the %s target. It should be removed.",
+                    visibility, target.name()));
+          }
         }
+      }
     }
+  }
 
-    @Test
-    public void testInheritanceSupport() throws Exception {
-        for (Target target : Target.values()) {
-            Model model = parseWithoutError("""
+  @Test
+  public void testInheritanceSupport() throws Exception {
+    for (Target target : Target.values()) {
+      Model model =
+          parseWithoutError(
+              """
                     target %s
                     reactor A{}
                     reactor B extends A{}
-                """.formatted(target));
-
-            if (target.supportsInheritance()) {
-                validator.assertNoIssues(model);
-            } else {
-                validator.assertError(model, LfPackage.eINSTANCE.getReactor(), null,
-                    "The " + target.getDisplayName() + " target does not support reactor inheritance.");
-            }
-        }
+                """
+                  .formatted(target));
+
+      if (target.supportsInheritance()) {
+        validator.assertNoIssues(model);
+      } else {
+        validator.assertError(
+            model,
+            LfPackage.eINSTANCE.getReactor(),
+            null,
+            "The " + target.getDisplayName() + " target does not support reactor inheritance.");
+      }
     }
+  }
 
-    @Test
-    public void testFederationSupport() throws Exception {
-        for (Target target : Target.values()) {
-            Model model = parseWithoutError("""
+  @Test
+  public void testFederationSupport() throws Exception {
+    for (Target target : Target.values()) {
+      Model model =
+          parseWithoutError(
+              """
                     target %s
                     federated reactor {}
-                """.formatted(target));
-
-            if (target.supportsFederated()) {
-                validator.assertNoIssues(model);
-            } else {
-                validator.assertError(model, LfPackage.eINSTANCE.getReactor(), null,
-                    "The " + target.getDisplayName() + " target does not support federated execution.");
-            }
-        }
+                """
+                  .formatted(target));
+
+      if (target.supportsFederated()) {
+        validator.assertNoIssues(model);
+      } else {
+        validator.assertError(
+            model,
+            LfPackage.eINSTANCE.getReactor(),
+            null,
+            "The " + target.getDisplayName() + " target does not support federated execution.");
+      }
     }
+  }
 
-
-    /**
-     * Tests for state and parameter declarations, including native lists.
-     */
-    @Test
-    public void stateAndParameterDeclarationsInC() throws Exception {
-        String testCase = """
+  /** Tests for state and parameter declarations, including native lists. */
+  @Test
+  public void stateAndParameterDeclarationsInC() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor Bar(a(0),                // ERROR: type missing
                             b:int,               // ERROR: uninitialized
                             t:time = 42,          // ERROR: units missing
                             x:int = 0,
-                            h:time = "bla",       // ERROR: not a type 
+                            h:time = "bla",       // ERROR: not a type
                             q:time(1 msec, 2 msec),  // ERROR: not a list
                             y:int = t             // ERROR: init using parameter
                 ) {
@@ -870,878 +959,1039 @@ reactor Bar(a(0),                // ERROR: type missing
                 }
             """;
 
-        Model model = parseWithoutError(testCase);
-
-
-        validator.assertError(model, LfPackage.eINSTANCE.getParameter(), null,
-            "Type declaration missing.");
-        validator.assertError(model, LfPackage.eINSTANCE.getParameter(), null,
-            "Parameter must have a default value.");
-        validator.assertError(model, LfPackage.eINSTANCE.getParameter(), null,
-            "Missing time unit.");
-        validator.assertError(model, LfPackage.eINSTANCE.getParameter(), null,
-            "Invalid time value.");
-        validator.assertError(model, LfPackage.eINSTANCE.getParameter(), null,
-            "Expected exactly one time value.");
-        validator.assertError(model, LfPackage.eINSTANCE.getParameter(), null,
-            "Parameter cannot be initialized using parameter.");
-        validator.assertError(model, LfPackage.eINSTANCE.getStateVar(), null,
-            "Missing time unit.");
-        validator.assertError(model, LfPackage.eINSTANCE.getStateVar(), null,
-            "Referenced parameter is not of time type.");
-        validator.assertError(model, LfPackage.eINSTANCE.getStateVar(), null,
-            "Invalid time value.");
-        validator.assertError(model, LfPackage.eINSTANCE.getTimer(), null,
-            "Missing time unit.");
-    }
-
-
-    /**
-     * Recognize valid IPV4 addresses, report invalid ones.
-     */
-    @Test
-    public void recognizeIPV4() throws Exception {
-        List<String> correct = List.of("127.0.0.1", "10.0.0.1", "192.168.1.1", "0.0.0.0", "192.168.1.1");
-        List<String> parseError = List.of("10002.3.4", "1.2.3.4.5");
-        List<String> validationError = List.of("256.0.0.0", "260.0.0.0");
-
-        // Correct IP addresses.
-        for (String addr : correct) {
-
-            String testCase = """
+    Model model = parseWithoutError(testCase);
+
+    validator.assertError(
+        model, LfPackage.eINSTANCE.getParameter(), null, "Type declaration missing.");
+    validator.assertError(
+        model, LfPackage.eINSTANCE.getParameter(), null, "Parameter must have a default value.");
+    validator.assertError(model, LfPackage.eINSTANCE.getParameter(), null, "Missing time unit.");
+    validator.assertError(model, LfPackage.eINSTANCE.getParameter(), null, "Invalid time value.");
+    validator.assertError(
+        model, LfPackage.eINSTANCE.getParameter(), null, "Expected exactly one time value.");
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getParameter(),
+        null,
+        "Parameter cannot be initialized using parameter.");
+    validator.assertError(model, LfPackage.eINSTANCE.getStateVar(), null, "Missing time unit.");
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getStateVar(),
+        null,
+        "Referenced parameter is not of time type.");
+    validator.assertError(model, LfPackage.eINSTANCE.getStateVar(), null, "Invalid time value.");
+    validator.assertError(model, LfPackage.eINSTANCE.getTimer(), null, "Missing time unit.");
+  }
+
+  /** Recognize valid IPV4 addresses, report invalid ones. */
+  @Test
+  public void recognizeIPV4() throws Exception {
+    List<String> correct =
+        List.of("127.0.0.1", "10.0.0.1", "192.168.1.1", "0.0.0.0", "192.168.1.1");
+    List<String> parseError = List.of("10002.3.4", "1.2.3.4.5");
+    List<String> validationError = List.of("256.0.0.0", "260.0.0.0");
+
+    // Correct IP addresses.
+    for (String addr : correct) {
+
+      String testCase =
+          """
                     target C;
                     reactor Y {}
                     federated reactor X at foo@%s:4242 {
-                        y = new Y() at %s:2424; 
+                        y = new Y() at %s:2424;
                     }
-                """.formatted(addr, addr);
-            parseWithoutError(
-                testCase
-            );
-        }
+                """
+              .formatted(addr, addr);
+      parseWithoutError(testCase);
+    }
 
-        // IP addresses that don't parse.
-        for (String addr : parseError) {
-            String testCase = """
+    // IP addresses that don't parse.
+    for (String addr : parseError) {
+      String testCase =
+          """
                     target C;
                     reactor Y {}
                     federated reactor X at foo@%s:4242 {
-                        y = new Y() at %s:2424; 
+                        y = new Y() at %s:2424;
                     }
-                """.formatted(addr, addr);
-            parseWithError(testCase);
-        }
+                """
+              .formatted(addr, addr);
+      parseWithError(testCase);
+    }
 
-        // IP addresses that parse but are invalid.
-        for (String addr : validationError) {
-            Model model = parseWithoutError("""
+    // IP addresses that parse but are invalid.
+    for (String addr : validationError) {
+      Model model =
+          parseWithoutError(
+              """
                     target C;
                     reactor Y {}
                     federated reactor X at foo@%s:4242 {
-                        y = new Y() at %s:2424; 
+                        y = new Y() at %s:2424;
                     }
-                """.formatted(addr, addr));
-            validator.assertWarning(model, LfPackage.eINSTANCE.getHost(), null, "Invalid IP address.");
-        }
-    }
-
-    /**
-     * Recognize valid IPV6 addresses, report invalid ones.
-     */
-    @Test
-    public void recognizeIPV6() throws Exception {
-        List<String> correct = List.of("1:2:3:4:5:6:7:8", "1:2:3:4:5:6:7::", "1:2:3:4:5:6::8",
-            "1:2:3:4:5::8", "1:2:3:4::8", "1:2:3::8", "1:2::8", "1::8", "::8",
-            "::", "1::3:4:5:6:7:8", "1::4:5:6:7:8", "1::5:6:7:8", "1::6:7:8",
-            "1::7:8", "1::8", "1::", "1:2:3:4:5::7:8", "1:2:3:4::6:7:8",
-            "1:2:3::5:6:7:8", "1:2::4:5:6:7:8", "1::3:4:5:6:7:8",
-            "::2:3:4:5:6:7:8", "fe80::7:8", "fe80::7:8%eth0", "fe80::7:8%1",
-            "::255.255.255.255", "::ffff:255.255.255.255",
-            "::ffff:0:255.255.255.0", "::ffff:00:255.255.255.0",
-            "::ffff:000:255.255.255.0", "::ffff:0000:255.255.255.0",
-            "::ffff:0.0.0.0", "::ffff:1.2.3.4", "::ffff:10.0.0.1",
-            "1:2:3:4:5:6:77:88", "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
-            "2001:db8:3:4::192.0.2.33", "64:ff9b::192.0.2.33", "0:0:0:0:0:0:10.0.0.1");
-
-        List<String> validationError = List.of("1:2:3:4:5:6:7:8:9", "1:2:3:4:5:6::7:8",
-            "1:2:3:4:5:6:7:8:", "::1:2:3:4:5:6:7:8", "1:2:3:4:5:6:7:8::",
-            "1:2:3:4:5:6:7:88888", "2001:db8:3:4:5::192.0.2.33",
-            "fe08::7:8interface", "fe08::7:8interface", "fe08::7:8i");
-
-        List<String> parseError = List.of("fe08::7:8%", ":1:2:3:4:5:6:7:8");
-
-        // Correct IP addresses.
-        for (String addr : correct) {
-            String testCase = """
+                """
+                  .formatted(addr, addr));
+      validator.assertWarning(model, LfPackage.eINSTANCE.getHost(), null, "Invalid IP address.");
+    }
+  }
+
+  /** Recognize valid IPV6 addresses, report invalid ones. */
+  @Test
+  public void recognizeIPV6() throws Exception {
+    List<String> correct =
+        List.of(
+            "1:2:3:4:5:6:7:8",
+            "1:2:3:4:5:6:7::",
+            "1:2:3:4:5:6::8",
+            "1:2:3:4:5::8",
+            "1:2:3:4::8",
+            "1:2:3::8",
+            "1:2::8",
+            "1::8",
+            "::8",
+            "::",
+            "1::3:4:5:6:7:8",
+            "1::4:5:6:7:8",
+            "1::5:6:7:8",
+            "1::6:7:8",
+            "1::7:8",
+            "1::8",
+            "1::",
+            "1:2:3:4:5::7:8",
+            "1:2:3:4::6:7:8",
+            "1:2:3::5:6:7:8",
+            "1:2::4:5:6:7:8",
+            "1::3:4:5:6:7:8",
+            "::2:3:4:5:6:7:8",
+            "fe80::7:8",
+            "fe80::7:8%eth0",
+            "fe80::7:8%1",
+            "::255.255.255.255",
+            "::ffff:255.255.255.255",
+            "::ffff:0:255.255.255.0",
+            "::ffff:00:255.255.255.0",
+            "::ffff:000:255.255.255.0",
+            "::ffff:0000:255.255.255.0",
+            "::ffff:0.0.0.0",
+            "::ffff:1.2.3.4",
+            "::ffff:10.0.0.1",
+            "1:2:3:4:5:6:77:88",
+            "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
+            "2001:db8:3:4::192.0.2.33",
+            "64:ff9b::192.0.2.33",
+            "0:0:0:0:0:0:10.0.0.1");
+
+    List<String> validationError =
+        List.of(
+            "1:2:3:4:5:6:7:8:9",
+            "1:2:3:4:5:6::7:8",
+            "1:2:3:4:5:6:7:8:",
+            "::1:2:3:4:5:6:7:8",
+            "1:2:3:4:5:6:7:8::",
+            "1:2:3:4:5:6:7:88888",
+            "2001:db8:3:4:5::192.0.2.33",
+            "fe08::7:8interface",
+            "fe08::7:8interface",
+            "fe08::7:8i");
+
+    List<String> parseError = List.of("fe08::7:8%", ":1:2:3:4:5:6:7:8");
+
+    // Correct IP addresses.
+    for (String addr : correct) {
+      String testCase =
+          """
                     target C;
                     reactor Y {}
                     federated reactor at [foo@%s]:4242 {
-                        y = new Y() at [%s]:2424; 
+                        y = new Y() at [%s]:2424;
                     }
-                """.formatted(addr, addr);
-            Model model = parseWithoutError(testCase);
-            validator.assertNoIssues(model);
-        }
-
+                """
+              .formatted(addr, addr);
+      Model model = parseWithoutError(testCase);
+      validator.assertNoIssues(model);
+    }
 
-        // IP addresses that don't parse.
-        for (String addr : parseError) {
-            String testCase = """
+    // IP addresses that don't parse.
+    for (String addr : parseError) {
+      String testCase =
+          """
                     target C;
                     reactor Y {}
                     federated reactor X at [foo@%s]:4242 {
-                        y = new Y() at [%s]:2424; 
+                        y = new Y() at [%s]:2424;
                     }
-                """.formatted(addr, addr);
-            parseWithError(testCase);
-        }
+                """
+              .formatted(addr, addr);
+      parseWithError(testCase);
+    }
 
-        // IP addresses that parse but are invalid.
-        for (String addr : validationError) {
-            String testCase = """
+    // IP addresses that parse but are invalid.
+    for (String addr : validationError) {
+      String testCase =
+          """
                     target C;
                     reactor Y {}
                     federated reactor X at [foo@%s]:4242 {
-                        y = new Y() at [%s]:2424; 
+                        y = new Y() at [%s]:2424;
                     }
-                """.formatted(addr, addr);
-            Model model = parseWithoutError(
-                testCase
-            );
-            validator.assertWarning(model, LfPackage.eINSTANCE.getHost(), null, "Invalid IP address.");
-        }
+                """
+              .formatted(addr, addr);
+      Model model = parseWithoutError(testCase);
+      validator.assertWarning(model, LfPackage.eINSTANCE.getHost(), null, "Invalid IP address.");
     }
+  }
 
-    /**
-     * Recognize valid host names and fully qualified names, report invalid ones.
-     */
-    @Test
-    public void recognizeHostNames() throws Exception {
-
-        List<String> correct = List.of("localhost"); // FIXME: add more
+  /** Recognize valid host names and fully qualified names, report invalid ones. */
+  @Test
+  public void recognizeHostNames() throws Exception {
 
-        List<String> validationError = List.of("x.y.z"); // FIXME: add more
+    List<String> correct = List.of("localhost"); // FIXME: add more
 
-        List<String> parseError = List.of("..xyz"); // FIXME: add more
+    List<String> validationError = List.of("x.y.z"); // FIXME: add more
 
+    List<String> parseError = List.of("..xyz"); // FIXME: add more
 
-        // Correct names.
-        for (String addr : correct) {
-            String testCase = """
+    // Correct names.
+    for (String addr : correct) {
+      String testCase =
+          """
                     target C;
                     reactor Y {}
                     federated reactor X at foo@%s:4242 {
-                        y = new Y() at %s:2424; 
+                        y = new Y() at %s:2424;
                     }
-                """.formatted(addr, addr);
-            parseWithoutError(
-                testCase
-            );
-        }
+                """
+              .formatted(addr, addr);
+      parseWithoutError(testCase);
+    }
 
-        // Names that don't parse.
-        for (String addr : parseError) {
-            String testCase = """
+    // Names that don't parse.
+    for (String addr : parseError) {
+      String testCase =
+          """
                     target C;
                     reactor Y {}
                     federated reactor X at foo@%s:4242 {
-                        y = new Y() at %s:2424; 
+                        y = new Y() at %s:2424;
                     }
-                """.formatted(addr, addr);
-            parseWithError(
-                testCase
-            );
-        }
+                """
+              .formatted(addr, addr);
+      parseWithError(testCase);
+    }
 
-        // Names that parse but are invalid.
-        for (String addr : validationError) {
-            String testCase = """
+    // Names that parse but are invalid.
+    for (String addr : validationError) {
+      String testCase =
+          """
                     target C;
                     reactor Y {}
                     federated reactor X at foo@%s:4242 {
-                        y = new Y() at %s:2424; 
+                        y = new Y() at %s:2424;
                     }
-                """.formatted(addr, addr);
-            Model model = parseWithoutError(
-                testCase
-            );
-            validator.assertWarning(model, LfPackage.eINSTANCE.getHost(), null,
-                "Invalid host name or fully qualified domain name.");
-        }
-    }
-
-    /**
-     * Maps a type to a list of known good values.
-     */
-    Map<PrimitiveType, List<String>> primitiveTypeToKnownGood = Map.of(
-        PrimitiveType.BOOLEAN, List.of("true", "\"true\"", "false", "\"false\""),
-        PrimitiveType.INTEGER, List.of("0", "1", "\"42\"", "\"-1\"", "-2"),
-        PrimitiveType.NON_NEGATIVE_INTEGER, List.of("0", "1", "42"),
-        PrimitiveType.TIME_VALUE, List.of("1 msec", "2 sec"),
-        PrimitiveType.STRING, List.of("1", "\"foo\"", "bar"),
-        PrimitiveType.FILE, List.of("valid.file", "something.json", "\"foobar.proto\"")
-    );
-
-    /**
-     * Maps a type to a list of known bad values.
-     */
-    Map<PrimitiveType, List<String>> primitiveTypeToKnownBad = Map.of(
-        PrimitiveType.BOOLEAN, List.of("1 sec", "foo", "\"foo\"", "[1]", "{baz: 42}", "'c'"),
-        PrimitiveType.INTEGER, List.of("foo", "\"bar\"", "1 sec", "[1, 2]", "{foo: \"bar\"}", "'c'"),
-        PrimitiveType.NON_NEGATIVE_INTEGER, List.of("-42", "foo", "\"bar\"", "1 sec", "[1, 2]", "{foo: \"bar\"}", "'c'"),
-        PrimitiveType.TIME_VALUE, List.of("foo", "\"bar\"", "\"3 sec\"", "\"4 weeks\"", "[1, 2]", "{foo: \"bar\"}", "'c'"),
-        PrimitiveType.STRING, List.of("1 msec", "[1, 2]", "{foo: \"bar\"}", "'c'")
-    );
-
-    /**
-     * Maps a type to a list, each entry of which represents a list with
-     * three entries: a known wrong value, the suffix to add to the reported
-     * name, and the type that it should be.
-     */
-    Map<TargetPropertyType, List<List<Object>>> compositeTypeToKnownBad = Map.of(
-        ArrayType.STRING_ARRAY, List.of(
-            List.of("[1 msec]", "[0]", PrimitiveType.STRING),
-            List.of("[foo, {bar: baz}]", "[1]", PrimitiveType.STRING),
-            List.of("{bar: baz}", "", ArrayType.STRING_ARRAY)
-        ),
-        UnionType.STRING_OR_STRING_ARRAY, List.of(
-            List.of("[1 msec]", "[0]", PrimitiveType.STRING),
-            List.of("[foo, {bar: baz}]", "[1]", PrimitiveType.STRING),
-            List.of("{bar: baz}", "", UnionType.STRING_OR_STRING_ARRAY)
-        ),
-        UnionType.PLATFORM_STRING_OR_DICTIONARY, List.of(
-            List.of("[bar, baz]", "", UnionType.PLATFORM_STRING_OR_DICTIONARY),
-            List.of("{name: [1, 2, 3]}", ".name", PrimitiveType.STRING),
-            List.of("{name: {bar: baz}}", ".name", PrimitiveType.STRING),
-            List.of("{board: [1, 2, 3]}", ".board", PrimitiveType.STRING),
-            List.of("{board: {bar: baz}}", ".board", PrimitiveType.STRING),
-            List.of("{baud-rate: [1, 2, 3]}", ".baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER),
-            List.of("{baud-rate: {bar: baz}}", ".baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER)
-        ),
-        UnionType.FILE_OR_FILE_ARRAY, List.of(
-            List.of("[1 msec]", "[0]", PrimitiveType.FILE),
-            List.of("[foo, {bar: baz}]", "[1]", PrimitiveType.FILE),
-            List.of("{bar: baz}", "", UnionType.FILE_OR_FILE_ARRAY)
-        ),
-        UnionType.DOCKER_UNION, List.of(
-            List.of("foo", "", UnionType.DOCKER_UNION),
-            List.of("[1]", "", UnionType.DOCKER_UNION),
-            List.of("{bar: baz}", "", DictionaryType.DOCKER_DICT),
-            List.of("{FROM: [1, 2, 3]}", ".FROM", PrimitiveType.STRING)
-        ),
-        UnionType.TRACING_UNION, List.of(
-            List.of("foo", "", UnionType.TRACING_UNION),
-            List.of("[1]", "", UnionType.TRACING_UNION),
-            List.of("{bar: baz}", "", DictionaryType.TRACING_DICT),
-            List.of("{trace-file-name: [1, 2, 3]}", ".trace-file-name", PrimitiveType.STRING)
-        )
-    );
-
-    /**
-     * Given an array type, return a list of good or bad examples,
-     * depending on the value of the second parameter.
-     */
-    private List<String> synthesizeExamples(ArrayType type, boolean correct) {
-        Map<PrimitiveType, List<String>> values = correct ? primitiveTypeToKnownGood
-            : primitiveTypeToKnownBad;
-        List<String> examples = new LinkedList<>();
-        if (correct) {
-            // Produce an array that has an entry for each value.
-            List<String> entries = values.get(type.type);
-            if (!(entries == null || entries.isEmpty())) {
-                examples.add(String.format("[%s]", String.join(", ", entries)));
-            }
-        }
-        return examples;
-    }
-
-    /**
-     * Given an union type, return a list of good or bad examples,
-     * depending on the value of the second parameter.
-     */
-    private List<String> synthesizeExamples(UnionType type, boolean correct) {
-        List<String> examples = new LinkedList<>();
-        if (correct) {
-            for (Enum<?> it : type.options) {
-                if (it instanceof TargetPropertyType) {
-                    synthesizeExamples((TargetPropertyType) it, correct).forEach(ex -> examples.add(ex));
-                } else {
-                    examples.add(it.toString());
-                }
-            }
-        } else {
-            // Return some obviously bad examples for the common
-            // case where the options are from an ordinary Enum<?>.
-            if (!type.options.stream().anyMatch(it -> it instanceof TargetPropertyType)) {
-                return List.of("foo", "\"bar\"", "1", "-1", "{x: 42}", "[1, 2, 3]");
-            }
-        }
-        return examples;
-    }
-
-    /**
-     * Given an union type, return a list of good or bad examples,
-     * depending on the value of the second parameter.
-     */
-    private List<String> synthesizeExamples(DictionaryType type, boolean correct) {
-        List<String> examples = new LinkedList<>();
-        // Produce a set of singleton dictionaries.
-        // If incorrect examples are wanted, garble the key.
-        for (DictionaryElement option : type.options) {
-            synthesizeExamples(option.getType(), correct).forEach(it -> examples.add(
-                "{" + option + (!correct ? "iamwrong: " : ": ") + it + "}"));
-        }
-        return examples;
-    }
-
-    private List<String> synthesizeExamples(StringDictionaryType type, boolean correct) {
-        List<String> examples = new LinkedList<>();
-        // Produce a set of singleton dictionaries.
-        // If incorrect examples are wanted, use non-strings for values.
-        List<String> goodStrs = synthesizeExamples(PrimitiveType.STRING, true);
-        List<String> badStrs = synthesizeExamples(PrimitiveType.STRING, false);
-        List<String> goodIDs = List.of("foo", "Bar", "__ab0_9fC", "f1o_O2B_a3r");
-        if (correct) {
-            for (String gs : goodStrs) {
-                goodIDs.forEach(it -> examples.add("{" + it + ": " + gs + "}"));
-            }
-        } else {
-            for (String bs : badStrs) {
-                goodIDs.forEach(it -> examples.add("{" + it + ": " + bs + "}"));
-            }
-        }
-        return examples;
-    }
-
-    /**
-     * Synthesize a list of values that either conform to the given type or
-     * do not, depending on whether the second argument 'correct' is true.
-     * Return an empty set if it is too complicated to generate examples
-     * (e.g., because the resulting errors are more sophisticated).
-     * <p>
-     * Not all cases are covered by this function. Currently, the only cases not
-     * covered are known bad examples for composite types, which should be added
-     * to the compositeTypeToKnownBad map.
-     *
-     * @param correct True to synthesize correct examples automatically, otherwise
-     * synthesize incorrect examples.
-     */
-    private List<String> synthesizeExamples(TargetPropertyType type, boolean correct) {
-        if (type instanceof PrimitiveType) {
-            Map<PrimitiveType, List<String>> values = correct ? primitiveTypeToKnownGood
-                : primitiveTypeToKnownBad;
-            List<String> examples = values.get(type);
-            Assertions.assertNotNull(examples);
-            return examples;
+                """
+              .formatted(addr, addr);
+      Model model = parseWithoutError(testCase);
+      validator.assertWarning(
+          model,
+          LfPackage.eINSTANCE.getHost(),
+          null,
+          "Invalid host name or fully qualified domain name.");
+    }
+  }
+
+  /** Maps a type to a list of known good values. */
+  Map<PrimitiveType, List<String>> primitiveTypeToKnownGood =
+      Map.of(
+          PrimitiveType.BOOLEAN, List.of("true", "\"true\"", "false", "\"false\""),
+          PrimitiveType.INTEGER, List.of("0", "1", "\"42\"", "\"-1\"", "-2"),
+          PrimitiveType.NON_NEGATIVE_INTEGER, List.of("0", "1", "42"),
+          PrimitiveType.TIME_VALUE, List.of("1 msec", "2 sec"),
+          PrimitiveType.STRING, List.of("1", "\"foo\"", "bar"),
+          PrimitiveType.FILE, List.of("valid.file", "something.json", "\"foobar.proto\""));
+
+  /** Maps a type to a list of known bad values. */
+  Map<PrimitiveType, List<String>> primitiveTypeToKnownBad =
+      Map.of(
+          PrimitiveType.BOOLEAN, List.of("1 sec", "foo", "\"foo\"", "[1]", "{baz: 42}", "'c'"),
+          PrimitiveType.INTEGER,
+              List.of("foo", "\"bar\"", "1 sec", "[1, 2]", "{foo: \"bar\"}", "'c'"),
+          PrimitiveType.NON_NEGATIVE_INTEGER,
+              List.of("-42", "foo", "\"bar\"", "1 sec", "[1, 2]", "{foo: \"bar\"}", "'c'"),
+          PrimitiveType.TIME_VALUE,
+              List.of(
+                  "foo", "\"bar\"", "\"3 sec\"", "\"4 weeks\"", "[1, 2]", "{foo: \"bar\"}", "'c'"),
+          PrimitiveType.STRING, List.of("1 msec", "[1, 2]", "{foo: \"bar\"}", "'c'"));
+
+  /**
+   * Maps a type to a list, each entry of which represents a list with three entries: a known wrong
+   * value, the suffix to add to the reported name, and the type that it should be.
+   */
+  Map<TargetPropertyType, List<List<Object>>> compositeTypeToKnownBad =
+      Map.of(
+          ArrayType.STRING_ARRAY,
+              List.of(
+                  List.of("[1 msec]", "[0]", PrimitiveType.STRING),
+                  List.of("[foo, {bar: baz}]", "[1]", PrimitiveType.STRING),
+                  List.of("{bar: baz}", "", ArrayType.STRING_ARRAY)),
+          UnionType.STRING_OR_STRING_ARRAY,
+              List.of(
+                  List.of("[1 msec]", "[0]", PrimitiveType.STRING),
+                  List.of("[foo, {bar: baz}]", "[1]", PrimitiveType.STRING),
+                  List.of("{bar: baz}", "", UnionType.STRING_OR_STRING_ARRAY)),
+          UnionType.PLATFORM_STRING_OR_DICTIONARY,
+              List.of(
+                  List.of("[bar, baz]", "", UnionType.PLATFORM_STRING_OR_DICTIONARY),
+                  List.of("{name: [1, 2, 3]}", ".name", PrimitiveType.STRING),
+                  List.of("{name: {bar: baz}}", ".name", PrimitiveType.STRING),
+                  List.of("{board: [1, 2, 3]}", ".board", PrimitiveType.STRING),
+                  List.of("{board: {bar: baz}}", ".board", PrimitiveType.STRING),
+                  List.of(
+                      "{baud-rate: [1, 2, 3]}", ".baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER),
+                  List.of(
+                      "{baud-rate: {bar: baz}}", ".baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER)),
+          UnionType.FILE_OR_FILE_ARRAY,
+              List.of(
+                  List.of("[1 msec]", "[0]", PrimitiveType.FILE),
+                  List.of("[foo, {bar: baz}]", "[1]", PrimitiveType.FILE),
+                  List.of("{bar: baz}", "", UnionType.FILE_OR_FILE_ARRAY)),
+          UnionType.DOCKER_UNION,
+              List.of(
+                  List.of("foo", "", UnionType.DOCKER_UNION),
+                  List.of("[1]", "", UnionType.DOCKER_UNION),
+                  List.of("{bar: baz}", "", DictionaryType.DOCKER_DICT),
+                  List.of("{FROM: [1, 2, 3]}", ".FROM", PrimitiveType.STRING)),
+          UnionType.TRACING_UNION,
+              List.of(
+                  List.of("foo", "", UnionType.TRACING_UNION),
+                  List.of("[1]", "", UnionType.TRACING_UNION),
+                  List.of("{bar: baz}", "", DictionaryType.TRACING_DICT),
+                  List.of(
+                      "{trace-file-name: [1, 2, 3]}", ".trace-file-name", PrimitiveType.STRING)));
+
+  /**
+   * Given an array type, return a list of good or bad examples, depending on the value of the
+   * second parameter.
+   */
+  private List<String> synthesizeExamples(ArrayType type, boolean correct) {
+    Map<PrimitiveType, List<String>> values =
+        correct ? primitiveTypeToKnownGood : primitiveTypeToKnownBad;
+    List<String> examples = new LinkedList<>();
+    if (correct) {
+      // Produce an array that has an entry for each value.
+      List<String> entries = values.get(type.type);
+      if (!(entries == null || entries.isEmpty())) {
+        examples.add(String.format("[%s]", String.join(", ", entries)));
+      }
+    }
+    return examples;
+  }
+
+  /**
+   * Given an union type, return a list of good or bad examples, depending on the value of the
+   * second parameter.
+   */
+  private List<String> synthesizeExamples(UnionType type, boolean correct) {
+    List<String> examples = new LinkedList<>();
+    if (correct) {
+      for (Enum<?> it : type.options) {
+        if (it instanceof TargetPropertyType) {
+          synthesizeExamples((TargetPropertyType) it, correct).forEach(ex -> examples.add(ex));
         } else {
-            if (type instanceof UnionType) {
-                return synthesizeExamples((UnionType) type, correct);
-            } else if (type instanceof ArrayType) {
-                return synthesizeExamples((ArrayType) type, correct);
-            } else if (type instanceof DictionaryType) {
-                return synthesizeExamples((DictionaryType) type, correct);
-            } else if (type instanceof StringDictionaryType) {
-                return synthesizeExamples((StringDictionaryType) type, correct);
-            } else {
-                Assertions.fail("Encountered an unknown type: " + type);
-            }
+          examples.add(it.toString());
         }
-        return new LinkedList<>();
-    }
-
-    /**
-     * Create an LF program with the given key and value as a target property,
-     * parse it, and return the resulting model.
-     */
-    private Model createModel(TargetProperty key, String value) throws Exception {
-        String target = key.supportedBy.get(0).getDisplayName();
-        System.out.printf("%s: %s%n", key, value);
-        return parseWithoutError("""
+      }
+    } else {
+      // Return some obviously bad examples for the common
+      // case where the options are from an ordinary Enum<?>.
+      if (!type.options.stream().anyMatch(it -> it instanceof TargetPropertyType)) {
+        return List.of("foo", "\"bar\"", "1", "-1", "{x: 42}", "[1, 2, 3]");
+      }
+    }
+    return examples;
+  }
+
+  /**
+   * Given an union type, return a list of good or bad examples, depending on the value of the
+   * second parameter.
+   */
+  private List<String> synthesizeExamples(DictionaryType type, boolean correct) {
+    List<String> examples = new LinkedList<>();
+    // Produce a set of singleton dictionaries.
+    // If incorrect examples are wanted, garble the key.
+    for (DictionaryElement option : type.options) {
+      synthesizeExamples(option.getType(), correct)
+          .forEach(it -> examples.add("{" + option + (!correct ? "iamwrong: " : ": ") + it + "}"));
+    }
+    return examples;
+  }
+
+  private List<String> synthesizeExamples(StringDictionaryType type, boolean correct) {
+    List<String> examples = new LinkedList<>();
+    // Produce a set of singleton dictionaries.
+    // If incorrect examples are wanted, use non-strings for values.
+    List<String> goodStrs = synthesizeExamples(PrimitiveType.STRING, true);
+    List<String> badStrs = synthesizeExamples(PrimitiveType.STRING, false);
+    List<String> goodIDs = List.of("foo", "Bar", "__ab0_9fC", "f1o_O2B_a3r");
+    if (correct) {
+      for (String gs : goodStrs) {
+        goodIDs.forEach(it -> examples.add("{" + it + ": " + gs + "}"));
+      }
+    } else {
+      for (String bs : badStrs) {
+        goodIDs.forEach(it -> examples.add("{" + it + ": " + bs + "}"));
+      }
+    }
+    return examples;
+  }
+
+  /**
+   * Synthesize a list of values that either conform to the given type or do not, depending on
+   * whether the second argument 'correct' is true. Return an empty set if it is too complicated to
+   * generate examples (e.g., because the resulting errors are more sophisticated).
+   *
+   * <p>Not all cases are covered by this function. Currently, the only cases not covered are known
+   * bad examples for composite types, which should be added to the compositeTypeToKnownBad map.
+   *
+   * @param correct True to synthesize correct examples automatically, otherwise synthesize
+   *     incorrect examples.
+   */
+  private List<String> synthesizeExamples(TargetPropertyType type, boolean correct) {
+    if (type instanceof PrimitiveType) {
+      Map<PrimitiveType, List<String>> values =
+          correct ? primitiveTypeToKnownGood : primitiveTypeToKnownBad;
+      List<String> examples = values.get(type);
+      Assertions.assertNotNull(examples);
+      return examples;
+    } else {
+      if (type instanceof UnionType) {
+        return synthesizeExamples((UnionType) type, correct);
+      } else if (type instanceof ArrayType) {
+        return synthesizeExamples((ArrayType) type, correct);
+      } else if (type instanceof DictionaryType) {
+        return synthesizeExamples((DictionaryType) type, correct);
+      } else if (type instanceof StringDictionaryType) {
+        return synthesizeExamples((StringDictionaryType) type, correct);
+      } else {
+        Assertions.fail("Encountered an unknown type: " + type);
+      }
+    }
+    return new LinkedList<>();
+  }
+
+  /**
+   * Create an LF program with the given key and value as a target property, parse it, and return
+   * the resulting model.
+   */
+  private Model createModel(TargetProperty key, String value) throws Exception {
+    String target = key.supportedBy.get(0).getDisplayName();
+    System.out.printf("%s: %s%n", key, value);
+    return parseWithoutError(
+        """
                 target %s {%s: %s};
                 reactor Y {}
                 main reactor {
-                    y = new Y() 
-                }
-            """.formatted(target, key, value));
-    }
-
-    /**
-     * Perform checks on target properties.
-     */
-    @Test
-    public void checkTargetProperties() throws Exception {
-        for (TargetProperty prop : TargetProperty.getOptions()) {
-            if (prop == TargetProperty.CARGO_DEPENDENCIES) {
-                // we test that separately as it has better error messages
-                return;
-            }
-            System.out.printf("Testing target property %s which is %s%n", prop, prop.type);
-            System.out.println("====");
-            System.out.println("Known good assignments:");
-            List<String> knownCorrect = synthesizeExamples(prop.type, true);
-
-            for (String it : knownCorrect) {
-                Model model = createModel(prop, it);
-                validator.assertNoErrors(model);
-                // Also make sure warnings are produced when files are not present.
-                if (prop.type == PrimitiveType.FILE) {
-                    validator.assertWarning(model, LfPackage.eINSTANCE.getKeyValuePair(),
-                        null, String.format("Could not find file: '%s'.", StringUtil.removeQuotes(it)));
-                }
-            }
-
-            // Extra checks for filenames. (This piece of code was commented out in the original xtend file)
-            // Temporarily disabled because we need a more sophisticated check that looks for files in different places.
-//            if (prop.type == prop.type == ArrayType.FILE_ARRAY ||
-//                prop.type == UnionType.FILE_OR_FILE_ARRAY) {
-//                val model = prop.createModel(
-//                    synthesizeExamples(ArrayType.FILE_ARRAY, true).get(0))
-//                primitiveTypeToKnownGood.get(PrimitiveType.FILE).forEach [
-//                    model.assertWarning(
-//                        LfPackage.eINSTANCE.keyValuePair,
-//                        null, '''Could not find file: '«it.withoutQuotes»'.''')
-//                ]
-//            }
-
-            System.out.println("Known bad assignments:");
-            List<String> knownIncorrect = synthesizeExamples(prop.type, false);
-            if (!(knownIncorrect == null || knownIncorrect.isEmpty())) {
-                for (String it : knownIncorrect) {
-                    if (prop.type instanceof StringDictionaryType) {
-                        validator.assertError(createModel(prop, it),
-                            LfPackage.eINSTANCE.getKeyValuePair(), null,
-                            String.format("Target property '%s.", prop), "' is required to be a string.");
-                    } else {
-                        validator.assertError(createModel(prop, it),
-                            LfPackage.eINSTANCE.getKeyValuePair(), null,
-                            String.format("Target property '%s' is required to be %s.", prop, prop.type));
-                    }
-                }
-            } else {
-                // No type was synthesized. It must be a composite type.
-                List<List<Object>> list = compositeTypeToKnownBad.get(prop.type);
-                if (list == null) {
-                    System.out.printf("No known incorrect values provided for target property '%s'. Aborting test.%n", prop);
-                    Assertions.fail();
-                } else {
-                    for (List<Object> it : list) {
-                        validator.assertError(createModel(prop, it.get(0).toString()),
-                            LfPackage.eINSTANCE.getKeyValuePair(), null,
-                            String.format("Target property '%s%s' is required to be %s.", prop, it.get(1), it.get(2)));
-                    }
-                }
-            }
-            System.out.println("====");
+                    y = new Y()
+                }
+            """
+            .formatted(target, key, value));
+  }
+
+  /** Perform checks on target properties. */
+  @Test
+  public void checkTargetProperties() throws Exception {
+    for (TargetProperty prop : TargetProperty.getOptions()) {
+      if (prop == TargetProperty.CARGO_DEPENDENCIES) {
+        // we test that separately as it has better error messages
+        return;
+      }
+      System.out.printf("Testing target property %s which is %s%n", prop, prop.type);
+      System.out.println("====");
+      System.out.println("Known good assignments:");
+      List<String> knownCorrect = synthesizeExamples(prop.type, true);
+
+      for (String it : knownCorrect) {
+        Model model = createModel(prop, it);
+        validator.assertNoErrors(model);
+        // Also make sure warnings are produced when files are not present.
+        if (prop.type == PrimitiveType.FILE) {
+          validator.assertWarning(
+              model,
+              LfPackage.eINSTANCE.getKeyValuePair(),
+              null,
+              String.format("Could not find file: '%s'.", StringUtil.removeQuotes(it)));
         }
-        System.out.println("Done!");
-    }
-
-
-    @Test
-    public void checkCargoDependencyProperty() throws Exception {
-        TargetProperty prop = TargetProperty.CARGO_DEPENDENCIES;
-        List<String> knownCorrect = List.of("{}", "{ dep: \"8.2\" }", "{ dep: { version: \"8.2\"} }", "{ dep: { version: \"8.2\", features: [\"foo\"]} }");
-        for (String it : knownCorrect) {
-            validator.assertNoErrors(createModel(prop, it));
+      }
+
+      // Extra checks for filenames. (This piece of code was commented out in the original xtend
+      // file)
+      // Temporarily disabled because we need a more sophisticated check that looks for files in
+      // different places.
+      //            if (prop.type == prop.type == ArrayType.FILE_ARRAY ||
+      //                prop.type == UnionType.FILE_OR_FILE_ARRAY) {
+      //                val model = prop.createModel(
+      //                    synthesizeExamples(ArrayType.FILE_ARRAY, true).get(0))
+      //                primitiveTypeToKnownGood.get(PrimitiveType.FILE).forEach [
+      //                    model.assertWarning(
+      //                        LfPackage.eINSTANCE.keyValuePair,
+      //                        null, '''Could not find file: '«it.withoutQuotes»'.''')
+      //                ]
+      //            }
+
+      System.out.println("Known bad assignments:");
+      List<String> knownIncorrect = synthesizeExamples(prop.type, false);
+      if (!(knownIncorrect == null || knownIncorrect.isEmpty())) {
+        for (String it : knownIncorrect) {
+          if (prop.type instanceof StringDictionaryType) {
+            validator.assertError(
+                createModel(prop, it),
+                LfPackage.eINSTANCE.getKeyValuePair(),
+                null,
+                String.format("Target property '%s.", prop),
+                "' is required to be a string.");
+          } else {
+            validator.assertError(
+                createModel(prop, it),
+                LfPackage.eINSTANCE.getKeyValuePair(),
+                null,
+                String.format("Target property '%s' is required to be %s.", prop, prop.type));
+          }
         }
-
-        //                                               vvvvvvvvvvv
-        validator.assertError(createModel(prop, "{ dep: {/*empty*/} }"),
-            LfPackage.eINSTANCE.getKeyValuePairs(), null, "Must specify one of 'version', 'path', or 'git'"
-        );
-
-        //                                                vvvvvvvvvvv
-        validator.assertError(createModel(prop, "{ dep: { unknown_key: \"\"} }"),
-            LfPackage.eINSTANCE.getKeyValuePair(), null, "Unknown key: 'unknown_key'"
-        );
-
-        //                                                          vvvv
-        validator.assertError(createModel(prop, "{ dep: { features: \"\" } }"),
-            LfPackage.eINSTANCE.getElement(), null, "Expected an array of strings for key 'features'"
-        );
-    }
-
-    @Test
-    public void testImportedCyclicReactor() throws Exception {
-        // File tempFile = File.createTempFile("lf-validation", ".lf");
-        // tempFile.deleteOnExit();
-        // // Java 17:
-        // //         String fileToBeImported = """
-        // //             target C;
-        // //             reactor A {
-        // //                 a = new A();
-        // //             }
-        // //         """
-        // // Java 11:
-        // String fileToBeImported = String.join(System.getProperty("line.separator"),
-        //     "target C;",
-        //     "reactor A {",
-        //     "    a = new A();",
-        //     "}"
-        // );
-        // BufferedWriter writer = new BufferedWriter(new FileWriter(tempFile));
-        // writer.write(fileToBeImported);
-        // writer.close();
-
-        // // Java 17:
-        // //         String testCase = """
-        // //             target C;
-        // //             import A from ...
-        // //             main reactor {
-        // //             }
-        // //         """
-        // // Java 11:
-        // String testCase = String.join(System.getProperty("line.separator"),
-        //     "target C;",
-        //     String.format("import A from \"%s\"", tempFile.getAbsolutePath()),
-        //     "main reactor {",
-        //     "}"
-        // );
-        // Model model = parseWithoutError(testCase);
-        // TODO: Uncomment the lines below and resolve the weird error. (java.lang.IllegalArgumentException: resolve against non-hierarchical or relative base)
-        // validator.assertError(model, LfPackage.eINSTANCE.getImportedReactor(), null, "Imported reactor 'A' has cyclic instantiation in it.");
-    }
-
-    @Test
-    public void testUnusedImport() throws Exception {
-        // File tempFile = File.createTempFile("lf-validation", ".lf");
-        // tempFile.deleteOnExit();
-        // // Java 17:
-        // //         String fileToBeImported = """
-        // //             target C;
-        // //             reactor A {}
-        // //         """
-        // // Java 11:
-        // String fileToBeImported = String.join(System.getProperty("line.separator"),
-        //     "target C;",
-        //     "reactor A{}"
-        // );
-        // BufferedWriter writer = new BufferedWriter(new FileWriter(tempFile));
-        // writer.write(fileToBeImported);
-        // writer.close();
-
-        // // Java 17:
-        // //         String testCase = """
-        // //             target C;
-        // //             import A from ...
-        // //             main reactor {}
-        // //         """
-        // // Java 11:
-        // String testCase = String.join(System.getProperty("line.separator"),
-        //     "target C;",
-        //     String.format("import A from \"%s\"", tempFile.getAbsolutePath()),
-        //     "main reactor{}"
-        // );
-        // Model model = parseWithoutError(testCase);
-        // TODO: Uncomment the lines below and resolve the weird error. (java.lang.IllegalArgumentException: resolve against non-hierarchical or relative base)
-        // validator.assertWarning(model, LfPackage.eINSTANCE.getImport(), null, "Unused import.");
-        // validator.assertWarning(parseWithoutError(testCase), LfPackage.eINSTANCE.getImportedReactor(), null, "Unused reactor class.");
-    }
-
-    @Test
-    public void testMissingInputType() throws Exception {
-        String testCase = """
+      } else {
+        // No type was synthesized. It must be a composite type.
+        List<List<Object>> list = compositeTypeToKnownBad.get(prop.type);
+        if (list == null) {
+          System.out.printf(
+              "No known incorrect values provided for target property '%s'. Aborting test.%n",
+              prop);
+          Assertions.fail();
+        } else {
+          for (List<Object> it : list) {
+            validator.assertError(
+                createModel(prop, it.get(0).toString()),
+                LfPackage.eINSTANCE.getKeyValuePair(),
+                null,
+                String.format(
+                    "Target property '%s%s' is required to be %s.", prop, it.get(1), it.get(2)));
+          }
+        }
+      }
+      System.out.println("====");
+    }
+    System.out.println("Done!");
+  }
+
+  @Test
+  public void checkCargoDependencyProperty() throws Exception {
+    TargetProperty prop = TargetProperty.CARGO_DEPENDENCIES;
+    List<String> knownCorrect =
+        List.of(
+            "{}",
+            "{ dep: \"8.2\" }",
+            "{ dep: { version: \"8.2\"} }",
+            "{ dep: { version: \"8.2\", features: [\"foo\"]} }");
+    for (String it : knownCorrect) {
+      validator.assertNoErrors(createModel(prop, it));
+    }
+
+    //                                               vvvvvvvvvvv
+    validator.assertError(
+        createModel(prop, "{ dep: {/*empty*/} }"),
+        LfPackage.eINSTANCE.getKeyValuePairs(),
+        null,
+        "Must specify one of 'version', 'path', or 'git'");
+
+    //                                                vvvvvvvvvvv
+    validator.assertError(
+        createModel(prop, "{ dep: { unknown_key: \"\"} }"),
+        LfPackage.eINSTANCE.getKeyValuePair(),
+        null,
+        "Unknown key: 'unknown_key'");
+
+    //                                                          vvvv
+    validator.assertError(
+        createModel(prop, "{ dep: { features: \"\" } }"),
+        LfPackage.eINSTANCE.getElement(),
+        null,
+        "Expected an array of strings for key 'features'");
+  }
+
+  @Test
+  public void testImportedCyclicReactor() throws Exception {
+    // File tempFile = File.createTempFile("lf-validation", ".lf");
+    // tempFile.deleteOnExit();
+    // // Java 17:
+    // //         String fileToBeImported = """
+    // //             target C;
+    // //             reactor A {
+    // //                 a = new A();
+    // //             }
+    // //         """
+    // // Java 11:
+    // String fileToBeImported = String.join(System.getProperty("line.separator"),
+    //     "target C;",
+    //     "reactor A {",
+    //     "    a = new A();",
+    //     "}"
+    // );
+    // BufferedWriter writer = new BufferedWriter(new FileWriter(tempFile));
+    // writer.write(fileToBeImported);
+    // writer.close();
+
+    // // Java 17:
+    // //         String testCase = """
+    // //             target C;
+    // //             import A from ...
+    // //             main reactor {
+    // //             }
+    // //         """
+    // // Java 11:
+    // String testCase = String.join(System.getProperty("line.separator"),
+    //     "target C;",
+    //     String.format("import A from \"%s\"", tempFile.getAbsolutePath()),
+    //     "main reactor {",
+    //     "}"
+    // );
+    // Model model = parseWithoutError(testCase);
+    // TODO: Uncomment the lines below and resolve the weird error.
+    // (java.lang.IllegalArgumentException: resolve against non-hierarchical or relative base)
+    // validator.assertError(model, LfPackage.eINSTANCE.getImportedReactor(), null, "Imported
+    // reactor 'A' has cyclic instantiation in it.");
+  }
+
+  @Test
+  public void testUnusedImport() throws Exception {
+    // File tempFile = File.createTempFile("lf-validation", ".lf");
+    // tempFile.deleteOnExit();
+    // // Java 17:
+    // //         String fileToBeImported = """
+    // //             target C;
+    // //             reactor A {}
+    // //         """
+    // // Java 11:
+    // String fileToBeImported = String.join(System.getProperty("line.separator"),
+    //     "target C;",
+    //     "reactor A{}"
+    // );
+    // BufferedWriter writer = new BufferedWriter(new FileWriter(tempFile));
+    // writer.write(fileToBeImported);
+    // writer.close();
+
+    // // Java 17:
+    // //         String testCase = """
+    // //             target C;
+    // //             import A from ...
+    // //             main reactor {}
+    // //         """
+    // // Java 11:
+    // String testCase = String.join(System.getProperty("line.separator"),
+    //     "target C;",
+    //     String.format("import A from \"%s\"", tempFile.getAbsolutePath()),
+    //     "main reactor{}"
+    // );
+    // Model model = parseWithoutError(testCase);
+    // TODO: Uncomment the lines below and resolve the weird error.
+    // (java.lang.IllegalArgumentException: resolve against non-hierarchical or relative base)
+    // validator.assertWarning(model, LfPackage.eINSTANCE.getImport(), null, "Unused import.");
+    // validator.assertWarning(parseWithoutError(testCase),
+    // LfPackage.eINSTANCE.getImportedReactor(), null, "Unused reactor class.");
+  }
+
+  @Test
+  public void testMissingInputType() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     input i;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getInput(), null,
-            "Input must have a type.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getInput(),
+        null,
+        "Input must have a type.");
+  }
 
-    @Test
-    public void testMissingOutputType() throws Exception {
-        String testCase = """
+  @Test
+  public void testMissingOutputType() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     output i;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getOutput(), null,
-            "Output must have a type.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getOutput(),
+        null,
+        "Output must have a type.");
+  }
 
-    @Test
-    public void testMissingStateType() throws Exception {
-        String testCase = """
+  @Test
+  public void testMissingStateType() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     state i;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getStateVar(), null,
-            "State must have a type.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getStateVar(),
+        null,
+        "State must have a type.");
+  }
 
-    @Test
-    public void testListWithParam() throws Exception {
-        String testCase = """
+  @Test
+  public void testListWithParam() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor (A:int(1)) { state i:int(A, 2, 3) }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getStateVar(), null,
-            "List items cannot refer to a parameter.");
-    }
-
-    @Test
-    public void testCppMutableInput() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getStateVar(),
+        null,
+        "List items cannot refer to a parameter.");
+  }
+
+  @Test
+  public void testCppMutableInput() throws Exception {
+    String testCase =
+        """
                 target Cpp;
                 main reactor {
                     mutable input i:int;
                 }
             """;
-        validator.assertWarning(parseWithoutError(testCase), LfPackage.eINSTANCE.getInput(), null,
-            "The mutable qualifier has no meaning for the C++ target and should be removed. " +
-                "In C++, any value can be made mutable by calling get_mutable_copy().");
-    }
+    validator.assertWarning(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getInput(),
+        null,
+        "The mutable qualifier has no meaning for the C++ target and should be removed. "
+            + "In C++, any value can be made mutable by calling get_mutable_copy().");
+  }
 
-    @Test
-    public void testOverflowingSTP() throws Exception {
-        String testCase = """
+  @Test
+  public void testOverflowingSTP() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     reaction(startup) {==} STP(2147483648) {==}
                 }
             """;
 
-        // TODO: Uncomment and fix failing test. See issue #903 on Github.
-        // validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getSTP(), null,
-        // "STP offset exceeds the maximum of " + TimeValue.MAX_LONG_DEADLINE + " nanoseconds.");
-    }
+    // TODO: Uncomment and fix failing test. See issue #903 on Github.
+    // validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getSTP(), null,
+    // "STP offset exceeds the maximum of " + TimeValue.MAX_LONG_DEADLINE + " nanoseconds.");
+  }
 
-    @Test
-    public void testOverflowingDeadline() throws Exception {
-        String testCase = """
+  @Test
+  public void testOverflowingDeadline() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     reaction(startup) {==} STP(2147483648) {==}
                 }
             """;
 
-        // TODO: Uncomment and fix failing test. See issue #903 on Github.
-        // validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getDeadline(), null,
-        // "Deadline exceeds the maximum of " + TimeValue.MAX_LONG_DEADLINE + " nanoseconds.");
-    }
+    // TODO: Uncomment and fix failing test. See issue #903 on Github.
+    // validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getDeadline(), null,
+    // "Deadline exceeds the maximum of " + TimeValue.MAX_LONG_DEADLINE + " nanoseconds.");
+  }
 
-    @Test
-    public void testInvalidTargetParam() throws Exception {
-        String testCase = """
+  @Test
+  public void testInvalidTargetParam() throws Exception {
+    String testCase =
+        """
                 target C { beefyDesktop: true }
                 main reactor {}
             """;
-        List<Issue> issues = validator.validate(parseWithoutError(testCase));
-        Assertions.assertTrue(issues.size() == 1
+    List<Issue> issues = validator.validate(parseWithoutError(testCase));
+    Assertions.assertTrue(
+        issues.size() == 1
             && issues.get(0).getMessage().contains("Unrecognized target parameter: beefyDesktop"));
-    }
+  }
 
-    @Test
-    public void testTargetParamNotSupportedForTarget() throws Exception {
-        String testCase = """
+  @Test
+  public void testTargetParamNotSupportedForTarget() throws Exception {
+    String testCase =
+        """
                 target Python { build: "" }
                 main reactor {}
             """;
-        List<Issue> issues = validator.validate(parseWithoutError(testCase));
-        Assertions.assertTrue(issues.size() == 1 && issues.get(0).getMessage().contains(
-            "The target parameter: build" +
-                " is not supported by the Python target and will thus be ignored."));
-    }
-
-    @Test
-    public void testUnnamedReactor() throws Exception {
-        String testCase = """
+    List<Issue> issues = validator.validate(parseWithoutError(testCase));
+    Assertions.assertTrue(
+        issues.size() == 1
+            && issues
+                .get(0)
+                .getMessage()
+                .contains(
+                    "The target parameter: build"
+                        + " is not supported by the Python target and will thus be ignored."));
+  }
+
+  @Test
+  public void testUnnamedReactor() throws Exception {
+    String testCase = """
                 target C;
                 reactor {}
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getReactor(), null,
-            "Reactor must be named.");
-    }
-
-    @Test
-    public void testMainHasInput() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Reactor must be named.");
+  }
+
+  @Test
+  public void testMainHasInput() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     input x:int;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getInput(), null,
-            "Main reactor cannot have inputs.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getInput(),
+        null,
+        "Main reactor cannot have inputs.");
+  }
 
-    @Test
-    public void testFederatedHasInput() throws Exception {
+  @Test
+  public void testFederatedHasInput() throws Exception {
 
-        String testCase = """
+    String testCase =
+        """
                 target C;
                 federated reactor {
                     input x:int;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getInput(), null,
-            "Main reactor cannot have inputs.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getInput(),
+        null,
+        "Main reactor cannot have inputs.");
+  }
 
-    @Test
-    public void testMainHasOutput() throws Exception {
+  @Test
+  public void testMainHasOutput() throws Exception {
 
-        String testCase = """
+    String testCase =
+        """
                 target C;
                 main reactor {
                     output x:int;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getOutput(), null,
-            "Main reactor cannot have outputs.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getOutput(),
+        null,
+        "Main reactor cannot have outputs.");
+  }
 
-    @Test
-    public void testFederatedHasOutput() throws Exception {
+  @Test
+  public void testFederatedHasOutput() throws Exception {
 
-        String testCase = """
+    String testCase =
+        """
                 target C;
                 federated reactor {
                     output x:int;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getOutput(), null,
-            "Main reactor cannot have outputs.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getOutput(),
+        null,
+        "Main reactor cannot have outputs.");
+  }
 
-    @Test
-    public void testMultipleMainReactor() throws Exception {
+  @Test
+  public void testMultipleMainReactor() throws Exception {
 
-        String testCase = """
+    String testCase =
+        """
                 target C;
                 main reactor A {}
                 main reactor A {}
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getReactor(), null,
-            "Multiple definitions of main or federated reactor.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Multiple definitions of main or federated reactor.");
+  }
 
-    @Test
-    public void testMultipleMainReactorUnnamed() throws Exception {
+  @Test
+  public void testMultipleMainReactorUnnamed() throws Exception {
 
-        String testCase = """
+    String testCase =
+        """
                 target C;
                 main reactor {}
                 main reactor {}
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getReactor(), null,
-            "Multiple definitions of main or federated reactor.");
-    }
-
-    @Test
-    public void testMultipleFederatedReactor() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Multiple definitions of main or federated reactor.");
+  }
+
+  @Test
+  public void testMultipleFederatedReactor() throws Exception {
+    String testCase =
+        """
                 target C;
                 federated reactor A {}
                 federated reactor A {}
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getReactor(), null,
-            "Multiple definitions of main or federated reactor.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Multiple definitions of main or federated reactor.");
+  }
 
-    @Test
-    public void testMultipleMainOrFederatedReactor() throws Exception {
+  @Test
+  public void testMultipleMainOrFederatedReactor() throws Exception {
 
-        String testCase = """
+    String testCase =
+        """
                 target C;
                 federated reactor A {}
                 federated reactor A {}
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getReactor(), null,
-            "Multiple definitions of main or federated reactor.");
-    }
-
-    @Test
-    public void testMainReactorHasHost() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Multiple definitions of main or federated reactor.");
+  }
+
+  @Test
+  public void testMainReactorHasHost() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor at 127.0.0.1{}
             """;
-        // TODO: Uncomment and fix test
-        // List<Issue> issues = validator.validate(parseWithoutError(testCase));
-        // Assertions.assertTrue(issues.size() == 1 &&
-        //     issues.get(0).getMessage().contains("Cannot assign a host to reactor '") &&
-        //     issues.get(0).getMessage().contains("' because it is not federated."));
-    }
+    // TODO: Uncomment and fix test
+    // List<Issue> issues = validator.validate(parseWithoutError(testCase));
+    // Assertions.assertTrue(issues.size() == 1 &&
+    //     issues.get(0).getMessage().contains("Cannot assign a host to reactor '") &&
+    //     issues.get(0).getMessage().contains("' because it is not federated."));
+  }
 
-    @Test
-    public void testUnrecognizedTarget() throws Exception {
+  @Test
+  public void testUnrecognizedTarget() throws Exception {
 
-        String testCase = """
+    String testCase =
+        """
                 target Pjthon;
                 main reactor {}
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getTargetDecl(), null,
-            "Unrecognized target: Pjthon");
-    }
-
-
-    @Test
-    public void testWrongStructureForLabelAttribute() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getTargetDecl(),
+        null,
+        "Unrecognized target: Pjthon");
+  }
+
+  @Test
+  public void testWrongStructureForLabelAttribute() throws Exception {
+    String testCase =
+        """
                 target C;
                 @label(name="something")
                 main reactor { }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getAttribute(), null,
-            "Unknown attribute parameter.");
-    }
-
-    @Test
-    public void testMissingName() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getAttribute(),
+        null,
+        "Unknown attribute parameter.");
+  }
+
+  @Test
+  public void testMissingName() throws Exception {
+    String testCase =
+        """
                 target C;
                 @label("something", "else")
                 main reactor { }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getAttribute(), null,
-            "Missing name for attribute parameter.");
-    }
-
-    @Test
-    public void testWrongParamType() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getAttribute(),
+        null,
+        "Missing name for attribute parameter.");
+  }
+
+  @Test
+  public void testWrongParamType() throws Exception {
+    String testCase =
+        """
                 target C;
                 @label(value=1)
                 main reactor { }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getAttribute(), null,
-            "Incorrect type: \"value\" should have type String.");
-    }
-
-    @Test
-    public void testInitialMode() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getAttribute(),
+        null,
+        "Incorrect type: \"value\" should have type String.");
+  }
+
+  @Test
+  public void testInitialMode() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     mode M {}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getReactor(), null,
-            "Every modal reactor requires one initial mode.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Every modal reactor requires one initial mode.");
+  }
 
-    @Test
-    public void testInitialModes() throws Exception {
-        String testCase = """
+  @Test
+  public void testInitialModes() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     initial mode IM1 {}
                     initial mode IM2 {}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getReactor(), null,
-            "A modal reactor can only have one initial mode.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "A modal reactor can only have one initial mode.");
+  }
 
-    @Test
-    public void testModeStateNamespace() throws Exception {
-        String testCase = """
+  @Test
+  public void testModeStateNamespace() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     initial mode IM {
@@ -1752,13 +2002,18 @@ public void testModeStateNamespace() throws Exception {
                     }
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getStateVar(), null,
-            "Duplicate state variable 's'. (State variables are currently scoped on reactor level not modes)");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getStateVar(),
+        null,
+        "Duplicate state variable 's'. (State variables are currently scoped on reactor level not"
+            + " modes)");
+  }
 
-    @Test
-    public void testModeTimerNamespace() throws Exception {
-        String testCase = """
+  @Test
+  public void testModeTimerNamespace() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     initial mode IM {
@@ -1769,13 +2024,17 @@ public void testModeTimerNamespace() throws Exception {
                     }
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getTimer(), null,
-            "Duplicate Timer 't'. (Timers are currently scoped on reactor level not modes)");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getTimer(),
+        null,
+        "Duplicate Timer 't'. (Timers are currently scoped on reactor level not modes)");
+  }
 
-    @Test
-    public void testModeActionNamespace() throws Exception {
-        String testCase = """
+  @Test
+  public void testModeActionNamespace() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     initial mode IM {
@@ -1786,13 +2045,17 @@ public void testModeActionNamespace() throws Exception {
                     }
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getAction(), null,
-            "Duplicate Action 'a'. (Actions are currently scoped on reactor level not modes)");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getAction(),
+        null,
+        "Duplicate Action 'a'. (Actions are currently scoped on reactor level not modes)");
+  }
 
-    @Test
-    public void testModeInstanceNamespace() throws Exception {
-        String testCase = """
+  @Test
+  public void testModeInstanceNamespace() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor R {}
                 main reactor {
@@ -1804,13 +2067,18 @@ public void testModeInstanceNamespace() throws Exception {
                     }
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getInstantiation(), null,
-            "Duplicate Instantiation 'r'. (Instantiations are currently scoped on reactor level not modes)");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getInstantiation(),
+        null,
+        "Duplicate Instantiation 'r'. (Instantiations are currently scoped on reactor level not"
+            + " modes)");
+  }
 
-    @Test
-    public void testMissingModeStateReset() throws Exception {
-        String testCase = """
+  @Test
+  public void testMissingModeStateReset() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     initial mode IM {
@@ -1821,13 +2089,18 @@ public void testMissingModeStateReset() throws Exception {
                     }
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getMode(), null,
-            "State variable is not reset upon mode entry. It is neither marked for automatic reset nor is there a reset reaction.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getMode(),
+        null,
+        "State variable is not reset upon mode entry. It is neither marked for automatic reset nor"
+            + " is there a reset reaction.");
+  }
 
-    @Test
-    public void testMissingModeStateResetInstance() throws Exception {
-        String testCase = """
+  @Test
+  public void testMissingModeStateResetInstance() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor R {
                     state s:int = 0;
@@ -1841,16 +2114,20 @@ public void testMissingModeStateResetInstance() throws Exception {
                     }
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getMode(), null,
-            "This reactor contains state variables that are not reset upon mode entry: "
-                + "s in R"
-                + ".\nThe state variables are neither marked for automatic reset nor have a dedicated reset reaction. "
-                + "It is unsafe to instantiate this reactor inside a mode entered with reset.");
-    }
-
-    @Test
-    public void testModeStateResetWithoutInitialValue() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getMode(),
+        null,
+        "This reactor contains state variables that are not reset upon mode entry: s in R.\n"
+            + "The state variables are neither marked for automatic reset nor have a dedicated"
+            + " reset reaction. It is unsafe to instantiate this reactor inside a mode entered with"
+            + " reset.");
+  }
+
+  @Test
+  public void testModeStateResetWithoutInitialValue() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     initial mode IM {
@@ -1858,13 +2135,17 @@ public void testModeStateResetWithoutInitialValue() throws Exception {
                     }
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getStateVar(), null,
-            "The state variable can not be automatically reset without an initial value.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getStateVar(),
+        null,
+        "The state variable can not be automatically reset without an initial value.");
+  }
 
-    @Test
-    public void testUnspecifiedTransitionType() throws Exception {
-        String testCase = """
+  @Test
+  public void testUnspecifiedTransitionType() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     initial mode IM {
@@ -1875,10 +2156,12 @@ public void testUnspecifiedTransitionType() throws Exception {
                     }
                 }
             """;
-        validator.assertWarning(parseWithoutError(testCase), LfPackage.eINSTANCE.getReaction(), null,
-            "You should specify a transition type! "
-                + "Reset and history transitions have different effects on this target mode. "
-                + "Currently, a reset type is implicitly assumed.");
-    }
-
+    validator.assertWarning(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReaction(),
+        null,
+        "You should specify a transition type! "
+            + "Reset and history transitions have different effects on this target mode. "
+            + "Currently, a reset type is implicitly assumed.");
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/MixedRadixIntTest.java b/org.lflang.tests/src/org/lflang/tests/compiler/MixedRadixIntTest.java
index 2cee2468c8..b119da05c2 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/MixedRadixIntTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/MixedRadixIntTest.java
@@ -2,111 +2,110 @@
 
 import java.util.Arrays;
 import java.util.List;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.lflang.generator.MixedRadixInt;
 
 public class MixedRadixIntTest {
-    
-    // Constants used many times below.
-    List<Integer> radixes = Arrays.asList(2, 3, 4, 5);
-    List<Integer> digits = Arrays.asList(1, 2, 3, 4);
 
-    @Test
-    public void create() throws Exception {
-        MixedRadixInt num = new MixedRadixInt(digits, radixes, null);
-        Assertions.assertEquals("1%2, 2%3, 3%4, 4%5", num.toString());
-        Assertions.assertEquals(1 + 2*2 + 3*6 + 4*24, num.get());
-        
-        List<Integer> altDigits = List.of(1, 2, 1);
-        MixedRadixInt altNum = new MixedRadixInt(altDigits, radixes, null);
-        Assertions.assertEquals(11, altNum.get());
-    }
+  // Constants used many times below.
+  List<Integer> radixes = Arrays.asList(2, 3, 4, 5);
+  List<Integer> digits = Arrays.asList(1, 2, 3, 4);
 
-    @Test
-    public void createWithInfinity() throws Exception {
-        List<Integer> radixes = List.of(2, 3, 4, 10000);
-        MixedRadixInt num = new MixedRadixInt(digits, radixes, null);
-        Assertions.assertEquals(1 + 2*2 + 3*6 + 4*24, num.get());
-    }
+  @Test
+  public void create() throws Exception {
+    MixedRadixInt num = new MixedRadixInt(digits, radixes, null);
+    Assertions.assertEquals("1%2, 2%3, 3%4, 4%5", num.toString());
+    Assertions.assertEquals(1 + 2 * 2 + 3 * 6 + 4 * 24, num.get());
 
-    @Test
-    public void createWithError() throws Exception {
-        List<Integer> radixes = List.of(2, 3);
-        try {
-            new MixedRadixInt(digits, radixes, null);
-        } catch (IllegalArgumentException ex) {
-            Assertions.assertTrue(ex.getMessage().startsWith("Invalid"));
-            return;
-        }
-        Assertions.assertTrue(false, "Expected exception did not occur.");
-    }
-    
-    @Test
-    public void createWithNullAndSet() throws Exception {
-        MixedRadixInt num = new MixedRadixInt(null, radixes, null);
-        Assertions.assertEquals(0, num.get());
-        Assertions.assertEquals("0%2", num.toString());
-        num.set(1 + 2*2 + 3*6 + 4*24);
-        Assertions.assertEquals(1 + 2*2 + 3*6 + 4*24, num.get());
-        int mag = num.magnitude();
-        Assertions.assertEquals(1 + 2*2 + 3*6 + 4*24, mag);
-        num.increment(); // wrap to zero.
-        Assertions.assertEquals(0, num.get());
-        Assertions.assertEquals(0, num.magnitude());
-        
-        num = new MixedRadixInt(null, radixes, null);
-        num.setMagnitude(mag);
-        Assertions.assertEquals(mag, num.magnitude());
-    }
-    
-    @Test
-    public void testPermutation() throws Exception {
-        List<Integer> radixes = Arrays.asList(2, 5);
-        List<Integer> digits = Arrays.asList(1, 2);
-        List<Integer> permutation = Arrays.asList(1, 0);
-        MixedRadixInt num = new MixedRadixInt(digits, radixes, permutation);
-        Assertions.assertEquals(5, num.get());
-        Assertions.assertEquals(2, num.get(1));
-        Assertions.assertEquals(7, num.magnitude());
-        num.increment();
-        Assertions.assertEquals(7, num.get());
-        Assertions.assertEquals(8, num.magnitude());
-        
-        num = new MixedRadixInt(null, radixes, permutation);
-        num.setMagnitude(8);
-        Assertions.assertEquals(8, num.magnitude());
-        Assertions.assertEquals(7, num.get());
+    List<Integer> altDigits = List.of(1, 2, 1);
+    MixedRadixInt altNum = new MixedRadixInt(altDigits, radixes, null);
+    Assertions.assertEquals(11, altNum.get());
+  }
 
-        // Test radix infinity digit (effectively).
-        digits = Arrays.asList(1, 2, 1);
-        radixes = Arrays.asList(2, 5, 1000000);
-        num = new MixedRadixInt(digits, radixes, null);
-        Assertions.assertEquals(15, num.get());
-        Assertions.assertEquals(7, num.get(1));
-        Assertions.assertEquals(15, num.magnitude());
-        
-        permutation = Arrays.asList(1, 0, 2);
-        num = new MixedRadixInt(digits, radixes, permutation);
-        num.increment();
-        Assertions.assertEquals(17, num.get());
-        Assertions.assertEquals(18, num.magnitude());
+  @Test
+  public void createWithInfinity() throws Exception {
+    List<Integer> radixes = List.of(2, 3, 4, 10000);
+    MixedRadixInt num = new MixedRadixInt(digits, radixes, null);
+    Assertions.assertEquals(1 + 2 * 2 + 3 * 6 + 4 * 24, num.get());
+  }
 
-        num = new MixedRadixInt(null, radixes, permutation);
-        num.setMagnitude(18);
-        Assertions.assertEquals(18, num.magnitude());
-        Assertions.assertEquals(17, num.get());
-    }
-    
-    @Test
-    public void testIncrement() throws Exception {
-        List<Integer> radixes = Arrays.asList(2, 3);
-        List<Integer> digits = Arrays.asList(0, 2);
-        MixedRadixInt num = new MixedRadixInt(digits, radixes, null);
-        num.increment();
-        Assertions.assertEquals(5, num.get());
-        num.increment(); // Wrap around to zero.
-        Assertions.assertEquals(0, num.get());
+  @Test
+  public void createWithError() throws Exception {
+    List<Integer> radixes = List.of(2, 3);
+    try {
+      new MixedRadixInt(digits, radixes, null);
+    } catch (IllegalArgumentException ex) {
+      Assertions.assertTrue(ex.getMessage().startsWith("Invalid"));
+      return;
     }
+    Assertions.assertTrue(false, "Expected exception did not occur.");
+  }
+
+  @Test
+  public void createWithNullAndSet() throws Exception {
+    MixedRadixInt num = new MixedRadixInt(null, radixes, null);
+    Assertions.assertEquals(0, num.get());
+    Assertions.assertEquals("0%2", num.toString());
+    num.set(1 + 2 * 2 + 3 * 6 + 4 * 24);
+    Assertions.assertEquals(1 + 2 * 2 + 3 * 6 + 4 * 24, num.get());
+    int mag = num.magnitude();
+    Assertions.assertEquals(1 + 2 * 2 + 3 * 6 + 4 * 24, mag);
+    num.increment(); // wrap to zero.
+    Assertions.assertEquals(0, num.get());
+    Assertions.assertEquals(0, num.magnitude());
+
+    num = new MixedRadixInt(null, radixes, null);
+    num.setMagnitude(mag);
+    Assertions.assertEquals(mag, num.magnitude());
+  }
+
+  @Test
+  public void testPermutation() throws Exception {
+    List<Integer> radixes = Arrays.asList(2, 5);
+    List<Integer> digits = Arrays.asList(1, 2);
+    List<Integer> permutation = Arrays.asList(1, 0);
+    MixedRadixInt num = new MixedRadixInt(digits, radixes, permutation);
+    Assertions.assertEquals(5, num.get());
+    Assertions.assertEquals(2, num.get(1));
+    Assertions.assertEquals(7, num.magnitude());
+    num.increment();
+    Assertions.assertEquals(7, num.get());
+    Assertions.assertEquals(8, num.magnitude());
+
+    num = new MixedRadixInt(null, radixes, permutation);
+    num.setMagnitude(8);
+    Assertions.assertEquals(8, num.magnitude());
+    Assertions.assertEquals(7, num.get());
+
+    // Test radix infinity digit (effectively).
+    digits = Arrays.asList(1, 2, 1);
+    radixes = Arrays.asList(2, 5, 1000000);
+    num = new MixedRadixInt(digits, radixes, null);
+    Assertions.assertEquals(15, num.get());
+    Assertions.assertEquals(7, num.get(1));
+    Assertions.assertEquals(15, num.magnitude());
+
+    permutation = Arrays.asList(1, 0, 2);
+    num = new MixedRadixInt(digits, radixes, permutation);
+    num.increment();
+    Assertions.assertEquals(17, num.get());
+    Assertions.assertEquals(18, num.magnitude());
+
+    num = new MixedRadixInt(null, radixes, permutation);
+    num.setMagnitude(18);
+    Assertions.assertEquals(18, num.magnitude());
+    Assertions.assertEquals(17, num.get());
+  }
+
+  @Test
+  public void testIncrement() throws Exception {
+    List<Integer> radixes = Arrays.asList(2, 3);
+    List<Integer> digits = Arrays.asList(0, 2);
+    MixedRadixInt num = new MixedRadixInt(digits, radixes, null);
+    num.increment();
+    Assertions.assertEquals(5, num.get());
+    num.increment(); // Wrap around to zero.
+    Assertions.assertEquals(0, num.get());
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/PortInstanceTests.java b/org.lflang.tests/src/org/lflang/tests/compiler/PortInstanceTests.java
index f5f2ba387b..8b8ef52a8f 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/PortInstanceTests.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/PortInstanceTests.java
@@ -1,15 +1,14 @@
 package org.lflang.tests.compiler;
 
 import java.util.List;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.lflang.DefaultErrorReporter;
 import org.lflang.ErrorReporter;
 import org.lflang.generator.PortInstance;
-import org.lflang.generator.RuntimeRange;
 import org.lflang.generator.ReactionInstance;
 import org.lflang.generator.ReactorInstance;
+import org.lflang.generator.RuntimeRange;
 import org.lflang.generator.SendRange;
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.Port;
@@ -18,204 +17,205 @@
 
 public class PortInstanceTests {
 
-    private ErrorReporter reporter = new DefaultErrorReporter();
-    private static LfFactory factory = LfFactory.eINSTANCE;
-    
-    @Test
-    public void createRange() throws Exception {
-        Reactor main = factory.createReactor();
-        ReactorInstance maini = new ReactorInstance(main, reporter);
-        
-        ReactorInstance a = newReactor("A", maini);
-        ReactorInstance b = newReactor("B", maini);
-        ReactorInstance c = newReactor("C", maini);
-        
-        PortInstance p = newOutputPort("p", a);
-        PortInstance q = newInputPort("q", b);
-        PortInstance r = newInputPort("r", c);
-
-        Assertions.assertEquals(".A.p", p.getFullName());
-        
-        connect(p, q);
-        connect(p, r);
-        
-        List<SendRange> sr = p.eventualDestinations();
-        // Destinations should be empty because there are no reactions.
-        Assertions.assertEquals("[]", sr.toString());
-        
-        // Clear caches to make a mutation.
-        maini.clearCaches();
-        newReaction(q);
-        // Re-retrieve destinations.
-        sr = p.eventualDestinations();
-        Assertions.assertEquals("[.A.p(0,1)->[.B.q(0,1)]]", sr.toString());
-
-        maini.clearCaches();
-        newReaction(r);
-        // Re-retrieve destinations.
-        sr = p.eventualDestinations();
-        Assertions.assertEquals("[.A.p(0,1)->[.B.q(0,1), .C.r(0,1)]]", sr.toString());
-        
-        // Now test multiports.
-        p.setWidth(3);
-        r.setWidth(2);
-        // Have to redo the connections.
-        clearConnections(maini);
-        maini.clearCaches();
-        connect(p, 0, 1, q, 0, 1);
-        connect(p, 1, 2, r, 0, 2);
-        
-        // Re-retrieve destinations.
-        sr = p.eventualDestinations();
-        Assertions.assertEquals("[.A.p(0,1)->[.B.q(0,1)], .A.p(1,2)->[.C.r(0,2)]]", sr.toString());
-
-        // More complicated multiport connection.
-        clearConnections(maini);
-        maini.clearCaches();
-
-        ReactorInstance d = newReactor("D", maini);
-        PortInstance v = newOutputPort("v", d);
-        v.setWidth(2);
-        q.setWidth(3);
-        connect(v, 0, 2, q, 0, 2);
-        connect(p, 0, 1, q, 2, 1);
-        connect(p, 1, 2, r, 0, 2);
-        
-        sr = p.eventualDestinations();
-        Assertions.assertEquals("[.A.p(0,1)->[.B.q(2,1)], .A.p(1,2)->[.C.r(0,2)]]", sr.toString());
-
-        // Additional multicast connection.
-        maini.clearCaches();
-        ReactorInstance e = newReactor("E", maini);
-        PortInstance s = newPort("s", e);
-        s.setWidth(3);
-        newReaction(s);
-        connect(p, s);
-
-        sr = p.eventualDestinations();
-        Assertions.assertEquals("[.A.p(0,1)->[.B.q(2,1), .E.s(0,1)], .A.p(1,2)->[.C.r(0,2), .E.s(1,2)]]", sr.toString());
-
-        // Add hierarchical reactors that further split the ranges.
-        maini.clearCaches();
-        ReactorInstance f = newReactor("F", e);
-        PortInstance t = newPort("t", f);
-        newReaction(t);
-        ReactorInstance g = newReactor("G", e);
-        PortInstance u = newPort("u", g);
-        u.setWidth(2);
-        newReaction(u);
-        connect(s, 0, 1, t, 0, 1);
-        connect(s, 1, 2, u, 0, 2);
-
-        sr = p.eventualDestinations();
-        // FIXME: Multicast destinations should be able to be reported in arbitrary order.
-        Assertions.assertEquals("[.A.p(0,1)->[.E.F.t(0,1), .E.s(0,1), .B.q(2,1)], .A.p(1,2)->[.E.G.u(0,2), .E.s(1,2), .C.r(0,2)]]", sr.toString());
-    }
-    
-    @Test
-    public void multiportDestination() throws Exception {
-        Reactor main = factory.createReactor();
-        ReactorInstance maini = new ReactorInstance(main, reporter);
-        
-        ReactorInstance a = newReactor("A", maini);
-        ReactorInstance b = newReactor("B", maini);
-        b.setWidth(4);
-        
-        PortInstance p = newOutputPort("p", a);
-        PortInstance q = newInputPort("q", b);
-
-        connect(p, 0, 1, q, 0, 4);
-
-        List<SendRange> sr = p.eventualDestinations();
-        // Destination has no reactions, so empty list is right.
-        Assertions.assertEquals("[]", sr.toString());
-
-        maini.clearCaches();
-        newReaction(q);
-        sr = p.eventualDestinations();
-        Assertions.assertEquals("[.A.p(0,1)->[.B.q(0,4)]]", sr.toString());
-}
-    
-    /**
-     * Clear connections. This recursively clears them for all contained reactors.
-     */
-    protected void clearConnections(ReactorInstance r) {
-        for (PortInstance p: r.inputs) {
-            p.getDependentPorts().clear();
-        }
-        for (PortInstance p: r.outputs) {
-            p.getDependentPorts().clear();
-        }
-        for (ReactorInstance child: r.children) {
-            clearConnections(child);
-        }
-    }
-
-    /**
-     * Simple connection of two ports. This should be used only
-     * for connections that would be allowed in the syntax (i.e., no
-     * cross-hierarchy connections), but this is not checked. 
-     * @param src The sending port.
-     * @param dst The receiving port.
-     */
-    protected void connect(PortInstance src, PortInstance dst) {
-        RuntimeRange<PortInstance> srcRange = new RuntimeRange.Port(src);
-        RuntimeRange<PortInstance> dstRange = new RuntimeRange.Port(dst);
-        ReactorInstance.connectPortInstances(srcRange, dstRange, null);
+  private ErrorReporter reporter = new DefaultErrorReporter();
+  private static LfFactory factory = LfFactory.eINSTANCE;
+
+  @Test
+  public void createRange() throws Exception {
+    Reactor main = factory.createReactor();
+    ReactorInstance maini = new ReactorInstance(main, reporter);
+
+    ReactorInstance a = newReactor("A", maini);
+    ReactorInstance b = newReactor("B", maini);
+    ReactorInstance c = newReactor("C", maini);
+
+    PortInstance p = newOutputPort("p", a);
+    PortInstance q = newInputPort("q", b);
+    PortInstance r = newInputPort("r", c);
+
+    Assertions.assertEquals(".A.p", p.getFullName());
+
+    connect(p, q);
+    connect(p, r);
+
+    List<SendRange> sr = p.eventualDestinations();
+    // Destinations should be empty because there are no reactions.
+    Assertions.assertEquals("[]", sr.toString());
+
+    // Clear caches to make a mutation.
+    maini.clearCaches();
+    newReaction(q);
+    // Re-retrieve destinations.
+    sr = p.eventualDestinations();
+    Assertions.assertEquals("[.A.p(0,1)->[.B.q(0,1)]]", sr.toString());
+
+    maini.clearCaches();
+    newReaction(r);
+    // Re-retrieve destinations.
+    sr = p.eventualDestinations();
+    Assertions.assertEquals("[.A.p(0,1)->[.B.q(0,1), .C.r(0,1)]]", sr.toString());
+
+    // Now test multiports.
+    p.setWidth(3);
+    r.setWidth(2);
+    // Have to redo the connections.
+    clearConnections(maini);
+    maini.clearCaches();
+    connect(p, 0, 1, q, 0, 1);
+    connect(p, 1, 2, r, 0, 2);
+
+    // Re-retrieve destinations.
+    sr = p.eventualDestinations();
+    Assertions.assertEquals("[.A.p(0,1)->[.B.q(0,1)], .A.p(1,2)->[.C.r(0,2)]]", sr.toString());
+
+    // More complicated multiport connection.
+    clearConnections(maini);
+    maini.clearCaches();
+
+    ReactorInstance d = newReactor("D", maini);
+    PortInstance v = newOutputPort("v", d);
+    v.setWidth(2);
+    q.setWidth(3);
+    connect(v, 0, 2, q, 0, 2);
+    connect(p, 0, 1, q, 2, 1);
+    connect(p, 1, 2, r, 0, 2);
+
+    sr = p.eventualDestinations();
+    Assertions.assertEquals("[.A.p(0,1)->[.B.q(2,1)], .A.p(1,2)->[.C.r(0,2)]]", sr.toString());
+
+    // Additional multicast connection.
+    maini.clearCaches();
+    ReactorInstance e = newReactor("E", maini);
+    PortInstance s = newPort("s", e);
+    s.setWidth(3);
+    newReaction(s);
+    connect(p, s);
+
+    sr = p.eventualDestinations();
+    Assertions.assertEquals(
+        "[.A.p(0,1)->[.B.q(2,1), .E.s(0,1)], .A.p(1,2)->[.C.r(0,2), .E.s(1,2)]]", sr.toString());
+
+    // Add hierarchical reactors that further split the ranges.
+    maini.clearCaches();
+    ReactorInstance f = newReactor("F", e);
+    PortInstance t = newPort("t", f);
+    newReaction(t);
+    ReactorInstance g = newReactor("G", e);
+    PortInstance u = newPort("u", g);
+    u.setWidth(2);
+    newReaction(u);
+    connect(s, 0, 1, t, 0, 1);
+    connect(s, 1, 2, u, 0, 2);
+
+    sr = p.eventualDestinations();
+    // FIXME: Multicast destinations should be able to be reported in arbitrary order.
+    Assertions.assertEquals(
+        "[.A.p(0,1)->[.E.F.t(0,1), .E.s(0,1), .B.q(2,1)], .A.p(1,2)->[.E.G.u(0,2), .E.s(1,2),"
+            + " .C.r(0,2)]]",
+        sr.toString());
+  }
+
+  @Test
+  public void multiportDestination() throws Exception {
+    Reactor main = factory.createReactor();
+    ReactorInstance maini = new ReactorInstance(main, reporter);
+
+    ReactorInstance a = newReactor("A", maini);
+    ReactorInstance b = newReactor("B", maini);
+    b.setWidth(4);
+
+    PortInstance p = newOutputPort("p", a);
+    PortInstance q = newInputPort("q", b);
+
+    connect(p, 0, 1, q, 0, 4);
+
+    List<SendRange> sr = p.eventualDestinations();
+    // Destination has no reactions, so empty list is right.
+    Assertions.assertEquals("[]", sr.toString());
+
+    maini.clearCaches();
+    newReaction(q);
+    sr = p.eventualDestinations();
+    Assertions.assertEquals("[.A.p(0,1)->[.B.q(0,4)]]", sr.toString());
+  }
+
+  /** Clear connections. This recursively clears them for all contained reactors. */
+  protected void clearConnections(ReactorInstance r) {
+    for (PortInstance p : r.inputs) {
+      p.getDependentPorts().clear();
     }
-    
-    /**
-     * Connection between multiports. This should be used only
-     * for connections that would be allowed in the syntax (i.e., no
-     * cross-hierarchy connections), but this is not checked. 
-     * @param src The sending port.
-     * @param dst The receiving port.
-     */
-    protected void connect(
-            PortInstance src, int srcStart, int srcWidth,
-            PortInstance dst, int dstStart, int dstWidth
-    ) {
-        RuntimeRange<PortInstance> srcRange = new RuntimeRange.Port(src, srcStart, srcWidth, null);
-        RuntimeRange<PortInstance> dstRange = new RuntimeRange.Port(dst, dstStart, dstWidth, null);
-        ReactorInstance.connectPortInstances(srcRange, dstRange, null);
+    for (PortInstance p : r.outputs) {
+      p.getDependentPorts().clear();
     }
-
-    protected PortInstance newPort(String name, ReactorInstance container) {
-        Port p = factory.createPort();
-        p.setName(name);
-        return new PortInstance(p, container, reporter);
-    }
-
-    protected PortInstance newInputPort(String name, ReactorInstance container) {
-        PortInstance pi = newPort(name, container);
-        container.inputs.add(pi);
-        return pi;
-    }
-    
-    protected PortInstance newOutputPort(String name, ReactorInstance container) {
-        PortInstance pi = newPort(name, container);
-        container.outputs.add(pi);
-        return pi;
-    }
-
-    /**
-     * Return a new reaction triggered by the specified port.
-     * @param trigger The triggering port.
-     */
-    protected ReactionInstance newReaction(PortInstance trigger) {
-        Reaction r = factory.createReaction();
-        ReactionInstance result = new ReactionInstance(
-                r, trigger.getParent(), false, trigger.getDependentReactions().size());
-        trigger.getDependentReactions().add(result);
-        trigger.getParent().reactions.add(result);
-        return result;
-    }
-
-    protected ReactorInstance newReactor(String name, ReactorInstance container) {
-        Reactor r = factory.createReactor();
-        r.setName(name);
-        ReactorInstance ri = new ReactorInstance(r, container, reporter);
-        container.children.add(ri);
-        return ri;
+    for (ReactorInstance child : r.children) {
+      clearConnections(child);
     }
+  }
+
+  /**
+   * Simple connection of two ports. This should be used only for connections that would be allowed
+   * in the syntax (i.e., no cross-hierarchy connections), but this is not checked.
+   *
+   * @param src The sending port.
+   * @param dst The receiving port.
+   */
+  protected void connect(PortInstance src, PortInstance dst) {
+    RuntimeRange<PortInstance> srcRange = new RuntimeRange.Port(src);
+    RuntimeRange<PortInstance> dstRange = new RuntimeRange.Port(dst);
+    ReactorInstance.connectPortInstances(srcRange, dstRange, null);
+  }
+
+  /**
+   * Connection between multiports. This should be used only for connections that would be allowed
+   * in the syntax (i.e., no cross-hierarchy connections), but this is not checked.
+   *
+   * @param src The sending port.
+   * @param dst The receiving port.
+   */
+  protected void connect(
+      PortInstance src, int srcStart, int srcWidth, PortInstance dst, int dstStart, int dstWidth) {
+    RuntimeRange<PortInstance> srcRange = new RuntimeRange.Port(src, srcStart, srcWidth, null);
+    RuntimeRange<PortInstance> dstRange = new RuntimeRange.Port(dst, dstStart, dstWidth, null);
+    ReactorInstance.connectPortInstances(srcRange, dstRange, null);
+  }
+
+  protected PortInstance newPort(String name, ReactorInstance container) {
+    Port p = factory.createPort();
+    p.setName(name);
+    return new PortInstance(p, container, reporter);
+  }
+
+  protected PortInstance newInputPort(String name, ReactorInstance container) {
+    PortInstance pi = newPort(name, container);
+    container.inputs.add(pi);
+    return pi;
+  }
+
+  protected PortInstance newOutputPort(String name, ReactorInstance container) {
+    PortInstance pi = newPort(name, container);
+    container.outputs.add(pi);
+    return pi;
+  }
+
+  /**
+   * Return a new reaction triggered by the specified port.
+   *
+   * @param trigger The triggering port.
+   */
+  protected ReactionInstance newReaction(PortInstance trigger) {
+    Reaction r = factory.createReaction();
+    ReactionInstance result =
+        new ReactionInstance(r, trigger.getParent(), false, trigger.getDependentReactions().size());
+    trigger.getDependentReactions().add(result);
+    trigger.getParent().reactions.add(result);
+    return result;
+  }
+
+  protected ReactorInstance newReactor(String name, ReactorInstance container) {
+    Reactor r = factory.createReactor();
+    r.setName(name);
+    ReactorInstance ri = new ReactorInstance(r, container, reporter);
+    container.children.add(ri);
+    return ri;
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/RangeTests.java b/org.lflang.tests/src/org/lflang/tests/compiler/RangeTests.java
index 5cd489d0f7..2c17145aaa 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/RangeTests.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/RangeTests.java
@@ -2,14 +2,13 @@
 
 import java.util.List;
 import java.util.Set;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.lflang.DefaultErrorReporter;
 import org.lflang.ErrorReporter;
 import org.lflang.generator.PortInstance;
-import org.lflang.generator.RuntimeRange;
 import org.lflang.generator.ReactorInstance;
+import org.lflang.generator.RuntimeRange;
 import org.lflang.generator.SendRange;
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.Port;
@@ -17,87 +16,87 @@
 
 public class RangeTests {
 
-    private ErrorReporter reporter = new DefaultErrorReporter();
-    private static LfFactory factory = LfFactory.eINSTANCE;
-    
-    @Test
-    public void createRange() throws Exception {
-        Reactor main = factory.createReactor();
-        ReactorInstance maini = new ReactorInstance(main, reporter);
-        
-        Reactor a = factory.createReactor();
-        a.setName("A");
-        ReactorInstance ai = new ReactorInstance(a, maini, reporter);
-        ai.setWidth(2);
-        
-        Reactor b = factory.createReactor();
-        b.setName("B");
-        ReactorInstance bi = new ReactorInstance(b, ai, reporter);
-        bi.setWidth(2);
-
-        Port p = factory.createPort();
-        p.setName("P");
-        PortInstance pi = new PortInstance(p, bi, reporter);
-        pi.setWidth(2);
-
-        Assertions.assertEquals(".A.B.P", pi.getFullName());
-        
-        RuntimeRange<PortInstance> range = new RuntimeRange.Port(pi, 3, 4, null);
-        
-        Assertions.assertEquals(8, range.maxWidth);
-        
-        Assertions.assertEquals(".A.B.P(3,4)", range.toString());
-
-        // The results expected below are derived from the class comment for RuntimeRange,
-        // which includes this example.
-        List<Integer> instances = range.instances();
-        Assertions.assertEquals(List.of(3, 4, 5, 6), instances);
-        Set<Integer> parents = range.parentInstances(1);
-        Assertions.assertEquals(Set.of(1, 2, 3), parents);
-        
-        parents = range.parentInstances(2);
-        Assertions.assertEquals(Set.of(0, 1), parents);
-        
-        // Test startMR().getDigits.
-        Assertions.assertEquals(List.of(1, 1, 0), range.startMR().getDigits());
-        
-        // Create a SendRange sending from and to this range.
-        SendRange sendRange = new SendRange(pi, 3, 4, null, null);
-        sendRange.destinations.add(range);
-        
-        // Test getNumberOfDestinationReactors.
-        Assertions.assertEquals(3, sendRange.getNumberOfDestinationReactors());
-        
-        // Make first interleaved version.
-        range = range.toggleInterleaved(bi);
-        instances = range.instances();
-        Assertions.assertEquals(List.of(3, 4, 6, 5), instances);
-
-        // Test startMR().getDigits.
-        Assertions.assertEquals(List.of(1, 1, 0), range.startMR().getDigits());
-
-        // Make second interleaved version.
-        range = range.toggleInterleaved(ai);
-        instances = range.instances();
-        Assertions.assertEquals(List.of(6, 1, 5, 3), instances);
-
-        // Test startMR().getDigits.
-        Assertions.assertEquals(List.of(0, 1, 1), range.startMR().getDigits());
-        
-        // Test instances of the parent.
-        Assertions.assertEquals(Set.of(3, 0, 2, 1), range.parentInstances(1));
-        
-        // Add this range to the sendRange destinations and verify
-        // that the number of destination reactors becomes 4.
-        sendRange.addDestination(range);
-        Assertions.assertEquals(4, sendRange.getNumberOfDestinationReactors());
-
-        // Make third interleaved version.
-        range = range.toggleInterleaved(bi);
-        instances = range.instances();
-        Assertions.assertEquals(List.of(5, 2, 6, 3), instances);
-
-        // Test startMR().getDigits.
-        Assertions.assertEquals(List.of(1, 0, 1), range.startMR().getDigits());
-    }
+  private ErrorReporter reporter = new DefaultErrorReporter();
+  private static LfFactory factory = LfFactory.eINSTANCE;
+
+  @Test
+  public void createRange() throws Exception {
+    Reactor main = factory.createReactor();
+    ReactorInstance maini = new ReactorInstance(main, reporter);
+
+    Reactor a = factory.createReactor();
+    a.setName("A");
+    ReactorInstance ai = new ReactorInstance(a, maini, reporter);
+    ai.setWidth(2);
+
+    Reactor b = factory.createReactor();
+    b.setName("B");
+    ReactorInstance bi = new ReactorInstance(b, ai, reporter);
+    bi.setWidth(2);
+
+    Port p = factory.createPort();
+    p.setName("P");
+    PortInstance pi = new PortInstance(p, bi, reporter);
+    pi.setWidth(2);
+
+    Assertions.assertEquals(".A.B.P", pi.getFullName());
+
+    RuntimeRange<PortInstance> range = new RuntimeRange.Port(pi, 3, 4, null);
+
+    Assertions.assertEquals(8, range.maxWidth);
+
+    Assertions.assertEquals(".A.B.P(3,4)", range.toString());
+
+    // The results expected below are derived from the class comment for RuntimeRange,
+    // which includes this example.
+    List<Integer> instances = range.instances();
+    Assertions.assertEquals(List.of(3, 4, 5, 6), instances);
+    Set<Integer> parents = range.parentInstances(1);
+    Assertions.assertEquals(Set.of(1, 2, 3), parents);
+
+    parents = range.parentInstances(2);
+    Assertions.assertEquals(Set.of(0, 1), parents);
+
+    // Test startMR().getDigits.
+    Assertions.assertEquals(List.of(1, 1, 0), range.startMR().getDigits());
+
+    // Create a SendRange sending from and to this range.
+    SendRange sendRange = new SendRange(pi, 3, 4, null, null);
+    sendRange.destinations.add(range);
+
+    // Test getNumberOfDestinationReactors.
+    Assertions.assertEquals(3, sendRange.getNumberOfDestinationReactors());
+
+    // Make first interleaved version.
+    range = range.toggleInterleaved(bi);
+    instances = range.instances();
+    Assertions.assertEquals(List.of(3, 4, 6, 5), instances);
+
+    // Test startMR().getDigits.
+    Assertions.assertEquals(List.of(1, 1, 0), range.startMR().getDigits());
+
+    // Make second interleaved version.
+    range = range.toggleInterleaved(ai);
+    instances = range.instances();
+    Assertions.assertEquals(List.of(6, 1, 5, 3), instances);
+
+    // Test startMR().getDigits.
+    Assertions.assertEquals(List.of(0, 1, 1), range.startMR().getDigits());
+
+    // Test instances of the parent.
+    Assertions.assertEquals(Set.of(3, 0, 2, 1), range.parentInstances(1));
+
+    // Add this range to the sendRange destinations and verify
+    // that the number of destination reactors becomes 4.
+    sendRange.addDestination(range);
+    Assertions.assertEquals(4, sendRange.getNumberOfDestinationReactors());
+
+    // Make third interleaved version.
+    range = range.toggleInterleaved(bi);
+    instances = range.instances();
+    Assertions.assertEquals(List.of(5, 2, 6, 3), instances);
+
+    // Test startMR().getDigits.
+    Assertions.assertEquals(List.of(1, 0, 1), range.startMR().getDigits());
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/RoundTripTests.java b/org.lflang.tests/src/org/lflang/tests/compiler/RoundTripTests.java
index 801211be23..8087d552a8 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/RoundTripTests.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/RoundTripTests.java
@@ -7,13 +7,11 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.lflang.Target;
 import org.lflang.ast.FormattingUtils;
 import org.lflang.ast.IsEqual;
@@ -28,46 +26,42 @@
 @InjectWith(LFInjectorProvider.class)
 public class RoundTripTests {
 
-    @Test
-    public void roundTripTest() {
-        for (Target target : Target.values()) {
-            for (TestCategory category : TestCategory.values()) {
-                for (LFTest test : TestRegistry.getRegisteredTests(target, category, false)) {
-                    try {
-                        run(test.getSrcPath());
-                    } catch (Throwable thrown) {
-                        fail("Test case " + test.getSrcPath() + " failed", thrown);
-                    }
-                }
-            }
+  @Test
+  public void roundTripTest() {
+    for (Target target : Target.values()) {
+      for (TestCategory category : TestCategory.values()) {
+        for (LFTest test : TestRegistry.getRegisteredTests(target, category, false)) {
+          try {
+            run(test.getSrcPath());
+          } catch (Throwable thrown) {
+            fail("Test case " + test.getSrcPath() + " failed", thrown);
+          }
         }
+      }
     }
+  }
 
-    private void run(Path file) throws Exception {
-        Model originalModel = LfParsingUtil.parse(file);
-        System.out.println(file);
-        assertThat(originalModel.eResource().getErrors(), equalTo(emptyList()));
-        // TODO: Check that the output is a fixed point
-        final int smallLineLength = 20;
-        final String squishedTestCase = FormattingUtils.render(originalModel, smallLineLength);
-        final Model resultingModel = LfParsingUtil.parseSourceAsIfInDirectory(file.getParent(), squishedTestCase);
-
-        assertThat(resultingModel.eResource().getErrors(), equalTo(emptyList()));
-        Assertions.assertTrue(
-            new IsEqual(originalModel).doSwitch(resultingModel),
-            String.format(
-                "The reformatted version of %s was not equivalent to the original file.%n"
-                    + "Formatted file:%n%s%n%n",
-                file,
-                squishedTestCase
-            )
-        );
-        final String normalTestCase = FormattingUtils.render(originalModel);
-        Assertions.assertEquals(
-            Files.readString(file).replaceAll("\\r\\n?", "\n"),
-            normalTestCase,
-            "File is not formatted properly, or formatter is bugged. Check " + file
-        );
-    }
+  private void run(Path file) throws Exception {
+    Model originalModel = LfParsingUtil.parse(file);
+    System.out.println(file);
+    assertThat(originalModel.eResource().getErrors(), equalTo(emptyList()));
+    // TODO: Check that the output is a fixed point
+    final int smallLineLength = 20;
+    final String squishedTestCase = FormattingUtils.render(originalModel, smallLineLength);
+    final Model resultingModel =
+        LfParsingUtil.parseSourceAsIfInDirectory(file.getParent(), squishedTestCase);
 
+    assertThat(resultingModel.eResource().getErrors(), equalTo(emptyList()));
+    Assertions.assertTrue(
+        new IsEqual(originalModel).doSwitch(resultingModel),
+        String.format(
+            "The reformatted version of %s was not equivalent to the original file.%n"
+                + "Formatted file:%n%s%n%n",
+            file, squishedTestCase));
+    final String normalTestCase = FormattingUtils.render(originalModel);
+    Assertions.assertEquals(
+        Files.readString(file).replaceAll("\\r\\n?", "\n"),
+        normalTestCase,
+        "File is not formatted properly, or formatter is bugged. Check " + file);
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/TargetConfigTests.java b/org.lflang.tests/src/org/lflang/tests/compiler/TargetConfigTests.java
index eede6a6831..e949ab6f9f 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/TargetConfigTests.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/TargetConfigTests.java
@@ -12,7 +12,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGenerator;
@@ -24,79 +23,81 @@
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
 
-/**
- * Tests for checking that target properties adequately translate into the target configuration.
- */
+/** Tests for checking that target properties adequately translate into the target configuration. */
 class TargetConfigTests {
 
-    @Inject
-    ParseHelper<Model> parser;
-
-    @Inject
-    LFGenerator generator;
-
-    @Inject
-    JavaIoFileSystemAccess fileAccess;
-
-    @Inject
-    Provider<ResourceSet> resourceSetProvider;
-
-    private void assertHasTargetProperty(Model model, String name) {
-        Assertions.assertNotNull(model);
-        Assertions.assertTrue(
-            model.getTarget().getConfig().getPairs().stream().anyMatch(
-                p -> p.getName().equals(name)
-            )
-        );
-    }
-
-    /**
-     * Check that tracing target property affects the target configuration.
-     * @throws Exception
-     */
-    @Test
-    public void testParsing() throws Exception {
-        assertHasTargetProperty(parser.parse("""
+  @Inject ParseHelper<Model> parser;
+
+  @Inject LFGenerator generator;
+
+  @Inject JavaIoFileSystemAccess fileAccess;
+
+  @Inject Provider<ResourceSet> resourceSetProvider;
+
+  private void assertHasTargetProperty(Model model, String name) {
+    Assertions.assertNotNull(model);
+    Assertions.assertTrue(
+        model.getTarget().getConfig().getPairs().stream().anyMatch(p -> p.getName().equals(name)));
+  }
+
+  /**
+   * Check that tracing target property affects the target configuration.
+   *
+   * @throws Exception
+   */
+  @Test
+  public void testParsing() throws Exception {
+    assertHasTargetProperty(
+        parser.parse(
+            """
             target C {
               tracing: true
             }
-            """), "tracing");
-    }
-
-    /**
-     * Check that when a federation has the "tracing" target property set, the generated federates
-     * will also have it set.
-     * @throws Exception
-     */
-    @Test
-    public void testFederation() throws Exception {
-        fileAccess.setOutputPath("src-gen");
-
-        Model federation = parser.parse("""
+            """),
+        "tracing");
+  }
+
+  /**
+   * Check that when a federation has the "tracing" target property set, the generated federates
+   * will also have it set.
+   *
+   * @throws Exception
+   */
+  @Test
+  public void testFederation() throws Exception {
+    fileAccess.setOutputPath("src-gen");
+
+    Model federation =
+        parser.parse(
+            """
             target C {
               tracing: true
             }
             reactor Foo {
-            
+
             }
             federated reactor {
                 a = new Foo()
                 b = new Foo()
             }
-            """, URI.createFileURI("tmp/src/Federation.lf"), resourceSetProvider.get());
-        assertHasTargetProperty(federation, "tracing");
-
-        var resource = federation.eResource();
-        var context = new MainContext(Mode.STANDALONE, resource, fileAccess, () -> false);
-
-        if (GeneratorUtils.isHostWindows()) return;
-
-        generator.doGenerate(resource, fileAccess, context);
-
-        String lfSrc = Files.readAllLines(
-            ((FedFileConfig)context.getFileConfig()).getSrcPath().resolve("federate__a.lf")
-        ).stream().reduce("\n", String::concat);
-        Model federate = parser.parse(lfSrc);
-        assertHasTargetProperty(federate, "tracing");
-    }
+            """,
+            URI.createFileURI("tmp/src/Federation.lf"),
+            resourceSetProvider.get());
+    assertHasTargetProperty(federation, "tracing");
+
+    var resource = federation.eResource();
+    var context = new MainContext(Mode.STANDALONE, resource, fileAccess, () -> false);
+
+    if (GeneratorUtils.isHostWindows()) return;
+
+    generator.doGenerate(resource, fileAccess, context);
+
+    String lfSrc =
+        Files.readAllLines(
+                ((FedFileConfig) context.getFileConfig()).getSrcPath().resolve("federate__a.lf"))
+            .stream()
+            .reduce("\n", String::concat);
+    Model federate = parser.parse(lfSrc);
+    assertHasTargetProperty(federate, "tracing");
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/lsp/ErrorInserter.java b/org.lflang.tests/src/org/lflang/tests/lsp/ErrorInserter.java
index a7b1c9d8ec..a1948821eb 100644
--- a/org.lflang.tests/src/org/lflang/tests/lsp/ErrorInserter.java
+++ b/org.lflang.tests/src/org/lflang/tests/lsp/ErrorInserter.java
@@ -1,5 +1,6 @@
 package org.lflang.tests.lsp;
 
+import com.google.common.collect.ImmutableList;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -17,339 +18,364 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import com.google.common.collect.ImmutableList;
-
 /**
  * Insert problems into integration tests.
+ *
  * @author Peter Donovan
  */
 @SuppressWarnings("ClassCanBeRecord")
 class ErrorInserter {
 
-    /** A basic error inserter builder on which more specific error inserters can be built. */
-    private static final Builder BASE_ERROR_INSERTER = new Builder()
-        .insertCondition((s0, s1) -> Stream.of(s0, s1).allMatch(it -> Stream.of(";", "}", "{").anyMatch(it::endsWith)))
-        .insertCondition((s0, s1) -> !s1.trim().startsWith("else"))
-        .insertable("    0 = 1;").insertable("some_undeclared_var1524263 = 9;").insertable("        ++;");
-    public static final Builder C = BASE_ERROR_INSERTER
-        .replacer("lf_set(", "UNDEFINED_NAME2828376(")
-        .replacer("lf_schedule(", "undefined_name15291838(");
-    public static final Builder CPP = BASE_ERROR_INSERTER
-        .replacer(".get", ".undefined_name15291838")
-        .replacer("std::", "undefined_name3286634::");
-    public static final Builder PYTHON_SYNTAX_ONLY = new Builder()
-        .insertable("        +++++;").insertable("        ..");
-    public static final Builder PYTHON = PYTHON_SYNTAX_ONLY
-        .replacer("print(", "undefined_name15291838(");
-    public static final Builder RUST = BASE_ERROR_INSERTER
-        .replacer("println!", "undefined_name15291838!")
-        .replacer("ctx.", "undefined_name3286634.");
-    public static final Builder TYPESCRIPT = BASE_ERROR_INSERTER
-        .replacer("requestErrorStop(", "not_an_attribute_of_util9764(")
-        .replacer("const ", "var ");
-
-    /** An {@code AlteredTest} represents an altered version of what was a valid LF file. */
-    static class AlteredTest implements Closeable {
-
-        /** A {@code OnceTrue} is randomly true once, and then never again. */
-        private static class OnceTrue {
-            boolean beenTrue;
-            Random random;
-            private OnceTrue(Random random) {
-                this.beenTrue = false;
-                this.random = random;
-            }
-            private boolean get() {
-                if (beenTrue) return false;
-                return beenTrue = random.nextBoolean() && random.nextBoolean();
-            }
-        }
-
-        /** The zero-based indices of the touched lines. */
-        private final List<Integer> badLines;
-        /** The original test on which this is based. */
-        private final Path srcFile;
-        /** The content of this test. */
-        private final LinkedList<String> lines;
-        /** Whether the error inserter is permitted to insert a line before the current line. */
-        private final Predicate<ListIterator<String>> insertCondition;
-
-        /**
-         * Initialize a possibly altered copy of {@code originalTest}.
-         * @param originalTest A path to an LF file that serves as a test.
-         * @param insertCondition Whether the error inserter is permitted to insert a line between two given lines.
-         * @throws IOException if the content of {@code originalTest} cannot be read.
-         */
-        private AlteredTest(Path originalTest, BiPredicate<String, String> insertCondition) throws IOException {
-            this.badLines = new ArrayList<>();
-            this.srcFile = originalTest;
-            this.lines = new LinkedList<>();  // Constant-time insertion during iteration is desired.
-            this.lines.addAll(Files.readAllLines(srcFile));
-            this.insertCondition = it -> {
-                it.previous();
-                String s0 = it.previous();
-                it.next();
-                String s1 = it.next();
-                return insertCondition.test(s0, s1);
-            };
-        }
+  /** A basic error inserter builder on which more specific error inserters can be built. */
+  private static final Builder BASE_ERROR_INSERTER =
+      new Builder()
+          .insertCondition(
+              (s0, s1) ->
+                  Stream.of(s0, s1).allMatch(it -> Stream.of(";", "}", "{").anyMatch(it::endsWith)))
+          .insertCondition((s0, s1) -> !s1.trim().startsWith("else"))
+          .insertable("    0 = 1;")
+          .insertable("some_undeclared_var1524263 = 9;")
+          .insertable("        ++;");
+
+  public static final Builder C =
+      BASE_ERROR_INSERTER
+          .replacer("lf_set(", "UNDEFINED_NAME2828376(")
+          .replacer("lf_schedule(", "undefined_name15291838(");
+  public static final Builder CPP =
+      BASE_ERROR_INSERTER
+          .replacer(".get", ".undefined_name15291838")
+          .replacer("std::", "undefined_name3286634::");
+  public static final Builder PYTHON_SYNTAX_ONLY =
+      new Builder().insertable("        +++++;").insertable("        ..");
+  public static final Builder PYTHON =
+      PYTHON_SYNTAX_ONLY.replacer("print(", "undefined_name15291838(");
+  public static final Builder RUST =
+      BASE_ERROR_INSERTER
+          .replacer("println!", "undefined_name15291838!")
+          .replacer("ctx.", "undefined_name3286634.");
+  public static final Builder TYPESCRIPT =
+      BASE_ERROR_INSERTER
+          .replacer("requestErrorStop(", "not_an_attribute_of_util9764(")
+          .replacer("const ", "var ");
+
+  /** An {@code AlteredTest} represents an altered version of what was a valid LF file. */
+  static class AlteredTest implements Closeable {
+
+    /** A {@code OnceTrue} is randomly true once, and then never again. */
+    private static class OnceTrue {
+      boolean beenTrue;
+      Random random;
+
+      private OnceTrue(Random random) {
+        this.beenTrue = false;
+        this.random = random;
+      }
 
-        /** Return the location where the content of {@code this} lives. */
-        public Path getSrcFile() {
-            return srcFile;
-        }
+      private boolean get() {
+        if (beenTrue) return false;
+        return beenTrue = random.nextBoolean() && random.nextBoolean();
+      }
+    }
 
-        /**
-         * Write the altered version of the test to the file system.
-         * @throws IOException If an I/O error occurred.
-         */
-        public void write() throws IOException {
-            Path src = srcFile;
-            if (!src.toFile().renameTo(swapFile(src).toFile())) {
-                throw new IOException("Failed to create a swap file.");
-            }
-            try (PrintWriter writer = new PrintWriter(src.toFile())) {
-                lines.forEach(writer::println);
-            }
-        }
+    /** The zero-based indices of the touched lines. */
+    private final List<Integer> badLines;
+    /** The original test on which this is based. */
+    private final Path srcFile;
+    /** The content of this test. */
+    private final LinkedList<String> lines;
+    /** Whether the error inserter is permitted to insert a line before the current line. */
+    private final Predicate<ListIterator<String>> insertCondition;
 
-        /**
-         * Restore the file associated with this test to its original state.
-         */
-        @Override
-        public void close() throws IOException {
-            Path src = srcFile;
-            if (!swapFile(src).toFile().exists()) throw new IllegalStateException("Swap file does not exist.");
-            if (!src.toFile().delete()) {
-                throw new IOException("Failed to delete the file associated with the original test.");
-            }
-            if (!swapFile(src).toFile().renameTo(src.toFile())) {
-                throw new IOException("Failed to restore the altered LF file to its original state.");
-            }
-        }
+    /**
+     * Initialize a possibly altered copy of {@code originalTest}.
+     *
+     * @param originalTest A path to an LF file that serves as a test.
+     * @param insertCondition Whether the error inserter is permitted to insert a line between two
+     *     given lines.
+     * @throws IOException if the content of {@code originalTest} cannot be read.
+     */
+    private AlteredTest(Path originalTest, BiPredicate<String, String> insertCondition)
+        throws IOException {
+      this.badLines = new ArrayList<>();
+      this.srcFile = originalTest;
+      this.lines = new LinkedList<>(); // Constant-time insertion during iteration is desired.
+      this.lines.addAll(Files.readAllLines(srcFile));
+      this.insertCondition =
+          it -> {
+            it.previous();
+            String s0 = it.previous();
+            it.next();
+            String s1 = it.next();
+            return insertCondition.test(s0, s1);
+          };
+    }
 
-        @Override
-        public String toString() {
-            int lengthOfPrefix = 6;
-            StringBuilder ret = new StringBuilder(
-                lines.stream().mapToInt(String::length).reduce(0, Integer::sum)
-                + lines.size() * lengthOfPrefix
-            );
-            for (int i = 0; i < lines.size(); i++) {
-                ret.append(badLines.contains(i) ? "-> " : "   ")
-                   .append(String.format("%1$2s ", i))
-                   .append(lines.get(i)).append("\n");
-            }
-            return ret.toString();
-        }
+    /** Return the location where the content of {@code this} lives. */
+    public Path getSrcFile() {
+      return srcFile;
+    }
 
-        /** Return the lines where this differs from the test from which it was derived. */
-        public ImmutableList<Integer> getBadLines() {
-            return ImmutableList.copyOf(badLines);
-        }
+    /**
+     * Write the altered version of the test to the file system.
+     *
+     * @throws IOException If an I/O error occurred.
+     */
+    public void write() throws IOException {
+      Path src = srcFile;
+      if (!src.toFile().renameTo(swapFile(src).toFile())) {
+        throw new IOException("Failed to create a swap file.");
+      }
+      try (PrintWriter writer = new PrintWriter(src.toFile())) {
+        lines.forEach(writer::println);
+      }
+    }
 
-        /**
-         * Attempt to replace a line of this test with a different line of target language code.
-         * @param replacer A function that replaces lines of code with possibly different lines.
-         */
-        public void replace(Function<String, String> replacer, Random random) {
-            OnceTrue onceTrue = new OnceTrue(random);
-            alter((it, current) -> {
-                if (!onceTrue.get()) return false;
-                String newLine = replacer.apply(current);
-                it.remove();
-                it.add(newLine);
-                return !newLine.equals(current);
-            });
-        }
+    /** Restore the file associated with this test to its original state. */
+    @Override
+    public void close() throws IOException {
+      Path src = srcFile;
+      if (!swapFile(src).toFile().exists())
+        throw new IllegalStateException("Swap file does not exist.");
+      if (!src.toFile().delete()) {
+        throw new IOException("Failed to delete the file associated with the original test.");
+      }
+      if (!swapFile(src).toFile().renameTo(src.toFile())) {
+        throw new IOException("Failed to restore the altered LF file to its original state.");
+      }
+    }
 
-        /**
-         * Attempt to insert a new line of target language code into this test.
-         * @param line The line to be inserted.
-         */
-        public void insert(String line, Random random) {
-            OnceTrue onceTrue = new OnceTrue(random);
-            alter((it, current) -> {
-                if (insertCondition.test(it) && onceTrue.get()) {
-                    it.previous();
-                    it.add(line);
-                    it.next();
-                    return true;
-                }
-                return false;
-            });
-        }
+    @Override
+    public String toString() {
+      int lengthOfPrefix = 6;
+      StringBuilder ret =
+          new StringBuilder(
+              lines.stream().mapToInt(String::length).reduce(0, Integer::sum)
+                  + lines.size() * lengthOfPrefix);
+      for (int i = 0; i < lines.size(); i++) {
+        ret.append(badLines.contains(i) ? "-> " : "   ")
+            .append(String.format("%1$2s ", i))
+            .append(lines.get(i))
+            .append("\n");
+      }
+      return ret.toString();
+    }
 
-        /**
-         * Alter the content of this test.
-         * @param alterer A function whose first argument is an iterator over the lines of {@code this}, whose second
-         *                argument is the line most recently returned by that iterator, and whose return value is
-         *                whether an alteration was successfully performed. This function is only applied within
-         *                multiline code blocks.
-         */
-        private void alter(BiFunction<ListIterator<String>, String, Boolean> alterer) {
-            ListIterator<String> it = lines.listIterator();
-            boolean inCodeBlock = false;
-            int lineNumber = 0;
-            while (it.hasNext()) {
-                String current = it.next();
-                String uncommented = current.contains("//") ?
-                    current.substring(0, current.indexOf("//")) : current;
-                uncommented = uncommented.contains("#") ?
-                    uncommented.substring(0, uncommented.indexOf("#")) : current;
-                if (uncommented.contains("=}")) inCodeBlock = false;
-                if (inCodeBlock && alterer.apply(it, current)) badLines.add(lineNumber);
-                if (uncommented.contains("{=")) inCodeBlock = true;
-                if (uncommented.contains("{=") && uncommented.contains("=}")) {
-                    inCodeBlock = uncommented.lastIndexOf("{=") > uncommented.lastIndexOf("=}");
-                }
-                lineNumber++;
-            }
-        }
+    /** Return the lines where this differs from the test from which it was derived. */
+    public ImmutableList<Integer> getBadLines() {
+      return ImmutableList.copyOf(badLines);
+    }
 
-        /** Return the swap file associated with {@code f}. */
-        private static Path swapFile(Path p) {
-            return p.getParent().resolve("." + p.getFileName() + ".swp");
-        }
+    /**
+     * Attempt to replace a line of this test with a different line of target language code.
+     *
+     * @param replacer A function that replaces lines of code with possibly different lines.
+     */
+    public void replace(Function<String, String> replacer, Random random) {
+      OnceTrue onceTrue = new OnceTrue(random);
+      alter(
+          (it, current) -> {
+            if (!onceTrue.get()) return false;
+            String newLine = replacer.apply(current);
+            it.remove();
+            it.add(newLine);
+            return !newLine.equals(current);
+          });
     }
 
-    /** A builder for an error inserter. */
-    public static class Builder {
-        private static class Node<T> implements Iterable<T> {
-            private final Node<T> previous;
-            private final T item;
-            private Node(Node<T> previous, T item) {
-                this.previous = previous;
-                this.item = item;
+    /**
+     * Attempt to insert a new line of target language code into this test.
+     *
+     * @param line The line to be inserted.
+     */
+    public void insert(String line, Random random) {
+      OnceTrue onceTrue = new OnceTrue(random);
+      alter(
+          (it, current) -> {
+            if (insertCondition.test(it) && onceTrue.get()) {
+              it.previous();
+              it.add(line);
+              it.next();
+              return true;
             }
+            return false;
+          });
+    }
 
-            @Override
-            public Iterator<T> iterator() {
-                NodeIterator<T> ret = new NodeIterator<>();
-                ret.current = this;
-                return ret;
-            }
+    /**
+     * Alter the content of this test.
+     *
+     * @param alterer A function whose first argument is an iterator over the lines of {@code this},
+     *     whose second argument is the line most recently returned by that iterator, and whose
+     *     return value is whether an alteration was successfully performed. This function is only
+     *     applied within multiline code blocks.
+     */
+    private void alter(BiFunction<ListIterator<String>, String, Boolean> alterer) {
+      ListIterator<String> it = lines.listIterator();
+      boolean inCodeBlock = false;
+      int lineNumber = 0;
+      while (it.hasNext()) {
+        String current = it.next();
+        String uncommented =
+            current.contains("//") ? current.substring(0, current.indexOf("//")) : current;
+        uncommented =
+            uncommented.contains("#")
+                ? uncommented.substring(0, uncommented.indexOf("#"))
+                : current;
+        if (uncommented.contains("=}")) inCodeBlock = false;
+        if (inCodeBlock && alterer.apply(it, current)) badLines.add(lineNumber);
+        if (uncommented.contains("{=")) inCodeBlock = true;
+        if (uncommented.contains("{=") && uncommented.contains("=}")) {
+          inCodeBlock = uncommented.lastIndexOf("{=") > uncommented.lastIndexOf("=}");
+        }
+        lineNumber++;
+      }
+    }
 
-            private static class NodeIterator<T> implements Iterator<T> {
-                private Node<T> current;
+    /** Return the swap file associated with {@code f}. */
+    private static Path swapFile(Path p) {
+      return p.getParent().resolve("." + p.getFileName() + ".swp");
+    }
+  }
 
-                @Override
-                public boolean hasNext() {
-                    return current != null;
-                }
+  /** A builder for an error inserter. */
+  public static class Builder {
+    private static class Node<T> implements Iterable<T> {
+      private final Node<T> previous;
+      private final T item;
 
-                @Override
-                public T next() {
-                    T ret = current.item;
-                    current = current.previous;
-                    return ret;
-                }
-            }
-        }
-        private final Node<Function<String, String>> replacers;
-        private final Node<String> insertables;
-        private final BiPredicate<String, String> insertCondition;
+      private Node(Node<T> previous, T item) {
+        this.previous = previous;
+        this.item = item;
+      }
 
-        /** Initializes a builder for error inserters. */
-        public Builder() {
-            this(null, null, (s0, s1) -> true);
-        }
+      @Override
+      public Iterator<T> iterator() {
+        NodeIterator<T> ret = new NodeIterator<>();
+        ret.current = this;
+        return ret;
+      }
 
-        /** Construct a builder with the given replacers and insertables. */
-        private Builder(
-            Node<Function<String, String>> replacers,
-            Node<String> insertables,
-            BiPredicate<String, String> insertCondition
-        ) {
-            this.replacers = replacers;
-            this.insertables = insertables;
-            this.insertCondition = insertCondition;
-        }
+      private static class NodeIterator<T> implements Iterator<T> {
+        private Node<T> current;
 
-        /**
-         * Record that the resulting {@code ErrorInserter} may replace {@code phrase} with {@code alternativePhrase}.
-         * @param phrase A phrase in target language code.
-         * @param alternativePhrase A phrase that {@code phrase} may be replaced with in order to introduce an error.
-         * @return A {@code Builder} that knows about all the edits that {@code this} knows about, plus the edit that
-         * replaces {@code phrase} with {@code alternativePhrase}.
-         */
-        public Builder replacer(String phrase, String alternativePhrase) {
-            return new Builder(
-                new Node<>(
-                    replacers,
-                    line -> {
-                        int changeableEnd = line.length();
-                        for (String bad : new String[]{"#", "//", "\""}) {
-                            if (line.contains(bad)) changeableEnd = Math.min(changeableEnd, line.indexOf(bad));
-                        }
-                        return line.substring(0, changeableEnd).replace(phrase, alternativePhrase)
-                            + line.substring(changeableEnd);
-                    }
-                ),
-                insertables,
-                insertCondition
-            );
+        @Override
+        public boolean hasNext() {
+          return current != null;
         }
 
-        /** Record that {@code} line may be inserted in order to introduce an error. */
-        public Builder insertable(String line) {
-            return new Builder(replacers, new Node<>(insertables, line), insertCondition);
+        @Override
+        public T next() {
+          T ret = current.item;
+          current = current.previous;
+          return ret;
         }
+      }
+    }
 
-        /**
-         * Record that for any lines X, Y, insertCondition(X, Y) is a necessary condition that a line may be inserted
-         * between X and Y.
-         */
-        public Builder insertCondition(BiPredicate<String, String> insertCondition) {
-            return new Builder(replacers, insertables, this.insertCondition.and(insertCondition));
-        }
+    private final Node<Function<String, String>> replacers;
+    private final Node<String> insertables;
+    private final BiPredicate<String, String> insertCondition;
 
-        /** Get the error inserter generated by {@code this}. */
-        public ErrorInserter get(Random random) {
-            return new ErrorInserter(
-                random,
-                replacers == null ? ImmutableList.of() : ImmutableList.copyOf(replacers),
-                insertables == null ? ImmutableList.of() : ImmutableList.copyOf(insertables),
-                insertCondition
-            );
-        }
+    /** Initializes a builder for error inserters. */
+    public Builder() {
+      this(null, null, (s0, s1) -> true);
     }
 
-    private static final int MAX_ALTERATION_ATTEMPTS = 100;
+    /** Construct a builder with the given replacers and insertables. */
+    private Builder(
+        Node<Function<String, String>> replacers,
+        Node<String> insertables,
+        BiPredicate<String, String> insertCondition) {
+      this.replacers = replacers;
+      this.insertables = insertables;
+      this.insertCondition = insertCondition;
+    }
 
-    private final Random random;
-    private final ImmutableList<Function<String, String>> replacers;
-    private final ImmutableList<String> insertables;
-    private final BiPredicate<String, String> insertCondition;
+    /**
+     * Record that the resulting {@code ErrorInserter} may replace {@code phrase} with {@code
+     * alternativePhrase}.
+     *
+     * @param phrase A phrase in target language code.
+     * @param alternativePhrase A phrase that {@code phrase} may be replaced with in order to
+     *     introduce an error.
+     * @return A {@code Builder} that knows about all the edits that {@code this} knows about, plus
+     *     the edit that replaces {@code phrase} with {@code alternativePhrase}.
+     */
+    public Builder replacer(String phrase, String alternativePhrase) {
+      return new Builder(
+          new Node<>(
+              replacers,
+              line -> {
+                int changeableEnd = line.length();
+                for (String bad : new String[] {"#", "//", "\""}) {
+                  if (line.contains(bad))
+                    changeableEnd = Math.min(changeableEnd, line.indexOf(bad));
+                }
+                return line.substring(0, changeableEnd).replace(phrase, alternativePhrase)
+                    + line.substring(changeableEnd);
+              }),
+          insertables,
+          insertCondition);
+    }
 
-    private ErrorInserter(
-        Random random,
-        ImmutableList<Function<String, String>> replacers,
-        ImmutableList<String> insertables,
-        BiPredicate<String, String> insertCondition
-    ) {
-        this.random = random;
-        this.replacers = replacers;
-        this.insertables = insertables;
-        this.insertCondition = insertCondition;
+    /** Record that {@code} line may be inserted in order to introduce an error. */
+    public Builder insertable(String line) {
+      return new Builder(replacers, new Node<>(insertables, line), insertCondition);
     }
 
     /**
-     * Alter the given test and return the altered version.
-     * @param test The path to the test.
-     * @return An {@code AlteredTest} that is based on {@code test}.
+     * Record that for any lines X, Y, insertCondition(X, Y) is a necessary condition that a line
+     * may be inserted between X and Y.
      */
-    public AlteredTest alterTest(Path test) throws IOException {
-        AlteredTest alterable = new AlteredTest(test, insertCondition);
-        int remainingAlterationAttempts = MAX_ALTERATION_ATTEMPTS;
-        while (alterable.getBadLines().isEmpty() && remainingAlterationAttempts-- > 0) {
-            if (random.nextBoolean() && !replacers.isEmpty()) {
-                alterable.replace(replacers.get(random.nextInt(replacers.size())), random);
-            } else if (!insertables.isEmpty()) {
-                alterable.insert(insertables.get(random.nextInt(insertables.size())), random);
-            }
-        }
-        alterable.write();
-        return alterable;
+    public Builder insertCondition(BiPredicate<String, String> insertCondition) {
+      return new Builder(replacers, insertables, this.insertCondition.and(insertCondition));
+    }
+
+    /** Get the error inserter generated by {@code this}. */
+    public ErrorInserter get(Random random) {
+      return new ErrorInserter(
+          random,
+          replacers == null ? ImmutableList.of() : ImmutableList.copyOf(replacers),
+          insertables == null ? ImmutableList.of() : ImmutableList.copyOf(insertables),
+          insertCondition);
+    }
+  }
+
+  private static final int MAX_ALTERATION_ATTEMPTS = 100;
+
+  private final Random random;
+  private final ImmutableList<Function<String, String>> replacers;
+  private final ImmutableList<String> insertables;
+  private final BiPredicate<String, String> insertCondition;
+
+  private ErrorInserter(
+      Random random,
+      ImmutableList<Function<String, String>> replacers,
+      ImmutableList<String> insertables,
+      BiPredicate<String, String> insertCondition) {
+    this.random = random;
+    this.replacers = replacers;
+    this.insertables = insertables;
+    this.insertCondition = insertCondition;
+  }
+
+  /**
+   * Alter the given test and return the altered version.
+   *
+   * @param test The path to the test.
+   * @return An {@code AlteredTest} that is based on {@code test}.
+   */
+  public AlteredTest alterTest(Path test) throws IOException {
+    AlteredTest alterable = new AlteredTest(test, insertCondition);
+    int remainingAlterationAttempts = MAX_ALTERATION_ATTEMPTS;
+    while (alterable.getBadLines().isEmpty() && remainingAlterationAttempts-- > 0) {
+      if (random.nextBoolean() && !replacers.isEmpty()) {
+        alterable.replace(replacers.get(random.nextInt(replacers.size())), random);
+      } else if (!insertables.isEmpty()) {
+        alterable.insert(insertables.get(random.nextInt(insertables.size())), random);
+      }
     }
+    alterable.write();
+    return alterable;
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/lsp/LspTests.java b/org.lflang.tests/src/org/lflang/tests/lsp/LspTests.java
index 99c1260d44..fe52d6016c 100644
--- a/org.lflang.tests/src/org/lflang/tests/lsp/LspTests.java
+++ b/org.lflang.tests/src/org/lflang/tests/lsp/LspTests.java
@@ -9,12 +9,10 @@
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
-
-import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.lsp4j.Diagnostic;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-
 import org.lflang.LFRuntimeModule;
 import org.lflang.LFStandaloneSetup;
 import org.lflang.Target;
@@ -33,188 +31,211 @@
  */
 class LspTests {
 
-    /** The test categories that should be excluded from LSP tests. */
-    private static final TestCategory[] EXCLUDED_CATEGORIES = {
-        TestCategory.SERIALIZATION, TestCategory.DOCKER, TestCategory.DOCKER_FEDERATED
-    };
-    private static final Predicate<List<Diagnostic>> NOT_SUPPORTED = diagnosticsHaveKeyword("supported");
-    private static final Predicate<List<Diagnostic>> MISSING_DEPENDENCY = diagnosticsHaveKeyword("libprotoc")
-        .or(diagnosticsHaveKeyword("protoc-c")).or(diagnosticsIncludeText("could not be found"));
-    /** The number of samples to take from each test category (with replacement) when doing validation tests. */
-    private static final int SAMPLES_PER_CATEGORY_VALIDATION_TESTS = 3;
-
-    /** The {@code IntegratedBuilder} instance whose behavior is to be tested. */
-    private static final IntegratedBuilder builder = new LFStandaloneSetup(new LFRuntimeModule())
-        .createInjectorAndDoEMFRegistration().getInstance(IntegratedBuilder.class);
-
-    /** Test for false negatives in Python syntax-only validation. */
-    @Test
-    void pythonValidationTestSyntaxOnly() throws IOException {
-        targetLanguageValidationTest(Target.Python, ErrorInserter.PYTHON_SYNTAX_ONLY);
-    }
-
-    /** Test for false negatives in C++ validation. */
-    @Test
-    void cppValidationTest() throws IOException {
-        targetLanguageValidationTest(Target.CPP, ErrorInserter.CPP);
-    }
-
-    /** Test for false negatives in Python validation. */
-    @Test
-    void pythonValidationTest() throws IOException {
-        targetLanguageValidationTest(Target.Python, ErrorInserter.PYTHON);
-    }
-
-    /** Test for false negatives in Rust validation. */
-    @Test
-    void rustValidationTest() throws IOException {
-        targetLanguageValidationTest(Target.Rust, ErrorInserter.RUST);
-    }
-
-    /** Test for false negatives in TypeScript validation. */
-    @Test
-    void typescriptValidationTest() throws IOException {
-        targetLanguageValidationTest(Target.TS, ErrorInserter.TYPESCRIPT);
-    }
-
-    /**
-     * Test for false negatives in the validation of LF files.
-     * @param target The target language of the LF files to be validated.
-     * @param builder A builder for the error inserter that will be used.
-     */
-    private void targetLanguageValidationTest(Target target, ErrorInserter.Builder builder) throws IOException {
-        long seed = new Random().nextLong();
-        System.out.printf("Running validation tests for %s with random seed %d.%n", target.getDisplayName(), seed);
-        Random random = new Random(seed);
-        int i = SAMPLES_PER_CATEGORY_VALIDATION_TESTS;
-        while (i-- > 0) checkDiagnostics(
-            target,
-            alteredTest -> MISSING_DEPENDENCY.or(diagnostics -> alteredTest.getBadLines().stream().allMatch(
-                badLine -> {
-                    System.out.print("Expecting an error to be reported at line " + badLine + "...");
-                    boolean result = NOT_SUPPORTED.test(diagnostics) || diagnostics.stream().anyMatch(
-                        diagnostic -> diagnostic.getRange().getStart().getLine() == badLine
-                    );
-                    if (result) {
-                        System.out.println(" Success.");
-                    } else {
-                        System.out.println(" but the expected error could not be found.");
-                        System.out.printf(
-                            "%s failed. Content of altered version of %s:%n%s%n",
-                            alteredTest.getSrcFile(),
-                            alteredTest.getSrcFile(),
-                            TestBase.THIN_LINE
-                        );
-                        System.out.println(alteredTest + "\n" + TestBase.THIN_LINE);
-                    }
-                    return result;
-                }
-            )),
-            builder.get(random),
-            random
-        );
-    }
-
-    /**
-     * Verify that the diagnostics that result from fully validating tests associated with {@code target} satisfy
-     * {@code requirementGetter}.
-     * @param target Any target language.
-     * @param requirementGetter A map from altered tests to the requirements that diagnostics regarding those tests
-     * must meet.
-     * @param alterer The means of inserting problems into the tests, or {@code null} if problems are not to be
-     * inserted.
-     * @param random The {@code Random} instance that determines which tests are selected.
-     * @throws IOException upon failure to write an altered copy of some test to storage.
-     */
-    private void checkDiagnostics(
-        Target target,
-        Function<AlteredTest, Predicate<List<Diagnostic>>> requirementGetter,
-        ErrorInserter alterer,
-        Random random
-    ) throws IOException {
-        MockLanguageClient client = new MockLanguageClient();
-        LanguageServerErrorReporter.setClient(client);
-        for (LFTest test : selectTests(target, random)) {
-            client.clearDiagnostics();
-            if (alterer != null) {
-                try (AlteredTest altered = alterer.alterTest(test.getSrcPath())) {
-                    runTest(altered.getSrcFile());
-                    Assertions.assertTrue(requirementGetter.apply(altered).test(client.getReceivedDiagnostics()));
-                }
-            } else {
-                runTest(test.getSrcPath());
-                Assertions.assertTrue(requirementGetter.apply(null).test(client.getReceivedDiagnostics()));
-            }
+  /** The test categories that should be excluded from LSP tests. */
+  private static final TestCategory[] EXCLUDED_CATEGORIES = {
+    TestCategory.SERIALIZATION, TestCategory.DOCKER, TestCategory.DOCKER_FEDERATED
+  };
+
+  private static final Predicate<List<Diagnostic>> NOT_SUPPORTED =
+      diagnosticsHaveKeyword("supported");
+  private static final Predicate<List<Diagnostic>> MISSING_DEPENDENCY =
+      diagnosticsHaveKeyword("libprotoc")
+          .or(diagnosticsHaveKeyword("protoc-c"))
+          .or(diagnosticsIncludeText("could not be found"));
+  /**
+   * The number of samples to take from each test category (with replacement) when doing validation
+   * tests.
+   */
+  private static final int SAMPLES_PER_CATEGORY_VALIDATION_TESTS = 3;
+
+  /** The {@code IntegratedBuilder} instance whose behavior is to be tested. */
+  private static final IntegratedBuilder builder =
+      new LFStandaloneSetup(new LFRuntimeModule())
+          .createInjectorAndDoEMFRegistration()
+          .getInstance(IntegratedBuilder.class);
+
+  /** Test for false negatives in Python syntax-only validation. */
+  @Test
+  void pythonValidationTestSyntaxOnly() throws IOException {
+    targetLanguageValidationTest(Target.Python, ErrorInserter.PYTHON_SYNTAX_ONLY);
+  }
+
+  /** Test for false negatives in C++ validation. */
+  @Test
+  void cppValidationTest() throws IOException {
+    targetLanguageValidationTest(Target.CPP, ErrorInserter.CPP);
+  }
+
+  /** Test for false negatives in Python validation. */
+  @Test
+  void pythonValidationTest() throws IOException {
+    targetLanguageValidationTest(Target.Python, ErrorInserter.PYTHON);
+  }
+
+  /** Test for false negatives in Rust validation. */
+  @Test
+  void rustValidationTest() throws IOException {
+    targetLanguageValidationTest(Target.Rust, ErrorInserter.RUST);
+  }
+
+  /** Test for false negatives in TypeScript validation. */
+  @Test
+  void typescriptValidationTest() throws IOException {
+    targetLanguageValidationTest(Target.TS, ErrorInserter.TYPESCRIPT);
+  }
+
+  /**
+   * Test for false negatives in the validation of LF files.
+   *
+   * @param target The target language of the LF files to be validated.
+   * @param builder A builder for the error inserter that will be used.
+   */
+  private void targetLanguageValidationTest(Target target, ErrorInserter.Builder builder)
+      throws IOException {
+    long seed = new Random().nextLong();
+    System.out.printf(
+        "Running validation tests for %s with random seed %d.%n", target.getDisplayName(), seed);
+    Random random = new Random(seed);
+    int i = SAMPLES_PER_CATEGORY_VALIDATION_TESTS;
+    while (i-- > 0)
+      checkDiagnostics(
+          target,
+          alteredTest ->
+              MISSING_DEPENDENCY.or(
+                  diagnostics ->
+                      alteredTest.getBadLines().stream()
+                          .allMatch(
+                              badLine -> {
+                                System.out.print(
+                                    "Expecting an error to be reported at line " + badLine + "...");
+                                boolean result =
+                                    NOT_SUPPORTED.test(diagnostics)
+                                        || diagnostics.stream()
+                                            .anyMatch(
+                                                diagnostic ->
+                                                    diagnostic.getRange().getStart().getLine()
+                                                        == badLine);
+                                if (result) {
+                                  System.out.println(" Success.");
+                                } else {
+                                  System.out.println(" but the expected error could not be found.");
+                                  System.out.printf(
+                                      "%s failed. Content of altered version of %s:%n%s%n",
+                                      alteredTest.getSrcFile(),
+                                      alteredTest.getSrcFile(),
+                                      TestBase.THIN_LINE);
+                                  System.out.println(alteredTest + "\n" + TestBase.THIN_LINE);
+                                }
+                                return result;
+                              })),
+          builder.get(random),
+          random);
+  }
+
+  /**
+   * Verify that the diagnostics that result from fully validating tests associated with {@code
+   * target} satisfy {@code requirementGetter}.
+   *
+   * @param target Any target language.
+   * @param requirementGetter A map from altered tests to the requirements that diagnostics
+   *     regarding those tests must meet.
+   * @param alterer The means of inserting problems into the tests, or {@code null} if problems are
+   *     not to be inserted.
+   * @param random The {@code Random} instance that determines which tests are selected.
+   * @throws IOException upon failure to write an altered copy of some test to storage.
+   */
+  private void checkDiagnostics(
+      Target target,
+      Function<AlteredTest, Predicate<List<Diagnostic>>> requirementGetter,
+      ErrorInserter alterer,
+      Random random)
+      throws IOException {
+    MockLanguageClient client = new MockLanguageClient();
+    LanguageServerErrorReporter.setClient(client);
+    for (LFTest test : selectTests(target, random)) {
+      client.clearDiagnostics();
+      if (alterer != null) {
+        try (AlteredTest altered = alterer.alterTest(test.getSrcPath())) {
+          runTest(altered.getSrcFile());
+          Assertions.assertTrue(
+              requirementGetter.apply(altered).test(client.getReceivedDiagnostics()));
         }
+      } else {
+        runTest(test.getSrcPath());
+        Assertions.assertTrue(requirementGetter.apply(null).test(client.getReceivedDiagnostics()));
+      }
     }
-
-    /**
-     * Select a test from each test category.
-     * @param target The target language of the desired tests.
-     * @param random The {@code Random} instance that determines which tests are selected.
-     * @return A sample of one integration test per target, per category.
-     */
-    private Set<LFTest> selectTests(Target target, Random random) {
-        Set<LFTest> ret = new HashSet<>();
-        for (TestCategory category : selectedCategories()) {
-            Set<LFTest> registeredTests = TestRegistry.getRegisteredTests(target, category, false);
-            if (registeredTests.size() == 0) continue;
-            int relativeIndex = random.nextInt(registeredTests.size());
-            for (LFTest t : registeredTests) {
-                if (relativeIndex-- == 0) {
-                    ret.add(t);
-                    break;
-                }
-            }
+  }
+
+  /**
+   * Select a test from each test category.
+   *
+   * @param target The target language of the desired tests.
+   * @param random The {@code Random} instance that determines which tests are selected.
+   * @return A sample of one integration test per target, per category.
+   */
+  private Set<LFTest> selectTests(Target target, Random random) {
+    Set<LFTest> ret = new HashSet<>();
+    for (TestCategory category : selectedCategories()) {
+      Set<LFTest> registeredTests = TestRegistry.getRegisteredTests(target, category, false);
+      if (registeredTests.size() == 0) continue;
+      int relativeIndex = random.nextInt(registeredTests.size());
+      for (LFTest t : registeredTests) {
+        if (relativeIndex-- == 0) {
+          ret.add(t);
+          break;
         }
-        return ret;
-    }
-
-    /** Return the non-excluded categories. */
-    private Iterable<? extends TestCategory> selectedCategories() {
-        return () -> Arrays.stream(TestCategory.values()).filter(
-            category -> Arrays.stream(EXCLUDED_CATEGORIES).noneMatch(category::equals)
-        ).iterator();
+      }
     }
-
-    /**
-     * Return the predicate that a list of diagnostics contains the given keyword.
-     * @param keyword A keyword that a list of diagnostics should be searched for.
-     * @return The predicate, "X mentions {@code keyword}."
-     */
-    private static Predicate<List<Diagnostic>> diagnosticsHaveKeyword(String keyword) {
-        return diagnostics -> diagnostics.stream().anyMatch(
-            d -> Arrays.asList(d.getMessage().toLowerCase().split("\\b")).contains(keyword)
-        );
-    }
-
-    /**
-     * Return the predicate that a list of diagnostics contains the given text.
-     * @param requiredText A keyword that a list of diagnostics should be searched for.
-     * @return The predicate, "X includes {@code requiredText}."
-     */
-    private static Predicate<List<Diagnostic>> diagnosticsIncludeText(@SuppressWarnings("SameParameterValue") String requiredText) {
-        return diagnostics -> diagnostics.stream().anyMatch(
-            d -> d.getMessage().toLowerCase().contains(requiredText)
-        );
-    }
-
-    /**
-     * Run the given test.
-     * @param test The test b
-     */
-    private void runTest(Path test) {
-        MockReportProgress reportProgress = new MockReportProgress();
-        try {
-            builder.run(
-                URI.createFileURI(test.toString()),
-                false, reportProgress,
-                () -> false
-            );
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw e;
-        }
-        Assertions.assertFalse(reportProgress.failed());
+    return ret;
+  }
+
+  /** Return the non-excluded categories. */
+  private Iterable<? extends TestCategory> selectedCategories() {
+    return () ->
+        Arrays.stream(TestCategory.values())
+            .filter(category -> Arrays.stream(EXCLUDED_CATEGORIES).noneMatch(category::equals))
+            .iterator();
+  }
+
+  /**
+   * Return the predicate that a list of diagnostics contains the given keyword.
+   *
+   * @param keyword A keyword that a list of diagnostics should be searched for.
+   * @return The predicate, "X mentions {@code keyword}."
+   */
+  private static Predicate<List<Diagnostic>> diagnosticsHaveKeyword(String keyword) {
+    return diagnostics ->
+        diagnostics.stream()
+            .anyMatch(
+                d -> Arrays.asList(d.getMessage().toLowerCase().split("\\b")).contains(keyword));
+  }
+
+  /**
+   * Return the predicate that a list of diagnostics contains the given text.
+   *
+   * @param requiredText A keyword that a list of diagnostics should be searched for.
+   * @return The predicate, "X includes {@code requiredText}."
+   */
+  private static Predicate<List<Diagnostic>> diagnosticsIncludeText(
+      @SuppressWarnings("SameParameterValue") String requiredText) {
+    return diagnostics ->
+        diagnostics.stream().anyMatch(d -> d.getMessage().toLowerCase().contains(requiredText));
+  }
+
+  /**
+   * Run the given test.
+   *
+   * @param test The test b
+   */
+  private void runTest(Path test) {
+    MockReportProgress reportProgress = new MockReportProgress();
+    try {
+      builder.run(URI.createFileURI(test.toString()), false, reportProgress, () -> false);
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw e;
     }
+    Assertions.assertFalse(reportProgress.failed());
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/lsp/MockLanguageClient.java b/org.lflang.tests/src/org/lflang/tests/lsp/MockLanguageClient.java
index 8aad48c547..1e3e06ef05 100644
--- a/org.lflang.tests/src/org/lflang/tests/lsp/MockLanguageClient.java
+++ b/org.lflang.tests/src/org/lflang/tests/lsp/MockLanguageClient.java
@@ -4,7 +4,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-
 import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.lsp4j.MessageActionItem;
@@ -20,49 +19,53 @@
  */
 public class MockLanguageClient implements LanguageClient {
 
-    private List<Diagnostic> receivedDiagnostics = new ArrayList<>();
+  private List<Diagnostic> receivedDiagnostics = new ArrayList<>();
 
-    @Override
-    public void telemetryEvent(Object object) {
-        // Do nothing.
-    }
+  @Override
+  public void telemetryEvent(Object object) {
+    // Do nothing.
+  }
 
-    @Override
-    public void publishDiagnostics(PublishDiagnosticsParams diagnostics) {
-        receivedDiagnostics.addAll(diagnostics.getDiagnostics());
-        for (Diagnostic d : diagnostics.getDiagnostics()) {
-            (
-                (d.getSeverity() == DiagnosticSeverity.Error || d.getSeverity() == DiagnosticSeverity.Warning) ?
-                System.err : System.out
-            ).println(
-                "Test client received diagnostic at line " + d.getRange().getStart().getLine() + ": " + d.getMessage()
-            );
-        }
+  @Override
+  public void publishDiagnostics(PublishDiagnosticsParams diagnostics) {
+    receivedDiagnostics.addAll(diagnostics.getDiagnostics());
+    for (Diagnostic d : diagnostics.getDiagnostics()) {
+      ((d.getSeverity() == DiagnosticSeverity.Error
+                  || d.getSeverity() == DiagnosticSeverity.Warning)
+              ? System.err
+              : System.out)
+          .println(
+              "Test client received diagnostic at line "
+                  + d.getRange().getStart().getLine()
+                  + ": "
+                  + d.getMessage());
     }
+  }
 
-    @Override
-    public void showMessage(MessageParams messageParams) {
-        System.out.println("Test client received message: " + messageParams.getMessage());
-    }
+  @Override
+  public void showMessage(MessageParams messageParams) {
+    System.out.println("Test client received message: " + messageParams.getMessage());
+  }
 
-    @Override
-    public CompletableFuture<MessageActionItem> showMessageRequest(ShowMessageRequestParams requestParams) {
-        showMessage(requestParams);
-        return null;
-    }
+  @Override
+  public CompletableFuture<MessageActionItem> showMessageRequest(
+      ShowMessageRequestParams requestParams) {
+    showMessage(requestParams);
+    return null;
+  }
 
-    @Override
-    public void logMessage(MessageParams message) {
-        showMessage(message);
-    }
+  @Override
+  public void logMessage(MessageParams message) {
+    showMessage(message);
+  }
 
-    /** Return the diagnostics that {@code this} has received. */
-    public List<Diagnostic> getReceivedDiagnostics() {
-        return Collections.unmodifiableList(receivedDiagnostics);
-    }
+  /** Return the diagnostics that {@code this} has received. */
+  public List<Diagnostic> getReceivedDiagnostics() {
+    return Collections.unmodifiableList(receivedDiagnostics);
+  }
 
-    /** Clear the diagnostics recorded by {@code this}. */
-    public void clearDiagnostics() {
-        receivedDiagnostics.clear();
-    }
+  /** Clear the diagnostics recorded by {@code this}. */
+  public void clearDiagnostics() {
+    receivedDiagnostics.clear();
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/lsp/MockReportProgress.java b/org.lflang.tests/src/org/lflang/tests/lsp/MockReportProgress.java
index 014fcc7276..f0cfb088c1 100644
--- a/org.lflang.tests/src/org/lflang/tests/lsp/MockReportProgress.java
+++ b/org.lflang.tests/src/org/lflang/tests/lsp/MockReportProgress.java
@@ -8,26 +8,29 @@
  * @author Peter Donovan
  */
 public class MockReportProgress implements IntegratedBuilder.ReportProgress {
-    private int previousPercentProgress;
-    private boolean failed;
-    public MockReportProgress() {
-        previousPercentProgress = 0;
-        failed = false;
-    }
+  private int previousPercentProgress;
+  private boolean failed;
 
-    @Override
-    public void apply(String message, Integer percentage) {
-        System.out.printf("MockReportProgress: %s [%d -> %d]%n", message, previousPercentProgress, percentage);
-        if (percentage == null) return;
-        if (percentage < previousPercentProgress || percentage < 0 || percentage > 100) failed = true;
-        previousPercentProgress = percentage;
-    }
+  public MockReportProgress() {
+    previousPercentProgress = 0;
+    failed = false;
+  }
 
-    /**
-     * Returns whether an invalid sequence of progress reports was received.
-     * @return whether an invalid sequence of progress reports was received
-     */
-    public boolean failed() {
-        return failed;
-    }
+  @Override
+  public void apply(String message, Integer percentage) {
+    System.out.printf(
+        "MockReportProgress: %s [%d -> %d]%n", message, previousPercentProgress, percentage);
+    if (percentage == null) return;
+    if (percentage < previousPercentProgress || percentage < 0 || percentage > 100) failed = true;
+    previousPercentProgress = percentage;
+  }
+
+  /**
+   * Returns whether an invalid sequence of progress reports was received.
+   *
+   * @return whether an invalid sequence of progress reports was received
+   */
+  public boolean failed() {
+    return failed;
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/CArduinoTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/CArduinoTest.java
index e783c335a0..95363fd30b 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/CArduinoTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/CArduinoTest.java
@@ -2,9 +2,7 @@
 
 import java.util.List;
 import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-
 import org.lflang.Target;
 import org.lflang.tests.Configurators;
 import org.lflang.tests.RuntimeTest;
@@ -17,17 +15,19 @@
  */
 public class CArduinoTest extends RuntimeTest {
 
-    public CArduinoTest() {
-        super(Target.C);
-    }
+  public CArduinoTest() {
+    super(Target.C);
+  }
 
-    @Test
-    public void buildArduinoTests() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runTestsFor(List.of(Target.C),
-            Message.DESC_ARDUINO,
-            TestCategory.ARDUINO::equals, Configurators::noChanges,
-            TestLevel.BUILD,
-            false);
-    }
+  @Test
+  public void buildArduinoTests() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runTestsFor(
+        List.of(Target.C),
+        Message.DESC_ARDUINO,
+        TestCategory.ARDUINO::equals,
+        Configurators::noChanges,
+        TestLevel.BUILD,
+        false);
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/CCppTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/CCppTest.java
index c8c2fc5b93..ba1865e870 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/CCppTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/CCppTest.java
@@ -2,51 +2,49 @@
 
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
-import org.lflang.ast.ASTUtils;
 import org.lflang.Target;
+import org.lflang.ast.ASTUtils;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry.TestCategory;
 
 /**
  * Collection of tests for the CCpp target.
  *
- * NOTE: This test does not inherit any tests because it directly extends TestBase.
+ * <p>NOTE: This test does not inherit any tests because it directly extends TestBase.
  *
  * @author Marten Lohstroh
  */
 public class CCppTest extends TestBase {
 
-    /**
-     * This target selects the C target it has no tests defined for it.
-     * Instead, it reconfigures existing C tests to adopt the CCpp target.
-     */
-    public CCppTest() {
-        super(Target.C);
-    }
+  /**
+   * This target selects the C target it has no tests defined for it. Instead, it reconfigures
+   * existing C tests to adopt the CCpp target.
+   */
+  public CCppTest() {
+    super(Target.C);
+  }
 
-    /**
-     * Run C tests with the target CCpp.
-     */
-    @Test
-    public void runAsCCpp() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        runTestsForTargets(Message.DESC_AS_CCPP, CCppTest::isExcludedFromCCpp,
-                           it -> ASTUtils.changeTargetName(it.getFileConfig().resource,
-                                                           Target.CCPP.getDisplayName()),
-                           TestLevel.EXECUTION,
-                           true);
-    }
+  /** Run C tests with the target CCpp. */
+  @Test
+  public void runAsCCpp() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    runTestsForTargets(
+        Message.DESC_AS_CCPP,
+        CCppTest::isExcludedFromCCpp,
+        it -> ASTUtils.changeTargetName(it.getFileConfig().resource, Target.CCPP.getDisplayName()),
+        TestLevel.EXECUTION,
+        true);
+  }
 
-    /**
-     * Exclusion function for runAsCCpp test
-     */
-    private static boolean isExcludedFromCCpp(TestCategory category) {
-        boolean excluded = category == TestCategory.SERIALIZATION;
-        excluded |= isWindows() && (category == TestCategory.DOCKER_FEDERATED);
-        excluded |= isMac() && (category == TestCategory.DOCKER_FEDERATED || category == TestCategory.DOCKER);
-        excluded |= category == TestCategory.ZEPHYR;
-        excluded |= category == TestCategory.ARDUINO;
-        excluded |= category == TestCategory.NO_INLINING;
-        return !excluded;
-    }
+  /** Exclusion function for runAsCCpp test */
+  private static boolean isExcludedFromCCpp(TestCategory category) {
+    boolean excluded = category == TestCategory.SERIALIZATION;
+    excluded |= isWindows() && (category == TestCategory.DOCKER_FEDERATED);
+    excluded |=
+        isMac() && (category == TestCategory.DOCKER_FEDERATED || category == TestCategory.DOCKER);
+    excluded |= category == TestCategory.ZEPHYR;
+    excluded |= category == TestCategory.ARDUINO;
+    excluded |= category == TestCategory.NO_INLINING;
+    return !excluded;
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/CSchedulerTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/CSchedulerTest.java
index fa387d8a00..fd2345723f 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/CSchedulerTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/CSchedulerTest.java
@@ -1,74 +1,65 @@
 package org.lflang.tests.runtime;
 
 import java.util.EnumSet;
-
 import org.junit.jupiter.api.Test;
-
 import org.lflang.Target;
 import org.lflang.TargetProperty.SchedulerOption;
 import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry.TestCategory;
 
-/**
- */
+/** */
 public class CSchedulerTest extends TestBase {
 
+  public CSchedulerTest() {
+    super(Target.C);
+  }
 
-    public CSchedulerTest() {
-        super(Target.C);
-    }
-
-    /**
-     * Swap the default runtime scheduler with other supported versions and
-     * run all the supported tests. Only run tests for a specific non-default
-     * scheduler if specified using a system property (e.g., -Dscheduler=GEDF_NP).
-     */
-    @Test
-    public void runWithNonDefaultSchedulers() {
-        EnumSet<TestCategory> categories = EnumSet.of(TestCategory.CONCURRENT,
-                                                      TestCategory.MULTIPORT);
-        
-        // Add federated and docker tests if supported
-        if (!isWindows()) {
-            categories.add(TestCategory.FEDERATED);
-            if (isLinux()) {
-                categories.add(TestCategory.DOCKER_FEDERATED);
-            }
-        }
-        var name = System.getProperty("scheduler");
+  /**
+   * Swap the default runtime scheduler with other supported versions and run all the supported
+   * tests. Only run tests for a specific non-default scheduler if specified using a system property
+   * (e.g., -Dscheduler=GEDF_NP).
+   */
+  @Test
+  public void runWithNonDefaultSchedulers() {
+    EnumSet<TestCategory> categories = EnumSet.of(TestCategory.CONCURRENT, TestCategory.MULTIPORT);
 
-        if (name != null) {
-            var option = EnumSet.allOf(SchedulerOption.class).stream()
-                                .filter(it -> it.name().equals(name)).findFirst();
-            if (option.isPresent()) {
-                this.runTest(option.get(), categories);
-            } else {
-                throw new RuntimeException("Cannot find runtime scheduler called " + name);
-            }
-        } else {
-            for (SchedulerOption scheduler: EnumSet.allOf(SchedulerOption.class)) {
-                if (scheduler == SchedulerOption.getDefault()) continue;
-                this.runTest(scheduler, categories);
-            }
-        }
+    // Add federated and docker tests if supported
+    if (!isWindows()) {
+      categories.add(TestCategory.FEDERATED);
+      if (isLinux()) {
+        categories.add(TestCategory.DOCKER_FEDERATED);
+      }
     }
+    var name = System.getProperty("scheduler");
 
-    private void runTest(SchedulerOption scheduler, EnumSet<TestCategory> categories) {
-        this.runTestsForTargets(
-            Message.DESC_SCHED_SWAPPING + scheduler.toString() +".",
-            categories::contains,
-            test -> {
-                test.getContext().getArgs()
-                    .setProperty(
-                        "scheduler",
-                        scheduler.toString()
-                    );
-                return Configurators.noChanges(test);
-            },
-            TestLevel.EXECUTION,
-            true
-        );
+    if (name != null) {
+      var option =
+          EnumSet.allOf(SchedulerOption.class).stream()
+              .filter(it -> it.name().equals(name))
+              .findFirst();
+      if (option.isPresent()) {
+        this.runTest(option.get(), categories);
+      } else {
+        throw new RuntimeException("Cannot find runtime scheduler called " + name);
+      }
+    } else {
+      for (SchedulerOption scheduler : EnumSet.allOf(SchedulerOption.class)) {
+        if (scheduler == SchedulerOption.getDefault()) continue;
+        this.runTest(scheduler, categories);
+      }
     }
-}
+  }
 
+  private void runTest(SchedulerOption scheduler, EnumSet<TestCategory> categories) {
+    this.runTestsForTargets(
+        Message.DESC_SCHED_SWAPPING + scheduler.toString() + ".",
+        categories::contains,
+        test -> {
+          test.getContext().getArgs().setProperty("scheduler", scheduler.toString());
+          return Configurators.noChanges(test);
+        },
+        TestLevel.EXECUTION,
+        true);
+  }
+}
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/CTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/CTest.java
index eba4f7bc71..4902550661 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/CTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/CTest.java
@@ -1,133 +1,131 @@
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.tests.runtime;
 
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-
 import org.lflang.Target;
 import org.lflang.tests.RuntimeTest;
 
 /**
  * Collection of tests for the C target.
  *
- * Tests that are implemented in the base class are still overridden so that
- * each test can be easily invoked individually from IDEs with JUnit support
- * like Eclipse and IntelliJ.
- * This is typically done by right-clicking on the name of the test method and
- * then clicking "Run".*
+ * <p>Tests that are implemented in the base class are still overridden so that each test can be
+ * easily invoked individually from IDEs with JUnit support like Eclipse and IntelliJ. This is
+ * typically done by right-clicking on the name of the test method and then clicking "Run".*
+ *
  * @author Marten Lohstroh
  */
 public class CTest extends RuntimeTest {
 
-    public CTest() {
-        super(Target.C);
-    }
-
-    @Override
-    protected boolean supportsSingleThreadedExecution() {
-        return true;
-    }
-
-    @Override
-    protected boolean supportsFederatedExecution() {
-        return true;
-    }
-
-    @Override
-    protected boolean supportsDockerOption() {
-        return true;
-    }
-
-    @Test
-    @Override
-    public void runGenericTests() {
-        super.runGenericTests();
-    }
-
-    @Test
-    @Override
-    public void runTargetSpecificTests() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runTargetSpecificTests();
-    }
-
-    @Test
-    @Override
-    public void runMultiportTests() {
-        super.runMultiportTests();
-    }
-
-    @Test
-    @Override
-    public void runWithThreadingOff() {
-        super.runWithThreadingOff();
-    }
-
-    @Test
-    @Disabled("TODO only 27/96 tests pass")
-    @Override
-    public void runAsFederated() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runAsFederated();
-    }
-
-    @Test
-    @Override
-    public void runConcurrentTests() {
-        super.runConcurrentTests();
-    }
-
-    @Test
-    @Override
-    public void runFederatedTests() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runFederatedTests();
-    }
-
-    @Test
-    public void runModalTests() {
-        super.runModalTests();
-    }
-
-    @Test
-    public void runNoInliningTests() {
-        super.runNoInliningTests();
-    }
-
-    @Test
-    @Override
-    public void runDockerTests() {
-        super.runDockerTests();
-    }
-
-    @Test
-    @Override
-    public void runDockerFederatedTests() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runDockerFederatedTests();
-    }
+  public CTest() {
+    super(Target.C);
+  }
+
+  @Override
+  protected boolean supportsSingleThreadedExecution() {
+    return true;
+  }
+
+  @Override
+  protected boolean supportsFederatedExecution() {
+    return true;
+  }
+
+  @Override
+  protected boolean supportsDockerOption() {
+    return true;
+  }
+
+  @Test
+  @Override
+  public void runGenericTests() {
+    super.runGenericTests();
+  }
+
+  @Test
+  @Override
+  public void runTargetSpecificTests() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runTargetSpecificTests();
+  }
+
+  @Test
+  @Override
+  public void runMultiportTests() {
+    super.runMultiportTests();
+  }
+
+  @Test
+  @Override
+  public void runWithThreadingOff() {
+    super.runWithThreadingOff();
+  }
+
+  @Test
+  @Disabled("TODO only 27/96 tests pass")
+  @Override
+  public void runAsFederated() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runAsFederated();
+  }
+
+  @Test
+  @Override
+  public void runConcurrentTests() {
+    super.runConcurrentTests();
+  }
+
+  @Test
+  @Override
+  public void runFederatedTests() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runFederatedTests();
+  }
+
+  @Test
+  public void runModalTests() {
+    super.runModalTests();
+  }
+
+  @Test
+  public void runNoInliningTests() {
+    super.runNoInliningTests();
+  }
+
+  @Test
+  @Override
+  public void runDockerTests() {
+    super.runDockerTests();
+  }
+
+  @Test
+  @Override
+  public void runDockerFederatedTests() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runDockerFederatedTests();
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/CZephyrTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/CZephyrTest.java
index afe1646829..c151c1bb76 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/CZephyrTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/CZephyrTest.java
@@ -1,35 +1,32 @@
 /*************
-Copyright (c) 2023, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2023, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.tests.runtime;
 
 import java.util.List;
-
 import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-
 import org.lflang.Target;
 import org.lflang.tests.Configurators;
 import org.lflang.tests.RuntimeTest;
@@ -42,29 +39,31 @@
  */
 public class CZephyrTest extends RuntimeTest {
 
-    public CZephyrTest() {
-        super(Target.C);
-    }
+  public CZephyrTest() {
+    super(Target.C);
+  }
 
-    @Test
-    public void buildZephyrTests() {
-        Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
-        super.runTestsFor(List.of(Target.C),
-            Message.DESC_ZEPHYR,
-            TestCategory.ZEPHYR::equals,
-            Configurators::makeZephyrCompatible,
-            TestLevel.BUILD,
-            false);
-    }
-    @Test
-    public void buildGenericTests() {
-        Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
-        super.runTestsFor(List.of(Target.C),
-            Message.DESC_GENERIC,
-            TestCategory.GENERIC::equals,
-            Configurators::makeZephyrCompatible,
-            TestLevel.BUILD,
-            false);
-    }
-}
+  @Test
+  public void buildZephyrTests() {
+    Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
+    super.runTestsFor(
+        List.of(Target.C),
+        Message.DESC_ZEPHYR,
+        TestCategory.ZEPHYR::equals,
+        Configurators::makeZephyrCompatible,
+        TestLevel.BUILD,
+        false);
+  }
 
+  @Test
+  public void buildGenericTests() {
+    Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
+    super.runTestsFor(
+        List.of(Target.C),
+        Message.DESC_GENERIC,
+        TestCategory.GENERIC::equals,
+        Configurators::makeZephyrCompatible,
+        TestLevel.BUILD,
+        false);
+  }
+}
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/CppRos2Test.java b/org.lflang.tests/src/org/lflang/tests/runtime/CppRos2Test.java
index 2e4f6b78d3..dc2612c14b 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/CppRos2Test.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/CppRos2Test.java
@@ -2,9 +2,8 @@
 
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.Target;
+import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.LfFactory;
 import org.lflang.tests.TestBase;
@@ -12,25 +11,27 @@
 /**
  * Run C++ tests using the ROS2 platform.
  *
- * NOTE: This test does not inherit any tests because it directly extends TestBase.
+ * <p>NOTE: This test does not inherit any tests because it directly extends TestBase.
  *
  * @author Christian Menard
  */
 public class CppRos2Test extends TestBase {
 
-    public CppRos2Test() { super(Target.CPP); }
+  public CppRos2Test() {
+    super(Target.CPP);
+  }
 
-    /**
-     * Run C++ tests with the ros2 target property set
-     */
-    @Test
-    public void runWithRos2() {
-        Assumptions.assumeTrue(isLinux(), "Only supported on Linux");
-        Element trueLiteral = LfFactory.eINSTANCE.createElement();
-        trueLiteral.setLiteral("true");
-        runTestsForTargets(Message.DESC_ROS2, it -> true,
-                           it -> ASTUtils.addTargetProperty(it.getFileConfig().resource, "ros2", trueLiteral),
-                           TestLevel.EXECUTION,
-                           true);
-    }
+  /** Run C++ tests with the ros2 target property set */
+  @Test
+  public void runWithRos2() {
+    Assumptions.assumeTrue(isLinux(), "Only supported on Linux");
+    Element trueLiteral = LfFactory.eINSTANCE.createElement();
+    trueLiteral.setLiteral("true");
+    runTestsForTargets(
+        Message.DESC_ROS2,
+        it -> true,
+        it -> ASTUtils.addTargetProperty(it.getFileConfig().resource, "ros2", trueLiteral),
+        TestLevel.EXECUTION,
+        true);
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/CppTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/CppTest.java
index 77bf4e664a..20973189b9 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/CppTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/CppTest.java
@@ -1,86 +1,84 @@
 /* Integration tests for the C++ target. */
 
 /*************
-Copyright (c) 2021, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2021, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.tests.runtime;
 
-import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.lflang.Target;
 import org.lflang.tests.RuntimeTest;
 
 /**
- * Collection of tests for the Cpp target.
- * Even though all tests are implemented in the base class, we override them
- * here so that each test can be easily invoked individually from IDEs with
- * JUnit support like Eclipse and IntelliJ.
- * This is typically done by right-clicking on the name of the test method and
- * then clicking "Run".
+ * Collection of tests for the Cpp target. Even though all tests are implemented in the base class,
+ * we override them here so that each test can be easily invoked individually from IDEs with JUnit
+ * support like Eclipse and IntelliJ. This is typically done by right-clicking on the name of the
+ * test method and then clicking "Run".
  *
  * @author Marten Lohstroh
  */
 public class CppTest extends RuntimeTest {
 
-    public CppTest() {
-        super(Target.CPP);
-    }
-
-    @Override
-    protected boolean supportsEnclaves() { return true; }
-
-    @Test
-    @Override
-    public void runGenericTests() {
-        super.runGenericTests();
-    }
-
-    @Test
-    @Override
-    public void runTargetSpecificTests() {
-        super.runTargetSpecificTests();
-    }
-
-    @Test
-    @Override
-    public void runMultiportTests() {
-        super.runMultiportTests();
-    }
-
-    @Test
-    @Override
-    public void runConcurrentTests() {
-        super.runConcurrentTests();
-    }
-
-    @Test
-    @Override
-    public void runFederatedTests() {
-        super.runFederatedTests();
-    }
-
-    @Test
-    public void runRos2Tests() { }
-
+  public CppTest() {
+    super(Target.CPP);
+  }
+
+  @Override
+  protected boolean supportsEnclaves() {
+    return true;
+  }
+
+  @Test
+  @Override
+  public void runGenericTests() {
+    super.runGenericTests();
+  }
+
+  @Test
+  @Override
+  public void runTargetSpecificTests() {
+    super.runTargetSpecificTests();
+  }
+
+  @Test
+  @Override
+  public void runMultiportTests() {
+    super.runMultiportTests();
+  }
+
+  @Test
+  @Override
+  public void runConcurrentTests() {
+    super.runConcurrentTests();
+  }
+
+  @Test
+  @Override
+  public void runFederatedTests() {
+    super.runFederatedTests();
+  }
+
+  @Test
+  public void runRos2Tests() {}
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/PythonTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/PythonTest.java
index e028e6ac4d..1c258b7481 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/PythonTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/PythonTest.java
@@ -1,31 +1,30 @@
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.tests.runtime;
 
 import java.util.Properties;
-
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -35,94 +34,92 @@
 /**
  * Collection of tests for the Python target.
  *
- * Even though all tests are implemented in the base class, we override them
- * here so that each test can be easily invoked individually from IDEs with
- * JUnit support like Eclipse and IntelliJ.
- * This is typically done by right-clicking on the name of the test method and
- * then clicking "Run".
+ * <p>Even though all tests are implemented in the base class, we override them here so that each
+ * test can be easily invoked individually from IDEs with JUnit support like Eclipse and IntelliJ.
+ * This is typically done by right-clicking on the name of the test method and then clicking "Run".
  *
  * @author Marten Lohstroh
  */
 public class PythonTest extends RuntimeTest {
 
-    public PythonTest() {
-        super(Target.Python);
-    }
-
-    @Override
-    protected void addExtraLfcArgs(Properties args) {
-        super.addExtraLfcArgs(args);
-        if (System.getProperty("os.name").startsWith("Windows")) {
-            // Use the RelWithDebInfo build type on Windows as the Debug/Test build type produces linker Errors in CI
-            args.setProperty("build-type", "RelWithDebInfo");
-        }
-    }
-
-    @Override
-    protected boolean supportsFederatedExecution() {
-        return true;
-    }
-
-    @Override
-    protected boolean supportsSingleThreadedExecution() {
-        return true;
-    }
-
-    @Override
-    protected boolean supportsDockerOption() {
-        return false; // FIXME: https://issues.lf-lang.org/1564
-    }
-
-    @Test
-    @Override 
-    public void runGenericTests() {
-        super.runGenericTests();
-    }
-
-    @Test
-    @Override 
-    public void runTargetSpecificTests() {
-        super.runTargetSpecificTests();
-    }
-
-    @Test
-    @Override 
-    public void runMultiportTests() {
-        super.runMultiportTests();
-    }
-
-    @Test
-    @Disabled("TODO")
-    @Override 
-    public void runAsFederated() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runAsFederated();
-    }
-
-
-    @Test
-    @Override 
-    public void runConcurrentTests() {
-        super.runConcurrentTests();
-    }
-
-    @Test
-    @Override
-    public void runFederatedTests() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runFederatedTests();
-    }
-
-    @Test
-    @Override 
-    public void runDockerTests() {
-        super.runDockerTests();
-    }
-
-    @Test
-    @Override 
-    public void runDockerFederatedTests() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runDockerFederatedTests();
+  public PythonTest() {
+    super(Target.Python);
+  }
+
+  @Override
+  protected void addExtraLfcArgs(Properties args) {
+    super.addExtraLfcArgs(args);
+    if (System.getProperty("os.name").startsWith("Windows")) {
+      // Use the RelWithDebInfo build type on Windows as the Debug/Test build type produces linker
+      // Errors in CI
+      args.setProperty("build-type", "RelWithDebInfo");
     }
+  }
+
+  @Override
+  protected boolean supportsFederatedExecution() {
+    return true;
+  }
+
+  @Override
+  protected boolean supportsSingleThreadedExecution() {
+    return true;
+  }
+
+  @Override
+  protected boolean supportsDockerOption() {
+    return false; // FIXME: https://issues.lf-lang.org/1564
+  }
+
+  @Test
+  @Override
+  public void runGenericTests() {
+    super.runGenericTests();
+  }
+
+  @Test
+  @Override
+  public void runTargetSpecificTests() {
+    super.runTargetSpecificTests();
+  }
+
+  @Test
+  @Override
+  public void runMultiportTests() {
+    super.runMultiportTests();
+  }
+
+  @Test
+  @Disabled("TODO")
+  @Override
+  public void runAsFederated() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runAsFederated();
+  }
+
+  @Test
+  @Override
+  public void runConcurrentTests() {
+    super.runConcurrentTests();
+  }
+
+  @Test
+  @Override
+  public void runFederatedTests() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runFederatedTests();
+  }
+
+  @Test
+  @Override
+  public void runDockerTests() {
+    super.runDockerTests();
+  }
+
+  @Test
+  @Override
+  public void runDockerFederatedTests() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runDockerFederatedTests();
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/RustTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/RustTest.java
index 2601fe79d0..e41d358ac0 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/RustTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/RustTest.java
@@ -24,22 +24,18 @@
 
 package org.lflang.tests.runtime;
 
-import java.util.Properties;
-
 import org.lflang.Target;
 import org.lflang.tests.RuntimeTest;
 
-/**
- *
- */
+/** */
 public class RustTest extends RuntimeTest {
 
-    public RustTest() {
-        super(Target.Rust);
-    }
+  public RustTest() {
+    super(Target.Rust);
+  }
 
-    @Override
-    protected boolean supportsGenericTypes() {
-        return true;
-    }
+  @Override
+  protected boolean supportsGenericTypes() {
+    return true;
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/TypeScriptTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/TypeScriptTest.java
index 295a1961ed..036211607a 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/TypeScriptTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/TypeScriptTest.java
@@ -8,74 +8,72 @@
 /**
  * Collection of tests for the TypeScript target.
  *
- * Even though all tests are implemented in the base class, we override them
- * here so that each test can be easily invoked individually from IDEs with
- * JUnit support like Eclipse and IntelliJ.
- * This is typically done by right-clicking on the name of the test method and
- * then clicking "Run".
+ * <p>Even though all tests are implemented in the base class, we override them here so that each
+ * test can be easily invoked individually from IDEs with JUnit support like Eclipse and IntelliJ.
+ * This is typically done by right-clicking on the name of the test method and then clicking "Run".
  *
  * @author Marten Lohstroh
  */
 public class TypeScriptTest extends RuntimeTest {
-    public TypeScriptTest() {
-        super(Target.TS);
-    }
+  public TypeScriptTest() {
+    super(Target.TS);
+  }
 
-    @Override
-    protected boolean supportsDockerOption() {
-        return true;
-    }
+  @Override
+  protected boolean supportsDockerOption() {
+    return true;
+  }
 
-    @Override
-    protected boolean supportsFederatedExecution() {
-        return true;
-    }
+  @Override
+  protected boolean supportsFederatedExecution() {
+    return true;
+  }
 
-    @Test
-    @Override
-    public void runGenericTests() {
-        super.runGenericTests();
-    }
+  @Test
+  @Override
+  public void runGenericTests() {
+    super.runGenericTests();
+  }
 
-    @Test
-    @Override
-    public void runTargetSpecificTests() {
-        super.runTargetSpecificTests();
-    }
+  @Test
+  @Override
+  public void runTargetSpecificTests() {
+    super.runTargetSpecificTests();
+  }
 
-    @Test
-    @Override
-    public void runMultiportTests() {
-        super.runMultiportTests();
-    }
+  @Test
+  @Override
+  public void runMultiportTests() {
+    super.runMultiportTests();
+  }
 
-    @Test
-    @Override
-    public void runConcurrentTests() {
-        super.runConcurrentTests();
-    }
+  @Test
+  @Override
+  public void runConcurrentTests() {
+    super.runConcurrentTests();
+  }
 
-    @Test
-    @Override
-    public void runFederatedTests() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runFederatedTests();
-    }
+  @Test
+  @Override
+  public void runFederatedTests() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runFederatedTests();
+  }
 
-    @Test
-    @Override
-    public void runDockerTests() {
-        super.runDockerTests();
-    }
+  @Test
+  @Override
+  public void runDockerTests() {
+    super.runDockerTests();
+  }
 
-    @Test
-    @Override
-    public void runDockerFederatedTests() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runDockerFederatedTests();
-    }
+  @Test
+  @Override
+  public void runDockerFederatedTests() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runDockerFederatedTests();
+  }
 
-    @Test
-    @Override
-    public void runAsFederated() {}
+  @Test
+  @Override
+  public void runAsFederated() {}
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/serialization/SerializationTest.java b/org.lflang.tests/src/org/lflang/tests/serialization/SerializationTest.java
index 35dfa9f6de..26f3ec37af 100644
--- a/org.lflang.tests/src/org/lflang/tests/serialization/SerializationTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/serialization/SerializationTest.java
@@ -1,7 +1,6 @@
 package org.lflang.tests.serialization;
 
 import java.util.Properties;
-
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.lflang.Target;
@@ -11,32 +10,36 @@
 
 public class SerializationTest extends TestBase {
 
-    protected SerializationTest() {
-        super(Target.ALL);        
-    }
+  protected SerializationTest() {
+    super(Target.ALL);
+  }
+
+  @Override
+  protected void addExtraLfcArgs(Properties args) {
+    super.addExtraLfcArgs(args);
+    // Use the Debug build type as coverage generation does not work for the serialization tests
+    args.setProperty("build-type", "Debug");
+  }
+
+  @Test
+  public void runSerializationTestsWithThreadingOff() {
+    Assumptions.assumeTrue(supportsSingleThreadedExecution(), Message.NO_SINGLE_THREADED_SUPPORT);
+    runTestsForTargets(
+        Message.DESC_SERIALIZATION,
+        TestCategory.SERIALIZATION::equals,
+        Configurators::disableThreading,
+        TestLevel.EXECUTION,
+        false);
+  }
 
-    @Override
-    protected void addExtraLfcArgs(Properties args) {
-        super.addExtraLfcArgs(args);
-        // Use the Debug build type as coverage generation does not work for the serialization tests
-        args.setProperty("build-type", "Debug");
-    }
-    
-    @Test
-    public void runSerializationTestsWithThreadingOff() {
-        Assumptions.assumeTrue(supportsSingleThreadedExecution(), Message.NO_SINGLE_THREADED_SUPPORT);
-        runTestsForTargets(Message.DESC_SERIALIZATION,
-                TestCategory.SERIALIZATION::equals, Configurators::disableThreading,
-                TestLevel.EXECUTION,
-                false);
-    }
-    
-    @Test
-    public void runSerializationTests() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        runTestsForTargets(Message.DESC_SERIALIZATION,
-                TestCategory.SERIALIZATION::equals, Configurators::noChanges,
-                TestLevel.EXECUTION,
-                false);
-    }
+  @Test
+  public void runSerializationTests() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    runTestsForTargets(
+        Message.DESC_SERIALIZATION,
+        TestCategory.SERIALIZATION::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/util/StringUtilTest.java b/org.lflang.tests/src/org/lflang/tests/util/StringUtilTest.java
index fb15cda64c..7c8ca60b83 100644
--- a/org.lflang.tests/src/org/lflang/tests/util/StringUtilTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/util/StringUtilTest.java
@@ -33,24 +33,24 @@
 
 public class StringUtilTest {
 
-    @Test
-    public void testRemoveQuotes() {
-        assertEquals("abc", removeQuotes("\"abc\""));
-        assertEquals("a", removeQuotes("'a'"));
-        assertEquals("'a", removeQuotes("'a"));
-        assertEquals("a\"", removeQuotes("a\""));
-        assertEquals("\"", removeQuotes("\""));
-        assertEquals("'", removeQuotes("'"));
-        assertEquals("", removeQuotes(""));
-        assertNull(removeQuotes(null));
-    }
+  @Test
+  public void testRemoveQuotes() {
+    assertEquals("abc", removeQuotes("\"abc\""));
+    assertEquals("a", removeQuotes("'a'"));
+    assertEquals("'a", removeQuotes("'a"));
+    assertEquals("a\"", removeQuotes("a\""));
+    assertEquals("\"", removeQuotes("\""));
+    assertEquals("'", removeQuotes("'"));
+    assertEquals("", removeQuotes(""));
+    assertNull(removeQuotes(null));
+  }
 
-    @Test
-    public void testCamelToSnakeCase() {
-        assertEquals("some_string", camelToSnakeCase("someString"));
-        assertEquals("abc_str", camelToSnakeCase("AbcStr"));
-        assertEquals("ast", camelToSnakeCase("AST"));
-        assertEquals("ast_builder", camelToSnakeCase("ASTBuilder"));
-        assertEquals("something_with_a_preamble", camelToSnakeCase("SomethingWithAPreamble"));
-    }
+  @Test
+  public void testCamelToSnakeCase() {
+    assertEquals("some_string", camelToSnakeCase("someString"));
+    assertEquals("abc_str", camelToSnakeCase("AbcStr"));
+    assertEquals("ast", camelToSnakeCase("AST"));
+    assertEquals("ast_builder", camelToSnakeCase("ASTBuilder"));
+    assertEquals("something_with_a_preamble", camelToSnakeCase("SomethingWithAPreamble"));
+  }
 }
diff --git a/org.lflang/src/org/lflang/AttributeUtils.java b/org.lflang/src/org/lflang/AttributeUtils.java
index b6fddf0b0e..6703df2d0e 100644
--- a/org.lflang/src/org/lflang/AttributeUtils.java
+++ b/org.lflang/src/org/lflang/AttributeUtils.java
@@ -27,12 +27,10 @@
 
 import java.util.List;
 import java.util.Objects;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.nodemodel.ICompositeNode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.resource.XtextResource;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Action;
 import org.lflang.lf.AttrParm;
@@ -56,197 +54,194 @@
  */
 public class AttributeUtils {
 
-    /**
-     * Return the attributes declared on the given node. Throws
-     * if the node does not support declaring attributes.
-     *
-     * @throws IllegalArgumentException If the node cannot have attributes
-     */
-    public static List<Attribute> getAttributes(EObject node) {
-        if (node instanceof Reactor) {
-            return ((Reactor) node).getAttributes();
-        } else if (node instanceof Reaction) {
-            return ((Reaction) node).getAttributes();
-        } else if (node instanceof Action) {
-            return ((Action) node).getAttributes();
-        } else if (node instanceof Timer) {
-            return ((Timer) node).getAttributes();
-        } else if (node instanceof StateVar) {
-            return ((StateVar) node).getAttributes();
-        } else if (node instanceof Parameter) {
-            return ((Parameter) node).getAttributes();
-        } else if (node instanceof Input) {
-            return ((Input) node).getAttributes();
-        } else if (node instanceof Output) {
-            return ((Output) node).getAttributes();
-        } else if (node instanceof Instantiation) {
-            return ((Instantiation) node).getAttributes();
-        }
-        throw new IllegalArgumentException("Not annotatable: " + node);
-    }
-
-    /**
-     * Return the attribute with the given name
-     * if present, otherwise return null.
-     *
-     * @throws IllegalArgumentException If the node cannot have attributes
-     */
-    public static Attribute findAttributeByName(EObject node, String name) {
-        List<Attribute> attrs = getAttributes(node);
-        return attrs.stream()
-                    .filter(it -> it.getAttrName().equalsIgnoreCase(name)) // case-insensitive search (more user-friendly)
-                    .findFirst()
-                    .orElse(null);
+  /**
+   * Return the attributes declared on the given node. Throws if the node does not support declaring
+   * attributes.
+   *
+   * @throws IllegalArgumentException If the node cannot have attributes
+   */
+  public static List<Attribute> getAttributes(EObject node) {
+    if (node instanceof Reactor) {
+      return ((Reactor) node).getAttributes();
+    } else if (node instanceof Reaction) {
+      return ((Reaction) node).getAttributes();
+    } else if (node instanceof Action) {
+      return ((Action) node).getAttributes();
+    } else if (node instanceof Timer) {
+      return ((Timer) node).getAttributes();
+    } else if (node instanceof StateVar) {
+      return ((StateVar) node).getAttributes();
+    } else if (node instanceof Parameter) {
+      return ((Parameter) node).getAttributes();
+    } else if (node instanceof Input) {
+      return ((Input) node).getAttributes();
+    } else if (node instanceof Output) {
+      return ((Output) node).getAttributes();
+    } else if (node instanceof Instantiation) {
+      return ((Instantiation) node).getAttributes();
     }
-
-    /**
-     * Return the first argument specified for the attribute.
-     *
-     * This should be used if the attribute is expected to have a single argument.
-     * If there is no argument, null is returned.
-     */
-    public static String getFirstArgumentValue(Attribute attr) {
-        if (attr == null || attr.getAttrParms().isEmpty()) {
-            return null;
-        }
-        return StringUtil.removeQuotes(attr.getAttrParms().get(0).getValue());
-    }
-
-    /**
-     * Search for an attribute with the given name on the given AST node and return its first
-     * argument as a String.
-     *
-     * This should only be used on attributes that are expected to have a single argument.
-     *
-     * Returns null if the attribute is not found or if it does not have any arguments.
-     */
-    public static String getAttributeValue(EObject node, String attrName) {
-        final var attr = findAttributeByName(node, attrName);
-        String value = getFirstArgumentValue(attr);
-        // Attribute annotations in comments are deprecated, but we still check for then for backwards
-        // compatibility
-        if (value == null) {
-            return findAnnotationInComments(node, "@" + attrName);
-        }
-        return value;
+    throw new IllegalArgumentException("Not annotatable: " + node);
+  }
+
+  /**
+   * Return the attribute with the given name if present, otherwise return null.
+   *
+   * @throws IllegalArgumentException If the node cannot have attributes
+   */
+  public static Attribute findAttributeByName(EObject node, String name) {
+    List<Attribute> attrs = getAttributes(node);
+    return attrs.stream()
+        .filter(
+            it ->
+                it.getAttrName()
+                    .equalsIgnoreCase(name)) // case-insensitive search (more user-friendly)
+        .findFirst()
+        .orElse(null);
+  }
+
+  /**
+   * Return the first argument specified for the attribute.
+   *
+   * <p>This should be used if the attribute is expected to have a single argument. If there is no
+   * argument, null is returned.
+   */
+  public static String getFirstArgumentValue(Attribute attr) {
+    if (attr == null || attr.getAttrParms().isEmpty()) {
+      return null;
     }
-
-    /**
-     * Retrieve a specific annotation in a comment associated with the given model element in the AST.
-     *
-     * This will look for a comment. If one is found, it searches for the given annotation {@code key}.
-     * and extracts any string that follows the annotation marker.
-     *
-     * @param object the AST model element to search a comment for
-     * @param key the specific annotation key to be extracted
-     * @return {@code null} if no JavaDoc style comment was found or if it does not contain the given key.
-     *     The string immediately following the annotation marker otherwise.
-     */
-    public static String findAnnotationInComments(EObject object, String key) {
-        if (!(object.eResource() instanceof XtextResource)) return null;
-        ICompositeNode node = NodeModelUtils.findActualNodeFor(object);
-        return ASTUtils.getPrecedingComments(node, n -> true).flatMap(String::lines)
-            .filter(line -> line.contains(key))
-            .map(String::trim)
-            .map(it -> it.substring(it.indexOf(key) + key.length()))
-            .map(it -> it.endsWith("*/") ? it.substring(0, it.length() - "*/".length()) : it)
-            .findFirst().orElse(null);
+    return StringUtil.removeQuotes(attr.getAttrParms().get(0).getValue());
+  }
+
+  /**
+   * Search for an attribute with the given name on the given AST node and return its first argument
+   * as a String.
+   *
+   * <p>This should only be used on attributes that are expected to have a single argument.
+   *
+   * <p>Returns null if the attribute is not found or if it does not have any arguments.
+   */
+  public static String getAttributeValue(EObject node, String attrName) {
+    final var attr = findAttributeByName(node, attrName);
+    String value = getFirstArgumentValue(attr);
+    // Attribute annotations in comments are deprecated, but we still check for then for backwards
+    // compatibility
+    if (value == null) {
+      return findAnnotationInComments(node, "@" + attrName);
     }
-
-    /**
-     * Return the parameter of the given attribute with the given name.
-     *
-     * Returns null if no such parameter is found.
-     */
-    public static String getAttributeParameter(Attribute attribute, String parameterName) {
-        return (attribute == null) ? null : attribute.getAttrParms().stream()
+    return value;
+  }
+
+  /**
+   * Retrieve a specific annotation in a comment associated with the given model element in the AST.
+   *
+   * <p>This will look for a comment. If one is found, it searches for the given annotation {@code
+   * key}. and extracts any string that follows the annotation marker.
+   *
+   * @param object the AST model element to search a comment for
+   * @param key the specific annotation key to be extracted
+   * @return {@code null} if no JavaDoc style comment was found or if it does not contain the given
+   *     key. The string immediately following the annotation marker otherwise.
+   */
+  public static String findAnnotationInComments(EObject object, String key) {
+    if (!(object.eResource() instanceof XtextResource)) return null;
+    ICompositeNode node = NodeModelUtils.findActualNodeFor(object);
+    return ASTUtils.getPrecedingComments(node, n -> true)
+        .flatMap(String::lines)
+        .filter(line -> line.contains(key))
+        .map(String::trim)
+        .map(it -> it.substring(it.indexOf(key) + key.length()))
+        .map(it -> it.endsWith("*/") ? it.substring(0, it.length() - "*/".length()) : it)
+        .findFirst()
+        .orElse(null);
+  }
+
+  /**
+   * Return the parameter of the given attribute with the given name.
+   *
+   * <p>Returns null if no such parameter is found.
+   */
+  public static String getAttributeParameter(Attribute attribute, String parameterName) {
+    return (attribute == null)
+        ? null
+        : attribute.getAttrParms().stream()
             .filter(param -> Objects.equals(param.getName(), parameterName))
             .map(AttrParm::getValue)
             .map(StringUtil::removeQuotes)
             .findFirst()
             .orElse(null);
+  }
+
+  /**
+   * Return the parameter of the given attribute with the given name and interpret it as a boolean.
+   *
+   * <p>Returns null if no such parameter is found.
+   */
+  public static Boolean getBooleanAttributeParameter(Attribute attribute, String parameterName) {
+    if (attribute == null || parameterName == null) {
+      return null;
     }
-
-    /**
-     * Return the parameter of the given attribute with the given name and interpret it as a boolean.
-     *
-     * Returns null if no such parameter is found.
-     */
-    public static Boolean getBooleanAttributeParameter(Attribute attribute, String parameterName) {
-        if (attribute == null || parameterName == null) {
-            return null;
-        }
-        final var param = getAttributeParameter(attribute, parameterName);
-        if (param == null) {
-            return null;
-        }
-        return param.equalsIgnoreCase("true");
-    }
-
-    /**
-     * Return true if the specified node is an Input and has an {@code @sparse}
-     * attribute.
-     * @param node An AST node.
-     */
-    public static boolean isSparse(EObject node) {
-        return findAttributeByName(node, "sparse") != null;
-    }
-
-    /**
-     * Return true if the reaction is unordered.
-     *
-     * Currently, this is only used for synthesized reactions in the context of
-     * federated execution.
-     */
-    public static boolean isUnordered(Reaction reaction) {
-        return findAttributeByName(reaction, "_unordered") != null;
+    final var param = getAttributeParameter(attribute, parameterName);
+    if (param == null) {
+      return null;
     }
-
-    /**
-     * Return true if the reactor is marked to be a federate.
-     */
-    public static boolean isFederate(Reactor reactor) {
-        return findAttributeByName(reactor, "_fed_config") != null;
-    }
-
-    /**
-     * Return true if the reaction is marked to have a C code body.
-     *
-     * Currently, this is only used for synthesized reactions in the context of
-     * federated execution in Python.
-     */
-    public static boolean hasCBody(Reaction reaction) {
-        return findAttributeByName(reaction, "_c_body") != null;
-    }
-
-    /**
-     * Return the declared label of the node, as given by the @label annotation.
-     */
-    public static String getLabel(EObject node) {
-        return getAttributeValue(node, "label");
-    }
-
-    /**
-     * Return the declared icon of the node, as given by the @icon annotation.
-     */
-    public static  String getIconPath(EObject node) {
-        return getAttributeValue(node, "icon");
-    }
-
-    /**
-     * Return the {@code @enclave} attribute annotated on the given node.
-     *
-     * Returns null if there is no such attribute.
-     */
-    public static Attribute getEnclaveAttribute(Instantiation node) {
-        return findAttributeByName(node, "enclave");
-    }
-
-    /**
-     * Return true if the specified instance has an {@code @enclave} attribute.
-     */
-    public static boolean isEnclave(Instantiation node) {
-        return getEnclaveAttribute(node) != null;
-    }
-
+    return param.equalsIgnoreCase("true");
+  }
+
+  /**
+   * Return true if the specified node is an Input and has an {@code @sparse} attribute.
+   *
+   * @param node An AST node.
+   */
+  public static boolean isSparse(EObject node) {
+    return findAttributeByName(node, "sparse") != null;
+  }
+
+  /**
+   * Return true if the reaction is unordered.
+   *
+   * <p>Currently, this is only used for synthesized reactions in the context of federated
+   * execution.
+   */
+  public static boolean isUnordered(Reaction reaction) {
+    return findAttributeByName(reaction, "_unordered") != null;
+  }
+
+  /** Return true if the reactor is marked to be a federate. */
+  public static boolean isFederate(Reactor reactor) {
+    return findAttributeByName(reactor, "_fed_config") != null;
+  }
+
+  /**
+   * Return true if the reaction is marked to have a C code body.
+   *
+   * <p>Currently, this is only used for synthesized reactions in the context of federated execution
+   * in Python.
+   */
+  public static boolean hasCBody(Reaction reaction) {
+    return findAttributeByName(reaction, "_c_body") != null;
+  }
+
+  /** Return the declared label of the node, as given by the @label annotation. */
+  public static String getLabel(EObject node) {
+    return getAttributeValue(node, "label");
+  }
+
+  /** Return the declared icon of the node, as given by the @icon annotation. */
+  public static String getIconPath(EObject node) {
+    return getAttributeValue(node, "icon");
+  }
+
+  /**
+   * Return the {@code @enclave} attribute annotated on the given node.
+   *
+   * <p>Returns null if there is no such attribute.
+   */
+  public static Attribute getEnclaveAttribute(Instantiation node) {
+    return findAttributeByName(node, "enclave");
+  }
+
+  /** Return true if the specified instance has an {@code @enclave} attribute. */
+  public static boolean isEnclave(Instantiation node) {
+    return getEnclaveAttribute(node) != null;
+  }
 }
diff --git a/org.lflang/src/org/lflang/DefaultErrorReporter.java b/org.lflang/src/org/lflang/DefaultErrorReporter.java
index 704e19951c..2698d2b582 100644
--- a/org.lflang/src/org/lflang/DefaultErrorReporter.java
+++ b/org.lflang/src/org/lflang/DefaultErrorReporter.java
@@ -1,72 +1,68 @@
 package org.lflang;
 
-import org.eclipse.emf.ecore.EObject;
-
 import java.nio.file.Path;
+import org.eclipse.emf.ecore.EObject;
 
-/**
- * Simple implementation of the ErrorReport interface that simply prints to
- * standard out.
- */
+/** Simple implementation of the ErrorReport interface that simply prints to standard out. */
 public class DefaultErrorReporter implements ErrorReporter {
 
-    private boolean errorsOccurred = false;
+  private boolean errorsOccurred = false;
 
-    private String println(String s) {
-        System.out.println(s);
-        return s;
-    }
+  private String println(String s) {
+    System.out.println(s);
+    return s;
+  }
 
-    @Override
-    public String reportError(String message) {
-        errorsOccurred = true;
-        return println("ERROR: " + message);
-    }
+  @Override
+  public String reportError(String message) {
+    errorsOccurred = true;
+    return println("ERROR: " + message);
+  }
 
-    @Override
-    public String reportError(EObject object, String message) {
-        errorsOccurred = true;
-        return println("ERROR: " + message);
-    }
+  @Override
+  public String reportError(EObject object, String message) {
+    errorsOccurred = true;
+    return println("ERROR: " + message);
+  }
 
-    @Override
-    public String reportError(Path file, Integer line, String message) {
-        errorsOccurred = true;
-        return println("ERROR: " + message);
-    }
+  @Override
+  public String reportError(Path file, Integer line, String message) {
+    errorsOccurred = true;
+    return println("ERROR: " + message);
+  }
 
-    @Override
-    public String reportWarning(String message) {
-        return println("WARNING: " + message);
-    }
+  @Override
+  public String reportWarning(String message) {
+    return println("WARNING: " + message);
+  }
 
-    @Override
-    public String reportInfo(String message) {
-        return println("INFO: " + message);
-    }
+  @Override
+  public String reportInfo(String message) {
+    return println("INFO: " + message);
+  }
 
-    @Override
-    public String reportWarning(EObject object, String message) {
-        return println("WARNING: " + message);
-    }
+  @Override
+  public String reportWarning(EObject object, String message) {
+    return println("WARNING: " + message);
+  }
 
-    @Override
-    public String reportInfo(EObject object, String message) {
-        return println("INFO: " + message);
-    }
+  @Override
+  public String reportInfo(EObject object, String message) {
+    return println("INFO: " + message);
+  }
 
-    @Override
-    public String reportWarning(Path file, Integer line, String message) {
-        return println("WARNING: " + message);
-    }
+  @Override
+  public String reportWarning(Path file, Integer line, String message) {
+    return println("WARNING: " + message);
+  }
 
-    @Override
-    public String reportInfo(Path file, Integer line, String message) {
-        return println("INFO: " + message);
-    }
+  @Override
+  public String reportInfo(Path file, Integer line, String message) {
+    return println("INFO: " + message);
+  }
 
-    @Override
-    public boolean getErrorsOccurred() {
-        return errorsOccurred;
-    }
+  @Override
+  public boolean getErrorsOccurred() {
+    return errorsOccurred;
+  }
 }
diff --git a/org.lflang/src/org/lflang/ErrorReporter.java b/org.lflang/src/org/lflang/ErrorReporter.java
index 0a01e252ee..f7fe6dcb31 100644
--- a/org.lflang/src/org/lflang/ErrorReporter.java
+++ b/org.lflang/src/org/lflang/ErrorReporter.java
@@ -1,10 +1,8 @@
 package org.lflang;
 
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.generator.Position;
 
 /**
@@ -16,164 +14,157 @@
  */
 public interface ErrorReporter {
 
-    /**
-     * Report an error.
-     *
-     * @param message The error message.
-     * @return a string that describes the error.
-     */
-    String reportError(String message);
-
-
-    /**
-     * Report a warning.
-     *
-     * @param message The warning message.
-     * @return a string that describes the warning.
-     */
-    String reportWarning(String message);
-
-    /**
-     * Report an informational message.
-     *
-     * @param message The message to report
-     * @return a string that describes the error
-     */
-    String reportInfo(String message);
-
-
-    /**
-     * Report an error on the specified parse tree object.
-     *
-     * @param object  The parse tree object.
-     * @param message The error message.
-     * @return a string that describes the error.
-     */
-    String reportError(EObject object, String message);
-
-
-    /**
-     * Report a warning on the specified parse tree object.
-     *
-     * @param object  The parse tree object.
-     * @param message The error message.
-     * @return a string that describes the warning.
-     */
-    String reportWarning(EObject object, String message);
-
-    /**
-     * Report an informational message on the specified parse tree object.
-     *
-     * @param object The parse tree object.
-     * @param message The informational message
-     * @return a string that describes the info
-     */
-    String reportInfo(EObject object, String message);
-
-
-    /**
-     * Report an error at the specified line within a file.
-     *
-     * @param message The error message.
-     * @param line    The one-based line number to report at.
-     * @param file    The file to report at.
-     * @return a string that describes the error.
-     */
-    String reportError(Path file, Integer line, String message);
-
-
-    /**
-     * Report a warning at the specified line within a file.
-     *
-     * @param message The error message.
-     * @param line    The one-based line number to report at.
-     * @param file    The file to report at.
-     * @return a string that describes the warning.
-     */
-    String reportWarning(Path file, Integer line, String message);
-
-
-    /**
-     * Report an informational message at the specified line within a file.
-     *
-     * @param file The file to report at.
-     * @param line The one-based line number to report at.
-     * @param message The error message.
-     * @return
-     */
-    String reportInfo(Path file, Integer line, String message);
-
-    /**
-     * Report a message of severity {@code severity}.
-     * @param file The file to which the message pertains, or {@code null} if the file is unknown.
-     * @param severity the severity of the message
-     * @param message the message to send to the IDE
-     * @return a string that describes the diagnostic
-     */
-    default String report(Path file, DiagnosticSeverity severity, String message) {
-        switch (severity) {
-        case Error:
-            return reportError(message);
-        case Warning:
-        case Hint:
-        case Information:
-            return reportInfo(message);
-        default:
-            return reportWarning(message);
-        }
-    }
-
-    /**
-     * Report a message of severity {@code severity} that
-     * pertains to line {@code line} of an LF source file.
-     * @param file The file to which the message pertains, or {@code null} if the file is unknown.
-     * @param severity the severity of the message
-     * @param message the message to send to the IDE
-     * @param line the one-based line number associated
-     *             with the message
-     * @return a string that describes the diagnostic
-     */
-    default String report(Path file, DiagnosticSeverity severity, String message, int line) {
-        switch (severity) {
-        case Error:
-            return reportError(file, line, message);
-        case Warning:
-        case Hint:
-        case Information:
-            return reportInfo(file, line, message);
-        default:
-            return reportWarning(file, line, message);
-        }
+  /**
+   * Report an error.
+   *
+   * @param message The error message.
+   * @return a string that describes the error.
+   */
+  String reportError(String message);
+
+  /**
+   * Report a warning.
+   *
+   * @param message The warning message.
+   * @return a string that describes the warning.
+   */
+  String reportWarning(String message);
+
+  /**
+   * Report an informational message.
+   *
+   * @param message The message to report
+   * @return a string that describes the error
+   */
+  String reportInfo(String message);
+
+  /**
+   * Report an error on the specified parse tree object.
+   *
+   * @param object The parse tree object.
+   * @param message The error message.
+   * @return a string that describes the error.
+   */
+  String reportError(EObject object, String message);
+
+  /**
+   * Report a warning on the specified parse tree object.
+   *
+   * @param object The parse tree object.
+   * @param message The error message.
+   * @return a string that describes the warning.
+   */
+  String reportWarning(EObject object, String message);
+
+  /**
+   * Report an informational message on the specified parse tree object.
+   *
+   * @param object The parse tree object.
+   * @param message The informational message
+   * @return a string that describes the info
+   */
+  String reportInfo(EObject object, String message);
+
+  /**
+   * Report an error at the specified line within a file.
+   *
+   * @param message The error message.
+   * @param line The one-based line number to report at.
+   * @param file The file to report at.
+   * @return a string that describes the error.
+   */
+  String reportError(Path file, Integer line, String message);
+
+  /**
+   * Report a warning at the specified line within a file.
+   *
+   * @param message The error message.
+   * @param line The one-based line number to report at.
+   * @param file The file to report at.
+   * @return a string that describes the warning.
+   */
+  String reportWarning(Path file, Integer line, String message);
+
+  /**
+   * Report an informational message at the specified line within a file.
+   *
+   * @param file The file to report at.
+   * @param line The one-based line number to report at.
+   * @param message The error message.
+   * @return
+   */
+  String reportInfo(Path file, Integer line, String message);
+
+  /**
+   * Report a message of severity {@code severity}.
+   *
+   * @param file The file to which the message pertains, or {@code null} if the file is unknown.
+   * @param severity the severity of the message
+   * @param message the message to send to the IDE
+   * @return a string that describes the diagnostic
+   */
+  default String report(Path file, DiagnosticSeverity severity, String message) {
+    switch (severity) {
+      case Error:
+        return reportError(message);
+      case Warning:
+      case Hint:
+      case Information:
+        return reportInfo(message);
+      default:
+        return reportWarning(message);
     }
-
-    /**
-     * Report a message of severity {@code severity} that
-     * pertains to the range [{@code startPos}, {@code endPos})
-     * of an LF source file.
-     * @param file The file to which the message pertains, or {@code null} if the file is unknown.
-     * @param severity the severity of the message
-     * @param message the message to send to the IDE
-     * @param startPos the position of the first character
-     *                 of the range of interest
-     * @param endPos the position immediately AFTER the
-     *               final character of the range of
-     *               interest
-     * @return a string that describes the diagnostic
-     */
-    default String report(Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
-        return report(file, severity, message, startPos.getOneBasedLine());
+  }
+
+  /**
+   * Report a message of severity {@code severity} that pertains to line {@code line} of an LF
+   * source file.
+   *
+   * @param file The file to which the message pertains, or {@code null} if the file is unknown.
+   * @param severity the severity of the message
+   * @param message the message to send to the IDE
+   * @param line the one-based line number associated with the message
+   * @return a string that describes the diagnostic
+   */
+  default String report(Path file, DiagnosticSeverity severity, String message, int line) {
+    switch (severity) {
+      case Error:
+        return reportError(file, line, message);
+      case Warning:
+      case Hint:
+      case Information:
+        return reportInfo(file, line, message);
+      default:
+        return reportWarning(file, line, message);
     }
-
-    /**
-     * Check if errors where reported.
-     *
-     * @return true if errors where reported
-     */
-    boolean getErrorsOccurred();
-
-    /**
-     * Clear error history, if exists.
-     * This is usually only the case for error markers in Epoch (Eclipse).
-     */
-    default void clearHistory() {}
+  }
+
+  /**
+   * Report a message of severity {@code severity} that pertains to the range [{@code startPos},
+   * {@code endPos}) of an LF source file.
+   *
+   * @param file The file to which the message pertains, or {@code null} if the file is unknown.
+   * @param severity the severity of the message
+   * @param message the message to send to the IDE
+   * @param startPos the position of the first character of the range of interest
+   * @param endPos the position immediately AFTER the final character of the range of interest
+   * @return a string that describes the diagnostic
+   */
+  default String report(
+      Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
+    return report(file, severity, message, startPos.getOneBasedLine());
+  }
+
+  /**
+   * Check if errors where reported.
+   *
+   * @return true if errors where reported
+   */
+  boolean getErrorsOccurred();
+
+  /**
+   * Clear error history, if exists. This is usually only the case for error markers in Epoch
+   * (Eclipse).
+   */
+  default void clearHistory() {}
 }
diff --git a/org.lflang/src/org/lflang/FileConfig.java b/org.lflang/src/org/lflang/FileConfig.java
index e2d3313a61..831cb7957f 100644
--- a/org.lflang/src/org/lflang/FileConfig.java
+++ b/org.lflang/src/org/lflang/FileConfig.java
@@ -5,15 +5,12 @@
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.function.Consumer;
-
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
-
-
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.util.FileUtil;
 import org.lflang.util.LFCommand;
@@ -22,297 +19,267 @@
  * Base class that governs the interactions between code generators and the file system.
  *
  * @author Marten Lohstroh
- *
  */
 public abstract class FileConfig {
 
-    // Public static fields.
-
-    public static final String DEFAULT_SRC_DIR = "src";
-
-    /**
-     * Default name of the directory to store binaries in.
-     */
-    public static final String DEFAULT_BIN_DIR = "bin";
-
-    /**
-     * Default name of the directory to store generated sources in.
-     */
-    public static final String DEFAULT_SRC_GEN_DIR = "src-gen";
-
-    // Public fields.
-
-    /**
-     * The directory in which to put binaries, if the code generator produces any.
-     */
-    public final Path binPath;
-
-    /**
-     * The name of the main reactor, which has to match the file name (without
-     * the '.lf' extension).
-     */
-    public final String name;
-
-    /**
-     * The directory that is the root of the package in which the .lf source file resides. This path is determined
-     * differently depending on whether the compiler is invoked through the IDE or from the command line. In the former
-     * case, the package is the project root that the source resides in. In the latter case, it is the parent directory
-     * of the nearest {@code src} directory up the hierarchy, if there is one, or just the {@code outPath} if there is none. It is
-     * recommended to always keep the sources in a {@code src} directory regardless of the workflow, in which case the
-     * output behavior will be identical irrespective of the way the compiler is invoked.
-     */
-    public final Path srcPkgPath;
-
-    /**
-     * The file containing the main source code.
-     * This is the Eclipse eCore view of the file, which is distinct
-     * from the XText view of the file and the OS view of the file.
-     */
-    public final Resource resource;
-
-    /**
-     * If running in an Eclipse IDE, the iResource refers to the
-     * IFile representing the Lingua Franca program.
-     * This is the XText view of the file, which is distinct
-     * from the Eclipse eCore view of the file and the OS view of the file.
-     * <p>
-     * This is null if running outside an Eclipse IDE.
-     */
-    public final IResource iResource;
-
-    /**
-     * The full path to the file containing the .lf file including the
-     * full filename with the .lf extension.
-     */
-    public final Path srcFile;
-
-    /**
-     * The directory in which the source .lf file was found.
-     */
-    public final Path srcPath; // FIXME: rename this to srcDir?
-
-    /**
-     * Indicate whether the bin directory should be hierarchical.
-     */
-    public final boolean useHierarchicalBin;
-
-    // Protected fields.
-
-    /**
-     * Path representation of srcGenRoot, the root directory for generated
-     * sources.
-     */
-    protected Path srcGenBasePath;
-
-    /**
-     * The directory in which to put the generated sources.
-     * This takes into account the location of the source file relative to the
-     * package root. Specifically, if the source file is x/y/Z.lf relative
-     * to the package root, then the generated sources will be put in x/y/Z
-     * relative to srcGenBasePath.
-     */
-    protected Path srcGenPath;
-
-    // private fields
-
-    /**
-     * The parent of the directory designated for placing generated sources into ({@code ./src-gen} by default). Additional
-     * directories (such as {@code bin} or {@code build}) should be created as siblings of the directory for generated sources,
-     * which means that such directories should be created relative to the path assigned to this class variable.
-     * <p>
-     * The generated source directory is specified in the IDE (Project Properties->LF->Compiler->Output Folder). When
-     * invoking the standalone compiler, the output path is specified directly using the {@code -o} or {@code --output-path} option.
-     */
-    private final Path outPath;
-
-    /**
-     * The directory that denotes the root of the package to which the
-     * generated sources belong. Even if the target language does not have a
-     * notion of packages, this directory groups all files associated with a
-     * single main reactor.
-     * of packages.
-     */
-    private final Path srcGenPkgPath;
-
-    public FileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchicalBin) throws IOException {
-        this.resource = resource;
-        this.useHierarchicalBin = useHierarchicalBin;
-
-        this.srcFile = FileUtil.toPath(this.resource);
-
-        this.srcPath = srcFile.getParent();
-        this.srcPkgPath = getPkgPath(resource);
-
-        this.srcGenBasePath = srcGenBasePath;
-        this.name = FileUtil.nameWithoutExtension(this.srcFile);
-        this.srcGenPath = srcGenBasePath.resolve(getSubPkgPath(srcPath)).resolve(name);
-        this.srcGenPkgPath = this.srcGenPath;
-        this.outPath = srcGenBasePath.getParent();
-
-        Path binRoot = outPath.resolve(DEFAULT_BIN_DIR);
-        this.binPath = useHierarchicalBin ? binRoot.resolve(getSubPkgPath(srcPath)) : binRoot;
-
-        this.iResource = FileUtil.getIResource(resource);
-    }
-
-    /**
-     * Get the directory a resource is located in relative to the root package
-     */
-    public Path getDirectory(Resource r) throws IOException {
-        return getSubPkgPath(FileUtil.toPath(r).getParent());
-    }
-
-    /**
-     * The parent of the directory designated for placing generated sources into ({@code ./src-gen} by default). Additional
-     * directories (such as {@code bin} or {@code build}) should be created as siblings of the directory for generated sources,
-     * which means that such directories should be created relative to the path assigned to this class variable.
-     * <p>
-     * The generated source directory is specified in the IDE (Project Properties->LF->Compiler->Output Folder). When
-     * invoking the standalone compiler, the output path is specified directly using the {@code -o} or {@code --output-path} option.
-     */
-    public Path getOutPath() {
-        return outPath;
+  // Public static fields.
+
+  public static final String DEFAULT_SRC_DIR = "src";
+
+  /** Default name of the directory to store binaries in. */
+  public static final String DEFAULT_BIN_DIR = "bin";
+
+  /** Default name of the directory to store generated sources in. */
+  public static final String DEFAULT_SRC_GEN_DIR = "src-gen";
+
+  // Public fields.
+
+  /** The directory in which to put binaries, if the code generator produces any. */
+  public final Path binPath;
+
+  /**
+   * The name of the main reactor, which has to match the file name (without the '.lf' extension).
+   */
+  public final String name;
+
+  /**
+   * The directory that is the root of the package in which the .lf source file resides. This path
+   * is determined differently depending on whether the compiler is invoked through the IDE or from
+   * the command line. In the former case, the package is the project root that the source resides
+   * in. In the latter case, it is the parent directory of the nearest {@code src} directory up the
+   * hierarchy, if there is one, or just the {@code outPath} if there is none. It is recommended to
+   * always keep the sources in a {@code src} directory regardless of the workflow, in which case
+   * the output behavior will be identical irrespective of the way the compiler is invoked.
+   */
+  public final Path srcPkgPath;
+
+  /**
+   * The file containing the main source code. This is the Eclipse eCore view of the file, which is
+   * distinct from the XText view of the file and the OS view of the file.
+   */
+  public final Resource resource;
+
+  /**
+   * If running in an Eclipse IDE, the iResource refers to the IFile representing the Lingua Franca
+   * program. This is the XText view of the file, which is distinct from the Eclipse eCore view of
+   * the file and the OS view of the file.
+   *
+   * <p>This is null if running outside an Eclipse IDE.
+   */
+  public final IResource iResource;
+
+  /**
+   * The full path to the file containing the .lf file including the full filename with the .lf
+   * extension.
+   */
+  public final Path srcFile;
+
+  /** The directory in which the source .lf file was found. */
+  public final Path srcPath; // FIXME: rename this to srcDir?
+
+  /** Indicate whether the bin directory should be hierarchical. */
+  public final boolean useHierarchicalBin;
+
+  // Protected fields.
+
+  /** Path representation of srcGenRoot, the root directory for generated sources. */
+  protected Path srcGenBasePath;
+
+  /**
+   * The directory in which to put the generated sources. This takes into account the location of
+   * the source file relative to the package root. Specifically, if the source file is x/y/Z.lf
+   * relative to the package root, then the generated sources will be put in x/y/Z relative to
+   * srcGenBasePath.
+   */
+  protected Path srcGenPath;
+
+  // private fields
+
+  /**
+   * The parent of the directory designated for placing generated sources into ({@code ./src-gen} by
+   * default). Additional directories (such as {@code bin} or {@code build}) should be created as
+   * siblings of the directory for generated sources, which means that such directories should be
+   * created relative to the path assigned to this class variable.
+   *
+   * <p>The generated source directory is specified in the IDE (Project
+   * Properties->LF->Compiler->Output Folder). When invoking the standalone compiler, the output
+   * path is specified directly using the {@code -o} or {@code --output-path} option.
+   */
+  private final Path outPath;
+
+  /**
+   * The directory that denotes the root of the package to which the generated sources belong. Even
+   * if the target language does not have a notion of packages, this directory groups all files
+   * associated with a single main reactor. of packages.
+   */
+  private final Path srcGenPkgPath;
+
+  public FileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchicalBin)
+      throws IOException {
+    this.resource = resource;
+    this.useHierarchicalBin = useHierarchicalBin;
+
+    this.srcFile = FileUtil.toPath(this.resource);
+
+    this.srcPath = srcFile.getParent();
+    this.srcPkgPath = getPkgPath(resource);
+
+    this.srcGenBasePath = srcGenBasePath;
+    this.name = FileUtil.nameWithoutExtension(this.srcFile);
+    this.srcGenPath = srcGenBasePath.resolve(getSubPkgPath(srcPath)).resolve(name);
+    this.srcGenPkgPath = this.srcGenPath;
+    this.outPath = srcGenBasePath.getParent();
+
+    Path binRoot = outPath.resolve(DEFAULT_BIN_DIR);
+    this.binPath = useHierarchicalBin ? binRoot.resolve(getSubPkgPath(srcPath)) : binRoot;
+
+    this.iResource = FileUtil.getIResource(resource);
+  }
+
+  /** Get the directory a resource is located in relative to the root package */
+  public Path getDirectory(Resource r) throws IOException {
+    return getSubPkgPath(FileUtil.toPath(r).getParent());
+  }
+
+  /**
+   * The parent of the directory designated for placing generated sources into ({@code ./src-gen} by
+   * default). Additional directories (such as {@code bin} or {@code build}) should be created as
+   * siblings of the directory for generated sources, which means that such directories should be
+   * created relative to the path assigned to this class variable.
+   *
+   * <p>The generated source directory is specified in the IDE (Project
+   * Properties->LF->Compiler->Output Folder). When invoking the standalone compiler, the output
+   * path is specified directly using the {@code -o} or {@code --output-path} option.
+   */
+  public Path getOutPath() {
+    return outPath;
+  }
+
+  /**
+   * The directory in which to put the generated sources. This takes into account the location of
+   * the source file relative to the package root. Specifically, if the source file is x/y/Z.lf
+   * relative to the package root, then the generated sources will be put in x/y/Z relative to
+   * srcGenBasePath.
+   */
+  public Path getSrcGenPath() {
+    return srcGenPath;
+  }
+
+  /**
+   * Path representation of srcGenRoot, the root directory for generated sources. This is the root,
+   * meaning that if the source file is x/y/Z.lf relative to the package root, then the generated
+   * sources will be put in x/y/Z relative to this URI.
+   */
+  public Path getSrcGenBasePath() {
+    return srcGenBasePath;
+  }
+
+  /**
+   * The directory that denotes the root of the package to which the generated sources belong. Even
+   * if the target language does not have a notion of packages, this directory groups all files
+   * associated with a single main reactor.
+   */
+  public Path getSrcGenPkgPath() {
+    return srcGenPkgPath;
+  }
+
+  /** Returns the root directory for generated sources. */
+  public static Path getSrcGenRoot(IFileSystemAccess2 fsa) throws IOException {
+    URI srcGenURI = fsa.getURI("");
+    if (srcGenURI.hasTrailingPathSeparator()) {
+      srcGenURI = srcGenURI.trimSegments(1);
     }
-
-    /**
-     * The directory in which to put the generated sources.
-     * This takes into account the location of the source file relative to the
-     * package root. Specifically, if the source file is x/y/Z.lf relative
-     * to the package root, then the generated sources will be put in x/y/Z
-     * relative to srcGenBasePath.
-     */
-    public Path getSrcGenPath() {
-        return srcGenPath;
-    }
-
-
-    /**
-     * Path representation of srcGenRoot, the root directory for generated
-     * sources. This is the root, meaning that if the source file is x/y/Z.lf
-     * relative to the package root, then the generated sources will be put in x/y/Z
-     * relative to this URI.
-     */
-    public Path getSrcGenBasePath() {
-        return srcGenBasePath;
+    return FileUtil.toPath(srcGenURI);
+  }
+
+  /**
+   * Given a path that denotes the full path to a source file (not including the file itself),
+   * return the relative path from the root of the 'src' directory, or, if there is no 'src'
+   * directory, the relative path from the root of the package.
+   *
+   * @param srcPath The path to the source.
+   * @return the relative path from the root of the 'src' directory, or, if there is no 'src'
+   *     directory, the relative path from the root of the package
+   */
+  protected Path getSubPkgPath(Path srcPath) {
+    Path relSrcPath = srcPkgPath.relativize(srcPath);
+    if (relSrcPath.startsWith(DEFAULT_SRC_DIR)) {
+      int segments = relSrcPath.getNameCount();
+      if (segments == 1) {
+        return Paths.get("");
+      } else {
+        relSrcPath = relSrcPath.subpath(1, segments);
+      }
     }
-
-    /**
-     * The directory that denotes the root of the package to which the
-     * generated sources belong. Even if the target language does not have a
-     * notion of packages, this directory groups all files associated with a
-     * single main reactor.
-     */
-    public Path getSrcGenPkgPath() {
-        return srcGenPkgPath;
-    }
-
-    /**
-     * Returns the root directory for generated sources.
-     */
-    public static Path getSrcGenRoot(IFileSystemAccess2 fsa) throws IOException {
-        URI srcGenURI = fsa.getURI("");
-        if (srcGenURI.hasTrailingPathSeparator()) {
-            srcGenURI = srcGenURI.trimSegments(1);
+    return relSrcPath;
+  }
+
+  /**
+   * Clean any artifacts produced by the code generator and target compilers.
+   *
+   * <p>The base implementation deletes the bin and src-gen directories. If the target code
+   * generator creates additional files or directories, the corresponding generator should override
+   * this method.
+   *
+   * @throws IOException If an I/O error occurs.
+   */
+  public void doClean() throws IOException {
+    FileUtil.deleteDirectory(binPath);
+    FileUtil.deleteDirectory(srcGenBasePath);
+  }
+
+  private static Path getPkgPath(Resource resource) throws IOException {
+    if (resource.getURI().isPlatform()) {
+      // We are in the RCA.
+      Path srcFile = FileUtil.toPath(resource);
+      for (IProject r : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
+        Path p = Paths.get(r.getLocation().toFile().getAbsolutePath());
+        Path f = srcFile.toAbsolutePath();
+        if (f.startsWith(p)) {
+          return p;
         }
-        return FileUtil.toPath(srcGenURI);
-    }
-
-    /**
-     * Given a path that denotes the full path to a source file (not including the
-     * file itself), return the relative path from the root of the 'src'
-     * directory, or, if there is no 'src' directory, the relative path
-     * from the root of the package.
-     * @param srcPath The path to the source.
-     * @return the relative path from the root of the 'src'
-     * directory, or, if there is no 'src' directory, the relative path
-     * from the root of the package
-     */
-    protected Path getSubPkgPath(Path srcPath) {
-        Path relSrcPath = srcPkgPath.relativize(srcPath);
-        if (relSrcPath.startsWith(DEFAULT_SRC_DIR)) {
-            int segments = relSrcPath.getNameCount();
-            if (segments == 1) {
-                return Paths.get("");
-            } else {
-                relSrcPath = relSrcPath.subpath(1, segments);
-            }
-        }
-        return relSrcPath;
-    }
-
-    /**
-     * Clean any artifacts produced by the code generator and target compilers.
-     * <p>
-     * The base implementation deletes the bin and src-gen directories. If the
-     * target code generator creates additional files or directories, the
-     * corresponding generator should override this method.
-     *
-     * @throws IOException If an I/O error occurs.
-     */
-    public void doClean() throws IOException {
-        FileUtil.deleteDirectory(binPath);
-        FileUtil.deleteDirectory(srcGenBasePath);
-    }
-
-    private static Path getPkgPath(Resource resource) throws IOException {
-        if (resource.getURI().isPlatform()) {
-            // We are in the RCA.
-            Path srcFile = FileUtil.toPath(resource);
-            for (IProject r : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
-                Path p = Paths.get(r.getLocation().toFile().getAbsolutePath());
-                Path f = srcFile.toAbsolutePath();
-                if (f.startsWith(p)) {
-                    return p;
-                }
-            }
-        }
-        return findPackageRoot(FileUtil.toPath(resource), s -> {});
-    }
-
-    /**
-     * Find the package root by looking for an 'src'
-     * directory. If none can be found, return the current
-     * working directory instead.
-     *
-     * @param input The *.lf file to find the package root
-     *              for.
-     * @return The package root, or the current working
-     * directory if none exists.
-     */
-    public static Path findPackageRoot(final Path input, final Consumer<String> printWarning) {
-        Path p = input;
-        do {
-            p = p.getParent();
-            if (p == null) {
-                printWarning.accept("File '" + input.getFileName() + "' is not located in an 'src' directory.");
-                printWarning.accept("Adopting the current working directory as the package root.");
-                return Paths.get(".").toAbsolutePath(); // todo #1478 replace with Io::getWd
-            }
-        } while (!p.toFile().getName().equals("src"));
-        return p.getParent();
-    }
-
-    /**
-     * Return an LFCommand instance that can be used to execute the program under compilation.
-     */
-    public LFCommand getCommand() {
-        String cmd = GeneratorUtils.isHostWindows() ?
-            getExecutable().toString() :
-            srcPkgPath.relativize(getExecutable()).toString();
-        return LFCommand.get(cmd, List.of(), true, srcPkgPath);
-    }
-
-    /**
-     * Return the extension used for binaries on the platform on which compilation takes place.
-     */
-    protected String getExecutableExtension() {
-        return GeneratorUtils.isHostWindows() ? ".exe" : "";
-    }
-
-    /**
-     * Return a path to an executable version of the program under compilation.
-     */
-    public Path getExecutable() {
-        return binPath.resolve(name + getExecutableExtension());
+      }
     }
+    return findPackageRoot(FileUtil.toPath(resource), s -> {});
+  }
+
+  /**
+   * Find the package root by looking for an 'src' directory. If none can be found, return the
+   * current working directory instead.
+   *
+   * @param input The *.lf file to find the package root for.
+   * @return The package root, or the current working directory if none exists.
+   */
+  public static Path findPackageRoot(final Path input, final Consumer<String> printWarning) {
+    Path p = input;
+    do {
+      p = p.getParent();
+      if (p == null) {
+        printWarning.accept(
+            "File '" + input.getFileName() + "' is not located in an 'src' directory.");
+        printWarning.accept("Adopting the current working directory as the package root.");
+        return Paths.get(".").toAbsolutePath(); // todo #1478 replace with Io::getWd
+      }
+    } while (!p.toFile().getName().equals("src"));
+    return p.getParent();
+  }
+
+  /** Return an LFCommand instance that can be used to execute the program under compilation. */
+  public LFCommand getCommand() {
+    String cmd =
+        GeneratorUtils.isHostWindows()
+            ? getExecutable().toString()
+            : srcPkgPath.relativize(getExecutable()).toString();
+    return LFCommand.get(cmd, List.of(), true, srcPkgPath);
+  }
+
+  /** Return the extension used for binaries on the platform on which compilation takes place. */
+  protected String getExecutableExtension() {
+    return GeneratorUtils.isHostWindows() ? ".exe" : "";
+  }
+
+  /** Return a path to an executable version of the program under compilation. */
+  public Path getExecutable() {
+    return binPath.resolve(name + getExecutableExtension());
+  }
 }
diff --git a/org.lflang/src/org/lflang/InferredType.java b/org.lflang/src/org/lflang/InferredType.java
index 41931e0e32..5e9b4a8aa3 100644
--- a/org.lflang/src/org/lflang/InferredType.java
+++ b/org.lflang/src/org/lflang/InferredType.java
@@ -1,209 +1,184 @@
 /*************
-Copyright (c) 2020, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang;
 
 import java.util.function.Function;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Type;
 
 /**
  * A helper class that represents an inferred type.
  *
- * <p>This class helps to separate the rules of type inference from code generation
- * for types. It is particularly useful in cases when the type is not given directly
- * in LF code, but is inferred from the context. In this case it could happen that
- * no ASTNode representing the type does not exist. For instance when a
- * parameter type is inferred from a time value. All in all, this class provides a
- * clean interface between type inference in ASTUtils and code generation.
+ * <p>This class helps to separate the rules of type inference from code generation for types. It is
+ * particularly useful in cases when the type is not given directly in LF code, but is inferred from
+ * the context. In this case it could happen that no ASTNode representing the type does not exist.
+ * For instance when a parameter type is inferred from a time value. All in all, this class provides
+ * a clean interface between type inference in ASTUtils and code generation.
  *
- * <p>ASTUtils provides functionality to create an inferred type from
- * Lingua Franca variables (getInferredType). This inferred type can than be
- * translated to target code using the code generators or be converted to a general
- * textual representation using toText().
+ * <p>ASTUtils provides functionality to create an inferred type from Lingua Franca variables
+ * (getInferredType). This inferred type can than be translated to target code using the code
+ * generators or be converted to a general textual representation using toText().
  *
  * @author Christian Menard
  */
 public class InferredType {
 
-    /**
-     * The AST node representing the inferred type if such a node exists.
-     */
-    public final Type astType;
-    /**
-     * A flag indicating whether the inferred type has the base type time.
-     */
-    public final boolean isTime;
-    /**
-     * A flag indicating whether the inferred type is a list.
-     */
-    public final boolean isList;
-    /**
-     * A flag indicating whether the inferred type is a list of variable size.
-     */
-    public final boolean isVariableSizeList;
-    /**
-     * A flag indicating whether the inferred type is a list of fixed size.
-     */
-    public final boolean isFixedSizeList;
-    /**
-     * The list size if the inferred type is a fixed size list.
-     * Otherwise, null.
-     */
-    public final Integer listSize;
-
-
-    /**
-     * Private constructor
-     */
-    private InferredType(Type astType, boolean isTime, boolean isVariableSizeList,
-                         boolean isFixedSizeList, Integer listSize) {
-        this.astType = astType;
-        this.isTime = isTime;
-        this.isList = isVariableSizeList || isFixedSizeList;
-        this.isVariableSizeList = isVariableSizeList;
-        this.isFixedSizeList = isFixedSizeList;
-        this.listSize = listSize;
+  /** The AST node representing the inferred type if such a node exists. */
+  public final Type astType;
+  /** A flag indicating whether the inferred type has the base type time. */
+  public final boolean isTime;
+  /** A flag indicating whether the inferred type is a list. */
+  public final boolean isList;
+  /** A flag indicating whether the inferred type is a list of variable size. */
+  public final boolean isVariableSizeList;
+  /** A flag indicating whether the inferred type is a list of fixed size. */
+  public final boolean isFixedSizeList;
+  /** The list size if the inferred type is a fixed size list. Otherwise, null. */
+  public final Integer listSize;
+
+  /** Private constructor */
+  private InferredType(
+      Type astType,
+      boolean isTime,
+      boolean isVariableSizeList,
+      boolean isFixedSizeList,
+      Integer listSize) {
+    this.astType = astType;
+    this.isTime = isTime;
+    this.isList = isVariableSizeList || isFixedSizeList;
+    this.isVariableSizeList = isVariableSizeList;
+    this.isFixedSizeList = isFixedSizeList;
+    this.listSize = listSize;
+  }
+
+  /** Check if the inferred type is undefined. */
+  public boolean isUndefined() {
+    return astType == null && !isTime;
+  }
+
+  /**
+   * Convert the inferred type to its textual representation as it would appear in LF code, with
+   * CodeMap tags inserted.
+   */
+  public String toText() {
+    return toTextHelper(ASTUtils::toText);
+  }
+
+  /**
+   * Convert the inferred type to its textual representation as it would appear in LF code, without
+   * CodeMap tags inserted.
+   */
+  public String toOriginalText() {
+    return toTextHelper(ASTUtils::toOriginalText);
+  }
+
+  private String toTextHelper(Function<EObject, String> toText) {
+    if (astType != null) {
+      return toText.apply(astType);
+    } else if (isTime) {
+      if (isFixedSizeList) {
+        return "time[" + listSize + "]";
+      } else if (isVariableSizeList) {
+        return "time[]";
+      } else {
+        return "time";
+      }
     }
-
-
-    /**
-     * Check if the inferred type is undefined.
-     */
-    public boolean isUndefined() {
-        return astType == null && !isTime;
-    }
-
-    /**
-     * Convert the inferred type to its textual representation as it would appear in LF code,
-     * with CodeMap tags inserted.
-     */
-    public String toText() { return toTextHelper(ASTUtils::toText); }
-
-    /**
-     * Convert the inferred type to its textual representation as it would appear in LF code,
-     * without CodeMap tags inserted.
-     */
-    public String toOriginalText() { return toTextHelper(ASTUtils::toOriginalText); }
-
-    private String toTextHelper(Function<EObject, String> toText) {
-        if (astType != null) {
-            return toText.apply(astType);
-        } else if (isTime) {
-            if (isFixedSizeList) {
-                return "time[" + listSize + "]";
-            } else if (isVariableSizeList) {
-                return "time[]";
-            } else {
-                return "time";
-            }
-        }
-        return "";
-    }
-
-    /**
-     * Convert the inferred type to its textual representation
-     * while ignoring any list qualifiers or type arguments.
-     *
-     * @return Textual representation of this inferred type without list qualifiers
-     */
-    public String baseType() {
-        if (astType != null) {
-            return ASTUtils.baseType(astType);
-        } else if (isTime) {
-            return "time";
-        }
-        return "";
+    return "";
+  }
+
+  /**
+   * Convert the inferred type to its textual representation while ignoring any list qualifiers or
+   * type arguments.
+   *
+   * @return Textual representation of this inferred type without list qualifiers
+   */
+  public String baseType() {
+    if (astType != null) {
+      return ASTUtils.baseType(astType);
+    } else if (isTime) {
+      return "time";
     }
-
-    /**
-     * Create an inferred type from an AST node.
-     *
-     * @param type an AST node
-     * @return A new inferred type representing the given AST node
-     */
-    public static InferredType fromAST(Type type) {
-        if (type == null) {
-            return undefined();
-        }
-        return new InferredType(
-            type,
-            type.isTime(),
-            type.getArraySpec() != null && type.getArraySpec().isOfVariableLength(),
-            type.getArraySpec() != null && !type.getArraySpec().isOfVariableLength(),
-            type.getArraySpec() != null ? type.getArraySpec().getLength() : null
-        );
-    }
-
-    /**
-     * Create an undefined inferred type.
-     */
-    public static InferredType undefined() {
-        return new InferredType(null, false, false, false, null);
-    }
-
-    /**
-     * Create an inferred type representing time.
-     */
-    public static InferredType time() {
-        return new InferredType(null, true, false, false, null);
-    }
-
-    /**
-     * Create an inferred type representing a list of time values.
-     *
-     * <p>This creates a fixed size list if size is non-null,
-     * otherwise a variable size list.
-     *
-     * @param size The list size, may be null
-     */
-    public static InferredType timeList(Integer size) {
-        return new InferredType(null, true, size == null, size != null, size);
-    }
-
-    /**
-     * Create an inferred type representing a variable size time list.
-     */
-    public static InferredType timeList() {
-        return timeList(null);
-    }
-
-    /**
-     * Returns the component type, if this is a first-class
-     * list type. Eg returns {@code time} for the type {@code time[]}.
-     * If this is not a first-class list type, returns null.
-     *
-     * <p>Todo this does not return int for int[], we need to
-     *  make the parser production left-recursive. OTOH only
-     *  time and time[] are first class in our framework so
-     *  this doesn't contradict the contract of this method.
-     */
-    public InferredType getComponentType() {
-        return isTime && isList ? time() : null;
+    return "";
+  }
+
+  /**
+   * Create an inferred type from an AST node.
+   *
+   * @param type an AST node
+   * @return A new inferred type representing the given AST node
+   */
+  public static InferredType fromAST(Type type) {
+    if (type == null) {
+      return undefined();
     }
+    return new InferredType(
+        type,
+        type.isTime(),
+        type.getArraySpec() != null && type.getArraySpec().isOfVariableLength(),
+        type.getArraySpec() != null && !type.getArraySpec().isOfVariableLength(),
+        type.getArraySpec() != null ? type.getArraySpec().getLength() : null);
+  }
+
+  /** Create an undefined inferred type. */
+  public static InferredType undefined() {
+    return new InferredType(null, false, false, false, null);
+  }
+
+  /** Create an inferred type representing time. */
+  public static InferredType time() {
+    return new InferredType(null, true, false, false, null);
+  }
+
+  /**
+   * Create an inferred type representing a list of time values.
+   *
+   * <p>This creates a fixed size list if size is non-null, otherwise a variable size list.
+   *
+   * @param size The list size, may be null
+   */
+  public static InferredType timeList(Integer size) {
+    return new InferredType(null, true, size == null, size != null, size);
+  }
+
+  /** Create an inferred type representing a variable size time list. */
+  public static InferredType timeList() {
+    return timeList(null);
+  }
+
+  /**
+   * Returns the component type, if this is a first-class list type. Eg returns {@code time} for the
+   * type {@code time[]}. If this is not a first-class list type, returns null.
+   *
+   * <p>Todo this does not return int for int[], we need to make the parser production
+   * left-recursive. OTOH only time and time[] are first class in our framework so this doesn't
+   * contradict the contract of this method.
+   */
+  public InferredType getComponentType() {
+    return isTime && isList ? time() : null;
+  }
 }
diff --git a/org.lflang/src/org/lflang/LFResourceDescriptionStrategy.java b/org.lflang/src/org/lflang/LFResourceDescriptionStrategy.java
index 548d5e0ea6..487e63374b 100644
--- a/org.lflang/src/org/lflang/LFResourceDescriptionStrategy.java
+++ b/org.lflang/src/org/lflang/LFResourceDescriptionStrategy.java
@@ -1,32 +1,32 @@
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang;
 
+import com.google.inject.Inject;
 import java.util.Map;
 import java.util.stream.Collectors;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.naming.QualifiedName;
 import org.eclipse.xtext.resource.EObjectDescription;
@@ -34,56 +34,52 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.eclipse.xtext.resource.impl.DefaultResourceDescriptionStrategy;
 import org.eclipse.xtext.scoping.impl.ImportUriResolver;
 import org.eclipse.xtext.util.IAcceptor;
-
 import org.lflang.lf.Model;
 
-import com.google.inject.Inject;
-
 /**
- * Resource description strategy designed to limit global scope to only those
- * files that were explicitly imported.
- * <p>
- * Adapted from example provided by Itemis.
+ * Resource description strategy designed to limit global scope to only those files that were
+ * explicitly imported.
+ *
+ * <p>Adapted from example provided by Itemis.
  *
  * @author Marten Lohstroh
  * @see "https://blogs.itemis.com/en/in-five-minutes-to-transitive-imports-within-a-dsl-with-xtext"
  */
 public class LFResourceDescriptionStrategy extends DefaultResourceDescriptionStrategy {
 
-    /**
-     * Key used in user data attached to description of a Model.
-     */
-    public static final String INCLUDES = "includes";
+  /** Key used in user data attached to description of a Model. */
+  public static final String INCLUDES = "includes";
 
-    /**
-     * Delimiter used in the values associated with INCLUDES keys in the
-     * user-data descriptions of Models.
-     */
-    public static final String DELIMITER = ",";
+  /**
+   * Delimiter used in the values associated with INCLUDES keys in the user-data descriptions of
+   * Models.
+   */
+  public static final String DELIMITER = ",";
 
-    @Inject
-    private ImportUriResolver uriResolver;
+  @Inject private ImportUriResolver uriResolver;
 
-    @Override
-    public boolean createEObjectDescriptions(EObject eObject, IAcceptor<IEObjectDescription> acceptor) {
-        if (eObject instanceof Model) {
-            this.createEObjectDescriptionForModel((Model) eObject, acceptor);
-            return true;
-        } else {
-            return super.createEObjectDescriptions(eObject, acceptor);
-        }
+  @Override
+  public boolean createEObjectDescriptions(
+      EObject eObject, IAcceptor<IEObjectDescription> acceptor) {
+    if (eObject instanceof Model) {
+      this.createEObjectDescriptionForModel((Model) eObject, acceptor);
+      return true;
+    } else {
+      return super.createEObjectDescriptions(eObject, acceptor);
     }
+  }
 
-    /**
-     * Build an index containing the strings of the URIs imported resources.
-     * <p>
-     * All the URIs are added to comma-separated string and stored under the
-     * key "includes" in the userData map of the object description.
-     **/
-    private void createEObjectDescriptionForModel(Model model, IAcceptor<IEObjectDescription> acceptor) {
-        var uris = model.getImports().stream().map(uriResolver).collect(Collectors.joining(DELIMITER));
-        var userData = Map.of(INCLUDES, uris);
-        QualifiedName qname = QualifiedName.create(model.eResource().getURI().toString());
-        acceptor.accept(EObjectDescription.create(qname, model, userData));
-    }
+  /**
+   * Build an index containing the strings of the URIs imported resources.
+   *
+   * <p>All the URIs are added to comma-separated string and stored under the key "includes" in the
+   * userData map of the object description.
+   */
+  private void createEObjectDescriptionForModel(
+      Model model, IAcceptor<IEObjectDescription> acceptor) {
+    var uris = model.getImports().stream().map(uriResolver).collect(Collectors.joining(DELIMITER));
+    var userData = Map.of(INCLUDES, uris);
+    QualifiedName qname = QualifiedName.create(model.eResource().getURI().toString());
+    acceptor.accept(EObjectDescription.create(qname, model, userData));
+  }
 }
diff --git a/org.lflang/src/org/lflang/LFResourceProvider.java b/org.lflang/src/org/lflang/LFResourceProvider.java
index 51db96a6d5..03c7b9ea47 100644
--- a/org.lflang/src/org/lflang/LFResourceProvider.java
+++ b/org.lflang/src/org/lflang/LFResourceProvider.java
@@ -1,28 +1,24 @@
 package org.lflang;
 
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
 import com.google.inject.Inject;
 import com.google.inject.Provider;
+import org.eclipse.emf.ecore.resource.ResourceSet;
 
 /**
  * Class that provides access to a resource set.
- * 
- * @author Marten Lohstroh
  *
+ * @author Marten Lohstroh
  */
 public class LFResourceProvider {
-    /**
-     * Injected resource set provider.
-     */
-    @Inject
-    private Provider<ResourceSet> resourceSetProvider;
-    
-    /**
-     * Return a resource set obtained from the injected provider.
-     * @return
-     */
-    public ResourceSet getResourceSet() {
-        return this.resourceSetProvider.get();
-    }
+  /** Injected resource set provider. */
+  @Inject private Provider<ResourceSet> resourceSetProvider;
+
+  /**
+   * Return a resource set obtained from the injected provider.
+   *
+   * @return
+   */
+  public ResourceSet getResourceSet() {
+    return this.resourceSetProvider.get();
+  }
 }
diff --git a/org.lflang/src/org/lflang/LFRuntimeModule.java b/org.lflang/src/org/lflang/LFRuntimeModule.java
index a7c1e80a19..a01986dfb3 100644
--- a/org.lflang/src/org/lflang/LFRuntimeModule.java
+++ b/org.lflang/src/org/lflang/LFRuntimeModule.java
@@ -8,50 +8,50 @@
 import org.eclipse.xtext.resource.IDefaultResourceDescriptionStrategy;
 import org.eclipse.xtext.scoping.IGlobalScopeProvider;
 import org.eclipse.xtext.validation.INamesAreUniqueValidationHelper;
-
 import org.lflang.formatting2.LFFormatter;
 import org.lflang.scoping.LFGlobalScopeProvider;
 import org.lflang.validation.LFNamesAreUniqueValidationHelper;
 
 /**
- * Binds services that are available both when running LFC
- * standalone, and when running within the IDE.
+ * Binds services that are available both when running LFC standalone, and when running within the
+ * IDE.
+ *
  * <ul>
- * <li>LfIdeModule overrides this module with additional
- * bindings when running in the IDE.
- * <li>{@code org.lflang.lfc.LFStandaloneModule} overrides this module when
- * running LFC standalone.
+ *   <li>LfIdeModule overrides this module with additional bindings when running in the IDE.
+ *   <li>{@code org.lflang.lfc.LFStandaloneModule} overrides this module when running LFC
+ *       standalone.
  * </ul>
  */
 public class LFRuntimeModule extends AbstractLFRuntimeModule {
 
-    /** Establish a binding to our custom resource description strategy. */
-    public Class<? extends IDefaultResourceDescriptionStrategy> bindIDefaultResourceDescriptionStrategy() {
-        return LFResourceDescriptionStrategy.class;
-    }
-
-    /** Establish a binding to our custom global scope provider. */
-    @Override
-    public Class<? extends IGlobalScopeProvider> bindIGlobalScopeProvider() {
-        return LFGlobalScopeProvider.class;
-    }
-
-    /** Establish a binding to a helper that checks that names are unique. */
-    public Class<? extends INamesAreUniqueValidationHelper> bindNamesAreUniqueValidationHelper() {
-        return LFNamesAreUniqueValidationHelper.class;
-    }
-    
-    public Class<? extends ISyntaxErrorMessageProvider> bindISyntaxErrorMessageProvider() {
-        return LFSyntaxErrorMessageProvider.class;
-    }
-
-    /** The error reporter. {@code org.lflang.lfc.LFStandaloneModule} overrides this binding. */
-    public Class<? extends ErrorReporter> bindErrorReporter() {
-        return DefaultErrorReporter.class;
-    }
-
-    @Override
-    public Class<? extends IFormatter2> bindIFormatter2() {
-        return LFFormatter.class;
-    }
+  /** Establish a binding to our custom resource description strategy. */
+  public Class<? extends IDefaultResourceDescriptionStrategy>
+      bindIDefaultResourceDescriptionStrategy() {
+    return LFResourceDescriptionStrategy.class;
+  }
+
+  /** Establish a binding to our custom global scope provider. */
+  @Override
+  public Class<? extends IGlobalScopeProvider> bindIGlobalScopeProvider() {
+    return LFGlobalScopeProvider.class;
+  }
+
+  /** Establish a binding to a helper that checks that names are unique. */
+  public Class<? extends INamesAreUniqueValidationHelper> bindNamesAreUniqueValidationHelper() {
+    return LFNamesAreUniqueValidationHelper.class;
+  }
+
+  public Class<? extends ISyntaxErrorMessageProvider> bindISyntaxErrorMessageProvider() {
+    return LFSyntaxErrorMessageProvider.class;
+  }
+
+  /** The error reporter. {@code org.lflang.lfc.LFStandaloneModule} overrides this binding. */
+  public Class<? extends ErrorReporter> bindErrorReporter() {
+    return DefaultErrorReporter.class;
+  }
+
+  @Override
+  public Class<? extends IFormatter2> bindIFormatter2() {
+    return LFFormatter.class;
+  }
 }
diff --git a/org.lflang/src/org/lflang/LFStandaloneSetup.java b/org.lflang/src/org/lflang/LFStandaloneSetup.java
index c1b5e85ecf..13264adabe 100644
--- a/org.lflang/src/org/lflang/LFStandaloneSetup.java
+++ b/org.lflang/src/org/lflang/LFStandaloneSetup.java
@@ -4,33 +4,30 @@
 
 package org.lflang;
 
-
-import org.eclipse.xtext.util.Modules2;
-
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Module;
+import org.eclipse.xtext.util.Modules2;
 
 /**
- * Initialization support for running Xtext languages without
- * Equinox extension registry.
+ * Initialization support for running Xtext languages without Equinox extension registry.
  *
- * See {@link LFRuntimeModule}, the base Guice module for LF services.
+ * <p>See {@link LFRuntimeModule}, the base Guice module for LF services.
  */
 public class LFStandaloneSetup extends LFStandaloneSetupGenerated {
 
-	private final Module module;
+  private final Module module;
 
-	public LFStandaloneSetup() {
-		this.module = new LFRuntimeModule();
-	}
+  public LFStandaloneSetup() {
+    this.module = new LFRuntimeModule();
+  }
 
-	public LFStandaloneSetup(Module... modules) {
-		this.module = Modules2.mixin(modules);
-	}
+  public LFStandaloneSetup(Module... modules) {
+    this.module = Modules2.mixin(modules);
+  }
 
-	@Override
-	public Injector createInjector() {
-		return Guice.createInjector(this.module);
-	}
+  @Override
+  public Injector createInjector() {
+    return Guice.createInjector(this.module);
+  }
 }
diff --git a/org.lflang/src/org/lflang/LFSyntaxErrorMessageProvider.java b/org.lflang/src/org/lflang/LFSyntaxErrorMessageProvider.java
index ac5511980a..d1ddb312e1 100644
--- a/org.lflang/src/org/lflang/LFSyntaxErrorMessageProvider.java
+++ b/org.lflang/src/org/lflang/LFSyntaxErrorMessageProvider.java
@@ -1,8 +1,8 @@
 package org.lflang;
 
+import com.google.inject.Inject;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.antlr.runtime.RecognitionException;
 import org.antlr.runtime.Token;
 import org.eclipse.xtext.GrammarUtil;
@@ -10,78 +10,70 @@
 import org.eclipse.xtext.nodemodel.SyntaxErrorMessage;
 import org.eclipse.xtext.parser.antlr.SyntaxErrorMessageProvider;
 
-import com.google.inject.Inject;
-
 /**
  * Custom error message provider that intercepts syntax errors.
- * 
+ *
  * @author Marten Lohstroh
  */
 public class LFSyntaxErrorMessageProvider extends SyntaxErrorMessageProvider {
-    
-    /**
-     * Issue code for syntax error due to misused keyword.
-     */
-    public static String USED_RESERVED_KEYWORD = "USED_RESERVED_KEYWORD";
-    
-    /**
-     * Issue code for syntax error due to misused single quotes.
-     */
-    public static String SINGLY_QUOTED_STRING = "SINGLE_QUOTED_STRING";
-    
-    /**
-     * Helper that provides access to the grammar.
-     */
-    @Inject IGrammarAccess grammarAccess;
-    
-    /**
-     * Set of keywords that otherwise would be valid identifiers. 
-     * For example, 'reaction' is part of this set, but '{=' is not.
-     */
-    public Set<String> keywords;
-        
-    /**
-     * Customize intercepted error messages.
-     * 
-     * @Override
-     */
-    public SyntaxErrorMessage getSyntaxErrorMessage(IParserErrorContext context) {
-        
-        if (context != null) {
-            String message = context.getDefaultMessage(); 
-            
-            // Describe situation where an unexpected token was encountered where a closing single quote was expected.
-            if (message.contains("expecting '''")) {
-                return new SyntaxErrorMessage("Single quotes can only be used around single characters, not strings. "
-                        + "Please use double quotes instead.", SINGLY_QUOTED_STRING);
+
+  /** Issue code for syntax error due to misused keyword. */
+  public static String USED_RESERVED_KEYWORD = "USED_RESERVED_KEYWORD";
+
+  /** Issue code for syntax error due to misused single quotes. */
+  public static String SINGLY_QUOTED_STRING = "SINGLE_QUOTED_STRING";
+
+  /** Helper that provides access to the grammar. */
+  @Inject IGrammarAccess grammarAccess;
+
+  /**
+   * Set of keywords that otherwise would be valid identifiers. For example, 'reaction' is part of
+   * this set, but '{=' is not.
+   */
+  public Set<String> keywords;
+
+  /** Customize intercepted error messages. @Override */
+  public SyntaxErrorMessage getSyntaxErrorMessage(IParserErrorContext context) {
+
+    if (context != null) {
+      String message = context.getDefaultMessage();
+
+      // Describe situation where an unexpected token was encountered where a closing single quote
+      // was expected.
+      if (message.contains("expecting '''")) {
+        return new SyntaxErrorMessage(
+            "Single quotes can only be used around single characters, not strings. "
+                + "Please use double quotes instead.",
+            SINGLY_QUOTED_STRING);
+      }
+
+      RecognitionException e = context.getRecognitionException();
+      if (e != null) {
+        Token token = e.token;
+        if (token != null) {
+          String text = token.getText();
+          if (text != null) {
+            // Update keywords if not yet set.
+            if (keywords == null) {
+              // ('a'..'z'|'A'..'Z'|'_')('a'..'z'|'A'..'Z'|'_'|'0'..'9')*
+              this.keywords =
+                  GrammarUtil.getAllKeywords(grammarAccess.getGrammar()).stream()
+                      .filter(k -> k.matches("^([a-z]|[A-Z]|_)+(\\w|_)*$"))
+                      .collect(Collectors.toSet());
             }
-            
-            RecognitionException e = context.getRecognitionException();
-            if (e != null) {
-                Token token = e.token;
-                if (token != null) {
-                    String text = token.getText();
-                    if (text != null) {
-                        // Update keywords if not yet set.
-                        if (keywords == null) {
-                            // ('a'..'z'|'A'..'Z'|'_')('a'..'z'|'A'..'Z'|'_'|'0'..'9')*
-                            this.keywords = GrammarUtil
-                                    .getAllKeywords(grammarAccess.getGrammar())
-                                    .stream()
-                                    .filter(k -> k
-                                            .matches("^([a-z]|[A-Z]|_)+(\\w|_)*$"))
-                                    .collect(Collectors.toSet());
-                            
-                        }
-                        // Describe situation where a keyword is used as an identifier.
-                        if (keywords.contains(text)) {
-                            return new SyntaxErrorMessage("'" + text + "' is a reserved keyword "
-                                    + "which cannot be used as an identifier.", USED_RESERVED_KEYWORD);
-                        }
-                    }
-                }
+            // Describe situation where a keyword is used as an identifier.
+            if (keywords.contains(text)) {
+              return new SyntaxErrorMessage(
+                  "'"
+                      + text
+                      + "' is a reserved keyword "
+                      + "which cannot be used as an identifier.",
+                  USED_RESERVED_KEYWORD);
             }
+          }
         }
-        return super.getSyntaxErrorMessage(context);
+      }
     }
+    return super.getSyntaxErrorMessage(context);
+  }
 }
diff --git a/org.lflang/src/org/lflang/LocalStrings.java b/org.lflang/src/org/lflang/LocalStrings.java
index 79f338b39d..314839c3f1 100644
--- a/org.lflang/src/org/lflang/LocalStrings.java
+++ b/org.lflang/src/org/lflang/LocalStrings.java
@@ -2,10 +2,8 @@
 
 import java.util.ResourceBundle;
 
-/**
- * Static class for managing strings.
- */
+/** Static class for managing strings. */
 public class LocalStrings {
-    public static final ResourceBundle res = ResourceBundle.getBundle("org.lflang.StringsBundle");
-    public static final String VERSION = res.getString("VERSION");
+  public static final ResourceBundle res = ResourceBundle.getBundle("org.lflang.StringsBundle");
+  public static final String VERSION = res.getString("VERSION");
 }
diff --git a/org.lflang/src/org/lflang/MainConflictChecker.java b/org.lflang/src/org/lflang/MainConflictChecker.java
index 6ee3ebf569..1805cda5d7 100644
--- a/org.lflang/src/org/lflang/MainConflictChecker.java
+++ b/org.lflang/src/org/lflang/MainConflictChecker.java
@@ -2,6 +2,7 @@
 
 import static java.nio.file.FileVisitResult.CONTINUE;
 
+import com.google.common.collect.Iterables;
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
@@ -11,7 +12,6 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -20,92 +20,79 @@
 import org.lflang.lf.Reactor;
 import org.lflang.util.FileUtil;
 
-import com.google.common.collect.Iterables;
-
 /**
- * Class that (upon instantiation) determines whether there are any conflicting main reactors in the current package.
- * Conflicts are reported in the instance's conflicts list.
- * 
- * @author Marten Lohstroh
+ * Class that (upon instantiation) determines whether there are any conflicting main reactors in the
+ * current package. Conflicts are reported in the instance's conflicts list.
  *
+ * @author Marten Lohstroh
  */
 public class MainConflictChecker {
 
-    /**
-     * List of conflict encountered while traversing the package.
-     */
-    public final List<String> conflicts = new LinkedList<String>();
-    
-    /**
-     * The current file configuration.
-     */
-    protected FileConfig fileConfig;
-    
-    /**
-     * Resource set used to obtain resources from.
-     */
-    protected static final ResourceSet rs = new LFStandaloneSetup()
-            .createInjectorAndDoEMFRegistration()
-            .<LFResourceProvider>getInstance(LFResourceProvider.class).getResourceSet();
-    
-    /**
-     * Create a new instance that walks the file tree of the package to find conflicts.
-     * 
-     * @param fileConfig The current file configuration.
-     */
-    public MainConflictChecker(FileConfig fileConfig) {
-        // FIXME: See if there is a faster way to do this check that does not involve parsing all
-        //  files in the current package (which happens when we get the resources)
-        this.fileConfig = fileConfig;
-        try {
-            Files.walkFileTree(fileConfig.srcPkgPath, new PackageVisitor());
-        } catch (IOException e) {
-            System.err.println("Error while checking for name conflicts in package.");
-            e.printStackTrace();
-        }
+  /** List of conflict encountered while traversing the package. */
+  public final List<String> conflicts = new LinkedList<String>();
+
+  /** The current file configuration. */
+  protected FileConfig fileConfig;
+
+  /** Resource set used to obtain resources from. */
+  protected static final ResourceSet rs =
+      new LFStandaloneSetup()
+          .createInjectorAndDoEMFRegistration()
+          .<LFResourceProvider>getInstance(LFResourceProvider.class)
+          .getResourceSet();
+
+  /**
+   * Create a new instance that walks the file tree of the package to find conflicts.
+   *
+   * @param fileConfig The current file configuration.
+   */
+  public MainConflictChecker(FileConfig fileConfig) {
+    // FIXME: See if there is a faster way to do this check that does not involve parsing all
+    //  files in the current package (which happens when we get the resources)
+    this.fileConfig = fileConfig;
+    try {
+      Files.walkFileTree(fileConfig.srcPkgPath, new PackageVisitor());
+    } catch (IOException e) {
+      System.err.println("Error while checking for name conflicts in package.");
+      e.printStackTrace();
     }
-    
-    /**
-     * Extension of a SimpleFileVisitor that adds entries to the conflicts list in the outer class.
-     * 
-     * Specifically, each visited file is checked against the name present in the current file configuration.
-     * If the name matches the current file (but is not the file itself), then parse that file and determine whether 
-     * there is a main reactor declared. If there is one, report a conflict.
-     * 
-     * @author Marten Lohstroh
-     *
-     */
-    public class PackageVisitor extends SimpleFileVisitor<Path> {
+  }
+
+  /**
+   * Extension of a SimpleFileVisitor that adds entries to the conflicts list in the outer class.
+   *
+   * <p>Specifically, each visited file is checked against the name present in the current file
+   * configuration. If the name matches the current file (but is not the file itself), then parse
+   * that file and determine whether there is a main reactor declared. If there is one, report a
+   * conflict.
+   *
+   * @author Marten Lohstroh
+   */
+  public class PackageVisitor extends SimpleFileVisitor<Path> {
 
-        /**
-         * Report a conflicting main reactors in visited files.
-         */
-        @Override
-        public FileVisitResult visitFile(Path path, BasicFileAttributes attr) {
-            path = path.normalize();
-            if (attr.isRegularFile() && path.toString().endsWith(".lf")) {
-                // Parse the file.
-                Resource r = rs.getResource(
-                        URI.createFileURI(path.toFile().getAbsolutePath()),
-                        true);
-                if (r.getErrors().isEmpty()) {
-                    // No errors. Find the main reactor.
-                    Iterator<Reactor> reactors = Iterables
-                            .<Reactor>filter(IteratorExtensions
-                                    .<EObject>toIterable(r.getAllContents()),
-                                    Reactor.class)
-                            .iterator();
-                    // If this is not the same file, but it has a main reactor
-                    // and the name matches, then report the conflict.
-                    if (!fileConfig.srcFile.equals(path)
-                            && IteratorExtensions.exists(reactors, it -> it.isMain() || it.isFederated())
-                            && fileConfig.name.equals(FileUtil.nameWithoutExtension(path))) {
-                        conflicts.add(
-                                fileConfig.srcPath.relativize(path).toString());
-                    }
-                }
-            }
-            return CONTINUE;
+    /** Report a conflicting main reactors in visited files. */
+    @Override
+    public FileVisitResult visitFile(Path path, BasicFileAttributes attr) {
+      path = path.normalize();
+      if (attr.isRegularFile() && path.toString().endsWith(".lf")) {
+        // Parse the file.
+        Resource r = rs.getResource(URI.createFileURI(path.toFile().getAbsolutePath()), true);
+        if (r.getErrors().isEmpty()) {
+          // No errors. Find the main reactor.
+          Iterator<Reactor> reactors =
+              Iterables.<Reactor>filter(
+                      IteratorExtensions.<EObject>toIterable(r.getAllContents()), Reactor.class)
+                  .iterator();
+          // If this is not the same file, but it has a main reactor
+          // and the name matches, then report the conflict.
+          if (!fileConfig.srcFile.equals(path)
+              && IteratorExtensions.exists(reactors, it -> it.isMain() || it.isFederated())
+              && fileConfig.name.equals(FileUtil.nameWithoutExtension(path))) {
+            conflicts.add(fileConfig.srcPath.relativize(path).toString());
+          }
         }
+      }
+      return CONTINUE;
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/ModelInfo.java b/org.lflang/src/org/lflang/ModelInfo.java
index 24d5c447c2..17ee7cfb76 100644
--- a/org.lflang/src/org/lflang/ModelInfo.java
+++ b/org.lflang/src/org/lflang/ModelInfo.java
@@ -1,27 +1,27 @@
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang;
 
@@ -35,7 +35,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.NamedInstance;
 import org.lflang.generator.ReactorInstance;
@@ -51,214 +50,209 @@
 import org.lflang.lf.STP;
 import org.lflang.util.FileUtil;
 
-
 /**
  * A helper class for analyzing the AST. This class is instantiated once for each compilation.
- * <p>
- * NOTE: the validator used on imported files uses the same instance! Hence, this class should not contain any info
- * specific to any particular resource that is involved in the compilation.
+ *
+ * <p>NOTE: the validator used on imported files uses the same instance! Hence, this class should
+ * not contain any info specific to any particular resource that is involved in the compilation.
  *
  * @author Marten Lohstroh
  */
 public class ModelInfo {
 
-    /**
-     * Data structure for tracking dependencies between reactor classes. An
-     * instantiation of class A inside of class B implies that B depends on A.
-     */
-    public InstantiationGraph instantiationGraph;
-
-    /**
-     * The AST that the info gathered in this class pertains to.
-     */
-    public Model model;
-
-    /**
-     * The set of assignments that assign a too-large constant to a parameter
-     * that is used to specify a deadline. These assignments are to be reported
-     * during validation.
-     */
-    public Set<Assignment> overflowingAssignments;
-
-    /**
-     * The set of deadlines that use a too-large constant to specify their time
-     * interval.
-     */
-    public Set<Deadline> overflowingDeadlines;
-
-    /**
-     * The set of STP offsets that use a too-large constant to specify their time
-     * interval.
-     */
-    public Set<STP> overflowingSTP;
-
-    /**
-     * The set of parameters used to specify a deadline while having been
-     * assigned a default value the is too large for this purpose. These
-     * parameters are to be reported during validation.
-     */
-    public Set<Parameter> overflowingParameters;
-
-    /** Cycles found during topology analysis. */
-    private Set<NamedInstance<?>> topologyCycles = new LinkedHashSet<NamedInstance<?>>();
-
-    /**
-     * Whether or not the model information has been updated at least once.
-     */
-    public boolean updated;
-
-    /**
-     * Redo all analysis based on the given model.
-     *
-     * @param model the model to analyze.
-     */
-    public void update(Model model, ErrorReporter reporter) {
-        this.updated = true;
-        this.model = model;
-        this.instantiationGraph = new InstantiationGraph(model, true);
-
-        if (this.instantiationGraph.getCycles().size() == 0) {
-            List<ReactorInstance> topLevelReactorInstances = new LinkedList<>();
-            var main = model.getReactors().stream().filter(it -> it.isMain() || it.isFederated()).findFirst();
-            if (main.isPresent()) {
-                var inst = new ReactorInstance(main.get(), reporter);
-                topLevelReactorInstances.add(inst);
-            } else {
-                model.getReactors().forEach(
-                    it -> topLevelReactorInstances.add(new ReactorInstance(it, reporter))
-                );
-            }
-            // don't store the graph into a field, only the cycles.
-            for (ReactorInstance top : topLevelReactorInstances) {
-                this.topologyCycles.addAll(top.getCycles());
-            }
-        }
-
-        // may be null if the target is invalid
-        var target = Target.forName(model.getTarget().getName()).orElse(null);
+  /**
+   * Data structure for tracking dependencies between reactor classes. An instantiation of class A
+   * inside of class B implies that B depends on A.
+   */
+  public InstantiationGraph instantiationGraph;
+
+  /** The AST that the info gathered in this class pertains to. */
+  public Model model;
+
+  /**
+   * The set of assignments that assign a too-large constant to a parameter that is used to specify
+   * a deadline. These assignments are to be reported during validation.
+   */
+  public Set<Assignment> overflowingAssignments;
+
+  /** The set of deadlines that use a too-large constant to specify their time interval. */
+  public Set<Deadline> overflowingDeadlines;
+
+  /** The set of STP offsets that use a too-large constant to specify their time interval. */
+  public Set<STP> overflowingSTP;
+
+  /**
+   * The set of parameters used to specify a deadline while having been assigned a default value the
+   * is too large for this purpose. These parameters are to be reported during validation.
+   */
+  public Set<Parameter> overflowingParameters;
+
+  /** Cycles found during topology analysis. */
+  private Set<NamedInstance<?>> topologyCycles = new LinkedHashSet<NamedInstance<?>>();
+
+  /** Whether or not the model information has been updated at least once. */
+  public boolean updated;
+
+  /**
+   * Redo all analysis based on the given model.
+   *
+   * @param model the model to analyze.
+   */
+  public void update(Model model, ErrorReporter reporter) {
+    this.updated = true;
+    this.model = model;
+    this.instantiationGraph = new InstantiationGraph(model, true);
+
+    if (this.instantiationGraph.getCycles().size() == 0) {
+      List<ReactorInstance> topLevelReactorInstances = new LinkedList<>();
+      var main =
+          model.getReactors().stream().filter(it -> it.isMain() || it.isFederated()).findFirst();
+      if (main.isPresent()) {
+        var inst = new ReactorInstance(main.get(), reporter);
+        topLevelReactorInstances.add(inst);
+      } else {
+        model
+            .getReactors()
+            .forEach(it -> topLevelReactorInstances.add(new ReactorInstance(it, reporter)));
+      }
+      // don't store the graph into a field, only the cycles.
+      for (ReactorInstance top : topLevelReactorInstances) {
+        this.topologyCycles.addAll(top.getCycles());
+      }
+    }
 
-        // Perform C-specific traversals.
-        if (target == Target.C) {
-            this.collectOverflowingNodes();
-        }
+    // may be null if the target is invalid
+    var target = Target.forName(model.getTarget().getName()).orElse(null);
 
-        checkCaseInsensitiveNameCollisions(model, reporter);
+    // Perform C-specific traversals.
+    if (target == Target.C) {
+      this.collectOverflowingNodes();
     }
 
-    public void checkCaseInsensitiveNameCollisions(Model model, ErrorReporter reporter) {
-        var reactorNames = new HashSet<>();
-        var bad = new ArrayList<>();
-        for (var reactor : model.getReactors()) {
-            var lowerName = getName(reactor).toLowerCase();
-            if (reactorNames.contains(lowerName)) bad.add(lowerName);
-            reactorNames.add(lowerName);
-        }
-        for (var badName : bad) {
-            model.getReactors().stream()
-                .filter(it -> getName(it).toLowerCase().equals(badName))
-                .forEach(it -> reporter.reportError(it, "Multiple reactors have the same name up to case differences."));
-        }
-    }
+    checkCaseInsensitiveNameCollisions(model, reporter);
+  }
 
-    private String getName(Reactor r) {
-        return r.getName() != null ? r.getName() : FileUtil.nameWithoutExtension(Path.of(model.eResource().getURI().toFileString()));
+  public void checkCaseInsensitiveNameCollisions(Model model, ErrorReporter reporter) {
+    var reactorNames = new HashSet<>();
+    var bad = new ArrayList<>();
+    for (var reactor : model.getReactors()) {
+      var lowerName = getName(reactor).toLowerCase();
+      if (reactorNames.contains(lowerName)) bad.add(lowerName);
+      reactorNames.add(lowerName);
     }
-
-    public Set<NamedInstance<?>> topologyCycles() {
-        return this.topologyCycles;
+    for (var badName : bad) {
+      model.getReactors().stream()
+          .filter(it -> getName(it).toLowerCase().equals(badName))
+          .forEach(
+              it ->
+                  reporter.reportError(
+                      it, "Multiple reactors have the same name up to case differences."));
     }
-
-    /**
-     * Collect all assignments, deadlines, and parameters that can cause the
-     * time interval of a deadline to overflow. In the C target, only 48 bits
-     * are allotted for deadline intervals, which are specified in nanosecond
-     * precision.
-     */
-    private void collectOverflowingNodes() {
-
-        this.overflowingAssignments = new HashSet<>();
-        this.overflowingDeadlines = new HashSet<>();
-        this.overflowingParameters = new HashSet<>();
-        this.overflowingSTP = new HashSet<>();
-
-        // Visit all deadlines in the model; detect possible overflow.
-        for (var deadline : filter(toIterable(model.eAllContents()), Deadline.class)) {
-            // If the time value overflows, mark this deadline as overflowing.
-            if (isTooLarge(ASTUtils.getLiteralTimeValue(deadline.getDelay()))) {
-                this.overflowingDeadlines.add(deadline);
-            }
-
-            // If any of the upstream parameters overflow, report this deadline.
-            final var delay = deadline.getDelay();
-            if (delay instanceof ParameterReference
-                && detectOverflow(new HashSet<>(), ((ParameterReference) deadline.getDelay()).getParameter())) {
-                this.overflowingDeadlines.add(deadline);
-            }
-        }
-        // Visit all STP offsets in the model; detect possible overflow.
-        for (var stp : filter(toIterable(model.eAllContents()), STP.class)) {
-            // If the time value overflows, mark this deadline as overflowing.
-            if (isTooLarge(ASTUtils.getLiteralTimeValue(stp.getValue()))) {
-                this.overflowingSTP.add(stp);
-            }
-        }
+  }
+
+  private String getName(Reactor r) {
+    return r.getName() != null
+        ? r.getName()
+        : FileUtil.nameWithoutExtension(Path.of(model.eResource().getURI().toFileString()));
+  }
+
+  public Set<NamedInstance<?>> topologyCycles() {
+    return this.topologyCycles;
+  }
+
+  /**
+   * Collect all assignments, deadlines, and parameters that can cause the time interval of a
+   * deadline to overflow. In the C target, only 48 bits are allotted for deadline intervals, which
+   * are specified in nanosecond precision.
+   */
+  private void collectOverflowingNodes() {
+
+    this.overflowingAssignments = new HashSet<>();
+    this.overflowingDeadlines = new HashSet<>();
+    this.overflowingParameters = new HashSet<>();
+    this.overflowingSTP = new HashSet<>();
+
+    // Visit all deadlines in the model; detect possible overflow.
+    for (var deadline : filter(toIterable(model.eAllContents()), Deadline.class)) {
+      // If the time value overflows, mark this deadline as overflowing.
+      if (isTooLarge(ASTUtils.getLiteralTimeValue(deadline.getDelay()))) {
+        this.overflowingDeadlines.add(deadline);
+      }
+
+      // If any of the upstream parameters overflow, report this deadline.
+      final var delay = deadline.getDelay();
+      if (delay instanceof ParameterReference
+          && detectOverflow(
+              new HashSet<>(), ((ParameterReference) deadline.getDelay()).getParameter())) {
+        this.overflowingDeadlines.add(deadline);
+      }
     }
-
-    /**
-     * In the C target, only 48 bits are allotted for deadline intervals, which
-     * are specified in nanosecond precision. Check whether the given time value
-     * exceeds the maximum specified value.
-     *
-     * @return true if the time value is greater than the specified maximum,
-     * false otherwise.
-     */
-    private boolean isTooLarge(TimeValue time) {
-        return time != null && time.toNanoSeconds() > TimeValue.MAX_LONG_DEADLINE;
+    // Visit all STP offsets in the model; detect possible overflow.
+    for (var stp : filter(toIterable(model.eAllContents()), STP.class)) {
+      // If the time value overflows, mark this deadline as overflowing.
+      if (isTooLarge(ASTUtils.getLiteralTimeValue(stp.getValue()))) {
+        this.overflowingSTP.add(stp);
+      }
+    }
+  }
+
+  /**
+   * In the C target, only 48 bits are allotted for deadline intervals, which are specified in
+   * nanosecond precision. Check whether the given time value exceeds the maximum specified value.
+   *
+   * @return true if the time value is greater than the specified maximum, false otherwise.
+   */
+  private boolean isTooLarge(TimeValue time) {
+    return time != null && time.toNanoSeconds() > TimeValue.MAX_LONG_DEADLINE;
+  }
+
+  /**
+   * Given a parameter that is used in a deadline specification, recursively track down its
+   * definition and check whether it is overflowing. Also detect and report overrides that are
+   * overflowing.
+   *
+   * @return true if there exists a parameter corresponding to a value that does not fit in the
+   *     available bits.
+   */
+  private boolean detectOverflow(Set<Instantiation> visited, Parameter current) {
+    var overflow = false;
+
+    // Determine whether the parameter's default value overflows or not.
+    if (isTooLarge(ASTUtils.getDefaultAsTimeValue(current))) {
+      this.overflowingParameters.add(current);
+      overflow = true;
     }
 
-    /**
-     * Given a parameter that is used in a deadline specification, recursively
-     * track down its definition and check whether it is overflowing. Also
-     * detect and report overrides that are overflowing.
-     * @return true if there exists a parameter corresponding to a value that
-     * does not fit in the available bits.
-     */
-    private boolean detectOverflow(Set<Instantiation> visited, Parameter current) {
-        var overflow = false;
-
-        // Determine whether the parameter's default value overflows or not.
-        if (isTooLarge(ASTUtils.getDefaultAsTimeValue(current))) {
-            this.overflowingParameters.add(current);
-            overflow = true;
-        }
-
-        // Iterate over the instantiations of the reactor in which the
-        // current parameter was found.
-        Set<Instantiation> instantiations = this.instantiationGraph.getInstantiations((Reactor) current.eContainer());
-        for (var instantiation : instantiations) {
-            // Only visit each instantiation once per deadline to avoid cycles.
-            if (!visited.contains(instantiation)) {
-                visited.add(instantiation);
-                // Find assignments that override the current parameter.
-                for (var assignment : instantiation.getParameters()) {
-                    if (assignment.getLhs().equals(current)) {
-                        if (assignment.getRhs().getExprs().isEmpty()) continue;  // This error should be caught elsewhere.
-                        Expression expr = ASTUtils.asSingleExpr(assignment.getRhs());
-                        if (expr instanceof ParameterReference) {
-                            // Check for overflow in the referenced parameter.
-                            overflow = detectOverflow(visited, ((ParameterReference)expr).getParameter()) || overflow;
-                        } else {
-                            // The right-hand side of the assignment is a
-                            // constant; check whether it is too large.
-                            if (isTooLarge(ASTUtils.getLiteralTimeValue(expr))) {
-                                this.overflowingAssignments.add(assignment);
-                                overflow = true;
-                            }
-                        }
-                    }
-                }
+    // Iterate over the instantiations of the reactor in which the
+    // current parameter was found.
+    Set<Instantiation> instantiations =
+        this.instantiationGraph.getInstantiations((Reactor) current.eContainer());
+    for (var instantiation : instantiations) {
+      // Only visit each instantiation once per deadline to avoid cycles.
+      if (!visited.contains(instantiation)) {
+        visited.add(instantiation);
+        // Find assignments that override the current parameter.
+        for (var assignment : instantiation.getParameters()) {
+          if (assignment.getLhs().equals(current)) {
+            if (assignment.getRhs().getExprs().isEmpty())
+              continue; // This error should be caught elsewhere.
+            Expression expr = ASTUtils.asSingleExpr(assignment.getRhs());
+            if (expr instanceof ParameterReference) {
+              // Check for overflow in the referenced parameter.
+              overflow =
+                  detectOverflow(visited, ((ParameterReference) expr).getParameter()) || overflow;
+            } else {
+              // The right-hand side of the assignment is a
+              // constant; check whether it is too large.
+              if (isTooLarge(ASTUtils.getLiteralTimeValue(expr))) {
+                this.overflowingAssignments.add(assignment);
+                overflow = true;
+              }
             }
+          }
         }
-        return overflow;
+      }
     }
+    return overflow;
+  }
 }
diff --git a/org.lflang/src/org/lflang/Target.java b/org.lflang/src/org/lflang/Target.java
index 2a0e0e8700..8f08e89fcc 100644
--- a/org.lflang/src/org/lflang/Target.java
+++ b/org.lflang/src/org/lflang/Target.java
@@ -1,22 +1,19 @@
 /* Static information about targets. */
 /**
- * Copyright (c) 2019, The University of California at Berkeley.
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) 2019, The University of California at Berkeley. Redistribution and use in source
+ * and binary forms, with or without modification, are permitted provided that the following
+ * conditions are met: 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in binary form must
+ * reproduce the above copyright notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY
+ * THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package org.lflang;
 
@@ -27,574 +24,552 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-
 import org.lflang.lf.TargetDecl;
 
-/** 
- * Enumeration of targets and their associated properties. These classes are
- * written in Java, not Xtend, because the enum implementation in Xtend more
- * primitive. It is safer to use enums rather than string values since it allows
- * faulty references to be caught at compile time. Switch statements that take
- * as input an enum but do not have cases for all members of the enum are also
+/**
+ * Enumeration of targets and their associated properties. These classes are written in Java, not
+ * Xtend, because the enum implementation in Xtend more primitive. It is safer to use enums rather
+ * than string values since it allows faulty references to be caught at compile time. Switch
+ * statements that take as input an enum but do not have cases for all members of the enum are also
  * reported by Xtend with a warning message.
- * 
+ *
  * @author Marten Lohstroh
  */
 public enum Target {
-    C("C", true, Arrays.asList(
-                // List via: https://en.cppreference.com/w/c/keyword
-                "auto",
-                "break",
-                "case",
-                "char",
-                "const",
-                "continue",
-                "default",
-                "do",
-                "double",
-                "else",
-                "enum",
-                "extern",
-                "float",
-                "for",
-                "goto",
-                "if",
-                "inline", // (since C99)
-                "int",
-                "long",
-                "register",
-                "restrict", // (since C99)
-                "return",
-                "short",
-                "signed",
-                "sizeof",
-                "static",
-                "struct",
-                "switch",
-                "typedef",
-                "union",
-                "unsigned",
-                "void",
-                "volatile",
-                "while",
-                "_Alignas", // (since C11)
-                "_Alignof", // (since C11)
-                "_Atomic", // (since C11)
-                "_Bool", // (since C99)
-                "_Complex", // (since C99)
-                "_Generic", // (since C11)
-                "_Imaginary", // (since C99)
-                "_Noreturn", // (since C11)
-                "_Static_assert", // (since C11)
-                "_Thread_local" // (since C11)
-                )
-    ), 
-    CCPP("CCpp", true, Target.C.keywords), 
-    CPP("Cpp", true, "cpp", "Cpp", Arrays.asList(
-                // List via: https://en.cppreference.com/w/cpp/keyword
-                "alignas", // (since C++11)
-                "alignof", // (since C++11)
-                "and",
-                "and_eq",
-                "asm",
-                "atomic_cancel", // (TM TS)
-                "atomic_commit", // (TM TS)
-                "atomic_noexcept", // (TM TS)
-                "auto(1)",
-                "bitand",
-                "bitor",
-                "bool",
-                "break",
-                "case",
-                "catch",
-                "char",
-                "char8_t", // (since C++20)
-                "char16_t", // (since C++11)
-                "char32_t", // (since C++11)
-                "class(1)",
-                "compl",
-                "concept", // (since C++20)
-                "const",
-                "consteval", // (since C++20)
-                "constexpr", // (since C++11)
-                "constinit", // (since C++20)
-                "const_cast",
-                "continue",
-                "co_await", // (since C++20)
-                "co_return", // (since C++20)
-                "co_yield", // (since C++20)
-                "decltype", // (since C++11)
-                "default(1)",
-                "delete(1)",
-                "do",
-                "double",
-                "dynamic_cast",
-                "else",
-                "enum",
-                "explicit",
-                "export(1)(3)",
-                "extern(1)",
-                "false",
-                "float",
-                "for",
-                "friend",
-                "goto",
-                "if",
-                "inline(1)",
-                "int",
-                "long",
-                "mutable(1)",
-                "namespace",
-                "new",
-                "noexcept", // (since C++11)
-                "not",
-                "not_eq",
-                "nullptr", // (since C++11)
-                "operator",
-                "or",
-                "or_eq",
-                "private",
-                "protected",
-                "public",
-                "reflexpr", // (reflection TS)
-                "register(2)",
-                "reinterpret_cast",
-                "requires", // (since C++20)
-                "return",
-                "short",
-                "signed",
-                "sizeof(1)",
-                "static",
-                "static_assert", // (since C++11)
-                "static_cast",
-                "struct(1)",
-                "switch",
-                "synchronized", // (TM TS)
-                "template",
-                "this",
-                "thread_local", // (since C++11)
-                "throw",
-                "true",
-                "try",
-                "typedef",
-                "typeid",
-                "typename",
-                "union",
-                "unsigned",
-                "using(1)",
-                "virtual",
-                "void",
-                "volatile",
-                "wchar_t",
-                "while",
-                "xor",
-                "xor_eq"
-                )
-    ),
-    TS("TypeScript", false, "ts", "TS", Arrays.asList(
-                // List via: https://github.com/Microsoft/TypeScript/issues/2536 
-                // Reserved words
-                "break",
-                "case",
-                "catch",
-                "class",
-                "const",
-                "continue",
-                "debugger",
-                "default",
-                "delete",
-                "do",
-                "else",
-                "enum",
-                "export",
-                "extends",
-                "false",
-                "finally",
-                "for",
-                "function",
-                "if",
-                "import",
-                "in",
-                "instanceof",
-                "new",
-                "null",
-                "return",
-                "super",
-                "switch",
-                "this",
-                "throw",
-                "true",
-                "try",
-                "typeof",
-                "var",
-                "void",
-                "while",
-                "with",
-                
-                // Strict Mode Reserved Words
-                "as",
-                "implements",
-                "interface",
-                "let",
-                "package",
-                "private",
-                "protected",
-                "public",
-                "static",
-                "yield",
-                
-                // Contextual Keywords
-                "any",
-                "boolean",
-                "constructor",
-                "declare",
-                "get",
-                "module",
-                "require",
-                "number",
-                "set",
-                "string",
-                "symbol",
-                "type",
-                "from",
-                "of",
-                
-                // Reactor-TS specific keywords (other classes, which are less user-facing, have double underscores)
-                "TimeUnit",
-                "TimeValue",
-                "Present",
-                "Sched",
-                "Read",
-                "Write",
-                "ReadWrite"
-                )
-    ), 
-    Python("Python", false, Arrays.asList(
-            // List via: https://www.w3schools.com/python/python_ref_keywords.asp
-            // and https://en.cppreference.com/w/c/keyword (due to reliance on the C lib).
-            "and",
-            "as",
-            "assert",
-            "auto",
-            "break",
-            "case",
-            "char",
-            "class",
-            "const",
-            "continue",
-            "def",
-            "default",
-            "del",
-            "do",
-            "double",
-            "elif",
-            "else",
-            "enum",
-            "except",
-            "extern",
-            "False",
-            "finally",
-            "float",
-            "for",
-            "from",
-            "global",
-            "goto",
-            "if",
-            "import",
-            "inline", // (since C99)
-            "int",
-            "in",
-            "is",
-            "lambda",
-            "long",
-            "None",
-            "nonlocal",
-            "not",
-            "or",
-            "pass",
-            "raise",
-            "register",
-            "restrict", // (since C99)
-            "return",
-            "short",
-            "signed",
-            "sizeof",
-            "static",
-            "struct",
-            "switch",
-            "True",
-            "try",
-            "typedef",
-            "union",
-            "unsigned",
-            "void",
-            "volatile",
-            "while",
-            "with",
-            "yield",
-            "_Alignas", // (since C11)
-            "_Alignof", // (since C11)
-            "_Atomic", // (since C11)
-            "_Bool", // (since C99)
-            "_Complex", // (since C99)
-            "_Generic", // (since C11)
-            "_Imaginary", // (since C99)
-            "_Noreturn", // (since C11)
-            "_Static_assert", // (since C11)
-            "_Thread_local" // (since C11)
-            )
-    ),
-    Rust("Rust", true,
-         "rust", "Rust",
-         // In our Rust implementation, the only reserved keywords
-         // are those that are a valid expression. Others may be escaped
-         // with the syntax r#keyword.
-         Arrays.asList("self", "true", "false")
-    );
-
-    /**
-     * String representation of this target.
-     */
-    private final String displayName;
-
-    /**
-     * Name of package containing Kotlin classes for the target language.
-     */
-    public final String packageName;
-
-    /**
-     * Prefix of names of Kotlin classes for the target language.
-     */
-    public final String classNamePrefix;
-
-    /**
-     * Whether or not this target requires types.
-     */
-    public final boolean requiresTypes;
-
-    /**
-     * Reserved words in the target language.
-     */
-    public final Set<String> keywords;
-
-    /**
-     *An unmodifiable list of all known targets.
-     */
-    public static final List<Target> ALL = List.of(Target.values());
-
-    /**
-     * Private constructor for targets.
-     *
-     * @param displayName     String representation of this target.
-     * @param requiresTypes   Types Whether this target requires type annotations or not.
-     * @param packageName     Name of package containing Kotlin classes for the target language.
-     * @param classNamePrefix Prefix of names of Kotlin classes for the target language.
-     * @param keywords        List of reserved strings in the target language.
-     */
-    Target(String displayName, boolean requiresTypes, String packageName,
-           String classNamePrefix, Collection<String> keywords) {
-        this.displayName = displayName;
-        this.requiresTypes = requiresTypes;
-        this.keywords = Collections.unmodifiableSet(new LinkedHashSet<>(keywords));
-        this.packageName = packageName;
-        this.classNamePrefix = classNamePrefix;
-    }
-
-
-    /**
-     * Private constructor for targets without packageName and classNamePrefix.
-     */
-    Target(String displayName, boolean requiresTypes, Collection<String> keywords) {
-        this(displayName, requiresTypes, "N/A", "N/A", keywords); // FIXME: prefix
-    }
-
-
-    /**
-     * Return the target whose {@linkplain #getDisplayName() display name}
-     * is the given string (modulo character case), or an empty
-     * optional if there is no such target.
-     */
-    public static Optional<Target> forName(String name) {
-        return Arrays.stream(Target.values())
-                     .filter(it -> it.getDisplayName().equalsIgnoreCase(name))
-                     .findFirst();
-    }
-
-    /**
-     * Return the display name of the target, as it should be
-     * written in LF code. This is hence a single identifier.
-     * Eg for {@link #CPP} returns {@code "Cpp"}, for {@link #Python}
-     * returns {@code "Python"}. Avoid using either {@link #name()}
-     * or {@link #toString()}, which have unrelated contracts.
-     */
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    /**
-     * Returns the conventional directory name for this target.
-     * This is used to divide e.g. the {@code test} and {@code example}
-     * directories by target language. For instance, {@code test/Cpp}
-     * is the path of {@link #CPP}'s test directory, and this
-     * method returns {@code "Cpp"}.
-     */
-    public String getDirectoryName() {
-        return displayName;
-    }
-
-    /**
-     * Return the description. Avoid depending on this, toString
-     * is supposed to be debug information. Prefer {@link #getDisplayName()}.
-     */
-    @Override
-    public String toString() {
-        return displayName;
-    }
-
-    /**
-     * Returns whether the given identifier is invalid as the
-     * name of an LF construct. This usually means that the identifier
-     * is a keyword in the target language. In Rust, many
-     * keywords may be escaped with the syntax {@code r#keyword},
-     * and they are considered valid identifiers.
-     */
-    public boolean isReservedIdent(String ident) {
-        return this.keywords.contains(ident);
-    }
-
-    /**
-     * Return true if the target supports federated execution.
-     */
-    public boolean supportsFederated() {
-        return switch (this) {
-            case C, CCPP, Python, TS -> true;
-            default -> false;
-        };
-    }
-
-    /**
-     * Return true if the target supports reactor inheritance (extends keyword).
-     */
-    public boolean supportsInheritance() {
-        return switch (this) {
-            case C, CCPP, Python -> true;
-            default -> false;
-        };
-    }
-
-    /**
-     * Return true if the target supports multiports and banks
-     * of reactors.
-     */
-    public boolean supportsMultiports() {
-        switch (this) {
-        case C:
-        case CCPP:
-        case CPP:
-        case Python:
-        case Rust:
-        case TS:
-            return true;
-        }
-        return false;
-    }
-
-
-    /**
-     * Return true if the target supports widths of banks and
-     * multiports that depend on reactor parameters (not only
-     * on constants).
-     */
-    public boolean supportsParameterizedWidths() {
+  C(
+      "C",
+      true,
+      Arrays.asList(
+          // List via: https://en.cppreference.com/w/c/keyword
+          "auto",
+          "break",
+          "case",
+          "char",
+          "const",
+          "continue",
+          "default",
+          "do",
+          "double",
+          "else",
+          "enum",
+          "extern",
+          "float",
+          "for",
+          "goto",
+          "if",
+          "inline", // (since C99)
+          "int",
+          "long",
+          "register",
+          "restrict", // (since C99)
+          "return",
+          "short",
+          "signed",
+          "sizeof",
+          "static",
+          "struct",
+          "switch",
+          "typedef",
+          "union",
+          "unsigned",
+          "void",
+          "volatile",
+          "while",
+          "_Alignas", // (since C11)
+          "_Alignof", // (since C11)
+          "_Atomic", // (since C11)
+          "_Bool", // (since C99)
+          "_Complex", // (since C99)
+          "_Generic", // (since C11)
+          "_Imaginary", // (since C99)
+          "_Noreturn", // (since C11)
+          "_Static_assert", // (since C11)
+          "_Thread_local" // (since C11)
+          )),
+  CCPP("CCpp", true, Target.C.keywords),
+  CPP(
+      "Cpp",
+      true,
+      "cpp",
+      "Cpp",
+      Arrays.asList(
+          // List via: https://en.cppreference.com/w/cpp/keyword
+          "alignas", // (since C++11)
+          "alignof", // (since C++11)
+          "and",
+          "and_eq",
+          "asm",
+          "atomic_cancel", // (TM TS)
+          "atomic_commit", // (TM TS)
+          "atomic_noexcept", // (TM TS)
+          "auto(1)",
+          "bitand",
+          "bitor",
+          "bool",
+          "break",
+          "case",
+          "catch",
+          "char",
+          "char8_t", // (since C++20)
+          "char16_t", // (since C++11)
+          "char32_t", // (since C++11)
+          "class(1)",
+          "compl",
+          "concept", // (since C++20)
+          "const",
+          "consteval", // (since C++20)
+          "constexpr", // (since C++11)
+          "constinit", // (since C++20)
+          "const_cast",
+          "continue",
+          "co_await", // (since C++20)
+          "co_return", // (since C++20)
+          "co_yield", // (since C++20)
+          "decltype", // (since C++11)
+          "default(1)",
+          "delete(1)",
+          "do",
+          "double",
+          "dynamic_cast",
+          "else",
+          "enum",
+          "explicit",
+          "export(1)(3)",
+          "extern(1)",
+          "false",
+          "float",
+          "for",
+          "friend",
+          "goto",
+          "if",
+          "inline(1)",
+          "int",
+          "long",
+          "mutable(1)",
+          "namespace",
+          "new",
+          "noexcept", // (since C++11)
+          "not",
+          "not_eq",
+          "nullptr", // (since C++11)
+          "operator",
+          "or",
+          "or_eq",
+          "private",
+          "protected",
+          "public",
+          "reflexpr", // (reflection TS)
+          "register(2)",
+          "reinterpret_cast",
+          "requires", // (since C++20)
+          "return",
+          "short",
+          "signed",
+          "sizeof(1)",
+          "static",
+          "static_assert", // (since C++11)
+          "static_cast",
+          "struct(1)",
+          "switch",
+          "synchronized", // (TM TS)
+          "template",
+          "this",
+          "thread_local", // (since C++11)
+          "throw",
+          "true",
+          "try",
+          "typedef",
+          "typeid",
+          "typename",
+          "union",
+          "unsigned",
+          "using(1)",
+          "virtual",
+          "void",
+          "volatile",
+          "wchar_t",
+          "while",
+          "xor",
+          "xor_eq")),
+  TS(
+      "TypeScript",
+      false,
+      "ts",
+      "TS",
+      Arrays.asList(
+          // List via: https://github.com/Microsoft/TypeScript/issues/2536
+          // Reserved words
+          "break",
+          "case",
+          "catch",
+          "class",
+          "const",
+          "continue",
+          "debugger",
+          "default",
+          "delete",
+          "do",
+          "else",
+          "enum",
+          "export",
+          "extends",
+          "false",
+          "finally",
+          "for",
+          "function",
+          "if",
+          "import",
+          "in",
+          "instanceof",
+          "new",
+          "null",
+          "return",
+          "super",
+          "switch",
+          "this",
+          "throw",
+          "true",
+          "try",
+          "typeof",
+          "var",
+          "void",
+          "while",
+          "with",
+
+          // Strict Mode Reserved Words
+          "as",
+          "implements",
+          "interface",
+          "let",
+          "package",
+          "private",
+          "protected",
+          "public",
+          "static",
+          "yield",
+
+          // Contextual Keywords
+          "any",
+          "boolean",
+          "constructor",
+          "declare",
+          "get",
+          "module",
+          "require",
+          "number",
+          "set",
+          "string",
+          "symbol",
+          "type",
+          "from",
+          "of",
+
+          // Reactor-TS specific keywords (other classes, which are less user-facing, have double
+          // underscores)
+          "TimeUnit",
+          "TimeValue",
+          "Present",
+          "Sched",
+          "Read",
+          "Write",
+          "ReadWrite")),
+  Python(
+      "Python",
+      false,
+      Arrays.asList(
+          // List via: https://www.w3schools.com/python/python_ref_keywords.asp
+          // and https://en.cppreference.com/w/c/keyword (due to reliance on the C lib).
+          "and",
+          "as",
+          "assert",
+          "auto",
+          "break",
+          "case",
+          "char",
+          "class",
+          "const",
+          "continue",
+          "def",
+          "default",
+          "del",
+          "do",
+          "double",
+          "elif",
+          "else",
+          "enum",
+          "except",
+          "extern",
+          "False",
+          "finally",
+          "float",
+          "for",
+          "from",
+          "global",
+          "goto",
+          "if",
+          "import",
+          "inline", // (since C99)
+          "int",
+          "in",
+          "is",
+          "lambda",
+          "long",
+          "None",
+          "nonlocal",
+          "not",
+          "or",
+          "pass",
+          "raise",
+          "register",
+          "restrict", // (since C99)
+          "return",
+          "short",
+          "signed",
+          "sizeof",
+          "static",
+          "struct",
+          "switch",
+          "True",
+          "try",
+          "typedef",
+          "union",
+          "unsigned",
+          "void",
+          "volatile",
+          "while",
+          "with",
+          "yield",
+          "_Alignas", // (since C11)
+          "_Alignof", // (since C11)
+          "_Atomic", // (since C11)
+          "_Bool", // (since C99)
+          "_Complex", // (since C99)
+          "_Generic", // (since C11)
+          "_Imaginary", // (since C99)
+          "_Noreturn", // (since C11)
+          "_Static_assert", // (since C11)
+          "_Thread_local" // (since C11)
+          )),
+  Rust(
+      "Rust",
+      true,
+      "rust",
+      "Rust",
+      // In our Rust implementation, the only reserved keywords
+      // are those that are a valid expression. Others may be escaped
+      // with the syntax r#keyword.
+      Arrays.asList("self", "true", "false"));
+
+  /** String representation of this target. */
+  private final String displayName;
+
+  /** Name of package containing Kotlin classes for the target language. */
+  public final String packageName;
+
+  /** Prefix of names of Kotlin classes for the target language. */
+  public final String classNamePrefix;
+
+  /** Whether or not this target requires types. */
+  public final boolean requiresTypes;
+
+  /** Reserved words in the target language. */
+  public final Set<String> keywords;
+
+  /** An unmodifiable list of all known targets. */
+  public static final List<Target> ALL = List.of(Target.values());
+
+  /**
+   * Private constructor for targets.
+   *
+   * @param displayName String representation of this target.
+   * @param requiresTypes Types Whether this target requires type annotations or not.
+   * @param packageName Name of package containing Kotlin classes for the target language.
+   * @param classNamePrefix Prefix of names of Kotlin classes for the target language.
+   * @param keywords List of reserved strings in the target language.
+   */
+  Target(
+      String displayName,
+      boolean requiresTypes,
+      String packageName,
+      String classNamePrefix,
+      Collection<String> keywords) {
+    this.displayName = displayName;
+    this.requiresTypes = requiresTypes;
+    this.keywords = Collections.unmodifiableSet(new LinkedHashSet<>(keywords));
+    this.packageName = packageName;
+    this.classNamePrefix = classNamePrefix;
+  }
+
+  /** Private constructor for targets without packageName and classNamePrefix. */
+  Target(String displayName, boolean requiresTypes, Collection<String> keywords) {
+    this(displayName, requiresTypes, "N/A", "N/A", keywords); // FIXME: prefix
+  }
+
+  /**
+   * Return the target whose {@linkplain #getDisplayName() display name} is the given string (modulo
+   * character case), or an empty optional if there is no such target.
+   */
+  public static Optional<Target> forName(String name) {
+    return Arrays.stream(Target.values())
+        .filter(it -> it.getDisplayName().equalsIgnoreCase(name))
+        .findFirst();
+  }
+
+  /**
+   * Return the display name of the target, as it should be written in LF code. This is hence a
+   * single identifier. Eg for {@link #CPP} returns {@code "Cpp"}, for {@link #Python} returns
+   * {@code "Python"}. Avoid using either {@link #name()} or {@link #toString()}, which have
+   * unrelated contracts.
+   */
+  public String getDisplayName() {
+    return displayName;
+  }
+
+  /**
+   * Returns the conventional directory name for this target. This is used to divide e.g. the {@code
+   * test} and {@code example} directories by target language. For instance, {@code test/Cpp} is the
+   * path of {@link #CPP}'s test directory, and this method returns {@code "Cpp"}.
+   */
+  public String getDirectoryName() {
+    return displayName;
+  }
+
+  /**
+   * Return the description. Avoid depending on this, toString is supposed to be debug information.
+   * Prefer {@link #getDisplayName()}.
+   */
+  @Override
+  public String toString() {
+    return displayName;
+  }
+
+  /**
+   * Returns whether the given identifier is invalid as the name of an LF construct. This usually
+   * means that the identifier is a keyword in the target language. In Rust, many keywords may be
+   * escaped with the syntax {@code r#keyword}, and they are considered valid identifiers.
+   */
+  public boolean isReservedIdent(String ident) {
+    return this.keywords.contains(ident);
+  }
+
+  /** Return true if the target supports federated execution. */
+  public boolean supportsFederated() {
+    return switch (this) {
+      case C, CCPP, Python, TS -> true;
+      default -> false;
+    };
+  }
+
+  /** Return true if the target supports reactor inheritance (extends keyword). */
+  public boolean supportsInheritance() {
+    return switch (this) {
+      case C, CCPP, Python -> true;
+      default -> false;
+    };
+  }
+
+  /** Return true if the target supports multiports and banks of reactors. */
+  public boolean supportsMultiports() {
+    switch (this) {
+      case C:
+      case CCPP:
+      case CPP:
+      case Python:
+      case Rust:
+      case TS:
         return true;
     }
-
-    /**
-     * Return true if this code for this target should be built using Docker if Docker is used.
-     * @return
-     */
-    public boolean buildsUsingDocker() {
-        return switch (this) {
-            case TS -> false;
-            case C, CCPP, CPP, Python, Rust -> true;
-        };
-    }
-
-    /**
-     * Whether the target requires using an equal sign to assign a default value to a parameter,
-     * or initialize a state variable. All targets mandate an equal sign when passing
-     * arguments to a reactor constructor call, regardless of this method.
-     */
-    public boolean mandatesEqualsInitializers() {
-        return this != CPP;
+    return false;
+  }
+
+  /**
+   * Return true if the target supports widths of banks and multiports that depend on reactor
+   * parameters (not only on constants).
+   */
+  public boolean supportsParameterizedWidths() {
+    return true;
+  }
+
+  /**
+   * Return true if this code for this target should be built using Docker if Docker is used.
+   *
+   * @return
+   */
+  public boolean buildsUsingDocker() {
+    return switch (this) {
+      case TS -> false;
+      case C, CCPP, CPP, Python, Rust -> true;
+    };
+  }
+
+  /**
+   * Whether the target requires using an equal sign to assign a default value to a parameter, or
+   * initialize a state variable. All targets mandate an equal sign when passing arguments to a
+   * reactor constructor call, regardless of this method.
+   */
+  public boolean mandatesEqualsInitializers() {
+    return this != CPP;
+  }
+
+  /** Allow expressions of the form {@code {a, b, c}}. */
+  public boolean allowsBracedListExpressions() {
+    return this == C || this == CCPP || this == CPP;
+  }
+
+  /** Return a string that demarcates the beginning of a single-line comment. */
+  public String getSingleLineCommentPrefix() {
+    return this.equals(Target.Python) ? "#" : "//";
+  }
+
+  /**
+   * Return true if the keepalive option is set automatically for this target if physical actions
+   * are detected in the program (and keepalive was not explicitly unset by the user).
+   */
+  public boolean setsKeepAliveOptionAutomatically() {
+    return this != Rust && this != CPP;
+  }
+
+  /**
+   * Given a string and a list of candidate objects, return the first candidate that matches, or
+   * null if no candidate matches.
+   *
+   * <p>todo move to CollectionUtil (introduced in #442)
+   *
+   * @param string The string to match against candidates.
+   * @param candidates The candidates to match the string against.
+   */
+  public static <T> T match(final String string, final Iterable<T> candidates) {
+    // kotlin: candidates.firstOrNull { it.toString().equalsIgnoreCase(string) }
+    for (T candidate : candidates) {
+      if (candidate.toString().equalsIgnoreCase(string)) {
+        return candidate;
+      }
     }
-
-    /** Allow expressions of the form {@code {a, b, c}}. */
-    public boolean allowsBracedListExpressions() {
-        return this == C || this == CCPP || this == CPP;
-    }
-
-    /**
-     * Return a string that demarcates the beginning of a single-line comment.
-     */
-    public String getSingleLineCommentPrefix() {
-        return this.equals(Target.Python) ? "#" : "//";
-    }
-
-    /**
-     * Return true if the keepalive option is set automatically
-     * for this target if physical actions are detected in the
-     * program (and keepalive was not explicitly unset by the user).
-     */
-    public boolean setsKeepAliveOptionAutomatically() {
-        return this != Rust && this != CPP;
-    }
-
-    /**
-     * Given a string and a list of candidate objects, return the first
-     * candidate that matches, or null if no candidate matches.
-     *
-     * todo move to CollectionUtil (introduced in #442)
-     *
-     * @param string     The string to match against candidates.
-     * @param candidates The candidates to match the string against.
-     */
-    public static <T> T match(final String string, final Iterable<T> candidates) {
-        // kotlin: candidates.firstOrNull { it.toString().equalsIgnoreCase(string) }
-        for (T candidate : candidates) {
-            if (candidate.toString().equalsIgnoreCase(string)) {
-                return candidate;
-            }
-        }
-        return null;
-    }
-
-
-    /**
-     * Given a string and a list of candidate objects, return the first
-     * candidate that matches, or null if no candidate matches.
-     *
-     * todo move to CollectionUtil (introduced in #442)
-     *
-     * @param string     The string to match against candidates.
-     * @param candidates The candidates to match the string against.
-     */
-    public static <T> T match(final String string, final T[] candidates) {
-        return match(string, Arrays.asList(candidates));
-    }
-
-
-    /**
-     * Return the target constant corresponding to given target
-     * declaration among. Return a non-null result, will throw
-     * if invalid.
-     *
-     * @throws RuntimeException If no {@link TargetDecl} is present or if it is invalid.
-     */
-    public static Target fromDecl(TargetDecl targetDecl) {
-        String name = targetDecl.getName();
-        return Target.forName(name)
-                     .orElseThrow(() -> new RuntimeException("Invalid target name '" + name + "'"));
-    }
-
+    return null;
+  }
+
+  /**
+   * Given a string and a list of candidate objects, return the first candidate that matches, or
+   * null if no candidate matches.
+   *
+   * <p>todo move to CollectionUtil (introduced in #442)
+   *
+   * @param string The string to match against candidates.
+   * @param candidates The candidates to match the string against.
+   */
+  public static <T> T match(final String string, final T[] candidates) {
+    return match(string, Arrays.asList(candidates));
+  }
+
+  /**
+   * Return the target constant corresponding to given target declaration among. Return a non-null
+   * result, will throw if invalid.
+   *
+   * @throws RuntimeException If no {@link TargetDecl} is present or if it is invalid.
+   */
+  public static Target fromDecl(TargetDecl targetDecl) {
+    String name = targetDecl.getName();
+    return Target.forName(name)
+        .orElseThrow(() -> new RuntimeException("Invalid target name '" + name + "'"));
+  }
 }
diff --git a/org.lflang/src/org/lflang/TargetConfig.java b/org.lflang/src/org/lflang/TargetConfig.java
index 84770be5d1..c4794b4b1a 100644
--- a/org.lflang/src/org/lflang/TargetConfig.java
+++ b/org.lflang/src/org/lflang/TargetConfig.java
@@ -1,27 +1,27 @@
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang;
 
 import java.util.ArrayList;
@@ -32,7 +32,6 @@
 import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
-
 import org.lflang.TargetProperty.BuildType;
 import org.lflang.TargetProperty.ClockSyncMode;
 import org.lflang.TargetProperty.CoordinationType;
@@ -48,453 +47,376 @@
 /**
  * A class for keeping the current target configuration.
  *
- * Class members of type String are initialized as empty strings,
- * unless otherwise stated.
+ * <p>Class members of type String are initialized as empty strings, unless otherwise stated.
+ *
  * @author Marten Lohstroh
  */
 public class TargetConfig {
 
-    /**
-     * The target of this configuration (e.g., C, TypeScript, Python).
-     */
-    public final Target target;
-
-    /**
-     * Create a new target configuration based on the given target declaration AST node only.
-     * @param target AST node of a target declaration.
-     */
-    public TargetConfig(TargetDecl target) { // FIXME: eliminate this constructor if we can
-        this.target = Target.fromDecl(target);
+  /** The target of this configuration (e.g., C, TypeScript, Python). */
+  public final Target target;
+
+  /**
+   * Create a new target configuration based on the given target declaration AST node only.
+   *
+   * @param target AST node of a target declaration.
+   */
+  public TargetConfig(TargetDecl target) { // FIXME: eliminate this constructor if we can
+    this.target = Target.fromDecl(target);
+  }
+
+  /**
+   * Create a new target configuration based on the given commandline arguments and target
+   * declaration AST node.
+   *
+   * @param cliArgs Arguments passed on the commandline.
+   * @param target AST node of a target declaration.
+   * @param errorReporter An error reporter to report problems.
+   */
+  public TargetConfig(Properties cliArgs, TargetDecl target, ErrorReporter errorReporter) {
+    this(target);
+    if (target.getConfig() != null) {
+      List<KeyValuePair> pairs = target.getConfig().getPairs();
+      TargetProperty.set(this, pairs != null ? pairs : List.of(), errorReporter);
     }
-
-    /**
-     * Create a new target configuration based on the given commandline arguments and target
-     * declaration AST node.
-     * @param cliArgs Arguments passed on the commandline.
-     * @param target AST node of a target declaration.
-     * @param errorReporter An error reporter to report problems.
-     */
-    public TargetConfig(
-        Properties cliArgs,
-        TargetDecl target,
-        ErrorReporter errorReporter
-    ) {
-        this(target);
-        if (target.getConfig() != null) {
-            List<KeyValuePair> pairs = target.getConfig().getPairs();
-            TargetProperty.set(this, pairs != null ? pairs : List.of(), errorReporter);
-        }
-        if (cliArgs.containsKey("no-compile")) {
-            this.noCompile = true;
-        }
-        if (cliArgs.containsKey("docker")) {
-            var arg = cliArgs.getProperty("docker");
-            if (Boolean.parseBoolean(arg)) {
-                this.dockerOptions = new DockerOptions();
-            } else {
-                this.dockerOptions = null;
-            }
-            // FIXME: this is pretty ad-hoc and does not account for more complex overrides yet.
-        }
-        if (cliArgs.containsKey("build-type")) {
-            this.cmakeBuildType = (BuildType) UnionType.BUILD_TYPE_UNION.forName(cliArgs.getProperty("build-type"));
-        }
-        if (cliArgs.containsKey("logging")) {
-            this.logLevel = LogLevel.valueOf(cliArgs.getProperty("logging").toUpperCase());
-        }
-        if (cliArgs.containsKey("workers")) {
-            this.workers = Integer.parseInt(cliArgs.getProperty("workers"));
-        }
-        if (cliArgs.containsKey("threading")) {
-            this.threading = Boolean.parseBoolean(cliArgs.getProperty("threading"));
-        }
-        if (cliArgs.containsKey("target-compiler")) {
-            this.compiler = cliArgs.getProperty("target-compiler");
-        }
-        if (cliArgs.containsKey("tracing")) {
-            this.tracing = new TracingOptions();
-        }
-        if (cliArgs.containsKey("scheduler")) {
-            this.schedulerType = SchedulerOption.valueOf(
-                cliArgs.getProperty("scheduler")
-            );
-            this.setByUser.add(TargetProperty.SCHEDULER);
-        }
-        if (cliArgs.containsKey("target-flags")) {
-            this.compilerFlags.clear();
-            if (!cliArgs.getProperty("target-flags").isEmpty()) {
-                this.compilerFlags.addAll(List.of(
-                    cliArgs.getProperty("target-flags").split(" ")
-                ));
-            }
-        }
-        if (cliArgs.containsKey("runtime-version")) {
-            this.runtimeVersion = cliArgs.getProperty("runtime-version");
-        }
-        if (cliArgs.containsKey("external-runtime-path")) {
-            this.externalRuntimePath = cliArgs.getProperty("external-runtime-path");
-        }
-        if (cliArgs.containsKey(TargetProperty.KEEPALIVE.description)) {
-            this.keepalive = Boolean.parseBoolean(
-                cliArgs.getProperty(TargetProperty.KEEPALIVE.description));
-        }
-        if (cliArgs.containsKey(BuildParm.PRINT_STATISTICS.getKey())) {
-            this.printStatistics = true;
-        }
+    if (cliArgs.containsKey("no-compile")) {
+      this.noCompile = true;
+    }
+    if (cliArgs.containsKey("docker")) {
+      var arg = cliArgs.getProperty("docker");
+      if (Boolean.parseBoolean(arg)) {
+        this.dockerOptions = new DockerOptions();
+      } else {
+        this.dockerOptions = null;
+      }
+      // FIXME: this is pretty ad-hoc and does not account for more complex overrides yet.
+    }
+    if (cliArgs.containsKey("build-type")) {
+      this.cmakeBuildType =
+          (BuildType) UnionType.BUILD_TYPE_UNION.forName(cliArgs.getProperty("build-type"));
+    }
+    if (cliArgs.containsKey("logging")) {
+      this.logLevel = LogLevel.valueOf(cliArgs.getProperty("logging").toUpperCase());
+    }
+    if (cliArgs.containsKey("workers")) {
+      this.workers = Integer.parseInt(cliArgs.getProperty("workers"));
+    }
+    if (cliArgs.containsKey("threading")) {
+      this.threading = Boolean.parseBoolean(cliArgs.getProperty("threading"));
+    }
+    if (cliArgs.containsKey("target-compiler")) {
+      this.compiler = cliArgs.getProperty("target-compiler");
+    }
+    if (cliArgs.containsKey("tracing")) {
+      this.tracing = new TracingOptions();
+    }
+    if (cliArgs.containsKey("scheduler")) {
+      this.schedulerType = SchedulerOption.valueOf(cliArgs.getProperty("scheduler"));
+      this.setByUser.add(TargetProperty.SCHEDULER);
+    }
+    if (cliArgs.containsKey("target-flags")) {
+      this.compilerFlags.clear();
+      if (!cliArgs.getProperty("target-flags").isEmpty()) {
+        this.compilerFlags.addAll(List.of(cliArgs.getProperty("target-flags").split(" ")));
+      }
+    }
+    if (cliArgs.containsKey("runtime-version")) {
+      this.runtimeVersion = cliArgs.getProperty("runtime-version");
+    }
+    if (cliArgs.containsKey("external-runtime-path")) {
+      this.externalRuntimePath = cliArgs.getProperty("external-runtime-path");
+    }
+    if (cliArgs.containsKey(TargetProperty.KEEPALIVE.description)) {
+      this.keepalive =
+          Boolean.parseBoolean(cliArgs.getProperty(TargetProperty.KEEPALIVE.description));
     }
+    if (cliArgs.containsKey(BuildParm.PRINT_STATISTICS.getKey())) {
+      this.printStatistics = true;
+    }
+  }
 
-    /**
-     * Keep track of every target property that is explicitly set by the user.
-     */
-    public Set<TargetProperty> setByUser = new HashSet<>();
+  /** Keep track of every target property that is explicitly set by the user. */
+  public Set<TargetProperty> setByUser = new HashSet<>();
 
-    /**
-     * A list of custom build commands that replace the default build process of
-     * directly invoking a designated compiler. A common usage of this target
-     * property is to set the command to build on the basis of a Makefile.
-     */
-    public List<String> buildCommands = new ArrayList<>();
+  /**
+   * A list of custom build commands that replace the default build process of directly invoking a
+   * designated compiler. A common usage of this target property is to set the command to build on
+   * the basis of a Makefile.
+   */
+  public List<String> buildCommands = new ArrayList<>();
 
-    /**
-     * The mode of clock synchronization to be used in federated programs.
-     * The default is 'initial'.
-     */
-    public ClockSyncMode clockSync = ClockSyncMode.INIT;
+  /**
+   * The mode of clock synchronization to be used in federated programs. The default is 'initial'.
+   */
+  public ClockSyncMode clockSync = ClockSyncMode.INIT;
 
-    /**
-     * Clock sync options.
-     */
-    public ClockSyncOptions clockSyncOptions = new ClockSyncOptions();
+  /** Clock sync options. */
+  public ClockSyncOptions clockSyncOptions = new ClockSyncOptions();
 
-    /**
-     * Parameter passed to cmake. The default is 'Release'.
-     */
-    public BuildType cmakeBuildType = BuildType.RELEASE;
+  /** Parameter passed to cmake. The default is 'Release'. */
+  public BuildType cmakeBuildType = BuildType.RELEASE;
 
-    /**
-     * Optional additional extensions to include in the generated CMakeLists.txt.
-     */
-    public List<String> cmakeIncludes = new ArrayList<>();
+  /** Optional additional extensions to include in the generated CMakeLists.txt. */
+  public List<String> cmakeIncludes = new ArrayList<>();
 
-    /**
-     * The compiler to invoke, unless a build command has been specified.
-     */
-    public String compiler = "";
+  /** The compiler to invoke, unless a build command has been specified. */
+  public String compiler = "";
 
-    /**
-     * Additional sources to add to the compile command if appropriate.
-     */
-    public List<String> compileAdditionalSources = new ArrayList<>();
+  /** Additional sources to add to the compile command if appropriate. */
+  public List<String> compileAdditionalSources = new ArrayList<>();
 
-    /**
-     * Additional (preprocessor) definitions to add to the compile command if appropriate.
-     *
-     * The first string is the definition itself, and the second string is the value to attribute to that definition, if any.
-     * The second value could be left empty.
-     */
-    public Map<String, String> compileDefinitions = new HashMap<>();
+  /**
+   * Additional (preprocessor) definitions to add to the compile command if appropriate.
+   *
+   * <p>The first string is the definition itself, and the second string is the value to attribute
+   * to that definition, if any. The second value could be left empty.
+   */
+  public Map<String, String> compileDefinitions = new HashMap<>();
 
-    /**
-     * Additional libraries to add to the compile command using the "-l" command-line option.
-     */
-    public List<String> compileLibraries = new ArrayList<>();
+  /** Additional libraries to add to the compile command using the "-l" command-line option. */
+  public List<String> compileLibraries = new ArrayList<>();
 
-    /**
-     * Flags to pass to the compiler, unless a build command has been specified.
-     */
-    public List<String> compilerFlags = new ArrayList<>();
+  /** Flags to pass to the compiler, unless a build command has been specified. */
+  public List<String> compilerFlags = new ArrayList<>();
 
-    /**
-     * The type of coordination used during the execution of a federated program.
-     * The default is 'centralized'.
-     */
-    public CoordinationType coordination = CoordinationType.CENTRALIZED;
+  /**
+   * The type of coordination used during the execution of a federated program. The default is
+   * 'centralized'.
+   */
+  public CoordinationType coordination = CoordinationType.CENTRALIZED;
+
+  /** Docker options. */
+  public DockerOptions dockerOptions = null;
 
-    /**
-     * Docker options.
-     */
-    public DockerOptions dockerOptions = null;
+  /** Coordination options. */
+  public CoordinationOptions coordinationOptions = new CoordinationOptions();
 
-    /**
-     * Coordination options.
-     */
-    public CoordinationOptions coordinationOptions = new CoordinationOptions();
+  /** Link to an external runtime library instead of the default one. */
+  public String externalRuntimePath = null;
 
-    /**
-     * Link to an external runtime library instead of the default one.
-     */
-    public String externalRuntimePath = null;
+  /**
+   * If true, configure the execution environment such that it does not wait for physical time to
+   * match logical time. The default is false.
+   */
+  public boolean fastMode = false;
 
-    /**
-     * If true, configure the execution environment such that it does not
-     * wait for physical time to match logical time. The default is false.
-     */
-    public boolean fastMode = false;
+  /** List of files to be copied to src-gen. */
+  public List<String> files = new ArrayList<>();
 
-    /**
-     * List of files to be copied to src-gen.
-     */
-    public List<String> files = new ArrayList<>();
+  /**
+   * If true, configure the execution environment to keep executing if there are no more events on
+   * the event queue. The default is false.
+   */
+  public boolean keepalive = false;
 
-    /**
-     * If true, configure the execution environment to keep executing if there
-     * are no more events on the event queue. The default is false.
-     */
-    public boolean keepalive = false;
+  /** The level of logging during execution. The default is INFO. */
+  public LogLevel logLevel = LogLevel.INFO;
 
-    /**
-     * The level of logging during execution. The default is INFO.
-     */
-    public LogLevel logLevel = LogLevel.INFO;
+  /** Flags to pass to the linker, unless a build command has been specified. */
+  public String linkerFlags = "";
 
-    /**
-     * Flags to pass to the linker, unless a build command has been specified.
-     */
-    public String linkerFlags = "";
+  /** If true, do not invoke the target compiler or build command. The default is false. */
+  public boolean noCompile = false;
 
-    /**
-     * If true, do not invoke the target compiler or build command.
-     * The default is false.
-     */
-    public boolean noCompile = false;
+  /** If true, do not perform runtime validation. The default is false. */
+  public boolean noRuntimeValidation = false;
 
-    /**
-     * If true, do not perform runtime validation. The default is false.
-     */
-    public boolean noRuntimeValidation = false;
+  /**
+   * Set the target platform config. This tells the build system what platform-specific support
+   * files it needs to incorporate at compile time.
+   *
+   * <p>This is now a wrapped class to account for overloaded definitions of defining platform
+   * (either a string or dictionary of values)
+   */
+  public PlatformOptions platformOptions = new PlatformOptions();
 
-    /**
-     * Set the target platform config.
-     * This tells the build system what platform-specific support
-     * files it needs to incorporate at compile time.
-     * 
-     * This is now a wrapped class to account for overloaded definitions 
-     * of defining platform (either a string or dictionary of values)
-     */
-    public PlatformOptions platformOptions = new PlatformOptions();
+  /** If true, instruct the runtime to collect and print execution statistics. */
+  public boolean printStatistics = false;
 
-    /**
-     * If true, instruct the runtime to collect and print execution statistics.
-     */
-    public boolean printStatistics = false;
+  /** List of proto files to be processed by the code generator. */
+  public List<String> protoFiles = new ArrayList<>();
 
-    /**
-     * List of proto files to be processed by the code generator.
-     */
-    public List<String> protoFiles = new ArrayList<>();
+  /** If true, generate ROS2 specific code. */
+  public boolean ros2 = false;
 
-    /**
-     * If true, generate ROS2 specific code.
-     */
-    public boolean ros2 = false;
+  /** Additional ROS2 packages that the LF program depends on. */
+  public List<String> ros2Dependencies = null;
 
-    /**
-     * Additional ROS2 packages that the LF program depends on.
-     */
-    public List<String> ros2Dependencies = null;
+  /** The version of the runtime library to be used in the generated target. */
+  public String runtimeVersion = null;
 
-    /**
-     * The version of the runtime library to be used in the generated target.
-     */
-    public String runtimeVersion = null;
+  /** Whether all reactors are to be generated into a single target language file. */
+  public boolean singleFileProject = false;
+
+  /** What runtime scheduler to use. */
+  public SchedulerOption schedulerType = SchedulerOption.getDefault();
+
+  /**
+   * The number of worker threads to deploy. The default is zero, which indicates that the runtime
+   * is allowed to freely choose the number of workers.
+   */
+  public int workers = 0;
+
+  /** Indicate whether HMAC authentication is used. */
+  public boolean auth = false;
+
+  /** Indicate whether the runtime should use multithreaded execution. */
+  public boolean threading = true;
+
+  /** The timeout to be observed during execution of the program. */
+  public TimeValue timeout;
+
+  /** If non-null, configure the runtime environment to perform tracing. The default is null. */
+  public TracingOptions tracing = null;
+
+  /**
+   * If true, the resulting binary will output a graph visualizing all reaction dependencies.
+   *
+   * <p>This option is currently only used for C++ and Rust. This export function is a valuable tool
+   * for debugging LF programs and helps to understand the dependencies inferred by the runtime.
+   */
+  public boolean exportDependencyGraph = false;
 
-    /** Whether all reactors are to be generated into a single target language file. */
-    public boolean singleFileProject = false;
+  /**
+   * If true, the resulting binary will output a yaml file describing the whole reactor structure of
+   * the program.
+   *
+   * <p>This option is currently only used for C++. This export function is a valuable tool for
+   * debugging LF programs and performing external analysis.
+   */
+  public boolean exportToYaml = false;
 
-    /** What runtime scheduler to use. */
-    public SchedulerOption schedulerType = SchedulerOption.getDefault();
+  /** Rust-specific configuration. */
+  public final RustTargetConfig rust =
+      new RustTargetConfig(); // FIXME: https://issue.lf-lang.org/1558
+
+  /** Path to a C file used by the Python target to setup federated execution. */
+  public String fedSetupPreamble = null; // FIXME: https://issue.lf-lang.org/1558
+
+  /** Settings related to clock synchronization. */
+  public static class ClockSyncOptions {
 
     /**
-     * The number of worker threads to deploy. The default is zero, which indicates that
-     * the runtime is allowed to freely choose the number of workers.
+     * Dampen the adjustments to the clock synchronization offset by this rate. The default is 10.
      */
-    public int workers = 0;
+    public int attenuation = 10;
 
     /**
-     * Indicate whether HMAC authentication is used.
+     * Whether to collect statistics while performing clock synchronization. This setting is only
+     * considered when clock synchronization has been activated. The default is true.
      */
-    public boolean auth = false;
+    public boolean collectStats = true;
+
+    /** Enable clock synchronization for federates on the same machine. Default is false. */
+    public boolean localFederatesOn = false;
 
     /**
-     * Indicate whether the runtime should use multithreaded execution.
+     * Interval at which clock synchronization is initiated by the RTI (will be passed to it as an
+     * argument on the command-line). The default is 5 milliseconds.
      */
-    public boolean threading = true;
+    public TimeValue period = new TimeValue(5, TimeUnit.MILLI);
 
     /**
-     * The timeout to be observed during execution of the program.
+     * Indicate the number of exchanges to be had per each clock synchronization round. See
+     * /lib/core/federated/clock-sync.h for more details. The default is 10.
      */
-    public TimeValue timeout;
+    public int trials = 10;
 
     /**
-     * If non-null, configure the runtime environment to perform tracing.
-     * The default is null.
+     * Used to create an artificial clock synchronization error for the purpose of testing. The
+     * default is null.
      */
-    public TracingOptions tracing = null;
+    public TimeValue testOffset;
+  }
 
+  /** Settings related to coordination of federated execution. */
+  public static class CoordinationOptions {
 
     /**
-     * If true, the resulting binary will output a graph visualizing all reaction dependencies.
-     *
-     * This option is currently only used for C++ and Rust. This export function is a valuable tool
-     * for debugging LF programs and helps to understand the dependencies inferred by the runtime.
+     * For centralized coordination, if a federate has a physical action that can trigger an output,
+     * directly or indirectly, then it will send NET (next event tag) messages to the RTI
+     * periodically as its physical clock advances. This option sets the amount of time to wait
+     * between sending such messages. Increasing this value results in downstream federates that lag
+     * further behind physical time (if the "after" delays are insufficient). The default is null,
+     * which means it is up the implementation to choose an interval.
      */
-    public boolean exportDependencyGraph = false;
-
+    public TimeValue advance_message_interval = null;
+  }
 
+  /** Settings related to Docker options. */
+  public static class DockerOptions {
     /**
-     * If true, the resulting binary will output a yaml file describing the whole reactor structure
-     * of the program.
-     *
-     * This option is currently only used for C++. This export function is a valuable tool for debugging
-     * LF programs and performing external analysis.
+     * The base image and tag from which to build the Docker image. The default is "alpine:latest".
      */
-    public boolean exportToYaml = false;
+    public String from = "alpine:latest";
 
-    /** Rust-specific configuration. */
-    public final RustTargetConfig rust = new RustTargetConfig(); // FIXME: https://issue.lf-lang.org/1558
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      DockerOptions that = (DockerOptions) o;
+      return from.equals(that.from);
+    }
+  }
 
-    /** Path to a C file used by the Python target to setup federated execution. */
-    public String fedSetupPreamble = null; // FIXME: https://issue.lf-lang.org/1558
+  /** Settings related to Platform Options. */
+  public static class PlatformOptions {
 
     /**
-     * Settings related to clock synchronization.
+     * The base platform we build our LF Files on. Should be set to AUTO by default unless
+     * developing for specific OS/Embedded Platform
      */
-    public static class ClockSyncOptions {
-
-        /**
-         * Dampen the adjustments to the clock synchronization offset by this rate.
-         * The default is 10.
-         */
-        public int attenuation = 10;
-
-        /**
-         * Whether to collect statistics while performing clock synchronization.
-         * This setting is only considered when clock synchronization has been activated.
-         * The default is true.
-         */
-        public boolean collectStats = true;
-
-        /**
-         * Enable clock synchronization for federates on the same machine.
-         * Default is false.
-         */
-        public boolean localFederatesOn = false;
-
-
-        /**
-         * Interval at which clock synchronization is initiated by the RTI (will be passed
-         * to it as an argument on the command-line).
-         * The default is 5 milliseconds.
-         */
-        public TimeValue period = new TimeValue(5, TimeUnit.MILLI);
-
-        /**
-         * Indicate the number of exchanges to be had per each clock synchronization round.
-         * See /lib/core/federated/clock-sync.h for more details.
-         * The default is 10.
-         */
-        public int trials = 10;
-
-        /**
-         * Used to create an artificial clock synchronization error for the purpose of testing.
-         * The default is null.
-         */
-        public TimeValue testOffset;
-    }
+    public Platform platform = Platform.AUTO;
 
     /**
-     * Settings related to coordination of federated execution.
+     * The string value used to determine what type of embedded board we work with and can be used
+     * to simplify the build process. For example, when we want to flash to an Arduino Nano 33 BLE
+     * board, we can use the string arduino:mbed_nano:nano33ble
      */
-    public static class CoordinationOptions {
-
-        /**
-         * For centralized coordination, if a federate has a physical action that can trigger
-         * an output, directly or indirectly, then it will send NET (next event tag) messages
-         * to the RTI periodically as its physical clock advances. This option sets the amount
-         * of time to wait between sending such messages. Increasing this value results in
-         * downstream federates that lag further behind physical time (if the "after" delays
-         * are insufficient).
-         * The default is null, which means it is up the implementation to choose an interval.
-         */
-        public TimeValue advance_message_interval = null;
-    }
+    public String board = null;
 
     /**
-     * Settings related to Docker options.
+     * The string value used to determine the port on which to flash the compiled program (i.e.
+     * /dev/cu.usbmodem21301)
      */
-    public static class DockerOptions {
-        /**
-         * The base image and tag from which to build the Docker image. The default is "alpine:latest".
-         */
-        public String from = "alpine:latest";
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            DockerOptions that = (DockerOptions) o;
-            return from.equals(that.from);
-        }
-    }
+    public String port = null;
+
+    /**
+     * The baud rate used as a parameter to certain embedded platforms. 9600 is a standard rate
+     * amongst systems like Arduino, so it's the default value.
+     */
+    public int baudRate = 9600;
 
     /**
-     * Settings related to Platform Options.
+     * The boolean statement used to determine whether we should automatically attempt to flash once
+     * we compile. This may require the use of board and port values depending on the infrastructure
+     * you use to flash the boards.
      */
-    public static class PlatformOptions {
-        
-        /**
-         * The base platform we build our LF Files on. Should be set to AUTO by default unless developing for specific OS/Embedded Platform
-         */
-        public Platform platform = Platform.AUTO;
-
-        /**
-         * The string value used to determine what type of embedded board we work with and can be used to simplify the build process. For example,
-         * when we want to flash to an Arduino Nano 33 BLE board, we can use the string arduino:mbed_nano:nano33ble
-         */
-        public String board = null;
-
-
-        /**
-         * The string value used to determine the port on which to flash the compiled program (i.e. /dev/cu.usbmodem21301)
-         */
-        public String port = null;
-
-        /**
-         * The baud rate used as a parameter to certain embedded platforms. 9600 is a standard rate amongst systems like Arduino, so it's the default value.
-         */
-        public int baudRate = 9600;
-
-        /**
-         * The boolean statement used to determine whether we should automatically attempt to flash once we compile. This may require the use of board and
-         * port values depending on the infrastructure you use to flash the boards.
-         */
-        public boolean flash = false;
-    }   
+    public boolean flash = false;
+  }
 
+  /** Settings related to tracing options. */
+  public static class TracingOptions {
     /**
-     * Settings related to tracing options.
+     * The name to use as the root of the trace file produced. This defaults to the name of the .lf
+     * file.
      */
-    public static class TracingOptions {
-        /**
-         * The name to use as the root of the trace file produced.
-         * This defaults to the name of the .lf file.
-         */
-        public String traceFileName = null;
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            TracingOptions that = (TracingOptions) o;
-            return Objects.equals(traceFileName, that.traceFileName); // traceFileName may be null
-        }
+    public String traceFileName = null;
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      TracingOptions that = (TracingOptions) o;
+      return Objects.equals(traceFileName, that.traceFileName); // traceFileName may be null
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/TargetProperty.java b/org.lflang/src/org/lflang/TargetProperty.java
index fe5c7dd0b2..b3abf815a3 100644
--- a/org.lflang/src/org/lflang/TargetProperty.java
+++ b/org.lflang/src/org/lflang/TargetProperty.java
@@ -1,30 +1,31 @@
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang;
 
+import com.google.common.collect.ImmutableList;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -33,7 +34,6 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
 import org.eclipse.xtext.util.RuntimeIOException;
 import org.lflang.TargetConfig.DockerOptions;
 import org.lflang.TargetConfig.PlatformOptions;
@@ -52,1819 +52,1761 @@
 import org.lflang.util.StringUtil;
 import org.lflang.validation.LFValidator;
 
-import com.google.common.collect.ImmutableList;
-
 /**
- * A target properties along with a type and a list of supporting targets
- * that supports it, as well as a function for configuration updates.
+ * A target properties along with a type and a list of supporting targets that supports it, as well
+ * as a function for configuration updates.
  *
  * @author Marten Lohstroh
  */
 public enum TargetProperty {
-    /**
-     * Directive to allow including OpenSSL libraries and process HMAC authentication.
-     */
-    AUTH("auth", PrimitiveType.BOOLEAN,
-            Arrays.asList(Target.C, Target.CCPP),
-         (config) -> ASTUtils.toElement(config.auth),
-         (config, value, err) -> {
-                config.auth = ASTUtils.toBoolean(value);
-            }),
-    /**
-     * Directive to let the generator use the custom build command.
-     */
-    BUILD("build", UnionType.STRING_OR_STRING_ARRAY,
-            Arrays.asList(Target.C, Target.CCPP),
-            (config) -> ASTUtils.toElement(config.buildCommands),
-            (config, value, err) -> {
-                config.buildCommands = ASTUtils.elementToListOfStrings(value);
-            }),
-
-    /**
-     * Directive to specify the target build type such as 'Release' or 'Debug'.
-     * This is also used in the Rust target to select a Cargo profile.
-     */
-    BUILD_TYPE("build-type", UnionType.BUILD_TYPE_UNION,
-            Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Rust),
-            (config) -> ASTUtils.toElement(config.cmakeBuildType.toString()),
-            (config, value, err) -> {
-                config.cmakeBuildType = (BuildType) UnionType.BUILD_TYPE_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-                // set it there too, because the default is different.
-                config.rust.setBuildType(config.cmakeBuildType);
-            }),
-
-    /**
-     * Directive to let the federate execution handle clock synchronization in software.
-     */
-    CLOCK_SYNC("clock-sync", UnionType.CLOCK_SYNC_UNION,
-               Arrays.asList(Target.C, Target.CCPP, Target.Python),
-               (config) -> ASTUtils.toElement(config.clockSync.toString()),
-               (config, value, err) -> {
-                    config.clockSync = (ClockSyncMode) UnionType.CLOCK_SYNC_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-               }),
-    /**
-     * Key-value pairs giving options for clock synchronization.
-     */
-    CLOCK_SYNC_OPTIONS("clock-sync-options",
-            DictionaryType.CLOCK_SYNC_OPTION_DICT, Arrays.asList(Target.C, Target.CCPP, Target.Python),
-            (config) -> {
-                Element e = LfFactory.eINSTANCE.createElement();
-                KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                for (ClockSyncOption opt : ClockSyncOption.values()) {
-                    KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                    pair.setName(opt.toString());
-                    switch (opt) {
-                        case ATTENUATION:
-                            pair.setValue(ASTUtils.toElement(config.clockSyncOptions.attenuation));
-                            break;
-                        case COLLECT_STATS:
-                            pair.setValue(ASTUtils.toElement(config.clockSyncOptions.collectStats));
-                            break;
-                        case LOCAL_FEDERATES_ON:
-                            pair.setValue(ASTUtils.toElement(config.clockSyncOptions.localFederatesOn));
-                            break;
-                        case PERIOD:
-                            if (config.clockSyncOptions.period == null) continue; // don't set if null
-                            pair.setValue(ASTUtils.toElement(config.clockSyncOptions.period));
-                            break;
-                        case TEST_OFFSET:
-                            if (config.clockSyncOptions.testOffset == null) continue; // don't set if null
-                            pair.setValue(ASTUtils.toElement(config.clockSyncOptions.testOffset));
-                            break;
-                        case TRIALS:
-                            pair.setValue(ASTUtils.toElement(config.clockSyncOptions.trials));
-                            break;
-                    }
-                    kvp.getPairs().add(pair);
-                }
-                e.setKeyvalue(kvp);
-                // kvp will never be empty
-                return e;
-            },
-            (config, value, err) -> {
-                for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                    ClockSyncOption option = (ClockSyncOption) DictionaryType.CLOCK_SYNC_OPTION_DICT
-                            .forName(entry.getName());
-                    switch (option) {
-                        case ATTENUATION:
-                            config.clockSyncOptions.attenuation = ASTUtils
-                                    .toInteger(entry.getValue());
-                            break;
-                        case COLLECT_STATS:
-                            config.clockSyncOptions.collectStats = ASTUtils
-                                    .toBoolean(entry.getValue());
-                            break;
-                        case LOCAL_FEDERATES_ON:
-                            config.clockSyncOptions.localFederatesOn = ASTUtils
-                                    .toBoolean(entry.getValue());
-                            break;
-                        case PERIOD:
-                            config.clockSyncOptions.period = ASTUtils
-                                    .toTimeValue(entry.getValue());
-                            break;
-                        case TEST_OFFSET:
-                            config.clockSyncOptions.testOffset = ASTUtils
-                                    .toTimeValue(entry.getValue());
-                            break;
-                        case TRIALS:
-                            config.clockSyncOptions.trials = ASTUtils
-                                    .toInteger(entry.getValue());
-                            break;
-                        default:
-                            break;
-                    }
-                }
-            }),
-
-    /**
-     * Directive to specify a cmake to be included by the generated build
-     * systems.
-     *
-     * This gives full control over the C/C++ build as any cmake parameters
-     * can be adjusted in the included file.
-     */
-    CMAKE_INCLUDE("cmake-include", UnionType.FILE_OR_FILE_ARRAY,
-            Arrays.asList(Target.CPP, Target.C, Target.CCPP),
-            (config) -> ASTUtils.toElement(config.cmakeIncludes),
-            (config, value, err) -> {
-                config.cmakeIncludes = ASTUtils.elementToListOfStrings(value);
-            },
-            // FIXME: This merging of lists is potentially dangerous since
-            // the incoming list of cmake-includes can belong to a .lf file that is
-            // located in a different location, and keeping just filename
-            // strings like this without absolute paths is incorrect.
-            (config, value, err) -> {
-                config.cmakeIncludes.addAll(ASTUtils.elementToListOfStrings(value));
-            }),
-    /**
-     * Directive to specify the target compiler.
-     */
-    COMPILER("compiler", PrimitiveType.STRING, Target.ALL,
-            (config) -> ASTUtils.toElement(config.compiler),
-            (config, value, err) -> {
-                config.compiler = ASTUtils.elementToSingleString(value);
-            }),
-
-    /**
-     * Directive to specify compile-time definitions.
-     */
-    COMPILE_DEFINITIONS("compile-definitions", StringDictionaryType.COMPILE_DEFINITION,
-            Arrays.asList(Target.C, Target.CCPP, Target.Python),
-            (config) -> ASTUtils.toElement(config.compileDefinitions),
-            (config, value, err) -> {
-                config.compileDefinitions = ASTUtils.elementToStringMaps(value);
-            }),
-
-    /**
-     * Directive to generate a Dockerfile. This is either a boolean,
-     * true or false, or a dictionary of options.
-     */
-    DOCKER("docker", UnionType.DOCKER_UNION,
-            Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS),
-            (config) -> {
-                if (config.dockerOptions == null) {
-                    return null;
-                } else if(config.dockerOptions.equals(new DockerOptions())) {
-                    // default configuration
-                    return ASTUtils.toElement(true);
-                } else {
-                    Element e = LfFactory.eINSTANCE.createElement();
-                    KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                    for (DockerOption opt : DockerOption.values()) {
-                        KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                        pair.setName(opt.toString());
-                        switch (opt) {
-                            case FROM:
-                                if (config.dockerOptions.from == null) continue;
-                                pair.setValue(ASTUtils.toElement(config.dockerOptions.from));
-                                break;
-                        }
-                        kvp.getPairs().add(pair);
-                    }
-                    e.setKeyvalue(kvp);
-                    if (kvp.getPairs().isEmpty()) return null;
-                    return e;
-                }
-            },
-            (config, value, err) -> setDockerProperty(config, value),
-            (config, value, err) -> setDockerProperty(config, value)),
-
-    /**
-     * Directive for specifying a path to an external runtime to be used for the
-     * compiled binary.
-     */
-    EXTERNAL_RUNTIME_PATH("external-runtime-path", PrimitiveType.STRING,
-            List.of(Target.CPP),
-            (config) -> ASTUtils.toElement(config.externalRuntimePath),
-            (config, value, err) -> {
-                config.externalRuntimePath = ASTUtils.elementToSingleString(value);
-            }),
-
-    /**
-     * Directive to let the execution engine allow logical time to elapse
-     * faster than physical time.
-     */
-    FAST("fast", PrimitiveType.BOOLEAN, Target.ALL,
-            (config) -> ASTUtils.toElement(config.fastMode),
-            (config, value, err) -> {
-                config.fastMode = ASTUtils.toBoolean(value);
-            }),
-
-    /**
-     * Directive to stage particular files on the class path to be
-     * processed by the code generator.
-     */
-    FILES("files", UnionType.FILE_OR_FILE_ARRAY, List.of(Target.C, Target.CCPP, Target.Python),
-            (config) -> ASTUtils.toElement(config.files),
-            (config, value, err) -> {
-                config.files = ASTUtils.elementToListOfStrings(value);
-            },
-            // FIXME: This merging of lists is potentially dangerous since
-            // the incoming list of files can belong to a .lf file that is
-            // located in a different location, and keeping just filename
-            // strings like this without absolute paths is incorrect.
-            (config, value, err) -> {
-                config.files.addAll(ASTUtils.elementToListOfStrings(value));
-            }),
-
-    /**
-     * Flags to be passed on to the target compiler.
-     */
-    FLAGS("flags", UnionType.STRING_OR_STRING_ARRAY,
-            Arrays.asList(Target.C, Target.CCPP),
-            (config) -> ASTUtils.toElement(config.compilerFlags),
-            (config, value, err) -> {
-                config.compilerFlags = ASTUtils.elementToListOfStrings(value);
-            }),
-
-    /**
-     * Directive to specify the coordination mode
-     */
-    COORDINATION("coordination", UnionType.COORDINATION_UNION,
-            Arrays.asList(Target.C, Target.CCPP, Target.Python),
-            (config) -> ASTUtils.toElement(config.coordination.toString()),
-            (config, value, err) -> {
-                config.coordination = (CoordinationType) UnionType.COORDINATION_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-            },
-            (config, value, err) -> {
-                config.coordination = (CoordinationType) UnionType.COORDINATION_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-            }),
-
-    /**
-     * Key-value pairs giving options for clock synchronization.
-     */
-    COORDINATION_OPTIONS("coordination-options",
-            DictionaryType.COORDINATION_OPTION_DICT, Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS),
-            (config) -> {
-                Element e = LfFactory.eINSTANCE.createElement();
-                KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                for (CoordinationOption opt : CoordinationOption.values()) {
-                    KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                    pair.setName(opt.toString());
-                    switch (opt) {
-                        case ADVANCE_MESSAGE_INTERVAL:
-                            if (config.coordinationOptions.advance_message_interval == null) continue;
-                            pair.setValue(ASTUtils.toElement(config.coordinationOptions.advance_message_interval));
-                            break;
-                    }
-                    kvp.getPairs().add(pair);
-                }
-                e.setKeyvalue(kvp);
-                if (kvp.getPairs().isEmpty()) return null;
-                return e;
-            },
-            (config, value, err) -> {
-                for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                    CoordinationOption option = (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT
-                            .forName(entry.getName());
-                    switch (option) {
-                        case ADVANCE_MESSAGE_INTERVAL:
-                            config.coordinationOptions.advance_message_interval = ASTUtils
-                                    .toTimeValue(entry.getValue());
-                            break;
-                        default:
-                            break;
-                    }
-                }
-            },
-            (config, value, err) -> {
-             for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                 CoordinationOption option = (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT
-                     .forName(entry.getName());
-                 switch (option) {
-                 case ADVANCE_MESSAGE_INTERVAL:
-                     config.coordinationOptions.advance_message_interval = ASTUtils
-                         .toTimeValue(entry.getValue());
-                     break;
-                 default:
-                     break;
-                 }
-             }
-            }),
-
-    /**
-     * Directive to let the execution engine remain active also if there
-     * are no more events in the event queue.
-     */
-    KEEPALIVE("keepalive", PrimitiveType.BOOLEAN, Target.ALL,
-            (config) -> ASTUtils.toElement(config.keepalive),
-            (config, value, err) -> {
-                config.keepalive = ASTUtils.toBoolean(value);
-            }),
-
-    /**
-     * Directive to specify the grain at which to report log messages during execution.
-     */
-    LOGGING("logging", UnionType.LOGGING_UNION, Target.ALL,
-            (config) -> ASTUtils.toElement(config.logLevel.toString()),
-            (config, value, err) -> {
-                config.logLevel = (LogLevel) UnionType.LOGGING_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-            }),
-
-    /**
-     * Directive to not invoke the target compiler.
-     */
-    NO_COMPILE("no-compile", PrimitiveType.BOOLEAN,
-            Arrays.asList(Target.C, Target.CPP, Target.CCPP, Target.Python),
-            (config) -> ASTUtils.toElement(config.noCompile),
-            (config, value, err) -> {
-                config.noCompile = ASTUtils.toBoolean(value);
-            }),
-
-    /**
-     * Directive to disable validation of reactor rules at runtime.
-     */
-    NO_RUNTIME_VALIDATION("no-runtime-validation", PrimitiveType.BOOLEAN,
-            Arrays.asList(Target.CPP),
-            (config) -> ASTUtils.toElement(config.noRuntimeValidation),
-            (config, value, err) -> {
-                config.noRuntimeValidation = ASTUtils.toBoolean(value);
-            }),
-
-    /**
-     * Directive to specify the platform for cross code generation. This is either a string of the platform
-     * or a dictionary of options that includes the string name.
-     */
-    PLATFORM("platform", UnionType.PLATFORM_STRING_OR_DICTIONARY, Target.ALL,
-            (config) -> {
-                Element e = LfFactory.eINSTANCE.createElement();
-                KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                for (PlatformOption opt : PlatformOption.values()) {
-                    KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                    pair.setName(opt.toString());
-                    switch (opt) {
-                        case NAME:
-                            pair.setValue(ASTUtils.toElement(config.platformOptions.platform.toString()));
-                            break;
-                        case BAUDRATE:
-                            pair.setValue(ASTUtils.toElement(config.platformOptions.baudRate));
-                            break;
-                        case BOARD:
-                            pair.setValue(ASTUtils.toElement(config.platformOptions.board));
-                            break;
-                        case FLASH:
-                            pair.setValue(ASTUtils.toElement(config.platformOptions.flash));
-                            break;
-                        case PORT:
-                            pair.setValue(ASTUtils.toElement(config.platformOptions.port));
-                            break;
-                    }
-                    kvp.getPairs().add(pair);
-                }
-                e.setKeyvalue(kvp);
-                if (kvp.getPairs().isEmpty()) return null;
-                return e;
-            },
-            (config, value, err) -> {
-                if (value.getLiteral() != null) {
-                    config.platformOptions = new PlatformOptions();
-                    config.platformOptions.platform = (Platform) UnionType.PLATFORM_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-                } else {
-                    config.platformOptions= new PlatformOptions();
-                    for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                        PlatformOption option = (PlatformOption) DictionaryType.PLATFORM_DICT
-                                .forName(entry.getName());
-                        switch (option) {
-                            case NAME:
-                                Platform p = (Platform) UnionType.PLATFORM_UNION
-                                    .forName(ASTUtils.elementToSingleString(entry.getValue()));
-                                if(p == null) {
-                                    String s = "Unidentified Platform Type, LF supports the following platform types: " + Arrays.asList(Platform.values()).toString();
-                                    err.reportError(s);
-                                    throw new AssertionError(s);
-                                }
-                                config.platformOptions.platform = p;
-                                break;
-                            case BAUDRATE:
-                                config.platformOptions.baudRate = ASTUtils.toInteger(entry.getValue());
-                                break;
-                            case BOARD:
-                                config.platformOptions.board = ASTUtils.elementToSingleString(entry.getValue());
-                                break;
-                            case FLASH:
-                                config.platformOptions.flash = ASTUtils.toBoolean(entry.getValue());
-                                break;
-                            case PORT:
-                                config.platformOptions.port = ASTUtils.elementToSingleString(entry.getValue());
-                                break;
-                            default:
-                                break;
-                        }
-                    }
-                }
-            }),
-
-    /**
-     * Directive to instruct the runtime to collect and print execution statistics.
-     */
-    PRINT_STATISTICS("print-statistics", PrimitiveType.BOOLEAN,
-        Arrays.asList(Target.CPP),
-        (config) -> ASTUtils.toElement(config.printStatistics),
-        (config, value, err) -> {
-            config.printStatistics = ASTUtils.toBoolean(value);
-        }),
-
-    /**
-     * Directive for specifying .proto files that need to be compiled and their
-     * code included in the sources.
-     */
-    PROTOBUFS("protobufs", UnionType.FILE_OR_FILE_ARRAY,
-            Arrays.asList(Target.C, Target.CCPP, Target.TS, Target.Python),
-            (config) -> ASTUtils.toElement(config.protoFiles),
-            (config, value, err) -> {
-                config.protoFiles = ASTUtils.elementToListOfStrings(value);
-            }),
-
-
-    /**
-     * Directive to specify that ROS2 specific code is generated,
-     */
-    ROS2("ros2", PrimitiveType.BOOLEAN,
-         List.of(Target.CPP),
-         (config) -> ASTUtils.toElement(config.ros2),
-         (config, value, err) -> {
-             config.ros2 = ASTUtils.toBoolean(value);
-    }),
-
-    /**
-     * Directive to specify additional ROS2 packages that this LF program depends on.
-     */
-    ROS2_DEPENDENCIES("ros2-dependencies", ArrayType.STRING_ARRAY,
-        List.of(Target.CPP),
-                      (config) -> ASTUtils.toElement(config.ros2Dependencies),
-                      (config, value, err) -> {
-            config.ros2Dependencies = ASTUtils.elementToListOfStrings(value);
-    }),
-
-    /**
-     * Directive for specifying a specific version of the reactor runtime library.
-     */
-    RUNTIME_VERSION("runtime-version", PrimitiveType.STRING,
-            Arrays.asList(Target.CPP),
-            (config) -> ASTUtils.toElement(config.runtimeVersion),
-            (config, value, err) -> {
-                config.runtimeVersion = ASTUtils.elementToSingleString(value);
-            }),
-
-
-    /**
-     * Directive for specifying a specific runtime scheduler, if supported.
-     */
-    SCHEDULER("scheduler", UnionType.SCHEDULER_UNION,
-            Arrays.asList(Target.C, Target.CCPP, Target.Python),
-            (config) -> ASTUtils.toElement(config.schedulerType.toString()),
-            (config, value, err) -> {
-                config.schedulerType = (SchedulerOption) UnionType.SCHEDULER_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-            }),
-
-    /**
-     * Directive to specify that all code is generated in a single file.
-     */
-    SINGLE_FILE_PROJECT("single-file-project", PrimitiveType.BOOLEAN,
-            List.of(Target.Rust),
-            (config) -> ASTUtils.toElement(config.singleFileProject),
-            (config, value, err) -> {
-                config.singleFileProject = ASTUtils.toBoolean(value);
-            }),
-
-    /**
-     * Directive to indicate whether the runtime should use multi-threading.
-     */
-    THREADING("threading", PrimitiveType.BOOLEAN,
-              List.of(Target.C, Target.CCPP, Target.Python),
-              (config) -> ASTUtils.toElement(config.threading),
-              (config, value, err) -> {
-                  config.threading = ASTUtils.toBoolean(value);
-              }),
-
-    /**
-     * Directive to specify the number of worker threads used by the runtime.
-     */
-    WORKERS("workers", PrimitiveType.NON_NEGATIVE_INTEGER,
-            List.of(Target.C, Target.CCPP, Target.Python, Target.CPP, Target.Rust),
-            (config) -> ASTUtils.toElement(config.workers),
-            (config, value, err) -> {
-                config.workers = ASTUtils.toInteger(value);
-            }),
-
-    /**
-     * Directive to specify the execution timeout.
-     */
-    TIMEOUT("timeout", PrimitiveType.TIME_VALUE, Target.ALL,
-            (config) -> ASTUtils.toElement(config.timeout),
-            (config, value, err) -> {
-                config.timeout = ASTUtils.toTimeValue(value);
-            },
-            (config, value, err) -> {
-                config.timeout = ASTUtils.toTimeValue(value);
-            }),
-
-    /**
-     * Directive to enable tracing.
-     */
-    TRACING("tracing", UnionType.TRACING_UNION,
-            Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Python),
-            (config) -> {
-                if (config.tracing == null) {
-                    return null;
-                } else if (config.tracing.equals(new TracingOptions())) {
-                    // default values
-                    return ASTUtils.toElement(true);
-                } else {
-                    Element e = LfFactory.eINSTANCE.createElement();
-                    KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                    for (TracingOption opt : TracingOption.values()) {
-                        KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                        pair.setName(opt.toString());
-                        switch (opt) {
-                            case TRACE_FILE_NAME:
-                                 if (config.tracing.traceFileName == null) continue;
-                                 pair.setValue(ASTUtils.toElement(config.tracing.traceFileName));
-                        }
-                        kvp.getPairs().add(pair);
-                    }
-                    e.setKeyvalue(kvp);
-                    if (kvp.getPairs().isEmpty()) return null;
-                    return e;
-                }
-            },
-            (config, value, err) -> {
-                if (value.getLiteral() != null) {
-                    if (ASTUtils.toBoolean(value)) {
-                        config.tracing = new TracingOptions();
-                    } else {
-                        config.tracing = null;
-                    }
-                } else {
-                    config.tracing = new TracingOptions();
-                    for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                        TracingOption option = (TracingOption) DictionaryType.TRACING_DICT
-                            .forName(entry.getName());
-                        switch (option) {
-                        case TRACE_FILE_NAME:
-                            config.tracing.traceFileName = ASTUtils.elementToSingleString(entry.getValue());
-                            break;
-                        default:
-                            break;
-                        }
-                    }
-                }
-            }),
-
-    /**
-     * Directive to let the runtime export its internal dependency graph.
-     *
-     * This is a debugging feature and currently only used for C++ and Rust programs.
-     */
-    EXPORT_DEPENDENCY_GRAPH("export-dependency-graph", PrimitiveType.BOOLEAN,
-                           List.of(Target.CPP, Target.Rust),
-                           (config) -> ASTUtils.toElement(config.exportDependencyGraph),
-                           (config, value, err) -> {
-        config.exportDependencyGraph = ASTUtils.toBoolean(value);
-    }),
-
-    /**
-     * Directive to let the runtime export the program structure to a yaml file.
-     *
-     * This is a debugging feature and currently only used for C++ programs.
-     */
-    EXPORT_TO_YAML("export-to-yaml", PrimitiveType.BOOLEAN,
-                           List.of(Target.CPP),
-                           (config) -> ASTUtils.toElement(config.exportToYaml),
-                           (config, value, err) -> {
-                               config.exportToYaml = ASTUtils.toBoolean(value);
-                           }),
-
-    /**
-     * List of module files to link into the crate as top-level.
-     * For instance, a {@code target Rust { rust-modules: [ "foo.rs" ] }}
-     * will cause the file to be copied into the generated project,
-     * and the generated {@code main.rs} will include it with a {@code mod foo;}.
-     * If one of the paths is a directory, it must contain a {@code mod.rs}
-     * file, and all its contents are copied.
-     */
-    RUST_INCLUDE("rust-include",
-                 UnionType.FILE_OR_FILE_ARRAY,
-                 List.of(Target.Rust),
-                 (config) -> {
-                    // do not check paths here, and simply copy the absolute path over
-                    List<Path> paths = config.rust.getRustTopLevelModules();
-                    if (paths.isEmpty()) return null;
-                    else if (paths.size() == 1) {
-                        return ASTUtils.toElement(paths.get(0).toString());
-                    } else {
-                        Element e = LfFactory.eINSTANCE.createElement();
-                        Array arr = LfFactory.eINSTANCE.createArray();
-                        for (Path p : paths) {
-                            arr.getElements().add(ASTUtils.toElement(p.toString()));
-                        }
-                        e.setArray(arr);
-                        return e;
-                    }
-                 },
-                (config, value, err) -> {
-                    Path referencePath;
-                    try {
-                        referencePath = FileUtil.toPath(value.eResource().getURI()).toAbsolutePath();
-                    } catch (IOException e) {
-                        err.reportError(value, "Invalid path? " + e.getMessage());
-                        throw new RuntimeIOException(e);
-                    }
-
-                    // we'll resolve relative paths to check that the files
-                    // are as expected.
-
-                    if (value.getLiteral() != null) {
-                        Path resolved = referencePath.resolveSibling(StringUtil.removeQuotes(value.getLiteral()));
-
-                        config.rust.addAndCheckTopLevelModule(resolved, value, err);
-                    } else if (value.getArray() != null) {
-                        for (Element element : value.getArray().getElements()) {
-                            String literal = StringUtil.removeQuotes(element.getLiteral());
-                            Path resolved = referencePath.resolveSibling(literal);
-                            config.rust.addAndCheckTopLevelModule(resolved, element, err);
-                        }
-                    }
-                }),
-
-    /**
-     * Directive for specifying Cargo features of the generated
-     * program to enable.
-     */
-    CARGO_FEATURES("cargo-features", ArrayType.STRING_ARRAY,
-                   List.of(Target.Rust),
-                   (config) -> ASTUtils.toElement(config.rust.getCargoFeatures()),
-                   (config, value, err) -> {
-        config.rust.setCargoFeatures(ASTUtils.elementToListOfStrings(value));
-    }),
-
-    /**
-     * Dependency specifications for Cargo. This property looks like this:
-     * <pre>{@code
-     * cargo-dependencies: {
-     *    // Name-of-the-crate: "version"
-     *    rand: "0.8",
-     *    // Equivalent to using an explicit map:
-     *    rand: {
-     *      version: "0.8"
-     *    },
-     *    // The map allows specifying more details
-     *    rand: {
-     *      // A path to a local unpublished crate.
-     *      // Note 'path' is mutually exclusive with 'version'.
-     *      path: "/home/me/Git/local-rand-clone"
-     *    },
-     *    rand: {
-     *      version: "0.8",
-     *      // you can specify cargo features
-     *      features: ["some-cargo-feature",]
-     *    }
-     * }
-     * }</pre>
-     */
-    CARGO_DEPENDENCIES("cargo-dependencies",
-                       CargoDependenciesPropertyType.INSTANCE,
-                       List.of(Target.Rust),
-                       (config) -> {
-                            var deps = config.rust.getCargoDependencies();
-                            if (deps.size() == 0) return null;
-                            else {
-                                Element e = LfFactory.eINSTANCE.createElement();
-                                KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                                for (var ent : deps.entrySet()) {
-                                    KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                                    pair.setName(ent.getKey());
-                                    pair.setValue(CargoDependencySpec.extractSpec(ent.getValue()));
-                                    kvp.getPairs().add(pair);
-                                }
-                                e.setKeyvalue(kvp);
-                                return e;
-                            }
-                       },
-                       (config, value, err) -> {
-                            config.rust.setCargoDependencies(CargoDependencySpec.parseAll(value));
-    }),
-
-    /**
-     * Directs the C or Python target to include the associated C file used for
-     * setting up federated execution before processing the first tag.
-     */
-    FED_SETUP("_fed_setup", PrimitiveType.FILE,
-              Arrays.asList(Target.C, Target.CCPP, Target.Python),
-              (config) -> ASTUtils.toElement(config.fedSetupPreamble),
-              (config, value, err) ->
-                  config.fedSetupPreamble = StringUtil.removeQuotes(ASTUtils.elementToSingleString(value))
-    )
-    ;
-
-    /**
-     * Update {@code config}.dockerOptions based on value.
-     */
-    private static void setDockerProperty(TargetConfig config, Element value) {
-        if (value.getLiteral() != null) {
-            if (ASTUtils.toBoolean(value)) {
-                config.dockerOptions = new DockerOptions();
-            } else {
-                config.dockerOptions = null;
+  /** Directive to allow including OpenSSL libraries and process HMAC authentication. */
+  AUTH(
+      "auth",
+      PrimitiveType.BOOLEAN,
+      Arrays.asList(Target.C, Target.CCPP),
+      (config) -> ASTUtils.toElement(config.auth),
+      (config, value, err) -> {
+        config.auth = ASTUtils.toBoolean(value);
+      }),
+  /** Directive to let the generator use the custom build command. */
+  BUILD(
+      "build",
+      UnionType.STRING_OR_STRING_ARRAY,
+      Arrays.asList(Target.C, Target.CCPP),
+      (config) -> ASTUtils.toElement(config.buildCommands),
+      (config, value, err) -> {
+        config.buildCommands = ASTUtils.elementToListOfStrings(value);
+      }),
+
+  /**
+   * Directive to specify the target build type such as 'Release' or 'Debug'. This is also used in
+   * the Rust target to select a Cargo profile.
+   */
+  BUILD_TYPE(
+      "build-type",
+      UnionType.BUILD_TYPE_UNION,
+      Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Rust),
+      (config) -> ASTUtils.toElement(config.cmakeBuildType.toString()),
+      (config, value, err) -> {
+        config.cmakeBuildType =
+            (BuildType) UnionType.BUILD_TYPE_UNION.forName(ASTUtils.elementToSingleString(value));
+        // set it there too, because the default is different.
+        config.rust.setBuildType(config.cmakeBuildType);
+      }),
+
+  /** Directive to let the federate execution handle clock synchronization in software. */
+  CLOCK_SYNC(
+      "clock-sync",
+      UnionType.CLOCK_SYNC_UNION,
+      Arrays.asList(Target.C, Target.CCPP, Target.Python),
+      (config) -> ASTUtils.toElement(config.clockSync.toString()),
+      (config, value, err) -> {
+        config.clockSync =
+            (ClockSyncMode)
+                UnionType.CLOCK_SYNC_UNION.forName(ASTUtils.elementToSingleString(value));
+      }),
+  /** Key-value pairs giving options for clock synchronization. */
+  CLOCK_SYNC_OPTIONS(
+      "clock-sync-options",
+      DictionaryType.CLOCK_SYNC_OPTION_DICT,
+      Arrays.asList(Target.C, Target.CCPP, Target.Python),
+      (config) -> {
+        Element e = LfFactory.eINSTANCE.createElement();
+        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+        for (ClockSyncOption opt : ClockSyncOption.values()) {
+          KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+          pair.setName(opt.toString());
+          switch (opt) {
+            case ATTENUATION:
+              pair.setValue(ASTUtils.toElement(config.clockSyncOptions.attenuation));
+              break;
+            case COLLECT_STATS:
+              pair.setValue(ASTUtils.toElement(config.clockSyncOptions.collectStats));
+              break;
+            case LOCAL_FEDERATES_ON:
+              pair.setValue(ASTUtils.toElement(config.clockSyncOptions.localFederatesOn));
+              break;
+            case PERIOD:
+              if (config.clockSyncOptions.period == null) continue; // don't set if null
+              pair.setValue(ASTUtils.toElement(config.clockSyncOptions.period));
+              break;
+            case TEST_OFFSET:
+              if (config.clockSyncOptions.testOffset == null) continue; // don't set if null
+              pair.setValue(ASTUtils.toElement(config.clockSyncOptions.testOffset));
+              break;
+            case TRIALS:
+              pair.setValue(ASTUtils.toElement(config.clockSyncOptions.trials));
+              break;
+          }
+          kvp.getPairs().add(pair);
+        }
+        e.setKeyvalue(kvp);
+        // kvp will never be empty
+        return e;
+      },
+      (config, value, err) -> {
+        for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+          ClockSyncOption option =
+              (ClockSyncOption) DictionaryType.CLOCK_SYNC_OPTION_DICT.forName(entry.getName());
+          switch (option) {
+            case ATTENUATION:
+              config.clockSyncOptions.attenuation = ASTUtils.toInteger(entry.getValue());
+              break;
+            case COLLECT_STATS:
+              config.clockSyncOptions.collectStats = ASTUtils.toBoolean(entry.getValue());
+              break;
+            case LOCAL_FEDERATES_ON:
+              config.clockSyncOptions.localFederatesOn = ASTUtils.toBoolean(entry.getValue());
+              break;
+            case PERIOD:
+              config.clockSyncOptions.period = ASTUtils.toTimeValue(entry.getValue());
+              break;
+            case TEST_OFFSET:
+              config.clockSyncOptions.testOffset = ASTUtils.toTimeValue(entry.getValue());
+              break;
+            case TRIALS:
+              config.clockSyncOptions.trials = ASTUtils.toInteger(entry.getValue());
+              break;
+            default:
+              break;
+          }
+        }
+      }),
+
+  /**
+   * Directive to specify a cmake to be included by the generated build systems.
+   *
+   * <p>This gives full control over the C/C++ build as any cmake parameters can be adjusted in the
+   * included file.
+   */
+  CMAKE_INCLUDE(
+      "cmake-include",
+      UnionType.FILE_OR_FILE_ARRAY,
+      Arrays.asList(Target.CPP, Target.C, Target.CCPP),
+      (config) -> ASTUtils.toElement(config.cmakeIncludes),
+      (config, value, err) -> {
+        config.cmakeIncludes = ASTUtils.elementToListOfStrings(value);
+      },
+      // FIXME: This merging of lists is potentially dangerous since
+      // the incoming list of cmake-includes can belong to a .lf file that is
+      // located in a different location, and keeping just filename
+      // strings like this without absolute paths is incorrect.
+      (config, value, err) -> {
+        config.cmakeIncludes.addAll(ASTUtils.elementToListOfStrings(value));
+      }),
+  /** Directive to specify the target compiler. */
+  COMPILER(
+      "compiler",
+      PrimitiveType.STRING,
+      Target.ALL,
+      (config) -> ASTUtils.toElement(config.compiler),
+      (config, value, err) -> {
+        config.compiler = ASTUtils.elementToSingleString(value);
+      }),
+
+  /** Directive to specify compile-time definitions. */
+  COMPILE_DEFINITIONS(
+      "compile-definitions",
+      StringDictionaryType.COMPILE_DEFINITION,
+      Arrays.asList(Target.C, Target.CCPP, Target.Python),
+      (config) -> ASTUtils.toElement(config.compileDefinitions),
+      (config, value, err) -> {
+        config.compileDefinitions = ASTUtils.elementToStringMaps(value);
+      }),
+
+  /**
+   * Directive to generate a Dockerfile. This is either a boolean, true or false, or a dictionary of
+   * options.
+   */
+  DOCKER(
+      "docker",
+      UnionType.DOCKER_UNION,
+      Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS),
+      (config) -> {
+        if (config.dockerOptions == null) {
+          return null;
+        } else if (config.dockerOptions.equals(new DockerOptions())) {
+          // default configuration
+          return ASTUtils.toElement(true);
+        } else {
+          Element e = LfFactory.eINSTANCE.createElement();
+          KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+          for (DockerOption opt : DockerOption.values()) {
+            KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+            pair.setName(opt.toString());
+            switch (opt) {
+              case FROM:
+                if (config.dockerOptions.from == null) continue;
+                pair.setValue(ASTUtils.toElement(config.dockerOptions.from));
+                break;
             }
+            kvp.getPairs().add(pair);
+          }
+          e.setKeyvalue(kvp);
+          if (kvp.getPairs().isEmpty()) return null;
+          return e;
+        }
+      },
+      (config, value, err) -> setDockerProperty(config, value),
+      (config, value, err) -> setDockerProperty(config, value)),
+
+  /** Directive for specifying a path to an external runtime to be used for the compiled binary. */
+  EXTERNAL_RUNTIME_PATH(
+      "external-runtime-path",
+      PrimitiveType.STRING,
+      List.of(Target.CPP),
+      (config) -> ASTUtils.toElement(config.externalRuntimePath),
+      (config, value, err) -> {
+        config.externalRuntimePath = ASTUtils.elementToSingleString(value);
+      }),
+
+  /**
+   * Directive to let the execution engine allow logical time to elapse faster than physical time.
+   */
+  FAST(
+      "fast",
+      PrimitiveType.BOOLEAN,
+      Target.ALL,
+      (config) -> ASTUtils.toElement(config.fastMode),
+      (config, value, err) -> {
+        config.fastMode = ASTUtils.toBoolean(value);
+      }),
+
+  /**
+   * Directive to stage particular files on the class path to be processed by the code generator.
+   */
+  FILES(
+      "files",
+      UnionType.FILE_OR_FILE_ARRAY,
+      List.of(Target.C, Target.CCPP, Target.Python),
+      (config) -> ASTUtils.toElement(config.files),
+      (config, value, err) -> {
+        config.files = ASTUtils.elementToListOfStrings(value);
+      },
+      // FIXME: This merging of lists is potentially dangerous since
+      // the incoming list of files can belong to a .lf file that is
+      // located in a different location, and keeping just filename
+      // strings like this without absolute paths is incorrect.
+      (config, value, err) -> {
+        config.files.addAll(ASTUtils.elementToListOfStrings(value));
+      }),
+
+  /** Flags to be passed on to the target compiler. */
+  FLAGS(
+      "flags",
+      UnionType.STRING_OR_STRING_ARRAY,
+      Arrays.asList(Target.C, Target.CCPP),
+      (config) -> ASTUtils.toElement(config.compilerFlags),
+      (config, value, err) -> {
+        config.compilerFlags = ASTUtils.elementToListOfStrings(value);
+      }),
+
+  /** Directive to specify the coordination mode */
+  COORDINATION(
+      "coordination",
+      UnionType.COORDINATION_UNION,
+      Arrays.asList(Target.C, Target.CCPP, Target.Python),
+      (config) -> ASTUtils.toElement(config.coordination.toString()),
+      (config, value, err) -> {
+        config.coordination =
+            (CoordinationType)
+                UnionType.COORDINATION_UNION.forName(ASTUtils.elementToSingleString(value));
+      },
+      (config, value, err) -> {
+        config.coordination =
+            (CoordinationType)
+                UnionType.COORDINATION_UNION.forName(ASTUtils.elementToSingleString(value));
+      }),
+
+  /** Key-value pairs giving options for clock synchronization. */
+  COORDINATION_OPTIONS(
+      "coordination-options",
+      DictionaryType.COORDINATION_OPTION_DICT,
+      Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS),
+      (config) -> {
+        Element e = LfFactory.eINSTANCE.createElement();
+        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+        for (CoordinationOption opt : CoordinationOption.values()) {
+          KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+          pair.setName(opt.toString());
+          switch (opt) {
+            case ADVANCE_MESSAGE_INTERVAL:
+              if (config.coordinationOptions.advance_message_interval == null) continue;
+              pair.setValue(
+                  ASTUtils.toElement(config.coordinationOptions.advance_message_interval));
+              break;
+          }
+          kvp.getPairs().add(pair);
+        }
+        e.setKeyvalue(kvp);
+        if (kvp.getPairs().isEmpty()) return null;
+        return e;
+      },
+      (config, value, err) -> {
+        for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+          CoordinationOption option =
+              (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT.forName(entry.getName());
+          switch (option) {
+            case ADVANCE_MESSAGE_INTERVAL:
+              config.coordinationOptions.advance_message_interval =
+                  ASTUtils.toTimeValue(entry.getValue());
+              break;
+            default:
+              break;
+          }
+        }
+      },
+      (config, value, err) -> {
+        for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+          CoordinationOption option =
+              (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT.forName(entry.getName());
+          switch (option) {
+            case ADVANCE_MESSAGE_INTERVAL:
+              config.coordinationOptions.advance_message_interval =
+                  ASTUtils.toTimeValue(entry.getValue());
+              break;
+            default:
+              break;
+          }
+        }
+      }),
+
+  /**
+   * Directive to let the execution engine remain active also if there are no more events in the
+   * event queue.
+   */
+  KEEPALIVE(
+      "keepalive",
+      PrimitiveType.BOOLEAN,
+      Target.ALL,
+      (config) -> ASTUtils.toElement(config.keepalive),
+      (config, value, err) -> {
+        config.keepalive = ASTUtils.toBoolean(value);
+      }),
+
+  /** Directive to specify the grain at which to report log messages during execution. */
+  LOGGING(
+      "logging",
+      UnionType.LOGGING_UNION,
+      Target.ALL,
+      (config) -> ASTUtils.toElement(config.logLevel.toString()),
+      (config, value, err) -> {
+        config.logLevel =
+            (LogLevel) UnionType.LOGGING_UNION.forName(ASTUtils.elementToSingleString(value));
+      }),
+
+  /** Directive to not invoke the target compiler. */
+  NO_COMPILE(
+      "no-compile",
+      PrimitiveType.BOOLEAN,
+      Arrays.asList(Target.C, Target.CPP, Target.CCPP, Target.Python),
+      (config) -> ASTUtils.toElement(config.noCompile),
+      (config, value, err) -> {
+        config.noCompile = ASTUtils.toBoolean(value);
+      }),
+
+  /** Directive to disable validation of reactor rules at runtime. */
+  NO_RUNTIME_VALIDATION(
+      "no-runtime-validation",
+      PrimitiveType.BOOLEAN,
+      Arrays.asList(Target.CPP),
+      (config) -> ASTUtils.toElement(config.noRuntimeValidation),
+      (config, value, err) -> {
+        config.noRuntimeValidation = ASTUtils.toBoolean(value);
+      }),
+
+  /**
+   * Directive to specify the platform for cross code generation. This is either a string of the
+   * platform or a dictionary of options that includes the string name.
+   */
+  PLATFORM(
+      "platform",
+      UnionType.PLATFORM_STRING_OR_DICTIONARY,
+      Target.ALL,
+      (config) -> {
+        Element e = LfFactory.eINSTANCE.createElement();
+        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+        for (PlatformOption opt : PlatformOption.values()) {
+          KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+          pair.setName(opt.toString());
+          switch (opt) {
+            case NAME:
+              pair.setValue(ASTUtils.toElement(config.platformOptions.platform.toString()));
+              break;
+            case BAUDRATE:
+              pair.setValue(ASTUtils.toElement(config.platformOptions.baudRate));
+              break;
+            case BOARD:
+              pair.setValue(ASTUtils.toElement(config.platformOptions.board));
+              break;
+            case FLASH:
+              pair.setValue(ASTUtils.toElement(config.platformOptions.flash));
+              break;
+            case PORT:
+              pair.setValue(ASTUtils.toElement(config.platformOptions.port));
+              break;
+          }
+          kvp.getPairs().add(pair);
+        }
+        e.setKeyvalue(kvp);
+        if (kvp.getPairs().isEmpty()) return null;
+        return e;
+      },
+      (config, value, err) -> {
+        if (value.getLiteral() != null) {
+          config.platformOptions = new PlatformOptions();
+          config.platformOptions.platform =
+              (Platform) UnionType.PLATFORM_UNION.forName(ASTUtils.elementToSingleString(value));
         } else {
-            config.dockerOptions = new DockerOptions();
-            for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                DockerOption option = (DockerOption) DictionaryType.DOCKER_DICT
-                        .forName(entry.getName());
-                switch (option) {
-                    case FROM:
-                        config.dockerOptions.from = ASTUtils.elementToSingleString(entry.getValue());
-                        break;
-                    default:
-                        break;
+          config.platformOptions = new PlatformOptions();
+          for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+            PlatformOption option =
+                (PlatformOption) DictionaryType.PLATFORM_DICT.forName(entry.getName());
+            switch (option) {
+              case NAME:
+                Platform p =
+                    (Platform)
+                        UnionType.PLATFORM_UNION.forName(
+                            ASTUtils.elementToSingleString(entry.getValue()));
+                if (p == null) {
+                  String s =
+                      "Unidentified Platform Type, LF supports the following platform types: "
+                          + Arrays.asList(Platform.values()).toString();
+                  err.reportError(s);
+                  throw new AssertionError(s);
                 }
+                config.platformOptions.platform = p;
+                break;
+              case BAUDRATE:
+                config.platformOptions.baudRate = ASTUtils.toInteger(entry.getValue());
+                break;
+              case BOARD:
+                config.platformOptions.board = ASTUtils.elementToSingleString(entry.getValue());
+                break;
+              case FLASH:
+                config.platformOptions.flash = ASTUtils.toBoolean(entry.getValue());
+                break;
+              case PORT:
+                config.platformOptions.port = ASTUtils.elementToSingleString(entry.getValue());
+                break;
+              default:
+                break;
             }
+          }
+        }
+      }),
+
+  /** Directive to instruct the runtime to collect and print execution statistics. */
+  PRINT_STATISTICS(
+      "print-statistics",
+      PrimitiveType.BOOLEAN,
+      Arrays.asList(Target.CPP),
+      (config) -> ASTUtils.toElement(config.printStatistics),
+      (config, value, err) -> {
+        config.printStatistics = ASTUtils.toBoolean(value);
+      }),
+
+  /**
+   * Directive for specifying .proto files that need to be compiled and their code included in the
+   * sources.
+   */
+  PROTOBUFS(
+      "protobufs",
+      UnionType.FILE_OR_FILE_ARRAY,
+      Arrays.asList(Target.C, Target.CCPP, Target.TS, Target.Python),
+      (config) -> ASTUtils.toElement(config.protoFiles),
+      (config, value, err) -> {
+        config.protoFiles = ASTUtils.elementToListOfStrings(value);
+      }),
+
+  /** Directive to specify that ROS2 specific code is generated, */
+  ROS2(
+      "ros2",
+      PrimitiveType.BOOLEAN,
+      List.of(Target.CPP),
+      (config) -> ASTUtils.toElement(config.ros2),
+      (config, value, err) -> {
+        config.ros2 = ASTUtils.toBoolean(value);
+      }),
+
+  /** Directive to specify additional ROS2 packages that this LF program depends on. */
+  ROS2_DEPENDENCIES(
+      "ros2-dependencies",
+      ArrayType.STRING_ARRAY,
+      List.of(Target.CPP),
+      (config) -> ASTUtils.toElement(config.ros2Dependencies),
+      (config, value, err) -> {
+        config.ros2Dependencies = ASTUtils.elementToListOfStrings(value);
+      }),
+
+  /** Directive for specifying a specific version of the reactor runtime library. */
+  RUNTIME_VERSION(
+      "runtime-version",
+      PrimitiveType.STRING,
+      Arrays.asList(Target.CPP),
+      (config) -> ASTUtils.toElement(config.runtimeVersion),
+      (config, value, err) -> {
+        config.runtimeVersion = ASTUtils.elementToSingleString(value);
+      }),
+
+  /** Directive for specifying a specific runtime scheduler, if supported. */
+  SCHEDULER(
+      "scheduler",
+      UnionType.SCHEDULER_UNION,
+      Arrays.asList(Target.C, Target.CCPP, Target.Python),
+      (config) -> ASTUtils.toElement(config.schedulerType.toString()),
+      (config, value, err) -> {
+        config.schedulerType =
+            (SchedulerOption)
+                UnionType.SCHEDULER_UNION.forName(ASTUtils.elementToSingleString(value));
+      }),
+
+  /** Directive to specify that all code is generated in a single file. */
+  SINGLE_FILE_PROJECT(
+      "single-file-project",
+      PrimitiveType.BOOLEAN,
+      List.of(Target.Rust),
+      (config) -> ASTUtils.toElement(config.singleFileProject),
+      (config, value, err) -> {
+        config.singleFileProject = ASTUtils.toBoolean(value);
+      }),
+
+  /** Directive to indicate whether the runtime should use multi-threading. */
+  THREADING(
+      "threading",
+      PrimitiveType.BOOLEAN,
+      List.of(Target.C, Target.CCPP, Target.Python),
+      (config) -> ASTUtils.toElement(config.threading),
+      (config, value, err) -> {
+        config.threading = ASTUtils.toBoolean(value);
+      }),
+
+  /** Directive to specify the number of worker threads used by the runtime. */
+  WORKERS(
+      "workers",
+      PrimitiveType.NON_NEGATIVE_INTEGER,
+      List.of(Target.C, Target.CCPP, Target.Python, Target.CPP, Target.Rust),
+      (config) -> ASTUtils.toElement(config.workers),
+      (config, value, err) -> {
+        config.workers = ASTUtils.toInteger(value);
+      }),
+
+  /** Directive to specify the execution timeout. */
+  TIMEOUT(
+      "timeout",
+      PrimitiveType.TIME_VALUE,
+      Target.ALL,
+      (config) -> ASTUtils.toElement(config.timeout),
+      (config, value, err) -> {
+        config.timeout = ASTUtils.toTimeValue(value);
+      },
+      (config, value, err) -> {
+        config.timeout = ASTUtils.toTimeValue(value);
+      }),
+
+  /** Directive to enable tracing. */
+  TRACING(
+      "tracing",
+      UnionType.TRACING_UNION,
+      Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Python),
+      (config) -> {
+        if (config.tracing == null) {
+          return null;
+        } else if (config.tracing.equals(new TracingOptions())) {
+          // default values
+          return ASTUtils.toElement(true);
+        } else {
+          Element e = LfFactory.eINSTANCE.createElement();
+          KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+          for (TracingOption opt : TracingOption.values()) {
+            KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+            pair.setName(opt.toString());
+            switch (opt) {
+              case TRACE_FILE_NAME:
+                if (config.tracing.traceFileName == null) continue;
+                pair.setValue(ASTUtils.toElement(config.tracing.traceFileName));
+            }
+            kvp.getPairs().add(pair);
+          }
+          e.setKeyvalue(kvp);
+          if (kvp.getPairs().isEmpty()) return null;
+          return e;
+        }
+      },
+      (config, value, err) -> {
+        if (value.getLiteral() != null) {
+          if (ASTUtils.toBoolean(value)) {
+            config.tracing = new TracingOptions();
+          } else {
+            config.tracing = null;
+          }
+        } else {
+          config.tracing = new TracingOptions();
+          for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+            TracingOption option =
+                (TracingOption) DictionaryType.TRACING_DICT.forName(entry.getName());
+            switch (option) {
+              case TRACE_FILE_NAME:
+                config.tracing.traceFileName = ASTUtils.elementToSingleString(entry.getValue());
+                break;
+              default:
+                break;
+            }
+          }
+        }
+      }),
+
+  /**
+   * Directive to let the runtime export its internal dependency graph.
+   *
+   * <p>This is a debugging feature and currently only used for C++ and Rust programs.
+   */
+  EXPORT_DEPENDENCY_GRAPH(
+      "export-dependency-graph",
+      PrimitiveType.BOOLEAN,
+      List.of(Target.CPP, Target.Rust),
+      (config) -> ASTUtils.toElement(config.exportDependencyGraph),
+      (config, value, err) -> {
+        config.exportDependencyGraph = ASTUtils.toBoolean(value);
+      }),
+
+  /**
+   * Directive to let the runtime export the program structure to a yaml file.
+   *
+   * <p>This is a debugging feature and currently only used for C++ programs.
+   */
+  EXPORT_TO_YAML(
+      "export-to-yaml",
+      PrimitiveType.BOOLEAN,
+      List.of(Target.CPP),
+      (config) -> ASTUtils.toElement(config.exportToYaml),
+      (config, value, err) -> {
+        config.exportToYaml = ASTUtils.toBoolean(value);
+      }),
+
+  /**
+   * List of module files to link into the crate as top-level. For instance, a {@code target Rust {
+   * rust-modules: [ "foo.rs" ] }} will cause the file to be copied into the generated project, and
+   * the generated {@code main.rs} will include it with a {@code mod foo;}. If one of the paths is a
+   * directory, it must contain a {@code mod.rs} file, and all its contents are copied.
+   */
+  RUST_INCLUDE(
+      "rust-include",
+      UnionType.FILE_OR_FILE_ARRAY,
+      List.of(Target.Rust),
+      (config) -> {
+        // do not check paths here, and simply copy the absolute path over
+        List<Path> paths = config.rust.getRustTopLevelModules();
+        if (paths.isEmpty()) return null;
+        else if (paths.size() == 1) {
+          return ASTUtils.toElement(paths.get(0).toString());
+        } else {
+          Element e = LfFactory.eINSTANCE.createElement();
+          Array arr = LfFactory.eINSTANCE.createArray();
+          for (Path p : paths) {
+            arr.getElements().add(ASTUtils.toElement(p.toString()));
+          }
+          e.setArray(arr);
+          return e;
+        }
+      },
+      (config, value, err) -> {
+        Path referencePath;
+        try {
+          referencePath = FileUtil.toPath(value.eResource().getURI()).toAbsolutePath();
+        } catch (IOException e) {
+          err.reportError(value, "Invalid path? " + e.getMessage());
+          throw new RuntimeIOException(e);
         }
-    }
-
-    /**
-     * String representation of this target property.
-     */
-    public final String description;
-
-    /**
-     * List of targets that support this property. If a property is used for
-     * a target that does not support it, a warning reported during
-     * validation.
-     */
-    public final List<Target> supportedBy;
-
-    /**
-     * The type of values that can be assigned to this property.
-     */
-    public final TargetPropertyType type;
 
-    /**
-     * Function that given a configuration object and an Element AST node
-     * sets the configuration. It is assumed that validation already
-     * occurred, so this code should be straightforward.
-     */
-    public final PropertyParser setter;
+        // we'll resolve relative paths to check that the files
+        // are as expected.
 
-    /**
-     * Function that given a configuration object and an Element AST node
-     * sets the configuration. It is assumed that validation already
-     * occurred, so this code should be straightforward.
-     */
-    public final PropertyParser updater;
+        if (value.getLiteral() != null) {
+          Path resolved = referencePath.resolveSibling(StringUtil.removeQuotes(value.getLiteral()));
+
+          config.rust.addAndCheckTopLevelModule(resolved, value, err);
+        } else if (value.getArray() != null) {
+          for (Element element : value.getArray().getElements()) {
+            String literal = StringUtil.removeQuotes(element.getLiteral());
+            Path resolved = referencePath.resolveSibling(literal);
+            config.rust.addAndCheckTopLevelModule(resolved, element, err);
+          }
+        }
+      }),
+
+  /** Directive for specifying Cargo features of the generated program to enable. */
+  CARGO_FEATURES(
+      "cargo-features",
+      ArrayType.STRING_ARRAY,
+      List.of(Target.Rust),
+      (config) -> ASTUtils.toElement(config.rust.getCargoFeatures()),
+      (config, value, err) -> {
+        config.rust.setCargoFeatures(ASTUtils.elementToListOfStrings(value));
+      }),
+
+  /**
+   * Dependency specifications for Cargo. This property looks like this:
+   *
+   * <pre>{@code
+   * cargo-dependencies: {
+   *    // Name-of-the-crate: "version"
+   *    rand: "0.8",
+   *    // Equivalent to using an explicit map:
+   *    rand: {
+   *      version: "0.8"
+   *    },
+   *    // The map allows specifying more details
+   *    rand: {
+   *      // A path to a local unpublished crate.
+   *      // Note 'path' is mutually exclusive with 'version'.
+   *      path: "/home/me/Git/local-rand-clone"
+   *    },
+   *    rand: {
+   *      version: "0.8",
+   *      // you can specify cargo features
+   *      features: ["some-cargo-feature",]
+   *    }
+   * }
+   * }</pre>
+   */
+  CARGO_DEPENDENCIES(
+      "cargo-dependencies",
+      CargoDependenciesPropertyType.INSTANCE,
+      List.of(Target.Rust),
+      (config) -> {
+        var deps = config.rust.getCargoDependencies();
+        if (deps.size() == 0) return null;
+        else {
+          Element e = LfFactory.eINSTANCE.createElement();
+          KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+          for (var ent : deps.entrySet()) {
+            KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+            pair.setName(ent.getKey());
+            pair.setValue(CargoDependencySpec.extractSpec(ent.getValue()));
+            kvp.getPairs().add(pair);
+          }
+          e.setKeyvalue(kvp);
+          return e;
+        }
+      },
+      (config, value, err) -> {
+        config.rust.setCargoDependencies(CargoDependencySpec.parseAll(value));
+      }),
+
+  /**
+   * Directs the C or Python target to include the associated C file used for setting up federated
+   * execution before processing the first tag.
+   */
+  FED_SETUP(
+      "_fed_setup",
+      PrimitiveType.FILE,
+      Arrays.asList(Target.C, Target.CCPP, Target.Python),
+      (config) -> ASTUtils.toElement(config.fedSetupPreamble),
+      (config, value, err) ->
+          config.fedSetupPreamble = StringUtil.removeQuotes(ASTUtils.elementToSingleString(value)));
+
+  /** Update {@code config}.dockerOptions based on value. */
+  private static void setDockerProperty(TargetConfig config, Element value) {
+    if (value.getLiteral() != null) {
+      if (ASTUtils.toBoolean(value)) {
+        config.dockerOptions = new DockerOptions();
+      } else {
+        config.dockerOptions = null;
+      }
+    } else {
+      config.dockerOptions = new DockerOptions();
+      for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+        DockerOption option = (DockerOption) DictionaryType.DOCKER_DICT.forName(entry.getName());
+        switch (option) {
+          case FROM:
+            config.dockerOptions.from = ASTUtils.elementToSingleString(entry.getValue());
+            break;
+          default:
+            break;
+        }
+      }
+    }
+  }
+
+  /** String representation of this target property. */
+  public final String description;
+
+  /**
+   * List of targets that support this property. If a property is used for a target that does not
+   * support it, a warning reported during validation.
+   */
+  public final List<Target> supportedBy;
+
+  /** The type of values that can be assigned to this property. */
+  public final TargetPropertyType type;
+
+  /**
+   * Function that given a configuration object and an Element AST node sets the configuration. It
+   * is assumed that validation already occurred, so this code should be straightforward.
+   */
+  public final PropertyParser setter;
+
+  /**
+   * Function that given a configuration object and an Element AST node sets the configuration. It
+   * is assumed that validation already occurred, so this code should be straightforward.
+   */
+  public final PropertyParser updater;
+
+  @FunctionalInterface
+  private interface PropertyParser {
+
+    /**
+     * Parse the given element into the given target config. May use the error reporter to report
+     * format errors.
+     */
+    void parseIntoTargetConfig(TargetConfig config, Element element, ErrorReporter err);
+  }
+
+  public final PropertyGetter getter;
+
+  @FunctionalInterface
+  private interface PropertyGetter {
+
+    /**
+     * Read this property from the target config and build an element which represents it for the
+     * AST. May return null if the given value of this property is the same as the default.
+     */
+    Element getPropertyElement(TargetConfig config);
+  }
+
+  /**
+   * Private constructor for target properties.
+   *
+   * @param description String representation of this property.
+   * @param type The type that values assigned to this property should conform to.
+   * @param supportedBy List of targets that support this property.
+   * @param setter Function for configuration updates.
+   */
+  TargetProperty(
+      String description,
+      TargetPropertyType type,
+      List<Target> supportedBy,
+      PropertyGetter getter,
+      PropertyParser setter) {
+    this.description = description;
+    this.type = type;
+    this.supportedBy = supportedBy;
+    this.getter = getter;
+    this.setter = setter;
+    this.updater = setter; // (Re)set by default
+  }
+
+  /**
+   * Private constructor for target properties. This will take an additional {@code updater}, which
+   * will be used to merge target properties from imported resources.
+   *
+   * @param description String representation of this property.
+   * @param type The type that values assigned to this property should conform to.
+   * @param supportedBy List of targets that support this property.
+   * @param setter Function for setting configuration values.
+   * @param updater Function for updating configuration values.
+   */
+  TargetProperty(
+      String description,
+      TargetPropertyType type,
+      List<Target> supportedBy,
+      PropertyGetter getter,
+      PropertyParser setter,
+      PropertyParser updater) {
+    this.description = description;
+    this.type = type;
+    this.supportedBy = supportedBy;
+    this.getter = getter;
+    this.setter = setter;
+    this.updater = updater;
+  }
+
+  /**
+   * Return the name of the property in lingua franca. This is suitable for use as a key in a target
+   * properties block. It may be an invalid identifier in other languages (may contains dashes
+   * {@code -}).
+   */
+  public String getDisplayName() {
+    return description;
+  }
+
+  /**
+   * Set the given configuration using the given target properties.
+   *
+   * @param config The configuration object to update.
+   * @param properties AST node that holds all the target properties.
+   * @param err Error reporter on which property format errors will be reported
+   */
+  public static void set(TargetConfig config, List<KeyValuePair> properties, ErrorReporter err) {
+    properties.forEach(
+        property -> {
+          TargetProperty p = forName(property.getName());
+          if (p != null) {
+            // Mark the specified target property as set by the user
+            config.setByUser.add(p);
+            try {
+              p.setter.parseIntoTargetConfig(config, property.getValue(), err);
+            } catch (InvalidLfSourceException e) {
+              err.reportError(e.getNode(), e.getProblem());
+            }
+          }
+        });
+  }
+
+  /**
+   * Extracts all properties as a list of key-value pairs from a TargetConfig. Only extracts
+   * properties explicitly set by user.
+   *
+   * @param config The TargetConfig to extract from.
+   * @return The extracted properties.
+   */
+  public static List<KeyValuePair> extractProperties(TargetConfig config) {
+    var res = new LinkedList<KeyValuePair>();
+    for (TargetProperty p : config.setByUser) {
+      KeyValuePair kv = LfFactory.eINSTANCE.createKeyValuePair();
+      kv.setName(p.toString());
+      kv.setValue(p.getter.getPropertyElement(config));
+      if (kv.getValue() != null) res.add(kv);
+    }
+    return res;
+  }
+
+  /**
+   * Constructs a TargetDecl by extracting the fields of the given TargetConfig.
+   *
+   * @param target The target to generate for.
+   * @param config The TargetConfig to extract from.
+   * @return A generated TargetDecl.
+   */
+  public static TargetDecl extractTargetDecl(Target target, TargetConfig config) {
+    TargetDecl decl = LfFactory.eINSTANCE.createTargetDecl();
+    KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+    for (KeyValuePair p : extractProperties(config)) {
+      kvp.getPairs().add(p);
+    }
+    decl.setName(target.toString());
+    decl.setConfig(kvp);
+    return decl;
+  }
+
+  /**
+   * Update the given configuration using the given target properties.
+   *
+   * @param config The configuration object to update.
+   * @param properties AST node that holds all the target properties.
+   */
+  public static void update(TargetConfig config, List<KeyValuePair> properties, ErrorReporter err) {
+    properties.forEach(
+        property -> {
+          TargetProperty p = forName(property.getName());
+          if (p != null) {
+            // Mark the specified target property as set by the user
+            config.setByUser.add(p);
+            p.updater.parseIntoTargetConfig(config, property.getValue(), err);
+          }
+        });
+  }
+
+  /**
+   * Update one of the target properties, given by 'propertyName'. For convenience, a list of target
+   * properties (e.g., taken from a file or resource) can be passed without any filtering. This
+   * function will do nothing if the list of target properties doesn't include the property given by
+   * 'propertyName'.
+   *
+   * @param config The target config to apply the update to.
+   * @param property The target property.
+   * @param properties AST node that holds all the target properties.
+   * @param err Error reporter on which property format errors will be reported
+   */
+  public static void updateOne(
+      TargetConfig config,
+      TargetProperty property,
+      List<KeyValuePair> properties,
+      ErrorReporter err) {
+    properties.stream()
+        .filter(p -> p.getName().equals(property.getDisplayName()))
+        .findFirst()
+        .map(KeyValuePair::getValue)
+        .ifPresent(value -> property.updater.parseIntoTargetConfig(config, value, err));
+  }
+
+  /**
+   * Return the entry that matches the given string.
+   *
+   * @param name The string to match against.
+   */
+  public static TargetProperty forName(String name) {
+    return Target.match(name, TargetProperty.values());
+  }
+
+  /**
+   * Return a list with all target properties.
+   *
+   * @return All existing target properties.
+   */
+  public static List<TargetProperty> getOptions() {
+    return Arrays.asList(TargetProperty.values());
+  }
+
+  /** Return the description. */
+  @Override
+  public String toString() {
+    return this.description;
+  }
+
+  // Inner classes for the various supported types.
+
+  /** Dictionary type that allows for keys that will be interpreted as strings and string values. */
+  public enum StringDictionaryType implements TargetPropertyType {
+    COMPILE_DEFINITION();
 
-    @FunctionalInterface
-    private interface PropertyParser {
+    @Override
+    public boolean validate(Element e) {
+      if (e.getKeyvalue() != null) {
+        return true;
+      }
+      return false;
+    }
 
-        /**
-         * Parse the given element into the given target config.
-         * May use the error reporter to report format errors.
-         */
-        void parseIntoTargetConfig(TargetConfig config, Element element, ErrorReporter err);
+    @Override
+    public void check(Element e, String name, LFValidator v) {
+      KeyValuePairs kv = e.getKeyvalue();
+      if (kv == null) {
+        TargetPropertyType.produceError(name, this.toString(), v);
+      } else {
+        for (KeyValuePair pair : kv.getPairs()) {
+          String key = pair.getName();
+          Element val = pair.getValue();
+
+          // Make sure the type is string
+          PrimitiveType.STRING.check(val, name + "." + key, v);
+        }
+      }
     }
+  }
 
-    public final PropertyGetter getter;
+  /** Interface for dictionary elements. It associates an entry with a type. */
+  public interface DictionaryElement {
 
-    @FunctionalInterface
-    private interface PropertyGetter {
+    TargetPropertyType getType();
+  }
 
-        /**
-         * Read this property from the target config and build an element which represents it for the AST.
-         * May return null if the given value of this property is the same as the default.
-         */
-        Element getPropertyElement(TargetConfig config);
-    }
+  /**
+   * A dictionary type with a predefined set of possible keys and assignable types.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum DictionaryType implements TargetPropertyType {
+    CLOCK_SYNC_OPTION_DICT(Arrays.asList(ClockSyncOption.values())),
+    DOCKER_DICT(Arrays.asList(DockerOption.values())),
+    PLATFORM_DICT(Arrays.asList(PlatformOption.values())),
+    COORDINATION_OPTION_DICT(Arrays.asList(CoordinationOption.values())),
+    TRACING_DICT(Arrays.asList(TracingOption.values()));
 
-    /**
-     * Private constructor for target properties.
-     *
-     * @param description String representation of this property.
-     * @param type        The type that values assigned to this property
-     *                    should conform to.
-     * @param supportedBy List of targets that support this property.
-     * @param setter      Function for configuration updates.
-     */
-    TargetProperty(String description, TargetPropertyType type,
-                   List<Target> supportedBy,
-                   PropertyGetter getter,
-                   PropertyParser setter) {
-        this.description = description;
-        this.type = type;
-        this.supportedBy = supportedBy;
-        this.getter = getter;
-        this.setter = setter;
-        this.updater = setter; // (Re)set by default
-    }
+    /** The keys and assignable types that are allowed in this dictionary. */
+    public List<DictionaryElement> options;
 
     /**
-     * Private constructor for target properties. This will take an additional
-     * {@code updater}, which will be used to merge target properties from imported resources.
+     * A dictionary type restricted to sets of predefined keys and types of values.
      *
-     * @param description String representation of this property.
-     * @param type        The type that values assigned to this property
-     *                    should conform to.
-     * @param supportedBy List of targets that support this property.
-     * @param setter      Function for setting configuration values.
-     * @param updater     Function for updating configuration values.
-     */
-    TargetProperty(String description, TargetPropertyType type,
-                   List<Target> supportedBy,
-                   PropertyGetter getter,
-                   PropertyParser setter,
-                   PropertyParser updater) {
-        this.description = description;
-        this.type = type;
-        this.supportedBy = supportedBy;
-        this.getter = getter;
-        this.setter = setter;
-        this.updater = updater;
-    }
-
-    /**
-     * Return the name of the property in lingua franca. This
-     * is suitable for use as a key in a target properties block.
-     * It may be an invalid identifier in other languages (may
-     * contains dashes {@code -}).
+     * @param options The dictionary elements allowed by this type.
      */
-    public String getDisplayName() {
-        return description;
+    private DictionaryType(List<DictionaryElement> options) {
+      this.options = options;
     }
 
     /**
-     * Set the given configuration using the given target properties.
+     * Return the dictionary element of which the key matches the given string.
      *
-     * @param config     The configuration object to update.
-     * @param properties AST node that holds all the target properties.
-     * @param err        Error reporter on which property format errors will be reported
+     * @param name The string to match against.
+     * @return The matching dictionary element (or null if there is none).
      */
-    public static void set(TargetConfig config, List<KeyValuePair> properties, ErrorReporter err) {
-        properties.forEach(property ->  {
-            TargetProperty p = forName(property.getName());
-            if (p != null) {
-                // Mark the specified target property as set by the user
-                config.setByUser.add(p);
-                try {
-                    p.setter.parseIntoTargetConfig(config, property.getValue(), err);
-                } catch (InvalidLfSourceException e) {
-                    err.reportError(e.getNode(), e.getProblem());
-                }
-            }
-        });
+    public DictionaryElement forName(String name) {
+      return Target.match(name, options);
     }
 
-    /**
-     * Extracts all properties as a list of key-value pairs from a TargetConfig. Only extracts properties explicitly set by user.
-     * @param config The TargetConfig to extract from.
-     * @return The extracted properties.
-     */
-    public static List<KeyValuePair> extractProperties(TargetConfig config) {
-        var res = new LinkedList<KeyValuePair>();
-        for (TargetProperty p : config.setByUser) {
-            KeyValuePair kv = LfFactory.eINSTANCE.createKeyValuePair();
-            kv.setName(p.toString());
-            kv.setValue(p.getter.getPropertyElement(config));
-            if (kv.getValue() != null)
-                res.add(kv);
+    /** Recursively check that the passed in element conforms to the rules of this dictionary. */
+    @Override
+    public void check(Element e, String name, LFValidator v) {
+      KeyValuePairs kv = e.getKeyvalue();
+      if (kv == null) {
+        TargetPropertyType.produceError(name, this.toString(), v);
+      } else {
+        for (KeyValuePair pair : kv.getPairs()) {
+          String key = pair.getName();
+          Element val = pair.getValue();
+          Optional<DictionaryElement> match =
+              this.options.stream()
+                  .filter(element -> key.equalsIgnoreCase(element.toString()))
+                  .findAny();
+          if (match.isPresent()) {
+            // Make sure the type is correct, too.
+            TargetPropertyType type = match.get().getType();
+            type.check(val, name + "." + key, v);
+          } else {
+            // No match found; report error.
+            TargetPropertyType.produceError(name, this.toString(), v);
+          }
         }
-        return res;
+      }
     }
 
-    /**
-     * Constructs a TargetDecl by extracting the fields of the given TargetConfig.
-     * @param target  The target to generate for.
-     * @param config  The TargetConfig to extract from.
-     * @return        A generated TargetDecl.
-     */
-    public static TargetDecl extractTargetDecl(Target target, TargetConfig config) {
-        TargetDecl decl = LfFactory.eINSTANCE.createTargetDecl();
-        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-        for (KeyValuePair p : extractProperties(config)) {
-            kvp.getPairs().add(p);
-        }
-        decl.setName(target.toString());
-        decl.setConfig(kvp);
-        return decl;
+    /** Return true if the given element represents a dictionary, false otherwise. */
+    @Override
+    public boolean validate(Element e) {
+      if (e.getKeyvalue() != null) {
+        return true;
+      }
+      return false;
     }
 
-    /**
-     * Update the given configuration using the given target properties.
-     *
-     * @param config     The configuration object to update.
-     * @param properties AST node that holds all the target properties.
-     */
-    public static void update(TargetConfig config, List<KeyValuePair> properties, ErrorReporter err) {
-        properties.forEach(property ->  {
-            TargetProperty p = forName(property.getName());
-            if (p != null) {
-                // Mark the specified target property as set by the user
-                config.setByUser.add(p);
-                p.updater.parseIntoTargetConfig(config, property.getValue(), err);
-            }
-        });
+    /** Return a human-readable description of this type. */
+    @Override
+    public String toString() {
+      return "a dictionary with one or more of the following keys: "
+          + options.stream().map(option -> option.toString()).collect(Collectors.joining(", "));
     }
-
-    /**
-     * Update one of the target properties, given by 'propertyName'.
-     * For convenience, a list of target properties (e.g., taken from
-     * a file or resource) can be passed without any filtering. This
-     * function will do nothing if the list of target properties doesn't
-     * include the property given by 'propertyName'.
+  }
+  /**
+   * A type that can assume one of several types.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum UnionType implements TargetPropertyType {
+    STRING_OR_STRING_ARRAY(Arrays.asList(PrimitiveType.STRING, ArrayType.STRING_ARRAY), null),
+    PLATFORM_STRING_OR_DICTIONARY(
+        Arrays.asList(PrimitiveType.STRING, DictionaryType.PLATFORM_DICT), null),
+    FILE_OR_FILE_ARRAY(Arrays.asList(PrimitiveType.FILE, ArrayType.FILE_ARRAY), null),
+    BUILD_TYPE_UNION(Arrays.asList(BuildType.values()), null),
+    COORDINATION_UNION(Arrays.asList(CoordinationType.values()), CoordinationType.CENTRALIZED),
+    SCHEDULER_UNION(Arrays.asList(SchedulerOption.values()), SchedulerOption.getDefault()),
+    LOGGING_UNION(Arrays.asList(LogLevel.values()), LogLevel.INFO),
+    PLATFORM_UNION(Arrays.asList(Platform.values()), Platform.AUTO),
+    CLOCK_SYNC_UNION(Arrays.asList(ClockSyncMode.values()), ClockSyncMode.INIT),
+    DOCKER_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.DOCKER_DICT), null),
+    TRACING_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.TRACING_DICT), null);
+
+    /** The constituents of this type union. */
+    public final List<Enum<?>> options;
+
+    /** The default type, if there is one. */
+    private final Enum<?> defaultOption;
+
+    /**
+     * Private constructor for creating unions types.
      *
-     * @param config     The target config to apply the update to.
-     * @param property   The target property.
-     * @param properties AST node that holds all the target properties.
-     * @param err        Error reporter on which property format errors will be reported
+     * @param options The types that that are part of the union.
+     * @param defaultOption The default type.
      */
-    public static void updateOne(TargetConfig config, TargetProperty property, List<KeyValuePair> properties, ErrorReporter err) {
-        properties.stream()
-            .filter(p -> p.getName().equals(property.getDisplayName()))
-            .findFirst()
-            .map(KeyValuePair::getValue)
-            .ifPresent(value -> property.updater.parseIntoTargetConfig(
-                config,
-                value,
-                err
-            ));
+    private UnionType(List<Enum<?>> options, Enum<?> defaultOption) {
+      this.options = options;
+      this.defaultOption = defaultOption;
     }
 
     /**
-     * Return the entry that matches the given string.
-     * @param name The string to match against.
-     */
-    public static TargetProperty forName(String name) {
-        return Target.match(name, TargetProperty.values());
-    }
-
-    /**
-     * Return a list with all target properties.
+     * Return the type among those in this type union that matches the given name.
      *
-     * @return All existing target properties.
+     * @param name The string to match against.
+     * @return The matching dictionary element (or null if there is none).
      */
-    public static List<TargetProperty> getOptions() {
-        return Arrays.asList(TargetProperty.values());
+    public Enum<?> forName(String name) {
+      return Target.match(name, options);
     }
 
-    /**
-     * Return the description.
-     */
+    /** Recursively check that the passed in element conforms to the rules of this union. */
     @Override
-    public String toString() {
-        return this.description;
+    public void check(Element e, String name, LFValidator v) {
+      Optional<Enum<?>> match = this.match(e);
+      if (match.isPresent()) {
+        // Go deeper if the element is an array or dictionary.
+        Enum<?> type = match.get();
+        if (type instanceof DictionaryType) {
+          ((DictionaryType) type).check(e, name, v);
+        } else if (type instanceof ArrayType) {
+          ((ArrayType) type).check(e, name, v);
+        } else if (type instanceof PrimitiveType) {
+          ((PrimitiveType) type).check(e, name, v);
+        } else if (!(type instanceof Enum<?>)) {
+          throw new RuntimeException("Encountered an unknown type.");
+        }
+      } else {
+        // No match found; report error.
+        TargetPropertyType.produceError(name, this.toString(), v);
+      }
     }
 
-    // Inner classes for the various supported types.
-
     /**
-     * Dictionary type that allows for keys that will be interpreted as strings
-     * and string values.
+     * Internal method for matching a given element against the allowable types.
+     *
+     * @param e AST node that represents the value of a target property.
+     * @return The matching type wrapped in an Optional object.
      */
-    public enum StringDictionaryType implements TargetPropertyType {
-        COMPILE_DEFINITION();
-        @Override
-        public boolean validate(Element e) {
-            if (e.getKeyvalue() != null) {
-                return true;
-            }
-            return false;
-        }
-
-        @Override
-        public void check(Element e, String name, LFValidator v) {
-            KeyValuePairs kv = e.getKeyvalue();
-            if (kv == null) {
-                TargetPropertyType.produceError(name, this.toString(), v);
-            } else {
-                for (KeyValuePair pair : kv.getPairs()) {
-                    String key = pair.getName();
-                    Element val = pair.getValue();
-
-                    // Make sure the type is string
-                    PrimitiveType.STRING.check(val, name + "." + key, v);
+    private Optional<Enum<?>> match(Element e) {
+      return this.options.stream()
+          .filter(
+              option -> {
+                if (option instanceof TargetPropertyType) {
+                  return ((TargetPropertyType) option).validate(e);
+                } else {
+                  return ASTUtils.elementToSingleString(e).equalsIgnoreCase(option.toString());
                 }
-            }
-
-        }
+              })
+          .findAny();
     }
 
     /**
-     * Interface for dictionary elements. It associates an entry with a type.
+     * Return true if this union has an option that matches the given element.
+     *
+     * @param e The element to match against this type.
      */
-    public interface DictionaryElement {
-
-        TargetPropertyType getType();
+    @Override
+    public boolean validate(Element e) {
+      if (this.match(e).isPresent()) {
+        return true;
+      }
+      return false;
     }
 
     /**
-     * A dictionary type with a predefined set of possible keys and assignable
-     * types.
-     *
-     * @author Marten Lohstroh
-     *
+     * Return a human-readable description of this type. If three is a default option, then indicate
+     * it.
      */
-    public enum DictionaryType implements TargetPropertyType {
-        CLOCK_SYNC_OPTION_DICT(Arrays.asList(ClockSyncOption.values())),
-        DOCKER_DICT(Arrays.asList(DockerOption.values())),
-        PLATFORM_DICT(Arrays.asList(PlatformOption.values())),
-        COORDINATION_OPTION_DICT(Arrays.asList(CoordinationOption.values())),
-        TRACING_DICT(Arrays.asList(TracingOption.values()));
-
-        /**
-         * The keys and assignable types that are allowed in this dictionary.
-         */
-        public List<DictionaryElement> options;
-
-        /**
-         * A dictionary type restricted to sets of predefined keys and types of
-         * values.
-         *
-         * @param options The dictionary elements allowed by this type.
-         */
-        private DictionaryType(List<DictionaryElement> options) {
-            this.options = options;
-        }
-
-        /**
-         * Return the dictionary element of which the key matches the given
-         * string.
-         *
-         * @param name The string to match against.
-         * @return The matching dictionary element (or null if there is none).
-         */
-        public DictionaryElement forName(String name) {
-            return Target.match(name, options);
-        }
-
-        /**
-         * Recursively check that the passed in element conforms to the rules of
-         * this dictionary.
-         */
-        @Override
-        public void check(Element e, String name, LFValidator v) {
-            KeyValuePairs kv = e.getKeyvalue();
-            if (kv == null) {
-                TargetPropertyType.produceError(name, this.toString(), v);
-            } else {
-                for (KeyValuePair pair : kv.getPairs()) {
-                    String key = pair.getName();
-                    Element val = pair.getValue();
-                    Optional<DictionaryElement> match = this.options.stream()
-                            .filter(element -> key.equalsIgnoreCase(element.toString())).findAny();
-                    if (match.isPresent()) {
-                        // Make sure the type is correct, too.
-                        TargetPropertyType type = match.get().getType();
-                        type.check(val, name + "." + key, v);
+    @Override
+    public String toString() {
+      return "one of the following: "
+          + options.stream()
+              .map(
+                  option -> {
+                    if (option == this.defaultOption) {
+                      return option.toString() + " (default)";
                     } else {
-                        // No match found; report error.
-                        TargetPropertyType.produceError(name,
-                                this.toString(), v);
+                      return option.toString();
                     }
-                }
-            }
-        }
-
-        /**
-         * Return true if the given element represents a dictionary, false
-         * otherwise.
-         */
-        @Override
-        public boolean validate(Element e) {
-            if (e.getKeyvalue() != null) {
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Return a human-readable description of this type.
-         */
-        @Override
-        public String toString() {
-            return "a dictionary with one or more of the following keys: "
-                    + options.stream().map(option -> option.toString())
-                            .collect(Collectors.joining(", "));
-        }
+                  })
+              .collect(Collectors.joining(", "));
     }
-    /**
-     * A type that can assume one of several types.
-     *
-     * @author Marten Lohstroh
-     *
-     */
-    public enum UnionType implements TargetPropertyType {
-        STRING_OR_STRING_ARRAY(
-                Arrays.asList(PrimitiveType.STRING, ArrayType.STRING_ARRAY),
-                null),
-        PLATFORM_STRING_OR_DICTIONARY(
-                Arrays.asList(PrimitiveType.STRING, DictionaryType.PLATFORM_DICT),
-                null),
-        FILE_OR_FILE_ARRAY(
-                Arrays.asList(PrimitiveType.FILE, ArrayType.FILE_ARRAY), null),
-        BUILD_TYPE_UNION(Arrays.asList(BuildType.values()), null),
-        COORDINATION_UNION(Arrays.asList(CoordinationType.values()),
-                CoordinationType.CENTRALIZED),
-        SCHEDULER_UNION(Arrays.asList(SchedulerOption.values()), SchedulerOption.getDefault()),
-        LOGGING_UNION(Arrays.asList(LogLevel.values()), LogLevel.INFO),
-        PLATFORM_UNION(Arrays.asList(Platform.values()), Platform.AUTO),
-        CLOCK_SYNC_UNION(Arrays.asList(ClockSyncMode.values()),
-                ClockSyncMode.INIT),
-        DOCKER_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.DOCKER_DICT),
-                null),
-        TRACING_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.TRACING_DICT),
-                null);
-
-        /**
-         * The constituents of this type union.
-         */
-        public final List<Enum<?>> options;
-
-        /**
-         * The default type, if there is one.
-         */
-        private final Enum<?> defaultOption;
-
-        /**
-         * Private constructor for creating unions types.
-         *
-         * @param options The types that that are part of the union.
-         * @param defaultOption The default type.
-         */
-        private UnionType(List<Enum<?>> options, Enum<?> defaultOption) {
-            this.options = options;
-            this.defaultOption = defaultOption;
-        }
-
-        /**
-         * Return the type among those in this type union that matches the given
-         * name.
-         *
-         * @param name The string to match against.
-         * @return The matching dictionary element (or null if there is none).
-         */
-        public Enum<?> forName(String name) {
-            return Target.match(name, options);
-        }
-
-        /**
-         * Recursively check that the passed in element conforms to the rules of
-         * this union.
-         */
-        @Override
-        public void check(Element e, String name, LFValidator v) {
-            Optional<Enum<?>> match = this.match(e);
-            if (match.isPresent()) {
-                // Go deeper if the element is an array or dictionary.
-                Enum<?> type = match.get();
-                if (type instanceof DictionaryType) {
-                    ((DictionaryType) type).check(e, name, v);
-                } else if (type instanceof ArrayType) {
-                    ((ArrayType) type).check(e, name, v);
-                } else if (type instanceof PrimitiveType) {
-                    ((PrimitiveType) type).check(e, name, v);
-                } else if (!(type instanceof Enum<?>)) {
-                    throw new RuntimeException("Encountered an unknown type.");
-                }
-            } else {
-                // No match found; report error.
-                TargetPropertyType.produceError(name, this.toString(), v);
-            }
-        }
-
-        /**
-         * Internal method for matching a given element against the allowable
-         * types.
-         *
-         * @param e AST node that represents the value of a target property.
-         * @return The matching type wrapped in an Optional object.
-         */
-        private Optional<Enum<?>> match(Element e) {
-            return this.options.stream().filter(option -> {
-                if (option instanceof TargetPropertyType) {
-                    return ((TargetPropertyType) option).validate(e);
-                } else {
-                    return ASTUtils.elementToSingleString(e)
-                            .equalsIgnoreCase(option.toString());
-                }
-            }).findAny();
-        }
+  }
 
-        /**
-         * Return true if this union has an option that matches the given
-         * element.
-         * @param e The element to match against this type.
-         */
-        @Override
-        public boolean validate(Element e) {
-            if (this.match(e).isPresent()) {
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Return a human-readable description of this type. If three is a
-         * default option, then indicate it.
-         */
-        @Override
-        public String toString() {
-            return "one of the following: " + options.stream().map(option -> {
-                if (option == this.defaultOption) {
-                    return option.toString() + " (default)";
-                } else {
-                    return option.toString();
-                }
-            }).collect(Collectors.joining(", "));
-        }
+  /**
+   * An array type of which the elements confirm to a given type.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum ArrayType implements TargetPropertyType {
+    STRING_ARRAY(PrimitiveType.STRING),
+    FILE_ARRAY(PrimitiveType.FILE);
 
-    }
+    /** Type parameter of this array type. */
+    public TargetPropertyType type;
 
     /**
-     * An array type of which the elements confirm to a given type.
-     *
-     * @author Marten Lohstroh
+     * Private constructor to create a new array type.
      *
+     * @param type The type of elements in the array.
      */
-    public enum ArrayType implements TargetPropertyType {
-        STRING_ARRAY(PrimitiveType.STRING),
-        FILE_ARRAY(PrimitiveType.FILE);
-
-        /**
-         * Type parameter of this array type.
-         */
-        public TargetPropertyType type;
-
-        /**
-         * Private constructor to create a new array type.
-         *
-         * @param type The type of elements in the array.
-         */
-        private ArrayType(TargetPropertyType type) {
-            this.type = type;
-        }
-
-        /**
-         * Check that the passed in element represents an array and ensure that
-         * its elements are all of the correct type.
-         */
-        @Override
-        public void check(Element e, String name, LFValidator v) {
-            Array array = e.getArray();
-            if (array == null) {
-                TargetPropertyType.produceError(name, this.toString(), v);
-            } else {
-                List<Element> elements = array.getElements();
-                for (int i = 0; i < elements.size(); i++) {
-                    this.type.check(elements.get(i), name + "[" + i + "]", v);
-                }
-            }
-        }
-
-        /**
-         * Return true of the given element is an array.
-         */
-        @Override
-        public boolean validate(Element e) {
-            if (e.getArray() != null) {
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Return a human-readable description of this type.
-         */
-        @Override
-        public String toString() {
-            return "an array of which each element is " + this.type.toString();
-        }
+    private ArrayType(TargetPropertyType type) {
+      this.type = type;
     }
 
     /**
-     * Enumeration of Cmake build types. These are also mapped
-     * to Cargo profiles for the Rust target (see {@link org.lflang.generator.rust.RustTargetConfig})
-     *
-     * @author Christian Menard
+     * Check that the passed in element represents an array and ensure that its elements are all of
+     * the correct type.
      */
-    public enum BuildType {
-        RELEASE("Release"),
-        DEBUG("Debug"),
-        TEST("Test"),
-        REL_WITH_DEB_INFO("RelWithDebInfo"),
-        MIN_SIZE_REL("MinSizeRel");
-
-        /**
-         * Alias used in toString method.
-         */
-        private final String alias;
-
-        /**
-         * Private constructor for Cmake build types.
-         */
-        BuildType(String alias) {
-            this.alias = alias;
+    @Override
+    public void check(Element e, String name, LFValidator v) {
+      Array array = e.getArray();
+      if (array == null) {
+        TargetPropertyType.produceError(name, this.toString(), v);
+      } else {
+        List<Element> elements = array.getElements();
+        for (int i = 0; i < elements.size(); i++) {
+          this.type.check(elements.get(i), name + "[" + i + "]", v);
         }
+      }
+    }
 
-        /**
-         * Return the alias.
-         */
-        @Override
-        public String toString() {
-            return this.alias;
-        }
+    /** Return true of the given element is an array. */
+    @Override
+    public boolean validate(Element e) {
+      if (e.getArray() != null) {
+        return true;
+      }
+      return false;
     }
 
-    /**
-     * Enumeration of coordination types.
-     *
-     * @author Marten Lohstroh
-     */
-    public enum CoordinationType {
-        CENTRALIZED, DECENTRALIZED;
-
-        /**
-         * Return the name in lower case.
-         */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
+    /** Return a human-readable description of this type. */
+    @Override
+    public String toString() {
+      return "an array of which each element is " + this.type.toString();
+    }
+  }
+
+  /**
+   * Enumeration of Cmake build types. These are also mapped to Cargo profiles for the Rust target
+   * (see {@link org.lflang.generator.rust.RustTargetConfig})
+   *
+   * @author Christian Menard
+   */
+  public enum BuildType {
+    RELEASE("Release"),
+    DEBUG("Debug"),
+    TEST("Test"),
+    REL_WITH_DEB_INFO("RelWithDebInfo"),
+    MIN_SIZE_REL("MinSizeRel");
+
+    /** Alias used in toString method. */
+    private final String alias;
+
+    /** Private constructor for Cmake build types. */
+    BuildType(String alias) {
+      this.alias = alias;
+    }
+
+    /** Return the alias. */
+    @Override
+    public String toString() {
+      return this.alias;
+    }
+  }
+
+  /**
+   * Enumeration of coordination types.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum CoordinationType {
+    CENTRALIZED,
+    DECENTRALIZED;
+
+    /** Return the name in lower case. */
+    @Override
+    public String toString() {
+      return this.name().toLowerCase();
+    }
+  }
+
+  /**
+   * Enumeration of clock synchronization modes.
+   *
+   * <ul>
+   *   <li>OFF: The clock synchronization is universally off.
+   *   <li>STARTUP: Clock synchronization occurs at startup only.
+   *   <li>ON: Clock synchronization occurs at startup and at runtime.
+   * </ul>
+   *
+   * @author Edward A. Lee
+   */
+  public enum ClockSyncMode {
+    OFF,
+    INIT,
+    ON; // TODO Discuss initial in now a mode keyword (same as startup) and cannot be used as target
+    // property value, thus changed it to init
+    // FIXME I could not test if this change breaks anything
+
+    /** Return the name in lower case. */
+    @Override
+    public String toString() {
+      return this.name().toLowerCase();
     }
+  }
 
+  /**
+   * An interface for types associated with target properties.
+   *
+   * @author Marten Lohstroh
+   */
+  public interface TargetPropertyType {
 
     /**
-     * Enumeration of clock synchronization modes.
+     * Return true if the the given Element is a valid instance of this type.
      *
-     * <ul>
-     * <li>OFF: The clock synchronization is universally off.</li>
-     * <li>STARTUP: Clock synchronization occurs at startup only.</li>
-     * <li>ON: Clock synchronization occurs at startup and at runtime.</li>
-     * </ul>
-     *
-     * @author Edward A. Lee
+     * @param e The Element to validate.
+     * @return True if the element conforms to this type, false otherwise.
      */
-    public enum ClockSyncMode {
-        OFF, INIT, ON; // TODO Discuss initial in now a mode keyword (same as startup) and cannot be used as target property value, thus changed it to init
-        // FIXME I could not test if this change breaks anything
-
-        /**
-         * Return the name in lower case.
-         */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
-    }
+    public boolean validate(Element e);
 
     /**
-     * An interface for types associated with target properties.
+     * Check (recursively) the given Element against its associated type(s) and add found problems
+     * to the given list of errors.
      *
-     * @author Marten Lohstroh
+     * @param e The Element to type check.
+     * @param name The name of the target property.
+     * @param v A reference to the validator to report errors to.
      */
-    public interface TargetPropertyType {
-
-        /**
-         * Return true if the the given Element is a valid instance of this
-         * type.
-         *
-         * @param e The Element to validate.
-         * @return True if the element conforms to this type, false otherwise.
-         */
-        public boolean validate(Element e);
-
-        /**
-         * Check (recursively) the given Element against its associated type(s)
-         * and add found problems to the given list of errors.
-         *
-         * @param e    The Element to type check.
-         * @param name The name of the target property.
-         * @param v    A reference to the validator to report errors to.
-         */
-        public void check(Element e, String name, LFValidator v);
-
-        /**
-         * Helper function to produce an error during type checking.
-         *
-         * @param name        The description of the target property.
-         * @param description The description of the type.
-         * @param v           A reference to the validator to report errors to.
-         */
-        public static void produceError(String name, String description,
-                LFValidator v) {
-            v.getTargetPropertyErrors().add("Target property '" + name
-                    + "' is required to be " + description + ".");
-        }
-    }
+    public void check(Element e, String name, LFValidator v);
 
     /**
-     * Primitive types for target properties, each with a description used in
-     * error messages and predicate used for validating values.
+     * Helper function to produce an error during type checking.
      *
-     * @author Marten Lohstroh
+     * @param name The description of the target property.
+     * @param description The description of the type.
+     * @param v A reference to the validator to report errors to.
      */
-    public enum PrimitiveType implements TargetPropertyType {
-        BOOLEAN("'true' or 'false'",
-                v -> ASTUtils.elementToSingleString(v).equalsIgnoreCase("true")
-                        || ASTUtils.elementToSingleString(v).equalsIgnoreCase("false")),
-        INTEGER("an integer", v -> {
-            try {
-                Integer.parseInt(ASTUtils.elementToSingleString(v));
-            } catch (NumberFormatException e) {
-                return false;
-            }
-            return true;
+    public static void produceError(String name, String description, LFValidator v) {
+      v.getTargetPropertyErrors()
+          .add("Target property '" + name + "' is required to be " + description + ".");
+    }
+  }
+
+  /**
+   * Primitive types for target properties, each with a description used in error messages and
+   * predicate used for validating values.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum PrimitiveType implements TargetPropertyType {
+    BOOLEAN(
+        "'true' or 'false'",
+        v ->
+            ASTUtils.elementToSingleString(v).equalsIgnoreCase("true")
+                || ASTUtils.elementToSingleString(v).equalsIgnoreCase("false")),
+    INTEGER(
+        "an integer",
+        v -> {
+          try {
+            Integer.parseInt(ASTUtils.elementToSingleString(v));
+          } catch (NumberFormatException e) {
+            return false;
+          }
+          return true;
         }),
-        NON_NEGATIVE_INTEGER("a non-negative integer", v -> {
-            try {
-                int result = Integer.parseInt(ASTUtils.elementToSingleString(v));
-                if (result < 0)
-                    return false;
-            } catch (NumberFormatException e) {
-                return false;
-            }
-            return true;
+    NON_NEGATIVE_INTEGER(
+        "a non-negative integer",
+        v -> {
+          try {
+            int result = Integer.parseInt(ASTUtils.elementToSingleString(v));
+            if (result < 0) return false;
+          } catch (NumberFormatException e) {
+            return false;
+          }
+          return true;
         }),
-        TIME_VALUE("a time value with units", v ->
-            v.getKeyvalue() == null && v.getArray() == null
-                && v.getLiteral() == null && v.getId() == null
+    TIME_VALUE(
+        "a time value with units",
+        v ->
+            v.getKeyvalue() == null
+                && v.getArray() == null
+                && v.getLiteral() == null
+                && v.getId() == null
                 && (v.getTime() == 0 || v.getUnit() != null)),
-        STRING("a string", v -> v.getLiteral() != null && !isCharLiteral(v.getLiteral()) || v.getId() != null),
-        FILE("a path to a file", STRING.validator);
-
-        /**
-         * A description of this type, featured in error messages.
-         */
-        private final String description;
-
-        /**
-         * A predicate for determining whether a given Element conforms to this
-         * type.
-         */
-        public final Predicate<Element> validator;
-
-        /**
-         * Private constructor to create a new primitive type.
-         * @param description A textual description of the type that should
-         * start with "a/an".
-         * @param validator A predicate that returns true if a given Element
-         * conforms to this type.
-         */
-        private PrimitiveType(String description,
-                Predicate<Element> validator) {
-            this.description = description;
-            this.validator = validator;
-        }
+    STRING(
+        "a string",
+        v -> v.getLiteral() != null && !isCharLiteral(v.getLiteral()) || v.getId() != null),
+    FILE("a path to a file", STRING.validator);
 
-        /**
-         * Return true if the the given Element is a valid instance of this type.
-         */
-        public boolean validate(Element e) {
-            return this.validator.test(e);
-        }
+    /** A description of this type, featured in error messages. */
+    private final String description;
 
-        /**
-         * Check (recursively) the given Element against its associated type(s)
-         * and add found problems to the given list of errors.
-         *
-         * @param e      The element to type check.
-         * @param name   The name of the target property.
-         * @param v      The LFValidator to append errors to.
-         */
-        public void check(Element e, String name, LFValidator v) {
-            if (!this.validate(e)) {
-                TargetPropertyType.produceError(name, this.description, v);
-            }
-            // If this is a file, perform an additional check to make sure
-            // the file actually exists.
-            // FIXME: premature because we first need a mechanism for looking up files!
-            // Looking in the same directory is too restrictive. Disabling this check for now.
-            /*
-            if (this == FILE) {
-                String file = ASTUtils.toSingleString(e);
-
-                if (!FileConfig.fileExists(file, FileConfig.toPath(e.eResource().getURI()).toFile().getParent())) {
-                    v.targetPropertyWarnings
-                            .add("Could not find file: '" + file + "'.");
-                }
-            }
-            */
-        }
-
-        /**
-         * Return a textual description of this type.
-         */
-        @Override
-        public String toString() {
-            return this.description;
-        }
-
-
-        private static boolean isCharLiteral(String s) {
-            return s.length() > 2
-                && '\'' == s.charAt(0)
-                && '\'' == s.charAt(s.length() - 1);
-        }
-    }
+    /** A predicate for determining whether a given Element conforms to this type. */
+    public final Predicate<Element> validator;
 
     /**
-     * Clock synchronization options.
-     * @author Marten Lohstroh
+     * Private constructor to create a new primitive type.
+     *
+     * @param description A textual description of the type that should start with "a/an".
+     * @param validator A predicate that returns true if a given Element conforms to this type.
      */
-    public enum ClockSyncOption implements DictionaryElement {
-        ATTENUATION("attenuation", PrimitiveType.NON_NEGATIVE_INTEGER),
-        LOCAL_FEDERATES_ON("local-federates-on", PrimitiveType.BOOLEAN),
-        PERIOD("period", PrimitiveType.TIME_VALUE),
-        TEST_OFFSET("test-offset", PrimitiveType.TIME_VALUE),
-        TRIALS("trials", PrimitiveType.NON_NEGATIVE_INTEGER),
-        COLLECT_STATS("collect-stats", PrimitiveType.BOOLEAN);
-
-        public final PrimitiveType type;
-
-        private final String description;
-
-        private ClockSyncOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
-
-
-        /**
-         * Return the description of this dictionary element.
-         */
-        @Override
-        public String toString() {
-            return this.description;
-        }
+    private PrimitiveType(String description, Predicate<Element> validator) {
+      this.description = description;
+      this.validator = validator;
+    }
 
-        /**
-         * Return the type associated with this dictionary element.
-         */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
+    /** Return true if the the given Element is a valid instance of this type. */
+    public boolean validate(Element e) {
+      return this.validator.test(e);
     }
 
     /**
-     * Docker options.
-     * @author Edward A. Lee
-     */
-    public enum DockerOption implements DictionaryElement {
-        FROM("FROM", PrimitiveType.STRING);
-
-        public final PrimitiveType type;
-
-        private final String description;
-
-        private DockerOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
-
-        /**
-         * Return the description of this dictionary element.
-         */
-        @Override
-        public String toString() {
-            return this.description;
-        }
+     * Check (recursively) the given Element against its associated type(s) and add found problems
+     * to the given list of errors.
+     *
+     * @param e The element to type check.
+     * @param name The name of the target property.
+     * @param v The LFValidator to append errors to.
+     */
+    public void check(Element e, String name, LFValidator v) {
+      if (!this.validate(e)) {
+        TargetPropertyType.produceError(name, this.description, v);
+      }
+      // If this is a file, perform an additional check to make sure
+      // the file actually exists.
+      // FIXME: premature because we first need a mechanism for looking up files!
+      // Looking in the same directory is too restrictive. Disabling this check for now.
+      /*
+      if (this == FILE) {
+          String file = ASTUtils.toSingleString(e);
+
+          if (!FileConfig.fileExists(file, FileConfig.toPath(e.eResource().getURI()).toFile().getParent())) {
+              v.targetPropertyWarnings
+                      .add("Could not find file: '" + file + "'.");
+          }
+      }
+      */
+    }
 
-        /**
-         * Return the type associated with this dictionary element.
-         */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
+    /** Return a textual description of this type. */
+    @Override
+    public String toString() {
+      return this.description;
     }
 
+    private static boolean isCharLiteral(String s) {
+      return s.length() > 2 && '\'' == s.charAt(0) && '\'' == s.charAt(s.length() - 1);
+    }
+  }
+
+  /**
+   * Clock synchronization options.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum ClockSyncOption implements DictionaryElement {
+    ATTENUATION("attenuation", PrimitiveType.NON_NEGATIVE_INTEGER),
+    LOCAL_FEDERATES_ON("local-federates-on", PrimitiveType.BOOLEAN),
+    PERIOD("period", PrimitiveType.TIME_VALUE),
+    TEST_OFFSET("test-offset", PrimitiveType.TIME_VALUE),
+    TRIALS("trials", PrimitiveType.NON_NEGATIVE_INTEGER),
+    COLLECT_STATS("collect-stats", PrimitiveType.BOOLEAN);
+
+    public final PrimitiveType type;
+
+    private final String description;
+
+    private ClockSyncOption(String alias, PrimitiveType type) {
+      this.description = alias;
+      this.type = type;
+    }
 
-    /**
-     * Platform options.
-     * @author Anirudh Rengarajan
-     */
-    public enum PlatformOption implements DictionaryElement {
-        NAME("name", PrimitiveType.STRING),
-        BAUDRATE("baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER),
-        BOARD("board", PrimitiveType.STRING),
-        FLASH("flash", PrimitiveType.BOOLEAN),
-        PORT("port", PrimitiveType.STRING);
+    /** Return the description of this dictionary element. */
+    @Override
+    public String toString() {
+      return this.description;
+    }
 
-        public final PrimitiveType type;
+    /** Return the type associated with this dictionary element. */
+    public TargetPropertyType getType() {
+      return this.type;
+    }
+  }
 
-        private final String description;
+  /**
+   * Docker options.
+   *
+   * @author Edward A. Lee
+   */
+  public enum DockerOption implements DictionaryElement {
+    FROM("FROM", PrimitiveType.STRING);
 
-        private PlatformOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
+    public final PrimitiveType type;
 
+    private final String description;
 
-        /**
-         * Return the description of this dictionary element.
-         */
-        @Override
-        public String toString() {
-            return this.description;
-        }
+    private DockerOption(String alias, PrimitiveType type) {
+      this.description = alias;
+      this.type = type;
+    }
 
-        /**
-         * Return the type associated with this dictionary element.
-         */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
+    /** Return the description of this dictionary element. */
+    @Override
+    public String toString() {
+      return this.description;
     }
 
-    /**
-     * Coordination options.
-     * @author Edward A. Lee
-     */
-    public enum CoordinationOption implements DictionaryElement {
-        ADVANCE_MESSAGE_INTERVAL("advance-message-interval", PrimitiveType.TIME_VALUE);
+    /** Return the type associated with this dictionary element. */
+    public TargetPropertyType getType() {
+      return this.type;
+    }
+  }
+
+  /**
+   * Platform options.
+   *
+   * @author Anirudh Rengarajan
+   */
+  public enum PlatformOption implements DictionaryElement {
+    NAME("name", PrimitiveType.STRING),
+    BAUDRATE("baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER),
+    BOARD("board", PrimitiveType.STRING),
+    FLASH("flash", PrimitiveType.BOOLEAN),
+    PORT("port", PrimitiveType.STRING);
+
+    public final PrimitiveType type;
+
+    private final String description;
+
+    private PlatformOption(String alias, PrimitiveType type) {
+      this.description = alias;
+      this.type = type;
+    }
 
-        public final PrimitiveType type;
+    /** Return the description of this dictionary element. */
+    @Override
+    public String toString() {
+      return this.description;
+    }
 
-        private final String description;
+    /** Return the type associated with this dictionary element. */
+    public TargetPropertyType getType() {
+      return this.type;
+    }
+  }
 
-        private CoordinationOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
+  /**
+   * Coordination options.
+   *
+   * @author Edward A. Lee
+   */
+  public enum CoordinationOption implements DictionaryElement {
+    ADVANCE_MESSAGE_INTERVAL("advance-message-interval", PrimitiveType.TIME_VALUE);
 
+    public final PrimitiveType type;
 
-        /**
-         * Return the description of this dictionary element.
-         */
-        @Override
-        public String toString() {
-            return this.description;
-        }
+    private final String description;
 
-        /**
-         * Return the type associated with this dictionary element.
-         */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
+    private CoordinationOption(String alias, PrimitiveType type) {
+      this.description = alias;
+      this.type = type;
     }
 
-    /**
-     * Log levels in descending order of severity.
-     * @author Marten Lohstroh
-     */
-    public enum LogLevel {
-        ERROR, WARN, INFO, LOG, DEBUG;
-
-        /**
-         * Return the name in lower case.
-         */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
+    /** Return the description of this dictionary element. */
+    @Override
+    public String toString() {
+      return this.description;
     }
 
-    /**
-     * Enumeration of supported platforms
-     */
-    public enum Platform {
-        AUTO,
-        ARDUINO,
-        NRF52("Nrf52"),
-        LINUX("Linux"),
-        MAC("Darwin"),
-        ZEPHYR("Zephyr"),
-        WINDOWS("Windows");
-
-        String cMakeName;
-        Platform() {
-            this.cMakeName = this.toString();
-        }
-        Platform(String cMakeName) {
-            this.cMakeName = cMakeName;
-        }
+    /** Return the type associated with this dictionary element. */
+    public TargetPropertyType getType() {
+      return this.type;
+    }
+  }
+
+  /**
+   * Log levels in descending order of severity.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum LogLevel {
+    ERROR,
+    WARN,
+    INFO,
+    LOG,
+    DEBUG;
+
+    /** Return the name in lower case. */
+    @Override
+    public String toString() {
+      return this.name().toLowerCase();
+    }
+  }
+
+  /** Enumeration of supported platforms */
+  public enum Platform {
+    AUTO,
+    ARDUINO,
+    NRF52("Nrf52"),
+    LINUX("Linux"),
+    MAC("Darwin"),
+    ZEPHYR("Zephyr"),
+    WINDOWS("Windows");
+
+    String cMakeName;
+
+    Platform() {
+      this.cMakeName = this.toString();
+    }
 
-        /**
-         * Return the name in lower case.
-         */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
+    Platform(String cMakeName) {
+      this.cMakeName = cMakeName;
+    }
 
-        /**
-         * Get the CMake name for the platform.
-         */
-        public String getcMakeName() {
-            return this.cMakeName;
-        }
+    /** Return the name in lower case. */
+    @Override
+    public String toString() {
+      return this.name().toLowerCase();
     }
 
-    /**
-     * Supported schedulers.
-     * @author Soroush Bateni
-     */
-    public enum SchedulerOption {
-        NP(false),         // Non-preemptive
-        ADAPTIVE(false, List.of(
+    /** Get the CMake name for the platform. */
+    public String getcMakeName() {
+      return this.cMakeName;
+    }
+  }
+
+  /**
+   * Supported schedulers.
+   *
+   * @author Soroush Bateni
+   */
+  public enum SchedulerOption {
+    NP(false), // Non-preemptive
+    ADAPTIVE(
+        false,
+        List.of(
             Path.of("scheduler_adaptive.c"),
             Path.of("worker_assignments.h"),
             Path.of("worker_states.h"),
-            Path.of("data_collection.h")
-        )),
-        GEDF_NP(true),    // Global EDF non-preemptive
-        GEDF_NP_CI(true); // Global EDF non-preemptive with chain ID
-        // PEDF_NP(true);    // Partitioned EDF non-preemptive (FIXME: To be re-added in a future PR)
-
-        /**
-         * Indicate whether or not the scheduler prioritizes reactions by deadline.
-         */
-        private final boolean prioritizesDeadline;
-
-        /** Relative paths to files required by this scheduler. */
-        private final List<Path> relativePaths;
-
-        SchedulerOption(boolean prioritizesDeadline) {
-            this(prioritizesDeadline, null);
-        }
+            Path.of("data_collection.h"))),
+    GEDF_NP(true), // Global EDF non-preemptive
+    GEDF_NP_CI(true); // Global EDF non-preemptive with chain ID
+    // PEDF_NP(true);    // Partitioned EDF non-preemptive (FIXME: To be re-added in a future PR)
 
-        SchedulerOption(boolean prioritizesDeadline, List<Path> relativePaths) {
-            this.prioritizesDeadline = prioritizesDeadline;
-            this.relativePaths = relativePaths;
-        }
+    /** Indicate whether or not the scheduler prioritizes reactions by deadline. */
+    private final boolean prioritizesDeadline;
 
-        /**
-         * Return true if the scheduler prioritizes reactions by deadline.
-         */
-        public boolean prioritizesDeadline() {
-            return this.prioritizesDeadline;
-        }
+    /** Relative paths to files required by this scheduler. */
+    private final List<Path> relativePaths;
 
-        public List<Path> getRelativePaths() {
-            return relativePaths != null ? ImmutableList.copyOf(relativePaths) :
-                   List.of(Path.of("scheduler_" + this + ".c"));
-        }
+    SchedulerOption(boolean prioritizesDeadline) {
+      this(prioritizesDeadline, null);
+    }
 
-        public static SchedulerOption getDefault() {
-            return NP;
-        }
+    SchedulerOption(boolean prioritizesDeadline, List<Path> relativePaths) {
+      this.prioritizesDeadline = prioritizesDeadline;
+      this.relativePaths = relativePaths;
     }
 
-    /**
-     * Tracing options.
-     * @author Edward A. Lee
-     */
-    public enum TracingOption implements DictionaryElement {
-        TRACE_FILE_NAME("trace-file-name", PrimitiveType.STRING);
+    /** Return true if the scheduler prioritizes reactions by deadline. */
+    public boolean prioritizesDeadline() {
+      return this.prioritizesDeadline;
+    }
 
-        public final PrimitiveType type;
+    public List<Path> getRelativePaths() {
+      return relativePaths != null
+          ? ImmutableList.copyOf(relativePaths)
+          : List.of(Path.of("scheduler_" + this + ".c"));
+    }
 
-        private final String description;
+    public static SchedulerOption getDefault() {
+      return NP;
+    }
+  }
 
-        private TracingOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
+  /**
+   * Tracing options.
+   *
+   * @author Edward A. Lee
+   */
+  public enum TracingOption implements DictionaryElement {
+    TRACE_FILE_NAME("trace-file-name", PrimitiveType.STRING);
 
-        /**
-         * Return the description of this dictionary element.
-         */
-        @Override
-        public String toString() {
-            return this.description;
-        }
+    public final PrimitiveType type;
 
-        /**
-         * Return the type associated with this dictionary element.
-         */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
+    private final String description;
+
+    private TracingOption(String alias, PrimitiveType type) {
+      this.description = alias;
+      this.type = type;
     }
 
+    /** Return the description of this dictionary element. */
+    @Override
+    public String toString() {
+      return this.description;
+    }
+
+    /** Return the type associated with this dictionary element. */
+    public TargetPropertyType getType() {
+      return this.type;
+    }
+  }
 }
diff --git a/org.lflang/src/org/lflang/TimeUnit.java b/org.lflang/src/org/lflang/TimeUnit.java
index 00c6314e51..a39bd505e8 100644
--- a/org.lflang/src/org/lflang/TimeUnit.java
+++ b/org.lflang/src/org/lflang/TimeUnit.java
@@ -38,82 +38,73 @@
  * @author Clément Fournier, TU Dresden, INSA Rennes
  */
 public enum TimeUnit {
-    /** Nanoseconds. */
-    NANO("nsec", "ns", "nsecs"),
-    /** Microseconds. */
-    MICRO("usec", "us", "usecs"),
-    /** Milliseconds. */
-    MILLI("msec", "ms", "msecs"),
-    /** Seconds. */
-    SECOND("sec", "s", "secs", "second", "seconds"),
-    /** Minute. */ // NOTE: Do not use MIN as the first entry. Common macro for minimum.
-    MINUTE("minute", "min", "mins", "minutes"),
-    /** Hour. */
-    HOUR("hour", "h", "hours"),
-    /** Day. */
-    DAY("day", "d", "days"),
-    WEEK("week", "weeks"),
-    ;
+  /** Nanoseconds. */
+  NANO("nsec", "ns", "nsecs"),
+  /** Microseconds. */
+  MICRO("usec", "us", "usecs"),
+  /** Milliseconds. */
+  MILLI("msec", "ms", "msecs"),
+  /** Seconds. */
+  SECOND("sec", "s", "secs", "second", "seconds"),
+  /** Minute. */
+  // NOTE: Do not use MIN as the first entry. Common macro for minimum.
+  MINUTE("minute", "min", "mins", "minutes"),
+  /** Hour. */
+  HOUR("hour", "h", "hours"),
+  /** Day. */
+  DAY("day", "d", "days"),
+  WEEK("week", "weeks"),
+  ;
 
-    private final Set<String> allNames;
-    private final String canonicalName;
+  private final Set<String> allNames;
+  private final String canonicalName;
 
-    TimeUnit(String canonicalName, String... aliases) {
-        this.canonicalName = canonicalName;
-        this.allNames = immutableSetOf(canonicalName, aliases);
-    }
+  TimeUnit(String canonicalName, String... aliases) {
+    this.canonicalName = canonicalName;
+    this.allNames = immutableSetOf(canonicalName, aliases);
+  }
 
+  /** Returns the name that is preferred when displaying this unit. */
+  public String getCanonicalName() {
+    return canonicalName;
+  }
 
-    /**
-     * Returns the name that is preferred when displaying this unit.
-     */
-    public String getCanonicalName() {
-        return canonicalName;
-    }
+  /** Returns true if the given name is one of the aliases of this unit. */
+  public boolean hasAlias(String name) {
+    return allNames.contains(name);
+  }
 
-    /** Returns true if the given name is one of the aliases of this unit. */
-    public boolean hasAlias(String name) {
-        return allNames.contains(name);
+  /**
+   * Returns the constant corresponding to the given name. The comparison is case-sensitive.
+   *
+   * @return Null if the parameter is null, otherwise a non-null constant
+   * @throws IllegalArgumentException If the name doesn't correspond to any constant
+   */
+  public static TimeUnit fromName(String name) {
+    if (name == null) {
+      return null;
     }
+    return Arrays.stream(values())
+        .filter(it -> it.hasAlias(name))
+        .findFirst()
+        .orElseThrow(() -> new IllegalArgumentException("invalid name '" + name + "'"));
+  }
 
-
-    /**
-     * Returns the constant corresponding to the given name.
-     * The comparison is case-sensitive.
-     *
-     * @return Null if the parameter is null, otherwise a non-null constant
-     * @throws IllegalArgumentException If the name doesn't correspond to any constant
-     */
-    public static TimeUnit fromName(String name) {
-        if (name == null) {
-            return null;
-        }
-        return Arrays.stream(values())
-                     .filter(it -> it.hasAlias(name))
-                     .findFirst()
-                     .orElseThrow(() -> new IllegalArgumentException("invalid name '" + name + "'"));
+  /** Returns true if the parameter is null, or it is the alias of a valid time unit. */
+  public static boolean isValidUnit(String name) {
+    if (name == null) {
+      return false;
     }
+    return Arrays.stream(values()).anyMatch(it -> it.hasAlias(name));
+  }
 
-    /**
-     * Returns true if the parameter is null, or it is the
-     * alias of a valid time unit.
-     */
-    public static boolean isValidUnit(String name) {
-        if (name == null) {
-            return false;
-        }
-        return Arrays.stream(values()).anyMatch(it -> it.hasAlias(name));
-    }
+  /** Returns a list of all possible aliases for time values. */
+  public static List<String> list() {
+    return Arrays.stream(values()).flatMap(it -> it.allNames.stream()).collect(Collectors.toList());
+  }
 
-    /**
-     * Returns a list of all possible aliases for time values.
-     */
-    public static List<String> list() {
-        return Arrays.stream(values()).flatMap(it -> it.allNames.stream()).collect(Collectors.toList());
-    }
-
-    @Override
-    public String toString() {
-        return this.canonicalName;
-    }
+  @Override
+  public String toString() {
+    return this.canonicalName;
+  }
 }
diff --git a/org.lflang/src/org/lflang/TimeValue.java b/org.lflang/src/org/lflang/TimeValue.java
index f008a0ae4b..f0bb94820c 100644
--- a/org.lflang/src/org/lflang/TimeValue.java
+++ b/org.lflang/src/org/lflang/TimeValue.java
@@ -1,27 +1,27 @@
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang;
 
@@ -33,172 +33,152 @@
  */
 public final class TimeValue implements Comparable<TimeValue> {
 
-    /**
-     * The maximum value of this type. This is approximately equal to 292 years.
-     */
-    public static final TimeValue MAX_VALUE = new TimeValue(Long.MAX_VALUE, TimeUnit.NANO);
-    /**
-     * A time value equal to zero.
-     */
-    public static final TimeValue ZERO = new TimeValue(0, null);
-
-
-    /**
-     * Primitive numerical representation of this time value,
-     * to be interpreted in terms the associated time unit.
-     */
-    public final long time;
-
-    /**
-     * Units associated with this time value. May be null.
-     */
-    public final TimeUnit unit;
-
-    /**
-     * Maximum size of a deadline in primitive representation.
-     * NOTE: if we were to use an unsigned data type this would be
-     * 0xFFFFFFFFFFFF
-     */
-    public static final long MAX_LONG_DEADLINE = Long.decode("0x7FFFFFFFFFFF");
-
-    /**
-     * Create a new time value.
-     *
-     * @throws IllegalArgumentException If time is non-zero and the unit is null
-     */
-    public TimeValue(long time, TimeUnit unit) {
-        if (unit == null && time != 0) {
-            throw new IllegalArgumentException("Non-zero time values must have a unit");
-        }
-        this.time = time;
-        this.unit = unit;
-    }
-
-    @Override
-    public boolean equals(Object t1) {
-        if (t1 instanceof TimeValue) {
-            return this.compareTo((TimeValue) t1) == 0;
-        }
-        return false;
-    }
-    
-    public static int compare(TimeValue t1, TimeValue t2) {
-        if (t1.isEarlierThan(t2)) {
-            return -1;
-        }
-        if (t2.isEarlierThan(t1)) {
-            return 1;
-        }
-        return 0;
-    }
-    
-    private static long makeNanosecs(long time, TimeUnit unit) {
-        if (unit == null) {
-            return time; // == 0, see constructor.
-        }
-        switch (unit) {
-        case NANO:
-            return time;
-        case MICRO:
-            return time * 1000;
-        case MILLI:
-            return time * 1_000_000;
-        case SECOND:
-            return time * 1_000_000_000;
-        case MINUTE:
-            return time * 60_000_000_000L;
-        case HOUR:
-            return time * 3_600_000_000_000L;
-        case DAY:
-            return time * 86_400_000_000_000L;
-        case WEEK:
-            return time * 604_800_016_558_522L;
-        }
-        throw new AssertionError("unreachable");
-    }
-
-    /**
-     * Returns whether this time value is earlier than another.
-     */
-    public boolean isEarlierThan(TimeValue other) {
-        return this.compareTo(other) < 0;
+  /** The maximum value of this type. This is approximately equal to 292 years. */
+  public static final TimeValue MAX_VALUE = new TimeValue(Long.MAX_VALUE, TimeUnit.NANO);
+  /** A time value equal to zero. */
+  public static final TimeValue ZERO = new TimeValue(0, null);
+
+  /**
+   * Primitive numerical representation of this time value, to be interpreted in terms the
+   * associated time unit.
+   */
+  public final long time;
+
+  /** Units associated with this time value. May be null. */
+  public final TimeUnit unit;
+
+  /**
+   * Maximum size of a deadline in primitive representation. NOTE: if we were to use an unsigned
+   * data type this would be 0xFFFFFFFFFFFF
+   */
+  public static final long MAX_LONG_DEADLINE = Long.decode("0x7FFFFFFFFFFF");
+
+  /**
+   * Create a new time value.
+   *
+   * @throws IllegalArgumentException If time is non-zero and the unit is null
+   */
+  public TimeValue(long time, TimeUnit unit) {
+    if (unit == null && time != 0) {
+      throw new IllegalArgumentException("Non-zero time values must have a unit");
     }
-
-    @Override
-    public int compareTo(TimeValue o) {
-        return Long.compare(this.toNanoSeconds(), o.toNanoSeconds());
+    this.time = time;
+    this.unit = unit;
+  }
+
+  @Override
+  public boolean equals(Object t1) {
+    if (t1 instanceof TimeValue) {
+      return this.compareTo((TimeValue) t1) == 0;
     }
+    return false;
+  }
 
-    /**
-     * Return the magnitude of this value, as expressed in the
-     * {@linkplain #getUnit() unit} of this value.
-     */
-    public long getMagnitude() {
-        return time;
+  public static int compare(TimeValue t1, TimeValue t2) {
+    if (t1.isEarlierThan(t2)) {
+      return -1;
     }
-
-    /**
-     * Units associated with this time value. May be null,
-     * but only if the magnitude is zero.
-     */
-    public TimeUnit getUnit() {
-        return unit;
+    if (t2.isEarlierThan(t1)) {
+      return 1;
     }
+    return 0;
+  }
 
-    /**
-     * Get this time value in number of nanoseconds.
-     */
-    public long toNanoSeconds() {
-        return makeNanosecs(time, unit);
+  private static long makeNanosecs(long time, TimeUnit unit) {
+    if (unit == null) {
+      return time; // == 0, see constructor.
     }
-
-    /**
-     * Return a string representation of this time value.
-     */
-    public String toString() {
-        return unit != null ? time + " " + unit.getCanonicalName()
-                                     : Long.toString(time);
+    switch (unit) {
+      case NANO:
+        return time;
+      case MICRO:
+        return time * 1000;
+      case MILLI:
+        return time * 1_000_000;
+      case SECOND:
+        return time * 1_000_000_000;
+      case MINUTE:
+        return time * 60_000_000_000L;
+      case HOUR:
+        return time * 3_600_000_000_000L;
+      case DAY:
+        return time * 86_400_000_000_000L;
+      case WEEK:
+        return time * 604_800_016_558_522L;
     }
-
-    /** Return the latest of both values. */
-    public static TimeValue max(TimeValue t1, TimeValue t2) {
-        return t1.isEarlierThan(t2) ? t2 : t1;
+    throw new AssertionError("unreachable");
+  }
+
+  /** Returns whether this time value is earlier than another. */
+  public boolean isEarlierThan(TimeValue other) {
+    return this.compareTo(other) < 0;
+  }
+
+  @Override
+  public int compareTo(TimeValue o) {
+    return Long.compare(this.toNanoSeconds(), o.toNanoSeconds());
+  }
+
+  /**
+   * Return the magnitude of this value, as expressed in the {@linkplain #getUnit() unit} of this
+   * value.
+   */
+  public long getMagnitude() {
+    return time;
+  }
+
+  /** Units associated with this time value. May be null, but only if the magnitude is zero. */
+  public TimeUnit getUnit() {
+    return unit;
+  }
+
+  /** Get this time value in number of nanoseconds. */
+  public long toNanoSeconds() {
+    return makeNanosecs(time, unit);
+  }
+
+  /** Return a string representation of this time value. */
+  public String toString() {
+    return unit != null ? time + " " + unit.getCanonicalName() : Long.toString(time);
+  }
+
+  /** Return the latest of both values. */
+  public static TimeValue max(TimeValue t1, TimeValue t2) {
+    return t1.isEarlierThan(t2) ? t2 : t1;
+  }
+
+  /** Return the earliest of both values. */
+  public static TimeValue min(TimeValue t1, TimeValue t2) {
+    return t1.isEarlierThan(t2) ? t1 : t2;
+  }
+
+  /**
+   * Return the sum of this duration and the one represented by b.
+   *
+   * <p>The unit of the returned TimeValue will be the minimum of the units of both operands except
+   * if only one of the units is TimeUnit.NONE. In that case, the unit of the other input is used.
+   *
+   * @param b The right operand
+   * @return A new TimeValue (the current value will not be affected)
+   */
+  public TimeValue add(TimeValue b) {
+    // Figure out the actual sum
+    final long sumOfNumbers;
+    try {
+      sumOfNumbers = Math.addExact(this.toNanoSeconds(), b.toNanoSeconds());
+    } catch (ArithmeticException overflow) {
+      return MAX_VALUE;
     }
 
-    /** Return the earliest of both values. */
-    public static TimeValue min(TimeValue t1, TimeValue t2) {
-        return t1.isEarlierThan(t2) ? t1 : t2;
+    if (this.unit == null || b.unit == null) {
+      // A time value with no unit is necessarily zero. So
+      // if this is null, (this + b) == b, if b is none, (this+b) == this.
+      return b.unit == null ? this : b;
     }
-    
-    /**
-     * Return the sum of this duration and the one represented by b.
-     * <p>
-     * The unit of the returned TimeValue will be the minimum
-     * of the units of both operands except if only one of the units
-     * is TimeUnit.NONE. In that case, the unit of the other input is used.
-     *
-     * @param b The right operand
-     * @return A new TimeValue (the current value will not be affected)
-     */
-    public TimeValue add(TimeValue b) {
-        // Figure out the actual sum
-        final long sumOfNumbers;
-        try {
-            sumOfNumbers = Math.addExact(this.toNanoSeconds(), b.toNanoSeconds());
-        } catch (ArithmeticException overflow) {
-            return MAX_VALUE;
-        }
-
-        if (this.unit == null || b.unit == null) {
-            // A time value with no unit is necessarily zero. So
-            // if this is null, (this + b) == b, if b is none, (this+b) == this.
-            return b.unit == null ? this : b;
-        }
-        boolean isThisUnitSmallerThanBUnit = this.unit.compareTo(b.unit) <= 0;
-        TimeUnit smallestUnit = isThisUnitSmallerThanBUnit ? this.unit : b.unit;
-        // Find the appropriate divider to bring sumOfNumbers from nanoseconds to returnUnit
-        var unitDivider = makeNanosecs(1, smallestUnit);
-        return new TimeValue(sumOfNumbers / unitDivider, smallestUnit);
-    }
-
+    boolean isThisUnitSmallerThanBUnit = this.unit.compareTo(b.unit) <= 0;
+    TimeUnit smallestUnit = isThisUnitSmallerThanBUnit ? this.unit : b.unit;
+    // Find the appropriate divider to bring sumOfNumbers from nanoseconds to returnUnit
+    var unitDivider = makeNanosecs(1, smallestUnit);
+    return new TimeValue(sumOfNumbers / unitDivider, smallestUnit);
+  }
 }
diff --git a/org.lflang/src/org/lflang/ast/ASTUtils.java b/org.lflang/src/org/lflang/ast/ASTUtils.java
index d0bf2bad1a..91ff7ac69a 100644
--- a/org.lflang/src/org/lflang/ast/ASTUtils.java
+++ b/org.lflang/src/org/lflang/ast/ASTUtils.java
@@ -25,8 +25,9 @@
 
 package org.lflang.ast;
 
-import static org.lflang.AttributeUtils.isEnclave;
-
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Iterators;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -41,7 +42,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
-
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -56,7 +56,6 @@
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
-
 import org.lflang.InferredType;
 import org.lflang.Target;
 import org.lflang.TimeUnit;
@@ -102,1794 +101,1768 @@
 import org.lflang.lf.WidthTerm;
 import org.lflang.util.StringUtil;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Iterators;
-
 /**
  * A helper class for modifying and analyzing the AST.
+ *
  * @author Marten Lohstroh
  * @author Edward A. Lee
  * @author Christian Menard
  */
 public class ASTUtils {
 
-    /**
-     * The Lingua Franca factory for creating new AST nodes.
-     */
-    public static final LfFactory factory = LfFactory.eINSTANCE;
-
-    /**
-     * The Lingua Franca feature package.
-     */
-    public static final LfPackage featurePackage = LfPackage.eINSTANCE;
-
-    /* Match an abbreviated form of a float literal. */
-    private static final Pattern ABBREVIATED_FLOAT = Pattern.compile("[+\\-]?\\.\\d+[\\deE+\\-]*");
-
-    /**
-     * A mapping from Reactor features to corresponding Mode features for collecting contained elements.
-     */
-    private static final Map<EStructuralFeature, EStructuralFeature> reactorModeFeatureMap = Map.of(
-            featurePackage.getReactor_Actions(),        featurePackage.getMode_Actions(),
-            featurePackage.getReactor_Connections(),    featurePackage.getMode_Connections(),
-            featurePackage.getReactor_Instantiations(), featurePackage.getMode_Instantiations(),
-            featurePackage.getReactor_Reactions(),      featurePackage.getMode_Reactions(),
-            featurePackage.getReactor_StateVars(),      featurePackage.getMode_StateVars(),
-            featurePackage.getReactor_Timers(),         featurePackage.getMode_Timers()
-            );
-
-
-    /**
-     * Get all reactors defined in the given resource.
-     * @param resource the resource to extract reactors from
-     * @return An iterable over all reactors found in the resource
-     */
-    public static List<Reactor> getAllReactors(Resource resource) {
-        return StreamSupport.stream(IteratorExtensions.toIterable(resource.getAllContents()).spliterator(), false)
-                     .filter(Reactor.class::isInstance)
-                     .map(Reactor.class::cast)
-                     .collect(Collectors.toList());
-    }
-
-    /**
-     * Find connections in the given resource that would be conflicting writes if they were not located in mutually
-     * exclusive modes.
-     *
-     * @param resource The AST.
-     * @return a list of connections being able to be transformed
-     */
-    public static Collection<Connection> findConflictingConnectionsInModalReactors(Resource resource) {
-        var transform = new HashSet<Connection>();
-
-        for (Reactor reactor : getAllReactors(resource)) {
-            if (!reactor.getModes().isEmpty()) { // Only for modal reactors
-                var allWriters = HashMultimap.<Pair<Instantiation, Variable>, EObject>create();
-
-                // Collect destinations
-                for (var rea : allReactions(reactor)) {
-                    for (var eff : rea.getEffects()) {
-                        if (eff.getVariable() instanceof Port) {
-                            allWriters.put(Tuples.pair(eff.getContainer(), eff.getVariable()), rea);
-                        }
-                    }
-                }
-                for (var con : ASTUtils.<Connection>collectElements(reactor, featurePackage.getReactor_Connections(), false, true)) {
-                    for (var port : con.getRightPorts()) {
-                        allWriters.put(Tuples.pair(port.getContainer(), port.getVariable()), con);
-                    }
-                }
-
-                // Handle conflicting writers
-                for (var key : allWriters.keySet()) {
-                    var writers = allWriters.get(key);
-                    if (writers.size() > 1) { // has multiple sources
-                        var writerModes = HashMultimap.<Mode, EObject>create();
-                        // find modes
-                        for (var writer : writers) {
-                            if (writer.eContainer() instanceof Mode) {
-                                writerModes.put((Mode) writer.eContainer(), writer);
-                            } else {
-                                writerModes.put(null, writer);
-                            }
-                        }
-                        // Conflicting connection can only be handled if..
-                        if (!writerModes.containsKey(null) && // no writer is on root level (outside of modes) and...
-                            writerModes.keySet().stream().map(writerModes::get).allMatch(writersInMode -> // all writers in a mode are either...
-                                writersInMode.size() == 1 || // the only writer or...
-                                writersInMode.stream().allMatch(w -> w instanceof Reaction) // all are reactions and hence ordered
-                            )) {
-                            // Add connections to transform list
-                            writers.stream().filter(w -> w instanceof Connection).forEach(c -> transform.add((Connection) c));
-                        }
-                    }
-                }
+  /** The Lingua Franca factory for creating new AST nodes. */
+  public static final LfFactory factory = LfFactory.eINSTANCE;
+
+  /** The Lingua Franca feature package. */
+  public static final LfPackage featurePackage = LfPackage.eINSTANCE;
+
+  /* Match an abbreviated form of a float literal. */
+  private static final Pattern ABBREVIATED_FLOAT = Pattern.compile("[+\\-]?\\.\\d+[\\deE+\\-]*");
+
+  /**
+   * A mapping from Reactor features to corresponding Mode features for collecting contained
+   * elements.
+   */
+  private static final Map<EStructuralFeature, EStructuralFeature> reactorModeFeatureMap =
+      Map.of(
+          featurePackage.getReactor_Actions(), featurePackage.getMode_Actions(),
+          featurePackage.getReactor_Connections(), featurePackage.getMode_Connections(),
+          featurePackage.getReactor_Instantiations(), featurePackage.getMode_Instantiations(),
+          featurePackage.getReactor_Reactions(), featurePackage.getMode_Reactions(),
+          featurePackage.getReactor_StateVars(), featurePackage.getMode_StateVars(),
+          featurePackage.getReactor_Timers(), featurePackage.getMode_Timers());
+
+  /**
+   * Get all reactors defined in the given resource.
+   *
+   * @param resource the resource to extract reactors from
+   * @return An iterable over all reactors found in the resource
+   */
+  public static List<Reactor> getAllReactors(Resource resource) {
+    return StreamSupport.stream(
+            IteratorExtensions.toIterable(resource.getAllContents()).spliterator(), false)
+        .filter(Reactor.class::isInstance)
+        .map(Reactor.class::cast)
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Find connections in the given resource that would be conflicting writes if they were not
+   * located in mutually exclusive modes.
+   *
+   * @param resource The AST.
+   * @return a list of connections being able to be transformed
+   */
+  public static Collection<Connection> findConflictingConnectionsInModalReactors(
+      Resource resource) {
+    var transform = new HashSet<Connection>();
+
+    for (Reactor reactor : getAllReactors(resource)) {
+      if (!reactor.getModes().isEmpty()) { // Only for modal reactors
+        var allWriters = HashMultimap.<Pair<Instantiation, Variable>, EObject>create();
+
+        // Collect destinations
+        for (var rea : allReactions(reactor)) {
+          for (var eff : rea.getEffects()) {
+            if (eff.getVariable() instanceof Port) {
+              allWriters.put(Tuples.pair(eff.getContainer(), eff.getVariable()), rea);
             }
+          }
         }
-
-        return transform;
-    }
-
-    /**
-     * Return the enclosing reactor of an LF EObject in a reactor or mode.
-     * @param obj the LF model element
-     * @return the reactor or null
-     */
-    public static Reactor getEnclosingReactor(EObject obj) {
-        if (obj.eContainer() instanceof Reactor) {
-            return (Reactor) obj.eContainer();
-        } else if (obj.eContainer() instanceof Mode) {
-            return (Reactor) obj.eContainer().eContainer();
+        for (var con :
+            ASTUtils.<Connection>collectElements(
+                reactor, featurePackage.getReactor_Connections(), false, true)) {
+          for (var port : con.getRightPorts()) {
+            allWriters.put(Tuples.pair(port.getContainer(), port.getVariable()), con);
+          }
         }
-        return null;
-    }
 
-    /**
-     * Return the main reactor in the given resource if there is one, null otherwise.
-     */
-    public static Reactor findMainReactor(Resource resource) {
-        return IteratorExtensions.findFirst(
-                Iterators.filter(resource.getAllContents(), Reactor.class),
-                Reactor::isMain
-        );
-    }
-
-    /**
-     * Find the main reactor and change it to a federated reactor.
-     * Return true if the transformation was successful (or the given resource
-     * already had a federated reactor); return false otherwise.
-     */
-    public static boolean makeFederated(Resource resource) {
-        // Find the main reactor
-        Reactor r = findMainReactor(resource);
-        if (r == null) {
-            return false;
-        }
-        r.setMain(false);
-        r.setFederated(true);
-        return true;
-    }
-
-    /**
-     * Change the target name to 'newTargetName'.
-     * For example, change C to CCpp.
-     */
-    public static boolean changeTargetName(Resource resource, String newTargetName) {
-        targetDecl(resource).setName(newTargetName);
-        return true;
-    }
-
-    /**
-     * Return the target of the file in which the given node lives.
-     */
-    public static Target getTarget(EObject object) {
-        TargetDecl targetDecl = targetDecl(object.eResource());
-        return Target.fromDecl(targetDecl);
-    }
-
-    /**
-     * Add a new target property to the given resource.
-     * This also creates a config object if the resource does not yey have one.
-     *
-     * @param resource The resource to modify
-     * @param name Name of the property to add
-     * @param value Value to be assigned to the property
-     */
-    public static boolean addTargetProperty(final Resource resource, final String name, final Element value) {
-        var config = targetDecl(resource).getConfig();
-        if (config == null) {
-            config = LfFactory.eINSTANCE.createKeyValuePairs();
-            targetDecl(resource).setConfig(config);
-        }
-        final var newProperty = LfFactory.eINSTANCE.createKeyValuePair();
-        newProperty.setName(name);
-        newProperty.setValue(value);
-        config.getPairs().add(newProperty);
-        return true;
-    }
-
-    /**
-     * Return true if the connection involves multiple ports on the left or right side of the connection, or
-     * if the port on the left or right of the connection involves a bank of reactors or a multiport.
-     * @param connection The connection.
-     */
-    public static boolean hasMultipleConnections(Connection connection) {
-        if (connection.getLeftPorts().size() > 1 || connection.getRightPorts().size() > 1) {
-            return true;
-        }
-        VarRef leftPort = connection.getLeftPorts().get(0);
-        VarRef rightPort = connection.getRightPorts().get(0);
-        Instantiation leftContainer = leftPort.getContainer();
-        Instantiation rightContainer = rightPort.getContainer();
-        Port leftPortAsPort = (Port) leftPort.getVariable();
-        Port rightPortAsPort = (Port) rightPort.getVariable();
-        return leftPortAsPort.getWidthSpec() != null
-            || leftContainer != null && leftContainer.getWidthSpec() != null
-            || rightPortAsPort.getWidthSpec() != null
-            || rightContainer != null && rightContainer.getWidthSpec() != null;
-    }
-
-    /**
-     * Produce a unique identifier within a reactor based on a
-     * given based name. If the name does not exists, it is returned;
-     * if does exist, an index is appended that makes the name unique.
-     * @param reactor The reactor to find a unique identifier within.
-     * @param name The name to base the returned identifier on.
-     */
-    public static String getUniqueIdentifier(Reactor reactor, String name) {
-        LinkedHashSet<String> vars = new LinkedHashSet<>();
-        allActions(reactor).forEach(it -> vars.add(it.getName()));
-        allTimers(reactor).forEach(it -> vars.add(it.getName()));
-        allParameters(reactor).forEach(it -> vars.add(it.getName()));
-        allInputs(reactor).forEach(it -> vars.add(it.getName()));
-        allOutputs(reactor).forEach(it -> vars.add(it.getName()));
-        allStateVars(reactor).forEach(it -> vars.add(it.getName()));
-        allInstantiations(reactor).forEach(it -> vars.add(it.getName()));
-
-        int index = 0;
-        String suffix = "";
-        boolean exists = true;
-        while (exists) {
-            String id = name + suffix;
-            if (IterableExtensions.exists(vars, it -> it.equals(id))) {
-                suffix = "_" + index;
-                index++;
-            } else {
-                exists = false;
+        // Handle conflicting writers
+        for (var key : allWriters.keySet()) {
+          var writers = allWriters.get(key);
+          if (writers.size() > 1) { // has multiple sources
+            var writerModes = HashMultimap.<Mode, EObject>create();
+            // find modes
+            for (var writer : writers) {
+              if (writer.eContainer() instanceof Mode) {
+                writerModes.put((Mode) writer.eContainer(), writer);
+              } else {
+                writerModes.put(null, writer);
+              }
             }
-        }
-        return name + suffix;
-    }
-
-    ////////////////////////////////
-    //// Utility functions for supporting inheritance and modes
-
-    /**
-     * Given a reactor class, return a list of all its actions,
-     * which includes actions of base classes that it extends.
-     * This also includes actions in modes, returning a flattened
-     * view over all modes.
-     * @param definition Reactor class definition.
-     */
-    public static List<Action> allActions(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Actions());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its connections,
-     * which includes connections of base classes that it extends.
-     * This also includes connections in modes, returning a flattened
-     * view over all modes.
-     * @param definition Reactor class definition.
-     */
-    public static List<Connection> allConnections(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Connections());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its inputs,
-     * which includes inputs of base classes that it extends.
-     * If the base classes include a cycle, where X extends Y and Y extends X,
-     * then return only the input defined in the base class.
-     * The returned list may be empty.
-     * @param definition Reactor class definition.
-     */
-    public static List<Input> allInputs(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Inputs());
-    }
-
-    /** A list of all ports of {@code definition}, in an unspecified order. */
-    public static List<Port> allPorts(Reactor definition) {
-        return Stream.concat(ASTUtils.allInputs(definition).stream(), ASTUtils.allOutputs(definition).stream()).toList();
-    }
-
-    /**
-     * Given a reactor class, return a list of all its preambles,
-     * which includes preambles of base classes that it extends.
-     * If the base classes include a cycle, where X extends Y and Y extends X,
-     * then return only the input defined in the base class.
-     * The returned list may be empty.
-     * @param definition Reactor class definition.
-     */
-    public static List<Preamble> allPreambles(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Preambles());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its instantiations,
-     * which includes instantiations of base classes that it extends.
-     * This also includes instantiations in modes, returning a flattened
-     * view over all modes.
-     * @param definition Reactor class definition.
-     */
-    public static List<Instantiation> allInstantiations(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Instantiations());
-    }
-
-    /**
-     * Given a reactor Class, return a set of include names for
-     * interacting reactors which includes all instantiations of base class that it extends.
-     *
-     * @param r Reactor Class
-     * */
-    public static HashSet<String> allIncludes(Reactor r) {
-        var set = new HashSet<String>();
-        for (var i : allInstantiations(r))
-        {
-            set.add(CUtil.getName(new TypeParameterizedReactor(i)));
-        }
-        return set;
-    }
-
-    /*
-     * Given a reactor class, return a stream of reactor classes that it instantiates.
-     * @param definition Reactor class definition.
-     * @return A stream of reactor classes.
-     */
-    public static Stream<Reactor> allNestedClasses(Reactor definition) {
-        return new HashSet<>(ASTUtils.allInstantiations(definition)).stream()
-            .map(Instantiation::getReactorClass)
-            .map(ASTUtils::toDefinition);
-    }
-
-    /**
-     * Given a reactor class, return a list of all its methods,
-     * which includes methods of base classes that it extends.
-     * @param definition Reactor class definition.
-     */
-    public static List<Method> allMethods(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Methods());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its outputs,
-     * which includes outputs of base classes that it extends.
-     * @param definition Reactor class definition.
-     */
-    public static List<Output> allOutputs(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Outputs());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its parameters,
-     * which includes parameters of base classes that it extends.
-     * @param definition Reactor class definition.
-     */
-    public static List<Parameter> allParameters(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Parameters());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its reactions,
-     * which includes reactions of base classes that it extends.
-     * This also includes reactions in modes, returning a flattened
-     * view over all modes.
-     * @param definition Reactor class definition.
-     */
-    public static List<Reaction> allReactions(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Reactions());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its watchdogs.
-     *
-     * @param definition Reactor class definition
-     * @return List<Watchdog>
-     */
-    public static List<Watchdog> allWatchdogs(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Watchdogs());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its state variables,
-     * which includes state variables of base classes that it extends.
-     * This also includes reactions in modes, returning a flattened
-     * view over all modes.
-     * @param definition Reactor class definition.
-     */
-    public static List<StateVar> allStateVars(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_StateVars());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its timers,
-     * which includes timers of base classes that it extends.
-     * This also includes reactions in modes, returning a flattened
-     * view over all modes.
-     * @param definition Reactor class definition.
-     */
-    public static List<Timer> allTimers(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Timers());
-    }
-
-    /**
-     * Given a reactor class, returns a list of all its modes,
-     * which includes modes of base classes that it extends.
-     * @param definition Reactor class definition.
-     */
-    public static List<Mode> allModes(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Modes());
-    }
-
-    public static List<ReactorInstance> recursiveChildren(ReactorInstance r) {
-        List<ReactorInstance> ret = new ArrayList<>();
-        ret.add(r);
-        for (var child: r.children) {
-            ret.addAll(recursiveChildren(child));
-        }
-        return ret;
-    }
-
-    /**
-     * Return all the superclasses of the specified reactor
-     * in deepest-first order. For example, if A extends B and C, and
-     * B and C both extend D, this will return the list [D, B, C, A].
-     * Duplicates are removed. If the specified reactor does not extend
-     * any other reactor, then return an empty list.
-     * If a cycle is found, where X extends Y and Y extends X, or if
-     * a superclass is declared that is not found, then return null.
-     * @param reactor The specified reactor.
-     */
-    public static LinkedHashSet<Reactor> superClasses(Reactor reactor) {
-        return superClasses(reactor, new LinkedHashSet<>());
-    }
-
-    /**
-     * Return all the file-level preambles in the files that define the
-     * specified class and its superclasses in deepest-first order.
-     * Duplicates are removed. If there are no file-level preambles,
-     * then return an empty list.
-     * If a cycle is found, where X extends Y and Y extends X, or if
-     * a superclass is declared that is not found, then return null.
-     * @param reactor The specified reactor.
-     */
-    public static LinkedHashSet<Preamble> allFileLevelPreambles(Reactor reactor) {
-        return allFileLevelPreambles(reactor, new LinkedHashSet<>());
-    }
-
-    /**
-     * Collect elements of type T from the class hierarchy and modes
-     * defined by a given reactor definition.
-     * @param definition The reactor definition.
-     * @param <T> The type of elements to collect (e.g., Port, Timer, etc.)
-     * @return A list of all elements of type T found
-     */
-    public static <T extends EObject> List<T> collectElements(Reactor definition, EStructuralFeature feature) {
-        return ASTUtils.collectElements(definition, feature, true, true);
-    }
-
-    /**
-     * Collect elements of type T contained in given reactor definition, including
-     * modes and the class hierarchy defined depending on configuration.
-     * @param definition The reactor definition.
-     * @param feature The structual model elements to collect.
-     * @param includeSuperClasses Whether to include elements in super classes.
-     * @param includeModes Whether to include elements in modes.
-     * @param <T> The type of elements to collect (e.g., Port, Timer, etc.)
-     * @return A list of all elements of type T found
-     */
-    @SuppressWarnings("unchecked")
-    public static <T extends EObject> List<T> collectElements(Reactor definition, EStructuralFeature feature, boolean includeSuperClasses, boolean includeModes) {
-        List<T> result = new ArrayList<>();
-
-        if (includeSuperClasses) {
-            // Add elements of elements defined in superclasses.
-            LinkedHashSet<Reactor> s = superClasses(definition);
-            if (s != null) {
-                for (Reactor superClass : s) {
-                    result.addAll((EList<T>) superClass.eGet(feature));
-                }
+            // Conflicting connection can only be handled if..
+            if (!writerModes.containsKey(null)
+                && // no writer is on root level (outside of modes) and...
+                writerModes.keySet().stream()
+                    .map(writerModes::get)
+                    .allMatch(
+                        writersInMode -> // all writers in a mode are either...
+                        writersInMode.size() == 1
+                                || // the only writer or...
+                                writersInMode.stream()
+                                    .allMatch(
+                                        w ->
+                                            w
+                                                instanceof
+                                                Reaction) // all are reactions and hence ordered
+                        )) {
+              // Add connections to transform list
+              writers.stream()
+                  .filter(w -> w instanceof Connection)
+                  .forEach(c -> transform.add((Connection) c));
             }
+          }
         }
-
-        // Add elements of the current reactor.
-        result.addAll((EList<T>) definition.eGet(feature));
-
-        if (includeModes && reactorModeFeatureMap.containsKey(feature)) {
-            var modeFeature = reactorModeFeatureMap.get(feature);
-            // Add elements of elements defined in modes.
-            for (Mode mode : includeSuperClasses ? allModes(definition) : definition.getModes()) {
-                insertModeElementsAtTextualPosition(result, (EList<T>) mode.eGet(modeFeature), mode);
-            }
+      }
+    }
+
+    return transform;
+  }
+
+  /**
+   * Return the enclosing reactor of an LF EObject in a reactor or mode.
+   *
+   * @param obj the LF model element
+   * @return the reactor or null
+   */
+  public static Reactor getEnclosingReactor(EObject obj) {
+    if (obj.eContainer() instanceof Reactor) {
+      return (Reactor) obj.eContainer();
+    } else if (obj.eContainer() instanceof Mode) {
+      return (Reactor) obj.eContainer().eContainer();
+    }
+    return null;
+  }
+
+  /** Return the main reactor in the given resource if there is one, null otherwise. */
+  public static Reactor findMainReactor(Resource resource) {
+    return IteratorExtensions.findFirst(
+        Iterators.filter(resource.getAllContents(), Reactor.class), Reactor::isMain);
+  }
+
+  /**
+   * Find the main reactor and change it to a federated reactor. Return true if the transformation
+   * was successful (or the given resource already had a federated reactor); return false otherwise.
+   */
+  public static boolean makeFederated(Resource resource) {
+    // Find the main reactor
+    Reactor r = findMainReactor(resource);
+    if (r == null) {
+      return false;
+    }
+    r.setMain(false);
+    r.setFederated(true);
+    return true;
+  }
+
+  /** Change the target name to 'newTargetName'. For example, change C to CCpp. */
+  public static boolean changeTargetName(Resource resource, String newTargetName) {
+    targetDecl(resource).setName(newTargetName);
+    return true;
+  }
+
+  /** Return the target of the file in which the given node lives. */
+  public static Target getTarget(EObject object) {
+    TargetDecl targetDecl = targetDecl(object.eResource());
+    return Target.fromDecl(targetDecl);
+  }
+
+  /**
+   * Add a new target property to the given resource. This also creates a config object if the
+   * resource does not yey have one.
+   *
+   * @param resource The resource to modify
+   * @param name Name of the property to add
+   * @param value Value to be assigned to the property
+   */
+  public static boolean addTargetProperty(
+      final Resource resource, final String name, final Element value) {
+    var config = targetDecl(resource).getConfig();
+    if (config == null) {
+      config = LfFactory.eINSTANCE.createKeyValuePairs();
+      targetDecl(resource).setConfig(config);
+    }
+    final var newProperty = LfFactory.eINSTANCE.createKeyValuePair();
+    newProperty.setName(name);
+    newProperty.setValue(value);
+    config.getPairs().add(newProperty);
+    return true;
+  }
+
+  /**
+   * Return true if the connection involves multiple ports on the left or right side of the
+   * connection, or if the port on the left or right of the connection involves a bank of reactors
+   * or a multiport.
+   *
+   * @param connection The connection.
+   */
+  public static boolean hasMultipleConnections(Connection connection) {
+    if (connection.getLeftPorts().size() > 1 || connection.getRightPorts().size() > 1) {
+      return true;
+    }
+    VarRef leftPort = connection.getLeftPorts().get(0);
+    VarRef rightPort = connection.getRightPorts().get(0);
+    Instantiation leftContainer = leftPort.getContainer();
+    Instantiation rightContainer = rightPort.getContainer();
+    Port leftPortAsPort = (Port) leftPort.getVariable();
+    Port rightPortAsPort = (Port) rightPort.getVariable();
+    return leftPortAsPort.getWidthSpec() != null
+        || leftContainer != null && leftContainer.getWidthSpec() != null
+        || rightPortAsPort.getWidthSpec() != null
+        || rightContainer != null && rightContainer.getWidthSpec() != null;
+  }
+
+  /**
+   * Produce a unique identifier within a reactor based on a given based name. If the name does not
+   * exists, it is returned; if does exist, an index is appended that makes the name unique.
+   *
+   * @param reactor The reactor to find a unique identifier within.
+   * @param name The name to base the returned identifier on.
+   */
+  public static String getUniqueIdentifier(Reactor reactor, String name) {
+    LinkedHashSet<String> vars = new LinkedHashSet<>();
+    allActions(reactor).forEach(it -> vars.add(it.getName()));
+    allTimers(reactor).forEach(it -> vars.add(it.getName()));
+    allParameters(reactor).forEach(it -> vars.add(it.getName()));
+    allInputs(reactor).forEach(it -> vars.add(it.getName()));
+    allOutputs(reactor).forEach(it -> vars.add(it.getName()));
+    allStateVars(reactor).forEach(it -> vars.add(it.getName()));
+    allInstantiations(reactor).forEach(it -> vars.add(it.getName()));
+
+    int index = 0;
+    String suffix = "";
+    boolean exists = true;
+    while (exists) {
+      String id = name + suffix;
+      if (IterableExtensions.exists(vars, it -> it.equals(id))) {
+        suffix = "_" + index;
+        index++;
+      } else {
+        exists = false;
+      }
+    }
+    return name + suffix;
+  }
+
+  ////////////////////////////////
+  //// Utility functions for supporting inheritance and modes
+
+  /**
+   * Given a reactor class, return a list of all its actions, which includes actions of base classes
+   * that it extends. This also includes actions in modes, returning a flattened view over all
+   * modes.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Action> allActions(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Actions());
+  }
+
+  /**
+   * Given a reactor class, return a list of all its connections, which includes connections of base
+   * classes that it extends. This also includes connections in modes, returning a flattened view
+   * over all modes.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Connection> allConnections(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Connections());
+  }
+
+  /**
+   * Given a reactor class, return a list of all its inputs, which includes inputs of base classes
+   * that it extends. If the base classes include a cycle, where X extends Y and Y extends X, then
+   * return only the input defined in the base class. The returned list may be empty.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Input> allInputs(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Inputs());
+  }
+
+  /** A list of all ports of {@code definition}, in an unspecified order. */
+  public static List<Port> allPorts(Reactor definition) {
+    return Stream.concat(
+            ASTUtils.allInputs(definition).stream(), ASTUtils.allOutputs(definition).stream())
+        .toList();
+  }
+
+  /**
+   * Given a reactor class, return a list of all its preambles, which includes preambles of base
+   * classes that it extends. If the base classes include a cycle, where X extends Y and Y extends
+   * X, then return only the input defined in the base class. The returned list may be empty.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Preamble> allPreambles(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Preambles());
+  }
+
+  /**
+   * Given a reactor class, return a list of all its instantiations, which includes instantiations
+   * of base classes that it extends. This also includes instantiations in modes, returning a
+   * flattened view over all modes.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Instantiation> allInstantiations(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Instantiations());
+  }
+
+  /**
+   * Given a reactor Class, return a set of include names for interacting reactors which includes
+   * all instantiations of base class that it extends.
+   *
+   * @param r Reactor Class
+   */
+  public static HashSet<String> allIncludes(Reactor r) {
+    var set = new HashSet<String>();
+    for (var i : allInstantiations(r)) {
+      set.add(CUtil.getName(new TypeParameterizedReactor(i)));
+    }
+    return set;
+  }
+
+  /*
+   * Given a reactor class, return a stream of reactor classes that it instantiates.
+   * @param definition Reactor class definition.
+   * @return A stream of reactor classes.
+   */
+  public static Stream<Reactor> allNestedClasses(Reactor definition) {
+    return new HashSet<>(ASTUtils.allInstantiations(definition))
+        .stream().map(Instantiation::getReactorClass).map(ASTUtils::toDefinition);
+  }
+
+  /**
+   * Given a reactor class, return a list of all its methods, which includes methods of base classes
+   * that it extends.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Method> allMethods(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Methods());
+  }
+
+  /**
+   * Given a reactor class, return a list of all its outputs, which includes outputs of base classes
+   * that it extends.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Output> allOutputs(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Outputs());
+  }
+
+  /**
+   * Given a reactor class, return a list of all its parameters, which includes parameters of base
+   * classes that it extends.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Parameter> allParameters(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Parameters());
+  }
+
+  /**
+   * Given a reactor class, return a list of all its reactions, which includes reactions of base
+   * classes that it extends. This also includes reactions in modes, returning a flattened view over
+   * all modes.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Reaction> allReactions(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Reactions());
+  }
+
+  /**
+   * Given a reactor class, return a list of all its watchdogs.
+   *
+   * @param definition Reactor class definition
+   * @return List<Watchdog>
+   */
+  public static List<Watchdog> allWatchdogs(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Watchdogs());
+  }
+
+  /**
+   * Given a reactor class, return a list of all its state variables, which includes state variables
+   * of base classes that it extends. This also includes reactions in modes, returning a flattened
+   * view over all modes.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<StateVar> allStateVars(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_StateVars());
+  }
+
+  /**
+   * Given a reactor class, return a list of all its timers, which includes timers of base classes
+   * that it extends. This also includes reactions in modes, returning a flattened view over all
+   * modes.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Timer> allTimers(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Timers());
+  }
+
+  /**
+   * Given a reactor class, returns a list of all its modes, which includes modes of base classes
+   * that it extends.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Mode> allModes(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Modes());
+  }
+
+  public static List<ReactorInstance> recursiveChildren(ReactorInstance r) {
+    List<ReactorInstance> ret = new ArrayList<>();
+    ret.add(r);
+    for (var child : r.children) {
+      ret.addAll(recursiveChildren(child));
+    }
+    return ret;
+  }
+
+  /**
+   * Return all the superclasses of the specified reactor in deepest-first order. For example, if A
+   * extends B and C, and B and C both extend D, this will return the list [D, B, C, A]. Duplicates
+   * are removed. If the specified reactor does not extend any other reactor, then return an empty
+   * list. If a cycle is found, where X extends Y and Y extends X, or if a superclass is declared
+   * that is not found, then return null.
+   *
+   * @param reactor The specified reactor.
+   */
+  public static LinkedHashSet<Reactor> superClasses(Reactor reactor) {
+    return superClasses(reactor, new LinkedHashSet<>());
+  }
+
+  /**
+   * Return all the file-level preambles in the files that define the specified class and its
+   * superclasses in deepest-first order. Duplicates are removed. If there are no file-level
+   * preambles, then return an empty list. If a cycle is found, where X extends Y and Y extends X,
+   * or if a superclass is declared that is not found, then return null.
+   *
+   * @param reactor The specified reactor.
+   */
+  public static LinkedHashSet<Preamble> allFileLevelPreambles(Reactor reactor) {
+    return allFileLevelPreambles(reactor, new LinkedHashSet<>());
+  }
+
+  /**
+   * Collect elements of type T from the class hierarchy and modes defined by a given reactor
+   * definition.
+   *
+   * @param definition The reactor definition.
+   * @param <T> The type of elements to collect (e.g., Port, Timer, etc.)
+   * @return A list of all elements of type T found
+   */
+  public static <T extends EObject> List<T> collectElements(
+      Reactor definition, EStructuralFeature feature) {
+    return ASTUtils.collectElements(definition, feature, true, true);
+  }
+
+  /**
+   * Collect elements of type T contained in given reactor definition, including modes and the class
+   * hierarchy defined depending on configuration.
+   *
+   * @param definition The reactor definition.
+   * @param feature The structual model elements to collect.
+   * @param includeSuperClasses Whether to include elements in super classes.
+   * @param includeModes Whether to include elements in modes.
+   * @param <T> The type of elements to collect (e.g., Port, Timer, etc.)
+   * @return A list of all elements of type T found
+   */
+  @SuppressWarnings("unchecked")
+  public static <T extends EObject> List<T> collectElements(
+      Reactor definition,
+      EStructuralFeature feature,
+      boolean includeSuperClasses,
+      boolean includeModes) {
+    List<T> result = new ArrayList<>();
+
+    if (includeSuperClasses) {
+      // Add elements of elements defined in superclasses.
+      LinkedHashSet<Reactor> s = superClasses(definition);
+      if (s != null) {
+        for (Reactor superClass : s) {
+          result.addAll((EList<T>) superClass.eGet(feature));
         }
-
-        return result;
-    }
-
-    /**
-     * Adds the elements into the given list at a location matching to their textual position.
-     *
-     * When creating a flat view onto reactor elements including modes, the final list must be ordered according
-     * to the textual positions.
-     *
-     * Example:
-     * reactor R {
-     *   reaction // -> is R.reactions[0]
-     *   mode M {
-     *      reaction // -> is R.mode[0].reactions[0]
-     *      reaction // -> is R.mode[0].reactions[1]
-     *   }
-     *   reaction // -> is R.reactions[1]
-     * }
-     * In this example, it is important that the reactions in the mode are inserted between the top-level
-     * reactions to retain the correct global reaction ordering, which will be derived from this flattened view.
-     *
-     * @param list The list to add the elements into.
-     * @param elements The elements to add.
-     * @param mode The mode containing the elements.
-     * @param <T> The type of elements to add (e.g., Port, Timer, etc.)
-     */
-    private static <T extends EObject> void insertModeElementsAtTextualPosition(List<T> list, List<T> elements, Mode mode) {
-        if (elements.isEmpty()) {
-            return; // Nothing to add
-        }
-
-        var idx = list.size();
-        if (idx > 0) {
-            // If there are elements in the list, first check if the last element has the same container as the mode.
-            // I.e. we don't want to compare textual positions of different reactors (super classes)
-            if (mode.eContainer() == list.get(list.size() - 1).eContainer()) {
-                var modeAstNode = NodeModelUtils.getNode(mode);
-                if (modeAstNode != null) {
-                    var modePos = modeAstNode.getOffset();
-                    // Now move the insertion index from the last element forward as long as this element has a textual
-                    // position after the mode.
-                    do {
-                        var astNode = NodeModelUtils.getNode(list.get(idx - 1));
-                        if (astNode != null && astNode.getOffset() > modePos) {
-                            idx--;
-                        } else {
-                            break; // Insertion index is ok.
-                        }
-                    } while (idx > 0);
-                }
-            }
-        }
-        list.addAll(idx, elements);
-    }
-
-    public static <T extends EObject> Iterable<T> allElementsOfClass(
-        Resource resource,
-        Class<T> elementClass
-    ) {
-        //noinspection StaticPseudoFunctionalStyleMethod
-        return Iterables.filter(IteratorExtensions.toIterable(resource.getAllContents()), elementClass);
-    }
-
-    ////////////////////////////////
-    //// Utility functions for translating AST nodes into text
-
-    /**
-     * Translate the given code into its textual representation
-     * with {@code CodeMap.Correspondence} tags inserted, or
-     * return the empty string if {@code node} is {@code null}.
-     * This method should be used to generate code.
-     * @param node AST node to render as string.
-     * @return Textual representation of the given argument.
-     */
-    public static String toText(EObject node) {
-        if (node == null) return "";
-        return CodeMap.Correspondence.tag(node, toOriginalText(node), node instanceof Code);
-    }
-
-    /**
-     * Translate the given code into its textual representation
-     * without {@code CodeMap.Correspondence} tags, or return
-     * the empty string if {@code node} is {@code null}.
-     * This method should be used for analyzing AST nodes in
-     * cases where they are easiest to analyze as strings.
-     * @param node AST node to render as string.
-     * @return Textual representation of the given argument.
-     */
-    public static String toOriginalText(EObject node) {
-        if (node == null) return "";
-        return ToText.instance.doSwitch(node);
-    }
-
-    /**
-     * Return an integer representation of the given element.
-     *
-     * Internally, this method uses Integer.decode, so it will
-     * also understand hexadecimal, binary, etc.
-     *
-     * @param e The element to be rendered as an integer.
-     */
-    public static Integer toInteger(Element e) {
-        return Integer.decode(e.getLiteral());
-    }
-
-    /**
-     * Return a time value based on the given element.
-     *
-     * @param e The element to be rendered as a time value.
-     */
-    public static TimeValue toTimeValue(Element e) {
-        return new TimeValue(e.getTime(), TimeUnit.fromName(e.getUnit()));
-    }
-
-    /**
-     * Returns the time value represented by the given AST node.
-     */
-    public static TimeValue toTimeValue(Time e) {
-        if (!isValidTime(e)) {
-            // invalid unit, will have been reported by validator
-            throw new IllegalArgumentException();
-        }
-        return new TimeValue(e.getInterval(), TimeUnit.fromName(e.getUnit()));
-    }
-
-    /**
-     * Return a boolean based on the given element.
-     *
-     * @param e The element to be rendered as a boolean.
-     */
-    public static boolean toBoolean(Element e) {
-        return elementToSingleString(e).equalsIgnoreCase("true");
-    }
-
-    /**
-     * Given the right-hand side of a target property, return a string that
-     * represents the given value/
-     *
-     * If the given value is not a literal or and id (but for instance and array or dict),
-     * an empty string is returned. If the element is a string, any quotes are removed.
-     *
-     * @param e The right-hand side of a target property.
-     */
-    public static String elementToSingleString(Element e) {
-        if (e.getLiteral() != null) {
-            return StringUtil.removeQuotes(e.getLiteral()).trim();
-        } else if (e.getId() != null) {
-            return e.getId();
-        }
-        return "";
-    }
-
-    /**
-     * Given the right-hand side of a target property, return a list with all
-     * the strings that the property lists.
-     *
-     * Arrays are traversed, so strings are collected recursively. Empty strings
-     * are ignored; they are not added to the list.
-     * @param value The right-hand side of a target property.
-     */
-    public static List<String> elementToListOfStrings(Element value) {
-        List<String> elements = new ArrayList<>();
-        if (value.getArray() != null) {
-            for (Element element : value.getArray().getElements()) {
-                elements.addAll(elementToListOfStrings(element));
-            }
-            return elements;
-        } else {
-            String v = elementToSingleString(value);
-            if (!v.isEmpty()) {
-                elements.add(v);
-            }
-        }
-        return elements;
-    }
-
-    /**
-     * Convert key-value pairs in an Element to a map, assuming that both the key
-     * and the value are strings.
-     */
-    public static Map<String, String> elementToStringMaps(Element value) {
-        Map<String, String> elements = new HashMap<>();
-        for (var element: value.getKeyvalue().getPairs()) {
-            elements.put(
-                element.getName().trim(),
-                StringUtil.removeQuotes(elementToSingleString(element.getValue()))
-            );
-        }
-        return elements;
-    }
-
-    // Various utility methods to convert various data types to Elements
-
-    /**
-     * Convert a <String, String> map to key-value pairs in an Element.
-     */
-    public static Element toElement(Map<String, String> map) {
-        Element e = LfFactory.eINSTANCE.createElement();
-        if (map.size() == 0) return null;
-        else {
-            var kv = LfFactory.eINSTANCE.createKeyValuePairs();
-            for (var entry : map.entrySet()) {
-                var pair = LfFactory.eINSTANCE.createKeyValuePair();
-                pair.setName(entry.getKey());
-                var element = LfFactory.eINSTANCE.createElement();
-                element.setLiteral(StringUtil.addDoubleQuotes(entry.getValue()));
-                pair.setValue(element);
-                kv.getPairs().add(pair);
-            }
-            e.setKeyvalue(kv);
-        }
-
-        return e;
-    }
-
-    /**
-     * Given a single string, convert it into its AST representation.
-     * {@code addQuotes} controls if the generated representation should be
-     * accompanied by double quotes ("") or not.
-     */
-    private static Element toElement(String str, boolean addQuotes) {
-        if (str == null) return null;
-        var strToReturn = addQuotes? StringUtil.addDoubleQuotes(str):str;
-        Element e = LfFactory.eINSTANCE.createElement();
-        e.setLiteral(strToReturn);
-        return e;
-    }
-
-    /**
-     * Given a single string, convert it into its AST representation.
-     */
-    public static Element toElement(String str) {
-        return toElement(str, true);
-    }
-
-    /**
-     * Given a list of strings, convert it into its AST representation.
-     * Stores the list in the Array field of the element, unless the list only has one string,
-     * in which case it is stored in the Literal field. Returns null if the provided list is empty.
-     */
-    public static Element toElement(List<String> list) {
-        Element e = LfFactory.eINSTANCE.createElement();
-        if (list.size() == 0) return null;
-        else if (list.size() == 1) {
-            return toElement(list.get(0));
-        } else {
-            var arr = LfFactory.eINSTANCE.createArray();
-            for (String s : list) {
-                arr.getElements().add(ASTUtils.toElement(s));
-            }
-            e.setArray(arr);
-        }
-        return e;
-    }
-
-    /**
-     * Convert a TimeValue to its AST representation. The value is type-cast to int in order to fit inside an Element.
-     */
-    public static Element toElement(TimeValue tv) {
-        Element e = LfFactory.eINSTANCE.createElement();
-        e.setTime((int)tv.time);
-        if (tv.unit != null) {
-            e.setUnit(tv.unit.toString());
-        }
-        return e;
-    }
-
-    public static Element toElement(boolean val) {
-        return toElement(Boolean.toString(val), false);
-    }
-
-    public static Element toElement(int val) {
-        return toElement(Integer.toString(val), false);
-    }
-
-    /**
-     * Translate the given type into its textual representation, but
-     * do not append any array specifications or type arguments.
-     * @param type AST node to render as string.
-     * @return Textual representation of the given argument.
-     */
-    public static String baseType(Type type) {
-        if (type != null) {
-            if (type.getCode() != null) {
-                return toText(type.getCode());
+      }
+    }
+
+    // Add elements of the current reactor.
+    result.addAll((EList<T>) definition.eGet(feature));
+
+    if (includeModes && reactorModeFeatureMap.containsKey(feature)) {
+      var modeFeature = reactorModeFeatureMap.get(feature);
+      // Add elements of elements defined in modes.
+      for (Mode mode : includeSuperClasses ? allModes(definition) : definition.getModes()) {
+        insertModeElementsAtTextualPosition(result, (EList<T>) mode.eGet(modeFeature), mode);
+      }
+    }
+
+    return result;
+  }
+
+  /**
+   * Adds the elements into the given list at a location matching to their textual position.
+   *
+   * <p>When creating a flat view onto reactor elements including modes, the final list must be
+   * ordered according to the textual positions.
+   *
+   * <p>Example: reactor R { reaction // -> is R.reactions[0] mode M { reaction // -> is
+   * R.mode[0].reactions[0] reaction // -> is R.mode[0].reactions[1] } reaction // -> is
+   * R.reactions[1] } In this example, it is important that the reactions in the mode are inserted
+   * between the top-level reactions to retain the correct global reaction ordering, which will be
+   * derived from this flattened view.
+   *
+   * @param list The list to add the elements into.
+   * @param elements The elements to add.
+   * @param mode The mode containing the elements.
+   * @param <T> The type of elements to add (e.g., Port, Timer, etc.)
+   */
+  private static <T extends EObject> void insertModeElementsAtTextualPosition(
+      List<T> list, List<T> elements, Mode mode) {
+    if (elements.isEmpty()) {
+      return; // Nothing to add
+    }
+
+    var idx = list.size();
+    if (idx > 0) {
+      // If there are elements in the list, first check if the last element has the same container
+      // as the mode.
+      // I.e. we don't want to compare textual positions of different reactors (super classes)
+      if (mode.eContainer() == list.get(list.size() - 1).eContainer()) {
+        var modeAstNode = NodeModelUtils.getNode(mode);
+        if (modeAstNode != null) {
+          var modePos = modeAstNode.getOffset();
+          // Now move the insertion index from the last element forward as long as this element has
+          // a textual
+          // position after the mode.
+          do {
+            var astNode = NodeModelUtils.getNode(list.get(idx - 1));
+            if (astNode != null && astNode.getOffset() > modePos) {
+              idx--;
             } else {
-                if (type.isTime()) {
-                    return "time";
-                } else {
-                    StringBuilder result = new StringBuilder(type.getId());
-
-                    for (String s : convertToEmptyListIfNull(type.getStars())) {
-                        result.append(s);
-                    }
-                    return result.toString();
-                }
-            }
-        }
-        return "";
-    }
-
-    /**
-     * Report whether the given literal is zero or not.
-     * @param literal AST node to inspect.
-     * @return True if the given literal denotes the constant {@code 0}, false
-     * otherwise.
-     */
-    public static boolean isZero(String literal) {
-        try {
-            if (literal != null &&
-                Integer.parseInt(literal) == 0) {
-                return true;
+              break; // Insertion index is ok.
             }
-        } catch (NumberFormatException e) {
-            // Not an int.
+          } while (idx > 0);
         }
-        return false;
-    }
-
-    /**
-     * Report whether the given expression is zero or not.
-     *
-     * @param expr AST node to inspect.
-     * @return True if the given value denotes the constant {@code 0}, false otherwise.
-     */
-    public static boolean isZero(Expression expr) {
-        if (expr instanceof Literal) {
-            return isZero(((Literal) expr).getLiteral());
-        }
-        return false;
-    }
-
-    /**
-     * Report whether the given string literal is an integer number or not.
-     *
-     * @param literal AST node to inspect.
-     * @return True if the given value is an integer, false otherwise.
-     */
-    public static boolean isInteger(String literal) {
-        try {
-            //noinspection ResultOfMethodCallIgnored
-            Integer.decode(literal);
-        } catch (NumberFormatException e) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Report whether the given string literal is a boolean value or not.
-     * @param literal AST node to inspect.
-     * @return True if the given value is a boolean, false otherwise.
-     */
-    public static boolean isBoolean(String literal) {
-        return literal.equalsIgnoreCase("true") || literal.equalsIgnoreCase("false");
-    }
-
-    /**
-     * Report whether the given string literal is a float value or not.
-     * @param literal AST node to inspect.
-     * @return True if the given value is a float, false otherwise.
-     */
-    public static boolean isFloat(String literal) {
-        try {
-            //noinspection ResultOfMethodCallIgnored
-            Float.parseFloat(literal);
-        } catch (NumberFormatException e) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Report whether the given code is an integer number or not.
-     * @param code AST node to inspect.
-     * @return True if the given code is an integer, false otherwise.
-     */
-    public static boolean isInteger(Code code) {
-        return isInteger(toText(code));
-    }
-
-    /**
-     * Report whether the given expression is an integer number or not.
-     * @param expr AST node to inspect.
-     * @return True if the given value is an integer, false otherwise.
-     */
-    public static boolean isInteger(Expression expr) {
-        if (expr instanceof Literal) {
-            return isInteger(((Literal) expr).getLiteral());
-        } else if (expr instanceof Code) {
-            return isInteger((Code) expr);
-        }
-        return false;
-    }
-
-    /**
-     * Report whether the given expression denotes a valid time or not.
-     * @param expr AST node to inspect.
-     * @return True if the argument denotes a valid time, false otherwise.
-     */
-    public static boolean isValidTime(Expression expr) {
-        if (expr instanceof ParameterReference) {
-            return isOfTimeType(((ParameterReference) expr).getParameter());
-        } else if (expr instanceof Time) {
-            return isValidTime((Time) expr);
-        } else if (expr instanceof Literal) {
-            return isZero(((Literal) expr).getLiteral());
-        }
-        return false;
-    }
-
-    /**
-     * Report whether the given time denotes a valid time or not.
-     * @param t AST node to inspect.
-     * @return True if the argument denotes a valid time, false otherwise.
-     */
-    public static boolean isValidTime(Time t) {
-        if (t == null) return false;
-        String unit = t.getUnit();
-        return t.getInterval() == 0 ||
-               TimeUnit.isValidUnit(unit);
-    }
-
-    /**
-     * If the initializer contains exactly one expression,
-     * return it. Otherwise, return null.
-     */
-    public static Expression asSingleExpr(Initializer init) {
-        if (init == null) {
-            return null;
-        }
-        var exprs = init.getExprs();
-        return exprs.size() == 1 ? exprs.get(0) : null;
-    }
-
-    public static boolean isSingleExpr(Initializer init) {
-        // todo expand that to = initialization
-        if (init == null) {
-            return false;
-        }
-        var exprs = init.getExprs();
-        return exprs.size() == 1;
-    }
-
-    public static boolean isListInitializer(Initializer init) {
-        return init != null && !isSingleExpr(init);
-    }
-
-    /**
-     * Return the type of a declaration with the given
-     * (nullable) explicit type, and the given (nullable)
-     * initializer. If the explicit type is null, then the
-     * type is inferred from the initializer. Only two types
-     * can be inferred: "time" and "timeList". Return the
-     * "undefined" type if neither can be inferred.
-     *
-     * @param type Explicit type declared on the declaration
-     * @param init The initializer expression
-     * @return The inferred type, or "undefined" if none could be inferred.
-     */
-    public static InferredType getInferredType(Type type, Initializer init) {
-        if (type != null) {
-            return InferredType.fromAST(type);
-        } else if (init == null) {
-            return InferredType.undefined();
-        }
-
-        var single = asSingleExpr(init);
-        if (single != null) {
-            // If there is a single element in the list, and it is a proper
-            // time value with units, we infer the type "time".
-            if (single instanceof ParameterReference) {
-                return getInferredType(((ParameterReference) single).getParameter());
-            } else if (single instanceof Time) {
-                return InferredType.time();
-            }
-        } else if (init.getExprs().size() > 1) {
-            // If there are multiple elements in the list, and there is at
-            // least one proper time value with units, and all other elements
-            // are valid times (including zero without units), we infer the
-            // type "time list".
-            var allValidTime = true;
-            var foundNonZero = false;
-
-            for (var e : init.getExprs()) {
-                if (!ASTUtils.isValidTime(e)) {
-                    allValidTime = false;
-                }
-                if (!ASTUtils.isZero(e)) {
-                    foundNonZero = true;
-                }
-            }
-
-            if (allValidTime && foundNonZero) {
-                // Conservatively, no bounds are inferred; the returned type
-                // is a variable-size list.
-                return InferredType.timeList();
-            }
-        }
-        return InferredType.undefined();
-    }
-
-    /**
-     * Given a parameter, return an inferred type. Only two types can be
-     * inferred: "time" and "timeList". Return the "undefined" type if
-     * neither can be inferred.
-     *
-     * @param p A parameter to infer the type of.
-     * @return The inferred type, or "undefined" if none could be inferred.
-     */
-    public static InferredType getInferredType(Parameter p) {
-        return getInferredType(p.getType(), p.getInit());
-    }
-
-    /**
-     * Given a state variable, return an inferred type. Only two types can be
-     * inferred: "time" and "timeList". Return the "undefined" type if
-     * neither can be inferred.
-     *
-     * @param s A state variable to infer the type of.
-     * @return The inferred type, or "undefined" if none could be inferred.
-     */
-    public static InferredType getInferredType(StateVar s) {
-        return getInferredType(s.getType(), s.getInit());
-    }
-
-    /**
-     * Construct an inferred type from an "action" AST node based
-     * on its declared type. If no type is declared, return the "undefined"
-     * type.
-     *
-     * @param a An action to construct an inferred type object for.
-     * @return The inferred type, or "undefined" if none was declared.
-     */
-    public static InferredType getInferredType(Action a) {
-        return getInferredType(a.getType(), null);
-    }
-
-    /**
-     * Construct an inferred type from a "port" AST node based on its declared
-     * type. If no type is declared, return the "undefined" type.
-     *
-     * @param p A port to construct an inferred type object for.
-     * @return The inferred type, or "undefined" if none was declared.
-     */
-    public static InferredType getInferredType(Port p) {
-        return getInferredType(p.getType(), null);
-    }
-
-    /**
-     * If the given string can be recognized as a floating-point number that has a leading decimal point,
-     * prepend the string with a zero and return it. Otherwise, return the original string.
-     *
-     * @param literal A string might be recognizable as a floating point number with a leading decimal point.
-     * @return an equivalent representation of <code>literal
-     * </code>
-     */
-    public static String addZeroToLeadingDot(String literal) {
-        Matcher m = ABBREVIATED_FLOAT.matcher(literal);
-        if (m.matches()) {
-            return literal.replace(".", "0.");
-        }
-        return literal;
-    }
-
-    /**
-     * Return true if the specified port is a multiport.
-     * @param port The port.
-     * @return True if the port is a multiport.
-     */
-    public static boolean isMultiport(Port port) {
-        return port.getWidthSpec() != null;
-    }
-
-    ////////////////////////////////
-    //// Utility functions for translating AST nodes into text
-    // This is a continuation of a large section of ASTUtils.xtend
-    // with the same name.
-
-    /**
-     * Generate code for referencing a port, action, or timer.
-     * @param reference The reference to the variable.
-     */
-    public static String generateVarRef(VarRef reference) {
-        var prefix = "";
-        if (reference.getContainer() != null) {
-            prefix = reference.getContainer().getName() + ".";
-        }
-        return prefix + reference.getVariable().getName();
-    }
-
-    /**
-     * Assuming that the given expression denotes a valid time literal,
-     * return a time value.
-     */
-    public static TimeValue getLiteralTimeValue(Expression expr) {
-        if (expr instanceof Time) {
-            return toTimeValue((Time)expr);
-        } else if (expr instanceof Literal && isZero(((Literal) expr).getLiteral())) {
-            return TimeValue.ZERO;
+      }
+    }
+    list.addAll(idx, elements);
+  }
+
+  public static <T extends EObject> Iterable<T> allElementsOfClass(
+      Resource resource, Class<T> elementClass) {
+    //noinspection StaticPseudoFunctionalStyleMethod
+    return Iterables.filter(IteratorExtensions.toIterable(resource.getAllContents()), elementClass);
+  }
+
+  ////////////////////////////////
+  //// Utility functions for translating AST nodes into text
+
+  /**
+   * Translate the given code into its textual representation with {@code CodeMap.Correspondence}
+   * tags inserted, or return the empty string if {@code node} is {@code null}. This method should
+   * be used to generate code.
+   *
+   * @param node AST node to render as string.
+   * @return Textual representation of the given argument.
+   */
+  public static String toText(EObject node) {
+    if (node == null) return "";
+    return CodeMap.Correspondence.tag(node, toOriginalText(node), node instanceof Code);
+  }
+
+  /**
+   * Translate the given code into its textual representation without {@code CodeMap.Correspondence}
+   * tags, or return the empty string if {@code node} is {@code null}. This method should be used
+   * for analyzing AST nodes in cases where they are easiest to analyze as strings.
+   *
+   * @param node AST node to render as string.
+   * @return Textual representation of the given argument.
+   */
+  public static String toOriginalText(EObject node) {
+    if (node == null) return "";
+    return ToText.instance.doSwitch(node);
+  }
+
+  /**
+   * Return an integer representation of the given element.
+   *
+   * <p>Internally, this method uses Integer.decode, so it will also understand hexadecimal, binary,
+   * etc.
+   *
+   * @param e The element to be rendered as an integer.
+   */
+  public static Integer toInteger(Element e) {
+    return Integer.decode(e.getLiteral());
+  }
+
+  /**
+   * Return a time value based on the given element.
+   *
+   * @param e The element to be rendered as a time value.
+   */
+  public static TimeValue toTimeValue(Element e) {
+    return new TimeValue(e.getTime(), TimeUnit.fromName(e.getUnit()));
+  }
+
+  /** Returns the time value represented by the given AST node. */
+  public static TimeValue toTimeValue(Time e) {
+    if (!isValidTime(e)) {
+      // invalid unit, will have been reported by validator
+      throw new IllegalArgumentException();
+    }
+    return new TimeValue(e.getInterval(), TimeUnit.fromName(e.getUnit()));
+  }
+
+  /**
+   * Return a boolean based on the given element.
+   *
+   * @param e The element to be rendered as a boolean.
+   */
+  public static boolean toBoolean(Element e) {
+    return elementToSingleString(e).equalsIgnoreCase("true");
+  }
+
+  /**
+   * Given the right-hand side of a target property, return a string that represents the given
+   * value/
+   *
+   * <p>If the given value is not a literal or and id (but for instance and array or dict), an empty
+   * string is returned. If the element is a string, any quotes are removed.
+   *
+   * @param e The right-hand side of a target property.
+   */
+  public static String elementToSingleString(Element e) {
+    if (e.getLiteral() != null) {
+      return StringUtil.removeQuotes(e.getLiteral()).trim();
+    } else if (e.getId() != null) {
+      return e.getId();
+    }
+    return "";
+  }
+
+  /**
+   * Given the right-hand side of a target property, return a list with all the strings that the
+   * property lists.
+   *
+   * <p>Arrays are traversed, so strings are collected recursively. Empty strings are ignored; they
+   * are not added to the list.
+   *
+   * @param value The right-hand side of a target property.
+   */
+  public static List<String> elementToListOfStrings(Element value) {
+    List<String> elements = new ArrayList<>();
+    if (value.getArray() != null) {
+      for (Element element : value.getArray().getElements()) {
+        elements.addAll(elementToListOfStrings(element));
+      }
+      return elements;
+    } else {
+      String v = elementToSingleString(value);
+      if (!v.isEmpty()) {
+        elements.add(v);
+      }
+    }
+    return elements;
+  }
+
+  /**
+   * Convert key-value pairs in an Element to a map, assuming that both the key and the value are
+   * strings.
+   */
+  public static Map<String, String> elementToStringMaps(Element value) {
+    Map<String, String> elements = new HashMap<>();
+    for (var element : value.getKeyvalue().getPairs()) {
+      elements.put(
+          element.getName().trim(),
+          StringUtil.removeQuotes(elementToSingleString(element.getValue())));
+    }
+    return elements;
+  }
+
+  // Various utility methods to convert various data types to Elements
+
+  /** Convert a <String, String> map to key-value pairs in an Element. */
+  public static Element toElement(Map<String, String> map) {
+    Element e = LfFactory.eINSTANCE.createElement();
+    if (map.size() == 0) return null;
+    else {
+      var kv = LfFactory.eINSTANCE.createKeyValuePairs();
+      for (var entry : map.entrySet()) {
+        var pair = LfFactory.eINSTANCE.createKeyValuePair();
+        pair.setName(entry.getKey());
+        var element = LfFactory.eINSTANCE.createElement();
+        element.setLiteral(StringUtil.addDoubleQuotes(entry.getValue()));
+        pair.setValue(element);
+        kv.getPairs().add(pair);
+      }
+      e.setKeyvalue(kv);
+    }
+
+    return e;
+  }
+
+  /**
+   * Given a single string, convert it into its AST representation. {@code addQuotes} controls if
+   * the generated representation should be accompanied by double quotes ("") or not.
+   */
+  private static Element toElement(String str, boolean addQuotes) {
+    if (str == null) return null;
+    var strToReturn = addQuotes ? StringUtil.addDoubleQuotes(str) : str;
+    Element e = LfFactory.eINSTANCE.createElement();
+    e.setLiteral(strToReturn);
+    return e;
+  }
+
+  /** Given a single string, convert it into its AST representation. */
+  public static Element toElement(String str) {
+    return toElement(str, true);
+  }
+
+  /**
+   * Given a list of strings, convert it into its AST representation. Stores the list in the Array
+   * field of the element, unless the list only has one string, in which case it is stored in the
+   * Literal field. Returns null if the provided list is empty.
+   */
+  public static Element toElement(List<String> list) {
+    Element e = LfFactory.eINSTANCE.createElement();
+    if (list.size() == 0) return null;
+    else if (list.size() == 1) {
+      return toElement(list.get(0));
+    } else {
+      var arr = LfFactory.eINSTANCE.createArray();
+      for (String s : list) {
+        arr.getElements().add(ASTUtils.toElement(s));
+      }
+      e.setArray(arr);
+    }
+    return e;
+  }
+
+  /**
+   * Convert a TimeValue to its AST representation. The value is type-cast to int in order to fit
+   * inside an Element.
+   */
+  public static Element toElement(TimeValue tv) {
+    Element e = LfFactory.eINSTANCE.createElement();
+    e.setTime((int) tv.time);
+    if (tv.unit != null) {
+      e.setUnit(tv.unit.toString());
+    }
+    return e;
+  }
+
+  public static Element toElement(boolean val) {
+    return toElement(Boolean.toString(val), false);
+  }
+
+  public static Element toElement(int val) {
+    return toElement(Integer.toString(val), false);
+  }
+
+  /**
+   * Translate the given type into its textual representation, but do not append any array
+   * specifications or type arguments.
+   *
+   * @param type AST node to render as string.
+   * @return Textual representation of the given argument.
+   */
+  public static String baseType(Type type) {
+    if (type != null) {
+      if (type.getCode() != null) {
+        return toText(type.getCode());
+      } else {
+        if (type.isTime()) {
+          return "time";
         } else {
-            return null;
-        }
-    }
-
-    /**
-     * If the parameter is of time type, return its default value.
-     * Otherwise, return null.
-     */
-    public static TimeValue getDefaultAsTimeValue(Parameter p) {
-        if (isOfTimeType(p)) {
-            var init = asSingleExpr(p.getInit());
-            if (init != null) {
-                return getLiteralTimeValue(init);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Return whether the given state variable is inferred
-     * to a time type.
-     */
-    public static boolean isOfTimeType(StateVar state) {
-        InferredType t = getInferredType(state);
-        return t.isTime && !t.isList;
-    }
-
-    /**
-     * Return whether the given parameter is inferred
-     * to a time type.
-     */
-    public static boolean isOfTimeType(Parameter param) {
-        InferredType t = getInferredType(param);
-        return t.isTime && !t.isList;
-    }
+          StringBuilder result = new StringBuilder(type.getId());
 
-    /**
-     *  Given a parameter, return its initial value.
-     *  The initial value is a list of instances of Expressions.
-     *
-     *  If the instantiations argument is null or an empty list, then the
-     *  value returned is simply the default value given when the parameter
-     *  is defined.
-     *
-     *  If a list of instantiations is given, then the first instantiation
-     *  is required to be an instantiation of the reactor class that is
-     *  parameterized by the parameter. I.e.,
-     *  <pre><code>     <span class="hljs-keyword">parameter</span>.eContainer <span class="hljs-comment">== instantiations.get(0).reactorClass</span>
-     * </code></pre><p> If a second instantiation is given, then it is required to be an instantiation of a
-     *  reactor class that contains the first instantiation.  That is,</p>
-     * <pre><code>     instantiations.<span class="hljs-keyword">get</span>(<span class="hljs-number">0</span>).eContainer == instantiations.<span class="hljs-keyword">get</span>(<span class="hljs-number">1</span>).reactorClass
-     * </code></pre><p> More generally, for all 0 &lt;= i &lt; instantiations.size - 1,</p>
-     * <pre><code>     instantiations.get(i)<span class="hljs-selector-class">.eContainer</span> == instantiations.get(<span class="hljs-selector-tag">i</span> + <span class="hljs-number">1</span>).reactorClass
-     * </code></pre><p> If any of these conditions is not satisfied, then an IllegalArgumentException
-     *  will be thrown.</p>
-     * <p> Note that this chain of reactions cannot be inferred from the parameter because
-     *  in each of the predicates above, there may be more than one instantiation that
-     *  can appear on the right hand side of the predicate.</p>
-     * <p> For example, consider the following program:</p>
-     * <pre><code>     reactor A(x:int(<span class="hljs-number">1</span>)) {}
-     *      reactor <span class="hljs-keyword">B(y:int(2)) </span>{
-     *          <span class="hljs-built_in">a1</span> = new A(x = y)<span class="hljs-comment">;</span>
-     *          <span class="hljs-built_in">a2</span> = new A(x = -<span class="hljs-number">1</span>)<span class="hljs-comment">;</span>
-     *      }
-     *      reactor C(z:int(<span class="hljs-number">3</span>)) {
-     *          <span class="hljs-keyword">b1 </span>= new <span class="hljs-keyword">B(y </span>= z)<span class="hljs-comment">;</span>
-     *          <span class="hljs-keyword">b2 </span>= new <span class="hljs-keyword">B(y </span>= -<span class="hljs-number">2</span>)<span class="hljs-comment">;</span>
-     *      }
-     * </code></pre><p> Notice that there are a total of four instances of reactor class A.
-     *  Then</p>
-     * <pre><code>     initialValue(<span class="hljs-name">x</span>, null) returns <span class="hljs-number">1</span>
-     *      initialValue(<span class="hljs-name">x</span>, [a1]) returns <span class="hljs-number">2</span>
-     *      initialValue(<span class="hljs-name">x</span>, [a2]) returns <span class="hljs-number">-1</span>
-     *      initialValue(<span class="hljs-name">x</span>, [a1, b1]) returns <span class="hljs-number">3</span>
-     *      initialValue(<span class="hljs-name">x</span>, [a2, b1]) returns <span class="hljs-number">-1</span>
-     *      initialValue(<span class="hljs-name">x</span>, [a1, b2]) returns <span class="hljs-number">-2</span>
-     *      initialValue(<span class="hljs-name">x</span>, [a2, b2]) returns <span class="hljs-number">-1</span>
-     * </code></pre><p> (Actually, in each of the above cases, the returned value is a list with
-     *  one entry, a Literal, e.g. [&quot;1&quot;]).</p>
-     * <p> There are two instances of reactor class B.</p>
-     * <pre><code>     initialValue(<span class="hljs-name">y</span>, null) returns <span class="hljs-number">2</span>
-     *      initialValue(<span class="hljs-name">y</span>, [a1]) throws an IllegalArgumentException
-     *      initialValue(<span class="hljs-name">y</span>, [b1]) returns <span class="hljs-number">3</span>
-     *      initialValue(<span class="hljs-name">y</span>, [b2]) returns <span class="hljs-number">-2</span>
-     * </code></pre>
-     * @param parameter The parameter.
-     * @param instantiations The (optional) list of instantiations.
-     *
-     * @return The value of the parameter.
-     *
-     * @throws IllegalArgumentException If an instantiation provided is not an
-     *  instantiation of the reactor class that is parameterized by the
-     *  respective parameter or if the chain of instantiations is not nested.
-     */
-    public static List<Expression> initialValue(Parameter parameter, List<Instantiation> instantiations) {
-        // If instantiations are given, then check to see whether this parameter gets overridden in
-        // the first of those instantiations.
-        if (instantiations != null && instantiations.size() > 0) {
-            // Check to be sure that the instantiation is in fact an instantiation
-            // of the reactor class for which this is a parameter.
-            Instantiation instantiation = instantiations.get(0);
-
-            if (!belongsTo(parameter, instantiation)) {
-                throw new IllegalArgumentException("Parameter "
-                    + parameter.getName()
-                    + " is not a parameter of reactor instance "
-                    + instantiation.getName()
-                    + "."
-                );
-            }
-            // In case there is more than one assignment to this parameter, we need to
-            // find the last one.
-            Assignment lastAssignment = null;
-            for (Assignment assignment: instantiation.getParameters()) {
-                if (assignment.getLhs().equals(parameter)) {
-                    lastAssignment = assignment;
-                }
-            }
-            if (lastAssignment != null) {
-                // Right hand side can be a list. Collect the entries.
-                List<Expression> result = new ArrayList<>();
-                for (Expression expr: lastAssignment.getRhs().getExprs()) {
-                    if (expr instanceof ParameterReference) {
-                        if (instantiations.size() > 1
-                            && instantiation.eContainer() != instantiations.get(1).getReactorClass()
-                        ) {
-                            throw new IllegalArgumentException("Reactor instance "
-                                    + instantiation.getName()
-                                    + " is not contained by instance "
-                                    + instantiations.get(1).getName()
-                                    + "."
-                            );
-                        }
-                        result.addAll(initialValue(((ParameterReference)expr).getParameter(),
-                                instantiations.subList(1, instantiations.size())));
-                    } else {
-                        result.add(expr);
-                    }
-                }
-                return result;
-            }
-        }
-        // If we reach here, then either no instantiation was supplied or
-        // there was no assignment in the instantiation. So just use the
-        // parameter's initial value.
-        return parameter.getInit().getExprs();
-    }
-
-    /**
-     * Return true if the specified object (a Parameter, Port, Action, or Timer)
-     * belongs to the specified instantiation, meaning that it is defined in
-     * the reactor class being instantiated or one of its base classes.
-     * @param eobject The object.
-     * @param instantiation The instantiation.
-     */
-    public static boolean belongsTo(EObject eobject, Instantiation instantiation) {
-        Reactor reactor = toDefinition(instantiation.getReactorClass());
-        return belongsTo(eobject, reactor);
-    }
-
-    /**
-     * Return true if the specified object (a Parameter, Port, Action, or Timer)
-     * belongs to the specified reactor, meaning that it is defined in
-     * reactor class or one of its base classes.
-     * @param eobject The object.
-     * @param reactor The reactor.
-     */
-    public static boolean belongsTo(EObject eobject, Reactor reactor) {
-        if (eobject.eContainer() == reactor) return true;
-        for (ReactorDecl baseClass : reactor.getSuperClasses()) {
-            if (belongsTo(eobject, toDefinition(baseClass))) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Given a parameter return its integer value or null
-     * if it does not have an integer value.
-     * If the value of the parameter is a list of integers,
-     * return the sum of value in the list.
-     * The instantiations parameter is as in
-     * {@link #initialValue(Parameter, List)}.
-     *
-     * @param parameter The parameter.
-     * @param instantiations The (optional) list of instantiations.
-     *
-     * @return The integer value of the parameter, or null if it does not have an integer value.
-     *
-     * @throws IllegalArgumentException If an instantiation provided is not an
-     *  instantiation of the reactor class that is parameterized by the
-     *  respective parameter or if the chain of instantiations is not nested.
-     */
-    public static Integer initialValueInt(Parameter parameter, List<Instantiation> instantiations) {
-        List<Expression> expressions = initialValue(parameter, instantiations);
-        int result = 0;
-        for (Expression expr: expressions) {
-            if (!(expr instanceof Literal)) {
-                return null;
-            }
-            try {
-                result += Integer.decode(((Literal) expr).getLiteral());
-            } catch (NumberFormatException ex) {
-                return null;
-            }
+          for (String s : convertToEmptyListIfNull(type.getStars())) {
+            result.append(s);
+          }
+          return result.toString();
         }
-        return result;
-    }
-
-    /**
-     * Given the width specification of port or instantiation
-     * and an (optional) list of nested instantiations, return
-     * the width if it can be determined and -1 if not.
-     * It will not be able to be determined if either the
-     * width is variable (in which case you should use
-     * {@link #inferPortWidth(VarRef, Connection, List)} )
-     * or the list of instantiations is incomplete or missing.
-     * If there are parameter references in the width, they are
-     * evaluated to the extent possible given the instantiations list.
-     *
-     * The instantiations list is as in
-     * {@link #initialValue(Parameter, List)}.
-     * If the spec belongs to an instantiation (for a bank of reactors),
-     * then the first element on this list should be the instantiation
-     * that contains this instantiation. If the spec belongs to a port,
-     * then the first element on the list should be the instantiation
-     * of the reactor that contains the port.
-     *
-     * @param spec The width specification or null (to return 1).
-     * @param instantiations The (optional) list of instantiations.
-     *
-     * @return The width, or -1 if the width could not be determined.
-     *
-     * @throws IllegalArgumentException If an instantiation provided is not as
-     *  given above or if the chain of instantiations is not nested.
-     */
-    public static int width(WidthSpec spec, List<Instantiation> instantiations) {
-        if (spec == null) {
-            return 1;
+      }
+    }
+    return "";
+  }
+
+  /**
+   * Report whether the given literal is zero or not.
+   *
+   * @param literal AST node to inspect.
+   * @return True if the given literal denotes the constant {@code 0}, false otherwise.
+   */
+  public static boolean isZero(String literal) {
+    try {
+      if (literal != null && Integer.parseInt(literal) == 0) {
+        return true;
+      }
+    } catch (NumberFormatException e) {
+      // Not an int.
+    }
+    return false;
+  }
+
+  /**
+   * Report whether the given expression is zero or not.
+   *
+   * @param expr AST node to inspect.
+   * @return True if the given value denotes the constant {@code 0}, false otherwise.
+   */
+  public static boolean isZero(Expression expr) {
+    if (expr instanceof Literal) {
+      return isZero(((Literal) expr).getLiteral());
+    }
+    return false;
+  }
+
+  /**
+   * Report whether the given string literal is an integer number or not.
+   *
+   * @param literal AST node to inspect.
+   * @return True if the given value is an integer, false otherwise.
+   */
+  public static boolean isInteger(String literal) {
+    try {
+      //noinspection ResultOfMethodCallIgnored
+      Integer.decode(literal);
+    } catch (NumberFormatException e) {
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * Report whether the given string literal is a boolean value or not.
+   *
+   * @param literal AST node to inspect.
+   * @return True if the given value is a boolean, false otherwise.
+   */
+  public static boolean isBoolean(String literal) {
+    return literal.equalsIgnoreCase("true") || literal.equalsIgnoreCase("false");
+  }
+
+  /**
+   * Report whether the given string literal is a float value or not.
+   *
+   * @param literal AST node to inspect.
+   * @return True if the given value is a float, false otherwise.
+   */
+  public static boolean isFloat(String literal) {
+    try {
+      //noinspection ResultOfMethodCallIgnored
+      Float.parseFloat(literal);
+    } catch (NumberFormatException e) {
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * Report whether the given code is an integer number or not.
+   *
+   * @param code AST node to inspect.
+   * @return True if the given code is an integer, false otherwise.
+   */
+  public static boolean isInteger(Code code) {
+    return isInteger(toText(code));
+  }
+
+  /**
+   * Report whether the given expression is an integer number or not.
+   *
+   * @param expr AST node to inspect.
+   * @return True if the given value is an integer, false otherwise.
+   */
+  public static boolean isInteger(Expression expr) {
+    if (expr instanceof Literal) {
+      return isInteger(((Literal) expr).getLiteral());
+    } else if (expr instanceof Code) {
+      return isInteger((Code) expr);
+    }
+    return false;
+  }
+
+  /**
+   * Report whether the given expression denotes a valid time or not.
+   *
+   * @param expr AST node to inspect.
+   * @return True if the argument denotes a valid time, false otherwise.
+   */
+  public static boolean isValidTime(Expression expr) {
+    if (expr instanceof ParameterReference) {
+      return isOfTimeType(((ParameterReference) expr).getParameter());
+    } else if (expr instanceof Time) {
+      return isValidTime((Time) expr);
+    } else if (expr instanceof Literal) {
+      return isZero(((Literal) expr).getLiteral());
+    }
+    return false;
+  }
+
+  /**
+   * Report whether the given time denotes a valid time or not.
+   *
+   * @param t AST node to inspect.
+   * @return True if the argument denotes a valid time, false otherwise.
+   */
+  public static boolean isValidTime(Time t) {
+    if (t == null) return false;
+    String unit = t.getUnit();
+    return t.getInterval() == 0 || TimeUnit.isValidUnit(unit);
+  }
+
+  /** If the initializer contains exactly one expression, return it. Otherwise, return null. */
+  public static Expression asSingleExpr(Initializer init) {
+    if (init == null) {
+      return null;
+    }
+    var exprs = init.getExprs();
+    return exprs.size() == 1 ? exprs.get(0) : null;
+  }
+
+  public static boolean isSingleExpr(Initializer init) {
+    // todo expand that to = initialization
+    if (init == null) {
+      return false;
+    }
+    var exprs = init.getExprs();
+    return exprs.size() == 1;
+  }
+
+  public static boolean isListInitializer(Initializer init) {
+    return init != null && !isSingleExpr(init);
+  }
+
+  /**
+   * Return the type of a declaration with the given (nullable) explicit type, and the given
+   * (nullable) initializer. If the explicit type is null, then the type is inferred from the
+   * initializer. Only two types can be inferred: "time" and "timeList". Return the "undefined" type
+   * if neither can be inferred.
+   *
+   * @param type Explicit type declared on the declaration
+   * @param init The initializer expression
+   * @return The inferred type, or "undefined" if none could be inferred.
+   */
+  public static InferredType getInferredType(Type type, Initializer init) {
+    if (type != null) {
+      return InferredType.fromAST(type);
+    } else if (init == null) {
+      return InferredType.undefined();
+    }
+
+    var single = asSingleExpr(init);
+    if (single != null) {
+      // If there is a single element in the list, and it is a proper
+      // time value with units, we infer the type "time".
+      if (single instanceof ParameterReference) {
+        return getInferredType(((ParameterReference) single).getParameter());
+      } else if (single instanceof Time) {
+        return InferredType.time();
+      }
+    } else if (init.getExprs().size() > 1) {
+      // If there are multiple elements in the list, and there is at
+      // least one proper time value with units, and all other elements
+      // are valid times (including zero without units), we infer the
+      // type "time list".
+      var allValidTime = true;
+      var foundNonZero = false;
+
+      for (var e : init.getExprs()) {
+        if (!ASTUtils.isValidTime(e)) {
+          allValidTime = false;
         }
-        if (spec.isOfVariableLength() && spec.eContainer() instanceof Instantiation) {
-            return inferWidthFromConnections(spec, instantiations);
+        if (!ASTUtils.isZero(e)) {
+          foundNonZero = true;
         }
-        var result = 0;
-        for (WidthTerm term: spec.getTerms()) {
-            if (term.getParameter() != null) {
-                Integer termWidth = initialValueInt(term.getParameter(), instantiations);
-                if (termWidth != null) {
-                    result += termWidth;
-                } else {
-                    return -1;
-                }
-            } else if (term.getWidth() > 0) {
-                result += term.getWidth();
-            } else {
-                // If the width cannot be determined because term's width <= 0, which means the term's width
-                // must be inferred, try to infer the width using connections.
-                if (spec.eContainer() instanceof Instantiation) {
-                    try {
-                        return inferWidthFromConnections(spec, instantiations);
-                    } catch (InvalidSourceException e) {
-                        // If the inference fails, return -1.
-                        return -1;
-                    }
-                }
-            }
+      }
+
+      if (allValidTime && foundNonZero) {
+        // Conservatively, no bounds are inferred; the returned type
+        // is a variable-size list.
+        return InferredType.timeList();
+      }
+    }
+    return InferredType.undefined();
+  }
+
+  /**
+   * Given a parameter, return an inferred type. Only two types can be inferred: "time" and
+   * "timeList". Return the "undefined" type if neither can be inferred.
+   *
+   * @param p A parameter to infer the type of.
+   * @return The inferred type, or "undefined" if none could be inferred.
+   */
+  public static InferredType getInferredType(Parameter p) {
+    return getInferredType(p.getType(), p.getInit());
+  }
+
+  /**
+   * Given a state variable, return an inferred type. Only two types can be inferred: "time" and
+   * "timeList". Return the "undefined" type if neither can be inferred.
+   *
+   * @param s A state variable to infer the type of.
+   * @return The inferred type, or "undefined" if none could be inferred.
+   */
+  public static InferredType getInferredType(StateVar s) {
+    return getInferredType(s.getType(), s.getInit());
+  }
+
+  /**
+   * Construct an inferred type from an "action" AST node based on its declared type. If no type is
+   * declared, return the "undefined" type.
+   *
+   * @param a An action to construct an inferred type object for.
+   * @return The inferred type, or "undefined" if none was declared.
+   */
+  public static InferredType getInferredType(Action a) {
+    return getInferredType(a.getType(), null);
+  }
+
+  /**
+   * Construct an inferred type from a "port" AST node based on its declared type. If no type is
+   * declared, return the "undefined" type.
+   *
+   * @param p A port to construct an inferred type object for.
+   * @return The inferred type, or "undefined" if none was declared.
+   */
+  public static InferredType getInferredType(Port p) {
+    return getInferredType(p.getType(), null);
+  }
+
+  /**
+   * If the given string can be recognized as a floating-point number that has a leading decimal
+   * point, prepend the string with a zero and return it. Otherwise, return the original string.
+   *
+   * @param literal A string might be recognizable as a floating point number with a leading decimal
+   *     point.
+   * @return an equivalent representation of <code>literal
+   * </code>
+   */
+  public static String addZeroToLeadingDot(String literal) {
+    Matcher m = ABBREVIATED_FLOAT.matcher(literal);
+    if (m.matches()) {
+      return literal.replace(".", "0.");
+    }
+    return literal;
+  }
+
+  /**
+   * Return true if the specified port is a multiport.
+   *
+   * @param port The port.
+   * @return True if the port is a multiport.
+   */
+  public static boolean isMultiport(Port port) {
+    return port.getWidthSpec() != null;
+  }
+
+  ////////////////////////////////
+  //// Utility functions for translating AST nodes into text
+  // This is a continuation of a large section of ASTUtils.xtend
+  // with the same name.
+
+  /**
+   * Generate code for referencing a port, action, or timer.
+   *
+   * @param reference The reference to the variable.
+   */
+  public static String generateVarRef(VarRef reference) {
+    var prefix = "";
+    if (reference.getContainer() != null) {
+      prefix = reference.getContainer().getName() + ".";
+    }
+    return prefix + reference.getVariable().getName();
+  }
+
+  /** Assuming that the given expression denotes a valid time literal, return a time value. */
+  public static TimeValue getLiteralTimeValue(Expression expr) {
+    if (expr instanceof Time) {
+      return toTimeValue((Time) expr);
+    } else if (expr instanceof Literal && isZero(((Literal) expr).getLiteral())) {
+      return TimeValue.ZERO;
+    } else {
+      return null;
+    }
+  }
+
+  /** If the parameter is of time type, return its default value. Otherwise, return null. */
+  public static TimeValue getDefaultAsTimeValue(Parameter p) {
+    if (isOfTimeType(p)) {
+      var init = asSingleExpr(p.getInit());
+      if (init != null) {
+        return getLiteralTimeValue(init);
+      }
+    }
+    return null;
+  }
+
+  /** Return whether the given state variable is inferred to a time type. */
+  public static boolean isOfTimeType(StateVar state) {
+    InferredType t = getInferredType(state);
+    return t.isTime && !t.isList;
+  }
+
+  /** Return whether the given parameter is inferred to a time type. */
+  public static boolean isOfTimeType(Parameter param) {
+    InferredType t = getInferredType(param);
+    return t.isTime && !t.isList;
+  }
+
+  /**
+   * Given a parameter, return its initial value. The initial value is a list of instances of
+   * Expressions.
+   *
+   * <p>If the instantiations argument is null or an empty list, then the value returned is simply
+   * the default value given when the parameter is defined.
+   *
+   * <p>If a list of instantiations is given, then the first instantiation is required to be an
+   * instantiation of the reactor class that is parameterized by the parameter. I.e.,
+   *
+   * <pre>
+   * <code>     <span class="hljs-keyword">parameter</span>.eContainer <span class="hljs-comment">== instantiations.get(0).reactorClass</span>
+   * </code></pre>
+   *
+   * <p>If a second instantiation is given, then it is required to be an instantiation of a reactor
+   * class that contains the first instantiation. That is,
+   *
+   * <pre>
+   * <code>     instantiations.<span class="hljs-keyword">get</span>(<span class="hljs-number">0</span>).eContainer == instantiations.<span class="hljs-keyword">get</span>(<span class="hljs-number">1</span>).reactorClass
+   * </code></pre>
+   *
+   * <p>More generally, for all 0 &lt;= i &lt; instantiations.size - 1,
+   *
+   * <pre>
+   * <code>     instantiations.get(i)<span class="hljs-selector-class">.eContainer</span> == instantiations.get(<span class="hljs-selector-tag">i</span> + <span class="hljs-number">1</span>).reactorClass
+   * </code></pre>
+   *
+   * <p>If any of these conditions is not satisfied, then an IllegalArgumentException will be
+   * thrown.
+   *
+   * <p>Note that this chain of reactions cannot be inferred from the parameter because in each of
+   * the predicates above, there may be more than one instantiation that can appear on the right
+   * hand side of the predicate.
+   *
+   * <p>For example, consider the following program:
+   *
+   * <pre><code>     reactor A(x:int(<span class="hljs-number">1</span>)) {}
+   *      reactor <span class="hljs-keyword">B(y:int(2)) </span>{
+   *          <span class="hljs-built_in">a1</span> = new A(x = y)<span class="hljs-comment">;</span>
+   *          <span class="hljs-built_in">a2</span> = new A(x = -<span class="hljs-number">1</span>)<span class="hljs-comment">;</span>
+   *      }
+   *      reactor C(z:int(<span class="hljs-number">3</span>)) {
+   *          <span class="hljs-keyword">b1 </span>= new <span class="hljs-keyword">B(y </span>= z)<span class="hljs-comment">;</span>
+   *          <span class="hljs-keyword">b2 </span>= new <span class="hljs-keyword">B(y </span>= -<span class="hljs-number">2</span>)<span class="hljs-comment">;</span>
+   *      }
+   * </code></pre>
+   *
+   * <p>Notice that there are a total of four instances of reactor class A. Then
+   *
+   * <pre>
+   * <code>     initialValue(<span class="hljs-name">x</span>, null) returns <span class="hljs-number">1</span>
+   *      initialValue(<span class="hljs-name">x</span>, [a1]) returns <span class="hljs-number">2</span>
+   *      initialValue(<span class="hljs-name">x</span>, [a2]) returns <span class="hljs-number">-1</span>
+   *      initialValue(<span class="hljs-name">x</span>, [a1, b1]) returns <span class="hljs-number">3</span>
+   *      initialValue(<span class="hljs-name">x</span>, [a2, b1]) returns <span class="hljs-number">-1</span>
+   *      initialValue(<span class="hljs-name">x</span>, [a1, b2]) returns <span class="hljs-number">-2</span>
+   *      initialValue(<span class="hljs-name">x</span>, [a2, b2]) returns <span class="hljs-number">-1</span>
+   * </code></pre>
+   *
+   * <p>(Actually, in each of the above cases, the returned value is a list with one entry, a
+   * Literal, e.g. [&quot;1&quot;]).
+   *
+   * <p>There are two instances of reactor class B.
+   *
+   * <pre>
+   * <code>     initialValue(<span class="hljs-name">y</span>, null) returns <span class="hljs-number">2</span>
+   *      initialValue(<span class="hljs-name">y</span>, [a1]) throws an IllegalArgumentException
+   *      initialValue(<span class="hljs-name">y</span>, [b1]) returns <span class="hljs-number">3</span>
+   *      initialValue(<span class="hljs-name">y</span>, [b2]) returns <span class="hljs-number">-2</span>
+   * </code></pre>
+   *
+   * @param parameter The parameter.
+   * @param instantiations The (optional) list of instantiations.
+   * @return The value of the parameter.
+   * @throws IllegalArgumentException If an instantiation provided is not an instantiation of the
+   *     reactor class that is parameterized by the respective parameter or if the chain of
+   *     instantiations is not nested.
+   */
+  public static List<Expression> initialValue(
+      Parameter parameter, List<Instantiation> instantiations) {
+    // If instantiations are given, then check to see whether this parameter gets overridden in
+    // the first of those instantiations.
+    if (instantiations != null && instantiations.size() > 0) {
+      // Check to be sure that the instantiation is in fact an instantiation
+      // of the reactor class for which this is a parameter.
+      Instantiation instantiation = instantiations.get(0);
+
+      if (!belongsTo(parameter, instantiation)) {
+        throw new IllegalArgumentException(
+            "Parameter "
+                + parameter.getName()
+                + " is not a parameter of reactor instance "
+                + instantiation.getName()
+                + ".");
+      }
+      // In case there is more than one assignment to this parameter, we need to
+      // find the last one.
+      Assignment lastAssignment = null;
+      for (Assignment assignment : instantiation.getParameters()) {
+        if (assignment.getLhs().equals(parameter)) {
+          lastAssignment = assignment;
         }
-        return result;
-    }
-
-    /**
-     * Infer the width of a port reference in a connection.
-     * The port reference one or two parts, a port and an (optional) container
-     * which is an Instantiation that may refer to a bank of reactors.
-     * The width will be the product of the bank width and the port width.
-     * The returned value will be 1 if the port is not in a bank and is not a multiport.
-     *
-     * If the width cannot be determined, this will return -1.
-     * The width cannot be determined if the list of instantiations is
-     * missing or incomplete.
-     *
-     * The instantiations list is as in
-     * {@link #initialValue(Parameter, List)}.
-     * The first element on this list should be the instantiation
-     * that contains the specified connection.
-     *
-     * @param reference A port reference.
-     * @param connection A connection, or null if not in the context of a connection.
-     * @param instantiations The (optional) list of instantiations.
-     *
-     * @return The width or -1 if it could not be determined.
-     *
-     * @throws IllegalArgumentException If an instantiation provided is not as
-     *  given above or if the chain of instantiations is not nested.
-     */
-    public static int inferPortWidth(
-        VarRef reference, Connection connection, List<Instantiation> instantiations
-    ) {
-        if (reference.getVariable() instanceof Port) {
-            // If the port is given as a.b, then we want to prepend a to
-            // the list of instantiations to determine the width of this port.
-            List<Instantiation> extended = instantiations;
-            if (reference.getContainer() != null) {
-                extended = new ArrayList<>();
-                extended.add(reference.getContainer());
-                if (instantiations != null) {
-                    extended.addAll(instantiations);
-                }
-            }
-
-            int portWidth = width(((Port) reference.getVariable()).getWidthSpec(), extended);
-            if (portWidth < 0) {
-                // Could not determine port width.
-                return -1;
+      }
+      if (lastAssignment != null) {
+        // Right hand side can be a list. Collect the entries.
+        List<Expression> result = new ArrayList<>();
+        for (Expression expr : lastAssignment.getRhs().getExprs()) {
+          if (expr instanceof ParameterReference) {
+            if (instantiations.size() > 1
+                && instantiation.eContainer() != instantiations.get(1).getReactorClass()) {
+              throw new IllegalArgumentException(
+                  "Reactor instance "
+                      + instantiation.getName()
+                      + " is not contained by instance "
+                      + instantiations.get(1).getName()
+                      + ".");
             }
-
-            // Next determine the bank width. This may be unspecified, in which
-            // case it has to be inferred using the connection.
-            int bankWidth = 1;
-            if (reference.getContainer() != null) {
-                bankWidth = width(reference.getContainer().getWidthSpec(), instantiations);
-                if (bankWidth < 0 && connection != null) {
-                    // Try to infer the bank width from the connection.
-                    if (reference.getContainer().getWidthSpec().isOfVariableLength()) {
-                        // This occurs for a bank of delays.
-                        int leftWidth = 0;
-                        int rightWidth = 0;
-                        int leftOrRight = 0;
-                        for (VarRef leftPort : connection.getLeftPorts()) {
-                            if (leftPort == reference) {
-                                if (leftOrRight != 0) {
-                                    throw new InvalidSourceException("Multiple ports with variable width on a connection.");
-                                }
-                                // Indicate that this port is on the left.
-                                leftOrRight = -1;
-                            } else {
-                                // The left port is not the same as this reference.
-                                int otherWidth = inferPortWidth(leftPort, connection, instantiations);
-                                if (otherWidth < 0) {
-                                    // Cannot determine width.
-                                    return -1;
-                                }
-                                leftWidth += otherWidth;
-                            }
-                        }
-                        for (VarRef rightPort : connection.getRightPorts()) {
-                            if (rightPort == reference) {
-                                if (leftOrRight != 0) {
-                                    throw new InvalidSourceException("Multiple ports with variable width on a connection.");
-                                }
-                                // Indicate that this port is on the right.
-                                leftOrRight = 1;
-                            } else {
-                                int otherWidth = inferPortWidth(rightPort, connection, instantiations);
-                                if (otherWidth < 0) {
-                                    // Cannot determine width.
-                                    return -1;
-                                }
-                                rightWidth += otherWidth;
-                            }
-                        }
-                        int discrepancy = 0;
-                        if (leftOrRight < 0) {
-                            // This port is on the left.
-                            discrepancy = rightWidth - leftWidth;
-                        } else if (leftOrRight > 0) {
-                            // This port is on the right.
-                            discrepancy = leftWidth - rightWidth;
-                        }
-                        // Check that portWidth divides the discrepancy.
-                        if (discrepancy % portWidth != 0) {
-                            // This is an error.
-                            return -1;
-                        }
-                        bankWidth = discrepancy / portWidth;
-                    } else {
-                        // Could not determine the bank width.
-                        return -1;
-                    }
-                }
-            }
-            return portWidth * bankWidth;
-        }
-        // Argument is not a port.
-        return -1;
-    }
-
-    /**
-     * Given an instantiation of a reactor or bank of reactors, return
-     * the width. This will be 1 if this is not a reactor bank. Otherwise,
-     * this will attempt to determine the width. If the width is declared
-     * as a literal constant, it will return that constant. If the width
-     * is specified as a reference to a parameter, this will throw an
-     * exception. If the width is variable, this will find
-     * connections in the enclosing reactor and attempt to infer the
-     * width. If the width cannot be determined, it will throw an exception.
-     *
-     * IMPORTANT: This method should not be used you really need to
-     * determine the width! It will not evaluate parameter values.
-     * @see #width(WidthSpec, List)
-     *
-     * @param instantiation A reactor instantiation.
-     *
-     * @return The width, if it can be determined.
-     * @deprecated
-     */
-    @Deprecated
-    public static int widthSpecification(Instantiation instantiation) {
-        int result = width(instantiation.getWidthSpec(), null);
-        if (result < 0) {
-            throw new InvalidSourceException("Cannot determine width for the instance "
-                    + instantiation.getName());
+            result.addAll(
+                initialValue(
+                    ((ParameterReference) expr).getParameter(),
+                    instantiations.subList(1, instantiations.size())));
+          } else {
+            result.add(expr);
+          }
         }
         return result;
-    }
-
-    /**
-     * Report whether a state variable has been initialized or not.
-     * @param v The state variable to be checked.
-     * @return True if the variable was initialized, false otherwise.
-     */
-    public static boolean isInitialized(StateVar v) {
-        return v != null && v.getInit() != null;
-    }
-
-    /**
-     * Report whether the given time state variable is initialized using a
-     * parameter or not.
-     * @param s A state variable.
-     * @return True if the argument is initialized using a parameter, false
-     * otherwise.
-     */
-    public static boolean isParameterized(StateVar s) {
-        return s.getInit() != null &&
-               IterableExtensions.exists(s.getInit().getExprs(), it -> it instanceof ParameterReference);
-    }
-
-    /**
-     * Check if the reactor class uses generics
-     * @param r the reactor to check
-     * @return true if the reactor uses generics
-     */
-    public static boolean isGeneric(Reactor r) {
-        if (r == null) {
-            return false;
-        }
-        return r.getTypeParms().size() != 0;
-    }
-
-    /**
-     * If the specified reactor declaration is an import, then
-     * return the imported reactor class definition. Otherwise,
-     * just return the argument.
-     * @param r A Reactor or an ImportedReactor.
-     * @return The Reactor class definition or null if no definition is found.
-     */
-    public static Reactor toDefinition(ReactorDecl r) {
-        if (r == null)
-            return null;
-        if (r instanceof Reactor) {
-            return (Reactor) r;
-        } else if (r instanceof ImportedReactor) {
-            return ((ImportedReactor) r).getReactorClass();
-        }
+      }
+    }
+    // If we reach here, then either no instantiation was supplied or
+    // there was no assignment in the instantiation. So just use the
+    // parameter's initial value.
+    return parameter.getInit().getExprs();
+  }
+
+  /**
+   * Return true if the specified object (a Parameter, Port, Action, or Timer) belongs to the
+   * specified instantiation, meaning that it is defined in the reactor class being instantiated or
+   * one of its base classes.
+   *
+   * @param eobject The object.
+   * @param instantiation The instantiation.
+   */
+  public static boolean belongsTo(EObject eobject, Instantiation instantiation) {
+    Reactor reactor = toDefinition(instantiation.getReactorClass());
+    return belongsTo(eobject, reactor);
+  }
+
+  /**
+   * Return true if the specified object (a Parameter, Port, Action, or Timer) belongs to the
+   * specified reactor, meaning that it is defined in reactor class or one of its base classes.
+   *
+   * @param eobject The object.
+   * @param reactor The reactor.
+   */
+  public static boolean belongsTo(EObject eobject, Reactor reactor) {
+    if (eobject.eContainer() == reactor) return true;
+    for (ReactorDecl baseClass : reactor.getSuperClasses()) {
+      if (belongsTo(eobject, toDefinition(baseClass))) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Given a parameter return its integer value or null if it does not have an integer value. If the
+   * value of the parameter is a list of integers, return the sum of value in the list. The
+   * instantiations parameter is as in {@link #initialValue(Parameter, List)}.
+   *
+   * @param parameter The parameter.
+   * @param instantiations The (optional) list of instantiations.
+   * @return The integer value of the parameter, or null if it does not have an integer value.
+   * @throws IllegalArgumentException If an instantiation provided is not an instantiation of the
+   *     reactor class that is parameterized by the respective parameter or if the chain of
+   *     instantiations is not nested.
+   */
+  public static Integer initialValueInt(Parameter parameter, List<Instantiation> instantiations) {
+    List<Expression> expressions = initialValue(parameter, instantiations);
+    int result = 0;
+    for (Expression expr : expressions) {
+      if (!(expr instanceof Literal)) {
         return null;
-    }
-
-    /**
-     * Return all single-line or multi-line comments immediately preceding the
-     * given EObject.
-     */
-    public static Stream<String> getPrecedingComments(
-        ICompositeNode compNode,
-        Predicate<INode> filter
-    ) {
-        return getPrecedingCommentNodes(compNode, filter).map(INode::getText);
-    }
-
-    /**
-     * Return all single-line or multi-line comments immediately preceding the
-     * given EObject.
-     */
-    public static Stream<INode> getPrecedingCommentNodes(
-        ICompositeNode compNode,
-        Predicate<INode> filter
-    ) {
-        if (compNode == null) return Stream.of();
-        List<INode> ret = new ArrayList<>();
-        for (INode node : compNode.getAsTreeIterable()) {
-            if (!(node instanceof ICompositeNode)) {
-                if (isComment(node)) {
-                    if (filter.test(node)) ret.add(node);
-                } else if (!node.getText().isBlank()) {
-                    break;
-                }
-            }
-        }
-        return ret.stream();
-    }
-
-    /** Return whether {@code node} is a comment. */
-    public static boolean isComment(INode node) {
-        return node instanceof HiddenLeafNode hlNode
-            && hlNode.getGrammarElement() instanceof TerminalRule tRule
-            && tRule.getName().endsWith("_COMMENT");
-    }
-
-    /**
-     * Return true if the given node starts on the same line as the given other
-     * node.
-     */
-    public static Predicate<INode> sameLine(ICompositeNode compNode) {
-        return other -> {
-            for (INode node : compNode.getAsTreeIterable()) {
-                if (!(node instanceof ICompositeNode) && !node.getText().isBlank() && !isComment(node)) {
-                    return node.getStartLine() == other.getStartLine();
-                }
-            }
-            return false;
-        };
-    }
-
-    /**
-     * Find the main reactor and set its name if none was defined.
-     * @param resource The resource to find the main reactor in.
-     */
-    public static void setMainName(Resource resource, String name) {
-        Reactor main = IteratorExtensions.findFirst(Iterators.filter(resource.getAllContents(), Reactor.class),
-            it -> it.isMain() || it.isFederated()
-        );
-        if (main != null && StringExtensions.isNullOrEmpty(main.getName())) {
-            main.setName(name);
-        }
-    }
-
-    /**
-     * Create a new instantiation node with the given reactor as its defining class.
-     * @param reactor The reactor class to create an instantiation of.
-     */
-    public static Instantiation createInstantiation(Reactor reactor) {
-        Instantiation inst = LfFactory.eINSTANCE.createInstantiation();
-        inst.setReactorClass(reactor);
-        // If the reactor is federated or at the top level, then it
-        // may not have a name. In the generator's doGenerate()
-        // method, the name gets set using setMainName().
-        // But this may be called before that, e.g. during
-        // diagram synthesis.  We assign a temporary name here.
-        if (reactor.getName() == null) {
-            if (reactor.isFederated() || reactor.isMain()) {
-                inst.setName("main");
-            } else {
-                inst.setName("");
-            }
-
+      }
+      try {
+        result += Integer.decode(((Literal) expr).getLiteral());
+      } catch (NumberFormatException ex) {
+        return null;
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Given the width specification of port or instantiation and an (optional) list of nested
+   * instantiations, return the width if it can be determined and -1 if not. It will not be able to
+   * be determined if either the width is variable (in which case you should use {@link
+   * #inferPortWidth(VarRef, Connection, List)} ) or the list of instantiations is incomplete or
+   * missing. If there are parameter references in the width, they are evaluated to the extent
+   * possible given the instantiations list.
+   *
+   * <p>The instantiations list is as in {@link #initialValue(Parameter, List)}. If the spec belongs
+   * to an instantiation (for a bank of reactors), then the first element on this list should be the
+   * instantiation that contains this instantiation. If the spec belongs to a port, then the first
+   * element on the list should be the instantiation of the reactor that contains the port.
+   *
+   * @param spec The width specification or null (to return 1).
+   * @param instantiations The (optional) list of instantiations.
+   * @return The width, or -1 if the width could not be determined.
+   * @throws IllegalArgumentException If an instantiation provided is not as given above or if the
+   *     chain of instantiations is not nested.
+   */
+  public static int width(WidthSpec spec, List<Instantiation> instantiations) {
+    if (spec == null) {
+      return 1;
+    }
+    if (spec.isOfVariableLength() && spec.eContainer() instanceof Instantiation) {
+      return inferWidthFromConnections(spec, instantiations);
+    }
+    var result = 0;
+    for (WidthTerm term : spec.getTerms()) {
+      if (term.getParameter() != null) {
+        Integer termWidth = initialValueInt(term.getParameter(), instantiations);
+        if (termWidth != null) {
+          result += termWidth;
         } else {
-            inst.setName(reactor.getName());
+          return -1;
         }
-        return inst;
-    }
-
-    /**
-     * Returns the target declaration in the given model.
-     * Non-null because it would cause a parse error.
-     */
-    public static TargetDecl targetDecl(Model model) {
-        return IteratorExtensions.head(Iterators.filter(model.eAllContents(), TargetDecl.class));
-    }
-
-    /**
-     * Returns the target declaration in the given resource.
-     * Non-null because it would cause a parse error.
-     */
-    public static TargetDecl targetDecl(Resource model) {
-        return IteratorExtensions.head(Iterators.filter(model.getAllContents(), TargetDecl.class));
-    }
-
-    /////////////////////////////////////////////////////////
-    //// Private methods
-
-    /**
-     * Returns the list if it is not null. Otherwise, return an empty list.
-     */
-    public static <T> List<T> convertToEmptyListIfNull(List<T> list) {
-        return list != null ? list : new ArrayList<>();
-    }
-
-    /**
-     * Return all the superclasses of the specified reactor
-     * in deepest-first order. For example, if A extends B and C, and
-     * B and C both extend D, this will return the list [D, B, C, A].
-     * Duplicates are removed. If the specified reactor does not extend
-     * any other reactor, then return an empty list.
-     * If a cycle is found, where X extends Y and Y extends X, or if
-     * a superclass is declared that is not found, then return null.
-     * @param reactor The specified reactor.
-     * @param extensions A set of reactors extending the specified reactor
-     *  (used to detect circular extensions).
-     */
-    private static LinkedHashSet<Reactor> superClasses(Reactor reactor, Set<Reactor> extensions) {
-        LinkedHashSet<Reactor> result = new LinkedHashSet<>();
-        for (ReactorDecl superDecl : convertToEmptyListIfNull(reactor.getSuperClasses())) {
-            Reactor r = toDefinition(superDecl);
-            if (r == reactor || r == null) return null;
-            // If r is in the extensions, then we have a circular inheritance structure.
-            if (extensions.contains(r)) return null;
-            extensions.add(r);
-            LinkedHashSet<Reactor> baseExtends = superClasses(r, extensions);
-            extensions.remove(r);
-            if (baseExtends == null) return null;
-            result.addAll(baseExtends);
-            result.add(r);
+      } else if (term.getWidth() > 0) {
+        result += term.getWidth();
+      } else {
+        // If the width cannot be determined because term's width <= 0, which means the term's width
+        // must be inferred, try to infer the width using connections.
+        if (spec.eContainer() instanceof Instantiation) {
+          try {
+            return inferWidthFromConnections(spec, instantiations);
+          } catch (InvalidSourceException e) {
+            // If the inference fails, return -1.
+            return -1;
+          }
         }
-        return result;
-    }
-
-    /**
-     * Return all the file-level preambles in the files that define the
-     * specified class and its superclasses in deepest-first order.
-     * Duplicates are removed. If there are no file-level preambles,
-     * then return an empty list.
-     * If a cycle is found, where X extends Y and Y extends X, or if
-     * a superclass is declared that is not found, then return null.
-     * @param reactor The specified reactor.
-     * @param extensions A set of reactors extending the specified reactor
-     *  (used to detect circular extensions).
-     */
-    private static LinkedHashSet<Preamble> allFileLevelPreambles(Reactor reactor, Set<Reactor> extensions) {
-        LinkedHashSet<Preamble> result = new LinkedHashSet<>();
-        for (ReactorDecl superDecl : convertToEmptyListIfNull(reactor.getSuperClasses())) {
-            Reactor r = toDefinition(superDecl);
-            if (r == reactor || r == null) return null;
-            // If r is in the extensions, then we have a circular inheritance structure.
-            if (extensions.contains(r)) return null;
-            extensions.add(r);
-            LinkedHashSet<Preamble> basePreambles = allFileLevelPreambles(r, extensions);
-            extensions.remove(r);
-            if (basePreambles == null) return null;
-            result.addAll(basePreambles);
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Infer the width of a port reference in a connection. The port reference one or two parts, a
+   * port and an (optional) container which is an Instantiation that may refer to a bank of
+   * reactors. The width will be the product of the bank width and the port width. The returned
+   * value will be 1 if the port is not in a bank and is not a multiport.
+   *
+   * <p>If the width cannot be determined, this will return -1. The width cannot be determined if
+   * the list of instantiations is missing or incomplete.
+   *
+   * <p>The instantiations list is as in {@link #initialValue(Parameter, List)}. The first element
+   * on this list should be the instantiation that contains the specified connection.
+   *
+   * @param reference A port reference.
+   * @param connection A connection, or null if not in the context of a connection.
+   * @param instantiations The (optional) list of instantiations.
+   * @return The width or -1 if it could not be determined.
+   * @throws IllegalArgumentException If an instantiation provided is not as given above or if the
+   *     chain of instantiations is not nested.
+   */
+  public static int inferPortWidth(
+      VarRef reference, Connection connection, List<Instantiation> instantiations) {
+    if (reference.getVariable() instanceof Port) {
+      // If the port is given as a.b, then we want to prepend a to
+      // the list of instantiations to determine the width of this port.
+      List<Instantiation> extended = instantiations;
+      if (reference.getContainer() != null) {
+        extended = new ArrayList<>();
+        extended.add(reference.getContainer());
+        if (instantiations != null) {
+          extended.addAll(instantiations);
         }
-        result.addAll(((Model) reactor.eContainer()).getPreambles());
-        return result;
-    }
+      }
 
-    /**
-     * We may be able to infer the width by examining the connections of
-     * the enclosing reactor definition. This works, for example, with
-     * delays between multiports or banks of reactors.
-     * Attempt to infer the width from connections and return -1 if the width cannot be inferred.
-     *
-     * @param spec The width specification or null (to return 1).
-     * @param instantiations The (optional) list of instantiations.
-     *
-     * @return The width, or -1 if the width could not be inferred from connections.
-     */
-    private static int inferWidthFromConnections(WidthSpec spec, List<Instantiation> instantiations) {
-        for (Connection c : ((Reactor) spec.eContainer().eContainer()).getConnections()) {
+      int portWidth = width(((Port) reference.getVariable()).getWidthSpec(), extended);
+      if (portWidth < 0) {
+        // Could not determine port width.
+        return -1;
+      }
+
+      // Next determine the bank width. This may be unspecified, in which
+      // case it has to be inferred using the connection.
+      int bankWidth = 1;
+      if (reference.getContainer() != null) {
+        bankWidth = width(reference.getContainer().getWidthSpec(), instantiations);
+        if (bankWidth < 0 && connection != null) {
+          // Try to infer the bank width from the connection.
+          if (reference.getContainer().getWidthSpec().isOfVariableLength()) {
+            // This occurs for a bank of delays.
             int leftWidth = 0;
             int rightWidth = 0;
             int leftOrRight = 0;
-            for (VarRef leftPort : c.getLeftPorts()) {
-                if (leftPort.getContainer() == spec.eContainer()) {
-                    if (leftOrRight != 0) {
-                        throw new InvalidSourceException("Multiple ports with variable width on a connection.");
-                    }
-                    // Indicate that the port is on the left.
-                    leftOrRight = -1;
-                } else {
-                    leftWidth += inferPortWidth(leftPort, c, instantiations);
+            for (VarRef leftPort : connection.getLeftPorts()) {
+              if (leftPort == reference) {
+                if (leftOrRight != 0) {
+                  throw new InvalidSourceException(
+                      "Multiple ports with variable width on a connection.");
+                }
+                // Indicate that this port is on the left.
+                leftOrRight = -1;
+              } else {
+                // The left port is not the same as this reference.
+                int otherWidth = inferPortWidth(leftPort, connection, instantiations);
+                if (otherWidth < 0) {
+                  // Cannot determine width.
+                  return -1;
                 }
+                leftWidth += otherWidth;
+              }
             }
-            for (VarRef rightPort : c.getRightPorts()) {
-                if (rightPort.getContainer() == spec.eContainer()) {
-                    if (leftOrRight != 0) {
-                        throw new InvalidSourceException("Multiple ports with variable width on a connection.");
-                    }
-                    // Indicate that the port is on the right.
-                    leftOrRight = 1;
-                } else {
-                    rightWidth += inferPortWidth(rightPort, c, instantiations);
+            for (VarRef rightPort : connection.getRightPorts()) {
+              if (rightPort == reference) {
+                if (leftOrRight != 0) {
+                  throw new InvalidSourceException(
+                      "Multiple ports with variable width on a connection.");
+                }
+                // Indicate that this port is on the right.
+                leftOrRight = 1;
+              } else {
+                int otherWidth = inferPortWidth(rightPort, connection, instantiations);
+                if (otherWidth < 0) {
+                  // Cannot determine width.
+                  return -1;
                 }
+                rightWidth += otherWidth;
+              }
             }
+            int discrepancy = 0;
             if (leftOrRight < 0) {
-                return rightWidth - leftWidth;
+              // This port is on the left.
+              discrepancy = rightWidth - leftWidth;
             } else if (leftOrRight > 0) {
-                return leftWidth - rightWidth;
+              // This port is on the right.
+              discrepancy = leftWidth - rightWidth;
             }
+            // Check that portWidth divides the discrepancy.
+            if (discrepancy % portWidth != 0) {
+              // This is an error.
+              return -1;
+            }
+            bankWidth = discrepancy / portWidth;
+          } else {
+            // Could not determine the bank width.
+            return -1;
+          }
         }
-        // A connection was not found with the instantiation.
-        return -1;
-    }
-
-    public static void addReactionAttribute(Reaction reaction, String name) {
-        var fedAttr = factory.createAttribute();
-        fedAttr.setAttrName(name);
-        reaction.getAttributes().add(fedAttr);
-    }
-
+      }
+      return portWidth * bankWidth;
+    }
+    // Argument is not a port.
+    return -1;
+  }
+
+  /**
+   * Given an instantiation of a reactor or bank of reactors, return the width. This will be 1 if
+   * this is not a reactor bank. Otherwise, this will attempt to determine the width. If the width
+   * is declared as a literal constant, it will return that constant. If the width is specified as a
+   * reference to a parameter, this will throw an exception. If the width is variable, this will
+   * find connections in the enclosing reactor and attempt to infer the width. If the width cannot
+   * be determined, it will throw an exception.
+   *
+   * <p>IMPORTANT: This method should not be used you really need to determine the width! It will
+   * not evaluate parameter values.
+   *
+   * @see #width(WidthSpec, List)
+   * @param instantiation A reactor instantiation.
+   * @return The width, if it can be determined.
+   * @deprecated
+   */
+  @Deprecated
+  public static int widthSpecification(Instantiation instantiation) {
+    int result = width(instantiation.getWidthSpec(), null);
+    if (result < 0) {
+      throw new InvalidSourceException(
+          "Cannot determine width for the instance " + instantiation.getName());
+    }
+    return result;
+  }
+
+  /**
+   * Report whether a state variable has been initialized or not.
+   *
+   * @param v The state variable to be checked.
+   * @return True if the variable was initialized, false otherwise.
+   */
+  public static boolean isInitialized(StateVar v) {
+    return v != null && v.getInit() != null;
+  }
+
+  /**
+   * Report whether the given time state variable is initialized using a parameter or not.
+   *
+   * @param s A state variable.
+   * @return True if the argument is initialized using a parameter, false otherwise.
+   */
+  public static boolean isParameterized(StateVar s) {
+    return s.getInit() != null
+        && IterableExtensions.exists(
+            s.getInit().getExprs(), it -> it instanceof ParameterReference);
+  }
+
+  /**
+   * Check if the reactor class uses generics
+   *
+   * @param r the reactor to check
+   * @return true if the reactor uses generics
+   */
+  public static boolean isGeneric(Reactor r) {
+    if (r == null) {
+      return false;
+    }
+    return r.getTypeParms().size() != 0;
+  }
+
+  /**
+   * If the specified reactor declaration is an import, then return the imported reactor class
+   * definition. Otherwise, just return the argument.
+   *
+   * @param r A Reactor or an ImportedReactor.
+   * @return The Reactor class definition or null if no definition is found.
+   */
+  public static Reactor toDefinition(ReactorDecl r) {
+    if (r == null) return null;
+    if (r instanceof Reactor) {
+      return (Reactor) r;
+    } else if (r instanceof ImportedReactor) {
+      return ((ImportedReactor) r).getReactorClass();
+    }
+    return null;
+  }
+
+  /** Return all single-line or multi-line comments immediately preceding the given EObject. */
+  public static Stream<String> getPrecedingComments(
+      ICompositeNode compNode, Predicate<INode> filter) {
+    return getPrecedingCommentNodes(compNode, filter).map(INode::getText);
+  }
+
+  /** Return all single-line or multi-line comments immediately preceding the given EObject. */
+  public static Stream<INode> getPrecedingCommentNodes(
+      ICompositeNode compNode, Predicate<INode> filter) {
+    if (compNode == null) return Stream.of();
+    List<INode> ret = new ArrayList<>();
+    for (INode node : compNode.getAsTreeIterable()) {
+      if (!(node instanceof ICompositeNode)) {
+        if (isComment(node)) {
+          if (filter.test(node)) ret.add(node);
+        } else if (!node.getText().isBlank()) {
+          break;
+        }
+      }
+    }
+    return ret.stream();
+  }
+
+  /** Return whether {@code node} is a comment. */
+  public static boolean isComment(INode node) {
+    return node instanceof HiddenLeafNode hlNode
+        && hlNode.getGrammarElement() instanceof TerminalRule tRule
+        && tRule.getName().endsWith("_COMMENT");
+  }
+
+  /** Return true if the given node starts on the same line as the given other node. */
+  public static Predicate<INode> sameLine(ICompositeNode compNode) {
+    return other -> {
+      for (INode node : compNode.getAsTreeIterable()) {
+        if (!(node instanceof ICompositeNode) && !node.getText().isBlank() && !isComment(node)) {
+          return node.getStartLine() == other.getStartLine();
+        }
+      }
+      return false;
+    };
+  }
+
+  /**
+   * Find the main reactor and set its name if none was defined.
+   *
+   * @param resource The resource to find the main reactor in.
+   */
+  public static void setMainName(Resource resource, String name) {
+    Reactor main =
+        IteratorExtensions.findFirst(
+            Iterators.filter(resource.getAllContents(), Reactor.class),
+            it -> it.isMain() || it.isFederated());
+    if (main != null && StringExtensions.isNullOrEmpty(main.getName())) {
+      main.setName(name);
+    }
+  }
+
+  /**
+   * Create a new instantiation node with the given reactor as its defining class.
+   *
+   * @param reactor The reactor class to create an instantiation of.
+   */
+  public static Instantiation createInstantiation(Reactor reactor) {
+    Instantiation inst = LfFactory.eINSTANCE.createInstantiation();
+    inst.setReactorClass(reactor);
+    // If the reactor is federated or at the top level, then it
+    // may not have a name. In the generator's doGenerate()
+    // method, the name gets set using setMainName().
+    // But this may be called before that, e.g. during
+    // diagram synthesis.  We assign a temporary name here.
+    if (reactor.getName() == null) {
+      if (reactor.isFederated() || reactor.isMain()) {
+        inst.setName("main");
+      } else {
+        inst.setName("");
+      }
+
+    } else {
+      inst.setName(reactor.getName());
+    }
+    return inst;
+  }
+
+  /**
+   * Returns the target declaration in the given model. Non-null because it would cause a parse
+   * error.
+   */
+  public static TargetDecl targetDecl(Model model) {
+    return IteratorExtensions.head(Iterators.filter(model.eAllContents(), TargetDecl.class));
+  }
+
+  /**
+   * Returns the target declaration in the given resource. Non-null because it would cause a parse
+   * error.
+   */
+  public static TargetDecl targetDecl(Resource model) {
+    return IteratorExtensions.head(Iterators.filter(model.getAllContents(), TargetDecl.class));
+  }
+
+  /////////////////////////////////////////////////////////
+  //// Private methods
+
+  /** Returns the list if it is not null. Otherwise, return an empty list. */
+  public static <T> List<T> convertToEmptyListIfNull(List<T> list) {
+    return list != null ? list : new ArrayList<>();
+  }
+
+  /**
+   * Return all the superclasses of the specified reactor in deepest-first order. For example, if A
+   * extends B and C, and B and C both extend D, this will return the list [D, B, C, A]. Duplicates
+   * are removed. If the specified reactor does not extend any other reactor, then return an empty
+   * list. If a cycle is found, where X extends Y and Y extends X, or if a superclass is declared
+   * that is not found, then return null.
+   *
+   * @param reactor The specified reactor.
+   * @param extensions A set of reactors extending the specified reactor (used to detect circular
+   *     extensions).
+   */
+  private static LinkedHashSet<Reactor> superClasses(Reactor reactor, Set<Reactor> extensions) {
+    LinkedHashSet<Reactor> result = new LinkedHashSet<>();
+    for (ReactorDecl superDecl : convertToEmptyListIfNull(reactor.getSuperClasses())) {
+      Reactor r = toDefinition(superDecl);
+      if (r == reactor || r == null) return null;
+      // If r is in the extensions, then we have a circular inheritance structure.
+      if (extensions.contains(r)) return null;
+      extensions.add(r);
+      LinkedHashSet<Reactor> baseExtends = superClasses(r, extensions);
+      extensions.remove(r);
+      if (baseExtends == null) return null;
+      result.addAll(baseExtends);
+      result.add(r);
+    }
+    return result;
+  }
+
+  /**
+   * Return all the file-level preambles in the files that define the specified class and its
+   * superclasses in deepest-first order. Duplicates are removed. If there are no file-level
+   * preambles, then return an empty list. If a cycle is found, where X extends Y and Y extends X,
+   * or if a superclass is declared that is not found, then return null.
+   *
+   * @param reactor The specified reactor.
+   * @param extensions A set of reactors extending the specified reactor (used to detect circular
+   *     extensions).
+   */
+  private static LinkedHashSet<Preamble> allFileLevelPreambles(
+      Reactor reactor, Set<Reactor> extensions) {
+    LinkedHashSet<Preamble> result = new LinkedHashSet<>();
+    for (ReactorDecl superDecl : convertToEmptyListIfNull(reactor.getSuperClasses())) {
+      Reactor r = toDefinition(superDecl);
+      if (r == reactor || r == null) return null;
+      // If r is in the extensions, then we have a circular inheritance structure.
+      if (extensions.contains(r)) return null;
+      extensions.add(r);
+      LinkedHashSet<Preamble> basePreambles = allFileLevelPreambles(r, extensions);
+      extensions.remove(r);
+      if (basePreambles == null) return null;
+      result.addAll(basePreambles);
+    }
+    result.addAll(((Model) reactor.eContainer()).getPreambles());
+    return result;
+  }
+
+  /**
+   * We may be able to infer the width by examining the connections of the enclosing reactor
+   * definition. This works, for example, with delays between multiports or banks of reactors.
+   * Attempt to infer the width from connections and return -1 if the width cannot be inferred.
+   *
+   * @param spec The width specification or null (to return 1).
+   * @param instantiations The (optional) list of instantiations.
+   * @return The width, or -1 if the width could not be inferred from connections.
+   */
+  private static int inferWidthFromConnections(WidthSpec spec, List<Instantiation> instantiations) {
+    for (Connection c : ((Reactor) spec.eContainer().eContainer()).getConnections()) {
+      int leftWidth = 0;
+      int rightWidth = 0;
+      int leftOrRight = 0;
+      for (VarRef leftPort : c.getLeftPorts()) {
+        if (leftPort.getContainer() == spec.eContainer()) {
+          if (leftOrRight != 0) {
+            throw new InvalidSourceException("Multiple ports with variable width on a connection.");
+          }
+          // Indicate that the port is on the left.
+          leftOrRight = -1;
+        } else {
+          leftWidth += inferPortWidth(leftPort, c, instantiations);
+        }
+      }
+      for (VarRef rightPort : c.getRightPorts()) {
+        if (rightPort.getContainer() == spec.eContainer()) {
+          if (leftOrRight != 0) {
+            throw new InvalidSourceException("Multiple ports with variable width on a connection.");
+          }
+          // Indicate that the port is on the right.
+          leftOrRight = 1;
+        } else {
+          rightWidth += inferPortWidth(rightPort, c, instantiations);
+        }
+      }
+      if (leftOrRight < 0) {
+        return rightWidth - leftWidth;
+      } else if (leftOrRight > 0) {
+        return leftWidth - rightWidth;
+      }
+    }
+    // A connection was not found with the instantiation.
+    return -1;
+  }
+
+  public static void addReactionAttribute(Reaction reaction, String name) {
+    var fedAttr = factory.createAttribute();
+    fedAttr.setAttrName(name);
+    reaction.getAttributes().add(fedAttr);
+  }
 }
diff --git a/org.lflang/src/org/lflang/ast/AstTransformation.java b/org.lflang/src/org/lflang/ast/AstTransformation.java
index 80a93da4b9..cf5c5843ff 100644
--- a/org.lflang/src/org/lflang/ast/AstTransformation.java
+++ b/org.lflang/src/org/lflang/ast/AstTransformation.java
@@ -1,16 +1,11 @@
 package org.lflang.ast;
 
 import java.util.List;
-
 import org.lflang.lf.Reactor;
 
-/**
- * Interface for AST Transfomations
- */
+/** Interface for AST Transfomations */
 public interface AstTransformation {
 
-    /**
-     * Apply the AST transformation to all given reactors.
-     */
-    void applyTransformation(List<Reactor> reactors);
+  /** Apply the AST transformation to all given reactors. */
+  void applyTransformation(List<Reactor> reactors);
 }
diff --git a/org.lflang/src/org/lflang/ast/DelayedConnectionTransformation.java b/org.lflang/src/org/lflang/ast/DelayedConnectionTransformation.java
index 953b9bdfdb..882019ac44 100644
--- a/org.lflang/src/org/lflang/ast/DelayedConnectionTransformation.java
+++ b/org.lflang/src/org/lflang/ast/DelayedConnectionTransformation.java
@@ -6,13 +6,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-
 import org.lflang.InferredType;
 import org.lflang.generator.DelayBodyGenerator;
 import org.lflang.generator.TargetTypes;
@@ -40,365 +38,371 @@
 import org.lflang.lf.WidthTerm;
 
 /**
- This class implements AST transformations for delayed connections.
- There are two types of delayed connections:
- 1) Connections with {@code after}-delays
- 2) Physical connections
+ * This class implements AST transformations for delayed connections. There are two types of delayed
+ * connections: 1) Connections with {@code after}-delays 2) Physical connections
  */
 public class DelayedConnectionTransformation implements AstTransformation {
 
-    /**
-     * The Lingua Franca factory for creating new AST nodes.
-     */
-    public static final LfFactory factory = ASTUtils.factory;
-
-    /**
-     * A code generator used to insert reaction bodies for the generated delay reactors.
-     */
-    private final DelayBodyGenerator generator;
-
-    /**
-     * A target type instance that is used during the transformation to manage target specific types
-     */
-    private final TargetTypes targetTypes;
-
-    /**
-     * The Eclipse eCore view of the main LF file.
-     */
-    private final Resource mainResource;
-
-    private boolean transformAfterDelays = false;
-    private boolean transformPhysicalConnection = false;
-    /**
-     * Collection of generated delay classes.
-     */
-    private final LinkedHashSet<Reactor> delayClasses = new LinkedHashSet<>();
-
-    public DelayedConnectionTransformation(DelayBodyGenerator generator, TargetTypes targetTypes, Resource mainResource, boolean transformAfterDelays, boolean transformPhysicalConnections) {
-        this.generator = generator;
-        this.targetTypes = targetTypes;
-        this.mainResource = mainResource;
-        this.transformAfterDelays = transformAfterDelays;
-        this.transformPhysicalConnection = transformPhysicalConnections;
-    }
-
-    /**
-     * Transform all after delay connections by inserting generated delay reactors.
-     */
-    @Override
-    public void applyTransformation(List<Reactor> reactors) {
-        insertGeneratedDelays(reactors);
-    }
-
-    /**
-     * Find connections in the given resource that have a delay associated with them,
-     * and reroute them via a generated delay reactor.
-     * @param reactors A list of reactors to apply the transformation to.
-     */
-    private void insertGeneratedDelays(List<Reactor> reactors) {
-        // The resulting changes to the AST are performed _after_ iterating
-        // in order to avoid concurrent modification problems.
-        List<Connection> oldConnections = new ArrayList<>();
-        Map<EObject, List<Connection>> newConnections = new LinkedHashMap<>();
-        Map<EObject, List<Instantiation>> delayInstances = new LinkedHashMap<>();
-
-        // Iterate over the connections in the tree.
-        for (Reactor container : reactors) {
-            for (Connection connection : ASTUtils.allConnections(container)) {
-                if ( transformAfterDelays && connection.getDelay() != null ||
-                    transformPhysicalConnection && connection.isPhysical()) {
-                    EObject parent = connection.eContainer();
-                    // Assume all the types are the same, so just use the first on the right.
-                    Type type = ((Port) connection.getRightPorts().get(0).getVariable()).getType();
-                    Reactor delayClass = getDelayClass(type, connection.isPhysical());
-                    String generic = targetTypes.supportsGenerics()
-                        ? targetTypes.getTargetType(type) : null;
-
-                    Instantiation delayInstance = getDelayInstance(delayClass, connection, generic,
-                        !generator.generateAfterDelaysWithVariableWidth(), connection.isPhysical());
-
-                    // Stage the new connections for insertion into the tree.
-                    List<Connection> connections = ASTUtils.convertToEmptyListIfNull(newConnections.get(parent));
-                    connections.addAll(rerouteViaDelay(connection, delayInstance));
-                    newConnections.put(parent, connections);
-                    // Stage the original connection for deletion from the tree.
-                    oldConnections.add(connection);
-
-                    // Stage the newly created delay reactor instance for insertion
-                    List<Instantiation> instances = ASTUtils.convertToEmptyListIfNull(delayInstances.get(parent));
-                    instances.add(delayInstance);
-                    delayInstances.put(parent, instances);
-                }
-            }
+  /** The Lingua Franca factory for creating new AST nodes. */
+  public static final LfFactory factory = ASTUtils.factory;
+
+  /** A code generator used to insert reaction bodies for the generated delay reactors. */
+  private final DelayBodyGenerator generator;
+
+  /**
+   * A target type instance that is used during the transformation to manage target specific types
+   */
+  private final TargetTypes targetTypes;
+
+  /** The Eclipse eCore view of the main LF file. */
+  private final Resource mainResource;
+
+  private boolean transformAfterDelays = false;
+  private boolean transformPhysicalConnection = false;
+  /** Collection of generated delay classes. */
+  private final LinkedHashSet<Reactor> delayClasses = new LinkedHashSet<>();
+
+  public DelayedConnectionTransformation(
+      DelayBodyGenerator generator,
+      TargetTypes targetTypes,
+      Resource mainResource,
+      boolean transformAfterDelays,
+      boolean transformPhysicalConnections) {
+    this.generator = generator;
+    this.targetTypes = targetTypes;
+    this.mainResource = mainResource;
+    this.transformAfterDelays = transformAfterDelays;
+    this.transformPhysicalConnection = transformPhysicalConnections;
+  }
+
+  /** Transform all after delay connections by inserting generated delay reactors. */
+  @Override
+  public void applyTransformation(List<Reactor> reactors) {
+    insertGeneratedDelays(reactors);
+  }
+
+  /**
+   * Find connections in the given resource that have a delay associated with them, and reroute them
+   * via a generated delay reactor.
+   *
+   * @param reactors A list of reactors to apply the transformation to.
+   */
+  private void insertGeneratedDelays(List<Reactor> reactors) {
+    // The resulting changes to the AST are performed _after_ iterating
+    // in order to avoid concurrent modification problems.
+    List<Connection> oldConnections = new ArrayList<>();
+    Map<EObject, List<Connection>> newConnections = new LinkedHashMap<>();
+    Map<EObject, List<Instantiation>> delayInstances = new LinkedHashMap<>();
+
+    // Iterate over the connections in the tree.
+    for (Reactor container : reactors) {
+      for (Connection connection : ASTUtils.allConnections(container)) {
+        if (transformAfterDelays && connection.getDelay() != null
+            || transformPhysicalConnection && connection.isPhysical()) {
+          EObject parent = connection.eContainer();
+          // Assume all the types are the same, so just use the first on the right.
+          Type type = ((Port) connection.getRightPorts().get(0).getVariable()).getType();
+          Reactor delayClass = getDelayClass(type, connection.isPhysical());
+          String generic = targetTypes.supportsGenerics() ? targetTypes.getTargetType(type) : null;
+
+          Instantiation delayInstance =
+              getDelayInstance(
+                  delayClass,
+                  connection,
+                  generic,
+                  !generator.generateAfterDelaysWithVariableWidth(),
+                  connection.isPhysical());
+
+          // Stage the new connections for insertion into the tree.
+          List<Connection> connections =
+              ASTUtils.convertToEmptyListIfNull(newConnections.get(parent));
+          connections.addAll(rerouteViaDelay(connection, delayInstance));
+          newConnections.put(parent, connections);
+          // Stage the original connection for deletion from the tree.
+          oldConnections.add(connection);
+
+          // Stage the newly created delay reactor instance for insertion
+          List<Instantiation> instances =
+              ASTUtils.convertToEmptyListIfNull(delayInstances.get(parent));
+          instances.add(delayInstance);
+          delayInstances.put(parent, instances);
         }
+      }
+    }
 
-        // Remove old connections; insert new ones.
-        oldConnections.forEach(connection -> {
-            var container = connection.eContainer();
-            if (container instanceof Reactor) {
-                ((Reactor) container).getConnections().remove(connection);
-            } else if (container instanceof Mode) {
-                ((Mode) container).getConnections().remove(connection);
-            }
+    // Remove old connections; insert new ones.
+    oldConnections.forEach(
+        connection -> {
+          var container = connection.eContainer();
+          if (container instanceof Reactor) {
+            ((Reactor) container).getConnections().remove(connection);
+          } else if (container instanceof Mode) {
+            ((Mode) container).getConnections().remove(connection);
+          }
         });
-        newConnections.forEach((container, connections) -> {
-            if (container instanceof Reactor) {
-                ((Reactor) container).getConnections().addAll(connections);
-            } else if (container instanceof Mode) {
-                ((Mode) container).getConnections().addAll(connections);
-            }
+    newConnections.forEach(
+        (container, connections) -> {
+          if (container instanceof Reactor) {
+            ((Reactor) container).getConnections().addAll(connections);
+          } else if (container instanceof Mode) {
+            ((Mode) container).getConnections().addAll(connections);
+          }
         });
-        // Finally, insert the instances and, before doing so, assign them a unique name.
-        delayInstances.forEach((container, instantiations) ->
-            instantiations.forEach(instantiation -> {
-                if (container instanceof Reactor) {
-                    instantiation.setName(ASTUtils.getUniqueIdentifier((Reactor) container, "delay"));
+    // Finally, insert the instances and, before doing so, assign them a unique name.
+    delayInstances.forEach(
+        (container, instantiations) ->
+            instantiations.forEach(
+                instantiation -> {
+                  if (container instanceof Reactor) {
+                    instantiation.setName(
+                        ASTUtils.getUniqueIdentifier((Reactor) container, "delay"));
                     ((Reactor) container).getInstantiations().add(instantiation);
-                } else if (container instanceof Mode) {
-                    instantiation.setName(ASTUtils.getUniqueIdentifier((Reactor) container.eContainer(), "delay"));
+                  } else if (container instanceof Mode) {
+                    instantiation.setName(
+                        ASTUtils.getUniqueIdentifier((Reactor) container.eContainer(), "delay"));
                     ((Mode) container).getInstantiations().add(instantiation);
-                }
-            })
-        );
-    }
-
-    /**
-     * Take a connection and reroute it via an instance of a generated delay
-     * reactor. This method returns a list to new connections to substitute
-     * the original one.
-     * @param connection The connection to reroute.
-     * @param delayInstance The delay instance to route the connection through.
-     */
-    private static List<Connection> rerouteViaDelay(Connection connection,
-        Instantiation delayInstance) {
-        List<Connection> connections = new ArrayList<>();
-        Connection upstream = factory.createConnection();
-        Connection downstream = factory.createConnection();
-        VarRef input = factory.createVarRef();
-        VarRef output = factory.createVarRef();
-
-        Reactor delayClass = ASTUtils.toDefinition(delayInstance.getReactorClass());
-
-        // Establish references to the involved ports.
-        input.setContainer(delayInstance);
-        input.setVariable(delayClass.getInputs().get(0));
-        output.setContainer(delayInstance);
-        output.setVariable(delayClass.getOutputs().get(0));
-        upstream.getLeftPorts().addAll(connection.getLeftPorts());
-        upstream.getRightPorts().add(input);
-        downstream.getLeftPorts().add(output);
-        downstream.getRightPorts().addAll(connection.getRightPorts());
-        downstream.setIterated(connection.isIterated());
-        connections.add(upstream);
-        connections.add(downstream);
-        return connections;
+                  }
+                }));
+  }
+
+  /**
+   * Take a connection and reroute it via an instance of a generated delay reactor. This method
+   * returns a list to new connections to substitute the original one.
+   *
+   * @param connection The connection to reroute.
+   * @param delayInstance The delay instance to route the connection through.
+   */
+  private static List<Connection> rerouteViaDelay(
+      Connection connection, Instantiation delayInstance) {
+    List<Connection> connections = new ArrayList<>();
+    Connection upstream = factory.createConnection();
+    Connection downstream = factory.createConnection();
+    VarRef input = factory.createVarRef();
+    VarRef output = factory.createVarRef();
+
+    Reactor delayClass = ASTUtils.toDefinition(delayInstance.getReactorClass());
+
+    // Establish references to the involved ports.
+    input.setContainer(delayInstance);
+    input.setVariable(delayClass.getInputs().get(0));
+    output.setContainer(delayInstance);
+    output.setVariable(delayClass.getOutputs().get(0));
+    upstream.getLeftPorts().addAll(connection.getLeftPorts());
+    upstream.getRightPorts().add(input);
+    downstream.getLeftPorts().add(output);
+    downstream.getRightPorts().addAll(connection.getRightPorts());
+    downstream.setIterated(connection.isIterated());
+    connections.add(upstream);
+    connections.add(downstream);
+    return connections;
+  }
+
+  /**
+   * Create a new instance delay instances using the given reactor class. The supplied time value is
+   * used to override the default interval (which is zero). If the target supports parametric
+   * polymorphism, then a single class may be used for each instantiation, in which case a non-empty
+   * string must be supplied to parameterize the instance. A default name ("delay") is assigned to
+   * the instantiation, but this name must be overridden at the call site, where checks can be done
+   * to avoid name collisions in the container in which the instantiation is to be placed. Such
+   * checks (or modifications of the AST) are not performed in this method in order to avoid causing
+   * concurrent modification exceptions.
+   *
+   * @param delayClass The class to create an instantiation for
+   * @param connection The connection to create a delay instantiation foe
+   * @param genericArg A string that denotes the appropriate type parameter, which should be null or
+   *     empty if the target does not support generics.
+   * @param defineWidthFromConnection If this is true and if the connection is a wide connection,
+   *     then instantiate a bank of delays where the width is given by ports involved in the
+   *     connection. Otherwise, the width will be unspecified indicating a variable length.
+   * @param isPhysical Is this a delay instance using a physical action. These are used for
+   *     implementing Physical Connections. If true we will accept zero delay on the connection.
+   */
+  private static Instantiation getDelayInstance(
+      Reactor delayClass,
+      Connection connection,
+      String genericArg,
+      Boolean defineWidthFromConnection,
+      Boolean isPhysical) {
+    Instantiation delayInstance = factory.createInstantiation();
+    delayInstance.setReactorClass(delayClass);
+    if (genericArg != null) {
+      Code code = factory.createCode();
+      code.setBody(genericArg);
+      Type type = factory.createType();
+      type.setCode(code);
+      delayInstance.getTypeArgs().add(type);
     }
-
-    /**
-     * Create a new instance delay instances using the given reactor class.
-     * The supplied time value is used to override the default interval (which
-     * is zero).
-     * If the target supports parametric polymorphism, then a single class may
-     * be used for each instantiation, in which case a non-empty string must
-     * be supplied to parameterize the instance.
-     * A default name ("delay") is assigned to the instantiation, but this
-     * name must be overridden at the call site, where checks can be done to
-     * avoid name collisions in the container in which the instantiation is
-     * to be placed. Such checks (or modifications of the AST) are not
-     * performed in this method in order to avoid causing concurrent
-     * modification exceptions.
-     * @param delayClass The class to create an instantiation for
-     * @param connection The connection to create a delay instantiation foe
-     * @param genericArg A string that denotes the appropriate type parameter,
-     *  which should be null or empty if the target does not support generics.
-     * @param defineWidthFromConnection If this is true and if the connection
-     *  is a wide connection, then instantiate a bank of delays where the width
-     *  is given by ports involved in the connection. Otherwise, the width will
-     *  be  unspecified indicating a variable length.
-     *  @param isPhysical Is this a delay instance using a physical action.
-     *   These are used for implementing Physical Connections. If true
-     *   we will accept zero delay on the connection.
-     */
-    private static Instantiation getDelayInstance(Reactor delayClass,
-        Connection connection, String genericArg, Boolean defineWidthFromConnection, Boolean isPhysical) {
-        Instantiation delayInstance = factory.createInstantiation();
-        delayInstance.setReactorClass(delayClass);
-        if (genericArg != null) {
-            Code code = factory.createCode();
-            code.setBody(genericArg);
-            Type type = factory.createType();
-            type.setCode(code);
-            delayInstance.getTypeArgs().add(type);
-        }
-        if (ASTUtils.hasMultipleConnections(connection)) {
-            WidthSpec widthSpec = factory.createWidthSpec();
-            if (defineWidthFromConnection) {
-                // Add all left ports of the connection to the WidthSpec of the generated delay instance.
-                // This allows the code generator to later infer the width from the involved ports.
-                // We only consider the left ports here, as they could be part of a broadcast. In this case, we want
-                // to delay the ports first, and then broadcast the output of the delays.
-                for (VarRef port : connection.getLeftPorts()) {
-                    WidthTerm term = factory.createWidthTerm();
-                    term.setPort(EcoreUtil.copy(port));
-                    widthSpec.getTerms().add(term);
-                }
-            } else {
-                widthSpec.setOfVariableLength(true);
-            }
-            delayInstance.setWidthSpec(widthSpec);
-        }
-        // Allow physical connections with no after delay
-        //  they will use the default min_delay of 0.
-        if (!isPhysical || connection.getDelay() != null) {
-            Assignment assignment = factory.createAssignment();
-            assignment.setLhs(delayClass.getParameters().get(0));
-            Initializer init = factory.createInitializer();
-            init.getExprs().add(Objects.requireNonNull(connection.getDelay(), "null delay"));
-            assignment.setRhs(init);
-            delayInstance.getParameters().add(assignment);
+    if (ASTUtils.hasMultipleConnections(connection)) {
+      WidthSpec widthSpec = factory.createWidthSpec();
+      if (defineWidthFromConnection) {
+        // Add all left ports of the connection to the WidthSpec of the generated delay instance.
+        // This allows the code generator to later infer the width from the involved ports.
+        // We only consider the left ports here, as they could be part of a broadcast. In this case,
+        // we want
+        // to delay the ports first, and then broadcast the output of the delays.
+        for (VarRef port : connection.getLeftPorts()) {
+          WidthTerm term = factory.createWidthTerm();
+          term.setPort(EcoreUtil.copy(port));
+          widthSpec.getTerms().add(term);
         }
-
-        delayInstance.setName("delay");  // This has to be overridden.
-        return delayInstance;
+      } else {
+        widthSpec.setOfVariableLength(true);
+      }
+      delayInstance.setWidthSpec(widthSpec);
+    }
+    // Allow physical connections with no after delay
+    //  they will use the default min_delay of 0.
+    if (!isPhysical || connection.getDelay() != null) {
+      Assignment assignment = factory.createAssignment();
+      assignment.setLhs(delayClass.getParameters().get(0));
+      Initializer init = factory.createInitializer();
+      init.getExprs().add(Objects.requireNonNull(connection.getDelay(), "null delay"));
+      assignment.setRhs(init);
+      delayInstance.getParameters().add(assignment);
     }
 
-    /**
-     * Return a synthesized AST node that represents the definition of a delay
-     * reactor. Depending on whether the target supports generics, either this
-     * method will synthesize a generic definition and keep returning it upon
-     * subsequent calls, or otherwise, it will synthesize a new definition for
-     * each new type it hasn't yet created a compatible delay reactor for.
-     * @param type The type the delay class must be compatible with.
-     * @param isPhysical Is this delay reactor using a physical action.
-     */
-    private Reactor getDelayClass(Type type, boolean isPhysical) {
-        String className;
-        if (targetTypes.supportsGenerics()) {
-            className = DelayBodyGenerator.GEN_DELAY_CLASS_NAME;
-        } else {
-            String id = Integer.toHexString(InferredType.fromAST(type).toText().hashCode());
-            className = String.format("%s_%s", DelayBodyGenerator.GEN_DELAY_CLASS_NAME, id);
-        }
-
-        // Only add class definition if it is not already there.
-        Reactor classDef = findDelayClass(className);
-        if (classDef != null) {
-            return classDef;
-        }
-
-        Reactor delayClass = factory.createReactor();
-        Parameter delayParameter = factory.createParameter();
-        Action action = factory.createAction();
-        VarRef triggerRef = factory.createVarRef();
-        VarRef effectRef = factory.createVarRef();
-        Input input = factory.createInput();
-        Output output = factory.createOutput();
-        VarRef inRef = factory.createVarRef();
-        VarRef outRef = factory.createVarRef();
-
-        Reaction r1 = factory.createReaction();
-        Reaction r2 = factory.createReaction();
-
-        delayParameter.setName("delay");
-        delayParameter.setType(factory.createType());
-        delayParameter.getType().setId("time");
-        delayParameter.getType().setTime(true);
-        Time defaultTime = factory.createTime();
-        defaultTime.setUnit(null);
-        defaultTime.setInterval(0);
-        Initializer init = factory.createInitializer();
-        init.setParens(true);
-        init.setBraces(false);
-        init.getExprs().add(defaultTime);
-        delayParameter.setInit(init);
-
-        // Name the newly created action; set its delay and type.
-        action.setName("act");
-        var paramRef = factory.createParameterReference();
-        paramRef.setParameter(delayParameter);
-        action.setMinDelay(paramRef);
-        if (isPhysical) {
-            action.setOrigin(ActionOrigin.PHYSICAL);
-        } else {
-            action.setOrigin(ActionOrigin.LOGICAL);
-        }
+    delayInstance.setName("delay"); // This has to be overridden.
+    return delayInstance;
+  }
+
+  /**
+   * Return a synthesized AST node that represents the definition of a delay reactor. Depending on
+   * whether the target supports generics, either this method will synthesize a generic definition
+   * and keep returning it upon subsequent calls, or otherwise, it will synthesize a new definition
+   * for each new type it hasn't yet created a compatible delay reactor for.
+   *
+   * @param type The type the delay class must be compatible with.
+   * @param isPhysical Is this delay reactor using a physical action.
+   */
+  private Reactor getDelayClass(Type type, boolean isPhysical) {
+    String className;
+    if (targetTypes.supportsGenerics()) {
+      className = DelayBodyGenerator.GEN_DELAY_CLASS_NAME;
+    } else {
+      String id = Integer.toHexString(InferredType.fromAST(type).toText().hashCode());
+      className = String.format("%s_%s", DelayBodyGenerator.GEN_DELAY_CLASS_NAME, id);
+    }
 
-        if (targetTypes.supportsGenerics()) {
-            action.setType(factory.createType());
-            action.getType().setId("T");
-        } else {
-            action.setType(EcoreUtil.copy(type));
-        }
+    // Only add class definition if it is not already there.
+    Reactor classDef = findDelayClass(className);
+    if (classDef != null) {
+      return classDef;
+    }
 
-        input.setName("inp");
-        input.setType(EcoreUtil.copy(action.getType()));
-
-        output.setName("out");
-        output.setType(EcoreUtil.copy(action.getType()));
-
-        // Establish references to the involved ports.
-        inRef.setVariable(input);
-        outRef.setVariable(output);
-
-        // Establish references to the action.
-        triggerRef.setVariable(action);
-        effectRef.setVariable(action);
-
-        // Add the action to the reactor.
-        delayClass.setName(className);
-        delayClass.getActions().add(action);
-
-        // Configure the second reaction, which reads the input.
-        r1.getTriggers().add(inRef);
-        r1.getEffects().add(effectRef);
-        r1.setCode(factory.createCode());
-        r1.getCode().setBody(generator.generateDelayBody(action, inRef));
-
-        // Configure the first reaction, which produces the output.
-        r2.getTriggers().add(triggerRef);
-        r2.getEffects().add(outRef);
-        r2.setCode(factory.createCode());
-        r2.getCode().setBody(generator.generateForwardBody(action, outRef));
-
-        generator.finalizeReactions(r1, r2);
-
-        // Add the reactions to the newly created reactor class.
-        // These need to go in the opposite order in case
-        // a new input arrives at the same time the delayed
-        // output is delivered!
-        delayClass.getReactions().add(r2);
-        delayClass.getReactions().add(r1);
-
-        // Add a type parameter if the target supports it.
-        if (targetTypes.supportsGenerics()) {
-            TypeParm parm = factory.createTypeParm();
-            parm.setLiteral(generator.generateDelayGeneric());
-            delayClass.getTypeParms().add(parm);
-        }
-        delayClass.getInputs().add(input);
-        delayClass.getOutputs().add(output);
-        delayClass.getParameters().add(delayParameter);
-        addDelayClass(delayClass);
-        return delayClass;
+    Reactor delayClass = factory.createReactor();
+    Parameter delayParameter = factory.createParameter();
+    Action action = factory.createAction();
+    VarRef triggerRef = factory.createVarRef();
+    VarRef effectRef = factory.createVarRef();
+    Input input = factory.createInput();
+    Output output = factory.createOutput();
+    VarRef inRef = factory.createVarRef();
+    VarRef outRef = factory.createVarRef();
+
+    Reaction r1 = factory.createReaction();
+    Reaction r2 = factory.createReaction();
+
+    delayParameter.setName("delay");
+    delayParameter.setType(factory.createType());
+    delayParameter.getType().setId("time");
+    delayParameter.getType().setTime(true);
+    Time defaultTime = factory.createTime();
+    defaultTime.setUnit(null);
+    defaultTime.setInterval(0);
+    Initializer init = factory.createInitializer();
+    init.setParens(true);
+    init.setBraces(false);
+    init.getExprs().add(defaultTime);
+    delayParameter.setInit(init);
+
+    // Name the newly created action; set its delay and type.
+    action.setName("act");
+    var paramRef = factory.createParameterReference();
+    paramRef.setParameter(delayParameter);
+    action.setMinDelay(paramRef);
+    if (isPhysical) {
+      action.setOrigin(ActionOrigin.PHYSICAL);
+    } else {
+      action.setOrigin(ActionOrigin.LOGICAL);
     }
 
-    /**
-     * Store the given reactor in the collection of generated delay classes
-     * and insert it in the AST under the top-level reactor's node.
-     */
-    private void addDelayClass(Reactor generatedDelay) {
-        // Record this class, so it can be reused.
-        delayClasses.add(generatedDelay);
-        // And hook it into the AST.
-        EObject node = IteratorExtensions.findFirst(mainResource.getAllContents(), Model.class::isInstance);
-        ((Model) node).getReactors().add(generatedDelay);
+    if (targetTypes.supportsGenerics()) {
+      action.setType(factory.createType());
+      action.getType().setId("T");
+    } else {
+      action.setType(EcoreUtil.copy(type));
     }
 
-    /**
-     * Return the generated delay reactor that corresponds to the given class
-     * name if it had been created already, {@code null} otherwise.
-     */
-    private Reactor findDelayClass(String className) {
-        return IterableExtensions.findFirst(delayClasses, it -> it.getName().equals(className));
+    input.setName("inp");
+    input.setType(EcoreUtil.copy(action.getType()));
+
+    output.setName("out");
+    output.setType(EcoreUtil.copy(action.getType()));
+
+    // Establish references to the involved ports.
+    inRef.setVariable(input);
+    outRef.setVariable(output);
+
+    // Establish references to the action.
+    triggerRef.setVariable(action);
+    effectRef.setVariable(action);
+
+    // Add the action to the reactor.
+    delayClass.setName(className);
+    delayClass.getActions().add(action);
+
+    // Configure the second reaction, which reads the input.
+    r1.getTriggers().add(inRef);
+    r1.getEffects().add(effectRef);
+    r1.setCode(factory.createCode());
+    r1.getCode().setBody(generator.generateDelayBody(action, inRef));
+
+    // Configure the first reaction, which produces the output.
+    r2.getTriggers().add(triggerRef);
+    r2.getEffects().add(outRef);
+    r2.setCode(factory.createCode());
+    r2.getCode().setBody(generator.generateForwardBody(action, outRef));
+
+    generator.finalizeReactions(r1, r2);
+
+    // Add the reactions to the newly created reactor class.
+    // These need to go in the opposite order in case
+    // a new input arrives at the same time the delayed
+    // output is delivered!
+    delayClass.getReactions().add(r2);
+    delayClass.getReactions().add(r1);
+
+    // Add a type parameter if the target supports it.
+    if (targetTypes.supportsGenerics()) {
+      TypeParm parm = factory.createTypeParm();
+      parm.setLiteral(generator.generateDelayGeneric());
+      delayClass.getTypeParms().add(parm);
     }
+    delayClass.getInputs().add(input);
+    delayClass.getOutputs().add(output);
+    delayClass.getParameters().add(delayParameter);
+    addDelayClass(delayClass);
+    return delayClass;
+  }
+
+  /**
+   * Store the given reactor in the collection of generated delay classes and insert it in the AST
+   * under the top-level reactor's node.
+   */
+  private void addDelayClass(Reactor generatedDelay) {
+    // Record this class, so it can be reused.
+    delayClasses.add(generatedDelay);
+    // And hook it into the AST.
+    EObject node =
+        IteratorExtensions.findFirst(mainResource.getAllContents(), Model.class::isInstance);
+    ((Model) node).getReactors().add(generatedDelay);
+  }
+
+  /**
+   * Return the generated delay reactor that corresponds to the given class name if it had been
+   * created already, {@code null} otherwise.
+   */
+  private Reactor findDelayClass(String className) {
+    return IterableExtensions.findFirst(delayClasses, it -> it.getName().equals(className));
+  }
 }
diff --git a/org.lflang/src/org/lflang/ast/EnclavedConnectionTransformation.java b/org.lflang/src/org/lflang/ast/EnclavedConnectionTransformation.java
index 8681755efc..1caaf26a40 100644
--- a/org.lflang/src/org/lflang/ast/EnclavedConnectionTransformation.java
+++ b/org.lflang/src/org/lflang/ast/EnclavedConnectionTransformation.java
@@ -7,208 +7,163 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-
-import org.lflang.ASTUtils;
-import org.lflang.InferredType;
 import org.lflang.generator.DelayBodyGenerator;
 import org.lflang.generator.TargetTypes;
-import org.lflang.lf.Action;
-import org.lflang.lf.ActionOrigin;
-import org.lflang.lf.Assignment;
-import org.lflang.lf.Attribute;
-import org.lflang.lf.Code;
-import org.lflang.lf.CodeExpr;
 import org.lflang.lf.Connection;
-import org.lflang.lf.Expression;
 import org.lflang.lf.Initializer;
 import org.lflang.lf.Input;
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.LfFactory;
-import org.lflang.lf.Mode;
-import org.lflang.lf.Model;
-import org.lflang.lf.Output;
 import org.lflang.lf.Parameter;
 import org.lflang.lf.ParameterReference;
-import org.lflang.lf.Port;
-import org.lflang.lf.Reaction;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.ReactorDecl;
-import org.lflang.lf.StateVar;
 import org.lflang.lf.Time;
-import org.lflang.lf.Type;
-import org.lflang.lf.TypeParm;
 import org.lflang.lf.VarRef;
-import org.lflang.lf.WidthSpec;
-import org.lflang.lf.WidthTerm;
-
-import com.fasterxml.jackson.databind.deser.impl.CreatorCandidate.Param;
 
 /**
- This class implements AST transformations for enclaved connections.
- There are three types of enclaved connections:
- 1) Zero-delay connections
- 2) Delayed connections
- 3) Physical connections
+ * This class implements AST transformations for enclaved connections. There are three types of
+ * enclaved connections: 1) Zero-delay connections 2) Delayed connections 3) Physical connections
  */
 public class EnclavedConnectionTransformation implements AstTransformation {
 
-    /**
-     * The Lingua Franca factory for creating new AST nodes.
-     */
-    public static final LfFactory factory = ASTUtils.factory;
-
-    /**
-     * A code generator used to insert reaction bodies for the generated delay reactors.
-     */
-    private final DelayBodyGenerator generator;
-
-    /**
-     * A target type instance that is used during the transformation to manage target specific types
-     */
-    private final TargetTypes targetTypes;
-
-    /**
-     * The Eclipse eCore view of the main LF file.
-     */
-    private final Resource mainResource;
-
-    /**
-     * Collection of generated delay classes.
-     */
-    private final LinkedHashSet<Reactor> delayClasses = new LinkedHashSet<>();
-
-    private final LinkedHashSet<Reactor> wrapperClasses = new LinkedHashSet<>();
-    private final LinkedHashSet<Reactor> connectionClasses = new LinkedHashSet<>();
-
-
-    /**
-     *
-     * @param generator
-     * @param targetTypes
-     * @param mainResource
-     */
-
-    public EnclavedConnectionTransformation(DelayBodyGenerator generator, TargetTypes targetTypes, Resource mainResource) {
-        this.generator = generator;
-        this.targetTypes = targetTypes;
-        this.mainResource = mainResource;
-    }
-
-    /**
-     * Transform all after delay connections by inserting generated delay reactors.
-     */
-    @Override
-    public void applyTransformation(List<Reactor> reactors) {
-        insertGeneratedEnclavedConnections(reactors);
-    }
-
-    /**
-     * Find connections in the given resource that have a delay associated with them,
-     * and reroute them via a generated delay reactor.
-     * @param reactors A list of reactors to apply the transformation to.
-     */
-    private void insertGeneratedEnclavedConnections(List<Reactor> reactors) {
-        // The resulting changes to the AST are performed _after_ iterating
-        // in order to avoid concurrent modification problems.
-        List<Connection> oldConnections = new ArrayList<>();
-        Map<EObject, List<Connection>> newConnections = new LinkedHashMap<>();
-        Map<EObject, List<Instantiation>> delayInstances = new LinkedHashMap<>();
-
-        Map<ReactorDecl, Reactor> enclaveWrappers = new LinkedHashMap<>();
-
-        // Iterate over all reactor instances, and find any enclaves
-        for (Reactor container: reactors) {
-            for (Instantiation inst : container.getInstantiations()) {
-                if (isEnclave(inst)) {
-                    Reactor r = ASTUtils.toDefinition(inst.getReactorClass());
-                    if (!enclaveWrappers.containsKey(r)) {
-
-                    }
-                }
-            }
+  /** The Lingua Franca factory for creating new AST nodes. */
+  public static final LfFactory factory = ASTUtils.factory;
+
+  /** A code generator used to insert reaction bodies for the generated delay reactors. */
+  private final DelayBodyGenerator generator;
+
+  /**
+   * A target type instance that is used during the transformation to manage target specific types
+   */
+  private final TargetTypes targetTypes;
+
+  /** The Eclipse eCore view of the main LF file. */
+  private final Resource mainResource;
+
+  /** Collection of generated delay classes. */
+  private final LinkedHashSet<Reactor> delayClasses = new LinkedHashSet<>();
+
+  private final LinkedHashSet<Reactor> wrapperClasses = new LinkedHashSet<>();
+  private final LinkedHashSet<Reactor> connectionClasses = new LinkedHashSet<>();
+
+  /**
+   * @param generator
+   * @param targetTypes
+   * @param mainResource
+   */
+  public EnclavedConnectionTransformation(
+      DelayBodyGenerator generator, TargetTypes targetTypes, Resource mainResource) {
+    this.generator = generator;
+    this.targetTypes = targetTypes;
+    this.mainResource = mainResource;
+  }
+
+  /** Transform all after delay connections by inserting generated delay reactors. */
+  @Override
+  public void applyTransformation(List<Reactor> reactors) {
+    insertGeneratedEnclavedConnections(reactors);
+  }
+
+  /**
+   * Find connections in the given resource that have a delay associated with them, and reroute them
+   * via a generated delay reactor.
+   *
+   * @param reactors A list of reactors to apply the transformation to.
+   */
+  private void insertGeneratedEnclavedConnections(List<Reactor> reactors) {
+    // The resulting changes to the AST are performed _after_ iterating
+    // in order to avoid concurrent modification problems.
+    List<Connection> oldConnections = new ArrayList<>();
+    Map<EObject, List<Connection>> newConnections = new LinkedHashMap<>();
+    Map<EObject, List<Instantiation>> delayInstances = new LinkedHashMap<>();
+
+    Map<ReactorDecl, Reactor> enclaveWrappers = new LinkedHashMap<>();
+
+    // Iterate over all reactor instances, and find any enclaves
+    for (Reactor container : reactors) {
+      for (Instantiation inst : container.getInstantiations()) {
+        if (isEnclave(inst)) {
+          Reactor r = ASTUtils.toDefinition(inst.getReactorClass());
+          if (!enclaveWrappers.containsKey(r)) {}
         }
+      }
     }
+  }
+
+  // Create an enclave wrapper class for a particular enclave
+  private Reactor createEnclaveWrapperClass(Instantiation enclave) {
+
+    Reactor enclaveClass = ASTUtils.toDefinition(enclave.getReactorClass());
+    Reactor wrapperClass = factory.createReactor();
+    for (int i = 0; i < enclaveClass.getInputs().size(); i++) {
+      Input in = factory.createInput();
+      VarRef topInRef = factory.createVarRef();
+      VarRef connInRef = factory.createVarRef();
+      VarRef connOutRef = factory.createVarRef();
+      VarRef encInRef = factory.createVarRef();
+      Reactor connClass = createEnclaveConnectionClass(enclaveClass.getInputs().get(i));
+      Instantiation connInst = createEnclaveConnectionInstance(connClass);
+      Connection topConn = factory.createConnection();
+      Connection connEnc = factory.createConnection();
+
+      // Connect top port with input port of ConnectionReactor
+      topInRef.setVariable(in);
+      connInRef.setContainer(connInst);
+      connInRef.setVariable(connClass.getInputs().get(0));
+      topConn.getLeftPorts().add(topInRef);
+      topConn.getRightPorts().add(connInRef);
+
+      // Connect output port of ConnectionReactor with the enclaved reactor
+      encInRef.setContainer(enclave);
+      encInRef.setVariable(enclaveClass.getInputs().get(i));
+      connOutRef.setContainer(connInst);
+      connOutRef.setVariable(connClass.getOutputs().get(0));
+      connEnc.getLeftPorts().add(connOutRef);
+      connEnc.getRightPorts().add(encInRef);
+
+      // Create parameters for the delay on the connection
+      Parameter topDelay =
+          createDelayParameter(enclaveClass.getInputs().get(0).getName() + "_delay");
+      ParameterReference paramRef = factory.createParameterReference();
+      paramRef.setParameter(topDelay);
+      //            connInst.getParameters().add(paramRef);
+
+      topDelay.setName("delay");
+      //            topConn.getLeftPorts().add(inRef);
+      //            topConn.getRightPorts().add(connInst.get);
 
-    // Create an enclave wrapper class for a particular enclave
-    private Reactor createEnclaveWrapperClass(Instantiation enclave) {
-
-        Reactor enclaveClass = ASTUtils.toDefinition(enclave.getReactorClass());
-        Reactor wrapperClass = factory.createReactor();
-        for (int i = 0; i<enclaveClass.getInputs().size(); i++) {
-            Input in = factory.createInput();
-            VarRef topInRef = factory.createVarRef();
-            VarRef connInRef = factory.createVarRef();
-            VarRef connOutRef = factory.createVarRef();
-            VarRef encInRef = factory.createVarRef();
-            Reactor connClass = createEnclaveConnectionClass(enclaveClass.getInputs().get(i));
-            Instantiation connInst = createEnclaveConnectionInstance(connClass);
-            Connection topConn= factory.createConnection();
-            Connection connEnc = factory.createConnection();
-
-            // Connect top port with input port of ConnectionReactor
-            topInRef.setVariable(in);
-            connInRef.setContainer(connInst);
-            connInRef.setVariable(connClass.getInputs().get(0));
-            topConn.getLeftPorts().add(topInRef);
-            topConn.getRightPorts().add(connInRef);
-
-            // Connect output port of ConnectionReactor with the enclaved reactor
-            encInRef.setContainer(enclave);
-            encInRef.setVariable(enclaveClass.getInputs().get(i));
-            connOutRef.setContainer(connInst);
-            connOutRef.setVariable(connClass.getOutputs().get(0));
-            connEnc.getLeftPorts().add(connOutRef);
-            connEnc.getRightPorts().add(encInRef);
-
-            // Create parameters for the delay on the connection
-            Parameter topDelay = createDelayParameter(enclaveClass.getInputs().get(0).getName() + "_delay");
-            ParameterReference paramRef = factory.createParameterReference();
-            paramRef.setParameter(topDelay);
-//            connInst.getParameters().add(paramRef);
-
-
-            topDelay.setName("delay");
-//            topConn.getLeftPorts().add(inRef);
-//            topConn.getRightPorts().add(connInst.get);
-
-        }
-        return enclaveClass;
-    }
-
-    private Reactor createEnclaveConnectionClass(Input input) {
-        Reactor enclaveConn = factory.createReactor();
-        Parameter delayParam = createDelayParameter("delay");
-        return enclaveConn;
-    }
-    private Instantiation createEnclaveConnectionInstance(Reactor conn) {
-        Instantiation inst = factory.createInstantiation();
-        return inst;
     }
-
-    private Parameter createDelayParameter(String name) {
-        Parameter delay = factory.createParameter();
-        delay.setType(factory.createType());
-        delay.getType().setId("time");
-        delay.getType().setTime(true);
-        delay.setName(name);
-        Time defaultTime = factory.createTime();
-        defaultTime.setUnit(null);
-        defaultTime.setInterval(0);
-        Initializer init = factory.createInitializer();
-        init.setParens(true);
-        init.setBraces(false);
-        init.getExprs().add(defaultTime);
-        delay.setInit(init);
-        return delay;
-    }
-
+    return enclaveClass;
+  }
+
+  private Reactor createEnclaveConnectionClass(Input input) {
+    Reactor enclaveConn = factory.createReactor();
+    Parameter delayParam = createDelayParameter("delay");
+    return enclaveConn;
+  }
+
+  private Instantiation createEnclaveConnectionInstance(Reactor conn) {
+    Instantiation inst = factory.createInstantiation();
+    return inst;
+  }
+
+  private Parameter createDelayParameter(String name) {
+    Parameter delay = factory.createParameter();
+    delay.setType(factory.createType());
+    delay.getType().setId("time");
+    delay.getType().setTime(true);
+    delay.setName(name);
+    Time defaultTime = factory.createTime();
+    defaultTime.setUnit(null);
+    defaultTime.setInterval(0);
+    Initializer init = factory.createInitializer();
+    init.setParens(true);
+    init.setBraces(false);
+    init.getExprs().add(defaultTime);
+    delay.setInit(init);
+    return delay;
+  }
 }
diff --git a/org.lflang/src/org/lflang/ast/FormattingUtils.java b/org.lflang/src/org/lflang/ast/FormattingUtils.java
index 860e3d6bb2..9b47440391 100644
--- a/org.lflang/src/org/lflang/ast/FormattingUtils.java
+++ b/org.lflang/src/org/lflang/ast/FormattingUtils.java
@@ -8,264 +8,241 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.lflang.Target;
 import org.lflang.lf.Model;
 
 /**
  * Utility functions that determine the specific behavior of the LF formatter.
+ *
  * @author Peter Donovan
  * @author Billy Bao
  */
 public class FormattingUtils {
-    /**
-     * The minimum number of columns that should be allotted to a comment.
-     * This is relevant in case of high indentation/small wrapLength.
-     */
-    private static final int MINIMUM_COMMENT_WIDTH_IN_COLUMNS = 15;
+  /**
+   * The minimum number of columns that should be allotted to a comment. This is relevant in case of
+   * high indentation/small wrapLength.
+   */
+  private static final int MINIMUM_COMMENT_WIDTH_IN_COLUMNS = 15;
 
-    /** Match a multiline comment. */
-    private static final Pattern MULTILINE_COMMENT = Pattern.compile(
-        "\\s*/\\*\\v?(\\V*\\v+)*\\V*"
-    );
+  /** Match a multiline comment. */
+  private static final Pattern MULTILINE_COMMENT = Pattern.compile("\\s*/\\*\\v?(\\V*\\v+)*\\V*");
 
-    /** The number of spaces to prepend to a line per indentation level. */
-    private static final int INDENTATION = 4;
+  /** The number of spaces to prepend to a line per indentation level. */
+  private static final int INDENTATION = 4;
 
-    public static final int DEFAULT_LINE_LENGTH = 80;
+  public static final int DEFAULT_LINE_LENGTH = 80;
 
-    static final int MAX_WHITESPACE_USED_FOR_ALIGNMENT = 20;
+  static final int MAX_WHITESPACE_USED_FOR_ALIGNMENT = 20;
 
-    static final long BADNESS_PER_CHARACTER_VIOLATING_LINE_LENGTH = 20;
+  static final long BADNESS_PER_CHARACTER_VIOLATING_LINE_LENGTH = 20;
 
-    static final long BADNESS_PER_LEVEL_OF_COMMENT_DISPLACEMENT = 1000;
+  static final long BADNESS_PER_LEVEL_OF_COMMENT_DISPLACEMENT = 1000;
 
-    static final long BADNESS_PER_NEWLINE = 1;
+  static final long BADNESS_PER_NEWLINE = 1;
 
-    /**
-     * Return a String representation of {@code object}, with lines wrapped at
-     * {@code lineLength}.
-     */
-    public static String render(EObject object, int lineLength) {
-        return render(object, lineLength, inferTarget(object), false);
-    }
+  /** Return a String representation of {@code object}, with lines wrapped at {@code lineLength}. */
+  public static String render(EObject object, int lineLength) {
+    return render(object, lineLength, inferTarget(object), false);
+  }
 
-    /** Return a function that renders AST nodes for the given target. */
-    public static Function<EObject, String> renderer(Target target) {
-        return object -> render(object, DEFAULT_LINE_LENGTH, target, true);
-    }
+  /** Return a function that renders AST nodes for the given target. */
+  public static Function<EObject, String> renderer(Target target) {
+    return object -> render(object, DEFAULT_LINE_LENGTH, target, true);
+  }
 
-    /**
-     * Return a String representation of {@code object}, with lines wrapped at
-     * {@code lineLength}, with the assumption that the target language is
-     * {@code target}.
-     */
-    public static String render(EObject object, int lineLength, Target target, boolean codeMapTags) {
-        MalleableString ms = ToLf.instance.doSwitch(object);
-        String singleLineCommentPrefix = target.getSingleLineCommentPrefix();
-        ms.findBestRepresentation(
-            () -> ms.render(INDENTATION, singleLineCommentPrefix, codeMapTags, null),
-            r -> r.levelsOfCommentDisplacement() * BADNESS_PER_LEVEL_OF_COMMENT_DISPLACEMENT
+  /**
+   * Return a String representation of {@code object}, with lines wrapped at {@code lineLength},
+   * with the assumption that the target language is {@code target}.
+   */
+  public static String render(EObject object, int lineLength, Target target, boolean codeMapTags) {
+    MalleableString ms = ToLf.instance.doSwitch(object);
+    String singleLineCommentPrefix = target.getSingleLineCommentPrefix();
+    ms.findBestRepresentation(
+        () -> ms.render(INDENTATION, singleLineCommentPrefix, codeMapTags, null),
+        r ->
+            r.levelsOfCommentDisplacement() * BADNESS_PER_LEVEL_OF_COMMENT_DISPLACEMENT
                 + countCharactersViolatingLineLength(lineLength).applyAsLong(r.rendering())
                     * BADNESS_PER_CHARACTER_VIOLATING_LINE_LENGTH
                 + countNewlines(r.rendering()) * BADNESS_PER_NEWLINE,
-            lineLength,
-            INDENTATION,
-            singleLineCommentPrefix
-        );
-        var optimizedRendering = ms.render(INDENTATION, singleLineCommentPrefix, codeMapTags, null);
-        List<String> comments = optimizedRendering.unplacedComments().toList();
-        return comments.stream().allMatch(String::isBlank) ? optimizedRendering.rendering()
-            : lineWrapComments(comments, lineLength, singleLineCommentPrefix)
-                + "\n" + optimizedRendering.rendering();
+        lineLength,
+        INDENTATION,
+        singleLineCommentPrefix);
+    var optimizedRendering = ms.render(INDENTATION, singleLineCommentPrefix, codeMapTags, null);
+    List<String> comments = optimizedRendering.unplacedComments().toList();
+    return comments.stream().allMatch(String::isBlank)
+        ? optimizedRendering.rendering()
+        : lineWrapComments(comments, lineLength, singleLineCommentPrefix)
+            + "\n"
+            + optimizedRendering.rendering();
+  }
+
+  /** Infer the target language of the object. */
+  private static Target inferTarget(EObject object) {
+    if (object instanceof Model model) {
+      var targetDecl = ASTUtils.targetDecl(model);
+      if (targetDecl != null) {
+        return Target.fromDecl(targetDecl);
+      }
     }
-
-    /**
-     * Infer the target language of the object.
-     */
-    private static Target inferTarget(EObject object) {
-        if (object instanceof Model model) {
-            var targetDecl = ASTUtils.targetDecl(model);
-            if (targetDecl != null) {
-                return Target.fromDecl(targetDecl);
-            }
-        }
-        throw new IllegalArgumentException("Unable to determine target based on given EObject.");
-    }
-
-    /**
-     * Return a String representation of {@code object} using a reasonable
-     * default line length.
-     */
-    public static String render(EObject object) { return render(object, DEFAULT_LINE_LENGTH); }
-
-    /**
-     * Return the number of characters appearing in columns exceeding {@code lineLength}.
-     */
-    private static ToLongFunction<String> countCharactersViolatingLineLength(int lineLength) {
-        return s -> s.lines().mapToInt(it -> Math.max(0, it.length() - lineLength)).sum();
-    }
-
-    private static long countNewlines(String s) {
-        return s.lines().count();
-    }
-
-    /**
-     * Break lines at spaces so that each line is no more than {@code width}
-     * columns long, if possible. Normalize whitespace. Merge consecutive
-     * single-line comments.
-     */
-    static String lineWrapComments(
-        List<String> comments,
-        int width,
-        String singleLineCommentPrefix
-    ) {
-        StringBuilder ret = new StringBuilder();
-        StringBuilder current = new StringBuilder();
-        for (String comment : comments) {
-            if (comment.stripLeading().startsWith("/*")) {
-                if (!ret.isEmpty() && !current.isEmpty()) ret.append("\n");
-                ret.append(lineWrapComment(current.toString(), width, singleLineCommentPrefix));
-                current.setLength(0);
-                if (!ret.isEmpty()) ret.append("\n");
-                ret.append(lineWrapComment(comment.strip(), width, singleLineCommentPrefix));
-            } else {
-                if (!current.isEmpty()) current.append("\n");
-                current.append(comment.strip());
-            }
-        }
+    throw new IllegalArgumentException("Unable to determine target based on given EObject.");
+  }
+
+  /** Return a String representation of {@code object} using a reasonable default line length. */
+  public static String render(EObject object) {
+    return render(object, DEFAULT_LINE_LENGTH);
+  }
+
+  /** Return the number of characters appearing in columns exceeding {@code lineLength}. */
+  private static ToLongFunction<String> countCharactersViolatingLineLength(int lineLength) {
+    return s -> s.lines().mapToInt(it -> Math.max(0, it.length() - lineLength)).sum();
+  }
+
+  private static long countNewlines(String s) {
+    return s.lines().count();
+  }
+
+  /**
+   * Break lines at spaces so that each line is no more than {@code width} columns long, if
+   * possible. Normalize whitespace. Merge consecutive single-line comments.
+   */
+  static String lineWrapComments(List<String> comments, int width, String singleLineCommentPrefix) {
+    StringBuilder ret = new StringBuilder();
+    StringBuilder current = new StringBuilder();
+    for (String comment : comments) {
+      if (comment.stripLeading().startsWith("/*")) {
         if (!ret.isEmpty() && !current.isEmpty()) ret.append("\n");
         ret.append(lineWrapComment(current.toString(), width, singleLineCommentPrefix));
-        return ret.toString();
+        current.setLength(0);
+        if (!ret.isEmpty()) ret.append("\n");
+        ret.append(lineWrapComment(comment.strip(), width, singleLineCommentPrefix));
+      } else {
+        if (!current.isEmpty()) current.append("\n");
+        current.append(comment.strip());
+      }
     }
-    /** Wrap lines. Do not merge lines that start with weird characters. */
-    private static String lineWrapComment(
-        String comment,
-        int width,
-        String singleLineCommentPrefix
-    ) {
-        width = Math.max(width, MINIMUM_COMMENT_WIDTH_IN_COLUMNS);
-        List<List<String>> paragraphs = Arrays.stream(
-            comment.strip()
-                .replaceAll("^/?((\\*|//|#)\\s*)+", "")
-                .replaceAll("\\s*\\*/$", "")
-                .replaceAll("(?<=(\\r\\n|\\r|\\n))\\h*(\\*|//|#)\\h*", "")
-                .split("(\n\\s*){2,}")
-            ).map(s -> Arrays.stream(s.split("(\\r\\n|\\r|\\n)\\h*(?=[@#$%^&*\\-+=:;<>/])")))
+    if (!ret.isEmpty() && !current.isEmpty()) ret.append("\n");
+    ret.append(lineWrapComment(current.toString(), width, singleLineCommentPrefix));
+    return ret.toString();
+  }
+  /** Wrap lines. Do not merge lines that start with weird characters. */
+  private static String lineWrapComment(String comment, int width, String singleLineCommentPrefix) {
+    width = Math.max(width, MINIMUM_COMMENT_WIDTH_IN_COLUMNS);
+    List<List<String>> paragraphs =
+        Arrays.stream(
+                comment
+                    .strip()
+                    .replaceAll("^/?((\\*|//|#)\\s*)+", "")
+                    .replaceAll("\\s*\\*/$", "")
+                    .replaceAll("(?<=(\\r\\n|\\r|\\n))\\h*(\\*|//|#)\\h*", "")
+                    .split("(\n\\s*){2,}"))
+            .map(s -> Arrays.stream(s.split("(\\r\\n|\\r|\\n)\\h*(?=[@#$%^&*\\-+=:;<>/])")))
             .map(stream -> stream.map(s -> s.replaceAll("\\s+", " ")))
             .map(Stream::toList)
             .toList();
-        if (MULTILINE_COMMENT.matcher(comment).matches()) {
-            if (paragraphs.size() == 1 && paragraphs.get(0).size() == 1) {
-                String singleLineRepresentation = String.format(
-                    "/** %s */", paragraphs.get(0).get(0)
-                );
-                if (singleLineRepresentation.length() <= width) return singleLineRepresentation;
-            }
-            return String.format("/**\n%s\n */", lineWrapComment(paragraphs, width, " * "));
-        }
-        return lineWrapComment(paragraphs, width, singleLineCommentPrefix + " ");
-    }
-
-    /**
-     * Wrap lines.
-     * @param paragraphs A list of lists of subparagraphs.
-     * @param width The preferred maximum number of columns per line.
-     * @param linePrefix A string to prepend to each line of comment.
-     */
-    private static String lineWrapComment(
-        List<List<String>> paragraphs,
-        int width,
-        String linePrefix
-    ) {
-        int widthAfterPrefix = Math.max(
-            width - linePrefix.length(),
-            MINIMUM_COMMENT_WIDTH_IN_COLUMNS
-        );
-        return paragraphs.stream()
-            .map(paragraph -> wrapLines(paragraph, widthAfterPrefix)
-                .map(s -> (linePrefix + s.stripLeading()).stripTrailing())
-                .collect(Collectors.joining("\n"))
-            ).collect(Collectors.joining(String.format("\n%s\n", linePrefix.stripTrailing())));
+    if (MULTILINE_COMMENT.matcher(comment).matches()) {
+      if (paragraphs.size() == 1 && paragraphs.get(0).size() == 1) {
+        String singleLineRepresentation = String.format("/** %s */", paragraphs.get(0).get(0));
+        if (singleLineRepresentation.length() <= width) return singleLineRepresentation;
+      }
+      return String.format("/**\n%s\n */", lineWrapComment(paragraphs, width, " * "));
     }
-
-    /** Wrap a given paragraph. */
-    private static Stream<String> wrapLines(List<String> subparagraphs, int width) {
-        var ret = new ArrayList<String>();
-        for (String s : subparagraphs) {
-            int numCharactersProcessed = 0;
-            while (numCharactersProcessed + width < s.length()) {
-                // try to wrap at space
-                int breakAt = s.lastIndexOf(' ', numCharactersProcessed + width);
-                // if unable to find space in limit, extend to the first space we find
-                if (breakAt < numCharactersProcessed) {
-                    breakAt = s.indexOf(' ', numCharactersProcessed + width);
-                }
-                if (breakAt < numCharactersProcessed) breakAt = s.length();
-                ret.add(s.substring(numCharactersProcessed, breakAt));
-                numCharactersProcessed = breakAt + 1;
-            }
-            if (numCharactersProcessed < s.length()) ret.add(s.substring(numCharactersProcessed));
+    return lineWrapComment(paragraphs, width, singleLineCommentPrefix + " ");
+  }
+
+  /**
+   * Wrap lines.
+   *
+   * @param paragraphs A list of lists of subparagraphs.
+   * @param width The preferred maximum number of columns per line.
+   * @param linePrefix A string to prepend to each line of comment.
+   */
+  private static String lineWrapComment(
+      List<List<String>> paragraphs, int width, String linePrefix) {
+    int widthAfterPrefix = Math.max(width - linePrefix.length(), MINIMUM_COMMENT_WIDTH_IN_COLUMNS);
+    return paragraphs.stream()
+        .map(
+            paragraph ->
+                wrapLines(paragraph, widthAfterPrefix)
+                    .map(s -> (linePrefix + s.stripLeading()).stripTrailing())
+                    .collect(Collectors.joining("\n")))
+        .collect(Collectors.joining(String.format("\n%s\n", linePrefix.stripTrailing())));
+  }
+
+  /** Wrap a given paragraph. */
+  private static Stream<String> wrapLines(List<String> subparagraphs, int width) {
+    var ret = new ArrayList<String>();
+    for (String s : subparagraphs) {
+      int numCharactersProcessed = 0;
+      while (numCharactersProcessed + width < s.length()) {
+        // try to wrap at space
+        int breakAt = s.lastIndexOf(' ', numCharactersProcessed + width);
+        // if unable to find space in limit, extend to the first space we find
+        if (breakAt < numCharactersProcessed) {
+          breakAt = s.indexOf(' ', numCharactersProcessed + width);
         }
-        return ret.stream();
+        if (breakAt < numCharactersProcessed) breakAt = s.length();
+        ret.add(s.substring(numCharactersProcessed, breakAt));
+        numCharactersProcessed = breakAt + 1;
+      }
+      if (numCharactersProcessed < s.length()) ret.add(s.substring(numCharactersProcessed));
     }
-
-    /**
-     * Merge {@code comment} into the given list of strings without changing the
-     * length of the list, preferably in a place that indicates that
-     * {@code comment} is associated with the {@code i}th string.
-     * @param comment A comment associated with an element of
-     * {@code components}.
-     * @param components A list of strings that will be rendered in sequence.
-     * @param i The position of the component associated with {@code comment}.
-     * @param width The ideal number of columns available for comments that
-     * appear on their own line.
-     * @param keepCommentsOnSameLine Whether to make a best-effort attempt to
-     * keep the comment on the same line as the associated string.
-     * @param singleLineCommentPrefix The prefix that marks the start of a
-     * single-line comment.
-     * @param startColumn The ideal starting column of a comment
-     * @return Whether the comment placement succeeded.
-     */
-    static boolean placeComment(
-        List<String> comment,
-        List<String> components,
-        int i,
-        int width,
-        boolean keepCommentsOnSameLine,
-        String singleLineCommentPrefix,
-        int startColumn
-    ) {
-        if (comment.stream().allMatch(String::isBlank)) return true;
-        String wrapped = FormattingUtils.lineWrapComments(comment, width, singleLineCommentPrefix);
-        if (keepCommentsOnSameLine && wrapped.lines().count() == 1 && !wrapped.startsWith("/**")) {
-            int sum = 0;
-            for (int j = 0; j < components.size(); j++) {
-                String current = components.get(j);
-                if (j >= i && current.contains("\n")) {
-                    components.set(j, components.get(j).replaceFirst(
-                        "\n",
-                        " ".repeat(Math.max(
-                            2,
-                            startColumn - sum - components.get(j).indexOf("\n")
-                        )) + wrapped + "\n"
-                    ));
-                    return true;
-                } else if (current.contains("\n")) {
-                    sum = current.length() - current.lastIndexOf("\n") - 1;
-                } else {
-                    sum += current.length();
-                }
-            }
+    return ret.stream();
+  }
+
+  /**
+   * Merge {@code comment} into the given list of strings without changing the length of the list,
+   * preferably in a place that indicates that {@code comment} is associated with the {@code i}th
+   * string.
+   *
+   * @param comment A comment associated with an element of {@code components}.
+   * @param components A list of strings that will be rendered in sequence.
+   * @param i The position of the component associated with {@code comment}.
+   * @param width The ideal number of columns available for comments that appear on their own line.
+   * @param keepCommentsOnSameLine Whether to make a best-effort attempt to keep the comment on the
+   *     same line as the associated string.
+   * @param singleLineCommentPrefix The prefix that marks the start of a single-line comment.
+   * @param startColumn The ideal starting column of a comment
+   * @return Whether the comment placement succeeded.
+   */
+  static boolean placeComment(
+      List<String> comment,
+      List<String> components,
+      int i,
+      int width,
+      boolean keepCommentsOnSameLine,
+      String singleLineCommentPrefix,
+      int startColumn) {
+    if (comment.stream().allMatch(String::isBlank)) return true;
+    String wrapped = FormattingUtils.lineWrapComments(comment, width, singleLineCommentPrefix);
+    if (keepCommentsOnSameLine && wrapped.lines().count() == 1 && !wrapped.startsWith("/**")) {
+      int sum = 0;
+      for (int j = 0; j < components.size(); j++) {
+        String current = components.get(j);
+        if (j >= i && current.contains("\n")) {
+          components.set(
+              j,
+              components
+                  .get(j)
+                  .replaceFirst(
+                      "\n",
+                      " ".repeat(Math.max(2, startColumn - sum - components.get(j).indexOf("\n")))
+                          + wrapped
+                          + "\n"));
+          return true;
+        } else if (current.contains("\n")) {
+          sum = current.length() - current.lastIndexOf("\n") - 1;
+        } else {
+          sum += current.length();
         }
-        for (int j = i - 1; j >= 0; j--) {
-            if (components.get(j).endsWith("\n")) {
-                components.set(j, String.format("%s%s\n", components.get(j), wrapped));
-                return true;
-            }
-        }
-        return false;
+      }
+    }
+    for (int j = i - 1; j >= 0; j--) {
+      if (components.get(j).endsWith("\n")) {
+        components.set(j, String.format("%s%s\n", components.get(j), wrapped));
+        return true;
+      }
     }
+    return false;
+  }
 }
diff --git a/org.lflang/src/org/lflang/ast/IsEqual.java b/org.lflang/src/org/lflang/ast/IsEqual.java
index af0274ea2a..bc0fc31abf 100644
--- a/org.lflang/src/org/lflang/ast/IsEqual.java
+++ b/org.lflang/src/org/lflang/ast/IsEqual.java
@@ -6,9 +6,7 @@
 import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.lflang.TimeUnit;
 import org.lflang.lf.Action;
 import org.lflang.lf.Array;
@@ -66,620 +64,603 @@
 import org.lflang.lf.util.LfSwitch;
 
 /**
- * Switch class that checks if subtrees of the AST are semantically equivalent
- * to each other. Return {@code false} if they are not equivalent; return
- * {@code true} or {@code false} (but preferably {@code true}) if they are
- * equivalent.
+ * Switch class that checks if subtrees of the AST are semantically equivalent to each other. Return
+ * {@code false} if they are not equivalent; return {@code true} or {@code false} (but preferably
+ * {@code true}) if they are equivalent.
  */
 public class IsEqual extends LfSwitch<Boolean> {
 
-    private final EObject otherObject;
-
-    public IsEqual(EObject other) {
-        this.otherObject = other;
-    }
-
-    @Override
-    public Boolean doSwitch(EObject eObject) {
-        if (otherObject == eObject) return true;
-        if (eObject == null) return false;
-        return super.doSwitch(eObject);
-    }
-
-    @Override
-    public Boolean caseModel(Model object) {
-        return new ComparisonMachine<>(object, Model.class)
-            .equivalent(Model::getTarget)
-            .listsEquivalent(Model::getImports)
-            .listsEquivalent(Model::getPreambles)
-            .listsEquivalent(Model::getReactors).conclusion;
-    }
-
-    @Override
-    public Boolean caseImport(Import object) {
-        return new ComparisonMachine<>(object, Import.class)
-            .equalAsObjects(Import::getImportURI)
-            .listsEquivalent(Import::getReactorClasses).conclusion;
-    }
-
-    @Override
-    public Boolean caseReactorDecl(ReactorDecl object) {
-        return new ComparisonMachine<>(object, ReactorDecl.class)
-            .equalAsObjects(ReactorDecl::getName)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseImportedReactor(ImportedReactor object) {
-        return new ComparisonMachine<>(object, ImportedReactor.class)
-            .equalAsObjects(ImportedReactor::getName)
-            .equivalent(ImportedReactor::getReactorClass)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseReactor(Reactor object) {
-        return new ComparisonMachine<>(object, Reactor.class)
-            .listsEquivalent(Reactor::getAttributes)
-            .equalAsObjects(Reactor::isFederated)
-            .equalAsObjects(Reactor::isRealtime)
-            .equalAsObjects(Reactor::isMain)
-            .equalAsObjects(Reactor::getName)
-            .listsEquivalent(Reactor::getTypeParms)
-            .listsEquivalent(Reactor::getParameters)
-            .equivalent(Reactor::getHost)
-            .listsEquivalent(Reactor::getSuperClasses)
-            .listsEquivalent(Reactor::getPreambles)
-            .listsEquivalent(Reactor::getInputs)
-            .listsEquivalent(Reactor::getOutputs)
-            .listsEquivalent(Reactor::getTimers)
-            .listsEquivalent(Reactor::getActions)
-            .listsEquivalent(Reactor::getInstantiations)
-            .listsEquivalent(Reactor::getConnections)
-            .listsEquivalent(Reactor::getStateVars)
-            .listsEquivalent(Reactor::getReactions)
-            .listsEquivalent(Reactor::getMethods)
-            .listsEquivalent(Reactor::getModes)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseTypeParm(TypeParm object) {
-        return new ComparisonMachine<>(object, TypeParm.class)
-            .equalAsObjects(TypeParm::getLiteral)
-            .equivalent(TypeParm::getCode)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseTargetDecl(TargetDecl object) {
-        return new ComparisonMachine<>(object, TargetDecl.class)
-            .equalAsObjects(TargetDecl::getName)
-            .equivalentModulo(
-                TargetDecl::getConfig,
-                (KeyValuePairs it) -> it != null && it.getPairs().isEmpty() ? null : it
-            )
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseStateVar(StateVar object) {
-        return new ComparisonMachine<>(object, StateVar.class)
-            .listsEquivalent(StateVar::getAttributes)
-            .equalAsObjects(StateVar::getName)
-            .equivalent(StateVar::getType)
-            .equivalent(StateVar::getInit)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseInitializer(Initializer object) {
-        // Empty braces are not equivalent to no init.
-        return new ComparisonMachine<>(object, Initializer.class)
-            .equalAsObjects(Initializer::isBraces)
-            // An initializer with no parens is equivalent to one with parens,
-            // if the list has a single element. This is probably going to change
-            // when we introduce equals initializers.
-            // .equalAsObjects(Initializer::isParens)
-            .listsEquivalent(Initializer::getExprs)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseMethod(Method object) {
-        return new ComparisonMachine<>(object, Method.class)
-            .equalAsObjects(Method::isConst)
-            .equalAsObjects(Method::getName)
-            .listsEquivalent(Method::getArguments)
-            .equivalent(Method::getReturn)
-            .equivalent(Method::getCode)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseMethodArgument(MethodArgument object) {
-        return new ComparisonMachine<>(object, MethodArgument.class)
-            .equalAsObjects(MethodArgument::getName)
-            .equivalent(MethodArgument::getType)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseInput(Input object) {
-        return new ComparisonMachine<>(object, Input.class)
-            .listsEquivalent(Input::getAttributes)
-            .equalAsObjects(Input::isMutable)
-            .equivalent(Input::getWidthSpec)
-            .equivalent(Input::getType)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseOutput(Output object) {
-        return new ComparisonMachine<>(object, Output.class)
-            .listsEquivalent(Output::getAttributes)
-            .equivalent(Output::getWidthSpec)
-            .equalAsObjects(Output::getName)
-            .equivalent(Output::getType)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseTimer(Timer object) {
-        return new ComparisonMachine<>(object, Timer.class)
-            .listsEquivalent(Timer::getAttributes)
-            .equalAsObjects(Timer::getName)
-            .equivalent(Timer::getOffset)
-            .equivalent(Timer::getPeriod)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseMode(Mode object) {
-        return new ComparisonMachine<>(object, Mode.class)
-            .equalAsObjects(Mode::isInitial)
-            .equalAsObjects(Mode::getName)
-            .listsEquivalent(Mode::getStateVars)
-            .listsEquivalent(Mode::getTimers)
-            .listsEquivalent(Mode::getActions)
-            .listsEquivalent(Mode::getInstantiations)
-            .listsEquivalent(Mode::getConnections)
-            .listsEquivalent(Mode::getReactions)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseAction(Action object) {
-        return new ComparisonMachine<>(object, Action.class)
-            .listsEquivalent(Action::getAttributes)
-            .equalAsObjects(Action::getOrigin) // This is an enum
-            .equalAsObjects(Action::getName)
-            .equivalent(Action::getMinDelay)
-            .equivalent(Action::getMinSpacing)
-            .equalAsObjects(Action::getPolicy)
-            .equivalent(Action::getType)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseAttribute(Attribute object) {
-        return new ComparisonMachine<>(object, Attribute.class)
-            .equalAsObjects(Attribute::getAttrName)
-            .listsEquivalent(Attribute::getAttrParms)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseAttrParm(AttrParm object) {
-        return new ComparisonMachine<>(object, AttrParm.class)
-            .equalAsObjects(AttrParm::getName)
-            .equalAsObjects(AttrParm::getValue)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseReaction(Reaction object) {
-        return new ComparisonMachine<>(object, Reaction.class)
-            .listsEquivalent(Reaction::getAttributes)
-            .listsEquivalent(Reaction::getTriggers)
-            .listsEquivalent(Reaction::getSources)
-            .listsEquivalent(Reaction::getEffects)
-            .equalAsObjects(Reaction::isMutation)
-            .equalAsObjects(Reaction::getName)
-            .equivalent(Reaction::getCode)
-            .equivalent(Reaction::getStp)
-            .equivalent(Reaction::getDeadline)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseTriggerRef(TriggerRef object) {
-        throw thereIsAMoreSpecificCase(TriggerRef.class, BuiltinTriggerRef.class, VarRef.class);
-    }
-
-    @Override
-    public Boolean caseBuiltinTriggerRef(BuiltinTriggerRef object) {
-        return new ComparisonMachine<>(object, BuiltinTriggerRef.class)
-            .equalAsObjects(BuiltinTriggerRef::getType)  // This is an enum
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseDeadline(Deadline object) {
-        return new ComparisonMachine<>(object, Deadline.class)
-            .equivalent(Deadline::getDelay)
-            .equivalent(Deadline::getCode)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseSTP(STP object) {
-        return new ComparisonMachine<>(object, STP.class)
-            .equivalent(STP::getValue)
-            .equivalent(STP::getCode)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean casePreamble(Preamble object) {
-        return new ComparisonMachine<>(object, Preamble.class)
-            .equalAsObjects(Preamble::getVisibility)  // This is an enum
-            .equivalent(Preamble::getCode)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseInstantiation(Instantiation object) {
-        return new ComparisonMachine<>(object, Instantiation.class)
-            .equalAsObjects(Instantiation::getName)
-            .equivalent(Instantiation::getWidthSpec)
-            .equivalent(Instantiation::getReactorClass)
-            .listsEquivalent(Instantiation::getTypeArgs)
-            .listsEquivalent(Instantiation::getParameters)
-            .equivalent(Instantiation::getHost)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseConnection(Connection object) {
-        return new ComparisonMachine<>(object, Connection.class)
-            .listsEquivalent(Connection::getLeftPorts)
-            .equalAsObjects(Connection::isIterated)
-            .equalAsObjects(Connection::isPhysical)
-            .listsEquivalent(Connection::getRightPorts)
-            .equivalent(Connection::getDelay)
-            .equivalent(Connection::getSerializer)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseSerializer(Serializer object) {
-        return new ComparisonMachine<>(object, Serializer.class)
-            .equalAsObjects(Serializer::getType)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseKeyValuePairs(KeyValuePairs object) {
-        return new ComparisonMachine<>(object, KeyValuePairs.class)
-            .listsEquivalent(KeyValuePairs::getPairs)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseKeyValuePair(KeyValuePair object) {
-        return new ComparisonMachine<>(object, KeyValuePair.class)
-            .equalAsObjects(KeyValuePair::getName)
-            .equivalent(KeyValuePair::getValue)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseArray(Array object) {
-        return new ComparisonMachine<>(object, Array.class)
-            .listsEquivalent(Array::getElements)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseElement(Element object) {
-        return new ComparisonMachine<>(object, Element.class)
-            .equivalent(Element::getKeyvalue)
-            .equivalent(Element::getArray)
-            .equalAsObjects(Element::getLiteral)
-            .equalAsObjects(Element::getId)
-            .equalAsObjects(Element::getUnit)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseTypedVariable(TypedVariable object) {
-        throw thereIsAMoreSpecificCase(TypedVariable.class, Port.class, Action.class);
-    }
-
-    @Override
-    public Boolean caseVariable(Variable object) {
-        throw thereIsAMoreSpecificCase(Variable.class, TypedVariable.class, Timer.class, Mode.class);
-    }
-
-    @Override
-    public Boolean caseVarRef(VarRef object) {
-        return new ComparisonMachine<>(object, VarRef.class)
-            .equalAsObjects(varRef -> varRef.getVariable() instanceof Mode ? null : varRef.getVariable().getName())
-            .equivalent(varRef -> varRef.getVariable() instanceof Mode ? null : varRef.getVariable())
-            .equalAsObjects(varRef -> varRef.getContainer() == null ? null : varRef.getContainer().getName())
-            .equalAsObjects(VarRef::isInterleaved)
-            .equalAsObjects(VarRef::getTransition)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseAssignment(Assignment object) {
-        return new ComparisonMachine<>(object, Assignment.class)
-            .equivalent(Assignment::getLhs)
-            .equivalent(Assignment::getRhs)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseParameter(Parameter object) {
-        return new ComparisonMachine<>(object, Parameter.class)
-            .listsEquivalent(Parameter::getAttributes)
-            .equalAsObjects(Parameter::getName)
-            .equivalent(Parameter::getType)
-            .equivalent(Parameter::getInit)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseExpression(Expression object) {
-        throw thereIsAMoreSpecificCase(
-            Expression.class,
-            Literal.class,
-            Time.class,
-            ParameterReference.class,
-            Code.class,
-            BracedListExpression.class
-        );
-    }
-
-    @Override
-    public Boolean caseBracedListExpression(BracedListExpression object) {
-        return new ComparisonMachine<>(object, BracedListExpression.class)
-            .listsEquivalent(BracedListExpression::getItems)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseParameterReference(ParameterReference object) {
-        return new ComparisonMachine<>(object, ParameterReference.class)
-            .equivalent(ParameterReference::getParameter)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseTime(Time object) {
-        return new ComparisonMachine<>(object, Time.class)
-            .equalAsObjects(Time::getInterval)
-            .equalAsObjectsModulo(
-                Time::getUnit,
-                ((Function<TimeUnit, String>) TimeUnit::getCanonicalName)
-                    .compose(TimeUnit::fromName)
-            )
-            .conclusion;
-    }
-
-    @Override
-    public Boolean casePort(Port object) {
-        throw thereIsAMoreSpecificCase(Port.class, Input.class, Output.class);
-    }
-
-    @Override
-    public Boolean caseType(Type object) {
-        return new ComparisonMachine<>(object, Type.class)
-            .equivalent(Type::getCode)
-            .equalAsObjects(Type::isTime)
-            .equivalent(Type::getArraySpec)
-            .equalAsObjects(Type::getId)
-            .listsEquivalent(Type::getTypeArgs)
-            .listsEqualAsObjects(Type::getStars)
-            .equivalent(Type::getArraySpec)
-            .equivalent(Type::getCode)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseArraySpec(ArraySpec object) {
-        return new ComparisonMachine<>(object, ArraySpec.class)
-            .equalAsObjects(ArraySpec::isOfVariableLength)
-            .equalAsObjects(ArraySpec::getLength)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseWatchdog(Watchdog object) {
-        return new ComparisonMachine<>(object, Watchdog.class)
-            .equalAsObjects(Watchdog::getName)
-            .equivalent(Watchdog::getTimeout)
-            .listsEquivalent(Watchdog::getEffects)
-            .equivalent(Watchdog::getCode)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseWidthSpec(WidthSpec object) {
-        return new ComparisonMachine<>(object, WidthSpec.class)
-            .equalAsObjects(WidthSpec::isOfVariableLength)
-            .listsEquivalent(WidthSpec::getTerms)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseWidthTerm(WidthTerm object) {
-        return new ComparisonMachine<>(object, WidthTerm.class)
-            .equalAsObjects(WidthTerm::getWidth)
-            .equivalent(WidthTerm::getParameter)
-            .equivalent(WidthTerm::getPort)
-            .equivalent(WidthTerm::getCode)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseIPV4Host(IPV4Host object) {
-        return caseHost(object);
-    }
-
-    @Override
-    public Boolean caseIPV6Host(IPV6Host object) {
-        return caseHost(object);
-    }
-
-    @Override
-    public Boolean caseNamedHost(NamedHost object) {
-        return caseHost(object);
-    }
-
-    @Override
-    public Boolean caseHost(Host object) {
-        return new ComparisonMachine<>(object, Host.class)
-            .equalAsObjects(Host::getUser)
-            .equalAsObjects(Host::getAddr)
-            .equalAsObjects(Host::getPort)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseCodeExpr(CodeExpr object) {
-        return new ComparisonMachine<>(object, CodeExpr.class).equivalent(CodeExpr::getCode).conclusion;
-    }
-
-    @Override
-    public Boolean caseCode(Code object) {
-        return new ComparisonMachine<>(object, Code.class)
-            .equalAsObjectsModulo(
-                Code::getBody,
-                s -> s == null ? null : s.strip().stripIndent()
-            )
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseLiteral(Literal object) {
-        return new ComparisonMachine<>(object, Literal.class)
-            .equalAsObjects(Literal::getLiteral)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean defaultCase(EObject object) {
-        return super.defaultCase(object);
-    }
-
-    @SafeVarargs
-    private UnsupportedOperationException thereIsAMoreSpecificCase(
-        Class<? extends EObject> thisCase,
-        Class<? extends EObject>... moreSpecificCases
-    ) {
-        return new UnsupportedOperationException(String.format(
+  private final EObject otherObject;
+
+  public IsEqual(EObject other) {
+    this.otherObject = other;
+  }
+
+  @Override
+  public Boolean doSwitch(EObject eObject) {
+    if (otherObject == eObject) return true;
+    if (eObject == null) return false;
+    return super.doSwitch(eObject);
+  }
+
+  @Override
+  public Boolean caseModel(Model object) {
+    return new ComparisonMachine<>(object, Model.class)
+        .equivalent(Model::getTarget)
+        .listsEquivalent(Model::getImports)
+        .listsEquivalent(Model::getPreambles)
+        .listsEquivalent(Model::getReactors)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseImport(Import object) {
+    return new ComparisonMachine<>(object, Import.class)
+        .equalAsObjects(Import::getImportURI)
+        .listsEquivalent(Import::getReactorClasses)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseReactorDecl(ReactorDecl object) {
+    return new ComparisonMachine<>(object, ReactorDecl.class)
+        .equalAsObjects(ReactorDecl::getName)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseImportedReactor(ImportedReactor object) {
+    return new ComparisonMachine<>(object, ImportedReactor.class)
+        .equalAsObjects(ImportedReactor::getName)
+        .equivalent(ImportedReactor::getReactorClass)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseReactor(Reactor object) {
+    return new ComparisonMachine<>(object, Reactor.class)
+        .listsEquivalent(Reactor::getAttributes)
+        .equalAsObjects(Reactor::isFederated)
+        .equalAsObjects(Reactor::isRealtime)
+        .equalAsObjects(Reactor::isMain)
+        .equalAsObjects(Reactor::getName)
+        .listsEquivalent(Reactor::getTypeParms)
+        .listsEquivalent(Reactor::getParameters)
+        .equivalent(Reactor::getHost)
+        .listsEquivalent(Reactor::getSuperClasses)
+        .listsEquivalent(Reactor::getPreambles)
+        .listsEquivalent(Reactor::getInputs)
+        .listsEquivalent(Reactor::getOutputs)
+        .listsEquivalent(Reactor::getTimers)
+        .listsEquivalent(Reactor::getActions)
+        .listsEquivalent(Reactor::getInstantiations)
+        .listsEquivalent(Reactor::getConnections)
+        .listsEquivalent(Reactor::getStateVars)
+        .listsEquivalent(Reactor::getReactions)
+        .listsEquivalent(Reactor::getMethods)
+        .listsEquivalent(Reactor::getModes)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseTypeParm(TypeParm object) {
+    return new ComparisonMachine<>(object, TypeParm.class)
+        .equalAsObjects(TypeParm::getLiteral)
+        .equivalent(TypeParm::getCode)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseTargetDecl(TargetDecl object) {
+    return new ComparisonMachine<>(object, TargetDecl.class)
+        .equalAsObjects(TargetDecl::getName)
+        .equivalentModulo(
+            TargetDecl::getConfig,
+            (KeyValuePairs it) -> it != null && it.getPairs().isEmpty() ? null : it)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseStateVar(StateVar object) {
+    return new ComparisonMachine<>(object, StateVar.class)
+        .listsEquivalent(StateVar::getAttributes)
+        .equalAsObjects(StateVar::getName)
+        .equivalent(StateVar::getType)
+        .equivalent(StateVar::getInit)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseInitializer(Initializer object) {
+    // Empty braces are not equivalent to no init.
+    return new ComparisonMachine<>(object, Initializer.class)
+        .equalAsObjects(Initializer::isBraces)
+        // An initializer with no parens is equivalent to one with parens,
+        // if the list has a single element. This is probably going to change
+        // when we introduce equals initializers.
+        // .equalAsObjects(Initializer::isParens)
+        .listsEquivalent(Initializer::getExprs)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseMethod(Method object) {
+    return new ComparisonMachine<>(object, Method.class)
+        .equalAsObjects(Method::isConst)
+        .equalAsObjects(Method::getName)
+        .listsEquivalent(Method::getArguments)
+        .equivalent(Method::getReturn)
+        .equivalent(Method::getCode)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseMethodArgument(MethodArgument object) {
+    return new ComparisonMachine<>(object, MethodArgument.class)
+        .equalAsObjects(MethodArgument::getName)
+        .equivalent(MethodArgument::getType)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseInput(Input object) {
+    return new ComparisonMachine<>(object, Input.class)
+        .listsEquivalent(Input::getAttributes)
+        .equalAsObjects(Input::isMutable)
+        .equivalent(Input::getWidthSpec)
+        .equivalent(Input::getType)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseOutput(Output object) {
+    return new ComparisonMachine<>(object, Output.class)
+        .listsEquivalent(Output::getAttributes)
+        .equivalent(Output::getWidthSpec)
+        .equalAsObjects(Output::getName)
+        .equivalent(Output::getType)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseTimer(Timer object) {
+    return new ComparisonMachine<>(object, Timer.class)
+        .listsEquivalent(Timer::getAttributes)
+        .equalAsObjects(Timer::getName)
+        .equivalent(Timer::getOffset)
+        .equivalent(Timer::getPeriod)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseMode(Mode object) {
+    return new ComparisonMachine<>(object, Mode.class)
+        .equalAsObjects(Mode::isInitial)
+        .equalAsObjects(Mode::getName)
+        .listsEquivalent(Mode::getStateVars)
+        .listsEquivalent(Mode::getTimers)
+        .listsEquivalent(Mode::getActions)
+        .listsEquivalent(Mode::getInstantiations)
+        .listsEquivalent(Mode::getConnections)
+        .listsEquivalent(Mode::getReactions)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseAction(Action object) {
+    return new ComparisonMachine<>(object, Action.class)
+        .listsEquivalent(Action::getAttributes)
+        .equalAsObjects(Action::getOrigin) // This is an enum
+        .equalAsObjects(Action::getName)
+        .equivalent(Action::getMinDelay)
+        .equivalent(Action::getMinSpacing)
+        .equalAsObjects(Action::getPolicy)
+        .equivalent(Action::getType)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseAttribute(Attribute object) {
+    return new ComparisonMachine<>(object, Attribute.class)
+        .equalAsObjects(Attribute::getAttrName)
+        .listsEquivalent(Attribute::getAttrParms)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseAttrParm(AttrParm object) {
+    return new ComparisonMachine<>(object, AttrParm.class)
+        .equalAsObjects(AttrParm::getName)
+        .equalAsObjects(AttrParm::getValue)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseReaction(Reaction object) {
+    return new ComparisonMachine<>(object, Reaction.class)
+        .listsEquivalent(Reaction::getAttributes)
+        .listsEquivalent(Reaction::getTriggers)
+        .listsEquivalent(Reaction::getSources)
+        .listsEquivalent(Reaction::getEffects)
+        .equalAsObjects(Reaction::isMutation)
+        .equalAsObjects(Reaction::getName)
+        .equivalent(Reaction::getCode)
+        .equivalent(Reaction::getStp)
+        .equivalent(Reaction::getDeadline)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseTriggerRef(TriggerRef object) {
+    throw thereIsAMoreSpecificCase(TriggerRef.class, BuiltinTriggerRef.class, VarRef.class);
+  }
+
+  @Override
+  public Boolean caseBuiltinTriggerRef(BuiltinTriggerRef object) {
+    return new ComparisonMachine<>(object, BuiltinTriggerRef.class)
+        .equalAsObjects(BuiltinTriggerRef::getType) // This is an enum
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseDeadline(Deadline object) {
+    return new ComparisonMachine<>(object, Deadline.class)
+        .equivalent(Deadline::getDelay)
+        .equivalent(Deadline::getCode)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseSTP(STP object) {
+    return new ComparisonMachine<>(object, STP.class)
+        .equivalent(STP::getValue)
+        .equivalent(STP::getCode)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean casePreamble(Preamble object) {
+    return new ComparisonMachine<>(object, Preamble.class)
+        .equalAsObjects(Preamble::getVisibility) // This is an enum
+        .equivalent(Preamble::getCode)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseInstantiation(Instantiation object) {
+    return new ComparisonMachine<>(object, Instantiation.class)
+        .equalAsObjects(Instantiation::getName)
+        .equivalent(Instantiation::getWidthSpec)
+        .equivalent(Instantiation::getReactorClass)
+        .listsEquivalent(Instantiation::getTypeArgs)
+        .listsEquivalent(Instantiation::getParameters)
+        .equivalent(Instantiation::getHost)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseConnection(Connection object) {
+    return new ComparisonMachine<>(object, Connection.class)
+        .listsEquivalent(Connection::getLeftPorts)
+        .equalAsObjects(Connection::isIterated)
+        .equalAsObjects(Connection::isPhysical)
+        .listsEquivalent(Connection::getRightPorts)
+        .equivalent(Connection::getDelay)
+        .equivalent(Connection::getSerializer)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseSerializer(Serializer object) {
+    return new ComparisonMachine<>(object, Serializer.class)
+        .equalAsObjects(Serializer::getType)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseKeyValuePairs(KeyValuePairs object) {
+    return new ComparisonMachine<>(object, KeyValuePairs.class)
+        .listsEquivalent(KeyValuePairs::getPairs)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseKeyValuePair(KeyValuePair object) {
+    return new ComparisonMachine<>(object, KeyValuePair.class)
+        .equalAsObjects(KeyValuePair::getName)
+        .equivalent(KeyValuePair::getValue)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseArray(Array object) {
+    return new ComparisonMachine<>(object, Array.class)
+        .listsEquivalent(Array::getElements)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseElement(Element object) {
+    return new ComparisonMachine<>(object, Element.class)
+        .equivalent(Element::getKeyvalue)
+        .equivalent(Element::getArray)
+        .equalAsObjects(Element::getLiteral)
+        .equalAsObjects(Element::getId)
+        .equalAsObjects(Element::getUnit)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseTypedVariable(TypedVariable object) {
+    throw thereIsAMoreSpecificCase(TypedVariable.class, Port.class, Action.class);
+  }
+
+  @Override
+  public Boolean caseVariable(Variable object) {
+    throw thereIsAMoreSpecificCase(Variable.class, TypedVariable.class, Timer.class, Mode.class);
+  }
+
+  @Override
+  public Boolean caseVarRef(VarRef object) {
+    return new ComparisonMachine<>(object, VarRef.class)
+        .equalAsObjects(
+            varRef -> varRef.getVariable() instanceof Mode ? null : varRef.getVariable().getName())
+        .equivalent(varRef -> varRef.getVariable() instanceof Mode ? null : varRef.getVariable())
+        .equalAsObjects(
+            varRef -> varRef.getContainer() == null ? null : varRef.getContainer().getName())
+        .equalAsObjects(VarRef::isInterleaved)
+        .equalAsObjects(VarRef::getTransition)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseAssignment(Assignment object) {
+    return new ComparisonMachine<>(object, Assignment.class)
+        .equivalent(Assignment::getLhs)
+        .equivalent(Assignment::getRhs)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseParameter(Parameter object) {
+    return new ComparisonMachine<>(object, Parameter.class)
+        .listsEquivalent(Parameter::getAttributes)
+        .equalAsObjects(Parameter::getName)
+        .equivalent(Parameter::getType)
+        .equivalent(Parameter::getInit)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseExpression(Expression object) {
+    throw thereIsAMoreSpecificCase(
+        Expression.class,
+        Literal.class,
+        Time.class,
+        ParameterReference.class,
+        Code.class,
+        BracedListExpression.class);
+  }
+
+  @Override
+  public Boolean caseBracedListExpression(BracedListExpression object) {
+    return new ComparisonMachine<>(object, BracedListExpression.class)
+        .listsEquivalent(BracedListExpression::getItems)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseParameterReference(ParameterReference object) {
+    return new ComparisonMachine<>(object, ParameterReference.class)
+        .equivalent(ParameterReference::getParameter)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseTime(Time object) {
+    return new ComparisonMachine<>(object, Time.class)
+        .equalAsObjects(Time::getInterval)
+        .equalAsObjectsModulo(
+            Time::getUnit,
+            ((Function<TimeUnit, String>) TimeUnit::getCanonicalName).compose(TimeUnit::fromName))
+        .conclusion;
+  }
+
+  @Override
+  public Boolean casePort(Port object) {
+    throw thereIsAMoreSpecificCase(Port.class, Input.class, Output.class);
+  }
+
+  @Override
+  public Boolean caseType(Type object) {
+    return new ComparisonMachine<>(object, Type.class)
+        .equivalent(Type::getCode)
+        .equalAsObjects(Type::isTime)
+        .equivalent(Type::getArraySpec)
+        .equalAsObjects(Type::getId)
+        .listsEquivalent(Type::getTypeArgs)
+        .listsEqualAsObjects(Type::getStars)
+        .equivalent(Type::getArraySpec)
+        .equivalent(Type::getCode)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseArraySpec(ArraySpec object) {
+    return new ComparisonMachine<>(object, ArraySpec.class)
+        .equalAsObjects(ArraySpec::isOfVariableLength)
+        .equalAsObjects(ArraySpec::getLength)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseWatchdog(Watchdog object) {
+    return new ComparisonMachine<>(object, Watchdog.class)
+        .equalAsObjects(Watchdog::getName)
+        .equivalent(Watchdog::getTimeout)
+        .listsEquivalent(Watchdog::getEffects)
+        .equivalent(Watchdog::getCode)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseWidthSpec(WidthSpec object) {
+    return new ComparisonMachine<>(object, WidthSpec.class)
+        .equalAsObjects(WidthSpec::isOfVariableLength)
+        .listsEquivalent(WidthSpec::getTerms)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseWidthTerm(WidthTerm object) {
+    return new ComparisonMachine<>(object, WidthTerm.class)
+        .equalAsObjects(WidthTerm::getWidth)
+        .equivalent(WidthTerm::getParameter)
+        .equivalent(WidthTerm::getPort)
+        .equivalent(WidthTerm::getCode)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseIPV4Host(IPV4Host object) {
+    return caseHost(object);
+  }
+
+  @Override
+  public Boolean caseIPV6Host(IPV6Host object) {
+    return caseHost(object);
+  }
+
+  @Override
+  public Boolean caseNamedHost(NamedHost object) {
+    return caseHost(object);
+  }
+
+  @Override
+  public Boolean caseHost(Host object) {
+    return new ComparisonMachine<>(object, Host.class)
+        .equalAsObjects(Host::getUser)
+        .equalAsObjects(Host::getAddr)
+        .equalAsObjects(Host::getPort)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseCodeExpr(CodeExpr object) {
+    return new ComparisonMachine<>(object, CodeExpr.class).equivalent(CodeExpr::getCode).conclusion;
+  }
+
+  @Override
+  public Boolean caseCode(Code object) {
+    return new ComparisonMachine<>(object, Code.class)
+        .equalAsObjectsModulo(Code::getBody, s -> s == null ? null : s.strip().stripIndent())
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseLiteral(Literal object) {
+    return new ComparisonMachine<>(object, Literal.class)
+        .equalAsObjects(Literal::getLiteral)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean defaultCase(EObject object) {
+    return super.defaultCase(object);
+  }
+
+  @SafeVarargs
+  private UnsupportedOperationException thereIsAMoreSpecificCase(
+      Class<? extends EObject> thisCase, Class<? extends EObject>... moreSpecificCases) {
+    return new UnsupportedOperationException(
+        String.format(
             "%ss are %s, so the methods "
                 + "corresponding to those types should be invoked instead.",
             thisCase.getName(),
             Arrays.stream(moreSpecificCases)
-                  .map(Class::getName)
-                  .map(it -> it + (it.endsWith("s") ? "es" : "s"))
-                  .collect(Collectors.joining(" or "))
-        ));
-    }
-
-    /** Fluently compare a pair of parse tree nodes for equivalence. */
-    private class ComparisonMachine<E extends EObject> {
-        private final E object;
-        private final E other;
-        private boolean conclusion;
-
-        ComparisonMachine(E object, Class<E> clz) {
-            this.object = object;
-            this.conclusion = clz.isInstance(otherObject);
-            this.other = conclusion ? clz.cast(otherObject) : null;
-        }
-
-        /**
-         * Conclude false if the two given Lists are different as EObject
-         * sequences. Order matters.
-         */
-        <T extends EObject> ComparisonMachine<E> listsEquivalent(Function<E, List<T>> listGetter) {
-            if (conclusion) conclusion = listsEqualish(listGetter, (T a, T b) -> new IsEqual(a).doSwitch(b));
-            return this;
-        }
-
-        /**
-         * Conclude false if the two given Lists are different as object
-         * sequences. Order matters.
-         */
-        <T> ComparisonMachine<E> listsEqualAsObjects(Function<E, List<T>> listGetter) {
-            if (conclusion) conclusion = listsEqualish(listGetter, Objects::equals);
-            return this;
-        }
-
-        <T> boolean listsEqualish(Function<E, ? extends List<T>> listGetter, BiPredicate<T, T> equalish) {
-            if (!conclusion) return false;
-            List<T> list0 = listGetter.apply(object);
-            List<T> list1 = listGetter.apply(other);
-            if (list0 == list1) return true;  // e.g., they are both null
-            if (list0.size() != list1.size()) return false;
-            for (int i = 0; i < list0.size(); i++) {
-                if (!equalish.test(list0.get(i), list1.get(i))) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /** Conclude false if the two properties are not equal as objects. */
-        <T> ComparisonMachine<E> equalAsObjects(Function<E, T> propertyGetter) {
-            return equalAsObjectsModulo(propertyGetter, Function.identity());
-        }
-
-        /**
-         * Conclude false if the two properties are not equal as objects,
-         * given that {@code projectionToClassRepresentatives} maps each
-         * object to some semantically equivalent object.
-         */
-        <T> ComparisonMachine<E> equalAsObjectsModulo(
-            Function<E, T> propertyGetter,
-            Function<T, T> projectionToClassRepresentatives
-        ) {
-            if (propertyGetter.apply(object) instanceof EObject) {
-                throw new IllegalArgumentException(
-                    "EObjects should be compared for semantic equivalence, not object equality."
-                );
-            }
-            propertyGetter = projectionToClassRepresentatives.compose(propertyGetter);
-            if (conclusion) conclusion = Objects.equals(propertyGetter.apply(object), propertyGetter.apply(other));
-            return this;
-        }
-
-        /**
-         * Conclude false if the two properties are not semantically equivalent
-         * parse nodes.
-         */
-        <T extends EObject> ComparisonMachine<E> equivalent(Function<E, T> propertyGetter) {
-            return equivalentModulo(propertyGetter, Function.identity());
-        }
-
-        /**
-         * Conclude false if the two properties are not semantically equivalent
-         * parse nodes, given that {@code projectionToClassRepresentatives}
-         * maps each parse node to some semantically equivalent node.
-         */
-        <T extends EObject> ComparisonMachine<E> equivalentModulo(
-            Function<E, T> propertyGetter,
-            Function<T, T> projectionToClassRepresentatives
-        ) {
-            propertyGetter = projectionToClassRepresentatives.compose(propertyGetter);
-            if (conclusion) conclusion = new IsEqual(propertyGetter.apply(object))
-                .doSwitch(propertyGetter.apply(other));
-            return this;
+                .map(Class::getName)
+                .map(it -> it + (it.endsWith("s") ? "es" : "s"))
+                .collect(Collectors.joining(" or "))));
+  }
+
+  /** Fluently compare a pair of parse tree nodes for equivalence. */
+  private class ComparisonMachine<E extends EObject> {
+    private final E object;
+    private final E other;
+    private boolean conclusion;
+
+    ComparisonMachine(E object, Class<E> clz) {
+      this.object = object;
+      this.conclusion = clz.isInstance(otherObject);
+      this.other = conclusion ? clz.cast(otherObject) : null;
+    }
+
+    /** Conclude false if the two given Lists are different as EObject sequences. Order matters. */
+    <T extends EObject> ComparisonMachine<E> listsEquivalent(Function<E, List<T>> listGetter) {
+      if (conclusion)
+        conclusion = listsEqualish(listGetter, (T a, T b) -> new IsEqual(a).doSwitch(b));
+      return this;
+    }
+
+    /** Conclude false if the two given Lists are different as object sequences. Order matters. */
+    <T> ComparisonMachine<E> listsEqualAsObjects(Function<E, List<T>> listGetter) {
+      if (conclusion) conclusion = listsEqualish(listGetter, Objects::equals);
+      return this;
+    }
+
+    <T> boolean listsEqualish(
+        Function<E, ? extends List<T>> listGetter, BiPredicate<T, T> equalish) {
+      if (!conclusion) return false;
+      List<T> list0 = listGetter.apply(object);
+      List<T> list1 = listGetter.apply(other);
+      if (list0 == list1) return true; // e.g., they are both null
+      if (list0.size() != list1.size()) return false;
+      for (int i = 0; i < list0.size(); i++) {
+        if (!equalish.test(list0.get(i), list1.get(i))) {
+          return false;
         }
-    }
+      }
+      return true;
+    }
+
+    /** Conclude false if the two properties are not equal as objects. */
+    <T> ComparisonMachine<E> equalAsObjects(Function<E, T> propertyGetter) {
+      return equalAsObjectsModulo(propertyGetter, Function.identity());
+    }
+
+    /**
+     * Conclude false if the two properties are not equal as objects, given that {@code
+     * projectionToClassRepresentatives} maps each object to some semantically equivalent object.
+     */
+    <T> ComparisonMachine<E> equalAsObjectsModulo(
+        Function<E, T> propertyGetter, Function<T, T> projectionToClassRepresentatives) {
+      if (propertyGetter.apply(object) instanceof EObject) {
+        throw new IllegalArgumentException(
+            "EObjects should be compared for semantic equivalence, not object equality.");
+      }
+      propertyGetter = projectionToClassRepresentatives.compose(propertyGetter);
+      if (conclusion)
+        conclusion = Objects.equals(propertyGetter.apply(object), propertyGetter.apply(other));
+      return this;
+    }
+
+    /** Conclude false if the two properties are not semantically equivalent parse nodes. */
+    <T extends EObject> ComparisonMachine<E> equivalent(Function<E, T> propertyGetter) {
+      return equivalentModulo(propertyGetter, Function.identity());
+    }
+
+    /**
+     * Conclude false if the two properties are not semantically equivalent parse nodes, given that
+     * {@code projectionToClassRepresentatives} maps each parse node to some semantically equivalent
+     * node.
+     */
+    <T extends EObject> ComparisonMachine<E> equivalentModulo(
+        Function<E, T> propertyGetter, Function<T, T> projectionToClassRepresentatives) {
+      propertyGetter = projectionToClassRepresentatives.compose(propertyGetter);
+      if (conclusion)
+        conclusion =
+            new IsEqual(propertyGetter.apply(object)).doSwitch(propertyGetter.apply(other));
+      return this;
+    }
+  }
 }
diff --git a/org.lflang/src/org/lflang/ast/ToLf.java b/org.lflang/src/org/lflang/ast/ToLf.java
index 7ecf04684f..9505c57478 100644
--- a/org.lflang/src/org/lflang/ast/ToLf.java
+++ b/org.lflang/src/org/lflang/ast/ToLf.java
@@ -20,7 +20,6 @@
 import org.eclipse.xtext.nodemodel.INode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
-
 import org.lflang.Target;
 import org.lflang.ast.MalleableString.Builder;
 import org.lflang.ast.MalleableString.Joiner;
@@ -219,11 +218,7 @@ public MalleableString caseCode(Code code) {
             .map(String::stripTrailing)
             .collect(Collectors.joining("\n"));
     MalleableString singleLineRepresentation =
-        new Builder()
-            .append("{= ")
-            .append(content.strip())
-            .append(" =}")
-            .get();
+        new Builder().append("{= ").append(content.strip()).append(" =}").get();
     MalleableString multilineRepresentation =
         new Builder()
             .append(String.format("{=%n"))
diff --git a/org.lflang/src/org/lflang/ast/ToText.java b/org.lflang/src/org/lflang/ast/ToText.java
index 4d02d4ed08..f1d47b7c69 100644
--- a/org.lflang/src/org/lflang/ast/ToText.java
+++ b/org.lflang/src/org/lflang/ast/ToText.java
@@ -4,7 +4,6 @@
 import org.eclipse.xtext.nodemodel.ICompositeNode;
 import org.eclipse.xtext.nodemodel.ILeafNode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
-
 import org.lflang.lf.ArraySpec;
 import org.lflang.lf.BracedListExpression;
 import org.lflang.lf.Code;
@@ -19,112 +18,115 @@
 import org.lflang.lf.util.LfSwitch;
 import org.lflang.util.StringUtil;
 
-
 /**
- * Switch class for converting AST nodes to some textual representation that seems likely
- * to be useful for as many code generators as possible.
+ * Switch class for converting AST nodes to some textual representation that seems likely to be
+ * useful for as many code generators as possible.
  */
 public class ToText extends LfSwitch<String> {
 
-    /// public instance initialized when loading the class
-    public static final ToText instance = new ToText();
-
-    // private constructor
-    private ToText() { super(); }
-
-    @Override
-    public String caseArraySpec(ArraySpec spec) {
-        return ToLf.instance.doSwitch(spec).toString();
-    }
-
-    @Override
-    public String caseCodeExpr(CodeExpr object) {
-        return caseCode(object.getCode());
+  /// public instance initialized when loading the class
+  public static final ToText instance = new ToText();
+
+  // private constructor
+  private ToText() {
+    super();
+  }
+
+  @Override
+  public String caseArraySpec(ArraySpec spec) {
+    return ToLf.instance.doSwitch(spec).toString();
+  }
+
+  @Override
+  public String caseCodeExpr(CodeExpr object) {
+    return caseCode(object.getCode());
+  }
+
+  @Override
+  public String caseCode(Code code) {
+    ICompositeNode node = NodeModelUtils.getNode(code);
+    if (node != null) {
+      StringBuilder builder = new StringBuilder(Math.max(node.getTotalLength(), 1));
+      for (ILeafNode leaf : node.getLeafNodes()) {
+        builder.append(leaf.getText());
+      }
+      String str = builder.toString().trim();
+      // Remove the code delimiters (and any surrounding comments).
+      // This assumes any comment before {= does not include {=.
+      int start = str.indexOf("{=");
+      int end = str.lastIndexOf("=}");
+      if (start == -1 || end == -1) {
+        // Silent failure is needed here because toText is needed to create the intermediate
+        // representation,
+        // which the validator uses.
+        return str;
+      }
+      str = str.substring(start + 2, end);
+      if (str.split("\n").length > 1) {
+        // multi line code
+        return StringUtil.trimCodeBlock(str, 1);
+      } else {
+        // single line code
+        return str.trim();
+      }
+    } else if (code.getBody() != null) {
+      // Code must have been added as a simple string.
+      return code.getBody();
     }
-
-    @Override
-    public String caseCode(Code code) {
-        ICompositeNode node = NodeModelUtils.getNode(code);
-        if (node != null) {
-            StringBuilder builder = new StringBuilder(Math.max(node.getTotalLength(), 1));
-            for (ILeafNode leaf : node.getLeafNodes()) {
-                builder.append(leaf.getText());
-            }
-            String str = builder.toString().trim();
-            // Remove the code delimiters (and any surrounding comments).
-            // This assumes any comment before {= does not include {=.
-            int start = str.indexOf("{=");
-            int end = str.lastIndexOf("=}");
-            if (start == -1 || end == -1) {
-                // Silent failure is needed here because toText is needed to create the intermediate representation,
-                // which the validator uses.
-                return str;
-            }
-            str = str.substring(start + 2, end);
-            if (str.split("\n").length > 1) {
-                // multi line code
-                return StringUtil.trimCodeBlock(str, 1);
-            } else {
-                // single line code
-                return str.trim();
-            }
-        } else if (code.getBody() != null) {
-            // Code must have been added as a simple string.
-            return code.getBody();
-        }
-        return "";
-    }
-
-    @Override
-    public String caseBracedListExpression(BracedListExpression object) {
-        return ToLf.instance.caseBracedListExpression(object).toString();
+    return "";
+  }
+
+  @Override
+  public String caseBracedListExpression(BracedListExpression object) {
+    return ToLf.instance.caseBracedListExpression(object).toString();
+  }
+
+  @Override
+  public String caseHost(Host host) {
+    return ToLf.instance.caseHost(host).toString();
+  }
+
+  @Override
+  public String caseLiteral(Literal l) {
+    return ToLf.instance.caseLiteral(l).toString();
+  }
+
+  @Override
+  public String caseParameterReference(ParameterReference p) {
+    return ToLf.instance.caseParameterReference(p).toString();
+  }
+
+  @Override
+  public String caseTime(Time t) {
+    return ToLf.instance.caseTime(t).toString();
+  }
+
+  @Override
+  public String caseType(Type type) {
+    if (type.getCode() != null) {
+      return caseCode(type.getCode());
     }
-
-    @Override
-    public String caseHost(Host host) {
-        return ToLf.instance.caseHost(host).toString();
-    }
-
-    @Override
-    public String caseLiteral(Literal l) {
-        return ToLf.instance.caseLiteral(l).toString();
+    return ToLf.instance.caseType(type).toString();
+  }
+
+  @Override
+  public String caseTypeParm(TypeParm t) {
+    if (t.getCode() != null) return doSwitch(t.getCode());
+    return ToLf.instance.caseTypeParm(t).toString();
+  }
+
+  @Override
+  public String caseVarRef(VarRef v) {
+    if (v.getContainer() != null) {
+      return String.format("%s.%s", v.getContainer().getName(), v.getVariable().getName());
+    } else {
+      return v.getVariable().getName();
     }
+  }
 
-    @Override
-    public String caseParameterReference(ParameterReference p) {
-        return ToLf.instance.caseParameterReference(p).toString();
-    }
-
-    @Override
-    public String caseTime(Time t) {
-        return ToLf.instance.caseTime(t).toString();
-    }
-
-    @Override
-    public String caseType(Type type) {
-        if (type.getCode() != null) {
-            return caseCode(type.getCode());
-        }
-        return ToLf.instance.caseType(type).toString();
-    }
-
-    @Override
-    public String caseTypeParm(TypeParm t) {
-        if (t.getCode() != null) return doSwitch(t.getCode());
-        return ToLf.instance.caseTypeParm(t).toString();
-    }
-
-    @Override
-    public String caseVarRef(VarRef v) {
-        if (v.getContainer() != null) {
-            return String.format("%s.%s", v.getContainer().getName(), v.getVariable().getName());
-        } else {
-            return v.getVariable().getName();
-        }
-    }
-
-    @Override
-    public String defaultCase(EObject object) {
-        throw new UnsupportedOperationException("ToText has no case for " + object.getClass().getName());
-    }
+  @Override
+  public String defaultCase(EObject object) {
+    throw new UnsupportedOperationException(
+        "ToText has no case for " + object.getClass().getName());
+  }
 }
diff --git a/org.lflang/src/org/lflang/cli/CliBase.java b/org.lflang/src/org/lflang/cli/CliBase.java
index 2f4a9d849c..a6c1c805ed 100644
--- a/org.lflang/src/org/lflang/cli/CliBase.java
+++ b/org.lflang/src/org/lflang/cli/CliBase.java
@@ -1,26 +1,21 @@
 package org.lflang.cli;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonParser;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.Provider;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Arrays;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map.Entry;
-import java.util.Properties;
 import java.util.Set;
 import java.util.stream.Collectors;
-
-import picocli.CommandLine;
-import picocli.CommandLine.ArgGroup;
-import picocli.CommandLine.Command;
-import picocli.CommandLine.Model.CommandSpec;
-import picocli.CommandLine.Option;
-import picocli.CommandLine.Parameters;
-import picocli.CommandLine.Spec;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -28,18 +23,16 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.eclipse.xtext.validation.Issue;
-
 import org.lflang.ErrorReporter;
 import org.lflang.LFRuntimeModule;
 import org.lflang.LFStandaloneSetup;
 import org.lflang.util.FileUtil;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonParseException;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.Provider;
+import picocli.CommandLine;
+import picocli.CommandLine.ArgGroup;
+import picocli.CommandLine.Model.CommandSpec;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.Parameters;
+import picocli.CommandLine.Spec;
 
 /**
  * Base class for standalone CLI applications.
@@ -50,318 +43,277 @@
  * @author Atharva Patil
  */
 public abstract class CliBase implements Runnable {
-    /**
-     * Models a command specification, including the options, positional
-     * parameters and subcommands supported by the command.
-     */
-    @Spec CommandSpec spec;
-
-    /**
-     * Options and parameters present in both Lfc and Lff.
-     */
-    static class MutuallyExclusive {
-         @Parameters(
-         arity = "1..",
-         paramLabel = "FILES",
-         description = "Paths to one or more Lingua Franca programs.")
-             protected List<Path> files;
-
-         @Option(
-         names="--json",
-         description="JSON object containing CLI arguments.")
-             private String jsonString;
-
-         @Option(
-         names="--json-file",
-         description="JSON file containing CLI arguments.")
-             private Path jsonFile;
-     }
-
-     @ArgGroup(exclusive = true, multiplicity = "1")
-     MutuallyExclusive topLevelArg;
-
-     @Option(
-     names = {"-o", "--output-path"},
-     defaultValue = "",
-     fallbackValue = "",
-     description = "Specify the root output directory.")
-         private Path outputPath;
-
-    /**
-     * Used to collect all errors that happen during validation/generation.
-     */
-    @Inject
-    protected IssueCollector issueCollector;
-
-    /**
-     * Used to report error messages at the end.
-     */
-    @Inject
-    protected ReportingBackend reporter;
-
-    /**
-     * Used to report error messages at the end.
-     */
-    @Inject
-    protected ErrorReporter errorReporter;
-
-    /**
-     * IO context of this run.
-     */
-    @Inject
-    protected Io io;
-    
-    /**
-     * Injected resource provider.
-     */
-    @Inject
-    private Provider<ResourceSet> resourceSetProvider;
-    
-    /**
-     * Injected resource validator.
-     */
-    @Inject
-    private IResourceValidator validator;
-
-    protected static void cliMain(
-            String toolName, Class<? extends CliBase> toolClass,
-            Io io, String[] args) {
-        // Injector used to obtain Main instance.
-        final Injector injector = getInjector(toolName, io);
-        // Main instance.
-        final CliBase main = injector.getInstance(toolClass);
-        // Parse arguments and execute main logic.
-        main.doExecute(io, args);
-    }
-
-    public void doExecute(Io io, String[] args) {
-        CommandLine cmd = new CommandLine(this)
+  /**
+   * Models a command specification, including the options, positional parameters and subcommands
+   * supported by the command.
+   */
+  @Spec CommandSpec spec;
+
+  /** Options and parameters present in both Lfc and Lff. */
+  static class MutuallyExclusive {
+    @Parameters(
+        arity = "1..",
+        paramLabel = "FILES",
+        description = "Paths to one or more Lingua Franca programs.")
+    protected List<Path> files;
+
+    @Option(names = "--json", description = "JSON object containing CLI arguments.")
+    private String jsonString;
+
+    @Option(names = "--json-file", description = "JSON file containing CLI arguments.")
+    private Path jsonFile;
+  }
+
+  @ArgGroup(exclusive = true, multiplicity = "1")
+  MutuallyExclusive topLevelArg;
+
+  @Option(
+      names = {"-o", "--output-path"},
+      defaultValue = "",
+      fallbackValue = "",
+      description = "Specify the root output directory.")
+  private Path outputPath;
+
+  /** Used to collect all errors that happen during validation/generation. */
+  @Inject protected IssueCollector issueCollector;
+
+  /** Used to report error messages at the end. */
+  @Inject protected ReportingBackend reporter;
+
+  /** Used to report error messages at the end. */
+  @Inject protected ErrorReporter errorReporter;
+
+  /** IO context of this run. */
+  @Inject protected Io io;
+
+  /** Injected resource provider. */
+  @Inject private Provider<ResourceSet> resourceSetProvider;
+
+  /** Injected resource validator. */
+  @Inject private IResourceValidator validator;
+
+  protected static void cliMain(
+      String toolName, Class<? extends CliBase> toolClass, Io io, String[] args) {
+    // Injector used to obtain Main instance.
+    final Injector injector = getInjector(toolName, io);
+    // Main instance.
+    final CliBase main = injector.getInstance(toolClass);
+    // Parse arguments and execute main logic.
+    main.doExecute(io, args);
+  }
+
+  public void doExecute(Io io, String[] args) {
+    CommandLine cmd =
+        new CommandLine(this)
             .setOut(new PrintWriter(io.getOut()))
             .setErr(new PrintWriter(io.getErr()));
-        int exitCode = cmd.execute(args);
-        io.callSystemExit(exitCode);
+    int exitCode = cmd.execute(args);
+    io.callSystemExit(exitCode);
+  }
+
+  /**
+   * The entrypoint of Picocli applications - the first method called when CliBase, which implements
+   * the Runnable interface, is instantiated.
+   */
+  public void run() {
+    // If args are given in a json file, store its contents in jsonString.
+    if (topLevelArg.jsonFile != null) {
+      try {
+        topLevelArg.jsonString =
+            new String(Files.readAllBytes(io.getWd().resolve(topLevelArg.jsonFile)));
+      } catch (IOException e) {
+        reporter.printFatalErrorAndExit("No such file: " + topLevelArg.jsonFile);
+      }
     }
-
-    /**
-     * The entrypoint of Picocli applications - the first method called when 
-     * CliBase, which implements the Runnable interface, is instantiated.
-     */ 
-    public void run() {
-        // If args are given in a json file, store its contents in jsonString.
-        if (topLevelArg.jsonFile != null) {
-            try {
-                topLevelArg.jsonString = new String(Files.readAllBytes(
-                        io.getWd().resolve(topLevelArg.jsonFile)));
-            } catch (IOException e) {
-                reporter.printFatalErrorAndExit(
-                        "No such file: " + topLevelArg.jsonFile);
-            }
-        }
-        // If args are given in a json string, unpack them and re-run
-        // picocli argument validation.
-        if (topLevelArg.jsonString != null) {
-            // Unpack args from json string.
-            String[] args = jsonStringToArgs(topLevelArg.jsonString);
-            // Execute application on unpacked args.
-            CommandLine cmd = spec.commandLine();
-            cmd.execute(args);
-        // If args are already unpacked, invoke tool-specific logic.
-        } else {
-            doRun();
-        }
+    // If args are given in a json string, unpack them and re-run
+    // picocli argument validation.
+    if (topLevelArg.jsonString != null) {
+      // Unpack args from json string.
+      String[] args = jsonStringToArgs(topLevelArg.jsonString);
+      // Execute application on unpacked args.
+      CommandLine cmd = spec.commandLine();
+      cmd.execute(args);
+      // If args are already unpacked, invoke tool-specific logic.
+    } else {
+      doRun();
     }
-
-    /*
-     * The entrypoint of tool-specific logic.
-     * Lfc and Lff have their own specific implementations for this method.
-     */
-    public abstract void doRun();
-
-    public static Injector getInjector(String toolName, Io io) {
-        final ReportingBackend reporter 
-            = new ReportingBackend(io, toolName + ": ");
-
-        // Injector used to obtain Main instance.
-        return new LFStandaloneSetup(
-            new LFRuntimeModule(),
-            new LFStandaloneModule(reporter, io)
-        ).createInjectorAndDoEMFRegistration();
+  }
+
+  /*
+   * The entrypoint of tool-specific logic.
+   * Lfc and Lff have their own specific implementations for this method.
+   */
+  public abstract void doRun();
+
+  public static Injector getInjector(String toolName, Io io) {
+    final ReportingBackend reporter = new ReportingBackend(io, toolName + ": ");
+
+    // Injector used to obtain Main instance.
+    return new LFStandaloneSetup(new LFRuntimeModule(), new LFStandaloneModule(reporter, io))
+        .createInjectorAndDoEMFRegistration();
+  }
+
+  /** Resolve to an absolute path, in the given {@link #io} context. */
+  protected Path toAbsolutePath(Path other) {
+    return io.getWd().resolve(other).toAbsolutePath();
+  }
+
+  /**
+   * Returns the validated input paths.
+   *
+   * @return Validated input paths.
+   */
+  protected List<Path> getInputPaths() {
+    List<Path> paths =
+        topLevelArg.files.stream().map(io.getWd()::resolve).collect(Collectors.toList());
+
+    for (Path path : paths) {
+      if (!Files.exists(path)) {
+        reporter.printFatalErrorAndExit(path + ": No such file or directory.");
+      }
     }
 
-    /**
-     * Resolve to an absolute path, in the given {@link #io} context.
-     */
-    protected Path toAbsolutePath(Path other) {
-        return io.getWd().resolve(other).toAbsolutePath();
+    return paths;
+  }
+
+  /**
+   * Returns the validated, normalized output path.
+   *
+   * @return Validated, normalized output path.
+   */
+  protected Path getOutputRoot() {
+    Path root = null;
+    if (!outputPath.toString().isEmpty()) {
+      root = io.getWd().resolve(outputPath).normalize();
+      if (!Files.exists(root)) { // FIXME: Create it instead?
+        reporter.printFatalErrorAndExit(root + ": Output location does not exist.");
+      }
+      if (!Files.isDirectory(root)) {
+        reporter.printFatalErrorAndExit(root + ": Output location is not a directory.");
+      }
     }
 
-    /**
-     * Returns the validated input paths.
-     *
-     * @return Validated input paths.
-     */
-    protected List<Path> getInputPaths() {
-        List<Path> paths = topLevelArg.files.stream()
-            .map(io.getWd()::resolve)
-            .collect(Collectors.toList());
-
-        for (Path path : paths) {
-            if (!Files.exists(path)) {
-                reporter.printFatalErrorAndExit(
-                    path + ": No such file or directory.");
-            }
-        }
-
-        return paths;
+    return root;
+  }
+
+  /** If some errors were collected, print them and abort execution. Otherwise, return. */
+  protected void exitIfCollectedErrors() {
+    if (issueCollector.getErrorsOccurred()) {
+      // if there are errors, don't print warnings.
+      List<LfIssue> errors = printErrorsIfAny();
+      String cause = errors.size() + " previous error";
+      if (errors.size() > 1) {
+        cause += 's';
+      }
+      reporter.printFatalErrorAndExit("Aborting due to " + cause + '.');
     }
-
-    /**
-     * Returns the validated, normalized output path.
-     *
-     * @return Validated, normalized output path.
-     */
-    protected Path getOutputRoot() {
-        Path root = null;
-        if (!outputPath.toString().isEmpty()) {
-            root = io.getWd().resolve(outputPath).normalize();
-            if (!Files.exists(root)) { // FIXME: Create it instead?
-                reporter.printFatalErrorAndExit(
-                    root + ": Output location does not exist.");
-            }
-            if (!Files.isDirectory(root)) {
-                reporter.printFatalErrorAndExit(
-                    root + ": Output location is not a directory.");
-            }
+  }
+
+  /**
+   * If any errors were collected, print them, then return them.
+   *
+   * @return A list of collected errors.
+   */
+  public List<LfIssue> printErrorsIfAny() {
+    List<LfIssue> errors = issueCollector.getErrors();
+    errors.forEach(reporter::printIssue);
+    return errors;
+  }
+
+  /**
+   * Validates a given resource. If issues arise during validation, these are recorded using the
+   * issue collector.
+   *
+   * @param resource The resource to validate.
+   */
+  public void validateResource(Resource resource) {
+    assert resource != null;
+
+    List<Issue> issues = this.validator.validate(resource, CheckMode.ALL, CancelIndicator.NullImpl);
+
+    for (Issue issue : issues) {
+      // Issues may also relate to imported resources.
+      URI uri = issue.getUriToProblem();
+      Path path = null;
+      if (uri != null) {
+        try {
+          path = FileUtil.toPath(uri);
+        } catch (IOException e) {
+          reporter.printError("Unable to convert '" + uri + "' to path." + e);
         }
-
-        return root;
+      }
+      issueCollector.accept(
+          new LfIssue(
+              issue.getMessage(),
+              issue.getSeverity(),
+              issue.getLineNumber(),
+              issue.getColumn(),
+              issue.getLineNumberEnd(),
+              issue.getColumnEnd(),
+              issue.getLength(),
+              path));
     }
-
-    /**
-     * If some errors were collected, print them and abort execution.
-     * Otherwise, return.
-     */
-    protected void exitIfCollectedErrors() {
-        if (issueCollector.getErrorsOccurred()) {
-            // if there are errors, don't print warnings.
-            List<LfIssue> errors = printErrorsIfAny();
-            String cause = errors.size() + " previous error";
-            if (errors.size() > 1) {
-                cause += 's';
-            }
-            reporter.printFatalErrorAndExit("Aborting due to " + cause + '.');
-        }
+  }
+
+  /**
+   * Obtains a resource from a path. Returns null if path is not an LF file.
+   *
+   * @param path The path to obtain the resource from.
+   * @return The obtained resource. Set to null if path is not an LF file.
+   */
+  public Resource getResource(Path path) {
+    final ResourceSet set = this.resourceSetProvider.get();
+    try {
+      return set.getResource(URI.createFileURI(path.toString()), true);
+    } catch (RuntimeException e) {
+      return null;
     }
+  }
 
-    /**
-     * If any errors were collected, print them, then return them.
-     * @return A list of collected errors.
-     */
-    public List<LfIssue> printErrorsIfAny() {
-        List<LfIssue> errors = issueCollector.getErrors();
-        errors.forEach(reporter::printIssue);
-        return errors;
-    }
+  private String[] jsonStringToArgs(String jsonString) {
+    ArrayList<String> argsList = new ArrayList<>();
+    JsonObject jsonObject = new JsonObject();
 
-    /**
-     * Validates a given resource. If issues arise during validation,
-     * these are recorded using the issue collector.
-     *
-     * @param resource The resource to validate.
-     */
-    public void validateResource(Resource resource) {
-        assert resource != null;
-
-        List<Issue> issues = this.validator.validate(
-            resource, CheckMode.ALL, CancelIndicator.NullImpl);
-
-        for (Issue issue : issues) {
-            // Issues may also relate to imported resources.
-            URI uri = issue.getUriToProblem();
-            Path path = null;
-            if (uri != null) {
-                try {
-                    path = FileUtil.toPath(uri);
-                } catch (IOException e) {
-                    reporter.printError("Unable to convert '" + uri + "' to path." + e);
-                }
-            }
-            issueCollector.accept(
-                new LfIssue(
-                    issue.getMessage(),
-                    issue.getSeverity(),
-                    issue.getLineNumber(),
-                    issue.getColumn(),
-                    issue.getLineNumberEnd(),
-                    issue.getColumnEnd(),
-                    issue.getLength(),
-                    path));
-        }
+    // Parse JSON string and get top-level JSON object.
+    try {
+      jsonObject = JsonParser.parseString(jsonString).getAsJsonObject();
+    } catch (JsonParseException e) {
+      reporter.printFatalErrorAndExit(String.format("Invalid JSON string:%n %s", jsonString));
     }
-
-    /**
-     * Obtains a resource from a path. Returns null if path is not an LF file.
-     *
-     * @param path The path to obtain the resource from.
-     * @return The obtained resource. Set to null if path is not an LF file.
-     */
-    public Resource getResource(Path path) {
-        final ResourceSet set = this.resourceSetProvider.get();
-        try {
-            return set.getResource(URI.createFileURI(path.toString()), true);
-        } catch (RuntimeException e) {
-            return null;
-        }
+    // Append input paths.
+    JsonElement src = jsonObject.get("src");
+    if (src == null) {
+      reporter.printFatalErrorAndExit("JSON Parse Exception: field \"src\" not found.");
+    }
+    argsList.add(src.getAsString());
+    // Append output path if given.
+    JsonElement out = jsonObject.get("out");
+    if (out != null) {
+      argsList.add("--output-path");
+      argsList.add(out.getAsString());
     }
 
-    private String[] jsonStringToArgs(String jsonString) {
-        ArrayList<String> argsList = new ArrayList<>();
-        JsonObject jsonObject = new JsonObject();
-
-        // Parse JSON string and get top-level JSON object.
-        try {
-            jsonObject = JsonParser.parseString(jsonString).getAsJsonObject();
-        } catch (JsonParseException e) {
-            reporter.printFatalErrorAndExit(
-                    String.format("Invalid JSON string:%n %s", jsonString));
-        }
-        // Append input paths.
-        JsonElement src = jsonObject.get("src");
-        if (src == null) {
-            reporter.printFatalErrorAndExit(
-                    "JSON Parse Exception: field \"src\" not found.");
-        }
-        argsList.add(src.getAsString());
-        // Append output path if given.
-        JsonElement out = jsonObject.get("out");
-        if (out != null) {
-            argsList.add("--output-path");
-            argsList.add(out.getAsString());
-        }
-
-        // If there are no other properties, return args array.
-        JsonElement properties = jsonObject.get("properties");
-        if (properties != null) {
-            // Get the remaining properties.
-            Set<Entry<String, JsonElement>> entrySet = properties
-                .getAsJsonObject()
-                .entrySet();
-            // Append the remaining properties to the args array.
-            for(Entry<String,JsonElement> entry : entrySet) {
-                String property = entry.getKey();
-                String value = entry.getValue().getAsString();
-
-                // Append option.
-                argsList.add("--" + property);
-                // Append argument for non-boolean options.
-                if (value != "true" || property == "threading") {
-                    argsList.add(value);
-                }
-            }
+    // If there are no other properties, return args array.
+    JsonElement properties = jsonObject.get("properties");
+    if (properties != null) {
+      // Get the remaining properties.
+      Set<Entry<String, JsonElement>> entrySet = properties.getAsJsonObject().entrySet();
+      // Append the remaining properties to the args array.
+      for (Entry<String, JsonElement> entry : entrySet) {
+        String property = entry.getKey();
+        String value = entry.getValue().getAsString();
+
+        // Append option.
+        argsList.add("--" + property);
+        // Append argument for non-boolean options.
+        if (value != "true" || property == "threading") {
+          argsList.add(value);
         }
-
-        // Return as String[].
-        String[] args = argsList.toArray(new String[argsList.size()]);
-        return args;
+      }
     }
+
+    // Return as String[].
+    String[] args = argsList.toArray(new String[argsList.size()]);
+    return args;
+  }
 }
diff --git a/org.lflang/src/org/lflang/cli/LFStandaloneModule.java b/org.lflang/src/org/lflang/cli/LFStandaloneModule.java
index 8b85e49282..abf01bfcd3 100644
--- a/org.lflang/src/org/lflang/cli/LFStandaloneModule.java
+++ b/org.lflang/src/org/lflang/cli/LFStandaloneModule.java
@@ -28,49 +28,45 @@
 
 package org.lflang.cli;
 
+import com.google.inject.Binder;
+import com.google.inject.Module;
 import java.util.Objects;
-
 import org.eclipse.emf.ecore.EValidator;
 import org.eclipse.emf.ecore.impl.EValidatorRegistryImpl;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
-
 import org.lflang.ErrorReporter;
 import org.lflang.LFRuntimeModule;
 
-import com.google.inject.Binder;
-import com.google.inject.Module;
-
 /**
- * Module that is only available when running LFC as a
- * standalone program.
+ * Module that is only available when running LFC as a standalone program.
  *
  * @see LFRuntimeModule
  */
 public class LFStandaloneModule implements Module {
-    // Note that xtext's base module classes has broken support
-    // for @Provides, which would allow us to bind this field.
-    // So we directly implement Module, instead of extending eg LFRuntimeModule.
-    private final ReportingBackend helper;
-    private final Io io;
+  // Note that xtext's base module classes has broken support
+  // for @Provides, which would allow us to bind this field.
+  // So we directly implement Module, instead of extending eg LFRuntimeModule.
+  private final ReportingBackend helper;
+  private final Io io;
 
-    public LFStandaloneModule(ReportingBackend helper, Io io) {
-        this.helper = Objects.requireNonNull(helper);
-        this.io = Objects.requireNonNull(io);
-    }
+  public LFStandaloneModule(ReportingBackend helper, Io io) {
+    this.helper = Objects.requireNonNull(helper);
+    this.io = Objects.requireNonNull(io);
+  }
 
-    @Override
-    public void configure(Binder binder) {
-        binder.bind(ErrorReporter.class).to(StandaloneErrorReporter.class);
-        binder.bind(ReportingBackend.class).toInstance(helper);
-        binder.bind(Io.class).toInstance(io);
-        binder.bind(ValidationMessageAcceptor.class).to(StandaloneIssueAcceptor.class);
-        // This is required to force the ResourceValidator to
-        // use a new registry instance (which is reused by the injector as a singleton).
-        // Otherwise, it uses the static EValidator.Registry.INSTANCE which is bad
-        // as the first validator to be created would persist in that static instance.
-        // New injectors would reuse the existing instance, but
-        // its fields would have been injected by an older injector
-        // and be out of sync with the rest of the application.
-        binder.bind(EValidator.Registry.class).to(EValidatorRegistryImpl.class).asEagerSingleton();
-    }
+  @Override
+  public void configure(Binder binder) {
+    binder.bind(ErrorReporter.class).to(StandaloneErrorReporter.class);
+    binder.bind(ReportingBackend.class).toInstance(helper);
+    binder.bind(Io.class).toInstance(io);
+    binder.bind(ValidationMessageAcceptor.class).to(StandaloneIssueAcceptor.class);
+    // This is required to force the ResourceValidator to
+    // use a new registry instance (which is reused by the injector as a singleton).
+    // Otherwise, it uses the static EValidator.Registry.INSTANCE which is bad
+    // as the first validator to be created would persist in that static instance.
+    // New injectors would reuse the existing instance, but
+    // its fields would have been injected by an older injector
+    // and be out of sync with the rest of the application.
+    binder.bind(EValidator.Registry.class).to(EValidatorRegistryImpl.class).asEagerSingleton();
+  }
 }
diff --git a/org.lflang/src/org/lflang/cli/Lfc.java b/org.lflang/src/org/lflang/cli/Lfc.java
index 3ef52e54a0..19869f9394 100644
--- a/org.lflang/src/org/lflang/cli/Lfc.java
+++ b/org.lflang/src/org/lflang/cli/Lfc.java
@@ -1,27 +1,22 @@
 package org.lflang.cli;
 
-
+import com.google.inject.Inject;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Properties;
-
-import picocli.CommandLine.Command;
-import picocli.CommandLine.Option;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.GeneratorDelegate;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
 import org.eclipse.xtext.util.CancelIndicator;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.FileConfig;
 import org.lflang.TargetProperty.UnionType;
-
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.LFGeneratorContext.BuildParm;
 import org.lflang.generator.MainContext;
-
-import com.google.inject.Inject;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
 
 /**
  * Standalone version of the Lingua Franca compiler (lfc).
@@ -36,287 +31,261 @@
     mixinStandardHelpOptions = true,
     versionProvider = VersionProvider.class)
 public class Lfc extends CliBase {
-    /**
-     * Injected code generator.
-     */
-    @Inject
-    private GeneratorDelegate generator;
-
-    /**
-     * Injected file access object.
-     */
-    @Inject
-    private JavaIoFileSystemAccess fileAccess;
-
-    /*
-     * Supported CLI options.
-     */
-
-    @Option(
-        names = "--build-type",
-        description = "The build type to use.")
-    private String buildType;
-
-    @Option(
-        names = {"-c", "--clean"},
-        arity = "0",
-        description = "Clean before building.")
-    private boolean clean;
-
-    @Option(
-        names = "--target-compiler",
-        description = "Target compiler to invoke.")
-    private String targetCompiler;
-
-    @Option(
-        names = "--external-runtime-path",
-        description = "Specify an external runtime library to be used by the"
-                    + " compiled binary.")
-    private Path externalRuntimePath;
-
-    @Option(
-        names = {"-f", "--federated"},
-        arity = "0",
-        description = "Treat main reactor as federated.")
-    private boolean federated;
-
-    @Option(
-        names = "--logging",
-        description = "The logging level to use by the generated binary")
-    private String logging;
-
-    @Option(
-        names = {"-l", "--lint"},
-        arity = "0",
-        description = "Enable linting of generated code.")
-    private boolean lint;
-
-    @Option(
-        names = {"-n", "--no-compile"},
-        arity = "0",
-        description = "Do not invoke target compiler.")
-    private boolean noCompile;
-
-    @Option(
-        names = {"--print-statistics"},
-        arity = "0",
-        description = "Instruct the runtime to collect and print statistics.")
-    private boolean printStatistics;
-
-    @Option(
-        names = {"-q", "--quiet"},
-        arity = "0",
-        description =
-            "Suppress output of the target compiler and other commands")
-    private boolean quiet;
-
-    @Option(
-        names = {"-r", "--rti"},
-        description = "Specify the location of the RTI.")
-    private Path rti;
-
-    @Option(
-        names = "--runtime-version",
-        description = "Specify the version of the runtime library used for"
-                    + " compiling LF programs.")
-    private String runtimeVersion;
-
-    @Option(
-        names = {"-s", "--scheduler"},
-        description = "Specify the runtime scheduler (if supported).")
-    private String scheduler;
-
-    @Option(
-        names = {"-t", "--threading"},
-        paramLabel = "<true/false>",
-        description = "Specify whether the runtime should use multi-threading"
-                    + " (true/false).")
-    private String threading;
-
-    @Option(
-        names = {"-w", "--workers"},
-        description = "Specify the default number of worker threads.")
-    private Integer workers;
-
-    /**
-     * Main function of the stand-alone compiler.
-     * Caution: this will invoke System.exit.
-     *
-     * @param args CLI arguments
-     */
-    public static void main(final String[] args) {
-        main(Io.SYSTEM, args);
+  /** Injected code generator. */
+  @Inject private GeneratorDelegate generator;
+
+  /** Injected file access object. */
+  @Inject private JavaIoFileSystemAccess fileAccess;
+
+  /*
+   * Supported CLI options.
+   */
+
+  @Option(names = "--build-type", description = "The build type to use.")
+  private String buildType;
+
+  @Option(
+      names = {"-c", "--clean"},
+      arity = "0",
+      description = "Clean before building.")
+  private boolean clean;
+
+  @Option(names = "--target-compiler", description = "Target compiler to invoke.")
+  private String targetCompiler;
+
+  @Option(
+      names = "--external-runtime-path",
+      description = "Specify an external runtime library to be used by the" + " compiled binary.")
+  private Path externalRuntimePath;
+
+  @Option(
+      names = {"-f", "--federated"},
+      arity = "0",
+      description = "Treat main reactor as federated.")
+  private boolean federated;
+
+  @Option(names = "--logging", description = "The logging level to use by the generated binary")
+  private String logging;
+
+  @Option(
+      names = {"-l", "--lint"},
+      arity = "0",
+      description = "Enable linting of generated code.")
+  private boolean lint;
+
+  @Option(
+      names = {"-n", "--no-compile"},
+      arity = "0",
+      description = "Do not invoke target compiler.")
+  private boolean noCompile;
+
+  @Option(
+      names = {"--print-statistics"},
+      arity = "0",
+      description = "Instruct the runtime to collect and print statistics.")
+  private boolean printStatistics;
+
+  @Option(
+      names = {"-q", "--quiet"},
+      arity = "0",
+      description = "Suppress output of the target compiler and other commands")
+  private boolean quiet;
+
+  @Option(
+      names = {"-r", "--rti"},
+      description = "Specify the location of the RTI.")
+  private Path rti;
+
+  @Option(
+      names = "--runtime-version",
+      description =
+          "Specify the version of the runtime library used for" + " compiling LF programs.")
+  private String runtimeVersion;
+
+  @Option(
+      names = {"-s", "--scheduler"},
+      description = "Specify the runtime scheduler (if supported).")
+  private String scheduler;
+
+  @Option(
+      names = {"-t", "--threading"},
+      paramLabel = "<true/false>",
+      description = "Specify whether the runtime should use multi-threading" + " (true/false).")
+  private String threading;
+
+  @Option(
+      names = {"-w", "--workers"},
+      description = "Specify the default number of worker threads.")
+  private Integer workers;
+
+  /**
+   * Main function of the stand-alone compiler. Caution: this will invoke System.exit.
+   *
+   * @param args CLI arguments
+   */
+  public static void main(final String[] args) {
+    main(Io.SYSTEM, args);
+  }
+
+  /**
+   * Main function of the standalone compiler, with a custom IO.
+   *
+   * @param io IO streams.
+   * @param args Command-line arguments.
+   */
+  public static void main(Io io, final String... args) {
+    cliMain("lfc", Lfc.class, io, args);
+  }
+
+  /** Load the resource, validate it, and, invoke the code generator. */
+  @Override
+  public void doRun() {
+    List<Path> paths = getInputPaths();
+    final Path outputRoot = getOutputRoot();
+    // Hard code the props based on the options we want.
+    Properties properties = this.getGeneratorArgs();
+
+    try {
+      // Invoke the generator on all input file paths.
+      invokeGenerator(paths, outputRoot, properties);
+    } catch (RuntimeException e) {
+      reporter.printFatalErrorAndExit("An unexpected error occurred:", e);
     }
-
-    /**
-     * Main function of the standalone compiler, with a custom IO.
-     *
-     * @param io IO streams.
-     * @param args Command-line arguments.
-     */
-    public static void main(Io io, final String... args) {
-        cliMain("lfc", Lfc.class, io, args);
-    }
-
-    /**
-     * Load the resource, validate it, and, invoke the code generator.
-     */
-    @Override
-    public void doRun() {
-        List<Path> paths = getInputPaths();
-        final Path outputRoot = getOutputRoot();
-        // Hard code the props based on the options we want.
-        Properties properties = this.getGeneratorArgs();
-
-        try {
-            // Invoke the generator on all input file paths.
-            invokeGenerator(paths, outputRoot, properties);
-        } catch (RuntimeException e) {
-            reporter.printFatalErrorAndExit("An unexpected error occurred:", e);
+  }
+
+  /** Invoke the code generator on the given validated file paths. */
+  private void invokeGenerator(List<Path> files, Path root, Properties properties) {
+    for (Path path : files) {
+      path = toAbsolutePath(path);
+      String outputPath = getActualOutputPath(root, path).toString();
+      this.fileAccess.setOutputPath(outputPath);
+
+      final Resource resource = getResource(path);
+      if (resource == null) {
+        reporter.printFatalErrorAndExit(
+            path + " is not an LF file. Use the .lf file extension to" + " denote LF files.");
+      } else if (federated) {
+        if (!ASTUtils.makeFederated(resource)) {
+          reporter.printError("Unable to change main reactor to federated reactor.");
         }
+      }
+
+      validateResource(resource);
+      exitIfCollectedErrors();
+
+      LFGeneratorContext context =
+          new MainContext(
+              LFGeneratorContext.Mode.STANDALONE,
+              CancelIndicator.NullImpl,
+              (m, p) -> {},
+              properties,
+              resource,
+              this.fileAccess,
+              fileConfig -> errorReporter);
+
+      try {
+        this.generator.generate(resource, this.fileAccess, context);
+      } catch (Exception e) {
+        reporter.printFatalErrorAndExit("Error running generator", e);
+      }
+
+      exitIfCollectedErrors();
+      // Print all other issues (not errors).
+      issueCollector.getAllIssues().forEach(reporter::printIssue);
+
+      this.io.getOut().println("Code generation finished.");
     }
-
-    /**
-     * Invoke the code generator on the given validated file paths.
-     */
-    private void invokeGenerator(
-            List<Path> files, Path root, Properties properties) {
-        for (Path path : files) {
-            path = toAbsolutePath(path);
-            String outputPath = getActualOutputPath(root, path).toString();
-            this.fileAccess.setOutputPath(outputPath);
-
-            final Resource resource = getResource(path);
-            if (resource == null) {
-                reporter.printFatalErrorAndExit(path
-                    + " is not an LF file. Use the .lf file extension to"
-                    + " denote LF files.");
-            } else if (federated) {
-                if (!ASTUtils.makeFederated(resource)) {
-                    reporter.printError(
-                        "Unable to change main reactor to federated reactor.");
-                }
-            }
-
-            validateResource(resource);
-            exitIfCollectedErrors();
-
-            LFGeneratorContext context = new MainContext(
-                LFGeneratorContext.Mode.STANDALONE, CancelIndicator.NullImpl,
-                (m, p) -> {}, properties, resource, this.fileAccess,
-                fileConfig -> errorReporter
-            );
-
-            try {
-                this.generator.generate(resource, this.fileAccess, context);
-            } catch (Exception e) {
-                reporter.printFatalErrorAndExit("Error running generator", e);
-            }
-
-            exitIfCollectedErrors();
-            // Print all other issues (not errors).
-            issueCollector.getAllIssues().forEach(reporter::printIssue);
-
-            this.io.getOut().println("Code generation finished.");
-        }
+  }
+
+  private Path getActualOutputPath(Path root, Path path) {
+    if (root != null) {
+      return root.resolve("src-gen");
+    } else {
+      Path pkgRoot = FileConfig.findPackageRoot(path, reporter::printWarning);
+      return pkgRoot.resolve("src-gen");
     }
-
-    private Path getActualOutputPath(Path root, Path path) {
-        if (root != null) {
-            return root.resolve("src-gen");
-        } else {
-            Path pkgRoot = FileConfig.findPackageRoot(
-                path, reporter::printWarning);
-            return pkgRoot.resolve("src-gen");
-        }
+  }
+
+  /**
+   * Filter the command-line arguments needed by the code generator, and return them as properties.
+   *
+   * @return Properties for the code generator.
+   */
+  public Properties getGeneratorArgs() {
+    Properties props = new Properties();
+
+    if (buildType != null) {
+      // Validate build type.
+      if (UnionType.BUILD_TYPE_UNION.forName(buildType) == null) {
+        reporter.printFatalErrorAndExit(buildType + ": Invalid build type.");
+      }
+      props.setProperty(BuildParm.BUILD_TYPE.getKey(), buildType);
     }
 
-    /**
-     * Filter the command-line arguments needed by the code generator, and
-     * return them as properties.
-     *
-     * @return Properties for the code generator.
-     */
-    public Properties getGeneratorArgs() {
-        Properties props = new Properties();
-
-        if (buildType != null) {
-            // Validate build type.
-            if (UnionType.BUILD_TYPE_UNION.forName(buildType) == null) {
-                reporter.printFatalErrorAndExit(
-                    buildType + ": Invalid build type.");
-            }
-            props.setProperty(BuildParm.BUILD_TYPE.getKey(), buildType);
-        }
-
-        if (clean) {
-            props.setProperty(BuildParm.CLEAN.getKey(), "true");
-        }
-
-        if (externalRuntimePath != null) {
-            props.setProperty(BuildParm.EXTERNAL_RUNTIME_PATH.getKey(),
-                    externalRuntimePath.toString());
-        }
+    if (clean) {
+      props.setProperty(BuildParm.CLEAN.getKey(), "true");
+    }
 
-        if (lint) {
-            props.setProperty(BuildParm.LINT.getKey(), "true");
-        }
+    if (externalRuntimePath != null) {
+      props.setProperty(BuildParm.EXTERNAL_RUNTIME_PATH.getKey(), externalRuntimePath.toString());
+    }
 
-        if (logging != null) {
-            // Validate log level.
-            if (UnionType.LOGGING_UNION.forName(logging) == null) {
-                reporter.printFatalErrorAndExit(
-                    logging + ": Invalid log level.");
-            }
-            props.setProperty(BuildParm.LOGGING.getKey(), logging);
-        }
+    if (lint) {
+      props.setProperty(BuildParm.LINT.getKey(), "true");
+    }
 
-        if(printStatistics) {
-            props.setProperty(BuildParm.PRINT_STATISTICS.getKey(), "true");
-        }
+    if (logging != null) {
+      // Validate log level.
+      if (UnionType.LOGGING_UNION.forName(logging) == null) {
+        reporter.printFatalErrorAndExit(logging + ": Invalid log level.");
+      }
+      props.setProperty(BuildParm.LOGGING.getKey(), logging);
+    }
 
-        if (noCompile) {
-            props.setProperty(BuildParm.NO_COMPILE.getKey(), "true");
-        }
+    if (printStatistics) {
+      props.setProperty(BuildParm.PRINT_STATISTICS.getKey(), "true");
+    }
 
-        if (targetCompiler != null) {
-            props.setProperty(BuildParm.TARGET_COMPILER.getKey(), targetCompiler);
-        }
+    if (noCompile) {
+      props.setProperty(BuildParm.NO_COMPILE.getKey(), "true");
+    }
 
-        if (quiet) {
-            props.setProperty(BuildParm.QUIET.getKey(), "true");
-        }
+    if (targetCompiler != null) {
+      props.setProperty(BuildParm.TARGET_COMPILER.getKey(), targetCompiler);
+    }
 
-        if (rti != null) {
-            // Validate RTI path.
-            if (!Files.exists(io.getWd().resolve(rti))) {
-                reporter.printFatalErrorAndExit(
-                    rti + ": Invalid RTI path.");
-            }
-            props.setProperty(BuildParm.RTI.getKey(), rti.toString());
-        }
+    if (quiet) {
+      props.setProperty(BuildParm.QUIET.getKey(), "true");
+    }
 
-        if (runtimeVersion != null) {
-            props.setProperty(BuildParm.RUNTIME_VERSION.getKey(), runtimeVersion);
-        }
+    if (rti != null) {
+      // Validate RTI path.
+      if (!Files.exists(io.getWd().resolve(rti))) {
+        reporter.printFatalErrorAndExit(rti + ": Invalid RTI path.");
+      }
+      props.setProperty(BuildParm.RTI.getKey(), rti.toString());
+    }
 
-        if (scheduler != null) {
-            // Validate scheduler.
-            if (UnionType.SCHEDULER_UNION.forName(scheduler) == null) {
-                reporter.printFatalErrorAndExit(
-                    scheduler + ": Invalid scheduler.");
-            }
-            props.setProperty(BuildParm.SCHEDULER.getKey(), scheduler);
-        }
+    if (runtimeVersion != null) {
+      props.setProperty(BuildParm.RUNTIME_VERSION.getKey(), runtimeVersion);
+    }
 
-        if (threading != null) {
-            props.setProperty(BuildParm.THREADING.getKey(), threading);
-        }
+    if (scheduler != null) {
+      // Validate scheduler.
+      if (UnionType.SCHEDULER_UNION.forName(scheduler) == null) {
+        reporter.printFatalErrorAndExit(scheduler + ": Invalid scheduler.");
+      }
+      props.setProperty(BuildParm.SCHEDULER.getKey(), scheduler);
+    }
 
-        if (workers != null) {
-            props.setProperty(BuildParm.WORKERS.getKey(), workers.toString());
-        }
+    if (threading != null) {
+      props.setProperty(BuildParm.THREADING.getKey(), threading);
+    }
 
-        return props;
+    if (workers != null) {
+      props.setProperty(BuildParm.WORKERS.getKey(), workers.toString());
     }
+
+    return props;
+  }
 }
diff --git a/org.lflang/src/org/lflang/cli/Lff.java b/org.lflang/src/org/lflang/cli/Lff.java
index 297bc5ad84..f4f7714119 100644
--- a/org.lflang/src/org/lflang/cli/Lff.java
+++ b/org.lflang/src/org/lflang/cli/Lff.java
@@ -8,13 +8,11 @@
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.List;
-
-import picocli.CommandLine.Command;
-import picocli.CommandLine.Option;
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.lflang.ast.FormattingUtils;
 import org.lflang.util.FileUtil;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
 
 /**
  * Standalone version of the Lingua Franca formatter (lff). Based on lfc.
@@ -31,169 +29,163 @@
     versionProvider = VersionProvider.class)
 public class Lff extends CliBase {
 
-    /**
-     * Supported CLI options for Lff.
-     */
-    @Option(
-        names = {"-d", "--dry-run"},
-        description = "Send the formatted file contents to stdout"
-                        + " without writing to the file system.")
-    private boolean dryRun = false;
-
-    @Option(
-        names = {"-w", "--wrap"},
-        description = "Causes the formatter to line wrap the files to a"
-                        + " specified length.",
-        defaultValue = "" + FormattingUtils.DEFAULT_LINE_LENGTH,
-        fallbackValue = "" + FormattingUtils.DEFAULT_LINE_LENGTH)
-    private int lineLength;
-
-    @Option(
-        names = "--no-recurse",
-        description = "Do not format files in subdirectories of the"
-            + " specified paths.")
-    private boolean noRecurse = false;
-
-    @Option(
-        names = {"-v", "--verbose"},
-        description = "Print more details on files affected.")
-    private boolean verbose = false;
-
-    @Option(
-        names = {"--ignore-errors"},
-        description = "Ignore validation errors in files and format them anyway.")
-    private boolean ignoreErrors = false;
-
-    /**
-     * Main function of the formatter.
-     * Caution: this will invoke System.exit.
-     *
-     * @param args CLI arguments
-     */
-    public static void main(String[] args) {
-        main(Io.SYSTEM, args);
+  /** Supported CLI options for Lff. */
+  @Option(
+      names = {"-d", "--dry-run"},
+      description =
+          "Send the formatted file contents to stdout" + " without writing to the file system.")
+  private boolean dryRun = false;
+
+  @Option(
+      names = {"-w", "--wrap"},
+      description = "Causes the formatter to line wrap the files to a" + " specified length.",
+      defaultValue = "" + FormattingUtils.DEFAULT_LINE_LENGTH,
+      fallbackValue = "" + FormattingUtils.DEFAULT_LINE_LENGTH)
+  private int lineLength;
+
+  @Option(
+      names = "--no-recurse",
+      description = "Do not format files in subdirectories of the" + " specified paths.")
+  private boolean noRecurse = false;
+
+  @Option(
+      names = {"-v", "--verbose"},
+      description = "Print more details on files affected.")
+  private boolean verbose = false;
+
+  @Option(
+      names = {"--ignore-errors"},
+      description = "Ignore validation errors in files and format them anyway.")
+  private boolean ignoreErrors = false;
+
+  /**
+   * Main function of the formatter. Caution: this will invoke System.exit.
+   *
+   * @param args CLI arguments
+   */
+  public static void main(String[] args) {
+    main(Io.SYSTEM, args);
+  }
+
+  /**
+   * Programmatic entry point, with a custom IO.
+   *
+   * @param io IO streams.
+   * @param args Command-line arguments.
+   */
+  public static void main(Io io, final String... args) {
+    cliMain("lff", Lff.class, io, args);
+  }
+
+  /** Validates all paths and invokes the formatter on the input paths. */
+  @Override
+  public void doRun() {
+    List<Path> paths = getInputPaths();
+    final Path outputRoot = getOutputRoot();
+
+    try {
+      // Format all files defined by the list of paths.
+      formatAllFiles(paths, outputRoot);
+
+      exitIfCollectedErrors();
+      if (!dryRun || verbose) {
+        reporter.printInfo("Done formatting.");
+      }
+    } catch (RuntimeException e) {
+      reporter.printFatalErrorAndExit("An unexpected error occurred:", e);
     }
-
-    /**
-     * Programmatic entry point, with a custom IO.
-     *
-     * @param io IO streams.
-     * @param args Command-line arguments.
-     */
-    public static void main(Io io, final String... args) {
-        cliMain("lff", Lff.class, io, args);
-    }
-
-    /**
-     * Validates all paths and invokes the formatter on the input paths.
-     */
-    @Override
-    public void doRun() {
-        List<Path> paths = getInputPaths();
-        final Path outputRoot = getOutputRoot();
-
+  }
+
+  /*
+   * Invokes the formatter on all files defined by the list of paths.
+   */
+  private void formatAllFiles(List<Path> paths, Path outputRoot) {
+    for (Path relativePath : paths) {
+      if (verbose) {
+        reporter.printInfo("Formatting " + io.getWd().relativize(relativePath) + ":");
+      }
+
+      Path path = toAbsolutePath(relativePath);
+      if (Files.isDirectory(path) && !noRecurse) {
+        // Walk the contents of this directory.
         try {
-            // Format all files defined by the list of paths.
-            formatAllFiles(paths, outputRoot);
-
-            exitIfCollectedErrors();
-            if (!dryRun || verbose) {
-                reporter.printInfo("Done formatting.");
-            }
-        } catch (RuntimeException e) {
-            reporter.printFatalErrorAndExit("An unexpected error occurred:", e);
-        }
-    }
-
-    /*
-     * Invokes the formatter on all files defined by the list of paths.
-     */
-    private void formatAllFiles(List<Path> paths, Path outputRoot) {
-        for (Path relativePath : paths) {
-            if (verbose) {
-                reporter.printInfo("Formatting "
-                        + io.getWd().relativize(relativePath) + ":");
-            }
-
-            Path path = toAbsolutePath(relativePath);
-            if (Files.isDirectory(path) && !noRecurse) {
-                // Walk the contents of this directory.
-                try {
-                    Files.walkFileTree(path, new SimpleFileVisitor<>() {
-                        @Override
-                        public FileVisitResult visitFile(
-                                Path file, BasicFileAttributes attrs) {
-                            formatSingleFile(file, path, outputRoot);
-                            return FileVisitResult.CONTINUE;
-                        }
-                    });
-                } catch (IOException e) {
-                    reporter.printError("IO error: " + e);
+          Files.walkFileTree(
+              path,
+              new SimpleFileVisitor<>() {
+                @Override
+                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
+                  formatSingleFile(file, path, outputRoot);
+                  return FileVisitResult.CONTINUE;
                 }
-            } else {
-                // Simple file.
-                formatSingleFile(path, path.getParent(), outputRoot);
-            }
+              });
+        } catch (IOException e) {
+          reporter.printError("IO error: " + e);
         }
+      } else {
+        // Simple file.
+        formatSingleFile(path, path.getParent(), outputRoot);
+      }
     }
-
-    /*
-     * Invokes the formatter on a single file defined by the given path.
-     */
-    private void formatSingleFile(Path path, Path inputRoot, Path outputRoot) {
-        path = path.normalize();
-        Path outputPath = outputRoot == null
+  }
+
+  /*
+   * Invokes the formatter on a single file defined by the given path.
+   */
+  private void formatSingleFile(Path path, Path inputRoot, Path outputRoot) {
+    path = path.normalize();
+    Path outputPath =
+        outputRoot == null
             ? path // Format in place.
             : outputRoot.resolve(inputRoot.relativize(path)).normalize();
 
-        final Resource resource = getResource(path);
-        // Skip file if not an LF file.
-        if (resource == null) {
-            if (verbose) {
-                reporter.printInfo("Skipped " + path + ": not an LF file");
-            }
-            return;
-        }
-        validateResource(resource);
+    final Resource resource = getResource(path);
+    // Skip file if not an LF file.
+    if (resource == null) {
+      if (verbose) {
+        reporter.printInfo("Skipped " + path + ": not an LF file");
+      }
+      return;
+    }
+    validateResource(resource);
 
-        if (!ignoreErrors) {
-            exitIfCollectedErrors();
-        }
-        final String formattedFileContents =
-            FormattingUtils.render(resource.getContents().get(0), lineLength);
-
-        if (dryRun) {
-            io.getOut().print(formattedFileContents);
-        } else {
-            try {
-                FileUtil.writeToFile(formattedFileContents, outputPath, true);
-            } catch (IOException e) {
-                if (e instanceof FileAlreadyExistsException) {
-                    // Only happens if a subdirectory is named with
-                    // ".lf" at the end.
-                    reporter.printFatalErrorAndExit(
-                        "Error writing to "
-                        + outputPath
-                        + ": file already exists. Make sure that no file or"
-                        + " directory within provided input paths have the"
-                        + " same relative paths.");
-                }
-            }
+    if (!ignoreErrors) {
+      exitIfCollectedErrors();
+    }
+    final String formattedFileContents =
+        FormattingUtils.render(resource.getContents().get(0), lineLength);
+
+    if (dryRun) {
+      io.getOut().print(formattedFileContents);
+    } else {
+      try {
+        FileUtil.writeToFile(formattedFileContents, outputPath, true);
+      } catch (IOException e) {
+        if (e instanceof FileAlreadyExistsException) {
+          // Only happens if a subdirectory is named with
+          // ".lf" at the end.
+          reporter.printFatalErrorAndExit(
+              "Error writing to "
+                  + outputPath
+                  + ": file already exists. Make sure that no file or"
+                  + " directory within provided input paths have the"
+                  + " same relative paths.");
         }
+      }
+    }
 
-        if (!ignoreErrors) {
-            exitIfCollectedErrors();
-        }
-        // Only errors are printed. Warnings are not helpful for LFF
-        // and since they don't prevent the file from being formatted,
-        // the position of the issue may be wrong in the formatted file.
-        // issueCollector.getAllIssues().forEach(reporter::printIssue);
-        if (verbose) {
-            String msg = "Formatted " + io.getWd().relativize(path);
-            if (path != outputPath) {
-              msg += " -> " + io.getWd().relativize(outputPath);
-            }
-            reporter.printInfo(msg);
-        }
+    if (!ignoreErrors) {
+      exitIfCollectedErrors();
+    }
+    // Only errors are printed. Warnings are not helpful for LFF
+    // and since they don't prevent the file from being formatted,
+    // the position of the issue may be wrong in the formatted file.
+    // issueCollector.getAllIssues().forEach(reporter::printIssue);
+    if (verbose) {
+      String msg = "Formatted " + io.getWd().relativize(path);
+      if (path != outputPath) {
+        msg += " -> " + io.getWd().relativize(outputPath);
+      }
+      reporter.printInfo(msg);
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/cli/StandaloneErrorReporter.java b/org.lflang/src/org/lflang/cli/StandaloneErrorReporter.java
index 2b4ae6fe46..83e58eb15c 100644
--- a/org.lflang/src/org/lflang/cli/StandaloneErrorReporter.java
+++ b/org.lflang/src/org/lflang/cli/StandaloneErrorReporter.java
@@ -27,90 +27,79 @@
 
 package org.lflang.cli;
 
+import com.google.inject.Inject;
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.diagnostics.Severity;
-
 import org.lflang.ErrorReporter;
 
-import com.google.inject.Inject;
-
 /**
- * An error reporter that forwards all messages to an {@link IssueCollector}.
- * They'll be sorted out later.
+ * An error reporter that forwards all messages to an {@link IssueCollector}. They'll be sorted out
+ * later.
  */
 public class StandaloneErrorReporter implements ErrorReporter {
 
-    @Inject
-    private StandaloneIssueAcceptor issueAcceptor;
-
-    private String reportWithNode(String message, Severity severity, EObject obj) {
-        issueAcceptor.accept(severity, message, obj, null, 0, null);
-        return message;
-    }
-
-    private String reportSimpleFileCtx(String message, Severity severity, Integer line, Path path) {
-        LfIssue issue = new LfIssue(message, severity, line, 1, line, 1, 0, path);
-        issueAcceptor.accept(issue);
-        // Return a string that can be inserted into the generated code.
-        return message;
-    }
-
-
-    @Override
-    public String reportError(String message) {
-        return reportSimpleFileCtx(message, Severity.ERROR, null, null);
-    }
-
-
-    @Override
-    public String reportWarning(String message) {
-        return reportSimpleFileCtx(message, Severity.WARNING, null, null);
-    }
-
-    @Override
-    public String reportInfo(String message) {
-        return reportSimpleFileCtx(message, Severity.INFO, null, null);
-    }
-
-
-    @Override
-    public String reportError(EObject obj, String message) {
-        return reportWithNode(message, Severity.ERROR, obj);
-    }
-
-
-    @Override
-    public String reportWarning(EObject obj, String message) {
-        return reportWithNode(message, Severity.WARNING, obj);
-    }
-
-    @Override
-    public String reportInfo(EObject obj, String message) {
-        return reportWithNode(message, Severity.INFO, obj);
-    }
-
-
-    @Override
-    public String reportError(Path file, Integer line, String message) {
-        return reportSimpleFileCtx(message, Severity.ERROR, line, file);
-    }
-
-
-    @Override
-    public String reportWarning(Path file, Integer line, String message) {
-        return reportSimpleFileCtx(message, Severity.WARNING, line, file);
-    }
-
-    @Override
-    public String reportInfo(Path file, Integer line, String message) {
-        return reportSimpleFileCtx(message, Severity.INFO, line, file);
-    }
-
-
-    @Override
-    public boolean getErrorsOccurred() {
-        return issueAcceptor.getErrorsOccurred();
-    }
+  @Inject private StandaloneIssueAcceptor issueAcceptor;
+
+  private String reportWithNode(String message, Severity severity, EObject obj) {
+    issueAcceptor.accept(severity, message, obj, null, 0, null);
+    return message;
+  }
+
+  private String reportSimpleFileCtx(String message, Severity severity, Integer line, Path path) {
+    LfIssue issue = new LfIssue(message, severity, line, 1, line, 1, 0, path);
+    issueAcceptor.accept(issue);
+    // Return a string that can be inserted into the generated code.
+    return message;
+  }
+
+  @Override
+  public String reportError(String message) {
+    return reportSimpleFileCtx(message, Severity.ERROR, null, null);
+  }
+
+  @Override
+  public String reportWarning(String message) {
+    return reportSimpleFileCtx(message, Severity.WARNING, null, null);
+  }
+
+  @Override
+  public String reportInfo(String message) {
+    return reportSimpleFileCtx(message, Severity.INFO, null, null);
+  }
+
+  @Override
+  public String reportError(EObject obj, String message) {
+    return reportWithNode(message, Severity.ERROR, obj);
+  }
+
+  @Override
+  public String reportWarning(EObject obj, String message) {
+    return reportWithNode(message, Severity.WARNING, obj);
+  }
+
+  @Override
+  public String reportInfo(EObject obj, String message) {
+    return reportWithNode(message, Severity.INFO, obj);
+  }
+
+  @Override
+  public String reportError(Path file, Integer line, String message) {
+    return reportSimpleFileCtx(message, Severity.ERROR, line, file);
+  }
+
+  @Override
+  public String reportWarning(Path file, Integer line, String message) {
+    return reportSimpleFileCtx(message, Severity.WARNING, line, file);
+  }
+
+  @Override
+  public String reportInfo(Path file, Integer line, String message) {
+    return reportSimpleFileCtx(message, Severity.INFO, line, file);
+  }
+
+  @Override
+  public boolean getErrorsOccurred() {
+    return issueAcceptor.getErrorsOccurred();
+  }
 }
diff --git a/org.lflang/src/org/lflang/cli/StandaloneIssueAcceptor.java b/org.lflang/src/org/lflang/cli/StandaloneIssueAcceptor.java
index 73ca4bea9e..cb9712a7cb 100644
--- a/org.lflang/src/org/lflang/cli/StandaloneIssueAcceptor.java
+++ b/org.lflang/src/org/lflang/cli/StandaloneIssueAcceptor.java
@@ -1,42 +1,41 @@
 package org.lflang.cli;
 
+import com.google.inject.Inject;
 import java.io.IOException;
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.xtext.diagnostics.Severity;
 import org.eclipse.xtext.validation.EObjectDiagnosticImpl;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
-
 import org.lflang.util.FileUtil;
 
-import com.google.inject.Inject;
-
-/**
- *
- */
+/** */
 public class StandaloneIssueAcceptor implements ValidationMessageAcceptor {
 
-    @Inject
-    private IssueCollector collector;
-
-
-    boolean getErrorsOccurred() {
-        return collector.getErrorsOccurred();
-    }
-
-
-    void accept(LfIssue lfIssue) {
-        collector.accept(lfIssue);
-    }
-
-
-    void accept(Severity severity, String message, EObject object, EStructuralFeature feature, int index, String code, String... issueData) {
-        EObjectDiagnosticImpl diagnostic =
-            new EObjectDiagnosticImpl(severity, code, message, object, feature, index, issueData);
-
-        LfIssue lfIssue = new LfIssue(
+  @Inject private IssueCollector collector;
+
+  boolean getErrorsOccurred() {
+    return collector.getErrorsOccurred();
+  }
+
+  void accept(LfIssue lfIssue) {
+    collector.accept(lfIssue);
+  }
+
+  void accept(
+      Severity severity,
+      String message,
+      EObject object,
+      EStructuralFeature feature,
+      int index,
+      String code,
+      String... issueData) {
+    EObjectDiagnosticImpl diagnostic =
+        new EObjectDiagnosticImpl(severity, code, message, object, feature, index, issueData);
+
+    LfIssue lfIssue =
+        new LfIssue(
             message,
             severity,
             diagnostic.getLine(),
@@ -44,64 +43,81 @@ void accept(Severity severity, String message, EObject object, EStructuralFeatur
             diagnostic.getLineEnd(),
             diagnostic.getColumnEnd(),
             diagnostic.getLength(),
-            getPath(diagnostic)
-        );
-
-        accept(lfIssue);
-    }
-
-
-    /**
-     * Best effort to get a fileName. May return null.
-     */
-    private Path getPath(EObjectDiagnosticImpl diagnostic) {
-        Path file = null;
-        try {
-            file = FileUtil.toPath(diagnostic.getUriToProblem());
-        } catch (IOException e) {
-            // just continue with null
-        }
-        return file;
-    }
-
-
-    private void accept(Severity severity, String message, EObject object, int offset, int length, String code, String... issueData) {
-        throw new UnsupportedOperationException("not implemented: range based diagnostics");
-    }
-
-
-    @Override
-    public void acceptError(String message, EObject object, EStructuralFeature feature, int index, String code, String... issueData) {
-        accept(Severity.ERROR, message, object, feature, index, code, issueData);
-    }
-
-
-    @Override
-    public void acceptError(String message, EObject object, int offset, int length, String code, String... issueData) {
-        accept(Severity.ERROR, message, object, offset, length, code, issueData);
-    }
-
-
-    @Override
-    public void acceptWarning(String message, EObject object, EStructuralFeature feature, int index, String code, String... issueData) {
-        accept(Severity.WARNING, message, object, feature, index, code, issueData);
-    }
-
-
-    @Override
-    public void acceptWarning(String message, EObject object, int offset, int length, String code, String... issueData) {
-        accept(Severity.WARNING, message, object, offset, length, code, issueData);
-    }
-
-
-    @Override
-    public void acceptInfo(String message, EObject object, EStructuralFeature feature, int index, String code, String... issueData) {
-        accept(Severity.INFO, message, object, feature, index, code, issueData);
-    }
-
-
-    @Override
-    public void acceptInfo(String message, EObject object, int offset, int length, String code, String... issueData) {
-        accept(Severity.INFO, message, object, offset, length, code, issueData);
+            getPath(diagnostic));
+
+    accept(lfIssue);
+  }
+
+  /** Best effort to get a fileName. May return null. */
+  private Path getPath(EObjectDiagnosticImpl diagnostic) {
+    Path file = null;
+    try {
+      file = FileUtil.toPath(diagnostic.getUriToProblem());
+    } catch (IOException e) {
+      // just continue with null
     }
+    return file;
+  }
+
+  private void accept(
+      Severity severity,
+      String message,
+      EObject object,
+      int offset,
+      int length,
+      String code,
+      String... issueData) {
+    throw new UnsupportedOperationException("not implemented: range based diagnostics");
+  }
+
+  @Override
+  public void acceptError(
+      String message,
+      EObject object,
+      EStructuralFeature feature,
+      int index,
+      String code,
+      String... issueData) {
+    accept(Severity.ERROR, message, object, feature, index, code, issueData);
+  }
+
+  @Override
+  public void acceptError(
+      String message, EObject object, int offset, int length, String code, String... issueData) {
+    accept(Severity.ERROR, message, object, offset, length, code, issueData);
+  }
+
+  @Override
+  public void acceptWarning(
+      String message,
+      EObject object,
+      EStructuralFeature feature,
+      int index,
+      String code,
+      String... issueData) {
+    accept(Severity.WARNING, message, object, feature, index, code, issueData);
+  }
+
+  @Override
+  public void acceptWarning(
+      String message, EObject object, int offset, int length, String code, String... issueData) {
+    accept(Severity.WARNING, message, object, offset, length, code, issueData);
+  }
+
+  @Override
+  public void acceptInfo(
+      String message,
+      EObject object,
+      EStructuralFeature feature,
+      int index,
+      String code,
+      String... issueData) {
+    accept(Severity.INFO, message, object, feature, index, code, issueData);
+  }
+
+  @Override
+  public void acceptInfo(
+      String message, EObject object, int offset, int length, String code, String... issueData) {
+    accept(Severity.INFO, message, object, offset, length, code, issueData);
+  }
 }
diff --git a/org.lflang/src/org/lflang/cli/VersionProvider.java b/org.lflang/src/org/lflang/cli/VersionProvider.java
index ce9c8f6252..ca9c3d6bbb 100644
--- a/org.lflang/src/org/lflang/cli/VersionProvider.java
+++ b/org.lflang/src/org/lflang/cli/VersionProvider.java
@@ -1,11 +1,10 @@
 package org.lflang.cli;
 
+import org.lflang.LocalStrings;
 import picocli.CommandLine.IVersionProvider;
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.Spec;
 
-import org.lflang.LocalStrings;
-
 /*
  * Dynamically provides version information to the Lingua Franca CLI.
  * Picocli will instantiate this class and invoke it to collect version
@@ -14,19 +13,18 @@
  * @author Atharva Patil
  */
 class VersionProvider implements IVersionProvider {
-    /* 
-     * Here, picocli will inject the CommandSpec (full command hierarchy) of the
-     * command that uses this version provider. This allows this version 
-     * provider to be reused among multiple commands.
-     */ 
-    @Spec CommandSpec spec;
+  /*
+   * Here, picocli will inject the CommandSpec (full command hierarchy) of the
+   * command that uses this version provider. This allows this version
+   * provider to be reused among multiple commands.
+   */
+  @Spec CommandSpec spec;
 
-    // Method invoked by picocli to get the version info.
-    public String[] getVersion() {
-        return new String[] {
-            // "lfc", "lff", etc.
-            spec.qualifiedName()
-                + " " + LocalStrings.VERSION
-        };
-    }
+  // Method invoked by picocli to get the version info.
+  public String[] getVersion() {
+    return new String[] {
+      // "lfc", "lff", etc.
+      spec.qualifiedName() + " " + LocalStrings.VERSION
+    };
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/lsp/LFLanguageServer.java b/org.lflang/src/org/lflang/diagram/lsp/LFLanguageServer.java
index 1971fbc081..405e322a88 100644
--- a/org.lflang/src/org/lflang/diagram/lsp/LFLanguageServer.java
+++ b/org.lflang/src/org/lflang/diagram/lsp/LFLanguageServer.java
@@ -1,10 +1,9 @@
 package org.lflang.diagram.lsp;
 
-import org.eclipse.lsp4j.WorkDoneProgressCancelParams;
 import de.cau.cs.kieler.klighd.lsp.KGraphLanguageServerExtension;
-
 import org.eclipse.lsp4j.Hover;
 import org.eclipse.lsp4j.HoverParams;
+import org.eclipse.lsp4j.WorkDoneProgressCancelParams;
 import org.eclipse.xtext.ide.server.hover.IHoverService;
 import org.eclipse.xtext.util.CancelIndicator;
 
@@ -14,21 +13,24 @@
  * @author Peter Donovan
  */
 public class LFLanguageServer extends KGraphLanguageServerExtension {
-    @Override
-    public void cancelProgress(WorkDoneProgressCancelParams params) {
-        Progress.cancel(params.getToken().getRight().intValue());
-    }
+  @Override
+  public void cancelProgress(WorkDoneProgressCancelParams params) {
+    Progress.cancel(params.getToken().getRight().intValue());
+  }
 
-    @Override
-    protected Hover hover(HoverParams params, CancelIndicator cancelIndicator) {
-        // This override is just a hacky little patch that is being applied downstream of the original mistake and
-        //  upstream of the ungraceful handling (IndexOutOfBoundsException) of said mistake. This patch is applied here
-        //  simply because it is easy. This would be done differently were it not for the fact that we plan to rebuild
-        //  this infrastructure from scratch anyway.
-        try {
-            return super.hover(params, cancelIndicator);
-        } catch (IndexOutOfBoundsException e) {
-            return IHoverService.EMPTY_HOVER;  // Fail silently
-        }
+  @Override
+  protected Hover hover(HoverParams params, CancelIndicator cancelIndicator) {
+    // This override is just a hacky little patch that is being applied downstream of the original
+    // mistake and
+    //  upstream of the ungraceful handling (IndexOutOfBoundsException) of said mistake. This patch
+    // is applied here
+    //  simply because it is easy. This would be done differently were it not for the fact that we
+    // plan to rebuild
+    //  this infrastructure from scratch anyway.
+    try {
+      return super.hover(params, cancelIndicator);
+    } catch (IndexOutOfBoundsException e) {
+      return IHoverService.EMPTY_HOVER; // Fail silently
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/lsp/LFLanguageServerExtension.java b/org.lflang/src/org/lflang/diagram/lsp/LFLanguageServerExtension.java
index fd25b0fc0a..18de51f482 100644
--- a/org.lflang/src/org/lflang/diagram/lsp/LFLanguageServerExtension.java
+++ b/org.lflang/src/org/lflang/diagram/lsp/LFLanguageServerExtension.java
@@ -1,125 +1,125 @@
 package org.lflang.diagram.lsp;
 
-import java.util.concurrent.CompletableFuture;
 import java.util.ArrayList;
-
+import java.util.concurrent.CompletableFuture;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.services.LanguageClient;
-import org.eclipse.xtext.ide.server.ILanguageServerExtension;
 import org.eclipse.xtext.ide.server.ILanguageServerAccess;
-
+import org.eclipse.xtext.ide.server.ILanguageServerExtension;
+import org.lflang.LFRuntimeModule;
+import org.lflang.LFStandaloneSetup;
+import org.lflang.generator.GeneratorResult;
 import org.lflang.generator.GeneratorResult.Status;
 import org.lflang.generator.IntegratedBuilder;
-import org.lflang.generator.GeneratorResult;
-import org.lflang.LFStandaloneSetup;
-import org.lflang.LFRuntimeModule;
 import org.lflang.util.LFCommand;
 
 /**
- * Provide Lingua-Franca-specific extensions to the
- * language server's behavior.
+ * Provide Lingua-Franca-specific extensions to the language server's behavior.
  *
  * @author Peter Donovan
  */
 class LFLanguageServerExtension implements ILanguageServerExtension {
 
-    /** The IntegratedBuilder instance that handles all build requests for the current session. */
-    private static final IntegratedBuilder builder = new LFStandaloneSetup(new LFRuntimeModule())
-        .createInjectorAndDoEMFRegistration().getInstance(IntegratedBuilder.class);
+  /** The IntegratedBuilder instance that handles all build requests for the current session. */
+  private static final IntegratedBuilder builder =
+      new LFStandaloneSetup(new LFRuntimeModule())
+          .createInjectorAndDoEMFRegistration()
+          .getInstance(IntegratedBuilder.class);
 
-    /** The access point for reading documents, communicating with the language client, etc. */
-    private LanguageClient client;
+  /** The access point for reading documents, communicating with the language client, etc. */
+  private LanguageClient client;
 
-    @Override
-    public void initialize(ILanguageServerAccess access) {
-        // This method is never invoked.
-    }
+  @Override
+  public void initialize(ILanguageServerAccess access) {
+    // This method is never invoked.
+  }
 
-    public void setClient(LanguageClient client) {
-        this.client = client;
-    }
+  public void setClient(LanguageClient client) {
+    this.client = client;
+  }
 
-    /**
-     * Handle a request for a complete build of the Lingua
-     * Franca file specified by {@code uri}.
-     * @param uri the URI of the LF file of interest
-     * @return A message describing the outcome of the build
-     * process.
-     */
-    @JsonRequest("generator/build")
-    public CompletableFuture<String> build(String uri) {
-        if (client == null) return CompletableFuture.completedFuture(
-            "Please wait for the Lingua Franca language server to be fully initialized."
-        );
-        return CompletableFuture.supplyAsync(
-            () -> {
-                try {
-                    return buildWithProgress(client, uri, true).getUserMessage();
-                } catch (Exception e) {
-                    return "An internal error occurred:\n" + e;
-                }
-            }
-        );
-    }
+  /**
+   * Handle a request for a complete build of the Lingua Franca file specified by {@code uri}.
+   *
+   * @param uri the URI of the LF file of interest
+   * @return A message describing the outcome of the build process.
+   */
+  @JsonRequest("generator/build")
+  public CompletableFuture<String> build(String uri) {
+    if (client == null)
+      return CompletableFuture.completedFuture(
+          "Please wait for the Lingua Franca language server to be fully initialized.");
+    return CompletableFuture.supplyAsync(
+        () -> {
+          try {
+            return buildWithProgress(client, uri, true).getUserMessage();
+          } catch (Exception e) {
+            return "An internal error occurred:\n" + e;
+          }
+        });
+  }
 
-    /**
-     * Handles a request for the most complete build of the
-     * specified Lingua Franca file that can be done in a
-     * limited amount of time.
-     * @param uri the URI of the LF file of interest
-     */
-    @JsonNotification("generator/partialBuild")
-    public void partialBuild(String uri) {
-        if (client == null) return;
-        buildWithProgress(client, uri, false);
-    }
+  /**
+   * Handles a request for the most complete build of the specified Lingua Franca file that can be
+   * done in a limited amount of time.
+   *
+   * @param uri the URI of the LF file of interest
+   */
+  @JsonNotification("generator/partialBuild")
+  public void partialBuild(String uri) {
+    if (client == null) return;
+    buildWithProgress(client, uri, false);
+  }
 
-    /**
-     * Completely build the specified LF program and provide information that is sufficient to
-     * run it.
-     * @param uri The URI of the LF program to be built.
-     * @return An array consisting of the directory in which the execute command should be
-     * executed, the program of the execute command, and the arguments of the execute command.
-     */
-    @JsonNotification("generator/buildAndRun")
-    public CompletableFuture<String[]> buildAndRun(String uri) {
-        return new CompletableFuture<String[]>().completeAsync(() -> {
-            var result = buildWithProgress(client, uri, true);
-            if (!result.getStatus().equals(Status.COMPILED)) return null;
-            LFCommand cmd = result.getContext().getFileConfig().getCommand();
-            ArrayList<String> ret = new ArrayList<>();
-            ret.add(cmd.directory().toString());
-            ret.addAll(cmd.command());
-            return ret.toArray(new String[0]);
-        });
-    }
+  /**
+   * Completely build the specified LF program and provide information that is sufficient to run it.
+   *
+   * @param uri The URI of the LF program to be built.
+   * @return An array consisting of the directory in which the execute command should be executed,
+   *     the program of the execute command, and the arguments of the execute command.
+   */
+  @JsonNotification("generator/buildAndRun")
+  public CompletableFuture<String[]> buildAndRun(String uri) {
+    return new CompletableFuture<String[]>()
+        .completeAsync(
+            () -> {
+              var result = buildWithProgress(client, uri, true);
+              if (!result.getStatus().equals(Status.COMPILED)) return null;
+              LFCommand cmd = result.getContext().getFileConfig().getCommand();
+              ArrayList<String> ret = new ArrayList<>();
+              ret.add(cmd.directory().toString());
+              ret.addAll(cmd.command());
+              return ret.toArray(new String[0]);
+            });
+  }
 
-    /**
-     * Describes a build process that has a progress.
-     */
-    private GeneratorResult buildWithProgress(LanguageClient client, String uri, boolean mustComplete) {
-        URI parsedUri;
-        try {
-            parsedUri = URI.createFileURI(new java.net.URI(uri).getPath());
-        } catch (java.net.URISyntaxException e) {
-            // This error will appear as a silent failure to most users, but that is acceptable because this error
-            // should be impossible. The URI is not the result of user input -- the language client provides it --
-            // so it should be valid.
-            System.err.println(e);
-            return GeneratorResult.NOTHING;
-        }
-        Progress progress = new Progress(client, "Build \"" + parsedUri.lastSegment() + "\"", mustComplete);
-        progress.begin();
-        GeneratorResult result = null;
-        try {
-            result = builder.run(
-                parsedUri, mustComplete, progress::report, progress.getCancelIndicator()
-            );
-        } finally {
-            progress.end(result == null ? "An internal error occurred." : result.getUserMessage());
-        }
-        return result;
+  /** Describes a build process that has a progress. */
+  private GeneratorResult buildWithProgress(
+      LanguageClient client, String uri, boolean mustComplete) {
+    URI parsedUri;
+    try {
+      parsedUri = URI.createFileURI(new java.net.URI(uri).getPath());
+    } catch (java.net.URISyntaxException e) {
+      // This error will appear as a silent failure to most users, but that is acceptable because
+      // this error
+      // should be impossible. The URI is not the result of user input -- the language client
+      // provides it --
+      // so it should be valid.
+      System.err.println(e);
+      return GeneratorResult.NOTHING;
+    }
+    Progress progress =
+        new Progress(client, "Build \"" + parsedUri.lastSegment() + "\"", mustComplete);
+    progress.begin();
+    GeneratorResult result = null;
+    try {
+      result =
+          builder.run(parsedUri, mustComplete, progress::report, progress.getCancelIndicator());
+    } finally {
+      progress.end(result == null ? "An internal error occurred." : result.getUserMessage());
     }
+    return result;
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/lsp/LanguageDiagramServer.java b/org.lflang/src/org/lflang/diagram/lsp/LanguageDiagramServer.java
index c4d7804453..96e887d242 100644
--- a/org.lflang/src/org/lflang/diagram/lsp/LanguageDiagramServer.java
+++ b/org.lflang/src/org/lflang/diagram/lsp/LanguageDiagramServer.java
@@ -1,20 +1,8 @@
 package org.lflang.diagram.lsp;
 
-import java.util.List;
-
-import org.eclipse.xtext.Constants;
-import org.eclipse.xtext.IGrammarAccess;
-import org.eclipse.xtext.ide.server.ILanguageServerExtension;
-import org.eclipse.xtext.ide.server.LanguageServerImpl;
-import org.eclipse.xtext.service.AbstractGenericModule;
-import org.eclipse.xtext.util.Modules2;
-import org.lflang.generator.LanguageServerErrorReporter;
-import org.lflang.ide.LFIdeSetup;
-
 import com.google.inject.Module;
 import com.google.inject.name.Names;
 import com.google.inject.util.Modules;
-
 import de.cau.cs.kieler.kgraph.text.services.KGraphGrammarAccess;
 import de.cau.cs.kieler.klighd.lsp.KGraphLanguageClient;
 import de.cau.cs.kieler.klighd.lsp.interactive.layered.LayeredInteractiveLanguageServerExtension;
@@ -24,82 +12,102 @@
 import de.cau.cs.kieler.klighd.lsp.launch.AbstractRegistrationLanguageServerExtension;
 import de.cau.cs.kieler.klighd.lsp.launch.ILanguageRegistration;
 import de.cau.cs.kieler.klighd.lsp.launch.Language;
+import java.util.List;
+import org.eclipse.xtext.Constants;
+import org.eclipse.xtext.IGrammarAccess;
+import org.eclipse.xtext.ide.server.ILanguageServerExtension;
+import org.eclipse.xtext.ide.server.LanguageServerImpl;
+import org.eclipse.xtext.service.AbstractGenericModule;
+import org.eclipse.xtext.util.Modules2;
+import org.lflang.generator.LanguageServerErrorReporter;
+import org.lflang.ide.LFIdeSetup;
 
 /**
  * Language server with extended diagram communication.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class LanguageDiagramServer extends AbstractLanguageServer {
-    
-    private static class LFLsCreator extends AbstractLsCreator {
 
-        @Override
-        public Module createLSModules(boolean socket) {
-            return Modules2.mixin(Modules.override(super.createLSModules(socket)).with(new AbstractGenericModule() {
-                public Class<? extends LanguageServerImpl> bindLanguageServerImpl() {
-                    return LFLanguageServer.class;
-                }
-            }), it -> {
-                // Temporary fix for an issue of Klighd with Xtext 2.28 (https://github.com/kieler/KLighD/issues/144)
-                it.bind(IGrammarAccess.class).to(KGraphGrammarAccess.class);
-                it.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance("de.cau.cs.kieler.kgraph.text.KGraph");    
-            });
-        }
-        
-        LayeredInteractiveLanguageServerExtension constraints;
-        RectpackingInteractiveLanguageServerExtension rectPack;
-        LFLanguageServerExtension lfExtension;
-        
-        @Override
-        public List<ILanguageServerExtension> getLanguageServerExtensions() {
-            constraints = injector.getInstance(LayeredInteractiveLanguageServerExtension.class);
-            rectPack = injector.getInstance(RectpackingInteractiveLanguageServerExtension.class);
-            lfExtension = injector.getInstance(LFLanguageServerExtension.class);
-            return List.of(
-                injector.getInstance(LFRegistrationLanguageServerExtension.class), constraints, rectPack, lfExtension
-            );
-        }
-        
-        @Override
-        public Class<? extends KGraphLanguageClient> getRemoteInterface() {
-            return KGraphLanguageClient.class;
-        }
-        
-        @Override
-        public void onConnect() {
-            super.onConnect();
-            constraints.setClient((KGraphLanguageClient) languageClient);
-            rectPack.setClient((KGraphLanguageClient) languageClient);
-            LanguageServerErrorReporter.setClient(languageClient);
-            lfExtension.setClient(languageClient);
-            // The following is needed because VS Code treats System.err like System.out and System.out like a shout
-            // into the void.
-            System.setOut(System.err);
-        }
+  private static class LFLsCreator extends AbstractLsCreator {
+
+    @Override
+    public Module createLSModules(boolean socket) {
+      return Modules2.mixin(
+          Modules.override(super.createLSModules(socket))
+              .with(
+                  new AbstractGenericModule() {
+                    public Class<? extends LanguageServerImpl> bindLanguageServerImpl() {
+                      return LFLanguageServer.class;
+                    }
+                  }),
+          it -> {
+            // Temporary fix for an issue of Klighd with Xtext 2.28
+            // (https://github.com/kieler/KLighD/issues/144)
+            it.bind(IGrammarAccess.class).to(KGraphGrammarAccess.class);
+            it.bind(String.class)
+                .annotatedWith(Names.named(Constants.LANGUAGE_NAME))
+                .toInstance("de.cau.cs.kieler.kgraph.text.KGraph");
+          });
+    }
+
+    LayeredInteractiveLanguageServerExtension constraints;
+    RectpackingInteractiveLanguageServerExtension rectPack;
+    LFLanguageServerExtension lfExtension;
+
+    @Override
+    public List<ILanguageServerExtension> getLanguageServerExtensions() {
+      constraints = injector.getInstance(LayeredInteractiveLanguageServerExtension.class);
+      rectPack = injector.getInstance(RectpackingInteractiveLanguageServerExtension.class);
+      lfExtension = injector.getInstance(LFLanguageServerExtension.class);
+      return List.of(
+          injector.getInstance(LFRegistrationLanguageServerExtension.class),
+          constraints,
+          rectPack,
+          lfExtension);
     }
-    
-    private static class LFLanguageRegistration implements ILanguageRegistration {
-        
-        @Override
-        public void bindAndRegisterLanguages() {
-            LFIdeSetup.doSetup();
-        }
+
+    @Override
+    public Class<? extends KGraphLanguageClient> getRemoteInterface() {
+      return KGraphLanguageClient.class;
     }
 
-    private static class LFRegistrationLanguageServerExtension extends AbstractRegistrationLanguageServerExtension {
-        
-        @Override
-        public List<Language> getLanguageExtensions() {
-            return List.of(new Language("lf", "Lingua Franca", List.of()));
-        }
+    @Override
+    public void onConnect() {
+      super.onConnect();
+      constraints.setClient((KGraphLanguageClient) languageClient);
+      rectPack.setClient((KGraphLanguageClient) languageClient);
+      LanguageServerErrorReporter.setClient(languageClient);
+      lfExtension.setClient(languageClient);
+      // The following is needed because VS Code treats System.err like System.out and System.out
+      // like a shout
+      // into the void.
+      System.setOut(System.err);
     }
-    
-    public static void main(String[] args) {
-        new LanguageDiagramServer().start();
+  }
+
+  private static class LFLanguageRegistration implements ILanguageRegistration {
+
+    @Override
+    public void bindAndRegisterLanguages() {
+      LFIdeSetup.doSetup();
     }
-    
-    public void start() {
-        configureAndRun(new LFLanguageRegistration(), new LFLsCreator());
+  }
+
+  private static class LFRegistrationLanguageServerExtension
+      extends AbstractRegistrationLanguageServerExtension {
+
+    @Override
+    public List<Language> getLanguageExtensions() {
+      return List.of(new Language("lf", "Lingua Franca", List.of()));
     }
+  }
+
+  public static void main(String[] args) {
+    new LanguageDiagramServer().start();
+  }
+
+  public void start() {
+    configureAndRun(new LFLanguageRegistration(), new LFLsCreator());
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/lsp/Progress.java b/org.lflang/src/org/lflang/diagram/lsp/Progress.java
index 2c1bb2f7fe..56c6788ea8 100644
--- a/org.lflang/src/org/lflang/diagram/lsp/Progress.java
+++ b/org.lflang/src/org/lflang/diagram/lsp/Progress.java
@@ -2,15 +2,14 @@
 
 import java.util.HashMap;
 import java.util.Map;
-
-import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.ProgressParams;
-import org.eclipse.lsp4j.services.LanguageClient;
-import org.eclipse.lsp4j.WorkDoneProgressCreateParams;
 import org.eclipse.lsp4j.WorkDoneProgressBegin;
+import org.eclipse.lsp4j.WorkDoneProgressCreateParams;
 import org.eclipse.lsp4j.WorkDoneProgressEnd;
 import org.eclipse.lsp4j.WorkDoneProgressNotification;
 import org.eclipse.lsp4j.WorkDoneProgressReport;
+import org.eclipse.lsp4j.jsonrpc.messages.Either;
+import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.xtext.util.CancelIndicator;
 
 /**
@@ -19,88 +18,85 @@
  * @author Peter Donovan
  */
 public class Progress {
-    private static int nextToken = 0;
-    private static final Map<Integer, Boolean> cancellations = new HashMap<>();
+  private static int nextToken = 0;
+  private static final Map<Integer, Boolean> cancellations = new HashMap<>();
 
-    private final LanguageClient client;
-    private final String title;
-    private final int token;
-    private final boolean cancellable;
+  private final LanguageClient client;
+  private final String title;
+  private final int token;
+  private final boolean cancellable;
 
-    /**
-     * Initialize the {@code Progress} of a task titled {@code title} that is
-     * triggered via {@code client}.
-     * @param client A language client through which a task was triggered.
-     * @param title The title of the task.
-     * @param cancellable Whether the task tracked by {@code this} can be
-     * cancelled.
-     */
-    public Progress(LanguageClient client, String title, boolean cancellable) {
-        this.client = client;
-        this.title = title;
-        this.token = nextToken++;
-        this.cancellable = cancellable;
-        if (cancellable) cancellations.put(token, false);
-        client.createProgress(new WorkDoneProgressCreateParams(Either.forRight(token)));
-    }
+  /**
+   * Initialize the {@code Progress} of a task titled {@code title} that is triggered via {@code
+   * client}.
+   *
+   * @param client A language client through which a task was triggered.
+   * @param title The title of the task.
+   * @param cancellable Whether the task tracked by {@code this} can be cancelled.
+   */
+  public Progress(LanguageClient client, String title, boolean cancellable) {
+    this.client = client;
+    this.title = title;
+    this.token = nextToken++;
+    this.cancellable = cancellable;
+    if (cancellable) cancellations.put(token, false);
+    client.createProgress(new WorkDoneProgressCreateParams(Either.forRight(token)));
+  }
 
-    /**
-     * Cancel the task tracked by the {@code Progress} that has token
-     * {@code token}.
-     */
-    public static void cancel(int token) {
-        if (cancellations.containsKey(token)) cancellations.put(token, true);
-    }
+  /** Cancel the task tracked by the {@code Progress} that has token {@code token}. */
+  public static void cancel(int token) {
+    if (cancellations.containsKey(token)) cancellations.put(token, true);
+  }
 
-    /**
-     * Returns the cancel indicator for the task tracked by this
-     * {@code Progress}.
-     * @return the cancel indicator for the task tracked by this
-     * {@code Progress}
-     */
-    public CancelIndicator getCancelIndicator() {
-        if (cancellable) return () -> cancellations.get(token);
-        return () -> false;
-    }
+  /**
+   * Returns the cancel indicator for the task tracked by this {@code Progress}.
+   *
+   * @return the cancel indicator for the task tracked by this {@code Progress}
+   */
+  public CancelIndicator getCancelIndicator() {
+    if (cancellable) return () -> cancellations.get(token);
+    return () -> false;
+  }
 
-    /**
-     * Report that the task tracked by {@code this} is done.
-     */
-    public void begin() {
-        WorkDoneProgressBegin begin = new WorkDoneProgressBegin();
-        begin.setTitle(title);
-        begin.setCancellable(cancellable);
-        begin.setPercentage(0);
-        notifyProgress(begin);
-    }
+  /** Report that the task tracked by {@code this} is done. */
+  public void begin() {
+    WorkDoneProgressBegin begin = new WorkDoneProgressBegin();
+    begin.setTitle(title);
+    begin.setCancellable(cancellable);
+    begin.setPercentage(0);
+    notifyProgress(begin);
+  }
 
-    /**
-     * Report the progress of the task tracked by {@code this}.
-     * @param message A message describing the progress of the task.
-     */
-    public void report(String message, Integer percentage) {
-        WorkDoneProgressReport report = new WorkDoneProgressReport();
-        report.setMessage(message);
-        report.setCancellable(cancellable);
-        report.setPercentage(percentage);
-        notifyProgress(report);
-    }
+  /**
+   * Report the progress of the task tracked by {@code this}.
+   *
+   * @param message A message describing the progress of the task.
+   */
+  public void report(String message, Integer percentage) {
+    WorkDoneProgressReport report = new WorkDoneProgressReport();
+    report.setMessage(message);
+    report.setCancellable(cancellable);
+    report.setPercentage(percentage);
+    notifyProgress(report);
+  }
 
-    /**
-     * Marks the task tracked by {@code this} as terminated.
-     * @param message A message describing the outcome of the task.
-     */
-    public void end(String message) {
-        WorkDoneProgressEnd end = new WorkDoneProgressEnd();
-        end.setMessage(message);
-        notifyProgress(end);
-    }
+  /**
+   * Marks the task tracked by {@code this} as terminated.
+   *
+   * @param message A message describing the outcome of the task.
+   */
+  public void end(String message) {
+    WorkDoneProgressEnd end = new WorkDoneProgressEnd();
+    end.setMessage(message);
+    notifyProgress(end);
+  }
 
-    /**
-     * Send the given progress notification to the client.
-     * @param notification
-     */
-    private void notifyProgress(WorkDoneProgressNotification notification) {
-        client.notifyProgress(new ProgressParams(Either.forRight(token), Either.forLeft(notification)));
-    }
+  /**
+   * Send the given progress notification to the client.
+   *
+   * @param notification
+   */
+  private void notifyProgress(WorkDoneProgressNotification notification) {
+    client.notifyProgress(new ProgressParams(Either.forRight(token), Either.forLeft(notification)));
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/AbstractSynthesisExtensions.java b/org.lflang/src/org/lflang/diagram/synthesis/AbstractSynthesisExtensions.java
index 1041af3ce7..4d32af61ef 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/AbstractSynthesisExtensions.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/AbstractSynthesisExtensions.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis;
 
 import de.cau.cs.kieler.klighd.SynthesisOption;
@@ -30,33 +30,33 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * Abstract super class for extension classes used in for the diagram synthesis that provides some convince methods.
- * 
+ * Abstract super class for extension classes used in for the diagram synthesis that provides some
+ * convince methods.
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public abstract class AbstractSynthesisExtensions {
-    
-    @Inject
-    private AbstractDiagramSynthesis<?> delegate;
-    
-    public boolean getBooleanValue(SynthesisOption option) {
-        return delegate.getBooleanValue(option);
-    }
-    
-    public float getFloatValue(SynthesisOption option) {
-        return delegate.getFloatValue(option);
-    }
-
-    public Object getObjectValue(final SynthesisOption option) {
-        return delegate.getObjectValue(option);
-    }
-      
-    public <T extends EObject> T associateWith(T derived, Object source) {
-        return delegate.associateWith(derived, source);
-    }
-    
-    @SuppressWarnings("unchecked")
-    public <T extends AbstractDiagramSynthesis<?>> T getRootSynthesis() {
-        return (T) delegate;
-    }
+
+  @Inject private AbstractDiagramSynthesis<?> delegate;
+
+  public boolean getBooleanValue(SynthesisOption option) {
+    return delegate.getBooleanValue(option);
+  }
+
+  public float getFloatValue(SynthesisOption option) {
+    return delegate.getFloatValue(option);
+  }
+
+  public Object getObjectValue(final SynthesisOption option) {
+    return delegate.getObjectValue(option);
+  }
+
+  public <T extends EObject> T associateWith(T derived, Object source) {
+    return delegate.associateWith(derived, source);
+  }
+
+  @SuppressWarnings("unchecked")
+  public <T extends AbstractDiagramSynthesis<?>> T getRootSynthesis() {
+    return (T) delegate;
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/org.lflang/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index 2b1a2a1bf6..45f3342a0a 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -1,29 +1,61 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis;
 
+import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Table;
+import de.cau.cs.kieler.klighd.DisplayedActionData;
+import de.cau.cs.kieler.klighd.SynthesisOption;
+import de.cau.cs.kieler.klighd.kgraph.KEdge;
+import de.cau.cs.kieler.klighd.kgraph.KLabel;
+import de.cau.cs.kieler.klighd.kgraph.KNode;
+import de.cau.cs.kieler.klighd.kgraph.KPort;
+import de.cau.cs.kieler.klighd.krendering.Colors;
+import de.cau.cs.kieler.klighd.krendering.HorizontalAlignment;
+import de.cau.cs.kieler.klighd.krendering.KContainerRendering;
+import de.cau.cs.kieler.klighd.krendering.KPolyline;
+import de.cau.cs.kieler.klighd.krendering.KRectangle;
+import de.cau.cs.kieler.klighd.krendering.KRendering;
+import de.cau.cs.kieler.klighd.krendering.KRoundedRectangle;
+import de.cau.cs.kieler.klighd.krendering.KStyle;
+import de.cau.cs.kieler.klighd.krendering.KText;
+import de.cau.cs.kieler.klighd.krendering.LineCap;
+import de.cau.cs.kieler.klighd.krendering.LineStyle;
+import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
+import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KEdgeExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KLabelExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions;
+import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis;
+import de.cau.cs.kieler.klighd.util.KlighdProperties;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.EnumSet;
@@ -35,9 +67,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import javax.inject.Inject;
-
 import org.eclipse.elk.alg.layered.options.LayerConstraint;
 import org.eclipse.elk.alg.layered.options.LayeredOptions;
 import org.eclipse.elk.alg.layered.options.NodePlacementStrategy;
@@ -62,9 +92,9 @@
 import org.eclipse.xtext.xbase.lib.ListExtensions;
 import org.eclipse.xtext.xbase.lib.Pair;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.lflang.ast.ASTUtils;
 import org.lflang.AttributeUtils;
 import org.lflang.InferredType;
+import org.lflang.ast.ASTUtils;
 import org.lflang.ast.FormattingUtils;
 import org.lflang.diagram.synthesis.action.CollapseAllReactorsAction;
 import org.lflang.diagram.synthesis.action.ExpandAllReactorsAction;
@@ -99,40 +129,6 @@
 import org.lflang.lf.StateVar;
 import org.lflang.util.FileUtil;
 
-import com.google.common.collect.HashBasedTable;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Table;
-
-import de.cau.cs.kieler.klighd.DisplayedActionData;
-import de.cau.cs.kieler.klighd.SynthesisOption;
-import de.cau.cs.kieler.klighd.kgraph.KEdge;
-import de.cau.cs.kieler.klighd.kgraph.KLabel;
-import de.cau.cs.kieler.klighd.kgraph.KNode;
-import de.cau.cs.kieler.klighd.kgraph.KPort;
-import de.cau.cs.kieler.klighd.krendering.Colors;
-import de.cau.cs.kieler.klighd.krendering.HorizontalAlignment;
-import de.cau.cs.kieler.klighd.krendering.KContainerRendering;
-import de.cau.cs.kieler.klighd.krendering.KPolyline;
-import de.cau.cs.kieler.klighd.krendering.KRectangle;
-import de.cau.cs.kieler.klighd.krendering.KRendering;
-import de.cau.cs.kieler.klighd.krendering.KRoundedRectangle;
-import de.cau.cs.kieler.klighd.krendering.KStyle;
-import de.cau.cs.kieler.klighd.krendering.KText;
-import de.cau.cs.kieler.klighd.krendering.LineCap;
-import de.cau.cs.kieler.klighd.krendering.LineStyle;
-import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
-import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KEdgeExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KLabelExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions;
-import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis;
-import de.cau.cs.kieler.klighd.util.KlighdProperties;
-
 /**
  * Diagram synthesis for Lingua Franca programs.
  *
@@ -140,1270 +136,1537 @@
  */
 @ViewSynthesisShared
 public class LinguaFrancaSynthesis extends AbstractDiagramSynthesis<Model> {
-    @Inject @Extension private KNodeExtensions _kNodeExtensions;
-    @Inject @Extension private KEdgeExtensions _kEdgeExtensions;
-    @Inject @Extension private KPortExtensions _kPortExtensions;
-    @Inject @Extension private KLabelExtensions _kLabelExtensions;
-    @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
-    @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
-    @Inject @Extension private KPolylineExtensions _kPolylineExtensions;
-    @Inject @Extension private LinguaFrancaStyleExtensions _linguaFrancaStyleExtensions;
-    @Inject @Extension private LinguaFrancaShapeExtensions _linguaFrancaShapeExtensions;
-    @Inject @Extension private UtilityExtensions _utilityExtensions;
-    @Inject @Extension private CycleVisualization _cycleVisualization;
-    @Inject @Extension private InterfaceDependenciesVisualization _interfaceDependenciesVisualization;
-    @Inject @Extension private FilterCycleAction _filterCycleAction;
-    @Inject @Extension private ReactorIcons _reactorIcons;
-    @Inject @Extension private ModeDiagrams _modeDiagrams;
-    @Inject @Extension private LayoutPostProcessing _layoutPostProcessing;
-
-    // -------------------------------------------------------------------------
-
-    public static final String ID = "org.lflang.diagram.synthesis.LinguaFrancaSynthesis";
-
-    // -- INTERNAL --
-    public static final Property<Boolean> REACTOR_RECURSIVE_INSTANTIATION = new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.recursive.instantiation", false);
-    public static final Property<Boolean> REACTOR_HAS_BANK_PORT_OFFSET = new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.bank.offset", false);
-    public static final Property<Boolean> REACTOR_INPUT = new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.input", false);
-    public static final Property<Boolean> REACTOR_OUTPUT = new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.output", false);
-    public static final Property<Boolean> REACTION_SPECIAL_TRIGGER = new Property<>("org.lflang.linguafranca.diagram.synthesis.reaction.special.trigger", false);
-
-    // -- STYLE --
-    public static final List<Float> ALTERNATIVE_DASH_PATTERN = List.of(3.0f);
-
-    // -- TEXT --
-    public static final String TEXT_ERROR_RECURSIVE = "Recursive reactor instantiation!";
-    public static final String TEXT_ERROR_CONTAINS_RECURSION = "Reactor contains recursive instantiation!";
-    public static final String TEXT_ERROR_CONTAINS_CYCLE = "Reactor contains cyclic dependencies!";
-    public static final String TEXT_ERROR_CYCLE_DETECTION = "Dependency cycle detection failed.\nCould not detect dependency cycles due to unexpected graph structure.";
-    public static final String TEXT_ERROR_CYCLE_BTN_SHOW = "Show Cycle";
-    public static final String TEXT_ERROR_CYCLE_BTN_FILTER = "Filter Cycle";
-    public static final String TEXT_ERROR_CYCLE_BTN_UNFILTER = "Remove Cycle Filter";
-    public static final String TEXT_NO_MAIN_REACTOR = "No Main Reactor";
-    public static final String TEXT_REACTOR_NULL = "Reactor is null";
-    public static final String TEXT_HIDE_ACTION = "[Hide]";
-    public static final String TEXT_SHOW_ACTION = "[Details]";
-
-    // -------------------------------------------------------------------------
-
-    /** Synthesis category */
-    public static final SynthesisOption APPEARANCE = SynthesisOption.createCategory("Appearance", true);
-    public static final SynthesisOption EXPERIMENTAL = SynthesisOption.createCategory("Experimental", true);
-    public static final SynthesisOption LAYOUT = SynthesisOption.createCategory("Layout", false).setCategory(LinguaFrancaSynthesis.APPEARANCE);
-
-    /** Synthesis options */
-    public static final SynthesisOption SHOW_ALL_REACTORS = SynthesisOption.createCheckOption("All Reactors", false);
-    public static final SynthesisOption CYCLE_DETECTION = SynthesisOption.createCheckOption("Dependency Cycle Detection", true);
-
-    public static final SynthesisOption SHOW_USER_LABELS = SynthesisOption.createCheckOption("User Labels (@label in JavaDoc)", true).setCategory(APPEARANCE);
-    public static final SynthesisOption SHOW_HYPERLINKS = SynthesisOption.createCheckOption("Expand/Collapse Hyperlinks", false).setCategory(APPEARANCE);
-    public static final SynthesisOption REACTIONS_USE_HYPEREDGES = SynthesisOption.createCheckOption("Bundled Dependencies", false).setCategory(APPEARANCE);
-    public static final SynthesisOption USE_ALTERNATIVE_DASH_PATTERN = SynthesisOption.createCheckOption("Alternative Dependency Line Style", false).setCategory(APPEARANCE);
-    public static final SynthesisOption SHOW_PORT_NAMES = SynthesisOption.createCheckOption("Port names", true).setCategory(APPEARANCE);
-    public static final SynthesisOption SHOW_MULTIPORT_WIDTH = SynthesisOption.createCheckOption("Multiport Widths", false).setCategory(APPEARANCE);
-    public static final SynthesisOption SHOW_REACTION_CODE = SynthesisOption.createCheckOption("Reaction Code", false).setCategory(APPEARANCE);
-    public static final SynthesisOption SHOW_REACTION_LEVEL = SynthesisOption.createCheckOption("Reaction Level", false).setCategory(APPEARANCE);
-    public static final SynthesisOption SHOW_REACTION_ORDER_EDGES = SynthesisOption.createCheckOption("Reaction Order Edges", false).setCategory(APPEARANCE);
-    public static final SynthesisOption SHOW_REACTOR_HOST = SynthesisOption.createCheckOption("Reactor Host Addresses", true).setCategory(APPEARANCE);
-    public static final SynthesisOption SHOW_INSTANCE_NAMES = SynthesisOption.createCheckOption("Reactor Instance Names", false).setCategory(APPEARANCE);
-    public static final SynthesisOption REACTOR_PARAMETER_MODE = SynthesisOption.createChoiceOption("Reactor Parameters", ((List<?>)Conversions.doWrapArray(ReactorParameterDisplayModes.values())), ReactorParameterDisplayModes.NONE).setCategory(APPEARANCE);
-    public static final SynthesisOption SHOW_STATE_VARIABLES = SynthesisOption.createCheckOption("Reactor State Variables", false).setCategory(APPEARANCE);
-    public static final SynthesisOption REACTOR_BODY_TABLE_COLS = SynthesisOption.<Integer>createRangeOption("Reactor Parameter/Variable Columns", 1, 10, 1).setCategory(APPEARANCE);
-
-    public static final SynthesisOption SPACING = SynthesisOption.<Integer>createRangeOption("Spacing (%)", 0, 150, 5, 75).setCategory(LAYOUT);
-
-    /** Synthesis actions */
-    public static final DisplayedActionData COLLAPSE_ALL = DisplayedActionData.create(CollapseAllReactorsAction.ID, "Hide all Details");
-    public static final DisplayedActionData EXPAND_ALL = DisplayedActionData.create(ExpandAllReactorsAction.ID, "Show all Details");
-
-    @Override
-    public List<SynthesisOption> getDisplayedSynthesisOptions() {
-        return List.of(
-            SHOW_ALL_REACTORS,
-            MemorizingExpandCollapseAction.MEMORIZE_EXPANSION_STATES,
-            CYCLE_DETECTION,
-            APPEARANCE,
-            ModeDiagrams.MODES_CATEGORY,
-            ModeDiagrams.SHOW_TRANSITION_LABELS,
-            ModeDiagrams.INITIALLY_COLLAPSE_MODES,
-            SHOW_USER_LABELS,
-            SHOW_HYPERLINKS,
-            //LinguaFrancaSynthesisInterfaceDependencies.SHOW_INTERFACE_DEPENDENCIES,
-            REACTIONS_USE_HYPEREDGES,
-            USE_ALTERNATIVE_DASH_PATTERN,
-            SHOW_PORT_NAMES,
-            SHOW_MULTIPORT_WIDTH,
-            SHOW_REACTION_CODE,
-            SHOW_REACTION_LEVEL,
-            SHOW_REACTION_ORDER_EDGES,
-            SHOW_REACTOR_HOST,
-            SHOW_INSTANCE_NAMES,
-            REACTOR_PARAMETER_MODE,
-            SHOW_STATE_VARIABLES,
-            REACTOR_BODY_TABLE_COLS,
-            LAYOUT,
-            LayoutPostProcessing.MODEL_ORDER,
-            SPACING
-        );
-    }
-
-    @Override
-    public List<DisplayedActionData> getDisplayedActions() {
-        return List.of(COLLAPSE_ALL, EXPAND_ALL);
-    }
-
-    // -------------------------------------------------------------------------
-
-    @Override
-    public KNode transform(final Model model) {
-        KNode rootNode = _kNodeExtensions.createNode();
-        setLayoutOption(rootNode, CoreOptions.ALGORITHM, LayeredOptions.ALGORITHM_ID);
-        setLayoutOption(rootNode, CoreOptions.DIRECTION, Direction.RIGHT);
-        setLayoutOption(rootNode, CoreOptions.PADDING, new ElkPadding(0));
-
-        try {
-            // Find main
-            Reactor main = IterableExtensions.findFirst(model.getReactors(), _utilityExtensions::isMainOrFederated);
-            if (main != null) {
-                ReactorInstance reactorInstance = new ReactorInstance(main, new SynthesisErrorReporter());
-                rootNode.getChildren().addAll(createReactorNode(reactorInstance, true, null, null, new HashMap<>()));
-            } else if (!getBooleanValue(SHOW_ALL_REACTORS)) {
-                KNode messageNode = _kNodeExtensions.createNode();
-                _linguaFrancaShapeExtensions.addErrorMessage(messageNode, TEXT_NO_MAIN_REACTOR, null);
-                rootNode.getChildren().add(messageNode);
-            }
-
-            // Show all reactors
-            if (main == null || getBooleanValue(SHOW_ALL_REACTORS)) {
-                List<KNode> reactorNodes = new ArrayList<>();
-                for (Reactor reactor : model.getReactors()) {
-                    if (reactor == main) continue;
-                    ReactorInstance reactorInstance = new ReactorInstance(reactor, new SynthesisErrorReporter());
-                    reactorNodes.addAll(createReactorNode(reactorInstance, main == null,
-                            HashBasedTable.<ReactorInstance, PortInstance, KPort>create(),
-                            HashBasedTable.<ReactorInstance, PortInstance, KPort>create(),
-                            new HashMap<>()));
-                }
-                if (!reactorNodes.isEmpty()) {
-                    // To allow ordering, we need box layout but we also need layered layout for ports thus wrap all node
-                    reactorNodes.add(0, IterableExtensions.head(rootNode.getChildren()));
-
-                    int index = 0;
-                    for (KNode node : reactorNodes) {
-                        // Element could be null if there is no main reactor and Show All Reactors is checked.
-                        if (node == null) continue;
-                        if (node.getProperty(CoreOptions.COMMENT_BOX)) continue;
-                        KNode child = _kNodeExtensions.createNode();
-                        child.getChildren().add(node);
-                        // Add comment nodes
-                        for (KEdge edge : node.getIncomingEdges()) {
-                            if (!edge.getSource().getProperty(CoreOptions.COMMENT_BOX)) continue;
-                            child.getChildren().add(edge.getSource());
-                        }
-                        _kRenderingExtensions.addInvisibleContainerRendering(child);
-                        setLayoutOption(child, CoreOptions.ALGORITHM, LayeredOptions.ALGORITHM_ID);
-                        setLayoutOption(child, CoreOptions.DIRECTION, Direction.RIGHT);
-                        setLayoutOption(child, CoreOptions.PADDING, new ElkPadding(0));
-                        // Legacy ordering option.
-                        setLayoutOption(child, CoreOptions.PRIORITY, reactorNodes.size() - index); // Order!
-                        rootNode.getChildren().add(child);
-                        index++;
-                    }
-
-                    setLayoutOption(rootNode, CoreOptions.ALGORITHM, BoxLayouterOptions.ALGORITHM_ID);
-                    setLayoutOption(rootNode, CoreOptions.SPACING_NODE_NODE, 25.0);
-                }
+  @Inject @Extension private KNodeExtensions _kNodeExtensions;
+  @Inject @Extension private KEdgeExtensions _kEdgeExtensions;
+  @Inject @Extension private KPortExtensions _kPortExtensions;
+  @Inject @Extension private KLabelExtensions _kLabelExtensions;
+  @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
+  @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
+  @Inject @Extension private KPolylineExtensions _kPolylineExtensions;
+  @Inject @Extension private LinguaFrancaStyleExtensions _linguaFrancaStyleExtensions;
+  @Inject @Extension private LinguaFrancaShapeExtensions _linguaFrancaShapeExtensions;
+  @Inject @Extension private UtilityExtensions _utilityExtensions;
+  @Inject @Extension private CycleVisualization _cycleVisualization;
+  @Inject @Extension private InterfaceDependenciesVisualization _interfaceDependenciesVisualization;
+  @Inject @Extension private FilterCycleAction _filterCycleAction;
+  @Inject @Extension private ReactorIcons _reactorIcons;
+  @Inject @Extension private ModeDiagrams _modeDiagrams;
+  @Inject @Extension private LayoutPostProcessing _layoutPostProcessing;
+
+  // -------------------------------------------------------------------------
+
+  public static final String ID = "org.lflang.diagram.synthesis.LinguaFrancaSynthesis";
+
+  // -- INTERNAL --
+  public static final Property<Boolean> REACTOR_RECURSIVE_INSTANTIATION =
+      new Property<>(
+          "org.lflang.linguafranca.diagram.synthesis.reactor.recursive.instantiation", false);
+  public static final Property<Boolean> REACTOR_HAS_BANK_PORT_OFFSET =
+      new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.bank.offset", false);
+  public static final Property<Boolean> REACTOR_INPUT =
+      new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.input", false);
+  public static final Property<Boolean> REACTOR_OUTPUT =
+      new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.output", false);
+  public static final Property<Boolean> REACTION_SPECIAL_TRIGGER =
+      new Property<>("org.lflang.linguafranca.diagram.synthesis.reaction.special.trigger", false);
+
+  // -- STYLE --
+  public static final List<Float> ALTERNATIVE_DASH_PATTERN = List.of(3.0f);
+
+  // -- TEXT --
+  public static final String TEXT_ERROR_RECURSIVE = "Recursive reactor instantiation!";
+  public static final String TEXT_ERROR_CONTAINS_RECURSION =
+      "Reactor contains recursive instantiation!";
+  public static final String TEXT_ERROR_CONTAINS_CYCLE = "Reactor contains cyclic dependencies!";
+  public static final String TEXT_ERROR_CYCLE_DETECTION =
+      "Dependency cycle detection failed.\n"
+          + "Could not detect dependency cycles due to unexpected graph structure.";
+  public static final String TEXT_ERROR_CYCLE_BTN_SHOW = "Show Cycle";
+  public static final String TEXT_ERROR_CYCLE_BTN_FILTER = "Filter Cycle";
+  public static final String TEXT_ERROR_CYCLE_BTN_UNFILTER = "Remove Cycle Filter";
+  public static final String TEXT_NO_MAIN_REACTOR = "No Main Reactor";
+  public static final String TEXT_REACTOR_NULL = "Reactor is null";
+  public static final String TEXT_HIDE_ACTION = "[Hide]";
+  public static final String TEXT_SHOW_ACTION = "[Details]";
+
+  // -------------------------------------------------------------------------
+
+  /** Synthesis category */
+  public static final SynthesisOption APPEARANCE =
+      SynthesisOption.createCategory("Appearance", true);
+
+  public static final SynthesisOption EXPERIMENTAL =
+      SynthesisOption.createCategory("Experimental", true);
+  public static final SynthesisOption LAYOUT =
+      SynthesisOption.createCategory("Layout", false).setCategory(LinguaFrancaSynthesis.APPEARANCE);
+
+  /** Synthesis options */
+  public static final SynthesisOption SHOW_ALL_REACTORS =
+      SynthesisOption.createCheckOption("All Reactors", false);
+
+  public static final SynthesisOption CYCLE_DETECTION =
+      SynthesisOption.createCheckOption("Dependency Cycle Detection", true);
+
+  public static final SynthesisOption SHOW_USER_LABELS =
+      SynthesisOption.createCheckOption("User Labels (@label in JavaDoc)", true)
+          .setCategory(APPEARANCE);
+  public static final SynthesisOption SHOW_HYPERLINKS =
+      SynthesisOption.createCheckOption("Expand/Collapse Hyperlinks", false)
+          .setCategory(APPEARANCE);
+  public static final SynthesisOption REACTIONS_USE_HYPEREDGES =
+      SynthesisOption.createCheckOption("Bundled Dependencies", false).setCategory(APPEARANCE);
+  public static final SynthesisOption USE_ALTERNATIVE_DASH_PATTERN =
+      SynthesisOption.createCheckOption("Alternative Dependency Line Style", false)
+          .setCategory(APPEARANCE);
+  public static final SynthesisOption SHOW_PORT_NAMES =
+      SynthesisOption.createCheckOption("Port names", true).setCategory(APPEARANCE);
+  public static final SynthesisOption SHOW_MULTIPORT_WIDTH =
+      SynthesisOption.createCheckOption("Multiport Widths", false).setCategory(APPEARANCE);
+  public static final SynthesisOption SHOW_REACTION_CODE =
+      SynthesisOption.createCheckOption("Reaction Code", false).setCategory(APPEARANCE);
+  public static final SynthesisOption SHOW_REACTION_LEVEL =
+      SynthesisOption.createCheckOption("Reaction Level", false).setCategory(APPEARANCE);
+  public static final SynthesisOption SHOW_REACTION_ORDER_EDGES =
+      SynthesisOption.createCheckOption("Reaction Order Edges", false).setCategory(APPEARANCE);
+  public static final SynthesisOption SHOW_REACTOR_HOST =
+      SynthesisOption.createCheckOption("Reactor Host Addresses", true).setCategory(APPEARANCE);
+  public static final SynthesisOption SHOW_INSTANCE_NAMES =
+      SynthesisOption.createCheckOption("Reactor Instance Names", false).setCategory(APPEARANCE);
+  public static final SynthesisOption REACTOR_PARAMETER_MODE =
+      SynthesisOption.createChoiceOption(
+              "Reactor Parameters",
+              ((List<?>) Conversions.doWrapArray(ReactorParameterDisplayModes.values())),
+              ReactorParameterDisplayModes.NONE)
+          .setCategory(APPEARANCE);
+  public static final SynthesisOption SHOW_STATE_VARIABLES =
+      SynthesisOption.createCheckOption("Reactor State Variables", false).setCategory(APPEARANCE);
+  public static final SynthesisOption REACTOR_BODY_TABLE_COLS =
+      SynthesisOption.<Integer>createRangeOption("Reactor Parameter/Variable Columns", 1, 10, 1)
+          .setCategory(APPEARANCE);
+
+  public static final SynthesisOption SPACING =
+      SynthesisOption.<Integer>createRangeOption("Spacing (%)", 0, 150, 5, 75).setCategory(LAYOUT);
+
+  /** Synthesis actions */
+  public static final DisplayedActionData COLLAPSE_ALL =
+      DisplayedActionData.create(CollapseAllReactorsAction.ID, "Hide all Details");
+
+  public static final DisplayedActionData EXPAND_ALL =
+      DisplayedActionData.create(ExpandAllReactorsAction.ID, "Show all Details");
+
+  @Override
+  public List<SynthesisOption> getDisplayedSynthesisOptions() {
+    return List.of(
+        SHOW_ALL_REACTORS,
+        MemorizingExpandCollapseAction.MEMORIZE_EXPANSION_STATES,
+        CYCLE_DETECTION,
+        APPEARANCE,
+        ModeDiagrams.MODES_CATEGORY,
+        ModeDiagrams.SHOW_TRANSITION_LABELS,
+        ModeDiagrams.INITIALLY_COLLAPSE_MODES,
+        SHOW_USER_LABELS,
+        SHOW_HYPERLINKS,
+        // LinguaFrancaSynthesisInterfaceDependencies.SHOW_INTERFACE_DEPENDENCIES,
+        REACTIONS_USE_HYPEREDGES,
+        USE_ALTERNATIVE_DASH_PATTERN,
+        SHOW_PORT_NAMES,
+        SHOW_MULTIPORT_WIDTH,
+        SHOW_REACTION_CODE,
+        SHOW_REACTION_LEVEL,
+        SHOW_REACTION_ORDER_EDGES,
+        SHOW_REACTOR_HOST,
+        SHOW_INSTANCE_NAMES,
+        REACTOR_PARAMETER_MODE,
+        SHOW_STATE_VARIABLES,
+        REACTOR_BODY_TABLE_COLS,
+        LAYOUT,
+        LayoutPostProcessing.MODEL_ORDER,
+        SPACING);
+  }
+
+  @Override
+  public List<DisplayedActionData> getDisplayedActions() {
+    return List.of(COLLAPSE_ALL, EXPAND_ALL);
+  }
+
+  // -------------------------------------------------------------------------
+
+  @Override
+  public KNode transform(final Model model) {
+    KNode rootNode = _kNodeExtensions.createNode();
+    setLayoutOption(rootNode, CoreOptions.ALGORITHM, LayeredOptions.ALGORITHM_ID);
+    setLayoutOption(rootNode, CoreOptions.DIRECTION, Direction.RIGHT);
+    setLayoutOption(rootNode, CoreOptions.PADDING, new ElkPadding(0));
+
+    try {
+      // Find main
+      Reactor main =
+          IterableExtensions.findFirst(model.getReactors(), _utilityExtensions::isMainOrFederated);
+      if (main != null) {
+        ReactorInstance reactorInstance = new ReactorInstance(main, new SynthesisErrorReporter());
+        rootNode
+            .getChildren()
+            .addAll(createReactorNode(reactorInstance, true, null, null, new HashMap<>()));
+      } else if (!getBooleanValue(SHOW_ALL_REACTORS)) {
+        KNode messageNode = _kNodeExtensions.createNode();
+        _linguaFrancaShapeExtensions.addErrorMessage(messageNode, TEXT_NO_MAIN_REACTOR, null);
+        rootNode.getChildren().add(messageNode);
+      }
+
+      // Show all reactors
+      if (main == null || getBooleanValue(SHOW_ALL_REACTORS)) {
+        List<KNode> reactorNodes = new ArrayList<>();
+        for (Reactor reactor : model.getReactors()) {
+          if (reactor == main) continue;
+          ReactorInstance reactorInstance =
+              new ReactorInstance(reactor, new SynthesisErrorReporter());
+          reactorNodes.addAll(
+              createReactorNode(
+                  reactorInstance,
+                  main == null,
+                  HashBasedTable.<ReactorInstance, PortInstance, KPort>create(),
+                  HashBasedTable.<ReactorInstance, PortInstance, KPort>create(),
+                  new HashMap<>()));
+        }
+        if (!reactorNodes.isEmpty()) {
+          // To allow ordering, we need box layout but we also need layered layout for ports thus
+          // wrap all node
+          reactorNodes.add(0, IterableExtensions.head(rootNode.getChildren()));
+
+          int index = 0;
+          for (KNode node : reactorNodes) {
+            // Element could be null if there is no main reactor and Show All Reactors is checked.
+            if (node == null) continue;
+            if (node.getProperty(CoreOptions.COMMENT_BOX)) continue;
+            KNode child = _kNodeExtensions.createNode();
+            child.getChildren().add(node);
+            // Add comment nodes
+            for (KEdge edge : node.getIncomingEdges()) {
+              if (!edge.getSource().getProperty(CoreOptions.COMMENT_BOX)) continue;
+              child.getChildren().add(edge.getSource());
             }
-        } catch (Exception e) {
-            e.printStackTrace();
+            _kRenderingExtensions.addInvisibleContainerRendering(child);
+            setLayoutOption(child, CoreOptions.ALGORITHM, LayeredOptions.ALGORITHM_ID);
+            setLayoutOption(child, CoreOptions.DIRECTION, Direction.RIGHT);
+            setLayoutOption(child, CoreOptions.PADDING, new ElkPadding(0));
+            // Legacy ordering option.
+            setLayoutOption(child, CoreOptions.PRIORITY, reactorNodes.size() - index); // Order!
+            rootNode.getChildren().add(child);
+            index++;
+          }
 
-            KNode messageNode = _kNodeExtensions.createNode();
-            _linguaFrancaShapeExtensions.addErrorMessage(messageNode, "Error in Diagram Synthesis",
-                    e.getClass().getSimpleName() + " occurred. Could not create diagram.");
-            rootNode.getChildren().add(messageNode);
+          setLayoutOption(rootNode, CoreOptions.ALGORITHM, BoxLayouterOptions.ALGORITHM_ID);
+          setLayoutOption(rootNode, CoreOptions.SPACING_NODE_NODE, 25.0);
         }
+      }
+    } catch (Exception e) {
+      e.printStackTrace();
+
+      KNode messageNode = _kNodeExtensions.createNode();
+      _linguaFrancaShapeExtensions.addErrorMessage(
+          messageNode,
+          "Error in Diagram Synthesis",
+          e.getClass().getSimpleName() + " occurred. Could not create diagram.");
+      rootNode.getChildren().add(messageNode);
+    }
 
-        return rootNode;
+    return rootNode;
+  }
+
+  private Collection<KNode> createReactorNode(
+      ReactorInstance reactorInstance,
+      boolean expandDefault,
+      Table<ReactorInstance, PortInstance, KPort> inputPortsReg,
+      Table<ReactorInstance, PortInstance, KPort> outputPortsReg,
+      Map<ReactorInstance, KNode> allReactorNodes) {
+    Reactor reactor = reactorInstance.reactorDefinition;
+    KNode node = _kNodeExtensions.createNode();
+    allReactorNodes.put(reactorInstance, node);
+    associateWith(node, reactor);
+    _utilityExtensions.setID(node, reactorInstance.uniqueID());
+    // save to distinguish nodes associated with the same reactor
+    NamedInstanceUtil.linkInstance(node, reactorInstance);
+
+    List<KNode> nodes = new ArrayList<>();
+    nodes.add(node);
+    String label = createReactorLabel(reactorInstance);
+
+    if (reactorInstance.recursive) {
+      // Mark this node
+      node.setProperty(REACTOR_RECURSIVE_INSTANTIATION, true);
+      // Mark root
+      allReactorNodes
+          .get(reactorInstance.root())
+          .setProperty(REACTOR_RECURSIVE_INSTANTIATION, true);
     }
 
-    private Collection<KNode> createReactorNode(
-        ReactorInstance reactorInstance,
-        boolean expandDefault,
-        Table<ReactorInstance, PortInstance, KPort> inputPortsReg,
-        Table<ReactorInstance, PortInstance, KPort> outputPortsReg,
-        Map<ReactorInstance, KNode> allReactorNodes
-    ) {
-        Reactor reactor = reactorInstance.reactorDefinition;
-        KNode node = _kNodeExtensions.createNode();
-        allReactorNodes.put(reactorInstance, node);
-        associateWith(node, reactor);
-        _utilityExtensions.setID(node, reactorInstance.uniqueID());
-        // save to distinguish nodes associated with the same reactor
-        NamedInstanceUtil.linkInstance(node, reactorInstance);
-
-        List<KNode> nodes = new ArrayList<>();
-        nodes.add(node);
-        String label = createReactorLabel(reactorInstance);
-
-        if (reactorInstance.recursive) {
-            // Mark this node
-            node.setProperty(REACTOR_RECURSIVE_INSTANTIATION, true);
-            // Mark root
-            allReactorNodes.get(reactorInstance.root()).setProperty(REACTOR_RECURSIVE_INSTANTIATION, true);
+    if (reactor == null) {
+      _linguaFrancaShapeExtensions.addErrorMessage(node, TEXT_REACTOR_NULL, null);
+    } else if (reactorInstance.isMainOrFederated()) {
+      KRoundedRectangle figure =
+          _linguaFrancaShapeExtensions.addMainReactorFigure(node, reactorInstance, label);
+
+      if (getObjectValue(REACTOR_PARAMETER_MODE) == ReactorParameterDisplayModes.TABLE
+          && !reactorInstance.parameters.isEmpty()) {
+        KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(figure);
+        _kRenderingExtensions.setInvisible(rectangle, true);
+        _kRenderingExtensions.to(
+            _kRenderingExtensions.from(
+                _kRenderingExtensions.setGridPlacementData(rectangle),
+                _kRenderingExtensions.LEFT,
+                6,
+                0,
+                _kRenderingExtensions.TOP,
+                0,
+                0),
+            _kRenderingExtensions.RIGHT,
+            6,
+            0,
+            _kRenderingExtensions.BOTTOM,
+            4,
+            0);
+        _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
+        addParameterList(rectangle, reactorInstance.parameters);
+      }
+
+      if (getBooleanValue(SHOW_STATE_VARIABLES)) {
+        var variables =
+            ASTUtils.<StateVar>collectElements(
+                reactor, LfPackage.eINSTANCE.getReactor_StateVars(), true, false);
+        if (!variables.isEmpty()) {
+          KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(figure);
+          _kRenderingExtensions.setInvisible(rectangle, true);
+          _kRenderingExtensions.to(
+              _kRenderingExtensions.from(
+                  _kRenderingExtensions.setGridPlacementData(rectangle),
+                  _kRenderingExtensions.LEFT,
+                  6,
+                  0,
+                  _kRenderingExtensions.TOP,
+                  0,
+                  0),
+              _kRenderingExtensions.RIGHT,
+              6,
+              0,
+              _kRenderingExtensions.BOTTOM,
+              4,
+              0);
+          _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
+          addStateVariableList(rectangle, variables);
         }
-
-        if (reactor == null) {
-            _linguaFrancaShapeExtensions.addErrorMessage(node, TEXT_REACTOR_NULL, null);
-        } else if (reactorInstance.isMainOrFederated()) {
-            KRoundedRectangle figure = _linguaFrancaShapeExtensions.addMainReactorFigure(node, reactorInstance, label);
-
-            if (getObjectValue(REACTOR_PARAMETER_MODE) == ReactorParameterDisplayModes.TABLE
-                && !reactorInstance.parameters.isEmpty()
-            ) {
-                KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(figure);
-                _kRenderingExtensions.setInvisible(rectangle, true);
-                _kRenderingExtensions.to(
-                        _kRenderingExtensions.from(
-                                _kRenderingExtensions.setGridPlacementData(rectangle),
-                                _kRenderingExtensions.LEFT, 6, 0,
-                                _kRenderingExtensions.TOP, 0, 0),
-                        _kRenderingExtensions.RIGHT, 6, 0,
-                        _kRenderingExtensions.BOTTOM, 4, 0);
-                _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
-                addParameterList(rectangle, reactorInstance.parameters);
-            }
-
-            if (getBooleanValue(SHOW_STATE_VARIABLES)) {
-                var variables = ASTUtils.<StateVar>collectElements(reactor, LfPackage.eINSTANCE.getReactor_StateVars(), true, false);
-                if (!variables.isEmpty()) {
-                    KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(figure);
-                    _kRenderingExtensions.setInvisible(rectangle, true);
-                    _kRenderingExtensions.to(
-                            _kRenderingExtensions.from(
-                                    _kRenderingExtensions.setGridPlacementData(rectangle),
-                                    _kRenderingExtensions.LEFT, 6, 0,
-                                    _kRenderingExtensions.TOP, 0, 0),
-                            _kRenderingExtensions.RIGHT, 6, 0,
-                            _kRenderingExtensions.BOTTOM, 4, 0);
-                    _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
-                    addStateVariableList(rectangle, variables);
-                }
-            }
-
-            if (reactorInstance.recursive) {
-                nodes.add(addErrorComment(node, TEXT_ERROR_RECURSIVE));
-                _linguaFrancaStyleExtensions.errorStyle(figure);
-            } else {
-                _kContainerRenderingExtensions.addChildArea(figure);
-                node.getChildren().addAll(transformReactorNetwork(reactorInstance,
-                        new HashMap<>(),
-                        new HashMap<>(),
-                        allReactorNodes));
-            }
-            Iterables.addAll(nodes, createUserComments(reactor, node));
-            configureReactorNodeLayout(node, true);
-            _layoutPostProcessing.configureMainReactor(node);
+      }
+
+      if (reactorInstance.recursive) {
+        nodes.add(addErrorComment(node, TEXT_ERROR_RECURSIVE));
+        _linguaFrancaStyleExtensions.errorStyle(figure);
+      } else {
+        _kContainerRenderingExtensions.addChildArea(figure);
+        node.getChildren()
+            .addAll(
+                transformReactorNetwork(
+                    reactorInstance, new HashMap<>(), new HashMap<>(), allReactorNodes));
+      }
+      Iterables.addAll(nodes, createUserComments(reactor, node));
+      configureReactorNodeLayout(node, true);
+      _layoutPostProcessing.configureMainReactor(node);
+    } else {
+      ReactorInstance instance = reactorInstance;
+
+      // Expanded Rectangle
+      ReactorFigureComponents comps =
+          _linguaFrancaShapeExtensions.addReactorFigure(node, reactorInstance, label);
+      comps.getOuter().setProperty(KlighdProperties.EXPANDED_RENDERING, true);
+      for (KRendering figure : comps.getFigures()) {
+        associateWith(figure, reactor);
+        _kRenderingExtensions.addDoubleClickAction(figure, MemorizingExpandCollapseAction.ID);
+      }
+      _reactorIcons.handleIcon(comps.getReactor(), reactor, false);
+
+      if (getBooleanValue(SHOW_HYPERLINKS)) {
+        // Collapse button
+        KText button =
+            _linguaFrancaShapeExtensions.addTextButton(comps.getReactor(), TEXT_HIDE_ACTION);
+        _kRenderingExtensions.to(
+            _kRenderingExtensions.from(
+                _kRenderingExtensions.setGridPlacementData(button),
+                _kRenderingExtensions.LEFT,
+                8,
+                0,
+                _kRenderingExtensions.TOP,
+                0,
+                0),
+            _kRenderingExtensions.RIGHT,
+            8,
+            0,
+            _kRenderingExtensions.BOTTOM,
+            0,
+            0);
+        _kRenderingExtensions.addSingleClickAction(button, MemorizingExpandCollapseAction.ID);
+        _kRenderingExtensions.addDoubleClickAction(button, MemorizingExpandCollapseAction.ID);
+      }
+
+      if (getObjectValue(REACTOR_PARAMETER_MODE) == ReactorParameterDisplayModes.TABLE
+          && !instance.parameters.isEmpty()) {
+        KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(comps.getReactor());
+        _kRenderingExtensions.setInvisible(rectangle, true);
+        if (!getBooleanValue(SHOW_HYPERLINKS)) {
+          _kRenderingExtensions.to(
+              _kRenderingExtensions.from(
+                  _kRenderingExtensions.setGridPlacementData(rectangle),
+                  _kRenderingExtensions.LEFT,
+                  6,
+                  0,
+                  _kRenderingExtensions.TOP,
+                  0,
+                  0),
+              _kRenderingExtensions.RIGHT,
+              6,
+              0,
+              _kRenderingExtensions.BOTTOM,
+              4,
+              0);
         } else {
-            ReactorInstance instance = reactorInstance;
-
-            // Expanded Rectangle
-            ReactorFigureComponents comps = _linguaFrancaShapeExtensions.addReactorFigure(node, reactorInstance, label);
-            comps.getOuter().setProperty(KlighdProperties.EXPANDED_RENDERING, true);
-            for (KRendering figure : comps.getFigures()) {
-                associateWith(figure, reactor);
-                _kRenderingExtensions.addDoubleClickAction(figure, MemorizingExpandCollapseAction.ID);
-            }
-            _reactorIcons.handleIcon(comps.getReactor(), reactor, false);
-
-            if (getBooleanValue(SHOW_HYPERLINKS)) {
-                // Collapse button
-                KText button = _linguaFrancaShapeExtensions.addTextButton(comps.getReactor(), TEXT_HIDE_ACTION);
-                _kRenderingExtensions.to(
-                        _kRenderingExtensions.from(
-                                _kRenderingExtensions.setGridPlacementData(button),
-                                _kRenderingExtensions.LEFT, 8, 0,
-                                _kRenderingExtensions.TOP, 0, 0),
-                        _kRenderingExtensions.RIGHT, 8, 0,
-                        _kRenderingExtensions.BOTTOM, 0, 0);
-                _kRenderingExtensions.addSingleClickAction(button, MemorizingExpandCollapseAction.ID);
-                _kRenderingExtensions.addDoubleClickAction(button, MemorizingExpandCollapseAction.ID);
-            }
-
-            if (getObjectValue(REACTOR_PARAMETER_MODE) == ReactorParameterDisplayModes.TABLE
-                    && !instance.parameters.isEmpty()) {
-                KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(comps.getReactor());
-                _kRenderingExtensions.setInvisible(rectangle, true);
-                if (!getBooleanValue(SHOW_HYPERLINKS)) {
-                    _kRenderingExtensions.to(
-                            _kRenderingExtensions.from(
-                                    _kRenderingExtensions.setGridPlacementData(rectangle),
-                                    _kRenderingExtensions.LEFT, 6, 0,
-                                    _kRenderingExtensions.TOP, 0, 0),
-                            _kRenderingExtensions.RIGHT, 6, 0,
-                            _kRenderingExtensions.BOTTOM, 4, 0);
-                } else {
-                    _kRenderingExtensions.to(
-                            _kRenderingExtensions.from(
-                                    _kRenderingExtensions.setGridPlacementData(rectangle),
-                                    _kRenderingExtensions.LEFT, 6, 0,
-                                    _kRenderingExtensions.TOP, 4, 0),
-                            _kRenderingExtensions.RIGHT, 6, 0,
-                            _kRenderingExtensions.BOTTOM, 0, 0);
-                }
-                _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
-                addParameterList(rectangle, instance.parameters);
-            }
-
-            if (getBooleanValue(SHOW_STATE_VARIABLES)) {
-                var variables = ASTUtils.<StateVar>collectElements(reactor, LfPackage.eINSTANCE.getReactor_StateVars(), true, false);
-                if (!variables.isEmpty()) {
-                    KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(comps.getReactor());
-                    _kRenderingExtensions.setInvisible(rectangle, true);
-                    if (!getBooleanValue(SHOW_HYPERLINKS)) {
-                        _kRenderingExtensions.to(
-                                _kRenderingExtensions.from(
-                                        _kRenderingExtensions.setGridPlacementData(rectangle),
-                                        _kRenderingExtensions.LEFT, 6, 0,
-                                        _kRenderingExtensions.TOP, 0, 0),
-                                _kRenderingExtensions.RIGHT, 6, 0,
-                                _kRenderingExtensions.BOTTOM, 4, 0);
-                    } else {
-                        _kRenderingExtensions.to(
-                                _kRenderingExtensions.from(
-                                        _kRenderingExtensions.setGridPlacementData(rectangle),
-                                        _kRenderingExtensions.LEFT, 6, 0,
-                                        _kRenderingExtensions.TOP, 4, 0),
-                                _kRenderingExtensions.RIGHT, 6, 0,
-                                _kRenderingExtensions.BOTTOM, 0, 0);
-                    }
-                    _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
-                    addStateVariableList(rectangle, variables);
-                }
-            }
-
-            if (instance.recursive) {
-                comps.getFigures().forEach(_linguaFrancaStyleExtensions::errorStyle);
-            } else {
-                _kContainerRenderingExtensions.addChildArea(comps.getReactor());
-            }
-
-            // Collapse Rectangle
-            comps = _linguaFrancaShapeExtensions.addReactorFigure(node, reactorInstance, label);
-            comps.getOuter().setProperty(KlighdProperties.COLLAPSED_RENDERING, true);
-            for (KRendering figure : comps.getFigures()) {
-                associateWith(figure, reactor);
-                if (_utilityExtensions.hasContent(instance) && !instance.recursive) {
-                    _kRenderingExtensions.addDoubleClickAction(figure, MemorizingExpandCollapseAction.ID);
-                }
-            }
-            _reactorIcons.handleIcon(comps.getReactor(), reactor, true);
-
-            if (getBooleanValue(SHOW_HYPERLINKS)) {
-                // Expand button
-                if (_utilityExtensions.hasContent(instance) && !instance.recursive) {
-                    KText button = _linguaFrancaShapeExtensions.addTextButton(comps.getReactor(), TEXT_SHOW_ACTION);
-                    _kRenderingExtensions.to(
-                            _kRenderingExtensions.from(
-                                    _kRenderingExtensions.setGridPlacementData(button),
-                                    _kRenderingExtensions.LEFT, 8, 0,
-                                    _kRenderingExtensions.TOP, 0, 0),
-                            _kRenderingExtensions.RIGHT, 8, 0,
-                            _kRenderingExtensions.BOTTOM, 8, 0);
-                    _kRenderingExtensions.addSingleClickAction(button, MemorizingExpandCollapseAction.ID);
-                    _kRenderingExtensions.addDoubleClickAction(button, MemorizingExpandCollapseAction.ID);
-                }
-            }
-
-            if (instance.recursive) {
-                comps.getFigures().forEach(_linguaFrancaStyleExtensions::errorStyle);
-            }
-
-
-            // Create ports
-            Map<PortInstance, KPort> inputPorts = new HashMap<>();
-            Map<PortInstance, KPort> outputPorts = new HashMap<>();
-            List<PortInstance> inputs = instance.inputs;
-            if (LayoutPostProcessing.LEGACY.equals((String) getObjectValue(LayoutPostProcessing.MODEL_ORDER))) {
-                inputs = ListExtensions.reverseView(instance.inputs);
-            }
-            for (PortInstance input : inputs) {
-                inputPorts.put(input, addIOPort(node, input, true, input.isMultiport(), reactorInstance.isBank()));
-            }
-            for (PortInstance output : instance.outputs) {
-                outputPorts.put(output, addIOPort(node, output, false, output.isMultiport(), reactorInstance.isBank()));
-            }
-            // Mark ports
-            inputPorts.values().forEach(it -> it.setProperty(REACTOR_INPUT, true));
-            outputPorts.values().forEach(it -> it.setProperty(REACTOR_OUTPUT, true));
-
-            // Add content
-            if (_utilityExtensions.hasContent(instance) && !instance.recursive) {
-                node.getChildren().addAll(transformReactorNetwork(instance, inputPorts, outputPorts, allReactorNodes));
-            }
-
-            // Pass port to given tables
-            if (!_utilityExtensions.isRoot(instance)) {
-                if (inputPortsReg != null) {
-                    for (Map.Entry<PortInstance, KPort> entry : inputPorts.entrySet()) {
-                        inputPortsReg.put(instance, entry.getKey(), entry.getValue());
-                    }
-                }
-                if (outputPortsReg != null) {
-                    for (Map.Entry<PortInstance, KPort> entry : outputPorts.entrySet()) {
-                        outputPortsReg.put(instance, entry.getKey(), entry.getValue());
-                    }
-                }
-            }
-
-            if (instance.recursive) {
-                setLayoutOption(node, KlighdProperties.EXPAND, false);
-                nodes.add(addErrorComment(node, TEXT_ERROR_RECURSIVE));
-            } else {
-                setLayoutOption(node, KlighdProperties.EXPAND, expandDefault);
-
-                // Interface Dependencies
-                _interfaceDependenciesVisualization.addInterfaceDependencies(node, expandDefault);
-            }
-
-            if (!_utilityExtensions.isRoot(instance)) {
-                // If all reactors are being shown, then only put the label on
-                // the reactor definition, not on its instances. Otherwise,
-                // add the annotation now.
-                if (!getBooleanValue(SHOW_ALL_REACTORS)) {
-                    Iterables.addAll(nodes, createUserComments(reactor, node));
-                }
-            } else {
-                Iterables.addAll(nodes, createUserComments(reactor, node));
-            }
-            configureReactorNodeLayout(node, false);
-            _layoutPostProcessing.configureReactor(node);
+          _kRenderingExtensions.to(
+              _kRenderingExtensions.from(
+                  _kRenderingExtensions.setGridPlacementData(rectangle),
+                  _kRenderingExtensions.LEFT,
+                  6,
+                  0,
+                  _kRenderingExtensions.TOP,
+                  4,
+                  0),
+              _kRenderingExtensions.RIGHT,
+              6,
+              0,
+              _kRenderingExtensions.BOTTOM,
+              0,
+              0);
         }
-
-        // Find and annotate cycles
-        if (getBooleanValue(CYCLE_DETECTION) &&
-                _utilityExtensions.isRoot(reactorInstance)) {
-            KNode errNode = detectAndAnnotateCycles(node, reactorInstance, allReactorNodes);
-            if (errNode != null) {
-                nodes.add(errNode);
-            }
+        _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
+        addParameterList(rectangle, instance.parameters);
+      }
+
+      if (getBooleanValue(SHOW_STATE_VARIABLES)) {
+        var variables =
+            ASTUtils.<StateVar>collectElements(
+                reactor, LfPackage.eINSTANCE.getReactor_StateVars(), true, false);
+        if (!variables.isEmpty()) {
+          KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(comps.getReactor());
+          _kRenderingExtensions.setInvisible(rectangle, true);
+          if (!getBooleanValue(SHOW_HYPERLINKS)) {
+            _kRenderingExtensions.to(
+                _kRenderingExtensions.from(
+                    _kRenderingExtensions.setGridPlacementData(rectangle),
+                    _kRenderingExtensions.LEFT,
+                    6,
+                    0,
+                    _kRenderingExtensions.TOP,
+                    0,
+                    0),
+                _kRenderingExtensions.RIGHT,
+                6,
+                0,
+                _kRenderingExtensions.BOTTOM,
+                4,
+                0);
+          } else {
+            _kRenderingExtensions.to(
+                _kRenderingExtensions.from(
+                    _kRenderingExtensions.setGridPlacementData(rectangle),
+                    _kRenderingExtensions.LEFT,
+                    6,
+                    0,
+                    _kRenderingExtensions.TOP,
+                    4,
+                    0),
+                _kRenderingExtensions.RIGHT,
+                6,
+                0,
+                _kRenderingExtensions.BOTTOM,
+                0,
+                0);
+          }
+          _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
+          addStateVariableList(rectangle, variables);
         }
-
-        return nodes;
-    }
-
-    public KNode configureReactorNodeLayout(KNode node, boolean main) {
-        // Set layered algorithm
-        setLayoutOption(node, CoreOptions.ALGORITHM, LayeredOptions.ALGORITHM_ID);
-        // Left to right layout
-        setLayoutOption(node, CoreOptions.DIRECTION, Direction.RIGHT);
-        // Center free floating children
-        setLayoutOption(node, CoreOptions.CONTENT_ALIGNMENT, ContentAlignment.centerCenter());
-
-        // Balanced placement with straight long edges.
-        setLayoutOption(node, LayeredOptions.NODE_PLACEMENT_STRATEGY, NodePlacementStrategy.NETWORK_SIMPLEX);
-        // Do not shrink nodes below content
-        setLayoutOption(node, CoreOptions.NODE_SIZE_CONSTRAINTS, EnumSet.of(SizeConstraint.MINIMUM_SIZE, SizeConstraint.PORTS));
-
-        // Allows to freely shuffle ports on each side
-        setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FIXED_SIDE);
-        // Adjust port label spacing to be closer to edge but not overlap with port figure
-        // TODO: Add PortLabelPlacement.NEXT_TO_PORT_IF_POSSIBLE back into the configuration, as soon as ELK provides a fix for LF issue #1273
-        setLayoutOption(node, CoreOptions.PORT_LABELS_PLACEMENT, EnumSet.of(PortLabelPlacement.ALWAYS_OTHER_SAME_SIDE, PortLabelPlacement.OUTSIDE));
-        setLayoutOption(node, CoreOptions.SPACING_LABEL_PORT_HORIZONTAL, 2.0);
-        setLayoutOption(node, CoreOptions.SPACING_LABEL_PORT_VERTICAL, -3.0);
-
-        // Configure spacing
-        if (!getBooleanValue(SHOW_HYPERLINKS)) { // Hyperlink version is more relaxed in terms of space
-            var factor = (double) getIntValue(SPACING) / 100;
-
-            setLayoutOption(node, LayeredOptions.SPACING_COMPONENT_COMPONENT, LayeredOptions.SPACING_COMPONENT_COMPONENT.getDefault() * factor);
-
-            setLayoutOption(node, LayeredOptions.SPACING_NODE_NODE, LayeredOptions.SPACING_NODE_NODE.getDefault() * factor);
-            setLayoutOption(node, LayeredOptions.SPACING_NODE_NODE_BETWEEN_LAYERS, LayeredOptions.SPACING_NODE_NODE_BETWEEN_LAYERS.getDefault() * factor);
-
-            setLayoutOption(node, LayeredOptions.SPACING_PORT_PORT, LayeredOptions.SPACING_PORT_PORT.getDefault() * factor);
-
-            setLayoutOption(node, LayeredOptions.SPACING_EDGE_NODE, LayeredOptions.SPACING_EDGE_NODE.getDefault() * factor);
-            setLayoutOption(node, LayeredOptions.SPACING_EDGE_NODE_BETWEEN_LAYERS, LayeredOptions.SPACING_EDGE_NODE_BETWEEN_LAYERS.getDefault() * factor);
-            setLayoutOption(node, LayeredOptions.SPACING_EDGE_EDGE, LayeredOptions.SPACING_EDGE_EDGE.getDefault() * factor);
-            setLayoutOption(node, LayeredOptions.SPACING_EDGE_EDGE_BETWEEN_LAYERS, LayeredOptions.SPACING_EDGE_EDGE_BETWEEN_LAYERS.getDefault() * factor);
-            setLayoutOption(node, LayeredOptions.SPACING_EDGE_EDGE, LayeredOptions.SPACING_EDGE_EDGE.getDefault() * factor);
-            setLayoutOption(node, LayeredOptions.SPACING_EDGE_EDGE_BETWEEN_LAYERS, LayeredOptions.SPACING_EDGE_EDGE_BETWEEN_LAYERS.getDefault() * factor);
-            setLayoutOption(node, LayeredOptions.SPACING_EDGE_LABEL, LayeredOptions.SPACING_EDGE_LABEL.getDefault() * factor);
-
-            // Padding for sub graph
-            if (main) { // Special handing for main reactors
-                setLayoutOption(node, CoreOptions.PADDING, new ElkPadding(-1, 6, 6, 6));
-            } else {
-                setLayoutOption(node, CoreOptions.PADDING, new ElkPadding(2, 6, 6, 6));
-            }
+      }
+
+      if (instance.recursive) {
+        comps.getFigures().forEach(_linguaFrancaStyleExtensions::errorStyle);
+      } else {
+        _kContainerRenderingExtensions.addChildArea(comps.getReactor());
+      }
+
+      // Collapse Rectangle
+      comps = _linguaFrancaShapeExtensions.addReactorFigure(node, reactorInstance, label);
+      comps.getOuter().setProperty(KlighdProperties.COLLAPSED_RENDERING, true);
+      for (KRendering figure : comps.getFigures()) {
+        associateWith(figure, reactor);
+        if (_utilityExtensions.hasContent(instance) && !instance.recursive) {
+          _kRenderingExtensions.addDoubleClickAction(figure, MemorizingExpandCollapseAction.ID);
         }
-
-        return node;
-    }
-
-    private KNode detectAndAnnotateCycles(KNode node, ReactorInstance reactorInstance, Map<ReactorInstance, KNode> allReactorNodes) {
-        if (node.getProperty(REACTOR_RECURSIVE_INSTANTIATION)) {
-            _filterCycleAction.resetCycleFiltering(node);
-            return addErrorComment(node, TEXT_ERROR_CONTAINS_RECURSION);
-        } else { // only detect dependency cycles if not recursive
-            try {
-                boolean hasCycle = _cycleVisualization.detectAndHighlightCycles(reactorInstance,
-                        allReactorNodes, it -> {
-                            if (it instanceof KNode) {
-                                List<KRendering> renderings = IterableExtensions.toList(
-                                        Iterables.filter(((KNode) it).getData(), KRendering.class));
-                                if (renderings.size() == 1) {
-                                     _linguaFrancaStyleExtensions.errorStyle(IterableExtensions.head(renderings));
-                                } else {
-                                    IterableExtensions.filter(renderings, rendering -> {
-                                        return rendering.getProperty(KlighdProperties.COLLAPSED_RENDERING);
-                                    }).forEach(_linguaFrancaStyleExtensions::errorStyle);
-                                }
-                            } else if (it instanceof KEdge) {
-                                Iterables.filter(((KEdge) it).getData(),
-                                        KRendering.class).forEach(_linguaFrancaStyleExtensions::errorStyle);
-                                // TODO initiallyHide does not work with incremental (https://github.com/kieler/KLighD/issues/37)
-                                // cycleEgde.initiallyShow() // Show hidden order dependencies
-                                _kRenderingExtensions.setInvisible(_kRenderingExtensions.getKRendering(it), false);
-                            } else if (it instanceof KPort) {
-                                Iterables.filter(((KPort) it).getData(),
-                                        KRendering.class).forEach(_linguaFrancaStyleExtensions::errorStyle);
-                                //it.reverseTrianglePort()
-                            }
-                        });
-
-                if (hasCycle) {
-                    KNode err = addErrorComment(node, TEXT_ERROR_CONTAINS_CYCLE);
-
-                    // Add to existing figure
-                    KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(_kRenderingExtensions.getKContainerRendering(err));
-                    _kRenderingExtensions.to(
-                            _kRenderingExtensions.from(
-                                    _kRenderingExtensions.setGridPlacementData(rectangle),
-                                    _kRenderingExtensions.LEFT, 3, 0,
-                                    _kRenderingExtensions.TOP, (-1), 0),
-                            _kRenderingExtensions.RIGHT, 3, 0,
-                            _kRenderingExtensions.BOTTOM, 3, 0);
-                    _linguaFrancaStyleExtensions.noSelectionStyle(rectangle);
-                    _kRenderingExtensions.setInvisible(rectangle, true);
-                    _kContainerRenderingExtensions.setGridPlacement(rectangle, 2);
-
-                    KRectangle subrectangle = _kContainerRenderingExtensions.addRectangle(rectangle);
-                    _kRenderingExtensions.to(
-                            _kRenderingExtensions.from(
-                                    _kRenderingExtensions.setGridPlacementData(subrectangle),
-                                    _kRenderingExtensions.LEFT, 0, 0,
-                                    _kRenderingExtensions.TOP, 0, 0),
-                            _kRenderingExtensions.RIGHT, 2, 0,
-                            _kRenderingExtensions.BOTTOM, 0, 0);
-                    _linguaFrancaStyleExtensions.noSelectionStyle(subrectangle);
-                    _kRenderingExtensions.addSingleClickAction(subrectangle, ShowCycleAction.ID);
-
-                    KText subrectangleText = _kContainerRenderingExtensions.addText(subrectangle, TEXT_ERROR_CYCLE_BTN_SHOW);
-                    // Copy text style
-                    List<KStyle> styles = ListExtensions.map(
-                            IterableExtensions.head(
-                                    _kRenderingExtensions.getKContainerRendering(err).getChildren()).getStyles(),
-                            EcoreUtil::copy);
-                    subrectangleText.getStyles().addAll(styles);
-                    _kRenderingExtensions.setFontSize(subrectangleText, 5);
-                    _kRenderingExtensions.setSurroundingSpace(subrectangleText, 1, 0);
-                    _linguaFrancaStyleExtensions.noSelectionStyle(subrectangleText);
-                    _kRenderingExtensions.addSingleClickAction(subrectangleText, ShowCycleAction.ID);
-
-                    subrectangle = _kContainerRenderingExtensions.addRectangle(rectangle);
-                    _kRenderingExtensions.to(
-                            _kRenderingExtensions.from(
-                                    _kRenderingExtensions.setGridPlacementData(subrectangle),
-                                    _kRenderingExtensions.LEFT, 0, 0,
-                                    _kRenderingExtensions.TOP, 0, 0),
-                            _kRenderingExtensions.RIGHT, 0, 0,
-                            _kRenderingExtensions.BOTTOM, 0, 0);
-                    _linguaFrancaStyleExtensions.noSelectionStyle(subrectangle);
-                    _kRenderingExtensions.addSingleClickAction(subrectangle, FilterCycleAction.ID);
-
-                    subrectangleText = _kContainerRenderingExtensions.addText(subrectangle,
-                            _filterCycleAction.isCycleFiltered(node) ?
-                                    TEXT_ERROR_CYCLE_BTN_UNFILTER : TEXT_ERROR_CYCLE_BTN_FILTER);
-                    // Copy text style
-                    styles = ListExtensions.map(
-                            IterableExtensions.head(
-                                    _kRenderingExtensions.getKContainerRendering(err).getChildren()).getStyles(),
-                            EcoreUtil::copy);
-                    subrectangleText.getStyles().addAll(styles);
-                    _kRenderingExtensions.setFontSize(subrectangleText, 5);
-                    _kRenderingExtensions.setSurroundingSpace(subrectangleText, 1, 0);
-                    _linguaFrancaStyleExtensions.noSelectionStyle(subrectangleText);
-                    _kRenderingExtensions.addSingleClickAction(subrectangleText, FilterCycleAction.ID);
-                    _filterCycleAction.markCycleFilterText(subrectangleText, err);
-
-                    // if user interactively requested a filtered diagram keep it filtered during updates
-                    if (_filterCycleAction.isCycleFiltered(node)) {
-                        _filterCycleAction.filterCycle(node);
-                    }
-                    return err;
-                }
-            } catch(Exception e) {
-                _filterCycleAction.resetCycleFiltering(node);
-                e.printStackTrace();
-                return addErrorComment(node, TEXT_ERROR_CYCLE_DETECTION);
-            }
+      }
+      _reactorIcons.handleIcon(comps.getReactor(), reactor, true);
+
+      if (getBooleanValue(SHOW_HYPERLINKS)) {
+        // Expand button
+        if (_utilityExtensions.hasContent(instance) && !instance.recursive) {
+          KText button =
+              _linguaFrancaShapeExtensions.addTextButton(comps.getReactor(), TEXT_SHOW_ACTION);
+          _kRenderingExtensions.to(
+              _kRenderingExtensions.from(
+                  _kRenderingExtensions.setGridPlacementData(button),
+                  _kRenderingExtensions.LEFT,
+                  8,
+                  0,
+                  _kRenderingExtensions.TOP,
+                  0,
+                  0),
+              _kRenderingExtensions.RIGHT,
+              8,
+              0,
+              _kRenderingExtensions.BOTTOM,
+              8,
+              0);
+          _kRenderingExtensions.addSingleClickAction(button, MemorizingExpandCollapseAction.ID);
+          _kRenderingExtensions.addDoubleClickAction(button, MemorizingExpandCollapseAction.ID);
         }
-        return null;
-    }
-
-    private Collection<KNode> transformReactorNetwork(
-        ReactorInstance reactorInstance,
-        Map<PortInstance, KPort> parentInputPorts,
-        Map<PortInstance, KPort> parentOutputPorts,
-        Map<ReactorInstance, KNode> allReactorNodes
-    ) {
-        List<KNode> nodes = new ArrayList<>();
-        Table<ReactorInstance, PortInstance, KPort> inputPorts = HashBasedTable.create();
-        Table<ReactorInstance, PortInstance, KPort> outputPorts = HashBasedTable.create();
-        Map<ReactionInstance, KNode> reactionNodes = new HashMap<>();
-        Map<KPort, KNode> directConnectionDummyNodes = new HashMap<>();
-        Multimap<ActionInstance, KPort> actionDestinations = HashMultimap.create();
-        Multimap<ActionInstance, KPort> actionSources = HashMultimap.create();
-        Map<TimerInstance, KNode> timerNodes = new HashMap<>();
-        KNode startupNode = _kNodeExtensions.createNode();
-        TriggerInstance<?> startup = null;
-        KNode shutdownNode = _kNodeExtensions.createNode();
-        TriggerInstance<?> shutdown = null;
-        KNode resetNode = _kNodeExtensions.createNode();
-        TriggerInstance<?> reset = null;
-
-        // Transform instances
-        int index = 0;
-        for (ReactorInstance child : reactorInstance.children) {
-            Boolean expansionState = MemorizingExpandCollapseAction.getExpansionState(child);
-            Collection<KNode> rNodes = createReactorNode(
-                    child,
-                    expansionState != null ? expansionState : false,
-                    inputPorts,
-                    outputPorts,
-                    allReactorNodes);
-            nodes.addAll(rNodes);
-            index++;
+      }
+
+      if (instance.recursive) {
+        comps.getFigures().forEach(_linguaFrancaStyleExtensions::errorStyle);
+      }
+
+      // Create ports
+      Map<PortInstance, KPort> inputPorts = new HashMap<>();
+      Map<PortInstance, KPort> outputPorts = new HashMap<>();
+      List<PortInstance> inputs = instance.inputs;
+      if (LayoutPostProcessing.LEGACY.equals(
+          (String) getObjectValue(LayoutPostProcessing.MODEL_ORDER))) {
+        inputs = ListExtensions.reverseView(instance.inputs);
+      }
+      for (PortInstance input : inputs) {
+        inputPorts.put(
+            input, addIOPort(node, input, true, input.isMultiport(), reactorInstance.isBank()));
+      }
+      for (PortInstance output : instance.outputs) {
+        outputPorts.put(
+            output, addIOPort(node, output, false, output.isMultiport(), reactorInstance.isBank()));
+      }
+      // Mark ports
+      inputPorts.values().forEach(it -> it.setProperty(REACTOR_INPUT, true));
+      outputPorts.values().forEach(it -> it.setProperty(REACTOR_OUTPUT, true));
+
+      // Add content
+      if (_utilityExtensions.hasContent(instance) && !instance.recursive) {
+        node.getChildren()
+            .addAll(transformReactorNetwork(instance, inputPorts, outputPorts, allReactorNodes));
+      }
+
+      // Pass port to given tables
+      if (!_utilityExtensions.isRoot(instance)) {
+        if (inputPortsReg != null) {
+          for (Map.Entry<PortInstance, KPort> entry : inputPorts.entrySet()) {
+            inputPortsReg.put(instance, entry.getKey(), entry.getValue());
+          }
         }
-
-        // Create timers
-        for (TimerInstance timer : reactorInstance.timers) {
-            KNode node = associateWith(_kNodeExtensions.createNode(), timer.getDefinition());
-            NamedInstanceUtil.linkInstance(node, timer);
-            _utilityExtensions.setID(node, timer.uniqueID());
-            nodes.add(node);
-            Iterables.addAll(nodes, createUserComments(timer.getDefinition(), node));
-            timerNodes.put(timer, node);
-            _linguaFrancaShapeExtensions.addTimerFigure(node, timer);
-            _layoutPostProcessing.configureTimer(node);
+        if (outputPortsReg != null) {
+          for (Map.Entry<PortInstance, KPort> entry : outputPorts.entrySet()) {
+            outputPortsReg.put(instance, entry.getKey(), entry.getValue());
+          }
         }
+      }
+
+      if (instance.recursive) {
+        setLayoutOption(node, KlighdProperties.EXPAND, false);
+        nodes.add(addErrorComment(node, TEXT_ERROR_RECURSIVE));
+      } else {
+        setLayoutOption(node, KlighdProperties.EXPAND, expandDefault);
+
+        // Interface Dependencies
+        _interfaceDependenciesVisualization.addInterfaceDependencies(node, expandDefault);
+      }
+
+      if (!_utilityExtensions.isRoot(instance)) {
+        // If all reactors are being shown, then only put the label on
+        // the reactor definition, not on its instances. Otherwise,
+        // add the annotation now.
+        if (!getBooleanValue(SHOW_ALL_REACTORS)) {
+          Iterables.addAll(nodes, createUserComments(reactor, node));
+        }
+      } else {
+        Iterables.addAll(nodes, createUserComments(reactor, node));
+      }
+      configureReactorNodeLayout(node, false);
+      _layoutPostProcessing.configureReactor(node);
+    }
 
-        // Create reactions
-        for (ReactionInstance reaction : reactorInstance.reactions) {
-            int idx = reactorInstance.reactions.indexOf(reaction);
-            KNode node = associateWith(_kNodeExtensions.createNode(), reaction.getDefinition());
-            NamedInstanceUtil.linkInstance(node, reaction);
-            _utilityExtensions.setID(node, reaction.uniqueID());
-            nodes.add(node);
-            Iterables.addAll(nodes, createUserComments(reaction.getDefinition(), node));
-            reactionNodes.put(reaction, node);
-
-            setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FIXED_SIDE);
-            _layoutPostProcessing.configureReaction(node);
-            setLayoutOption(node, LayeredOptions.POSITION, new KVector(0, idx + 1)); // try order reactions vertically if in one layer (+1 to account for startup)
-
-            var figure = _linguaFrancaShapeExtensions.addReactionFigure(node, reaction);
-
-            int inputSize = Stream.concat(reaction.triggers.stream(), reaction.sources.stream()).collect(Collectors.toSet()).size();
-            int outputSize = reaction.effects.size();
-            if (!getBooleanValue(REACTIONS_USE_HYPEREDGES) && (inputSize > 1 || outputSize > 1)) {
-                // If this node will have more than one input/output port, the port positions must be adjusted to the
-                // pointy shape. However, this is only possible after the layout.
-                ReactionPortAdjustment.apply(node, figure);
-            }
-
-            // connect input
-            KPort port = null;
-            for (TriggerInstance<?> trigger : reaction.triggers) {
-                // Create new port if there is no previous one or each dependency should have its own one
-                if (port == null || !getBooleanValue(REACTIONS_USE_HYPEREDGES)) {
-                    port = addInvisiblePort(node);
-                    setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.WEST);
-
-                    if (getBooleanValue(REACTIONS_USE_HYPEREDGES) || inputSize == 1) {
-                        // manual adjustment disabling automatic one
-                        setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET,
-                                (double) -LinguaFrancaShapeExtensions.REACTION_POINTINESS);
-                    }
-                }
-
-                if (trigger.isStartup()) {
-                    connect(createDependencyEdge(((TriggerInstance.BuiltinTriggerVariable) trigger.getDefinition()).definition),
-                            startupNode,
-                            port);
-                    startup = trigger;
-                } else if (trigger.isShutdown()) {
-                    connect(createDelayEdge(((TriggerInstance.BuiltinTriggerVariable) trigger.getDefinition()).definition),
-                            shutdownNode,
-                            port);
-                    shutdown = trigger;
-                } else if (trigger.isReset()) {
-                    connect(createDependencyEdge(((TriggerInstance.BuiltinTriggerVariable) trigger.getDefinition()).definition),
-                            resetNode,
-                            port);
-                    reset = trigger;
-                } else if (trigger instanceof ActionInstance) {
-                    actionDestinations.put(((ActionInstance) trigger), port);
-                } else if (trigger instanceof PortInstance) {
-                    KPort src = null;
-                    PortInstance triggerAsPort = (PortInstance) trigger;
-                    if (triggerAsPort.getParent() == reactorInstance) {
-                        src = parentInputPorts.get(trigger);
-                    } else {
-                        src = outputPorts.get(triggerAsPort.getParent(), trigger);
-                    }
-                    if (src != null) {
-                        connect(createDependencyEdge(triggerAsPort.getDefinition()), src, port);
-                    }
-                } else if (trigger instanceof TimerInstance) {
-                    KNode src = timerNodes.get(trigger);
-                    if (src != null) {
-                        connect(createDependencyEdge(trigger.getDefinition()), src, port);
-                    }
-                }
-            }
-
-            // connect dependencies
-            for (TriggerInstance<?> dep : reaction.sources) {
-                if (reaction.triggers.contains(dep)) continue; // skip
-
-                // Create new port if there is no previous one or each dependency should have its own one
-                if (port == null || !getBooleanValue(REACTIONS_USE_HYPEREDGES)) {
-                    port = addInvisiblePort(node);
-                    setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.WEST);
+    // Find and annotate cycles
+    if (getBooleanValue(CYCLE_DETECTION) && _utilityExtensions.isRoot(reactorInstance)) {
+      KNode errNode = detectAndAnnotateCycles(node, reactorInstance, allReactorNodes);
+      if (errNode != null) {
+        nodes.add(errNode);
+      }
+    }
 
-                    if (getBooleanValue(REACTIONS_USE_HYPEREDGES) || inputSize == 1) {
-                        // manual adjustment disabling automatic one
-                        setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET,
-                                (double) -LinguaFrancaShapeExtensions.REACTION_POINTINESS);
-                    }
-                }
+    return nodes;
+  }
+
+  public KNode configureReactorNodeLayout(KNode node, boolean main) {
+    // Set layered algorithm
+    setLayoutOption(node, CoreOptions.ALGORITHM, LayeredOptions.ALGORITHM_ID);
+    // Left to right layout
+    setLayoutOption(node, CoreOptions.DIRECTION, Direction.RIGHT);
+    // Center free floating children
+    setLayoutOption(node, CoreOptions.CONTENT_ALIGNMENT, ContentAlignment.centerCenter());
+
+    // Balanced placement with straight long edges.
+    setLayoutOption(
+        node, LayeredOptions.NODE_PLACEMENT_STRATEGY, NodePlacementStrategy.NETWORK_SIMPLEX);
+    // Do not shrink nodes below content
+    setLayoutOption(
+        node,
+        CoreOptions.NODE_SIZE_CONSTRAINTS,
+        EnumSet.of(SizeConstraint.MINIMUM_SIZE, SizeConstraint.PORTS));
+
+    // Allows to freely shuffle ports on each side
+    setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FIXED_SIDE);
+    // Adjust port label spacing to be closer to edge but not overlap with port figure
+    // TODO: Add PortLabelPlacement.NEXT_TO_PORT_IF_POSSIBLE back into the configuration, as soon as
+    // ELK provides a fix for LF issue #1273
+    setLayoutOption(
+        node,
+        CoreOptions.PORT_LABELS_PLACEMENT,
+        EnumSet.of(PortLabelPlacement.ALWAYS_OTHER_SAME_SIDE, PortLabelPlacement.OUTSIDE));
+    setLayoutOption(node, CoreOptions.SPACING_LABEL_PORT_HORIZONTAL, 2.0);
+    setLayoutOption(node, CoreOptions.SPACING_LABEL_PORT_VERTICAL, -3.0);
+
+    // Configure spacing
+    if (!getBooleanValue(SHOW_HYPERLINKS)) { // Hyperlink version is more relaxed in terms of space
+      var factor = (double) getIntValue(SPACING) / 100;
+
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_COMPONENT_COMPONENT,
+          LayeredOptions.SPACING_COMPONENT_COMPONENT.getDefault() * factor);
+
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_NODE_NODE,
+          LayeredOptions.SPACING_NODE_NODE.getDefault() * factor);
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_NODE_NODE_BETWEEN_LAYERS,
+          LayeredOptions.SPACING_NODE_NODE_BETWEEN_LAYERS.getDefault() * factor);
+
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_PORT_PORT,
+          LayeredOptions.SPACING_PORT_PORT.getDefault() * factor);
+
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_EDGE_NODE,
+          LayeredOptions.SPACING_EDGE_NODE.getDefault() * factor);
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_EDGE_NODE_BETWEEN_LAYERS,
+          LayeredOptions.SPACING_EDGE_NODE_BETWEEN_LAYERS.getDefault() * factor);
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_EDGE_EDGE,
+          LayeredOptions.SPACING_EDGE_EDGE.getDefault() * factor);
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_EDGE_EDGE_BETWEEN_LAYERS,
+          LayeredOptions.SPACING_EDGE_EDGE_BETWEEN_LAYERS.getDefault() * factor);
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_EDGE_EDGE,
+          LayeredOptions.SPACING_EDGE_EDGE.getDefault() * factor);
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_EDGE_EDGE_BETWEEN_LAYERS,
+          LayeredOptions.SPACING_EDGE_EDGE_BETWEEN_LAYERS.getDefault() * factor);
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_EDGE_LABEL,
+          LayeredOptions.SPACING_EDGE_LABEL.getDefault() * factor);
+
+      // Padding for sub graph
+      if (main) { // Special handing for main reactors
+        setLayoutOption(node, CoreOptions.PADDING, new ElkPadding(-1, 6, 6, 6));
+      } else {
+        setLayoutOption(node, CoreOptions.PADDING, new ElkPadding(2, 6, 6, 6));
+      }
+    }
 
-                if (dep instanceof PortInstance) {
-                    KPort src = null;
-                    PortInstance depAsPort = (PortInstance) dep;
-                    if (dep.getParent() == reactorInstance) {
-                        src = parentInputPorts.get(dep);
+    return node;
+  }
+
+  private KNode detectAndAnnotateCycles(
+      KNode node, ReactorInstance reactorInstance, Map<ReactorInstance, KNode> allReactorNodes) {
+    if (node.getProperty(REACTOR_RECURSIVE_INSTANTIATION)) {
+      _filterCycleAction.resetCycleFiltering(node);
+      return addErrorComment(node, TEXT_ERROR_CONTAINS_RECURSION);
+    } else { // only detect dependency cycles if not recursive
+      try {
+        boolean hasCycle =
+            _cycleVisualization.detectAndHighlightCycles(
+                reactorInstance,
+                allReactorNodes,
+                it -> {
+                  if (it instanceof KNode) {
+                    List<KRendering> renderings =
+                        IterableExtensions.toList(
+                            Iterables.filter(((KNode) it).getData(), KRendering.class));
+                    if (renderings.size() == 1) {
+                      _linguaFrancaStyleExtensions.errorStyle(IterableExtensions.head(renderings));
                     } else {
-                        src = outputPorts.get(depAsPort.getParent(), dep);
+                      IterableExtensions.filter(
+                              renderings,
+                              rendering -> {
+                                return rendering.getProperty(KlighdProperties.COLLAPSED_RENDERING);
+                              })
+                          .forEach(_linguaFrancaStyleExtensions::errorStyle);
                     }
-                    if (src != null) {
-                        connect(createDependencyEdge(dep.getDefinition()), src, port);
-                    }
-                }
-            }
-
-            // connect outputs
-            port = null; // enforce new ports for outputs
-            Set<TriggerInstance<?>> iterSet = reaction.effects != null ? reaction.effects : new HashSet<>();
-            for (TriggerInstance<?> effect : iterSet) {
-                // Create new port if there is no previous one or each dependency should have its own one
-                if (port == null || !getBooleanValue(REACTIONS_USE_HYPEREDGES)) {
-                    port = addInvisiblePort(node);
-                    setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.EAST);
-                }
+                  } else if (it instanceof KEdge) {
+                    Iterables.filter(((KEdge) it).getData(), KRendering.class)
+                        .forEach(_linguaFrancaStyleExtensions::errorStyle);
+                    // TODO initiallyHide does not work with incremental
+                    // (https://github.com/kieler/KLighD/issues/37)
+                    // cycleEgde.initiallyShow() // Show hidden order dependencies
+                    _kRenderingExtensions.setInvisible(
+                        _kRenderingExtensions.getKRendering(it), false);
+                  } else if (it instanceof KPort) {
+                    Iterables.filter(((KPort) it).getData(), KRendering.class)
+                        .forEach(_linguaFrancaStyleExtensions::errorStyle);
+                    // it.reverseTrianglePort()
+                  }
+                });
 
-                if (effect instanceof ActionInstance) {
-                    actionSources.put((ActionInstance) effect, port);
-                } else if (effect instanceof PortInstance) {
-                    KPort dst = null;
-                    PortInstance effectAsPort = (PortInstance) effect;
-                    if (effectAsPort.isOutput()) {
-                        dst = parentOutputPorts.get(effect);
-                    } else {
-                        dst = inputPorts.get(effectAsPort.getParent(), effect);
-                    }
-                    if (dst != null) {
-                        connect(createDependencyEdge(effect), port, dst);
-                    }
-                }
-            }
+        if (hasCycle) {
+          KNode err = addErrorComment(node, TEXT_ERROR_CONTAINS_CYCLE);
+
+          // Add to existing figure
+          KRectangle rectangle =
+              _kContainerRenderingExtensions.addRectangle(
+                  _kRenderingExtensions.getKContainerRendering(err));
+          _kRenderingExtensions.to(
+              _kRenderingExtensions.from(
+                  _kRenderingExtensions.setGridPlacementData(rectangle),
+                  _kRenderingExtensions.LEFT,
+                  3,
+                  0,
+                  _kRenderingExtensions.TOP,
+                  (-1),
+                  0),
+              _kRenderingExtensions.RIGHT,
+              3,
+              0,
+              _kRenderingExtensions.BOTTOM,
+              3,
+              0);
+          _linguaFrancaStyleExtensions.noSelectionStyle(rectangle);
+          _kRenderingExtensions.setInvisible(rectangle, true);
+          _kContainerRenderingExtensions.setGridPlacement(rectangle, 2);
+
+          KRectangle subrectangle = _kContainerRenderingExtensions.addRectangle(rectangle);
+          _kRenderingExtensions.to(
+              _kRenderingExtensions.from(
+                  _kRenderingExtensions.setGridPlacementData(subrectangle),
+                  _kRenderingExtensions.LEFT,
+                  0,
+                  0,
+                  _kRenderingExtensions.TOP,
+                  0,
+                  0),
+              _kRenderingExtensions.RIGHT,
+              2,
+              0,
+              _kRenderingExtensions.BOTTOM,
+              0,
+              0);
+          _linguaFrancaStyleExtensions.noSelectionStyle(subrectangle);
+          _kRenderingExtensions.addSingleClickAction(subrectangle, ShowCycleAction.ID);
+
+          KText subrectangleText =
+              _kContainerRenderingExtensions.addText(subrectangle, TEXT_ERROR_CYCLE_BTN_SHOW);
+          // Copy text style
+          List<KStyle> styles =
+              ListExtensions.map(
+                  IterableExtensions.head(
+                          _kRenderingExtensions.getKContainerRendering(err).getChildren())
+                      .getStyles(),
+                  EcoreUtil::copy);
+          subrectangleText.getStyles().addAll(styles);
+          _kRenderingExtensions.setFontSize(subrectangleText, 5);
+          _kRenderingExtensions.setSurroundingSpace(subrectangleText, 1, 0);
+          _linguaFrancaStyleExtensions.noSelectionStyle(subrectangleText);
+          _kRenderingExtensions.addSingleClickAction(subrectangleText, ShowCycleAction.ID);
+
+          subrectangle = _kContainerRenderingExtensions.addRectangle(rectangle);
+          _kRenderingExtensions.to(
+              _kRenderingExtensions.from(
+                  _kRenderingExtensions.setGridPlacementData(subrectangle),
+                  _kRenderingExtensions.LEFT,
+                  0,
+                  0,
+                  _kRenderingExtensions.TOP,
+                  0,
+                  0),
+              _kRenderingExtensions.RIGHT,
+              0,
+              0,
+              _kRenderingExtensions.BOTTOM,
+              0,
+              0);
+          _linguaFrancaStyleExtensions.noSelectionStyle(subrectangle);
+          _kRenderingExtensions.addSingleClickAction(subrectangle, FilterCycleAction.ID);
+
+          subrectangleText =
+              _kContainerRenderingExtensions.addText(
+                  subrectangle,
+                  _filterCycleAction.isCycleFiltered(node)
+                      ? TEXT_ERROR_CYCLE_BTN_UNFILTER
+                      : TEXT_ERROR_CYCLE_BTN_FILTER);
+          // Copy text style
+          styles =
+              ListExtensions.map(
+                  IterableExtensions.head(
+                          _kRenderingExtensions.getKContainerRendering(err).getChildren())
+                      .getStyles(),
+                  EcoreUtil::copy);
+          subrectangleText.getStyles().addAll(styles);
+          _kRenderingExtensions.setFontSize(subrectangleText, 5);
+          _kRenderingExtensions.setSurroundingSpace(subrectangleText, 1, 0);
+          _linguaFrancaStyleExtensions.noSelectionStyle(subrectangleText);
+          _kRenderingExtensions.addSingleClickAction(subrectangleText, FilterCycleAction.ID);
+          _filterCycleAction.markCycleFilterText(subrectangleText, err);
+
+          // if user interactively requested a filtered diagram keep it filtered during updates
+          if (_filterCycleAction.isCycleFiltered(node)) {
+            _filterCycleAction.filterCycle(node);
+          }
+          return err;
         }
+      } catch (Exception e) {
+        _filterCycleAction.resetCycleFiltering(node);
+        e.printStackTrace();
+        return addErrorComment(node, TEXT_ERROR_CYCLE_DETECTION);
+      }
+    }
+    return null;
+  }
+
+  private Collection<KNode> transformReactorNetwork(
+      ReactorInstance reactorInstance,
+      Map<PortInstance, KPort> parentInputPorts,
+      Map<PortInstance, KPort> parentOutputPorts,
+      Map<ReactorInstance, KNode> allReactorNodes) {
+    List<KNode> nodes = new ArrayList<>();
+    Table<ReactorInstance, PortInstance, KPort> inputPorts = HashBasedTable.create();
+    Table<ReactorInstance, PortInstance, KPort> outputPorts = HashBasedTable.create();
+    Map<ReactionInstance, KNode> reactionNodes = new HashMap<>();
+    Map<KPort, KNode> directConnectionDummyNodes = new HashMap<>();
+    Multimap<ActionInstance, KPort> actionDestinations = HashMultimap.create();
+    Multimap<ActionInstance, KPort> actionSources = HashMultimap.create();
+    Map<TimerInstance, KNode> timerNodes = new HashMap<>();
+    KNode startupNode = _kNodeExtensions.createNode();
+    TriggerInstance<?> startup = null;
+    KNode shutdownNode = _kNodeExtensions.createNode();
+    TriggerInstance<?> shutdown = null;
+    KNode resetNode = _kNodeExtensions.createNode();
+    TriggerInstance<?> reset = null;
+
+    // Transform instances
+    int index = 0;
+    for (ReactorInstance child : reactorInstance.children) {
+      Boolean expansionState = MemorizingExpandCollapseAction.getExpansionState(child);
+      Collection<KNode> rNodes =
+          createReactorNode(
+              child,
+              expansionState != null ? expansionState : false,
+              inputPorts,
+              outputPorts,
+              allReactorNodes);
+      nodes.addAll(rNodes);
+      index++;
+    }
 
-        // Connect actions
-        Set<ActionInstance> actions = new HashSet<>();
-        actions.addAll(actionSources.keySet());
-        actions.addAll(actionDestinations.keySet());
-
-        for (ActionInstance action : actions) {
-            KNode node = associateWith(_kNodeExtensions.createNode(), action.getDefinition());
-            NamedInstanceUtil.linkInstance(node, action);
-            _utilityExtensions.setID(node, action.uniqueID());
-            nodes.add(node);
-            Iterables.addAll(nodes, createUserComments(action.getDefinition(), node));
-            setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FIXED_SIDE);
-            _layoutPostProcessing.configureAction(node);
-            Pair<KPort, KPort> ports = _linguaFrancaShapeExtensions.addActionFigureAndPorts(
-                    node,
-                    action.isPhysical() ? "P" : "L");
-            // TODO handle variables?
-            if (action.getMinDelay() != null && action.getMinDelay() != ActionInstance.DEFAULT_MIN_DELAY) {
-                _kLabelExtensions.addOutsideBottomCenteredNodeLabel(
-                        node,
-                        String.format("min delay: %s", action.getMinDelay().toString()),
-                        7);
-            }
-            // TODO default value?
-            if (action.getDefinition().getMinSpacing() != null) {
-                _kLabelExtensions.addOutsideBottomCenteredNodeLabel(node,
-                        String.format("min spacing: %s", action.getMinSpacing().toString()),
-                        7);
-            }
-            if (!StringExtensions.isNullOrEmpty(action.getDefinition().getPolicy())) {
-                _kLabelExtensions.addOutsideBottomCenteredNodeLabel(node,
-                        String.format("policy: %s", action.getPolicy().toString()),
-                        7);
-            }
-            // connect source
-            for (KPort source : actionSources.get(action)) {
-                connect(createDelayEdge(action), source, ports.getKey());
-            }
+    // Create timers
+    for (TimerInstance timer : reactorInstance.timers) {
+      KNode node = associateWith(_kNodeExtensions.createNode(), timer.getDefinition());
+      NamedInstanceUtil.linkInstance(node, timer);
+      _utilityExtensions.setID(node, timer.uniqueID());
+      nodes.add(node);
+      Iterables.addAll(nodes, createUserComments(timer.getDefinition(), node));
+      timerNodes.put(timer, node);
+      _linguaFrancaShapeExtensions.addTimerFigure(node, timer);
+      _layoutPostProcessing.configureTimer(node);
+    }
 
-            // connect targets
-            for (KPort target : actionDestinations.get(action)) {
-                connect(createDelayEdge(action), ports.getValue(), target);
-            }
+    // Create reactions
+    for (ReactionInstance reaction : reactorInstance.reactions) {
+      int idx = reactorInstance.reactions.indexOf(reaction);
+      KNode node = associateWith(_kNodeExtensions.createNode(), reaction.getDefinition());
+      NamedInstanceUtil.linkInstance(node, reaction);
+      _utilityExtensions.setID(node, reaction.uniqueID());
+      nodes.add(node);
+      Iterables.addAll(nodes, createUserComments(reaction.getDefinition(), node));
+      reactionNodes.put(reaction, node);
+
+      setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FIXED_SIDE);
+      _layoutPostProcessing.configureReaction(node);
+      setLayoutOption(
+          node,
+          LayeredOptions.POSITION,
+          new KVector(
+              0, idx + 1)); // try order reactions vertically if in one layer (+1 to account for
+      // startup)
+
+      var figure = _linguaFrancaShapeExtensions.addReactionFigure(node, reaction);
+
+      int inputSize =
+          Stream.concat(reaction.triggers.stream(), reaction.sources.stream())
+              .collect(Collectors.toSet())
+              .size();
+      int outputSize = reaction.effects.size();
+      if (!getBooleanValue(REACTIONS_USE_HYPEREDGES) && (inputSize > 1 || outputSize > 1)) {
+        // If this node will have more than one input/output port, the port positions must be
+        // adjusted to the
+        // pointy shape. However, this is only possible after the layout.
+        ReactionPortAdjustment.apply(node, figure);
+      }
+
+      // connect input
+      KPort port = null;
+      for (TriggerInstance<?> trigger : reaction.triggers) {
+        // Create new port if there is no previous one or each dependency should have its own one
+        if (port == null || !getBooleanValue(REACTIONS_USE_HYPEREDGES)) {
+          port = addInvisiblePort(node);
+          setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.WEST);
+
+          if (getBooleanValue(REACTIONS_USE_HYPEREDGES) || inputSize == 1) {
+            // manual adjustment disabling automatic one
+            setLayoutOption(
+                port,
+                CoreOptions.PORT_BORDER_OFFSET,
+                (double) -LinguaFrancaShapeExtensions.REACTION_POINTINESS);
+          }
         }
 
-        // Transform connections.
-        // First, collect all the source ports.
-        List<PortInstance> sourcePorts = new LinkedList<>(reactorInstance.inputs);
-        for (ReactorInstance child : reactorInstance.children) {
-            sourcePorts.addAll(child.outputs);
+        if (trigger.isStartup()) {
+          connect(
+              createDependencyEdge(
+                  ((TriggerInstance.BuiltinTriggerVariable) trigger.getDefinition()).definition),
+              startupNode,
+              port);
+          startup = trigger;
+        } else if (trigger.isShutdown()) {
+          connect(
+              createDelayEdge(
+                  ((TriggerInstance.BuiltinTriggerVariable) trigger.getDefinition()).definition),
+              shutdownNode,
+              port);
+          shutdown = trigger;
+        } else if (trigger.isReset()) {
+          connect(
+              createDependencyEdge(
+                  ((TriggerInstance.BuiltinTriggerVariable) trigger.getDefinition()).definition),
+              resetNode,
+              port);
+          reset = trigger;
+        } else if (trigger instanceof ActionInstance) {
+          actionDestinations.put(((ActionInstance) trigger), port);
+        } else if (trigger instanceof PortInstance) {
+          KPort src = null;
+          PortInstance triggerAsPort = (PortInstance) trigger;
+          if (triggerAsPort.getParent() == reactorInstance) {
+            src = parentInputPorts.get(trigger);
+          } else {
+            src = outputPorts.get(triggerAsPort.getParent(), trigger);
+          }
+          if (src != null) {
+            connect(createDependencyEdge(triggerAsPort.getDefinition()), src, port);
+          }
+        } else if (trigger instanceof TimerInstance) {
+          KNode src = timerNodes.get(trigger);
+          if (src != null) {
+            connect(createDependencyEdge(trigger.getDefinition()), src, port);
+          }
         }
-
-        for (PortInstance leftPort : sourcePorts) {
-            KPort source = leftPort.getParent() == reactorInstance ?
-                    parentInputPorts.get(leftPort) :
-                    outputPorts.get(leftPort.getParent(), leftPort);
-
-            for (SendRange sendRange : leftPort.getDependentPorts()) {
-                for (RuntimeRange<PortInstance> rightRange : sendRange.destinations) {
-                    PortInstance rightPort = rightRange.instance;
-                    KPort target = rightPort.getParent() == reactorInstance ?
-                            parentOutputPorts.get(rightPort) :
-                            inputPorts.get(rightPort.getParent(), rightPort);
-                    // There should be a connection, but skip if not.
-                    Connection connection = sendRange.connection;
-                    if (connection != null) {
-                        KEdge edge = createIODependencyEdge(connection, (leftPort.isMultiport() || rightPort.isMultiport()));
-                        if (connection.getDelay() != null) {
-                            KLabel delayLabel = _kLabelExtensions.addCenterEdgeLabel(edge, ASTUtils.toOriginalText(connection.getDelay()));
-                            associateWith(delayLabel, connection.getDelay());
-                            if (connection.isPhysical()) {
-                                _linguaFrancaStyleExtensions.applyOnEdgePysicalDelayStyle(delayLabel,
-                                        reactorInstance.isMainOrFederated() ? Colors.WHITE : Colors.GRAY_95);
-                            } else {
-                                _linguaFrancaStyleExtensions.applyOnEdgeDelayStyle(delayLabel);
-                            }
-                        } else if (connection.isPhysical()) {
-                            KLabel physicalConnectionLabel = _kLabelExtensions.addCenterEdgeLabel(edge, "---");
-                            _linguaFrancaStyleExtensions.applyOnEdgePysicalStyle(physicalConnectionLabel,
-                                    reactorInstance.isMainOrFederated() ? Colors.WHITE : Colors.GRAY_95);
-                        }
-                        if (source != null && target != null) {
-                            // check for inside loop (direct in -> out connection with delay)
-                            if (parentInputPorts.values().contains(source) &&
-                                    parentOutputPorts.values().contains(target)) {
-                                // edge.setLayoutOption(CoreOptions.INSIDE_SELF_LOOPS_YO, true) // Does not work as expected
-                                // Introduce dummy node to enable direct connection (that is also hidden when collapsed)
-                                KNode dummy = _kNodeExtensions.createNode();
-                                if (directConnectionDummyNodes.containsKey(target)) {
-                                    dummy = directConnectionDummyNodes.get(target);
-                                } else {
-                                    nodes.add(dummy);
-                                    directConnectionDummyNodes.put(target, dummy);
-                                    _kRenderingExtensions.addInvisibleContainerRendering(dummy);
-                                    _kNodeExtensions.setNodeSize(dummy, 0, 0);
-                                    KEdge extraEdge = createIODependencyEdge(null,
-                                            (leftPort.isMultiport() || rightPort.isMultiport()));
-                                    connect(extraEdge, dummy, target);
-                                }
-                                connect(edge, source, dummy);
-                            } else {
-                                connect(edge, source, target);
-                            }
-                        }
-                    }
-                }
-            }
+      }
+
+      // connect dependencies
+      for (TriggerInstance<?> dep : reaction.sources) {
+        if (reaction.triggers.contains(dep)) continue; // skip
+
+        // Create new port if there is no previous one or each dependency should have its own one
+        if (port == null || !getBooleanValue(REACTIONS_USE_HYPEREDGES)) {
+          port = addInvisiblePort(node);
+          setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.WEST);
+
+          if (getBooleanValue(REACTIONS_USE_HYPEREDGES) || inputSize == 1) {
+            // manual adjustment disabling automatic one
+            setLayoutOption(
+                port,
+                CoreOptions.PORT_BORDER_OFFSET,
+                (double) -LinguaFrancaShapeExtensions.REACTION_POINTINESS);
+          }
         }
 
-        // Add startup/shutdown
-        if (startup != null) {
-            _linguaFrancaShapeExtensions.addStartupFigure(startupNode);
-            _utilityExtensions.setID(startupNode, reactorInstance.uniqueID() + "_startup");
-            NamedInstanceUtil.linkInstance(startupNode, startup);
-            startupNode.setProperty(REACTION_SPECIAL_TRIGGER, true);
-            nodes.add(0, startupNode); // add at the start (ordered first)
-            // try to order with reactions vertically if in one layer
-            setLayoutOption(startupNode, LayeredOptions.POSITION, new KVector(0, 0));
-            setLayoutOption(startupNode, LayeredOptions.LAYERING_LAYER_CONSTRAINT, LayerConstraint.FIRST);
-            _layoutPostProcessing.configureAction(startupNode);
-
-            if (getBooleanValue(REACTIONS_USE_HYPEREDGES)) {
-                KPort port = addInvisiblePort(startupNode);
-                startupNode.getOutgoingEdges().forEach(it -> {
-                    it.setSourcePort(port);
-                });
-            }
+        if (dep instanceof PortInstance) {
+          KPort src = null;
+          PortInstance depAsPort = (PortInstance) dep;
+          if (dep.getParent() == reactorInstance) {
+            src = parentInputPorts.get(dep);
+          } else {
+            src = outputPorts.get(depAsPort.getParent(), dep);
+          }
+          if (src != null) {
+            connect(createDependencyEdge(dep.getDefinition()), src, port);
+          }
         }
-        if (shutdown != null) {
-            _linguaFrancaShapeExtensions.addShutdownFigure(shutdownNode);
-            _utilityExtensions.setID(shutdownNode, reactorInstance.uniqueID() + "_shutdown");
-            NamedInstanceUtil.linkInstance(shutdownNode, shutdown);
-            shutdownNode.setProperty(REACTION_SPECIAL_TRIGGER, true);
-            nodes.add(shutdownNode); // add at the end (ordered last)
-            // try to order with reactions vertically if in one layer
-            _layoutPostProcessing.configureShutDown(shutdownNode);
-            setLayoutOption(shutdownNode, LayeredOptions.POSITION, new KVector(0, reactorInstance.reactions.size() + 1));
-
-            if (getBooleanValue(REACTIONS_USE_HYPEREDGES)) { // connect all edges to one port
-                KPort port = addInvisiblePort(shutdownNode);
-                shutdownNode.getOutgoingEdges().forEach(it -> {
-                    it.setSourcePort(port);
-                });
-            }
-        }
-        if (reset != null) {
-            _linguaFrancaShapeExtensions.addResetFigure(resetNode);
-            _utilityExtensions.setID(resetNode, reactorInstance.uniqueID() + "_reset");
-            NamedInstanceUtil.linkInstance(resetNode, reset);
-            resetNode.setProperty(REACTION_SPECIAL_TRIGGER, true);
-            nodes.add(startup != null ? 1 : 0, resetNode); // after startup
-            // try to order with reactions vertically if in one layer
-            setLayoutOption(resetNode, LayeredOptions.POSITION, new KVector(0, 0.5));
-            setLayoutOption(resetNode, LayeredOptions.LAYERING_LAYER_CONSTRAINT, LayerConstraint.FIRST);
-
-            if (getBooleanValue(REACTIONS_USE_HYPEREDGES)) { // connect all edges to one port
-                KPort port = addInvisiblePort(resetNode);
-                resetNode.getOutgoingEdges().forEach(it -> {
-                    it.setSourcePort(port);
-                });
-            }
-        }
-
-        // Postprocess timer nodes
-        if (getBooleanValue(REACTIONS_USE_HYPEREDGES)) { // connect all edges to one port
-            for (KNode timerNode : timerNodes.values()) {
-                KPort port = addInvisiblePort(timerNode);
-                timerNode.getOutgoingEdges().forEach(it -> {
-                    it.setSourcePort(port);
-                });
-            }
+      }
+
+      // connect outputs
+      port = null; // enforce new ports for outputs
+      Set<TriggerInstance<?>> iterSet =
+          reaction.effects != null ? reaction.effects : new HashSet<>();
+      for (TriggerInstance<?> effect : iterSet) {
+        // Create new port if there is no previous one or each dependency should have its own one
+        if (port == null || !getBooleanValue(REACTIONS_USE_HYPEREDGES)) {
+          port = addInvisiblePort(node);
+          setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.EAST);
         }
 
-        // Add reaction order edges (add last to have them on top of other edges)
-        if (reactorInstance.reactions.size() > 1) {
-            KNode prevNode = reactionNodes.get(IterableExtensions.head(reactorInstance.reactions));
-            Iterable<KNode> iterList = IterableExtensions.map(
-                    IterableExtensions.drop(reactorInstance.reactions, 1),
-                    reactionNodes::get);
-            for (KNode node : iterList) {
-                KEdge edge = createOrderEdge();
-                edge.setSource(prevNode);
-                edge.setTarget(node);
-                edge.setProperty(CoreOptions.NO_LAYOUT, true);
-
-                // Do not remove them, as they are needed for cycle detection
-                KRendering edgeRendering = _kRenderingExtensions.getKRendering(edge);
-                _kRenderingExtensions.setInvisible(edgeRendering, !getBooleanValue(SHOW_REACTION_ORDER_EDGES));
-                _kRenderingExtensions.getInvisible(edgeRendering).setPropagateToChildren(true);
-               // TODO this does not work work with incremental update (https://github.com/kieler/KLighD/issues/37)
-               // if (!getBooleanValue(SHOW_REACTION_ORDER_EDGES)) edge.initiallyHide()
-
-                prevNode = node;
-            }
+        if (effect instanceof ActionInstance) {
+          actionSources.put((ActionInstance) effect, port);
+        } else if (effect instanceof PortInstance) {
+          KPort dst = null;
+          PortInstance effectAsPort = (PortInstance) effect;
+          if (effectAsPort.isOutput()) {
+            dst = parentOutputPorts.get(effect);
+          } else {
+            dst = inputPorts.get(effectAsPort.getParent(), effect);
+          }
+          if (dst != null) {
+            connect(createDependencyEdge(effect), port, dst);
+          }
         }
+      }
+    }
 
-        _layoutPostProcessing.orderChildren(nodes);
-        _modeDiagrams.handleModes(nodes, reactorInstance);
+    // Connect actions
+    Set<ActionInstance> actions = new HashSet<>();
+    actions.addAll(actionSources.keySet());
+    actions.addAll(actionDestinations.keySet());
+
+    for (ActionInstance action : actions) {
+      KNode node = associateWith(_kNodeExtensions.createNode(), action.getDefinition());
+      NamedInstanceUtil.linkInstance(node, action);
+      _utilityExtensions.setID(node, action.uniqueID());
+      nodes.add(node);
+      Iterables.addAll(nodes, createUserComments(action.getDefinition(), node));
+      setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FIXED_SIDE);
+      _layoutPostProcessing.configureAction(node);
+      Pair<KPort, KPort> ports =
+          _linguaFrancaShapeExtensions.addActionFigureAndPorts(
+              node, action.isPhysical() ? "P" : "L");
+      // TODO handle variables?
+      if (action.getMinDelay() != null
+          && action.getMinDelay() != ActionInstance.DEFAULT_MIN_DELAY) {
+        _kLabelExtensions.addOutsideBottomCenteredNodeLabel(
+            node, String.format("min delay: %s", action.getMinDelay().toString()), 7);
+      }
+      // TODO default value?
+      if (action.getDefinition().getMinSpacing() != null) {
+        _kLabelExtensions.addOutsideBottomCenteredNodeLabel(
+            node, String.format("min spacing: %s", action.getMinSpacing().toString()), 7);
+      }
+      if (!StringExtensions.isNullOrEmpty(action.getDefinition().getPolicy())) {
+        _kLabelExtensions.addOutsideBottomCenteredNodeLabel(
+            node, String.format("policy: %s", action.getPolicy().toString()), 7);
+      }
+      // connect source
+      for (KPort source : actionSources.get(action)) {
+        connect(createDelayEdge(action), source, ports.getKey());
+      }
+
+      // connect targets
+      for (KPort target : actionDestinations.get(action)) {
+        connect(createDelayEdge(action), ports.getValue(), target);
+      }
+    }
 
-        return nodes;
+    // Transform connections.
+    // First, collect all the source ports.
+    List<PortInstance> sourcePorts = new LinkedList<>(reactorInstance.inputs);
+    for (ReactorInstance child : reactorInstance.children) {
+      sourcePorts.addAll(child.outputs);
     }
 
-    private String createReactorLabel(ReactorInstance reactorInstance) {
-        StringBuilder b = new StringBuilder();
-        if (getBooleanValue(SHOW_INSTANCE_NAMES) && !_utilityExtensions.isRoot(reactorInstance)) {
-            if (!reactorInstance.isMainOrFederated()) {
-                b.append(reactorInstance.getName()).append(" : ");
-            }
-        }
-        if (reactorInstance.isMainOrFederated()) {
-            try {
-                b.append(FileUtil.nameWithoutExtension(reactorInstance.reactorDeclaration.eResource()));
-            } catch (Exception e) {
-                throw Exceptions.sneakyThrow(e);
+    for (PortInstance leftPort : sourcePorts) {
+      KPort source =
+          leftPort.getParent() == reactorInstance
+              ? parentInputPorts.get(leftPort)
+              : outputPorts.get(leftPort.getParent(), leftPort);
+
+      for (SendRange sendRange : leftPort.getDependentPorts()) {
+        for (RuntimeRange<PortInstance> rightRange : sendRange.destinations) {
+          PortInstance rightPort = rightRange.instance;
+          KPort target =
+              rightPort.getParent() == reactorInstance
+                  ? parentOutputPorts.get(rightPort)
+                  : inputPorts.get(rightPort.getParent(), rightPort);
+          // There should be a connection, but skip if not.
+          Connection connection = sendRange.connection;
+          if (connection != null) {
+            KEdge edge =
+                createIODependencyEdge(
+                    connection, (leftPort.isMultiport() || rightPort.isMultiport()));
+            if (connection.getDelay() != null) {
+              KLabel delayLabel =
+                  _kLabelExtensions.addCenterEdgeLabel(
+                      edge, ASTUtils.toOriginalText(connection.getDelay()));
+              associateWith(delayLabel, connection.getDelay());
+              if (connection.isPhysical()) {
+                _linguaFrancaStyleExtensions.applyOnEdgePysicalDelayStyle(
+                    delayLabel,
+                    reactorInstance.isMainOrFederated() ? Colors.WHITE : Colors.GRAY_95);
+              } else {
+                _linguaFrancaStyleExtensions.applyOnEdgeDelayStyle(delayLabel);
+              }
+            } else if (connection.isPhysical()) {
+              KLabel physicalConnectionLabel = _kLabelExtensions.addCenterEdgeLabel(edge, "---");
+              _linguaFrancaStyleExtensions.applyOnEdgePysicalStyle(
+                  physicalConnectionLabel,
+                  reactorInstance.isMainOrFederated() ? Colors.WHITE : Colors.GRAY_95);
             }
-        } else if (reactorInstance.reactorDeclaration == null) {
-            // There is an error in the graph.
-            b.append("<Unresolved Reactor>");
-        } else {
-            b.append(reactorInstance.reactorDeclaration.getName());
-        }
-        if (getObjectValue(REACTOR_PARAMETER_MODE) == ReactorParameterDisplayModes.TITLE) {
-            if (reactorInstance.parameters.isEmpty()) {
-                b.append("()");
-            } else {
-                b.append(IterableExtensions.join(reactorInstance.parameters, "(", ", ", ")",
-                        it -> {
-                            return createParameterLabel(it);
-                        }));
+            if (source != null && target != null) {
+              // check for inside loop (direct in -> out connection with delay)
+              if (parentInputPorts.values().contains(source)
+                  && parentOutputPorts.values().contains(target)) {
+                // edge.setLayoutOption(CoreOptions.INSIDE_SELF_LOOPS_YO, true) // Does not work as
+                // expected
+                // Introduce dummy node to enable direct connection (that is also hidden when
+                // collapsed)
+                KNode dummy = _kNodeExtensions.createNode();
+                if (directConnectionDummyNodes.containsKey(target)) {
+                  dummy = directConnectionDummyNodes.get(target);
+                } else {
+                  nodes.add(dummy);
+                  directConnectionDummyNodes.put(target, dummy);
+                  _kRenderingExtensions.addInvisibleContainerRendering(dummy);
+                  _kNodeExtensions.setNodeSize(dummy, 0, 0);
+                  KEdge extraEdge =
+                      createIODependencyEdge(
+                          null, (leftPort.isMultiport() || rightPort.isMultiport()));
+                  connect(extraEdge, dummy, target);
+                }
+                connect(edge, source, dummy);
+              } else {
+                connect(edge, source, target);
+              }
             }
+          }
         }
-        return b.toString();
+      }
     }
 
-    private void addParameterList(KContainerRendering container, List<ParameterInstance> parameters) {
-        int cols = 1;
-        try {
-            cols = getIntValue(REACTOR_BODY_TABLE_COLS);
-        } catch (Exception e) {} // ignore
-        if (cols > parameters.size()) {
-            cols = parameters.size();
-        }
-        _kContainerRenderingExtensions.setGridPlacement(container, cols);
-        for (ParameterInstance param : parameters) {
-            var entry = _linguaFrancaShapeExtensions.addParameterEntry(
-                    container, param.getDefinition(), createParameterLabel(param));
-            _kRenderingExtensions.setHorizontalAlignment(entry, HorizontalAlignment.LEFT);
-        }
+    // Add startup/shutdown
+    if (startup != null) {
+      _linguaFrancaShapeExtensions.addStartupFigure(startupNode);
+      _utilityExtensions.setID(startupNode, reactorInstance.uniqueID() + "_startup");
+      NamedInstanceUtil.linkInstance(startupNode, startup);
+      startupNode.setProperty(REACTION_SPECIAL_TRIGGER, true);
+      nodes.add(0, startupNode); // add at the start (ordered first)
+      // try to order with reactions vertically if in one layer
+      setLayoutOption(startupNode, LayeredOptions.POSITION, new KVector(0, 0));
+      setLayoutOption(startupNode, LayeredOptions.LAYERING_LAYER_CONSTRAINT, LayerConstraint.FIRST);
+      _layoutPostProcessing.configureAction(startupNode);
+
+      if (getBooleanValue(REACTIONS_USE_HYPEREDGES)) {
+        KPort port = addInvisiblePort(startupNode);
+        startupNode
+            .getOutgoingEdges()
+            .forEach(
+                it -> {
+                  it.setSourcePort(port);
+                });
+      }
     }
-
-    private String createParameterLabel(ParameterInstance param) {
-        StringBuilder b = new StringBuilder();
-        b.append(param.getName());
-        String t = param.type.toOriginalText();
-        if (!StringExtensions.isNullOrEmpty(t)) {
-            b.append(": ").append(t);
-        }
-        if (param.getOverride() != null) {
-            b.append(" = ");
-            var init = param.getActualValue();
-            b.append(FormattingUtils.render(init));
-        }
-        return b.toString();
+    if (shutdown != null) {
+      _linguaFrancaShapeExtensions.addShutdownFigure(shutdownNode);
+      _utilityExtensions.setID(shutdownNode, reactorInstance.uniqueID() + "_shutdown");
+      NamedInstanceUtil.linkInstance(shutdownNode, shutdown);
+      shutdownNode.setProperty(REACTION_SPECIAL_TRIGGER, true);
+      nodes.add(shutdownNode); // add at the end (ordered last)
+      // try to order with reactions vertically if in one layer
+      _layoutPostProcessing.configureShutDown(shutdownNode);
+      setLayoutOption(
+          shutdownNode,
+          LayeredOptions.POSITION,
+          new KVector(0, reactorInstance.reactions.size() + 1));
+
+      if (getBooleanValue(REACTIONS_USE_HYPEREDGES)) { // connect all edges to one port
+        KPort port = addInvisiblePort(shutdownNode);
+        shutdownNode
+            .getOutgoingEdges()
+            .forEach(
+                it -> {
+                  it.setSourcePort(port);
+                });
+      }
     }
-
-    public void addStateVariableList(KContainerRendering container, List<StateVar> variables) {
-        int cols = 1;
-        try {
-            cols = getIntValue(REACTOR_BODY_TABLE_COLS);
-        } catch (Exception e) {} // ignore
-        if (cols > variables.size()) {
-            cols = variables.size();
-        }
-        _kContainerRenderingExtensions.setGridPlacement(container, cols);
-        for (var variable : variables) {
-            var entry = _linguaFrancaShapeExtensions.addStateEntry(
-                    container, variable, createStateVariableLabel(variable), variable.isReset());
-            _kRenderingExtensions.setHorizontalAlignment(entry, HorizontalAlignment.LEFT);
-        }
+    if (reset != null) {
+      _linguaFrancaShapeExtensions.addResetFigure(resetNode);
+      _utilityExtensions.setID(resetNode, reactorInstance.uniqueID() + "_reset");
+      NamedInstanceUtil.linkInstance(resetNode, reset);
+      resetNode.setProperty(REACTION_SPECIAL_TRIGGER, true);
+      nodes.add(startup != null ? 1 : 0, resetNode); // after startup
+      // try to order with reactions vertically if in one layer
+      setLayoutOption(resetNode, LayeredOptions.POSITION, new KVector(0, 0.5));
+      setLayoutOption(resetNode, LayeredOptions.LAYERING_LAYER_CONSTRAINT, LayerConstraint.FIRST);
+
+      if (getBooleanValue(REACTIONS_USE_HYPEREDGES)) { // connect all edges to one port
+        KPort port = addInvisiblePort(resetNode);
+        resetNode
+            .getOutgoingEdges()
+            .forEach(
+                it -> {
+                  it.setSourcePort(port);
+                });
+      }
     }
 
-    private String createStateVariableLabel(StateVar variable) {
-        StringBuilder b = new StringBuilder();
-        b.append(variable.getName());
-        if (variable.getType() != null) {
-            var t = InferredType.fromAST(variable.getType());
-            b.append(":").append(t.toOriginalText());
-        }
-        if (variable.getInit() != null) {
-            b.append(FormattingUtils.render(variable.getInit()));
-        }
-        return b.toString();
+    // Postprocess timer nodes
+    if (getBooleanValue(REACTIONS_USE_HYPEREDGES)) { // connect all edges to one port
+      for (KNode timerNode : timerNodes.values()) {
+        KPort port = addInvisiblePort(timerNode);
+        timerNode
+            .getOutgoingEdges()
+            .forEach(
+                it -> {
+                  it.setSourcePort(port);
+                });
+      }
     }
 
-    private KEdge createDelayEdge(Object associate) {
-        KEdge edge = _kEdgeExtensions.createEdge();
-        associateWith(edge, associate);
-        KPolyline line = _kEdgeExtensions.addPolyline(edge);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(line);
-        _kPolylineExtensions.addJunctionPointDecorator(line);
-        if (getBooleanValue(USE_ALTERNATIVE_DASH_PATTERN)) {
-            _kRenderingExtensions.setLineStyle(line, LineStyle.CUSTOM);
-            _kRenderingExtensions.getLineStyle(line).getDashPattern().addAll(ALTERNATIVE_DASH_PATTERN);
-        } else {
-            _kRenderingExtensions.setLineStyle(line, LineStyle.DASH);
-        }
-        return edge;
+    // Add reaction order edges (add last to have them on top of other edges)
+    if (reactorInstance.reactions.size() > 1) {
+      KNode prevNode = reactionNodes.get(IterableExtensions.head(reactorInstance.reactions));
+      Iterable<KNode> iterList =
+          IterableExtensions.map(
+              IterableExtensions.drop(reactorInstance.reactions, 1), reactionNodes::get);
+      for (KNode node : iterList) {
+        KEdge edge = createOrderEdge();
+        edge.setSource(prevNode);
+        edge.setTarget(node);
+        edge.setProperty(CoreOptions.NO_LAYOUT, true);
+
+        // Do not remove them, as they are needed for cycle detection
+        KRendering edgeRendering = _kRenderingExtensions.getKRendering(edge);
+        _kRenderingExtensions.setInvisible(
+            edgeRendering, !getBooleanValue(SHOW_REACTION_ORDER_EDGES));
+        _kRenderingExtensions.getInvisible(edgeRendering).setPropagateToChildren(true);
+        // TODO this does not work work with incremental update
+        // (https://github.com/kieler/KLighD/issues/37)
+        // if (!getBooleanValue(SHOW_REACTION_ORDER_EDGES)) edge.initiallyHide()
+
+        prevNode = node;
+      }
     }
 
-    private KEdge createIODependencyEdge(Object associate, boolean multiport) {
-        KEdge edge = _kEdgeExtensions.createEdge();
-        if (associate != null) {
-            associateWith(edge, associate);
-        }
-        KPolyline line = _kEdgeExtensions.addPolyline(edge);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(line);
-        _kPolylineExtensions.addJunctionPointDecorator(line);
-        if (multiport) {
-            // Render multiport connections and bank connections in bold.
-            _kRenderingExtensions.setLineWidth(line, 2.2f);
-            _kRenderingExtensions.setLineCap(line, LineCap.CAP_SQUARE);
-            // Adjust junction point size
-            _kPolylineExtensions.setJunctionPointDecorator(line, line.getJunctionPointRendering(), 6, 6);
-        }
-        return edge;
-    }
+    _layoutPostProcessing.orderChildren(nodes);
+    _modeDiagrams.handleModes(nodes, reactorInstance);
 
-    private KEdge createDependencyEdge(Object associate) {
-        KEdge edge = _kEdgeExtensions.createEdge();
-        if (associate != null) {
-            associateWith(edge, associate);
-        }
-        KPolyline line = _kEdgeExtensions.addPolyline(edge);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(line);
-        _kPolylineExtensions.addJunctionPointDecorator(line);
-        if (getBooleanValue(USE_ALTERNATIVE_DASH_PATTERN)) {
-            _kRenderingExtensions.setLineStyle(line, LineStyle.CUSTOM);
-            _kRenderingExtensions.getLineStyle(line).getDashPattern().addAll(ALTERNATIVE_DASH_PATTERN);
-        } else {
-            _kRenderingExtensions.setLineStyle(line, LineStyle.DASH);
-        }
-        return edge;
-    }
+    return nodes;
+  }
 
-    private KEdge createOrderEdge() {
-        KEdge edge = _kEdgeExtensions.createEdge();
-        KPolyline line = _kEdgeExtensions.addPolyline(edge);
-        _kRenderingExtensions.setLineWidth(line, 1.5f);
-        _kRenderingExtensions.setLineStyle(line, LineStyle.DOT);
-        _kRenderingExtensions.setForeground(line, Colors.CHOCOLATE_1);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(line);
-        //addFixedTailArrowDecorator() // Fix for bug: https://github.com/kieler/KLighD/issues/38
-        _kPolylineExtensions.addHeadArrowDecorator(line);
-        return edge;
+  private String createReactorLabel(ReactorInstance reactorInstance) {
+    StringBuilder b = new StringBuilder();
+    if (getBooleanValue(SHOW_INSTANCE_NAMES) && !_utilityExtensions.isRoot(reactorInstance)) {
+      if (!reactorInstance.isMainOrFederated()) {
+        b.append(reactorInstance.getName()).append(" : ");
+      }
     }
-
-    private KEdge connect(KEdge edge, KNode src, KNode dst) {
-        edge.setSource(src);
-        edge.setTarget(dst);
-        return edge;
+    if (reactorInstance.isMainOrFederated()) {
+      try {
+        b.append(FileUtil.nameWithoutExtension(reactorInstance.reactorDeclaration.eResource()));
+      } catch (Exception e) {
+        throw Exceptions.sneakyThrow(e);
+      }
+    } else if (reactorInstance.reactorDeclaration == null) {
+      // There is an error in the graph.
+      b.append("<Unresolved Reactor>");
+    } else {
+      b.append(reactorInstance.reactorDeclaration.getName());
     }
-
-    private KEdge connect(KEdge edge, KNode src, KPort dst) {
-        edge.setSource(src);
-        edge.setTargetPort(dst);
-        edge.setTarget(dst != null ? dst.getNode() : null);
-        return edge;
+    if (getObjectValue(REACTOR_PARAMETER_MODE) == ReactorParameterDisplayModes.TITLE) {
+      if (reactorInstance.parameters.isEmpty()) {
+        b.append("()");
+      } else {
+        b.append(
+            IterableExtensions.join(
+                reactorInstance.parameters,
+                "(",
+                ", ",
+                ")",
+                it -> {
+                  return createParameterLabel(it);
+                }));
+      }
     }
-
-    private KEdge connect(KEdge edge, KPort src, KNode dst) {
-        edge.setSourcePort(src);
-        edge.setSource(src != null ? src.getNode() : null);
-        edge.setTarget(dst);
-        return edge;
+    return b.toString();
+  }
+
+  private void addParameterList(KContainerRendering container, List<ParameterInstance> parameters) {
+    int cols = 1;
+    try {
+      cols = getIntValue(REACTOR_BODY_TABLE_COLS);
+    } catch (Exception e) {
+    } // ignore
+    if (cols > parameters.size()) {
+      cols = parameters.size();
+    }
+    _kContainerRenderingExtensions.setGridPlacement(container, cols);
+    for (ParameterInstance param : parameters) {
+      var entry =
+          _linguaFrancaShapeExtensions.addParameterEntry(
+              container, param.getDefinition(), createParameterLabel(param));
+      _kRenderingExtensions.setHorizontalAlignment(entry, HorizontalAlignment.LEFT);
+    }
+  }
+
+  private String createParameterLabel(ParameterInstance param) {
+    StringBuilder b = new StringBuilder();
+    b.append(param.getName());
+    String t = param.type.toOriginalText();
+    if (!StringExtensions.isNullOrEmpty(t)) {
+      b.append(": ").append(t);
+    }
+    if (param.getOverride() != null) {
+      b.append(" = ");
+      var init = param.getActualValue();
+      b.append(FormattingUtils.render(init));
+    }
+    return b.toString();
+  }
+
+  public void addStateVariableList(KContainerRendering container, List<StateVar> variables) {
+    int cols = 1;
+    try {
+      cols = getIntValue(REACTOR_BODY_TABLE_COLS);
+    } catch (Exception e) {
+    } // ignore
+    if (cols > variables.size()) {
+      cols = variables.size();
+    }
+    _kContainerRenderingExtensions.setGridPlacement(container, cols);
+    for (var variable : variables) {
+      var entry =
+          _linguaFrancaShapeExtensions.addStateEntry(
+              container, variable, createStateVariableLabel(variable), variable.isReset());
+      _kRenderingExtensions.setHorizontalAlignment(entry, HorizontalAlignment.LEFT);
     }
+  }
+
+  private String createStateVariableLabel(StateVar variable) {
+    StringBuilder b = new StringBuilder();
+    b.append(variable.getName());
+    if (variable.getType() != null) {
+      var t = InferredType.fromAST(variable.getType());
+      b.append(":").append(t.toOriginalText());
+    }
+    if (variable.getInit() != null) {
+      b.append(FormattingUtils.render(variable.getInit()));
+    }
+    return b.toString();
+  }
+
+  private KEdge createDelayEdge(Object associate) {
+    KEdge edge = _kEdgeExtensions.createEdge();
+    associateWith(edge, associate);
+    KPolyline line = _kEdgeExtensions.addPolyline(edge);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(line);
+    _kPolylineExtensions.addJunctionPointDecorator(line);
+    if (getBooleanValue(USE_ALTERNATIVE_DASH_PATTERN)) {
+      _kRenderingExtensions.setLineStyle(line, LineStyle.CUSTOM);
+      _kRenderingExtensions.getLineStyle(line).getDashPattern().addAll(ALTERNATIVE_DASH_PATTERN);
+    } else {
+      _kRenderingExtensions.setLineStyle(line, LineStyle.DASH);
+    }
+    return edge;
+  }
 
-    private KEdge connect(KEdge edge, KPort src, KPort dst) {
-        edge.setSourcePort(src);
-        edge.setSource(src != null ? src.getNode() : null);
-        edge.setTargetPort(dst);
-        edge.setTarget(dst != null ? dst.getNode() : null);
-        return edge;
+  private KEdge createIODependencyEdge(Object associate, boolean multiport) {
+    KEdge edge = _kEdgeExtensions.createEdge();
+    if (associate != null) {
+      associateWith(edge, associate);
+    }
+    KPolyline line = _kEdgeExtensions.addPolyline(edge);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(line);
+    _kPolylineExtensions.addJunctionPointDecorator(line);
+    if (multiport) {
+      // Render multiport connections and bank connections in bold.
+      _kRenderingExtensions.setLineWidth(line, 2.2f);
+      _kRenderingExtensions.setLineCap(line, LineCap.CAP_SQUARE);
+      // Adjust junction point size
+      _kPolylineExtensions.setJunctionPointDecorator(line, line.getJunctionPointRendering(), 6, 6);
     }
+    return edge;
+  }
 
-    /**
-     * Translate an input/output into a port.
-     */
-    private KPort addIOPort(KNode node, PortInstance lfPort, boolean input, boolean multiport, boolean bank) {
-        KPort port = _kPortExtensions.createPort();
-        node.getPorts().add(port);
-        associateWith(port, lfPort.getDefinition());
-        NamedInstanceUtil.linkInstance(port, lfPort);
-        _kPortExtensions.setPortSize(port, 6, 6);
-
-        if (input) {
-            // multiports are smaller by an offset at the right, hence compensate in inputs
-            double offset = multiport ? -3.4 : -3.3;
-            setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.WEST);
-            setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET, offset);
-        } else {
-            double offset = multiport ? -2.6 : -3.3; // multiports are smaller
-            offset = bank ? offset - LinguaFrancaShapeExtensions.BANK_FIGURE_X_OFFSET_SUM : offset; // compensate bank figure width
-            setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.EAST);
-            setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET, offset);
-        }
+  private KEdge createDependencyEdge(Object associate) {
+    KEdge edge = _kEdgeExtensions.createEdge();
+    if (associate != null) {
+      associateWith(edge, associate);
+    }
+    KPolyline line = _kEdgeExtensions.addPolyline(edge);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(line);
+    _kPolylineExtensions.addJunctionPointDecorator(line);
+    if (getBooleanValue(USE_ALTERNATIVE_DASH_PATTERN)) {
+      _kRenderingExtensions.setLineStyle(line, LineStyle.CUSTOM);
+      _kRenderingExtensions.getLineStyle(line).getDashPattern().addAll(ALTERNATIVE_DASH_PATTERN);
+    } else {
+      _kRenderingExtensions.setLineStyle(line, LineStyle.DASH);
+    }
+    return edge;
+  }
+
+  private KEdge createOrderEdge() {
+    KEdge edge = _kEdgeExtensions.createEdge();
+    KPolyline line = _kEdgeExtensions.addPolyline(edge);
+    _kRenderingExtensions.setLineWidth(line, 1.5f);
+    _kRenderingExtensions.setLineStyle(line, LineStyle.DOT);
+    _kRenderingExtensions.setForeground(line, Colors.CHOCOLATE_1);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(line);
+    // addFixedTailArrowDecorator() // Fix for bug: https://github.com/kieler/KLighD/issues/38
+    _kPolylineExtensions.addHeadArrowDecorator(line);
+    return edge;
+  }
+
+  private KEdge connect(KEdge edge, KNode src, KNode dst) {
+    edge.setSource(src);
+    edge.setTarget(dst);
+    return edge;
+  }
+
+  private KEdge connect(KEdge edge, KNode src, KPort dst) {
+    edge.setSource(src);
+    edge.setTargetPort(dst);
+    edge.setTarget(dst != null ? dst.getNode() : null);
+    return edge;
+  }
+
+  private KEdge connect(KEdge edge, KPort src, KNode dst) {
+    edge.setSourcePort(src);
+    edge.setSource(src != null ? src.getNode() : null);
+    edge.setTarget(dst);
+    return edge;
+  }
+
+  private KEdge connect(KEdge edge, KPort src, KPort dst) {
+    edge.setSourcePort(src);
+    edge.setSource(src != null ? src.getNode() : null);
+    edge.setTargetPort(dst);
+    edge.setTarget(dst != null ? dst.getNode() : null);
+    return edge;
+  }
+
+  /** Translate an input/output into a port. */
+  private KPort addIOPort(
+      KNode node, PortInstance lfPort, boolean input, boolean multiport, boolean bank) {
+    KPort port = _kPortExtensions.createPort();
+    node.getPorts().add(port);
+    associateWith(port, lfPort.getDefinition());
+    NamedInstanceUtil.linkInstance(port, lfPort);
+    _kPortExtensions.setPortSize(port, 6, 6);
+
+    if (input) {
+      // multiports are smaller by an offset at the right, hence compensate in inputs
+      double offset = multiport ? -3.4 : -3.3;
+      setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.WEST);
+      setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET, offset);
+    } else {
+      double offset = multiport ? -2.6 : -3.3; // multiports are smaller
+      offset =
+          bank
+              ? offset - LinguaFrancaShapeExtensions.BANK_FIGURE_X_OFFSET_SUM
+              : offset; // compensate bank figure width
+      setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.EAST);
+      setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET, offset);
+    }
 
-        if (bank && !node.getProperty(REACTOR_HAS_BANK_PORT_OFFSET)) {// compensate bank figure height
-            // https://github.com/eclipse/elk/issues/693
-            _utilityExtensions.getPortMarginsInitIfAbsent(node).add(
-                    new ElkMargin(0, 0, LinguaFrancaShapeExtensions.BANK_FIGURE_Y_OFFSET_SUM, 0));
-            node.setProperty(REACTOR_HAS_BANK_PORT_OFFSET, true); // only once
-        }
+    if (bank && !node.getProperty(REACTOR_HAS_BANK_PORT_OFFSET)) { // compensate bank figure height
+      // https://github.com/eclipse/elk/issues/693
+      _utilityExtensions
+          .getPortMarginsInitIfAbsent(node)
+          .add(new ElkMargin(0, 0, LinguaFrancaShapeExtensions.BANK_FIGURE_Y_OFFSET_SUM, 0));
+      node.setProperty(REACTOR_HAS_BANK_PORT_OFFSET, true); // only once
+    }
 
-        _linguaFrancaShapeExtensions.addTrianglePort(port, multiport);
+    _linguaFrancaShapeExtensions.addTrianglePort(port, multiport);
 
-        String label = lfPort.getName();
-        if (!getBooleanValue(SHOW_PORT_NAMES)) {
-            label = "";
-        }
-        if (getBooleanValue(SHOW_MULTIPORT_WIDTH)) {
-            if (lfPort.isMultiport()) {
-                label += (lfPort.getWidth() >= 0) ?
-                        "[" + lfPort.getWidth() + "]" :
-                        "[?]";
-            }
-        }
-        associateWith(_kLabelExtensions.addOutsidePortLabel(port, label, 8), lfPort.getDefinition());
-        return port;
+    String label = lfPort.getName();
+    if (!getBooleanValue(SHOW_PORT_NAMES)) {
+      label = "";
     }
-
-    private KPort addInvisiblePort(KNode node) {
-        KPort port = _kPortExtensions.createPort();
-        node.getPorts().add(port);
-        port.setSize(0, 0); // invisible
-        return port;
+    if (getBooleanValue(SHOW_MULTIPORT_WIDTH)) {
+      if (lfPort.isMultiport()) {
+        label += (lfPort.getWidth() >= 0) ? "[" + lfPort.getWidth() + "]" : "[?]";
+      }
     }
-
-    private KNode addErrorComment(KNode node, String message) {
+    associateWith(_kLabelExtensions.addOutsidePortLabel(port, label, 8), lfPort.getDefinition());
+    return port;
+  }
+
+  private KPort addInvisiblePort(KNode node) {
+    KPort port = _kPortExtensions.createPort();
+    node.getPorts().add(port);
+    port.setSize(0, 0); // invisible
+    return port;
+  }
+
+  private KNode addErrorComment(KNode node, String message) {
+    KNode comment = _kNodeExtensions.createNode();
+    setLayoutOption(comment, CoreOptions.COMMENT_BOX, true);
+    KRoundedRectangle commentFigure =
+        _linguaFrancaShapeExtensions.addCommentFigure(comment, message);
+    _linguaFrancaStyleExtensions.errorStyle(commentFigure);
+    _kRenderingExtensions.setBackground(commentFigure, Colors.PEACH_PUFF_2);
+
+    // connect
+    KEdge edge = _kEdgeExtensions.createEdge();
+    edge.setSource(comment);
+    edge.setTarget(node);
+    _linguaFrancaStyleExtensions.errorStyle(_linguaFrancaShapeExtensions.addCommentPolyline(edge));
+    return comment;
+  }
+
+  private Iterable<KNode> createUserComments(EObject element, KNode targetNode) {
+    if (getBooleanValue(SHOW_USER_LABELS)) {
+      String commentText = AttributeUtils.getLabel(element);
+
+      if (!StringExtensions.isNullOrEmpty(commentText)) {
         KNode comment = _kNodeExtensions.createNode();
         setLayoutOption(comment, CoreOptions.COMMENT_BOX, true);
-        KRoundedRectangle commentFigure = _linguaFrancaShapeExtensions.addCommentFigure(comment, message);
-        _linguaFrancaStyleExtensions.errorStyle(commentFigure);
-        _kRenderingExtensions.setBackground(commentFigure, Colors.PEACH_PUFF_2);
+        KRoundedRectangle commentFigure =
+            _linguaFrancaShapeExtensions.addCommentFigure(comment, commentText);
+        _linguaFrancaStyleExtensions.commentStyle(commentFigure);
 
         // connect
         KEdge edge = _kEdgeExtensions.createEdge();
         edge.setSource(comment);
-        edge.setTarget(node);
-        _linguaFrancaStyleExtensions.errorStyle(_linguaFrancaShapeExtensions.addCommentPolyline(edge));
-        return comment;
-    }
-
-    private Iterable<KNode> createUserComments(EObject element, KNode targetNode) {
-        if (getBooleanValue(SHOW_USER_LABELS)) {
-            String commentText = AttributeUtils.getLabel(element);
-
-            if (!StringExtensions.isNullOrEmpty(commentText)) {
-                KNode comment = _kNodeExtensions.createNode();
-                setLayoutOption(comment, CoreOptions.COMMENT_BOX, true);
-                KRoundedRectangle commentFigure = _linguaFrancaShapeExtensions.addCommentFigure(comment, commentText);
-                _linguaFrancaStyleExtensions.commentStyle(commentFigure);
+        edge.setTarget(targetNode);
+        _linguaFrancaStyleExtensions.commentStyle(
+            _linguaFrancaShapeExtensions.addCommentPolyline(edge));
 
-                // connect
-                KEdge edge = _kEdgeExtensions.createEdge();
-                edge.setSource(comment);
-                edge.setTarget(targetNode);
-                _linguaFrancaStyleExtensions.commentStyle(_linguaFrancaShapeExtensions.addCommentPolyline(edge));
-
-                return List.of(comment);
-            }
-        }
-        return List.of();
+        return List.of(comment);
+      }
     }
-
+    return List.of();
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/ReactorParameterDisplayModes.java b/org.lflang/src/org/lflang/diagram/synthesis/ReactorParameterDisplayModes.java
index 23365eeff9..dba7c94dde 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/ReactorParameterDisplayModes.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/ReactorParameterDisplayModes.java
@@ -1,47 +1,51 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.diagram.synthesis;
 
 /**
  * Enumeration of different display options for reactor parameters.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public enum ReactorParameterDisplayModes {
-    NONE,
-    TITLE,
-    TABLE;
-    
-    @Override
-    public String toString() {
-        switch(this) {
-            case NONE: return "None";
-            case TITLE: return "List in Title";
-            case TABLE: return "Table in Body";
-            default: return "";
-        }
+  NONE,
+  TITLE,
+  TABLE;
+
+  @Override
+  public String toString() {
+    switch (this) {
+      case NONE:
+        return "None";
+      case TITLE:
+        return "List in Title";
+      case TABLE:
+        return "Table in Body";
+      default:
+        return "";
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/SynthesisRegistration.java b/org.lflang/src/org/lflang/diagram/synthesis/SynthesisRegistration.java
index f1e217b9f1..c48d2e59ee 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/SynthesisRegistration.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/SynthesisRegistration.java
@@ -1,5 +1,7 @@
 package org.lflang.diagram.synthesis;
 
+import de.cau.cs.kieler.klighd.IKlighdStartupHook;
+import de.cau.cs.kieler.klighd.KlighdDataManager;
 import org.lflang.diagram.synthesis.action.CollapseAllReactorsAction;
 import org.lflang.diagram.synthesis.action.ExpandAllReactorsAction;
 import org.lflang.diagram.synthesis.action.FilterCycleAction;
@@ -10,43 +12,42 @@
 import org.lflang.diagram.synthesis.styles.LinguaFrancaStyleExtensions;
 import org.lflang.diagram.synthesis.util.NamedInstanceUtil;
 
-import de.cau.cs.kieler.klighd.IKlighdStartupHook;
-import de.cau.cs.kieler.klighd.KlighdDataManager;
-
 /**
  * Registration of all diagram synthesis related classes in Klighd.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class SynthesisRegistration implements IKlighdStartupHook {
-    
-    @Override
-    public void execute() {
-        KlighdDataManager reg = KlighdDataManager.getInstance();
-        
-        // Synthesis
-        reg.registerDiagramSynthesisClass(LinguaFrancaSynthesis.ID, LinguaFrancaSynthesis.class);
-        
-        // Actions
-        reg.registerAction(MemorizingExpandCollapseAction.ID, new MemorizingExpandCollapseAction());
-        reg.registerAction(ExpandAllReactorsAction.ID, new ExpandAllReactorsAction());
-        reg.registerAction(CollapseAllReactorsAction.ID, new CollapseAllReactorsAction());
-        reg.registerAction(ShowCycleAction.ID, new ShowCycleAction());
-        reg.registerAction(FilterCycleAction.ID, new FilterCycleAction());
-        
-        // Style Mod
-        reg.registerStyleModifier(ReactionPortAdjustment.ID, new ReactionPortAdjustment());
-        
-        // Blacklist LF-specific properties that should be removed when a diagram is sent from the diagram server to a client.
-        reg.registerBlacklistedProperty(FilterCycleAction.FILTER_BUTTON);
-        reg.registerBlacklistedProperty(LinguaFrancaSynthesis.REACTOR_HAS_BANK_PORT_OFFSET);
-        reg.registerBlacklistedProperty(LinguaFrancaSynthesis.REACTOR_INPUT);
-        reg.registerBlacklistedProperty(LinguaFrancaSynthesis.REACTOR_OUTPUT);
-        reg.registerBlacklistedProperty(LinguaFrancaSynthesis.REACTION_SPECIAL_TRIGGER);
-        reg.registerBlacklistedProperty(ReactionPortAdjustment.PROCESSED);
-        reg.registerBlacklistedProperty(LinguaFrancaShapeExtensions.REACTOR_CONTENT_CONTAINER);
-        reg.registerBlacklistedProperty(LinguaFrancaStyleExtensions.LABEL_PARENT_BACKGROUND);
-        reg.registerBlacklistedProperty(NamedInstanceUtil.LINKED_INSTANCE); // Very important since its values can not be synthesized easily!
-    }
-    
+
+  @Override
+  public void execute() {
+    KlighdDataManager reg = KlighdDataManager.getInstance();
+
+    // Synthesis
+    reg.registerDiagramSynthesisClass(LinguaFrancaSynthesis.ID, LinguaFrancaSynthesis.class);
+
+    // Actions
+    reg.registerAction(MemorizingExpandCollapseAction.ID, new MemorizingExpandCollapseAction());
+    reg.registerAction(ExpandAllReactorsAction.ID, new ExpandAllReactorsAction());
+    reg.registerAction(CollapseAllReactorsAction.ID, new CollapseAllReactorsAction());
+    reg.registerAction(ShowCycleAction.ID, new ShowCycleAction());
+    reg.registerAction(FilterCycleAction.ID, new FilterCycleAction());
+
+    // Style Mod
+    reg.registerStyleModifier(ReactionPortAdjustment.ID, new ReactionPortAdjustment());
+
+    // Blacklist LF-specific properties that should be removed when a diagram is sent from the
+    // diagram server to a client.
+    reg.registerBlacklistedProperty(FilterCycleAction.FILTER_BUTTON);
+    reg.registerBlacklistedProperty(LinguaFrancaSynthesis.REACTOR_HAS_BANK_PORT_OFFSET);
+    reg.registerBlacklistedProperty(LinguaFrancaSynthesis.REACTOR_INPUT);
+    reg.registerBlacklistedProperty(LinguaFrancaSynthesis.REACTOR_OUTPUT);
+    reg.registerBlacklistedProperty(LinguaFrancaSynthesis.REACTION_SPECIAL_TRIGGER);
+    reg.registerBlacklistedProperty(ReactionPortAdjustment.PROCESSED);
+    reg.registerBlacklistedProperty(LinguaFrancaShapeExtensions.REACTOR_CONTENT_CONTAINER);
+    reg.registerBlacklistedProperty(LinguaFrancaStyleExtensions.LABEL_PARENT_BACKGROUND);
+    reg.registerBlacklistedProperty(
+        NamedInstanceUtil
+            .LINKED_INSTANCE); // Very important since its values can not be synthesized easily!
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/action/AbstractAction.java b/org.lflang/src/org/lflang/diagram/synthesis/action/AbstractAction.java
index d665dff433..e840b99077 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/action/AbstractAction.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/action/AbstractAction.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.action;
 
 import de.cau.cs.kieler.klighd.IAction;
@@ -32,24 +32,23 @@
 
 /**
  * Abstract super class for diagram actions that provides some convince methods.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public abstract class AbstractAction implements IAction {
-    public Object sourceElement(final KGraphElement elem) {
-        return elem.getProperty(KlighdInternalProperties.MODEL_ELEMEMT);
-    }
-    
-    public boolean sourceIs(KNode node, Class<?> clazz) {
-        return clazz.isInstance(sourceElement(node));
-    }
-    
-    public boolean sourceIsReactor(final KNode node) {
-        return sourceElement(node) instanceof Reactor;
-    }
-    
-    public Reactor sourceAsReactor(final KNode node) {
-        return sourceIsReactor(node) ? (Reactor) sourceElement(node) : null;
-    }
+  public Object sourceElement(final KGraphElement elem) {
+    return elem.getProperty(KlighdInternalProperties.MODEL_ELEMEMT);
+  }
+
+  public boolean sourceIs(KNode node, Class<?> clazz) {
+    return clazz.isInstance(sourceElement(node));
+  }
+
+  public boolean sourceIsReactor(final KNode node) {
+    return sourceElement(node) instanceof Reactor;
+  }
+
+  public Reactor sourceAsReactor(final KNode node) {
+    return sourceIsReactor(node) ? (Reactor) sourceElement(node) : null;
+  }
 }
-  
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/action/CollapseAllReactorsAction.java b/org.lflang/src/org/lflang/diagram/synthesis/action/CollapseAllReactorsAction.java
index 0927caeb37..712e9d9e66 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/action/CollapseAllReactorsAction.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/action/CollapseAllReactorsAction.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.action;
 
 import de.cau.cs.kieler.klighd.IAction;
@@ -29,36 +29,32 @@
 import de.cau.cs.kieler.klighd.kgraph.KNode;
 import de.cau.cs.kieler.klighd.util.ModelingUtil;
 import java.util.Iterator;
-import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.lflang.diagram.synthesis.util.NamedInstanceUtil;
 import org.lflang.lf.Mode;
 
 /**
  * Action that expands (shows details) of all reactor nodes.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class CollapseAllReactorsAction extends AbstractAction {
-    
-    public static final String ID = "org.lflang.diagram.synthesis.action.CollapseAllReactorsAction";
-    
-    @Override
-    public IAction.ActionResult execute(final IAction.ActionContext context) {
-        ViewContext vc = context.getViewContext();
-        Iterator<KNode> nodes = ModelingUtil.eAllContentsOfType(vc.getViewModel(), KNode.class);
-        
-        while(nodes.hasNext()) {
-            var node = nodes.next();
-            if (sourceIs(node, Mode.class) || (sourceIsReactor(node) &&
-                    !(sourceAsReactor(node).isMain() || sourceAsReactor(node).isFederated()))) {
-                MemorizingExpandCollapseAction.setExpansionState(
-                    node, 
-                    NamedInstanceUtil.getLinkedInstance(node), 
-                    vc.getViewer(), 
-                    false
-                );
-            }
-        }
-        return IAction.ActionResult.createResult(true);
+
+  public static final String ID = "org.lflang.diagram.synthesis.action.CollapseAllReactorsAction";
+
+  @Override
+  public IAction.ActionResult execute(final IAction.ActionContext context) {
+    ViewContext vc = context.getViewContext();
+    Iterator<KNode> nodes = ModelingUtil.eAllContentsOfType(vc.getViewModel(), KNode.class);
+
+    while (nodes.hasNext()) {
+      var node = nodes.next();
+      if (sourceIs(node, Mode.class)
+          || (sourceIsReactor(node)
+              && !(sourceAsReactor(node).isMain() || sourceAsReactor(node).isFederated()))) {
+        MemorizingExpandCollapseAction.setExpansionState(
+            node, NamedInstanceUtil.getLinkedInstance(node), vc.getViewer(), false);
+      }
     }
+    return IAction.ActionResult.createResult(true);
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/action/ExpandAllReactorsAction.java b/org.lflang/src/org/lflang/diagram/synthesis/action/ExpandAllReactorsAction.java
index 08f8b5a115..bdd7c173d6 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/action/ExpandAllReactorsAction.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/action/ExpandAllReactorsAction.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.action;
 
 import de.cau.cs.kieler.klighd.IAction;
@@ -29,36 +29,30 @@
 import de.cau.cs.kieler.klighd.kgraph.KNode;
 import de.cau.cs.kieler.klighd.util.ModelingUtil;
 import java.util.Iterator;
-import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.lflang.diagram.synthesis.util.NamedInstanceUtil;
 import org.lflang.lf.Mode;
 
 /**
  * Action that collapses (hides details) of all reactor nodes.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class ExpandAllReactorsAction extends AbstractAction {
 
-    public static final String ID = "org.lflang.diagram.synthesis.action.ExpandAllReactorsAction";
-    
-    @Override
-    public IAction.ActionResult execute(final IAction.ActionContext context) {
-        ViewContext vc = context.getViewContext();
-        Iterator<KNode> nodes = ModelingUtil.eAllContentsOfType(vc.getViewModel(), KNode.class);
-        
-        while(nodes.hasNext()) {
-            var node = nodes.next();
-            if (sourceIs(node, Mode.class) || sourceIsReactor(node)) {
-                MemorizingExpandCollapseAction.setExpansionState(
-                        node, 
-                        NamedInstanceUtil.getLinkedInstance(node), 
-                        vc.getViewer(), 
-                        true
-                );
-            }
-        }
-        return IAction.ActionResult.createResult(true);
+  public static final String ID = "org.lflang.diagram.synthesis.action.ExpandAllReactorsAction";
+
+  @Override
+  public IAction.ActionResult execute(final IAction.ActionContext context) {
+    ViewContext vc = context.getViewContext();
+    Iterator<KNode> nodes = ModelingUtil.eAllContentsOfType(vc.getViewModel(), KNode.class);
+
+    while (nodes.hasNext()) {
+      var node = nodes.next();
+      if (sourceIs(node, Mode.class) || sourceIsReactor(node)) {
+        MemorizingExpandCollapseAction.setExpansionState(
+            node, NamedInstanceUtil.getLinkedInstance(node), vc.getViewer(), true);
+      }
     }
+    return IAction.ActionResult.createResult(true);
+  }
 }
-  
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/action/FilterCycleAction.java b/org.lflang/src/org/lflang/diagram/synthesis/action/FilterCycleAction.java
index 6daf07a1b3..bbe20806a3 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/action/FilterCycleAction.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/action/FilterCycleAction.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.action;
 
 import com.google.common.collect.Iterables;
@@ -31,7 +31,6 @@
 import de.cau.cs.kieler.klighd.kgraph.KEdge;
 import de.cau.cs.kieler.klighd.kgraph.KNode;
 import de.cau.cs.kieler.klighd.krendering.KText;
-
 import java.util.Iterator;
 import java.util.List;
 import java.util.WeakHashMap;
@@ -46,112 +45,115 @@
 
 /**
  * Action that filters the diagram for only those elements included in a cycle.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class FilterCycleAction extends AbstractAction {
-    
-    public static final String ID = "org.lflang.diagram.synthesis.action.FilterCycleAction";
-    
-    /**
-     * Memory-leak-free cache of filtered states
-     */
-    private static final WeakHashMap<Object, Boolean> FILTERING_STATES = new WeakHashMap<>();
-    
-    /**
-     * INTERNAL property to mark filter button.
-     */
-    public static final Property<Boolean> FILTER_BUTTON = new Property<>("org.lflang.diagram.synthesis.action.cyclefilter.button", false);
-    
-    @Override
-    public IAction.ActionResult execute(final IAction.ActionContext context) {
-        ViewContext vc = context.getViewContext();
-        Object all = vc.getOptionValue(LinguaFrancaSynthesis.SHOW_ALL_REACTORS);
-        List<KNode> nodes = vc.getViewModel().getChildren();
-
-        if (all instanceof Boolean && (Boolean) all) {
-            nodes = IterableExtensions.toList(
-                        Iterables.concat(
-                            ListExtensions.map(
-                                nodes, it -> { return it.getChildren(); }
-                            )
-                        )
-                    );
-        }
 
-        if (IterableExtensions.exists(nodes, this::isCycleFiltered)) {
-            // undo
-            nodes.forEach(this::resetCycleFiltering);
-            
-            // re-synthesize everything
-            vc.getViewModel().getChildren().clear();
-              vc.update();
-        } else {
-            // filter
-            nodes.forEach(it -> {
-                this.markCycleFiltered(it);
-                this.filterCycle(it);
-            });
-
-            Function1<KNode, Boolean> knodeFilterButton = it -> { 
-                return it.getProperty(FILTER_BUTTON); 
-            };
-            
-            Function1<KText, Boolean> ktextFilterButton = it -> { 
-                return it.getProperty(FILTER_BUTTON); 
-            };
-
-            // switch filter label
-            for (KNode node : IterableExtensions.filter(nodes, knodeFilterButton)) {
-                Iterator<KText> ktexts = Iterators.filter(node.eAllContents(), KText.class);
-                KText text = IteratorExtensions.findFirst(ktexts, ktextFilterButton);
-                if (text != null) {
-                    text.setText(LinguaFrancaSynthesis.TEXT_ERROR_CYCLE_BTN_UNFILTER);
-                }
-            }
+  public static final String ID = "org.lflang.diagram.synthesis.action.FilterCycleAction";
+
+  /** Memory-leak-free cache of filtered states */
+  private static final WeakHashMap<Object, Boolean> FILTERING_STATES = new WeakHashMap<>();
+
+  /** INTERNAL property to mark filter button. */
+  public static final Property<Boolean> FILTER_BUTTON =
+      new Property<>("org.lflang.diagram.synthesis.action.cyclefilter.button", false);
+
+  @Override
+  public IAction.ActionResult execute(final IAction.ActionContext context) {
+    ViewContext vc = context.getViewContext();
+    Object all = vc.getOptionValue(LinguaFrancaSynthesis.SHOW_ALL_REACTORS);
+    List<KNode> nodes = vc.getViewModel().getChildren();
+
+    if (all instanceof Boolean && (Boolean) all) {
+      nodes =
+          IterableExtensions.toList(
+              Iterables.concat(
+                  ListExtensions.map(
+                      nodes,
+                      it -> {
+                        return it.getChildren();
+                      })));
+    }
+
+    if (IterableExtensions.exists(nodes, this::isCycleFiltered)) {
+      // undo
+      nodes.forEach(this::resetCycleFiltering);
+
+      // re-synthesize everything
+      vc.getViewModel().getChildren().clear();
+      vc.update();
+    } else {
+      // filter
+      nodes.forEach(
+          it -> {
+            this.markCycleFiltered(it);
+            this.filterCycle(it);
+          });
+
+      Function1<KNode, Boolean> knodeFilterButton =
+          it -> {
+            return it.getProperty(FILTER_BUTTON);
+          };
+
+      Function1<KText, Boolean> ktextFilterButton =
+          it -> {
+            return it.getProperty(FILTER_BUTTON);
+          };
+
+      // switch filter label
+      for (KNode node : IterableExtensions.filter(nodes, knodeFilterButton)) {
+        Iterator<KText> ktexts = Iterators.filter(node.eAllContents(), KText.class);
+        KText text = IteratorExtensions.findFirst(ktexts, ktextFilterButton);
+        if (text != null) {
+          text.setText(LinguaFrancaSynthesis.TEXT_ERROR_CYCLE_BTN_UNFILTER);
         }
-        
-        return IAction.ActionResult.createResult(true);
+      }
     }
-    
-    public void filterCycle(KNode root) {
-        Predicate<KNode> knodeNotInCycle = it -> {
-            return !it.getProperty(CycleVisualization.DEPENDENCY_CYCLE);
+
+    return IAction.ActionResult.createResult(true);
+  }
+
+  public void filterCycle(KNode root) {
+    Predicate<KNode> knodeNotInCycle =
+        it -> {
+          return !it.getProperty(CycleVisualization.DEPENDENCY_CYCLE);
         };
-        
-        Predicate<KEdge> kedgeNotInCycle = it -> {
-            return !it.getProperty(CycleVisualization.DEPENDENCY_CYCLE);
+
+    Predicate<KEdge> kedgeNotInCycle =
+        it -> {
+          return !it.getProperty(CycleVisualization.DEPENDENCY_CYCLE);
         };
-        
-        root.getChildren().removeIf(knodeNotInCycle);
-        for (KNode node : root.getChildren()) {
-            node.getOutgoingEdges().removeIf(kedgeNotInCycle);
-            this.filterCycle(node);
-        }
-    }
 
-    public void markCycleFiltered(KNode node) {
-        Object source = this.sourceElement(node);
-        if (source != null) {
-            FILTERING_STATES.put(source, true);
-        }
-    }
-    
-    public void resetCycleFiltering(KNode node) {
-        Object source = this.sourceElement(node);
-        if (source != null) {
-            FILTERING_STATES.remove(source);
-        }
+    root.getChildren().removeIf(knodeNotInCycle);
+    for (KNode node : root.getChildren()) {
+      node.getOutgoingEdges().removeIf(kedgeNotInCycle);
+      this.filterCycle(node);
     }
+  }
 
-    public boolean isCycleFiltered(KNode node) {
-        Object source = this.sourceElement(node);
-        Boolean result = FILTERING_STATES.get(source);
-        return result == null ? false : result;
+  public void markCycleFiltered(KNode node) {
+    Object source = this.sourceElement(node);
+    if (source != null) {
+      FILTERING_STATES.put(source, true);
     }
+  }
 
-    public void markCycleFilterText(KText text, KNode node) {
-        text.setProperty(FILTER_BUTTON, true);
-        node.setProperty(FILTER_BUTTON, true);
+  public void resetCycleFiltering(KNode node) {
+    Object source = this.sourceElement(node);
+    if (source != null) {
+      FILTERING_STATES.remove(source);
     }
+  }
+
+  public boolean isCycleFiltered(KNode node) {
+    Object source = this.sourceElement(node);
+    Boolean result = FILTERING_STATES.get(source);
+    return result == null ? false : result;
+  }
+
+  public void markCycleFilterText(KText text, KNode node) {
+    text.setProperty(FILTER_BUTTON, true);
+    node.setProperty(FILTER_BUTTON, true);
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/action/MemorizingExpandCollapseAction.java b/org.lflang/src/org/lflang/diagram/synthesis/action/MemorizingExpandCollapseAction.java
index 20347e2c22..b9a91fe08c 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/action/MemorizingExpandCollapseAction.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/action/MemorizingExpandCollapseAction.java
@@ -1,123 +1,119 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.action;
 
-import java.util.WeakHashMap;
-
-import org.lflang.diagram.synthesis.util.InterfaceDependenciesVisualization;
-import org.lflang.diagram.synthesis.util.NamedInstanceUtil;
-import org.lflang.generator.NamedInstance;
-import org.lflang.generator.ReactorInstance;
-
 import com.google.common.base.Preconditions;
-
 import de.cau.cs.kieler.klighd.IAction;
 import de.cau.cs.kieler.klighd.IViewer;
 import de.cau.cs.kieler.klighd.SynthesisOption;
 import de.cau.cs.kieler.klighd.ViewContext;
 import de.cau.cs.kieler.klighd.kgraph.KNode;
+import java.util.WeakHashMap;
+import org.lflang.diagram.synthesis.util.InterfaceDependenciesVisualization;
+import org.lflang.diagram.synthesis.util.NamedInstanceUtil;
+import org.lflang.generator.NamedInstance;
+import org.lflang.generator.ReactorInstance;
 
 /**
- * Action for toggling collapse/expand state of reactors that memorizes the state and
- * allows correct initialization synthesis runs for the same model.
- * Prevents automatic collapsing of manually expanded nodes.
- * 
+ * Action for toggling collapse/expand state of reactors that memorizes the state and allows correct
+ * initialization synthesis runs for the same model. Prevents automatic collapsing of manually
+ * expanded nodes.
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class MemorizingExpandCollapseAction extends AbstractAction {
-    
-    public static final String ID = "org.lflang.diagram.synthesis.action.MemorizingExpandCollapseAction";
-    
-    /**
-     * The related synthesis option
-     */
-    public static final SynthesisOption MEMORIZE_EXPANSION_STATES = SynthesisOption.createCheckOption("Remember Collapsed/Expanded Reactors", true);
-    
-    /**
-     * Memory-leak-free cache of expansion states
-     */
-    private static final WeakHashMap<Object, Boolean> EXPANSION_STATES = new WeakHashMap<>();
-        
-    /**
-     * Sets the expansion state of a node and saves it for future synthesis.
-     */
-    public static void setExpansionState(final KNode node, final Object memorizableObj, final IViewer viewer, final boolean expand) {
 
-        Preconditions.checkNotNull(node);
-        
-        // Store new state if activated
-        if (((Boolean) viewer.getViewContext().getOptionValue(MEMORIZE_EXPANSION_STATES)) && memorizableObj != null) {
-            if (memorizableObj instanceof NamedInstance<?>) {
-                EXPANSION_STATES.put(((NamedInstance<?>) memorizableObj).uniqueID(), expand);
-            } else {
-                EXPANSION_STATES.put(memorizableObj, expand);
-            }
-        }
-        
-        // Apply state
-        if (expand) {
-            viewer.expand(node);
-        } else {
-            viewer.collapse(node);
-        }
-        
-        // Handle edges that should only appear for one of the renderings
-        InterfaceDependenciesVisualization.updateInterfaceDependencyVisibility(node, expand);
+  public static final String ID =
+      "org.lflang.diagram.synthesis.action.MemorizingExpandCollapseAction";
+
+  /** The related synthesis option */
+  public static final SynthesisOption MEMORIZE_EXPANSION_STATES =
+      SynthesisOption.createCheckOption("Remember Collapsed/Expanded Reactors", true);
+
+  /** Memory-leak-free cache of expansion states */
+  private static final WeakHashMap<Object, Boolean> EXPANSION_STATES = new WeakHashMap<>();
+
+  /** Sets the expansion state of a node and saves it for future synthesis. */
+  public static void setExpansionState(
+      final KNode node, final Object memorizableObj, final IViewer viewer, final boolean expand) {
+
+    Preconditions.checkNotNull(node);
+
+    // Store new state if activated
+    if (((Boolean) viewer.getViewContext().getOptionValue(MEMORIZE_EXPANSION_STATES))
+        && memorizableObj != null) {
+      if (memorizableObj instanceof NamedInstance<?>) {
+        EXPANSION_STATES.put(((NamedInstance<?>) memorizableObj).uniqueID(), expand);
+      } else {
+        EXPANSION_STATES.put(memorizableObj, expand);
+      }
     }
-    
-    /**
-     * @return the memorized expansion state of the given model element or null if not memorized
-     */
-    public static Boolean getExpansionState(final Object obj) {
-        if (obj instanceof NamedInstance<?>) {
-            return EXPANSION_STATES.get(((NamedInstance<?>) obj).uniqueID());
-        }
-        return EXPANSION_STATES.get(obj);
+
+    // Apply state
+    if (expand) {
+      viewer.expand(node);
+    } else {
+      viewer.collapse(node);
     }
-    
-    //-----------------------------------------------------------------------------------------------------------------
-    
-    @Override
-    public IAction.ActionResult execute(final IAction.ActionContext context) {
-        ViewContext vc = context.getViewContext();
-        IViewer v = vc.getViewer();
-        KNode node = context.getKNode();
-        NamedInstance<?> linkedInstance = NamedInstanceUtil.getLinkedInstance(node);
-        
-        // Find node that is properly linked
-        while(node != null && linkedInstance == null) {
-            node = node.getParent();
-            linkedInstance = NamedInstanceUtil.getLinkedInstance(node);
-        }
-        
-        if (node == null || (linkedInstance instanceof ReactorInstance && ((ReactorInstance) linkedInstance).isMainOrFederated())) {
-            return IAction.ActionResult.createResult(false);
-        } else {
-            setExpansionState(node, linkedInstance, v, !v.isExpanded(node)); // toggle
-            return IAction.ActionResult.createResult(true);
-        }
+
+    // Handle edges that should only appear for one of the renderings
+    InterfaceDependenciesVisualization.updateInterfaceDependencyVisibility(node, expand);
+  }
+
+  /**
+   * @return the memorized expansion state of the given model element or null if not memorized
+   */
+  public static Boolean getExpansionState(final Object obj) {
+    if (obj instanceof NamedInstance<?>) {
+      return EXPANSION_STATES.get(((NamedInstance<?>) obj).uniqueID());
+    }
+    return EXPANSION_STATES.get(obj);
+  }
+
+  // -----------------------------------------------------------------------------------------------------------------
+
+  @Override
+  public IAction.ActionResult execute(final IAction.ActionContext context) {
+    ViewContext vc = context.getViewContext();
+    IViewer v = vc.getViewer();
+    KNode node = context.getKNode();
+    NamedInstance<?> linkedInstance = NamedInstanceUtil.getLinkedInstance(node);
+
+    // Find node that is properly linked
+    while (node != null && linkedInstance == null) {
+      node = node.getParent();
+      linkedInstance = NamedInstanceUtil.getLinkedInstance(node);
+    }
+
+    if (node == null
+        || (linkedInstance instanceof ReactorInstance
+            && ((ReactorInstance) linkedInstance).isMainOrFederated())) {
+      return IAction.ActionResult.createResult(false);
+    } else {
+      setExpansionState(node, linkedInstance, v, !v.isExpanded(node)); // toggle
+      return IAction.ActionResult.createResult(true);
     }
-    
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/action/ShowCycleAction.java b/org.lflang/src/org/lflang/diagram/synthesis/action/ShowCycleAction.java
index fb947511e4..5640adc424 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/action/ShowCycleAction.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/action/ShowCycleAction.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.action;
 
 import de.cau.cs.kieler.klighd.IAction;
@@ -31,61 +31,58 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Set;
-
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.lflang.diagram.synthesis.util.CycleVisualization;
 import org.lflang.diagram.synthesis.util.NamedInstanceUtil;
 
 /**
  * Action that expands all reactor nodes that are included in a cycle.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class ShowCycleAction extends AbstractAction {
-    
-    public static final String ID = "org.lflang.diagram.synthesis.action.ShowCycleAction";
 
-    private static final CollapseAllReactorsAction collapseAll = new CollapseAllReactorsAction();
-    
-    @Override
-    public IAction.ActionResult execute(final IAction.ActionContext context) {
-        ViewContext vc = context.getViewContext();
-        
-        // Collapse all
-        collapseAll.execute(context);
-        
-        // Expand only errors
-        Iterator<KNode> knodes = ModelingUtil.eAllContentsOfType(vc.getViewModel(), KNode.class);
-        
-        // Filter out nodes that are not in cycle or not a reactor
-        knodes = IteratorExtensions.filter(knodes, it -> {
-            return it.getProperty(CycleVisualization.DEPENDENCY_CYCLE) && sourceIsReactor(it);
-        });
-        
-        // Remove duplicates
-        Set<KNode> cycleNodes = IteratorExtensions.toSet(knodes);
+  public static final String ID = "org.lflang.diagram.synthesis.action.ShowCycleAction";
+
+  private static final CollapseAllReactorsAction collapseAll = new CollapseAllReactorsAction();
+
+  @Override
+  public IAction.ActionResult execute(final IAction.ActionContext context) {
+    ViewContext vc = context.getViewContext();
+
+    // Collapse all
+    collapseAll.execute(context);
+
+    // Expand only errors
+    Iterator<KNode> knodes = ModelingUtil.eAllContentsOfType(vc.getViewModel(), KNode.class);
 
-        // Include parents
-        LinkedList<KNode> check = new LinkedList<>(cycleNodes);
+    // Filter out nodes that are not in cycle or not a reactor
+    knodes =
+        IteratorExtensions.filter(
+            knodes,
+            it -> {
+              return it.getProperty(CycleVisualization.DEPENDENCY_CYCLE) && sourceIsReactor(it);
+            });
+
+    // Remove duplicates
+    Set<KNode> cycleNodes = IteratorExtensions.toSet(knodes);
+
+    // Include parents
+    LinkedList<KNode> check = new LinkedList<>(cycleNodes);
+
+    while (!check.isEmpty()) {
+      KNode parent = check.pop().getParent();
+      if (parent != null && !cycleNodes.contains(parent)) {
+        cycleNodes.add(parent);
+        check.add(parent);
+      }
+    }
 
-        while (!check.isEmpty()) {
-            KNode parent = check.pop().getParent();
-            if (parent != null && !cycleNodes.contains(parent)) {
-                cycleNodes.add(parent);
-                check.add(parent);
-            }
-        }
-        
-        // Expand
-        for (KNode node : cycleNodes) {
-            MemorizingExpandCollapseAction.setExpansionState(
-                node, 
-                NamedInstanceUtil.getLinkedInstance(node), 
-                vc.getViewer(), 
-                true
-            );
-        }
-        return IAction.ActionResult.createResult(true);
+    // Expand
+    for (KNode node : cycleNodes) {
+      MemorizingExpandCollapseAction.setExpansionState(
+          node, NamedInstanceUtil.getLinkedInstance(node), vc.getViewer(), true);
     }
-    
+    return IAction.ActionResult.createResult(true);
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactionPortAdjustment.java b/org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactionPortAdjustment.java
index db3a42fd7a..4507039b28 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactionPortAdjustment.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactionPortAdjustment.java
@@ -1,39 +1,29 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.postprocessor;
 
-import java.util.stream.Collectors;
-
-import org.eclipse.elk.core.options.CoreOptions;
-import org.eclipse.elk.core.options.PortSide;
-import org.eclipse.elk.graph.properties.Property;
-import org.eclipse.xtext.xbase.lib.Extension;
-import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.Pair;
-import org.lflang.diagram.synthesis.styles.LinguaFrancaShapeExtensions;
-
 import de.cau.cs.kieler.klighd.IStyleModifier;
 import de.cau.cs.kieler.klighd.IViewer;
 import de.cau.cs.kieler.klighd.internal.ILayoutRecorder;
@@ -45,142 +35,159 @@
 import de.cau.cs.kieler.klighd.kgraph.KPort;
 import de.cau.cs.kieler.klighd.krendering.KRendering;
 import de.cau.cs.kieler.klighd.krendering.KRenderingFactory;
+import java.util.stream.Collectors;
+import org.eclipse.elk.core.options.CoreOptions;
+import org.eclipse.elk.core.options.PortSide;
+import org.eclipse.elk.graph.properties.Property;
+import org.eclipse.xtext.xbase.lib.Extension;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.Pair;
+import org.lflang.diagram.synthesis.styles.LinguaFrancaShapeExtensions;
 
 /**
- * Adjusts the port position of reactions node AFTER layout, to allow free port order but also adapt (snuggle) to pointy shape of reaction node.
- * 
+ * Adjusts the port position of reactions node AFTER layout, to allow free port order but also adapt
+ * (snuggle) to pointy shape of reaction node.
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class ReactionPortAdjustment implements IStyleModifier {
 
-    public static final String ID = "org.lflang.diagram.synthesis.postprocessor.ReactionPortAdjustment";
-    
-    /** 
-     * INTERNAL property to mark node as processed.
-     */
-    public static final Property<Boolean> PROCESSED = new Property<>("org.lflang.diagram.synthesis.postprocessor.reaction.ports.processed", false);
-    
-    @Extension
-    private KGraphFactory _kGraphFactory = KGraphFactory.eINSTANCE;
-    private static KRenderingFactory _kRenderingFactory = KRenderingFactory.eINSTANCE;
-    
-    /**
-     * Register this modifier on a reaction rendering.
-     */
-    public static void apply(KNode node, KRendering rendering) {
-        // Add modifier that fixes port positions such that edges are properly attached to the shape
-        var invisible = _kRenderingFactory.createKInvisibility();
-        invisible.setInvisible(false); // make it ineffective (just for purpose of holding modifier)
-        invisible.setModifierId(ReactionPortAdjustment.ID); // Add modifier to receive callback after layout
-        rendering.getStyles().add(invisible);
-        node.setProperty(PROCESSED, false);
-    }
+  public static final String ID =
+      "org.lflang.diagram.synthesis.postprocessor.ReactionPortAdjustment";
 
-    @Override
-    public boolean modify(IStyleModifier.StyleModificationContext context) {
-        try {
-            KGraphElement node = context.getGraphElement();
-            if (node instanceof KNode) {
-                KNode knode = (KNode) node;
-                
-                // Find root node
-                KNode parent = knode;
-                while (parent.eContainer() != null) {
-                    parent = (KNode) parent.eContainer();
-                }
-                
-                // Get viewer (this is a bit brittle because it fetches the viewer from some internal property)
-                Object viewer = 
-                        parent.getAllProperties().entrySet().stream().filter(entry -> 
-                                    entry.getKey().getId().equals("de.cau.cs.kieler.klighd.viewer")
-                                    || entry.getKey().getId().equals("klighd.layout.viewer"))
-                                .findAny().map(entry -> entry.getValue()).orElse(null);
-                                
-                ILayoutRecorder recorder = null;
-                if (viewer instanceof IViewer) {
-                    recorder = ((IViewer) viewer).getViewContext().getLayoutRecorder();
-                }
-                
-                if (!knode.getPorts().isEmpty()) {
-                    if (IterableExtensions.head(knode.getPorts()).getYpos() != 0 && 
-                             // Only adjust if layout is already applied important for incremental update animation
-                            !knode.getProperty(ReactionPortAdjustment.PROCESSED)) {
-                        if (recorder != null) {
-                            recorder.startRecording();
-                        }
-                        
-                        var in = knode.getPorts().stream().filter(p -> 
-                            p.getProperty(CoreOptions.PORT_SIDE) == PortSide.WEST).sorted((p1, p2) ->  
-                                Float.compare(p1.getYpos(), p2.getYpos())).collect(Collectors.toList());
-                        
-                        var out = knode.getPorts().stream().filter(p -> 
-                            p.getProperty(CoreOptions.PORT_SIDE) == PortSide.EAST).sorted((p1, p2) ->  
-                                Float.compare(p1.getYpos(), p2.getYpos())).collect(Collectors.toList());
-
-                        // Adjust
-                        if (in.stream().anyMatch(p -> !p.hasProperty(CoreOptions.PORT_BORDER_OFFSET))) {
-                            adjustPositions(IterableExtensions.indexed(in), in.size(), true);
-                        }
-                        if (out.stream().anyMatch(p -> !p.hasProperty(CoreOptions.PORT_BORDER_OFFSET))) {
-                            adjustPositions(IterableExtensions.indexed(out), out.size(), false);
-                        }
-                        knode.setProperty(ReactionPortAdjustment.PROCESSED, true);
-                        
-                        if (recorder!=null) {
-                          recorder.stopRecording(0);
-                        }
-                        
-                    } else if (IterableExtensions.head(knode.getPorts()).getYpos() == 0) {
-                        knode.setProperty(PROCESSED, false);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            // do not disturb rendering process
+  /** INTERNAL property to mark node as processed. */
+  public static final Property<Boolean> PROCESSED =
+      new Property<>("org.lflang.diagram.synthesis.postprocessor.reaction.ports.processed", false);
+
+  @Extension private KGraphFactory _kGraphFactory = KGraphFactory.eINSTANCE;
+  private static KRenderingFactory _kRenderingFactory = KRenderingFactory.eINSTANCE;
+
+  /** Register this modifier on a reaction rendering. */
+  public static void apply(KNode node, KRendering rendering) {
+    // Add modifier that fixes port positions such that edges are properly attached to the shape
+    var invisible = _kRenderingFactory.createKInvisibility();
+    invisible.setInvisible(false); // make it ineffective (just for purpose of holding modifier)
+    invisible.setModifierId(
+        ReactionPortAdjustment.ID); // Add modifier to receive callback after layout
+    rendering.getStyles().add(invisible);
+    node.setProperty(PROCESSED, false);
+  }
+
+  @Override
+  public boolean modify(IStyleModifier.StyleModificationContext context) {
+    try {
+      KGraphElement node = context.getGraphElement();
+      if (node instanceof KNode) {
+        KNode knode = (KNode) node;
+
+        // Find root node
+        KNode parent = knode;
+        while (parent.eContainer() != null) {
+          parent = (KNode) parent.eContainer();
         }
-        return false;
-    }
 
-    public void adjustPositions(Iterable<Pair<Integer, KPort>> indexedPorts, int count, boolean input) {
-        float segments = LinguaFrancaShapeExtensions.REACTION_POINTINESS * 2 / (count + 1);
-        for (Pair<Integer, KPort> indexedPort : indexedPorts) {
-            KPort port = indexedPort.getValue();
-            int idx = indexedPort.getKey();
-            float offset = 0;
-            
-            if (count % 2 != 0 && idx == count / 2) {
-                offset += LinguaFrancaShapeExtensions.REACTION_POINTINESS;
-            } else if (idx < count / 2) {
-                offset += segments * (idx + 1);
-            } else {
-                offset += segments * (count - idx);
+        // Get viewer (this is a bit brittle because it fetches the viewer from some internal
+        // property)
+        Object viewer =
+            parent.getAllProperties().entrySet().stream()
+                .filter(
+                    entry ->
+                        entry.getKey().getId().equals("de.cau.cs.kieler.klighd.viewer")
+                            || entry.getKey().getId().equals("klighd.layout.viewer"))
+                .findAny()
+                .map(entry -> entry.getValue())
+                .orElse(null);
+
+        ILayoutRecorder recorder = null;
+        if (viewer instanceof IViewer) {
+          recorder = ((IViewer) viewer).getViewContext().getLayoutRecorder();
+        }
+
+        if (!knode.getPorts().isEmpty()) {
+          if (IterableExtensions.head(knode.getPorts()).getYpos() != 0
+              &&
+              // Only adjust if layout is already applied important for incremental update animation
+              !knode.getProperty(ReactionPortAdjustment.PROCESSED)) {
+            if (recorder != null) {
+              recorder.startRecording();
             }
-            
-            if (!input) { // reverse
-                offset -= LinguaFrancaShapeExtensions.REACTION_POINTINESS;
+
+            var in =
+                knode.getPorts().stream()
+                    .filter(p -> p.getProperty(CoreOptions.PORT_SIDE) == PortSide.WEST)
+                    .sorted((p1, p2) -> Float.compare(p1.getYpos(), p2.getYpos()))
+                    .collect(Collectors.toList());
+
+            var out =
+                knode.getPorts().stream()
+                    .filter(p -> p.getProperty(CoreOptions.PORT_SIDE) == PortSide.EAST)
+                    .sorted((p1, p2) -> Float.compare(p1.getYpos(), p2.getYpos()))
+                    .collect(Collectors.toList());
+
+            // Adjust
+            if (in.stream().anyMatch(p -> !p.hasProperty(CoreOptions.PORT_BORDER_OFFSET))) {
+              adjustPositions(IterableExtensions.indexed(in), in.size(), true);
+            }
+            if (out.stream().anyMatch(p -> !p.hasProperty(CoreOptions.PORT_BORDER_OFFSET))) {
+              adjustPositions(IterableExtensions.indexed(out), out.size(), false);
             }
-            
-            // apply
-            port.setPos(port.getXpos() + offset, port.getYpos());
-            for (KEdge edge : port.getEdges()) {
-                if (input) {
-                    edge.setTargetPoint(adjustedKPoint(edge.getTargetPoint(), offset));
-                } else {
-                    edge.setSourcePoint(adjustedKPoint(edge.getSourcePoint(), offset));
-                }
+            knode.setProperty(ReactionPortAdjustment.PROCESSED, true);
+
+            if (recorder != null) {
+              recorder.stopRecording(0);
             }
-            
-            // Save for future layout
-            port.setProperty(CoreOptions.PORT_BORDER_OFFSET, (double) (input ? -offset : offset));
+
+          } else if (IterableExtensions.head(knode.getPorts()).getYpos() == 0) {
+            knode.setProperty(PROCESSED, false);
+          }
         }
+      }
+    } catch (Exception e) {
+      e.printStackTrace();
+      // do not disturb rendering process
     }
+    return false;
+  }
+
+  public void adjustPositions(
+      Iterable<Pair<Integer, KPort>> indexedPorts, int count, boolean input) {
+    float segments = LinguaFrancaShapeExtensions.REACTION_POINTINESS * 2 / (count + 1);
+    for (Pair<Integer, KPort> indexedPort : indexedPorts) {
+      KPort port = indexedPort.getValue();
+      int idx = indexedPort.getKey();
+      float offset = 0;
+
+      if (count % 2 != 0 && idx == count / 2) {
+        offset += LinguaFrancaShapeExtensions.REACTION_POINTINESS;
+      } else if (idx < count / 2) {
+        offset += segments * (idx + 1);
+      } else {
+        offset += segments * (count - idx);
+      }
+
+      if (!input) { // reverse
+        offset -= LinguaFrancaShapeExtensions.REACTION_POINTINESS;
+      }
+
+      // apply
+      port.setPos(port.getXpos() + offset, port.getYpos());
+      for (KEdge edge : port.getEdges()) {
+        if (input) {
+          edge.setTargetPoint(adjustedKPoint(edge.getTargetPoint(), offset));
+        } else {
+          edge.setSourcePoint(adjustedKPoint(edge.getSourcePoint(), offset));
+        }
+      }
 
-    public KPoint adjustedKPoint(KPoint point, float xOffset) {
-        KPoint kPoint = _kGraphFactory.createKPoint();
-        kPoint.setX(point.getX() + xOffset);
-        kPoint.setY(point.getY());
-        return kPoint;
+      // Save for future layout
+      port.setProperty(CoreOptions.PORT_BORDER_OFFSET, (double) (input ? -offset : offset));
     }
+  }
 
+  public KPoint adjustedKPoint(KPoint point, float xOffset) {
+    KPoint kPoint = _kGraphFactory.createKPoint();
+    kPoint.setX(point.getX() + xOffset);
+    kPoint.setY(point.getY());
+    return kPoint;
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java b/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
index 260e2c98db..efdc2ff4d5 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.styles;
 
 import static de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceX.LEFT;
@@ -29,29 +29,6 @@
 import static de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceY.BOTTOM;
 import static de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceY.TOP;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import org.eclipse.elk.core.options.CoreOptions;
-import org.eclipse.elk.core.options.PortSide;
-import org.eclipse.elk.graph.properties.Property;
-import org.eclipse.xtext.xbase.lib.Extension;
-import org.eclipse.xtext.xbase.lib.Functions.Function1;
-import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.Pair;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.lflang.ast.ASTUtils;
-import org.lflang.diagram.synthesis.AbstractSynthesisExtensions;
-import org.lflang.diagram.synthesis.LinguaFrancaSynthesis;
-import org.lflang.diagram.synthesis.util.UtilityExtensions;
-import org.lflang.generator.ReactionInstance;
-import org.lflang.generator.ReactorInstance;
-import org.lflang.generator.TimerInstance;
-import org.lflang.lf.Parameter;
-import org.lflang.lf.StateVar;
-
 import de.cau.cs.kieler.klighd.KlighdConstants;
 import de.cau.cs.kieler.klighd.kgraph.KEdge;
 import de.cau.cs.kieler.klighd.kgraph.KNode;
@@ -87,6 +64,26 @@
 import de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceX;
 import de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceY;
 import de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses;
+import java.util.ArrayList;
+import java.util.List;
+import javax.inject.Inject;
+import org.eclipse.elk.core.options.CoreOptions;
+import org.eclipse.elk.core.options.PortSide;
+import org.eclipse.elk.graph.properties.Property;
+import org.eclipse.xtext.xbase.lib.Extension;
+import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.Pair;
+import org.eclipse.xtext.xbase.lib.StringExtensions;
+import org.lflang.ast.ASTUtils;
+import org.lflang.diagram.synthesis.AbstractSynthesisExtensions;
+import org.lflang.diagram.synthesis.LinguaFrancaSynthesis;
+import org.lflang.diagram.synthesis.util.UtilityExtensions;
+import org.lflang.generator.ReactionInstance;
+import org.lflang.generator.ReactorInstance;
+import org.lflang.generator.TimerInstance;
+import org.lflang.lf.Parameter;
+import org.lflang.lf.StateVar;
 
 /**
  * Extension class that provides shapes and figures for the Lingua France diagram synthesis.
@@ -96,873 +93,1207 @@
 @ViewSynthesisShared
 public class LinguaFrancaShapeExtensions extends AbstractSynthesisExtensions {
 
-    public static final float REACTION_POINTINESS = 6; // arrow point length
-    // Property for marking the KContainterRendering in Reactor figures that is supposed to hold the content
-    public static final Property<Boolean> REACTOR_CONTENT_CONTAINER = new Property<>(
-            "org.lflang.diagram.synthesis.shapes.reactor.content", false);
-
-    @Inject
-    @Extension
-    private KNodeExtensions _kNodeExtensions;
-    @Inject
-    @Extension
-    private KEdgeExtensions _kEdgeExtensions;
-    @Inject
-    @Extension
-    private KPortExtensions _kPortExtensions;
-    @Inject
-    @Extension
-    private KLabelExtensions _kLabelExtensions;
-    @Inject
-    @Extension
-    private KRenderingExtensions _kRenderingExtensions;
-    @Inject
-    @Extension
-    private KContainerRenderingExtensions _kContainerRenderingExtensions;
-    @Inject
-    @Extension
-    private KPolylineExtensions _kPolylineExtensions;
-    @Inject
-    @Extension
-    private KColorExtensions _kColorExtensions;
-    @Inject
-    @Extension
-    private LinguaFrancaStyleExtensions _linguaFrancaStyleExtensions;
-    @Inject
-    @Extension
-    private UtilityExtensions _utilityExtensions;
-    @Extension
-    private KRenderingFactory _kRenderingFactory = KRenderingFactory.eINSTANCE;
-
-    public static final float BANK_FIGURE_X_OFFSET_SUM = 6.0f;
-    public static final float BANK_FIGURE_Y_OFFSET_SUM = 9.0f;
-
-    /**
-     * Creates the main reactor frame.
-     */
-    public KRoundedRectangle addMainReactorFigure(KNode node, ReactorInstance reactorInstance, String text) {
-        int padding = getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS) ? 8 : 6;
-        KRoundedRectangle figure = _kRenderingExtensions.addRoundedRectangle(node, 8, 8, 1);
-        _kContainerRenderingExtensions.setGridPlacement(figure, 1);
-        _kRenderingExtensions.setLineWidth(figure, 1);
-        _kRenderingExtensions.setForeground(figure, Colors.GRAY);
-        _kRenderingExtensions.setBackground(figure, Colors.WHITE);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
-
-        // Create parent container
-        KRectangle parentContainer = _kContainerRenderingExtensions.addRectangle(figure);
-        _kRenderingExtensions.setInvisible(parentContainer, true);
-        setGridPlacementDataFromPointToPoint(parentContainer,
-            LEFT, padding, 0, TOP, padding, 0,
-            RIGHT, padding, 0, BOTTOM, 4, 0
-        );
-
-        // Create child container
-        KRectangle childContainer = _kContainerRenderingExtensions.addRectangle(parentContainer);
-        _kRenderingExtensions.setInvisible(childContainer, true);
-        _kRenderingExtensions.setPointPlacementData(childContainer,
-                _kRenderingExtensions.LEFT, 0, 0.5f,
-                _kRenderingExtensions.TOP, 0, 0.5f,
-                _kRenderingExtensions.H_CENTRAL, _kRenderingExtensions.V_CENTRAL, 0,
-                0, 0, 0);
-        KGridPlacement placement = _kContainerRenderingExtensions.setGridPlacement(childContainer, 1);
-
-        // Add text to the child container
-        KText childText = _kContainerRenderingExtensions.addText(childContainer, text);
-        DiagramSyntheses.suppressSelectability(childText);
-        _linguaFrancaStyleExtensions.underlineSelectionStyle(childText);
-
-        if (reactorInstance.reactorDefinition.isFederated()) {
-            KContainerRendering cloudIcon = _linguaFrancaStyleExtensions.addCloudIcon(childContainer);
-            setGridPlacementDataFromPointToPoint(cloudIcon,
-                LEFT, 3, 0, TOP, 0, 0,
-                RIGHT, 0, 0, BOTTOM, 0, 0
-            );
-            placement.setNumColumns(2);
-
-            if (reactorInstance.reactorDefinition.getHost() != null &&
-                    getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTOR_HOST)) {
-                KText hostNameText = _kContainerRenderingExtensions.addText(childContainer,
-                        ASTUtils.toOriginalText(reactorInstance.reactorDefinition.getHost()));
-                DiagramSyntheses.suppressSelectability(hostNameText);
-                _linguaFrancaStyleExtensions.underlineSelectionStyle(hostNameText);
-                setGridPlacementDataFromPointToPoint(hostNameText,
-                    LEFT, 3, 0, TOP, 0, 0,
-                    RIGHT, 0, 0, BOTTOM, 0, 0
-                );
-                placement.setNumColumns(3);
-            }
-        }
-        return figure;
+  public static final float REACTION_POINTINESS = 6; // arrow point length
+  // Property for marking the KContainterRendering in Reactor figures that is supposed to hold the
+  // content
+  public static final Property<Boolean> REACTOR_CONTENT_CONTAINER =
+      new Property<>("org.lflang.diagram.synthesis.shapes.reactor.content", false);
+
+  @Inject @Extension private KNodeExtensions _kNodeExtensions;
+  @Inject @Extension private KEdgeExtensions _kEdgeExtensions;
+  @Inject @Extension private KPortExtensions _kPortExtensions;
+  @Inject @Extension private KLabelExtensions _kLabelExtensions;
+  @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
+  @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
+  @Inject @Extension private KPolylineExtensions _kPolylineExtensions;
+  @Inject @Extension private KColorExtensions _kColorExtensions;
+  @Inject @Extension private LinguaFrancaStyleExtensions _linguaFrancaStyleExtensions;
+  @Inject @Extension private UtilityExtensions _utilityExtensions;
+  @Extension private KRenderingFactory _kRenderingFactory = KRenderingFactory.eINSTANCE;
+
+  public static final float BANK_FIGURE_X_OFFSET_SUM = 6.0f;
+  public static final float BANK_FIGURE_Y_OFFSET_SUM = 9.0f;
+
+  /** Creates the main reactor frame. */
+  public KRoundedRectangle addMainReactorFigure(
+      KNode node, ReactorInstance reactorInstance, String text) {
+    int padding = getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS) ? 8 : 6;
+    KRoundedRectangle figure = _kRenderingExtensions.addRoundedRectangle(node, 8, 8, 1);
+    _kContainerRenderingExtensions.setGridPlacement(figure, 1);
+    _kRenderingExtensions.setLineWidth(figure, 1);
+    _kRenderingExtensions.setForeground(figure, Colors.GRAY);
+    _kRenderingExtensions.setBackground(figure, Colors.WHITE);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
+
+    // Create parent container
+    KRectangle parentContainer = _kContainerRenderingExtensions.addRectangle(figure);
+    _kRenderingExtensions.setInvisible(parentContainer, true);
+    setGridPlacementDataFromPointToPoint(
+        parentContainer, LEFT, padding, 0, TOP, padding, 0, RIGHT, padding, 0, BOTTOM, 4, 0);
+
+    // Create child container
+    KRectangle childContainer = _kContainerRenderingExtensions.addRectangle(parentContainer);
+    _kRenderingExtensions.setInvisible(childContainer, true);
+    _kRenderingExtensions.setPointPlacementData(
+        childContainer,
+        _kRenderingExtensions.LEFT,
+        0,
+        0.5f,
+        _kRenderingExtensions.TOP,
+        0,
+        0.5f,
+        _kRenderingExtensions.H_CENTRAL,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        0,
+        0);
+    KGridPlacement placement = _kContainerRenderingExtensions.setGridPlacement(childContainer, 1);
+
+    // Add text to the child container
+    KText childText = _kContainerRenderingExtensions.addText(childContainer, text);
+    DiagramSyntheses.suppressSelectability(childText);
+    _linguaFrancaStyleExtensions.underlineSelectionStyle(childText);
+
+    if (reactorInstance.reactorDefinition.isFederated()) {
+      KContainerRendering cloudIcon = _linguaFrancaStyleExtensions.addCloudIcon(childContainer);
+      setGridPlacementDataFromPointToPoint(
+          cloudIcon, LEFT, 3, 0, TOP, 0, 0, RIGHT, 0, 0, BOTTOM, 0, 0);
+      placement.setNumColumns(2);
+
+      if (reactorInstance.reactorDefinition.getHost() != null
+          && getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTOR_HOST)) {
+        KText hostNameText =
+            _kContainerRenderingExtensions.addText(
+                childContainer,
+                ASTUtils.toOriginalText(reactorInstance.reactorDefinition.getHost()));
+        DiagramSyntheses.suppressSelectability(hostNameText);
+        _linguaFrancaStyleExtensions.underlineSelectionStyle(hostNameText);
+        setGridPlacementDataFromPointToPoint(
+            hostNameText, LEFT, 3, 0, TOP, 0, 0, RIGHT, 0, 0, BOTTOM, 0, 0);
+        placement.setNumColumns(3);
+      }
     }
-
-    /**
-     * Creates the visual representation of a reactor node
-     */
-    public ReactorFigureComponents addReactorFigure(KNode node, ReactorInstance reactorInstance, String text) {
-        int padding = getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS) ? 8 : 6;
-
-        Function1<KRoundedRectangle, KRendering> style = r -> {
-            _kRenderingExtensions.setLineWidth(r, 1);
-            _kRenderingExtensions.setForeground(r, Colors.GRAY);
-            _kRenderingExtensions.setBackground(r, Colors.GRAY_95);
-            return _linguaFrancaStyleExtensions.boldLineSelectionStyle(r);
+    return figure;
+  }
+
+  /** Creates the visual representation of a reactor node */
+  public ReactorFigureComponents addReactorFigure(
+      KNode node, ReactorInstance reactorInstance, String text) {
+    int padding = getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS) ? 8 : 6;
+
+    Function1<KRoundedRectangle, KRendering> style =
+        r -> {
+          _kRenderingExtensions.setLineWidth(r, 1);
+          _kRenderingExtensions.setForeground(r, Colors.GRAY);
+          _kRenderingExtensions.setBackground(r, Colors.GRAY_95);
+          return _linguaFrancaStyleExtensions.boldLineSelectionStyle(r);
         };
 
-        KRoundedRectangle figure = _kRenderingExtensions.addRoundedRectangle(node, 8, 8, 1);
-        _kContainerRenderingExtensions.setGridPlacement(figure, 1);
-        style.apply(figure);
-        figure.setProperty(REACTOR_CONTENT_CONTAINER, true);
-
-        // minimal node size is necessary if no text will be added
-        List<Float> minSize = List.of(2 * figure.getCornerWidth(), 2 * figure.getCornerHeight());
-        _kNodeExtensions.setMinimalNodeSize(node, minSize.get(0), minSize.get(1));
-
-        // Add parent container
-        KRectangle parentContainer = _kContainerRenderingExtensions.addRectangle(figure);
-        _kRenderingExtensions.setInvisible(parentContainer, true);
-        setGridPlacementDataFromPointToPoint(parentContainer,
-                LEFT, padding, 0,
-                TOP, padding, 0,
-                RIGHT, padding, 0, BOTTOM,
-                _utilityExtensions.hasContent(reactorInstance) ? 4 : padding, 0
-        );
-
-        // Add centered child container
-        KRectangle childContainer = _kContainerRenderingExtensions.addRectangle(parentContainer);
-        _kRenderingExtensions.setInvisible(childContainer, true);
-        _kRenderingExtensions.setPointPlacementData(childContainer,
-                _kRenderingExtensions.LEFT, 0, 0.5f,
-                _kRenderingExtensions.TOP, 0, 0.5f,
-                _kRenderingExtensions.H_CENTRAL, _kRenderingExtensions.V_CENTRAL, 0,
-                0, 0, 0);
-        KGridPlacement placement = _kContainerRenderingExtensions.setGridPlacement(childContainer, 1);
-
-        KText childText = _kContainerRenderingExtensions.addText(childContainer, text);
-        DiagramSyntheses.suppressSelectability(childText);
-        _linguaFrancaStyleExtensions.underlineSelectionStyle(childText);
-
-        if (!_utilityExtensions.isRoot(reactorInstance) &&
-                reactorInstance.getDefinition().getHost() != null) {
-            KRendering cloudUploadIcon = _linguaFrancaStyleExtensions.addCloudUploadIcon(childContainer);
-            setGridPlacementDataFromPointToPoint(cloudUploadIcon,
-                    LEFT, 3, 0, TOP, 0, 0,
-                    RIGHT, 0, 0, BOTTOM, 0, 0
-            );
-            placement.setNumColumns(2);
-
-            if (getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTOR_HOST)) {
-                KText reactorHostText = _kContainerRenderingExtensions.addText(childContainer,
-                        ASTUtils.toOriginalText(reactorInstance.getDefinition().getHost()));
-                DiagramSyntheses.suppressSelectability(reactorHostText);
-                _linguaFrancaStyleExtensions.underlineSelectionStyle(reactorHostText);
-                setGridPlacementDataFromPointToPoint(reactorHostText,
-                        LEFT, 3, 0, TOP, 0, 0,
-                        RIGHT, 0, 0, BOTTOM, 0, 0
-                );
-                placement.setNumColumns(3);
-            }
-        }
-
-        if (reactorInstance.isBank()) {
-            List<KRendering> bank = new ArrayList<>();
-            KContainerRendering container = _kRenderingExtensions.addInvisibleContainerRendering(node);
-            // TODO handle unresolved width
-            KRoundedRectangle banks;
-            banks = _kContainerRenderingExtensions.addRoundedRectangle(container, 8, 8, 1);
-            style.apply(banks);
-            setGridPlacementDataFromPointToPoint(banks,
-                LEFT, BANK_FIGURE_X_OFFSET_SUM, 0, TOP, BANK_FIGURE_Y_OFFSET_SUM, 0,
-                RIGHT, 0, 0, BOTTOM, 0, 0
-            );
-            if (reactorInstance.getWidth() == 3) {
-                banks = _kContainerRenderingExtensions.addRoundedRectangle(container, 8, 8, 1);
-                style.apply(banks);
-                setGridPlacementDataFromPointToPoint(banks,
-                    LEFT, BANK_FIGURE_X_OFFSET_SUM / 2, 0, TOP, BANK_FIGURE_Y_OFFSET_SUM / 2, 0,
-                    RIGHT, BANK_FIGURE_X_OFFSET_SUM / 2, 0, BOTTOM, BANK_FIGURE_Y_OFFSET_SUM / 2, 0
-                );
-            } else if (reactorInstance.getWidth() != 2 && reactorInstance.getWidth() != 3) {
-                banks = _kContainerRenderingExtensions.addRoundedRectangle(container, 8, 8, 1);
-                style.apply(banks);
-                setGridPlacementDataFromPointToPoint(banks,
-                    LEFT, 2 * BANK_FIGURE_X_OFFSET_SUM / 3, 0, TOP, 2 * BANK_FIGURE_Y_OFFSET_SUM / 3, 0,
-                    RIGHT, BANK_FIGURE_X_OFFSET_SUM / 3, 0, BOTTOM, BANK_FIGURE_Y_OFFSET_SUM / 3, 0
-                );
-
-                banks = _kContainerRenderingExtensions.addRoundedRectangle(container, 8, 8, 1);
-                style.apply(banks);
-                setGridPlacementDataFromPointToPoint(banks,
-                    LEFT, BANK_FIGURE_X_OFFSET_SUM / 3, 0, TOP, BANK_FIGURE_Y_OFFSET_SUM / 3, 0,
-                    RIGHT, 2 * BANK_FIGURE_X_OFFSET_SUM / 3, 0, BOTTOM, 2 * BANK_FIGURE_Y_OFFSET_SUM / 3, 0
-                );
-            }
-
-            container.getChildren().add(figure);
-            setGridPlacementDataFromPointToPoint(figure,
-                LEFT, 0, 0, TOP, 0, 0,
-                RIGHT, BANK_FIGURE_X_OFFSET_SUM, 0, BOTTOM, BANK_FIGURE_Y_OFFSET_SUM, 0
-            );
-            bank.addAll(container.getChildren());
-
-            KRectangle widthLabelContainer = _kContainerRenderingExtensions.addRectangle(container);
-            _kRenderingExtensions.setInvisible(widthLabelContainer, true);
-            setGridPlacementDataFromPointToPoint(widthLabelContainer,
-                LEFT, 12, 0, BOTTOM, 9, 0,
-                RIGHT, 6, 0, BOTTOM, 0.5f, 0
-            );
-            // Handle unresolved width.
-            String widthLabel = reactorInstance.getWidth() >= 0 ? Integer.toString(reactorInstance.getWidth()) : "?";
-            KText widthLabelText = _kContainerRenderingExtensions.addText(widthLabelContainer, widthLabel);
-            _kRenderingExtensions.setHorizontalAlignment(widthLabelText, HorizontalAlignment.LEFT);
-            _kRenderingExtensions.setVerticalAlignment(widthLabelText, VerticalAlignment.BOTTOM);
-            _kRenderingExtensions.setFontSize(widthLabelText, 6);
-            _linguaFrancaStyleExtensions.noSelectionStyle(widthLabelText);
-            associateWith(widthLabelText, reactorInstance.getDefinition().getWidthSpec());
-            return new ReactorFigureComponents(container, figure, bank);
-        } else {
-            return new ReactorFigureComponents(figure, figure, List.of(figure));
-        }
+    KRoundedRectangle figure = _kRenderingExtensions.addRoundedRectangle(node, 8, 8, 1);
+    _kContainerRenderingExtensions.setGridPlacement(figure, 1);
+    style.apply(figure);
+    figure.setProperty(REACTOR_CONTENT_CONTAINER, true);
+
+    // minimal node size is necessary if no text will be added
+    List<Float> minSize = List.of(2 * figure.getCornerWidth(), 2 * figure.getCornerHeight());
+    _kNodeExtensions.setMinimalNodeSize(node, minSize.get(0), minSize.get(1));
+
+    // Add parent container
+    KRectangle parentContainer = _kContainerRenderingExtensions.addRectangle(figure);
+    _kRenderingExtensions.setInvisible(parentContainer, true);
+    setGridPlacementDataFromPointToPoint(
+        parentContainer,
+        LEFT,
+        padding,
+        0,
+        TOP,
+        padding,
+        0,
+        RIGHT,
+        padding,
+        0,
+        BOTTOM,
+        _utilityExtensions.hasContent(reactorInstance) ? 4 : padding,
+        0);
+
+    // Add centered child container
+    KRectangle childContainer = _kContainerRenderingExtensions.addRectangle(parentContainer);
+    _kRenderingExtensions.setInvisible(childContainer, true);
+    _kRenderingExtensions.setPointPlacementData(
+        childContainer,
+        _kRenderingExtensions.LEFT,
+        0,
+        0.5f,
+        _kRenderingExtensions.TOP,
+        0,
+        0.5f,
+        _kRenderingExtensions.H_CENTRAL,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        0,
+        0);
+    KGridPlacement placement = _kContainerRenderingExtensions.setGridPlacement(childContainer, 1);
+
+    KText childText = _kContainerRenderingExtensions.addText(childContainer, text);
+    DiagramSyntheses.suppressSelectability(childText);
+    _linguaFrancaStyleExtensions.underlineSelectionStyle(childText);
+
+    if (!_utilityExtensions.isRoot(reactorInstance)
+        && reactorInstance.getDefinition().getHost() != null) {
+      KRendering cloudUploadIcon = _linguaFrancaStyleExtensions.addCloudUploadIcon(childContainer);
+      setGridPlacementDataFromPointToPoint(
+          cloudUploadIcon, LEFT, 3, 0, TOP, 0, 0, RIGHT, 0, 0, BOTTOM, 0, 0);
+      placement.setNumColumns(2);
+
+      if (getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTOR_HOST)) {
+        KText reactorHostText =
+            _kContainerRenderingExtensions.addText(
+                childContainer, ASTUtils.toOriginalText(reactorInstance.getDefinition().getHost()));
+        DiagramSyntheses.suppressSelectability(reactorHostText);
+        _linguaFrancaStyleExtensions.underlineSelectionStyle(reactorHostText);
+        setGridPlacementDataFromPointToPoint(
+            reactorHostText, LEFT, 3, 0, TOP, 0, 0, RIGHT, 0, 0, BOTTOM, 0, 0);
+        placement.setNumColumns(3);
+      }
     }
 
-    /**
-     * Creates the visual representation of a reaction node
-     */
-    public KPolygon addReactionFigure(KNode node, ReactionInstance reaction) {
-        int minHeight = 22;
-        int minWidth = 45;
-        ReactorInstance reactor = reaction.getParent();
-        _kNodeExtensions.setMinimalNodeSize(node, minWidth, minHeight);
-
-        // Create base shape
-        KPolygon baseShape = _kRenderingExtensions.addPolygon(node);
-        associateWith(baseShape, reaction);
-        _kRenderingExtensions.setLineWidth(baseShape, 1);
-        _kRenderingExtensions.setForeground(baseShape, Colors.GRAY_45);
-        _kRenderingExtensions.setBackground(baseShape, Colors.GRAY_65);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(baseShape);
-        baseShape.getPoints().addAll(
+    if (reactorInstance.isBank()) {
+      List<KRendering> bank = new ArrayList<>();
+      KContainerRendering container = _kRenderingExtensions.addInvisibleContainerRendering(node);
+      // TODO handle unresolved width
+      KRoundedRectangle banks;
+      banks = _kContainerRenderingExtensions.addRoundedRectangle(container, 8, 8, 1);
+      style.apply(banks);
+      setGridPlacementDataFromPointToPoint(
+          banks,
+          LEFT,
+          BANK_FIGURE_X_OFFSET_SUM,
+          0,
+          TOP,
+          BANK_FIGURE_Y_OFFSET_SUM,
+          0,
+          RIGHT,
+          0,
+          0,
+          BOTTOM,
+          0,
+          0);
+      if (reactorInstance.getWidth() == 3) {
+        banks = _kContainerRenderingExtensions.addRoundedRectangle(container, 8, 8, 1);
+        style.apply(banks);
+        setGridPlacementDataFromPointToPoint(
+            banks,
+            LEFT,
+            BANK_FIGURE_X_OFFSET_SUM / 2,
+            0,
+            TOP,
+            BANK_FIGURE_Y_OFFSET_SUM / 2,
+            0,
+            RIGHT,
+            BANK_FIGURE_X_OFFSET_SUM / 2,
+            0,
+            BOTTOM,
+            BANK_FIGURE_Y_OFFSET_SUM / 2,
+            0);
+      } else if (reactorInstance.getWidth() != 2 && reactorInstance.getWidth() != 3) {
+        banks = _kContainerRenderingExtensions.addRoundedRectangle(container, 8, 8, 1);
+        style.apply(banks);
+        setGridPlacementDataFromPointToPoint(
+            banks,
+            LEFT,
+            2 * BANK_FIGURE_X_OFFSET_SUM / 3,
+            0,
+            TOP,
+            2 * BANK_FIGURE_Y_OFFSET_SUM / 3,
+            0,
+            RIGHT,
+            BANK_FIGURE_X_OFFSET_SUM / 3,
+            0,
+            BOTTOM,
+            BANK_FIGURE_Y_OFFSET_SUM / 3,
+            0);
+
+        banks = _kContainerRenderingExtensions.addRoundedRectangle(container, 8, 8, 1);
+        style.apply(banks);
+        setGridPlacementDataFromPointToPoint(
+            banks,
+            LEFT,
+            BANK_FIGURE_X_OFFSET_SUM / 3,
+            0,
+            TOP,
+            BANK_FIGURE_Y_OFFSET_SUM / 3,
+            0,
+            RIGHT,
+            2 * BANK_FIGURE_X_OFFSET_SUM / 3,
+            0,
+            BOTTOM,
+            2 * BANK_FIGURE_Y_OFFSET_SUM / 3,
+            0);
+      }
+
+      container.getChildren().add(figure);
+      setGridPlacementDataFromPointToPoint(
+          figure,
+          LEFT,
+          0,
+          0,
+          TOP,
+          0,
+          0,
+          RIGHT,
+          BANK_FIGURE_X_OFFSET_SUM,
+          0,
+          BOTTOM,
+          BANK_FIGURE_Y_OFFSET_SUM,
+          0);
+      bank.addAll(container.getChildren());
+
+      KRectangle widthLabelContainer = _kContainerRenderingExtensions.addRectangle(container);
+      _kRenderingExtensions.setInvisible(widthLabelContainer, true);
+      setGridPlacementDataFromPointToPoint(
+          widthLabelContainer, LEFT, 12, 0, BOTTOM, 9, 0, RIGHT, 6, 0, BOTTOM, 0.5f, 0);
+      // Handle unresolved width.
+      String widthLabel =
+          reactorInstance.getWidth() >= 0 ? Integer.toString(reactorInstance.getWidth()) : "?";
+      KText widthLabelText =
+          _kContainerRenderingExtensions.addText(widthLabelContainer, widthLabel);
+      _kRenderingExtensions.setHorizontalAlignment(widthLabelText, HorizontalAlignment.LEFT);
+      _kRenderingExtensions.setVerticalAlignment(widthLabelText, VerticalAlignment.BOTTOM);
+      _kRenderingExtensions.setFontSize(widthLabelText, 6);
+      _linguaFrancaStyleExtensions.noSelectionStyle(widthLabelText);
+      associateWith(widthLabelText, reactorInstance.getDefinition().getWidthSpec());
+      return new ReactorFigureComponents(container, figure, bank);
+    } else {
+      return new ReactorFigureComponents(figure, figure, List.of(figure));
+    }
+  }
+
+  /** Creates the visual representation of a reaction node */
+  public KPolygon addReactionFigure(KNode node, ReactionInstance reaction) {
+    int minHeight = 22;
+    int minWidth = 45;
+    ReactorInstance reactor = reaction.getParent();
+    _kNodeExtensions.setMinimalNodeSize(node, minWidth, minHeight);
+
+    // Create base shape
+    KPolygon baseShape = _kRenderingExtensions.addPolygon(node);
+    associateWith(baseShape, reaction);
+    _kRenderingExtensions.setLineWidth(baseShape, 1);
+    _kRenderingExtensions.setForeground(baseShape, Colors.GRAY_45);
+    _kRenderingExtensions.setBackground(baseShape, Colors.GRAY_65);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(baseShape);
+    baseShape
+        .getPoints()
+        .addAll(
             List.of(
                 _kRenderingExtensions.createKPosition(LEFT, 0, 0, TOP, 0, 0),
                 _kRenderingExtensions.createKPosition(RIGHT, REACTION_POINTINESS, 0, TOP, 0, 0),
                 _kRenderingExtensions.createKPosition(RIGHT, 0, 0, TOP, 0, 0.5f),
                 _kRenderingExtensions.createKPosition(RIGHT, REACTION_POINTINESS, 0, BOTTOM, 0, 0),
                 _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0, 0),
-                _kRenderingExtensions.createKPosition(LEFT, REACTION_POINTINESS, 0, BOTTOM, 0, 0.5f)
-            )
-        );
-
-        KRectangle contentContainer = _kContainerRenderingExtensions.addRectangle(baseShape);
-        associateWith(contentContainer, reaction);
-        _kRenderingExtensions.setInvisible(contentContainer, true);
-        _kRenderingExtensions.<KRectangle>setPointPlacementData(contentContainer,
-                _kRenderingExtensions.LEFT, REACTION_POINTINESS, 0,
-                _kRenderingExtensions.TOP, 0, 0,
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_TOP, REACTION_POINTINESS,
-                0, minWidth - REACTION_POINTINESS * 2, minHeight);
-        _kContainerRenderingExtensions.setGridPlacement(contentContainer, 1);
-
-        if (reactor.reactions.size() > 1) {
-            KText textToAdd = _kContainerRenderingExtensions.addText(contentContainer,
-                    Integer.toString(reactor.reactions.indexOf(reaction) + 1));
-            _kRenderingExtensions.setFontBold(textToAdd, true);
-            _linguaFrancaStyleExtensions.noSelectionStyle(textToAdd);
-            DiagramSyntheses.suppressSelectability(textToAdd);
-        }
-
-        // optional reaction level
-        if (getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTION_LEVEL)) {
-            // Force calculation of levels for reactions. This calculation
-            // will only be done once. Note that if this fails due to a causality loop,
-            // then some reactions will have level -1.
-            try {
-                String levels = IterableExtensions.join(reaction.getLevels(), ", ");
-                KText levelsText = _kContainerRenderingExtensions.addText(contentContainer, ("level: " + levels));
-                _kRenderingExtensions.setFontBold(levelsText, false);
-                _linguaFrancaStyleExtensions.noSelectionStyle(levelsText);
-                DiagramSyntheses.suppressSelectability(levelsText);
-            } catch (Exception ex) {
-                // If the graph has cycles, the above fails. Continue without showing levels.
-            }
-        }
-
-        // optional code content
-        boolean hasCode = getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTION_CODE) &&
-                !StringExtensions.isNullOrEmpty(reaction.getDefinition().getCode().getBody());
-        if (hasCode) {
-            KText hasCodeText = _kContainerRenderingExtensions.addText(contentContainer,
-                    _utilityExtensions.trimCode(reaction.getDefinition().getCode()));
-            associateWith(hasCodeText, reaction);
-            _kRenderingExtensions.setFontSize(hasCodeText, 6);
-            _kRenderingExtensions.setFontName(hasCodeText, KlighdConstants.DEFAULT_MONOSPACE_FONT_NAME);
-            _linguaFrancaStyleExtensions.noSelectionStyle(hasCodeText);
-            _kRenderingExtensions.setHorizontalAlignment(hasCodeText, HorizontalAlignment.LEFT);
-            _kRenderingExtensions.setVerticalAlignment(hasCodeText, VerticalAlignment.TOP);
-            setGridPlacementDataFromPointToPoint(hasCodeText,
-                    _kRenderingExtensions.LEFT, 5, 0,
-                    _kRenderingExtensions.TOP, 5, 0,
-                    _kRenderingExtensions.RIGHT, 5, 0,
-                    _kRenderingExtensions.BOTTOM, 5, 0
-            );
-        }
-
-        if (reaction.declaredDeadline != null) {
-            boolean hasDeadlineCode = getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTION_CODE) &&
-                    !StringExtensions.isNullOrEmpty(reaction.getDefinition().getDeadline().getCode().getBody());
-            if (hasCode || hasDeadlineCode) {
-                KPolyline line = _kContainerRenderingExtensions.addHorizontalLine(contentContainer, 0);
-                setGridPlacementDataFromPointToPoint(line,
-                    _kRenderingExtensions.LEFT, 5, 0,
-                    _kRenderingExtensions.TOP, 3, 0,
-                    _kRenderingExtensions.RIGHT, 5, 0,
-                    _kRenderingExtensions.BOTTOM, 6, 0
-                );
-            }
-
-            // delay with stopwatch
-            KRectangle labelContainer = _kContainerRenderingExtensions.addRectangle(contentContainer);
-            _kRenderingExtensions.setInvisible(labelContainer, true);
-            KRendering placement = setGridPlacementDataFromPointToPoint(labelContainer,
-                _kRenderingExtensions.LEFT, hasDeadlineCode ? 0 : -REACTION_POINTINESS * 0.5f, 0,
-                _kRenderingExtensions.TOP, 0, reactor.reactions.size() > 1 || hasCode || hasDeadlineCode ? 0 : 0.5f,
-                _kRenderingExtensions.RIGHT, 0, 0,
-                _kRenderingExtensions.BOTTOM, 0, 0
-            );
-            _kRenderingExtensions.setHorizontalAlignment(placement, HorizontalAlignment.LEFT);
-
-            KRectangle stopWatchFigure = addStopwatchFigure(labelContainer);
-            _kRenderingExtensions.setLeftTopAlignedPointPlacementData(stopWatchFigure, 0, 0, 0, 0);
-
-            KText stopWatchText = _kContainerRenderingExtensions.addText(labelContainer,
-                    reaction.declaredDeadline.maxDelay.toString());
-            associateWith(stopWatchText, reaction.getDefinition().getDeadline().getDelay());
-            _kRenderingExtensions.setForeground(stopWatchText, Colors.BROWN);
-            _kRenderingExtensions.setFontBold(stopWatchText, true);
-            _kRenderingExtensions.setFontSize(stopWatchText, 7);
-            _linguaFrancaStyleExtensions.underlineSelectionStyle(stopWatchText);
-            _kRenderingExtensions.setLeftTopAlignedPointPlacementData(stopWatchText, 15, 0, 0, 0);
-
-            // optional code content
-            if (hasDeadlineCode) {
-                KText contentContainerText = _kContainerRenderingExtensions.addText(contentContainer,
-                        _utilityExtensions.trimCode(reaction.getDefinition().getDeadline().getCode()));
-                associateWith(contentContainerText, reaction.declaredDeadline);
-                _kRenderingExtensions.setForeground(contentContainerText, Colors.BROWN);
-                _kRenderingExtensions.setFontSize(contentContainerText, 6);
-                _kRenderingExtensions.setFontName(contentContainerText, KlighdConstants.DEFAULT_MONOSPACE_FONT_NAME);
-                setGridPlacementDataFromPointToPoint(contentContainerText,
-                        _kRenderingExtensions.LEFT, 5, 0,
-                        _kRenderingExtensions.TOP, 0, 0,
-                        _kRenderingExtensions.RIGHT, 5, 0,
-                        _kRenderingExtensions.BOTTOM, 5, 0
-                );
-                _kRenderingExtensions.setHorizontalAlignment(contentContainerText, HorizontalAlignment.LEFT);
-                _linguaFrancaStyleExtensions.noSelectionStyle(contentContainerText);
-            }
-        }
-
-        return baseShape;
+                _kRenderingExtensions.createKPosition(
+                    LEFT, REACTION_POINTINESS, 0, BOTTOM, 0, 0.5f)));
+
+    KRectangle contentContainer = _kContainerRenderingExtensions.addRectangle(baseShape);
+    associateWith(contentContainer, reaction);
+    _kRenderingExtensions.setInvisible(contentContainer, true);
+    _kRenderingExtensions.<KRectangle>setPointPlacementData(
+        contentContainer,
+        _kRenderingExtensions.LEFT,
+        REACTION_POINTINESS,
+        0,
+        _kRenderingExtensions.TOP,
+        0,
+        0,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_TOP,
+        REACTION_POINTINESS,
+        0,
+        minWidth - REACTION_POINTINESS * 2,
+        minHeight);
+    _kContainerRenderingExtensions.setGridPlacement(contentContainer, 1);
+
+    if (reactor.reactions.size() > 1) {
+      KText textToAdd =
+          _kContainerRenderingExtensions.addText(
+              contentContainer, Integer.toString(reactor.reactions.indexOf(reaction) + 1));
+      _kRenderingExtensions.setFontBold(textToAdd, true);
+      _linguaFrancaStyleExtensions.noSelectionStyle(textToAdd);
+      DiagramSyntheses.suppressSelectability(textToAdd);
     }
 
-    /**
-     * Stopwatch figure for deadlines.
-     */
-    public KRectangle addStopwatchFigure(KContainerRendering parent) {
-        final int size = 12;
-        KRectangle container = _kContainerRenderingExtensions.addRectangle(parent);
-        _kRenderingExtensions.setInvisible(container, true);
-        _kRenderingExtensions.setPointPlacementData(container,
-                _kRenderingExtensions.LEFT, 0, 0,
-                _kRenderingExtensions.TOP, 0, 0,
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_TOP, 0,
-                0, size, size);
-
-        KPolyline polyline = _kContainerRenderingExtensions.addPolyline(container, 2,
-            List.of(
-                _kRenderingExtensions.createKPosition(LEFT, 3, 0.5f, TOP, (-2), 0),
-                _kRenderingExtensions.createKPosition(LEFT, (-3), 0.5f, TOP, (-2), 0)
-            )
-        );
-        _kRenderingExtensions.setForeground(polyline, Colors.BROWN);
+    // optional reaction level
+    if (getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTION_LEVEL)) {
+      // Force calculation of levels for reactions. This calculation
+      // will only be done once. Note that if this fails due to a causality loop,
+      // then some reactions will have level -1.
+      try {
+        String levels = IterableExtensions.join(reaction.getLevels(), ", ");
+        KText levelsText =
+            _kContainerRenderingExtensions.addText(contentContainer, ("level: " + levels));
+        _kRenderingExtensions.setFontBold(levelsText, false);
+        _linguaFrancaStyleExtensions.noSelectionStyle(levelsText);
+        DiagramSyntheses.suppressSelectability(levelsText);
+      } catch (Exception ex) {
+        // If the graph has cycles, the above fails. Continue without showing levels.
+      }
+    }
 
-        polyline = _kContainerRenderingExtensions.addPolyline(container, 2,
-            List.of(
-                _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, (-2), 0),
-                _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, 1, 0)
-            )
-        );
-        _kRenderingExtensions.setForeground(polyline, Colors.BROWN);
-
-        KEllipse body = _kContainerRenderingExtensions.addEllipse(container);
-        _kRenderingExtensions.setLineWidth(body, 1);
-        _kRenderingExtensions.setForeground(body, Colors.BROWN);
-        _kRenderingExtensions.<KEllipse>setPointPlacementData(body,
-                _kRenderingExtensions.LEFT, 0, 0,
-                _kRenderingExtensions.TOP, 0, 0,
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_TOP, 0,
-                0, size, size);
-        _linguaFrancaStyleExtensions.noSelectionStyle(body);
-
-        KArc arc = _kContainerRenderingExtensions.addArc(body);
-        arc.setStartAngle((-20));
-        arc.setArcAngle(110);
-        arc.setArcType(Arc.PIE);
-        _kRenderingExtensions.setLineWidth(arc, 0);
-        _kRenderingExtensions.setBackground(arc, Colors.BROWN);
-        _kRenderingExtensions.setPointPlacementData(arc,
-                _kRenderingExtensions.LEFT, 2, 0,
-                _kRenderingExtensions.TOP, 2, 0,
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_TOP, 2,
-                2, size - 4, size - 4);
-        _linguaFrancaStyleExtensions.noSelectionStyle(arc);
-
-        return container;
+    // optional code content
+    boolean hasCode =
+        getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTION_CODE)
+            && !StringExtensions.isNullOrEmpty(reaction.getDefinition().getCode().getBody());
+    if (hasCode) {
+      KText hasCodeText =
+          _kContainerRenderingExtensions.addText(
+              contentContainer, _utilityExtensions.trimCode(reaction.getDefinition().getCode()));
+      associateWith(hasCodeText, reaction);
+      _kRenderingExtensions.setFontSize(hasCodeText, 6);
+      _kRenderingExtensions.setFontName(hasCodeText, KlighdConstants.DEFAULT_MONOSPACE_FONT_NAME);
+      _linguaFrancaStyleExtensions.noSelectionStyle(hasCodeText);
+      _kRenderingExtensions.setHorizontalAlignment(hasCodeText, HorizontalAlignment.LEFT);
+      _kRenderingExtensions.setVerticalAlignment(hasCodeText, VerticalAlignment.TOP);
+      setGridPlacementDataFromPointToPoint(
+          hasCodeText,
+          _kRenderingExtensions.LEFT,
+          5,
+          0,
+          _kRenderingExtensions.TOP,
+          5,
+          0,
+          _kRenderingExtensions.RIGHT,
+          5,
+          0,
+          _kRenderingExtensions.BOTTOM,
+          5,
+          0);
     }
 
-    /**
-     * Creates the visual representation of a timer node
-     */
-    public KEllipse addTimerFigure(KNode node, TimerInstance timer) {
-        _kNodeExtensions.setMinimalNodeSize(node, 30, 30);
+    if (reaction.declaredDeadline != null) {
+      boolean hasDeadlineCode =
+          getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTION_CODE)
+              && !StringExtensions.isNullOrEmpty(
+                  reaction.getDefinition().getDeadline().getCode().getBody());
+      if (hasCode || hasDeadlineCode) {
+        KPolyline line = _kContainerRenderingExtensions.addHorizontalLine(contentContainer, 0);
+        setGridPlacementDataFromPointToPoint(
+            line,
+            _kRenderingExtensions.LEFT,
+            5,
+            0,
+            _kRenderingExtensions.TOP,
+            3,
+            0,
+            _kRenderingExtensions.RIGHT,
+            5,
+            0,
+            _kRenderingExtensions.BOTTOM,
+            6,
+            0);
+      }
+
+      // delay with stopwatch
+      KRectangle labelContainer = _kContainerRenderingExtensions.addRectangle(contentContainer);
+      _kRenderingExtensions.setInvisible(labelContainer, true);
+      KRendering placement =
+          setGridPlacementDataFromPointToPoint(
+              labelContainer,
+              _kRenderingExtensions.LEFT,
+              hasDeadlineCode ? 0 : -REACTION_POINTINESS * 0.5f,
+              0,
+              _kRenderingExtensions.TOP,
+              0,
+              reactor.reactions.size() > 1 || hasCode || hasDeadlineCode ? 0 : 0.5f,
+              _kRenderingExtensions.RIGHT,
+              0,
+              0,
+              _kRenderingExtensions.BOTTOM,
+              0,
+              0);
+      _kRenderingExtensions.setHorizontalAlignment(placement, HorizontalAlignment.LEFT);
+
+      KRectangle stopWatchFigure = addStopwatchFigure(labelContainer);
+      _kRenderingExtensions.setLeftTopAlignedPointPlacementData(stopWatchFigure, 0, 0, 0, 0);
+
+      KText stopWatchText =
+          _kContainerRenderingExtensions.addText(
+              labelContainer, reaction.declaredDeadline.maxDelay.toString());
+      associateWith(stopWatchText, reaction.getDefinition().getDeadline().getDelay());
+      _kRenderingExtensions.setForeground(stopWatchText, Colors.BROWN);
+      _kRenderingExtensions.setFontBold(stopWatchText, true);
+      _kRenderingExtensions.setFontSize(stopWatchText, 7);
+      _linguaFrancaStyleExtensions.underlineSelectionStyle(stopWatchText);
+      _kRenderingExtensions.setLeftTopAlignedPointPlacementData(stopWatchText, 15, 0, 0, 0);
+
+      // optional code content
+      if (hasDeadlineCode) {
+        KText contentContainerText =
+            _kContainerRenderingExtensions.addText(
+                contentContainer,
+                _utilityExtensions.trimCode(reaction.getDefinition().getDeadline().getCode()));
+        associateWith(contentContainerText, reaction.declaredDeadline);
+        _kRenderingExtensions.setForeground(contentContainerText, Colors.BROWN);
+        _kRenderingExtensions.setFontSize(contentContainerText, 6);
+        _kRenderingExtensions.setFontName(
+            contentContainerText, KlighdConstants.DEFAULT_MONOSPACE_FONT_NAME);
+        setGridPlacementDataFromPointToPoint(
+            contentContainerText,
+            _kRenderingExtensions.LEFT,
+            5,
+            0,
+            _kRenderingExtensions.TOP,
+            0,
+            0,
+            _kRenderingExtensions.RIGHT,
+            5,
+            0,
+            _kRenderingExtensions.BOTTOM,
+            5,
+            0);
+        _kRenderingExtensions.setHorizontalAlignment(
+            contentContainerText, HorizontalAlignment.LEFT);
+        _linguaFrancaStyleExtensions.noSelectionStyle(contentContainerText);
+      }
+    }
 
-        KEllipse figure = _kRenderingExtensions.addEllipse(node);
-        _kRenderingExtensions.setBackground(figure, Colors.GRAY_95);
-        _linguaFrancaStyleExtensions.noSelectionStyle(figure);
-        _kRenderingExtensions.setLineWidth(figure, 1);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
+    return baseShape;
+  }
+
+  /** Stopwatch figure for deadlines. */
+  public KRectangle addStopwatchFigure(KContainerRendering parent) {
+    final int size = 12;
+    KRectangle container = _kContainerRenderingExtensions.addRectangle(parent);
+    _kRenderingExtensions.setInvisible(container, true);
+    _kRenderingExtensions.setPointPlacementData(
+        container,
+        _kRenderingExtensions.LEFT,
+        0,
+        0,
+        _kRenderingExtensions.TOP,
+        0,
+        0,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_TOP,
+        0,
+        0,
+        size,
+        size);
+
+    KPolyline polyline =
+        _kContainerRenderingExtensions.addPolyline(
+            container,
+            2,
+            List.of(
+                _kRenderingExtensions.createKPosition(LEFT, 3, 0.5f, TOP, (-2), 0),
+                _kRenderingExtensions.createKPosition(LEFT, (-3), 0.5f, TOP, (-2), 0)));
+    _kRenderingExtensions.setForeground(polyline, Colors.BROWN);
 
-        List<KPosition> polylinePoints = List.of(
+    polyline =
+        _kContainerRenderingExtensions.addPolyline(
+            container,
+            2,
+            List.of(
+                _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, (-2), 0),
+                _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, 1, 0)));
+    _kRenderingExtensions.setForeground(polyline, Colors.BROWN);
+
+    KEllipse body = _kContainerRenderingExtensions.addEllipse(container);
+    _kRenderingExtensions.setLineWidth(body, 1);
+    _kRenderingExtensions.setForeground(body, Colors.BROWN);
+    _kRenderingExtensions.<KEllipse>setPointPlacementData(
+        body,
+        _kRenderingExtensions.LEFT,
+        0,
+        0,
+        _kRenderingExtensions.TOP,
+        0,
+        0,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_TOP,
+        0,
+        0,
+        size,
+        size);
+    _linguaFrancaStyleExtensions.noSelectionStyle(body);
+
+    KArc arc = _kContainerRenderingExtensions.addArc(body);
+    arc.setStartAngle((-20));
+    arc.setArcAngle(110);
+    arc.setArcType(Arc.PIE);
+    _kRenderingExtensions.setLineWidth(arc, 0);
+    _kRenderingExtensions.setBackground(arc, Colors.BROWN);
+    _kRenderingExtensions.setPointPlacementData(
+        arc,
+        _kRenderingExtensions.LEFT,
+        2,
+        0,
+        _kRenderingExtensions.TOP,
+        2,
+        0,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_TOP,
+        2,
+        2,
+        size - 4,
+        size - 4);
+    _linguaFrancaStyleExtensions.noSelectionStyle(arc);
+
+    return container;
+  }
+
+  /** Creates the visual representation of a timer node */
+  public KEllipse addTimerFigure(KNode node, TimerInstance timer) {
+    _kNodeExtensions.setMinimalNodeSize(node, 30, 30);
+
+    KEllipse figure = _kRenderingExtensions.addEllipse(node);
+    _kRenderingExtensions.setBackground(figure, Colors.GRAY_95);
+    _linguaFrancaStyleExtensions.noSelectionStyle(figure);
+    _kRenderingExtensions.setLineWidth(figure, 1);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
+
+    List<KPosition> polylinePoints =
+        List.of(
             _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, 0, 0.1f),
             _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, 0, 0.5f),
-            _kRenderingExtensions.createKPosition(LEFT, 0, 0.7f, TOP, 0, 0.7f)
-        );
-        KPolyline polyline = _kContainerRenderingExtensions.addPolyline(figure, 1, polylinePoints);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(polyline);
-
-        List<String> labelParts = new ArrayList<>();
-        if (timer.getOffset() != TimerInstance.DEFAULT_OFFSET && timer.getOffset() != null) {
-            labelParts.add(timer.getOffset().toString());
-        }
-        if (timer.getPeriod() != TimerInstance.DEFAULT_PERIOD && timer.getPeriod() != null) {
-            if (timer.getOffset() == TimerInstance.DEFAULT_OFFSET) {
-                labelParts.add(timer.getOffset().toString());
-            }
-            labelParts.add(timer.getPeriod().toString());
-        }
-        if (!labelParts.isEmpty()) {
-            _kLabelExtensions.addOutsideBottomCenteredNodeLabel(node,
-                "(" + String.join(", ", labelParts) + ")", 8);
-        }
-        return figure;
-    }
+            _kRenderingExtensions.createKPosition(LEFT, 0, 0.7f, TOP, 0, 0.7f));
+    KPolyline polyline = _kContainerRenderingExtensions.addPolyline(figure, 1, polylinePoints);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(polyline);
 
-    /**
-     * Creates the visual representation of a startup trigger.
-     */
-    public KEllipse addStartupFigure(KNode node) {
-        _kNodeExtensions.setMinimalNodeSize(node, 18, 18);
-        KEllipse figure = _kRenderingExtensions.addEllipse(node);
-        _kRenderingExtensions.setLineWidth(figure, 1);
-        _kRenderingExtensions.setBackground(figure, Colors.WHITE);
-        _linguaFrancaStyleExtensions.noSelectionStyle(figure);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
-        return figure;
+    List<String> labelParts = new ArrayList<>();
+    if (timer.getOffset() != TimerInstance.DEFAULT_OFFSET && timer.getOffset() != null) {
+      labelParts.add(timer.getOffset().toString());
     }
-
-    /**
-     * Creates the visual representation of a shutdown trigger.
-     */
-    public KPolygon addShutdownFigure(KNode node) {
-        _kNodeExtensions.setMinimalNodeSize(node, 18, 18);
-        KPolygon figure = _kRenderingExtensions.addPolygon(node);
-        _kRenderingExtensions.setLineWidth(figure, 1);
-        _kRenderingExtensions.setBackground(figure, Colors.WHITE);
-        _linguaFrancaStyleExtensions.noSelectionStyle(figure);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
-
-        List<KPosition> pointsToAdd = List.of(
+    if (timer.getPeriod() != TimerInstance.DEFAULT_PERIOD && timer.getPeriod() != null) {
+      if (timer.getOffset() == TimerInstance.DEFAULT_OFFSET) {
+        labelParts.add(timer.getOffset().toString());
+      }
+      labelParts.add(timer.getPeriod().toString());
+    }
+    if (!labelParts.isEmpty()) {
+      _kLabelExtensions.addOutsideBottomCenteredNodeLabel(
+          node, "(" + String.join(", ", labelParts) + ")", 8);
+    }
+    return figure;
+  }
+
+  /** Creates the visual representation of a startup trigger. */
+  public KEllipse addStartupFigure(KNode node) {
+    _kNodeExtensions.setMinimalNodeSize(node, 18, 18);
+    KEllipse figure = _kRenderingExtensions.addEllipse(node);
+    _kRenderingExtensions.setLineWidth(figure, 1);
+    _kRenderingExtensions.setBackground(figure, Colors.WHITE);
+    _linguaFrancaStyleExtensions.noSelectionStyle(figure);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
+    return figure;
+  }
+
+  /** Creates the visual representation of a shutdown trigger. */
+  public KPolygon addShutdownFigure(KNode node) {
+    _kNodeExtensions.setMinimalNodeSize(node, 18, 18);
+    KPolygon figure = _kRenderingExtensions.addPolygon(node);
+    _kRenderingExtensions.setLineWidth(figure, 1);
+    _kRenderingExtensions.setBackground(figure, Colors.WHITE);
+    _linguaFrancaStyleExtensions.noSelectionStyle(figure);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
+
+    List<KPosition> pointsToAdd =
+        List.of(
             _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, 0, 0),
             _kRenderingExtensions.createKPosition(RIGHT, 0, 0, TOP, 0, 0.5f),
             _kRenderingExtensions.createKPosition(RIGHT, 0, 0.5f, BOTTOM, 0, 0),
-            _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0, 0.5f)
-        );
-
-        figure.getPoints().addAll(pointsToAdd);
-        return figure;
-    }
-
-    /**
-     * Creates the visual representation of a shutdown trigger.
-     */
-    public KEllipse addResetFigure(KNode node) {
-        _kNodeExtensions.setMinimalNodeSize(node, 18, 18);
-        KEllipse figure = _kRenderingExtensions.addEllipse(node);
-        _kRenderingExtensions.setLineWidth(figure, 1);
-        _kRenderingExtensions.setBackground(figure, Colors.WHITE);
-        _linguaFrancaStyleExtensions.noSelectionStyle(figure);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
-
-        KEllipse resetCircle = _kContainerRenderingExtensions.addEllipse(figure);
-        _kRenderingExtensions.setSurroundingSpace(resetCircle, 3f, 0);
-        _kRenderingExtensions.setLineWidth(resetCircle, 1.5f);
-        _kRenderingExtensions.setBackground(resetCircle, Colors.WHITE);
-        _linguaFrancaStyleExtensions.noSelectionStyle(resetCircle);
-
-        var resetCycleGap = _kContainerRenderingExtensions.addPolygon(resetCircle);
-        resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 0, 0, PositionReferenceY.TOP, 0.0f, 0));
-        resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.RIGHT, 0, 0, PositionReferenceY.TOP, 0.0f, 0));
-        resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.RIGHT, 1.1f, 0, PositionReferenceY.BOTTOM, 0, 0));
-        resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 1.1f, 0, PositionReferenceY.BOTTOM, 0, 0));
-        _kRenderingExtensions.setLineWidth(resetCycleGap, 0.3f);
-        _kRenderingExtensions.setForeground(resetCycleGap, Colors.WHITE);
-        _kRenderingExtensions.setBackground(resetCycleGap, Colors.WHITE);
-        _linguaFrancaStyleExtensions.noSelectionStyle(resetCycleGap);
-        _kRenderingExtensions.setPointPlacementData(resetCycleGap,
-                _kRenderingExtensions.LEFT, -2, 0.5f,
-                _kRenderingExtensions.TOP, 1.5f, 0,
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_CENTRAL,
-                0, 0, 4.0f, 3.0f);
-
-        var resetArrow = _kContainerRenderingExtensions.addPolygon(resetCircle);
-        resetArrow.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 0, 0, PositionReferenceY.TOP, 0.0f, 0.1f));
-        resetArrow.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 0.0f, 0.3f, PositionReferenceY.BOTTOM, 0, 0));
-        resetArrow.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.RIGHT, 0.0f, 0, PositionReferenceY.TOP, 0.0f, 0.0f));
-        _kRenderingExtensions.setLineWidth(resetArrow, 0.3f);
-        _kRenderingExtensions.setBackground(resetArrow, Colors.BLACK);
-        _linguaFrancaStyleExtensions.noSelectionStyle(resetArrow);
-        _kRenderingExtensions.setPointPlacementData(resetArrow,
-                _kRenderingExtensions.LEFT, 1.0f, 0.5f,
-                _kRenderingExtensions.TOP, 1.8f, 0,
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_CENTRAL,
-                0, 0, 3.2f, 3.2f);
-
-        return figure;
+            _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0, 0.5f));
+
+    figure.getPoints().addAll(pointsToAdd);
+    return figure;
+  }
+
+  /** Creates the visual representation of a shutdown trigger. */
+  public KEllipse addResetFigure(KNode node) {
+    _kNodeExtensions.setMinimalNodeSize(node, 18, 18);
+    KEllipse figure = _kRenderingExtensions.addEllipse(node);
+    _kRenderingExtensions.setLineWidth(figure, 1);
+    _kRenderingExtensions.setBackground(figure, Colors.WHITE);
+    _linguaFrancaStyleExtensions.noSelectionStyle(figure);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
+
+    KEllipse resetCircle = _kContainerRenderingExtensions.addEllipse(figure);
+    _kRenderingExtensions.setSurroundingSpace(resetCircle, 3f, 0);
+    _kRenderingExtensions.setLineWidth(resetCircle, 1.5f);
+    _kRenderingExtensions.setBackground(resetCircle, Colors.WHITE);
+    _linguaFrancaStyleExtensions.noSelectionStyle(resetCircle);
+
+    var resetCycleGap = _kContainerRenderingExtensions.addPolygon(resetCircle);
+    resetCycleGap
+        .getPoints()
+        .add(
+            _kRenderingExtensions.createKPosition(
+                PositionReferenceX.LEFT, 0, 0, PositionReferenceY.TOP, 0.0f, 0));
+    resetCycleGap
+        .getPoints()
+        .add(
+            _kRenderingExtensions.createKPosition(
+                PositionReferenceX.RIGHT, 0, 0, PositionReferenceY.TOP, 0.0f, 0));
+    resetCycleGap
+        .getPoints()
+        .add(
+            _kRenderingExtensions.createKPosition(
+                PositionReferenceX.RIGHT, 1.1f, 0, PositionReferenceY.BOTTOM, 0, 0));
+    resetCycleGap
+        .getPoints()
+        .add(
+            _kRenderingExtensions.createKPosition(
+                PositionReferenceX.LEFT, 1.1f, 0, PositionReferenceY.BOTTOM, 0, 0));
+    _kRenderingExtensions.setLineWidth(resetCycleGap, 0.3f);
+    _kRenderingExtensions.setForeground(resetCycleGap, Colors.WHITE);
+    _kRenderingExtensions.setBackground(resetCycleGap, Colors.WHITE);
+    _linguaFrancaStyleExtensions.noSelectionStyle(resetCycleGap);
+    _kRenderingExtensions.setPointPlacementData(
+        resetCycleGap,
+        _kRenderingExtensions.LEFT,
+        -2,
+        0.5f,
+        _kRenderingExtensions.TOP,
+        1.5f,
+        0,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        4.0f,
+        3.0f);
+
+    var resetArrow = _kContainerRenderingExtensions.addPolygon(resetCircle);
+    resetArrow
+        .getPoints()
+        .add(
+            _kRenderingExtensions.createKPosition(
+                PositionReferenceX.LEFT, 0, 0, PositionReferenceY.TOP, 0.0f, 0.1f));
+    resetArrow
+        .getPoints()
+        .add(
+            _kRenderingExtensions.createKPosition(
+                PositionReferenceX.LEFT, 0.0f, 0.3f, PositionReferenceY.BOTTOM, 0, 0));
+    resetArrow
+        .getPoints()
+        .add(
+            _kRenderingExtensions.createKPosition(
+                PositionReferenceX.RIGHT, 0.0f, 0, PositionReferenceY.TOP, 0.0f, 0.0f));
+    _kRenderingExtensions.setLineWidth(resetArrow, 0.3f);
+    _kRenderingExtensions.setBackground(resetArrow, Colors.BLACK);
+    _linguaFrancaStyleExtensions.noSelectionStyle(resetArrow);
+    _kRenderingExtensions.setPointPlacementData(
+        resetArrow,
+        _kRenderingExtensions.LEFT,
+        1.0f,
+        0.5f,
+        _kRenderingExtensions.TOP,
+        1.8f,
+        0,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        3.2f,
+        3.2f);
+
+    return figure;
+  }
+
+  /** Creates the visual representation of a reactor port. */
+  public KPolygon addTrianglePort(KPort port, boolean multiport) {
+    port.setSize(8, 8);
+
+    // Create triangle port
+    KPolygon trianglePort = _kRenderingExtensions.addPolygon(port);
+
+    // Set line width and background color according to multiport or not
+    float lineWidth = multiport ? 2.2f : 1;
+    _kRenderingExtensions.setLineWidth(trianglePort, lineWidth);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(trianglePort);
+    Colors background = multiport ? Colors.WHITE : Colors.BLACK;
+    _kRenderingExtensions.setBackground(trianglePort, background);
+
+    List<KPosition> pointsToAdd;
+    if (multiport) {
+      // Compensate for line width by making triangle smaller
+      // Do not adjust by port size because this will affect port distribution and cause offsets
+      // between parallel connections
+      pointsToAdd =
+          List.of(
+              _kRenderingExtensions.createKPosition(LEFT, 0, 0, TOP, 0.6f, 0),
+              _kRenderingExtensions.createKPosition(RIGHT, 1.2f, 0, TOP, 0, 0.5f),
+              _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0.6f, 0));
+    } else {
+      pointsToAdd =
+          List.of(
+              _kRenderingExtensions.createKPosition(LEFT, 0, 0, TOP, 0, 0),
+              _kRenderingExtensions.createKPosition(RIGHT, 0, 0, TOP, 0, 0.5f),
+              _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0, 0));
     }
-
-    /**
-     * Creates the visual representation of a reactor port.
-     */
-    public KPolygon addTrianglePort(KPort port, boolean multiport) {
-        port.setSize(8, 8);
-
-        // Create triangle port
-        KPolygon trianglePort = _kRenderingExtensions.addPolygon(port);
-
-        // Set line width and background color according to multiport or not
-        float lineWidth = multiport ? 2.2f : 1;
-        _kRenderingExtensions.setLineWidth(trianglePort, lineWidth);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(trianglePort);
-        Colors background = multiport ? Colors.WHITE : Colors.BLACK;
-        _kRenderingExtensions.setBackground(trianglePort, background);
-
-        List<KPosition> pointsToAdd;
-        if (multiport) {
-            // Compensate for line width by making triangle smaller
-            // Do not adjust by port size because this will affect port distribution and cause offsets between parallel connections
-            pointsToAdd = List.of(
-                _kRenderingExtensions.createKPosition(LEFT, 0, 0, TOP, 0.6f, 0),
-                _kRenderingExtensions.createKPosition(RIGHT, 1.2f, 0, TOP, 0, 0.5f),
-                _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0.6f, 0)
-            );
-        } else {
-            pointsToAdd = List.of(
-                _kRenderingExtensions.createKPosition(LEFT, 0, 0, TOP, 0, 0),
-                _kRenderingExtensions.createKPosition(RIGHT, 0, 0, TOP, 0, 0.5f),
-                _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0, 0)
-            );
-        }
-        trianglePort.getPoints().addAll(pointsToAdd);
-        return trianglePort;
-    }
-
-    /**
-     * Added a text as collapse expand button.
-     */
-    public KText addTextButton(KContainerRendering container, String text) {
-        KText textToAdd = _kContainerRenderingExtensions.addText(container, text);
-        _kRenderingExtensions.setForeground(textToAdd, Colors.BLUE);
-        _kRenderingExtensions.setFontSize(textToAdd, 8);
-        _linguaFrancaStyleExtensions.noSelectionStyle(textToAdd);
-        return textToAdd;
-    }
-
-    /**
-     * Creates the triangular line decorator with text.
-     */
-    public KPolygon addActionDecorator(KPolyline line, String text) {
-        final float size = 18;
-
-        // Create action decorator
-        KPolygon actionDecorator = _kContainerRenderingExtensions.addPolygon(line);
-        _kRenderingExtensions.setBackground(actionDecorator, Colors.WHITE);
-        List<KPosition> pointsToAdd = List.of(
+    trianglePort.getPoints().addAll(pointsToAdd);
+    return trianglePort;
+  }
+
+  /** Added a text as collapse expand button. */
+  public KText addTextButton(KContainerRendering container, String text) {
+    KText textToAdd = _kContainerRenderingExtensions.addText(container, text);
+    _kRenderingExtensions.setForeground(textToAdd, Colors.BLUE);
+    _kRenderingExtensions.setFontSize(textToAdd, 8);
+    _linguaFrancaStyleExtensions.noSelectionStyle(textToAdd);
+    return textToAdd;
+  }
+
+  /** Creates the triangular line decorator with text. */
+  public KPolygon addActionDecorator(KPolyline line, String text) {
+    final float size = 18;
+
+    // Create action decorator
+    KPolygon actionDecorator = _kContainerRenderingExtensions.addPolygon(line);
+    _kRenderingExtensions.setBackground(actionDecorator, Colors.WHITE);
+    List<KPosition> pointsToAdd =
+        List.of(
             _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, 0, 0),
             _kRenderingExtensions.createKPosition(RIGHT, 0, 0, BOTTOM, 0, 0),
-            _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0, 0)
-        );
-        actionDecorator.getPoints().addAll(pointsToAdd);
-
-        // Set placement data of the action decorator
-        KDecoratorPlacementData placementData = _kRenderingFactory.createKDecoratorPlacementData();
-        placementData.setRelative(0.5f);
-        placementData.setAbsolute(-size / 2);
-        placementData.setWidth(size);
-        placementData.setHeight(size);
-        placementData.setYOffset(-size * 0.66f);
-        placementData.setRotateWithLine(true);
-        actionDecorator.setPlacementData(placementData);
-
-        // Add text to the action decorator
-        KText textToAdd = _kContainerRenderingExtensions.addText(actionDecorator, text);
-        _kRenderingExtensions.setFontSize(textToAdd, 8);
-        _linguaFrancaStyleExtensions.noSelectionStyle(textToAdd);
-        DiagramSyntheses.suppressSelectability(textToAdd);
-        _kRenderingExtensions.setPointPlacementData(textToAdd,
-                _kRenderingExtensions.LEFT, 0, 0.5f,
-                _kRenderingExtensions.TOP, size * 0.15f, 0.5f,
-                _kRenderingExtensions.H_CENTRAL, _kRenderingExtensions.V_CENTRAL, 0,
-                0, size, size);
-
-        return actionDecorator;
-    }
-
-    /**
-     * Creates the triangular action node with text and ports.
-     */
-    public Pair<KPort, KPort> addActionFigureAndPorts(KNode node, String text) {
-        final float size = 18;
-        _kNodeExtensions.setMinimalNodeSize(node, size, size);
-        KPolygon figure = _kRenderingExtensions.addPolygon(node);
-        _kRenderingExtensions.setBackground(figure, Colors.WHITE);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
-
-        List<KPosition> pointsToAdd = List.of(
+            _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0, 0));
+    actionDecorator.getPoints().addAll(pointsToAdd);
+
+    // Set placement data of the action decorator
+    KDecoratorPlacementData placementData = _kRenderingFactory.createKDecoratorPlacementData();
+    placementData.setRelative(0.5f);
+    placementData.setAbsolute(-size / 2);
+    placementData.setWidth(size);
+    placementData.setHeight(size);
+    placementData.setYOffset(-size * 0.66f);
+    placementData.setRotateWithLine(true);
+    actionDecorator.setPlacementData(placementData);
+
+    // Add text to the action decorator
+    KText textToAdd = _kContainerRenderingExtensions.addText(actionDecorator, text);
+    _kRenderingExtensions.setFontSize(textToAdd, 8);
+    _linguaFrancaStyleExtensions.noSelectionStyle(textToAdd);
+    DiagramSyntheses.suppressSelectability(textToAdd);
+    _kRenderingExtensions.setPointPlacementData(
+        textToAdd,
+        _kRenderingExtensions.LEFT,
+        0,
+        0.5f,
+        _kRenderingExtensions.TOP,
+        size * 0.15f,
+        0.5f,
+        _kRenderingExtensions.H_CENTRAL,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        size,
+        size);
+
+    return actionDecorator;
+  }
+
+  /** Creates the triangular action node with text and ports. */
+  public Pair<KPort, KPort> addActionFigureAndPorts(KNode node, String text) {
+    final float size = 18;
+    _kNodeExtensions.setMinimalNodeSize(node, size, size);
+    KPolygon figure = _kRenderingExtensions.addPolygon(node);
+    _kRenderingExtensions.setBackground(figure, Colors.WHITE);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
+
+    List<KPosition> pointsToAdd =
+        List.of(
             _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, 0, 0),
             _kRenderingExtensions.createKPosition(RIGHT, 0, 0, BOTTOM, 0, 0),
-            _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0, 0)
-        );
-        figure.getPoints().addAll(pointsToAdd);
-
-        // Add text to the action figure
-        KText textToAdd = _kContainerRenderingExtensions.addText(figure, text);
-        _kRenderingExtensions.setFontSize(textToAdd, 8);
-        _linguaFrancaStyleExtensions.noSelectionStyle(textToAdd);
-        DiagramSyntheses.suppressSelectability(textToAdd);
-        _kRenderingExtensions.setPointPlacementData(textToAdd,
-                _kRenderingExtensions.LEFT, 0, 0.5f,
-                _kRenderingExtensions.TOP, (size * 0.15f), 0.5f,
-                _kRenderingExtensions.H_CENTRAL,
-                _kRenderingExtensions.V_CENTRAL, 0, 0, size, size);
-
-        // Add input port
-        KPort in = _kPortExtensions.createPort();
-        node.getPorts().add(in);
-        in.setSize(0, 0);
-        DiagramSyntheses.setLayoutOption(in, CoreOptions.PORT_SIDE, PortSide.WEST);
-        DiagramSyntheses.setLayoutOption(in, CoreOptions.PORT_BORDER_OFFSET, -size / ((double) 4));
-
-        // Add output port
-        KPort out = _kPortExtensions.createPort();
-        node.getPorts().add(out);
-        DiagramSyntheses.setLayoutOption(out, CoreOptions.PORT_SIDE, PortSide.EAST);
-        DiagramSyntheses.setLayoutOption(out, CoreOptions.PORT_BORDER_OFFSET, -size / ((double) 4));
-        return new Pair<KPort, KPort>(in, out);
+            _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0, 0));
+    figure.getPoints().addAll(pointsToAdd);
+
+    // Add text to the action figure
+    KText textToAdd = _kContainerRenderingExtensions.addText(figure, text);
+    _kRenderingExtensions.setFontSize(textToAdd, 8);
+    _linguaFrancaStyleExtensions.noSelectionStyle(textToAdd);
+    DiagramSyntheses.suppressSelectability(textToAdd);
+    _kRenderingExtensions.setPointPlacementData(
+        textToAdd,
+        _kRenderingExtensions.LEFT,
+        0,
+        0.5f,
+        _kRenderingExtensions.TOP,
+        (size * 0.15f),
+        0.5f,
+        _kRenderingExtensions.H_CENTRAL,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        size,
+        size);
+
+    // Add input port
+    KPort in = _kPortExtensions.createPort();
+    node.getPorts().add(in);
+    in.setSize(0, 0);
+    DiagramSyntheses.setLayoutOption(in, CoreOptions.PORT_SIDE, PortSide.WEST);
+    DiagramSyntheses.setLayoutOption(in, CoreOptions.PORT_BORDER_OFFSET, -size / ((double) 4));
+
+    // Add output port
+    KPort out = _kPortExtensions.createPort();
+    node.getPorts().add(out);
+    DiagramSyntheses.setLayoutOption(out, CoreOptions.PORT_SIDE, PortSide.EAST);
+    DiagramSyntheses.setLayoutOption(out, CoreOptions.PORT_BORDER_OFFSET, -size / ((double) 4));
+    return new Pair<KPort, KPort>(in, out);
+  }
+
+  /** Creates and adds an error message figure */
+  public KRectangle addErrorMessage(KNode node, String title, String message) {
+    // Create figure for error message
+    KRectangle figure = _kRenderingExtensions.addRectangle(node);
+    _kRenderingExtensions.setInvisible(figure, true);
+
+    // Add error message box
+    KRoundedRectangle errMsgBox = _kContainerRenderingExtensions.addRoundedRectangle(figure, 7, 7);
+    _kContainerRenderingExtensions.setGridPlacement(errMsgBox, 1);
+    _kRenderingExtensions.setLineWidth(errMsgBox, 2);
+    _linguaFrancaStyleExtensions.noSelectionStyle(errMsgBox);
+
+    if (title != null) {
+      // Add title to error message box
+      KText titleText = _kContainerRenderingExtensions.addText(errMsgBox, title);
+      _kRenderingExtensions.setFontSize(titleText, 12);
+      _kRenderingExtensions.setFontBold(titleText, true);
+      _kRenderingExtensions.setForeground(titleText, Colors.RED);
+      setGridPlacementDataFromPointToPoint(
+          titleText,
+          _kRenderingExtensions.LEFT,
+          8,
+          0,
+          _kRenderingExtensions.TOP,
+          8,
+          0,
+          _kRenderingExtensions.RIGHT,
+          8,
+          0,
+          _kRenderingExtensions.BOTTOM,
+          4,
+          0);
+      DiagramSyntheses.suppressSelectability(titleText);
+      _linguaFrancaStyleExtensions.noSelectionStyle(titleText);
     }
 
-    /**
-     * Creates and adds an error message figure
-     */
-    public KRectangle addErrorMessage(KNode node, String title, String message) {
-        // Create figure for error message
-        KRectangle figure = _kRenderingExtensions.addRectangle(node);
-        _kRenderingExtensions.setInvisible(figure, true);
-
-        // Add error message box
-        KRoundedRectangle errMsgBox = _kContainerRenderingExtensions.addRoundedRectangle(figure, 7, 7);
-        _kContainerRenderingExtensions.setGridPlacement(errMsgBox, 1);
-        _kRenderingExtensions.setLineWidth(errMsgBox, 2);
-        _linguaFrancaStyleExtensions.noSelectionStyle(errMsgBox);
-
-        if (title != null) {
-            // Add title to error message box
-            KText titleText = _kContainerRenderingExtensions.addText(errMsgBox, title);
-            _kRenderingExtensions.setFontSize(titleText, 12);
-            _kRenderingExtensions.setFontBold(titleText, true);
-            _kRenderingExtensions.setForeground(titleText, Colors.RED);
-            setGridPlacementDataFromPointToPoint(titleText,
-                    _kRenderingExtensions.LEFT, 8, 0,
-                    _kRenderingExtensions.TOP, 8, 0,
-                    _kRenderingExtensions.RIGHT, 8, 0,
-                    _kRenderingExtensions.BOTTOM, 4, 0);
-            DiagramSyntheses.suppressSelectability(titleText);
-            _linguaFrancaStyleExtensions.noSelectionStyle(titleText);
-        }
-
-        if (message != null) {
-            // Add message to error message box
-            KText msgText = _kContainerRenderingExtensions.addText(errMsgBox, message);
-            if (title != null) {
-                setGridPlacementDataFromPointToPoint(msgText,
-                        _kRenderingExtensions.LEFT, 8, 0,
-                        _kRenderingExtensions.TOP, 0, 0,
-                        _kRenderingExtensions.RIGHT, 8, 0,
-                        _kRenderingExtensions.BOTTOM, 4, 0);
-            } else {
-                setGridPlacementDataFromPointToPoint(msgText,
-                        _kRenderingExtensions.LEFT, 8, 0,
-                        _kRenderingExtensions.TOP, 8, 0,
-                        _kRenderingExtensions.RIGHT, 8, 0,
-                        _kRenderingExtensions.BOTTOM, 8, 0);
-            }
-            _linguaFrancaStyleExtensions.noSelectionStyle(msgText);
-        }
-        return figure;
+    if (message != null) {
+      // Add message to error message box
+      KText msgText = _kContainerRenderingExtensions.addText(errMsgBox, message);
+      if (title != null) {
+        setGridPlacementDataFromPointToPoint(
+            msgText,
+            _kRenderingExtensions.LEFT,
+            8,
+            0,
+            _kRenderingExtensions.TOP,
+            0,
+            0,
+            _kRenderingExtensions.RIGHT,
+            8,
+            0,
+            _kRenderingExtensions.BOTTOM,
+            4,
+            0);
+      } else {
+        setGridPlacementDataFromPointToPoint(
+            msgText,
+            _kRenderingExtensions.LEFT,
+            8,
+            0,
+            _kRenderingExtensions.TOP,
+            8,
+            0,
+            _kRenderingExtensions.RIGHT,
+            8,
+            0,
+            _kRenderingExtensions.BOTTOM,
+            8,
+            0);
+      }
+      _linguaFrancaStyleExtensions.noSelectionStyle(msgText);
     }
-
-    public KRoundedRectangle addCommentFigure(KNode node, String message) {
-        // Create rectangle for comment figure
-        KRoundedRectangle commentFigure = _kRenderingExtensions.addRoundedRectangle(node, 1, 1, 1);
-        _kContainerRenderingExtensions.setGridPlacement(commentFigure, 1);
-
-        // Add message
-        KText text = _kContainerRenderingExtensions.addText(commentFigure, message);
-        _kRenderingExtensions.setFontSize(text, 6);
-        setGridPlacementDataFromPointToPoint(text,
-                _kRenderingExtensions.LEFT, 3, 0,
-                _kRenderingExtensions.TOP, 3, 0,
-                _kRenderingExtensions.RIGHT, 3, 0,
-                _kRenderingExtensions.BOTTOM, 3, 0);
-        _linguaFrancaStyleExtensions.noSelectionStyle(text);
-        return commentFigure;
-    }
-
-    private KRendering setGridPlacementDataFromPointToPoint(KRendering rendering,
-            PositionReferenceX fPx, float fAbsoluteLR, float fRelativeLR,
-            PositionReferenceY fPy, float fAbsoluteTB, float fRelativeTB,
-            PositionReferenceX tPx, float tAbsoluteLR, float tRelativeLR,
-            PositionReferenceY tPy, float tAbsoluteTB, float tRelativeTB) {
-        KAreaPlacementData fromPoint = _kRenderingExtensions.from(
-                _kRenderingExtensions.setGridPlacementData(rendering),
-                fPx, fAbsoluteLR, fRelativeLR,
-                fPy, fAbsoluteTB, fRelativeTB);
-        return _kRenderingExtensions.to(fromPoint,
-                tPx, tAbsoluteLR, tRelativeLR,
-                tPy, tAbsoluteTB, tRelativeTB);
-    }
-
-
-    public KPolyline addCommentPolyline(KEdge edge) {
-        KPolyline polyline = _kEdgeExtensions.addPolyline(edge);
-        _kRenderingExtensions.setLineWidth(polyline, 1);
-        _kRenderingExtensions.setLineStyle(polyline, LineStyle.DOT);
-        return polyline;
-    }
-
-    public KContainerRendering addParameterEntry(KContainerRendering parent, Parameter associate, String text) {
-        KRectangle container = _kContainerRenderingExtensions.addRectangle(parent);
-         _kRenderingExtensions.setInvisible(container, true);
-
-        var ktext = _kContainerRenderingExtensions.addText(container, text);
-        _kRenderingExtensions.setFontSize(ktext, 8);
-        _kRenderingExtensions.setPointPlacementData(ktext,
-                _kRenderingExtensions.LEFT, 10, 0,
-                _kRenderingExtensions.TOP, 0, 0.5f,
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_CENTRAL,
-                0, 0, 0, 0);
-        associateWith(ktext, associate);
-
-        var dot = _kContainerRenderingExtensions.addEllipse(container);
-        _kRenderingExtensions.setLineWidth(dot, 1);
-        _linguaFrancaStyleExtensions.noSelectionStyle(dot);
-        _kRenderingExtensions.setPointPlacementData(dot,
-                _kRenderingExtensions.LEFT, 2, 0,
-                _kRenderingExtensions.TOP, 0, 0.5f,
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_CENTRAL,
-                0, 0, 5, 5);
-
-        return container;
-    }
-
-
-    public KContainerRendering addStateEntry(KContainerRendering parent, StateVar associate, String text, boolean reset) {
-        KRectangle container = _kContainerRenderingExtensions.addRectangle(parent);
-         _kRenderingExtensions.setInvisible(container, true);
-
-        var ktext = _kContainerRenderingExtensions.addText(container, text);
-        _kRenderingExtensions.setFontSize(ktext, 8);
-        _kRenderingExtensions.setPointPlacementData(ktext,
-                _kRenderingExtensions.LEFT, 10, 0,
-                _kRenderingExtensions.TOP, 0, 0.5f,
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_CENTRAL,
-                0, 0, 0, 0);
-        associateWith(ktext, associate);
-
-        KEllipse outerCircle;
-
-        if (reset) {
-            outerCircle = _kContainerRenderingExtensions.addEllipse(container);
-            _kRenderingExtensions.setLineWidth(outerCircle, 0.9f);
-            _kRenderingExtensions.setBackground(outerCircle, Colors.WHITE);
-            _linguaFrancaStyleExtensions.noSelectionStyle(outerCircle);
-            _kRenderingExtensions.setPointPlacementData(outerCircle,
-                    _kRenderingExtensions.LEFT, 1.5f, 0,
-                    _kRenderingExtensions.TOP, 0, 0.5f,
-                    _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_CENTRAL,
-                    0, 0, 6.3f, 6.3f);
-
-            var resetCycleGap = _kContainerRenderingExtensions.addPolygon(outerCircle);
-            resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 0, 0, PositionReferenceY.TOP, 0.26f, 0));
-            resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 0, 0.2f, PositionReferenceY.TOP, 0.1f, 0));
-            resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 0, 0.5f, PositionReferenceY.TOP, 0.0f, 0));
-            resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.RIGHT, 0, 0.2f, PositionReferenceY.TOP, 0.1f, 0));
-            resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.RIGHT, 0, 0, PositionReferenceY.TOP, 0.26f, 0));
-            resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.RIGHT, 0.5f, 0, PositionReferenceY.BOTTOM, 0, 0));
-            resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 0.5f, 0, PositionReferenceY.BOTTOM, 0, 0));
-            _kRenderingExtensions.setLineWidth(resetCycleGap, 0.3f);
-            _kRenderingExtensions.setForeground(resetCycleGap, Colors.WHITE);
-            _kRenderingExtensions.setBackground(resetCycleGap, Colors.WHITE);
-            _linguaFrancaStyleExtensions.noSelectionStyle(resetCycleGap);
-            _kRenderingExtensions.setPointPlacementData(resetCycleGap,
-                    _kRenderingExtensions.LEFT, -1.2f, 0.5f,
-                    _kRenderingExtensions.TOP, 0.75f, 0,
-                    _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_CENTRAL,
-                    0, 0, 2.5f, 1.3f);
-
-            var resetArrow = _kContainerRenderingExtensions.addPolygon(outerCircle);
-            resetArrow.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 0, 0, PositionReferenceY.TOP, 0.0f, 0.1f));
-            resetArrow.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 0.0f, 0.3f, PositionReferenceY.BOTTOM, 0, 0));
-            resetArrow.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.RIGHT, 0.0f, 0, PositionReferenceY.TOP, 0.0f, 0.0f));
-            _kRenderingExtensions.setLineWidth(resetArrow, 0.3f);
-            _kRenderingExtensions.setBackground(resetArrow, Colors.BLACK);
-            _linguaFrancaStyleExtensions.noSelectionStyle(resetArrow);
-            _kRenderingExtensions.setPointPlacementData(resetArrow,
-                    _kRenderingExtensions.LEFT, 0.8f, 0.5f,
-                    _kRenderingExtensions.TOP, 1.1f, 0,
-                    _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_CENTRAL,
-                    0, 0, 1.5f, 1.5f);
-        } else {
-            outerCircle = _kContainerRenderingExtensions.addEllipse(container);
-            _kRenderingExtensions.setLineWidth(outerCircle, 1);
-            _kRenderingExtensions.setBackground(outerCircle, Colors.WHITE);
-            _linguaFrancaStyleExtensions.noSelectionStyle(outerCircle);
-            _kRenderingExtensions.setPointPlacementData(outerCircle,
-                    _kRenderingExtensions.LEFT, 1.5f, 0,
-                    _kRenderingExtensions.TOP, 0, 0.5f,
-                    _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_CENTRAL,
-                    0, 0, 6, 6);
-        }
-
-        var innerDot = _kContainerRenderingExtensions.addEllipse(outerCircle);
-        _kRenderingExtensions.setLineWidth(innerDot, 0.5f);
-        _kRenderingExtensions.setBackground(innerDot, Colors.BLACK);
-        _linguaFrancaStyleExtensions.noSelectionStyle(innerDot);
-        _kRenderingExtensions.setPointPlacementData(innerDot,
-                _kRenderingExtensions.LEFT, 0, 0.5f,
-                _kRenderingExtensions.TOP, 0, 0.5f,
-                _kRenderingExtensions.H_CENTRAL, _kRenderingExtensions.V_CENTRAL,
-                0, 0, 2.5f, 2.5f);
-
-        return container;
+    return figure;
+  }
+
+  public KRoundedRectangle addCommentFigure(KNode node, String message) {
+    // Create rectangle for comment figure
+    KRoundedRectangle commentFigure = _kRenderingExtensions.addRoundedRectangle(node, 1, 1, 1);
+    _kContainerRenderingExtensions.setGridPlacement(commentFigure, 1);
+
+    // Add message
+    KText text = _kContainerRenderingExtensions.addText(commentFigure, message);
+    _kRenderingExtensions.setFontSize(text, 6);
+    setGridPlacementDataFromPointToPoint(
+        text,
+        _kRenderingExtensions.LEFT,
+        3,
+        0,
+        _kRenderingExtensions.TOP,
+        3,
+        0,
+        _kRenderingExtensions.RIGHT,
+        3,
+        0,
+        _kRenderingExtensions.BOTTOM,
+        3,
+        0);
+    _linguaFrancaStyleExtensions.noSelectionStyle(text);
+    return commentFigure;
+  }
+
+  private KRendering setGridPlacementDataFromPointToPoint(
+      KRendering rendering,
+      PositionReferenceX fPx,
+      float fAbsoluteLR,
+      float fRelativeLR,
+      PositionReferenceY fPy,
+      float fAbsoluteTB,
+      float fRelativeTB,
+      PositionReferenceX tPx,
+      float tAbsoluteLR,
+      float tRelativeLR,
+      PositionReferenceY tPy,
+      float tAbsoluteTB,
+      float tRelativeTB) {
+    KAreaPlacementData fromPoint =
+        _kRenderingExtensions.from(
+            _kRenderingExtensions.setGridPlacementData(rendering),
+            fPx,
+            fAbsoluteLR,
+            fRelativeLR,
+            fPy,
+            fAbsoluteTB,
+            fRelativeTB);
+    return _kRenderingExtensions.to(
+        fromPoint, tPx, tAbsoluteLR, tRelativeLR, tPy, tAbsoluteTB, tRelativeTB);
+  }
+
+  public KPolyline addCommentPolyline(KEdge edge) {
+    KPolyline polyline = _kEdgeExtensions.addPolyline(edge);
+    _kRenderingExtensions.setLineWidth(polyline, 1);
+    _kRenderingExtensions.setLineStyle(polyline, LineStyle.DOT);
+    return polyline;
+  }
+
+  public KContainerRendering addParameterEntry(
+      KContainerRendering parent, Parameter associate, String text) {
+    KRectangle container = _kContainerRenderingExtensions.addRectangle(parent);
+    _kRenderingExtensions.setInvisible(container, true);
+
+    var ktext = _kContainerRenderingExtensions.addText(container, text);
+    _kRenderingExtensions.setFontSize(ktext, 8);
+    _kRenderingExtensions.setPointPlacementData(
+        ktext,
+        _kRenderingExtensions.LEFT,
+        10,
+        0,
+        _kRenderingExtensions.TOP,
+        0,
+        0.5f,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        0,
+        0);
+    associateWith(ktext, associate);
+
+    var dot = _kContainerRenderingExtensions.addEllipse(container);
+    _kRenderingExtensions.setLineWidth(dot, 1);
+    _linguaFrancaStyleExtensions.noSelectionStyle(dot);
+    _kRenderingExtensions.setPointPlacementData(
+        dot,
+        _kRenderingExtensions.LEFT,
+        2,
+        0,
+        _kRenderingExtensions.TOP,
+        0,
+        0.5f,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        5,
+        5);
+
+    return container;
+  }
+
+  public KContainerRendering addStateEntry(
+      KContainerRendering parent, StateVar associate, String text, boolean reset) {
+    KRectangle container = _kContainerRenderingExtensions.addRectangle(parent);
+    _kRenderingExtensions.setInvisible(container, true);
+
+    var ktext = _kContainerRenderingExtensions.addText(container, text);
+    _kRenderingExtensions.setFontSize(ktext, 8);
+    _kRenderingExtensions.setPointPlacementData(
+        ktext,
+        _kRenderingExtensions.LEFT,
+        10,
+        0,
+        _kRenderingExtensions.TOP,
+        0,
+        0.5f,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        0,
+        0);
+    associateWith(ktext, associate);
+
+    KEllipse outerCircle;
+
+    if (reset) {
+      outerCircle = _kContainerRenderingExtensions.addEllipse(container);
+      _kRenderingExtensions.setLineWidth(outerCircle, 0.9f);
+      _kRenderingExtensions.setBackground(outerCircle, Colors.WHITE);
+      _linguaFrancaStyleExtensions.noSelectionStyle(outerCircle);
+      _kRenderingExtensions.setPointPlacementData(
+          outerCircle,
+          _kRenderingExtensions.LEFT,
+          1.5f,
+          0,
+          _kRenderingExtensions.TOP,
+          0,
+          0.5f,
+          _kRenderingExtensions.H_LEFT,
+          _kRenderingExtensions.V_CENTRAL,
+          0,
+          0,
+          6.3f,
+          6.3f);
+
+      var resetCycleGap = _kContainerRenderingExtensions.addPolygon(outerCircle);
+      resetCycleGap
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.LEFT, 0, 0, PositionReferenceY.TOP, 0.26f, 0));
+      resetCycleGap
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.LEFT, 0, 0.2f, PositionReferenceY.TOP, 0.1f, 0));
+      resetCycleGap
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.LEFT, 0, 0.5f, PositionReferenceY.TOP, 0.0f, 0));
+      resetCycleGap
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.RIGHT, 0, 0.2f, PositionReferenceY.TOP, 0.1f, 0));
+      resetCycleGap
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.RIGHT, 0, 0, PositionReferenceY.TOP, 0.26f, 0));
+      resetCycleGap
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.RIGHT, 0.5f, 0, PositionReferenceY.BOTTOM, 0, 0));
+      resetCycleGap
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.LEFT, 0.5f, 0, PositionReferenceY.BOTTOM, 0, 0));
+      _kRenderingExtensions.setLineWidth(resetCycleGap, 0.3f);
+      _kRenderingExtensions.setForeground(resetCycleGap, Colors.WHITE);
+      _kRenderingExtensions.setBackground(resetCycleGap, Colors.WHITE);
+      _linguaFrancaStyleExtensions.noSelectionStyle(resetCycleGap);
+      _kRenderingExtensions.setPointPlacementData(
+          resetCycleGap,
+          _kRenderingExtensions.LEFT,
+          -1.2f,
+          0.5f,
+          _kRenderingExtensions.TOP,
+          0.75f,
+          0,
+          _kRenderingExtensions.H_LEFT,
+          _kRenderingExtensions.V_CENTRAL,
+          0,
+          0,
+          2.5f,
+          1.3f);
+
+      var resetArrow = _kContainerRenderingExtensions.addPolygon(outerCircle);
+      resetArrow
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.LEFT, 0, 0, PositionReferenceY.TOP, 0.0f, 0.1f));
+      resetArrow
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.LEFT, 0.0f, 0.3f, PositionReferenceY.BOTTOM, 0, 0));
+      resetArrow
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.RIGHT, 0.0f, 0, PositionReferenceY.TOP, 0.0f, 0.0f));
+      _kRenderingExtensions.setLineWidth(resetArrow, 0.3f);
+      _kRenderingExtensions.setBackground(resetArrow, Colors.BLACK);
+      _linguaFrancaStyleExtensions.noSelectionStyle(resetArrow);
+      _kRenderingExtensions.setPointPlacementData(
+          resetArrow,
+          _kRenderingExtensions.LEFT,
+          0.8f,
+          0.5f,
+          _kRenderingExtensions.TOP,
+          1.1f,
+          0,
+          _kRenderingExtensions.H_LEFT,
+          _kRenderingExtensions.V_CENTRAL,
+          0,
+          0,
+          1.5f,
+          1.5f);
+    } else {
+      outerCircle = _kContainerRenderingExtensions.addEllipse(container);
+      _kRenderingExtensions.setLineWidth(outerCircle, 1);
+      _kRenderingExtensions.setBackground(outerCircle, Colors.WHITE);
+      _linguaFrancaStyleExtensions.noSelectionStyle(outerCircle);
+      _kRenderingExtensions.setPointPlacementData(
+          outerCircle,
+          _kRenderingExtensions.LEFT,
+          1.5f,
+          0,
+          _kRenderingExtensions.TOP,
+          0,
+          0.5f,
+          _kRenderingExtensions.H_LEFT,
+          _kRenderingExtensions.V_CENTRAL,
+          0,
+          0,
+          6,
+          6);
     }
 
+    var innerDot = _kContainerRenderingExtensions.addEllipse(outerCircle);
+    _kRenderingExtensions.setLineWidth(innerDot, 0.5f);
+    _kRenderingExtensions.setBackground(innerDot, Colors.BLACK);
+    _linguaFrancaStyleExtensions.noSelectionStyle(innerDot);
+    _kRenderingExtensions.setPointPlacementData(
+        innerDot,
+        _kRenderingExtensions.LEFT,
+        0,
+        0.5f,
+        _kRenderingExtensions.TOP,
+        0,
+        0.5f,
+        _kRenderingExtensions.H_CENTRAL,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        2.5f,
+        2.5f);
+
+    return container;
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaStyleExtensions.java b/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaStyleExtensions.java
index f4c0aefd98..6eb2cfd7f0 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaStyleExtensions.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaStyleExtensions.java
@@ -1,29 +1,32 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.styles;
 
+import static de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceX.*;
+import static de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceY.*;
+
 import de.cau.cs.kieler.klighd.internal.util.KlighdInternalProperties;
 import de.cau.cs.kieler.klighd.kgraph.KEdge;
 import de.cau.cs.kieler.klighd.kgraph.KLabel;
@@ -48,7 +51,6 @@
 import de.cau.cs.kieler.klighd.labels.decoration.IDecoratorRenderingProvider;
 import de.cau.cs.kieler.klighd.labels.decoration.LabelDecorationConfigurator;
 import java.util.List;
-
 import javax.inject.Inject;
 import org.eclipse.elk.core.math.ElkPadding;
 import org.eclipse.elk.graph.properties.Property;
@@ -56,415 +58,469 @@
 import org.eclipse.xtext.xbase.lib.Extension;
 import org.lflang.diagram.synthesis.AbstractSynthesisExtensions;
 
-import static de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceX.*;
-import static de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceY.*;
-
 /**
  * Extension class that provides styles and coloring for the Lingua France diagram synthesis.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 @ViewSynthesisShared
 public class LinguaFrancaStyleExtensions extends AbstractSynthesisExtensions {
-    
-    /** 
-     * INTERNAL property to communicate a node's background color. 
-     */
-    public static final Property<Colors> LABEL_PARENT_BACKGROUND = new Property<>(
-            "org.lflang.linguafranca.diagram.synthesis.styles.label.parent.background", Colors.WHITE);
-    
-    @Inject
-    @Extension
-    private KRenderingExtensions _kRenderingExtensions;
-    @Inject
-    @Extension
-    private KContainerRenderingExtensions _kContainerRenderingExtensions;
-    @Inject
-    @Extension
-    private KPolylineExtensions _kPolylineExtensions;
-    @Extension
-    private KRenderingFactory _kRenderingFactory = KRenderingFactory.eINSTANCE;
-
-    public KRendering noSelectionStyle(KRendering r) {
-        return _kRenderingExtensions.setSelectionTextStrikeout(r, false);
-    }
-  
-    public KRendering underlineSelectionStyle(KRendering r) {
-        return _kRenderingExtensions.setSelectionTextUnderline(r, Underline.SINGLE);
-    }
-  
-    public KRendering boldLineSelectionStyle(KRendering r) {
-        float lineWidthValue = _kRenderingExtensions.getLineWidthValue(r);
-        return _kRenderingExtensions.setSelectionLineWidth(r, lineWidthValue * 2);
-    }
-  
-    public KText boldTextSelectionStyle(KText t) {
-        return _kRenderingExtensions.setSelectionFontBold(t, true);
-    }
-    
-    public void errorStyle(KRendering r) {
-        _kRenderingExtensions.setForeground(r, Colors.RED);
-        _kRenderingExtensions.setLineWidth(r, 2);
-        _kRenderingExtensions.setSelectionLineWidth(r, 3);
-        
-        // Set background color the body if its a port or an line decorator
-        if (r.eContainer() instanceof KPort || r.eContainer() instanceof KPolyline) {
-            _kRenderingExtensions.setBackground(r, Colors.RED);
-            _kRenderingExtensions.getBackground(r).setPropagateToChildren(true);
-            _kRenderingExtensions.getForeground(r).setPropagateToChildren(true);
-            _kRenderingExtensions.getLineWidth(r).setPropagateToChildren(true);
-        } else if (r.eContainer() instanceof KEdge && r instanceof KPolyline) {
-            // As a workaround for a rendering issue in Klighd VSCode, the style is applied to polyline
-            // children directly because a propagated background would lead to a filled edge area.
-            // See https://github.com/kieler/klighd-vscode/issues/67
-            // If fixed this commit can be reverted
-            ((KPolyline) r).getChildren().stream().forEach(c -> errorStyle(c));
-        }
-    }
-    
-    public void commentStyle(KRendering r) {
-        _kRenderingExtensions.setForeground(r, Colors.LIGHT_GOLDENROD);
-        _kRenderingExtensions.setBackground(r, Colors.PALE_GOLDENROD);
-        _kRenderingExtensions.setLineWidth(r, 1);
-        _kRenderingExtensions.setSelectionLineWidth(r, 2);
-
-        if (r.eContainer() instanceof KEdge) {  // also color potential arrow heads
-            _kRenderingExtensions.setBackground(r, Colors.LIGHT_GOLDENROD);
-            _kRenderingExtensions.getBackground(r).setPropagateToChildren(true);
-            _kRenderingExtensions.getForeground(r).setPropagateToChildren(true);
-            _kRenderingExtensions.getLineWidth(r).setPropagateToChildren(true);
-        }
+
+  /** INTERNAL property to communicate a node's background color. */
+  public static final Property<Colors> LABEL_PARENT_BACKGROUND =
+      new Property<>(
+          "org.lflang.linguafranca.diagram.synthesis.styles.label.parent.background", Colors.WHITE);
+
+  @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
+  @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
+  @Inject @Extension private KPolylineExtensions _kPolylineExtensions;
+  @Extension private KRenderingFactory _kRenderingFactory = KRenderingFactory.eINSTANCE;
+
+  public KRendering noSelectionStyle(KRendering r) {
+    return _kRenderingExtensions.setSelectionTextStrikeout(r, false);
+  }
+
+  public KRendering underlineSelectionStyle(KRendering r) {
+    return _kRenderingExtensions.setSelectionTextUnderline(r, Underline.SINGLE);
+  }
+
+  public KRendering boldLineSelectionStyle(KRendering r) {
+    float lineWidthValue = _kRenderingExtensions.getLineWidthValue(r);
+    return _kRenderingExtensions.setSelectionLineWidth(r, lineWidthValue * 2);
+  }
+
+  public KText boldTextSelectionStyle(KText t) {
+    return _kRenderingExtensions.setSelectionFontBold(t, true);
+  }
+
+  public void errorStyle(KRendering r) {
+    _kRenderingExtensions.setForeground(r, Colors.RED);
+    _kRenderingExtensions.setLineWidth(r, 2);
+    _kRenderingExtensions.setSelectionLineWidth(r, 3);
+
+    // Set background color the body if its a port or an line decorator
+    if (r.eContainer() instanceof KPort || r.eContainer() instanceof KPolyline) {
+      _kRenderingExtensions.setBackground(r, Colors.RED);
+      _kRenderingExtensions.getBackground(r).setPropagateToChildren(true);
+      _kRenderingExtensions.getForeground(r).setPropagateToChildren(true);
+      _kRenderingExtensions.getLineWidth(r).setPropagateToChildren(true);
+    } else if (r.eContainer() instanceof KEdge && r instanceof KPolyline) {
+      // As a workaround for a rendering issue in Klighd VSCode, the style is applied to polyline
+      // children directly because a propagated background would lead to a filled edge area.
+      // See https://github.com/kieler/klighd-vscode/issues/67
+      // If fixed this commit can be reverted
+      ((KPolyline) r).getChildren().stream().forEach(c -> errorStyle(c));
     }
-    
-    private static final int CLOUD_WIDTH = 20;
-    public KContainerRendering addCloudIcon(final KContainerRendering parent) {
-        KRectangle figure = _kContainerRenderingExtensions.addRectangle(parent);
-        _kRenderingExtensions.setInvisible(figure, true);
-        
-        KRoundedRectangle roundRectangle = _kContainerRenderingExtensions.addRoundedRectangle(
-                figure, 
-                CLOUD_WIDTH / 7, 
-                CLOUD_WIDTH / 7
-        );
-        _kRenderingExtensions.setBackground(roundRectangle, Colors.GRAY);
-        _kRenderingExtensions.setForeground(roundRectangle, Colors.GRAY);
-        _kRenderingExtensions.setPointPlacementData(roundRectangle, 
-                _kRenderingExtensions.LEFT, 2, 0, 
-                _kRenderingExtensions.TOP, 0, 0.5f, 
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_TOP, 0, 
-                0, CLOUD_WIDTH, CLOUD_WIDTH / 3);
-        
-        KEllipse childEllipse = _kContainerRenderingExtensions.addEllipse(figure);
-        _kRenderingExtensions.setBackground(childEllipse, Colors.GRAY);
-        _kRenderingExtensions.setForeground(childEllipse, Colors.GRAY);
-        _kRenderingExtensions.setPointPlacementData(childEllipse, 
-                _kRenderingExtensions.LEFT, 0, 0f,
-                _kRenderingExtensions.TOP, 0, 0.38f, 
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_TOP, 0, 
-                0, CLOUD_WIDTH / 2.5f, CLOUD_WIDTH / 2.5f);
-        
-        childEllipse = _kContainerRenderingExtensions.addEllipse(figure);
-        _kRenderingExtensions.setBackground(childEllipse, Colors.GRAY);
-        _kRenderingExtensions.setForeground(childEllipse, Colors.GRAY);
-        _kRenderingExtensions.setPointPlacementData(childEllipse, 
-                _kRenderingExtensions.LEFT, 0, 0.5f, 
-                _kRenderingExtensions.TOP, 0, 0.25f, 
-                _kRenderingExtensions.H_RIGHT, _kRenderingExtensions.V_TOP, 0, 
-                0, CLOUD_WIDTH / 3f, CLOUD_WIDTH / 3f);
-        
-        childEllipse = _kContainerRenderingExtensions.addEllipse(figure);
-        _kRenderingExtensions.setBackground(childEllipse, Colors.GRAY);
-        _kRenderingExtensions.setForeground(childEllipse, Colors.GRAY);
-        _kRenderingExtensions.setPointPlacementData(childEllipse, 
-                _kRenderingExtensions.LEFT, 0, 0.4f,
-                _kRenderingExtensions.TOP, CLOUD_WIDTH / 10, 0, 
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_TOP, 0, 
-                0, CLOUD_WIDTH / 2, CLOUD_WIDTH / 2);
-        
-        return figure;
+  }
+
+  public void commentStyle(KRendering r) {
+    _kRenderingExtensions.setForeground(r, Colors.LIGHT_GOLDENROD);
+    _kRenderingExtensions.setBackground(r, Colors.PALE_GOLDENROD);
+    _kRenderingExtensions.setLineWidth(r, 1);
+    _kRenderingExtensions.setSelectionLineWidth(r, 2);
+
+    if (r.eContainer() instanceof KEdge) { // also color potential arrow heads
+      _kRenderingExtensions.setBackground(r, Colors.LIGHT_GOLDENROD);
+      _kRenderingExtensions.getBackground(r).setPropagateToChildren(true);
+      _kRenderingExtensions.getForeground(r).setPropagateToChildren(true);
+      _kRenderingExtensions.getLineWidth(r).setPropagateToChildren(true);
     }
-    
-    public KRendering addCloudUploadIcon(KContainerRendering parent) {
-        KContainerRendering cloudIcon = addCloudIcon(parent);
-        KPolygon cloudPolygon = _kContainerRenderingExtensions.addPolygon(cloudIcon);
-        _kRenderingExtensions.setBackground(cloudPolygon, Colors.WHITE);
-        _kRenderingExtensions.setForeground(cloudPolygon, Colors.WHITE);
-        cloudPolygon.getPoints().addAll(
+  }
+
+  private static final int CLOUD_WIDTH = 20;
+
+  public KContainerRendering addCloudIcon(final KContainerRendering parent) {
+    KRectangle figure = _kContainerRenderingExtensions.addRectangle(parent);
+    _kRenderingExtensions.setInvisible(figure, true);
+
+    KRoundedRectangle roundRectangle =
+        _kContainerRenderingExtensions.addRoundedRectangle(
+            figure, CLOUD_WIDTH / 7, CLOUD_WIDTH / 7);
+    _kRenderingExtensions.setBackground(roundRectangle, Colors.GRAY);
+    _kRenderingExtensions.setForeground(roundRectangle, Colors.GRAY);
+    _kRenderingExtensions.setPointPlacementData(
+        roundRectangle,
+        _kRenderingExtensions.LEFT,
+        2,
+        0,
+        _kRenderingExtensions.TOP,
+        0,
+        0.5f,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_TOP,
+        0,
+        0,
+        CLOUD_WIDTH,
+        CLOUD_WIDTH / 3);
+
+    KEllipse childEllipse = _kContainerRenderingExtensions.addEllipse(figure);
+    _kRenderingExtensions.setBackground(childEllipse, Colors.GRAY);
+    _kRenderingExtensions.setForeground(childEllipse, Colors.GRAY);
+    _kRenderingExtensions.setPointPlacementData(
+        childEllipse,
+        _kRenderingExtensions.LEFT,
+        0,
+        0f,
+        _kRenderingExtensions.TOP,
+        0,
+        0.38f,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_TOP,
+        0,
+        0,
+        CLOUD_WIDTH / 2.5f,
+        CLOUD_WIDTH / 2.5f);
+
+    childEllipse = _kContainerRenderingExtensions.addEllipse(figure);
+    _kRenderingExtensions.setBackground(childEllipse, Colors.GRAY);
+    _kRenderingExtensions.setForeground(childEllipse, Colors.GRAY);
+    _kRenderingExtensions.setPointPlacementData(
+        childEllipse,
+        _kRenderingExtensions.LEFT,
+        0,
+        0.5f,
+        _kRenderingExtensions.TOP,
+        0,
+        0.25f,
+        _kRenderingExtensions.H_RIGHT,
+        _kRenderingExtensions.V_TOP,
+        0,
+        0,
+        CLOUD_WIDTH / 3f,
+        CLOUD_WIDTH / 3f);
+
+    childEllipse = _kContainerRenderingExtensions.addEllipse(figure);
+    _kRenderingExtensions.setBackground(childEllipse, Colors.GRAY);
+    _kRenderingExtensions.setForeground(childEllipse, Colors.GRAY);
+    _kRenderingExtensions.setPointPlacementData(
+        childEllipse,
+        _kRenderingExtensions.LEFT,
+        0,
+        0.4f,
+        _kRenderingExtensions.TOP,
+        CLOUD_WIDTH / 10,
+        0,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_TOP,
+        0,
+        0,
+        CLOUD_WIDTH / 2,
+        CLOUD_WIDTH / 2);
+
+    return figure;
+  }
+
+  public KRendering addCloudUploadIcon(KContainerRendering parent) {
+    KContainerRendering cloudIcon = addCloudIcon(parent);
+    KPolygon cloudPolygon = _kContainerRenderingExtensions.addPolygon(cloudIcon);
+    _kRenderingExtensions.setBackground(cloudPolygon, Colors.WHITE);
+    _kRenderingExtensions.setForeground(cloudPolygon, Colors.WHITE);
+    cloudPolygon
+        .getPoints()
+        .addAll(
             List.of(
-                _kRenderingExtensions.createKPosition(LEFT, -1.5f, 0.5f, TOP, CLOUD_WIDTH / 3, 0.5f),
+                _kRenderingExtensions.createKPosition(
+                    LEFT, -1.5f, 0.5f, TOP, CLOUD_WIDTH / 3, 0.5f),
                 _kRenderingExtensions.createKPosition(LEFT, -1.5f, 0.5f, TOP, 0, 0.58f),
                 _kRenderingExtensions.createKPosition(LEFT, (-4), 0.5f, TOP, 0, 0.58f),
                 _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, 0, 0.35f),
                 _kRenderingExtensions.createKPosition(LEFT, 4, 0.5f, TOP, 0, 0.58f),
                 _kRenderingExtensions.createKPosition(LEFT, 1.5f, 0.5f, TOP, 0, 0.58f),
-                _kRenderingExtensions.createKPosition(LEFT, 1.5f, 0.5f, TOP, CLOUD_WIDTH / 3, 0.5f)
-            )
-        );
-        return cloudIcon;
-    }
-    
-    private static LabelDecorationConfigurator _onEdgeLabelConfigurator; // ONLY for use in applyOnEdgeStyle
-    public void applyOnEdgeStyle(KLabel label) {
-        if (_onEdgeLabelConfigurator == null) {
-            LabelDecorationConfigurator configurator = LabelDecorationConfigurator.create().withInlineLabels(true);
-            _onEdgeLabelConfigurator = configurator.withLabelTextRenderingProvider(
-                    (KContainerRendering container, KLabel klabel) -> {
+                _kRenderingExtensions.createKPosition(
+                    LEFT, 1.5f, 0.5f, TOP, CLOUD_WIDTH / 3, 0.5f)));
+    return cloudIcon;
+  }
+
+  private static LabelDecorationConfigurator
+      _onEdgeLabelConfigurator; // ONLY for use in applyOnEdgeStyle
+
+  public void applyOnEdgeStyle(KLabel label) {
+    if (_onEdgeLabelConfigurator == null) {
+      LabelDecorationConfigurator configurator =
+          LabelDecorationConfigurator.create().withInlineLabels(true);
+      _onEdgeLabelConfigurator =
+          configurator.withLabelTextRenderingProvider(
+              (KContainerRendering container, KLabel klabel) -> {
                 KText kText = _kRenderingFactory.createKText();
                 _kRenderingExtensions.setFontSize(kText, 9);
                 container.getChildren().add(kText);
                 return kText;
-            });
-        }
-        _onEdgeLabelConfigurator.applyTo(label);
+              });
     }
-   
-    private static LabelDecorationConfigurator _onEdgeDelayLabelConfigurator; // ONLY for use in applyOnEdgeDelayStyle
-    public void applyOnEdgeDelayStyle(KLabel label) {
-        if (_onEdgeDelayLabelConfigurator == null) {
-            LabelDecorationConfigurator configurator = LabelDecorationConfigurator.create().withInlineLabels(true);
-            configurator = configurator.withLabelTextRenderingProvider(
-                (KContainerRendering container, KLabel klabel) -> {
-                    KText kText = _kRenderingFactory.createKText();
-                    _kRenderingExtensions.setFontSize(kText, 8);
-                    boldTextSelectionStyle(kText);
-                    kText.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, 
-                            klabel.getProperty(KlighdInternalProperties.MODEL_ELEMEMT));
-                    container.getChildren().add(kText);
-                    return kText;
-                }
-            );
-            configurator = configurator.addDecoratorRenderingProvider(new IDecoratorRenderingProvider() {
+    _onEdgeLabelConfigurator.applyTo(label);
+  }
+
+  private static LabelDecorationConfigurator
+      _onEdgeDelayLabelConfigurator; // ONLY for use in applyOnEdgeDelayStyle
+
+  public void applyOnEdgeDelayStyle(KLabel label) {
+    if (_onEdgeDelayLabelConfigurator == null) {
+      LabelDecorationConfigurator configurator =
+          LabelDecorationConfigurator.create().withInlineLabels(true);
+      configurator =
+          configurator.withLabelTextRenderingProvider(
+              (KContainerRendering container, KLabel klabel) -> {
+                KText kText = _kRenderingFactory.createKText();
+                _kRenderingExtensions.setFontSize(kText, 8);
+                boldTextSelectionStyle(kText);
+                kText.setProperty(
+                    KlighdInternalProperties.MODEL_ELEMEMT,
+                    klabel.getProperty(KlighdInternalProperties.MODEL_ELEMEMT));
+                container.getChildren().add(kText);
+                return kText;
+              });
+      configurator =
+          configurator.addDecoratorRenderingProvider(
+              new IDecoratorRenderingProvider() {
                 @Override
                 public ElkPadding createDecoratorRendering(
-                        KContainerRendering container, KLabel label, 
-                        LabelDecorationConfigurator.LayoutMode layoutMode) {
-                    ElkPadding padding =  new ElkPadding();
-                    padding.top = 1;
-                    padding.bottom = 1;
-                    padding.left = 2;
-                    padding.right = 2;
-                    
-                    KPolygon polygon = _kRenderingFactory.createKPolygon();
-                    _kRenderingExtensions.from(polygon, LEFT, (-2), 0, BOTTOM, 0, 0);
-                    _kRenderingExtensions.to(polygon, LEFT, 2, 0, TOP, 0, 0);
-                    _kRenderingExtensions.to(polygon, RIGHT, (-2), 0, TOP, 0, 0);
-                    _kRenderingExtensions.to(polygon, RIGHT, 2, 0, BOTTOM, 0, 0);
-                    _kRenderingExtensions.setBackground(polygon, Colors.WHITE);
-                    _kRenderingExtensions.setForeground(polygon, Colors.WHITE);
-                    container.getChildren().add(polygon);
-                    
-                    KPolyline polyline = _kRenderingFactory.createKPolyline();
-                    _kRenderingExtensions.from(polyline, LEFT, (-2), 0, BOTTOM, 0, 0);
-                    _kRenderingExtensions.to(polyline, LEFT, 2, 0, TOP, 0, 0);
-                    container.getChildren().add(polyline);
-                    
-                    polyline = _kRenderingFactory.createKPolyline();
-                    _kRenderingExtensions.from(polyline, RIGHT, 2, 0, BOTTOM, 0, 0);
-                    _kRenderingExtensions.to(polyline, RIGHT, (-2), 0, TOP, 0, 0);
-                    container.getChildren().add(polyline);
-                    
-                    return padding;
+                    KContainerRendering container,
+                    KLabel label,
+                    LabelDecorationConfigurator.LayoutMode layoutMode) {
+                  ElkPadding padding = new ElkPadding();
+                  padding.top = 1;
+                  padding.bottom = 1;
+                  padding.left = 2;
+                  padding.right = 2;
+
+                  KPolygon polygon = _kRenderingFactory.createKPolygon();
+                  _kRenderingExtensions.from(polygon, LEFT, (-2), 0, BOTTOM, 0, 0);
+                  _kRenderingExtensions.to(polygon, LEFT, 2, 0, TOP, 0, 0);
+                  _kRenderingExtensions.to(polygon, RIGHT, (-2), 0, TOP, 0, 0);
+                  _kRenderingExtensions.to(polygon, RIGHT, 2, 0, BOTTOM, 0, 0);
+                  _kRenderingExtensions.setBackground(polygon, Colors.WHITE);
+                  _kRenderingExtensions.setForeground(polygon, Colors.WHITE);
+                  container.getChildren().add(polygon);
+
+                  KPolyline polyline = _kRenderingFactory.createKPolyline();
+                  _kRenderingExtensions.from(polyline, LEFT, (-2), 0, BOTTOM, 0, 0);
+                  _kRenderingExtensions.to(polyline, LEFT, 2, 0, TOP, 0, 0);
+                  container.getChildren().add(polyline);
+
+                  polyline = _kRenderingFactory.createKPolyline();
+                  _kRenderingExtensions.from(polyline, RIGHT, 2, 0, BOTTOM, 0, 0);
+                  _kRenderingExtensions.to(polyline, RIGHT, (-2), 0, TOP, 0, 0);
+                  container.getChildren().add(polyline);
+
+                  return padding;
                 }
-            });
-            _onEdgeDelayLabelConfigurator = configurator;
-        }
-        _onEdgeDelayLabelConfigurator.applyTo(label);
+              });
+      _onEdgeDelayLabelConfigurator = configurator;
     }
+    _onEdgeDelayLabelConfigurator.applyTo(label);
+  }
 
-    private static LabelDecorationConfigurator _onEdgePysicalDelayLabelConfigurator; // ONLY for use in applyOnEdgePysicalDelayStyle
-    public void applyOnEdgePysicalDelayStyle(KLabel label, Colors parentBackgroundColor) {
-        if (_onEdgePysicalDelayLabelConfigurator == null) {
-            LabelDecorationConfigurator configurator = LabelDecorationConfigurator.create().withInlineLabels(true);
-            configurator = configurator.withLabelTextRenderingProvider(
-                (KContainerRendering container, KLabel klabel) -> {
-                    KText kText = _kRenderingFactory.createKText();
-                    _kRenderingExtensions.setFontSize(kText, 8);
-                    boldTextSelectionStyle(kText);
-                    kText.setProperty(KlighdInternalProperties.MODEL_ELEMEMT,
-                            klabel.getProperty(KlighdInternalProperties.MODEL_ELEMEMT));
-                    container.getChildren().add(kText);
-                    return kText;
-                }
-            );
-            configurator = configurator.addDecoratorRenderingProvider(new IDecoratorRenderingProvider() {
+  private static LabelDecorationConfigurator
+      _onEdgePysicalDelayLabelConfigurator; // ONLY for use in applyOnEdgePysicalDelayStyle
+
+  public void applyOnEdgePysicalDelayStyle(KLabel label, Colors parentBackgroundColor) {
+    if (_onEdgePysicalDelayLabelConfigurator == null) {
+      LabelDecorationConfigurator configurator =
+          LabelDecorationConfigurator.create().withInlineLabels(true);
+      configurator =
+          configurator.withLabelTextRenderingProvider(
+              (KContainerRendering container, KLabel klabel) -> {
+                KText kText = _kRenderingFactory.createKText();
+                _kRenderingExtensions.setFontSize(kText, 8);
+                boldTextSelectionStyle(kText);
+                kText.setProperty(
+                    KlighdInternalProperties.MODEL_ELEMEMT,
+                    klabel.getProperty(KlighdInternalProperties.MODEL_ELEMEMT));
+                container.getChildren().add(kText);
+                return kText;
+              });
+      configurator =
+          configurator.addDecoratorRenderingProvider(
+              new IDecoratorRenderingProvider() {
                 @Override
                 public ElkPadding createDecoratorRendering(
-                        KContainerRendering container, 
-                        KLabel label, 
-                        LabelDecorationConfigurator.LayoutMode layoutMode) {
-                    ElkPadding padding = new ElkPadding();
-                    padding.top = 1;
-                    padding.bottom = 1;
-                    padding.left = 8;
-                    padding.right = 16;
-                    
-                    KPolygon polygon = _kRenderingFactory.createKPolygon();
-                    _kRenderingExtensions.from(polygon, LEFT, 0, 0, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.to(polygon, LEFT, 0, 0, TOP, 1, 0.5f);
-                    _kRenderingExtensions.to(polygon, RIGHT, 0, 0, TOP, 1, 0.5f);
-                    _kRenderingExtensions.to(polygon, RIGHT, 0, 0, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.setBackground(polygon, label.getProperty(LABEL_PARENT_BACKGROUND));
-                    _kRenderingExtensions.setForeground(polygon, label.getProperty(LABEL_PARENT_BACKGROUND));
-                    container.getChildren().add(polygon);
-                    
-                    KSpline kSpline = _kRenderingFactory.createKSpline();
-                    _kRenderingExtensions.from(kSpline, LEFT, -0.66f, 0, BOTTOM, -0.5f, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 1, 0, BOTTOM, -0.5f, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 3, 0, BOTTOM, 8, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 5, 0, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 5.5f, 0, BOTTOM, -1.5f, 0.5f);
-                    container.getChildren().add(kSpline);
-                    
-                    kSpline = _kRenderingFactory.createKSpline();
-                    _kRenderingExtensions.from(kSpline, RIGHT, 15f, 0, BOTTOM, 3.5f, 0.5f);
-                    _kRenderingExtensions.to(kSpline, RIGHT, 14f, 0, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.to(kSpline, RIGHT, 11, 0, BOTTOM, -8, 0.5f);
-                    _kRenderingExtensions.to(kSpline, RIGHT, 9, 0, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.to(kSpline, RIGHT, 7, 0, BOTTOM, 8, 0.5f);
-                    _kRenderingExtensions.to(kSpline, RIGHT, 4f, 0, BOTTOM, 2, 0.5f);
-                    _kRenderingExtensions.to(kSpline, RIGHT, 1.5f, 0, BOTTOM, 0.5f, 0.5f);
-                    _kRenderingExtensions.to(kSpline, RIGHT, 0.2f, 0, BOTTOM, -0.5f, 0.5f);
-                    _kRenderingExtensions.to(kSpline, RIGHT, -0.7f, 0, BOTTOM, -0.5f, 0.5f);
-                    container.getChildren().add(kSpline);
-                    
-                    polygon = _kRenderingFactory.createKPolygon();
-                    _kRenderingExtensions.from(polygon, LEFT, 4, 0, BOTTOM, 0, 0);
-                    _kRenderingExtensions.to(polygon, LEFT, 8, 0, TOP, 0, 0);
-                    _kRenderingExtensions.to(polygon, RIGHT, 12, 0, TOP, 0, 0);
-                    _kRenderingExtensions.to(polygon, RIGHT, 16, 0, BOTTOM, 0, 0);
-                    _kRenderingExtensions.setBackground(polygon, Colors.WHITE);
-                    _kRenderingExtensions.setForeground(polygon, Colors.WHITE);
-                    container.getChildren().add(polygon);
-                    
-                    KPolyline polyline = _kRenderingFactory.createKPolyline();
-                    _kRenderingExtensions.from(polyline, LEFT, 4, 0, BOTTOM, 0, 0);
-                    _kRenderingExtensions.to(polyline, LEFT, 8, 0, TOP, 0, 0);
-                    container.getChildren().add(polyline);
-                    
-                    polyline = _kRenderingFactory.createKPolyline();
-                    _kRenderingExtensions.from(polyline, RIGHT, 16, 0, BOTTOM, 0, 0);
-                    _kRenderingExtensions.to(polyline, RIGHT, 12, 0, TOP, 0, 0);
-                    container.getChildren().add(polyline);
-                    
-                    return padding;
+                    KContainerRendering container,
+                    KLabel label,
+                    LabelDecorationConfigurator.LayoutMode layoutMode) {
+                  ElkPadding padding = new ElkPadding();
+                  padding.top = 1;
+                  padding.bottom = 1;
+                  padding.left = 8;
+                  padding.right = 16;
+
+                  KPolygon polygon = _kRenderingFactory.createKPolygon();
+                  _kRenderingExtensions.from(polygon, LEFT, 0, 0, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.to(polygon, LEFT, 0, 0, TOP, 1, 0.5f);
+                  _kRenderingExtensions.to(polygon, RIGHT, 0, 0, TOP, 1, 0.5f);
+                  _kRenderingExtensions.to(polygon, RIGHT, 0, 0, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.setBackground(
+                      polygon, label.getProperty(LABEL_PARENT_BACKGROUND));
+                  _kRenderingExtensions.setForeground(
+                      polygon, label.getProperty(LABEL_PARENT_BACKGROUND));
+                  container.getChildren().add(polygon);
+
+                  KSpline kSpline = _kRenderingFactory.createKSpline();
+                  _kRenderingExtensions.from(kSpline, LEFT, -0.66f, 0, BOTTOM, -0.5f, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 1, 0, BOTTOM, -0.5f, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 3, 0, BOTTOM, 8, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 5, 0, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 5.5f, 0, BOTTOM, -1.5f, 0.5f);
+                  container.getChildren().add(kSpline);
+
+                  kSpline = _kRenderingFactory.createKSpline();
+                  _kRenderingExtensions.from(kSpline, RIGHT, 15f, 0, BOTTOM, 3.5f, 0.5f);
+                  _kRenderingExtensions.to(kSpline, RIGHT, 14f, 0, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.to(kSpline, RIGHT, 11, 0, BOTTOM, -8, 0.5f);
+                  _kRenderingExtensions.to(kSpline, RIGHT, 9, 0, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.to(kSpline, RIGHT, 7, 0, BOTTOM, 8, 0.5f);
+                  _kRenderingExtensions.to(kSpline, RIGHT, 4f, 0, BOTTOM, 2, 0.5f);
+                  _kRenderingExtensions.to(kSpline, RIGHT, 1.5f, 0, BOTTOM, 0.5f, 0.5f);
+                  _kRenderingExtensions.to(kSpline, RIGHT, 0.2f, 0, BOTTOM, -0.5f, 0.5f);
+                  _kRenderingExtensions.to(kSpline, RIGHT, -0.7f, 0, BOTTOM, -0.5f, 0.5f);
+                  container.getChildren().add(kSpline);
+
+                  polygon = _kRenderingFactory.createKPolygon();
+                  _kRenderingExtensions.from(polygon, LEFT, 4, 0, BOTTOM, 0, 0);
+                  _kRenderingExtensions.to(polygon, LEFT, 8, 0, TOP, 0, 0);
+                  _kRenderingExtensions.to(polygon, RIGHT, 12, 0, TOP, 0, 0);
+                  _kRenderingExtensions.to(polygon, RIGHT, 16, 0, BOTTOM, 0, 0);
+                  _kRenderingExtensions.setBackground(polygon, Colors.WHITE);
+                  _kRenderingExtensions.setForeground(polygon, Colors.WHITE);
+                  container.getChildren().add(polygon);
+
+                  KPolyline polyline = _kRenderingFactory.createKPolyline();
+                  _kRenderingExtensions.from(polyline, LEFT, 4, 0, BOTTOM, 0, 0);
+                  _kRenderingExtensions.to(polyline, LEFT, 8, 0, TOP, 0, 0);
+                  container.getChildren().add(polyline);
+
+                  polyline = _kRenderingFactory.createKPolyline();
+                  _kRenderingExtensions.from(polyline, RIGHT, 16, 0, BOTTOM, 0, 0);
+                  _kRenderingExtensions.to(polyline, RIGHT, 12, 0, TOP, 0, 0);
+                  container.getChildren().add(polyline);
+
+                  return padding;
                 }
-            });
-            _onEdgePysicalDelayLabelConfigurator = configurator;
-        }
-        label.setProperty(LABEL_PARENT_BACKGROUND, parentBackgroundColor);
-        _onEdgePysicalDelayLabelConfigurator.applyTo(label);
+              });
+      _onEdgePysicalDelayLabelConfigurator = configurator;
     }
-    
-    private static LabelDecorationConfigurator _onEdgePysicalLabelConfigurator; // ONLY for use in applyOnEdgePysicalStyle
-    public void applyOnEdgePysicalStyle(KLabel label, Colors parentBackgroundColor) {
-        if (_onEdgePysicalLabelConfigurator == null) {
-            LabelDecorationConfigurator configurator = LabelDecorationConfigurator.create().withInlineLabels(true);
-            configurator = configurator.withLabelTextRenderingProvider(
-                (KContainerRendering container, KLabel klabel) -> {
-                    KText kText = _kRenderingFactory.createKText();
-                    _kRenderingExtensions.setInvisible(kText, true);
-                    container.getChildren().add(kText);
-                    return kText;
-                }
-            );
-            configurator = configurator.addDecoratorRenderingProvider(new IDecoratorRenderingProvider() {
+    label.setProperty(LABEL_PARENT_BACKGROUND, parentBackgroundColor);
+    _onEdgePysicalDelayLabelConfigurator.applyTo(label);
+  }
+
+  private static LabelDecorationConfigurator
+      _onEdgePysicalLabelConfigurator; // ONLY for use in applyOnEdgePysicalStyle
+
+  public void applyOnEdgePysicalStyle(KLabel label, Colors parentBackgroundColor) {
+    if (_onEdgePysicalLabelConfigurator == null) {
+      LabelDecorationConfigurator configurator =
+          LabelDecorationConfigurator.create().withInlineLabels(true);
+      configurator =
+          configurator.withLabelTextRenderingProvider(
+              (KContainerRendering container, KLabel klabel) -> {
+                KText kText = _kRenderingFactory.createKText();
+                _kRenderingExtensions.setInvisible(kText, true);
+                container.getChildren().add(kText);
+                return kText;
+              });
+      configurator =
+          configurator.addDecoratorRenderingProvider(
+              new IDecoratorRenderingProvider() {
                 @Override
-                public ElkPadding createDecoratorRendering(final KContainerRendering container, final KLabel label, final LabelDecorationConfigurator.LayoutMode layoutMode) {
-                    ElkPadding padding = new ElkPadding();
-                    padding.top = 1;
-                    padding.bottom = 1;
-                    padding.left = 3;
-                    padding.right = 3;
-                    
-                    KPolygon polygon = _kRenderingFactory.createKPolygon();
-                    _kRenderingExtensions.from(polygon, LEFT, 0, 0, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.to(polygon, LEFT, 0, 0, TOP, 1, 0.5f);
-                    _kRenderingExtensions.to(polygon, RIGHT, 0, 0, TOP, 1, 0.5f);
-                    _kRenderingExtensions.to(polygon, RIGHT, 0, 0, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.setBackground(polygon, label.getProperty(LABEL_PARENT_BACKGROUND));
-                    _kRenderingExtensions.setForeground(polygon, label.getProperty(LABEL_PARENT_BACKGROUND));
-                    container.getChildren().add(polygon);
-                    
-                    KSpline kSpline = _kRenderingFactory.createKSpline();
-                    _kRenderingExtensions.from(kSpline, LEFT, (-0.66f), 0, BOTTOM, (-0.5f), 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 1, 0, BOTTOM, (-0.5f), 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.1f, BOTTOM, 8, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.2f, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.3f, BOTTOM, (-8), 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.4f, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.45f, BOTTOM, 4f, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.5f, BOTTOM, 8, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.55f, BOTTOM, 4f, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.6f, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.65f, BOTTOM, (-4), 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.7f, BOTTOM, (-8), 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.8f, BOTTOM, (-4), 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.9f, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, (-1), 1, BOTTOM, (-0.5f), 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0.66f, 1, BOTTOM, (-0.5f), 0.5f);
-                    container.getChildren().add(kSpline);
-                    return padding;
+                public ElkPadding createDecoratorRendering(
+                    final KContainerRendering container,
+                    final KLabel label,
+                    final LabelDecorationConfigurator.LayoutMode layoutMode) {
+                  ElkPadding padding = new ElkPadding();
+                  padding.top = 1;
+                  padding.bottom = 1;
+                  padding.left = 3;
+                  padding.right = 3;
+
+                  KPolygon polygon = _kRenderingFactory.createKPolygon();
+                  _kRenderingExtensions.from(polygon, LEFT, 0, 0, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.to(polygon, LEFT, 0, 0, TOP, 1, 0.5f);
+                  _kRenderingExtensions.to(polygon, RIGHT, 0, 0, TOP, 1, 0.5f);
+                  _kRenderingExtensions.to(polygon, RIGHT, 0, 0, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.setBackground(
+                      polygon, label.getProperty(LABEL_PARENT_BACKGROUND));
+                  _kRenderingExtensions.setForeground(
+                      polygon, label.getProperty(LABEL_PARENT_BACKGROUND));
+                  container.getChildren().add(polygon);
+
+                  KSpline kSpline = _kRenderingFactory.createKSpline();
+                  _kRenderingExtensions.from(kSpline, LEFT, (-0.66f), 0, BOTTOM, (-0.5f), 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 1, 0, BOTTOM, (-0.5f), 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.1f, BOTTOM, 8, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.2f, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.3f, BOTTOM, (-8), 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.4f, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.45f, BOTTOM, 4f, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.5f, BOTTOM, 8, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.55f, BOTTOM, 4f, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.6f, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.65f, BOTTOM, (-4), 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.7f, BOTTOM, (-8), 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.8f, BOTTOM, (-4), 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.9f, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, (-1), 1, BOTTOM, (-0.5f), 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0.66f, 1, BOTTOM, (-0.5f), 0.5f);
+                  container.getChildren().add(kSpline);
+                  return padding;
                 }
-            });
-            _onEdgePysicalLabelConfigurator = configurator;
-        }
-        label.setProperty(LABEL_PARENT_BACKGROUND, parentBackgroundColor);
-        _onEdgePysicalLabelConfigurator.applyTo(label);
+              });
+      _onEdgePysicalLabelConfigurator = configurator;
     }
+    label.setProperty(LABEL_PARENT_BACKGROUND, parentBackgroundColor);
+    _onEdgePysicalLabelConfigurator.applyTo(label);
+  }
 
-    public KRendering addFixedTailArrowDecorator(KPolyline pl) {
-        KRendering head = _kPolylineExtensions.addTailArrowDecorator(pl);
-        KDecoratorPlacementData placement = _kRenderingFactory.createKDecoratorPlacementData();
-        placement.setRotateWithLine(true);
-        placement.setRelative(0f);
-        placement.setAbsolute(2f);
-        placement.setWidth(8);
-        placement.setHeight(6);
-        placement.setXOffset(-3f);
-        placement.setYOffset(-4f);
-        head.setPlacementData(placement);
-        return head;
-    }
-    
-    public void addArrayDecorator(KEdge edge, Integer size) {
-        final KRendering line = _kRenderingExtensions.getKRendering(edge);
-        if (line instanceof KPolyline) {
-            KDecoratorPlacementData placement = _kRenderingFactory.createKDecoratorPlacementData();
-            placement.setRotateWithLine(true);
-            placement.setRelative(0f);
-            placement.setAbsolute(6f);
-            
-            KPolyline slash = _kContainerRenderingExtensions.addChild(
-                    (KContainerRendering) line, 
-                    _kRenderingFactory.createKPolyline());
-            slash.getPoints().add(
-            _kRenderingExtensions.createKPosition(
-                _kRenderingExtensions.RIGHT, 0, 0, 
-                _kRenderingExtensions.TOP, 0, 0)
-            );
-            slash.getPoints().add(
-            _kRenderingExtensions.createKPosition(
-                _kRenderingExtensions.LEFT, 0, 0, 
-                _kRenderingExtensions.BOTTOM, 0, 0)
-            );
-            KDecoratorPlacementData slashPlacement = EcoreUtil.copy(placement);
-            slashPlacement.setWidth(5);
-            slashPlacement.setHeight(10);
-            slashPlacement.setYOffset(-5f);
-            slash.setPlacementData(slashPlacement);
-            
-            if (size != null) {
-                KText num = _kContainerRenderingExtensions.addChild(
-                    (KContainerRendering) line, 
-                    _kRenderingFactory.createKText()
-                );
-                num.setText(size.toString());
-                _kRenderingExtensions.setFontSize(num, 5);
-                noSelectionStyle(num);
-                KDecoratorPlacementData numPlacement = EcoreUtil.copy(placement);
-                numPlacement.setXOffset(2f);
-                num.setPlacementData(numPlacement);
-            }
-        }
+  public KRendering addFixedTailArrowDecorator(KPolyline pl) {
+    KRendering head = _kPolylineExtensions.addTailArrowDecorator(pl);
+    KDecoratorPlacementData placement = _kRenderingFactory.createKDecoratorPlacementData();
+    placement.setRotateWithLine(true);
+    placement.setRelative(0f);
+    placement.setAbsolute(2f);
+    placement.setWidth(8);
+    placement.setHeight(6);
+    placement.setXOffset(-3f);
+    placement.setYOffset(-4f);
+    head.setPlacementData(placement);
+    return head;
+  }
+
+  public void addArrayDecorator(KEdge edge, Integer size) {
+    final KRendering line = _kRenderingExtensions.getKRendering(edge);
+    if (line instanceof KPolyline) {
+      KDecoratorPlacementData placement = _kRenderingFactory.createKDecoratorPlacementData();
+      placement.setRotateWithLine(true);
+      placement.setRelative(0f);
+      placement.setAbsolute(6f);
+
+      KPolyline slash =
+          _kContainerRenderingExtensions.addChild(
+              (KContainerRendering) line, _kRenderingFactory.createKPolyline());
+      slash
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  _kRenderingExtensions.RIGHT, 0, 0, _kRenderingExtensions.TOP, 0, 0));
+      slash
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  _kRenderingExtensions.LEFT, 0, 0, _kRenderingExtensions.BOTTOM, 0, 0));
+      KDecoratorPlacementData slashPlacement = EcoreUtil.copy(placement);
+      slashPlacement.setWidth(5);
+      slashPlacement.setHeight(10);
+      slashPlacement.setYOffset(-5f);
+      slash.setPlacementData(slashPlacement);
+
+      if (size != null) {
+        KText num =
+            _kContainerRenderingExtensions.addChild(
+                (KContainerRendering) line, _kRenderingFactory.createKText());
+        num.setText(size.toString());
+        _kRenderingExtensions.setFontSize(num, 5);
+        noSelectionStyle(num);
+        KDecoratorPlacementData numPlacement = EcoreUtil.copy(placement);
+        numPlacement.setXOffset(2f);
+        num.setPlacementData(numPlacement);
+      }
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/styles/ReactorFigureComponents.java b/org.lflang/src/org/lflang/diagram/synthesis/styles/ReactorFigureComponents.java
index a7ca735f29..aab539926b 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/styles/ReactorFigureComponents.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/styles/ReactorFigureComponents.java
@@ -1,26 +1,24 @@
 /**
  * Copyright (c) 2020, Kiel University.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * <p>Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * <p>1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * <p>2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials provided with
+ * the distribution.
+ *
+ * <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package org.lflang.diagram.synthesis.styles;
 
@@ -31,81 +29,77 @@
 import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
 
 public class ReactorFigureComponents {
-    private final KContainerRendering outer;
+  private final KContainerRendering outer;
 
-    private final KContainerRendering reactor;
+  private final KContainerRendering reactor;
 
-    private final List<KRendering> figures;
+  private final List<KRendering> figures;
 
-    public ReactorFigureComponents(KContainerRendering outer, 
-                                   KContainerRendering reactor,
-                                   List<KRendering> figures) {
-        super();
-        this.outer = outer;
-        this.reactor = reactor;
-        this.figures = figures;
-    }
+  public ReactorFigureComponents(
+      KContainerRendering outer, KContainerRendering reactor, List<KRendering> figures) {
+    super();
+    this.outer = outer;
+    this.reactor = reactor;
+    this.figures = figures;
+  }
 
-    @Override
-    @Pure
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((this.outer== null) ? 0 : this.outer.hashCode());
-        result = prime * result + ((this.reactor== null) ? 0 : this.reactor.hashCode());
-        return prime * result + ((this.figures== null) ? 0 : this.figures.hashCode());
-    }
+  @Override
+  @Pure
+  public int hashCode() {
+    final int prime = 31;
+    int result = 1;
+    result = prime * result + ((this.outer == null) ? 0 : this.outer.hashCode());
+    result = prime * result + ((this.reactor == null) ? 0 : this.reactor.hashCode());
+    return prime * result + ((this.figures == null) ? 0 : this.figures.hashCode());
+  }
 
-    @Override
-    @Pure
-    public boolean equals(final Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        ReactorFigureComponents other = (ReactorFigureComponents) obj;
-        if (this.outer == null && other.outer != null) {
-            return false;
-        } else if (!this.outer.equals(other.outer)) {
-            return false;
-        }
-        if (this.reactor == null && other.reactor != null) {
-            return false;
-        } else if (!this.reactor.equals(other.reactor)) {
-            return false;
-        }
-        if (this.figures == null && other.figures != null) {
-            return false;
-        } else if (!this.figures.equals(other.figures)) {
-            return false;
-        }
-        return true;
+  @Override
+  @Pure
+  public boolean equals(final Object obj) {
+    if (this == obj) return true;
+    if (obj == null) return false;
+    if (getClass() != obj.getClass()) return false;
+    ReactorFigureComponents other = (ReactorFigureComponents) obj;
+    if (this.outer == null && other.outer != null) {
+      return false;
+    } else if (!this.outer.equals(other.outer)) {
+      return false;
     }
-
-    @Override
-    @Pure
-    public String toString() {
-        ToStringBuilder b = new ToStringBuilder(this);
-        b.add("outer", this.outer);
-        b.add("reactor", this.reactor);
-        b.add("figures", this.figures);
-        return b.toString();
+    if (this.reactor == null && other.reactor != null) {
+      return false;
+    } else if (!this.reactor.equals(other.reactor)) {
+      return false;
     }
-
-    @Pure
-    public KContainerRendering getOuter() {
-        return this.outer;
+    if (this.figures == null && other.figures != null) {
+      return false;
+    } else if (!this.figures.equals(other.figures)) {
+      return false;
     }
+    return true;
+  }
 
-    @Pure
-    public KContainerRendering getReactor() {
-        return this.reactor;
-    }
+  @Override
+  @Pure
+  public String toString() {
+    ToStringBuilder b = new ToStringBuilder(this);
+    b.add("outer", this.outer);
+    b.add("reactor", this.reactor);
+    b.add("figures", this.figures);
+    return b.toString();
+  }
 
-    @Pure
-    public List<KRendering> getFigures() {
-        return this.figures;
-    }
+  @Pure
+  public KContainerRendering getOuter() {
+    return this.outer;
+  }
+
+  @Pure
+  public KContainerRendering getReactor() {
+    return this.reactor;
+  }
+
+  @Pure
+  public List<KRendering> getFigures() {
+    return this.figures;
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/util/CycleVisualization.java b/org.lflang/src/org/lflang/diagram/synthesis/util/CycleVisualization.java
index 0fc52b0665..4fb313fe4b 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/util/CycleVisualization.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/util/CycleVisualization.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.util;
 
 import com.google.common.collect.HashMultimap;
@@ -43,115 +43,114 @@
 
 /**
  * Dependency cycle detection for Lingua Franca diagrams.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 @ViewSynthesisShared
 public class CycleVisualization extends AbstractSynthesisExtensions {
-    
-    // Properties for marking diagram elements
-    public static final Property<Boolean> DEPENDENCY_CYCLE = new Property<>("org.lflang.diagram.synthesis.dependency.cycle", false);
 
-    @Inject @Extension private UtilityExtensions _utilityExtensions;
-    
-    /**
-     * Performs cycle detection based on the diagram's graph structure and applies given highlighting to the included elements
-     */
-    public boolean detectAndHighlightCycles(ReactorInstance rootReactorInstance, 
-            Map<ReactorInstance, KNode> allReactorNodes, 
-            Consumer<KGraphElement> highlighter) {
-        
-        if (rootReactorInstance.hasCycles() && highlighter != null) {
-            // Highlight cycles
-            // A cycle consists of reactions and ports.
-            HashMultimap<ReactorInstance, NamedInstance<?>> cycleElementsByReactor = HashMultimap.create();
-            Set<NamedInstance<?>> cycles = rootReactorInstance.getCycles();
-            for (NamedInstance<?> element : cycles) {
-                // First find the involved reactor instances
-                if (element instanceof ReactorInstance) {
-                    cycleElementsByReactor.put((ReactorInstance) element, element);
-                } else {
-                    cycleElementsByReactor.put(element.getParent(), element);
-                }
-            }
-                
-            for (ReactorInstance reactor  : cycleElementsByReactor.keySet()) {
-                KNode node = allReactorNodes.get(reactor);
-                if (node != null) {
-                    node.setProperty(DEPENDENCY_CYCLE, true);
-                    highlighter.accept(node);
+  // Properties for marking diagram elements
+  public static final Property<Boolean> DEPENDENCY_CYCLE =
+      new Property<>("org.lflang.diagram.synthesis.dependency.cycle", false);
+
+  @Inject @Extension private UtilityExtensions _utilityExtensions;
 
-                    Set<NamedInstance<?>> reactorContentInCycle = cycleElementsByReactor.get(reactor);
-                    
-                    // Reactor edges
-                    for (KEdge edge : node.getOutgoingEdges()) {
-                        if (connectsCycleElements(edge, cycles)) {
-                            edge.setProperty(DEPENDENCY_CYCLE, true);
-                            highlighter.accept(edge);
-                        }
-                    }
+  /**
+   * Performs cycle detection based on the diagram's graph structure and applies given highlighting
+   * to the included elements
+   */
+  public boolean detectAndHighlightCycles(
+      ReactorInstance rootReactorInstance,
+      Map<ReactorInstance, KNode> allReactorNodes,
+      Consumer<KGraphElement> highlighter) {
 
-                    // Reactor ports
-                    for (KPort port : node.getPorts()) {
-                        if (reactorContentInCycle.contains(NamedInstanceUtil.getLinkedInstance(port))) {
-                            port.setProperty(DEPENDENCY_CYCLE, true);
-                            highlighter.accept(port);
-                        }
-                    }
+    if (rootReactorInstance.hasCycles() && highlighter != null) {
+      // Highlight cycles
+      // A cycle consists of reactions and ports.
+      HashMultimap<ReactorInstance, NamedInstance<?>> cycleElementsByReactor =
+          HashMultimap.create();
+      Set<NamedInstance<?>> cycles = rootReactorInstance.getCycles();
+      for (NamedInstance<?> element : cycles) {
+        // First find the involved reactor instances
+        if (element instanceof ReactorInstance) {
+          cycleElementsByReactor.put((ReactorInstance) element, element);
+        } else {
+          cycleElementsByReactor.put(element.getParent(), element);
+        }
+      }
 
-                    // Child Nodes
-                    for (KNode childNode : node.getChildren()) {
-                        if (reactorContentInCycle.contains(NamedInstanceUtil.getLinkedInstance(childNode)) && 
-                                !_utilityExtensions.sourceIsReactor(childNode)) {
-                            childNode.setProperty(DEPENDENCY_CYCLE, true);
-                            highlighter.accept(childNode);
+      for (ReactorInstance reactor : cycleElementsByReactor.keySet()) {
+        KNode node = allReactorNodes.get(reactor);
+        if (node != null) {
+          node.setProperty(DEPENDENCY_CYCLE, true);
+          highlighter.accept(node);
+
+          Set<NamedInstance<?>> reactorContentInCycle = cycleElementsByReactor.get(reactor);
+
+          // Reactor edges
+          for (KEdge edge : node.getOutgoingEdges()) {
+            if (connectsCycleElements(edge, cycles)) {
+              edge.setProperty(DEPENDENCY_CYCLE, true);
+              highlighter.accept(edge);
+            }
+          }
 
-                            for (KEdge edge : childNode.getOutgoingEdges()) {
-                                if (connectsCycleElements(edge, cycles)) {
-                                    edge.setProperty(DEPENDENCY_CYCLE, true);
-                                    highlighter.accept(edge);
-                                }
-                            }
-                        }
-                    }
+          // Reactor ports
+          for (KPort port : node.getPorts()) {
+            if (reactorContentInCycle.contains(NamedInstanceUtil.getLinkedInstance(port))) {
+              port.setProperty(DEPENDENCY_CYCLE, true);
+              highlighter.accept(port);
+            }
+          }
+
+          // Child Nodes
+          for (KNode childNode : node.getChildren()) {
+            if (reactorContentInCycle.contains(NamedInstanceUtil.getLinkedInstance(childNode))
+                && !_utilityExtensions.sourceIsReactor(childNode)) {
+              childNode.setProperty(DEPENDENCY_CYCLE, true);
+              highlighter.accept(childNode);
+
+              for (KEdge edge : childNode.getOutgoingEdges()) {
+                if (connectsCycleElements(edge, cycles)) {
+                  edge.setProperty(DEPENDENCY_CYCLE, true);
+                  highlighter.accept(edge);
                 }
+              }
             }
-            return true;
-         }
-         return false;
-    }
-    
-    /**
-     * Checks whether an edge connects two elements that are part of the cycle.
-     * Assumes that the source node is always part of the cycle!
-     */
-    private boolean connectsCycleElements(KEdge edge, Set<NamedInstance<?>> cycle) {
-        return (
-                // if source is not a reactor, there is nothing to check
-                !_utilityExtensions.sourceIsReactor(edge.getSource())
-                ||
-                // otherwise, the source port must be on the cycle
-                cycle.contains(NamedInstanceUtil.getLinkedInstance(edge.getSourcePort()))
-            ) && (
-                // leads to reactor port in cycle
-                _utilityExtensions.sourceIsReactor(edge.getTarget()) 
-                && 
-                cycle.contains(NamedInstanceUtil.getLinkedInstance(edge.getTargetPort()))
-                ||
-                // leads to reaction in cycle
-                !_utilityExtensions.sourceIsReactor(edge.getTarget()) 
-                && 
-                cycle.contains(NamedInstanceUtil.getLinkedInstance(edge.getTarget()))
-            ) && (
-                // Special case only for connections
-                !(_utilityExtensions.sourceElement(edge) instanceof Connection)
-                || (
-                    // If the edge represents a connections between two ports in the cycle (checked before),
-                    // then it is only included in the actual cycle, if it is neither delayed nor physical.
-                    ((Connection) _utilityExtensions.sourceElement(edge)).getDelay() == null
-                    &&
-                    !((Connection) _utilityExtensions.sourceElement(edge)).isPhysical()
-                )
-            );
+          }
+        }
+      }
+      return true;
     }
+    return false;
+  }
+
+  /**
+   * Checks whether an edge connects two elements that are part of the cycle. Assumes that the
+   * source node is always part of the cycle!
+   */
+  private boolean connectsCycleElements(KEdge edge, Set<NamedInstance<?>> cycle) {
+    return (
+        // if source is not a reactor, there is nothing to check
+        !_utilityExtensions.sourceIsReactor(edge.getSource())
+            ||
+            // otherwise, the source port must be on the cycle
+            cycle.contains(NamedInstanceUtil.getLinkedInstance(edge.getSourcePort())))
+        && (
+        // leads to reactor port in cycle
+        _utilityExtensions.sourceIsReactor(edge.getTarget())
+                && cycle.contains(NamedInstanceUtil.getLinkedInstance(edge.getTargetPort()))
+            ||
+            // leads to reaction in cycle
+            !_utilityExtensions.sourceIsReactor(edge.getTarget())
+                && cycle.contains(NamedInstanceUtil.getLinkedInstance(edge.getTarget())))
+        && (
+        // Special case only for connections
+        !(_utilityExtensions.sourceElement(edge) instanceof Connection)
+            || (
+            // If the edge represents a connections between two ports in the cycle (checked before),
+            // then it is only included in the actual cycle, if it is neither delayed nor physical.
+            ((Connection) _utilityExtensions.sourceElement(edge)).getDelay() == null
+                && !((Connection) _utilityExtensions.sourceElement(edge)).isPhysical()));
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/util/InterfaceDependenciesVisualization.java b/org.lflang/src/org/lflang/diagram/synthesis/util/InterfaceDependenciesVisualization.java
index 41635fb7c7..e3de923847 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/util/InterfaceDependenciesVisualization.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/util/InterfaceDependenciesVisualization.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.util;
 
 import com.google.common.collect.ImmutableList;
@@ -64,143 +64,177 @@
 
 /**
  * Utility class to handle dependency edges for collapsed reactors in Lingua Franca diagrams.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 @ViewSynthesisShared
 public class InterfaceDependenciesVisualization extends AbstractSynthesisExtensions {
-    
-    // Related synthesis option
-    public static final SynthesisOption SHOW_INTERFACE_DEPENDENCIES = SynthesisOption.createCheckOption("Port Dependencies in Collapsed Reactors", false).setCategory(LinguaFrancaSynthesis.APPEARANCE);
-    
-    // Properties for marking diagram elements
-    public static final Property<Boolean> INTERFACE_DEPENDENCY = new Property<>("org.lflang.linguafranca.diagram.synthesis.dependency.interface", false);
-  
-    @Inject @Extension private KEdgeExtensions _kEdgeExtensions;
-    @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
-    @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
-    @Inject @Extension private LinguaFrancaStyleExtensions _linguaFrancaStyleExtensions;
-    @Inject @Extension private UtilityExtensions _utilityExtensions;
-    
-    /**
-     * Updates the visibility of interface dependencies edges based on the expansion state.
-     */
-    public static void updateInterfaceDependencyVisibility(KNode node, boolean expanded) {
-        Iterable<KEdge> edges = IterableExtensions.filter(node.getOutgoingEdges(),  it -> {
-            return it.getProperty(INTERFACE_DEPENDENCY);
-        });
-        
-        Iterable<Iterable<KRendering>> renders = IterableExtensions.map(edges, (KEdge it) -> {
-            return Iterables.<KRendering>filter(it.getData(), KRendering.class);
-        });
-        
-        Iterables.concat(renders).forEach(
+
+  // Related synthesis option
+  public static final SynthesisOption SHOW_INTERFACE_DEPENDENCIES =
+      SynthesisOption.createCheckOption("Port Dependencies in Collapsed Reactors", false)
+          .setCategory(LinguaFrancaSynthesis.APPEARANCE);
+
+  // Properties for marking diagram elements
+  public static final Property<Boolean> INTERFACE_DEPENDENCY =
+      new Property<>("org.lflang.linguafranca.diagram.synthesis.dependency.interface", false);
+
+  @Inject @Extension private KEdgeExtensions _kEdgeExtensions;
+  @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
+  @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
+  @Inject @Extension private LinguaFrancaStyleExtensions _linguaFrancaStyleExtensions;
+  @Inject @Extension private UtilityExtensions _utilityExtensions;
+
+  /** Updates the visibility of interface dependencies edges based on the expansion state. */
+  public static void updateInterfaceDependencyVisibility(KNode node, boolean expanded) {
+    Iterable<KEdge> edges =
+        IterableExtensions.filter(
+            node.getOutgoingEdges(),
             it -> {
-                KInvisibility inv = IterableExtensions.last(Iterables.filter(it.getStyles(), KInvisibility.class));
-                if (inv == null) {
-                    inv = KRenderingFactory.eINSTANCE.createKInvisibility();
-                    it.getStyles().add(inv);
-                }
-                inv.setInvisible(expanded);
-            }
-        );
-    }
+              return it.getProperty(INTERFACE_DEPENDENCY);
+            });
+
+    Iterable<Iterable<KRendering>> renders =
+        IterableExtensions.map(
+            edges,
+            (KEdge it) -> {
+              return Iterables.<KRendering>filter(it.getData(), KRendering.class);
+            });
+
+    Iterables.concat(renders)
+        .forEach(
+            it -> {
+              KInvisibility inv =
+                  IterableExtensions.last(Iterables.filter(it.getStyles(), KInvisibility.class));
+              if (inv == null) {
+                inv = KRenderingFactory.eINSTANCE.createKInvisibility();
+                it.getStyles().add(inv);
+              }
+              inv.setInvisible(expanded);
+            });
+  }
+
+  /**
+   * Adds interface dependencies to the node if this option is active. Visibility will be adjusted
+   * based on expansion state.
+   */
+  public Spacing addInterfaceDependencies(KNode node, boolean expanded) {
+    Spacing marginInit = null;
+    if (getBooleanValue(SHOW_INTERFACE_DEPENDENCIES)) {
+      List<Pair<KPort, KPort>> deps = getPortDependencies(node);
+      if (!deps.isEmpty()) {
+        for (Pair<KPort, KPort> pair : deps) {
+          createDependencyEdge(pair, expanded);
+        }
 
-    /**
-     * Adds interface dependencies to the node if this option is active.
-     * Visibility will be adjusted based on expansion state.
-     */
-    public Spacing addInterfaceDependencies(KNode node, boolean expanded) {
-        Spacing marginInit = null;
-        if (getBooleanValue(SHOW_INTERFACE_DEPENDENCIES)) {
-            List<Pair<KPort, KPort>> deps = getPortDependencies(node);
-            if (!deps.isEmpty()) {
-                for (Pair<KPort, KPort> pair : deps) {
-                    createDependencyEdge(pair, expanded);
-                }
-                
-                // Fix content (label) of collapsed rendering
-                KContainerRendering contentContainer = IterableExtensions.findFirst(
-                        Iterables.filter(node.getData(), KContainerRendering.class), 
-                        it -> { return it.getProperty(KlighdProperties.COLLAPSED_RENDERING); }
-                );
-                if (contentContainer != null) {
-                    if (!contentContainer.getProperty(LinguaFrancaShapeExtensions.REACTOR_CONTENT_CONTAINER)) {
-                        contentContainer = IteratorExtensions.findFirst(
-                            Iterators.filter(contentContainer.eAllContents(), KContainerRendering.class), 
-                            it -> { return it.getProperty(LinguaFrancaShapeExtensions.REACTOR_CONTENT_CONTAINER); }
-                        );
-                    }
-                    if (contentContainer != null) {
-                        List<KRendering> content = ImmutableList.copyOf(contentContainer.getChildren());
-                        // Put into two new containers such that they are not centered/maximized
-                        KRectangle firstContainer = _kContainerRenderingExtensions.addRectangle(contentContainer);
-                        _kRenderingExtensions.setInvisible(firstContainer, true);
-                        
-                        KRectangle secondContainer = _kContainerRenderingExtensions.addRectangle(firstContainer);
-                        _kRenderingExtensions.setInvisible(secondContainer, true);
-                        _kContainerRenderingExtensions.setGridPlacement(secondContainer, 1);
-                        Iterables.addAll(secondContainer.getChildren(), content);
-                        _kRenderingExtensions.setPointPlacementData(secondContainer, 
-                                _kRenderingExtensions.LEFT, 0, 0.5f, 
-                                _kRenderingExtensions.TOP, 0, 0, 
-                                _kRenderingExtensions.H_CENTRAL, _kRenderingExtensions.V_TOP, 0, 
-                                0, 0, 0);
-                      
-                        
-                        // Adjust ports separate dependency edges from label/content
-                        if (content.size() > 0) {
-                            marginInit = _utilityExtensions.getPortMarginsInitIfAbsent(node).add(
-                                new ElkMargin((content.size() * 20) - 8, 0, 0, 0)
-                            );
-                        }
-                    }
-                }
+        // Fix content (label) of collapsed rendering
+        KContainerRendering contentContainer =
+            IterableExtensions.findFirst(
+                Iterables.filter(node.getData(), KContainerRendering.class),
+                it -> {
+                  return it.getProperty(KlighdProperties.COLLAPSED_RENDERING);
+                });
+        if (contentContainer != null) {
+          if (!contentContainer.getProperty(
+              LinguaFrancaShapeExtensions.REACTOR_CONTENT_CONTAINER)) {
+            contentContainer =
+                IteratorExtensions.findFirst(
+                    Iterators.filter(contentContainer.eAllContents(), KContainerRendering.class),
+                    it -> {
+                      return it.getProperty(LinguaFrancaShapeExtensions.REACTOR_CONTENT_CONTAINER);
+                    });
+          }
+          if (contentContainer != null) {
+            List<KRendering> content = ImmutableList.copyOf(contentContainer.getChildren());
+            // Put into two new containers such that they are not centered/maximized
+            KRectangle firstContainer =
+                _kContainerRenderingExtensions.addRectangle(contentContainer);
+            _kRenderingExtensions.setInvisible(firstContainer, true);
+
+            KRectangle secondContainer =
+                _kContainerRenderingExtensions.addRectangle(firstContainer);
+            _kRenderingExtensions.setInvisible(secondContainer, true);
+            _kContainerRenderingExtensions.setGridPlacement(secondContainer, 1);
+            Iterables.addAll(secondContainer.getChildren(), content);
+            _kRenderingExtensions.setPointPlacementData(
+                secondContainer,
+                _kRenderingExtensions.LEFT,
+                0,
+                0.5f,
+                _kRenderingExtensions.TOP,
+                0,
+                0,
+                _kRenderingExtensions.H_CENTRAL,
+                _kRenderingExtensions.V_TOP,
+                0,
+                0,
+                0,
+                0);
+
+            // Adjust ports separate dependency edges from label/content
+            if (content.size() > 0) {
+              marginInit =
+                  _utilityExtensions
+                      .getPortMarginsInitIfAbsent(node)
+                      .add(new ElkMargin((content.size() * 20) - 8, 0, 0, 0));
             }
+          }
         }
-        return marginInit;
-    }
-    
-    /**
-     * Find dependencies between ports.
-     */
-    private List<Pair<KPort, KPort>> getPortDependencies(KNode node) {
-        Set<KPort> inputPorts = IterableExtensions.toSet(IterableExtensions.filter(
-                node.getPorts(), 
-                it -> { return it.getProperty(LinguaFrancaSynthesis.REACTOR_INPUT); })
-        );
-        Set<KPort> outputPorts = IterableExtensions.toSet(IterableExtensions.filter(
-                node.getPorts(), 
-                it -> { return it.getProperty(LinguaFrancaSynthesis.REACTOR_OUTPUT); })
-        );
-        
-        // FIXME Replace with real logic
-        Random rand = new Random();
-        return IterableExtensions.toList(
-                IterableExtensions.map(IterableExtensions.filter(
-                        Sets.cartesianProduct(inputPorts, outputPorts), 
-                        it -> { return rand.nextBoolean(); }), 
-                it -> { return new Pair<KPort, KPort>(it.get(0), it.get(1)); }));
-    }
-    
-    /**
-     * Create an edges for interface dependencies and adjust visibility based on the expansion state of the node.
-     */
-    private KEdge createDependencyEdge(final Pair<KPort, KPort> connection, final boolean expanded) {
-        KEdge depEdge = _kEdgeExtensions.createEdge();
-        depEdge.setSource(connection.getKey().getNode());
-        depEdge.setSourcePort(connection.getKey());
-        depEdge.setTarget(connection.getValue().getNode());
-        depEdge.setTargetPort(connection.getValue());
-        depEdge.setProperty(InterfaceDependenciesVisualization.INTERFACE_DEPENDENCY, true);
-        depEdge.setProperty(CoreOptions.NO_LAYOUT, true);  // no routing!
-        DiagramSyntheses.suppressSelectability(depEdge);
-        
-        KPolyline polyline = _kEdgeExtensions.addPolyline(depEdge);
-        _kRenderingExtensions.setLineStyle(polyline, LineStyle.DOT);
-        _linguaFrancaStyleExtensions.noSelectionStyle(polyline);
-        _kRenderingExtensions.setInvisible(polyline, expanded); // make sure there is a style to toggle!
-        
-        return depEdge;
+      }
     }
+    return marginInit;
+  }
+
+  /** Find dependencies between ports. */
+  private List<Pair<KPort, KPort>> getPortDependencies(KNode node) {
+    Set<KPort> inputPorts =
+        IterableExtensions.toSet(
+            IterableExtensions.filter(
+                node.getPorts(),
+                it -> {
+                  return it.getProperty(LinguaFrancaSynthesis.REACTOR_INPUT);
+                }));
+    Set<KPort> outputPorts =
+        IterableExtensions.toSet(
+            IterableExtensions.filter(
+                node.getPorts(),
+                it -> {
+                  return it.getProperty(LinguaFrancaSynthesis.REACTOR_OUTPUT);
+                }));
+
+    // FIXME Replace with real logic
+    Random rand = new Random();
+    return IterableExtensions.toList(
+        IterableExtensions.map(
+            IterableExtensions.filter(
+                Sets.cartesianProduct(inputPorts, outputPorts),
+                it -> {
+                  return rand.nextBoolean();
+                }),
+            it -> {
+              return new Pair<KPort, KPort>(it.get(0), it.get(1));
+            }));
+  }
+
+  /**
+   * Create an edges for interface dependencies and adjust visibility based on the expansion state
+   * of the node.
+   */
+  private KEdge createDependencyEdge(final Pair<KPort, KPort> connection, final boolean expanded) {
+    KEdge depEdge = _kEdgeExtensions.createEdge();
+    depEdge.setSource(connection.getKey().getNode());
+    depEdge.setSourcePort(connection.getKey());
+    depEdge.setTarget(connection.getValue().getNode());
+    depEdge.setTargetPort(connection.getValue());
+    depEdge.setProperty(InterfaceDependenciesVisualization.INTERFACE_DEPENDENCY, true);
+    depEdge.setProperty(CoreOptions.NO_LAYOUT, true); // no routing!
+    DiagramSyntheses.suppressSelectability(depEdge);
+
+    KPolyline polyline = _kEdgeExtensions.addPolyline(depEdge);
+    _kRenderingExtensions.setLineStyle(polyline, LineStyle.DOT);
+    _linguaFrancaStyleExtensions.noSelectionStyle(polyline);
+    _kRenderingExtensions.setInvisible(polyline, expanded); // make sure there is a style to toggle!
+
+    return depEdge;
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/util/LayoutPostProcessing.java b/org.lflang/src/org/lflang/diagram/synthesis/util/LayoutPostProcessing.java
index e3264c4b75..33a9b02167 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/util/LayoutPostProcessing.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/util/LayoutPostProcessing.java
@@ -1,33 +1,36 @@
 /*************
-* Copyright (c) 2022, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2022, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.util;
 
+import de.cau.cs.kieler.klighd.SynthesisOption;
+import de.cau.cs.kieler.klighd.kgraph.KNode;
+import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
+import de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
-
 import org.eclipse.elk.alg.layered.components.ComponentOrderingStrategy;
 import org.eclipse.elk.alg.layered.options.CrossingMinimizationStrategy;
 import org.eclipse.elk.alg.layered.options.CycleBreakingStrategy;
@@ -41,326 +44,392 @@
 import org.lflang.diagram.synthesis.LinguaFrancaSynthesis;
 import org.lflang.generator.TriggerInstance.BuiltinTriggerVariable;
 
-import de.cau.cs.kieler.klighd.SynthesisOption;
-import de.cau.cs.kieler.klighd.kgraph.KNode;
-import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
-import de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses;
-
 /**
  * Set layout configuration options for the Lingua Franca diagram synthesis.
- * 
+ *
  * @author Sören Domrös
  */
 @ViewSynthesisShared
 public class LayoutPostProcessing extends AbstractSynthesisExtensions {
 
-    /** Synthesis option to control the order of nodes and edges by model order. */
-    public static final String MODEL_ORDER_OPTION = "Model Order";
-    /** Uses semi-automatic layout. */
-    public static final String LEGACY = "Legacy";
-    /** Only reactions are strictly ordered by their model order. */
-    public static final String STRICT_REACTION_ONLY = "Reactions Only";
-    /** Reactions and reactor are strictly ordered by their model order. */
-    public static final String STRICT = "Reactions and Reactors";
-    /** Reactions and reactors are ordered by their model order if no additional crossing are created. */
-    public static final String TIE_BREAKER = "Optimize Crossings";
-    /**
-     * No crossing minimization is done at all. This requires that actions and timers are sorted based on their model
-     * order.
-     */
-    public static final String FULL_CONTROL = "Full Control";
-    
-    
-    public static final SynthesisOption MODEL_ORDER = 
-            SynthesisOption.createChoiceOption(
-                    MODEL_ORDER_OPTION,
-                    Arrays.asList(TIE_BREAKER, STRICT_REACTION_ONLY, STRICT, FULL_CONTROL),
-                    STRICT_REACTION_ONLY).setCategory(LinguaFrancaSynthesis.LAYOUT);
+  /** Synthesis option to control the order of nodes and edges by model order. */
+  public static final String MODEL_ORDER_OPTION = "Model Order";
+  /** Uses semi-automatic layout. */
+  public static final String LEGACY = "Legacy";
+  /** Only reactions are strictly ordered by their model order. */
+  public static final String STRICT_REACTION_ONLY = "Reactions Only";
+  /** Reactions and reactor are strictly ordered by their model order. */
+  public static final String STRICT = "Reactions and Reactors";
+  /**
+   * Reactions and reactors are ordered by their model order if no additional crossing are created.
+   */
+  public static final String TIE_BREAKER = "Optimize Crossings";
+  /**
+   * No crossing minimization is done at all. This requires that actions and timers are sorted based
+   * on their model order.
+   */
+  public static final String FULL_CONTROL = "Full Control";
 
-    /**
-     * Comparator to sort KNodes based on the textual order of their linked instances.
-     * 
-     * Startup, reset and shutdown actions are not in the model and are handled separately:
-     * Startup actions will always be first.
-     * Reset actions follow after the startup action.
-     * Shutdown is always sorted last. However, shutdown actions will not have a model order set and are, therefore,
-     * implicitly ordered by their connection.
-     */
-    public static final Comparator<KNode> TEXTUAL_ORDER = new Comparator<KNode>() {
+  public static final SynthesisOption MODEL_ORDER =
+      SynthesisOption.createChoiceOption(
+              MODEL_ORDER_OPTION,
+              Arrays.asList(TIE_BREAKER, STRICT_REACTION_ONLY, STRICT, FULL_CONTROL),
+              STRICT_REACTION_ONLY)
+          .setCategory(LinguaFrancaSynthesis.LAYOUT);
+
+  /**
+   * Comparator to sort KNodes based on the textual order of their linked instances.
+   *
+   * <p>Startup, reset and shutdown actions are not in the model and are handled separately: Startup
+   * actions will always be first. Reset actions follow after the startup action. Shutdown is always
+   * sorted last. However, shutdown actions will not have a model order set and are, therefore,
+   * implicitly ordered by their connection.
+   */
+  public static final Comparator<KNode> TEXTUAL_ORDER =
+      new Comparator<KNode>() {
 
         @Override
         public int compare(KNode node1, KNode node2) {
-            var pos1 = getTextPosition(node1);
-            var pos2 = getTextPosition(node2);
-            if (pos1 >= 0 && pos1 >= 0) {
-                return Integer.compare(pos1, pos2); // textual order
-            } else if (pos1 >= 0) {
-                return -1; // unassociated elements last
-            } else if (pos2 >= 0) {
-                return 1; // unassociated elements last
-            }
-            return Integer.compare(node1.hashCode(), node2.hashCode()); // any stable order between unassociated elements
+          var pos1 = getTextPosition(node1);
+          var pos2 = getTextPosition(node2);
+          if (pos1 >= 0 && pos1 >= 0) {
+            return Integer.compare(pos1, pos2); // textual order
+          } else if (pos1 >= 0) {
+            return -1; // unassociated elements last
+          } else if (pos2 >= 0) {
+            return 1; // unassociated elements last
+          }
+          return Integer.compare(
+              node1.hashCode(), node2.hashCode()); // any stable order between unassociated elements
         }
-        
+
         private int getTextPosition(KNode node) {
-            var instance = NamedInstanceUtil.getLinkedInstance(node);
-            if (instance != null) {
-                var definition = instance.getDefinition();
-                if (definition instanceof BuiltinTriggerVariable) {
-                    // special handling for built-in triggers
-                    switch(((BuiltinTriggerVariable)definition).type) {
-                        case STARTUP: return 0; // first
-                        case RESET: return 1; // second
-                        case SHUTDOWN: return Integer.MAX_VALUE; // last
-                    }
-                } else if (definition instanceof EObject) {
-                    var ast = NodeModelUtils.getNode((EObject) definition);
-                    if (ast != null) {
-                        return ast.getOffset();
-                    }
-                }
+          var instance = NamedInstanceUtil.getLinkedInstance(node);
+          if (instance != null) {
+            var definition = instance.getDefinition();
+            if (definition instanceof BuiltinTriggerVariable) {
+              // special handling for built-in triggers
+              switch (((BuiltinTriggerVariable) definition).type) {
+                case STARTUP:
+                  return 0; // first
+                case RESET:
+                  return 1; // second
+                case SHUTDOWN:
+                  return Integer.MAX_VALUE; // last
+              }
+            } else if (definition instanceof EObject) {
+              var ast = NodeModelUtils.getNode((EObject) definition);
+              if (ast != null) {
+                return ast.getOffset();
+              }
             }
-            return -1;
+          }
+          return -1;
         }
-    };
+      };
 
-    /**
-     * Configures layout options for main reactor.
-     * 
-     * @param node The KNode of the main reactor.
-     */
-    public void configureMainReactor(KNode node) {
-        configureReactor(node);
-    }
+  /**
+   * Configures layout options for main reactor.
+   *
+   * @param node The KNode of the main reactor.
+   */
+  public void configureMainReactor(KNode node) {
+    configureReactor(node);
+  }
 
-    /**
-     * Configures layout options for a reactor.
-     * 
-     * @param node The KNode of a reactor. 
-     */
-    public void configureReactor(KNode node) {
-        String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
-        
-        switch (modelOrderStrategy) {
-            case LEGACY:
-                // Otherwise nodes are not sorted if they are not connected
-                DiagramSyntheses.setLayoutOption(node, CoreOptions.SEPARATE_CONNECTED_COMPONENTS, false);
-                // Needed to enforce node positions.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CROSSING_MINIMIZATION_SEMI_INTERACTIVE, true);
-                // Costs a little more time but layout is quick, therefore, we can do that.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.THOROUGHNESS, 100);
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CROSSING_MINIMIZATION_GREEDY_SWITCH_TYPE, GreedySwitchType.TWO_SIDED);
-                break;
-            case STRICT_REACTION_ONLY:
-                // Only set model order for reactions.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
-                // Do tie-breaking model order cycle breaking. 
-                // Minimize number of backward edges but make decisions based on the model order if no greedy best alternative exists.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CYCLE_BREAKING_STRATEGY, CycleBreakingStrategy.GREEDY_MODEL_ORDER);
-                // Before crossing minimization sort all nodes and edges/ports but also consider the node model order.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_STRATEGY, OrderingStrategy.NODES_AND_EDGES);
-                // Separate connected components should be drawn separately.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.SEPARATE_CONNECTED_COMPONENTS, true);
-                // Component order is enforced by looking at the minimum element with respect to model order of each component.
-                // Remember that the startUp action is always the first node.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS, ComponentOrderingStrategy.FORCE_MODEL_ORDER);
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
+  /**
+   * Configures layout options for a reactor.
+   *
+   * @param node The KNode of a reactor.
+   */
+  public void configureReactor(KNode node) {
+    String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
 
-                // Node order should not change during crossing minimization.
-                // Since only reactions will have a model order set in this approach the order of reactions in their respective
-                // separate connected components always respects the model order.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CROSSING_MINIMIZATION_FORCE_NODE_MODEL_ORDER, true);
-                // Disable greedy switch since this does otherwise change the node order after crossing minimization.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CROSSING_MINIMIZATION_GREEDY_SWITCH_TYPE, GreedySwitchType.OFF);
-                break;
-            case STRICT:
-                // Do tie-breaking model order cycle breaking. 
-                // Minimize number of backward edges but make decisions based on the model order if no greedy best alternative exists.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CYCLE_BREAKING_STRATEGY, CycleBreakingStrategy.GREEDY_MODEL_ORDER);
-                // Before crossing minimization sort all nodes and edges/ports but also consider the node model order.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_STRATEGY, OrderingStrategy.NODES_AND_EDGES);
-                // Separate connected components should be drawn separately.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.SEPARATE_CONNECTED_COMPONENTS, true);
-                // Component order is enforced by looking at the minimum element with respect to model order of each component.
-                // Remember that the startUp action is always the first node.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS, ComponentOrderingStrategy.FORCE_MODEL_ORDER);
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
-                
-                // Node order should not change during crossing minimization.
-                // Since only reactions and reactors will have a model order set in this approach the order of reactions and reactors in their respective
-                // separate connected components always respects the model order.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CROSSING_MINIMIZATION_FORCE_NODE_MODEL_ORDER, true);
-                // Disable greedy switch since this does otherwise change the node order after crossing minimization.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CROSSING_MINIMIZATION_GREEDY_SWITCH_TYPE, GreedySwitchType.OFF);
-                break;
-            case TIE_BREAKER:
-                // Do tie-breaking model order cycle breaking. 
-                // Minimize number of backward edges but make decisions based on the model order if no greedy best alternative exists.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CYCLE_BREAKING_STRATEGY, CycleBreakingStrategy.GREEDY_MODEL_ORDER);
-                // Before crossing minimization sort all nodes and edges/ports but also consider the node model order.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_STRATEGY, OrderingStrategy.NODES_AND_EDGES);
-                // Separate connected components should be drawn separately.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.SEPARATE_CONNECTED_COMPONENTS, true);
-                // Component order is enforced by looking at the minimum element with respect to model order of each component.
-                // Remember that the startUp action is always the first node.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS, ComponentOrderingStrategy.FORCE_MODEL_ORDER);
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
-                // During crossing minimization 10 node order violations are regarded as important as 1 edge crossing.
-                // In reality this chooses the best node order from all tries.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_CROSSING_COUNTER_NODE_INFLUENCE, 0.1);
-                // Increase the number of tries with different starting configurations.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.THOROUGHNESS, 100);
+    switch (modelOrderStrategy) {
+      case LEGACY:
+        // Otherwise nodes are not sorted if they are not connected
+        DiagramSyntheses.setLayoutOption(node, CoreOptions.SEPARATE_CONNECTED_COMPONENTS, false);
+        // Needed to enforce node positions.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CROSSING_MINIMIZATION_SEMI_INTERACTIVE, true);
+        // Costs a little more time but layout is quick, therefore, we can do that.
+        DiagramSyntheses.setLayoutOption(node, LayeredOptions.THOROUGHNESS, 100);
+        DiagramSyntheses.setLayoutOption(
+            node,
+            LayeredOptions.CROSSING_MINIMIZATION_GREEDY_SWITCH_TYPE,
+            GreedySwitchType.TWO_SIDED);
+        break;
+      case STRICT_REACTION_ONLY:
+        // Only set model order for reactions.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
+        // Do tie-breaking model order cycle breaking.
+        // Minimize number of backward edges but make decisions based on the model order if no
+        // greedy best alternative exists.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CYCLE_BREAKING_STRATEGY, CycleBreakingStrategy.GREEDY_MODEL_ORDER);
+        // Before crossing minimization sort all nodes and edges/ports but also consider the node
+        // model order.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_STRATEGY, OrderingStrategy.NODES_AND_EDGES);
+        // Separate connected components should be drawn separately.
+        DiagramSyntheses.setLayoutOption(node, LayeredOptions.SEPARATE_CONNECTED_COMPONENTS, true);
+        // Component order is enforced by looking at the minimum element with respect to model order
+        // of each component.
+        // Remember that the startUp action is always the first node.
+        DiagramSyntheses.setLayoutOption(
+            node,
+            LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS,
+            ComponentOrderingStrategy.FORCE_MODEL_ORDER);
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
 
-                break;
-            case FULL_CONTROL:
-                // Do strict model order cycle breaking. This may introduce unnecessary backward edges.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CYCLE_BREAKING_STRATEGY, CycleBreakingStrategy.MODEL_ORDER);
-                // Before crossing minimization sort all nodes and edges/ports but also consider the node model order.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_STRATEGY, OrderingStrategy.NODES_AND_EDGES);
-                // Separate connected components should be drawn separately.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.SEPARATE_CONNECTED_COMPONENTS, true);
-                // Component order is enforced by looking at the minimum element with respect to model order of each component.
-                // Remember that the startUp action is always the first node.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS, ComponentOrderingStrategy.FORCE_MODEL_ORDER);
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
-                // Disable all kinds of crossing minimization entirely. Just take what is in the model and just do it.
-                // This requires that the list of nodes is not ordered by type, e.g. first all reactions, then all reactors, then all actions, ...
-                // but by their model order. In other approaches ordering actions between the reactions has no effect.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CROSSING_MINIMIZATION_STRATEGY, CrossingMinimizationStrategy.NONE);
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CROSSING_MINIMIZATION_GREEDY_SWITCH_TYPE, GreedySwitchType.OFF);  
-                
-                break;
-            default:
-                // Do nothing.
-        }
-    }
+        // Node order should not change during crossing minimization.
+        // Since only reactions will have a model order set in this approach the order of reactions
+        // in their respective
+        // separate connected components always respects the model order.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CROSSING_MINIMIZATION_FORCE_NODE_MODEL_ORDER, true);
+        // Disable greedy switch since this does otherwise change the node order after crossing
+        // minimization.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CROSSING_MINIMIZATION_GREEDY_SWITCH_TYPE, GreedySwitchType.OFF);
+        break;
+      case STRICT:
+        // Do tie-breaking model order cycle breaking.
+        // Minimize number of backward edges but make decisions based on the model order if no
+        // greedy best alternative exists.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CYCLE_BREAKING_STRATEGY, CycleBreakingStrategy.GREEDY_MODEL_ORDER);
+        // Before crossing minimization sort all nodes and edges/ports but also consider the node
+        // model order.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_STRATEGY, OrderingStrategy.NODES_AND_EDGES);
+        // Separate connected components should be drawn separately.
+        DiagramSyntheses.setLayoutOption(node, LayeredOptions.SEPARATE_CONNECTED_COMPONENTS, true);
+        // Component order is enforced by looking at the minimum element with respect to model order
+        // of each component.
+        // Remember that the startUp action is always the first node.
+        DiagramSyntheses.setLayoutOption(
+            node,
+            LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS,
+            ComponentOrderingStrategy.FORCE_MODEL_ORDER);
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
 
-    /**
-     * Configures layout options for an action.
-     * 
-     * @param node The KNode of an action.
-     */
-    public void configureAction(KNode node) {
-        String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
-        
-        switch (modelOrderStrategy) {
-            case STRICT_REACTION_ONLY:
-            case STRICT:
-            case TIE_BREAKER:
-                // Actions have no model order since their ordering in the model cannot be compared to the order of
-                // for example reactions since they are generally defined below in inputs/outputs and above the reactions.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
-                break;
-            case FULL_CONTROL:
-                // Give actions a model order since they should be controllable too.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, false);
-                break;
-            default:
-                // Do nothing.
-        }
-    }
+        // Node order should not change during crossing minimization.
+        // Since only reactions and reactors will have a model order set in this approach the order
+        // of reactions and reactors in their respective
+        // separate connected components always respects the model order.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CROSSING_MINIMIZATION_FORCE_NODE_MODEL_ORDER, true);
+        // Disable greedy switch since this does otherwise change the node order after crossing
+        // minimization.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CROSSING_MINIMIZATION_GREEDY_SWITCH_TYPE, GreedySwitchType.OFF);
+        break;
+      case TIE_BREAKER:
+        // Do tie-breaking model order cycle breaking.
+        // Minimize number of backward edges but make decisions based on the model order if no
+        // greedy best alternative exists.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CYCLE_BREAKING_STRATEGY, CycleBreakingStrategy.GREEDY_MODEL_ORDER);
+        // Before crossing minimization sort all nodes and edges/ports but also consider the node
+        // model order.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_STRATEGY, OrderingStrategy.NODES_AND_EDGES);
+        // Separate connected components should be drawn separately.
+        DiagramSyntheses.setLayoutOption(node, LayeredOptions.SEPARATE_CONNECTED_COMPONENTS, true);
+        // Component order is enforced by looking at the minimum element with respect to model order
+        // of each component.
+        // Remember that the startUp action is always the first node.
+        DiagramSyntheses.setLayoutOption(
+            node,
+            LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS,
+            ComponentOrderingStrategy.FORCE_MODEL_ORDER);
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
+        // During crossing minimization 10 node order violations are regarded as important as 1 edge
+        // crossing.
+        // In reality this chooses the best node order from all tries.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_CROSSING_COUNTER_NODE_INFLUENCE, 0.1);
+        // Increase the number of tries with different starting configurations.
+        DiagramSyntheses.setLayoutOption(node, LayeredOptions.THOROUGHNESS, 100);
 
-    /**
-     * Configures layout options for a timer.
-     * 
-     * @param node The KNode of a timer.
-     */
-    public void configureTimer(KNode node) {
-        String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
-        
-        switch (modelOrderStrategy) {
-            case STRICT_REACTION_ONLY:
-            case STRICT:
-            case TIE_BREAKER:
-                // Timers have no model order since their ordering in the model cannot be compared to the order of
-                // for example reactions since they are generally defined below in inputs/outputs and above the reactions.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
-                break;
-            case FULL_CONTROL:
-                // Give timers a model order since they should be controllable too.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, false);
-                break;
-            default:
-                // Do nothing.
-        }
+        break;
+      case FULL_CONTROL:
+        // Do strict model order cycle breaking. This may introduce unnecessary backward edges.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CYCLE_BREAKING_STRATEGY, CycleBreakingStrategy.MODEL_ORDER);
+        // Before crossing minimization sort all nodes and edges/ports but also consider the node
+        // model order.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_STRATEGY, OrderingStrategy.NODES_AND_EDGES);
+        // Separate connected components should be drawn separately.
+        DiagramSyntheses.setLayoutOption(node, LayeredOptions.SEPARATE_CONNECTED_COMPONENTS, true);
+        // Component order is enforced by looking at the minimum element with respect to model order
+        // of each component.
+        // Remember that the startUp action is always the first node.
+        DiagramSyntheses.setLayoutOption(
+            node,
+            LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS,
+            ComponentOrderingStrategy.FORCE_MODEL_ORDER);
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
+        // Disable all kinds of crossing minimization entirely. Just take what is in the model and
+        // just do it.
+        // This requires that the list of nodes is not ordered by type, e.g. first all reactions,
+        // then all reactors, then all actions, ...
+        // but by their model order. In other approaches ordering actions between the reactions has
+        // no effect.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CROSSING_MINIMIZATION_STRATEGY, CrossingMinimizationStrategy.NONE);
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CROSSING_MINIMIZATION_GREEDY_SWITCH_TYPE, GreedySwitchType.OFF);
+
+        break;
+      default:
+        // Do nothing.
     }
+  }
+
+  /**
+   * Configures layout options for an action.
+   *
+   * @param node The KNode of an action.
+   */
+  public void configureAction(KNode node) {
+    String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
 
-    /**
-     * Configures layout options for a startup action.
-     * 
-     * @param node The KNode of a startup action.
-     */
-    public void configureStartUp(KNode node) {
-        // Nothing should be done. Model order is considered per default value.
-        // The actual ordering of this node has to be done in the synthesis.
+    switch (modelOrderStrategy) {
+      case STRICT_REACTION_ONLY:
+      case STRICT:
+      case TIE_BREAKER:
+        // Actions have no model order since their ordering in the model cannot be compared to the
+        // order of
+        // for example reactions since they are generally defined below in inputs/outputs and above
+        // the reactions.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
+        break;
+      case FULL_CONTROL:
+        // Give actions a model order since they should be controllable too.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, false);
+        break;
+      default:
+        // Do nothing.
     }
+  }
 
-    /**
-     * Configures layout options for a shutdown action.
-     * 
-     * @param node The KNode of a shutdown action.
-     */
-    public void configureShutDown(KNode node) {
-        String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
-        
-        switch (modelOrderStrategy) {
-            case STRICT_REACTION_ONLY:
-            case STRICT:
-            case TIE_BREAKER:
-            case FULL_CONTROL:
-                // The shutdown node cannot have a high model order, since this would confuse cycle breaking.
-                // It  also cannot have a low model order.
-                // It should have none at all and the other nodes should define its position.
-                // This is no problem since the shutdown node has only outgoing edges.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
-                break;
-            default:
-                // Do nothing.
-        }
+  /**
+   * Configures layout options for a timer.
+   *
+   * @param node The KNode of a timer.
+   */
+  public void configureTimer(KNode node) {
+    String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
+
+    switch (modelOrderStrategy) {
+      case STRICT_REACTION_ONLY:
+      case STRICT:
+      case TIE_BREAKER:
+        // Timers have no model order since their ordering in the model cannot be compared to the
+        // order of
+        // for example reactions since they are generally defined below in inputs/outputs and above
+        // the reactions.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
+        break;
+      case FULL_CONTROL:
+        // Give timers a model order since they should be controllable too.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, false);
+        break;
+      default:
+        // Do nothing.
     }
+  }
+
+  /**
+   * Configures layout options for a startup action.
+   *
+   * @param node The KNode of a startup action.
+   */
+  public void configureStartUp(KNode node) {
+    // Nothing should be done. Model order is considered per default value.
+    // The actual ordering of this node has to be done in the synthesis.
+  }
 
-    /**
-     * Configures layout options for a reaction.
-     * Currently a reaction does not have internal behavior that is visualized and its order is always considered,
-     * therefore, nothing needs to be done.
-     * 
-     * @param node The KNode of a reaction.
-     */
-    public void configureReaction(KNode node) {
-        // Has no internal behavior and model order is set by default.
+  /**
+   * Configures layout options for a shutdown action.
+   *
+   * @param node The KNode of a shutdown action.
+   */
+  public void configureShutDown(KNode node) {
+    String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
+
+    switch (modelOrderStrategy) {
+      case STRICT_REACTION_ONLY:
+      case STRICT:
+      case TIE_BREAKER:
+      case FULL_CONTROL:
+        // The shutdown node cannot have a high model order, since this would confuse cycle
+        // breaking.
+        // It  also cannot have a low model order.
+        // It should have none at all and the other nodes should define its position.
+        // This is no problem since the shutdown node has only outgoing edges.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
+        break;
+      default:
+        // Do nothing.
     }
+  }
 
-    /**
-     * Configures layout options for a dummy node.
-     * 
-     * @param node The KNode of a dummy node.
-     */
-    public void configureDummy(KNode node) {
-        String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
-        
-        switch (modelOrderStrategy) {
-            case STRICT_REACTION_ONLY:
-            case STRICT:
-            case TIE_BREAKER:
-            case FULL_CONTROL:
-                // A dummy node has no model order.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
-                break;
-            default:
-                // Do nothing.
-        }
+  /**
+   * Configures layout options for a reaction. Currently a reaction does not have internal behavior
+   * that is visualized and its order is always considered, therefore, nothing needs to be done.
+   *
+   * @param node The KNode of a reaction.
+   */
+  public void configureReaction(KNode node) {
+    // Has no internal behavior and model order is set by default.
+  }
+
+  /**
+   * Configures layout options for a dummy node.
+   *
+   * @param node The KNode of a dummy node.
+   */
+  public void configureDummy(KNode node) {
+    String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
+
+    switch (modelOrderStrategy) {
+      case STRICT_REACTION_ONLY:
+      case STRICT:
+      case TIE_BREAKER:
+      case FULL_CONTROL:
+        // A dummy node has no model order.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
+        break;
+      default:
+        // Do nothing.
     }
+  }
 
-    /**
-     * Orders a list of nodes by their corresponding linked instance if synthesis option for full control is enabled.
-     * Ordering is done by the {@link #TEXTUAL_ORDER} comparator.
-     * 
-     * @param nodes List of KNodes to be ordered.
-     */
-    public void orderChildren(List<KNode> nodes) {
-        String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
-        if (FULL_CONTROL.equals(modelOrderStrategy)) {
-            nodes.sort(TEXTUAL_ORDER);
-        }
+  /**
+   * Orders a list of nodes by their corresponding linked instance if synthesis option for full
+   * control is enabled. Ordering is done by the {@link #TEXTUAL_ORDER} comparator.
+   *
+   * @param nodes List of KNodes to be ordered.
+   */
+  public void orderChildren(List<KNode> nodes) {
+    String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
+    if (FULL_CONTROL.equals(modelOrderStrategy)) {
+      nodes.sort(TEXTUAL_ORDER);
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/util/ModeDiagrams.java b/org.lflang/src/org/lflang/diagram/synthesis/util/ModeDiagrams.java
index 7222df3cf1..18c13e2b1f 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/util/ModeDiagrams.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/util/ModeDiagrams.java
@@ -1,30 +1,62 @@
 /*************
-* Copyright (c) 2021, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2021, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.util;
 
-
+import com.google.common.collect.LinkedHashMultimap;
+import com.google.inject.Inject;
+import de.cau.cs.kieler.klighd.SynthesisOption;
+import de.cau.cs.kieler.klighd.kgraph.KEdge;
+import de.cau.cs.kieler.klighd.kgraph.KIdentifier;
+import de.cau.cs.kieler.klighd.kgraph.KLabel;
+import de.cau.cs.kieler.klighd.kgraph.KNode;
+import de.cau.cs.kieler.klighd.kgraph.KPort;
+import de.cau.cs.kieler.klighd.krendering.Colors;
+import de.cau.cs.kieler.klighd.krendering.HorizontalAlignment;
+import de.cau.cs.kieler.klighd.krendering.KContainerRendering;
+import de.cau.cs.kieler.klighd.krendering.KDecoratorPlacementData;
+import de.cau.cs.kieler.klighd.krendering.KEllipse;
+import de.cau.cs.kieler.klighd.krendering.KPolyline;
+import de.cau.cs.kieler.klighd.krendering.KRectangle;
+import de.cau.cs.kieler.klighd.krendering.KRendering;
+import de.cau.cs.kieler.klighd.krendering.KRenderingFactory;
+import de.cau.cs.kieler.klighd.krendering.KText;
+import de.cau.cs.kieler.klighd.krendering.LineStyle;
+import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
+import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KEdgeExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KLabelExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions;
+import de.cau.cs.kieler.klighd.labels.decoration.ITextRenderingProvider;
+import de.cau.cs.kieler.klighd.labels.decoration.LabelDecorationConfigurator;
+import de.cau.cs.kieler.klighd.labels.decoration.LinesDecorator;
+import de.cau.cs.kieler.klighd.labels.decoration.RectangleDecorator;
+import de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses;
+import de.cau.cs.kieler.klighd.util.KlighdProperties;
 import java.awt.Color;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -33,7 +65,6 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.eclipse.elk.alg.layered.options.CenterEdgeLabelPlacementStrategy;
 import org.eclipse.elk.alg.layered.options.EdgeStraighteningStrategy;
 import org.eclipse.elk.alg.layered.options.FixedAlignment;
@@ -57,8 +88,8 @@
 import org.lflang.diagram.synthesis.styles.LinguaFrancaShapeExtensions;
 import org.lflang.diagram.synthesis.styles.LinguaFrancaStyleExtensions;
 import org.lflang.generator.ModeInstance;
-import org.lflang.generator.NamedInstance;
 import org.lflang.generator.ModeInstance.Transition;
+import org.lflang.generator.NamedInstance;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Action;
 import org.lflang.lf.Mode;
@@ -66,531 +97,648 @@
 import org.lflang.lf.Reactor;
 import org.lflang.lf.Timer;
 
-import com.google.common.collect.LinkedHashMultimap;
-import com.google.inject.Inject;
-
-import de.cau.cs.kieler.klighd.SynthesisOption;
-import de.cau.cs.kieler.klighd.kgraph.KEdge;
-import de.cau.cs.kieler.klighd.kgraph.KIdentifier;
-import de.cau.cs.kieler.klighd.kgraph.KLabel;
-import de.cau.cs.kieler.klighd.kgraph.KNode;
-import de.cau.cs.kieler.klighd.kgraph.KPort;
-import de.cau.cs.kieler.klighd.krendering.Colors;
-import de.cau.cs.kieler.klighd.krendering.HorizontalAlignment;
-import de.cau.cs.kieler.klighd.krendering.KContainerRendering;
-import de.cau.cs.kieler.klighd.krendering.KDecoratorPlacementData;
-import de.cau.cs.kieler.klighd.krendering.KEllipse;
-import de.cau.cs.kieler.klighd.krendering.KPolyline;
-import de.cau.cs.kieler.klighd.krendering.KRectangle;
-import de.cau.cs.kieler.klighd.krendering.KRendering;
-import de.cau.cs.kieler.klighd.krendering.KRenderingFactory;
-import de.cau.cs.kieler.klighd.krendering.KText;
-import de.cau.cs.kieler.klighd.krendering.LineStyle;
-import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
-import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KEdgeExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KLabelExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions;
-import de.cau.cs.kieler.klighd.labels.decoration.ITextRenderingProvider;
-import de.cau.cs.kieler.klighd.labels.decoration.LabelDecorationConfigurator;
-import de.cau.cs.kieler.klighd.labels.decoration.LinesDecorator;
-import de.cau.cs.kieler.klighd.labels.decoration.RectangleDecorator;
-import de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses;
-import de.cau.cs.kieler.klighd.util.KlighdProperties;
-
 /**
  * Transformations to support modes in the Lingua Franca diagram synthesis.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 @ViewSynthesisShared
 public class ModeDiagrams extends AbstractSynthesisExtensions {
-    
-    // Related synthesis option
-    public static final SynthesisOption MODES_CATEGORY = 
-            SynthesisOption.createCategory("Modes", false).setCategory(LinguaFrancaSynthesis.APPEARANCE);
-    public static final SynthesisOption SHOW_TRANSITION_LABELS = 
-            SynthesisOption.createCheckOption("Transition Labels", true).setCategory(MODES_CATEGORY);
-    public static final SynthesisOption INITIALLY_COLLAPSE_MODES = 
-            SynthesisOption.createCheckOption("Initially Collapse Modes", true).setCategory(MODES_CATEGORY);
-    
-    private static final Colors MODE_FG = Colors.SLATE_GRAY;
-    private static final Colors MODE_BG = Colors.SLATE_GRAY_3;
-    private static final int MODE_BG_ALPHA = 50;
-    
-    @Inject @Extension private KNodeExtensions _kNodeExtensions;
-    @Inject @Extension private KEdgeExtensions _kEdgeExtensions;
-    @Inject @Extension private KPortExtensions _kPortExtensions;
-    @Inject @Extension private KLabelExtensions _kLabelExtensions;
-    @Inject @Extension private KPolylineExtensions _kPolylineExtensions;
-    @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
-    @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
-    @Inject @Extension private LinguaFrancaShapeExtensions _linguaFrancaShapeExtensions;
-    @Inject @Extension private LinguaFrancaStyleExtensions _linguaFrancaStyleExtensions;
-    @Inject @Extension private UtilityExtensions _utilityExtensions;
-    @Inject @Extension private LayoutPostProcessing _layoutPostProcessing;
-        
-    @Extension private KRenderingFactory _kRenderingFactory = KRenderingFactory.eINSTANCE;
-    
-    public void handleModes(List<KNode> nodes, ReactorInstance reactor) {
-        if (!reactor.modes.isEmpty()) {
-            var modeNodes = new LinkedHashMap<ModeInstance, KNode>();
-            var modeDefinitionMap = new LinkedHashMap<Mode, ModeInstance>();
-            for (ModeInstance mode : reactor.modes) {
-                var node = _kNodeExtensions.createNode();
-                associateWith(node, mode.getDefinition());
-                NamedInstanceUtil.linkInstance(node, mode);
-                _utilityExtensions.setID(node, mode.uniqueID());
-                
-                modeNodes.put(mode, node);
-                modeDefinitionMap.put(mode.getDefinition(), mode);
-                
-                // Layout
-                if (mode.isInitial()) {
-                    DiagramSyntheses.setLayoutOption(node, LayeredOptions.LAYERING_LAYER_CONSTRAINT, LayerConstraint.FIRST);
-                }
-                // Use general layout configuration of reactors
-                this.<LinguaFrancaSynthesis>getRootSynthesis().configureReactorNodeLayout(node, false); 
-                _layoutPostProcessing.configureReactor(node);
-                // Adjust for modes
-                DiagramSyntheses.setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FREE);
-                
-                var expansionState = MemorizingExpandCollapseAction.getExpansionState(mode);
-                DiagramSyntheses.setLayoutOption(node, KlighdProperties.EXPAND, 
-                        expansionState != null ? expansionState : !this.getBooleanValue(INITIALLY_COLLAPSE_MODES));
-                
-                // Expanded Rectangle
-                var expandFigure = addModeFigure(node, mode, true);
-                expandFigure.setProperty(KlighdProperties.EXPANDED_RENDERING, true);
-                _kRenderingExtensions.addDoubleClickAction(expandFigure, MemorizingExpandCollapseAction.ID);
-                
-                if (getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS)) {
-                    // Collapse button
-                    KText textButton = _linguaFrancaShapeExtensions.addTextButton(expandFigure, LinguaFrancaSynthesis.TEXT_HIDE_ACTION);
-                    _kRenderingExtensions.to(
-                            _kRenderingExtensions.from(_kRenderingExtensions.setGridPlacementData(textButton),
-                                                       _kRenderingExtensions.LEFT, 8, 0, _kRenderingExtensions.TOP, 0, 0),
-                            _kRenderingExtensions.RIGHT, 8, 0, _kRenderingExtensions.BOTTOM, 0, 0);
-                    _kRenderingExtensions.addSingleClickAction(textButton, MemorizingExpandCollapseAction.ID);
-                    _kRenderingExtensions.addDoubleClickAction(textButton, MemorizingExpandCollapseAction.ID);
-                }
-                
-                if (getBooleanValue(LinguaFrancaSynthesis.SHOW_STATE_VARIABLES)) {
-                    // Add mode-local state variables
-                    var variables = mode.getDefinition().getStateVars();
-                    if (!variables.isEmpty()) {
-                        KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(expandFigure);
-                        _kRenderingExtensions.setInvisible(rectangle, true);
-                        if (!getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS)) {
-                            _kRenderingExtensions.to(
-                                    _kRenderingExtensions.from(
-                                            _kRenderingExtensions.setGridPlacementData(rectangle), 
-                                            _kRenderingExtensions.LEFT, 6, 0, 
-                                            _kRenderingExtensions.TOP, 0, 0), 
-                                    _kRenderingExtensions.RIGHT, 6, 0, 
-                                    _kRenderingExtensions.BOTTOM, 4, 0);
-                        } else {
-                            _kRenderingExtensions.to(
-                                    _kRenderingExtensions.from(
-                                            _kRenderingExtensions.setGridPlacementData(rectangle), 
-                                            _kRenderingExtensions.LEFT, 6, 0, 
-                                            _kRenderingExtensions.TOP, 4, 0), 
-                                    _kRenderingExtensions.RIGHT, 6, 0, 
-                                    _kRenderingExtensions.BOTTOM, 0, 0);
-                        }
-                        _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
-                        this.<LinguaFrancaSynthesis>getRootSynthesis().addStateVariableList(rectangle, variables);
-                    }
-                }
-                
-                _kContainerRenderingExtensions.addChildArea(expandFigure);
-    
-                // Collapse Rectangle
-                var collapseFigure = addModeFigure(node, mode, false);
-                collapseFigure.setProperty(KlighdProperties.COLLAPSED_RENDERING, true);
-                if (this.hasContent(mode)) {
-                    _kRenderingExtensions.addDoubleClickAction(collapseFigure, MemorizingExpandCollapseAction.ID);
-                    
-                    if (getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS)) {
-                        // Expand button
-                        KText textButton = _linguaFrancaShapeExtensions.addTextButton(collapseFigure, LinguaFrancaSynthesis.TEXT_SHOW_ACTION);
-                        _kRenderingExtensions.to(_kRenderingExtensions.from(
-                                    _kRenderingExtensions.setGridPlacementData(textButton), 
-                                    _kRenderingExtensions.LEFT, 8, 0, _kRenderingExtensions.TOP, 0, 0), 
-                                _kRenderingExtensions.RIGHT, 8, 0, _kRenderingExtensions.BOTTOM, 8, 0);
-                        _kRenderingExtensions.addSingleClickAction(textButton, MemorizingExpandCollapseAction.ID);
-                        _kRenderingExtensions.addDoubleClickAction(textButton, MemorizingExpandCollapseAction.ID);
-                    }
-                }
+
+  // Related synthesis option
+  public static final SynthesisOption MODES_CATEGORY =
+      SynthesisOption.createCategory("Modes", false).setCategory(LinguaFrancaSynthesis.APPEARANCE);
+  public static final SynthesisOption SHOW_TRANSITION_LABELS =
+      SynthesisOption.createCheckOption("Transition Labels", true).setCategory(MODES_CATEGORY);
+  public static final SynthesisOption INITIALLY_COLLAPSE_MODES =
+      SynthesisOption.createCheckOption("Initially Collapse Modes", true)
+          .setCategory(MODES_CATEGORY);
+
+  private static final Colors MODE_FG = Colors.SLATE_GRAY;
+  private static final Colors MODE_BG = Colors.SLATE_GRAY_3;
+  private static final int MODE_BG_ALPHA = 50;
+
+  @Inject @Extension private KNodeExtensions _kNodeExtensions;
+  @Inject @Extension private KEdgeExtensions _kEdgeExtensions;
+  @Inject @Extension private KPortExtensions _kPortExtensions;
+  @Inject @Extension private KLabelExtensions _kLabelExtensions;
+  @Inject @Extension private KPolylineExtensions _kPolylineExtensions;
+  @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
+  @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
+  @Inject @Extension private LinguaFrancaShapeExtensions _linguaFrancaShapeExtensions;
+  @Inject @Extension private LinguaFrancaStyleExtensions _linguaFrancaStyleExtensions;
+  @Inject @Extension private UtilityExtensions _utilityExtensions;
+  @Inject @Extension private LayoutPostProcessing _layoutPostProcessing;
+
+  @Extension private KRenderingFactory _kRenderingFactory = KRenderingFactory.eINSTANCE;
+
+  public void handleModes(List<KNode> nodes, ReactorInstance reactor) {
+    if (!reactor.modes.isEmpty()) {
+      var modeNodes = new LinkedHashMap<ModeInstance, KNode>();
+      var modeDefinitionMap = new LinkedHashMap<Mode, ModeInstance>();
+      for (ModeInstance mode : reactor.modes) {
+        var node = _kNodeExtensions.createNode();
+        associateWith(node, mode.getDefinition());
+        NamedInstanceUtil.linkInstance(node, mode);
+        _utilityExtensions.setID(node, mode.uniqueID());
+
+        modeNodes.put(mode, node);
+        modeDefinitionMap.put(mode.getDefinition(), mode);
+
+        // Layout
+        if (mode.isInitial()) {
+          DiagramSyntheses.setLayoutOption(
+              node, LayeredOptions.LAYERING_LAYER_CONSTRAINT, LayerConstraint.FIRST);
+        }
+        // Use general layout configuration of reactors
+        this.<LinguaFrancaSynthesis>getRootSynthesis().configureReactorNodeLayout(node, false);
+        _layoutPostProcessing.configureReactor(node);
+        // Adjust for modes
+        DiagramSyntheses.setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FREE);
+
+        var expansionState = MemorizingExpandCollapseAction.getExpansionState(mode);
+        DiagramSyntheses.setLayoutOption(
+            node,
+            KlighdProperties.EXPAND,
+            expansionState != null
+                ? expansionState
+                : !this.getBooleanValue(INITIALLY_COLLAPSE_MODES));
+
+        // Expanded Rectangle
+        var expandFigure = addModeFigure(node, mode, true);
+        expandFigure.setProperty(KlighdProperties.EXPANDED_RENDERING, true);
+        _kRenderingExtensions.addDoubleClickAction(expandFigure, MemorizingExpandCollapseAction.ID);
+
+        if (getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS)) {
+          // Collapse button
+          KText textButton =
+              _linguaFrancaShapeExtensions.addTextButton(
+                  expandFigure, LinguaFrancaSynthesis.TEXT_HIDE_ACTION);
+          _kRenderingExtensions.to(
+              _kRenderingExtensions.from(
+                  _kRenderingExtensions.setGridPlacementData(textButton),
+                  _kRenderingExtensions.LEFT,
+                  8,
+                  0,
+                  _kRenderingExtensions.TOP,
+                  0,
+                  0),
+              _kRenderingExtensions.RIGHT,
+              8,
+              0,
+              _kRenderingExtensions.BOTTOM,
+              0,
+              0);
+          _kRenderingExtensions.addSingleClickAction(textButton, MemorizingExpandCollapseAction.ID);
+          _kRenderingExtensions.addDoubleClickAction(textButton, MemorizingExpandCollapseAction.ID);
+        }
+
+        if (getBooleanValue(LinguaFrancaSynthesis.SHOW_STATE_VARIABLES)) {
+          // Add mode-local state variables
+          var variables = mode.getDefinition().getStateVars();
+          if (!variables.isEmpty()) {
+            KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(expandFigure);
+            _kRenderingExtensions.setInvisible(rectangle, true);
+            if (!getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS)) {
+              _kRenderingExtensions.to(
+                  _kRenderingExtensions.from(
+                      _kRenderingExtensions.setGridPlacementData(rectangle),
+                      _kRenderingExtensions.LEFT,
+                      6,
+                      0,
+                      _kRenderingExtensions.TOP,
+                      0,
+                      0),
+                  _kRenderingExtensions.RIGHT,
+                  6,
+                  0,
+                  _kRenderingExtensions.BOTTOM,
+                  4,
+                  0);
+            } else {
+              _kRenderingExtensions.to(
+                  _kRenderingExtensions.from(
+                      _kRenderingExtensions.setGridPlacementData(rectangle),
+                      _kRenderingExtensions.LEFT,
+                      6,
+                      0,
+                      _kRenderingExtensions.TOP,
+                      4,
+                      0),
+                  _kRenderingExtensions.RIGHT,
+                  6,
+                  0,
+                  _kRenderingExtensions.BOTTOM,
+                  0,
+                  0);
             }
-            
-            var modeChildren =  LinkedHashMultimap.<ModeInstance, KNode>create();
-            var nodeModes =  new HashMap<KNode, ModeInstance>();
-            for (var node : nodes) {
-                var instance = NamedInstanceUtil.getLinkedInstance(node);
-                if (instance == null && node.getProperty(CoreOptions.COMMENT_BOX)) {
-                    var firstEdge = IterableExtensions.<KEdge>head(node.getOutgoingEdges());
-                    if (firstEdge != null && firstEdge.getTarget() != null) {
-                        instance = NamedInstanceUtil.getLinkedInstance(firstEdge.getTarget());
-                    }
-                }
-                if (instance != null) {
-                    var mode = instance.getMode(true);
-                    modeChildren.put(mode, node);
-                    nodeModes.put(node, mode);
-                } else {
-                    modeChildren.put(null, node);
-                }
+            _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
+            this.<LinguaFrancaSynthesis>getRootSynthesis()
+                .addStateVariableList(rectangle, variables);
+          }
+        }
+
+        _kContainerRenderingExtensions.addChildArea(expandFigure);
+
+        // Collapse Rectangle
+        var collapseFigure = addModeFigure(node, mode, false);
+        collapseFigure.setProperty(KlighdProperties.COLLAPSED_RENDERING, true);
+        if (this.hasContent(mode)) {
+          _kRenderingExtensions.addDoubleClickAction(
+              collapseFigure, MemorizingExpandCollapseAction.ID);
+
+          if (getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS)) {
+            // Expand button
+            KText textButton =
+                _linguaFrancaShapeExtensions.addTextButton(
+                    collapseFigure, LinguaFrancaSynthesis.TEXT_SHOW_ACTION);
+            _kRenderingExtensions.to(
+                _kRenderingExtensions.from(
+                    _kRenderingExtensions.setGridPlacementData(textButton),
+                    _kRenderingExtensions.LEFT,
+                    8,
+                    0,
+                    _kRenderingExtensions.TOP,
+                    0,
+                    0),
+                _kRenderingExtensions.RIGHT,
+                8,
+                0,
+                _kRenderingExtensions.BOTTOM,
+                8,
+                0);
+            _kRenderingExtensions.addSingleClickAction(
+                textButton, MemorizingExpandCollapseAction.ID);
+            _kRenderingExtensions.addDoubleClickAction(
+                textButton, MemorizingExpandCollapseAction.ID);
+          }
+        }
+      }
+
+      var modeChildren = LinkedHashMultimap.<ModeInstance, KNode>create();
+      var nodeModes = new HashMap<KNode, ModeInstance>();
+      for (var node : nodes) {
+        var instance = NamedInstanceUtil.getLinkedInstance(node);
+        if (instance == null && node.getProperty(CoreOptions.COMMENT_BOX)) {
+          var firstEdge = IterableExtensions.<KEdge>head(node.getOutgoingEdges());
+          if (firstEdge != null && firstEdge.getTarget() != null) {
+            instance = NamedInstanceUtil.getLinkedInstance(firstEdge.getTarget());
+          }
+        }
+        if (instance != null) {
+          var mode = instance.getMode(true);
+          modeChildren.put(mode, node);
+          nodeModes.put(node, mode);
+        } else {
+          modeChildren.put(null, node);
+        }
+      }
+
+      var modeContainer = _kNodeExtensions.createNode();
+      modeContainer.getChildren().addAll(modeNodes.values());
+      var modeContainerFigure = addModeContainerFigure(modeContainer);
+      _kRenderingExtensions.addDoubleClickAction(
+          modeContainerFigure, MemorizingExpandCollapseAction.ID);
+
+      // Use general layout configuration of reactors
+      this.<LinguaFrancaSynthesis>getRootSynthesis()
+          .configureReactorNodeLayout(modeContainer, false);
+      _layoutPostProcessing.configureReactor(modeContainer);
+      // Adjust for state machine style
+      // Create alternating directions to make the model more compact
+      DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.DIRECTION, Direction.DOWN);
+      // More state machine like node placement
+      DiagramSyntheses.setLayoutOption(
+          modeContainer,
+          LayeredOptions.NODE_PLACEMENT_STRATEGY,
+          NodePlacementStrategy.BRANDES_KOEPF);
+      DiagramSyntheses.setLayoutOption(
+          modeContainer, LayeredOptions.NODE_PLACEMENT_BK_FIXED_ALIGNMENT, FixedAlignment.BALANCED);
+      DiagramSyntheses.setLayoutOption(
+          modeContainer,
+          LayeredOptions.NODE_PLACEMENT_BK_EDGE_STRAIGHTENING,
+          EdgeStraighteningStrategy.IMPROVE_STRAIGHTNESS);
+      // Splines
+      DiagramSyntheses.setLayoutOption(
+          modeContainer, CoreOptions.EDGE_ROUTING, EdgeRouting.SPLINES);
+      DiagramSyntheses.setLayoutOption(
+          modeContainer,
+          LayeredOptions.EDGE_LABELS_CENTER_LABEL_PLACEMENT_STRATEGY,
+          CenterEdgeLabelPlacementStrategy.TAIL_LAYER);
+      DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.SPACING_NODE_SELF_LOOP, 18.0);
+      // Unreachable states are unlikely
+      DiagramSyntheses.setLayoutOption(
+          modeContainer, CoreOptions.SEPARATE_CONNECTED_COMPONENTS, false);
+      // Equal padding
+      DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.PADDING, new ElkPadding(6));
+      if (reactor.modes.stream()
+          .anyMatch(m -> m.transitions.stream().anyMatch(t -> t.type == ModeTransition.HISTORY))) {
+        // Make additional space for history indicator
+        DiagramSyntheses.setLayoutOption(
+            modeContainer,
+            LayeredOptions.SPACING_NODE_NODE_BETWEEN_LAYERS,
+            modeContainer.getProperty(LayeredOptions.SPACING_NODE_NODE_BETWEEN_LAYERS)
+                + (getBooleanValue(SHOW_TRANSITION_LABELS) ? 6.0 : 10.0));
+      }
+
+      var modeContainerPorts = new HashMap<KPort, KPort>();
+      for (var mode : reactor.modes) {
+        var modeNode = modeNodes.get(mode);
+        var edges = new LinkedHashSet<KEdge>();
+        // add children
+        for (var child : modeChildren.get(mode)) {
+          nodes.remove(child);
+          modeNode.getChildren().add(child);
+
+          edges.addAll(child.getIncomingEdges());
+          edges.addAll(child.getOutgoingEdges());
+        }
+
+        // add transitions
+        var representedTargets = new HashSet<Pair<ModeInstance, ModeTransition>>();
+        for (var transition : mode.transitions) {
+          if (!representedTargets.contains(
+              new Pair<ModeInstance, ModeTransition>(transition.target, transition.type))) {
+            var edge = _kEdgeExtensions.createEdge();
+            edge.setSource(modeNode);
+            edge.setTarget(modeNodes.get(transition.target));
+            addTransitionFigure(edge, transition);
+
+            if (getBooleanValue(SHOW_TRANSITION_LABELS)) {
+              associateWith(edge, transition.getDefinition());
+            } else {
+              // Bundle similar transitions
+              representedTargets.add(
+                  new Pair<ModeInstance, ModeTransition>(transition.target, transition.type));
+            }
+          }
+        }
+
+        // handle cross hierarchy edges
+        var portCopies = new HashMap<KPort, KPort>();
+        var triggerCopies = new HashMap<KNode, KNode>();
+        for (var edge : edges) {
+          if (!edge.getProperty(CoreOptions.NO_LAYOUT)) {
+            var sourceNodeMode = nodeModes.get(edge.getSource());
+            if (sourceNodeMode == null) {
+              sourceNodeMode = nodeModes.get(edge.getSource().getParent());
             }
-            
-            var modeContainer = _kNodeExtensions.createNode();
-            modeContainer.getChildren().addAll(modeNodes.values());
-            var modeContainerFigure = addModeContainerFigure(modeContainer);
-            _kRenderingExtensions.addDoubleClickAction(modeContainerFigure, MemorizingExpandCollapseAction.ID);
-            
-            // Use general layout configuration of reactors
-            this.<LinguaFrancaSynthesis>getRootSynthesis().configureReactorNodeLayout(modeContainer, false); 
-            _layoutPostProcessing.configureReactor(modeContainer);
-            // Adjust for state machine style
-            // Create alternating directions to make the model more compact
-            DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.DIRECTION, Direction.DOWN);
-            // More state machine like node placement
-            DiagramSyntheses.setLayoutOption(modeContainer, LayeredOptions.NODE_PLACEMENT_STRATEGY, NodePlacementStrategy.BRANDES_KOEPF);
-            DiagramSyntheses.setLayoutOption(modeContainer, LayeredOptions.NODE_PLACEMENT_BK_FIXED_ALIGNMENT, FixedAlignment.BALANCED);
-            DiagramSyntheses.setLayoutOption(modeContainer, LayeredOptions.NODE_PLACEMENT_BK_EDGE_STRAIGHTENING, EdgeStraighteningStrategy.IMPROVE_STRAIGHTNESS);
-            // Splines
-            DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.EDGE_ROUTING, EdgeRouting.SPLINES);
-            DiagramSyntheses.setLayoutOption(modeContainer, LayeredOptions.EDGE_LABELS_CENTER_LABEL_PLACEMENT_STRATEGY, CenterEdgeLabelPlacementStrategy.TAIL_LAYER);
-            DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.SPACING_NODE_SELF_LOOP, 18.0);
-            // Unreachable states are unlikely
-            DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.SEPARATE_CONNECTED_COMPONENTS, false);
-            // Equal padding
-            DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.PADDING, new ElkPadding(6));
-            if (reactor.modes.stream().anyMatch(m -> m.transitions.stream().anyMatch(t -> t.type == ModeTransition.HISTORY))) {
-                // Make additional space for history indicator
-                DiagramSyntheses.setLayoutOption(modeContainer, LayeredOptions.SPACING_NODE_NODE_BETWEEN_LAYERS, 
-                        modeContainer.getProperty(LayeredOptions.SPACING_NODE_NODE_BETWEEN_LAYERS) 
-                        + (getBooleanValue(SHOW_TRANSITION_LABELS) ? 6.0 : 10.0));
+            var sourceIsInMode = sourceNodeMode != null;
+            var targetNodeMode = nodeModes.get(edge.getTarget());
+            if (targetNodeMode == null) {
+              targetNodeMode = nodeModes.get(edge.getTarget().getParent());
             }
+            var targetIsInMode = targetNodeMode != null;
+
+            if (!sourceIsInMode || !targetIsInMode) {
+              var node = sourceIsInMode ? edge.getTarget() : edge.getSource();
+
+              if (node.getProperty(LinguaFrancaSynthesis.REACTION_SPECIAL_TRIGGER)) {
+                // Duplicate trigger node
+                if (!triggerCopies.containsKey(node)) {
+                  var copy = EcoreUtil.copy(node);
+                  modeNode
+                      .getChildren()
+                      .add(modeNode.getChildren().indexOf(edge.getTarget()), copy);
+                  triggerCopies.put(node, copy);
 
-            var modeContainerPorts = new HashMap<KPort, KPort>();
-            for (var mode : reactor.modes) {
-                var modeNode = modeNodes.get(mode);
-                var edges = new LinkedHashSet<KEdge>();
-                // add children
-                for (var child : modeChildren.get(mode)) {
-                    nodes.remove(child);
-                    modeNode.getChildren().add(child);
-                    
-                    edges.addAll(child.getIncomingEdges());
-                    edges.addAll(child.getOutgoingEdges());
+                  // Adjust copy
+                  copy.getOutgoingEdges()
+                      .forEach(
+                          e -> {
+                            e.setTarget(null);
+                            e.setTargetPort(null);
+                          });
+                  copy.getOutgoingEdges().clear();
+                  copy.getData().stream()
+                      .filter(d -> d instanceof KIdentifier)
+                      .forEach(
+                          d -> {
+                            var kid = (KIdentifier) d;
+                            kid.setId(kid.getId() + "_" + mode.getName());
+                          });
                 }
-                
-                // add transitions
-                var representedTargets = new HashSet<Pair<ModeInstance, ModeTransition>>();
-                for (var transition : mode.transitions) {
-                    if (!representedTargets.contains(new Pair<ModeInstance, ModeTransition>(transition.target, transition.type))) {
-                        var edge = _kEdgeExtensions.createEdge();
-                        edge.setSource(modeNode);
-                        edge.setTarget(modeNodes.get(transition.target));
-                        addTransitionFigure(edge, transition);
-                        
-                        if (getBooleanValue(SHOW_TRANSITION_LABELS)) {
-                            associateWith(edge, transition.getDefinition());
-                        } else {
-                            // Bundle similar transitions
-                            representedTargets.add(new Pair<ModeInstance, ModeTransition>(transition.target, transition.type));
-                        }
-                    }
+
+                var newNode = triggerCopies.get(node);
+                edge.setSource(newNode);
+
+                // Remove trigger on top level if only used in modes
+                if (node.getOutgoingEdges().isEmpty()) {
+                  nodes.remove(node);
                 }
-                
-                // handle cross hierarchy edges
-                var portCopies = new HashMap<KPort, KPort>();
-                var triggerCopies = new HashMap<KNode, KNode>();
-                for (var edge : edges) {
-                    if (!edge.getProperty(CoreOptions.NO_LAYOUT)) {
-                        var sourceNodeMode = nodeModes.get(edge.getSource());
-                        if (sourceNodeMode == null) {
-                            sourceNodeMode = nodeModes.get(edge.getSource().getParent());
-                        }
-                        var sourceIsInMode = sourceNodeMode != null;
-                        var targetNodeMode = nodeModes.get(edge.getTarget());
-                        if (targetNodeMode == null) {
-                            targetNodeMode = nodeModes.get(edge.getTarget().getParent());
-                        }
-                        var targetIsInMode = targetNodeMode != null;
-                        
-                        if (!sourceIsInMode || !targetIsInMode) {
-                            var node = sourceIsInMode ? edge.getTarget() : edge.getSource();
-                            
-                            if (node.getProperty(LinguaFrancaSynthesis.REACTION_SPECIAL_TRIGGER)) {
-                                // Duplicate trigger node
-                                if (!triggerCopies.containsKey(node)) {
-                                    var copy = EcoreUtil.copy(node);
-                                    modeNode.getChildren().add(modeNode.getChildren().indexOf(edge.getTarget()), copy);
-                                    triggerCopies.put(node, copy);
-                                    
-                                    // Adjust copy
-                                    copy.getOutgoingEdges().forEach(e -> {e.setTarget(null);e.setTargetPort(null);});
-                                    copy.getOutgoingEdges().clear();
-                                    copy.getData().stream().filter(d -> d instanceof KIdentifier).forEach(d -> {
-                                        var kid = (KIdentifier) d;
-                                        kid.setId(kid.getId() + "_" + mode.getName());
-                                    });
-                                }
-                                
-                                var newNode = triggerCopies.get(node);
-                                edge.setSource(newNode);
-                                
-                                // Remove trigger on top level if only used in modes
-                                if (node.getOutgoingEdges().isEmpty()) {
-                                    nodes.remove(node);
-                                }
-                            } else {
-                                var port = sourceIsInMode ? edge.getTargetPort() : edge.getSourcePort();
-                                var isLocal = modeChildren.get(null).contains(node);
-                                if (isLocal) {
-                                    // Add port to mode container
-                                    if (modeContainerPorts.containsKey(port)) {
-                                        node = modeContainer;
-                                        port = modeContainerPorts.get(port);
-                                    } else {
-                                        var containerPort = _kPortExtensions.createPort();
-                                        modeContainerPorts.put(port, containerPort);
-                                        modeContainer.getPorts().add(containerPort);
-                                        
-                                        _kPortExtensions.setPortSize(containerPort, 8, 8);
-                                        KRectangle rect = _kRenderingExtensions.addRectangle(containerPort);
-                                        _kRenderingExtensions.setPointPlacementData(rect,
-                                                _kRenderingExtensions.LEFT, 0, 0.5f,
-                                                _kRenderingExtensions.BOTTOM, 0, 0.5f,
-                                                _kRenderingExtensions.H_CENTRAL, _kRenderingExtensions.V_CENTRAL,
-                                                0, 0, 8, 4);
-                                        _kRenderingExtensions.setBackground(rect, Colors.BLACK);
-                                        _linguaFrancaStyleExtensions.boldLineSelectionStyle(rect);
-                                        
-                                        DiagramSyntheses.setLayoutOption(containerPort, CoreOptions.PORT_BORDER_OFFSET, -4.0);
-                                        DiagramSyntheses.setLayoutOption(containerPort, CoreOptions.PORT_SIDE, sourceIsInMode ? PortSide.EAST : PortSide.WEST);
-                                        
-                                        var source = _utilityExtensions.sourceElement(node);
-                                        var label = "";
-                                        if (source instanceof Action) {
-                                            label = ((Action) source).getName();
-                                        } else if (source instanceof Timer) {
-                                            label = ((Timer) source).getName();
-                                        } else if (!port.getLabels().isEmpty()) {
-                                            label = port.getLabels().get(0).getText();
-                                            if (source instanceof Reactor && getBooleanValue(LinguaFrancaSynthesis.SHOW_INSTANCE_NAMES)) {
-                                                NamedInstance<?> linkedInstance = NamedInstanceUtil.getLinkedInstance(node);
-                                                if (linkedInstance instanceof ReactorInstance) {
-                                                    label = ((ReactorInstance) linkedInstance).getName() + "." + label;
-                                                }
-                                            }
-                                        }
-                                        var portLabel = _kLabelExtensions.createLabel(containerPort);
-                                        portLabel.setText(label);
-                                        var portLabelKText = _kRenderingFactory.createKText();
-                                        _kRenderingExtensions.setFontSize(portLabelKText, 8);
-                                        portLabel.getData().add(portLabelKText);
-                                        
-                                        // new connection
-                                        var copy = EcoreUtil.copy(edge);
-                                        if (sourceIsInMode) {
-                                            copy.setSource(modeContainer);
-                                            copy.setSourcePort(containerPort);
-                                            copy.setTarget(edge.getTarget());
-                                        } else {
-                                            copy.setTarget(modeContainer);
-                                            copy.setTargetPort(containerPort);
-                                            copy.setSource(edge.getSource());
-                                        }
-                                        
-                                        node = modeContainer;
-                                        port = containerPort;
-                                    }
-                                }
-                                
-                                // Duplicate port
-                                if (!portCopies.containsKey(port)) {
-                                    var copy = EcoreUtil.copy(port);
-                                    portCopies.put(port, copy);
-                                    
-                                    var dummyNode = _kNodeExtensions.createNode();
-                                    var newID = mode.uniqueID() + "_";
-                                    if (!port.getLabels().isEmpty()) {
-                                        newID += IterableExtensions.head(port.getLabels()).getText();
-                                    }
-                                    _utilityExtensions.setID(dummyNode, newID);
-                                    _kRenderingExtensions.addInvisibleContainerRendering(dummyNode);
-                                    dummyNode.getPorts().add(copy);
-                                    // Assign layer
-                                    DiagramSyntheses.setLayoutOption(dummyNode, LayeredOptions.LAYERING_LAYER_CONSTRAINT,
-                                            port.getProperty(CoreOptions.PORT_SIDE) == PortSide.WEST ? LayerConstraint.FIRST : LayerConstraint.LAST);
-                                    // Configure port spacing
-                                    DiagramSyntheses.setLayoutOption(dummyNode, CoreOptions.PORT_LABELS_PLACEMENT, EnumSet.of(PortLabelPlacement.ALWAYS_OTHER_SAME_SIDE, PortLabelPlacement.OUTSIDE));
-                                    // Place freely
-                                    DiagramSyntheses.setLayoutOption(dummyNode, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
-                                    // Switch port side
-                                    DiagramSyntheses.setLayoutOption(copy, CoreOptions.PORT_SIDE, 
-                                            port.getProperty(CoreOptions.PORT_SIDE) == PortSide.WEST ? PortSide.EAST : PortSide.WEST);
-                                    
-                                    modeNode.getChildren().add(dummyNode);
-                                }
-                                var newPort = portCopies.get(port);
-                                if (sourceIsInMode) {
-                                    edge.setTarget(newPort.getNode());
-                                    edge.setTargetPort(newPort);
-                                } else {
-                                    edge.setSource(newPort.getNode());
-                                    edge.setSourcePort(newPort);
-                                }
-                            }
+              } else {
+                var port = sourceIsInMode ? edge.getTargetPort() : edge.getSourcePort();
+                var isLocal = modeChildren.get(null).contains(node);
+                if (isLocal) {
+                  // Add port to mode container
+                  if (modeContainerPorts.containsKey(port)) {
+                    node = modeContainer;
+                    port = modeContainerPorts.get(port);
+                  } else {
+                    var containerPort = _kPortExtensions.createPort();
+                    modeContainerPorts.put(port, containerPort);
+                    modeContainer.getPorts().add(containerPort);
+
+                    _kPortExtensions.setPortSize(containerPort, 8, 8);
+                    KRectangle rect = _kRenderingExtensions.addRectangle(containerPort);
+                    _kRenderingExtensions.setPointPlacementData(
+                        rect,
+                        _kRenderingExtensions.LEFT,
+                        0,
+                        0.5f,
+                        _kRenderingExtensions.BOTTOM,
+                        0,
+                        0.5f,
+                        _kRenderingExtensions.H_CENTRAL,
+                        _kRenderingExtensions.V_CENTRAL,
+                        0,
+                        0,
+                        8,
+                        4);
+                    _kRenderingExtensions.setBackground(rect, Colors.BLACK);
+                    _linguaFrancaStyleExtensions.boldLineSelectionStyle(rect);
+
+                    DiagramSyntheses.setLayoutOption(
+                        containerPort, CoreOptions.PORT_BORDER_OFFSET, -4.0);
+                    DiagramSyntheses.setLayoutOption(
+                        containerPort,
+                        CoreOptions.PORT_SIDE,
+                        sourceIsInMode ? PortSide.EAST : PortSide.WEST);
+
+                    var source = _utilityExtensions.sourceElement(node);
+                    var label = "";
+                    if (source instanceof Action) {
+                      label = ((Action) source).getName();
+                    } else if (source instanceof Timer) {
+                      label = ((Timer) source).getName();
+                    } else if (!port.getLabels().isEmpty()) {
+                      label = port.getLabels().get(0).getText();
+                      if (source instanceof Reactor
+                          && getBooleanValue(LinguaFrancaSynthesis.SHOW_INSTANCE_NAMES)) {
+                        NamedInstance<?> linkedInstance = NamedInstanceUtil.getLinkedInstance(node);
+                        if (linkedInstance instanceof ReactorInstance) {
+                          label = ((ReactorInstance) linkedInstance).getName() + "." + label;
                         }
+                      }
+                    }
+                    var portLabel = _kLabelExtensions.createLabel(containerPort);
+                    portLabel.setText(label);
+                    var portLabelKText = _kRenderingFactory.createKText();
+                    _kRenderingExtensions.setFontSize(portLabelKText, 8);
+                    portLabel.getData().add(portLabelKText);
+
+                    // new connection
+                    var copy = EcoreUtil.copy(edge);
+                    if (sourceIsInMode) {
+                      copy.setSource(modeContainer);
+                      copy.setSourcePort(containerPort);
+                      copy.setTarget(edge.getTarget());
+                    } else {
+                      copy.setTarget(modeContainer);
+                      copy.setTargetPort(containerPort);
+                      copy.setSource(edge.getSource());
                     }
+
+                    node = modeContainer;
+                    port = containerPort;
+                  }
                 }
-            }
-            
-            // If mode container is unused (no ports for local connections) -> hide it
-            if (modeContainer.getPorts().isEmpty()) {
-                _kRenderingExtensions.setInvisible(modeContainerFigure, true);
-                DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.PADDING, new ElkPadding(2));
-            } else if (getBooleanValue(LinguaFrancaSynthesis.SHOW_INSTANCE_NAMES)) {
-                // Remove mode container port labels of ports representing internal connections
-                // because their association to reactor instances is unambiguous due to instance names
-                for (var p : modeContainer.getPorts()) {
-                    p.getLabels().removeIf(l -> l.getText().contains("."));
+
+                // Duplicate port
+                if (!portCopies.containsKey(port)) {
+                  var copy = EcoreUtil.copy(port);
+                  portCopies.put(port, copy);
+
+                  var dummyNode = _kNodeExtensions.createNode();
+                  var newID = mode.uniqueID() + "_";
+                  if (!port.getLabels().isEmpty()) {
+                    newID += IterableExtensions.head(port.getLabels()).getText();
+                  }
+                  _utilityExtensions.setID(dummyNode, newID);
+                  _kRenderingExtensions.addInvisibleContainerRendering(dummyNode);
+                  dummyNode.getPorts().add(copy);
+                  // Assign layer
+                  DiagramSyntheses.setLayoutOption(
+                      dummyNode,
+                      LayeredOptions.LAYERING_LAYER_CONSTRAINT,
+                      port.getProperty(CoreOptions.PORT_SIDE) == PortSide.WEST
+                          ? LayerConstraint.FIRST
+                          : LayerConstraint.LAST);
+                  // Configure port spacing
+                  DiagramSyntheses.setLayoutOption(
+                      dummyNode,
+                      CoreOptions.PORT_LABELS_PLACEMENT,
+                      EnumSet.of(
+                          PortLabelPlacement.ALWAYS_OTHER_SAME_SIDE, PortLabelPlacement.OUTSIDE));
+                  // Place freely
+                  DiagramSyntheses.setLayoutOption(
+                      dummyNode, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
+                  // Switch port side
+                  DiagramSyntheses.setLayoutOption(
+                      copy,
+                      CoreOptions.PORT_SIDE,
+                      port.getProperty(CoreOptions.PORT_SIDE) == PortSide.WEST
+                          ? PortSide.EAST
+                          : PortSide.WEST);
+
+                  modeNode.getChildren().add(dummyNode);
+                }
+                var newPort = portCopies.get(port);
+                if (sourceIsInMode) {
+                  edge.setTarget(newPort.getNode());
+                  edge.setTargetPort(newPort);
+                } else {
+                  edge.setSource(newPort.getNode());
+                  edge.setSourcePort(newPort);
                 }
+              }
             }
-            
-            nodes.add(modeContainer);
+          }
         }
-    }
-    
-    private boolean hasContent(ModeInstance mode) {
-        return !mode.reactions.isEmpty() || !mode.instantiations.isEmpty();
-    }
-    
-    private KContainerRendering addModeFigure(KNode node, ModeInstance mode, boolean expanded) {
-        int padding = getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS) ? 8 : 6;
-        
-        var figure = _kRenderingExtensions.addRoundedRectangle(node, 13, 13, 1);
-        _kContainerRenderingExtensions.setGridPlacement(figure, 1);
-        _kRenderingExtensions.setLineWidth(figure, mode.isInitial() ? 3f : 1.5f);
-        _kRenderingExtensions.setForeground(figure, MODE_FG);
-        _kRenderingExtensions.setBackground(figure, MODE_BG);
-        var background = _kRenderingExtensions.getBackground(figure);
-        background.setAlpha(MODE_BG_ALPHA);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
-        
-        // Invisible container
-        KRectangle container = _kContainerRenderingExtensions.addRectangle(figure);
-        _kRenderingExtensions.setInvisible(container, true);
-        int bottomPadding = this.hasContent(mode) && expanded ? 4 : padding;
-        var from = _kRenderingExtensions.from(
-                _kRenderingExtensions.setGridPlacementData(container),
-                _kRenderingExtensions.LEFT, padding, 0, _kRenderingExtensions.TOP, padding, 0);
-        _kRenderingExtensions.to(from, _kRenderingExtensions.RIGHT, padding, 0, _kRenderingExtensions.BOTTOM, bottomPadding, 0);
-        
-        // Centered child container
-        KRectangle childContainer = _kContainerRenderingExtensions.addRectangle(container);
-        this._kRenderingExtensions.setInvisible(childContainer, true);
-        this._kRenderingExtensions.setPointPlacementData(childContainer,
-                _kRenderingExtensions.LEFT, 0, 0.5f, _kRenderingExtensions.TOP, 0, 0.5f,
-                _kRenderingExtensions.H_CENTRAL, _kRenderingExtensions.V_CENTRAL, 0, 0, 0, 0);
-        this._kContainerRenderingExtensions.setGridPlacement(childContainer, 1);
-        
-        KText text = _kContainerRenderingExtensions.addText(childContainer, mode.getName());
-        DiagramSyntheses.suppressSelectability(text);
-        _linguaFrancaStyleExtensions.underlineSelectionStyle(text);
-        
-        return figure;
-    }
-    
-    private KContainerRendering addModeContainerFigure(KNode node) {
-        var rect = _kRenderingExtensions.addRectangle(node);
-        _kRenderingExtensions.setLineWidth(rect, 1);
-        _kRenderingExtensions.setLineStyle(rect, LineStyle.DOT);
-        _kRenderingExtensions.setForeground(rect, MODE_FG);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(rect);
-        return rect;
-    }
-    
-    private void addTransitionFigure(KEdge edge, Transition transition) {
-        var spline = _kEdgeExtensions.addSpline(edge);
-        _kRenderingExtensions.setLineWidth(spline, 1.5f);
-        _kRenderingExtensions.setForeground(spline, MODE_FG);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(spline);
-
-        if (transition.type == ModeTransition.HISTORY) {
-            addHistoryDecorator(spline);
-        } else {
-            KRendering arrowDecorator = _kPolylineExtensions.addHeadArrowDecorator(spline);
-            this._kRenderingExtensions.setForeground(arrowDecorator, MODE_FG);
-            this._kRenderingExtensions.setBackground(arrowDecorator, MODE_FG);
-        }
-            
-        if (getBooleanValue(SHOW_TRANSITION_LABELS)) {
-            associateWith(spline, transition.getDefinition());
-            
-            KLabel centerEdgeLabel = _kLabelExtensions.addCenterEdgeLabel(edge, this.toTransitionLabel(transition));
-            associateWith(centerEdgeLabel, transition.getDefinition());
-            applyTransitionOnEdgeStyle(centerEdgeLabel);
+      }
+
+      // If mode container is unused (no ports for local connections) -> hide it
+      if (modeContainer.getPorts().isEmpty()) {
+        _kRenderingExtensions.setInvisible(modeContainerFigure, true);
+        DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.PADDING, new ElkPadding(2));
+      } else if (getBooleanValue(LinguaFrancaSynthesis.SHOW_INSTANCE_NAMES)) {
+        // Remove mode container port labels of ports representing internal connections
+        // because their association to reactor instances is unambiguous due to instance names
+        for (var p : modeContainer.getPorts()) {
+          p.getLabels().removeIf(l -> l.getText().contains("."));
         }
+      }
+
+      nodes.add(modeContainer);
     }
-    
-    private String toTransitionLabel(Transition transition) {
-        var text = new StringBuilder();
-        
-        text.append(transition.reaction.triggers.stream().map(t -> t.getDefinition().getName()).collect(Collectors.joining(", ")));
-        return text.toString();
+  }
+
+  private boolean hasContent(ModeInstance mode) {
+    return !mode.reactions.isEmpty() || !mode.instantiations.isEmpty();
+  }
+
+  private KContainerRendering addModeFigure(KNode node, ModeInstance mode, boolean expanded) {
+    int padding = getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS) ? 8 : 6;
+
+    var figure = _kRenderingExtensions.addRoundedRectangle(node, 13, 13, 1);
+    _kContainerRenderingExtensions.setGridPlacement(figure, 1);
+    _kRenderingExtensions.setLineWidth(figure, mode.isInitial() ? 3f : 1.5f);
+    _kRenderingExtensions.setForeground(figure, MODE_FG);
+    _kRenderingExtensions.setBackground(figure, MODE_BG);
+    var background = _kRenderingExtensions.getBackground(figure);
+    background.setAlpha(MODE_BG_ALPHA);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
+
+    // Invisible container
+    KRectangle container = _kContainerRenderingExtensions.addRectangle(figure);
+    _kRenderingExtensions.setInvisible(container, true);
+    int bottomPadding = this.hasContent(mode) && expanded ? 4 : padding;
+    var from =
+        _kRenderingExtensions.from(
+            _kRenderingExtensions.setGridPlacementData(container),
+            _kRenderingExtensions.LEFT,
+            padding,
+            0,
+            _kRenderingExtensions.TOP,
+            padding,
+            0);
+    _kRenderingExtensions.to(
+        from,
+        _kRenderingExtensions.RIGHT,
+        padding,
+        0,
+        _kRenderingExtensions.BOTTOM,
+        bottomPadding,
+        0);
+
+    // Centered child container
+    KRectangle childContainer = _kContainerRenderingExtensions.addRectangle(container);
+    this._kRenderingExtensions.setInvisible(childContainer, true);
+    this._kRenderingExtensions.setPointPlacementData(
+        childContainer,
+        _kRenderingExtensions.LEFT,
+        0,
+        0.5f,
+        _kRenderingExtensions.TOP,
+        0,
+        0.5f,
+        _kRenderingExtensions.H_CENTRAL,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        0,
+        0);
+    this._kContainerRenderingExtensions.setGridPlacement(childContainer, 1);
+
+    KText text = _kContainerRenderingExtensions.addText(childContainer, mode.getName());
+    DiagramSyntheses.suppressSelectability(text);
+    _linguaFrancaStyleExtensions.underlineSelectionStyle(text);
+
+    return figure;
+  }
+
+  private KContainerRendering addModeContainerFigure(KNode node) {
+    var rect = _kRenderingExtensions.addRectangle(node);
+    _kRenderingExtensions.setLineWidth(rect, 1);
+    _kRenderingExtensions.setLineStyle(rect, LineStyle.DOT);
+    _kRenderingExtensions.setForeground(rect, MODE_FG);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(rect);
+    return rect;
+  }
+
+  private void addTransitionFigure(KEdge edge, Transition transition) {
+    var spline = _kEdgeExtensions.addSpline(edge);
+    _kRenderingExtensions.setLineWidth(spline, 1.5f);
+    _kRenderingExtensions.setForeground(spline, MODE_FG);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(spline);
+
+    if (transition.type == ModeTransition.HISTORY) {
+      addHistoryDecorator(spline);
+    } else {
+      KRendering arrowDecorator = _kPolylineExtensions.addHeadArrowDecorator(spline);
+      this._kRenderingExtensions.setForeground(arrowDecorator, MODE_FG);
+      this._kRenderingExtensions.setBackground(arrowDecorator, MODE_FG);
+    }
+
+    if (getBooleanValue(SHOW_TRANSITION_LABELS)) {
+      associateWith(spline, transition.getDefinition());
+
+      KLabel centerEdgeLabel =
+          _kLabelExtensions.addCenterEdgeLabel(edge, this.toTransitionLabel(transition));
+      associateWith(centerEdgeLabel, transition.getDefinition());
+      applyTransitionOnEdgeStyle(centerEdgeLabel);
     }
-    
-    private static LabelDecorationConfigurator _onEdgeTransitionLabelConfigurator; // ONLY for use in applyTransitionOnEdgeStyle
-    private void applyTransitionOnEdgeStyle(KLabel label) {
-        if (_onEdgeTransitionLabelConfigurator == null) {
-            var foreground = new Color(MODE_FG.getRed(), MODE_FG.getGreen(), MODE_FG.getBlue());
-            var background = new Color(Colors.GRAY_95.getRed(), Colors.GRAY_95.getGreen(), Colors.GRAY_95.getBlue());
-            _onEdgeTransitionLabelConfigurator = LabelDecorationConfigurator.create()
-                .withInlineLabels(true)
-                .withLabelTextRenderingProvider(new ITextRenderingProvider() {
+  }
+
+  private String toTransitionLabel(Transition transition) {
+    var text = new StringBuilder();
+
+    text.append(
+        transition.reaction.triggers.stream()
+            .map(t -> t.getDefinition().getName())
+            .collect(Collectors.joining(", ")));
+    return text.toString();
+  }
+
+  private static LabelDecorationConfigurator
+      _onEdgeTransitionLabelConfigurator; // ONLY for use in applyTransitionOnEdgeStyle
+
+  private void applyTransitionOnEdgeStyle(KLabel label) {
+    if (_onEdgeTransitionLabelConfigurator == null) {
+      var foreground = new Color(MODE_FG.getRed(), MODE_FG.getGreen(), MODE_FG.getBlue());
+      var background =
+          new Color(Colors.GRAY_95.getRed(), Colors.GRAY_95.getGreen(), Colors.GRAY_95.getBlue());
+      _onEdgeTransitionLabelConfigurator =
+          LabelDecorationConfigurator.create()
+              .withInlineLabels(true)
+              .withLabelTextRenderingProvider(
+                  new ITextRenderingProvider() {
                     @Override
                     public KRendering createTextRendering(
-                            KContainerRendering container, KLabel llabel) {
-                        var kText = _kRenderingFactory.createKText();
-                        _kRenderingExtensions.setFontSize(kText, 8);
-                        container.getChildren().add(kText);
-                        return kText;
+                        KContainerRendering container, KLabel llabel) {
+                      var kText = _kRenderingFactory.createKText();
+                      _kRenderingExtensions.setFontSize(kText, 8);
+                      container.getChildren().add(kText);
+                      return kText;
                     }
-                })
-                .addDecoratorRenderingProvider(RectangleDecorator.create().withBackground(background))
-                .addDecoratorRenderingProvider(LinesDecorator.create().withColor(foreground));
-        }
-        _onEdgeTransitionLabelConfigurator.applyTo(label);
-    }
-    
-    private void addHistoryDecorator(KPolyline line) {
-        var decorator = _kPolylineExtensions.addHeadArrowDecorator(line);
-        ((KDecoratorPlacementData) decorator.getPlacementData()).setAbsolute((-15.0f));
-
-        var ellipse = _kContainerRenderingExtensions.addEllipse(line);
-        _kRenderingExtensions.<KEllipse>setDecoratorPlacementData(ellipse, 16, 16, (-6), 1, false);
-        _kRenderingExtensions.setLineWidth(ellipse, 0.8f);
-        _kRenderingExtensions.setForeground(ellipse, MODE_FG);
-        _kRenderingExtensions.setBackground(ellipse, Colors.WHITE);
-        
-        var innerLine = _kContainerRenderingExtensions.addPolyline(ellipse);
-        _kRenderingExtensions.setLineWidth(innerLine, 2);
-        var points = innerLine.getPoints();
-        points.add(_kRenderingExtensions.createKPosition(_kRenderingExtensions.LEFT, 5, 0, _kRenderingExtensions.TOP, 4, 0));
-        points.add(_kRenderingExtensions.createKPosition(_kRenderingExtensions.LEFT, 5, 0, _kRenderingExtensions.BOTTOM, 4, 0));
-        points.add(_kRenderingExtensions.createKPosition(_kRenderingExtensions.LEFT, 5, 0, _kRenderingExtensions.TOP, 0, 0.5f));
-        points.add(_kRenderingExtensions.createKPosition(_kRenderingExtensions.RIGHT, 5, 0, _kRenderingExtensions.TOP, 0, 0.5f));
-        points.add(_kRenderingExtensions.createKPosition(_kRenderingExtensions.RIGHT, 5, 0, _kRenderingExtensions.BOTTOM, 4, 0));
-        points.add(_kRenderingExtensions.createKPosition(_kRenderingExtensions.RIGHT, 5, 0, _kRenderingExtensions.TOP, 4, 0));
-        _kRenderingExtensions.setForeground(innerLine, MODE_FG);
+                  })
+              .addDecoratorRenderingProvider(RectangleDecorator.create().withBackground(background))
+              .addDecoratorRenderingProvider(LinesDecorator.create().withColor(foreground));
     }
-    
-}
\ No newline at end of file
+    _onEdgeTransitionLabelConfigurator.applyTo(label);
+  }
+
+  private void addHistoryDecorator(KPolyline line) {
+    var decorator = _kPolylineExtensions.addHeadArrowDecorator(line);
+    ((KDecoratorPlacementData) decorator.getPlacementData()).setAbsolute((-15.0f));
+
+    var ellipse = _kContainerRenderingExtensions.addEllipse(line);
+    _kRenderingExtensions.<KEllipse>setDecoratorPlacementData(ellipse, 16, 16, (-6), 1, false);
+    _kRenderingExtensions.setLineWidth(ellipse, 0.8f);
+    _kRenderingExtensions.setForeground(ellipse, MODE_FG);
+    _kRenderingExtensions.setBackground(ellipse, Colors.WHITE);
+
+    var innerLine = _kContainerRenderingExtensions.addPolyline(ellipse);
+    _kRenderingExtensions.setLineWidth(innerLine, 2);
+    var points = innerLine.getPoints();
+    points.add(
+        _kRenderingExtensions.createKPosition(
+            _kRenderingExtensions.LEFT, 5, 0, _kRenderingExtensions.TOP, 4, 0));
+    points.add(
+        _kRenderingExtensions.createKPosition(
+            _kRenderingExtensions.LEFT, 5, 0, _kRenderingExtensions.BOTTOM, 4, 0));
+    points.add(
+        _kRenderingExtensions.createKPosition(
+            _kRenderingExtensions.LEFT, 5, 0, _kRenderingExtensions.TOP, 0, 0.5f));
+    points.add(
+        _kRenderingExtensions.createKPosition(
+            _kRenderingExtensions.RIGHT, 5, 0, _kRenderingExtensions.TOP, 0, 0.5f));
+    points.add(
+        _kRenderingExtensions.createKPosition(
+            _kRenderingExtensions.RIGHT, 5, 0, _kRenderingExtensions.BOTTOM, 4, 0));
+    points.add(
+        _kRenderingExtensions.createKPosition(
+            _kRenderingExtensions.RIGHT, 5, 0, _kRenderingExtensions.TOP, 4, 0));
+    _kRenderingExtensions.setForeground(innerLine, MODE_FG);
+  }
+}
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/util/NamedInstanceUtil.java b/org.lflang/src/org/lflang/diagram/synthesis/util/NamedInstanceUtil.java
index e7143b44fc..ab2edc658a 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/util/NamedInstanceUtil.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/util/NamedInstanceUtil.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.util;
 
 import de.cau.cs.kieler.klighd.kgraph.KGraphElement;
@@ -31,28 +31,24 @@
 
 /**
  * Utility class to link KGraphElements to NamedInstances.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class NamedInstanceUtil {
-    public static final Property<NamedInstance<?>> LINKED_INSTANCE = new Property<>(
-            "org.lflang.linguafranca.diagram.synthesis.graph.instance");
+  public static final Property<NamedInstance<?>> LINKED_INSTANCE =
+      new Property<>("org.lflang.linguafranca.diagram.synthesis.graph.instance");
 
-    /**
-     * Establishes a link between KGraphElement and NamedInstance.
-     */
-    public static IPropertyHolder linkInstance(KGraphElement elem, NamedInstance<?> instance) {
-        return elem.setProperty(LINKED_INSTANCE, instance);
-    }
+  /** Establishes a link between KGraphElement and NamedInstance. */
+  public static IPropertyHolder linkInstance(KGraphElement elem, NamedInstance<?> instance) {
+    return elem.setProperty(LINKED_INSTANCE, instance);
+  }
 
-    /**
-     * Returns the linked NamedInstance for the given KGraphElement.
-     */
-    public static NamedInstance<?> getLinkedInstance(KGraphElement elem) {
-        var instance = elem.getProperty(LINKED_INSTANCE);
-        if (instance != null) {
-            return instance;
-        }
-        return null;
+  /** Returns the linked NamedInstance for the given KGraphElement. */
+  public static NamedInstance<?> getLinkedInstance(KGraphElement elem) {
+    var instance = elem.getProperty(LINKED_INSTANCE);
+    if (instance != null) {
+      return instance;
     }
+    return null;
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/util/ReactorIcons.java b/org.lflang/src/org/lflang/diagram/synthesis/util/ReactorIcons.java
index e740ebf653..a69b7d3e4f 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/util/ReactorIcons.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/util/ReactorIcons.java
@@ -1,146 +1,148 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.util;
 
-//import org.eclipse.swt.graphics.ImageData;
-//import org.eclipse.swt.graphics.ImageLoader;
-import org.eclipse.xtext.xbase.lib.Extension;
-import org.lflang.AttributeUtils;
-import org.lflang.diagram.synthesis.AbstractSynthesisExtensions;
-import org.lflang.lf.ReactorDecl;
-import org.lflang.util.FileUtil;
-
+// import org.eclipse.swt.graphics.ImageData;
+// import org.eclipse.swt.graphics.ImageLoader;
 import com.google.inject.Inject;
-
 import de.cau.cs.kieler.klighd.krendering.KContainerRendering;
 import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
 import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensions;
 import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions;
+import org.eclipse.xtext.xbase.lib.Extension;
+import org.lflang.AttributeUtils;
+import org.lflang.diagram.synthesis.AbstractSynthesisExtensions;
+import org.lflang.lf.ReactorDecl;
+import org.lflang.util.FileUtil;
 
 /**
  * Utility class to handle icons for reactors in Lingua Franca diagrams.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 @ViewSynthesisShared
 public class ReactorIcons extends AbstractSynthesisExtensions {
 
-    @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
-    @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
-    
-//    private static final ImageLoader LOADER = new ImageLoader();
-    
-    // Image cache during synthesis
-//    private final HashMap<java.net.URI, ImageData> cache = new HashMap<>();
-    
-    // Error message
-    private String error = null;
+  @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
+  @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
+
+  //    private static final ImageLoader LOADER = new ImageLoader();
+
+  // Image cache during synthesis
+  //    private final HashMap<java.net.URI, ImageData> cache = new HashMap<>();
+
+  // Error message
+  private String error = null;
 
-    public void handleIcon(KContainerRendering rendering, ReactorDecl reactor, boolean collapsed) {
-        if (!collapsed) {
-            return;
-        }
-        
-        // Reset error
-        error = null;
-        
-        // Get annotation
-        var iconPath = AttributeUtils.getIconPath(reactor);
-        if (iconPath != null && !iconPath.isEmpty()) {
-            var iconLocation = FileUtil.locateFile(iconPath, reactor.eResource());
-            if (iconLocation == null) {
-                error = "Cannot find given icon file.";
-            } else {
-                /*
-                 * This code was disabled because it cannot be compiled for the language server with Gradle.
-                 * As soon as the Klighd API is extended to support URI-based images in both Eclipse and VSCode,
-                 * this code should be reactivated and adapted.
-                 * See: https://github.com/kieler/KLighD/issues/146
-                 */
-//                ImageData data = loadImage(iconLocation);
-//                if (data != null) {
-//                    KRectangle figure = _kContainerRenderingExtensions.addRectangle(rendering);
-//                    _kRenderingExtensions.setInvisible(figure, true);
-//                    KGridPlacementData figurePlacement = _kRenderingExtensions.setGridPlacementData(figure, data.width, data.height);
-//                    _kRenderingExtensions.to(
-//                            _kRenderingExtensions.from(
-//                                    figurePlacement, 
-//                                    _kRenderingExtensions.LEFT, 3, 0,
-//                                    _kRenderingExtensions.TOP, 0, 0), 
-//                            _kRenderingExtensions.RIGHT, 3, 0, 
-//                            _kRenderingExtensions.BOTTOM, 3, 0);
-//                    
-//                    KRectangle icon = _kContainerRenderingExtensions.addRectangle(figure);
-//                    _kRenderingExtensions.setInvisible(icon, true);
-//                    _kContainerRenderingExtensions.addImage(icon, data);
-//                    _kRenderingExtensions.setPointPlacementData(icon, 
-//                            _kRenderingExtensions.createKPosition(
-//                                    _kRenderingExtensions.LEFT, 0, 0.5f, 
-//                                    _kRenderingExtensions.TOP, 0, 0.5f), 
-//                            _kRenderingExtensions.H_CENTRAL, _kRenderingExtensions.V_CENTRAL, 0,
-//                            0, data.width, data.height);
-//                }
-//                if (error != null) {
-//                    var errorText = _kContainerRenderingExtensions.addText(rendering, "Icon not found!\n"+error);
-//                    _kRenderingExtensions.setForeground(errorText, Colors.RED);
-//                    _kRenderingExtensions.setFontBold(errorText, true);
-//                    _kRenderingExtensions.setSurroundingSpaceGrid(errorText, 8, 0);
-//                }
-            }
-        }
+  public void handleIcon(KContainerRendering rendering, ReactorDecl reactor, boolean collapsed) {
+    if (!collapsed) {
+      return;
     }
 
-//    private ImageData loadImage(final java.net.URI uri) {
-//        try {
-//            if (cache.containsKey(uri)) {
-//                return cache.get(uri);
-//            }
-//            synchronized (LOADER) {
-//                InputStream inStream = null;
-//                try {
-//                    inStream = uri.toURL().openStream();
-//                    ImageData[] data = LOADER.load(inStream);
-//                    if (data != null && data.length > 0) {
-//                        ImageData img = data[0];
-//                        cache.put(uri, img);
-//                        return img;
-//                    } else {
-//                        error = "Could not load icon image.";
-//                        return null;
-//                    }
-//                } finally {
-//                    if (inStream != null) {
-//                        inStream.close();
-//                    }
-//                }
-//            }
-//        } catch (Exception ex) {
-//            ex.printStackTrace();
-//            error = "Could not load icon image.";
-//            return null;
-//        }
-//    }
-    
+    // Reset error
+    error = null;
+
+    // Get annotation
+    var iconPath = AttributeUtils.getIconPath(reactor);
+    if (iconPath != null && !iconPath.isEmpty()) {
+      var iconLocation = FileUtil.locateFile(iconPath, reactor.eResource());
+      if (iconLocation == null) {
+        error = "Cannot find given icon file.";
+      } else {
+        /*
+         * This code was disabled because it cannot be compiled for the language server with Gradle.
+         * As soon as the Klighd API is extended to support URI-based images in both Eclipse and VSCode,
+         * this code should be reactivated and adapted.
+         * See: https://github.com/kieler/KLighD/issues/146
+         */
+        //                ImageData data = loadImage(iconLocation);
+        //                if (data != null) {
+        //                    KRectangle figure =
+        // _kContainerRenderingExtensions.addRectangle(rendering);
+        //                    _kRenderingExtensions.setInvisible(figure, true);
+        //                    KGridPlacementData figurePlacement =
+        // _kRenderingExtensions.setGridPlacementData(figure, data.width, data.height);
+        //                    _kRenderingExtensions.to(
+        //                            _kRenderingExtensions.from(
+        //                                    figurePlacement,
+        //                                    _kRenderingExtensions.LEFT, 3, 0,
+        //                                    _kRenderingExtensions.TOP, 0, 0),
+        //                            _kRenderingExtensions.RIGHT, 3, 0,
+        //                            _kRenderingExtensions.BOTTOM, 3, 0);
+        //
+        //                    KRectangle icon = _kContainerRenderingExtensions.addRectangle(figure);
+        //                    _kRenderingExtensions.setInvisible(icon, true);
+        //                    _kContainerRenderingExtensions.addImage(icon, data);
+        //                    _kRenderingExtensions.setPointPlacementData(icon,
+        //                            _kRenderingExtensions.createKPosition(
+        //                                    _kRenderingExtensions.LEFT, 0, 0.5f,
+        //                                    _kRenderingExtensions.TOP, 0, 0.5f),
+        //                            _kRenderingExtensions.H_CENTRAL,
+        // _kRenderingExtensions.V_CENTRAL, 0,
+        //                            0, data.width, data.height);
+        //                }
+        //                if (error != null) {
+        //                    var errorText = _kContainerRenderingExtensions.addText(rendering,
+        // "Icon not found!\n"+error);
+        //                    _kRenderingExtensions.setForeground(errorText, Colors.RED);
+        //                    _kRenderingExtensions.setFontBold(errorText, true);
+        //                    _kRenderingExtensions.setSurroundingSpaceGrid(errorText, 8, 0);
+        //                }
+      }
+    }
+  }
+
+  //    private ImageData loadImage(final java.net.URI uri) {
+  //        try {
+  //            if (cache.containsKey(uri)) {
+  //                return cache.get(uri);
+  //            }
+  //            synchronized (LOADER) {
+  //                InputStream inStream = null;
+  //                try {
+  //                    inStream = uri.toURL().openStream();
+  //                    ImageData[] data = LOADER.load(inStream);
+  //                    if (data != null && data.length > 0) {
+  //                        ImageData img = data[0];
+  //                        cache.put(uri, img);
+  //                        return img;
+  //                    } else {
+  //                        error = "Could not load icon image.";
+  //                        return null;
+  //                    }
+  //                } finally {
+  //                    if (inStream != null) {
+  //                        inStream.close();
+  //                    }
+  //                }
+  //            }
+  //        } catch (Exception ex) {
+  //            ex.printStackTrace();
+  //            error = "Could not load icon image.";
+  //            return null;
+  //        }
+  //    }
+
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java b/org.lflang/src/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
index fdf5070713..a249c009fd 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.util;
 
 import java.nio.file.Path;
@@ -32,53 +32,53 @@
  * @author Alexander Schulz-Rosengarten
  */
 public class SynthesisErrorReporter implements ErrorReporter {
-    @Override
-    public String reportError(String message) {
-        return null;
-    }
-    
-    @Override
-    public String reportError(EObject object, String message) {
-        return null;
-    }
-    
-    @Override
-    public String reportError(Path file, Integer line, String message) {
-        return null;
-    }
-    
-    @Override
-    public String reportWarning(String message) {
-        return null;
-    }
-    
-    @Override
-    public String reportWarning(EObject object, String message) {
-        return null;
-    }
-    
-    @Override
-    public String reportWarning(Path file, Integer line, String message) {
-        return null;
-    }
+  @Override
+  public String reportError(String message) {
+    return null;
+  }
 
-    @Override
-    public String reportInfo(String message) {
-        return null;
-    }
+  @Override
+  public String reportError(EObject object, String message) {
+    return null;
+  }
 
-    @Override
-    public String reportInfo(EObject object, String message) {
-        return null;
-    }
+  @Override
+  public String reportError(Path file, Integer line, String message) {
+    return null;
+  }
 
-    @Override
-    public String reportInfo(Path file, Integer line, String message) {
-        return null;
-    }
+  @Override
+  public String reportWarning(String message) {
+    return null;
+  }
 
-    @Override
-    public boolean getErrorsOccurred() {
-        return false;
-    }
-}
\ No newline at end of file
+  @Override
+  public String reportWarning(EObject object, String message) {
+    return null;
+  }
+
+  @Override
+  public String reportWarning(Path file, Integer line, String message) {
+    return null;
+  }
+
+  @Override
+  public String reportInfo(String message) {
+    return null;
+  }
+
+  @Override
+  public String reportInfo(EObject object, String message) {
+    return null;
+  }
+
+  @Override
+  public String reportInfo(Path file, Integer line, String message) {
+    return null;
+  }
+
+  @Override
+  public boolean getErrorsOccurred() {
+    return false;
+  }
+}
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/util/UtilityExtensions.java b/org.lflang/src/org/lflang/diagram/synthesis/util/UtilityExtensions.java
index fb97bd1449..ca83da41a8 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/util/UtilityExtensions.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/util/UtilityExtensions.java
@@ -1,33 +1,38 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.util;
 
+import de.cau.cs.kieler.klighd.internal.util.KlighdInternalProperties;
+import de.cau.cs.kieler.klighd.kgraph.KGraphElement;
+import de.cau.cs.kieler.klighd.kgraph.KGraphFactory;
+import de.cau.cs.kieler.klighd.kgraph.KIdentifier;
+import de.cau.cs.kieler.klighd.kgraph.KNode;
+import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import org.eclipse.elk.core.math.ElkMargin;
 import org.eclipse.elk.core.options.CoreOptions;
 import org.eclipse.elk.core.util.IndividualSpacings;
@@ -39,163 +44,133 @@
 import org.lflang.diagram.synthesis.AbstractSynthesisExtensions;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Code;
-import org.lflang.lf.Expression;
-import org.lflang.lf.Host;
-import org.lflang.lf.Literal;
-import org.lflang.lf.ParameterReference;
 import org.lflang.lf.Reactor;
-import org.lflang.lf.Time;
-import org.lflang.util.StringUtil;
-
-import de.cau.cs.kieler.klighd.internal.util.KlighdInternalProperties;
-import de.cau.cs.kieler.klighd.kgraph.KGraphElement;
-import de.cau.cs.kieler.klighd.kgraph.KGraphFactory;
-import de.cau.cs.kieler.klighd.kgraph.KIdentifier;
-import de.cau.cs.kieler.klighd.kgraph.KNode;
-import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
 
 /**
  * Extension class that provides various utility methods for the synthesis.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 @ViewSynthesisShared
 public class UtilityExtensions extends AbstractSynthesisExtensions {
-    
-    @Extension
-    private KGraphFactory _kGraphFactory = KGraphFactory.eINSTANCE;
-
-    
-    /**
-     * Returns true if the reactor is the primary reactor
-     */
-    public boolean isMainOrFederated(Reactor reactor) {
-        return reactor.isMain() || reactor.isFederated();
-    }
-    
-    /**
-     * Returns true if the instance is a bank of reactors
-     */
-//    def boolean isBank(Instantiation ins) {
-//        return ins?.widthSpec !== null ? ins.widthSpec.width !== 1 : false
-//    }
-    
-    /**
-     * Returns true if the reactor as has inner reactions or instances
-     */
-    public boolean hasContent(final ReactorInstance reactor) {
-        return !reactor.reactions.isEmpty() || !reactor.instantiations().isEmpty();
-    }
-    
-    /**
-     * 
-     */
-    public boolean isRoot(final ReactorInstance ri) {
-        return ri.getParent() == null;
+
+  @Extension private KGraphFactory _kGraphFactory = KGraphFactory.eINSTANCE;
+
+  /** Returns true if the reactor is the primary reactor */
+  public boolean isMainOrFederated(Reactor reactor) {
+    return reactor.isMain() || reactor.isFederated();
+  }
+
+  /** Returns true if the instance is a bank of reactors */
+  //    def boolean isBank(Instantiation ins) {
+  //        return ins?.widthSpec !== null ? ins.widthSpec.width !== 1 : false
+  //    }
+
+  /** Returns true if the reactor as has inner reactions or instances */
+  public boolean hasContent(final ReactorInstance reactor) {
+    return !reactor.reactions.isEmpty() || !reactor.instantiations().isEmpty();
+  }
+
+  /** */
+  public boolean isRoot(final ReactorInstance ri) {
+    return ri.getParent() == null;
+  }
+
+  /** Trims the hostcode of reactions. */
+  public String trimCode(final Code tokenizedCode) {
+    if (tokenizedCode == null || StringExtensions.isNullOrEmpty(tokenizedCode.getBody())) {
+      return "";
     }
-    
-    /**
-     * Trims the hostcode of reactions.
-     */
-    public String trimCode(final Code tokenizedCode) {
-        if (tokenizedCode == null || StringExtensions.isNullOrEmpty(tokenizedCode.getBody())) {
-            return "";
+    try {
+      ICompositeNode node = NodeModelUtils.findActualNodeFor(tokenizedCode);
+      String code = node != null ? node.getText() : null;
+      int contentStart = 0;
+      List<String> lines = new ArrayList<>();
+      Arrays.stream(code.split("\n"))
+          .dropWhile(line -> !line.contains("{="))
+          .forEachOrdered(lines::add);
+
+      // Remove start pattern
+      if (!lines.isEmpty()) {
+        if (IterableExtensions.head(lines).trim().equals("{=")) {
+          lines.remove(0); // skip
+        } else {
+          lines.set(0, IterableExtensions.head(lines).replace("{=", "").trim());
+          contentStart = 1;
         }
-        try {
-            ICompositeNode node = NodeModelUtils.findActualNodeFor(tokenizedCode);
-            String code = node != null ? node.getText() : null;
-            int contentStart = 0;
-            List<String> lines = new ArrayList<>();
-            Arrays.stream(code.split("\n")).dropWhile(line -> !line.contains("{=")).forEachOrdered(lines::add);
-            
-            // Remove start pattern
-            if (!lines.isEmpty()) {
-                if (IterableExtensions.head(lines).trim().equals("{=")) {
-                    lines.remove(0); // skip
-                } else {
-                    lines.set(0, IterableExtensions.head(lines).replace("{=", "").trim());
-                    contentStart = 1;
-                }
-            }
-            
-            // Remove end pattern
-            if (!lines.isEmpty()) {
-                if (IterableExtensions.last(lines).trim().equals("=}")) {
-                    lines.remove(lines.size() - 1); // skip
-                } else {
-                    lines.set(lines.size() - 1, IterableExtensions.last(lines).replace("=}", ""));
-                }
-            }
-            
-            // Find indentation
-            String indentation = null;
-            while (indentation == null && lines.size() > contentStart) {
-                String firstLine = lines.get(contentStart);
-                String trimmed = firstLine.trim();
-                if (trimmed.isEmpty()) {
-                    lines.set(contentStart, "");
-                    contentStart++;
-                } else {
-                    int firstCharIdx = firstLine.indexOf(trimmed.charAt(0));
-                    indentation = firstLine.substring(0, firstCharIdx);
-                }
-            }
-            
-            // Remove root indentation
-            if (!lines.isEmpty()) {
-                for (int i = 0; i < lines.size(); i++) {
-                    if (lines.get(i).startsWith(indentation)) {
-                        lines.set(i, lines.get(i).substring(indentation.length()));
-                    }
-                }
-            }
-            
-            return String.join("\n", lines);
-        } catch(Exception e) {
-            e.printStackTrace();
-            return tokenizedCode.getBody();
+      }
+
+      // Remove end pattern
+      if (!lines.isEmpty()) {
+        if (IterableExtensions.last(lines).trim().equals("=}")) {
+          lines.remove(lines.size() - 1); // skip
+        } else {
+          lines.set(lines.size() - 1, IterableExtensions.last(lines).replace("=}", ""));
         }
-    }
-    
-    /**
-     * Sets KGE ID.
-     */
-    public boolean setID(KGraphElement kge, String id) {
-        KIdentifier identifier  = _kGraphFactory.createKIdentifier();
-        identifier.setId(id);
-        return kge.getData().add(identifier);
-    }
-    
-    /**
-     * Retrieves the source element of the given diagram element
-     */
-    public Object sourceElement(KGraphElement elem) {
-        return elem.getProperty(KlighdInternalProperties.MODEL_ELEMEMT);
-    }
-    
-    /**
-     * Checks if the source element of the given diagram element is a reactor
-     */
-    public boolean sourceIsReactor(KNode node) {
-        return sourceElement(node) instanceof Reactor;
-    }
+      }
 
-    /**
-     * Returns the port placement margins for the node.
-     * If this spacing does not yet exist, the properties are initialized.
-     */
-    public ElkMargin getPortMarginsInitIfAbsent(KNode node) {
-        IndividualSpacings spacing = node.getProperty(CoreOptions.SPACING_INDIVIDUAL);
-        if (spacing == null) {
-            spacing = new IndividualSpacings();
-            node.setProperty(CoreOptions.SPACING_INDIVIDUAL, spacing);
+      // Find indentation
+      String indentation = null;
+      while (indentation == null && lines.size() > contentStart) {
+        String firstLine = lines.get(contentStart);
+        String trimmed = firstLine.trim();
+        if (trimmed.isEmpty()) {
+          lines.set(contentStart, "");
+          contentStart++;
+        } else {
+          int firstCharIdx = firstLine.indexOf(trimmed.charAt(0));
+          indentation = firstLine.substring(0, firstCharIdx);
         }
-        ElkMargin margin = spacing.getProperty(CoreOptions.SPACING_PORTS_SURROUNDING);
-        if (margin == null) {
-            margin = new ElkMargin();
-            node.setProperty(CoreOptions.SPACING_PORTS_SURROUNDING, margin);
+      }
+
+      // Remove root indentation
+      if (!lines.isEmpty()) {
+        for (int i = 0; i < lines.size(); i++) {
+          if (lines.get(i).startsWith(indentation)) {
+            lines.set(i, lines.get(i).substring(indentation.length()));
+          }
         }
-        return margin;
-    }    
+      }
+
+      return String.join("\n", lines);
+    } catch (Exception e) {
+      e.printStackTrace();
+      return tokenizedCode.getBody();
+    }
+  }
+
+  /** Sets KGE ID. */
+  public boolean setID(KGraphElement kge, String id) {
+    KIdentifier identifier = _kGraphFactory.createKIdentifier();
+    identifier.setId(id);
+    return kge.getData().add(identifier);
+  }
 
+  /** Retrieves the source element of the given diagram element */
+  public Object sourceElement(KGraphElement elem) {
+    return elem.getProperty(KlighdInternalProperties.MODEL_ELEMEMT);
+  }
+
+  /** Checks if the source element of the given diagram element is a reactor */
+  public boolean sourceIsReactor(KNode node) {
+    return sourceElement(node) instanceof Reactor;
+  }
+
+  /**
+   * Returns the port placement margins for the node. If this spacing does not yet exist, the
+   * properties are initialized.
+   */
+  public ElkMargin getPortMarginsInitIfAbsent(KNode node) {
+    IndividualSpacings spacing = node.getProperty(CoreOptions.SPACING_INDIVIDUAL);
+    if (spacing == null) {
+      spacing = new IndividualSpacings();
+      node.setProperty(CoreOptions.SPACING_INDIVIDUAL, spacing);
+    }
+    ElkMargin margin = spacing.getProperty(CoreOptions.SPACING_PORTS_SURROUNDING);
+    if (margin == null) {
+      margin = new ElkMargin();
+      node.setProperty(CoreOptions.SPACING_PORTS_SURROUNDING, margin);
+    }
+    return margin;
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtension.java b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
index 18b5d9615a..121cf5d817 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
@@ -33,14 +33,13 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedASTUtils;
 import org.lflang.federated.generator.FedConnectionInstance;
 import org.lflang.federated.generator.FedFileConfig;
@@ -59,708 +58,763 @@
 import org.lflang.lf.VarRef;
 
 /**
- * An extension class to the CGenerator that enables certain federated
- * functionalities. Currently, this class offers the following features:
+ * An extension class to the CGenerator that enables certain federated functionalities. Currently,
+ * this class offers the following features:
  *
  * <ul>
- * <li>Allocating and initializing C structures for federated communication</li>
- * <li>Creating status field for network input ports that help the receiver logic in
- * federate.c communicate the status of a network input port with network input
- * control reactions.</li>
+ *   <li>Allocating and initializing C structures for federated communication
+ *   <li>Creating status field for network input ports that help the receiver logic in federate.c
+ *       communicate the status of a network input port with network input control reactions.
  * </ul>
  *
  * @author {Soroush Bateni <soroush@berkeley.edu>}
  * @author {Hou Seng Wong <housengw@berkeley.edu>}
  * @author {Billy Bao <billybao@berkeley.edu>}
- *
  */
 public class CExtension implements FedTargetExtension {
 
-    @Override
-    public void initializeTargetConfig(
-        LFGeneratorContext context,
-        int numOfFederates, FederateInstance federate,
-        FedFileConfig fileConfig,
-        ErrorReporter errorReporter,
-        RtiConfig rtiConfig
-    ) throws IOException {
-
-        CExtensionUtils.handleCompileDefinitions(federate, numOfFederates, rtiConfig);
-
-        generateCMakeInclude(federate, fileConfig);
-
-        federate.targetConfig.keepalive = true;
-        federate.targetConfig.setByUser.add(TargetProperty.KEEPALIVE);
-
-        // If there are federates, copy the required files for that.
-        // Also, create the RTI C file and the launcher script.
-        // Handle target parameters.
-        // If the program is federated, then ensure that threading is enabled.
-        federate.targetConfig.threading = true;
-        federate.targetConfig.setByUser.add(TargetProperty.THREADING);
-
-        // Include the fed setup file for this federate in the target property
-        String relPath = getPreamblePath(federate);
-        federate.targetConfig.fedSetupPreamble = relPath;
-        federate.targetConfig.setByUser.add(TargetProperty.FED_SETUP);
+  @Override
+  public void initializeTargetConfig(
+      LFGeneratorContext context,
+      int numOfFederates,
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      ErrorReporter errorReporter,
+      RtiConfig rtiConfig)
+      throws IOException {
+
+    CExtensionUtils.handleCompileDefinitions(federate, numOfFederates, rtiConfig);
+
+    generateCMakeInclude(federate, fileConfig);
+
+    federate.targetConfig.keepalive = true;
+    federate.targetConfig.setByUser.add(TargetProperty.KEEPALIVE);
+
+    // If there are federates, copy the required files for that.
+    // Also, create the RTI C file and the launcher script.
+    // Handle target parameters.
+    // If the program is federated, then ensure that threading is enabled.
+    federate.targetConfig.threading = true;
+    federate.targetConfig.setByUser.add(TargetProperty.THREADING);
+
+    // Include the fed setup file for this federate in the target property
+    String relPath = getPreamblePath(federate);
+    federate.targetConfig.fedSetupPreamble = relPath;
+    federate.targetConfig.setByUser.add(TargetProperty.FED_SETUP);
+  }
+
+  /** Generate a cmake-include file for {@code federate} if needed. */
+  protected void generateCMakeInclude(FederateInstance federate, FedFileConfig fileConfig)
+      throws IOException {
+    CExtensionUtils.generateCMakeInclude(federate, fileConfig);
+  }
+
+  /**
+   * Generate code for the body of a reaction that handles the action that is triggered by receiving
+   * a message from a remote federate.
+   *
+   * @param action The action.
+   * @param sendingPort The output port providing the data to send.
+   * @param receivingPort The ID of the destination port.
+   * @param connection FIXME
+   * @param type FIXME
+   * @param coordinationType The coordination type
+   * @param errorReporter
+   */
+  public String generateNetworkReceiverBody(
+      Action action,
+      VarRef sendingPort,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      CoordinationType coordinationType,
+      ErrorReporter errorReporter) {
+    var receiveRef =
+        CUtil.portRefInReaction(receivingPort, connection.getDstBank(), connection.getDstChannel());
+    var result = new CodeBuilder();
+    // We currently have no way to mark a reaction "unordered"
+    // in the AST, so we use a magic string at the start of the body.
+    result.pr("// " + ReactionInstance.UNORDERED_REACTION_MARKER);
+    // Transfer the physical time of arrival from the action to the port
+    result.pr(
+        receiveRef
+            + "->physical_time_of_arrival = self->_lf__"
+            + action.getName()
+            + ".physical_time_of_arrival;");
+    if (coordinationType == CoordinationType.DECENTRALIZED
+        && !connection.getDefinition().isPhysical()) {
+      // Transfer the intended tag.
+      result.pr(
+          receiveRef + "->intended_tag = self->_lf__" + action.getName() + ".intended_tag;\n");
     }
 
-    /**
-     * Generate a cmake-include file for {@code federate} if needed.
-     */
-    protected void generateCMakeInclude(FederateInstance federate, FedFileConfig fileConfig) throws IOException {
-        CExtensionUtils.generateCMakeInclude(federate, fileConfig);
+    deserialize(action, receivingPort, connection, type, receiveRef, result, errorReporter);
+    return result.toString();
+  }
+
+  /**
+   * Generate code to deserialize a message received over the network.
+   *
+   * @param action The network action that is mapped to the {@code receivingPort}
+   * @param receivingPort The receiving port
+   * @param connection The connection used to receive the message
+   * @param type Type for the port
+   * @param receiveRef A target language reference to the receiving port
+   * @param result Used to put generated code in
+   * @param errorReporter Used to report errors, if any
+   */
+  protected void deserialize(
+      Action action,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      String receiveRef,
+      CodeBuilder result,
+      ErrorReporter errorReporter) {
+    CTypes types = new CTypes();
+    // Adjust the type of the action and the receivingPort.
+    // If it is "string", then change it to "char*".
+    // This string is dynamically allocated, and type 'string' is to be
+    // used only for statically allocated strings. This would force the
+    // CGenerator to treat the port and action as token types.
+    if (types.getTargetType(action).equals("string")) {
+      action.getType().setCode(null);
+      action.getType().setId("char*");
     }
-
-    /**
-     * Generate code for the body of a reaction that handles the
-     * action that is triggered by receiving a message from a remote
-     * federate.
-     * @param action The action.
-     * @param sendingPort The output port providing the data to send.
-     * @param receivingPort The ID of the destination port.
-     * @param connection FIXME
-     * @param type FIXME
-     * @param coordinationType The coordination type
-     * @param errorReporter
-     */
-    public String generateNetworkReceiverBody(
-        Action action,
-        VarRef sendingPort,
-        VarRef receivingPort,
-        FedConnectionInstance connection,
-        InferredType type,
-        CoordinationType coordinationType,
-        ErrorReporter errorReporter
-    ) {
-        var receiveRef = CUtil.portRefInReaction(receivingPort, connection.getDstBank(), connection.getDstChannel());
-        var result = new CodeBuilder();
-        // We currently have no way to mark a reaction "unordered"
-        // in the AST, so we use a magic string at the start of the body.
-        result.pr("// " + ReactionInstance.UNORDERED_REACTION_MARKER);
-        // Transfer the physical time of arrival from the action to the port
-        result.pr(receiveRef+"->physical_time_of_arrival = self->_lf__"+action.getName()+".physical_time_of_arrival;");
-        if (coordinationType == CoordinationType.DECENTRALIZED && !connection.getDefinition().isPhysical()) {
-            // Transfer the intended tag.
-            result.pr(receiveRef+"->intended_tag = self->_lf__"+action.getName()+".intended_tag;\n");
-        }
-
-        deserialize(action, receivingPort, connection, type, receiveRef, result, errorReporter);
-        return result.toString();
+    if (types.getTargetType((Port) receivingPort.getVariable()).equals("string")) {
+      ((Port) receivingPort.getVariable()).getType().setCode(null);
+      ((Port) receivingPort.getVariable()).getType().setId("char*");
     }
-
-    /**
-     * Generate code to deserialize a message received over the network.
-     * @param action The network action that is mapped to the {@code receivingPort}
-     * @param receivingPort The receiving port
-     * @param connection The connection used to receive the message
-     * @param type Type for the port
-     * @param receiveRef A target language reference to the receiving port
-     * @param result Used to put generated code in
-     * @param errorReporter Used to report errors, if any
-     */
-    protected void deserialize(
-        Action action,
-        VarRef receivingPort,
-        FedConnectionInstance connection,
-        InferredType type,
-        String receiveRef,
-        CodeBuilder result,
-        ErrorReporter errorReporter
-    ) {
-        CTypes types = new CTypes();
-        // Adjust the type of the action and the receivingPort.
-        // If it is "string", then change it to "char*".
-        // This string is dynamically allocated, and type 'string' is to be
-        // used only for statically allocated strings. This would force the
-        // CGenerator to treat the port and action as token types.
-        if (types.getTargetType(action).equals("string")) {
-            action.getType().setCode(null);
-            action.getType().setId("char*");
+    var value = "";
+    switch (connection.getSerializer()) {
+      case NATIVE:
+        {
+          // NOTE: Docs say that malloc'd char* is freed on conclusion of the time step.
+          // So passing it downstream should be OK.
+          value = action.getName() + "->value";
+          if (CUtil.isTokenType(type, types)) {
+            result.pr("lf_set_token(" + receiveRef + ", " + action.getName() + "->token);");
+          } else {
+            result.pr("lf_set(" + receiveRef + ", " + value + ");");
+          }
+          break;
         }
-        if (types.getTargetType((Port) receivingPort.getVariable()).equals("string")) {
-            ((Port) receivingPort.getVariable()).getType().setCode(null);
-            ((Port) receivingPort.getVariable()).getType().setId("char*");
+      case PROTO:
+        {
+          throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
         }
-        var value = "";
-        switch (connection.getSerializer()) {
-        case NATIVE: {
-            // NOTE: Docs say that malloc'd char* is freed on conclusion of the time step.
-            // So passing it downstream should be OK.
-            value = action.getName()+"->value";
-            if (CUtil.isTokenType(type, types)) {
-                result.pr("lf_set_token("+ receiveRef +", "+ action.getName()+"->token);");
-            } else {
-                result.pr("lf_set("+ receiveRef +", "+value+");");
+      case ROS2:
+        {
+          var portType = ASTUtils.getInferredType(((Port) receivingPort.getVariable()));
+          var portTypeStr = types.getTargetType(portType);
+          if (CUtil.isTokenType(portType, types)) {
+            throw new UnsupportedOperationException(
+                "Cannot handle ROS serialization when ports are pointers.");
+          } else if (CExtensionUtils.isSharedPtrType(portType, types)) {
+            var matcher = CExtensionUtils.sharedPointerVariable.matcher(portTypeStr);
+            if (matcher.find()) {
+              portTypeStr = matcher.group("type");
             }
-            break;
-        }
-        case PROTO: {
-            throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
-        }
-        case ROS2: {
-            var portType = ASTUtils.getInferredType(((Port) receivingPort.getVariable()));
-            var portTypeStr = types.getTargetType(portType);
-            if (CUtil.isTokenType(portType, types)) {
-                throw new UnsupportedOperationException("Cannot handle ROS serialization when ports are pointers.");
-            } else if (CExtensionUtils.isSharedPtrType(portType, types)) {
-                var matcher = CExtensionUtils.sharedPointerVariable.matcher(portTypeStr);
-                if (matcher.find()) {
-                    portTypeStr = matcher.group("type");
-                }
-            }
-            var ROSDeserializer = new FedROS2CPPSerialization();
-            value = FedROS2CPPSerialization.deserializedVarName;
+          }
+          var ROSDeserializer = new FedROS2CPPSerialization();
+          value = FedROS2CPPSerialization.deserializedVarName;
+          result.pr(
+              ROSDeserializer.generateNetworkDeserializerCode(
+                  "self->_lf__" + action.getName(), portTypeStr));
+          if (CExtensionUtils.isSharedPtrType(portType, types)) {
             result.pr(
-                ROSDeserializer.generateNetworkDeserializerCode(
-                    "self->_lf__"+ action.getName(),
-                    portTypeStr
-                )
-            );
-            if (CExtensionUtils.isSharedPtrType(portType, types)) {
-                result.pr("auto msg_shared_ptr = std::make_shared<"+portTypeStr+">("+value+");");
-                result.pr("lf_set("+ receiveRef +", msg_shared_ptr);");
-            } else {
-                result.pr("lf_set("+ receiveRef +", std::move("+value+"));");
-            }
-            break;
-        }
+                "auto msg_shared_ptr = std::make_shared<" + portTypeStr + ">(" + value + ");");
+            result.pr("lf_set(" + receiveRef + ", msg_shared_ptr);");
+          } else {
+            result.pr("lf_set(" + receiveRef + ", std::move(" + value + "));");
+          }
+          break;
         }
     }
+  }
+
+  /**
+   * Generate code for the body of a reaction that handles an output that is to be sent over the
+   * network.
+   *
+   * @param sendingPort The output port providing the data to send.
+   * @param receivingPort The variable reference to the destination port.
+   * @param connection
+   * @param type
+   * @param coordinationType
+   * @param errorReporter FIXME
+   */
+  public String generateNetworkSenderBody(
+      VarRef sendingPort,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      CoordinationType coordinationType,
+      ErrorReporter errorReporter) {
+    var sendRef =
+        CUtil.portRefInReaction(sendingPort, connection.getSrcBank(), connection.getSrcChannel());
+    var receiveRef =
+        ASTUtils.generateVarRef(
+            receivingPort); // Used for comments only, so no need for bank/multiport index.
+    var result = new CodeBuilder();
+    // The ID of the receiving port (rightPort) is the position
+    // of the action in this list.
+    int receivingPortID = connection.getDstFederate().networkMessageActions.size();
+
+    // We currently have no way to mark a reaction "unordered"
+    // in the AST, so we use a magic string at the start of the body.
+    result.pr("// " + ReactionInstance.UNORDERED_REACTION_MARKER + "\n");
+
+    result.pr(
+        "// Sending from "
+            + sendRef
+            + " in federate "
+            + connection.getSrcFederate().name
+            + " to "
+            + receiveRef
+            + " in federate "
+            + connection.getDstFederate().name);
+
+    // In case sendRef is a multiport or is in a bank, this reaction will be triggered when any
+    // channel or bank index of sendRef is present
+    // ex. if a.out[i] is present, the entire output a.out is triggered.
+    if (connection.getSrcBank() != -1 || connection.getSrcChannel() != -1) {
+      result.pr("if (!" + sendRef + "->is_present) return;");
+    }
 
-    /**
-     * Generate code for the body of a reaction that handles an output
-     * that is to be sent over the network.
-     * @param sendingPort The output port providing the data to send.
-     * @param receivingPort The variable reference to the destination port.
-     * @param connection
-     * @param type
-     * @param coordinationType
-     * @param errorReporter FIXME
-     */
-    public String generateNetworkSenderBody(
-        VarRef sendingPort,
-        VarRef receivingPort,
-        FedConnectionInstance connection,
-        InferredType type,
-        CoordinationType coordinationType,
-        ErrorReporter errorReporter
-    ) {
-        var sendRef = CUtil.portRefInReaction(sendingPort, connection.getSrcBank(), connection.getSrcChannel());
-        var receiveRef = ASTUtils.generateVarRef(receivingPort); // Used for comments only, so no need for bank/multiport index.
-        var result = new CodeBuilder();
-        // The ID of the receiving port (rightPort) is the position
-        // of the action in this list.
-        int receivingPortID = connection.getDstFederate().networkMessageActions.size();
-
-        // We currently have no way to mark a reaction "unordered"
-        // in the AST, so we use a magic string at the start of the body.
-        result.pr("// " + ReactionInstance.UNORDERED_REACTION_MARKER + "\n");
-
-        result.pr("// Sending from " + sendRef + " in federate "
-                      + connection.getSrcFederate().name + " to " + receiveRef
-                      + " in federate " + connection.getDstFederate().name);
-
-        // In case sendRef is a multiport or is in a bank, this reaction will be triggered when any channel or bank index of sendRef is present
-        // ex. if a.out[i] is present, the entire output a.out is triggered.
-        if (connection.getSrcBank() != -1 || connection.getSrcChannel() != -1) {
-            result.pr("if (!"+sendRef+"->is_present) return;");
-        }
-
-        // If the connection is physical and the receiving federate is remote, send it directly on a socket.
-        // If the connection is logical and the coordination mode is centralized, send via RTI.
-        // If the connection is logical and the coordination mode is decentralized, send directly
-        String messageType;
-        // Name of the next immediate destination of this message
-        var next_destination_name = "\"federate "+connection.getDstFederate().id+"\"";
-
-        // Get the delay literal
-        String additionalDelayString = CExtensionUtils.getNetworkDelayLiteral(connection.getDefinition().getDelay());
-
-        if (connection.getDefinition().isPhysical()) {
-            messageType = "MSG_TYPE_P2P_MESSAGE";
-        } else if (coordinationType == CoordinationType.DECENTRALIZED) {
-            messageType = "MSG_TYPE_P2P_TAGGED_MESSAGE";
-        } else {
-            // Logical connection
-            // Send the message via rti
-            messageType = "MSG_TYPE_TAGGED_MESSAGE";
-            next_destination_name = "\"federate "+connection.getDstFederate().id+" via the RTI\"";
-        }
-
-
-        String sendingFunction = "send_timed_message";
-        String commonArgs = String.join(", ",
-                                        additionalDelayString,
-                                        messageType,
-                                        receivingPortID + "",
-                                        connection.getDstFederate().id + "",
-                                        next_destination_name,
-                                        "message_length"
-        );
-        if (connection.getDefinition().isPhysical()) {
-            // Messages going on a physical connection do not
-            // carry a timestamp or require the delay;
-            sendingFunction = "send_message";
-            commonArgs = messageType+", "+receivingPortID+", "+connection.getDstFederate().id+", "+next_destination_name+", message_length";
-        }
+    // If the connection is physical and the receiving federate is remote, send it directly on a
+    // socket.
+    // If the connection is logical and the coordination mode is centralized, send via RTI.
+    // If the connection is logical and the coordination mode is decentralized, send directly
+    String messageType;
+    // Name of the next immediate destination of this message
+    var next_destination_name = "\"federate " + connection.getDstFederate().id + "\"";
+
+    // Get the delay literal
+    String additionalDelayString =
+        CExtensionUtils.getNetworkDelayLiteral(connection.getDefinition().getDelay());
+
+    if (connection.getDefinition().isPhysical()) {
+      messageType = "MSG_TYPE_P2P_MESSAGE";
+    } else if (coordinationType == CoordinationType.DECENTRALIZED) {
+      messageType = "MSG_TYPE_P2P_TAGGED_MESSAGE";
+    } else {
+      // Logical connection
+      // Send the message via rti
+      messageType = "MSG_TYPE_TAGGED_MESSAGE";
+      next_destination_name = "\"federate " + connection.getDstFederate().id + " via the RTI\"";
+    }
 
-        serializeAndSend(
-            connection,
-            type,
-            sendRef,
-            result,
-            sendingFunction,
-            commonArgs,
-            errorReporter
-        );
-        return result.toString();
+    String sendingFunction = "send_timed_message";
+    String commonArgs =
+        String.join(
+            ", ",
+            additionalDelayString,
+            messageType,
+            receivingPortID + "",
+            connection.getDstFederate().id + "",
+            next_destination_name,
+            "message_length");
+    if (connection.getDefinition().isPhysical()) {
+      // Messages going on a physical connection do not
+      // carry a timestamp or require the delay;
+      sendingFunction = "send_message";
+      commonArgs =
+          messageType
+              + ", "
+              + receivingPortID
+              + ", "
+              + connection.getDstFederate().id
+              + ", "
+              + next_destination_name
+              + ", message_length";
     }
 
-    /**
-     * FIXME
-     * @param connection
-     * @param type
-     * @param sendRef
-     * @param result
-     * @param sendingFunction
-     * @param commonArgs
-     * @param errorReporter
-     */
-    protected void serializeAndSend(
-        FedConnectionInstance connection,
-        InferredType type,
-        String sendRef,
-        CodeBuilder result,
-        String sendingFunction,
-        String commonArgs,
-        ErrorReporter errorReporter
-    ) {
-        CTypes types = new CTypes();
-        var lengthExpression = "";
-        var pointerExpression = "";
-        switch (connection.getSerializer()) {
-        case NATIVE: {
-            // Handle native types.
-            if (CUtil.isTokenType(type, types)) {
-                // NOTE: Transporting token types this way is likely to only work if the sender and receiver
-                // both have the same endianness. Otherwise, you have to use protobufs or some other serialization scheme.
-                result.pr("size_t message_length = "+ sendRef +"->token->length * "+ sendRef
-                              +"->token->type->element_size;");
-                result.pr(sendingFunction +"("+ commonArgs +", (unsigned char*) "+ sendRef
-                              +"->value);");
-            } else {
-                // string types need to be dealt with specially because they are hidden pointers.
-                // void type is odd, but it avoids generating non-standard expression sizeof(void),
-                // which some compilers reject.
-                lengthExpression = "sizeof("+ types.getTargetType(type)+")";
-                pointerExpression = "(unsigned char*)&"+ sendRef +"->value";
-                var targetType = types.getTargetType(type);
-                if (targetType.equals("string")) {
-                    lengthExpression = "strlen("+ sendRef +"->value) + 1";
-                    pointerExpression = "(unsigned char*) "+ sendRef +"->value";
-                } else if (targetType.equals("void")) {
-                    lengthExpression = "0";
-                }
-                result.pr("size_t message_length = "+lengthExpression+";");
-                result.pr(
-                    sendingFunction +"("+ commonArgs +", "+pointerExpression+");");
+    serializeAndSend(connection, type, sendRef, result, sendingFunction, commonArgs, errorReporter);
+    return result.toString();
+  }
+
+  /**
+   * FIXME
+   *
+   * @param connection
+   * @param type
+   * @param sendRef
+   * @param result
+   * @param sendingFunction
+   * @param commonArgs
+   * @param errorReporter
+   */
+  protected void serializeAndSend(
+      FedConnectionInstance connection,
+      InferredType type,
+      String sendRef,
+      CodeBuilder result,
+      String sendingFunction,
+      String commonArgs,
+      ErrorReporter errorReporter) {
+    CTypes types = new CTypes();
+    var lengthExpression = "";
+    var pointerExpression = "";
+    switch (connection.getSerializer()) {
+      case NATIVE:
+        {
+          // Handle native types.
+          if (CUtil.isTokenType(type, types)) {
+            // NOTE: Transporting token types this way is likely to only work if the sender and
+            // receiver
+            // both have the same endianness. Otherwise, you have to use protobufs or some other
+            // serialization scheme.
+            result.pr(
+                "size_t message_length = "
+                    + sendRef
+                    + "->token->length * "
+                    + sendRef
+                    + "->token->type->element_size;");
+            result.pr(
+                sendingFunction + "(" + commonArgs + ", (unsigned char*) " + sendRef + "->value);");
+          } else {
+            // string types need to be dealt with specially because they are hidden pointers.
+            // void type is odd, but it avoids generating non-standard expression sizeof(void),
+            // which some compilers reject.
+            lengthExpression = "sizeof(" + types.getTargetType(type) + ")";
+            pointerExpression = "(unsigned char*)&" + sendRef + "->value";
+            var targetType = types.getTargetType(type);
+            if (targetType.equals("string")) {
+              lengthExpression = "strlen(" + sendRef + "->value) + 1";
+              pointerExpression = "(unsigned char*) " + sendRef + "->value";
+            } else if (targetType.equals("void")) {
+              lengthExpression = "0";
             }
-            break;
+            result.pr("size_t message_length = " + lengthExpression + ";");
+            result.pr(sendingFunction + "(" + commonArgs + ", " + pointerExpression + ");");
+          }
+          break;
         }
-        case PROTO: {
-            throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
+      case PROTO:
+        {
+          throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
         }
-        case ROS2: {
-            var variableToSerialize = sendRef;
-            var typeStr = types.getTargetType(type);
-            if (CUtil.isTokenType(type, types)) {
-                throw new UnsupportedOperationException("Cannot handle ROS serialization when ports are pointers.");
-            } else if (CExtensionUtils.isSharedPtrType(type, types)) {
-                var matcher = CExtensionUtils.sharedPointerVariable.matcher(typeStr);
-                if (matcher.find()) {
-                    typeStr = matcher.group("type");
-                }
+      case ROS2:
+        {
+          var variableToSerialize = sendRef;
+          var typeStr = types.getTargetType(type);
+          if (CUtil.isTokenType(type, types)) {
+            throw new UnsupportedOperationException(
+                "Cannot handle ROS serialization when ports are pointers.");
+          } else if (CExtensionUtils.isSharedPtrType(type, types)) {
+            var matcher = CExtensionUtils.sharedPointerVariable.matcher(typeStr);
+            if (matcher.find()) {
+              typeStr = matcher.group("type");
             }
-            var ROSSerializer = new FedROS2CPPSerialization();
-            lengthExpression = ROSSerializer.serializedBufferLength();
-            pointerExpression = ROSSerializer.seializedBufferVar();
-            result.pr(
-                ROSSerializer.generateNetworkSerializerCode(variableToSerialize, typeStr, CExtensionUtils.isSharedPtrType(type, types))
-            );
-            result.pr("size_t message_length = "+lengthExpression+";");
-            result.pr(sendingFunction +"("+ commonArgs +", "+pointerExpression+");");
-            break;
-        }
-
+          }
+          var ROSSerializer = new FedROS2CPPSerialization();
+          lengthExpression = ROSSerializer.serializedBufferLength();
+          pointerExpression = ROSSerializer.seializedBufferVar();
+          result.pr(
+              ROSSerializer.generateNetworkSerializerCode(
+                  variableToSerialize, typeStr, CExtensionUtils.isSharedPtrType(type, types)));
+          result.pr("size_t message_length = " + lengthExpression + ";");
+          result.pr(sendingFunction + "(" + commonArgs + ", " + pointerExpression + ");");
+          break;
         }
     }
-
-    /**
-     * Generate code for the body of a reaction that decides whether the trigger for the given
-     * port is going to be present or absent for the current logical time.
-     * This reaction is put just before the first reaction that is triggered by the network
-     * input port "port" or has it in its sources. If there are only connections to contained
-     * reactors, in the top-level reactor.
-     *
-     * @param receivingPortID The port to generate the control reaction for
-     * @param maxSTP The maximum value of STP is assigned to reactions (if any)
-     *  that have port as their trigger or source
-     */
-    public String generateNetworkInputControlReactionBody(
-        int receivingPortID,
-        TimeValue maxSTP,
-        CoordinationType coordination
-    ) {
-        // Store the code
-        var result = new CodeBuilder();
-
-        // We currently have no way to mark a reaction "unordered"
-        // in the AST, so we use a magic string at the start of the body.
-        result.pr("// " + ReactionInstance.UNORDERED_REACTION_MARKER + "\n");
-        result.pr("interval_t max_STP = 0LL;");
-
-        // Find the maximum STP for decentralized coordination
-        if(coordination == CoordinationType.DECENTRALIZED) {
-            result.pr("max_STP = "+ CTypes.getInstance().getTargetTimeExpr(maxSTP) +";");
-        }
-        result.pr("// Wait until the port status is known");
-        result.pr("wait_until_port_status_known("+receivingPortID+", max_STP);");
-        return result.toString();
-    }
-
-    /**
-     * Generate code for the body of a reaction that sends a port status message for the given
-     * port if it is absent.
-     *
-     * @oaram srcOutputPort FIXME
-     * @param connection FIXME
-     */
-    public String generateNetworkOutputControlReactionBody(
-        VarRef srcOutputPort,
-        FedConnectionInstance connection
-    ) {
-        // Store the code
-        var result = new CodeBuilder();
-        // The ID of the receiving port (rightPort) is the position
-        // of the networkAction (see below) in this list.
-        int receivingPortID = connection.getDstFederate().networkMessageActions.size();
-
-        // We currently have no way to mark a reaction "unordered"
-        // in the AST, so we use a magic string at the start of the body.
-        result.pr("// " + ReactionInstance.UNORDERED_REACTION_MARKER + "\n");
-        var sendRef = CUtil.portRefInReaction(srcOutputPort, connection.getSrcBank(), connection.getSrcChannel());
-        // Get the delay literal
-        var additionalDelayString = CExtensionUtils.getNetworkDelayLiteral(connection.getDefinition().getDelay());
-        result.pr(String.join("\n",
-                              "// If the output port has not been lf_set for the current logical time,",
-                              "// send an ABSENT message to the receiving federate            ",
-                              "LF_PRINT_LOG(\"Contemplating whether to send port \"",
-                              "          \"absent for port %d to federate %d.\", ",
-                              "          "+receivingPortID+", "+connection.getDstFederate().id+");",
-                              "if ("+sendRef+" == NULL || !"+sendRef+"->is_present) {",
-                              "    // The output port is NULL or it is not present.",
-                              "    send_port_absent_to_federate("+additionalDelayString+", "+receivingPortID+", "+connection.getDstFederate().id+");",
-                              "}"
-        ));
-        return result.toString();
+  }
+
+  /**
+   * Generate code for the body of a reaction that decides whether the trigger for the given port is
+   * going to be present or absent for the current logical time. This reaction is put just before
+   * the first reaction that is triggered by the network input port "port" or has it in its sources.
+   * If there are only connections to contained reactors, in the top-level reactor.
+   *
+   * @param receivingPortID The port to generate the control reaction for
+   * @param maxSTP The maximum value of STP is assigned to reactions (if any) that have port as
+   *     their trigger or source
+   */
+  public String generateNetworkInputControlReactionBody(
+      int receivingPortID, TimeValue maxSTP, CoordinationType coordination) {
+    // Store the code
+    var result = new CodeBuilder();
+
+    // We currently have no way to mark a reaction "unordered"
+    // in the AST, so we use a magic string at the start of the body.
+    result.pr("// " + ReactionInstance.UNORDERED_REACTION_MARKER + "\n");
+    result.pr("interval_t max_STP = 0LL;");
+
+    // Find the maximum STP for decentralized coordination
+    if (coordination == CoordinationType.DECENTRALIZED) {
+      result.pr("max_STP = " + CTypes.getInstance().getTargetTimeExpr(maxSTP) + ";");
     }
-
-
-    public String getNetworkBufferType() {
-        return "uint8_t*";
+    result.pr("// Wait until the port status is known");
+    result.pr("wait_until_port_status_known(" + receivingPortID + ", max_STP);");
+    return result.toString();
+  }
+
+  /**
+   * Generate code for the body of a reaction that sends a port status message for the given port if
+   * it is absent.
+   *
+   * @oaram srcOutputPort FIXME
+   * @param connection FIXME
+   */
+  public String generateNetworkOutputControlReactionBody(
+      VarRef srcOutputPort, FedConnectionInstance connection) {
+    // Store the code
+    var result = new CodeBuilder();
+    // The ID of the receiving port (rightPort) is the position
+    // of the networkAction (see below) in this list.
+    int receivingPortID = connection.getDstFederate().networkMessageActions.size();
+
+    // We currently have no way to mark a reaction "unordered"
+    // in the AST, so we use a magic string at the start of the body.
+    result.pr("// " + ReactionInstance.UNORDERED_REACTION_MARKER + "\n");
+    var sendRef =
+        CUtil.portRefInReaction(srcOutputPort, connection.getSrcBank(), connection.getSrcChannel());
+    // Get the delay literal
+    var additionalDelayString =
+        CExtensionUtils.getNetworkDelayLiteral(connection.getDefinition().getDelay());
+    result.pr(
+        String.join(
+            "\n",
+            "// If the output port has not been lf_set for the current logical time,",
+            "// send an ABSENT message to the receiving federate            ",
+            "LF_PRINT_LOG(\"Contemplating whether to send port \"",
+            "          \"absent for port %d to federate %d.\", ",
+            "          " + receivingPortID + ", " + connection.getDstFederate().id + ");",
+            "if (" + sendRef + " == NULL || !" + sendRef + "->is_present) {",
+            "    // The output port is NULL or it is not present.",
+            "    send_port_absent_to_federate("
+                + additionalDelayString
+                + ", "
+                + receivingPortID
+                + ", "
+                + connection.getDstFederate().id
+                + ");",
+            "}"));
+    return result.toString();
+  }
+
+  public String getNetworkBufferType() {
+    return "uint8_t*";
+  }
+
+  /**
+   * Add preamble to a separate file to set up federated execution. Return an empty string since no
+   * code generated needs to go in the source.
+   */
+  @Override
+  public String generatePreamble(
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      RtiConfig rtiConfig,
+      ErrorReporter errorReporter)
+      throws IOException {
+    // Put the C preamble in a {@code include/_federate.name + _preamble.h} file
+    String cPreamble = makePreamble(federate, fileConfig, rtiConfig, errorReporter);
+    String relPath = getPreamblePath(federate);
+    Path fedPreamblePath = fileConfig.getSrcPath().resolve(relPath);
+    Files.createDirectories(fedPreamblePath.getParent());
+    try (var writer = Files.newBufferedWriter(fedPreamblePath)) {
+      writer.write(cPreamble);
     }
-
-    /**
-     * Add preamble to a separate file to set up federated execution.
-     * Return an empty string since no code generated needs to go in the source.
-     */
-    @Override
-    public String generatePreamble(
-        FederateInstance federate,
-        FedFileConfig fileConfig,
-        RtiConfig rtiConfig,
-        ErrorReporter errorReporter
-    ) throws IOException {
-        // Put the C preamble in a {@code include/_federate.name + _preamble.h} file
-        String cPreamble = makePreamble(federate, fileConfig, rtiConfig, errorReporter);
-        String relPath = getPreamblePath(federate);
-        Path fedPreamblePath = fileConfig.getSrcPath().resolve(relPath);
-        Files.createDirectories(fedPreamblePath.getParent());
-        try (var writer = Files.newBufferedWriter(fedPreamblePath)) {
-            writer.write(cPreamble);
-        }
-        var includes = new CodeBuilder();
-        if (federate.targetConfig.target != Target.Python) {
-            includes.pr("#ifdef __cplusplus\n"
-                + "extern \"C\" {\n"
-                + "#endif");
-            includes.pr("#include \"core/federated/federate.h\"");
-            includes.pr("#include \"core/federated/net_common.h\"");
-            includes.pr("#include \"core/federated/net_util.h\"");
-            includes.pr("#include \"core/federated/clock-sync.h\"");
-            includes.pr("#include \"core/threaded/reactor_threaded.h\"");
-            includes.pr("#include \"core/utils/util.h\"");
-            includes.pr("extern federate_instance_t _fed;");
-            includes.pr("#ifdef __cplusplus\n"
-                + "}\n"
-                + "#endif");
-            includes.pr(generateSerializationIncludes(federate, fileConfig));
-        }
-
-        return includes.toString();
+    var includes = new CodeBuilder();
+    if (federate.targetConfig.target != Target.Python) {
+      includes.pr("#ifdef __cplusplus\n" + "extern \"C\" {\n" + "#endif");
+      includes.pr("#include \"core/federated/federate.h\"");
+      includes.pr("#include \"core/federated/net_common.h\"");
+      includes.pr("#include \"core/federated/net_util.h\"");
+      includes.pr("#include \"core/federated/clock-sync.h\"");
+      includes.pr("#include \"core/threaded/reactor_threaded.h\"");
+      includes.pr("#include \"core/utils/util.h\"");
+      includes.pr("extern federate_instance_t _fed;");
+      includes.pr("#ifdef __cplusplus\n" + "}\n" + "#endif");
+      includes.pr(generateSerializationIncludes(federate, fileConfig));
     }
 
-    /**
-     * Generate the preamble to setup federated execution in C.
-     */
-    protected String makePreamble(
-        FederateInstance federate,
-        FedFileConfig fileConfig,
-        RtiConfig rtiConfig,
-        ErrorReporter errorReporter) {
-
-        var code = new CodeBuilder();
-
-        code.pr("#include \"core/federated/federate.h\"");
-        code.pr("#include \"core/federated/net_common.h\"");
-        code.pr("#include \"core/federated/net_util.h\"");
-        code.pr("#include \"core/threaded/reactor_threaded.h\"");
-        code.pr("#include \"core/utils/util.h\"");
-        code.pr("extern federate_instance_t _fed;");
-
-        // Generate function to return a pointer to the action trigger_t
-        // that handles incoming network messages destined to the specified
-        // port. This will only be used if there are federates.
-        int numOfNetworkActions = federate.networkMessageActions.size();
-        code.pr("""
+    return includes.toString();
+  }
+
+  /** Generate the preamble to setup federated execution in C. */
+  protected String makePreamble(
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      RtiConfig rtiConfig,
+      ErrorReporter errorReporter) {
+
+    var code = new CodeBuilder();
+
+    code.pr("#include \"core/federated/federate.h\"");
+    code.pr("#include \"core/federated/net_common.h\"");
+    code.pr("#include \"core/federated/net_util.h\"");
+    code.pr("#include \"core/threaded/reactor_threaded.h\"");
+    code.pr("#include \"core/utils/util.h\"");
+    code.pr("extern federate_instance_t _fed;");
+
+    // Generate function to return a pointer to the action trigger_t
+    // that handles incoming network messages destined to the specified
+    // port. This will only be used if there are federates.
+    int numOfNetworkActions = federate.networkMessageActions.size();
+    code.pr(
+        """
         lf_action_base_t* _lf_action_table[%1$s];
         size_t _lf_action_table_size = %1$s;
-        """.formatted(numOfNetworkActions));
-
-        code.pr(generateExecutablePreamble(federate, rtiConfig, errorReporter));
-
-        code.pr(generateInitializeTriggers(federate, errorReporter));
-
-        code.pr(CExtensionUtils.generateFederateNeighborStructure(federate));
-
-        return code.getCode();
-    }
-
-    /**
-     * Generate preamble code needed for enabled serializers of the federate.
-     */
-    protected String generateSerializationIncludes(FederateInstance federate, FedFileConfig fileConfig) {
-        return CExtensionUtils.generateSerializationIncludes(federate, fileConfig);
-    }
-
-    /**
-     * Create a function that initializes necessary triggers for federated execution,
-     * which are the triggers for control reactions and references to all network
-     * actions (which are triggered upon receiving network messages).
-     *
-     * @param federate The federate to initialize triggers for.
-     * @param errorReporter Used to report errors.
-     * @return The generated code for the macro.
-     */
-    private String generateInitializeTriggers(FederateInstance federate, ErrorReporter errorReporter) {
-        CodeBuilder code = new CodeBuilder();
-        // Temporarily change the original federate reactor's name in the AST to
-        // the federate's name so that trigger references are accurate.
-        var federatedReactor = FedASTUtils.findFederatedReactor(federate.instantiation.eResource());
-        var oldFederatedReactorName = federatedReactor.getName();
-        federatedReactor.setName(federate.name);
-        var main = new ReactorInstance(federatedReactor, errorReporter, 1);
-        code.pr(CExtensionUtils.initializeTriggersForNetworkActions(federate, main));
-        code.pr(CExtensionUtils.initializeTriggerForControlReactions(main, main, federate));
-        federatedReactor.setName(oldFederatedReactorName);
-
-        return """
+        """
+            .formatted(numOfNetworkActions));
+
+    code.pr(generateExecutablePreamble(federate, rtiConfig, errorReporter));
+
+    code.pr(generateInitializeTriggers(federate, errorReporter));
+
+    code.pr(CExtensionUtils.generateFederateNeighborStructure(federate));
+
+    return code.getCode();
+  }
+
+  /** Generate preamble code needed for enabled serializers of the federate. */
+  protected String generateSerializationIncludes(
+      FederateInstance federate, FedFileConfig fileConfig) {
+    return CExtensionUtils.generateSerializationIncludes(federate, fileConfig);
+  }
+
+  /**
+   * Create a function that initializes necessary triggers for federated execution, which are the
+   * triggers for control reactions and references to all network actions (which are triggered upon
+   * receiving network messages).
+   *
+   * @param federate The federate to initialize triggers for.
+   * @param errorReporter Used to report errors.
+   * @return The generated code for the macro.
+   */
+  private String generateInitializeTriggers(
+      FederateInstance federate, ErrorReporter errorReporter) {
+    CodeBuilder code = new CodeBuilder();
+    // Temporarily change the original federate reactor's name in the AST to
+    // the federate's name so that trigger references are accurate.
+    var federatedReactor = FedASTUtils.findFederatedReactor(federate.instantiation.eResource());
+    var oldFederatedReactorName = federatedReactor.getName();
+    federatedReactor.setName(federate.name);
+    var main = new ReactorInstance(federatedReactor, errorReporter, 1);
+    code.pr(CExtensionUtils.initializeTriggersForNetworkActions(federate, main));
+    code.pr(CExtensionUtils.initializeTriggerForControlReactions(main, main, federate));
+    federatedReactor.setName(oldFederatedReactorName);
+
+    return """
             #define initialize_triggers_for_federate() \\
             do { \\
             %s
             } \\
             while (0)
-            """.formatted((code.getCode().isBlank() ? "\\" : code.getCode()).indent(4).stripTrailing());
-    }
+            """
+        .formatted((code.getCode().isBlank() ? "\\" : code.getCode()).indent(4).stripTrailing());
+  }
 
-    /**
-     * Generate code for an executed preamble.
-     *
-     */
-    private String generateExecutablePreamble(FederateInstance federate, RtiConfig rtiConfig, ErrorReporter errorReporter) {
-        CodeBuilder code = new CodeBuilder();
+  /** Generate code for an executed preamble. */
+  private String generateExecutablePreamble(
+      FederateInstance federate, RtiConfig rtiConfig, ErrorReporter errorReporter) {
+    CodeBuilder code = new CodeBuilder();
 
-        code.pr(generateCodeForPhysicalActions(federate, errorReporter));
+    code.pr(generateCodeForPhysicalActions(federate, errorReporter));
 
-        code.pr(generateCodeToInitializeFederate(federate, rtiConfig));
+    code.pr(generateCodeToInitializeFederate(federate, rtiConfig));
 
-        code.pr(CExtensionUtils.allocateTriggersForFederate(federate));
+    code.pr(CExtensionUtils.allocateTriggersForFederate(federate));
 
-        return """
+    return """
             void _lf_executable_preamble() {
             %s
             }
-            """.formatted(code.toString().indent(4).stripTrailing());
+            """
+        .formatted(code.toString().indent(4).stripTrailing());
+  }
+
+  /**
+   * Generate code to initialize the {@code federate}.
+   *
+   * @param rtiConfig
+   * @return The generated code
+   */
+  private String generateCodeToInitializeFederate(FederateInstance federate, RtiConfig rtiConfig) {
+    CodeBuilder code = new CodeBuilder();
+    code.pr("// ***** Start initializing the federated execution. */");
+    code.pr(
+        String.join(
+            "\n",
+            "// Initialize the socket mutex",
+            "lf_mutex_init(&outbound_socket_mutex);",
+            "lf_cond_init(&port_status_changed, &mutex);"));
+
+    // Find the STA (A.K.A. the global STP offset) for this federate.
+    if (federate.targetConfig.coordination == CoordinationType.DECENTRALIZED) {
+      var reactor = ASTUtils.toDefinition(federate.instantiation.getReactorClass());
+      var stpParam =
+          reactor.getParameters().stream()
+              .filter(
+                  param ->
+                      param.getName().equalsIgnoreCase("STP_offset")
+                          && (param.getType() == null || param.getType().isTime()))
+              .findFirst();
+
+      if (stpParam.isPresent()) {
+        var globalSTP =
+            ASTUtils.initialValue(stpParam.get(), List.of(federate.instantiation)).get(0);
+        var globalSTPTV = ASTUtils.getLiteralTimeValue(globalSTP);
+        code.pr("lf_set_stp_offset(" + CTypes.getInstance().getTargetTimeExpr(globalSTPTV) + ");");
+      }
     }
 
-    /**
-     * Generate code to initialize the {@code federate}.
-     * @param rtiConfig
-     * @return The generated code
-     */
-    private String generateCodeToInitializeFederate(FederateInstance federate, RtiConfig rtiConfig) {
-        CodeBuilder code = new CodeBuilder();
-        code.pr("// ***** Start initializing the federated execution. */");
-        code.pr(String.join("\n",
-                            "// Initialize the socket mutex",
-                            "lf_mutex_init(&outbound_socket_mutex);",
-                            "lf_cond_init(&port_status_changed, &mutex);"
-        ));
-
-        // Find the STA (A.K.A. the global STP offset) for this federate.
-        if (federate.targetConfig.coordination == CoordinationType.DECENTRALIZED) {
-            var reactor = ASTUtils.toDefinition(federate.instantiation.getReactorClass());
-            var stpParam = reactor.getParameters().stream().filter(
-                    param ->
-                        param.getName().equalsIgnoreCase("STP_offset")
-                            && (param.getType() == null || param.getType().isTime())
-            ).findFirst();
-
-            if (stpParam.isPresent()) {
-                var globalSTP = ASTUtils.initialValue(stpParam.get(), List.of(federate.instantiation)).get(0);
-                var globalSTPTV = ASTUtils.getLiteralTimeValue(globalSTP);
-                code.pr("lf_set_stp_offset("+ CTypes.getInstance().getTargetTimeExpr(globalSTPTV) +");");
-            }
-        }
-
-        // Set indicator variables that specify whether the federate has
-        // upstream logical connections.
-        if (federate.dependsOn.size() > 0) {
-            code.pr("_fed.has_upstream  = true;");
-        }
-        if (federate.sendsTo.size() > 0) {
-            code.pr("_fed.has_downstream = true;");
-        }
-        // Set global variable identifying the federate.
-        code.pr("_lf_my_fed_id = "+ federate.id+";");
-
-        // We keep separate record for incoming and outgoing p2p connections to allow incoming traffic to be processed in a separate
-        // thread without requiring a mutex lock.
-        var numberOfInboundConnections = federate.inboundP2PConnections.size();
-        var numberOfOutboundConnections  = federate.outboundP2PConnections.size();
-
-        code.pr(String.join("\n",
-                            "_fed.number_of_inbound_p2p_connections = "+numberOfInboundConnections+";",
-                            "_fed.number_of_outbound_p2p_connections = "+numberOfOutboundConnections+";"
-        ));
-        if (numberOfInboundConnections > 0) {
-            code.pr(String.join("\n",
-                                "// Initialize the array of socket for incoming connections to -1.",
-                                "for (int i = 0; i < NUMBER_OF_FEDERATES; i++) {",
-                                "    _fed.sockets_for_inbound_p2p_connections[i] = -1;",
-                                "}"
-            ));
-        }
-        if (numberOfOutboundConnections > 0) {
-            code.pr(String.join("\n",
-                                "// Initialize the array of socket for outgoing connections to -1.",
-                                "for (int i = 0; i < NUMBER_OF_FEDERATES; i++) {",
-                                "    _fed.sockets_for_outbound_p2p_connections[i] = -1;",
-                                "}"
-            ));
-        }
+    // Set indicator variables that specify whether the federate has
+    // upstream logical connections.
+    if (federate.dependsOn.size() > 0) {
+      code.pr("_fed.has_upstream  = true;");
+    }
+    if (federate.sendsTo.size() > 0) {
+      code.pr("_fed.has_downstream = true;");
+    }
+    // Set global variable identifying the federate.
+    code.pr("_lf_my_fed_id = " + federate.id + ";");
+
+    // We keep separate record for incoming and outgoing p2p connections to allow incoming traffic
+    // to be processed in a separate
+    // thread without requiring a mutex lock.
+    var numberOfInboundConnections = federate.inboundP2PConnections.size();
+    var numberOfOutboundConnections = federate.outboundP2PConnections.size();
+
+    code.pr(
+        String.join(
+            "\n",
+            "_fed.number_of_inbound_p2p_connections = " + numberOfInboundConnections + ";",
+            "_fed.number_of_outbound_p2p_connections = " + numberOfOutboundConnections + ";"));
+    if (numberOfInboundConnections > 0) {
+      code.pr(
+          String.join(
+              "\n",
+              "// Initialize the array of socket for incoming connections to -1.",
+              "for (int i = 0; i < NUMBER_OF_FEDERATES; i++) {",
+              "    _fed.sockets_for_inbound_p2p_connections[i] = -1;",
+              "}"));
+    }
+    if (numberOfOutboundConnections > 0) {
+      code.pr(
+          String.join(
+              "\n",
+              "// Initialize the array of socket for outgoing connections to -1.",
+              "for (int i = 0; i < NUMBER_OF_FEDERATES; i++) {",
+              "    _fed.sockets_for_outbound_p2p_connections[i] = -1;",
+              "}"));
+    }
 
-        // If a test clock offset has been specified, insert code to set it here.
-        if (federate.targetConfig.clockSyncOptions.testOffset != null) {
-            code.pr("lf_set_physical_clock_offset((1 + "+ federate.id+") * "+ federate.targetConfig.clockSyncOptions.testOffset.toNanoSeconds()+"LL);");
-        }
+    // If a test clock offset has been specified, insert code to set it here.
+    if (federate.targetConfig.clockSyncOptions.testOffset != null) {
+      code.pr(
+          "lf_set_physical_clock_offset((1 + "
+              + federate.id
+              + ") * "
+              + federate.targetConfig.clockSyncOptions.testOffset.toNanoSeconds()
+              + "LL);");
+    }
 
-        code.pr(String.join("\n",
-                            "// Connect to the RTI. This sets _fed.socket_TCP_RTI and _lf_rti_socket_UDP.",
-                            "connect_to_rti("+addDoubleQuotes(rtiConfig.getHost())+", "+ rtiConfig.getPort()+");"
-        ));
+    code.pr(
+        String.join(
+            "\n",
+            "// Connect to the RTI. This sets _fed.socket_TCP_RTI and _lf_rti_socket_UDP.",
+            "connect_to_rti("
+                + addDoubleQuotes(rtiConfig.getHost())
+                + ", "
+                + rtiConfig.getPort()
+                + ");"));
+
+    // Disable clock synchronization for the federate if it resides on the same host as the RTI,
+    // unless that is overridden with the clock-sync-options target property.
+    if (CExtensionUtils.clockSyncIsOn(federate, rtiConfig)) {
+      code.pr("synchronize_initial_physical_clock_with_rti(_fed.socket_TCP_RTI);");
+    }
 
-        // Disable clock synchronization for the federate if it resides on the same host as the RTI,
-        // unless that is overridden with the clock-sync-options target property.
-        if (CExtensionUtils.clockSyncIsOn(federate, rtiConfig)) {
-            code.pr("synchronize_initial_physical_clock_with_rti(_fed.socket_TCP_RTI);");
-        }
+    if (numberOfInboundConnections > 0) {
+      code.pr(
+          String.join(
+              "\n",
+              "// Create a socket server to listen to other federates.",
+              "// If a port is specified by the user, that will be used",
+              "// as the only possibility for the server. If not, the port",
+              "// will start from STARTING_PORT. The function will",
+              "// keep incrementing the port until the number of tries reaches PORT_RANGE_LIMIT.",
+              "create_server(" + federate.port + ");",
+              "// Connect to remote federates for each physical connection.",
+              "// This is done in a separate thread because this thread will call",
+              "// connect_to_federate for each outbound physical connection at the same",
+              "// time that the new thread is listening for such connections for inbound",
+              "// physical connections. The thread will live until all connections",
+              "// have been established.",
+              "lf_thread_create(&_fed.inbound_p2p_handling_thread_id,"
+                  + " handle_p2p_connections_from_federates, NULL);"));
+    }
 
-        if (numberOfInboundConnections > 0) {
-            code.pr(String.join("\n",
-                                "// Create a socket server to listen to other federates.",
-                                "// If a port is specified by the user, that will be used",
-                                "// as the only possibility for the server. If not, the port",
-                                "// will start from STARTING_PORT. The function will",
-                                "// keep incrementing the port until the number of tries reaches PORT_RANGE_LIMIT.",
-                                "create_server("+ federate.port+");",
-                                "// Connect to remote federates for each physical connection.",
-                                "// This is done in a separate thread because this thread will call",
-                                "// connect_to_federate for each outbound physical connection at the same",
-                                "// time that the new thread is listening for such connections for inbound",
-                                "// physical connections. The thread will live until all connections",
-                                "// have been established.",
-                                "lf_thread_create(&_fed.inbound_p2p_handling_thread_id, handle_p2p_connections_from_federates, NULL);"
-            ));
+    for (FederateInstance remoteFederate : federate.outboundP2PConnections) {
+      code.pr("connect_to_federate(" + remoteFederate.id + ");");
+    }
+    return code.getCode();
+  }
+
+  /**
+   * Generate code to handle physical actions in the {@code federate}.
+   *
+   * @param errorReporter Used to report errors.
+   * @return Generated code.
+   */
+  private String generateCodeForPhysicalActions(
+      FederateInstance federate, ErrorReporter errorReporter) {
+    CodeBuilder code = new CodeBuilder();
+    if (federate.targetConfig.coordination.equals(CoordinationType.CENTRALIZED)) {
+      // If this program uses centralized coordination then check
+      // for outputs that depend on physical actions so that null messages can be
+      // sent to the RTI.
+      var federateClass = ASTUtils.toDefinition(federate.instantiation.getReactorClass());
+      var main =
+          new ReactorInstance(
+              FedASTUtils.findFederatedReactor(federate.instantiation.eResource()),
+              errorReporter,
+              1);
+      var instance = new ReactorInstance(federateClass, main, errorReporter);
+      var outputDelayMap = federate.findOutputsConnectedToPhysicalActions(instance);
+      var minDelay = TimeValue.MAX_VALUE;
+      Output outputFound = null;
+      for (Output output : outputDelayMap.keySet()) {
+        var outputDelay = outputDelayMap.get(output);
+        if (outputDelay.isEarlierThan(minDelay)) {
+          minDelay = outputDelay;
+          outputFound = output;
         }
-
-        for (FederateInstance remoteFederate : federate.outboundP2PConnections) {
-            code.pr("connect_to_federate("+remoteFederate.id+");");
+      }
+      if (minDelay != TimeValue.MAX_VALUE) {
+        // Unless silenced, issue a warning.
+        if (federate.targetConfig.coordinationOptions.advance_message_interval == null) {
+          errorReporter.reportWarning(
+              outputFound,
+              String.join(
+                  "\n",
+                  "Found a path from a physical action to output for reactor "
+                      + addDoubleQuotes(instance.getName())
+                      + ". ",
+                  "The amount of delay is " + minDelay + ".",
+                  "With centralized coordination, this can result in a large number of messages to"
+                      + " the RTI.",
+                  "Consider refactoring the code so that the output does not depend on the physical"
+                      + " action,",
+                  "or consider using decentralized coordination. To silence this warning, set the"
+                      + " target",
+                  "parameter coordination-options with a value like {advance-message-interval: 10"
+                      + " msec}"));
         }
-        return code.getCode();
+        code.pr(
+            "_fed.min_delay_from_physical_action_to_federate_output = "
+                + CTypes.getInstance().getTargetTimeExpr(minDelay)
+                + ";");
+      }
     }
+    return code.getCode();
+  }
 
-    /**
-     * Generate code to handle physical actions in the {@code federate}.
-     * @param errorReporter Used to report errors.
-     * @return Generated code.
-     */
-    private String generateCodeForPhysicalActions(FederateInstance federate, ErrorReporter errorReporter) {
-        CodeBuilder code = new CodeBuilder();
-        if (federate.targetConfig.coordination.equals(CoordinationType.CENTRALIZED)) {
-            // If this program uses centralized coordination then check
-            // for outputs that depend on physical actions so that null messages can be
-            // sent to the RTI.
-            var federateClass = ASTUtils.toDefinition(federate.instantiation.getReactorClass());
-            var main = new ReactorInstance(FedASTUtils.findFederatedReactor(federate.instantiation.eResource()), errorReporter, 1);
-            var instance = new ReactorInstance(federateClass, main, errorReporter);
-            var outputDelayMap = federate
-                .findOutputsConnectedToPhysicalActions(instance);
-            var minDelay = TimeValue.MAX_VALUE;
-            Output outputFound = null;
-            for (Output output : outputDelayMap.keySet()) {
-                var outputDelay = outputDelayMap.get(output);
-                if (outputDelay.isEarlierThan(minDelay)) {
-                    minDelay = outputDelay;
-                    outputFound = output;
-                }
-            }
-            if (minDelay != TimeValue.MAX_VALUE) {
-                // Unless silenced, issue a warning.
-                if (federate.targetConfig.coordinationOptions.advance_message_interval
-                    == null) {
-                    errorReporter.reportWarning(outputFound, String.join("\n",
-                                                                         "Found a path from a physical action to output for reactor "
-                                                                             + addDoubleQuotes(instance.getName())
-                                                                             + ". ",
-                                                                         "The amount of delay is "
-                                                                             + minDelay
-                                                                             + ".",
-                                                                         "With centralized coordination, this can result in a large number of messages to the RTI.",
-                                                                         "Consider refactoring the code so that the output does not depend on the physical action,",
-                                                                         "or consider using decentralized coordination. To silence this warning, set the target",
-                                                                         "parameter coordination-options with a value like {advance-message-interval: 10 msec}"
-                    ));
-                }
-                code.pr(
-                    "_fed.min_delay_from_physical_action_to_federate_output = "
-                        + CTypes.getInstance().getTargetTimeExpr(minDelay) + ";");
-            }
-        }
-        return code.getCode();
-    }
-    private String getPreamblePath(FederateInstance f) {
-        return "include" + File.separator + "_" + f.name + "_preamble.h";
-    }
+  private String getPreamblePath(FederateInstance f) {
+    return "include" + File.separator + "_" + f.name + "_preamble.h";
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
index 3eeee4b5cb..391204fdb5 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
@@ -7,13 +7,12 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.regex.Pattern;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig.ClockSyncOptions;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.ClockSyncMode;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
 import org.lflang.federated.launcher.RtiConfig;
@@ -33,563 +32,573 @@
 
 public class CExtensionUtils {
 
-    // Regular expression pattern for shared_ptr types.
-    static final Pattern sharedPointerVariable = Pattern.compile("^(/\\*.*?\\*/)?std::shared_ptr<(?<type>((/\\*.*?\\*/)?(\\S+))+)>$");
-
-    /**
-     * Generate C code that allocates sufficient memory for the following two
-     * critical data structures that support network control reactions:
-     * <ul>
-     *   <li>{@code triggers_for_network_input_control_reactions}: These are triggers that
-     *      are used at runtime to insert network input control reactions into the
-     *      reaction queue.</li>
-     *   <li>{@code trigger_for_network_output_control_reactions}: Triggers for
-     * network output control reactions, which are unique per each output port.
-     * There could be multiple network output control reactions for each
-     * network
-     * output port if it is connected to multiple downstream federates.</li>
-     * </ul>
-     *
-     * @param federate The top-level federate instance
-     * @return A string that allocates memory for the aforementioned three
-     * structures.
-     */
-    public static String allocateTriggersForFederate(
-        FederateInstance federate
-    ) {
-
-        CodeBuilder builder = new CodeBuilder();
-        if (federate.networkInputControlReactionsTriggers.size() > 0) {
-            // Proliferate the network input control reaction trigger array
-            builder.pr(
-                """
+  // Regular expression pattern for shared_ptr types.
+  static final Pattern sharedPointerVariable =
+      Pattern.compile("^(/\\*.*?\\*/)?std::shared_ptr<(?<type>((/\\*.*?\\*/)?(\\S+))+)>$");
+
+  /**
+   * Generate C code that allocates sufficient memory for the following two critical data structures
+   * that support network control reactions:
+   *
+   * <ul>
+   *   <li>{@code triggers_for_network_input_control_reactions}: These are triggers that are used at
+   *       runtime to insert network input control reactions into the reaction queue.
+   *   <li>{@code trigger_for_network_output_control_reactions}: Triggers for network output control
+   *       reactions, which are unique per each output port. There could be multiple network output
+   *       control reactions for each network output port if it is connected to multiple downstream
+   *       federates.
+   * </ul>
+   *
+   * @param federate The top-level federate instance
+   * @return A string that allocates memory for the aforementioned three structures.
+   */
+  public static String allocateTriggersForFederate(FederateInstance federate) {
+
+    CodeBuilder builder = new CodeBuilder();
+    if (federate.networkInputControlReactionsTriggers.size() > 0) {
+      // Proliferate the network input control reaction trigger array
+      builder.pr(
+          """
                 // Initialize the array of pointers to network input port triggers
                 _fed.triggers_for_network_input_control_reactions_size = %s;
                 _fed.triggers_for_network_input_control_reactions = (trigger_t**)malloc(
                     _fed.triggers_for_network_input_control_reactions_size * sizeof(trigger_t*));
-                """.formatted(federate.networkInputControlReactionsTriggers.size()));
-
-        }
-        return builder.getCode();
+                """
+              .formatted(federate.networkInputControlReactionsTriggers.size()));
     }
-
-    /**
-     * Generate C code that initializes network actions.
-     *
-     * These network actions will be triggered by federate.c whenever a message
-     * is received from the network.
-     * @param federate The federate.
-     * @param main The main reactor that contains the federate (used to lookup references).
-     * @return
-     */
-    public static String initializeTriggersForNetworkActions(FederateInstance federate, ReactorInstance main) {
-        CodeBuilder code = new CodeBuilder();
-        if (federate.networkMessageActions.size() > 0) {
-            // Create a static array of trigger_t pointers.
-            // networkMessageActions is a list of Actions, but we
-            // need a list of trigger struct names for ActionInstances.
-            // There should be exactly one ActionInstance in the
-            // main reactor for each Action.
-            var triggers = new LinkedList<String>();
-            for (Action action : federate.networkMessageActions) {
-                // Find the corresponding ActionInstance.
-                var actionInstance = main.lookupActionInstance(action);
-                triggers.add(CUtil.actionRef(actionInstance, null));
-            }
-            var actionTableCount = 0;
-            for (String trigger : triggers) {
-                code.pr("_lf_action_table[" + (actionTableCount++) + "] = (lf_action_base_t*)&"
-                            + trigger + "; \\");
-            }
-        }
-        return code.getCode();
+    return builder.getCode();
+  }
+
+  /**
+   * Generate C code that initializes network actions.
+   *
+   * <p>These network actions will be triggered by federate.c whenever a message is received from
+   * the network.
+   *
+   * @param federate The federate.
+   * @param main The main reactor that contains the federate (used to lookup references).
+   * @return
+   */
+  public static String initializeTriggersForNetworkActions(
+      FederateInstance federate, ReactorInstance main) {
+    CodeBuilder code = new CodeBuilder();
+    if (federate.networkMessageActions.size() > 0) {
+      // Create a static array of trigger_t pointers.
+      // networkMessageActions is a list of Actions, but we
+      // need a list of trigger struct names for ActionInstances.
+      // There should be exactly one ActionInstance in the
+      // main reactor for each Action.
+      var triggers = new LinkedList<String>();
+      for (Action action : federate.networkMessageActions) {
+        // Find the corresponding ActionInstance.
+        var actionInstance = main.lookupActionInstance(action);
+        triggers.add(CUtil.actionRef(actionInstance, null));
+      }
+      var actionTableCount = 0;
+      for (String trigger : triggers) {
+        code.pr(
+            "_lf_action_table["
+                + (actionTableCount++)
+                + "] = (lf_action_base_t*)&"
+                + trigger
+                + "; \\");
+      }
+    }
+    return code.getCode();
+  }
+
+  /**
+   * Generate C code that initializes three critical structures that support network control
+   * reactions: - triggers_for_network_input_control_reactions: These are triggers that are used at
+   * runtime to insert network input control reactions into the reaction queue. There could be
+   * multiple network input control reactions for one network input at multiple levels in the
+   * hierarchy. - trigger_for_network_output_control_reactions: Triggers for network output control
+   * reactions, which are unique per each output port. There could be multiple network output
+   * control reactions for each network output port if it is connected to multiple downstream
+   * federates.
+   *
+   * @param instance The reactor instance that is at any level of the hierarchy within the federate.
+   * @param federate The top-level federate
+   * @return A string that initializes the aforementioned three structures.
+   */
+  public static String initializeTriggerForControlReactions(
+      ReactorInstance instance, ReactorInstance main, FederateInstance federate) {
+    CodeBuilder builder = new CodeBuilder();
+    // The network control reactions are always in the main federated
+    // reactor
+    if (instance != main) {
+      return "";
     }
 
-    /**
-     * Generate C code that initializes three critical structures that support
-     * network control reactions:
-     *  - triggers_for_network_input_control_reactions: These are triggers that are
-     *  used at runtime to insert network input control reactions into the
-     *  reaction queue. There could be multiple network input control reactions
-     *  for one network input at multiple levels in the hierarchy.
-     *  - trigger_for_network_output_control_reactions: Triggers for
-     *  network output control reactions, which are unique per each output port.
-     *  There could be multiple network output control reactions for each network
-     *  output port if it is connected to multiple downstream federates.
-     *
-     * @param instance  The reactor instance that is at any level of the
-     *                  hierarchy within the federate.
-     * @param federate  The top-level federate
-     * @return A string that initializes the aforementioned three structures.
-     */
-    public static String initializeTriggerForControlReactions(
-            ReactorInstance instance,
-            ReactorInstance main,
-            FederateInstance federate
-    ) {
-        CodeBuilder builder = new CodeBuilder();
-        // The network control reactions are always in the main federated
-        // reactor
-        if (instance != main) {
-            return "";
-        }
-
-        ReactorDecl reactorClass = instance.getDefinition().getReactorClass();
-        Reactor reactor = ASTUtils.toDefinition(reactorClass);
-        String nameOfSelfStruct = CUtil.reactorRef(instance);
-
-        // Initialize triggers for network input control reactions
-        for (Action trigger : federate.networkInputControlReactionsTriggers) {
-            // Check if the trigger belongs to this reactor instance
-            if (ASTUtils.allReactions(reactor).stream().anyMatch(r -> {
-                return r.getTriggers().stream().anyMatch(t -> {
-                    if (t instanceof VarRef) {
-                        return ((VarRef) t).getVariable().equals(trigger);
-                    } else {
-                        return false;
-                    }
-                });
-            })) {
-                // Initialize the triggers_for_network_input_control_reactions for the input
-                builder.pr(
-                    String.join("\n",
-                        "/* Add trigger " + nameOfSelfStruct + "->_lf__"+trigger.getName()+" to the global list of network input ports. */ \\",
-                        "_fed.triggers_for_network_input_control_reactions["+federate.networkInputControlReactionsTriggers.indexOf(trigger)+"]= \\",
-                        "    &"+nameOfSelfStruct+"->_lf__"+trigger.getName()+"; \\"
-                    )
-                );
-            }
-        }
-
-        nameOfSelfStruct = CUtil.reactorRef(instance);
-
-        // Initialize the trigger for network output control reactions if it doesn't exist.
-        if (federate.networkOutputControlReactionsTrigger != null) {
-            builder.pr("_fed.trigger_for_network_output_control_reactions=&"
+    ReactorDecl reactorClass = instance.getDefinition().getReactorClass();
+    Reactor reactor = ASTUtils.toDefinition(reactorClass);
+    String nameOfSelfStruct = CUtil.reactorRef(instance);
+
+    // Initialize triggers for network input control reactions
+    for (Action trigger : federate.networkInputControlReactionsTriggers) {
+      // Check if the trigger belongs to this reactor instance
+      if (ASTUtils.allReactions(reactor).stream()
+          .anyMatch(
+              r -> {
+                return r.getTriggers().stream()
+                    .anyMatch(
+                        t -> {
+                          if (t instanceof VarRef) {
+                            return ((VarRef) t).getVariable().equals(trigger);
+                          } else {
+                            return false;
+                          }
+                        });
+              })) {
+        // Initialize the triggers_for_network_input_control_reactions for the input
+        builder.pr(
+            String.join(
+                "\n",
+                "/* Add trigger "
                     + nameOfSelfStruct
-                    + "->_lf__outputControlReactionTrigger; \\");
-        }
-
-        return builder.getCode();
+                    + "->_lf__"
+                    + trigger.getName()
+                    + " to the global list of network input ports. */ \\",
+                "_fed.triggers_for_network_input_control_reactions["
+                    + federate.networkInputControlReactionsTriggers.indexOf(trigger)
+                    + "]= \\",
+                "    &" + nameOfSelfStruct + "->_lf__" + trigger.getName() + "; \\"));
+      }
     }
 
-    /**
-     * Create a port status field variable for a network input port "input" in
-     * the self struct of a reactor.
-     *
-     * @param input     The network input port
-     * @return A string containing the appropriate variable
-     */
-    public static String createPortStatusFieldForInput(Input input) {
-        StringBuilder builder = new StringBuilder();
-        // Check if the port is a multiport
-        if (ASTUtils.isMultiport(input)) {
-            // If it is a multiport, then create an auxiliary list of port
-            // triggers for each channel of
-            // the multiport to keep track of the status of each channel
-            // individually
-            builder.append("trigger_t* _lf__" + input.getName()
-            + "_network_port_status;\n");
-        } else {
-            // If it is not a multiport, then we could re-use the port trigger,
-            // and nothing needs to be
-            // done
-        }
-        return builder.toString();
-    }
+    nameOfSelfStruct = CUtil.reactorRef(instance);
 
-    /**
-     * Given a connection 'delay' predicate, return a string that represents the
-     * interval_t value of the additional delay that needs to be applied to the
-     * outgoing message.
-     *
-     * The returned additional delay in absence of after on network connection
-     * (i.e., if delay is passed as a null) is  NEVER. This has a special
-     * meaning in C library functions that send network messages that carry
-     * timestamps (@see send_timed_message and send_port_absent_to_federate
-     * in lib/core/federate.c). In this case, the sender will send its current
-     * tag as the timestamp of the outgoing message without adding a microstep delay.
-     * If the user has assigned an after delay to the network connection (that
-     * can be zero) either as a time value (e.g., 200 msec) or as a literal
-     * (e.g., a parameter), that delay in nsec will be returned.
-     *
-     * @param delay
-     * @return
-     */
-    public static String getNetworkDelayLiteral(Expression delay) {
-        String additionalDelayString = "NEVER";
-        if (delay != null) {
-            TimeValue tv;
-            if (delay instanceof ParameterReference) {
-                // The parameter has to be parameter of the main reactor.
-                // And that value has to be a Time.
-                tv = ASTUtils.getDefaultAsTimeValue(((ParameterReference)delay).getParameter());
-            } else {
-                tv = ASTUtils.getLiteralTimeValue(delay);
-            }
-            additionalDelayString = Long.toString(tv.toNanoSeconds());
-        }
-        return additionalDelayString;
+    // Initialize the trigger for network output control reactions if it doesn't exist.
+    if (federate.networkOutputControlReactionsTrigger != null) {
+      builder.pr(
+          "_fed.trigger_for_network_output_control_reactions=&"
+              + nameOfSelfStruct
+              + "->_lf__outputControlReactionTrigger; \\");
     }
 
-    static boolean isSharedPtrType(InferredType type, CTypes types) {
-        return !type.isUndefined() && sharedPointerVariable.matcher(types.getTargetType(type)).find();
+    return builder.getCode();
+  }
+
+  /**
+   * Create a port status field variable for a network input port "input" in the self struct of a
+   * reactor.
+   *
+   * @param input The network input port
+   * @return A string containing the appropriate variable
+   */
+  public static String createPortStatusFieldForInput(Input input) {
+    StringBuilder builder = new StringBuilder();
+    // Check if the port is a multiport
+    if (ASTUtils.isMultiport(input)) {
+      // If it is a multiport, then create an auxiliary list of port
+      // triggers for each channel of
+      // the multiport to keep track of the status of each channel
+      // individually
+      builder.append("trigger_t* _lf__" + input.getName() + "_network_port_status;\n");
+    } else {
+      // If it is not a multiport, then we could re-use the port trigger,
+      // and nothing needs to be
+      // done
     }
-
-    public static void handleCompileDefinitions(
-        FederateInstance federate,
-        int numOfFederates,
-        RtiConfig rtiConfig
-    ) {
-        federate.targetConfig.setByUser.add(TargetProperty.COMPILE_DEFINITIONS);
-        federate.targetConfig.compileDefinitions.put("FEDERATED", "");
-        federate.targetConfig.compileDefinitions.put("FEDERATED_"+federate.targetConfig.coordination.toString().toUpperCase(), "");
-        if (federate.targetConfig.auth) {
-            federate.targetConfig.compileDefinitions.put("FEDERATED_AUTHENTICATED", "");
-        }
-        federate.targetConfig.compileDefinitions.put("NUMBER_OF_FEDERATES", String.valueOf(numOfFederates));
-        federate.targetConfig.compileDefinitions.put("EXECUTABLE_PREAMBLE", "");
-        federate.targetConfig.compileDefinitions.put("WORKERS_NEEDED_FOR_FEDERATE", String.valueOf(minThreadsToHandleInputPorts(federate)));
-
-        handleAdvanceMessageInterval(federate);
-
-        initializeClockSynchronization(federate, rtiConfig);
+    return builder.toString();
+  }
+
+  /**
+   * Given a connection 'delay' predicate, return a string that represents the interval_t value of
+   * the additional delay that needs to be applied to the outgoing message.
+   *
+   * <p>The returned additional delay in absence of after on network connection (i.e., if delay is
+   * passed as a null) is NEVER. This has a special meaning in C library functions that send network
+   * messages that carry timestamps (@see send_timed_message and send_port_absent_to_federate in
+   * lib/core/federate.c). In this case, the sender will send its current tag as the timestamp of
+   * the outgoing message without adding a microstep delay. If the user has assigned an after delay
+   * to the network connection (that can be zero) either as a time value (e.g., 200 msec) or as a
+   * literal (e.g., a parameter), that delay in nsec will be returned.
+   *
+   * @param delay
+   * @return
+   */
+  public static String getNetworkDelayLiteral(Expression delay) {
+    String additionalDelayString = "NEVER";
+    if (delay != null) {
+      TimeValue tv;
+      if (delay instanceof ParameterReference) {
+        // The parameter has to be parameter of the main reactor.
+        // And that value has to be a Time.
+        tv = ASTUtils.getDefaultAsTimeValue(((ParameterReference) delay).getParameter());
+      } else {
+        tv = ASTUtils.getLiteralTimeValue(delay);
+      }
+      additionalDelayString = Long.toString(tv.toNanoSeconds());
     }
-
-    /**
-     * The number of threads needs to be at least one larger than the input ports
-     * to allow the federate to wait on all input ports while allowing an additional
-     * worker thread to process incoming messages.
-     * @return The minimum number of threads needed.
-     */
-    public static int minThreadsToHandleInputPorts(FederateInstance federate) {
-        int nthreads = 1;
-        nthreads = Math.max(nthreads, federate.networkMessageActions.size() + 1);
-        return nthreads;
+    return additionalDelayString;
+  }
+
+  static boolean isSharedPtrType(InferredType type, CTypes types) {
+    return !type.isUndefined() && sharedPointerVariable.matcher(types.getTargetType(type)).find();
+  }
+
+  public static void handleCompileDefinitions(
+      FederateInstance federate, int numOfFederates, RtiConfig rtiConfig) {
+    federate.targetConfig.setByUser.add(TargetProperty.COMPILE_DEFINITIONS);
+    federate.targetConfig.compileDefinitions.put("FEDERATED", "");
+    federate.targetConfig.compileDefinitions.put(
+        "FEDERATED_" + federate.targetConfig.coordination.toString().toUpperCase(), "");
+    if (federate.targetConfig.auth) {
+      federate.targetConfig.compileDefinitions.put("FEDERATED_AUTHENTICATED", "");
     }
-
-    private static void handleAdvanceMessageInterval(FederateInstance federate) {
-        var advanceMessageInterval = federate.targetConfig.coordinationOptions.advance_message_interval;
-        federate.targetConfig.setByUser.remove(TargetProperty.COORDINATION_OPTIONS);
-        if (advanceMessageInterval != null) {
-            federate.targetConfig.compileDefinitions.put(
-                "ADVANCE_MESSAGE_INTERVAL",
-                String.valueOf(advanceMessageInterval.toNanoSeconds())
-            );
-        }
+    federate.targetConfig.compileDefinitions.put(
+        "NUMBER_OF_FEDERATES", String.valueOf(numOfFederates));
+    federate.targetConfig.compileDefinitions.put("EXECUTABLE_PREAMBLE", "");
+    federate.targetConfig.compileDefinitions.put(
+        "WORKERS_NEEDED_FOR_FEDERATE", String.valueOf(minThreadsToHandleInputPorts(federate)));
+
+    handleAdvanceMessageInterval(federate);
+
+    initializeClockSynchronization(federate, rtiConfig);
+  }
+
+  /**
+   * The number of threads needs to be at least one larger than the input ports to allow the
+   * federate to wait on all input ports while allowing an additional worker thread to process
+   * incoming messages.
+   *
+   * @return The minimum number of threads needed.
+   */
+  public static int minThreadsToHandleInputPorts(FederateInstance federate) {
+    int nthreads = 1;
+    nthreads = Math.max(nthreads, federate.networkMessageActions.size() + 1);
+    return nthreads;
+  }
+
+  private static void handleAdvanceMessageInterval(FederateInstance federate) {
+    var advanceMessageInterval = federate.targetConfig.coordinationOptions.advance_message_interval;
+    federate.targetConfig.setByUser.remove(TargetProperty.COORDINATION_OPTIONS);
+    if (advanceMessageInterval != null) {
+      federate.targetConfig.compileDefinitions.put(
+          "ADVANCE_MESSAGE_INTERVAL", String.valueOf(advanceMessageInterval.toNanoSeconds()));
     }
+  }
 
-    static boolean clockSyncIsOn(FederateInstance federate, RtiConfig rtiConfig) {
-        return federate.targetConfig.clockSync != ClockSyncMode.OFF
-            && (!rtiConfig.getHost().equals(federate.host)
+  static boolean clockSyncIsOn(FederateInstance federate, RtiConfig rtiConfig) {
+    return federate.targetConfig.clockSync != ClockSyncMode.OFF
+        && (!rtiConfig.getHost().equals(federate.host)
             || federate.targetConfig.clockSyncOptions.localFederatesOn);
-    }
-
-    /**
-     * Initialize clock synchronization (if enabled) and its related options for a given federate.
-     *
-     * Clock synchronization can be enabled using the clock-sync target property.
-     * @see <a href="https://github.com/icyphy/lingua-franca/wiki/Distributed-Execution#clock-synchronization">Documentation</a>
-     */
-    public static void initializeClockSynchronization(
-        FederateInstance federate,
-        RtiConfig rtiConfig
-    ) {
-        // Check if clock synchronization should be enabled for this federate in the first place
-        if (clockSyncIsOn(federate, rtiConfig)) {
-            System.out.println("Initial clock synchronization is enabled for federate "
-                                   + federate.id
-            );
-            if (federate.targetConfig.clockSync == ClockSyncMode.ON) {
-                if (federate.targetConfig.clockSyncOptions.collectStats) {
-                    System.out.println("Will collect clock sync statistics for federate " + federate.id);
-                    // Add libm to the compiler flags
-                    // FIXME: This is a linker flag not compile flag but we don't have a way to add linker flags
-                    // FIXME: This is probably going to fail on MacOS (especially using clang)
-                    // because libm functions are builtin
-                    federate.targetConfig.compilerFlags.add("-lm");
-                    federate.targetConfig.setByUser.add(TargetProperty.FLAGS);
-                }
-                System.out.println("Runtime clock synchronization is enabled for federate "
-                                       + federate.id
-                );
-            }
-
-            addClockSyncCompileDefinitions(federate);
+  }
+
+  /**
+   * Initialize clock synchronization (if enabled) and its related options for a given federate.
+   *
+   * <p>Clock synchronization can be enabled using the clock-sync target property.
+   *
+   * @see <a
+   *     href="https://github.com/icyphy/lingua-franca/wiki/Distributed-Execution#clock-synchronization">Documentation</a>
+   */
+  public static void initializeClockSynchronization(
+      FederateInstance federate, RtiConfig rtiConfig) {
+    // Check if clock synchronization should be enabled for this federate in the first place
+    if (clockSyncIsOn(federate, rtiConfig)) {
+      System.out.println("Initial clock synchronization is enabled for federate " + federate.id);
+      if (federate.targetConfig.clockSync == ClockSyncMode.ON) {
+        if (federate.targetConfig.clockSyncOptions.collectStats) {
+          System.out.println("Will collect clock sync statistics for federate " + federate.id);
+          // Add libm to the compiler flags
+          // FIXME: This is a linker flag not compile flag but we don't have a way to add linker
+          // flags
+          // FIXME: This is probably going to fail on MacOS (especially using clang)
+          // because libm functions are builtin
+          federate.targetConfig.compilerFlags.add("-lm");
+          federate.targetConfig.setByUser.add(TargetProperty.FLAGS);
         }
-    }
-
-
-    /**
-     * Initialize clock synchronization (if enabled) and its related options for a given federate.
-     *
-     * Clock synchronization can be enabled using the clock-sync target property.
-     * @see <a href="https://github.com/icyphy/lingua-franca/wiki/Distributed-Execution#clock-synchronization">Documentation</a>
-     */
-    public static void addClockSyncCompileDefinitions(FederateInstance federate) {
+        System.out.println("Runtime clock synchronization is enabled for federate " + federate.id);
+      }
 
-        ClockSyncMode mode = federate.targetConfig.clockSync;
-        ClockSyncOptions options = federate.targetConfig.clockSyncOptions;
-
-
-        federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_INITIAL", "");
-        federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_PERIOD_NS", String.valueOf(options.period.toNanoSeconds()));
-        federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_EXCHANGES_PER_INTERVAL", String.valueOf(options.trials));
-        federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_ATTENUATION", String.valueOf(options.attenuation));
-
-        if (mode == ClockSyncMode.ON) {
-            federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_ON", "");
-            if (options.collectStats) {
-                federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_COLLECT_STATS", "");
-            }
-        }
+      addClockSyncCompileDefinitions(federate);
+    }
+  }
+
+  /**
+   * Initialize clock synchronization (if enabled) and its related options for a given federate.
+   *
+   * <p>Clock synchronization can be enabled using the clock-sync target property.
+   *
+   * @see <a
+   *     href="https://github.com/icyphy/lingua-franca/wiki/Distributed-Execution#clock-synchronization">Documentation</a>
+   */
+  public static void addClockSyncCompileDefinitions(FederateInstance federate) {
+
+    ClockSyncMode mode = federate.targetConfig.clockSync;
+    ClockSyncOptions options = federate.targetConfig.clockSyncOptions;
+
+    federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_INITIAL", "");
+    federate.targetConfig.compileDefinitions.put(
+        "_LF_CLOCK_SYNC_PERIOD_NS", String.valueOf(options.period.toNanoSeconds()));
+    federate.targetConfig.compileDefinitions.put(
+        "_LF_CLOCK_SYNC_EXCHANGES_PER_INTERVAL", String.valueOf(options.trials));
+    federate.targetConfig.compileDefinitions.put(
+        "_LF_CLOCK_SYNC_ATTENUATION", String.valueOf(options.attenuation));
+
+    if (mode == ClockSyncMode.ON) {
+      federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_ON", "");
+      if (options.collectStats) {
+        federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_COLLECT_STATS", "");
+      }
     }
+  }
 
+  /** Generate a file to be included by CMake. */
+  public static void generateCMakeInclude(FederateInstance federate, FedFileConfig fileConfig)
+      throws IOException {
+    Files.createDirectories(fileConfig.getSrcPath().resolve("include"));
 
-    /**
-     * Generate a file to be included by CMake.
-     */
-    public static void generateCMakeInclude(
-        FederateInstance federate,
-        FedFileConfig fileConfig
-    ) throws IOException {
-        Files.createDirectories(fileConfig.getSrcPath().resolve("include"));
-
-        Path cmakeIncludePath = fileConfig.getSrcPath()
-                                          .resolve("include" + File.separator + federate.name + "_extension.cmake");
-
-        CodeBuilder cmakeIncludeCode = new CodeBuilder();
-
-        cmakeIncludeCode.pr(generateSerializationCMakeExtension(federate));
-        cmakeIncludeCode.pr(
-            "add_compile_definitions(LF_SOURCE_DIRECTORY=\""
-            + fileConfig.srcPath
-            + "\")"
-        );
-        cmakeIncludeCode.pr(
-            "add_compile_definitions(LF_PACKAGE_DIRECTORY=\""
-                + fileConfig.srcPkgPath
-                + "\")"
-        );
-
-        try (var srcWriter = Files.newBufferedWriter(cmakeIncludePath)) {
-            srcWriter.write(cmakeIncludeCode.getCode());
-        }
+    Path cmakeIncludePath =
+        fileConfig
+            .getSrcPath()
+            .resolve("include" + File.separator + federate.name + "_extension.cmake");
 
-        federate.targetConfig.cmakeIncludes.add(fileConfig.getSrcPath().relativize(cmakeIncludePath).toString());
-        federate.targetConfig.setByUser.add(TargetProperty.CMAKE_INCLUDE);
-    }
+    CodeBuilder cmakeIncludeCode = new CodeBuilder();
 
+    cmakeIncludeCode.pr(generateSerializationCMakeExtension(federate));
+    cmakeIncludeCode.pr(
+        "add_compile_definitions(LF_SOURCE_DIRECTORY=\"" + fileConfig.srcPath + "\")");
+    cmakeIncludeCode.pr(
+        "add_compile_definitions(LF_PACKAGE_DIRECTORY=\"" + fileConfig.srcPkgPath + "\")");
 
-    /**
-     * Generate code that sends the neighbor structure message to the RTI.
-     * See {@code MSG_TYPE_NEIGHBOR_STRUCTURE} in {@code federated/net_common.h}.
-     *
-     * @param federate The federate that is sending its neighbor structure
-     */
-    public static String generateFederateNeighborStructure(FederateInstance federate) {
-        var code = new CodeBuilder();
-        code.pr(String.join("\n",
-                            "/**",
-                            "* Generated function that sends information about connections between this federate and",
-                            "* other federates where messages are routed through the RTI. Currently, this",
-                            "* only includes logical connections when the coordination is centralized. This",
-                            "* information is needed for the RTI to perform the centralized coordination.",
-                            "* @see MSG_TYPE_NEIGHBOR_STRUCTURE in net_common.h",
-                            "*/",
-                            "void send_neighbor_structure_to_RTI(int rti_socket) {"
-        ));
-        code.indent();
-        // Initialize the array of information about the federate's immediate upstream
-        // and downstream relayed (through the RTI) logical connections, to send to the
-        // RTI.
-        code.pr(String.join("\n",
-                            "interval_t candidate_tmp;",
-                            "size_t buffer_size = 1 + 8 + ",
-                            "                "+federate.dependsOn.keySet().size()+" * ( sizeof(uint16_t) + sizeof(int64_t) ) +",
-                            "                "+federate.sendsTo.keySet().size()+" * sizeof(uint16_t);",
-                            "unsigned char buffer_to_send[buffer_size];",
-                            "",
-                            "size_t message_head = 0;",
-                            "buffer_to_send[message_head] = MSG_TYPE_NEIGHBOR_STRUCTURE;",
-                            "message_head++;",
-                            "encode_int32((int32_t)"+federate.dependsOn.keySet().size()+", &(buffer_to_send[message_head]));",
-                            "message_head+=sizeof(int32_t);",
-                            "encode_int32((int32_t)"+federate.sendsTo.keySet().size()+", &(buffer_to_send[message_head]));",
-                            "message_head+=sizeof(int32_t);"
-        ));
-
-        if (!federate.dependsOn.keySet().isEmpty()) {
-            // Next, populate these arrays.
-            // Find the minimum delay in the process.
-            // FIXME: Zero delay is not really the same as a microstep delay.
-            for (FederateInstance upstreamFederate : federate.dependsOn.keySet()) {
-                code.pr(String.join("\n",
-                                    "encode_uint16((uint16_t)"+upstreamFederate.id+", &(buffer_to_send[message_head]));",
-                                    "message_head += sizeof(uint16_t);"
-                ));
-                // The minimum delay calculation needs to be made in the C code because it
-                // may depend on parameter values.
-                // FIXME: These would have to be top-level parameters, which don't really
-                // have any support yet. Ideally, they could be overridden on the command line.
-                // When that is done, they will need to be in scope here.
-                var delays = federate.dependsOn.get(upstreamFederate);
-                if (delays != null) {
-                    // There is at least one delay, so find the minimum.
-                    // If there is no delay at all, this is encoded as NEVER.
-                    code.pr("candidate_tmp = FOREVER;");
-                    for (Expression delay : delays) {
-                        if (delay == null) {
-                            // Use NEVER to encode no delay at all.
-                            code.pr("candidate_tmp = NEVER;");
-                        } else {
-                            var delayTime =
-                                delay instanceof ParameterReference
-                                    // In that case use the default value.
-                                    ? CTypes.getInstance().getTargetTimeExpr(ASTUtils.getDefaultAsTimeValue(((ParameterReference) delay).getParameter()))
-                                    : CTypes.getInstance().getTargetExpr(delay, InferredType.time());
-
-                            code.pr(String.join("\n",
-                                "if (" + delayTime + " < candidate_tmp) {",
-                                "    candidate_tmp = " + delayTime + ";",
-                                "}"
-                            ));
-                        }
-                    }
-                    code.pr(String.join("\n",
-                                        "encode_int64((int64_t)candidate_tmp, &(buffer_to_send[message_head]));",
-                                        "message_head += sizeof(int64_t);"
-                    ));
-                } else {
-                    // Use NEVER to encode no delay at all.
-                    code.pr(String.join("\n",
-                                        "encode_int64(NEVER, &(buffer_to_send[message_head]));",
-                                        "message_head += sizeof(int64_t);"
-                    ));
-                }
-            }
-        }
+    try (var srcWriter = Files.newBufferedWriter(cmakeIncludePath)) {
+      srcWriter.write(cmakeIncludeCode.getCode());
+    }
 
-        // Next, set up the downstream array.
-        if (!federate.sendsTo.keySet().isEmpty()) {
-            // Next, populate the array.
-            // Find the minimum delay in the process.
-            // FIXME: Zero delay is not really the same as a microstep delay.
-            for (FederateInstance downstreamFederate : federate.sendsTo.keySet()) {
-                code.pr(String.join("\n",
-                                    "encode_uint16("+downstreamFederate.id+", &(buffer_to_send[message_head]));",
-                                    "message_head += sizeof(uint16_t);"
-                ));
+    federate.targetConfig.cmakeIncludes.add(
+        fileConfig.getSrcPath().relativize(cmakeIncludePath).toString());
+    federate.targetConfig.setByUser.add(TargetProperty.CMAKE_INCLUDE);
+  }
+
+  /**
+   * Generate code that sends the neighbor structure message to the RTI. See {@code
+   * MSG_TYPE_NEIGHBOR_STRUCTURE} in {@code federated/net_common.h}.
+   *
+   * @param federate The federate that is sending its neighbor structure
+   */
+  public static String generateFederateNeighborStructure(FederateInstance federate) {
+    var code = new CodeBuilder();
+    code.pr(
+        String.join(
+            "\n",
+            "/**",
+            "* Generated function that sends information about connections between this federate"
+                + " and",
+            "* other federates where messages are routed through the RTI. Currently, this",
+            "* only includes logical connections when the coordination is centralized. This",
+            "* information is needed for the RTI to perform the centralized coordination.",
+            "* @see MSG_TYPE_NEIGHBOR_STRUCTURE in net_common.h",
+            "*/",
+            "void send_neighbor_structure_to_RTI(int rti_socket) {"));
+    code.indent();
+    // Initialize the array of information about the federate's immediate upstream
+    // and downstream relayed (through the RTI) logical connections, to send to the
+    // RTI.
+    code.pr(
+        String.join(
+            "\n",
+            "interval_t candidate_tmp;",
+            "size_t buffer_size = 1 + 8 + ",
+            "                "
+                + federate.dependsOn.keySet().size()
+                + " * ( sizeof(uint16_t) + sizeof(int64_t) ) +",
+            "                " + federate.sendsTo.keySet().size() + " * sizeof(uint16_t);",
+            "unsigned char buffer_to_send[buffer_size];",
+            "",
+            "size_t message_head = 0;",
+            "buffer_to_send[message_head] = MSG_TYPE_NEIGHBOR_STRUCTURE;",
+            "message_head++;",
+            "encode_int32((int32_t)"
+                + federate.dependsOn.keySet().size()
+                + ", &(buffer_to_send[message_head]));",
+            "message_head+=sizeof(int32_t);",
+            "encode_int32((int32_t)"
+                + federate.sendsTo.keySet().size()
+                + ", &(buffer_to_send[message_head]));",
+            "message_head+=sizeof(int32_t);"));
+
+    if (!federate.dependsOn.keySet().isEmpty()) {
+      // Next, populate these arrays.
+      // Find the minimum delay in the process.
+      // FIXME: Zero delay is not really the same as a microstep delay.
+      for (FederateInstance upstreamFederate : federate.dependsOn.keySet()) {
+        code.pr(
+            String.join(
+                "\n",
+                "encode_uint16((uint16_t)"
+                    + upstreamFederate.id
+                    + ", &(buffer_to_send[message_head]));",
+                "message_head += sizeof(uint16_t);"));
+        // The minimum delay calculation needs to be made in the C code because it
+        // may depend on parameter values.
+        // FIXME: These would have to be top-level parameters, which don't really
+        // have any support yet. Ideally, they could be overridden on the command line.
+        // When that is done, they will need to be in scope here.
+        var delays = federate.dependsOn.get(upstreamFederate);
+        if (delays != null) {
+          // There is at least one delay, so find the minimum.
+          // If there is no delay at all, this is encoded as NEVER.
+          code.pr("candidate_tmp = FOREVER;");
+          for (Expression delay : delays) {
+            if (delay == null) {
+              // Use NEVER to encode no delay at all.
+              code.pr("candidate_tmp = NEVER;");
+            } else {
+              var delayTime =
+                  delay instanceof ParameterReference
+                      // In that case use the default value.
+                      ? CTypes.getInstance()
+                          .getTargetTimeExpr(
+                              ASTUtils.getDefaultAsTimeValue(
+                                  ((ParameterReference) delay).getParameter()))
+                      : CTypes.getInstance().getTargetExpr(delay, InferredType.time());
+
+              code.pr(
+                  String.join(
+                      "\n",
+                      "if (" + delayTime + " < candidate_tmp) {",
+                      "    candidate_tmp = " + delayTime + ";",
+                      "}"));
             }
+          }
+          code.pr(
+              String.join(
+                  "\n",
+                  "encode_int64((int64_t)candidate_tmp, &(buffer_to_send[message_head]));",
+                  "message_head += sizeof(int64_t);"));
+        } else {
+          // Use NEVER to encode no delay at all.
+          code.pr(
+              String.join(
+                  "\n",
+                  "encode_int64(NEVER, &(buffer_to_send[message_head]));",
+                  "message_head += sizeof(int64_t);"));
         }
-        code.pr(String.join("\n",
-                            "write_to_socket_errexit(",
-                            "    rti_socket, ",
-                            "    buffer_size,",
-                            "    buffer_to_send,",
-                            "    \"Failed to send the neighbor structure message to the RTI.\"",
-                            ");"
-        ));
-        code.unindent();
-        code.pr("}");
-        return code.toString();
+      }
     }
 
-
-    public static List<String> getFederatedFiles() {
-        return List.of(
-            "federated/net_util.c",
-            "federated/net_util.h",
-            "federated/net_common.h",
-            "federated/federate.c",
-            "federated/federate.h",
-            "federated/clock-sync.h",
-            "federated/clock-sync.c"
-        );
+    // Next, set up the downstream array.
+    if (!federate.sendsTo.keySet().isEmpty()) {
+      // Next, populate the array.
+      // Find the minimum delay in the process.
+      // FIXME: Zero delay is not really the same as a microstep delay.
+      for (FederateInstance downstreamFederate : federate.sendsTo.keySet()) {
+        code.pr(
+            String.join(
+                "\n",
+                "encode_uint16(" + downstreamFederate.id + ", &(buffer_to_send[message_head]));",
+                "message_head += sizeof(uint16_t);"));
+      }
     }
-
-    /**
-     * Surround {@code code} with blocks to ensure that code only executes
-     * if the program is federated.
-     */
-    public static String surroundWithIfFederated(String code) {
-        return """
+    code.pr(
+        String.join(
+            "\n",
+            "write_to_socket_errexit(",
+            "    rti_socket, ",
+            "    buffer_size,",
+            "    buffer_to_send,",
+            "    \"Failed to send the neighbor structure message to the RTI.\"",
+            ");"));
+    code.unindent();
+    code.pr("}");
+    return code.toString();
+  }
+
+  public static List<String> getFederatedFiles() {
+    return List.of(
+        "federated/net_util.c",
+        "federated/net_util.h",
+        "federated/net_common.h",
+        "federated/federate.c",
+        "federated/federate.h",
+        "federated/clock-sync.h",
+        "federated/clock-sync.c");
+  }
+
+  /**
+   * Surround {@code code} with blocks to ensure that code only executes if the program is
+   * federated.
+   */
+  public static String surroundWithIfFederated(String code) {
+    return """
             #ifdef FEDERATED
             %s
             #endif // FEDERATED
-            """.formatted(code);
-    }
-
-    /**
-     * Surround {@code code} with blocks to ensure that code only executes
-     * if the program is federated and has a centralized coordination.
-     */
-    public static String surroundWithIfFederatedCentralized(String code) {
-        return """
+            """
+        .formatted(code);
+  }
+
+  /**
+   * Surround {@code code} with blocks to ensure that code only executes if the program is federated
+   * and has a centralized coordination.
+   */
+  public static String surroundWithIfFederatedCentralized(String code) {
+    return """
             #ifdef FEDERATED_CENTRALIZED
             %s
             #endif // FEDERATED_CENTRALIZED
-            """.formatted(code);
-    }
-
-    /**
-     * Surround {@code code} with blocks to ensure that code only executes
-     * if the program is federated and has a decentralized coordination.
-     */
-    public static String surroundWithIfFederatedDecentralized(String code) {
-        return """
+            """
+        .formatted(code);
+  }
+
+  /**
+   * Surround {@code code} with blocks to ensure that code only executes if the program is federated
+   * and has a decentralized coordination.
+   */
+  public static String surroundWithIfFederatedDecentralized(String code) {
+    return """
             #ifdef FEDERATED_DECENTRALIZED
             %s
             #endif // FEDERATED_DECENTRALIZED
-            """.formatted(code);
+            """
+        .formatted(code);
+  }
+
+  /** Generate preamble code needed for enabled serializers of the federate. */
+  public static String generateSerializationIncludes(
+      FederateInstance federate, FedFileConfig fileConfig) {
+    CodeBuilder code = new CodeBuilder();
+    for (SupportedSerializers serializer : federate.enabledSerializers) {
+      switch (serializer) {
+        case NATIVE:
+        case PROTO:
+          {
+            // No need to do anything at this point.
+            break;
+          }
+        case ROS2:
+          {
+            var ROSSerializer = new FedROS2CPPSerialization();
+            code.pr(ROSSerializer.generatePreambleForSupport().toString());
+            break;
+          }
+      }
     }
-
-    /**
-     * Generate preamble code needed for enabled serializers of the federate.
-     */
-    public static String generateSerializationIncludes(
-        FederateInstance federate,
-        FedFileConfig fileConfig
-    ) {
-        CodeBuilder code = new CodeBuilder();
-        for (SupportedSerializers serializer : federate.enabledSerializers) {
-            switch (serializer) {
-            case NATIVE:
-            case PROTO: {
-                // No need to do anything at this point.
-                break;
-            }
-            case ROS2: {
-                var ROSSerializer = new FedROS2CPPSerialization();
-                code.pr(ROSSerializer.generatePreambleForSupport().toString());
-                break;
-            }
-            }
-        }
-        return code.getCode();
-    }
-
-    /**
-     * Generate cmake-include code needed for enabled serializers of the federate.
-     */
-    public static String generateSerializationCMakeExtension(
-        FederateInstance federate
-    ) {
-        CodeBuilder code = new CodeBuilder();
-        for (SupportedSerializers serializer : federate.enabledSerializers) {
-            switch (serializer) {
-            case NATIVE:
-            case PROTO: {
-                // No CMake code is needed for now
-                break;
-            }
-            case ROS2: {
-                var ROSSerializer = new FedROS2CPPSerialization();
-                code.pr(ROSSerializer.generateCompilerExtensionForSupport());
-                break;
-            }
-            }
-        }
-        return code.getCode();
+    return code.getCode();
+  }
+
+  /** Generate cmake-include code needed for enabled serializers of the federate. */
+  public static String generateSerializationCMakeExtension(FederateInstance federate) {
+    CodeBuilder code = new CodeBuilder();
+    for (SupportedSerializers serializer : federate.enabledSerializers) {
+      switch (serializer) {
+        case NATIVE:
+        case PROTO:
+          {
+            // No CMake code is needed for now
+            break;
+          }
+        case ROS2:
+          {
+            var ROSSerializer = new FedROS2CPPSerialization();
+            code.pr(ROSSerializer.generateCompilerExtensionForSupport());
+            break;
+          }
+      }
     }
+    return code.getCode();
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/extensions/FedTargetExtension.java b/org.lflang/src/org/lflang/federated/extensions/FedTargetExtension.java
index d50a801617..17ac198781 100644
--- a/org.lflang/src/org/lflang/federated/extensions/FedTargetExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/FedTargetExtension.java
@@ -1,7 +1,6 @@
 package org.lflang.federated.extensions;
 
 import java.io.IOException;
-
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetProperty.CoordinationType;
@@ -17,110 +16,110 @@
 
 public interface FedTargetExtension {
 
-    /**
-     * Perform necessary actions to initialize the target config.
-     *
-     * @param context
-     * @param numOfFederates
-     * @param federate       The federate instance.
-     * @param fileConfig     An instance of {@code FedFileConfig}.
-     * @param errorReporter  Used to report errors.
-     */
-    void initializeTargetConfig(LFGeneratorContext context, int numOfFederates, FederateInstance federate, FedFileConfig fileConfig,
-                                ErrorReporter errorReporter, RtiConfig rtiConfig) throws IOException;
+  /**
+   * Perform necessary actions to initialize the target config.
+   *
+   * @param context
+   * @param numOfFederates
+   * @param federate The federate instance.
+   * @param fileConfig An instance of {@code FedFileConfig}.
+   * @param errorReporter Used to report errors.
+   */
+  void initializeTargetConfig(
+      LFGeneratorContext context,
+      int numOfFederates,
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      ErrorReporter errorReporter,
+      RtiConfig rtiConfig)
+      throws IOException;
 
-    /**
-     * Generate code for the body of a reaction that handles the
-     * action that is triggered by receiving a message from a remote
-     * federate.
-     * @param action The action.
-     * @param sendingPort The output port providing the data to send.
-     * @param receivingPort The ID of the destination port.
-     * @param connection FIXME
-     * @param type FIXME
-     * @param coordinationType The coordination type
-     * @param errorReporter
-     */
-    String generateNetworkReceiverBody(
-        Action action,
-        VarRef sendingPort,
-        VarRef receivingPort,
-        FedConnectionInstance connection,
-        InferredType type,
-        CoordinationType coordinationType,
-        ErrorReporter errorReporter
-    );
+  /**
+   * Generate code for the body of a reaction that handles the action that is triggered by receiving
+   * a message from a remote federate.
+   *
+   * @param action The action.
+   * @param sendingPort The output port providing the data to send.
+   * @param receivingPort The ID of the destination port.
+   * @param connection FIXME
+   * @param type FIXME
+   * @param coordinationType The coordination type
+   * @param errorReporter
+   */
+  String generateNetworkReceiverBody(
+      Action action,
+      VarRef sendingPort,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      CoordinationType coordinationType,
+      ErrorReporter errorReporter);
 
-    /**
-     * Generate code for the body of a reaction that handles an output
-     * that is to be sent over the network.
-     * @param sendingPort The output port providing the data to send.
-     * @param receivingPort The variable reference to the destination port.
-     * @param connection
-     * @param type
-     * @param coordinationType
-     * @param errorReporter FIXME
-     */
-    String generateNetworkSenderBody(
-        VarRef sendingPort,
-        VarRef receivingPort,
-        FedConnectionInstance connection,
-        InferredType type,
-        CoordinationType coordinationType,
-        ErrorReporter errorReporter
-    );
+  /**
+   * Generate code for the body of a reaction that handles an output that is to be sent over the
+   * network.
+   *
+   * @param sendingPort The output port providing the data to send.
+   * @param receivingPort The variable reference to the destination port.
+   * @param connection
+   * @param type
+   * @param coordinationType
+   * @param errorReporter FIXME
+   */
+  String generateNetworkSenderBody(
+      VarRef sendingPort,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      CoordinationType coordinationType,
+      ErrorReporter errorReporter);
 
-    /**
-     * Generate code for the body of a reaction that decides whether the trigger for the given
-     * port is going to be present or absent for the current logical time.
-     * This reaction is put just before the first reaction that is triggered by the network
-     * input port "port" or has it in its sources. If there are only connections to contained
-     * reactors, in the top-level reactor.
-     *
-     * @param receivingPortID The port to generate the control reaction for
-     * @param maxSTP The maximum value of STP is assigned to reactions (if any)
-     *  that have port as their trigger or source
-     * @param coordination FIXME
-     */
-    String generateNetworkInputControlReactionBody(
-        int receivingPortID,
-        TimeValue maxSTP,
-        CoordinationType coordination
-    );
+  /**
+   * Generate code for the body of a reaction that decides whether the trigger for the given port is
+   * going to be present or absent for the current logical time. This reaction is put just before
+   * the first reaction that is triggered by the network input port "port" or has it in its sources.
+   * If there are only connections to contained reactors, in the top-level reactor.
+   *
+   * @param receivingPortID The port to generate the control reaction for
+   * @param maxSTP The maximum value of STP is assigned to reactions (if any) that have port as
+   *     their trigger or source
+   * @param coordination FIXME
+   */
+  String generateNetworkInputControlReactionBody(
+      int receivingPortID, TimeValue maxSTP, CoordinationType coordination);
 
-    /**
-     * Generate code for the body of a reaction that sends a port status message for the given
-     * port if it is absent.
-     *
-     * @oaram srcOutputPort FIXME
-     * @param connection FIXME
-     */
-    String generateNetworkOutputControlReactionBody(
-        VarRef srcOutputPort,
-        FedConnectionInstance connection
-    );
+  /**
+   * Generate code for the body of a reaction that sends a port status message for the given port if
+   * it is absent.
+   *
+   * @oaram srcOutputPort FIXME
+   * @param connection FIXME
+   */
+  String generateNetworkOutputControlReactionBody(
+      VarRef srcOutputPort, FedConnectionInstance connection);
 
-    /** Optionally apply additional annotations to the reaction. */
-    default void annotateReaction(Reaction reaction) {}
+  /** Optionally apply additional annotations to the reaction. */
+  default void annotateReaction(Reaction reaction) {}
 
-    /**
-     * Return the type for the raw network buffer in the target language (e.g., {@code uint_8} in C). This would be the type of the 
-     * network messages after serialization and before deserialization. It is primarily used to determine the type for the 
-     * network action at the receiver.
-     */
-    String getNetworkBufferType();
+  /**
+   * Return the type for the raw network buffer in the target language (e.g., {@code uint_8} in C).
+   * This would be the type of the network messages after serialization and before deserialization.
+   * It is primarily used to determine the type for the network action at the receiver.
+   */
+  String getNetworkBufferType();
 
-    /**
-     * Add necessary preamble to the source to set up federated execution.
-     *
-     * @param federate
-     * @param rtiConfig
-     * @param errorReporter
-     * @return
-     */
-    String generatePreamble(FederateInstance federate,
-                            FedFileConfig fileConfig,
-                            RtiConfig rtiConfig,
-                            ErrorReporter errorReporter)
-        throws IOException;
+  /**
+   * Add necessary preamble to the source to set up federated execution.
+   *
+   * @param federate
+   * @param rtiConfig
+   * @param errorReporter
+   * @return
+   */
+  String generatePreamble(
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      RtiConfig rtiConfig,
+      ErrorReporter errorReporter)
+      throws IOException;
 }
diff --git a/org.lflang/src/org/lflang/federated/extensions/FedTargetExtensionFactory.java b/org.lflang/src/org/lflang/federated/extensions/FedTargetExtensionFactory.java
index 5caafc1c0c..ca16d1d445 100644
--- a/org.lflang/src/org/lflang/federated/extensions/FedTargetExtensionFactory.java
+++ b/org.lflang/src/org/lflang/federated/extensions/FedTargetExtensionFactory.java
@@ -1,24 +1,26 @@
 package org.lflang.federated.extensions;
 
 import org.lflang.Target;
-import org.lflang.lf.TargetDecl;
 
 /**
  * Class for instantiating target extensions.
+ *
  * @author Soroush Bateni
  */
 public class FedTargetExtensionFactory {
 
-    /**
-     * Given a target, return the appropriate extension.
-     */
-    public static FedTargetExtension getExtension(Target target) {
-        switch (target) {
-        case CCPP:
-        case C: return new CExtension();
-        case Python: return new PythonExtension();
-        case TS: return new TSExtension();
-        default: throw new RuntimeException("Target not supported");
-        }
+  /** Given a target, return the appropriate extension. */
+  public static FedTargetExtension getExtension(Target target) {
+    switch (target) {
+      case CCPP:
+      case C:
+        return new CExtension();
+      case Python:
+        return new PythonExtension();
+      case TS:
+        return new TSExtension();
+      default:
+        throw new RuntimeException("Target not supported");
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/extensions/PythonExtension.java b/org.lflang/src/org/lflang/federated/extensions/PythonExtension.java
index 15606c6fa0..6fd1cb3dc9 100644
--- a/org.lflang/src/org/lflang/federated/extensions/PythonExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/PythonExtension.java
@@ -27,11 +27,10 @@
 package org.lflang.federated.extensions;
 
 import java.io.IOException;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetProperty.CoordinationType;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedConnectionInstance;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
@@ -46,165 +45,149 @@
 import org.lflang.lf.VarRef;
 
 /**
- * An extension class to the PythonGenerator that enables certain federated
- * functionalities.
+ * An extension class to the PythonGenerator that enables certain federated functionalities.
  *
  * @author Soroush Bateni
  */
 public class PythonExtension extends CExtension {
 
-    @Override
-    protected void generateCMakeInclude(FederateInstance federate, FedFileConfig fileConfig) throws IOException {}
-
-    @Override
-    protected String generateSerializationIncludes(FederateInstance federate, FedFileConfig fileConfig) {
-        CodeBuilder code = new CodeBuilder();
-        for (SupportedSerializers serialization : federate.enabledSerializers) {
-            switch (serialization) {
-            case NATIVE: {
-                FedNativePythonSerialization pickler = new FedNativePythonSerialization();
-                code.pr(pickler.generatePreambleForSupport().toString());
-            }
-            case PROTO: {
-                // Nothing needs to be done
-            }
-            case ROS2: {
-                // FIXME: Not supported yet
-            }
-            }
-        }
-        return code.getCode();
-    }
-
-    @Override
-    public String generateNetworkSenderBody(
-        VarRef sendingPort,
-        VarRef receivingPort,
-        FedConnectionInstance connection,
-        InferredType type,
-        CoordinationType coordinationType,
-        ErrorReporter errorReporter
-    ) {
-        var result = new CodeBuilder();
-
-        // We currently have no way to mark a reaction "unordered"
-        // in the AST, so we use a magic string at the start of the body.
-        result.pr("// " + ReactionInstance.UNORDERED_REACTION_MARKER + "\n");
-        result.pr(PyUtil.generateGILAcquireCode() + "\n");
-        result.pr(
-            super.generateNetworkSenderBody(
-                sendingPort,
-                receivingPort,
-                connection,
-                type,
-                coordinationType,
-                errorReporter
-            )
-        );
-        result.pr(PyUtil.generateGILReleaseCode() + "\n");
-        return result.getCode();
-    }
-
-    @Override
-    public String generateNetworkReceiverBody(
-        Action action,
-        VarRef sendingPort,
-        VarRef receivingPort,
-        FedConnectionInstance connection,
-        InferredType type,
-        CoordinationType coordinationType,
-        ErrorReporter errorReporter
-    ) {
-        var result = new CodeBuilder();
-
-        // We currently have no way to mark a reaction "unordered"
-        // in the AST, so we use a magic string at the start of the body.
-        result.pr("// " + ReactionInstance.UNORDERED_REACTION_MARKER + "\n");
-        result.pr(PyUtil.generateGILAcquireCode() + "\n");
-        result.pr(
-            super.generateNetworkReceiverBody(
-                action,
-                sendingPort,
-                receivingPort,
-                connection,
-                type,
-                coordinationType,
-                errorReporter
-            )
-        );
-        result.pr(PyUtil.generateGILReleaseCode() + "\n");
-        return result.getCode();
-
-    }
-
-    @Override
-    protected void deserialize(
-        Action action,
-        VarRef receivingPort,
-        FedConnectionInstance connection,
-        InferredType type,
-        String receiveRef,
-        CodeBuilder result,
-        ErrorReporter errorReporter
-    ) {
-        String value = "";
-        switch (connection.getSerializer()) {
-        case NATIVE: {
-            value = action.getName();
+  @Override
+  protected void generateCMakeInclude(FederateInstance federate, FedFileConfig fileConfig)
+      throws IOException {}
+
+  @Override
+  protected String generateSerializationIncludes(
+      FederateInstance federate, FedFileConfig fileConfig) {
+    CodeBuilder code = new CodeBuilder();
+    for (SupportedSerializers serialization : federate.enabledSerializers) {
+      switch (serialization) {
+        case NATIVE:
+          {
             FedNativePythonSerialization pickler = new FedNativePythonSerialization();
-            result.pr(pickler.generateNetworkDeserializerCode(value, null));
-            result.pr("lf_set(" + receiveRef + ", "
-                          + FedSerialization.deserializedVarName + ");\n");
-            break;
-        }
-        case PROTO: {
-            throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
+            code.pr(pickler.generatePreambleForSupport().toString());
+          }
+        case PROTO:
+          {
+            // Nothing needs to be done
+          }
+        case ROS2:
+          {
+            // FIXME: Not supported yet
+          }
+      }
+    }
+    return code.getCode();
+  }
+
+  @Override
+  public String generateNetworkSenderBody(
+      VarRef sendingPort,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      CoordinationType coordinationType,
+      ErrorReporter errorReporter) {
+    var result = new CodeBuilder();
+
+    // We currently have no way to mark a reaction "unordered"
+    // in the AST, so we use a magic string at the start of the body.
+    result.pr("// " + ReactionInstance.UNORDERED_REACTION_MARKER + "\n");
+    result.pr(PyUtil.generateGILAcquireCode() + "\n");
+    result.pr(
+        super.generateNetworkSenderBody(
+            sendingPort, receivingPort, connection, type, coordinationType, errorReporter));
+    result.pr(PyUtil.generateGILReleaseCode() + "\n");
+    return result.getCode();
+  }
+
+  @Override
+  public String generateNetworkReceiverBody(
+      Action action,
+      VarRef sendingPort,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      CoordinationType coordinationType,
+      ErrorReporter errorReporter) {
+    var result = new CodeBuilder();
+
+    // We currently have no way to mark a reaction "unordered"
+    // in the AST, so we use a magic string at the start of the body.
+    result.pr("// " + ReactionInstance.UNORDERED_REACTION_MARKER + "\n");
+    result.pr(PyUtil.generateGILAcquireCode() + "\n");
+    result.pr(
+        super.generateNetworkReceiverBody(
+            action, sendingPort, receivingPort, connection, type, coordinationType, errorReporter));
+    result.pr(PyUtil.generateGILReleaseCode() + "\n");
+    return result.getCode();
+  }
+
+  @Override
+  protected void deserialize(
+      Action action,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      String receiveRef,
+      CodeBuilder result,
+      ErrorReporter errorReporter) {
+    String value = "";
+    switch (connection.getSerializer()) {
+      case NATIVE:
+        {
+          value = action.getName();
+          FedNativePythonSerialization pickler = new FedNativePythonSerialization();
+          result.pr(pickler.generateNetworkDeserializerCode(value, null));
+          result.pr("lf_set(" + receiveRef + ", " + FedSerialization.deserializedVarName + ");\n");
+          break;
         }
-        case ROS2: {
-            throw new UnsupportedOperationException("ROS2 serialization is not supported yet.");
+      case PROTO:
+        {
+          throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
         }
-
+      case ROS2:
+        {
+          throw new UnsupportedOperationException("ROS2 serialization is not supported yet.");
         }
     }
-
-    @Override
-    protected void serializeAndSend(
-        FedConnectionInstance connection,
-        InferredType type,
-        String sendRef,
-        CodeBuilder result,
-        String sendingFunction,
-        String commonArgs,
-        ErrorReporter errorReporter
-    ) {
-        String lengthExpression = "";
-        String pointerExpression = "";
-        switch (connection.getSerializer()) {
-        case NATIVE: {
-            var variableToSerialize = sendRef + "->value";
-            FedNativePythonSerialization pickler = new FedNativePythonSerialization();
-            lengthExpression = pickler.serializedBufferLength();
-            pointerExpression = pickler.seializedBufferVar();
-            result.pr(pickler.generateNetworkSerializerCode(variableToSerialize, null));
-            result.pr(
-                "size_t message_length = " + lengthExpression + ";");
-            result.pr(
-                sendingFunction + "(" + commonArgs + ", " + pointerExpression
-                    + ");\n");
-            break;
+  }
+
+  @Override
+  protected void serializeAndSend(
+      FedConnectionInstance connection,
+      InferredType type,
+      String sendRef,
+      CodeBuilder result,
+      String sendingFunction,
+      String commonArgs,
+      ErrorReporter errorReporter) {
+    String lengthExpression = "";
+    String pointerExpression = "";
+    switch (connection.getSerializer()) {
+      case NATIVE:
+        {
+          var variableToSerialize = sendRef + "->value";
+          FedNativePythonSerialization pickler = new FedNativePythonSerialization();
+          lengthExpression = pickler.serializedBufferLength();
+          pointerExpression = pickler.seializedBufferVar();
+          result.pr(pickler.generateNetworkSerializerCode(variableToSerialize, null));
+          result.pr("size_t message_length = " + lengthExpression + ";");
+          result.pr(sendingFunction + "(" + commonArgs + ", " + pointerExpression + ");\n");
+          break;
         }
-        case PROTO: {
-            throw new UnsupportedOperationException("Protbuf serialization is not supported yet.");
+      case PROTO:
+        {
+          throw new UnsupportedOperationException("Protbuf serialization is not supported yet.");
         }
-        case ROS2: {
-            throw new UnsupportedOperationException("ROS2 serialization is not supported yet.");
-        }
-
+      case ROS2:
+        {
+          throw new UnsupportedOperationException("ROS2 serialization is not supported yet.");
         }
     }
+  }
 
-    @Override
-    public void annotateReaction(Reaction reaction) {
-        ASTUtils.addReactionAttribute(reaction, "_c_body");
-    }
+  @Override
+  public void annotateReaction(Reaction reaction) {
+    ASTUtils.addReactionAttribute(reaction, "_c_body");
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/extensions/TSExtension.java b/org.lflang/src/org/lflang/federated/extensions/TSExtension.java
index 4a70f4cc6b..b52b739803 100644
--- a/org.lflang/src/org/lflang/federated/extensions/TSExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/TSExtension.java
@@ -6,12 +6,11 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedASTUtils;
 import org.lflang.federated.generator.FedConnectionInstance;
 import org.lflang.federated.generator.FedFileConfig;
@@ -27,73 +26,94 @@
 import org.lflang.lf.Variable;
 
 public class TSExtension implements FedTargetExtension {
-    @Override
-    public void initializeTargetConfig(LFGeneratorContext context, int numOfFederates, FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter, RtiConfig rtiConfig) throws IOException {
-
-    }
+  @Override
+  public void initializeTargetConfig(
+      LFGeneratorContext context,
+      int numOfFederates,
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      ErrorReporter errorReporter,
+      RtiConfig rtiConfig)
+      throws IOException {}
 
-    @Override
-    public String generateNetworkReceiverBody(Action action, VarRef sendingPort, VarRef receivingPort, FedConnectionInstance connection, InferredType type, CoordinationType coordinationType, ErrorReporter errorReporter) {
-        return """
+  @Override
+  public String generateNetworkReceiverBody(
+      Action action,
+      VarRef sendingPort,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      CoordinationType coordinationType,
+      ErrorReporter errorReporter) {
+    return """
         // generateNetworkReceiverBody
         if (%1$s !== undefined) {
             %2$s.%3$s = %1$s;
         }
-        """.formatted(
+        """
+        .formatted(
             action.getName(),
             receivingPort.getContainer().getName(),
-            receivingPort.getVariable().getName()
-        );
-    }
+            receivingPort.getVariable().getName());
+  }
 
-    @Override
-    public String generateNetworkSenderBody(VarRef sendingPort, VarRef receivingPort, FedConnectionInstance connection, InferredType type, CoordinationType coordinationType, ErrorReporter errorReporter) {
-        return"""
+  @Override
+  public String generateNetworkSenderBody(
+      VarRef sendingPort,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      CoordinationType coordinationType,
+      ErrorReporter errorReporter) {
+    return """
         if (%1$s.%2$s !== undefined) {
             this.util.sendRTITimedMessage(%1$s.%2$s, %3$s, %4$s, %5$s);
         }
-        """.formatted(
+        """
+        .formatted(
             sendingPort.getContainer().getName(),
             sendingPort.getVariable().getName(),
             connection.getDstFederate().id,
             connection.getDstFederate().networkMessageActions.size(),
-            getNetworkDelayLiteral(connection.getDefinition().getDelay())
-        );
-    }
+            getNetworkDelayLiteral(connection.getDefinition().getDelay()));
+  }
 
-    private String getNetworkDelayLiteral(Expression e) {
-        var cLiteral = CExtensionUtils.getNetworkDelayLiteral(e);
-        return cLiteral.equals("NEVER") ? "0" : cLiteral;
-    }
+  private String getNetworkDelayLiteral(Expression e) {
+    var cLiteral = CExtensionUtils.getNetworkDelayLiteral(e);
+    return cLiteral.equals("NEVER") ? "0" : cLiteral;
+  }
 
-    @Override
-    public String generateNetworkInputControlReactionBody(int receivingPortID, TimeValue maxSTP, CoordinationType coordination) {
-        return "// TODO(hokeun): Figure out what to do for generateNetworkInputControlReactionBody";
-    }
+  @Override
+  public String generateNetworkInputControlReactionBody(
+      int receivingPortID, TimeValue maxSTP, CoordinationType coordination) {
+    return "// TODO(hokeun): Figure out what to do for generateNetworkInputControlReactionBody";
+  }
 
-    @Override
-    public String generateNetworkOutputControlReactionBody(VarRef srcOutputPort, FedConnectionInstance connection) {
-        return "// TODO(hokeun): Figure out what to do for generateNetworkOutputControlReactionBody";
-    }
+  @Override
+  public String generateNetworkOutputControlReactionBody(
+      VarRef srcOutputPort, FedConnectionInstance connection) {
+    return "// TODO(hokeun): Figure out what to do for generateNetworkOutputControlReactionBody";
+  }
 
-    @Override
-    public String getNetworkBufferType() {
-        return "";
-    }
+  @Override
+  public String getNetworkBufferType() {
+    return "";
+  }
 
-    /**
-     * Add necessary preamble to the source to set up federated execution.
-     *
-     * @return
-     */
-    @Override
-    public String generatePreamble(FederateInstance federate, FedFileConfig fileConfig,
-                                   RtiConfig rtiConfig,
-                                   ErrorReporter errorReporter) {
-        var minOutputDelay = getMinOutputDelay(federate, fileConfig, errorReporter);
-        var upstreamConnectionDelays = getUpstreamConnectionDelays(federate);
-        return
-        """
+  /**
+   * Add necessary preamble to the source to set up federated execution.
+   *
+   * @return
+   */
+  @Override
+  public String generatePreamble(
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      RtiConfig rtiConfig,
+      ErrorReporter errorReporter) {
+    var minOutputDelay = getMinOutputDelay(federate, fileConfig, errorReporter);
+    var upstreamConnectionDelays = getUpstreamConnectionDelays(federate);
+    return """
         const defaultFederateConfig: __FederateConfig = {
             dependsOn: [%s],
             executionTimeout: undefined,
@@ -108,94 +128,101 @@ public String generatePreamble(FederateInstance federate, FedFileConfig fileConf
             sendsTo: [%s],
             upstreamConnectionDelays: [%s]
         }
-            """.formatted(
+            """
+        .formatted(
             federate.dependsOn.keySet().stream()
-                              .map(e->String.valueOf(e.id))
-                              .collect(Collectors.joining(",")),
+                .map(e -> String.valueOf(e.id))
+                .collect(Collectors.joining(",")),
             federate.id,
-            minOutputDelay == null ? "undefined"
-                                   : "%s".formatted(TSTypes.getInstance().getTargetTimeExpr(minOutputDelay)),
-            federate.networkMessageActions
-                .stream()
+            minOutputDelay == null
+                ? "undefined"
+                : "%s".formatted(TSTypes.getInstance().getTargetTimeExpr(minOutputDelay)),
+            federate.networkMessageActions.stream()
                 .map(Variable::getName)
                 .collect(Collectors.joining(",", "\"", "\"")),
             rtiConfig.getHost(),
             rtiConfig.getPort(),
             federate.sendsTo.keySet().stream()
-                            .map(e->String.valueOf(e.id))
-                            .collect(Collectors.joining(",")),
-            upstreamConnectionDelays.stream().collect(Collectors.joining(","))
-        );
-    }
+                .map(e -> String.valueOf(e.id))
+                .collect(Collectors.joining(",")),
+            upstreamConnectionDelays.stream().collect(Collectors.joining(",")));
+  }
 
-    private TimeValue getMinOutputDelay(FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-        if (federate.targetConfig.coordination.equals(CoordinationType.CENTRALIZED)) {
-            // If this program uses centralized coordination then check
-            // for outputs that depend on physical actions so that null messages can be
-            // sent to the RTI.
-            var federateClass = ASTUtils.toDefinition(federate.instantiation.getReactorClass());
-            var main = new ReactorInstance(FedASTUtils.findFederatedReactor(federate.instantiation.eResource()), errorReporter, 1);
-            var instance = new ReactorInstance(federateClass, main, errorReporter);
-            var outputDelayMap = federate
-                .findOutputsConnectedToPhysicalActions(instance);
-            var minOutputDelay = TimeValue.MAX_VALUE;
-            Output outputFound = null;
-            for (Output output : outputDelayMap.keySet()) {
-                var outputDelay = outputDelayMap.get(output);
-                if (outputDelay.isEarlierThan(minOutputDelay)) {
-                    minOutputDelay = outputDelay;
-                    outputFound = output;
-                }
-            }
-            if (minOutputDelay != TimeValue.MAX_VALUE) {
-                // Unless silenced, issue a warning.
-                if (federate.targetConfig.coordinationOptions.advance_message_interval
-                    == null) {
-                    errorReporter.reportWarning(outputFound, String.join("\n",
-                                                                         "Found a path from a physical action to output for reactor "
-                                                                             + addDoubleQuotes(instance.getName())
-                                                                             + ". ",
-                                                                         "The amount of delay is "
-                                                                             + minOutputDelay
-                                                                             + ".",
-                                                                         "With centralized coordination, this can result in a large number of messages to the RTI.",
-                                                                         "Consider refactoring the code so that the output does not depend on the physical action,",
-                                                                         "or consider using decentralized coordination. To silence this warning, set the target",
-                                                                         "parameter coordination-options with a value like {advance-message-interval: 10 msec}"
-                    ));
-                }
-                return minOutputDelay;
-            }
+  private TimeValue getMinOutputDelay(
+      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+    if (federate.targetConfig.coordination.equals(CoordinationType.CENTRALIZED)) {
+      // If this program uses centralized coordination then check
+      // for outputs that depend on physical actions so that null messages can be
+      // sent to the RTI.
+      var federateClass = ASTUtils.toDefinition(federate.instantiation.getReactorClass());
+      var main =
+          new ReactorInstance(
+              FedASTUtils.findFederatedReactor(federate.instantiation.eResource()),
+              errorReporter,
+              1);
+      var instance = new ReactorInstance(federateClass, main, errorReporter);
+      var outputDelayMap = federate.findOutputsConnectedToPhysicalActions(instance);
+      var minOutputDelay = TimeValue.MAX_VALUE;
+      Output outputFound = null;
+      for (Output output : outputDelayMap.keySet()) {
+        var outputDelay = outputDelayMap.get(output);
+        if (outputDelay.isEarlierThan(minOutputDelay)) {
+          minOutputDelay = outputDelay;
+          outputFound = output;
         }
-        return null;
+      }
+      if (minOutputDelay != TimeValue.MAX_VALUE) {
+        // Unless silenced, issue a warning.
+        if (federate.targetConfig.coordinationOptions.advance_message_interval == null) {
+          errorReporter.reportWarning(
+              outputFound,
+              String.join(
+                  "\n",
+                  "Found a path from a physical action to output for reactor "
+                      + addDoubleQuotes(instance.getName())
+                      + ". ",
+                  "The amount of delay is " + minOutputDelay + ".",
+                  "With centralized coordination, this can result in a large number of messages to"
+                      + " the RTI.",
+                  "Consider refactoring the code so that the output does not depend on the physical"
+                      + " action,",
+                  "or consider using decentralized coordination. To silence this warning, set the"
+                      + " target",
+                  "parameter coordination-options with a value like {advance-message-interval: 10"
+                      + " msec}"));
+        }
+        return minOutputDelay;
+      }
     }
+    return null;
+  }
 
-    private List<String> getUpstreamConnectionDelays(FederateInstance federate) {
-        List<String> candidates = new ArrayList<>();
-        if (!federate.dependsOn.keySet().isEmpty()) {
-            for (FederateInstance upstreamFederate: federate.dependsOn.keySet()) {
-                String element = "[";
-                var delays = federate.dependsOn.get(upstreamFederate);
-                int cnt = 0;
-                if (delays != null) {
-                    for (Expression delay : delays) {
-                        if (delay == null) {
-                            element += "TimeValue.NEVER()";
-                        } else {
-                            element += "TimeValue.nsec(" + getNetworkDelayLiteral(delay) + ")";
-                        }
-                        cnt++;
-                        if (cnt != delays.size()) {
-                            element += ", ";
-                        }
-                    }
-                } else {
-                    element += "TimeValue.NEVER()";
-                }
-                element += "]";
-                candidates.add(element);
+  private List<String> getUpstreamConnectionDelays(FederateInstance federate) {
+    List<String> candidates = new ArrayList<>();
+    if (!federate.dependsOn.keySet().isEmpty()) {
+      for (FederateInstance upstreamFederate : federate.dependsOn.keySet()) {
+        String element = "[";
+        var delays = federate.dependsOn.get(upstreamFederate);
+        int cnt = 0;
+        if (delays != null) {
+          for (Expression delay : delays) {
+            if (delay == null) {
+              element += "TimeValue.NEVER()";
+            } else {
+              element += "TimeValue.nsec(" + getNetworkDelayLiteral(delay) + ")";
+            }
+            cnt++;
+            if (cnt != delays.size()) {
+              element += ", ";
             }
+          }
+        } else {
+          element += "TimeValue.NEVER()";
         }
-        return candidates;
+        element += "]";
+        candidates.add(element);
+      }
     }
+    return candidates;
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java b/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
index cedb9da017..338fbff242 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
@@ -27,6 +27,7 @@
 
 package org.lflang.federated.generator;
 
+import com.google.common.collect.Iterators;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -38,17 +39,15 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.ModelInfo;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.extensions.FedTargetExtensionFactory;
 import org.lflang.federated.serialization.SupportedSerializers;
 import org.lflang.generator.PortInstance;
@@ -68,795 +67,740 @@
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
 
-import com.google.common.collect.Iterators;
-
 /**
- * A helper class for AST transformations needed for federated
- * execution.
+ * A helper class for AST transformations needed for federated execution.
  *
  * @author Soroush Bateni
  * @author Edward A. Lee
  */
 public class FedASTUtils {
 
-    /**
-     * Map from reactions to bank indices
-     */
-    private static Map<Reaction,Integer> reactionBankIndices = null;
-
-    /**
-     * Mark the specified reaction to belong to only the specified
-     * bank index. This is needed because reactions cannot declare
-     * a specific bank index as an effect or trigger. Reactions that
-     * send messages between federates, including absent messages,
-     * need to be specific to a bank member.
-     * @param reaction The reaction.
-     * @param bankIndex The bank index, or -1 if there is no bank.
-     */
-    public static void setReactionBankIndex(Reaction reaction, int bankIndex) {
-        if (bankIndex < 0) {
-            return;
-        }
-        if (reactionBankIndices == null) {
-            reactionBankIndices = new LinkedHashMap<>();
-        }
-        reactionBankIndices.put(reaction, bankIndex);
+  /** Map from reactions to bank indices */
+  private static Map<Reaction, Integer> reactionBankIndices = null;
+
+  /**
+   * Mark the specified reaction to belong to only the specified bank index. This is needed because
+   * reactions cannot declare a specific bank index as an effect or trigger. Reactions that send
+   * messages between federates, including absent messages, need to be specific to a bank member.
+   *
+   * @param reaction The reaction.
+   * @param bankIndex The bank index, or -1 if there is no bank.
+   */
+  public static void setReactionBankIndex(Reaction reaction, int bankIndex) {
+    if (bankIndex < 0) {
+      return;
     }
-
-    /**
-     * Return the reaction bank index.
-     * @see #setReactionBankIndex(Reaction reaction, int bankIndex)
-     * @param reaction The reaction.
-     * @return The reaction bank index, if one has been set, and -1 otherwise.
-     */
-    public static int getReactionBankIndex(Reaction reaction) {
-        if (reactionBankIndices == null) return -1;
-        if (reactionBankIndices.get(reaction) == null) return -1;
-        return reactionBankIndices.get(reaction);
-    }
-
-    /**
-     * Find the federated reactor in a .lf file.
-     *
-     * @param resource Resource representing a .lf file.
-     * @return The federated reactor if found.
-     */
-    public static Reactor findFederatedReactor(Resource resource) {
-        return IteratorExtensions.findFirst(
-            Iterators.filter(resource.getAllContents(), Reactor.class),
-            Reactor::isFederated
-        );
+    if (reactionBankIndices == null) {
+      reactionBankIndices = new LinkedHashMap<>();
     }
-
-    /**
-     * Replace the specified connection with communication between federates.
-     *
-     * @param connection   Network connection between two federates.
-     * @param coordination One of CoordinationType.DECENTRALIZED or
-     *                     CoordinationType.CENTRALIZED.
-     * @param errorReporter Used to report errors encountered.
-     */
-    public static void makeCommunication(
-        FedConnectionInstance connection,
-        CoordinationType coordination,
-        ErrorReporter errorReporter
+    reactionBankIndices.put(reaction, bankIndex);
+  }
+
+  /**
+   * Return the reaction bank index.
+   *
+   * @see #setReactionBankIndex(Reaction reaction, int bankIndex)
+   * @param reaction The reaction.
+   * @return The reaction bank index, if one has been set, and -1 otherwise.
+   */
+  public static int getReactionBankIndex(Reaction reaction) {
+    if (reactionBankIndices == null) return -1;
+    if (reactionBankIndices.get(reaction) == null) return -1;
+    return reactionBankIndices.get(reaction);
+  }
+
+  /**
+   * Find the federated reactor in a .lf file.
+   *
+   * @param resource Resource representing a .lf file.
+   * @return The federated reactor if found.
+   */
+  public static Reactor findFederatedReactor(Resource resource) {
+    return IteratorExtensions.findFirst(
+        Iterators.filter(resource.getAllContents(), Reactor.class), Reactor::isFederated);
+  }
+
+  /**
+   * Replace the specified connection with communication between federates.
+   *
+   * @param connection Network connection between two federates.
+   * @param coordination One of CoordinationType.DECENTRALIZED or CoordinationType.CENTRALIZED.
+   * @param errorReporter Used to report errors encountered.
+   */
+  public static void makeCommunication(
+      FedConnectionInstance connection,
+      CoordinationType coordination,
+      ErrorReporter errorReporter) {
+
+    // Add the sender reaction.
+    addNetworkSenderReaction(connection, coordination, errorReporter);
+
+    // Next, generate control reactions
+    if (!connection.getDefinition().isPhysical()
+        &&
+        // Connections that are physical don't need control reactions
+        connection.getDefinition().getDelay()
+            == null // Connections that have delays don't need control reactions
     ) {
+      // Add the network output control reaction to the parent
+      FedASTUtils.addNetworkOutputControlReaction(connection);
 
-        // Add the sender reaction.
-        addNetworkSenderReaction(
-            connection,
-            coordination,
-            errorReporter
-        );
-
-        // Next, generate control reactions
-        if (
-            !connection.getDefinition().isPhysical() &&
-                // Connections that are physical don't need control reactions
-                connection.getDefinition().getDelay()
-                    == null // Connections that have delays don't need control reactions
-        ) {
-            // Add the network output control reaction to the parent
-            FedASTUtils.addNetworkOutputControlReaction(connection);
-
-            // Add the network input control reaction to the parent
-            FedASTUtils.addNetworkInputControlReaction(connection, coordination, errorReporter);
-        }
-
-        // Create the network action (@see createNetworkAction)
-        Action networkAction = createNetworkAction(connection);
-
-        // Keep track of this action in the destination federate.
-        connection.dstFederate.networkMessageActions.add(networkAction);
-
-        // Add the action definition to the parent reactor.
-        ((Reactor) connection.getDefinition().eContainer()).getActions().add(networkAction);
-
-        // Add the network receiver reaction in the destinationFederate
-        addNetworkReceiverReaction(
-            networkAction,
-            connection,
-            coordination,
-            errorReporter
-        );
+      // Add the network input control reaction to the parent
+      FedASTUtils.addNetworkInputControlReaction(connection, coordination, errorReporter);
     }
 
-    /**
-     * Create a "network action" in the reactor that contains the given
-     * connection and return it.
-     *
-     * The purpose of this action is to serve as a trigger for a "network
-     * input reaction" that is responsible for relaying messages to the
-     * port that is on the receiving side of the given connection. The
-     * connection is assumed to be between two reactors that reside in
-     * distinct federates. Hence, the container of the connection is
-     * assumed to be top-level.
-     *
-     * @param connection A connection between two federates
-     * @return The newly created action.
-     */
-    private static Action createNetworkAction(FedConnectionInstance connection) {
-        Reactor top = (Reactor) connection.getDefinition().eContainer();
-        LfFactory factory = LfFactory.eINSTANCE;
-
-        Action action = factory.createAction();
-        // Name the newly created action; set its delay and type.
-        action.setName(ASTUtils.getUniqueIdentifier(top, "networkMessage"));
-        if (connection.serializer == SupportedSerializers.NATIVE) {
-            action.setType(EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getType()));
-        } else {
-            Type action_type = factory.createType();
-            action_type.setId(
-                FedTargetExtensionFactory.getExtension(
-                    connection.srcFederate.targetConfig.target
-                                   ).getNetworkBufferType()
-            );
-            action.setType(action_type);
-        }
-
-        // The connection is 'physical' if it uses the ~> notation.
-        if (connection.getDefinition().isPhysical()) {
-            action.setOrigin(ActionOrigin.PHYSICAL);
-            // Messages sent on physical connections do not
-            // carry a timestamp, or a delay. The delay
-            // provided using after is enforced by setting
-            // the minDelay.
-            if (connection.getDefinition().getDelay() != null) {
-                action.setMinDelay(connection.getDefinition().getDelay());
-            }
-        } else {
-            action.setOrigin(ActionOrigin.LOGICAL);
-        }
+    // Create the network action (@see createNetworkAction)
+    Action networkAction = createNetworkAction(connection);
+
+    // Keep track of this action in the destination federate.
+    connection.dstFederate.networkMessageActions.add(networkAction);
+
+    // Add the action definition to the parent reactor.
+    ((Reactor) connection.getDefinition().eContainer()).getActions().add(networkAction);
+
+    // Add the network receiver reaction in the destinationFederate
+    addNetworkReceiverReaction(networkAction, connection, coordination, errorReporter);
+  }
+
+  /**
+   * Create a "network action" in the reactor that contains the given connection and return it.
+   *
+   * <p>The purpose of this action is to serve as a trigger for a "network input reaction" that is
+   * responsible for relaying messages to the port that is on the receiving side of the given
+   * connection. The connection is assumed to be between two reactors that reside in distinct
+   * federates. Hence, the container of the connection is assumed to be top-level.
+   *
+   * @param connection A connection between two federates
+   * @return The newly created action.
+   */
+  private static Action createNetworkAction(FedConnectionInstance connection) {
+    Reactor top = (Reactor) connection.getDefinition().eContainer();
+    LfFactory factory = LfFactory.eINSTANCE;
+
+    Action action = factory.createAction();
+    // Name the newly created action; set its delay and type.
+    action.setName(ASTUtils.getUniqueIdentifier(top, "networkMessage"));
+    if (connection.serializer == SupportedSerializers.NATIVE) {
+      action.setType(EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getType()));
+    } else {
+      Type action_type = factory.createType();
+      action_type.setId(
+          FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
+              .getNetworkBufferType());
+      action.setType(action_type);
+    }
 
-        return action;
+    // The connection is 'physical' if it uses the ~> notation.
+    if (connection.getDefinition().isPhysical()) {
+      action.setOrigin(ActionOrigin.PHYSICAL);
+      // Messages sent on physical connections do not
+      // carry a timestamp, or a delay. The delay
+      // provided using after is enforced by setting
+      // the minDelay.
+      if (connection.getDefinition().getDelay() != null) {
+        action.setMinDelay(connection.getDefinition().getDelay());
+      }
+    } else {
+      action.setOrigin(ActionOrigin.LOGICAL);
     }
 
-    /**
-     * Add a network receiver reaction for a given input port 'destination' to
-     * destination's parent reactor. This reaction will react to a generated
-     * 'networkAction' (triggered asynchronously, e.g., by federate.c). This
-     * 'networkAction' will contain the actual message that is sent by the
-     * sender
-     * in 'action->value'. This value is forwarded to 'destination' in the
-     * network
-     * receiver reaction.
-     *
-     * @param networkAction       The network action (also, @see createNetworkAction)
-     * @param connection          FIXME
-     * @param coordination        One of CoordinationType.DECENTRALIZED or
-     *                            CoordinationType.CENTRALIZED.
-     * @note: Used in federated execution
-     */
-    private static void addNetworkReceiverReaction(
-        Action networkAction,
-        FedConnectionInstance connection,
-        CoordinationType coordination,
-        ErrorReporter errorReporter
-    ) {
-        LfFactory factory = LfFactory.eINSTANCE;
-        VarRef sourceRef = factory.createVarRef();
-        VarRef destRef = factory.createVarRef();
-        Reactor parent = (Reactor) connection.getDefinition().eContainer();
-        Reaction networkReceiverReaction = factory.createReaction();
-
-        // If the sender or receiver is in a bank of reactors, then we want
-        // these reactions to appear only in the federate whose bank ID matches.
-        setReactionBankIndex(networkReceiverReaction, connection.getDstBank());
-
-        // FIXME: do not create a new extension every time it is used
-        FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
-                                 .annotateReaction(networkReceiverReaction);
-
-        // The connection is 'physical' if it uses the ~> notation.
-        if (connection.getDefinition().isPhysical()) {
-            connection.dstFederate.inboundP2PConnections.add(connection.srcFederate);
-        } else {
-            // If the connection is logical but coordination
-            // is decentralized, we would need
-            // to make P2P connections
-            if (coordination == CoordinationType.DECENTRALIZED) {
-                connection.dstFederate.inboundP2PConnections.add(connection.srcFederate);
-            }
-        }
+    return action;
+  }
+
+  /**
+   * Add a network receiver reaction for a given input port 'destination' to destination's parent
+   * reactor. This reaction will react to a generated 'networkAction' (triggered asynchronously,
+   * e.g., by federate.c). This 'networkAction' will contain the actual message that is sent by the
+   * sender in 'action->value'. This value is forwarded to 'destination' in the network receiver
+   * reaction.
+   *
+   * @param networkAction The network action (also, @see createNetworkAction)
+   * @param connection FIXME
+   * @param coordination One of CoordinationType.DECENTRALIZED or CoordinationType.CENTRALIZED.
+   * @note: Used in federated execution
+   */
+  private static void addNetworkReceiverReaction(
+      Action networkAction,
+      FedConnectionInstance connection,
+      CoordinationType coordination,
+      ErrorReporter errorReporter) {
+    LfFactory factory = LfFactory.eINSTANCE;
+    VarRef sourceRef = factory.createVarRef();
+    VarRef destRef = factory.createVarRef();
+    Reactor parent = (Reactor) connection.getDefinition().eContainer();
+    Reaction networkReceiverReaction = factory.createReaction();
+
+    // If the sender or receiver is in a bank of reactors, then we want
+    // these reactions to appear only in the federate whose bank ID matches.
+    setReactionBankIndex(networkReceiverReaction, connection.getDstBank());
+
+    // FIXME: do not create a new extension every time it is used
+    FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
+        .annotateReaction(networkReceiverReaction);
+
+    // The connection is 'physical' if it uses the ~> notation.
+    if (connection.getDefinition().isPhysical()) {
+      connection.dstFederate.inboundP2PConnections.add(connection.srcFederate);
+    } else {
+      // If the connection is logical but coordination
+      // is decentralized, we would need
+      // to make P2P connections
+      if (coordination == CoordinationType.DECENTRALIZED) {
+        connection.dstFederate.inboundP2PConnections.add(connection.srcFederate);
+      }
+    }
 
-        // Establish references to the involved ports.
-        sourceRef.setContainer(connection.getSourcePortInstance().getParent().getDefinition());
-        sourceRef.setVariable(connection.getSourcePortInstance().getDefinition());
-        destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
-        destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
-
-        // Add the input port at the receiver federate reactor as an effect
-        networkReceiverReaction.getEffects().add(destRef);
-
-        VarRef triggerRef = factory.createVarRef();
-        // Establish references to the action.
-        triggerRef.setVariable(networkAction);
-        // Add the action as a trigger to the receiver reaction
-        networkReceiverReaction.getTriggers().add(triggerRef);
-
-        // Generate code for the network receiver reaction
-        networkReceiverReaction.setCode(factory.createCode());
-        networkReceiverReaction.getCode().setBody(
-            FedTargetExtensionFactory.getExtension(
-                connection.dstFederate.targetConfig.target).generateNetworkReceiverBody(
+    // Establish references to the involved ports.
+    sourceRef.setContainer(connection.getSourcePortInstance().getParent().getDefinition());
+    sourceRef.setVariable(connection.getSourcePortInstance().getDefinition());
+    destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
+    destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
+
+    // Add the input port at the receiver federate reactor as an effect
+    networkReceiverReaction.getEffects().add(destRef);
+
+    VarRef triggerRef = factory.createVarRef();
+    // Establish references to the action.
+    triggerRef.setVariable(networkAction);
+    // Add the action as a trigger to the receiver reaction
+    networkReceiverReaction.getTriggers().add(triggerRef);
+
+    // Generate code for the network receiver reaction
+    networkReceiverReaction.setCode(factory.createCode());
+    networkReceiverReaction
+        .getCode()
+        .setBody(
+            FedTargetExtensionFactory.getExtension(connection.dstFederate.targetConfig.target)
+                .generateNetworkReceiverBody(
                     networkAction,
                     sourceRef,
                     destRef,
                     connection,
                     ASTUtils.getInferredType(networkAction),
                     coordination,
-                    errorReporter
-            ));
-
-
-        ASTUtils.addReactionAttribute(networkReceiverReaction, "_unordered");
-
-        // Add the receiver reaction to the parent
-        parent.getReactions().add(networkReceiverReaction);
-
-        // Add the network receiver reaction to the federate instance's list
-        // of network reactions
-        connection.dstFederate.networkReactions.add(networkReceiverReaction);
-
-
-        if (
-            !connection.getDefinition().isPhysical() &&
-                // Connections that are physical don't need control reactions
-                connection.getDefinition().getDelay()
-                    == null // Connections that have delays don't need control reactions
-        ) {
-            // Add necessary dependencies to reaction to ensure that it executes correctly
-            // relative to other network input control reactions in the federate.
-            addRelativeDependency(connection, networkReceiverReaction, errorReporter);
-        }
-    }
+                    errorReporter));
 
-    /**
-     * Add a network control reaction for a given input port 'destination' to
-     * destination's parent reactor. This reaction will block for
-     * any valid logical time until it is known whether the trigger for the
-     * action corresponding to the given port is present or absent.
-     *
-     * @param connection    FIXME
-     * @param coordination  FIXME
-     * @param errorReporter
-     * @note Used in federated execution
-     */
-    private static void addNetworkInputControlReaction(
-        FedConnectionInstance connection,
-        CoordinationType coordination,
-        ErrorReporter errorReporter) {
-
-        LfFactory factory = LfFactory.eINSTANCE;
-        Reaction reaction = factory.createReaction();
-        VarRef destRef = factory.createVarRef();
-        int receivingPortID = connection.dstFederate.networkMessageActions.size();
-
-        // If the sender or receiver is in a bank of reactors, then we want
-        // these reactions to appear only in the federate whose bank ID matches.
-        setReactionBankIndex(reaction, connection.getDstBank());
-
-        // FIXME: do not create a new extension every time it is used
-        FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
-                                 .annotateReaction(reaction);
-
-        // Create a new action that will be used to trigger the
-        // input control reactions.
-        Action newTriggerForControlReactionInput = factory.createAction();
-        newTriggerForControlReactionInput.setOrigin(ActionOrigin.LOGICAL);
-
-        // Set the container and variable according to the network port
-        destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
-        destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
-
-        Reactor top = connection.getDestinationPortInstance()
-                                .getParent()
-                                .getParent().reactorDefinition;
-
-        newTriggerForControlReactionInput.setName(
-            ASTUtils.getUniqueIdentifier(top, "inputControlReactionTrigger"));
-
-        // Add the newly created Action to the action list of the federated reactor.
-        top.getActions().add(newTriggerForControlReactionInput);
-
-        // Create the trigger for the reaction
-        VarRef newTriggerForControlReaction = factory.createVarRef();
-        newTriggerForControlReaction.setVariable(newTriggerForControlReactionInput);
-
-        // Add the appropriate triggers to the list of triggers of the reaction
-        reaction.getTriggers().add(newTriggerForControlReaction);
-
-        // Add the destination port as an effect of the reaction
-        reaction.getEffects().add(destRef);
-
-        // Generate code for the network input control reaction
-        reaction.setCode(factory.createCode());
-
-        TimeValue maxSTP = findMaxSTP(connection, coordination);
-
-        reaction.getCode()
-                .setBody(
-                    FedTargetExtensionFactory
-                        .getExtension(connection.dstFederate.targetConfig.target)
-                        .generateNetworkInputControlReactionBody(
-                            receivingPortID,
-                            maxSTP,
-                            coordination
-                        )
-                );
-
-        ASTUtils.addReactionAttribute(reaction, "_unordered");
-
-        // Insert the reaction
-        top.getReactions().add(reaction);
-
-        // Add the trigger for this reaction to the list of triggers, used to actually
-        // trigger the reaction at the beginning of each logical time.
-        connection.dstFederate.networkInputControlReactionsTriggers.add(newTriggerForControlReactionInput);
-
-        // Add the network input control reaction to the federate instance's list
-        // of network reactions
-        connection.dstFederate.networkReactions.add(reaction);
-
-        // Add necessary dependencies to reaction to ensure that it executes correctly
-        // relative to other network input control reactions in the federate.
-        addRelativeDependency(connection, reaction, errorReporter);
-    }
+    ASTUtils.addReactionAttribute(networkReceiverReaction, "_unordered");
 
-    /**
-     * Add necessary dependency information to the signature of {@code networkInputReaction} so that
-     * it can execute in the correct order relative to other network reactions in the federate.
-     *
-     * In particular, we want to avoid a deadlock if multiple network input control reactions in federate
-     * are in a zero-delay cycle through other federates in the federation. To avoid the deadlock, we encode the
-     * zero-delay cycle inside the federate by adding an artificial dependency from the output port of this federate
-     * that is involved in the cycle to the signature of {@code networkInputReaction} as a source.
-     */
-    private static void addRelativeDependency(
-        FedConnectionInstance connection,
-        Reaction networkInputReaction,
-        ErrorReporter errorReporter) {
-        var upstreamOutputPortsInFederate =
-            findUpstreamPortsInFederate(
-                connection.dstFederate,
-                connection.getSourcePortInstance(),
-                new HashSet<>(),
-                new HashSet<>()
-            );
-
-        ModelInfo info = new ModelInfo();
-        for (var port: upstreamOutputPortsInFederate) {
-            VarRef sourceRef = ASTUtils.factory.createVarRef();
-
-            sourceRef.setContainer(port.getParent().getDefinition());
-            sourceRef.setVariable(port.getDefinition());
-            networkInputReaction.getSources().add(sourceRef);
-
-            // Remove the port if it introduces cycles
-            info.update(
-                   (Model)networkInputReaction.eContainer().eContainer(),
-                    errorReporter
-                    );
-            if (!info.topologyCycles().isEmpty()) {
-                    networkInputReaction.getSources().remove(sourceRef);
-                }
-        }
+    // Add the receiver reaction to the parent
+    parent.getReactions().add(networkReceiverReaction);
 
-    }
+    // Add the network receiver reaction to the federate instance's list
+    // of network reactions
+    connection.dstFederate.networkReactions.add(networkReceiverReaction);
 
-    /**
-     * Go upstream from input port {@code port} until we reach one or more output
-     * ports that belong to the same federate.
-     *
-     * Along the path, we follow direct connections, as well as reactions, as long
-     * as there is no logical delay. When following reactions, we also follow
-     * dependant reactions (because we are traversing a potential cycle backwards).
-     *
-     * @return A set of {@link PortInstance}. If no port exist that match the
-     * criteria, return an empty set.
-     */
-    private static Set<PortInstance> findUpstreamPortsInFederate(
-        FederateInstance federate,
-        PortInstance port,
-        Set<PortInstance> visitedPorts,
-        Set<ReactionInstance>  reactionVisited
+    if (!connection.getDefinition().isPhysical()
+        &&
+        // Connections that are physical don't need control reactions
+        connection.getDefinition().getDelay()
+            == null // Connections that have delays don't need control reactions
     ) {
-        Set<PortInstance> toReturn = new HashSet<>();
-        if (port == null) return toReturn;
-        else if (federate.contains(port.getParent())) {
-            // Reached the requested federate
-            toReturn.add(port);
-            visitedPorts.add(port);
-        } else if (visitedPorts.contains(port)) {
-            return toReturn;
-        } else {
-            visitedPorts.add(port);
-            // Follow depends on reactions
-            port.getDependsOnReactions().forEach(
-                reaction -> {
-                    followReactionUpstream(federate, visitedPorts, toReturn, reaction, reactionVisited);
-                }
-            );
-            // Follow depends on ports
-            port.getDependsOnPorts().forEach(
-                it -> toReturn.addAll(
-                    findUpstreamPortsInFederate(federate, it.instance, visitedPorts, reactionVisited)
-                )
-            );
-        }
-        return toReturn;
+      // Add necessary dependencies to reaction to ensure that it executes correctly
+      // relative to other network input control reactions in the federate.
+      addRelativeDependency(connection, networkReceiverReaction, errorReporter);
     }
-
-    /**
-     * Follow reactions upstream. This is part of the algorithm of
-     * {@link #findUpstreamPortsInFederate(FederateInstance, PortInstance, Set)}.
-     */
-    private static void followReactionUpstream(
-        FederateInstance federate,
-        Set<PortInstance> visitedPorts,
-        Set<PortInstance> toReturn,
-        ReactionInstance reaction,
-        Set<ReactionInstance>  reactionVisited
-    ) {
-        if (reactionVisited.contains(reaction)) return;
-        reactionVisited.add(reaction);
-        // Add triggers
-        Set<VarRef> varRefsToFollow = new HashSet<>();
-        varRefsToFollow.addAll(
-            reaction.getDefinition()
-                    .getTriggers()
-                    .stream()
-                    .filter(
-                  trigger -> !(trigger instanceof BuiltinTriggerRef)
-              )
-              .map(VarRef.class::cast).toList());
-        // Add sources
-        varRefsToFollow.addAll(reaction.getDefinition().getSources());
-
-        // Follow everything upstream
-        varRefsToFollow.forEach(
-            varRef ->
-                toReturn.addAll(
-                    findUpstreamPortsInFederate(
-                        federate,
-                        reaction.getParent()
-                            .lookupPortInstance(varRef),
-                        visitedPorts,
-                        reactionVisited
-                    )
-                )
-        );
-
-        reaction.dependsOnReactions()
-                .stream()
-                .filter(
-                    // Stay within the reactor
-                    it -> it.getParent().equals(reaction.getParent())
-                )
-                .forEach(
-                    it -> followReactionUpstream(federate, visitedPorts, toReturn, it, reactionVisited)
-                );
-
-        // FIXME: This is most certainly wrong. Please fix it.
-        reaction.dependentReactions()
-                .stream()
-                .filter(
-                    // Stay within the reactor
-                    it -> it.getParent().equals(reaction.getParent())
-                )
-                .forEach(
-                    it -> followReactionUpstream(federate, visitedPorts, toReturn, it, reactionVisited)
-                );
+  }
+
+  /**
+   * Add a network control reaction for a given input port 'destination' to destination's parent
+   * reactor. This reaction will block for any valid logical time until it is known whether the
+   * trigger for the action corresponding to the given port is present or absent.
+   *
+   * @param connection FIXME
+   * @param coordination FIXME
+   * @param errorReporter
+   * @note Used in federated execution
+   */
+  private static void addNetworkInputControlReaction(
+      FedConnectionInstance connection,
+      CoordinationType coordination,
+      ErrorReporter errorReporter) {
+
+    LfFactory factory = LfFactory.eINSTANCE;
+    Reaction reaction = factory.createReaction();
+    VarRef destRef = factory.createVarRef();
+    int receivingPortID = connection.dstFederate.networkMessageActions.size();
+
+    // If the sender or receiver is in a bank of reactors, then we want
+    // these reactions to appear only in the federate whose bank ID matches.
+    setReactionBankIndex(reaction, connection.getDstBank());
+
+    // FIXME: do not create a new extension every time it is used
+    FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
+        .annotateReaction(reaction);
+
+    // Create a new action that will be used to trigger the
+    // input control reactions.
+    Action newTriggerForControlReactionInput = factory.createAction();
+    newTriggerForControlReactionInput.setOrigin(ActionOrigin.LOGICAL);
+
+    // Set the container and variable according to the network port
+    destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
+    destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
+
+    Reactor top = connection.getDestinationPortInstance().getParent().getParent().reactorDefinition;
+
+    newTriggerForControlReactionInput.setName(
+        ASTUtils.getUniqueIdentifier(top, "inputControlReactionTrigger"));
+
+    // Add the newly created Action to the action list of the federated reactor.
+    top.getActions().add(newTriggerForControlReactionInput);
+
+    // Create the trigger for the reaction
+    VarRef newTriggerForControlReaction = factory.createVarRef();
+    newTriggerForControlReaction.setVariable(newTriggerForControlReactionInput);
+
+    // Add the appropriate triggers to the list of triggers of the reaction
+    reaction.getTriggers().add(newTriggerForControlReaction);
+
+    // Add the destination port as an effect of the reaction
+    reaction.getEffects().add(destRef);
+
+    // Generate code for the network input control reaction
+    reaction.setCode(factory.createCode());
+
+    TimeValue maxSTP = findMaxSTP(connection, coordination);
+
+    reaction
+        .getCode()
+        .setBody(
+            FedTargetExtensionFactory.getExtension(connection.dstFederate.targetConfig.target)
+                .generateNetworkInputControlReactionBody(receivingPortID, maxSTP, coordination));
+
+    ASTUtils.addReactionAttribute(reaction, "_unordered");
+
+    // Insert the reaction
+    top.getReactions().add(reaction);
+
+    // Add the trigger for this reaction to the list of triggers, used to actually
+    // trigger the reaction at the beginning of each logical time.
+    connection.dstFederate.networkInputControlReactionsTriggers.add(
+        newTriggerForControlReactionInput);
+
+    // Add the network input control reaction to the federate instance's list
+    // of network reactions
+    connection.dstFederate.networkReactions.add(reaction);
+
+    // Add necessary dependencies to reaction to ensure that it executes correctly
+    // relative to other network input control reactions in the federate.
+    addRelativeDependency(connection, reaction, errorReporter);
+  }
+
+  /**
+   * Add necessary dependency information to the signature of {@code networkInputReaction} so that
+   * it can execute in the correct order relative to other network reactions in the federate.
+   *
+   * <p>In particular, we want to avoid a deadlock if multiple network input control reactions in
+   * federate are in a zero-delay cycle through other federates in the federation. To avoid the
+   * deadlock, we encode the zero-delay cycle inside the federate by adding an artificial dependency
+   * from the output port of this federate that is involved in the cycle to the signature of {@code
+   * networkInputReaction} as a source.
+   */
+  private static void addRelativeDependency(
+      FedConnectionInstance connection,
+      Reaction networkInputReaction,
+      ErrorReporter errorReporter) {
+    var upstreamOutputPortsInFederate =
+        findUpstreamPortsInFederate(
+            connection.dstFederate,
+            connection.getSourcePortInstance(),
+            new HashSet<>(),
+            new HashSet<>());
+
+    ModelInfo info = new ModelInfo();
+    for (var port : upstreamOutputPortsInFederate) {
+      VarRef sourceRef = ASTUtils.factory.createVarRef();
+
+      sourceRef.setContainer(port.getParent().getDefinition());
+      sourceRef.setVariable(port.getDefinition());
+      networkInputReaction.getSources().add(sourceRef);
+
+      // Remove the port if it introduces cycles
+      info.update((Model) networkInputReaction.eContainer().eContainer(), errorReporter);
+      if (!info.topologyCycles().isEmpty()) {
+        networkInputReaction.getSources().remove(sourceRef);
+      }
     }
-
-    /**
-     * Find the maximum STP offset for the given 'port'.
-     *
-     * An STP offset predicate can be nested in contained reactors in
-     * the federate.
-     *
-     * @param connection The connection to find the max STP offset for.
-     * @param coordination The coordination scheme.
-     * @return The maximum STP as a TimeValue
-     */
-    private static TimeValue findMaxSTP(FedConnectionInstance connection,
-                                        CoordinationType coordination) {
-        Variable port = connection.getDestinationPortInstance().getDefinition();
-        FederateInstance instance = connection.dstFederate;
-        Reactor reactor = connection.getDestinationPortInstance().getParent().reactorDefinition;
-
-        // Find a list of STP offsets (if any exists)
-        List<Expression> STPList = new LinkedList<>();
-
-        // First, check if there are any connections to contained reactors that
-        // need to be handled
-        List<Connection> connectionsWithPort = ASTUtils
-            .allConnections(reactor).stream().filter(c -> c.getLeftPorts()
-                                                           .stream()
-                                                           .anyMatch((VarRef v) -> v
-                                                               .getVariable().equals(port)))
+  }
+
+  /**
+   * Go upstream from input port {@code port} until we reach one or more output ports that belong to
+   * the same federate.
+   *
+   * <p>Along the path, we follow direct connections, as well as reactions, as long as there is no
+   * logical delay. When following reactions, we also follow dependant reactions (because we are
+   * traversing a potential cycle backwards).
+   *
+   * @return A set of {@link PortInstance}. If no port exist that match the criteria, return an
+   *     empty set.
+   */
+  private static Set<PortInstance> findUpstreamPortsInFederate(
+      FederateInstance federate,
+      PortInstance port,
+      Set<PortInstance> visitedPorts,
+      Set<ReactionInstance> reactionVisited) {
+    Set<PortInstance> toReturn = new HashSet<>();
+    if (port == null) return toReturn;
+    else if (federate.contains(port.getParent())) {
+      // Reached the requested federate
+      toReturn.add(port);
+      visitedPorts.add(port);
+    } else if (visitedPorts.contains(port)) {
+      return toReturn;
+    } else {
+      visitedPorts.add(port);
+      // Follow depends on reactions
+      port.getDependsOnReactions()
+          .forEach(
+              reaction -> {
+                followReactionUpstream(federate, visitedPorts, toReturn, reaction, reactionVisited);
+              });
+      // Follow depends on ports
+      port.getDependsOnPorts()
+          .forEach(
+              it ->
+                  toReturn.addAll(
+                      findUpstreamPortsInFederate(
+                          federate, it.instance, visitedPorts, reactionVisited)));
+    }
+    return toReturn;
+  }
+
+  /**
+   * Follow reactions upstream. This is part of the algorithm of {@link
+   * #findUpstreamPortsInFederate(FederateInstance, PortInstance, Set)}.
+   */
+  private static void followReactionUpstream(
+      FederateInstance federate,
+      Set<PortInstance> visitedPorts,
+      Set<PortInstance> toReturn,
+      ReactionInstance reaction,
+      Set<ReactionInstance> reactionVisited) {
+    if (reactionVisited.contains(reaction)) return;
+    reactionVisited.add(reaction);
+    // Add triggers
+    Set<VarRef> varRefsToFollow = new HashSet<>();
+    varRefsToFollow.addAll(
+        reaction.getDefinition().getTriggers().stream()
+            .filter(trigger -> !(trigger instanceof BuiltinTriggerRef))
+            .map(VarRef.class::cast)
+            .toList());
+    // Add sources
+    varRefsToFollow.addAll(reaction.getDefinition().getSources());
+
+    // Follow everything upstream
+    varRefsToFollow.forEach(
+        varRef ->
+            toReturn.addAll(
+                findUpstreamPortsInFederate(
+                    federate,
+                    reaction.getParent().lookupPortInstance(varRef),
+                    visitedPorts,
+                    reactionVisited)));
+
+    reaction.dependsOnReactions().stream()
+        .filter(
+            // Stay within the reactor
+            it -> it.getParent().equals(reaction.getParent()))
+        .forEach(
+            it -> followReactionUpstream(federate, visitedPorts, toReturn, it, reactionVisited));
+
+    // FIXME: This is most certainly wrong. Please fix it.
+    reaction.dependentReactions().stream()
+        .filter(
+            // Stay within the reactor
+            it -> it.getParent().equals(reaction.getParent()))
+        .forEach(
+            it -> followReactionUpstream(federate, visitedPorts, toReturn, it, reactionVisited));
+  }
+
+  /**
+   * Find the maximum STP offset for the given 'port'.
+   *
+   * <p>An STP offset predicate can be nested in contained reactors in the federate.
+   *
+   * @param connection The connection to find the max STP offset for.
+   * @param coordination The coordination scheme.
+   * @return The maximum STP as a TimeValue
+   */
+  private static TimeValue findMaxSTP(
+      FedConnectionInstance connection, CoordinationType coordination) {
+    Variable port = connection.getDestinationPortInstance().getDefinition();
+    FederateInstance instance = connection.dstFederate;
+    Reactor reactor = connection.getDestinationPortInstance().getParent().reactorDefinition;
+
+    // Find a list of STP offsets (if any exists)
+    List<Expression> STPList = new LinkedList<>();
+
+    // First, check if there are any connections to contained reactors that
+    // need to be handled
+    List<Connection> connectionsWithPort =
+        ASTUtils.allConnections(reactor).stream()
+            .filter(
+                c -> c.getLeftPorts().stream().anyMatch((VarRef v) -> v.getVariable().equals(port)))
             .collect(Collectors.toList());
 
+    // Find the list of reactions that have the port as trigger or source
+    // (could be a variable name)
+    List<Reaction> reactionsWithPort =
+        ASTUtils.allReactions(reactor).stream()
+            .filter(
+                r -> {
+                  // Check the triggers of reaction r first
+                  return r.getTriggers().stream()
+                          .anyMatch(
+                              t -> {
+                                if (t instanceof VarRef) {
+                                  // Check if the variables match
+                                  return ((VarRef) t).getVariable() == port;
+                                } else {
+                                  // Not a network port (startup or shutdown)
+                                  return false;
+                                }
+                              })
+                      || // Then check the sources of reaction r
+                      r.getSources().stream().anyMatch(s -> s.getVariable() == port);
+                })
+            .collect(Collectors.toList());
 
-        // Find the list of reactions that have the port as trigger or source
-        // (could be a variable name)
-        List<Reaction> reactionsWithPort = ASTUtils
-            .allReactions(reactor).stream().filter(r -> {
-                // Check the triggers of reaction r first
-                return r.getTriggers().stream().anyMatch(t -> {
-                    if (t instanceof VarRef) {
-                        // Check if the variables match
-                        return ((VarRef) t).getVariable() == port;
-                    } else {
-                        // Not a network port (startup or shutdown)
-                        return false;
-                    }
-                }) || // Then check the sources of reaction r
-                    r.getSources().stream().anyMatch(s -> s.getVariable()
-                        == port);
-            }).collect(Collectors.toList());
-
-        // Find a list of STP offsets (if any exists)
-        if (coordination == CoordinationType.DECENTRALIZED) {
-            for (Reaction r : safe(reactionsWithPort)) {
-                // If STP offset is determined, add it
-                // If not, assume it is zero
-                if (r.getStp() != null) {
-                    if (r.getStp().getValue() instanceof ParameterReference) {
-                        List<Instantiation> instantList = new ArrayList<>();
-                        instantList.add(instance.instantiation);
-                        final var param = ((ParameterReference) r.getStp().getValue()).getParameter();
-                        STPList.addAll(ASTUtils.initialValue(param, instantList));
-                    } else {
-                        STPList.add(r.getStp().getValue());
-                    }
-                }
-            }
-            // Check the children for STPs as well
-            for (Connection c : safe(connectionsWithPort)) {
-                VarRef childPort = c.getRightPorts().get(0);
-                Reactor childReactor = (Reactor) childPort.getVariable()
-                                                          .eContainer();
-                // Find the list of reactions that have the port as trigger or
-                // source (could be a variable name)
-                List<Reaction> childReactionsWithPort =
-                    ASTUtils.allReactions(childReactor)
-                            .stream()
-                            .filter(r ->
-                                        r.getTriggers().stream().anyMatch(t -> {
-                                            if (t instanceof VarRef) {
-                                                // Check if the variables match
-                                                return
-                                                    ((VarRef) t).getVariable()
-                                                        == childPort.getVariable();
-                                            } else {
-                                                // Not a network port (startup or shutdown)
-                                                return false;
-                                            }
-                                        }) ||
-                                            r.getSources()
-                                             .stream()
-                                             .anyMatch(s ->
-                                                           s.getVariable()
-                                                               == childPort.getVariable())
-                            ).collect(Collectors.toList());
-
-                for (Reaction r : safe(childReactionsWithPort)) {
-                    // If STP offset is determined, add it
-                    // If not, assume it is zero
-                    if (r.getStp() != null) {
-                        if (r.getStp().getValue() instanceof ParameterReference) {
-                            List<Instantiation> instantList = new ArrayList<>();
-                            instantList.add(childPort.getContainer());
-                            final var param = ((ParameterReference) r.getStp().getValue()).getParameter();
-                            STPList.addAll(ASTUtils.initialValue(param, instantList));
-                        } else {
-                            STPList.add(r.getStp().getValue());
-                        }
-                    }
-                }
+    // Find a list of STP offsets (if any exists)
+    if (coordination == CoordinationType.DECENTRALIZED) {
+      for (Reaction r : safe(reactionsWithPort)) {
+        // If STP offset is determined, add it
+        // If not, assume it is zero
+        if (r.getStp() != null) {
+          if (r.getStp().getValue() instanceof ParameterReference) {
+            List<Instantiation> instantList = new ArrayList<>();
+            instantList.add(instance.instantiation);
+            final var param = ((ParameterReference) r.getStp().getValue()).getParameter();
+            STPList.addAll(ASTUtils.initialValue(param, instantList));
+          } else {
+            STPList.add(r.getStp().getValue());
+          }
+        }
+      }
+      // Check the children for STPs as well
+      for (Connection c : safe(connectionsWithPort)) {
+        VarRef childPort = c.getRightPorts().get(0);
+        Reactor childReactor = (Reactor) childPort.getVariable().eContainer();
+        // Find the list of reactions that have the port as trigger or
+        // source (could be a variable name)
+        List<Reaction> childReactionsWithPort =
+            ASTUtils.allReactions(childReactor).stream()
+                .filter(
+                    r ->
+                        r.getTriggers().stream()
+                                .anyMatch(
+                                    t -> {
+                                      if (t instanceof VarRef) {
+                                        // Check if the variables match
+                                        return ((VarRef) t).getVariable()
+                                            == childPort.getVariable();
+                                      } else {
+                                        // Not a network port (startup or shutdown)
+                                        return false;
+                                      }
+                                    })
+                            || r.getSources().stream()
+                                .anyMatch(s -> s.getVariable() == childPort.getVariable()))
+                .collect(Collectors.toList());
+
+        for (Reaction r : safe(childReactionsWithPort)) {
+          // If STP offset is determined, add it
+          // If not, assume it is zero
+          if (r.getStp() != null) {
+            if (r.getStp().getValue() instanceof ParameterReference) {
+              List<Instantiation> instantList = new ArrayList<>();
+              instantList.add(childPort.getContainer());
+              final var param = ((ParameterReference) r.getStp().getValue()).getParameter();
+              STPList.addAll(ASTUtils.initialValue(param, instantList));
+            } else {
+              STPList.add(r.getStp().getValue());
             }
+          }
         }
-
-        return STPList.stream()
-                      .map(ASTUtils::getLiteralTimeValue)
-                      .filter(Objects::nonNull)
-                      .reduce(TimeValue.ZERO, TimeValue::max);
+      }
     }
 
-    /**
-     * Return a null-safe List
-     *
-     * @param <E>  The type of the list
-     * @param list The potentially null List
-     * @return Empty list or the original list
-     */
-    public static <E> List<E> safe(List<E> list) {
-        return list == null ? Collections.emptyList() : list;
+    return STPList.stream()
+        .map(ASTUtils::getLiteralTimeValue)
+        .filter(Objects::nonNull)
+        .reduce(TimeValue.ZERO, TimeValue::max);
+  }
+
+  /**
+   * Return a null-safe List
+   *
+   * @param <E> The type of the list
+   * @param list The potentially null List
+   * @return Empty list or the original list
+   */
+  public static <E> List<E> safe(List<E> list) {
+    return list == null ? Collections.emptyList() : list;
+  }
+
+  /**
+   * Add a network sender reaction for a given input port 'source' to source's parent reactor. This
+   * reaction will react to the 'source' and then send a message on the network destined for the
+   * destinationFederate.
+   *
+   * @param connection Network connection between two federates.
+   * @param coordination One of CoordinationType.DECENTRALIZED or CoordinationType.CENTRALIZED.
+   * @param errorReporter FIXME
+   * @note Used in federated execution
+   */
+  private static void addNetworkSenderReaction(
+      FedConnectionInstance connection,
+      CoordinationType coordination,
+      ErrorReporter errorReporter) {
+    LfFactory factory = LfFactory.eINSTANCE;
+    // Assume all the types are the same, so just use the first on the right.
+    Type type = EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getType());
+    VarRef sourceRef = factory.createVarRef();
+    VarRef destRef = factory.createVarRef();
+    Reactor parent = (Reactor) connection.getDefinition().eContainer();
+    Reaction networkSenderReaction = factory.createReaction();
+
+    // FIXME: do not create a new extension every time it is used
+    FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
+        .annotateReaction(networkSenderReaction);
+
+    // If the sender or receiver is in a bank of reactors, then we want
+    // these reactions to appear only in the federate whose bank ID matches.
+    setReactionBankIndex(networkSenderReaction, connection.getSrcBank());
+
+    // The connection is 'physical' if it uses the ~> notation.
+    if (connection.getDefinition().isPhysical()) {
+      connection.srcFederate.outboundP2PConnections.add(connection.dstFederate);
+    } else {
+      // If the connection is logical but coordination
+      // is decentralized, we would need
+      // to make P2P connections
+      if (coordination == CoordinationType.DECENTRALIZED) {
+        connection.srcFederate.outboundP2PConnections.add(connection.dstFederate);
+      }
     }
 
-    /**
-     * Add a network sender reaction for a given input port 'source' to
-     * source's parent reactor. This reaction will react to the 'source'
-     * and then send a message on the network destined for the
-     * destinationFederate.
-     *
-     * @param connection   Network connection between two federates.
-     * @param coordination One of CoordinationType.DECENTRALIZED or
-     *                     CoordinationType.CENTRALIZED.
-     * @param errorReporter FIXME
-     * @note Used in federated execution
-     */
-    private static void addNetworkSenderReaction(
-        FedConnectionInstance connection,
-        CoordinationType coordination,
-        ErrorReporter errorReporter
-    ) {
-        LfFactory factory = LfFactory.eINSTANCE;
-        // Assume all the types are the same, so just use the first on the right.
-        Type type = EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getType());
-        VarRef sourceRef = factory.createVarRef();
-        VarRef destRef = factory.createVarRef();
-        Reactor parent = (Reactor) connection.getDefinition().eContainer();
-        Reaction networkSenderReaction = factory.createReaction();
-
-        // FIXME: do not create a new extension every time it is used
-        FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
-                                 .annotateReaction(networkSenderReaction);
-
-        // If the sender or receiver is in a bank of reactors, then we want
-        // these reactions to appear only in the federate whose bank ID matches.
-        setReactionBankIndex(networkSenderReaction, connection.getSrcBank());
-
-        // The connection is 'physical' if it uses the ~> notation.
-        if (connection.getDefinition().isPhysical()) {
-            connection.srcFederate.outboundP2PConnections.add(connection.dstFederate);
-        } else {
-            // If the connection is logical but coordination
-            // is decentralized, we would need
-            // to make P2P connections
-            if (coordination == CoordinationType.DECENTRALIZED) {
-                connection.srcFederate.outboundP2PConnections.add(connection.dstFederate);
-            }
-        }
-
-        // Establish references to the involved ports.
-        sourceRef.setContainer(connection.getSourcePortInstance().getParent().getDefinition());
-        sourceRef.setVariable(connection.getSourcePortInstance().getDefinition());
-        destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
-        destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
-
-        // Configure the sending reaction.
-        networkSenderReaction.getTriggers().add(sourceRef);
-        networkSenderReaction.setCode(factory.createCode());
-        networkSenderReaction.getCode().setBody(
+    // Establish references to the involved ports.
+    sourceRef.setContainer(connection.getSourcePortInstance().getParent().getDefinition());
+    sourceRef.setVariable(connection.getSourcePortInstance().getDefinition());
+    destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
+    destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
+
+    // Configure the sending reaction.
+    networkSenderReaction.getTriggers().add(sourceRef);
+    networkSenderReaction.setCode(factory.createCode());
+    networkSenderReaction
+        .getCode()
+        .setBody(
             FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
-                                     .generateNetworkSenderBody(
-                                   sourceRef,
-                                   destRef,
-                                   connection,
-                                   InferredType.fromAST(type),
-                                   coordination,
-                                   errorReporter
-                               ));
-
-        ASTUtils.addReactionAttribute(networkSenderReaction, "_unordered");
-
-        // Add the sending reaction to the parent.
-        parent.getReactions().add(networkSenderReaction);
-
-        // Add the network sender reaction to the federate instance's list
-        // of network reactions
-        connection.srcFederate.networkReactions.add(networkSenderReaction);
+                .generateNetworkSenderBody(
+                    sourceRef,
+                    destRef,
+                    connection,
+                    InferredType.fromAST(type),
+                    coordination,
+                    errorReporter));
+
+    ASTUtils.addReactionAttribute(networkSenderReaction, "_unordered");
+
+    // Add the sending reaction to the parent.
+    parent.getReactions().add(networkSenderReaction);
+
+    // Add the network sender reaction to the federate instance's list
+    // of network reactions
+    connection.srcFederate.networkReactions.add(networkSenderReaction);
+  }
+
+  /**
+   * Add a network control reaction for a given output port 'source' to source's parent reactor.
+   * This reaction will send a port absent message if the status of the output port is absent.
+   *
+   * @param connection FIXME
+   * @note Used in federated execution
+   */
+  private static void addNetworkOutputControlReaction(FedConnectionInstance connection) {
+    LfFactory factory = LfFactory.eINSTANCE;
+    Reaction reaction = factory.createReaction();
+    Reactor top =
+        connection
+            .getSourcePortInstance()
+            .getParent()
+            .getParent()
+            .reactorDefinition; // Top-level reactor.
+
+    // Add the output from the contained reactor as a source to
+    // the reaction to preserve precedence order.
+    VarRef newPortRef = factory.createVarRef();
+    newPortRef.setContainer(connection.getSourcePortInstance().getParent().getDefinition());
+    newPortRef.setVariable(connection.getSourcePortInstance().getDefinition());
+    reaction.getSources().add(newPortRef);
+
+    // If the sender or receiver is in a bank of reactors, then we want
+    // these reactions to appear only in the federate whose bank ID matches.
+    setReactionBankIndex(reaction, connection.getSrcBank());
+
+    // FIXME: do not create a new extension every time it is used
+    FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
+        .annotateReaction(reaction);
+
+    // We use an action at the top-level to manually
+    // trigger output control reactions. That action is created once
+    // and recorded in the federate instance.
+    // Check whether the action already has been created.
+    if (connection.srcFederate.networkOutputControlReactionsTrigger == null) {
+      // The port has not been created.
+      String triggerName = "outputControlReactionTrigger";
+
+      // Find the trigger definition in the reactor definition, which could have been
+      // generated for another federate instance if there are multiple instances
+      // of the same reactor that are each distinct federates.
+      Optional<Action> optTriggerInput =
+          top.getActions().stream().filter(I -> I.getName().equals(triggerName)).findFirst();
+
+      if (optTriggerInput.isEmpty()) {
+        // If no trigger with the name "outputControlReactionTrigger" is
+        // already added to the reactor definition, we need to create it
+        // for the first time. The trigger is a logical action.
+        Action newTriggerForControlReactionVariable = factory.createAction();
+        newTriggerForControlReactionVariable.setName(triggerName);
+        newTriggerForControlReactionVariable.setOrigin(ActionOrigin.LOGICAL);
+        top.getActions().add(newTriggerForControlReactionVariable);
+
+        // Now that the variable is created, store it in the federate instance
+        connection.srcFederate.networkOutputControlReactionsTrigger =
+            newTriggerForControlReactionVariable;
+      } else {
+        // If the "outputControlReactionTrigger" trigger is already
+        // there, we can re-use it for this new reaction since a single trigger
+        // will trigger
+        // all network output control reactions.
+        connection.srcFederate.networkOutputControlReactionsTrigger = optTriggerInput.get();
+      }
     }
 
-    /**
-     * Add a network control reaction for a given output port 'source' to
-     * source's parent reactor. This reaction will send a port absent
-     * message if the status of the output port is absent.
-     *
-     * @param connection FIXME
-     * @note Used in federated execution
-     */
-    private static void addNetworkOutputControlReaction(FedConnectionInstance connection) {
-        LfFactory factory = LfFactory.eINSTANCE;
-        Reaction reaction = factory.createReaction();
-        Reactor top = connection.getSourcePortInstance()
-                                .getParent()
-                                .getParent().reactorDefinition; // Top-level reactor.
-
-        // Add the output from the contained reactor as a source to
-        // the reaction to preserve precedence order.
-        VarRef newPortRef = factory.createVarRef();
-        newPortRef.setContainer(connection.getSourcePortInstance().getParent().getDefinition());
-        newPortRef.setVariable(connection.getSourcePortInstance().getDefinition());
-        reaction.getSources().add(newPortRef);
-
-        // If the sender or receiver is in a bank of reactors, then we want
-        // these reactions to appear only in the federate whose bank ID matches.
-        setReactionBankIndex(reaction, connection.getSrcBank());
-
-        // FIXME: do not create a new extension every time it is used
-        FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
-                                 .annotateReaction(reaction);
-
-        // We use an action at the top-level to manually
-        // trigger output control reactions. That action is created once
-        // and recorded in the federate instance.
-        // Check whether the action already has been created.
-        if (connection.srcFederate.networkOutputControlReactionsTrigger == null) {
-            // The port has not been created.
-            String triggerName = "outputControlReactionTrigger";
-
-            // Find the trigger definition in the reactor definition, which could have been
-            // generated for another federate instance if there are multiple instances
-            // of the same reactor that are each distinct federates.
-            Optional<Action> optTriggerInput
-                = top.getActions().stream().filter(
-                I -> I.getName().equals(triggerName)).findFirst();
-
-            if (optTriggerInput.isEmpty()) {
-                // If no trigger with the name "outputControlReactionTrigger" is
-                // already added to the reactor definition, we need to create it
-                // for the first time. The trigger is a logical action.
-                Action newTriggerForControlReactionVariable = factory.createAction();
-                newTriggerForControlReactionVariable.setName(triggerName);
-                newTriggerForControlReactionVariable.setOrigin(ActionOrigin.LOGICAL);
-                top.getActions().add(newTriggerForControlReactionVariable);
-
-                // Now that the variable is created, store it in the federate instance
-                connection.srcFederate.networkOutputControlReactionsTrigger
-                    = newTriggerForControlReactionVariable;
-            } else {
-                // If the "outputControlReactionTrigger" trigger is already
-                // there, we can re-use it for this new reaction since a single trigger
-                // will trigger
-                // all network output control reactions.
-                connection.srcFederate.networkOutputControlReactionsTrigger = optTriggerInput.get();
-            }
-        }
-
-        // Add the trigger for all output control reactions to the list of triggers
-        VarRef triggerRef = factory.createVarRef();
-        triggerRef.setVariable(connection.srcFederate.networkOutputControlReactionsTrigger);
-        reaction.getTriggers().add(triggerRef);
+    // Add the trigger for all output control reactions to the list of triggers
+    VarRef triggerRef = factory.createVarRef();
+    triggerRef.setVariable(connection.srcFederate.networkOutputControlReactionsTrigger);
+    reaction.getTriggers().add(triggerRef);
 
-        // Generate the code
-        reaction.setCode(factory.createCode());
+    // Generate the code
+    reaction.setCode(factory.createCode());
 
-        reaction.getCode().setBody(
+    reaction
+        .getCode()
+        .setBody(
             FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
-                                     .generateNetworkOutputControlReactionBody(newPortRef, connection));
+                .generateNetworkOutputControlReactionBody(newPortRef, connection));
 
-        ASTUtils.addReactionAttribute(reaction, "_unordered");
+    ASTUtils.addReactionAttribute(reaction, "_unordered");
 
+    // Insert the newly generated reaction after the generated sender and
+    // receiver top-level reactions.
+    top.getReactions().add(reaction);
 
-        // Insert the newly generated reaction after the generated sender and
-        // receiver top-level reactions.
-        top.getReactions().add(reaction);
-
-        // Add the network output control reaction to the federate instance's list
-        // of network reactions
-        connection.srcFederate.networkReactions.add(reaction);
-    }
+    // Add the network output control reaction to the federate instance's list
+    // of network reactions
+    connection.srcFederate.networkReactions.add(reaction);
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedConnectionInstance.java b/org.lflang/src/org/lflang/federated/generator/FedConnectionInstance.java
index a82e1d2dfa..d08aa5f850 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedConnectionInstance.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedConnectionInstance.java
@@ -9,102 +9,100 @@
 /**
  * Class representing a federated connection.
  *
- * This is an undocumented class written by a previous contributor who is no longer active.
- * It merely serves as a record, presumably to make it easier to pass around information
- * around.
+ * <p>This is an undocumented class written by a previous contributor who is no longer active. It
+ * merely serves as a record, presumably to make it easier to pass around information around.
  *
  * @author Soroush Bateni
  */
 public class FedConnectionInstance {
 
-    SendRange srcRange;
+  SendRange srcRange;
 
-    RuntimeRange<PortInstance> dstRange;
+  RuntimeRange<PortInstance> dstRange;
 
-    int srcChannel;
+  int srcChannel;
 
-    int srcBank;
+  int srcBank;
 
-    int dstChannel;
+  int dstChannel;
 
-    int dstBank;
+  int dstBank;
 
-    FederateInstance srcFederate;
+  FederateInstance srcFederate;
 
-    FederateInstance dstFederate;
+  FederateInstance dstFederate;
 
-    SupportedSerializers serializer;
+  SupportedSerializers serializer;
 
-    public FedConnectionInstance(
-        SendRange srcRange,
-        RuntimeRange<PortInstance> dstRange,
-        int srcChannel,
-        int srcBank,
-        int dstChannel,
-        int dstBank,
-        FederateInstance srcFederate,
-        FederateInstance dstFederate,
-        SupportedSerializers serializer
-    ) {
-        this.srcRange = srcRange;
-        this.srcChannel = srcChannel;
-        this.srcBank = srcBank;
-        this.dstChannel = dstChannel;
-        this.dstBank = dstBank;
-        this.srcFederate = srcFederate;
-        this.dstFederate = dstFederate;
-        this.dstRange = dstRange;
-        this.serializer = serializer;
+  public FedConnectionInstance(
+      SendRange srcRange,
+      RuntimeRange<PortInstance> dstRange,
+      int srcChannel,
+      int srcBank,
+      int dstChannel,
+      int dstBank,
+      FederateInstance srcFederate,
+      FederateInstance dstFederate,
+      SupportedSerializers serializer) {
+    this.srcRange = srcRange;
+    this.srcChannel = srcChannel;
+    this.srcBank = srcBank;
+    this.dstChannel = dstChannel;
+    this.dstBank = dstBank;
+    this.srcFederate = srcFederate;
+    this.dstFederate = dstFederate;
+    this.dstRange = dstRange;
+    this.serializer = serializer;
 
-        this.srcFederate.connections.add(this);
-        this.dstFederate.connections.add(this);
-    }
+    this.srcFederate.connections.add(this);
+    this.dstFederate.connections.add(this);
+  }
 
-    public SendRange getSrcRange() {
-        return srcRange;
-    }
+  public SendRange getSrcRange() {
+    return srcRange;
+  }
 
-    public RuntimeRange<PortInstance> getDstRange() {
-        return dstRange;
-    }
+  public RuntimeRange<PortInstance> getDstRange() {
+    return dstRange;
+  }
 
-    public int getSrcChannel() {
-        return srcChannel;
-    }
+  public int getSrcChannel() {
+    return srcChannel;
+  }
 
-    public int getSrcBank() {
-        return srcBank;
-    }
+  public int getSrcBank() {
+    return srcBank;
+  }
 
-    public int getDstChannel() {
-        return dstChannel;
-    }
+  public int getDstChannel() {
+    return dstChannel;
+  }
 
-    public int getDstBank() {
-        return dstBank;
-    }
+  public int getDstBank() {
+    return dstBank;
+  }
 
-    public FederateInstance getSrcFederate() {
-        return srcFederate;
-    }
+  public FederateInstance getSrcFederate() {
+    return srcFederate;
+  }
 
-    public FederateInstance getDstFederate() {
-        return dstFederate;
-    }
+  public FederateInstance getDstFederate() {
+    return dstFederate;
+  }
 
-    public SupportedSerializers getSerializer() {
-        return serializer;
-    }
+  public SupportedSerializers getSerializer() {
+    return serializer;
+  }
 
-    public Connection getDefinition() {
-        return srcRange.connection;
-    }
+  public Connection getDefinition() {
+    return srcRange.connection;
+  }
 
-    public PortInstance getSourcePortInstance() {
-        return srcRange.instance;
-    }
+  public PortInstance getSourcePortInstance() {
+    return srcRange.instance;
+  }
 
-    public PortInstance getDestinationPortInstance() {
-        return dstRange.instance;
-    }
+  public PortInstance getDestinationPortInstance() {
+    return dstRange.instance;
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedEmitter.java b/org.lflang/src/org/lflang/federated/generator/FedEmitter.java
index 2c9f32aad8..bdf912d0c8 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedEmitter.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedEmitter.java
@@ -4,76 +4,70 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.Map;
-
 import org.lflang.ErrorReporter;
 import org.lflang.federated.launcher.RtiConfig;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.lf.Reactor;
 
-/**
- * Helper class to generate code for federates.
- */
+/** Helper class to generate code for federates. */
 public class FedEmitter {
 
-    private final FedFileConfig fileConfig;
-    private final Reactor originalMainReactor;
-    private final ErrorReporter errorReporter;
-    private final RtiConfig rtiConfig;
+  private final FedFileConfig fileConfig;
+  private final Reactor originalMainReactor;
+  private final ErrorReporter errorReporter;
+  private final RtiConfig rtiConfig;
 
-    public FedEmitter(
-        FedFileConfig fileConfig,
-        Reactor originalMainReactor,
-        ErrorReporter errorReporter,
-        RtiConfig rtiConfig
-    ) {
-        this.fileConfig = fileConfig;
-        this.originalMainReactor = originalMainReactor;
-        this.errorReporter = errorReporter;
-        this.rtiConfig = rtiConfig;
-    }
+  public FedEmitter(
+      FedFileConfig fileConfig,
+      Reactor originalMainReactor,
+      ErrorReporter errorReporter,
+      RtiConfig rtiConfig) {
+    this.fileConfig = fileConfig;
+    this.originalMainReactor = originalMainReactor;
+    this.errorReporter = errorReporter;
+    this.rtiConfig = rtiConfig;
+  }
 
-    /**
-     * Generate a .lf file for federate {@code federate}.
-     *
-     * @throws IOException
-     */
-    Map<Path, CodeMap> generateFederate(
-        LFGeneratorContext context,
-        FederateInstance federate,
-        int numOfFederates
-    ) throws IOException {
-        String fedName = federate.name;
-        Files.createDirectories(fileConfig.getSrcPath());
-        System.out.println("##### Generating code for federate " + fedName
-                               + " in directory "
-                               + fileConfig.getSrcPath());
+  /**
+   * Generate a .lf file for federate {@code federate}.
+   *
+   * @throws IOException
+   */
+  Map<Path, CodeMap> generateFederate(
+      LFGeneratorContext context, FederateInstance federate, int numOfFederates)
+      throws IOException {
+    String fedName = federate.name;
+    Files.createDirectories(fileConfig.getSrcPath());
+    System.out.println(
+        "##### Generating code for federate "
+            + fedName
+            + " in directory "
+            + fileConfig.getSrcPath());
 
-        String federateCode = String.join(
+    String federateCode =
+        String.join(
             "\n",
-            new FedTargetEmitter().generateTarget(context, numOfFederates, federate, fileConfig, errorReporter, rtiConfig),
+            new FedTargetEmitter()
+                .generateTarget(
+                    context, numOfFederates, federate, fileConfig, errorReporter, rtiConfig),
             new FedImportEmitter().generateImports(federate, fileConfig),
-            new FedPreambleEmitter().generatePreamble(federate, fileConfig, rtiConfig, errorReporter),
+            new FedPreambleEmitter()
+                .generatePreamble(federate, fileConfig, rtiConfig, errorReporter),
             new FedReactorEmitter().generateReactorDefinitions(federate),
-            new FedMainEmitter().generateMainReactor(
-                federate,
-                originalMainReactor,
-                errorReporter
-            )
-        );
-        Map<Path, CodeMap> codeMapMap = new HashMap<>();
-        var lfFilePath = lfFilePath(fileConfig, federate);
-        try (var srcWriter = Files.newBufferedWriter(lfFilePath)) {
-            var codeMap = CodeMap.fromGeneratedCode(federateCode);
-            codeMapMap.put(lfFilePath, codeMap);
-            srcWriter.write(codeMap.getGeneratedCode());
-        }
-        return codeMapMap;
+            new FedMainEmitter().generateMainReactor(federate, originalMainReactor, errorReporter));
+    Map<Path, CodeMap> codeMapMap = new HashMap<>();
+    var lfFilePath = lfFilePath(fileConfig, federate);
+    try (var srcWriter = Files.newBufferedWriter(lfFilePath)) {
+      var codeMap = CodeMap.fromGeneratedCode(federateCode);
+      codeMapMap.put(lfFilePath, codeMap);
+      srcWriter.write(codeMap.getGeneratedCode());
     }
+    return codeMapMap;
+  }
 
-    public static Path lfFilePath(FedFileConfig fileConfig, FederateInstance federate) {
-        return fileConfig.getSrcPath().resolve(federate.name + ".lf");
-    }
+  public static Path lfFilePath(FedFileConfig fileConfig, FederateInstance federate) {
+    return fileConfig.getSrcPath().resolve(federate.name + ".lf");
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedFileConfig.java b/org.lflang/src/org/lflang/federated/generator/FedFileConfig.java
index e434501825..cb12c90a7d 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedFileConfig.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedFileConfig.java
@@ -1,16 +1,16 @@
 /*************
  * Copyright (c) 2019-2021, The University of California at Berkeley.
-
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
-
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
-
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
-
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -30,113 +30,105 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.lflang.FileConfig;
 import org.lflang.util.FileUtil;
 
 /**
- * A subclass of @see FileConfig that extends the base functionality to add support
- * for compiling federated LF programs. The code generator should create one instance
- * of this class for each federate.
+ * A subclass of @see FileConfig that extends the base functionality to add support for compiling
+ * federated LF programs. The code generator should create one instance of this class for each
+ * federate.
  *
  * @author Soroush Bateni
- *
  */
 public class FedFileConfig extends FileConfig {
 
-    public FedFileConfig(
-        Resource resource,
-        Path srcGenBasePath,
-        boolean useHierarchicalBin
-    ) throws IOException {
-        super(resource, srcGenBasePath, useHierarchicalBin);
-    }
-
-    public FedFileConfig(FileConfig fileConfig) throws IOException {
-        super(fileConfig.resource, fileConfig.getSrcGenBasePath(), fileConfig.useHierarchicalBin);
-    }
-
-    /**
-     * Return the path to the root of a LF project generated on the basis of a
-     * federated LF program currently under compilation.
-     */
-    public Path getGenPath() {
-        return srcPkgPath.resolve("fed-gen").resolve(name);
-    }
-
-    /**
-     * Return the path for storing generated LF sources that jointly constitute a
-     * federation.
-     */
-    public Path getSrcPath() {
-        return getGenPath().resolve("src");
-    }
-
-    /**
-     * The directory in which to put the generated sources.
-     * This takes into account the location of the source file relative to the
-     * package root. Specifically, if the source file is x/y/Z.lf relative
-     * to the package root, then the generated sources will be put in x/y/Z
-     * relative to srcGenBasePath.
-     */
-    @Override
-    public Path getSrcGenPath() {
-        return getGenPath().resolve("src-gen");
-    }
-
-    /**
-     * Return the path to the root of a LF project generated on the basis of a
-     * federated LF program currently under compilation.
-     */
-    public Path getFedGenPath() {
-        return srcPkgPath.resolve("fed-gen").resolve(this.name);
-    }
-
-    /**
-     * Return the path to the directory in which the executables of compiled federates are stored.
-     */
-    public Path getFedBinPath() { return getFedGenPath().resolve("bin"); }
-
-    @Override
-    public void doClean() throws IOException {
-        super.doClean();
-        FileUtil.deleteDirectory(this.getFedGenPath());
-    }
-
-    /**
-     * Relativize target properties that involve paths like files and cmake-include to be
-     * relative to the generated .lf file for the federate.
-     */
-    public void relativizePaths(FedTargetConfig targetConfig) {
-        relativizePathList(targetConfig.protoFiles);
-        relativizePathList(targetConfig.files);
-        relativizePathList(targetConfig.cmakeIncludes);
-    }
-
-    /**
-     * Relativize each path in the given list.
-     * @param paths The paths to relativize.
-     */
-    private void relativizePathList(List<String> paths) {
-        List<String> tempList = new ArrayList<>();
-        paths.forEach(f -> tempList.add(relativizePath(Paths.get(f))));
-        paths.clear();
-        paths.addAll(tempList);
-    }
-
-    /**
-     * Relativize a single path, but only if it points to a local resource in the project (i.e., not
-     * on the class path).
-     * @param path The path to relativize.
-     */
-    private String relativizePath(Path path) {
-        if (FileUtil.findInPackage(path, this) == null) {
-            return String.valueOf(path);
-        } else {
-            Path resolvedPath = this.srcPath.resolve(path).toAbsolutePath();
-            return this.getSrcPath().relativize(resolvedPath).toString();
-        }
+  public FedFileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchicalBin)
+      throws IOException {
+    super(resource, srcGenBasePath, useHierarchicalBin);
+  }
+
+  public FedFileConfig(FileConfig fileConfig) throws IOException {
+    super(fileConfig.resource, fileConfig.getSrcGenBasePath(), fileConfig.useHierarchicalBin);
+  }
+
+  /**
+   * Return the path to the root of a LF project generated on the basis of a federated LF program
+   * currently under compilation.
+   */
+  public Path getGenPath() {
+    return srcPkgPath.resolve("fed-gen").resolve(name);
+  }
+
+  /** Return the path for storing generated LF sources that jointly constitute a federation. */
+  public Path getSrcPath() {
+    return getGenPath().resolve("src");
+  }
+
+  /**
+   * The directory in which to put the generated sources. This takes into account the location of
+   * the source file relative to the package root. Specifically, if the source file is x/y/Z.lf
+   * relative to the package root, then the generated sources will be put in x/y/Z relative to
+   * srcGenBasePath.
+   */
+  @Override
+  public Path getSrcGenPath() {
+    return getGenPath().resolve("src-gen");
+  }
+
+  /**
+   * Return the path to the root of a LF project generated on the basis of a federated LF program
+   * currently under compilation.
+   */
+  public Path getFedGenPath() {
+    return srcPkgPath.resolve("fed-gen").resolve(this.name);
+  }
+
+  /** Return the path to the directory in which the executables of compiled federates are stored. */
+  public Path getFedBinPath() {
+    return getFedGenPath().resolve("bin");
+  }
+
+  @Override
+  public void doClean() throws IOException {
+    super.doClean();
+    FileUtil.deleteDirectory(this.getFedGenPath());
+  }
+
+  /**
+   * Relativize target properties that involve paths like files and cmake-include to be relative to
+   * the generated .lf file for the federate.
+   */
+  public void relativizePaths(FedTargetConfig targetConfig) {
+    relativizePathList(targetConfig.protoFiles);
+    relativizePathList(targetConfig.files);
+    relativizePathList(targetConfig.cmakeIncludes);
+  }
+
+  /**
+   * Relativize each path in the given list.
+   *
+   * @param paths The paths to relativize.
+   */
+  private void relativizePathList(List<String> paths) {
+    List<String> tempList = new ArrayList<>();
+    paths.forEach(f -> tempList.add(relativizePath(Paths.get(f))));
+    paths.clear();
+    paths.addAll(tempList);
+  }
+
+  /**
+   * Relativize a single path, but only if it points to a local resource in the project (i.e., not
+   * on the class path).
+   *
+   * @param path The path to relativize.
+   */
+  private String relativizePath(Path path) {
+    if (FileUtil.findInPackage(path, this) == null) {
+      return String.valueOf(path);
+    } else {
+      Path resolvedPath = this.srcPath.resolve(path).toAbsolutePath();
+      return this.getSrcPath().relativize(resolvedPath).toString();
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedGenerator.java b/org.lflang/src/org/lflang/federated/generator/FedGenerator.java
index 595a721c93..08a1fcf6e8 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedGenerator.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedGenerator.java
@@ -2,6 +2,7 @@
 
 import static org.lflang.generator.DockerGenerator.dockerGeneratorFactory;
 
+import com.google.inject.Injector;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -19,7 +20,6 @@
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
@@ -27,14 +27,13 @@
 import org.eclipse.xtext.resource.XtextResourceSet;
 import org.eclipse.xtext.util.RuntimeIOException;
 import org.eclipse.xtext.xbase.lib.Exceptions;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.LFStandaloneSetup;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty.CoordinationType;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.launcher.FedLauncherGenerator;
 import org.lflang.federated.launcher.RtiConfig;
 import org.lflang.generator.CodeMap;
@@ -58,569 +57,539 @@
 import org.lflang.lf.Reactor;
 import org.lflang.util.Averager;
 
-import com.google.inject.Injector;
-
 public class FedGenerator {
 
-
-    /**
-     *
-     */
-    private final ErrorReporter errorReporter;
-
-    /**
-     * A list of federate instances.
-     */
-    private final List<FederateInstance> federates = new ArrayList<>();
-
-    /**
-     * File configuration to be used during the LF code generation stage (not the target code
-     * generation stage of individual federates).
-     */
-    private final FedFileConfig fileConfig;
-
-    /**
-     * Configuration of the RTI.
-     */
-    final RtiConfig rtiConfig = new RtiConfig();
-
-    /**
-     * Target configuration of the federation; drawn from the file
-     * in which the federated reactor is defined.
-     */
-    private final TargetConfig targetConfig;
-
-    /**
-     * A map from instantiations to the federate instances for that
-     * instantiation.
-     * If the instantiation has a width, there may be more than one federate
-     * instance.
-     */
-    private Map<Instantiation, List<FederateInstance>> federatesByInstantiation;
-
-    /**
-     * Definition of the main (top-level) reactor.
-     * This is an automatically generated AST node for the top-level
-     * reactor.
-     */
-    private Instantiation mainDef;
-
-    /**
-     * Create a new generator and initialize a file configuration, target configuration, and error
-     * reporter.
-     * @param context
-     */
-    public FedGenerator(LFGeneratorContext context) {
-        this.fileConfig = (FedFileConfig) context.getFileConfig();
-        this.targetConfig = context.getTargetConfig();
-        this.errorReporter = context.getErrorReporter();
+  /** */
+  private final ErrorReporter errorReporter;
+
+  /** A list of federate instances. */
+  private final List<FederateInstance> federates = new ArrayList<>();
+
+  /**
+   * File configuration to be used during the LF code generation stage (not the target code
+   * generation stage of individual federates).
+   */
+  private final FedFileConfig fileConfig;
+
+  /** Configuration of the RTI. */
+  final RtiConfig rtiConfig = new RtiConfig();
+
+  /**
+   * Target configuration of the federation; drawn from the file in which the federated reactor is
+   * defined.
+   */
+  private final TargetConfig targetConfig;
+
+  /**
+   * A map from instantiations to the federate instances for that instantiation. If the
+   * instantiation has a width, there may be more than one federate instance.
+   */
+  private Map<Instantiation, List<FederateInstance>> federatesByInstantiation;
+
+  /**
+   * Definition of the main (top-level) reactor. This is an automatically generated AST node for the
+   * top-level reactor.
+   */
+  private Instantiation mainDef;
+
+  /**
+   * Create a new generator and initialize a file configuration, target configuration, and error
+   * reporter.
+   *
+   * @param context
+   */
+  public FedGenerator(LFGeneratorContext context) {
+    this.fileConfig = (FedFileConfig) context.getFileConfig();
+    this.targetConfig = context.getTargetConfig();
+    this.errorReporter = context.getErrorReporter();
+  }
+
+  /**
+   * Produce LF code for each federate in a separate file, then invoke a target-specific code
+   * generator for each of those files.
+   *
+   * @param resource The resource that has the federated main reactor in it
+   * @param context The context in which to carry out the code generation.
+   * @return False if no errors have occurred, true otherwise.
+   * @throws IOException
+   */
+  public boolean doGenerate(Resource resource, LFGeneratorContext context) throws IOException {
+    if (!federatedExecutionIsSupported(resource)) return true;
+    cleanIfNeeded(context);
+
+    // In a federated execution, we need keepalive to be true,
+    // otherwise a federate could exit simply because it hasn't received
+    // any messages.
+    targetConfig.keepalive = true;
+
+    // Process command-line arguments
+    processCLIArguments(context);
+
+    // Find the federated reactor
+    Reactor federation = FedASTUtils.findFederatedReactor(resource);
+
+    // Extract some useful information about the federation
+    analyzeFederates(federation, context);
+
+    // Find all the connections between federates.
+    // For each connection between federates, replace it in the
+    // AST with an action (which inherits the delay) and four reactions.
+    // The action will be physical for physical connections and logical
+    // for logical connections.
+    replaceFederateConnectionsWithProxies(federation);
+
+    FedEmitter fedEmitter =
+        new FedEmitter(
+            fileConfig, ASTUtils.toDefinition(mainDef.getReactorClass()), errorReporter, rtiConfig);
+
+    // Generate LF code for each federate.
+    Map<Path, CodeMap> lf2lfCodeMapMap = new HashMap<>();
+    for (FederateInstance federate : federates) {
+      lf2lfCodeMapMap.putAll(fedEmitter.generateFederate(context, federate, federates.size()));
     }
 
-    /**
-     * Produce LF code for each federate in a separate file, then invoke a target-specific code
-     * generator for each of those files.
-     *
-     * @param resource The resource that has the federated main reactor in it
-     * @param context The context in which to carry out the code generation.
-     * @return False if no errors have occurred, true otherwise.
-     * @throws IOException
-     */
-    public boolean doGenerate(Resource resource, LFGeneratorContext context) throws IOException {
-        if (!federatedExecutionIsSupported(resource)) return true;
-        cleanIfNeeded(context);
-
-        // In a federated execution, we need keepalive to be true,
-        // otherwise a federate could exit simply because it hasn't received
-        // any messages.
-        targetConfig.keepalive = true;
-
-        // Process command-line arguments
-        processCLIArguments(context);
-
-        // Find the federated reactor
-        Reactor federation = FedASTUtils.findFederatedReactor(resource);
-
-        // Extract some useful information about the federation
-        analyzeFederates(federation, context);
-
-        // Find all the connections between federates.
-        // For each connection between federates, replace it in the
-        // AST with an action (which inherits the delay) and four reactions.
-        // The action will be physical for physical connections and logical
-        // for logical connections.
-        replaceFederateConnectionsWithProxies(federation);
-
-        FedEmitter fedEmitter = new FedEmitter(
-            fileConfig,
-            ASTUtils.toDefinition(mainDef.getReactorClass()),
-            errorReporter,
-            rtiConfig
-        );
-
-        // Generate LF code for each federate.
-        Map<Path, CodeMap> lf2lfCodeMapMap = new HashMap<>();
-        for (FederateInstance federate : federates) {
-            lf2lfCodeMapMap.putAll(fedEmitter.generateFederate(
-                context, federate, federates.size()
-            ));
-        }
-
-        // Do not invoke target code generators if --no-compile flag is used.
-        if (context.getTargetConfig().noCompile) {
-            context.finish(Status.GENERATED, lf2lfCodeMapMap);
-            return false;
-        }
+    // Do not invoke target code generators if --no-compile flag is used.
+    if (context.getTargetConfig().noCompile) {
+      context.finish(Status.GENERATED, lf2lfCodeMapMap);
+      return false;
+    }
 
-        Map<Path, CodeMap> codeMapMap = compileFederates(context, lf2lfCodeMapMap, subContexts -> {
-            createDockerFiles(context, subContexts);
-            generateLaunchScript();
-        });
+    Map<Path, CodeMap> codeMapMap =
+        compileFederates(
+            context,
+            lf2lfCodeMapMap,
+            subContexts -> {
+              createDockerFiles(context, subContexts);
+              generateLaunchScript();
+            });
 
-        context.finish(Status.COMPILED, codeMapMap);
-        return false;
+    context.finish(Status.COMPILED, codeMapMap);
+    return false;
+  }
+
+  private void generateLaunchScript() {
+    new FedLauncherGenerator(this.targetConfig, this.fileConfig, this.errorReporter)
+        .doGenerate(federates, rtiConfig);
+  }
+
+  /**
+   * Generate a Dockerfile for each federate and a docker-compose.yml for the federation.
+   *
+   * @param context The main context in which the federation has been compiled.
+   * @param subContexts The subcontexts in which the federates have been compiled.
+   */
+  private void createDockerFiles(LFGeneratorContext context, List<SubContext> subContexts) {
+    if (context.getTargetConfig().dockerOptions == null) return;
+    final List<DockerData> services = new ArrayList<>();
+    // 1. create a Dockerfile for each federate
+    for (SubContext subContext : subContexts) { // Inherit Docker options from main context
+      subContext.getTargetConfig().dockerOptions = context.getTargetConfig().dockerOptions;
+      var dockerGenerator = dockerGeneratorFactory(subContext);
+      var dockerData = dockerGenerator.generateDockerData();
+      try {
+        dockerData.writeDockerFile();
+      } catch (IOException e) {
+        throw new RuntimeIOException(e);
+      }
+      services.add(dockerData);
     }
-
-    private void generateLaunchScript() {
-        new FedLauncherGenerator(
-            this.targetConfig,
-            this.fileConfig,
-            this.errorReporter
-        ).doGenerate(federates, rtiConfig);
+    // 2. create a docker-compose.yml for the federation
+    try {
+      new FedDockerComposeGenerator(context, rtiConfig.getHost()).writeDockerComposeFile(services);
+    } catch (IOException e) {
+      throw new RuntimeIOException(e);
     }
-
-    /**
-     * Generate a Dockerfile for each federate and a docker-compose.yml for the federation.
-     * @param context The main context in which the federation has been compiled.
-     * @param subContexts The subcontexts in which the federates have been compiled.
-     */
-    private void createDockerFiles(LFGeneratorContext context, List<SubContext> subContexts) {
-        if (context.getTargetConfig().dockerOptions == null) return;
-        final List<DockerData> services = new ArrayList<>();
-        // 1. create a Dockerfile for each federate
-        for (SubContext subContext : subContexts) {// Inherit Docker options from main context
-            subContext.getTargetConfig().dockerOptions = context.getTargetConfig().dockerOptions;
-            var dockerGenerator = dockerGeneratorFactory(subContext);
-            var dockerData = dockerGenerator.generateDockerData();
-            try {
-                dockerData.writeDockerFile();
-            } catch (IOException e) {
-                throw new RuntimeIOException(e);
-            }
-            services.add(dockerData);
-        }
-        // 2. create a docker-compose.yml for the federation
-        try {
-            new FedDockerComposeGenerator(
-                context,
-                rtiConfig.getHost()
-            ).writeDockerComposeFile(services);
-        } catch (IOException e) {
-            throw new RuntimeIOException(e);
-        }
+  }
+
+  /**
+   * Check if a clean was requested from the standalone compiler and perform the clean step.
+   *
+   * @param context Context in which the generator operates
+   */
+  private void cleanIfNeeded(LFGeneratorContext context) {
+    if (context.getArgs().containsKey(BuildParm.CLEAN.getKey())) {
+      try {
+        fileConfig.doClean();
+      } catch (IOException e) {
+        System.err.println("WARNING: IO Error during clean");
+      }
     }
-
-    /**
-     * Check if a clean was requested from the standalone compiler and perform
-     * the clean step.
-     * @param context Context in which the generator operates
-     */
-    private void cleanIfNeeded(LFGeneratorContext context) {
-        if (context.getArgs().containsKey(BuildParm.CLEAN.getKey())) {
-            try {
-                fileConfig.doClean();
-            } catch (IOException e) {
-                System.err.println("WARNING: IO Error during clean");
-            }
-        }
+  }
+
+  /** Return whether federated execution is supported for {@code resource}. */
+  private boolean federatedExecutionIsSupported(Resource resource) {
+    var target = Target.fromDecl(GeneratorUtils.findTargetDecl(resource));
+    var targetOK =
+        List.of(Target.C, Target.Python, Target.TS, Target.CPP, Target.CCPP).contains(target);
+    if (!targetOK) {
+      errorReporter.reportError("Federated execution is not supported with target " + target + ".");
     }
-
-    /** Return whether federated execution is supported for {@code resource}. */
-    private boolean federatedExecutionIsSupported(Resource resource) {
-        var target = Target.fromDecl(GeneratorUtils.findTargetDecl(resource));
-        var targetOK = List.of(
-            Target.C, Target.Python, Target.TS, Target.CPP, Target.CCPP
-        ).contains(target);
-        if (!targetOK) {
-            errorReporter.reportError(
-                "Federated execution is not supported with target " + target + "."
-            );
-        }
-        if(target.equals(Target.C) && GeneratorUtils.isHostWindows()) {
-            errorReporter.reportError(
-                "Federated LF programs with a C target are currently not supported on Windows."
-            );
-            targetOK = false;
-        }
-
-        return targetOK;
+    if (target.equals(Target.C) && GeneratorUtils.isHostWindows()) {
+      errorReporter.reportError(
+          "Federated LF programs with a C target are currently not supported on Windows.");
+      targetOK = false;
     }
 
-    private Map<Path, CodeMap> compileFederates(
-            LFGeneratorContext context,
-            Map<Path, CodeMap> lf2lfCodeMapMap,
-            Consumer<List<SubContext>> finalizer) {
-
-        // FIXME: Use the appropriate resource set instead of always using standalone
-        Injector inj = new LFStandaloneSetup()
-            .createInjectorAndDoEMFRegistration();
-        XtextResourceSet rs = inj.getInstance(XtextResourceSet.class);
-        rs.addLoadOption(XtextResource.OPTION_RESOLVE_ALL, Boolean.TRUE);
-        // define output path here
-        JavaIoFileSystemAccess fsa = inj.getInstance(JavaIoFileSystemAccess.class);
-        fsa.setOutputPath("DEFAULT_OUTPUT", fileConfig.getSrcGenPath().toString());
-
-        var numOfCompileThreads = Math.min(6,
-                                           Math.min(
-                                               Math.max(federates.size(), 1),
-                                               Runtime.getRuntime().availableProcessors()
-                                           )
-        );
-        var compileThreadPool = Executors.newFixedThreadPool(numOfCompileThreads);
-        System.out.println("******** Using "+numOfCompileThreads+" threads to compile the program.");
-        Map<Path, CodeMap> codeMapMap = new ConcurrentHashMap<>();
-        List<SubContext> subContexts = Collections.synchronizedList(new ArrayList<>());
-        Averager averager = new Averager(federates.size());
-        final var threadSafeErrorReporter = new SynchronizedErrorReporter(errorReporter);
-        for (int i = 0; i < federates.size(); i++) {
-            FederateInstance fed = federates.get(i);
-            final int id = i;
-            compileThreadPool.execute(() -> {
-                Resource res = rs.getResource(URI.createFileURI(
-                    FedEmitter.lfFilePath(fileConfig, fed).toAbsolutePath().toString()
-                ), true);
-                FileConfig subFileConfig = LFGenerator.createFileConfig(res, fileConfig.getSrcGenPath(), true);
-                ErrorReporter subContextErrorReporter = new LineAdjustingErrorReporter(threadSafeErrorReporter, lf2lfCodeMapMap);
-
-                var props = new Properties();
-                if (targetConfig.dockerOptions != null && targetConfig.target.buildsUsingDocker()) {
-                    props.put("no-compile", "true");
-                }
-                props.put("docker", "false");
-
-                TargetConfig subConfig = new TargetConfig(
-                    props, GeneratorUtils.findTargetDecl(subFileConfig.resource), subContextErrorReporter
-                );
-                SubContext subContext = new SubContext(context, IntegratedBuilder.VALIDATED_PERCENT_PROGRESS, 100) {
-                    @Override
-                    public ErrorReporter getErrorReporter() {
-                        return subContextErrorReporter;
-                    }
-
-                    @Override
-                    public void reportProgress(String message, int percentage) {
-                        averager.report(id, percentage, meanPercentage -> super.reportProgress(message, meanPercentage));
-                    }
-
-                    @Override
-                    public FileConfig getFileConfig() {
-                        return subFileConfig;
-                    }
-
-                    @Override
-                    public TargetConfig getTargetConfig() {
-                        return subConfig;
-                    }
+    return targetOK;
+  }
+
+  private Map<Path, CodeMap> compileFederates(
+      LFGeneratorContext context,
+      Map<Path, CodeMap> lf2lfCodeMapMap,
+      Consumer<List<SubContext>> finalizer) {
+
+    // FIXME: Use the appropriate resource set instead of always using standalone
+    Injector inj = new LFStandaloneSetup().createInjectorAndDoEMFRegistration();
+    XtextResourceSet rs = inj.getInstance(XtextResourceSet.class);
+    rs.addLoadOption(XtextResource.OPTION_RESOLVE_ALL, Boolean.TRUE);
+    // define output path here
+    JavaIoFileSystemAccess fsa = inj.getInstance(JavaIoFileSystemAccess.class);
+    fsa.setOutputPath("DEFAULT_OUTPUT", fileConfig.getSrcGenPath().toString());
+
+    var numOfCompileThreads =
+        Math.min(
+            6, Math.min(Math.max(federates.size(), 1), Runtime.getRuntime().availableProcessors()));
+    var compileThreadPool = Executors.newFixedThreadPool(numOfCompileThreads);
+    System.out.println(
+        "******** Using " + numOfCompileThreads + " threads to compile the program.");
+    Map<Path, CodeMap> codeMapMap = new ConcurrentHashMap<>();
+    List<SubContext> subContexts = Collections.synchronizedList(new ArrayList<>());
+    Averager averager = new Averager(federates.size());
+    final var threadSafeErrorReporter = new SynchronizedErrorReporter(errorReporter);
+    for (int i = 0; i < federates.size(); i++) {
+      FederateInstance fed = federates.get(i);
+      final int id = i;
+      compileThreadPool.execute(
+          () -> {
+            Resource res =
+                rs.getResource(
+                    URI.createFileURI(
+                        FedEmitter.lfFilePath(fileConfig, fed).toAbsolutePath().toString()),
+                    true);
+            FileConfig subFileConfig =
+                LFGenerator.createFileConfig(res, fileConfig.getSrcGenPath(), true);
+            ErrorReporter subContextErrorReporter =
+                new LineAdjustingErrorReporter(threadSafeErrorReporter, lf2lfCodeMapMap);
+
+            var props = new Properties();
+            if (targetConfig.dockerOptions != null && targetConfig.target.buildsUsingDocker()) {
+              props.put("no-compile", "true");
+            }
+            props.put("docker", "false");
+
+            TargetConfig subConfig =
+                new TargetConfig(
+                    props,
+                    GeneratorUtils.findTargetDecl(subFileConfig.resource),
+                    subContextErrorReporter);
+            SubContext subContext =
+                new SubContext(context, IntegratedBuilder.VALIDATED_PERCENT_PROGRESS, 100) {
+                  @Override
+                  public ErrorReporter getErrorReporter() {
+                    return subContextErrorReporter;
+                  }
+
+                  @Override
+                  public void reportProgress(String message, int percentage) {
+                    averager.report(
+                        id,
+                        percentage,
+                        meanPercentage -> super.reportProgress(message, meanPercentage));
+                  }
+
+                  @Override
+                  public FileConfig getFileConfig() {
+                    return subFileConfig;
+                  }
+
+                  @Override
+                  public TargetConfig getTargetConfig() {
+                    return subConfig;
+                  }
                 };
 
-                inj.getInstance(LFGenerator.class).doGenerate(res, fsa, subContext);
-                codeMapMap.putAll(subContext.getResult().getCodeMaps());
-                subContexts.add(subContext);
-            });
-        }
-        // Initiate an orderly shutdown in which previously submitted tasks are
-        // executed, but no new tasks will be accepted.
-        compileThreadPool.shutdown();
-
-        // Wait for all compile threads to finish (NOTE: Can block forever)
-        try {
-            compileThreadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
-        } catch (Exception e) {
-            Exceptions.sneakyThrow(e);
-        } finally {
-            finalizer.accept(subContexts);
-        }
-        return codeMapMap;
+            inj.getInstance(LFGenerator.class).doGenerate(res, fsa, subContext);
+            codeMapMap.putAll(subContext.getResult().getCodeMaps());
+            subContexts.add(subContext);
+          });
     }
-
-    /**
-     * Process command-line arguments passed on to the generator.
-     *
-     * @param context Context of the build process.
-     */
-    private void processCLIArguments(LFGeneratorContext context) {
-        if (context.getArgs().containsKey("rti")) {
-            setFederationRTIProperties(context);
-        }
+    // Initiate an orderly shutdown in which previously submitted tasks are
+    // executed, but no new tasks will be accepted.
+    compileThreadPool.shutdown();
+
+    // Wait for all compile threads to finish (NOTE: Can block forever)
+    try {
+      compileThreadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
+    } catch (Exception e) {
+      Exceptions.sneakyThrow(e);
+    } finally {
+      finalizer.accept(subContexts);
     }
-
-    /**
-     * Set the RTI hostname, port and username if given as compiler arguments
-     *
-     * @param context Context of the build process.
-     */
-    private void setFederationRTIProperties(LFGeneratorContext context) {
-        String rtiAddr = context.getArgs().getProperty("rti");
-        Pattern pattern = Pattern.compile("([a-zA-Z0-9]+@)?([a-zA-Z0-9]+\\.?[a-z]{2,}|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+):?([0-9]+)?");
-        Matcher matcher = pattern.matcher(rtiAddr);
-
-        if (!matcher.find()) {
-            return;
-        }
-
-        // the user match group contains a trailing "@" which needs to be removed.
-        String userWithAt = matcher.group(1);
-        String user = (userWithAt == null) ? null : userWithAt.substring(0,
-                                                                       userWithAt.length()
-                                                                           - 1);
-        String host = matcher.group(2);
-        String port = matcher.group(3);
-
-        if (host != null) {
-            rtiConfig.setHost(host);
-        }
-        if (port != null) {
-            rtiConfig.setPort(Integer.parseInt(port));
-        }
-        if (user != null) {
-            rtiConfig.setUser(user);
-        }
+    return codeMapMap;
+  }
+
+  /**
+   * Process command-line arguments passed on to the generator.
+   *
+   * @param context Context of the build process.
+   */
+  private void processCLIArguments(LFGeneratorContext context) {
+    if (context.getArgs().containsKey("rti")) {
+      setFederationRTIProperties(context);
+    }
+  }
+
+  /**
+   * Set the RTI hostname, port and username if given as compiler arguments
+   *
+   * @param context Context of the build process.
+   */
+  private void setFederationRTIProperties(LFGeneratorContext context) {
+    String rtiAddr = context.getArgs().getProperty("rti");
+    Pattern pattern =
+        Pattern.compile(
+            "([a-zA-Z0-9]+@)?([a-zA-Z0-9]+\\.?[a-z]{2,}|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+):?([0-9]+)?");
+    Matcher matcher = pattern.matcher(rtiAddr);
+
+    if (!matcher.find()) {
+      return;
     }
 
-    /**
-     * Analyze the federation and record various properties of it.
-     *
-     * @param federation The federated reactor that contains all federates' instances.
-     */
-    private void analyzeFederates(Reactor federation, LFGeneratorContext context) {
-        // Create an instantiation for the fed reactor because there isn't one.
-        // Creating a definition for the main reactor because there isn't one.
-        mainDef = LfFactory.eINSTANCE.createInstantiation();
-        mainDef.setName(federation.getName());
-        mainDef.setReactorClass(federation);
-
-        // Make sure that if no federation RTI properties were given in the
-        // cmdline, then those specified in the lf file are not lost
-        if (rtiConfig.getHost().equals("localhost") &&
-            federation.getHost() != null &&
-            !federation.getHost().getAddr().equals("localhost")) {
-            rtiConfig.setHost(federation.getHost().getAddr());
-        }
+    // the user match group contains a trailing "@" which needs to be removed.
+    String userWithAt = matcher.group(1);
+    String user = (userWithAt == null) ? null : userWithAt.substring(0, userWithAt.length() - 1);
+    String host = matcher.group(2);
+    String port = matcher.group(3);
 
-        // Since federates are always within the main (federated) reactor,
-        // create a list containing just that one containing instantiation.
-        // This will be used to look up parameter values.
-        List<Instantiation> mainReactorContext = new ArrayList<>();
-        mainReactorContext.add(mainDef);
-
-        // Create a FederateInstance for each instance in the top-level reactor.
-        for (Instantiation instantiation : ASTUtils.allInstantiations(federation)) {
-            int bankWidth = ASTUtils.width(instantiation.getWidthSpec(), mainReactorContext);
-            if (bankWidth < 0) {
-                errorReporter.reportError(instantiation, "Cannot determine bank width! Assuming width of 1.");
-                // Continue with a bank width of 1.
-                bankWidth = 1;
-            }
-            List<FederateInstance> federateInstances = getFederateInstances(instantiation, bankWidth, context);
-            if (federatesByInstantiation == null) {
-                federatesByInstantiation = new LinkedHashMap<>();
-            }
-            federatesByInstantiation.put(instantiation, federateInstances);
-        }
+    if (host != null) {
+      rtiConfig.setHost(host);
     }
-
-    /**
-     * Get federate instances for a given {@code instantiation}. A bank will
-     * result in the creation of multiple federate instances (one for each
-     * member of the bank).
-     *
-     * @param instantiation An instantiation that corresponds to a federate.
-     * @param bankWidth     The width specified for the instantiation.
-     * @return A list of federate instance (of type @see FederateInstance).
-     */
-    private List<FederateInstance> getFederateInstances(Instantiation instantiation, int bankWidth, LFGeneratorContext context) {
-        // Create one federate instance for each instance in a bank of reactors.
-        List<FederateInstance> federateInstances = new ArrayList<>(bankWidth);
-
-        for (int i = 0; i < bankWidth; i++) {
-            // Assign an integer ID to the federate.
-            int federateID = federates.size();
-            var resource = instantiation.getReactorClass().eResource();
-            var federateTargetConfig = new FedTargetConfig(context, resource);
-            FederateInstance federateInstance = new FederateInstance(
-                instantiation,
-                federateID,
-                i,
-                federateTargetConfig,
-                errorReporter);
-            federates.add(federateInstance);
-            federateInstances.add(federateInstance);
-
-            if (instantiation.getHost() != null) {
-                federateInstance.host = instantiation.getHost().getAddr();
-                // The following could be 0.
-                federateInstance.port = instantiation.getHost().getPort();
-                // The following could be null.
-                federateInstance.user = instantiation.getHost().getUser();
-                /* FIXME: The at keyword should support a directory component.
-                 * federateInstance.dir = instantiation.getHost().dir
-                 */
-                if (federateInstance.host != null
-                    && !federateInstance.host.equals("localhost")
-                    && !federateInstance.host.equals("0.0.0.0")) {
-                    federateInstance.isRemote = true;
-                }
-            }
-        }
-        return federateInstances;
+    if (port != null) {
+      rtiConfig.setPort(Integer.parseInt(port));
     }
-
-    /**
-     * Replace connections between federates in the AST with proxies that
-     * handle sending and receiving data.
-     *
-     * @param federation Reactor class of the federation.
-     */
-    private void replaceFederateConnectionsWithProxies(Reactor federation) {
-        // Each connection in the AST may represent more than one connection between
-        // federation instances because of banks and multiports. We need to generate communication
-        // for each of these. To do this, we create a ReactorInstance so that we don't have
-        // to duplicate the rather complicated logic in that class. We specify a depth of 1,
-        // so it only creates the reactors immediately within the top level, not reactors
-        // that those contain.
-        ReactorInstance mainInstance = new ReactorInstance(federation, errorReporter);
-
-        for (ReactorInstance child : mainInstance.children) {
-            for (PortInstance output : child.outputs) {
-                replaceConnectionFromOutputPort(output);
-            }
-        }
-
-        // Remove the connections at the top level
-        federation.getConnections().clear();
-
-        // There will be AST transformations that invalidate some info
-        // cached in ReactorInstance. FIXME: most likely not needed anymore
-        mainInstance.clearCaches(false);
+    if (user != null) {
+      rtiConfig.setUser(user);
     }
-
-    /**
-     * Replace the connections from the specified output port.
-     *
-     * @param output The output port instance.
-     */
-    private void replaceConnectionFromOutputPort(PortInstance output) {
-        // Iterate through ranges of the output port
-        for (SendRange srcRange : output.getDependentPorts()) {
-            if (srcRange.connection == null) {
-                // This should not happen.
-                errorReporter.reportError(
-                    output.getDefinition(),
-                    "Unexpected error. Cannot find output connection for port"
-                );
-                continue;
-            }
-            // Iterate through destinations
-            for (RuntimeRange<PortInstance> dstRange : srcRange.destinations) {
-                replaceOneToManyConnection(
-                    srcRange,
-                    dstRange
-                );
-            }
-        }
+  }
+
+  /**
+   * Analyze the federation and record various properties of it.
+   *
+   * @param federation The federated reactor that contains all federates' instances.
+   */
+  private void analyzeFederates(Reactor federation, LFGeneratorContext context) {
+    // Create an instantiation for the fed reactor because there isn't one.
+    // Creating a definition for the main reactor because there isn't one.
+    mainDef = LfFactory.eINSTANCE.createInstantiation();
+    mainDef.setName(federation.getName());
+    mainDef.setReactorClass(federation);
+
+    // Make sure that if no federation RTI properties were given in the
+    // cmdline, then those specified in the lf file are not lost
+    if (rtiConfig.getHost().equals("localhost")
+        && federation.getHost() != null
+        && !federation.getHost().getAddr().equals("localhost")) {
+      rtiConfig.setHost(federation.getHost().getAddr());
     }
 
-    /**
-     * Replace (potentially multiple) connection(s) that originate from an
-     * output port to multiple destinations.
-     *
-     * @param srcRange A range of an output port that sources data for this
-     *                 connection.
-     * @param dstRange A range of input ports that receive the data.
-     */
-    private void replaceOneToManyConnection(
-        SendRange srcRange,
-        RuntimeRange<PortInstance> dstRange
-    ) {
-        MixedRadixInt srcID = srcRange.startMR();
-        MixedRadixInt dstID = dstRange.startMR();
-        int dstCount = 0;
-        int srcCount = 0;
-
-        while (dstCount++ < dstRange.width) {
-            int srcChannel = srcID.getDigits().get(0);
-            int srcBank = srcID.get(1);
-            int dstChannel = dstID.getDigits().get(0);
-            int dstBank = dstID.get(1);
-
-            FederateInstance srcFederate = federatesByInstantiation.get(
-                srcRange.instance.getParent().getDefinition()
-            ).get(srcBank);
-            FederateInstance dstFederate = federatesByInstantiation.get(
-                dstRange.instance.getParent().getDefinition()
-            ).get(dstBank);
-
-            // Clear banks
-            srcFederate.instantiation.setWidthSpec(null);
-            dstFederate.instantiation.setWidthSpec(null);
-
-            FedConnectionInstance fedConnection = new FedConnectionInstance(
-                srcRange,
-                dstRange,
-                srcChannel,
-                srcBank,
-                dstChannel,
-                dstBank,
-                srcFederate,
-                dstFederate,
-                FedUtils.getSerializer(srcRange.connection, srcFederate, dstFederate)
-            );
-
-            replaceFedConnection(fedConnection);
-
-            dstID.increment();
-            srcID.increment();
-            srcCount++;
-            if (srcCount == srcRange.width) {
-                srcID = srcRange.startMR(); // Multicast. Start over.
-            }
-        }
+    // Since federates are always within the main (federated) reactor,
+    // create a list containing just that one containing instantiation.
+    // This will be used to look up parameter values.
+    List<Instantiation> mainReactorContext = new ArrayList<>();
+    mainReactorContext.add(mainDef);
+
+    // Create a FederateInstance for each instance in the top-level reactor.
+    for (Instantiation instantiation : ASTUtils.allInstantiations(federation)) {
+      int bankWidth = ASTUtils.width(instantiation.getWidthSpec(), mainReactorContext);
+      if (bankWidth < 0) {
+        errorReporter.reportError(
+            instantiation, "Cannot determine bank width! Assuming width of 1.");
+        // Continue with a bank width of 1.
+        bankWidth = 1;
+      }
+      List<FederateInstance> federateInstances =
+          getFederateInstances(instantiation, bankWidth, context);
+      if (federatesByInstantiation == null) {
+        federatesByInstantiation = new LinkedHashMap<>();
+      }
+      federatesByInstantiation.put(instantiation, federateInstances);
     }
-
-    /**
-     * Replace a one-to-one federated connection with proxies.
-     *
-     * @param connection A connection between two federates.
-     */
-    private void replaceFedConnection(FedConnectionInstance connection) {
-        if (!connection.getDefinition().isPhysical()
-            && targetConfig.coordination != CoordinationType.DECENTRALIZED) {
-            // Map the delays on connections between federates.
-            Set<Expression> dependsOnDelays =
-                connection.dstFederate.dependsOn.computeIfAbsent(
-                    connection.srcFederate,
-                    k -> new LinkedHashSet<>()
-                );
-            // Put the delay on the cache.
-            if (connection.getDefinition().getDelay() != null) {
-                dependsOnDelays.add(connection.getDefinition().getDelay());
-            } else {
-                // To indicate that at least one connection has no delay, add a null entry.
-                dependsOnDelays.add(null);
-            }
-            // Map the connections between federates.
-            Set<Expression> sendsToDelays =
-                connection.srcFederate.sendsTo.computeIfAbsent(
-                    connection.dstFederate,
-                    k -> new LinkedHashSet<>()
-                );
-            if (connection.getDefinition().getDelay() != null) {
-                sendsToDelays.add(connection.getDefinition().getDelay());
-            } else {
-                // To indicate that at least one connection has no delay, add a null entry.
-                sendsToDelays.add(null);
-            }
+  }
+
+  /**
+   * Get federate instances for a given {@code instantiation}. A bank will result in the creation of
+   * multiple federate instances (one for each member of the bank).
+   *
+   * @param instantiation An instantiation that corresponds to a federate.
+   * @param bankWidth The width specified for the instantiation.
+   * @return A list of federate instance (of type @see FederateInstance).
+   */
+  private List<FederateInstance> getFederateInstances(
+      Instantiation instantiation, int bankWidth, LFGeneratorContext context) {
+    // Create one federate instance for each instance in a bank of reactors.
+    List<FederateInstance> federateInstances = new ArrayList<>(bankWidth);
+
+    for (int i = 0; i < bankWidth; i++) {
+      // Assign an integer ID to the federate.
+      int federateID = federates.size();
+      var resource = instantiation.getReactorClass().eResource();
+      var federateTargetConfig = new FedTargetConfig(context, resource);
+      FederateInstance federateInstance =
+          new FederateInstance(instantiation, federateID, i, federateTargetConfig, errorReporter);
+      federates.add(federateInstance);
+      federateInstances.add(federateInstance);
+
+      if (instantiation.getHost() != null) {
+        federateInstance.host = instantiation.getHost().getAddr();
+        // The following could be 0.
+        federateInstance.port = instantiation.getHost().getPort();
+        // The following could be null.
+        federateInstance.user = instantiation.getHost().getUser();
+        /* FIXME: The at keyword should support a directory component.
+         * federateInstance.dir = instantiation.getHost().dir
+         */
+        if (federateInstance.host != null
+            && !federateInstance.host.equals("localhost")
+            && !federateInstance.host.equals("0.0.0.0")) {
+          federateInstance.isRemote = true;
         }
+      }
+    }
+    return federateInstances;
+  }
+
+  /**
+   * Replace connections between federates in the AST with proxies that handle sending and receiving
+   * data.
+   *
+   * @param federation Reactor class of the federation.
+   */
+  private void replaceFederateConnectionsWithProxies(Reactor federation) {
+    // Each connection in the AST may represent more than one connection between
+    // federation instances because of banks and multiports. We need to generate communication
+    // for each of these. To do this, we create a ReactorInstance so that we don't have
+    // to duplicate the rather complicated logic in that class. We specify a depth of 1,
+    // so it only creates the reactors immediately within the top level, not reactors
+    // that those contain.
+    ReactorInstance mainInstance = new ReactorInstance(federation, errorReporter);
+
+    for (ReactorInstance child : mainInstance.children) {
+      for (PortInstance output : child.outputs) {
+        replaceConnectionFromOutputPort(output);
+      }
+    }
 
-        FedASTUtils.makeCommunication(connection, targetConfig.coordination, errorReporter);
+    // Remove the connections at the top level
+    federation.getConnections().clear();
+
+    // There will be AST transformations that invalidate some info
+    // cached in ReactorInstance. FIXME: most likely not needed anymore
+    mainInstance.clearCaches(false);
+  }
+
+  /**
+   * Replace the connections from the specified output port.
+   *
+   * @param output The output port instance.
+   */
+  private void replaceConnectionFromOutputPort(PortInstance output) {
+    // Iterate through ranges of the output port
+    for (SendRange srcRange : output.getDependentPorts()) {
+      if (srcRange.connection == null) {
+        // This should not happen.
+        errorReporter.reportError(
+            output.getDefinition(), "Unexpected error. Cannot find output connection for port");
+        continue;
+      }
+      // Iterate through destinations
+      for (RuntimeRange<PortInstance> dstRange : srcRange.destinations) {
+        replaceOneToManyConnection(srcRange, dstRange);
+      }
+    }
+  }
+
+  /**
+   * Replace (potentially multiple) connection(s) that originate from an output port to multiple
+   * destinations.
+   *
+   * @param srcRange A range of an output port that sources data for this connection.
+   * @param dstRange A range of input ports that receive the data.
+   */
+  private void replaceOneToManyConnection(SendRange srcRange, RuntimeRange<PortInstance> dstRange) {
+    MixedRadixInt srcID = srcRange.startMR();
+    MixedRadixInt dstID = dstRange.startMR();
+    int dstCount = 0;
+    int srcCount = 0;
+
+    while (dstCount++ < dstRange.width) {
+      int srcChannel = srcID.getDigits().get(0);
+      int srcBank = srcID.get(1);
+      int dstChannel = dstID.getDigits().get(0);
+      int dstBank = dstID.get(1);
+
+      FederateInstance srcFederate =
+          federatesByInstantiation.get(srcRange.instance.getParent().getDefinition()).get(srcBank);
+      FederateInstance dstFederate =
+          federatesByInstantiation.get(dstRange.instance.getParent().getDefinition()).get(dstBank);
+
+      // Clear banks
+      srcFederate.instantiation.setWidthSpec(null);
+      dstFederate.instantiation.setWidthSpec(null);
+
+      FedConnectionInstance fedConnection =
+          new FedConnectionInstance(
+              srcRange,
+              dstRange,
+              srcChannel,
+              srcBank,
+              dstChannel,
+              dstBank,
+              srcFederate,
+              dstFederate,
+              FedUtils.getSerializer(srcRange.connection, srcFederate, dstFederate));
+
+      replaceFedConnection(fedConnection);
+
+      dstID.increment();
+      srcID.increment();
+      srcCount++;
+      if (srcCount == srcRange.width) {
+        srcID = srcRange.startMR(); // Multicast. Start over.
+      }
     }
+  }
+
+  /**
+   * Replace a one-to-one federated connection with proxies.
+   *
+   * @param connection A connection between two federates.
+   */
+  private void replaceFedConnection(FedConnectionInstance connection) {
+    if (!connection.getDefinition().isPhysical()
+        && targetConfig.coordination != CoordinationType.DECENTRALIZED) {
+      // Map the delays on connections between federates.
+      Set<Expression> dependsOnDelays =
+          connection.dstFederate.dependsOn.computeIfAbsent(
+              connection.srcFederate, k -> new LinkedHashSet<>());
+      // Put the delay on the cache.
+      if (connection.getDefinition().getDelay() != null) {
+        dependsOnDelays.add(connection.getDefinition().getDelay());
+      } else {
+        // To indicate that at least one connection has no delay, add a null entry.
+        dependsOnDelays.add(null);
+      }
+      // Map the connections between federates.
+      Set<Expression> sendsToDelays =
+          connection.srcFederate.sendsTo.computeIfAbsent(
+              connection.dstFederate, k -> new LinkedHashSet<>());
+      if (connection.getDefinition().getDelay() != null) {
+        sendsToDelays.add(connection.getDefinition().getDelay());
+      } else {
+        // To indicate that at least one connection has no delay, add a null entry.
+        sendsToDelays.add(null);
+      }
+    }
+
+    FedASTUtils.makeCommunication(connection, targetConfig.coordination, errorReporter);
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedImportEmitter.java b/org.lflang/src/org/lflang/federated/generator/FedImportEmitter.java
index 95351237a7..baf13d6a0a 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedImportEmitter.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedImportEmitter.java
@@ -4,9 +4,7 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.eclipse.emf.ecore.util.EcoreUtil;
-
 import org.lflang.ast.FormattingUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.lf.Import;
@@ -19,44 +17,41 @@
  */
 public class FedImportEmitter {
 
-    private static Set<Import> visitedImports = new HashSet<>();
-
-    /**
-     * Generate import statements for {@code federate}.
-     */
-    String generateImports(FederateInstance federate, FedFileConfig fileConfig) {
-        var imports = ((Model) federate.instantiation.eContainer().eContainer())
-            .getImports()
-            .stream()
-            .filter(federate::contains).toList();
-
-        // Transform the URIs
+  private static Set<Import> visitedImports = new HashSet<>();
+
+  /** Generate import statements for {@code federate}. */
+  String generateImports(FederateInstance federate, FedFileConfig fileConfig) {
+    var imports =
+        ((Model) federate.instantiation.eContainer().eContainer())
+            .getImports().stream().filter(federate::contains).toList();
+
+    // Transform the URIs
+    imports.stream()
+        .filter(i -> !visitedImports.contains(i))
+        .forEach(
+            i -> {
+              visitedImports.add(i);
+              Path importPath = fileConfig.srcPath.resolve(i.getImportURI()).toAbsolutePath();
+              i.setImportURI(
+                  fileConfig.getSrcPath().relativize(importPath).toString().replace('\\', '/'));
+            });
+
+    var importStatements = new CodeBuilder();
+
+    // Add import statements needed for the ordinary functionality of the federate
+    importStatements.pr(
         imports.stream()
-               .filter(i -> !visitedImports.contains(i))
-               .forEach(i -> {
-                   visitedImports.add(i);
-                   Path importPath =
-                       fileConfig.srcPath
-                           .resolve(i.getImportURI()).toAbsolutePath();
-                   i.setImportURI(fileConfig.getSrcPath().relativize(importPath)
-                                      .toString().replace('\\', '/')
-                   );
-               });
-
-        var importStatements = new CodeBuilder();
-
-        // Add import statements needed for the ordinary functionality of the federate
-        importStatements.pr(imports.stream()
-                                   .map(i -> {
-                                       var new_import = EcoreUtil.copy(i);
-                                       new_import.getReactorClasses().removeIf(
-                                           importedReactor -> !federate.contains(importedReactor)
-                                       );
-                                       return new_import;
-                                   })
-                                   .map(FormattingUtils.renderer(federate.targetConfig.target))
-                                   .collect(Collectors.joining("\n")));
-
-        return importStatements.getCode();
-    }
+            .map(
+                i -> {
+                  var new_import = EcoreUtil.copy(i);
+                  new_import
+                      .getReactorClasses()
+                      .removeIf(importedReactor -> !federate.contains(importedReactor));
+                  return new_import;
+                })
+            .map(FormattingUtils.renderer(federate.targetConfig.target))
+            .collect(Collectors.joining("\n")));
+
+    return importStatements.getCode();
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java b/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java
index 65b9d4cd15..86ce4f02b9 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java
@@ -2,83 +2,90 @@
 
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
 import org.eclipse.emf.ecore.EObject;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
+import org.lflang.ast.ASTUtils;
 import org.lflang.ast.FormattingUtils;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.Variable;
 
-/**
- * Helper class to generate a main reactor
- */
+/** Helper class to generate a main reactor */
 public class FedMainEmitter {
 
-    /**
-     * Generate a main reactor for {@code federate}.
-     *
-     * @param federate
-     * @param originalMainReactor The original main reactor.
-     * @param errorReporter       Used to report errors.
-     * @return The main reactor.
-     */
-    String generateMainReactor(FederateInstance federate, Reactor originalMainReactor, ErrorReporter errorReporter) {
-        // FIXME: Handle modes at the top-level
-        if (!ASTUtils.allModes(originalMainReactor).isEmpty()) {
-            errorReporter.reportError(
-                ASTUtils.allModes(originalMainReactor).stream().findFirst().get(),
-                "Modes at the top level are not supported under federated execution."
-            );
-        }
-        var renderer = FormattingUtils.renderer(federate.targetConfig.target);
+  /**
+   * Generate a main reactor for {@code federate}.
+   *
+   * @param federate
+   * @param originalMainReactor The original main reactor.
+   * @param errorReporter Used to report errors.
+   * @return The main reactor.
+   */
+  String generateMainReactor(
+      FederateInstance federate, Reactor originalMainReactor, ErrorReporter errorReporter) {
+    // FIXME: Handle modes at the top-level
+    if (!ASTUtils.allModes(originalMainReactor).isEmpty()) {
+      errorReporter.reportError(
+          ASTUtils.allModes(originalMainReactor).stream().findFirst().get(),
+          "Modes at the top level are not supported under federated execution.");
+    }
+    var renderer = FormattingUtils.renderer(federate.targetConfig.target);
 
-        return String
-            .join(
+    return String.join(
+        "\n",
+        generateMainSignature(federate, originalMainReactor, renderer),
+        String.join(
                 "\n",
-                generateMainSignature(federate, originalMainReactor, renderer),
-               String.join(
-                   "\n",
-                   renderer.apply(federate.instantiation),
-                   ASTUtils.allStateVars(originalMainReactor).stream().filter(federate::contains).map(renderer).collect(Collectors.joining("\n")),
-                   ASTUtils.allActions(originalMainReactor).stream().filter(federate::contains).map(renderer).collect(Collectors.joining("\n")),
-                   ASTUtils.allTimers(originalMainReactor).stream().filter(federate::contains).map(renderer).collect(Collectors.joining("\n")),
-                   ASTUtils.allMethods(originalMainReactor).stream().filter(federate::contains).map(renderer).collect(Collectors.joining("\n")),
-                   ASTUtils.allReactions(originalMainReactor).stream().filter(federate::contains).map(renderer).collect(Collectors.joining("\n"))
-               ).indent(4).stripTrailing(),
-               "}"
-            );
-    }
+                renderer.apply(federate.instantiation),
+                ASTUtils.allStateVars(originalMainReactor).stream()
+                    .filter(federate::contains)
+                    .map(renderer)
+                    .collect(Collectors.joining("\n")),
+                ASTUtils.allActions(originalMainReactor).stream()
+                    .filter(federate::contains)
+                    .map(renderer)
+                    .collect(Collectors.joining("\n")),
+                ASTUtils.allTimers(originalMainReactor).stream()
+                    .filter(federate::contains)
+                    .map(renderer)
+                    .collect(Collectors.joining("\n")),
+                ASTUtils.allMethods(originalMainReactor).stream()
+                    .filter(federate::contains)
+                    .map(renderer)
+                    .collect(Collectors.joining("\n")),
+                ASTUtils.allReactions(originalMainReactor).stream()
+                    .filter(federate::contains)
+                    .map(renderer)
+                    .collect(Collectors.joining("\n")))
+            .indent(4)
+            .stripTrailing(),
+        "}");
+  }
 
-    /**
-     * Generate the signature of the main reactor.
-     * @param federate The federate.
-     * @param originalMainReactor The original main reactor of the original .lf file.
-     * @param renderer Used to render EObjects (in String representation).
-     */
-    private CharSequence generateMainSignature(FederateInstance federate, Reactor originalMainReactor, Function<EObject, String> renderer) {
-        var paramList = ASTUtils.allParameters(originalMainReactor)
-                                .stream()
-                                .filter(federate::contains)
-                                .map(renderer)
-                                .collect(
-                                    Collectors.joining(
-                                        ",", "(", ")"
-                                    )
-                                );
-        // Empty "()" is currently not allowed by the syntax
+  /**
+   * Generate the signature of the main reactor.
+   *
+   * @param federate The federate.
+   * @param originalMainReactor The original main reactor of the original .lf file.
+   * @param renderer Used to render EObjects (in String representation).
+   */
+  private CharSequence generateMainSignature(
+      FederateInstance federate, Reactor originalMainReactor, Function<EObject, String> renderer) {
+    var paramList =
+        ASTUtils.allParameters(originalMainReactor).stream()
+            .filter(federate::contains)
+            .map(renderer)
+            .collect(Collectors.joining(",", "(", ")"));
+    // Empty "()" is currently not allowed by the syntax
 
-        var networkMessageActionsListString = federate.networkMessageActions
-            .stream()
+    var networkMessageActionsListString =
+        federate.networkMessageActions.stream()
             .map(Variable::getName)
             .collect(Collectors.joining(","));
 
-        return
-        """
+    return """
         @_fed_config(network_message_actions="%s")
         main reactor %s {
-        """.formatted(networkMessageActionsListString,
-                      paramList.equals("()") ? "" : paramList);
-    }
+        """
+        .formatted(networkMessageActionsListString, paramList.equals("()") ? "" : paramList);
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedPreambleEmitter.java b/org.lflang/src/org/lflang/federated/generator/FedPreambleEmitter.java
index 154919c816..9cb35b2949 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedPreambleEmitter.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedPreambleEmitter.java
@@ -3,9 +3,8 @@
 import static org.lflang.ast.ASTUtils.toText;
 
 import java.io.IOException;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.extensions.FedTargetExtensionFactory;
 import org.lflang.federated.launcher.RtiConfig;
 import org.lflang.generator.CodeBuilder;
@@ -14,38 +13,43 @@
 
 public class FedPreambleEmitter {
 
-    public FedPreambleEmitter() {}
-
-    /**
-     * Add necessary code to the source and necessary build support to
-     * enable the requested serializations in 'enabledSerializations'
-     */
-    String generatePreamble(FederateInstance federate, FedFileConfig fileConfig, RtiConfig rtiConfig, ErrorReporter errorReporter)
-        throws IOException {
-        CodeBuilder preambleCode = new CodeBuilder();
-
-        // Transfer top-level preambles
-        var mainModel = (Model) ASTUtils.toDefinition(federate.instantiation.getReactorClass()).eContainer();
-        for (Preamble p : mainModel.getPreambles()) {
-            preambleCode.pr(
-            """
+  public FedPreambleEmitter() {}
+
+  /**
+   * Add necessary code to the source and necessary build support to enable the requested
+   * serializations in 'enabledSerializations'
+   */
+  String generatePreamble(
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      RtiConfig rtiConfig,
+      ErrorReporter errorReporter)
+      throws IOException {
+    CodeBuilder preambleCode = new CodeBuilder();
+
+    // Transfer top-level preambles
+    var mainModel =
+        (Model) ASTUtils.toDefinition(federate.instantiation.getReactorClass()).eContainer();
+    for (Preamble p : mainModel.getPreambles()) {
+      preambleCode.pr(
+          """
             %spreamble {=
             %s
             =}
-            """.formatted(
-                p.getVisibility() == null ? "" : p.getVisibility() + " ",
-                toText(p.getCode())
-            ));
-        }
+            """
+              .formatted(
+                  p.getVisibility() == null ? "" : p.getVisibility() + " ", toText(p.getCode())));
+    }
 
-        preambleCode.pr("""
+    preambleCode.pr(
+        """
             preamble {=
             %s
-            =}""".formatted(FedTargetExtensionFactory.getExtension(federate.targetConfig.target).generatePreamble(
-                federate, fileConfig, rtiConfig, errorReporter
-            ))
-        );
+            =}"""
+            .formatted(
+                FedTargetExtensionFactory.getExtension(federate.targetConfig.target)
+                    .generatePreamble(federate, fileConfig, rtiConfig, errorReporter)));
 
-        return preambleCode.getCode();
-    }
+    return preambleCode.getCode();
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedReactorEmitter.java b/org.lflang/src/org/lflang/federated/generator/FedReactorEmitter.java
index 976049601c..69a6342486 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedReactorEmitter.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedReactorEmitter.java
@@ -1,24 +1,22 @@
 package org.lflang.federated.generator;
 
 import java.util.stream.Collectors;
-
 import org.lflang.ast.FormattingUtils;
 import org.lflang.lf.Model;
 
 public class FedReactorEmitter {
 
-    public FedReactorEmitter() {}
+  public FedReactorEmitter() {}
 
-    /**
-     * @param federate
-     * @return
-     */
-    String generateReactorDefinitions(FederateInstance federate) {
-        return ((Model) federate.instantiation.eContainer().eContainer())
-            .getReactors()
-            .stream()
+  /**
+   * @param federate
+   * @return
+   */
+  String generateReactorDefinitions(FederateInstance federate) {
+    return ((Model) federate.instantiation.eContainer().eContainer())
+        .getReactors().stream()
             .filter(federate::contains)
             .map(FormattingUtils.renderer(federate.targetConfig.target))
             .collect(Collectors.joining("\n"));
-    }
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedTargetConfig.java b/org.lflang/src/org/lflang/federated/generator/FedTargetConfig.java
index af83d1f919..3252f31a39 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedTargetConfig.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedTargetConfig.java
@@ -2,77 +2,69 @@
 
 import static org.lflang.ast.ASTUtils.convertToEmptyListIfNull;
 
+import org.eclipse.emf.ecore.resource.Resource;
 import org.lflang.ErrorReporter;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGeneratorContext;
-import org.eclipse.emf.ecore.resource.Resource;
 
 /**
- * Subclass of TargetConfig with a specialized constructor for creating configurations for federates.
+ * Subclass of TargetConfig with a specialized constructor for creating configurations for
+ * federates.
+ *
  * @author Marten Lohstroh
  */
 public class FedTargetConfig extends TargetConfig {
 
-    /**
-     * Create a configuration for a federate given a main context and the resource in which the class
-     * of the federate is specified.
-     * @param context The generator context.
-     * @param federateResource The resource in which to find the reactor class of the federate.
-     */
-    public FedTargetConfig(LFGeneratorContext context, Resource federateResource) {
-        // Create target config based on the main .lf file
-        super(
-            context.getArgs(),
-            GeneratorUtils.findTargetDecl(context.getFileConfig().resource),
-            context.getErrorReporter()
-        );
+  /**
+   * Create a configuration for a federate given a main context and the resource in which the class
+   * of the federate is specified.
+   *
+   * @param context The generator context.
+   * @param federateResource The resource in which to find the reactor class of the federate.
+   */
+  public FedTargetConfig(LFGeneratorContext context, Resource federateResource) {
+    // Create target config based on the main .lf file
+    super(
+        context.getArgs(),
+        GeneratorUtils.findTargetDecl(context.getFileConfig().resource),
+        context.getErrorReporter());
 
-        mergeImportedConfig(
-            federateResource,
-            context.getFileConfig().resource,
-            context.getErrorReporter()
-        );
+    mergeImportedConfig(
+        federateResource, context.getFileConfig().resource, context.getErrorReporter());
 
-        clearPropertiesToIgnore();
+    clearPropertiesToIgnore();
 
-        ((FedFileConfig)context.getFileConfig()).relativizePaths(this);
+    ((FedFileConfig) context.getFileConfig()).relativizePaths(this);
+  }
 
+  /**
+   * If the federate that target configuration applies to is imported, merge target properties
+   * declared in the file that it was imported from.
+   *
+   * @param federateResource The resource where the class of the federate is specified.
+   * @param mainResource The resource in which the federation (i.e., main reactor) is specified.
+   * @param errorReporter An error reporter to use when problems are encountered.
+   */
+  private void mergeImportedConfig(
+      Resource federateResource, Resource mainResource, ErrorReporter errorReporter) {
+    // If the federate is imported, then update the configuration based on target properties
+    // in the imported file.
+    if (!federateResource.equals(mainResource)) {
+      var importedTargetDecl = GeneratorUtils.findTargetDecl(federateResource);
+      var targetProperties = importedTargetDecl.getConfig();
+      if (targetProperties != null) {
+        // Merge properties
+        TargetProperty.update(
+            this, convertToEmptyListIfNull(targetProperties.getPairs()), errorReporter);
+      }
     }
+  }
 
-    /**
-     * If the federate that target configuration applies to is imported, merge target properties
-     * declared in the file that it was imported from.
-     * @param federateResource The resource where the class of the federate is specified.
-     * @param mainResource The resource in which the federation (i.e., main reactor) is specified.
-     * @param errorReporter An error reporter to use when problems are encountered.
-     */
-    private void mergeImportedConfig(
-        Resource federateResource,
-        Resource mainResource,
-        ErrorReporter errorReporter) {
-        // If the federate is imported, then update the configuration based on target properties
-        // in the imported file.
-        if (!federateResource.equals(mainResource)) {
-            var importedTargetDecl = GeneratorUtils.findTargetDecl(federateResource);
-            var targetProperties = importedTargetDecl.getConfig();
-            if (targetProperties != null) {
-                // Merge properties
-                TargetProperty.update(
-                    this,
-                    convertToEmptyListIfNull(targetProperties.getPairs()),
-                    errorReporter
-                );
-            }
-        }
-    }
-
-    /**
-     * Method for the removal of things that should not appear in the target config of a federate.
-     */
-    private void clearPropertiesToIgnore() {
-        this.setByUser.remove(TargetProperty.CLOCK_SYNC);
-        this.setByUser.remove(TargetProperty.CLOCK_SYNC_OPTIONS);
-    }
+  /** Method for the removal of things that should not appear in the target config of a federate. */
+  private void clearPropertiesToIgnore() {
+    this.setByUser.remove(TargetProperty.CLOCK_SYNC);
+    this.setByUser.remove(TargetProperty.CLOCK_SYNC_OPTIONS);
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedTargetEmitter.java b/org.lflang/src/org/lflang/federated/generator/FedTargetEmitter.java
index 1616286048..402138f283 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedTargetEmitter.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedTargetEmitter.java
@@ -1,7 +1,6 @@
 package org.lflang.federated.generator;
 
 import java.io.IOException;
-
 import org.lflang.ErrorReporter;
 import org.lflang.TargetProperty;
 import org.lflang.ast.FormattingUtils;
@@ -11,34 +10,25 @@
 
 public class FedTargetEmitter {
 
-    String generateTarget(
-        LFGeneratorContext context,
-        int numOfFederates,
-        FederateInstance federate,
-        FedFileConfig fileConfig,
-        ErrorReporter errorReporter,
-        RtiConfig rtiConfig
-    ) throws IOException {
+  String generateTarget(
+      LFGeneratorContext context,
+      int numOfFederates,
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      ErrorReporter errorReporter,
+      RtiConfig rtiConfig)
+      throws IOException {
 
-        // FIXME: First of all, this is not an initialization; there is all sorts of stuff happening
-        // in the C implementation of this method. Second, true initialization stuff should happen
-        // when the target config is constructed, not when we're doing code generation.
-        // See https://issues.lf-lang.org/1667
-        FedTargetExtensionFactory.getExtension(federate.targetConfig.target)
-                                 .initializeTargetConfig(
-                                     context,
-                                     numOfFederates,
-                                     federate,
-                                     fileConfig,
-                                     errorReporter,
-                                     rtiConfig
-                                 );
+    // FIXME: First of all, this is not an initialization; there is all sorts of stuff happening
+    // in the C implementation of this method. Second, true initialization stuff should happen
+    // when the target config is constructed, not when we're doing code generation.
+    // See https://issues.lf-lang.org/1667
+    FedTargetExtensionFactory.getExtension(federate.targetConfig.target)
+        .initializeTargetConfig(
+            context, numOfFederates, federate, fileConfig, errorReporter, rtiConfig);
 
-        return FormattingUtils.renderer(federate.targetConfig.target).apply(
-            TargetProperty.extractTargetDecl(
-                federate.targetConfig.target,
-                federate.targetConfig
-            )
-        );
-    }
+    return FormattingUtils.renderer(federate.targetConfig.target)
+        .apply(
+            TargetProperty.extractTargetDecl(federate.targetConfig.target, federate.targetConfig));
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedUtils.java b/org.lflang/src/org/lflang/federated/generator/FedUtils.java
index dd5ee6a9b3..2970be7c2a 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedUtils.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedUtils.java
@@ -1,38 +1,24 @@
 package org.lflang.federated.generator;
 
-import java.util.List;
-
 import org.lflang.federated.serialization.SupportedSerializers;
-import org.lflang.generator.PortInstance;
-import org.lflang.generator.ReactionInstance;
-import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Connection;
-import org.lflang.lf.Reaction;
-import org.lflang.lf.VarRef;
 
-/**
- * A collection of utility methods for the federated generator.
- */
+/** A collection of utility methods for the federated generator. */
 public class FedUtils {
-    /**
-     * Get the serializer for the {@code connection} between {@code srcFederate} and {@code dstFederate}.
-     */
-    public static SupportedSerializers getSerializer(
-        Connection connection,
-        FederateInstance srcFederate,
-        FederateInstance dstFederate
-    ) {
-        // Get the serializer
-        SupportedSerializers serializer = SupportedSerializers.NATIVE;
-        if (connection.getSerializer() != null) {
-            serializer = SupportedSerializers.valueOf(
-                connection.getSerializer().getType().toUpperCase()
-            );
-        }
-        // Add it to the list of enabled serializers for the source and destination federates
-        srcFederate.enabledSerializers.add(serializer);
-        dstFederate.enabledSerializers.add(serializer);
-        return serializer;
+  /**
+   * Get the serializer for the {@code connection} between {@code srcFederate} and {@code
+   * dstFederate}.
+   */
+  public static SupportedSerializers getSerializer(
+      Connection connection, FederateInstance srcFederate, FederateInstance dstFederate) {
+    // Get the serializer
+    SupportedSerializers serializer = SupportedSerializers.NATIVE;
+    if (connection.getSerializer() != null) {
+      serializer = SupportedSerializers.valueOf(connection.getSerializer().getType().toUpperCase());
     }
-
+    // Add it to the list of enabled serializers for the source and destination federates
+    srcFederate.enabledSerializers.add(serializer);
+    dstFederate.enabledSerializers.add(serializer);
+    return serializer;
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FederateInstance.java b/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
index 0669b4f9dc..ee3c0a46f0 100644
--- a/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
+++ b/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
@@ -1,30 +1,31 @@
-/** Instance of a federate specification.
+/**
+ * Instance of a federate specification.
  *
-Copyright (c) 2020, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
-
+ * <p>Copyright (c) 2020, The University of California at Berkeley.
+ *
+ * <p>Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * <p>1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * <p>2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials provided with
+ * the distribution.
+ *
+ * <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * *************
+ */
 package org.lflang.federated.generator;
 
+import com.google.common.base.Objects;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -34,13 +35,11 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.eclipse.emf.ecore.EObject;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.TargetConfig;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.serialization.SupportedSerializers;
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.PortInstance;
@@ -66,599 +65,559 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
 
-import com.google.common.base.Objects;
-
-
 /**
- * Instance of a federate, or marker that no federation has been defined
- * (if isSingleton() returns true) FIXME: this comment makes no sense.
- * Every top-level reactor (contained
- * directly by the main reactor) is a federate, so there will be one
- * instance of this class for each top-level reactor.
+ * Instance of a federate, or marker that no federation has been defined (if isSingleton() returns
+ * true) FIXME: this comment makes no sense. Every top-level reactor (contained directly by the main
+ * reactor) is a federate, so there will be one instance of this class for each top-level reactor.
  *
  * @author Edward A. Lee
  * @author Soroush Bateni
  */
 public class FederateInstance { // why does this not extend ReactorInstance?
 
-    /**
-     * Construct a new instance with the specified instantiation of
-     * of a top-level reactor. The federate will be given the specified
-     * integer ID.
-     * @param instantiation The instantiation of a top-level reactor,
-     *  or null if no federation has been defined.
-     * @param id The federate ID.
-     * @param bankIndex If instantiation.widthSpec !== null, this gives the bank position.
-     * @param errorReporter The error reporter
-     */
-    public FederateInstance(
-            Instantiation instantiation,
-            int id,
-            int bankIndex,
-            TargetConfig targetConfig,
-            ErrorReporter errorReporter) {
-        this.instantiation = instantiation;
-        this.id = id;
-        this.bankIndex = bankIndex;
-        this.errorReporter = errorReporter;
-        this.targetConfig = targetConfig;
-
-        if (instantiation != null) {
-            // If the instantiation is in a bank, then we have to append
-            // the bank index to the name.
-            if (instantiation.getWidthSpec() != null) {
-                this.name = "federate__" + instantiation.getName() + "__" + bankIndex;
-            } else {
-                this.name = "federate__" + instantiation.getName();
-            }
-        }
+  /**
+   * Construct a new instance with the specified instantiation of of a top-level reactor. The
+   * federate will be given the specified integer ID.
+   *
+   * @param instantiation The instantiation of a top-level reactor, or null if no federation has
+   *     been defined.
+   * @param id The federate ID.
+   * @param bankIndex If instantiation.widthSpec !== null, this gives the bank position.
+   * @param errorReporter The error reporter
+   */
+  public FederateInstance(
+      Instantiation instantiation,
+      int id,
+      int bankIndex,
+      TargetConfig targetConfig,
+      ErrorReporter errorReporter) {
+    this.instantiation = instantiation;
+    this.id = id;
+    this.bankIndex = bankIndex;
+    this.errorReporter = errorReporter;
+    this.targetConfig = targetConfig;
+
+    if (instantiation != null) {
+      // If the instantiation is in a bank, then we have to append
+      // the bank index to the name.
+      if (instantiation.getWidthSpec() != null) {
+        this.name = "federate__" + instantiation.getName() + "__" + bankIndex;
+      } else {
+        this.name = "federate__" + instantiation.getName();
+      }
     }
-
-    /////////////////////////////////////////////
-    //// Public Fields
-
-    /**
-     * The position within a bank of reactors for this federate.
-     * This is 0 if the instantiation is not a bank of reactors.
-     */
-    public int bankIndex = 0;
-
-    /**
-     * A list of outputs that can be triggered directly or indirectly by physical actions.
-     */
-    public Set<Expression> outputsConnectedToPhysicalActions = new LinkedHashSet<>();
-
-    /**
-     * The host, if specified using the 'at' keyword.
-     */
-    public String host = "localhost";
-
-
-    /**
-     * The instantiation of the top-level reactor, or null if there is no federation.
-     */
-    public Instantiation instantiation;
-    public Instantiation getInstantiation() {
-        return instantiation;
+  }
+
+  /////////////////////////////////////////////
+  //// Public Fields
+
+  /**
+   * The position within a bank of reactors for this federate. This is 0 if the instantiation is not
+   * a bank of reactors.
+   */
+  public int bankIndex = 0;
+
+  /** A list of outputs that can be triggered directly or indirectly by physical actions. */
+  public Set<Expression> outputsConnectedToPhysicalActions = new LinkedHashSet<>();
+
+  /** The host, if specified using the 'at' keyword. */
+  public String host = "localhost";
+
+  /** The instantiation of the top-level reactor, or null if there is no federation. */
+  public Instantiation instantiation;
+
+  public Instantiation getInstantiation() {
+    return instantiation;
+  }
+
+  /** A list of individual connections between federates */
+  public Set<FedConnectionInstance> connections = new HashSet<>();
+
+  /**
+   * Map from the federates that this federate receives messages from to the delays on connections
+   * from that federate. The delay set may include null, meaning that there is a connection from the
+   * federate instance that has no delay.
+   */
+  public Map<FederateInstance, Set<Expression>> dependsOn = new LinkedHashMap<>();
+
+  /** The directory, if specified using the 'at' keyword. */
+  public String dir = null;
+
+  /** The port, if specified using the 'at' keyword. */
+  public int port = 0;
+
+  /**
+   * Map from the federates that this federate sends messages to to the delays on connections to
+   * that federate. The delay set may may include null, meaning that there is a connection from the
+   * federate instance that has no delay.
+   */
+  public Map<FederateInstance, Set<Expression>> sendsTo = new LinkedHashMap<>();
+
+  /** The user, if specified using the 'at' keyword. */
+  public String user = null;
+
+  /** The integer ID of this federate. */
+  public int id = 0;
+
+  /**
+   * The name of this federate instance. This will be the instantiation name, possibly appended with
+   * "__n", where n is the bank position of this instance if the instantiation is of a bank of
+   * reactors.
+   */
+  public String name = "Unnamed";
+
+  /**
+   * List of networkMessage actions. Each of these handles a message received from another federate
+   * over the network. The ID of receiving port is simply the position of the action in the list.
+   * The sending federate needs to specify this ID.
+   */
+  public List<Action> networkMessageActions = new ArrayList<>();
+
+  /**
+   * A set of federates with which this federate has an inbound connection There will only be one
+   * physical connection even if federate A has defined multiple physical connections to federate B.
+   * The message handler on federate A will be responsible for including the appropriate information
+   * in the message header (such as port ID) to help the receiver distinguish different events.
+   */
+  public Set<FederateInstance> inboundP2PConnections = new LinkedHashSet<>();
+
+  /**
+   * A list of federate with which this federate has an outbound physical connection. There will
+   * only be one physical connection even if federate A has defined multiple physical connections to
+   * federate B. The message handler on federate B will be responsible for distinguishing the
+   * incoming messages by parsing their header and scheduling the appropriate action.
+   */
+  public Set<FederateInstance> outboundP2PConnections = new LinkedHashSet<>();
+
+  /**
+   * A list of triggers for network input control reactions. This is used to trigger all the input
+   * network control reactions that might be nested in a hierarchy.
+   */
+  public List<Action> networkInputControlReactionsTriggers = new ArrayList<>();
+
+  /**
+   * The trigger that triggers the output control reaction of this federate.
+   *
+   * <p>The network output control reactions send a PORT_ABSENT message for a network output port,
+   * if it is absent at the current tag, to notify all downstream federates that no value will be
+   * present on the given network port, allowing input control reactions on those federates to stop
+   * blocking.
+   */
+  public Variable networkOutputControlReactionsTrigger = null;
+
+  /** Indicates whether the federate is remote or local */
+  public boolean isRemote = false;
+
+  /**
+   * List of generated network reactions (network receivers, network input control reactions,
+   * network senders, and network output control reactions) that belong to this federate instance.
+   */
+  public List<Reaction> networkReactions = new ArrayList<>();
+
+  /** Parsed target config of the federate. */
+  public TargetConfig targetConfig;
+
+  /** Keep a unique list of enabled serializers */
+  public HashSet<SupportedSerializers> enabledSerializers = new HashSet<>();
+
+  /**
+   * Return true if the specified EObject should be included in the code generated for this
+   * federate.
+   *
+   * @param object An {@code EObject}
+   * @return True if this federate contains the EObject.
+   */
+  public boolean contains(EObject object) {
+    if (object instanceof Action) {
+      return contains((Action) object);
+    } else if (object instanceof Reaction) {
+      return contains((Reaction) object);
+    } else if (object instanceof Timer) {
+      return contains((Timer) object);
+    } else if (object instanceof ReactorDecl) {
+      return contains(this.instantiation, (ReactorDecl) object);
+    } else if (object instanceof Import) {
+      return contains((Import) object);
+    } else if (object instanceof Parameter) {
+      return contains((Parameter) object);
+    } else if (object instanceof StateVar) {
+      return true; // FIXME: Should we disallow state vars at the top level?
     }
-
-    /**
-     * A list of individual connections between federates
-     */
-    public Set<FedConnectionInstance> connections = new HashSet<>();
-
-    /**
-     * Map from the federates that this federate receives messages from
-     * to the delays on connections from that federate. The delay set
-     * may include null, meaning that there is a connection
-     * from the federate instance that has no delay.
-     */
-    public Map<FederateInstance, Set<Expression>> dependsOn = new LinkedHashMap<>();
-
-    /**
-     * The directory, if specified using the 'at' keyword.
-     */
-    public String dir = null;
-
-    /**
-     * The port, if specified using the 'at' keyword.
-     */
-    public int port = 0;
-
-    /**
-     * Map from the federates that this federate sends messages to
-     * to the delays on connections to that federate. The delay set
-     * may may include null, meaning that there is a connection
-     * from the federate instance that has no delay.
-     */
-    public Map<FederateInstance, Set<Expression>> sendsTo = new LinkedHashMap<>();
-
-    /**
-     * The user, if specified using the 'at' keyword.
-     */
-    public String user = null;
-
-    /**
-     * The integer ID of this federate.
-     */
-    public int id = 0;
-
-
-    /**
-     * The name of this federate instance. This will be the instantiation
-     * name, possibly appended with "__n", where n is the bank position of
-     * this instance if the instantiation is of a bank of reactors.
-     */
-    public String name = "Unnamed";
-
-    /**
-     * List of networkMessage actions. Each of these handles a message
-     *  received from another federate over the network. The ID of
-     *  receiving port is simply the position of the action in the list.
-     *  The sending federate needs to specify this ID.
-     */
-    public List<Action> networkMessageActions = new ArrayList<>();
-
-    /**
-     * A set of federates with which this federate has an inbound connection
-     * There will only be one physical connection even if federate A has defined multiple
-     * physical connections to federate B. The message handler on federate A will be
-     * responsible for including the appropriate information in the message header (such as port ID)
-     * to help the receiver distinguish different events.
-     */
-    public Set<FederateInstance> inboundP2PConnections = new LinkedHashSet<>();
-
-    /**
-     * A list of federate with which this federate has an outbound physical connection.
-     * There will only be one physical connection even if federate A has defined multiple
-     * physical connections to federate B. The message handler on federate B will be
-     * responsible for distinguishing the incoming messages by parsing their header and
-     * scheduling the appropriate action.
-     */
-    public Set<FederateInstance> outboundP2PConnections = new LinkedHashSet<>();
-
-    /**
-     * A list of triggers for network input control reactions. This is used to trigger
-     * all the input network control reactions that might be nested in a hierarchy.
-     */
-    public List<Action> networkInputControlReactionsTriggers = new ArrayList<>();
-
-    /**
-     * The trigger that triggers the output control reaction of this
-     * federate.
-     *
-     * The network output control reactions send a PORT_ABSENT message for a network output port,
-     * if it is absent at the current tag, to notify all downstream federates that no value will
-     * be present on the given network port, allowing input control reactions on those federates
-     * to stop blocking.
-     */
-    public Variable networkOutputControlReactionsTrigger = null;
-
-    /**
-     * Indicates whether the federate is remote or local
-     */
-    public boolean isRemote = false;
-
-    /**
-     * List of generated network reactions (network receivers,
-     * network input control reactions, network senders, and network output control
-     * reactions) that belong to this federate instance.
-     */
-    public List<Reaction> networkReactions = new ArrayList<>();
-
-    /**
-     * Parsed target config of the federate.
-     */
-    public TargetConfig targetConfig;
-
-    /**
-     * Keep a unique list of enabled serializers
-     */
-    public HashSet<SupportedSerializers> enabledSerializers = new HashSet<>();
-
-    /**
-     * Return true if the specified EObject should be included in the code
-     * generated for this federate.
-     *
-     * @param object An {@code EObject}
-     * @return True if this federate contains the EObject.
-     */
-    public boolean contains(EObject object) {
-        if (object instanceof Action) {
-            return contains((Action)object);
-        } else if (object instanceof Reaction) {
-            return contains((Reaction)object);
-        } else if (object instanceof Timer) {
-            return contains((Timer)object);
-        } else if (object instanceof ReactorDecl) {
-            return contains(this.instantiation, (ReactorDecl)object);
-        } else if (object instanceof Import) {
-            return contains((Import)object);
-        } else if (object instanceof Parameter) {
-            return contains((Parameter)object);
-        } else if (object instanceof StateVar) {
-            return true; // FIXME: Should we disallow state vars at the top level?
-        }
-        throw new UnsupportedOperationException("EObject class "+object.eClass().getName()+" not supported.");
+    throw new UnsupportedOperationException(
+        "EObject class " + object.eClass().getName() + " not supported.");
+  }
+
+  /**
+   * Return true if the specified reactor belongs to this federate.
+   *
+   * @param instantiation The instantiation to look inside
+   * @param reactor The reactor declaration to find
+   */
+  private boolean contains(Instantiation instantiation, ReactorDecl reactor) {
+    if (instantiation.getReactorClass().equals(ASTUtils.toDefinition(reactor))) {
+      return true;
     }
 
-    /**
-     * Return true if the specified reactor belongs to this federate.
-     * @param instantiation The instantiation to look inside
-     * @param reactor The reactor declaration to find
-     */
-    private boolean contains(
-        Instantiation instantiation,
-        ReactorDecl reactor
-    ) {
-        if (instantiation.getReactorClass().equals(ASTUtils.toDefinition(reactor))) {
-            return true;
-        }
-
-        boolean instantiationsCheck = false;
-        // For a federate, we don't need to look inside imported reactors.
-        if (instantiation.getReactorClass() instanceof Reactor reactorDef) {
-            for (Instantiation child : reactorDef.getInstantiations()) {
-                instantiationsCheck |= contains(child, reactor);
-            }
-        }
-
-        return instantiationsCheck;
+    boolean instantiationsCheck = false;
+    // For a federate, we don't need to look inside imported reactors.
+    if (instantiation.getReactorClass() instanceof Reactor reactorDef) {
+      for (Instantiation child : reactorDef.getInstantiations()) {
+        instantiationsCheck |= contains(child, reactor);
+      }
     }
 
-    /**
-     * Return true if the specified import should be included in the code generated for this federate.
-     * @param imp The import
-     */
-    private boolean contains(Import imp) {
-        for (ImportedReactor reactor : imp.getReactorClasses()) {
-            if (contains(reactor)) {
-                return true;
-            }
-        }
-        return false;
+    return instantiationsCheck;
+  }
+
+  /**
+   * Return true if the specified import should be included in the code generated for this federate.
+   *
+   * @param imp The import
+   */
+  private boolean contains(Import imp) {
+    for (ImportedReactor reactor : imp.getReactorClasses()) {
+      if (contains(reactor)) {
+        return true;
+      }
     }
-
-    /**
-     * Return true if the specified parameter should be included in the code generated for this federate.
-     * @param param The parameter
-     */
-    private boolean contains(Parameter param) {
-        boolean returnValue = false;
-        // Check if param is referenced in this federate's instantiation
-        returnValue = instantiation.getParameters().stream().anyMatch(
-            assignment -> assignment.getRhs()
-                                    .getExprs()
-                                    .stream()
-                                    .filter(
-                                        it -> it instanceof ParameterReference
-                                    )
-                                    .map(it -> ((ParameterReference) it).getParameter())
-                                    .toList()
-                                    .contains(param)
-        );
-        // If there are any user-defined top-level reactions, they could access
-        // the parameters, so we need to include the parameter.
-        var topLevelUserDefinedReactions = ((Reactor) instantiation.eContainer())
-            .getReactions().stream().filter(
-                r -> !networkReactions.contains(r) && contains(r)
-            ).collect(Collectors.toCollection(ArrayList::new));
-        returnValue |= !topLevelUserDefinedReactions.isEmpty();
-        return returnValue;
-    }
-
-    /**
-     * Return true if the specified action should be included in the code generated
-     * for this federate. This means that either the action is used as a trigger,
-     * a source, or an effect in a top-level reaction that belongs to this federate.
-     * This returns true if the program is not federated.
-     *
-     * @param action The action
-     * @return True if this federate contains the action.
-     */
-    private boolean contains(Action action) {
-        Reactor reactor  = ASTUtils.getEnclosingReactor(action);
-
-        // If the action is used as a trigger, a source, or an effect for a top-level reaction
-        // that belongs to this federate, then generate it.
-        for (Reaction react : ASTUtils.allReactions(reactor)) {
-            if (contains(react)) {
-                // Look in triggers
-                for (TriggerRef trigger : convertToEmptyListIfNull(react.getTriggers())) {
-                    if (trigger instanceof VarRef triggerAsVarRef) {
-                        if (Objects.equal(triggerAsVarRef.getVariable(), action)) {
-                            return true;
-                        }
-                    }
-                }
-                // Look in sources
-                for (VarRef source : convertToEmptyListIfNull(react.getSources())) {
-                    if (Objects.equal(source.getVariable(), action)) {
-                        return true;
-                    }
-                }
-                // Look in effects
-                for (VarRef effect : convertToEmptyListIfNull(react.getEffects())) {
-                    if (Objects.equal(effect.getVariable(), action)) {
-                        return true;
-                    }
-                }
+    return false;
+  }
+
+  /**
+   * Return true if the specified parameter should be included in the code generated for this
+   * federate.
+   *
+   * @param param The parameter
+   */
+  private boolean contains(Parameter param) {
+    boolean returnValue = false;
+    // Check if param is referenced in this federate's instantiation
+    returnValue =
+        instantiation.getParameters().stream()
+            .anyMatch(
+                assignment ->
+                    assignment.getRhs().getExprs().stream()
+                        .filter(it -> it instanceof ParameterReference)
+                        .map(it -> ((ParameterReference) it).getParameter())
+                        .toList()
+                        .contains(param));
+    // If there are any user-defined top-level reactions, they could access
+    // the parameters, so we need to include the parameter.
+    var topLevelUserDefinedReactions =
+        ((Reactor) instantiation.eContainer())
+            .getReactions().stream()
+                .filter(r -> !networkReactions.contains(r) && contains(r))
+                .collect(Collectors.toCollection(ArrayList::new));
+    returnValue |= !topLevelUserDefinedReactions.isEmpty();
+    return returnValue;
+  }
+
+  /**
+   * Return true if the specified action should be included in the code generated for this federate.
+   * This means that either the action is used as a trigger, a source, or an effect in a top-level
+   * reaction that belongs to this federate. This returns true if the program is not federated.
+   *
+   * @param action The action
+   * @return True if this federate contains the action.
+   */
+  private boolean contains(Action action) {
+    Reactor reactor = ASTUtils.getEnclosingReactor(action);
+
+    // If the action is used as a trigger, a source, or an effect for a top-level reaction
+    // that belongs to this federate, then generate it.
+    for (Reaction react : ASTUtils.allReactions(reactor)) {
+      if (contains(react)) {
+        // Look in triggers
+        for (TriggerRef trigger : convertToEmptyListIfNull(react.getTriggers())) {
+          if (trigger instanceof VarRef triggerAsVarRef) {
+            if (Objects.equal(triggerAsVarRef.getVariable(), action)) {
+              return true;
             }
+          }
         }
-
-        return false;
-    }
-
-    /**
-     * Return true if the specified reaction should be included in the code generated for this
-     * federate at the top-level. This means that if the reaction is triggered by or
-     * sends data to a port of a contained reactor, then that reaction
-     * is in the federate. Otherwise, return false.
-     *
-     * NOTE: This method assumes that it will not be called with reaction arguments
-     * that are within other federates. It should only be called on reactions that are
-     * either at the top level or within this federate. For this reason, for any reaction
-     * not at the top level, it returns true.
-     *
-     * @param reaction The reaction.
-     */
-    private boolean contains(Reaction reaction) {
-        Reactor reactor  = ASTUtils.getEnclosingReactor(reaction);
-
-        assert reactor != null;
-        if (!reactor.getReactions().contains(reaction)) return false;
-
-        if (networkReactions.contains(reaction)) {
-            // Reaction is a network reaction that belongs to this federate
+        // Look in sources
+        for (VarRef source : convertToEmptyListIfNull(react.getSources())) {
+          if (Objects.equal(source.getVariable(), action)) {
             return true;
+          }
         }
-
-        int reactionBankIndex = FedASTUtils.getReactionBankIndex(reaction);
-        if (reactionBankIndex >= 0 && this.bankIndex >= 0 && reactionBankIndex != this.bankIndex) {
-            return false;
-        }
-
-        // If this has been called before, then the result of the
-        // following check is cached.
-        if (excludeReactions != null) {
-            return !excludeReactions.contains(reaction);
+        // Look in effects
+        for (VarRef effect : convertToEmptyListIfNull(react.getEffects())) {
+          if (Objects.equal(effect.getVariable(), action)) {
+            return true;
+          }
         }
+      }
+    }
 
-        indexExcludedTopLevelReactions(reactor);
-
-        return !excludeReactions.contains(reaction);
+    return false;
+  }
+
+  /**
+   * Return true if the specified reaction should be included in the code generated for this
+   * federate at the top-level. This means that if the reaction is triggered by or sends data to a
+   * port of a contained reactor, then that reaction is in the federate. Otherwise, return false.
+   *
+   * <p>NOTE: This method assumes that it will not be called with reaction arguments that are within
+   * other federates. It should only be called on reactions that are either at the top level or
+   * within this federate. For this reason, for any reaction not at the top level, it returns true.
+   *
+   * @param reaction The reaction.
+   */
+  private boolean contains(Reaction reaction) {
+    Reactor reactor = ASTUtils.getEnclosingReactor(reaction);
+
+    assert reactor != null;
+    if (!reactor.getReactions().contains(reaction)) return false;
+
+    if (networkReactions.contains(reaction)) {
+      // Reaction is a network reaction that belongs to this federate
+      return true;
     }
 
-    /**
-     * Return true if the specified timer should be included in the code generated
-     * for the federate. This means that the timer is used as a trigger
-     * in a top-level reaction that belongs to this federate.
-     * This also returns true if the program is not federated.
-     *
-     * @return True if this federate contains the action in the specified reactor
-     */
-    private boolean contains(Timer timer) {
-        Reactor reactor  = ASTUtils.getEnclosingReactor(timer);
-
-        // If the action is used as a trigger, a source, or an effect for a top-level reaction
-        // that belongs to this federate, then generate it.
-        for (Reaction r : ASTUtils.allReactions(reactor)) {
-            if (contains(r)) {
-                // Look in triggers
-                for (TriggerRef trigger : convertToEmptyListIfNull(r.getTriggers())) {
-                    if (trigger instanceof VarRef triggerAsVarRef) {
-                        if (Objects.equal(triggerAsVarRef.getVariable(), timer)) {
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
+    int reactionBankIndex = FedASTUtils.getReactionBankIndex(reaction);
+    if (reactionBankIndex >= 0 && this.bankIndex >= 0 && reactionBankIndex != this.bankIndex) {
+      return false;
+    }
 
-        return false;
+    // If this has been called before, then the result of the
+    // following check is cached.
+    if (excludeReactions != null) {
+      return !excludeReactions.contains(reaction);
     }
 
-    /**
-     * Return true if the specified reactor instance or any parent
-     * reactor instance is contained by this federate.
-     * If the specified instance is the top-level reactor, return true
-     * (the top-level reactor belongs to all federates).
-     * If this federate instance is a singleton, then return true if the
-     * instance is non null.
-     *
-     * NOTE: If the instance is bank within the top level, then this
-     * returns true even though only one of the bank members is in the federate.
-     *
-     * @param instance The reactor instance.
-     * @return True if this federate contains the reactor instance
-     */
-    public boolean contains(ReactorInstance instance) {
-        if (instance.getParent() == null) {
-            return true; // Top-level reactor
-        }
-        // Start with this instance, then check its parents.
-        ReactorInstance i = instance;
-        while (i != null) {
-            if (i.getDefinition() == instantiation) {
-                return true;
+    indexExcludedTopLevelReactions(reactor);
+
+    return !excludeReactions.contains(reaction);
+  }
+
+  /**
+   * Return true if the specified timer should be included in the code generated for the federate.
+   * This means that the timer is used as a trigger in a top-level reaction that belongs to this
+   * federate. This also returns true if the program is not federated.
+   *
+   * @return True if this federate contains the action in the specified reactor
+   */
+  private boolean contains(Timer timer) {
+    Reactor reactor = ASTUtils.getEnclosingReactor(timer);
+
+    // If the action is used as a trigger, a source, or an effect for a top-level reaction
+    // that belongs to this federate, then generate it.
+    for (Reaction r : ASTUtils.allReactions(reactor)) {
+      if (contains(r)) {
+        // Look in triggers
+        for (TriggerRef trigger : convertToEmptyListIfNull(r.getTriggers())) {
+          if (trigger instanceof VarRef triggerAsVarRef) {
+            if (Objects.equal(triggerAsVarRef.getVariable(), timer)) {
+              return true;
             }
-            i = i.getParent();
+          }
         }
-        return false;
+      }
     }
 
-    /**
-     * Build an index of reactions at the top-level (in the
-     * federatedReactor) that don't belong to this federate
-     * instance. This index is put in the excludeReactions
-     * class variable.
-     *
-     * @param federatedReactor The top-level federated reactor
-     */
-    private void indexExcludedTopLevelReactions(Reactor federatedReactor) {
-        boolean inFederate = false;
-        if (excludeReactions != null) {
-            throw new IllegalStateException("The index for excluded reactions at the top level is already built.");
-        }
+    return false;
+  }
+
+  /**
+   * Return true if the specified reactor instance or any parent reactor instance is contained by
+   * this federate. If the specified instance is the top-level reactor, return true (the top-level
+   * reactor belongs to all federates). If this federate instance is a singleton, then return true
+   * if the instance is non null.
+   *
+   * <p>NOTE: If the instance is bank within the top level, then this returns true even though only
+   * one of the bank members is in the federate.
+   *
+   * @param instance The reactor instance.
+   * @return True if this federate contains the reactor instance
+   */
+  public boolean contains(ReactorInstance instance) {
+    if (instance.getParent() == null) {
+      return true; // Top-level reactor
+    }
+    // Start with this instance, then check its parents.
+    ReactorInstance i = instance;
+    while (i != null) {
+      if (i.getDefinition() == instantiation) {
+        return true;
+      }
+      i = i.getParent();
+    }
+    return false;
+  }
+
+  /**
+   * Build an index of reactions at the top-level (in the federatedReactor) that don't belong to
+   * this federate instance. This index is put in the excludeReactions class variable.
+   *
+   * @param federatedReactor The top-level federated reactor
+   */
+  private void indexExcludedTopLevelReactions(Reactor federatedReactor) {
+    boolean inFederate = false;
+    if (excludeReactions != null) {
+      throw new IllegalStateException(
+          "The index for excluded reactions at the top level is already built.");
+    }
 
-        excludeReactions = new LinkedHashSet<>();
-
-        // Construct the set of excluded reactions for this federate.
-        // If a reaction is a network reaction that belongs to this federate, we
-        // don't need to perform this analysis.
-        Iterable<Reaction> reactions = ASTUtils.allReactions(federatedReactor).stream().filter(it -> !networkReactions.contains(it)).collect(Collectors.toList());
-        for (Reaction react : reactions) {
-            // Create a collection of all the VarRefs (i.e., triggers, sources, and effects) in the react
-            // signature that are ports that reference federates.
-            // We then later check that all these VarRefs reference this federate. If not, we will add this
-            // react to the list of reactions that have to be excluded (note that mixing VarRefs from
-            // different federates is not allowed).
-            List<VarRef> allVarRefsReferencingFederates = new ArrayList<>();
-            // Add all the triggers that are outputs
-            Stream<VarRef> triggersAsVarRef = react.getTriggers().stream().filter(it -> it instanceof VarRef).map(it -> (VarRef) it);
-            allVarRefsReferencingFederates.addAll(
-                triggersAsVarRef.filter(it -> it.getVariable() instanceof Output).toList()
-            );
-            // Add all the sources that are outputs
-            allVarRefsReferencingFederates.addAll(
-                react.getSources().stream().filter(it -> it.getVariable() instanceof Output).toList()
-            );
-            // Add all the effects that are inputs
-            allVarRefsReferencingFederates.addAll(
-                react.getEffects().stream().filter(it -> it.getVariable() instanceof Input).toList()
-            );
-            inFederate = containsAllVarRefs(allVarRefsReferencingFederates);
-            if (!inFederate) {
-                excludeReactions.add(react);
-            }
+    excludeReactions = new LinkedHashSet<>();
+
+    // Construct the set of excluded reactions for this federate.
+    // If a reaction is a network reaction that belongs to this federate, we
+    // don't need to perform this analysis.
+    Iterable<Reaction> reactions =
+        ASTUtils.allReactions(federatedReactor).stream()
+            .filter(it -> !networkReactions.contains(it))
+            .collect(Collectors.toList());
+    for (Reaction react : reactions) {
+      // Create a collection of all the VarRefs (i.e., triggers, sources, and effects) in the react
+      // signature that are ports that reference federates.
+      // We then later check that all these VarRefs reference this federate. If not, we will add
+      // this
+      // react to the list of reactions that have to be excluded (note that mixing VarRefs from
+      // different federates is not allowed).
+      List<VarRef> allVarRefsReferencingFederates = new ArrayList<>();
+      // Add all the triggers that are outputs
+      Stream<VarRef> triggersAsVarRef =
+          react.getTriggers().stream().filter(it -> it instanceof VarRef).map(it -> (VarRef) it);
+      allVarRefsReferencingFederates.addAll(
+          triggersAsVarRef.filter(it -> it.getVariable() instanceof Output).toList());
+      // Add all the sources that are outputs
+      allVarRefsReferencingFederates.addAll(
+          react.getSources().stream().filter(it -> it.getVariable() instanceof Output).toList());
+      // Add all the effects that are inputs
+      allVarRefsReferencingFederates.addAll(
+          react.getEffects().stream().filter(it -> it.getVariable() instanceof Input).toList());
+      inFederate = containsAllVarRefs(allVarRefsReferencingFederates);
+      if (!inFederate) {
+        excludeReactions.add(react);
+      }
+    }
+  }
+
+  /**
+   * Return true if all members of 'varRefs' belong to this federate.
+   *
+   * <p>As a convenience measure, if some members of 'varRefs' are from different federates, also
+   * report an error.
+   *
+   * @param varRefs A collection of VarRefs
+   */
+  private boolean containsAllVarRefs(Iterable<VarRef> varRefs) {
+    var referencesFederate = false;
+    var inFederate = true;
+    for (VarRef varRef : varRefs) {
+      if (varRef.getContainer() == this.instantiation) {
+        referencesFederate = true;
+      } else {
+        if (referencesFederate) {
+          errorReporter.reportError(
+              varRef,
+              "Mixed triggers and effects from" + " different federates. This is not permitted");
         }
+        inFederate = false;
+      }
     }
-
-    /**
-     * Return true if all members of 'varRefs' belong to this federate.
-     *
-     * As a convenience measure, if some members of 'varRefs' are from
-     * different federates, also report an error.
-     *
-     * @param varRefs A collection of VarRefs
-     */
-    private boolean containsAllVarRefs(Iterable<VarRef> varRefs) {
-        var referencesFederate = false;
-        var inFederate = true;
-        for (VarRef varRef : varRefs) {
-            if (varRef.getContainer() == this.instantiation) {
-                referencesFederate = true;
-            } else {
-                if (referencesFederate) {
-                    errorReporter.reportError(varRef,
-                                              "Mixed triggers and effects from"
-                                                  +
-                                                  " different federates. This is not permitted");
-                }
-                inFederate = false;
-            }
+    return inFederate;
+  }
+
+  /**
+   * Find output ports that are connected to a physical action trigger upstream in the same reactor.
+   * Return a list of such outputs paired with the minimum delay from the nearest physical action.
+   *
+   * @param instance The reactor instance containing the output ports
+   * @return A LinkedHashMap<Output, TimeValue>
+   */
+  public LinkedHashMap<Output, TimeValue> findOutputsConnectedToPhysicalActions(
+      ReactorInstance instance) {
+    LinkedHashMap<Output, TimeValue> physicalActionToOutputMinDelay = new LinkedHashMap<>();
+    // Find reactions that write to the output port of the reactor
+    for (PortInstance output : instance.outputs) {
+      for (ReactionInstance reaction : output.getDependsOnReactions()) {
+        TimeValue minDelay = findNearestPhysicalActionTrigger(reaction);
+        if (!Objects.equal(minDelay, TimeValue.MAX_VALUE)) {
+          physicalActionToOutputMinDelay.put((Output) output.getDefinition(), minDelay);
         }
-        return inFederate;
+      }
     }
-
-    /**
-     * Find output ports that are connected to a physical action trigger upstream
-     * in the same reactor. Return a list of such outputs paired with the minimum delay
-     * from the nearest physical action.
-     * @param instance The reactor instance containing the output ports
-     * @return A LinkedHashMap<Output, TimeValue>
-     */
-    public LinkedHashMap<Output, TimeValue> findOutputsConnectedToPhysicalActions(ReactorInstance instance) {
-        LinkedHashMap<Output, TimeValue> physicalActionToOutputMinDelay = new LinkedHashMap<>();
-        // Find reactions that write to the output port of the reactor
-        for (PortInstance output : instance.outputs) {
-            for (ReactionInstance reaction : output.getDependsOnReactions()) {
-                TimeValue minDelay = findNearestPhysicalActionTrigger(reaction);
-                if (!Objects.equal(minDelay, TimeValue.MAX_VALUE)) {
-                    physicalActionToOutputMinDelay.put((Output) output.getDefinition(), minDelay);
-                }
+    return physicalActionToOutputMinDelay;
+  }
+
+  /**
+   * Return a list of federates that are upstream of this federate and have a zero-delay (direct)
+   * connection to this federate.
+   */
+  public List<FederateInstance> getZeroDelayImmediateUpstreamFederates() {
+    return this.dependsOn.entrySet().stream()
+        .filter(e -> e.getValue().contains(null))
+        .map(Map.Entry::getKey)
+        .toList();
+  }
+
+  @Override
+  public String toString() {
+    return "Federate "
+        + id
+        + ": "
+        + ((instantiation != null) ? instantiation.getName() : "no name");
+  }
+
+  /////////////////////////////////////////////
+  //// Private Fields
+
+  /** Cached result of analysis of which reactions to exclude from main. */
+  private Set<Reaction> excludeReactions = null;
+
+  /** An error reporter */
+  private final ErrorReporter errorReporter;
+
+  /**
+   * Find the nearest (shortest) path to a physical action trigger from this 'reaction' in terms of
+   * minimum delay.
+   *
+   * @param reaction The reaction to start with
+   * @return The minimum delay found to the nearest physical action and TimeValue.MAX_VALUE
+   *     otherwise
+   */
+  public TimeValue findNearestPhysicalActionTrigger(ReactionInstance reaction) {
+    TimeValue minDelay = TimeValue.MAX_VALUE;
+    for (TriggerInstance<? extends Variable> trigger : reaction.triggers) {
+      if (trigger.getDefinition() instanceof Action action) {
+        ActionInstance actionInstance = (ActionInstance) trigger;
+        if (action.getOrigin() == ActionOrigin.PHYSICAL) {
+          if (actionInstance.getMinDelay().isEarlierThan(minDelay)) {
+            minDelay = actionInstance.getMinDelay();
+          }
+        } else if (action.getOrigin() == ActionOrigin.LOGICAL) {
+          // Logical action
+          // Follow it upstream inside the reactor
+          for (ReactionInstance uReaction : actionInstance.getDependsOnReactions()) {
+            // Avoid a loop
+            if (!Objects.equal(uReaction, reaction)) {
+              TimeValue uMinDelay =
+                  actionInstance.getMinDelay().add(findNearestPhysicalActionTrigger(uReaction));
+              if (uMinDelay.isEarlierThan(minDelay)) {
+                minDelay = uMinDelay;
+              }
             }
+          }
         }
-        return physicalActionToOutputMinDelay;
-    }
-
-    /**
-     * Return a list of federates that are upstream of this federate and have a
-     * zero-delay (direct) connection to this federate.
-     */
-    public List<FederateInstance> getZeroDelayImmediateUpstreamFederates() {
-        return this.dependsOn.entrySet()
-                                 .stream()
-                                 .filter(e -> e.getValue().contains(null))
-                                 .map(Map.Entry::getKey).toList();
-    }
 
-    @Override
-    public String toString() {
-        return "Federate " + id + ": "
-            + ((instantiation != null) ? instantiation.getName() : "no name");
-    }
-
-    /////////////////////////////////////////////
-    //// Private Fields
-
-    /**
-     * Cached result of analysis of which reactions to exclude from main.
-     */
-    private Set<Reaction> excludeReactions = null;
-
-    /**
-     * An error reporter
-     */
-    private final ErrorReporter errorReporter;
-
-    /**
-     * Find the nearest (shortest) path to a physical action trigger from this
-     * 'reaction' in terms of minimum delay.
-     *
-     * @param reaction The reaction to start with
-     * @return The minimum delay found to the nearest physical action and
-     *  TimeValue.MAX_VALUE otherwise
-     */
-    public TimeValue findNearestPhysicalActionTrigger(ReactionInstance reaction) {
-        TimeValue minDelay = TimeValue.MAX_VALUE;
-        for (TriggerInstance<? extends Variable> trigger : reaction.triggers) {
-            if (trigger.getDefinition() instanceof Action action) {
-                ActionInstance actionInstance = (ActionInstance) trigger;
-                if (action.getOrigin() == ActionOrigin.PHYSICAL) {
-                    if (actionInstance.getMinDelay().isEarlierThan(minDelay)) {
-                        minDelay = actionInstance.getMinDelay();
-                    }
-                } else if (action.getOrigin() == ActionOrigin.LOGICAL) {
-                    // Logical action
-                    // Follow it upstream inside the reactor
-                    for (ReactionInstance uReaction: actionInstance.getDependsOnReactions()) {
-                        // Avoid a loop
-                        if (!Objects.equal(uReaction, reaction)) {
-                            TimeValue uMinDelay = actionInstance.getMinDelay().add(findNearestPhysicalActionTrigger(uReaction));
-                            if (uMinDelay.isEarlierThan(minDelay)) {
-                                minDelay = uMinDelay;
-                            }
-                        }
-                    }
-                }
-
-            } else if (trigger.getDefinition() instanceof Output) {
-                // Outputs of contained reactions
-                PortInstance outputInstance = (PortInstance) trigger;
-                for (ReactionInstance uReaction: outputInstance.getDependsOnReactions()) {
-                    TimeValue uMinDelay = findNearestPhysicalActionTrigger(uReaction);
-                    if (uMinDelay.isEarlierThan(minDelay)) {
-                        minDelay = uMinDelay;
-                    }
-                }
-            }
+      } else if (trigger.getDefinition() instanceof Output) {
+        // Outputs of contained reactions
+        PortInstance outputInstance = (PortInstance) trigger;
+        for (ReactionInstance uReaction : outputInstance.getDependsOnReactions()) {
+          TimeValue uMinDelay = findNearestPhysicalActionTrigger(uReaction);
+          if (uMinDelay.isEarlierThan(minDelay)) {
+            minDelay = uMinDelay;
+          }
         }
-        return minDelay;
+      }
     }
+    return minDelay;
+  }
 
-    // TODO: Put this function into a utils file instead
-    private <T> List<T> convertToEmptyListIfNull(List<T> list) {
-        return list == null ? new ArrayList<>() : list;
-    }
+  // TODO: Put this function into a utils file instead
+  private <T> List<T> convertToEmptyListIfNull(List<T> list) {
+    return list == null ? new ArrayList<>() : list;
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/LineAdjustingErrorReporter.java b/org.lflang/src/org/lflang/federated/generator/LineAdjustingErrorReporter.java
index f483c228db..aa2f49b6da 100644
--- a/org.lflang/src/org/lflang/federated/generator/LineAdjustingErrorReporter.java
+++ b/org.lflang/src/org/lflang/federated/generator/LineAdjustingErrorReporter.java
@@ -2,10 +2,8 @@
 
 import java.nio.file.Path;
 import java.util.Map;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.ErrorReporter;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.Position;
@@ -13,116 +11,102 @@
 
 public class LineAdjustingErrorReporter implements ErrorReporter {
 
-    private final ErrorReporter parent;
-    private final Map<Path, CodeMap> codeMapMap;
-
-    public LineAdjustingErrorReporter(ErrorReporter parent, Map<Path, CodeMap> codeMapMap) {
-        this.parent = parent;
-        this.codeMapMap = codeMapMap;
-    }
-
-    @Override
-    public String reportError(String message) {
-        return parent.reportError(message);
-    }
-
-    @Override
-    public String reportWarning(String message) {
-        return parent.reportWarning(message);
-    }
-
-    @Override
-    public String reportInfo(String message) {
-        return parent.reportInfo(message);
-    }
-
-    @Override
-    public String reportError(EObject object, String message) {
-        return parent.reportError(object, message);
-    }
-
-    @Override
-    public String reportWarning(EObject object, String message) {
-        return parent.reportWarning(object, message);
-    }
-
-    @Override
-    public String reportInfo(EObject object, String message) {
-        return parent.reportInfo(object, message);
-    }
-
-    @Override
-    public String reportError(Path file, Integer line, String message) {
-        return report(file, line, message, DiagnosticSeverity.Error);
-    }
-
-    @Override
-    public String reportWarning(Path file, Integer line, String message) {
-        return report(file, line, message, DiagnosticSeverity.Warning);
-    }
-
-    @Override
-    public String reportInfo(Path file, Integer line, String message) {
-        return report(file, line, message, DiagnosticSeverity.Information);
-    }
-
-    private String report(Path file, Integer line, String message, DiagnosticSeverity severity) {
-        if (line == null) return report(file, severity, message);
-        var position = Position.fromOneBased(line, Integer.MAX_VALUE);
-        return report(
-            file,
-            severity,
-            message,
-            Position.fromZeroBased(position.getZeroBasedLine(), 0),
-            position
-        );
-    }
-
-    @Override
-    public String report(Path file, DiagnosticSeverity severity, String message) {
-        return ErrorReporter.super.report(file, severity, message);
-    }
-
-    @Override
-    public String report(Path file, DiagnosticSeverity severity, String message, int line) {
-        return ErrorReporter.super.report(file, severity, message, line);
-    }
-
-    @Override
-    public String report(
-        Path file,
-        DiagnosticSeverity severity,
-        String message,
-        Position startPos,
-        Position endPos
-    ) {
-        String ret = null;
-        if (codeMapMap.containsKey(file)) {
-            var relevantMap = codeMapMap.get(file);
-            for (Path lfSource : relevantMap.lfSourcePaths()) {
-                var adjustedRange = relevantMap.adjusted(
-                    lfSource,
-                    new Range(startPos, endPos)
-                );
-                ret = parent.report(
-                    lfSource,
-                    severity,
-                    message,
-                    adjustedRange.getStartInclusive().equals(Position.ORIGIN) ?
-                        Position.fromZeroBased(
-                            adjustedRange.getEndExclusive().getZeroBasedLine(),
-                            0
-                        ) : adjustedRange.getStartInclusive(),
-                    adjustedRange.getEndExclusive()
-                );
-            }
-        }
-        if (ret == null) return severity == DiagnosticSeverity.Error ? reportError(message) : reportWarning(message);
-        return ret;
-    }
-
-    @Override
-    public boolean getErrorsOccurred() {
-        return parent.getErrorsOccurred();
+  private final ErrorReporter parent;
+  private final Map<Path, CodeMap> codeMapMap;
+
+  public LineAdjustingErrorReporter(ErrorReporter parent, Map<Path, CodeMap> codeMapMap) {
+    this.parent = parent;
+    this.codeMapMap = codeMapMap;
+  }
+
+  @Override
+  public String reportError(String message) {
+    return parent.reportError(message);
+  }
+
+  @Override
+  public String reportWarning(String message) {
+    return parent.reportWarning(message);
+  }
+
+  @Override
+  public String reportInfo(String message) {
+    return parent.reportInfo(message);
+  }
+
+  @Override
+  public String reportError(EObject object, String message) {
+    return parent.reportError(object, message);
+  }
+
+  @Override
+  public String reportWarning(EObject object, String message) {
+    return parent.reportWarning(object, message);
+  }
+
+  @Override
+  public String reportInfo(EObject object, String message) {
+    return parent.reportInfo(object, message);
+  }
+
+  @Override
+  public String reportError(Path file, Integer line, String message) {
+    return report(file, line, message, DiagnosticSeverity.Error);
+  }
+
+  @Override
+  public String reportWarning(Path file, Integer line, String message) {
+    return report(file, line, message, DiagnosticSeverity.Warning);
+  }
+
+  @Override
+  public String reportInfo(Path file, Integer line, String message) {
+    return report(file, line, message, DiagnosticSeverity.Information);
+  }
+
+  private String report(Path file, Integer line, String message, DiagnosticSeverity severity) {
+    if (line == null) return report(file, severity, message);
+    var position = Position.fromOneBased(line, Integer.MAX_VALUE);
+    return report(
+        file, severity, message, Position.fromZeroBased(position.getZeroBasedLine(), 0), position);
+  }
+
+  @Override
+  public String report(Path file, DiagnosticSeverity severity, String message) {
+    return ErrorReporter.super.report(file, severity, message);
+  }
+
+  @Override
+  public String report(Path file, DiagnosticSeverity severity, String message, int line) {
+    return ErrorReporter.super.report(file, severity, message, line);
+  }
+
+  @Override
+  public String report(
+      Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
+    String ret = null;
+    if (codeMapMap.containsKey(file)) {
+      var relevantMap = codeMapMap.get(file);
+      for (Path lfSource : relevantMap.lfSourcePaths()) {
+        var adjustedRange = relevantMap.adjusted(lfSource, new Range(startPos, endPos));
+        ret =
+            parent.report(
+                lfSource,
+                severity,
+                message,
+                adjustedRange.getStartInclusive().equals(Position.ORIGIN)
+                    ? Position.fromZeroBased(adjustedRange.getEndExclusive().getZeroBasedLine(), 0)
+                    : adjustedRange.getStartInclusive(),
+                adjustedRange.getEndExclusive());
+      }
     }
+    if (ret == null)
+      return severity == DiagnosticSeverity.Error ? reportError(message) : reportWarning(message);
+    return ret;
+  }
+
+  @Override
+  public boolean getErrorsOccurred() {
+    return parent.getErrorsOccurred();
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/SynchronizedErrorReporter.java b/org.lflang/src/org/lflang/federated/generator/SynchronizedErrorReporter.java
index 571d2de5c7..08c47c4cd3 100644
--- a/org.lflang/src/org/lflang/federated/generator/SynchronizedErrorReporter.java
+++ b/org.lflang/src/org/lflang/federated/generator/SynchronizedErrorReporter.java
@@ -1,83 +1,83 @@
 package org.lflang.federated.generator;
 
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.ErrorReporter;
 import org.lflang.generator.Position;
 
 public class SynchronizedErrorReporter implements ErrorReporter {
 
-    private final ErrorReporter parent;
-
-    public SynchronizedErrorReporter(ErrorReporter parent) {
-        this.parent = parent;
-    }
-
-    @Override
-    public synchronized String reportError(String message) {
-        return parent.reportError(message);
-    }
-
-    @Override
-    public synchronized String reportWarning(String message) {
-        return parent.reportWarning(message);
-    }
-
-    @Override
-    public synchronized String reportInfo(String message) {
-        return parent.reportInfo(message);
-    }
-
-    @Override
-    public synchronized String reportError(EObject object, String message) {
-        return parent.reportError(object, message);
-    }
-
-    @Override
-    public synchronized String reportWarning(EObject object, String message) {
-        return parent.reportWarning(object, message);
-    }
-
-    @Override
-    public synchronized String reportInfo(EObject object, String message) {
-        return parent.reportInfo(object, message);
-    }
-
-    @Override
-    public synchronized String reportError(Path file, Integer line, String message) {
-        return parent.reportError(file, line, message);
-    }
-
-    @Override
-    public synchronized String reportWarning(Path file, Integer line, String message) {
-        return parent.reportWarning(file, line, message);
-    }
-
-    @Override
-    public synchronized String reportInfo(Path file, Integer line, String message) {
-        return parent.reportInfo(file, line, message);
-    }
-
-    @Override
-    public synchronized String report(Path file, DiagnosticSeverity severity, String message) {
-        return parent.report(file, severity, message);
-    }
-
-    @Override
-    public synchronized String report(Path file, DiagnosticSeverity severity, String message, int line) {
-        return parent.report(file, severity, message, line);
-    }
-
-    @Override
-    public synchronized String report(Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
-        return parent.report(file, severity, message, startPos, endPos);
-    }
-
-    @Override
-    public synchronized boolean getErrorsOccurred() {
-        return parent.getErrorsOccurred();
-    }
+  private final ErrorReporter parent;
+
+  public SynchronizedErrorReporter(ErrorReporter parent) {
+    this.parent = parent;
+  }
+
+  @Override
+  public synchronized String reportError(String message) {
+    return parent.reportError(message);
+  }
+
+  @Override
+  public synchronized String reportWarning(String message) {
+    return parent.reportWarning(message);
+  }
+
+  @Override
+  public synchronized String reportInfo(String message) {
+    return parent.reportInfo(message);
+  }
+
+  @Override
+  public synchronized String reportError(EObject object, String message) {
+    return parent.reportError(object, message);
+  }
+
+  @Override
+  public synchronized String reportWarning(EObject object, String message) {
+    return parent.reportWarning(object, message);
+  }
+
+  @Override
+  public synchronized String reportInfo(EObject object, String message) {
+    return parent.reportInfo(object, message);
+  }
+
+  @Override
+  public synchronized String reportError(Path file, Integer line, String message) {
+    return parent.reportError(file, line, message);
+  }
+
+  @Override
+  public synchronized String reportWarning(Path file, Integer line, String message) {
+    return parent.reportWarning(file, line, message);
+  }
+
+  @Override
+  public synchronized String reportInfo(Path file, Integer line, String message) {
+    return parent.reportInfo(file, line, message);
+  }
+
+  @Override
+  public synchronized String report(Path file, DiagnosticSeverity severity, String message) {
+    return parent.report(file, severity, message);
+  }
+
+  @Override
+  public synchronized String report(
+      Path file, DiagnosticSeverity severity, String message, int line) {
+    return parent.report(file, severity, message, line);
+  }
+
+  @Override
+  public synchronized String report(
+      Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
+    return parent.report(file, severity, message, startPos, endPos);
+  }
+
+  @Override
+  public synchronized boolean getErrorsOccurred() {
+    return parent.getErrorsOccurred();
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/launcher/BuildConfig.java b/org.lflang/src/org/lflang/federated/launcher/BuildConfig.java
index c1a01bfa47..47345af147 100644
--- a/org.lflang/src/org/lflang/federated/launcher/BuildConfig.java
+++ b/org.lflang/src/org/lflang/federated/launcher/BuildConfig.java
@@ -4,57 +4,48 @@
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
 
-/**
- * A collection of methods used for building target code for federates.
- */
+/** A collection of methods used for building target code for federates. */
 public abstract class BuildConfig {
 
-    /**
-     * The federate that this configuration applies to.
-     */
-    protected final FederateInstance federate;
-
-    /**
-     * An error reporter to report problems.
-     */
-    protected final ErrorReporter errorReporter;
-
-    /**
-     * The file configuration of the federation that the federate belongs to.
-     */
-    protected final FedFileConfig fileConfig;
-
-    /**
-     * Create a new build configuration.
-     *
-     * @param federate The federate that this configuration applies to.
-     * @param fileConfig The file configuration of the federation that the federate belongs to.
-     * @param errorReporter An error reporter to report problems.
-     */
-    public BuildConfig(FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-        this.errorReporter = errorReporter;
-        this.federate = federate;
-        this.fileConfig = fileConfig;
-    }
-
-    /**
-     * Return the compile command for the federate that this build configuration belongs to.
-     */
-    public String compileCommand() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Return the command that will execute the federate that this build configuration belongs to
-     * locally, assuming that the current directory is the top-level project folder.
-     */
-    public abstract String localExecuteCommand();
-
-    /**
-     * Return the command that will execute the federate that this build configuration belongs to
-     * remotely, assuming that the current directory is the top-level project folder.
-     */
-    public String remoteExecuteCommand() {
-        throw new UnsupportedOperationException();
-    }
+  /** The federate that this configuration applies to. */
+  protected final FederateInstance federate;
+
+  /** An error reporter to report problems. */
+  protected final ErrorReporter errorReporter;
+
+  /** The file configuration of the federation that the federate belongs to. */
+  protected final FedFileConfig fileConfig;
+
+  /**
+   * Create a new build configuration.
+   *
+   * @param federate The federate that this configuration applies to.
+   * @param fileConfig The file configuration of the federation that the federate belongs to.
+   * @param errorReporter An error reporter to report problems.
+   */
+  public BuildConfig(
+      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+    this.errorReporter = errorReporter;
+    this.federate = federate;
+    this.fileConfig = fileConfig;
+  }
+
+  /** Return the compile command for the federate that this build configuration belongs to. */
+  public String compileCommand() {
+    throw new UnsupportedOperationException();
+  }
+
+  /**
+   * Return the command that will execute the federate that this build configuration belongs to
+   * locally, assuming that the current directory is the top-level project folder.
+   */
+  public abstract String localExecuteCommand();
+
+  /**
+   * Return the command that will execute the federate that this build configuration belongs to
+   * remotely, assuming that the current directory is the top-level project folder.
+   */
+  public String remoteExecuteCommand() {
+    throw new UnsupportedOperationException();
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/launcher/CBuildConfig.java b/org.lflang/src/org/lflang/federated/launcher/CBuildConfig.java
index bd88a719b4..d77ea3988c 100644
--- a/org.lflang/src/org/lflang/federated/launcher/CBuildConfig.java
+++ b/org.lflang/src/org/lflang/federated/launcher/CBuildConfig.java
@@ -1,16 +1,16 @@
 /*************
  * Copyright (c) 2019-2021, The University of California at Berkeley.
-
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
-
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
-
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
-
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -26,51 +26,51 @@
 package org.lflang.federated.launcher;
 
 import java.io.File;
-
 import org.lflang.ErrorReporter;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
 import org.lflang.generator.c.CCompiler;
 
 /**
- * Utility class that can be used to create a launcher for federated LF programs
- * that are written in C.
+ * Utility class that can be used to create a launcher for federated LF programs that are written in
+ * C.
  *
  * @author Soroush Bateni
  * @author Marten Lohstroh
  */
 public class CBuildConfig extends BuildConfig {
 
-    public CBuildConfig(FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-        super(federate, fileConfig, errorReporter);
-    }
+  public CBuildConfig(
+      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+    super(federate, fileConfig, errorReporter);
+  }
 
-    @Override
-    public String compileCommand() {
+  @Override
+  public String compileCommand() {
 
-        String commandToReturn = "";
-        // FIXME: Hack to add platform support only for linux systems.
-        // We need to fix the CMake build command for remote federates.
-        String linuxPlatformSupport = "core" + File.separator + "platform" + File.separator + "lf_linux_support.c";
-        if (!federate.targetConfig.compileAdditionalSources.contains(linuxPlatformSupport)) {
-            federate.targetConfig.compileAdditionalSources.add(linuxPlatformSupport);
-        }
-        CCompiler cCompiler= new CCompiler(federate.targetConfig, fileConfig, errorReporter, false);
-        commandToReturn = String.join(" ",
-                cCompiler.compileCCommand(
-                        fileConfig.name+"_"+federate.name,
-                        false
-                    ).toString());
-        return commandToReturn;
+    String commandToReturn = "";
+    // FIXME: Hack to add platform support only for linux systems.
+    // We need to fix the CMake build command for remote federates.
+    String linuxPlatformSupport =
+        "core" + File.separator + "platform" + File.separator + "lf_linux_support.c";
+    if (!federate.targetConfig.compileAdditionalSources.contains(linuxPlatformSupport)) {
+      federate.targetConfig.compileAdditionalSources.add(linuxPlatformSupport);
     }
+    CCompiler cCompiler = new CCompiler(federate.targetConfig, fileConfig, errorReporter, false);
+    commandToReturn =
+        String.join(
+            " ",
+            cCompiler.compileCCommand(fileConfig.name + "_" + federate.name, false).toString());
+    return commandToReturn;
+  }
 
-    @Override
-    public String remoteExecuteCommand() {
-        return "bin/"+fileConfig.name+"_"+federate.name+" -i '$FEDERATION_ID'";
-    }
+  @Override
+  public String remoteExecuteCommand() {
+    return "bin/" + fileConfig.name + "_" + federate.name + " -i '$FEDERATION_ID'";
+  }
 
-    @Override
-    public String localExecuteCommand() {
-        return fileConfig.getFedBinPath().resolve(federate.name)+" -i $FEDERATION_ID";
-    }
+  @Override
+  public String localExecuteCommand() {
+    return fileConfig.getFedBinPath().resolve(federate.name) + " -i $FEDERATION_ID";
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/launcher/FedLauncherGenerator.java b/org.lflang/src/org/lflang/federated/launcher/FedLauncherGenerator.java
index 3ad08e2450..23547ca1d0 100644
--- a/org.lflang/src/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/org.lflang/src/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -1,25 +1,25 @@
 /*************
  * Copyright (c) 2019-2021, The University of California at Berkeley.
-
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
-
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
-
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
-
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
 
@@ -33,9 +33,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.lflang.ErrorReporter;
-import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty.ClockSyncMode;
 import org.lflang.federated.generator.FedFileConfig;
@@ -43,453 +41,477 @@
 
 /**
  * Utility class that can be used to create a launcher for federated LF programs.
- * 
+ *
  * @author Edward A. Lee
  * @author Soroush Bateni
  */
 public class FedLauncherGenerator {
-    protected TargetConfig targetConfig;
-    protected FedFileConfig fileConfig;
-    protected ErrorReporter errorReporter;
-
-    /**
-     * @param targetConfig The current target configuration.
-     * @param fileConfig The current file configuration.
-     * @param errorReporter A error reporter for reporting any errors or warnings during the code generation
-     */
-    public FedLauncherGenerator(TargetConfig targetConfig, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-        this.targetConfig = targetConfig;
-        this.fileConfig = fileConfig;
-        this.errorReporter = errorReporter;
+  protected TargetConfig targetConfig;
+  protected FedFileConfig fileConfig;
+  protected ErrorReporter errorReporter;
+
+  /**
+   * @param targetConfig The current target configuration.
+   * @param fileConfig The current file configuration.
+   * @param errorReporter A error reporter for reporting any errors or warnings during the code
+   *     generation
+   */
+  public FedLauncherGenerator(
+      TargetConfig targetConfig, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+    this.targetConfig = targetConfig;
+    this.fileConfig = fileConfig;
+    this.errorReporter = errorReporter;
+  }
+
+  /**
+   * Create the launcher shell scripts. This will create one or two files in the output path (bin
+   * directory). The first has name equal to the filename of the source file without the ".lf"
+   * extension. This will be a shell script that launches the RTI and the federates. If, in
+   * addition, either the RTI or any federate is mapped to a particular machine (anything other than
+   * the default "localhost" or "0.0.0.0"), then this will generate a shell script in the bin
+   * directory with name filename_distribute.sh that copies the relevant source files to the remote
+   * host and compiles them so that they are ready to execute using the launcher.
+   *
+   * <p>A precondition for this to work is that the user invoking this code generator can log into
+   * the remote host without supplying a password. Specifically, you have to have installed your
+   * public key (typically found in ~/.ssh/id_rsa.pub) in ~/.ssh/authorized_keys on the remote host.
+   * In addition, the remote host must be running an ssh service. On an Arch Linux system using
+   * systemd, for example, this means running:
+   *
+   * <p>sudo systemctl <start|enable> ssh.service
+   *
+   * <p>Enable means to always start the service at startup, whereas start means to just start it
+   * this once.
+   *
+   * <p>On macOS, open System Preferences from the Apple menu and click on the "Sharing" preference
+   * panel. Select the checkbox next to "Remote Login" to enable it.
+   *
+   * <p>In addition, every host must have OpenSSL installed, with at least version 1.1.1a. You can
+   * check the version with
+   *
+   * <p>openssl version
+   *
+   * @param federates A list of federate instances in the federation
+   * @param rtiConfig Can have values for 'host', 'dir', and 'user'
+   */
+  public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
+    // NOTE: It might be good to use screen when invoking the RTI
+    // or federates remotely, so you can detach and the process keeps running.
+    // However, I was unable to get it working properly.
+    // What this means is that the shell that invokes the launcher
+    // needs to remain live for the duration of the federation.
+    // If that shell is killed, the federation will die.
+    // Hence, it is reasonable to launch the federation on a
+    // machine that participates in the federation, for example,
+    // on the machine that runs the RTI.  The command I tried
+    // to get screen to work looks like this:
+    // ssh -t «target» cd «path»; screen -S «filename»_«federate.name» -L
+    // bin/«filename»_«federate.name» 2>&1
+    // var outPath = binGenPath
+    StringBuilder shCode = new StringBuilder();
+    StringBuilder distCode = new StringBuilder();
+    shCode.append(getSetupCode() + "\n");
+    String distHeader = getDistHeader();
+    String host = rtiConfig.getHost();
+    String target = host;
+
+    String user = rtiConfig.getUser();
+    if (user != null) {
+      target = user + "@" + host;
     }
 
-    /**
-     * Create the launcher shell scripts. This will create one or two files
-     * in the output path (bin directory). The first has name equal to
-     * the filename of the source file without the ".lf" extension.
-     * This will be a shell script that launches the
-     * RTI and the federates.  If, in addition, either the RTI or any
-     * federate is mapped to a particular machine (anything other than
-     * the default "localhost" or "0.0.0.0"), then this will generate
-     * a shell script in the bin directory with name filename_distribute.sh
-     * that copies the relevant source files to the remote host and compiles
-     * them so that they are ready to execute using the launcher.
-     * 
-     * A precondition for this to work is that the user invoking this
-     * code generator can log into the remote host without supplying
-     * a password. Specifically, you have to have installed your
-     * public key (typically found in ~/.ssh/id_rsa.pub) in
-     * ~/.ssh/authorized_keys on the remote host. In addition, the
-     * remote host must be running an ssh service.
-     * On an Arch Linux system using systemd, for example, this means
-     * running:
-     * 
-     *     sudo systemctl <start|enable> ssh.service
-     * 
-     * Enable means to always start the service at startup, whereas
-     * start means to just start it this once.
-     * 
-     * On macOS, open System Preferences from the Apple menu and
-     * click on the "Sharing" preference panel. Select the checkbox
-     * next to "Remote Login" to enable it.
-     * 
-     * In addition, every host must have OpenSSL installed, with at least
-     * version 1.1.1a.  You can check the version with
-     *
-     *     openssl version
-     *
-     * @param federates A list of federate instances in the federation
-     * @param rtiConfig
-     *  Can have values for 'host', 'dir', and 'user'
-     */
-    public void doGenerate(
-        List<FederateInstance> federates,
-        RtiConfig rtiConfig
-    ) {
-        // NOTE: It might be good to use screen when invoking the RTI
-        // or federates remotely, so you can detach and the process keeps running.
-        // However, I was unable to get it working properly.
-        // What this means is that the shell that invokes the launcher
-        // needs to remain live for the duration of the federation.
-        // If that shell is killed, the federation will die.
-        // Hence, it is reasonable to launch the federation on a
-        // machine that participates in the federation, for example,
-        // on the machine that runs the RTI.  The command I tried
-        // to get screen to work looks like this:
-        // ssh -t «target» cd «path»; screen -S «filename»_«federate.name» -L bin/«filename»_«federate.name» 2>&1
-        // var outPath = binGenPath
-        StringBuilder shCode = new StringBuilder();
-        StringBuilder distCode = new StringBuilder();
-        shCode.append(getSetupCode() + "\n");
-        String distHeader = getDistHeader(); 
-        String host = rtiConfig.getHost();
-        String target = host;
-
-        String user = rtiConfig.getUser();
-        if (user != null) {
-            target = user + "@" + host;
-        }
-
-        shCode.append("#### Host is " + host);
-        
-        // Launch the RTI in the foreground.
-        if (host.equals("localhost") || host.equals("0.0.0.0")) {
-            // FIXME: the paths below will not work on Windows
-            shCode.append(getLaunchCode(getRtiCommand(federates, false)) + "\n");
-        } else {
-            // Start the RTI on the remote machine.
-            // FIXME: Should $FEDERATION_ID be used to ensure unique directories, executables, on the remote host?
-            // Copy the source code onto the remote machine and compile it there.
-            if(distCode.length() == 0) distCode.append(distHeader + "\n");
-
-            String logFileName = String.format("log/%s_RTI.log", fileConfig.name);
-
-            // Launch the RTI on the remote machine using ssh and screen.
-            // The -t argument to ssh creates a virtual terminal, which is needed by screen.
-            // The -S gives the session a name.
-            // The -L option turns on logging. Unfortunately, the -Logfile giving the log file name
-            // is not standardized in screen. Logs go to screenlog.0 (or screenlog.n).
-            // FIXME: Remote errors are not reported back via ssh from screen.
-            // How to get them back to the local machine?
-            // Perhaps use -c and generate a screen command file to control the logfile name,
-            // but screen apparently doesn't write anything to the log file!
-            //
-            // The cryptic 2>&1 reroutes stderr to stdout so that both are returned.
-            // The sleep at the end prevents screen from exiting before outgoing messages from
-            // the federate have had time to go out to the RTI through the socket.
-
-            shCode.append(getRemoteLaunchCode(host, target, logFileName, 
-                    getRtiCommand(federates, true)) + "\n");
-        }
-
-        // Index used for storing pids of federates
-        int federateIndex = 0;
-        for (FederateInstance federate : federates) {
-            var buildConfig = getBuildConfig(federate, fileConfig, errorReporter);
-            if (federate.isRemote) {
-                Path fedRelSrcGenPath = fileConfig.getOutPath().relativize(fileConfig.getSrcGenPath()).resolve(federate.name);
-                if(distCode.length() == 0) distCode.append(distHeader + "\n");
-                String logFileName = String.format("log/%s_%s.log", fileConfig.name, federate.name);
-                String compileCommand = buildConfig.compileCommand();
-                // FIXME: Should $FEDERATION_ID be used to ensure unique directories, executables, on the remote host?
-                distCode.append(getDistCode(rtiConfig.getDirectory(), federate, fedRelSrcGenPath, logFileName, fileConfig.getSrcGenPath(), compileCommand) + "\n");
-                String executeCommand = buildConfig.remoteExecuteCommand();
-                shCode.append(getFedRemoteLaunchCode(federate, rtiConfig.getDirectory(), logFileName, executeCommand, federateIndex++) + "\n");
-            } else {
-                String executeCommand = buildConfig.localExecuteCommand();
-                shCode.append(getFedLocalLaunchCode(federate, executeCommand, federateIndex++) + "\n");
-            }
-        }
-        if (host.equals("localhost") || host.equals("0.0.0.0")) {
-            // Local PID managements
-            shCode.append("echo \"#### Bringing the RTI back to foreground so it can receive Control-C.\"" + "\n");
-            shCode.append("fg %1" + "\n");
-        }
-        // Wait for launched processes to finish
-        shCode.append(String.join("\n", 
-            "echo \"RTI has exited. Wait for federates to exit.\"",
-            "# Wait for launched processes to finish.",
-            "# The errors are handled separately via trap.",
-            "for pid in \"${pids[@]}\"",
-            "do",
-            "    wait $pid",
-            "done",
-            "echo \"All done.\""
-        ) + "\n");
-
-        // Create bin directory for the script.
-        if (!Files.exists(fileConfig.binPath)) {
-            try {
-                Files.createDirectories(fileConfig.binPath);
-            } catch (IOException e) {
-                errorReporter.reportError("Unable to create directory: " + fileConfig.binPath);
-            }
-        }
-
-        System.out.println("##### Generating launcher for federation "
-                               + " in directory "
-                               + fileConfig.binPath);
-
-        // Write the launcher file.
-        // Delete file previously produced, if any.
-        File file = fileConfig.binPath.resolve(fileConfig.name).toFile();
-        if (file.exists()) {
-            file.delete();
-        }
+    shCode.append("#### Host is " + host);
+
+    // Launch the RTI in the foreground.
+    if (host.equals("localhost") || host.equals("0.0.0.0")) {
+      // FIXME: the paths below will not work on Windows
+      shCode.append(getLaunchCode(getRtiCommand(federates, false)) + "\n");
+    } else {
+      // Start the RTI on the remote machine.
+      // FIXME: Should $FEDERATION_ID be used to ensure unique directories, executables, on the
+      // remote host?
+      // Copy the source code onto the remote machine and compile it there.
+      if (distCode.length() == 0) distCode.append(distHeader + "\n");
+
+      String logFileName = String.format("log/%s_RTI.log", fileConfig.name);
+
+      // Launch the RTI on the remote machine using ssh and screen.
+      // The -t argument to ssh creates a virtual terminal, which is needed by screen.
+      // The -S gives the session a name.
+      // The -L option turns on logging. Unfortunately, the -Logfile giving the log file name
+      // is not standardized in screen. Logs go to screenlog.0 (or screenlog.n).
+      // FIXME: Remote errors are not reported back via ssh from screen.
+      // How to get them back to the local machine?
+      // Perhaps use -c and generate a screen command file to control the logfile name,
+      // but screen apparently doesn't write anything to the log file!
+      //
+      // The cryptic 2>&1 reroutes stderr to stdout so that both are returned.
+      // The sleep at the end prevents screen from exiting before outgoing messages from
+      // the federate have had time to go out to the RTI through the socket.
+
+      shCode.append(
+          getRemoteLaunchCode(host, target, logFileName, getRtiCommand(federates, true)) + "\n");
+    }
 
-        FileOutputStream fOut = null;
-        try {
-            fOut = new FileOutputStream(file);
-        } catch (FileNotFoundException e) {
-            errorReporter.reportError("Unable to find file: " + file);
-        }
-        try {
-            fOut.write(shCode.toString().getBytes());
-            fOut.close();
-        } catch (IOException e) {
-            errorReporter.reportError("Unable to write to file: " + file);
-        }
+    // Index used for storing pids of federates
+    int federateIndex = 0;
+    for (FederateInstance federate : federates) {
+      var buildConfig = getBuildConfig(federate, fileConfig, errorReporter);
+      if (federate.isRemote) {
+        Path fedRelSrcGenPath =
+            fileConfig.getOutPath().relativize(fileConfig.getSrcGenPath()).resolve(federate.name);
+        if (distCode.length() == 0) distCode.append(distHeader + "\n");
+        String logFileName = String.format("log/%s_%s.log", fileConfig.name, federate.name);
+        String compileCommand = buildConfig.compileCommand();
+        // FIXME: Should $FEDERATION_ID be used to ensure unique directories, executables, on the
+        // remote host?
+        distCode.append(
+            getDistCode(
+                    rtiConfig.getDirectory(),
+                    federate,
+                    fedRelSrcGenPath,
+                    logFileName,
+                    fileConfig.getSrcGenPath(),
+                    compileCommand)
+                + "\n");
+        String executeCommand = buildConfig.remoteExecuteCommand();
+        shCode.append(
+            getFedRemoteLaunchCode(
+                    federate,
+                    rtiConfig.getDirectory(),
+                    logFileName,
+                    executeCommand,
+                    federateIndex++)
+                + "\n");
+      } else {
+        String executeCommand = buildConfig.localExecuteCommand();
+        shCode.append(getFedLocalLaunchCode(federate, executeCommand, federateIndex++) + "\n");
+      }
+    }
+    if (host.equals("localhost") || host.equals("0.0.0.0")) {
+      // Local PID managements
+      shCode.append(
+          "echo \"#### Bringing the RTI back to foreground so it can receive Control-C.\"" + "\n");
+      shCode.append("fg %1" + "\n");
+    }
+    // Wait for launched processes to finish
+    shCode.append(
+        String.join(
+                "\n",
+                "echo \"RTI has exited. Wait for federates to exit.\"",
+                "# Wait for launched processes to finish.",
+                "# The errors are handled separately via trap.",
+                "for pid in \"${pids[@]}\"",
+                "do",
+                "    wait $pid",
+                "done",
+                "echo \"All done.\"")
+            + "\n");
+
+    // Create bin directory for the script.
+    if (!Files.exists(fileConfig.binPath)) {
+      try {
+        Files.createDirectories(fileConfig.binPath);
+      } catch (IOException e) {
+        errorReporter.reportError("Unable to create directory: " + fileConfig.binPath);
+      }
+    }
 
-        if (!file.setExecutable(true, false)) {
-            errorReporter.reportWarning("Unable to make launcher script executable.");
-        }
+    System.out.println(
+        "##### Generating launcher for federation " + " in directory " + fileConfig.binPath);
 
-        // Write the distributor file.
-        // Delete the file even if it does not get generated.
-        file = fileConfig.binPath.resolve(fileConfig.name + "_distribute.sh").toFile();
-        if (file.exists()) {
-            file.delete();
-        }
-        if (distCode.length() > 0) {
-            try {
-                fOut = new FileOutputStream(file);
-                fOut.write(distCode.toString().getBytes());
-                fOut.close();
-                if (!file.setExecutable(true, false)) {
-                    errorReporter.reportWarning("Unable to make file executable: " + file);
-                }
-            } catch (FileNotFoundException e) {
-                errorReporter.reportError("Unable to find file: " + file);
-            } catch (IOException e) {
-                errorReporter.reportError("Unable to write to file " + file);
-            }
-        }
+    // Write the launcher file.
+    // Delete file previously produced, if any.
+    File file = fileConfig.binPath.resolve(fileConfig.name).toFile();
+    if (file.exists()) {
+      file.delete();
     }
 
-    private String getSetupCode() {
-        return String.join("\n", 
-            "#!/bin/bash",
-            "# Launcher for federated " + fileConfig.name + ".lf Lingua Franca program.",
-            "# Uncomment to specify to behave as close as possible to the POSIX standard.",
-            "# set -o posix",
-            "",
-            "# Enable job control",
-            "set -m",
-            "shopt -s huponexit",
-            "",
-            "# Set a trap to kill all background jobs on error or control-C",
-            "# Use two distinct traps so we can see which signal causes this.",
-            "cleanup() {",
-            "    printf \"Killing federate %s.\\n\" ${pids[*]}",
-            "    # The || true clause means this is not an error if kill fails.",
-            "    kill ${pids[@]} || true",
-            "    printf \"#### Killing RTI %s.\\n\" ${RTI}",
-            "    kill ${RTI} || true",
-            "    exit 1",
-            "}",
-            "cleanup_err() {",
-            "    echo \"#### Received ERR signal on line $1. Invoking cleanup().\"",
-            "    cleanup",
-            "}",
-            "cleanup_sigint() {",
-            "    echo \"#### Received SIGINT signal on line $1. Invoking cleanup().\"",
-            "    cleanup",
-            "}",
-            "",
-            "trap 'cleanup_err $LINENO' ERR",
-            "trap 'cleanup_sigint $LINENO' SIGINT",
-            "",
-            "# Create a random 48-byte text ID for this federation.",
-            "# The likelihood of two federations having the same ID is 1/16,777,216 (1/2^24).",
-            "FEDERATION_ID=`openssl rand -hex 24`",
-            "echo \"Federate " + fileConfig.name + " in Federation ID '$FEDERATION_ID'\"",
-            "# Launch the federates:"
-        );
+    FileOutputStream fOut = null;
+    try {
+      fOut = new FileOutputStream(file);
+    } catch (FileNotFoundException e) {
+      errorReporter.reportError("Unable to find file: " + file);
+    }
+    try {
+      fOut.write(shCode.toString().getBytes());
+      fOut.close();
+    } catch (IOException e) {
+      errorReporter.reportError("Unable to write to file: " + file);
     }
 
-    private String getDistHeader() {
-        return String.join("\n", 
-            "#!/bin/bash",
-            "# Distributor for federated "+ fileConfig.name + ".lf Lingua Franca program.",
-            "# Uncomment to specify to behave as close as possible to the POSIX standard.",
-            "# set -o posix"
-        );
+    if (!file.setExecutable(true, false)) {
+      errorReporter.reportWarning("Unable to make launcher script executable.");
     }
 
-    private String getRtiCommand(List<FederateInstance> federates, boolean isRemote) {
-        List<String> commands = new ArrayList<>();
-        if (isRemote) {
-            commands.add("RTI -i '${FEDERATION_ID}' \\");
-        } else {
-            commands.add("RTI -i ${FEDERATION_ID} \\");
-        }
-        if (targetConfig.auth) {
-            commands.add("                        -a \\");
-        }
-        if (targetConfig.tracing != null) {
-            commands.add("                        -t \\");
-        }
-        commands.addAll(List.of(
-            "                        -n "+federates.size()+" \\",
-            "                        -c "+targetConfig.clockSync.toString()+" \\"
-        ));
-        if (targetConfig.clockSync.equals(ClockSyncMode.ON)) {
-            commands.add("period " + targetConfig.clockSyncOptions.period.toNanoSeconds()+" \\");
-        }
-        if (targetConfig.clockSync.equals(ClockSyncMode.ON) || 
-                targetConfig.clockSync.equals(ClockSyncMode.INIT)) {
-            commands.add("exchanges-per-interval "+targetConfig.clockSyncOptions.trials+" \\");
+    // Write the distributor file.
+    // Delete the file even if it does not get generated.
+    file = fileConfig.binPath.resolve(fileConfig.name + "_distribute.sh").toFile();
+    if (file.exists()) {
+      file.delete();
+    }
+    if (distCode.length() > 0) {
+      try {
+        fOut = new FileOutputStream(file);
+        fOut.write(distCode.toString().getBytes());
+        fOut.close();
+        if (!file.setExecutable(true, false)) {
+          errorReporter.reportWarning("Unable to make file executable: " + file);
         }
-        commands.add("&");
-        return String.join("\n", commands);
+      } catch (FileNotFoundException e) {
+        errorReporter.reportError("Unable to find file: " + file);
+      } catch (IOException e) {
+        errorReporter.reportError("Unable to write to file " + file);
+      }
     }
-
-    private String getLaunchCode(String rtiLaunchCode) {
-        return String.join("\n", 
-            "echo \"#### Launching the runtime infrastructure (RTI).\"",
-            "# First, check if the RTI is on the PATH",
-            "if ! command -v RTI &> /dev/null",
-            "then",
-            "    echo \"RTI could not be found.\"",
-            "    echo \"The source code can be obtained from https://github.com/lf-lang/reactor-c/tree/main/core/federated/RTI\"",
-            "    exit",
-            "fi                ",
-            "# The RTI is started first to allow proper boot-up",
-            "# before federates will try to connect.",
-            "# The RTI will be brought back to foreground",
-            "# to be responsive to user inputs after all federates",
-            "# are launched.",
-            rtiLaunchCode,
-            "# Store the PID of the RTI",
-            "RTI=$!",
-            "# Wait for the RTI to boot up before",
-            "# starting federates (this could be done by waiting for a specific output",
-            "# from the RTI, but here we use sleep)",
-            "sleep 1"
-        );
+  }
+
+  private String getSetupCode() {
+    return String.join(
+        "\n",
+        "#!/bin/bash",
+        "# Launcher for federated " + fileConfig.name + ".lf Lingua Franca program.",
+        "# Uncomment to specify to behave as close as possible to the POSIX standard.",
+        "# set -o posix",
+        "",
+        "# Enable job control",
+        "set -m",
+        "shopt -s huponexit",
+        "",
+        "# Set a trap to kill all background jobs on error or control-C",
+        "# Use two distinct traps so we can see which signal causes this.",
+        "cleanup() {",
+        "    printf \"Killing federate %s.\\n\" ${pids[*]}",
+        "    # The || true clause means this is not an error if kill fails.",
+        "    kill ${pids[@]} || true",
+        "    printf \"#### Killing RTI %s.\\n\" ${RTI}",
+        "    kill ${RTI} || true",
+        "    exit 1",
+        "}",
+        "cleanup_err() {",
+        "    echo \"#### Received ERR signal on line $1. Invoking cleanup().\"",
+        "    cleanup",
+        "}",
+        "cleanup_sigint() {",
+        "    echo \"#### Received SIGINT signal on line $1. Invoking cleanup().\"",
+        "    cleanup",
+        "}",
+        "",
+        "trap 'cleanup_err $LINENO' ERR",
+        "trap 'cleanup_sigint $LINENO' SIGINT",
+        "",
+        "# Create a random 48-byte text ID for this federation.",
+        "# The likelihood of two federations having the same ID is 1/16,777,216 (1/2^24).",
+        "FEDERATION_ID=`openssl rand -hex 24`",
+        "echo \"Federate " + fileConfig.name + " in Federation ID '$FEDERATION_ID'\"",
+        "# Launch the federates:");
+  }
+
+  private String getDistHeader() {
+    return String.join(
+        "\n",
+        "#!/bin/bash",
+        "# Distributor for federated " + fileConfig.name + ".lf Lingua Franca program.",
+        "# Uncomment to specify to behave as close as possible to the POSIX standard.",
+        "# set -o posix");
+  }
+
+  private String getRtiCommand(List<FederateInstance> federates, boolean isRemote) {
+    List<String> commands = new ArrayList<>();
+    if (isRemote) {
+      commands.add("RTI -i '${FEDERATION_ID}' \\");
+    } else {
+      commands.add("RTI -i ${FEDERATION_ID} \\");
     }
-
-    private String getRemoteLaunchCode(Object host, Object target, String logFileName, String rtiLaunchString) {
-        return String.join("\n", 
-            "echo \"#### Launching the runtime infrastructure (RTI) on remote host " + host + ".\"",
-            "# FIXME: Killing this ssh does not kill the remote process.",
-            "# A double -t -t option to ssh forces creation of a virtual terminal, which",
-            "# fixes the problem, but then the ssh command does not execute. The remote",
-            "# federate does not start!",
-            "ssh " + target + " 'mkdir -p log; \\",
-            "    echo \"-------------- Federation ID: \"'$FEDERATION_ID' >> " + logFileName + "; \\",
-            "    date >> " + logFileName + "; \\",
-            "    echo \"Executing RTI: " + rtiLaunchString + "\" 2>&1 | tee -a " + logFileName + "; \\",
-            "    # First, check if the RTI is on the PATH",
-            "    if ! command -v RTI &> /dev/null",
-            "    then",
-            "        echo \"RTI could not be found.\"",
-            "        echo \"The source code can be found in org.lflang/src/lib/core/federated/RTI\"",
-            "        exit",
-            "    fi",
-            "    " + rtiLaunchString + " 2>&1 | tee -a " + logFileName + "' &",
-            "# Store the PID of the channel to RTI",
-            "RTI=$!",
-            "# Wait for the RTI to boot up before",
-            "# starting federates (this could be done by waiting for a specific output",
-            "# from the RTI, but here we use sleep)",
-            "sleep 5"
-        );
+    if (targetConfig.auth) {
+      commands.add("                        -a \\");
     }
-
-    private String getDistCode(
-            Path remoteBase,
-            FederateInstance federate, 
-            Path remoteRelSrcGenPath,
-            String logFileName,
-            Path localAbsSrcGenPath,
-            String compileCommand) {
-        return String.join("\n",
-                           "echo \"Making directory " + remoteBase
-                               + " and subdirectories src-gen, bin, and log on host "
-                               + getUserHost(federate.user, federate.host)
-                               + "\"",
-                           "# The >> syntax appends stdout to a file. The 2>&1 appends stderr to the same file.",
-                           "ssh " + getUserHost(federate.user, federate.host)
-                               + " '\\",
-                           "    mkdir -p " + remoteBase.resolve(remoteRelSrcGenPath).resolve("core")
-                               + " " + remoteBase.resolve("bin") + " "
-                               + remoteBase + "/log; \\",
-                           "    echo \"--------------\" >> " + remoteBase + "/"
-                               + logFileName + "; \\",
-                           "    date >> " + remoteBase + "/" + logFileName + ";",
-                           "'",
-                           "pushd " + localAbsSrcGenPath
-                               + " > /dev/null",
-                           "echo \"Copying source files to host "
-                               + getUserHost(federate.user, federate.host)
-                               + "\"",
-                           "scp -r * "
-                               + getUserHost(federate.user, federate.host) + ":"
-                               + remoteBase.resolve(remoteRelSrcGenPath),
-                           "popd > /dev/null",
-                           "echo \"Compiling on host "
-                               + getUserHost(federate.user, federate.host)
-                               + " using: " + compileCommand + "\"",
-                           "ssh " + getUserHost(federate.user, federate.host)
-                               + " 'cd " + remoteBase + "; \\",
-                           "    echo \"In " + remoteBase + " compiling with: "
-                               + compileCommand + "\" >> " + logFileName
-                               + " 2>&1; \\",
-                           "    # Capture the output in the log file and stdout. \\",
-                           "    " + compileCommand + " 2>&1 | tee -a "
-                               + logFileName + ";' "
-        );
+    if (targetConfig.tracing != null) {
+      commands.add("                        -t \\");
     }
-
-    private String getUserHost(Object user, Object host) {
-        if (user == null) {
-            return host.toString();
-        }
-        return user + "@" + host;
+    commands.addAll(
+        List.of(
+            "                        -n " + federates.size() + " \\",
+            "                        -c " + targetConfig.clockSync.toString() + " \\"));
+    if (targetConfig.clockSync.equals(ClockSyncMode.ON)) {
+      commands.add("period " + targetConfig.clockSyncOptions.period.toNanoSeconds() + " \\");
     }
-
-    private String getFedRemoteLaunchCode(
-            FederateInstance federate, 
-            Path path,
-            String logFileName,
-            String executeCommand,
-            int federateIndex
-        ) {
-        return String.join("\n", 
-            "echo \"#### Launching the federate "+federate.name+" on host "+getUserHost(federate.user, federate.host)+"\"",
-            "# FIXME: Killing this ssh does not kill the remote process.",
-            "# A double -t -t option to ssh forces creation of a virtual terminal, which",
-            "# fixes the problem, but then the ssh command does not execute. The remote",
-            "# federate does not start!",
-            "ssh "+getUserHost(federate.user, federate.host)+" '\\",
-            "    cd "+path+"; \\",
-            "    echo \"-------------- Federation ID: \"'$FEDERATION_ID' >> "+logFileName+"; \\",
-            "    date >> "+logFileName+"; \\",
-            "    echo \"In "+path+", executing: "+executeCommand+"\" 2>&1 | tee -a "+logFileName+"; \\",
-            "    "+executeCommand+" 2>&1 | tee -a "+logFileName+"' &",
-            "pids["+federateIndex+"]=$!"
-        );
+    if (targetConfig.clockSync.equals(ClockSyncMode.ON)
+        || targetConfig.clockSync.equals(ClockSyncMode.INIT)) {
+      commands.add("exchanges-per-interval " + targetConfig.clockSyncOptions.trials + " \\");
     }
-
-    private String getFedLocalLaunchCode(FederateInstance federate, String executeCommand, int federateIndex) {
-        return String.format(String.join("\n", 
-            "echo \"#### Launching the federate %s.\"",
-            "%s &",
-            "pids[%s]=$!"
-        ),
+    commands.add("&");
+    return String.join("\n", commands);
+  }
+
+  private String getLaunchCode(String rtiLaunchCode) {
+    return String.join(
+        "\n",
+        "echo \"#### Launching the runtime infrastructure (RTI).\"",
+        "# First, check if the RTI is on the PATH",
+        "if ! command -v RTI &> /dev/null",
+        "then",
+        "    echo \"RTI could not be found.\"",
+        "    echo \"The source code can be obtained from"
+            + " https://github.com/lf-lang/reactor-c/tree/main/core/federated/RTI\"",
+        "    exit",
+        "fi                ",
+        "# The RTI is started first to allow proper boot-up",
+        "# before federates will try to connect.",
+        "# The RTI will be brought back to foreground",
+        "# to be responsive to user inputs after all federates",
+        "# are launched.",
+        rtiLaunchCode,
+        "# Store the PID of the RTI",
+        "RTI=$!",
+        "# Wait for the RTI to boot up before",
+        "# starting federates (this could be done by waiting for a specific output",
+        "# from the RTI, but here we use sleep)",
+        "sleep 1");
+  }
+
+  private String getRemoteLaunchCode(
+      Object host, Object target, String logFileName, String rtiLaunchString) {
+    return String.join(
+        "\n",
+        "echo \"#### Launching the runtime infrastructure (RTI) on remote host " + host + ".\"",
+        "# FIXME: Killing this ssh does not kill the remote process.",
+        "# A double -t -t option to ssh forces creation of a virtual terminal, which",
+        "# fixes the problem, but then the ssh command does not execute. The remote",
+        "# federate does not start!",
+        "ssh " + target + " 'mkdir -p log; \\",
+        "    echo \"-------------- Federation ID: \"'$FEDERATION_ID' >> " + logFileName + "; \\",
+        "    date >> " + logFileName + "; \\",
+        "    echo \"Executing RTI: " + rtiLaunchString + "\" 2>&1 | tee -a " + logFileName + "; \\",
+        "    # First, check if the RTI is on the PATH",
+        "    if ! command -v RTI &> /dev/null",
+        "    then",
+        "        echo \"RTI could not be found.\"",
+        "        echo \"The source code can be found in org.lflang/src/lib/core/federated/RTI\"",
+        "        exit",
+        "    fi",
+        "    " + rtiLaunchString + " 2>&1 | tee -a " + logFileName + "' &",
+        "# Store the PID of the channel to RTI",
+        "RTI=$!",
+        "# Wait for the RTI to boot up before",
+        "# starting federates (this could be done by waiting for a specific output",
+        "# from the RTI, but here we use sleep)",
+        "sleep 5");
+  }
+
+  private String getDistCode(
+      Path remoteBase,
+      FederateInstance federate,
+      Path remoteRelSrcGenPath,
+      String logFileName,
+      Path localAbsSrcGenPath,
+      String compileCommand) {
+    return String.join(
+        "\n",
+        "echo \"Making directory "
+            + remoteBase
+            + " and subdirectories src-gen, bin, and log on host "
+            + getUserHost(federate.user, federate.host)
+            + "\"",
+        "# The >> syntax appends stdout to a file. The 2>&1 appends stderr to the same file.",
+        "ssh " + getUserHost(federate.user, federate.host) + " '\\",
+        "    mkdir -p "
+            + remoteBase.resolve(remoteRelSrcGenPath).resolve("core")
+            + " "
+            + remoteBase.resolve("bin")
+            + " "
+            + remoteBase
+            + "/log; \\",
+        "    echo \"--------------\" >> " + remoteBase + "/" + logFileName + "; \\",
+        "    date >> " + remoteBase + "/" + logFileName + ";",
+        "'",
+        "pushd " + localAbsSrcGenPath + " > /dev/null",
+        "echo \"Copying source files to host " + getUserHost(federate.user, federate.host) + "\"",
+        "scp -r * "
+            + getUserHost(federate.user, federate.host)
+            + ":"
+            + remoteBase.resolve(remoteRelSrcGenPath),
+        "popd > /dev/null",
+        "echo \"Compiling on host "
+            + getUserHost(federate.user, federate.host)
+            + " using: "
+            + compileCommand
+            + "\"",
+        "ssh " + getUserHost(federate.user, federate.host) + " 'cd " + remoteBase + "; \\",
+        "    echo \"In "
+            + remoteBase
+            + " compiling with: "
+            + compileCommand
+            + "\" >> "
+            + logFileName
+            + " 2>&1; \\",
+        "    # Capture the output in the log file and stdout. \\",
+        "    " + compileCommand + " 2>&1 | tee -a " + logFileName + ";' ");
+  }
+
+  private String getUserHost(Object user, Object host) {
+    if (user == null) {
+      return host.toString();
+    }
+    return user + "@" + host;
+  }
+
+  private String getFedRemoteLaunchCode(
+      FederateInstance federate,
+      Path path,
+      String logFileName,
+      String executeCommand,
+      int federateIndex) {
+    return String.join(
+        "\n",
+        "echo \"#### Launching the federate "
+            + federate.name
+            + " on host "
+            + getUserHost(federate.user, federate.host)
+            + "\"",
+        "# FIXME: Killing this ssh does not kill the remote process.",
+        "# A double -t -t option to ssh forces creation of a virtual terminal, which",
+        "# fixes the problem, but then the ssh command does not execute. The remote",
+        "# federate does not start!",
+        "ssh " + getUserHost(federate.user, federate.host) + " '\\",
+        "    cd " + path + "; \\",
+        "    echo \"-------------- Federation ID: \"'$FEDERATION_ID' >> " + logFileName + "; \\",
+        "    date >> " + logFileName + "; \\",
+        "    echo \"In "
+            + path
+            + ", executing: "
+            + executeCommand
+            + "\" 2>&1 | tee -a "
+            + logFileName
+            + "; \\",
+        "    " + executeCommand + " 2>&1 | tee -a " + logFileName + "' &",
+        "pids[" + federateIndex + "]=$!");
+  }
+
+  private String getFedLocalLaunchCode(
+      FederateInstance federate, String executeCommand, int federateIndex) {
+    return String.format(
+        String.join("\n", "echo \"#### Launching the federate %s.\"", "%s &", "pids[%s]=$!"),
         federate.name,
         executeCommand,
         federateIndex);
-    }
-
-    /**
-     * Create a build configuration of the appropriate target.
-     *
-     * @param federate The federate to which the build configuration applies.
-     * @param fileConfig The file configuration of the federation to which the federate belongs.
-     * @param errorReporter An error reporter to report problems.
-     * @return
-     */
-    private BuildConfig getBuildConfig(
-        FederateInstance federate,
-        FedFileConfig fileConfig,
-        ErrorReporter errorReporter) {
-        return switch(federate.targetConfig.target) {
-            case C, CCPP -> new CBuildConfig(federate, fileConfig, errorReporter);
-            case Python -> new PyBuildConfig(federate, fileConfig, errorReporter);
-            case TS -> new TsBuildConfig(federate, fileConfig, errorReporter);
-            case CPP, Rust -> throw new UnsupportedOperationException();
-        };
-    }
+  }
+
+  /**
+   * Create a build configuration of the appropriate target.
+   *
+   * @param federate The federate to which the build configuration applies.
+   * @param fileConfig The file configuration of the federation to which the federate belongs.
+   * @param errorReporter An error reporter to report problems.
+   * @return
+   */
+  private BuildConfig getBuildConfig(
+      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+    return switch (federate.targetConfig.target) {
+      case C, CCPP -> new CBuildConfig(federate, fileConfig, errorReporter);
+      case Python -> new PyBuildConfig(federate, fileConfig, errorReporter);
+      case TS -> new TsBuildConfig(federate, fileConfig, errorReporter);
+      case CPP, Rust -> throw new UnsupportedOperationException();
+    };
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/launcher/PyBuildConfig.java b/org.lflang/src/org/lflang/federated/launcher/PyBuildConfig.java
index 85d6dc4a0f..1a8a996349 100644
--- a/org.lflang/src/org/lflang/federated/launcher/PyBuildConfig.java
+++ b/org.lflang/src/org/lflang/federated/launcher/PyBuildConfig.java
@@ -6,17 +6,32 @@
 
 public class PyBuildConfig extends BuildConfig {
 
-    public PyBuildConfig(FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-        super(federate, fileConfig, errorReporter);
-    }
+  public PyBuildConfig(
+      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+    super(federate, fileConfig, errorReporter);
+  }
 
-    @Override
-    public String localExecuteCommand() {
-        return "python3 " + fileConfig.getSrcGenPath() + "/" + federate.name + "/" + federate.name+".py -i $FEDERATION_ID";
-    }
+  @Override
+  public String localExecuteCommand() {
+    return "python3 "
+        + fileConfig.getSrcGenPath()
+        + "/"
+        + federate.name
+        + "/"
+        + federate.name
+        + ".py -i $FEDERATION_ID";
+  }
 
-    @Override
-    public String remoteExecuteCommand() {
-        return "python3 src-gen/"+fileConfig.name+"/"+federate.name+"/"+fileConfig.name+"_"+federate.name+" -i '$FEDERATION_ID'";
-    }
+  @Override
+  public String remoteExecuteCommand() {
+    return "python3 src-gen/"
+        + fileConfig.name
+        + "/"
+        + federate.name
+        + "/"
+        + fileConfig.name
+        + "_"
+        + federate.name
+        + " -i '$FEDERATION_ID'";
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/launcher/RtiConfig.java b/org.lflang/src/org/lflang/federated/launcher/RtiConfig.java
index 81c608d5b3..60e07c9f53 100644
--- a/org.lflang/src/org/lflang/federated/launcher/RtiConfig.java
+++ b/org.lflang/src/org/lflang/federated/launcher/RtiConfig.java
@@ -4,89 +4,66 @@
 
 /**
  * Class for storing configuration settings pertaining to the RTI.
+ *
  * @author Marten Lohstroh
  */
 public class RtiConfig {
 
-    private Path directory;
+  private Path directory;
 
-    /**
-     * The host on which the RTI process is to be spawned.
-     */
-    private String host;
+  /** The host on which the RTI process is to be spawned. */
+  private String host;
 
-    /**
-     * The port on which to connect to the RTI process.
-     */
-    private int port;
+  /** The port on which to connect to the RTI process. */
+  private int port;
 
-    /**
-     * The username used to gain access to the host where the RTI is to be spawned.
-     */
-    private String user;
+  /** The username used to gain access to the host where the RTI is to be spawned. */
+  private String user;
 
-    /**
-     * Construct a new RTI configuration with all options set to their defaults.
-     */
-    public RtiConfig() {
-        this.directory = Path.of("LinguaFrancaRemote");
-        this.host = "localhost";
-        this.port = 0;
-    }
+  /** Construct a new RTI configuration with all options set to their defaults. */
+  public RtiConfig() {
+    this.directory = Path.of("LinguaFrancaRemote");
+    this.host = "localhost";
+    this.port = 0;
+  }
 
-    /**
-     * Return the directory to create on the remote host.
-     */
-    public Path getDirectory() {
-        return directory;
-    }
+  /** Return the directory to create on the remote host. */
+  public Path getDirectory() {
+    return directory;
+  }
 
-    /**
-     * Return the host on which the RTI process is to be spawned.
-     */
-    public String getHost() {
-        return host;
-    }
+  /** Return the host on which the RTI process is to be spawned. */
+  public String getHost() {
+    return host;
+  }
 
-    /**
-     * Return the port on which to connect to the RTI process.
-     */
-    public int getPort() {
-        return port;
-    }
+  /** Return the port on which to connect to the RTI process. */
+  public int getPort() {
+    return port;
+  }
 
-    /**
-     * Return the username used to gain access to the host where the RTI is to be spawned.
-     */
-    public String getUser() {
-        return user;
-    }
+  /** Return the username used to gain access to the host where the RTI is to be spawned. */
+  public String getUser() {
+    return user;
+  }
 
-    /**
-     * Set the directory to create on the remote host.
-     */
-    public void setDirectory(Path directory) {
-        this.directory = directory;
-    }
+  /** Set the directory to create on the remote host. */
+  public void setDirectory(Path directory) {
+    this.directory = directory;
+  }
 
-    /**
-     * Set the host on which the RTI process is to be spawned.
-     */
-    public void setHost(String host) {
-        this.host = host;
-    }
+  /** Set the host on which the RTI process is to be spawned. */
+  public void setHost(String host) {
+    this.host = host;
+  }
 
-    /**
-     * Set the port on which to connect to the RTI process.
-     */
-    public void setPort(int port) {
-        this.port = port;
-    }
+  /** Set the port on which to connect to the RTI process. */
+  public void setPort(int port) {
+    this.port = port;
+  }
 
-    /**
-     * Set the username used to gain access to the host where the RTI is to be spawned.
-     */
-    public void setUser(String user) {
-        this.user = user;
-    }
+  /** Set the username used to gain access to the host where the RTI is to be spawned. */
+  public void setUser(String user) {
+    this.user = user;
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/launcher/TsBuildConfig.java b/org.lflang/src/org/lflang/federated/launcher/TsBuildConfig.java
index 87b7ffaeb1..97f40c767a 100644
--- a/org.lflang/src/org/lflang/federated/launcher/TsBuildConfig.java
+++ b/org.lflang/src/org/lflang/federated/launcher/TsBuildConfig.java
@@ -1,59 +1,59 @@
 /*************
  * Copyright (c) 2019-2021, The University of California at Berkeley.
-
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
-
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
-
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
-
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
 
 package org.lflang.federated.launcher;
 
 import org.lflang.ErrorReporter;
-import org.lflang.TargetConfig;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
 
 /**
- * Utility class that can be used to create a launcher for federated LF programs
- * that are written in TypeScript.
- * 
+ * Utility class that can be used to create a launcher for federated LF programs that are written in
+ * TypeScript.
+ *
  * @author Soroush Bateni
  * @author Hokeun Kim
  * @author Marten Lohstroh
  */
 public class TsBuildConfig extends BuildConfig {
 
-
-    public TsBuildConfig(FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-        super(federate, fileConfig, errorReporter);
-    }
-
-    @Override
-    public String compileCommand() {
-        return null;
-    }
-
-    @Override
-    public String localExecuteCommand() {
-        String jsFilename = federate.name + ".js";
-        return "node "+fileConfig.getSrcGenPath().resolve(federate.name).resolve("dist").resolve(jsFilename)+" -i $FEDERATION_ID";
-    }
-
+  public TsBuildConfig(
+      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+    super(federate, fileConfig, errorReporter);
+  }
+
+  @Override
+  public String compileCommand() {
+    return null;
+  }
+
+  @Override
+  public String localExecuteCommand() {
+    String jsFilename = federate.name + ".js";
+    return "node "
+        + fileConfig.getSrcGenPath().resolve(federate.name).resolve("dist").resolve(jsFilename)
+        + " -i $FEDERATION_ID";
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/serialization/FedNativePythonSerialization.java b/org.lflang/src/org/lflang/federated/serialization/FedNativePythonSerialization.java
index e20588d62d..3947b1bd92 100644
--- a/org.lflang/src/org/lflang/federated/serialization/FedNativePythonSerialization.java
+++ b/org.lflang/src/org/lflang/federated/serialization/FedNativePythonSerialization.java
@@ -1,17 +1,17 @@
 /*************
  * Copyright (c) 2021, The University of California at Berkeley.
  * Copyright (c) 2021, The University of Texas at Dallas.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  * this list of conditions and the following disclaimer.
- * 
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  * this list of conditions and the following disclaimer in the documentation
  * and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -32,91 +32,105 @@
 
 /**
  * Enables support for Python pickle serialization.
- * 
- * @author Soroush Bateni
  *
+ * @author Soroush Bateni
  */
 public class FedNativePythonSerialization implements FedSerialization {
 
-    @Override
-    public boolean isCompatible(GeneratorBase generator) {
-        if (generator.getTarget() != Target.Python ) {
-            throw new UnsupportedOperationException("This class only support Python serialization.");
-        }
-        return true;
+  @Override
+  public boolean isCompatible(GeneratorBase generator) {
+    if (generator.getTarget() != Target.Python) {
+      throw new UnsupportedOperationException("This class only support Python serialization.");
     }
+    return true;
+  }
 
-    @Override
-    public String serializedBufferLength() {
-        return serializedVarName+".len";
-    }
+  @Override
+  public String serializedBufferLength() {
+    return serializedVarName + ".len";
+  }
 
-    @Override
-    public String seializedBufferVar() {
-        return serializedVarName+".buf";
-    }
+  @Override
+  public String seializedBufferVar() {
+    return serializedVarName + ".buf";
+  }
 
-    @Override
-    public StringBuilder generateNetworkSerializerCode(String varName,
-            String originalType) {
-        StringBuilder serializerCode = new StringBuilder();
-
-        // Check that global_pickler is not null
-        serializerCode.append("if (global_pickler == NULL) lf_print_error_and_exit(\"The pickle module is not loaded.\");\n");
-        // Define the serialized PyObject
-        serializerCode.append("PyObject* serialized_pyobject = PyObject_CallMethod(global_pickler, \"dumps\", \"O\", "+varName+");\n");
-
-        // Error check
-        serializerCode.append("if (serialized_pyobject == NULL) {\n");
-        serializerCode.append("    if (PyErr_Occurred()) PyErr_Print();\n");
-        serializerCode.append("    lf_print_error_and_exit(\"Could not serialize serialized_pyobject.\");\n");
-        serializerCode.append("}\n");
-        
-        serializerCode.append("Py_buffer "+serializedVarName+";\n");
-        serializerCode.append("int returnValue = PyBytes_AsStringAndSize(serialized_pyobject, &"+serializedVarName+".buf, &"+serializedVarName+".len);\n");
-        // Error check
-        serializerCode.append("if (returnValue == -1) {\n");
-        serializerCode.append("    if (PyErr_Occurred()) PyErr_Print();\n");
-        serializerCode.append("    lf_print_error_and_exit(\"Could not serialize "+serializedVarName+".\");\n");
-        serializerCode.append("}\n");
-        
-        
-            
-        return serializerCode;
-    }
+  @Override
+  public StringBuilder generateNetworkSerializerCode(String varName, String originalType) {
+    StringBuilder serializerCode = new StringBuilder();
 
-    @Override
-    public StringBuilder generateNetworkDeserializerCode(String varName,
-            String targetType) {
-        StringBuilder deserializerCode = new StringBuilder();
-        
-        // Convert the network message to a Python ByteArray
-        deserializerCode.append("PyObject* message_byte_array = "+
-                "PyBytes_FromStringAndSize((char*)"+varName+"->token->value, "+varName+"->token->length);\n");
-        // Deserialize using Pickle
-        deserializerCode.append("Py_XINCREF(message_byte_array);\n");
-        deserializerCode.append("PyObject* "+deserializedVarName+
-                " = PyObject_CallMethod(global_pickler, \"loads\", \"O\", message_byte_array);\n");
-        // Error check
-        deserializerCode.append("if ("+deserializedVarName+" == NULL) {\n");
-        deserializerCode.append("    if (PyErr_Occurred()) PyErr_Print();\n");
-        deserializerCode.append("    lf_print_error_and_exit(\"Could not deserialize "+deserializedVarName+".\");\n");
-        deserializerCode.append("}\n");
-        
-        // Decrment the reference count
-        deserializerCode.append("Py_XDECREF(message_byte_array);\n");
-        
-        return deserializerCode;
-    }
+    // Check that global_pickler is not null
+    serializerCode.append(
+        "if (global_pickler == NULL) lf_print_error_and_exit(\"The pickle module is not"
+            + " loaded.\");\n");
+    // Define the serialized PyObject
+    serializerCode.append(
+        "PyObject* serialized_pyobject = PyObject_CallMethod(global_pickler, \"dumps\", \"O\", "
+            + varName
+            + ");\n");
 
-    @Override
-    public StringBuilder generatePreambleForSupport() {
-        return new StringBuilder("");
-    }
+    // Error check
+    serializerCode.append("if (serialized_pyobject == NULL) {\n");
+    serializerCode.append("    if (PyErr_Occurred()) PyErr_Print();\n");
+    serializerCode.append(
+        "    lf_print_error_and_exit(\"Could not serialize serialized_pyobject.\");\n");
+    serializerCode.append("}\n");
 
-    @Override
-    public StringBuilder generateCompilerExtensionForSupport() {
-        return new StringBuilder("");
-    }
+    serializerCode.append("Py_buffer " + serializedVarName + ";\n");
+    serializerCode.append(
+        "int returnValue = PyBytes_AsStringAndSize(serialized_pyobject, &"
+            + serializedVarName
+            + ".buf, &"
+            + serializedVarName
+            + ".len);\n");
+    // Error check
+    serializerCode.append("if (returnValue == -1) {\n");
+    serializerCode.append("    if (PyErr_Occurred()) PyErr_Print();\n");
+    serializerCode.append(
+        "    lf_print_error_and_exit(\"Could not serialize " + serializedVarName + ".\");\n");
+    serializerCode.append("}\n");
+
+    return serializerCode;
+  }
+
+  @Override
+  public StringBuilder generateNetworkDeserializerCode(String varName, String targetType) {
+    StringBuilder deserializerCode = new StringBuilder();
+
+    // Convert the network message to a Python ByteArray
+    deserializerCode.append(
+        "PyObject* message_byte_array = "
+            + "PyBytes_FromStringAndSize((char*)"
+            + varName
+            + "->token->value, "
+            + varName
+            + "->token->length);\n");
+    // Deserialize using Pickle
+    deserializerCode.append("Py_XINCREF(message_byte_array);\n");
+    deserializerCode.append(
+        "PyObject* "
+            + deserializedVarName
+            + " = PyObject_CallMethod(global_pickler, \"loads\", \"O\", message_byte_array);\n");
+    // Error check
+    deserializerCode.append("if (" + deserializedVarName + " == NULL) {\n");
+    deserializerCode.append("    if (PyErr_Occurred()) PyErr_Print();\n");
+    deserializerCode.append(
+        "    lf_print_error_and_exit(\"Could not deserialize " + deserializedVarName + ".\");\n");
+    deserializerCode.append("}\n");
+
+    // Decrment the reference count
+    deserializerCode.append("Py_XDECREF(message_byte_array);\n");
+
+    return deserializerCode;
+  }
+
+  @Override
+  public StringBuilder generatePreambleForSupport() {
+    return new StringBuilder("");
+  }
 
+  @Override
+  public StringBuilder generateCompilerExtensionForSupport() {
+    return new StringBuilder("");
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/serialization/FedROS2CPPSerialization.java b/org.lflang/src/org/lflang/federated/serialization/FedROS2CPPSerialization.java
index d116489dca..1384d11517 100644
--- a/org.lflang/src/org/lflang/federated/serialization/FedROS2CPPSerialization.java
+++ b/org.lflang/src/org/lflang/federated/serialization/FedROS2CPPSerialization.java
@@ -1,17 +1,17 @@
 /*************
  * Copyright (c) 2021, The University of California at Berkeley.
  * Copyright (c) 2021, The University of Texas at Dallas.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  * this list of conditions and the following disclaimer.
- * 
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  * this list of conditions and the following disclaimer in the documentation
  * and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -32,179 +32,191 @@
 
 /**
  * Enables support for ROS 2 serialization in C/C++ code.
- * 
- * @author Soroush Bateni
  *
+ * @author Soroush Bateni
  */
 public class FedROS2CPPSerialization implements FedSerialization {
 
-    /**
-     * Check whether the current generator is compatible with the given
-     * serialization technique or not.
-     * 
-     * @param generator The current generator.
-     * @return true if compatible, false if not.
-     */
-    @Override
-    public boolean isCompatible(GeneratorBase generator) {
-        if (generator.getTarget() != Target.C) {
-            generator.errorReporter.reportError("ROS serialization is currently only supported for the C target.");
-            return false;
-        } else if (!generator.getTargetConfig().compiler.equalsIgnoreCase("g++")) {
-            generator.errorReporter.reportError(
-                    "Please use the 'compiler: \"g++\"' target property \n"+
-                    "for ROS serialization"
-            );
-            return false;
-        }
-        return true;
-    }
-    
-    /** 
-     * @return Expression in target language that corresponds to the length
-     *  of the serialized buffer.
-     */
-    @Override
-    public String serializedBufferLength() {
-        return serializedVarName+".size()";
+  /**
+   * Check whether the current generator is compatible with the given serialization technique or
+   * not.
+   *
+   * @param generator The current generator.
+   * @return true if compatible, false if not.
+   */
+  @Override
+  public boolean isCompatible(GeneratorBase generator) {
+    if (generator.getTarget() != Target.C) {
+      generator.errorReporter.reportError(
+          "ROS serialization is currently only supported for the C target.");
+      return false;
+    } else if (!generator.getTargetConfig().compiler.equalsIgnoreCase("g++")) {
+      generator.errorReporter.reportError(
+          "Please use the 'compiler: \"g++\"' target property \n" + "for ROS serialization");
+      return false;
     }
+    return true;
+  }
 
-    /**
-     * @return Expression in target language that is the buffer variable 
-     *  itself.
-     */
-    @Override
-    public String seializedBufferVar() {
-        return serializedVarName+".get_rcl_serialized_message().buffer";
-    }
-    
-    /**
-     * Generate code in C++ that serializes 'varName'. This code
-     * will convert the data in 'varName' from its 'originalType' into an 
-     * uint8_t. The serialized data will be put in a variable called 
-     * 'serialized_message', defined by @see serializedVarName.
-     * 
-     * @param varName The variable to be serialized.
-     * @param originalType The original type of the variable.
-     * @return Target code that serializes the 'varName' from 'type'
-     *  to an unsigned byte array.
-     */
-    @Override
-    public StringBuilder generateNetworkSerializerCode(String varName, String originalType) {
-        StringBuilder serializerCode = new StringBuilder();
-        
-        serializerCode.append("rclcpp::SerializedMessage "+serializedVarName+"(0u);\n");
-        // Use the port type verbatim here, which can result
-        // in compile error if it is not a valid ROS type
-        serializerCode.append("using MessageT = "+originalType+";\n");
-        serializerCode.append("static rclcpp::Serialization<MessageT> _lf_serializer;\n");
-        serializerCode.append("_lf_serializer.serialize_message(&"+varName+"->value , &"+serializedVarName+");\n");
-        
-        return serializerCode;
-    }
-    
-    /**
-     * Variant of @see generateNetworkSerializerCode(String varName, String originalType)
-     * that also supports shared pointer (i.e., std::shared_ptr<>) definitions of ROS port
-     * types.
-     * @param isSharedPtrType Indicates whether the port type is a shared pointer or not.
-     */
-    public StringBuilder generateNetworkSerializerCode(String varName, String originalType, boolean isSharedPtrType) {
-        StringBuilder serializerCode = new StringBuilder();
-        
-        serializerCode.append("rclcpp::SerializedMessage "+serializedVarName+"(0u);\n");
-        // Use the port type verbatim here, which can result
-        // in compile error if it is not a valid ROS type
-        serializerCode.append("using MessageT = "+originalType+";\n");
-        serializerCode.append("static rclcpp::Serialization<MessageT> _lf_serializer;\n");
-        if (isSharedPtrType) {
-            serializerCode.append("_lf_serializer.serialize_message("+varName+"->value.get() , &"+serializedVarName+");\n");
-        } else {
-            serializerCode.append("_lf_serializer.serialize_message(&"+varName+"->value , &"+serializedVarName+");\n");
-        }
-            
-        return serializerCode;
-    }
+  /**
+   * @return Expression in target language that corresponds to the length of the serialized buffer.
+   */
+  @Override
+  public String serializedBufferLength() {
+    return serializedVarName + ".size()";
+  }
 
+  /**
+   * @return Expression in target language that is the buffer variable itself.
+   */
+  @Override
+  public String seializedBufferVar() {
+    return serializedVarName + ".get_rcl_serialized_message().buffer";
+  }
 
-    
-    /**
-     * Generate code in C++ that deserializes 'varName'. This code will
-     * convert the data in 'varName' from a uint8_t into the 'targetType'.
-     * The deserialized data will be put in a variable called deserialized_message
-     * defined by @see deserializedVarName.
-     *  
-     * @param varName The variable to deserialize.
-     * @param targetType The type to deserialize into.
-     * @return Target code that deserializes 'varName' from an unsigned byte array
-     *  to 'type'.
-     */
-    @Override
-    public StringBuilder generateNetworkDeserializerCode(String varName, String targetType) {
-        StringBuilder deserializerCode = new StringBuilder();
-        
-        deserializerCode.append(
-                "auto message = std::make_unique<rcl_serialized_message_t>( rcl_serialized_message_t{\n"
-                + "    .buffer = (uint8_t*)"+varName+".tmplt.token->value,\n"
-                + "    .buffer_length = "+varName+".tmplt.token->length,\n"
-                + "    .buffer_capacity = "+varName+".tmplt.token->length,\n"
-                + "    .allocator = rcl_get_default_allocator()\n"
-                + "});\n"
-        );
-        deserializerCode.append("auto msg = std::make_unique<rclcpp::SerializedMessage>(std::move(*message.get()));\n");
-        deserializerCode.append(varName+".tmplt.token->value = NULL; // Manually move the data\n");
-        // Use the port type verbatim here, which can result
-        // in compile error if it is not a valid ROS type
-        deserializerCode.append("using MessageT = "+targetType+";\n");
-        deserializerCode.append(
-                "MessageT "+deserializedVarName+" = MessageT();\n"
-              + "auto _lf_serializer = rclcpp::Serialization<MessageT>();\n"
-              + "_lf_serializer.deserialize_message(msg.get(), &"+deserializedVarName+");\n"
-        );
-        
-        return deserializerCode;
-    }
+  /**
+   * Generate code in C++ that serializes 'varName'. This code will convert the data in 'varName'
+   * from its 'originalType' into an uint8_t. The serialized data will be put in a variable called
+   * 'serialized_message', defined by @see serializedVarName.
+   *
+   * @param varName The variable to be serialized.
+   * @param originalType The original type of the variable.
+   * @return Target code that serializes the 'varName' from 'type' to an unsigned byte array.
+   */
+  @Override
+  public StringBuilder generateNetworkSerializerCode(String varName, String originalType) {
+    StringBuilder serializerCode = new StringBuilder();
 
-    /**
-     * @return Code in C that includes all the necessary preamble to enable
-     *  support for ROS 2 serialization.
-     */
-    @Override
-    public StringBuilder generatePreambleForSupport() {
-        StringBuilder preamble = new StringBuilder();
-        
-        preamble.append(
-            "#include \"rcutils/allocator.h\"\n"
-          + "#include \"rclcpp/rclcpp.hpp\"\n"
-          + "#include \"rclcpp/serialization.hpp\"\n"
-          + "#include \"rclcpp/serialized_message.hpp\"\n"
-        );
-        
-        return preamble;        
-    }
-    
-    /** 
-     * @return Code that should be appended to the CMakeLists.txt to enable 
-     *  support for ROS 2 serialization.
-     */
-    @Override
-    public StringBuilder generateCompilerExtensionForSupport() {
-        StringBuilder cMakeExtension = new StringBuilder();
-        
-        cMakeExtension.append(
-            "enable_language(CXX)\n"
-          + "set(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -Wno-write-strings -O2\")\n"
-          + "\n"
-          + "find_package(ament_cmake REQUIRED)\n"
-          + "find_package(rclcpp REQUIRED)\n"
-          + "find_package(rclcpp_components REQUIRED)\n"
-          + "find_package(rcutils)\n"
-          + "find_package(rmw REQUIRED)\n"
-          + "\n"
-          + "ament_target_dependencies( ${LF_MAIN_TARGET} rclcpp rmw)"
-        );
-        
-        return cMakeExtension;
+    serializerCode.append("rclcpp::SerializedMessage " + serializedVarName + "(0u);\n");
+    // Use the port type verbatim here, which can result
+    // in compile error if it is not a valid ROS type
+    serializerCode.append("using MessageT = " + originalType + ";\n");
+    serializerCode.append("static rclcpp::Serialization<MessageT> _lf_serializer;\n");
+    serializerCode.append(
+        "_lf_serializer.serialize_message(&"
+            + varName
+            + "->value , &"
+            + serializedVarName
+            + ");\n");
+
+    return serializerCode;
+  }
+
+  /**
+   * Variant of @see generateNetworkSerializerCode(String varName, String originalType) that also
+   * supports shared pointer (i.e., std::shared_ptr<>) definitions of ROS port types.
+   *
+   * @param isSharedPtrType Indicates whether the port type is a shared pointer or not.
+   */
+  public StringBuilder generateNetworkSerializerCode(
+      String varName, String originalType, boolean isSharedPtrType) {
+    StringBuilder serializerCode = new StringBuilder();
+
+    serializerCode.append("rclcpp::SerializedMessage " + serializedVarName + "(0u);\n");
+    // Use the port type verbatim here, which can result
+    // in compile error if it is not a valid ROS type
+    serializerCode.append("using MessageT = " + originalType + ";\n");
+    serializerCode.append("static rclcpp::Serialization<MessageT> _lf_serializer;\n");
+    if (isSharedPtrType) {
+      serializerCode.append(
+          "_lf_serializer.serialize_message("
+              + varName
+              + "->value.get() , &"
+              + serializedVarName
+              + ");\n");
+    } else {
+      serializerCode.append(
+          "_lf_serializer.serialize_message(&"
+              + varName
+              + "->value , &"
+              + serializedVarName
+              + ");\n");
     }
 
+    return serializerCode;
+  }
+
+  /**
+   * Generate code in C++ that deserializes 'varName'. This code will convert the data in 'varName'
+   * from a uint8_t into the 'targetType'. The deserialized data will be put in a variable called
+   * deserialized_message defined by @see deserializedVarName.
+   *
+   * @param varName The variable to deserialize.
+   * @param targetType The type to deserialize into.
+   * @return Target code that deserializes 'varName' from an unsigned byte array to 'type'.
+   */
+  @Override
+  public StringBuilder generateNetworkDeserializerCode(String varName, String targetType) {
+    StringBuilder deserializerCode = new StringBuilder();
+
+    deserializerCode.append(
+        "auto message = std::make_unique<rcl_serialized_message_t>( rcl_serialized_message_t{\n"
+            + "    .buffer = (uint8_t*)"
+            + varName
+            + ".tmplt.token->value,\n"
+            + "    .buffer_length = "
+            + varName
+            + ".tmplt.token->length,\n"
+            + "    .buffer_capacity = "
+            + varName
+            + ".tmplt.token->length,\n"
+            + "    .allocator = rcl_get_default_allocator()\n"
+            + "});\n");
+    deserializerCode.append(
+        "auto msg = std::make_unique<rclcpp::SerializedMessage>(std::move(*message.get()));\n");
+    deserializerCode.append(varName + ".tmplt.token->value = NULL; // Manually move the data\n");
+    // Use the port type verbatim here, which can result
+    // in compile error if it is not a valid ROS type
+    deserializerCode.append("using MessageT = " + targetType + ";\n");
+    deserializerCode.append(
+        "MessageT "
+            + deserializedVarName
+            + " = MessageT();\n"
+            + "auto _lf_serializer = rclcpp::Serialization<MessageT>();\n"
+            + "_lf_serializer.deserialize_message(msg.get(), &"
+            + deserializedVarName
+            + ");\n");
+
+    return deserializerCode;
+  }
+
+  /**
+   * @return Code in C that includes all the necessary preamble to enable support for ROS 2
+   *     serialization.
+   */
+  @Override
+  public StringBuilder generatePreambleForSupport() {
+    StringBuilder preamble = new StringBuilder();
+
+    preamble.append(
+        "#include \"rcutils/allocator.h\"\n"
+            + "#include \"rclcpp/rclcpp.hpp\"\n"
+            + "#include \"rclcpp/serialization.hpp\"\n"
+            + "#include \"rclcpp/serialized_message.hpp\"\n");
+
+    return preamble;
+  }
+
+  /**
+   * @return Code that should be appended to the CMakeLists.txt to enable support for ROS 2
+   *     serialization.
+   */
+  @Override
+  public StringBuilder generateCompilerExtensionForSupport() {
+    StringBuilder cMakeExtension = new StringBuilder();
+
+    cMakeExtension.append(
+        "enable_language(CXX)\n"
+            + "set(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -Wno-write-strings -O2\")\n"
+            + "\n"
+            + "find_package(ament_cmake REQUIRED)\n"
+            + "find_package(rclcpp REQUIRED)\n"
+            + "find_package(rclcpp_components REQUIRED)\n"
+            + "find_package(rcutils)\n"
+            + "find_package(rmw REQUIRED)\n"
+            + "\n"
+            + "ament_target_dependencies( ${LF_MAIN_TARGET} rclcpp rmw)");
+
+    return cMakeExtension;
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/serialization/FedSerialization.java b/org.lflang/src/org/lflang/federated/serialization/FedSerialization.java
index 9b7ba0b2eb..fab7201c21 100644
--- a/org.lflang/src/org/lflang/federated/serialization/FedSerialization.java
+++ b/org.lflang/src/org/lflang/federated/serialization/FedSerialization.java
@@ -3,80 +3,69 @@
 import org.lflang.generator.GeneratorBase;
 
 /**
- * Interface to enable support for automatic data serialization 
- * in target code.
- * 
- * @author Soroush Bateni
+ * Interface to enable support for automatic data serialization in target code.
  *
+ * @author Soroush Bateni
  */
 public interface FedSerialization {
-    
-    /**
-     * Variable name in the target language for the serialized data.
-     */
-    final static String serializedVarName = "serialized_message";
-    
-    /**
-     * Variable name in the target language for the deserialized data.
-     */
-    final static String deserializedVarName = "deserialized_message";
-    
-    /**
-     * Check whether the current generator is compatible with the given
-     * serialization technique or not.
-     * 
-     * @param generator The current generator.
-     * @return true if compatible, false if not.
-     */
-    public boolean isCompatible(GeneratorBase generator);
 
-    /** 
-     * @return Expression in target language that corresponds to the length
-     *  of the serialized buffer.
-     */
-    public String serializedBufferLength();
-    
-    /**
-     * @return Expression in target language that is the buffer variable 
-     *  itself.
-     */
-    public String seializedBufferVar();
-    
-    /**
-     * Generate code in target language that serializes 'varName'. This code
-     * will convert the data in 'varName' from its 'originalType' into an 
-     * unsigned byte array. The serialized data will be put in a variable 
-     * with the name defined by @see serializedVarName.
-     * 
-     * @param varName The variable to be serialized.
-     * @param originalType The original type of the variable.
-     * @return Target code that serializes the 'varName' from 'type'
-     *  to an unsigned byte array.
-     */
-    public StringBuilder generateNetworkSerializerCode(String varName, String originalType);
-    
-    /**
-     * Generate code in target language that deserializes 'varName'. This code will
-     * convert the data in 'varName' from an unsigned byte array into the 'targetType'.
-     * The deserialized data will be put in a variable with the name defined by 
-     * @see deserializedVarName.
-     *  
-     * @param varName The variable to deserialize.
-     * @param targetType The type to deserialize into.
-     * @return Target code that deserializes 'varName' from an unsigned byte array
-     *  to 'type'.
-     */
-    public StringBuilder generateNetworkDeserializerCode(String varName, String targetType);
-    
-    /**
-     * @return Code in target language that includes all the necessary preamble to enable
-     *  support for the current serializer.
-     */
-    public StringBuilder generatePreambleForSupport();
-    
-    /** 
-     * @return Code that should be appended to the compiler instructions (e.g., flags to gcc or
-     *  additional lines to a CMakeLists.txt) to enable support for the current serializer.
-     */
-    public StringBuilder generateCompilerExtensionForSupport();
+  /** Variable name in the target language for the serialized data. */
+  static final String serializedVarName = "serialized_message";
+
+  /** Variable name in the target language for the deserialized data. */
+  static final String deserializedVarName = "deserialized_message";
+
+  /**
+   * Check whether the current generator is compatible with the given serialization technique or
+   * not.
+   *
+   * @param generator The current generator.
+   * @return true if compatible, false if not.
+   */
+  public boolean isCompatible(GeneratorBase generator);
+
+  /**
+   * @return Expression in target language that corresponds to the length of the serialized buffer.
+   */
+  public String serializedBufferLength();
+
+  /**
+   * @return Expression in target language that is the buffer variable itself.
+   */
+  public String seializedBufferVar();
+
+  /**
+   * Generate code in target language that serializes 'varName'. This code will convert the data in
+   * 'varName' from its 'originalType' into an unsigned byte array. The serialized data will be put
+   * in a variable with the name defined by @see serializedVarName.
+   *
+   * @param varName The variable to be serialized.
+   * @param originalType The original type of the variable.
+   * @return Target code that serializes the 'varName' from 'type' to an unsigned byte array.
+   */
+  public StringBuilder generateNetworkSerializerCode(String varName, String originalType);
+
+  /**
+   * Generate code in target language that deserializes 'varName'. This code will convert the data
+   * in 'varName' from an unsigned byte array into the 'targetType'. The deserialized data will be
+   * put in a variable with the name defined by
+   *
+   * @see deserializedVarName.
+   * @param varName The variable to deserialize.
+   * @param targetType The type to deserialize into.
+   * @return Target code that deserializes 'varName' from an unsigned byte array to 'type'.
+   */
+  public StringBuilder generateNetworkDeserializerCode(String varName, String targetType);
+
+  /**
+   * @return Code in target language that includes all the necessary preamble to enable support for
+   *     the current serializer.
+   */
+  public StringBuilder generatePreambleForSupport();
+
+  /**
+   * @return Code that should be appended to the compiler instructions (e.g., flags to gcc or
+   *     additional lines to a CMakeLists.txt) to enable support for the current serializer.
+   */
+  public StringBuilder generateCompilerExtensionForSupport();
 }
diff --git a/org.lflang/src/org/lflang/federated/serialization/SupportedSerializers.java b/org.lflang/src/org/lflang/federated/serialization/SupportedSerializers.java
index 332ab6152c..4767f3f4d7 100644
--- a/org.lflang/src/org/lflang/federated/serialization/SupportedSerializers.java
+++ b/org.lflang/src/org/lflang/federated/serialization/SupportedSerializers.java
@@ -2,23 +2,25 @@
 
 /**
  * The supported serializers.
+ *
  * @author Soroush Bateni
  */
 public enum SupportedSerializers {
-    NATIVE("native"), // Dangerous: just copies the memory layout of the sender
-    ROS2("ros2"),
-    PROTO("proto");
+  NATIVE("native"), // Dangerous: just copies the memory layout of the sender
+  ROS2("ros2"),
+  PROTO("proto");
 
-    private String serializer;
-    SupportedSerializers(String serializer) {
-        this.serializer = serializer;
-    }
-    
-    public String getSerializer() {
-        return serializer;
-    }
-    
-    public void setSerializer(String serializer) {
-        this.serializer = serializer;
-    }
+  private String serializer;
+
+  SupportedSerializers(String serializer) {
+    this.serializer = serializer;
+  }
+
+  public String getSerializer() {
+    return serializer;
+  }
+
+  public void setSerializer(String serializer) {
+    this.serializer = serializer;
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/validation/FedValidator.java b/org.lflang/src/org/lflang/federated/validation/FedValidator.java
index 49add78557..9aeb535d2f 100644
--- a/org.lflang/src/org/lflang/federated/validation/FedValidator.java
+++ b/org.lflang/src/org/lflang/federated/validation/FedValidator.java
@@ -3,9 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
+import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Input;
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.Output;
@@ -13,57 +12,55 @@
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
 
-/**
- * Helper class that is used to validate a federated reactor.
- */
+/** Helper class that is used to validate a federated reactor. */
 public class FedValidator {
 
-    public static void validateFederatedReactor(Reactor reactor, ErrorReporter errorReporter) {
-        if (!reactor.isFederated()) return;
+  public static void validateFederatedReactor(Reactor reactor, ErrorReporter errorReporter) {
+    if (!reactor.isFederated()) return;
 
-        // Construct the set of excluded reactions for this federate.
-        // If a reaction is a network reaction that belongs to this federate, we
-        // don't need to perform this analysis.
-        Iterable<Reaction> reactions = ASTUtils.allReactions(reactor);
-        for (Reaction react : reactions) {
-            // Create a collection of all the VarRefs (i.e., triggers, sources, and effects) in the react
-            // signature that are ports that reference federates.
-            // We then later check that all these VarRefs reference this federate. If not, we will add this
-            // react to the list of reactions that have to be excluded (note that mixing VarRefs from
-            // different federates is not allowed).
-            List<VarRef> allVarRefsReferencingFederates = new ArrayList<>();
-            // Add all the triggers that are outputs
-            Stream<VarRef> triggersAsVarRef = react.getTriggers().stream().filter(it -> it instanceof VarRef).map(it -> (VarRef) it);
-            allVarRefsReferencingFederates.addAll(
-                triggersAsVarRef.filter(it -> it.getVariable() instanceof Output).toList()
-            );
-            // Add all the sources that are outputs
-            allVarRefsReferencingFederates.addAll(
-                react.getSources().stream().filter(it -> it.getVariable() instanceof Output).toList()
-            );
-            // Add all the effects that are inputs
-            allVarRefsReferencingFederates.addAll(
-                react.getEffects().stream().filter(it -> it.getVariable() instanceof Input).toList()
-            );
-            containsAllVarRefs(allVarRefsReferencingFederates, errorReporter);
-        }
+    // Construct the set of excluded reactions for this federate.
+    // If a reaction is a network reaction that belongs to this federate, we
+    // don't need to perform this analysis.
+    Iterable<Reaction> reactions = ASTUtils.allReactions(reactor);
+    for (Reaction react : reactions) {
+      // Create a collection of all the VarRefs (i.e., triggers, sources, and effects) in the react
+      // signature that are ports that reference federates.
+      // We then later check that all these VarRefs reference this federate. If not, we will add
+      // this
+      // react to the list of reactions that have to be excluded (note that mixing VarRefs from
+      // different federates is not allowed).
+      List<VarRef> allVarRefsReferencingFederates = new ArrayList<>();
+      // Add all the triggers that are outputs
+      Stream<VarRef> triggersAsVarRef =
+          react.getTriggers().stream().filter(it -> it instanceof VarRef).map(it -> (VarRef) it);
+      allVarRefsReferencingFederates.addAll(
+          triggersAsVarRef.filter(it -> it.getVariable() instanceof Output).toList());
+      // Add all the sources that are outputs
+      allVarRefsReferencingFederates.addAll(
+          react.getSources().stream().filter(it -> it.getVariable() instanceof Output).toList());
+      // Add all the effects that are inputs
+      allVarRefsReferencingFederates.addAll(
+          react.getEffects().stream().filter(it -> it.getVariable() instanceof Input).toList());
+      containsAllVarRefs(allVarRefsReferencingFederates, errorReporter);
     }
+  }
 
-    /**
-     * Check if this federate contains all the {@code varRefs}. If not, report an error using {@code errorReporter}.
-     */
-    private static void containsAllVarRefs(List<VarRef> varRefs, ErrorReporter errorReporter) {
-        var referencesFederate = false;
-        Instantiation instantiation = null;
-        for (VarRef varRef : varRefs) {
-            if (instantiation == null) {
-                instantiation = varRef.getContainer();
-                referencesFederate = true;
-            } else if (!varRef.getContainer().equals(instantiation)) {
-                    errorReporter.reportError(varRef, "Mixed triggers and effects from" +
-                        " different federates. This is not permitted");
-            }
-        }
-
+  /**
+   * Check if this federate contains all the {@code varRefs}. If not, report an error using {@code
+   * errorReporter}.
+   */
+  private static void containsAllVarRefs(List<VarRef> varRefs, ErrorReporter errorReporter) {
+    var referencesFederate = false;
+    Instantiation instantiation = null;
+    for (VarRef varRef : varRefs) {
+      if (instantiation == null) {
+        instantiation = varRef.getContainer();
+        referencesFederate = true;
+      } else if (!varRef.getContainer().equals(instantiation)) {
+        errorReporter.reportError(
+            varRef,
+            "Mixed triggers and effects from" + " different federates. This is not permitted");
+      }
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/formatting2/LFFormatter.java b/org.lflang/src/org/lflang/formatting2/LFFormatter.java
index 2a5e60cdc8..7df4053eef 100644
--- a/org.lflang/src/org/lflang/formatting2/LFFormatter.java
+++ b/org.lflang/src/org/lflang/formatting2/LFFormatter.java
@@ -4,8 +4,8 @@
 
 package org.lflang.formatting2;
 
+import com.google.inject.Inject;
 import java.util.List;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.formatting2.FormatterRequest;
 import org.eclipse.xtext.formatting2.IFormatter2;
@@ -15,38 +15,32 @@
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
-
 import org.lflang.ast.FormattingUtils;
 
-import com.google.inject.Inject;
-
 public class LFFormatter implements IFormatter2 {
 
-    @Inject
-    private IResourceValidator validator;
+  @Inject private IResourceValidator validator;
 
-    @Override
-    public List<ITextReplacement> format(FormatterRequest request) {
-        // TODO: Use a CancelIndicator that actually cancels?
-        if (!request.getTextRegionAccess().getResource().getErrors().isEmpty()
-            || !validator.validate(
+  @Override
+  public List<ITextReplacement> format(FormatterRequest request) {
+    // TODO: Use a CancelIndicator that actually cancels?
+    if (!request.getTextRegionAccess().getResource().getErrors().isEmpty()
+        || !validator
+            .validate(
                 request.getTextRegionAccess().getResource(),
                 CheckMode.ALL,
-                CancelIndicator.NullImpl
-            ).isEmpty()
-        ) {
-            return List.of();
-        }
-        ITextSegment documentRegion = request.getTextRegionAccess().regionForDocument();
-        List<EObject> documentContents = request.getTextRegionAccess().getResource().getContents();
-        if (documentContents.isEmpty()) return List.of();
-        return List.of(
-            new TextReplacement(
-                request.getTextRegionAccess(),
-                documentRegion.getOffset(),
-                documentRegion.getLength(),
-                FormattingUtils.render(documentContents.get(0))
-            )
-        );
+                CancelIndicator.NullImpl)
+            .isEmpty()) {
+      return List.of();
     }
+    ITextSegment documentRegion = request.getTextRegionAccess().regionForDocument();
+    List<EObject> documentContents = request.getTextRegionAccess().getResource().getContents();
+    if (documentContents.isEmpty()) return List.of();
+    return List.of(
+        new TextReplacement(
+            request.getTextRegionAccess(),
+            documentRegion.getOffset(),
+            documentRegion.getLength(),
+            FormattingUtils.render(documentContents.get(0))));
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/ActionInstance.java b/org.lflang/src/org/lflang/generator/ActionInstance.java
index bdc8793383..b749a26426 100644
--- a/org.lflang/src/org/lflang/generator/ActionInstance.java
+++ b/org.lflang/src/org/lflang/generator/ActionInstance.java
@@ -1,28 +1,28 @@
 /* Instance of an action. */
 
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
@@ -32,69 +32,69 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 
 /**
  * Instance of an action.
+ *
  * @author Edward A. Lee
  * @author Marten Lohstroh
  */
 public class ActionInstance extends TriggerInstance<Action> {
 
-    /** The constant default for a minimum delay. */
-    public static final TimeValue DEFAULT_MIN_DELAY = TimeValue.ZERO;
+  /** The constant default for a minimum delay. */
+  public static final TimeValue DEFAULT_MIN_DELAY = TimeValue.ZERO;
 
-    /** The minimum delay for this action. */
-    private TimeValue minDelay = DEFAULT_MIN_DELAY;
+  /** The minimum delay for this action. */
+  private TimeValue minDelay = DEFAULT_MIN_DELAY;
 
-    /** The minimum spacing between action events. */
-    private TimeValue minSpacing = null;
+  /** The minimum spacing between action events. */
+  private TimeValue minSpacing = null;
 
-    /** The replacement policy for when minimum spacing is violated. */
-    private String policy = null;
+  /** The replacement policy for when minimum spacing is violated. */
+  private String policy = null;
 
-    /** Indicator of whether the action is physical. */
-    private boolean physical;
+  /** Indicator of whether the action is physical. */
+  private boolean physical;
 
-    /**
-     * Create a new action instance.
-     * If the definition is null, then this is a shutdown action.
-     * @param definition The AST definition, or null for startup.
-     * @param parent The parent reactor.
-     */
-    public ActionInstance(Action definition, ReactorInstance parent) {
-        super(definition, parent);
-        if (parent == null) {
-            throw new InvalidSourceException("Cannot create an ActionInstance with no parent.");
-        }
-        if (definition != null) {
-            if (definition.getMinDelay() != null) {
-                this.minDelay = parent.getTimeValue(definition.getMinDelay());
-            }
-            if (definition.getMinSpacing() != null) {
-                this.minSpacing = parent.getTimeValue(definition.getMinSpacing());
-            }
-            if (definition.getOrigin() == ActionOrigin.PHYSICAL) {
-                physical = true;
-            }
-            policy = definition.getPolicy();
-        }
+  /**
+   * Create a new action instance. If the definition is null, then this is a shutdown action.
+   *
+   * @param definition The AST definition, or null for startup.
+   * @param parent The parent reactor.
+   */
+  public ActionInstance(Action definition, ReactorInstance parent) {
+    super(definition, parent);
+    if (parent == null) {
+      throw new InvalidSourceException("Cannot create an ActionInstance with no parent.");
     }
-
-    /** Return the minimum delay for this action. */
-    public TimeValue getMinDelay() {
-        return minDelay;
+    if (definition != null) {
+      if (definition.getMinDelay() != null) {
+        this.minDelay = parent.getTimeValue(definition.getMinDelay());
+      }
+      if (definition.getMinSpacing() != null) {
+        this.minSpacing = parent.getTimeValue(definition.getMinSpacing());
+      }
+      if (definition.getOrigin() == ActionOrigin.PHYSICAL) {
+        physical = true;
+      }
+      policy = definition.getPolicy();
     }
-    
-    /** Return the minimum spacing between action events. */
-    public TimeValue getMinSpacing() {
-        return minSpacing;
-    }
-    
-    /** Return the replacement policy for when minimum spacing is violated. */
-    public String getPolicy() {
-        return policy;
-    }
-    
-    /** Return the indicator of whether the action is physical. */
-    public boolean isPhysical() {
-        return physical;
-    }
-
+  }
+
+  /** Return the minimum delay for this action. */
+  public TimeValue getMinDelay() {
+    return minDelay;
+  }
+
+  /** Return the minimum spacing between action events. */
+  public TimeValue getMinSpacing() {
+    return minSpacing;
+  }
+
+  /** Return the replacement policy for when minimum spacing is violated. */
+  public String getPolicy() {
+    return policy;
+  }
+
+  /** Return the indicator of whether the action is physical. */
+  public boolean isPhysical() {
+    return physical;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/CodeBuilder.java b/org.lflang/src/org/lflang/generator/CodeBuilder.java
index 2b77239680..e4e92294fb 100644
--- a/org.lflang/src/org/lflang/generator/CodeBuilder.java
+++ b/org.lflang/src/org/lflang/generator/CodeBuilder.java
@@ -1,533 +1,555 @@
 package org.lflang.generator;
 
-import java.nio.file.Path;
-import java.io.IOException;
+import static org.lflang.generator.c.CMixedRadixGenerator.*;
+import static org.lflang.util.StringUtil.joinObjects;
 
+import java.io.IOException;
+import java.nio.file.Path;
 import org.eclipse.emf.common.CommonPlugin;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
-import org.lflang.federated.generator.FederateInstance;
 import org.lflang.generator.c.CUtil;
 import org.lflang.lf.Code;
 import org.lflang.util.FileUtil;
-import static org.lflang.generator.c.CMixedRadixGenerator.*;
-import static org.lflang.util.StringUtil.joinObjects;
 
 /**
- * Helper class for printing code with indentation.
- * This class is backed by a StringBuilder and is used to accumulate
- * code to be printed to a file. Its main function is to handle indentation.
+ * Helper class for printing code with indentation. This class is backed by a StringBuilder and is
+ * used to accumulate code to be printed to a file. Its main function is to handle indentation.
  *
  * @author Edward A. Lee
  * @author Peter Donovan
  */
 public class CodeBuilder {
 
-    /**
-     * Construct a new empty code emitter.
-     */
-    public CodeBuilder() {}
-
-    /**
-     * Construct a new code emitter with the text and indentation
-     * of the specified code emitter.
-     * @param model The model code emitter.
-     */
-    public CodeBuilder(CodeBuilder model) {
-        indentation = model.indentation;
-        code.append(model);
-    }
-
-    /////////////////////////////////////////////
-    ///// Public methods.
-
-    /**
-     * Get the code produced so far.
-     * @return The code produced so far as a String.
-     */
-    public String getCode() {
-        return code.toString();
-    }
-
-    /**
-     * Increase the indentation of the output code produced.
-     */
-    public void indent() {
-        indentation += "    ";
-    }
-
-    /**
-     * Insert the specified text at the specified position.
-     * @param position The position.
-     * @param text The text.
-     */
-    public void insert(int position, String text) {
-        code.insert(position, text);
-    }
-
-    /**
-     * Return the length of the code in characters.
-     */
-    public int length() {
-        return code.length();
-    }
-
-    /**
-     * Add a new line.
-     */
-    public void newLine() {
-        this.pr("");
-    }
-
-    /**
-     * Append the specified text plus a final newline.
-     * @param format A format string to be used by {@code String.format} or
-     *  the text to append if no further arguments are given.
-     * @param args Additional arguments to pass to the formatter.
-     */
-    public void pr(String format, Object... args) {
-        pr(
-            (args != null && args.length > 0) ? String.format(format, args) : format
-        );
-    }
-
-    /**
-     * Append the given text to the code buffer at the current indentation level.
-     */
-    public void pr(CharSequence text) {
-        for (String line : (Iterable<? extends String>) () -> text.toString().lines().iterator()) {
-            code.append(indentation).append(line).append("\n");
-        }
+  /** Construct a new empty code emitter. */
+  public CodeBuilder() {}
+
+  /**
+   * Construct a new code emitter with the text and indentation of the specified code emitter.
+   *
+   * @param model The model code emitter.
+   */
+  public CodeBuilder(CodeBuilder model) {
+    indentation = model.indentation;
+    code.append(model);
+  }
+
+  /////////////////////////////////////////////
+  ///// Public methods.
+
+  /**
+   * Get the code produced so far.
+   *
+   * @return The code produced so far as a String.
+   */
+  public String getCode() {
+    return code.toString();
+  }
+
+  /** Increase the indentation of the output code produced. */
+  public void indent() {
+    indentation += "    ";
+  }
+
+  /**
+   * Insert the specified text at the specified position.
+   *
+   * @param position The position.
+   * @param text The text.
+   */
+  public void insert(int position, String text) {
+    code.insert(position, text);
+  }
+
+  /** Return the length of the code in characters. */
+  public int length() {
+    return code.length();
+  }
+
+  /** Add a new line. */
+  public void newLine() {
+    this.pr("");
+  }
+
+  /**
+   * Append the specified text plus a final newline.
+   *
+   * @param format A format string to be used by {@code String.format} or the text to append if no
+   *     further arguments are given.
+   * @param args Additional arguments to pass to the formatter.
+   */
+  public void pr(String format, Object... args) {
+    pr((args != null && args.length > 0) ? String.format(format, args) : format);
+  }
+
+  /** Append the given text to the code buffer at the current indentation level. */
+  public void pr(CharSequence text) {
+    for (String line : (Iterable<? extends String>) () -> text.toString().lines().iterator()) {
+      code.append(indentation).append(line).append("\n");
     }
-
-    /**
-     * Version of pr() that prints a source line number using a #line
-     * prior to each line of the output. Use this when multiple lines of
-     * output code are all due to the same source line in the .lf file.
-     * @param eObject The AST node that this source line is based on.
-     * @param text The text to append.
-     */
-    public void pr(EObject eObject, Object text) {
-        var split = text.toString().split("\n");
-        for (String line : split) {
-            prSourceLineNumber(eObject);
-            pr(line);
-        }
+  }
+
+  /**
+   * Version of pr() that prints a source line number using a #line prior to each line of the
+   * output. Use this when multiple lines of output code are all due to the same source line in the
+   * .lf file.
+   *
+   * @param eObject The AST node that this source line is based on.
+   * @param text The text to append.
+   */
+  public void pr(EObject eObject, Object text) {
+    var split = text.toString().split("\n");
+    for (String line : split) {
+      prSourceLineNumber(eObject);
+      pr(line);
     }
-
-    /** Print the #line compiler directive with the line number of
-     *  the specified object.
-     *  @param eObject The node.
-     */
-    public void prSourceLineNumber(EObject eObject) {
-        var node = NodeModelUtils.getNode(eObject);
-        if (node != null) {
-            // For code blocks (delimited by {= ... =}, unfortunately,
-            // we have to adjust the offset by the number of newlines before {=.
-            // Unfortunately, this is complicated because the code has been
-            // tokenized.
-            var offset = 0;
-            if (eObject instanceof Code) {
-                offset += 1;
-            }
-            // Extract the filename from eResource, an astonishingly difficult thing to do.
-            String filePath = CommonPlugin.resolve(eObject.eResource().getURI()).path();
-            pr("#line " + (node.getStartLine() + offset) + " \"" + filePath + "\"");
-        }
+  }
+
+  /**
+   * Print the #line compiler directive with the line number of the specified object.
+   *
+   * @param eObject The node.
+   */
+  public void prSourceLineNumber(EObject eObject) {
+    var node = NodeModelUtils.getNode(eObject);
+    if (node != null) {
+      // For code blocks (delimited by {= ... =}, unfortunately,
+      // we have to adjust the offset by the number of newlines before {=.
+      // Unfortunately, this is complicated because the code has been
+      // tokenized.
+      var offset = 0;
+      if (eObject instanceof Code) {
+        offset += 1;
+      }
+      // Extract the filename from eResource, an astonishingly difficult thing to do.
+      String filePath = CommonPlugin.resolve(eObject.eResource().getURI()).path();
+      pr("#line " + (node.getStartLine() + offset) + " \"" + filePath + "\"");
     }
-
-    /**
-     * Append a single-line, C-style comment to the code.
-     * @param comment The comment.
-     */
-    public void prComment(String comment) {
-        pr("// " + comment);
+  }
+
+  /**
+   * Append a single-line, C-style comment to the code.
+   *
+   * @param comment The comment.
+   */
+  public void prComment(String comment) {
+    pr("// " + comment);
+  }
+
+  /**
+   * Remove all lines that start with the specified prefix and return a new CodeBuilder with the
+   * result.
+   *
+   * @param prefix The prefix.
+   */
+  public CodeBuilder removeLines(String prefix) {
+    String separator = "\n";
+    String[] lines = toString().split(separator);
+
+    CodeBuilder builder = new CodeBuilder();
+
+    for (String line : lines) {
+      String trimmedLine = line.trim();
+      if (!trimmedLine.startsWith(prefix)) {
+        builder.pr(line);
+      }
     }
-
-    /**
-     * Remove all lines that start with the specified prefix
-     * and return a new CodeBuilder with the result.
-     * @param prefix The prefix.
-     */
-    public CodeBuilder removeLines(String prefix) {
-        String separator = "\n";
-        String[] lines = toString().split(separator);
-
-        CodeBuilder builder = new CodeBuilder();
-
-        for(String line : lines) {
-            String trimmedLine = line.trim();
-            if(!trimmedLine.startsWith(prefix)) {
-                builder.pr(line);
-            }
-        }
-        return builder;
+    return builder;
+  }
+
+  /**
+   * Start a scoped block, which is a section of code surrounded by curley braces and indented. This
+   * must be followed by an {@link #endScopedBlock()}.
+   */
+  public void startScopedBlock() {
+    pr("{");
+    indent();
+  }
+
+  /**
+   * Start a scoped block for the specified reactor. If the reactor is a bank, then this starts a
+   * for loop that iterates over the bank members using a standard index variable whose name is that
+   * returned by {@link CUtil#bankIndex(ReactorInstance)}. If the reactor is null or is not a bank,
+   * then this simply starts a scoped block by printing an opening curly brace. This also adds a
+   * declaration of a pointer to the self struct of the reactor or bank member.
+   *
+   * <p>This block is intended to be nested, where each block is put within a similar block for the
+   * reactor's parent. This ensures that all (possibly nested) bank index variables are defined
+   * within the block.
+   *
+   * <p>This must be followed by an {@link #endScopedBlock()}.
+   *
+   * @param reactor The reactor instance.
+   */
+  public void startScopedBlock(ReactorInstance reactor) {
+    if (reactor != null && reactor.isBank()) {
+      var index = CUtil.bankIndexName(reactor);
+      pr("// Reactor is a bank. Iterate over bank members.");
+      pr("for (int " + index + " = 0; " + index + " < " + reactor.width + "; " + index + "++) {");
+      indent();
+    } else {
+      startScopedBlock();
     }
-
-    /**
-     * Start a scoped block, which is a section of code
-     * surrounded by curley braces and indented.
-     * This must be followed by an {@link #endScopedBlock()}.
-     */
-    public void startScopedBlock() {
-        pr("{");
-        indent();
+  }
+
+  /**
+   * If the specified port is a multiport, then start a specified iteration over the channels of the
+   * multiport using as the channel index the variable name returned by {@link
+   * CUtil#channelIndex(PortInstance)}. If the port is not a multiport, do nothing. This is required
+   * to be followed by {@link #endChannelIteration(PortInstance)}.
+   *
+   * @param port The port.
+   */
+  public void startChannelIteration(PortInstance port) {
+    if (port.isMultiport) {
+      var channel = CUtil.channelIndexName(port);
+      pr("// Port " + port.getFullName() + " is a multiport. Iterate over its channels.");
+      pr(
+          "for (int "
+              + channel
+              + " = 0; "
+              + channel
+              + " < "
+              + port.width
+              + "; "
+              + channel
+              + "++) {");
+      indent();
     }
-
-    /**
-     * Start a scoped block for the specified reactor.
-     * If the reactor is a bank, then this starts a for loop
-     * that iterates over the bank members using a standard index
-     * variable whose name is that returned by {@link CUtil#bankIndex(ReactorInstance)}.
-     * If the reactor is null or is not a bank, then this simply
-     * starts a scoped block by printing an opening curly brace.
-     * This also adds a declaration of a pointer to the self
-     * struct of the reactor or bank member.
-     *
-     * This block is intended to be nested, where each block is
-     * put within a similar block for the reactor's parent.
-     * This ensures that all (possibly nested) bank index variables
-     * are defined within the block.
-     *
-     * This must be followed by an {@link #endScopedBlock()}.
-     *
-     * @param reactor The reactor instance.
-     */
-    public void startScopedBlock(
-        ReactorInstance reactor
-    ) {
-        if (reactor != null && reactor.isBank()) {
-            var index = CUtil.bankIndexName(reactor);
-            pr("// Reactor is a bank. Iterate over bank members.");
-            pr("for (int "+index+" = 0; "+index+" < "+reactor.width+"; "+index+"++) {");
-            indent();
-        } else {
-            startScopedBlock();
-        }
+  }
+
+  /**
+   * Start a scoped block to iterate over bank members and channels for the specified port with a
+   * variable with the name given by count counting the iterations. If this port is a multiport,
+   * then the channel index variable name is that returned by {@link
+   * CUtil#channelIndex(PortInstance)}.
+   *
+   * <p>This block is intended to be nested, where each block is put within a similar block for the
+   * reactor's parent.
+   *
+   * <p>This is required to be followed by a call to {@link
+   * #endScopedBankChannelIteration(PortInstance, String)}.
+   *
+   * @param port The port.
+   * @param count The variable name to use for the counter, or null to not provide a counter.
+   */
+  public void startScopedBankChannelIteration(PortInstance port, String count) {
+    if (count != null) {
+      startScopedBlock();
+      pr("int " + count + " = 0;");
     }
-
-    /**
-     * If the specified port is a multiport, then start a specified iteration
-     * over the channels of the multiport using as the channel index the
-     * variable name returned by {@link CUtil#channelIndex(PortInstance)}.
-     * If the port is not a multiport, do nothing.
-     * This is required to be followed by {@link #endChannelIteration(PortInstance)}.
-     * @param port The port.
-     */
-    public void startChannelIteration(PortInstance port) {
-        if (port.isMultiport) {
-            var channel = CUtil.channelIndexName(port);
-            pr("// Port "+port.getFullName()+" is a multiport. Iterate over its channels.");
-            pr("for (int "+channel+" = 0; "+channel+" < "+port.width+"; "+channel+"++) {");
-            indent();
-        }
+    startScopedBlock(port.parent);
+    startChannelIteration(port);
+  }
+
+  /**
+   * Start a scoped block that iterates over the specified range of port channels.
+   *
+   * <p>This must be followed by a call to {@link #endScopedRangeBlock(RuntimeRange)}.
+   *
+   * <p>This block should NOT be nested, where each block is put within a similar block for the
+   * reactor's parent. Within the created block, every use of {@link
+   * CUtil#reactorRef(ReactorInstance, String)} must provide the second argument, a runtime index
+   * variable name, that must match the runtimeIndex parameter given here.
+   *
+   * @param range The range of port channels.
+   * @param runtimeIndex A variable name to use to index the runtime instance of either port's
+   *     parent or the port's parent's parent (if nested is true), or null to use the default,
+   *     "runtime_index".
+   * @param bankIndex A variable name to use to index the bank of the port's parent or null to use
+   *     the default, the string returned by {@link CUtil#bankIndexName(ReactorInstance)}.
+   * @param channelIndex A variable name to use to index the channel or null to use the default, the
+   *     string returned by {@link CUtil#channelIndexName(PortInstance)}.
+   * @param nested If true, then the runtimeIndex variable will be set to the bank index of the
+   *     port's parent's parent rather than the port's parent.
+   */
+  public void startScopedRangeBlock(
+      RuntimeRange<PortInstance> range,
+      String runtimeIndex,
+      String bankIndex,
+      String channelIndex,
+      boolean nested) {
+
+    pr("// Iterate over range " + range.toString() + ".");
+    var ri = (runtimeIndex == null) ? "runtime_index" : runtimeIndex;
+    var ci = (channelIndex == null) ? CUtil.channelIndexName(range.instance) : channelIndex;
+    var bi = (bankIndex == null) ? CUtil.bankIndexName(range.instance.parent) : bankIndex;
+    var rangeMR = range.startMR();
+    var sizeMR = rangeMR.getDigits().size();
+    var nestedLevel = (nested) ? 2 : 1;
+
+    startScopedBlock();
+    if (range.width > 1) {
+      pr(
+          String.join(
+              "\n",
+              "int range_start[] =  { " + joinObjects(rangeMR.getDigits(), ", ") + " };",
+              "int range_radixes[] = { " + joinObjects(rangeMR.getRadixes(), ", ") + " };",
+              "int permutation[] = { " + joinObjects(range.permutation(), ", ") + " };",
+              "mixed_radix_int_t range_mr = {",
+              "    " + sizeMR + ",",
+              "    range_start,",
+              "    range_radixes,",
+              "    permutation",
+              "};",
+              "for (int range_count = "
+                  + range.start
+                  + "; range_count < "
+                  + range.start
+                  + " + "
+                  + range.width
+                  + "; range_count++) {"));
+      indent();
+      pr(
+          String.join(
+              "\n",
+              "int "
+                  + ri
+                  + " = mixed_radix_parent(&range_mr, "
+                  + nestedLevel
+                  + "); // Runtime index.",
+              "SUPPRESS_UNUSED_WARNING(" + ri + ");",
+              "int " + ci + " = range_mr.digits[0]; // Channel index.",
+              "SUPPRESS_UNUSED_WARNING(" + ci + ");",
+              "int " + bi + " = " + (sizeMR <= 1 ? "0" : "range_mr.digits[1]") + "; // Bank index.",
+              "SUPPRESS_UNUSED_WARNING(" + bi + ");"));
+
+    } else {
+      var ciValue = rangeMR.getDigits().get(0);
+      var riValue = rangeMR.get(nestedLevel);
+      var biValue = (sizeMR > 1) ? rangeMR.getDigits().get(1) : 0;
+      pr(
+          String.join(
+              "\n",
+              "int "
+                  + ri
+                  + " = "
+                  + riValue
+                  + "; SUPPRESS_UNUSED_WARNING("
+                  + ri
+                  + "); // Runtime index.",
+              "int "
+                  + ci
+                  + " = "
+                  + ciValue
+                  + "; SUPPRESS_UNUSED_WARNING("
+                  + ci
+                  + "); // Channel index.",
+              "int "
+                  + bi
+                  + " = "
+                  + biValue
+                  + "; SUPPRESS_UNUSED_WARNING("
+                  + bi
+                  + "); // Bank index.",
+              "int range_count = 0; SUPPRESS_UNUSED_WARNING(range_count);"));
     }
-
-    /**
-     * Start a scoped block to iterate over bank members and
-     * channels for the specified port with a variable with
-     * the name given by count counting the iterations.
-     * If this port is a multiport, then the channel index
-     * variable name is that returned by {@link CUtil#channelIndex(PortInstance)}.
-     *
-     * This block is intended to be nested, where each block is
-     * put within a similar block for the reactor's parent.
-     *
-     * This is required to be followed by a call to
-     * {@link #endScopedBankChannelIteration(PortInstance, String)}.
-     * @param port The port.
-     * @param count The variable name to use for the counter, or
-     *  null to not provide a counter.
-     */
-    public void startScopedBankChannelIteration(PortInstance port,
-                                                String count) {
-        if (count != null) {
-            startScopedBlock();
-            pr("int "+count+" = 0;");
-        }
-        startScopedBlock(port.parent);
-        startChannelIteration(port);
+  }
+
+  /**
+   * Start a scoped block that iterates over the specified pair of ranges. The destination range can
+   * be wider than the source range, in which case the source range is reused until the destination
+   * range is filled. The following integer variables will be defined within the scoped block:
+   *
+   * <ul>
+   *   <li>src_channel: The channel index for the source.
+   *   <li>src_bank: The bank index of the source port&#39;s parent.
+   *   <li>src_runtime: The runtime index of the source port&#39;s parent or the parent&#39;s parent
+   *       (if the source is an input).
+   * </ul>
+   *
+   * <ul>
+   *   <li>dst_channel: The channel index for the destination.
+   *   <li>dst_bank: The bank index of the destination port&#39;s parent.
+   *   <li>dst_runtime: The runtime index of the destination port&#39;s parent or the parent&#39;s
+   *       parent (if destination is an output).
+   * </ul>
+   *
+   * <p>For convenience, the above variable names are defined in the private class variables sc, sb,
+   * sr, and dc, db, dr.
+   *
+   * <p>This block should NOT be nested, where each block is put within a similar block for the
+   * reactor's parent. Within the created block, every use of {@link
+   * CUtil#reactorRef(ReactorInstance, String)} and related functions must provide the above
+   * variable names.
+   *
+   * <p>This must be followed by a call to {@link #endScopedRangeBlock(SendRange, RuntimeRange)}.x
+   *
+   * @param srcRange The send range.
+   * @param dstRange The destination range.
+   */
+  public void startScopedRangeBlock(SendRange srcRange, RuntimeRange<PortInstance> dstRange) {
+    var srcRangeMR = srcRange.startMR();
+    var srcSizeMR = srcRangeMR.getRadixes().size();
+    var srcNestedLevel = (srcRange.instance.isInput()) ? 2 : 1;
+    var dstNested = dstRange.instance.isOutput();
+
+    pr("// Iterate over ranges " + srcRange + " and " + dstRange + ".");
+    startScopedBlock();
+    if (srcRange.width > 1) {
+      pr(
+          String.join(
+              "\n",
+              "int src_start[] =  { " + joinObjects(srcRangeMR.getDigits(), ", ") + " };",
+              "int src_value[] =  { "
+                  + joinObjects(srcRangeMR.getDigits(), ", ")
+                  + " }; // Will be incremented.",
+              "int src_radixes[] = { " + joinObjects(srcRangeMR.getRadixes(), ", ") + " };",
+              "int src_permutation[] = { " + joinObjects(srcRange.permutation(), ", ") + " };",
+              "mixed_radix_int_t src_range_mr = {",
+              "    " + srcSizeMR + ",",
+              "    src_value,",
+              "    src_radixes,",
+              "    src_permutation",
+              "};"));
+    } else {
+      var ciValue = srcRangeMR.getDigits().get(0);
+      var biValue = (srcSizeMR > 1) ? srcRangeMR.getDigits().get(1) : 0;
+      var riValue = srcRangeMR.get(srcNestedLevel);
+      pr(
+          String.join(
+              "\n",
+              "int " + sr + " = " + riValue + "; // Runtime index.",
+              "SUPPRESS_UNUSED_WARNING(" + sr + ");",
+              "int " + sc + " = " + ciValue + "; // Channel index.",
+              "SUPPRESS_UNUSED_WARNING(" + sc + ");",
+              "int " + sb + " = " + biValue + "; // Bank index.",
+              "SUPPRESS_UNUSED_WARNING(" + sb + ");"));
     }
 
-    /**
-     * Start a scoped block that iterates over the specified range of port channels.
-     *
-     * This must be followed by a call to
-     * {@link #endScopedRangeBlock(RuntimeRange)}.
-     *
-     * This block should NOT be nested, where each block is
-     * put within a similar block for the reactor's parent.
-     * Within the created block, every use of
-     * {@link CUtil#reactorRef(ReactorInstance, String)}
-     * must provide the second argument, a runtime index variable name,
-     * that must match the runtimeIndex parameter given here.
-     *
-     * @param range The range of port channels.
-     * @param runtimeIndex A variable name to use to index the runtime instance of
-     *  either port's parent or the port's parent's parent (if nested is true), or
-     *  null to use the default, "runtime_index".
-     * @param bankIndex A variable name to use to index the bank of the port's parent or null to use the
-     *  default, the string returned by {@link CUtil#bankIndexName(ReactorInstance)}.
-     * @param channelIndex A variable name to use to index the channel or null to
-     *  use the default, the string returned by {@link CUtil#channelIndexName(PortInstance)}.
-     * @param nested If true, then the runtimeIndex variable will be set
-     *  to the bank index of the port's parent's parent rather than the
-     *  port's parent.
-     */
-    public void startScopedRangeBlock(
-        RuntimeRange<PortInstance> range,
-        String runtimeIndex,
-        String bankIndex,
-        String channelIndex,
-        boolean nested
-    ) {
-
-        pr("// Iterate over range "+range.toString()+".");
-        var ri = (runtimeIndex == null)? "runtime_index" : runtimeIndex;
-        var ci = (channelIndex == null)? CUtil.channelIndexName(range.instance) : channelIndex;
-        var bi = (bankIndex == null)? CUtil.bankIndexName(range.instance.parent) : bankIndex;
-        var rangeMR = range.startMR();
-        var sizeMR = rangeMR.getDigits().size();
-        var nestedLevel = (nested) ? 2 : 1;
-
-        startScopedBlock();
-        if (range.width > 1) {
-            pr(String.join("\n",
-                "int range_start[] =  { "+joinObjects(rangeMR.getDigits(), ", ")+" };",
-                "int range_radixes[] = { "+joinObjects(rangeMR.getRadixes(), ", ")+" };",
-                "int permutation[] = { "+joinObjects(range.permutation(), ", ")+" };",
-                "mixed_radix_int_t range_mr = {",
-                "    "+sizeMR+",",
-                "    range_start,",
-                "    range_radixes,",
-                "    permutation",
-                "};",
-                "for (int range_count = "+range.start+"; range_count < "+range.start+" + "+range.width+"; range_count++) {"
-            ));
-            indent();
-            pr(String.join("\n",
-                "int "+ri+" = mixed_radix_parent(&range_mr, "+nestedLevel+"); // Runtime index.",
-                "SUPPRESS_UNUSED_WARNING("+ri+");",
-                "int "+ci+" = range_mr.digits[0]; // Channel index.",
-                "SUPPRESS_UNUSED_WARNING("+ci+");",
-                "int "+bi+" = "+(sizeMR <= 1 ? "0" : "range_mr.digits[1]")+"; // Bank index.",
-                "SUPPRESS_UNUSED_WARNING("+bi+");"
-            ));
-
-        } else {
-            var ciValue = rangeMR.getDigits().get(0);
-            var riValue = rangeMR.get(nestedLevel);
-            var biValue = (sizeMR > 1)? rangeMR.getDigits().get(1) : 0;
-            pr(String.join("\n",
-                "int "+ri+" = "+riValue+"; SUPPRESS_UNUSED_WARNING("+ri+"); // Runtime index.",
-                "int "+ci+" = "+ciValue+"; SUPPRESS_UNUSED_WARNING("+ci+"); // Channel index.",
-                "int "+bi+" = "+biValue+"; SUPPRESS_UNUSED_WARNING("+bi+"); // Bank index.",
-                "int range_count = 0; SUPPRESS_UNUSED_WARNING(range_count);"
-            ));
-        }
+    startScopedRangeBlock(dstRange, dr, db, dc, dstNested);
+
+    if (srcRange.width > 1) {
+      pr(
+          String.join(
+              "\n",
+              "int "
+                  + sr
+                  + " = mixed_radix_parent(&src_range_mr, "
+                  + srcNestedLevel
+                  + "); // Runtime index.",
+              "SUPPRESS_UNUSED_WARNING(" + sr + ");",
+              "int " + sc + " = src_range_mr.digits[0]; // Channel index.",
+              "SUPPRESS_UNUSED_WARNING(" + sc + ");",
+              "int "
+                  + sb
+                  + " = "
+                  + (srcSizeMR <= 1 ? "0" : "src_range_mr.digits[1]")
+                  + "; // Bank index.",
+              "SUPPRESS_UNUSED_WARNING(" + sb + ");"));
     }
-
-    /**
-     * Start a scoped block that iterates over the specified pair of ranges.
-     * The destination range can be wider than the source range, in which case the
-     * source range is reused until the destination range is filled.
-     * The following integer variables will be defined within the scoped block:
-     *
-     * <ul>
-     * <li>src_channel: The channel index for the source.</li>
-     * <li>src_bank: The bank index of the source port&#39;s parent.</li>
-     * <li>src_runtime: The runtime index of the source port&#39;s parent or
-     * the parent&#39;s parent (if the source is an input).</li>
-     * </ul>
-     * <ul>
-     * <li>dst_channel: The channel index for the destination.</li>
-     * <li>dst_bank: The bank index of the destination port&#39;s parent.</li>
-     * <li>dst_runtime: The runtime index of the destination port&#39;s parent or
-     * the parent&#39;s parent (if destination is an output).</li>
-     * </ul>
-     *
-     * <p>For convenience, the above variable names are defined in the private
-     * class variables sc, sb, sr, and dc, db, dr.</p>
-     *
-     * <p>This block should NOT be nested, where each block is
-     * put within a similar block for the reactor's parent.
-     * Within the created block, every use of
-     * {@link CUtil#reactorRef(ReactorInstance, String)}
-     * and related functions must provide the above variable names.</p>
-     *
-     * <p>This must be followed by a call to
-     * {@link #endScopedRangeBlock(SendRange, RuntimeRange)}.</p>x
-     *
-     * @param srcRange The send range.
-     * @param dstRange The destination range.
-     */
-    public void startScopedRangeBlock(
-        SendRange srcRange,
-        RuntimeRange<PortInstance> dstRange
-    ) {
-        var srcRangeMR = srcRange.startMR();
-        var srcSizeMR = srcRangeMR.getRadixes().size();
-        var srcNestedLevel = (srcRange.instance.isInput()) ? 2 : 1;
-        var dstNested = dstRange.instance.isOutput();
-
-        pr("// Iterate over ranges "+srcRange+" and "+dstRange+".");
-        startScopedBlock();
-        if (srcRange.width > 1) {
-            pr(String.join("\n",
-                "int src_start[] =  { "+joinObjects(srcRangeMR.getDigits(), ", ")+" };",
-                "int src_value[] =  { "+joinObjects(srcRangeMR.getDigits(), ", ")+" }; // Will be incremented.",
-                "int src_radixes[] = { "+joinObjects(srcRangeMR.getRadixes(), ", ")+" };",
-                "int src_permutation[] = { "+joinObjects(srcRange.permutation(), ", ")+" };",
-                "mixed_radix_int_t src_range_mr = {",
-                "    "+srcSizeMR+",",
-                "    src_value,",
-                "    src_radixes,",
-                "    src_permutation",
-                "};"
-            ));
-        } else {
-            var ciValue = srcRangeMR.getDigits().get(0);
-            var biValue = (srcSizeMR > 1)? srcRangeMR.getDigits().get(1) : 0;
-            var riValue = srcRangeMR.get(srcNestedLevel);
-            pr(String.join("\n",
-                "int "+sr+" = "+riValue+"; // Runtime index.",
-                "SUPPRESS_UNUSED_WARNING("+sr+");",
-                "int "+sc+" = "+ciValue+"; // Channel index.",
-                "SUPPRESS_UNUSED_WARNING("+sc+");",
-                "int "+sb+" = "+biValue+"; // Bank index.",
-                "SUPPRESS_UNUSED_WARNING("+sb+");"
-            ));
-        }
-
-        startScopedRangeBlock(dstRange, dr, db, dc, dstNested);
-
-        if (srcRange.width > 1) {
-            pr(String.join("\n",
-                "int "+sr+" = mixed_radix_parent(&src_range_mr, "+srcNestedLevel+"); // Runtime index.",
-                "SUPPRESS_UNUSED_WARNING("+sr+");",
-                "int "+sc+" = src_range_mr.digits[0]; // Channel index.",
-                "SUPPRESS_UNUSED_WARNING("+sc+");",
-                "int "+sb+" = "+(srcSizeMR <= 1 ? "0" : "src_range_mr.digits[1]")+"; // Bank index.",
-                "SUPPRESS_UNUSED_WARNING("+sb+");"
-            ));
-        }
+  }
+
+  public void endScopedBlock() {
+    unindent();
+    pr("}");
+  }
+
+  /**
+   * If the specified port is a multiport, then start a specified iteration over the channels of the
+   * multiport using as the channel index the variable name returned by {@link
+   * CUtil#channelIndex(PortInstance)}. If the port is not a multiport, do nothing.
+   *
+   * @param port The port.
+   */
+  public void endChannelIteration(PortInstance port) {
+    if (port.isMultiport) {
+      unindent();
+      pr("}");
     }
-
-    public void endScopedBlock() {
-        unindent();
-        pr("}");
+  }
+
+  /**
+   * End a scoped block to iterate over bank members and channels for the specified port with a
+   * variable with the name given by count counting the iterations.
+   *
+   * @param port The port.
+   * @param count The variable name to use for the counter, or null to not provide a counter.
+   */
+  public void endScopedBankChannelIteration(PortInstance port, String count) {
+    if (count != null) {
+      pr(count + "++;");
     }
-
-    /**
-     * If the specified port is a multiport, then start a specified iteration
-     * over the channels of the multiport using as the channel index the
-     * variable name returned by {@link CUtil#channelIndex(PortInstance)}.
-     * If the port is not a multiport, do nothing.
-     * @param port The port.
-     */
-    public void endChannelIteration(PortInstance port) {
-        if (port.isMultiport) {
-            unindent();
-            pr("}");
-        }
+    endChannelIteration(port);
+    endScopedBlock();
+    if (count != null) {
+      endScopedBlock();
     }
-
-    /**
-     * End a scoped block to iterate over bank members and
-     * channels for the specified port with a variable with
-     * the name given by count counting the iterations.
-     * @param port The port.
-     * @param count The variable name to use for the counter, or
-     *  null to not provide a counter.
-     */
-    public void endScopedBankChannelIteration(
-        PortInstance port, String count
-    ) {
-        if (count != null) {
-            pr(count + "++;");
-        }
-        endChannelIteration(port);
-        endScopedBlock();
-        if (count != null) {
-            endScopedBlock();
-        }
+  }
+
+  /**
+   * End a scoped block for the specified range.
+   *
+   * @param range The send range.
+   */
+  public void endScopedRangeBlock(RuntimeRange<PortInstance> range) {
+    if (range.width > 1) {
+      pr("mixed_radix_incr(&range_mr);");
+      endScopedBlock(); // Terminate for loop.
     }
-
-    /**
-     * End a scoped block for the specified range.
-     * @param range The send range.
-     */
-    public void endScopedRangeBlock(
-        RuntimeRange<PortInstance> range
-    ) {
-        if (range.width > 1) {
-            pr("mixed_radix_incr(&range_mr);");
-            endScopedBlock(); // Terminate for loop.
-        }
-        endScopedBlock();
-    }
-
-    /**
-     * End a scoped block that iterates over the specified pair of ranges.
-     *
-     * @param srcRange The send range.
-     * @param dstRange The destination range.
-     */
-    public void endScopedRangeBlock(
-        SendRange srcRange,
-        RuntimeRange<PortInstance> dstRange
-    ) {
-        if (srcRange.width > 1) {
-            pr(String.join("\n",
-                "mixed_radix_incr(&src_range_mr);",
-                "if (mixed_radix_to_int(&src_range_mr) >= "+srcRange.start+" + "+srcRange.width+") {",
-                "    // Start over with the source.",
-                "    for (int i = 0; i < src_range_mr.size; i++) {",
-                "        src_range_mr.digits[i] = src_start[i];",
-                "    }",
-                "}"
-            ));
-        }
-        if (dstRange.width > 1) {
-            pr("mixed_radix_incr(&range_mr);");
-            endScopedBlock(); // Terminate for loop.
-        }
-        // Terminate unconditional scope block in startScopedRangeBlock calls.
-        endScopedBlock();
-        endScopedBlock();
+    endScopedBlock();
+  }
+
+  /**
+   * End a scoped block that iterates over the specified pair of ranges.
+   *
+   * @param srcRange The send range.
+   * @param dstRange The destination range.
+   */
+  public void endScopedRangeBlock(SendRange srcRange, RuntimeRange<PortInstance> dstRange) {
+    if (srcRange.width > 1) {
+      pr(
+          String.join(
+              "\n",
+              "mixed_radix_incr(&src_range_mr);",
+              "if (mixed_radix_to_int(&src_range_mr) >= "
+                  + srcRange.start
+                  + " + "
+                  + srcRange.width
+                  + ") {",
+              "    // Start over with the source.",
+              "    for (int i = 0; i < src_range_mr.size; i++) {",
+              "        src_range_mr.digits[i] = src_start[i];",
+              "    }",
+              "}"));
     }
-
-    /**
-     * Return the code as a string.
-     */
-    @Override
-    public String toString() {
-        return code.toString();
-    }
-
-    /**
-     * Reduce the indentation by one level for generated code/
-     */
-    public void unindent() {
-        indentation = indentation.substring(0, Math.max(0, indentation.length() - 4));
+    if (dstRange.width > 1) {
+      pr("mixed_radix_incr(&range_mr);");
+      endScopedBlock(); // Terminate for loop.
     }
-
-    /**
-     * Write the text to a file.
-     * @param path The file to write the code to.
-     */
-    public CodeMap writeToFile(String path) throws IOException {
-        CodeMap ret = CodeMap.fromGeneratedCode(code.toString());
-        FileUtil.writeToFile(ret.getGeneratedCode(), Path.of(path), true);
-        return ret;
-    }
-
-    ////////////////////////////////////////////
-    //// Private fields.
-
-    /** Place to store the code. */
-    private final StringBuilder code = new StringBuilder();
-
-    /** Current indentation. */
-    private String indentation = "";
+    // Terminate unconditional scope block in startScopedRangeBlock calls.
+    endScopedBlock();
+    endScopedBlock();
+  }
+
+  /** Return the code as a string. */
+  @Override
+  public String toString() {
+    return code.toString();
+  }
+
+  /** Reduce the indentation by one level for generated code/ */
+  public void unindent() {
+    indentation = indentation.substring(0, Math.max(0, indentation.length() - 4));
+  }
+
+  /**
+   * Write the text to a file.
+   *
+   * @param path The file to write the code to.
+   */
+  public CodeMap writeToFile(String path) throws IOException {
+    CodeMap ret = CodeMap.fromGeneratedCode(code.toString());
+    FileUtil.writeToFile(ret.getGeneratedCode(), Path.of(path), true);
+    return ret;
+  }
+
+  ////////////////////////////////////////////
+  //// Private fields.
+
+  /** Place to store the code. */
+  private final StringBuilder code = new StringBuilder();
+
+  /** Current indentation. */
+  private String indentation = "";
 }
diff --git a/org.lflang/src/org/lflang/generator/CodeMap.java b/org.lflang/src/org/lflang/generator/CodeMap.java
index d00fe9bc9a..9d196c7daa 100644
--- a/org.lflang/src/org/lflang/generator/CodeMap.java
+++ b/org.lflang/src/org/lflang/generator/CodeMap.java
@@ -1,348 +1,320 @@
 package org.lflang.generator;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.NavigableMap;
 import java.util.Set;
 import java.util.TreeMap;
-import java.util.HashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.nodemodel.INode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.util.LineAndColumn;
-
 import org.lflang.lf.ParameterReference;
-import org.lflang.lf.impl.ParameterReferenceImpl;
 
 /**
- * Encapsulates data about the correspondence between
- * ranges of generated code and ranges of a Lingua Franca
- * file.
+ * Encapsulates data about the correspondence between ranges of generated code and ranges of a
+ * Lingua Franca file.
  */
 public class CodeMap {
 
-    public static class Correspondence {
-        // This pattern has the markers "/* */", which some languages use as line comments. This does not
-        //  represent any serious effort to embed the string representation of this object in generated code
-        //  without introducing a syntax error. Instead, it is done simply because it is easy.
-        private static final Pattern PATTERN = Pattern.compile(String.format(
-            "/\\*Correspondence: (?<lfRange>%s) \\-> (?<generatedRange>%s) \\(verbatim=(?<verbatim>true|false); src=(?<path>%s)\\)\\*/",
-            Position.removeNamedCapturingGroups(Range.PATTERN),
-            Position.removeNamedCapturingGroups(Range.PATTERN),
-            ".*?"
-        ));
-
-        private final Path path;
-        private final Range lfRange;
-        private final Range generatedRange;
-        private final boolean verbatim;
-
-        /**
-         * Instantiates a Correspondence between
-         * {@code lfRange} at {@code path} and
-         * {@code generatedRange} in the generated file
-         * associated with this Correspondence.
-         * @param path a path to an LF source file
-         * @param lfRange a range in the given LF file
-         * @param generatedRange the range of generated code
-         *                       associated with
-         *                       {@code lfRange}
-         */
-        private Correspondence(Path path, Range lfRange, Range generatedRange, boolean verbatim) {
-            this.path = path;
-            this.lfRange = lfRange;
-            this.generatedRange = generatedRange;
-            this.verbatim = verbatim;
-        }
-
-        /**
-         * Returns a path to the LF source file described by
-         * this Correspondence.
-         * @return a path to the LF source file described by
-         * this Correspondence
-         */
-        public Path getPath() {
-            return path;
-        }
-
-        /**
-         * Returns a range in an LF source file.
-         * @return a range in an LF source file
-         */
-        public Range getLfRange() {
-            return lfRange;
-        }
+  public static class Correspondence {
+    // This pattern has the markers "/* */", which some languages use as line comments. This does
+    // not
+    //  represent any serious effort to embed the string representation of this object in generated
+    // code
+    //  without introducing a syntax error. Instead, it is done simply because it is easy.
+    private static final Pattern PATTERN =
+        Pattern.compile(
+            String.format(
+                "/\\*Correspondence: (?<lfRange>%s) \\-> (?<generatedRange>%s)"
+                    + " \\(verbatim=(?<verbatim>true|false); src=(?<path>%s)\\)\\*/",
+                Position.removeNamedCapturingGroups(Range.PATTERN),
+                Position.removeNamedCapturingGroups(Range.PATTERN),
+                ".*?"));
 
-        /**
-         * Returns a range in a generated file that
-         * corresponds to a range in an LF file.
-         * @return a range in a generated file that
-         * corresponds to a range in an LF file
-         */
-        public Range getGeneratedRange() {
-            return generatedRange;
-        }
+    private final Path path;
+    private final Range lfRange;
+    private final Range generatedRange;
+    private final boolean verbatim;
 
-        @Override
-        public String toString() {
-            return String.format(
-                "/*Correspondence: %s -> %s (verbatim=%b; src=%s)*/",
-                lfRange.toString(), generatedRange.toString(), verbatim, path.toString()
-            );
-        }
-
-        /**
-         * Returns the Correspondence represented by
-         * {@code s}.
-         * @param s a String that represents a
-         *          Correspondence, formatted like the
-         *          output of Correspondence::toString
-         * @param relativeTo the offset relative to which
-         *                   the offsets given are given
-         * @return the Correspondence represented by
-         * {@code s}
-         */
-        public static Correspondence fromString(String s, Position relativeTo) {
-            Matcher matcher = PATTERN.matcher(s);
-            if (matcher.matches()) {
-                Range lfRange = Range.fromString(matcher.group("lfRange"));
-                Range generatedRange = Range.fromString(matcher.group("generatedRange"), relativeTo);
-                return new Correspondence(
-                    Path.of(matcher.group("path")),
-                    lfRange,
-                    generatedRange,
-                    Boolean.parseBoolean(matcher.group("verbatim"))
-                );
-            }
-            throw new IllegalArgumentException(String.format("Could not parse %s as a Correspondence.", s));
-        }
-
-        /**
-         * Returns {@code representation}, tagged with
-         * a Correspondence to the source code associated
-         * with {@code astNode}.
-         * @param astNode an arbitrary AST node
-         * @param representation the code generated from
-         *                       that AST node
-         * @param verbatim whether {@code representation}
-         *                 is copied verbatim from the
-         *                 part of the source code
-         *                 associated with {@code astNode}
-         * @return {@code representation}, tagged with
-         * a Correspondence to the source code associated
-         * with {@code astNode}
-         */
-        public static String tag(EObject astNode, String representation, boolean verbatim) {
-            final INode node = NodeModelUtils.getNode(astNode);
-            // If the EObject originates from an AST transformation, then it does not correspond directly
-            // to any LF code, and it need not be tagged at all.
-            if (node == null) return representation;
-            final LineAndColumn oneBasedLfLineAndColumn = NodeModelUtils.getLineAndColumn(node, node.getTotalOffset());
-            Position lfStart = Position.fromOneBased(
-                oneBasedLfLineAndColumn.getLine(), oneBasedLfLineAndColumn.getColumn()
-            );
-            final URI uri = bestEffortGetEResource(astNode).getURI();
-            if (uri == null) {
-                // no EResource, no correspondence can be found
-                return representation;
-            }
-            final Path lfPath = Path.of(uri.isFile() ? uri.toFileString() : uri.path());
-            if (verbatim) lfStart = lfStart.plus(node.getText().substring(0, indexOf(node.getText(), representation)));
-            return new Correspondence(
-                lfPath,
-                new Range(lfStart, lfStart.plus(verbatim ? representation : node.getText())),
-                new Range(Position.ORIGIN, Position.displacementOf(representation)),
-                verbatim
-            ) + representation;
-        }
-
-        /**
-         * Return the {@code eResource} associated with the given AST node.
-         * This is a dangerous operation which can cause an unrecoverable error.
-         */
-        private static Resource bestEffortGetEResource(EObject astNode) {
-            if (astNode instanceof ParameterReference pri) {
-                return pri.getParameter().eResource();
-            }
-            return astNode.eResource();
-        }
-
-        /**
-         * Make a best-effort attempt to find the index of
-         * a near substring whose first line is expected to
-         * be an exact substring of {@code s}. Return 0
-         * upon failure.
-         * @param s an arbitrary string
-         * @param imperfectSubstring an approximate
-         *                           substring of {@code s}
-         * @return the index of {@code imperfectSubstring}
-         * within {@code s}
-         */
-        private static int indexOf(String s, String imperfectSubstring) {
-            String firstLine = imperfectSubstring.lines().findFirst().orElse("");
-            return Math.max(0, s.indexOf(firstLine));
-        }
+    /**
+     * Instantiates a Correspondence between {@code lfRange} at {@code path} and {@code
+     * generatedRange} in the generated file associated with this Correspondence.
+     *
+     * @param path a path to an LF source file
+     * @param lfRange a range in the given LF file
+     * @param generatedRange the range of generated code associated with {@code lfRange}
+     */
+    private Correspondence(Path path, Range lfRange, Range generatedRange, boolean verbatim) {
+      this.path = path;
+      this.lfRange = lfRange;
+      this.generatedRange = generatedRange;
+      this.verbatim = verbatim;
     }
 
     /**
-     * The content of the generated file represented by
-     * this.
+     * Returns a path to the LF source file described by this Correspondence.
+     *
+     * @return a path to the LF source file described by this Correspondence
      */
-    private final String generatedCode;
+    public Path getPath() {
+      return path;
+    }
+
     /**
-     * A mapping from Lingua Franca source paths to mappings
-     * from ranges in the generated file represented by this
-     * to ranges in Lingua Franca files.
+     * Returns a range in an LF source file.
+     *
+     * @return a range in an LF source file
      */
-    private final Map<Path, NavigableMap<Range, Range>> map;
+    public Range getLfRange() {
+      return lfRange;
+    }
+
     /**
-     * A mapping from Lingua Franca source paths to mappings
-     * from ranges in the generated file represented by this
-     * to whether those ranges are copied verbatim from the
-     * source.
+     * Returns a range in a generated file that corresponds to a range in an LF file.
+     *
+     * @return a range in a generated file that corresponds to a range in an LF file
      */
-    private final Map<Path, Map<Range, Boolean>> isVerbatimByLfSourceByRange;
+    public Range getGeneratedRange() {
+      return generatedRange;
+    }
 
-    /* ------------------------- PUBLIC METHODS -------------------------- */
+    @Override
+    public String toString() {
+      return String.format(
+          "/*Correspondence: %s -> %s (verbatim=%b; src=%s)*/",
+          lfRange.toString(), generatedRange.toString(), verbatim, path.toString());
+    }
 
     /**
-     * Instantiates a {@code CodeMap} from
-     * {@code internalGeneratedCode}.
-     * {@code internalGeneratedCode} may be invalid
-     * code that is different from the final generated code
-     * because it should contain deserializable
-     * representations of {@code Correspondences}.
-     * @param internalGeneratedCode code from a code
-     *                              generator that contains
-     *                              serialized
-     *                              Correspondences
-     * @return a CodeMap documenting the provided code
+     * Returns the Correspondence represented by {@code s}.
+     *
+     * @param s a String that represents a Correspondence, formatted like the output of
+     *     Correspondence::toString
+     * @param relativeTo the offset relative to which the offsets given are given
+     * @return the Correspondence represented by {@code s}
      */
-    public static CodeMap fromGeneratedCode(String internalGeneratedCode) {
-        Map<Path, NavigableMap<Range, Range>> map = new HashMap<>();
-        Map<Path, Map<Range, Boolean>> isVerbatimByLfSourceByRange = new HashMap<>();
-        StringBuilder generatedCode = new StringBuilder();
-        Iterator<String> it = internalGeneratedCode.lines().iterator();
-        int zeroBasedLine = 0;
-        while (it.hasNext()) {
-            generatedCode.append(processGeneratedLine(it.next(), zeroBasedLine++, map, isVerbatimByLfSourceByRange)).append('\n');
-        }
-        return new CodeMap(generatedCode.toString(), map, isVerbatimByLfSourceByRange);
+    public static Correspondence fromString(String s, Position relativeTo) {
+      Matcher matcher = PATTERN.matcher(s);
+      if (matcher.matches()) {
+        Range lfRange = Range.fromString(matcher.group("lfRange"));
+        Range generatedRange = Range.fromString(matcher.group("generatedRange"), relativeTo);
+        return new Correspondence(
+            Path.of(matcher.group("path")),
+            lfRange,
+            generatedRange,
+            Boolean.parseBoolean(matcher.group("verbatim")));
+      }
+      throw new IllegalArgumentException(
+          String.format("Could not parse %s as a Correspondence.", s));
     }
 
     /**
-     * Returns the generated code (without Correspondences).
-     * @return the generated code (without Correspondences)
+     * Returns {@code representation}, tagged with a Correspondence to the source code associated
+     * with {@code astNode}.
+     *
+     * @param astNode an arbitrary AST node
+     * @param representation the code generated from that AST node
+     * @param verbatim whether {@code representation} is copied verbatim from the part of the source
+     *     code associated with {@code astNode}
+     * @return {@code representation}, tagged with a Correspondence to the source code associated
+     *     with {@code astNode}
      */
-    public String getGeneratedCode() {
-        return generatedCode;
+    public static String tag(EObject astNode, String representation, boolean verbatim) {
+      final INode node = NodeModelUtils.getNode(astNode);
+      // If the EObject originates from an AST transformation, then it does not correspond directly
+      // to any LF code, and it need not be tagged at all.
+      if (node == null) return representation;
+      final LineAndColumn oneBasedLfLineAndColumn =
+          NodeModelUtils.getLineAndColumn(node, node.getTotalOffset());
+      Position lfStart =
+          Position.fromOneBased(
+              oneBasedLfLineAndColumn.getLine(), oneBasedLfLineAndColumn.getColumn());
+      final URI uri = bestEffortGetEResource(astNode).getURI();
+      if (uri == null) {
+        // no EResource, no correspondence can be found
+        return representation;
+      }
+      final Path lfPath = Path.of(uri.isFile() ? uri.toFileString() : uri.path());
+      if (verbatim)
+        lfStart =
+            lfStart.plus(node.getText().substring(0, indexOf(node.getText(), representation)));
+      return new Correspondence(
+              lfPath,
+              new Range(lfStart, lfStart.plus(verbatim ? representation : node.getText())),
+              new Range(Position.ORIGIN, Position.displacementOf(representation)),
+              verbatim)
+          + representation;
     }
 
     /**
-     * Returns the set of all paths to Lingua Franca files
-     * that are known to contain code that corresponds to
-     * code in the generated file represented by this.
+     * Return the {@code eResource} associated with the given AST node. This is a dangerous
+     * operation which can cause an unrecoverable error.
      */
-    public Set<Path> lfSourcePaths() {
-        return map.keySet();
+    private static Resource bestEffortGetEResource(EObject astNode) {
+      if (astNode instanceof ParameterReference pri) {
+        return pri.getParameter().eResource();
+      }
+      return astNode.eResource();
     }
 
     /**
-     * Returns the position in {@code lfFile}
-     * corresponding to {@code generatedFilePosition}
-     * if such a position is known, or the zero Position
-     * otherwise.
-     * @param lfFile the path to an arbitrary Lingua Franca
-     *               source file
-     * @param generatedFilePosition a position in a
-     *                              generated file
-     * @return the position in {@code lfFile}
-     * corresponding to {@code generatedFilePosition}
+     * Make a best-effort attempt to find the index of a near substring whose first line is expected
+     * to be an exact substring of {@code s}. Return 0 upon failure.
+     *
+     * @param s an arbitrary string
+     * @param imperfectSubstring an approximate substring of {@code s}
+     * @return the index of {@code imperfectSubstring} within {@code s}
      */
-    public Position adjusted(Path lfFile, Position generatedFilePosition) {
-        NavigableMap<Range, Range> mapOfInterest = map.get(lfFile);
-        Map<Range, Boolean> isVerbatimByRange = isVerbatimByLfSourceByRange.get(lfFile);
-        Map.Entry<Range, Range> nearestEntry = mapOfInterest.floorEntry(Range.degenerateRange(generatedFilePosition));
-        if (nearestEntry == null) return Position.ORIGIN;
-        if (!isVerbatimByRange.get(nearestEntry.getKey())) {
-            return nearestEntry.getValue().getStartInclusive();
-        }
-        if (nearestEntry.getKey().contains(generatedFilePosition)) {
-            return nearestEntry.getValue().getStartInclusive().plus(
-                generatedFilePosition.minus(nearestEntry.getKey().getStartInclusive())
-            );
-        }
-        return Position.ORIGIN;
+    private static int indexOf(String s, String imperfectSubstring) {
+      String firstLine = imperfectSubstring.lines().findFirst().orElse("");
+      return Math.max(0, s.indexOf(firstLine));
     }
+  }
 
-    /**
-     * Returns the range in {@code lfFile}
-     * corresponding to {@code generatedFileRange}
-     * if such a range is known, or a degenerate Range
-     * otherwise.
-     * @param lfFile the path to an arbitrary Lingua Franca
-     *               source file
-     * @param generatedFileRange a position in a
-     *                              generated file
-     * @return the range in {@code lfFile}
-     * corresponding to {@code generatedFileRange}
-     */
-    public Range adjusted(Path lfFile, Range generatedFileRange) {
-        final Position start = adjusted(lfFile, generatedFileRange.getStartInclusive());
-        final Position end = adjusted(lfFile, generatedFileRange.getEndExclusive());
-        return start.compareTo(end) <= 0 ? new Range(start, end) : new Range(start, start);
+  /** The content of the generated file represented by this. */
+  private final String generatedCode;
+  /**
+   * A mapping from Lingua Franca source paths to mappings from ranges in the generated file
+   * represented by this to ranges in Lingua Franca files.
+   */
+  private final Map<Path, NavigableMap<Range, Range>> map;
+  /**
+   * A mapping from Lingua Franca source paths to mappings from ranges in the generated file
+   * represented by this to whether those ranges are copied verbatim from the source.
+   */
+  private final Map<Path, Map<Range, Boolean>> isVerbatimByLfSourceByRange;
+
+  /* ------------------------- PUBLIC METHODS -------------------------- */
+
+  /**
+   * Instantiates a {@code CodeMap} from {@code internalGeneratedCode}. {@code
+   * internalGeneratedCode} may be invalid code that is different from the final generated code
+   * because it should contain deserializable representations of {@code Correspondences}.
+   *
+   * @param internalGeneratedCode code from a code generator that contains serialized
+   *     Correspondences
+   * @return a CodeMap documenting the provided code
+   */
+  public static CodeMap fromGeneratedCode(String internalGeneratedCode) {
+    Map<Path, NavigableMap<Range, Range>> map = new HashMap<>();
+    Map<Path, Map<Range, Boolean>> isVerbatimByLfSourceByRange = new HashMap<>();
+    StringBuilder generatedCode = new StringBuilder();
+    Iterator<String> it = internalGeneratedCode.lines().iterator();
+    int zeroBasedLine = 0;
+    while (it.hasNext()) {
+      generatedCode
+          .append(
+              processGeneratedLine(it.next(), zeroBasedLine++, map, isVerbatimByLfSourceByRange))
+          .append('\n');
     }
+    return new CodeMap(generatedCode.toString(), map, isVerbatimByLfSourceByRange);
+  }
 
-    /* ------------------------- PRIVATE METHODS ------------------------- */
+  /**
+   * Returns the generated code (without Correspondences).
+   *
+   * @return the generated code (without Correspondences)
+   */
+  public String getGeneratedCode() {
+    return generatedCode;
+  }
 
-    private CodeMap(
-        String generatedCode, Map<Path,
-        NavigableMap<Range, Range>> map,
-        Map<Path, Map<Range, Boolean>> isVerbatimByLfSourceByRange
-    ) {
-        this.generatedCode = generatedCode;
-        this.map = map;
-        this.isVerbatimByLfSourceByRange = isVerbatimByLfSourceByRange;
+  /**
+   * Returns the set of all paths to Lingua Franca files that are known to contain code that
+   * corresponds to code in the generated file represented by this.
+   */
+  public Set<Path> lfSourcePaths() {
+    return map.keySet();
+  }
+
+  /**
+   * Returns the position in {@code lfFile} corresponding to {@code generatedFilePosition} if such a
+   * position is known, or the zero Position otherwise.
+   *
+   * @param lfFile the path to an arbitrary Lingua Franca source file
+   * @param generatedFilePosition a position in a generated file
+   * @return the position in {@code lfFile} corresponding to {@code generatedFilePosition}
+   */
+  public Position adjusted(Path lfFile, Position generatedFilePosition) {
+    NavigableMap<Range, Range> mapOfInterest = map.get(lfFile);
+    Map<Range, Boolean> isVerbatimByRange = isVerbatimByLfSourceByRange.get(lfFile);
+    Map.Entry<Range, Range> nearestEntry =
+        mapOfInterest.floorEntry(Range.degenerateRange(generatedFilePosition));
+    if (nearestEntry == null) return Position.ORIGIN;
+    if (!isVerbatimByRange.get(nearestEntry.getKey())) {
+      return nearestEntry.getValue().getStartInclusive();
+    }
+    if (nearestEntry.getKey().contains(generatedFilePosition)) {
+      return nearestEntry
+          .getValue()
+          .getStartInclusive()
+          .plus(generatedFilePosition.minus(nearestEntry.getKey().getStartInclusive()));
     }
+    return Position.ORIGIN;
+  }
 
-    /**
-     * Removes serialized Correspondences from {@code line}
-     * and updates {@code map} according to those
-     * Correspondences.
-     * @param line a line of generated code
-     * @param zeroBasedLineIndex the index of the given line
-     * @param map a map that stores Correspondences
-     * @return the line of generated code with all
-     * Correspondences removed
-     */
-    private static String processGeneratedLine(
-        String line,
-        int zeroBasedLineIndex,
-        Map<Path, NavigableMap<Range, Range>> map,
-        Map<Path, Map<Range, Boolean>> isVerbatimByLfSourceByRange
-    ) {
-        Matcher matcher = Correspondence.PATTERN.matcher(line);
-        StringBuilder cleanedLine = new StringBuilder();
-        int lastEnd = 0;
-        while (matcher.find()) {
-            cleanedLine.append(line, lastEnd, matcher.start());
-            Correspondence c = Correspondence.fromString(
-                matcher.group(),
-                Position.fromZeroBased(zeroBasedLineIndex, cleanedLine.length())
-            );
-            if (!map.containsKey(c.path)) map.put(c.path, new TreeMap<>());
-            map.get(c.path).put(c.generatedRange, c.lfRange);
-            if (!isVerbatimByLfSourceByRange.containsKey(c.path)) isVerbatimByLfSourceByRange.put(c.path, new HashMap<>());
-            isVerbatimByLfSourceByRange.get(c.path).put(c.generatedRange, c.verbatim);
-            lastEnd = matcher.end();
-        }
-        cleanedLine.append(line.substring(lastEnd));
-        return cleanedLine.toString();
+  /**
+   * Returns the range in {@code lfFile} corresponding to {@code generatedFileRange} if such a range
+   * is known, or a degenerate Range otherwise.
+   *
+   * @param lfFile the path to an arbitrary Lingua Franca source file
+   * @param generatedFileRange a position in a generated file
+   * @return the range in {@code lfFile} corresponding to {@code generatedFileRange}
+   */
+  public Range adjusted(Path lfFile, Range generatedFileRange) {
+    final Position start = adjusted(lfFile, generatedFileRange.getStartInclusive());
+    final Position end = adjusted(lfFile, generatedFileRange.getEndExclusive());
+    return start.compareTo(end) <= 0 ? new Range(start, end) : new Range(start, start);
+  }
+
+  /* ------------------------- PRIVATE METHODS ------------------------- */
+
+  private CodeMap(
+      String generatedCode,
+      Map<Path, NavigableMap<Range, Range>> map,
+      Map<Path, Map<Range, Boolean>> isVerbatimByLfSourceByRange) {
+    this.generatedCode = generatedCode;
+    this.map = map;
+    this.isVerbatimByLfSourceByRange = isVerbatimByLfSourceByRange;
+  }
+
+  /**
+   * Removes serialized Correspondences from {@code line} and updates {@code map} according to those
+   * Correspondences.
+   *
+   * @param line a line of generated code
+   * @param zeroBasedLineIndex the index of the given line
+   * @param map a map that stores Correspondences
+   * @return the line of generated code with all Correspondences removed
+   */
+  private static String processGeneratedLine(
+      String line,
+      int zeroBasedLineIndex,
+      Map<Path, NavigableMap<Range, Range>> map,
+      Map<Path, Map<Range, Boolean>> isVerbatimByLfSourceByRange) {
+    Matcher matcher = Correspondence.PATTERN.matcher(line);
+    StringBuilder cleanedLine = new StringBuilder();
+    int lastEnd = 0;
+    while (matcher.find()) {
+      cleanedLine.append(line, lastEnd, matcher.start());
+      Correspondence c =
+          Correspondence.fromString(
+              matcher.group(), Position.fromZeroBased(zeroBasedLineIndex, cleanedLine.length()));
+      if (!map.containsKey(c.path)) map.put(c.path, new TreeMap<>());
+      map.get(c.path).put(c.generatedRange, c.lfRange);
+      if (!isVerbatimByLfSourceByRange.containsKey(c.path))
+        isVerbatimByLfSourceByRange.put(c.path, new HashMap<>());
+      isVerbatimByLfSourceByRange.get(c.path).put(c.generatedRange, c.verbatim);
+      lastEnd = matcher.end();
     }
+    cleanedLine.append(line.substring(lastEnd));
+    return cleanedLine.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/DeadlineInstance.java b/org.lflang/src/org/lflang/generator/DeadlineInstance.java
index 208c116791..e73f6b8f9b 100644
--- a/org.lflang/src/org/lflang/generator/DeadlineInstance.java
+++ b/org.lflang/src/org/lflang/generator/DeadlineInstance.java
@@ -1,29 +1,29 @@
 /** A data structure for a deadline instance. */
 
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
@@ -31,41 +31,37 @@
 import org.lflang.lf.Deadline;
 
 /**
- * Instance of a deadline. Upon creation the actual delay is converted into
- * a proper time value. If a parameter is referenced, it is looked up in the
- * given (grand)parent reactor instance.
- * 
+ * Instance of a deadline. Upon creation the actual delay is converted into a proper time value. If
+ * a parameter is referenced, it is looked up in the given (grand)parent reactor instance.
+ *
  * @author Marten Lohstroh
  * @author Edward A. Lee
  */
 public class DeadlineInstance {
-		
-	/**
-	 * Create a new deadline instance associated with the given reaction
-	 * instance.
-	 */
-	public DeadlineInstance(Deadline definition, ReactionInstance reaction) {
-        if (definition.getDelay() != null) {
-            this.maxDelay = reaction.parent.getTimeValue(definition.getDelay());
-        } else {
-            this.maxDelay = TimeValue.ZERO;
-        }
+
+  /** Create a new deadline instance associated with the given reaction instance. */
+  public DeadlineInstance(Deadline definition, ReactionInstance reaction) {
+    if (definition.getDelay() != null) {
+      this.maxDelay = reaction.parent.getTimeValue(definition.getDelay());
+    } else {
+      this.maxDelay = TimeValue.ZERO;
     }
+  }
 
-    //////////////////////////////////////////////////////
-    //// Public fields.
+  //////////////////////////////////////////////////////
+  //// Public fields.
 
-    /**
-     * The delay D associated with this deadline. If physical time T < logical
-     * time t + D, the deadline is met, otherwise, it is violated.
-     */
-    public final TimeValue maxDelay;
+  /**
+   * The delay D associated with this deadline. If physical time T < logical time t + D, the
+   * deadline is met, otherwise, it is violated.
+   */
+  public final TimeValue maxDelay;
 
-    //////////////////////////////////////////////////////
-    //// Public methods.
-	
-    @Override
-    public String toString() {
-        return "DeadlineInstance " + maxDelay.toString();
-    }
+  //////////////////////////////////////////////////////
+  //// Public methods.
+
+  @Override
+  public String toString() {
+    return "DeadlineInstance " + maxDelay.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/DelayBodyGenerator.java b/org.lflang/src/org/lflang/generator/DelayBodyGenerator.java
index 39742a3488..240eba7bc1 100644
--- a/org.lflang/src/org/lflang/generator/DelayBodyGenerator.java
+++ b/org.lflang/src/org/lflang/generator/DelayBodyGenerator.java
@@ -6,54 +6,47 @@
 
 public interface DelayBodyGenerator {
 
-    /**
-     * Constant that specifies how to name generated delay reactors.
-     */
-    String GEN_DELAY_CLASS_NAME = "_lf_GenDelay";
-
-    /**
-     * Generate code for the body of a reaction that takes an input and
-     * schedules an action with the value of that input.
-     *
-     * @param action the action to schedule
-     * @param port the port to read from
-     */
-    String generateDelayBody(Action action, VarRef port);
-
-    /**
-     * Generate code for the body of a reaction that is triggered by the
-     * given action and writes its value to the given port.
-     *
-     * @param action the action that triggers the reaction
-     * @param port the port to write to
-     */
-    String generateForwardBody(Action action, VarRef port);
-
-    /**
-     * Generate code for the generic type to be used in the class definition
-     * of a generated delay reactor.
-     */
-    String generateDelayGeneric();
-
-    /**
-     * Indicates whether delay banks generated from after delays should have a variable length
-     * width.
-     * <p>
-     * If this is true, any delay reactors that are inserted for after delays on multiport
-     * connections
-     * will have an unspecified variable length width. The code generator is then responsible for
-     * inferring the
-     * correct width of the delay bank, which is only possible if the precise connection width is
-     * known at compile time.
-     * <p>
-     * If this is false, the width specification of the generated bank will list all the ports
-     * listed on the right
-     * side of the connection. This gives the code generator the information needed to infer the
-     * correct width at
-     * runtime.
-     */
-    boolean generateAfterDelaysWithVariableWidth();
-
-    /** Used to optionally apply additional transformations to the generated reactions */
-    default void finalizeReactions(Reaction delayReaction, Reaction forwardReaction) { }
+  /** Constant that specifies how to name generated delay reactors. */
+  String GEN_DELAY_CLASS_NAME = "_lf_GenDelay";
+
+  /**
+   * Generate code for the body of a reaction that takes an input and schedules an action with the
+   * value of that input.
+   *
+   * @param action the action to schedule
+   * @param port the port to read from
+   */
+  String generateDelayBody(Action action, VarRef port);
+
+  /**
+   * Generate code for the body of a reaction that is triggered by the given action and writes its
+   * value to the given port.
+   *
+   * @param action the action that triggers the reaction
+   * @param port the port to write to
+   */
+  String generateForwardBody(Action action, VarRef port);
+
+  /**
+   * Generate code for the generic type to be used in the class definition of a generated delay
+   * reactor.
+   */
+  String generateDelayGeneric();
+
+  /**
+   * Indicates whether delay banks generated from after delays should have a variable length width.
+   *
+   * <p>If this is true, any delay reactors that are inserted for after delays on multiport
+   * connections will have an unspecified variable length width. The code generator is then
+   * responsible for inferring the correct width of the delay bank, which is only possible if the
+   * precise connection width is known at compile time.
+   *
+   * <p>If this is false, the width specification of the generated bank will list all the ports
+   * listed on the right side of the connection. This gives the code generator the information
+   * needed to infer the correct width at runtime.
+   */
+  boolean generateAfterDelaysWithVariableWidth();
+
+  /** Used to optionally apply additional transformations to the generated reactions */
+  default void finalizeReactions(Reaction delayReaction, Reaction forwardReaction) {}
 }
diff --git a/org.lflang/src/org/lflang/generator/DiagnosticReporting.java b/org.lflang/src/org/lflang/generator/DiagnosticReporting.java
index 82d3535444..871f417a0d 100644
--- a/org.lflang/src/org/lflang/generator/DiagnosticReporting.java
+++ b/org.lflang/src/org/lflang/generator/DiagnosticReporting.java
@@ -2,59 +2,62 @@
 
 import java.nio.file.Path;
 import java.util.Map;
-
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.ErrorReporter;
 
 /**
- * {@code DiagnosticReporting} provides utilities for
- * reporting validation output.
+ * {@code DiagnosticReporting} provides utilities for reporting validation output.
  *
  * @author Peter Donovan
  */
 public class DiagnosticReporting {
 
-    private DiagnosticReporting() {
-        // utility class
-    }
-
-    /**
-     * A means of parsing the output of a validator.
-     */
-    @FunctionalInterface public interface Strategy {
-        /**
-         * Parse the validation output and report any errors
-         * that it contains.
-         * @param validationOutput any validation output
-         * @param errorReporter any error reporter
-         * @param map the map from generated files to CodeMaps
-         */
-        void report(String validationOutput, ErrorReporter errorReporter, Map<Path, CodeMap> map);
-    }
-
-    /**
-     * Format the given data as a human-readable message.
-     * @param message An error message.
-     * @param path The path of the source of the message.
-     * @param position The position where the message originates.
-     * @return The given data as a human-readable message.
-     */
-    public static String messageOf(String message, Path path, Position position) {
-        return String.format("%s [%s:%s:%s]", message, path.getFileName().toString(), position.getOneBasedLine(), position.getOneBasedColumn());
-    }
+  private DiagnosticReporting() {
+    // utility class
+  }
 
+  /** A means of parsing the output of a validator. */
+  @FunctionalInterface
+  public interface Strategy {
     /**
-     * Convert {@code severity} into a {@code DiagnosticSeverity} using a heuristic that should be
-     * compatible with many tools.
-     * @param severity The string representation of a diagnostic severity.
-     * @return The {@code DiagnosticSeverity} representation of {@code severity}.
+     * Parse the validation output and report any errors that it contains.
+     *
+     * @param validationOutput any validation output
+     * @param errorReporter any error reporter
+     * @param map the map from generated files to CodeMaps
      */
-    public static DiagnosticSeverity severityOf(String severity) {
-        severity = severity.toLowerCase();
-        if (severity.contains("error")) return DiagnosticSeverity.Error;
-        else if (severity.contains("warning")) return DiagnosticSeverity.Warning;
-        else if (severity.contains("hint") || severity.contains("help")) return DiagnosticSeverity.Hint;
-        else return DiagnosticSeverity.Information;
-    }
+    void report(String validationOutput, ErrorReporter errorReporter, Map<Path, CodeMap> map);
+  }
+
+  /**
+   * Format the given data as a human-readable message.
+   *
+   * @param message An error message.
+   * @param path The path of the source of the message.
+   * @param position The position where the message originates.
+   * @return The given data as a human-readable message.
+   */
+  public static String messageOf(String message, Path path, Position position) {
+    return String.format(
+        "%s [%s:%s:%s]",
+        message,
+        path.getFileName().toString(),
+        position.getOneBasedLine(),
+        position.getOneBasedColumn());
+  }
+
+  /**
+   * Convert {@code severity} into a {@code DiagnosticSeverity} using a heuristic that should be
+   * compatible with many tools.
+   *
+   * @param severity The string representation of a diagnostic severity.
+   * @return The {@code DiagnosticSeverity} representation of {@code severity}.
+   */
+  public static DiagnosticSeverity severityOf(String severity) {
+    severity = severity.toLowerCase();
+    if (severity.contains("error")) return DiagnosticSeverity.Error;
+    else if (severity.contains("warning")) return DiagnosticSeverity.Warning;
+    else if (severity.contains("hint") || severity.contains("help")) return DiagnosticSeverity.Hint;
+    else return DiagnosticSeverity.Information;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/DockerComposeGenerator.java b/org.lflang/src/org/lflang/generator/DockerComposeGenerator.java
index 040d925614..a3e5028317 100644
--- a/org.lflang/src/org/lflang/generator/DockerComposeGenerator.java
+++ b/org.lflang/src/org/lflang/generator/DockerComposeGenerator.java
@@ -4,7 +4,6 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.lflang.util.FileUtil;
 
 /**
@@ -15,109 +14,104 @@
  */
 public class DockerComposeGenerator {
 
-    /**
-     * Path to the docker-compose.yml file.
-     */
-    protected final Path path;
+  /** Path to the docker-compose.yml file. */
+  protected final Path path;
 
-    public DockerComposeGenerator(LFGeneratorContext context) {
-        this.path = context.getFileConfig().getSrcGenPath().resolve("docker-compose.yml");
-    }
+  public DockerComposeGenerator(LFGeneratorContext context) {
+    this.path = context.getFileConfig().getSrcGenPath().resolve("docker-compose.yml");
+  }
 
-    /**
-     * Return a string that represents the network portion of the docker-compose configuration.
-     * @param networkName Name of the default network
-     */
-    protected String generateDockerNetwork(String networkName) {
-        return """
+  /**
+   * Return a string that represents the network portion of the docker-compose configuration.
+   *
+   * @param networkName Name of the default network
+   */
+  protected String generateDockerNetwork(String networkName) {
+    return """
             networks:
                 default:
                     name: "%s"
-            """.formatted(networkName);
-    }
+            """
+        .formatted(networkName);
+  }
 
-    /**
-     * Return a string that represents the services portion of the docker-compose configuration.
-     * @param services A list of docker data representing the services to render
-     */
-    protected String generateDockerServices(List<DockerData> services) {
-        return """
-            version: "3.9" 
+  /**
+   * Return a string that represents the services portion of the docker-compose configuration.
+   *
+   * @param services A list of docker data representing the services to render
+   */
+  protected String generateDockerServices(List<DockerData> services) {
+    return """
+            version: "3.9"
             services:
             %s
-            """.formatted(services.stream().map(
-                data -> getServiceDescription(data)
-            ).collect(Collectors.joining("\n")));
-    }
+            """
+        .formatted(
+            services.stream()
+                .map(data -> getServiceDescription(data))
+                .collect(Collectors.joining("\n")));
+  }
 
-    /**
-     * Return the command to build and run using the docker-compose configuration.
-     */
-    public String getUsageInstructions() {
-        return """
+  /** Return the command to build and run using the docker-compose configuration. */
+  public String getUsageInstructions() {
+    return """
             #####################################
             To build and run:
                 pushd %s && docker compose up --build
             To return to the current working directory afterwards:
                 popd
             #####################################
-            """.formatted(path.getParent());
-    }
+            """
+        .formatted(path.getParent());
+  }
 
-    /**
-     * Turn given docker data into a string.
-     */
-    protected String getServiceDescription(DockerData data) {
-        return """
+  /** Turn given docker data into a string. */
+  protected String getServiceDescription(DockerData data) {
+    return """
                 %s:
                     build:
                         context: "%s"
                     container_name: "%s"
-            """.formatted(getServiceName(data), getBuildContext(data), getContainerName(data));
-    }
+            """
+        .formatted(getServiceName(data), getBuildContext(data), getContainerName(data));
+  }
 
-    /**
-     * Return the name of the service represented by the given data.
-     */
-    protected String getServiceName(DockerData data) {
-        return "main";
-    }
+  /** Return the name of the service represented by the given data. */
+  protected String getServiceName(DockerData data) {
+    return "main";
+  }
 
-    /**
-     * Return the name of the service represented by the given data.
-     */
-    protected String getBuildContext(DockerData data) {
-        return ".";
-    }
+  /** Return the name of the service represented by the given data. */
+  protected String getBuildContext(DockerData data) {
+    return ".";
+  }
 
-    /**
-     * Return the name of the container for the given data.
-     */
-    protected String getContainerName(DockerData data) {
-        return data.serviceName;
-    }
+  /** Return the name of the container for the given data. */
+  protected String getContainerName(DockerData data) {
+    return data.serviceName;
+  }
 
-    /**
-     * Write the docker-compose.yml file with a default network called "lf".
-     * @param services A list of all the services.
-     */
-    public void writeDockerComposeFile(List<DockerData> services) throws IOException {
-        writeDockerComposeFile(services, "lf");
-    }
+  /**
+   * Write the docker-compose.yml file with a default network called "lf".
+   *
+   * @param services A list of all the services.
+   */
+  public void writeDockerComposeFile(List<DockerData> services) throws IOException {
+    writeDockerComposeFile(services, "lf");
+  }
 
-    /**
-     * Write the docker-compose.yml file.
-     * @param services A list of all the services to include.
-     * @param networkName The name of the network to which docker will connect the services.
-     */
-    public void writeDockerComposeFile(
-        List<DockerData> services,
-        String networkName
-    ) throws IOException {
-        var contents = String.join("\n",
-            this.generateDockerServices(services),
-            this.generateDockerNetwork(networkName));
-        FileUtil.writeToFile(contents, path);
-        System.out.println(getUsageInstructions());
-    }
+  /**
+   * Write the docker-compose.yml file.
+   *
+   * @param services A list of all the services to include.
+   * @param networkName The name of the network to which docker will connect the services.
+   */
+  public void writeDockerComposeFile(List<DockerData> services, String networkName)
+      throws IOException {
+    var contents =
+        String.join(
+            "\n", this.generateDockerServices(services), this.generateDockerNetwork(networkName));
+    FileUtil.writeToFile(contents, path);
+    System.out.println(getUsageInstructions());
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/DockerData.java b/org.lflang/src/org/lflang/generator/DockerData.java
index a2b1927125..af29e9e1d5 100644
--- a/org.lflang/src/org/lflang/generator/DockerData.java
+++ b/org.lflang/src/org/lflang/generator/DockerData.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
-
 import org.lflang.util.FileUtil;
 
 /**
@@ -11,43 +10,31 @@
  * @author Marten Lohstroh
  */
 public class DockerData {
-    /**
-     * The absolute path to the docker file.
-     */
-    private final Path dockerFilePath;
+  /** The absolute path to the docker file. */
+  private final Path dockerFilePath;
 
-    /**
-     * The content of the docker file to be generated.
-     */
-    private final String dockerFileContent;
+  /** The content of the docker file to be generated. */
+  private final String dockerFileContent;
 
-    /**
-     * The name of the service.
-     */
-    public final String serviceName;
+  /** The name of the service. */
+  public final String serviceName;
 
-    public DockerData(
-        String serviceName,
-        Path dockerFilePath,
-        String dockerFileContent
-    ) {
+  public DockerData(String serviceName, Path dockerFilePath, String dockerFileContent) {
 
-        if (!dockerFilePath.toFile().isAbsolute()) {
-            throw new RuntimeException("Cannot use relative docker file path in DockerData instance");
-        }
-        this.serviceName = serviceName;
-        this.dockerFilePath = dockerFilePath;
-        this.dockerFileContent = dockerFileContent;
+    if (!dockerFilePath.toFile().isAbsolute()) {
+      throw new RuntimeException("Cannot use relative docker file path in DockerData instance");
     }
-
-    /**
-     * Write a docker file based on this data.
-     */
-    public void writeDockerFile() throws IOException {
-        if (dockerFilePath.toFile().exists()) {
-            dockerFilePath.toFile().delete();
-        }
-        FileUtil.writeToFile(dockerFileContent, dockerFilePath);
-        System.out.println("Dockerfile written to " + dockerFilePath);
+    this.serviceName = serviceName;
+    this.dockerFilePath = dockerFilePath;
+    this.dockerFileContent = dockerFileContent;
+  }
+
+  /** Write a docker file based on this data. */
+  public void writeDockerFile() throws IOException {
+    if (dockerFilePath.toFile().exists()) {
+      dockerFilePath.toFile().delete();
     }
+    FileUtil.writeToFile(dockerFileContent, dockerFilePath);
+    System.out.println("Dockerfile written to " + dockerFilePath);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/DockerGenerator.java b/org.lflang/src/org/lflang/generator/DockerGenerator.java
index 851ee6c0be..cf6044f14f 100644
--- a/org.lflang/src/org/lflang/generator/DockerGenerator.java
+++ b/org.lflang/src/org/lflang/generator/DockerGenerator.java
@@ -4,7 +4,6 @@
 import org.lflang.generator.python.PythonDockerGenerator;
 import org.lflang.generator.ts.TSDockerGenerator;
 
-
 /**
  * A class for generating docker files.
  *
@@ -13,46 +12,43 @@
  */
 public abstract class DockerGenerator {
 
-    /**
-     * Configuration for interactions with the filesystem.
-     */
-     protected final LFGeneratorContext context;
-
-    /**
-     * The constructor for the base docker file generation class.
-     * @param context The context of the code generator.
-     */
-    public DockerGenerator(LFGeneratorContext context) {
-        this.context = context;
-
-    }
-
-    /**
-     * Generate the contents of a Dockerfile.
-     */
-     protected abstract String generateDockerFileContent();
-
-    /**
-     * Produce a DockerData object.
-     * If the returned object is to be used in a federated context,
-     * pass in the file configuration of the federated generator, null otherwise.
-     * @return docker data created based on the context in this instance
-     */
-    public DockerData generateDockerData() {
-        var name = context.getFileConfig().name;
-        var dockerFilePath = context.getFileConfig().getSrcGenPath().resolve("Dockerfile");
-        var dockerFileContent = generateDockerFileContent();
-
-        return new DockerData(name.replace("_", ""), dockerFilePath, dockerFileContent);
-    }
-
-    public static DockerGenerator dockerGeneratorFactory(LFGeneratorContext context) {
-        var target = context.getTargetConfig().target;
-        return switch (target) {
-            case C, CCPP -> new CDockerGenerator(context);
-            case TS -> new TSDockerGenerator(context);
-            case Python -> new PythonDockerGenerator(context);
-            case CPP, Rust -> throw new IllegalArgumentException("No Docker support for " + target + " yet.");
-        };
-    }
+  /** Configuration for interactions with the filesystem. */
+  protected final LFGeneratorContext context;
+
+  /**
+   * The constructor for the base docker file generation class.
+   *
+   * @param context The context of the code generator.
+   */
+  public DockerGenerator(LFGeneratorContext context) {
+    this.context = context;
+  }
+
+  /** Generate the contents of a Dockerfile. */
+  protected abstract String generateDockerFileContent();
+
+  /**
+   * Produce a DockerData object. If the returned object is to be used in a federated context, pass
+   * in the file configuration of the federated generator, null otherwise.
+   *
+   * @return docker data created based on the context in this instance
+   */
+  public DockerData generateDockerData() {
+    var name = context.getFileConfig().name;
+    var dockerFilePath = context.getFileConfig().getSrcGenPath().resolve("Dockerfile");
+    var dockerFileContent = generateDockerFileContent();
+
+    return new DockerData(name.replace("_", ""), dockerFilePath, dockerFileContent);
+  }
+
+  public static DockerGenerator dockerGeneratorFactory(LFGeneratorContext context) {
+    var target = context.getTargetConfig().target;
+    return switch (target) {
+      case C, CCPP -> new CDockerGenerator(context);
+      case TS -> new TSDockerGenerator(context);
+      case Python -> new PythonDockerGenerator(context);
+      case CPP, Rust -> throw new IllegalArgumentException(
+          "No Docker support for " + target + " yet.");
+    };
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/EnclaveInfo.java b/org.lflang/src/org/lflang/generator/EnclaveInfo.java
index d704ad8312..ba249bfe44 100644
--- a/org.lflang/src/org/lflang/generator/EnclaveInfo.java
+++ b/org.lflang/src/org/lflang/generator/EnclaveInfo.java
@@ -1,16 +1,16 @@
 package org.lflang.generator;
 
 public class EnclaveInfo {
-    public int numIsPresentFields = 0;
-    public int numStartupReactions = 0;
-    public int numShutdownReactions = 0;
-    public int numTimerTriggers = 0;
-    public int numResetReactions = 0;
-    public int numWorkers = 1;
+  public int numIsPresentFields = 0;
+  public int numStartupReactions = 0;
+  public int numShutdownReactions = 0;
+  public int numTimerTriggers = 0;
+  public int numResetReactions = 0;
+  public int numWorkers = 1;
 
-    private ReactorInstance instance;
+  private ReactorInstance instance;
 
-    public EnclaveInfo(ReactorInstance inst) {
-        instance = inst;
-    }
+  public EnclaveInfo(ReactorInstance inst) {
+    instance = inst;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/FedDockerComposeGenerator.java b/org.lflang/src/org/lflang/generator/FedDockerComposeGenerator.java
index d666abba2d..18896f03a0 100644
--- a/org.lflang/src/org/lflang/generator/FedDockerComposeGenerator.java
+++ b/org.lflang/src/org/lflang/generator/FedDockerComposeGenerator.java
@@ -1,6 +1,5 @@
 package org.lflang.generator;
 
-
 import java.util.List;
 
 /**
@@ -10,57 +9,55 @@
  */
 public class FedDockerComposeGenerator extends DockerComposeGenerator {
 
-    /**
-     * The host on which to run the rti.
-     */
-    private String rtiHost;
+  /** The host on which to run the rti. */
+  private String rtiHost;
 
-    /**
-     * The name of this federation.
-     */
-    private String containerName;
+  /** The name of this federation. */
+  private String containerName;
 
-    public FedDockerComposeGenerator(LFGeneratorContext context, String rtiHost) {
-        super(context);
-        this.rtiHost = rtiHost;
-        this.containerName = context.getFileConfig().name;
-    }
+  public FedDockerComposeGenerator(LFGeneratorContext context, String rtiHost) {
+    super(context);
+    this.rtiHost = rtiHost;
+    this.containerName = context.getFileConfig().name;
+  }
 
-    @Override
-    protected String generateDockerServices(List<DockerData> services) {
-        return """
+  @Override
+  protected String generateDockerServices(List<DockerData> services) {
+    return """
             %s\
                 rti:
                     image: "lflang/rti:rti"
                     hostname: "%s"
                     command: "-i 1 -n %s"
                     container_name: "%s-rti"
-            """.formatted(super.generateDockerServices(services),
-                this.rtiHost, services.size(), containerName);
-    }
-
-    @Override
-    protected String getServiceDescription(DockerData data) {
-        return """
+            """
+        .formatted(
+            super.generateDockerServices(services), this.rtiHost, services.size(), containerName);
+  }
+
+  @Override
+  protected String getServiceDescription(DockerData data) {
+    return """
             %s\
                     command: "-i 1"
                     depends_on:
                         - rti
-            """.formatted(super.getServiceDescription(data));
-    }
-
-    @Override
-    protected String getServiceName(DockerData data) {
-        return data.serviceName;
-    }
-
-    @Override
-    protected String getBuildContext(DockerData data) {
-        return data.serviceName;
-    }
-
-    @Override
-    protected String getContainerName(DockerData data) {
-        return this.containerName + "-" + data.serviceName;
-    }
+            """
+        .formatted(super.getServiceDescription(data));
+  }
+
+  @Override
+  protected String getServiceName(DockerData data) {
+    return data.serviceName;
+  }
+
+  @Override
+  protected String getBuildContext(DockerData data) {
+    return data.serviceName;
+  }
+
+  @Override
+  protected String getContainerName(DockerData data) {
+    return this.containerName + "-" + data.serviceName;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/GenerationException.java b/org.lflang/src/org/lflang/generator/GenerationException.java
index 1920e9aca8..1bc7985ee7 100644
--- a/org.lflang/src/org/lflang/generator/GenerationException.java
+++ b/org.lflang/src/org/lflang/generator/GenerationException.java
@@ -27,40 +27,36 @@
 import org.eclipse.emf.ecore.EObject;
 // import org.jetbrains.annotations.Nullable;
 
-/**
- * An exception that occurred during code generation. May also
- * wrap another exception.
- */
-public class GenerationException extends RuntimeException { // note that this is an unchecked exception.
-
-    /* @Nullable */
-    private final EObject location;
-
-    public GenerationException(String message) {
-        this(null, message, null);
-    }
-
-    public GenerationException(/* @Nullable */ EObject location, String message) {
-        this(location, message, null);
-    }
-
-    public GenerationException(String message, Throwable cause) {
-        this(null, message, cause);
-
-    }
-
-    public GenerationException(/* @Nullable */ EObject location, String message, Throwable cause) {
-        super(message, cause);
-        this.location = location;
-    }
-
-    public GenerationException(Throwable cause) {
-        this(null, null, cause);
-    }
-
-    /* @Nullable */
-    public EObject getLocation() {
-        return location;
-    }
+/** An exception that occurred during code generation. May also wrap another exception. */
+public class GenerationException
+    extends RuntimeException { // note that this is an unchecked exception.
+
+  /* @Nullable */
+  private final EObject location;
+
+  public GenerationException(String message) {
+    this(null, message, null);
+  }
+
+  public GenerationException(/* @Nullable */ EObject location, String message) {
+    this(location, message, null);
+  }
+
+  public GenerationException(String message, Throwable cause) {
+    this(null, message, cause);
+  }
+
+  public GenerationException(/* @Nullable */ EObject location, String message, Throwable cause) {
+    super(message, cause);
+    this.location = location;
+  }
+
+  public GenerationException(Throwable cause) {
+    this(null, null, cause);
+  }
+
+  /* @Nullable */
+  public EObject getLocation() {
+    return location;
+  }
 }
-
diff --git a/org.lflang/src/org/lflang/generator/GeneratorBase.java b/org.lflang/src/org/lflang/generator/GeneratorBase.java
index 8d57e4c522..c8ebbc38a2 100644
--- a/org.lflang/src/org/lflang/generator/GeneratorBase.java
+++ b/org.lflang/src/org/lflang/generator/GeneratorBase.java
@@ -24,47 +24,42 @@
  ***************/
 package org.lflang.generator;
 
+import com.google.common.base.Objects;
+import com.google.common.collect.Iterables;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.LinkedHashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.MainConflictChecker;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
+import org.lflang.ast.ASTUtils;
 import org.lflang.ast.AstTransformation;
 import org.lflang.graph.InstantiationGraph;
 import org.lflang.lf.Connection;
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.Mode;
-
 import org.lflang.lf.Reaction;
 import org.lflang.lf.Reactor;
 import org.lflang.util.FileUtil;
 import org.lflang.validation.AbstractLFValidator;
 
-import com.google.common.base.Objects;
-import com.google.common.collect.Iterables;
-
 /**
- * Generator base class for specifying core functionality
- * that all code generators should have.
+ * Generator base class for specifying core functionality that all code generators should have.
  *
  * @author Edward A. Lee
  * @author Marten Lohstroh
@@ -74,598 +69,599 @@
  */
 public abstract class GeneratorBase extends AbstractLFValidator {
 
-    ////////////////////////////////////////////
-    //// Public fields.
-
-    /**
-     * The main (top-level) reactor instance.
-     */
-    public ReactorInstance main;
-
-    /** An error reporter for reporting any errors or warnings during the code generation */
-    public ErrorReporter errorReporter;
-
-    ////////////////////////////////////////////
-    //// Protected fields.
-
-    /**
-     * The current target configuration.
-     */
-    protected final TargetConfig targetConfig;
-
-    public TargetConfig getTargetConfig() { return this.targetConfig;}
-
-    public final LFGeneratorContext context;
-
-    /**
-     * A factory for compiler commands.
-     */
-    protected GeneratorCommandFactory commandFactory;
-
-    public GeneratorCommandFactory getCommandFactory() { return commandFactory; }
-
-    /**
-     * Definition of the main (top-level) reactor.
-     * This is an automatically generated AST node for the top-level
-     * reactor.
-     */
-    protected Instantiation mainDef;
-    public Instantiation getMainDef() { return mainDef; }
-
-    /**
-     * A list of Reactor definitions in the main resource, including non-main
-     * reactors defined in imported resources. These are ordered in the list in
-     * such a way that each reactor is preceded by any reactor that it instantiates
-     * using a command like {@code foo = new Foo();}
-     */
-    protected List<Reactor> reactors = new ArrayList<>();
-
-    /**
-     * The set of resources referenced reactor classes reside in.
-     */
-    protected Set<LFResource> resources = new LinkedHashSet<>(); // FIXME: Why do we need this?
-
-    /**
-     * Graph that tracks dependencies between instantiations.
-     * This is a graph where each node is a Reactor (not a ReactorInstance)
-     * and an arc from Reactor A to Reactor B means that B contains an instance of A, constructed with a statement
-     * like {@code a = new A();}  After creating the graph,
-     * sort the reactors in topological order and assign them to the reactors class variable.
-     * Hence, after this method returns, {@code this.reactors} will be a list of Reactors such that any
-     * reactor is preceded in the list by reactors that it instantiates.
-     */
-    protected InstantiationGraph instantiationGraph;
-
-    /**
-     * The set of unordered reactions. An unordered reaction is one that does
-     * not have any dependency on other reactions in the containing reactor,
-     * and where no other reaction in the containing reactor depends on it.
-     * There is currently no way in the syntax of LF to make a reaction
-     * unordered, deliberately, because it can introduce unexpected
-     * nondeterminacy. However, certain automatically generated reactions are
-     * known to be safe to be unordered because they do not interact with the
-     * state of the containing reactor. To make a reaction unordered, when
-     * the Reaction instance is created, add that instance to this set.
-     */
-    protected Set<Reaction> unorderedReactions = null;
-
-    /**
-     * Map from reactions to bank indices
-     */
-    protected Map<Reaction,Integer> reactionBankIndices = null;
-
-    /**
-     * Indicates whether the current Lingua Franca program
-     * contains model reactors.
-     */
-    public boolean hasModalReactors = false;
-
-    /**
-     * Indicates whether the program has any deadlines and thus
-     * needs to propagate deadlines through the reaction instance graph
-     */
-    public boolean hasDeadlines = false;
-
-    /** Indicates whether the program has any watchdogs. This is used to check for support. */
-    public boolean hasWatchdogs = false;
-
-    // //////////////////////////////////////////
-    // // Private fields.
-
-    /**
-     * A list ot AST transformations to apply before code generation
-     */
-    private final List<AstTransformation> astTransformations = new ArrayList<>();
-
-    /**
-     * Create a new GeneratorBase object.
-     */
-    public GeneratorBase(LFGeneratorContext context) {
-        this.context = context;
-        this.targetConfig = context.getTargetConfig();
-        this.errorReporter = context.getErrorReporter();
-        this.commandFactory = new GeneratorCommandFactory(errorReporter, context.getFileConfig());
+  ////////////////////////////////////////////
+  //// Public fields.
+
+  /** The main (top-level) reactor instance. */
+  public ReactorInstance main;
+
+  /** An error reporter for reporting any errors or warnings during the code generation */
+  public ErrorReporter errorReporter;
+
+  ////////////////////////////////////////////
+  //// Protected fields.
+
+  /** The current target configuration. */
+  protected final TargetConfig targetConfig;
+
+  public TargetConfig getTargetConfig() {
+    return this.targetConfig;
+  }
+
+  public final LFGeneratorContext context;
+
+  /** A factory for compiler commands. */
+  protected GeneratorCommandFactory commandFactory;
+
+  public GeneratorCommandFactory getCommandFactory() {
+    return commandFactory;
+  }
+
+  /**
+   * Definition of the main (top-level) reactor. This is an automatically generated AST node for the
+   * top-level reactor.
+   */
+  protected Instantiation mainDef;
+
+  public Instantiation getMainDef() {
+    return mainDef;
+  }
+
+  /**
+   * A list of Reactor definitions in the main resource, including non-main reactors defined in
+   * imported resources. These are ordered in the list in such a way that each reactor is preceded
+   * by any reactor that it instantiates using a command like {@code foo = new Foo();}
+   */
+  protected List<Reactor> reactors = new ArrayList<>();
+
+  /** The set of resources referenced reactor classes reside in. */
+  protected Set<LFResource> resources = new LinkedHashSet<>(); // FIXME: Why do we need this?
+
+  /**
+   * Graph that tracks dependencies between instantiations. This is a graph where each node is a
+   * Reactor (not a ReactorInstance) and an arc from Reactor A to Reactor B means that B contains an
+   * instance of A, constructed with a statement like {@code a = new A();} After creating the graph,
+   * sort the reactors in topological order and assign them to the reactors class variable. Hence,
+   * after this method returns, {@code this.reactors} will be a list of Reactors such that any
+   * reactor is preceded in the list by reactors that it instantiates.
+   */
+  protected InstantiationGraph instantiationGraph;
+
+  /**
+   * The set of unordered reactions. An unordered reaction is one that does not have any dependency
+   * on other reactions in the containing reactor, and where no other reaction in the containing
+   * reactor depends on it. There is currently no way in the syntax of LF to make a reaction
+   * unordered, deliberately, because it can introduce unexpected nondeterminacy. However, certain
+   * automatically generated reactions are known to be safe to be unordered because they do not
+   * interact with the state of the containing reactor. To make a reaction unordered, when the
+   * Reaction instance is created, add that instance to this set.
+   */
+  protected Set<Reaction> unorderedReactions = null;
+
+  /** Map from reactions to bank indices */
+  protected Map<Reaction, Integer> reactionBankIndices = null;
+
+  /** Indicates whether the current Lingua Franca program contains model reactors. */
+  public boolean hasModalReactors = false;
+
+  /**
+   * Indicates whether the program has any deadlines and thus needs to propagate deadlines through
+   * the reaction instance graph
+   */
+  public boolean hasDeadlines = false;
+
+  /** Indicates whether the program has any watchdogs. This is used to check for support. */
+  public boolean hasWatchdogs = false;
+
+  // //////////////////////////////////////////
+  // // Private fields.
+
+  /** A list ot AST transformations to apply before code generation */
+  private final List<AstTransformation> astTransformations = new ArrayList<>();
+
+  /** Create a new GeneratorBase object. */
+  public GeneratorBase(LFGeneratorContext context) {
+    this.context = context;
+    this.targetConfig = context.getTargetConfig();
+    this.errorReporter = context.getErrorReporter();
+    this.commandFactory = new GeneratorCommandFactory(errorReporter, context.getFileConfig());
+  }
+
+  /**
+   * Register an AST transformation to be applied to the AST.
+   *
+   * <p>The transformations will be applied in the order that they are registered in.
+   */
+  protected void registerTransformation(AstTransformation transformation) {
+    astTransformations.add(transformation);
+  }
+
+  // //////////////////////////////////////////
+  // // Code generation functions to override for a concrete code generator.
+
+  /**
+   * If there is a main or federated reactor, then create a synthetic Instantiation for that
+   * top-level reactor and set the field mainDef to refer to it.
+   */
+  private void createMainInstantiation() {
+    // Find the main reactor and create an AST node for its instantiation.
+    Iterable<EObject> nodes =
+        IteratorExtensions.toIterable(context.getFileConfig().resource.getAllContents());
+    for (Reactor reactor : Iterables.filter(nodes, Reactor.class)) {
+      if (reactor.isMain()) {
+        // Creating a definition for the main reactor because there isn't one.
+        this.mainDef = LfFactory.eINSTANCE.createInstantiation();
+        this.mainDef.setName(reactor.getName());
+        this.mainDef.setReactorClass(reactor);
+      }
     }
-
-    /**
-     * Register an AST transformation to be applied to the AST.
-     *
-     * The transformations will be applied in the order that they are registered in.
-     */
-    protected void registerTransformation(AstTransformation transformation) {
-        astTransformations.add(transformation);
+  }
+
+  /**
+   * Generate code from the Lingua Franca model contained by the specified resource.
+   *
+   * <p>This is the main entry point for code generation. This base class finds all reactor class
+   * definitions, including any reactors defined in imported .lf files (except any main reactors in
+   * those imported files), and adds them to the {@link GeneratorBase#reactors reactors} list. If
+   * errors occur during generation, then a subsequent call to errorsOccurred() will return true.
+   *
+   * @param resource The resource containing the source code.
+   * @param context Context relating to invocation of the code generator. In standalone mode, this
+   *     object is also used to relay CLI arguments.
+   */
+  public void doGenerate(Resource resource, LFGeneratorContext context) {
+
+    // FIXME: the signature can be reduced to only take context.
+    // The constructor also need not take a file config because this is tied to the context as well.
+    cleanIfNeeded(context);
+
+    printInfo(context.getMode());
+
+    // Clear any IDE markers that may have been created by a previous build.
+    // Markers mark problems in the Eclipse IDE when running in integrated mode.
+    errorReporter.clearHistory();
+
+    ASTUtils.setMainName(context.getFileConfig().resource, context.getFileConfig().name);
+
+    createMainInstantiation();
+
+    // Check if there are any conflicting main reactors elsewhere in the package.
+    if (Objects.equal(context.getMode(), LFGeneratorContext.Mode.STANDALONE) && mainDef != null) {
+      for (String conflict : new MainConflictChecker(context.getFileConfig()).conflicts) {
+        errorReporter.reportError(
+            this.mainDef.getReactorClass(), "Conflicting main reactor in " + conflict);
+      }
     }
 
-    // //////////////////////////////////////////
-    // // Code generation functions to override for a concrete code generator.
-
-    /**
-     * If there is a main or federated reactor, then create a synthetic Instantiation
-     * for that top-level reactor and set the field mainDef to refer to it.
-     */
-    private void createMainInstantiation() {
-        // Find the main reactor and create an AST node for its instantiation.
-        Iterable<EObject> nodes = IteratorExtensions.toIterable(context.getFileConfig().resource.getAllContents());
-        for (Reactor reactor : Iterables.filter(nodes, Reactor.class)) {
-            if (reactor.isMain()) {
-                // Creating a definition for the main reactor because there isn't one.
-                this.mainDef = LfFactory.eINSTANCE.createInstantiation();
-                this.mainDef.setName(reactor.getName());
-                this.mainDef.setReactorClass(reactor);
-            }
-        }
+    // Configure the command factory
+    commandFactory.setVerbose();
+    if (Objects.equal(context.getMode(), LFGeneratorContext.Mode.STANDALONE)
+        && context.getArgs().containsKey("quiet")) {
+      commandFactory.setQuiet();
     }
 
-    /**
-     * Generate code from the Lingua Franca model contained by the specified resource.
-     *
-     * This is the main entry point for code generation. This base class finds all
-     * reactor class definitions, including any reactors defined in imported .lf files
-     * (except any main reactors in those imported files), and adds them to the
-     * {@link GeneratorBase#reactors reactors} list. If errors occur during
-     * generation, then a subsequent call to errorsOccurred() will return true.
-     * @param resource The resource containing the source code.
-     * @param context Context relating to invocation of the code generator.
-     * In standalone mode, this object is also used to relay CLI arguments.
-     */
-    public void doGenerate(Resource resource, LFGeneratorContext context) {
-
-        // FIXME: the signature can be reduced to only take context.
-        // The constructor also need not take a file config because this is tied to the context as well.
-        cleanIfNeeded(context);
-
-        printInfo(context.getMode());
-
-        // Clear any IDE markers that may have been created by a previous build.
-        // Markers mark problems in the Eclipse IDE when running in integrated mode.
-        errorReporter.clearHistory();
-
-        ASTUtils.setMainName(context.getFileConfig().resource, context.getFileConfig().name);
-
-        createMainInstantiation();
-
-        // Check if there are any conflicting main reactors elsewhere in the package.
-        if (Objects.equal(context.getMode(), LFGeneratorContext.Mode.STANDALONE) && mainDef != null) {
-            for (String conflict : new MainConflictChecker(context.getFileConfig()).conflicts) {
-                errorReporter.reportError(this.mainDef.getReactorClass(), "Conflicting main reactor in " + conflict);
-            }
-        }
-
-        // Configure the command factory
-        commandFactory.setVerbose();
-        if (Objects.equal(context.getMode(), LFGeneratorContext.Mode.STANDALONE) && context.getArgs().containsKey("quiet")) {
-            commandFactory.setQuiet();
-        }
-
-        // Process target files. Copy each of them into the src-gen dir.
-        // FIXME: Should we do this here? This doesn't make sense for federates the way it is
-        // done here.
-        copyUserFiles(this.targetConfig, context.getFileConfig());
-
-        // Collect reactors and create an instantiation graph.
-        // These are needed to figure out which resources we need
-        // to validate, which happens in setResources().
-        setReactorsAndInstantiationGraph(context.getMode());
-
-        List<Resource> allResources = GeneratorUtils.getResources(reactors);
-        resources.addAll(allResources.stream()  // FIXME: This filter reproduces the behavior of the method it replaces. But why must it be so complicated? Why are we worried about weird corner cases like this?
-            .filter(it -> !Objects.equal(it, context.getFileConfig().resource) || mainDef != null && it == mainDef.getReactorClass().eResource())
-            .map(it -> GeneratorUtils.getLFResource(it, context.getFileConfig().getSrcGenBasePath(), context, errorReporter))
-            .toList()
-        );
-        GeneratorUtils.accommodatePhysicalActionsIfPresent(
-            allResources,
-            getTarget().setsKeepAliveOptionAutomatically(),
-            targetConfig,
-            errorReporter
-        );
-        // FIXME: Should the GeneratorBase pull in {@code files} from imported
-        // resources?
-
-        for (AstTransformation transformation : astTransformations) {
-            transformation.applyTransformation(reactors);
-        }
-
-        // Transform connections that reside in mutually exclusive modes and are otherwise conflicting
-        // This should be done before creating the instantiation graph
-        transformConflictingConnectionsInModalReactors();
-
-        // Invoke these functions a second time because transformations
-        // may have introduced new reactors!
-        setReactorsAndInstantiationGraph(context.getMode());
-
-        // Check for existence and support of modes
-        hasModalReactors = IterableExtensions.exists(reactors, it -> !it.getModes().isEmpty());
-        checkModalReactorSupport(false);
-
-        // Check for the existence and support of watchdogs
-        hasWatchdogs = IterableExtensions.exists(reactors, it -> !it.getWatchdogs().isEmpty());
-        checkWatchdogSupport(targetConfig.threading && getTarget() == Target.C);
-        additionalPostProcessingForModes();
+    // Process target files. Copy each of them into the src-gen dir.
+    // FIXME: Should we do this here? This doesn't make sense for federates the way it is
+    // done here.
+    copyUserFiles(this.targetConfig, context.getFileConfig());
+
+    // Collect reactors and create an instantiation graph.
+    // These are needed to figure out which resources we need
+    // to validate, which happens in setResources().
+    setReactorsAndInstantiationGraph(context.getMode());
+
+    List<Resource> allResources = GeneratorUtils.getResources(reactors);
+    resources.addAll(
+        allResources
+            .stream() // FIXME: This filter reproduces the behavior of the method it replaces. But
+            // why must it be so complicated? Why are we worried about weird corner cases
+            // like this?
+            .filter(
+                it ->
+                    !Objects.equal(it, context.getFileConfig().resource)
+                        || mainDef != null && it == mainDef.getReactorClass().eResource())
+            .map(
+                it ->
+                    GeneratorUtils.getLFResource(
+                        it, context.getFileConfig().getSrcGenBasePath(), context, errorReporter))
+            .toList());
+    GeneratorUtils.accommodatePhysicalActionsIfPresent(
+        allResources, getTarget().setsKeepAliveOptionAutomatically(), targetConfig, errorReporter);
+    // FIXME: Should the GeneratorBase pull in {@code files} from imported
+    // resources?
+
+    for (AstTransformation transformation : astTransformations) {
+      transformation.applyTransformation(reactors);
     }
 
-    /**
-     * Check if a clean was requested from the standalone compiler and perform
-     * the clean step.
-     */
-    protected void cleanIfNeeded(LFGeneratorContext context) {
-        if (context.getArgs().containsKey("clean")) {
-            try {
-                context.getFileConfig().doClean();
-            } catch (IOException e) {
-                System.err.println("WARNING: IO Error during clean");
-            }
-        }
+    // Transform connections that reside in mutually exclusive modes and are otherwise conflicting
+    // This should be done before creating the instantiation graph
+    transformConflictingConnectionsInModalReactors();
+
+    // Invoke these functions a second time because transformations
+    // may have introduced new reactors!
+    setReactorsAndInstantiationGraph(context.getMode());
+
+    // Check for existence and support of modes
+    hasModalReactors = IterableExtensions.exists(reactors, it -> !it.getModes().isEmpty());
+    checkModalReactorSupport(false);
+
+    // Check for the existence and support of watchdogs
+    hasWatchdogs = IterableExtensions.exists(reactors, it -> !it.getWatchdogs().isEmpty());
+    checkWatchdogSupport(targetConfig.threading && getTarget() == Target.C);
+    additionalPostProcessingForModes();
+  }
+
+  /** Check if a clean was requested from the standalone compiler and perform the clean step. */
+  protected void cleanIfNeeded(LFGeneratorContext context) {
+    if (context.getArgs().containsKey("clean")) {
+      try {
+        context.getFileConfig().doClean();
+      } catch (IOException e) {
+        System.err.println("WARNING: IO Error during clean");
+      }
     }
-
-    /**
-     * Create a new instantiation graph. This is a graph where each node is a Reactor (not a ReactorInstance)
-     * and an arc from Reactor A to Reactor B means that B contains an instance of A, constructed with a statement
-     * like {@code a = new A();}  After creating the graph,
-     * sort the reactors in topological order and assign them to the reactors class variable.
-     * Hence, after this method returns, {@code this.reactors} will be a list of Reactors such that any
-     * reactor is preceded in the list by reactors that it instantiates.
-     */
-    protected void setReactorsAndInstantiationGraph(LFGeneratorContext.Mode mode) {
-        // Build the instantiation graph .
-        instantiationGraph = new InstantiationGraph(context.getFileConfig().resource, false);
-
-        // Topologically sort the reactors such that all of a reactor's instantiation dependencies occur earlier in
-        // the sorted list of reactors. This helps the code generator output code in the correct order.
-        // For example if {@code reactor Foo {bar = new Bar()}} then the definition of {@code Bar} has to be generated before
-        // the definition of {@code Foo}.
-        reactors = instantiationGraph.nodesInTopologicalOrder();
-
-        // If there is no main reactor or if all reactors in the file need to be validated, then make sure the reactors
-        // list includes even reactors that are not instantiated anywhere.
-        if (mainDef == null || Objects.equal(mode, LFGeneratorContext.Mode.LSP_MEDIUM)) {
-            Iterable<EObject> nodes = IteratorExtensions.toIterable(context.getFileConfig().resource.getAllContents());
-            for (Reactor r : IterableExtensions.filter(nodes, Reactor.class)) {
-                if (!reactors.contains(r)) {
-                    reactors.add(r);
-                }
-            }
+  }
+
+  /**
+   * Create a new instantiation graph. This is a graph where each node is a Reactor (not a
+   * ReactorInstance) and an arc from Reactor A to Reactor B means that B contains an instance of A,
+   * constructed with a statement like {@code a = new A();} After creating the graph, sort the
+   * reactors in topological order and assign them to the reactors class variable. Hence, after this
+   * method returns, {@code this.reactors} will be a list of Reactors such that any reactor is
+   * preceded in the list by reactors that it instantiates.
+   */
+  protected void setReactorsAndInstantiationGraph(LFGeneratorContext.Mode mode) {
+    // Build the instantiation graph .
+    instantiationGraph = new InstantiationGraph(context.getFileConfig().resource, false);
+
+    // Topologically sort the reactors such that all of a reactor's instantiation dependencies occur
+    // earlier in
+    // the sorted list of reactors. This helps the code generator output code in the correct order.
+    // For example if {@code reactor Foo {bar = new Bar()}} then the definition of {@code Bar} has
+    // to be generated before
+    // the definition of {@code Foo}.
+    reactors = instantiationGraph.nodesInTopologicalOrder();
+
+    // If there is no main reactor or if all reactors in the file need to be validated, then make
+    // sure the reactors
+    // list includes even reactors that are not instantiated anywhere.
+    if (mainDef == null || Objects.equal(mode, LFGeneratorContext.Mode.LSP_MEDIUM)) {
+      Iterable<EObject> nodes =
+          IteratorExtensions.toIterable(context.getFileConfig().resource.getAllContents());
+      for (Reactor r : IterableExtensions.filter(nodes, Reactor.class)) {
+        if (!reactors.contains(r)) {
+          reactors.add(r);
         }
+      }
     }
-
-    /**
-     * Copy user specific files to the src-gen folder.
-     *
-     * This should be overridden by the target generators.
-     *
-     * @param targetConfig The targetConfig to read the {@code files} from.
-     * @param fileConfig The fileConfig used to make the copy and resolve paths.
-     */
-    protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
-        var dst = this.context.getFileConfig().getSrcGenPath();
-        FileUtil.copyFilesOrDirectories(targetConfig.files, dst, fileConfig, errorReporter, false);
-    }
-
-    /**
-     * Return true if errors occurred in the last call to doGenerate().
-     * This will return true if any of the reportError methods was called.
-     * @return True if errors occurred.
-     */
-    public boolean errorsOccurred() {
-        return errorReporter.getErrorsOccurred();
+  }
+
+  /**
+   * Copy user specific files to the src-gen folder.
+   *
+   * <p>This should be overridden by the target generators.
+   *
+   * @param targetConfig The targetConfig to read the {@code files} from.
+   * @param fileConfig The fileConfig used to make the copy and resolve paths.
+   */
+  protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
+    var dst = this.context.getFileConfig().getSrcGenPath();
+    FileUtil.copyFilesOrDirectories(targetConfig.files, dst, fileConfig, errorReporter, false);
+  }
+
+  /**
+   * Return true if errors occurred in the last call to doGenerate(). This will return true if any
+   * of the reportError methods was called.
+   *
+   * @return True if errors occurred.
+   */
+  public boolean errorsOccurred() {
+    return errorReporter.getErrorsOccurred();
+  }
+
+  /*
+   * Return the TargetTypes instance associated with this.
+   */
+  public abstract TargetTypes getTargetTypes();
+
+  /**
+   * Mark the reaction unordered. An unordered reaction is one that does not have any dependency on
+   * other reactions in the containing reactor, and where no other reaction in the containing
+   * reactor depends on it. There is currently no way in the syntax of LF to make a reaction
+   * unordered, deliberately, because it can introduce unexpected nondeterminacy. However, certain
+   * automatically generated reactions are known to be safe to be unordered because they do not
+   * interact with the state of the containing reactor. To make a reaction unordered, when the
+   * Reaction instance is created, add that instance to this set.
+   *
+   * @param reaction The reaction to make unordered.
+   */
+  public void makeUnordered(Reaction reaction) {
+    if (unorderedReactions == null) {
+      unorderedReactions = new LinkedHashSet<>();
     }
-
-    /*
-     * Return the TargetTypes instance associated with this.
-     */
-    public abstract TargetTypes getTargetTypes();
-
-    /**
-     * Mark the reaction unordered. An unordered reaction is one that does not
-     * have any dependency on other reactions in the containing reactor, and
-     * where no other reaction in the containing reactor depends on it. There
-     * is currently no way in the syntax of LF to make a reaction unordered,
-     * deliberately, because it can introduce unexpected nondeterminacy.
-     * However, certain automatically generated reactions are known to be safe
-     * to be unordered because they do not interact with the state of the
-     * containing reactor. To make a reaction unordered, when the Reaction
-     * instance is created, add that instance to this set.
-     * @param reaction The reaction to make unordered.
-     */
-    public void makeUnordered(Reaction reaction) {
-        if (unorderedReactions == null) {
-            unorderedReactions = new LinkedHashSet<>();
-        }
-        unorderedReactions.add(reaction);
+    unorderedReactions.add(reaction);
+  }
+
+  /**
+   * Mark the specified reaction to belong to only the specified bank index. This is needed because
+   * reactions cannot declare a specific bank index as an effect or trigger. Reactions that send
+   * messages between federates, including absent messages, need to be specific to a bank member.
+   *
+   * @param reaction The reaction.
+   * @param bankIndex The bank index, or -1 if there is no bank.
+   */
+  public void setReactionBankIndex(Reaction reaction, int bankIndex) {
+    if (bankIndex < 0) {
+      return;
     }
-
-    /**
-     * Mark the specified reaction to belong to only the specified
-     * bank index. This is needed because reactions cannot declare
-     * a specific bank index as an effect or trigger. Reactions that
-     * send messages between federates, including absent messages,
-     * need to be specific to a bank member.
-     * @param reaction The reaction.
-     * @param bankIndex The bank index, or -1 if there is no bank.
-     */
-    public void setReactionBankIndex(Reaction reaction, int bankIndex) {
-        if (bankIndex < 0) {
-            return;
-        }
-        if (reactionBankIndices == null) {
-            reactionBankIndices = new LinkedHashMap<>();
-        }
-        reactionBankIndices.put(reaction, bankIndex);
+    if (reactionBankIndices == null) {
+      reactionBankIndices = new LinkedHashMap<>();
     }
-
-    /**
-     * Return the reaction bank index.
-     * @see #setReactionBankIndex(Reaction reaction, int bankIndex)
-     * @param reaction The reaction.
-     * @return The reaction bank index, if one has been set, and -1 otherwise.
-     */
-    public int getReactionBankIndex(Reaction reaction) {
-        if (reactionBankIndices == null) return -1;
-        if (reactionBankIndices.get(reaction) == null) return -1;
-        return reactionBankIndices.get(reaction);
+    reactionBankIndices.put(reaction, bankIndex);
+  }
+
+  /**
+   * Return the reaction bank index.
+   *
+   * @see #setReactionBankIndex(Reaction reaction, int bankIndex)
+   * @param reaction The reaction.
+   * @return The reaction bank index, if one has been set, and -1 otherwise.
+   */
+  public int getReactionBankIndex(Reaction reaction) {
+    if (reactionBankIndices == null) return -1;
+    if (reactionBankIndices.get(reaction) == null) return -1;
+    return reactionBankIndices.get(reaction);
+  }
+
+  // //////////////////////////////////////////
+  // // Protected methods.
+
+  /**
+   * Checks whether modal reactors are present and require appropriate code generation. This will
+   * set the hasModalReactors variable.
+   *
+   * @param isSupported indicates if modes are supported by this code generation.
+   */
+  protected void checkModalReactorSupport(boolean isSupported) {
+    if (hasModalReactors && !isSupported) {
+      errorReporter.reportError(
+          "The currently selected code generation or "
+              + "target configuration does not support modal reactors!");
     }
-
-    // //////////////////////////////////////////
-    // // Protected methods.
-
-    /**
-     * Checks whether modal reactors are present and require appropriate code generation.
-     * This will set the hasModalReactors variable.
-     * @param isSupported indicates if modes are supported by this code generation.
-     */
-    protected void checkModalReactorSupport(boolean isSupported) {
-        if (hasModalReactors && !isSupported) {
-            errorReporter.reportError("The currently selected code generation or " +
-                    "target configuration does not support modal reactors!");
-        }
+  }
+
+  /**
+   * Check whether watchdogs are present and are supported.
+   *
+   * @param isSupported indicates whether or not this is a supported target and whether or not it is
+   *     a threaded runtime.
+   */
+  protected void checkWatchdogSupport(boolean isSupported) {
+    if (hasWatchdogs && !isSupported) {
+      errorReporter.reportError(
+          "Watchdogs are currently only supported for threaded programs in the C target.");
     }
-
-    /**
-     * Check whether watchdogs are present and are supported.
-     *
-     * @param isSupported indicates whether or not this is a supported target and whether or not it
-     * is
-     * a threaded runtime.
-     */
-    protected void checkWatchdogSupport(boolean isSupported) {
-        if (hasWatchdogs && !isSupported) {
+  }
+
+  /**
+   * Finds and transforms connections into forwarding reactions iff the connections have the same
+   * destination as other connections or reaction in mutually exclusive modes.
+   */
+  private void transformConflictingConnectionsInModalReactors() {
+    for (LFResource r : resources) {
+      var transform = ASTUtils.findConflictingConnectionsInModalReactors(r.eResource);
+      if (!transform.isEmpty()) {
+        var factory = LfFactory.eINSTANCE;
+        for (Connection connection : transform) {
+          // Currently only simple transformations are supported
+          if (connection.isPhysical()
+              || connection.getDelay() != null
+              || connection.isIterated()
+              || connection.getLeftPorts().size() > 1
+              || connection.getRightPorts().size() > 1) {
             errorReporter.reportError(
-                "Watchdogs are currently only supported for threaded programs in the C target.");
+                connection,
+                "Cannot transform connection in modal reactor. Connection uses currently not"
+                    + " supported features.");
+          } else {
+            var reaction = factory.createReaction();
+            ((Mode) connection.eContainer()).getReactions().add(reaction);
+
+            var sourceRef = connection.getLeftPorts().get(0);
+            var destRef = connection.getRightPorts().get(0);
+            reaction.getTriggers().add(sourceRef);
+            reaction.getEffects().add(destRef);
+
+            var code = factory.createCode();
+            var source =
+                (sourceRef.getContainer() != null ? sourceRef.getContainer().getName() + "." : "")
+                    + sourceRef.getVariable().getName();
+            var dest =
+                (destRef.getContainer() != null ? destRef.getContainer().getName() + "." : "")
+                    + destRef.getVariable().getName();
+            code.setBody(getConflictingConnectionsInModalReactorsBody(source, dest));
+            reaction.setCode(code);
+
+            EcoreUtil.remove(connection);
+          }
         }
+      }
     }
-
-    /**
-     * Finds and transforms connections into forwarding reactions iff the connections have the same
-     * destination as other connections or reaction in mutually exclusive modes.
-     */
-    private void transformConflictingConnectionsInModalReactors() {
-        for (LFResource r : resources) {
-            var transform = ASTUtils.findConflictingConnectionsInModalReactors(r.eResource);
-            if (!transform.isEmpty()) {
-                var factory = LfFactory.eINSTANCE;
-                for (Connection connection : transform) {
-                    // Currently only simple transformations are supported
-                    if (connection.isPhysical() || connection.getDelay() != null || connection.isIterated() ||
-                        connection.getLeftPorts().size() > 1 || connection.getRightPorts().size() > 1
-                    ) {
-                        errorReporter.reportError(connection, "Cannot transform connection in modal reactor. Connection uses currently not supported features.");
-                    } else {
-                        var reaction = factory.createReaction();
-                        ((Mode)connection.eContainer()).getReactions().add(reaction);
-
-                        var sourceRef = connection.getLeftPorts().get(0);
-                        var destRef = connection.getRightPorts().get(0);
-                        reaction.getTriggers().add(sourceRef);
-                        reaction.getEffects().add(destRef);
-
-                        var code = factory.createCode();
-                        var source = (sourceRef.getContainer() != null ?
-                                sourceRef.getContainer().getName() + "." : "") + sourceRef.getVariable().getName();
-                        var dest = (destRef.getContainer() != null ?
-                                destRef.getContainer().getName() + "." : "") + destRef.getVariable().getName();
-                        code.setBody(getConflictingConnectionsInModalReactorsBody(source, dest));
-                        reaction.setCode(code);
-
-                        EcoreUtil.remove(connection);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Return target code for forwarding reactions iff the connections have the
-     * same destination as other connections or reaction in mutually exclusive modes.
-     *
-     * This method needs to be overridden in target specific code generators that
-     * support modal reactors.
-     */
-    protected String getConflictingConnectionsInModalReactorsBody(String source, String dest) {
-        errorReporter.reportError("The currently selected code generation " +
-                                  "is missing an implementation for conflicting " +
-                                  "transforming connections in modal reactors.");
-        return "MODAL MODELS NOT SUPPORTED";
+  }
+
+  /**
+   * Return target code for forwarding reactions iff the connections have the same destination as
+   * other connections or reaction in mutually exclusive modes.
+   *
+   * <p>This method needs to be overridden in target specific code generators that support modal
+   * reactors.
+   */
+  protected String getConflictingConnectionsInModalReactorsBody(String source, String dest) {
+    errorReporter.reportError(
+        "The currently selected code generation "
+            + "is missing an implementation for conflicting "
+            + "transforming connections in modal reactors.");
+    return "MODAL MODELS NOT SUPPORTED";
+  }
+
+  /** Hook for additional post-processing of the model. */
+  protected void additionalPostProcessingForModes() {
+    // Do nothing
+  }
+
+  /** Parsed error message from a compiler is returned here. */
+  public static class ErrorFileAndLine {
+    public String filepath = null;
+    public String line = "1";
+    public String character = "0";
+    public String message = "";
+    public boolean isError = true; // false for a warning.
+
+    @Override
+    public String toString() {
+      return (isError ? "Error" : "Non-error")
+          + " at "
+          + line
+          + ":"
+          + character
+          + " of file "
+          + filepath
+          + ": "
+          + message;
     }
-
-    /**
-     * Hook for additional post-processing of the model.
-     */
-    protected void additionalPostProcessingForModes() {
-        // Do nothing
-    }
-
-    /**
-     * Parsed error message from a compiler is returned here.
-     */
-    public static class ErrorFileAndLine {
-        public String filepath = null;
-        public String line = "1";
-        public String character = "0";
-        public String message = "";
-        public boolean isError = true; // false for a warning.
-
-        @Override
-        public String toString() {
-          return (isError ? "Error" : "Non-error") + " at " + line + ":" + character + " of file " + filepath + ": " + message;
-        }
-    }
-
-    /**
-     * Given a line of text from the output of a compiler, return
-     * an instance of ErrorFileAndLine if the line is recognized as
-     * the first line of an error message. Otherwise, return null.
-     * This base class simply returns null.
-     * @param line A line of output from a compiler or other external
-     * tool that might generate errors.
-     * @return If the line is recognized as the start of an error message,
-     * then return a class containing the path to the file on which the
-     * error occurred (or null if there is none), the line number (or the
-     * string "1" if there is none), the character position (or the string
-     * "0" if there is none), and the message (or an empty string if there
-     * is none).
-     */
-    protected ErrorFileAndLine parseCommandOutput(String line) {
-        return null;
-    }
-
-    /**
-     * Parse the specified string for command errors that can be reported
-     * using marks in the Eclipse IDE. In this class, we attempt to parse
-     * the messages to look for file and line information, thereby generating
-     * marks on the appropriate lines. This should not be called in standalone
-     * mode.
-     *
-     * @param stderr The output on standard error of executing a command.
-     */
-    public void reportCommandErrors(String stderr) {
-        // NOTE: If the VS Code branch passes code review, then this function,
-        //  parseCommandOutput, and ErrorFileAndLine will be deleted soon after.
-        // First, split the message into lines.
-        String[] lines = stderr.split("\\r?\\n");
-        StringBuilder message = new StringBuilder();
-        Integer lineNumber = null;
-        Path path = context.getFileConfig().srcFile;
-        // In case errors occur within an imported file, record the original path.
-        Path originalPath = path;
-
-        int severity = IMarker.SEVERITY_ERROR;
-        for (String line : lines) {
-            ErrorFileAndLine parsed = parseCommandOutput(line);
-            if (parsed != null) {
-                // Found a new line number designator.
-                // If there is a previously accumulated message, report it.
-                if (message.length() > 0) {
-                    if (severity == IMarker.SEVERITY_ERROR)
-                        errorReporter.reportError(path, lineNumber, message.toString());
-                    else
-                        errorReporter.reportWarning(path, lineNumber, message.toString());
-
-                    if (!Objects.equal(originalPath.toFile(), path.toFile())) {
-                        // Report an error also in the top-level resource.
-                        // FIXME: It should be possible to descend through the import
-                        // statements to find which one matches and mark all the
-                        // import statements down the chain. But what a pain!
-                        if (severity == IMarker.SEVERITY_ERROR) {
-                            errorReporter.reportError(originalPath, 1, "Error in imported file: " + path);
-                        } else {
-                            errorReporter.reportWarning(originalPath, 1, "Warning in imported file: " + path);
-                        }
-                     }
-                }
-                if (parsed.isError) {
-                    severity = IMarker.SEVERITY_ERROR;
-                } else {
-                    severity = IMarker.SEVERITY_WARNING;
-                }
-
-                // Start accumulating a new message.
-                message = new StringBuilder();
-                // Append the message on the line number designator line.
-                message.append(parsed.message);
-
-                // Set the new line number.
-                try {
-                    lineNumber = Integer.decode(parsed.line);
-                } catch (Exception ex) {
-                    // Set the line number unknown.
-                    lineNumber = null;
-                }
-                // FIXME: Ignoring the position within the line.
-                // Determine the path within which the error occurred.
-                path = Paths.get(parsed.filepath);
-            } else {
-                // No line designator.
-                if (message.length() > 0) {
-                    message.append("\n");
-                } else {
-                    if (!line.toLowerCase().contains("error:")) {
-                        severity = IMarker.SEVERITY_WARNING;
-                    }
-                }
-                message.append(line);
-            }
-        }
+  }
+
+  /**
+   * Given a line of text from the output of a compiler, return an instance of ErrorFileAndLine if
+   * the line is recognized as the first line of an error message. Otherwise, return null. This base
+   * class simply returns null.
+   *
+   * @param line A line of output from a compiler or other external tool that might generate errors.
+   * @return If the line is recognized as the start of an error message, then return a class
+   *     containing the path to the file on which the error occurred (or null if there is none), the
+   *     line number (or the string "1" if there is none), the character position (or the string "0"
+   *     if there is none), and the message (or an empty string if there is none).
+   */
+  protected ErrorFileAndLine parseCommandOutput(String line) {
+    return null;
+  }
+
+  /**
+   * Parse the specified string for command errors that can be reported using marks in the Eclipse
+   * IDE. In this class, we attempt to parse the messages to look for file and line information,
+   * thereby generating marks on the appropriate lines. This should not be called in standalone
+   * mode.
+   *
+   * @param stderr The output on standard error of executing a command.
+   */
+  public void reportCommandErrors(String stderr) {
+    // NOTE: If the VS Code branch passes code review, then this function,
+    //  parseCommandOutput, and ErrorFileAndLine will be deleted soon after.
+    // First, split the message into lines.
+    String[] lines = stderr.split("\\r?\\n");
+    StringBuilder message = new StringBuilder();
+    Integer lineNumber = null;
+    Path path = context.getFileConfig().srcFile;
+    // In case errors occur within an imported file, record the original path.
+    Path originalPath = path;
+
+    int severity = IMarker.SEVERITY_ERROR;
+    for (String line : lines) {
+      ErrorFileAndLine parsed = parseCommandOutput(line);
+      if (parsed != null) {
+        // Found a new line number designator.
+        // If there is a previously accumulated message, report it.
         if (message.length() > 0) {
+          if (severity == IMarker.SEVERITY_ERROR)
+            errorReporter.reportError(path, lineNumber, message.toString());
+          else errorReporter.reportWarning(path, lineNumber, message.toString());
+
+          if (!Objects.equal(originalPath.toFile(), path.toFile())) {
+            // Report an error also in the top-level resource.
+            // FIXME: It should be possible to descend through the import
+            // statements to find which one matches and mark all the
+            // import statements down the chain. But what a pain!
             if (severity == IMarker.SEVERITY_ERROR) {
-                errorReporter.reportError(path, lineNumber, message.toString());
+              errorReporter.reportError(originalPath, 1, "Error in imported file: " + path);
             } else {
-                errorReporter.reportWarning(path, lineNumber, message.toString());
+              errorReporter.reportWarning(originalPath, 1, "Warning in imported file: " + path);
             }
+          }
+        }
+        if (parsed.isError) {
+          severity = IMarker.SEVERITY_ERROR;
+        } else {
+          severity = IMarker.SEVERITY_WARNING;
+        }
 
-            if (originalPath.toFile() != path.toFile()) {
-                // Report an error also in the top-level resource.
-                // FIXME: It should be possible to descend through the import
-                // statements to find which one matches and mark all the
-                // import statements down the chain. But what a pain!
-                if (severity == IMarker.SEVERITY_ERROR) {
-                    errorReporter.reportError(originalPath, 1, "Error in imported file: " + path);
-                } else {
-                    errorReporter.reportWarning(originalPath, 1, "Warning in imported file: " + path);
-                }
-            }
+        // Start accumulating a new message.
+        message = new StringBuilder();
+        // Append the message on the line number designator line.
+        message.append(parsed.message);
+
+        // Set the new line number.
+        try {
+          lineNumber = Integer.decode(parsed.line);
+        } catch (Exception ex) {
+          // Set the line number unknown.
+          lineNumber = null;
+        }
+        // FIXME: Ignoring the position within the line.
+        // Determine the path within which the error occurred.
+        path = Paths.get(parsed.filepath);
+      } else {
+        // No line designator.
+        if (message.length() > 0) {
+          message.append("\n");
+        } else {
+          if (!line.toLowerCase().contains("error:")) {
+            severity = IMarker.SEVERITY_WARNING;
+          }
         }
+        message.append(line);
+      }
     }
-
-    // //////////////////////////////////////////////////
-    // // Private functions
-
-    /**
-     * Print to stdout information about what source file is being generated,
-     * what mode the generator is in, and where the generated sources are to be put.
-     */
-    public void printInfo(LFGeneratorContext.Mode mode) {
-        System.out.println("Generating code for: " + context.getFileConfig().resource.getURI().toString());
-        System.out.println("******** mode: " + mode);
-        System.out.println("******** generated sources: " + context.getFileConfig().getSrcGenPath());
+    if (message.length() > 0) {
+      if (severity == IMarker.SEVERITY_ERROR) {
+        errorReporter.reportError(path, lineNumber, message.toString());
+      } else {
+        errorReporter.reportWarning(path, lineNumber, message.toString());
+      }
+
+      if (originalPath.toFile() != path.toFile()) {
+        // Report an error also in the top-level resource.
+        // FIXME: It should be possible to descend through the import
+        // statements to find which one matches and mark all the
+        // import statements down the chain. But what a pain!
+        if (severity == IMarker.SEVERITY_ERROR) {
+          errorReporter.reportError(originalPath, 1, "Error in imported file: " + path);
+        } else {
+          errorReporter.reportWarning(originalPath, 1, "Warning in imported file: " + path);
+        }
+      }
     }
-
-    /**
-     * Get the buffer type used for network messages
-     */
-    public String getNetworkBufferType() { return ""; }
-
-    /**
-     * Return the Targets enum for the current target
-     */
-    public abstract Target getTarget();
+  }
+
+  // //////////////////////////////////////////////////
+  // // Private functions
+
+  /**
+   * Print to stdout information about what source file is being generated, what mode the generator
+   * is in, and where the generated sources are to be put.
+   */
+  public void printInfo(LFGeneratorContext.Mode mode) {
+    System.out.println(
+        "Generating code for: " + context.getFileConfig().resource.getURI().toString());
+    System.out.println("******** mode: " + mode);
+    System.out.println("******** generated sources: " + context.getFileConfig().getSrcGenPath());
+  }
+
+  /** Get the buffer type used for network messages */
+  public String getNetworkBufferType() {
+    return "";
+  }
+
+  /** Return the Targets enum for the current target */
+  public abstract Target getTarget();
 }
diff --git a/org.lflang/src/org/lflang/generator/GeneratorCommandFactory.java b/org.lflang/src/org/lflang/generator/GeneratorCommandFactory.java
index 081f07320b..b1dc44e094 100644
--- a/org.lflang/src/org/lflang/generator/GeneratorCommandFactory.java
+++ b/org.lflang/src/org/lflang/generator/GeneratorCommandFactory.java
@@ -1,26 +1,26 @@
 /*************
- Copyright (c) 2019-2021 TU Dresden
- Copyright (c) 2019-2021 UC Berkeley
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) 2019-2021 TU Dresden
+ * Copyright (c) 2019-2021 UC Berkeley
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
 
 package org.lflang.generator;
@@ -29,120 +29,128 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Objects;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.util.LFCommand;
 
 /**
  * A factory class responsible for creating commands for use by the LF code generators.
- * <p>
- * In addition to the basic functionality of LFCommand, this class additionally ensures that error messages (or
- * optionally warnings) are shown when a command is not found and that certain environment variables are set (see
- * {@link #createCommand(String, List, Path, boolean) createCommand}).
+ *
+ * <p>In addition to the basic functionality of LFCommand, this class additionally ensures that
+ * error messages (or optionally warnings) are shown when a command is not found and that certain
+ * environment variables are set (see {@link #createCommand(String, List, Path, boolean)
+ * createCommand}).
  */
 public class GeneratorCommandFactory {
 
-    protected final ErrorReporter errorReporter;
-    protected final FileConfig fileConfig;
-    protected boolean quiet = false;
-
-    public GeneratorCommandFactory(ErrorReporter errorReporter, FileConfig fileConfig) {
-        this.errorReporter = Objects.requireNonNull(errorReporter);
-        this.fileConfig = Objects.requireNonNull(fileConfig);
-    }
-
-    /// enable quiet mode (command output is not printed)
-    public void setQuiet() { quiet = true; }
-
-    /// enable verbose mode (command output is printed)
-    public void setVerbose() { quiet = false; }
-
-    /**
-     * Create a LFCommand instance from a given command and an argument list.
-     * <p>
-     * The command will be executed in the CWD and if the command cannot be found an error message is shown.
-     *
-     * @param cmd  the command to look up
-     * @param args a list of arguments
-     * @return an LFCommand object or null if the command could not be found
-     * @see #createCommand(String, List, Path, boolean)
-     */
-    public LFCommand createCommand(String cmd, List<String> args) {
-        return createCommand(cmd, args, null, true);
+  protected final ErrorReporter errorReporter;
+  protected final FileConfig fileConfig;
+  protected boolean quiet = false;
+
+  public GeneratorCommandFactory(ErrorReporter errorReporter, FileConfig fileConfig) {
+    this.errorReporter = Objects.requireNonNull(errorReporter);
+    this.fileConfig = Objects.requireNonNull(fileConfig);
+  }
+
+  /// enable quiet mode (command output is not printed)
+  public void setQuiet() {
+    quiet = true;
+  }
+
+  /// enable verbose mode (command output is printed)
+  public void setVerbose() {
+    quiet = false;
+  }
+
+  /**
+   * Create a LFCommand instance from a given command and an argument list.
+   *
+   * <p>The command will be executed in the CWD and if the command cannot be found an error message
+   * is shown.
+   *
+   * @param cmd the command to look up
+   * @param args a list of arguments
+   * @return an LFCommand object or null if the command could not be found
+   * @see #createCommand(String, List, Path, boolean)
+   */
+  public LFCommand createCommand(String cmd, List<String> args) {
+    return createCommand(cmd, args, null, true);
+  }
+
+  /**
+   * Create a LFCommand instance from a given command, an argument list and a directory.
+   *
+   * @param cmd the command to look up
+   * @param args a list of arguments
+   * @param failOnError If true, an error is shown if the command cannot be found. Otherwise, only a
+   *     warning is displayed.
+   * @return an LFCommand object or null if the command could not be found
+   * @see #createCommand(String, List, Path, boolean)
+   */
+  public LFCommand createCommand(String cmd, List<String> args, boolean failOnError) {
+    return createCommand(cmd, args, null, failOnError);
+  }
+
+  /**
+   * Create a LFCommand instance from a given command, an argument list and a directory.
+   *
+   * <p>The command will be executed in the CWD and if the command cannot be found an error message
+   * is shown.
+   *
+   * @param cmd the command to look up
+   * @param args a list of arguments
+   * @param dir the directory to execute the command in. If null, this will default to the CWD
+   * @return an LFCommand object or null if the command could not be found
+   * @see #createCommand(String, List, Path, boolean)
+   */
+  public LFCommand createCommand(String cmd, List<String> args, Path dir) {
+    return createCommand(cmd, args, dir, true);
+  }
+
+  /**
+   * Create a LFCommand instance from a given command, an argument list and a directory.
+   *
+   * <p>This will check first if the command can actually be found and executed. If the command is
+   * not found, null is returned. In addition, an error message will be shown if failOnError is
+   * true. Otherwise, a warning will be displayed.
+   *
+   * @param cmd the command to look up
+   * @param args a list of arguments
+   * @param dir the directory to execute the command in. If null, this will default to the CWD
+   * @param failOnError If true, an error is shown if the command cannot be found. Otherwise, only a
+   *     warning is displayed.
+   * @return an LFCommand object or null if the command could not be found
+   * @see LFCommand#get(String, List, boolean, Path)
+   */
+  public LFCommand createCommand(String cmd, List<String> args, Path dir, boolean failOnError) {
+    assert cmd != null && args != null;
+    if (dir == null) {
+      dir = Paths.get("");
     }
-
-
-    /**
-     * Create a LFCommand instance from a given command, an argument list and a directory.
-     *
-     * @param cmd         the command to look up
-     * @param args        a list of arguments
-     * @param failOnError If true, an error is shown if the command cannot be found. Otherwise, only a warning is
-     *                    displayed.
-     * @return an LFCommand object or null if the command could not be found
-     * @see #createCommand(String, List, Path, boolean)
-     */
-    public LFCommand createCommand(String cmd, List<String> args, boolean failOnError) {
-        return createCommand(cmd, args, null, failOnError);
+    LFCommand command = LFCommand.get(cmd, args, quiet, dir);
+    if (command != null) {
+      command.setEnvironmentVariable("LF_CURRENT_WORKING_DIRECTORY", dir.toString());
+      command.setEnvironmentVariable("LF_SOURCE_DIRECTORY", fileConfig.srcPath.toString());
+      command.setEnvironmentVariable("LF_PACKAGE_DIRECTORY", fileConfig.srcPkgPath.toString());
+      command.setEnvironmentVariable(
+          "LF_SOURCE_GEN_DIRECTORY", fileConfig.getSrcGenPath().toString());
+      command.setEnvironmentVariable("LF_BIN_DIRECTORY", fileConfig.binPath.toString());
+    } else {
+      final String message =
+          "The command "
+              + cmd
+              + " could not be found in the current working directory or in your PATH. "
+              + "Make sure that your PATH variable includes the directory where "
+              + cmd
+              + " is installed. "
+              + "You can set PATH in ~/.bash_profile on Linux or Mac.";
+      if (failOnError) {
+        errorReporter.reportError(message);
+      } else {
+        errorReporter.reportWarning(message);
+      }
     }
 
-
-    /**
-     * Create a LFCommand instance from a given command, an argument list and a directory.
-     * <p>
-     * The command will be executed in the CWD and if the command cannot be found an error message is shown.
-     *
-     * @param cmd  the command to look up
-     * @param args a list of arguments
-     * @param dir  the directory to execute the command in. If null, this will default to the CWD
-     * @return an LFCommand object or null if the command could not be found
-     * @see #createCommand(String, List, Path, boolean)
-     */
-    public LFCommand createCommand(String cmd, List<String> args, Path dir) {
-        return createCommand(cmd, args, dir, true);
-    }
-
-
-    /**
-     * Create a LFCommand instance from a given command, an argument list and a directory.
-     * <p>
-     * This will check first if the command can actually be found and executed. If the command is not found, null is
-     * returned. In addition, an error message will be shown if failOnError is true. Otherwise, a warning will be
-     * displayed.
-     *
-     * @param cmd         the command to look up
-     * @param args        a list of arguments
-     * @param dir         the directory to execute the command in. If null, this will default to the CWD
-     * @param failOnError If true, an error is shown if the command cannot be found. Otherwise, only a warning is
-     *                    displayed.
-     * @return an LFCommand object or null if the command could not be found
-     * @see LFCommand#get(String, List, boolean, Path)
-     */
-    public LFCommand createCommand(String cmd, List<String> args, Path dir, boolean failOnError) {
-        assert cmd != null && args != null;
-        if (dir == null) {
-            dir = Paths.get("");
-        }
-        LFCommand command = LFCommand.get(cmd, args, quiet, dir);
-        if (command != null) {
-            command.setEnvironmentVariable("LF_CURRENT_WORKING_DIRECTORY", dir.toString());
-            command.setEnvironmentVariable("LF_SOURCE_DIRECTORY", fileConfig.srcPath.toString());
-            command.setEnvironmentVariable("LF_PACKAGE_DIRECTORY", fileConfig.srcPkgPath.toString());
-            command.setEnvironmentVariable("LF_SOURCE_GEN_DIRECTORY", fileConfig.getSrcGenPath().toString());
-            command.setEnvironmentVariable("LF_BIN_DIRECTORY", fileConfig.binPath.toString());
-        } else {
-            final String message =
-                "The command " + cmd + " could not be found in the current working directory or in your PATH. " +
-                    "Make sure that your PATH variable includes the directory where " + cmd + " is installed. " +
-                    "You can set PATH in ~/.bash_profile on Linux or Mac.";
-            if (failOnError) {
-                errorReporter.reportError(message);
-            } else {
-                errorReporter.reportWarning(message);
-            }
-        }
-
-        return command;
-    }
+    return command;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/GeneratorResult.java b/org.lflang/src/org/lflang/generator/GeneratorResult.java
index 2b42e17f34..b882510d50 100644
--- a/org.lflang/src/org/lflang/generator/GeneratorResult.java
+++ b/org.lflang/src/org/lflang/generator/GeneratorResult.java
@@ -1,19 +1,9 @@
 package org.lflang.generator;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.function.BiFunction;
-import java.util.function.Function;
-
-import org.eclipse.xtext.generator.GeneratorContext;
-
-import org.lflang.FileConfig;
-import org.lflang.Target;
-import org.lflang.TargetConfig;
-import org.lflang.util.LFCommand;
 
 /**
  * A {@code GeneratorResult} is the outcome of a code generation task.
@@ -21,101 +11,99 @@
  * @author Peter Donovan
  */
 public class GeneratorResult {
-    public static GeneratorResult NOTHING = incompleteGeneratorResult(Status.NOTHING);
-    public static GeneratorResult CANCELLED = incompleteGeneratorResult(Status.CANCELLED);
-    public static GeneratorResult FAILED = incompleteGeneratorResult(Status.FAILED);
-    public static BiFunction<LFGeneratorContext, Map<Path, CodeMap>, GeneratorResult> GENERATED_NO_EXECUTABLE
-        = (context, codeMaps) -> new GeneratorResult(Status.GENERATED, context, codeMaps);
-
-    /**
-     * A {@code Status} is a level of completion of a code generation task.
-     */
-    public enum Status {
-        NOTHING(result -> ""),  // Code generation was not performed.
-        CANCELLED(result -> "Code generation was cancelled."),
-        FAILED(result -> ""),  // This may be due to a failed validation check, in which case the error should have been
-        // sent to the error reporter and handled there. This makes a message unnecessary.
-        GENERATED(GetUserMessage.COMPLETED),
-        COMPILED(GetUserMessage.COMPLETED);
-
-        /**
-         * A {@code GetUserMessage} is a function that translates a
-         * {@code GeneratorResult} into a human-readable report for the end user.
-         */
-        public interface GetUserMessage {
-            GetUserMessage COMPLETED = result -> {
-                return String.format(
-                    "Code generation complete. The executable is at \"%s\".",
-                    result.getContext().getFileConfig().getExecutable()
-                );
-            };
-            String apply(GeneratorResult result);
-        }
-
-        /** The {@code GetUserMessage} associated with this {@code Status}. */
-        private final GetUserMessage gum;
-
-        /** Initializes a {@code Status} whose {@code GetUserMessage} is {@code gum}. */
-        Status(GetUserMessage gum) {
-            this.gum = gum;
-        }
-    }
-
-    private final Status status;
-
-    private final LFGeneratorContext context;
-
-    private final Map<Path, CodeMap> codeMaps;
+  public static GeneratorResult NOTHING = incompleteGeneratorResult(Status.NOTHING);
+  public static GeneratorResult CANCELLED = incompleteGeneratorResult(Status.CANCELLED);
+  public static GeneratorResult FAILED = incompleteGeneratorResult(Status.FAILED);
+  public static BiFunction<LFGeneratorContext, Map<Path, CodeMap>, GeneratorResult>
+      GENERATED_NO_EXECUTABLE =
+          (context, codeMaps) -> new GeneratorResult(Status.GENERATED, context, codeMaps);
+
+  /** A {@code Status} is a level of completion of a code generation task. */
+  public enum Status {
+    NOTHING(result -> ""), // Code generation was not performed.
+    CANCELLED(result -> "Code generation was cancelled."),
+    FAILED(
+        result ->
+            ""), // This may be due to a failed validation check, in which case the error should
+    // have been
+    // sent to the error reporter and handled there. This makes a message unnecessary.
+    GENERATED(GetUserMessage.COMPLETED),
+    COMPILED(GetUserMessage.COMPLETED);
 
     /**
-     * Initialize a GeneratorResult.
-     * @param status The level of completion of a code generation task.
-     * @param context The context within which the result was produced.
-     * @param codeMaps A mapping from generated files to their CodeMaps.
+     * A {@code GetUserMessage} is a function that translates a {@code GeneratorResult} into a
+     * human-readable report for the end user.
      */
-    public GeneratorResult(Status status, LFGeneratorContext context, Map<Path, CodeMap> codeMaps) {
-        this.status = status != null ? status : Status.NOTHING;
-        this.context = context;
-        this.codeMaps = codeMaps != null ? codeMaps : Collections.emptyMap();
+    public interface GetUserMessage {
+      GetUserMessage COMPLETED =
+          result -> {
+            return String.format(
+                "Code generation complete. The executable is at \"%s\".",
+                result.getContext().getFileConfig().getExecutable());
+          };
+
+      String apply(GeneratorResult result);
     }
 
-    /**
-     * Return the result of an incomplete generation task that terminated
-     * with status {@code status}.
-     * @return the result of an incomplete generation task that terminated
-     * with status {@code status}
-     */
-    private static GeneratorResult incompleteGeneratorResult(Status status) {
-        return new GeneratorResult(status, null, Collections.emptyMap());
-    }
+    /** The {@code GetUserMessage} associated with this {@code Status}. */
+    private final GetUserMessage gum;
 
-    /** Return the status of {@code this}. */
-    public Status getStatus() {
-        return status;
+    /** Initializes a {@code Status} whose {@code GetUserMessage} is {@code gum}. */
+    Status(GetUserMessage gum) {
+      this.gum = gum;
     }
-
-    /**
-     * Return a message that can be relayed to the end user about this
-     * {@code GeneratorResult}.
-     */
-    public String getUserMessage() {
-        return status.gum.apply(this);
-    }
-
-    /**
-     * Return a map from generated sources to their code maps. The
-     * completeness of this resulting map is given on a best-effort
-     * basis, but those mappings that it does contain are guaranteed
-     * to be correct.
-     * @return An unmodifiable map from generated sources to their
-     * code maps.
-     */
-    public Map<Path, CodeMap> getCodeMaps() {
-        return Collections.unmodifiableMap(codeMaps);
-    }
-
-    public LFGeneratorContext getContext() {
-        return context;
-    }
-
+  }
+
+  private final Status status;
+
+  private final LFGeneratorContext context;
+
+  private final Map<Path, CodeMap> codeMaps;
+
+  /**
+   * Initialize a GeneratorResult.
+   *
+   * @param status The level of completion of a code generation task.
+   * @param context The context within which the result was produced.
+   * @param codeMaps A mapping from generated files to their CodeMaps.
+   */
+  public GeneratorResult(Status status, LFGeneratorContext context, Map<Path, CodeMap> codeMaps) {
+    this.status = status != null ? status : Status.NOTHING;
+    this.context = context;
+    this.codeMaps = codeMaps != null ? codeMaps : Collections.emptyMap();
+  }
+
+  /**
+   * Return the result of an incomplete generation task that terminated with status {@code status}.
+   *
+   * @return the result of an incomplete generation task that terminated with status {@code status}
+   */
+  private static GeneratorResult incompleteGeneratorResult(Status status) {
+    return new GeneratorResult(status, null, Collections.emptyMap());
+  }
+
+  /** Return the status of {@code this}. */
+  public Status getStatus() {
+    return status;
+  }
+
+  /** Return a message that can be relayed to the end user about this {@code GeneratorResult}. */
+  public String getUserMessage() {
+    return status.gum.apply(this);
+  }
+
+  /**
+   * Return a map from generated sources to their code maps. The completeness of this resulting map
+   * is given on a best-effort basis, but those mappings that it does contain are guaranteed to be
+   * correct.
+   *
+   * @return An unmodifiable map from generated sources to their code maps.
+   */
+  public Map<Path, CodeMap> getCodeMaps() {
+    return Collections.unmodifiableMap(codeMaps);
+  }
+
+  public LFGeneratorContext getContext() {
+    return context;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/GeneratorUtils.java b/org.lflang/src/org/lflang/generator/GeneratorUtils.java
index b4563a6165..04ae33ba0c 100644
--- a/org.lflang/src/org/lflang/generator/GeneratorUtils.java
+++ b/org.lflang/src/org/lflang/generator/GeneratorUtils.java
@@ -4,19 +4,17 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.LFGeneratorContext.Mode;
 import org.lflang.lf.Action;
 import org.lflang.lf.ActionOrigin;
@@ -27,177 +25,162 @@
 import org.lflang.lf.TargetDecl;
 
 /**
- * A helper class with functions that may be useful for code
- * generators.
- * This is created to ease our transition from Xtend and
- * possibly Eclipse. All functions in this class should
- * instead be in GeneratorUtils.kt, but Eclipse cannot
- * handle Kotlin files.
+ * A helper class with functions that may be useful for code generators. This is created to ease our
+ * transition from Xtend and possibly Eclipse. All functions in this class should instead be in
+ * GeneratorUtils.kt, but Eclipse cannot handle Kotlin files.
  */
 public class GeneratorUtils {
 
-    private GeneratorUtils() {
-        // utility class
-    }
+  private GeneratorUtils() {
+    // utility class
+  }
 
-    /**
-     * Return the target declaration found in the given resource.
-     */
-    public static TargetDecl findTargetDecl(Resource resource) {
-        return findAll(resource, TargetDecl.class).iterator().next();
-    }
+  /** Return the target declaration found in the given resource. */
+  public static TargetDecl findTargetDecl(Resource resource) {
+    return findAll(resource, TargetDecl.class).iterator().next();
+  }
 
-    /**
-     * Look for physical actions in 'resource'.
-     * If appropriate, set keepalive to true in
-     * {@code targetConfig}.
-     * This is a helper function for setTargetConfig. It
-     * should not be used elsewhere.
-     */
-    public static void accommodatePhysicalActionsIfPresent(
-        List<Resource> resources,
-        boolean setsKeepAliveOptionAutomatically,
-        TargetConfig targetConfig,
-        ErrorReporter errorReporter
-    ) {
-        if (!setsKeepAliveOptionAutomatically) {
-            return;
-        }
-        for (Resource resource : resources) {
-            for (Action action : findAll(resource, Action.class)) {
-                if (action.getOrigin() == ActionOrigin.PHYSICAL &&
-                    // Check if the user has explicitly set keepalive to false
-                    !targetConfig.setByUser.contains(TargetProperty.KEEPALIVE) &&
-                    !targetConfig.keepalive
-                ) {
-                    // If not, set it to true
-                    targetConfig.keepalive = true;
-                    errorReporter.reportWarning(
-                        action,
-                        String.format(
-                            "Setting %s to true because of the physical action %s.",
-                            TargetProperty.KEEPALIVE.getDisplayName(),
-                            action.getName()
-                        )
-                    );
-                    return;
-                }
-            }
+  /**
+   * Look for physical actions in 'resource'. If appropriate, set keepalive to true in {@code
+   * targetConfig}. This is a helper function for setTargetConfig. It should not be used elsewhere.
+   */
+  public static void accommodatePhysicalActionsIfPresent(
+      List<Resource> resources,
+      boolean setsKeepAliveOptionAutomatically,
+      TargetConfig targetConfig,
+      ErrorReporter errorReporter) {
+    if (!setsKeepAliveOptionAutomatically) {
+      return;
+    }
+    for (Resource resource : resources) {
+      for (Action action : findAll(resource, Action.class)) {
+        if (action.getOrigin() == ActionOrigin.PHYSICAL
+            &&
+            // Check if the user has explicitly set keepalive to false
+            !targetConfig.setByUser.contains(TargetProperty.KEEPALIVE)
+            && !targetConfig.keepalive) {
+          // If not, set it to true
+          targetConfig.keepalive = true;
+          errorReporter.reportWarning(
+              action,
+              String.format(
+                  "Setting %s to true because of the physical action %s.",
+                  TargetProperty.KEEPALIVE.getDisplayName(), action.getName()));
+          return;
         }
+      }
     }
+  }
 
-    /**
-     * Return all instances of {@code eObjectType} in
-     * {@code resource}.
-     * @param resource A resource to be searched.
-     * @param nodeType The type of the desired parse tree
-     *                    nodes.
-     * @param <T> The type of the desired parse tree nodes.
-     * @return all instances of {@code eObjectType} in
-     * {@code resource}
-     */
-    public static <T> Iterable<T> findAll(Resource resource, Class<T> nodeType) {
-        return () -> IteratorExtensions.filter(resource.getAllContents(), nodeType);
-    }
+  /**
+   * Return all instances of {@code eObjectType} in {@code resource}.
+   *
+   * @param resource A resource to be searched.
+   * @param nodeType The type of the desired parse tree nodes.
+   * @param <T> The type of the desired parse tree nodes.
+   * @return all instances of {@code eObjectType} in {@code resource}
+   */
+  public static <T> Iterable<T> findAll(Resource resource, Class<T> nodeType) {
+    return () -> IteratorExtensions.filter(resource.getAllContents(), nodeType);
+  }
 
-    /**
-     * Return the resources that provide the given
-     * reactors.
-     * @param reactors The reactors for which to find
-     *                 containing resources.
-     * @return the resources that provide the given
-     * reactors.
-     */
-    public static List<Resource> getResources(Iterable<Reactor> reactors) {
-        HashSet<Resource> visited = new HashSet<>();
-        List<Resource> resources = new ArrayList<>();
-        for (Reactor r : reactors) {
-            Resource resource = r.eResource();
-            if (!visited.contains(resource)) {
-                visited.add(resource);
-                resources.add(resource);
-            }
-        }
-        return resources;
+  /**
+   * Return the resources that provide the given reactors.
+   *
+   * @param reactors The reactors for which to find containing resources.
+   * @return the resources that provide the given reactors.
+   */
+  public static List<Resource> getResources(Iterable<Reactor> reactors) {
+    HashSet<Resource> visited = new HashSet<>();
+    List<Resource> resources = new ArrayList<>();
+    for (Reactor r : reactors) {
+      Resource resource = r.eResource();
+      if (!visited.contains(resource)) {
+        visited.add(resource);
+        resources.add(resource);
+      }
     }
+    return resources;
+  }
 
-    /**
-     * Return the {@code LFResource} representation of the
-     * given resource.
-     * @param resource The {@code Resource} to be
-     *                 represented as an {@code LFResource}
-     * @param srcGenBasePath The root directory for any
-     * generated sources associated with the resource.
-     * @param context The generator invocation context.
-     * @param errorReporter An error message acceptor.
-     * @return the {@code LFResource} representation of the
-     * given resource.
-     */
-    public static LFResource getLFResource(
-        Resource resource,
-        Path srcGenBasePath,
-        LFGeneratorContext context,
-        ErrorReporter errorReporter
-    ) {
-        var target = ASTUtils.targetDecl(resource);
-        KeyValuePairs config = target.getConfig();
-        var targetConfig = new TargetConfig(target);
-        if (config != null) {
-            List<KeyValuePair> pairs = config.getPairs();
-            TargetProperty.set(targetConfig, pairs != null ? pairs : List.of(), errorReporter);
-        }
-        FileConfig fc = LFGenerator.createFileConfig(resource, srcGenBasePath, context.getFileConfig().useHierarchicalBin);
-        return new LFResource(resource, fc, targetConfig);
+  /**
+   * Return the {@code LFResource} representation of the given resource.
+   *
+   * @param resource The {@code Resource} to be represented as an {@code LFResource}
+   * @param srcGenBasePath The root directory for any generated sources associated with the
+   *     resource.
+   * @param context The generator invocation context.
+   * @param errorReporter An error message acceptor.
+   * @return the {@code LFResource} representation of the given resource.
+   */
+  public static LFResource getLFResource(
+      Resource resource,
+      Path srcGenBasePath,
+      LFGeneratorContext context,
+      ErrorReporter errorReporter) {
+    var target = ASTUtils.targetDecl(resource);
+    KeyValuePairs config = target.getConfig();
+    var targetConfig = new TargetConfig(target);
+    if (config != null) {
+      List<KeyValuePair> pairs = config.getPairs();
+      TargetProperty.set(targetConfig, pairs != null ? pairs : List.of(), errorReporter);
     }
+    FileConfig fc =
+        LFGenerator.createFileConfig(
+            resource, srcGenBasePath, context.getFileConfig().useHierarchicalBin);
+    return new LFResource(resource, fc, targetConfig);
+  }
 
-    /**
-     * If the mode is Mode.EPOCH (the code generator is running in an
-     * Eclipse IDE), then refresh the project. This will ensure that
-     * any generated files become visible in the project.
-     * @param resource The resource.
-     * @param compilerMode An indicator of whether Epoch is running.
-     */
-    public static void refreshProject(Resource resource, Mode compilerMode) {
-        if (compilerMode == LFGeneratorContext.Mode.EPOCH) {
-            URI uri = resource.getURI();
-            if (uri.isPlatformResource()) { // This condition should normally be met when running Epoch
-                IResource member = ResourcesPlugin.getWorkspace().getRoot().findMember(uri.toPlatformString(true));
-                try {
-                    member.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
-                } catch (CoreException e) {
-                    System.err.println("Unable to refresh workspace: " + e);
-                }
-            }
+  /**
+   * If the mode is Mode.EPOCH (the code generator is running in an Eclipse IDE), then refresh the
+   * project. This will ensure that any generated files become visible in the project.
+   *
+   * @param resource The resource.
+   * @param compilerMode An indicator of whether Epoch is running.
+   */
+  public static void refreshProject(Resource resource, Mode compilerMode) {
+    if (compilerMode == LFGeneratorContext.Mode.EPOCH) {
+      URI uri = resource.getURI();
+      if (uri.isPlatformResource()) { // This condition should normally be met when running Epoch
+        IResource member =
+            ResourcesPlugin.getWorkspace().getRoot().findMember(uri.toPlatformString(true));
+        try {
+          member.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
+        } catch (CoreException e) {
+          System.err.println("Unable to refresh workspace: " + e);
         }
+      }
     }
+  }
 
-    /** Return whether the operating system is Windows. */
-    public static boolean isHostWindows() {
-        return System.getProperty("os.name").toLowerCase().contains("win");
-    }
+  /** Return whether the operating system is Windows. */
+  public static boolean isHostWindows() {
+    return System.getProperty("os.name").toLowerCase().contains("win");
+  }
 
-    /**
-     * Check whether code can be generated; report any problems
-     * and inform the context accordingly.
-     * @return Whether it is possible to generate code.
-     */
-    public static boolean canGenerate(
-        Boolean errorsOccurred,
-        Instantiation mainDef,
-        ErrorReporter errorReporter,
-        LFGeneratorContext context
-    ) {
-        // stop if there are any errors found in the program by doGenerate() in GeneratorBase
-        if (errorsOccurred) {
-            context.finish(GeneratorResult.FAILED);
-            return false;
-        }
-        // abort if there is no main reactor
-        if (mainDef == null) {
-            errorReporter.reportInfo("INFO: The given Lingua Franca program does not define a main reactor. Therefore, no code was generated.");
-            context.finish(GeneratorResult.NOTHING);
-            return false;
-        }
-        return true;
+  /**
+   * Check whether code can be generated; report any problems and inform the context accordingly.
+   *
+   * @return Whether it is possible to generate code.
+   */
+  public static boolean canGenerate(
+      Boolean errorsOccurred,
+      Instantiation mainDef,
+      ErrorReporter errorReporter,
+      LFGeneratorContext context) {
+    // stop if there are any errors found in the program by doGenerate() in GeneratorBase
+    if (errorsOccurred) {
+      context.finish(GeneratorResult.FAILED);
+      return false;
+    }
+    // abort if there is no main reactor
+    if (mainDef == null) {
+      errorReporter.reportInfo(
+          "INFO: The given Lingua Franca program does not define a main reactor. Therefore, no code"
+              + " was generated.");
+      context.finish(GeneratorResult.NOTHING);
+      return false;
     }
+    return true;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/HumanReadableReportingStrategy.java b/org.lflang/src/org/lflang/generator/HumanReadableReportingStrategy.java
index f6ecd0a991..8c1dd1e547 100644
--- a/org.lflang/src/org/lflang/generator/HumanReadableReportingStrategy.java
+++ b/org.lflang/src/org/lflang/generator/HumanReadableReportingStrategy.java
@@ -6,171 +6,163 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure0;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure2;
-
 import org.lflang.ErrorReporter;
 
 /**
- * An error reporting strategy that parses human-readable
- * output.
+ * An error reporting strategy that parses human-readable output.
  *
  * @author Peter Donovan
  */
 public class HumanReadableReportingStrategy implements DiagnosticReporting.Strategy {
 
-    /** A pattern that matches lines that should be reported via this strategy. */
-    private final Pattern diagnosticMessagePattern;
-    /** A pattern that matches labels that show the exact range to which the diagnostic pertains. */
-    private final Pattern labelPattern;
-    /** The path against which any paths should be resolved. */
-    private final Path relativeTo;
-    /** The next line to be processed, or {@code null}. */
-    private String bufferedLine;
+  /** A pattern that matches lines that should be reported via this strategy. */
+  private final Pattern diagnosticMessagePattern;
+  /** A pattern that matches labels that show the exact range to which the diagnostic pertains. */
+  private final Pattern labelPattern;
+  /** The path against which any paths should be resolved. */
+  private final Path relativeTo;
+  /** The next line to be processed, or {@code null}. */
+  private String bufferedLine;
 
-    /**
-     * Instantiate a reporting strategy for lines of
-     * validator output that match {@code diagnosticMessagePattern}.
-     * @param diagnosticMessagePattern A pattern that matches lines that should be
-     *          reported via this strategy. This pattern
-     *          must contain named capturing groups called
-     *          "path", "line", "column", "message", and
-     *          "severity".
-     * @param labelPattern A pattern that matches lines that act as labels, showing
-     *                     the location of the relevant piece of text. This pattern
-     *                     must contain two groups, the first of which must match
-     *                     characters that precede the location given by the "line"
-     *                     and "column" groups.
-     */
-    public HumanReadableReportingStrategy(Pattern diagnosticMessagePattern, Pattern labelPattern) {
-        this(diagnosticMessagePattern, labelPattern, null);
-    }
+  /**
+   * Instantiate a reporting strategy for lines of validator output that match {@code
+   * diagnosticMessagePattern}.
+   *
+   * @param diagnosticMessagePattern A pattern that matches lines that should be reported via this
+   *     strategy. This pattern must contain named capturing groups called "path", "line", "column",
+   *     "message", and "severity".
+   * @param labelPattern A pattern that matches lines that act as labels, showing the location of
+   *     the relevant piece of text. This pattern must contain two groups, the first of which must
+   *     match characters that precede the location given by the "line" and "column" groups.
+   */
+  public HumanReadableReportingStrategy(Pattern diagnosticMessagePattern, Pattern labelPattern) {
+    this(diagnosticMessagePattern, labelPattern, null);
+  }
 
-    /**
-     * Instantiate a reporting strategy for lines of
-     * validator output that match {@code diagnosticMessagePattern}.
-     * @param diagnosticMessagePattern a pattern that matches lines that should be
-     *          reported via this strategy. This pattern
-     *          must contain named capturing groups called
-     *          "path", "line", "column", "message", and
-     *          "severity".
-     * @param labelPattern A pattern that matches lines that act as labels, showing
-     *                     the location of the relevant piece of text. This pattern
-     *                     must contain two groups, the first of which must match
-     *                     characters that precede the location given by the "line"
-     *                     and "column" groups.
-     * @param relativeTo The path against which any paths should be resolved.
-     */
-    public HumanReadableReportingStrategy(Pattern diagnosticMessagePattern, Pattern labelPattern, Path relativeTo) {
-        for (String groupName : new String[]{"path", "line", "column", "message", "severity"}) {
-            assert diagnosticMessagePattern.pattern().contains(groupName) : String.format(
-                "Error line patterns must have a named capturing group called %s", groupName
-            );
-        }
-        this.diagnosticMessagePattern = diagnosticMessagePattern;
-        this.labelPattern = labelPattern;
-        this.relativeTo = relativeTo;
-        this.bufferedLine = null;
+  /**
+   * Instantiate a reporting strategy for lines of validator output that match {@code
+   * diagnosticMessagePattern}.
+   *
+   * @param diagnosticMessagePattern a pattern that matches lines that should be reported via this
+   *     strategy. This pattern must contain named capturing groups called "path", "line", "column",
+   *     "message", and "severity".
+   * @param labelPattern A pattern that matches lines that act as labels, showing the location of
+   *     the relevant piece of text. This pattern must contain two groups, the first of which must
+   *     match characters that precede the location given by the "line" and "column" groups.
+   * @param relativeTo The path against which any paths should be resolved.
+   */
+  public HumanReadableReportingStrategy(
+      Pattern diagnosticMessagePattern, Pattern labelPattern, Path relativeTo) {
+    for (String groupName : new String[] {"path", "line", "column", "message", "severity"}) {
+      assert diagnosticMessagePattern.pattern().contains(groupName)
+          : String.format(
+              "Error line patterns must have a named capturing group called %s", groupName);
     }
+    this.diagnosticMessagePattern = diagnosticMessagePattern;
+    this.labelPattern = labelPattern;
+    this.relativeTo = relativeTo;
+    this.bufferedLine = null;
+  }
 
-    @Override
-    public void report(String validationOutput, ErrorReporter errorReporter, Map<Path, CodeMap> map) {
-        Iterator<String> it = validationOutput.lines().iterator();
-        while (it.hasNext() || bufferedLine != null) {
-            if (bufferedLine != null) {
-                reportErrorLine(bufferedLine, it, errorReporter, map);
-                bufferedLine = null;
-            } else {
-                reportErrorLine(it.next(), it, errorReporter, map);
-            }
-        }
+  @Override
+  public void report(String validationOutput, ErrorReporter errorReporter, Map<Path, CodeMap> map) {
+    Iterator<String> it = validationOutput.lines().iterator();
+    while (it.hasNext() || bufferedLine != null) {
+      if (bufferedLine != null) {
+        reportErrorLine(bufferedLine, it, errorReporter, map);
+        bufferedLine = null;
+      } else {
+        reportErrorLine(it.next(), it, errorReporter, map);
+      }
     }
+  }
 
-    /**
-     * Report the validation message contained in the given line of text.
-     * @param line The current line.
-     * @param it An iterator over the lines that follow the current line.
-     * @param errorReporter An arbitrary ErrorReporter.
-     * @param maps A mapping from generated file paths to
-     *             CodeMaps.
-     */
-    private void reportErrorLine(String line, Iterator<String> it, ErrorReporter errorReporter, Map<Path, CodeMap> maps) {
-        Matcher matcher = diagnosticMessagePattern.matcher(stripEscaped(line));
-        if (matcher.matches()) {
-            final Path path = Paths.get(matcher.group("path"));
-            final Position generatedFilePosition = Position.fromOneBased(
-                Integer.parseInt(matcher.group("line")),
-                Integer.parseInt(matcher.group("column") != null ? matcher.group("column") : "0") // FIXME: Unreliable heuristic
-            );
-            final String message = DiagnosticReporting.messageOf(
-                matcher.group("message"), path, generatedFilePosition
-            );
-            final CodeMap map = maps.get(relativeTo != null ? relativeTo.resolve(path) : path);
-            final DiagnosticSeverity severity = DiagnosticReporting.severityOf(matcher.group("severity"));
-            if (map == null) {
-                errorReporter.report(null, severity, message);
-                return;
-            }
-            for (Path srcFile : map.lfSourcePaths()) {
-                Position lfFilePosition = map.adjusted(srcFile, generatedFilePosition);
-                if (matcher.group("column") != null) {
-                    reportAppropriateRange(
-                        (p0, p1) -> errorReporter.report(srcFile, severity, message, p0, p1), lfFilePosition, it
-                    );
-                } else {
-                    errorReporter.report(srcFile, severity, message, lfFilePosition.getOneBasedLine());
-                }
-            }
+  /**
+   * Report the validation message contained in the given line of text.
+   *
+   * @param line The current line.
+   * @param it An iterator over the lines that follow the current line.
+   * @param errorReporter An arbitrary ErrorReporter.
+   * @param maps A mapping from generated file paths to CodeMaps.
+   */
+  private void reportErrorLine(
+      String line, Iterator<String> it, ErrorReporter errorReporter, Map<Path, CodeMap> maps) {
+    Matcher matcher = diagnosticMessagePattern.matcher(stripEscaped(line));
+    if (matcher.matches()) {
+      final Path path = Paths.get(matcher.group("path"));
+      final Position generatedFilePosition =
+          Position.fromOneBased(
+              Integer.parseInt(matcher.group("line")),
+              Integer.parseInt(
+                  matcher.group("column") != null
+                      ? matcher.group("column")
+                      : "0") // FIXME: Unreliable heuristic
+              );
+      final String message =
+          DiagnosticReporting.messageOf(matcher.group("message"), path, generatedFilePosition);
+      final CodeMap map = maps.get(relativeTo != null ? relativeTo.resolve(path) : path);
+      final DiagnosticSeverity severity = DiagnosticReporting.severityOf(matcher.group("severity"));
+      if (map == null) {
+        errorReporter.report(null, severity, message);
+        return;
+      }
+      for (Path srcFile : map.lfSourcePaths()) {
+        Position lfFilePosition = map.adjusted(srcFile, generatedFilePosition);
+        if (matcher.group("column") != null) {
+          reportAppropriateRange(
+              (p0, p1) -> errorReporter.report(srcFile, severity, message, p0, p1),
+              lfFilePosition,
+              it);
+        } else {
+          errorReporter.report(srcFile, severity, message, lfFilePosition.getOneBasedLine());
         }
+      }
     }
+  }
 
-    /**
-     * Report the appropriate range to {@code report}.
-     * @param report A reporting method whose first and
-     *               second parameters are the (included)
-     *               start and (excluded) end of the
-     *               relevant range.
-     * @param lfFilePosition The point about which the
-     *                       relevant range is anchored.
-     * @param it An iterator over the lines immediately
-     *           following a diagnostic message.
-     */
-    private void reportAppropriateRange(
-        Procedure2<Position, Position> report, Position lfFilePosition, Iterator<String> it
-    ) {
-        Procedure0 failGracefully = () -> report.apply(lfFilePosition, lfFilePosition.plus(" "));
-        if (!it.hasNext()) {
-            failGracefully.apply();
-            return;
-        }
-        String line = it.next();
-        Matcher labelMatcher = labelPattern.matcher(line);
-        if (labelMatcher.find()) {
-            report.apply(
-                Position.fromZeroBased(
-                    lfFilePosition.getZeroBasedLine(),
-                    lfFilePosition.getZeroBasedColumn() - labelMatcher.group(1).length()
-                ),
-                lfFilePosition.plus(labelMatcher.group(2))
-            );
-            return;
-        }
-        if (diagnosticMessagePattern.matcher(line).find()) {
-            failGracefully.apply();
-            bufferedLine = line;
-            return;
-        }
-        reportAppropriateRange(report, lfFilePosition, it);
+  /**
+   * Report the appropriate range to {@code report}.
+   *
+   * @param report A reporting method whose first and second parameters are the (included) start and
+   *     (excluded) end of the relevant range.
+   * @param lfFilePosition The point about which the relevant range is anchored.
+   * @param it An iterator over the lines immediately following a diagnostic message.
+   */
+  private void reportAppropriateRange(
+      Procedure2<Position, Position> report, Position lfFilePosition, Iterator<String> it) {
+    Procedure0 failGracefully = () -> report.apply(lfFilePosition, lfFilePosition.plus(" "));
+    if (!it.hasNext()) {
+      failGracefully.apply();
+      return;
     }
-
-    /**
-     * Strip the ANSI escape sequences from {@code s}.
-     * @param s Any string.
-     * @return {@code s}, with any escape sequences removed.
-     */
-    private static String stripEscaped(String s) {
-        return s.replaceAll("\u001B\\[[;\\d]*[ -/]*[@-~]", "");
+    String line = it.next();
+    Matcher labelMatcher = labelPattern.matcher(line);
+    if (labelMatcher.find()) {
+      report.apply(
+          Position.fromZeroBased(
+              lfFilePosition.getZeroBasedLine(),
+              lfFilePosition.getZeroBasedColumn() - labelMatcher.group(1).length()),
+          lfFilePosition.plus(labelMatcher.group(2)));
+      return;
     }
+    if (diagnosticMessagePattern.matcher(line).find()) {
+      failGracefully.apply();
+      bufferedLine = line;
+      return;
+    }
+    reportAppropriateRange(report, lfFilePosition, it);
+  }
+
+  /**
+   * Strip the ANSI escape sequences from {@code s}.
+   *
+   * @param s Any string.
+   * @return {@code s}, with any escape sequences removed.
+   */
+  private static String stripEscaped(String s) {
+    return s.replaceAll("\u001B\\[[;\\d]*[ -/]*[@-~]", "");
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/IntegratedBuilder.java b/org.lflang/src/org/lflang/generator/IntegratedBuilder.java
index d6a2d3d681..f87c81728d 100644
--- a/org.lflang/src/org/lflang/generator/IntegratedBuilder.java
+++ b/org.lflang/src/org/lflang/generator/IntegratedBuilder.java
@@ -1,9 +1,10 @@
 package org.lflang.generator;
 
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Properties;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -15,142 +16,133 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.eclipse.xtext.validation.Issue;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.generator.LFGeneratorContext.Mode;
 
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-
 /**
- * Manages Lingua Franca build processes that are requested
- * from the language server.
+ * Manages Lingua Franca build processes that are requested from the language server.
  *
  * @author Peter Donovan
  */
 public class IntegratedBuilder {
-    public static final int START_PERCENT_PROGRESS = 0;
-    public static final int VALIDATED_PERCENT_PROGRESS = 33;
-    public static final int GENERATED_PERCENT_PROGRESS = 67;
-    public static final int COMPILED_PERCENT_PROGRESS = 100;
-
-    /**
-     * A {@code ProgressReporter} reports the progress of a build.
-     */
-    public interface ReportProgress {
-        void apply(String message, Integer percentage);
-    }
-
-    // Note: This class is not currently used in response to
-    //  document edits, even though the validator and code
-    //  generator are invoked by Xtext in response to
-    //  document edits.
-    /**
-     * A {@code ReportMethod} is a way of reporting issues.
-     */
-    private interface ReportMethod {
-        void apply(Path file, Integer line, String message);
-    }
-
-    /* ---------------------- INJECTED DEPENDENCIES ---------------------- */
-
-    @Inject
-    private IResourceValidator validator;
-    @Inject
-    private GeneratorDelegate generator;
-    @Inject
-    private JavaIoFileSystemAccess fileAccess;
-    @Inject
-    private Provider<ResourceSet> resourceSetProvider;
-
-    /* ------------------------- PUBLIC METHODS -------------------------- */
-
-    /**
-     * Generates code from the Lingua Franca file {@code f}.
-     * @param uri The URI of a Lingua Franca file.
-     * @param mustComplete Whether the build must be taken to completion.
-     * @return The result of the build.
-     */
-    public GeneratorResult run(
-        URI uri,
-        boolean mustComplete,
-        ReportProgress reportProgress,
-        CancelIndicator cancelIndicator
-    ) {
-        fileAccess.setOutputPath(
-            FileConfig.findPackageRoot(Path.of(uri.path()), s -> {}).resolve(FileConfig.DEFAULT_SRC_GEN_DIR).toString()
-        );
-        List<EObject> parseRoots = getResource(uri).getContents();
-        if (parseRoots.isEmpty()) return GeneratorResult.NOTHING;
-        ErrorReporter errorReporter = new LanguageServerErrorReporter(parseRoots.get(0));
-        reportProgress.apply("Validating...", START_PERCENT_PROGRESS);
-        validate(uri, errorReporter);
-        reportProgress.apply("Code validation complete.", VALIDATED_PERCENT_PROGRESS);
-        if (cancelIndicator.isCanceled()) return GeneratorResult.CANCELLED;
-        if (errorReporter.getErrorsOccurred()) return GeneratorResult.FAILED;
-        reportProgress.apply("Generating code...", VALIDATED_PERCENT_PROGRESS);
-        return doGenerate(uri, mustComplete, reportProgress, cancelIndicator);
-    }
-
-    /* ------------------------- PRIVATE METHODS ------------------------- */
-
-    /**
-     * Validates the Lingua Franca file {@code f}.
-     * @param uri The URI of a Lingua Franca file.
-     * @param errorReporter The error reporter.
-     */
-    private void validate(URI uri, ErrorReporter errorReporter) {
-        for (Issue issue : validator.validate(getResource(uri), CheckMode.ALL, CancelIndicator.NullImpl)) {
-            getReportMethod(errorReporter, issue.getSeverity()).apply(
-                Path.of(uri.path()), issue.getLineNumber(), issue.getMessage()
-            );
-        }
+  public static final int START_PERCENT_PROGRESS = 0;
+  public static final int VALIDATED_PERCENT_PROGRESS = 33;
+  public static final int GENERATED_PERCENT_PROGRESS = 67;
+  public static final int COMPILED_PERCENT_PROGRESS = 100;
+
+  /** A {@code ProgressReporter} reports the progress of a build. */
+  public interface ReportProgress {
+    void apply(String message, Integer percentage);
+  }
+
+  // Note: This class is not currently used in response to
+  //  document edits, even though the validator and code
+  //  generator are invoked by Xtext in response to
+  //  document edits.
+  /** A {@code ReportMethod} is a way of reporting issues. */
+  private interface ReportMethod {
+    void apply(Path file, Integer line, String message);
+  }
+
+  /* ---------------------- INJECTED DEPENDENCIES ---------------------- */
+
+  @Inject private IResourceValidator validator;
+  @Inject private GeneratorDelegate generator;
+  @Inject private JavaIoFileSystemAccess fileAccess;
+  @Inject private Provider<ResourceSet> resourceSetProvider;
+
+  /* ------------------------- PUBLIC METHODS -------------------------- */
+
+  /**
+   * Generates code from the Lingua Franca file {@code f}.
+   *
+   * @param uri The URI of a Lingua Franca file.
+   * @param mustComplete Whether the build must be taken to completion.
+   * @return The result of the build.
+   */
+  public GeneratorResult run(
+      URI uri,
+      boolean mustComplete,
+      ReportProgress reportProgress,
+      CancelIndicator cancelIndicator) {
+    fileAccess.setOutputPath(
+        FileConfig.findPackageRoot(Path.of(uri.path()), s -> {})
+            .resolve(FileConfig.DEFAULT_SRC_GEN_DIR)
+            .toString());
+    List<EObject> parseRoots = getResource(uri).getContents();
+    if (parseRoots.isEmpty()) return GeneratorResult.NOTHING;
+    ErrorReporter errorReporter = new LanguageServerErrorReporter(parseRoots.get(0));
+    reportProgress.apply("Validating...", START_PERCENT_PROGRESS);
+    validate(uri, errorReporter);
+    reportProgress.apply("Code validation complete.", VALIDATED_PERCENT_PROGRESS);
+    if (cancelIndicator.isCanceled()) return GeneratorResult.CANCELLED;
+    if (errorReporter.getErrorsOccurred()) return GeneratorResult.FAILED;
+    reportProgress.apply("Generating code...", VALIDATED_PERCENT_PROGRESS);
+    return doGenerate(uri, mustComplete, reportProgress, cancelIndicator);
+  }
+
+  /* ------------------------- PRIVATE METHODS ------------------------- */
+
+  /**
+   * Validates the Lingua Franca file {@code f}.
+   *
+   * @param uri The URI of a Lingua Franca file.
+   * @param errorReporter The error reporter.
+   */
+  private void validate(URI uri, ErrorReporter errorReporter) {
+    for (Issue issue :
+        validator.validate(getResource(uri), CheckMode.ALL, CancelIndicator.NullImpl)) {
+      getReportMethod(errorReporter, issue.getSeverity())
+          .apply(Path.of(uri.path()), issue.getLineNumber(), issue.getMessage());
     }
-
-    /**
-     * Generates code from the contents of {@code f}.
-     * @param uri The URI of a Lingua Franca file.
-     * @param mustComplete Whether the build must be taken to completion.
-     * @param cancelIndicator An indicator that returns true when the build is
-     *                        cancelled.
-     * @return The result of the build.
-     */
-    private GeneratorResult doGenerate(
-        URI uri,
-        boolean mustComplete,
-        ReportProgress reportProgress,
-        CancelIndicator cancelIndicator
-    ) {
-        var resource = getResource(uri);
-        LFGeneratorContext context = new MainContext(
+  }
+
+  /**
+   * Generates code from the contents of {@code f}.
+   *
+   * @param uri The URI of a Lingua Franca file.
+   * @param mustComplete Whether the build must be taken to completion.
+   * @param cancelIndicator An indicator that returns true when the build is cancelled.
+   * @return The result of the build.
+   */
+  private GeneratorResult doGenerate(
+      URI uri,
+      boolean mustComplete,
+      ReportProgress reportProgress,
+      CancelIndicator cancelIndicator) {
+    var resource = getResource(uri);
+    LFGeneratorContext context =
+        new MainContext(
             mustComplete ? Mode.LSP_SLOW : LFGeneratorContext.Mode.LSP_MEDIUM,
-            cancelIndicator, reportProgress, new Properties(),
-            resource, fileAccess,
-            fileConfig -> new LanguageServerErrorReporter(resource.getContents().get(0))
-        );
-        generator.generate(getResource(uri), fileAccess, context);
-        return context.getResult();
-    }
-
-    /**
-     * Returns the resource corresponding to {@code uri}.
-     * @param uri The URI of a Lingua Franca file.
-     * @return The resource corresponding to {@code uri}.
-     */
-    private Resource getResource(URI uri) {
-        return resourceSetProvider.get().getResource(uri, true);
-    }
-
-    /**
-     * Returns the appropriate reporting method for the
-     * given {@code Severity}.
-     * @param severity An arbitrary {@code Severity}.
-     * @return The appropriate reporting method for
-     * {@code severity}.
-     */
-    private ReportMethod getReportMethod(ErrorReporter errorReporter, Severity severity) {
-        if (severity == Severity.ERROR) return errorReporter::reportError;
-        return errorReporter::reportWarning;
-    }
+            cancelIndicator,
+            reportProgress,
+            new Properties(),
+            resource,
+            fileAccess,
+            fileConfig -> new LanguageServerErrorReporter(resource.getContents().get(0)));
+    generator.generate(getResource(uri), fileAccess, context);
+    return context.getResult();
+  }
+
+  /**
+   * Returns the resource corresponding to {@code uri}.
+   *
+   * @param uri The URI of a Lingua Franca file.
+   * @return The resource corresponding to {@code uri}.
+   */
+  private Resource getResource(URI uri) {
+    return resourceSetProvider.get().getResource(uri, true);
+  }
+
+  /**
+   * Returns the appropriate reporting method for the given {@code Severity}.
+   *
+   * @param severity An arbitrary {@code Severity}.
+   * @return The appropriate reporting method for {@code severity}.
+   */
+  private ReportMethod getReportMethod(ErrorReporter errorReporter, Severity severity) {
+    if (severity == Severity.ERROR) return errorReporter::reportError;
+    return errorReporter::reportWarning;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/InvalidLfSourceException.java b/org.lflang/src/org/lflang/generator/InvalidLfSourceException.java
index 515bdbb8a0..61cf9632f2 100644
--- a/org.lflang/src/org/lflang/generator/InvalidLfSourceException.java
+++ b/org.lflang/src/org/lflang/generator/InvalidLfSourceException.java
@@ -27,32 +27,31 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * An exception that indicates invalid source, which should
- * be reported to the user. This is an error, it should not
- * be used for warnings.
+ * An exception that indicates invalid source, which should be reported to the user. This is an
+ * error, it should not be used for warnings.
  *
  * @author Clément Fournier
  */
 public class InvalidLfSourceException extends RuntimeException {
 
-    private final EObject node;
-    private final String problem;
+  private final EObject node;
+  private final String problem;
 
-    public InvalidLfSourceException(EObject node, String problem) {
-        super(problem);
-        this.node = node;
-        this.problem = problem;
-    }
+  public InvalidLfSourceException(EObject node, String problem) {
+    super(problem);
+    this.node = node;
+    this.problem = problem;
+  }
 
-    public InvalidLfSourceException(String problem, EObject node) {
-        this(node, problem);
-    }
+  public InvalidLfSourceException(String problem, EObject node) {
+    this(node, problem);
+  }
 
-    public EObject getNode() {
-        return node;
-    }
+  public EObject getNode() {
+    return node;
+  }
 
-    public String getProblem() {
-        return problem;
-    }
+  public String getProblem() {
+    return problem;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/InvalidSourceException.java b/org.lflang/src/org/lflang/generator/InvalidSourceException.java
index 11bedabce2..88b65d0c24 100644
--- a/org.lflang/src/org/lflang/generator/InvalidSourceException.java
+++ b/org.lflang/src/org/lflang/generator/InvalidSourceException.java
@@ -25,19 +25,17 @@
 package org.lflang.generator;
 
 /**
- *
- * This exception is thrown when a program fails a validity check
- * performed by a code generator (and not the validator). This should
- * be thrown only when local control flow cannot recover, otherwise
- * using {@link GeneratorBase#errorReporter} should be preferred,
- * in order to collect more errors before failing.
+ * This exception is thrown when a program fails a validity check performed by a code generator (and
+ * not the validator). This should be thrown only when local control flow cannot recover, otherwise
+ * using {@link GeneratorBase#errorReporter} should be preferred, in order to collect more errors
+ * before failing.
  *
  * @author Clément Fournier
  */
 public class InvalidSourceException extends RuntimeException {
 
-    /** Create a new instance of the exception with the given message. */
-    public InvalidSourceException(String message) {
-        super(message);
-    }
+  /** Create a new instance of the exception with the given message. */
+  public InvalidSourceException(String message) {
+    super(message);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/LFGenerator.java b/org.lflang/src/org/lflang/generator/LFGenerator.java
index c8d985e80c..f2881c9fb8 100644
--- a/org.lflang/src/org/lflang/generator/LFGenerator.java
+++ b/org.lflang/src/org/lflang/generator/LFGenerator.java
@@ -1,19 +1,18 @@
 package org.lflang.generator;
 
+import com.google.inject.Inject;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.AbstractGenerator;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 import org.eclipse.xtext.generator.IGeneratorContext;
 import org.eclipse.xtext.util.RuntimeIOException;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.Target;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedASTUtils;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FedGenerator;
@@ -23,170 +22,179 @@
 import org.lflang.generator.python.PythonGenerator;
 import org.lflang.scoping.LFGlobalScopeProvider;
 
-import com.google.inject.Inject;
-
 /**
  * Generates code from your model files on save.
  *
- * See
- * https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#code-generation
+ * <p>See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#code-generation
  */
 public class LFGenerator extends AbstractGenerator {
 
-    @Inject
-    private LFGlobalScopeProvider scopeProvider;
-
-    // Indicator of whether generator errors occurred.
-    protected boolean generatorErrorsOccurred = false;
-
-    /**
-     * Create a target-specific FileConfig object in Kotlin
-     * <p>
-     * Since the CppFileConfig and TSFileConfig class are implemented in Kotlin, the classes are
-     * not visible from all contexts. If the RCA is run from within Eclipse via
-     * "Run as Eclipse Application", the Kotlin classes are unfortunately not
-     * available at runtime due to bugs in the Eclipse Kotlin plugin. (See
-     * https://stackoverflow.com/questions/68095816/is-ist-possible-to-build-mixed-kotlin-and-java-applications-with-a-recent-eclips)
-     * <p>
-     * If the FileConfig class is found, this method returns an instance.
-     * Otherwise, it returns an Instance of FileConfig.
-     *
-     * @return A FileConfig object in Kotlin if the class can be found.
-     * @throws IOException If the file config could not be created properly
-     */
-    public static FileConfig createFileConfig(Resource resource, Path srcGenBasePath,
-                                        boolean useHierarchicalBin) {
-
-        final Target target = Target.fromDecl(ASTUtils.targetDecl(resource));
-        assert target != null;
-
-        // Since our Eclipse Plugin uses code injection via guice, we need to
-        // play a few tricks here so that FileConfig does not appear as an
-        // import. Instead, we look the class up at runtime and instantiate it if
-        // found.
-        try {
-            if (FedASTUtils.findFederatedReactor(resource) != null) {
-                return new FedFileConfig(resource, srcGenBasePath, useHierarchicalBin);
-            }
-            switch (target) {
-            case CCPP:
-            case C: return new CFileConfig(resource, srcGenBasePath, useHierarchicalBin);
-            case Python: return new PyFileConfig(resource, srcGenBasePath, useHierarchicalBin);
-            case CPP:
-            case Rust:
-            case TS:
-                String className = "org.lflang.generator." + target.packageName + "." + target.classNamePrefix + "FileConfig";
-                try {
-                    return (FileConfig) Class.forName(className)
-                                             .getDeclaredConstructor(Resource.class, Path.class, boolean.class)
-                                             .newInstance(resource, srcGenBasePath, useHierarchicalBin);
-                } catch (ReflectiveOperationException e) {
-                    throw new RuntimeException(
-                        "Exception instantiating " + className, e.getCause());
-                }
-            default:
-                throw new RuntimeException("Could not find FileConfig implementation for target " + target);
-            }
-        } catch (IOException e) {
-            throw new RuntimeException("Unable to create FileConfig object for target " + target + ": " + e.getStackTrace());
-        }
+  @Inject private LFGlobalScopeProvider scopeProvider;
+
+  // Indicator of whether generator errors occurred.
+  protected boolean generatorErrorsOccurred = false;
+
+  /**
+   * Create a target-specific FileConfig object in Kotlin
+   *
+   * <p>Since the CppFileConfig and TSFileConfig class are implemented in Kotlin, the classes are
+   * not visible from all contexts. If the RCA is run from within Eclipse via "Run as Eclipse
+   * Application", the Kotlin classes are unfortunately not available at runtime due to bugs in the
+   * Eclipse Kotlin plugin. (See
+   * https://stackoverflow.com/questions/68095816/is-ist-possible-to-build-mixed-kotlin-and-java-applications-with-a-recent-eclips)
+   *
+   * <p>If the FileConfig class is found, this method returns an instance. Otherwise, it returns an
+   * Instance of FileConfig.
+   *
+   * @return A FileConfig object in Kotlin if the class can be found.
+   * @throws IOException If the file config could not be created properly
+   */
+  public static FileConfig createFileConfig(
+      Resource resource, Path srcGenBasePath, boolean useHierarchicalBin) {
+
+    final Target target = Target.fromDecl(ASTUtils.targetDecl(resource));
+    assert target != null;
+
+    // Since our Eclipse Plugin uses code injection via guice, we need to
+    // play a few tricks here so that FileConfig does not appear as an
+    // import. Instead, we look the class up at runtime and instantiate it if
+    // found.
+    try {
+      if (FedASTUtils.findFederatedReactor(resource) != null) {
+        return new FedFileConfig(resource, srcGenBasePath, useHierarchicalBin);
+      }
+      switch (target) {
+        case CCPP:
+        case C:
+          return new CFileConfig(resource, srcGenBasePath, useHierarchicalBin);
+        case Python:
+          return new PyFileConfig(resource, srcGenBasePath, useHierarchicalBin);
+        case CPP:
+        case Rust:
+        case TS:
+          String className =
+              "org.lflang.generator."
+                  + target.packageName
+                  + "."
+                  + target.classNamePrefix
+                  + "FileConfig";
+          try {
+            return (FileConfig)
+                Class.forName(className)
+                    .getDeclaredConstructor(Resource.class, Path.class, boolean.class)
+                    .newInstance(resource, srcGenBasePath, useHierarchicalBin);
+          } catch (ReflectiveOperationException e) {
+            throw new RuntimeException("Exception instantiating " + className, e.getCause());
+          }
+        default:
+          throw new RuntimeException(
+              "Could not find FileConfig implementation for target " + target);
+      }
+    } catch (IOException e) {
+      throw new RuntimeException(
+          "Unable to create FileConfig object for target " + target + ": " + e.getStackTrace());
     }
-
-    /**
-     *  Create a generator object for the given target.
-     *  Returns null if the generator could not be created.
-     */
-    private GeneratorBase createGenerator(LFGeneratorContext context) {
-        final Target target = Target.fromDecl(ASTUtils.targetDecl(context.getFileConfig().resource));
-        assert target != null;
-        return switch (target) {
-            case C -> new CGenerator(context, false);
-            case CCPP -> new CGenerator(context, true);
-            case Python -> new PythonGenerator(context);
-            case CPP, TS, Rust ->
-                createKotlinBaseGenerator(target, context);
-            // If no case matched, then throw a runtime exception.
-            default -> throw new RuntimeException("Unexpected target!");
-        };
+  }
+
+  /**
+   * Create a generator object for the given target. Returns null if the generator could not be
+   * created.
+   */
+  private GeneratorBase createGenerator(LFGeneratorContext context) {
+    final Target target = Target.fromDecl(ASTUtils.targetDecl(context.getFileConfig().resource));
+    assert target != null;
+    return switch (target) {
+      case C -> new CGenerator(context, false);
+      case CCPP -> new CGenerator(context, true);
+      case Python -> new PythonGenerator(context);
+      case CPP, TS, Rust -> createKotlinBaseGenerator(target, context);
+        // If no case matched, then throw a runtime exception.
+      default -> throw new RuntimeException("Unexpected target!");
+    };
+  }
+
+  /**
+   * Create a code generator in Kotlin.
+   *
+   * <p>Since the CppGenerator and TSGenerator class are implemented in Kotlin, the classes are not
+   * visible from all contexts. If the RCA is run from within Eclipse via "Run as Eclipse
+   * Application", the Kotlin classes are unfortunately not available at runtime due to bugs in the
+   * Eclipse Kotlin plugin. (See
+   * https://stackoverflow.com/questions/68095816/is-ist-possible-to-build-mixed-kotlin-and-java-applications-with-a-recent-eclips)
+   * In this case, the method returns null
+   *
+   * @return A Kotlin Generator object if the class can be found
+   */
+  private GeneratorBase createKotlinBaseGenerator(Target target, LFGeneratorContext context) {
+    // Since our Eclipse Plugin uses code injection via guice, we need to
+    // play a few tricks here so that Kotlin FileConfig and
+    // Kotlin Generator do not appear as an import. Instead, we look the
+    // class up at runtime and instantiate it if found.
+    String classPrefix =
+        "org.lflang.generator." + target.packageName + "." + target.classNamePrefix;
+    try {
+      Class<?> generatorClass = Class.forName(classPrefix + "Generator");
+      Constructor<?> ctor =
+          generatorClass.getDeclaredConstructor(
+              LFGeneratorContext.class, LFGlobalScopeProvider.class);
+
+      return (GeneratorBase) ctor.newInstance(context, scopeProvider);
+    } catch (ReflectiveOperationException e) {
+      generatorErrorsOccurred = true;
+      context
+          .getErrorReporter()
+          .reportError(
+              "The code generator for the "
+                  + target
+                  + " target could not be found. "
+                  + "This is likely because you built Epoch using "
+                  + "Eclipse. The "
+                  + target
+                  + " code generator is written in Kotlin and, unfortunately, the plugin that"
+                  + " Eclipse uses for compiling Kotlin code is broken. Please consider building"
+                  + " Epoch using Maven.\n"
+                  + "For step-by-step instructions, see: "
+                  + "https://github.com/icyphy/lingua-franca/wiki/Running-Lingua-Franca-IDE-%28Epoch%29-with-Kotlin-based-Code-Generators-Enabled-%28without-Eclipse-Environment%29");
+      return null;
+    }
+  }
+
+  @Override
+  public void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorContext context) {
+    final LFGeneratorContext lfContext;
+    if (context instanceof LFGeneratorContext) {
+      lfContext = (LFGeneratorContext) context;
+    } else {
+      lfContext = LFGeneratorContext.lfGeneratorContextOf(resource, fsa, context);
     }
 
+    // The fastest way to generate code is to not generate any code.
+    if (lfContext.getMode() == LFGeneratorContext.Mode.LSP_FAST) return;
 
-    /**
-     * Create a code generator in Kotlin.
-     * <p>
-     * Since the CppGenerator and TSGenerator class are implemented in Kotlin, the classes are
-     * not visible from all contexts. If the RCA is run from within Eclipse via
-     * "Run as Eclipse Application", the Kotlin classes are unfortunately not
-     * available at runtime due to bugs in the Eclipse Kotlin plugin. (See
-     * https://stackoverflow.com/questions/68095816/is-ist-possible-to-build-mixed-kotlin-and-java-applications-with-a-recent-eclips)
-     * In this case, the method returns null
-     *
-     * @return A Kotlin Generator object if the class can be found
-     */
-    private GeneratorBase createKotlinBaseGenerator(Target target, LFGeneratorContext context) {
-        // Since our Eclipse Plugin uses code injection via guice, we need to
-        // play a few tricks here so that Kotlin FileConfig and
-        // Kotlin Generator do not appear as an import. Instead, we look the
-        // class up at runtime and instantiate it if found.
-        String classPrefix = "org.lflang.generator." + target.packageName + "." + target.classNamePrefix;
-        try {
-            Class<?> generatorClass = Class.forName(classPrefix + "Generator");
-            Constructor<?> ctor = generatorClass
-                .getDeclaredConstructor(LFGeneratorContext.class, LFGlobalScopeProvider.class);
-
-            return (GeneratorBase) ctor.newInstance(context, scopeProvider);
-        } catch (ReflectiveOperationException e) {
-            generatorErrorsOccurred = true;
-            context.getErrorReporter().reportError(
-                "The code generator for the " + target + " target could not be found. "
-                    + "This is likely because you built Epoch using "
-                    + "Eclipse. The " + target + " code generator is written in Kotlin "
-                    + "and, unfortunately, the plugin that Eclipse uses "
-                    + "for compiling Kotlin code is broken. "
-                    + "Please consider building Epoch using Maven.\n"
-                    + "For step-by-step instructions, see: "
-                    + "https://github.com/icyphy/lingua-franca/wiki/Running-Lingua-Franca-IDE-%28Epoch%29-with-Kotlin-based-Code-Generators-Enabled-%28without-Eclipse-Environment%29");
-            return null;
-        }
-    }
+    if (FedASTUtils.findFederatedReactor(resource) != null) {
+      try {
+        generatorErrorsOccurred = (new FedGenerator(lfContext)).doGenerate(resource, lfContext);
+      } catch (IOException e) {
+        throw new RuntimeIOException("Error during federated code generation", e);
+      }
 
-    @Override
-    public void doGenerate(Resource resource, IFileSystemAccess2 fsa,
-            IGeneratorContext context) {
-        final LFGeneratorContext lfContext;
-        if (context instanceof LFGeneratorContext) {
-            lfContext = (LFGeneratorContext)context;
-        } else {
-            lfContext = LFGeneratorContext.lfGeneratorContextOf(resource, fsa, context);
-        }
-
-        // The fastest way to generate code is to not generate any code.
-        if (lfContext.getMode() == LFGeneratorContext.Mode.LSP_FAST) return;
-
-        if (FedASTUtils.findFederatedReactor(resource) != null) {
-            try {
-                generatorErrorsOccurred = (new FedGenerator(lfContext)).doGenerate(resource, lfContext);
-            } catch (IOException e) {
-                throw new RuntimeIOException("Error during federated code generation", e);
-            }
-
-        } else {
-
-            final GeneratorBase generator = createGenerator(lfContext);
-
-            if (generator != null) {
-                generator.doGenerate(resource, lfContext);
-                generatorErrorsOccurred = generator.errorsOccurred();
-            }
-        }
-        final ErrorReporter errorReporter = lfContext.getErrorReporter();
-        if (errorReporter instanceof LanguageServerErrorReporter) {
-            ((LanguageServerErrorReporter) errorReporter).publishDiagnostics();
-        }
-    }
+    } else {
 
-    /** Return true if errors occurred in the last call to doGenerate(). */
-    public boolean errorsOccurred() {
-        return generatorErrorsOccurred;
+      final GeneratorBase generator = createGenerator(lfContext);
+
+      if (generator != null) {
+        generator.doGenerate(resource, lfContext);
+        generatorErrorsOccurred = generator.errorsOccurred();
+      }
+    }
+    final ErrorReporter errorReporter = lfContext.getErrorReporter();
+    if (errorReporter instanceof LanguageServerErrorReporter) {
+      ((LanguageServerErrorReporter) errorReporter).publishDiagnostics();
     }
+  }
+
+  /** Return true if errors occurred in the last call to doGenerate(). */
+  public boolean errorsOccurred() {
+    return generatorErrorsOccurred;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/LFGeneratorContext.java b/org.lflang/src/org/lflang/generator/LFGeneratorContext.java
index 84032ecdc6..727ce229b9 100644
--- a/org.lflang/src/org/lflang/generator/LFGeneratorContext.java
+++ b/org.lflang/src/org/lflang/generator/LFGeneratorContext.java
@@ -3,160 +3,146 @@
 import java.nio.file.Path;
 import java.util.Map;
 import java.util.Properties;
-
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 import org.eclipse.xtext.generator.IGeneratorContext;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 
 /**
- * An {@code LFGeneratorContext} is the context of a Lingua Franca build process.
- * It is the point of communication between a build process and the environment
- * in which it is executed.
+ * An {@code LFGeneratorContext} is the context of a Lingua Franca build process. It is the point of
+ * communication between a build process and the environment in which it is executed.
  *
  * @author Peter Donovan
  */
 public interface LFGeneratorContext extends IGeneratorContext {
 
-    /**
-     * Enumeration of keys used to parameterize the build process.
-     */
-    enum BuildParm {
-        BUILD_TYPE("The build type to use"),
-        CLEAN("Clean before building."),
-        EXTERNAL_RUNTIME_PATH("Specify an external runtime library to be used by the compiled binary."),
-        FEDERATED("Treat main reactor as federated."),
-        HELP("Display this information."),
-        LOGGING("The logging level to use by the generated binary"),
-        LINT("Enable or disable linting of generated code."),
-        NO_COMPILE("Do not invoke target compiler."),
-        OUTPUT_PATH("Specify the root output directory."),
-        PRINT_STATISTICS("Instruct the runtime to collect and print statistics."),
-        QUIET("Suppress output of the target compiler and other commands"),
-        RTI("Specify the location of the RTI."),
-        RUNTIME_VERSION("Specify the version of the runtime library used for compiling LF programs."),
-        SCHEDULER("Specify the runtime scheduler (if supported)."),
-        TARGET_COMPILER("Target compiler to invoke."),
-        THREADING("Specify whether the runtime should use multi-threading (true/false)."),
-        VERSION("Print version information."),
-        WORKERS("Specify the default number of worker threads.");
-
-        public final String description;
-
-        BuildParm(String description) {
-            this.description = description;
-        }
-
-        /**
-         * Return the string to use as the key to store a value relating to this parameter.
-         */
-        public String getKey() {
-            return this.name().toLowerCase().replace('_', '-');
-        }
-
-        /**
-         * Return the value corresponding to this parameter or {@code null} if there is none.
-         * @param context The context passed to the code generator.
-         */
-        public String getValue(LFGeneratorContext context) {
-            return context.getArgs().getProperty(this.getKey());
-        }
+  /** Enumeration of keys used to parameterize the build process. */
+  enum BuildParm {
+    BUILD_TYPE("The build type to use"),
+    CLEAN("Clean before building."),
+    EXTERNAL_RUNTIME_PATH("Specify an external runtime library to be used by the compiled binary."),
+    FEDERATED("Treat main reactor as federated."),
+    HELP("Display this information."),
+    LOGGING("The logging level to use by the generated binary"),
+    LINT("Enable or disable linting of generated code."),
+    NO_COMPILE("Do not invoke target compiler."),
+    OUTPUT_PATH("Specify the root output directory."),
+    PRINT_STATISTICS("Instruct the runtime to collect and print statistics."),
+    QUIET("Suppress output of the target compiler and other commands"),
+    RTI("Specify the location of the RTI."),
+    RUNTIME_VERSION("Specify the version of the runtime library used for compiling LF programs."),
+    SCHEDULER("Specify the runtime scheduler (if supported)."),
+    TARGET_COMPILER("Target compiler to invoke."),
+    THREADING("Specify whether the runtime should use multi-threading (true/false)."),
+    VERSION("Print version information."),
+    WORKERS("Specify the default number of worker threads.");
+
+    public final String description;
+
+    BuildParm(String description) {
+      this.description = description;
     }
 
-
-    enum Mode {
-        STANDALONE,
-        EPOCH,
-        LSP_FAST,
-        LSP_MEDIUM,
-        LSP_SLOW,
-        UNDEFINED
+    /** Return the string to use as the key to store a value relating to this parameter. */
+    public String getKey() {
+      return this.name().toLowerCase().replace('_', '-');
     }
 
     /**
-     * Return the mode of operation, which indicates how the compiler has been invoked 
-     * (e.g., from within Epoch, from the command line, or via a Language Server).
-     */
-    Mode getMode();
-
-    /**
-     * Return any arguments that will override target properties.
-     */
-    Properties getArgs();
-
-    /**
-     * Get the error reporter for this context; construct one if it hasn't been
-     * constructed yet.
-     */
-    ErrorReporter getErrorReporter();
-
-    /**
-     * Mark the code generation process performed in this
-     * context as finished with the result {@code result}.
-     * @param result The result of the code generation
-     *               process that was performed in this
-     *               context.
+     * Return the value corresponding to this parameter or {@code null} if there is none.
+     *
+     * @param context The context passed to the code generator.
      */
-    void finish(GeneratorResult result);
-
-    /**
-     * Return the result of the code generation process that was performed in
-     * this context.
-     * @return the result of the code generation process that was performed in
-     * this context
-     */
-    GeneratorResult getResult();
-
-    FileConfig getFileConfig();
-
-    TargetConfig getTargetConfig();
-
-    /**
-     * Report the progress of a build.
-     * @param message A message for the LF programmer to read.
-     * @param percentage The approximate percent completion of the build.
-     */
-    void reportProgress(String message, int percentage);
-
-    /**
-     * Conclude this build and record the result if necessary.
-     * @param status The status of the result.
-     * @param codeMaps The generated files and their corresponding code maps.
-     */
-    default void finish(
-        GeneratorResult.Status status,
-        Map<Path, CodeMap> codeMaps
-    ) {
-        finish(new GeneratorResult(status, this, codeMaps));
-    }
-
-    /**
-     * Conclude this build and record that it was unsuccessful.
-     */
-    default void unsuccessfulFinish() {
-        finish(
-            getCancelIndicator() != null && getCancelIndicator().isCanceled() ?
-            GeneratorResult.CANCELLED : GeneratorResult.FAILED
-        );
-    }
-
-    /**
-     * Return the {@code LFGeneratorContext} that best describes the given {@code context} when
-     * building {@code Resource}.
-     * @param resource
-     * @param fsa
-     * @param context The context of a Lingua Franca build process.
-     * @return The {@code LFGeneratorContext} that best describes the given {@code context} when
-     * building {@code Resource}.
-     */
-    static LFGeneratorContext lfGeneratorContextOf(Resource resource, IFileSystemAccess2 fsa, IGeneratorContext context) {
-        if (context instanceof LFGeneratorContext) return (LFGeneratorContext) context;
-
-        if (resource.getURI().isPlatform()) return new MainContext(Mode.EPOCH, resource, fsa, context.getCancelIndicator());
-
-        return new MainContext(Mode.LSP_FAST, resource, fsa, context.getCancelIndicator());
+    public String getValue(LFGeneratorContext context) {
+      return context.getArgs().getProperty(this.getKey());
     }
+  }
+
+  enum Mode {
+    STANDALONE,
+    EPOCH,
+    LSP_FAST,
+    LSP_MEDIUM,
+    LSP_SLOW,
+    UNDEFINED
+  }
+
+  /**
+   * Return the mode of operation, which indicates how the compiler has been invoked (e.g., from
+   * within Epoch, from the command line, or via a Language Server).
+   */
+  Mode getMode();
+
+  /** Return any arguments that will override target properties. */
+  Properties getArgs();
+
+  /** Get the error reporter for this context; construct one if it hasn't been constructed yet. */
+  ErrorReporter getErrorReporter();
+
+  /**
+   * Mark the code generation process performed in this context as finished with the result {@code
+   * result}.
+   *
+   * @param result The result of the code generation process that was performed in this context.
+   */
+  void finish(GeneratorResult result);
+
+  /**
+   * Return the result of the code generation process that was performed in this context.
+   *
+   * @return the result of the code generation process that was performed in this context
+   */
+  GeneratorResult getResult();
+
+  FileConfig getFileConfig();
+
+  TargetConfig getTargetConfig();
+
+  /**
+   * Report the progress of a build.
+   *
+   * @param message A message for the LF programmer to read.
+   * @param percentage The approximate percent completion of the build.
+   */
+  void reportProgress(String message, int percentage);
+
+  /**
+   * Conclude this build and record the result if necessary.
+   *
+   * @param status The status of the result.
+   * @param codeMaps The generated files and their corresponding code maps.
+   */
+  default void finish(GeneratorResult.Status status, Map<Path, CodeMap> codeMaps) {
+    finish(new GeneratorResult(status, this, codeMaps));
+  }
+
+  /** Conclude this build and record that it was unsuccessful. */
+  default void unsuccessfulFinish() {
+    finish(
+        getCancelIndicator() != null && getCancelIndicator().isCanceled()
+            ? GeneratorResult.CANCELLED
+            : GeneratorResult.FAILED);
+  }
+
+  /**
+   * Return the {@code LFGeneratorContext} that best describes the given {@code context} when
+   * building {@code Resource}.
+   *
+   * @param resource
+   * @param fsa
+   * @param context The context of a Lingua Franca build process.
+   * @return The {@code LFGeneratorContext} that best describes the given {@code context} when
+   *     building {@code Resource}.
+   */
+  static LFGeneratorContext lfGeneratorContextOf(
+      Resource resource, IFileSystemAccess2 fsa, IGeneratorContext context) {
+    if (context instanceof LFGeneratorContext) return (LFGeneratorContext) context;
+
+    if (resource.getURI().isPlatform())
+      return new MainContext(Mode.EPOCH, resource, fsa, context.getCancelIndicator());
+
+    return new MainContext(Mode.LSP_FAST, resource, fsa, context.getCancelIndicator());
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/LFResource.java b/org.lflang/src/org/lflang/generator/LFResource.java
index bc59c418ee..42367dd24f 100644
--- a/org.lflang/src/org/lflang/generator/LFResource.java
+++ b/org.lflang/src/org/lflang/generator/LFResource.java
@@ -5,36 +5,43 @@
 import org.lflang.TargetConfig;
 
 /**
- * A class that keeps metadata for discovered resources
- * during code generation and the supporting structures
- * associated with that resource.
- * 
+ * A class that keeps metadata for discovered resources during code generation and the supporting
+ * structures associated with that resource.
+ *
  * @author Soroush Bateni
  */
 public class LFResource {
-    LFResource(Resource resource, FileConfig fileConfig, TargetConfig targetConfig) {
-        this.eResource = resource; // FIXME: this is redundant because fileConfig already has the resource.
-        this.fileConfig = fileConfig;
-        this.targetConfig = targetConfig;
-    }
-    
-    /**
-     * Resource associated with a file either from the main .lf
-     * file or one of the imported ones.
-     */
-    Resource eResource;
-    public Resource getEResource() { return this.eResource; };
-    
-    /**
-     * The file config associated with 'resource' that can be
-     * used to discover files relative to that resource.
-     */
-    FileConfig fileConfig;
-    public FileConfig getFileConfig() { return this.fileConfig; };
-    
-    /**
-     * The target config read from the resource.
-     */
-    TargetConfig targetConfig;
-    public TargetConfig getTargetConfig() { return this.targetConfig; };
+  LFResource(Resource resource, FileConfig fileConfig, TargetConfig targetConfig) {
+    this.eResource =
+        resource; // FIXME: this is redundant because fileConfig already has the resource.
+    this.fileConfig = fileConfig;
+    this.targetConfig = targetConfig;
+  }
+
+  /** Resource associated with a file either from the main .lf file or one of the imported ones. */
+  Resource eResource;
+
+  public Resource getEResource() {
+    return this.eResource;
+  }
+  ;
+
+  /**
+   * The file config associated with 'resource' that can be used to discover files relative to that
+   * resource.
+   */
+  FileConfig fileConfig;
+
+  public FileConfig getFileConfig() {
+    return this.fileConfig;
+  }
+  ;
+
+  /** The target config read from the resource. */
+  TargetConfig targetConfig;
+
+  public TargetConfig getTargetConfig() {
+    return this.targetConfig;
+  }
+  ;
 }
diff --git a/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java b/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java
index 5ce5da28dc..31304f43c9 100644
--- a/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java
+++ b/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java
@@ -6,16 +6,14 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.lsp4j.PublishDiagnosticsParams;
 import org.eclipse.lsp4j.Range;
-import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.lsp4j.services.LanguageClient;
-
+import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.lflang.ErrorReporter;
 
 /**
@@ -25,179 +23,174 @@
  */
 public class LanguageServerErrorReporter implements ErrorReporter {
 
-    /**
-     * The language client to which errors should be
-     * reported, if such a client is available.
-     * FIXME: This is a de facto global, and it is a hack.
-     */
-    private static LanguageClient client;
-
-    /** The document for which this is a diagnostic acceptor. */
-    private final EObject parseRoot;
-    /** The list of all diagnostics since the last reset. */
-    private final Map<Path, List<Diagnostic>> diagnostics;
-
-    /* ------------------------  CONSTRUCTORS  -------------------------- */
-
-    /**
-     * Initialize a {@code DiagnosticAcceptor} for the
-     * document whose parse tree root node is
-     * {@code parseRoot}.
-     * @param parseRoot the root of the AST of the document
-     *                  for which this is an error reporter
-     */
-    public LanguageServerErrorReporter(EObject parseRoot) {
-        this.parseRoot = parseRoot;
-        this.diagnostics = new HashMap<>();
-    }
-
-    /* -----------------------  PUBLIC METHODS  ------------------------- */
-
-    @Override
-    public String reportError(String message) {
-        return report(getMainFile(), DiagnosticSeverity.Error, message);
-    }
-
-    @Override
-    public String reportWarning(String message) {
-        return report(getMainFile(), DiagnosticSeverity.Warning, message);
-    }
-
-    @Override
-    public String reportInfo(String message) {
-        return report(getMainFile(), DiagnosticSeverity.Information, message);
-    }
-
-    @Override
-    public String reportError(EObject object, String message) {
-        return reportError(message);
-    }
-
-    @Override
-    public String reportWarning(EObject object, String message) {
-        return reportWarning(message);
-    }
-
-    @Override
-    public String reportInfo(EObject object, String message) {
-        return reportInfo(message);
-    }
-
-    @Override
-    public String reportError(Path file, Integer line, String message) {
-        return report(file, DiagnosticSeverity.Error, message, line != null ? line : 1);
-    }
-
-    @Override
-    public String reportWarning(Path file, Integer line, String message) {
-        return report(file, DiagnosticSeverity.Warning, message, line != null ? line : 1);
-    }
-
-    @Override
-    public String reportInfo(Path file, Integer line, String message) {
-        return report(file, DiagnosticSeverity.Information, message, line != null ? line : 1);
-    }
-
-    @Override
-    public boolean getErrorsOccurred() {
-        return diagnostics.values().stream().anyMatch(
-            it -> it.stream().anyMatch(diagnostic -> diagnostic.getSeverity() == DiagnosticSeverity.Error)
-        );
-    }
-
-    @Override
-    public String report(Path file, DiagnosticSeverity severity, String message) {
-        return report(file, severity, message, 1);
-    }
-
-    @Override
-    public String report(Path file, DiagnosticSeverity severity, String message, int line) {
-        Optional<String> text = getLine(line - 1);
-        return report(
-            file,
-            severity,
-            message,
-            Position.fromOneBased(line, 1),
-            Position.fromOneBased(line, 1 + (text.isEmpty() ? 0 : text.get().length()))
-        );
-    }
-
-    @Override
-    public String report(Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
-        if (file == null) file = getMainFile();
-        diagnostics.putIfAbsent(file, new ArrayList<>());
-        diagnostics.get(file).add(new Diagnostic(
-            toRange(startPos, endPos), message, severity, "LF Language Server"
-        ));
-        return "" + severity + ": " + message;
-    }
-
-    /**
-     * Save a reference to the language client.
-     * @param client the language client
-     */
-    public static void setClient(LanguageClient client) {
-        LanguageServerErrorReporter.client = client;
-    }
-
-    /**
-     * Publish diagnostics by forwarding them to the
-     * language client.
-     */
-    public void publishDiagnostics() {
-        if (client == null) {
-            System.err.println(
-                "WARNING: Cannot publish diagnostics because the language client has not yet been found."
-            );
-            return;
-        }
-        for (Path file : diagnostics.keySet()) {
-            PublishDiagnosticsParams publishDiagnosticsParams = new PublishDiagnosticsParams();
-            publishDiagnosticsParams.setUri(URI.createFileURI(file.toString()).toString());
-            publishDiagnosticsParams.setDiagnostics(diagnostics.get(file));
-            client.publishDiagnostics(publishDiagnosticsParams);
-        }
-    }
-
-    /* -----------------------  PRIVATE METHODS  ------------------------ */
-
-    /** Return the file on which the current validation process was triggered. */
-    private Path getMainFile() {
-        return Path.of(parseRoot.eResource().getURI().toFileString());
-    }
-
-    /**
-     * Return the text of the document for which this is an
-     * error reporter.
-     * @return the text of the document for which this is an
-     * error reporter
-     */
-    private String getText() {
-        return NodeModelUtils.getNode(parseRoot).getText();
-    }
-
-    /**
-     * Return the line at index {@code line} in the
-     * document for which this is an error reporter.
-     * @param line the zero-based line index
-     * @return the line located at the given index
-     */
-    private Optional<String> getLine(int line) {
-        return getText().lines().skip(line).findFirst();
-    }
-
-    /**
-     * Return the Range that starts at {@code p0} and ends
-     * at {@code p1}.
-     * @param p0 an arbitrary Position
-     * @param p1 a Position that is greater than {@code p0}
-     * @return the Range that starts at {@code p0} and ends
-     * at {@code p1}
-     */
-    private Range toRange(Position p0, Position p1) {
-        return new Range(
-            new org.eclipse.lsp4j.Position(p0.getZeroBasedLine(), p0.getZeroBasedColumn()),
-            new org.eclipse.lsp4j.Position(p1.getZeroBasedLine(), p1.getZeroBasedColumn())
-        );
-    }
+  /**
+   * The language client to which errors should be reported, if such a client is available. FIXME:
+   * This is a de facto global, and it is a hack.
+   */
+  private static LanguageClient client;
+
+  /** The document for which this is a diagnostic acceptor. */
+  private final EObject parseRoot;
+  /** The list of all diagnostics since the last reset. */
+  private final Map<Path, List<Diagnostic>> diagnostics;
+
+  /* ------------------------  CONSTRUCTORS  -------------------------- */
+
+  /**
+   * Initialize a {@code DiagnosticAcceptor} for the document whose parse tree root node is {@code
+   * parseRoot}.
+   *
+   * @param parseRoot the root of the AST of the document for which this is an error reporter
+   */
+  public LanguageServerErrorReporter(EObject parseRoot) {
+    this.parseRoot = parseRoot;
+    this.diagnostics = new HashMap<>();
+  }
+
+  /* -----------------------  PUBLIC METHODS  ------------------------- */
+
+  @Override
+  public String reportError(String message) {
+    return report(getMainFile(), DiagnosticSeverity.Error, message);
+  }
+
+  @Override
+  public String reportWarning(String message) {
+    return report(getMainFile(), DiagnosticSeverity.Warning, message);
+  }
+
+  @Override
+  public String reportInfo(String message) {
+    return report(getMainFile(), DiagnosticSeverity.Information, message);
+  }
+
+  @Override
+  public String reportError(EObject object, String message) {
+    return reportError(message);
+  }
+
+  @Override
+  public String reportWarning(EObject object, String message) {
+    return reportWarning(message);
+  }
+
+  @Override
+  public String reportInfo(EObject object, String message) {
+    return reportInfo(message);
+  }
+
+  @Override
+  public String reportError(Path file, Integer line, String message) {
+    return report(file, DiagnosticSeverity.Error, message, line != null ? line : 1);
+  }
+
+  @Override
+  public String reportWarning(Path file, Integer line, String message) {
+    return report(file, DiagnosticSeverity.Warning, message, line != null ? line : 1);
+  }
+
+  @Override
+  public String reportInfo(Path file, Integer line, String message) {
+    return report(file, DiagnosticSeverity.Information, message, line != null ? line : 1);
+  }
+
+  @Override
+  public boolean getErrorsOccurred() {
+    return diagnostics.values().stream()
+        .anyMatch(
+            it ->
+                it.stream()
+                    .anyMatch(diagnostic -> diagnostic.getSeverity() == DiagnosticSeverity.Error));
+  }
+
+  @Override
+  public String report(Path file, DiagnosticSeverity severity, String message) {
+    return report(file, severity, message, 1);
+  }
+
+  @Override
+  public String report(Path file, DiagnosticSeverity severity, String message, int line) {
+    Optional<String> text = getLine(line - 1);
+    return report(
+        file,
+        severity,
+        message,
+        Position.fromOneBased(line, 1),
+        Position.fromOneBased(line, 1 + (text.isEmpty() ? 0 : text.get().length())));
+  }
+
+  @Override
+  public String report(
+      Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
+    if (file == null) file = getMainFile();
+    diagnostics.putIfAbsent(file, new ArrayList<>());
+    diagnostics
+        .get(file)
+        .add(new Diagnostic(toRange(startPos, endPos), message, severity, "LF Language Server"));
+    return "" + severity + ": " + message;
+  }
+
+  /**
+   * Save a reference to the language client.
+   *
+   * @param client the language client
+   */
+  public static void setClient(LanguageClient client) {
+    LanguageServerErrorReporter.client = client;
+  }
+
+  /** Publish diagnostics by forwarding them to the language client. */
+  public void publishDiagnostics() {
+    if (client == null) {
+      System.err.println(
+          "WARNING: Cannot publish diagnostics because the language client has not yet been"
+              + " found.");
+      return;
+    }
+    for (Path file : diagnostics.keySet()) {
+      PublishDiagnosticsParams publishDiagnosticsParams = new PublishDiagnosticsParams();
+      publishDiagnosticsParams.setUri(URI.createFileURI(file.toString()).toString());
+      publishDiagnosticsParams.setDiagnostics(diagnostics.get(file));
+      client.publishDiagnostics(publishDiagnosticsParams);
+    }
+  }
+
+  /* -----------------------  PRIVATE METHODS  ------------------------ */
+
+  /** Return the file on which the current validation process was triggered. */
+  private Path getMainFile() {
+    return Path.of(parseRoot.eResource().getURI().toFileString());
+  }
+
+  /**
+   * Return the text of the document for which this is an error reporter.
+   *
+   * @return the text of the document for which this is an error reporter
+   */
+  private String getText() {
+    return NodeModelUtils.getNode(parseRoot).getText();
+  }
+
+  /**
+   * Return the line at index {@code line} in the document for which this is an error reporter.
+   *
+   * @param line the zero-based line index
+   * @return the line located at the given index
+   */
+  private Optional<String> getLine(int line) {
+    return getText().lines().skip(line).findFirst();
+  }
+
+  /**
+   * Return the Range that starts at {@code p0} and ends at {@code p1}.
+   *
+   * @param p0 an arbitrary Position
+   * @param p1 a Position that is greater than {@code p0}
+   * @return the Range that starts at {@code p0} and ends at {@code p1}
+   */
+  private Range toRange(Position p0, Position p1) {
+    return new Range(
+        new org.eclipse.lsp4j.Position(p0.getZeroBasedLine(), p0.getZeroBasedColumn()),
+        new org.eclipse.lsp4j.Position(p1.getZeroBasedLine(), p1.getZeroBasedColumn()));
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/LfExpressionVisitor.java b/org.lflang/src/org/lflang/generator/LfExpressionVisitor.java
index 2bb72789ff..15f0e8ddad 100644
--- a/org.lflang/src/org/lflang/generator/LfExpressionVisitor.java
+++ b/org.lflang/src/org/lflang/generator/LfExpressionVisitor.java
@@ -40,121 +40,120 @@
  */
 public interface LfExpressionVisitor<P, R> {
 
-
-    R visitLiteral(Literal expr, P param);
-
-    R visitBracedListExpr(BracedListExpression expr, P param);
-
-    R visitTimeLiteral(Time expr, P param);
-
-    R visitCodeExpr(CodeExpr expr, P param);
-
-    R visitParameterRef(ParameterReference expr, P param);
-
-    /**
-     * Dispatch the visitor on the given expression type.
-     *
-     * @param e An expression that will be visited
-     * @param arg Argument for the visitor
-     * @param visitor Visitor
-     * @param <P> Type of parameter expected by the visitor
-     * @param <R> Return type of the visitor
-     * @return The return value of the visitor
-     */
-    static <P, R> R dispatch(Expression e, P arg, LfExpressionVisitor<? super P, ? extends R> visitor) {
-        if (e instanceof Literal) {
-            return visitor.visitLiteral((Literal) e, arg);
-        } else if (e instanceof BracedListExpression) {
-            return visitor.visitBracedListExpr((BracedListExpression) e, arg);
-        } else if (e instanceof Time) {
-            return visitor.visitTimeLiteral((Time) e, arg);
-        } else if (e instanceof CodeExpr) {
-            return visitor.visitCodeExpr((CodeExpr) e, arg);
-        } else if (e instanceof ParameterReference) {
-            return visitor.visitParameterRef((ParameterReference) e, arg);
-        }
-
-        throw new IllegalArgumentException("Expression of type " + e.getClass() + " not handled");
+  R visitLiteral(Literal expr, P param);
+
+  R visitBracedListExpr(BracedListExpression expr, P param);
+
+  R visitTimeLiteral(Time expr, P param);
+
+  R visitCodeExpr(CodeExpr expr, P param);
+
+  R visitParameterRef(ParameterReference expr, P param);
+
+  /**
+   * Dispatch the visitor on the given expression type.
+   *
+   * @param e An expression that will be visited
+   * @param arg Argument for the visitor
+   * @param visitor Visitor
+   * @param <P> Type of parameter expected by the visitor
+   * @param <R> Return type of the visitor
+   * @return The return value of the visitor
+   */
+  static <P, R> R dispatch(
+      Expression e, P arg, LfExpressionVisitor<? super P, ? extends R> visitor) {
+    if (e instanceof Literal) {
+      return visitor.visitLiteral((Literal) e, arg);
+    } else if (e instanceof BracedListExpression) {
+      return visitor.visitBracedListExpr((BracedListExpression) e, arg);
+    } else if (e instanceof Time) {
+      return visitor.visitTimeLiteral((Time) e, arg);
+    } else if (e instanceof CodeExpr) {
+      return visitor.visitCodeExpr((CodeExpr) e, arg);
+    } else if (e instanceof ParameterReference) {
+      return visitor.visitParameterRef((ParameterReference) e, arg);
     }
 
-    /** Base visitor class where methods are defaulted to a common one. */
-    abstract class DefaultLfVisitor<P, R> implements LfExpressionVisitor<P, R> {
+    throw new IllegalArgumentException("Expression of type " + e.getClass() + " not handled");
+  }
+
+  /** Base visitor class where methods are defaulted to a common one. */
+  abstract class DefaultLfVisitor<P, R> implements LfExpressionVisitor<P, R> {
+
+    abstract R visitExpression(Expression expr, P param);
 
-        abstract R visitExpression(Expression expr, P param);
+    @Override
+    public R visitLiteral(Literal expr, P param) {
+      return visitExpression(expr, param);
+    }
+
+    @Override
+    public R visitBracedListExpr(BracedListExpression expr, P param) {
+      return visitExpression(expr, param);
+    }
 
-        @Override
-        public R visitLiteral(Literal expr, P param) {
-            return visitExpression(expr, param);
-        }
+    @Override
+    public R visitTimeLiteral(Time expr, P param) {
+      return visitExpression(expr, param);
+    }
 
-        @Override
-        public R visitBracedListExpr(BracedListExpression expr, P param) {
-            return visitExpression(expr, param);
-        }
+    @Override
+    public R visitCodeExpr(CodeExpr expr, P param) {
+      return visitExpression(expr, param);
+    }
 
-        @Override
-        public R visitTimeLiteral(Time expr, P param) {
-            return visitExpression(expr, param);
-        }
+    @Override
+    public R visitParameterRef(ParameterReference expr, P param) {
+      return visitExpression(expr, param);
+    }
+  }
+
+  /**
+   * A visitor that deep copies the expression. Can be extended to replace certain expressions
+   * during the copy.
+   *
+   * @param <P> Parameter type
+   */
+  class LfExpressionDeepCopyVisitor<P> implements LfExpressionVisitor<P, Expression> {
+
+    @Override
+    public Expression visitLiteral(Literal expr, P param) {
+      Literal clone = LfFactory.eINSTANCE.createLiteral();
+      clone.setLiteral(expr.getLiteral());
+      return clone;
+    }
 
-        @Override
-        public R visitCodeExpr(CodeExpr expr, P param) {
-            return visitExpression(expr, param);
-        }
+    @Override
+    public Expression visitBracedListExpr(BracedListExpression expr, P param) {
+      BracedListExpression clone = LfFactory.eINSTANCE.createBracedListExpression();
+      for (Expression item : expr.getItems()) {
+        clone.getItems().add(dispatch(item, param, this));
+      }
+      return clone;
+    }
 
-        @Override
-        public R visitParameterRef(ParameterReference expr, P param) {
-            return visitExpression(expr, param);
-        }
+    @Override
+    public Expression visitTimeLiteral(Time expr, P param) {
+      Time clone = LfFactory.eINSTANCE.createTime();
+      clone.setUnit(expr.getUnit());
+      clone.setInterval(expr.getInterval());
+      return clone;
     }
 
-    /**
-     * A visitor that deep copies the expression. Can be extended
-     * to replace certain expressions during the copy.
-     *
-     * @param <P> Parameter type
-     */
-    class LfExpressionDeepCopyVisitor<P> implements LfExpressionVisitor<P, Expression> {
-
-        @Override
-        public Expression visitLiteral(Literal expr, P param) {
-            Literal clone = LfFactory.eINSTANCE.createLiteral();
-            clone.setLiteral(expr.getLiteral());
-            return clone;
-        }
-
-        @Override
-        public Expression visitBracedListExpr(BracedListExpression expr, P param) {
-            BracedListExpression clone = LfFactory.eINSTANCE.createBracedListExpression();
-            for (Expression item : expr.getItems()) {
-                clone.getItems().add(dispatch(item, param, this));
-            }
-            return clone;
-        }
-
-        @Override
-        public Expression visitTimeLiteral(Time expr, P param) {
-            Time clone = LfFactory.eINSTANCE.createTime();
-            clone.setUnit(expr.getUnit());
-            clone.setInterval(expr.getInterval());
-            return clone;
-        }
-
-        @Override
-        public Expression visitParameterRef(ParameterReference expr, P param) {
-            ParameterReference clone = LfFactory.eINSTANCE.createParameterReference();
-            clone.setParameter(expr.getParameter());
-            return clone;
-        }
-
-        @Override
-        public Expression visitCodeExpr(CodeExpr expr, P param) {
-            CodeExpr codeExpr = LfFactory.eINSTANCE.createCodeExpr();
-            Code code = LfFactory.eINSTANCE.createCode();
-            code.setBody(expr.getCode().getBody());
-            codeExpr.setCode(code);
-            return codeExpr;
-        }
+    @Override
+    public Expression visitParameterRef(ParameterReference expr, P param) {
+      ParameterReference clone = LfFactory.eINSTANCE.createParameterReference();
+      clone.setParameter(expr.getParameter());
+      return clone;
     }
 
+    @Override
+    public Expression visitCodeExpr(CodeExpr expr, P param) {
+      CodeExpr codeExpr = LfFactory.eINSTANCE.createCodeExpr();
+      Code code = LfFactory.eINSTANCE.createCode();
+      code.setBody(expr.getCode().getBody());
+      codeExpr.setCode(code);
+      return codeExpr;
+    }
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/MainContext.java b/org.lflang/src/org/lflang/generator/MainContext.java
index 5ee53e5f83..4a60c4d6a8 100644
--- a/org.lflang/src/org/lflang/generator/MainContext.java
+++ b/org.lflang/src/org/lflang/generator/MainContext.java
@@ -4,12 +4,10 @@
 import java.util.Objects;
 import java.util.Properties;
 import java.util.function.Function;
-
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.util.RuntimeIOException;
-
 import org.lflang.DefaultErrorReporter;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
@@ -17,154 +15,156 @@
 import org.lflang.generator.IntegratedBuilder.ReportProgress;
 
 /**
- * A {@code MainContext} is an {@code LFGeneratorContext} that is
- * not nested in any other generator context. There is one
- * {@code MainContext} for every build process.
+ * A {@code MainContext} is an {@code LFGeneratorContext} that is not nested in any other generator
+ * context. There is one {@code MainContext} for every build process.
  *
  * @author Peter Donovan
  */
 public class MainContext implements LFGeneratorContext {
-    
-    /**
-     * This constructor will be set by the LF plugin, if the generator is running in Epoch.
-     */
-    public static Function<FileConfig, ErrorReporter> EPOCH_ERROR_REPORTER_CONSTRUCTOR = null;
-    
-    /**
-     * The indicator that shows whether this build
-     * process is canceled.
-     */
-    private final CancelIndicator cancelIndicator;
-    /** The {@code ReportProgress} function of {@code this}. */
-    private final ReportProgress reportProgress;
-
-    private final FileConfig fileConfig;
-
-    /** Whether the requested build is required to be complete. */
-    private final Mode mode;
-
-    private TargetConfig targetConfig;
-
-    /** The result of the code generation process. */
-    private GeneratorResult result = null;
-    private final Properties args;
-    private final ErrorReporter errorReporter;
-
-    /**
-     * Initialize the context of a build process whose cancellation is
-     * indicated by {@code cancelIndicator}
-     * @param mode The mode of this build process.
-     * @param cancelIndicator The cancel indicator of the code generation
-     *                        process to which this corresponds.
-     */
-    public MainContext(Mode mode, Resource resource, IFileSystemAccess2 fsa, CancelIndicator cancelIndicator) {
-        this(
-            mode, cancelIndicator, (message, completion) -> {}, new Properties(), resource, fsa,
-            (mode == Mode.EPOCH && EPOCH_ERROR_REPORTER_CONSTRUCTOR != null) ?
-                    EPOCH_ERROR_REPORTER_CONSTRUCTOR :
-                    fileConfig -> new DefaultErrorReporter()
-        );
-    }
-
-    /**
-     * Initialize the context of a build process whose cancellation is
-     * indicated by {@code cancelIndicator}
-     * @param mode The mode of this build process.
-     * @param cancelIndicator The cancel indicator of the code generation
-     *                        process to which this corresponds.
-     * @param reportProgress The {@code ReportProgress} function of
-     *                       {@code this}.
-     * @param args Any arguments that may be used to affect the product of the
-     *             build.
-     * @param resource ...
-     * @param fsa ...
-     * @param constructErrorReporter A function that constructs the appropriate
-     *                               error reporter for the given FileConfig.
-     */
-    public MainContext(
-        Mode mode,
-        CancelIndicator cancelIndicator,
-        ReportProgress reportProgress,
-        Properties args,
-        Resource resource,
-        IFileSystemAccess2 fsa,
-        Function<FileConfig, ErrorReporter> constructErrorReporter
-    ) {
-        this.mode = mode;
-        this.cancelIndicator = cancelIndicator == null ? () -> false : cancelIndicator;
-        this.reportProgress = reportProgress;
-        this.args = args;
-
-        try {
-            var useHierarchicalBin = args.containsKey("hierarchical-bin") && Boolean.parseBoolean(args.getProperty("hierarchical-bin"));
-            fileConfig = Objects.requireNonNull(LFGenerator.createFileConfig(resource, FileConfig.getSrcGenRoot(fsa), useHierarchicalBin));
-        } catch (IOException e) {
-            throw new RuntimeIOException("Error during FileConfig instantiation", e);
-        }
-
-        this.errorReporter = constructErrorReporter.apply(this.fileConfig);
-
-        loadTargetConfig();
-    }
-
-    @Override
-    public CancelIndicator getCancelIndicator() {
-        return cancelIndicator;
-    }
-
-    @Override
-    public Mode getMode() {
-        return mode;
-    }
-
-    @Override
-    public Properties getArgs() {
-        return args;
-    }
-
 
-    @Override
-    public ErrorReporter getErrorReporter() {
-        return errorReporter;
+  /** This constructor will be set by the LF plugin, if the generator is running in Epoch. */
+  public static Function<FileConfig, ErrorReporter> EPOCH_ERROR_REPORTER_CONSTRUCTOR = null;
+
+  /** The indicator that shows whether this build process is canceled. */
+  private final CancelIndicator cancelIndicator;
+  /** The {@code ReportProgress} function of {@code this}. */
+  private final ReportProgress reportProgress;
+
+  private final FileConfig fileConfig;
+
+  /** Whether the requested build is required to be complete. */
+  private final Mode mode;
+
+  private TargetConfig targetConfig;
+
+  /** The result of the code generation process. */
+  private GeneratorResult result = null;
+
+  private final Properties args;
+  private final ErrorReporter errorReporter;
+
+  /**
+   * Initialize the context of a build process whose cancellation is indicated by {@code
+   * cancelIndicator}
+   *
+   * @param mode The mode of this build process.
+   * @param cancelIndicator The cancel indicator of the code generation process to which this
+   *     corresponds.
+   */
+  public MainContext(
+      Mode mode, Resource resource, IFileSystemAccess2 fsa, CancelIndicator cancelIndicator) {
+    this(
+        mode,
+        cancelIndicator,
+        (message, completion) -> {},
+        new Properties(),
+        resource,
+        fsa,
+        (mode == Mode.EPOCH && EPOCH_ERROR_REPORTER_CONSTRUCTOR != null)
+            ? EPOCH_ERROR_REPORTER_CONSTRUCTOR
+            : fileConfig -> new DefaultErrorReporter());
+  }
+
+  /**
+   * Initialize the context of a build process whose cancellation is indicated by {@code
+   * cancelIndicator}
+   *
+   * @param mode The mode of this build process.
+   * @param cancelIndicator The cancel indicator of the code generation process to which this
+   *     corresponds.
+   * @param reportProgress The {@code ReportProgress} function of {@code this}.
+   * @param args Any arguments that may be used to affect the product of the build.
+   * @param resource ...
+   * @param fsa ...
+   * @param constructErrorReporter A function that constructs the appropriate error reporter for the
+   *     given FileConfig.
+   */
+  public MainContext(
+      Mode mode,
+      CancelIndicator cancelIndicator,
+      ReportProgress reportProgress,
+      Properties args,
+      Resource resource,
+      IFileSystemAccess2 fsa,
+      Function<FileConfig, ErrorReporter> constructErrorReporter) {
+    this.mode = mode;
+    this.cancelIndicator = cancelIndicator == null ? () -> false : cancelIndicator;
+    this.reportProgress = reportProgress;
+    this.args = args;
+
+    try {
+      var useHierarchicalBin =
+          args.containsKey("hierarchical-bin")
+              && Boolean.parseBoolean(args.getProperty("hierarchical-bin"));
+      fileConfig =
+          Objects.requireNonNull(
+              LFGenerator.createFileConfig(
+                  resource, FileConfig.getSrcGenRoot(fsa), useHierarchicalBin));
+    } catch (IOException e) {
+      throw new RuntimeIOException("Error during FileConfig instantiation", e);
     }
 
-    @Override
-    public void finish(GeneratorResult result) {
-        if (this.result != null) throw new IllegalStateException("A code generation process can only have one result.");
-        this.result = result;
-        reportProgress(result.getUserMessage(), 100);
-    }
-
-    @Override
-    public GeneratorResult getResult() {
-        return result != null ? result : GeneratorResult.NOTHING;
-    }
-
-    @Override
-    public FileConfig getFileConfig() {
-        return this.fileConfig;
-    }
-
-    @Override
-    public TargetConfig getTargetConfig() {
-        return this.targetConfig;
-    }
-
-    @Override
-    public void reportProgress(String message, int percentage) {
-        reportProgress.apply(message, percentage);
-    }
-
-    /**
-     * Load the target configuration based on the contents of the resource.
-     * This is done automatically upon instantiation of the context, but
-     * in case the resource changes (e.g., due to an AST transformation),
-     * this method can be called to reload to ensure that the changes are
-     * reflected in the target configuration.
-     */
-    public void loadTargetConfig() {
-        this.targetConfig = new TargetConfig(
-            args, GeneratorUtils.findTargetDecl(fileConfig.resource), errorReporter
-        );
-    }
+    this.errorReporter = constructErrorReporter.apply(this.fileConfig);
+
+    loadTargetConfig();
+  }
+
+  @Override
+  public CancelIndicator getCancelIndicator() {
+    return cancelIndicator;
+  }
+
+  @Override
+  public Mode getMode() {
+    return mode;
+  }
+
+  @Override
+  public Properties getArgs() {
+    return args;
+  }
+
+  @Override
+  public ErrorReporter getErrorReporter() {
+    return errorReporter;
+  }
+
+  @Override
+  public void finish(GeneratorResult result) {
+    if (this.result != null)
+      throw new IllegalStateException("A code generation process can only have one result.");
+    this.result = result;
+    reportProgress(result.getUserMessage(), 100);
+  }
+
+  @Override
+  public GeneratorResult getResult() {
+    return result != null ? result : GeneratorResult.NOTHING;
+  }
+
+  @Override
+  public FileConfig getFileConfig() {
+    return this.fileConfig;
+  }
+
+  @Override
+  public TargetConfig getTargetConfig() {
+    return this.targetConfig;
+  }
+
+  @Override
+  public void reportProgress(String message, int percentage) {
+    reportProgress.apply(message, percentage);
+  }
+
+  /**
+   * Load the target configuration based on the contents of the resource. This is done automatically
+   * upon instantiation of the context, but in case the resource changes (e.g., due to an AST
+   * transformation), this method can be called to reload to ensure that the changes are reflected
+   * in the target configuration.
+   */
+  public void loadTargetConfig() {
+    this.targetConfig =
+        new TargetConfig(args, GeneratorUtils.findTargetDecl(fileConfig.resource), errorReporter);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/MixedRadixInt.java b/org.lflang/src/org/lflang/generator/MixedRadixInt.java
index 700012385c..c75ebd5864 100644
--- a/org.lflang/src/org/lflang/generator/MixedRadixInt.java
+++ b/org.lflang/src/org/lflang/generator/MixedRadixInt.java
@@ -34,241 +34,223 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.Set;
 
 /**
- * Representation of a permuted mixed radix (PMR) integer.
- * A mixed radix number is a number representation where each digit can have
- * a distinct radix. The radixes are given by a list of numbers, r0, r1, ... , rn,
- * where r0 is the radix of the lowest-order digit and rn is the radix of the
- * highest order digit that has a specified radix.
+ * Representation of a permuted mixed radix (PMR) integer. A mixed radix number is a number
+ * representation where each digit can have a distinct radix. The radixes are given by a list of
+ * numbers, r0, r1, ... , rn, where r0 is the radix of the lowest-order digit and rn is the radix of
+ * the highest order digit that has a specified radix.
+ *
+ * <p>A PMR is a mixed radix number that, when incremented, increments the digits in the order given
+ * by the permutation matrix. For an ordinary mixed radix number, the permutation matrix is [0, 1,
+ * ..., n-1]. The permutation matrix may be any permutation of these digits, [d0, d1, ..., dn-1], in
+ * which case, when incremented, the d0 digit will be incremented first. If it overflows, it will be
+ * set to 0 and the d1 digit will be incremented. If it overflows, the next digit is incremented. If
+ * the last digit overflows, then the number wraps around so that all digits become zero.
+ *
+ * <p>This implementation realizes a finite set of numbers, where incrementing past the end of the
+ * range wraps around to the beginning. As a consequence, the increment() function from any starting
+ * point is guaranteed to eventually cover all possible values.
+ *
+ * <p>The {@link #toString()} method gives a string representation of the number where each digit is
+ * represented by the string "d%r", where d is the digit and r is the radix. For example, the number
+ * "1%2, 2%3, 1%4" has value 11, 1 + (2*2) + (1*2*3).
  *
- * A PMR is a mixed radix number that, when incremented,
- * increments the digits in the order given by the permutation matrix.
- * For an ordinary mixed radix number, the permutation matrix is
- * [0, 1, ..., n-1]. The permutation matrix may be any permutation of
- * these digits, [d0, d1, ..., dn-1], in which case, when incremented,
- * the d0 digit will be incremented first. If it overflows, it will be
- * set to 0 and the d1 digit will be incremented. If it overflows, the
- * next digit is incremented.  If the last digit overflows, then the
- * number wraps around so that all digits become zero.
- * 
- * This implementation realizes a finite set of numbers, where incrementing
- * past the end of the range wraps around to the beginning. As a consequence,
- * the increment() function from any starting point is guaranteed to eventually
- * cover all possible values.
- * 
- * The {@link #toString()} method gives a string representation of the number
- * where each digit is represented by the string "d%r", where d is the digit
- * and r is the radix. For example, the number "1%2, 2%3, 1%4" has value 11,
- * 1 + (2*2) + (1*2*3).
- * 
  * @author Edward A. Lee
  */
 public class MixedRadixInt {
-    
-    /**
-     * Create a mixed radix number with the specified digits and radixes,
-     * which are given low-order digits first.
-     * If there is one more digit than radixes, throw an exception.
-     * @param digits The digits, or null to get a zero-valued number.
-     * @param radixes The radixes.
-     * @param permutation The permutation matrix, or null for the default permutation.
-     */
-    public MixedRadixInt(
-            List<Integer> digits, List<Integer> radixes, List<Integer> permutation
-    ) {
-        if (radixes == null 
-                || (digits != null && digits.size() > radixes.size())
-                || (permutation != null && permutation.size() != radixes.size())
-                || radixes.contains(0)) {
-            throw new IllegalArgumentException("Invalid constructor arguments.");
-        }
-        this.radixes = radixes;
-        if (digits != null) {
-            this.digits = digits;
-        } else {
-            this.digits = new ArrayList<Integer>(1);
-            this.digits.add(0);
-        }
-        if (permutation != null) {
-            // Check the permutation matrix.
-            Set<Integer> indices = new HashSet<Integer>();
-            for (int p : permutation) {
-                if (p < 0 || p >= radixes.size() || indices.contains(p)) {
-                    throw new IllegalArgumentException(
-                            "Permutation list is required to be a permutation of [0, 1, ... , n-1].");
-                }
-                indices.add(p);
-            }
-            this.permutation = permutation;
-        }
-    }
-    
-    /**
-     * A zero-valued mixed radix number with just one digit will radix 1.
-     */
-    public final static MixedRadixInt ZERO = new MixedRadixInt(null, List.of(1), null);
-
-    //////////////////////////////////////////////////////////
-    //// Public methods
 
-    /**
-     * Get the value as an integer.
-     */
-    public int get() {
-        return get(0);
+  /**
+   * Create a mixed radix number with the specified digits and radixes, which are given low-order
+   * digits first. If there is one more digit than radixes, throw an exception.
+   *
+   * @param digits The digits, or null to get a zero-valued number.
+   * @param radixes The radixes.
+   * @param permutation The permutation matrix, or null for the default permutation.
+   */
+  public MixedRadixInt(List<Integer> digits, List<Integer> radixes, List<Integer> permutation) {
+    if (radixes == null
+        || (digits != null && digits.size() > radixes.size())
+        || (permutation != null && permutation.size() != radixes.size())
+        || radixes.contains(0)) {
+      throw new IllegalArgumentException("Invalid constructor arguments.");
     }
-    
-    /**
-     * Get the value as an integer after dropping the first n digits.
-     * @param n The number of digits to drop.
-     */
-    public int get(int n) {
-        int result = 0;
-        int scale = 1;
-        if (n < 0) n = 0;
-        for (int i = n; i < radixes.size(); i++) {
-            if (i >= digits.size()) return result;
-            result += digits.get(i) * scale;
-            scale *= radixes.get(i);
-        }
-        return result;
+    this.radixes = radixes;
+    if (digits != null) {
+      this.digits = digits;
+    } else {
+      this.digits = new ArrayList<Integer>(1);
+      this.digits.add(0);
     }
-
-    /**
-     * Return the digits. This is assured of returning as many
-     * digits as there are radixes.
-     */
-    public List<Integer> getDigits() {
-        while (digits.size() < radixes.size()) {
-            digits.add(0);
+    if (permutation != null) {
+      // Check the permutation matrix.
+      Set<Integer> indices = new HashSet<Integer>();
+      for (int p : permutation) {
+        if (p < 0 || p >= radixes.size() || indices.contains(p)) {
+          throw new IllegalArgumentException(
+              "Permutation list is required to be a permutation of [0, 1, ... , n-1].");
         }
-        return digits;
+        indices.add(p);
+      }
+      this.permutation = permutation;
     }
-    
-    /**
-     * Return the permutation list.
-     */
-    public List<Integer> getPermutation() {
-        if (permutation == null) {
-            // Construct a default permutation.
-            permutation = new ArrayList<Integer>(radixes.size());
-            for (int i = 0; i < radixes.size(); i++) {
-                permutation.add(i);
-            }
-        }
-        return permutation;
+  }
+
+  /** A zero-valued mixed radix number with just one digit will radix 1. */
+  public static final MixedRadixInt ZERO = new MixedRadixInt(null, List.of(1), null);
+
+  //////////////////////////////////////////////////////////
+  //// Public methods
+
+  /** Get the value as an integer. */
+  public int get() {
+    return get(0);
+  }
+
+  /**
+   * Get the value as an integer after dropping the first n digits.
+   *
+   * @param n The number of digits to drop.
+   */
+  public int get(int n) {
+    int result = 0;
+    int scale = 1;
+    if (n < 0) n = 0;
+    for (int i = n; i < radixes.size(); i++) {
+      if (i >= digits.size()) return result;
+      result += digits.get(i) * scale;
+      scale *= radixes.get(i);
     }
-        
-    /**
-     * Return the radixes.
-     */
-    public List<Integer> getRadixes() {
-        return radixes;
+    return result;
+  }
+
+  /** Return the digits. This is assured of returning as many digits as there are radixes. */
+  public List<Integer> getDigits() {
+    while (digits.size() < radixes.size()) {
+      digits.add(0);
     }
-    
-    /**
-     * Increment the number by one, using the permutation vector to
-     * determine the order in which the digits are incremented.
-     * If an overflow occurs, then a radix-infinity digit will be added
-     * to the digits array if there isn't one there already.
-     */
-    public void increment() {
-        int i = 0;
-        while (i < radixes.size()) {
-            int digit_to_increment = getPermutation().get(i);
-            while (digit_to_increment >= digits.size()) {
-                digits.add(0);
-            }
-            digits.set(digit_to_increment, digits.get(digit_to_increment) + 1);
-            if (digits.get(digit_to_increment) >= radixes.get(digit_to_increment)) {
-                digits.set(digit_to_increment, 0);
-                i++;
-            } else {
-                return; // All done.
-            }
-        }
+    return digits;
+  }
+
+  /** Return the permutation list. */
+  public List<Integer> getPermutation() {
+    if (permutation == null) {
+      // Construct a default permutation.
+      permutation = new ArrayList<Integer>(radixes.size());
+      for (int i = 0; i < radixes.size(); i++) {
+        permutation.add(i);
+      }
     }
-    
-    /**
-     * Return the magnitude of this PMR, which is defined to be the number
-     * of times that increment() would need to invoked starting with zero
-     * before the value returned by {@link #get()} would be reached.
-     */
-    public int magnitude() {
-        int factor = 1;
-        int result = 0;
-        List<Integer> p = getPermutation();
-        for (int i = 0; i < radixes.size(); i++) {
-            if (digits.size() <= i) return result;
-            result += factor * digits.get(p.get(i));
-            factor *= radixes.get(p.get(i));
-        }
-        return result;
+    return permutation;
+  }
+
+  /** Return the radixes. */
+  public List<Integer> getRadixes() {
+    return radixes;
+  }
+
+  /**
+   * Increment the number by one, using the permutation vector to determine the order in which the
+   * digits are incremented. If an overflow occurs, then a radix-infinity digit will be added to the
+   * digits array if there isn't one there already.
+   */
+  public void increment() {
+    int i = 0;
+    while (i < radixes.size()) {
+      int digit_to_increment = getPermutation().get(i);
+      while (digit_to_increment >= digits.size()) {
+        digits.add(0);
+      }
+      digits.set(digit_to_increment, digits.get(digit_to_increment) + 1);
+      if (digits.get(digit_to_increment) >= radixes.get(digit_to_increment)) {
+        digits.set(digit_to_increment, 0);
+        i++;
+      } else {
+        return; // All done.
+      }
     }
-        
-    /**
-     * Return the number of digits in this mixed radix number.
-     * This is the size of the radixes list.
-     */
-    public int numDigits() {
-        return radixes.size();
+  }
+
+  /**
+   * Return the magnitude of this PMR, which is defined to be the number of times that increment()
+   * would need to invoked starting with zero before the value returned by {@link #get()} would be
+   * reached.
+   */
+  public int magnitude() {
+    int factor = 1;
+    int result = 0;
+    List<Integer> p = getPermutation();
+    for (int i = 0; i < radixes.size(); i++) {
+      if (digits.size() <= i) return result;
+      result += factor * digits.get(p.get(i));
+      factor *= radixes.get(p.get(i));
     }
-    
-    /**
-     * Set the value of this number to equal that of the specified integer.
-     * @param v The ordinary integer value of this number.
-     */
-    public void set(int v) {
-        int temp = v;
-        int count = 0;
-        for (int radix : radixes) {
-            if (count >= digits.size()) {
-                digits.add(temp % radix);
-            } else {
-                digits.set(count, temp % radix);
-            }
-            count++;
-            temp = temp / radix;
-        }
+    return result;
+  }
+
+  /**
+   * Return the number of digits in this mixed radix number. This is the size of the radixes list.
+   */
+  public int numDigits() {
+    return radixes.size();
+  }
+
+  /**
+   * Set the value of this number to equal that of the specified integer.
+   *
+   * @param v The ordinary integer value of this number.
+   */
+  public void set(int v) {
+    int temp = v;
+    int count = 0;
+    for (int radix : radixes) {
+      if (count >= digits.size()) {
+        digits.add(temp % radix);
+      } else {
+        digits.set(count, temp % radix);
+      }
+      count++;
+      temp = temp / radix;
     }
-    
-    /**
-     * Set the magnitude of this number to equal that of the specified integer,
-     * which is the number of times that increment must be invoked from zero
-     * for the value returned by {@link #get()} to equal v.
-     * @param v The new magnitude of this number.
-     */
-    public void setMagnitude(int v) {
-        int temp = v;
-        for (int i = 0; i < radixes.size(); i++) {
-            int p = getPermutation().get(i);
-            while (digits.size() < p + 1) digits.add(0);
-            digits.set(p, temp % radixes.get(p));
-            temp = temp / radixes.get(p);
-        }
+  }
+
+  /**
+   * Set the magnitude of this number to equal that of the specified integer, which is the number of
+   * times that increment must be invoked from zero for the value returned by {@link #get()} to
+   * equal v.
+   *
+   * @param v The new magnitude of this number.
+   */
+  public void setMagnitude(int v) {
+    int temp = v;
+    for (int i = 0; i < radixes.size(); i++) {
+      int p = getPermutation().get(i);
+      while (digits.size() < p + 1) digits.add(0);
+      digits.set(p, temp % radixes.get(p));
+      temp = temp / radixes.get(p);
     }
-    
-    /**
-     * Give a string representation of the number, where each digit is
-     * represented as n%r, where r is the radix.
-     */
-    @Override
-    public String toString() {
-        List<String> pieces = new LinkedList<String>();
-        Iterator<Integer> radixIterator = radixes.iterator();
-        for (int digit : digits) {
-            if (! radixIterator.hasNext()) {
-                pieces.add(digit + "%infinity");
-            } else {
-                pieces.add(digit + "%" + radixIterator.next());
-            }
-        }
-        return String.join(", ", pieces);
+  }
+
+  /**
+   * Give a string representation of the number, where each digit is represented as n%r, where r is
+   * the radix.
+   */
+  @Override
+  public String toString() {
+    List<String> pieces = new LinkedList<String>();
+    Iterator<Integer> radixIterator = radixes.iterator();
+    for (int digit : digits) {
+      if (!radixIterator.hasNext()) {
+        pieces.add(digit + "%infinity");
+      } else {
+        pieces.add(digit + "%" + radixIterator.next());
+      }
     }
+    return String.join(", ", pieces);
+  }
 
-    //////////////////////////////////////////////////////////
-    //// Private variables
+  //////////////////////////////////////////////////////////
+  //// Private variables
 
-    private List<Integer> radixes;
-    private List<Integer> digits;
-    private List<Integer> permutation;
+  private List<Integer> radixes;
+  private List<Integer> digits;
+  private List<Integer> permutation;
 }
diff --git a/org.lflang/src/org/lflang/generator/ModeInstance.java b/org.lflang/src/org/lflang/generator/ModeInstance.java
index 1f30f25802..932683f0ed 100644
--- a/org.lflang/src/org/lflang/generator/ModeInstance.java
+++ b/org.lflang/src/org/lflang/generator/ModeInstance.java
@@ -1,215 +1,206 @@
 /*************
-Copyright (c) 2021, Kiel University.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2021, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
 import java.util.LinkedList;
 import java.util.List;
-
 import org.lflang.lf.Mode;
 import org.lflang.lf.ModeTransition;
 import org.lflang.lf.VarRef;
 
 /**
  * Representation of a runtime instance of a mode.
- *  
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class ModeInstance extends NamedInstance<Mode> {
 
-    /**
-     * Create a new reaction instance from the specified definition
-     * within the specified parent. This constructor should be called
-     * only by the ReactorInstance class after all other contents
-     * (reactions, etc.) are registered because this constructor call
-     * will look them up.
-     * @param definition A mode definition.
-     * @param parent The parent reactor instance, which cannot be null.
-     */
-    protected ModeInstance(Mode definition, ReactorInstance parent) {
-        super(definition, parent);
-        
-        collectMembers();
+  /**
+   * Create a new reaction instance from the specified definition within the specified parent. This
+   * constructor should be called only by the ReactorInstance class after all other contents
+   * (reactions, etc.) are registered because this constructor call will look them up.
+   *
+   * @param definition A mode definition.
+   * @param parent The parent reactor instance, which cannot be null.
+   */
+  protected ModeInstance(Mode definition, ReactorInstance parent) {
+    super(definition, parent);
+
+    collectMembers();
+  }
+
+  ////////////////////////////////////////////////////
+  // Member fields.
+
+  /** The action instances belonging to this mode instance. */
+  public List<ActionInstance> actions = new LinkedList<ActionInstance>();
+
+  /** The reactor instances belonging to this mode instance, in order of declaration. */
+  public List<ReactorInstance> instantiations = new LinkedList<ReactorInstance>();
+
+  /** List of reaction instances for this reactor instance. */
+  public List<ReactionInstance> reactions = new LinkedList<ReactionInstance>();
+
+  /** The timer instances belonging to this reactor instance. */
+  public List<TimerInstance> timers = new LinkedList<TimerInstance>();
+
+  /** The outgoing transitions of this mode. */
+  public List<Transition> transitions = new LinkedList<Transition>();
+
+  ////////////////////////////////////////////////////
+  // Public methods.
+
+  /**
+   * Return the name of this mode.
+   *
+   * @return The name of this mode.
+   */
+  @Override
+  public String getName() {
+    return this.definition.getName();
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public ReactorInstance root() {
+    return parent.root();
+  }
+
+  /** Return a descriptive string. */
+  @Override
+  public String toString() {
+    return getName() + " of " + parent.getFullName();
+  }
+
+  /** Returns true iff this mode is the initial mode of this reactor instance. */
+  public boolean isInitial() {
+    return definition.isInitial();
+  }
+
+  /**
+   * Sets up all transitions that leave this mode. Requires that all mode instances and other
+   * contents (reactions, etc.) of the parent reactor are created.
+   */
+  public void setupTranstions() {
+    transitions.clear();
+    for (var reaction : reactions) {
+      for (var effect : reaction.definition.getEffects()) {
+        if (effect instanceof VarRef) {
+          var target = effect.getVariable();
+          if (target instanceof Mode) {
+            transitions.add(
+                new Transition(this, parent.lookupModeInstance((Mode) target), reaction, effect));
+          }
+        }
+      }
     }
-    
-    ////////////////////////////////////////////////////
-    // Member fields.
-    
-    /** The action instances belonging to this mode instance. */
-    public List<ActionInstance> actions = new LinkedList<ActionInstance>();
-    
-    /** The reactor instances belonging to this mode instance, in order of declaration. */
-    public List<ReactorInstance> instantiations = new LinkedList<ReactorInstance>();
-
-    /** List of reaction instances for this reactor instance. */
-    public List<ReactionInstance> reactions = new LinkedList<ReactionInstance>();
-
-    /** The timer instances belonging to this reactor instance. */
-    public List<TimerInstance> timers = new LinkedList<TimerInstance>();
-    
-    /** The outgoing transitions of this mode. */
-    public List<Transition> transitions = new LinkedList<Transition>();
-
-    ////////////////////////////////////////////////////
-    // Public methods.
-    
-    /**
-     * Return the name of this mode.
-     * @return The name of this mode.
-     */
-    @Override
-    public String getName() {
-        return this.definition.getName();
+  }
+
+  /** Returns true iff this mode contains the given instance. */
+  public boolean contains(NamedInstance<?> instance) {
+    if (instance instanceof TimerInstance) {
+      return timers.contains(instance);
+    } else if (instance instanceof ActionInstance) {
+      return actions.contains(instance);
+    } else if (instance instanceof ReactorInstance) {
+      return instantiations.contains(instance);
+    } else if (instance instanceof ReactionInstance) {
+      return reactions.contains(instance);
+    } else {
+      return false;
     }
-    
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public ReactorInstance root() {
-        return parent.root();
+  }
+
+  ////////////////////////////////////////////////////
+  // Private methods.
+
+  private void collectMembers() {
+    // Collect timers
+    for (var decl : definition.getTimers()) {
+      var instance = parent.lookupTimerInstance(decl);
+      if (instance != null) {
+        this.timers.add(instance);
+      }
     }
 
-    /**
-     * Return a descriptive string.
-     */
-    @Override
-    public String toString() {
-        return getName() + " of " + parent.getFullName();
+    // Collect actions
+    for (var decl : definition.getActions()) {
+      var instance = parent.lookupActionInstance(decl);
+      if (instance != null) {
+        this.actions.add(instance);
+      }
     }
-    
-    /**
-     * Returns true iff this mode is the initial mode of this reactor instance.
-     */
-    public boolean isInitial() {
-        return definition.isInitial();
+
+    // Collect reactor instantiation
+    for (var decl : definition.getInstantiations()) {
+      var instance = parent.lookupReactorInstance(decl);
+      if (instance != null) {
+        this.instantiations.add(instance);
+      }
     }
-    
-    /**
-     * Sets up all transitions that leave this mode.
-     * Requires that all mode instances and other contents
-     * (reactions, etc.) of the parent reactor are created.
-     */
-    public void setupTranstions() {
-        transitions.clear();
-        for (var reaction : reactions) {
-            for (var effect : reaction.definition.getEffects()) {
-                if (effect instanceof VarRef) {
-                    var target = effect.getVariable();
-                    if (target instanceof Mode) {
-                        transitions.add(new Transition(this, parent.lookupModeInstance((Mode) target), reaction, effect));
-                    }
-                }
-            }
-        }
+
+    // Collect reactions
+    for (var decl : definition.getReactions()) {
+      var instance = parent.lookupReactionInstance(decl);
+      if (instance != null) {
+        this.reactions.add(instance);
+      }
     }
-    
-    /**
-     * Returns true iff this mode contains the given instance.
-     */
-    public boolean contains(NamedInstance<?> instance) {
-        if (instance instanceof TimerInstance) {
-            return timers.contains(instance);
-        } else if (instance instanceof ActionInstance) {
-            return actions.contains(instance);
-        } else if (instance instanceof ReactorInstance) {
-            return instantiations.contains(instance);
-        } else if (instance instanceof ReactionInstance) {
-            return reactions.contains(instance);
-        } else {
-            return false;
-        }
+  }
+
+  ////////////////////////////////////////////////////
+  // Data class.
+
+  public static class Transition extends NamedInstance<VarRef> {
+    public final ModeInstance source;
+    public final ModeInstance target;
+    public final ReactionInstance reaction;
+    public final ModeTransition type;
+
+    Transition(
+        ModeInstance source, ModeInstance target, ReactionInstance reaction, VarRef definition) {
+      super(definition, source.parent);
+      this.source = source;
+      this.target = target;
+      this.reaction = reaction;
+      this.type =
+          definition.getTransition() == null ? ModeTransition.RESET : definition.getTransition();
     }
 
-    ////////////////////////////////////////////////////
-    // Private methods.
-    
-    private void collectMembers() {
-        // Collect timers
-        for (var decl : definition.getTimers()) {
-            var instance = parent.lookupTimerInstance(decl);
-            if (instance != null) {
-                this.timers.add(instance);
-            }
-        }
-        
-        // Collect actions
-        for (var decl : definition.getActions()) {
-            var instance = parent.lookupActionInstance(decl);
-            if (instance != null) {
-                this.actions.add(instance);
-            }
-        }
-        
-        // Collect reactor instantiation
-        for (var decl : definition.getInstantiations()) {
-            var instance = parent.lookupReactorInstance(decl);
-            if (instance != null) {
-                this.instantiations.add(instance);
-            }
-        }
-        
-        // Collect reactions
-        for (var decl : definition.getReactions()) {
-            var instance = parent.lookupReactionInstance(decl);
-            if (instance != null) {
-                this.reactions.add(instance);
-            }
-        }
+    @Override
+    public String getName() {
+      return this.source.getName() + " -> " + this.target + " by " + this.reaction.getName();
     }
-    
-    ////////////////////////////////////////////////////
-    // Data class.
-    
-    public static class Transition extends NamedInstance<VarRef> {
-        public final ModeInstance source;
-        public final ModeInstance target;
-        public final ReactionInstance reaction;
-        public final ModeTransition type;
-        
-        Transition(ModeInstance source, ModeInstance target, ReactionInstance reaction, VarRef definition) {
-            super(definition, source.parent);
-            this.source = source;
-            this.target = target;
-            this.reaction = reaction;
-            this.type = definition.getTransition() == null ? ModeTransition.RESET : definition.getTransition();
-        }
-        
-        @Override
-        public String getName() {
-            return this.source.getName() + " -> " + this.target + " by " + this.reaction.getName();
-        }
-        
-        @Override
-        public ReactorInstance root() {
-            return this.parent.root();
-        }
-        
-        public ModeTransition getType() {
-            return type;
-        }
-        
+
+    @Override
+    public ReactorInstance root() {
+      return this.parent.root();
+    }
+
+    public ModeTransition getType() {
+      return type;
     }
-    
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/NamedInstance.java b/org.lflang/src/org/lflang/generator/NamedInstance.java
index 1d8c37321f..3455bcdf40 100644
--- a/org.lflang/src/org/lflang/generator/NamedInstance.java
+++ b/org.lflang/src/org/lflang/generator/NamedInstance.java
@@ -1,337 +1,319 @@
 /* Base class for instances with names in Lingua Franca. */
 
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-
 import org.eclipse.emf.ecore.EObject;
 
-/** 
- * Base class for compile-time instances with names in Lingua Franca.
- * An instance of concrete subclasses of this class represents one or
- * more runtime instances of a reactor, port, reaction, etc. There
- * will be more than one runtime instance if the object or any of its
- * parents is a bank of reactors.
- *  
+/**
+ * Base class for compile-time instances with names in Lingua Franca. An instance of concrete
+ * subclasses of this class represents one or more runtime instances of a reactor, port, reaction,
+ * etc. There will be more than one runtime instance if the object or any of its parents is a bank
+ * of reactors.
+ *
  * @author Marten Lohstroh
  * @author Edward A. Lee
  */
 public abstract class NamedInstance<T extends EObject> {
-        
-    /**
-     * Construct a new instance with the specified definition
-     * and parent. E.g., for a reactor instance, the definition
-     * is Instantiation, and for a port instance, it is Port. These are
-     * nodes in the AST. This is protected because only subclasses
-     * should be constructed.
-     * @param definition The definition in the AST for this instance.
-     * @param parent The reactor instance that creates this instance.
-     */
-    protected NamedInstance(T definition, ReactorInstance parent) {
-        this.definition = definition;
-        this.parent = parent;
-
-        // Calculate the depth.
-        this.depth = 0;
-        ReactorInstance p = parent;
-        while (p != null) {
-            p = p.parent;
-            this.depth++;
-        }
-    }
-    
-    //////////////////////////////////////////////////////
-    //// Public fields.
-        
-    /** A limit on the number of characters returned by uniqueID. */
-    public static int identifierLengthLimit = 40;
-    
-    //////////////////////////////////////////////////////
-    //// Public methods.
-
-    /**
-     * Return the definition, which is the AST node for this object.
-     */
-    public T getDefinition() {
-        return definition;
-    }
-    
-    /**
-     * Get the depth of the reactor instance. This is 0 for the main reactor,
-     * 1 for reactors immediately contained therein, etc.
-     */
-    public int getDepth() {
-        return depth;
-    }
-    
-    /** 
-     * Return the full name of this instance, which has the form
-     * "a.b.c", where "c" is the name of this instance, "b" is the name
-     * of its container, and "a" is the name of its container, stopping
-     * at the container in main. If any reactor in the hierarchy is
-     * in a bank of reactors then, it will appear as a[index].
-     * Similarly, if c is a port in a multiport, it will appear as
-     * c[index].
-     * @return The full name of this instance.
-     */
-    public String getFullName() {
-        return getFullNameWithJoiner(".");
-    }
-    
-    /**
-     * Return the name of this instance as given in its definition.
-     * Note that this is unique only relative to other instances with
-     * the same parent.
-     * @return The name of this instance within its parent.
-     */
-    public abstract String getName();
-    
-    /**
-     * Return the parent or null if this is a top-level reactor.
-     */
-    public ReactorInstance getParent() {
-        return parent;
-    }
-    
-    /**
-     * Return the parent at the given depth or null if there is
-     * no parent at the given depth.
-     * @param d The depth.
-     */
-    public ReactorInstance getParent(int d) {
-        if (d >= depth || d < 0) return null;
-        ReactorInstance p = parent;
-        while (p != null) {
-            if (p.depth == d) return p;
-            p = p.parent;
-        }
-        return null;
+
+  /**
+   * Construct a new instance with the specified definition and parent. E.g., for a reactor
+   * instance, the definition is Instantiation, and for a port instance, it is Port. These are nodes
+   * in the AST. This is protected because only subclasses should be constructed.
+   *
+   * @param definition The definition in the AST for this instance.
+   * @param parent The reactor instance that creates this instance.
+   */
+  protected NamedInstance(T definition, ReactorInstance parent) {
+    this.definition = definition;
+    this.parent = parent;
+
+    // Calculate the depth.
+    this.depth = 0;
+    ReactorInstance p = parent;
+    while (p != null) {
+      p = p.parent;
+      this.depth++;
     }
+  }
+
+  //////////////////////////////////////////////////////
+  //// Public fields.
+
+  /** A limit on the number of characters returned by uniqueID. */
+  public static int identifierLengthLimit = 40;
+
+  //////////////////////////////////////////////////////
+  //// Public methods.
+
+  /** Return the definition, which is the AST node for this object. */
+  public T getDefinition() {
+    return definition;
+  }
 
-    /**
-     * Return the width of this instance, which in this base class is 1.
-     * Subclasses PortInstance and ReactorInstance change this to the
-     * multiport and bank widths respectively.
-     */
-    public int getWidth() {
-        return width;
+  /**
+   * Get the depth of the reactor instance. This is 0 for the main reactor, 1 for reactors
+   * immediately contained therein, etc.
+   */
+  public int getDepth() {
+    return depth;
+  }
+
+  /**
+   * Return the full name of this instance, which has the form "a.b.c", where "c" is the name of
+   * this instance, "b" is the name of its container, and "a" is the name of its container, stopping
+   * at the container in main. If any reactor in the hierarchy is in a bank of reactors then, it
+   * will appear as a[index]. Similarly, if c is a port in a multiport, it will appear as c[index].
+   *
+   * @return The full name of this instance.
+   */
+  public String getFullName() {
+    return getFullNameWithJoiner(".");
+  }
+
+  /**
+   * Return the name of this instance as given in its definition. Note that this is unique only
+   * relative to other instances with the same parent.
+   *
+   * @return The name of this instance within its parent.
+   */
+  public abstract String getName();
+
+  /** Return the parent or null if this is a top-level reactor. */
+  public ReactorInstance getParent() {
+    return parent;
+  }
+
+  /**
+   * Return the parent at the given depth or null if there is no parent at the given depth.
+   *
+   * @param d The depth.
+   */
+  public ReactorInstance getParent(int d) {
+    if (d >= depth || d < 0) return null;
+    ReactorInstance p = parent;
+    while (p != null) {
+      if (p.depth == d) return p;
+      p = p.parent;
     }
-    
-    /**
-     * Return true if this instance has the specified parent
-     * (possibly indirectly, anywhere up the hierarchy).
-     */
-    public boolean hasParent(ReactorInstance container) {
-        
-        ReactorInstance p = parent;
-        
-        while (p != null) {
-            if (p == container) return true;
-            p = p.parent;
-        }
-        return false;
+    return null;
+  }
+
+  /**
+   * Return the width of this instance, which in this base class is 1. Subclasses PortInstance and
+   * ReactorInstance change this to the multiport and bank widths respectively.
+   */
+  public int getWidth() {
+    return width;
+  }
+
+  /**
+   * Return true if this instance has the specified parent (possibly indirectly, anywhere up the
+   * hierarchy).
+   */
+  public boolean hasParent(ReactorInstance container) {
+
+    ReactorInstance p = parent;
+
+    while (p != null) {
+      if (p == container) return true;
+      p = p.parent;
     }
-    
-    /**
-     * Return a list of all the parents starting with the root().
-     */
-    public List<ReactorInstance> parents() {
-        List<ReactorInstance> result = new ArrayList<ReactorInstance>(depth + 1);
-        if (this instanceof ReactorInstance && parent == null) {
-            // This is the top level, so it must be a reactor.
-            result.add((ReactorInstance) this);
-        }
-        ReactorInstance container = parent;
-        while (container != null) {
-            result.add(container);
-            container = container.parent;
-        }
-        return result;
+    return false;
+  }
+
+  /** Return a list of all the parents starting with the root(). */
+  public List<ReactorInstance> parents() {
+    List<ReactorInstance> result = new ArrayList<ReactorInstance>(depth + 1);
+    if (this instanceof ReactorInstance && parent == null) {
+      // This is the top level, so it must be a reactor.
+      result.add((ReactorInstance) this);
     }
-    
-    /**
-     * Return the root reactor, which is the top-level parent.
-     * @return The top-level parent.
-     */
-    public ReactorInstance root() {
-        if (parent != null) {
-            return parent.root();
-        } else {
-            return (ReactorInstance)this;
-        }
+    ReactorInstance container = parent;
+    while (container != null) {
+      result.add(container);
+      container = container.parent;
     }
-            
-    /**
-     * Set the width. This method is here for testing only and should
-     * not be used for any other purpose.
-     * @param width The new width.
-     */
-    public void setWidth(int width) {
-        this.width = width;
+    return result;
+  }
+
+  /**
+   * Return the root reactor, which is the top-level parent.
+   *
+   * @return The top-level parent.
+   */
+  public ReactorInstance root() {
+    if (parent != null) {
+      return parent.root();
+    } else {
+      return (ReactorInstance) this;
     }
+  }
 
-    /**
-     * Return an identifier for this instance, which has the form "a_b_c"
-     * or "a_b_c_n", where "c" is the name of this instance, "b" is the name
-     * of its container, and "a" is the name of its container, stopping
-     * at the container in main. All names are converted to lower case.
-     * The suffix _n is usually omitted, but it is possible to get name
-     * collisions using the above scheme, in which case _n will be an
-     * increasing integer until there is no collision.
-     * If the length of the root of the name as calculated above (the root
-     * is without the _n suffix) is longer than
-     * the static variable identifierLengthLimit, then the name will be
-     * truncated. The returned name will be the tail of the name calculated
-     * above with the prefix '_'.
-     * @return An identifier for this instance that is guaranteed to be
-     *  unique within the top-level parent.
-     */
-    public String uniqueID() {
-        if (_uniqueID == null) {
-            // Construct the unique ID only if it has not been
-            // previously constructed.
-            String prefix = getFullNameWithJoiner("_").toLowerCase();
-            
-            // Replace all non-alphanumeric (Latin) characters with underscore.
-            prefix = prefix.replaceAll("[^A-Za-z0-9]", "_");
-            
-            // Truncate, if necessary.
-            if (prefix.length() > identifierLengthLimit) {
-                prefix = '_' 
-                    + prefix.substring(prefix.length() - identifierLengthLimit + 1);
-            }
-            
-            // Ensure uniqueness.
-            ReactorInstance toplevel = root();
-            if (toplevel.uniqueIDCount == null) {
-                toplevel.uniqueIDCount = new HashMap<String,Integer>();
-            }
-            var count = toplevel.uniqueIDCount.get(prefix);
-            if (count == null) {
-                toplevel.uniqueIDCount.put(prefix, 1);
-                _uniqueID = prefix;
-            } else {
-                toplevel.uniqueIDCount.put(prefix, count + 1);
-                // NOTE: The length of this name could exceed
-                // identifierLengthLimit. Is this OK?
-                _uniqueID = prefix + '_' + (count + 1);
-            }
-        }
-        return _uniqueID;
+  /**
+   * Set the width. This method is here for testing only and should not be used for any other
+   * purpose.
+   *
+   * @param width The new width.
+   */
+  public void setWidth(int width) {
+    this.width = width;
+  }
+
+  /**
+   * Return an identifier for this instance, which has the form "a_b_c" or "a_b_c_n", where "c" is
+   * the name of this instance, "b" is the name of its container, and "a" is the name of its
+   * container, stopping at the container in main. All names are converted to lower case. The suffix
+   * _n is usually omitted, but it is possible to get name collisions using the above scheme, in
+   * which case _n will be an increasing integer until there is no collision. If the length of the
+   * root of the name as calculated above (the root is without the _n suffix) is longer than the
+   * static variable identifierLengthLimit, then the name will be truncated. The returned name will
+   * be the tail of the name calculated above with the prefix '_'.
+   *
+   * @return An identifier for this instance that is guaranteed to be unique within the top-level
+   *     parent.
+   */
+  public String uniqueID() {
+    if (_uniqueID == null) {
+      // Construct the unique ID only if it has not been
+      // previously constructed.
+      String prefix = getFullNameWithJoiner("_").toLowerCase();
+
+      // Replace all non-alphanumeric (Latin) characters with underscore.
+      prefix = prefix.replaceAll("[^A-Za-z0-9]", "_");
+
+      // Truncate, if necessary.
+      if (prefix.length() > identifierLengthLimit) {
+        prefix = '_' + prefix.substring(prefix.length() - identifierLengthLimit + 1);
+      }
+
+      // Ensure uniqueness.
+      ReactorInstance toplevel = root();
+      if (toplevel.uniqueIDCount == null) {
+        toplevel.uniqueIDCount = new HashMap<String, Integer>();
+      }
+      var count = toplevel.uniqueIDCount.get(prefix);
+      if (count == null) {
+        toplevel.uniqueIDCount.put(prefix, 1);
+        _uniqueID = prefix;
+      } else {
+        toplevel.uniqueIDCount.put(prefix, count + 1);
+        // NOTE: The length of this name could exceed
+        // identifierLengthLimit. Is this OK?
+        _uniqueID = prefix + '_' + (count + 1);
+      }
     }
-    
-    /**
-     * Returns the directly/indirectly enclosing mode.
-     * @param direct flag whether to check only for direct enclosing mode
-     *   or also consider modes of parent reactor instances.
-     * @return The mode, if any, null otherwise.
-     */
-    public ModeInstance getMode(boolean direct) {
-        ModeInstance mode = null;
-        if (parent != null) {
-            if (!parent.modes.isEmpty()) {
-                mode = parent.modes.stream().filter(it -> it.contains(this)).findFirst().orElse(null);
-            }
-            if (mode == null && !direct) {
-                mode = parent.getMode(false);
-            }
-        }
-        return mode;
+    return _uniqueID;
+  }
+
+  /**
+   * Returns the directly/indirectly enclosing mode.
+   *
+   * @param direct flag whether to check only for direct enclosing mode or also consider modes of
+   *     parent reactor instances.
+   * @return The mode, if any, null otherwise.
+   */
+  public ModeInstance getMode(boolean direct) {
+    ModeInstance mode = null;
+    if (parent != null) {
+      if (!parent.modes.isEmpty()) {
+        mode = parent.modes.stream().filter(it -> it.contains(this)).findFirst().orElse(null);
+      }
+      if (mode == null && !direct) {
+        mode = parent.getMode(false);
+      }
     }
+    return mode;
+  }
 
-    //////////////////////////////////////////////////////
-    //// Protected fields.
-
-    /** The Instantiation AST object from which this was created. */
-    T definition;
-
-    /** The reactor instance that creates this instance. */
-    ReactorInstance parent;
-
-    /**
-     * Map from a name of the form a_b_c to the number of
-     * unique IDs with that prefix that have been already
-     * assigned. If none have been assigned, then there is
-     * no entry in this map. This map should be non-null only
-     * for the main reactor (the top level).
-     */
-    HashMap<String,Integer> uniqueIDCount;
-
-    /** 
-     * The width of this instance. This is 1 for everything
-     * except a PortInstance representing a multiport and a
-     * ReactorInstance representing a bank.
-     */
-    int width = 1;
-
-    //////////////////////////////////////////////////////
-    //// Protected methods.
-
-    /**
-     * Return a string of the form
-     * "a.b.c", where "." is replaced by the specified joiner,
-     * "c" is the name of this instance, "b" is the name
-     * of its container, and "a" is the name of its container, stopping
-     * at the container in main.
-     * @return A string representing this instance.
-     */
-    protected String getFullNameWithJoiner(String joiner) {
-        // This is not cached because _uniqueID is cached.
-        if (parent == null) {
-            return this.getName();
-        } else if (getMode(true) != null) {
-            return parent.getFullNameWithJoiner(joiner) + joiner + getMode(true).getName() + joiner + this.getName();
-        } else {
-            return parent.getFullNameWithJoiner(joiner) + joiner + this.getName();
-        }
+  //////////////////////////////////////////////////////
+  //// Protected fields.
+
+  /** The Instantiation AST object from which this was created. */
+  T definition;
+
+  /** The reactor instance that creates this instance. */
+  ReactorInstance parent;
+
+  /**
+   * Map from a name of the form a_b_c to the number of unique IDs with that prefix that have been
+   * already assigned. If none have been assigned, then there is no entry in this map. This map
+   * should be non-null only for the main reactor (the top level).
+   */
+  HashMap<String, Integer> uniqueIDCount;
+
+  /**
+   * The width of this instance. This is 1 for everything except a PortInstance representing a
+   * multiport and a ReactorInstance representing a bank.
+   */
+  int width = 1;
+
+  //////////////////////////////////////////////////////
+  //// Protected methods.
+
+  /**
+   * Return a string of the form "a.b.c", where "." is replaced by the specified joiner, "c" is the
+   * name of this instance, "b" is the name of its container, and "a" is the name of its container,
+   * stopping at the container in main.
+   *
+   * @return A string representing this instance.
+   */
+  protected String getFullNameWithJoiner(String joiner) {
+    // This is not cached because _uniqueID is cached.
+    if (parent == null) {
+      return this.getName();
+    } else if (getMode(true) != null) {
+      return parent.getFullNameWithJoiner(joiner)
+          + joiner
+          + getMode(true).getName()
+          + joiner
+          + this.getName();
+    } else {
+      return parent.getFullNameWithJoiner(joiner) + joiner + this.getName();
     }
+  }
+
+  //////////////////////////////////////////////////////
+  //// Protected fields.
+
+  /**
+   * The depth in the hierarchy of this instance. This is 0 for main or federated, 1 for the
+   * reactors immediately contained, etc.
+   */
+  protected int depth = 0;
+
+  //////////////////////////////////////////////////////
+  //// Private fields.
+
+  /** The full name of this instance. */
+  private String _fullName = null;
 
-    //////////////////////////////////////////////////////
-    //// Protected fields.
-
-    /**
-     * The depth in the hierarchy of this instance.
-     * This is 0 for main or federated, 1 for the reactors immediately contained, etc.
-     */
-    protected int depth = 0;
-
-    //////////////////////////////////////////////////////
-    //// Private fields.
-    
-    /**
-     * The full name of this instance.
-     */
-    private String _fullName = null;
-    
-    /**
-     * Unique ID for this instance. This is null until
-     * uniqueID() is called.
-     */
-    private String _uniqueID = null;
-}
\ No newline at end of file
+  /** Unique ID for this instance. This is null until uniqueID() is called. */
+  private String _uniqueID = null;
+}
diff --git a/org.lflang/src/org/lflang/generator/ParameterInstance.java b/org.lflang/src/org/lflang/generator/ParameterInstance.java
index 851fcb627e..92a1b03ed4 100644
--- a/org.lflang/src/org/lflang/generator/ParameterInstance.java
+++ b/org.lflang/src/org/lflang/generator/ParameterInstance.java
@@ -1,121 +1,118 @@
 /** A data structure for a parameter instance. */
 
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
 import java.util.List;
 import java.util.Optional;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.InferredType;
+import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Assignment;
 import org.lflang.lf.Initializer;
 import org.lflang.lf.Parameter;
 
 /**
- * Representation of a compile-time instance of a parameter.
- * Upon creation, it is checked whether this parameter is overridden by an
- * assignment in the instantiation that this parameter instance is a result of.
- * If it is overridden, the parameter gets initialized using the value looked up
- * in the instantiation hierarchy.
+ * Representation of a compile-time instance of a parameter. Upon creation, it is checked whether
+ * this parameter is overridden by an assignment in the instantiation that this parameter instance
+ * is a result of. If it is overridden, the parameter gets initialized using the value looked up in
+ * the instantiation hierarchy.
+ *
  * @author Marten Lohstroh
  * @author Edward A. Lee
  */
 public class ParameterInstance extends NamedInstance<Parameter> {
 
-    /**
-     * Create a runtime instance from the specified definition
-     * and with the specified parent that instantiated it.
-     * @param definition The declaration in the AST.
-     * @param parent The reactor instance this parameter is a part of.
-     */
-    public ParameterInstance(Parameter definition, ReactorInstance parent) {
-        super(definition, parent);
-        if (parent == null) {
-            throw new InvalidSourceException("Cannot create a ParameterInstance with no parent.");
-        }
-
-        this.type = ASTUtils.getInferredType(definition);
-    }
-
-    /////////////////////////////////////////////
-    //// Public Fields
-
-    public InferredType type;
-
-    /////////////////////////////////////////////
-    //// Public Methods
-
-    /**
-     * Get the initial value of this parameter.
-     */
-    private Initializer getInitialValue() {
-        return definition.getInit();
-    }
-
-    /**
-     * Return the (possibly overridden) value of this parameter
-     * in the containing instance. Parameter references are resolved
-     * to actual expressions.
-     */
-    public Initializer getActualValue() {
-        Assignment override = getOverride();
-        Initializer init;
-        if (override != null) {
-            init = override.getRhs();
-        } else {
-            init = getInitialValue();
-        }
-        return init;
-    }
-
-    /**
-     * Return the name of this parameter.
-     * @return The name of this parameter.
-     */
-    public String getName() {
-        return this.definition.getName();
-    }
-
-    /**
-     * Return the assignment that overrides this parameter in
-     * the parent's instantiation or null if there is no override.
-     */
-    public Assignment getOverride() {
-        List<Assignment> assignments = parent.definition.getParameters();
-        Optional<Assignment> assignment = assignments.stream().filter(
-            it -> it.getLhs() == definition
-        ).findFirst();
-        return assignment.orElse(null);
+  /**
+   * Create a runtime instance from the specified definition and with the specified parent that
+   * instantiated it.
+   *
+   * @param definition The declaration in the AST.
+   * @param parent The reactor instance this parameter is a part of.
+   */
+  public ParameterInstance(Parameter definition, ReactorInstance parent) {
+    super(definition, parent);
+    if (parent == null) {
+      throw new InvalidSourceException("Cannot create a ParameterInstance with no parent.");
     }
 
-    /** Return a descriptive string. */
-    @Override
-    public String toString() {
-        return "ParameterInstance " + getFullName();
+    this.type = ASTUtils.getInferredType(definition);
+  }
+
+  /////////////////////////////////////////////
+  //// Public Fields
+
+  public InferredType type;
+
+  /////////////////////////////////////////////
+  //// Public Methods
+
+  /** Get the initial value of this parameter. */
+  private Initializer getInitialValue() {
+    return definition.getInit();
+  }
+
+  /**
+   * Return the (possibly overridden) value of this parameter in the containing instance. Parameter
+   * references are resolved to actual expressions.
+   */
+  public Initializer getActualValue() {
+    Assignment override = getOverride();
+    Initializer init;
+    if (override != null) {
+      init = override.getRhs();
+    } else {
+      init = getInitialValue();
     }
+    return init;
+  }
+
+  /**
+   * Return the name of this parameter.
+   *
+   * @return The name of this parameter.
+   */
+  public String getName() {
+    return this.definition.getName();
+  }
+
+  /**
+   * Return the assignment that overrides this parameter in the parent's instantiation or null if
+   * there is no override.
+   */
+  public Assignment getOverride() {
+    List<Assignment> assignments = parent.definition.getParameters();
+    Optional<Assignment> assignment =
+        assignments.stream().filter(it -> it.getLhs() == definition).findFirst();
+    return assignment.orElse(null);
+  }
+
+  /** Return a descriptive string. */
+  @Override
+  public String toString() {
+    return "ParameterInstance " + getFullName();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/PortInstance.java b/org.lflang/src/org/lflang/generator/PortInstance.java
index 57dbdcf73d..60a904ef5b 100644
--- a/org.lflang/src/org/lflang/generator/PortInstance.java
+++ b/org.lflang/src/org/lflang/generator/PortInstance.java
@@ -1,35 +1,34 @@
 /** A data structure for a port instance. */
 
 /*************
-Copyright (c) 2019-2022, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019-2022, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.generator;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.PriorityQueue;
-
 import org.lflang.ErrorReporter;
 import org.lflang.lf.Input;
 import org.lflang.lf.Output;
@@ -38,422 +37,404 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.lf.WidthSpec;
 import org.lflang.lf.WidthTerm;
 
-/** 
- * Representation of a compile-time instance of a port.
- * Like {@link ReactorInstance}, if one or more parents of this port
- * is a bank of reactors, then there will be more than one runtime instance
+/**
+ * Representation of a compile-time instance of a port. Like {@link ReactorInstance}, if one or more
+ * parents of this port is a bank of reactors, then there will be more than one runtime instance
  * corresponding to this compile-time instance.
- * 
- * This may be a single port or a multiport. If it is a multiport, then
- * one instance of this PortInstance class represents all channels.
- * If in addition any parent is a bank, then it represents all channels of all
- * bank members. The {@link #eventualDestinations()} and {@link #eventualSources()}
- * functions report the connectivity of all such channels as lists of
- * {@link SendRange} and {@link RuntimeRange} objects.
- *  
+ *
+ * <p>This may be a single port or a multiport. If it is a multiport, then one instance of this
+ * PortInstance class represents all channels. If in addition any parent is a bank, then it
+ * represents all channels of all bank members. The {@link #eventualDestinations()} and {@link
+ * #eventualSources()} functions report the connectivity of all such channels as lists of {@link
+ * SendRange} and {@link RuntimeRange} objects.
+ *
  * @author Marten Lohstroh
  * @author Edward A. Lee
  */
 public class PortInstance extends TriggerInstance<Port> {
 
-    /**
-     * Create a runtime instance from the specified definition
-     * and with the specified parent that instantiated it.
-     * @param definition The declaration in the AST.
-     * @param parent The parent.
-     */
-    public PortInstance(Port definition, ReactorInstance parent) {
-        this(definition, parent, null);
-    }
+  /**
+   * Create a runtime instance from the specified definition and with the specified parent that
+   * instantiated it.
+   *
+   * @param definition The declaration in the AST.
+   * @param parent The parent.
+   */
+  public PortInstance(Port definition, ReactorInstance parent) {
+    this(definition, parent, null);
+  }
 
-    /**
-     * Create a port instance from the specified definition
-     * and with the specified parent that instantiated it.
-     * @param definition The declaration in the AST.
-     * @param parent The parent.
-     * @param errorReporter An error reporter, or null to throw exceptions.
-     */
-    public PortInstance(Port definition, ReactorInstance parent, ErrorReporter errorReporter) {
-        super(definition, parent);
-        
-        if (parent == null) {
-            throw new NullPointerException("Cannot create a PortInstance with no parent.");
-        }
-        
-        setInitialWidth(errorReporter);
-    }
+  /**
+   * Create a port instance from the specified definition and with the specified parent that
+   * instantiated it.
+   *
+   * @param definition The declaration in the AST.
+   * @param parent The parent.
+   * @param errorReporter An error reporter, or null to throw exceptions.
+   */
+  public PortInstance(Port definition, ReactorInstance parent, ErrorReporter errorReporter) {
+    super(definition, parent);
 
-    //////////////////////////////////////////////////////
-    //// Public methods
-
-    /**
-     * Clear cached information about the connectivity of this port.
-     * In particular, {@link #eventualDestinations()} and {@link #eventualSources()}
-     * cache the lists they return. To force those methods to recompute
-     * their lists, call this method. This method also clears the caches
-     * of any ports that are listed as eventual destinations and sources.
-     */
-    public void clearCaches() {
-        if (clearingCaches) return; // Prevent stack overflow.
-        clearingCaches = true;
-        try {
-            if (eventualSourceRanges != null) {
-                for (RuntimeRange<PortInstance> sourceRange : eventualSourceRanges) {
-                    sourceRange.instance.clearCaches();
-                }
-            }
-            if (eventualDestinationRanges != null) {
-                for (SendRange sendRange : eventualDestinationRanges) {
-                    for (RuntimeRange<PortInstance> destinationRange : sendRange.destinations) {
-                        destinationRange.instance.clearCaches();
-                    }
-                }
-            }
-            eventualDestinationRanges = null;
-            eventualSourceRanges = null;
-        } finally {
-            clearingCaches = false;
-        }
+    if (parent == null) {
+      throw new NullPointerException("Cannot create a PortInstance with no parent.");
     }
 
-    /**
-     * Return a list of ranges of this port, where each range sends
-     * to a list of destination ports that receive data from the range of
-     * this port. Each destination port is annotated with the channel
-     * range on which it receives data.
-     * The ports listed are only ports that are sources for reactions,
-     * not relay ports that the data may go through on the way.
-     * Also, if there is an "after" delay anywhere along the path,
-     * then the destination is not in the resulting list.
-     * 
-     * If this port itself has dependent reactions,
-     * then this port will be included as a destination in all items
-     * on the returned list.
-     * 
-     * Each item in the returned list has the following fields:
-     * <ul>
-     *   <li>{@code startRange}: The starting channel index of this port.</li>
-     *   <li>{@code rangeWidth}: The number of channels sent to the destinations.</li>
-     *   <li>{@code destinations}: A list of port ranges for destination ports, each
-     *   of which has the same width as {@code rangeWidth}.</li>
-     * </ul>
-     *
-     * Each item also has a method, {@link SendRange#getNumberOfDestinationReactors()},
-     * that returns the total number of unique destination reactors for
-     * its range. This is not necessarily the same as the number
-     * of ports in its destinations field because some of the ports may 
-     * share the same container reactor.
-     */
-    public List<SendRange> eventualDestinations() {
-        if (eventualDestinationRanges != null) {
-            return eventualDestinationRanges;
+    setInitialWidth(errorReporter);
+  }
+
+  //////////////////////////////////////////////////////
+  //// Public methods
+
+  /**
+   * Clear cached information about the connectivity of this port. In particular, {@link
+   * #eventualDestinations()} and {@link #eventualSources()} cache the lists they return. To force
+   * those methods to recompute their lists, call this method. This method also clears the caches of
+   * any ports that are listed as eventual destinations and sources.
+   */
+  public void clearCaches() {
+    if (clearingCaches) return; // Prevent stack overflow.
+    clearingCaches = true;
+    try {
+      if (eventualSourceRanges != null) {
+        for (RuntimeRange<PortInstance> sourceRange : eventualSourceRanges) {
+          sourceRange.instance.clearCaches();
         }
-        
-        // Construct the full range for this port.
-        RuntimeRange<PortInstance> range = new RuntimeRange.Port(this);
-        eventualDestinationRanges = eventualDestinations(range);
-        return eventualDestinationRanges;
-    }
-    
-    /**
-     * Return a list of ranges of ports that send data to this port.
-     * If this port is directly written to by one more more reactions,
-     * then it is its own eventual source and only this port
-     * will be represented in the result.
-     * 
-     * If this is not a multiport and is not within a bank, then the list will have
-     * only one item and the range will have a total width of one. Otherwise, it will
-     * have enough items so that the range widths add up to the width of this
-     * multiport multiplied by the total number of instances within containing banks.
-     * 
-     * The ports listed are only ports that are written to by reactions,
-     * not relay ports that the data may go through on the way.
-     */
-    public List<RuntimeRange<PortInstance>> eventualSources() {
-        return eventualSources(new RuntimeRange.Port(this));
+      }
+      if (eventualDestinationRanges != null) {
+        for (SendRange sendRange : eventualDestinationRanges) {
+          for (RuntimeRange<PortInstance> destinationRange : sendRange.destinations) {
+            destinationRange.instance.clearCaches();
+          }
+        }
+      }
+      eventualDestinationRanges = null;
+      eventualSourceRanges = null;
+    } finally {
+      clearingCaches = false;
     }
+  }
 
-    /** 
-     * Return the list of ranges of this port together with the
-     * downstream ports that are connected to this port.
-     * The total with of the ranges in the returned list is a
-     * multiple N >= 0 of the total width of this port.
-     */
-    public List<SendRange> getDependentPorts() {
-        return dependentPorts;
+  /**
+   * Return a list of ranges of this port, where each range sends to a list of destination ports
+   * that receive data from the range of this port. Each destination port is annotated with the
+   * channel range on which it receives data. The ports listed are only ports that are sources for
+   * reactions, not relay ports that the data may go through on the way. Also, if there is an
+   * "after" delay anywhere along the path, then the destination is not in the resulting list.
+   *
+   * <p>If this port itself has dependent reactions, then this port will be included as a
+   * destination in all items on the returned list.
+   *
+   * <p>Each item in the returned list has the following fields:
+   *
+   * <ul>
+   *   <li>{@code startRange}: The starting channel index of this port.
+   *   <li>{@code rangeWidth}: The number of channels sent to the destinations.
+   *   <li>{@code destinations}: A list of port ranges for destination ports, each of which has the
+   *       same width as {@code rangeWidth}.
+   * </ul>
+   *
+   * Each item also has a method, {@link SendRange#getNumberOfDestinationReactors()}, that returns
+   * the total number of unique destination reactors for its range. This is not necessarily the same
+   * as the number of ports in its destinations field because some of the ports may share the same
+   * container reactor.
+   */
+  public List<SendRange> eventualDestinations() {
+    if (eventualDestinationRanges != null) {
+      return eventualDestinationRanges;
     }
 
-    /** 
-     * Return the list of upstream ports that are connected to this port,
-     * or an empty set if there are none.
-     * For an ordinary port, this list will have length 0 or 1.
-     * For a multiport, it can have a larger size.
-     */
-    public List<RuntimeRange<PortInstance>> getDependsOnPorts() {
-        return dependsOnPorts;
-    }
-    
-    /** 
-     * Return true if the port is an input.
-     */
-    public boolean isInput() {
-        return (definition instanceof Input);
-    }
-    
-    /**
-     * Return true if this is a multiport.
-     */
-    public boolean isMultiport() {
-        return isMultiport;
-    }
+    // Construct the full range for this port.
+    RuntimeRange<PortInstance> range = new RuntimeRange.Port(this);
+    eventualDestinationRanges = eventualDestinations(range);
+    return eventualDestinationRanges;
+  }
+
+  /**
+   * Return a list of ranges of ports that send data to this port. If this port is directly written
+   * to by one more more reactions, then it is its own eventual source and only this port will be
+   * represented in the result.
+   *
+   * <p>If this is not a multiport and is not within a bank, then the list will have only one item
+   * and the range will have a total width of one. Otherwise, it will have enough items so that the
+   * range widths add up to the width of this multiport multiplied by the total number of instances
+   * within containing banks.
+   *
+   * <p>The ports listed are only ports that are written to by reactions, not relay ports that the
+   * data may go through on the way.
+   */
+  public List<RuntimeRange<PortInstance>> eventualSources() {
+    return eventualSources(new RuntimeRange.Port(this));
+  }
+
+  /**
+   * Return the list of ranges of this port together with the downstream ports that are connected to
+   * this port. The total with of the ranges in the returned list is a multiple N >= 0 of the total
+   * width of this port.
+   */
+  public List<SendRange> getDependentPorts() {
+    return dependentPorts;
+  }
+
+  /**
+   * Return the list of upstream ports that are connected to this port, or an empty set if there are
+   * none. For an ordinary port, this list will have length 0 or 1. For a multiport, it can have a
+   * larger size.
+   */
+  public List<RuntimeRange<PortInstance>> getDependsOnPorts() {
+    return dependsOnPorts;
+  }
+
+  /** Return true if the port is an input. */
+  public boolean isInput() {
+    return (definition instanceof Input);
+  }
+
+  /** Return true if this is a multiport. */
+  public boolean isMultiport() {
+    return isMultiport;
+  }
+
+  /** Return true if the port is an output. */
+  public boolean isOutput() {
+    return (definition instanceof Output);
+  }
+
+  @Override
+  public String toString() {
+    return "PortInstance " + getFullName();
+  }
+
+  //////////////////////////////////////////////////////
+  //// Protected fields.
+
+  /**
+   * Ranges of this port together with downstream ports that are connected directly to this port.
+   * When there are multiple destinations, the destinations are listed in the order they appear in
+   * connections in the parent reactor instance of this port (inside connections), followed by the
+   * order in which they appear in the parent's parent (outside connections). The total of the
+   * widths of these SendRanges is an integer multiple N >= 0 of the width of this port (this is
+   * checked by the validator). Each channel of this port will be broadcast to N recipients (or, if
+   * there are no connections to zero recipients).
+   */
+  List<SendRange> dependentPorts = new ArrayList<SendRange>();
+
+  /**
+   * Upstream ports that are connected directly to this port, if there are any. For an ordinary
+   * port, this set will have size 0 or 1. For a multiport, it can have a larger size. This
+   * initially has capacity 1 because that is by far the most common case.
+   */
+  List<RuntimeRange<PortInstance>> dependsOnPorts = new ArrayList<RuntimeRange<PortInstance>>(1);
+
+  /** Indicator of whether this is a multiport. */
+  boolean isMultiport = false;
 
-    /** 
-     * Return true if the port is an output.
-     */
-    public boolean isOutput() {
-        return (definition instanceof Output);
+  //////////////////////////////////////////////////////
+  //// Private methods.
+
+  /**
+   * Given a RuntimeRange, return a list of SendRange that describes the eventual destinations of
+   * the given range. The sum of the total widths of the send ranges on the returned list will be an
+   * integer multiple N of the total width of the specified range. Each returned SendRange has a
+   * list of destination RuntimeRanges, each of which represents a port that has dependent
+   * reactions. Intermediate ports with no dependent reactions are not listed.
+   *
+   * @param srcRange The source range.
+   */
+  private static List<SendRange> eventualDestinations(RuntimeRange<PortInstance> srcRange) {
+
+    // Getting the destinations is more complex than getting the sources
+    // because of multicast, where there is more than one connection statement
+    // for a source of data. The strategy we follow here is to first get all
+    // the ports that this port eventually sends to. Then, if needed, split
+    // the resulting ranges so that the resulting list covers exactly
+    // srcRange, possibly in pieces.  We make two passes. First, we build
+    // a queue of ranges that may overlap, then we split those ranges
+    // and consolidate their destinations.
+
+    List<SendRange> result = new ArrayList<SendRange>();
+    PriorityQueue<SendRange> queue = new PriorityQueue<SendRange>();
+    PortInstance srcPort = srcRange.instance;
+
+    // Start with, if this port has dependent reactions, then add it to
+    // every range of the result.
+    if (!srcRange.instance.dependentReactions.isEmpty()) {
+      // This will be the final result if there are no connections.
+      SendRange candidate =
+          new SendRange(
+              srcRange.instance,
+              srcRange.start,
+              srcRange.width,
+              null, // No interleaving for this range.
+              null // No connection for this range.
+              );
+      candidate.destinations.add(srcRange);
+      queue.add(candidate);
     }
-    
-    @Override
-    public String toString() {
-        return "PortInstance " + getFullName();
-    }    
-
-    //////////////////////////////////////////////////////
-    //// Protected fields.
-
-    /** 
-     * Ranges of this port together with downstream ports that
-     * are connected directly to this port. When there are multiple destinations,
-     * the destinations are listed in the order they appear in connections
-     * in the parent reactor instance of this port (inside connections),
-     * followed by the order in which they appear in the parent's parent (outside
-     * connections). The total of the widths of these SendRanges is an integer
-     * multiple N >= 0 of the width of this port (this is checked
-     * by the validator). Each channel of this port will be broadcast
-     * to N recipients (or, if there are no connections to zero recipients).
-     */
-    List<SendRange> dependentPorts = new ArrayList<SendRange>();
-
-    /** 
-     * Upstream ports that are connected directly to this port, if there are any.
-     * For an ordinary port, this set will have size 0 or 1.
-     * For a multiport, it can have a larger size.
-     * This initially has capacity 1 because that is by far the most common case.
-     */
-    List<RuntimeRange<PortInstance>> dependsOnPorts = new ArrayList<RuntimeRange<PortInstance>>(1);
-    
-    /** Indicator of whether this is a multiport. */
-    boolean isMultiport = false;
-    
-    //////////////////////////////////////////////////////
-    //// Private methods.
-    
-    /**
-     * Given a RuntimeRange, return a list of SendRange that describes
-     * the eventual destinations of the given range.
-     * The sum of the total widths of the send ranges on the returned list
-     * will be an integer multiple N of the total width of the specified range.
-     * Each returned SendRange has a list
-     * of destination RuntimeRanges, each of which represents a port that
-     * has dependent reactions. Intermediate ports with no dependent
-     * reactions are not listed.
-     * @param srcRange The source range.
-     */
-    private static List<SendRange> eventualDestinations(RuntimeRange<PortInstance> srcRange) {
-
-        // Getting the destinations is more complex than getting the sources
-        // because of multicast, where there is more than one connection statement
-        // for a source of data. The strategy we follow here is to first get all
-        // the ports that this port eventually sends to. Then, if needed, split
-        // the resulting ranges so that the resulting list covers exactly
-        // srcRange, possibly in pieces.  We make two passes. First, we build
-        // a queue of ranges that may overlap, then we split those ranges
-        // and consolidate their destinations.
-
-        List<SendRange> result = new ArrayList<SendRange>();
-        PriorityQueue<SendRange> queue = new PriorityQueue<SendRange>();
-        PortInstance srcPort = srcRange.instance;
-        
-        // Start with, if this port has dependent reactions, then add it to 
-        // every range of the result.
-        if (!srcRange.instance.dependentReactions.isEmpty()) {
-            // This will be the final result if there are no connections.
-            SendRange candidate = new SendRange(
-                    srcRange.instance,
-                    srcRange.start, 
-                    srcRange.width,
-                    null, // No interleaving for this range.
-                    null  // No connection for this range.
-            );
-            candidate.destinations.add(srcRange);
-            queue.add(candidate);
-        }
 
-        // Need to find send ranges that overlap with this srcRange.
-        Iterator<SendRange> sendRanges = srcPort.dependentPorts.iterator();
-        while (sendRanges.hasNext()) {
-            
-            SendRange wSendRange = sendRanges.next();
-            
-            if (wSendRange.connection != null && wSendRange.connection.getDelay() != null) {
-                continue;
-            }
-            
-            wSendRange = wSendRange.overlap(srcRange);
-            if (wSendRange == null) {
-                // This send range does not overlap with the desired range. Try the next one.
-                continue;
-            }
-            for (RuntimeRange<PortInstance> dstRange : wSendRange.destinations) {
-                // Recursively get the send ranges of that destination port.
-                List<SendRange> dstSendRanges = eventualDestinations(dstRange);
-                int sendRangeStart = 0;
-                for (SendRange dstSend : dstSendRanges) {
-                    queue.add(dstSend.newSendRange(wSendRange, sendRangeStart));
-                    sendRangeStart += dstSend.width;
-                }
-            }
+    // Need to find send ranges that overlap with this srcRange.
+    Iterator<SendRange> sendRanges = srcPort.dependentPorts.iterator();
+    while (sendRanges.hasNext()) {
+
+      SendRange wSendRange = sendRanges.next();
+
+      if (wSendRange.connection != null && wSendRange.connection.getDelay() != null) {
+        continue;
+      }
+
+      wSendRange = wSendRange.overlap(srcRange);
+      if (wSendRange == null) {
+        // This send range does not overlap with the desired range. Try the next one.
+        continue;
+      }
+      for (RuntimeRange<PortInstance> dstRange : wSendRange.destinations) {
+        // Recursively get the send ranges of that destination port.
+        List<SendRange> dstSendRanges = eventualDestinations(dstRange);
+        int sendRangeStart = 0;
+        for (SendRange dstSend : dstSendRanges) {
+          queue.add(dstSend.newSendRange(wSendRange, sendRangeStart));
+          sendRangeStart += dstSend.width;
         }
+      }
+    }
 
-        // Now check for overlapping ranges, constructing a new result.
-        SendRange candidate = queue.poll();
-        SendRange next = queue.poll();
-        while (candidate != null) {
-            if (next == null) {
-                // No more candidates.  We are done.
-                result.add(candidate);
-                break;
-            }
-            if (candidate.start == next.start) {
-                // Ranges have the same starting point. Need to merge them.
-                if (candidate.width <= next.width) {
-                    // Can use all of the channels of candidate.
-                    // Import the destinations of next and split it.
-                    for (RuntimeRange<PortInstance> destination : next.destinations) {
-                        candidate.destinations.add(destination.head(candidate.width));
-                    }
-                    if (candidate.width < next.width) {
-                        // The next range has more channels connected to this sender.
-                        // Put it back on the queue an poll for a new next.
-                        queue.add(next.tail(candidate.width));
-                        next = queue.poll();
-                    } else {
-                        // We are done with next and can discard it.
-                        next = queue.poll();
-                    }
-                } else {
-                    // candidate is wider than next. Switch them and continue.
-                    SendRange temp = candidate;
-                    candidate = next;
-                    next = temp;
-                }
-            } else {
-                // Because the result list is sorted, next starts at
-                // a higher channel than candidate.
-                if (candidate.start + candidate.width <= next.start) {
-                    // Can use candidate as is and make next the new candidate.
-                    result.add(candidate);
-                    candidate = next;
-                    next = queue.poll();
-                } else {
-                    // Ranges overlap. Can use a truncated candidate and make its
-                    // truncated version the new candidate.
-                    result.add(candidate.head(next.start));
-                    candidate = (SendRange)candidate.tail(next.start);
-                }
-            }
+    // Now check for overlapping ranges, constructing a new result.
+    SendRange candidate = queue.poll();
+    SendRange next = queue.poll();
+    while (candidate != null) {
+      if (next == null) {
+        // No more candidates.  We are done.
+        result.add(candidate);
+        break;
+      }
+      if (candidate.start == next.start) {
+        // Ranges have the same starting point. Need to merge them.
+        if (candidate.width <= next.width) {
+          // Can use all of the channels of candidate.
+          // Import the destinations of next and split it.
+          for (RuntimeRange<PortInstance> destination : next.destinations) {
+            candidate.destinations.add(destination.head(candidate.width));
+          }
+          if (candidate.width < next.width) {
+            // The next range has more channels connected to this sender.
+            // Put it back on the queue an poll for a new next.
+            queue.add(next.tail(candidate.width));
+            next = queue.poll();
+          } else {
+            // We are done with next and can discard it.
+            next = queue.poll();
+          }
+        } else {
+          // candidate is wider than next. Switch them and continue.
+          SendRange temp = candidate;
+          candidate = next;
+          next = temp;
+        }
+      } else {
+        // Because the result list is sorted, next starts at
+        // a higher channel than candidate.
+        if (candidate.start + candidate.width <= next.start) {
+          // Can use candidate as is and make next the new candidate.
+          result.add(candidate);
+          candidate = next;
+          next = queue.poll();
+        } else {
+          // Ranges overlap. Can use a truncated candidate and make its
+          // truncated version the new candidate.
+          result.add(candidate.head(next.start));
+          candidate = (SendRange) candidate.tail(next.start);
         }
-        
-        return result;
+      }
     }
 
-    /**
-     * Return a list of ranges of ports that send data to this port within the
-     * specified range. If this port is directly written to by one more more reactions,
-     * then it is its own eventual source and only this port
-     * will be represented in the result.
-     * 
-     * If this is not a multiport and is not within a bank, then the list will have
-     * only one item and the range will have a total width of one. Otherwise, it will
-     * have enough items so that the range widths add up to the width of this
-     * multiport multiplied by the total number of instances within containing banks.
-     * 
-     * The ports listed are only ports that are written to by reactions,
-     * not relay ports that the data may go through on the way.
-     */
-    private List<RuntimeRange<PortInstance>> eventualSources(RuntimeRange<PortInstance> range) {
-        if (eventualSourceRanges == null) {
-            // Cached result has not been created.
-            eventualSourceRanges = new ArrayList<RuntimeRange<PortInstance>>();
-            
-            if (!dependsOnReactions.isEmpty()) {
-                eventualSourceRanges.add(new RuntimeRange.Port(this));
-            } else {
-                var channelsCovered = 0;
-                for (RuntimeRange<PortInstance> sourceRange : dependsOnPorts) {
-                    // Check whether the sourceRange overlaps with the range.
-                    if (channelsCovered + sourceRange.width >= range.start
-                            && channelsCovered < range.start + range.width) {
-                        eventualSourceRanges.addAll(sourceRange.instance.eventualSources(sourceRange));
-                    }
-                    channelsCovered += sourceRange.width;
-                }
-            }
+    return result;
+  }
+
+  /**
+   * Return a list of ranges of ports that send data to this port within the specified range. If
+   * this port is directly written to by one more more reactions, then it is its own eventual source
+   * and only this port will be represented in the result.
+   *
+   * <p>If this is not a multiport and is not within a bank, then the list will have only one item
+   * and the range will have a total width of one. Otherwise, it will have enough items so that the
+   * range widths add up to the width of this multiport multiplied by the total number of instances
+   * within containing banks.
+   *
+   * <p>The ports listed are only ports that are written to by reactions, not relay ports that the
+   * data may go through on the way.
+   */
+  private List<RuntimeRange<PortInstance>> eventualSources(RuntimeRange<PortInstance> range) {
+    if (eventualSourceRanges == null) {
+      // Cached result has not been created.
+      eventualSourceRanges = new ArrayList<RuntimeRange<PortInstance>>();
+
+      if (!dependsOnReactions.isEmpty()) {
+        eventualSourceRanges.add(new RuntimeRange.Port(this));
+      } else {
+        var channelsCovered = 0;
+        for (RuntimeRange<PortInstance> sourceRange : dependsOnPorts) {
+          // Check whether the sourceRange overlaps with the range.
+          if (channelsCovered + sourceRange.width >= range.start
+              && channelsCovered < range.start + range.width) {
+            eventualSourceRanges.addAll(sourceRange.instance.eventualSources(sourceRange));
+          }
+          channelsCovered += sourceRange.width;
         }
-        return eventualSourceRanges;
+      }
     }
+    return eventualSourceRanges;
+  }
+
+  /**
+   * Set the initial multiport width, if this is a multiport, from the widthSpec in the definition.
+   * This will be set to -1 if the width cannot be determined.
+   *
+   * @param errorReporter For reporting errors.
+   */
+  private void setInitialWidth(ErrorReporter errorReporter) {
+    // If this is a multiport, determine the width.
+    WidthSpec widthSpec = definition.getWidthSpec();
+
+    if (widthSpec != null) {
+      if (widthSpec.isOfVariableLength()) {
+        errorReporter.reportError(
+            definition, "Variable-width multiports not supported (yet): " + definition.getName());
+      } else {
+        isMultiport = true;
 
-    /**
-     * Set the initial multiport width, if this is a multiport, from the widthSpec
-     * in the definition. This will be set to -1 if the width cannot be determined.
-     * @param errorReporter For reporting errors.
-     */
-    private void setInitialWidth(ErrorReporter errorReporter) {
-        // If this is a multiport, determine the width.
-        WidthSpec widthSpec = definition.getWidthSpec();
-
-        if (widthSpec != null) {
-            if (widthSpec.isOfVariableLength()) {
-                errorReporter.reportError(definition,
-                        "Variable-width multiports not supported (yet): " + definition.getName());
+        // Determine the initial width, if possible.
+        // The width may be given by a parameter or even sum of parameters.
+        width = 0;
+        for (WidthTerm term : widthSpec.getTerms()) {
+          Parameter parameter = term.getParameter();
+          if (parameter != null) {
+            Integer parameterValue = parent.initialIntParameterValue(parameter);
+            // Only a Literal is supported.
+            if (parameterValue != null) {
+              width += parameterValue;
             } else {
-                isMultiport = true;
-                
-                // Determine the initial width, if possible.
-                // The width may be given by a parameter or even sum of parameters.
-                width = 0;
-                for (WidthTerm term : widthSpec.getTerms()) {
-                    Parameter parameter = term.getParameter();
-                    if (parameter != null) {
-                        Integer parameterValue = parent.initialIntParameterValue(parameter);
-                        // Only a Literal is supported.
-                        if (parameterValue != null) {
-                            width += parameterValue;
-                        } else {
-                            width = -1;
-                            return;
-                        }
-                    } else if (term.getWidth() != 0){
-                        width += term.getWidth();
-                    } else {
-                        width = -1;
-                        return;
-                    }
-                }
+              width = -1;
+              return;
             }
+          } else if (term.getWidth() != 0) {
+            width += term.getWidth();
+          } else {
+            width = -1;
+            return;
+          }
         }
+      }
     }
+  }
+
+  //////////////////////////////////////////////////////
+  //// Private fields.
+
+  /** Cached list of destination ports with channel ranges. */
+  private List<SendRange> eventualDestinationRanges;
+
+  /** Cached list of source ports with channel ranges. */
+  private List<RuntimeRange<PortInstance>> eventualSourceRanges;
 
-    //////////////////////////////////////////////////////
-    //// Private fields.
-    
-    /** Cached list of destination ports with channel ranges. */
-    private List<SendRange> eventualDestinationRanges;
-
-    /** Cached list of source ports with channel ranges. */
-    private List<RuntimeRange<PortInstance>> eventualSourceRanges;
-    
-    /** Indicator that we are clearing the caches. */
-    private boolean clearingCaches = false;
+  /** Indicator that we are clearing the caches. */
+  private boolean clearingCaches = false;
 }
diff --git a/org.lflang/src/org/lflang/generator/Position.java b/org.lflang/src/org/lflang/generator/Position.java
index 872b09a24e..80e3976365 100644
--- a/org.lflang/src/org/lflang/generator/Position.java
+++ b/org.lflang/src/org/lflang/generator/Position.java
@@ -4,234 +4,219 @@
 import java.util.regex.Pattern;
 
 /**
- * A position in a document, including line and
- * column. This position may be relative to some
+ * A position in a document, including line and column. This position may be relative to some
  * position other than the origin.
  *
  * @author Peter Donovan
  */
 public class Position implements Comparable<Position> {
-    public static final Pattern PATTERN = Pattern.compile("\\((?<line>[0-9]+), (?<column>[0-9]+)\\)");
-
-    public static final Position ORIGIN = Position.fromZeroBased(0, 0);
-
-    private static final Pattern LINE_SEPARATOR = Pattern.compile("(\n)|(\r)|(\r\n)");
-
-    private final int line;
-    private final int column;
-
-    /* ------------------------  CONSTRUCTORS  -------------------------- */
-
-    /**
-     * Return the Position that describes the given
-     * zero-based line and column numbers.
-     * @param line the zero-based line number
-     * @param column the zero-based column number
-     * @return a Position describing the position described
-     * by {@code line} and {@code column}.
-     */
-    public static Position fromZeroBased(int line, int column) {
-        return new Position(line, column);
-    }
-
-    /**
-     * Return the Position that describes the given
-     * one-based line and column numbers.
-     * @param line the one-based line number
-     * @param column the one-based column number
-     * @return a Position describing the position described
-     * by {@code line} and {@code column}.
-     */
-    public static Position fromOneBased(int line, int column) {
-        return new Position(line - 1, column - 1);
-    }
-
-    /**
-     * Return the Position that equals the displacement
-     * caused by {@code text}, assuming that {@code text}
-     * starts in column 0.
-     * @param text an arbitrary string
-     * @return the Position that equals the displacement
-     * caused by {@code text}
-     */
-    public static Position displacementOf(String text) {
-        String[] lines = text.lines().toArray(String[]::new);
-        if (lines.length == 0) return ORIGIN;
-        return Position.fromZeroBased(lines.length - 1, lines[lines.length - 1].length());
-    }
-
-    /**
-     * Return the Position that describes the same location
-     * in {@code content} as {@code offset}.
-     * @param offset a location, expressed as an offset from
-     *               the beginning of {@code content}
-     * @param content the content of a document
-     * @return the Position that describes the same location
-     * in {@code content} as {@code offset}
-     */
-    public static Position fromOffset(int offset, String content) {
-        int lineNumber = 0;
-        Matcher matcher = LINE_SEPARATOR.matcher(content);
-        int start = 0;
-        while (matcher.find(start)) {
-            if (matcher.start() > offset) return Position.fromZeroBased(lineNumber, offset - start);
-            start = matcher.end();
-            lineNumber++;
-        }
-        return Position.fromZeroBased(lineNumber, offset);
-    }
-
-    /**
-     * Create a new Position with the given line and column
-     * numbers.
-     * @param line the zero-based line number
-     * @param column the zero-based column number
-     */
-    private Position(int line, int column) {
-        // Assertions about whether line and column are
-        // non-negative are deliberately omitted. Positions
-        // can be relative.
-        this.line = line;
-        this.column = column;
-    }
-
-    /* -----------------------  PUBLIC METHODS  ------------------------- */
-
-    /**
-     * Return the one-based line number described by this
-     * {@code Position}.
-     * @return the one-based line number described by this
-     * {@code Position}
-     */
-    public int getOneBasedLine() {
-        return line + 1;
-    }
-
-    /**
-     * Return the one-based column number described by this
-     * {@code Position}.
-     * @return the one-based column number described by this
-     * {@code Position}
-     */
-    public int getOneBasedColumn() {
-        return column + 1;
-    }
-
-    /**
-     * Return the zero-based line number described by this
-     * {@code Position}.
-     * @return the zero-based line number described by this
-     * {@code Position}
-     */
-    public int getZeroBasedLine() {
-        return line;
-    }
-
-    /**
-     * Return the zero-based column number described by this
-     * {@code Position}.
-     * @return the zero-based column number described by this
-     * {@code Position}
-     */
-    public int getZeroBasedColumn() {
-        return column;
-    }
-
-    /**
-     * Return the Position that equals the displacement of
-     * ((text whose displacement equals {@code this})
-     * concatenated with {@code text}). Note that this is
-     * not necessarily equal to
-     * ({@code this} + displacementOf(text)).
-     * @param text an arbitrary string
-     * @return the Position that equals the displacement
-     * caused by {@code text}
-     */
-    public Position plus(String text) {
-        text += "\n";  // Turn line separators into line terminators.
-        String[] lines = text.lines().toArray(String[]::new);
-        if (lines.length == 0) return this; // OK not to copy because Positions are immutable
-        int lastLineLength = lines[lines.length - 1].length();
-        return new Position(line + lines.length - 1, lines.length > 1 ? lastLineLength : column + lastLineLength);
-    }
-
-    /**
-     * Return the sum of this and another {@code Position}.
-     * The result has meaning because Positions are
-     * relative.
-     * @param other another {@code Position}
-     * @return the sum of this and {@code other}
-     */
-    public Position plus(Position other) {
-        return new Position(line + other.line, column + other.column);
-    }
-
-    /**
-     * Return the difference of this and another {@code
-     * Position}. The result has meaning because
-     * Positions are relative.
-     * @param other another {@code Position}
-     * @return the difference of this and {@code other}
-     */
-    public Position minus(Position other) {
-        return new Position(line - other.line, column - other.column);
-    }
-
-    /**
-     * Compare two positions according to their order of
-     * appearance in a document (first according to line,
-     * then according to column).
-     */
-    @Override
-    public int compareTo(Position o) {
-        if (line != o.line) {
-            return line - o.line;
-        }
-        return column - o.column;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof Position && ((Position) obj).compareTo(this) == 0;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("(%d, %d)", getZeroBasedLine(), getZeroBasedColumn());
-    }
-
-    /**
-     * Return the Position represented by {@code s}.
-     * @param s a String that represents a Position,
-     *          formatted like the output of
-     *          {@code Position::toString}.
-     * @return the Position represented by {@code s}
-     */
-    public static Position fromString(String s) {
-        Matcher matcher = PATTERN.matcher(s);
-        if (matcher.matches()) {
-            return Position.fromZeroBased(
-                Integer.parseInt(matcher.group("line")),
-                Integer.parseInt(matcher.group("column"))
-            );
-        }
-        throw new IllegalArgumentException(String.format("Could not parse %s as a Position.", s));
-    }
-
-    @Override
-    public int hashCode() {
-        return line * 31 + column;
-    }
-
-    /**
-     * Remove the names from the named capturing groups
-     * that appear in {@code regex}.
-     * @param regex an arbitrary regular expression
-     * @return a string representation of {@code regex}
-     * with the names removed from the named capturing
-     * groups
-     */
-    public static String removeNamedCapturingGroups(Pattern regex) {  // FIXME: Does this belong here?
-        return regex.toString().replaceAll("\\(\\?<\\w+>", "(");
-    }
+  public static final Pattern PATTERN = Pattern.compile("\\((?<line>[0-9]+), (?<column>[0-9]+)\\)");
+
+  public static final Position ORIGIN = Position.fromZeroBased(0, 0);
+
+  private static final Pattern LINE_SEPARATOR = Pattern.compile("(\n)|(\r)|(\r\n)");
+
+  private final int line;
+  private final int column;
+
+  /* ------------------------  CONSTRUCTORS  -------------------------- */
+
+  /**
+   * Return the Position that describes the given zero-based line and column numbers.
+   *
+   * @param line the zero-based line number
+   * @param column the zero-based column number
+   * @return a Position describing the position described by {@code line} and {@code column}.
+   */
+  public static Position fromZeroBased(int line, int column) {
+    return new Position(line, column);
+  }
+
+  /**
+   * Return the Position that describes the given one-based line and column numbers.
+   *
+   * @param line the one-based line number
+   * @param column the one-based column number
+   * @return a Position describing the position described by {@code line} and {@code column}.
+   */
+  public static Position fromOneBased(int line, int column) {
+    return new Position(line - 1, column - 1);
+  }
+
+  /**
+   * Return the Position that equals the displacement caused by {@code text}, assuming that {@code
+   * text} starts in column 0.
+   *
+   * @param text an arbitrary string
+   * @return the Position that equals the displacement caused by {@code text}
+   */
+  public static Position displacementOf(String text) {
+    String[] lines = text.lines().toArray(String[]::new);
+    if (lines.length == 0) return ORIGIN;
+    return Position.fromZeroBased(lines.length - 1, lines[lines.length - 1].length());
+  }
+
+  /**
+   * Return the Position that describes the same location in {@code content} as {@code offset}.
+   *
+   * @param offset a location, expressed as an offset from the beginning of {@code content}
+   * @param content the content of a document
+   * @return the Position that describes the same location in {@code content} as {@code offset}
+   */
+  public static Position fromOffset(int offset, String content) {
+    int lineNumber = 0;
+    Matcher matcher = LINE_SEPARATOR.matcher(content);
+    int start = 0;
+    while (matcher.find(start)) {
+      if (matcher.start() > offset) return Position.fromZeroBased(lineNumber, offset - start);
+      start = matcher.end();
+      lineNumber++;
+    }
+    return Position.fromZeroBased(lineNumber, offset);
+  }
+
+  /**
+   * Create a new Position with the given line and column numbers.
+   *
+   * @param line the zero-based line number
+   * @param column the zero-based column number
+   */
+  private Position(int line, int column) {
+    // Assertions about whether line and column are
+    // non-negative are deliberately omitted. Positions
+    // can be relative.
+    this.line = line;
+    this.column = column;
+  }
+
+  /* -----------------------  PUBLIC METHODS  ------------------------- */
+
+  /**
+   * Return the one-based line number described by this {@code Position}.
+   *
+   * @return the one-based line number described by this {@code Position}
+   */
+  public int getOneBasedLine() {
+    return line + 1;
+  }
+
+  /**
+   * Return the one-based column number described by this {@code Position}.
+   *
+   * @return the one-based column number described by this {@code Position}
+   */
+  public int getOneBasedColumn() {
+    return column + 1;
+  }
+
+  /**
+   * Return the zero-based line number described by this {@code Position}.
+   *
+   * @return the zero-based line number described by this {@code Position}
+   */
+  public int getZeroBasedLine() {
+    return line;
+  }
+
+  /**
+   * Return the zero-based column number described by this {@code Position}.
+   *
+   * @return the zero-based column number described by this {@code Position}
+   */
+  public int getZeroBasedColumn() {
+    return column;
+  }
+
+  /**
+   * Return the Position that equals the displacement of ((text whose displacement equals {@code
+   * this}) concatenated with {@code text}). Note that this is not necessarily equal to ({@code
+   * this} + displacementOf(text)).
+   *
+   * @param text an arbitrary string
+   * @return the Position that equals the displacement caused by {@code text}
+   */
+  public Position plus(String text) {
+    text += "\n"; // Turn line separators into line terminators.
+    String[] lines = text.lines().toArray(String[]::new);
+    if (lines.length == 0) return this; // OK not to copy because Positions are immutable
+    int lastLineLength = lines[lines.length - 1].length();
+    return new Position(
+        line + lines.length - 1, lines.length > 1 ? lastLineLength : column + lastLineLength);
+  }
+
+  /**
+   * Return the sum of this and another {@code Position}. The result has meaning because Positions
+   * are relative.
+   *
+   * @param other another {@code Position}
+   * @return the sum of this and {@code other}
+   */
+  public Position plus(Position other) {
+    return new Position(line + other.line, column + other.column);
+  }
+
+  /**
+   * Return the difference of this and another {@code Position}. The result has meaning because
+   * Positions are relative.
+   *
+   * @param other another {@code Position}
+   * @return the difference of this and {@code other}
+   */
+  public Position minus(Position other) {
+    return new Position(line - other.line, column - other.column);
+  }
+
+  /**
+   * Compare two positions according to their order of appearance in a document (first according to
+   * line, then according to column).
+   */
+  @Override
+  public int compareTo(Position o) {
+    if (line != o.line) {
+      return line - o.line;
+    }
+    return column - o.column;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof Position && ((Position) obj).compareTo(this) == 0;
+  }
+
+  @Override
+  public String toString() {
+    return String.format("(%d, %d)", getZeroBasedLine(), getZeroBasedColumn());
+  }
+
+  /**
+   * Return the Position represented by {@code s}.
+   *
+   * @param s a String that represents a Position, formatted like the output of {@code
+   *     Position::toString}.
+   * @return the Position represented by {@code s}
+   */
+  public static Position fromString(String s) {
+    Matcher matcher = PATTERN.matcher(s);
+    if (matcher.matches()) {
+      return Position.fromZeroBased(
+          Integer.parseInt(matcher.group("line")), Integer.parseInt(matcher.group("column")));
+    }
+    throw new IllegalArgumentException(String.format("Could not parse %s as a Position.", s));
+  }
+
+  @Override
+  public int hashCode() {
+    return line * 31 + column;
+  }
+
+  /**
+   * Remove the names from the named capturing groups that appear in {@code regex}.
+   *
+   * @param regex an arbitrary regular expression
+   * @return a string representation of {@code regex} with the names removed from the named
+   *     capturing groups
+   */
+  public static String removeNamedCapturingGroups(Pattern regex) { // FIXME: Does this belong here?
+    return regex.toString().replaceAll("\\(\\?<\\w+>", "(");
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/Range.java b/org.lflang/src/org/lflang/generator/Range.java
index ffca1104d9..9300127d36 100644
--- a/org.lflang/src/org/lflang/generator/Range.java
+++ b/org.lflang/src/org/lflang/generator/Range.java
@@ -4,136 +4,129 @@
 import java.util.regex.Pattern;
 
 /**
- * Represents a range in a document. Ranges have a
- * natural ordering that respects their start
+ * Represents a range in a document. Ranges have a natural ordering that respects their start
  * position(s) only.
  */
 public class Range implements Comparable<Range> {
-    public static final Pattern PATTERN = Pattern.compile(String.format(
-        "Range: \\[(?<start>%s), (?<end>%s)\\)",
-        Position.removeNamedCapturingGroups(Position.PATTERN),
-        Position.removeNamedCapturingGroups(Position.PATTERN)
-    ));
+  public static final Pattern PATTERN =
+      Pattern.compile(
+          String.format(
+              "Range: \\[(?<start>%s), (?<end>%s)\\)",
+              Position.removeNamedCapturingGroups(Position.PATTERN),
+              Position.removeNamedCapturingGroups(Position.PATTERN)));
 
-    /** The start of the Range (INCLUSIVE). */
-    private final Position start;
-    /** The end of the Range (EXCLUSIVE). */
-    private final Position end;
+  /** The start of the Range (INCLUSIVE). */
+  private final Position start;
+  /** The end of the Range (EXCLUSIVE). */
+  private final Position end;
 
-    /* ------------------------- PUBLIC METHODS -------------------------- */
+  /* ------------------------- PUBLIC METHODS -------------------------- */
 
-    /**
-     * Initializes a Range that starts at
-     * {@code startInclusive} and ends at, but does not
-     * include, {@code endExclusive}.
-     * @param startInclusive the start of the range
-     *                       (inclusive)
-     * @param endExclusive the end of the range (exclusive)
-     */
-    public Range(Position startInclusive, Position endExclusive) {
-        assert startInclusive.compareTo(endExclusive) <= 0: "endExclusive cannot precede startInclusive";
-        start = startInclusive;
-        end = endExclusive;
-    }
+  /**
+   * Initializes a Range that starts at {@code startInclusive} and ends at, but does not include,
+   * {@code endExclusive}.
+   *
+   * @param startInclusive the start of the range (inclusive)
+   * @param endExclusive the end of the range (exclusive)
+   */
+  public Range(Position startInclusive, Position endExclusive) {
+    assert startInclusive.compareTo(endExclusive) <= 0
+        : "endExclusive cannot precede startInclusive";
+    start = startInclusive;
+    end = endExclusive;
+  }
 
-    /**
-     * Returns the first Position that is included in this
-     * Range.
-     * @return the first Position that is included in this
-     * Range
-     */
-    public Position getStartInclusive() {
-        return start;
-    }
+  /**
+   * Returns the first Position that is included in this Range.
+   *
+   * @return the first Position that is included in this Range
+   */
+  public Position getStartInclusive() {
+    return start;
+  }
 
-    /**
-     * Returns the Position that immediately follows the
-     * last Position in this Range.
-     * @return the Position that immediately follows the
-     * last Position in this Range
-     */
-    public Position getEndExclusive() {
-        return end;
-    }
+  /**
+   * Returns the Position that immediately follows the last Position in this Range.
+   *
+   * @return the Position that immediately follows the last Position in this Range
+   */
+  public Position getEndExclusive() {
+    return end;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof Range r)) return false;
-        return start.equals(r.start);
-    }
+  @Override
+  public boolean equals(Object o) {
+    if (!(o instanceof Range r)) return false;
+    return start.equals(r.start);
+  }
 
-    @Override
-    public int hashCode() {
-        return start.hashCode();
-    }
+  @Override
+  public int hashCode() {
+    return start.hashCode();
+  }
 
-    /**
-     * Compares this to {@code o}.
-     * @param o another Range
-     * @return an integer indicating how this compares to
-     * {@code o}
-     */
-    @Override
-    public int compareTo(Range o) {
-        return this.start.compareTo(o.start);
-    }
+  /**
+   * Compares this to {@code o}.
+   *
+   * @param o another Range
+   * @return an integer indicating how this compares to {@code o}
+   */
+  @Override
+  public int compareTo(Range o) {
+    return this.start.compareTo(o.start);
+  }
 
-    /**
-     * Returns whether this contains {@code p}.
-     * @param p an arbitrary Position
-     * @return whether this contains {@code p}
-     */
-    public boolean contains(Position p) {
-        return start.compareTo(p) <= 0 && p.compareTo(end) < 0;
-    }
+  /**
+   * Returns whether this contains {@code p}.
+   *
+   * @param p an arbitrary Position
+   * @return whether this contains {@code p}
+   */
+  public boolean contains(Position p) {
+    return start.compareTo(p) <= 0 && p.compareTo(end) < 0;
+  }
 
-    @Override
-    public String toString() {
-        return String.format("Range: [%s, %s)", start, end);
-    }
+  @Override
+  public String toString() {
+    return String.format("Range: [%s, %s)", start, end);
+  }
 
-    /**
-     * Converts {@code s} to a Range.
-     * @param s a String that represents a Range, formatted
-     *          like the output of {@code Range::toString}
-     * @return the Range r such that {@code r.toString()}
-     * equals {@code s}
-     */
-    public static Range fromString(String s) {
-        return fromString(s, Position.fromZeroBased(0, 0));
-    }
+  /**
+   * Converts {@code s} to a Range.
+   *
+   * @param s a String that represents a Range, formatted like the output of {@code Range::toString}
+   * @return the Range r such that {@code r.toString()} equals {@code s}
+   */
+  public static Range fromString(String s) {
+    return fromString(s, Position.fromZeroBased(0, 0));
+  }
 
-    /**
-     * Converts {@code s} to a Range, with the
-     * assumption that the positions expressed in {@code s}
-     * are given relative to {@code relativeTo}.
-     * @param s a String that represents a Range, formatted
-     *          like the output of {@code Range::toString}
-     * @param relativeTo the position relative to which the
-     *                   positions in {@code s} are
-     *                   represented
-     * @return the Range represented by {@code s},
-     * expressed relative to the Position relative to which
-     * the Position {@code relativeTo} is expressed
-     */
-    public static Range fromString(String s, Position relativeTo) {
-        Matcher matcher = PATTERN.matcher(s);
-        if (matcher.matches()) {
-            Position start = Position.fromString(matcher.group("start"));
-            Position end = Position.fromString(matcher.group("end"));
-            return new Range(start.plus(relativeTo), end.plus(relativeTo));
-        }
-        throw new IllegalArgumentException(String.format("Could not parse %s as a Range.", s));
+  /**
+   * Converts {@code s} to a Range, with the assumption that the positions expressed in {@code s}
+   * are given relative to {@code relativeTo}.
+   *
+   * @param s a String that represents a Range, formatted like the output of {@code Range::toString}
+   * @param relativeTo the position relative to which the positions in {@code s} are represented
+   * @return the Range represented by {@code s}, expressed relative to the Position relative to
+   *     which the Position {@code relativeTo} is expressed
+   */
+  public static Range fromString(String s, Position relativeTo) {
+    Matcher matcher = PATTERN.matcher(s);
+    if (matcher.matches()) {
+      Position start = Position.fromString(matcher.group("start"));
+      Position end = Position.fromString(matcher.group("end"));
+      return new Range(start.plus(relativeTo), end.plus(relativeTo));
     }
+    throw new IllegalArgumentException(String.format("Could not parse %s as a Range.", s));
+  }
 
-    /**
-     * Returns the degenerate range that simply
-     * describes the exact location specified by {@code p}.
-     * @param p an arbitrary Position
-     * @return a Range that starts and ends immediately
-     * before {@code p}
-     */
-    public static Range degenerateRange(Position p) {
-        return new Range(p, p);
-    }
+  /**
+   * Returns the degenerate range that simply describes the exact location specified by {@code p}.
+   *
+   * @param p an arbitrary Position
+   * @return a Range that starts and ends immediately before {@code p}
+   */
+  public static Range degenerateRange(Position p) {
+    return new Range(p, p);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/ReactionInstance.java b/org.lflang/src/org/lflang/generator/ReactionInstance.java
index 1d7cbab52a..a1e35ffb19 100644
--- a/org.lflang/src/org/lflang/generator/ReactionInstance.java
+++ b/org.lflang/src/org/lflang/generator/ReactionInstance.java
@@ -1,28 +1,28 @@
 /** Representation of a runtime instance of a reaction. */
 
 /*************
-Copyright (c) 2019-2022, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019-2022, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
@@ -31,9 +31,8 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Action;
 import org.lflang.lf.BuiltinTriggerRef;
 import org.lflang.lf.Port;
@@ -44,551 +43,519 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.lf.Variable;
 
 /**
- * Representation of a compile-time instance of a reaction.
- * Like {@link ReactorInstance}, if one or more parents of this reaction
- * is a bank of reactors, then there will be more than one runtime instance
- * corresponding to this compile-time instance.  The {@link #getRuntimeInstances()}
- * method returns a list of these runtime instances, each an instance of the
- * inner class {@link ReactionInstance.Runtime}.  Each runtime instance has a "level", which is
- * its depth an acyclic precedence graph representing the dependencies between
- * reactions at a tag.
+ * Representation of a compile-time instance of a reaction. Like {@link ReactorInstance}, if one or
+ * more parents of this reaction is a bank of reactors, then there will be more than one runtime
+ * instance corresponding to this compile-time instance. The {@link #getRuntimeInstances()} method
+ * returns a list of these runtime instances, each an instance of the inner class {@link
+ * ReactionInstance.Runtime}. Each runtime instance has a "level", which is its depth an acyclic
+ * precedence graph representing the dependencies between reactions at a tag.
  *
  * @author Edward A. Lee
  * @author Marten Lohstroh
  */
 public class ReactionInstance extends NamedInstance<Reaction> {
 
-    /**
-     * Create a new reaction instance from the specified definition
-     * within the specified parent. This constructor should be called
-     * only by the ReactorInstance class, but it is public to enable unit tests.
-     * @param definition A reaction definition.
-     * @param parent The parent reactor instance, which cannot be null.
-     * @param isUnordered Indicator that this reaction is unordered w.r.t. other reactions.
-     * @param index The index of the reaction within the reactor (0 for the
-     * first reaction, 1 for the second, etc.).
-     */
-    public ReactionInstance(
-            Reaction definition,
-            ReactorInstance parent,
-            boolean isUnordered,
-            int index
-    ) {
-        super(definition, parent);
-        this.index = index;
-        this.isUnordered = isUnordered;
-
-        // If the reaction body starts with the magic string
-        // UNORDERED_REACTION_MARKER, then mark it unordered,
-        // overriding the argument.
-        String body = ASTUtils.toText(definition.getCode());
-        if (body.contains(UNORDERED_REACTION_MARKER)) {
-            this.isUnordered = true;
-        }
+  /**
+   * Create a new reaction instance from the specified definition within the specified parent. This
+   * constructor should be called only by the ReactorInstance class, but it is public to enable unit
+   * tests.
+   *
+   * @param definition A reaction definition.
+   * @param parent The parent reactor instance, which cannot be null.
+   * @param isUnordered Indicator that this reaction is unordered w.r.t. other reactions.
+   * @param index The index of the reaction within the reactor (0 for the first reaction, 1 for the
+   *     second, etc.).
+   */
+  public ReactionInstance(
+      Reaction definition, ReactorInstance parent, boolean isUnordered, int index) {
+    super(definition, parent);
+    this.index = index;
+    this.isUnordered = isUnordered;
+
+    // If the reaction body starts with the magic string
+    // UNORDERED_REACTION_MARKER, then mark it unordered,
+    // overriding the argument.
+    String body = ASTUtils.toText(definition.getCode());
+    if (body.contains(UNORDERED_REACTION_MARKER)) {
+      this.isUnordered = true;
+    }
 
-        // Identify the dependencies for this reaction.
-        // First handle the triggers.
-        for (TriggerRef trigger : definition.getTriggers()) {
-            if (trigger instanceof VarRef) {
-                Variable variable = ((VarRef)trigger).getVariable();
-                if (variable instanceof Port) {
-                    PortInstance portInstance = parent.lookupPortInstance((Port)variable);
-                    // If the trigger is the port of a contained bank, then the
-                    // portInstance will be null and we have to instead search for
-                    // each port instance in the bank.
-                    if (portInstance != null) {
-                        this.sources.add(portInstance);
-                        portInstance.dependentReactions.add(this);
-                        this.triggers.add(portInstance);
-                    } else if (((VarRef)trigger).getContainer() != null) {
-                        // Port belongs to a contained reactor or bank.
-                        ReactorInstance containedReactor
-                                = parent.lookupReactorInstance(((VarRef)trigger).getContainer());
-                        if (containedReactor != null) {
-                            portInstance = containedReactor.lookupPortInstance((Port)variable);
-                            if (portInstance != null) {
-                                this.sources.add(portInstance);
-                                portInstance.dependentReactions.add(this);
-                                this.triggers.add(portInstance);
-                            }
-                        }
-                    }
-                } else if (variable instanceof Action) {
-                    var actionInstance = parent.lookupActionInstance(
-                        (Action)((VarRef)trigger).getVariable());
-                    this.triggers.add(actionInstance);
-                    actionInstance.dependentReactions.add(this);
-                    this.sources.add(actionInstance);
-                } else if (variable instanceof Timer) {
-                    var timerInstance = parent.lookupTimerInstance(
-                            (Timer)((VarRef)trigger).getVariable());
-                    this.triggers.add(timerInstance);
-                    timerInstance.dependentReactions.add(this);
-                    this.sources.add(timerInstance);
-                }
-            } else if (trigger instanceof BuiltinTriggerRef) {
-                this.triggers.add(parent.getOrCreateBuiltinTrigger((BuiltinTriggerRef) trigger));
+    // Identify the dependencies for this reaction.
+    // First handle the triggers.
+    for (TriggerRef trigger : definition.getTriggers()) {
+      if (trigger instanceof VarRef) {
+        Variable variable = ((VarRef) trigger).getVariable();
+        if (variable instanceof Port) {
+          PortInstance portInstance = parent.lookupPortInstance((Port) variable);
+          // If the trigger is the port of a contained bank, then the
+          // portInstance will be null and we have to instead search for
+          // each port instance in the bank.
+          if (portInstance != null) {
+            this.sources.add(portInstance);
+            portInstance.dependentReactions.add(this);
+            this.triggers.add(portInstance);
+          } else if (((VarRef) trigger).getContainer() != null) {
+            // Port belongs to a contained reactor or bank.
+            ReactorInstance containedReactor =
+                parent.lookupReactorInstance(((VarRef) trigger).getContainer());
+            if (containedReactor != null) {
+              portInstance = containedReactor.lookupPortInstance((Port) variable);
+              if (portInstance != null) {
+                this.sources.add(portInstance);
+                portInstance.dependentReactions.add(this);
+                this.triggers.add(portInstance);
+              }
             }
+          }
+        } else if (variable instanceof Action) {
+          var actionInstance =
+              parent.lookupActionInstance((Action) ((VarRef) trigger).getVariable());
+          this.triggers.add(actionInstance);
+          actionInstance.dependentReactions.add(this);
+          this.sources.add(actionInstance);
+        } else if (variable instanceof Timer) {
+          var timerInstance = parent.lookupTimerInstance((Timer) ((VarRef) trigger).getVariable());
+          this.triggers.add(timerInstance);
+          timerInstance.dependentReactions.add(this);
+          this.sources.add(timerInstance);
         }
-        // Next handle the ports that this reaction reads.
-        for (VarRef source : definition.getSources()) {
-            Variable variable = source.getVariable();
-            if (variable instanceof Port) {
-                var portInstance = parent.lookupPortInstance((Port)variable);
-
-                // If the trigger is the port of a contained bank, then the
-                // portInstance will be null and we have to instead search for
-                // each port instance in the bank.
-                if (portInstance != null) {
-                    this.sources.add(portInstance);
-                    this.reads.add(portInstance);
-                    portInstance.dependentReactions.add(this);
-                } else if (source.getContainer() != null) {
-                    ReactorInstance containedReactor
-                            = parent.lookupReactorInstance(source.getContainer());
-                    if (containedReactor != null) {
-                        portInstance = containedReactor.lookupPortInstance((Port)variable);
-                        if (portInstance != null) {
-                            this.sources.add(portInstance);
-                            portInstance.dependentReactions.add(this);
-                            this.triggers.add(portInstance);
-                        }
-                    }
-                }
+      } else if (trigger instanceof BuiltinTriggerRef) {
+        this.triggers.add(parent.getOrCreateBuiltinTrigger((BuiltinTriggerRef) trigger));
+      }
+    }
+    // Next handle the ports that this reaction reads.
+    for (VarRef source : definition.getSources()) {
+      Variable variable = source.getVariable();
+      if (variable instanceof Port) {
+        var portInstance = parent.lookupPortInstance((Port) variable);
+
+        // If the trigger is the port of a contained bank, then the
+        // portInstance will be null and we have to instead search for
+        // each port instance in the bank.
+        if (portInstance != null) {
+          this.sources.add(portInstance);
+          this.reads.add(portInstance);
+          portInstance.dependentReactions.add(this);
+        } else if (source.getContainer() != null) {
+          ReactorInstance containedReactor = parent.lookupReactorInstance(source.getContainer());
+          if (containedReactor != null) {
+            portInstance = containedReactor.lookupPortInstance((Port) variable);
+            if (portInstance != null) {
+              this.sources.add(portInstance);
+              portInstance.dependentReactions.add(this);
+              this.triggers.add(portInstance);
             }
+          }
         }
+      }
+    }
 
-        // Finally, handle the effects.
-        for (VarRef effect : definition.getEffects()) {
-            Variable variable = effect.getVariable();
-            if (variable instanceof Port) {
-                var portInstance = parent.lookupPortInstance(effect);
-                if (portInstance != null) {
-                    this.effects.add(portInstance);
-                    portInstance.dependsOnReactions.add(this);
-                } else {
-                    throw new InvalidSourceException(
-                            "Unexpected effect. Cannot find port " + variable.getName());
-                }
-            } else if (variable instanceof Action) {
-                // Effect is an Action.
-                var actionInstance = parent.lookupActionInstance(
-                    (Action)variable);
-                this.effects.add(actionInstance);
-                actionInstance.dependsOnReactions.add(this);
-            } else {
-                // Effect is either a mode or an unresolved reference.
-                // Do nothing, transitions will be set up by the ModeInstance.
-            }
-        }
-        // Create a deadline instance if one has been defined.
-        if (this.definition.getDeadline() != null) {
-            this.declaredDeadline = new DeadlineInstance(
-                this.definition.getDeadline(), this);
+    // Finally, handle the effects.
+    for (VarRef effect : definition.getEffects()) {
+      Variable variable = effect.getVariable();
+      if (variable instanceof Port) {
+        var portInstance = parent.lookupPortInstance(effect);
+        if (portInstance != null) {
+          this.effects.add(portInstance);
+          portInstance.dependsOnReactions.add(this);
+        } else {
+          throw new InvalidSourceException(
+              "Unexpected effect. Cannot find port " + variable.getName());
         }
+      } else if (variable instanceof Action) {
+        // Effect is an Action.
+        var actionInstance = parent.lookupActionInstance((Action) variable);
+        this.effects.add(actionInstance);
+        actionInstance.dependsOnReactions.add(this);
+      } else {
+        // Effect is either a mode or an unresolved reference.
+        // Do nothing, transitions will be set up by the ModeInstance.
+      }
     }
-
-    //////////////////////////////////////////////////////
-    //// Public fields.
-
-    /**
-     * Indicates the chain this reaction is a part of. It is constructed
-     * through a bit-wise or among all upstream chains. Each fork in the
-     * dependency graph setting a new, unused bit to true in order to
-     * disambiguate it from parallel chains. Note that zero results in
-     * no overlap with any other reaction, which means the reaction can
-     * execute in parallel with any other reaction. The default is 1L.
-     * If left at the default, parallel execution will be based purely
-     * on levels.
-     */
-    public long chainID = 1L;
-
-    /**
-     * The ports or actions that this reaction may write to.
-     */
-    public Set<TriggerInstance<? extends Variable>> effects = new LinkedHashSet<>();
-
-    /**
-     * The ports, actions, or timers that this reaction is triggered by or uses.
-     */
-    public Set<TriggerInstance<? extends Variable>> sources = new LinkedHashSet<>();
-    // FIXME: Above sources is misnamed because in the grammar,
-    // "sources" are only the inputs a reaction reads without being
-    // triggered by them. The name "reads" used here would be a better
-    // choice in the grammar.
-
-    /**
-     * Deadline for this reaction instance, if declared.
-     */
-    public DeadlineInstance declaredDeadline;
-
-    /**
-     * Sadly, we have no way to mark reaction "unordered" in the AST,
-     * so instead, we use a magic comment at the start of the reaction body.
-     * This is that magic comment.
-     */
-    public static String UNORDERED_REACTION_MARKER
-            = "**** This reaction is unordered.";
-
-    /**
-     * Index of order of occurrence within the reactor definition.
-     * The first reaction has index 0, the second index 1, etc.
-     */
-    public int index;
-
-    /**
-     * Whether or not this reaction is ordered with respect to other
-     * reactions in the same reactor.
-     */
-    public boolean isUnordered;
-
-    /**
-     * The ports that this reaction reads but that do not trigger it.
-     */
-    public Set<TriggerInstance<? extends Variable>> reads = new LinkedHashSet<>();
-
-    /**
-     * The trigger instances (input ports, timers, and actions
-     * that trigger reactions) that trigger this reaction.
-     */
-    public Set<TriggerInstance<? extends Variable>> triggers = new LinkedHashSet<>();
-
-    //////////////////////////////////////////////////////
-    //// Public methods.
-
-    /**
-     * Clear caches used in reporting dependentReactions() and dependsOnReactions().
-     * This method should be called if any changes are made to triggers, sources,
-     * or effects.
-     * @param includingRuntimes If false, leave the runtime instances intact.
-     *  This is useful for federated execution where levels are computed using
-     *  the top-level connections, but then those connections are discarded.
-     */
-    public void clearCaches(boolean includingRuntimes) {
-        dependentReactionsCache = null;
-        dependsOnReactionsCache = null;
-        if (includingRuntimes) runtimeInstances = null;
+    // Create a deadline instance if one has been defined.
+    if (this.definition.getDeadline() != null) {
+      this.declaredDeadline = new DeadlineInstance(this.definition.getDeadline(), this);
     }
-
-    /**
-     * Return the set of immediate downstream reactions, which are reactions
-     * that receive data produced by this reaction plus
-     * at most one reaction in the same reactor whose definition
-     * lexically follows this one (unless this reaction is unordered).
-     */
-    public Set<ReactionInstance> dependentReactions() {
-        // Cache the result.
-        if (dependentReactionsCache != null) return dependentReactionsCache;
-        dependentReactionsCache = new LinkedHashSet<>();
-
-        // First, add the next lexical reaction, if appropriate.
-        if (!isUnordered && parent.reactions.size() > index + 1) {
-            // Find the next reaction in the parent's reaction list.
-            dependentReactionsCache.add(parent.reactions.get(index + 1));
-        }
-
-        // Next, add reactions that get data from this one via a port.
-        for (TriggerInstance<? extends Variable> effect : effects) {
-            if (effect instanceof PortInstance) {
-                for (SendRange senderRange
-                        : ((PortInstance)effect).eventualDestinations()) {
-                    for (RuntimeRange<PortInstance> destinationRange
-                            : senderRange.destinations) {
-                        dependentReactionsCache.addAll(
-                                destinationRange.instance.dependentReactions);
-                    }
-                }
-            }
-        }
-        return dependentReactionsCache;
+  }
+
+  //////////////////////////////////////////////////////
+  //// Public fields.
+
+  /**
+   * Indicates the chain this reaction is a part of. It is constructed through a bit-wise or among
+   * all upstream chains. Each fork in the dependency graph setting a new, unused bit to true in
+   * order to disambiguate it from parallel chains. Note that zero results in no overlap with any
+   * other reaction, which means the reaction can execute in parallel with any other reaction. The
+   * default is 1L. If left at the default, parallel execution will be based purely on levels.
+   */
+  public long chainID = 1L;
+
+  /** The ports or actions that this reaction may write to. */
+  public Set<TriggerInstance<? extends Variable>> effects = new LinkedHashSet<>();
+
+  /** The ports, actions, or timers that this reaction is triggered by or uses. */
+  public Set<TriggerInstance<? extends Variable>> sources = new LinkedHashSet<>();
+  // FIXME: Above sources is misnamed because in the grammar,
+  // "sources" are only the inputs a reaction reads without being
+  // triggered by them. The name "reads" used here would be a better
+  // choice in the grammar.
+
+  /** Deadline for this reaction instance, if declared. */
+  public DeadlineInstance declaredDeadline;
+
+  /**
+   * Sadly, we have no way to mark reaction "unordered" in the AST, so instead, we use a magic
+   * comment at the start of the reaction body. This is that magic comment.
+   */
+  public static String UNORDERED_REACTION_MARKER = "**** This reaction is unordered.";
+
+  /**
+   * Index of order of occurrence within the reactor definition. The first reaction has index 0, the
+   * second index 1, etc.
+   */
+  public int index;
+
+  /**
+   * Whether or not this reaction is ordered with respect to other reactions in the same reactor.
+   */
+  public boolean isUnordered;
+
+  /** The ports that this reaction reads but that do not trigger it. */
+  public Set<TriggerInstance<? extends Variable>> reads = new LinkedHashSet<>();
+
+  /**
+   * The trigger instances (input ports, timers, and actions that trigger reactions) that trigger
+   * this reaction.
+   */
+  public Set<TriggerInstance<? extends Variable>> triggers = new LinkedHashSet<>();
+
+  //////////////////////////////////////////////////////
+  //// Public methods.
+
+  /**
+   * Clear caches used in reporting dependentReactions() and dependsOnReactions(). This method
+   * should be called if any changes are made to triggers, sources, or effects.
+   *
+   * @param includingRuntimes If false, leave the runtime instances intact. This is useful for
+   *     federated execution where levels are computed using the top-level connections, but then
+   *     those connections are discarded.
+   */
+  public void clearCaches(boolean includingRuntimes) {
+    dependentReactionsCache = null;
+    dependsOnReactionsCache = null;
+    if (includingRuntimes) runtimeInstances = null;
+  }
+
+  /**
+   * Return the set of immediate downstream reactions, which are reactions that receive data
+   * produced by this reaction plus at most one reaction in the same reactor whose definition
+   * lexically follows this one (unless this reaction is unordered).
+   */
+  public Set<ReactionInstance> dependentReactions() {
+    // Cache the result.
+    if (dependentReactionsCache != null) return dependentReactionsCache;
+    dependentReactionsCache = new LinkedHashSet<>();
+
+    // First, add the next lexical reaction, if appropriate.
+    if (!isUnordered && parent.reactions.size() > index + 1) {
+      // Find the next reaction in the parent's reaction list.
+      dependentReactionsCache.add(parent.reactions.get(index + 1));
     }
 
-    /**
-     * Return the set of immediate upstream reactions, which are reactions
-     * that send data to this one plus at most one reaction in the same
-     * reactor whose definition immediately precedes the definition of this one
-     * (unless this reaction is unordered).
-     */
-    public Set<ReactionInstance> dependsOnReactions() {
-        // Cache the result.
-        if (dependsOnReactionsCache != null) return dependsOnReactionsCache;
-        dependsOnReactionsCache = new LinkedHashSet<>();
-
-        // First, add the previous lexical reaction, if appropriate.
-        if (!isUnordered && index > 0) {
-            // Find the previous ordered reaction in the parent's reaction list.
-            int earlierIndex = index - 1;
-            ReactionInstance earlierOrderedReaction = parent.reactions.get(earlierIndex);
-            while (earlierOrderedReaction.isUnordered && --earlierIndex >= 0) {
-                earlierOrderedReaction = parent.reactions.get(earlierIndex);
-            }
-            if (earlierIndex >= 0) {
-                dependsOnReactionsCache.add(parent.reactions.get(index - 1));
-            }
-        }
-
-        // Next, add reactions that send data to this one.
-        for (TriggerInstance<? extends Variable> source : sources) {
-            if (source instanceof PortInstance) {
-                // First, add reactions that send data through an intermediate port.
-                for (RuntimeRange<PortInstance> senderRange
-                        : ((PortInstance)source).eventualSources()) {
-                    dependsOnReactionsCache.addAll(senderRange.instance.dependsOnReactions);
-                }
-                // Then, add reactions that send directly to this port.
-                dependsOnReactionsCache.addAll(source.dependsOnReactions);
-            }
+    // Next, add reactions that get data from this one via a port.
+    for (TriggerInstance<? extends Variable> effect : effects) {
+      if (effect instanceof PortInstance) {
+        for (SendRange senderRange : ((PortInstance) effect).eventualDestinations()) {
+          for (RuntimeRange<PortInstance> destinationRange : senderRange.destinations) {
+            dependentReactionsCache.addAll(destinationRange.instance.dependentReactions);
+          }
         }
-        return dependsOnReactionsCache;
+      }
     }
-
-    /**
-     * Return a set of levels that runtime instances of this reaction have.
-     * A ReactionInstance may have more than one level if it lies within
-     * a bank and its dependencies on other reactions pass through multiports.
-     */
-    public Set<Integer> getLevels() {
-        Set<Integer> result = new LinkedHashSet<>();
-        // Force calculation of levels if it has not been done.
-        // FIXME: Comment out this as I think it is redundant.
-        //  If it is NOT redundant then deadline propagation is not correct
-        // parent.assignLevels();
-        for (Runtime runtime : runtimeInstances) {
-            result.add(runtime.level);
-        }
-        return result;
+    return dependentReactionsCache;
+  }
+
+  /**
+   * Return the set of immediate upstream reactions, which are reactions that send data to this one
+   * plus at most one reaction in the same reactor whose definition immediately precedes the
+   * definition of this one (unless this reaction is unordered).
+   */
+  public Set<ReactionInstance> dependsOnReactions() {
+    // Cache the result.
+    if (dependsOnReactionsCache != null) return dependsOnReactionsCache;
+    dependsOnReactionsCache = new LinkedHashSet<>();
+
+    // First, add the previous lexical reaction, if appropriate.
+    if (!isUnordered && index > 0) {
+      // Find the previous ordered reaction in the parent's reaction list.
+      int earlierIndex = index - 1;
+      ReactionInstance earlierOrderedReaction = parent.reactions.get(earlierIndex);
+      while (earlierOrderedReaction.isUnordered && --earlierIndex >= 0) {
+        earlierOrderedReaction = parent.reactions.get(earlierIndex);
+      }
+      if (earlierIndex >= 0) {
+        dependsOnReactionsCache.add(parent.reactions.get(index - 1));
+      }
     }
 
-    /**
-     * Return a set of deadlines that runtime instances of this reaction have.
-     * A ReactionInstance may have more than one deadline if it lies within.
-     */
-    public Set<TimeValue> getInferredDeadlines() {
-        Set<TimeValue> result = new LinkedHashSet<>();
-        for (Runtime runtime : runtimeInstances) {
-            result.add(runtime.deadline);
+    // Next, add reactions that send data to this one.
+    for (TriggerInstance<? extends Variable> source : sources) {
+      if (source instanceof PortInstance) {
+        // First, add reactions that send data through an intermediate port.
+        for (RuntimeRange<PortInstance> senderRange : ((PortInstance) source).eventualSources()) {
+          dependsOnReactionsCache.addAll(senderRange.instance.dependsOnReactions);
         }
-        return result;
+        // Then, add reactions that send directly to this port.
+        dependsOnReactionsCache.addAll(source.dependsOnReactions);
+      }
     }
-
-
-    /**
-     * Return a list of levels that runtime instances of this reaction have.
-     * The size of this list is the total number of runtime instances.
-     * A ReactionInstance may have more than one level if it lies within
-     * a bank and its dependencies on other reactions pass through multiports.
-     */
-    public List<Integer> getLevelsList() {
-        List<Integer> result = new LinkedList<>();
-        // Force calculation of levels if it has not been done.
-        // FIXME: Comment out this as I think it is redundant.
-        //  If it is NOT redundant then deadline propagation is not correct
-        // parent.assignLevels();
-        for (Runtime runtime : runtimeInstances) {
-            result.add(runtime.level);
-        }
-        return result;
+    return dependsOnReactionsCache;
+  }
+
+  /**
+   * Return a set of levels that runtime instances of this reaction have. A ReactionInstance may
+   * have more than one level if it lies within a bank and its dependencies on other reactions pass
+   * through multiports.
+   */
+  public Set<Integer> getLevels() {
+    Set<Integer> result = new LinkedHashSet<>();
+    // Force calculation of levels if it has not been done.
+    // FIXME: Comment out this as I think it is redundant.
+    //  If it is NOT redundant then deadline propagation is not correct
+    // parent.assignLevels();
+    for (Runtime runtime : runtimeInstances) {
+      result.add(runtime.level);
     }
-
-    /**
-     * Return a list of the deadlines that runtime instances of this reaction have.
-     * The size of this list is the total number of runtime instances.
-     * A ReactionInstance may have more than one deadline if it lies within
-     */
-    public List<TimeValue> getInferredDeadlinesList() {
-        List<TimeValue> result = new LinkedList<>();
-        for (Runtime runtime : runtimeInstances) {
-            result.add(runtime.deadline);
-        }
-        return result;
+    return result;
+  }
+
+  /**
+   * Return a set of deadlines that runtime instances of this reaction have. A ReactionInstance may
+   * have more than one deadline if it lies within.
+   */
+  public Set<TimeValue> getInferredDeadlines() {
+    Set<TimeValue> result = new LinkedHashSet<>();
+    for (Runtime runtime : runtimeInstances) {
+      result.add(runtime.deadline);
     }
-
-
-    /**
-     * Return the name of this reaction, which is 'reaction_n',
-     * where n is replaced by the reaction index.
-     * @return The name of this reaction.
-     */
-    @Override
-    public String getName() {
-        return "reaction_" + this.index;
+    return result;
+  }
+
+  /**
+   * Return a list of levels that runtime instances of this reaction have. The size of this list is
+   * the total number of runtime instances. A ReactionInstance may have more than one level if it
+   * lies within a bank and its dependencies on other reactions pass through multiports.
+   */
+  public List<Integer> getLevelsList() {
+    List<Integer> result = new LinkedList<>();
+    // Force calculation of levels if it has not been done.
+    // FIXME: Comment out this as I think it is redundant.
+    //  If it is NOT redundant then deadline propagation is not correct
+    // parent.assignLevels();
+    for (Runtime runtime : runtimeInstances) {
+      result.add(runtime.level);
     }
-
-    /**
-     * Return an array of runtime instances of this reaction in a
-     * <i>natural order</i>, defined as follows.  The position within the
-     * returned list of the runtime instance is given by a mixed-radix
-     * number where the low-order digit is the bank index within the
-     * container reactor (or {@code 0} if it is not a bank), the second low order
-     * digit is the bank index of the container's container (or {@code 0} if
-     * it is not a bank), etc., until the container that is directly
-     * contained by the top level (the top-level reactor need not be
-     * included because its index is always {@code 0}).
-     * 
-     * The size of the returned array is the product of the widths of all of the
-     * container {@link ReactorInstance} objects. If none of these is a bank,
-     * then the size will be {@code 1}.
-     *     
-     * This method creates this array the first time it is called, but then
-     * holds on to it.  The array is used by {@link ReactionInstanceGraph}
-     * to determine and record levels and deadline for runtime instances
-     * of reactors.
-     */
-    public List<Runtime> getRuntimeInstances() {
-        if (runtimeInstances != null) return runtimeInstances;
-        int size = parent.getTotalWidth();
-        // If the width cannot be determined, assume there is only one instance.
-        if (size < 0) size = 1;
-        runtimeInstances = new ArrayList<>(size);
-        for (int i = 0; i < size; i++) {
-            Runtime r = new Runtime();
-            r.id = i;
-            if (declaredDeadline != null) {
-                r.deadline = declaredDeadline.maxDelay;
-            }
-            runtimeInstances.add(r);
-        }
-        return runtimeInstances;
+    return result;
+  }
+
+  /**
+   * Return a list of the deadlines that runtime instances of this reaction have. The size of this
+   * list is the total number of runtime instances. A ReactionInstance may have more than one
+   * deadline if it lies within
+   */
+  public List<TimeValue> getInferredDeadlinesList() {
+    List<TimeValue> result = new LinkedList<>();
+    for (Runtime runtime : runtimeInstances) {
+      result.add(runtime.deadline);
     }
-
-    /**
-     * Purge 'portInstance' from this reaction, removing it from the list
-     * of triggers, sources, effects, and reads.  Note that this leaves
-     * the runtime instances intact, including their level information.
-     */
-    public void removePortInstance(PortInstance portInstance) {
-        this.triggers.remove(portInstance);
-        this.sources.remove(portInstance);
-        this.effects.remove(portInstance);
-        this.reads.remove(portInstance);
-        clearCaches(false);
-        portInstance.clearCaches();
+    return result;
+  }
+
+  /**
+   * Return the name of this reaction, which is 'reaction_n', where n is replaced by the reaction
+   * index.
+   *
+   * @return The name of this reaction.
+   */
+  @Override
+  public String getName() {
+    return "reaction_" + this.index;
+  }
+
+  /**
+   * Return an array of runtime instances of this reaction in a <i>natural order</i>, defined as
+   * follows. The position within the returned list of the runtime instance is given by a
+   * mixed-radix number where the low-order digit is the bank index within the container reactor (or
+   * {@code 0} if it is not a bank), the second low order digit is the bank index of the container's
+   * container (or {@code 0} if it is not a bank), etc., until the container that is directly
+   * contained by the top level (the top-level reactor need not be included because its index is
+   * always {@code 0}).
+   *
+   * <p>The size of the returned array is the product of the widths of all of the container {@link
+   * ReactorInstance} objects. If none of these is a bank, then the size will be {@code 1}.
+   *
+   * <p>This method creates this array the first time it is called, but then holds on to it. The
+   * array is used by {@link ReactionInstanceGraph} to determine and record levels and deadline for
+   * runtime instances of reactors.
+   */
+  public List<Runtime> getRuntimeInstances() {
+    if (runtimeInstances != null) return runtimeInstances;
+    int size = parent.getTotalWidth();
+    // If the width cannot be determined, assume there is only one instance.
+    if (size < 0) size = 1;
+    runtimeInstances = new ArrayList<>(size);
+    for (int i = 0; i < size; i++) {
+      Runtime r = new Runtime();
+      r.id = i;
+      if (declaredDeadline != null) {
+        r.deadline = declaredDeadline.maxDelay;
+      }
+      runtimeInstances.add(r);
     }
-
-    /**
-     * Return a descriptive string.
-     */
-    @Override
-    public String toString() {
-        return getName() + " of " + parent.getFullName();
+    return runtimeInstances;
+  }
+
+  /**
+   * Purge 'portInstance' from this reaction, removing it from the list of triggers, sources,
+   * effects, and reads. Note that this leaves the runtime instances intact, including their level
+   * information.
+   */
+  public void removePortInstance(PortInstance portInstance) {
+    this.triggers.remove(portInstance);
+    this.sources.remove(portInstance);
+    this.effects.remove(portInstance);
+    this.reads.remove(portInstance);
+    clearCaches(false);
+    portInstance.clearCaches();
+  }
+
+  /** Return a descriptive string. */
+  @Override
+  public String toString() {
+    return getName() + " of " + parent.getFullName();
+  }
+
+  /**
+   * Determine logical execution time for each reaction during compile time based on immediate
+   * downstream logical delays (after delays and actions) and label each reaction with the minimum
+   * of all such delays.
+   */
+  public TimeValue assignLogicalExecutionTime() {
+    if (this.let != null) {
+      return this.let;
     }
 
-    /**
-     * Determine logical execution time for each reaction during compile
-     * time based on immediate downstream logical delays (after delays and actions)
-     * and label each reaction with the minimum of all such delays.
-     */
-    public TimeValue assignLogicalExecutionTime() {
-        if (this.let != null) {
-            return this.let;
-        }
-
-        if (this.parent.isGeneratedDelay()) {
-            return this.let = TimeValue.ZERO;
-        }
+    if (this.parent.isGeneratedDelay()) {
+      return this.let = TimeValue.ZERO;
+    }
 
-        TimeValue let = null;
-
-        // Iterate over effect and find minimum delay.
-        for (TriggerInstance<? extends Variable> effect : effects) {
-            if (effect instanceof PortInstance) {
-                var afters = this.parent.getParent().children.stream().filter(c -> {
-                    if (c.isGeneratedDelay()) {
-                        return c.inputs.get(0).getDependsOnPorts().get(0).instance
-                                       .equals((PortInstance) effect);
-                    }
-                    return false;
-                }).map(c -> c.actions.get(0).getMinDelay())
-                  .min(TimeValue::compare);
-
-                if (afters.isPresent()) {
-                    if (let == null) {
-                        let = afters.get();
-                    } else {
-                        let = TimeValue.min(afters.get(), let);
-                    }
-                }
-            } else if (effect instanceof ActionInstance) {
-                var action = ((ActionInstance) effect).getMinDelay();
-                if (let == null) {
-                    let = action;
-                } else {
-                    let = TimeValue.min(action, let);
-                }
-            }
+    TimeValue let = null;
+
+    // Iterate over effect and find minimum delay.
+    for (TriggerInstance<? extends Variable> effect : effects) {
+      if (effect instanceof PortInstance) {
+        var afters =
+            this.parent.getParent().children.stream()
+                .filter(
+                    c -> {
+                      if (c.isGeneratedDelay()) {
+                        return c.inputs
+                            .get(0)
+                            .getDependsOnPorts()
+                            .get(0)
+                            .instance
+                            .equals((PortInstance) effect);
+                      }
+                      return false;
+                    })
+                .map(c -> c.actions.get(0).getMinDelay())
+                .min(TimeValue::compare);
+
+        if (afters.isPresent()) {
+          if (let == null) {
+            let = afters.get();
+          } else {
+            let = TimeValue.min(afters.get(), let);
+          }
         }
-
+      } else if (effect instanceof ActionInstance) {
+        var action = ((ActionInstance) effect).getMinDelay();
         if (let == null) {
-            let = TimeValue.ZERO;
+          let = action;
+        } else {
+          let = TimeValue.min(action, let);
         }
-        return this.let = let;
+      }
     }
 
-    //////////////////////////////////////////////////////
-    //// Private variables.
-
-    /** Cache of the set of downstream reactions. */
-    private Set<ReactionInstance> dependentReactionsCache;
-
-    /** Cache of the set of upstream reactions. */
-    private Set<ReactionInstance> dependsOnReactionsCache;
-
-    /**
-     * Array of runtime instances of this reaction.
-     * This has length 1 unless the reaction is contained
-     * by one or more banks.  Suppose that this reaction
-     * has depth 3, with full name r0.r1.r2.r. The top-level
-     * reactor is r0, which contains r1, which contains r2,
-     * which contains this reaction r.  Suppose the widths
-     * of the containing reactors are w0, w1, and w2, and
-     * we are interested in the instance at bank indexes
-     * b0, b1, and b2.  That instance is in this array at
-     * location given by the <strong>natural ordering</strong>, which
-     * is the mixed radix number b2%w2; b1%w1.
-     */
-    private List<Runtime> runtimeInstances;
-
-    private TimeValue let = null;
-
-    ///////////////////////////////////////////////////////////
-    //// Inner classes
-
-    /** Inner class representing a runtime instance of a reaction. */
-    public class Runtime {
-        public TimeValue deadline;
-        // If this reaction instance depends on exactly one upstream
-        // reaction (via a port), then the "dominating" field will
-        // point to that upstream reaction.
-        public Runtime dominating;
-        /** ID ranging from 0 to parent.getTotalWidth() - 1. */
-        public int id;
-        public int level;
-
-        public ReactionInstance getReaction() {
-            return ReactionInstance.this;
-        }
-        @Override
-        public String toString() {
-            String result = ReactionInstance.this + "(level: " + level;
-            if (deadline != null && deadline != TimeValue.MAX_VALUE) {
-               result += ", deadline: " + deadline;
-            }
-            if (dominating != null) {
-                result += ", dominating: " + dominating.getReaction();
-            }
-            result += ")";
-            return result;
-        }
+    if (let == null) {
+      let = TimeValue.ZERO;
+    }
+    return this.let = let;
+  }
+
+  //////////////////////////////////////////////////////
+  //// Private variables.
+
+  /** Cache of the set of downstream reactions. */
+  private Set<ReactionInstance> dependentReactionsCache;
+
+  /** Cache of the set of upstream reactions. */
+  private Set<ReactionInstance> dependsOnReactionsCache;
+
+  /**
+   * Array of runtime instances of this reaction. This has length 1 unless the reaction is contained
+   * by one or more banks. Suppose that this reaction has depth 3, with full name r0.r1.r2.r. The
+   * top-level reactor is r0, which contains r1, which contains r2, which contains this reaction r.
+   * Suppose the widths of the containing reactors are w0, w1, and w2, and we are interested in the
+   * instance at bank indexes b0, b1, and b2. That instance is in this array at location given by
+   * the <strong>natural ordering</strong>, which is the mixed radix number b2%w2; b1%w1.
+   */
+  private List<Runtime> runtimeInstances;
+
+  private TimeValue let = null;
+
+  ///////////////////////////////////////////////////////////
+  //// Inner classes
+
+  /** Inner class representing a runtime instance of a reaction. */
+  public class Runtime {
+    public TimeValue deadline;
+    // If this reaction instance depends on exactly one upstream
+    // reaction (via a port), then the "dominating" field will
+    // point to that upstream reaction.
+    public Runtime dominating;
+    /** ID ranging from 0 to parent.getTotalWidth() - 1. */
+    public int id;
+
+    public int level;
+
+    public ReactionInstance getReaction() {
+      return ReactionInstance.this;
+    }
 
-        public Runtime() {
-            this.dominating = null;
-            this.id = 0;
-            this.level = 0;
-            if (ReactionInstance.this.declaredDeadline != null) {
-                this.deadline = ReactionInstance.this.declaredDeadline.maxDelay;
-            } else {
-                this.deadline = TimeValue.MAX_VALUE;
-            }
-        }
+    @Override
+    public String toString() {
+      String result = ReactionInstance.this + "(level: " + level;
+      if (deadline != null && deadline != TimeValue.MAX_VALUE) {
+        result += ", deadline: " + deadline;
+      }
+      if (dominating != null) {
+        result += ", dominating: " + dominating.getReaction();
+      }
+      result += ")";
+      return result;
+    }
+
+    public Runtime() {
+      this.dominating = null;
+      this.id = 0;
+      this.level = 0;
+      if (ReactionInstance.this.declaredDeadline != null) {
+        this.deadline = ReactionInstance.this.declaredDeadline.maxDelay;
+      } else {
+        this.deadline = TimeValue.MAX_VALUE;
+      }
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java b/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
index 4c5f3ec292..57d171e327 100644
--- a/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
+++ b/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
@@ -1,28 +1,28 @@
 /** A graph that represents causality cycles formed by reaction instances. */
 
 /*************
-Copyright (c) 2021, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2021, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
@@ -31,359 +31,347 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.lflang.generator.ReactionInstance.Runtime;
 import org.lflang.generator.c.CUtil;
 import org.lflang.graph.PrecedenceGraph;
 import org.lflang.lf.Variable;
 
 /**
- * This class analyzes the dependencies between reaction runtime instances.
- * For each ReactionInstance, there may be more than one runtime instance because
- * the ReactionInstance may be nested within one or more banks.
- * In the worst case, of these runtime instances may have distinct dependencies,
- * and hence distinct levels in the graph. Moreover, some of these instances
- * may be involved in cycles while others are not.
+ * This class analyzes the dependencies between reaction runtime instances. For each
+ * ReactionInstance, there may be more than one runtime instance because the ReactionInstance may be
+ * nested within one or more banks. In the worst case, of these runtime instances may have distinct
+ * dependencies, and hence distinct levels in the graph. Moreover, some of these instances may be
+ * involved in cycles while others are not.
  *
- * Upon construction of this class, the runtime instances are created if necessary,
- * stored each ReactionInstance, and assigned levels (maximum number of
- * upstream reaction instances), deadlines, and single dominating reactions.
+ * <p>Upon construction of this class, the runtime instances are created if necessary, stored each
+ * ReactionInstance, and assigned levels (maximum number of upstream reaction instances), deadlines,
+ * and single dominating reactions.
  *
- * After creation, the resulting graph will be empty unless there are causality
- * cycles, in which case, the resulting graph is a graph of runtime reaction
- * instances that form cycles.
+ * <p>After creation, the resulting graph will be empty unless there are causality cycles, in which
+ * case, the resulting graph is a graph of runtime reaction instances that form cycles.
  *
  * @author Marten Lohstroh
  * @author Edward A. Lee
  */
 public class ReactionInstanceGraph extends PrecedenceGraph<ReactionInstance.Runtime> {
 
-    /**
-     * Create a new graph by traversing the maps in the named instances
-     * embedded in the hierarchy of the program.
-     */
-    public ReactionInstanceGraph(ReactorInstance main) {
-        this.main = main;
-        rebuild();
-    }
-
-    ///////////////////////////////////////////////////////////
-    //// Public fields
-
-    /**
-     * The main reactor instance that this graph is associated with.
-     */
-    public final ReactorInstance main;
-
-    ///////////////////////////////////////////////////////////
-    //// Public methods
-
-    /**
-     * Rebuild this graph by clearing and repeating the traversal that
-     * adds all the nodes and edges.
-     */
-    public void rebuild() {
-        this.clear();
-        addNodesAndEdges(main);
-
-        // FIXME: Use {@link TargetProperty#EXPORT_DEPENDENCY_GRAPH}.
-        // System.out.println(toDOT());
-
-        // Assign a level to each reaction.
-        // If there are cycles present in the graph, it will be detected here.
-        assignLevels();
-        if (nodeCount() != 0) {
-            // The graph has cycles.
-            // main.reporter.reportError("Reactions form a cycle! " + toString());
-            // Do not throw an exception so that cycle visualization can proceed.
-            // throw new InvalidSourceException("Reactions form a cycle!");
-        }
+  /**
+   * Create a new graph by traversing the maps in the named instances embedded in the hierarchy of
+   * the program.
+   */
+  public ReactionInstanceGraph(ReactorInstance main) {
+    this.main = main;
+    rebuild();
+  }
+
+  ///////////////////////////////////////////////////////////
+  //// Public fields
+
+  /** The main reactor instance that this graph is associated with. */
+  public final ReactorInstance main;
+
+  ///////////////////////////////////////////////////////////
+  //// Public methods
+
+  /**
+   * Rebuild this graph by clearing and repeating the traversal that adds all the nodes and edges.
+   */
+  public void rebuild() {
+    this.clear();
+    addNodesAndEdges(main);
+
+    // FIXME: Use {@link TargetProperty#EXPORT_DEPENDENCY_GRAPH}.
+    // System.out.println(toDOT());
+
+    // Assign a level to each reaction.
+    // If there are cycles present in the graph, it will be detected here.
+    assignLevels();
+    if (nodeCount() != 0) {
+      // The graph has cycles.
+      // main.reporter.reportError("Reactions form a cycle! " + toString());
+      // Do not throw an exception so that cycle visualization can proceed.
+      // throw new InvalidSourceException("Reactions form a cycle!");
     }
-    /**
-     * This function rebuilds the graph and propagates and assigns deadlines
-     * to all reactions.
-     */
-    public void rebuildAndAssignDeadlines() {
-        this.clear();
-        addNodesAndEdges(main);
-        assignInferredDeadlines();
-        this.clear();
-    }
-
-    /*
-     * Get an array of non-negative integers representing the number of reactions
-     * per each level, where levels are indices of the array.
-     */
-    public Integer[] getNumReactionsPerLevel() {
-        return numReactionsPerLevel.toArray(new Integer[0]);
+  }
+  /** This function rebuilds the graph and propagates and assigns deadlines to all reactions. */
+  public void rebuildAndAssignDeadlines() {
+    this.clear();
+    addNodesAndEdges(main);
+    assignInferredDeadlines();
+    this.clear();
+  }
+
+  /*
+   * Get an array of non-negative integers representing the number of reactions
+   * per each level, where levels are indices of the array.
+   */
+  public Integer[] getNumReactionsPerLevel() {
+    return numReactionsPerLevel.toArray(new Integer[0]);
+  }
+
+  /** Return the max breadth of the reaction dependency graph */
+  public int getBreadth() {
+    var maxBreadth = 0;
+    for (Integer breadth : numReactionsPerLevel) {
+      if (breadth > maxBreadth) {
+        maxBreadth = breadth;
+      }
     }
+    return maxBreadth;
+  }
+
+  ///////////////////////////////////////////////////////////
+  //// Protected methods
+
+  /**
+   * Add to the graph edges between the given reaction and all the reactions that depend on the
+   * specified port.
+   *
+   * @param port The port that the given reaction has as an effect.
+   * @param reaction The reaction to relate downstream reactions to.
+   */
+  protected void addDownstreamReactions(PortInstance port, ReactionInstance reaction) {
+    // Use mixed-radix numbers to increment over the ranges.
+    List<Runtime> srcRuntimes = reaction.getRuntimeInstances();
+    List<SendRange> eventualDestinations = port.eventualDestinations();
+
+    int srcDepth = (port.isInput()) ? 2 : 1;
+
+    for (SendRange sendRange : eventualDestinations) {
+      for (RuntimeRange<PortInstance> dstRange : sendRange.destinations) {
+
+        int dstDepth = (dstRange.instance.isOutput()) ? 2 : 1;
+        MixedRadixInt dstRangePosition = dstRange.startMR();
+        int dstRangeCount = 0;
+
+        MixedRadixInt sendRangePosition = sendRange.startMR();
+        int sendRangeCount = 0;
+
+        while (dstRangeCount++ < dstRange.width) {
+          int srcIndex = sendRangePosition.get(srcDepth);
+          int dstIndex = dstRangePosition.get(dstDepth);
+          for (ReactionInstance dstReaction : dstRange.instance.dependentReactions) {
+            List<Runtime> dstRuntimes = dstReaction.getRuntimeInstances();
+            Runtime srcRuntime = srcRuntimes.get(srcIndex);
+            Runtime dstRuntime = dstRuntimes.get(dstIndex);
+            // Only add this dependency if the reactions are not in modes at all or in the same mode
+            // or in modes of separate reactors
+            // This allows modes to break cycles since modes are always mutually exclusive.
+            if (srcRuntime.getReaction().getMode(true) == null
+                || dstRuntime.getReaction().getMode(true) == null
+                || srcRuntime.getReaction().getMode(true) == dstRuntime.getReaction().getMode(true)
+                || srcRuntime.getReaction().getParent() != dstRuntime.getReaction().getParent()) {
+              addEdge(dstRuntime, srcRuntime);
+            }
 
-    /**
-     * Return the max breadth of the reaction dependency graph
-     */
-    public int getBreadth() {
-        var maxBreadth = 0;
-        for (Integer breadth: numReactionsPerLevel ) {
-            if (breadth > maxBreadth) {
-                maxBreadth = breadth;
+            // Propagate the deadlines, if any.
+            if (srcRuntime.deadline.compareTo(dstRuntime.deadline) > 0) {
+              srcRuntime.deadline = dstRuntime.deadline;
             }
-        }
-        return maxBreadth;
-    }
 
-    ///////////////////////////////////////////////////////////
-    //// Protected methods
-
-    /**
-     * Add to the graph edges between the given reaction and all the reactions
-     * that depend on the specified port.
-     * @param port The port that the given reaction has as an effect.
-     * @param reaction The reaction to relate downstream reactions to.
-     */
-    protected void addDownstreamReactions(PortInstance port, ReactionInstance reaction) {
-        // Use mixed-radix numbers to increment over the ranges.
-        List<Runtime> srcRuntimes = reaction.getRuntimeInstances();
-        List<SendRange> eventualDestinations = port.eventualDestinations();
-
-        int srcDepth = (port.isInput())? 2 : 1;
-
-        for (SendRange sendRange : eventualDestinations) {
-            for (RuntimeRange<PortInstance> dstRange : sendRange.destinations) {
-
-                int dstDepth = (dstRange.instance.isOutput())? 2 : 1;
-                MixedRadixInt dstRangePosition = dstRange.startMR();
-                int dstRangeCount = 0;
-
-                MixedRadixInt sendRangePosition = sendRange.startMR();
-                int sendRangeCount = 0;
-
-                while (dstRangeCount++ < dstRange.width) {
-                    int srcIndex = sendRangePosition.get(srcDepth);
-                    int dstIndex = dstRangePosition.get(dstDepth);
-                    for (ReactionInstance dstReaction : dstRange.instance.dependentReactions) {
-                        List<Runtime> dstRuntimes = dstReaction.getRuntimeInstances();
-                        Runtime srcRuntime = srcRuntimes.get(srcIndex);
-                        Runtime dstRuntime = dstRuntimes.get(dstIndex);
-                        // Only add this dependency if the reactions are not in modes at all or in the same mode or in modes of separate reactors
-                        // This allows modes to break cycles since modes are always mutually exclusive.
-                        if (srcRuntime.getReaction().getMode(true) == null ||
-                                dstRuntime.getReaction().getMode(true) == null ||
-                                srcRuntime.getReaction().getMode(true) == dstRuntime.getReaction().getMode(true) ||
-                                srcRuntime.getReaction().getParent() != dstRuntime.getReaction().getParent()) {
-                            addEdge(dstRuntime, srcRuntime);
-                        }
-
-                        // Propagate the deadlines, if any.
-                        if (srcRuntime.deadline.compareTo(dstRuntime.deadline) > 0) {
-                            srcRuntime.deadline = dstRuntime.deadline;
-                        }
-
-                        // If this seems to be a single dominating reaction, set it.
-                        // If another upstream reaction shows up, then this will be
-                        // reset to null.
-                        if (this.getUpstreamAdjacentNodes(dstRuntime).size() == 1
-                                && (dstRuntime.getReaction().isUnordered
-                                        || dstRuntime.getReaction().index == 0)) {
-                            dstRuntime.dominating = srcRuntime;
-                        } else {
-                            dstRuntime.dominating = null;
-                        }
-                    }
-                    dstRangePosition.increment();
-                    sendRangePosition.increment();
-                    sendRangeCount++;
-                    if (sendRangeCount >= sendRange.width) {
-                        // Reset to multicast.
-                        sendRangeCount = 0;
-                        sendRangePosition = sendRange.startMR();
-                    }
-                }
+            // If this seems to be a single dominating reaction, set it.
+            // If another upstream reaction shows up, then this will be
+            // reset to null.
+            if (this.getUpstreamAdjacentNodes(dstRuntime).size() == 1
+                && (dstRuntime.getReaction().isUnordered || dstRuntime.getReaction().index == 0)) {
+              dstRuntime.dominating = srcRuntime;
+            } else {
+              dstRuntime.dominating = null;
             }
+          }
+          dstRangePosition.increment();
+          sendRangePosition.increment();
+          sendRangeCount++;
+          if (sendRangeCount >= sendRange.width) {
+            // Reset to multicast.
+            sendRangeCount = 0;
+            sendRangePosition = sendRange.startMR();
+          }
         }
+      }
     }
-
-    /**
-     * Build the graph by adding nodes and edges based on the given reactor
-     * instance.
-     * @param reactor The reactor on the basis of which to add nodes and edges.
-     */
-    protected void addNodesAndEdges(ReactorInstance reactor) {
-        ReactionInstance previousReaction = null;
-        for (ReactionInstance reaction : reactor.reactions) {
-            List<Runtime> runtimes = reaction.getRuntimeInstances();
-
-            // Add reactions of this reactor.
-            for (Runtime runtime : runtimes) {
-                this.addNode(runtime);
-            }
-
-            // If this is not an unordered reaction, then create a dependency
-            // on any previously defined reaction.
-            if (!reaction.isUnordered) {
-                // If there is an earlier reaction in this same reactor, then
-                // create a link in the reaction graph for all runtime instances.
-                if (previousReaction != null) {
-                    List<Runtime> previousRuntimes = previousReaction.getRuntimeInstances();
-                    int count = 0;
-                    for (Runtime runtime : runtimes) {
-                        // Only add the reaction order edge if previous reaction is outside of a mode or both are in the same mode
-                        // This allows modes to break cycles since modes are always mutually exclusive.
-                        if (runtime.getReaction().getMode(true) == null || runtime.getReaction().getMode(true) == reaction.getMode(true)) {
-                            this.addEdge(runtime, previousRuntimes.get(count));
-                            count++;
-                        }
-                    }
-                }
-                previousReaction = reaction;
-            }
-
-            // Add downstream reactions. Note that this is sufficient.
-            // We don't need to also add upstream reactions because this reaction
-            // will be downstream of those upstream reactions.
-            for (TriggerInstance<? extends Variable> effect : reaction.effects) {
-                if (effect instanceof PortInstance) {
-                    addDownstreamReactions((PortInstance)effect, reaction);
-                }
+  }
+
+  /**
+   * Build the graph by adding nodes and edges based on the given reactor instance.
+   *
+   * @param reactor The reactor on the basis of which to add nodes and edges.
+   */
+  protected void addNodesAndEdges(ReactorInstance reactor) {
+    ReactionInstance previousReaction = null;
+    for (ReactionInstance reaction : reactor.reactions) {
+      List<Runtime> runtimes = reaction.getRuntimeInstances();
+
+      // Add reactions of this reactor.
+      for (Runtime runtime : runtimes) {
+        this.addNode(runtime);
+      }
+
+      // If this is not an unordered reaction, then create a dependency
+      // on any previously defined reaction.
+      if (!reaction.isUnordered) {
+        // If there is an earlier reaction in this same reactor, then
+        // create a link in the reaction graph for all runtime instances.
+        if (previousReaction != null) {
+          List<Runtime> previousRuntimes = previousReaction.getRuntimeInstances();
+          int count = 0;
+          for (Runtime runtime : runtimes) {
+            // Only add the reaction order edge if previous reaction is outside of a mode or both
+            // are in the same mode
+            // This allows modes to break cycles since modes are always mutually exclusive.
+            if (runtime.getReaction().getMode(true) == null
+                || runtime.getReaction().getMode(true) == reaction.getMode(true)) {
+              this.addEdge(runtime, previousRuntimes.get(count));
+              count++;
             }
+          }
         }
-        // Recursively add nodes and edges from contained reactors.
-        for (ReactorInstance child : reactor.children) {
-            addNodesAndEdges(child);
+        previousReaction = reaction;
+      }
+
+      // Add downstream reactions. Note that this is sufficient.
+      // We don't need to also add upstream reactions because this reaction
+      // will be downstream of those upstream reactions.
+      for (TriggerInstance<? extends Variable> effect : reaction.effects) {
+        if (effect instanceof PortInstance) {
+          addDownstreamReactions((PortInstance) effect, reaction);
         }
+      }
+    }
+    // Recursively add nodes and edges from contained reactors.
+    for (ReactorInstance child : reactor.children) {
+      addNodesAndEdges(child);
+    }
+  }
+
+  ///////////////////////////////////////////////////////////
+  //// Private fields
+
+  /**
+   * Number of reactions per level, represented as a list of integers where the indices are the
+   * levels.
+   */
+  private List<Integer> numReactionsPerLevel = new ArrayList<>(List.of(0));
+
+  ///////////////////////////////////////////////////////////
+  //// Private methods
+
+  /**
+   * Analyze the dependencies between reactions and assign each reaction instance a level. This
+   * method removes nodes from this graph as it assigns levels. Any remaining nodes are part of
+   * causality cycles.
+   *
+   * <p>This procedure is based on Kahn's algorithm for topological sorting. Rather than
+   * establishing a total order, we establish a partial order. In this order, the level of each
+   * reaction is the least upper bound of the levels of the reactions it depends on.
+   */
+  private void assignLevels() {
+    List<ReactionInstance.Runtime> start = new ArrayList<>(rootNodes());
+
+    // All root nodes start with level 0.
+    for (Runtime origin : start) {
+      origin.level = 0;
     }
 
-    ///////////////////////////////////////////////////////////
-    //// Private fields
-
-    /**
-     * Number of reactions per level, represented as a list of
-     * integers where the indices are the levels.
-     */
-    private List<Integer> numReactionsPerLevel = new ArrayList<>(List.of(0));
-
-    ///////////////////////////////////////////////////////////
-    //// Private methods
-
-    /**
-     * Analyze the dependencies between reactions and assign each reaction
-     * instance a level. This method removes nodes from this graph as it
-     * assigns levels. Any remaining nodes are part of causality cycles.
-     *
-     * This procedure is based on Kahn's algorithm for topological sorting.
-     * Rather than establishing a total order, we establish a partial order.
-     * In this order, the level of each reaction is the least upper bound of
-     * the levels of the reactions it depends on.
-     */
-    private void assignLevels() {
-        List<ReactionInstance.Runtime> start = new ArrayList<>(rootNodes());
-
-        // All root nodes start with level 0.
-        for (Runtime origin : start) {
-            origin.level = 0;
+    // No need to do any of this if there are no root nodes;
+    // the graph must be cyclic.
+    while (!start.isEmpty()) {
+      Runtime origin = start.remove(0);
+      Set<Runtime> toRemove = new LinkedHashSet<>();
+      Set<Runtime> downstreamAdjacentNodes = getDownstreamAdjacentNodes(origin);
+
+      // Visit effect nodes.
+      for (Runtime effect : downstreamAdjacentNodes) {
+        // Stage edge between origin and effect for removal.
+        toRemove.add(effect);
+
+        // Update level of downstream node.
+        effect.level = origin.level + 1;
+      }
+      // Remove visited edges.
+      for (Runtime effect : toRemove) {
+        removeEdge(effect, origin);
+        // If the effect node has no more incoming edges,
+        // then move it in the start set.
+        if (getUpstreamAdjacentNodes(effect).size() == 0) {
+          start.add(effect);
         }
+      }
 
-        // No need to do any of this if there are no root nodes;
-        // the graph must be cyclic.
-        while (!start.isEmpty()) {
-            Runtime origin = start.remove(0);
-            Set<Runtime> toRemove = new LinkedHashSet<>();
-            Set<Runtime> downstreamAdjacentNodes = getDownstreamAdjacentNodes(origin);
-
-            // Visit effect nodes.
-            for (Runtime effect : downstreamAdjacentNodes) {
-                // Stage edge between origin and effect for removal.
-                toRemove.add(effect);
+      // Remove visited origin.
+      removeNode(origin);
 
-                // Update level of downstream node.
-                effect.level = origin.level + 1;
-            }
-            // Remove visited edges.
-            for (Runtime effect : toRemove) {
-                removeEdge(effect, origin);
-                // If the effect node has no more incoming edges,
-                // then move it in the start set.
-                if (getUpstreamAdjacentNodes(effect).size() == 0) {
-                    start.add(effect);
-                }
-            }
-
-            // Remove visited origin.
-            removeNode(origin);
-
-            // Update numReactionsPerLevel info
-            adjustNumReactionsPerLevel(origin.level, 1);
-        }
+      // Update numReactionsPerLevel info
+      adjustNumReactionsPerLevel(origin.level, 1);
     }
-
-    /**
-     * This function assigns inferred deadlines to all the reactions in the graph.
-     * It is modeled after {@code assignLevels} but it starts at the leaf nodes and uses
-     * Kahns algorithm to build a reverse topologically sorted graph
-     *
-     */
-    private void assignInferredDeadlines() {
-        List<ReactionInstance.Runtime> start = new ArrayList<>(leafNodes());
-
-        // All leaf nodes have deadline initialized to their declared deadline or MAX_VALUE
-        while (!start.isEmpty()) {
-            Runtime origin = start.remove(0);
-            Set<Runtime> toRemove = new LinkedHashSet<>();
-            Set<Runtime> upstreamAdjacentNodes = getUpstreamAdjacentNodes(origin);
-
-            // Visit effect nodes.
-            for (Runtime upstream : upstreamAdjacentNodes) {
-                // Stage edge between origin and upstream for removal.
-                toRemove.add(upstream);
-
-                // Update deadline of upstream node if origins deadline is earlier.
-                if (origin.deadline.isEarlierThan(upstream.deadline)) {
-                    upstream.deadline = origin.deadline;
-                }
-            }
-            // Remove visited edges.
-            for (Runtime upstream : toRemove) {
-                removeEdge(origin, upstream);
-                // If the upstream node has no more outgoing edges,
-                // then move it in the start set.
-                if (getDownstreamAdjacentNodes(upstream).size() == 0) {
-                    start.add(upstream);
-                }
-            }
-
-            // Remove visited origin.
-            removeNode(origin);
+  }
+
+  /**
+   * This function assigns inferred deadlines to all the reactions in the graph. It is modeled after
+   * {@code assignLevels} but it starts at the leaf nodes and uses Kahns algorithm to build a
+   * reverse topologically sorted graph
+   */
+  private void assignInferredDeadlines() {
+    List<ReactionInstance.Runtime> start = new ArrayList<>(leafNodes());
+
+    // All leaf nodes have deadline initialized to their declared deadline or MAX_VALUE
+    while (!start.isEmpty()) {
+      Runtime origin = start.remove(0);
+      Set<Runtime> toRemove = new LinkedHashSet<>();
+      Set<Runtime> upstreamAdjacentNodes = getUpstreamAdjacentNodes(origin);
+
+      // Visit effect nodes.
+      for (Runtime upstream : upstreamAdjacentNodes) {
+        // Stage edge between origin and upstream for removal.
+        toRemove.add(upstream);
+
+        // Update deadline of upstream node if origins deadline is earlier.
+        if (origin.deadline.isEarlierThan(upstream.deadline)) {
+          upstream.deadline = origin.deadline;
         }
-    }
-
-    /**
-     * Adjust {@link #numReactionsPerLevel} at index <code>level<code> by
-     * adding to the previously recorded number <code>valueToAdd<code>.
-     * If there is no previously recorded number for this level, then
-     * create one with index <code>level</code> and value <code>valueToAdd</code>.
-     * @param level The level.
-     * @param valueToAdd The value to add to the number of levels.
-     */
-    private void adjustNumReactionsPerLevel(int level, int valueToAdd) {
-        if (numReactionsPerLevel.size() > level) {
-            numReactionsPerLevel.set(level, numReactionsPerLevel.get(level) + valueToAdd);
-        } else {
-            while (numReactionsPerLevel.size() < level) {
-                numReactionsPerLevel.add(0);
-            }
-            numReactionsPerLevel.add(valueToAdd);
+      }
+      // Remove visited edges.
+      for (Runtime upstream : toRemove) {
+        removeEdge(origin, upstream);
+        // If the upstream node has no more outgoing edges,
+        // then move it in the start set.
+        if (getDownstreamAdjacentNodes(upstream).size() == 0) {
+          start.add(upstream);
         }
+      }
+
+      // Remove visited origin.
+      removeNode(origin);
     }
+  }
+
+  /**
+   * Adjust {@link #numReactionsPerLevel} at index <code>level<code> by
+   * adding to the previously recorded number <code>valueToAdd<code>.
+   * If there is no previously recorded number for this level, then
+   * create one with index <code>level</code> and value <code>valueToAdd</code>.
+   * @param level The level.
+   * @param valueToAdd The value to add to the number of levels.
+   */
+  private void adjustNumReactionsPerLevel(int level, int valueToAdd) {
+    if (numReactionsPerLevel.size() > level) {
+      numReactionsPerLevel.set(level, numReactionsPerLevel.get(level) + valueToAdd);
+    } else {
+      while (numReactionsPerLevel.size() < level) {
+        numReactionsPerLevel.add(0);
+      }
+      numReactionsPerLevel.add(valueToAdd);
+    }
+  }
 
-    /**
-     * Return the DOT (GraphViz) representation of the graph.
-     */
-    @Override
-    public String toDOT() {
-        var dotRepresentation = new CodeBuilder();
-        var edges = new StringBuilder();
+  /** Return the DOT (GraphViz) representation of the graph. */
+  @Override
+  public String toDOT() {
+    var dotRepresentation = new CodeBuilder();
+    var edges = new StringBuilder();
 
-        // Start the digraph with a left-write rank
-        dotRepresentation.pr(
+    // Start the digraph with a left-write rank
+    dotRepresentation.pr(
         """
         digraph {
             rankdir=LF;
@@ -392,49 +380,52 @@ public String toDOT() {
             edge [fontname=Times];
         """);
 
-        var nodes = nodes();
-        // Group nodes by levels
-        var groupedNodes =
-            nodes.stream()
-                 .collect(
-                     Collectors.groupingBy(it -> it.level)
-                 );
-
-        dotRepresentation.indent();
-        // For each level
-        for (var level : groupedNodes.keySet()) {
-            // Create a subgraph
-            dotRepresentation.pr("subgraph cluster_level_" + level + " {");
-            dotRepresentation.pr("    graph [compound=True, label = \"level " + level + "\"];");
-
-            // Get the nodes at the current level
-            var currentLevelNodes = groupedNodes.get(level);
-            for (var node: currentLevelNodes) {
-                // Draw the node
-                var label = CUtil.getName(node.getReaction().getParent().tpr) + "." + node.getReaction().getName();
-                // Need a positive number to name the nodes in GraphViz
-                var labelHashCode = label.hashCode() & 0xfffffff;
-                dotRepresentation.pr("    node_" + labelHashCode  + " [label=\""+ label +"\"];");
-
-                // Draw the edges
-                var downstreamNodes = getDownstreamAdjacentNodes(node);
-                for (var downstreamNode: downstreamNodes) {
-                    var downstreamLabel =  CUtil.getName(downstreamNode.getReaction().getParent().tpr) + "." + downstreamNode.getReaction().getName();
-                    edges.append("    node_" + labelHashCode + " -> node_" +
-                                     (downstreamLabel.hashCode() & 0xfffffff) + ";\n"
-                    );
-                }
-            }
-            // Close the subgraph
-            dotRepresentation.pr("}");
+    var nodes = nodes();
+    // Group nodes by levels
+    var groupedNodes = nodes.stream().collect(Collectors.groupingBy(it -> it.level));
+
+    dotRepresentation.indent();
+    // For each level
+    for (var level : groupedNodes.keySet()) {
+      // Create a subgraph
+      dotRepresentation.pr("subgraph cluster_level_" + level + " {");
+      dotRepresentation.pr("    graph [compound=True, label = \"level " + level + "\"];");
+
+      // Get the nodes at the current level
+      var currentLevelNodes = groupedNodes.get(level);
+      for (var node : currentLevelNodes) {
+        // Draw the node
+        var label =
+            CUtil.getName(node.getReaction().getParent().tpr) + "." + node.getReaction().getName();
+        // Need a positive number to name the nodes in GraphViz
+        var labelHashCode = label.hashCode() & 0xfffffff;
+        dotRepresentation.pr("    node_" + labelHashCode + " [label=\"" + label + "\"];");
+
+        // Draw the edges
+        var downstreamNodes = getDownstreamAdjacentNodes(node);
+        for (var downstreamNode : downstreamNodes) {
+          var downstreamLabel =
+              CUtil.getName(downstreamNode.getReaction().getParent().tpr)
+                  + "."
+                  + downstreamNode.getReaction().getName();
+          edges.append(
+              "    node_"
+                  + labelHashCode
+                  + " -> node_"
+                  + (downstreamLabel.hashCode() & 0xfffffff)
+                  + ";\n");
         }
-        dotRepresentation.unindent();
-        // Add the edges to the definition of the graph at the bottom
-        dotRepresentation.pr(edges);
-        // Close the digraph
-        dotRepresentation.pr("}");
-
-        // Return the DOT representation
-        return dotRepresentation.toString();
+      }
+      // Close the subgraph
+      dotRepresentation.pr("}");
     }
+    dotRepresentation.unindent();
+    // Add the edges to the definition of the graph at the bottom
+    dotRepresentation.pr(edges);
+    // Close the digraph
+    dotRepresentation.pr("}");
+
+    // Return the DOT representation
+    return dotRepresentation.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/ReactorInstance.java b/org.lflang/src/org/lflang/generator/ReactorInstance.java
index 5886b8907c..93dbfcfdd0 100644
--- a/org.lflang/src/org/lflang/generator/ReactorInstance.java
+++ b/org.lflang/src/org/lflang/generator/ReactorInstance.java
@@ -1,33 +1,33 @@
 /** A data structure for a reactor instance. */
 
 /*************
-Copyright (c) 2019-2022, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019-2022, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
-import static org.lflang.ast.ASTUtils.getLiteralTimeValue;
 import static org.lflang.AttributeUtils.isEnclave;
+import static org.lflang.ast.ASTUtils.getLiteralTimeValue;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,11 +38,10 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.AttributeUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.TriggerInstance.BuiltinTriggerVariable;
 import org.lflang.generator.c.TypeParameterizedReactor;
 import org.lflang.lf.Action;
@@ -69,1128 +68,1098 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.lf.WidthSpec;
 
 /**
- * Representation of a compile-time instance of a reactor.
- * If the reactor is instantiated as a bank of reactors, or if any
- * of its parents is instantiated as a bank of reactors, then one instance
- * of this ReactorInstance class represents all the runtime instances within
- * these banks.  The {@link #getTotalWidth()} method returns the number of such
- * runtime instances, which is the product of the bank width of this reactor
- * instance and the bank widths of all of its parents.
- * There is exactly one instance of this ReactorInstance class for each
- * graphical rendition of a reactor in the diagram view.
+ * Representation of a compile-time instance of a reactor. If the reactor is instantiated as a bank
+ * of reactors, or if any of its parents is instantiated as a bank of reactors, then one instance of
+ * this ReactorInstance class represents all the runtime instances within these banks. The {@link
+ * #getTotalWidth()} method returns the number of such runtime instances, which is the product of
+ * the bank width of this reactor instance and the bank widths of all of its parents. There is
+ * exactly one instance of this ReactorInstance class for each graphical rendition of a reactor in
+ * the diagram view.
  *
- * For the main reactor, which has no parent, once constructed,
- * this object represents the entire Lingua Franca program.
- * If the program has causality loops (a programming error), then
- * {@link #hasCycles()} will return true and {@link #getCycles()} will
- * return the ports and reaction instances involved in the cycles.
+ * <p>For the main reactor, which has no parent, once constructed, this object represents the entire
+ * Lingua Franca program. If the program has causality loops (a programming error), then {@link
+ * #hasCycles()} will return true and {@link #getCycles()} will return the ports and reaction
+ * instances involved in the cycles.
  *
  * @author Marten Lohstroh
  * @author Edward A. Lee
  */
 public class ReactorInstance extends NamedInstance<Instantiation> {
 
-    /**
-     * Create a new instantiation hierarchy that starts with the given top-level reactor.
-     * @param reactor The top-level reactor.
-     * @param reporter The error reporter.
-     */
-    public ReactorInstance(Reactor reactor, ErrorReporter reporter) {
-        this(ASTUtils.createInstantiation(reactor), null, reporter, -1);
+  /**
+   * Create a new instantiation hierarchy that starts with the given top-level reactor.
+   *
+   * @param reactor The top-level reactor.
+   * @param reporter The error reporter.
+   */
+  public ReactorInstance(Reactor reactor, ErrorReporter reporter) {
+    this(ASTUtils.createInstantiation(reactor), null, reporter, -1);
+  }
+
+  /**
+   * Create a new instantiation hierarchy that starts with the given top-level reactor but only
+   * creates contained reactors up to the specified depth.
+   *
+   * @param reactor The top-level reactor.
+   * @param reporter The error reporter.
+   * @param desiredDepth The depth to which to go, or -1 to construct the full hierarchy.
+   */
+  public ReactorInstance(Reactor reactor, ErrorReporter reporter, int desiredDepth) {
+    this(ASTUtils.createInstantiation(reactor), null, reporter, desiredDepth);
+  }
+
+  /**
+   * Create a new instantiation with the specified parent. This constructor is here to allow for
+   * unit tests. It should not be used for any other purpose.
+   *
+   * @param reactor The top-level reactor.
+   * @param parent The parent reactor instance.
+   * @param reporter The error reporter.
+   */
+  public ReactorInstance(Reactor reactor, ReactorInstance parent, ErrorReporter reporter) {
+    this(ASTUtils.createInstantiation(reactor), parent, reporter, -1);
+  }
+
+  //////////////////////////////////////////////////////
+  //// Public fields.
+
+  /** The action instances belonging to this reactor instance. */
+  public List<ActionInstance> actions = new ArrayList<>();
+
+  /**
+   * The contained reactor instances, in order of declaration. For banks of reactors, this includes
+   * both the bank definition Reactor (which has bankIndex == -2) followed by each of the bank
+   * members (which have bankIndex >= 0).
+   */
+  public final List<ReactorInstance> children = new ArrayList<>();
+
+  /** The input port instances belonging to this reactor instance. */
+  public final List<PortInstance> inputs = new ArrayList<>();
+
+  /** The output port instances belonging to this reactor instance. */
+  public final List<PortInstance> outputs = new ArrayList<>();
+
+  /** The parameters of this instance. */
+  public final List<ParameterInstance> parameters = new ArrayList<>();
+
+  /** List of reaction instances for this reactor instance. */
+  public final List<ReactionInstance> reactions = new ArrayList<>();
+
+  /** List of watchdog instances for this reactor instance. */
+  public final List<WatchdogInstance> watchdogs = new ArrayList<>();
+
+  /** The timer instances belonging to this reactor instance. */
+  public final List<TimerInstance> timers = new ArrayList<>();
+
+  /** The mode instances belonging to this reactor instance. */
+  public final List<ModeInstance> modes = new ArrayList<>();
+
+  /** The reactor declaration in the AST. This is either an import or Reactor declaration. */
+  public final ReactorDecl reactorDeclaration;
+
+  /** The reactor after imports are resolve. */
+  public final Reactor reactorDefinition;
+
+  /** Indicator that this reactor has itself as a parent, an error condition. */
+  public final boolean recursive;
+
+  // An enclave object if this ReactorInstance is an enclave. null if not
+  public EnclaveInfo enclaveInfo = null;
+  public TypeParameterizedReactor tpr;
+
+  //////////////////////////////////////////////////////
+  //// Public methods.
+
+  /**
+   * Assign levels to all reactions within the same root as this reactor. The level of a reaction r
+   * is equal to the length of the longest chain of reactions that must have the opportunity to
+   * execute before r at each logical tag. This fails and returns false if a causality cycle exists.
+   *
+   * <p>This method uses a variant of Kahn's algorithm, which is linear in V + E, where V is the
+   * number of vertices (reactions) and E is the number of edges (dependencies between reactions).
+   *
+   * @return An empty graph if successful and otherwise a graph with runtime reaction instances that
+   *     form cycles.
+   */
+  public ReactionInstanceGraph assignLevels() {
+    if (depth != 0) return root().assignLevels();
+    if (cachedReactionLoopGraph == null) {
+      cachedReactionLoopGraph = new ReactionInstanceGraph(this);
     }
-
-    /**
-     * Create a new instantiation hierarchy that starts with the given top-level reactor
-     * but only creates contained reactors up to the specified depth.
-     * @param reactor The top-level reactor.
-     * @param reporter The error reporter.
-     * @param desiredDepth The depth to which to go, or -1 to construct the full hierarchy.
-     */
-    public ReactorInstance(Reactor reactor, ErrorReporter reporter, int desiredDepth) {
-        this(ASTUtils.createInstantiation(reactor), null, reporter, desiredDepth);
+    return cachedReactionLoopGraph;
+  }
+
+  /**
+   * This function assigns/propagates deadlines through the Reaction Instance Graph. It performs
+   * Kahn's algorithm in reverse, starting from the leaf nodes and propagates deadlines upstream. To
+   * reduce cost, it should only be invoked when there are user-specified deadlines in the program.
+   *
+   * @return
+   */
+  public ReactionInstanceGraph assignDeadlines() {
+    if (depth != 0) return root().assignDeadlines();
+    if (cachedReactionLoopGraph == null) {
+      cachedReactionLoopGraph = new ReactionInstanceGraph(this);
     }
-
-    /**
-     * Create a new instantiation with the specified parent.
-     * This constructor is here to allow for unit tests.
-     * It should not be used for any other purpose.
-     * @param reactor The top-level reactor.
-     * @param parent The parent reactor instance.
-     * @param reporter The error reporter.
-     */
-    public ReactorInstance(Reactor reactor, ReactorInstance parent, ErrorReporter reporter) {
-        this(ASTUtils.createInstantiation(reactor), parent, reporter, -1);
+    cachedReactionLoopGraph.rebuildAndAssignDeadlines();
+    return cachedReactionLoopGraph;
+  }
+
+  /**
+   * Return the instance of a child rector created by the specified definition or null if there is
+   * none.
+   *
+   * @param definition The definition of the child reactor ("new" statement).
+   */
+  public ReactorInstance getChildReactorInstance(Instantiation definition) {
+    for (ReactorInstance child : this.children) {
+      if (child.definition == definition) {
+        return child;
+      }
     }
-
-    //////////////////////////////////////////////////////
-    //// Public fields.
-
-    /** The action instances belonging to this reactor instance. */
-    public List<ActionInstance> actions = new ArrayList<>();
-
-    /**
-     * The contained reactor instances, in order of declaration.
-     * For banks of reactors, this includes both the bank definition
-     * Reactor (which has bankIndex == -2) followed by each of the
-     * bank members (which have bankIndex >= 0).
-     */
-    public final List<ReactorInstance> children = new ArrayList<>();
-
-    /** The input port instances belonging to this reactor instance. */
-    public final List<PortInstance> inputs = new ArrayList<>();
-
-    /** The output port instances belonging to this reactor instance. */
-    public final List<PortInstance> outputs = new ArrayList<>();
-
-    /** The parameters of this instance. */
-    public final List<ParameterInstance> parameters = new ArrayList<>();
-
-    /** List of reaction instances for this reactor instance. */
-    public final List<ReactionInstance> reactions = new ArrayList<>();
-
-    /** List of watchdog instances for this reactor instance. */
-    public final List<WatchdogInstance> watchdogs = new ArrayList<>();
-
-    /** The timer instances belonging to this reactor instance. */
-    public final List<TimerInstance> timers = new ArrayList<>();
-
-    /** The mode instances belonging to this reactor instance. */
-    public final List<ModeInstance> modes = new ArrayList<>();
-
-    /** The reactor declaration in the AST. This is either an import or Reactor declaration. */
-    public final ReactorDecl reactorDeclaration;
-
-    /** The reactor after imports are resolve. */
-    public final Reactor reactorDefinition;
-
-    /** Indicator that this reactor has itself as a parent, an error condition. */
-    public final boolean recursive;
-
-    // An enclave object if this ReactorInstance is an enclave. null if not
-    public EnclaveInfo enclaveInfo = null;
-    public TypeParameterizedReactor tpr;
-
-    //////////////////////////////////////////////////////
-    //// Public methods.
-
-    /**
-     * Assign levels to all reactions within the same root as this
-     * reactor. The level of a reaction r is equal to the length of the
-     * longest chain of reactions that must have the opportunity to
-     * execute before r at each logical tag. This fails and returns
-     * false if a causality cycle exists.
-     *
-     * This method uses a variant of Kahn's algorithm, which is linear
-     * in V + E, where V is the number of vertices (reactions) and E
-     * is the number of edges (dependencies between reactions).
-     *
-     * @return An empty graph if successful and otherwise a graph
-     *  with runtime reaction instances that form cycles.
-     */
-    public ReactionInstanceGraph assignLevels() {
-        if (depth != 0) return root().assignLevels();
-        if (cachedReactionLoopGraph == null) {
-            cachedReactionLoopGraph = new ReactionInstanceGraph(this);
-        }
-        return cachedReactionLoopGraph;
+    return null;
+  }
+
+  /**
+   * Clear any cached data in this reactor and its children. This is useful if a mutation has been
+   * realized.
+   */
+  public void clearCaches() {
+    clearCaches(true);
+  }
+
+  /**
+   * Clear any cached data in this reactor and its children. This is useful if a mutation has been
+   * realized.
+   *
+   * @param includingRuntimes If false, leave the runtime instances of reactions intact. This is
+   *     useful for federated execution where levels are computed using the top-level connections,
+   *     but then those connections are discarded.
+   */
+  public void clearCaches(boolean includingRuntimes) {
+    if (includingRuntimes) cachedReactionLoopGraph = null;
+    for (ReactorInstance child : children) {
+      child.clearCaches(includingRuntimes);
     }
-
-    /**
-     * This function assigns/propagates deadlines through the Reaction Instance Graph.
-     * It performs Kahn's algorithm in reverse, starting from the leaf nodes and
-     * propagates deadlines upstream. To reduce cost, it should only be invoked when
-     * there are user-specified deadlines in the program.
-     * @return
-     */
-    public ReactionInstanceGraph assignDeadlines() {
-        if (depth != 0) return root().assignDeadlines();
-        if (cachedReactionLoopGraph == null) {
-            cachedReactionLoopGraph = new ReactionInstanceGraph(this);
-        }
-        cachedReactionLoopGraph.rebuildAndAssignDeadlines();
-        return cachedReactionLoopGraph;
+    for (PortInstance port : inputs) {
+      port.clearCaches();
     }
-
-    /**
-     * Return the instance of a child rector created by the specified
-     * definition or null if there is none.
-     * @param definition The definition of the child reactor ("new" statement).
-     */
-    public ReactorInstance getChildReactorInstance(Instantiation definition) {
-        for (ReactorInstance child : this.children) {
-            if (child.definition == definition) {
-                return child;
-            }
-        }
-        return null;
+    for (PortInstance port : outputs) {
+      port.clearCaches();
     }
-
-    /**
-     * Clear any cached data in this reactor and its children.
-     * This is useful if a mutation has been realized.
-     */
-    public void clearCaches() {
-        clearCaches(true);
+    for (ReactionInstance reaction : reactions) {
+      reaction.clearCaches(includingRuntimes);
     }
-
-    /**
-     * Clear any cached data in this reactor and its children.
-     * This is useful if a mutation has been realized.
-     * @param includingRuntimes If false, leave the runtime instances of reactions intact.
-     *  This is useful for federated execution where levels are computed using
-     *  the top-level connections, but then those connections are discarded.
-     */
-    public void clearCaches(boolean includingRuntimes) {
-        if (includingRuntimes) cachedReactionLoopGraph = null;
-        for (ReactorInstance child : children) {
-            child.clearCaches(includingRuntimes);
+    cachedCycles = null;
+  }
+
+  /**
+   * Return the set of ReactionInstance and PortInstance that form causality loops in the topmost
+   * parent reactor in the instantiation hierarchy. This will return an empty set if there are no
+   * causality loops.
+   */
+  public Set<NamedInstance<?>> getCycles() {
+    if (depth != 0) return root().getCycles();
+    if (cachedCycles != null) return cachedCycles;
+    cachedCycles = new LinkedHashSet<>();
+
+    ReactionInstanceGraph reactionRuntimes = assignLevels();
+    if (reactionRuntimes.nodes().size() > 0) {
+      Set<ReactionInstance> reactions = new LinkedHashSet<>();
+      Set<PortInstance> ports = new LinkedHashSet<>();
+      // There are cycles. But the nodes set includes not
+      // just the cycles, but also nodes that are downstream of the
+      // cycles.  Use Tarjan's algorithm to get just the cycles.
+      var cycleNodes = reactionRuntimes.getCycles();
+      for (var cycle : cycleNodes) {
+        for (ReactionInstance.Runtime runtime : cycle) {
+          reactions.add(runtime.getReaction());
         }
-        for (PortInstance port : inputs) {
-            port.clearCaches();
+      }
+      // Need to figure out which ports are involved in the cycles.
+      // It may not be all ports that depend on this reaction.
+      for (ReactionInstance r : reactions) {
+        for (TriggerInstance<? extends Variable> p : r.effects) {
+          if (p instanceof PortInstance) {
+            findPaths((PortInstance) p, reactions, ports);
+          }
         }
-        for (PortInstance port : outputs) {
-            port.clearCaches();
-        }
-        for (ReactionInstance reaction : reactions) {
-            reaction.clearCaches(includingRuntimes);
-        }
-        cachedCycles = null;
+      }
+      cachedCycles.addAll(reactions);
+      cachedCycles.addAll(ports);
     }
 
-    /**
-     * Return the set of ReactionInstance and PortInstance that form causality
-     * loops in the topmost parent reactor in the instantiation hierarchy. This will return an
-     * empty set if there are no causality loops.
-     */
-    public Set<NamedInstance<?>> getCycles() {
-        if (depth != 0) return root().getCycles();
-        if (cachedCycles != null) return cachedCycles;
-        cachedCycles = new LinkedHashSet<>();
-
-        ReactionInstanceGraph reactionRuntimes = assignLevels();
-        if (reactionRuntimes.nodes().size() > 0) {
-            Set<ReactionInstance> reactions = new LinkedHashSet<>();
-            Set<PortInstance> ports = new LinkedHashSet<>();
-            // There are cycles. But the nodes set includes not
-            // just the cycles, but also nodes that are downstream of the
-            // cycles.  Use Tarjan's algorithm to get just the cycles.
-            var cycleNodes = reactionRuntimes.getCycles();
-            for (var cycle : cycleNodes) {
-                for (ReactionInstance.Runtime runtime : cycle) {
-                    reactions.add(runtime.getReaction());
-                }
-            }
-            // Need to figure out which ports are involved in the cycles.
-            // It may not be all ports that depend on this reaction.
-            for (ReactionInstance r : reactions) {
-                for (TriggerInstance<? extends Variable> p : r.effects) {
-                    if (p instanceof PortInstance) {
-                        findPaths((PortInstance)p, reactions, ports);
-                    }
-                }
-            }
-            cachedCycles.addAll(reactions);
-            cachedCycles.addAll(ports);
-        }
-
-        return cachedCycles;
+    return cachedCycles;
+  }
+
+  /**
+   * Return the specified input by name or null if there is no such input.
+   *
+   * @param name The input name.
+   */
+  public PortInstance getInput(String name) {
+    for (PortInstance port : inputs) {
+      if (port.getName().equals(name)) {
+        return port;
+      }
     }
-
-    /**
-     * Return the specified input by name or null if there is no such input.
-     * @param name The input name.
-     */
-    public PortInstance getInput(String name) {
-        for (PortInstance port: inputs) {
-            if (port.getName().equals(name)) {
-                return port;
-            }
-        }
-        return null;
+    return null;
+  }
+
+  /**
+   * Override the base class to append [i_d], where d is the depth, if this reactor is in a bank of
+   * reactors.
+   *
+   * @return The name of this instance.
+   */
+  @Override
+  public String getName() {
+    return this.definition.getName();
+  }
+
+  /**
+   * @see NamedInstance#uniqueID()
+   *     <p>Append {@code _main} to the name of the main reactor to allow instantiations within that
+   *     reactor to have the same name.
+   */
+  @Override
+  public String uniqueID() {
+    if (this.isMainOrFederated()) {
+      if (reactorDefinition.isFederated() && !super.uniqueID().startsWith("federate__"))
+        return "federate__" + super.uniqueID() + "_main";
+      return super.uniqueID() + "_main";
     }
-
-    /**
-     * Override the base class to append [i_d], where d is the depth,
-     * if this reactor is in a bank of reactors.
-     * @return The name of this instance.
-     */
-    @Override
-    public String getName() {
-        return this.definition.getName();
+    return super.uniqueID();
+  }
+
+  /**
+   * Return the specified output by name or null if there is no such output.
+   *
+   * @param name The output name.
+   */
+  public PortInstance getOutput(String name) {
+    for (PortInstance port : outputs) {
+      if (port.getName().equals(name)) {
+        return port;
+      }
     }
-
-    /**
-     * @see NamedInstance#uniqueID()
-     *
-     * Append {@code _main} to the name of the main reactor to allow instantiations
-     * within that reactor to have the same name.
-     */
-    @Override
-    public String uniqueID() {
-       if (this.isMainOrFederated()) {
-           if (reactorDefinition.isFederated() && !super.uniqueID().startsWith("federate__")) return "federate__" + super.uniqueID() + "_main";
-           return super.uniqueID() + "_main";
-       }
-       return super.uniqueID();
+    return null;
+  }
+
+  /**
+   * Return a parameter matching the specified name if the reactor has one and otherwise return
+   * null.
+   *
+   * @param name The parameter name.
+   */
+  public ParameterInstance getParameter(String name) {
+    for (ParameterInstance parameter : parameters) {
+      if (parameter.getName().equals(name)) {
+        return parameter;
+      }
     }
-
-    /**
-     * Return the specified output by name or null if there is no such output.
-     * @param name The output name.
-     */
-    public PortInstance getOutput(String name) {
-        for (PortInstance port: outputs) {
-            if (port.getName().equals(name)) {
-                return port;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Return a parameter matching the specified name if the reactor has one
-     * and otherwise return null.
-     * @param name The parameter name.
-     */
-    public ParameterInstance getParameter(String name) {
-        for (ParameterInstance parameter: parameters) {
-            if (parameter.getName().equals(name)) {
-                return parameter;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Return the startup trigger or null if not used in any reaction.
-     */
-    public TriggerInstance<BuiltinTriggerVariable> getStartupTrigger() {
-        return builtinTriggers.get(BuiltinTrigger.STARTUP);
+    return null;
+  }
+
+  /** Return the startup trigger or null if not used in any reaction. */
+  public TriggerInstance<BuiltinTriggerVariable> getStartupTrigger() {
+    return builtinTriggers.get(BuiltinTrigger.STARTUP);
+  }
+
+  /** Return the shutdown trigger or null if not used in any reaction. */
+  public TriggerInstance<BuiltinTriggerVariable> getShutdownTrigger() {
+    return builtinTriggers.get(BuiltinTrigger.SHUTDOWN);
+  }
+
+  /**
+   * If this reactor is a bank or any of its parents is a bank, return the total number of runtime
+   * instances, which is the product of the widths of all the parents. Return -1 if the width cannot
+   * be determined.
+   */
+  public int getTotalWidth() {
+    return getTotalWidth(0);
+  }
+
+  /**
+   * If this reactor is a bank or any of its parents is a bank, return the total number of runtime
+   * instances, which is the product of the widths of all the parents. Return -1 if the width cannot
+   * be determined.
+   *
+   * @param atDepth The depth at which to determine the width. Use 0 to get the total number of
+   *     instances. Use 1 to get the number of instances within a single top-level bank member (this
+   *     is useful for federates).
+   */
+  public int getTotalWidth(int atDepth) {
+    if (width <= 0) return -1;
+    if (depth <= atDepth) return 1;
+    int result = width;
+    ReactorInstance p = parent;
+    while (p != null && p.depth > atDepth) {
+      if (p.width <= 0) return -1;
+      result *= p.width;
+      p = p.parent;
     }
-
-    /**
-     * Return the shutdown trigger or null if not used in any reaction.
-     */
-    public TriggerInstance<BuiltinTriggerVariable> getShutdownTrigger() {
-        return builtinTriggers.get(BuiltinTrigger.SHUTDOWN);
+    return result;
+  }
+
+  /**
+   * Return the trigger instances (input ports, timers, and actions that trigger reactions)
+   * belonging to this reactor instance.
+   */
+  public Set<TriggerInstance<? extends Variable>> getTriggers() {
+    // FIXME: Cache this.
+    var triggers = new LinkedHashSet<TriggerInstance<? extends Variable>>();
+    for (ReactionInstance reaction : this.reactions) {
+      triggers.addAll(reaction.triggers);
     }
-
-    /**
-     * If this reactor is a bank or any of its parents is a bank,
-     * return the total number of runtime instances, which is the product
-     * of the widths of all the parents.
-     * Return -1 if the width cannot be determined.
-     */
-    public int getTotalWidth() {
-        return getTotalWidth(0);
+    return triggers;
+  }
+
+  /**
+   * Return the trigger instances (input ports, timers, and actions that trigger reactions) together
+   * the ports that the reaction reads but that don't trigger it.
+   *
+   * @return The trigger instances belonging to this reactor instance.
+   */
+  public Set<TriggerInstance<? extends Variable>> getTriggersAndReads() {
+    // FIXME: Cache this.
+    var triggers = new LinkedHashSet<TriggerInstance<? extends Variable>>();
+    for (ReactionInstance reaction : this.reactions) {
+      triggers.addAll(reaction.triggers);
+      triggers.addAll(reaction.reads);
     }
+    return triggers;
+  }
+
+  /** Return true if the top-level parent of this reactor has causality cycles. */
+  public boolean hasCycles() {
+    return assignLevels().nodeCount() != 0;
+  }
+
+  /**
+   * Given a parameter definition for this reactor, return the initial integer value of the
+   * parameter. If the parameter is overridden when instantiating this reactor or any of its
+   * containing reactors, use that value. Otherwise, use the default value in the reactor
+   * definition. If the parameter cannot be found or its value is not an integer, return null.
+   *
+   * @param parameter The parameter definition (a syntactic object in the AST).
+   * @return An integer value or null.
+   */
+  public Integer initialIntParameterValue(Parameter parameter) {
+    return ASTUtils.initialValueInt(parameter, instantiations());
+  }
+
+  public Expression resolveParameters(Expression e) {
+    return LfExpressionVisitor.dispatch(e, this, ParameterInliner.INSTANCE);
+  }
+
+  private static final class ParameterInliner
+      extends LfExpressionVisitor.LfExpressionDeepCopyVisitor<ReactorInstance> {
+    static final ParameterInliner INSTANCE = new ParameterInliner();
 
-    /**
-     * If this reactor is a bank or any of its parents is a bank,
-     * return the total number of runtime instances, which is the product
-     * of the widths of all the parents.
-     * Return -1 if the width cannot be determined.
-     * @param atDepth The depth at which to determine the width.
-     *  Use 0 to get the total number of instances.
-     *  Use 1 to get the number of instances within a single top-level
-     *  bank member (this is useful for federates).
-     */
-    public int getTotalWidth(int atDepth) {
-        if (width <= 0) return -1;
-        if (depth <= atDepth) return 1;
-        int result = width;
-        ReactorInstance p = parent;
-        while (p != null && p.depth > atDepth) {
-            if (p.width <= 0) return -1;
-            result *= p.width;
-            p = p.parent;
+    @Override
+    public Expression visitParameterRef(ParameterReference expr, ReactorInstance instance) {
+      if (!ASTUtils.belongsTo(expr.getParameter(), instance.definition)) {
+        throw new IllegalArgumentException(
+            "Parameter "
+                + expr.getParameter().getName()
+                + " is not a parameter of reactor instance "
+                + instance.getName()
+                + ".");
+      }
+
+      Optional<Assignment> assignment =
+          instance.definition.getParameters().stream()
+              .filter(it -> it.getLhs().equals(expr.getParameter()))
+              .findAny(); // There is at most one
+
+      if (assignment.isPresent()) {
+        // replace the parameter with its value.
+        Expression value = ASTUtils.asSingleExpr(assignment.get().getRhs());
+        // recursively resolve parameters
+        return instance.getParent().resolveParameters(value);
+      } else {
+        // In that case use the default value. Default values
+        // cannot use parameter values, so they don't need to
+        // be recursively resolved.
+        Initializer init = expr.getParameter().getInit();
+        Expression defaultValue = ASTUtils.asSingleExpr(init);
+        if (defaultValue == null) {
+          // this is a problem
+          return super.visitParameterRef(expr, instance);
         }
-        return result;
+        return defaultValue;
+      }
     }
-
-    /**
-     * Return the trigger instances (input ports, timers, and actions
-     * that trigger reactions) belonging to this reactor instance.
-     */
-    public Set<TriggerInstance<? extends Variable>> getTriggers() {
-        // FIXME: Cache this.
-        var triggers = new LinkedHashSet<TriggerInstance<? extends Variable>>();
-        for (ReactionInstance reaction : this.reactions) {
-            triggers.addAll(reaction.triggers);
+  }
+
+  /**
+   * Return a list of Instantiation objects for evaluating parameter values. The first object in the
+   * list is the AST Instantiation that created this reactor instance, the second is the AST
+   * instantiation that created the containing reactor instance, and so on until there are no more
+   * containing reactor instances. This will return an empty list if this reactor instance is at the
+   * top level (is main).
+   */
+  public List<Instantiation> instantiations() {
+    if (_instantiations == null) {
+      _instantiations = new ArrayList<>();
+      if (definition != null) {
+        _instantiations.add(definition);
+        if (parent != null) {
+          _instantiations.addAll(parent.instantiations());
         }
-        return triggers;
+      }
     }
-
-    /**
-     * Return the trigger instances (input ports, timers, and actions
-     * that trigger reactions) together the ports that the reaction reads
-     * but that don't trigger it.
-     *
-     * @return The trigger instances belonging to this reactor instance.
-     */
-    public Set<TriggerInstance<? extends Variable>> getTriggersAndReads() {
-        // FIXME: Cache this.
-        var triggers = new LinkedHashSet<TriggerInstance<? extends Variable>>();
-        for (ReactionInstance reaction : this.reactions) {
-            triggers.addAll(reaction.triggers);
-            triggers.addAll(reaction.reads);
-        }
-        return triggers;
+    return _instantiations;
+  }
+
+  /**
+   * Returns true if this is a bank of reactors.
+   *
+   * @return true if a reactor is a bank, false otherwise
+   */
+  public boolean isBank() {
+    return definition.getWidthSpec() != null;
+  }
+
+  /**
+   * Returns whether this is a main or federated reactor.
+   *
+   * @return true if reactor definition is marked as main or federated, false otherwise.
+   */
+  public boolean isMainOrFederated() {
+    return reactorDefinition != null
+        && (reactorDefinition.isMain() || reactorDefinition.isFederated());
+  }
+
+  /**
+   * Return true if the specified reactor instance is either equal to this reactor instance or a
+   * parent of it.
+   *
+   * @param r The reactor instance.
+   */
+  public boolean isParent(ReactorInstance r) {
+    ReactorInstance p = this;
+    while (p != null) {
+      if (p == r) return true;
+      p = p.getParent();
     }
-
-    /**
-     * Return true if the top-level parent of this reactor has causality cycles.
-     */
-    public boolean hasCycles() {
-        return assignLevels().nodeCount() != 0;
+    return false;
+  }
+
+  ///////////////////////////////////////////////////
+  //// Methods for finding instances in this reactor given an AST node.
+
+  /**
+   * Return the action instance within this reactor instance corresponding to the specified action
+   * reference.
+   *
+   * @param action The action as an AST node.
+   * @return The corresponding action instance or null if the action does not belong to this
+   *     reactor.
+   */
+  public ActionInstance lookupActionInstance(Action action) {
+    for (ActionInstance actionInstance : actions) {
+      if (actionInstance.definition == action) {
+        return actionInstance;
+      }
     }
-
-    /**
-     * Given a parameter definition for this reactor, return the initial integer
-     * value of the parameter. If the parameter is overridden when instantiating
-     * this reactor or any of its containing reactors, use that value.
-     * Otherwise, use the default value in the reactor definition.
-     * If the parameter cannot be found or its value is not an integer, return null.
-     *
-     * @param parameter The parameter definition (a syntactic object in the AST).
-     *
-     * @return An integer value or null.
-     */
-    public Integer initialIntParameterValue(Parameter parameter) {
-        return ASTUtils.initialValueInt(parameter, instantiations());
+    return null;
+  }
+
+  /**
+   * Given a parameter definition, return the parameter instance corresponding to that definition,
+   * or null if there is no such instance.
+   *
+   * @param parameter The parameter definition (a syntactic object in the AST).
+   * @return A parameter instance, or null if there is none.
+   */
+  public ParameterInstance lookupParameterInstance(Parameter parameter) {
+    for (ParameterInstance param : parameters) {
+      if (param.definition == parameter) {
+        return param;
+      }
     }
-
-    public Expression resolveParameters(Expression e) {
-        return LfExpressionVisitor.dispatch(e, this, ParameterInliner.INSTANCE);
+    return null;
+  }
+
+  /**
+   * Given a port definition, return the port instance corresponding to that definition, or null if
+   * there is no such instance.
+   *
+   * @param port The port definition (a syntactic object in the AST).
+   * @return A port instance, or null if there is none.
+   */
+  public PortInstance lookupPortInstance(Port port) {
+    // Search one of the inputs and outputs sets.
+    List<PortInstance> ports = null;
+    if (port instanceof Input) {
+      ports = this.inputs;
+    } else if (port instanceof Output) {
+      ports = this.outputs;
     }
-
-
-    private static final class ParameterInliner extends LfExpressionVisitor.LfExpressionDeepCopyVisitor<ReactorInstance> {
-        static final ParameterInliner INSTANCE = new ParameterInliner();
-
-        @Override
-        public Expression visitParameterRef(ParameterReference expr, ReactorInstance instance) {
-            if (!ASTUtils.belongsTo(expr.getParameter(), instance.definition)) {
-                throw new IllegalArgumentException("Parameter "
-                    + expr.getParameter().getName()
-                    + " is not a parameter of reactor instance "
-                    + instance.getName()
-                    + "."
-                );
-            }
-
-            Optional<Assignment> assignment =
-                instance.definition.getParameters().stream()
-                    .filter(it -> it.getLhs().equals(expr.getParameter()))
-                    .findAny(); // There is at most one
-
-            if (assignment.isPresent()) {
-                // replace the parameter with its value.
-                Expression value = ASTUtils.asSingleExpr(assignment.get().getRhs());
-                // recursively resolve parameters
-                return instance.getParent().resolveParameters(value);
-            } else {
-                // In that case use the default value. Default values
-                // cannot use parameter values, so they don't need to
-                // be recursively resolved.
-                Initializer init = expr.getParameter().getInit();
-                Expression defaultValue = ASTUtils.asSingleExpr(init);
-                if (defaultValue == null) {
-                    // this is a problem
-                    return super.visitParameterRef(expr, instance);
-                }
-                return defaultValue;
-            }
-        }
+    for (PortInstance portInstance : ports) {
+      if (portInstance.definition == port) {
+        return portInstance;
+      }
     }
-
-    /**
-     * Return a list of Instantiation objects for evaluating parameter
-     * values.  The first object in the list is the AST Instantiation
-     * that created this reactor instance, the second is the AST instantiation
-     * that created the containing reactor instance, and so on until there
-     * are no more containing reactor instances. This will return an empty
-     * list if this reactor instance is at the top level (is main).
-     */
-    public List<Instantiation> instantiations() {
-        if (_instantiations == null) {
-            _instantiations = new ArrayList<>();
-            if (definition != null) {
-                _instantiations.add(definition);
-                if (parent != null) {
-                    _instantiations.addAll(parent.instantiations());
-                }
-            }
-        }
-        return _instantiations;
+    return null;
+  }
+
+  /**
+   * Given a reference to a port belonging to this reactor instance, return the port instance.
+   * Return null if there is no such instance.
+   *
+   * @param reference The port reference.
+   * @return A port instance, or null if there is none.
+   */
+  public PortInstance lookupPortInstance(VarRef reference) {
+    if (!(reference.getVariable() instanceof Port)) {
+      // Trying to resolve something that is not a port
+      return null;
     }
-
-    /**
-     * Returns true if this is a bank of reactors.
-     * @return true if a reactor is a bank, false otherwise
-     */
-    public boolean isBank() {
-        return definition.getWidthSpec() != null;
+    if (reference.getContainer() == null) {
+      // Handle local reference
+      return lookupPortInstance((Port) reference.getVariable());
+    } else {
+      // Handle hierarchical reference
+      var containerInstance = getChildReactorInstance(reference.getContainer());
+      if (containerInstance == null) return null;
+      return containerInstance.lookupPortInstance((Port) reference.getVariable());
     }
-
-    /**
-     * Returns whether this is a main or federated reactor.
-     * @return true if reactor definition is marked as main or federated, false otherwise.
-     */
-    public boolean isMainOrFederated() {
-        return reactorDefinition != null
-                && (reactorDefinition.isMain() || reactorDefinition.isFederated());
+  }
+
+  /**
+   * Return the reaction instance within this reactor instance corresponding to the specified
+   * reaction.
+   *
+   * @param reaction The reaction as an AST node.
+   * @return The corresponding reaction instance or null if the reaction does not belong to this
+   *     reactor.
+   */
+  public ReactionInstance lookupReactionInstance(Reaction reaction) {
+    for (ReactionInstance reactionInstance : reactions) {
+      if (reactionInstance.definition == reaction) {
+        return reactionInstance;
+      }
     }
-
-    /**
-     * Return true if the specified reactor instance is either equal to this
-     * reactor instance or a parent of it.
-     * @param r The reactor instance.
-     */
-    public boolean isParent(ReactorInstance r) {
-        ReactorInstance p = this;
-        while (p != null) {
-            if (p == r) return true;
-            p = p.getParent();
-        }
-        return false;
+    return null;
+  }
+
+  /**
+   * Return the reactor instance within this reactor that has the specified instantiation. Note that
+   * this may be a bank of reactors. Return null if there is no such reactor instance.
+   */
+  public ReactorInstance lookupReactorInstance(Instantiation instantiation) {
+    for (ReactorInstance reactorInstance : children) {
+      if (reactorInstance.definition == instantiation) {
+        return reactorInstance;
+      }
     }
-
-    ///////////////////////////////////////////////////
-    //// Methods for finding instances in this reactor given an AST node.
-
-    /**
-     * Return the action instance within this reactor
-     * instance corresponding to the specified action reference.
-     * @param action The action as an AST node.
-     * @return The corresponding action instance or null if the
-     *  action does not belong to this reactor.
-     */
-    public ActionInstance lookupActionInstance(Action action) {
-        for (ActionInstance actionInstance : actions) {
-            if (actionInstance.definition == action) {
-                return actionInstance;
-            }
-        }
-        return null;
+    return null;
+  }
+
+  /**
+   * Return the timer instance within this reactor instance corresponding to the specified timer
+   * reference.
+   *
+   * @param timer The timer as an AST node.
+   * @return The corresponding timer instance or null if the timer does not belong to this reactor.
+   */
+  public TimerInstance lookupTimerInstance(Timer timer) {
+    for (TimerInstance timerInstance : timers) {
+      if (timerInstance.definition == timer) {
+        return timerInstance;
+      }
     }
-
-    /**
-     * Given a parameter definition, return the parameter instance
-     * corresponding to that definition, or null if there is
-     * no such instance.
-     * @param parameter The parameter definition (a syntactic object in the AST).
-     * @return A parameter instance, or null if there is none.
-     */
-    public ParameterInstance lookupParameterInstance(Parameter parameter) {
-        for (ParameterInstance param : parameters) {
-            if (param.definition == parameter) {
-                return param;
-            }
-        }
-        return null;
+    return null;
+  }
+
+  /**
+   * Returns the mode instance within this reactor instance corresponding to the specified mode
+   * reference.
+   *
+   * @param mode The mode as an AST node.
+   * @return The corresponding mode instance or null if the mode does not belong to this reactor.
+   */
+  public ModeInstance lookupModeInstance(Mode mode) {
+    for (ModeInstance modeInstance : modes) {
+      if (modeInstance.definition == mode) {
+        return modeInstance;
+      }
     }
-
-    /**
-     * Given a port definition, return the port instance
-     * corresponding to that definition, or null if there is
-     * no such instance.
-     * @param port The port definition (a syntactic object in the AST).
-     * @return A port instance, or null if there is none.
-     */
-    public PortInstance lookupPortInstance(Port port) {
-        // Search one of the inputs and outputs sets.
-        List<PortInstance> ports = null;
-        if (port instanceof Input) {
-            ports = this.inputs;
-        } else if (port instanceof Output) {
-            ports = this.outputs;
-        }
-        for (PortInstance portInstance : ports) {
-            if (portInstance.definition == port) {
-                return portInstance;
-            }
+    return null;
+  }
+
+  /** Return a descriptive string. */
+  @Override
+  public String toString() {
+    return "ReactorInstance " + getFullName();
+  }
+
+  /**
+   * Assuming that the given expression denotes a valid time, return a time value.
+   *
+   * <p>If the value is given as a parameter reference, this will look up the precise time value
+   * assigned to this reactor instance.
+   */
+  public TimeValue getTimeValue(Expression expr) {
+    Expression resolved = resolveParameters(expr);
+    return getLiteralTimeValue(resolved);
+  }
+
+  //////////////////////////////////////////////////////
+  //// Protected fields.
+
+  /** The generator that created this reactor instance. */
+  protected ErrorReporter reporter; // FIXME: This accumulates a lot of redundant references
+
+  /** The map of used built-in triggers. */
+  protected Map<BuiltinTrigger, TriggerInstance<BuiltinTriggerVariable>> builtinTriggers =
+      new HashMap<>();
+
+  /**
+   * The LF syntax does not currently support declaring reactions unordered, but unordered reactions
+   * are created in the AST transformations handling federated communication and after delays.
+   * Unordered reactions can execute in any order and concurrently even though they are in the same
+   * reactor. FIXME: Remove this when the language provides syntax.
+   */
+  protected Set<Reaction> unorderedReactions = new LinkedHashSet<>();
+
+  /** The nested list of instantiations that created this reactor instance. */
+  protected List<Instantiation> _instantiations;
+
+  //////////////////////////////////////////////////////
+  //// Protected methods.
+
+  /**
+   * Create all the reaction instances of this reactor instance and record the dependencies and
+   * antidependencies between ports, actions, and timers and reactions. This also records the
+   * dependencies between reactions that follows from the order in which they are defined.
+   */
+  protected void createReactionInstances() {
+    List<Reaction> reactions = ASTUtils.allReactions(reactorDefinition);
+    if (reactions != null) {
+      int count = 0;
+
+      // Check for startup and shutdown triggers.
+      for (Reaction reaction : reactions) {
+        if (AttributeUtils.isUnordered(reaction)) {
+          unorderedReactions.add(reaction);
         }
-        return null;
+        // Create the reaction instance.
+        var reactionInstance =
+            new ReactionInstance(reaction, this, unorderedReactions.contains(reaction), count++);
+
+        // Add the reaction instance to the map of reactions for this
+        // reactor.
+        this.reactions.add(reactionInstance);
+      }
     }
-
-    /**
-     * Given a reference to a port belonging to this reactor
-     * instance, return the port instance.
-     * Return null if there is no such instance.
-     * @param reference The port reference.
-     * @return A port instance, or null if there is none.
-     */
-    public PortInstance lookupPortInstance(VarRef reference) {
-        if (!(reference.getVariable() instanceof Port)) {
-            // Trying to resolve something that is not a port
-            return null;
-        }
-        if (reference.getContainer() == null) {
-            // Handle local reference
-            return lookupPortInstance((Port) reference.getVariable());
-        } else {
-            // Handle hierarchical reference
-            var containerInstance = getChildReactorInstance(reference.getContainer());
-            if (containerInstance == null) return null;
-            return containerInstance.lookupPortInstance((Port) reference.getVariable());
-        }
+  }
+
+  /** Returns the built-in trigger or create a new one if none exists. */
+  protected TriggerInstance<BuiltinTriggerVariable> getOrCreateBuiltinTrigger(
+      BuiltinTriggerRef trigger) {
+    return builtinTriggers.computeIfAbsent(
+        trigger.getType(), ref -> TriggerInstance.builtinTrigger(trigger, this));
+  }
+
+  /** Create all the watchdog instances of this reactor instance. */
+  protected void createWatchdogInstances() {
+    List<Watchdog> watchdogs = ASTUtils.allWatchdogs(reactorDefinition);
+    if (watchdogs != null) {
+      for (Watchdog watchdog : watchdogs) {
+        // Create the watchdog instance.
+        var watchdogInstance = new WatchdogInstance(watchdog, this);
+
+        // Add the watchdog instance to the list of watchdogs for this
+        // reactor.
+        this.watchdogs.add(watchdogInstance);
+      }
     }
-
-    /**
-     * Return the reaction instance within this reactor
-     * instance corresponding to the specified reaction.
-     * @param reaction The reaction as an AST node.
-     * @return The corresponding reaction instance or null if the
-     *  reaction does not belong to this reactor.
-     */
-    public ReactionInstance lookupReactionInstance(Reaction reaction) {
-        for (ReactionInstance reactionInstance : reactions) {
-            if (reactionInstance.definition == reaction) {
-                return reactionInstance;
-            }
-        }
-        return null;
+  }
+
+  ////////////////////////////////////////
+  //// Private constructors
+
+  /**
+   * Create a runtime instance from the specified definition and with the specified parent that
+   * instantiated it.
+   *
+   * @param definition The instantiation statement in the AST.
+   * @param parent The parent, or null for the main rector.
+   * @param reporter An error reporter.
+   * @param desiredDepth The depth to which to expand the hierarchy.
+   */
+  public ReactorInstance(
+      Instantiation definition, ReactorInstance parent, ErrorReporter reporter, int desiredDepth) {
+    super(definition, parent);
+    this.reporter = reporter;
+    this.reactorDeclaration = definition.getReactorClass();
+    this.reactorDefinition = ASTUtils.toDefinition(reactorDeclaration);
+    this.tpr = new TypeParameterizedReactor(definition);
+
+    if (isEnclave(definition) || this.isMainOrFederated()) {
+      enclaveInfo = new EnclaveInfo(this);
     }
 
-    /**
-     * Return the reactor instance within this reactor
-     * that has the specified instantiation. Note that this
-     * may be a bank of reactors. Return null if there
-     * is no such reactor instance.
-     */
-    public ReactorInstance lookupReactorInstance(Instantiation instantiation) {
-        for (ReactorInstance reactorInstance : children) {
-            if (reactorInstance.definition == instantiation) {
-                return reactorInstance;
-            }
+    // check for recursive instantiation
+    var currentParent = parent;
+    var foundSelfAsParent = false;
+    do {
+      if (currentParent != null) {
+        if (currentParent.reactorDefinition == this.reactorDefinition) {
+          foundSelfAsParent = true;
+          currentParent = null; // break
+        } else {
+          currentParent = currentParent.parent;
         }
-        return null;
-    }
+      }
+    } while (currentParent != null);
 
-    /**
-     * Return the timer instance within this reactor
-     * instance corresponding to the specified timer reference.
-     * @param timer The timer as an AST node.
-     * @return The corresponding timer instance or null if the
-     *  timer does not belong to this reactor.
-     */
-    public TimerInstance lookupTimerInstance(Timer timer) {
-        for (TimerInstance timerInstance : timers) {
-            if (timerInstance.definition == timer) {
-                return timerInstance;
-            }
-        }
-        return null;
+    this.recursive = foundSelfAsParent;
+    if (recursive) {
+      reporter.reportError(definition, "Recursive reactor instantiation.");
     }
 
-    /** Returns the mode instance within this reactor
-     *  instance corresponding to the specified mode reference.
-     *  @param mode The mode as an AST node.
-     *  @return The corresponding mode instance or null if the
-     *   mode does not belong to this reactor.
-     */
-    public ModeInstance lookupModeInstance(Mode mode) {
-        for (ModeInstance modeInstance : modes) {
-            if (modeInstance.definition == mode) {
-                return modeInstance;
-            }
-        }
-        return null;
+    // If the reactor definition is null, give up here. Otherwise, diagram generation
+    // will fail an NPE.
+    if (reactorDefinition == null) {
+      reporter.reportError(definition, "Reactor instantiation has no matching reactor definition.");
+      return;
     }
 
-    /**
-     * Return a descriptive string.
-     */
-    @Override
-    public String toString() {
-        return "ReactorInstance " + getFullName();
-    }
+    setInitialWidth();
 
-    /**
-     * Assuming that the given expression denotes a valid time, return a time value.
-     *
-     * If the value is given as a parameter reference, this will look up the
-     * precise time value assigned to this reactor instance.
-     */
-    public TimeValue getTimeValue(Expression expr) {
-        Expression resolved = resolveParameters(expr);
-        return getLiteralTimeValue(resolved);
+    // Apply overrides and instantiate parameters for this reactor instance.
+    for (Parameter parameter : ASTUtils.allParameters(reactorDefinition)) {
+      this.parameters.add(new ParameterInstance(parameter, this));
     }
 
-    //////////////////////////////////////////////////////
-    //// Protected fields.
-
-    /** The generator that created this reactor instance. */
-    protected ErrorReporter reporter; // FIXME: This accumulates a lot of redundant references
-
-    /** The map of used built-in triggers. */
-    protected Map<BuiltinTrigger, TriggerInstance<BuiltinTriggerVariable>> builtinTriggers = new HashMap<>();
-
-    /**
-     * The LF syntax does not currently support declaring reactions unordered,
-     * but unordered reactions are created in the AST transformations handling
-     * federated communication and after delays. Unordered reactions can execute
-     * in any order and concurrently even though they are in the same reactor.
-     * FIXME: Remove this when the language provides syntax.
-     */
-    protected Set<Reaction> unorderedReactions = new LinkedHashSet<>();
-
-    /** The nested list of instantiations that created this reactor instance. */
-    protected List<Instantiation> _instantiations;
-
-    //////////////////////////////////////////////////////
-    //// Protected methods.
-
-    /**
-     * Create all the reaction instances of this reactor instance
-     * and record the dependencies and antidependencies
-     * between ports, actions, and timers and reactions.
-     * This also records the dependencies between reactions
-     * that follows from the order in which they are defined.
-     */
-    protected void createReactionInstances() {
-        List<Reaction> reactions = ASTUtils.allReactions(reactorDefinition);
-        if (reactions != null) {
-            int count = 0;
-
-            // Check for startup and shutdown triggers.
-            for (Reaction reaction : reactions) {
-                if (AttributeUtils.isUnordered(reaction)) {
-                    unorderedReactions.add(reaction);
-                }
-                // Create the reaction instance.
-                var reactionInstance = new ReactionInstance(reaction, this,
-                    unorderedReactions.contains(reaction), count++);
-
-                // Add the reaction instance to the map of reactions for this
-                // reactor.
-                this.reactions.add(reactionInstance);
-            }
-        }
+    // Instantiate inputs for this reactor instance
+    for (Input inputDecl : ASTUtils.allInputs(reactorDefinition)) {
+      this.inputs.add(new PortInstance(inputDecl, this, reporter));
     }
 
-    /**
-     * Returns the built-in trigger or create a new one if none exists.
-     */
-    protected TriggerInstance<BuiltinTriggerVariable> getOrCreateBuiltinTrigger(BuiltinTriggerRef trigger) {
-        return builtinTriggers.computeIfAbsent(trigger.getType(), ref -> TriggerInstance.builtinTrigger(trigger, this));
+    // Instantiate outputs for this reactor instance
+    for (Output outputDecl : ASTUtils.allOutputs(reactorDefinition)) {
+      this.outputs.add(new PortInstance(outputDecl, this, reporter));
     }
 
-    /** Create all the watchdog instances of this reactor instance. */
-    protected void createWatchdogInstances() {
-        List<Watchdog> watchdogs = ASTUtils.allWatchdogs(reactorDefinition);
-        if (watchdogs != null) {
-            for (Watchdog watchdog : watchdogs) {
-                // Create the watchdog instance.
-                var watchdogInstance = new WatchdogInstance(watchdog, this);
-
-                // Add the watchdog instance to the list of watchdogs for this
-                // reactor.
-                this.watchdogs.add(watchdogInstance);
-            }
-        }
+    // Do not process content (except interface above) if recursive
+    if (!recursive && (desiredDepth < 0 || this.depth < desiredDepth)) {
+      // Instantiate children for this reactor instance.
+      // While doing this, assign an index offset to each.
+      for (Instantiation child : ASTUtils.allInstantiations(reactorDefinition)) {
+        var childInstance = new ReactorInstance(child, this, reporter, desiredDepth);
+        this.children.add(childInstance);
+      }
+
+      // Instantiate timers for this reactor instance
+      for (Timer timerDecl : ASTUtils.allTimers(reactorDefinition)) {
+        this.timers.add(new TimerInstance(timerDecl, this));
+      }
+
+      // Instantiate actions for this reactor instance
+      for (Action actionDecl : ASTUtils.allActions(reactorDefinition)) {
+        this.actions.add(new ActionInstance(actionDecl, this));
+      }
+
+      establishPortConnections();
+
+      // Create the reaction instances in this reactor instance.
+      // This also establishes all the implied dependencies.
+      // Note that this can only happen _after_ the children,
+      // port, action, and timer instances have been created.
+      createReactionInstances();
+
+      // Instantiate modes for this reactor instance
+      // This must come after the child elements (reactions, etc) of this reactor
+      // are created in order to allow their association with modes
+      for (Mode modeDecl : ASTUtils.allModes(reactorDefinition)) {
+        this.modes.add(new ModeInstance(modeDecl, this));
+      }
+      for (ModeInstance mode : this.modes) {
+        mode.setupTranstions();
+      }
     }
-
-    ////////////////////////////////////////
-    //// Private constructors
-
-    /**
-     * Create a runtime instance from the specified definition
-     * and with the specified parent that instantiated it.
-     * @param definition The instantiation statement in the AST.
-     * @param parent The parent, or null for the main rector.
-     * @param reporter An error reporter.
-     * @param desiredDepth The depth to which to expand the hierarchy.
-     */
-    public ReactorInstance(
-        Instantiation definition,
-        ReactorInstance parent,
-        ErrorReporter reporter,
-        int desiredDepth) {
-        super(definition, parent);
-        this.reporter = reporter;
-        this.reactorDeclaration = definition.getReactorClass();
-        this.reactorDefinition = ASTUtils.toDefinition(reactorDeclaration);
-        this.tpr = new TypeParameterizedReactor(definition);
-
-        if (isEnclave(definition) || this.isMainOrFederated()) {
-            enclaveInfo = new EnclaveInfo(this);
-        }
-
-        // check for recursive instantiation
-        var currentParent = parent;
-        var foundSelfAsParent = false;
-        do {
-            if (currentParent != null) {
-                if (currentParent.reactorDefinition == this.reactorDefinition) {
-                    foundSelfAsParent = true;
-                    currentParent = null; // break
-                } else {
-                    currentParent = currentParent.parent;
-                }
-            }
-        } while(currentParent != null);
-
-        this.recursive = foundSelfAsParent;
-        if (recursive) {
-            reporter.reportError(definition, "Recursive reactor instantiation.");
-        }
-
-        // If the reactor definition is null, give up here. Otherwise, diagram generation
-        // will fail an NPE.
-        if (reactorDefinition == null) {
-            reporter.reportError(definition, "Reactor instantiation has no matching reactor definition.");
-            return;
-        }
-
-        setInitialWidth();
-
-        // Apply overrides and instantiate parameters for this reactor instance.
-        for (Parameter parameter : ASTUtils.allParameters(reactorDefinition)) {
-            this.parameters.add(new ParameterInstance(parameter, this));
+  }
+
+  public TypeParameterizedReactor getTypeParameterizedReactor() {
+    return this.tpr;
+  }
+
+  //////////////////////////////////////////////////////
+  //// Private methods.
+
+  /**
+   * Connect the given left port range to the given right port range.
+   *
+   * <p>NOTE: This method is public to enable its use in unit tests. Otherwise, it should be
+   * private. This is why it is defined here, in the section labeled "Private methods."
+   *
+   * @param src The source range.
+   * @param dst The destination range.
+   * @param connection The connection establishing this relationship.
+   */
+  public static void connectPortInstances(
+      RuntimeRange<PortInstance> src, RuntimeRange<PortInstance> dst, Connection connection) {
+    SendRange range = new SendRange(src, dst, src._interleaved, connection);
+    src.instance.dependentPorts.add(range);
+    dst.instance.dependsOnPorts.add(src);
+  }
+
+  /**
+   * Populate connectivity information in the port instances. Note that this can only happen _after_
+   * the children and port instances have been created. Unfortunately, we have to do some
+   * complicated things here to support multiport-to-multiport, multiport-to-bank, and
+   * bank-to-multiport communication. The principle being followed is: in each connection statement,
+   * for each port instance on the left, connect to the next available port on the right.
+   */
+  private void establishPortConnections() {
+    for (Connection connection : ASTUtils.allConnections(reactorDefinition)) {
+      List<RuntimeRange<PortInstance>> leftPorts =
+          listPortInstances(connection.getLeftPorts(), connection);
+      Iterator<RuntimeRange<PortInstance>> srcRanges = leftPorts.iterator();
+      List<RuntimeRange<PortInstance>> rightPorts =
+          listPortInstances(connection.getRightPorts(), connection);
+      Iterator<RuntimeRange<PortInstance>> dstRanges = rightPorts.iterator();
+
+      // Check for empty lists.
+      if (!srcRanges.hasNext()) {
+        if (dstRanges.hasNext()) {
+          reporter.reportWarning(connection, "No sources to provide inputs.");
         }
-
-        // Instantiate inputs for this reactor instance
-        for (Input inputDecl : ASTUtils.allInputs(reactorDefinition)) {
-            this.inputs.add(new PortInstance(inputDecl, this, reporter));
-        }
-
-        // Instantiate outputs for this reactor instance
-        for (Output outputDecl : ASTUtils.allOutputs(reactorDefinition)) {
-            this.outputs.add(new PortInstance(outputDecl, this, reporter));
-        }
-
-        // Do not process content (except interface above) if recursive
-        if (!recursive && (desiredDepth < 0 || this.depth < desiredDepth)) {
-            // Instantiate children for this reactor instance.
-            // While doing this, assign an index offset to each.
-            for (Instantiation child : ASTUtils.allInstantiations(reactorDefinition)) {
-                var childInstance = new ReactorInstance(
-                    child,
-                    this,
-                    reporter,
-                    desiredDepth
-                );
-                this.children.add(childInstance);
-            }
-
-            // Instantiate timers for this reactor instance
-            for (Timer timerDecl : ASTUtils.allTimers(reactorDefinition)) {
-                this.timers.add(new TimerInstance(timerDecl, this));
+        return;
+      } else if (!dstRanges.hasNext()) {
+        reporter.reportWarning(connection, "No destination. Outputs will be lost.");
+        return;
+      }
+
+      RuntimeRange<PortInstance> src = srcRanges.next();
+      RuntimeRange<PortInstance> dst = dstRanges.next();
+
+      while (true) {
+        if (dst.width == src.width) {
+          connectPortInstances(src, dst, connection);
+          if (!dstRanges.hasNext()) {
+            if (srcRanges.hasNext()) {
+              // Should not happen (checked by the validator).
+              reporter.reportWarning(
+                  connection, "Source is wider than the destination. Outputs will be lost.");
             }
-
-            // Instantiate actions for this reactor instance
-            for (Action actionDecl : ASTUtils.allActions(reactorDefinition)) {
-                this.actions.add(new ActionInstance(actionDecl, this));
-            }
-
-            establishPortConnections();
-
-            // Create the reaction instances in this reactor instance.
-            // This also establishes all the implied dependencies.
-            // Note that this can only happen _after_ the children,
-            // port, action, and timer instances have been created.
-            createReactionInstances();
-
-            // Instantiate modes for this reactor instance
-            // This must come after the child elements (reactions, etc) of this reactor
-            // are created in order to allow their association with modes
-            for (Mode modeDecl : ASTUtils.allModes(reactorDefinition)) {
-                this.modes.add(new ModeInstance(modeDecl, this));
+            break;
+          }
+          if (!srcRanges.hasNext()) {
+            if (connection.isIterated()) {
+              srcRanges = leftPorts.iterator();
+            } else {
+              if (dstRanges.hasNext()) {
+                // Should not happen (checked by the validator).
+                reporter.reportWarning(
+                    connection, "Destination is wider than the source. Inputs will be missing.");
+              }
+              break;
             }
-            for (ModeInstance mode : this.modes) {
-                mode.setupTranstions();
+          }
+          dst = dstRanges.next();
+          src = srcRanges.next();
+        } else if (dst.width < src.width) {
+          // Split the left (src) range in two.
+          connectPortInstances(src.head(dst.width), dst, connection);
+          src = src.tail(dst.width);
+          if (!dstRanges.hasNext()) {
+            // Should not happen (checked by the validator).
+            reporter.reportWarning(
+                connection, "Source is wider than the destination. Outputs will be lost.");
+            break;
+          }
+          dst = dstRanges.next();
+        } else if (src.width < dst.width) {
+          // Split the right (dst) range in two.
+          connectPortInstances(src, dst.head(src.width), connection);
+          dst = dst.tail(src.width);
+          if (!srcRanges.hasNext()) {
+            if (connection.isIterated()) {
+              srcRanges = leftPorts.iterator();
+            } else {
+              reporter.reportWarning(
+                  connection, "Destination is wider than the source. Inputs will be missing.");
+              break;
             }
+          }
+          src = srcRanges.next();
         }
+      }
     }
-
-    public TypeParameterizedReactor getTypeParameterizedReactor() {
-        return this.tpr;
-    }
-
-    //////////////////////////////////////////////////////
-    //// Private methods.
-
-    /**
-     * Connect the given left port range to the given right port range.
-     *
-     * NOTE: This method is public to enable its use in unit tests.
-     * Otherwise, it should be private. This is why it is defined here,
-     * in the section labeled "Private methods."
-     *
-     * @param src The source range.
-     * @param dst The destination range.
-     * @param connection The connection establishing this relationship.
-     */
-    public static void connectPortInstances(
-            RuntimeRange<PortInstance> src,
-            RuntimeRange<PortInstance> dst,
-            Connection connection
-    ) {
-        SendRange range = new SendRange(src, dst, src._interleaved, connection);
-        src.instance.dependentPorts.add(range);
-        dst.instance.dependsOnPorts.add(src);
+  }
+
+  /**
+   * If path exists from the specified port to any reaction in the specified set of reactions, then
+   * add the specified port and all ports along the path to the specified set of ports.
+   *
+   * @return True if the specified port was added.
+   */
+  private boolean findPaths(
+      PortInstance port, Set<ReactionInstance> reactions, Set<PortInstance> ports) {
+    if (ports.contains(port)) return false;
+    boolean result = false;
+    for (ReactionInstance d : port.getDependentReactions()) {
+      if (reactions.contains(d)) ports.add(port);
+      result = true;
     }
-
-    /**
-     * Populate connectivity information in the port instances.
-     * Note that this can only happen _after_ the children and port instances have been created.
-     * Unfortunately, we have to do some complicated things here
-     * to support multiport-to-multiport, multiport-to-bank,
-     * and bank-to-multiport communication.  The principle being followed is:
-     * in each connection statement, for each port instance on the left,
-     * connect to the next available port on the right.
-     */
-    private void establishPortConnections() {
-        for (Connection connection : ASTUtils.allConnections(reactorDefinition)) {
-            List<RuntimeRange<PortInstance>> leftPorts = listPortInstances(connection.getLeftPorts(), connection);
-            Iterator<RuntimeRange<PortInstance>> srcRanges = leftPorts.iterator();
-            List<RuntimeRange<PortInstance>> rightPorts = listPortInstances(connection.getRightPorts(), connection);
-            Iterator<RuntimeRange<PortInstance>> dstRanges = rightPorts.iterator();
-
-            // Check for empty lists.
-            if (!srcRanges.hasNext()) {
-                if (dstRanges.hasNext()) {
-                    reporter.reportWarning(connection, "No sources to provide inputs.");
-                }
-                return;
-            } else if (!dstRanges.hasNext()) {
-                reporter.reportWarning(connection, "No destination. Outputs will be lost.");
-                return;
-            }
-
-            RuntimeRange<PortInstance> src = srcRanges.next();
-            RuntimeRange<PortInstance> dst = dstRanges.next();
-
-            while(true) {
-                if (dst.width == src.width) {
-                    connectPortInstances(src, dst, connection);
-                    if (!dstRanges.hasNext()) {
-                        if (srcRanges.hasNext()) {
-                            // Should not happen (checked by the validator).
-                            reporter.reportWarning(connection,
-                                    "Source is wider than the destination. Outputs will be lost.");
-                        }
-                        break;
-                    }
-                    if (!srcRanges.hasNext()) {
-                        if (connection.isIterated()) {
-                            srcRanges = leftPorts.iterator();
-                        } else {
-                            if (dstRanges.hasNext()) {
-                                // Should not happen (checked by the validator).
-                                reporter.reportWarning(connection,
-                                        "Destination is wider than the source. Inputs will be missing.");
-                            }
-                            break;
-                        }
-                    }
-                    dst = dstRanges.next();
-                    src = srcRanges.next();
-                } else if (dst.width < src.width) {
-                    // Split the left (src) range in two.
-                    connectPortInstances(src.head(dst.width), dst, connection);
-                    src = src.tail(dst.width);
-                    if (!dstRanges.hasNext()) {
-                        // Should not happen (checked by the validator).
-                        reporter.reportWarning(connection,
-                                "Source is wider than the destination. Outputs will be lost.");
-                        break;
-                    }
-                    dst = dstRanges.next();
-                } else if (src.width < dst.width) {
-                    // Split the right (dst) range in two.
-                    connectPortInstances(src, dst.head(src.width), connection);
-                    dst = dst.tail(src.width);
-                    if (!srcRanges.hasNext()) {
-                        if (connection.isIterated()) {
-                            srcRanges = leftPorts.iterator();
-                        } else {
-                            reporter.reportWarning(connection,
-                                    "Destination is wider than the source. Inputs will be missing.");
-                            break;
-                        }
-                    }
-                    src = srcRanges.next();
-                }
-            }
+    // Perform a depth-first search.
+    for (SendRange r : port.dependentPorts) {
+      for (RuntimeRange<PortInstance> p : r.destinations) {
+        boolean added = findPaths(p.instance, reactions, ports);
+        if (added) {
+          result = true;
+          ports.add(port);
         }
+      }
     }
-
-    /**
-     * If path exists from the specified port to any reaction in the specified
-     * set of reactions, then add the specified port and all ports along the path
-     * to the specified set of ports.
-     * @return True if the specified port was added.
-     */
-    private boolean findPaths(
-            PortInstance port,
-            Set<ReactionInstance> reactions,
-            Set<PortInstance> ports
-    ) {
-        if (ports.contains(port)) return false;
-        boolean result = false;
-        for (ReactionInstance d : port.getDependentReactions()) {
-            if (reactions.contains(d)) ports.add(port);
-            result = true;
-        }
-        // Perform a depth-first search.
-        for (SendRange r : port.dependentPorts) {
-            for (RuntimeRange<PortInstance> p : r.destinations) {
-                boolean added = findPaths(p.instance, reactions, ports);
-                if (added) {
-                    result = true;
-                    ports.add(port);
-                }
-            }
-        }
+    return result;
+  }
+
+  /**
+   * Given a list of port references, as found on either side of a connection, return a list of the
+   * port instance ranges referenced. These may be multiports, and may be ports of a contained bank
+   * (a port representing ports of the bank members) so the returned list includes ranges of banks
+   * and channels.
+   *
+   * <p>If a given port reference has the form {@code interleaved(b.m)}, where {@code b} is a bank
+   * and {@code m} is a multiport, then the corresponding range in the returned list is marked
+   * interleaved.
+   *
+   * <p>For example, if {@code b} and {@code m} have width 2, without the interleaved keyword, the
+   * returned range represents the sequence {@code [b0.m0, b0.m1, b1.m0, b1.m1]}. With the
+   * interleaved marking, the returned range represents the sequence {@code [b0.m0, b1.m0, b0.m1,
+   * b1.m1]}. Both ranges will have width 4.
+   *
+   * @param references The variable references on one side of the connection.
+   * @param connection The connection.
+   */
+  private List<RuntimeRange<PortInstance>> listPortInstances(
+      List<VarRef> references, Connection connection) {
+    List<RuntimeRange<PortInstance>> result = new ArrayList<>();
+    List<RuntimeRange<PortInstance>> tails = new LinkedList<>();
+    int count = 0;
+    for (VarRef portRef : references) {
+      // Simple error checking first.
+      if (!(portRef.getVariable() instanceof Port)) {
+        reporter.reportError(portRef, "Not a port.");
         return result;
-    }
-
-    /**
-     * Given a list of port references, as found on either side of a connection,
-     * return a list of the port instance ranges referenced. These may be multiports,
-     * and may be ports of a contained bank (a port representing ports of the bank
-     * members) so the returned list includes ranges of banks and channels.
-     *
-     * If a given port reference has the form {@code interleaved(b.m)}, where {@code b} is
-     * a bank and {@code m} is a multiport, then the corresponding range in the returned
-     * list is marked interleaved.
-     *
-     * For example, if {@code b} and {@code m} have width 2, without the interleaved keyword,
-     * the returned range represents the sequence {@code [b0.m0, b0.m1, b1.m0, b1.m1]}.
-     * With the interleaved marking, the returned range represents the sequence
-     * {@code [b0.m0, b1.m0, b0.m1, b1.m1]}. Both ranges will have width 4.
-     *
-     * @param references The variable references on one side of the connection.
-     * @param connection The connection.
-     */
-    private List<RuntimeRange<PortInstance>> listPortInstances(
-            List<VarRef> references, Connection connection
-    ) {
-        List<RuntimeRange<PortInstance>> result = new ArrayList<>();
-        List<RuntimeRange<PortInstance>> tails = new LinkedList<>();
-        int count = 0;
-        for (VarRef portRef : references) {
-            // Simple error checking first.
-            if (!(portRef.getVariable() instanceof Port)) {
-                reporter.reportError(portRef, "Not a port.");
-                return result;
-            }
-            // First, figure out which reactor we are dealing with.
-            // The reactor we want is the container of the port.
-            // If the port reference has no container, then the reactor is this one.
-            var reactor = this;
-            if (portRef.getContainer() != null) {
-                reactor = getChildReactorInstance(portRef.getContainer());
-            }
-            // The reactor can be null only if there is an error in the code.
-            // Skip this portRef so that diagram synthesis can complete.
-            if (reactor != null) {
-                PortInstance portInstance = reactor.lookupPortInstance(
-                        (Port) portRef.getVariable());
-
-                Set<ReactorInstance> interleaved = new LinkedHashSet<>();
-                if (portRef.isInterleaved()) {
-                    // NOTE: Here, we are assuming that the interleaved()
-                    // keyword is only allowed on the multiports contained by
-                    // contained reactors.
-                    interleaved.add(portInstance.parent);
-                }
-                RuntimeRange<PortInstance> range = new RuntimeRange.Port(
-                        portInstance, interleaved);
-                // If this portRef is not the last one in the references list
-                // then we have to check whether the range can be incremented at
-                // the lowest two levels (port and container).  If not,
-                // split the range and add the tail to list to iterate over again.
-                // The reason for this is that the connection has only local visibility,
-                // but the range width may be reflective of bank structure higher
-                // in the hierarchy.
-                if (count < references.size() - 1) {
-                    int portWidth = portInstance.width;
-                    int portParentWidth = portInstance.parent.width;
-                    // If the port is being connected on the inside and there is
-                    // more than one port in the list, then we can only connect one
-                    // bank member at a time.
-                    if (reactor == this && references.size() > 1) {
-                        portParentWidth = 1;
-                    }
-                    int widthBound = portWidth * portParentWidth;
-
-                    // If either of these widths cannot be determined, assume infinite.
-                    if (portWidth < 0) widthBound = Integer.MAX_VALUE;
-                    if (portParentWidth < 0) widthBound = Integer.MAX_VALUE;
-
-                    if (widthBound < range.width) {
-                        // Need to split the range.
-                        tails.add(range.tail(widthBound));
-                        range = range.head(widthBound);
-                    }
-                }
-                result.add(range);
-            }
+      }
+      // First, figure out which reactor we are dealing with.
+      // The reactor we want is the container of the port.
+      // If the port reference has no container, then the reactor is this one.
+      var reactor = this;
+      if (portRef.getContainer() != null) {
+        reactor = getChildReactorInstance(portRef.getContainer());
+      }
+      // The reactor can be null only if there is an error in the code.
+      // Skip this portRef so that diagram synthesis can complete.
+      if (reactor != null) {
+        PortInstance portInstance = reactor.lookupPortInstance((Port) portRef.getVariable());
+
+        Set<ReactorInstance> interleaved = new LinkedHashSet<>();
+        if (portRef.isInterleaved()) {
+          // NOTE: Here, we are assuming that the interleaved()
+          // keyword is only allowed on the multiports contained by
+          // contained reactors.
+          interleaved.add(portInstance.parent);
         }
-        // Iterate over the tails.
-        while(tails.size() > 0) {
-            List<RuntimeRange<PortInstance>> moreTails = new LinkedList<>();
-            count = 0;
-            for (RuntimeRange<PortInstance> tail : tails) {
-                if (count < tails.size() - 1) {
-                    int widthBound = tail.instance.width;
-                    if (tail._interleaved.contains(tail.instance.parent)) {
-                        widthBound = tail.instance.parent.width;
-                    }
-                    // If the width cannot be determined, assume infinite.
-                    if (widthBound < 0) widthBound = Integer.MAX_VALUE;
-
-                    if (widthBound < tail.width) {
-                        // Need to split the range again
-                        moreTails.add(tail.tail(widthBound));
-                        tail = tail.head(widthBound);
-                    }
-                }
-                result.add(tail);
-            }
-            tails = moreTails;
+        RuntimeRange<PortInstance> range = new RuntimeRange.Port(portInstance, interleaved);
+        // If this portRef is not the last one in the references list
+        // then we have to check whether the range can be incremented at
+        // the lowest two levels (port and container).  If not,
+        // split the range and add the tail to list to iterate over again.
+        // The reason for this is that the connection has only local visibility,
+        // but the range width may be reflective of bank structure higher
+        // in the hierarchy.
+        if (count < references.size() - 1) {
+          int portWidth = portInstance.width;
+          int portParentWidth = portInstance.parent.width;
+          // If the port is being connected on the inside and there is
+          // more than one port in the list, then we can only connect one
+          // bank member at a time.
+          if (reactor == this && references.size() > 1) {
+            portParentWidth = 1;
+          }
+          int widthBound = portWidth * portParentWidth;
+
+          // If either of these widths cannot be determined, assume infinite.
+          if (portWidth < 0) widthBound = Integer.MAX_VALUE;
+          if (portParentWidth < 0) widthBound = Integer.MAX_VALUE;
+
+          if (widthBound < range.width) {
+            // Need to split the range.
+            tails.add(range.tail(widthBound));
+            range = range.head(widthBound);
+          }
         }
-        return result;
+        result.add(range);
+      }
     }
-
-    /**
-     * If this is a bank of reactors, set the width.
-     * It will be set to -1 if it cannot be determined.
-     */
-    private void setInitialWidth() {
-        WidthSpec widthSpec = definition.getWidthSpec();
-        if (widthSpec != null) {
-            // We need the instantiations list of the containing reactor,
-            // not this one.
-            width = ASTUtils.width(widthSpec, parent.instantiations());
+    // Iterate over the tails.
+    while (tails.size() > 0) {
+      List<RuntimeRange<PortInstance>> moreTails = new LinkedList<>();
+      count = 0;
+      for (RuntimeRange<PortInstance> tail : tails) {
+        if (count < tails.size() - 1) {
+          int widthBound = tail.instance.width;
+          if (tail._interleaved.contains(tail.instance.parent)) {
+            widthBound = tail.instance.parent.width;
+          }
+          // If the width cannot be determined, assume infinite.
+          if (widthBound < 0) widthBound = Integer.MAX_VALUE;
+
+          if (widthBound < tail.width) {
+            // Need to split the range again
+            moreTails.add(tail.tail(widthBound));
+            tail = tail.head(widthBound);
+          }
         }
+        result.add(tail);
+      }
+      tails = moreTails;
     }
-
-    //////////////////////////////////////////////////////
-    //// Private fields.
-
-    /**
-     * Cached set of reactions and ports that form a causality loop.
-     */
-    private Set<NamedInstance<?>> cachedCycles;
-
-    /**
-     * Cached reaction graph containing reactions that form a causality loop.
-     */
-    private ReactionInstanceGraph cachedReactionLoopGraph = null;
-
-    /**
-     * Return true if this is a generated delay reactor that originates from
-     * an "after" delay on a connection.
-     *
-     * @return True if this is a generated delay, false otherwise.
-     */
-    public boolean isGeneratedDelay() {
-        // FIXME: hacky string matching again...
-        return this.definition.getReactorClass().getName().contains(DelayBodyGenerator.GEN_DELAY_CLASS_NAME);
+    return result;
+  }
+
+  /**
+   * If this is a bank of reactors, set the width. It will be set to -1 if it cannot be determined.
+   */
+  private void setInitialWidth() {
+    WidthSpec widthSpec = definition.getWidthSpec();
+    if (widthSpec != null) {
+      // We need the instantiations list of the containing reactor,
+      // not this one.
+      width = ASTUtils.width(widthSpec, parent.instantiations());
     }
+  }
+
+  //////////////////////////////////////////////////////
+  //// Private fields.
+
+  /** Cached set of reactions and ports that form a causality loop. */
+  private Set<NamedInstance<?>> cachedCycles;
+
+  /** Cached reaction graph containing reactions that form a causality loop. */
+  private ReactionInstanceGraph cachedReactionLoopGraph = null;
+
+  /**
+   * Return true if this is a generated delay reactor that originates from an "after" delay on a
+   * connection.
+   *
+   * @return True if this is a generated delay, false otherwise.
+   */
+  public boolean isGeneratedDelay() {
+    // FIXME: hacky string matching again...
+    return this.definition
+        .getReactorClass()
+        .getName()
+        .contains(DelayBodyGenerator.GEN_DELAY_CLASS_NAME);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/RuntimeRange.java b/org.lflang/src/org/lflang/generator/RuntimeRange.java
index 36f132b27e..d684a41bd9 100644
--- a/org.lflang/src/org/lflang/generator/RuntimeRange.java
+++ b/org.lflang/src/org/lflang/generator/RuntimeRange.java
@@ -32,478 +32,419 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.Set;
 
 /**
- * Class representing a range of runtime instance objects
- * (port channels, reactors, reactions, etc.). This class and its derived classes
- * have the most detailed information about the structure of a Lingua Franca
- * program.  There are three levels of detail:
+ * Class representing a range of runtime instance objects (port channels, reactors, reactions,
+ * etc.). This class and its derived classes have the most detailed information about the structure
+ * of a Lingua Franca program. There are three levels of detail:
+ *
  * <ul>
- *   <li>The abstract syntax tree (AST).</li>
- *   <li>The compile-time instance graph (CIG).</li>
- *   <li>The runtime instance graph (RIG).</li>
+ *   <li>The abstract syntax tree (AST).
+ *   <li>The compile-time instance graph (CIG).
+ *   <li>The runtime instance graph (RIG).
  * </ul>
- * 
- * In the AST, each reactor class is represented once.
- * In the CIG, each reactor class is represented as many times as it is
- * instantiated, except that a bank has only one representation (as
- * in the graphical rendition). Equivalently, each CIG node has a unique
- * full name, even though it may represent many runtime instances.
- * The CIG is represented by
- * {@link NamedInstance} and its derived classes.
- * In the RIG, each bank is expanded so each bank member and
- * each port channel is represented.
- * 
- * In general, determining dependencies between reactions requires analysis
- * at the level of the RIG.  But a brute-force representation of the RIG
- * can get very large, and for most programs it has a great deal of
- * redundancy. In a fully detailed representation of the RIG, for example,
- * a bank of width N that contains a bank of width M within which there
- * is a reactor R with port P will have N*M runtime instances of the port.
- * If the port is a multiport with width L, then there are N*M*L
- * edges connected to instances of that port, each of which may go
- * to a distinct set of other remote runtime port instances.
- * 
- * This class and its subclasses give a more compact representation of the
- * RIG in most common cases where collections of runtime instances all have
- * the same dependencies or dependencies form a range that can be represented
- * compactly.
- * 
- * A RuntimeRange represents an adjacent set of RIG objects (port channels, reactions
- * reactors). For example, it can represent port channels 2 through 5 in a multiport
- * of width 10.  The width in this case is 4. If such a port is
- * contained by one or more banks of reactors, then channels 2 through 5
- * of one bank member form a contiguous range. If you want channels 2 through 5
- * of all bank members, then this needs to be represented with multiple ranges.
- * 
- * The maxWidth is the width of the instance multiplied by the widths of
- * each of its containers. For example, if a port of width 4 is contained by
- * a bank of width 2 that is then contained by a bank of width 3, then
- * the maxWidth will be 2*3*4 = 24.
- * 
- * The function iterationOrder returns a list that includes the instance
- * of this range and all its containers, except the top-level reactor (main
- * or federated).  The order of this list is the order in which an
- * iteration over the RIG objects represented by this range should be
- * iterated. If the instance is a PortInstance, then this order will
- * depend on whether connections at any level of the hierarchy are
- * interleaved.
- * 
- * The simplest Ranges are those where the corresponding CIG node represents
- * only one runtime instance (its instance is not (deeply) within a bank 
- * and is not a multiport). In this case, the RuntimeRange and all the objects
- * returned by iterationOrder will have width 1.
- * 
- * In a more complex instance, consider a bank A of width 2 that contains a
- * bank B of width 2 that contains a port instance P with width 2. .
- * There are a total of 8 instances of P, which we can name:
- * 
- *      A0.B0.P0
- *      A0.B0.P1
- *      A0.B1.P0
- *      A0.B1.P1
- *      A1.B0.P0
- *      A1.B0.P1
- *      A1.B1.P0
- *      A1.B1.P1
- * 
- * If there is no interleaving, iterationOrder() returns [P, B, A],
- * indicating that they should be iterated by incrementing the index of P
- * first, then the index of B, then the index of A, as done above.
- * 
- * If the connection within B to port P is interleaved, then the order
- * of iteration order will be [B, P, A], resulting in the list:
- * 
- *      A0.B0.P0
- *      A0.B1.P0
- *      A0.B0.P1
- *      A0.B1.P1
- *      A1.B0.P0
- *      A1.B1.P0
- *      A1.B0.P1
- *      A1.B1.P1
- *      
- *  If the connection within A to B is also interleaved, then the order
- *  will be [A, B, P], resulting in the list:
- *  
- *      A0.B0.P0
- *      A1.B0.P0
- *      A0.B1.P0
- *      A1.B1.P0
- *      A0.B0.P1
- *      A1.B0.P1
- *      A0.B1.P1
- *      A1.B1.P1
- * 
- * Finally, if the connection within A to B is interleaved, but not the
- * connection within B to P, then the order will be [A, P, B], resulting in
- * the list:
- * 
- *      A0.B0.P0
- *      A1.B0.P0
- *      A0.B0.P1
- *      A1.B0.P1
- *      A0.B1.P0
- *      A1.B1.P0
- *      A0.B1.P1
- *      A1.B1.P1
- * 
- * A RuntimeRange is a contiguous subset of one of the above lists, given by
- * a start offset and a width that is less than or equal to maxWidth.
- * 
- * Each element of the above lists can be represented as a permuted mixed-radix (PMR) number,
- * where the low-order digit has radix equal to the width of P, the second digit
- * has radix equal to the width of B, and the final digit has radix equal to the
- * width of A. Each PMR has a permutation vector that defines how to increment
- * PMR number. This permutation vector is derived from the iteration order as
- * follows.  When there is no interleaving, the iteration order is [P, B, A],
- * and the permutation vector is [0, 1, 2].  When there is interleaving, the permutation
- * vector simply specifies the iteration order. For example, if the iteration order
- * is [A, P, B], then the permutation vector is [2, 0, 1], indicating that digit 2
- * of the PMR (corresponding to A) should be incremented first, then digit 0 (for P),
- * then digit 1 (for B).
- * 
- * For a RuntimeRange with width greater than 1,
- * the head() and tail() functions split the range.
- * 
- * This class and subclasses are designed to be immutable.
- * Modifications always return a new RuntimeRange.
+ *
+ * In the AST, each reactor class is represented once. In the CIG, each reactor class is represented
+ * as many times as it is instantiated, except that a bank has only one representation (as in the
+ * graphical rendition). Equivalently, each CIG node has a unique full name, even though it may
+ * represent many runtime instances. The CIG is represented by {@link NamedInstance} and its derived
+ * classes. In the RIG, each bank is expanded so each bank member and each port channel is
+ * represented.
+ *
+ * <p>In general, determining dependencies between reactions requires analysis at the level of the
+ * RIG. But a brute-force representation of the RIG can get very large, and for most programs it has
+ * a great deal of redundancy. In a fully detailed representation of the RIG, for example, a bank of
+ * width N that contains a bank of width M within which there is a reactor R with port P will have
+ * N*M runtime instances of the port. If the port is a multiport with width L, then there are N*M*L
+ * edges connected to instances of that port, each of which may go to a distinct set of other remote
+ * runtime port instances.
+ *
+ * <p>This class and its subclasses give a more compact representation of the RIG in most common
+ * cases where collections of runtime instances all have the same dependencies or dependencies form
+ * a range that can be represented compactly.
+ *
+ * <p>A RuntimeRange represents an adjacent set of RIG objects (port channels, reactions reactors).
+ * For example, it can represent port channels 2 through 5 in a multiport of width 10. The width in
+ * this case is 4. If such a port is contained by one or more banks of reactors, then channels 2
+ * through 5 of one bank member form a contiguous range. If you want channels 2 through 5 of all
+ * bank members, then this needs to be represented with multiple ranges.
+ *
+ * <p>The maxWidth is the width of the instance multiplied by the widths of each of its containers.
+ * For example, if a port of width 4 is contained by a bank of width 2 that is then contained by a
+ * bank of width 3, then the maxWidth will be 2*3*4 = 24.
+ *
+ * <p>The function iterationOrder returns a list that includes the instance of this range and all
+ * its containers, except the top-level reactor (main or federated). The order of this list is the
+ * order in which an iteration over the RIG objects represented by this range should be iterated. If
+ * the instance is a PortInstance, then this order will depend on whether connections at any level
+ * of the hierarchy are interleaved.
+ *
+ * <p>The simplest Ranges are those where the corresponding CIG node represents only one runtime
+ * instance (its instance is not (deeply) within a bank and is not a multiport). In this case, the
+ * RuntimeRange and all the objects returned by iterationOrder will have width 1.
+ *
+ * <p>In a more complex instance, consider a bank A of width 2 that contains a bank B of width 2
+ * that contains a port instance P with width 2. . There are a total of 8 instances of P, which we
+ * can name:
+ *
+ * <p>A0.B0.P0 A0.B0.P1 A0.B1.P0 A0.B1.P1 A1.B0.P0 A1.B0.P1 A1.B1.P0 A1.B1.P1
+ *
+ * <p>If there is no interleaving, iterationOrder() returns [P, B, A], indicating that they should
+ * be iterated by incrementing the index of P first, then the index of B, then the index of A, as
+ * done above.
+ *
+ * <p>If the connection within B to port P is interleaved, then the order of iteration order will be
+ * [B, P, A], resulting in the list:
+ *
+ * <p>A0.B0.P0 A0.B1.P0 A0.B0.P1 A0.B1.P1 A1.B0.P0 A1.B1.P0 A1.B0.P1 A1.B1.P1
+ *
+ * <p>If the connection within A to B is also interleaved, then the order will be [A, B, P],
+ * resulting in the list:
+ *
+ * <p>A0.B0.P0 A1.B0.P0 A0.B1.P0 A1.B1.P0 A0.B0.P1 A1.B0.P1 A0.B1.P1 A1.B1.P1
+ *
+ * <p>Finally, if the connection within A to B is interleaved, but not the connection within B to P,
+ * then the order will be [A, P, B], resulting in the list:
+ *
+ * <p>A0.B0.P0 A1.B0.P0 A0.B0.P1 A1.B0.P1 A0.B1.P0 A1.B1.P0 A0.B1.P1 A1.B1.P1
+ *
+ * <p>A RuntimeRange is a contiguous subset of one of the above lists, given by a start offset and a
+ * width that is less than or equal to maxWidth.
+ *
+ * <p>Each element of the above lists can be represented as a permuted mixed-radix (PMR) number,
+ * where the low-order digit has radix equal to the width of P, the second digit has radix equal to
+ * the width of B, and the final digit has radix equal to the width of A. Each PMR has a permutation
+ * vector that defines how to increment PMR number. This permutation vector is derived from the
+ * iteration order as follows. When there is no interleaving, the iteration order is [P, B, A], and
+ * the permutation vector is [0, 1, 2]. When there is interleaving, the permutation vector simply
+ * specifies the iteration order. For example, if the iteration order is [A, P, B], then the
+ * permutation vector is [2, 0, 1], indicating that digit 2 of the PMR (corresponding to A) should
+ * be incremented first, then digit 0 (for P), then digit 1 (for B).
+ *
+ * <p>For a RuntimeRange with width greater than 1, the head() and tail() functions split the range.
+ *
+ * <p>This class and subclasses are designed to be immutable. Modifications always return a new
+ * RuntimeRange.
  *
  * @author Edward A. Lee
  */
 public class RuntimeRange<T extends NamedInstance<?>> implements Comparable<RuntimeRange<?>> {
-    
-    /**
-     * Create a new range representing the full width of the specified instance
-     * with no interleaving. The instances will be a list with the specified instance
-     * first, its parent next, and on up the hierarchy until the depth 1 parent (the
-     * top-level reactor is not included because it can never be a bank).
-     * @param instance The instance.
-     * @param interleaved A list of parents that are interleaved or null if none.
-     */
-    public RuntimeRange(
-            T instance,
-            Set<ReactorInstance> interleaved
-    ) {
-        this(instance, 0, 0, interleaved);
-    }
 
-    /**
-     * Create a new range representing a range of the specified instance
-     * with no interleaving. The instances will be a list with the specified instance
-     * first, its parent next, and on up the hierarchy until the depth 1 parent (the
-     * top-level reactor is not included because it can never be a bank).
-     * @param instance The instance over which this is a range (port, reaction, etc.)
-     * @param start The starting index for the range.
-     * @param width The width of the range or 0 to specify the maximum possible width.
-     * @param interleaved A list of parents that are interleaved or null if none.
-     */
-    public RuntimeRange(
-            T instance,
-            int start,
-            int width,
-            Set<ReactorInstance> interleaved
-    ) {
-        this.instance = instance;
-        this.start = start;
-        if (interleaved != null) {
-            this._interleaved.addAll(interleaved);
-        }
-        
-        int maxWidth = instance.width; // Initial value.
-        NamedInstance<?> parent = instance.parent;
-        while (parent.depth > 0) {
-            maxWidth *= parent.width;
-            parent = parent.parent;
-        }
-        this.maxWidth = maxWidth;
-
-        if (width > 0 && width + start < maxWidth) {
-            this.width = width;
-        } else {
-            this.width = maxWidth - start;
-        }
-    }
-    
-    //////////////////////////////////////////////////////////
-    //// Public variables
-    
-    /** The instance that this is a range of. */
-    public final T instance;
-    
-    /** The start offset of this range. */
-    public final int start;
-    
-    /** The maximum width of any range with this instance. */
-    public final int maxWidth;
-    
-    /** The width of this range. */
-    public final int width;
-    
-    //////////////////////////////////////////////////////////
-    //// Public methods
-
-    /**
-     * Compare ranges by first comparing their start offset, and then,
-     * if these are equal, comparing their widths. This comparison is
-     * meaningful only for ranges that have the same instances.
-     * Note that this can return 0 even if equals() does not return true.
-     */
-    @Override
-    public int compareTo(RuntimeRange<?> o) {
-        if (start < o.start) {
-            return -1;
-        } else if (start == o.start) {
-            return Integer.compare(width, o.width);
-        } else {
-            return 1;
-        }
+  /**
+   * Create a new range representing the full width of the specified instance with no interleaving.
+   * The instances will be a list with the specified instance first, its parent next, and on up the
+   * hierarchy until the depth 1 parent (the top-level reactor is not included because it can never
+   * be a bank).
+   *
+   * @param instance The instance.
+   * @param interleaved A list of parents that are interleaved or null if none.
+   */
+  public RuntimeRange(T instance, Set<ReactorInstance> interleaved) {
+    this(instance, 0, 0, interleaved);
+  }
+
+  /**
+   * Create a new range representing a range of the specified instance with no interleaving. The
+   * instances will be a list with the specified instance first, its parent next, and on up the
+   * hierarchy until the depth 1 parent (the top-level reactor is not included because it can never
+   * be a bank).
+   *
+   * @param instance The instance over which this is a range (port, reaction, etc.)
+   * @param start The starting index for the range.
+   * @param width The width of the range or 0 to specify the maximum possible width.
+   * @param interleaved A list of parents that are interleaved or null if none.
+   */
+  public RuntimeRange(T instance, int start, int width, Set<ReactorInstance> interleaved) {
+    this.instance = instance;
+    this.start = start;
+    if (interleaved != null) {
+      this._interleaved.addAll(interleaved);
     }
-    
-    /**
-     * Return a new RuntimeRange that is identical to this range but
-     * with width reduced to the specified width.
-     * If the new width is greater than or equal to the width
-     * of this range, then return this range.
-     * If the newWidth is 0 or negative, return null.
-     * @param newWidth The new width.
-     */
-    public RuntimeRange<T> head(int newWidth) {
-        if (newWidth >= width) return this;
-        if (newWidth <= 0) return null;
-        return new RuntimeRange<>(instance, start, newWidth, _interleaved);
+
+    int maxWidth = instance.width; // Initial value.
+    NamedInstance<?> parent = instance.parent;
+    while (parent.depth > 0) {
+      maxWidth *= parent.width;
+      parent = parent.parent;
     }
-    
-    /**
-     * Return the list of <strong>natural identifiers</strong> for the runtime instances
-     * in this range.  Each returned identifier is an integer representation
-     * of the mixed-radix number [d0, ... , dn] with radices [w0, ... , wn],
-     * where d0 is the bank or channel index of this RuntimeRange's instance, which
-     * has width w0, and dn is the bank index of its topmost parent below the 
-     * top-level (main) reactor, which has width wn. The depth of this RuntimeRange's 
-     * instance, therefore, is n - 1.  The order of the returned list is the order
-     * in which the runtime instances should be iterated.
-     */
-    public List<Integer> instances() {
-        List<Integer> result = new ArrayList<>(width);
-        MixedRadixInt mr = startMR();
-        int count = 0;
-        while (count++ < width) {
-            result.add(mr.get());
-            mr.increment();
-        }
-        return result;
+    this.maxWidth = maxWidth;
+
+    if (width > 0 && width + start < maxWidth) {
+      this.width = width;
+    } else {
+      this.width = maxWidth - start;
     }
-    
-    /**
-     * Return a list containing the instance for this range and all of its
-     * parents, not including the top level reactor, in the order in which
-     * their banks and multiport channels should be iterated.
-     * For each depth at which the connection is interleaved, that parent
-     * will appear before this instance in depth order (shallower to deeper).
-     * For each depth at which the connection is not interleaved, that parent
-     * will appear after this instance in reverse depth order (deeper to
-     * shallower).
-     */
-    public List<NamedInstance<?>> iterationOrder() {
-        ArrayList<NamedInstance<?>> result = new ArrayList<>();
-        result.add(instance);
-        ReactorInstance parent = instance.parent;
-        while (parent.depth > 0) {
-            if (_interleaved.contains(parent)) {
-                // Put the parent at the head of the list.
-                result.add(0, parent);
-            } else {
-                result.add(parent);
-            }
-            parent = parent.parent;
-        }
-        return result;
+  }
+
+  //////////////////////////////////////////////////////////
+  //// Public variables
+
+  /** The instance that this is a range of. */
+  public final T instance;
+
+  /** The start offset of this range. */
+  public final int start;
+
+  /** The maximum width of any range with this instance. */
+  public final int maxWidth;
+
+  /** The width of this range. */
+  public final int width;
+
+  //////////////////////////////////////////////////////////
+  //// Public methods
+
+  /**
+   * Compare ranges by first comparing their start offset, and then, if these are equal, comparing
+   * their widths. This comparison is meaningful only for ranges that have the same instances. Note
+   * that this can return 0 even if equals() does not return true.
+   */
+  @Override
+  public int compareTo(RuntimeRange<?> o) {
+    if (start < o.start) {
+      return -1;
+    } else if (start == o.start) {
+      return Integer.compare(width, o.width);
+    } else {
+      return 1;
     }
-    
-    /**
-     * Return a range that is the subset of this range that overlaps with the
-     * specified range or null if there is no overlap.
-     */
-    public RuntimeRange<?> overlap(RuntimeRange<?> range) {
-        if (!overlaps(range)) return null;
-        int newStart = Math.max(start, range.start);
-        int newEnd = Math.min(start + width, range.start + range.width);
-        return tail(newStart - start).head(newEnd - newStart);
+  }
+
+  /**
+   * Return a new RuntimeRange that is identical to this range but with width reduced to the
+   * specified width. If the new width is greater than or equal to the width of this range, then
+   * return this range. If the newWidth is 0 or negative, return null.
+   *
+   * @param newWidth The new width.
+   */
+  public RuntimeRange<T> head(int newWidth) {
+    if (newWidth >= width) return this;
+    if (newWidth <= 0) return null;
+    return new RuntimeRange<>(instance, start, newWidth, _interleaved);
+  }
+
+  /**
+   * Return the list of <strong>natural identifiers</strong> for the runtime instances in this
+   * range. Each returned identifier is an integer representation of the mixed-radix number [d0, ...
+   * , dn] with radices [w0, ... , wn], where d0 is the bank or channel index of this RuntimeRange's
+   * instance, which has width w0, and dn is the bank index of its topmost parent below the
+   * top-level (main) reactor, which has width wn. The depth of this RuntimeRange's instance,
+   * therefore, is n - 1. The order of the returned list is the order in which the runtime instances
+   * should be iterated.
+   */
+  public List<Integer> instances() {
+    List<Integer> result = new ArrayList<>(width);
+    MixedRadixInt mr = startMR();
+    int count = 0;
+    while (count++ < width) {
+      result.add(mr.get());
+      mr.increment();
     }
-    
-    /**
-     * Return true if the specified range has the same instance as this range
-     * and the ranges overlap.
-     */
-    public boolean overlaps(RuntimeRange<?> range) {
-        if (!instance.equals(range.instance)) return false;
-        return start < range.start + range.width && start + width > range.start;
+    return result;
+  }
+
+  /**
+   * Return a list containing the instance for this range and all of its parents, not including the
+   * top level reactor, in the order in which their banks and multiport channels should be iterated.
+   * For each depth at which the connection is interleaved, that parent will appear before this
+   * instance in depth order (shallower to deeper). For each depth at which the connection is not
+   * interleaved, that parent will appear after this instance in reverse depth order (deeper to
+   * shallower).
+   */
+  public List<NamedInstance<?>> iterationOrder() {
+    ArrayList<NamedInstance<?>> result = new ArrayList<>();
+    result.add(instance);
+    ReactorInstance parent = instance.parent;
+    while (parent.depth > 0) {
+      if (_interleaved.contains(parent)) {
+        // Put the parent at the head of the list.
+        result.add(0, parent);
+      } else {
+        result.add(parent);
+      }
+      parent = parent.parent;
     }
-    
-    /**
-     * Return a set of identifiers for runtime instances of a parent of this
-     * {@link RuntimeRange}'s instance {@code n} levels above this {@link RuntimeRange}'s instance. If {@code n == 1}, for
-     * example, then this return the identifiers for the parent ReactorInstance.
-     * 
-     * This returns a list of <i>natural identifiers</i>,
-     * as defined below, for the instances within the range.
-     * 
-     * The resulting list can be used to count the number of distinct
-     * runtime instances of this RuntimeRange's instance (using {@code n == 0}) or any of its parents that
-     * lie within the range and to provide an index into an array of runtime
-     * instances.
-     * 
-     * Each <i>natural identifier</i> is the integer value of a mixed-radix number
-     * defined as follows:
-     * <ul>
-     *   <li>The low-order digit is the index of the runtime instance of {@code i} within its container.
-     *   If the {@link NamedInstance} is a {@code PortInstance}, this will be the multiport channel or {@code 0} if it is not a
-     *   multiport. If the NamedInstance is a ReactorInstance, then it will be the bank
-     *   index or {@code 0} if the reactor is not a bank.  The radix for this digit will be
-     *   the multiport width or bank width or 1 if the NamedInstance is neither a
-     *   multiport nor a bank.</li>
-     * <li>The next digit will be the bank index of the container of the specified
-     * {@link NamedInstance} or {@code 0} if it is not a bank.</li>
-     * <li>The remaining digits will be bank indices of containers up to but not
-     * including the top-level reactor (there is no point in including the top-level
-     * reactor because it is never a bank).</li>
-     * <li>Each index that is returned can be used as an index into an array of
-     * runtime instances that is assumed to be in a <i>natural order</i>.</li>
-     * </ul>
-     *
-     * @param n The number of levels up of the parent. This is required to be
-     *  less than the depth of this RuntimeRange's instance or an exception will be thrown.
-     */
-    public Set<Integer> parentInstances(int n) {
-        Set<Integer> result = new LinkedHashSet<>(width);
-        MixedRadixInt mr = startMR();
-        int count = 0;
-        while (count++ < width) {
-            result.add(mr.get(n));
-            mr.increment();
-        }
-        return result;
+    return result;
+  }
+
+  /**
+   * Return a range that is the subset of this range that overlaps with the specified range or null
+   * if there is no overlap.
+   */
+  public RuntimeRange<?> overlap(RuntimeRange<?> range) {
+    if (!overlaps(range)) return null;
+    int newStart = Math.max(start, range.start);
+    int newEnd = Math.min(start + width, range.start + range.width);
+    return tail(newStart - start).head(newEnd - newStart);
+  }
+
+  /**
+   * Return true if the specified range has the same instance as this range and the ranges overlap.
+   */
+  public boolean overlaps(RuntimeRange<?> range) {
+    if (!instance.equals(range.instance)) return false;
+    return start < range.start + range.width && start + width > range.start;
+  }
+
+  /**
+   * Return a set of identifiers for runtime instances of a parent of this {@link RuntimeRange}'s
+   * instance {@code n} levels above this {@link RuntimeRange}'s instance. If {@code n == 1}, for
+   * example, then this return the identifiers for the parent ReactorInstance.
+   *
+   * <p>This returns a list of <i>natural identifiers</i>, as defined below, for the instances
+   * within the range.
+   *
+   * <p>The resulting list can be used to count the number of distinct runtime instances of this
+   * RuntimeRange's instance (using {@code n == 0}) or any of its parents that lie within the range
+   * and to provide an index into an array of runtime instances.
+   *
+   * <p>Each <i>natural identifier</i> is the integer value of a mixed-radix number defined as
+   * follows:
+   *
+   * <ul>
+   *   <li>The low-order digit is the index of the runtime instance of {@code i} within its
+   *       container. If the {@link NamedInstance} is a {@code PortInstance}, this will be the
+   *       multiport channel or {@code 0} if it is not a multiport. If the NamedInstance is a
+   *       ReactorInstance, then it will be the bank index or {@code 0} if the reactor is not a
+   *       bank. The radix for this digit will be the multiport width or bank width or 1 if the
+   *       NamedInstance is neither a multiport nor a bank.
+   *   <li>The next digit will be the bank index of the container of the specified {@link
+   *       NamedInstance} or {@code 0} if it is not a bank.
+   *   <li>The remaining digits will be bank indices of containers up to but not including the
+   *       top-level reactor (there is no point in including the top-level reactor because it is
+   *       never a bank).
+   *   <li>Each index that is returned can be used as an index into an array of runtime instances
+   *       that is assumed to be in a <i>natural order</i>.
+   * </ul>
+   *
+   * @param n The number of levels up of the parent. This is required to be less than the depth of
+   *     this RuntimeRange's instance or an exception will be thrown.
+   */
+  public Set<Integer> parentInstances(int n) {
+    Set<Integer> result = new LinkedHashSet<>(width);
+    MixedRadixInt mr = startMR();
+    int count = 0;
+    while (count++ < width) {
+      result.add(mr.get(n));
+      mr.increment();
     }
+    return result;
+  }
 
-    /**
-     * Return the nearest containing ReactorInstance for this instance.
-     * If this instance is a ReactorInstance, then return it.
-     * Otherwise, return its parent.
-     */
-    public ReactorInstance parentReactor() {
-        if (instance instanceof ReactorInstance) {
-            return (ReactorInstance)instance;
-        } else {
-            return instance.getParent();
-        }
+  /**
+   * Return the nearest containing ReactorInstance for this instance. If this instance is a
+   * ReactorInstance, then return it. Otherwise, return its parent.
+   */
+  public ReactorInstance parentReactor() {
+    if (instance instanceof ReactorInstance) {
+      return (ReactorInstance) instance;
+    } else {
+      return instance.getParent();
     }
-    
-    /**
-     * Return the permutation vector that indicates the order in which the digits
-     * of the permuted mixed-radix representations of indices in this range should
-     * be incremented.
-     */
-    public List<Integer> permutation() {
-        List<Integer> result = new ArrayList<>(instance.depth);
-        // Populate the result with default zeros.
-        for (int i = 0; i < instance.depth; i++) {
-            result.add(0);
-        }
-        int count = 0;
-        for (NamedInstance<?> i : iterationOrder()) {
-            result.set(count++, instance.depth - i.depth);
-        }
-        return result;
+  }
+
+  /**
+   * Return the permutation vector that indicates the order in which the digits of the permuted
+   * mixed-radix representations of indices in this range should be incremented.
+   */
+  public List<Integer> permutation() {
+    List<Integer> result = new ArrayList<>(instance.depth);
+    // Populate the result with default zeros.
+    for (int i = 0; i < instance.depth; i++) {
+      result.add(0);
     }
-    
-    /**
-     * Return the radixes vector containing the width of this instance followed
-     * by the widths of its containers, not including the top level, which always
-     * has radix 1 and value 0.
-     */
-    public List<Integer> radixes() {
-        List<Integer> result = new ArrayList<>(instance.depth);
-        int width = instance.width;
-        // If the width cannot be determined, assume 1.
-        if (width < 0) width = 1;
-        result.add(width);
-        ReactorInstance p = instance.getParent();
-        while (p != null && p.getDepth() > 0) {
-            width = p.getWidth();
-            // If the width cannot be determined, assume 1.
-            if (width < 0) width = 1;
-            result.add(width);
-            p = p.getParent();
-        }
-        return result;
+    int count = 0;
+    for (NamedInstance<?> i : iterationOrder()) {
+      result.set(count++, instance.depth - i.depth);
     }
+    return result;
+  }
 
-    /**
-     * Return the start as a new permuted mixed-radix number.
-     * For any instance that is neither a multiport nor a bank, the
-     * corresponding digit will be 0.
-     */
-    public MixedRadixInt startMR() {
-        MixedRadixInt result = new MixedRadixInt(null, radixes(), permutation());
-        result.setMagnitude(start);
-        return result;
+  /**
+   * Return the radixes vector containing the width of this instance followed by the widths of its
+   * containers, not including the top level, which always has radix 1 and value 0.
+   */
+  public List<Integer> radixes() {
+    List<Integer> result = new ArrayList<>(instance.depth);
+    int width = instance.width;
+    // If the width cannot be determined, assume 1.
+    if (width < 0) width = 1;
+    result.add(width);
+    ReactorInstance p = instance.getParent();
+    while (p != null && p.getDepth() > 0) {
+      width = p.getWidth();
+      // If the width cannot be determined, assume 1.
+      if (width < 0) width = 1;
+      result.add(width);
+      p = p.getParent();
     }
+    return result;
+  }
 
-    /**
-     * Return a new range that represents the leftover elements
-     * starting at the specified offset relative to start.
-     * If start + offset is greater than or equal to the width, then this returns null.
-     * If this offset is 0 then this returns this range unmodified.
-     * @param offset The number of elements to consume. 
-     */
-    public RuntimeRange<T> tail(int offset) {
-        if (offset == 0) return this;
-        if (offset >= width) return null;
-        return new RuntimeRange<>(instance, start + offset, width - offset, _interleaved);
+  /**
+   * Return the start as a new permuted mixed-radix number. For any instance that is neither a
+   * multiport nor a bank, the corresponding digit will be 0.
+   */
+  public MixedRadixInt startMR() {
+    MixedRadixInt result = new MixedRadixInt(null, radixes(), permutation());
+    result.setMagnitude(start);
+    return result;
+  }
+
+  /**
+   * Return a new range that represents the leftover elements starting at the specified offset
+   * relative to start. If start + offset is greater than or equal to the width, then this returns
+   * null. If this offset is 0 then this returns this range unmodified.
+   *
+   * @param offset The number of elements to consume.
+   */
+  public RuntimeRange<T> tail(int offset) {
+    if (offset == 0) return this;
+    if (offset >= width) return null;
+    return new RuntimeRange<>(instance, start + offset, width - offset, _interleaved);
+  }
+
+  /**
+   * Toggle the interleaved status of the specified reactor, which is assumed to be a parent of the
+   * instance of this range. If it was previously interleaved, make it not interleaved and vice
+   * versa. This returns a new RuntimeRange.
+   *
+   * @param reactor The parent reactor at which to toggle interleaving.
+   */
+  public RuntimeRange<T> toggleInterleaved(ReactorInstance reactor) {
+    Set<ReactorInstance> newInterleaved = new HashSet<>(_interleaved);
+    if (_interleaved.contains(reactor)) {
+      newInterleaved.remove(reactor);
+    } else {
+      newInterleaved.add(reactor);
     }
-    
-    /**
-     * Toggle the interleaved status of the specified reactor, which is assumed
-     * to be a parent of the instance of this range.
-     * If it was previously interleaved, make it not interleaved
-     * and vice versa.  This returns a new RuntimeRange.
-     * @param reactor The parent reactor at which to toggle interleaving.
-     */
-    public RuntimeRange<T> toggleInterleaved(ReactorInstance reactor) {
-        Set<ReactorInstance> newInterleaved = new HashSet<>(_interleaved);
-        if (_interleaved.contains(reactor)) {
-            newInterleaved.remove(reactor);
-        } else {
-            newInterleaved.add(reactor);
-        }
-        return new RuntimeRange<>(instance, start, width, newInterleaved);
+    return new RuntimeRange<>(instance, start, width, newInterleaved);
+  }
+
+  @Override
+  public String toString() {
+    return instance.getFullName() + "(" + start + "," + width + ")";
+  }
+
+  //////////////////////////////////////////////////////////
+  //// Protected variables
+
+  /** Record of which levels are interleaved. */
+  Set<ReactorInstance> _interleaved = new HashSet<>();
+
+  //////////////////////////////////////////////////////////
+  //// Public inner classes
+
+  /** Special case of RuntimeRange for PortInstance. */
+  public static class Port extends RuntimeRange<PortInstance> {
+    public Port(PortInstance instance) {
+      super(instance, null);
     }
-        
-    @Override
-    public String toString() {
-        return instance.getFullName() + "(" + start + "," + width + ")";
+
+    public Port(PortInstance instance, Set<ReactorInstance> interleaved) {
+      super(instance, interleaved);
     }
-    
-    //////////////////////////////////////////////////////////
-    //// Protected variables
-    
-    /** Record of which levels are interleaved. */
-    Set<ReactorInstance> _interleaved = new HashSet<>();
-    
-    //////////////////////////////////////////////////////////
-    //// Public inner classes
-    
-    /**
-     * Special case of RuntimeRange for PortInstance.
-     */
-    public static class Port extends RuntimeRange<PortInstance> {
-        public Port(PortInstance instance) {
-            super(instance, null);
-        }
-        public Port(PortInstance instance, Set<ReactorInstance> interleaved) {
-            super(instance, interleaved);
-        }
-        public Port(PortInstance instance, int start, int width, Set<ReactorInstance> interleaved) {
-            super(instance, start, width, interleaved);
-        }
+
+    public Port(PortInstance instance, int start, int width, Set<ReactorInstance> interleaved) {
+      super(instance, start, width, interleaved);
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/SendRange.java b/org.lflang/src/org/lflang/generator/SendRange.java
index c6f6221b5f..5e7f406f1e 100644
--- a/org.lflang/src/org/lflang/generator/SendRange.java
+++ b/org.lflang/src/org/lflang/generator/SendRange.java
@@ -32,286 +32,277 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.lflang.lf.Connection;
 
 /**
- * Class representing a range of a port that sources data
- * together with a list of destination ranges of other ports that should all
- * receive the same data sent in this range.
- * All ranges in the destinations list have widths that are an integer
- * multiple N of this range but not necessarily the same start offsets.
- * 
- * This class and subclasses are designed to be immutable.
- * Modifications always return a new RuntimeRange.
+ * Class representing a range of a port that sources data together with a list of destination ranges
+ * of other ports that should all receive the same data sent in this range. All ranges in the
+ * destinations list have widths that are an integer multiple N of this range but not necessarily
+ * the same start offsets.
+ *
+ * <p>This class and subclasses are designed to be immutable. Modifications always return a new
+ * RuntimeRange.
  *
  * @author Edward A. Lee
-*/
+ */
 public class SendRange extends RuntimeRange.Port {
-    
-    /**
-     * Create a new send range.
-     * @param instance The instance over which this is a range of.
-     * @param start The starting index.
-     * @param width The width.
-     * @param interleaved A list of parents that are interleaved or null if none.
-     * @param connection The connection that establishes this send or null if not unique or none.
-     */
-    public SendRange(
-            PortInstance instance,
-            int start,
-            int width,
-            Set<ReactorInstance> interleaved,
-            Connection connection
-    ) {
-        super(instance, start, width, interleaved);
-        this.connection = connection;
-    }
 
-    /**
-     * Create a new send range representing sending from the specified
-     * src to the specified dst.  This preserves the interleaved status
-     * of both the src and dst.
-     * @param src The source range.
-     * @param dst The destination range.
-     * @param interleaved A list of parents that are interleaved or null if none.
-     * @param connection The connection that establishes this send or null if not unique or none.
-     */
-    public SendRange(
-            RuntimeRange<PortInstance> src,
-            RuntimeRange<PortInstance> dst,
-            Set<ReactorInstance> interleaved,
-            Connection connection
-    ) {
-        super(src.instance, src.start, src.width, interleaved);
-        destinations.add(dst);
-        _interleaved.addAll(src._interleaved);
-        this.connection = connection;
-    }
+  /**
+   * Create a new send range.
+   *
+   * @param instance The instance over which this is a range of.
+   * @param start The starting index.
+   * @param width The width.
+   * @param interleaved A list of parents that are interleaved or null if none.
+   * @param connection The connection that establishes this send or null if not unique or none.
+   */
+  public SendRange(
+      PortInstance instance,
+      int start,
+      int width,
+      Set<ReactorInstance> interleaved,
+      Connection connection) {
+    super(instance, start, width, interleaved);
+    this.connection = connection;
+  }
 
-    //////////////////////////////////////////////////////////
-    //// Public variables
+  /**
+   * Create a new send range representing sending from the specified src to the specified dst. This
+   * preserves the interleaved status of both the src and dst.
+   *
+   * @param src The source range.
+   * @param dst The destination range.
+   * @param interleaved A list of parents that are interleaved or null if none.
+   * @param connection The connection that establishes this send or null if not unique or none.
+   */
+  public SendRange(
+      RuntimeRange<PortInstance> src,
+      RuntimeRange<PortInstance> dst,
+      Set<ReactorInstance> interleaved,
+      Connection connection) {
+    super(src.instance, src.start, src.width, interleaved);
+    destinations.add(dst);
+    _interleaved.addAll(src._interleaved);
+    this.connection = connection;
+  }
 
-    /** The connection that establishes this relationship or null if not unique or none. */
-    public final Connection connection;
-    
-    /** The list of destination ranges to which this broadcasts. */
-    public final List<RuntimeRange<PortInstance>> destinations = new ArrayList<>();
+  //////////////////////////////////////////////////////////
+  //// Public variables
 
-    //////////////////////////////////////////////////////////
-    //// Public methods
+  /** The connection that establishes this relationship or null if not unique or none. */
+  public final Connection connection;
 
-    /**
-     * Add a destination to the list of destinations of this range.
-     * If the width of the destination is not a multiple of the width
-     * of this range, throw an exception.
-     * @throws IllegalArgumentException If the width doesn't match.
-     */
-    public void addDestination(RuntimeRange<PortInstance> dst) {
-        if (dst.width % width != 0) {
-            throw new IllegalArgumentException(
-                    "Destination range width is not a multiple of sender's width");
-        }
-        destinations.add(dst);
-        // Void any precomputed number of destinations.
-        _numberOfDestinationReactors = -1;
+  /** The list of destination ranges to which this broadcasts. */
+  public final List<RuntimeRange<PortInstance>> destinations = new ArrayList<>();
+
+  //////////////////////////////////////////////////////////
+  //// Public methods
+
+  /**
+   * Add a destination to the list of destinations of this range. If the width of the destination is
+   * not a multiple of the width of this range, throw an exception.
+   *
+   * @throws IllegalArgumentException If the width doesn't match.
+   */
+  public void addDestination(RuntimeRange<PortInstance> dst) {
+    if (dst.width % width != 0) {
+      throw new IllegalArgumentException(
+          "Destination range width is not a multiple of sender's width");
     }
-    
-    /**
-     * Override the base class to add additional comparisons so that
-     * ordering is never ambiguous. This means that sorting will be deterministic.
-     * Note that this can return 0 even if equals() does not return true.
-     */
-    @Override
-    public int compareTo(RuntimeRange<?> o) {
-        int result = super.compareTo(o);
-        if (result == 0) {
-            // Longer destination lists come first.
-            if (destinations.size() > ((SendRange)o).destinations.size()) {
-                return -1;
-            } else if (destinations.size() == ((SendRange)o).destinations.size()) {
-                return instance.getFullName().compareTo(o.instance.getFullName());
-            } else {
-                return 1;
-            }
-        }
-        return result;
+    destinations.add(dst);
+    // Void any precomputed number of destinations.
+    _numberOfDestinationReactors = -1;
+  }
+
+  /**
+   * Override the base class to add additional comparisons so that ordering is never ambiguous. This
+   * means that sorting will be deterministic. Note that this can return 0 even if equals() does not
+   * return true.
+   */
+  @Override
+  public int compareTo(RuntimeRange<?> o) {
+    int result = super.compareTo(o);
+    if (result == 0) {
+      // Longer destination lists come first.
+      if (destinations.size() > ((SendRange) o).destinations.size()) {
+        return -1;
+      } else if (destinations.size() == ((SendRange) o).destinations.size()) {
+        return instance.getFullName().compareTo(o.instance.getFullName());
+      } else {
+        return 1;
+      }
     }
+    return result;
+  }
 
-    /**
-     * Return the total number of destination reactors for this range.
-     * Specifically, this is the number of distinct runtime reactor instances
-     * that react to messages from this send range.
-     */
-    public int getNumberOfDestinationReactors() {
-        if (_numberOfDestinationReactors < 0) {
-            // Has not been calculated before. Calculate now.
-            _numberOfDestinationReactors = 0;
-            Map<ReactorInstance, Set<Integer>> result = new HashMap<>();
-            for (RuntimeRange<PortInstance> destination : this.destinations) {
-                // The following set contains unique identifiers the parent reactors
-                // of destination ports.
-                Set<Integer> parentIDs = destination.parentInstances(1);
-                Set<Integer> previousParentIDs = result.get(destination.instance.parent);
-                if (previousParentIDs == null) {
-                    result.put(destination.instance.parent, parentIDs);
-                } else {
-                    previousParentIDs.addAll(parentIDs);
-                }
-            }
-            for (ReactorInstance parent : result.keySet()) {
-                _numberOfDestinationReactors += result.get(parent).size();
-            }
+  /**
+   * Return the total number of destination reactors for this range. Specifically, this is the
+   * number of distinct runtime reactor instances that react to messages from this send range.
+   */
+  public int getNumberOfDestinationReactors() {
+    if (_numberOfDestinationReactors < 0) {
+      // Has not been calculated before. Calculate now.
+      _numberOfDestinationReactors = 0;
+      Map<ReactorInstance, Set<Integer>> result = new HashMap<>();
+      for (RuntimeRange<PortInstance> destination : this.destinations) {
+        // The following set contains unique identifiers the parent reactors
+        // of destination ports.
+        Set<Integer> parentIDs = destination.parentInstances(1);
+        Set<Integer> previousParentIDs = result.get(destination.instance.parent);
+        if (previousParentIDs == null) {
+          result.put(destination.instance.parent, parentIDs);
+        } else {
+          previousParentIDs.addAll(parentIDs);
         }
-        return _numberOfDestinationReactors;
+      }
+      for (ReactorInstance parent : result.keySet()) {
+        _numberOfDestinationReactors += result.get(parent).size();
+      }
     }
+    return _numberOfDestinationReactors;
+  }
 
-    /**
-     * Return a new SendRange that is identical to this range but
-     * with width reduced to the specified width.
-     * If the new width is greater than or equal to the width
-     * of this range, then return this range.
-     * If the newWidth is 0 or negative, return null.
-     * This overrides the base class to also apply head()
-     * to the destination list.
-     * @param newWidth The new width.
-     */
-    @Override
-    public SendRange head(int newWidth) {
-        // NOTE: Cannot use the superclass because it returns a RuntimeRange, not a SendRange.
-        // Also, cannot return this without applying head() to the destinations.
-        if (newWidth <= 0) return null;
+  /**
+   * Return a new SendRange that is identical to this range but with width reduced to the specified
+   * width. If the new width is greater than or equal to the width of this range, then return this
+   * range. If the newWidth is 0 or negative, return null. This overrides the base class to also
+   * apply head() to the destination list.
+   *
+   * @param newWidth The new width.
+   */
+  @Override
+  public SendRange head(int newWidth) {
+    // NOTE: Cannot use the superclass because it returns a RuntimeRange, not a SendRange.
+    // Also, cannot return this without applying head() to the destinations.
+    if (newWidth <= 0) return null;
 
-        SendRange result = new SendRange(instance, start, newWidth, _interleaved, connection);
-        
-        for (RuntimeRange<PortInstance> destination : destinations) {
-            result.destinations.add(destination.head(newWidth));
-        }
-        return result;
+    SendRange result = new SendRange(instance, start, newWidth, _interleaved, connection);
+
+    for (RuntimeRange<PortInstance> destination : destinations) {
+      result.destinations.add(destination.head(newWidth));
     }
+    return result;
+  }
 
-    /**
-     * Return a range that is the subset of this range that overlaps with the
-     * specified range or null if there is no overlap.
-     */
-    @Override
-    public SendRange overlap(RuntimeRange<?> range) {
-        if (!overlaps(range)) return null;
-        if (range.start == start && range.width == width) return this;
-        int newStart = Math.max(start, range.start);
-        int newEnd = Math.min(start + width, range.start + range.width);
-        int newWidth = newEnd - newStart;
-        SendRange result = new SendRange(instance, newStart, newWidth, _interleaved, connection);
-        result._interleaved.addAll(_interleaved);
-        for (RuntimeRange<PortInstance> destination : destinations) {
-            // The destination width is a multiple of this range's width.
-            // If the multiple is greater than 1, then the destination needs to
-            // split into multiple destinations.
-            while (destination != null) {
-                int dstStart = destination.start + (newStart - start);
-                RuntimeRange.Port dst = new RuntimeRange.Port(
-                        destination.instance,
-                        dstStart,
-                        newWidth,
-                        destination._interleaved
-                );
-                result.addDestination(dst);
-                destination = destination.tail(width);
-            }
-        }
-        return result;
+  /**
+   * Return a range that is the subset of this range that overlaps with the specified range or null
+   * if there is no overlap.
+   */
+  @Override
+  public SendRange overlap(RuntimeRange<?> range) {
+    if (!overlaps(range)) return null;
+    if (range.start == start && range.width == width) return this;
+    int newStart = Math.max(start, range.start);
+    int newEnd = Math.min(start + width, range.start + range.width);
+    int newWidth = newEnd - newStart;
+    SendRange result = new SendRange(instance, newStart, newWidth, _interleaved, connection);
+    result._interleaved.addAll(_interleaved);
+    for (RuntimeRange<PortInstance> destination : destinations) {
+      // The destination width is a multiple of this range's width.
+      // If the multiple is greater than 1, then the destination needs to
+      // split into multiple destinations.
+      while (destination != null) {
+        int dstStart = destination.start + (newStart - start);
+        RuntimeRange.Port dst =
+            new RuntimeRange.Port(
+                destination.instance, dstStart, newWidth, destination._interleaved);
+        result.addDestination(dst);
+        destination = destination.tail(width);
+      }
     }
+    return result;
+  }
 
-    /**
-     * Return a new SendRange that represents the leftover elements
-     * starting at the specified offset. If the offset is greater
-     * than or equal to the width, then this returns null.
-     * If this offset is 0 then this returns this range unmodified.
-     * This overrides the base class to also apply tail()
-     * to the destination list.
-     * @param offset The number of elements to consume. 
-     */
-    @Override
-    public SendRange tail(int offset) {
-        // NOTE: Cannot use the superclass because it returns a RuntimeRange, not a SendRange.
-        // Also, cannot return this without applying tail() to the destinations.
-        if (offset >= width) return null;
-        SendRange result = new SendRange(
-                instance, start + offset, width - offset, _interleaved, connection);
+  /**
+   * Return a new SendRange that represents the leftover elements starting at the specified offset.
+   * If the offset is greater than or equal to the width, then this returns null. If this offset is
+   * 0 then this returns this range unmodified. This overrides the base class to also apply tail()
+   * to the destination list.
+   *
+   * @param offset The number of elements to consume.
+   */
+  @Override
+  public SendRange tail(int offset) {
+    // NOTE: Cannot use the superclass because it returns a RuntimeRange, not a SendRange.
+    // Also, cannot return this without applying tail() to the destinations.
+    if (offset >= width) return null;
+    SendRange result =
+        new SendRange(instance, start + offset, width - offset, _interleaved, connection);
 
-        for (RuntimeRange<PortInstance> destination : destinations) {
-            result.destinations.add(destination.tail(offset));
-        }
-        return result;
+    for (RuntimeRange<PortInstance> destination : destinations) {
+      result.destinations.add(destination.tail(offset));
     }
+    return result;
+  }
 
-    @Override
-    public String toString() {
-        StringBuilder result = new StringBuilder();
-        result.append(super.toString());
-        result.append("->[");
-        List<String> dsts = new LinkedList<>();
-        for (RuntimeRange<PortInstance> dst : destinations) {
-            dsts.add(dst.toString());
-        }
-        result.append(String.join(", ", dsts));
-        result.append("]");
-        return result.toString();
+  @Override
+  public String toString() {
+    StringBuilder result = new StringBuilder();
+    result.append(super.toString());
+    result.append("->[");
+    List<String> dsts = new LinkedList<>();
+    for (RuntimeRange<PortInstance> dst : destinations) {
+      dsts.add(dst.toString());
     }
+    result.append(String.join(", ", dsts));
+    result.append("]");
+    return result.toString();
+  }
+
+  //////////////////////////////////////////////////////////
+  //// Protected methods
 
-    //////////////////////////////////////////////////////////
-    //// Protected methods
+  /**
+   * Assuming that this SendRange is completely contained by one of the destinations of the
+   * specified srcRange, return a new SendRange where the send range is the subrange of the
+   * specified srcRange that overlaps with this SendRange and the destinations include all the
+   * destinations of this SendRange. If the assumption is not satisfied, throw an
+   * IllegalArgumentException.
+   *
+   * <p>If any parent of this range is marked interleaved and is also a parent of the specified
+   * srcRange, then that parent will be marked interleaved in the result.
+   *
+   * @param srcRange A new source range.
+   * @param srcRangeOffset An offset into the source range.
+   */
+  protected SendRange newSendRange(SendRange srcRange, int srcRangeOffset) {
+    // Every destination of srcRange receives all channels of srcRange (multicast).
+    // Find which multicast destination overlaps with this srcRange.
+    for (RuntimeRange<PortInstance> srcDestination : srcRange.destinations) {
+      RuntimeRange<?> overlap = srcDestination.overlap(this);
+      if (overlap == null) continue; // Not this one.
 
-    /**
-     * Assuming that this SendRange is completely contained by one
-     * of the destinations of the specified srcRange, return a new SendRange
-     * where the send range is the subrange of the specified srcRange that
-     * overlaps with this SendRange and the destinations include all the
-     * destinations of this SendRange. If the assumption is not satisfied,
-     * throw an IllegalArgumentException.
-     * 
-     * If any parent of this range is marked interleaved and is also a parent of the
-     * specified srcRange, then that parent will be marked interleaved
-     * in the result.
-     * 
-     * @param srcRange A new source range.
-     * @param srcRangeOffset An offset into the source range.
-     */
-    protected SendRange newSendRange(SendRange srcRange, int srcRangeOffset) {
-        // Every destination of srcRange receives all channels of srcRange (multicast).
-        // Find which multicast destination overlaps with this srcRange.
-        for (RuntimeRange<PortInstance> srcDestination : srcRange.destinations) {
-            RuntimeRange<?> overlap = srcDestination.overlap(this);
-            if (overlap == null) continue; // Not this one.
-            
-            if (overlap.width == width) {
-                // Found an overlap that is completely contained.
-                // If this width is greater than the srcRange width,
-                // then assume srcRange is multicasting via this.
-                int newWidth = Math.min(width,  srcRange.width);
-                // The interleaving of the result is the union of the two interleavings.
-                Set<ReactorInstance> interleaving = new LinkedHashSet<>();
-                interleaving.addAll(_interleaved);
-                interleaving.addAll(srcRange._interleaved);
-                SendRange result = new SendRange(
-                        srcRange.instance,
-                        srcRange.start + srcRangeOffset,
-                        newWidth,
-                        interleaving,
-                        connection);
-                for (RuntimeRange<PortInstance> dst : destinations) {
-                    result.addDestination(dst);
-                }
-                return result;
-            }
+      if (overlap.width == width) {
+        // Found an overlap that is completely contained.
+        // If this width is greater than the srcRange width,
+        // then assume srcRange is multicasting via this.
+        int newWidth = Math.min(width, srcRange.width);
+        // The interleaving of the result is the union of the two interleavings.
+        Set<ReactorInstance> interleaving = new LinkedHashSet<>();
+        interleaving.addAll(_interleaved);
+        interleaving.addAll(srcRange._interleaved);
+        SendRange result =
+            new SendRange(
+                srcRange.instance,
+                srcRange.start + srcRangeOffset,
+                newWidth,
+                interleaving,
+                connection);
+        for (RuntimeRange<PortInstance> dst : destinations) {
+          result.addDestination(dst);
         }
-        throw new IllegalArgumentException(
-                "Expected this SendRange " + this
-                + " to be completely contained by a destination of " + srcRange);
+        return result;
+      }
     }
+    throw new IllegalArgumentException(
+        "Expected this SendRange "
+            + this
+            + " to be completely contained by a destination of "
+            + srcRange);
+  }
 
-    //////////////////////////////////////////////////////////
-    //// Private variables
+  //////////////////////////////////////////////////////////
+  //// Private variables
 
-    private int _numberOfDestinationReactors = -1; // Never access this directly.
+  private int _numberOfDestinationReactors = -1; // Never access this directly.
 }
diff --git a/org.lflang/src/org/lflang/generator/SubContext.java b/org.lflang/src/org/lflang/generator/SubContext.java
index 5e7a981ab8..cf90cb1fda 100644
--- a/org.lflang/src/org/lflang/generator/SubContext.java
+++ b/org.lflang/src/org/lflang/generator/SubContext.java
@@ -1,90 +1,88 @@
 package org.lflang.generator;
 
-import java.io.File;
 import java.util.Properties;
-
 import org.eclipse.xtext.util.CancelIndicator;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 
 /**
- * A {@code SubContext} is the context of a process within a build process. For example,
- * compilation of generated code may optionally be given a {@code SubContext} because
- * compilation is part of a complete build.
+ * A {@code SubContext} is the context of a process within a build process. For example, compilation
+ * of generated code may optionally be given a {@code SubContext} because compilation is part of a
+ * complete build.
  *
  * @author Peter Donovan
  */
 public class SubContext implements LFGeneratorContext {
 
-    private final LFGeneratorContext containingContext;
-    private final int startPercentProgress;
-    private final int endPercentProgress;
-    private GeneratorResult result = null;
-
-    protected ErrorReporter errorReporter;
-
-    /**
-     * Initializes the context within {@code containingContext} of the process that extends from
-     * {@code startPercentProgress} to {@code endPercentProgress}.
-     * @param containingContext The context of the containing build process.
-     * @param startPercentProgress The percent progress of the containing build process when this
-     *                             nested process starts.
-     * @param endPercentProgress The percent progress of the containing build process when this
-     *                           nested process ends.
-     */
-    public SubContext(LFGeneratorContext containingContext, int startPercentProgress, int endPercentProgress) {
-        this.containingContext = containingContext;
-        this.startPercentProgress = startPercentProgress;
-        this.endPercentProgress = endPercentProgress;
-    }
-
-    @Override
-    public CancelIndicator getCancelIndicator() {
-        return containingContext.getCancelIndicator();
-    }
-
-    @Override
-    public Mode getMode() {
-        return containingContext.getMode();
-    }
-
-    @Override
-    public Properties getArgs() {
-        return containingContext.getArgs();
-    }
-
-    @Override
-    public ErrorReporter getErrorReporter() {
-        return containingContext.getErrorReporter();
-    }
-
-    @Override
-    public void finish(GeneratorResult result) {
-        this.result = result;
-    }
-
-    @Override
-    public GeneratorResult getResult() {
-        return result;
-    }
-
-    @Override
-    public FileConfig getFileConfig() {
-        return containingContext.getFileConfig();
-    }
-
-    @Override
-    public TargetConfig getTargetConfig() {
-        return containingContext.getTargetConfig();
-    }
-
-    @Override
-    public void reportProgress(String message, int percentage) {
-        containingContext.reportProgress(
-            message,
-            startPercentProgress * (100 - percentage) / 100 + endPercentProgress * percentage / 100
-        );
-    }
+  private final LFGeneratorContext containingContext;
+  private final int startPercentProgress;
+  private final int endPercentProgress;
+  private GeneratorResult result = null;
+
+  protected ErrorReporter errorReporter;
+
+  /**
+   * Initializes the context within {@code containingContext} of the process that extends from
+   * {@code startPercentProgress} to {@code endPercentProgress}.
+   *
+   * @param containingContext The context of the containing build process.
+   * @param startPercentProgress The percent progress of the containing build process when this
+   *     nested process starts.
+   * @param endPercentProgress The percent progress of the containing build process when this nested
+   *     process ends.
+   */
+  public SubContext(
+      LFGeneratorContext containingContext, int startPercentProgress, int endPercentProgress) {
+    this.containingContext = containingContext;
+    this.startPercentProgress = startPercentProgress;
+    this.endPercentProgress = endPercentProgress;
+  }
+
+  @Override
+  public CancelIndicator getCancelIndicator() {
+    return containingContext.getCancelIndicator();
+  }
+
+  @Override
+  public Mode getMode() {
+    return containingContext.getMode();
+  }
+
+  @Override
+  public Properties getArgs() {
+    return containingContext.getArgs();
+  }
+
+  @Override
+  public ErrorReporter getErrorReporter() {
+    return containingContext.getErrorReporter();
+  }
+
+  @Override
+  public void finish(GeneratorResult result) {
+    this.result = result;
+  }
+
+  @Override
+  public GeneratorResult getResult() {
+    return result;
+  }
+
+  @Override
+  public FileConfig getFileConfig() {
+    return containingContext.getFileConfig();
+  }
+
+  @Override
+  public TargetConfig getTargetConfig() {
+    return containingContext.getTargetConfig();
+  }
+
+  @Override
+  public void reportProgress(String message, int percentage) {
+    containingContext.reportProgress(
+        message,
+        startPercentProgress * (100 - percentage) / 100 + endPercentProgress * percentage / 100);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/TargetTypes.java b/org.lflang/src/org/lflang/generator/TargetTypes.java
index 585d65c96a..eda5cffd11 100644
--- a/org.lflang/src/org/lflang/generator/TargetTypes.java
+++ b/org.lflang/src/org/lflang/generator/TargetTypes.java
@@ -3,10 +3,9 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.InferredType;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Action;
 import org.lflang.lf.BracedListExpression;
 import org.lflang.lf.CodeExpr;
@@ -21,257 +20,217 @@
 import org.lflang.lf.Type;
 
 /**
- * Information about the types of a target language. Contains
- * utilities to convert LF expressions and types to the target
- * language. Each code generator is expected to use at least one
+ * Information about the types of a target language. Contains utilities to convert LF expressions
+ * and types to the target language. Each code generator is expected to use at least one
  * language-specific instance of this interface.
- * <p>
- * TODO currently, {@link GeneratorBase} implements this interface,
- *  it should instead contain an instance.
+ *
+ * <p>TODO currently, {@link GeneratorBase} implements this interface, it should instead contain an
+ * instance.
  *
  * @author Clément Fournier - TU Dresden, INSA Rennes
  */
 public interface TargetTypes {
 
-
-    /**
-     * Return true if the target supports generics (i.e., parametric
-     * polymorphism), false otherwise.
-     */
-    boolean supportsGenerics();
-
-
-    /**
-     * Return the type of time durations.
-     */
-    String getTargetTimeType();
-
-
-    /**
-     * Return the type of tags.
-     */
-    String getTargetTagType();
-
-
-    /**
-     * Return the type of fixed sized lists (or arrays).
-     */
-    String getTargetFixedSizeListType(String baseType, int size);
-
-
-    /**
-     * Return the type of variable sized lists (eg {@code std::vector<baseType>}).
-     */
-    String getTargetVariableSizeListType(String baseType);
-
-
-    default String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
-        return escapeIdentifier(expr.getParameter().getName());
-    }
-
-    /** Translate the braced list expression into target language syntax. */
-    default String getTargetBracedListExpr(BracedListExpression expr, InferredType typeOrNull) {
-        InferredType t = typeOrNull == null ? InferredType.undefined() : typeOrNull;
-        return expr.getItems().stream().map(e -> getTargetExpr(e, t))
-            .collect(Collectors.joining(",", "{", "}"));
-    }
-
-    /**
-     * Return an "undefined" type which is used as a default
-     * when a type cannot be inferred.
-     */
-    String getTargetUndefinedType();
-
-    /**
-     * Returns a version of the given LF identifier that is
-     * escaped properly for insertion into a piece of target
-     * code.
-     */
-    default String escapeIdentifier(String ident) {
-        return ident;
-    }
-
-    /**
-     * Returns an expression in the target language that corresponds
-     * to the given time value ({@link #getTargetTimeType()}).
-     */
-    default String getTargetTimeExpr(TimeValue timeValue) {
-        // todo make non-default when we reuse this for all generators,
-        //  all targets should support this.
-        Objects.requireNonNull(timeValue);
-        throw new UnsupportedGeneratorFeatureException("Time expressions");
-    }
-
-    /**
-     * Returns an expression in the target language that corresponds
-     * to a variable-size list expression.
-     *
-     * @throws UnsupportedGeneratorFeatureException If the target does not support this
-     */
-    default String getVariableSizeListInitExpression(List<String> contents, boolean withBraces) {
-        throw new UnsupportedGeneratorFeatureException("Variable size lists");
-    }
-
-    /**
-     * Returns an expression in the target language that corresponds
-     * to a fixed-size list expression.
-     *
-     * @throws UnsupportedGeneratorFeatureException If the target does not support this
-     */
-    default String getFixedSizeListInitExpression(List<String> contents, int listSize, boolean withBraces) {
-        throw new UnsupportedGeneratorFeatureException("Fixed size lists");
-    }
-
-
-    /**
-     * Returns the expression that is used to replace a
-     * missing expression in the source language. The expression
-     * may for instance be a type-agnostic default value
-     * (e.g. Rust's {@code Default::default()}), or produce
-     * a compiler error (e.g. Rust's {@code compiler_error!("missing initializer")}).
-     *
-     * @throws UnsupportedGeneratorFeatureException If the target does not support this
-     */
-    default String getMissingExpr(InferredType type) {
-        throw new UnsupportedGeneratorFeatureException("Missing initializers");
-    }
-
-
-    /**
-     * Returns a target type inferred from the type node, or the
-     * initializer list. If both are absent, then the undefined
-     * type is returned.
-     */
-    default String getTargetType(Type type, Initializer init) {
-        return getTargetType(ASTUtils.getInferredType(type, init));
-    }
-
-    /**
-     * Returns the target type of the type node. This just provides
-     * a default parameter for {@link #getTargetType(Type, Initializer)}.
-     * If the parameter is null, then the undefined type is returned.
-     */
-    default String getTargetType(Type type) {
-        return getTargetType(type, null);
-    }
-
-    /**
-     * Return a string representing the specified type in the
-     * target language.
-     */
-    default String getTargetType(InferredType type) {
-        if (type.isUndefined()) {
-            return getTargetUndefinedType();
-        } else if (type.isTime) {
-            if (type.isFixedSizeList) {
-                return getTargetFixedSizeListType(getTargetTimeType(), type.listSize);
-            } else if (type.isVariableSizeList) {
-                return getTargetVariableSizeListType(getTargetTimeType());
-            } else {
-                return getTargetTimeType();
-            }
-        } else if (type.isFixedSizeList) {
-            return getTargetFixedSizeListType(type.baseType(), type.listSize);
-        } else if (type.isVariableSizeList) {
-            return getTargetVariableSizeListType(type.baseType());
-        } else if (!type.astType.getTypeArgs().isEmpty()) {
-            List<String> args = type.astType.getTypeArgs().stream().map(this::getTargetType).toList();
-            return getGenericType(type.baseType(), args);
-        }
-        return type.toOriginalText();
-    }
-
-    /** Build a generic type. The type args list must not be empty. */
-    default String getGenericType(String base, List<String> args) {
-        assert !args.isEmpty() : "Empty type arguments for " + base;
-        return base + "<" + String.join(", ", args) + ">";
-    }
-
-    /**
-     * Return a string representing the type of the given
-     * parameter.
-     */
-    default String getTargetType(Parameter p) {
-        return getTargetType(ASTUtils.getInferredType(p));
-    }
-
-    /**
-     * Return a string representing the type of the given
-     * state variable.
-     */
-    default String getTargetType(StateVar s) {
-        return getTargetType(ASTUtils.getInferredType(s));
-    }
-
-    /**
-     * Return a string representing the type of the given
-     * action.
-     */
-    default String getTargetType(Action a) {
-        return getTargetType(ASTUtils.getInferredType(a));
-    }
-
-    /**
-     * Return a string representing the type of the given
-     * port.
-     */
-    default String getTargetType(Port p) {
-        return getTargetType(ASTUtils.getInferredType(p));
-    }
-
-    /**
-     * Returns the representation of the given initializer
-     * expression in target code. The given type, if non-null,
-     * may inform the code generation.
-     *
-     * @param init           Initializer node (nullable)
-     * @param type           Declared type of the expression (nullable)
-     */
-    default String getTargetInitializer(Initializer init, Type type) {
-        var inferredType = ASTUtils.getInferredType(type, init);
-        if (init == null) {
-            return getMissingExpr(inferredType);
-        }
-        var single = ASTUtils.asSingleExpr(init);
-        if (single != null) {
-            return getTargetExpr(single, inferredType);
-        }
-        var targetValues = init.getExprs().stream().map(it -> getTargetExpr(it, inferredType)).collect(Collectors.toList());
-        if (inferredType.isFixedSizeList) {
-            return getFixedSizeListInitExpression(targetValues, inferredType.listSize, init.isBraces());
-        } else  {
-            return getVariableSizeListInitExpression(targetValues, init.isBraces());
-        }
-    }
-
-
-    /**
-     * Returns the representation of the given expression in target code.
-     * The given type, if non-null, may inform the code generation.
-     */
-    default String getTargetExpr(Expression expr, InferredType type) {
-        if (ASTUtils.isZero(expr) && type != null && type.isTime) {
-            return getTargetTimeExpr(TimeValue.ZERO);
-        } else if (expr instanceof ParameterReference) {
-            return getTargetParamRef((ParameterReference) expr, type);
-        } else if (expr instanceof Time) {
-            return getTargetTimeExpr((Time) expr);
-        } else if (expr instanceof Literal) {
-            return ASTUtils.addZeroToLeadingDot(((Literal) expr).getLiteral()); // here we don't escape
-        } else if (expr instanceof CodeExpr) {
-            return ASTUtils.toText(((CodeExpr) expr).getCode());
-        } else if (expr instanceof BracedListExpression) {
-            return getTargetBracedListExpr((BracedListExpression) expr, type);
-        } else {
-            throw new IllegalStateException("Invalid value " + expr);
-        }
-    }
-
-    /**
-     * Returns the representation of the given time value in
-     * target code.
-     */
-    default String getTargetTimeExpr(Time t) {
-        return getTargetTimeExpr(ASTUtils.toTimeValue(t));
-    }
+  /**
+   * Return true if the target supports generics (i.e., parametric polymorphism), false otherwise.
+   */
+  boolean supportsGenerics();
+
+  /** Return the type of time durations. */
+  String getTargetTimeType();
+
+  /** Return the type of tags. */
+  String getTargetTagType();
+
+  /** Return the type of fixed sized lists (or arrays). */
+  String getTargetFixedSizeListType(String baseType, int size);
+
+  /** Return the type of variable sized lists (eg {@code std::vector<baseType>}). */
+  String getTargetVariableSizeListType(String baseType);
+
+  default String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
+    return escapeIdentifier(expr.getParameter().getName());
+  }
+
+  /** Translate the braced list expression into target language syntax. */
+  default String getTargetBracedListExpr(BracedListExpression expr, InferredType typeOrNull) {
+    InferredType t = typeOrNull == null ? InferredType.undefined() : typeOrNull;
+    return expr.getItems().stream()
+        .map(e -> getTargetExpr(e, t))
+        .collect(Collectors.joining(",", "{", "}"));
+  }
+
+  /** Return an "undefined" type which is used as a default when a type cannot be inferred. */
+  String getTargetUndefinedType();
+
+  /**
+   * Returns a version of the given LF identifier that is escaped properly for insertion into a
+   * piece of target code.
+   */
+  default String escapeIdentifier(String ident) {
+    return ident;
+  }
+
+  /**
+   * Returns an expression in the target language that corresponds to the given time value ({@link
+   * #getTargetTimeType()}).
+   */
+  default String getTargetTimeExpr(TimeValue timeValue) {
+    // todo make non-default when we reuse this for all generators,
+    //  all targets should support this.
+    Objects.requireNonNull(timeValue);
+    throw new UnsupportedGeneratorFeatureException("Time expressions");
+  }
+
+  /**
+   * Returns an expression in the target language that corresponds to a variable-size list
+   * expression.
+   *
+   * @throws UnsupportedGeneratorFeatureException If the target does not support this
+   */
+  default String getVariableSizeListInitExpression(List<String> contents, boolean withBraces) {
+    throw new UnsupportedGeneratorFeatureException("Variable size lists");
+  }
+
+  /**
+   * Returns an expression in the target language that corresponds to a fixed-size list expression.
+   *
+   * @throws UnsupportedGeneratorFeatureException If the target does not support this
+   */
+  default String getFixedSizeListInitExpression(
+      List<String> contents, int listSize, boolean withBraces) {
+    throw new UnsupportedGeneratorFeatureException("Fixed size lists");
+  }
+
+  /**
+   * Returns the expression that is used to replace a missing expression in the source language. The
+   * expression may for instance be a type-agnostic default value (e.g. Rust's {@code
+   * Default::default()}), or produce a compiler error (e.g. Rust's {@code compiler_error!("missing
+   * initializer")}).
+   *
+   * @throws UnsupportedGeneratorFeatureException If the target does not support this
+   */
+  default String getMissingExpr(InferredType type) {
+    throw new UnsupportedGeneratorFeatureException("Missing initializers");
+  }
+
+  /**
+   * Returns a target type inferred from the type node, or the initializer list. If both are absent,
+   * then the undefined type is returned.
+   */
+  default String getTargetType(Type type, Initializer init) {
+    return getTargetType(ASTUtils.getInferredType(type, init));
+  }
+
+  /**
+   * Returns the target type of the type node. This just provides a default parameter for {@link
+   * #getTargetType(Type, Initializer)}. If the parameter is null, then the undefined type is
+   * returned.
+   */
+  default String getTargetType(Type type) {
+    return getTargetType(type, null);
+  }
+
+  /** Return a string representing the specified type in the target language. */
+  default String getTargetType(InferredType type) {
+    if (type.isUndefined()) {
+      return getTargetUndefinedType();
+    } else if (type.isTime) {
+      if (type.isFixedSizeList) {
+        return getTargetFixedSizeListType(getTargetTimeType(), type.listSize);
+      } else if (type.isVariableSizeList) {
+        return getTargetVariableSizeListType(getTargetTimeType());
+      } else {
+        return getTargetTimeType();
+      }
+    } else if (type.isFixedSizeList) {
+      return getTargetFixedSizeListType(type.baseType(), type.listSize);
+    } else if (type.isVariableSizeList) {
+      return getTargetVariableSizeListType(type.baseType());
+    } else if (!type.astType.getTypeArgs().isEmpty()) {
+      List<String> args = type.astType.getTypeArgs().stream().map(this::getTargetType).toList();
+      return getGenericType(type.baseType(), args);
+    }
+    return type.toOriginalText();
+  }
+
+  /** Build a generic type. The type args list must not be empty. */
+  default String getGenericType(String base, List<String> args) {
+    assert !args.isEmpty() : "Empty type arguments for " + base;
+    return base + "<" + String.join(", ", args) + ">";
+  }
+
+  /** Return a string representing the type of the given parameter. */
+  default String getTargetType(Parameter p) {
+    return getTargetType(ASTUtils.getInferredType(p));
+  }
+
+  /** Return a string representing the type of the given state variable. */
+  default String getTargetType(StateVar s) {
+    return getTargetType(ASTUtils.getInferredType(s));
+  }
+
+  /** Return a string representing the type of the given action. */
+  default String getTargetType(Action a) {
+    return getTargetType(ASTUtils.getInferredType(a));
+  }
+
+  /** Return a string representing the type of the given port. */
+  default String getTargetType(Port p) {
+    return getTargetType(ASTUtils.getInferredType(p));
+  }
+
+  /**
+   * Returns the representation of the given initializer expression in target code. The given type,
+   * if non-null, may inform the code generation.
+   *
+   * @param init Initializer node (nullable)
+   * @param type Declared type of the expression (nullable)
+   */
+  default String getTargetInitializer(Initializer init, Type type) {
+    var inferredType = ASTUtils.getInferredType(type, init);
+    if (init == null) {
+      return getMissingExpr(inferredType);
+    }
+    var single = ASTUtils.asSingleExpr(init);
+    if (single != null) {
+      return getTargetExpr(single, inferredType);
+    }
+    var targetValues =
+        init.getExprs().stream()
+            .map(it -> getTargetExpr(it, inferredType))
+            .collect(Collectors.toList());
+    if (inferredType.isFixedSizeList) {
+      return getFixedSizeListInitExpression(targetValues, inferredType.listSize, init.isBraces());
+    } else {
+      return getVariableSizeListInitExpression(targetValues, init.isBraces());
+    }
+  }
+
+  /**
+   * Returns the representation of the given expression in target code. The given type, if non-null,
+   * may inform the code generation.
+   */
+  default String getTargetExpr(Expression expr, InferredType type) {
+    if (ASTUtils.isZero(expr) && type != null && type.isTime) {
+      return getTargetTimeExpr(TimeValue.ZERO);
+    } else if (expr instanceof ParameterReference) {
+      return getTargetParamRef((ParameterReference) expr, type);
+    } else if (expr instanceof Time) {
+      return getTargetTimeExpr((Time) expr);
+    } else if (expr instanceof Literal) {
+      return ASTUtils.addZeroToLeadingDot(((Literal) expr).getLiteral()); // here we don't escape
+    } else if (expr instanceof CodeExpr) {
+      return ASTUtils.toText(((CodeExpr) expr).getCode());
+    } else if (expr instanceof BracedListExpression) {
+      return getTargetBracedListExpr((BracedListExpression) expr, type);
+    } else {
+      throw new IllegalStateException("Invalid value " + expr);
+    }
+  }
+
+  /** Returns the representation of the given time value in target code. */
+  default String getTargetTimeExpr(Time t) {
+    return getTargetTimeExpr(ASTUtils.toTimeValue(t));
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/TimerInstance.java b/org.lflang/src/org/lflang/generator/TimerInstance.java
index 492398998c..b25552bb6c 100644
--- a/org.lflang/src/org/lflang/generator/TimerInstance.java
+++ b/org.lflang/src/org/lflang/generator/TimerInstance.java
@@ -1,28 +1,28 @@
 /** Instance of a timer. */
 
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
@@ -31,63 +31,58 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 
 /**
  * Instance of a timer.
- * 
+ *
  * @author Marten Lohstroh
  * @author Edward A. Lee
  */
 public class TimerInstance extends TriggerInstance<Timer> {
 
-    /** The global default for offset. */
-    public static final TimeValue DEFAULT_OFFSET = TimeValue.ZERO;
+  /** The global default for offset. */
+  public static final TimeValue DEFAULT_OFFSET = TimeValue.ZERO;
 
-    /** The global default for period. */
-    public static final TimeValue DEFAULT_PERIOD = TimeValue.ZERO;
+  /** The global default for period. */
+  public static final TimeValue DEFAULT_PERIOD = TimeValue.ZERO;
 
-    private TimeValue offset = DEFAULT_OFFSET;
+  private TimeValue offset = DEFAULT_OFFSET;
 
-    private TimeValue period = DEFAULT_PERIOD;
+  private TimeValue period = DEFAULT_PERIOD;
 
-    /**
-	 * Create a new timer instance.
-	 * If the definition is null, then this is a startup timer.
-	 * @param definition The AST definition, or null for startup.
-	 * @param parent The parent reactor.
-	 */
-    public TimerInstance(Timer definition, ReactorInstance parent) {
-		super(definition, parent);
-        if (parent == null) {
-            throw new InvalidSourceException("Cannot create an TimerInstance with no parent.");
+  /**
+   * Create a new timer instance. If the definition is null, then this is a startup timer.
+   *
+   * @param definition The AST definition, or null for startup.
+   * @param parent The parent reactor.
+   */
+  public TimerInstance(Timer definition, ReactorInstance parent) {
+    super(definition, parent);
+    if (parent == null) {
+      throw new InvalidSourceException("Cannot create an TimerInstance with no parent.");
+    }
+    if (definition != null) {
+      if (definition.getOffset() != null) {
+        try {
+          this.offset = parent.getTimeValue(definition.getOffset());
+        } catch (IllegalArgumentException ex) {
+          parent.reporter.reportError(definition.getOffset(), "Invalid time.");
         }
-        if (definition != null) {
-            if (definition.getOffset() != null) {
-                try {
-                    this.offset = parent.getTimeValue(definition.getOffset());
-                } catch (IllegalArgumentException ex) {
-                    parent.reporter.reportError(definition.getOffset(), "Invalid time.");
-                }
-            }
-            if (definition.getPeriod() != null) {
-                try {
-                    this.period = parent.getTimeValue(definition.getPeriod());
-                } catch (IllegalArgumentException ex) {
-                    parent.reporter.reportError(definition.getPeriod(), "Invalid time.");
-                }
-            }
+      }
+      if (definition.getPeriod() != null) {
+        try {
+          this.period = parent.getTimeValue(definition.getPeriod());
+        } catch (IllegalArgumentException ex) {
+          parent.reporter.reportError(definition.getPeriod(), "Invalid time.");
         }
+      }
     }
+  }
 
-    /**
-     * Get the value of the offset parameter.
-     */
-    public TimeValue getOffset() {
-        return offset;
-    }
-
-    /**
-     * Get the value of the offset parameter.
-     */
-    public TimeValue getPeriod() {
-        return period;
-    }
+  /** Get the value of the offset parameter. */
+  public TimeValue getOffset() {
+    return offset;
+  }
 
+  /** Get the value of the offset parameter. */
+  public TimeValue getPeriod() {
+    return period;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/TriggerInstance.java b/org.lflang/src/org/lflang/generator/TriggerInstance.java
index 47212ff0e8..b4ddc35a15 100644
--- a/org.lflang/src/org/lflang/generator/TriggerInstance.java
+++ b/org.lflang/src/org/lflang/generator/TriggerInstance.java
@@ -1,181 +1,170 @@
 /** Instance of a trigger (port, action, or timer). */
 
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
-
 import org.lflang.lf.BuiltinTrigger;
 import org.lflang.lf.BuiltinTriggerRef;
 import org.lflang.lf.TriggerRef;
 import org.lflang.lf.Variable;
 import org.lflang.lf.impl.VariableImpl;
 
-/** Instance of a trigger (port, action, or timer).
+/**
+ * Instance of a trigger (port, action, or timer).
  *
- *  @author Marten Lohstroh
- *  @author Edward A. Lee
- *  @author Alexander Schulz-Rosengarten
+ * @author Marten Lohstroh
+ * @author Edward A. Lee
+ * @author Alexander Schulz-Rosengarten
  */
 public class TriggerInstance<T extends Variable> extends NamedInstance<T> {
 
-    /** Construct a new instance with the specified definition
-     *  and parent. E.g., for a action instance, the definition
-     *  is Action, and for a port instance, it is Port. These are
-     *  nodes in the AST. This is protected because only subclasses
-     *  should be constructed.
-     *  @param definition The definition in the AST for this instance.
-     *  @param parent The reactor instance that creates this instance.
-     */
-    protected TriggerInstance(T definition, ReactorInstance parent) {
-        super(definition, parent);
-    }
-
-    /**
-     * Construct a new instance for a special builtin trigger.
-     *
-     * @param trigger The actual trigger definition.
-     * @param parent The reactor instance that creates this instance.
-     */
-    static TriggerInstance<BuiltinTriggerVariable> builtinTrigger(BuiltinTriggerRef trigger, ReactorInstance parent) {
-        return new TriggerInstance<>(new BuiltinTriggerVariable(trigger), parent);
-    }
-
-    /////////////////////////////////////////////
-    //// Public Methods
-
-    /**
-     * Return the reaction instances that are triggered or read by this trigger.
-     * If this port is an output, then the reaction instances
-     * belong to the parent of the port's parent. If the port
-     * is an input, then the reaction instances belong to the
-     * port's parent.
-     */
-    public Set<ReactionInstance> getDependentReactions() {
-        return dependentReactions;
+  /**
+   * Construct a new instance with the specified definition and parent. E.g., for a action instance,
+   * the definition is Action, and for a port instance, it is Port. These are nodes in the AST. This
+   * is protected because only subclasses should be constructed.
+   *
+   * @param definition The definition in the AST for this instance.
+   * @param parent The reactor instance that creates this instance.
+   */
+  protected TriggerInstance(T definition, ReactorInstance parent) {
+    super(definition, parent);
+  }
+
+  /**
+   * Construct a new instance for a special builtin trigger.
+   *
+   * @param trigger The actual trigger definition.
+   * @param parent The reactor instance that creates this instance.
+   */
+  static TriggerInstance<BuiltinTriggerVariable> builtinTrigger(
+      BuiltinTriggerRef trigger, ReactorInstance parent) {
+    return new TriggerInstance<>(new BuiltinTriggerVariable(trigger), parent);
+  }
+
+  /////////////////////////////////////////////
+  //// Public Methods
+
+  /**
+   * Return the reaction instances that are triggered or read by this trigger. If this port is an
+   * output, then the reaction instances belong to the parent of the port's parent. If the port is
+   * an input, then the reaction instances belong to the port's parent.
+   */
+  public Set<ReactionInstance> getDependentReactions() {
+    return dependentReactions;
+  }
+
+  /**
+   * Return the reaction instances that may send data via this port. If this port is an input, then
+   * the reaction instance belongs to parent of the port's parent. If it is an output, the reaction
+   * instance belongs to the port's parent.
+   */
+  public Set<ReactionInstance> getDependsOnReactions() {
+    return dependsOnReactions;
+  }
+
+  /**
+   * Return the name of this trigger.
+   *
+   * @return The name of this trigger.
+   */
+  @Override
+  public String getName() {
+    return definition.getName();
+  }
+
+  /** Return true if this trigger is "shutdown". */
+  public boolean isShutdown() {
+    return isBuiltInType(BuiltinTrigger.SHUTDOWN);
+  }
+
+  /** Return true if this trigger is "startup"./ */
+  public boolean isStartup() {
+    return isBuiltInType(BuiltinTrigger.STARTUP);
+  }
+
+  /** Return true if this trigger is "startup"./ */
+  public boolean isReset() {
+    return isBuiltInType(BuiltinTrigger.RESET);
+  }
+
+  /////////////////////////////////////////////
+  //// Private Methods
+
+  private boolean isBuiltInType(BuiltinTrigger type) {
+    return this.definition instanceof BuiltinTriggerVariable
+        && ((BuiltinTriggerRef) ((BuiltinTriggerVariable) this.definition).definition)
+            .getType()
+            .equals(type);
+  }
+
+  /////////////////////////////////////////////
+  //// Protected Fields
+
+  /**
+   * Reaction instances that are triggered or read by this trigger. If this port is an output, then
+   * the reaction instances belong to the parent of the port's parent. If the port is an input, then
+   * the reaction instances belong to the port's parent.
+   */
+  Set<ReactionInstance> dependentReactions = new LinkedHashSet<>();
+
+  /**
+   * Reaction instances that may send data via this port. If this port is an input, then the
+   * reaction instance belongs to parent of the port's parent. If it is an output, the reaction
+   * instance belongs to the port's parent.
+   */
+  Set<ReactionInstance> dependsOnReactions = new LinkedHashSet<>();
+
+  /////////////////////////////////////////////
+  //// Special class for builtin triggers
+
+  /** This class allows to have BuiltinTriggers represented by a Variable type. */
+  public static class BuiltinTriggerVariable extends VariableImpl {
+
+    /** The builtin trigger type represented by this variable. */
+    public final BuiltinTrigger type;
+
+    /** The actual TriggerRef definition in the AST. */
+    public final TriggerRef definition;
+
+    public BuiltinTriggerVariable(BuiltinTriggerRef trigger) {
+      this.type = trigger.getType();
+      this.definition = trigger;
     }
 
-    /**
-     * Return the reaction instances that may send data via this port.
-     * If this port is an input, then the reaction instance
-     * belongs to parent of the port's parent. If it is an output,
-     * the reaction instance belongs to the port's parent.
-     */
-    public Set<ReactionInstance> getDependsOnReactions() {
-        return dependsOnReactions;
-    }
-
-    /**
-     * Return the name of this trigger.
-     * @return The name of this trigger.
-     */
     @Override
     public String getName() {
-        return definition.getName();
-    }
-
-    /**
-     * Return true if this trigger is "shutdown".
-     */
-    public boolean isShutdown() {
-        return isBuiltInType(BuiltinTrigger.SHUTDOWN);
-    }
-
-    /**
-     * Return true if this trigger is "startup"./
-     */
-    public boolean isStartup() {
-        return isBuiltInType(BuiltinTrigger.STARTUP);
+      return this.type.name().toLowerCase();
     }
 
-    /**
-     * Return true if this trigger is "startup"./
-     */
-    public boolean isReset() {
-        return isBuiltInType(BuiltinTrigger.RESET);
-    }
-
-    /////////////////////////////////////////////
-    //// Private Methods
-
-    private boolean isBuiltInType(BuiltinTrigger type) {
-        return this.definition instanceof BuiltinTriggerVariable
-            && ((BuiltinTriggerRef) ((BuiltinTriggerVariable) this.definition).definition).getType().equals(type);
-    }
-
-    /////////////////////////////////////////////
-    //// Protected Fields
-
-
-    /**
-     * Reaction instances that are triggered or read by this trigger.
-     * If this port is an output, then the reaction instances
-     * belong to the parent of the port's parent. If the port
-     * is an input, then the reaction instances belong to the
-     * port's parent.
-     */
-    Set<ReactionInstance> dependentReactions = new LinkedHashSet<>();
-
-    /**
-     * Reaction instances that may send data via this port.
-     * If this port is an input, then the reaction instance
-     * belongs to parent of the port's parent. If it is an output,
-     * the reaction instance belongs to the port's parent.
-     */
-    Set<ReactionInstance> dependsOnReactions = new LinkedHashSet<>();
-
-    /////////////////////////////////////////////
-    //// Special class for builtin triggers
-
-    /**
-     * This class allows to have BuiltinTriggers represented by a Variable type.
-     */
-    static public class BuiltinTriggerVariable extends VariableImpl {
-
-        /** The builtin trigger type represented by this variable. */
-        public final BuiltinTrigger type;
-
-        /** The actual TriggerRef definition in the AST. */
-        public final TriggerRef definition;
-
-        public BuiltinTriggerVariable(BuiltinTriggerRef trigger) {
-            this.type = trigger.getType();
-            this.definition = trigger;
-        }
-
-        @Override
-        public String getName() {
-            return this.type.name().toLowerCase();
-        }
-
-        @Override
-        public void setName(String newName) {
-            throw new UnsupportedOperationException(
-                    this.getClass().getName() + " has an immutable name.");
-        }
+    @Override
+    public void setName(String newName) {
+      throw new UnsupportedOperationException(
+          this.getClass().getName() + " has an immutable name.");
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/UnsupportedGeneratorFeatureException.java b/org.lflang/src/org/lflang/generator/UnsupportedGeneratorFeatureException.java
index 59fe20386c..c1519a161a 100644
--- a/org.lflang/src/org/lflang/generator/UnsupportedGeneratorFeatureException.java
+++ b/org.lflang/src/org/lflang/generator/UnsupportedGeneratorFeatureException.java
@@ -26,17 +26,14 @@
 
 import org.eclipse.emf.ecore.EObject;
 
-/**
- * Signals that the code generator does not support a particular
- * feature of the source language.
- */
+/** Signals that the code generator does not support a particular feature of the source language. */
 public class UnsupportedGeneratorFeatureException extends GenerationException {
 
-    public UnsupportedGeneratorFeatureException(String feature) {
-        super("Unsupported generator feature: " + feature);
-    }
+  public UnsupportedGeneratorFeatureException(String feature) {
+    super("Unsupported generator feature: " + feature);
+  }
 
-    public UnsupportedGeneratorFeatureException(EObject location, String feature) {
-        super(location, "Unsupported generator feature: " + feature);
-    }
+  public UnsupportedGeneratorFeatureException(EObject location, String feature) {
+    super(location, "Unsupported generator feature: " + feature);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/ValidationStrategy.java b/org.lflang/src/org/lflang/generator/ValidationStrategy.java
index 7adff29527..674634ef7f 100644
--- a/org.lflang/src/org/lflang/generator/ValidationStrategy.java
+++ b/org.lflang/src/org/lflang/generator/ValidationStrategy.java
@@ -1,7 +1,6 @@
 package org.lflang.generator;
 
 import java.nio.file.Path;
-
 import org.lflang.util.LFCommand;
 
 /**
@@ -11,36 +10,38 @@
  */
 public interface ValidationStrategy {
 
-    /**
-     * Return the command that produces validation output in association
-     * with {@code generatedFile}, or {@code null} if this strategy has no
-     * command that will successfully produce validation output.
-     */
-    LFCommand getCommand(Path generatedFile);
-
-    /**
-     * Return a strategy for parsing the stderr of the validation command.
-     * @return A strategy for parsing the stderr of the validation command.
-     */
-    DiagnosticReporting.Strategy getErrorReportingStrategy();
-
-    /**
-     * Return a strategy for parsing the stdout of the validation command.
-     * @return A strategy for parsing the stdout of the validation command.
-     */
-    DiagnosticReporting.Strategy getOutputReportingStrategy();
-
-    /**
-     * Return whether this strategy validates all generated files, as
-     * opposed to just the given one.
-     * @return whether this strategy validates all generated files
-     */
-    boolean isFullBatch();
-
-    /**
-     * Return the priority of this. Strategies with higher
-     * priorities are more likely to be used.
-     * @return The priority of this.
-     */
-    int getPriority();
+  /**
+   * Return the command that produces validation output in association with {@code generatedFile},
+   * or {@code null} if this strategy has no command that will successfully produce validation
+   * output.
+   */
+  LFCommand getCommand(Path generatedFile);
+
+  /**
+   * Return a strategy for parsing the stderr of the validation command.
+   *
+   * @return A strategy for parsing the stderr of the validation command.
+   */
+  DiagnosticReporting.Strategy getErrorReportingStrategy();
+
+  /**
+   * Return a strategy for parsing the stdout of the validation command.
+   *
+   * @return A strategy for parsing the stdout of the validation command.
+   */
+  DiagnosticReporting.Strategy getOutputReportingStrategy();
+
+  /**
+   * Return whether this strategy validates all generated files, as opposed to just the given one.
+   *
+   * @return whether this strategy validates all generated files
+   */
+  boolean isFullBatch();
+
+  /**
+   * Return the priority of this. Strategies with higher priorities are more likely to be used.
+   *
+   * @return The priority of this.
+   */
+  int getPriority();
 }
diff --git a/org.lflang/src/org/lflang/generator/Validator.java b/org.lflang/src/org/lflang/generator/Validator.java
index 7a9b85c453..f9ae61f854 100644
--- a/org.lflang/src/org/lflang/generator/Validator.java
+++ b/org.lflang/src/org/lflang/generator/Validator.java
@@ -1,9 +1,6 @@
 package org.lflang.generator;
 
-import org.eclipse.xtext.util.CancelIndicator;
-
-import org.lflang.ErrorReporter;
-import org.lflang.util.LFCommand;
+import com.google.common.collect.ImmutableMap;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -17,8 +14,9 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
-
-import com.google.common.collect.ImmutableMap;
+import org.eclipse.xtext.util.CancelIndicator;
+import org.lflang.ErrorReporter;
+import org.lflang.util.LFCommand;
 
 /**
  * Validate generated code.
@@ -27,159 +25,180 @@
  */
 public abstract class Validator {
 
-    /**
-     * Files older than {@code FILE_AGE_THRESHOLD_MILLIS} may be skipped in validation on the
-     * grounds that they probably have not been updated since the last validator pass.
-     */
-    // This will cause silent validation failures if it takes too long to write all generated code to the file system.
-    private static final long FILE_AGE_THRESHOLD_MILLIS = 10000;
-
-    protected static class Pair<S, T> {
-        public final S first;
-        public final T second;
-        public Pair(S first, T second) {
-            this.first = first;
-            this.second = second;
-        }
-    }
-
-    protected final ErrorReporter errorReporter;
-    protected final ImmutableMap<Path, CodeMap> codeMaps;
-
-    /**
-     * Initialize a {@code Validator} that reports errors to {@code errorReporter} and adjusts
-     * document positions using {@code codeMaps}.
-     */
-    protected Validator(ErrorReporter errorReporter, Map<Path, CodeMap> codeMaps) {
-        this.errorReporter = errorReporter;
-        this.codeMaps = ImmutableMap.copyOf(codeMaps);
+  /**
+   * Files older than {@code FILE_AGE_THRESHOLD_MILLIS} may be skipped in validation on the grounds
+   * that they probably have not been updated since the last validator pass.
+   */
+  // This will cause silent validation failures if it takes too long to write all generated code to
+  // the file system.
+  private static final long FILE_AGE_THRESHOLD_MILLIS = 10000;
+
+  protected static class Pair<S, T> {
+    public final S first;
+    public final T second;
+
+    public Pair(S first, T second) {
+      this.first = first;
+      this.second = second;
     }
-
-    /**
-     * Validate this Validator's group of generated files.
-     * @param context The context of the current build.
-     */
-    public final void doValidate(LFGeneratorContext context) throws ExecutionException, InterruptedException {
-        if (!validationEnabled(context)) return;
-        final List<Callable<Pair<ValidationStrategy, LFCommand>>> tasks = getValidationStrategies().stream().map(
-            it -> (Callable<Pair<ValidationStrategy, LFCommand>>) () -> {
-                it.second.run(context.getCancelIndicator());
-                return it;
-            }
-        ).collect(Collectors.toList());
-        for (Future<Pair<ValidationStrategy, LFCommand>> f : getFutures(tasks)) {
-            f.get().first.getErrorReportingStrategy().report(f.get().second.getErrors().toString(), errorReporter, codeMaps);
-            f.get().first.getOutputReportingStrategy().report(f.get().second.getOutput().toString(), errorReporter, codeMaps);
-        }
-    }
-
-    /**
-     * Return whether generated code validation is enabled for this build.
-     * @param context The context of the current build.
-     */
-    private boolean validationEnabled(LFGeneratorContext context) {
-        return context.getArgs().containsKey("lint") || validationEnabledByDefault(context);
+  }
+
+  protected final ErrorReporter errorReporter;
+  protected final ImmutableMap<Path, CodeMap> codeMaps;
+
+  /**
+   * Initialize a {@code Validator} that reports errors to {@code errorReporter} and adjusts
+   * document positions using {@code codeMaps}.
+   */
+  protected Validator(ErrorReporter errorReporter, Map<Path, CodeMap> codeMaps) {
+    this.errorReporter = errorReporter;
+    this.codeMaps = ImmutableMap.copyOf(codeMaps);
+  }
+
+  /**
+   * Validate this Validator's group of generated files.
+   *
+   * @param context The context of the current build.
+   */
+  public final void doValidate(LFGeneratorContext context)
+      throws ExecutionException, InterruptedException {
+    if (!validationEnabled(context)) return;
+    final List<Callable<Pair<ValidationStrategy, LFCommand>>> tasks =
+        getValidationStrategies().stream()
+            .map(
+                it ->
+                    (Callable<Pair<ValidationStrategy, LFCommand>>)
+                        () -> {
+                          it.second.run(context.getCancelIndicator());
+                          return it;
+                        })
+            .collect(Collectors.toList());
+    for (Future<Pair<ValidationStrategy, LFCommand>> f : getFutures(tasks)) {
+      f.get()
+          .first
+          .getErrorReportingStrategy()
+          .report(f.get().second.getErrors().toString(), errorReporter, codeMaps);
+      f.get()
+          .first
+          .getOutputReportingStrategy()
+          .report(f.get().second.getOutput().toString(), errorReporter, codeMaps);
     }
-
-    /**
-     * Return whether validation of generated code is enabled by default.
-     * @param context The context of the current build.
-     * @return Whether validation of generated code is enabled by default.
-     */
-    protected boolean validationEnabledByDefault(LFGeneratorContext context) {
-        return context.getMode() != LFGeneratorContext.Mode.STANDALONE;
-    }
-
-    /**
-     * Invoke all the given tasks.
-     * @param tasks Any set of tasks.
-     * @param <T> The return type of the tasks.
-     * @return Futures corresponding to each task, or an empty list upon failure.
-     * @throws InterruptedException If interrupted while waiting.
-     */
-    private static <T> List<Future<T>> getFutures(List<Callable<T>> tasks) throws InterruptedException {
-        List<Future<T>> futures = List.of();
-        switch (tasks.size()) {
-        case 0:
-            break;
-        case 1:
-            try {
-                futures = List.of(CompletableFuture.completedFuture(tasks.get(0).call()));
-            } catch (Exception e) {
-                System.err.println(e.getMessage());  // This should never happen
-            }
-            break;
-        default:
-            ExecutorService service = Executors.newFixedThreadPool(
-                Math.min(Runtime.getRuntime().availableProcessors(), tasks.size())
-            );
-            futures = service.invokeAll(tasks);
-            service.shutdown();
+  }
+
+  /**
+   * Return whether generated code validation is enabled for this build.
+   *
+   * @param context The context of the current build.
+   */
+  private boolean validationEnabled(LFGeneratorContext context) {
+    return context.getArgs().containsKey("lint") || validationEnabledByDefault(context);
+  }
+
+  /**
+   * Return whether validation of generated code is enabled by default.
+   *
+   * @param context The context of the current build.
+   * @return Whether validation of generated code is enabled by default.
+   */
+  protected boolean validationEnabledByDefault(LFGeneratorContext context) {
+    return context.getMode() != LFGeneratorContext.Mode.STANDALONE;
+  }
+
+  /**
+   * Invoke all the given tasks.
+   *
+   * @param tasks Any set of tasks.
+   * @param <T> The return type of the tasks.
+   * @return Futures corresponding to each task, or an empty list upon failure.
+   * @throws InterruptedException If interrupted while waiting.
+   */
+  private static <T> List<Future<T>> getFutures(List<Callable<T>> tasks)
+      throws InterruptedException {
+    List<Future<T>> futures = List.of();
+    switch (tasks.size()) {
+      case 0:
+        break;
+      case 1:
+        try {
+          futures = List.of(CompletableFuture.completedFuture(tasks.get(0).call()));
+        } catch (Exception e) {
+          System.err.println(e.getMessage()); // This should never happen
         }
-        return futures;
+        break;
+      default:
+        ExecutorService service =
+            Executors.newFixedThreadPool(
+                Math.min(Runtime.getRuntime().availableProcessors(), tasks.size()));
+        futures = service.invokeAll(tasks);
+        service.shutdown();
     }
-
-    /**
-     * Run the given command, report any messages produced using the reporting strategies
-     * given by {@code getBuildReportingStrategies}, and return its return code.
-     */
-    public final int run(LFCommand command, CancelIndicator cancelIndicator) {
-        final int returnCode = command.run(cancelIndicator);
-        getBuildReportingStrategies().first.report(command.getErrors().toString(), errorReporter, codeMaps);
-        getBuildReportingStrategies().second.report(command.getOutput().toString(), errorReporter, codeMaps);
-        return returnCode;
+    return futures;
+  }
+
+  /**
+   * Run the given command, report any messages produced using the reporting strategies given by
+   * {@code getBuildReportingStrategies}, and return its return code.
+   */
+  public final int run(LFCommand command, CancelIndicator cancelIndicator) {
+    final int returnCode = command.run(cancelIndicator);
+    getBuildReportingStrategies()
+        .first
+        .report(command.getErrors().toString(), errorReporter, codeMaps);
+    getBuildReportingStrategies()
+        .second
+        .report(command.getOutput().toString(), errorReporter, codeMaps);
+    return returnCode;
+  }
+
+  /**
+   * Return the validation strategies and validation commands corresponding to each generated file.
+   *
+   * @return the validation strategies and validation commands corresponding to each generated file
+   */
+  private List<Pair<ValidationStrategy, LFCommand>> getValidationStrategies() {
+    final List<Pair<ValidationStrategy, LFCommand>> commands = new ArrayList<>();
+    long mostRecentDateModified =
+        codeMaps.keySet().stream().map(it -> it.toFile().lastModified()).reduce(0L, Math::max);
+    for (Path generatedFile : codeMaps.keySet()) {
+      if (generatedFile.toFile().lastModified()
+          > mostRecentDateModified - FILE_AGE_THRESHOLD_MILLIS) {
+        final Pair<ValidationStrategy, LFCommand> p = getValidationStrategy(generatedFile);
+        if (p.first == null || p.second == null) continue;
+        commands.add(p);
+        if (p.first.isFullBatch()) break;
+      }
     }
-
-    /**
-     * Return the validation strategies and validation
-     * commands corresponding to each generated file.
-     * @return the validation strategies and validation
-     * commands corresponding to each generated file
-     */
-    private List<Pair<ValidationStrategy, LFCommand>> getValidationStrategies() {
-        final List<Pair<ValidationStrategy, LFCommand>> commands = new ArrayList<>();
-        long mostRecentDateModified = codeMaps.keySet().stream()
-            .map(it -> it.toFile().lastModified()).reduce(0L, Math::max);
-        for (Path generatedFile : codeMaps.keySet()) {
-            if (generatedFile.toFile().lastModified() > mostRecentDateModified - FILE_AGE_THRESHOLD_MILLIS) {
-                final Pair<ValidationStrategy, LFCommand> p = getValidationStrategy(generatedFile);
-                if (p.first == null || p.second == null) continue;
-                commands.add(p);
-                if (p.first.isFullBatch()) break;
-            }
-        }
-        return commands;
+    return commands;
+  }
+
+  /**
+   * Return the validation strategy and command corresponding to the given file if such a strategy
+   * and command are available.
+   *
+   * @return the validation strategy and command corresponding to the given file if such a strategy
+   *     and command are available
+   */
+  private Pair<ValidationStrategy, LFCommand> getValidationStrategy(Path generatedFile) {
+    List<ValidationStrategy> sorted =
+        getPossibleStrategies().stream()
+            .sorted(Comparator.comparingInt(vs -> -vs.getPriority()))
+            .toList();
+    for (ValidationStrategy strategy : sorted) {
+      LFCommand validateCommand = strategy.getCommand(generatedFile);
+      if (validateCommand != null) {
+        return new Pair<>(strategy, validateCommand);
+      }
     }
-
-    /**
-     * Return the validation strategy and command
-     * corresponding to the given file if such a strategy
-     * and command are available.
-     * @return the validation strategy and command
-     * corresponding to the given file if such a strategy
-     * and command are available
-     */
-    private Pair<ValidationStrategy, LFCommand> getValidationStrategy(Path generatedFile) {
-        List<ValidationStrategy> sorted = getPossibleStrategies().stream()
-            .sorted(Comparator.comparingInt(vs -> -vs.getPriority())).toList();
-        for (ValidationStrategy strategy : sorted) {
-            LFCommand validateCommand = strategy.getCommand(generatedFile);
-            if (validateCommand != null) {
-                return new Pair<>(strategy, validateCommand);
-            }
-        }
-        return new Pair<>(null, null);
-    }
-
-    /**
-     * List all validation strategies that exist for the implementor
-     * without filtering by platform or availability.
-     */
-    protected abstract Collection<ValidationStrategy> getPossibleStrategies();
-
-    /**
-     * Return the appropriate output and error reporting
-     * strategies for the main build process.
-     */
-    protected abstract Pair<DiagnosticReporting.Strategy, DiagnosticReporting.Strategy> getBuildReportingStrategies();
+    return new Pair<>(null, null);
+  }
+
+  /**
+   * List all validation strategies that exist for the implementor without filtering by platform or
+   * availability.
+   */
+  protected abstract Collection<ValidationStrategy> getPossibleStrategies();
+
+  /** Return the appropriate output and error reporting strategies for the main build process. */
+  protected abstract Pair<DiagnosticReporting.Strategy, DiagnosticReporting.Strategy>
+      getBuildReportingStrategies();
 }
diff --git a/org.lflang/src/org/lflang/generator/WatchdogInstance.java b/org.lflang/src/org/lflang/generator/WatchdogInstance.java
index 90823102d6..ac51f389cb 100644
--- a/org.lflang/src/org/lflang/generator/WatchdogInstance.java
+++ b/org.lflang/src/org/lflang/generator/WatchdogInstance.java
@@ -2,8 +2,8 @@
  * @file
  * @author Benjamin Asch
  * @author Edward A. Lee
- * @copyright (c) 2023, The University of California at Berkeley
- * License in <a href="https://github.com/lf-lang/lingua-franca/blob/master/LICENSE">BSD 2-clause</a>
+ * @copyright (c) 2023, The University of California at Berkeley License in <a
+ *     href="https://github.com/lf-lang/lingua-franca/blob/master/LICENSE">BSD 2-clause</a>
  * @brief Instance of a watchdog
  */
 package org.lflang.generator;
diff --git a/org.lflang/src/org/lflang/generator/c/CActionGenerator.java b/org.lflang/src/org/lflang/generator/c/CActionGenerator.java
index 1ec8c9edb8..007539fb32 100644
--- a/org.lflang/src/org/lflang/generator/c/CActionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CActionGenerator.java
@@ -1,15 +1,16 @@
 package org.lflang.generator.c;
 
-import java.util.List;
+import static org.lflang.generator.c.CGenerator.variableStructType;
+
 import java.util.ArrayList;
-import org.lflang.ast.ASTUtils;
+import java.util.List;
 import org.lflang.Target;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Action;
 
-import static org.lflang.generator.c.CGenerator.variableStructType;
 /**
  * Generates code for actions (logical or physical) for the C and CCpp target.
  *
@@ -23,155 +24,159 @@
  * @author Hou Seng Wong
  */
 public class CActionGenerator {
-    /**
-     * For each action of the specified reactor instance, generate initialization code
-     * for the offset and period fields.
-     * @param instance The reactor.
-     */
-    public static String generateInitializers(
-        ReactorInstance instance
-    ) {
-        List<String> code = new ArrayList<>();
-        for (ActionInstance action : instance.actions) {
-            if (!action.isShutdown()) {
-                var triggerStructName = CUtil.reactorRef(action.getParent()) + "->_lf__" + action.getName();
-                var minDelay = action.getMinDelay();
-                var minSpacing = action.getMinSpacing();
-                var offsetInitializer = triggerStructName+".offset = " + CTypes.getInstance().getTargetTimeExpr(minDelay)
-                    + ";";
-                var periodInitializer = triggerStructName+".period = " + (minSpacing != null ?
-                    CTypes.getInstance().getTargetTimeExpr(minSpacing) :
-                                                                         CGenerator.UNDEFINED_MIN_SPACING) + ";";
-                var parentInitializer = triggerStructName+".parent = (void *) " + CUtil.reactorRef(action.getParent()) + ";";
-                code.addAll(List.of(
-                    "// Initializing action "+action.getFullName(),
-                    offsetInitializer,
-                    periodInitializer,
-                    parentInitializer
-                ));
+  /**
+   * For each action of the specified reactor instance, generate initialization code for the offset
+   * and period fields.
+   *
+   * @param instance The reactor.
+   */
+  public static String generateInitializers(ReactorInstance instance) {
+    List<String> code = new ArrayList<>();
+    for (ActionInstance action : instance.actions) {
+      if (!action.isShutdown()) {
+        var triggerStructName = CUtil.reactorRef(action.getParent()) + "->_lf__" + action.getName();
+        var minDelay = action.getMinDelay();
+        var minSpacing = action.getMinSpacing();
+        var offsetInitializer =
+            triggerStructName
+                + ".offset = "
+                + CTypes.getInstance().getTargetTimeExpr(minDelay)
+                + ";";
+        var periodInitializer =
+            triggerStructName
+                + ".period = "
+                + (minSpacing != null
+                    ? CTypes.getInstance().getTargetTimeExpr(minSpacing)
+                    : CGenerator.UNDEFINED_MIN_SPACING)
+                + ";";
+        var parentInitializer =
+            triggerStructName + ".parent = (void *) " + CUtil.reactorRef(action.getParent()) + ";";
+        code.addAll(
+            List.of(
+                "// Initializing action " + action.getFullName(),
+                offsetInitializer,
+                periodInitializer,
+                parentInitializer));
 
-                var mode = action.getMode(false);
-                if (mode != null) {
-                    var modeParent = mode.getParent();
-                    var modeRef = "&"+CUtil.reactorRef(modeParent)+"->_lf__modes["+modeParent.modes.indexOf(mode)+"];";
-                    code.add(triggerStructName+".mode = "+modeRef+";");
-                } else {
-                    code.add(triggerStructName+".mode = NULL;");
-                }
-            }
+        var mode = action.getMode(false);
+        if (mode != null) {
+          var modeParent = mode.getParent();
+          var modeRef =
+              "&"
+                  + CUtil.reactorRef(modeParent)
+                  + "->_lf__modes["
+                  + modeParent.modes.indexOf(mode)
+                  + "];";
+          code.add(triggerStructName + ".mode = " + modeRef + ";");
+        } else {
+          code.add(triggerStructName + ".mode = NULL;");
         }
-        return String.join("\n", code);
+      }
     }
+    return String.join("\n", code);
+  }
 
-    /**
-     * Create a template token initialized to the payload size.
-     * This token is marked to not be freed so that the trigger_t struct
-     * always has a template token.
-     * At the start of each time step, we need to initialize the is_present field
-     * of each action's trigger object to false and free a previously
-     * allocated token if appropriate. This code sets up the table that does that.
-     *
-     * @param selfStruct The variable name of the self struct
-     * @param actionName The action name
-     * @param payloadSize The code that returns the size of the action's payload in C.
-     */
-    public static String generateTokenInitializer(
-        String selfStruct,
-        String actionName,
-        String payloadSize
-    ) {
-        return String.join("\n",
-                "_lf_initialize_template((token_template_t*)",
-                "        &("+selfStruct+"->_lf__"+actionName+"),",
-                         payloadSize+");",
-            selfStruct+"->_lf__"+actionName+".status = absent;"
-        );
-    }
+  /**
+   * Create a template token initialized to the payload size. This token is marked to not be freed
+   * so that the trigger_t struct always has a template token. At the start of each time step, we
+   * need to initialize the is_present field of each action's trigger object to false and free a
+   * previously allocated token if appropriate. This code sets up the table that does that.
+   *
+   * @param selfStruct The variable name of the self struct
+   * @param actionName The action name
+   * @param payloadSize The code that returns the size of the action's payload in C.
+   */
+  public static String generateTokenInitializer(
+      String selfStruct, String actionName, String payloadSize) {
+    return String.join(
+        "\n",
+        "_lf_initialize_template((token_template_t*)",
+        "        &(" + selfStruct + "->_lf__" + actionName + "),",
+        payloadSize + ");",
+        selfStruct + "->_lf__" + actionName + ".status = absent;");
+  }
 
-    /**
-     * Generate the declarations of actions in the self struct
-     *
-     * @param body The content of the self struct
-     * @param constructorCode The constructor code of the reactor
-     */
-    public static void generateDeclarations(
-        TypeParameterizedReactor tpr,
-        CodeBuilder body,
-        CodeBuilder constructorCode
-    ) {
-        for (Action action : ASTUtils.allActions(tpr.reactor())) {
-            var actionName = action.getName();
-            body.pr(action, CGenerator.variableStructType(action, tpr, false)+" _lf_"+actionName+";");
-            // Initialize the trigger pointer in the action.
-            constructorCode.pr(action, "self->_lf_"+actionName+".trigger = &self->_lf__"+actionName+";");
-        }
+  /**
+   * Generate the declarations of actions in the self struct
+   *
+   * @param body The content of the self struct
+   * @param constructorCode The constructor code of the reactor
+   */
+  public static void generateDeclarations(
+      TypeParameterizedReactor tpr, CodeBuilder body, CodeBuilder constructorCode) {
+    for (Action action : ASTUtils.allActions(tpr.reactor())) {
+      var actionName = action.getName();
+      body.pr(
+          action, CGenerator.variableStructType(action, tpr, false) + " _lf_" + actionName + ";");
+      // Initialize the trigger pointer in the action.
+      constructorCode.pr(
+          action, "self->_lf_" + actionName + ".trigger = &self->_lf__" + actionName + ";");
     }
+  }
 
-    /**
-     * Generate the struct type definitions for the action of the
-     * reactor
-     *
-     * @param action The action to generate the struct for
-     * @param target The target of the code generation (C, CCpp or Python)
-     * @param types The helper object for types related stuff
-     * @param federatedExtension The code needed to support federated execution
-     * @return The auxiliary struct for the port as a string
-     */
-    public static String generateAuxiliaryStruct(
-        TypeParameterizedReactor tpr,
-        Action action,
-        Target target,
-        CTypes types,
-        CodeBuilder federatedExtension,
-        boolean userFacing
-    ) {
-        var code = new CodeBuilder();
-        code.pr("typedef struct {");
-        code.indent();
-        // NOTE: The following fields are required to be the first ones so that
-        // pointer to this struct can be cast to a (lf_action_base_t*) or to
-        // (token_template_t*) to access these fields for any port.
-        // IMPORTANT: These must match exactly the fields defined in port.h!!
-        code.pr(String.join("\n",
-                "token_type_t type;",  // From token_template_t
-                "lf_token_t* token;",  // From token_template_t
-                "size_t length;",      // From token_template_t
-                "bool is_present;",    // From lf_action_base_t
-                "bool has_value;",     // From lf_action_base_t
-                "trigger_t* trigger;"  // From lf_action_base_t
-        ));
-        code.pr(valueDeclaration(tpr, action, target, types));
-        code.pr(federatedExtension.toString());
-        code.unindent();
-        code.pr("} " + variableStructType(action, tpr, userFacing) + ";");
-        return code.toString();
-    }
+  /**
+   * Generate the struct type definitions for the action of the reactor
+   *
+   * @param action The action to generate the struct for
+   * @param target The target of the code generation (C, CCpp or Python)
+   * @param types The helper object for types related stuff
+   * @param federatedExtension The code needed to support federated execution
+   * @return The auxiliary struct for the port as a string
+   */
+  public static String generateAuxiliaryStruct(
+      TypeParameterizedReactor tpr,
+      Action action,
+      Target target,
+      CTypes types,
+      CodeBuilder federatedExtension,
+      boolean userFacing) {
+    var code = new CodeBuilder();
+    code.pr("typedef struct {");
+    code.indent();
+    // NOTE: The following fields are required to be the first ones so that
+    // pointer to this struct can be cast to a (lf_action_base_t*) or to
+    // (token_template_t*) to access these fields for any port.
+    // IMPORTANT: These must match exactly the fields defined in port.h!!
+    code.pr(
+        String.join(
+            "\n",
+            "token_type_t type;", // From token_template_t
+            "lf_token_t* token;", // From token_template_t
+            "size_t length;", // From token_template_t
+            "bool is_present;", // From lf_action_base_t
+            "bool has_value;", // From lf_action_base_t
+            "trigger_t* trigger;" // From lf_action_base_t
+            ));
+    code.pr(valueDeclaration(tpr, action, target, types));
+    code.pr(federatedExtension.toString());
+    code.unindent();
+    code.pr("} " + variableStructType(action, tpr, userFacing) + ";");
+    return code.toString();
+  }
 
-    /**
-     * For the specified action, return a declaration for action struct to
-     * contain the value of the action. An action of
-     * type int[10], for example, will result in this:
-     * <pre><code>
-     *     int* value;
-     * </code></pre>
-     * This will return an empty string for an action with no type.
-     * @param tpr {@link TypeParameterizedReactor}
-     * @param action The action.
-     * @return A string providing the value field of the action struct.
-     */
-    private static String valueDeclaration(
-        TypeParameterizedReactor tpr,
-        Action action,
-        Target target,
-        CTypes types
-    ) {
-        if (target == Target.Python) {
-            return "PyObject* value;";
-        }
-        // Do not convert to lf_token_t* using lfTypeToTokenType because there
-        // will be a separate field pointing to the token.
-        return action.getType() == null && target.requiresTypes ?
-               "" :
-               types.getTargetType(tpr.resolveType(action.getType())) + " value;";
+  /**
+   * For the specified action, return a declaration for action struct to contain the value of the
+   * action. An action of type int[10], for example, will result in this:
+   *
+   * <pre><code>
+   *     int* value;
+   * </code></pre>
+   *
+   * This will return an empty string for an action with no type.
+   *
+   * @param tpr {@link TypeParameterizedReactor}
+   * @param action The action.
+   * @return A string providing the value field of the action struct.
+   */
+  private static String valueDeclaration(
+      TypeParameterizedReactor tpr, Action action, Target target, CTypes types) {
+    if (target == Target.Python) {
+      return "PyObject* value;";
     }
+    // Do not convert to lf_token_t* using lfTypeToTokenType because there
+    // will be a separate field pointing to the token.
+    return action.getType() == null && target.requiresTypes
+        ? ""
+        : types.getTargetType(tpr.resolveType(action.getType())) + " value;";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java
index d158f7491b..860c85a75d 100644
--- a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java
@@ -1,16 +1,16 @@
 /*************
  * Copyright (c) 2019-2021, The University of California at Berkeley.
-
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
-
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
-
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
-
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -31,7 +31,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
@@ -42,357 +41,364 @@
 /**
  * A helper class that generates a CMakefile that can be used to compile the generated C code.
  *
- * Adapted from @see org.lflang.generator.CppCmakeGenerator.kt
+ * <p>Adapted from @see org.lflang.generator.CppCmakeGenerator.kt
  *
  * @author Soroush Bateni
  * @author Peter Donovan
  */
 public class CCmakeGenerator {
-    private static final String DEFAULT_INSTALL_CODE = """
+  private static final String DEFAULT_INSTALL_CODE =
+      """
         install(
             TARGETS ${LF_MAIN_TARGET}
             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
         )
     """;
 
-    public static final String MIN_CMAKE_VERSION = "3.19";
-
-    private final FileConfig fileConfig;
-    private final List<String> additionalSources;
-    private final SetUpMainTarget setUpMainTarget;
-    private final String installCode;
-
-    public CCmakeGenerator(
-        FileConfig fileConfig,
-        List<String> additionalSources
-    ) {
-        this.fileConfig = fileConfig;
-        this.additionalSources = additionalSources;
-        this.setUpMainTarget = CCmakeGenerator::setUpMainTarget;
-        this.installCode = DEFAULT_INSTALL_CODE;
+  public static final String MIN_CMAKE_VERSION = "3.19";
+
+  private final FileConfig fileConfig;
+  private final List<String> additionalSources;
+  private final SetUpMainTarget setUpMainTarget;
+  private final String installCode;
+
+  public CCmakeGenerator(FileConfig fileConfig, List<String> additionalSources) {
+    this.fileConfig = fileConfig;
+    this.additionalSources = additionalSources;
+    this.setUpMainTarget = CCmakeGenerator::setUpMainTarget;
+    this.installCode = DEFAULT_INSTALL_CODE;
+  }
+
+  public CCmakeGenerator(
+      FileConfig fileConfig,
+      List<String> additionalSources,
+      SetUpMainTarget setUpMainTarget,
+      String installCode) {
+    this.fileConfig = fileConfig;
+    this.additionalSources = additionalSources;
+    this.setUpMainTarget = setUpMainTarget;
+    this.installCode = installCode;
+  }
+
+  /**
+   * Generate the contents of a CMakeLists.txt that builds the provided LF C 'sources'. Any error
+   * will be reported in the 'errorReporter'.
+   *
+   * @param sources A list of .c files to build.
+   * @param executableName The name of the output executable.
+   * @param errorReporter Used to report errors.
+   * @param CppMode Indicate if the compilation should happen in C++ mode
+   * @param hasMain Indicate if the .lf file has a main reactor or not. If not, a library target
+   *     will be created instead of an executable.
+   * @param cMakeExtras CMake-specific code that should be appended to the CMakeLists.txt.
+   * @param targetConfig The TargetConfig instance to use.
+   * @return The content of the CMakeLists.txt.
+   */
+  CodeBuilder generateCMakeCode(
+      List<String> sources,
+      String executableName,
+      ErrorReporter errorReporter,
+      boolean CppMode,
+      boolean hasMain,
+      String cMakeExtras,
+      TargetConfig targetConfig) {
+    CodeBuilder cMakeCode = new CodeBuilder();
+
+    List<String> additionalSources = new ArrayList<>();
+    for (String file : targetConfig.compileAdditionalSources) {
+      var relativePath =
+          fileConfig
+              .getSrcGenPath()
+              .relativize(fileConfig.getSrcGenPath().resolve(Paths.get(file)));
+      additionalSources.add(FileUtil.toUnixString(relativePath));
     }
-
-    public CCmakeGenerator(
-        FileConfig fileConfig,
-        List<String> additionalSources,
-        SetUpMainTarget setUpMainTarget,
-        String installCode
-    ) {
-        this.fileConfig = fileConfig;
-        this.additionalSources = additionalSources;
-        this.setUpMainTarget = setUpMainTarget;
-        this.installCode = installCode;
+    additionalSources.addAll(this.additionalSources);
+    cMakeCode.newLine();
+
+    cMakeCode.pr("cmake_minimum_required(VERSION " + MIN_CMAKE_VERSION + ")");
+
+    if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
+      cMakeCode.pr("# Set default configuration file. To add custom configurations,");
+      cMakeCode.pr("# pass -- -DOVERLAY_CONFIG=my_config.prj to either cmake or west");
+      cMakeCode.pr("set(CONF_FILE prj_lf.conf)");
+      if (targetConfig.platformOptions.board != null) {
+        cMakeCode.pr("# Selecting board specified in target property");
+        cMakeCode.pr("set(BOARD " + targetConfig.platformOptions.board + ")");
+      } else {
+        cMakeCode.pr("# Selecting default board");
+        cMakeCode.pr("set(BOARD qemu_cortex_m3)");
+      }
+      cMakeCode.pr("# We require Zephyr version 3.2.0");
+      cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} 3.2.0)");
+      cMakeCode.newLine();
     }
 
-    /**
-     * Generate the contents of a CMakeLists.txt that builds the provided LF C 'sources'. Any error will be
-     * reported in the 'errorReporter'.
-     *
-     * @param sources A list of .c files to build.
-     * @param executableName The name of the output executable.
-     * @param errorReporter Used to report errors.
-     * @param CppMode Indicate if the compilation should happen in C++ mode
-     * @param hasMain Indicate if the .lf file has a main reactor or not. If not,
-     *  a library target will be created instead of an executable.
-     * @param cMakeExtras CMake-specific code that should be appended to the CMakeLists.txt.
-     * @param targetConfig The TargetConfig instance to use.
-     * @return The content of the CMakeLists.txt.
-     */
-    CodeBuilder generateCMakeCode(
-        List<String> sources,
-        String executableName,
-        ErrorReporter errorReporter,
-        boolean CppMode,
-        boolean hasMain,
-        String cMakeExtras,
-        TargetConfig targetConfig
-    ) {
-        CodeBuilder cMakeCode = new CodeBuilder();
-
-        List<String> additionalSources = new ArrayList<>();
-        for (String file: targetConfig.compileAdditionalSources) {
-            var relativePath = fileConfig.getSrcGenPath().relativize(
-                fileConfig.getSrcGenPath().resolve(Paths.get(file)));
-            additionalSources.add(FileUtil.toUnixString(relativePath));
-        }
-        additionalSources.addAll(this.additionalSources);
-        cMakeCode.newLine();
-
-        cMakeCode.pr("cmake_minimum_required(VERSION " + MIN_CMAKE_VERSION + ")");
-
-        if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
-            cMakeCode.pr("# Set default configuration file. To add custom configurations,");
-            cMakeCode.pr("# pass -- -DOVERLAY_CONFIG=my_config.prj to either cmake or west");
-            cMakeCode.pr("set(CONF_FILE prj_lf.conf)");
-            if (targetConfig.platformOptions.board != null) {
-                cMakeCode.pr("# Selecting board specified in target property");
-                cMakeCode.pr("set(BOARD "+targetConfig.platformOptions.board+")");
-            } else {
-                cMakeCode.pr("# Selecting default board");
-                cMakeCode.pr("set(BOARD qemu_cortex_m3)");
-            }
-            cMakeCode.pr("# We require Zephyr version 3.2.0");
-            cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} 3.2.0)");
-            cMakeCode.newLine();
-        }
-
-        cMakeCode.pr("project("+executableName+" LANGUAGES C)");
-        cMakeCode.newLine();
-
-        // The Test build type is the Debug type plus coverage generation
-        cMakeCode.pr("if(CMAKE_BUILD_TYPE STREQUAL \"Test\")");
-        cMakeCode.pr("  set(CMAKE_BUILD_TYPE \"Debug\")");
-        cMakeCode.pr("  if(CMAKE_C_COMPILER_ID STREQUAL \"GNU\")");
-        cMakeCode.pr("    find_program(LCOV_BIN lcov)");
-        cMakeCode.pr("    if(LCOV_BIN MATCHES \"lcov$\")");
-        cMakeCode.pr("      set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} --coverage -fprofile-arcs -ftest-coverage\")");
-        cMakeCode.pr("    else()");
-        cMakeCode.pr("      message(\"Not producing code coverage information since lcov was not found\")");
-        cMakeCode.pr("    endif()");
-        cMakeCode.pr("  else()");
-        cMakeCode.pr("    message(\"Not producing code coverage information since the selected compiler is no gcc\")");
-        cMakeCode.pr("  endif()");
-        cMakeCode.pr("endif()");
-
-        cMakeCode.pr("# Require C11");
-        cMakeCode.pr("set(CMAKE_C_STANDARD 11)");
-        cMakeCode.pr("set(CMAKE_C_STANDARD_REQUIRED ON)");
-        cMakeCode.newLine();
-
-        cMakeCode.pr("# Require C++17");
-        cMakeCode.pr("set(CMAKE_CXX_STANDARD 17)");
-        cMakeCode.pr("set(CMAKE_CXX_STANDARD_REQUIRED ON)");
-        cMakeCode.newLine();
-        if (!targetConfig.cmakeIncludes.isEmpty()) {
-            // The user might be using the non-keyword form of
-            // target_link_libraries. Ideally we would detect whether they are
-            // doing that, but it is easier to just always have a deprecation
-            // warning.
-            cMakeCode.pr("""
+    cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
+    cMakeCode.newLine();
+
+    // The Test build type is the Debug type plus coverage generation
+    cMakeCode.pr("if(CMAKE_BUILD_TYPE STREQUAL \"Test\")");
+    cMakeCode.pr("  set(CMAKE_BUILD_TYPE \"Debug\")");
+    cMakeCode.pr("  if(CMAKE_C_COMPILER_ID STREQUAL \"GNU\")");
+    cMakeCode.pr("    find_program(LCOV_BIN lcov)");
+    cMakeCode.pr("    if(LCOV_BIN MATCHES \"lcov$\")");
+    cMakeCode.pr(
+        "      set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} --coverage -fprofile-arcs -ftest-coverage\")");
+    cMakeCode.pr("    else()");
+    cMakeCode.pr(
+        "      message(\"Not producing code coverage information since lcov was not found\")");
+    cMakeCode.pr("    endif()");
+    cMakeCode.pr("  else()");
+    cMakeCode.pr(
+        "    message(\"Not producing code coverage information since the selected compiler is no"
+            + " gcc\")");
+    cMakeCode.pr("  endif()");
+    cMakeCode.pr("endif()");
+
+    cMakeCode.pr("# Require C11");
+    cMakeCode.pr("set(CMAKE_C_STANDARD 11)");
+    cMakeCode.pr("set(CMAKE_C_STANDARD_REQUIRED ON)");
+    cMakeCode.newLine();
+
+    cMakeCode.pr("# Require C++17");
+    cMakeCode.pr("set(CMAKE_CXX_STANDARD 17)");
+    cMakeCode.pr("set(CMAKE_CXX_STANDARD_REQUIRED ON)");
+    cMakeCode.newLine();
+    if (!targetConfig.cmakeIncludes.isEmpty()) {
+      // The user might be using the non-keyword form of
+      // target_link_libraries. Ideally we would detect whether they are
+      // doing that, but it is easier to just always have a deprecation
+      // warning.
+      cMakeCode.pr(
+          """
                 cmake_policy(SET CMP0023 OLD)  # This causes deprecation warnings
 
-                """
-            );
-        }
-
-        // Set the build type
-        cMakeCode.pr("set(DEFAULT_BUILD_TYPE " + targetConfig.cmakeBuildType + ")\n");
-        cMakeCode.pr("if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)\n");
-        cMakeCode.pr("    set(CMAKE_BUILD_TYPE ${DEFAULT_BUILD_TYPE} CACHE STRING \"Choose the type of build.\" FORCE)\n");
-        cMakeCode.pr("endif()\n");
-        cMakeCode.newLine();
-
-        cMakeCode.pr("# do not print install messages\n");
-        cMakeCode.pr("set(CMAKE_INSTALL_MESSAGE NEVER)\n");
-        cMakeCode.newLine();
-
-        if (CppMode) {
-            // Suppress warnings about const char*.
-            cMakeCode.pr("set(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -Wno-write-strings\")");
-            cMakeCode.newLine();
-        }
-
-        if (targetConfig.platformOptions.platform != Platform.AUTO) {
-            cMakeCode.pr("set(CMAKE_SYSTEM_NAME "+targetConfig.platformOptions.platform.getcMakeName()+")");
-        }
-        cMakeCode.newLine();
-
-        if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
-            cMakeCode.pr(setUpMainTargetZephyr(
-                hasMain,
-                executableName,
-                Stream.concat(additionalSources.stream(), sources.stream())
-            ));
-        } else {
-            cMakeCode.pr(setUpMainTarget.getCmakeCode(
-                hasMain,
-                executableName,
-                Stream.concat(additionalSources.stream(), sources.stream())
-            ));
-        }
-
-        cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE core)");
-
-        cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC .)");
-        cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/)");
-        cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/api)");
-        cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core)");
-        cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/platform)");
-        cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/modal_models)");
-        cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/utils)");
-
-        if(targetConfig.auth) {
-            // If security is requested, add the auth option.
-            var osName = System.getProperty("os.name").toLowerCase();
-            // if platform target was set, use given platform instead
-            if (targetConfig.platformOptions.platform != Platform.AUTO) {
-                osName = targetConfig.platformOptions.platform.toString();
-            }
-            if (osName.contains("mac")) {
-                cMakeCode.pr("set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)");
-            }
-            cMakeCode.pr("# Find OpenSSL and link to it");
-            cMakeCode.pr("find_package(OpenSSL REQUIRED)");
-            cMakeCode.pr("target_link_libraries( ${LF_MAIN_TARGET} PRIVATE OpenSSL::SSL)");
-            cMakeCode.newLine();
-        }
-
-        if (targetConfig.threading || targetConfig.tracing != null) {
-            // If threaded computation is requested, add the threads option.
-            cMakeCode.pr("# Find threads and link to it");
-            cMakeCode.pr("find_package(Threads REQUIRED)");
-            cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE Threads::Threads)");
-            cMakeCode.newLine();
-
-            // If the LF program itself is threaded or if tracing is enabled, we need to define
-            // NUMBER_OF_WORKERS so that platform-specific C files will contain the appropriate functions
-            cMakeCode.pr("# Set the number of workers to enable threading/tracing");
-            cMakeCode.pr("target_compile_definitions(${LF_MAIN_TARGET} PUBLIC NUMBER_OF_WORKERS="+targetConfig.workers+")");
-            cMakeCode.newLine();
-        }
-
-        // Add additional flags so runtime can distinguish between multi-threaded and single-threaded mode
-        if (targetConfig.threading) {
-            cMakeCode.pr("# Set flag to indicate a multi-threaded runtime");
-            cMakeCode.pr("target_compile_definitions( ${LF_MAIN_TARGET} PUBLIC LF_THREADED=1)");
-        } else {
-            cMakeCode.pr("# Set flag to indicate a single-threaded runtime");
-            cMakeCode.pr("target_compile_definitions( ${LF_MAIN_TARGET} PUBLIC LF_UNTHREADED=1)");
-        }
-        cMakeCode.newLine();
-
-
-        if (CppMode) cMakeCode.pr("enable_language(CXX)");
-
-        if (targetConfig.compiler != null && !targetConfig.compiler.isBlank()) {
-            if (CppMode) {
-                // Set the CXX compiler to what the user has requested.
-                cMakeCode.pr("set(CMAKE_CXX_COMPILER "+targetConfig.compiler+")");
-            } else {
-                cMakeCode.pr("set(CMAKE_C_COMPILER "+targetConfig.compiler+")");
-            }
-            cMakeCode.newLine();
-        }
-
-        // Set the compiler flags
-        // We can detect a few common libraries and use the proper target_link_libraries to find them
-        for (String compilerFlag : targetConfig.compilerFlags) {
-            switch(compilerFlag.trim()) {
-                case "-lm":
-                    cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE m)");
-                    break;
-                case "-lprotobuf-c":
-                    cMakeCode.pr("include(FindPackageHandleStandardArgs)");
-                    cMakeCode.pr("FIND_PATH( PROTOBUF_INCLUDE_DIR protobuf-c/protobuf-c.h)");
-                    cMakeCode.pr("""
+                """);
+    }
+
+    // Set the build type
+    cMakeCode.pr("set(DEFAULT_BUILD_TYPE " + targetConfig.cmakeBuildType + ")\n");
+    cMakeCode.pr("if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)\n");
+    cMakeCode.pr(
+        "    set(CMAKE_BUILD_TYPE ${DEFAULT_BUILD_TYPE} CACHE STRING \"Choose the type of build.\""
+            + " FORCE)\n");
+    cMakeCode.pr("endif()\n");
+    cMakeCode.newLine();
+
+    cMakeCode.pr("# do not print install messages\n");
+    cMakeCode.pr("set(CMAKE_INSTALL_MESSAGE NEVER)\n");
+    cMakeCode.newLine();
+
+    if (CppMode) {
+      // Suppress warnings about const char*.
+      cMakeCode.pr("set(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -Wno-write-strings\")");
+      cMakeCode.newLine();
+    }
+
+    if (targetConfig.platformOptions.platform != Platform.AUTO) {
+      cMakeCode.pr(
+          "set(CMAKE_SYSTEM_NAME " + targetConfig.platformOptions.platform.getcMakeName() + ")");
+    }
+    cMakeCode.newLine();
+
+    if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
+      cMakeCode.pr(
+          setUpMainTargetZephyr(
+              hasMain,
+              executableName,
+              Stream.concat(additionalSources.stream(), sources.stream())));
+    } else {
+      cMakeCode.pr(
+          setUpMainTarget.getCmakeCode(
+              hasMain,
+              executableName,
+              Stream.concat(additionalSources.stream(), sources.stream())));
+    }
+
+    cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE core)");
+
+    cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC .)");
+    cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/)");
+    cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/api)");
+    cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core)");
+    cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/platform)");
+    cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/modal_models)");
+    cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/utils)");
+
+    if (targetConfig.auth) {
+      // If security is requested, add the auth option.
+      var osName = System.getProperty("os.name").toLowerCase();
+      // if platform target was set, use given platform instead
+      if (targetConfig.platformOptions.platform != Platform.AUTO) {
+        osName = targetConfig.platformOptions.platform.toString();
+      }
+      if (osName.contains("mac")) {
+        cMakeCode.pr("set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)");
+      }
+      cMakeCode.pr("# Find OpenSSL and link to it");
+      cMakeCode.pr("find_package(OpenSSL REQUIRED)");
+      cMakeCode.pr("target_link_libraries( ${LF_MAIN_TARGET} PRIVATE OpenSSL::SSL)");
+      cMakeCode.newLine();
+    }
+
+    if (targetConfig.threading || targetConfig.tracing != null) {
+      // If threaded computation is requested, add the threads option.
+      cMakeCode.pr("# Find threads and link to it");
+      cMakeCode.pr("find_package(Threads REQUIRED)");
+      cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE Threads::Threads)");
+      cMakeCode.newLine();
+
+      // If the LF program itself is threaded or if tracing is enabled, we need to define
+      // NUMBER_OF_WORKERS so that platform-specific C files will contain the appropriate functions
+      cMakeCode.pr("# Set the number of workers to enable threading/tracing");
+      cMakeCode.pr(
+          "target_compile_definitions(${LF_MAIN_TARGET} PUBLIC NUMBER_OF_WORKERS="
+              + targetConfig.workers
+              + ")");
+      cMakeCode.newLine();
+    }
+
+    // Add additional flags so runtime can distinguish between multi-threaded and single-threaded
+    // mode
+    if (targetConfig.threading) {
+      cMakeCode.pr("# Set flag to indicate a multi-threaded runtime");
+      cMakeCode.pr("target_compile_definitions( ${LF_MAIN_TARGET} PUBLIC LF_THREADED=1)");
+    } else {
+      cMakeCode.pr("# Set flag to indicate a single-threaded runtime");
+      cMakeCode.pr("target_compile_definitions( ${LF_MAIN_TARGET} PUBLIC LF_UNTHREADED=1)");
+    }
+    cMakeCode.newLine();
+
+    if (CppMode) cMakeCode.pr("enable_language(CXX)");
+
+    if (targetConfig.compiler != null && !targetConfig.compiler.isBlank()) {
+      if (CppMode) {
+        // Set the CXX compiler to what the user has requested.
+        cMakeCode.pr("set(CMAKE_CXX_COMPILER " + targetConfig.compiler + ")");
+      } else {
+        cMakeCode.pr("set(CMAKE_C_COMPILER " + targetConfig.compiler + ")");
+      }
+      cMakeCode.newLine();
+    }
+
+    // Set the compiler flags
+    // We can detect a few common libraries and use the proper target_link_libraries to find them
+    for (String compilerFlag : targetConfig.compilerFlags) {
+      switch (compilerFlag.trim()) {
+        case "-lm":
+          cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE m)");
+          break;
+        case "-lprotobuf-c":
+          cMakeCode.pr("include(FindPackageHandleStandardArgs)");
+          cMakeCode.pr("FIND_PATH( PROTOBUF_INCLUDE_DIR protobuf-c/protobuf-c.h)");
+          cMakeCode.pr(
+              """
                          find_library(PROTOBUF_LIBRARY\s
                          NAMES libprotobuf-c.a libprotobuf-c.so libprotobuf-c.dylib protobuf-c.lib protobuf-c.dll
                          )""");
-                    cMakeCode.pr("find_package_handle_standard_args(libprotobuf-c DEFAULT_MSG PROTOBUF_INCLUDE_DIR PROTOBUF_LIBRARY)");
-                    cMakeCode.pr("target_include_directories( ${LF_MAIN_TARGET} PUBLIC ${PROTOBUF_INCLUDE_DIR} )");
-                    cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE ${PROTOBUF_LIBRARY})");
-                    break;
-                case "-O2":
-                    if (Objects.equals(targetConfig.compiler, "gcc") || CppMode) {
-                        // Workaround for the pre-added -O2 option in the CGenerator.
-                        // This flag is specific to gcc/g++ and the clang compiler
-                        cMakeCode.pr("add_compile_options(-O2)");
-                        cMakeCode.pr("add_link_options(-O2)");
-                        break;
-                    }
-                default:
-                    errorReporter.reportWarning("Using the flags target property with cmake is dangerous.\n"+
-                                                " Use cmake-include instead.");
-                    cMakeCode.pr("add_compile_options( "+compilerFlag+" )");
-                    cMakeCode.pr("add_link_options( "+compilerFlag+")");
-            }
-        }
-        cMakeCode.newLine();
-
-        // Add the install option
-        cMakeCode.pr(installCode);
-        cMakeCode.newLine();
-
-        // Add the include file
-        for (String includeFile : targetConfig.cmakeIncludes) {
-            cMakeCode.pr("include(\""+ Path.of(includeFile).getFileName()+"\")");
-        }
-        cMakeCode.newLine();
-
-        cMakeCode.pr(cMakeExtras);
-        cMakeCode.newLine();
-
-        return cMakeCode;
+          cMakeCode.pr(
+              "find_package_handle_standard_args(libprotobuf-c DEFAULT_MSG PROTOBUF_INCLUDE_DIR"
+                  + " PROTOBUF_LIBRARY)");
+          cMakeCode.pr(
+              "target_include_directories( ${LF_MAIN_TARGET} PUBLIC ${PROTOBUF_INCLUDE_DIR} )");
+          cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE ${PROTOBUF_LIBRARY})");
+          break;
+        case "-O2":
+          if (Objects.equals(targetConfig.compiler, "gcc") || CppMode) {
+            // Workaround for the pre-added -O2 option in the CGenerator.
+            // This flag is specific to gcc/g++ and the clang compiler
+            cMakeCode.pr("add_compile_options(-O2)");
+            cMakeCode.pr("add_link_options(-O2)");
+            break;
+          }
+        default:
+          errorReporter.reportWarning(
+              "Using the flags target property with cmake is dangerous.\n"
+                  + " Use cmake-include instead.");
+          cMakeCode.pr("add_compile_options( " + compilerFlag + " )");
+          cMakeCode.pr("add_link_options( " + compilerFlag + ")");
+      }
     }
+    cMakeCode.newLine();
 
-    /** Provide a strategy for configuring the main target of the CMake build. */
-    public interface SetUpMainTarget {
-        // Implementation note: This indirection is necessary because the Python
-        // target produces a shared object file, not an executable.
-        String getCmakeCode(boolean hasMain, String executableName, Stream<String> cSources);
-    }
+    // Add the install option
+    cMakeCode.pr(installCode);
+    cMakeCode.newLine();
 
-    /** Generate the C-target-specific code for configuring the executable produced by the build. */
-    private static String setUpMainTarget(
-        boolean hasMain,
-        String executableName,
-        Stream<String> cSources
-    ) {
-        var code = new CodeBuilder();
-        code.pr("add_subdirectory(core)");
-        code.newLine();
-        code.pr("set(LF_MAIN_TARGET "+executableName+")");
-        code.newLine();
-
-        if (hasMain) {
-            code.pr("# Declare a new executable target and list all its sources");
-            code.pr("add_executable(");
-        } else {
-            code.pr("# Declare a new library target and list all its sources");
-            code.pr("add_library(");
-        }
-        code.indent();
-        code.pr("${LF_MAIN_TARGET}");
-        cSources.forEach(code::pr);
-        code.unindent();
-        code.pr(")");
-        code.newLine();
-        return code.toString();
+    // Add the include file
+    for (String includeFile : targetConfig.cmakeIncludes) {
+      cMakeCode.pr("include(\"" + Path.of(includeFile).getFileName() + "\")");
     }
+    cMakeCode.newLine();
+
+    cMakeCode.pr(cMakeExtras);
+    cMakeCode.newLine();
+
+    return cMakeCode;
+  }
+
+  /** Provide a strategy for configuring the main target of the CMake build. */
+  public interface SetUpMainTarget {
+    // Implementation note: This indirection is necessary because the Python
+    // target produces a shared object file, not an executable.
+    String getCmakeCode(boolean hasMain, String executableName, Stream<String> cSources);
+  }
+
+  /** Generate the C-target-specific code for configuring the executable produced by the build. */
+  private static String setUpMainTarget(
+      boolean hasMain, String executableName, Stream<String> cSources) {
+    var code = new CodeBuilder();
+    code.pr("add_subdirectory(core)");
+    code.newLine();
+    code.pr("set(LF_MAIN_TARGET " + executableName + ")");
+    code.newLine();
+
+    if (hasMain) {
+      code.pr("# Declare a new executable target and list all its sources");
+      code.pr("add_executable(");
+    } else {
+      code.pr("# Declare a new library target and list all its sources");
+      code.pr("add_library(");
+    }
+    code.indent();
+    code.pr("${LF_MAIN_TARGET}");
+    cSources.forEach(code::pr);
+    code.unindent();
+    code.pr(")");
+    code.newLine();
+    return code.toString();
+  }
+
+  private static String setUpMainTargetZephyr(
+      boolean hasMain, String executableName, Stream<String> cSources) {
+    var code = new CodeBuilder();
+    code.pr("add_subdirectory(core)");
+    code.pr("target_link_libraries(core PUBLIC zephyr_interface)");
+    // FIXME: Linking the reactor-c corelib with the zephyr kernel lib
+    //  resolves linker issues but I am not yet sure if it is safe
+    code.pr("target_link_libraries(core PRIVATE kernel)");
+    code.newLine();
+
+    if (hasMain) {
+      code.pr("# Declare a new executable target and list all its sources");
+      code.pr("set(LF_MAIN_TARGET app)");
+      code.pr("target_sources(");
+    } else {
+      code.pr("# Declare a new library target and list all its sources");
+      code.pr("set(LF_MAIN_TARGET" + executableName + ")");
+      code.pr("add_library(");
+    }
+    code.indent();
+    code.pr("${LF_MAIN_TARGET}");
 
-    private static String setUpMainTargetZephyr(
-        boolean hasMain,
-        String executableName,
-        Stream<String> cSources
-    ) {
-        var code = new CodeBuilder();
-        code.pr("add_subdirectory(core)");
-        code.pr("target_link_libraries(core PUBLIC zephyr_interface)");
-        // FIXME: Linking the reactor-c corelib with the zephyr kernel lib
-        //  resolves linker issues but I am not yet sure if it is safe
-        code.pr("target_link_libraries(core PRIVATE kernel)");
-        code.newLine();
-
-        if (hasMain) {
-            code.pr("# Declare a new executable target and list all its sources");
-            code.pr("set(LF_MAIN_TARGET app)");
-            code.pr("target_sources(");
-        } else {
-            code.pr("# Declare a new library target and list all its sources");
-            code.pr("set(LF_MAIN_TARGET"+executableName+")");
-            code.pr("add_library(");
-        }
-        code.indent();
-        code.pr("${LF_MAIN_TARGET}");
-
-        if (hasMain) {
-            code.pr("PRIVATE");
-        }
-
-        cSources.forEach(code::pr);
-        code.unindent();
-        code.pr(")");
-        code.newLine();
-        return code.toString();
+    if (hasMain) {
+      code.pr("PRIVATE");
     }
+
+    cSources.forEach(code::pr);
+    code.unindent();
+    code.pr(")");
+    code.newLine();
+    return code.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CCompiler.java b/org.lflang/src/org/lflang/generator/c/CCompiler.java
index 9fcb72b4a6..f919977ba5 100644
--- a/org.lflang/src/org/lflang/generator/c/CCompiler.java
+++ b/org.lflang/src/org/lflang/generator/c/CCompiler.java
@@ -1,16 +1,16 @@
 /*************
  * Copyright (c) 2019-2021, The University of California at Berkeley.
-
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
-
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
-
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
-
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -33,7 +33,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
@@ -47,8 +46,8 @@
 import org.lflang.util.LFCommand;
 
 /**
- * Responsible for creating and executing the necessary CMake command to compile
- * code that is generated by the CGenerator. This class uses CMake to compile.
+ * Responsible for creating and executing the necessary CMake command to compile code that is
+ * generated by the CGenerator. This class uses CMake to compile.
  *
  * @author Soroush Bateni
  * @author Edward A. Lee
@@ -59,392 +58,386 @@
  */
 public class CCompiler {
 
-    FileConfig fileConfig;
-    TargetConfig targetConfig;
-    ErrorReporter errorReporter;
-
-    /**
-     * Indicate whether the compiler is in C++ mode.
-     * In C++ mode, the compiler produces .cpp files instead
-     * of .c files and uses a C++ compiler to compiler the code.
-     */
-    private final boolean cppMode;
-
-    /**
-     * A factory for compiler commands.
-     */
-    GeneratorCommandFactory commandFactory;
-
-    /**
-     * Create an instance of CCompiler.
-     *
-     * @param targetConfig The current target configuration.
-     * @param fileConfig The current file configuration.
-     * @param errorReporter Used to report errors.
-     * @param cppMode Whether the generated code should be compiled as if it
-     * were C++.
-     */
-    public CCompiler(
-        TargetConfig targetConfig,
-        FileConfig fileConfig,
-        ErrorReporter errorReporter,
-        boolean cppMode
-    ) {
-        this.fileConfig = fileConfig;
-        this.targetConfig = targetConfig;
-        this.errorReporter = errorReporter;
-        this.commandFactory = new GeneratorCommandFactory(errorReporter, fileConfig);
-        this.cppMode = cppMode;
+  FileConfig fileConfig;
+  TargetConfig targetConfig;
+  ErrorReporter errorReporter;
+
+  /**
+   * Indicate whether the compiler is in C++ mode. In C++ mode, the compiler produces .cpp files
+   * instead of .c files and uses a C++ compiler to compiler the code.
+   */
+  private final boolean cppMode;
+
+  /** A factory for compiler commands. */
+  GeneratorCommandFactory commandFactory;
+
+  /**
+   * Create an instance of CCompiler.
+   *
+   * @param targetConfig The current target configuration.
+   * @param fileConfig The current file configuration.
+   * @param errorReporter Used to report errors.
+   * @param cppMode Whether the generated code should be compiled as if it were C++.
+   */
+  public CCompiler(
+      TargetConfig targetConfig,
+      FileConfig fileConfig,
+      ErrorReporter errorReporter,
+      boolean cppMode) {
+    this.fileConfig = fileConfig;
+    this.targetConfig = targetConfig;
+    this.errorReporter = errorReporter;
+    this.commandFactory = new GeneratorCommandFactory(errorReporter, fileConfig);
+    this.cppMode = cppMode;
+  }
+
+  /**
+   * Run the C compiler by invoking cmake and make.
+   *
+   * @param generator An instance of GeneratorBase, only used to report error line numbers in the
+   *     Eclipse IDE.
+   * @return true if compilation succeeds, false otherwise.
+   */
+  public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
+      throws IOException {
+    // Set the build directory to be "build"
+    Path buildPath = fileConfig.getSrcGenPath().resolve("build");
+    // Remove the previous build directory if it exists to
+    // avoid any error residue that can occur in CMake from
+    // a previous build.
+    // FIXME: This is slow and only needed if an error
+    //  has previously occurred. Deleting the build directory
+    //  if no prior errors have occurred can prolong the compilation
+    //  substantially. See #1416 for discussion.
+    FileUtil.deleteDirectory(buildPath);
+    // Make sure the build directory exists
+    Files.createDirectories(buildPath);
+
+    LFCommand compile = compileCmakeCommand();
+    if (compile == null) {
+      return false;
     }
 
-    /**
-     * Run the C compiler by invoking cmake and make.
-     * @param generator An instance of GeneratorBase, only used to report error line numbers
-     *  in the Eclipse IDE.
-     *
-     * @return true if compilation succeeds, false otherwise.
-     */
-    public boolean runCCompiler(
-        GeneratorBase generator,
-        LFGeneratorContext context
-    ) throws IOException {
-        // Set the build directory to be "build"
-        Path buildPath = fileConfig.getSrcGenPath().resolve("build");
-        // Remove the previous build directory if it exists to
-        // avoid any error residue that can occur in CMake from
-        // a previous build.
-        // FIXME: This is slow and only needed if an error
-        //  has previously occurred. Deleting the build directory
-        //  if no prior errors have occurred can prolong the compilation
-        //  substantially. See #1416 for discussion.
-        FileUtil.deleteDirectory(buildPath);
-        // Make sure the build directory exists
-        Files.createDirectories(buildPath);
-
-        LFCommand compile = compileCmakeCommand();
-        if (compile == null) {
-            return false;
-        }
-
-        // Use the user-specified compiler if any
-        if (targetConfig.compiler != null) {
-            if (cppMode) {
-                // Set the CXX environment variable to change the C++ compiler.
-                compile.replaceEnvironmentVariable("CXX", targetConfig.compiler);
-            } else {
-                // Set the CC environment variable to change the C compiler.
-                compile.replaceEnvironmentVariable("CC", targetConfig.compiler);
-            }
-        }
-
-        int cMakeReturnCode = compile.run(context.getCancelIndicator());
-
-        if (cMakeReturnCode != 0 &&
-                context.getMode() == LFGeneratorContext.Mode.STANDALONE &&
-                !outputContainsKnownCMakeErrors(compile.getErrors().toString())) {
-            errorReporter.reportError(targetConfig.compiler + " failed with error code " + cMakeReturnCode);
-        }
-
-        // For warnings (vs. errors), the return code is 0.
-        // But we still want to mark the IDE.
-        if (compile.getErrors().toString().length() > 0 &&
-                context.getMode() != LFGeneratorContext.Mode.STANDALONE &&
-                !outputContainsKnownCMakeErrors(compile.getErrors().toString())) {
-            generator.reportCommandErrors(compile.getErrors().toString());
-        }
-
-        int makeReturnCode = 0;
-
-        if (cMakeReturnCode == 0) {
-            LFCommand build = buildCmakeCommand();
-
-            makeReturnCode = build.run(context.getCancelIndicator());
-
-            if (makeReturnCode != 0 &&
-                    context.getMode() == LFGeneratorContext.Mode.STANDALONE &&
-                    !outputContainsKnownCMakeErrors(build.getErrors().toString())) {
-                errorReporter.reportError(targetConfig.compiler + " failed with error code " + makeReturnCode);
-            }
-
-            // For warnings (vs. errors), the return code is 0.
-            // But we still want to mark the IDE.
-            if (build.getErrors().toString().length() > 0 &&
-                    context.getMode() != LFGeneratorContext.Mode.STANDALONE &&
-                    !outputContainsKnownCMakeErrors(build.getErrors().toString())) {
-                generator.reportCommandErrors(build.getErrors().toString());
-            }
-
-
-            if (makeReturnCode == 0 && build.getErrors().toString().length() == 0) {
-                System.out.println("SUCCESS: Compiling generated code for " + fileConfig.name + " finished with no errors.");
-            }
-
-            if (targetConfig.platformOptions.platform == Platform.ZEPHYR && targetConfig.platformOptions.flash) {
-                System.out.println("Invoking flash command for Zephyr");
-                LFCommand flash = buildWestFlashCommand();
-                int flashRet = flash.run();
-                if (flashRet != 0) {
-                    errorReporter.reportError("West flash command failed with error code " + flashRet);
-                } else {
-                    System.out.println("SUCCESS: Flashed application with west");
-                }
-            }
-
-        }
-        return cMakeReturnCode == 0 && makeReturnCode == 0;
+    // Use the user-specified compiler if any
+    if (targetConfig.compiler != null) {
+      if (cppMode) {
+        // Set the CXX environment variable to change the C++ compiler.
+        compile.replaceEnvironmentVariable("CXX", targetConfig.compiler);
+      } else {
+        // Set the CC environment variable to change the C compiler.
+        compile.replaceEnvironmentVariable("CC", targetConfig.compiler);
+      }
     }
 
+    int cMakeReturnCode = compile.run(context.getCancelIndicator());
 
-    /**
-     * Return a command to compile the specified C file using CMake.
-     * This produces a C-specific compile command.
-     */
-    public LFCommand compileCmakeCommand() {
-        // Set the build directory to be "build"
-        Path buildPath = fileConfig.getSrcGenPath().resolve("build");
-
-        LFCommand command = commandFactory.createCommand(
-                "cmake", cmakeOptions(targetConfig, fileConfig),
-                buildPath);
-        if (command == null) {
-            errorReporter.reportError(
-                "The C/CCpp target requires CMAKE >= " + CCmakeGenerator.MIN_CMAKE_VERSION
-                    + " to compile the generated code. " +
-                    "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
-        }
-        return command;
+    if (cMakeReturnCode != 0
+        && context.getMode() == LFGeneratorContext.Mode.STANDALONE
+        && !outputContainsKnownCMakeErrors(compile.getErrors().toString())) {
+      errorReporter.reportError(
+          targetConfig.compiler + " failed with error code " + cMakeReturnCode);
     }
 
-    static Stream<String> cmakeCompileDefinitions(TargetConfig targetConfig) {
-        return targetConfig.compileDefinitions.entrySet().stream()
-            .map(entry -> "-D" + entry.getKey() + "=" + entry.getValue());
+    // For warnings (vs. errors), the return code is 0.
+    // But we still want to mark the IDE.
+    if (compile.getErrors().toString().length() > 0
+        && context.getMode() != LFGeneratorContext.Mode.STANDALONE
+        && !outputContainsKnownCMakeErrors(compile.getErrors().toString())) {
+      generator.reportCommandErrors(compile.getErrors().toString());
     }
 
-    private static List<String> cmakeOptions(TargetConfig targetConfig, FileConfig fileConfig) {
-        List<String> arguments = new ArrayList<>();
-        cmakeCompileDefinitions(targetConfig).forEachOrdered(arguments::add);
-        String separator = File.separator;
-        String maybeQuote = ""; // Windows seems to require extra level of quoting.
-        String srcPath = fileConfig.srcPath.toString(); // Windows requires escaping the backslashes.
-        String rootPath = fileConfig.srcPkgPath.toString();
-        if (separator.equals("\\")) {
-            separator = "\\\\\\\\";
-            maybeQuote = "\\\"";
-            srcPath = srcPath.replaceAll("\\\\", "\\\\\\\\");
-            rootPath = rootPath.replaceAll("\\\\", "\\\\\\\\");
+    int makeReturnCode = 0;
+
+    if (cMakeReturnCode == 0) {
+      LFCommand build = buildCmakeCommand();
+
+      makeReturnCode = build.run(context.getCancelIndicator());
+
+      if (makeReturnCode != 0
+          && context.getMode() == LFGeneratorContext.Mode.STANDALONE
+          && !outputContainsKnownCMakeErrors(build.getErrors().toString())) {
+        errorReporter.reportError(
+            targetConfig.compiler + " failed with error code " + makeReturnCode);
+      }
+
+      // For warnings (vs. errors), the return code is 0.
+      // But we still want to mark the IDE.
+      if (build.getErrors().toString().length() > 0
+          && context.getMode() != LFGeneratorContext.Mode.STANDALONE
+          && !outputContainsKnownCMakeErrors(build.getErrors().toString())) {
+        generator.reportCommandErrors(build.getErrors().toString());
+      }
+
+      if (makeReturnCode == 0 && build.getErrors().toString().length() == 0) {
+        System.out.println(
+            "SUCCESS: Compiling generated code for "
+                + fileConfig.name
+                + " finished with no errors.");
+      }
+
+      if (targetConfig.platformOptions.platform == Platform.ZEPHYR
+          && targetConfig.platformOptions.flash) {
+        System.out.println("Invoking flash command for Zephyr");
+        LFCommand flash = buildWestFlashCommand();
+        int flashRet = flash.run();
+        if (flashRet != 0) {
+          errorReporter.reportError("West flash command failed with error code " + flashRet);
+        } else {
+          System.out.println("SUCCESS: Flashed application with west");
         }
-        arguments.addAll(List.of(
-            "-DCMAKE_BUILD_TYPE=" + ((targetConfig.cmakeBuildType!=null) ? targetConfig.cmakeBuildType.toString() : "Release"),
+      }
+    }
+    return cMakeReturnCode == 0 && makeReturnCode == 0;
+  }
+
+  /**
+   * Return a command to compile the specified C file using CMake. This produces a C-specific
+   * compile command.
+   */
+  public LFCommand compileCmakeCommand() {
+    // Set the build directory to be "build"
+    Path buildPath = fileConfig.getSrcGenPath().resolve("build");
+
+    LFCommand command =
+        commandFactory.createCommand("cmake", cmakeOptions(targetConfig, fileConfig), buildPath);
+    if (command == null) {
+      errorReporter.reportError(
+          "The C/CCpp target requires CMAKE >= "
+              + CCmakeGenerator.MIN_CMAKE_VERSION
+              + " to compile the generated code. "
+              + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
+    }
+    return command;
+  }
+
+  static Stream<String> cmakeCompileDefinitions(TargetConfig targetConfig) {
+    return targetConfig.compileDefinitions.entrySet().stream()
+        .map(entry -> "-D" + entry.getKey() + "=" + entry.getValue());
+  }
+
+  private static List<String> cmakeOptions(TargetConfig targetConfig, FileConfig fileConfig) {
+    List<String> arguments = new ArrayList<>();
+    cmakeCompileDefinitions(targetConfig).forEachOrdered(arguments::add);
+    String separator = File.separator;
+    String maybeQuote = ""; // Windows seems to require extra level of quoting.
+    String srcPath = fileConfig.srcPath.toString(); // Windows requires escaping the backslashes.
+    String rootPath = fileConfig.srcPkgPath.toString();
+    if (separator.equals("\\")) {
+      separator = "\\\\\\\\";
+      maybeQuote = "\\\"";
+      srcPath = srcPath.replaceAll("\\\\", "\\\\\\\\");
+      rootPath = rootPath.replaceAll("\\\\", "\\\\\\\\");
+    }
+    arguments.addAll(
+        List.of(
+            "-DCMAKE_BUILD_TYPE="
+                + ((targetConfig.cmakeBuildType != null)
+                    ? targetConfig.cmakeBuildType.toString()
+                    : "Release"),
             "-DCMAKE_INSTALL_PREFIX=" + FileUtil.toUnixString(fileConfig.getOutPath()),
-            "-DCMAKE_INSTALL_BINDIR=" + FileUtil.toUnixString(
-                fileConfig.getOutPath().relativize(
-                    fileConfig.binPath
-                )
-            ),
-            "-DLF_FILE_SEPARATOR=\"" + maybeQuote + separator + maybeQuote + "\""
-        ));
-        // Add #define for source file directory.
-        // Do not do this for federated programs because for those, the definition is put
-        // into the cmake file (and fileConfig.srcPath is the wrong directory anyway).
-        if (!fileConfig.srcPath.toString().contains("fed-gen")) {
-            // Do not convert to Unix path
-            arguments.add("-DLF_SOURCE_DIRECTORY=\"" + maybeQuote + srcPath + maybeQuote + "\"");
-            arguments.add("-DLF_PACKAGE_DIRECTORY=\"" + maybeQuote + rootPath + maybeQuote + "\"");
-        }
-        arguments.add(FileUtil.toUnixString(fileConfig.getSrcGenPath()));
-
-        if (GeneratorUtils.isHostWindows()) {
-            arguments.add("-DCMAKE_SYSTEM_VERSION=\"10.0\"");
-        }
-        return arguments;
+            "-DCMAKE_INSTALL_BINDIR="
+                + FileUtil.toUnixString(fileConfig.getOutPath().relativize(fileConfig.binPath)),
+            "-DLF_FILE_SEPARATOR=\"" + maybeQuote + separator + maybeQuote + "\""));
+    // Add #define for source file directory.
+    // Do not do this for federated programs because for those, the definition is put
+    // into the cmake file (and fileConfig.srcPath is the wrong directory anyway).
+    if (!fileConfig.srcPath.toString().contains("fed-gen")) {
+      // Do not convert to Unix path
+      arguments.add("-DLF_SOURCE_DIRECTORY=\"" + maybeQuote + srcPath + maybeQuote + "\"");
+      arguments.add("-DLF_PACKAGE_DIRECTORY=\"" + maybeQuote + rootPath + maybeQuote + "\"");
     }
+    arguments.add(FileUtil.toUnixString(fileConfig.getSrcGenPath()));
 
-    /**
-     * Return the cmake config name correspnding to a given build type.
-     */
-    private String buildTypeToCmakeConfig(TargetProperty.BuildType type) {
-        if (type == null) {
-            return "Release";
-        }
-        switch (type) {
-        case TEST:
-            return "Debug";
-        default:
-            return type.toString();
-        }
+    if (GeneratorUtils.isHostWindows()) {
+      arguments.add("-DCMAKE_SYSTEM_VERSION=\"10.0\"");
     }
+    return arguments;
+  }
 
-    /**
-     * Return a command to build the specified C file using CMake.
-     * This produces a C-specific build command.
-     *
-     * <p>Note: It appears that configuration and build cannot happen in one command.
-     * Therefore, this is separated into a compile command and a build command.</p>
-     */
-    public LFCommand buildCmakeCommand() {
-        // Set the build directory to be "build"
-        Path buildPath = fileConfig.getSrcGenPath().resolve("build");
-        String cores = String.valueOf(Runtime.getRuntime().availableProcessors());
-        LFCommand command =  commandFactory.createCommand(
-                "cmake", List.of(
-                        "--build", ".", "--target", "install", "--parallel", cores, "--config",
-                        buildTypeToCmakeConfig(targetConfig.cmakeBuildType)
-                    ),
-                buildPath);
-        if (command == null) {
-            errorReporter.reportError(
-                "The C/CCpp target requires CMAKE >= 3.5 to compile the generated code. "
-                + "Auto-compiling can be disabled using the \"no-compile: true\" target property."
-            );
-        }
-        return command;
+  /** Return the cmake config name correspnding to a given build type. */
+  private String buildTypeToCmakeConfig(TargetProperty.BuildType type) {
+    if (type == null) {
+      return "Release";
     }
-
-    /**
-     * Return a flash/emulate command using west.
-     * If board is null (defaults to qemu_cortex_m3) or qemu_*
-     * Return a flash command which runs the target as an emulation
-     * If ordinary target, return {@code west flash}
-     */
-    public LFCommand buildWestFlashCommand() {
-        // Set the build directory to be "build"
-        Path buildPath = fileConfig.getSrcGenPath().resolve("build");
-        String board = targetConfig.platformOptions.board;
-        LFCommand cmd;
-        if (board == null || board.startsWith("qemu")) {
-            cmd = commandFactory.createCommand(
-                "west", List.of("build", "-t", "run"), buildPath);
-        } else {
-            cmd = commandFactory.createCommand(
-                "west", List.of("flash"), buildPath);
-        }
-        if (cmd == null) {
-            errorReporter.reportError(
-                "Could not create west flash command."
-            );
-        }
-
-        return cmd;
+    switch (type) {
+      case TEST:
+        return "Debug";
+      default:
+        return type.toString();
     }
-
-    /**
-     * Check if the output produced by CMake has any known and common errors.
-     * If a known error is detected, a specialized, more informative message
-     * is shown.
-     *
-     * Errors currently detected:
-     * <ul>
-     * <li>C++ compiler used to compile C files: This error shows up as
-     * &#39;#error &quot;The CMAKE_C_COMPILER is set to a C++ compiler&quot;&#39; in
-     * the &#39;CMakeOutput&#39; string.</li>
-     * </ul>
-     *
-     * @param CMakeOutput The captured output from CMake.
-     * @return true if the provided 'CMakeOutput' contains a known error.
-     *  false otherwise.
-     */
-    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-    private boolean outputContainsKnownCMakeErrors(String CMakeOutput) {
-        // Check if the error thrown is due to the wrong compiler
-        if (CMakeOutput.contains("The CMAKE_C_COMPILER is set to a C++ compiler")) {
-            // If so, print an appropriate error message
-            if (targetConfig.compiler != null) {
-                errorReporter.reportError(
-                        "A C++ compiler was requested in the compiler target property."
-                                + " Use the CCpp or the Cpp target instead.");
-            } else {
-                errorReporter.reportError("\"A C++ compiler was detected."
-                       + " The C target works best with a C compiler."
-                       + " Use the CCpp or the Cpp target instead.\"");
-            }
-            return true;
-        }
-        return false;
+  }
+
+  /**
+   * Return a command to build the specified C file using CMake. This produces a C-specific build
+   * command.
+   *
+   * <p>Note: It appears that configuration and build cannot happen in one command. Therefore, this
+   * is separated into a compile command and a build command.
+   */
+  public LFCommand buildCmakeCommand() {
+    // Set the build directory to be "build"
+    Path buildPath = fileConfig.getSrcGenPath().resolve("build");
+    String cores = String.valueOf(Runtime.getRuntime().availableProcessors());
+    LFCommand command =
+        commandFactory.createCommand(
+            "cmake",
+            List.of(
+                "--build",
+                ".",
+                "--target",
+                "install",
+                "--parallel",
+                cores,
+                "--config",
+                buildTypeToCmakeConfig(targetConfig.cmakeBuildType)),
+            buildPath);
+    if (command == null) {
+      errorReporter.reportError(
+          "The C/CCpp target requires CMAKE >= 3.5 to compile the generated code. "
+              + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
+    }
+    return command;
+  }
+
+  /**
+   * Return a flash/emulate command using west. If board is null (defaults to qemu_cortex_m3) or
+   * qemu_* Return a flash command which runs the target as an emulation If ordinary target, return
+   * {@code west flash}
+   */
+  public LFCommand buildWestFlashCommand() {
+    // Set the build directory to be "build"
+    Path buildPath = fileConfig.getSrcGenPath().resolve("build");
+    String board = targetConfig.platformOptions.board;
+    LFCommand cmd;
+    if (board == null || board.startsWith("qemu")) {
+      cmd = commandFactory.createCommand("west", List.of("build", "-t", "run"), buildPath);
+    } else {
+      cmd = commandFactory.createCommand("west", List.of("flash"), buildPath);
+    }
+    if (cmd == null) {
+      errorReporter.reportError("Could not create west flash command.");
     }
 
-    /**
-     * Return a command to compile the specified C file using a native compiler
-     * (generally gcc unless overridden by the user).
-     * This produces a C specific compile command.
-     *
-     * @param fileToCompile The C filename without the .c extension.
-     * @param noBinary If true, the compiler will create a .o output instead of a binary.
-     *  If false, the compile command will produce a binary.
-     */
-    public LFCommand compileCCommand(
-        String fileToCompile,
-        boolean noBinary
-    ) {
-        String cFilename = getTargetFileName(fileToCompile, cppMode, targetConfig);
-
-        Path relativeSrcPath = fileConfig.getOutPath().relativize(
-            fileConfig.getSrcGenPath().resolve(Paths.get(cFilename)));
-        Path relativeBinPath = fileConfig.getOutPath().relativize(
-            fileConfig.binPath.resolve(Paths.get(fileToCompile)));
-
-        // NOTE: we assume that any C compiler takes Unix paths as arguments.
-        String relSrcPathString = FileUtil.toUnixString(relativeSrcPath);
-        String relBinPathString = FileUtil.toUnixString(relativeBinPath);
-
-        // If there is no main reactor, then generate a .o file not an executable.
-        if (noBinary) {
-            relBinPathString += ".o";
-        }
-
-        ArrayList<String> compileArgs = new ArrayList<>();
-        compileArgs.add(relSrcPathString);
-        for (String file: targetConfig.compileAdditionalSources) {
-            var relativePath = fileConfig.getOutPath().relativize(
-                fileConfig.getSrcGenPath().resolve(Paths.get(file)));
-            compileArgs.add(FileUtil.toUnixString(relativePath));
-        }
-        compileArgs.addAll(targetConfig.compileLibraries);
+    return cmd;
+  }
+
+  /**
+   * Check if the output produced by CMake has any known and common errors. If a known error is
+   * detected, a specialized, more informative message is shown.
+   *
+   * <p>Errors currently detected:
+   *
+   * <ul>
+   *   <li>C++ compiler used to compile C files: This error shows up as &#39;#error &quot;The
+   *       CMAKE_C_COMPILER is set to a C++ compiler&quot;&#39; in the &#39;CMakeOutput&#39; string.
+   * </ul>
+   *
+   * @param CMakeOutput The captured output from CMake.
+   * @return true if the provided 'CMakeOutput' contains a known error. false otherwise.
+   */
+  @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+  private boolean outputContainsKnownCMakeErrors(String CMakeOutput) {
+    // Check if the error thrown is due to the wrong compiler
+    if (CMakeOutput.contains("The CMAKE_C_COMPILER is set to a C++ compiler")) {
+      // If so, print an appropriate error message
+      if (targetConfig.compiler != null) {
+        errorReporter.reportError(
+            "A C++ compiler was requested in the compiler target property."
+                + " Use the CCpp or the Cpp target instead.");
+      } else {
+        errorReporter.reportError(
+            "\"A C++ compiler was detected."
+                + " The C target works best with a C compiler."
+                + " Use the CCpp or the Cpp target instead.\"");
+      }
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * Return a command to compile the specified C file using a native compiler (generally gcc unless
+   * overridden by the user). This produces a C specific compile command.
+   *
+   * @param fileToCompile The C filename without the .c extension.
+   * @param noBinary If true, the compiler will create a .o output instead of a binary. If false,
+   *     the compile command will produce a binary.
+   */
+  public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
+    String cFilename = getTargetFileName(fileToCompile, cppMode, targetConfig);
+
+    Path relativeSrcPath =
+        fileConfig
+            .getOutPath()
+            .relativize(fileConfig.getSrcGenPath().resolve(Paths.get(cFilename)));
+    Path relativeBinPath =
+        fileConfig.getOutPath().relativize(fileConfig.binPath.resolve(Paths.get(fileToCompile)));
+
+    // NOTE: we assume that any C compiler takes Unix paths as arguments.
+    String relSrcPathString = FileUtil.toUnixString(relativeSrcPath);
+    String relBinPathString = FileUtil.toUnixString(relativeBinPath);
+
+    // If there is no main reactor, then generate a .o file not an executable.
+    if (noBinary) {
+      relBinPathString += ".o";
+    }
 
-        // Add compile definitions
-        targetConfig.compileDefinitions.forEach((key,value) -> compileArgs.add("-D"+key+"="+value));
+    ArrayList<String> compileArgs = new ArrayList<>();
+    compileArgs.add(relSrcPathString);
+    for (String file : targetConfig.compileAdditionalSources) {
+      var relativePath =
+          fileConfig.getOutPath().relativize(fileConfig.getSrcGenPath().resolve(Paths.get(file)));
+      compileArgs.add(FileUtil.toUnixString(relativePath));
+    }
+    compileArgs.addAll(targetConfig.compileLibraries);
 
-        // Finally, add the compiler flags in target parameters (if any)
-        compileArgs.addAll(targetConfig.compilerFlags);
+    // Add compile definitions
+    targetConfig.compileDefinitions.forEach(
+        (key, value) -> compileArgs.add("-D" + key + "=" + value));
 
-        // Only set the output file name if it hasn't already been set
-        // using a target property or Args line flag.
-        if (!compileArgs.contains("-o")) {
-            compileArgs.add("-o");
-            compileArgs.add(relBinPathString);
-        }
+    // Finally, add the compiler flags in target parameters (if any)
+    compileArgs.addAll(targetConfig.compilerFlags);
 
-        // If there is no main reactor, then use the -c flag to prevent linking from occurring.
-        // FIXME: we could add a {@code -c} flag to {@code lfc} to make this explicit in stand-alone mode.
-        //  Then again, I think this only makes sense when we can do linking.
-        if (noBinary) {
-            compileArgs.add("-c"); // FIXME: revisit
-        }
+    // Only set the output file name if it hasn't already been set
+    // using a target property or Args line flag.
+    if (!compileArgs.contains("-o")) {
+      compileArgs.add("-o");
+      compileArgs.add(relBinPathString);
+    }
 
-        LFCommand command = commandFactory.createCommand(targetConfig.compiler, compileArgs, fileConfig.getOutPath());
-        if (command == null) {
-            errorReporter.reportError(
-                "The C/CCpp target requires GCC >= 7 to compile the generated code. " +
-                    "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
-        }
-        return command;
+    // If there is no main reactor, then use the -c flag to prevent linking from occurring.
+    // FIXME: we could add a {@code -c} flag to {@code lfc} to make this explicit in stand-alone
+    // mode.
+    //  Then again, I think this only makes sense when we can do linking.
+    if (noBinary) {
+      compileArgs.add("-c"); // FIXME: revisit
     }
 
-    /**
-     * Produces the filename including the target-specific extension
-     *
-     * @param fileName The base name of the file without any extensions
-     * @param cppMode  Indicate whether the compiler is in C++ mode
-     * In C++ mode, the compiler produces .cpp files instead
-     * of .c files and uses a C++ compiler to compiler the code.
-     */
-    static String getTargetFileName(String fileName, boolean cppMode, TargetConfig targetConfig) {
-        if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
-            return fileName + ".ino";
-        }
-        if (cppMode) {
-            // If the C++ mode is enabled, use a .cpp extension
-            return fileName + ".cpp";
-        }
-        return fileName + ".c";
+    LFCommand command =
+        commandFactory.createCommand(targetConfig.compiler, compileArgs, fileConfig.getOutPath());
+    if (command == null) {
+      errorReporter.reportError(
+          "The C/CCpp target requires GCC >= 7 to compile the generated code. "
+              + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
+    }
+    return command;
+  }
+
+  /**
+   * Produces the filename including the target-specific extension
+   *
+   * @param fileName The base name of the file without any extensions
+   * @param cppMode Indicate whether the compiler is in C++ mode In C++ mode, the compiler produces
+   *     .cpp files instead of .c files and uses a C++ compiler to compiler the code.
+   */
+  static String getTargetFileName(String fileName, boolean cppMode, TargetConfig targetConfig) {
+    if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
+      return fileName + ".ino";
+    }
+    if (cppMode) {
+      // If the C++ mode is enabled, use a .cpp extension
+      return fileName + ".cpp";
     }
+    return fileName + ".c";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CConstructorGenerator.java b/org.lflang/src/org/lflang/generator/c/CConstructorGenerator.java
index 41731106c3..529e37a975 100644
--- a/org.lflang/src/org/lflang/generator/c/CConstructorGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CConstructorGenerator.java
@@ -1,36 +1,30 @@
 package org.lflang.generator.c;
 
 import org.lflang.generator.CodeBuilder;
-import org.lflang.lf.Reactor;
 
-/**
- * Generates C constructor code for a reactor.
- *
- */
+/** Generates C constructor code for a reactor. */
 public class CConstructorGenerator {
-    /**
-     * Generate a constructor for the specified reactor in the specified federate.
-     * @param reactor The parsed reactor data structure.
-     * @param constructorCode Lines of code previously generated that need to
-     *  go into the constructor.
-     */
-    public static String generateConstructor(
-        TypeParameterizedReactor tpr,
-        String constructorCode
-    ) {
-        var structType = CUtil.selfType(tpr);
-        var code = new CodeBuilder();
-        code.pr(structType+"* new_"+CUtil.getName(tpr)+"() {");
-        code.indent();
-        code.pr(structType+"* self = ("+structType+"*)_lf_new_reactor(sizeof("+structType+"));");
-        code.pr(constructorCode);
-        code.pr("return self;");
-        code.unindent();
-        code.pr("}");
-        return code.toString();
-    }
+  /**
+   * Generate a constructor for the specified reactor in the specified federate.
+   *
+   * @param reactor The parsed reactor data structure.
+   * @param constructorCode Lines of code previously generated that need to go into the constructor.
+   */
+  public static String generateConstructor(TypeParameterizedReactor tpr, String constructorCode) {
+    var structType = CUtil.selfType(tpr);
+    var code = new CodeBuilder();
+    code.pr(structType + "* new_" + CUtil.getName(tpr) + "() {");
+    code.indent();
+    code.pr(
+        structType + "* self = (" + structType + "*)_lf_new_reactor(sizeof(" + structType + "));");
+    code.pr(constructorCode);
+    code.pr("return self;");
+    code.unindent();
+    code.pr("}");
+    return code.toString();
+  }
 
-    public static String generateConstructorPrototype(TypeParameterizedReactor tpr) {
-        return CUtil.selfType(tpr)+"* new_"+CUtil.getName(tpr)+"();";
-    }
+  public static String generateConstructorPrototype(TypeParameterizedReactor tpr) {
+    return CUtil.selfType(tpr) + "* new_" + CUtil.getName(tpr) + "();";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CCoreFilesUtils.java b/org.lflang/src/org/lflang/generator/c/CCoreFilesUtils.java
index 46503d87cc..2d83a105da 100644
--- a/org.lflang/src/org/lflang/generator/c/CCoreFilesUtils.java
+++ b/org.lflang/src/org/lflang/generator/c/CCoreFilesUtils.java
@@ -1,32 +1,28 @@
 package org.lflang.generator.c;
+
 import java.util.List;
 
 /**
- * Generates the list of files to be included in the
- * core library for each reactor given conditions listed
- * as arguments of each function.
+ * Generates the list of files to be included in the core library for each reactor given conditions
+ * listed as arguments of each function.
  *
  * @author Hou Seng Wong
  */
 public class CCoreFilesUtils {
 
-    public static List<String> getCTargetSrc() {
-        return List.of(
-            "lib/schedule.c"
-        );
-    }
+  public static List<String> getCTargetSrc() {
+    return List.of("lib/schedule.c");
+  }
 
-    public static List<String> getCTargetHeader() {
-        return List.of(
-            "include/api/api.h"
-        );
-    }
+  public static List<String> getCTargetHeader() {
+    return List.of("include/api/api.h");
+  }
 
-    public static String getCTargetSetHeader() {
-        return "include/api/set.h";
-    }
+  public static String getCTargetSetHeader() {
+    return "include/api/set.h";
+  }
 
-    public static String getCTargetSetUndefHeader() {
-        return "include/api/set_undef.h";
-    }
+  public static String getCTargetSetUndefHeader() {
+    return "include/api/set_undef.h";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CDelayBodyGenerator.java b/org.lflang/src/org/lflang/generator/c/CDelayBodyGenerator.java
index f5aa244e60..ec75412b42 100644
--- a/org.lflang/src/org/lflang/generator/c/CDelayBodyGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CDelayBodyGenerator.java
@@ -9,54 +9,51 @@
 
 public class CDelayBodyGenerator implements DelayBodyGenerator {
 
-    protected CTypes types;
-
-    public CDelayBodyGenerator(CTypes types) {
-        this.types = types;
-    }
-
-    /**
-     * Generate code for the body of a reaction that takes an input and
-     * schedules an action with the value of that input.
-     * @param action The action to schedule
-     * @param port The port to read from
-     */
-    @Override
-    public String generateDelayBody(Action action, VarRef port) {
-        var ref = ASTUtils.generateVarRef(port);
-        return CReactionGenerator.generateDelayBody(
-            ref,
-            action.getName(),
-            CUtil.isTokenType(getInferredType(action), types)
-        );
-    }
-
-    /**
-     * Generate code for the body of a reaction that is triggered by the
-     * given action and writes its value to the given port. This realizes
-     * the receiving end of a logical delay specified with the 'after'
-     * keyword.
-     * @param action The action that triggers the reaction
-     * @param port The port to write to.
-     */
-    @Override
-    public String generateForwardBody(Action action, VarRef port) {
-        var outputName = ASTUtils.generateVarRef(port);
-        return CReactionGenerator.generateForwardBody(
-            outputName,
-            types.getTargetType(action),
-            action.getName(),
-            CUtil.isTokenType(getInferredType(action), types)
-        );
-    }
-
-    @Override
-    public String generateDelayGeneric() {
-        throw new UnsupportedOperationException("TODO: auto-generated method stub");
-    }
-
-    @Override
-    public boolean generateAfterDelaysWithVariableWidth() {
-        return true;
-    }
+  protected CTypes types;
+
+  public CDelayBodyGenerator(CTypes types) {
+    this.types = types;
+  }
+
+  /**
+   * Generate code for the body of a reaction that takes an input and schedules an action with the
+   * value of that input.
+   *
+   * @param action The action to schedule
+   * @param port The port to read from
+   */
+  @Override
+  public String generateDelayBody(Action action, VarRef port) {
+    var ref = ASTUtils.generateVarRef(port);
+    return CReactionGenerator.generateDelayBody(
+        ref, action.getName(), CUtil.isTokenType(getInferredType(action), types));
+  }
+
+  /**
+   * Generate code for the body of a reaction that is triggered by the given action and writes its
+   * value to the given port. This realizes the receiving end of a logical delay specified with the
+   * 'after' keyword.
+   *
+   * @param action The action that triggers the reaction
+   * @param port The port to write to.
+   */
+  @Override
+  public String generateForwardBody(Action action, VarRef port) {
+    var outputName = ASTUtils.generateVarRef(port);
+    return CReactionGenerator.generateForwardBody(
+        outputName,
+        types.getTargetType(action),
+        action.getName(),
+        CUtil.isTokenType(getInferredType(action), types));
+  }
+
+  @Override
+  public String generateDelayGeneric() {
+    throw new UnsupportedOperationException("TODO: auto-generated method stub");
+  }
+
+  @Override
+  public boolean generateAfterDelaysWithVariableWidth() {
+    return true;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CDockerGenerator.java b/org.lflang/src/org/lflang/generator/c/CDockerGenerator.java
index ae9058dcbb..f52e23a949 100644
--- a/org.lflang/src/org/lflang/generator/c/CDockerGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CDockerGenerator.java
@@ -1,9 +1,7 @@
 package org.lflang.generator.c;
 
 import java.util.stream.Collectors;
-
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
-
 import org.lflang.Target;
 import org.lflang.generator.DockerGenerator;
 import org.lflang.generator.LFGeneratorContext;
@@ -15,62 +13,66 @@
  * @author Hou Seng Wong
  */
 public class CDockerGenerator extends DockerGenerator {
-    private static final String DEFAULT_BASE_IMAGE = "alpine:latest";
+  private static final String DEFAULT_BASE_IMAGE = "alpine:latest";
 
-    /**
-     * The constructor for the base docker file generation class.
-     *
-     * @param context The context of the code generator.
-     */
-    public CDockerGenerator(LFGeneratorContext context) {
-        super(context);
-    }
+  /**
+   * The constructor for the base docker file generation class.
+   *
+   * @param context The context of the code generator.
+   */
+  public CDockerGenerator(LFGeneratorContext context) {
+    super(context);
+  }
 
-
-    /**
-     * Generate the contents of the docker file.
-     */
-    @Override
-    protected String generateDockerFileContent() {
-        var lfModuleName = context.getFileConfig().name;
-        var config = context.getTargetConfig();
-        var compileCommand = IterableExtensions.isNullOrEmpty(config.buildCommands) ?
-                                 generateDefaultCompileCommand() :
-                                 StringUtil.joinObjects(config.buildCommands, " ");
-        var compiler = config.target == Target.CCPP ? "g++" : "gcc";
-        var baseImage = DEFAULT_BASE_IMAGE;
-        if (config.dockerOptions != null && config.dockerOptions.from != null) {
-            baseImage = config.dockerOptions.from;
-        }
-        return String.join("\n",
-            "# For instructions, see: https://www.lf-lang.org/docs/handbook/containerized-execution",
-            "FROM "+baseImage+" AS builder",
-            "WORKDIR /lingua-franca/"+lfModuleName,
-            "RUN set -ex && apk add --no-cache "+compiler+" musl-dev cmake make",
-            "COPY . src-gen",
-            compileCommand,
-            "",
-            "FROM "+baseImage,
-            "WORKDIR /lingua-franca",
-            "RUN mkdir bin",
-            "COPY --from=builder /lingua-franca/"+lfModuleName+"/bin/"+lfModuleName+" ./bin/"+lfModuleName,
-            "",
-            "# Use ENTRYPOINT not CMD so that command-line arguments go through",
-            "ENTRYPOINT [\"./bin/"+lfModuleName+"\"]",
-            ""
-        );
+  /** Generate the contents of the docker file. */
+  @Override
+  protected String generateDockerFileContent() {
+    var lfModuleName = context.getFileConfig().name;
+    var config = context.getTargetConfig();
+    var compileCommand =
+        IterableExtensions.isNullOrEmpty(config.buildCommands)
+            ? generateDefaultCompileCommand()
+            : StringUtil.joinObjects(config.buildCommands, " ");
+    var compiler = config.target == Target.CCPP ? "g++" : "gcc";
+    var baseImage = DEFAULT_BASE_IMAGE;
+    if (config.dockerOptions != null && config.dockerOptions.from != null) {
+      baseImage = config.dockerOptions.from;
     }
+    return String.join(
+        "\n",
+        "# For instructions, see: https://www.lf-lang.org/docs/handbook/containerized-execution",
+        "FROM " + baseImage + " AS builder",
+        "WORKDIR /lingua-franca/" + lfModuleName,
+        "RUN set -ex && apk add --no-cache " + compiler + " musl-dev cmake make",
+        "COPY . src-gen",
+        compileCommand,
+        "",
+        "FROM " + baseImage,
+        "WORKDIR /lingua-franca",
+        "RUN mkdir bin",
+        "COPY --from=builder /lingua-franca/"
+            + lfModuleName
+            + "/bin/"
+            + lfModuleName
+            + " ./bin/"
+            + lfModuleName,
+        "",
+        "# Use ENTRYPOINT not CMD so that command-line arguments go through",
+        "ENTRYPOINT [\"./bin/" + lfModuleName + "\"]",
+        "");
+  }
 
-    /** Return the default compile command for the C docker container. */
-    protected String generateDefaultCompileCommand() {
-        return String.join("\n",
-            "RUN set -ex && \\",
-            "mkdir bin && \\",
-            "cmake " + CCompiler.cmakeCompileDefinitions(context.getTargetConfig())
+  /** Return the default compile command for the C docker container. */
+  protected String generateDefaultCompileCommand() {
+    return String.join(
+        "\n",
+        "RUN set -ex && \\",
+        "mkdir bin && \\",
+        "cmake "
+            + CCompiler.cmakeCompileDefinitions(context.getTargetConfig())
                 .collect(Collectors.joining(" "))
-                + " -S src-gen -B bin && \\",
-            "cd bin && \\",
-            "make all"
-        );
-    }
+            + " -S src-gen -B bin && \\",
+        "cd bin && \\",
+        "make all");
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CEnclavedConnectionBodyGenerator.java b/org.lflang/src/org/lflang/generator/c/CEnclavedConnectionBodyGenerator.java
index 4b613c03d8..837f0ce9b9 100644
--- a/org.lflang/src/org/lflang/generator/c/CEnclavedConnectionBodyGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CEnclavedConnectionBodyGenerator.java
@@ -1,62 +1,59 @@
 package org.lflang.generator.c;
 
-import static org.lflang.ASTUtils.getInferredType;
+import static org.lflang.ast.ASTUtils.getInferredType;
 
-import org.lflang.ASTUtils;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.DelayBodyGenerator;
 import org.lflang.lf.Action;
 import org.lflang.lf.VarRef;
 
 public class CEnclavedConnectionBodyGenerator implements DelayBodyGenerator {
 
-    protected CTypes types;
-
-    public CEnclavedConnectionBodyGenerator(CTypes types) {
-        this.types = types;
-    }
-
-    /**
-     * Generate code for the body of a reaction that takes an input and
-     * schedules an action with the value of that input.
-     * @param action The action to schedule
-     * @param port The port to read from
-     */
-    @Override
-    public String generateDelayBody(Action action, VarRef port) {
-        var ref = ASTUtils.generateVarRef(port);
-        return CReactionGenerator.generateEnclavedConnectionDelayBody(
-            ref,
-            action.getName(),
-            CUtil.isTokenType(getInferredType(action), types)
-        );
-    }
-
-    /**
-     * Generate code for the body of a reaction that is triggered by the
-     * given action and writes its value to the given port. This realizes
-     * the receiving end of a logical delay specified with the 'after'
-     * keyword.
-     * @param action The action that triggers the reaction
-     * @param port The port to write to.
-     */
-    @Override
-    public String generateForwardBody(Action action, VarRef port) {
-        var outputName = ASTUtils.generateVarRef(port);
-        return CReactionGenerator.generateForwardBody(
-            outputName,
-            types.getTargetType(action),
-            action.getName(),
-            CUtil.isTokenType(getInferredType(action), types)
-        );
-    }
-
-    @Override
-    public String generateDelayGeneric() {
-        throw new UnsupportedOperationException("TODO: auto-generated method stub");
-    }
-
-    @Override
-    public boolean generateAfterDelaysWithVariableWidth() {
-        return true;
-    }
+  protected CTypes types;
+
+  public CEnclavedConnectionBodyGenerator(CTypes types) {
+    this.types = types;
+  }
+
+  /**
+   * Generate code for the body of a reaction that takes an input and schedules an action with the
+   * value of that input.
+   *
+   * @param action The action to schedule
+   * @param port The port to read from
+   */
+  @Override
+  public String generateDelayBody(Action action, VarRef port) {
+    var ref = ASTUtils.generateVarRef(port);
+    return CReactionGenerator.generateEnclavedConnectionDelayBody(
+        ref, action.getName(), CUtil.isTokenType(getInferredType(action), types));
+  }
+
+  /**
+   * Generate code for the body of a reaction that is triggered by the given action and writes its
+   * value to the given port. This realizes the receiving end of a logical delay specified with the
+   * 'after' keyword.
+   *
+   * @param action The action that triggers the reaction
+   * @param port The port to write to.
+   */
+  @Override
+  public String generateForwardBody(Action action, VarRef port) {
+    var outputName = ASTUtils.generateVarRef(port);
+    return CReactionGenerator.generateForwardBody(
+        outputName,
+        types.getTargetType(action),
+        action.getName(),
+        CUtil.isTokenType(getInferredType(action), types));
+  }
+
+  @Override
+  public String generateDelayGeneric() {
+    throw new UnsupportedOperationException("TODO: auto-generated method stub");
+  }
+
+  @Override
+  public boolean generateAfterDelaysWithVariableWidth() {
+    return true;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
index e97c390e4a..d7df4b8e37 100644
--- a/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -2,88 +2,95 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ReactorInstance;
 
 public class CEnvironmentFunctionGenerator {
 
+  public CEnvironmentFunctionGenerator(ReactorInstance main) {
+    this.enclaves = CUtil.getEnclaves(main);
+  }
 
-    public CEnvironmentFunctionGenerator(ReactorInstance main) {
-        this.enclaves = CUtil.getEnclaves(main);
-    }
-    public String generateDeclarations() {
-        CodeBuilder code = new CodeBuilder();
-        code.pr(generateEnvironmentInclude());
-        code.pr(generateEnvironmentEnum());
-        code.pr(generateEnvironmentArray());
-        return code.toString();
-    }
+  public String generateDeclarations() {
+    CodeBuilder code = new CodeBuilder();
+    code.pr(generateEnvironmentInclude());
+    code.pr(generateEnvironmentEnum());
+    code.pr(generateEnvironmentArray());
+    return code.toString();
+  }
 
-    public String generateDefinitions() {
-        CodeBuilder code = new CodeBuilder();
-        code.pr(generateCreateEnvironments());
-        code.pr(generateGetEnvironments());
-        return code.toString();
-    }
+  public String generateDefinitions() {
+    CodeBuilder code = new CodeBuilder();
+    code.pr(generateCreateEnvironments());
+    code.pr(generateGetEnvironments());
+    return code.toString();
+  }
 
-    private List<ReactorInstance> enclaves = new ArrayList<>();
+  private List<ReactorInstance> enclaves = new ArrayList<>();
 
-    private String generateEnvironmentInclude() {
-        return "#include \"environment.h\"";
-    }
+  private String generateEnvironmentInclude() {
+    return "#include \"environment.h\"";
+  }
 
-    private String generateEnvironmentArray() {
-        return String.join("\n",
-            "// The global array of environments associated with each enclave",
-            "environment_t envs[_num_enclaves];");
-    }
-    private String generateGetEnvironments() {
-        return String.join("\n",
-            "// Update the pointer argument to point to the beginning of the environment array",
-            "// and return the size of that array",
-            "int _lf_get_environments(environment_t ** return_envs) {",
-            "   (*return_envs) = (environment_t *) envs;",
-            "   return _num_enclaves;",
-            "}"
-            );
-    }
+  private String generateEnvironmentArray() {
+    return String.join(
+        "\n",
+        "// The global array of environments associated with each enclave",
+        "environment_t envs[_num_enclaves];");
+  }
 
-    private String generateEnvironmentEnum() {
-        CodeBuilder code = new CodeBuilder();
-        code.pr("typedef enum {");
-        code.indent();
-        for (ReactorInstance enclave: enclaves) {
-            code.pr(CUtil.getEnvironmentId(enclave) +",");
-        }
-        code.pr("_num_enclaves");
-        code.unindent();
-        code.pr("} _enclave_id;");
+  private String generateGetEnvironments() {
+    return String.join(
+        "\n",
+        "// Update the pointer argument to point to the beginning of the environment array",
+        "// and return the size of that array",
+        "int _lf_get_environments(environment_t ** return_envs) {",
+        "   (*return_envs) = (environment_t *) envs;",
+        "   return _num_enclaves;",
+        "}");
+  }
 
-        return code.toString();
+  private String generateEnvironmentEnum() {
+    CodeBuilder code = new CodeBuilder();
+    code.pr("typedef enum {");
+    code.indent();
+    for (ReactorInstance enclave : enclaves) {
+      code.pr(CUtil.getEnvironmentId(enclave) + ",");
     }
+    code.pr("_num_enclaves");
+    code.unindent();
+    code.pr("} _enclave_id;");
 
+    return code.toString();
+  }
 
-    private String generateCreateEnvironments() {
-        CodeBuilder code = new CodeBuilder();
-        code.pr("// 'Create' and initialize the environments in the program");
-        code.pr("void _lf_create_environments() {");
-        code.indent();
-        for (ReactorInstance enclave: enclaves) {
-            code.pr(
-                "environment_init(&"+CUtil.getEnvironmentStruct(enclave) +
-                    ","+CUtil.getEnvironmentId(enclave) +
-                    ","+enclave.enclaveInfo.numWorkers +
-                    ","+enclave.enclaveInfo.numTimerTriggers+
-                    ","+enclave.enclaveInfo.numStartupReactions +
-                    ","+enclave.enclaveInfo.numShutdownReactions +
-                    ","+enclave.enclaveInfo.numResetReactions +
-                    ","+enclave.enclaveInfo.numIsPresentFields +
-                    ");"
-            );
-        }
-        code.unindent();
-        code.pr("}");
-        return code.toString();
+  private String generateCreateEnvironments() {
+    CodeBuilder code = new CodeBuilder();
+    code.pr("// 'Create' and initialize the environments in the program");
+    code.pr("void _lf_create_environments() {");
+    code.indent();
+    for (ReactorInstance enclave : enclaves) {
+      code.pr(
+          "environment_init(&"
+              + CUtil.getEnvironmentStruct(enclave)
+              + ","
+              + CUtil.getEnvironmentId(enclave)
+              + ","
+              + enclave.enclaveInfo.numWorkers
+              + ","
+              + enclave.enclaveInfo.numTimerTriggers
+              + ","
+              + enclave.enclaveInfo.numStartupReactions
+              + ","
+              + enclave.enclaveInfo.numShutdownReactions
+              + ","
+              + enclave.enclaveInfo.numResetReactions
+              + ","
+              + enclave.enclaveInfo.numIsPresentFields
+              + ");");
     }
+    code.unindent();
+    code.pr("}");
+    return code.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CFileConfig.java b/org.lflang/src/org/lflang/generator/c/CFileConfig.java
index 362b8645b5..db9447a833 100644
--- a/org.lflang/src/org/lflang/generator/c/CFileConfig.java
+++ b/org.lflang/src/org/lflang/generator/c/CFileConfig.java
@@ -2,24 +2,29 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.lflang.FileConfig;
 
 public class CFileConfig extends FileConfig {
-    private final Path includePath;
-    public CFileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchicalBin) throws IOException {
-        super(resource, srcGenBasePath, useHierarchicalBin);
-        var includeDir = getOutPath().resolve("include");
-        includePath = !useHierarchicalBin ? includeDir : includeDir.resolve(getOutPath().relativize(srcPath)).resolve(srcFile.getFileName().toString().split("\\.")[0]);
-    }
+  private final Path includePath;
+
+  public CFileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchicalBin)
+      throws IOException {
+    super(resource, srcGenBasePath, useHierarchicalBin);
+    var includeDir = getOutPath().resolve("include");
+    includePath =
+        !useHierarchicalBin
+            ? includeDir
+            : includeDir
+                .resolve(getOutPath().relativize(srcPath))
+                .resolve(srcFile.getFileName().toString().split("\\.")[0]);
+  }
 
-    public Path getIncludePath() {
-        return includePath;
-    }
+  public Path getIncludePath() {
+    return includePath;
+  }
 
-    public String getRuntimeIncludePath() {
-        return "/lib/c/reactor-c/include";
-    }
+  public String getRuntimeIncludePath() {
+    return "/lib/c/reactor-c/include";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
index ad7e7f1068..7f00badc92 100644
--- a/org.lflang/src/org/lflang/generator/c/CGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -1,26 +1,26 @@
 /*************
-Copyright (c) 2019-2021, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019-2021, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator.c;
 
@@ -34,11 +34,12 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import static org.lflang.ast.ASTUtils.toText;
 import static org.lflang.util.StringUtil.addDoubleQuotes;
 
+import com.google.common.base.Objects;
+import com.google.common.collect.Iterables;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.HashSet;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
@@ -47,34 +48,27 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
-
-import org.lflang.ast.ASTUtils;
-import org.lflang.generator.CodeMap;
-import org.lflang.generator.DockerComposeGenerator;
 import org.lflang.FileConfig;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.Platform;
-
-import org.lflang.federated.extensions.CExtensionUtils;
-
+import org.lflang.ast.ASTUtils;
 import org.lflang.ast.DelayedConnectionTransformation;
-
+import org.lflang.federated.extensions.CExtensionUtils;
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.CodeBuilder;
+import org.lflang.generator.CodeMap;
+import org.lflang.generator.DelayBodyGenerator;
+import org.lflang.generator.DockerComposeGenerator;
 import org.lflang.generator.DockerGenerator;
 import org.lflang.generator.GeneratorBase;
 import org.lflang.generator.GeneratorResult;
 import org.lflang.generator.GeneratorUtils;
-
-import org.lflang.generator.DelayBodyGenerator;
-
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.LFResource;
 import org.lflang.generator.ParameterInstance;
@@ -100,166 +94,156 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.util.ArduinoUtil;
 import org.lflang.util.FileUtil;
 
-import com.google.common.base.Objects;
-import com.google.common.collect.Iterables;
-
 /**
- * Generator for C target. This class generates C code defining each reactor
- * class given in the input .lf file and imported .lf files. The generated code
- * has the following components:
+ * Generator for C target. This class generates C code defining each reactor class given in the
+ * input .lf file and imported .lf files. The generated code has the following components:
+ *
  * <ul>
- * <li>A typedef for inputs, outputs, and actions of each reactor class. These
- * define the types of the variables that reactions use to access inputs and
- * action values and to set output values.</li>
- * <li>A typedef for a &quot;self&quot; struct for each reactor class. One instance of this
- * struct will be created for each reactor instance. See below for details.</li>
- * <li>A function definition for each reaction in each reactor class. These
- * functions take an instance of the self struct as an argument.</li>
- * <li>A constructor function for each reactor class. This is used to create
- * a new instance of the reactor.
- * After these, the main generated function is <code>_lf_initialize_trigger_objects()</code>.
- * This function creates the instances of reactors (using their constructors)
- * and makes connections between them.
- * A few other smaller functions are also generated.<h2 id="self-struct">Self Struct</h2>
- * The &quot;self&quot; struct has fields for each of the following:</li>
- * <li>parameter: the field name and type match the parameter.</li>
- * <li>state: the field name and type match the state.</li>
- * <li>action: the field name prepends the action name with &quot;<em>lf</em>&quot;.
- * A second field for the action is also created to house the trigger_t object.
- * That second field prepends the action name with &quot;_lf__&quot;.</li>
- * <li>output: the field name prepends the output name with &quot;<em>lf</em>&quot;.</li>
- * <li>input:  the field name prepends the output name with &quot;<em>lf</em>&quot;.
- * A second field for the input is also created to house the trigger_t object.
- * That second field prepends the input name with &quot;_lf__&quot;.
- * If, in addition, the reactor contains other reactors and reacts to their outputs,
- * then there will be a struct within the self struct for each such contained reactor.
- * The name of that self struct will be the name of the contained reactor prepended with &quot;<em>lf</em>&quot;.
- * That inside struct will contain pointers the outputs of the contained reactors
- * that are read together with pointers to booleans indicating whether those outputs are present.
- * If, in addition, the reactor has a reaction to shutdown, then there will be a pointer to
- * trigger_t object (see reactor.h) for the shutdown event and an action struct named
- * _lf_shutdown on the self struct.<h2 id="reaction-functions">Reaction Functions</h2>
- * For each reaction in a reactor class, this generator will produce a C function
- * that expects a pointer to an instance of the &quot;self&quot; struct as an argument.
- * This function will contain verbatim the C code specified in the reaction, but
- * before that C code, the generator inserts a few lines of code that extract from the
- * self struct the variables that that code has declared it will use. For example, if
- * the reaction declares that it is triggered by or uses an input named &quot;x&quot; of type
- * int, the function will contain a line like this:<pre><code>  r_x_t* x = <span class="hljs-keyword">self</span>-&gt;_lf_x;
- * </code></pre>where <code>r</code> is the full name of the reactor class and the struct type <code>r_x_t</code>
- * has fields <code>is_present</code> and <code>value</code>, where the type of <code>value</code> matches the port type.
- * If the programmer fails to declare that it uses x, then the absence of the
- * above code will trigger a compile error when the verbatim code attempts to read <code>x</code>.<h2 id="constructor">Constructor</h2>
- * For each reactor class, this generator will create a constructor function named
- * <code>new_r</code>, where <code>r</code> is the reactor class name. This function will malloc and return
- * a pointer to an instance of the &quot;self&quot; struct.  This struct initially represents
- * an unconnected reactor. To establish connections between reactors, additional
- * information needs to be inserted (see below). The self struct is made visible
- * to the body of a reaction as a variable named &quot;self&quot;.  The self struct contains the
- * following:</li>
- * <li>Parameters: For each parameter <code>p</code> of the reactor, there will be a field <code>p</code>
- * with the type and value of the parameter. So C code in the body of a reaction
- * can access parameter values as <code>self-&gt;p</code>.</li>
- * <li>State variables: For each state variable <code>s</code> of the reactor, there will be a field <code>s</code>
- * with the type and value of the state variable. So C code in the body of a reaction
- * can access state variables as <code>self-&gt;s</code>.
- * The self struct also contains various fields that the user is not intended to
- * use. The names of these fields begin with at least two underscores. They are:</li>
- * <li>Outputs: For each output named <code>out</code>, there will be a field <code>_lf_out</code> that is
- * a struct containing a value field whose type matches that of the output.
- * The output value is stored here. That struct also has a field <code>is_present</code>
- * that is a boolean indicating whether the output has been set.
- * This field is reset to false at the start of every time
- * step. There is also a field <code>num_destinations</code> whose value matches the
- * number of downstream reactors that use this variable. This field must be
- * set when connections are made or changed. It is used to determine for
- * a mutable input destination whether a copy needs to be made.</li>
- * <li>Inputs: For each input named <code>in</code> of type T, there is a field named <code>_lf_in</code>
- * that is a pointer struct with a value field of type T. The struct pointed
- * to also has an <code>is_present</code> field of type bool that indicates whether the
- * input is present.</li>
- * <li>Outputs of contained reactors: If a reactor reacts to outputs of a
- * contained reactor <code>r</code>, then the self struct will contain a nested struct
- * named <code>_lf_r</code> that has fields pointing to those outputs. For example,
- * if <code>r</code> has an output <code>out</code> of type T, then there will be field in <code>_lf_r</code>
- * named <code>out</code> that points to a struct containing a value field
- * of type T and a field named <code>is_present</code> of type bool.</li>
- * <li>Inputs of contained reactors: If a reactor sends to inputs of a
- * contained reactor <code>r</code>, then the self struct will contain a nested struct
- * named <code>_lf_r</code> that has fields for storing the values provided to those
- * inputs. For example, if R has an input <code>in</code> of type T, then there will
- * be field in _lf_R named <code>in</code> that is a struct with a value field
- * of type T and a field named <code>is_present</code> of type bool.</li>
- * <li>Actions: If the reactor has an action a (logical or physical), then there
- * will be a field in the self struct named <code>_lf_a</code> and another named <code>_lf__a</code>.
- * The type of the first is specific to the action and contains a <code>value</code>
- * field with the type and value of the action (if it has a value). That
- * struct also has a <code>has_value</code> field, an <code>is_present</code> field, and a
- * <code>token</code> field (which is NULL if the action carries no value).
- * The <code>_lf__a</code> field is of type trigger_t.
- * That struct contains various things, including an array of reactions
- * sensitive to this trigger and a lf_token_t struct containing the value of
- * the action, if it has a value.  See reactor.h in the C library for
- * details.</li>
- * <li>Reactions: Each reaction will have several fields in the self struct.
- * Each of these has a name that begins with <code>_lf__reaction_i</code>, where i is
- * the number of the reaction, starting with 0. The fields are:<ul>
- * <li>_lf__reaction_i: The struct that is put onto the reaction queue to
- * execute the reaction (see reactor.h in the C library).</li>
- * <li>Timers: For each timer t, there is are two fields in the self struct:<ul>
- * <li>_lf__t: The trigger_t struct for this timer (see reactor.h).</li>
- * <li>_lf__t_reactions: An array of reactions (pointers to the
- * reaction_t structs on this self struct) sensitive to this timer.</li>
- * </ul>
- * </li>
- * </ul>
- * </li>
- * <li>Triggers: For each Timer, Action, Input, and Output of a contained
- * reactor that triggers reactions, there will be a trigger_t struct
- * on the self struct with name <code>_lf__t</code>, where t is the name of the trigger.<h2 id="connections-between-reactors">Connections Between Reactors</h2>
- * Establishing connections between reactors involves two steps.
- * First, each destination (e.g. an input port) must have pointers to
- * the source (the output port). As explained above, for an input named
- * <code>in</code>, the field <code>_lf_in-&gt;value</code> is a pointer to the output data being read.
- * In addition, <code>_lf_in-&gt;is_present</code> is a pointer to the corresponding
- * <code>out-&gt;is_present</code> field of the output reactor&#39;s self struct.
- * In addition, the <code>reaction_i</code> struct on the self struct has a <code>triggers</code>
- * field that records all the trigger_t structs for ports and actions
- * that are triggered by the i-th reaction. The triggers field is
- * an array of arrays of pointers to trigger_t structs.
- * The length of the outer array is the number of output channels
- * (single ports plus multiport widths) that the reaction effects
- * plus the number of input port channels of contained
- * reactors that it effects. Each inner array has a length equal to the
- * number of final destinations of that output channel or input channel.
- * The reaction_i struct has an array triggered_sizes that indicates
- * the sizes of these inner arrays. The num_outputs field of the
- * reaction_i struct gives the length of the triggered_sizes and
- * (outer) triggers arrays. The num_outputs field is equal to the
- * total number of single ports and multiport channels that the reaction
- * writes to.<h2 id="runtime-tables">Runtime Tables</h2>
- * This generator creates an populates the following tables used at run time.
- * These tables may have to be resized and adjusted when mutations occur.</li>
- * <li>_lf_is_present_fields: An array of pointers to booleans indicating whether an
- * event is present. The _lf_start_time_step() function in reactor_common.c uses
- * this to mark every event absent at the start of a time step. The size of this
- * table is contained in the variable _lf_is_present_fields_size.<ul>
- * <li>This table is accompanied by another list, _lf_is_present_fields_abbreviated,
- * which only contains the is_present fields that have been set to true in the
- * current tag. This list can allow a performance improvement if most ports are
- * seldom present because only fields that have been set to true need to be
- * reset to false.</li>
- * </ul>
- * </li>
- * <li>_lf_shutdown_triggers: An array of pointers to trigger_t structs for shutdown
- * reactions. The length of this table is in the _lf_shutdown_triggers_size
- * variable.</li>
- * <li>_lf_timer_triggers: An array of pointers to trigger_t structs for timers that
- * need to be started when the program runs. The length of this table is in the
- * _lf_timer_triggers_size variable.</li>
- * <li>_lf_action_table: For a federated execution, each federate will have this table
- * that maps port IDs to the corresponding action struct, which can be cast to
- * action_base_t.</li>
+ *   <li>A typedef for inputs, outputs, and actions of each reactor class. These define the types of
+ *       the variables that reactions use to access inputs and action values and to set output
+ *       values.
+ *   <li>A typedef for a &quot;self&quot; struct for each reactor class. One instance of this struct
+ *       will be created for each reactor instance. See below for details.
+ *   <li>A function definition for each reaction in each reactor class. These functions take an
+ *       instance of the self struct as an argument.
+ *   <li>A constructor function for each reactor class. This is used to create a new instance of the
+ *       reactor. After these, the main generated function is <code>_lf_initialize_trigger_objects()
+ *       </code>. This function creates the instances of reactors (using their constructors) and
+ *       makes connections between them. A few other smaller functions are also generated.
+ *       <h2 id="self-struct">Self Struct</h2>
+ *       The &quot;self&quot; struct has fields for each of the following:
+ *   <li>parameter: the field name and type match the parameter.
+ *   <li>state: the field name and type match the state.
+ *   <li>action: the field name prepends the action name with &quot;<em>lf</em>&quot;. A second
+ *       field for the action is also created to house the trigger_t object. That second field
+ *       prepends the action name with &quot;_lf__&quot;.
+ *   <li>output: the field name prepends the output name with &quot;<em>lf</em>&quot;.
+ *   <li>input: the field name prepends the output name with &quot;<em>lf</em>&quot;. A second field
+ *       for the input is also created to house the trigger_t object. That second field prepends the
+ *       input name with &quot;_lf__&quot;. If, in addition, the reactor contains other reactors and
+ *       reacts to their outputs, then there will be a struct within the self struct for each such
+ *       contained reactor. The name of that self struct will be the name of the contained reactor
+ *       prepended with &quot;<em>lf</em>&quot;. That inside struct will contain pointers the
+ *       outputs of the contained reactors that are read together with pointers to booleans
+ *       indicating whether those outputs are present. If, in addition, the reactor has a reaction
+ *       to shutdown, then there will be a pointer to trigger_t object (see reactor.h) for the
+ *       shutdown event and an action struct named _lf_shutdown on the self struct.
+ *       <h2 id="reaction-functions">Reaction Functions</h2>
+ *       For each reaction in a reactor class, this generator will produce a C function that expects
+ *       a pointer to an instance of the &quot;self&quot; struct as an argument. This function will
+ *       contain verbatim the C code specified in the reaction, but before that C code, the
+ *       generator inserts a few lines of code that extract from the self struct the variables that
+ *       that code has declared it will use. For example, if the reaction declares that it is
+ *       triggered by or uses an input named &quot;x&quot; of type int, the function will contain a
+ *       line like this:
+ *       <pre><code>  r_x_t* x = <span class="hljs-keyword">self</span>-&gt;_lf_x;
+ * </code></pre>
+ *       where <code>r</code> is the full name of the reactor class and the struct type <code>r_x_t
+ *       </code> has fields <code>is_present</code> and <code>value</code>, where the type of <code>
+ *       value</code> matches the port type. If the programmer fails to declare that it uses x, then
+ *       the absence of the above code will trigger a compile error when the verbatim code attempts
+ *       to read <code>x</code>.
+ *       <h2 id="constructor">Constructor</h2>
+ *       For each reactor class, this generator will create a constructor function named <code>new_r
+ *       </code>, where <code>r</code> is the reactor class name. This function will malloc and
+ *       return a pointer to an instance of the &quot;self&quot; struct. This struct initially
+ *       represents an unconnected reactor. To establish connections between reactors, additional
+ *       information needs to be inserted (see below). The self struct is made visible to the body
+ *       of a reaction as a variable named &quot;self&quot;. The self struct contains the following:
+ *   <li>Parameters: For each parameter <code>p</code> of the reactor, there will be a field <code>p
+ *       </code> with the type and value of the parameter. So C code in the body of a reaction can
+ *       access parameter values as <code>self-&gt;p</code>.
+ *   <li>State variables: For each state variable <code>s</code> of the reactor, there will be a
+ *       field <code>s</code> with the type and value of the state variable. So C code in the body
+ *       of a reaction can access state variables as <code>self-&gt;s</code>. The self struct also
+ *       contains various fields that the user is not intended to use. The names of these fields
+ *       begin with at least two underscores. They are:
+ *   <li>Outputs: For each output named <code>out</code>, there will be a field <code>_lf_out</code>
+ *       that is a struct containing a value field whose type matches that of the output. The output
+ *       value is stored here. That struct also has a field <code>is_present</code> that is a
+ *       boolean indicating whether the output has been set. This field is reset to false at the
+ *       start of every time step. There is also a field <code>num_destinations</code> whose value
+ *       matches the number of downstream reactors that use this variable. This field must be set
+ *       when connections are made or changed. It is used to determine for a mutable input
+ *       destination whether a copy needs to be made.
+ *   <li>Inputs: For each input named <code>in</code> of type T, there is a field named <code>_lf_in
+ *       </code> that is a pointer struct with a value field of type T. The struct pointed to also
+ *       has an <code>is_present</code> field of type bool that indicates whether the input is
+ *       present.
+ *   <li>Outputs of contained reactors: If a reactor reacts to outputs of a contained reactor <code>
+ *       r</code>, then the self struct will contain a nested struct named <code>_lf_r</code> that
+ *       has fields pointing to those outputs. For example, if <code>r</code> has an output <code>
+ *       out</code> of type T, then there will be field in <code>_lf_r</code> named <code>out</code>
+ *       that points to a struct containing a value field of type T and a field named <code>
+ *       is_present</code> of type bool.
+ *   <li>Inputs of contained reactors: If a reactor sends to inputs of a contained reactor <code>r
+ *       </code>, then the self struct will contain a nested struct named <code>_lf_r</code> that
+ *       has fields for storing the values provided to those inputs. For example, if R has an input
+ *       <code>in</code> of type T, then there will be field in _lf_R named <code>in</code> that is
+ *       a struct with a value field of type T and a field named <code>is_present</code> of type
+ *       bool.
+ *   <li>Actions: If the reactor has an action a (logical or physical), then there will be a field
+ *       in the self struct named <code>_lf_a</code> and another named <code>_lf__a</code>. The type
+ *       of the first is specific to the action and contains a <code>value</code> field with the
+ *       type and value of the action (if it has a value). That struct also has a <code>has_value
+ *       </code> field, an <code>is_present</code> field, and a <code>token</code> field (which is
+ *       NULL if the action carries no value). The <code>_lf__a</code> field is of type trigger_t.
+ *       That struct contains various things, including an array of reactions sensitive to this
+ *       trigger and a lf_token_t struct containing the value of the action, if it has a value. See
+ *       reactor.h in the C library for details.
+ *   <li>Reactions: Each reaction will have several fields in the self struct. Each of these has a
+ *       name that begins with <code>_lf__reaction_i</code>, where i is the number of the reaction,
+ *       starting with 0. The fields are:
+ *       <ul>
+ *         <li>_lf__reaction_i: The struct that is put onto the reaction queue to execute the
+ *             reaction (see reactor.h in the C library).
+ *         <li>Timers: For each timer t, there is are two fields in the self struct:
+ *             <ul>
+ *               <li>_lf__t: The trigger_t struct for this timer (see reactor.h).
+ *               <li>_lf__t_reactions: An array of reactions (pointers to the reaction_t structs on
+ *                   this self struct) sensitive to this timer.
+ *             </ul>
+ *       </ul>
+ *   <li>Triggers: For each Timer, Action, Input, and Output of a contained reactor that triggers
+ *       reactions, there will be a trigger_t struct on the self struct with name <code>_lf__t
+ *       </code>, where t is the name of the trigger.
+ *       <h2 id="connections-between-reactors">Connections Between Reactors</h2>
+ *       Establishing connections between reactors involves two steps. First, each destination (e.g.
+ *       an input port) must have pointers to the source (the output port). As explained above, for
+ *       an input named <code>in</code>, the field <code>_lf_in-&gt;value</code> is a pointer to the
+ *       output data being read. In addition, <code>_lf_in-&gt;is_present</code> is a pointer to the
+ *       corresponding <code>out-&gt;is_present</code> field of the output reactor&#39;s self
+ *       struct. In addition, the <code>reaction_i</code> struct on the self struct has a <code>
+ *       triggers</code> field that records all the trigger_t structs for ports and actions that are
+ *       triggered by the i-th reaction. The triggers field is an array of arrays of pointers to
+ *       trigger_t structs. The length of the outer array is the number of output channels (single
+ *       ports plus multiport widths) that the reaction effects plus the number of input port
+ *       channels of contained reactors that it effects. Each inner array has a length equal to the
+ *       number of final destinations of that output channel or input channel. The reaction_i struct
+ *       has an array triggered_sizes that indicates the sizes of these inner arrays. The
+ *       num_outputs field of the reaction_i struct gives the length of the triggered_sizes and
+ *       (outer) triggers arrays. The num_outputs field is equal to the total number of single ports
+ *       and multiport channels that the reaction writes to.
+ *       <h2 id="runtime-tables">Runtime Tables</h2>
+ *       This generator creates an populates the following tables used at run time. These tables may
+ *       have to be resized and adjusted when mutations occur.
+ *   <li>_lf_is_present_fields: An array of pointers to booleans indicating whether an event is
+ *       present. The _lf_start_time_step() function in reactor_common.c uses this to mark every
+ *       event absent at the start of a time step. The size of this table is contained in the
+ *       variable _lf_is_present_fields_size.
+ *       <ul>
+ *         <li>This table is accompanied by another list, _lf_is_present_fields_abbreviated, which
+ *             only contains the is_present fields that have been set to true in the current tag.
+ *             This list can allow a performance improvement if most ports are seldom present
+ *             because only fields that have been set to true need to be reset to false.
+ *       </ul>
+ *   <li>_lf_shutdown_triggers: An array of pointers to trigger_t structs for shutdown reactions.
+ *       The length of this table is in the _lf_shutdown_triggers_size variable.
+ *   <li>_lf_timer_triggers: An array of pointers to trigger_t structs for timers that need to be
+ *       started when the program runs. The length of this table is in the _lf_timer_triggers_size
+ *       variable.
+ *   <li>_lf_action_table: For a federated execution, each federate will have this table that maps
+ *       port IDs to the corresponding action struct, which can be cast to action_base_t.
  * </ul>
  *
  * @author Edward A. Lee
@@ -275,1138 +259,1144 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 @SuppressWarnings("StaticPseudoFunctionalStyleMethod")
 public class CGenerator extends GeneratorBase {
 
-    // Regular expression pattern for compiler error messages with resource
-    // and line number information. The first match will a resource URI in the
-    // form of "file:/path/file.lf". The second match will be a line number.
-    // The third match is a character position within the line.
-    // The fourth match will be the error message.
-    static final Pattern compileErrorPattern = Pattern.compile(
-        "^(?<path>.*):(?<line>\\d+):(?<column>\\d+):(?<message>.*)$"
-    );
-
-    public static int UNDEFINED_MIN_SPACING = -1;
-
-    ////////////////////////////////////////////
-    //// Protected fields
-
-    /** The main place to put generated code. */
-    protected CodeBuilder code = new CodeBuilder();
-
-    /** Place to collect code to initialize the trigger objects for all reactor instances. */
-    protected CodeBuilder initializeTriggerObjects = new CodeBuilder();
-
-    protected final CFileConfig fileConfig;
-
-    /**
-     * Count of the number of is_present fields of the self struct that
-     * need to be reinitialized in _lf_start_time_step().
-     */
-
-    ////////////////////////////////////////////
-    //// Private fields
-    /**
-     * Extra lines that need to go into the generated CMakeLists.txt.
-     */
-    private final String cMakeExtras = "";
-
-    /** Place to collect code to execute at the start of a time step. */
-    private final CodeBuilder startTimeStep = new CodeBuilder();
-
-    /** Count of the number of token pointers that need to have their
-     *  reference count decremented in _lf_start_time_step().
-     */
-    private int shutdownReactionCount = 0;
-    private int resetReactionCount = 0;
-    private int modalReactorCount = 0;
-    private int modalStateResetCount = 0;
-    private int watchdogCount = 0;
-
-    // Indicate whether the generator is in Cpp mode or not
-    private final boolean CCppMode;
-
-    private final CTypes types;
-
-    private final CCmakeGenerator cmakeGenerator;
-
-    protected CGenerator(
-        LFGeneratorContext context,
-        boolean CCppMode,
-        CTypes types,
-        CCmakeGenerator cmakeGenerator,
-        DelayBodyGenerator delayConnectionBodyGenerator,
-        DelayBodyGenerator enclavedConnectionBodyGenerator
-    ) {
-        super(context);
-        this.fileConfig = (CFileConfig) context.getFileConfig();
-        this.CCppMode = CCppMode;
-        this.types = types;
-        this.cmakeGenerator = cmakeGenerator;
-
-        // Register the delayed connection transformation to be applied by GeneratorBase.
-        // transform both after delays and physical connections
-//        registerTransformation(new EnclavedConnectionTransformation(enclavedConnectionBodyGenerator, types, fileConfig.resource, true, true));
-        registerTransformation(new DelayedConnectionTransformation(delayConnectionBodyGenerator, types, fileConfig.resource, true, true));
-
-        // TODO: Register the enclaved connection transformation to be applied by generatorBase
+  // Regular expression pattern for compiler error messages with resource
+  // and line number information. The first match will a resource URI in the
+  // form of "file:/path/file.lf". The second match will be a line number.
+  // The third match is a character position within the line.
+  // The fourth match will be the error message.
+  static final Pattern compileErrorPattern =
+      Pattern.compile("^(?<path>.*):(?<line>\\d+):(?<column>\\d+):(?<message>.*)$");
+
+  public static int UNDEFINED_MIN_SPACING = -1;
+
+  ////////////////////////////////////////////
+  //// Protected fields
+
+  /** The main place to put generated code. */
+  protected CodeBuilder code = new CodeBuilder();
+
+  /** Place to collect code to initialize the trigger objects for all reactor instances. */
+  protected CodeBuilder initializeTriggerObjects = new CodeBuilder();
+
+  protected final CFileConfig fileConfig;
+
+  /**
+   * Count of the number of is_present fields of the self struct that need to be reinitialized in
+   * _lf_start_time_step().
+   */
+
+  ////////////////////////////////////////////
+  //// Private fields
+  /** Extra lines that need to go into the generated CMakeLists.txt. */
+  private final String cMakeExtras = "";
+
+  /** Place to collect code to execute at the start of a time step. */
+  private final CodeBuilder startTimeStep = new CodeBuilder();
+
+  /**
+   * Count of the number of token pointers that need to have their reference count decremented in
+   * _lf_start_time_step().
+   */
+  private int shutdownReactionCount = 0;
+
+  private int resetReactionCount = 0;
+  private int modalReactorCount = 0;
+  private int modalStateResetCount = 0;
+  private int watchdogCount = 0;
+
+  // Indicate whether the generator is in Cpp mode or not
+  private final boolean CCppMode;
+
+  private final CTypes types;
+
+  private final CCmakeGenerator cmakeGenerator;
+
+  protected CGenerator(
+      LFGeneratorContext context,
+      boolean CCppMode,
+      CTypes types,
+      CCmakeGenerator cmakeGenerator,
+      DelayBodyGenerator delayConnectionBodyGenerator,
+      DelayBodyGenerator enclavedConnectionBodyGenerator) {
+    super(context);
+    this.fileConfig = (CFileConfig) context.getFileConfig();
+    this.CCppMode = CCppMode;
+    this.types = types;
+    this.cmakeGenerator = cmakeGenerator;
+
+    // Register the delayed connection transformation to be applied by GeneratorBase.
+    // transform both after delays and physical connections
+    //        registerTransformation(new
+    // EnclavedConnectionTransformation(enclavedConnectionBodyGenerator, types, fileConfig.resource,
+    // true, true));
+    registerTransformation(
+        new DelayedConnectionTransformation(
+            delayConnectionBodyGenerator, types, fileConfig.resource, true, true));
+
+    // TODO: Register the enclaved connection transformation to be applied by generatorBase
+  }
+
+  public CGenerator(LFGeneratorContext context, boolean ccppMode) {
+    this(
+        context,
+        ccppMode,
+        new CTypes(),
+        new CCmakeGenerator(context.getFileConfig(), List.of()),
+        new CDelayBodyGenerator(new CTypes()),
+        new CEnclavedConnectionBodyGenerator(new CTypes()));
+  }
+
+  /**
+   * Look for physical actions in all resources. If found, set threads to be at least one to allow
+   * asynchronous schedule calls.
+   */
+  public void accommodatePhysicalActionsIfPresent() {
+    // If there are any physical actions, ensure the threaded engine is used and that
+    // keepalive is set to true, unless the user has explicitly set it to false.
+    for (Resource resource : GeneratorUtils.getResources(reactors)) {
+      for (Action action : ASTUtils.allElementsOfClass(resource, Action.class)) {
+        if (ActionOrigin.PHYSICAL.equals(action.getOrigin())) {
+          // If the unthreaded runtime is not requested by the user, use the threaded runtime
+          // instead
+          // because it is the only one currently capable of handling asynchronous events.
+          if (!targetConfig.threading
+              && !targetConfig.setByUser.contains(TargetProperty.THREADING)) {
+            targetConfig.threading = true;
+            errorReporter.reportWarning(
+                action,
+                "Using the threaded C runtime to allow for asynchronous handling of physical action"
+                    + " "
+                    + action.getName());
+            return;
+          }
+        }
+      }
     }
-
-    public CGenerator(LFGeneratorContext context, boolean ccppMode) {
-        this(
-            context,
-            ccppMode,
-            new CTypes(),
-            new CCmakeGenerator(context.getFileConfig(), List.of()),
-            new CDelayBodyGenerator(new CTypes()),
-            new CEnclavedConnectionBodyGenerator(new CTypes())
-        );
+  }
+
+  /**
+   * Return true if the host operating system is compatible and otherwise report an error and return
+   * false.
+   */
+  protected boolean isOSCompatible() {
+    if (GeneratorUtils.isHostWindows()) {
+      if (CCppMode) {
+        errorReporter.reportError(
+            "LF programs with a CCpp target are currently not supported on Windows. "
+                + "Exiting code generation.");
+        return false;
+      }
     }
+    return true;
+  }
+
+  /**
+   * Generate C code from the Lingua Franca model contained by the specified resource. This is the
+   * main entry point for code generation.
+   *
+   * @param resource The resource containing the source code.
+   * @param context The context in which the generator is invoked, including whether it is cancelled
+   *     and whether it is a standalone context
+   */
+  @Override
+  public void doGenerate(Resource resource, LFGeneratorContext context) {
+    super.doGenerate(resource, context);
+    if (!GeneratorUtils.canGenerate(errorsOccurred(), mainDef, errorReporter, context)) return;
+    if (!isOSCompatible()) return; // Incompatible OS and configuration
 
-    /**
-     * Look for physical actions in all resources.
-     * If found, set threads to be at least one to allow asynchronous schedule calls.
-     */
-    public void accommodatePhysicalActionsIfPresent() {
-        // If there are any physical actions, ensure the threaded engine is used and that
-        // keepalive is set to true, unless the user has explicitly set it to false.
-        for (Resource resource : GeneratorUtils.getResources(reactors)) {
-            for (Action action : ASTUtils.allElementsOfClass(resource, Action.class)) {
-                if (ActionOrigin.PHYSICAL.equals(action.getOrigin())) {
-                    // If the unthreaded runtime is not requested by the user, use the threaded runtime instead
-                    // because it is the only one currently capable of handling asynchronous events.
-                    if (!targetConfig.threading && !targetConfig.setByUser.contains(TargetProperty.THREADING)) {
-                        targetConfig.threading = true;
-                        errorReporter.reportWarning(
-                            action,
-                            "Using the threaded C runtime to allow for asynchronous handling of physical action " +
-                            action.getName()
-                        );
-                        return;
-                    }
-                }
-            }
-        }
+    // Perform set up that does not generate code
+    setUpGeneralParameters();
+
+    FileUtil.createDirectoryIfDoesNotExist(fileConfig.getSrcGenPath().toFile());
+    FileUtil.createDirectoryIfDoesNotExist(fileConfig.binPath.toFile());
+    FileUtil.createDirectoryIfDoesNotExist(fileConfig.getIncludePath().toFile());
+    handleProtoFiles();
+
+    // Derive target filename from the .lf filename.
+    var lfModuleName = fileConfig.name;
+    var cFilename = CCompiler.getTargetFileName(lfModuleName, this.CCppMode, targetConfig);
+    var targetFile = fileConfig.getSrcGenPath() + File.separator + cFilename;
+    try {
+      generateCodeFor(lfModuleName);
+      copyTargetFiles();
+      generateHeaders();
+      code.writeToFile(targetFile);
+    } catch (IOException e) {
+      //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
+      Exceptions.sneakyThrow(e);
     }
 
-    /**
-     * Return true if the host operating system is compatible and
-     * otherwise report an error and return false.
-     */
-    protected boolean isOSCompatible() {
-        if (GeneratorUtils.isHostWindows()) {
-            if (CCppMode) {
-                errorReporter.reportError(
-                    "LF programs with a CCpp target are currently not supported on Windows. " +
-                    "Exiting code generation."
-                );
-                return false;
-            }
-        }
-        return true;
+    // Create docker file.
+    if (targetConfig.dockerOptions != null && mainDef != null) {
+      try {
+        var dockerData = getDockerGenerator(context).generateDockerData();
+        dockerData.writeDockerFile();
+        (new DockerComposeGenerator(context)).writeDockerComposeFile(List.of(dockerData));
+      } catch (IOException e) {
+        throw new RuntimeException("Error while writing Docker files", e);
+      }
     }
 
-    /**
-     * Generate C code from the Lingua Franca model contained by the
-     * specified resource. This is the main entry point for code
-     * generation.
-     * @param resource The resource containing the source code.
-     * @param context The context in which the generator is
-     *     invoked, including whether it is cancelled and
-     *     whether it is a standalone context
-     */
-    @Override
-    public void doGenerate(Resource resource, LFGeneratorContext context) {
-        super.doGenerate(resource, context);
-        if (!GeneratorUtils.canGenerate(errorsOccurred(), mainDef, errorReporter, context)) return;
-        if (!isOSCompatible()) return; // Incompatible OS and configuration
-
-        // Perform set up that does not generate code
-        setUpGeneralParameters();
-
-        FileUtil.createDirectoryIfDoesNotExist(fileConfig.getSrcGenPath().toFile());
-        FileUtil.createDirectoryIfDoesNotExist(fileConfig.binPath.toFile());
-        FileUtil.createDirectoryIfDoesNotExist(fileConfig.getIncludePath().toFile());
-        handleProtoFiles();
-
-        // Derive target filename from the .lf filename.
-        var lfModuleName = fileConfig.name;
-        var cFilename = CCompiler.getTargetFileName(lfModuleName, this.CCppMode, targetConfig);
-        var targetFile = fileConfig.getSrcGenPath() + File.separator + cFilename;
-        try {
-            generateCodeFor(lfModuleName);
-            copyTargetFiles();
-            generateHeaders();
-            code.writeToFile(targetFile);
-        } catch (IOException e) {
-            //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
-            Exceptions.sneakyThrow(e);
-        }
-
-        // Create docker file.
-        if (targetConfig.dockerOptions != null && mainDef != null) {
-            try {
-                var dockerData = getDockerGenerator(context).generateDockerData();
-                dockerData.writeDockerFile();
-                (new DockerComposeGenerator(context)).writeDockerComposeFile(List.of(dockerData));
-            } catch (IOException e) {
-                throw new RuntimeException("Error while writing Docker files", e);
-            }
-        }
-
-        // If cmake is requested, generate the CMakeLists.txt
-        if (targetConfig.platformOptions.platform != Platform.ARDUINO) {
-            var cmakeFile = fileConfig.getSrcGenPath() + File.separator + "CMakeLists.txt";
-            var sources = allTypeParameterizedReactors()
-                .map(CUtil::getName)
-                .map(it -> it + (CCppMode ? ".cpp" : ".c"))
-                .collect(Collectors.toCollection(ArrayList::new));
-            sources.add(cFilename);
-            var cmakeCode = cmakeGenerator.generateCMakeCode(
-                sources,
-                lfModuleName,
-                errorReporter,
-                CCppMode,
-                mainDef != null,
-                cMakeExtras,
-                targetConfig
-            );
-            try {
-                cmakeCode.writeToFile(cmakeFile);
-            } catch (IOException e) {
-                //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
-                Exceptions.sneakyThrow(e);
-            }
-        } else {
-            try {
-                Path include = fileConfig.getSrcGenPath().resolve("include/");
-                Path src = fileConfig.getSrcGenPath().resolve("src/");
-                FileUtil.arduinoDeleteHelper(src, targetConfig.threading);
-                FileUtil.relativeIncludeHelper(src, include);
-                FileUtil.relativeIncludeHelper(include, include);
-            } catch (IOException e) {
-                //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
-                Exceptions.sneakyThrow(e);
-            }
-            if (!targetConfig.noCompile) {
-                ArduinoUtil arduinoUtil = new ArduinoUtil(context, commandFactory, errorReporter);
-                arduinoUtil.buildArduino(fileConfig, targetConfig);
-                context.finish(
-                    GeneratorResult.Status.COMPILED, null
-                );
-            } else {
-                System.out.println("********");
-                System.out.println("To compile your program, run the following command to see information about the board you plugged in:\n\n\tarduino-cli board list\n\nGrab the FQBN and PORT from the command and run the following command in the generated sources directory:\n\n\tarduino-cli compile -b <FQBN> --build-property compiler.c.extra_flags='-DLF_UNTHREADED -DPLATFORM_ARDUINO -DINITIAL_EVENT_QUEUE_SIZE=10 -DINITIAL_REACT_QUEUE_SIZE=10' --build-property compiler.cpp.extra_flags='-DLF_UNTHREADED -DPLATFORM_ARDUINO -DINITIAL_EVENT_QUEUE_SIZE=10 -DINITIAL_REACT_QUEUE_SIZE=10' .\n\nTo flash/upload your generated sketch to the board, run the following command in the generated sources directory:\n\n\tarduino-cli upload -b <FQBN> -p <PORT>\n");
-                // System.out.println("For a list of all boards installed on your computer, you can use the following command:\n\n\tarduino-cli board listall\n");
-                context.finish(
-                    GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, null)
-                );
-            }
-            GeneratorUtils.refreshProject(resource, context.getMode());
-            return;
-        }
-
-        // Dump the additional compile definitions to a file to keep the generated project
-        // self-contained. In this way, third-party build tools like PlatformIO, west, arduino-cli can
-        // take over and do the rest of compilation.
-        try {
-            String compileDefs = targetConfig.compileDefinitions.keySet().stream()
-                                                                .map(key -> key + "=" + targetConfig.compileDefinitions.get(key))
-                                                                .collect(Collectors.joining("\n")) + "\n";
-            FileUtil.writeToFile(
-                compileDefs,
-                Path.of(fileConfig.getSrcGenPath() + File.separator + "CompileDefinitions.txt")
-            );
-        } catch (IOException e) {
-            Exceptions.sneakyThrow(e);
-        }
+    // If cmake is requested, generate the CMakeLists.txt
+    if (targetConfig.platformOptions.platform != Platform.ARDUINO) {
+      var cmakeFile = fileConfig.getSrcGenPath() + File.separator + "CMakeLists.txt";
+      var sources =
+          allTypeParameterizedReactors()
+              .map(CUtil::getName)
+              .map(it -> it + (CCppMode ? ".cpp" : ".c"))
+              .collect(Collectors.toCollection(ArrayList::new));
+      sources.add(cFilename);
+      var cmakeCode =
+          cmakeGenerator.generateCMakeCode(
+              sources,
+              lfModuleName,
+              errorReporter,
+              CCppMode,
+              mainDef != null,
+              cMakeExtras,
+              targetConfig);
+      try {
+        cmakeCode.writeToFile(cmakeFile);
+      } catch (IOException e) {
+        //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
+        Exceptions.sneakyThrow(e);
+      }
+    } else {
+      try {
+        Path include = fileConfig.getSrcGenPath().resolve("include/");
+        Path src = fileConfig.getSrcGenPath().resolve("src/");
+        FileUtil.arduinoDeleteHelper(src, targetConfig.threading);
+        FileUtil.relativeIncludeHelper(src, include);
+        FileUtil.relativeIncludeHelper(include, include);
+      } catch (IOException e) {
+        //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
+        Exceptions.sneakyThrow(e);
+      }
+      if (!targetConfig.noCompile) {
+        ArduinoUtil arduinoUtil = new ArduinoUtil(context, commandFactory, errorReporter);
+        arduinoUtil.buildArduino(fileConfig, targetConfig);
+        context.finish(GeneratorResult.Status.COMPILED, null);
+      } else {
+        System.out.println("********");
+        System.out.println(
+            "To compile your program, run the following command to see information about the board"
+                + " you plugged in:\n\n"
+                + "\tarduino-cli board list\n\n"
+                + "Grab the FQBN and PORT from the command and run the following command in the"
+                + " generated sources directory:\n\n"
+                + "\tarduino-cli compile -b <FQBN> --build-property"
+                + " compiler.c.extra_flags='-DLF_UNTHREADED -DPLATFORM_ARDUINO"
+                + " -DINITIAL_EVENT_QUEUE_SIZE=10 -DINITIAL_REACT_QUEUE_SIZE=10' --build-property"
+                + " compiler.cpp.extra_flags='-DLF_UNTHREADED -DPLATFORM_ARDUINO"
+                + " -DINITIAL_EVENT_QUEUE_SIZE=10 -DINITIAL_REACT_QUEUE_SIZE=10' .\n\n"
+                + "To flash/upload your generated sketch to the board, run the following command in"
+                + " the generated sources directory:\n\n"
+                + "\tarduino-cli upload -b <FQBN> -p <PORT>\n");
+        // System.out.println("For a list of all boards installed on your computer, you can use the
+        // following command:\n\n\tarduino-cli board listall\n");
+        context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, null));
+      }
+      GeneratorUtils.refreshProject(resource, context.getMode());
+      return;
+    }
 
-        // Create a .vscode/settings.json file in the target directory so that VSCode can
-        // immediately compile the generated code.
-        try {
-            String compileDefs = targetConfig.compileDefinitions.keySet().stream()
-                .map(key -> "\"-D" + key + "=" + targetConfig.compileDefinitions.get(key) + "\"")
-                .collect(Collectors.joining(",\n"));
-            String settings = "{\n"
-                + "\"cmake.configureArgs\": [\n"
-                + compileDefs
-                + "\n]\n}\n";
-            Path vscodePath = Path.of(fileConfig.getSrcGenPath() + File.separator + ".vscode");
-            if (!Files.exists(vscodePath))
-            Files.createDirectory(vscodePath);
-            FileUtil.writeToFile(
-                settings,
-                Path.of(fileConfig.getSrcGenPath()
-                    + File.separator + ".vscode"
-                    + File.separator + "settings.json")
-            );
-        } catch (IOException e) {
-            Exceptions.sneakyThrow(e);
-        }
+    // Dump the additional compile definitions to a file to keep the generated project
+    // self-contained. In this way, third-party build tools like PlatformIO, west, arduino-cli can
+    // take over and do the rest of compilation.
+    try {
+      String compileDefs =
+          targetConfig.compileDefinitions.keySet().stream()
+                  .map(key -> key + "=" + targetConfig.compileDefinitions.get(key))
+                  .collect(Collectors.joining("\n"))
+              + "\n";
+      FileUtil.writeToFile(
+          compileDefs,
+          Path.of(fileConfig.getSrcGenPath() + File.separator + "CompileDefinitions.txt"));
+    } catch (IOException e) {
+      Exceptions.sneakyThrow(e);
+    }
 
-        // If this code generator is directly compiling the code, compile it now so that we
-        // clean it up after, removing the #line directives after errors have been reported.
-        if (
-            !targetConfig.noCompile && targetConfig.dockerOptions == null
-                && IterableExtensions.isNullOrEmpty(targetConfig.buildCommands)
-                // This code is unreachable in LSP_FAST mode, so that check is omitted.
-                && context.getMode() != LFGeneratorContext.Mode.LSP_MEDIUM
-        ) {
-            // FIXME: Currently, a lack of main is treated as a request to not produce
-            // a binary and produce a .o file instead. There should be a way to control
-            // this.
-            // Create an anonymous Runnable class and add it to the compileThreadPool
-            // so that compilation can happen in parallel.
-            var cleanCode = code.removeLines("#line");
-
-            var execName = lfModuleName;
-            var threadFileConfig = fileConfig;
-            var generator = this; // FIXME: currently only passed to report errors with line numbers in the Eclipse IDE
-            var CppMode = CCppMode;
-            // generatingContext.reportProgress(
-            //     String.format("Generated code for %d/%d executables. Compiling...", federateCount, federates.size()),
-            //     100 * federateCount / federates.size()
-            // ); // FIXME: Move to FedGenerator
-            // Create the compiler to be used later
-
-            var cCompiler = new CCompiler(targetConfig, threadFileConfig, errorReporter, CppMode);
-            try {
-                if (!cCompiler.runCCompiler(generator, context)) {
-                    // If compilation failed, remove any bin files that may have been created.
-                    CUtil.deleteBinFiles(threadFileConfig);
-                    // If finish has already been called, it is illegal and makes no sense. However,
-                    //  if finish has already been called, then this must be a federated execution.
-                    context.unsuccessfulFinish();
-                } else {
-                    context.finish(
-                        GeneratorResult.Status.COMPILED, null
-                    );
-                }
-                cleanCode.writeToFile(targetFile);
-            } catch (IOException e) {
-                Exceptions.sneakyThrow(e);
-            }
-        }
+    // Create a .vscode/settings.json file in the target directory so that VSCode can
+    // immediately compile the generated code.
+    try {
+      String compileDefs =
+          targetConfig.compileDefinitions.keySet().stream()
+              .map(key -> "\"-D" + key + "=" + targetConfig.compileDefinitions.get(key) + "\"")
+              .collect(Collectors.joining(",\n"));
+      String settings = "{\n" + "\"cmake.configureArgs\": [\n" + compileDefs + "\n]\n}\n";
+      Path vscodePath = Path.of(fileConfig.getSrcGenPath() + File.separator + ".vscode");
+      if (!Files.exists(vscodePath)) Files.createDirectory(vscodePath);
+      FileUtil.writeToFile(
+          settings,
+          Path.of(
+              fileConfig.getSrcGenPath()
+                  + File.separator
+                  + ".vscode"
+                  + File.separator
+                  + "settings.json"));
+    } catch (IOException e) {
+      Exceptions.sneakyThrow(e);
+    }
 
-        // If a build directive has been given, invoke it now.
-        // Note that the code does not get cleaned in this case.
-        if (!targetConfig.noCompile) {
-            if (!IterableExtensions.isNullOrEmpty(targetConfig.buildCommands)) {
-                CUtil.runBuildCommand(
-                    fileConfig,
-                    targetConfig,
-                    commandFactory,
-                    errorReporter,
-                    this::reportCommandErrors,
-                    context.getMode()
-                );
-                context.finish(
-                    GeneratorResult.Status.COMPILED, null
-                );
-            }
-            if (!errorsOccurred()){
-                System.out.println("Compiled binary is in " + fileConfig.binPath);
-            }
+    // If this code generator is directly compiling the code, compile it now so that we
+    // clean it up after, removing the #line directives after errors have been reported.
+    if (!targetConfig.noCompile
+        && targetConfig.dockerOptions == null
+        && IterableExtensions.isNullOrEmpty(targetConfig.buildCommands)
+        // This code is unreachable in LSP_FAST mode, so that check is omitted.
+        && context.getMode() != LFGeneratorContext.Mode.LSP_MEDIUM) {
+      // FIXME: Currently, a lack of main is treated as a request to not produce
+      // a binary and produce a .o file instead. There should be a way to control
+      // this.
+      // Create an anonymous Runnable class and add it to the compileThreadPool
+      // so that compilation can happen in parallel.
+      var cleanCode = code.removeLines("#line");
+
+      var execName = lfModuleName;
+      var threadFileConfig = fileConfig;
+      var generator =
+          this; // FIXME: currently only passed to report errors with line numbers in the Eclipse
+      // IDE
+      var CppMode = CCppMode;
+      // generatingContext.reportProgress(
+      //     String.format("Generated code for %d/%d executables. Compiling...", federateCount,
+      // federates.size()),
+      //     100 * federateCount / federates.size()
+      // ); // FIXME: Move to FedGenerator
+      // Create the compiler to be used later
+
+      var cCompiler = new CCompiler(targetConfig, threadFileConfig, errorReporter, CppMode);
+      try {
+        if (!cCompiler.runCCompiler(generator, context)) {
+          // If compilation failed, remove any bin files that may have been created.
+          CUtil.deleteBinFiles(threadFileConfig);
+          // If finish has already been called, it is illegal and makes no sense. However,
+          //  if finish has already been called, then this must be a federated execution.
+          context.unsuccessfulFinish();
         } else {
-            context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, null));
+          context.finish(GeneratorResult.Status.COMPILED, null);
         }
+        cleanCode.writeToFile(targetFile);
+      } catch (IOException e) {
+        Exceptions.sneakyThrow(e);
+      }
+    }
 
-        // In case we are in Eclipse, make sure the generated code is visible.
-        GeneratorUtils.refreshProject(resource, context.getMode());
+    // If a build directive has been given, invoke it now.
+    // Note that the code does not get cleaned in this case.
+    if (!targetConfig.noCompile) {
+      if (!IterableExtensions.isNullOrEmpty(targetConfig.buildCommands)) {
+        CUtil.runBuildCommand(
+            fileConfig,
+            targetConfig,
+            commandFactory,
+            errorReporter,
+            this::reportCommandErrors,
+            context.getMode());
+        context.finish(GeneratorResult.Status.COMPILED, null);
+      }
+      if (!errorsOccurred()) {
+        System.out.println("Compiled binary is in " + fileConfig.binPath);
+      }
+    } else {
+      context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, null));
     }
 
-    private void generateCodeFor(
-        String lfModuleName
-    ) throws IOException {
-        code.pr(generateDirectives());
-        code.pr(new CMainFunctionGenerator(targetConfig).generateCode());
-        // Generate code for each reactor.
-        generateReactorDefinitions();
-
-        // Generate main instance, if there is one.
-        // Note that any main reactors in imported files are ignored.
-        // Skip generation if there are cycles.
-        if (main != null) {
-            initializeTriggerObjects.pr(CModesGenerator.generateModalInitalizationCounters(hasModalReactors));
-            var envFuncGen = new CEnvironmentFunctionGenerator(main);
-
-
-            code.pr(envFuncGen.generateDeclarations());
-            initializeTriggerObjects.pr(String.join("\n",
-                "int bank_index;",
-                "SUPPRESS_UNUSED_WARNING(bank_index);",
-                "int watchdog_number = 0;",
-                "SUPPRESS_UNUSED_WARNING(watchdog_number);"));
-            // Add counters for modal initialization
-
-            // Create an array of arrays to store all self structs.
-            // This is needed because connections cannot be established until
-            // all reactor instances have self structs because ports that
-            // receive data reference the self structs of the originating
-            // reactors, which are arbitarily far away in the program graph.
-            generateSelfStructs(main);
-            generateReactorInstance(main);
-
-            code.pr(envFuncGen.generateDefinitions());
-
-            if (targetConfig.fedSetupPreamble != null) {
-                if (targetLanguageIsCpp()) code.pr("extern \"C\" {");
-                code.pr("#include \"" + targetConfig.fedSetupPreamble + "\"");
-                if (targetLanguageIsCpp()) code.pr("}");
-            }
+    // In case we are in Eclipse, make sure the generated code is visible.
+    GeneratorUtils.refreshProject(resource, context.getMode());
+  }
+
+  private void generateCodeFor(String lfModuleName) throws IOException {
+    code.pr(generateDirectives());
+    code.pr(new CMainFunctionGenerator(targetConfig).generateCode());
+    // Generate code for each reactor.
+    generateReactorDefinitions();
+
+    // Generate main instance, if there is one.
+    // Note that any main reactors in imported files are ignored.
+    // Skip generation if there are cycles.
+    if (main != null) {
+      initializeTriggerObjects.pr(
+          CModesGenerator.generateModalInitalizationCounters(hasModalReactors));
+      var envFuncGen = new CEnvironmentFunctionGenerator(main);
+
+      code.pr(envFuncGen.generateDeclarations());
+      initializeTriggerObjects.pr(
+          String.join(
+              "\n",
+              "int bank_index;",
+              "SUPPRESS_UNUSED_WARNING(bank_index);",
+              "int watchdog_number = 0;",
+              "SUPPRESS_UNUSED_WARNING(watchdog_number);"));
+      // Add counters for modal initialization
+
+      // Create an array of arrays to store all self structs.
+      // This is needed because connections cannot be established until
+      // all reactor instances have self structs because ports that
+      // receive data reference the self structs of the originating
+      // reactors, which are arbitarily far away in the program graph.
+      generateSelfStructs(main);
+      generateReactorInstance(main);
+
+      code.pr(envFuncGen.generateDefinitions());
+
+      if (targetConfig.fedSetupPreamble != null) {
+        if (targetLanguageIsCpp()) code.pr("extern \"C\" {");
+        code.pr("#include \"" + targetConfig.fedSetupPreamble + "\"");
+        if (targetLanguageIsCpp()) code.pr("}");
+      }
 
-            // If there are watchdogs, create a table of triggers.
-            code.pr(CWatchdogGenerator.generateWatchdogTable(watchdogCount));
-
-            // If there are modes, create a table of mode state to be checked for transitions.
-            code.pr(CModesGenerator.generateModeStatesTable(
-                hasModalReactors,
-                modalReactorCount,
-                modalStateResetCount
-            ));
-
-            // Generate function to initialize the trigger objects for all reactors.
-            code.pr(CTriggerObjectsGenerator.generateInitializeTriggerObjects(
-                main,
-                targetConfig,
-                initializeTriggerObjects,
-                startTimeStep,
-                types,
-                lfModuleName
-            ));
-
-            // Generate function to trigger startup reactions for all reactors.
-            code.pr(CReactionGenerator.generateLfTriggerStartupReactions(hasModalReactors));
-
-            // Generate function to schedule timers for all reactors.
-            code.pr(CTimerGenerator.generateLfInitializeTimer());
-
-            // Generate a function that will either do nothing
-            // (if there is only one federate or the coordination
-            // is set to decentralized) or, if there are
-            // downstream federates, will notify the RTI
-            // that the specified logical time is complete.
-            if (CCppMode || targetConfig.platformOptions.platform == Platform.ARDUINO) code.pr("extern \"C\"");
-            code.pr(String.join("\n",
-                "void logical_tag_complete(tag_t tag_to_send) {",
-                CExtensionUtils.surroundWithIfFederatedCentralized(
-                "        _lf_logical_tag_complete(tag_to_send);"
-                ),
-                "}"
-            ));
-
-            // Generate function to schedule shutdown reactions if any
-            // reactors have reactions to shutdown.
-            code.pr(CReactionGenerator.generateLfTriggerShutdownReactions(shutdownReactionCount, hasModalReactors));
-
-            // Generate an empty termination function for non-federated
-            // execution. For federated execution, an implementation is
-            // provided in federate.c.  That implementation will resign
-            // from the federation and close any open sockets.
-            code.pr("""
+      // If there are watchdogs, create a table of triggers.
+      code.pr(CWatchdogGenerator.generateWatchdogTable(watchdogCount));
+
+      // If there are modes, create a table of mode state to be checked for transitions.
+      code.pr(
+          CModesGenerator.generateModeStatesTable(
+              hasModalReactors, modalReactorCount, modalStateResetCount));
+
+      // Generate function to initialize the trigger objects for all reactors.
+      code.pr(
+          CTriggerObjectsGenerator.generateInitializeTriggerObjects(
+              main, targetConfig, initializeTriggerObjects, startTimeStep, types, lfModuleName));
+
+      // Generate function to trigger startup reactions for all reactors.
+      code.pr(CReactionGenerator.generateLfTriggerStartupReactions(hasModalReactors));
+
+      // Generate function to schedule timers for all reactors.
+      code.pr(CTimerGenerator.generateLfInitializeTimer());
+
+      // Generate a function that will either do nothing
+      // (if there is only one federate or the coordination
+      // is set to decentralized) or, if there are
+      // downstream federates, will notify the RTI
+      // that the specified logical time is complete.
+      if (CCppMode || targetConfig.platformOptions.platform == Platform.ARDUINO)
+        code.pr("extern \"C\"");
+      code.pr(
+          String.join(
+              "\n",
+              "void logical_tag_complete(tag_t tag_to_send) {",
+              CExtensionUtils.surroundWithIfFederatedCentralized(
+                  "        _lf_logical_tag_complete(tag_to_send);"),
+              "}"));
+
+      // Generate function to schedule shutdown reactions if any
+      // reactors have reactions to shutdown.
+      code.pr(
+          CReactionGenerator.generateLfTriggerShutdownReactions(
+              shutdownReactionCount, hasModalReactors));
+
+      // Generate an empty termination function for non-federated
+      // execution. For federated execution, an implementation is
+      // provided in federate.c.  That implementation will resign
+      // from the federation and close any open sockets.
+      code.pr(
+          """
                 #ifndef FEDERATED
                 void terminate_execution() {}
-                #endif"""
-            );
-
-
-            // Generate functions for modes
-            code.pr(CModesGenerator.generateLfInitializeModes(
-                hasModalReactors
-            ));
-            code.pr(CModesGenerator.generateLfHandleModeChanges(
-                hasModalReactors,
-                modalStateResetCount
-            ));
-            code.pr(CReactionGenerator.generateLfModeTriggeredReactions(
-                resetReactionCount,
-                hasModalReactors
-            ));
-        }
-    }
-
-    @Override
-    public void checkModalReactorSupport(boolean __) {
-        // Modal reactors are currently only supported for non federated applications
-        super.checkModalReactorSupport(true);
-    }
-
-    @Override
-    protected String getConflictingConnectionsInModalReactorsBody(String source, String dest) {
-        return String.join("\n",
-            "// Generated forwarding reaction for connections with the same destination",
-            "// but located in mutually exclusive modes.",
-            "lf_set("+dest+", "+source+"->value);"
-        );
+                #endif""");
+
+      // Generate functions for modes
+      code.pr(CModesGenerator.generateLfInitializeModes(hasModalReactors));
+      code.pr(CModesGenerator.generateLfHandleModeChanges(hasModalReactors, modalStateResetCount));
+      code.pr(
+          CReactionGenerator.generateLfModeTriggeredReactions(
+              resetReactionCount, hasModalReactors));
     }
-
-    /** Set the scheduler type in the target config as needed. */
-    private void pickScheduler() {
-        // Don't use a scheduler that does not prioritize reactions based on deadlines
-        // if the program contains a deadline (handler). Use the GEDF_NP scheduler instead.
-        if (!targetConfig.schedulerType.prioritizesDeadline()) {
-            // Check if a deadline is assigned to any reaction
-            if (hasDeadlines(reactors)) {
-                if (!targetConfig.setByUser.contains(TargetProperty.SCHEDULER)) {
-                    targetConfig.schedulerType = TargetProperty.SchedulerOption.GEDF_NP;
-                }
-            }
+  }
+
+  @Override
+  public void checkModalReactorSupport(boolean __) {
+    // Modal reactors are currently only supported for non federated applications
+    super.checkModalReactorSupport(true);
+  }
+
+  @Override
+  protected String getConflictingConnectionsInModalReactorsBody(String source, String dest) {
+    return String.join(
+        "\n",
+        "// Generated forwarding reaction for connections with the same destination",
+        "// but located in mutually exclusive modes.",
+        "lf_set(" + dest + ", " + source + "->value);");
+  }
+
+  /** Set the scheduler type in the target config as needed. */
+  private void pickScheduler() {
+    // Don't use a scheduler that does not prioritize reactions based on deadlines
+    // if the program contains a deadline (handler). Use the GEDF_NP scheduler instead.
+    if (!targetConfig.schedulerType.prioritizesDeadline()) {
+      // Check if a deadline is assigned to any reaction
+      if (hasDeadlines(reactors)) {
+        if (!targetConfig.setByUser.contains(TargetProperty.SCHEDULER)) {
+          targetConfig.schedulerType = TargetProperty.SchedulerOption.GEDF_NP;
         }
+      }
     }
+  }
 
-    private boolean hasDeadlines(List<Reactor> reactors) {
-        for (Reactor reactor : reactors) {
-            for (Reaction reaction : allReactions(reactor)) {
-                if (reaction.getDeadline() != null) {
-                    return true;
-                }
-            }
+  private boolean hasDeadlines(List<Reactor> reactors) {
+    for (Reactor reactor : reactors) {
+      for (Reaction reaction : allReactions(reactor)) {
+        if (reaction.getDeadline() != null) {
+          return true;
         }
-        return false;
+      }
     }
-
-    /**
-     * Look at the 'reactor' eResource.
-     * If it is an imported .lf file, incorporate it into the current
-     * program in the following manner:
-     * <ul>
-     * <li>Merge its target property with {@code targetConfig}</li>
-     * <li>If there are any preambles, add them to the preambles of the reactor.</li>
-     * </ul>
-     *
-     */
-    private void inspectReactorEResource(ReactorDecl reactor) {
-        // If the reactor is imported, look at the
-        // target definition of the .lf file in which the reactor is imported from and
-        // append any cmake-include.
-        // Check if the reactor definition is imported
-        if (reactor.eResource() != mainDef.getReactorClass().eResource()) {
-            // Find the LFResource corresponding to this eResource
-            LFResource lfResource = null;
-            for (var resource : resources) {
-                if (resource.getEResource() == reactor.eResource()) {
-                    lfResource = resource;
-                    break;
-                }
-            }
-            if (lfResource != null) {
-                // Copy the user files and cmake-includes to the src-gen path of the main .lf file
-                copyUserFiles(lfResource.getTargetConfig(), lfResource.getFileConfig());
-                // Merge the CMake includes from the imported file into the target config
-                lfResource.getTargetConfig().cmakeIncludes.forEach(incl -> {
-                    if (!this.targetConfig.cmakeIncludes.contains(incl)) {
-                        this.targetConfig.cmakeIncludes.add(incl);
-                    }
-                });
-            }
+    return false;
+  }
+
+  /**
+   * Look at the 'reactor' eResource. If it is an imported .lf file, incorporate it into the current
+   * program in the following manner:
+   *
+   * <ul>
+   *   <li>Merge its target property with {@code targetConfig}
+   *   <li>If there are any preambles, add them to the preambles of the reactor.
+   * </ul>
+   */
+  private void inspectReactorEResource(ReactorDecl reactor) {
+    // If the reactor is imported, look at the
+    // target definition of the .lf file in which the reactor is imported from and
+    // append any cmake-include.
+    // Check if the reactor definition is imported
+    if (reactor.eResource() != mainDef.getReactorClass().eResource()) {
+      // Find the LFResource corresponding to this eResource
+      LFResource lfResource = null;
+      for (var resource : resources) {
+        if (resource.getEResource() == reactor.eResource()) {
+          lfResource = resource;
+          break;
         }
+      }
+      if (lfResource != null) {
+        // Copy the user files and cmake-includes to the src-gen path of the main .lf file
+        copyUserFiles(lfResource.getTargetConfig(), lfResource.getFileConfig());
+        // Merge the CMake includes from the imported file into the target config
+        lfResource
+            .getTargetConfig()
+            .cmakeIncludes
+            .forEach(
+                incl -> {
+                  if (!this.targetConfig.cmakeIncludes.contains(incl)) {
+                    this.targetConfig.cmakeIncludes.add(incl);
+                  }
+                });
+      }
     }
-
-    /**
-     * Copy all files or directories listed in the target property {@code files}, {@code cmake-include},
-     * and {@code _fed_setup} into the src-gen folder of the main .lf file
-     *
-     * @param targetConfig The targetConfig to read the target properties from.
-     * @param fileConfig The fileConfig used to make the copy and resolve paths.
-     */
-    @Override
-    protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
-        super.copyUserFiles(targetConfig, fileConfig);
-        // Must use class variable to determine destination!
-        var destination = this.fileConfig.getSrcGenPath();
-
-        FileUtil.copyFilesOrDirectories(targetConfig.cmakeIncludes, destination, fileConfig, errorReporter, true);
-
-        // FIXME: Unclear what the following does, but it does not appear to belong here.
-        if (!StringExtensions.isNullOrEmpty(targetConfig.fedSetupPreamble)) {
-            try {
-                FileUtil.copyFile(fileConfig.srcFile.getParent().resolve(targetConfig.fedSetupPreamble),
-                                  destination.resolve(targetConfig.fedSetupPreamble));
-            } catch (IOException e) {
-                errorReporter.reportError("Failed to find _fed_setup file " + targetConfig.fedSetupPreamble);
-            }
-        }
+  }
+
+  /**
+   * Copy all files or directories listed in the target property {@code files}, {@code
+   * cmake-include}, and {@code _fed_setup} into the src-gen folder of the main .lf file
+   *
+   * @param targetConfig The targetConfig to read the target properties from.
+   * @param fileConfig The fileConfig used to make the copy and resolve paths.
+   */
+  @Override
+  protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
+    super.copyUserFiles(targetConfig, fileConfig);
+    // Must use class variable to determine destination!
+    var destination = this.fileConfig.getSrcGenPath();
+
+    FileUtil.copyFilesOrDirectories(
+        targetConfig.cmakeIncludes, destination, fileConfig, errorReporter, true);
+
+    // FIXME: Unclear what the following does, but it does not appear to belong here.
+    if (!StringExtensions.isNullOrEmpty(targetConfig.fedSetupPreamble)) {
+      try {
+        FileUtil.copyFile(
+            fileConfig.srcFile.getParent().resolve(targetConfig.fedSetupPreamble),
+            destination.resolve(targetConfig.fedSetupPreamble));
+      } catch (IOException e) {
+        errorReporter.reportError(
+            "Failed to find _fed_setup file " + targetConfig.fedSetupPreamble);
+      }
     }
-
-    /**
-     * Generate code for defining all instantiated reactors.
-     *
-     * Imported reactors' original .lf file is
-     * incorporated in the following manner:
-     * <ul>
-     * <li>If there are any cmake-include files, add them to the current list
-     * of cmake-include files.</li>
-     * <li>If there are any preambles, add them to the preambles of the reactor.</li>
-     * </ul>
-     */
-    private void generateReactorDefinitions() throws IOException {
-        var generatedReactors = new LinkedHashSet<TypeParameterizedReactor>();
-        if (this.main != null) {
-            resolveTemplatedTypes(this.main, this.main.tpr);
-            generateReactorChildren(this.main, generatedReactors);
-            generateReactorClass(this.main.getTypeParameterizedReactor());
-        }
-        // do not generate code for reactors that are not instantiated
+  }
+
+  /**
+   * Generate code for defining all instantiated reactors.
+   *
+   * <p>Imported reactors' original .lf file is incorporated in the following manner:
+   *
+   * <ul>
+   *   <li>If there are any cmake-include files, add them to the current list of cmake-include
+   *       files.
+   *   <li>If there are any preambles, add them to the preambles of the reactor.
+   * </ul>
+   */
+  private void generateReactorDefinitions() throws IOException {
+    var generatedReactors = new LinkedHashSet<TypeParameterizedReactor>();
+    if (this.main != null) {
+      resolveTemplatedTypes(this.main, this.main.tpr);
+      generateReactorChildren(this.main, generatedReactors);
+      generateReactorClass(this.main.getTypeParameterizedReactor());
     }
-
-    /**
-     * Recursively Resolve all Templated Types of child Reactors to their respective
-     * concrete types
-     *
-     * @param reactorInstance The Reactor Class
-     * @param parentTpr {@link TypeParameterizedReactor} of Parent
-     */
-    private void resolveTemplatedTypes(ReactorInstance reactorInstance, TypeParameterizedReactor parentTpr) {
-        for (var child : reactorInstance.children) {
-            if (parentTpr.typeArgs() != null) {
-                Map<String, Type> copy = new HashMap<>();
-                child.tpr.typeArgs().forEach((literal, typename) -> {
-                    var type = typename.getId();
-                    if (parentTpr.typeArgs().containsKey(type)) {
-                        var basicType = parentTpr.typeArgs().get(type);
-                        copy.put(literal, basicType);
-                    } else {
-                        // Typename is not inherited from Parent Reactor. Keep As Is!
-                        copy.put(literal, typename);
-                    }
+    // do not generate code for reactors that are not instantiated
+  }
+
+  /**
+   * Recursively Resolve all Templated Types of child Reactors to their respective concrete types
+   *
+   * @param reactorInstance The Reactor Class
+   * @param parentTpr {@link TypeParameterizedReactor} of Parent
+   */
+  private void resolveTemplatedTypes(
+      ReactorInstance reactorInstance, TypeParameterizedReactor parentTpr) {
+    for (var child : reactorInstance.children) {
+      if (parentTpr.typeArgs() != null) {
+        Map<String, Type> copy = new HashMap<>();
+        child
+            .tpr
+            .typeArgs()
+            .forEach(
+                (literal, typename) -> {
+                  var type = typename.getId();
+                  if (parentTpr.typeArgs().containsKey(type)) {
+                    var basicType = parentTpr.typeArgs().get(type);
+                    copy.put(literal, basicType);
+                  } else {
+                    // Typename is not inherited from Parent Reactor. Keep As Is!
+                    copy.put(literal, typename);
+                  }
                 });
-                if (!copy.isEmpty()) { // If we found some templated-types update the tpr with new map
-                    child.tpr = new TypeParameterizedReactor(child.tpr.reactor(), copy);
-                }
-                resolveTemplatedTypes(child, child.tpr);
-            }
-        }
-    }
-
-    private record TypeParameterizedReactorWithDecl(TypeParameterizedReactor tpr, ReactorDecl decl) {}
-
-    /** Generate user-visible header files for all reactors instantiated. */
-    private void generateHeaders() throws IOException {
-        FileUtil.deleteDirectory(fileConfig.getIncludePath());
-        FileUtil.copyFromClassPath(
-            fileConfig.getRuntimeIncludePath(),
-            fileConfig.getIncludePath(),
-            false,
-            true
-        );
-        for (TypeParameterizedReactor tpr :
-            (Iterable<TypeParameterizedReactor>) () -> allTypeParameterizedReactors().iterator()
-        ) {
-            CReactorHeaderFileGenerator.doGenerate(
-                types, tpr, fileConfig,
-                (builder, rr, userFacing) -> {
-                    generateAuxiliaryStructs(builder, rr, userFacing);
-                    if (userFacing) {
-                        rr.reactor().getInstantiations().stream()
-                            .map(it -> new TypeParameterizedReactorWithDecl(new TypeParameterizedReactor(it), it.getReactorClass())).collect(Collectors.toSet()).forEach(it -> {
-                                ASTUtils.allPorts(it.tpr.reactor())
-                                    .forEach(p -> builder.pr(CPortGenerator.generateAuxiliaryStruct(
-                                        it.tpr, p, getTarget(), errorReporter, types, new CodeBuilder(), true, it.decl()
-                                    )));
-                            });
-                    }
-                },
-                this::generateTopLevelPreambles);
+        if (!copy.isEmpty()) { // If we found some templated-types update the tpr with new map
+          child.tpr = new TypeParameterizedReactor(child.tpr.reactor(), copy);
         }
-        FileUtil.copyDirectoryContents(fileConfig.getIncludePath(), fileConfig.getSrcGenPath().resolve("include"), false);
+        resolveTemplatedTypes(child, child.tpr);
+      }
     }
-
-    /**
-     * Generate code for the children of 'reactor' that belong to 'federate'.
-     * Duplicates are avoided.
-     *
-     * Imported reactors' original .lf file is
-     * incorporated in the following manner:
-     * <ul>
-     * <li>If there are any cmake-include files, add them to the current list
-     * of cmake-include files.</li>
-     * <li>If there are any preambles, add them to the preambles of the reactor.</li>
-     * </ul>
-     *
-     * @param reactor Used to extract children from
-     */
-    private void generateReactorChildren(
-        ReactorInstance reactor,
-        LinkedHashSet<TypeParameterizedReactor> generatedReactors
-    ) throws IOException {
-        for (ReactorInstance r : reactor.children) {
-            var newTpr = r.tpr;
-            if (r.reactorDeclaration != null &&
-                  !generatedReactors.contains(newTpr)) {
-                generatedReactors.add(newTpr);
-                generateReactorChildren(r, generatedReactors);
-                inspectReactorEResource(r.reactorDeclaration);
-                generateReactorClass(newTpr);
+  }
+
+  private record TypeParameterizedReactorWithDecl(TypeParameterizedReactor tpr, ReactorDecl decl) {}
+
+  /** Generate user-visible header files for all reactors instantiated. */
+  private void generateHeaders() throws IOException {
+    FileUtil.deleteDirectory(fileConfig.getIncludePath());
+    FileUtil.copyFromClassPath(
+        fileConfig.getRuntimeIncludePath(), fileConfig.getIncludePath(), false, true);
+    for (TypeParameterizedReactor tpr :
+        (Iterable<TypeParameterizedReactor>) () -> allTypeParameterizedReactors().iterator()) {
+      CReactorHeaderFileGenerator.doGenerate(
+          types,
+          tpr,
+          fileConfig,
+          (builder, rr, userFacing) -> {
+            generateAuxiliaryStructs(builder, rr, userFacing);
+            if (userFacing) {
+              rr.reactor().getInstantiations().stream()
+                  .map(
+                      it ->
+                          new TypeParameterizedReactorWithDecl(
+                              new TypeParameterizedReactor(it), it.getReactorClass()))
+                  .collect(Collectors.toSet())
+                  .forEach(
+                      it -> {
+                        ASTUtils.allPorts(it.tpr.reactor())
+                            .forEach(
+                                p ->
+                                    builder.pr(
+                                        CPortGenerator.generateAuxiliaryStruct(
+                                            it.tpr,
+                                            p,
+                                            getTarget(),
+                                            errorReporter,
+                                            types,
+                                            new CodeBuilder(),
+                                            true,
+                                            it.decl())));
+                      });
             }
-        }
+          },
+          this::generateTopLevelPreambles);
     }
-
-    /**
-     * Choose which platform files to compile with according to the OS.
-     * If there is no main reactor, then compilation will produce a .o file requiring further linking.
-     * Also, if useCmake is set to true, we don't need to add platform files. The CMakeLists.txt file
-     * will detect and use the appropriate platform file based on the platform that cmake is invoked on.
-     */
-    private void pickCompilePlatform() {
-        var osName = System.getProperty("os.name").toLowerCase();
-        // if platform target was set, use given platform instead
-        if (targetConfig.platformOptions.platform != Platform.AUTO) {
-            osName = targetConfig.platformOptions.platform.toString();
-        } else if (Stream.of("mac", "darwin", "win", "nux").noneMatch(osName::contains)) {
-            errorReporter.reportError("Platform " + osName + " is not supported");
-        }
-    }
-
-    /**
-     * Copy target-specific header file to the src-gen directory.
-     */
-    protected void copyTargetFiles() throws IOException {
-        // Copy the core lib
-        String coreLib = LFGeneratorContext.BuildParm.EXTERNAL_RUNTIME_PATH.getValue(context);
-        Path dest = fileConfig.getSrcGenPath();
-      if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
-        dest = dest.resolve("src");
+    FileUtil.copyDirectoryContents(
+        fileConfig.getIncludePath(), fileConfig.getSrcGenPath().resolve("include"), false);
+  }
+
+  /**
+   * Generate code for the children of 'reactor' that belong to 'federate'. Duplicates are avoided.
+   *
+   * <p>Imported reactors' original .lf file is incorporated in the following manner:
+   *
+   * <ul>
+   *   <li>If there are any cmake-include files, add them to the current list of cmake-include
+   *       files.
+   *   <li>If there are any preambles, add them to the preambles of the reactor.
+   * </ul>
+   *
+   * @param reactor Used to extract children from
+   */
+  private void generateReactorChildren(
+      ReactorInstance reactor, LinkedHashSet<TypeParameterizedReactor> generatedReactors)
+      throws IOException {
+    for (ReactorInstance r : reactor.children) {
+      var newTpr = r.tpr;
+      if (r.reactorDeclaration != null && !generatedReactors.contains(newTpr)) {
+        generatedReactors.add(newTpr);
+        generateReactorChildren(r, generatedReactors);
+        inspectReactorEResource(r.reactorDeclaration);
+        generateReactorClass(newTpr);
       }
-        if (coreLib != null) {
-            FileUtil.copyDirectoryContents(Path.of(coreLib), dest, true);
-        } else {
-            FileUtil.copyFromClassPath(
-                "/lib/c/reactor-c/core",
-                dest,
-                true,
-                false
-            );
-            FileUtil.copyFromClassPath(
-                "/lib/c/reactor-c/lib",
-                dest,
-                true,
-                false
-            );
-        }
-
-        // For the Zephyr target, copy default config and board files.
-        if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
-            FileUtil.copyFromClassPath(
-                "/lib/platform/zephyr/boards",
-                fileConfig.getSrcGenPath(),
-                false,
-                false
-            );
-            FileUtil.copyFileFromClassPath(
-                "/lib/platform/zephyr/prj_lf.conf",
-                fileConfig.getSrcGenPath(),
-                true
-            );
-
-            FileUtil.copyFileFromClassPath(
-                "/lib/platform/zephyr/Kconfig",
-                fileConfig.getSrcGenPath(),
-                true
-            );
-        }
     }
-
-    ////////////////////////////////////////////
-    //// Code generators.
-
-    /**
-     * Generate a reactor class definition for the specified federate.
-     * A class definition has four parts:
-     *
-     * <ul>
-     * <li>Preamble code, if any, specified in the Lingua Franca file.</li>
-     * <li>A &quot;self&quot; struct type definition (see the class documentation above).</li>
-     * <li>A function for each reaction.</li>
-     * <li>A constructor for creating an instance.
-     * for deleting an instance.</li>
-     * </ul>
-     *
-     * <p>If the reactor is the main reactor, then
-     * the generated code may be customized. Specifically,
-     * if the main reactor has reactions, these reactions
-     * will not be generated if they are triggered by or send
-     * data to contained reactors that are not in the federate.</p>
-     */
-    private void generateReactorClass(TypeParameterizedReactor tpr) throws IOException {
-        // FIXME: Currently we're not reusing definitions for declarations that point to the same definition.
-        CodeBuilder header = new CodeBuilder();
-        CodeBuilder src = new CodeBuilder();
-        final String headerName = CUtil.getName(tpr) + ".h";
-        var guardMacro = headerName.toUpperCase().replace(".", "_");
-        header.pr("#ifndef " + guardMacro);
-        header.pr("#define " + guardMacro);
-        generateReactorClassHeaders(tpr, headerName, header, src);
-        header.pr(generateTopLevelPreambles(tpr.reactor()));
-        generateUserPreamblesForReactor(tpr.reactor(), src);
-        generateReactorClassBody(tpr, header, src);
-        header.pr("#endif // " + guardMacro);
-        FileUtil.writeToFile(CodeMap.fromGeneratedCode(header.toString()).getGeneratedCode(), fileConfig.getSrcGenPath().resolve(headerName), true);
-        var extension = targetConfig.platformOptions.platform == Platform.ARDUINO ? ".ino" :
-            CCppMode ? ".cpp" : ".c";
-        FileUtil.writeToFile(CodeMap.fromGeneratedCode(src.toString()).getGeneratedCode(), fileConfig.getSrcGenPath().resolve(CUtil.getName(tpr) + extension), true);
+  }
+
+  /**
+   * Choose which platform files to compile with according to the OS. If there is no main reactor,
+   * then compilation will produce a .o file requiring further linking. Also, if useCmake is set to
+   * true, we don't need to add platform files. The CMakeLists.txt file will detect and use the
+   * appropriate platform file based on the platform that cmake is invoked on.
+   */
+  private void pickCompilePlatform() {
+    var osName = System.getProperty("os.name").toLowerCase();
+    // if platform target was set, use given platform instead
+    if (targetConfig.platformOptions.platform != Platform.AUTO) {
+      osName = targetConfig.platformOptions.platform.toString();
+    } else if (Stream.of("mac", "darwin", "win", "nux").noneMatch(osName::contains)) {
+      errorReporter.reportError("Platform " + osName + " is not supported");
     }
-
-    protected void generateReactorClassHeaders(TypeParameterizedReactor tpr, String headerName, CodeBuilder header, CodeBuilder src) {
-        if (CCppMode) {
-            src.pr("extern \"C\" {");
-            header.pr("extern \"C\" {");
-        }
-        header.pr("#include \"include/core/reactor.h\"");
-        src.pr("#include \"include/api/api.h\"");
-        src.pr("#include \"include/api/set.h\"");
-        generateIncludes(tpr);
-        if (CCppMode) {
-            src.pr("}");
-            header.pr("}");
-        }
-        src.pr("#include \"include/" + CReactorHeaderFileGenerator.outputPath(tpr) + "\"");
-        src.pr("#include \"" + headerName + "\"");
-        tpr.doDefines(src);
-        ASTUtils.allIncludes(tpr.reactor()).stream().map(name -> "#include \""
-            + name + ".h\"").forEach(header::pr);
+  }
+
+  /** Copy target-specific header file to the src-gen directory. */
+  protected void copyTargetFiles() throws IOException {
+    // Copy the core lib
+    String coreLib = LFGeneratorContext.BuildParm.EXTERNAL_RUNTIME_PATH.getValue(context);
+    Path dest = fileConfig.getSrcGenPath();
+    if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
+      dest = dest.resolve("src");
     }
-
-    private void generateReactorClassBody(TypeParameterizedReactor tpr, CodeBuilder header, CodeBuilder src) {
-        // Some of the following methods create lines of code that need to
-        // go into the constructor.  Collect those lines of code here:
-        var constructorCode = new CodeBuilder();
-        generateAuxiliaryStructs(header, tpr, false);
-        // The following must go before the self struct so the #include watchdog.h ends up in the header.
-        CWatchdogGenerator.generateWatchdogs(src, header, tpr, errorReporter);
-        generateSelfStruct(header, tpr, constructorCode);
-        generateMethods(src, tpr);
-        generateReactions(src, tpr);
-        generateConstructor(src, header, tpr, constructorCode);
+    if (coreLib != null) {
+      FileUtil.copyDirectoryContents(Path.of(coreLib), dest, true);
+    } else {
+      FileUtil.copyFromClassPath("/lib/c/reactor-c/core", dest, true, false);
+      FileUtil.copyFromClassPath("/lib/c/reactor-c/lib", dest, true, false);
     }
 
-    /**
-     * Generate methods for {@code reactor}.
-     */
-    protected void generateMethods(CodeBuilder src, TypeParameterizedReactor tpr) {
-        CMethodGenerator.generateMethods(tpr, src, types);
-    }
+    // For the Zephyr target, copy default config and board files.
+    if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
+      FileUtil.copyFromClassPath(
+          "/lib/platform/zephyr/boards", fileConfig.getSrcGenPath(), false, false);
+      FileUtil.copyFileFromClassPath(
+          "/lib/platform/zephyr/prj_lf.conf", fileConfig.getSrcGenPath(), true);
 
-    /**
-     * Generates preambles defined by user for a given reactor
-     * @param reactor The given reactor
-     */
-    protected void generateUserPreamblesForReactor(Reactor reactor, CodeBuilder src) {
-        for (Preamble p : ASTUtils.allPreambles(reactor)) {
-            src.pr("// *********** From the preamble, verbatim:");
-            src.prSourceLineNumber(p.getCode());
-            src.pr(toText(p.getCode()));
-            src.pr("\n// *********** End of preamble.");
-        }
+      FileUtil.copyFileFromClassPath(
+          "/lib/platform/zephyr/Kconfig", fileConfig.getSrcGenPath(), true);
     }
-
-    /**
-     * Generate a constructor for the specified reactor in the specified federate.
-     * @param tpr The parsed reactor data structure.
-     * @param constructorCode Lines of code previously generated that need to
-     *  go into the constructor.
-     */
-    protected void generateConstructor(
-        CodeBuilder src, CodeBuilder header, TypeParameterizedReactor tpr, CodeBuilder constructorCode
-    ) {
-        header.pr(CConstructorGenerator.generateConstructorPrototype(tpr));
-        src.pr(CConstructorGenerator.generateConstructor(
-            tpr,
-            constructorCode.toString()
-        ));
+  }
+
+  ////////////////////////////////////////////
+  //// Code generators.
+
+  /**
+   * Generate a reactor class definition for the specified federate. A class definition has four
+   * parts:
+   *
+   * <ul>
+   *   <li>Preamble code, if any, specified in the Lingua Franca file.
+   *   <li>A &quot;self&quot; struct type definition (see the class documentation above).
+   *   <li>A function for each reaction.
+   *   <li>A constructor for creating an instance. for deleting an instance.
+   * </ul>
+   *
+   * <p>If the reactor is the main reactor, then the generated code may be customized. Specifically,
+   * if the main reactor has reactions, these reactions will not be generated if they are triggered
+   * by or send data to contained reactors that are not in the federate.
+   */
+  private void generateReactorClass(TypeParameterizedReactor tpr) throws IOException {
+    // FIXME: Currently we're not reusing definitions for declarations that point to the same
+    // definition.
+    CodeBuilder header = new CodeBuilder();
+    CodeBuilder src = new CodeBuilder();
+    final String headerName = CUtil.getName(tpr) + ".h";
+    var guardMacro = headerName.toUpperCase().replace(".", "_");
+    header.pr("#ifndef " + guardMacro);
+    header.pr("#define " + guardMacro);
+    generateReactorClassHeaders(tpr, headerName, header, src);
+    header.pr(generateTopLevelPreambles(tpr.reactor()));
+    generateUserPreamblesForReactor(tpr.reactor(), src);
+    generateReactorClassBody(tpr, header, src);
+    header.pr("#endif // " + guardMacro);
+    FileUtil.writeToFile(
+        CodeMap.fromGeneratedCode(header.toString()).getGeneratedCode(),
+        fileConfig.getSrcGenPath().resolve(headerName),
+        true);
+    var extension =
+        targetConfig.platformOptions.platform == Platform.ARDUINO
+            ? ".ino"
+            : CCppMode ? ".cpp" : ".c";
+    FileUtil.writeToFile(
+        CodeMap.fromGeneratedCode(src.toString()).getGeneratedCode(),
+        fileConfig.getSrcGenPath().resolve(CUtil.getName(tpr) + extension),
+        true);
+  }
+
+  protected void generateReactorClassHeaders(
+      TypeParameterizedReactor tpr, String headerName, CodeBuilder header, CodeBuilder src) {
+    if (CCppMode) {
+      src.pr("extern \"C\" {");
+      header.pr("extern \"C\" {");
     }
-
-    protected void generateIncludes(TypeParameterizedReactor tpr) {
-        code.pr("#include \"" + CUtil.getName(tpr) + ".h\"");
+    header.pr("#include \"include/core/reactor.h\"");
+    src.pr("#include \"include/api/api.h\"");
+    src.pr("#include \"include/api/set.h\"");
+    generateIncludes(tpr);
+    if (CCppMode) {
+      src.pr("}");
+      header.pr("}");
     }
-
-    /**
-     * Generate the struct type definitions for inputs, outputs, and
-     * actions of the specified reactor.
-     */
-    protected void generateAuxiliaryStructs(CodeBuilder builder, TypeParameterizedReactor tpr, boolean userFacing) {
-        // In the case where there are incoming
-        // p2p logical connections in decentralized
-        // federated execution, there will be an
-        // intended_tag field added to accommodate
-        // the case where a reaction triggered by a
-        // port or action is late due to network
-        // latency, etc..
-        var federatedExtension = new CodeBuilder();
-        federatedExtension.pr(String.format("""
+    src.pr("#include \"include/" + CReactorHeaderFileGenerator.outputPath(tpr) + "\"");
+    src.pr("#include \"" + headerName + "\"");
+    tpr.doDefines(src);
+    ASTUtils.allIncludes(tpr.reactor()).stream()
+        .map(name -> "#include \"" + name + ".h\"")
+        .forEach(header::pr);
+  }
+
+  private void generateReactorClassBody(
+      TypeParameterizedReactor tpr, CodeBuilder header, CodeBuilder src) {
+    // Some of the following methods create lines of code that need to
+    // go into the constructor.  Collect those lines of code here:
+    var constructorCode = new CodeBuilder();
+    generateAuxiliaryStructs(header, tpr, false);
+    // The following must go before the self struct so the #include watchdog.h ends up in the
+    // header.
+    CWatchdogGenerator.generateWatchdogs(src, header, tpr, errorReporter);
+    generateSelfStruct(header, tpr, constructorCode);
+    generateMethods(src, tpr);
+    generateReactions(src, tpr);
+    generateConstructor(src, header, tpr, constructorCode);
+  }
+
+  /** Generate methods for {@code reactor}. */
+  protected void generateMethods(CodeBuilder src, TypeParameterizedReactor tpr) {
+    CMethodGenerator.generateMethods(tpr, src, types);
+  }
+
+  /**
+   * Generates preambles defined by user for a given reactor
+   *
+   * @param reactor The given reactor
+   */
+  protected void generateUserPreamblesForReactor(Reactor reactor, CodeBuilder src) {
+    for (Preamble p : ASTUtils.allPreambles(reactor)) {
+      src.pr("// *********** From the preamble, verbatim:");
+      src.prSourceLineNumber(p.getCode());
+      src.pr(toText(p.getCode()));
+      src.pr("\n// *********** End of preamble.");
+    }
+  }
+
+  /**
+   * Generate a constructor for the specified reactor in the specified federate.
+   *
+   * @param tpr The parsed reactor data structure.
+   * @param constructorCode Lines of code previously generated that need to go into the constructor.
+   */
+  protected void generateConstructor(
+      CodeBuilder src,
+      CodeBuilder header,
+      TypeParameterizedReactor tpr,
+      CodeBuilder constructorCode) {
+    header.pr(CConstructorGenerator.generateConstructorPrototype(tpr));
+    src.pr(CConstructorGenerator.generateConstructor(tpr, constructorCode.toString()));
+  }
+
+  protected void generateIncludes(TypeParameterizedReactor tpr) {
+    code.pr("#include \"" + CUtil.getName(tpr) + ".h\"");
+  }
+
+  /**
+   * Generate the struct type definitions for inputs, outputs, and actions of the specified reactor.
+   */
+  protected void generateAuxiliaryStructs(
+      CodeBuilder builder, TypeParameterizedReactor tpr, boolean userFacing) {
+    // In the case where there are incoming
+    // p2p logical connections in decentralized
+    // federated execution, there will be an
+    // intended_tag field added to accommodate
+    // the case where a reaction triggered by a
+    // port or action is late due to network
+    // latency, etc..
+    var federatedExtension = new CodeBuilder();
+    federatedExtension.pr(
+        String.format(
+            """
             #ifdef FEDERATED
             #ifdef FEDERATED_DECENTRALIZED
             %s intended_tag;
             #endif
             %s physical_time_of_arrival;
             #endif
-            """, types.getTargetTagType(), types.getTargetTimeType())
-        );
-        for (Port p : allPorts(tpr.reactor())) {
-            builder.pr(CPortGenerator.generateAuxiliaryStruct(
-                tpr,
-                p,
-                getTarget(),
-                errorReporter,
-                types,
-                federatedExtension,
-                userFacing,
-                null
-            ));
-        }
-        // The very first item on this struct needs to be
-        // a trigger_t* because the struct will be cast to (trigger_t*)
-        // by the lf_schedule() functions to get to the trigger.
-        for (Action action : allActions(tpr.reactor())) {
-            builder.pr(CActionGenerator.generateAuxiliaryStruct(
-                tpr,
-                action,
-                getTarget(),
-                types,
-                federatedExtension,
-                userFacing
-            ));
-        }
+            """,
+            types.getTargetTagType(), types.getTargetTimeType()));
+    for (Port p : allPorts(tpr.reactor())) {
+      builder.pr(
+          CPortGenerator.generateAuxiliaryStruct(
+              tpr, p, getTarget(), errorReporter, types, federatedExtension, userFacing, null));
     }
-
-    /**
-     * Generate the self struct type definition for the specified reactor
-     * in the specified federate.
-     * @param constructorCode Place to put lines of code that need to
-     *  go into the constructor.
-     */
-    private void generateSelfStruct(CodeBuilder builder, TypeParameterizedReactor tpr, CodeBuilder constructorCode) {
-        var reactor = toDefinition(tpr.reactor());
-        var selfType = CUtil.selfType(tpr);
-
-        // Construct the typedef for the "self" struct.
-        // Create a type name for the self struct.
-        var body = new CodeBuilder();
-
-        // Extensions can add functionality to the CGenerator
-        generateSelfStructExtension(body, reactor, constructorCode);
-
-        // Next handle parameters.
-        body.pr(CParameterGenerator.generateDeclarations(tpr, types));
-
-        // Next handle states.
-        body.pr(CStateGenerator.generateDeclarations(tpr, types));
-
-        // Next handle actions.
-        CActionGenerator.generateDeclarations(tpr, body, constructorCode);
-
-        // Next handle inputs and outputs.
-        CPortGenerator.generateDeclarations(tpr, reactor, body, constructorCode);
-
-        // If there are contained reactors that either receive inputs
-        // from reactions of this reactor or produce outputs that trigger
-        // reactions of this reactor, then we need to create a struct
-        // inside the self struct for each contained reactor. That
-        // struct has a place to hold the data produced by this reactor's
-        // reactions and a place to put pointers to data produced by
-        // the contained reactors.
-        generateInteractingContainedReactors(tpr, body, constructorCode);
-
-        // Next, generate the fields needed for each reaction.
-        CReactionGenerator.generateReactionAndTriggerStructs(
-            body,
-            tpr,
-            constructorCode,
-            types
-        );
-
-        // Generate the fields needed for each watchdog.
-        CWatchdogGenerator.generateWatchdogStruct(body, tpr, constructorCode);
-
-        // Next, generate fields for modes
-        CModesGenerator.generateDeclarations(reactor, body, constructorCode);
-
-        // The first field has to always be a pointer to the list of
-        // of allocated memory that must be freed when the reactor is freed.
-        // This means that the struct can be safely cast to self_base_t.
-        builder.pr("typedef struct {");
-        builder.indent();
-        builder.pr("struct self_base_t base;");
-        builder.pr(body.toString());
-        builder.unindent();
-        builder.pr("} " + selfType + ";");
+    // The very first item on this struct needs to be
+    // a trigger_t* because the struct will be cast to (trigger_t*)
+    // by the lf_schedule() functions to get to the trigger.
+    for (Action action : allActions(tpr.reactor())) {
+      builder.pr(
+          CActionGenerator.generateAuxiliaryStruct(
+              tpr, action, getTarget(), types, federatedExtension, userFacing));
     }
-
-    /**
-     * Generate structs and associated code for contained reactors that
-     * send or receive data to or from the container's reactions.
-     *
-     * If there are contained reactors that either receive inputs
-     * from reactions of this reactor or produce outputs that trigger
-     * reactions of this reactor, then we need to create a struct
-     * inside the self struct of the container for each contained reactor.
-     * That struct has a place to hold the data produced by the container reactor's
-     * reactions and a place to put pointers to data produced by
-     * the contained reactors.
-     *
-     * @param tpr {@link TypeParameterizedReactor}
-     * @param body The place to put the struct definition for the contained reactors.
-     * @param constructorCode The place to put matching code that goes in the container's constructor.
-     */
-    private void generateInteractingContainedReactors(
-        TypeParameterizedReactor tpr,
-        CodeBuilder body,
-        CodeBuilder constructorCode
-    ) {
-        // The contents of the struct will be collected first so that
-        // we avoid duplicate entries and then the struct will be constructed.
-        var contained = new InteractingContainedReactors(tpr.reactor());
-        // Next generate the relevant code.
-        for (Instantiation containedReactor : contained.containedReactors()) {
-            var containedTpr = new TypeParameterizedReactor(containedReactor);
-            // First define an _width variable in case it is a bank.
-            var array = "";
-            var width = -2;
-            // If the instantiation is a bank, find the maximum bank width
-            // to define an array.
-            if (containedReactor.getWidthSpec() != null) {
-                width = CReactionGenerator.maxContainedReactorBankWidth(containedReactor, null, 0, mainDef);
-                array = "[" + width + "]";
-            }
-            // NOTE: The following needs to be done for each instance
-            // so that the width can be parameter, not in the constructor.
-            // Here, we conservatively use a width that is the largest of all instances.
-            constructorCode.pr(String.join("\n",
-                "// Set the _width variable for all cases. This will be -2",
-                "// if the reactor is not a bank of reactors.",
-                "self->_lf_"+containedReactor.getName()+"_width = "+width+";"
-            ));
-
-            // Generate one struct for each contained reactor that interacts.
-            body.pr("struct {");
-            body.indent();
-            for (Port port : contained.portsOfInstance(containedReactor)) {
-                if (port instanceof Input) {
-                    // If the variable is a multiport, then the place to store the data has
-                    // to be malloc'd at initialization.
-                    if (!ASTUtils.isMultiport(port)) {
-                        // Not a multiport.
-                        body.pr(port, variableStructType(port, containedTpr, false)+" "+port.getName()+";");
-                    } else {
-                        // Is a multiport.
-                        // Memory will be malloc'd in initialization.
-                        body.pr(port, String.join("\n",
-                            variableStructType(port, containedTpr, false)+"** "+port.getName()+";",
-                            "int "+port.getName()+"_width;"
-                        ));
-                    }
-                } else {
-                    // Must be an output port.
-                    // Outputs of contained reactors are pointers to the source of data on the
-                    // self struct of the container.
-                    if (!ASTUtils.isMultiport(port)) {
-                        // Not a multiport.
-                        body.pr(port, variableStructType(port, containedTpr, false)+"* "+port.getName()+";");
-                    } else {
-                        // Is a multiport.
-                        // Here, we will use an array of pointers.
-                        // Memory will be malloc'd in initialization.
-                        body.pr(port, String.join("\n",
-                            variableStructType(port, containedTpr, false)+"** "+port.getName()+";",
-                            "int "+port.getName()+"_width;"
-                        ));
-                    }
-                    body.pr(port, "trigger_t "+port.getName()+"_trigger;");
-                    var reactorIndex = "";
-                    if (containedReactor.getWidthSpec() != null) {
-                        reactorIndex = "[reactor_index]";
-                        constructorCode.pr("for (int reactor_index = 0; reactor_index < self->_lf_"+containedReactor.getName()+"_width; reactor_index++) {");
-                        constructorCode.indent();
-                    }
-                    var portOnSelf = "self->_lf_"+containedReactor.getName()+reactorIndex+"."+port.getName();
-
-                    constructorCode.pr(
-                        port,
-                        CExtensionUtils.surroundWithIfFederatedDecentralized(
-                            portOnSelf+"_trigger.intended_tag = (tag_t) { .time = NEVER, .microstep = 0u};"
-                        )
-                    );
-
-                    var triggered = contained.reactionsTriggered(containedReactor, port);
-                    //noinspection StatementWithEmptyBody
-                    if (triggered.size() > 0) {
-                        body.pr(port, "reaction_t* "+port.getName()+"_reactions["+triggered.size()+"];");
-                        var triggeredCount = 0;
-                        for (Integer index : triggered) {
-                            constructorCode.pr(port, portOnSelf+"_reactions["+triggeredCount+++"] = &self->_lf__reaction_"+index+";");
-                        }
-                        constructorCode.pr(port, portOnSelf+"_trigger.reactions = "+portOnSelf+"_reactions;");
-                    } else {
-                        // Since the self struct is created using calloc, there is no need to set
-                        // self->_lf_"+containedReactor.getName()+"."+port.getName()+"_trigger.reactions = NULL
-                    }
-                    // Since the self struct is created using calloc, there is no need to set falsy fields.
-                    constructorCode.pr(port, String.join("\n",
-                        portOnSelf+"_trigger.last = NULL;",
-                        portOnSelf+"_trigger.number_of_reactions = "+triggered.size()+";"
-                    ));
-
-
-                    // Set the physical_time_of_arrival
-                    constructorCode.pr(
-                        port,
-                        CExtensionUtils.surroundWithIfFederated(
-                            portOnSelf+"_trigger.physical_time_of_arrival = NEVER;"
-                        )
-                    );
-
-                    if (containedReactor.getWidthSpec() != null) {
-                        constructorCode.unindent();
-                        constructorCode.pr("}");
-                    }
-                }
+  }
+
+  /**
+   * Generate the self struct type definition for the specified reactor in the specified federate.
+   *
+   * @param constructorCode Place to put lines of code that need to go into the constructor.
+   */
+  private void generateSelfStruct(
+      CodeBuilder builder, TypeParameterizedReactor tpr, CodeBuilder constructorCode) {
+    var reactor = toDefinition(tpr.reactor());
+    var selfType = CUtil.selfType(tpr);
+
+    // Construct the typedef for the "self" struct.
+    // Create a type name for the self struct.
+    var body = new CodeBuilder();
+
+    // Extensions can add functionality to the CGenerator
+    generateSelfStructExtension(body, reactor, constructorCode);
+
+    // Next handle parameters.
+    body.pr(CParameterGenerator.generateDeclarations(tpr, types));
+
+    // Next handle states.
+    body.pr(CStateGenerator.generateDeclarations(tpr, types));
+
+    // Next handle actions.
+    CActionGenerator.generateDeclarations(tpr, body, constructorCode);
+
+    // Next handle inputs and outputs.
+    CPortGenerator.generateDeclarations(tpr, reactor, body, constructorCode);
+
+    // If there are contained reactors that either receive inputs
+    // from reactions of this reactor or produce outputs that trigger
+    // reactions of this reactor, then we need to create a struct
+    // inside the self struct for each contained reactor. That
+    // struct has a place to hold the data produced by this reactor's
+    // reactions and a place to put pointers to data produced by
+    // the contained reactors.
+    generateInteractingContainedReactors(tpr, body, constructorCode);
+
+    // Next, generate the fields needed for each reaction.
+    CReactionGenerator.generateReactionAndTriggerStructs(body, tpr, constructorCode, types);
+
+    // Generate the fields needed for each watchdog.
+    CWatchdogGenerator.generateWatchdogStruct(body, tpr, constructorCode);
+
+    // Next, generate fields for modes
+    CModesGenerator.generateDeclarations(reactor, body, constructorCode);
+
+    // The first field has to always be a pointer to the list of
+    // of allocated memory that must be freed when the reactor is freed.
+    // This means that the struct can be safely cast to self_base_t.
+    builder.pr("typedef struct {");
+    builder.indent();
+    builder.pr("struct self_base_t base;");
+    builder.pr(body.toString());
+    builder.unindent();
+    builder.pr("} " + selfType + ";");
+  }
+
+  /**
+   * Generate structs and associated code for contained reactors that send or receive data to or
+   * from the container's reactions.
+   *
+   * <p>If there are contained reactors that either receive inputs from reactions of this reactor or
+   * produce outputs that trigger reactions of this reactor, then we need to create a struct inside
+   * the self struct of the container for each contained reactor. That struct has a place to hold
+   * the data produced by the container reactor's reactions and a place to put pointers to data
+   * produced by the contained reactors.
+   *
+   * @param tpr {@link TypeParameterizedReactor}
+   * @param body The place to put the struct definition for the contained reactors.
+   * @param constructorCode The place to put matching code that goes in the container's constructor.
+   */
+  private void generateInteractingContainedReactors(
+      TypeParameterizedReactor tpr, CodeBuilder body, CodeBuilder constructorCode) {
+    // The contents of the struct will be collected first so that
+    // we avoid duplicate entries and then the struct will be constructed.
+    var contained = new InteractingContainedReactors(tpr.reactor());
+    // Next generate the relevant code.
+    for (Instantiation containedReactor : contained.containedReactors()) {
+      var containedTpr = new TypeParameterizedReactor(containedReactor);
+      // First define an _width variable in case it is a bank.
+      var array = "";
+      var width = -2;
+      // If the instantiation is a bank, find the maximum bank width
+      // to define an array.
+      if (containedReactor.getWidthSpec() != null) {
+        width = CReactionGenerator.maxContainedReactorBankWidth(containedReactor, null, 0, mainDef);
+        array = "[" + width + "]";
+      }
+      // NOTE: The following needs to be done for each instance
+      // so that the width can be parameter, not in the constructor.
+      // Here, we conservatively use a width that is the largest of all instances.
+      constructorCode.pr(
+          String.join(
+              "\n",
+              "// Set the _width variable for all cases. This will be -2",
+              "// if the reactor is not a bank of reactors.",
+              "self->_lf_" + containedReactor.getName() + "_width = " + width + ";"));
+
+      // Generate one struct for each contained reactor that interacts.
+      body.pr("struct {");
+      body.indent();
+      for (Port port : contained.portsOfInstance(containedReactor)) {
+        if (port instanceof Input) {
+          // If the variable is a multiport, then the place to store the data has
+          // to be malloc'd at initialization.
+          if (!ASTUtils.isMultiport(port)) {
+            // Not a multiport.
+            body.pr(
+                port, variableStructType(port, containedTpr, false) + " " + port.getName() + ";");
+          } else {
+            // Is a multiport.
+            // Memory will be malloc'd in initialization.
+            body.pr(
+                port,
+                String.join(
+                    "\n",
+                    variableStructType(port, containedTpr, false) + "** " + port.getName() + ";",
+                    "int " + port.getName() + "_width;"));
+          }
+        } else {
+          // Must be an output port.
+          // Outputs of contained reactors are pointers to the source of data on the
+          // self struct of the container.
+          if (!ASTUtils.isMultiport(port)) {
+            // Not a multiport.
+            body.pr(
+                port, variableStructType(port, containedTpr, false) + "* " + port.getName() + ";");
+          } else {
+            // Is a multiport.
+            // Here, we will use an array of pointers.
+            // Memory will be malloc'd in initialization.
+            body.pr(
+                port,
+                String.join(
+                    "\n",
+                    variableStructType(port, containedTpr, false) + "** " + port.getName() + ";",
+                    "int " + port.getName() + "_width;"));
+          }
+          body.pr(port, "trigger_t " + port.getName() + "_trigger;");
+          var reactorIndex = "";
+          if (containedReactor.getWidthSpec() != null) {
+            reactorIndex = "[reactor_index]";
+            constructorCode.pr(
+                "for (int reactor_index = 0; reactor_index < self->_lf_"
+                    + containedReactor.getName()
+                    + "_width; reactor_index++) {");
+            constructorCode.indent();
+          }
+          var portOnSelf =
+              "self->_lf_" + containedReactor.getName() + reactorIndex + "." + port.getName();
+
+          constructorCode.pr(
+              port,
+              CExtensionUtils.surroundWithIfFederatedDecentralized(
+                  portOnSelf
+                      + "_trigger.intended_tag = (tag_t) { .time = NEVER, .microstep = 0u};"));
+
+          var triggered = contained.reactionsTriggered(containedReactor, port);
+          //noinspection StatementWithEmptyBody
+          if (triggered.size() > 0) {
+            body.pr(
+                port, "reaction_t* " + port.getName() + "_reactions[" + triggered.size() + "];");
+            var triggeredCount = 0;
+            for (Integer index : triggered) {
+              constructorCode.pr(
+                  port,
+                  portOnSelf
+                      + "_reactions["
+                      + triggeredCount++
+                      + "] = &self->_lf__reaction_"
+                      + index
+                      + ";");
             }
-            body.unindent();
-            body.pr(String.join("\n",
-                "} _lf_"+containedReactor.getName()+array+";",
-                "int _lf_"+containedReactor.getName()+"_width;"
-            ));
+            constructorCode.pr(
+                port, portOnSelf + "_trigger.reactions = " + portOnSelf + "_reactions;");
+          } else {
+            // Since the self struct is created using calloc, there is no need to set
+            // self->_lf_"+containedReactor.getName()+"."+port.getName()+"_trigger.reactions = NULL
+          }
+          // Since the self struct is created using calloc, there is no need to set falsy fields.
+          constructorCode.pr(
+              port,
+              String.join(
+                  "\n",
+                  portOnSelf + "_trigger.last = NULL;",
+                  portOnSelf + "_trigger.number_of_reactions = " + triggered.size() + ";"));
+
+          // Set the physical_time_of_arrival
+          constructorCode.pr(
+              port,
+              CExtensionUtils.surroundWithIfFederated(
+                  portOnSelf + "_trigger.physical_time_of_arrival = NEVER;"));
+
+          if (containedReactor.getWidthSpec() != null) {
+            constructorCode.unindent();
+            constructorCode.pr("}");
+          }
         }
+      }
+      body.unindent();
+      body.pr(
+          String.join(
+              "\n",
+              "} _lf_" + containedReactor.getName() + array + ";",
+              "int _lf_" + containedReactor.getName() + "_width;"));
     }
-
-    /**
-     * This function is provided to allow extensions of the CGenerator to append the structure of the self struct
-     * @param body The body of the self struct
-     * @param reactor The reactor declaration for the self struct
-     * @param constructorCode Code that is executed when the reactor is instantiated
-     */
-    protected void generateSelfStructExtension(
-        CodeBuilder body,
-        Reactor reactor,
-        CodeBuilder constructorCode
-    ) {
-        // Do nothing
-    }
-
-    /** Generate reaction functions definition for a reactor.
-     *  These functions have a single argument that is a void* pointing to
-     *  a struct that contains parameters, state variables, inputs (triggering or not),
-     *  actions (triggering or produced), and outputs.
-     *  @param tpr The reactor.
-     */
-    public void generateReactions(CodeBuilder src, TypeParameterizedReactor tpr) {
-        var reactionIndex = 0;
-        var reactor = ASTUtils.toDefinition(tpr.reactor());
-        for (Reaction reaction : allReactions(reactor)) {
-            generateReaction(src, reaction, tpr, reactionIndex);
-            // Increment reaction index even if the reaction is not in the federate
-            // so that across federates, the reaction indices are consistent.
-            reactionIndex++;
-        }
+  }
+
+  /**
+   * This function is provided to allow extensions of the CGenerator to append the structure of the
+   * self struct
+   *
+   * @param body The body of the self struct
+   * @param reactor The reactor declaration for the self struct
+   * @param constructorCode Code that is executed when the reactor is instantiated
+   */
+  protected void generateSelfStructExtension(
+      CodeBuilder body, Reactor reactor, CodeBuilder constructorCode) {
+    // Do nothing
+  }
+
+  /**
+   * Generate reaction functions definition for a reactor. These functions have a single argument
+   * that is a void* pointing to a struct that contains parameters, state variables, inputs
+   * (triggering or not), actions (triggering or produced), and outputs.
+   *
+   * @param tpr The reactor.
+   */
+  public void generateReactions(CodeBuilder src, TypeParameterizedReactor tpr) {
+    var reactionIndex = 0;
+    var reactor = ASTUtils.toDefinition(tpr.reactor());
+    for (Reaction reaction : allReactions(reactor)) {
+      generateReaction(src, reaction, tpr, reactionIndex);
+      // Increment reaction index even if the reaction is not in the federate
+      // so that across federates, the reaction indices are consistent.
+      reactionIndex++;
     }
-
-    /** Generate a reaction function definition for a reactor.
-     *  This function will have a single argument that is a void* pointing to
-     *  a struct that contains parameters, state variables, inputs (triggering or not),
-     *  actions (triggering or produced), and outputs.
-     *  @param reaction The reaction.
-     *  @param tpr The reactor.
-     *  @param reactionIndex The position of the reaction within the reactor.
-     */
-    protected void generateReaction(CodeBuilder src, Reaction reaction, TypeParameterizedReactor tpr, int reactionIndex) {
-        src.pr(CReactionGenerator.generateReaction(
+  }
+
+  /**
+   * Generate a reaction function definition for a reactor. This function will have a single
+   * argument that is a void* pointing to a struct that contains parameters, state variables, inputs
+   * (triggering or not), actions (triggering or produced), and outputs.
+   *
+   * @param reaction The reaction.
+   * @param tpr The reactor.
+   * @param reactionIndex The position of the reaction within the reactor.
+   */
+  protected void generateReaction(
+      CodeBuilder src, Reaction reaction, TypeParameterizedReactor tpr, int reactionIndex) {
+    src.pr(
+        CReactionGenerator.generateReaction(
             reaction,
             tpr,
             reactionIndex,
@@ -1414,715 +1404,781 @@ protected void generateReaction(CodeBuilder src, Reaction reaction, TypeParamete
             errorReporter,
             types,
             targetConfig,
-            getTarget().requiresTypes
-        ));
-    }
-
-    /**
-     * Record startup, shutdown, and reset reactions.
-     * @param instance A reactor instance.
-     */
-    private void recordBuiltinTriggers(ReactorInstance instance) {
-        // For each reaction instance, allocate the arrays that will be used to
-        // trigger downstream reactions.
-
-        var enclaveInfo = CUtil.getClosestEnclave(instance).enclaveInfo;
-        var enclaveStruct = CUtil.getEnvironmentStruct(instance);
-        var enclaveId = CUtil.getEnvironmentId(instance);
-        for (ReactionInstance reaction : instance.reactions) {
-            var reactor = reaction.getParent();
-            var temp = new CodeBuilder();
-            var foundOne = false;
-
-            var reactionRef = CUtil.reactionRef(reaction);
-
-            // Next handle triggers of the reaction that come from a multiport output
-            // of a contained reactor.  Also, handle startup and shutdown triggers.
-            for (TriggerInstance<?> trigger : reaction.triggers) {
-                if (trigger.isStartup()) {
-                    temp.pr(enclaveStruct+"._lf_startup_reactions[startup_reactions_count["+enclaveId+"]++] = &"+reactionRef+";");
-                    enclaveInfo.numStartupReactions+= reactor.getTotalWidth();
-                    foundOne = true;
-                } else if (trigger.isShutdown()) {
-                    temp.pr(enclaveStruct+"._lf_shutdown_reactions[shutdown_reactions_count["+enclaveId+"]++] = &"+reactionRef+";");
-                    foundOne = true;
-                    enclaveInfo.numShutdownReactions += reactor.getTotalWidth();
-
-                    if (targetConfig.tracing != null) {
-                        var description = CUtil.getShortenedName(reactor);
-                        var reactorRef = CUtil.reactorRef(reactor);
-                        temp.pr(String.join("\n",
-                            "_lf_register_trace_event("+reactorRef+", &("+reactorRef+"->_lf__shutdown),",
-                            "trace_trigger, "+addDoubleQuotes(description+".shutdown")+");"
-                        ));
-                    }
-                } else if (trigger.isReset()) {
-                    temp.pr(enclaveStruct+"._lf_reset_reactions[reset_reactions_count["+enclaveId+"]++] = &"+reactionRef+";");
-                    enclaveInfo.numResetReactions += reactor.getTotalWidth();
-                    foundOne = true;
-                }
-            }
-            if (foundOne) initializeTriggerObjects.pr(temp.toString());
+            getTarget().requiresTypes));
+  }
+
+  /**
+   * Record startup, shutdown, and reset reactions.
+   *
+   * @param instance A reactor instance.
+   */
+  private void recordBuiltinTriggers(ReactorInstance instance) {
+    // For each reaction instance, allocate the arrays that will be used to
+    // trigger downstream reactions.
+
+    var enclaveInfo = CUtil.getClosestEnclave(instance).enclaveInfo;
+    var enclaveStruct = CUtil.getEnvironmentStruct(instance);
+    var enclaveId = CUtil.getEnvironmentId(instance);
+    for (ReactionInstance reaction : instance.reactions) {
+      var reactor = reaction.getParent();
+      var temp = new CodeBuilder();
+      var foundOne = false;
+
+      var reactionRef = CUtil.reactionRef(reaction);
+
+      // Next handle triggers of the reaction that come from a multiport output
+      // of a contained reactor.  Also, handle startup and shutdown triggers.
+      for (TriggerInstance<?> trigger : reaction.triggers) {
+        if (trigger.isStartup()) {
+          temp.pr(
+              enclaveStruct
+                  + "._lf_startup_reactions[startup_reactions_count["
+                  + enclaveId
+                  + "]++] = &"
+                  + reactionRef
+                  + ";");
+          enclaveInfo.numStartupReactions += reactor.getTotalWidth();
+          foundOne = true;
+        } else if (trigger.isShutdown()) {
+          temp.pr(
+              enclaveStruct
+                  + "._lf_shutdown_reactions[shutdown_reactions_count["
+                  + enclaveId
+                  + "]++] = &"
+                  + reactionRef
+                  + ";");
+          foundOne = true;
+          enclaveInfo.numShutdownReactions += reactor.getTotalWidth();
+
+          if (targetConfig.tracing != null) {
+            var description = CUtil.getShortenedName(reactor);
+            var reactorRef = CUtil.reactorRef(reactor);
+            temp.pr(
+                String.join(
+                    "\n",
+                    "_lf_register_trace_event("
+                        + reactorRef
+                        + ", &("
+                        + reactorRef
+                        + "->_lf__shutdown),",
+                    "trace_trigger, " + addDoubleQuotes(description + ".shutdown") + ");"));
+          }
+        } else if (trigger.isReset()) {
+          temp.pr(
+              enclaveStruct
+                  + "._lf_reset_reactions[reset_reactions_count["
+                  + enclaveId
+                  + "]++] = &"
+                  + reactionRef
+                  + ";");
+          enclaveInfo.numResetReactions += reactor.getTotalWidth();
+          foundOne = true;
         }
+      }
+      if (foundOne) initializeTriggerObjects.pr(temp.toString());
     }
-
-    /**
-     * Generate code to set up the tables used in _lf_start_time_step to decrement reference
-     * counts and mark outputs absent between time steps. This function puts the code
-     * into startTimeStep.
-     */
-    /**
-     * Generate code to set up the tables used in _lf_start_time_step to decrement reference
-     * counts and mark outputs absent between time steps. This function puts the code
-     * into startTimeStep.
-     */
-    private void generateStartTimeStep(ReactorInstance instance) {
-        // Avoid generating dead code if nothing is relevant.
-        var foundOne = false;
-        var temp = new CodeBuilder();
-        var containerSelfStructName = CUtil.reactorRef(instance);
-        var enclave = CUtil.getClosestEnclave(instance);
-        var enclaveInfo = enclave.enclaveInfo;
-        var enclaveStruct = CUtil.getEnvironmentStruct(enclave);
-
-        // Handle inputs that get sent data from a reaction rather than from
-        // another contained reactor and reactions that are triggered by an
-        // output of a contained reactor.
-        // Note that there may be more than one reaction reacting to the same
-        // port so we have to avoid listing the port more than once.
-        var portsSeen = new LinkedHashSet<PortInstance>();
-        for (ReactionInstance reaction : instance.reactions) {
-            for (PortInstance port : Iterables.filter(reaction.effects, PortInstance.class)) {
-                if (port.getDefinition() instanceof Input && !portsSeen.contains(port)) {
-                    portsSeen.add(port);
-                    // This reaction is sending to an input. Must be
-                    // the input of a contained reactor in the federate.
-                    // NOTE: If instance == main and the federate is within a bank,
-                    // this assumes that the reaction writes only to the bank member in the federate.
-                    foundOne = true;
-
-                    temp.pr("// Add port "+port.getFullName()+" to array of is_present fields.");
-
-                    if (!Objects.equal(port.getParent(), instance)) {
-                        // The port belongs to contained reactor, so we also have
-                        // iterate over the instance bank members.
-                        temp.startScopedBlock();
-                        temp.pr("int count = 0; SUPPRESS_UNUSED_WARNING(count);");
-                        temp.startScopedBlock(instance);
-                        temp.startScopedBankChannelIteration(port, null);
-                    } else {
-                        temp.startScopedBankChannelIteration(port, "count");
-                    }
-                    var portRef = CUtil.portRefNested(port);
-                    var con = (port.isMultiport()) ? "->" : ".";
-
-                    temp.pr(enclaveStruct+"._lf_is_present_fields["+enclaveInfo.numIsPresentFields+" + count] = &"+portRef+con+"is_present;");
-                    // Intended_tag is only applicable to ports in federated execution.
-                    temp.pr(
-                        CExtensionUtils.surroundWithIfFederatedDecentralized(
-                            enclaveStruct+"._lf_intended_tag_fields["+enclaveInfo.numIsPresentFields+" + count] = &"+portRef+con+"intended_tag;"
-                        )
-                    );
-
-                    enclaveInfo.numIsPresentFields += port.getWidth() * port.getParent().getTotalWidth();
-
-                    if (!Objects.equal(port.getParent(), instance)) {
-                        temp.pr("count++;");
-                        temp.endScopedBlock();
-                        temp.endScopedBlock();
-                        temp.endScopedBankChannelIteration(port, null);
-                    } else {
-                        temp.endScopedBankChannelIteration(port, "count");
-                    }
-                }
-            }
+  }
+
+  /**
+   * Generate code to set up the tables used in _lf_start_time_step to decrement reference counts
+   * and mark outputs absent between time steps. This function puts the code into startTimeStep.
+   */
+  /**
+   * Generate code to set up the tables used in _lf_start_time_step to decrement reference counts
+   * and mark outputs absent between time steps. This function puts the code into startTimeStep.
+   */
+  private void generateStartTimeStep(ReactorInstance instance) {
+    // Avoid generating dead code if nothing is relevant.
+    var foundOne = false;
+    var temp = new CodeBuilder();
+    var containerSelfStructName = CUtil.reactorRef(instance);
+    var enclave = CUtil.getClosestEnclave(instance);
+    var enclaveInfo = enclave.enclaveInfo;
+    var enclaveStruct = CUtil.getEnvironmentStruct(enclave);
+
+    // Handle inputs that get sent data from a reaction rather than from
+    // another contained reactor and reactions that are triggered by an
+    // output of a contained reactor.
+    // Note that there may be more than one reaction reacting to the same
+    // port so we have to avoid listing the port more than once.
+    var portsSeen = new LinkedHashSet<PortInstance>();
+    for (ReactionInstance reaction : instance.reactions) {
+      for (PortInstance port : Iterables.filter(reaction.effects, PortInstance.class)) {
+        if (port.getDefinition() instanceof Input && !portsSeen.contains(port)) {
+          portsSeen.add(port);
+          // This reaction is sending to an input. Must be
+          // the input of a contained reactor in the federate.
+          // NOTE: If instance == main and the federate is within a bank,
+          // this assumes that the reaction writes only to the bank member in the federate.
+          foundOne = true;
+
+          temp.pr("// Add port " + port.getFullName() + " to array of is_present fields.");
+
+          if (!Objects.equal(port.getParent(), instance)) {
+            // The port belongs to contained reactor, so we also have
+            // iterate over the instance bank members.
+            temp.startScopedBlock();
+            temp.pr("int count = 0; SUPPRESS_UNUSED_WARNING(count);");
+            temp.startScopedBlock(instance);
+            temp.startScopedBankChannelIteration(port, null);
+          } else {
+            temp.startScopedBankChannelIteration(port, "count");
+          }
+          var portRef = CUtil.portRefNested(port);
+          var con = (port.isMultiport()) ? "->" : ".";
+
+          temp.pr(
+              enclaveStruct
+                  + "._lf_is_present_fields["
+                  + enclaveInfo.numIsPresentFields
+                  + " + count] = &"
+                  + portRef
+                  + con
+                  + "is_present;");
+          // Intended_tag is only applicable to ports in federated execution.
+          temp.pr(
+              CExtensionUtils.surroundWithIfFederatedDecentralized(
+                  enclaveStruct
+                      + "._lf_intended_tag_fields["
+                      + enclaveInfo.numIsPresentFields
+                      + " + count] = &"
+                      + portRef
+                      + con
+                      + "intended_tag;"));
+
+          enclaveInfo.numIsPresentFields += port.getWidth() * port.getParent().getTotalWidth();
+
+          if (!Objects.equal(port.getParent(), instance)) {
+            temp.pr("count++;");
+            temp.endScopedBlock();
+            temp.endScopedBlock();
+            temp.endScopedBankChannelIteration(port, null);
+          } else {
+            temp.endScopedBankChannelIteration(port, "count");
+          }
         }
-        if (foundOne) startTimeStep.pr(temp.toString());
-        temp = new CodeBuilder();
-        foundOne = false;
+      }
+    }
+    if (foundOne) startTimeStep.pr(temp.toString());
+    temp = new CodeBuilder();
+    foundOne = false;
+
+    for (ActionInstance action : instance.actions) {
+      foundOne = true;
+      temp.startScopedBlock(instance);
+
+      temp.pr(
+          String.join(
+              "\n",
+              "// Add action " + action.getFullName() + " to array of is_present fields.",
+              enclaveStruct + "._lf_is_present_fields[" + enclaveInfo.numIsPresentFields + "] ",
+              "        = &"
+                  + containerSelfStructName
+                  + "->_lf_"
+                  + action.getName()
+                  + ".is_present;"));
+
+      // Intended_tag is only applicable to actions in federated execution with decentralized
+      // coordination.
+      temp.pr(
+          CExtensionUtils.surroundWithIfFederatedDecentralized(
+              String.join(
+                  "\n",
+                  "// Add action " + action.getFullName() + " to array of intended_tag fields.",
+                  enclaveStruct
+                      + "._lf_intended_tag_fields["
+                      + enclaveInfo.numIsPresentFields
+                      + "] ",
+                  "        = &"
+                      + containerSelfStructName
+                      + "->_lf_"
+                      + action.getName()
+                      + ".intended_tag;")));
+
+      enclaveInfo.numIsPresentFields += action.getParent().getTotalWidth();
+      temp.endScopedBlock();
+    }
+    if (foundOne) startTimeStep.pr(temp.toString());
+    temp = new CodeBuilder();
+    foundOne = false;
 
-        for (ActionInstance action : instance.actions) {
-            foundOne = true;
-            temp.startScopedBlock(instance);
+    // Next, set up the table to mark each output of each contained reactor absent.
+    for (ReactorInstance child : instance.children) {
+      if (child.outputs.size() > 0) {
 
-            temp.pr(String.join("\n",
-                "// Add action "+action.getFullName()+" to array of is_present fields.",
-                enclaveStruct+"._lf_is_present_fields["+enclaveInfo.numIsPresentFields+"] ",
-                "        = &"+containerSelfStructName+"->_lf_"+action.getName()+".is_present;"
-            ));
+        temp.startScopedBlock();
+        temp.pr("int count = 0; SUPPRESS_UNUSED_WARNING(count);");
+        temp.startScopedBlock(child);
 
-            // Intended_tag is only applicable to actions in federated execution with decentralized coordination.
+        var channelCount = 0;
+        for (PortInstance output : child.outputs) {
+          if (!output.getDependsOnReactions().isEmpty()) {
+            foundOne = true;
+            temp.pr("// Add port " + output.getFullName() + " to array of is_present fields.");
+            temp.startChannelIteration(output);
+            temp.pr(
+                enclaveStruct
+                    + "._lf_is_present_fields["
+                    + enclaveInfo.numIsPresentFields
+                    + " + count] = &"
+                    + CUtil.portRef(output)
+                    + ".is_present;");
+
+            // Intended_tag is only applicable to ports in federated execution with decentralized
+            // coordination.
             temp.pr(
                 CExtensionUtils.surroundWithIfFederatedDecentralized(
-                    String.join("\n",
-                        "// Add action " + action.getFullName()
-                            + " to array of intended_tag fields.",
-                        enclaveStruct+"._lf_intended_tag_fields["
-                            + enclaveInfo.numIsPresentFields + "] ",
-                        "        = &" + containerSelfStructName
-                            + "->_lf_" + action.getName()
-                            + ".intended_tag;"
-                    )));
-
-            enclaveInfo.numIsPresentFields += action.getParent().getTotalWidth();
-            temp.endScopedBlock();
+                    String.join(
+                        "\n",
+                        "// Add port " + output.getFullName() + " to array of intended_tag fields.",
+                        enclaveStruct
+                            + "._lf_intended_tag_fields["
+                            + enclaveInfo.numIsPresentFields
+                            + " + count] = &"
+                            + CUtil.portRef(output)
+                            + ".intended_tag;")));
+
+            temp.pr("count++;");
+            channelCount += output.getWidth();
+            temp.endChannelIteration(output);
+          }
         }
-        if (foundOne) startTimeStep.pr(temp.toString());
-        temp = new CodeBuilder();
-        foundOne = false;
-
-        // Next, set up the table to mark each output of each contained reactor absent.
-        for (ReactorInstance child : instance.children) {
-            if (child.outputs.size() > 0) {
-
-                temp.startScopedBlock();
-                temp.pr("int count = 0; SUPPRESS_UNUSED_WARNING(count);");
-                temp.startScopedBlock(child);
-
-                var channelCount = 0;
-                for (PortInstance output : child.outputs) {
-                    if (!output.getDependsOnReactions().isEmpty()){
-                        foundOne = true;
-                        temp.pr("// Add port "+output.getFullName()+" to array of is_present fields.");
-                        temp.startChannelIteration(output);
-                        temp.pr(enclaveStruct+"._lf_is_present_fields["+enclaveInfo.numIsPresentFields+" + count] = &"+CUtil.portRef(output)+".is_present;");
-
-                        // Intended_tag is only applicable to ports in federated execution with decentralized coordination.
-                        temp.pr(
-                            CExtensionUtils.surroundWithIfFederatedDecentralized(
-                                String.join("\n",
-                                    "// Add port "+output.getFullName()+" to array of intended_tag fields.",
-                                    enclaveStruct+"._lf_intended_tag_fields["+enclaveInfo.numIsPresentFields+" + count] = &"+CUtil.portRef(output)+".intended_tag;"
-                                )));
-
-                        temp.pr("count++;");
-                        channelCount += output.getWidth();
-                        temp.endChannelIteration(output);
-                    }
-                }
-                enclaveInfo.numIsPresentFields += channelCount * child.getTotalWidth();
-                temp.endScopedBlock();
-                temp.endScopedBlock();
-            }
-        }
-        if (foundOne) startTimeStep.pr(temp.toString());
+        enclaveInfo.numIsPresentFields += channelCount * child.getTotalWidth();
+        temp.endScopedBlock();
+        temp.endScopedBlock();
+      }
     }
-
-    /**
-     * For each timer in the given reactor, generate initialization code for the offset
-     * and period fields.
-     *
-     * This method will also populate the global _lf_timer_triggers array, which is
-     * used to start all timers at the start of execution.
-     *
-     * @param instance A reactor instance.
-     */
-    private void generateTimerInitializations(ReactorInstance instance) {
-        for (TimerInstance timer : instance.timers) {
-            if (!timer.isStartup()) {
-                initializeTriggerObjects.pr(CTimerGenerator.generateInitializer(timer));
-                CUtil.getClosestEnclave(instance).enclaveInfo.numTimerTriggers += timer.getParent().getTotalWidth();
-            }
-        }
+    if (foundOne) startTimeStep.pr(temp.toString());
+  }
+
+  /**
+   * For each timer in the given reactor, generate initialization code for the offset and period
+   * fields.
+   *
+   * <p>This method will also populate the global _lf_timer_triggers array, which is used to start
+   * all timers at the start of execution.
+   *
+   * @param instance A reactor instance.
+   */
+  private void generateTimerInitializations(ReactorInstance instance) {
+    for (TimerInstance timer : instance.timers) {
+      if (!timer.isStartup()) {
+        initializeTriggerObjects.pr(CTimerGenerator.generateInitializer(timer));
+        CUtil.getClosestEnclave(instance).enclaveInfo.numTimerTriggers +=
+            timer.getParent().getTotalWidth();
+      }
     }
-
-    /**
-     * Process a given .proto file.
-     *
-     * Run, if possible, the proto-c protocol buffer code generator to produce
-     * the required .h and .c files.
-     * @param filename Name of the file to process.
-     */
-     public void processProtoFile(String filename) {
-        var protoc = commandFactory.createCommand(
+  }
+
+  /**
+   * Process a given .proto file.
+   *
+   * <p>Run, if possible, the proto-c protocol buffer code generator to produce the required .h and
+   * .c files.
+   *
+   * @param filename Name of the file to process.
+   */
+  public void processProtoFile(String filename) {
+    var protoc =
+        commandFactory.createCommand(
             "protoc-c",
-            List.of("--c_out="+this.fileConfig.getSrcGenPath(), filename),
+            List.of("--c_out=" + this.fileConfig.getSrcGenPath(), filename),
             fileConfig.srcPath);
-        if (protoc == null) {
-            errorReporter.reportError("Processing .proto files requires protoc-c >= 1.3.3.");
-            return;
-        }
-        var returnCode = protoc.run();
-        if (returnCode == 0) {
-            var nameSansProto = filename.substring(0, filename.length() - 6);
-            targetConfig.compileAdditionalSources.add(
-                fileConfig.getSrcGenPath().resolve(nameSansProto + ".pb-c.c").toString()
-            );
-
-            targetConfig.compileLibraries.add("-l");
-            targetConfig.compileLibraries.add("protobuf-c");
-            targetConfig.compilerFlags.add("-lprotobuf-c");
-        } else {
-            errorReporter.reportError("protoc-c returns error code " + returnCode);
-        }
+    if (protoc == null) {
+      errorReporter.reportError("Processing .proto files requires protoc-c >= 1.3.3.");
+      return;
     }
-
-    /**
-     * Construct a unique type for the struct of the specified
-     * typed variable (port or action) of the specified reactor class.
-     * This is required to be the same as the type name returned by
-     * {@link #variableStructType(TriggerInstance)}.
-     */
-    public static String variableStructType(Variable variable, TypeParameterizedReactor tpr, boolean userFacing) {
-        return (userFacing ? tpr.getName().toLowerCase() : CUtil.getName(tpr)) +"_"+variable.getName()+"_t";
+    var returnCode = protoc.run();
+    if (returnCode == 0) {
+      var nameSansProto = filename.substring(0, filename.length() - 6);
+      targetConfig.compileAdditionalSources.add(
+          fileConfig.getSrcGenPath().resolve(nameSansProto + ".pb-c.c").toString());
+
+      targetConfig.compileLibraries.add("-l");
+      targetConfig.compileLibraries.add("protobuf-c");
+      targetConfig.compilerFlags.add("-lprotobuf-c");
+    } else {
+      errorReporter.reportError("protoc-c returns error code " + returnCode);
     }
-
-    /**
-     * Construct a unique type for the struct of the specified
-     * instance (port or action).
-     * This is required to be the same as the type name returned by
-     * {@link #variableStructType(Variable, TypeParameterizedReactor, boolean)}.
-     * @param portOrAction The port or action instance.
-     * @return The name of the self struct.
-     */
-    public static String variableStructType(TriggerInstance<?> portOrAction) {
-        return CUtil.getName(portOrAction.getParent().tpr)+"_"+portOrAction.getName()+"_t";
+  }
+
+  /**
+   * Construct a unique type for the struct of the specified typed variable (port or action) of the
+   * specified reactor class. This is required to be the same as the type name returned by {@link
+   * #variableStructType(TriggerInstance)}.
+   */
+  public static String variableStructType(
+      Variable variable, TypeParameterizedReactor tpr, boolean userFacing) {
+    return (userFacing ? tpr.getName().toLowerCase() : CUtil.getName(tpr))
+        + "_"
+        + variable.getName()
+        + "_t";
+  }
+
+  /**
+   * Construct a unique type for the struct of the specified instance (port or action). This is
+   * required to be the same as the type name returned by {@link #variableStructType(Variable,
+   * TypeParameterizedReactor, boolean)}.
+   *
+   * @param portOrAction The port or action instance.
+   * @return The name of the self struct.
+   */
+  public static String variableStructType(TriggerInstance<?> portOrAction) {
+    return CUtil.getName(portOrAction.getParent().tpr) + "_" + portOrAction.getName() + "_t";
+  }
+
+  /**
+   * If tracing is turned on, then generate code that records the full name of the specified reactor
+   * instance in the trace table. If tracing is not turned on, do nothing.
+   *
+   * @param instance The reactor instance.
+   */
+  private void generateTraceTableEntries(ReactorInstance instance) {
+    if (targetConfig.tracing != null) {
+      initializeTriggerObjects.pr(CTracingGenerator.generateTraceTableEntries(instance));
     }
-
-    /**
-     * If tracing is turned on, then generate code that records
-     * the full name of the specified reactor instance in the
-     * trace table. If tracing is not turned on, do nothing.
-     * @param instance The reactor instance.
-     */
-    private void generateTraceTableEntries(ReactorInstance instance) {
-        if (targetConfig.tracing != null) {
-            initializeTriggerObjects.pr(
-                CTracingGenerator.generateTraceTableEntries(instance)
-            );
-        }
+  }
+
+  /**
+   * Generate code to instantiate the specified reactor instance and initialize it.
+   *
+   * @param instance A reactor instance.
+   */
+  public void generateReactorInstance(ReactorInstance instance) {
+    var reactorClass = ASTUtils.toDefinition(instance.getDefinition().getReactorClass());
+    var fullName = instance.getFullName();
+    initializeTriggerObjects.pr(
+        "// ***** Start initializing " + fullName + " of class " + reactorClass.getName());
+    // Generate the instance self struct containing parameters, state variables,
+    // and outputs (the "self" struct).
+    initializeTriggerObjects.pr(
+        CUtil.reactorRefName(instance)
+            + "["
+            + CUtil.runtimeIndex(instance)
+            + "] = new_"
+            + CUtil.getName(instance.tpr)
+            + "();");
+    initializeTriggerObjects.pr(
+        CUtil.reactorRefName(instance)
+            + "["
+            + CUtil.runtimeIndex(instance)
+            + "]->base.environment = &envs["
+            + CUtil.getEnvironmentId(instance)
+            + "];");
+    // Generate code to initialize the "self" struct in the
+    // _lf_initialize_trigger_objects function.
+    generateTraceTableEntries(instance);
+    generateReactorInstanceExtension(instance);
+    generateParameterInitialization(instance);
+    initializeOutputMultiports(instance);
+    initializeInputMultiports(instance);
+    recordBuiltinTriggers(instance);
+    watchdogCount +=
+        CWatchdogGenerator.generateInitializeWatchdogs(initializeTriggerObjects, instance);
+
+    // Next, initialize the "self" struct with state variables.
+    // These values may be expressions that refer to the parameter values defined above.
+    generateStateVariableInitializations(instance);
+
+    // Generate trigger objects for the instance.
+    generateTimerInitializations(instance);
+    generateActionInitializations(instance);
+    generateInitializeActionToken(instance);
+    generateSetDeadline(instance);
+    generateModeStructure(instance);
+
+    // Recursively generate code for the children.
+    for (ReactorInstance child : instance.children) {
+      // If this reactor is a placeholder for a bank of reactors, then generate
+      // an array of instances of reactors and create an enclosing for loop.
+      // Need to do this for each of the builders into which the code writes.
+      startTimeStep.startScopedBlock(child);
+      initializeTriggerObjects.startScopedBlock(child);
+      generateReactorInstance(child);
+      initializeTriggerObjects.endScopedBlock();
+      startTimeStep.endScopedBlock();
     }
 
-    /**
-     * Generate code to instantiate the specified reactor instance and
-     * initialize it.
-     * @param instance A reactor instance.
-     */
-    public void generateReactorInstance(ReactorInstance instance) {
-        var reactorClass = ASTUtils.toDefinition(instance.getDefinition().getReactorClass());
-        var fullName = instance.getFullName();
-        initializeTriggerObjects.pr(
-                "// ***** Start initializing " + fullName + " of class " + reactorClass.getName());
-        // Generate the instance self struct containing parameters, state variables,
-        // and outputs (the "self" struct).
-        initializeTriggerObjects.pr(CUtil.reactorRefName(instance)+"["+CUtil.runtimeIndex(instance)+"] = new_"+CUtil.getName(instance.tpr)+"();");
-        initializeTriggerObjects.pr(CUtil.reactorRefName(instance)+"["+CUtil.runtimeIndex(instance)+"]->base.environment = &envs["+CUtil.getEnvironmentId(instance)+"];");
-        // Generate code to initialize the "self" struct in the
-        // _lf_initialize_trigger_objects function.
-        generateTraceTableEntries(instance);
-        generateReactorInstanceExtension(instance);
-        generateParameterInitialization(instance);
-        initializeOutputMultiports(instance);
-        initializeInputMultiports(instance);
-        recordBuiltinTriggers(instance);
-        watchdogCount += CWatchdogGenerator.generateInitializeWatchdogs(initializeTriggerObjects, instance);
-
-        // Next, initialize the "self" struct with state variables.
-        // These values may be expressions that refer to the parameter values defined above.
-        generateStateVariableInitializations(instance);
-
-        // Generate trigger objects for the instance.
-        generateTimerInitializations(instance);
-        generateActionInitializations(instance);
-        generateInitializeActionToken(instance);
-        generateSetDeadline(instance);
-        generateModeStructure(instance);
-
-        // Recursively generate code for the children.
-        for (ReactorInstance child : instance.children) {
-            // If this reactor is a placeholder for a bank of reactors, then generate
-            // an array of instances of reactors and create an enclosing for loop.
-            // Need to do this for each of the builders into which the code writes.
-            startTimeStep.startScopedBlock(child);
-            initializeTriggerObjects.startScopedBlock(child);
-            generateReactorInstance(child);
-            initializeTriggerObjects.endScopedBlock();
-            startTimeStep.endScopedBlock();
+    // For this instance, define what must be done at the start of
+    // each time step. This sets up the tables that are used by the
+    // _lf_start_time_step() function in reactor_common.c.
+    // Note that this function is also run once at the end
+    // so that it can deallocate any memory.
+    generateStartTimeStep(instance);
+    initializeTriggerObjects.pr("//***** End initializing " + fullName);
+  }
+
+  /**
+   * For each action of the specified reactor instance, generate initialization code for the offset
+   * and period fields.
+   *
+   * @param instance The reactor.
+   */
+  private void generateActionInitializations(ReactorInstance instance) {
+    initializeTriggerObjects.pr(CActionGenerator.generateInitializers(instance));
+  }
+
+  /**
+   * Initialize actions by creating a lf_token_t in the self struct. This has the information
+   * required to allocate memory for the action payload. Skip any action that is not actually used
+   * as a trigger.
+   *
+   * @param reactor The reactor containing the actions.
+   */
+  private void generateInitializeActionToken(ReactorInstance reactor) {
+    for (ActionInstance action : reactor.actions) {
+      // Skip this step if the action is not in use.
+      if (action.getParent().getTriggers().contains(action)) {
+        var type = reactor.tpr.resolveType(getInferredType(action.getDefinition()));
+        var payloadSize = "0";
+        if (!type.isUndefined()) {
+          var typeStr = types.getTargetType(type);
+          if (CUtil.isTokenType(type, types)) {
+            typeStr = CUtil.rootType(typeStr);
+          }
+          if (typeStr != null && !typeStr.equals("") && !typeStr.equals("void")) {
+            payloadSize = "sizeof(" + typeStr + ")";
+          }
         }
 
-        // For this instance, define what must be done at the start of
-        // each time step. This sets up the tables that are used by the
-        // _lf_start_time_step() function in reactor_common.c.
-        // Note that this function is also run once at the end
-        // so that it can deallocate any memory.
-        generateStartTimeStep(instance);
-        initializeTriggerObjects.pr("//***** End initializing " + fullName);
-    }
-
-    /**
-     * For each action of the specified reactor instance, generate initialization code
-     * for the offset and period fields.
-     * @param instance The reactor.
-     */
-    private void generateActionInitializations(ReactorInstance instance) {
-        initializeTriggerObjects.pr(CActionGenerator.generateInitializers(instance));
+        var selfStruct = CUtil.reactorRef(action.getParent());
+        initializeTriggerObjects.pr(
+            CActionGenerator.generateTokenInitializer(selfStruct, action.getName(), payloadSize));
+      }
     }
-
-    /**
-     * Initialize actions by creating a lf_token_t in the self struct.
-     * This has the information required to allocate memory for the action payload.
-     * Skip any action that is not actually used as a trigger.
-     * @param reactor The reactor containing the actions.
-     */
-    private void generateInitializeActionToken(ReactorInstance reactor) {
-        for (ActionInstance action : reactor.actions) {
-            // Skip this step if the action is not in use.
-            if (action.getParent().getTriggers().contains(action)
-            ) {
-                var type = reactor.tpr.resolveType(getInferredType(action.getDefinition()));
-                var payloadSize = "0";
-                if (!type.isUndefined()) {
-                    var typeStr = types.getTargetType(type);
-                    if (CUtil.isTokenType(type, types)) {
-                        typeStr = CUtil.rootType(typeStr);
-                    }
-                    if (typeStr != null && !typeStr.equals("") && !typeStr.equals("void")) {
-                        payloadSize = "sizeof("+typeStr+")";
-                    }
-                }
-
-                var selfStruct = CUtil.reactorRef(action.getParent());
-                initializeTriggerObjects.pr(
-                    CActionGenerator.generateTokenInitializer(
-                        selfStruct, action.getName(), payloadSize
-                    )
-                );
-            }
+  }
+
+  /**
+   * Generate code that is executed while the reactor instance is being initialized. This is
+   * provided as an extension point for subclasses. Normally, the reactions argument is the full
+   * list of reactions, but for the top-level of a federate, will be a subset of reactions that is
+   * relevant to the federate.
+   *
+   * @param instance The reactor instance.
+   */
+  protected void generateReactorInstanceExtension(ReactorInstance instance) {
+    // Do nothing
+  }
+
+  /**
+   * Generate code that initializes the state variables for a given instance. Unlike parameters,
+   * state variables are uniformly initialized for all instances of the same reactor.
+   *
+   * @param instance The reactor class instance
+   */
+  protected void generateStateVariableInitializations(ReactorInstance instance) {
+    var reactorClass = instance.getDefinition().getReactorClass();
+    var selfRef = CUtil.reactorRef(instance);
+    for (StateVar stateVar : allStateVars(toDefinition(reactorClass))) {
+      if (isInitialized(stateVar)) {
+        var mode =
+            stateVar.eContainer() instanceof Mode
+                ? instance.lookupModeInstance((Mode) stateVar.eContainer())
+                : instance.getMode(false);
+        initializeTriggerObjects.pr(
+            CStateGenerator.generateInitializer(instance, selfRef, stateVar, mode, types));
+        if (mode != null && stateVar.isReset()) {
+          modalStateResetCount += instance.getTotalWidth();
         }
+      }
     }
-
-    /**
-     * Generate code that is executed while the reactor instance is being initialized.
-     * This is provided as an extension point for subclasses.
-     * Normally, the reactions argument is the full list of reactions,
-     * but for the top-level of a federate, will be a subset of reactions that
-     * is relevant to the federate.
-     * @param instance The reactor instance.
-     */
-    protected void generateReactorInstanceExtension(ReactorInstance instance) {
-        // Do nothing
+  }
+
+  /**
+   * Generate code to set the deadline field of the reactions in the specified reactor instance.
+   *
+   * @param instance The reactor instance.
+   */
+  private void generateSetDeadline(ReactorInstance instance) {
+    for (ReactionInstance reaction : instance.reactions) {
+      var selfRef = CUtil.reactorRef(reaction.getParent()) + "->_lf__reaction_" + reaction.index;
+      if (reaction.declaredDeadline != null) {
+        var deadline = reaction.declaredDeadline.maxDelay;
+        initializeTriggerObjects.pr(
+            selfRef + ".deadline = " + types.getTargetTimeExpr(deadline) + ";");
+      } else { // No deadline.
+        initializeTriggerObjects.pr(selfRef + ".deadline = NEVER;");
+      }
     }
-
-    /**
-     * Generate code that initializes the state variables for a given instance.
-     * Unlike parameters, state variables are uniformly initialized for all instances
-     * of the same reactor.
-     * @param instance The reactor class instance
-     */
-    protected void generateStateVariableInitializations(ReactorInstance instance) {
-        var reactorClass = instance.getDefinition().getReactorClass();
-        var selfRef = CUtil.reactorRef(instance);
-        for (StateVar stateVar : allStateVars(toDefinition(reactorClass))) {
-            if (isInitialized(stateVar)) {
-                var mode = stateVar.eContainer() instanceof Mode ?
-                    instance.lookupModeInstance((Mode) stateVar.eContainer()) :
-                    instance.getMode(false);
-                initializeTriggerObjects.pr(CStateGenerator.generateInitializer(
-                    instance,
-                    selfRef,
-                    stateVar,
-                    mode,
-                    types
-                ));
-                if (mode != null && stateVar.isReset()) {
-                    modalStateResetCount += instance.getTotalWidth();
-                }
-            }
-        }
+  }
+
+  /**
+   * Generate code to initialize modes.
+   *
+   * @param instance The reactor instance.
+   */
+  private void generateModeStructure(ReactorInstance instance) {
+    CModesGenerator.generateModeStructure(instance, initializeTriggerObjects);
+    if (!instance.modes.isEmpty()) {
+      modalReactorCount += instance.getTotalWidth();
     }
-
-    /**
-     * Generate code to set the deadline field of the reactions in the
-     * specified reactor instance.
-     * @param instance The reactor instance.
-     */
-    private void generateSetDeadline(ReactorInstance instance) {
-        for (ReactionInstance reaction : instance.reactions) {
-            var selfRef = CUtil.reactorRef(reaction.getParent())+"->_lf__reaction_"+reaction.index;
-            if (reaction.declaredDeadline != null) {
-                var deadline = reaction.declaredDeadline.maxDelay;
-                initializeTriggerObjects.pr(selfRef+".deadline = "+types.getTargetTimeExpr(deadline)+";");
-            } else { // No deadline.
-                initializeTriggerObjects.pr(selfRef+".deadline = NEVER;");
-            }
-        }
+  }
+
+  /**
+   * Generate runtime initialization code for parameters of a given reactor instance
+   *
+   * @param instance The reactor instance.
+   */
+  protected void generateParameterInitialization(ReactorInstance instance) {
+    var selfRef = CUtil.reactorRef(instance);
+    // Set the local bank_index variable so that initializers can use it.
+    initializeTriggerObjects.pr(
+        "bank_index = "
+            + CUtil.bankIndex(instance)
+            + ";"
+            + " SUPPRESS_UNUSED_WARNING(bank_index);");
+    for (ParameterInstance parameter : instance.parameters) {
+      // NOTE: we now use the resolved literal value. For better efficiency, we could
+      // store constants in a global array and refer to its elements to avoid duplicate
+      // memory allocations.
+      // NOTE: If the parameter is initialized with a static initializer for an array
+      // or struct (the initialization expression is surrounded by { ... }), then we
+      // have to declare a static variable to ensure that the memory is put in data space
+      // and not on the stack.
+      // FIXME: Is there a better way to determine this than the string comparison?
+      var initializer = CParameterGenerator.getInitializer(parameter);
+      if (initializer.startsWith("{")) {
+        var temporaryVariableName = parameter.uniqueID();
+        initializeTriggerObjects.pr(
+            String.join(
+                "\n",
+                "static "
+                    + types.getVariableDeclaration(
+                        instance.tpr, parameter.type, temporaryVariableName, true)
+                    + " = "
+                    + initializer
+                    + ";",
+                selfRef + "->" + parameter.getName() + " = " + temporaryVariableName + ";"));
+      } else {
+        initializeTriggerObjects.pr(
+            selfRef + "->" + parameter.getName() + " = " + initializer + ";");
+      }
     }
-
-    /**
-     * Generate code to initialize modes.
-     * @param instance The reactor instance.
-     */
-    private void generateModeStructure(ReactorInstance instance) {
-        CModesGenerator.generateModeStructure(instance, initializeTriggerObjects);
-        if (!instance.modes.isEmpty()) {
-            modalReactorCount += instance.getTotalWidth();
-        }
+  }
+
+  /**
+   * Generate code that mallocs memory for any output multiports.
+   *
+   * @param reactor The reactor instance.
+   */
+  private void initializeOutputMultiports(ReactorInstance reactor) {
+    var reactorSelfStruct = CUtil.reactorRef(reactor);
+    for (PortInstance output : reactor.outputs) {
+      initializeTriggerObjects.pr(
+          CPortGenerator.initializeOutputMultiport(output, reactorSelfStruct));
     }
-
-    /**
-     * Generate runtime initialization code for parameters of a given reactor instance
-     * @param instance The reactor instance.
-     */
-    protected void generateParameterInitialization(ReactorInstance instance) {
-        var selfRef = CUtil.reactorRef(instance);
-        // Set the local bank_index variable so that initializers can use it.
-        initializeTriggerObjects.pr("bank_index = "+CUtil.bankIndex(instance)+";"
-                + " SUPPRESS_UNUSED_WARNING(bank_index);");
-        for (ParameterInstance parameter : instance.parameters) {
-            // NOTE: we now use the resolved literal value. For better efficiency, we could
-            // store constants in a global array and refer to its elements to avoid duplicate
-            // memory allocations.
-            // NOTE: If the parameter is initialized with a static initializer for an array
-            // or struct (the initialization expression is surrounded by { ... }), then we
-            // have to declare a static variable to ensure that the memory is put in data space
-            // and not on the stack.
-            // FIXME: Is there a better way to determine this than the string comparison?
-            var initializer = CParameterGenerator.getInitializer(parameter);
-            if (initializer.startsWith("{")) {
-                var temporaryVariableName = parameter.uniqueID();
-                initializeTriggerObjects.pr(String.join("\n",
-                    "static "+types.getVariableDeclaration(instance.tpr, parameter.type, temporaryVariableName, true)+" = "+initializer+";",
-                    selfRef+"->"+parameter.getName()+" = "+temporaryVariableName+";"
-                ));
-            } else {
-                initializeTriggerObjects.pr(selfRef+"->"+parameter.getName()+" = "+initializer+";");
-            }
-        }
+  }
+
+  /**
+   * Allocate memory for inputs.
+   *
+   * @param reactor The reactor.
+   */
+  private void initializeInputMultiports(ReactorInstance reactor) {
+    var reactorSelfStruct = CUtil.reactorRef(reactor);
+    for (PortInstance input : reactor.inputs) {
+      initializeTriggerObjects.pr(
+          CPortGenerator.initializeInputMultiport(input, reactorSelfStruct));
     }
-
-    /**
-     * Generate code that mallocs memory for any output multiports.
-     * @param reactor The reactor instance.
-     */
-    private void initializeOutputMultiports(ReactorInstance reactor) {
-        var reactorSelfStruct = CUtil.reactorRef(reactor);
-        for (PortInstance output : reactor.outputs) {
-            initializeTriggerObjects.pr(CPortGenerator.initializeOutputMultiport(
-                output,
-                reactorSelfStruct
-            ));
-        }
+  }
+
+  @Override
+  public TargetTypes getTargetTypes() {
+    return types;
+  }
+
+  /**
+   * Get the Docker generator.
+   *
+   * @param context
+   * @return
+   */
+  protected DockerGenerator getDockerGenerator(LFGeneratorContext context) {
+    return new CDockerGenerator(context);
+  }
+
+  // //////////////////////////////////////////
+  // // Protected methods.
+
+  // Perform set up that does not generate code
+  protected void setUpGeneralParameters() {
+    accommodatePhysicalActionsIfPresent();
+    targetConfig.compileDefinitions.put(
+        "LOG_LEVEL", String.valueOf(targetConfig.logLevel.ordinal()));
+    targetConfig.compileAdditionalSources.addAll(CCoreFilesUtils.getCTargetSrc());
+    // Create the main reactor instance if there is a main reactor.
+    createMainReactorInstance();
+    if (hasModalReactors) {
+      // So that each separate compile knows about modal reactors, do this:
+      targetConfig.compileDefinitions.put("MODAL_REACTORS", "TRUE");
     }
-
-    /**
-     * Allocate memory for inputs.
-     * @param reactor The reactor.
-     */
-    private void initializeInputMultiports(ReactorInstance reactor) {
-        var reactorSelfStruct = CUtil.reactorRef(reactor);
-        for (PortInstance input : reactor.inputs) {
-            initializeTriggerObjects.pr(CPortGenerator.initializeInputMultiport(
-                input,
-                reactorSelfStruct
-            ));
-        }
+    if (targetConfig.threading
+        && targetConfig.platformOptions.platform == Platform.ARDUINO
+        && (targetConfig.platformOptions.board == null
+            || !targetConfig.platformOptions.board.contains("mbed"))) {
+      // non-MBED boards should not use threading
+      System.out.println(
+          "Threading is incompatible on your current Arduino flavor. Setting threading to false.");
+      targetConfig.threading = false;
     }
 
-    @Override
-    public TargetTypes getTargetTypes() {
-        return types;
+    if (targetConfig.platformOptions.platform == Platform.ARDUINO
+        && !targetConfig.noCompile
+        && targetConfig.platformOptions.board == null) {
+      System.out.println(
+          "To enable compilation for the Arduino platform, you must specify the fully-qualified"
+              + " board name (FQBN) in the target property. For example, platform: {name: arduino,"
+              + " board: arduino:avr:leonardo}. Entering \"no-compile\" mode and generating target"
+              + " code only.");
+      targetConfig.noCompile = true;
     }
-
-    /**
-     * Get the Docker generator.
-     * @param context
-     * @return
-     */
-    protected DockerGenerator getDockerGenerator(LFGeneratorContext context) {
-        return new CDockerGenerator(context);
+    if (targetConfig.threading) { // FIXME: This logic is duplicated in CMake
+      pickScheduler();
+      // FIXME: this and pickScheduler should be combined.
+      targetConfig.compileDefinitions.put("SCHEDULER", targetConfig.schedulerType.name());
+      targetConfig.compileDefinitions.put(
+          "NUMBER_OF_WORKERS", String.valueOf(targetConfig.workers));
     }
+    pickCompilePlatform();
+  }
 
-    // //////////////////////////////////////////
-    // // Protected methods.
-
-    // Perform set up that does not generate code
-    protected void setUpGeneralParameters() {
-        accommodatePhysicalActionsIfPresent();
-        targetConfig.compileDefinitions.put("LOG_LEVEL", String.valueOf(targetConfig.logLevel.ordinal()));
-        targetConfig.compileAdditionalSources.addAll(CCoreFilesUtils.getCTargetSrc());
-        // Create the main reactor instance if there is a main reactor.
-        createMainReactorInstance();
-        if (hasModalReactors) {
-            // So that each separate compile knows about modal reactors, do this:
-            targetConfig.compileDefinitions.put("MODAL_REACTORS", "TRUE");
-        }
-        if (targetConfig.threading && targetConfig.platformOptions.platform == Platform.ARDUINO
-            && (targetConfig.platformOptions.board == null || !targetConfig.platformOptions.board.contains("mbed"))) {
-            //non-MBED boards should not use threading
-            System.out.println("Threading is incompatible on your current Arduino flavor. Setting threading to false.");
-            targetConfig.threading = false;
-        }
-
-        if (targetConfig.platformOptions.platform == Platform.ARDUINO && !targetConfig.noCompile
-            && targetConfig.platformOptions.board == null) {
-            System.out.println("To enable compilation for the Arduino platform, you must specify the fully-qualified board name (FQBN) in the target property. For example, platform: {name: arduino, board: arduino:avr:leonardo}. Entering \"no-compile\" mode and generating target code only.");
-            targetConfig.noCompile = true;
-        }
-        if (targetConfig.threading) {  // FIXME: This logic is duplicated in CMake
-            pickScheduler();
-            // FIXME: this and pickScheduler should be combined.
-            targetConfig.compileDefinitions.put(
-                "SCHEDULER",
-                targetConfig.schedulerType.name()
-            );
-            targetConfig.compileDefinitions.put(
-                "NUMBER_OF_WORKERS",
-                String.valueOf(targetConfig.workers)
-            );
-        }
-        pickCompilePlatform();
+  protected void handleProtoFiles() {
+    // Handle .proto files.
+    for (String file : targetConfig.protoFiles) {
+      this.processProtoFile(file);
     }
-
-    protected void handleProtoFiles() {
-        // Handle .proto files.
-        for (String file : targetConfig.protoFiles) {
-            this.processProtoFile(file);
-        }
+  }
+
+  /**
+   * Generate code that needs to appear at the top of the generated C file, such as #define and
+   * #include statements.
+   */
+  public String generateDirectives() {
+    CodeBuilder code = new CodeBuilder();
+    code.prComment("Code generated by the Lingua Franca compiler from:");
+    code.prComment("file:/" + FileUtil.toUnixString(fileConfig.srcFile));
+    code.pr(
+        CPreambleGenerator.generateDefineDirectives(
+            targetConfig, fileConfig.getSrcGenPath(), hasModalReactors));
+    code.pr(CPreambleGenerator.generateIncludeStatements(targetConfig, CCppMode));
+    return code.toString();
+  }
+
+  /** Generate top-level preamble code. */
+  protected String generateTopLevelPreambles(Reactor reactor) {
+    CodeBuilder builder = new CodeBuilder();
+    var guard = "TOP_LEVEL_PREAMBLE_" + reactor.eContainer().hashCode() + "_H";
+    builder.pr("#ifndef " + guard);
+    builder.pr("#define " + guard);
+    // Reactors that are instantiated by the specified reactor need to have
+    // their file-level preambles included.  This needs to also include file-level
+    // preambles of base classes of those reactors.
+    Stream.concat(Stream.of(reactor), ASTUtils.allNestedClasses(reactor))
+        .flatMap(it -> ASTUtils.allFileLevelPreambles(it).stream())
+        .collect(Collectors.toSet())
+        .forEach(it -> builder.pr(toText(it.getCode())));
+    for (String file : targetConfig.protoFiles) {
+      var dotIndex = file.lastIndexOf(".");
+      var rootFilename = file;
+      if (dotIndex > 0) {
+        rootFilename = file.substring(0, dotIndex);
+      }
+      code.pr("#include " + addDoubleQuotes(rootFilename + ".pb-c.h"));
+      builder.pr("#include " + addDoubleQuotes(rootFilename + ".pb-c.h"));
     }
-
-    /**
-     * Generate code that needs to appear at the top of the generated
-     * C file, such as #define and #include statements.
-     */
-    public String generateDirectives() {
-        CodeBuilder code = new CodeBuilder();
-        code.prComment("Code generated by the Lingua Franca compiler from:");
-        code.prComment("file:/" + FileUtil.toUnixString(fileConfig.srcFile));
-        code.pr(CPreambleGenerator.generateDefineDirectives(
-            targetConfig,
-            fileConfig.getSrcGenPath(),
-            hasModalReactors
-        ));
-        code.pr(CPreambleGenerator.generateIncludeStatements(
-            targetConfig,
-            CCppMode
-        ));
-        return code.toString();
+    builder.pr("#endif");
+    return builder.toString();
+  }
+
+  protected boolean targetLanguageIsCpp() {
+    return CCppMode;
+  }
+
+  /**
+   * Given a line of text from the output of a compiler, return an instance of ErrorFileAndLine if
+   * the line is recognized as the first line of an error message. Otherwise, return null.
+   *
+   * @param line A line of output from a compiler or other external tool that might generate errors.
+   * @return If the line is recognized as the start of an error message, then return a class
+   *     containing the path to the file on which the error occurred (or null if there is none), the
+   *     line number (or the string "1" if there is none), the character position (or the string "0"
+   *     if there is none), and the message (or an empty string if there is none).
+   */
+  @Override
+  public GeneratorBase.ErrorFileAndLine parseCommandOutput(String line) {
+    var matcher = compileErrorPattern.matcher(line);
+    if (matcher.find()) {
+      var result = new ErrorFileAndLine();
+      result.filepath = matcher.group("path");
+      result.line = matcher.group("line");
+      result.character = matcher.group("column");
+      result.message = matcher.group("message");
+
+      if (!result.message.toLowerCase().contains("error:")) {
+        result.isError = false;
+      }
+      return result;
     }
-
-    /**
-     * Generate top-level preamble code.
-     */
-    protected String generateTopLevelPreambles(Reactor reactor) {
-        CodeBuilder builder = new CodeBuilder();
-        var guard = "TOP_LEVEL_PREAMBLE_" + reactor.eContainer().hashCode() + "_H";
-        builder.pr("#ifndef " + guard);
-        builder.pr("#define " + guard);
-        // Reactors that are instantiated by the specified reactor need to have
-        // their file-level preambles included.  This needs to also include file-level
-        // preambles of base classes of those reactors.
-        Stream.concat(Stream.of(reactor), ASTUtils.allNestedClasses(reactor))
-            .flatMap(it -> ASTUtils.allFileLevelPreambles(it).stream())
-            .collect(Collectors.toSet())
-            .forEach(it -> builder.pr(toText(it.getCode())));
-        for (String file : targetConfig.protoFiles) {
-            var dotIndex = file.lastIndexOf(".");
-            var rootFilename = file;
-            if (dotIndex > 0) {
-                rootFilename = file.substring(0, dotIndex);
-            }
-            code.pr("#include " + addDoubleQuotes(rootFilename + ".pb-c.h"));
-            builder.pr("#include " + addDoubleQuotes(rootFilename + ".pb-c.h"));
+    return null;
+  }
+
+  ////////////////////////////////////////////
+  //// Private methods.
+
+  /** Returns the Target enum for this generator */
+  @Override
+  public Target getTarget() {
+    return Target.C;
+  }
+
+  ////////////////////////////////////////////////////////////
+  //// Private methods
+
+  /**
+   * If a main or federated reactor has been declared, create a ReactorInstance for this top level.
+   * This will also assign levels to reactions, then, if the program is federated, perform an AST
+   * transformation to disconnect connections between federates.
+   */
+  private void createMainReactorInstance() {
+    if (this.mainDef != null) {
+      if (this.main == null) {
+        // Recursively build instances.
+        this.main = new ReactorInstance(toDefinition(mainDef.getReactorClass()), errorReporter);
+        var reactionInstanceGraph = this.main.assignLevels();
+        if (reactionInstanceGraph.nodeCount() > 0) {
+          errorReporter.reportError("Main reactor has causality cycles. Skipping code generation.");
+          return;
         }
-        builder.pr("#endif");
-        return builder.toString();
-    }
-
-    protected boolean targetLanguageIsCpp() {
-        return CCppMode;
-    }
-
-    /** Given a line of text from the output of a compiler, return
-     *  an instance of ErrorFileAndLine if the line is recognized as
-     *  the first line of an error message. Otherwise, return null.
-     *  @param line A line of output from a compiler or other external
-     *   tool that might generate errors.
-     *  @return If the line is recognized as the start of an error message,
-     *   then return a class containing the path to the file on which the
-     *   error occurred (or null if there is none), the line number (or the
-     *   string "1" if there is none), the character position (or the string
-     *   "0" if there is none), and the message (or an empty string if there
-     *   is none).
-     */
-    @Override
-    public GeneratorBase.ErrorFileAndLine parseCommandOutput(String line) {
-        var matcher = compileErrorPattern.matcher(line);
-        if (matcher.find()) {
-            var result = new ErrorFileAndLine();
-            result.filepath = matcher.group("path");
-            result.line = matcher.group("line");
-            result.character = matcher.group("column");
-            result.message = matcher.group("message");
-
-            if (!result.message.toLowerCase().contains("error:")) {
-                result.isError = false;
-            }
-            return result;
+        if (hasDeadlines) {
+          this.main.assignDeadlines();
         }
-        return null;
-    }
-
-    ////////////////////////////////////////////
-    //// Private methods.
-
-    /** Returns the Target enum for this generator */
-    @Override
-    public Target getTarget() {
-        return Target.C;
-    }
-
-    ////////////////////////////////////////////////////////////
-    //// Private methods
-
-    /**
-     * If a main or federated reactor has been declared, create a ReactorInstance
-     * for this top level. This will also assign levels to reactions, then,
-     * if the program is federated, perform an AST transformation to disconnect
-     * connections between federates.
-     */
-    private void createMainReactorInstance() {
-        if (this.mainDef != null) {
-            if (this.main == null) {
-                // Recursively build instances.
-                this.main = new ReactorInstance(toDefinition(mainDef.getReactorClass()), errorReporter);
-                var reactionInstanceGraph = this.main.assignLevels();
-                if (reactionInstanceGraph.nodeCount() > 0) {
-                    errorReporter.reportError("Main reactor has causality cycles. Skipping code generation.");
-                    return;
-                }
-                if (hasDeadlines) {
-                    this.main.assignDeadlines();
-                }
-                // Inform the run-time of the breadth/parallelism of the reaction graph
-                var breadth = reactionInstanceGraph.getBreadth();
-                if (breadth == 0) {
-                    errorReporter.reportWarning("The program has no reactions");
-                } else {
-                    targetConfig.compileDefinitions.put(
-                      "LF_REACTION_GRAPH_BREADTH",
-                      String.valueOf(reactionInstanceGraph.getBreadth())
-                    );
-                }
-            }
+        // Inform the run-time of the breadth/parallelism of the reaction graph
+        var breadth = reactionInstanceGraph.getBreadth();
+        if (breadth == 0) {
+          errorReporter.reportWarning("The program has no reactions");
+        } else {
+          targetConfig.compileDefinitions.put(
+              "LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth()));
         }
+      }
     }
-
-    /**
-     * Generate an array of self structs for the reactor
-     * and one for each of its children.
-     * @param r The reactor instance.
-     */
-    private void generateSelfStructs(ReactorInstance r) {
-        initializeTriggerObjects.pr(CUtil.selfType(r)+"* "+CUtil.reactorRefName(r)+"["+r.getTotalWidth()+"];");
-        initializeTriggerObjects.pr("SUPPRESS_UNUSED_WARNING("+CUtil.reactorRefName(r)+");");
-        for (ReactorInstance child : r.children) {
-            generateSelfStructs(child);
-        }
+  }
+
+  /**
+   * Generate an array of self structs for the reactor and one for each of its children.
+   *
+   * @param r The reactor instance.
+   */
+  private void generateSelfStructs(ReactorInstance r) {
+    initializeTriggerObjects.pr(
+        CUtil.selfType(r) + "* " + CUtil.reactorRefName(r) + "[" + r.getTotalWidth() + "];");
+    initializeTriggerObjects.pr("SUPPRESS_UNUSED_WARNING(" + CUtil.reactorRefName(r) + ");");
+    for (ReactorInstance child : r.children) {
+      generateSelfStructs(child);
     }
+  }
 
-    private Stream<TypeParameterizedReactor> allTypeParameterizedReactors() {
-        return ASTUtils.recursiveChildren(main).stream()
-            .map(it -> it.tpr)
-            .distinct();
-    }
+  private Stream<TypeParameterizedReactor> allTypeParameterizedReactors() {
+    return ASTUtils.recursiveChildren(main).stream().map(it -> it.tpr).distinct();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CMainFunctionGenerator.java b/org.lflang/src/org/lflang/generator/c/CMainFunctionGenerator.java
index 533611368a..044874029f 100644
--- a/org.lflang/src/org/lflang/generator/c/CMainFunctionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CMainFunctionGenerator.java
@@ -3,120 +3,113 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.lflang.TargetConfig;
+import org.lflang.TargetProperty.Platform;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.util.StringUtil;
-import org.lflang.TargetProperty.Platform;
 
 public class CMainFunctionGenerator {
-    private TargetConfig targetConfig;
-    /** The command to run the generated code if specified in the target directive. */
-    private List<String> runCommand;
+  private TargetConfig targetConfig;
+  /** The command to run the generated code if specified in the target directive. */
+  private List<String> runCommand;
 
-    public CMainFunctionGenerator(TargetConfig targetConfig) {
-        this.targetConfig = targetConfig;
-        runCommand = new ArrayList<>();
-        parseTargetParameters();
-    }
+  public CMainFunctionGenerator(TargetConfig targetConfig) {
+    this.targetConfig = targetConfig;
+    runCommand = new ArrayList<>();
+    parseTargetParameters();
+  }
 
-    /**
-     * Generate the code that is the entry point
-     * of the program.
-     *
-     * Ideally, this code would belong to its own {@code main.c}
-     * file, but it currently lives in the same file
-     * as all the code generated for reactors.
-     */
-    public String generateCode() {
-        CodeBuilder code = new CodeBuilder();
-        code.pr(generateMainFunction());
-        code.pr(generateSetDefaultCliOption());
-        return code.toString();
-    }
+  /**
+   * Generate the code that is the entry point of the program.
+   *
+   * <p>Ideally, this code would belong to its own {@code main.c} file, but it currently lives in
+   * the same file as all the code generated for reactors.
+   */
+  public String generateCode() {
+    CodeBuilder code = new CodeBuilder();
+    code.pr(generateMainFunction());
+    code.pr(generateSetDefaultCliOption());
+    return code.toString();
+  }
 
-    /**
-     * Generate the {@code main} function.
-     */
-    private String generateMainFunction() {
-        if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
-            /**
-                By default, we must have a serial begin line prior to calling lf_reactor_c_main due to internal debugging messages requiring a print buffer.
-                For the future, we can check whether internal LF logging is enabled or not before removing this line.
-                - Logging
-            */
-            return String.join("\n",
-            "\nvoid _lf_arduino_print_message_function(const char* format, va_list args) {",
-                "\tchar buf[128];",
-                "\tvsnprintf(buf, 128, format, args);",
-                "\tSerial.print(buf);",
-            "}\n",
-            "// Arduino setup() and loop() functions",
-            "void setup() {",
-                "\tSerial.begin(" + targetConfig.platformOptions.baudRate + ");",
-                "\tlf_register_print_function(&_lf_arduino_print_message_function, LOG_LEVEL);",
-                "\tlf_reactor_c_main(0, NULL);",
-            "}\n",
-            "void loop() {}"
-            );
-        } else if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
-            // The Zephyr "runtime" does not terminate when main returns.
-            //  Rather, {@code exit} should be called explicitly.
-            return String.join("\n",
-                "void main(void) {",
-                "   int res = lf_reactor_c_main(0, NULL);",
-                "   exit(res);",
-                "}"
-                );
-        } else {
-            return String.join("\n",
-                "int main(int argc, const char* argv[]) {",
-                "    return lf_reactor_c_main(argc, argv);",
-                "}"
-            );
-        }
+  /** Generate the {@code main} function. */
+  private String generateMainFunction() {
+    if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
+      /**
+       * By default, we must have a serial begin line prior to calling lf_reactor_c_main due to
+       * internal debugging messages requiring a print buffer. For the future, we can check whether
+       * internal LF logging is enabled or not before removing this line. - Logging
+       */
+      return String.join(
+          "\n",
+          "\nvoid _lf_arduino_print_message_function(const char* format, va_list args) {",
+          "\tchar buf[128];",
+          "\tvsnprintf(buf, 128, format, args);",
+          "\tSerial.print(buf);",
+          "}\n",
+          "// Arduino setup() and loop() functions",
+          "void setup() {",
+          "\tSerial.begin(" + targetConfig.platformOptions.baudRate + ");",
+          "\tlf_register_print_function(&_lf_arduino_print_message_function, LOG_LEVEL);",
+          "\tlf_reactor_c_main(0, NULL);",
+          "}\n",
+          "void loop() {}");
+    } else if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
+      // The Zephyr "runtime" does not terminate when main returns.
+      //  Rather, {@code exit} should be called explicitly.
+      return String.join(
+          "\n",
+          "void main(void) {",
+          "   int res = lf_reactor_c_main(0, NULL);",
+          "   exit(res);",
+          "}");
+    } else {
+      return String.join(
+          "\n",
+          "int main(int argc, const char* argv[]) {",
+          "    return lf_reactor_c_main(argc, argv);",
+          "}");
     }
+  }
 
-    /**
-     * Generate code that is used to override the
-     * command line options to the {@code main} function
-     */
-    private String generateSetDefaultCliOption() {
-        // Generate function to set default command-line options.
-        // A literal array needs to be given outside any function definition,
-        // so start with that.
-        return runCommand.size() > 0 ?
-            String.join("\n",
-                "const char* _lf_default_argv[] = { " +
-                        StringUtil.addDoubleQuotes(
-                            StringUtil.joinObjects(runCommand,
-                                StringUtil.addDoubleQuotes(", ")))+" };",
-                "void _lf_set_default_command_line_options() {",
-                "        default_argc = "+runCommand.size()+";",
-                "        default_argv = _lf_default_argv;",
-                "}")
-                : "void _lf_set_default_command_line_options() {}";
-    }
+  /**
+   * Generate code that is used to override the command line options to the {@code main} function
+   */
+  private String generateSetDefaultCliOption() {
+    // Generate function to set default command-line options.
+    // A literal array needs to be given outside any function definition,
+    // so start with that.
+    return runCommand.size() > 0
+        ? String.join(
+            "\n",
+            "const char* _lf_default_argv[] = { "
+                + StringUtil.addDoubleQuotes(
+                    StringUtil.joinObjects(runCommand, StringUtil.addDoubleQuotes(", ")))
+                + " };",
+            "void _lf_set_default_command_line_options() {",
+            "        default_argc = " + runCommand.size() + ";",
+            "        default_argv = _lf_default_argv;",
+            "}")
+        : "void _lf_set_default_command_line_options() {}";
+  }
 
-    /**
-     * Parse the target parameters and set flags to the runCommand
-     * accordingly.
-     */
-    private void parseTargetParameters() {
-        if (targetConfig.fastMode) {
-            runCommand.add("-f");
-            runCommand.add("true");
-        }
-        if (targetConfig.keepalive) {
-            runCommand.add("-k");
-            runCommand.add("true");
-        }
-        if (targetConfig.timeout != null) {
-            runCommand.add("-o");
-            runCommand.add(targetConfig.timeout.getMagnitude() + "");
-            runCommand.add(targetConfig.timeout.unit.getCanonicalName());
-        }
-        // The runCommand has a first entry that is ignored but needed.
-        if (runCommand.size() > 0) {
-            runCommand.add(0, "dummy");
-        }
+  /** Parse the target parameters and set flags to the runCommand accordingly. */
+  private void parseTargetParameters() {
+    if (targetConfig.fastMode) {
+      runCommand.add("-f");
+      runCommand.add("true");
+    }
+    if (targetConfig.keepalive) {
+      runCommand.add("-k");
+      runCommand.add("true");
+    }
+    if (targetConfig.timeout != null) {
+      runCommand.add("-o");
+      runCommand.add(targetConfig.timeout.getMagnitude() + "");
+      runCommand.add(targetConfig.timeout.unit.getCanonicalName());
+    }
+    // The runCommand has a first entry that is ignored but needed.
+    if (runCommand.size() > 0) {
+      runCommand.add(0, "dummy");
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CMethodGenerator.java b/org.lflang/src/org/lflang/generator/c/CMethodGenerator.java
index 5da00ac70e..1950e8df82 100644
--- a/org.lflang/src/org/lflang/generator/c/CMethodGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CMethodGenerator.java
@@ -2,8 +2,8 @@
 
 import static org.lflang.ast.ASTUtils.allMethods;
 
-import org.lflang.ast.ASTUtils;
 import org.lflang.InferredType;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.lf.Method;
 import org.lflang.lf.Reactor;
@@ -15,165 +15,151 @@
  */
 public class CMethodGenerator {
 
-    /**
-     * Generate macro definitions for methods.
-     * @param tpr The reactor.
-     * @param body The place to put the macro definitions.
-     */
-    public static void generateMacrosForMethods(
-        TypeParameterizedReactor tpr,
-        CodeBuilder body
-    ) {
-        for (Method method : allMethods(tpr.reactor())) {
-            var functionName = methodFunctionName(tpr, method);
-            // If the method has no arguments. Do not pass it any variadic arguments.
-            if (method.getArguments().size() > 0) {
-                body.pr("#define "+method.getName()+"(...) "+functionName+"(self, ##__VA_ARGS__)");
-            } else {
-                body.pr("#define "+method.getName()+"() "+functionName+"(self)");
-            }
-        }
+  /**
+   * Generate macro definitions for methods.
+   *
+   * @param tpr The reactor.
+   * @param body The place to put the macro definitions.
+   */
+  public static void generateMacrosForMethods(TypeParameterizedReactor tpr, CodeBuilder body) {
+    for (Method method : allMethods(tpr.reactor())) {
+      var functionName = methodFunctionName(tpr, method);
+      // If the method has no arguments. Do not pass it any variadic arguments.
+      if (method.getArguments().size() > 0) {
+        body.pr("#define " + method.getName() + "(...) " + functionName + "(self, ##__VA_ARGS__)");
+      } else {
+        body.pr("#define " + method.getName() + "() " + functionName + "(self)");
+      }
     }
+  }
 
-    /**
-     * Generate macro undefinitions for methods.
-     * @param reactor The reactor.
-     * @param body The place to put the macro definitions.
-     */
-    public static void generateMacroUndefsForMethods(
-        Reactor reactor,
-        CodeBuilder body
-    ) {
-        for (Method method : allMethods(reactor)) {
-            body.pr("#undef "+method.getName());
-        }
+  /**
+   * Generate macro undefinitions for methods.
+   *
+   * @param reactor The reactor.
+   * @param body The place to put the macro definitions.
+   */
+  public static void generateMacroUndefsForMethods(Reactor reactor, CodeBuilder body) {
+    for (Method method : allMethods(reactor)) {
+      body.pr("#undef " + method.getName());
     }
+  }
 
-    /**
-     * Generate a method function definition for a reactor.
-     * This function will have a first argument that is a void* pointing to
-     * the self struct, followed by any arguments given in its definition.
-     * @param method The method.
-     * @param tpr The concrete reactor class.
-     * @param types The C-specific type conversion functions.
-     */
-    public static String generateMethod(
-        Method method,
-        TypeParameterizedReactor tpr,
-        CTypes types
-    ) {
-        var code = new CodeBuilder();
-        var body = ASTUtils.toText(method.getCode());
-
-        code.prSourceLineNumber(method);
-        code.prComment("Implementation of method "+method.getName()+"()");
-        code.pr(generateMethodSignature(method, tpr, types) + " {");
-        code.indent();
+  /**
+   * Generate a method function definition for a reactor. This function will have a first argument
+   * that is a void* pointing to the self struct, followed by any arguments given in its definition.
+   *
+   * @param method The method.
+   * @param tpr The concrete reactor class.
+   * @param types The C-specific type conversion functions.
+   */
+  public static String generateMethod(Method method, TypeParameterizedReactor tpr, CTypes types) {
+    var code = new CodeBuilder();
+    var body = ASTUtils.toText(method.getCode());
 
-        // Define the "self" struct.
-        String structType = CUtil.selfType(tpr);
-        // A null structType means there are no inputs, state,
-        // or anything else. No need to declare it.
-        if (structType != null) {
-             code.pr(String.join("\n",
-                 structType+"* self = ("+structType+"*)instance_args;"
-                         + " SUPPRESS_UNUSED_WARNING(self);"
-             ));
-        }
+    code.prSourceLineNumber(method);
+    code.prComment("Implementation of method " + method.getName() + "()");
+    code.pr(generateMethodSignature(method, tpr, types) + " {");
+    code.indent();
 
-        code.prSourceLineNumber(method.getCode());
-        code.pr(body);
-        code.unindent();
-        code.pr("}");
-        return code.toString();
+    // Define the "self" struct.
+    String structType = CUtil.selfType(tpr);
+    // A null structType means there are no inputs, state,
+    // or anything else. No need to declare it.
+    if (structType != null) {
+      code.pr(
+          String.join(
+              "\n",
+              structType
+                  + "* self = ("
+                  + structType
+                  + "*)instance_args;"
+                  + " SUPPRESS_UNUSED_WARNING(self);"));
     }
 
-    /**
-     * Generate method functions definition for a reactor.
-     * These functions have a first argument that is a void* pointing to
-     * the self struct.
-     * @param tpr The reactor.
-     * @param code The place to put the code.
-     * @param types The C-specific type conversion functions.
-     */
-    public static void generateMethods(
-            TypeParameterizedReactor tpr,
-            CodeBuilder code,
-            CTypes types
-    ) {
-        var reactor = tpr.reactor();
-        code.prComment("***** Start of method declarations.");
-        signatures(tpr, code, types);
-        generateMacrosForMethods(tpr, code);
-        for (Method method : allMethods(reactor)) {
-            code.pr(CMethodGenerator.generateMethod(method, tpr, types));
-        }
-        generateMacroUndefsForMethods(reactor, code);
-        code.prComment("***** End of method declarations.");
-    }
+    code.prSourceLineNumber(method.getCode());
+    code.pr(body);
+    code.unindent();
+    code.pr("}");
+    return code.toString();
+  }
 
-    /**
-     * Generate function signatures for methods.
-     * This can be used to declare all the methods with signatures only
-     * before giving the full definition so that methods may call each other
-     * (and themselves) regardless of the order of definition.
-     * @param tpr The reactor declaration.
-     * @param types The C-specific type conversion functions.
-     */
-    public static void signatures(
-        TypeParameterizedReactor tpr,
-        CodeBuilder body,
-        CTypes types
-    ) {
-        Reactor reactor = tpr.reactor();
-        for (Method method : allMethods(reactor)) {
-            body.pr(generateMethodSignature(method, tpr, types) + ";");
-        }
+  /**
+   * Generate method functions definition for a reactor. These functions have a first argument that
+   * is a void* pointing to the self struct.
+   *
+   * @param tpr The reactor.
+   * @param code The place to put the code.
+   * @param types The C-specific type conversion functions.
+   */
+  public static void generateMethods(TypeParameterizedReactor tpr, CodeBuilder code, CTypes types) {
+    var reactor = tpr.reactor();
+    code.prComment("***** Start of method declarations.");
+    signatures(tpr, code, types);
+    generateMacrosForMethods(tpr, code);
+    for (Method method : allMethods(reactor)) {
+      code.pr(CMethodGenerator.generateMethod(method, tpr, types));
     }
+    generateMacroUndefsForMethods(reactor, code);
+    code.prComment("***** End of method declarations.");
+  }
 
-    /**
-     * Return the function name for specified method of the specified reactor.
-     * @param tpr The reactor
-     * @param method The method.
-     * @return The function name for the method.
-     */
-    private static String methodFunctionName(TypeParameterizedReactor tpr, Method method) {
-        return CUtil.getName(tpr) + "_method_" + method.getName();
+  /**
+   * Generate function signatures for methods. This can be used to declare all the methods with
+   * signatures only before giving the full definition so that methods may call each other (and
+   * themselves) regardless of the order of definition.
+   *
+   * @param tpr The reactor declaration.
+   * @param types The C-specific type conversion functions.
+   */
+  public static void signatures(TypeParameterizedReactor tpr, CodeBuilder body, CTypes types) {
+    Reactor reactor = tpr.reactor();
+    for (Method method : allMethods(reactor)) {
+      body.pr(generateMethodSignature(method, tpr, types) + ";");
     }
+  }
+
+  /**
+   * Return the function name for specified method of the specified reactor.
+   *
+   * @param tpr The reactor
+   * @param method The method.
+   * @return The function name for the method.
+   */
+  private static String methodFunctionName(TypeParameterizedReactor tpr, Method method) {
+    return CUtil.getName(tpr) + "_method_" + method.getName();
+  }
 
-    /**
-     * Generate a method function signature for a reactor.
-     * This function will have a first argument that is a void* pointing to
-     * the self struct, followed by any arguments given in its definition.
-     * @param method The method.
-     * @param tpr The reactor declaration.
-     * @param types The C-specific type conversion functions.
-     */
-    public static String generateMethodSignature(
-        Method method,
-        TypeParameterizedReactor tpr,
-        CTypes types
-    ) {
-        var functionName = methodFunctionName(tpr, method);
+  /**
+   * Generate a method function signature for a reactor. This function will have a first argument
+   * that is a void* pointing to the self struct, followed by any arguments given in its definition.
+   *
+   * @param method The method.
+   * @param tpr The reactor declaration.
+   * @param types The C-specific type conversion functions.
+   */
+  public static String generateMethodSignature(
+      Method method, TypeParameterizedReactor tpr, CTypes types) {
+    var functionName = methodFunctionName(tpr, method);
 
-        StringBuilder result = new StringBuilder();
-        if (method.getReturn() != null) {
-            result.append(types.getTargetType(InferredType.fromAST(method.getReturn())));
-            result.append(" ");
-        } else {
-            result.append("void ");
-        }
-        result.append(functionName);
-        result.append("(void* instance_args");
-        if (method.getArguments() != null) {
-            for (var arg : method.getArguments()) {
-                result.append(", ");
-                result.append(types.getTargetType(InferredType.fromAST(arg.getType())));
-                result.append(" ");
-                result.append(arg.getName());
-            }
-        }
-        result.append(")");
-        return result.toString();
+    StringBuilder result = new StringBuilder();
+    if (method.getReturn() != null) {
+      result.append(types.getTargetType(InferredType.fromAST(method.getReturn())));
+      result.append(" ");
+    } else {
+      result.append("void ");
+    }
+    result.append(functionName);
+    result.append("(void* instance_args");
+    if (method.getArguments() != null) {
+      for (var arg : method.getArguments()) {
+        result.append(", ");
+        result.append(types.getTargetType(InferredType.fromAST(arg.getType())));
+        result.append(" ");
+        result.append(arg.getName());
+      }
     }
+    result.append(")");
+    return result.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CMixedRadixGenerator.java b/org.lflang/src/org/lflang/generator/c/CMixedRadixGenerator.java
index 40717f3c4d..f2bf71ef66 100644
--- a/org.lflang/src/org/lflang/generator/c/CMixedRadixGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CMixedRadixGenerator.java
@@ -1,16 +1,16 @@
 package org.lflang.generator.c;
 
 public class CMixedRadixGenerator {
-    /** Standardized name for channel index variable for a source. */
-    public static String sc = "src_channel";
-    /** Standardized name for bank index variable for a source. */
-    public static String sb = "src_bank";
-    /** Standardized name for runtime index variable for a source. */
-    public static String sr = "src_runtime";
-    /** Standardized name for channel index variable for a destination. */
-    public static String dc = "dst_channel";
-    /** Standardized name for bank index variable for a destination. */
-    public static String db = "dst_bank";
-    /** Standardized name for runtime index variable for a destination. */
-    public static String dr = "dst_runtime";
+  /** Standardized name for channel index variable for a source. */
+  public static String sc = "src_channel";
+  /** Standardized name for bank index variable for a source. */
+  public static String sb = "src_bank";
+  /** Standardized name for runtime index variable for a source. */
+  public static String sr = "src_runtime";
+  /** Standardized name for channel index variable for a destination. */
+  public static String dc = "dst_channel";
+  /** Standardized name for bank index variable for a destination. */
+  public static String db = "dst_bank";
+  /** Standardized name for runtime index variable for a destination. */
+  public static String dr = "dst_runtime";
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CModesGenerator.java b/org.lflang/src/org/lflang/generator/c/CModesGenerator.java
index 2a6217de64..7d72890639 100644
--- a/org.lflang/src/org/lflang/generator/c/CModesGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CModesGenerator.java
@@ -1,7 +1,6 @@
 package org.lflang.generator.c;
 
 import java.util.List;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ReactionInstance;
@@ -17,203 +16,228 @@
  * @author Hou Seng Wong
  */
 public class CModesGenerator {
-    /**
-     * Generate fields in the self struct for mode instances
-     *
-     * @param reactor
-     * @param body
-     * @param constructorCode
-     */
-    public static void generateDeclarations(
-        Reactor reactor,
-        CodeBuilder body,
-        CodeBuilder constructorCode
-    ) {
-        List<Mode> allModes = ASTUtils.allModes(reactor);
-        if (!allModes.isEmpty()) {
-            // Reactor's mode instances and its state.
-            body.pr(String.join("\n",
-                "reactor_mode_t _lf__modes["+reactor.getModes().size()+"];"
-            ));
+  /**
+   * Generate fields in the self struct for mode instances
+   *
+   * @param reactor
+   * @param body
+   * @param constructorCode
+   */
+  public static void generateDeclarations(
+      Reactor reactor, CodeBuilder body, CodeBuilder constructorCode) {
+    List<Mode> allModes = ASTUtils.allModes(reactor);
+    if (!allModes.isEmpty()) {
+      // Reactor's mode instances and its state.
+      body.pr(String.join("\n", "reactor_mode_t _lf__modes[" + reactor.getModes().size() + "];"));
 
-            // Initialize the mode instances
-            constructorCode.pr("// Initialize modes");
-            constructorCode.pr("self_base_t* _lf_self_base = (self_base_t*)self;");
-            int initialMode = -1;
+      // Initialize the mode instances
+      constructorCode.pr("// Initialize modes");
+      constructorCode.pr("self_base_t* _lf_self_base = (self_base_t*)self;");
+      int initialMode = -1;
 
-            for (int i = 0; i < allModes.size(); i++){
-                var mode = allModes.get(i);
-                constructorCode.pr(mode, String.join("\n",
-                    "self->_lf__modes["+i+"].state = &_lf_self_base->_lf__mode_state;",
-                    "self->_lf__modes["+i+"].name = \""+mode.getName()+"\";",
-                    "self->_lf__modes["+i+"].deactivation_time = 0;",
-                    "self->_lf__modes["+i+"].flags = 0;"
-                ));
-                if (initialMode < 0 && mode.isInitial()) {
-                    initialMode = i;
-                }
-            }
+      for (int i = 0; i < allModes.size(); i++) {
+        var mode = allModes.get(i);
+        constructorCode.pr(
+            mode,
+            String.join(
+                "\n",
+                "self->_lf__modes[" + i + "].state = &_lf_self_base->_lf__mode_state;",
+                "self->_lf__modes[" + i + "].name = \"" + mode.getName() + "\";",
+                "self->_lf__modes[" + i + "].deactivation_time = 0;",
+                "self->_lf__modes[" + i + "].flags = 0;"));
+        if (initialMode < 0 && mode.isInitial()) {
+          initialMode = i;
+        }
+      }
 
-            assert initialMode >= 0 : "initial mode must be non-negative!!";
+      assert initialMode >= 0 : "initial mode must be non-negative!!";
 
-            // Initialize mode state with initial mode active upon start
-            constructorCode.pr(String.join("\n",
-                "// Initialize mode state",
-                "_lf_self_base->_lf__mode_state.parent_mode = NULL;",
-                "_lf_self_base->_lf__mode_state.initial_mode = &self->_lf__modes["+initialMode+"];",
-                "_lf_self_base->_lf__mode_state.current_mode = _lf_self_base->_lf__mode_state.initial_mode;",
-                "_lf_self_base->_lf__mode_state.next_mode = NULL;",
-                "_lf_self_base->_lf__mode_state.mode_change = no_transition;"
-            ));
-        }
+      // Initialize mode state with initial mode active upon start
+      constructorCode.pr(
+          String.join(
+              "\n",
+              "// Initialize mode state",
+              "_lf_self_base->_lf__mode_state.parent_mode = NULL;",
+              "_lf_self_base->_lf__mode_state.initial_mode = &self->_lf__modes["
+                  + initialMode
+                  + "];",
+              "_lf_self_base->_lf__mode_state.current_mode ="
+                  + " _lf_self_base->_lf__mode_state.initial_mode;",
+              "_lf_self_base->_lf__mode_state.next_mode = NULL;",
+              "_lf_self_base->_lf__mode_state.mode_change = no_transition;"));
     }
+  }
 
-    /**
-     * Generate the declaration of modal models state table.
-     *
-     * @param hasModalReactors True if there is modal model reactors, false otherwise
-     * @param modalReactorCount The number of modal model reactors
-     * @param modalStateResetCount The number of modal model state resets
-     */
-    public static String generateModeStatesTable(
-        boolean hasModalReactors,
-        int modalReactorCount,
-        int modalStateResetCount
-    ) {
-        if (hasModalReactors) {
-            return String.join("\n",
-                "// Array of pointers to mode states to be handled in _lf_handle_mode_changes().",
-                "reactor_mode_state_t* _lf_modal_reactor_states["+modalReactorCount+"];",
-                "int _lf_modal_reactor_states_size = "+modalReactorCount+";",
-                (modalStateResetCount > 0 ?
-                    String.join("\n",
-                        "// Array of reset data for state variables nested in modes. Used in _lf_handle_mode_changes().",
-                        "mode_state_variable_reset_data_t _lf_modal_state_reset["+modalStateResetCount+"];",
-                        "int _lf_modal_state_reset_size = "+modalStateResetCount+";")
-                    : ""
-                ));
-        }
-        return "";
+  /**
+   * Generate the declaration of modal models state table.
+   *
+   * @param hasModalReactors True if there is modal model reactors, false otherwise
+   * @param modalReactorCount The number of modal model reactors
+   * @param modalStateResetCount The number of modal model state resets
+   */
+  public static String generateModeStatesTable(
+      boolean hasModalReactors, int modalReactorCount, int modalStateResetCount) {
+    if (hasModalReactors) {
+      return String.join(
+          "\n",
+          "// Array of pointers to mode states to be handled in _lf_handle_mode_changes().",
+          "reactor_mode_state_t* _lf_modal_reactor_states[" + modalReactorCount + "];",
+          "int _lf_modal_reactor_states_size = " + modalReactorCount + ";",
+          (modalStateResetCount > 0
+              ? String.join(
+                  "\n",
+                  "// Array of reset data for state variables nested in modes. Used in"
+                      + " _lf_handle_mode_changes().",
+                  "mode_state_variable_reset_data_t _lf_modal_state_reset["
+                      + modalStateResetCount
+                      + "];",
+                  "int _lf_modal_state_reset_size = " + modalStateResetCount + ";")
+              : ""));
     }
+    return "";
+  }
 
-    /**
-     * Generate counter variable declarations used for registering modal reactors.
-     *
-     * @param hasModalReactors True if there is modal model reactors, false otherwise
-     */
-    public static String generateModalInitalizationCounters(boolean hasModalReactors) {
-        if (hasModalReactors) {
-            return String.join("\n",
-                "int _lf_modal_reactor_states_count = 0;",
-                "int _lf_modal_state_reset_count = 0;"
-            );
-        }
-        return "";
+  /**
+   * Generate counter variable declarations used for registering modal reactors.
+   *
+   * @param hasModalReactors True if there is modal model reactors, false otherwise
+   */
+  public static String generateModalInitalizationCounters(boolean hasModalReactors) {
+    if (hasModalReactors) {
+      return String.join(
+          "\n", "int _lf_modal_reactor_states_count = 0;", "int _lf_modal_state_reset_count = 0;");
     }
+    return "";
+  }
 
-    /**
-     * Generate code for modal reactor registration and hierarchy.
-     *
-     * @param instance The reactor instance.
-     * @param code The code builder.
-     */
-    public static void generateModeStructure(ReactorInstance instance, CodeBuilder code) {
-        var parentMode = instance.getMode(false);
-        var nameOfSelfStruct = CUtil.reactorRef(instance);
-        // If this instance is enclosed in another mode
-        if (parentMode != null) {
-            var parentModeRef = "&"+CUtil.reactorRef(parentMode.getParent())+"->_lf__modes["+parentMode.getParent().modes.indexOf(parentMode)+"]";
-            code.pr("// Setup relation to enclosing mode");
+  /**
+   * Generate code for modal reactor registration and hierarchy.
+   *
+   * @param instance The reactor instance.
+   * @param code The code builder.
+   */
+  public static void generateModeStructure(ReactorInstance instance, CodeBuilder code) {
+    var parentMode = instance.getMode(false);
+    var nameOfSelfStruct = CUtil.reactorRef(instance);
+    // If this instance is enclosed in another mode
+    if (parentMode != null) {
+      var parentModeRef =
+          "&"
+              + CUtil.reactorRef(parentMode.getParent())
+              + "->_lf__modes["
+              + parentMode.getParent().modes.indexOf(parentMode)
+              + "]";
+      code.pr("// Setup relation to enclosing mode");
 
-            // If this reactor does not have its own modes, all reactions must be linked to enclosing mode
-            if (instance.modes.isEmpty()) {
-                int i = 0;
-                for (ReactionInstance reaction : instance.reactions) {
-                    code.pr(CUtil.reactorRef(reaction.getParent())+"->_lf__reaction_"+i+".mode = "+parentModeRef+";");
-                    i++;
-                }
-            } else { // Otherwise, only reactions outside modes must be linked and the mode state itself gets a parent relation
-                code.pr("((self_base_t*)"+nameOfSelfStruct+")->_lf__mode_state.parent_mode = "+parentModeRef+";");
-                for (var reaction : (Iterable<ReactionInstance>) instance.reactions.stream().filter(it -> it.getMode(true) == null)::iterator) {
-                    code.pr(CUtil.reactorRef(reaction.getParent())+"->_lf__reaction_"+instance.reactions.indexOf(reaction)+".mode = "+parentModeRef+";");
-                }
-            }
+      // If this reactor does not have its own modes, all reactions must be linked to enclosing mode
+      if (instance.modes.isEmpty()) {
+        int i = 0;
+        for (ReactionInstance reaction : instance.reactions) {
+          code.pr(
+              CUtil.reactorRef(reaction.getParent())
+                  + "->_lf__reaction_"
+                  + i
+                  + ".mode = "
+                  + parentModeRef
+                  + ";");
+          i++;
         }
-        // If this reactor has modes, register for mode change handling
-        if (!instance.modes.isEmpty()) {
-            code.pr("// Register for transition handling");
-            code.pr("_lf_modal_reactor_states[_lf_modal_reactor_states_count++] = &((self_base_t*)"+nameOfSelfStruct+")->_lf__mode_state;");
+      } else { // Otherwise, only reactions outside modes must be linked and the mode state itself
+        // gets a parent relation
+        code.pr(
+            "((self_base_t*)"
+                + nameOfSelfStruct
+                + ")->_lf__mode_state.parent_mode = "
+                + parentModeRef
+                + ";");
+        for (var reaction :
+            (Iterable<ReactionInstance>)
+                instance.reactions.stream().filter(it -> it.getMode(true) == null)::iterator) {
+          code.pr(
+              CUtil.reactorRef(reaction.getParent())
+                  + "->_lf__reaction_"
+                  + instance.reactions.indexOf(reaction)
+                  + ".mode = "
+                  + parentModeRef
+                  + ";");
         }
+      }
     }
+    // If this reactor has modes, register for mode change handling
+    if (!instance.modes.isEmpty()) {
+      code.pr("// Register for transition handling");
+      code.pr(
+          "_lf_modal_reactor_states[_lf_modal_reactor_states_count++] = &((self_base_t*)"
+              + nameOfSelfStruct
+              + ")->_lf__mode_state;");
+    }
+  }
 
-    /**
-     * Generate code registering a state variable for automatic reset.
-     *
-     * @param modeRef The code to refer to the mode
-     * @param selfRef The code to refer to the self struct
-     * @param varName The variable name in the self struct
-     * @param source The variable that stores the initial value
-     * @param type The size of the initial value
-     */
-    public static String generateStateResetStructure(
-            String modeRef,
-            String selfRef,
-            String varName,
-            String source,
-            String type
-        ) {
-            return String.join("\n",
-                "// Register for automatic reset",
-                "_lf_modal_state_reset[_lf_modal_state_reset_count].mode = "+modeRef+";",
-                "_lf_modal_state_reset[_lf_modal_state_reset_count].target = &("+selfRef+"->"+varName+");",
-                "_lf_modal_state_reset[_lf_modal_state_reset_count].source = &"+source+";",
-                "_lf_modal_state_reset[_lf_modal_state_reset_count].size = sizeof("+type+");",
-                "_lf_modal_state_reset_count++;"
-            );
-        }
+  /**
+   * Generate code registering a state variable for automatic reset.
+   *
+   * @param modeRef The code to refer to the mode
+   * @param selfRef The code to refer to the self struct
+   * @param varName The variable name in the self struct
+   * @param source The variable that stores the initial value
+   * @param type The size of the initial value
+   */
+  public static String generateStateResetStructure(
+      String modeRef, String selfRef, String varName, String source, String type) {
+    return String.join(
+        "\n",
+        "// Register for automatic reset",
+        "_lf_modal_state_reset[_lf_modal_state_reset_count].mode = " + modeRef + ";",
+        "_lf_modal_state_reset[_lf_modal_state_reset_count].target = &("
+            + selfRef
+            + "->"
+            + varName
+            + ");",
+        "_lf_modal_state_reset[_lf_modal_state_reset_count].source = &" + source + ";",
+        "_lf_modal_state_reset[_lf_modal_state_reset_count].size = sizeof(" + type + ");",
+        "_lf_modal_state_reset_count++;");
+  }
 
-    /**
-     * Generate code to call {@code _lf_process_mode_changes}.
-     *
-     * @param hasModalReactors True if there is modal model reactors, false otherwise
-     * @param modalStateResetCount The number of modal model state resets
-     */
-    public static String generateLfHandleModeChanges(
-        boolean hasModalReactors,
-        int modalStateResetCount
-    ) {
-        if (!hasModalReactors) {
-            return "";
-        }
-        return String.join("\n",
-            "void _lf_handle_mode_changes() {",
-            "    _lf_process_mode_changes(",
-            "        _lf_modal_reactor_states, ",
-            "        _lf_modal_reactor_states_size, ",
-            "        " + (modalStateResetCount > 0 ? "_lf_modal_state_reset" : "NULL") + ", ",
-            "        " + (modalStateResetCount > 0 ? "_lf_modal_state_reset_size" : "0") + ", ",
-            "        _lf_timer_triggers, ",
-            "        _lf_timer_triggers_size",
-            "    );",
-            "}"
-        );
+  /**
+   * Generate code to call {@code _lf_process_mode_changes}.
+   *
+   * @param hasModalReactors True if there is modal model reactors, false otherwise
+   * @param modalStateResetCount The number of modal model state resets
+   */
+  public static String generateLfHandleModeChanges(
+      boolean hasModalReactors, int modalStateResetCount) {
+    if (!hasModalReactors) {
+      return "";
     }
+    return String.join(
+        "\n",
+        "void _lf_handle_mode_changes() {",
+        "    _lf_process_mode_changes(",
+        "        _lf_modal_reactor_states, ",
+        "        _lf_modal_reactor_states_size, ",
+        "        " + (modalStateResetCount > 0 ? "_lf_modal_state_reset" : "NULL") + ", ",
+        "        " + (modalStateResetCount > 0 ? "_lf_modal_state_reset_size" : "0") + ", ",
+        "        _lf_timer_triggers, ",
+        "        _lf_timer_triggers_size",
+        "    );",
+        "}");
+  }
 
-    /**
-     * Generate code to call {@code _lf_initialize_modes}.
-     *
-     * @param hasModalReactors True if there is modal model reactors, false otherwise
-     */
-    public static String generateLfInitializeModes(boolean hasModalReactors) {
-        if (!hasModalReactors) {
-            return "";
-        }
-        return String.join("\n",
-            "void _lf_initialize_modes() {",
-            "    _lf_initialize_mode_states(",
-            "        _lf_modal_reactor_states, ",
-            "        _lf_modal_reactor_states_size);",
-            "}"
-        );
+  /**
+   * Generate code to call {@code _lf_initialize_modes}.
+   *
+   * @param hasModalReactors True if there is modal model reactors, false otherwise
+   */
+  public static String generateLfInitializeModes(boolean hasModalReactors) {
+    if (!hasModalReactors) {
+      return "";
     }
+    return String.join(
+        "\n",
+        "void _lf_initialize_modes() {",
+        "    _lf_initialize_mode_states(",
+        "        _lf_modal_reactor_states, ",
+        "        _lf_modal_reactor_states_size);",
+        "}");
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CParameterGenerator.java b/org.lflang/src/org/lflang/generator/c/CParameterGenerator.java
index 786b4701de..caaa375056 100644
--- a/org.lflang/src/org/lflang/generator/c/CParameterGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CParameterGenerator.java
@@ -1,8 +1,8 @@
 package org.lflang.generator.c;
 
-import org.lflang.generator.ParameterInstance;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
+import org.lflang.generator.ParameterInstance;
 import org.lflang.lf.Initializer;
 import org.lflang.lf.Parameter;
 
@@ -14,34 +14,39 @@
  * @author Hou Seng Wong
  */
 public class CParameterGenerator {
-    /**
-     * Return a C expression that can be used to initialize the specified
-     * parameter instance. If the parameter initializer refers to other
-     * parameters, then those parameter references are replaced with
-     * accesses to the self struct of the parents of those parameters.
-     */
-    public static String getInitializer(ParameterInstance p) {
-        // Handle the bank_index parameter.
-        if (p.getName().equals("bank_index")) {
-            return CUtil.bankIndex(p.getParent());
-        }
-
-        CTypes ctypes = CTypes.generateParametersIn(p.getParent().getParent());
-        Initializer values = p.getActualValue();
-        return ctypes.getTargetInitializer(values, p.getDefinition().getType());
+  /**
+   * Return a C expression that can be used to initialize the specified parameter instance. If the
+   * parameter initializer refers to other parameters, then those parameter references are replaced
+   * with accesses to the self struct of the parents of those parameters.
+   */
+  public static String getInitializer(ParameterInstance p) {
+    // Handle the bank_index parameter.
+    if (p.getName().equals("bank_index")) {
+      return CUtil.bankIndex(p.getParent());
     }
 
-    /**
-     * Generate code for parameters variables of a reactor in the form "parameter.type parameter.name;"
-     * @param reactor {@link TypeParameterizedReactor}
-     * @param types A helper class for types
-     */
-    public static String generateDeclarations(TypeParameterizedReactor reactor, CTypes types) {
-        CodeBuilder code = new CodeBuilder();
-        for (Parameter parameter : ASTUtils.allParameters(reactor.reactor())) {
-            code.prSourceLineNumber(parameter);
-            code.pr(types.getTargetType(reactor.resolveType(ASTUtils.getInferredType(parameter))) + " " + parameter.getName() + ";");
-        }
-        return code.toString();
+    CTypes ctypes = CTypes.generateParametersIn(p.getParent().getParent());
+    Initializer values = p.getActualValue();
+    return ctypes.getTargetInitializer(values, p.getDefinition().getType());
+  }
+
+  /**
+   * Generate code for parameters variables of a reactor in the form "parameter.type
+   * parameter.name;"
+   *
+   * @param reactor {@link TypeParameterizedReactor}
+   * @param types A helper class for types
+   */
+  public static String generateDeclarations(TypeParameterizedReactor reactor, CTypes types) {
+    CodeBuilder code = new CodeBuilder();
+    for (Parameter parameter : ASTUtils.allParameters(reactor.reactor())) {
+      code.prSourceLineNumber(parameter);
+      code.pr(
+          types.getTargetType(reactor.resolveType(ASTUtils.getInferredType(parameter)))
+              + " "
+              + parameter.getName()
+              + ";");
     }
+    return code.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CPortGenerator.java b/org.lflang/src/org/lflang/generator/c/CPortGenerator.java
index f82bad661c..02697f4a85 100644
--- a/org.lflang/src/org/lflang/generator/c/CPortGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CPortGenerator.java
@@ -1,9 +1,11 @@
 package org.lflang.generator.c;
 
-import org.lflang.ast.ASTUtils;
+import static org.lflang.generator.c.CGenerator.variableStructType;
+
 import org.lflang.AttributeUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.Target;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.PortInstance;
 import org.lflang.lf.Input;
@@ -11,9 +13,6 @@
 import org.lflang.lf.Port;
 import org.lflang.lf.ReactorDecl;
 
-import static org.lflang.generator.c.CGenerator.variableStructType;
-
-
 /**
  * Generates C code to declare and initialize ports.
  *
@@ -22,256 +21,267 @@
  * @author Hou Seng Wong
  */
 public class CPortGenerator {
-    /**
-     * Generate fields in the self struct for input and output ports
-     */
-    public static void generateDeclarations(
-        TypeParameterizedReactor tpr,
-        ReactorDecl decl,
-        CodeBuilder body,
-        CodeBuilder constructorCode
-    ) {
-        generateInputDeclarations(tpr, body, constructorCode);
-        generateOutputDeclarations(tpr, body, constructorCode);
-    }
+  /** Generate fields in the self struct for input and output ports */
+  public static void generateDeclarations(
+      TypeParameterizedReactor tpr,
+      ReactorDecl decl,
+      CodeBuilder body,
+      CodeBuilder constructorCode) {
+    generateInputDeclarations(tpr, body, constructorCode);
+    generateOutputDeclarations(tpr, body, constructorCode);
+  }
 
-    /**
-     * Generate the struct type definitions for the port of the
-     * reactor
-     *
-     * @param port The port to generate the struct
-     * @param target The target of the code generation (C, CCpp or Python)
-     * @param errorReporter The error reporter
-     * @param types The helper object for types related stuff
-     * @param federatedExtension The code needed to support federated execution
-     * @param userFacing Whether this struct is to be presented in a user-facing header
-     * @param decl The reactorDecl if this struct is for the header of this reactor's container;
-     * null otherwise
-     * @return The auxiliary struct for the port as a string
-     */
-    public static String generateAuxiliaryStruct(
-        TypeParameterizedReactor tpr,
-        Port port,
-        Target target,
-        ErrorReporter errorReporter,
-        CTypes types,
-        CodeBuilder federatedExtension,
-        boolean userFacing,
-        ReactorDecl decl
-    ) {
-        assert decl == null || userFacing;
-        var code = new CodeBuilder();
-        code.pr("typedef struct {");
-        code.indent();
-        // NOTE: The following fields are required to be the first ones so that
-        // pointer to this struct can be cast to a (lf_port_base_t*) or to
-        // (token_template_t*) to access these fields for any port.
-        // IMPORTANT: These must match exactly the fields defined in port.h!!
-        code.pr(String.join("\n",
-                "token_type_t type;",  // From token_template_t
-                "lf_token_t* token;",  // From token_template_t
-                "size_t length;",      // From token_template_t
-                "bool is_present;",    // From lf_port_base_t
-                "lf_sparse_io_record_t* sparse_record;",  // From lf_port_base_t
-                "int destination_channel;",  // From lf_port_base_t
-                "int num_destinations;"      // From lf_port_base_t
-        ));
-        code.pr(valueDeclaration(tpr, port, target, errorReporter, types));
-        code.pr(federatedExtension.toString());
-        code.unindent();
-        var name = decl != null ? localPortName(decl, port.getName())
+  /**
+   * Generate the struct type definitions for the port of the reactor
+   *
+   * @param port The port to generate the struct
+   * @param target The target of the code generation (C, CCpp or Python)
+   * @param errorReporter The error reporter
+   * @param types The helper object for types related stuff
+   * @param federatedExtension The code needed to support federated execution
+   * @param userFacing Whether this struct is to be presented in a user-facing header
+   * @param decl The reactorDecl if this struct is for the header of this reactor's container; null
+   *     otherwise
+   * @return The auxiliary struct for the port as a string
+   */
+  public static String generateAuxiliaryStruct(
+      TypeParameterizedReactor tpr,
+      Port port,
+      Target target,
+      ErrorReporter errorReporter,
+      CTypes types,
+      CodeBuilder federatedExtension,
+      boolean userFacing,
+      ReactorDecl decl) {
+    assert decl == null || userFacing;
+    var code = new CodeBuilder();
+    code.pr("typedef struct {");
+    code.indent();
+    // NOTE: The following fields are required to be the first ones so that
+    // pointer to this struct can be cast to a (lf_port_base_t*) or to
+    // (token_template_t*) to access these fields for any port.
+    // IMPORTANT: These must match exactly the fields defined in port.h!!
+    code.pr(
+        String.join(
+            "\n",
+            "token_type_t type;", // From token_template_t
+            "lf_token_t* token;", // From token_template_t
+            "size_t length;", // From token_template_t
+            "bool is_present;", // From lf_port_base_t
+            "lf_sparse_io_record_t* sparse_record;", // From lf_port_base_t
+            "int destination_channel;", // From lf_port_base_t
+            "int num_destinations;" // From lf_port_base_t
+            ));
+    code.pr(valueDeclaration(tpr, port, target, errorReporter, types));
+    code.pr(federatedExtension.toString());
+    code.unindent();
+    var name =
+        decl != null
+            ? localPortName(decl, port.getName())
             : variableStructType(port, tpr, userFacing);
-        code.pr("} " + name + ";");
-        return code.toString();
-    }
+    code.pr("} " + name + ";");
+    return code.toString();
+  }
 
-    public static String localPortName(ReactorDecl decl, String portName) {
-        return decl.getName().toLowerCase() + "_" + portName + "_t";
-    }
+  public static String localPortName(ReactorDecl decl, String portName) {
+    return decl.getName().toLowerCase() + "_" + portName + "_t";
+  }
 
-    /**
-     * Allocate memory for the input port.
-     * @param input The input port
-     * @param reactorSelfStruct The name of the self struct
-     */
-    public static String initializeInputMultiport(
-        PortInstance input,
-        String reactorSelfStruct
-    ) {
-        var portRefName = CUtil.portRefName(input);
-        // If the port is a multiport, create an array.
-        if (input.isMultiport()) {
-            String result = String.join("\n",
-                portRefName+"_width = "+input.getWidth()+";",
-                "// Allocate memory for multiport inputs.",
-                portRefName+" = ("+variableStructType(input)+"**)_lf_allocate(",
-                "        "+input.getWidth()+", sizeof("+variableStructType(input)+"*),",
-                "        &"+reactorSelfStruct+"->base.allocations); ",
-                "// Set inputs by default to an always absent default input.",
-                "for (int i = 0; i < "+input.getWidth()+"; i++) {",
-                "    "+portRefName+"[i] = &"+reactorSelfStruct+"->_lf_default__"+input.getName()+";",
-                "}"
-            );
-            if (AttributeUtils.isSparse(input.getDefinition())) {
-                return String.join("\n", result,
-                    "if ("+input.getWidth()+" >= LF_SPARSE_WIDTH_THRESHOLD) {",
-                    "    "+portRefName+"__sparse = (lf_sparse_io_record_t*)_lf_allocate(1,",
-                    "            sizeof(lf_sparse_io_record_t) + sizeof(size_t) * "+input.getWidth()+"/LF_SPARSE_CAPACITY_DIVIDER,",
-                    "            &"+reactorSelfStruct+"->base.allocations);",
-                    "    "+portRefName+"__sparse->capacity = "+input.getWidth()+"/LF_SPARSE_CAPACITY_DIVIDER;",
-                    "    if (_lf_sparse_io_record_sizes.start == NULL) {",
-                    "        _lf_sparse_io_record_sizes = vector_new(1);",
-                    "    }",
-                    "    vector_push(&_lf_sparse_io_record_sizes, (void*)&"+portRefName+"__sparse->size);",
-                    "}"
-                );
-            }
-            return result;
-        } else {
-            return String.join("\n",
-                "// width of -2 indicates that it is not a multiport.",
-                portRefName+"_width = -2;"
-            );
-        }
+  /**
+   * Allocate memory for the input port.
+   *
+   * @param input The input port
+   * @param reactorSelfStruct The name of the self struct
+   */
+  public static String initializeInputMultiport(PortInstance input, String reactorSelfStruct) {
+    var portRefName = CUtil.portRefName(input);
+    // If the port is a multiport, create an array.
+    if (input.isMultiport()) {
+      String result =
+          String.join(
+              "\n",
+              portRefName + "_width = " + input.getWidth() + ";",
+              "// Allocate memory for multiport inputs.",
+              portRefName + " = (" + variableStructType(input) + "**)_lf_allocate(",
+              "        " + input.getWidth() + ", sizeof(" + variableStructType(input) + "*),",
+              "        &" + reactorSelfStruct + "->base.allocations); ",
+              "// Set inputs by default to an always absent default input.",
+              "for (int i = 0; i < " + input.getWidth() + "; i++) {",
+              "    "
+                  + portRefName
+                  + "[i] = &"
+                  + reactorSelfStruct
+                  + "->_lf_default__"
+                  + input.getName()
+                  + ";",
+              "}");
+      if (AttributeUtils.isSparse(input.getDefinition())) {
+        return String.join(
+            "\n",
+            result,
+            "if (" + input.getWidth() + " >= LF_SPARSE_WIDTH_THRESHOLD) {",
+            "    " + portRefName + "__sparse = (lf_sparse_io_record_t*)_lf_allocate(1,",
+            "            sizeof(lf_sparse_io_record_t) + sizeof(size_t) * "
+                + input.getWidth()
+                + "/LF_SPARSE_CAPACITY_DIVIDER,",
+            "            &" + reactorSelfStruct + "->base.allocations);",
+            "    "
+                + portRefName
+                + "__sparse->capacity = "
+                + input.getWidth()
+                + "/LF_SPARSE_CAPACITY_DIVIDER;",
+            "    if (_lf_sparse_io_record_sizes.start == NULL) {",
+            "        _lf_sparse_io_record_sizes = vector_new(1);",
+            "    }",
+            "    vector_push(&_lf_sparse_io_record_sizes, (void*)&"
+                + portRefName
+                + "__sparse->size);",
+            "}");
+      }
+      return result;
+    } else {
+      return String.join(
+          "\n",
+          "// width of -2 indicates that it is not a multiport.",
+          portRefName + "_width = -2;");
     }
+  }
 
-    /**
-     * Allocate memory for the output port.
-     * @param output The output port
-     * @param reactorSelfStruct The name of the self struct
-     */
-    public static String initializeOutputMultiport(
-        PortInstance output,
-        String reactorSelfStruct
-    ) {
-        var portRefName = CUtil.portRefName(output);
-        var portStructType = variableStructType(output);
-        return output.isMultiport() ?
-                String.join("\n",
-                    portRefName+"_width = "+output.getWidth()+";",
-                    "// Allocate memory for multiport output.",
-                    portRefName+" = ("+portStructType+"*)_lf_allocate(",
-                    "        "+output.getWidth()+", sizeof("+portStructType+"),",
-                    "        &"+reactorSelfStruct+"->base.allocations); ",
-                    portRefName+"_pointers = ("+portStructType+"**)_lf_allocate(",
-                    "        "+output.getWidth()+", sizeof("+portStructType+"*),",
-                    "        &"+reactorSelfStruct+"->base.allocations); ",
-                    "// Assign each output port pointer to be used in",
-                    "// reactions to facilitate user access to output ports",
-                    "for(int i=0; i < "+output.getWidth()+"; i++) {",
-                    "        "+portRefName+"_pointers[i] = &("+portRefName+"[i]);",
-                    "}"
-                ) :
-                String.join("\n",
-                    "// width of -2 indicates that it is not a multiport.",
-                    portRefName+"_width = -2;"
-                );
-    }
+  /**
+   * Allocate memory for the output port.
+   *
+   * @param output The output port
+   * @param reactorSelfStruct The name of the self struct
+   */
+  public static String initializeOutputMultiport(PortInstance output, String reactorSelfStruct) {
+    var portRefName = CUtil.portRefName(output);
+    var portStructType = variableStructType(output);
+    return output.isMultiport()
+        ? String.join(
+            "\n",
+            portRefName + "_width = " + output.getWidth() + ";",
+            "// Allocate memory for multiport output.",
+            portRefName + " = (" + portStructType + "*)_lf_allocate(",
+            "        " + output.getWidth() + ", sizeof(" + portStructType + "),",
+            "        &" + reactorSelfStruct + "->base.allocations); ",
+            portRefName + "_pointers = (" + portStructType + "**)_lf_allocate(",
+            "        " + output.getWidth() + ", sizeof(" + portStructType + "*),",
+            "        &" + reactorSelfStruct + "->base.allocations); ",
+            "// Assign each output port pointer to be used in",
+            "// reactions to facilitate user access to output ports",
+            "for(int i=0; i < " + output.getWidth() + "; i++) {",
+            "        " + portRefName + "_pointers[i] = &(" + portRefName + "[i]);",
+            "}")
+        : String.join(
+            "\n",
+            "// width of -2 indicates that it is not a multiport.",
+            portRefName + "_width = -2;");
+  }
 
-    /**
-     * For the specified port, return a declaration for port struct to
-     * contain the value of the port. A multiport output with width 4 and
-     * type int[10], for example, will result in this:
-     * <pre><code>
-     *     int value[10];
-     * </code></pre>
-     * There will be an array of size 4 of structs, each containing this value
-     * array.
-     * @param port The port.
-     * @return A string providing the value field of the port struct.
-     */
-    private static String valueDeclaration(
-        TypeParameterizedReactor tpr,
-        Port port,
-        Target target,
-        ErrorReporter errorReporter,
-        CTypes types
-    ) {
-        if (port.getType() == null && target.requiresTypes) {
-            // This should have been caught by the validator.
-            errorReporter.reportError(port, "Port is required to have a type: " + port.getName());
-            return "";
-        }
-        // Do not convert to lf_token_t* using lfTypeToTokenType because there
-        // will be a separate field pointing to the token.
-        return types.getVariableDeclaration(tpr, ASTUtils.getInferredType(port), "value", false) + ";";
+  /**
+   * For the specified port, return a declaration for port struct to contain the value of the port.
+   * A multiport output with width 4 and type int[10], for example, will result in this:
+   *
+   * <pre><code>
+   *     int value[10];
+   * </code></pre>
+   *
+   * There will be an array of size 4 of structs, each containing this value array.
+   *
+   * @param port The port.
+   * @return A string providing the value field of the port struct.
+   */
+  private static String valueDeclaration(
+      TypeParameterizedReactor tpr,
+      Port port,
+      Target target,
+      ErrorReporter errorReporter,
+      CTypes types) {
+    if (port.getType() == null && target.requiresTypes) {
+      // This should have been caught by the validator.
+      errorReporter.reportError(port, "Port is required to have a type: " + port.getName());
+      return "";
     }
+    // Do not convert to lf_token_t* using lfTypeToTokenType because there
+    // will be a separate field pointing to the token.
+    return types.getVariableDeclaration(tpr, ASTUtils.getInferredType(port), "value", false) + ";";
+  }
 
-    /**
-     * Generate fields in the self struct for input ports
-     *
-     * If the port is a multiport, the input field is an array of
-     * pointers that will be allocated separately for each instance
-     * because the sizes may be different. Otherwise, it is a simple
-     * pointer.
-     *
-     */
-    private static void generateInputDeclarations(
-        TypeParameterizedReactor tpr,
-        CodeBuilder body,
-        CodeBuilder constructorCode
-    ) {
-        for (Input input : ASTUtils.allInputs(tpr.reactor())) {
-            var inputName = input.getName();
-            if (ASTUtils.isMultiport(input)) {
-                body.pr(input, String.join("\n",
-                    "// Multiport input array will be malloc'd later.",
-                    variableStructType(input, tpr, false)+"** _lf_"+inputName+";",
-                    "int _lf_"+inputName+"_width;",
-                    "// Default input (in case it does not get connected)",
-                    variableStructType(input, tpr, false)+" _lf_default__"+inputName+";",
-                    "// Struct to support efficiently reading sparse inputs.",
-                    "lf_sparse_io_record_t* _lf_"+inputName+"__sparse;"
-                ));
-            } else {
-                // input is not a multiport.
-                body.pr(input, String.join("\n",
-                    variableStructType(input, tpr, false)+"* _lf_"+inputName+";",
-                    "// width of -2 indicates that it is not a multiport.",
-                    "int _lf_"+inputName+"_width;",
-                    "// Default input (in case it does not get connected)",
-                    variableStructType(input, tpr, false)+" _lf_default__"+inputName+";"
-                ));
+  /**
+   * Generate fields in the self struct for input ports
+   *
+   * <p>If the port is a multiport, the input field is an array of pointers that will be allocated
+   * separately for each instance because the sizes may be different. Otherwise, it is a simple
+   * pointer.
+   */
+  private static void generateInputDeclarations(
+      TypeParameterizedReactor tpr, CodeBuilder body, CodeBuilder constructorCode) {
+    for (Input input : ASTUtils.allInputs(tpr.reactor())) {
+      var inputName = input.getName();
+      if (ASTUtils.isMultiport(input)) {
+        body.pr(
+            input,
+            String.join(
+                "\n",
+                "// Multiport input array will be malloc'd later.",
+                variableStructType(input, tpr, false) + "** _lf_" + inputName + ";",
+                "int _lf_" + inputName + "_width;",
+                "// Default input (in case it does not get connected)",
+                variableStructType(input, tpr, false) + " _lf_default__" + inputName + ";",
+                "// Struct to support efficiently reading sparse inputs.",
+                "lf_sparse_io_record_t* _lf_" + inputName + "__sparse;"));
+      } else {
+        // input is not a multiport.
+        body.pr(
+            input,
+            String.join(
+                "\n",
+                variableStructType(input, tpr, false) + "* _lf_" + inputName + ";",
+                "// width of -2 indicates that it is not a multiport.",
+                "int _lf_" + inputName + "_width;",
+                "// Default input (in case it does not get connected)",
+                variableStructType(input, tpr, false) + " _lf_default__" + inputName + ";"));
 
-                constructorCode.pr(input, String.join("\n",
-                    "// Set input by default to an always absent default input.",
-                    "self->_lf_"+inputName+" = &self->_lf_default__"+inputName+";"
-                ));
-            }
-        }
+        constructorCode.pr(
+            input,
+            String.join(
+                "\n",
+                "// Set input by default to an always absent default input.",
+                "self->_lf_" + inputName + " = &self->_lf_default__" + inputName + ";"));
+      }
     }
+  }
 
-    /**
-     * Generate fields in the self struct for output ports
-     */
-    private static void generateOutputDeclarations(
-        TypeParameterizedReactor tpr,
-        CodeBuilder body,
-        CodeBuilder constructorCode
-    ) {
-        for (Output output : ASTUtils.allOutputs(tpr.reactor())) {
-            // If the port is a multiport, create an array to be allocated
-            // at instantiation.
-            var outputName = output.getName();
-            if (ASTUtils.isMultiport(output)) {
-                body.pr(output, String.join("\n",
-                    "// Array of output ports.",
-                    variableStructType(output, tpr, false)+"* _lf_"+outputName+";",
-                    "int _lf_"+outputName+"_width;",
-                    "// An array of pointers to the individual ports. Useful",
-                    "// for the lf_set macros to work out-of-the-box for",
-                    "// multiports in the body of reactions because their ",
-                    "// value can be accessed via a -> operator (e.g.,foo[i]->value).",
-                    "// So we have to handle multiports specially here a construct that",
-                    "// array of pointers.",
-                    variableStructType(output, tpr, false)+"** _lf_"+outputName+"_pointers;"
-                ));
-            } else {
-                body.pr(output, String.join("\n",
-                    variableStructType(output, tpr, false)+" _lf_"+outputName+";",
-                    "int _lf_"+outputName+"_width;"
-                ));
-            }
-        }
+  /** Generate fields in the self struct for output ports */
+  private static void generateOutputDeclarations(
+      TypeParameterizedReactor tpr, CodeBuilder body, CodeBuilder constructorCode) {
+    for (Output output : ASTUtils.allOutputs(tpr.reactor())) {
+      // If the port is a multiport, create an array to be allocated
+      // at instantiation.
+      var outputName = output.getName();
+      if (ASTUtils.isMultiport(output)) {
+        body.pr(
+            output,
+            String.join(
+                "\n",
+                "// Array of output ports.",
+                variableStructType(output, tpr, false) + "* _lf_" + outputName + ";",
+                "int _lf_" + outputName + "_width;",
+                "// An array of pointers to the individual ports. Useful",
+                "// for the lf_set macros to work out-of-the-box for",
+                "// multiports in the body of reactions because their ",
+                "// value can be accessed via a -> operator (e.g.,foo[i]->value).",
+                "// So we have to handle multiports specially here a construct that",
+                "// array of pointers.",
+                variableStructType(output, tpr, false) + "** _lf_" + outputName + "_pointers;"));
+      } else {
+        body.pr(
+            output,
+            String.join(
+                "\n",
+                variableStructType(output, tpr, false) + " _lf_" + outputName + ";",
+                "int _lf_" + outputName + "_width;"));
+      }
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CPreambleGenerator.java b/org.lflang/src/org/lflang/generator/c/CPreambleGenerator.java
index 8ca0404d75..45b81caab6 100644
--- a/org.lflang/src/org/lflang/generator/c/CPreambleGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CPreambleGenerator.java
@@ -1,18 +1,16 @@
 package org.lflang.generator.c;
 
-import java.nio.file.Path;
+import static org.lflang.util.StringUtil.addDoubleQuotes;
 
+import java.nio.file.Path;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty.Platform;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.util.StringUtil;
 
-import static org.lflang.util.StringUtil.addDoubleQuotes;
-
 /**
- * Generates code for preambles for the C and CCpp target.
- * This includes #include and #define directives at the top
- * of each generated ".c" file.
+ * Generates code for preambles for the C and CCpp target. This includes #include and #define
+ * directives at the top of each generated ".c" file.
  *
  * @author Edward A. Lee
  * @author Marten Lohstroh
@@ -26,76 +24,69 @@
  * @author Anirudh Rengarajan
  */
 public class CPreambleGenerator {
-    /** Add necessary source files specific to the target language.  */
-    public static String generateIncludeStatements(
-        TargetConfig targetConfig,
-        boolean cppMode
-    ) {
-        var tracing = targetConfig.tracing;
-        CodeBuilder code = new CodeBuilder();
-        if (cppMode || targetConfig.platformOptions.platform == Platform.ARDUINO) {
-            code.pr("extern \"C\" {");
-        }
-        code.pr("#include <limits.h>");
-        code.pr("#include \"include/core/platform.h\"");
-        CCoreFilesUtils.getCTargetHeader().forEach(
-            it -> code.pr("#include " + StringUtil.addDoubleQuotes(it))
-        );
-        code.pr("#include \"include/core/reactor.h\"");
-        code.pr("#include \"include/core/reactor_common.h\"");
-        if (targetConfig.threading) {
-            code.pr("#include \"include/core/threaded/scheduler.h\"");
-        }
+  /** Add necessary source files specific to the target language. */
+  public static String generateIncludeStatements(TargetConfig targetConfig, boolean cppMode) {
+    var tracing = targetConfig.tracing;
+    CodeBuilder code = new CodeBuilder();
+    if (cppMode || targetConfig.platformOptions.platform == Platform.ARDUINO) {
+      code.pr("extern \"C\" {");
+    }
+    code.pr("#include <limits.h>");
+    code.pr("#include \"include/core/platform.h\"");
+    CCoreFilesUtils.getCTargetHeader()
+        .forEach(it -> code.pr("#include " + StringUtil.addDoubleQuotes(it)));
+    code.pr("#include \"include/core/reactor.h\"");
+    code.pr("#include \"include/core/reactor_common.h\"");
+    if (targetConfig.threading) {
+      code.pr("#include \"include/core/threaded/scheduler.h\"");
+    }
 
-        if (tracing != null) {
-            code.pr("#include \"include/core/trace.h\"");
-        }
-        code.pr("#include \"include/core/mixed_radix.h\"");
-        code.pr("#include \"include/core/port.h\"");
-        code.pr("int lf_reactor_c_main(int argc, const char* argv[]);");
-        if(targetConfig.fedSetupPreamble != null) {
-            code.pr("#include \"include/core/federated/federate.h\"");
-            code.pr("#include \"include/core/federated/net_common.h\"");
-        }
-        if (cppMode || targetConfig.platformOptions.platform == Platform.ARDUINO) {
-            code.pr("}");
-        }
-        return code.toString();
+    if (tracing != null) {
+      code.pr("#include \"include/core/trace.h\"");
+    }
+    code.pr("#include \"include/core/mixed_radix.h\"");
+    code.pr("#include \"include/core/port.h\"");
+    code.pr("int lf_reactor_c_main(int argc, const char* argv[]);");
+    if (targetConfig.fedSetupPreamble != null) {
+      code.pr("#include \"include/core/federated/federate.h\"");
+      code.pr("#include \"include/core/federated/net_common.h\"");
+    }
+    if (cppMode || targetConfig.platformOptions.platform == Platform.ARDUINO) {
+      code.pr("}");
     }
+    return code.toString();
+  }
 
-    public static String generateDefineDirectives(
-        TargetConfig targetConfig,
-        Path srcGenPath,
-        boolean hasModalReactors
-    ) {
-        int logLevel = targetConfig.logLevel.ordinal();
-        var coordinationType = targetConfig.coordination;
-        var tracing = targetConfig.tracing;
-        CodeBuilder code = new CodeBuilder();
-        // TODO: Get rid of all of these
-        code.pr("#define LOG_LEVEL " + logLevel);
-        code.pr("#define TARGET_FILES_DIRECTORY " + addDoubleQuotes(srcGenPath.toString()));
+  public static String generateDefineDirectives(
+      TargetConfig targetConfig, Path srcGenPath, boolean hasModalReactors) {
+    int logLevel = targetConfig.logLevel.ordinal();
+    var coordinationType = targetConfig.coordination;
+    var tracing = targetConfig.tracing;
+    CodeBuilder code = new CodeBuilder();
+    // TODO: Get rid of all of these
+    code.pr("#define LOG_LEVEL " + logLevel);
+    code.pr("#define TARGET_FILES_DIRECTORY " + addDoubleQuotes(srcGenPath.toString()));
 
-        if (tracing != null) {
-            targetConfig.compileDefinitions.put("LF_TRACE", tracing.traceFileName);
-        }
-        // if (clockSyncIsOn) {
-        //     code.pr(generateClockSyncDefineDirective(
-        //         targetConfig.clockSync,
-        //         targetConfig.clockSyncOptions
-        //     ));
-        // }
-        if (targetConfig.threading) {
-            targetConfig.compileDefinitions.put("LF_THREADED", "1");
-        } else {
-            targetConfig.compileDefinitions.put("LF_UNTHREADED", "1");
-        }
-        if (targetConfig.threading) {
-            targetConfig.compileDefinitions.put("LF_THREADED", "1");
-        } else {
-            targetConfig.compileDefinitions.put("LF_UNTHREADED", "1");
-        }
-        code.newLine();
-        return code.toString();
+    if (tracing != null) {
+      targetConfig.compileDefinitions.put("LF_TRACE", tracing.traceFileName);
+    }
+    // if (clockSyncIsOn) {
+    //     code.pr(generateClockSyncDefineDirective(
+    //         targetConfig.clockSync,
+    //         targetConfig.clockSyncOptions
+    //     ));
+    // }
+    if (targetConfig.threading) {
+      targetConfig.compileDefinitions.put("LF_THREADED", "1");
+    } else {
+      targetConfig.compileDefinitions.put("LF_UNTHREADED", "1");
+    }
+    if (targetConfig.threading) {
+      targetConfig.compileDefinitions.put("LF_THREADED", "1");
+    } else {
+      targetConfig.compileDefinitions.put("LF_UNTHREADED", "1");
     }
+    code.newLine();
+    return code.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
index 4b973a1f34..7d687b9ecf 100644
--- a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
@@ -9,11 +9,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.extensions.CExtensionUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.lf.Action;
@@ -37,1163 +36,1355 @@
 import org.lflang.util.StringUtil;
 
 public class CReactionGenerator {
-    protected static String DISABLE_REACTION_INITIALIZATION_MARKER
-        = "// **** Do not include initialization code in this reaction.";  // FIXME: Such markers should not exist (#1687)
+  protected static String DISABLE_REACTION_INITIALIZATION_MARKER =
+      "// **** Do not include initialization code in this reaction."; // FIXME: Such markers should
+  // not exist (#1687)
 
-    /**
-     * Generate necessary initialization code inside the body of the reaction that belongs to reactor decl.
-     * @param body The body of the reaction. Used to check for the DISABLE_REACTION_INITIALIZATION_MARKER.
-     * @param reaction The initialization code will be generated for this specific reaction
-     * @param tpr The reactor that has the reaction
-     * @param reactionIndex The index of the reaction relative to other reactions in the reactor, starting from 0
-     */
-    public static String generateInitializationForReaction(String body,
-                                                           Reaction reaction,
-                                                           TypeParameterizedReactor tpr,
-                                                           int reactionIndex,
-                                                           CTypes types,
-                                                           ErrorReporter errorReporter,
-                                                           Instantiation mainDef,
-                                                           boolean requiresTypes) {
-        // Construct the reactionInitialization code to go into
-        // the body of the function before the verbatim code.
-        CodeBuilder reactionInitialization = new CodeBuilder();
+  /**
+   * Generate necessary initialization code inside the body of the reaction that belongs to reactor
+   * decl.
+   *
+   * @param body The body of the reaction. Used to check for the
+   *     DISABLE_REACTION_INITIALIZATION_MARKER.
+   * @param reaction The initialization code will be generated for this specific reaction
+   * @param tpr The reactor that has the reaction
+   * @param reactionIndex The index of the reaction relative to other reactions in the reactor,
+   *     starting from 0
+   */
+  public static String generateInitializationForReaction(
+      String body,
+      Reaction reaction,
+      TypeParameterizedReactor tpr,
+      int reactionIndex,
+      CTypes types,
+      ErrorReporter errorReporter,
+      Instantiation mainDef,
+      boolean requiresTypes) {
+    // Construct the reactionInitialization code to go into
+    // the body of the function before the verbatim code.
+    CodeBuilder reactionInitialization = new CodeBuilder();
 
-        CodeBuilder code = new CodeBuilder();
+    CodeBuilder code = new CodeBuilder();
 
-        // Define the "self" struct.
-        String structType = CUtil.selfType(tpr);
-        // A null structType means there are no inputs, state,
-        // or anything else. No need to declare it.
-        if (structType != null) {
-             code.pr(String.join("\n",
-                 structType+"* self = ("+structType+"*)instance_args; SUPPRESS_UNUSED_WARNING(self);"
-             ));
-        }
-
-        // Do not generate the initialization code if the body is marked
-        // to not generate it.
-        if (body.startsWith(DISABLE_REACTION_INITIALIZATION_MARKER)) {
-            return code.toString();
-        }
+    // Define the "self" struct.
+    String structType = CUtil.selfType(tpr);
+    // A null structType means there are no inputs, state,
+    // or anything else. No need to declare it.
+    if (structType != null) {
+      code.pr(
+          String.join(
+              "\n",
+              structType
+                  + "* self = ("
+                  + structType
+                  + "*)instance_args; SUPPRESS_UNUSED_WARNING(self);"));
+    }
 
-        // A reaction may send to or receive from multiple ports of
-        // a contained reactor. The variables for these ports need to
-        // all be declared as fields of the same struct. Hence, we first
-        // collect the fields to be defined in the structs and then
-        // generate the structs.
-        Map<Instantiation, CodeBuilder> fieldsForStructsForContainedReactors = new LinkedHashMap<>();
+    // Do not generate the initialization code if the body is marked
+    // to not generate it.
+    if (body.startsWith(DISABLE_REACTION_INITIALIZATION_MARKER)) {
+      return code.toString();
+    }
 
-        // Actions may appear twice, first as a trigger, then with the outputs.
-        // But we need to declare it only once. Collect in this data structure
-        // the actions that are declared as triggered so that if they appear
-        // again with the outputs, they are not defined a second time.
-        // That second redefinition would trigger a compile error.
-        Set<Action> actionsAsTriggers = new LinkedHashSet<>();
+    // A reaction may send to or receive from multiple ports of
+    // a contained reactor. The variables for these ports need to
+    // all be declared as fields of the same struct. Hence, we first
+    // collect the fields to be defined in the structs and then
+    // generate the structs.
+    Map<Instantiation, CodeBuilder> fieldsForStructsForContainedReactors = new LinkedHashMap<>();
 
-        // Next, add the triggers (input and actions; timers are not needed).
-        // This defines a local variable in the reaction function whose
-        // name matches that of the trigger. The value of the local variable
-        // is a struct with a value and is_present field, the latter a boolean
-        // that indicates whether the input/action is present.
-        // If the trigger is an output, then it is an output of a
-        // contained reactor. In this case, a struct with the name
-        // of the contained reactor is created with one field that is
-        // a pointer to a struct with a value and is_present field.
-        // E.g., if the contained reactor is named 'c' and its output
-        // port is named 'out', then c.out->value c.out->is_present are
-        // defined so that they can be used in the verbatim code.
-        for (TriggerRef trigger : ASTUtils.convertToEmptyListIfNull(reaction.getTriggers())) {
-            if (trigger instanceof VarRef triggerAsVarRef) {
-                if (triggerAsVarRef.getVariable() instanceof Port) {
-                    generatePortVariablesInReaction(
-                        reactionInitialization,
-                        fieldsForStructsForContainedReactors,
-                        triggerAsVarRef,
-                        tpr,
-                        types);
-                } else if (triggerAsVarRef.getVariable() instanceof Action) {
-                    reactionInitialization.pr(generateActionVariablesInReaction(
-                        (Action) triggerAsVarRef.getVariable(),
-                        tpr,
-                        types
-                    ));
-                    actionsAsTriggers.add((Action) triggerAsVarRef.getVariable());
-                }
-            }
-        }
-        if (reaction.getTriggers() == null || reaction.getTriggers().size() == 0) {
-            // No triggers are given, which means react to any input.
-            // Declare an argument for every input.
-            // NOTE: this does not include contained outputs.
-            for (Input input : tpr.reactor().getInputs()) {
-                reactionInitialization.pr(generateInputVariablesInReaction(input, tpr, types));
-            }
-        }
-        // Define argument for non-triggering inputs.
-        for (VarRef src : ASTUtils.convertToEmptyListIfNull(reaction.getSources())) {
-            if (src.getVariable() instanceof Port) {
-                generatePortVariablesInReaction(reactionInitialization, fieldsForStructsForContainedReactors, src, tpr, types);
-            } else if (src.getVariable() instanceof Action) {
-                // It's a bit odd to read but not be triggered by an action, but
-                // OK, I guess we allow it.
-                reactionInitialization.pr(generateActionVariablesInReaction(
-                    (Action) src.getVariable(),
-                    tpr,
-                    types
-                ));
-                actionsAsTriggers.add((Action) src.getVariable());
-            }
-        }
+    // Actions may appear twice, first as a trigger, then with the outputs.
+    // But we need to declare it only once. Collect in this data structure
+    // the actions that are declared as triggered so that if they appear
+    // again with the outputs, they are not defined a second time.
+    // That second redefinition would trigger a compile error.
+    Set<Action> actionsAsTriggers = new LinkedHashSet<>();
 
-        // Define variables for each declared output or action.
-        // In the case of outputs, the variable is a pointer to where the
-        // output is stored. This gives the reaction code access to any previous
-        // value that may have been written to that output in an earlier reaction.
-        if (reaction.getEffects() != null) {
-            for (VarRef effect : reaction.getEffects()) {
-                Variable variable = effect.getVariable();
-                if (variable instanceof Action) {
-                    // It is an action, not an output.
-                    // If it has already appeared as trigger, do not redefine it.
-                    if (!actionsAsTriggers.contains(effect.getVariable())) {
-                        reactionInitialization.pr(CGenerator.variableStructType(variable, tpr, false)+"* "+variable.getName()+" = &self->_lf_"+variable.getName()+";");
-                    }
-                } else if (effect.getVariable() instanceof Mode) {
-                    // Mode change effect
-                    int idx = ASTUtils.allModes(tpr.reactor()).indexOf((Mode)effect.getVariable());
-                    String name = effect.getVariable().getName();
-                    if (idx >= 0) {
-                        reactionInitialization.pr(
-                            "reactor_mode_t* " + name + " = &self->_lf__modes[" + idx + "];\n"
-                            + "lf_mode_change_type_t _lf_" + name + "_change_type = "
-                            + (effect.getTransition() == ModeTransition.HISTORY ?
-                                    "history_transition" : "reset_transition")
-                            + ";"
-                        );
-                    } else {
-                        errorReporter.reportError(
-                            reaction,
-                            "In generateReaction(): " + name + " not a valid mode of this reactor."
-                        );
-                    }
-                } else {
-                    if (variable instanceof Output) {
-                        reactionInitialization.pr(generateOutputVariablesInReaction(
-                            effect,
-                            tpr,
-                            errorReporter,
-                            requiresTypes
-                        ));
-                    } else if (variable instanceof Input) {
-                        // It is the input of a contained reactor.
-                        generateVariablesForSendingToContainedReactors(
-                            reactionInitialization,
-                            fieldsForStructsForContainedReactors,
-                            effect.getContainer(),
-                            (Input) variable);
-                    } else if (variable instanceof Watchdog) {
-                        reactionInitialization.pr(generateWatchdogVariablesInReaction(effect));
-                    } else {
-                        errorReporter.reportError(
-                            reaction,
-                            "In generateReaction(): effect is not an input, output, or watchdog."
-                        );
-                    }
-                }
-            }
+    // Next, add the triggers (input and actions; timers are not needed).
+    // This defines a local variable in the reaction function whose
+    // name matches that of the trigger. The value of the local variable
+    // is a struct with a value and is_present field, the latter a boolean
+    // that indicates whether the input/action is present.
+    // If the trigger is an output, then it is an output of a
+    // contained reactor. In this case, a struct with the name
+    // of the contained reactor is created with one field that is
+    // a pointer to a struct with a value and is_present field.
+    // E.g., if the contained reactor is named 'c' and its output
+    // port is named 'out', then c.out->value c.out->is_present are
+    // defined so that they can be used in the verbatim code.
+    for (TriggerRef trigger : ASTUtils.convertToEmptyListIfNull(reaction.getTriggers())) {
+      if (trigger instanceof VarRef triggerAsVarRef) {
+        if (triggerAsVarRef.getVariable() instanceof Port) {
+          generatePortVariablesInReaction(
+              reactionInitialization,
+              fieldsForStructsForContainedReactors,
+              triggerAsVarRef,
+              tpr,
+              types);
+        } else if (triggerAsVarRef.getVariable() instanceof Action) {
+          reactionInitialization.pr(
+              generateActionVariablesInReaction(
+                  (Action) triggerAsVarRef.getVariable(), tpr, types));
+          actionsAsTriggers.add((Action) triggerAsVarRef.getVariable());
         }
-        // Before the reaction initialization,
-        // generate the structs used for communication to and from contained reactors.
-        for (Instantiation containedReactor : fieldsForStructsForContainedReactors.keySet()) {
-            String array = "";
-            if (containedReactor.getWidthSpec() != null) {
-                String containedReactorWidthVar = generateWidthVariable(containedReactor.getName());
-                code.pr("int "+containedReactorWidthVar+" = self->_lf_"+containedReactorWidthVar+";");
-                // Windows does not support variables in arrays declared on the stack,
-                // so we use the maximum size over all bank members.
-                array = "["+maxContainedReactorBankWidth(containedReactor, null, 0, mainDef)+"]";
-            }
-            code.pr(String.join("\n",
-                "struct "+containedReactor.getName()+" {",
-                "    "+fieldsForStructsForContainedReactors.get(containedReactor),
-                "} "+containedReactor.getName()+array+";"
-            ));
-        }
-        // Next generate all the collected setup code.
-        code.pr(reactionInitialization.toString());
-        return code.toString();
+      }
+    }
+    if (reaction.getTriggers() == null || reaction.getTriggers().size() == 0) {
+      // No triggers are given, which means react to any input.
+      // Declare an argument for every input.
+      // NOTE: this does not include contained outputs.
+      for (Input input : tpr.reactor().getInputs()) {
+        reactionInitialization.pr(generateInputVariablesInReaction(input, tpr, types));
+      }
+    }
+    // Define argument for non-triggering inputs.
+    for (VarRef src : ASTUtils.convertToEmptyListIfNull(reaction.getSources())) {
+      if (src.getVariable() instanceof Port) {
+        generatePortVariablesInReaction(
+            reactionInitialization, fieldsForStructsForContainedReactors, src, tpr, types);
+      } else if (src.getVariable() instanceof Action) {
+        // It's a bit odd to read but not be triggered by an action, but
+        // OK, I guess we allow it.
+        reactionInitialization.pr(
+            generateActionVariablesInReaction((Action) src.getVariable(), tpr, types));
+        actionsAsTriggers.add((Action) src.getVariable());
+      }
     }
 
-    /**
-     * Return the maximum bank width for the given instantiation within all
-     * instantiations of its parent reactor.
-     * On the first call to this method, the breadcrumbs should be null and the max
-     * argument should be zero. On recursive calls, breadcrumbs is a list of nested
-     * instantiations, the max is the maximum width found so far.  The search for
-     * instances of the parent reactor will begin with the last instantiation
-     * in the specified list.
-     *
-     * This rather complicated method is used when a reaction sends or receives data
-     * to or from a bank of contained reactors. There will be an array of structs on
-     * the self struct of the parent, and the size of the array is conservatively set
-     * to the maximum of all the identified bank widths.  This is a bit wasteful of
-     * memory, but it avoids having to malloc the array for each instance, and in
-     * typical usage, there will be few instances or instances that are all the same
-     * width.
-     *
-     * @param containedReactor The contained reactor instantiation.
-     * @param breadcrumbs null on first call (non-recursive).
-     * @param max 0 on first call.
-     */
-    public static int maxContainedReactorBankWidth(
-        Instantiation containedReactor,
-        LinkedList<Instantiation> breadcrumbs,
-        int max,
-        Instantiation mainDef
-    ) {
-        // If the instantiation is not a bank, return 1.
-        if (containedReactor.getWidthSpec() == null) {
-            return 1;
-        }
-        // If there is no main, then we just use the default width.
-        if (mainDef == null) {
-            return ASTUtils.width(containedReactor.getWidthSpec(), null);
-        }
-        LinkedList<Instantiation> nestedBreadcrumbs = breadcrumbs;
-        if (nestedBreadcrumbs == null) {
-            nestedBreadcrumbs = new LinkedList<>();
-            nestedBreadcrumbs.add(mainDef);
-        }
-        int result = max;
-        Reactor parent = (Reactor) containedReactor.eContainer();
-        if (parent == ASTUtils.toDefinition(mainDef.getReactorClass())) {
-            // The parent is main, so there can't be any other instantiations of it.
-            return ASTUtils.width(containedReactor.getWidthSpec(), null);
-        }
-        // Search for instances of the parent within the tail of the breadcrumbs list.
-        Reactor container = ASTUtils.toDefinition(nestedBreadcrumbs.get(0).getReactorClass());
-        for (Instantiation instantiation : container.getInstantiations()) {
-            // Put this new instantiation at the head of the list.
-            nestedBreadcrumbs.add(0, instantiation);
-            if (ASTUtils.toDefinition(instantiation.getReactorClass()) == parent) {
-                // Found a matching instantiation of the parent.
-                // Evaluate the original width specification in this context.
-                int candidate = ASTUtils.width(containedReactor.getWidthSpec(), nestedBreadcrumbs);
-                if (candidate > result) {
-                    result = candidate;
-                }
-            } else {
-                // Found some other instantiation, not the parent.
-                // Search within it for instantiations of the parent.
-                // Note that we assume here that the parent cannot contain
-                // instances of itself.
-                int candidate = maxContainedReactorBankWidth(containedReactor, nestedBreadcrumbs, result, mainDef);
-                if (candidate > result) {
-                    result = candidate;
-                }
-            }
-            nestedBreadcrumbs.remove();
+    // Define variables for each declared output or action.
+    // In the case of outputs, the variable is a pointer to where the
+    // output is stored. This gives the reaction code access to any previous
+    // value that may have been written to that output in an earlier reaction.
+    if (reaction.getEffects() != null) {
+      for (VarRef effect : reaction.getEffects()) {
+        Variable variable = effect.getVariable();
+        if (variable instanceof Action) {
+          // It is an action, not an output.
+          // If it has already appeared as trigger, do not redefine it.
+          if (!actionsAsTriggers.contains(effect.getVariable())) {
+            reactionInitialization.pr(
+                CGenerator.variableStructType(variable, tpr, false)
+                    + "* "
+                    + variable.getName()
+                    + " = &self->_lf_"
+                    + variable.getName()
+                    + ";");
+          }
+        } else if (effect.getVariable() instanceof Mode) {
+          // Mode change effect
+          int idx = ASTUtils.allModes(tpr.reactor()).indexOf((Mode) effect.getVariable());
+          String name = effect.getVariable().getName();
+          if (idx >= 0) {
+            reactionInitialization.pr(
+                "reactor_mode_t* "
+                    + name
+                    + " = &self->_lf__modes["
+                    + idx
+                    + "];\n"
+                    + "lf_mode_change_type_t _lf_"
+                    + name
+                    + "_change_type = "
+                    + (effect.getTransition() == ModeTransition.HISTORY
+                        ? "history_transition"
+                        : "reset_transition")
+                    + ";");
+          } else {
+            errorReporter.reportError(
+                reaction, "In generateReaction(): " + name + " not a valid mode of this reactor.");
+          }
+        } else {
+          if (variable instanceof Output) {
+            reactionInitialization.pr(
+                generateOutputVariablesInReaction(effect, tpr, errorReporter, requiresTypes));
+          } else if (variable instanceof Input) {
+            // It is the input of a contained reactor.
+            generateVariablesForSendingToContainedReactors(
+                reactionInitialization,
+                fieldsForStructsForContainedReactors,
+                effect.getContainer(),
+                (Input) variable);
+          } else if (variable instanceof Watchdog) {
+            reactionInitialization.pr(generateWatchdogVariablesInReaction(effect));
+          } else {
+            errorReporter.reportError(
+                reaction, "In generateReaction(): effect is not an input, output, or watchdog.");
+          }
         }
-        return result;
+      }
     }
-
-    /**
-     * Generate code for the body of a reaction that takes an input and
-     * schedules an action with the value of that input.
-     * @param actionName The action to schedule
-     */
-    public static String generateDelayBody(String ref, String actionName, boolean isTokenType) {
-        // Note that the action.type set by the base class is actually
-        // the port type.
-        return isTokenType ?
-                String.join("\n",
-                    "if ("+ref+"->is_present) {",
-                    "    // Put the whole token on the event queue, not just the payload.",
-                    "    // This way, the length and element_size are transported.",
-                    "    lf_schedule_token("+actionName+", 0, "+ref+"->token);",
-                    "}"
-                ) :
-                "lf_schedule_copy("+actionName+", 0, &"+ref+"->value, 1);  // Length is 1.";
+    // Before the reaction initialization,
+    // generate the structs used for communication to and from contained reactors.
+    for (Instantiation containedReactor : fieldsForStructsForContainedReactors.keySet()) {
+      String array = "";
+      if (containedReactor.getWidthSpec() != null) {
+        String containedReactorWidthVar = generateWidthVariable(containedReactor.getName());
+        code.pr(
+            "int " + containedReactorWidthVar + " = self->_lf_" + containedReactorWidthVar + ";");
+        // Windows does not support variables in arrays declared on the stack,
+        // so we use the maximum size over all bank members.
+        array = "[" + maxContainedReactorBankWidth(containedReactor, null, 0, mainDef) + "]";
+      }
+      code.pr(
+          String.join(
+              "\n",
+              "struct " + containedReactor.getName() + " {",
+              "    " + fieldsForStructsForContainedReactors.get(containedReactor),
+              "} " + containedReactor.getName() + array + ";"));
     }
+    // Next generate all the collected setup code.
+    code.pr(reactionInitialization.toString());
+    return code.toString();
+  }
 
-    public static String generateEnclavedConnectionDelayBody(String ref, String actionName, boolean isTokenType) {
-        // Note that the action.type set by the base class is actually
-        // the port type.
-        return isTokenType ?
-            "lf_print_error_and_exit(\"Enclaved connection not implemented for token types\")"
-             :
-            String.join("\n",
-            "// Calculate the tag at which the event shall be inserted in the destination environment",
-            "tag_t target_tag = lf_delay_tag(self->source_environment->curren_tag, act->trigger->offset);",
-                "token_template_t* template = (token_template_t*)action;",
-                "lf_critical_section_enter(self->destination_environment);",
-                "lf_token_t* token = _lf_initialize_token(template, length);",
-                "memcpy(token->value, value, template->type.element_size * length);",
-                "// Schedule event to the destination environment.",
-                "trigger_handle_t result = _lf_schedule_at_tag(self->destination_environment, action->trigger, tag, token);",
-                "// Notify the main thread in case it is waiting for physical time to elapse.",
-                "lf_notify_of_event(env);",
-                "lf_critical_section_exit(self->destination_length);");
+  /**
+   * Return the maximum bank width for the given instantiation within all instantiations of its
+   * parent reactor. On the first call to this method, the breadcrumbs should be null and the max
+   * argument should be zero. On recursive calls, breadcrumbs is a list of nested instantiations,
+   * the max is the maximum width found so far. The search for instances of the parent reactor will
+   * begin with the last instantiation in the specified list.
+   *
+   * <p>This rather complicated method is used when a reaction sends or receives data to or from a
+   * bank of contained reactors. There will be an array of structs on the self struct of the parent,
+   * and the size of the array is conservatively set to the maximum of all the identified bank
+   * widths. This is a bit wasteful of memory, but it avoids having to malloc the array for each
+   * instance, and in typical usage, there will be few instances or instances that are all the same
+   * width.
+   *
+   * @param containedReactor The contained reactor instantiation.
+   * @param breadcrumbs null on first call (non-recursive).
+   * @param max 0 on first call.
+   */
+  public static int maxContainedReactorBankWidth(
+      Instantiation containedReactor,
+      LinkedList<Instantiation> breadcrumbs,
+      int max,
+      Instantiation mainDef) {
+    // If the instantiation is not a bank, return 1.
+    if (containedReactor.getWidthSpec() == null) {
+      return 1;
     }
-
-    public static String generateForwardBody(String outputName, String targetType, String actionName, boolean isTokenType) {
-        return isTokenType ?
-                String.join("\n",
-                    DISABLE_REACTION_INITIALIZATION_MARKER,
-                    "self->_lf_"+outputName+".value = ("+targetType+")self->_lf__"+actionName+".tmplt.token->value;",
-                    "_lf_replace_template_token((token_template_t*)&self->_lf_"+outputName+", (lf_token_t*)self->_lf__"+actionName+".tmplt.token);", //FIXME: Enclaves step1 hack
-                    "self->_lf_"+outputName+".is_present = true;"
-                ) :
-                "lf_set("+outputName+", "+actionName+"->value);";
+    // If there is no main, then we just use the default width.
+    if (mainDef == null) {
+      return ASTUtils.width(containedReactor.getWidthSpec(), null);
     }
-
-    /**
-     * Generate into the specified string builder the code to
-     * initialize local variables for sending data to an input
-     * of a contained reactor. This will also, if necessary,
-     * generate entries for local struct definitions into the
-     * struct argument. These entries point to where the data
-     * is stored.
-     *
-     * @param builder The string builder.
-     * @param structs A map from reactor instantiations to a place to write
-     *  struct fields.
-     * @param definition AST node defining the reactor within which this occurs
-     * @param input Input of the contained reactor.
-     */
-    private static void generateVariablesForSendingToContainedReactors(
-        CodeBuilder builder,
-        Map<Instantiation,CodeBuilder> structs,
-        Instantiation definition,
-        Input input
-    ) {
-        CodeBuilder structBuilder = structs.get(definition);
-        if (structBuilder == null) {
-            structBuilder = new CodeBuilder();
-            structs.put(definition, structBuilder);
+    LinkedList<Instantiation> nestedBreadcrumbs = breadcrumbs;
+    if (nestedBreadcrumbs == null) {
+      nestedBreadcrumbs = new LinkedList<>();
+      nestedBreadcrumbs.add(mainDef);
+    }
+    int result = max;
+    Reactor parent = (Reactor) containedReactor.eContainer();
+    if (parent == ASTUtils.toDefinition(mainDef.getReactorClass())) {
+      // The parent is main, so there can't be any other instantiations of it.
+      return ASTUtils.width(containedReactor.getWidthSpec(), null);
+    }
+    // Search for instances of the parent within the tail of the breadcrumbs list.
+    Reactor container = ASTUtils.toDefinition(nestedBreadcrumbs.get(0).getReactorClass());
+    for (Instantiation instantiation : container.getInstantiations()) {
+      // Put this new instantiation at the head of the list.
+      nestedBreadcrumbs.add(0, instantiation);
+      if (ASTUtils.toDefinition(instantiation.getReactorClass()) == parent) {
+        // Found a matching instantiation of the parent.
+        // Evaluate the original width specification in this context.
+        int candidate = ASTUtils.width(containedReactor.getWidthSpec(), nestedBreadcrumbs);
+        if (candidate > result) {
+          result = candidate;
         }
-        String inputStructType = CGenerator.variableStructType(input, new TypeParameterizedReactor(definition), false);
-        String defName = definition.getName();
-        String defWidth = generateWidthVariable(defName);
-        String inputName = input.getName();
-        String inputWidth = generateWidthVariable(inputName);
-        if (!ASTUtils.isMultiport(input)) {
-            // Contained reactor's input is not a multiport.
-            structBuilder.pr(inputStructType+"* "+inputName+";");
-            if (definition.getWidthSpec() != null) {
-                // Contained reactor is a bank.
-                builder.pr(String.join("\n",
-                    "for (int bankIndex = 0; bankIndex < self->_lf_"+defWidth+"; bankIndex++) {",
-                    "    "+defName+"[bankIndex]."+inputName+" = &(self->_lf_"+defName+"[bankIndex]."+inputName+");",
-                    "}"
-                ));
-            } else {
-                // Contained reactor is not a bank.
-                builder.pr(defName+"."+inputName+" = &(self->_lf_"+defName+"."+inputName+");");
-            }
-        } else {
-            // Contained reactor's input is a multiport.
-            structBuilder.pr(String.join("\n",
-                inputStructType+"** "+inputName+";",
-                "int "+inputWidth+";"
-            ));
-            // If the contained reactor is a bank, then we have to set the
-            // pointer for each element of the bank.
-            if (definition.getWidthSpec() != null) {
-                builder.pr(String.join("\n",
-                    "for (int _i = 0; _i < self->_lf_"+defWidth+"; _i++) {",
-                    "    "+defName+"[_i]."+inputName+" = self->_lf_"+defName+"[_i]."+inputName+";",
-                    "    "+defName+"[_i]."+inputWidth+" = self->_lf_"+defName+"[_i]."+inputWidth+";",
-                    "}"
-                ));
-            } else {
-                builder.pr(String.join("\n",
-                    defName+"."+inputName+" = self->_lf_"+defName+"."+inputName+";",
-                    defName+"."+inputWidth+" = self->_lf_"+defName+"."+inputWidth+";"
-                ));
-            }
+      } else {
+        // Found some other instantiation, not the parent.
+        // Search within it for instantiations of the parent.
+        // Note that we assume here that the parent cannot contain
+        // instances of itself.
+        int candidate =
+            maxContainedReactorBankWidth(containedReactor, nestedBreadcrumbs, result, mainDef);
+        if (candidate > result) {
+          result = candidate;
         }
+      }
+      nestedBreadcrumbs.remove();
     }
+    return result;
+  }
 
-    /**
-     * Generate into the specified string builder the code to
-     * initialize local variables for ports in a reaction function
-     * from the "self" struct. The port may be an input of the
-     * reactor or an output of a contained reactor. The second
-     * argument provides, for each contained reactor, a place to
-     * write the declaration of the output of that reactor that
-     * is triggering reactions.
-     * @param builder The place into which to write the code.
-     * @param structs A map from reactor instantiations to a place to write
-     *  struct fields.
-     */
-    private static void generatePortVariablesInReaction(
-        CodeBuilder builder,
-        Map<Instantiation,CodeBuilder> structs,
-        VarRef port,
-        TypeParameterizedReactor tpr,
-        CTypes types
-    ) {
-        if (port.getVariable() instanceof Input) {
-            builder.pr(generateInputVariablesInReaction((Input) port.getVariable(), tpr, types));
-        } else {
-            // port is an output of a contained reactor.
-            Output output = (Output) port.getVariable();
-            String portStructType = CGenerator.variableStructType(output, new TypeParameterizedReactor(port.getContainer()), false);
+  /**
+   * Generate code for the body of a reaction that takes an input and schedules an action with the
+   * value of that input.
+   *
+   * @param actionName The action to schedule
+   */
+  public static String generateDelayBody(String ref, String actionName, boolean isTokenType) {
+    // Note that the action.type set by the base class is actually
+    // the port type.
+    return isTokenType
+        ? String.join(
+            "\n",
+            "if (" + ref + "->is_present) {",
+            "    // Put the whole token on the event queue, not just the payload.",
+            "    // This way, the length and element_size are transported.",
+            "    lf_schedule_token(" + actionName + ", 0, " + ref + "->token);",
+            "}")
+        : "lf_schedule_copy(" + actionName + ", 0, &" + ref + "->value, 1);  // Length is 1.";
+  }
 
-            CodeBuilder structBuilder = structs.get(port.getContainer());
-            if (structBuilder == null) {
-                structBuilder = new CodeBuilder();
-                structs.put(port.getContainer(), structBuilder);
-            }
-            String subName = port.getContainer().getName();
-            String reactorWidth = generateWidthVariable(subName);
-            String outputName = output.getName();
-            String outputWidth = generateWidthVariable(outputName);
-            // First define the struct containing the output value and indicator
-            // of its presence.
-            if (!ASTUtils.isMultiport(output)) {
-                // Output is not a multiport.
-                structBuilder.pr(portStructType+"* "+outputName+";");
-            } else {
-                // Output is a multiport.
-                structBuilder.pr(String.join("\n",
-                    portStructType+"** "+outputName+";",
-                    "int "+outputWidth+";"
-                ));
-            }
+  public static String generateEnclavedConnectionDelayBody(
+      String ref, String actionName, boolean isTokenType) {
+    // Note that the action.type set by the base class is actually
+    // the port type.
+    return isTokenType
+        ? "lf_print_error_and_exit(\"Enclaved connection not implemented for token types\")"
+        : String.join(
+            "\n",
+            "// Calculate the tag at which the event shall be inserted in the destination"
+                + " environment",
+            "tag_t target_tag = lf_delay_tag(self->source_environment->curren_tag,"
+                + " act->trigger->offset);",
+            "token_template_t* template = (token_template_t*)action;",
+            "lf_critical_section_enter(self->destination_environment);",
+            "lf_token_t* token = _lf_initialize_token(template, length);",
+            "memcpy(token->value, value, template->type.element_size * length);",
+            "// Schedule event to the destination environment.",
+            "trigger_handle_t result = _lf_schedule_at_tag(self->destination_environment,"
+                + " action->trigger, tag, token);",
+            "// Notify the main thread in case it is waiting for physical time to elapse.",
+            "lf_notify_of_event(env);",
+            "lf_critical_section_exit(self->destination_length);");
+  }
 
-            // Next, initialize the struct with the current values.
-            if (port.getContainer().getWidthSpec() != null) {
-                // Output is in a bank.
-                builder.pr(String.join("\n",
-                    "for (int i = 0; i < "+reactorWidth+"; i++) {",
-                    "    "+subName+"[i]."+outputName+" = self->_lf_"+subName+"[i]."+outputName+";",
-                    "}"
-                ));
-                if (ASTUtils.isMultiport(output)) {
-                    builder.pr(String.join("\n",
-                        "for (int i = 0; i < "+reactorWidth+"; i++) {",
-                        "    "+subName+"[i]."+outputWidth+" = self->_lf_"+subName+"[i]."+outputWidth+";",
-                        "}"
-                    ));
-                }
-            } else {
-                 // Output is not in a bank.
-                builder.pr(subName+"."+outputName+" = self->_lf_"+subName+"."+outputName+";");
-                if (ASTUtils.isMultiport(output)) {
-                    builder.pr(subName+"."+outputWidth+" = self->_lf_"+subName+"."+outputWidth+";");
-                }
-            }
-        }
+  public static String generateForwardBody(
+      String outputName, String targetType, String actionName, boolean isTokenType) {
+    return isTokenType
+        ? String.join(
+            "\n",
+            DISABLE_REACTION_INITIALIZATION_MARKER,
+            "self->_lf_"
+                + outputName
+                + ".value = ("
+                + targetType
+                + ")self->_lf__"
+                + actionName
+                + ".tmplt.token->value;",
+            "_lf_replace_template_token((token_template_t*)&self->_lf_"
+                + outputName
+                + ", (lf_token_t*)self->_lf__"
+                + actionName
+                + ".tmplt.token);", // FIXME: Enclaves step1 hack
+            "self->_lf_" + outputName + ".is_present = true;")
+        : "lf_set(" + outputName + ", " + actionName + "->value);";
+  }
+
+  /**
+   * Generate into the specified string builder the code to initialize local variables for sending
+   * data to an input of a contained reactor. This will also, if necessary, generate entries for
+   * local struct definitions into the struct argument. These entries point to where the data is
+   * stored.
+   *
+   * @param builder The string builder.
+   * @param structs A map from reactor instantiations to a place to write struct fields.
+   * @param definition AST node defining the reactor within which this occurs
+   * @param input Input of the contained reactor.
+   */
+  private static void generateVariablesForSendingToContainedReactors(
+      CodeBuilder builder,
+      Map<Instantiation, CodeBuilder> structs,
+      Instantiation definition,
+      Input input) {
+    CodeBuilder structBuilder = structs.get(definition);
+    if (structBuilder == null) {
+      structBuilder = new CodeBuilder();
+      structs.put(definition, structBuilder);
     }
+    String inputStructType =
+        CGenerator.variableStructType(input, new TypeParameterizedReactor(definition), false);
+    String defName = definition.getName();
+    String defWidth = generateWidthVariable(defName);
+    String inputName = input.getName();
+    String inputWidth = generateWidthVariable(inputName);
+    if (!ASTUtils.isMultiport(input)) {
+      // Contained reactor's input is not a multiport.
+      structBuilder.pr(inputStructType + "* " + inputName + ";");
+      if (definition.getWidthSpec() != null) {
+        // Contained reactor is a bank.
+        builder.pr(
+            String.join(
+                "\n",
+                "for (int bankIndex = 0; bankIndex < self->_lf_" + defWidth + "; bankIndex++) {",
+                "    "
+                    + defName
+                    + "[bankIndex]."
+                    + inputName
+                    + " = &(self->_lf_"
+                    + defName
+                    + "[bankIndex]."
+                    + inputName
+                    + ");",
+                "}"));
+      } else {
+        // Contained reactor is not a bank.
+        builder.pr(
+            defName + "." + inputName + " = &(self->_lf_" + defName + "." + inputName + ");");
+      }
+    } else {
+      // Contained reactor's input is a multiport.
+      structBuilder.pr(
+          String.join("\n", inputStructType + "** " + inputName + ";", "int " + inputWidth + ";"));
+      // If the contained reactor is a bank, then we have to set the
+      // pointer for each element of the bank.
+      if (definition.getWidthSpec() != null) {
+        builder.pr(
+            String.join(
+                "\n",
+                "for (int _i = 0; _i < self->_lf_" + defWidth + "; _i++) {",
+                "    "
+                    + defName
+                    + "[_i]."
+                    + inputName
+                    + " = self->_lf_"
+                    + defName
+                    + "[_i]."
+                    + inputName
+                    + ";",
+                "    "
+                    + defName
+                    + "[_i]."
+                    + inputWidth
+                    + " = self->_lf_"
+                    + defName
+                    + "[_i]."
+                    + inputWidth
+                    + ";",
+                "}"));
+      } else {
+        builder.pr(
+            String.join(
+                "\n",
+                defName + "." + inputName + " = self->_lf_" + defName + "." + inputName + ";",
+                defName + "." + inputWidth + " = self->_lf_" + defName + "." + inputWidth + ";"));
+      }
+    }
+  }
+
+  /**
+   * Generate into the specified string builder the code to initialize local variables for ports in
+   * a reaction function from the "self" struct. The port may be an input of the reactor or an
+   * output of a contained reactor. The second argument provides, for each contained reactor, a
+   * place to write the declaration of the output of that reactor that is triggering reactions.
+   *
+   * @param builder The place into which to write the code.
+   * @param structs A map from reactor instantiations to a place to write struct fields.
+   */
+  private static void generatePortVariablesInReaction(
+      CodeBuilder builder,
+      Map<Instantiation, CodeBuilder> structs,
+      VarRef port,
+      TypeParameterizedReactor tpr,
+      CTypes types) {
+    if (port.getVariable() instanceof Input) {
+      builder.pr(generateInputVariablesInReaction((Input) port.getVariable(), tpr, types));
+    } else {
+      // port is an output of a contained reactor.
+      Output output = (Output) port.getVariable();
+      String portStructType =
+          CGenerator.variableStructType(
+              output, new TypeParameterizedReactor(port.getContainer()), false);
 
-    /** Generate action variables for a reaction.
-     *  @param action The action.
-     */
-    private static String generateActionVariablesInReaction(
-        Action action,
-        TypeParameterizedReactor tpr,
-        CTypes types
-    ) {
-        String structType = CGenerator.variableStructType(action, tpr, false);
-        // If the action has a type, create variables for accessing the value.
-        InferredType type = ASTUtils.getInferredType(action);
-        // Pointer to the lf_token_t sent as the payload in the trigger.
-        String tokenPointer = "(self->_lf__"+action.getName()+".tmplt.token)";
-        CodeBuilder builder = new CodeBuilder();
+      CodeBuilder structBuilder = structs.get(port.getContainer());
+      if (structBuilder == null) {
+        structBuilder = new CodeBuilder();
+        structs.put(port.getContainer(), structBuilder);
+      }
+      String subName = port.getContainer().getName();
+      String reactorWidth = generateWidthVariable(subName);
+      String outputName = output.getName();
+      String outputWidth = generateWidthVariable(outputName);
+      // First define the struct containing the output value and indicator
+      // of its presence.
+      if (!ASTUtils.isMultiport(output)) {
+        // Output is not a multiport.
+        structBuilder.pr(portStructType + "* " + outputName + ";");
+      } else {
+        // Output is a multiport.
+        structBuilder.pr(
+            String.join(
+                "\n", portStructType + "** " + outputName + ";", "int " + outputWidth + ";"));
+      }
 
+      // Next, initialize the struct with the current values.
+      if (port.getContainer().getWidthSpec() != null) {
+        // Output is in a bank.
         builder.pr(
-            String.join("\n",
-            "// Expose the action struct as a local variable whose name matches the action name.",
-            structType+"* "+action.getName()+" = &self->_lf_"+action.getName()+";",
-            "// Set the fields of the action struct to match the current trigger.",
-            action.getName()+"->is_present = (bool)self->_lf__"+action.getName()+".status;",
-            action.getName()+"->has_value = ("+tokenPointer+" != NULL && "+tokenPointer+"->value != NULL);",
-            "_lf_replace_template_token((token_template_t*)"+action.getName()+", "+tokenPointer+");") //FIXME: Enclaves step1 hack
-        );
-        // Set the value field only if there is a type.
-        if (!type.isUndefined()) {
-            // The value field will either be a copy (for primitive types)
-            // or a pointer (for types ending in *).
-            builder.pr("if ("+action.getName()+"->has_value) {");
-            builder.indent();
-            if (CUtil.isTokenType(type, types)) {
-                builder.pr(action.getName()+"->value = ("+types.getTargetType(type)+")"+tokenPointer+"->value;");
-            } else {
-                builder.pr(action.getName()+"->value = *("+types.getTargetType(type)+"*)"+tokenPointer+"->value;");
-            }
-            builder.unindent();
-            builder.pr("}");
+            String.join(
+                "\n",
+                "for (int i = 0; i < " + reactorWidth + "; i++) {",
+                "    "
+                    + subName
+                    + "[i]."
+                    + outputName
+                    + " = self->_lf_"
+                    + subName
+                    + "[i]."
+                    + outputName
+                    + ";",
+                "}"));
+        if (ASTUtils.isMultiport(output)) {
+          builder.pr(
+              String.join(
+                  "\n",
+                  "for (int i = 0; i < " + reactorWidth + "; i++) {",
+                  "    "
+                      + subName
+                      + "[i]."
+                      + outputWidth
+                      + " = self->_lf_"
+                      + subName
+                      + "[i]."
+                      + outputWidth
+                      + ";",
+                  "}"));
         }
-        return builder.toString();
+      } else {
+        // Output is not in a bank.
+        builder.pr(subName + "." + outputName + " = self->_lf_" + subName + "." + outputName + ";");
+        if (ASTUtils.isMultiport(output)) {
+          builder.pr(
+              subName + "." + outputWidth + " = self->_lf_" + subName + "." + outputWidth + ";");
+        }
+      }
     }
+  }
 
-    /** Generate into the specified string builder the code to
-     *  initialize local variables for the specified input port
-     *  in a reaction function from the "self" struct.
-     *  @param input The input statement from the AST.
-     *  @param tpr The reactor.
-     */
-    private static String generateInputVariablesInReaction(
-        Input input,
-        TypeParameterizedReactor tpr,
-        CTypes types
-    ) {
-        String structType = CGenerator.variableStructType(input, tpr, false);
-        InferredType inputType = ASTUtils.getInferredType(input);
-        CodeBuilder builder = new CodeBuilder();
-        String inputName = input.getName();
-        String inputWidth = generateWidthVariable(inputName);
+  /**
+   * Generate action variables for a reaction.
+   *
+   * @param action The action.
+   */
+  private static String generateActionVariablesInReaction(
+      Action action, TypeParameterizedReactor tpr, CTypes types) {
+    String structType = CGenerator.variableStructType(action, tpr, false);
+    // If the action has a type, create variables for accessing the value.
+    InferredType type = ASTUtils.getInferredType(action);
+    // Pointer to the lf_token_t sent as the payload in the trigger.
+    String tokenPointer = "(self->_lf__" + action.getName() + ".tmplt.token)";
+    CodeBuilder builder = new CodeBuilder();
 
-        // Create the local variable whose name matches the input name.
-        // If the input has not been declared mutable, then this is a pointer
-        // to the upstream output. Otherwise, it is a copy of the upstream output,
-        // which nevertheless points to the same token and value (hence, as done
-        // below, we have to use lf_writable_copy()). There are 8 cases,
-        // depending on whether the input is mutable, whether it is a multiport,
-        // and whether it is a token type.
-        // Easy case first.
-        if (!input.isMutable() && !CUtil.isTokenType(inputType, types) && !ASTUtils.isMultiport(input)) {
-            // Non-mutable, non-multiport, primitive type.
-            builder.pr(structType+"* "+inputName+" = self->_lf_"+inputName+";");
-        } else if (input.isMutable()&& !CUtil.isTokenType(inputType, types) && !ASTUtils.isMultiport(input)) {
-            // Mutable, non-multiport, primitive type.
-            builder.pr(String.join("\n",
-                "// Mutable input, so copy the input into a temporary variable.",
-                "// The input value on the struct is a copy.",
-                structType+" _lf_tmp_"+inputName+" = *(self->_lf_"+inputName+");",
-                structType+"* "+inputName+" = &_lf_tmp_"+inputName+";"
-            ));
-        } else if (!input.isMutable()&& CUtil.isTokenType(inputType, types) && !ASTUtils.isMultiport(input)) {
-            // Non-mutable, non-multiport, token type.
-            builder.pr(String.join("\n",
-                structType+"* "+inputName+" = self->_lf_"+inputName+";",
-                "if ("+inputName+"->is_present) {",
-                "    "+inputName+"->length = "+inputName+"->token->length;",
-                "    "+inputName+"->value = ("+types.getTargetType(inputType)+")"+inputName+"->token->value;",
-                "} else {",
-                "    "+inputName+"->length = 0;",
-                "}"
-            ));
-        } else if (input.isMutable()&& CUtil.isTokenType(inputType, types) && !ASTUtils.isMultiport(input)) {
-            // Mutable, non-multiport, token type.
-            builder.pr(String.join("\n",
-                "// Mutable input, so copy the input struct into a temporary variable.",
-                structType+" _lf_tmp_"+inputName+" = *(self->_lf_"+inputName+");",
-                structType+"* "+inputName+" = &_lf_tmp_"+inputName+";",
-                inputName+"->value = NULL;", // Prevent payload from being freed.
-                "if ("+inputName+"->is_present) {",
-                "    "+inputName+"->length = "+inputName+"->token->length;",
-                "    "+inputName+"->token = lf_writable_copy(self->base.environment, (lf_port_base_t*)self->_lf_"+inputName+");",
-                "    "+inputName+"->value = ("+types.getTargetType(inputType)+")"+inputName+"->token->value;",
-                "} else {",
-                "    "+inputName+"->length = 0;",
-                "}"
-            ));
-        } else if (!input.isMutable()&& ASTUtils.isMultiport(input)) {
-            // Non-mutable, multiport, primitive or token type.
-            builder.pr(structType+"** "+inputName+" = self->_lf_"+inputName+";");
-        } else if (CUtil.isTokenType(inputType, types)) {
-            // Mutable, multiport, token type
-            builder.pr(String.join("\n",
-                "// Mutable multiport input, so copy the input structs",
-                "// into an array of temporary variables on the stack.",
-                structType+" _lf_tmp_"+inputName+"["+CUtil.multiportWidthExpression(input)+"];",
-                structType+"* "+inputName+"["+CUtil.multiportWidthExpression(input)+"];",
-                "for (int i = 0; i < "+CUtil.multiportWidthExpression(input)+"; i++) {",
-                "    "+inputName+"[i] = &_lf_tmp_"+inputName+"[i];",
-                "    _lf_tmp_"+inputName+"[i] = *(self->_lf_"+inputName+"[i]);",
-                "    // If necessary, copy the tokens.",
-                "    if ("+inputName+"[i]->is_present) {",
-                "        "+inputName+"[i]->length = "+inputName+"[i]->token->length;",
-                "        token_template_t* _lf_input = (token_template_t*)self->_lf_"+inputName+"[i];",
-                "        "+inputName+"[i]->token = lf_writable_copy(self->base.environment, (lf_port_base_t*)_lf_input);",
-                "        "+inputName+"[i]->value = ("+types.getTargetType(inputType)+")"+inputName+"[i]->token->value;",
-                "    } else {",
-                "        "+inputName+"[i]->length = 0;",
-                "    }",
-                "}"
-            ));
-        } else {
-            // Mutable, multiport, primitive type
-            builder.pr(String.join("\n",
-                "// Mutable multiport input, so copy the input structs",
-                "// into an array of temporary variables on the stack.",
-                structType+" _lf_tmp_"+inputName+"["+CUtil.multiportWidthExpression(input)+"];",
-                structType+"* "+inputName+"["+CUtil.multiportWidthExpression(input)+"];",
-                "for (int i = 0; i < "+CUtil.multiportWidthExpression(input)+"; i++) {",
-                "    "+inputName+"[i]  = &_lf_tmp_"+inputName+"[i];",
-                "    // Copy the struct, which includes the value.",
-                "    _lf_tmp_"+inputName+"[i] = *(self->_lf_"+inputName+"[i]);",
-                "}"
-            ));
-        }
-        // Set the _width variable for all cases. This will be -1
-        // for a variable-width multiport, which is not currently supported.
-        // It will be -2 if it is not multiport.
-        builder.pr("int "+inputWidth+" = self->_lf_"+inputWidth+"; SUPPRESS_UNUSED_WARNING("+inputWidth+");");
-        return builder.toString();
+    builder.pr(
+        String.join(
+            "\n",
+            "// Expose the action struct as a local variable whose name matches the action name.",
+            structType + "* " + action.getName() + " = &self->_lf_" + action.getName() + ";",
+            "// Set the fields of the action struct to match the current trigger.",
+            action.getName() + "->is_present = (bool)self->_lf__" + action.getName() + ".status;",
+            action.getName()
+                + "->has_value = ("
+                + tokenPointer
+                + " != NULL && "
+                + tokenPointer
+                + "->value != NULL);",
+            "_lf_replace_template_token((token_template_t*)"
+                + action.getName()
+                + ", "
+                + tokenPointer
+                + ");") // FIXME: Enclaves step1 hack
+        );
+    // Set the value field only if there is a type.
+    if (!type.isUndefined()) {
+      // The value field will either be a copy (for primitive types)
+      // or a pointer (for types ending in *).
+      builder.pr("if (" + action.getName() + "->has_value) {");
+      builder.indent();
+      if (CUtil.isTokenType(type, types)) {
+        builder.pr(
+            action.getName()
+                + "->value = ("
+                + types.getTargetType(type)
+                + ")"
+                + tokenPointer
+                + "->value;");
+      } else {
+        builder.pr(
+            action.getName()
+                + "->value = *("
+                + types.getTargetType(type)
+                + "*)"
+                + tokenPointer
+                + "->value;");
+      }
+      builder.unindent();
+      builder.pr("}");
     }
+    return builder.toString();
+  }
 
-    /**
-     * Generate into the specified string builder the code to
-     * initialize local variables for outputs in a reaction function
-     * from the "self" struct.
-     * @param effect The effect declared by the reaction. This must refer to an output.
-     * @param tpr The reactor containing the reaction.
-     */
-    public static String generateOutputVariablesInReaction(
-        VarRef effect,
-        TypeParameterizedReactor tpr,
-        ErrorReporter errorReporter,
-        boolean requiresTypes
-    ) {
-        Output output = (Output) effect.getVariable();
-        String outputName = output.getName();
-        String outputWidth = generateWidthVariable(outputName);
-        if (output.getType() == null && requiresTypes) {
-            errorReporter.reportError(output, "Output is required to have a type: " + outputName);
-            return "";
-        } else {
-            // The container of the output may be a contained reactor or
-            // the reactor containing the reaction.
-            String outputStructType = (effect.getContainer() == null) ?
-                CGenerator.variableStructType(output, tpr, false)
-                :
-                    CGenerator.variableStructType(output, new TypeParameterizedReactor(effect.getContainer()), false);
-            if (!ASTUtils.isMultiport(output)) {
-                // Output port is not a multiport.
-                return outputStructType+"* "+outputName+" = &self->_lf_"+outputName+";";
-            } else {
-                // Output port is a multiport.
-                // Set the _width variable.
-                return String.join("\n",
-                    "int "+outputWidth+" = self->_lf_"+outputWidth+"; SUPPRESS_UNUSED_WARNING("+outputWidth+");",
-                    outputStructType+"** "+outputName+" = self->_lf_"+outputName+"_pointers;"
-                );
+  /**
+   * Generate into the specified string builder the code to initialize local variables for the
+   * specified input port in a reaction function from the "self" struct.
+   *
+   * @param input The input statement from the AST.
+   * @param tpr The reactor.
+   */
+  private static String generateInputVariablesInReaction(
+      Input input, TypeParameterizedReactor tpr, CTypes types) {
+    String structType = CGenerator.variableStructType(input, tpr, false);
+    InferredType inputType = ASTUtils.getInferredType(input);
+    CodeBuilder builder = new CodeBuilder();
+    String inputName = input.getName();
+    String inputWidth = generateWidthVariable(inputName);
 
-            }
-        }
+    // Create the local variable whose name matches the input name.
+    // If the input has not been declared mutable, then this is a pointer
+    // to the upstream output. Otherwise, it is a copy of the upstream output,
+    // which nevertheless points to the same token and value (hence, as done
+    // below, we have to use lf_writable_copy()). There are 8 cases,
+    // depending on whether the input is mutable, whether it is a multiport,
+    // and whether it is a token type.
+    // Easy case first.
+    if (!input.isMutable()
+        && !CUtil.isTokenType(inputType, types)
+        && !ASTUtils.isMultiport(input)) {
+      // Non-mutable, non-multiport, primitive type.
+      builder.pr(structType + "* " + inputName + " = self->_lf_" + inputName + ";");
+    } else if (input.isMutable()
+        && !CUtil.isTokenType(inputType, types)
+        && !ASTUtils.isMultiport(input)) {
+      // Mutable, non-multiport, primitive type.
+      builder.pr(
+          String.join(
+              "\n",
+              "// Mutable input, so copy the input into a temporary variable.",
+              "// The input value on the struct is a copy.",
+              structType + " _lf_tmp_" + inputName + " = *(self->_lf_" + inputName + ");",
+              structType + "* " + inputName + " = &_lf_tmp_" + inputName + ";"));
+    } else if (!input.isMutable()
+        && CUtil.isTokenType(inputType, types)
+        && !ASTUtils.isMultiport(input)) {
+      // Non-mutable, non-multiport, token type.
+      builder.pr(
+          String.join(
+              "\n",
+              structType + "* " + inputName + " = self->_lf_" + inputName + ";",
+              "if (" + inputName + "->is_present) {",
+              "    " + inputName + "->length = " + inputName + "->token->length;",
+              "    "
+                  + inputName
+                  + "->value = ("
+                  + types.getTargetType(inputType)
+                  + ")"
+                  + inputName
+                  + "->token->value;",
+              "} else {",
+              "    " + inputName + "->length = 0;",
+              "}"));
+    } else if (input.isMutable()
+        && CUtil.isTokenType(inputType, types)
+        && !ASTUtils.isMultiport(input)) {
+      // Mutable, non-multiport, token type.
+      builder.pr(
+          String.join(
+              "\n",
+              "// Mutable input, so copy the input struct into a temporary variable.",
+              structType + " _lf_tmp_" + inputName + " = *(self->_lf_" + inputName + ");",
+              structType + "* " + inputName + " = &_lf_tmp_" + inputName + ";",
+              inputName + "->value = NULL;", // Prevent payload from being freed.
+              "if (" + inputName + "->is_present) {",
+              "    " + inputName + "->length = " + inputName + "->token->length;",
+              "    "
+                  + inputName
+                  + "->token = lf_writable_copy(self->base.environment, (lf_port_base_t*)self->_lf_"
+                  + inputName
+                  + ");",
+              "    "
+                  + inputName
+                  + "->value = ("
+                  + types.getTargetType(inputType)
+                  + ")"
+                  + inputName
+                  + "->token->value;",
+              "} else {",
+              "    " + inputName + "->length = 0;",
+              "}"));
+    } else if (!input.isMutable() && ASTUtils.isMultiport(input)) {
+      // Non-mutable, multiport, primitive or token type.
+      builder.pr(structType + "** " + inputName + " = self->_lf_" + inputName + ";");
+    } else if (CUtil.isTokenType(inputType, types)) {
+      // Mutable, multiport, token type
+      builder.pr(
+          String.join(
+              "\n",
+              "// Mutable multiport input, so copy the input structs",
+              "// into an array of temporary variables on the stack.",
+              structType
+                  + " _lf_tmp_"
+                  + inputName
+                  + "["
+                  + CUtil.multiportWidthExpression(input)
+                  + "];",
+              structType + "* " + inputName + "[" + CUtil.multiportWidthExpression(input) + "];",
+              "for (int i = 0; i < " + CUtil.multiportWidthExpression(input) + "; i++) {",
+              "    " + inputName + "[i] = &_lf_tmp_" + inputName + "[i];",
+              "    _lf_tmp_" + inputName + "[i] = *(self->_lf_" + inputName + "[i]);",
+              "    // If necessary, copy the tokens.",
+              "    if (" + inputName + "[i]->is_present) {",
+              "        " + inputName + "[i]->length = " + inputName + "[i]->token->length;",
+              "        token_template_t* _lf_input = (token_template_t*)self->_lf_"
+                  + inputName
+                  + "[i];",
+              "        "
+                  + inputName
+                  + "[i]->token = lf_writable_copy(self->base.environment,"
+                  + " (lf_port_base_t*)_lf_input);",
+              "        "
+                  + inputName
+                  + "[i]->value = ("
+                  + types.getTargetType(inputType)
+                  + ")"
+                  + inputName
+                  + "[i]->token->value;",
+              "    } else {",
+              "        " + inputName + "[i]->length = 0;",
+              "    }",
+              "}"));
+    } else {
+      // Mutable, multiport, primitive type
+      builder.pr(
+          String.join(
+              "\n",
+              "// Mutable multiport input, so copy the input structs",
+              "// into an array of temporary variables on the stack.",
+              structType
+                  + " _lf_tmp_"
+                  + inputName
+                  + "["
+                  + CUtil.multiportWidthExpression(input)
+                  + "];",
+              structType + "* " + inputName + "[" + CUtil.multiportWidthExpression(input) + "];",
+              "for (int i = 0; i < " + CUtil.multiportWidthExpression(input) + "; i++) {",
+              "    " + inputName + "[i]  = &_lf_tmp_" + inputName + "[i];",
+              "    // Copy the struct, which includes the value.",
+              "    _lf_tmp_" + inputName + "[i] = *(self->_lf_" + inputName + "[i]);",
+              "}"));
     }
+    // Set the _width variable for all cases. This will be -1
+    // for a variable-width multiport, which is not currently supported.
+    // It will be -2 if it is not multiport.
+    builder.pr(
+        "int "
+            + inputWidth
+            + " = self->_lf_"
+            + inputWidth
+            + "; SUPPRESS_UNUSED_WARNING("
+            + inputWidth
+            + ");");
+    return builder.toString();
+  }
 
-    /**
-     * Generate into the specified string builder the code to initialize local variables for watchdogs
-     * in a reaction function from the "self" struct.
-     *
-     * @param effect The effect declared by the reaction. This must refer to a watchdog.
-     */
-    public static String generateWatchdogVariablesInReaction(VarRef effect) {
-        Watchdog watchdog = (Watchdog) effect.getVariable();
-        String watchdogName = watchdog.getName();
+  /**
+   * Generate into the specified string builder the code to initialize local variables for outputs
+   * in a reaction function from the "self" struct.
+   *
+   * @param effect The effect declared by the reaction. This must refer to an output.
+   * @param tpr The reactor containing the reaction.
+   */
+  public static String generateOutputVariablesInReaction(
+      VarRef effect,
+      TypeParameterizedReactor tpr,
+      ErrorReporter errorReporter,
+      boolean requiresTypes) {
+    Output output = (Output) effect.getVariable();
+    String outputName = output.getName();
+    String outputWidth = generateWidthVariable(outputName);
+    if (output.getType() == null && requiresTypes) {
+      errorReporter.reportError(output, "Output is required to have a type: " + outputName);
+      return "";
+    } else {
+      // The container of the output may be a contained reactor or
+      // the reactor containing the reaction.
+      String outputStructType =
+          (effect.getContainer() == null)
+              ? CGenerator.variableStructType(output, tpr, false)
+              : CGenerator.variableStructType(
+                  output, new TypeParameterizedReactor(effect.getContainer()), false);
+      if (!ASTUtils.isMultiport(output)) {
+        // Output port is not a multiport.
+        return outputStructType + "* " + outputName + " = &self->_lf_" + outputName + ";";
+      } else {
+        // Output port is a multiport.
+        // Set the _width variable.
         return String.join(
             "\n",
-             List.of("watchdog_t* " + watchdogName + " = &(self->_lf_watchdog_" + watchdogName + ");")
-        );
+            "int "
+                + outputWidth
+                + " = self->_lf_"
+                + outputWidth
+                + "; SUPPRESS_UNUSED_WARNING("
+                + outputWidth
+                + ");",
+            outputStructType + "** " + outputName + " = self->_lf_" + outputName + "_pointers;");
+      }
     }
+  }
 
-    /**
-     * Generate the fields of the self struct and statements for the constructor
-     * to create and initialize a reaction_t struct for each reaction in the
-     * specified reactor and a trigger_t struct for each trigger (input, action,
-     * timer, or output of a contained reactor).
-     * @param body The place to put the code for the self struct.
-     * @param tpr {@link TypeParameterizedReactor}
-     * @param constructorCode The place to put the constructor code.
-     */
-    public static void generateReactionAndTriggerStructs(
-        CodeBuilder body,
-        TypeParameterizedReactor tpr,
-        CodeBuilder constructorCode,
-        CTypes types
-    ) {
-        var reactionCount = 0;
-        // Iterate over reactions and create initialize the reaction_t struct
-        // on the self struct. Also, collect a map from triggers to the reactions
-        // that are triggered by that trigger. Also, collect a set of sources
-        // that are read by reactions but do not trigger reactions.
-        // Finally, collect a set of triggers and sources that are outputs
-        // of contained reactors.
-        var triggerMap = new LinkedHashMap<Variable,LinkedList<Integer>>();
-        var sourceSet = new LinkedHashSet<Variable>();
-        var outputsOfContainedReactors = new LinkedHashMap<Variable,Instantiation>();
-        var startupReactions = new LinkedHashSet<Integer>();
-        var shutdownReactions = new LinkedHashSet<Integer>();
-        var resetReactions = new LinkedHashSet<Integer>();
-        for (Reaction reaction : ASTUtils.allReactions(tpr.reactor())) {
-            // Create the reaction_t struct.
-            body.pr(reaction, "reaction_t _lf__reaction_"+reactionCount+";");
+  /**
+   * Generate into the specified string builder the code to initialize local variables for watchdogs
+   * in a reaction function from the "self" struct.
+   *
+   * @param effect The effect declared by the reaction. This must refer to a watchdog.
+   */
+  public static String generateWatchdogVariablesInReaction(VarRef effect) {
+    Watchdog watchdog = (Watchdog) effect.getVariable();
+    String watchdogName = watchdog.getName();
+    return String.join(
+        "\n",
+        List.of("watchdog_t* " + watchdogName + " = &(self->_lf_watchdog_" + watchdogName + ");"));
+  }
 
-            // Create the map of triggers to reactions.
-            for (TriggerRef trigger : reaction.getTriggers()) {
-                // trigger may not be a VarRef (it could be "startup" or "shutdown").
-                if (trigger instanceof VarRef triggerAsVarRef) {
-                    var reactionList = triggerMap.get(triggerAsVarRef.getVariable());
-                    if (reactionList == null) {
-                        reactionList = new LinkedList<>();
-                        triggerMap.put(triggerAsVarRef.getVariable(), reactionList);
-                    }
-                    reactionList.add(reactionCount);
-                    if (triggerAsVarRef.getContainer() != null) {
-                        outputsOfContainedReactors.put(triggerAsVarRef.getVariable(), triggerAsVarRef.getContainer());
-                    }
-                } else if (trigger instanceof BuiltinTriggerRef) {
-                    switch(((BuiltinTriggerRef) trigger).getType()) {
-                        case STARTUP:
-                            startupReactions.add(reactionCount);
-                            break;
-                        case SHUTDOWN:
-                            shutdownReactions.add(reactionCount);
-                            break;
-                        case RESET:
-                            resetReactions.add(reactionCount);
-                            break;
-                    }
-                }
-            }
-            // Create the set of sources read but not triggering.
-            for (VarRef source : reaction.getSources()) {
-                sourceSet.add(source.getVariable());
-                if (source.getContainer() != null) {
-                    outputsOfContainedReactors.put(source.getVariable(), source.getContainer());
-                }
-            }
+  /**
+   * Generate the fields of the self struct and statements for the constructor to create and
+   * initialize a reaction_t struct for each reaction in the specified reactor and a trigger_t
+   * struct for each trigger (input, action, timer, or output of a contained reactor).
+   *
+   * @param body The place to put the code for the self struct.
+   * @param tpr {@link TypeParameterizedReactor}
+   * @param constructorCode The place to put the constructor code.
+   */
+  public static void generateReactionAndTriggerStructs(
+      CodeBuilder body, TypeParameterizedReactor tpr, CodeBuilder constructorCode, CTypes types) {
+    var reactionCount = 0;
+    // Iterate over reactions and create initialize the reaction_t struct
+    // on the self struct. Also, collect a map from triggers to the reactions
+    // that are triggered by that trigger. Also, collect a set of sources
+    // that are read by reactions but do not trigger reactions.
+    // Finally, collect a set of triggers and sources that are outputs
+    // of contained reactors.
+    var triggerMap = new LinkedHashMap<Variable, LinkedList<Integer>>();
+    var sourceSet = new LinkedHashSet<Variable>();
+    var outputsOfContainedReactors = new LinkedHashMap<Variable, Instantiation>();
+    var startupReactions = new LinkedHashSet<Integer>();
+    var shutdownReactions = new LinkedHashSet<Integer>();
+    var resetReactions = new LinkedHashSet<Integer>();
+    for (Reaction reaction : ASTUtils.allReactions(tpr.reactor())) {
+      // Create the reaction_t struct.
+      body.pr(reaction, "reaction_t _lf__reaction_" + reactionCount + ";");
 
-            var deadlineFunctionPointer = "NULL";
-            if (reaction.getDeadline() != null) {
-                // The following has to match the name chosen in generateReactions
-                var deadlineFunctionName = generateDeadlineFunctionName(tpr, reactionCount);
-                deadlineFunctionPointer = "&" + deadlineFunctionName;
-            }
+      // Create the map of triggers to reactions.
+      for (TriggerRef trigger : reaction.getTriggers()) {
+        // trigger may not be a VarRef (it could be "startup" or "shutdown").
+        if (trigger instanceof VarRef triggerAsVarRef) {
+          var reactionList = triggerMap.get(triggerAsVarRef.getVariable());
+          if (reactionList == null) {
+            reactionList = new LinkedList<>();
+            triggerMap.put(triggerAsVarRef.getVariable(), reactionList);
+          }
+          reactionList.add(reactionCount);
+          if (triggerAsVarRef.getContainer() != null) {
+            outputsOfContainedReactors.put(
+                triggerAsVarRef.getVariable(), triggerAsVarRef.getContainer());
+          }
+        } else if (trigger instanceof BuiltinTriggerRef) {
+          switch (((BuiltinTriggerRef) trigger).getType()) {
+            case STARTUP:
+              startupReactions.add(reactionCount);
+              break;
+            case SHUTDOWN:
+              shutdownReactions.add(reactionCount);
+              break;
+            case RESET:
+              resetReactions.add(reactionCount);
+              break;
+          }
+        }
+      }
+      // Create the set of sources read but not triggering.
+      for (VarRef source : reaction.getSources()) {
+        sourceSet.add(source.getVariable());
+        if (source.getContainer() != null) {
+          outputsOfContainedReactors.put(source.getVariable(), source.getContainer());
+        }
+      }
 
-            // Assign the STP handler
-            var STPFunctionPointer = "NULL";
-            if (reaction.getStp() != null) {
-                // The following has to match the name chosen in generateReactions
-                var STPFunctionName = generateStpFunctionName(tpr, reactionCount);
-                STPFunctionPointer = "&" + STPFunctionName;
-            }
+      var deadlineFunctionPointer = "NULL";
+      if (reaction.getDeadline() != null) {
+        // The following has to match the name chosen in generateReactions
+        var deadlineFunctionName = generateDeadlineFunctionName(tpr, reactionCount);
+        deadlineFunctionPointer = "&" + deadlineFunctionName;
+      }
 
-            // Set the defaults of the reaction_t struct in the constructor.
-            // Since the self struct is allocated using calloc, there is no need to set:
-            // self->_lf__reaction_"+reactionCount+".index = 0;
-            // self->_lf__reaction_"+reactionCount+".chain_id = 0;
-            // self->_lf__reaction_"+reactionCount+".pos = 0;
-            // self->_lf__reaction_"+reactionCount+".status = inactive;
-            // self->_lf__reaction_"+reactionCount+".deadline = 0LL;
-            // self->_lf__reaction_"+reactionCount+".is_STP_violated = false;
-            constructorCode.pr(reaction, String.join("\n",
-                "self->_lf__reaction_"+reactionCount+".number = "+reactionCount+";",
-                "self->_lf__reaction_"+reactionCount+".function = "+CReactionGenerator.generateReactionFunctionName(tpr, reactionCount)+";",
-                "self->_lf__reaction_"+reactionCount+".self = self;",
-                "self->_lf__reaction_"+reactionCount+".deadline_violation_handler = "+deadlineFunctionPointer+";",
-                "self->_lf__reaction_"+reactionCount+".STP_handler = "+STPFunctionPointer+";",
-                "self->_lf__reaction_"+reactionCount+".name = "+addDoubleQuotes("?")+";",
-                reaction.eContainer() instanceof Mode ?
-                "self->_lf__reaction_"+reactionCount+".mode = &self->_lf__modes["+tpr.reactor().getModes().indexOf((Mode) reaction.eContainer())+"];" :
-                "self->_lf__reaction_"+reactionCount+".mode = NULL;"
-            ));
-            // Increment the reactionCount even if the reaction is not in the federate
-            // so that reaction indices are consistent across federates.
-            reactionCount++;
-        }
+      // Assign the STP handler
+      var STPFunctionPointer = "NULL";
+      if (reaction.getStp() != null) {
+        // The following has to match the name chosen in generateReactions
+        var STPFunctionName = generateStpFunctionName(tpr, reactionCount);
+        STPFunctionPointer = "&" + STPFunctionName;
+      }
 
-        // Next, create and initialize the trigger_t objects.
-        // Start with the timers.
-        for (Timer timer : ASTUtils.allTimers(tpr.reactor())) {
-            createTriggerT(body, timer, triggerMap, constructorCode, types);
-            // Since the self struct is allocated using calloc, there is no need to set falsy fields.
-            constructorCode.pr("self->_lf__"+timer.getName()+".is_timer = true;");
-            constructorCode.pr(CExtensionUtils.surroundWithIfFederatedDecentralized(
-                "self->_lf__"+timer.getName()+".intended_tag = (tag_t) { .time = NEVER, .microstep = 0u};"));
-        }
+      // Set the defaults of the reaction_t struct in the constructor.
+      // Since the self struct is allocated using calloc, there is no need to set:
+      // self->_lf__reaction_"+reactionCount+".index = 0;
+      // self->_lf__reaction_"+reactionCount+".chain_id = 0;
+      // self->_lf__reaction_"+reactionCount+".pos = 0;
+      // self->_lf__reaction_"+reactionCount+".status = inactive;
+      // self->_lf__reaction_"+reactionCount+".deadline = 0LL;
+      // self->_lf__reaction_"+reactionCount+".is_STP_violated = false;
+      constructorCode.pr(
+          reaction,
+          String.join(
+              "\n",
+              "self->_lf__reaction_" + reactionCount + ".number = " + reactionCount + ";",
+              "self->_lf__reaction_"
+                  + reactionCount
+                  + ".function = "
+                  + CReactionGenerator.generateReactionFunctionName(tpr, reactionCount)
+                  + ";",
+              "self->_lf__reaction_" + reactionCount + ".self = self;",
+              "self->_lf__reaction_"
+                  + reactionCount
+                  + ".deadline_violation_handler = "
+                  + deadlineFunctionPointer
+                  + ";",
+              "self->_lf__reaction_" + reactionCount + ".STP_handler = " + STPFunctionPointer + ";",
+              "self->_lf__reaction_" + reactionCount + ".name = " + addDoubleQuotes("?") + ";",
+              reaction.eContainer() instanceof Mode
+                  ? "self->_lf__reaction_"
+                      + reactionCount
+                      + ".mode = &self->_lf__modes["
+                      + tpr.reactor().getModes().indexOf((Mode) reaction.eContainer())
+                      + "];"
+                  : "self->_lf__reaction_" + reactionCount + ".mode = NULL;"));
+      // Increment the reactionCount even if the reaction is not in the federate
+      // so that reaction indices are consistent across federates.
+      reactionCount++;
+    }
 
-        // Handle builtin triggers.
-        if (startupReactions.size() > 0) {
-            generateBuiltinTriggeredReactionsArray(startupReactions, "startup", body, constructorCode);
-        }
-        // Handle shutdown triggers.
-        if (shutdownReactions.size() > 0) {
-            generateBuiltinTriggeredReactionsArray(shutdownReactions, "shutdown", body, constructorCode);
-        }
-        if (resetReactions.size() > 0) {
-            generateBuiltinTriggeredReactionsArray(resetReactions, "reset", body, constructorCode);
-        }
+    // Next, create and initialize the trigger_t objects.
+    // Start with the timers.
+    for (Timer timer : ASTUtils.allTimers(tpr.reactor())) {
+      createTriggerT(body, timer, triggerMap, constructorCode, types);
+      // Since the self struct is allocated using calloc, there is no need to set falsy fields.
+      constructorCode.pr("self->_lf__" + timer.getName() + ".is_timer = true;");
+      constructorCode.pr(
+          CExtensionUtils.surroundWithIfFederatedDecentralized(
+              "self->_lf__"
+                  + timer.getName()
+                  + ".intended_tag = (tag_t) { .time = NEVER, .microstep = 0u};"));
+    }
 
-        // Next handle actions.
-        for (Action action : ASTUtils.allActions(tpr.reactor())) {
-            createTriggerT(body, action, triggerMap, constructorCode, types);
-            var isPhysical = "true";
-            if (action.getOrigin().equals(ActionOrigin.LOGICAL)) {
-                isPhysical = "false";
-            }
-            var elementSize = "0";
-            // If the action type is 'void', we need to avoid generating the code
-            // 'sizeof(void)', which some compilers reject.
-            var rootType = action.getType() != null ? CUtil.rootType(types.getTargetType(action))
-                : null;
-            if (rootType != null && !rootType.equals("void")) {
-                elementSize = "sizeof(" + rootType + ")";
-            }
+    // Handle builtin triggers.
+    if (startupReactions.size() > 0) {
+      generateBuiltinTriggeredReactionsArray(startupReactions, "startup", body, constructorCode);
+    }
+    // Handle shutdown triggers.
+    if (shutdownReactions.size() > 0) {
+      generateBuiltinTriggeredReactionsArray(shutdownReactions, "shutdown", body, constructorCode);
+    }
+    if (resetReactions.size() > 0) {
+      generateBuiltinTriggeredReactionsArray(resetReactions, "reset", body, constructorCode);
+    }
 
-            // Since the self struct is allocated using calloc, there is no need to set:
-            // self->_lf__"+action.getName()+".is_timer = false;
-            constructorCode.pr(String.join("\n",
-                "self->_lf__" + action.getName() + ".is_physical = " + isPhysical + ";",
-                !(action.getPolicy() == null || action.getPolicy().isEmpty()) ?
-                    "self->_lf__" + action.getName() + ".policy = " + action.getPolicy() + ";" :
-                    "",
-                // Need to set the element_size in the trigger_t and the action struct.
-                "self->_lf__" + action.getName() + ".tmplt.type.element_size = " + elementSize
-                    + ";",
-                "self->_lf_" + action.getName() + ".type.element_size = " + elementSize + ";"
-            ));
-        }
+    // Next handle actions.
+    for (Action action : ASTUtils.allActions(tpr.reactor())) {
+      createTriggerT(body, action, triggerMap, constructorCode, types);
+      var isPhysical = "true";
+      if (action.getOrigin().equals(ActionOrigin.LOGICAL)) {
+        isPhysical = "false";
+      }
+      var elementSize = "0";
+      // If the action type is 'void', we need to avoid generating the code
+      // 'sizeof(void)', which some compilers reject.
+      var rootType = action.getType() != null ? CUtil.rootType(types.getTargetType(action)) : null;
+      if (rootType != null && !rootType.equals("void")) {
+        elementSize = "sizeof(" + rootType + ")";
+      }
 
-        // Next handle inputs.
-        for (Input input : ASTUtils.allInputs(tpr.reactor())) {
-            createTriggerT(body, input, triggerMap, constructorCode, types);
-        }
+      // Since the self struct is allocated using calloc, there is no need to set:
+      // self->_lf__"+action.getName()+".is_timer = false;
+      constructorCode.pr(
+          String.join(
+              "\n",
+              "self->_lf__" + action.getName() + ".is_physical = " + isPhysical + ";",
+              !(action.getPolicy() == null || action.getPolicy().isEmpty())
+                  ? "self->_lf__" + action.getName() + ".policy = " + action.getPolicy() + ";"
+                  : "",
+              // Need to set the element_size in the trigger_t and the action struct.
+              "self->_lf__" + action.getName() + ".tmplt.type.element_size = " + elementSize + ";",
+              "self->_lf_" + action.getName() + ".type.element_size = " + elementSize + ";"));
+    }
 
-        // Next handle watchdogs.
-        for (Watchdog watchdog : ASTUtils.allWatchdogs(tpr.reactor())) {
-            createTriggerT(body, watchdog, triggerMap, constructorCode, types);
-        }
+    // Next handle inputs.
+    for (Input input : ASTUtils.allInputs(tpr.reactor())) {
+      createTriggerT(body, input, triggerMap, constructorCode, types);
     }
 
-    /**
-     * Define the trigger_t object on the self struct, an array of
-     * reaction_t pointers pointing to reactions triggered by this variable,
-     * and initialize the pointers in the array in the constructor.
-     * @param body The place to write the self struct entries.
-     * @param variable The trigger variable (Timer, Action, Watchdog, or Input).
-     * @param triggerMap A map from Variables to a list of the reaction indices triggered by the
-     * variable.
-     * @param constructorCode The place to write the constructor code.
-     */
-    private static void createTriggerT(
-        CodeBuilder body,
-        Variable variable,
-        LinkedHashMap<Variable, LinkedList<Integer>> triggerMap,
-        CodeBuilder constructorCode,
-        CTypes types
-    ) {
-        var varName = variable.getName();
-        // variable is a port, a timer, or an action.
-        body.pr(variable, "trigger_t _lf__"+varName+";");
-        constructorCode.pr(variable, "self->_lf__"+varName+".last = NULL;");
-        constructorCode.pr(variable, CExtensionUtils.surroundWithIfFederatedDecentralized(
-            "self->_lf__"+varName+".intended_tag = (tag_t) { .time = NEVER, .microstep = 0u};"));
+    // Next handle watchdogs.
+    for (Watchdog watchdog : ASTUtils.allWatchdogs(tpr.reactor())) {
+      createTriggerT(body, watchdog, triggerMap, constructorCode, types);
+    }
+  }
 
-        // Generate the reactions triggered table.
-        var reactionsTriggered = triggerMap.get(variable);
-        if (reactionsTriggered != null) {
-            body.pr(variable, "reaction_t* _lf__"+varName+"_reactions["+reactionsTriggered.size()+"];");
-            var count = 0;
-            for (Integer reactionTriggered : reactionsTriggered) {
-                constructorCode.prSourceLineNumber(variable);
-                constructorCode.pr(variable, "self->_lf__"+varName+"_reactions["+count+"] = &self->_lf__reaction_"+reactionTriggered+";");
-                count++;
-            }
-            // Set up the trigger_t struct's pointer to the reactions.
-            constructorCode.pr(variable, String.join("\n",
-                "self->_lf__"+varName+".reactions = &self->_lf__"+varName+"_reactions[0];",
-                "self->_lf__"+varName+".number_of_reactions = "+count+";"
-            ));
+  /**
+   * Define the trigger_t object on the self struct, an array of reaction_t pointers pointing to
+   * reactions triggered by this variable, and initialize the pointers in the array in the
+   * constructor.
+   *
+   * @param body The place to write the self struct entries.
+   * @param variable The trigger variable (Timer, Action, Watchdog, or Input).
+   * @param triggerMap A map from Variables to a list of the reaction indices triggered by the
+   *     variable.
+   * @param constructorCode The place to write the constructor code.
+   */
+  private static void createTriggerT(
+      CodeBuilder body,
+      Variable variable,
+      LinkedHashMap<Variable, LinkedList<Integer>> triggerMap,
+      CodeBuilder constructorCode,
+      CTypes types) {
+    var varName = variable.getName();
+    // variable is a port, a timer, or an action.
+    body.pr(variable, "trigger_t _lf__" + varName + ";");
+    constructorCode.pr(variable, "self->_lf__" + varName + ".last = NULL;");
+    constructorCode.pr(
+        variable,
+        CExtensionUtils.surroundWithIfFederatedDecentralized(
+            "self->_lf__"
+                + varName
+                + ".intended_tag = (tag_t) { .time = NEVER, .microstep = 0u};"));
 
-            // If federated, set the physical_time_of_arrival
-            constructorCode.pr(variable, CExtensionUtils.surroundWithIfFederated(
-                "self->_lf__"+varName+".physical_time_of_arrival = NEVER;"));
-        }
-        if (variable instanceof Input) {
-            var rootType = CUtil.rootType(types.getTargetType((Input) variable));
-            // Since the self struct is allocated using calloc, there is no need to set falsy fields.
-            // If the input type is 'void', we need to avoid generating the code
-            // 'sizeof(void)', which some compilers reject.
-            var size = (rootType.equals("void")) ? "0" : "sizeof("+rootType+")";
+    // Generate the reactions triggered table.
+    var reactionsTriggered = triggerMap.get(variable);
+    if (reactionsTriggered != null) {
+      body.pr(
+          variable,
+          "reaction_t* _lf__" + varName + "_reactions[" + reactionsTriggered.size() + "];");
+      var count = 0;
+      for (Integer reactionTriggered : reactionsTriggered) {
+        constructorCode.prSourceLineNumber(variable);
+        constructorCode.pr(
+            variable,
+            "self->_lf__"
+                + varName
+                + "_reactions["
+                + count
+                + "] = &self->_lf__reaction_"
+                + reactionTriggered
+                + ";");
+        count++;
+      }
+      // Set up the trigger_t struct's pointer to the reactions.
+      constructorCode.pr(
+          variable,
+          String.join(
+              "\n",
+              "self->_lf__" + varName + ".reactions = &self->_lf__" + varName + "_reactions[0];",
+              "self->_lf__" + varName + ".number_of_reactions = " + count + ";"));
 
-            constructorCode.pr("self->_lf__"+varName+".tmplt.type.element_size = "+size+";");
-            body.pr(
-                CExtensionUtils.surroundWithIfFederated(
-                    CExtensionUtils.createPortStatusFieldForInput((Input) variable)
-                )
-            );
-        }
+      // If federated, set the physical_time_of_arrival
+      constructorCode.pr(
+          variable,
+          CExtensionUtils.surroundWithIfFederated(
+              "self->_lf__" + varName + ".physical_time_of_arrival = NEVER;"));
     }
+    if (variable instanceof Input) {
+      var rootType = CUtil.rootType(types.getTargetType((Input) variable));
+      // Since the self struct is allocated using calloc, there is no need to set falsy fields.
+      // If the input type is 'void', we need to avoid generating the code
+      // 'sizeof(void)', which some compilers reject.
+      var size = (rootType.equals("void")) ? "0" : "sizeof(" + rootType + ")";
 
-    public static void generateBuiltinTriggeredReactionsArray(
-            Set<Integer> reactions,
-            String name,
-            CodeBuilder body,
-            CodeBuilder constructorCode
-    ) {
-        body.pr(String.join("\n",
-            "trigger_t _lf__"+name+";",
-            "reaction_t* _lf__"+name+"_reactions["+reactions.size()+"];"
-        ));
-        constructorCode.pr(CExtensionUtils.surroundWithIfFederatedDecentralized(
-            "self->_lf__"+name+".intended_tag = (tag_t) { .time = NEVER, .microstep = 0u};"));
-        var i = 0;
-        for (Integer reactionIndex : reactions) {
-            constructorCode.pr("self->_lf__"+name+"_reactions["+i+++"] = &self->_lf__reaction_"+reactionIndex+";");
-        }
-        constructorCode.pr(String.join("\n",
-            "self->_lf__"+name+".last = NULL;",
-            "self->_lf__"+name+".reactions = &self->_lf__"+name+"_reactions[0];",
-            "self->_lf__"+name+".number_of_reactions = "+reactions.size()+";",
-            "self->_lf__"+name+".is_timer = false;"
-        ));
+      constructorCode.pr("self->_lf__" + varName + ".tmplt.type.element_size = " + size + ";");
+      body.pr(
+          CExtensionUtils.surroundWithIfFederated(
+              CExtensionUtils.createPortStatusFieldForInput((Input) variable)));
+    }
+  }
+
+  public static void generateBuiltinTriggeredReactionsArray(
+      Set<Integer> reactions, String name, CodeBuilder body, CodeBuilder constructorCode) {
+    body.pr(
+        String.join(
+            "\n",
+            "trigger_t _lf__" + name + ";",
+            "reaction_t* _lf__" + name + "_reactions[" + reactions.size() + "];"));
+    constructorCode.pr(
+        CExtensionUtils.surroundWithIfFederatedDecentralized(
+            "self->_lf__" + name + ".intended_tag = (tag_t) { .time = NEVER, .microstep = 0u};"));
+    var i = 0;
+    for (Integer reactionIndex : reactions) {
+      constructorCode.pr(
+          "self->_lf__"
+              + name
+              + "_reactions["
+              + i++
+              + "] = &self->_lf__reaction_"
+              + reactionIndex
+              + ";");
     }
+    constructorCode.pr(
+        String.join(
+            "\n",
+            "self->_lf__" + name + ".last = NULL;",
+            "self->_lf__" + name + ".reactions = &self->_lf__" + name + "_reactions[0];",
+            "self->_lf__" + name + ".number_of_reactions = " + reactions.size() + ";",
+            "self->_lf__" + name + ".is_timer = false;"));
+  }
+
+  public static String generateBuiltinTriggersTable(int reactionCount, String name) {
+    return String.join(
+        "\n",
+        List.of(
+            "// Array of pointers to " + name + " triggers.",
+            (reactionCount > 0
+                    ? "reaction_t* _lf_" + name + "_reactions[" + reactionCount + "]"
+                    : "reaction_t** _lf_" + name + "_reactions = NULL")
+                + ";",
+            "int _lf_" + name + "_reactions_size = " + reactionCount + ";"));
+  }
 
-    public static String generateBuiltinTriggersTable(int reactionCount, String name) {
-        return String.join("\n", List.of(
-            "// Array of pointers to "+name+" triggers.",
-            (reactionCount > 0 ?
-            "reaction_t* _lf_"+name+"_reactions["+reactionCount+"]" :
-            "reaction_t** _lf_"+name+"_reactions = NULL") + ";",
-            "int _lf_"+name+"_reactions_size = "+reactionCount+";"
-        ));
+  /** Generate the _lf_trigger_startup_reactions function. */
+  public static String generateLfTriggerStartupReactions(boolean hasModalReactors) {
+    var s = new StringBuilder();
+    s.append("void _lf_trigger_startup_reactions(environment_t *env) {");
+    s.append("\n");
+    if (hasModalReactors) {
+      s.append(
+          String.join(
+              "\n",
+              "    for (int i = 0; i < env->_lf_startup_reactions_size; i++) {",
+              "        if (env->_lf_startup_reactions[i] != NULL) {",
+              "            if (env->_lf_startup_reactions[i]->mode != NULL) {",
+              "                // Skip reactions in modes",
+              "                continue;",
+              "            }",
+              "            _lf_trigger_reaction(env, env->_lf_startup_reactions[i], -1);",
+              "        }",
+              "    }",
+              "    _lf_handle_mode_startup_reset_reactions(",
+              "        env->_lf_startup_reactions, env->_lf_startup_reactions_size,",
+              "        NULL, 0,",
+              "        _lf_modal_reactor_states, _lf_modal_reactor_states_size);"));
+    } else {
+      s.append(
+          String.join(
+              "\n",
+              "    for (int i = 0; i < env->_lf_startup_reactions_size; i++) {",
+              "        if (env->_lf_startup_reactions[i] != NULL) {",
+              "            _lf_trigger_reaction(env, env->_lf_startup_reactions[i], -1);",
+              "        }",
+              "    }"));
     }
+    s.append("\n");
+    s.append("}\n");
+    return s.toString();
+  }
 
-    /**
-     * Generate the _lf_trigger_startup_reactions function.
-     */
-    public static String generateLfTriggerStartupReactions(boolean hasModalReactors) {
-        var s = new StringBuilder();
-        s.append("void _lf_trigger_startup_reactions(environment_t *env) {");
-        s.append("\n");
-        if (hasModalReactors) {
-            s.append(String.join("\n",
-                "    for (int i = 0; i < env->_lf_startup_reactions_size; i++) {",
-                "        if (env->_lf_startup_reactions[i] != NULL) {",
-                "            if (env->_lf_startup_reactions[i]->mode != NULL) {",
+  /** Generate the _lf_trigger_shutdown_reactions function. */
+  public static String generateLfTriggerShutdownReactions(
+      int shutdownReactionCount, boolean hasModalReactors) {
+    var s = new StringBuilder();
+    s.append("bool _lf_trigger_shutdown_reactions(environment_t *env) {\n");
+    if (shutdownReactionCount > 0) {
+      if (hasModalReactors) {
+        s.append(
+            String.join(
+                "\n",
+                "    for (int i = 0; i < _lf_shutdown_reactions_size; i++) {",
+                "        if (_lf_shutdown_reactions[i] != NULL) {",
+                "            if (_lf_shutdown_reactions[i]->mode != NULL) {",
                 "                // Skip reactions in modes",
                 "                continue;",
                 "            }",
-                "            _lf_trigger_reaction(env, env->_lf_startup_reactions[i], -1);",
+                "            _lf_trigger_reaction(env, _lf_shutdown_reactions[i], -1);", // FIXME:
+                // Enclaves
+                // hack
                 "        }",
                 "    }",
-                "    _lf_handle_mode_startup_reset_reactions(",
-                "        env->_lf_startup_reactions, env->_lf_startup_reactions_size,",
-                "        NULL, 0,",
-                "        _lf_modal_reactor_states, _lf_modal_reactor_states_size);"
-            ));
-        } else {
-            s.append(String.join("\n",
-                "    for (int i = 0; i < env->_lf_startup_reactions_size; i++) {",
-                "        if (env->_lf_startup_reactions[i] != NULL) {",
-                "            _lf_trigger_reaction(env, env->_lf_startup_reactions[i], -1);",
+                "    _lf_handle_mode_shutdown_reactions(env, _lf_shutdown_reactions_size);",
+                "    return true;"));
+      } else {
+        s.append(
+            String.join(
+                "\n",
+                "    for (int i = 0; i < _lf_shutdown_reactions_size; i++) {",
+                "        if (_lf_shutdown_reactions[i] != NULL) {",
+                "            _lf_trigger_reaction(env, _lf_shutdown_reactions[i], -1);", // FIXME:
+                // Enclaves
+                // hack
                 "        }",
-                "    }"
-            ));
-        }
-        s.append("\n");
-        s.append("}\n");
-        return s.toString();
-    }
-
-    /**
-     * Generate the _lf_trigger_shutdown_reactions function.
-     */
-    public static String generateLfTriggerShutdownReactions(int shutdownReactionCount, boolean hasModalReactors) {
-        var s = new StringBuilder();
-        s.append("bool _lf_trigger_shutdown_reactions(environment_t *env) {\n");
-        if (shutdownReactionCount > 0) {
-            if (hasModalReactors) {
-                s.append(String.join("\n",
-                    "    for (int i = 0; i < _lf_shutdown_reactions_size; i++) {",
-                    "        if (_lf_shutdown_reactions[i] != NULL) {",
-                    "            if (_lf_shutdown_reactions[i]->mode != NULL) {",
-                    "                // Skip reactions in modes",
-                    "                continue;",
-                    "            }",
-                    "            _lf_trigger_reaction(env, _lf_shutdown_reactions[i], -1);", // FIXME: Enclaves hack
-                    "        }",
-                    "    }",
-                    "    _lf_handle_mode_shutdown_reactions(env, _lf_shutdown_reactions_size);",
-                    "    return true;"
-                ));
-            } else {
-                s.append(String.join("\n",
-                    "    for (int i = 0; i < _lf_shutdown_reactions_size; i++) {",
-                    "        if (_lf_shutdown_reactions[i] != NULL) {",
-                    "            _lf_trigger_reaction(env, _lf_shutdown_reactions[i], -1);", //FIXME: Enclaves hack
-                    "        }",
-                    "    }",
-                    "    return true;"
-                ));
-            }
-            s.append("\n");
-        } else {
-            s.append("    return false;\n");
-        }
-        s.append("}\n");
-        return s.toString();
+                "    }",
+                "    return true;"));
+      }
+      s.append("\n");
+    } else {
+      s.append("    return false;\n");
     }
+    s.append("}\n");
+    return s.toString();
+  }
 
-    /**
-     * Generate the _lf_handle_mode_triggered_reactions function.
-     */
-    public static String generateLfModeTriggeredReactions(
-            int resetReactionCount,
-            boolean hasModalReactors
-    ) {
-        if (!hasModalReactors) {
-            return "";
-        }
-        var s = new StringBuilder();
-        s.append("void _lf_handle_mode_triggered_reactions() {\n");
-        s.append("    _lf_handle_mode_startup_reset_reactions(\n");
-        s.append("        _lf_startup_reactions, _lf_startup_reactions_size,\n");
-        s.append("        _lf_reset_reactions, _lf_reset_reactions_size,\n");
-        s.append("        _lf_modal_reactor_states, _lf_modal_reactor_states_size);\n");
-        s.append("}\n");
-        return s.toString();
+  /** Generate the _lf_handle_mode_triggered_reactions function. */
+  public static String generateLfModeTriggeredReactions(
+      int resetReactionCount, boolean hasModalReactors) {
+    if (!hasModalReactors) {
+      return "";
     }
+    var s = new StringBuilder();
+    s.append("void _lf_handle_mode_triggered_reactions() {\n");
+    s.append("    _lf_handle_mode_startup_reset_reactions(\n");
+    s.append("        _lf_startup_reactions, _lf_startup_reactions_size,\n");
+    s.append("        _lf_reset_reactions, _lf_reset_reactions_size,\n");
+    s.append("        _lf_modal_reactor_states, _lf_modal_reactor_states_size);\n");
+    s.append("}\n");
+    return s.toString();
+  }
 
-    /** Generate a reaction function definition for a reactor.
-     *  This function will have a single argument that is a void* pointing to
-     *  a struct that contains parameters, state variables, inputs (triggering or not),
-     *  actions (triggering or produced), and outputs.
-     *  @param reaction The reaction.
-     *  @param tpr The reactor.
-     *  @param reactionIndex The position of the reaction within the reactor.
-     */
-    public static String generateReaction(
-        Reaction reaction,
-        TypeParameterizedReactor tpr,
-        int reactionIndex,
-        Instantiation mainDef,
-        ErrorReporter errorReporter,
-        CTypes types,
-        TargetConfig targetConfig,
-        boolean requiresType
-    ) {
-        var code = new CodeBuilder();
-        var body = ASTUtils.toText(getCode(types, reaction, tpr));
-        String init = generateInitializationForReaction(
-                        body, reaction, tpr, reactionIndex,
-                        types, errorReporter, mainDef,
-                        requiresType);
+  /**
+   * Generate a reaction function definition for a reactor. This function will have a single
+   * argument that is a void* pointing to a struct that contains parameters, state variables, inputs
+   * (triggering or not), actions (triggering or produced), and outputs.
+   *
+   * @param reaction The reaction.
+   * @param tpr The reactor.
+   * @param reactionIndex The position of the reaction within the reactor.
+   */
+  public static String generateReaction(
+      Reaction reaction,
+      TypeParameterizedReactor tpr,
+      int reactionIndex,
+      Instantiation mainDef,
+      ErrorReporter errorReporter,
+      CTypes types,
+      TargetConfig targetConfig,
+      boolean requiresType) {
+    var code = new CodeBuilder();
+    var body = ASTUtils.toText(getCode(types, reaction, tpr));
+    String init =
+        generateInitializationForReaction(
+            body, reaction, tpr, reactionIndex, types, errorReporter, mainDef, requiresType);
 
-        code.pr(
-            "#include " + StringUtil.addDoubleQuotes(
-                CCoreFilesUtils.getCTargetSetHeader()));
+    code.pr("#include " + StringUtil.addDoubleQuotes(CCoreFilesUtils.getCTargetSetHeader()));
 
-        CMethodGenerator.generateMacrosForMethods(tpr, code);
-        code.pr(generateFunction(
+    CMethodGenerator.generateMacrosForMethods(tpr, code);
+    code.pr(
+        generateFunction(
             generateReactionFunctionHeader(tpr, reactionIndex),
-            init, getCode(types, reaction, tpr)
-        ));
-        // Now generate code for the late function, if there is one
-        // Note that this function can only be defined on reactions
-        // in federates that have inputs from a logical connection.
-        if (reaction.getStp() != null) {
-            code.pr(generateFunction(
-                generateStpFunctionHeader(tpr, reactionIndex),
-                init, reaction.getStp().getCode()));
-        }
-
-        // Now generate code for the deadline violation function, if there is one.
-        if (reaction.getDeadline() != null) {
-            code.pr(generateFunction(
-                generateDeadlineFunctionHeader(tpr, reactionIndex),
-                init, reaction.getDeadline().getCode()));
-        }
-        CMethodGenerator.generateMacroUndefsForMethods(tpr.reactor(), code);
-        code.pr(
-            "#include " + StringUtil.addDoubleQuotes(
-                CCoreFilesUtils.getCTargetSetUndefHeader()));
-        return code.toString();
+            init,
+            getCode(types, reaction, tpr)));
+    // Now generate code for the late function, if there is one
+    // Note that this function can only be defined on reactions
+    // in federates that have inputs from a logical connection.
+    if (reaction.getStp() != null) {
+      code.pr(
+          generateFunction(
+              generateStpFunctionHeader(tpr, reactionIndex), init, reaction.getStp().getCode()));
     }
 
-    private static Code getCode(CTypes types, Reaction r, TypeParameterizedReactor tpr) {
-        if (r.getCode() != null) return r.getCode();
-        Code ret = LfFactory.eINSTANCE.createCode();
-        ret.setBody(
-            CReactorHeaderFileGenerator.nonInlineInitialization(r, tpr) + "\n"
-                + r.getName() + "( " + CReactorHeaderFileGenerator.reactionArguments(r, tpr) + " );");
-        return ret;
+    // Now generate code for the deadline violation function, if there is one.
+    if (reaction.getDeadline() != null) {
+      code.pr(
+          generateFunction(
+              generateDeadlineFunctionHeader(tpr, reactionIndex),
+              init,
+              reaction.getDeadline().getCode()));
     }
+    CMethodGenerator.generateMacroUndefsForMethods(tpr.reactor(), code);
+    code.pr("#include " + StringUtil.addDoubleQuotes(CCoreFilesUtils.getCTargetSetUndefHeader()));
+    return code.toString();
+  }
 
-    public static String generateFunction(String header, String init, Code code) {
-        var function = new CodeBuilder();
-        function.pr(header + " {");
-        function.indent();
-        function.pr(init);
-        function.prSourceLineNumber(code);
-        function.pr(ASTUtils.toText(code));
-        function.unindent();
-        function.pr("}");
-        return function.toString();
-    }
+  private static Code getCode(CTypes types, Reaction r, TypeParameterizedReactor tpr) {
+    if (r.getCode() != null) return r.getCode();
+    Code ret = LfFactory.eINSTANCE.createCode();
+    ret.setBody(
+        CReactorHeaderFileGenerator.nonInlineInitialization(r, tpr)
+            + "\n"
+            + r.getName()
+            + "( "
+            + CReactorHeaderFileGenerator.reactionArguments(r, tpr)
+            + " );");
+    return ret;
+  }
 
-    /**
-     * Returns the name of the deadline function for reaction.
-     * @param tpr The reactor with the deadline
-     * @param reactionIndex The number assigned to this reaction deadline
-     */
-    public static String generateDeadlineFunctionName(TypeParameterizedReactor tpr, int reactionIndex) {
-        return CUtil.getName(tpr).toLowerCase() + "_deadline_function" + reactionIndex;
-    }
+  public static String generateFunction(String header, String init, Code code) {
+    var function = new CodeBuilder();
+    function.pr(header + " {");
+    function.indent();
+    function.pr(init);
+    function.prSourceLineNumber(code);
+    function.pr(ASTUtils.toText(code));
+    function.unindent();
+    function.pr("}");
+    return function.toString();
+  }
 
-    /**
-     * Return the function name for specified reaction of the
-     * specified reactor.
-     * @param tpr The reactor
-     * @param reactionIndex The reaction index.
-     * @return The function name for the reaction.
-     */
-    public static String generateReactionFunctionName(TypeParameterizedReactor tpr, int reactionIndex) {
-        return CUtil.getName(tpr).toLowerCase() + "reaction_function_" + reactionIndex;
-    }
+  /**
+   * Returns the name of the deadline function for reaction.
+   *
+   * @param tpr The reactor with the deadline
+   * @param reactionIndex The number assigned to this reaction deadline
+   */
+  public static String generateDeadlineFunctionName(
+      TypeParameterizedReactor tpr, int reactionIndex) {
+    return CUtil.getName(tpr).toLowerCase() + "_deadline_function" + reactionIndex;
+  }
 
-    /**
-     * Returns the name of the stp function for reaction.
-     * @param tpr The reactor with the stp
-     * @param reactionIndex The number assigned to this reaction deadline
-     */
-    public static String generateStpFunctionName(TypeParameterizedReactor tpr, int reactionIndex) {
-        return CUtil.getName(tpr).toLowerCase() + "_STP_function" + reactionIndex;
-    }
+  /**
+   * Return the function name for specified reaction of the specified reactor.
+   *
+   * @param tpr The reactor
+   * @param reactionIndex The reaction index.
+   * @return The function name for the reaction.
+   */
+  public static String generateReactionFunctionName(
+      TypeParameterizedReactor tpr, int reactionIndex) {
+    return CUtil.getName(tpr).toLowerCase() + "reaction_function_" + reactionIndex;
+  }
 
-    /** Return the top level C function header for the deadline function numbered "reactionIndex" in "r"
-     *  @param tpr The reactor declaration
-     *  @param reactionIndex The reaction index.
-     *  @return The function name for the deadline function.
-     */
-    public static String generateDeadlineFunctionHeader(TypeParameterizedReactor tpr,
-                                                        int reactionIndex) {
-        String functionName = generateDeadlineFunctionName(tpr, reactionIndex);
-        return generateFunctionHeader(functionName);
-    }
+  /**
+   * Returns the name of the stp function for reaction.
+   *
+   * @param tpr The reactor with the stp
+   * @param reactionIndex The number assigned to this reaction deadline
+   */
+  public static String generateStpFunctionName(TypeParameterizedReactor tpr, int reactionIndex) {
+    return CUtil.getName(tpr).toLowerCase() + "_STP_function" + reactionIndex;
+  }
 
-    /** Return the top level C function header for the reaction numbered "reactionIndex" in "r"
-     *  @param tpr The reactor declaration
-     *  @param reactionIndex The reaction index.
-     *  @return The function name for the reaction.
-     */
-    public static String generateReactionFunctionHeader(TypeParameterizedReactor tpr,
-                                                        int reactionIndex) {
-        String functionName = generateReactionFunctionName(tpr, reactionIndex);
-        return generateFunctionHeader(functionName);
-    }
+  /**
+   * Return the top level C function header for the deadline function numbered "reactionIndex" in
+   * "r"
+   *
+   * @param tpr The reactor declaration
+   * @param reactionIndex The reaction index.
+   * @return The function name for the deadline function.
+   */
+  public static String generateDeadlineFunctionHeader(
+      TypeParameterizedReactor tpr, int reactionIndex) {
+    String functionName = generateDeadlineFunctionName(tpr, reactionIndex);
+    return generateFunctionHeader(functionName);
+  }
 
-    public static String generateStpFunctionHeader(TypeParameterizedReactor tpr,
-                                                   int reactionIndex) {
-        String functionName = generateStpFunctionName(tpr, reactionIndex);
-        return generateFunctionHeader(functionName);
-    }
+  /**
+   * Return the top level C function header for the reaction numbered "reactionIndex" in "r"
+   *
+   * @param tpr The reactor declaration
+   * @param reactionIndex The reaction index.
+   * @return The function name for the reaction.
+   */
+  public static String generateReactionFunctionHeader(
+      TypeParameterizedReactor tpr, int reactionIndex) {
+    String functionName = generateReactionFunctionName(tpr, reactionIndex);
+    return generateFunctionHeader(functionName);
+  }
 
-    /**
-     * Return the start of a function declaration for a function that takes
-     * a {@code void*} argument and returns void.
-     *
-     * @param functionName
-     * @return
-     */
-    public static String generateFunctionHeader(String functionName) {
-        return "void " + functionName + "(void* instance_args)";
-    }
+  public static String generateStpFunctionHeader(TypeParameterizedReactor tpr, int reactionIndex) {
+    String functionName = generateStpFunctionName(tpr, reactionIndex);
+    return generateFunctionHeader(functionName);
+  }
+
+  /**
+   * Return the start of a function declaration for a function that takes a {@code void*} argument
+   * and returns void.
+   *
+   * @param functionName
+   * @return
+   */
+  public static String generateFunctionHeader(String functionName) {
+    return "void " + functionName + "(void* instance_args)";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CReactorHeaderFileGenerator.java b/org.lflang/src/org/lflang/generator/c/CReactorHeaderFileGenerator.java
index 993168cad9..4f6a29b405 100644
--- a/org.lflang/src/org/lflang/generator/c/CReactorHeaderFileGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CReactorHeaderFileGenerator.java
@@ -6,7 +6,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.lf.Instantiation;
@@ -23,44 +22,61 @@
 /** Generate user-visible header files. */
 public class CReactorHeaderFileGenerator {
 
-    /** Functional interface for generating auxiliary structs such as port structs. */
-    public interface GenerateAuxiliaryStructs {
-        void generate(CodeBuilder b, TypeParameterizedReactor r, boolean userFacing);
-    }
-
-    /** Return the path to the user-visible header file that would be generated for {@code r}. */
-    public static Path outputPath(TypeParameterizedReactor tpr) {
-        return Path.of(Path.of(tpr.reactor().eResource().getURI().toFileString())
-                .getFileName().toString().replaceFirst("[.][^.]+$", ""))
-            .resolve(tpr.getName() + ".h");
-    }
-
-    public static void doGenerate(CTypes types, TypeParameterizedReactor tpr, CFileConfig fileConfig, GenerateAuxiliaryStructs generator, Function<Reactor, String> topLevelPreamble) throws IOException {
-        String contents = generateHeaderFile(types, tpr, generator, topLevelPreamble.apply(tpr.reactor()));
-        FileUtil.writeToFile(contents, fileConfig.getIncludePath().resolve(outputPath(tpr)));
-    }
-    private static String generateHeaderFile(CTypes types, TypeParameterizedReactor tpr, GenerateAuxiliaryStructs generator, String topLevelPreamble) {
-        CodeBuilder builder = new CodeBuilder();
-        appendIncludeGuard(builder, tpr);
-        builder.pr(topLevelPreamble);
-        appendPoundIncludes(builder);
-        tpr.doDefines(builder);
-        appendSelfStruct(builder, types, tpr);
-        generator.generate(builder, tpr, true);
-        for (Reaction reaction : tpr.reactor().getReactions()) {
-            appendSignature(builder, types, reaction, tpr);
-        }
-        builder.pr("#endif");
-        return builder.getCode();
-    }
-
-    private static void appendIncludeGuard(CodeBuilder builder, TypeParameterizedReactor r) {
-        String macro = CUtil.getName(r) + "_H";
-        builder.pr("#ifndef " + macro);
-        builder.pr("#define " + macro);
-    }
-    private static void appendPoundIncludes(CodeBuilder builder) {
-        builder.pr("""
+  /** Functional interface for generating auxiliary structs such as port structs. */
+  public interface GenerateAuxiliaryStructs {
+    void generate(CodeBuilder b, TypeParameterizedReactor r, boolean userFacing);
+  }
+
+  /** Return the path to the user-visible header file that would be generated for {@code r}. */
+  public static Path outputPath(TypeParameterizedReactor tpr) {
+    return Path.of(
+            Path.of(tpr.reactor().eResource().getURI().toFileString())
+                .getFileName()
+                .toString()
+                .replaceFirst("[.][^.]+$", ""))
+        .resolve(tpr.getName() + ".h");
+  }
+
+  public static void doGenerate(
+      CTypes types,
+      TypeParameterizedReactor tpr,
+      CFileConfig fileConfig,
+      GenerateAuxiliaryStructs generator,
+      Function<Reactor, String> topLevelPreamble)
+      throws IOException {
+    String contents =
+        generateHeaderFile(types, tpr, generator, topLevelPreamble.apply(tpr.reactor()));
+    FileUtil.writeToFile(contents, fileConfig.getIncludePath().resolve(outputPath(tpr)));
+  }
+
+  private static String generateHeaderFile(
+      CTypes types,
+      TypeParameterizedReactor tpr,
+      GenerateAuxiliaryStructs generator,
+      String topLevelPreamble) {
+    CodeBuilder builder = new CodeBuilder();
+    appendIncludeGuard(builder, tpr);
+    builder.pr(topLevelPreamble);
+    appendPoundIncludes(builder);
+    tpr.doDefines(builder);
+    appendSelfStruct(builder, types, tpr);
+    generator.generate(builder, tpr, true);
+    for (Reaction reaction : tpr.reactor().getReactions()) {
+      appendSignature(builder, types, reaction, tpr);
+    }
+    builder.pr("#endif");
+    return builder.getCode();
+  }
+
+  private static void appendIncludeGuard(CodeBuilder builder, TypeParameterizedReactor r) {
+    String macro = CUtil.getName(r) + "_H";
+    builder.pr("#ifndef " + macro);
+    builder.pr("#define " + macro);
+  }
+
+  private static void appendPoundIncludes(CodeBuilder builder) {
+    builder.pr(
+        """
             #ifdef __cplusplus
             extern "C" {
             #endif
@@ -71,135 +87,167 @@ private static void appendPoundIncludes(CodeBuilder builder) {
             }
             #endif
             """);
-    }
-
-    private static String userFacingSelfType(TypeParameterizedReactor tpr) {
-        return tpr.getName().toLowerCase() + "_self_t";
-    }
-
-    private static void appendSelfStruct(CodeBuilder builder, CTypes types, TypeParameterizedReactor tpr) {
-        builder.pr("typedef struct " + userFacingSelfType(tpr) + "{");
-        for (Parameter p : tpr.reactor().getParameters()) {
-            builder.pr(types.getTargetType(p) + " " + p.getName() + ";");
-        }
-        for (StateVar s : tpr.reactor().getStateVars()) {
-            builder.pr(types.getTargetType(s) + " " + s.getName() + ";");
-        }
-        builder.pr("int end[0]; // placeholder; MSVC does not compile empty structs");
-        builder.pr("} " + userFacingSelfType(tpr) + ";");
-    }
-
-    private static void appendSignature(CodeBuilder builder, CTypes types, Reaction r, TypeParameterizedReactor tpr) {
-        if (r.getName() != null) builder.pr("void " + r.getName() + "(" + reactionParameters(r, tpr) + ");");
-    }
-
-    private static String reactionParameters(Reaction r, TypeParameterizedReactor tpr) {
-        return Stream.concat(Stream.of(userFacingSelfType(tpr) + "* self"), portVariableStream(r, tpr)
-            .map(tv -> tv.getType(true) + tv.getName()))
-            .collect(Collectors.joining(", "));
-    }
-
-    private static String getApiSelfStruct(TypeParameterizedReactor tpr) {
-        return "(" + userFacingSelfType(tpr) + "*) (((char*) self) + sizeof(self_base_t))";
-    }
-
-    /** Generate initialization code that is needed if {@code r} is not inlined. */
-    public static String nonInlineInitialization(Reaction r, TypeParameterizedReactor reactor) {
-        var mainDef = LfFactory.eINSTANCE.createInstantiation();
-        mainDef.setName(reactor.getName());
-        mainDef.setReactorClass(ASTUtils.findMainReactor(reactor.reactor().eResource()));
-        return portVariableStream(r, reactor)
-            .map(it -> it.container == null ? "" : it.getWidth() == null ?
-                String.format("%s %s = (%s) %s;", it.getType(false), it.getAlias(), it.getType(false), it.getRvalue())
-                : String.format("""
+  }
+
+  private static String userFacingSelfType(TypeParameterizedReactor tpr) {
+    return tpr.getName().toLowerCase() + "_self_t";
+  }
+
+  private static void appendSelfStruct(
+      CodeBuilder builder, CTypes types, TypeParameterizedReactor tpr) {
+    builder.pr("typedef struct " + userFacingSelfType(tpr) + "{");
+    for (Parameter p : tpr.reactor().getParameters()) {
+      builder.pr(types.getTargetType(p) + " " + p.getName() + ";");
+    }
+    for (StateVar s : tpr.reactor().getStateVars()) {
+      builder.pr(types.getTargetType(s) + " " + s.getName() + ";");
+    }
+    builder.pr("int end[0]; // placeholder; MSVC does not compile empty structs");
+    builder.pr("} " + userFacingSelfType(tpr) + ";");
+  }
+
+  private static void appendSignature(
+      CodeBuilder builder, CTypes types, Reaction r, TypeParameterizedReactor tpr) {
+    if (r.getName() != null)
+      builder.pr("void " + r.getName() + "(" + reactionParameters(r, tpr) + ");");
+  }
+
+  private static String reactionParameters(Reaction r, TypeParameterizedReactor tpr) {
+    return Stream.concat(
+            Stream.of(userFacingSelfType(tpr) + "* self"),
+            portVariableStream(r, tpr).map(tv -> tv.getType(true) + tv.getName()))
+        .collect(Collectors.joining(", "));
+  }
+
+  private static String getApiSelfStruct(TypeParameterizedReactor tpr) {
+    return "(" + userFacingSelfType(tpr) + "*) (((char*) self) + sizeof(self_base_t))";
+  }
+
+  /** Generate initialization code that is needed if {@code r} is not inlined. */
+  public static String nonInlineInitialization(Reaction r, TypeParameterizedReactor reactor) {
+    var mainDef = LfFactory.eINSTANCE.createInstantiation();
+    mainDef.setName(reactor.getName());
+    mainDef.setReactorClass(ASTUtils.findMainReactor(reactor.reactor().eResource()));
+    return portVariableStream(r, reactor)
+        .map(
+            it ->
+                it.container == null
+                    ? ""
+                    : it.getWidth() == null
+                        ? String.format(
+                            "%s %s = (%s) %s;",
+                            it.getType(false), it.getAlias(), it.getType(false), it.getRvalue())
+                        : String.format(
+                            """
                     %s %s[%s];
                     for (int i = 0; i < %s; i++) {
                         %s[i] = (%s) self->_lf_%s[i].%s;
                     }
                     """,
-                    it.getType(true).replaceFirst("\\*", ""),
-                    it.getAlias(),
-                    CReactionGenerator.maxContainedReactorBankWidth(
-                        reactor.reactor().getInstantiations().stream()
-                            .filter(instantiation -> new TypeParameterizedReactor(instantiation).equals(it.r))
-                            .findAny().orElseThrow(),
-                        null, 0, mainDef),
-                    "self->_lf_"+it.container.getName()+"_width",
-                    it.getAlias(),
-                    it.getType(true).replaceFirst("\\*", ""),
-                    it.container.getName(),
-                    it.getName()))
-            .collect(Collectors.joining("\n"));
-    }
-
-    /** Return a string representation of the arguments passed to the function for {@code r}. */
-    public static String reactionArguments(Reaction r, TypeParameterizedReactor reactor) {
-        return Stream.concat(Stream.of(getApiSelfStruct(reactor)), portVariableStream(r, reactor)
+                            it.getType(true).replaceFirst("\\*", ""),
+                            it.getAlias(),
+                            CReactionGenerator.maxContainedReactorBankWidth(
+                                reactor.reactor().getInstantiations().stream()
+                                    .filter(
+                                        instantiation ->
+                                            new TypeParameterizedReactor(instantiation)
+                                                .equals(it.r))
+                                    .findAny()
+                                    .orElseThrow(),
+                                null,
+                                0,
+                                mainDef),
+                            "self->_lf_" + it.container.getName() + "_width",
+                            it.getAlias(),
+                            it.getType(true).replaceFirst("\\*", ""),
+                            it.container.getName(),
+                            it.getName()))
+        .collect(Collectors.joining("\n"));
+  }
+
+  /** Return a string representation of the arguments passed to the function for {@code r}. */
+  public static String reactionArguments(Reaction r, TypeParameterizedReactor reactor) {
+    return Stream.concat(
+            Stream.of(getApiSelfStruct(reactor)),
+            portVariableStream(r, reactor)
                 .map(it -> String.format("((%s) %s)", it.getType(true), it.getAlias())))
-            .collect(Collectors.joining(", "));
-    }
-
-    /** Return a stream of all ports referenced by the signature of {@code r}. */
-    private static Stream<PortVariable> portVariableStream(Reaction r, TypeParameterizedReactor reactorOfReaction) {
-        return varRefStream(r)
-            .map(it -> it.getVariable() instanceof TypedVariable tv ?
-                new PortVariable(
-                    tv,
-                    it.getContainer() != null ? new TypeParameterizedReactor(it.getContainer()) : reactorOfReaction,
-                    it.getContainer())
-                : null)
-            .filter(Objects::nonNull);
-    }
-
-    /**
-     * A variable that refers to a port.
-     * @param tv The variable of the variable reference.
-     * @param r The reactor in which the port is being used.
-     * @param container The {@code Instantiation} referenced in the obtaining of {@code tv}, if
-     * applicable; {@code null} otherwise.
-     */
-    private record PortVariable(TypedVariable tv, TypeParameterizedReactor r, Instantiation container) {
-        String getType(boolean userFacing) {
-            var typeName = container == null ?
-                CGenerator.variableStructType(tv, r, userFacing)
-                : CPortGenerator.localPortName(container.getReactorClass(), getName());
-            var isMultiport = ASTUtils.isMultiport(ASTUtils.allPorts(r.reactor()).stream()
-                    .filter(it -> it.getName().equals(tv.getName()))
-                    .findAny().orElseThrow());
-            return typeName + "*" + (getWidth() != null ? "*" : "") + (isMultiport ? "*" : "");
-        }
-        /** The name of the variable as it appears in the LF source. */
-        String getName() {
-            return tv.getName();
-        }
-        /** The alias of the variable that should be used in code generation. */
-        String getAlias() {
-            return getName();  // TODO: avoid naming conflicts
-        }
-        /** The width of the container, if applicable. */
-        String getWidth() {
-            return container == null || container.getWidthSpec() == null ? null : "self->_lf_"+r.getName()+"_width";
-        }
-        /** The representation of this port as used by the LF programmer. */
-        String getRvalue() {
-            return container == null ? getName() : container.getName() + "." + getName();
-        }
-    }
-
-    private static Stream<VarRef> inputVarRefStream(Reaction reaction) {
-        return varRefStream(Stream.concat(reaction.getTriggers().stream(), reaction.getSources().stream()));
-    }
-
-    private static Stream<VarRef> varRefStream(Stream<TriggerRef> toFilter) {
-        return toFilter.map(it -> it instanceof VarRef v ? v : null)
-            .filter(Objects::nonNull);
-    }
-
-    private static Stream<VarRef> outputVarRefStream(Reaction reaction) {
-        return reaction.getEffects().stream();
-    }
-
-    private static Stream<VarRef> varRefStream(Reaction reaction) {
-        return Stream.concat(inputVarRefStream(reaction), outputVarRefStream(reaction));
-    }
+        .collect(Collectors.joining(", "));
+  }
+
+  /** Return a stream of all ports referenced by the signature of {@code r}. */
+  private static Stream<PortVariable> portVariableStream(
+      Reaction r, TypeParameterizedReactor reactorOfReaction) {
+    return varRefStream(r)
+        .map(
+            it ->
+                it.getVariable() instanceof TypedVariable tv
+                    ? new PortVariable(
+                        tv,
+                        it.getContainer() != null
+                            ? new TypeParameterizedReactor(it.getContainer())
+                            : reactorOfReaction,
+                        it.getContainer())
+                    : null)
+        .filter(Objects::nonNull);
+  }
+
+  /**
+   * A variable that refers to a port.
+   *
+   * @param tv The variable of the variable reference.
+   * @param r The reactor in which the port is being used.
+   * @param container The {@code Instantiation} referenced in the obtaining of {@code tv}, if
+   *     applicable; {@code null} otherwise.
+   */
+  private record PortVariable(
+      TypedVariable tv, TypeParameterizedReactor r, Instantiation container) {
+    String getType(boolean userFacing) {
+      var typeName =
+          container == null
+              ? CGenerator.variableStructType(tv, r, userFacing)
+              : CPortGenerator.localPortName(container.getReactorClass(), getName());
+      var isMultiport =
+          ASTUtils.isMultiport(
+              ASTUtils.allPorts(r.reactor()).stream()
+                  .filter(it -> it.getName().equals(tv.getName()))
+                  .findAny()
+                  .orElseThrow());
+      return typeName + "*" + (getWidth() != null ? "*" : "") + (isMultiport ? "*" : "");
+    }
+    /** The name of the variable as it appears in the LF source. */
+    String getName() {
+      return tv.getName();
+    }
+    /** The alias of the variable that should be used in code generation. */
+    String getAlias() {
+      return getName(); // TODO: avoid naming conflicts
+    }
+    /** The width of the container, if applicable. */
+    String getWidth() {
+      return container == null || container.getWidthSpec() == null
+          ? null
+          : "self->_lf_" + r.getName() + "_width";
+    }
+    /** The representation of this port as used by the LF programmer. */
+    String getRvalue() {
+      return container == null ? getName() : container.getName() + "." + getName();
+    }
+  }
+
+  private static Stream<VarRef> inputVarRefStream(Reaction reaction) {
+    return varRefStream(
+        Stream.concat(reaction.getTriggers().stream(), reaction.getSources().stream()));
+  }
+
+  private static Stream<VarRef> varRefStream(Stream<TriggerRef> toFilter) {
+    return toFilter.map(it -> it instanceof VarRef v ? v : null).filter(Objects::nonNull);
+  }
+
+  private static Stream<VarRef> outputVarRefStream(Reaction reaction) {
+    return reaction.getEffects().stream();
+  }
+
+  private static Stream<VarRef> varRefStream(Reaction reaction) {
+    return Stream.concat(inputVarRefStream(reaction), outputVarRefStream(reaction));
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CStateGenerator.java b/org.lflang/src/org/lflang/generator/c/CStateGenerator.java
index f43d975632..69e41d1008 100644
--- a/org.lflang/src/org/lflang/generator/c/CStateGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CStateGenerator.java
@@ -7,121 +7,116 @@
 import org.lflang.lf.StateVar;
 
 public class CStateGenerator {
-    /**
-     * Generate code for state variables of a reactor in the form "stateVar.type stateVar.name;"
-     * @param reactor {@link TypeParameterizedReactor}
-     * @param types A helper object for types
-     */
-    public static String generateDeclarations(TypeParameterizedReactor reactor, CTypes types) {
-        CodeBuilder code = new CodeBuilder();
-        for (StateVar stateVar : ASTUtils.allStateVars(reactor.reactor())) {
-            code.prSourceLineNumber(stateVar);
-            code.pr(types.getTargetType(reactor.resolveType(ASTUtils.getInferredType(stateVar))) + " " + stateVar.getName() + ";");
-        }
-        return code.toString();
+  /**
+   * Generate code for state variables of a reactor in the form "stateVar.type stateVar.name;"
+   *
+   * @param reactor {@link TypeParameterizedReactor}
+   * @param types A helper object for types
+   */
+  public static String generateDeclarations(TypeParameterizedReactor reactor, CTypes types) {
+    CodeBuilder code = new CodeBuilder();
+    for (StateVar stateVar : ASTUtils.allStateVars(reactor.reactor())) {
+      code.prSourceLineNumber(stateVar);
+      code.pr(
+          types.getTargetType(reactor.resolveType(ASTUtils.getInferredType(stateVar)))
+              + " "
+              + stateVar.getName()
+              + ";");
     }
+    return code.toString();
+  }
 
-    /**
-     * If the state is initialized with a parameter, then do not use
-     * a temporary variable. Otherwise, do, because
-     * static initializers for arrays and structs have to be handled
-     * this way, and there is no way to tell whether the type of the array
-     * is a struct.
-     *
-     * @param instance {@link ReactorInstance}
-     * @param stateVar {@link StateVar}
-     * @param mode {@link ModeInstance}
-     * @return String
-     */
-    public static String generateInitializer(
-        ReactorInstance instance,
-        String selfRef,
-        StateVar stateVar,
-        ModeInstance mode,
-        CTypes types
-    ) {
-        var initExpr = getInitializerExpr(stateVar, instance);
-        String baseInitializer = generateBaseInitializer(instance.tpr, selfRef, stateVar, initExpr, types);
-        String modalReset = generateModalReset(instance, selfRef, stateVar, initExpr, mode, types);
-        return String.join("\n",
-            baseInitializer,
-            modalReset
-        );
-    }
+  /**
+   * If the state is initialized with a parameter, then do not use a temporary variable. Otherwise,
+   * do, because static initializers for arrays and structs have to be handled this way, and there
+   * is no way to tell whether the type of the array is a struct.
+   *
+   * @param instance {@link ReactorInstance}
+   * @param stateVar {@link StateVar}
+   * @param mode {@link ModeInstance}
+   * @return String
+   */
+  public static String generateInitializer(
+      ReactorInstance instance,
+      String selfRef,
+      StateVar stateVar,
+      ModeInstance mode,
+      CTypes types) {
+    var initExpr = getInitializerExpr(stateVar, instance);
+    String baseInitializer =
+        generateBaseInitializer(instance.tpr, selfRef, stateVar, initExpr, types);
+    String modalReset = generateModalReset(instance, selfRef, stateVar, initExpr, mode, types);
+    return String.join("\n", baseInitializer, modalReset);
+  }
 
-    private static String generateBaseInitializer(
-        TypeParameterizedReactor tpr,
-        String selfRef,
-        StateVar stateVar,
-        String initExpr,
-        CTypes types
-    ) {
-        if (ASTUtils.isOfTimeType(stateVar) ||
-            ASTUtils.isParameterized(stateVar) &&
-            !stateVar.getInit().getExprs().isEmpty()
-        ) {
-            return selfRef + "->" + stateVar.getName() + " = " + initExpr + ";";
-        } else {
-            var declaration = types.getVariableDeclaration(tpr,
-                ASTUtils.getInferredType(stateVar),
-                "_initial", true);
-            return String.join("\n",
-                "{ // For scoping",
-                "    static "+declaration+" = "+initExpr+";",
-                "    "+selfRef+"->"+stateVar.getName()+" = _initial;",
-                "} // End scoping."
-            );
-        }
+  private static String generateBaseInitializer(
+      TypeParameterizedReactor tpr,
+      String selfRef,
+      StateVar stateVar,
+      String initExpr,
+      CTypes types) {
+    if (ASTUtils.isOfTimeType(stateVar)
+        || ASTUtils.isParameterized(stateVar) && !stateVar.getInit().getExprs().isEmpty()) {
+      return selfRef + "->" + stateVar.getName() + " = " + initExpr + ";";
+    } else {
+      var declaration =
+          types.getVariableDeclaration(tpr, ASTUtils.getInferredType(stateVar), "_initial", true);
+      return String.join(
+          "\n",
+          "{ // For scoping",
+          "    static " + declaration + " = " + initExpr + ";",
+          "    " + selfRef + "->" + stateVar.getName() + " = _initial;",
+          "} // End scoping.");
     }
+  }
 
-    private static String generateModalReset(
-        ReactorInstance instance,
-        String selfRef,
-        StateVar stateVar,
-        String initExpr,
-        ModeInstance mode,
-        CTypes types
-    ) {
-        if (mode == null || !stateVar.isReset()) {
-            return "";
-        }
-        var modeRef = "&"+CUtil.reactorRef(mode.getParent())+"->_lf__modes["+mode.getParent().modes.indexOf(mode)+"]";
-        var type = types.getTargetType(instance.tpr.resolveType(ASTUtils.getInferredType(stateVar)));
-
-        if (ASTUtils.isOfTimeType(stateVar) ||
-            ASTUtils.isParameterized(stateVar) &&
-            !stateVar.getInit().getExprs().isEmpty()) {
-            return CModesGenerator.generateStateResetStructure(
-                modeRef, selfRef,
-                stateVar.getName(),
-                initExpr, type);
-        } else {
-            CodeBuilder code = new CodeBuilder();
-            var source = "_initial";
-            var declaration = types.getVariableDeclaration(instance.tpr,
-                ASTUtils.getInferredType(stateVar),
-                source, true);
-            code.pr("{ // For scoping");
-            code.indent();
-            code.pr("static "+declaration+" = "+initExpr+";");
-            code.pr(CModesGenerator.generateStateResetStructure(
-                modeRef, selfRef,
-                stateVar.getName(),
-                source, type));
-            code.unindent();
-            code.pr("} // End scoping.");
-            return code.toString();
-        }
+  private static String generateModalReset(
+      ReactorInstance instance,
+      String selfRef,
+      StateVar stateVar,
+      String initExpr,
+      ModeInstance mode,
+      CTypes types) {
+    if (mode == null || !stateVar.isReset()) {
+      return "";
     }
+    var modeRef =
+        "&"
+            + CUtil.reactorRef(mode.getParent())
+            + "->_lf__modes["
+            + mode.getParent().modes.indexOf(mode)
+            + "]";
+    var type = types.getTargetType(instance.tpr.resolveType(ASTUtils.getInferredType(stateVar)));
 
-    /**
-     * Return a C expression that can be used to initialize the specified
-     * state variable within the specified parent. If the state variable
-     * initializer refers to parameters of the parent, then those parameter
-     * references are replaced with accesses to the self struct of the parent.
-     */
-    private static String getInitializerExpr(StateVar state, ReactorInstance parent) {
-        var ctypes = CTypes.generateParametersIn(parent);
-        return ctypes.getTargetInitializer(state.getInit(), state.getType());
+    if (ASTUtils.isOfTimeType(stateVar)
+        || ASTUtils.isParameterized(stateVar) && !stateVar.getInit().getExprs().isEmpty()) {
+      return CModesGenerator.generateStateResetStructure(
+          modeRef, selfRef, stateVar.getName(), initExpr, type);
+    } else {
+      CodeBuilder code = new CodeBuilder();
+      var source = "_initial";
+      var declaration =
+          types.getVariableDeclaration(
+              instance.tpr, ASTUtils.getInferredType(stateVar), source, true);
+      code.pr("{ // For scoping");
+      code.indent();
+      code.pr("static " + declaration + " = " + initExpr + ";");
+      code.pr(
+          CModesGenerator.generateStateResetStructure(
+              modeRef, selfRef, stateVar.getName(), source, type));
+      code.unindent();
+      code.pr("} // End scoping.");
+      return code.toString();
     }
+  }
+
+  /**
+   * Return a C expression that can be used to initialize the specified state variable within the
+   * specified parent. If the state variable initializer refers to parameters of the parent, then
+   * those parameter references are replaced with accesses to the self struct of the parent.
+   */
+  private static String getInitializerExpr(StateVar state, ReactorInstance parent) {
+    var ctypes = CTypes.generateParametersIn(parent);
+    return ctypes.getTargetInitializer(state.getInit(), state.getType());
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java b/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
index f41240e858..15155122be 100644
--- a/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
@@ -1,7 +1,6 @@
 package org.lflang.generator.c;
 
 import java.util.List;
-
 import org.lflang.generator.TimerInstance;
 
 /**
@@ -11,60 +10,74 @@
  * @author {Soroush Bateni
  */
 public class CTimerGenerator {
-    /**
-     * Generate code to initialize the given timer.
-     *
-     * @param timer The timer to initialize for.
-     */
-    public static String generateInitializer(TimerInstance timer) {
-        var triggerStructName = CUtil.reactorRef(timer.getParent()) + "->_lf__"  + timer.getName();
-        var offset = CTypes.getInstance().getTargetTimeExpr(timer.getOffset());
-        var period = CTypes.getInstance().getTargetTimeExpr(timer.getPeriod());
-        var mode = timer.getMode(false);
-        var envId = CUtil.getEnvironmentId(timer.getParent());
-        var modeRef = mode != null ?
-            "&"+CUtil.reactorRef(mode.getParent())+"->_lf__modes["+mode.getParent().modes.indexOf(mode)+"];" :
-            "NULL";
+  /**
+   * Generate code to initialize the given timer.
+   *
+   * @param timer The timer to initialize for.
+   */
+  public static String generateInitializer(TimerInstance timer) {
+    var triggerStructName = CUtil.reactorRef(timer.getParent()) + "->_lf__" + timer.getName();
+    var offset = CTypes.getInstance().getTargetTimeExpr(timer.getOffset());
+    var period = CTypes.getInstance().getTargetTimeExpr(timer.getPeriod());
+    var mode = timer.getMode(false);
+    var envId = CUtil.getEnvironmentId(timer.getParent());
+    var modeRef =
+        mode != null
+            ? "&"
+                + CUtil.reactorRef(mode.getParent())
+                + "->_lf__modes["
+                + mode.getParent().modes.indexOf(mode)
+                + "];"
+            : "NULL";
 
-        return String.join("\n", List.of(
-            "// Initiaizing timer "+timer.getFullName()+".",
-            triggerStructName+".offset = "+offset+";",
-            triggerStructName+".period = "+period+";",
+    return String.join(
+        "\n",
+        List.of(
+            "// Initiaizing timer " + timer.getFullName() + ".",
+            triggerStructName + ".offset = " + offset + ";",
+            triggerStructName + ".period = " + period + ";",
             "// Associate timer with the environment of its parent",
-            "envs["+envId+"]._lf_timer_triggers[timer_triggers_count["+envId+"]++] = &"+triggerStructName+";",
-            triggerStructName+".mode = "+modeRef+";"
-        ));
-    }
+            "envs["
+                + envId
+                + "]._lf_timer_triggers[timer_triggers_count["
+                + envId
+                + "]++] = &"
+                + triggerStructName
+                + ";",
+            triggerStructName + ".mode = " + modeRef + ";"));
+  }
 
-    /**
-     * Generate code to declare the timer table.
-     *
-     * @param timerCount The total number of timers in the program
-     */
-    public static String generateDeclarations(int timerCount) {
-        return String.join("\n", List.of(
-                    "// Array of pointers to timer triggers to be scheduled in _lf_initialize_timers().",
-                    (timerCount > 0 ?
-                    "trigger_t* _lf_timer_triggers["+timerCount+"]" :
-                    "trigger_t** _lf_timer_triggers = NULL") + ";",
-                    "int _lf_timer_triggers_size = "+timerCount+";"
-                ));
-    }
+  /**
+   * Generate code to declare the timer table.
+   *
+   * @param timerCount The total number of timers in the program
+   */
+  public static String generateDeclarations(int timerCount) {
+    return String.join(
+        "\n",
+        List.of(
+            "// Array of pointers to timer triggers to be scheduled in _lf_initialize_timers().",
+            (timerCount > 0
+                    ? "trigger_t* _lf_timer_triggers[" + timerCount + "]"
+                    : "trigger_t** _lf_timer_triggers = NULL")
+                + ";",
+            "int _lf_timer_triggers_size = " + timerCount + ";"));
+  }
 
-    /**
-     * Generate code to call {@code _lf_initialize_timer} on each timer.
-     *
-     * @param timerCount The total number of timers in the program
-     */
-    public static String generateLfInitializeTimer() {
-        return String.join("\n",
-            "void _lf_initialize_timers(environment_t *env) {",
-            "   for (int i = 0; i < env->_lf_timer_triggers_size; i++) {",
-            "       if (env->_lf_timer_triggers[i] != NULL) {",
-            "            _lf_initialize_timer(env, env->_lf_timer_triggers[i]);",
-            "        }",
-            "    }",
-            "}"
-        );
-    }
+  /**
+   * Generate code to call {@code _lf_initialize_timer} on each timer.
+   *
+   * @param timerCount The total number of timers in the program
+   */
+  public static String generateLfInitializeTimer() {
+    return String.join(
+        "\n",
+        "void _lf_initialize_timers(environment_t *env) {",
+        "   for (int i = 0; i < env->_lf_timer_triggers_size; i++) {",
+        "       if (env->_lf_timer_triggers[i] != NULL) {",
+        "            _lf_initialize_timer(env, env->_lf_timer_triggers[i]);",
+        "        }",
+        "    }",
+        "}");
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CTracingGenerator.java b/org.lflang/src/org/lflang/generator/c/CTracingGenerator.java
index f999d14b3e..8439d562b0 100644
--- a/org.lflang/src/org/lflang/generator/c/CTracingGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTracingGenerator.java
@@ -1,13 +1,12 @@
 package org.lflang.generator.c;
 
+import static org.lflang.util.StringUtil.addDoubleQuotes;
+
 import java.util.ArrayList;
 import java.util.List;
-
-import org.lflang.federated.generator.FederateInstance;
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.generator.TimerInstance;
-import static org.lflang.util.StringUtil.addDoubleQuotes;
 
 /**
  * Generates C code to support tracing.
@@ -17,47 +16,54 @@
  * @author Hou Seng Wong
  */
 public class CTracingGenerator {
-    /**
-     * If tracing is turned on, then generate code that records
-     * the full name of the specified reactor instance in the
-     * trace table. If tracing is not turned on, do nothing.
-     *
-     * If tracing is turned on, record the address of this reaction
-     * in the _lf_trace_object_descriptions table that is used to generate
-     * the header information in the trace file.
-     *
-     * @param instance The reactor instance.
-     */
-    public static String generateTraceTableEntries(
-        ReactorInstance instance
-    ) {
-        List<String> code = new ArrayList<>();
-        var description = CUtil.getShortenedName(instance);
-        var selfStruct = CUtil.reactorRef(instance);
-        code.add(registerTraceEvent(
-            selfStruct, "NULL",
-            "trace_reactor", description)
-        );
-        for (ActionInstance action : instance.actions) {
-            code.add(registerTraceEvent(
-                selfStruct, getTrigger(selfStruct, action.getName()),
-                "trace_trigger", description + "." + action.getName())
-            );
-        }
-        for (TimerInstance timer : instance.timers) {
-            code.add(registerTraceEvent(
-                selfStruct, getTrigger(selfStruct, timer.getName()),
-                "trace_trigger", description + "." + timer.getName())
-            );
-        }
-        return String.join("\n", code);
+  /**
+   * If tracing is turned on, then generate code that records the full name of the specified reactor
+   * instance in the trace table. If tracing is not turned on, do nothing.
+   *
+   * <p>If tracing is turned on, record the address of this reaction in the
+   * _lf_trace_object_descriptions table that is used to generate the header information in the
+   * trace file.
+   *
+   * @param instance The reactor instance.
+   */
+  public static String generateTraceTableEntries(ReactorInstance instance) {
+    List<String> code = new ArrayList<>();
+    var description = CUtil.getShortenedName(instance);
+    var selfStruct = CUtil.reactorRef(instance);
+    code.add(registerTraceEvent(selfStruct, "NULL", "trace_reactor", description));
+    for (ActionInstance action : instance.actions) {
+      code.add(
+          registerTraceEvent(
+              selfStruct,
+              getTrigger(selfStruct, action.getName()),
+              "trace_trigger",
+              description + "." + action.getName()));
     }
-
-    private static String registerTraceEvent(String obj, String trigger, String type, String description) {
-        return "_lf_register_trace_event("+obj+", "+trigger+", "+type+", "+addDoubleQuotes(description)+");";
+    for (TimerInstance timer : instance.timers) {
+      code.add(
+          registerTraceEvent(
+              selfStruct,
+              getTrigger(selfStruct, timer.getName()),
+              "trace_trigger",
+              description + "." + timer.getName()));
     }
+    return String.join("\n", code);
+  }
 
-    private static String getTrigger(String obj, String triggerName) {
-        return "&("+obj+"->_lf__"+triggerName+")";
-    }
+  private static String registerTraceEvent(
+      String obj, String trigger, String type, String description) {
+    return "_lf_register_trace_event("
+        + obj
+        + ", "
+        + trigger
+        + ", "
+        + type
+        + ", "
+        + addDoubleQuotes(description)
+        + ");";
+  }
+
+  private static String getTrigger(String obj, String triggerName) {
+    return "&(" + obj + "->_lf__" + triggerName + ")";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 57175c3588..5f3ea0df7b 100644
--- a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -1,4 +1,5 @@
 package org.lflang.generator.c;
+
 import static org.lflang.generator.c.CMixedRadixGenerator.db;
 import static org.lflang.generator.c.CMixedRadixGenerator.dc;
 import static org.lflang.generator.c.CMixedRadixGenerator.dr;
@@ -8,17 +9,14 @@
 import static org.lflang.util.StringUtil.addDoubleQuotes;
 import static org.lflang.util.StringUtil.joinObjects;
 
+import com.google.common.collect.Iterables;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.stream.Collectors;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.AttributeUtils;
 import org.lflang.TargetConfig;
-
 import org.lflang.TargetProperty.LogLevel;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.extensions.CExtensionUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.PortInstance;
@@ -27,8 +25,6 @@
 import org.lflang.generator.RuntimeRange;
 import org.lflang.generator.SendRange;
 
-import com.google.common.collect.Iterables;
-
 /**
  * Generate code for the "_lf_initialize_trigger_objects" function
  *
@@ -37,1020 +33,1072 @@
  * @author Hou Seng Wong
  */
 public class CTriggerObjectsGenerator {
-    /**
-     * Generate the _lf_initialize_trigger_objects function for 'federate'.
-     */
-    public static String generateInitializeTriggerObjects(
-        ReactorInstance main,
-        TargetConfig targetConfig,
-        CodeBuilder initializeTriggerObjects,
-        CodeBuilder startTimeStep,
-        CTypes types,
-        String lfModuleName
-    ) {
-        var code = new CodeBuilder();
-        code.pr("void _lf_initialize_trigger_objects() {");
-        code.indent();
-        // Initialize the LF clock.
-        code.pr(String.join("\n",
-            "// Initialize the _lf_clock",
-            "lf_initialize_clock();"
-        ));
-
-        // Initialize tracing if it is enabled
-        if (targetConfig.tracing != null) {
-            var traceFileName = lfModuleName;
-            if (targetConfig.tracing.traceFileName != null) {
-                traceFileName = targetConfig.tracing.traceFileName;
-            }
-            code.pr(String.join("\n",
-                "// Initialize tracing",
-                "start_trace("+ addDoubleQuotes(traceFileName + ".lft") + ");"
-            )); // .lft is for Lingua Franca trace
-        }
+  /** Generate the _lf_initialize_trigger_objects function for 'federate'. */
+  public static String generateInitializeTriggerObjects(
+      ReactorInstance main,
+      TargetConfig targetConfig,
+      CodeBuilder initializeTriggerObjects,
+      CodeBuilder startTimeStep,
+      CTypes types,
+      String lfModuleName) {
+    var code = new CodeBuilder();
+    code.pr("void _lf_initialize_trigger_objects() {");
+    code.indent();
+    // Initialize the LF clock.
+    code.pr(String.join("\n", "// Initialize the _lf_clock", "lf_initialize_clock();"));
+
+    // Initialize tracing if it is enabled
+    if (targetConfig.tracing != null) {
+      var traceFileName = lfModuleName;
+      if (targetConfig.tracing.traceFileName != null) {
+        traceFileName = targetConfig.tracing.traceFileName;
+      }
+      code.pr(
+          String.join(
+              "\n",
+              "// Initialize tracing",
+              "start_trace("
+                  + addDoubleQuotes(traceFileName + ".lft")
+                  + ");")); // .lft is for Lingua Franca trace
+    }
 
-        // Create arrays of counters for managing pointer arrays of startup, shutdown, reset and triggers
-        code.pr(String.join("\n",
+    // Create arrays of counters for managing pointer arrays of startup, shutdown, reset and
+    // triggers
+    code.pr(
+        String.join(
+            "\n",
             "int startup_reaction_count[_num_enclaves] = {0};",
             "int shutdown_reaction_count[_num_enclaves] = {0};",
             "int reset_reaction_count[_num_enclaves] = {0};",
-            "int timer_triggers_count[_num_enclaves] = {0};"
-            ));
-
-        // Create the table to initialize intended tag fields to 0 between time
-        // steps.
-
-        code.pr(initializeTriggerObjects.toString());
-
-        code.pr(deferredInitialize(
-            main,
-            main.reactions,
-            targetConfig,
-            types
-        ));
-        code.pr(deferredInitializeNonNested(
-            main,
-            main,
-            main.reactions,
-            types
-        ));
-        // Next, for every input port, populate its "self" struct
-        // fields with pointers to the output port that sends it data.
-        code.pr(deferredConnectInputsToOutputs(
-            main
-        ));
-        // Put the code here to set up the tables that drive resetting is_present and
-        // decrementing reference counts between time steps. This code has to appear
-        // in _lf_initialize_trigger_objects() after the code that makes connections
-        // between inputs and outputs.
-        code.pr(startTimeStep.toString());
-        code.pr(setReactionPriorities(
-            main
-        ));
-        code.pr(generateSchedulerInitializerMain(
-            main,
-            targetConfig
-        ));
-
-        code.pr("""
+            "int timer_triggers_count[_num_enclaves] = {0};"));
+
+    // Create the table to initialize intended tag fields to 0 between time
+    // steps.
+
+    code.pr(initializeTriggerObjects.toString());
+
+    code.pr(deferredInitialize(main, main.reactions, targetConfig, types));
+    code.pr(deferredInitializeNonNested(main, main, main.reactions, types));
+    // Next, for every input port, populate its "self" struct
+    // fields with pointers to the output port that sends it data.
+    code.pr(deferredConnectInputsToOutputs(main));
+    // Put the code here to set up the tables that drive resetting is_present and
+    // decrementing reference counts between time steps. This code has to appear
+    // in _lf_initialize_trigger_objects() after the code that makes connections
+    // between inputs and outputs.
+    code.pr(startTimeStep.toString());
+    code.pr(setReactionPriorities(main));
+    code.pr(generateSchedulerInitializerMain(main, targetConfig));
+
+    code.pr(
+        """
         #ifdef EXECUTABLE_PREAMBLE
         _lf_executable_preamble();
         #endif
         """);
 
-        // Initialize triggers for federated execution.
-        code.pr(CExtensionUtils.surroundWithIfFederated("initialize_triggers_for_federate();"));
+    // Initialize triggers for federated execution.
+    code.pr(CExtensionUtils.surroundWithIfFederated("initialize_triggers_for_federate();"));
 
-        code.unindent();
-        code.pr("}\n");
-        return code.toString();
-    }
+    code.unindent();
+    code.pr("}\n");
+    return code.toString();
+  }
 
-    /**
-    * Generate code to initialize the scheduler for the threaded C runtime.
-    */
-    public static String generateSchedulerInitializerMain(
-        ReactorInstance main,
-        TargetConfig targetConfig
-    ) {
-        if (!targetConfig.threading) {
-            return "";
-        }
-        var code = new CodeBuilder();
-        var numReactionsPerLevel = main.assignLevels().getNumReactionsPerLevel();
-        var numReactionsPerLevelJoined = Arrays.stream(numReactionsPerLevel)
-                .map(String::valueOf)
-                .collect(Collectors.joining(", "));
-        // FIXME: We want to calculate levels for each enclave independently
-        code.pr(String.join("\n",
+  /** Generate code to initialize the scheduler for the threaded C runtime. */
+  public static String generateSchedulerInitializerMain(
+      ReactorInstance main, TargetConfig targetConfig) {
+    if (!targetConfig.threading) {
+      return "";
+    }
+    var code = new CodeBuilder();
+    var numReactionsPerLevel = main.assignLevels().getNumReactionsPerLevel();
+    var numReactionsPerLevelJoined =
+        Arrays.stream(numReactionsPerLevel).map(String::valueOf).collect(Collectors.joining(", "));
+    // FIXME: We want to calculate levels for each enclave independently
+    code.pr(
+        String.join(
+            "\n",
             "// Initialize the scheduler",
-            "size_t num_reactions_per_level["+numReactionsPerLevel.length+"] = ",
+            "size_t num_reactions_per_level[" + numReactionsPerLevel.length + "] = ",
             "    {" + numReactionsPerLevelJoined + "};",
             "sched_params_t sched_params = (sched_params_t) {",
             "                        .num_reactions_per_level = &num_reactions_per_level[0],",
-            "                        .num_reactions_per_level_size = (size_t) "+numReactionsPerLevel.length+"};"
-        ));
-
-        for (ReactorInstance enclave: CUtil.getEnclaves(main)) {
-            code.pr(generateSchedulerInitializerEnclave(enclave, targetConfig));
-        }
+            "                        .num_reactions_per_level_size = (size_t) "
+                + numReactionsPerLevel.length
+                + "};"));
 
-        return code.toString();
+    for (ReactorInstance enclave : CUtil.getEnclaves(main)) {
+      code.pr(generateSchedulerInitializerEnclave(enclave, targetConfig));
     }
 
-    // FIXME: Probably we want some enclaveConfig handed off
-    public static String generateSchedulerInitializerEnclave(
-        ReactorInstance enclave,
-        TargetConfig targetConfig
-    ) {
-        return String.join("\n",
-            "lf_sched_init(",
-            "    &"+CUtil.getEnvironmentStruct(enclave)+",", // FIXME: Hack for enclaves step1
-            "    "+CUtil.getEnvironmentStruct(enclave)+".num_workers,", // FIXME: Need better way of setting this
-            "    &sched_params",
-            ");"
-        );
+    return code.toString();
+  }
+
+  // FIXME: Probably we want some enclaveConfig handed off
+  public static String generateSchedulerInitializerEnclave(
+      ReactorInstance enclave, TargetConfig targetConfig) {
+    return String.join(
+        "\n",
+        "lf_sched_init(",
+        "    &" + CUtil.getEnvironmentStruct(enclave) + ",", // FIXME: Hack for enclaves step1
+        "    "
+            + CUtil.getEnvironmentStruct(enclave)
+            + ".num_workers,", // FIXME: Need better way of setting this
+        "    &sched_params",
+        ");");
+  }
+
+  /**
+   * Set the reaction priorities based on dependency analysis.
+   *
+   * @param reactor The reactor on which to do this.
+   */
+  private static String setReactionPriorities(ReactorInstance reactor) {
+    var code = new CodeBuilder();
+    setReactionPriorities(reactor, code);
+    return code.toString();
+  }
+
+  /**
+   * Set the reaction priorities based on dependency analysis.
+   *
+   * @param reactor The reactor on which to do this.
+   * @param builder Where to write the code.
+   */
+  private static boolean setReactionPriorities(ReactorInstance reactor, CodeBuilder builder) {
+    var foundOne = false;
+    // Force calculation of levels if it has not been done.
+    // FIXME: Comment out this as I think it is redundant.
+    //  If it is NOT redundant then deadline propagation is not correct
+    // reactor.assignLevels();
+
+    // We handle four different scenarios
+    //  1) A reactionInstance has 1 level and 1 deadline
+    //  2) A reactionInstance has 1 level but multiple deadlines
+    //  3) A reaction instance has multiple levels but all have the same deadline
+    //  4) Multiple deadlines and levels
+
+    var prolog = new CodeBuilder();
+    var epilog = new CodeBuilder();
+
+    for (ReactionInstance r : reactor.reactions) {
+      var levelSet = r.getLevels();
+      var deadlineSet = r.getInferredDeadlines();
+
+      if (levelSet.size() > 1 || deadlineSet.size() > 1) {
+        // Scenario 2-4
+        if (prolog.length() == 0) {
+          prolog.startScopedBlock();
+          epilog.endScopedBlock();
+        }
+      }
+      if (deadlineSet.size() > 1) {
+        // Scenario (2) or (4)
+        var deadlines =
+            r.getInferredDeadlinesList().stream()
+                .map(elt -> ("0x" + Long.toString(elt.toNanoSeconds(), 16) + "LL"))
+                .collect(Collectors.toList());
+
+        prolog.pr(
+            "interval_t "
+                + r.uniqueID()
+                + "_inferred_deadlines[] = { "
+                + joinObjects(deadlines, ", ")
+                + " };");
+      }
+
+      if (levelSet.size() > 1) {
+        // Scenario (3) or (4)
+        // Cannot use the above set of levels because it is a set, not a list.
+        prolog.pr(
+            "int "
+                + r.uniqueID()
+                + "_levels[] = { "
+                + joinObjects(r.getLevelsList(), ", ")
+                + " };");
+      }
     }
 
-    /**
-     * Set the reaction priorities based on dependency analysis.
-     *
-     * @param reactor The reactor on which to do this.
-     */
-    private static String setReactionPriorities(
-        ReactorInstance reactor
-    ) {
-        var code = new CodeBuilder();
-        setReactionPriorities(reactor, code);
-        return code.toString();
+    var temp = new CodeBuilder();
+    temp.pr("// Set reaction priorities for " + reactor);
+    temp.startScopedBlock(reactor);
+    for (ReactionInstance r : reactor.reactions) {
+      // if (currentFederate.contains(r.getDefinition())) {
+      foundOne = true;
+      var levelSet = r.getLevels();
+      var deadlineSet = r.getInferredDeadlines();
+
+      // Get the head of the associated lists. To avoid duplication in
+      //  several of the following cases
+      var level = r.getLevelsList().get(0);
+      var inferredDeadline = r.getInferredDeadlinesList().get(0);
+      var runtimeIdx = CUtil.runtimeIndex(r.getParent());
+
+      if (levelSet.size() == 1 && deadlineSet.size() == 1) {
+        // Scenario (1)
+
+        var indexValue = inferredDeadline.toNanoSeconds() << 16 | level;
+
+        var reactionIndex = "0x" + Long.toUnsignedString(indexValue, 16) + "LL";
+
+        temp.pr(
+            String.join(
+                "\n",
+                CUtil.reactionRef(r) + ".chain_id = " + r.chainID + ";",
+                "// index is the OR of level " + level + " and ",
+                "// deadline " + inferredDeadline.toNanoSeconds() + " shifted left 16 bits.",
+                CUtil.reactionRef(r) + ".index = " + reactionIndex + ";"));
+      } else if (levelSet.size() == 1 && deadlineSet.size() > 1) {
+        // Scenario 2
+        temp.pr(
+            String.join(
+                "\n",
+                CUtil.reactionRef(r) + ".chain_id = " + r.chainID + ";",
+                "// index is the OR of levels[" + runtimeIdx + "] and ",
+                "// deadlines[" + runtimeIdx + "] shifted left 16 bits.",
+                CUtil.reactionRef(r)
+                    + ".index = ("
+                    + r.uniqueID()
+                    + "_inferred_deadlines["
+                    + runtimeIdx
+                    + "] << 16) | "
+                    + level
+                    + ";"));
+
+      } else if (levelSet.size() > 1 && deadlineSet.size() == 1) {
+        // Scenarion (3)
+        temp.pr(
+            String.join(
+                "\n",
+                CUtil.reactionRef(r) + ".chain_id = " + r.chainID + ";",
+                "// index is the OR of levels[" + runtimeIdx + "] and ",
+                "// deadlines[" + runtimeIdx + "] shifted left 16 bits.",
+                CUtil.reactionRef(r)
+                    + ".index = ("
+                    + inferredDeadline.toNanoSeconds()
+                    + " << 16) | "
+                    + r.uniqueID()
+                    + "_levels["
+                    + runtimeIdx
+                    + "];"));
+
+      } else if (levelSet.size() > 1 && deadlineSet.size() > 1) {
+        // Scenario (4)
+        temp.pr(
+            String.join(
+                "\n",
+                CUtil.reactionRef(r) + ".chain_id = " + r.chainID + ";",
+                "// index is the OR of levels[" + runtimeIdx + "] and ",
+                "// deadlines[" + runtimeIdx + "] shifted left 16 bits.",
+                CUtil.reactionRef(r)
+                    + ".index = ("
+                    + r.uniqueID()
+                    + "_inferred_deadlines["
+                    + runtimeIdx
+                    + "] << 16) | "
+                    + r.uniqueID()
+                    + "_levels["
+                    + runtimeIdx
+                    + "];"));
+      }
     }
-
-    /**
-     * Set the reaction priorities based on dependency analysis.
-     *
-     * @param reactor The reactor on which to do this.
-     * @param builder Where to write the code.
-     */
-    private static boolean setReactionPriorities(
-        ReactorInstance reactor,
-        CodeBuilder builder
-    ) {
-        var foundOne = false;
-        // Force calculation of levels if it has not been done.
-        // FIXME: Comment out this as I think it is redundant.
-        //  If it is NOT redundant then deadline propagation is not correct
-        // reactor.assignLevels();
-
-        // We handle four different scenarios
-        //  1) A reactionInstance has 1 level and 1 deadline
-        //  2) A reactionInstance has 1 level but multiple deadlines
-        //  3) A reaction instance has multiple levels but all have the same deadline
-        //  4) Multiple deadlines and levels
-
-        var prolog = new CodeBuilder();
-        var epilog = new CodeBuilder();
-
-        for (ReactionInstance r : reactor.reactions) {
-            var levelSet = r.getLevels();
-            var deadlineSet = r.getInferredDeadlines();
-
-            if (levelSet.size() > 1 || deadlineSet.size() > 1) {
-                // Scenario 2-4
-                if (prolog.length() == 0) {
-                    prolog.startScopedBlock();
-                    epilog.endScopedBlock();
-                }
-            }
-            if (deadlineSet.size() > 1) {
-                // Scenario (2) or (4)
-                var deadlines = r.getInferredDeadlinesList().stream()
-                                 .map(elt -> ("0x" + Long.toString(elt.toNanoSeconds(), 16) + "LL"))
-                                 .collect(Collectors.toList());
-
-                prolog.pr("interval_t "+r.uniqueID()+"_inferred_deadlines[] = { "+joinObjects(deadlines, ", ")+" };");
-            }
-
-            if (levelSet.size() > 1) {
-                // Scenario (3) or (4)
-                // Cannot use the above set of levels because it is a set, not a list.
-                prolog.pr("int "+r.uniqueID()+"_levels[] = { "+joinObjects(r.getLevelsList(), ", ")+" };");
-            }
-        }
-
-
-        var temp = new CodeBuilder();
-        temp.pr("// Set reaction priorities for " + reactor);
-        temp.startScopedBlock(reactor);
-        for (ReactionInstance r : reactor.reactions) {
-            //if (currentFederate.contains(r.getDefinition())) {
-            foundOne = true;
-            var levelSet = r.getLevels();
-            var deadlineSet = r.getInferredDeadlines();
-
-            // Get the head of the associated lists. To avoid duplication in
-            //  several of the following cases
-            var level = r.getLevelsList().get(0);
-            var inferredDeadline = r.getInferredDeadlinesList().get(0);
-            var runtimeIdx =CUtil.runtimeIndex(r.getParent());
-
-            if (levelSet.size() == 1 && deadlineSet.size() == 1) {
-                // Scenario (1)
-
-                var indexValue = inferredDeadline.toNanoSeconds() << 16 | level;
-
-                var reactionIndex = "0x" + Long.toUnsignedString(indexValue, 16) + "LL";
-
-                temp.pr(String.join("\n",
-                    CUtil.reactionRef(r)+".chain_id = "+r.chainID+";",
-                    "// index is the OR of level "+level+" and ",
-                    "// deadline "+ inferredDeadline.toNanoSeconds()+" shifted left 16 bits.",
-                    CUtil.reactionRef(r)+".index = "+reactionIndex+";"
-                ));
-            } else if (levelSet.size() == 1 && deadlineSet.size() > 1) {
-                // Scenario 2
-                temp.pr(String.join("\n",
-                    CUtil.reactionRef(r)+".chain_id = "+r.chainID+";",
-                    "// index is the OR of levels["+runtimeIdx+"] and ",
-                    "// deadlines["+runtimeIdx+"] shifted left 16 bits.",
-                    CUtil.reactionRef(r)+".index = ("+r.uniqueID()+"_inferred_deadlines["+runtimeIdx+"] << 16) | " +
-                        level+";"
-                ));
-
-            } else if (levelSet.size() > 1 && deadlineSet.size() == 1) {
-                // Scenarion (3)
-                temp.pr(String.join("\n",
-                    CUtil.reactionRef(r)+".chain_id = "+r.chainID+";",
-                    "// index is the OR of levels["+runtimeIdx+"] and ",
-                    "// deadlines["+runtimeIdx+"] shifted left 16 bits.",
-                    CUtil.reactionRef(r)+".index = ("+inferredDeadline.toNanoSeconds()+" << 16) | " +
-                        r.uniqueID()+"_levels["+runtimeIdx+"];"
-                ));
-
-            } else if (levelSet.size() > 1 && deadlineSet.size() > 1) {
-                // Scenario (4)
-                temp.pr(String.join("\n",
-                    CUtil.reactionRef(r)+".chain_id = "+r.chainID+";",
-                    "// index is the OR of levels["+runtimeIdx+"] and ",
-                    "// deadlines["+runtimeIdx+"] shifted left 16 bits.",
-                    CUtil.reactionRef(r)+".index = ("+r.uniqueID()+"_inferred_deadlines["+runtimeIdx+"] << 16) | " +
-                        r.uniqueID()+"_levels["+runtimeIdx+"];"
-                ));
-            }
-
-        }
-        for (ReactorInstance child : reactor.children) {
-            foundOne = setReactionPriorities(child, temp) || foundOne;
-        }
-        temp.endScopedBlock();
-
-        if (foundOne) {
-            builder.pr(prolog.toString());
-            builder.pr(temp.toString());
-            builder.pr(epilog.toString());
-        }
-        return foundOne;
+    for (ReactorInstance child : reactor.children) {
+      foundOne = setReactionPriorities(child, temp) || foundOne;
     }
+    temp.endScopedBlock();
 
-    /**
-     * Generate assignments of pointers in the "self" struct of a destination
-     * port's reactor to the appropriate entries in the "self" struct of the
-     * source reactor. This has to be done after all reactors have been created
-     * because inputs point to outputs that are arbitrarily far away.
-     * @param instance The reactor instance.
-     */
-    private static String deferredConnectInputsToOutputs(
-        ReactorInstance instance
-    ) {
-        var code = new CodeBuilder();
-        code.pr("// Connect inputs and outputs for reactor "+instance.getFullName()+".");
-        // Iterate over all ports of this reactor that depend on reactions.
-        for (PortInstance input : instance.inputs) {
-            if (!input.getDependsOnReactions().isEmpty()) {
-                // Input is written to by reactions in the parent of the port's parent.
-                code.pr(connectPortToEventualDestinations(input));
-            }
-        }
-        for (PortInstance output : instance.outputs) {
-            if (!output.getDependsOnReactions().isEmpty()) {
-                // Output is written to by reactions in the port's parent.
-                code.pr(connectPortToEventualDestinations(output));
-            }
-        }
-        for (ReactorInstance child: instance.children) {
-            code.pr(deferredConnectInputsToOutputs(child));
-        }
-        return code.toString();
+    if (foundOne) {
+      builder.pr(prolog.toString());
+      builder.pr(temp.toString());
+      builder.pr(epilog.toString());
     }
-
-    /**
-     * Generate assignments of pointers in the "self" struct of a destination
-     * port's reactor to the appropriate entries in the "self" struct of the
-     * source reactor. If this port is an input, then it is being written
-     * to by a reaction belonging to the parent of the port's parent.
-     * If it is an output, then it is being written to by a reaction belonging
-     * to the port's parent.
-     * @param src A port that is written to by reactions.
-     */
-    private static String connectPortToEventualDestinations(
-        PortInstance src
-    ) {
-        var code = new CodeBuilder();
-        for (SendRange srcRange: src.eventualDestinations()) {
-            for (RuntimeRange<PortInstance> dstRange : srcRange.destinations) {
-                var dst = dstRange.instance;
-                var destStructType = CGenerator.variableStructType(dst);
-
-                // NOTE: For federated execution, dst.getParent() should always be contained
-                // by the currentFederate because an AST transformation removes connections
-                // between ports of distinct federates. So the following check is not
-                // really necessary.
-                var mod = (dst.isMultiport() || (src.isInput() && src.isMultiport()))? "" : "&";
-                code.pr("// Connect "+srcRange+" to port "+dstRange);
-                code.startScopedRangeBlock(srcRange, dstRange);
-                if (src.isInput()) {
-                    // Source port is written to by reaction in port's parent's parent
-                    // and ultimate destination is further downstream.
-                    code.pr(CUtil.portRef(dst, dr, db, dc)+" = ("+destStructType+"*)"+mod+CUtil.portRefNested(src, sr, sb, sc)+";");
-                } else if (dst.isOutput()) {
-                    // An output port of a contained reactor is triggering a reaction.
-                    code.pr(CUtil.portRefNested(dst, dr, db, dc)+" = ("+destStructType+"*)&"+CUtil.portRef(src, sr, sb, sc)+";");
-                } else {
-                    // An output port is triggering an input port.
-                    code.pr(CUtil.portRef(dst, dr, db, dc)+" = ("+destStructType+"*)&"+CUtil.portRef(src, sr, sb, sc)+";");
-                    if (AttributeUtils.isSparse(dst.getDefinition())) {
-                        code.pr(CUtil.portRef(dst, dr, db, dc)+"->sparse_record = "+CUtil.portRefName(dst, dr, db, dc)+"__sparse;");
-                        code.pr(CUtil.portRef(dst, dr, db, dc)+"->destination_channel = "+dc+";");
-                    }
-                }
-                code.endScopedRangeBlock(srcRange, dstRange);
-            }
-        }
-        return code.toString();
+    return foundOne;
+  }
+
+  /**
+   * Generate assignments of pointers in the "self" struct of a destination port's reactor to the
+   * appropriate entries in the "self" struct of the source reactor. This has to be done after all
+   * reactors have been created because inputs point to outputs that are arbitrarily far away.
+   *
+   * @param instance The reactor instance.
+   */
+  private static String deferredConnectInputsToOutputs(ReactorInstance instance) {
+    var code = new CodeBuilder();
+    code.pr("// Connect inputs and outputs for reactor " + instance.getFullName() + ".");
+    // Iterate over all ports of this reactor that depend on reactions.
+    for (PortInstance input : instance.inputs) {
+      if (!input.getDependsOnReactions().isEmpty()) {
+        // Input is written to by reactions in the parent of the port's parent.
+        code.pr(connectPortToEventualDestinations(input));
+      }
     }
-
-    /**
-     * For each reaction of the specified reactor,
-     * set the last_enabling_reaction field of the reaction struct to point
-     * to the single dominating upstream reaction if there is one, or to be
-     * NULL if there is none.
-     *
-     * @param r The reactor.
-     */
-    private static String deferredOptimizeForSingleDominatingReaction(
-        ReactorInstance r
-    ) {
-        var code = new CodeBuilder();
-        for (ReactionInstance reaction : r.reactions) {
-                // The following code attempts to gather into a loop assignments of successive
-                // bank members relations between reactions to avoid large chunks of inline code
-                // when a large bank sends to a large bank or when a large bank receives from
-                // one reaction that is either multicasting or sending through a multiport.
-                var start = 0;
-                var end = 0;
-                var domStart = 0;
-                var same = false; // Set to true when finding a string of identical dominating reactions.
-                ReactionInstance.Runtime previousRuntime = null;
-                var first = true;  //First time through the loop.
-                for (ReactionInstance.Runtime runtime : reaction.getRuntimeInstances()) {
-                    if (!first) { // Not the first time through the loop.
-                        if (same) { // Previously seen at least two identical dominating.
-                            if (runtime.dominating != previousRuntime.dominating) {
-                                // End of streak of same dominating reaction runtime instance.
-                                code.pr(printOptimizeForSingleDominatingReaction(
-                                    previousRuntime, start, end, domStart, same
-                                ));
-                                same = false;
-                                start = runtime.id;
-                                domStart = (runtime.dominating != null) ? runtime.dominating.id : 0;
-                            }
-                        } else if (runtime.dominating == previousRuntime.dominating) {
-                            // Start of a streak of identical dominating reaction runtime instances.
-                            same = true;
-                        } else if (runtime.dominating != null && previousRuntime.dominating != null
-                            && runtime.dominating.getReaction() == previousRuntime.dominating.getReaction()
-                        ) {
-                            // Same dominating reaction even if not the same dominating runtime.
-                            if (runtime.dominating.id != previousRuntime.dominating.id + 1) {
-                                // End of a streak of contiguous runtimes.
-                                printOptimizeForSingleDominatingReaction(
-                                    previousRuntime, start, end, domStart, same
-                                );
-                                same = false;
-                                start = runtime.id;
-                                domStart = runtime.dominating.id;
-                            }
-                        } else {
-                            // Different dominating reaction.
-                            printOptimizeForSingleDominatingReaction(
-                                previousRuntime, start, end, domStart, same
-                            );
-                            same = false;
-                            start = runtime.id;
-                            domStart = (runtime.dominating != null) ? runtime.dominating.id : 0;
-                        }
-                    }
-                    first = false;
-                    previousRuntime = runtime;
-                    end++;
-                }
-                if (end > start) {
-                    printOptimizeForSingleDominatingReaction(
-                        previousRuntime, start, end, domStart, same
-                    );
-                }
-        }
-        return code.toString();
+    for (PortInstance output : instance.outputs) {
+      if (!output.getDependsOnReactions().isEmpty()) {
+        // Output is written to by reactions in the port's parent.
+        code.pr(connectPortToEventualDestinations(output));
+      }
     }
-
-    /**
-     * Print statement that sets the last_enabling_reaction field of a reaction.
-     */
-    private static String printOptimizeForSingleDominatingReaction(
-        ReactionInstance.Runtime runtime,
-        int start,
-        int end,
-        int domStart,
-        boolean same
-    ) {
-        var code = new CodeBuilder();
-        var dominatingRef = "NULL";
-
-        if (end > start + 1) {
-            code.startScopedBlock();
-            var reactionRef = CUtil.reactionRef(runtime.getReaction(), "i");
-            if (runtime.dominating != null) {
-                if (same) {
-                    dominatingRef =  "&(" + CUtil.reactionRef(runtime.dominating.getReaction(), "" + domStart) + ")";
-                } else {
-                    dominatingRef =  "&(" + CUtil.reactionRef(runtime.dominating.getReaction(), "j++") + ")";
-                }
-            }
-            code.pr(String.join("\n",
-                "// "+runtime.getReaction().getFullName()+" dominating upstream reaction.",
-                "int j = "+domStart+";",
-                "for (int i = "+start+"; i < "+end+"; i++) {",
-                "    "+reactionRef+".last_enabling_reaction = "+dominatingRef+";",
-                "}"
-            ));
-           code.endScopedBlock();
-        } else if (end == start + 1) {
-            var reactionRef = CUtil.reactionRef(runtime.getReaction(), "" + start);
-            if (runtime.dominating != null) {
-                dominatingRef =  "&(" + CUtil.reactionRef(runtime.dominating.getReaction(), "" + domStart) + ")";
-            }
-            code.pr(String.join("\n",
-                "// "+runtime.getReaction().getFullName()+" dominating upstream reaction.",
-                reactionRef+".last_enabling_reaction = "+dominatingRef+";"
-            ));
-        }
-        return code.toString();
+    for (ReactorInstance child : instance.children) {
+      code.pr(deferredConnectInputsToOutputs(child));
     }
-
-    /**
-     * For the specified reaction, for ports that it writes to,
-     * fill the trigger table for triggering downstream reactions.
-     *
-     * @param reactions The reactions.
-     */
-    private static String deferredFillTriggerTable(
-        Iterable<ReactionInstance> reactions
-    ) {
-        var code = new CodeBuilder();
-        for (ReactionInstance reaction : reactions) {
-            var name = reaction.getParent().getFullName();
-
-            var reactorSelfStruct = CUtil.reactorRef(reaction.getParent(), sr);
-
-            var foundPort = false;
-
-            for (PortInstance port : Iterables.filter(reaction.effects, PortInstance.class)) {
-                if (!foundPort) {
-                    // Need a separate index for the triggers array for each bank member.
-                    code.startScopedBlock();
-                    code.pr("int triggers_index["+reaction.getParent().getTotalWidth()+"] = { 0 }; // Number of bank members with the reaction.");
-                    foundPort = true;
-                }
-                // If the port is a multiport, then its channels may have different sets
-                // of destinations. For ordinary ports, there will be only one range and
-                // its width will be 1.
-                // We generate the code to fill the triggers array first in a temporary code buffer,
-                // so that we can simultaneously calculate the size of the total array.
-                for (SendRange srcRange : port.eventualDestinations()) {
-                    var srcNested = port.isInput();
-                    code.startScopedRangeBlock(srcRange, sr, sb, sc, srcNested);
-
-                    var triggerArray = CUtil.reactionRef(reaction, sr)+".triggers[triggers_index["+sr+"]++]";
-                    // Skip ports whose parent is not in the federation.
-                    // This can happen with reactions in the top-level that have
-                    // as an effect a port in a bank.
-                    code.pr(String.join("\n",
-                        "// Reaction "+reaction.index+" of "+name+" triggers "+srcRange.destinations.size()+" downstream reactions",
-                        "// through port "+port.getFullName()+".",
-                        CUtil.reactionRef(reaction, sr)+".triggered_sizes[triggers_index["+sr+"]] = "+srcRange.destinations.size()+";",
-                        "// For reaction "+reaction.index+" of "+name+", allocate an",
-                        "// array of trigger pointers for downstream reactions through port "+port.getFullName(),
-                        "trigger_t** trigger_array = (trigger_t**)_lf_allocate(",
-                        "        "+srcRange.destinations.size()+", sizeof(trigger_t*),",
-                        "        &"+reactorSelfStruct+"->base.allocations); ",
-                        triggerArray+" = trigger_array;"
-                    ));
-                    code.endScopedRangeBlock(srcRange);
-                }
-            }
-            var cumulativePortWidth = 0;
-            for (PortInstance port : Iterables.filter(reaction.effects, PortInstance.class)) {
-                // If this port does not have any destinations, do not generate code for it.
-                if (port.eventualDestinations().isEmpty()) continue;
-
-                code.pr("for (int i = 0; i < "+reaction.getParent().getTotalWidth()+"; i++) triggers_index[i] = "+cumulativePortWidth+";");
-                for (SendRange srcRange : port.eventualDestinations()) {
-                    var srcNested = srcRange.instance.isInput();
-                    var multicastCount = 0;
-                    for (RuntimeRange<PortInstance> dstRange : srcRange.destinations) {
-                        var dst = dstRange.instance;
-
-                        code.startScopedRangeBlock(srcRange, dstRange);
-
-                        // If the source is nested, need to take into account the parent's bank index
-                        // when indexing into the triggers array.
-                        var triggerArray = "";
-                        if (srcNested && port.getParent().getWidth() > 1) {
-                            triggerArray = CUtil.reactionRef(reaction, sr)+".triggers[triggers_index["+sr+"] + "+sc+" + src_range_mr.digits[1] * src_range_mr.radixes[0]]";
-                        } else {
-                            triggerArray = CUtil.reactionRef(reaction, sr)+".triggers[triggers_index["+sr+"] + "+sc+"]";
-                        }
-
-                        if (dst.isOutput()) {
-                            // Include this destination port only if it has at least one
-                            // reaction in the federation.
-                            var belongs = false;
-                            for (ReactionInstance destinationReaction : dst.getDependentReactions()) {
-                                belongs = true;
-                            }
-                            if (belongs) {
-                                code.pr(String.join("\n",
-                                    "// Port "+port.getFullName()+" has reactions in its parent's parent.",
-                                    "// Point to the trigger struct for those reactions.",
-                                    triggerArray+"["+multicastCount+"] = &"+CUtil.triggerRefNested(dst, dr, db)+";"
-                                ));
-                            } else {
-                                // Put in a NULL pointer.
-                                code.pr(String.join("\n",
-                                    "// Port "+port.getFullName()+" has reactions in its parent's parent.",
-                                    "// But those are not in the federation.",
-                                    triggerArray+"["+multicastCount+"] = NULL;"
-                                ));
-                            }
-                        } else {
-                            // Destination is an input port.
-                            code.pr(String.join("\n",
-                                "// Point to destination port "+dst.getFullName()+"'s trigger struct.",
-                                triggerArray+"["+multicastCount+"] = &"+CUtil.triggerRef(dst, dr)+";"
-                            ));
-                        }
-                        code.endScopedRangeBlock(srcRange, dstRange);
-                        multicastCount++;
-                    }
-                }
-                // If the port is an input of a contained reactor, then we have to take
-                // into account the bank width of the contained reactor.
-                if (port.getParent() != reaction.getParent()) {
-                    cumulativePortWidth += port.getWidth() * port.getParent().getWidth();
-                } else {
-                    cumulativePortWidth += port.getWidth();
-                }
-            }
-            if (foundPort) code.endScopedBlock();
+    return code.toString();
+  }
+
+  /**
+   * Generate assignments of pointers in the "self" struct of a destination port's reactor to the
+   * appropriate entries in the "self" struct of the source reactor. If this port is an input, then
+   * it is being written to by a reaction belonging to the parent of the port's parent. If it is an
+   * output, then it is being written to by a reaction belonging to the port's parent.
+   *
+   * @param src A port that is written to by reactions.
+   */
+  private static String connectPortToEventualDestinations(PortInstance src) {
+    var code = new CodeBuilder();
+    for (SendRange srcRange : src.eventualDestinations()) {
+      for (RuntimeRange<PortInstance> dstRange : srcRange.destinations) {
+        var dst = dstRange.instance;
+        var destStructType = CGenerator.variableStructType(dst);
+
+        // NOTE: For federated execution, dst.getParent() should always be contained
+        // by the currentFederate because an AST transformation removes connections
+        // between ports of distinct federates. So the following check is not
+        // really necessary.
+        var mod = (dst.isMultiport() || (src.isInput() && src.isMultiport())) ? "" : "&";
+        code.pr("// Connect " + srcRange + " to port " + dstRange);
+        code.startScopedRangeBlock(srcRange, dstRange);
+        if (src.isInput()) {
+          // Source port is written to by reaction in port's parent's parent
+          // and ultimate destination is further downstream.
+          code.pr(
+              CUtil.portRef(dst, dr, db, dc)
+                  + " = ("
+                  + destStructType
+                  + "*)"
+                  + mod
+                  + CUtil.portRefNested(src, sr, sb, sc)
+                  + ";");
+        } else if (dst.isOutput()) {
+          // An output port of a contained reactor is triggering a reaction.
+          code.pr(
+              CUtil.portRefNested(dst, dr, db, dc)
+                  + " = ("
+                  + destStructType
+                  + "*)&"
+                  + CUtil.portRef(src, sr, sb, sc)
+                  + ";");
+        } else {
+          // An output port is triggering an input port.
+          code.pr(
+              CUtil.portRef(dst, dr, db, dc)
+                  + " = ("
+                  + destStructType
+                  + "*)&"
+                  + CUtil.portRef(src, sr, sb, sc)
+                  + ";");
+          if (AttributeUtils.isSparse(dst.getDefinition())) {
+            code.pr(
+                CUtil.portRef(dst, dr, db, dc)
+                    + "->sparse_record = "
+                    + CUtil.portRefName(dst, dr, db, dc)
+                    + "__sparse;");
+            code.pr(CUtil.portRef(dst, dr, db, dc) + "->destination_channel = " + dc + ";");
+          }
         }
-        return code.toString();
+        code.endScopedRangeBlock(srcRange, dstRange);
+      }
     }
-
-    /**
-     * For each input port of a contained reactor that receives data
-     * from one or more of the specified reactions, set the num_destinations
-     * field of the corresponding port structs on the self struct of
-     * the reaction's parent reactor equal to the total number of
-     * destination reactors.
-     * If the port has a token type, this also initializes it with a token.
-     * @param reactions The reactions.
-     * @param types The C types.
-     */
-    private static String deferredInputNumDestinations(
-        Iterable<ReactionInstance> reactions,
-        CTypes types
-    ) {
-        // We need the number of destination _reactors_, not the
-        // number of destination ports nor the number of destination reactions.
-        // One of the destination reactors may be the container of this
-        // instance because it may have a reaction to an output of this instance.
-        // Since a port may be written to by multiple reactions,
-        // ensure that this is done only once.
-        var portsHandled = new HashSet<PortInstance>();
-        var code = new CodeBuilder();
-        for (ReactionInstance reaction : reactions) {
-            for (PortInstance port : Iterables.filter(reaction.effects, PortInstance.class)) {
-                if (port.isInput() && !portsHandled.contains(port)) {
-                    // Port is an input of a contained reactor that gets data from a reaction of this reactor.
-                    portsHandled.add(port);
-                    code.pr("// Set number of destination reactors for port "+port.getParent().getName()+"."+port.getName()+".");
-                    // The input port may itself have multiple destinations.
-                    for (SendRange sendingRange : port.eventualDestinations()) {
-                        code.startScopedRangeBlock(sendingRange, sr, sb, sc, sendingRange.instance.isInput());
-                        // Syntax is slightly different for a multiport output vs. single port.
-                        var connector = (port.isMultiport())? "->" : ".";
-                        code.pr(CUtil.portRefNested(port, sr, sb, sc)+connector+"num_destinations = "+sendingRange.getNumberOfDestinationReactors()+";");
-
-                        // Initialize token types.
-                        var type = ASTUtils.getInferredType(port.getDefinition());
-                        if (CUtil.isTokenType(type, types)) {
-                            // Create the template token that goes in the port struct.
-                            var rootType = CUtil.rootType(types.getTargetType(type));
-                            // If the rootType is 'void', we need to avoid generating the code
-                            // 'sizeof(void)', which some compilers reject.
-                            var size = (rootType.equals("void")) ? "0" : "sizeof("+rootType+")";
-                            // If the port is a multiport, then the portRefNested is itself a pointer
-                            // so we want its value, not its address.
-                            var indirection = (port.isMultiport())? "" : "&";
-                            code.startChannelIteration(port);
-                            code.pr(String.join("\n",
-                                "_lf_initialize_template((token_template_t*)",
-                                    "        "+indirection+"("+CUtil.portRefNested(port, sr, sb, sc)+"),",
-                                             size+");"
-                            ));
-                            code.endChannelIteration(port);
-                        }
-
-                        code.endScopedRangeBlock(sendingRange);
-                    }
-                }
+    return code.toString();
+  }
+
+  /**
+   * For each reaction of the specified reactor, set the last_enabling_reaction field of the
+   * reaction struct to point to the single dominating upstream reaction if there is one, or to be
+   * NULL if there is none.
+   *
+   * @param r The reactor.
+   */
+  private static String deferredOptimizeForSingleDominatingReaction(ReactorInstance r) {
+    var code = new CodeBuilder();
+    for (ReactionInstance reaction : r.reactions) {
+      // The following code attempts to gather into a loop assignments of successive
+      // bank members relations between reactions to avoid large chunks of inline code
+      // when a large bank sends to a large bank or when a large bank receives from
+      // one reaction that is either multicasting or sending through a multiport.
+      var start = 0;
+      var end = 0;
+      var domStart = 0;
+      var same = false; // Set to true when finding a string of identical dominating reactions.
+      ReactionInstance.Runtime previousRuntime = null;
+      var first = true; // First time through the loop.
+      for (ReactionInstance.Runtime runtime : reaction.getRuntimeInstances()) {
+        if (!first) { // Not the first time through the loop.
+          if (same) { // Previously seen at least two identical dominating.
+            if (runtime.dominating != previousRuntime.dominating) {
+              // End of streak of same dominating reaction runtime instance.
+              code.pr(
+                  printOptimizeForSingleDominatingReaction(
+                      previousRuntime, start, end, domStart, same));
+              same = false;
+              start = runtime.id;
+              domStart = (runtime.dominating != null) ? runtime.dominating.id : 0;
             }
-        }
-        return code.toString();
-    }
-
-    /**
-     * For each output port of the specified reactor,
-     * set the num_destinations field of port structs on its self struct
-     * equal to the total number of destination reactors. This is used
-     * to initialize reference counts in dynamically allocated tokens
-     * sent to other reactors.
-     * @param reactor The reactor instance.
-     */
-    private static String deferredOutputNumDestinations(
-        ReactorInstance reactor
-    ) {
-        // Reference counts are decremented by each destination reactor
-        // at the conclusion of a time step. Hence, the initial reference
-        // count should equal the number of destination _reactors_, not the
-        // number of destination ports nor the number of destination reactions.
-        // One of the destination reactors may be the container of this
-        // instance because it may have a reaction to an output of this instance.
-        var code = new CodeBuilder();
-        for (PortInstance output : reactor.outputs) {
-            for (SendRange sendingRange : output.eventualDestinations()) {
-                code.pr("// For reference counting, set num_destinations for port " + output.getFullName() + ".");
-                code.startScopedRangeBlock(sendingRange, sr, sb, sc, sendingRange.instance.isInput());
-                code.pr(CUtil.portRef(output, sr, sb, sc)+".num_destinations = "+sendingRange.getNumberOfDestinationReactors()+";");
-                code.endScopedRangeBlock(sendingRange);
+          } else if (runtime.dominating == previousRuntime.dominating) {
+            // Start of a streak of identical dominating reaction runtime instances.
+            same = true;
+          } else if (runtime.dominating != null
+              && previousRuntime.dominating != null
+              && runtime.dominating.getReaction() == previousRuntime.dominating.getReaction()) {
+            // Same dominating reaction even if not the same dominating runtime.
+            if (runtime.dominating.id != previousRuntime.dominating.id + 1) {
+              // End of a streak of contiguous runtimes.
+              printOptimizeForSingleDominatingReaction(previousRuntime, start, end, domStart, same);
+              same = false;
+              start = runtime.id;
+              domStart = runtime.dominating.id;
             }
+          } else {
+            // Different dominating reaction.
+            printOptimizeForSingleDominatingReaction(previousRuntime, start, end, domStart, same);
+            same = false;
+            start = runtime.id;
+            domStart = (runtime.dominating != null) ? runtime.dominating.id : 0;
+          }
         }
-        return code.toString();
+        first = false;
+        previousRuntime = runtime;
+        end++;
+      }
+      if (end > start) {
+        printOptimizeForSingleDominatingReaction(previousRuntime, start, end, domStart, same);
+      }
     }
-
-    /**
-     * Perform initialization functions that must be performed after
-     * all reactor runtime instances have been created.
-     * This function does not create nested loops over nested banks,
-     * so each function it calls must handle its own iteration
-     * over all runtime instance.
-     * @param reactor The container.
-     * @param main The top-level reactor.
-     * @param reactions The list of reactions to consider.
-     * @param types The C types.
-     */
-    private static String deferredInitializeNonNested(
-        ReactorInstance reactor,
-        ReactorInstance main,
-        Iterable<ReactionInstance> reactions,
-        CTypes types
-    ) {
-        var code = new CodeBuilder();
-        code.pr("// **** Start non-nested deferred initialize for "+reactor.getFullName());
-        // Initialize the num_destinations fields of port structs on the self struct.
-        // This needs to be outside the above scoped block because it performs
-        // its own iteration over ranges.
-        code.pr(deferredInputNumDestinations(
-            reactions,
-            types
-        ));
-
-        // Second batch of initializes cannot be within a for loop
-        // iterating over bank members because they iterate over send
-        // ranges which may span bank members.
-        if (reactor != main) {
-            code.pr(deferredOutputNumDestinations(
-                reactor
-            ));
-        }
-        code.pr(deferredFillTriggerTable(
-            reactions
-        ));
-        code.pr(deferredOptimizeForSingleDominatingReaction(
-            reactor
-        ));
-        for (ReactorInstance child: reactor.children) {
-            code.pr(deferredInitializeNonNested(
-                child,
-                main,
-                child.reactions,
-                types
-            ));
+    return code.toString();
+  }
+
+  /** Print statement that sets the last_enabling_reaction field of a reaction. */
+  private static String printOptimizeForSingleDominatingReaction(
+      ReactionInstance.Runtime runtime, int start, int end, int domStart, boolean same) {
+    var code = new CodeBuilder();
+    var dominatingRef = "NULL";
+
+    if (end > start + 1) {
+      code.startScopedBlock();
+      var reactionRef = CUtil.reactionRef(runtime.getReaction(), "i");
+      if (runtime.dominating != null) {
+        if (same) {
+          dominatingRef =
+              "&(" + CUtil.reactionRef(runtime.dominating.getReaction(), "" + domStart) + ")";
+        } else {
+          dominatingRef = "&(" + CUtil.reactionRef(runtime.dominating.getReaction(), "j++") + ")";
         }
-        code.pr("// **** End of non-nested deferred initialize for "+reactor.getFullName());
-        return code.toString();
+      }
+      code.pr(
+          String.join(
+              "\n",
+              "// " + runtime.getReaction().getFullName() + " dominating upstream reaction.",
+              "int j = " + domStart + ";",
+              "for (int i = " + start + "; i < " + end + "; i++) {",
+              "    " + reactionRef + ".last_enabling_reaction = " + dominatingRef + ";",
+              "}"));
+      code.endScopedBlock();
+    } else if (end == start + 1) {
+      var reactionRef = CUtil.reactionRef(runtime.getReaction(), "" + start);
+      if (runtime.dominating != null) {
+        dominatingRef =
+            "&(" + CUtil.reactionRef(runtime.dominating.getReaction(), "" + domStart) + ")";
+      }
+      code.pr(
+          String.join(
+              "\n",
+              "// " + runtime.getReaction().getFullName() + " dominating upstream reaction.",
+              reactionRef + ".last_enabling_reaction = " + dominatingRef + ";"));
     }
-
-    /**
-     * For each output of the specified reactor that has a token type
-     * (type* or type[]), create a template token and put it on the self struct.
-     * @param reactor The reactor.
-     */
-    private static String deferredCreateTemplateTokens(
-        ReactorInstance reactor,
-        CTypes types
-    ) {
-        var code = new CodeBuilder();
-        // Look for outputs with token types.
-        for (PortInstance output : reactor.outputs) {
-            var type = ASTUtils.getInferredType(output.getDefinition());
-            if (CUtil.isTokenType(type, types)) {
-                // Create the template token that goes in the trigger struct.
-                // Its reference count is zero, enabling it to be used immediately.
-                var rootType = CUtil.rootType(types.getTargetType(type));
-                // If the rootType is 'void', we need to avoid generating the code
-                // 'sizeof(void)', which some compilers reject.
-                var size = (rootType.equals("void")) ? "0" : "sizeof("+rootType+")";
-                code.startChannelIteration(output);
-                code.pr(String.join("\n",
-                        "_lf_initialize_template(env, (token_template_t*)",
-                        "        &("+CUtil.portRef(output)+"),",
-                                 size+");"
-                ));
-                code.endChannelIteration(output);
-            }
+    return code.toString();
+  }
+
+  /**
+   * For the specified reaction, for ports that it writes to, fill the trigger table for triggering
+   * downstream reactions.
+   *
+   * @param reactions The reactions.
+   */
+  private static String deferredFillTriggerTable(Iterable<ReactionInstance> reactions) {
+    var code = new CodeBuilder();
+    for (ReactionInstance reaction : reactions) {
+      var name = reaction.getParent().getFullName();
+
+      var reactorSelfStruct = CUtil.reactorRef(reaction.getParent(), sr);
+
+      var foundPort = false;
+
+      for (PortInstance port : Iterables.filter(reaction.effects, PortInstance.class)) {
+        if (!foundPort) {
+          // Need a separate index for the triggers array for each bank member.
+          code.startScopedBlock();
+          code.pr(
+              "int triggers_index["
+                  + reaction.getParent().getTotalWidth()
+                  + "] = { 0 }; // Number of bank members with the reaction.");
+          foundPort = true;
         }
-        return code.toString();
-    }
-
-    /**
-     * For the specified reaction, for ports that it writes to,
-     * set up the arrays that store the results (if necessary) and
-     * that are used to trigger downstream reactions if an effect is actually
-     * produced.  The port may be an output of the reaction's parent
-     * or an input to a reactor contained by the parent.
-     *
-     * @param reaction The reaction instance.
-     */
-    private static String deferredReactionOutputs(
-        ReactionInstance reaction,
-        TargetConfig targetConfig
-    ) {
-        var code = new CodeBuilder();
-        // val selfRef = CUtil.reactorRef(reaction.getParent());
-        var name = reaction.getParent().getFullName();
-        // Insert a string name to facilitate debugging.
-        if (targetConfig.logLevel.compareTo(LogLevel.LOG) >= 0) {
-            code.pr(CUtil.reactionRef(reaction)+".name = "+addDoubleQuotes(name+" reaction "+reaction.index)+";");
+        // If the port is a multiport, then its channels may have different sets
+        // of destinations. For ordinary ports, there will be only one range and
+        // its width will be 1.
+        // We generate the code to fill the triggers array first in a temporary code buffer,
+        // so that we can simultaneously calculate the size of the total array.
+        for (SendRange srcRange : port.eventualDestinations()) {
+          var srcNested = port.isInput();
+          code.startScopedRangeBlock(srcRange, sr, sb, sc, srcNested);
+
+          var triggerArray =
+              CUtil.reactionRef(reaction, sr) + ".triggers[triggers_index[" + sr + "]++]";
+          // Skip ports whose parent is not in the federation.
+          // This can happen with reactions in the top-level that have
+          // as an effect a port in a bank.
+          code.pr(
+              String.join(
+                  "\n",
+                  "// Reaction "
+                      + reaction.index
+                      + " of "
+                      + name
+                      + " triggers "
+                      + srcRange.destinations.size()
+                      + " downstream reactions",
+                  "// through port " + port.getFullName() + ".",
+                  CUtil.reactionRef(reaction, sr)
+                      + ".triggered_sizes[triggers_index["
+                      + sr
+                      + "]] = "
+                      + srcRange.destinations.size()
+                      + ";",
+                  "// For reaction " + reaction.index + " of " + name + ", allocate an",
+                  "// array of trigger pointers for downstream reactions through port "
+                      + port.getFullName(),
+                  "trigger_t** trigger_array = (trigger_t**)_lf_allocate(",
+                  "        " + srcRange.destinations.size() + ", sizeof(trigger_t*),",
+                  "        &" + reactorSelfStruct + "->base.allocations); ",
+                  triggerArray + " = trigger_array;"));
+          code.endScopedRangeBlock(srcRange);
         }
-
-        var reactorSelfStruct = CUtil.reactorRef(reaction.getParent());
-
-        // Count the output ports and inputs of contained reactors that
-        // may be set by this reaction. This ignores actions in the effects.
-        // Collect initialization statements for the output_produced array for the reaction
-        // to point to the is_present field of the appropriate output.
-        // These statements must be inserted after the array is malloc'd,
-        // but we construct them while we are counting outputs.
-        var outputCount = 0;
-        var init = new CodeBuilder();
-
-        init.startScopedBlock();
-        init.pr("int count = 0; SUPPRESS_UNUSED_WARNING(count);");
-        for (PortInstance effect : Iterables.filter(reaction.effects, PortInstance.class)) {
-            // Create the entry in the output_produced array for this port.
-            // If the port is a multiport, then we need to create an entry for each
-            // individual channel.
-
-            // If the port is an input of a contained reactor, then, if that
-            // contained reactor is a bank, we will have to iterate over bank
-            // members.
-            var bankWidth = 1;
-            var portRef = "";
-            if (effect.isInput()) {
-                init.pr("// Reaction writes to an input of a contained reactor.");
-                bankWidth = effect.getParent().getWidth();
-                init.startScopedBlock(effect.getParent());
-                portRef = CUtil.portRefNestedName(effect);
+      }
+      var cumulativePortWidth = 0;
+      for (PortInstance port : Iterables.filter(reaction.effects, PortInstance.class)) {
+        // If this port does not have any destinations, do not generate code for it.
+        if (port.eventualDestinations().isEmpty()) continue;
+
+        code.pr(
+            "for (int i = 0; i < "
+                + reaction.getParent().getTotalWidth()
+                + "; i++) triggers_index[i] = "
+                + cumulativePortWidth
+                + ";");
+        for (SendRange srcRange : port.eventualDestinations()) {
+          var srcNested = srcRange.instance.isInput();
+          var multicastCount = 0;
+          for (RuntimeRange<PortInstance> dstRange : srcRange.destinations) {
+            var dst = dstRange.instance;
+
+            code.startScopedRangeBlock(srcRange, dstRange);
+
+            // If the source is nested, need to take into account the parent's bank index
+            // when indexing into the triggers array.
+            var triggerArray = "";
+            if (srcNested && port.getParent().getWidth() > 1) {
+              triggerArray =
+                  CUtil.reactionRef(reaction, sr)
+                      + ".triggers[triggers_index["
+                      + sr
+                      + "] + "
+                      + sc
+                      + " + src_range_mr.digits[1] * src_range_mr.radixes[0]]";
             } else {
-                init.startScopedBlock();
-                portRef = CUtil.portRefName(effect);
+              triggerArray =
+                  CUtil.reactionRef(reaction, sr)
+                      + ".triggers[triggers_index["
+                      + sr
+                      + "] + "
+                      + sc
+                      + "]";
             }
 
-            if (effect.isMultiport()) {
-                // Form is slightly different for inputs vs. outputs.
-                var connector = ".";
-                if (effect.isInput()) connector = "->";
-
-                // Point the output_produced field to where the is_present field of the port is.
-                init.pr(String.join("\n",
-                    "for (int i = 0; i < "+effect.getWidth()+"; i++) {",
-                    "    "+CUtil.reactionRef(reaction)+".output_produced[i + count]",
-                    "            = &"+portRef+"[i]"+connector+"is_present;",
-                    "}",
-                    "count += "+effect.getWidth()+";"
-                ));
-                outputCount += effect.getWidth() * bankWidth;
+            if (dst.isOutput()) {
+              // Include this destination port only if it has at least one
+              // reaction in the federation.
+              var belongs = false;
+              for (ReactionInstance destinationReaction : dst.getDependentReactions()) {
+                belongs = true;
+              }
+              if (belongs) {
+                code.pr(
+                    String.join(
+                        "\n",
+                        "// Port " + port.getFullName() + " has reactions in its parent's parent.",
+                        "// Point to the trigger struct for those reactions.",
+                        triggerArray
+                            + "["
+                            + multicastCount
+                            + "] = &"
+                            + CUtil.triggerRefNested(dst, dr, db)
+                            + ";"));
+              } else {
+                // Put in a NULL pointer.
+                code.pr(
+                    String.join(
+                        "\n",
+                        "// Port " + port.getFullName() + " has reactions in its parent's parent.",
+                        "// But those are not in the federation.",
+                        triggerArray + "[" + multicastCount + "] = NULL;"));
+              }
             } else {
-                // The effect is not a multiport.
-                init.pr(CUtil.reactionRef(reaction)+".output_produced[count++] = &"+portRef+".is_present;");
-                outputCount += bankWidth;
+              // Destination is an input port.
+              code.pr(
+                  String.join(
+                      "\n",
+                      "// Point to destination port " + dst.getFullName() + "'s trigger struct.",
+                      triggerArray
+                          + "["
+                          + multicastCount
+                          + "] = &"
+                          + CUtil.triggerRef(dst, dr)
+                          + ";"));
             }
-            init.endScopedBlock();
+            code.endScopedRangeBlock(srcRange, dstRange);
+            multicastCount++;
+          }
         }
-        init.endScopedBlock();
-        code.pr(String.join("\n",
-            "// Total number of outputs (single ports and multiport channels)",
-            "// produced by "+reaction+".",
-            CUtil.reactionRef(reaction)+".num_outputs = "+outputCount+";"
-        ));
-        if (outputCount > 0) {
-            code.pr(String.join("\n",
-                "// Allocate memory for triggers[] and triggered_sizes[] on the reaction_t",
-                "// struct for this reaction.",
-                CUtil.reactionRef(reaction)+".triggers = (trigger_t***)_lf_allocate(",
-                "        "+outputCount+", sizeof(trigger_t**),",
-                "        &"+reactorSelfStruct+"->base.allocations);",
-                CUtil.reactionRef(reaction)+".triggered_sizes = (int*)_lf_allocate(",
-                "        "+outputCount+", sizeof(int),",
-                "        &"+reactorSelfStruct+"->base.allocations);",
-                CUtil.reactionRef(reaction)+".output_produced = (bool**)_lf_allocate(",
-                "        "+outputCount+", sizeof(bool*),",
-                "        &"+reactorSelfStruct+"->base.allocations);"
-            ));
+        // If the port is an input of a contained reactor, then we have to take
+        // into account the bank width of the contained reactor.
+        if (port.getParent() != reaction.getParent()) {
+          cumulativePortWidth += port.getWidth() * port.getParent().getWidth();
+        } else {
+          cumulativePortWidth += port.getWidth();
         }
-
-        code.pr(String.join("\n",
-            init.toString(),
-            "// ** End initialization for reaction "+reaction.index+" of "+name
-        ));
-        return code.toString();
+      }
+      if (foundPort) code.endScopedBlock();
     }
-
-    /**
-     * Generate code to allocate the memory needed by reactions for triggering
-     * downstream reactions.
-     * @param reactions A list of reactions.
-     */
-    private static String deferredReactionMemory(
-        Iterable<ReactionInstance> reactions,
-        TargetConfig targetConfig
-    ) {
-        var code = new CodeBuilder();
-        // For each reaction instance, allocate the arrays that will be used to
-        // trigger downstream reactions.
-        for (ReactionInstance reaction : reactions) {
-            code.pr(deferredReactionOutputs(
-                reaction,
-                targetConfig
-            ));
-            var reactorSelfStruct = CUtil.reactorRef(reaction.getParent());
-
-            // Next handle triggers of the reaction that come from a multiport output
-            // of a contained reactor.  Also, handle startup and shutdown triggers.
-            for (PortInstance trigger : Iterables.filter(reaction.triggers, PortInstance.class)) {
-                // If the port is a multiport, then we need to create an entry for each
-                // individual port.
-                if (trigger.isMultiport() && trigger.getParent() != null && trigger.isOutput()) {
-                    // Trigger is an output of a contained reactor or bank.
-                    code.pr(String.join("\n",
-                        "// Allocate memory to store pointers to the multiport output "+trigger.getName()+" ",
-                        "// of a contained reactor "+trigger.getParent().getFullName()
-                    ));
-                    code.startScopedBlock(trigger.getParent());
-
-                    var width = trigger.getWidth();
-                    var portStructType = CGenerator.variableStructType(trigger);
-
-                    code.pr(String.join("\n",
-                        CUtil.reactorRefNested(trigger.getParent())+"."+trigger.getName()+"_width = "+width+";",
-                        CUtil.reactorRefNested(trigger.getParent())+"."+trigger.getName(),
-                        "        = ("+portStructType+"**)_lf_allocate(",
-                        "                "+width+", sizeof("+portStructType+"*),",
-                        "                &"+reactorSelfStruct+"->base.allocations); "
-                    ));
-
-                    code.endScopedBlock();
-                }
+    return code.toString();
+  }
+
+  /**
+   * For each input port of a contained reactor that receives data from one or more of the specified
+   * reactions, set the num_destinations field of the corresponding port structs on the self struct
+   * of the reaction's parent reactor equal to the total number of destination reactors. If the port
+   * has a token type, this also initializes it with a token.
+   *
+   * @param reactions The reactions.
+   * @param types The C types.
+   */
+  private static String deferredInputNumDestinations(
+      Iterable<ReactionInstance> reactions, CTypes types) {
+    // We need the number of destination _reactors_, not the
+    // number of destination ports nor the number of destination reactions.
+    // One of the destination reactors may be the container of this
+    // instance because it may have a reaction to an output of this instance.
+    // Since a port may be written to by multiple reactions,
+    // ensure that this is done only once.
+    var portsHandled = new HashSet<PortInstance>();
+    var code = new CodeBuilder();
+    for (ReactionInstance reaction : reactions) {
+      for (PortInstance port : Iterables.filter(reaction.effects, PortInstance.class)) {
+        if (port.isInput() && !portsHandled.contains(port)) {
+          // Port is an input of a contained reactor that gets data from a reaction of this reactor.
+          portsHandled.add(port);
+          code.pr(
+              "// Set number of destination reactors for port "
+                  + port.getParent().getName()
+                  + "."
+                  + port.getName()
+                  + ".");
+          // The input port may itself have multiple destinations.
+          for (SendRange sendingRange : port.eventualDestinations()) {
+            code.startScopedRangeBlock(sendingRange, sr, sb, sc, sendingRange.instance.isInput());
+            // Syntax is slightly different for a multiport output vs. single port.
+            var connector = (port.isMultiport()) ? "->" : ".";
+            code.pr(
+                CUtil.portRefNested(port, sr, sb, sc)
+                    + connector
+                    + "num_destinations = "
+                    + sendingRange.getNumberOfDestinationReactors()
+                    + ";");
+
+            // Initialize token types.
+            var type = ASTUtils.getInferredType(port.getDefinition());
+            if (CUtil.isTokenType(type, types)) {
+              // Create the template token that goes in the port struct.
+              var rootType = CUtil.rootType(types.getTargetType(type));
+              // If the rootType is 'void', we need to avoid generating the code
+              // 'sizeof(void)', which some compilers reject.
+              var size = (rootType.equals("void")) ? "0" : "sizeof(" + rootType + ")";
+              // If the port is a multiport, then the portRefNested is itself a pointer
+              // so we want its value, not its address.
+              var indirection = (port.isMultiport()) ? "" : "&";
+              code.startChannelIteration(port);
+              code.pr(
+                  String.join(
+                      "\n",
+                      "_lf_initialize_template((token_template_t*)",
+                      "        " + indirection + "(" + CUtil.portRefNested(port, sr, sb, sc) + "),",
+                      size + ");"));
+              code.endChannelIteration(port);
             }
+
+            code.endScopedRangeBlock(sendingRange);
+          }
         }
-        return code.toString();
+      }
+    }
+    return code.toString();
+  }
+
+  /**
+   * For each output port of the specified reactor, set the num_destinations field of port structs
+   * on its self struct equal to the total number of destination reactors. This is used to
+   * initialize reference counts in dynamically allocated tokens sent to other reactors.
+   *
+   * @param reactor The reactor instance.
+   */
+  private static String deferredOutputNumDestinations(ReactorInstance reactor) {
+    // Reference counts are decremented by each destination reactor
+    // at the conclusion of a time step. Hence, the initial reference
+    // count should equal the number of destination _reactors_, not the
+    // number of destination ports nor the number of destination reactions.
+    // One of the destination reactors may be the container of this
+    // instance because it may have a reaction to an output of this instance.
+    var code = new CodeBuilder();
+    for (PortInstance output : reactor.outputs) {
+      for (SendRange sendingRange : output.eventualDestinations()) {
+        code.pr(
+            "// For reference counting, set num_destinations for port "
+                + output.getFullName()
+                + ".");
+        code.startScopedRangeBlock(sendingRange, sr, sb, sc, sendingRange.instance.isInput());
+        code.pr(
+            CUtil.portRef(output, sr, sb, sc)
+                + ".num_destinations = "
+                + sendingRange.getNumberOfDestinationReactors()
+                + ";");
+        code.endScopedRangeBlock(sendingRange);
+      }
+    }
+    return code.toString();
+  }
+
+  /**
+   * Perform initialization functions that must be performed after all reactor runtime instances
+   * have been created. This function does not create nested loops over nested banks, so each
+   * function it calls must handle its own iteration over all runtime instance.
+   *
+   * @param reactor The container.
+   * @param main The top-level reactor.
+   * @param reactions The list of reactions to consider.
+   * @param types The C types.
+   */
+  private static String deferredInitializeNonNested(
+      ReactorInstance reactor,
+      ReactorInstance main,
+      Iterable<ReactionInstance> reactions,
+      CTypes types) {
+    var code = new CodeBuilder();
+    code.pr("// **** Start non-nested deferred initialize for " + reactor.getFullName());
+    // Initialize the num_destinations fields of port structs on the self struct.
+    // This needs to be outside the above scoped block because it performs
+    // its own iteration over ranges.
+    code.pr(deferredInputNumDestinations(reactions, types));
+
+    // Second batch of initializes cannot be within a for loop
+    // iterating over bank members because they iterate over send
+    // ranges which may span bank members.
+    if (reactor != main) {
+      code.pr(deferredOutputNumDestinations(reactor));
+    }
+    code.pr(deferredFillTriggerTable(reactions));
+    code.pr(deferredOptimizeForSingleDominatingReaction(reactor));
+    for (ReactorInstance child : reactor.children) {
+      code.pr(deferredInitializeNonNested(child, main, child.reactions, types));
+    }
+    code.pr("// **** End of non-nested deferred initialize for " + reactor.getFullName());
+    return code.toString();
+  }
+
+  /**
+   * For each output of the specified reactor that has a token type (type* or type[]), create a
+   * template token and put it on the self struct.
+   *
+   * @param reactor The reactor.
+   */
+  private static String deferredCreateTemplateTokens(ReactorInstance reactor, CTypes types) {
+    var code = new CodeBuilder();
+    // Look for outputs with token types.
+    for (PortInstance output : reactor.outputs) {
+      var type = ASTUtils.getInferredType(output.getDefinition());
+      if (CUtil.isTokenType(type, types)) {
+        // Create the template token that goes in the trigger struct.
+        // Its reference count is zero, enabling it to be used immediately.
+        var rootType = CUtil.rootType(types.getTargetType(type));
+        // If the rootType is 'void', we need to avoid generating the code
+        // 'sizeof(void)', which some compilers reject.
+        var size = (rootType.equals("void")) ? "0" : "sizeof(" + rootType + ")";
+        code.startChannelIteration(output);
+        code.pr(
+            String.join(
+                "\n",
+                "_lf_initialize_template(env, (token_template_t*)",
+                "        &(" + CUtil.portRef(output) + "),",
+                size + ");"));
+        code.endChannelIteration(output);
+      }
+    }
+    return code.toString();
+  }
+
+  /**
+   * For the specified reaction, for ports that it writes to, set up the arrays that store the
+   * results (if necessary) and that are used to trigger downstream reactions if an effect is
+   * actually produced. The port may be an output of the reaction's parent or an input to a reactor
+   * contained by the parent.
+   *
+   * @param reaction The reaction instance.
+   */
+  private static String deferredReactionOutputs(
+      ReactionInstance reaction, TargetConfig targetConfig) {
+    var code = new CodeBuilder();
+    // val selfRef = CUtil.reactorRef(reaction.getParent());
+    var name = reaction.getParent().getFullName();
+    // Insert a string name to facilitate debugging.
+    if (targetConfig.logLevel.compareTo(LogLevel.LOG) >= 0) {
+      code.pr(
+          CUtil.reactionRef(reaction)
+              + ".name = "
+              + addDoubleQuotes(name + " reaction " + reaction.index)
+              + ";");
     }
 
-    /**
-     * If any reaction of the specified reactor provides input
-     * to a contained reactor, then generate code to allocate
-     * memory to store the data produced by those reactions.
-     * The allocated memory is pointed to by a field called
-     * {@code _lf_containername.portname} on the self struct of the reactor.
-     * @param reactor The reactor.
-     */
-    private static String deferredAllocationForEffectsOnInputs(
-        ReactorInstance reactor
-    ) {
-        var code = new CodeBuilder();
-        // Keep track of ports already handled. There may be more than one reaction
-        // in the container writing to the port, but we want only one memory allocation.
-        var portsHandled = new HashSet<PortInstance>();
-        var reactorSelfStruct = CUtil.reactorRef(reactor);
-        // Find parent reactions that mention multiport inputs of this reactor.
-        for (ReactionInstance reaction : reactor.reactions) {
-            for (PortInstance effect : Iterables.filter(reaction.effects, PortInstance.class)) {
-                if (effect.getParent().getDepth() > reactor.getDepth() // port of a contained reactor.
-                    && effect.isMultiport()
-                    && !portsHandled.contains(effect)
-                ) {
-                    code.pr("// A reaction writes to a multiport of a child. Allocate memory.");
-                    portsHandled.add(effect);
-                    code.startScopedBlock(effect.getParent());
-                    var portStructType = CGenerator.variableStructType(effect);
-                    var effectRef = CUtil.portRefNestedName(effect);
-                    code.pr(String.join("\n",
-                        effectRef+"_width = "+effect.getWidth()+";",
-                        "// Allocate memory to store output of reaction feeding ",
-                        "// a multiport input of a contained reactor.",
-                        effectRef+" = ("+portStructType+"**)_lf_allocate(",
-                        "        "+effect.getWidth()+", sizeof("+portStructType+"*),",
-                        "        &"+reactorSelfStruct+"->base.allocations); ",
-                        "for (int i = 0; i < "+effect.getWidth()+"; i++) {",
-                        "    "+effectRef+"[i] = ("+portStructType+"*)_lf_allocate(",
-                        "            1, sizeof("+portStructType+"),",
-                        "            &"+reactorSelfStruct+"->base.allocations); ",
-                        "}"
-                    ));
-                    code.endScopedBlock();
-                }
-            }
-        }
-        return code.toString();
+    var reactorSelfStruct = CUtil.reactorRef(reaction.getParent());
+
+    // Count the output ports and inputs of contained reactors that
+    // may be set by this reaction. This ignores actions in the effects.
+    // Collect initialization statements for the output_produced array for the reaction
+    // to point to the is_present field of the appropriate output.
+    // These statements must be inserted after the array is malloc'd,
+    // but we construct them while we are counting outputs.
+    var outputCount = 0;
+    var init = new CodeBuilder();
+
+    init.startScopedBlock();
+    init.pr("int count = 0; SUPPRESS_UNUSED_WARNING(count);");
+    for (PortInstance effect : Iterables.filter(reaction.effects, PortInstance.class)) {
+      // Create the entry in the output_produced array for this port.
+      // If the port is a multiport, then we need to create an entry for each
+      // individual channel.
+
+      // If the port is an input of a contained reactor, then, if that
+      // contained reactor is a bank, we will have to iterate over bank
+      // members.
+      var bankWidth = 1;
+      var portRef = "";
+      if (effect.isInput()) {
+        init.pr("// Reaction writes to an input of a contained reactor.");
+        bankWidth = effect.getParent().getWidth();
+        init.startScopedBlock(effect.getParent());
+        portRef = CUtil.portRefNestedName(effect);
+      } else {
+        init.startScopedBlock();
+        portRef = CUtil.portRefName(effect);
+      }
+
+      if (effect.isMultiport()) {
+        // Form is slightly different for inputs vs. outputs.
+        var connector = ".";
+        if (effect.isInput()) connector = "->";
+
+        // Point the output_produced field to where the is_present field of the port is.
+        init.pr(
+            String.join(
+                "\n",
+                "for (int i = 0; i < " + effect.getWidth() + "; i++) {",
+                "    " + CUtil.reactionRef(reaction) + ".output_produced[i + count]",
+                "            = &" + portRef + "[i]" + connector + "is_present;",
+                "}",
+                "count += " + effect.getWidth() + ";"));
+        outputCount += effect.getWidth() * bankWidth;
+      } else {
+        // The effect is not a multiport.
+        init.pr(
+            CUtil.reactionRef(reaction)
+                + ".output_produced[count++] = &"
+                + portRef
+                + ".is_present;");
+        outputCount += bankWidth;
+      }
+      init.endScopedBlock();
+    }
+    init.endScopedBlock();
+    code.pr(
+        String.join(
+            "\n",
+            "// Total number of outputs (single ports and multiport channels)",
+            "// produced by " + reaction + ".",
+            CUtil.reactionRef(reaction) + ".num_outputs = " + outputCount + ";"));
+    if (outputCount > 0) {
+      code.pr(
+          String.join(
+              "\n",
+              "// Allocate memory for triggers[] and triggered_sizes[] on the reaction_t",
+              "// struct for this reaction.",
+              CUtil.reactionRef(reaction) + ".triggers = (trigger_t***)_lf_allocate(",
+              "        " + outputCount + ", sizeof(trigger_t**),",
+              "        &" + reactorSelfStruct + "->base.allocations);",
+              CUtil.reactionRef(reaction) + ".triggered_sizes = (int*)_lf_allocate(",
+              "        " + outputCount + ", sizeof(int),",
+              "        &" + reactorSelfStruct + "->base.allocations);",
+              CUtil.reactionRef(reaction) + ".output_produced = (bool**)_lf_allocate(",
+              "        " + outputCount + ", sizeof(bool*),",
+              "        &" + reactorSelfStruct + "->base.allocations);"));
     }
 
-    /**
-     * Perform initialization functions that must be performed after
-     * all reactor runtime instances have been created.
-     * This function creates nested loops over nested banks.
-     * @param reactor The container.
-     */
-    private static String deferredInitialize(
-        ReactorInstance reactor,
-        Iterable<ReactionInstance> reactions,
-        TargetConfig targetConfig,
-        CTypes types
-    ) {
-        var code = new CodeBuilder();
-        code.pr("// **** Start deferred initialize for "+reactor.getFullName());
-        // First batch of initializations is within a for loop iterating
-        // over bank members for the reactor's parent.
-        code.startScopedBlock(reactor);
-
-        // If the child has a multiport that is an effect of some reaction in its container,
-        // then we have to generate code to allocate memory for arrays pointing to
-        // its data. If the child is a bank, then memory is allocated for the entire
-        // bank width because a reaction cannot specify which bank members it writes
-        // to so we have to assume it can write to any.
-        code.pr(deferredAllocationForEffectsOnInputs(
-            reactor
-        ));
-        code.pr(deferredReactionMemory(
-            reactions,
-            targetConfig
-        ));
-
-        // For outputs that are not primitive types (of form type* or type[]),
-        // create a default token on the self struct.
-        code.pr(deferredCreateTemplateTokens(
-            reactor,
-            types
-        ));
-        for (ReactorInstance child: reactor.children) {
-            code.pr(deferredInitialize(
-                child,
-                child.reactions,
-                targetConfig,
-                types)
-            );
+    code.pr(
+        String.join(
+            "\n",
+            init.toString(),
+            "// ** End initialization for reaction " + reaction.index + " of " + name));
+    return code.toString();
+  }
+
+  /**
+   * Generate code to allocate the memory needed by reactions for triggering downstream reactions.
+   *
+   * @param reactions A list of reactions.
+   */
+  private static String deferredReactionMemory(
+      Iterable<ReactionInstance> reactions, TargetConfig targetConfig) {
+    var code = new CodeBuilder();
+    // For each reaction instance, allocate the arrays that will be used to
+    // trigger downstream reactions.
+    for (ReactionInstance reaction : reactions) {
+      code.pr(deferredReactionOutputs(reaction, targetConfig));
+      var reactorSelfStruct = CUtil.reactorRef(reaction.getParent());
+
+      // Next handle triggers of the reaction that come from a multiport output
+      // of a contained reactor.  Also, handle startup and shutdown triggers.
+      for (PortInstance trigger : Iterables.filter(reaction.triggers, PortInstance.class)) {
+        // If the port is a multiport, then we need to create an entry for each
+        // individual port.
+        if (trigger.isMultiport() && trigger.getParent() != null && trigger.isOutput()) {
+          // Trigger is an output of a contained reactor or bank.
+          code.pr(
+              String.join(
+                  "\n",
+                  "// Allocate memory to store pointers to the multiport output "
+                      + trigger.getName()
+                      + " ",
+                  "// of a contained reactor " + trigger.getParent().getFullName()));
+          code.startScopedBlock(trigger.getParent());
+
+          var width = trigger.getWidth();
+          var portStructType = CGenerator.variableStructType(trigger);
+
+          code.pr(
+              String.join(
+                  "\n",
+                  CUtil.reactorRefNested(trigger.getParent())
+                      + "."
+                      + trigger.getName()
+                      + "_width = "
+                      + width
+                      + ";",
+                  CUtil.reactorRefNested(trigger.getParent()) + "." + trigger.getName(),
+                  "        = (" + portStructType + "**)_lf_allocate(",
+                  "                " + width + ", sizeof(" + portStructType + "*),",
+                  "                &" + reactorSelfStruct + "->base.allocations); "));
+
+          code.endScopedBlock();
         }
-        code.endScopedBlock();
-        code.pr("// **** End of deferred initialize for "+reactor.getFullName());
-        return code.toString();
+      }
+    }
+    return code.toString();
+  }
+
+  /**
+   * If any reaction of the specified reactor provides input to a contained reactor, then generate
+   * code to allocate memory to store the data produced by those reactions. The allocated memory is
+   * pointed to by a field called {@code _lf_containername.portname} on the self struct of the
+   * reactor.
+   *
+   * @param reactor The reactor.
+   */
+  private static String deferredAllocationForEffectsOnInputs(ReactorInstance reactor) {
+    var code = new CodeBuilder();
+    // Keep track of ports already handled. There may be more than one reaction
+    // in the container writing to the port, but we want only one memory allocation.
+    var portsHandled = new HashSet<PortInstance>();
+    var reactorSelfStruct = CUtil.reactorRef(reactor);
+    // Find parent reactions that mention multiport inputs of this reactor.
+    for (ReactionInstance reaction : reactor.reactions) {
+      for (PortInstance effect : Iterables.filter(reaction.effects, PortInstance.class)) {
+        if (effect.getParent().getDepth() > reactor.getDepth() // port of a contained reactor.
+            && effect.isMultiport()
+            && !portsHandled.contains(effect)) {
+          code.pr("// A reaction writes to a multiport of a child. Allocate memory.");
+          portsHandled.add(effect);
+          code.startScopedBlock(effect.getParent());
+          var portStructType = CGenerator.variableStructType(effect);
+          var effectRef = CUtil.portRefNestedName(effect);
+          code.pr(
+              String.join(
+                  "\n",
+                  effectRef + "_width = " + effect.getWidth() + ";",
+                  "// Allocate memory to store output of reaction feeding ",
+                  "// a multiport input of a contained reactor.",
+                  effectRef + " = (" + portStructType + "**)_lf_allocate(",
+                  "        " + effect.getWidth() + ", sizeof(" + portStructType + "*),",
+                  "        &" + reactorSelfStruct + "->base.allocations); ",
+                  "for (int i = 0; i < " + effect.getWidth() + "; i++) {",
+                  "    " + effectRef + "[i] = (" + portStructType + "*)_lf_allocate(",
+                  "            1, sizeof(" + portStructType + "),",
+                  "            &" + reactorSelfStruct + "->base.allocations); ",
+                  "}"));
+          code.endScopedBlock();
+        }
+      }
+    }
+    return code.toString();
+  }
+
+  /**
+   * Perform initialization functions that must be performed after all reactor runtime instances
+   * have been created. This function creates nested loops over nested banks.
+   *
+   * @param reactor The container.
+   */
+  private static String deferredInitialize(
+      ReactorInstance reactor,
+      Iterable<ReactionInstance> reactions,
+      TargetConfig targetConfig,
+      CTypes types) {
+    var code = new CodeBuilder();
+    code.pr("// **** Start deferred initialize for " + reactor.getFullName());
+    // First batch of initializations is within a for loop iterating
+    // over bank members for the reactor's parent.
+    code.startScopedBlock(reactor);
+
+    // If the child has a multiport that is an effect of some reaction in its container,
+    // then we have to generate code to allocate memory for arrays pointing to
+    // its data. If the child is a bank, then memory is allocated for the entire
+    // bank width because a reaction cannot specify which bank members it writes
+    // to so we have to assume it can write to any.
+    code.pr(deferredAllocationForEffectsOnInputs(reactor));
+    code.pr(deferredReactionMemory(reactions, targetConfig));
+
+    // For outputs that are not primitive types (of form type* or type[]),
+    // create a default token on the self struct.
+    code.pr(deferredCreateTemplateTokens(reactor, types));
+    for (ReactorInstance child : reactor.children) {
+      code.pr(deferredInitialize(child, child.reactions, targetConfig, types));
     }
+    code.endScopedBlock();
+    code.pr("// **** End of deferred initialize for " + reactor.getFullName());
+    return code.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CTypes.java b/org.lflang/src/org/lflang/generator/c/CTypes.java
index 45edd59bd5..97ea482d83 100644
--- a/org.lflang/src/org/lflang/generator/c/CTypes.java
+++ b/org.lflang/src/org/lflang/generator/c/CTypes.java
@@ -4,162 +4,150 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-
 import org.lflang.InferredType;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.generator.TargetTypes;
-import org.lflang.lf.Initializer;
 import org.lflang.lf.ParameterReference;
-import org.lflang.lf.Type;
 
 public class CTypes implements TargetTypes {
 
-    // Regular expression pattern for array types.
-    // For example, for "foo[10]", the first match will be "foo" and the second "[10]".
-    // For "foo[]", the first match will be "foo" and the second "".
-    static final Pattern arrayPattern = Pattern.compile("^\\s*(?:/\\*.*?\\*/)?\\s*(\\w+)\\s*\\[([0-9]*)]\\s*$");
-    private static final CTypes INSTANCE = new CTypes();
-
-    public CTypes() {
-    }
-
-    @Override
-    public boolean supportsGenerics() {
-        return false;
-    }
-
-    @Override
-    public String getTargetTimeType() {
-        return "interval_t";
-    }
-
-    @Override
-    public String getTargetTagType() {
-        return "tag_t";
-    }
-
-    @Override
-    public String getTargetFixedSizeListType(String baseType, int size) {
-        return String.format("%s[%d]", baseType, size);
-    }
-
-    @Override
-    public String getTargetVariableSizeListType(String baseType) {
-        return String.format("%s[]", baseType);
-    }
-
-    @Override
-    public String getTargetUndefinedType() {
-        return "/*undefined*/";
-    }
-
-    /**
-     * Given a type, return a C representation of the type. Note that
-     * C types are very idiosyncratic. For example, {@code int[]} is not always accepted
-     * as a type, and {@code int*} must be used instead, except when initializing
-     * a variable using a static initializer, as in {@code int[] foo = {1, 2, 3};}.
-     * When initializing a variable using a static initializer, use
-     * {@link #getVariableDeclaration(TypeParameterizedReactor, InferredType, String, boolean)} instead.
-     * @param type The type.
-     */
-    @Override
-    public String getTargetType(InferredType type) {
-        var result = TargetTypes.super.getTargetType(type);
-        Matcher matcher = arrayPattern.matcher(result);
-        if (matcher.find()) {
-            return matcher.group(1) + '*';
-        }
-        return result;
-    }
-
-    @Override
-    public String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
-        throw new UnsupportedOperationException("No context defined");
-    }
-
-    @Override
-    public String getTargetTimeExpr(TimeValue time) {
-        if (time != null) {
-            if (time.unit != null) {
-                return cMacroName(time.unit) + "(" + time.getMagnitude() + ")";
-            } else {
-                return Long.valueOf(time.getMagnitude()).toString();
-            }
-        }
-        return "0"; // FIXME: do this or throw exception?
-    }
-
-    @Override
-    public String getFixedSizeListInitExpression(List<String> contents, int listSize, boolean withBraces) {
-        return contents.stream().collect(Collectors.joining(", ", "{ ", " }"));
-    }
-
-    @Override
-    public String getVariableSizeListInitExpression(List<String> contents, boolean withBraces) {
-        return contents.stream().collect(Collectors.joining(", ", "{ ", " }"));
-    }
-
-    /**
-     * Return a variable declaration of the form "{@code type name}".
-     * The type is as returned by {@link #getTargetType(InferredType)}, except with
-     * the array syntax {@code [size]} preferred over the pointer syntax
-     * {@code *} (if applicable). This also includes the variable name
-     * because C requires the array type specification to be placed after
-     * the variable name rather than with the type.
-     * The result is of the form {@code type variable_name[size]} or
-     * {@code type variable_name} depending on whether the given type
-     * is an array type, unless the array type has no size (it is given
-     * as {@code []}. In that case, the returned form depends on the
-     * third argument, initializer. If true, the then the returned
-     * declaration will have the form {@code type variable_name[]},
-     * and otherwise it will have the form {@code type* variable_name}.
-     * @param type The type.
-     * @param variableName The name of the variable.
-     * @param initializer True to return a form usable in a static initializer.
-     */
-    public String getVariableDeclaration(
-            TypeParameterizedReactor tpr,
-            InferredType type,
-            String variableName,
-            boolean initializer
-    ) {
-        String t = TargetTypes.super.getTargetType(tpr.resolveType(type));
-        Matcher matcher = arrayPattern.matcher(t);
-        String declaration = String.format("%s %s", t, variableName);
-        if (matcher.find()) {
-            // For array types, we have to move the []
-            // because C is very picky about where this goes. It has to go
-            // after the variable name. Also, in an initializer, it has to have
-            // form [], and in a struct definition, it has to use *.
-            if (matcher.group(2).equals("") && !initializer) {
-                declaration = String.format("%s* %s",
-                        matcher.group(1), variableName);
-            } else {
-                declaration = String.format("%s %s[%s]",
-                        matcher.group(1), variableName, matcher.group(2));
-            }
-        }
-        return declaration;
-    }
-
-    // note that this is moved out by #544
-    public static String cMacroName(TimeUnit unit) {
-        return unit.getCanonicalName().toUpperCase();
-    }
-
-    public static CTypes getInstance() {
-        return INSTANCE;
-    }
-
-
-    public static CTypes generateParametersIn(ReactorInstance instance) {
-        return new CTypes() {
-            @Override
-            public String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
-                return CUtil.reactorRef(instance) + "->" + expr.getParameter().getName();
-            }
-        };
-    }
+  // Regular expression pattern for array types.
+  // For example, for "foo[10]", the first match will be "foo" and the second "[10]".
+  // For "foo[]", the first match will be "foo" and the second "".
+  static final Pattern arrayPattern =
+      Pattern.compile("^\\s*(?:/\\*.*?\\*/)?\\s*(\\w+)\\s*\\[([0-9]*)]\\s*$");
+  private static final CTypes INSTANCE = new CTypes();
+
+  public CTypes() {}
+
+  @Override
+  public boolean supportsGenerics() {
+    return false;
+  }
+
+  @Override
+  public String getTargetTimeType() {
+    return "interval_t";
+  }
+
+  @Override
+  public String getTargetTagType() {
+    return "tag_t";
+  }
+
+  @Override
+  public String getTargetFixedSizeListType(String baseType, int size) {
+    return String.format("%s[%d]", baseType, size);
+  }
+
+  @Override
+  public String getTargetVariableSizeListType(String baseType) {
+    return String.format("%s[]", baseType);
+  }
+
+  @Override
+  public String getTargetUndefinedType() {
+    return "/*undefined*/";
+  }
+
+  /**
+   * Given a type, return a C representation of the type. Note that C types are very idiosyncratic.
+   * For example, {@code int[]} is not always accepted as a type, and {@code int*} must be used
+   * instead, except when initializing a variable using a static initializer, as in {@code int[] foo
+   * = {1, 2, 3};}. When initializing a variable using a static initializer, use {@link
+   * #getVariableDeclaration(TypeParameterizedReactor, InferredType, String, boolean)} instead.
+   *
+   * @param type The type.
+   */
+  @Override
+  public String getTargetType(InferredType type) {
+    var result = TargetTypes.super.getTargetType(type);
+    Matcher matcher = arrayPattern.matcher(result);
+    if (matcher.find()) {
+      return matcher.group(1) + '*';
+    }
+    return result;
+  }
+
+  @Override
+  public String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
+    throw new UnsupportedOperationException("No context defined");
+  }
+
+  @Override
+  public String getTargetTimeExpr(TimeValue time) {
+    if (time != null) {
+      if (time.unit != null) {
+        return cMacroName(time.unit) + "(" + time.getMagnitude() + ")";
+      } else {
+        return Long.valueOf(time.getMagnitude()).toString();
+      }
+    }
+    return "0"; // FIXME: do this or throw exception?
+  }
+
+  @Override
+  public String getFixedSizeListInitExpression(
+      List<String> contents, int listSize, boolean withBraces) {
+    return contents.stream().collect(Collectors.joining(", ", "{ ", " }"));
+  }
+
+  @Override
+  public String getVariableSizeListInitExpression(List<String> contents, boolean withBraces) {
+    return contents.stream().collect(Collectors.joining(", ", "{ ", " }"));
+  }
+
+  /**
+   * Return a variable declaration of the form "{@code type name}". The type is as returned by
+   * {@link #getTargetType(InferredType)}, except with the array syntax {@code [size]} preferred
+   * over the pointer syntax {@code *} (if applicable). This also includes the variable name because
+   * C requires the array type specification to be placed after the variable name rather than with
+   * the type. The result is of the form {@code type variable_name[size]} or {@code type
+   * variable_name} depending on whether the given type is an array type, unless the array type has
+   * no size (it is given as {@code []}. In that case, the returned form depends on the third
+   * argument, initializer. If true, the then the returned declaration will have the form {@code
+   * type variable_name[]}, and otherwise it will have the form {@code type* variable_name}.
+   *
+   * @param type The type.
+   * @param variableName The name of the variable.
+   * @param initializer True to return a form usable in a static initializer.
+   */
+  public String getVariableDeclaration(
+      TypeParameterizedReactor tpr, InferredType type, String variableName, boolean initializer) {
+    String t = TargetTypes.super.getTargetType(tpr.resolveType(type));
+    Matcher matcher = arrayPattern.matcher(t);
+    String declaration = String.format("%s %s", t, variableName);
+    if (matcher.find()) {
+      // For array types, we have to move the []
+      // because C is very picky about where this goes. It has to go
+      // after the variable name. Also, in an initializer, it has to have
+      // form [], and in a struct definition, it has to use *.
+      if (matcher.group(2).equals("") && !initializer) {
+        declaration = String.format("%s* %s", matcher.group(1), variableName);
+      } else {
+        declaration = String.format("%s %s[%s]", matcher.group(1), variableName, matcher.group(2));
+      }
+    }
+    return declaration;
+  }
+
+  // note that this is moved out by #544
+  public static String cMacroName(TimeUnit unit) {
+    return unit.getCanonicalName().toUpperCase();
+  }
+
+  public static CTypes getInstance() {
+    return INSTANCE;
+  }
+
+  public static CTypes generateParametersIn(ReactorInstance instance) {
+    return new CTypes() {
+      @Override
+      public String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
+        return CUtil.reactorRef(instance) + "->" + expr.getParameter().getName();
+      }
+    };
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CUtil.java b/org.lflang/src/org/lflang/generator/c/CUtil.java
index 15a66304bc..0855ad3b97 100644
--- a/org.lflang/src/org/lflang/generator/c/CUtil.java
+++ b/org.lflang/src/org/lflang/generator/c/CUtil.java
@@ -1,28 +1,28 @@
 /* Utilities for C code generation. */
 
 /*************
-Copyright (c) 2019-2021, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019-2021, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator.c;
 
@@ -35,12 +35,10 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.Objects;
 import java.util.Queue;
 import java.util.stream.Collectors;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig;
-
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.GeneratorCommandFactory;
 import org.lflang.generator.LFGeneratorContext;
@@ -58,810 +56,805 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.util.LFCommand;
 
 /**
- * A collection of utilities for C code generation.
- * This class codifies the coding conventions for the C target code generator.
- * I.e., it defines how variables are named and referenced.
+ * A collection of utilities for C code generation. This class codifies the coding conventions for
+ * the C target code generator. I.e., it defines how variables are named and referenced.
+ *
  * @author Edward A. Lee
  */
 public class CUtil {
 
-    /**
-     * Suffix that when appended to the name of a federated reactor yields
-     * the name of its corresponding RTI executable.
-     */
-    public static final String RTI_BIN_SUFFIX = "_RTI";
-
-    /**
-     * Suffix that when appended to the name of a federated reactor yields
-     * the name of its corresponding distribution script.
-     */
-    public static final String RTI_DISTRIBUTION_SCRIPT_SUFFIX = "_distribute.sh";
-
-    //////////////////////////////////////////////////////
-    //// Public methods.
-
-    /**
-     * Return a reference to the action struct of the specified
-     * action instance. This action_base_t struct is on the self struct.
-     * @param instance The action instance.
-     * @param runtimeIndex An optional index variable name to use to address runtime instances.
-     */
-    public static String actionRef(ActionInstance instance, String runtimeIndex) {
-        return reactorRef(instance.getParent(), runtimeIndex)
-                + "->_lf_"
-                + instance.getName();
-    }
-
-    /**
-     * Return a default name of a variable to refer to the bank index of a reactor
-     * in a bank. This is has the form uniqueID_i where uniqueID
-     * is an identifier for the instance that is guaranteed to be different
-     * from the ID of any other instance in the program.
-     * If the instance is not a bank, return "0".
-     * @param instance A reactor instance.
-     */
-    public static String bankIndex(ReactorInstance instance) {
-        if (!instance.isBank()) return "0";
-        return bankIndexName(instance);
-    }
-
-    /**
-     * Return a default name of a variable to refer to the bank index of a reactor
-     * in a bank. This is has the form uniqueID_i where uniqueID
-     * is an identifier for the instance that is guaranteed to be different
-     * from the ID of any other instance in the program.
-     * @param instance A reactor instance.
-     */
-    public static String bankIndexName(ReactorInstance instance) {
-        return instance.uniqueID() + "_i";
-    }
-
-    /**
-     * Return a default name of a variable to refer to the channel index of a port
-     * in a bank. This has the form uniqueID_c where uniqueID
-     * is an identifier for the instance that is guaranteed to be different
-     * from the ID of any other instance in the program.
-     * If the port is not a multiport, then return the string "0".
-     */
-    public static String channelIndex(PortInstance port) {
-        if (!port.isMultiport()) return "0";
-        return channelIndexName(port);
-    }
-
-    /**
-     * Return a default name of a variable to refer to the channel index of a port
-     * in a bank. This is has the form uniqueID_c where uniqueID
-     * is an identifier for the instance that is guaranteed to be different
-     * from the ID of any other instance in the program.
-     */
-    public static String channelIndexName(PortInstance port) {
-        return port.uniqueID() + "_c";
-    }
-
-    /**
-     * Return the name of the reactor. A {@code _main} is appended to the name if the
-     * reactor is main (to allow for instantiations that have the same name as
-     * the main reactor or the .lf file).
-     */
-    public static String getName(TypeParameterizedReactor reactor) {
-        String name = reactor.reactor().getName().toLowerCase() + reactor.hashCode();
-        if (reactor.reactor().isMain()) {
-            return name + "_main";
-        }
-        return name;
-    }
-
-    /**
-     * Return a reference to the specified port.
-     *
-     * The returned string will have one of the following forms:
-     * <ul>
-     * <li>{@code selfStructs[k]->_lf_portName}</li>
-     * <li>{@code selfStructs[k]->_lf_portName}</li>
-     * <li>{@code selfStructs[k]->_lf_portName[i]}</li>
-     * <li>{@code selfStructs[k]->_lf_parent.portName}</li>
-     * <li>{@code selfStructs[k]->_lf_parent.portName[i]}</li>
-     * <li>{@code selfStructs[k]->_lf_parent[j].portName}</li>
-     * <li>{@code selfStructs[k]->_lf_parent[j].portName[i]}</li>
-     * </ul>
-     *
-     * where {@code k} is the runtime index of either the port's parent
-     * or the port's parent's parent, the latter when isNested is {@code true}.
-     * The index {@code j} is present if the parent is a bank, and
-     * the index {@code i} is present if the port is a multiport.
-     *
-     * The first two forms are used if isNested is false,
-     * and the remaining four are used if isNested is true.
-     * Set {@code isNested} to {@code true} when referencing a port belonging
-     * to a contained reactor.
-     *
-     * @param port The port.
-     * @param isNested True to return a reference relative to the parent's parent.
-     * @param includeChannelIndex True to include the channel index at the end.
-     * @param runtimeIndex A variable name to use to index the runtime instance or
-     *  null to use the default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
-     * @param bankIndex A variable name to use to index the bank or null to use the
-     *  default, the string returned by {@link CUtil#bankIndex(ReactorInstance)}.
-     * @param channelIndex A variable name to use to index the channel or null to
-     *  use the default, the string returned by {@link CUtil#channelIndex(PortInstance)}.
-     */
-    public static String portRef(
-            PortInstance port,
-            boolean isNested,
-            boolean includeChannelIndex,
-            String runtimeIndex,
-            String bankIndex,
-            String channelIndex
-    ) {
-        String channel = "";
-        if (channelIndex == null) channelIndex = channelIndex(port);
-        if (port.isMultiport() && includeChannelIndex) {
-            channel = "[" + channelIndex + "]";
-        }
-        if (isNested) {
-            return reactorRefNested(port.getParent(), runtimeIndex, bankIndex) + "." + port.getName() + channel;
-        } else {
-            String sourceStruct = CUtil.reactorRef(port.getParent(), runtimeIndex);
-            return sourceStruct + "->_lf_" + port.getName() + channel;
-        }
-    }
-
-    /**
-     * Return a reference to the port on the self struct of the
-     * port's parent.  This is used when an input port triggers a reaction
-     * in the port's parent or when an output port is written to by
-     * a reaction in the port's parent.
-     * This is equivalent to calling {@code portRef(port, false, true, null, null)}.
-     * @param port An instance of the port to be referenced.
-     */
-    public static String portRef(PortInstance port) {
-        return portRef(port, false, true, null, null, null);
-    }
-
-    /**
-     * Return a reference to the port on the self struct of the
-     * port's parent using the specified index variables.
-     * This is used when an input port triggers a reaction
-     * in the port's parent or when an output port is written to by
-     * a reaction in the port's parent.
-     * This is equivalent to calling {@code portRef(port, false, true, bankIndex, channelIndex)}.
-     * @param port An instance of the port to be referenced.
-     * @param runtimeIndex A variable name to use to index the runtime instance or
-     *  null to use the default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
-     * @param bankIndex A variable name to use to index the bank or null to use the
-     *  default, the string returned by {@link CUtil#bankIndex(ReactorInstance)}.
-     * @param channelIndex A variable name to use to index the channel or null to
-     *  use the default, the string returned by {@link CUtil#channelIndex(PortInstance)}.
-     */
-    public static String portRef(
-            PortInstance port, String runtimeIndex, String bankIndex, String channelIndex
-    ) {
-        return portRef(port, false, true, runtimeIndex, bankIndex, channelIndex);
-    }
-
-    /**
-     * Return a reference to a port without any channel indexing.
-     * This is useful for deriving a reference to the _width variable.
-     * @param port An instance of the port to be referenced.
-     */
-    public static String portRefName(PortInstance port) {
-        return portRef(port, false, false, null, null, null);
-    }
-
-    /**
-     * Return the portRef without the channel indexing.
-     * This is useful for deriving a reference to the _width variable.
-     *
-     * @param port An instance of the port to be referenced.
-     * @param runtimeIndex A variable name to use to index the runtime instance or
-     *  null to use the default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
-     * @param bankIndex A variable name to use to index the bank or null to use the
-     *  default, the string returned by {@link CUtil#bankIndex(ReactorInstance)}.
-     * @param channelIndex A variable name to use to index the channel or null to
-     *  use the default, the string returned by {@link CUtil#channelIndex(PortInstance)}.
-     */
-    public static String portRefName(
-            PortInstance port, String runtimeIndex, String bankIndex, String channelIndex
-    ) {
-        return portRef(port, false, false, runtimeIndex, bankIndex, channelIndex);
-    }
-
-    /**
-     * Return a port reference to a port on the self struct of the
-     * parent of the port's parent.  This is used when an input port
-     * is written to by a reaction in the parent of the port's parent,
-     * or when an output port triggers a reaction in the parent of the
-     * port's parent. This is equivalent to calling
-     * {@code portRef(port, true, true, null, null, null)}.
-     *
-     * @param port The port.
-     */
-    public static String portRefNested(PortInstance port) {
-        return portRef(port, true, true, null, null, null);
-    }
-
-    /**
-     * Return a reference to the port on the self struct of the
-     * parent of the port's parent.  This is used when an input port
-     * is written to by a reaction in the parent of the port's parent,
-     * or when an output port triggers a reaction in the parent of the
-     * port's parent. This is equivalent to calling
-     * {@code portRef(port, true, true, runtimeIndex, bankIndex, channelIndex)}.
-     *
-     * @param port The port.
-     * @param runtimeIndex A variable name to use to index the runtime instance or
-     *  null to use the default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
-     * @param bankIndex A variable name to use to index the bank or null to use the
-     *  default, the string returned by {@link CUtil#bankIndex(ReactorInstance)}.
-     * @param channelIndex A variable name to use to index the channel or null to
-     *  use the default, the string returned by {@link CUtil#channelIndex(PortInstance)}.
-     */
-    public static String portRefNested(
-            PortInstance port, String runtimeIndex, String bankIndex, String channelIndex
-    ) {
-        return portRef(port, true, true, runtimeIndex, bankIndex, channelIndex);
-    }
-
-    /**
-     * Return a reference to the port on the self struct of the
-     * parent of the port's parent, but without the channel indexing,
-     * even if it is a multiport.  This is used when an input port
-     * is written to by a reaction in the parent of the port's parent,
-     * or when an output port triggers a reaction in the parent of the
-     * port's parent.
-     * This is equivalent to calling {@code portRef(port, true, false, null, null, null)}.
-     *
-     * @param port The port.
-     */
-    public static String portRefNestedName(PortInstance port) {
-        return portRef(port, true, false, null, null, null);
-    }
-
-    /**
-     * Return a reference to the port on the self struct of the
-     * parent of the port's parent, but without the channel indexing,
-     * even if it is a multiport.  This is used when an input port
-     * is written to by a reaction in the parent of the port's parent,
-     * or when an output port triggers a reaction in the parent of the
-     * port's parent. This is equivalent to calling
-     * {@code portRefNested(port, true, false, runtimeIndex, bankIndex, channelIndex)}.
-     *
-     * @param port The port.
-     * @param runtimeIndex A variable name to use to index the runtime instance or
-     *  null to use the default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
-     * @param bankIndex A variable name to use to index the bank or null to use the
-     *  default, the string returned by {@link CUtil#bankIndex(ReactorInstance)}.
-     * @param channelIndex A variable name to use to index the channel or null to
-     *  use the default, the string returned by {@link CUtil#channelIndex(PortInstance)}.
-     */
-    public static String portRefNestedName(
-            PortInstance port, String runtimeIndex, String bankIndex, String channelIndex
-    ) {
-        return portRef(port, true, false, runtimeIndex, bankIndex, channelIndex);
-    }
-
-    /**
-     * Return code for referencing a port within a reaction body possibly indexed by
-     * a bank index and/or a multiport index. If the provided reference is
-     * not a port, then this returns the string "ERROR: not a port."
-     * @param reference The reference to the port.
-     * @param bankIndex A bank index or null or negative if not in a bank.
-     * @param multiportIndex A multiport index or null or negative if not in a multiport.
-     */
-    public static String portRefInReaction(VarRef reference, Integer bankIndex, Integer multiportIndex) {
-        if (!(reference.getVariable() instanceof Port)) {
-            return "ERROR: not a port."; // FIXME: This is not the fail-fast approach, and it seems arbitrary.
-        }
-        var prefix = "";
-        if (reference.getContainer() != null) {
-            var bank = "";
-            if (reference.getContainer().getWidthSpec() != null && bankIndex != null && bankIndex >= 0) {
-                bank = "[" + bankIndex + "]";
-            }
-            prefix = reference.getContainer().getName() + bank + ".";
-        }
-        var multiport = "";
-        if (((Port) reference.getVariable()).getWidthSpec() != null && multiportIndex != null && multiportIndex >= 0) {
-            multiport = "[" + multiportIndex + "]";
-        }
-        return prefix + reference.getVariable().getName() + multiport;
-    }
-
-    /**
-     * Return a reference to the reaction entry on the self struct
-     * of the parent of the specified reaction.
-     * @param reaction The reaction.
-     */
-    public static String reactionRef(ReactionInstance reaction) {
-        return reactionRef(reaction, null);
-    }
-
-    /**
-     * Return a reference to the reaction entry on the self struct
-     * of the parent of the specified reaction.
-     * @param reaction The reaction.
-     * @param runtimeIndex An index into the array of self structs for the parent.
-     */
-    public static String reactionRef(ReactionInstance reaction, String runtimeIndex) {
-        return reactorRef(reaction.getParent(), runtimeIndex)
-                + "->_lf__reaction_" + reaction.index;
-    }
-
-    /**
-     * Return a reference to the "self" struct of the specified
-     * reactor instance. The returned string has the form
-     * self[j], where self is the name of the array of self structs
-     * for this reactor instance and j is the expression returned
-     * by {@link #runtimeIndex(ReactorInstance)} or 0 if there are no banks.
-     * @param instance The reactor instance.
-     */
-    public static String reactorRef(ReactorInstance instance) {
-        return reactorRef(instance, null);
-    }
-
-    /**
-     * Return the name of the array of "self" structs of the specified
-     * reactor instance.  This is similar to {@link #reactorRef(ReactorInstance)}
-     * except that it does not index into the array.
-     * @param instance The reactor instance.
-     */
-    public static String reactorRefName(ReactorInstance instance) {
-        return instance.uniqueID() + "_self";
-    }
-
-    /**
-     * Return a reference to the "self" struct of the specified
-     * reactor instance. The returned string has the form
-     * self[runtimeIndex], where self is the name of the array of self structs
-     * for this reactor instance. If runtimeIndex is null, then it is replaced by
-     * the expression returned
-     * by {@link #runtimeIndex(ReactorInstance)} or 0 if there are no banks.
-     * @param instance The reactor instance.
-     * @param runtimeIndex An optional expression to use to address bank members.
-     *  If this is null, the expression used will be that returned  by
-     *  {@link #runtimeIndex(ReactorInstance)}.
-     */
-    public static String reactorRef(ReactorInstance instance, String runtimeIndex) {
-        if (runtimeIndex == null) runtimeIndex = runtimeIndex(instance);
-        return reactorRefName(instance) + "[" + runtimeIndex + "]";
-    }
-
-    /**
-     * For situations where a reaction reacts to or reads from an output
-     * of a contained reactor or sends to an input of a contained reactor,
-     * then the container's self struct will have a field
-     * (or an array of fields if the contained reactor is a bank) that is
-     * a struct with fields corresponding to those inputs and outputs.
-     * This method returns a reference to that struct or array of structs.
-     * Note that the returned reference is not to the self struct of the
-     * contained reactor. Use {@link #reactorRef(ReactorInstance)} for that.
-     *
-     * @param reactor The contained reactor.
-     */
-    public static String reactorRefNested(ReactorInstance reactor) {
-        return reactorRefNested(reactor, null, null);
-    }
-
-    /**
-     * For situations where a reaction reacts to or reads from an output
-     * of a contained reactor or sends to an input of a contained reactor,
-     * then the container's self struct will have a field
-     * (or an array of fields if the contained reactor is a bank) that is
-     * a struct with fields corresponding to those inputs and outputs.
-     * This method returns a reference to that struct or array of structs.
-     * Note that the returned reference is not to the self struct of the
-     * contained reactor. Use {@link CUtil#reactorRef(ReactorInstance)} for that.
-     *
-     * @param reactor The contained reactor.
-     * @param runtimeIndex A variable name to use to index the runtime instance or
-     *  null to use the default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
-     * @param bankIndex A variable name to use to index the bank or null to use the
-     *  default, the string returned by {@link CUtil#bankIndex(ReactorInstance)}.
-     */
-    public static String reactorRefNested(ReactorInstance reactor, String runtimeIndex, String bankIndex) {
-        String result = reactorRef(reactor.getParent(), runtimeIndex) + "->_lf_" + reactor.getName();
-        if (reactor.isBank()) {
-            // Need the bank index not the runtimeIndex.
-            if (bankIndex == null) bankIndex = bankIndex(reactor);
-            result += "[" + bankIndex + "]";
-        }
-        return result;
-    }
-
-    /**
-     * Return an expression that, when evaluated, gives the index of
-     * a runtime instance of the specified ReactorInstance. If the reactor
-     * is not within any banks, then this will return "0". Otherwise, it
-     * will return an expression that evaluates a mixed-radix number
-     * d0%w0, d1%w1, ... , dn%wn, where n is the depth minus one of the
-     * reactor. The radixes, w0 to wn, are the widths of this reactor,
-     * its parent reactor, on up to the top-level reactor. Since the top-level
-     * reactor is never a bank, dn = 0 and wn = 1. The digits, di, are
-     * either 0 (of the parent is not a bank) or the variable name returned
-     * by {@link #bankIndexName(ReactorInstance)} if the parent is a bank.
-     * The returned expression, when evaluated, will yield the following value:
-     *
-     * <pre>
-     *     d0 + w0 * (d1 + w1 * ( ... (dn-1 + wn-1 * dn) ... )
-     * </pre>
-     *
-     * @param reactor The reactor.
-     */
-    public static String runtimeIndex(ReactorInstance reactor) {
-        StringBuilder result = new StringBuilder();
-        int width = 0;
-        int parens = 0;
-        while (reactor != null) {
-            if (reactor.isBank() && reactor.getWidth() > 1) {
-                if (width > 0) {
-                    result.append(" + " + width + " * (");
-                    parens++;
-                }
-                result.append(bankIndexName(reactor));
-                width = reactor.getWidth();
-            }
-            reactor = reactor.getParent();
-        }
-        while (parens-- > 0) {
-            result.append(")");
-        }
-        if (result.length() == 0) return "0";
-        return result.toString();
-    }
-
-    /**
-     * Return a unique type for the "self" struct of the specified
-     * reactor class from the reactor class.
-     * @param reactor The reactor class.
-     * @return The type of a self struct for the specified reactor class.
-     */
-    public static String selfType(TypeParameterizedReactor reactor) {
-        if (reactor.reactor().isMain()) {
-            return "_" + CUtil.getName(reactor) + "_main_self_t";
+  /**
+   * Suffix that when appended to the name of a federated reactor yields the name of its
+   * corresponding RTI executable.
+   */
+  public static final String RTI_BIN_SUFFIX = "_RTI";
+
+  /**
+   * Suffix that when appended to the name of a federated reactor yields the name of its
+   * corresponding distribution script.
+   */
+  public static final String RTI_DISTRIBUTION_SCRIPT_SUFFIX = "_distribute.sh";
+
+  //////////////////////////////////////////////////////
+  //// Public methods.
+
+  /**
+   * Return a reference to the action struct of the specified action instance. This action_base_t
+   * struct is on the self struct.
+   *
+   * @param instance The action instance.
+   * @param runtimeIndex An optional index variable name to use to address runtime instances.
+   */
+  public static String actionRef(ActionInstance instance, String runtimeIndex) {
+    return reactorRef(instance.getParent(), runtimeIndex) + "->_lf_" + instance.getName();
+  }
+
+  /**
+   * Return a default name of a variable to refer to the bank index of a reactor in a bank. This is
+   * has the form uniqueID_i where uniqueID is an identifier for the instance that is guaranteed to
+   * be different from the ID of any other instance in the program. If the instance is not a bank,
+   * return "0".
+   *
+   * @param instance A reactor instance.
+   */
+  public static String bankIndex(ReactorInstance instance) {
+    if (!instance.isBank()) return "0";
+    return bankIndexName(instance);
+  }
+
+  /**
+   * Return a default name of a variable to refer to the bank index of a reactor in a bank. This is
+   * has the form uniqueID_i where uniqueID is an identifier for the instance that is guaranteed to
+   * be different from the ID of any other instance in the program.
+   *
+   * @param instance A reactor instance.
+   */
+  public static String bankIndexName(ReactorInstance instance) {
+    return instance.uniqueID() + "_i";
+  }
+
+  /**
+   * Return a default name of a variable to refer to the channel index of a port in a bank. This has
+   * the form uniqueID_c where uniqueID is an identifier for the instance that is guaranteed to be
+   * different from the ID of any other instance in the program. If the port is not a multiport,
+   * then return the string "0".
+   */
+  public static String channelIndex(PortInstance port) {
+    if (!port.isMultiport()) return "0";
+    return channelIndexName(port);
+  }
+
+  /**
+   * Return a default name of a variable to refer to the channel index of a port in a bank. This is
+   * has the form uniqueID_c where uniqueID is an identifier for the instance that is guaranteed to
+   * be different from the ID of any other instance in the program.
+   */
+  public static String channelIndexName(PortInstance port) {
+    return port.uniqueID() + "_c";
+  }
+
+  /**
+   * Return the name of the reactor. A {@code _main} is appended to the name if the reactor is main
+   * (to allow for instantiations that have the same name as the main reactor or the .lf file).
+   */
+  public static String getName(TypeParameterizedReactor reactor) {
+    String name = reactor.reactor().getName().toLowerCase() + reactor.hashCode();
+    if (reactor.reactor().isMain()) {
+      return name + "_main";
+    }
+    return name;
+  }
+
+  /**
+   * Return a reference to the specified port.
+   *
+   * <p>The returned string will have one of the following forms:
+   *
+   * <ul>
+   *   <li>{@code selfStructs[k]->_lf_portName}
+   *   <li>{@code selfStructs[k]->_lf_portName}
+   *   <li>{@code selfStructs[k]->_lf_portName[i]}
+   *   <li>{@code selfStructs[k]->_lf_parent.portName}
+   *   <li>{@code selfStructs[k]->_lf_parent.portName[i]}
+   *   <li>{@code selfStructs[k]->_lf_parent[j].portName}
+   *   <li>{@code selfStructs[k]->_lf_parent[j].portName[i]}
+   * </ul>
+   *
+   * where {@code k} is the runtime index of either the port's parent or the port's parent's parent,
+   * the latter when isNested is {@code true}. The index {@code j} is present if the parent is a
+   * bank, and the index {@code i} is present if the port is a multiport.
+   *
+   * <p>The first two forms are used if isNested is false, and the remaining four are used if
+   * isNested is true. Set {@code isNested} to {@code true} when referencing a port belonging to a
+   * contained reactor.
+   *
+   * @param port The port.
+   * @param isNested True to return a reference relative to the parent's parent.
+   * @param includeChannelIndex True to include the channel index at the end.
+   * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
+   *     default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
+   * @param bankIndex A variable name to use to index the bank or null to use the default, the
+   *     string returned by {@link CUtil#bankIndex(ReactorInstance)}.
+   * @param channelIndex A variable name to use to index the channel or null to use the default, the
+   *     string returned by {@link CUtil#channelIndex(PortInstance)}.
+   */
+  public static String portRef(
+      PortInstance port,
+      boolean isNested,
+      boolean includeChannelIndex,
+      String runtimeIndex,
+      String bankIndex,
+      String channelIndex) {
+    String channel = "";
+    if (channelIndex == null) channelIndex = channelIndex(port);
+    if (port.isMultiport() && includeChannelIndex) {
+      channel = "[" + channelIndex + "]";
+    }
+    if (isNested) {
+      return reactorRefNested(port.getParent(), runtimeIndex, bankIndex)
+          + "."
+          + port.getName()
+          + channel;
+    } else {
+      String sourceStruct = CUtil.reactorRef(port.getParent(), runtimeIndex);
+      return sourceStruct + "->_lf_" + port.getName() + channel;
+    }
+  }
+
+  /**
+   * Return a reference to the port on the self struct of the port's parent. This is used when an
+   * input port triggers a reaction in the port's parent or when an output port is written to by a
+   * reaction in the port's parent. This is equivalent to calling {@code portRef(port, false, true,
+   * null, null)}.
+   *
+   * @param port An instance of the port to be referenced.
+   */
+  public static String portRef(PortInstance port) {
+    return portRef(port, false, true, null, null, null);
+  }
+
+  /**
+   * Return a reference to the port on the self struct of the port's parent using the specified
+   * index variables. This is used when an input port triggers a reaction in the port's parent or
+   * when an output port is written to by a reaction in the port's parent. This is equivalent to
+   * calling {@code portRef(port, false, true, bankIndex, channelIndex)}.
+   *
+   * @param port An instance of the port to be referenced.
+   * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
+   *     default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
+   * @param bankIndex A variable name to use to index the bank or null to use the default, the
+   *     string returned by {@link CUtil#bankIndex(ReactorInstance)}.
+   * @param channelIndex A variable name to use to index the channel or null to use the default, the
+   *     string returned by {@link CUtil#channelIndex(PortInstance)}.
+   */
+  public static String portRef(
+      PortInstance port, String runtimeIndex, String bankIndex, String channelIndex) {
+    return portRef(port, false, true, runtimeIndex, bankIndex, channelIndex);
+  }
+
+  /**
+   * Return a reference to a port without any channel indexing. This is useful for deriving a
+   * reference to the _width variable.
+   *
+   * @param port An instance of the port to be referenced.
+   */
+  public static String portRefName(PortInstance port) {
+    return portRef(port, false, false, null, null, null);
+  }
+
+  /**
+   * Return the portRef without the channel indexing. This is useful for deriving a reference to the
+   * _width variable.
+   *
+   * @param port An instance of the port to be referenced.
+   * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
+   *     default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
+   * @param bankIndex A variable name to use to index the bank or null to use the default, the
+   *     string returned by {@link CUtil#bankIndex(ReactorInstance)}.
+   * @param channelIndex A variable name to use to index the channel or null to use the default, the
+   *     string returned by {@link CUtil#channelIndex(PortInstance)}.
+   */
+  public static String portRefName(
+      PortInstance port, String runtimeIndex, String bankIndex, String channelIndex) {
+    return portRef(port, false, false, runtimeIndex, bankIndex, channelIndex);
+  }
+
+  /**
+   * Return a port reference to a port on the self struct of the parent of the port's parent. This
+   * is used when an input port is written to by a reaction in the parent of the port's parent, or
+   * when an output port triggers a reaction in the parent of the port's parent. This is equivalent
+   * to calling {@code portRef(port, true, true, null, null, null)}.
+   *
+   * @param port The port.
+   */
+  public static String portRefNested(PortInstance port) {
+    return portRef(port, true, true, null, null, null);
+  }
+
+  /**
+   * Return a reference to the port on the self struct of the parent of the port's parent. This is
+   * used when an input port is written to by a reaction in the parent of the port's parent, or when
+   * an output port triggers a reaction in the parent of the port's parent. This is equivalent to
+   * calling {@code portRef(port, true, true, runtimeIndex, bankIndex, channelIndex)}.
+   *
+   * @param port The port.
+   * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
+   *     default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
+   * @param bankIndex A variable name to use to index the bank or null to use the default, the
+   *     string returned by {@link CUtil#bankIndex(ReactorInstance)}.
+   * @param channelIndex A variable name to use to index the channel or null to use the default, the
+   *     string returned by {@link CUtil#channelIndex(PortInstance)}.
+   */
+  public static String portRefNested(
+      PortInstance port, String runtimeIndex, String bankIndex, String channelIndex) {
+    return portRef(port, true, true, runtimeIndex, bankIndex, channelIndex);
+  }
+
+  /**
+   * Return a reference to the port on the self struct of the parent of the port's parent, but
+   * without the channel indexing, even if it is a multiport. This is used when an input port is
+   * written to by a reaction in the parent of the port's parent, or when an output port triggers a
+   * reaction in the parent of the port's parent. This is equivalent to calling {@code portRef(port,
+   * true, false, null, null, null)}.
+   *
+   * @param port The port.
+   */
+  public static String portRefNestedName(PortInstance port) {
+    return portRef(port, true, false, null, null, null);
+  }
+
+  /**
+   * Return a reference to the port on the self struct of the parent of the port's parent, but
+   * without the channel indexing, even if it is a multiport. This is used when an input port is
+   * written to by a reaction in the parent of the port's parent, or when an output port triggers a
+   * reaction in the parent of the port's parent. This is equivalent to calling {@code
+   * portRefNested(port, true, false, runtimeIndex, bankIndex, channelIndex)}.
+   *
+   * @param port The port.
+   * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
+   *     default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
+   * @param bankIndex A variable name to use to index the bank or null to use the default, the
+   *     string returned by {@link CUtil#bankIndex(ReactorInstance)}.
+   * @param channelIndex A variable name to use to index the channel or null to use the default, the
+   *     string returned by {@link CUtil#channelIndex(PortInstance)}.
+   */
+  public static String portRefNestedName(
+      PortInstance port, String runtimeIndex, String bankIndex, String channelIndex) {
+    return portRef(port, true, false, runtimeIndex, bankIndex, channelIndex);
+  }
+
+  /**
+   * Return code for referencing a port within a reaction body possibly indexed by a bank index
+   * and/or a multiport index. If the provided reference is not a port, then this returns the string
+   * "ERROR: not a port."
+   *
+   * @param reference The reference to the port.
+   * @param bankIndex A bank index or null or negative if not in a bank.
+   * @param multiportIndex A multiport index or null or negative if not in a multiport.
+   */
+  public static String portRefInReaction(
+      VarRef reference, Integer bankIndex, Integer multiportIndex) {
+    if (!(reference.getVariable() instanceof Port)) {
+      return "ERROR: not a port."; // FIXME: This is not the fail-fast approach, and it seems
+      // arbitrary.
+    }
+    var prefix = "";
+    if (reference.getContainer() != null) {
+      var bank = "";
+      if (reference.getContainer().getWidthSpec() != null && bankIndex != null && bankIndex >= 0) {
+        bank = "[" + bankIndex + "]";
+      }
+      prefix = reference.getContainer().getName() + bank + ".";
+    }
+    var multiport = "";
+    if (((Port) reference.getVariable()).getWidthSpec() != null
+        && multiportIndex != null
+        && multiportIndex >= 0) {
+      multiport = "[" + multiportIndex + "]";
+    }
+    return prefix + reference.getVariable().getName() + multiport;
+  }
+
+  /**
+   * Return a reference to the reaction entry on the self struct of the parent of the specified
+   * reaction.
+   *
+   * @param reaction The reaction.
+   */
+  public static String reactionRef(ReactionInstance reaction) {
+    return reactionRef(reaction, null);
+  }
+
+  /**
+   * Return a reference to the reaction entry on the self struct of the parent of the specified
+   * reaction.
+   *
+   * @param reaction The reaction.
+   * @param runtimeIndex An index into the array of self structs for the parent.
+   */
+  public static String reactionRef(ReactionInstance reaction, String runtimeIndex) {
+    return reactorRef(reaction.getParent(), runtimeIndex) + "->_lf__reaction_" + reaction.index;
+  }
+
+  /**
+   * Return a reference to the "self" struct of the specified reactor instance. The returned string
+   * has the form self[j], where self is the name of the array of self structs for this reactor
+   * instance and j is the expression returned by {@link #runtimeIndex(ReactorInstance)} or 0 if
+   * there are no banks.
+   *
+   * @param instance The reactor instance.
+   */
+  public static String reactorRef(ReactorInstance instance) {
+    return reactorRef(instance, null);
+  }
+
+  /**
+   * Return the name of the array of "self" structs of the specified reactor instance. This is
+   * similar to {@link #reactorRef(ReactorInstance)} except that it does not index into the array.
+   *
+   * @param instance The reactor instance.
+   */
+  public static String reactorRefName(ReactorInstance instance) {
+    return instance.uniqueID() + "_self";
+  }
+
+  /**
+   * Return a reference to the "self" struct of the specified reactor instance. The returned string
+   * has the form self[runtimeIndex], where self is the name of the array of self structs for this
+   * reactor instance. If runtimeIndex is null, then it is replaced by the expression returned by
+   * {@link #runtimeIndex(ReactorInstance)} or 0 if there are no banks.
+   *
+   * @param instance The reactor instance.
+   * @param runtimeIndex An optional expression to use to address bank members. If this is null, the
+   *     expression used will be that returned by {@link #runtimeIndex(ReactorInstance)}.
+   */
+  public static String reactorRef(ReactorInstance instance, String runtimeIndex) {
+    if (runtimeIndex == null) runtimeIndex = runtimeIndex(instance);
+    return reactorRefName(instance) + "[" + runtimeIndex + "]";
+  }
+
+  /**
+   * For situations where a reaction reacts to or reads from an output of a contained reactor or
+   * sends to an input of a contained reactor, then the container's self struct will have a field
+   * (or an array of fields if the contained reactor is a bank) that is a struct with fields
+   * corresponding to those inputs and outputs. This method returns a reference to that struct or
+   * array of structs. Note that the returned reference is not to the self struct of the contained
+   * reactor. Use {@link #reactorRef(ReactorInstance)} for that.
+   *
+   * @param reactor The contained reactor.
+   */
+  public static String reactorRefNested(ReactorInstance reactor) {
+    return reactorRefNested(reactor, null, null);
+  }
+
+  /**
+   * For situations where a reaction reacts to or reads from an output of a contained reactor or
+   * sends to an input of a contained reactor, then the container's self struct will have a field
+   * (or an array of fields if the contained reactor is a bank) that is a struct with fields
+   * corresponding to those inputs and outputs. This method returns a reference to that struct or
+   * array of structs. Note that the returned reference is not to the self struct of the contained
+   * reactor. Use {@link CUtil#reactorRef(ReactorInstance)} for that.
+   *
+   * @param reactor The contained reactor.
+   * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
+   *     default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
+   * @param bankIndex A variable name to use to index the bank or null to use the default, the
+   *     string returned by {@link CUtil#bankIndex(ReactorInstance)}.
+   */
+  public static String reactorRefNested(
+      ReactorInstance reactor, String runtimeIndex, String bankIndex) {
+    String result = reactorRef(reactor.getParent(), runtimeIndex) + "->_lf_" + reactor.getName();
+    if (reactor.isBank()) {
+      // Need the bank index not the runtimeIndex.
+      if (bankIndex == null) bankIndex = bankIndex(reactor);
+      result += "[" + bankIndex + "]";
+    }
+    return result;
+  }
+
+  /**
+   * Return an expression that, when evaluated, gives the index of a runtime instance of the
+   * specified ReactorInstance. If the reactor is not within any banks, then this will return "0".
+   * Otherwise, it will return an expression that evaluates a mixed-radix number d0%w0, d1%w1, ... ,
+   * dn%wn, where n is the depth minus one of the reactor. The radixes, w0 to wn, are the widths of
+   * this reactor, its parent reactor, on up to the top-level reactor. Since the top-level reactor
+   * is never a bank, dn = 0 and wn = 1. The digits, di, are either 0 (of the parent is not a bank)
+   * or the variable name returned by {@link #bankIndexName(ReactorInstance)} if the parent is a
+   * bank. The returned expression, when evaluated, will yield the following value:
+   *
+   * <pre>
+   *     d0 + w0 * (d1 + w1 * ( ... (dn-1 + wn-1 * dn) ... )
+   * </pre>
+   *
+   * @param reactor The reactor.
+   */
+  public static String runtimeIndex(ReactorInstance reactor) {
+    StringBuilder result = new StringBuilder();
+    int width = 0;
+    int parens = 0;
+    while (reactor != null) {
+      if (reactor.isBank() && reactor.getWidth() > 1) {
+        if (width > 0) {
+          result.append(" + " + width + " * (");
+          parens++;
         }
-        return "_" + CUtil.getName(reactor) + "_self_t";
-    }
-
-    /** Construct a unique type for the "self" struct of the class of the given reactor. */
-    public static String selfType(ReactorInstance instance) {
-        return selfType(instance.tpr);
-    }
-
-    /**
-     * Return a reference to the trigger_t struct of the specified
-     * trigger instance (input port or action). This trigger_t struct
-     * is on the self struct.
-     * @param instance The port or action instance.
-     */
-    public static String triggerRef(TriggerInstance<? extends Variable> instance) {
-        return triggerRef(instance, null);
-    }
-
-    /**
-     * Return a reference to the trigger_t struct of the specified
-     * trigger instance (input port or action). This trigger_t struct
-     * is on the self struct.
-     * @param instance The port or action instance.
-     * @param runtimeIndex An optional index variable name to use to address runtime instances.
-     */
-    public static String triggerRef(TriggerInstance<? extends Variable> instance, String runtimeIndex) {
-        return reactorRef(instance.getParent(), runtimeIndex)
-                + "->_lf__"
-                + instance.getName();
-    }
-
-    /**
-     * Return a reference to the trigger_t struct for the specified
-     * port of a contained reactor.
-     * @param port The output port of a contained reactor.
-     */
-    public static String triggerRefNested(PortInstance port) {
-        return triggerRefNested(port, null, null);
-    }
-
-    /**
-     * Return a reference to the trigger_t struct for the specified
-     * port of a contained reactor.
-     * @param port The output port of a contained reactor.
-     * @param runtimeIndex An optional index variable name to use to index
-     *  the runtime instance of the port's parent's parent, or null to get the
-     *  default returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
-     * @param bankIndex An optional index variable name to use to index
-     *  the the bank of the port's parent, or null to get the default returned by
-     *  {@link CUtil#bankIndex(ReactorInstance)}.
-     */
-    public static String triggerRefNested(PortInstance port, String runtimeIndex, String bankIndex) {
-        return reactorRefNested(port.getParent(), runtimeIndex, bankIndex) + "." + port.getName() + "_trigger";
-    }
-
-
-    //////////////////////////////////////////////////////
-    //// FIXME: Not clear what the strategy is with the following inner interface.
-    // The {@code ReportCommandErrors} interface allows the
-    // method runBuildCommand to call a protected
-    // method from the CGenerator if that method is passed
-    // using a method reference. The method that is passed
-    // is then interpreted as a ReportCommandErrors instance.
-    // This is a convenient way to factor out part of the
-    // internals of the CGenerator while maintaining
-    // encapsulation, even though the internals of the CGenerator
-    // might seem to be tightly coupled. FIXME: Delete this comment
-
-    /**
-     * A {@code ReportCommandErrors} is a way to analyze command
-     * output and report any errors that it describes.
-     * FIXME: If the VSCode branch passes code review
-     *  without significant revision, this mechanism will probably be replaced.
-     */
-    public interface ReportCommandErrors {
-        void report(String errors);
-    }
-
-    /**
-     * Run the custom build command specified with the "build" parameter.
-     * This command is executed in the same directory as the source file.
-     * <p>
-     * The following environment variables will be available to the command:
-     * <ul>
-     * <li> {@code: LF_CURRENT_WORKING_DIRECTORY}: The directory in which the command is invoked.
-     * <li> {@code:LF_SOURCE_DIRECTORY}: The directory containing the .lf file being compiled.
-     * <li> {@code:LF_PACKAGE_DIRECTORY}: The directory that is the root of the package.
-     * <li> {@code:LF_SOURCE_GEN_DIRECTORY}: The directory in which generated files are placed.
-     * <li> {@code:LF_BIN_DIRECTORY}: The directory into which to put binaries.
-     * </ul>
-     */
-    public static void runBuildCommand(
-        FileConfig fileConfig,
-        TargetConfig targetConfig,
-        GeneratorCommandFactory commandFactory,
-        ErrorReporter errorReporter,
-        ReportCommandErrors reportCommandErrors,
-        LFGeneratorContext.Mode mode
-    ) {
-        List<LFCommand> commands = getCommands(targetConfig.buildCommands, commandFactory, fileConfig.srcPath);
-        // If the build command could not be found, abort.
-        // An error has already been reported in createCommand.
-        if (commands.stream().anyMatch(Objects::isNull)) return;
-
-        for (LFCommand cmd : commands) {
-            int returnCode = cmd.run();
-            if (returnCode != 0 && mode != LFGeneratorContext.Mode.EPOCH) {
-                errorReporter.reportError(String.format(
-                    // FIXME: Why is the content of stderr not provided to the user in this error message?
-                    "Build command \"%s\" failed with error code %d.",
-                    targetConfig.buildCommands, returnCode
-                ));
-                return;
-            }
-            // For warnings (vs. errors), the return code is 0.
-            // But we still want to mark the IDE.
-            if (!cmd.getErrors().toString().isEmpty() && mode == LFGeneratorContext.Mode.EPOCH) {
-                reportCommandErrors.report(cmd.getErrors().toString());
-                return; // FIXME: Why do we return here? Even if there are warnings, the build process should proceed.
-            }
-        }
-    }
-
-
-    /**
-     * Remove files in the bin directory that may have been created.
-     * Call this if a compilation occurs so that files from a previous
-     * version do not accidentally get executed.
-     * @param fileConfig
-     */
-    public static void deleteBinFiles(FileConfig fileConfig) {
-        String name = FileUtil.nameWithoutExtension(fileConfig.srcFile);
-        String[] files = fileConfig.binPath.toFile().list();
-        List<String> federateNames = new LinkedList<>(); // FIXME: put this in ASTUtils?
-        fileConfig.resource.getAllContents().forEachRemaining(node -> {
-            if (node instanceof Reactor r) {
+        result.append(bankIndexName(reactor));
+        width = reactor.getWidth();
+      }
+      reactor = reactor.getParent();
+    }
+    while (parens-- > 0) {
+      result.append(")");
+    }
+    if (result.length() == 0) return "0";
+    return result.toString();
+  }
+
+  /**
+   * Return a unique type for the "self" struct of the specified reactor class from the reactor
+   * class.
+   *
+   * @param reactor The reactor class.
+   * @return The type of a self struct for the specified reactor class.
+   */
+  public static String selfType(TypeParameterizedReactor reactor) {
+    if (reactor.reactor().isMain()) {
+      return "_" + CUtil.getName(reactor) + "_main_self_t";
+    }
+    return "_" + CUtil.getName(reactor) + "_self_t";
+  }
+
+  /** Construct a unique type for the "self" struct of the class of the given reactor. */
+  public static String selfType(ReactorInstance instance) {
+    return selfType(instance.tpr);
+  }
+
+  /**
+   * Return a reference to the trigger_t struct of the specified trigger instance (input port or
+   * action). This trigger_t struct is on the self struct.
+   *
+   * @param instance The port or action instance.
+   */
+  public static String triggerRef(TriggerInstance<? extends Variable> instance) {
+    return triggerRef(instance, null);
+  }
+
+  /**
+   * Return a reference to the trigger_t struct of the specified trigger instance (input port or
+   * action). This trigger_t struct is on the self struct.
+   *
+   * @param instance The port or action instance.
+   * @param runtimeIndex An optional index variable name to use to address runtime instances.
+   */
+  public static String triggerRef(
+      TriggerInstance<? extends Variable> instance, String runtimeIndex) {
+    return reactorRef(instance.getParent(), runtimeIndex) + "->_lf__" + instance.getName();
+  }
+
+  /**
+   * Return a reference to the trigger_t struct for the specified port of a contained reactor.
+   *
+   * @param port The output port of a contained reactor.
+   */
+  public static String triggerRefNested(PortInstance port) {
+    return triggerRefNested(port, null, null);
+  }
+
+  /**
+   * Return a reference to the trigger_t struct for the specified port of a contained reactor.
+   *
+   * @param port The output port of a contained reactor.
+   * @param runtimeIndex An optional index variable name to use to index the runtime instance of the
+   *     port's parent's parent, or null to get the default returned by {@link
+   *     CUtil#runtimeIndex(ReactorInstance)}.
+   * @param bankIndex An optional index variable name to use to index the the bank of the port's
+   *     parent, or null to get the default returned by {@link CUtil#bankIndex(ReactorInstance)}.
+   */
+  public static String triggerRefNested(PortInstance port, String runtimeIndex, String bankIndex) {
+    return reactorRefNested(port.getParent(), runtimeIndex, bankIndex)
+        + "."
+        + port.getName()
+        + "_trigger";
+  }
+
+  //////////////////////////////////////////////////////
+  //// FIXME: Not clear what the strategy is with the following inner interface.
+  // The {@code ReportCommandErrors} interface allows the
+  // method runBuildCommand to call a protected
+  // method from the CGenerator if that method is passed
+  // using a method reference. The method that is passed
+  // is then interpreted as a ReportCommandErrors instance.
+  // This is a convenient way to factor out part of the
+  // internals of the CGenerator while maintaining
+  // encapsulation, even though the internals of the CGenerator
+  // might seem to be tightly coupled. FIXME: Delete this comment
+
+  /**
+   * A {@code ReportCommandErrors} is a way to analyze command output and report any errors that it
+   * describes. FIXME: If the VSCode branch passes code review without significant revision, this
+   * mechanism will probably be replaced.
+   */
+  public interface ReportCommandErrors {
+    void report(String errors);
+  }
+
+  /**
+   * Run the custom build command specified with the "build" parameter. This command is executed in
+   * the same directory as the source file.
+   *
+   * <p>The following environment variables will be available to the command:
+   *
+   * <ul>
+   *   <li>{@code: LF_CURRENT_WORKING_DIRECTORY}: The directory in which the command is invoked.
+   *   <li>{@code:LF_SOURCE_DIRECTORY}: The directory containing the .lf file being compiled.
+   *   <li>{@code:LF_PACKAGE_DIRECTORY}: The directory that is the root of the package.
+   *   <li>{@code:LF_SOURCE_GEN_DIRECTORY}: The directory in which generated files are placed.
+   *   <li>{@code:LF_BIN_DIRECTORY}: The directory into which to put binaries.
+   * </ul>
+   */
+  public static void runBuildCommand(
+      FileConfig fileConfig,
+      TargetConfig targetConfig,
+      GeneratorCommandFactory commandFactory,
+      ErrorReporter errorReporter,
+      ReportCommandErrors reportCommandErrors,
+      LFGeneratorContext.Mode mode) {
+    List<LFCommand> commands =
+        getCommands(targetConfig.buildCommands, commandFactory, fileConfig.srcPath);
+    // If the build command could not be found, abort.
+    // An error has already been reported in createCommand.
+    if (commands.stream().anyMatch(Objects::isNull)) return;
+
+    for (LFCommand cmd : commands) {
+      int returnCode = cmd.run();
+      if (returnCode != 0 && mode != LFGeneratorContext.Mode.EPOCH) {
+        errorReporter.reportError(
+            String.format(
+                // FIXME: Why is the content of stderr not provided to the user in this error
+                // message?
+                "Build command \"%s\" failed with error code %d.",
+                targetConfig.buildCommands, returnCode));
+        return;
+      }
+      // For warnings (vs. errors), the return code is 0.
+      // But we still want to mark the IDE.
+      if (!cmd.getErrors().toString().isEmpty() && mode == LFGeneratorContext.Mode.EPOCH) {
+        reportCommandErrors.report(cmd.getErrors().toString());
+        return; // FIXME: Why do we return here? Even if there are warnings, the build process
+        // should proceed.
+      }
+    }
+  }
+
+  /**
+   * Remove files in the bin directory that may have been created. Call this if a compilation occurs
+   * so that files from a previous version do not accidentally get executed.
+   *
+   * @param fileConfig
+   */
+  public static void deleteBinFiles(FileConfig fileConfig) {
+    String name = FileUtil.nameWithoutExtension(fileConfig.srcFile);
+    String[] files = fileConfig.binPath.toFile().list();
+    List<String> federateNames = new LinkedList<>(); // FIXME: put this in ASTUtils?
+    fileConfig
+        .resource
+        .getAllContents()
+        .forEachRemaining(
+            node -> {
+              if (node instanceof Reactor r) {
                 if (r.isFederated()) {
-                    r.getInstantiations().forEach(inst -> federateNames
-                        .add(inst.getName()));
-                }
-            }
-        });
-        for (String f : files) {
-            // Delete executable file or launcher script, if any.
-            // Delete distribution file, if any.
-            // Delete RTI file, if any.
-            if (f.equals(name) || f.equals(name + RTI_BIN_SUFFIX)
-                || f.equals(name + RTI_DISTRIBUTION_SCRIPT_SUFFIX)) {
-                //noinspection ResultOfMethodCallIgnored
-                fileConfig.binPath.resolve(f).toFile().delete();
-            }
-            // Delete federate executable files, if any.
-            for (String federateName : federateNames) {
-                if (f.equals(name + "_" + federateName)) {
-                    //noinspection ResultOfMethodCallIgnored
-                    fileConfig.binPath.resolve(f).toFile().delete();
-                }
-            }
-        }
-    }
-
-    //////////////////////////////////////////////////////
-    //// Private functions.
-
-    /**
-     * If the argument is a multiport, then return a string that
-     * gives the width as an expression, and otherwise, return null.
-     * The string will be empty if the width is variable (specified
-     * as '[]'). Otherwise, if is a single term or a sum of terms
-     * (separated by '+'), where each term is either an integer
-     * or a parameter reference in the target language.
-     */
-    public static String multiportWidthExpression(Variable variable) {
-        List<String> spec = multiportWidthTerms(variable);
-        return spec == null ? null : String.join(" + ", spec);
-    }
-
-    //////////////////////////////////////////////////////
-    //// Private methods.
-
-    /**
-     * Convert the given commands from strings to their LFCommand
-     * representation and return a list of LFCommand.
-     * @param commands A list of commands as strings.
-     * @param factory A command factory.
-     * @param dir The directory in which the commands should be executed.
-     * @return The LFCommand representations of the given commands,
-     *  where {@code null} is a placeholder for commands that cannot be
-     *  executed.
-     */
-    private static List<LFCommand> getCommands(List<String> commands, GeneratorCommandFactory factory, Path dir) {
-        return commands.stream()
-                       .map(cmd -> List.of(cmd.split("\\s+")))
-                       .filter(tokens -> tokens.size() > 0)
-                       .map(tokens -> factory.createCommand(tokens.get(0), tokens.subList(1, tokens.size()), dir))
-                       .collect(Collectors.toList());
-    }
-
-    /**
-     * Return target code for a parameter reference, which in
-     * this case is just the parameter name.
-     *
-     * @param param The parameter to generate code for.
-     * @return Parameter reference in target code.
-     */
-    private static String getTargetReference(Parameter param) {
-        return param.getName();
-    }
-
-    /**
-     * If the argument is a multiport, return a list of strings
-     * describing the width of the port, and otherwise, return null.
-     * If the list is empty, then the width is variable (specified
-     * as '[]'). Otherwise, it is a list of integers and/or parameter
-     * references.
-     * @param variable The port.
-     * @return The width specification for a multiport or null if it is
-     *  not a multiport.
-     */
-    private static List<String> multiportWidthTerms(Variable variable) {
-        List<String> result = null;
-        if (variable instanceof Port) {
-            if (((Port) variable).getWidthSpec() != null) {
-                result = new ArrayList<>();
-                if (!((Port) variable).getWidthSpec().isOfVariableLength()) {
-                    for (WidthTerm term : ((Port) variable).getWidthSpec().getTerms()) {
-                        if (term.getParameter() != null) {
-                            result.add(getTargetReference(term.getParameter()));
-                        } else {
-                            result.add(String.valueOf(term.getWidth()));
-                        }
-                    }
+                  r.getInstantiations().forEach(inst -> federateNames.add(inst.getName()));
                 }
-            }
+              }
+            });
+    for (String f : files) {
+      // Delete executable file or launcher script, if any.
+      // Delete distribution file, if any.
+      // Delete RTI file, if any.
+      if (f.equals(name)
+          || f.equals(name + RTI_BIN_SUFFIX)
+          || f.equals(name + RTI_DISTRIBUTION_SCRIPT_SUFFIX)) {
+        //noinspection ResultOfMethodCallIgnored
+        fileConfig.binPath.resolve(f).toFile().delete();
+      }
+      // Delete federate executable files, if any.
+      for (String federateName : federateNames) {
+        if (f.equals(name + "_" + federateName)) {
+          //noinspection ResultOfMethodCallIgnored
+          fileConfig.binPath.resolve(f).toFile().delete();
         }
-        return result;
-    }
-
-    /**
-     * Given a type for an input or output, return true if it should be
-     * carried by a lf_token_t struct rather than the type itself.
-     * It should be carried by such a struct if the type ends with *
-     * (it is a pointer) or [] (it is a array with unspecified length).
-     * @param type The type specification.
-     */
-    public static boolean isTokenType(InferredType type, CTypes types) {
-        if (type.isUndefined()) return false;
-        // This is a hacky way to do this. It is now considered to be a bug (#657)
-        return type.isVariableSizeList || type.astType != null && (!type.astType.getStars().isEmpty() ||
-            type.astType.getCode() != null && type.astType.getCode().getBody().stripTrailing().endsWith("*"));
-    }
-
-    public static String generateWidthVariable(String var) {
-        return var + "_width";
-    }
-
-    /** If the type specification of the form {@code type[]},
-     *  {@code type*}, or {@code type}, return the type.
-     *  @param type A string describing the type.
-     */
-    public static String rootType(String type) {
-        if (type.endsWith("]")) {
-            return type.substring(0, type.indexOf("[")).trim();
-        } else if (type.endsWith("*")) {
-            return type.substring(0, type.length() - 1).trim();
-        } else {
-            return type.trim();
-        }
-    }
-
-    /**
-     * Return the full name of the specified instance without
-     * the leading name of the top-level reactor, unless this
-     * is the top-level reactor, in which case return its name.
-     * @param instance The instance.
-     * @return A shortened instance name.
-     */
-    public static String getShortenedName(ReactorInstance instance) {
-        var description = instance.getFullName();
-        // If not at the top level, strip off the name of the top level.
-        var period = description.indexOf(".");
-        if (period > 0) {
-            description = description.substring(period + 1);
-        }
-        return description;
-    }
-
-    // Returns the ReactorInstance of the closest enclave in the containment hierarchy.
-    // FIXME: Does this work, is a ReactorInstance == an instantiation which can be enclaved?
-    public static ReactorInstance getClosestEnclave(ReactorInstance inst) {
-        if (inst.isMainOrFederated() || isEnclave(inst.getDefinition())) {
-            return inst;
-        }
-        return getClosestEnclave(inst.getParent());
-    }
-
-    public static String getEnvironmentId(ReactorInstance inst) {
-        ReactorInstance enclave = getClosestEnclave(inst);
-        return enclave.uniqueID();
-    }
-
-    // Returns a string which represents a C literal which points to the struct of the environment
-    // of the ReactorInstance inst.
-    public static String getEnvironmentStruct(ReactorInstance inst) {
-        return "envs["+getEnvironmentId(inst)+"]";
-    }
-
-    // Given an instance, e.g. the main reactor, return a list of all enclaves in the program
-    public static List<ReactorInstance> getEnclaves(ReactorInstance root) {
-        List<ReactorInstance> enclaves = new ArrayList<>();
-        Queue<ReactorInstance> queue = new LinkedList<>();
-        queue.add(root);
-
-        while (!queue.isEmpty()) {
-            ReactorInstance inst = queue.poll();
-            if (inst.isMainOrFederated() || isEnclave(inst.getDefinition())) {
-                enclaves.add(inst);
-            }
-
-            for (ReactorInstance child : inst.children) {
-                queue.add(child);
+      }
+    }
+  }
+
+  //////////////////////////////////////////////////////
+  //// Private functions.
+
+  /**
+   * If the argument is a multiport, then return a string that gives the width as an expression, and
+   * otherwise, return null. The string will be empty if the width is variable (specified as '[]').
+   * Otherwise, if is a single term or a sum of terms (separated by '+'), where each term is either
+   * an integer or a parameter reference in the target language.
+   */
+  public static String multiportWidthExpression(Variable variable) {
+    List<String> spec = multiportWidthTerms(variable);
+    return spec == null ? null : String.join(" + ", spec);
+  }
+
+  //////////////////////////////////////////////////////
+  //// Private methods.
+
+  /**
+   * Convert the given commands from strings to their LFCommand representation and return a list of
+   * LFCommand.
+   *
+   * @param commands A list of commands as strings.
+   * @param factory A command factory.
+   * @param dir The directory in which the commands should be executed.
+   * @return The LFCommand representations of the given commands, where {@code null} is a
+   *     placeholder for commands that cannot be executed.
+   */
+  private static List<LFCommand> getCommands(
+      List<String> commands, GeneratorCommandFactory factory, Path dir) {
+    return commands.stream()
+        .map(cmd -> List.of(cmd.split("\\s+")))
+        .filter(tokens -> tokens.size() > 0)
+        .map(tokens -> factory.createCommand(tokens.get(0), tokens.subList(1, tokens.size()), dir))
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Return target code for a parameter reference, which in this case is just the parameter name.
+   *
+   * @param param The parameter to generate code for.
+   * @return Parameter reference in target code.
+   */
+  private static String getTargetReference(Parameter param) {
+    return param.getName();
+  }
+
+  /**
+   * If the argument is a multiport, return a list of strings describing the width of the port, and
+   * otherwise, return null. If the list is empty, then the width is variable (specified as '[]').
+   * Otherwise, it is a list of integers and/or parameter references.
+   *
+   * @param variable The port.
+   * @return The width specification for a multiport or null if it is not a multiport.
+   */
+  private static List<String> multiportWidthTerms(Variable variable) {
+    List<String> result = null;
+    if (variable instanceof Port) {
+      if (((Port) variable).getWidthSpec() != null) {
+        result = new ArrayList<>();
+        if (!((Port) variable).getWidthSpec().isOfVariableLength()) {
+          for (WidthTerm term : ((Port) variable).getWidthSpec().getTerms()) {
+            if (term.getParameter() != null) {
+              result.add(getTargetReference(term.getParameter()));
+            } else {
+              result.add(String.valueOf(term.getWidth()));
             }
+          }
         }
-        return enclaves;
-    }
-
-    // FIXME: All the functions below needs to be implemented, somehow
-    public static int numStartupReactionsInEnclave(ReactorInstance enclave) {
-        return 1;
-    }
-    public static int numShutdownReactionsInEnclave(ReactorInstance enclave) {
-        return 1;
-    }
-    public static int numResetReactionsInEnclave(ReactorInstance enclave) {
-        return 1;
-    }
-    public static int numWorkersInEnclave(ReactorInstance enclave) {
-        return 1;
-    }
-    public static int numTimerTriggersInEnclave(ReactorInstance enclave) {
-        return 1;
-    }
-    public static int numIsPresentFieldsInEnclave(ReactorInstance enclave) {
-        return 3;
-    }
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Given a type for an input or output, return true if it should be carried by a lf_token_t struct
+   * rather than the type itself. It should be carried by such a struct if the type ends with * (it
+   * is a pointer) or [] (it is a array with unspecified length).
+   *
+   * @param type The type specification.
+   */
+  public static boolean isTokenType(InferredType type, CTypes types) {
+    if (type.isUndefined()) return false;
+    // This is a hacky way to do this. It is now considered to be a bug (#657)
+    return type.isVariableSizeList
+        || type.astType != null
+            && (!type.astType.getStars().isEmpty()
+                || type.astType.getCode() != null
+                    && type.astType.getCode().getBody().stripTrailing().endsWith("*"));
+  }
+
+  public static String generateWidthVariable(String var) {
+    return var + "_width";
+  }
+
+  /**
+   * If the type specification of the form {@code type[]}, {@code type*}, or {@code type}, return
+   * the type.
+   *
+   * @param type A string describing the type.
+   */
+  public static String rootType(String type) {
+    if (type.endsWith("]")) {
+      return type.substring(0, type.indexOf("[")).trim();
+    } else if (type.endsWith("*")) {
+      return type.substring(0, type.length() - 1).trim();
+    } else {
+      return type.trim();
+    }
+  }
+
+  /**
+   * Return the full name of the specified instance without the leading name of the top-level
+   * reactor, unless this is the top-level reactor, in which case return its name.
+   *
+   * @param instance The instance.
+   * @return A shortened instance name.
+   */
+  public static String getShortenedName(ReactorInstance instance) {
+    var description = instance.getFullName();
+    // If not at the top level, strip off the name of the top level.
+    var period = description.indexOf(".");
+    if (period > 0) {
+      description = description.substring(period + 1);
+    }
+    return description;
+  }
+
+  // Returns the ReactorInstance of the closest enclave in the containment hierarchy.
+  // FIXME: Does this work, is a ReactorInstance == an instantiation which can be enclaved?
+  public static ReactorInstance getClosestEnclave(ReactorInstance inst) {
+    if (inst.isMainOrFederated() || isEnclave(inst.getDefinition())) {
+      return inst;
+    }
+    return getClosestEnclave(inst.getParent());
+  }
+
+  public static String getEnvironmentId(ReactorInstance inst) {
+    ReactorInstance enclave = getClosestEnclave(inst);
+    return enclave.uniqueID();
+  }
+
+  // Returns a string which represents a C literal which points to the struct of the environment
+  // of the ReactorInstance inst.
+  public static String getEnvironmentStruct(ReactorInstance inst) {
+    return "envs[" + getEnvironmentId(inst) + "]";
+  }
+
+  // Given an instance, e.g. the main reactor, return a list of all enclaves in the program
+  public static List<ReactorInstance> getEnclaves(ReactorInstance root) {
+    List<ReactorInstance> enclaves = new ArrayList<>();
+    Queue<ReactorInstance> queue = new LinkedList<>();
+    queue.add(root);
+
+    while (!queue.isEmpty()) {
+      ReactorInstance inst = queue.poll();
+      if (inst.isMainOrFederated() || isEnclave(inst.getDefinition())) {
+        enclaves.add(inst);
+      }
+
+      for (ReactorInstance child : inst.children) {
+        queue.add(child);
+      }
+    }
+    return enclaves;
+  }
+
+  // FIXME: All the functions below needs to be implemented, somehow
+  public static int numStartupReactionsInEnclave(ReactorInstance enclave) {
+    return 1;
+  }
+
+  public static int numShutdownReactionsInEnclave(ReactorInstance enclave) {
+    return 1;
+  }
+
+  public static int numResetReactionsInEnclave(ReactorInstance enclave) {
+    return 1;
+  }
+
+  public static int numWorkersInEnclave(ReactorInstance enclave) {
+    return 1;
+  }
+
+  public static int numTimerTriggersInEnclave(ReactorInstance enclave) {
+    return 1;
+  }
+
+  public static int numIsPresentFieldsInEnclave(ReactorInstance enclave) {
+    return 3;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CWatchdogGenerator.java b/org.lflang/src/org/lflang/generator/c/CWatchdogGenerator.java
index d403c1cddc..f864ca2661 100644
--- a/org.lflang/src/org/lflang/generator/c/CWatchdogGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CWatchdogGenerator.java
@@ -2,15 +2,15 @@
  * @file
  * @author Benjamin Asch
  * @author Edward A. Lee
- * @copyright (c) 2023, The University of California at Berkeley.
- * License: <a href="https://github.com/lf-lang/lingua-franca/blob/master/LICENSE">BSD 2-clause</a>
+ * @copyright (c) 2023, The University of California at Berkeley. License: <a
+ *     href="https://github.com/lf-lang/lingua-franca/blob/master/LICENSE">BSD 2-clause</a>
  * @brief Code generation methods for watchdogs in C.
  */
 package org.lflang.generator.c;
 
 import java.util.List;
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Mode;
@@ -21,11 +21,9 @@
 import org.lflang.lf.Watchdog;
 
 /**
- * @brief Generate C code for watchdogs.
- * This class contains a collection of static methods supporting code generation in C
- * for watchdogs. These methods are protected because they are intended to be used
- * only within the same package.
- *
+ * @brief Generate C code for watchdogs. This class contains a collection of static methods
+ *     supporting code generation in C for watchdogs. These methods are protected because they are
+ *     intended to be used only within the same package.
  * @author Benjamin Asch
  * @author Edward A. Lee
  */
@@ -33,6 +31,7 @@ public class CWatchdogGenerator {
 
   /**
    * Return true if the given reactor has one or more watchdogs.
+   *
    * @param reactor The reactor.
    * @return True if the given reactor has watchdogs.
    */
@@ -46,9 +45,10 @@ public static boolean hasWatchdogs(Reactor reactor) {
   // Protected methods
 
   /**
-   * For the specified reactor instance, generate initialization code for each watchdog
-   * in the reactor. This code initializes the watchdog-related fields on the self struct
-   * of the reactor instance.
+   * For the specified reactor instance, generate initialization code for each watchdog in the
+   * reactor. This code initializes the watchdog-related fields on the self struct of the reactor
+   * instance.
+   *
    * @param code The place to put the code
    * @param instance The reactor instance
    * @return The count of watchdogs found in the reactor
@@ -58,19 +58,24 @@ protected static int generateInitializeWatchdogs(CodeBuilder code, ReactorInstan
     var temp = new CodeBuilder();
     var reactorRef = CUtil.reactorRef(instance);
     int watchdogCount = 0;
-    for (Watchdog watchdog
-        : ASTUtils.allWatchdogs(ASTUtils.toDefinition(instance.getDefinition().getReactorClass()))) {
+    for (Watchdog watchdog :
+        ASTUtils.allWatchdogs(ASTUtils.toDefinition(instance.getDefinition().getReactorClass()))) {
       var watchdogField = reactorRef + "->_lf_watchdog_" + watchdog.getName();
-      temp.pr(String.join("\n",
-          "_lf_watchdogs[watchdog_number++] = &" + watchdogField + ";",
-          watchdogField + ".min_expiration = "
-              + CTypes.getInstance().getTargetTimeExpr(instance.getTimeValue(watchdog.getTimeout()))
-              + ";",
-          watchdogField + ".thread_active = false;",
-          "if (" + watchdogField + ".base->reactor_mutex == NULL) {",
-          "   " + watchdogField + ".base->reactor_mutex = (lf_mutex_t*)calloc(1, sizeof(lf_mutex_t));",
-          "}"
-      ));
+      temp.pr(
+          String.join(
+              "\n",
+              "_lf_watchdogs[watchdog_number++] = &" + watchdogField + ";",
+              watchdogField
+                  + ".min_expiration = "
+                  + CTypes.getInstance()
+                      .getTargetTimeExpr(instance.getTimeValue(watchdog.getTimeout()))
+                  + ";",
+              watchdogField + ".thread_active = false;",
+              "if (" + watchdogField + ".base->reactor_mutex == NULL) {",
+              "   "
+                  + watchdogField
+                  + ".base->reactor_mutex = (lf_mutex_t*)calloc(1, sizeof(lf_mutex_t));",
+              "}"));
       watchdogCount += 1;
       foundOne = true;
     }
@@ -92,8 +97,10 @@ protected static int generateInitializeWatchdogs(CodeBuilder code, ReactorInstan
    * @param tpr The reactor declaration
    */
   protected static void generateWatchdogs(
-      CodeBuilder src, CodeBuilder header, TypeParameterizedReactor tpr, ErrorReporter errorReporter
-  ) {
+      CodeBuilder src,
+      CodeBuilder header,
+      TypeParameterizedReactor tpr,
+      ErrorReporter errorReporter) {
     if (hasWatchdogs(tpr.reactor())) {
       header.pr("#include \"core/threaded/watchdog.h\"");
       for (Watchdog watchdog : ASTUtils.allWatchdogs(tpr.reactor())) {
@@ -104,6 +111,7 @@ protected static void generateWatchdogs(
 
   /**
    * Generate watchdog definitions in the reactor's self struct.
+   *
    * @param body The place to put the definitions
    * @param tpr The concrete reactor class
    * @param constructorCode The place to put initialization code.
@@ -135,34 +143,31 @@ protected static void generateWatchdogStruct(
                   + watchdogName
                   + ".trigger = &(self->_lf__"
                   + watchdogName
-                  + ");"
-          )
-      );
+                  + ");"));
     }
   }
 
   /**
    * Generate a global table of watchdog structs.
+   *
    * @param count The number of watchdogs found.
    * @return The code that defines the table or a comment if count is 0.
    */
   protected static String generateWatchdogTable(int count) {
     if (count == 0) {
-      return String.join("\n",
+      return String.join(
+          "\n",
           "// No watchdogs found.",
           "typedef void watchdog_t;",
           "watchdog_t* _lf_watchdogs = NULL;",
-          "int _lf_watchdog_count = 0;"
-      );
+          "int _lf_watchdog_count = 0;");
     }
     return String.join(
         "\n",
         List.of(
             "// Array of pointers to watchdog structs.",
             "watchdog_t* _lf_watchdogs[" + count + "];",
-            "int _lf_watchdog_count = " + count + ";"
-        )
-    );
+            "int _lf_watchdog_count = " + count + ";"));
   }
 
   /////////////////////////////////////////////////////////////////
@@ -175,10 +180,7 @@ protected static String generateWatchdogTable(int count) {
    * @param tpr The concrete reactor class that has the watchdog
    */
   private static String generateInitializationForWatchdog(
-      Watchdog watchdog,
-      TypeParameterizedReactor tpr,
-      ErrorReporter errorReporter
-  ) {
+      Watchdog watchdog, TypeParameterizedReactor tpr, ErrorReporter errorReporter) {
 
     // Construct the reactionInitialization code to go into
     // the body of the function before the verbatim code.
@@ -219,14 +221,15 @@ private static String generateInitializationForWatchdog(
                     + name
                     + "_change_type = "
                     + (effect.getTransition() == ModeTransition.HISTORY
-                    ? "history_transition"
-                    : "reset_transition")
+                        ? "history_transition"
+                        : "reset_transition")
                     + ";");
           } else {
-               errorReporter.reportError(
-                   watchdog,
-                   "In generateInitializationForWatchdog(): " + name + " not a valid mode of this reactor."
-               );
+            errorReporter.reportError(
+                watchdog,
+                "In generateInitializationForWatchdog(): "
+                    + name
+                    + " not a valid mode of this reactor.");
           }
         }
       }
@@ -264,11 +267,9 @@ private static String generateFunction(String header, String init, Watchdog watc
     return function.toString();
   }
 
-
   /** Generate the watchdog handler function. */
   private static String generateWatchdogFunction(
-      Watchdog watchdog, TypeParameterizedReactor tpr, ErrorReporter errorReporter
-  ) {
+      Watchdog watchdog, TypeParameterizedReactor tpr, ErrorReporter errorReporter) {
     return generateFunction(
         generateWatchdogFunctionHeader(watchdog, tpr),
         generateInitializationForWatchdog(watchdog, tpr, errorReporter),
@@ -282,7 +283,8 @@ private static String generateWatchdogFunction(
    * @param tpr The concrete reactor class
    * @return The function name for the watchdog function.
    */
-  private static String generateWatchdogFunctionHeader(Watchdog watchdog, TypeParameterizedReactor tpr) {
+  private static String generateWatchdogFunctionHeader(
+      Watchdog watchdog, TypeParameterizedReactor tpr) {
     String functionName = watchdogFunctionName(watchdog, tpr);
     return CReactionGenerator.generateFunctionHeader(functionName);
   }
diff --git a/org.lflang/src/org/lflang/generator/c/InteractingContainedReactors.java b/org.lflang/src/org/lflang/generator/c/InteractingContainedReactors.java
index 20ed65687b..16f5ceb565 100644
--- a/org.lflang/src/org/lflang/generator/c/InteractingContainedReactors.java
+++ b/org.lflang/src/org/lflang/generator/c/InteractingContainedReactors.java
@@ -5,7 +5,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Input;
 import org.lflang.lf.Instantiation;
@@ -23,131 +22,125 @@
  * @author Soroush Bateni
  * @author Hou Seng Wong
  */
-
 public class InteractingContainedReactors {
-    /**
-     * Data structure that for each instantiation of a contained
-     * reactor. This provides a set of input and output ports that trigger
-     * reactions of the container, are read by a reaction of the
-     * container, or that receive data from a reaction of the container.
-     * For each port, this provides a list of reaction indices that
-     * are triggered by the port, or an empty list if there are no
-     * reactions triggered by the port.
-     */
-    // This horrible data structure is a collection, indexed by instantiation
-    // of a contained reactor, of lists, indexed by ports of the contained reactor
-    // that are referenced by reactions of the container, of reactions that are
-    // triggered by the port of the contained reactor. The list is empty if
-    // the port does not trigger reactions but is read by the reaction or
-    // is written to by the reaction.
-    LinkedHashMap<
-        Instantiation, LinkedHashMap<
-            Port, LinkedList<Integer>
-        >
-    > portsByContainedReactor = new LinkedHashMap<>();
+  /**
+   * Data structure that for each instantiation of a contained reactor. This provides a set of input
+   * and output ports that trigger reactions of the container, are read by a reaction of the
+   * container, or that receive data from a reaction of the container. For each port, this provides
+   * a list of reaction indices that are triggered by the port, or an empty list if there are no
+   * reactions triggered by the port.
+   */
+  // This horrible data structure is a collection, indexed by instantiation
+  // of a contained reactor, of lists, indexed by ports of the contained reactor
+  // that are referenced by reactions of the container, of reactions that are
+  // triggered by the port of the contained reactor. The list is empty if
+  // the port does not trigger reactions but is read by the reaction or
+  // is written to by the reaction.
+  LinkedHashMap<Instantiation, LinkedHashMap<Port, LinkedList<Integer>>> portsByContainedReactor =
+      new LinkedHashMap<>();
 
-    /**
-     * Scan the reactions of the specified reactor and record which ports are
-     * referenced by reactions and which reactions are triggered by such ports.
-     */
-    public InteractingContainedReactors(Reactor reactor) {
-        var reactionCount = 0;
-        for (Reaction reaction : ASTUtils.allReactions(reactor)) {
-            // First, handle reactions that produce data sent to inputs
-            // of contained reactors.
-            for (VarRef effect : ASTUtils.convertToEmptyListIfNull(reaction.getEffects())) {
-                // If an effect is an input, then it must be an input
-                // of a contained reactor.
-                if (effect.getVariable() instanceof Input) {
-                    // This reaction is not triggered by the port, so
-                    // we do not add it to the list returned by the following.
-                    addPort(effect.getContainer(), (Input) effect.getVariable());
-                }
-            }
-            // Second, handle reactions that are triggered by outputs
-            // of contained reactors.
-            for (TriggerRef trigger : ASTUtils.convertToEmptyListIfNull(reaction.getTriggers())) {
-                if (trigger instanceof VarRef triggerAsVarRef) {
-                    // If an trigger is an output, then it must be an output
-                    // of a contained reactor.
-                    if (triggerAsVarRef.getVariable() instanceof Output) {
-                        var list = addPort(triggerAsVarRef.getContainer(), (Output) triggerAsVarRef.getVariable());
-                        list.add(reactionCount);
-                    }
-                }
-            }
-            // Third, handle reading (but not triggered by)
-            // outputs of contained reactors.
-            for (VarRef source : ASTUtils.convertToEmptyListIfNull(reaction.getSources())) {
-                if (source.getVariable() instanceof Output) {
-                    // If an source is an output, then it must be an output
-                    // of a contained reactor.
-                    // This reaction is not triggered by the port, so
-                    // we do not add it to the list returned by the following.
-                    addPort(source.getContainer(), (Output) source.getVariable());
-                }
-            }
-        // Increment the reaction count even if not in the federate for consistency.
-        reactionCount++;
+  /**
+   * Scan the reactions of the specified reactor and record which ports are referenced by reactions
+   * and which reactions are triggered by such ports.
+   */
+  public InteractingContainedReactors(Reactor reactor) {
+    var reactionCount = 0;
+    for (Reaction reaction : ASTUtils.allReactions(reactor)) {
+      // First, handle reactions that produce data sent to inputs
+      // of contained reactors.
+      for (VarRef effect : ASTUtils.convertToEmptyListIfNull(reaction.getEffects())) {
+        // If an effect is an input, then it must be an input
+        // of a contained reactor.
+        if (effect.getVariable() instanceof Input) {
+          // This reaction is not triggered by the port, so
+          // we do not add it to the list returned by the following.
+          addPort(effect.getContainer(), (Input) effect.getVariable());
+        }
+      }
+      // Second, handle reactions that are triggered by outputs
+      // of contained reactors.
+      for (TriggerRef trigger : ASTUtils.convertToEmptyListIfNull(reaction.getTriggers())) {
+        if (trigger instanceof VarRef triggerAsVarRef) {
+          // If an trigger is an output, then it must be an output
+          // of a contained reactor.
+          if (triggerAsVarRef.getVariable() instanceof Output) {
+            var list =
+                addPort(triggerAsVarRef.getContainer(), (Output) triggerAsVarRef.getVariable());
+            list.add(reactionCount);
+          }
+        }
+      }
+      // Third, handle reading (but not triggered by)
+      // outputs of contained reactors.
+      for (VarRef source : ASTUtils.convertToEmptyListIfNull(reaction.getSources())) {
+        if (source.getVariable() instanceof Output) {
+          // If an source is an output, then it must be an output
+          // of a contained reactor.
+          // This reaction is not triggered by the port, so
+          // we do not add it to the list returned by the following.
+          addPort(source.getContainer(), (Output) source.getVariable());
         }
+      }
+      // Increment the reaction count even if not in the federate for consistency.
+      reactionCount++;
     }
+  }
 
-    /**
-     * Return or create the list to which reactions triggered by the specified port
-     * are to be added. This also records that the port is referenced by the
-     * container's reactions.
-     * @param containedReactor The contained reactor.
-     * @param port The port.
-     */
-    private List<Integer> addPort(Instantiation containedReactor, Port port) {
-        // Get or create the entry for the containedReactor.
-        var containedReactorEntry = portsByContainedReactor.computeIfAbsent(
-            containedReactor,
-            k -> new LinkedHashMap<>()
-        );
-        // Get or create the entry for the port.
-        return containedReactorEntry.computeIfAbsent(port, k -> new LinkedList<>());
-    }
+  /**
+   * Return or create the list to which reactions triggered by the specified port are to be added.
+   * This also records that the port is referenced by the container's reactions.
+   *
+   * @param containedReactor The contained reactor.
+   * @param port The port.
+   */
+  private List<Integer> addPort(Instantiation containedReactor, Port port) {
+    // Get or create the entry for the containedReactor.
+    var containedReactorEntry =
+        portsByContainedReactor.computeIfAbsent(containedReactor, k -> new LinkedHashMap<>());
+    // Get or create the entry for the port.
+    return containedReactorEntry.computeIfAbsent(port, k -> new LinkedList<>());
+  }
 
-    /**
-     * Return the set of contained reactors that have ports that are referenced
-     * by reactions of the container reactor.
-     */
-    public Set<Instantiation> containedReactors() {
-        return portsByContainedReactor.keySet();
-    }
+  /**
+   * Return the set of contained reactors that have ports that are referenced by reactions of the
+   * container reactor.
+   */
+  public Set<Instantiation> containedReactors() {
+    return portsByContainedReactor.keySet();
+  }
 
-    /**
-     * Return the set of ports of the specified contained reactor that are
-     * referenced by reactions of the container reactor. Return an empty
-     * set if there are none.
-     * @param containedReactor The contained reactor.
-     */
-    public Set<Port> portsOfInstance(Instantiation containedReactor) {
-        Set<Port> result = null;
-        var ports = portsByContainedReactor.get(containedReactor);
-        if (ports == null) {
-            result = new LinkedHashSet<>();
-        } else {
-            result = ports.keySet();
-        }
-        return result;
+  /**
+   * Return the set of ports of the specified contained reactor that are referenced by reactions of
+   * the container reactor. Return an empty set if there are none.
+   *
+   * @param containedReactor The contained reactor.
+   */
+  public Set<Port> portsOfInstance(Instantiation containedReactor) {
+    Set<Port> result = null;
+    var ports = portsByContainedReactor.get(containedReactor);
+    if (ports == null) {
+      result = new LinkedHashSet<>();
+    } else {
+      result = ports.keySet();
     }
+    return result;
+  }
 
-    /**
-     * Return the indices of the reactions triggered by the specified port
-     * of the specified contained reactor or an empty list if there are none.
-     * @param containedReactor The contained reactor.
-     * @param port The port.
-     */
-    public List<Integer> reactionsTriggered(Instantiation containedReactor, Port port) {
-        var ports = portsByContainedReactor.get(containedReactor);
-        if (ports != null) {
-            var list = ports.get(port);
-            if (list != null) {
-                return list;
-            }
-        }
-        return new LinkedList<>();
+  /**
+   * Return the indices of the reactions triggered by the specified port of the specified contained
+   * reactor or an empty list if there are none.
+   *
+   * @param containedReactor The contained reactor.
+   * @param port The port.
+   */
+  public List<Integer> reactionsTriggered(Instantiation containedReactor, Port port) {
+    var ports = portsByContainedReactor.get(containedReactor);
+    if (ports != null) {
+      var list = ports.get(port);
+      if (list != null) {
+        return list;
+      }
     }
+    return new LinkedList<>();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/TypeParameterizedReactor.java b/org.lflang/src/org/lflang/generator/c/TypeParameterizedReactor.java
index 5f832e692a..c5e062399b 100644
--- a/org.lflang/src/org/lflang/generator/c/TypeParameterizedReactor.java
+++ b/org.lflang/src/org/lflang/generator/c/TypeParameterizedReactor.java
@@ -1,12 +1,10 @@
 package org.lflang.generator.c;
 
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.InferredType;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.Reactor;
@@ -14,62 +12,79 @@
 
 /**
  * A reactor class combined with concrete type arguments bound to its type parameters.
+ *
  * @param reactor The syntactic reactor class definition
  * @param typeArgs The type arguments associated with this particular variant of the reactor class.
  */
 public record TypeParameterizedReactor(Reactor reactor, Map<String, Type> typeArgs) {
 
-    public TypeParameterizedReactor(Instantiation i) {
-        this(ASTUtils.toDefinition(i.getReactorClass()), addTypeArgs(i, ASTUtils.toDefinition(i.getReactorClass())));
-    }
+  public TypeParameterizedReactor(Instantiation i) {
+    this(
+        ASTUtils.toDefinition(i.getReactorClass()),
+        addTypeArgs(i, ASTUtils.toDefinition(i.getReactorClass())));
+  }
 
-    private static Map<String, Type> addTypeArgs(Instantiation instantiation, Reactor r) {
-        HashMap<String, Type> ret = new HashMap<>();
-        if (instantiation.getTypeArgs() != null) {
-            for (int i = 0; i < r.getTypeParms().size(); i++) {
-                ret.put(r.getTypeParms().get(i).getLiteral(), instantiation.getTypeArgs().get(i));
-            }
-        }
-        return ret;
+  private static Map<String, Type> addTypeArgs(Instantiation instantiation, Reactor r) {
+    HashMap<String, Type> ret = new HashMap<>();
+    if (instantiation.getTypeArgs() != null) {
+      for (int i = 0; i < r.getTypeParms().size(); i++) {
+        ret.put(r.getTypeParms().get(i).getLiteral(), instantiation.getTypeArgs().get(i));
+      }
     }
+    return ret;
+  }
 
-    /** Return the name of the reactor given its type arguments. */
-    public String getName() {
-        // FIXME: Types that are not just a single token need to be escaped or hashed
-        return reactor.getName() + typeArgs.values().stream().map(ASTUtils::toOriginalText).collect(Collectors.joining("_"));
-    }
+  /** Return the name of the reactor given its type arguments. */
+  public String getName() {
+    // FIXME: Types that are not just a single token need to be escaped or hashed
+    return reactor.getName()
+        + typeArgs.values().stream().map(ASTUtils::toOriginalText).collect(Collectors.joining("_"));
+  }
 
-    /** #define type names as concrete types. */
-    public void doDefines(CodeBuilder b) {
-        typeArgs.forEach((literal, concreteType) -> b.pr(
-            "#if defined " + literal + "\n" +
-                "#undef " + literal + "\n" +
-                "#endif // " + literal + "\n" +
-                "#define " + literal + " " + ASTUtils.toOriginalText(concreteType)));
-    }
+  /** #define type names as concrete types. */
+  public void doDefines(CodeBuilder b) {
+    typeArgs.forEach(
+        (literal, concreteType) ->
+            b.pr(
+                "#if defined "
+                    + literal
+                    + "\n"
+                    + "#undef "
+                    + literal
+                    + "\n"
+                    + "#endif // "
+                    + literal
+                    + "\n"
+                    + "#define "
+                    + literal
+                    + " "
+                    + ASTUtils.toOriginalText(concreteType)));
+  }
 
-    /** Resolve type arguments if the given type is defined in terms of generics. */
-    public Type resolveType(Type t) {
-        if (t.getId() != null && typeArgs.get(t.getId()) != null) return typeArgs.get(t.getId());
-        if (t.getCode() == null) return t;
-        var arg = typeArgs.get(t.getCode().getBody());
-        if (arg != null) return arg;
-        return t;
-    }
+  /** Resolve type arguments if the given type is defined in terms of generics. */
+  public Type resolveType(Type t) {
+    if (t.getId() != null && typeArgs.get(t.getId()) != null) return typeArgs.get(t.getId());
+    if (t.getCode() == null) return t;
+    var arg = typeArgs.get(t.getCode().getBody());
+    if (arg != null) return arg;
+    return t;
+  }
 
-    /** Resolve type arguments if the given type is defined in terms of generics. */
-    public InferredType resolveType(InferredType t) {
-        if (t.astType == null) return t;
-        return InferredType.fromAST(resolveType(t.astType));
-    }
+  /** Resolve type arguments if the given type is defined in terms of generics. */
+  public InferredType resolveType(InferredType t) {
+    if (t.astType == null) return t;
+    return InferredType.fromAST(resolveType(t.astType));
+  }
 
-    @Override
-    public int hashCode() {
-        return Math.abs(reactor.hashCode() * 31 + typeArgs.hashCode());
-    }
+  @Override
+  public int hashCode() {
+    return Math.abs(reactor.hashCode() * 31 + typeArgs.hashCode());
+  }
 
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof TypeParameterizedReactor other && reactor.equals(other.reactor) && typeArgs.equals(other.typeArgs);
-    }
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof TypeParameterizedReactor other
+        && reactor.equals(other.reactor)
+        && typeArgs.equals(other.typeArgs);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PyFileConfig.java b/org.lflang/src/org/lflang/generator/python/PyFileConfig.java
index bb6a9e9796..7c67b92493 100644
--- a/org.lflang/src/org/lflang/generator/python/PyFileConfig.java
+++ b/org.lflang/src/org/lflang/generator/python/PyFileConfig.java
@@ -3,33 +3,29 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
-import org.lflang.FileConfig;
 import org.lflang.generator.c.CFileConfig;
 import org.lflang.util.LFCommand;
 
 public class PyFileConfig extends CFileConfig {
-    public PyFileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchicalBin) throws IOException {
-        super(resource, srcGenBasePath, useHierarchicalBin);
-    }
+  public PyFileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchicalBin)
+      throws IOException {
+    super(resource, srcGenBasePath, useHierarchicalBin);
+  }
 
-    @Override
-    public LFCommand getCommand() {
-        return LFCommand.get("python3",
-                      List.of(srcPkgPath.relativize(getExecutable()).toString()),
-                      true,
-                      srcPkgPath);
-    }
+  @Override
+  public LFCommand getCommand() {
+    return LFCommand.get(
+        "python3", List.of(srcPkgPath.relativize(getExecutable()).toString()), true, srcPkgPath);
+  }
 
-    @Override
-    public Path getExecutable() {
-        return srcGenPath.resolve(name + getExecutableExtension());
-    }
+  @Override
+  public Path getExecutable() {
+    return srcGenPath.resolve(name + getExecutableExtension());
+  }
 
-    @Override
-    protected String getExecutableExtension() {
-        return ".py";
-    }
+  @Override
+  protected String getExecutableExtension() {
+    return ".py";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PyUtil.java b/org.lflang/src/org/lflang/generator/python/PyUtil.java
index 48cc8f9e10..35aeed6fbb 100644
--- a/org.lflang/src/org/lflang/generator/python/PyUtil.java
+++ b/org.lflang/src/org/lflang/generator/python/PyUtil.java
@@ -1,28 +1,28 @@
 /* Utilities for Python code generation. */
 
 /*************
-Copyright (c) 2019-2021, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019-2021, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator.python;
 
@@ -31,116 +31,126 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.generator.c.CUtil;
 import org.lflang.lf.Expression;
 
-
 /**
- * A collection of utilities for Python code generation.
- * This class inherits from CUtil but overrides a few methods to
- * codify the coding conventions for the Python target code generator.
+ * A collection of utilities for Python code generation. This class inherits from CUtil but
+ * overrides a few methods to codify the coding conventions for the Python target code generator.
  * I.e., it defines how some variables are named and referenced.
+ *
  * @author Edward A. Lee
  * @author Soroush Bateni
  */
 public class PyUtil extends CUtil {
 
-    /**
-     * Return the name of the list of Python class instances that contains the
-     * specified reactor instance. This is similar to
-     * {@link #reactorRef(ReactorInstance)} except that it does not index into
-     * the list.
-     *
-     * @param instance The reactor instance.
-     */
-    public static String reactorRefName(ReactorInstance instance) {
-        return instance.uniqueID() + "_lf";
-    }
-
-    /**
-     * Return a reference to the list of Python class instances that contains
-     * the specified reactor instance. The returned string has the form
-     * list_name[runtimeIndex], where list_name is the name of the list of
-     * Python class instances that contains this reactor instance. If
-     * runtimeIndex is null, then it is replaced by the expression returned by
-     * {@link runtimeIndex(ReactorInstance)} or 0 if there are no banks.
-     *
-     * @param instance     The reactor instance.
-     * @param runtimeIndex An optional expression to use to address bank
-     *                     members. If this is null, the expression used will be
-     *                     that returned by
-     *                     {@link #runtimeIndex(ReactorInstance)}.
-     */
-    public static String reactorRef(ReactorInstance instance, String runtimeIndex) {
-        if (runtimeIndex == null) runtimeIndex = runtimeIndex(instance);
-        return PyUtil.reactorRefName(instance) + "[" + runtimeIndex + "]";
-    }
-
-    /**
-     * Return a reference to the list of Python class instances that contains
-     * the specified reactor instance. The returned string has the form
-     * list_name[j], where list_name is the name of the list of of Python class
-     * instances that contains this reactor instance and j is the expression
-     * returned by {@link #runtimeIndex(ReactorInstance)} or 0 if there are no
-     * banks.
-     *
-     * @param instance The reactor instance.
-     */
-    public static String reactorRef(ReactorInstance instance) {
-        return PyUtil.reactorRef(instance, null);
-    }
-
-    /**
-     * Convert C types to formats used in Py_BuildValue and PyArg_PurseTuple.
-     * This is unused but will be useful to enable inter-compatibility between
-     * C and Python reactors.
-     * @param type C type
-     */
-    public static String pyBuildValueArgumentType(String type) {
-        switch (type) {
-            case "int":                return "i";
-            case "string":             return "s";
-            case "char":               return "b";
-            case "short int":          return "h";
-            case "long":               return "l";
-            case "unsigned char":      return "B";
-            case "unsigned short int": return "H";
-            case "unsigned int":       return "I";
-            case "unsigned long":      return "k";
-            case "long long":          return "L";
-            case "interval_t":         return "L";
-            case "unsigned long long": return "K";
-            case "double":             return "d";
-            case "float":              return "f";
-            case "Py_complex":         return "D";
-            case "Py_complex*":        return "D";
-            case "Py_Object":          return "O";
-            case "Py_Object*":         return "O";
-            default:                   return "O";
-        }
-    }
-
-    public static String generateGILAcquireCode() {
-        return String.join("\n",
-            "// Acquire the GIL (Global Interpreter Lock) to be able to call Python APIs.",
-            "PyGILState_STATE gstate;",
-            "gstate = PyGILState_Ensure();"
-        );
-    }
-
-    public static String generateGILReleaseCode() {
-        return String.join("\n",
-            "/* Release the thread. No Python API allowed beyond this point. */",
-            "PyGILState_Release(gstate);"
-        );
-    }
-
-    /**
-     * Override to convert some C types to their
-     * Python equivalent.
-     * Examples:
-     * true/false -> True/False
-     * @param expr A value
-     * @return A value string in the target language
-     */
-    protected static String getPythonTargetValue(Expression expr) {
-        return PythonTypes.getInstance().getTargetExpr(expr, InferredType.undefined());
+  /**
+   * Return the name of the list of Python class instances that contains the specified reactor
+   * instance. This is similar to {@link #reactorRef(ReactorInstance)} except that it does not index
+   * into the list.
+   *
+   * @param instance The reactor instance.
+   */
+  public static String reactorRefName(ReactorInstance instance) {
+    return instance.uniqueID() + "_lf";
+  }
+
+  /**
+   * Return a reference to the list of Python class instances that contains the specified reactor
+   * instance. The returned string has the form list_name[runtimeIndex], where list_name is the name
+   * of the list of Python class instances that contains this reactor instance. If runtimeIndex is
+   * null, then it is replaced by the expression returned by {@link runtimeIndex(ReactorInstance)}
+   * or 0 if there are no banks.
+   *
+   * @param instance The reactor instance.
+   * @param runtimeIndex An optional expression to use to address bank members. If this is null, the
+   *     expression used will be that returned by {@link #runtimeIndex(ReactorInstance)}.
+   */
+  public static String reactorRef(ReactorInstance instance, String runtimeIndex) {
+    if (runtimeIndex == null) runtimeIndex = runtimeIndex(instance);
+    return PyUtil.reactorRefName(instance) + "[" + runtimeIndex + "]";
+  }
+
+  /**
+   * Return a reference to the list of Python class instances that contains the specified reactor
+   * instance. The returned string has the form list_name[j], where list_name is the name of the
+   * list of of Python class instances that contains this reactor instance and j is the expression
+   * returned by {@link #runtimeIndex(ReactorInstance)} or 0 if there are no banks.
+   *
+   * @param instance The reactor instance.
+   */
+  public static String reactorRef(ReactorInstance instance) {
+    return PyUtil.reactorRef(instance, null);
+  }
+
+  /**
+   * Convert C types to formats used in Py_BuildValue and PyArg_PurseTuple. This is unused but will
+   * be useful to enable inter-compatibility between C and Python reactors.
+   *
+   * @param type C type
+   */
+  public static String pyBuildValueArgumentType(String type) {
+    switch (type) {
+      case "int":
+        return "i";
+      case "string":
+        return "s";
+      case "char":
+        return "b";
+      case "short int":
+        return "h";
+      case "long":
+        return "l";
+      case "unsigned char":
+        return "B";
+      case "unsigned short int":
+        return "H";
+      case "unsigned int":
+        return "I";
+      case "unsigned long":
+        return "k";
+      case "long long":
+        return "L";
+      case "interval_t":
+        return "L";
+      case "unsigned long long":
+        return "K";
+      case "double":
+        return "d";
+      case "float":
+        return "f";
+      case "Py_complex":
+        return "D";
+      case "Py_complex*":
+        return "D";
+      case "Py_Object":
+        return "O";
+      case "Py_Object*":
+        return "O";
+      default:
+        return "O";
     }
+  }
+
+  public static String generateGILAcquireCode() {
+    return String.join(
+        "\n",
+        "// Acquire the GIL (Global Interpreter Lock) to be able to call Python APIs.",
+        "PyGILState_STATE gstate;",
+        "gstate = PyGILState_Ensure();");
+  }
+
+  public static String generateGILReleaseCode() {
+    return String.join(
+        "\n",
+        "/* Release the thread. No Python API allowed beyond this point. */",
+        "PyGILState_Release(gstate);");
+  }
+
+  /**
+   * Override to convert some C types to their Python equivalent. Examples: true/false -> True/False
+   *
+   * @param expr A value
+   * @return A value string in the target language
+   */
+  protected static String getPythonTargetValue(Expression expr) {
+    return PythonTypes.getInstance().getTargetExpr(expr, InferredType.undefined());
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonActionGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonActionGenerator.java
index 13dbed0f0f..5270a4d69e 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonActionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonActionGenerator.java
@@ -1,14 +1,17 @@
 package org.lflang.generator.python;
 
+import org.lflang.generator.c.CGenerator;
 import org.lflang.generator.c.TypeParameterizedReactor;
 import org.lflang.lf.Action;
-import org.lflang.lf.Reactor;
-import org.lflang.generator.c.CGenerator;
 
 public class PythonActionGenerator {
-    public static String generateAliasTypeDef(TypeParameterizedReactor tpr, Action action,
-                                              String genericActionType) {
+  public static String generateAliasTypeDef(
+      TypeParameterizedReactor tpr, Action action, String genericActionType) {
 
-        return "typedef "+genericActionType+" "+CGenerator.variableStructType(action, tpr, false)+";";
-    }
+    return "typedef "
+        + genericActionType
+        + " "
+        + CGenerator.variableStructType(action, tpr, false)
+        + ";";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonDelayBodyGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonDelayBodyGenerator.java
index b69cfc7da0..6171f3ca40 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonDelayBodyGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonDelayBodyGenerator.java
@@ -1,6 +1,5 @@
 package org.lflang.generator.python;
 
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.c.CDelayBodyGenerator;
 import org.lflang.generator.c.CUtil;
@@ -10,69 +9,74 @@
 
 public class PythonDelayBodyGenerator extends CDelayBodyGenerator {
 
-    public PythonDelayBodyGenerator(PythonTypes types) {
-        super(types);
-    }
+  public PythonDelayBodyGenerator(PythonTypes types) {
+    super(types);
+  }
 
-    /**
-     * Generate code for the body of a reaction that takes an input and
-     * schedules an action with the value of that input.
-     * @param action The action to schedule
-     * @param port The port to read from
-     */
-    @Override
-    public String generateDelayBody(Action action, VarRef port) {
-        boolean isTokenType = CUtil.isTokenType(ASTUtils.getInferredType(action), types);
-        String ref = ASTUtils.generateVarRef(port);
-        // Note that the action.type set by the base class is actually
-        // the port type.
-        if (isTokenType) {
-            return String.join("\n",
-                "if ("+ref+"->is_present) {",
-                "    // Put the whole token on the event queue, not just the payload.",
-                "    // This way, the length and element_size are transported.",
-                "    lf_schedule_token("+action.getName()+", 0, "+ref+"->token);",
-                "}"
-            );
-        } else {
-            return String.join("\n",
-                "// Create a token.",
-                "#if NUMBER_OF_WORKERS > 0",
-                "// Need to lock the mutex first.",
-                "lf_mutex_lock(&mutex);",
-                "#endif",
-                "lf_token_t* t = _lf_new_token((token_type_t*)"+action.getName()+", self->_lf_"+ref+"->value, 1);",
-                "#if NUMBER_OF_WORKERS > 0",
-                "lf_mutex_unlock(&mutex);",
-                "#endif",
-                "",
-                "// Pass the token along",
-                "lf_schedule_token("+action.getName()+", 0, t);"
-            );
-        }
+  /**
+   * Generate code for the body of a reaction that takes an input and schedules an action with the
+   * value of that input.
+   *
+   * @param action The action to schedule
+   * @param port The port to read from
+   */
+  @Override
+  public String generateDelayBody(Action action, VarRef port) {
+    boolean isTokenType = CUtil.isTokenType(ASTUtils.getInferredType(action), types);
+    String ref = ASTUtils.generateVarRef(port);
+    // Note that the action.type set by the base class is actually
+    // the port type.
+    if (isTokenType) {
+      return String.join(
+          "\n",
+          "if (" + ref + "->is_present) {",
+          "    // Put the whole token on the event queue, not just the payload.",
+          "    // This way, the length and element_size are transported.",
+          "    lf_schedule_token(" + action.getName() + ", 0, " + ref + "->token);",
+          "}");
+    } else {
+      return String.join(
+          "\n",
+          "// Create a token.",
+          "#if NUMBER_OF_WORKERS > 0",
+          "// Need to lock the mutex first.",
+          "lf_mutex_lock(&mutex);",
+          "#endif",
+          "lf_token_t* t = _lf_new_token((token_type_t*)"
+              + action.getName()
+              + ", self->_lf_"
+              + ref
+              + "->value, 1);",
+          "#if NUMBER_OF_WORKERS > 0",
+          "lf_mutex_unlock(&mutex);",
+          "#endif",
+          "",
+          "// Pass the token along",
+          "lf_schedule_token(" + action.getName() + ", 0, t);");
     }
+  }
 
-    /**
-     * Generate code for the body of a reaction that is triggered by the
-     * given action and writes its value to the given port. This realizes
-     * the receiving end of a logical delay specified with the 'after'
-     * keyword.
-     * @param action The action that triggers the reaction
-     * @param port The port to write to.
-     */
-    @Override
-    public String generateForwardBody(Action action, VarRef port) {
-        String outputName = ASTUtils.generateVarRef(port);
-        if (CUtil.isTokenType(ASTUtils.getInferredType(action), types)) {
-            return super.generateForwardBody(action, port);
-        } else {
-            return "lf_set("+outputName+", "+action.getName()+"->token->value);";
-        }
+  /**
+   * Generate code for the body of a reaction that is triggered by the given action and writes its
+   * value to the given port. This realizes the receiving end of a logical delay specified with the
+   * 'after' keyword.
+   *
+   * @param action The action that triggers the reaction
+   * @param port The port to write to.
+   */
+  @Override
+  public String generateForwardBody(Action action, VarRef port) {
+    String outputName = ASTUtils.generateVarRef(port);
+    if (CUtil.isTokenType(ASTUtils.getInferredType(action), types)) {
+      return super.generateForwardBody(action, port);
+    } else {
+      return "lf_set(" + outputName + ", " + action.getName() + "->token->value);";
     }
+  }
 
-    @Override
-    public void finalizeReactions(Reaction delayReaction, Reaction forwardReaction) {
-        ASTUtils.addReactionAttribute(delayReaction, "_c_body");
-        ASTUtils.addReactionAttribute(forwardReaction, "_c_body");
-    }
+  @Override
+  public void finalizeReactions(Reaction delayReaction, Reaction forwardReaction) {
+    ASTUtils.addReactionAttribute(delayReaction, "_c_body");
+    ASTUtils.addReactionAttribute(forwardReaction, "_c_body");
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonDockerGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonDockerGenerator.java
index ed69ac01fc..9d1bf0fcd4 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonDockerGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonDockerGenerator.java
@@ -1,7 +1,5 @@
-
 package org.lflang.generator.python;
 
-import org.lflang.TargetConfig;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.c.CDockerGenerator;
 
@@ -11,26 +9,25 @@
  * @author Hou Seng Wong
  */
 public class PythonDockerGenerator extends CDockerGenerator {
-    final String defaultBaseImage = "python:slim";
+  final String defaultBaseImage = "python:slim";
 
-    public PythonDockerGenerator(LFGeneratorContext context) {
-        super(context);
-    }
+  public PythonDockerGenerator(LFGeneratorContext context) {
+    super(context);
+  }
 
-    /**
-     * Generates the contents of the docker file.
-     */
-    @Override
-    protected String generateDockerFileContent() {
-        var baseImage = defaultBaseImage;
-        return String.join("\n",
-            "# For instructions, see: https://www.lf-lang.org/docs/handbook/containerized-execution?target=py",
-            "FROM "+baseImage,
-            "WORKDIR /lingua-franca/"+context.getFileConfig().name,
-            "RUN set -ex && apt-get update && apt-get install -y python3-pip && pip install cmake",
-            "COPY . src-gen",
-            super.generateDefaultCompileCommand(),
-            "ENTRYPOINT [\"python3\", \"src-gen/"+context.getFileConfig().name+".py\"]"
-        );
-    }
+  /** Generates the contents of the docker file. */
+  @Override
+  protected String generateDockerFileContent() {
+    var baseImage = defaultBaseImage;
+    return String.join(
+        "\n",
+        "# For instructions, see:"
+            + " https://www.lf-lang.org/docs/handbook/containerized-execution?target=py",
+        "FROM " + baseImage,
+        "WORKDIR /lingua-franca/" + context.getFileConfig().name,
+        "RUN set -ex && apt-get update && apt-get install -y python3-pip && pip install cmake",
+        "COPY . src-gen",
+        super.generateDefaultCompileCommand(),
+        "ENTRYPOINT [\"python3\", \"src-gen/" + context.getFileConfig().name + ".py\"]");
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
index 8ecf9721b8..0c8fc957b8 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
@@ -34,17 +34,14 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.Exceptions;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.AttributeUtils;
 import org.lflang.Target;
 import org.lflang.TargetProperty;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.CodeMap;
-
 import org.lflang.generator.GeneratorResult;
 import org.lflang.generator.IntegratedBuilder;
 import org.lflang.generator.LFGeneratorContext;
@@ -66,530 +63,522 @@
 import org.lflang.util.LFCommand;
 import org.lflang.util.StringUtil;
 
-
 /**
- * Generator for Python target. This class generates Python code defining each
- * reactor
- * class given in the input .lf file and imported .lf files.
+ * Generator for Python target. This class generates Python code defining each reactor class given
+ * in the input .lf file and imported .lf files.
  *
- * Each class will contain all the reaction functions defined by the user in
- * order, with the necessary ports/actions given as parameters.
- * Moreover, each class will contain all state variables in native Python
- * format.
+ * <p>Each class will contain all the reaction functions defined by the user in order, with the
+ * necessary ports/actions given as parameters. Moreover, each class will contain all state
+ * variables in native Python format.
  *
- * A backend is also generated using the CGenerator that interacts with the C
- * code library (see CGenerator.xtend).
- * The backend is responsible for passing arguments to the Python reactor
+ * <p>A backend is also generated using the CGenerator that interacts with the C code library (see
+ * CGenerator.xtend). The backend is responsible for passing arguments to the Python reactor
  * functions.
  *
  * @author Soroush Bateni
  */
 public class PythonGenerator extends CGenerator {
 
-    // Used to add statements that come before reactor classes and user code
-    private final CodeBuilder pythonPreamble = new CodeBuilder();
-
-    // Used to add module requirements to setup.py (delimited with ,)
-    private final List<String> pythonRequiredModules = new ArrayList<>();
-
-    private final PythonTypes types;
-
-    public PythonGenerator(LFGeneratorContext context) {
-        this(context,
-            new PythonTypes(),
-            new CCmakeGenerator(
-                context.getFileConfig(),
-                List.of("lib/python_action.c",
-                    "lib/python_port.c",
-                    "lib/python_tag.c",
-                    "lib/python_time.c",
-                    "lib/pythontarget.c"
-                ),
-                PythonGenerator::setUpMainTarget,
-                "install(TARGETS)" // No-op
-            )
-        );
-    }
-
-
-    private PythonGenerator(LFGeneratorContext context, PythonTypes types, CCmakeGenerator cmakeGenerator) {
-        super(context, false, types, cmakeGenerator, new PythonDelayBodyGenerator(types), null); // FIXME: What to pass to Pyhton?
-        this.targetConfig.compiler = "gcc";
-        this.targetConfig.compilerFlags = new ArrayList<>();
-        this.targetConfig.linkerFlags = "";
-        this.types = types;
-    }
-
-    /**
-     * Generic struct for ports with primitive types and
-     * statically allocated arrays in Lingua Franca.
-     * This template is defined as
-     *   typedef struct {
-     *       bool is_present;
-     *       lf_sparse_io_record_t* sparse_record; // NULL if there is no sparse record.
-     *       int destination_channel;              // -1 if there is no destination.
-     *       PyObject* value;
-     *       int num_destinations;
-     *       lf_token_t* token;
-     *       int length;
-     *       void (*destructor) (void* value);
-     *       void* (*copy_constructor) (void* value);
-     *       FEDERATED_GENERIC_EXTENSION
-     *   } generic_port_instance_struct;
-     *
-     * See reactor-c/python/lib/pythontarget.h for details.
-     */
-    String genericPortType = "generic_port_instance_struct";
-
-    /**
-     * Generic struct for actions.
-     * This template is defined as
-     * typedef struct {
-     * trigger_t* trigger;
-     * PyObject* value;
-     * bool is_present;
-     * bool has_value;
-     * lf_token_t* token;
-     * FEDERATED_CAPSULE_EXTENSION
-     * } generic_action_instance_struct;
-     *
-     * See reactor-c/python/lib/pythontarget.h for details.
-     */
-    String genericActionType = "generic_action_instance_struct";
-
-    /** Returns the Target enum for this generator */
-    @Override
-    public Target getTarget() {
-        return Target.Python;
-    }
-
-    private final Set<String> protoNames = new HashSet<>();
-
-    // //////////////////////////////////////////
-    // // Public methods
-    @Override
-    public TargetTypes getTargetTypes() {
-        return types;
-    }
-
-    // //////////////////////////////////////////
-    // // Protected methods
-
-    /**
-     * Generate all Python classes if they have a reaction
-     *
-     */
-    public String generatePythonReactorClasses() {
-        CodeBuilder pythonClasses = new CodeBuilder();
-        CodeBuilder pythonClassesInstantiation = new CodeBuilder();
-
-        // Generate reactor classes in Python
-        pythonClasses.pr(PythonReactorGenerator.generatePythonClass(main, main, types));
-
-        // Create empty lists to hold reactor instances
-        pythonClassesInstantiation.pr(PythonReactorGenerator.generateListsToHoldClassInstances(main));
-
-        // Instantiate generated classes
-        pythonClassesInstantiation.pr(PythonReactorGenerator.generatePythonClassInstantiations(main, main));
-
-        return String.join("\n",
-                           pythonClasses.toString(),
-                           "",
-                           "# Instantiate classes",
-                           pythonClassesInstantiation.toString()
-        );
-    }
-
-    /**
-     * Generate the Python code constructed from reactor classes and
-     * user-written classes.
-     *
-     * @return the code body
-     */
-    public String generatePythonCode(String pyModuleName) {
-        return String.join("\n",
-            "import os",
-            "import sys",
-            "sys.path.append(os.path.dirname(__file__))",
-            "# List imported names, but do not use pylint's --extension-pkg-allow-list option",
-            "# so that these names will be assumed present without having to compile and install.",
-            "# pylint: disable=no-name-in-module, import-error",
-            "from "+pyModuleName+" import (",
-            "    Tag, action_capsule_t, port_capsule, request_stop, schedule_copy, start",
-            ")",
-            "# pylint: disable=c-extension-no-member",
-            "import "+pyModuleName+" as lf",
-            "try:",
-            "    from LinguaFrancaBase.constants import BILLION, FOREVER, NEVER, instant_t, interval_t",
-            "    from LinguaFrancaBase.functions import (",
-            "        DAY, DAYS, HOUR, HOURS, MINUTE, MINUTES, MSEC, MSECS, NSEC, NSECS, SEC, SECS, USEC,",
-            "        USECS, WEEK, WEEKS",
-            "    )",
-            "    from LinguaFrancaBase.classes import Make",
-            "except ModuleNotFoundError:",
-            "    print(\"No module named 'LinguaFrancaBase'. \"",
-            "          \"Install using \\\"pip3 install LinguaFrancaBase\\\".\")",
-            "    sys.exit(1)",
-            "import copy",
-            "",
-            pythonPreamble.toString(),
-            "",
-            generatePythonReactorClasses(),
-            "",
-            PythonMainFunctionGenerator.generateCode()
-        );
-    }
-
-    /**
-     * Generate the necessary Python files.
-     */
-    public Map<Path, CodeMap> generatePythonFiles(
-        String lfModuleName,
-        String pyModuleName,
-        String pyFileName
-    ) throws IOException {
-        Path filePath = fileConfig.getSrcGenPath().resolve(pyFileName);
-        File file = filePath.toFile();
-        Files.deleteIfExists(filePath);
-        // Create the necessary directories
-        if (!file.getParentFile().exists()) {
-            if (!file.getParentFile().mkdirs()) {
-                throw new IOException(
-                    "Failed to create directories required for the Python code generator."
-                );
-            }
-        }
-        Map<Path, CodeMap> codeMaps = new HashMap<>();
-        codeMaps.put(filePath, CodeMap.fromGeneratedCode(
-            generatePythonCode(pyModuleName)));
-        FileUtil.writeToFile(codeMaps.get(filePath).getGeneratedCode(), filePath);
-        return codeMaps;
-    }
-
-    /**
-     * Generate code that needs to appear at the top of the generated
-     * C file, such as #define and #include statements.
-     */
-    @Override
-    public String generateDirectives() {
-        CodeBuilder code = new CodeBuilder();
-        code.prComment("Code generated by the Lingua Franca compiler from:");
-        code.prComment("file:/" + FileUtil.toUnixString(fileConfig.srcFile));
-        code.pr(PythonPreambleGenerator.generateCDefineDirectives(
+  // Used to add statements that come before reactor classes and user code
+  private final CodeBuilder pythonPreamble = new CodeBuilder();
+
+  // Used to add module requirements to setup.py (delimited with ,)
+  private final List<String> pythonRequiredModules = new ArrayList<>();
+
+  private final PythonTypes types;
+
+  public PythonGenerator(LFGeneratorContext context) {
+    this(
+        context,
+        new PythonTypes(),
+        new CCmakeGenerator(
+            context.getFileConfig(),
+            List.of(
+                "lib/python_action.c",
+                "lib/python_port.c",
+                "lib/python_tag.c",
+                "lib/python_time.c",
+                "lib/pythontarget.c"),
+            PythonGenerator::setUpMainTarget,
+            "install(TARGETS)" // No-op
+            ));
+  }
+
+  private PythonGenerator(
+      LFGeneratorContext context, PythonTypes types, CCmakeGenerator cmakeGenerator) {
+    super(
+        context,
+        false,
+        types,
+        cmakeGenerator,
+        new PythonDelayBodyGenerator(types),
+        null); // FIXME: What to pass to Pyhton?
+    this.targetConfig.compiler = "gcc";
+    this.targetConfig.compilerFlags = new ArrayList<>();
+    this.targetConfig.linkerFlags = "";
+    this.types = types;
+  }
+
+  /**
+   * Generic struct for ports with primitive types and statically allocated arrays in Lingua Franca.
+   * This template is defined as typedef struct { bool is_present; lf_sparse_io_record_t*
+   * sparse_record; // NULL if there is no sparse record. int destination_channel; // -1 if there is
+   * no destination. PyObject* value; int num_destinations; lf_token_t* token; int length; void
+   * (*destructor) (void* value); void* (*copy_constructor) (void* value);
+   * FEDERATED_GENERIC_EXTENSION } generic_port_instance_struct;
+   *
+   * <p>See reactor-c/python/lib/pythontarget.h for details.
+   */
+  String genericPortType = "generic_port_instance_struct";
+
+  /**
+   * Generic struct for actions. This template is defined as typedef struct { trigger_t* trigger;
+   * PyObject* value; bool is_present; bool has_value; lf_token_t* token;
+   * FEDERATED_CAPSULE_EXTENSION } generic_action_instance_struct;
+   *
+   * <p>See reactor-c/python/lib/pythontarget.h for details.
+   */
+  String genericActionType = "generic_action_instance_struct";
+
+  /** Returns the Target enum for this generator */
+  @Override
+  public Target getTarget() {
+    return Target.Python;
+  }
+
+  private final Set<String> protoNames = new HashSet<>();
+
+  // //////////////////////////////////////////
+  // // Public methods
+  @Override
+  public TargetTypes getTargetTypes() {
+    return types;
+  }
+
+  // //////////////////////////////////////////
+  // // Protected methods
+
+  /** Generate all Python classes if they have a reaction */
+  public String generatePythonReactorClasses() {
+    CodeBuilder pythonClasses = new CodeBuilder();
+    CodeBuilder pythonClassesInstantiation = new CodeBuilder();
+
+    // Generate reactor classes in Python
+    pythonClasses.pr(PythonReactorGenerator.generatePythonClass(main, main, types));
+
+    // Create empty lists to hold reactor instances
+    pythonClassesInstantiation.pr(PythonReactorGenerator.generateListsToHoldClassInstances(main));
+
+    // Instantiate generated classes
+    pythonClassesInstantiation.pr(
+        PythonReactorGenerator.generatePythonClassInstantiations(main, main));
+
+    return String.join(
+        "\n",
+        pythonClasses.toString(),
+        "",
+        "# Instantiate classes",
+        pythonClassesInstantiation.toString());
+  }
+
+  /**
+   * Generate the Python code constructed from reactor classes and user-written classes.
+   *
+   * @return the code body
+   */
+  public String generatePythonCode(String pyModuleName) {
+    return String.join(
+        "\n",
+        "import os",
+        "import sys",
+        "sys.path.append(os.path.dirname(__file__))",
+        "# List imported names, but do not use pylint's --extension-pkg-allow-list option",
+        "# so that these names will be assumed present without having to compile and install.",
+        "# pylint: disable=no-name-in-module, import-error",
+        "from " + pyModuleName + " import (",
+        "    Tag, action_capsule_t, port_capsule, request_stop, schedule_copy, start",
+        ")",
+        "# pylint: disable=c-extension-no-member",
+        "import " + pyModuleName + " as lf",
+        "try:",
+        "    from LinguaFrancaBase.constants import BILLION, FOREVER, NEVER, instant_t, interval_t",
+        "    from LinguaFrancaBase.functions import (",
+        "        DAY, DAYS, HOUR, HOURS, MINUTE, MINUTES, MSEC, MSECS, NSEC, NSECS, SEC, SECS,"
+            + " USEC,",
+        "        USECS, WEEK, WEEKS",
+        "    )",
+        "    from LinguaFrancaBase.classes import Make",
+        "except ModuleNotFoundError:",
+        "    print(\"No module named 'LinguaFrancaBase'. \"",
+        "          \"Install using \\\"pip3 install LinguaFrancaBase\\\".\")",
+        "    sys.exit(1)",
+        "import copy",
+        "",
+        pythonPreamble.toString(),
+        "",
+        generatePythonReactorClasses(),
+        "",
+        PythonMainFunctionGenerator.generateCode());
+  }
+
+  /** Generate the necessary Python files. */
+  public Map<Path, CodeMap> generatePythonFiles(
+      String lfModuleName, String pyModuleName, String pyFileName) throws IOException {
+    Path filePath = fileConfig.getSrcGenPath().resolve(pyFileName);
+    File file = filePath.toFile();
+    Files.deleteIfExists(filePath);
+    // Create the necessary directories
+    if (!file.getParentFile().exists()) {
+      if (!file.getParentFile().mkdirs()) {
+        throw new IOException(
+            "Failed to create directories required for the Python code generator.");
+      }
+    }
+    Map<Path, CodeMap> codeMaps = new HashMap<>();
+    codeMaps.put(filePath, CodeMap.fromGeneratedCode(generatePythonCode(pyModuleName)));
+    FileUtil.writeToFile(codeMaps.get(filePath).getGeneratedCode(), filePath);
+    return codeMaps;
+  }
+
+  /**
+   * Generate code that needs to appear at the top of the generated C file, such as #define and
+   * #include statements.
+   */
+  @Override
+  public String generateDirectives() {
+    CodeBuilder code = new CodeBuilder();
+    code.prComment("Code generated by the Lingua Franca compiler from:");
+    code.prComment("file:/" + FileUtil.toUnixString(fileConfig.srcFile));
+    code.pr(
+        PythonPreambleGenerator.generateCDefineDirectives(
             targetConfig, fileConfig.getSrcGenPath(), hasModalReactors));
-        return code.toString();
-    }
-
-    /**
-     * Override generate top-level preambles, but put the user preambles in the
-     * .py file rather than the C file. Also handles including the federated
-     * execution setup preamble specified in the target config.
-     */
-    @Override
-    protected String generateTopLevelPreambles(Reactor ignored) {
-        // user preambles
-        Set<Model> models = new LinkedHashSet<>();
-        for (Reactor r : ASTUtils.convertToEmptyListIfNull(reactors)) {
-            // The following assumes all reactors have a container.
-            // This means that generated reactors **have** to be
-            // added to a resource; not doing so will result in a NPE.
-            models.add((Model) ASTUtils.toDefinition(r).eContainer());
-        }
-        // Add the main reactor if it is defined
-        if (this.mainDef != null) {
-            models.add((Model) ASTUtils.toDefinition(this.mainDef.getReactorClass()).eContainer());
+    return code.toString();
+  }
+
+  /**
+   * Override generate top-level preambles, but put the user preambles in the .py file rather than
+   * the C file. Also handles including the federated execution setup preamble specified in the
+   * target config.
+   */
+  @Override
+  protected String generateTopLevelPreambles(Reactor ignored) {
+    // user preambles
+    Set<Model> models = new LinkedHashSet<>();
+    for (Reactor r : ASTUtils.convertToEmptyListIfNull(reactors)) {
+      // The following assumes all reactors have a container.
+      // This means that generated reactors **have** to be
+      // added to a resource; not doing so will result in a NPE.
+      models.add((Model) ASTUtils.toDefinition(r).eContainer());
+    }
+    // Add the main reactor if it is defined
+    if (this.mainDef != null) {
+      models.add((Model) ASTUtils.toDefinition(this.mainDef.getReactorClass()).eContainer());
+    }
+    for (Model m : models) {
+      pythonPreamble.pr(PythonPreambleGenerator.generatePythonPreambles(m.getPreambles()));
+    }
+    return PythonPreambleGenerator.generateCIncludeStatements(
+        targetConfig, targetLanguageIsCpp(), hasModalReactors);
+  }
+
+  @Override
+  protected void handleProtoFiles() {
+    for (String name : targetConfig.protoFiles) {
+      this.processProtoFile(name);
+      int dotIndex = name.lastIndexOf(".");
+      String rootFilename = dotIndex > 0 ? name.substring(0, dotIndex) : name;
+      pythonPreamble.pr("import " + rootFilename + "_pb2 as " + rootFilename);
+      protoNames.add(rootFilename);
+    }
+  }
+
+  /**
+   * Process a given .proto file.
+   *
+   * <p>Run, if possible, the proto-c protocol buffer code generator to produce the required .h and
+   * .c files.
+   *
+   * @param filename Name of the file to process.
+   */
+  @Override
+  public void processProtoFile(String filename) {
+    LFCommand protoc =
+        commandFactory.createCommand(
+            "protoc",
+            List.of("--python_out=" + fileConfig.getSrcGenPath(), filename),
+            fileConfig.srcPath);
+
+    if (protoc == null) {
+      errorReporter.reportError("Processing .proto files requires libprotoc >= 3.6.1");
+      return;
+    }
+    int returnCode = protoc.run();
+    if (returnCode == 0) {
+      pythonRequiredModules.add("google-api-python-client");
+    } else {
+      errorReporter.reportError("protoc returns error code " + returnCode);
+    }
+  }
+
+  /**
+   * Generate the aliases for inputs, outputs, and struct type definitions for actions of the
+   * specified reactor in the specified federate.
+   *
+   * @param tpr The concrete reactor class.
+   */
+  @Override
+  public void generateAuxiliaryStructs(
+      CodeBuilder builder, TypeParameterizedReactor tpr, boolean userFacing) {
+    for (Input input : ASTUtils.allInputs(tpr.reactor())) {
+      generateAuxiliaryStructsForPort(builder, tpr, input);
+    }
+    for (Output output : ASTUtils.allOutputs(tpr.reactor())) {
+      generateAuxiliaryStructsForPort(builder, tpr, output);
+    }
+    for (Action action : ASTUtils.allActions(tpr.reactor())) {
+      generateAuxiliaryStructsForAction(builder, tpr, action);
+    }
+  }
+
+  private void generateAuxiliaryStructsForPort(
+      CodeBuilder builder, TypeParameterizedReactor tpr, Port port) {
+    boolean isTokenType = CUtil.isTokenType(ASTUtils.getInferredType(port), types);
+    builder.pr(
+        port, PythonPortGenerator.generateAliasTypeDef(tpr, port, isTokenType, genericPortType));
+  }
+
+  private void generateAuxiliaryStructsForAction(
+      CodeBuilder builder, TypeParameterizedReactor tpr, Action action) {
+    builder.pr(action, PythonActionGenerator.generateAliasTypeDef(tpr, action, genericActionType));
+  }
+
+  /**
+   * Return true if the host operating system is compatible and otherwise report an error and return
+   * false.
+   */
+  @Override
+  public boolean isOSCompatible() {
+    return true;
+  }
+
+  /**
+   * Generate C code from the Lingua Franca model contained by the specified resource. This is the
+   * main entry point for code generation.
+   *
+   * @param resource The resource containing the source code.
+   * @param context Context relating to invocation of the code generator.
+   */
+  @Override
+  public void doGenerate(Resource resource, LFGeneratorContext context) {
+    // Set the threading to false by default, unless the user has
+    // specifically asked for it.
+    if (!targetConfig.setByUser.contains(TargetProperty.THREADING)) {
+      targetConfig.threading = false;
+    }
+    int cGeneratedPercentProgress = (IntegratedBuilder.VALIDATED_PERCENT_PROGRESS + 100) / 2;
+    code.pr(
+        PythonPreambleGenerator.generateCIncludeStatements(
+            targetConfig, targetLanguageIsCpp(), hasModalReactors));
+    super.doGenerate(
+        resource,
+        new SubContext(
+            context, IntegratedBuilder.VALIDATED_PERCENT_PROGRESS, cGeneratedPercentProgress));
+
+    if (errorsOccurred()) {
+      context.unsuccessfulFinish();
+      return;
+    }
+
+    Map<Path, CodeMap> codeMaps = new HashMap<>();
+    var lfModuleName = fileConfig.name;
+    // Don't generate code if there is no main reactor
+    if (this.main != null) {
+      try {
+        Map<Path, CodeMap> codeMapsForFederate =
+            generatePythonFiles(
+                lfModuleName,
+                generatePythonModuleName(lfModuleName),
+                generatePythonFileName(lfModuleName));
+        codeMaps.putAll(codeMapsForFederate);
+        copyTargetFiles();
+        new PythonValidator(fileConfig, errorReporter, codeMaps, protoNames).doValidate(context);
+        if (targetConfig.noCompile) {
+          System.out.println(PythonInfoGenerator.generateSetupInfo(fileConfig));
         }
-        for (Model m : models) {
-            pythonPreamble.pr(PythonPreambleGenerator.generatePythonPreambles(m.getPreambles()));
-        }
-        return PythonPreambleGenerator.generateCIncludeStatements(targetConfig, targetLanguageIsCpp(), hasModalReactors);
-    }
-
-    @Override
-    protected void handleProtoFiles() {
-        for (String name : targetConfig.protoFiles) {
-            this.processProtoFile(name);
-            int dotIndex = name.lastIndexOf(".");
-            String rootFilename = dotIndex > 0 ? name.substring(0, dotIndex) : name;
-            pythonPreamble.pr("import "+rootFilename+"_pb2 as "+rootFilename);
-            protoNames.add(rootFilename);
-        }
-    }
-
-    /**
-     * Process a given .proto file.
-     *
-     * Run, if possible, the proto-c protocol buffer code generator to produce
-     * the required .h and .c files.
-     *
-     * @param filename Name of the file to process.
-     */
-    @Override
-    public void processProtoFile(String filename) {
-        LFCommand protoc = commandFactory.createCommand(
-            "protoc", List.of("--python_out="
-                                  + fileConfig.getSrcGenPath(), filename), fileConfig.srcPath);
-
-        if (protoc == null) {
-            errorReporter.reportError("Processing .proto files requires libprotoc >= 3.6.1");
-            return;
-        }
-        int returnCode = protoc.run();
-        if (returnCode == 0) {
-            pythonRequiredModules.add("google-api-python-client");
-        } else {
-            errorReporter.reportError(
-                "protoc returns error code " + returnCode);
-        }
-    }
-
-    /**
-     * Generate the aliases for inputs, outputs, and struct type definitions for
-     * actions of the specified reactor in the specified federate.
-     * @param tpr The concrete reactor class.
-     */
-    @Override
-    public void generateAuxiliaryStructs(
-        CodeBuilder builder, TypeParameterizedReactor tpr, boolean userFacing
-    ) {
-        for (Input input : ASTUtils.allInputs(tpr.reactor())) {
-            generateAuxiliaryStructsForPort(builder, tpr, input);
-        }
-        for (Output output : ASTUtils.allOutputs(tpr.reactor())) {
-            generateAuxiliaryStructsForPort(builder, tpr, output);
-        }
-        for (Action action : ASTUtils.allActions(tpr.reactor())) {
-            generateAuxiliaryStructsForAction(builder, tpr, action);
-        }
-    }
-
-    private void generateAuxiliaryStructsForPort(CodeBuilder builder, TypeParameterizedReactor tpr,
-                                                 Port port) {
-        boolean isTokenType = CUtil.isTokenType(ASTUtils.getInferredType(port), types);
-        builder.pr(port,
-                PythonPortGenerator.generateAliasTypeDef(tpr, port, isTokenType,
-                                                         genericPortType));
-    }
-
-    private void generateAuxiliaryStructsForAction(CodeBuilder builder, TypeParameterizedReactor tpr,
-                                                   Action action) {
-        builder.pr(action, PythonActionGenerator.generateAliasTypeDef(tpr, action, genericActionType));
-    }
-
-    /**
-     * Return true if the host operating system is compatible and
-     * otherwise report an error and return false.
-     */
-    @Override
-    public boolean isOSCompatible() {
-        return true;
-    }
-
-    /**
-     * Generate C code from the Lingua Franca model contained by the
-     * specified resource. This is the main entry point for code
-     * generation.
-     *
-     * @param resource The resource containing the source code.
-     * @param context  Context relating to invocation of the code generator.
-     */
-    @Override
-    public void doGenerate(Resource resource, LFGeneratorContext context) {
-        // Set the threading to false by default, unless the user has
-        // specifically asked for it.
-        if (!targetConfig.setByUser.contains(TargetProperty.THREADING)) {
-            targetConfig.threading = false;
-        }
-        int cGeneratedPercentProgress = (IntegratedBuilder.VALIDATED_PERCENT_PROGRESS + 100) / 2;
-        code.pr(PythonPreambleGenerator.generateCIncludeStatements(targetConfig, targetLanguageIsCpp(), hasModalReactors));
-        super.doGenerate(resource, new SubContext(
-            context,
-            IntegratedBuilder.VALIDATED_PERCENT_PROGRESS,
-            cGeneratedPercentProgress
-        ));
-
-        if (errorsOccurred()) {
-            context.unsuccessfulFinish();
-            return;
-        }
-
-        Map<Path, CodeMap> codeMaps = new HashMap<>();
-        var lfModuleName = fileConfig.name;
-        // Don't generate code if there is no main reactor
-        if (this.main != null) {
-            try {
-                Map<Path, CodeMap> codeMapsForFederate = generatePythonFiles(lfModuleName, generatePythonModuleName(lfModuleName), generatePythonFileName(lfModuleName));
-                codeMaps.putAll(codeMapsForFederate);
-                copyTargetFiles();
-                new PythonValidator(fileConfig, errorReporter, codeMaps, protoNames).doValidate(context);
-                if (targetConfig.noCompile) {
-                    System.out.println(PythonInfoGenerator.generateSetupInfo(fileConfig));
-                }
-            } catch (Exception e) {
-                //noinspection ConstantConditions
-                throw Exceptions.sneakyThrow(e);
-            }
-
-            System.out.println(PythonInfoGenerator.generateRunInfo(fileConfig, lfModuleName));
-        }
-
-        if (errorReporter.getErrorsOccurred()) {
-            context.unsuccessfulFinish();
-        } else {
-            context.finish(GeneratorResult.Status.COMPILED, codeMaps);
-        }
-    }
-
-    @Override
-    protected PythonDockerGenerator getDockerGenerator(LFGeneratorContext context) {
-        return new PythonDockerGenerator(context);
-    }
-
-    /** Generate a reaction function definition for a reactor.
-     *  This function has a single argument that is a void* pointing to
-     *  a struct that contains parameters, state variables, inputs (triggering or not),
-     *  actions (triggering or produced), and outputs.
-     *  @param reaction The reaction.
-     *  @param tpr The reactor.
-     *  @param reactionIndex The position of the reaction within the reactor.
-     */
-    @Override
-    protected void generateReaction(CodeBuilder src, Reaction reaction, TypeParameterizedReactor tpr, int reactionIndex) {
-        Reactor reactor = ASTUtils.toDefinition(tpr.reactor());
-
-        // Reactions marked with a {@code @_c_body} attribute are generated in C
-        if (AttributeUtils.hasCBody(reaction)) {
-            super.generateReaction(src, reaction, tpr, reactionIndex);
-            return;
-        }
-        src.pr(PythonReactionGenerator.generateCReaction(reaction, tpr, reactor, reactionIndex, mainDef, errorReporter, types));
-    }
-
-    /**
-     * Generate code that initializes the state variables for a given instance.
-     * Unlike parameters, state variables are uniformly initialized for all
-     * instances
-     * of the same reactor. This task is left to Python code to allow for more
-     * liberal
-     * state variable assignments.
-     *
-     * @param instance The reactor class instance
-     * @return Initialization code fore state variables of instance
-     */
-    @Override
-    protected void generateStateVariableInitializations(ReactorInstance instance) {
-        // Do nothing
-    }
-
-    /**
-     * Generate runtime initialization code in C for parameters of a given
-     * reactor instance
-     *
-     * @param instance The reactor instance.
-     */
-    @Override
-    protected void generateParameterInitialization(ReactorInstance instance) {
-        // Do nothing
-        // Parameters are initialized in Python
-    }
-
-    /**
-     * Do nothing.
-     * Methods are generated in Python not C.
-     * @see PythonMethodGenerator
-     */
-    @Override
-    protected void generateMethods(CodeBuilder src, TypeParameterizedReactor reactor) {    }
-
-    /**
-     * Generate C preambles defined by user for a given reactor
-     * Since the Python generator expects preambles written in C,
-     * this function is overridden and does nothing.
-     *
-     * @param reactor The given reactor
-     */
-    @Override
-    protected void generateUserPreamblesForReactor(Reactor reactor, CodeBuilder src) {
-        // Do nothing
-    }
-
-    @Override
-    protected void generateReactorClassHeaders(TypeParameterizedReactor tpr, String headerName, CodeBuilder header, CodeBuilder src) {
-        header.pr(PythonPreambleGenerator.generateCIncludeStatements(targetConfig, targetLanguageIsCpp(), hasModalReactors));
-        super.generateReactorClassHeaders(tpr, headerName, header, src);
-    }
-
-    /**
-     * Generate code that is executed while the reactor instance is being
-     * initialized.
-     * This wraps the reaction functions in a Python function.
-     * @param instance The reactor instance.
-     */
-    @Override
-    protected void generateReactorInstanceExtension(
-        ReactorInstance instance
-    ) {
-        initializeTriggerObjects.pr(PythonReactionGenerator.generateCPythonReactionLinkers(instance, mainDef));
-    }
-
-    /**
-     * This function is provided to allow extensions of the CGenerator to append the structure of the self struct
-     * @param selfStructBody The body of the self struct
-     * @param reactor The reactor declaration for the self struct
-     * @param constructorCode Code that is executed when the reactor is instantiated
-     */
-    @Override
-    protected void generateSelfStructExtension(
-        CodeBuilder selfStructBody,
-        Reactor reactor,
-        CodeBuilder constructorCode
-    ) {
-        // Add the name field
-        selfStructBody.pr("char *_lf_name;");
-        int reactionIndex = 0;
-        for (Reaction reaction : ASTUtils.allReactions(reactor)) {
-            // Create a PyObject for each reaction
-            selfStructBody.pr("PyObject* "+ PythonReactionGenerator.generateCPythonReactionFunctionName(reactionIndex)+";");
-            if (reaction.getStp() != null) {
-                selfStructBody.pr("PyObject* "+ PythonReactionGenerator.generateCPythonSTPFunctionName(reactionIndex)+";");
-            }
-            if (reaction.getDeadline() != null) {
-                selfStructBody.pr("PyObject* "+ PythonReactionGenerator.generateCPythonDeadlineFunctionName(reactionIndex)+";");
-            }
-            reactionIndex++;
-        }
-    }
-
-    @Override
-    protected String getConflictingConnectionsInModalReactorsBody(String source, String dest) {
-        // NOTE: Strangely, a newline is needed at the beginning or indentation
-        // gets swallowed.
-        return String.join("\n",
-                           "\n# Generated forwarding reaction for connections with the same destination",
-                           "# but located in mutually exclusive modes.",
-                           dest + ".set(" + source + ".value)\n"
-        );
-    }
-
-    @Override
-    protected void setUpGeneralParameters() {
-        super.setUpGeneralParameters();
-        if (hasModalReactors) {
-            targetConfig.compileAdditionalSources.add("lib/modal_models/impl.c");
-        }
-    }
-
-    @Override
-    protected void additionalPostProcessingForModes() {
-        if (!hasModalReactors) {
-            return;
-        }
-        PythonModeGenerator.generateResetReactionsIfNeeded(reactors);
-    }
-
-    private static String setUpMainTarget(boolean hasMain, String executableName, Stream<String> cSources) {
-        return (
-            """
+      } catch (Exception e) {
+        //noinspection ConstantConditions
+        throw Exceptions.sneakyThrow(e);
+      }
+
+      System.out.println(PythonInfoGenerator.generateRunInfo(fileConfig, lfModuleName));
+    }
+
+    if (errorReporter.getErrorsOccurred()) {
+      context.unsuccessfulFinish();
+    } else {
+      context.finish(GeneratorResult.Status.COMPILED, codeMaps);
+    }
+  }
+
+  @Override
+  protected PythonDockerGenerator getDockerGenerator(LFGeneratorContext context) {
+    return new PythonDockerGenerator(context);
+  }
+
+  /**
+   * Generate a reaction function definition for a reactor. This function has a single argument that
+   * is a void* pointing to a struct that contains parameters, state variables, inputs (triggering
+   * or not), actions (triggering or produced), and outputs.
+   *
+   * @param reaction The reaction.
+   * @param tpr The reactor.
+   * @param reactionIndex The position of the reaction within the reactor.
+   */
+  @Override
+  protected void generateReaction(
+      CodeBuilder src, Reaction reaction, TypeParameterizedReactor tpr, int reactionIndex) {
+    Reactor reactor = ASTUtils.toDefinition(tpr.reactor());
+
+    // Reactions marked with a {@code @_c_body} attribute are generated in C
+    if (AttributeUtils.hasCBody(reaction)) {
+      super.generateReaction(src, reaction, tpr, reactionIndex);
+      return;
+    }
+    src.pr(
+        PythonReactionGenerator.generateCReaction(
+            reaction, tpr, reactor, reactionIndex, mainDef, errorReporter, types));
+  }
+
+  /**
+   * Generate code that initializes the state variables for a given instance. Unlike parameters,
+   * state variables are uniformly initialized for all instances of the same reactor. This task is
+   * left to Python code to allow for more liberal state variable assignments.
+   *
+   * @param instance The reactor class instance
+   * @return Initialization code fore state variables of instance
+   */
+  @Override
+  protected void generateStateVariableInitializations(ReactorInstance instance) {
+    // Do nothing
+  }
+
+  /**
+   * Generate runtime initialization code in C for parameters of a given reactor instance
+   *
+   * @param instance The reactor instance.
+   */
+  @Override
+  protected void generateParameterInitialization(ReactorInstance instance) {
+    // Do nothing
+    // Parameters are initialized in Python
+  }
+
+  /**
+   * Do nothing. Methods are generated in Python not C.
+   *
+   * @see PythonMethodGenerator
+   */
+  @Override
+  protected void generateMethods(CodeBuilder src, TypeParameterizedReactor reactor) {}
+
+  /**
+   * Generate C preambles defined by user for a given reactor Since the Python generator expects
+   * preambles written in C, this function is overridden and does nothing.
+   *
+   * @param reactor The given reactor
+   */
+  @Override
+  protected void generateUserPreamblesForReactor(Reactor reactor, CodeBuilder src) {
+    // Do nothing
+  }
+
+  @Override
+  protected void generateReactorClassHeaders(
+      TypeParameterizedReactor tpr, String headerName, CodeBuilder header, CodeBuilder src) {
+    header.pr(
+        PythonPreambleGenerator.generateCIncludeStatements(
+            targetConfig, targetLanguageIsCpp(), hasModalReactors));
+    super.generateReactorClassHeaders(tpr, headerName, header, src);
+  }
+
+  /**
+   * Generate code that is executed while the reactor instance is being initialized. This wraps the
+   * reaction functions in a Python function.
+   *
+   * @param instance The reactor instance.
+   */
+  @Override
+  protected void generateReactorInstanceExtension(ReactorInstance instance) {
+    initializeTriggerObjects.pr(
+        PythonReactionGenerator.generateCPythonReactionLinkers(instance, mainDef));
+  }
+
+  /**
+   * This function is provided to allow extensions of the CGenerator to append the structure of the
+   * self struct
+   *
+   * @param selfStructBody The body of the self struct
+   * @param reactor The reactor declaration for the self struct
+   * @param constructorCode Code that is executed when the reactor is instantiated
+   */
+  @Override
+  protected void generateSelfStructExtension(
+      CodeBuilder selfStructBody, Reactor reactor, CodeBuilder constructorCode) {
+    // Add the name field
+    selfStructBody.pr("char *_lf_name;");
+    int reactionIndex = 0;
+    for (Reaction reaction : ASTUtils.allReactions(reactor)) {
+      // Create a PyObject for each reaction
+      selfStructBody.pr(
+          "PyObject* "
+              + PythonReactionGenerator.generateCPythonReactionFunctionName(reactionIndex)
+              + ";");
+      if (reaction.getStp() != null) {
+        selfStructBody.pr(
+            "PyObject* "
+                + PythonReactionGenerator.generateCPythonSTPFunctionName(reactionIndex)
+                + ";");
+      }
+      if (reaction.getDeadline() != null) {
+        selfStructBody.pr(
+            "PyObject* "
+                + PythonReactionGenerator.generateCPythonDeadlineFunctionName(reactionIndex)
+                + ";");
+      }
+      reactionIndex++;
+    }
+  }
+
+  @Override
+  protected String getConflictingConnectionsInModalReactorsBody(String source, String dest) {
+    // NOTE: Strangely, a newline is needed at the beginning or indentation
+    // gets swallowed.
+    return String.join(
+        "\n",
+        "\n# Generated forwarding reaction for connections with the same destination",
+        "# but located in mutually exclusive modes.",
+        dest + ".set(" + source + ".value)\n");
+  }
+
+  @Override
+  protected void setUpGeneralParameters() {
+    super.setUpGeneralParameters();
+    if (hasModalReactors) {
+      targetConfig.compileAdditionalSources.add("lib/modal_models/impl.c");
+    }
+  }
+
+  @Override
+  protected void additionalPostProcessingForModes() {
+    if (!hasModalReactors) {
+      return;
+    }
+    PythonModeGenerator.generateResetReactionsIfNeeded(reactors);
+  }
+
+  private static String setUpMainTarget(
+      boolean hasMain, String executableName, Stream<String> cSources) {
+    return ("""
             set(CMAKE_POSITION_INDEPENDENT_CODE ON)
             add_compile_definitions(_LF_GARBAGE_COLLECTED)
             add_subdirectory(core)
@@ -614,74 +603,59 @@ private static String setUpMainTarget(boolean hasMain, String executableName, St
             include_directories(${Python_INCLUDE_DIRS})
             target_link_libraries(${LF_MAIN_TARGET} PRIVATE ${Python_LIBRARIES})
             target_compile_definitions(${LF_MAIN_TARGET} PUBLIC MODULE_NAME=<pyModuleName>)
-            """
-            ).replace("<pyModuleName>", generatePythonModuleName(executableName))
-            .replace("executableName", executableName);
-        // The use of fileConfig.name will break federated execution, but that's fine
-    }
-
-    /**
-     * Generate a ({@code key}, {@code val}) tuple pair for the {@code define_macros} field
-     * of the Extension class constructor from setuptools.
-     *
-     * @param key The key of the macro entry
-     * @param val The value of the macro entry
-     * @return A ({@code key}, {@code val}) tuple pair as String
-     */
-    private static String generateMacroEntry(String key, String val) {
-        return "(" + StringUtil.addDoubleQuotes(key) + ", " + StringUtil.addDoubleQuotes(val) + ")";
-    }
-
-    /**
-     * Generate the name of the python module.
-     *
-     * Ideally, this function would belong in a class like {@code PyFileConfig}
-     * that specifies all the paths to the generated code.
-     *
-     * @param lfModuleName The name of the LF module.
-     * @return The name of the python module.
-     */
-    private static String generatePythonModuleName(String lfModuleName) {
-        return "LinguaFranca" + lfModuleName;
-    }
-
-    /**
-     * Generate the python file name given an {@code lfModuleName}.
-     *
-     * Ideally, this function would belong in a class like {@code PyFileConfig}
-     * that specifies all the paths to the generated code.
-     *
-     * @param lfModuleName The name of the LF module
-     * @return The name of the generated python file.
-     */
-    private static String generatePythonFileName(String lfModuleName) {
-        return lfModuleName + ".py";
-    }
-
-    /**
-     * Copy Python specific target code to the src-gen directory
-     */
-    @Override
-    protected void copyTargetFiles() throws IOException {
-        super.copyTargetFiles();
-        FileUtil.copyFromClassPath(
-            "/lib/c/reactor-c/python/include",
-            fileConfig.getSrcGenPath(),
-            true,
-            false
-        );
-        FileUtil.copyFromClassPath(
-            "/lib/c/reactor-c/python/lib",
-            fileConfig.getSrcGenPath(),
-            true,
-            false
-        );
-        FileUtil.copyFromClassPath(
-            "/lib/py/lf-python-support/LinguaFrancaBase",
-            fileConfig.getSrcGenPath(),
-            true,
-            false
-        );
-    }
-
+            """)
+        .replace("<pyModuleName>", generatePythonModuleName(executableName))
+        .replace("executableName", executableName);
+    // The use of fileConfig.name will break federated execution, but that's fine
+  }
+
+  /**
+   * Generate a ({@code key}, {@code val}) tuple pair for the {@code define_macros} field of the
+   * Extension class constructor from setuptools.
+   *
+   * @param key The key of the macro entry
+   * @param val The value of the macro entry
+   * @return A ({@code key}, {@code val}) tuple pair as String
+   */
+  private static String generateMacroEntry(String key, String val) {
+    return "(" + StringUtil.addDoubleQuotes(key) + ", " + StringUtil.addDoubleQuotes(val) + ")";
+  }
+
+  /**
+   * Generate the name of the python module.
+   *
+   * <p>Ideally, this function would belong in a class like {@code PyFileConfig} that specifies all
+   * the paths to the generated code.
+   *
+   * @param lfModuleName The name of the LF module.
+   * @return The name of the python module.
+   */
+  private static String generatePythonModuleName(String lfModuleName) {
+    return "LinguaFranca" + lfModuleName;
+  }
+
+  /**
+   * Generate the python file name given an {@code lfModuleName}.
+   *
+   * <p>Ideally, this function would belong in a class like {@code PyFileConfig} that specifies all
+   * the paths to the generated code.
+   *
+   * @param lfModuleName The name of the LF module
+   * @return The name of the generated python file.
+   */
+  private static String generatePythonFileName(String lfModuleName) {
+    return lfModuleName + ".py";
+  }
+
+  /** Copy Python specific target code to the src-gen directory */
+  @Override
+  protected void copyTargetFiles() throws IOException {
+    super.copyTargetFiles();
+    FileUtil.copyFromClassPath(
+        "/lib/c/reactor-c/python/include", fileConfig.getSrcGenPath(), true, false);
+    FileUtil.copyFromClassPath(
+        "/lib/c/reactor-c/python/lib", fileConfig.getSrcGenPath(), true, false);
+    FileUtil.copyFromClassPath(
+        "/lib/py/lf-python-support/LinguaFrancaBase", fileConfig.getSrcGenPath(), true, false);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonInfoGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonInfoGenerator.java
index 23512f447a..01cadbcc5c 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonInfoGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonInfoGenerator.java
@@ -4,53 +4,49 @@
 import org.lflang.FileConfig;
 
 public class PythonInfoGenerator {
-    /**
-     * Print information about necessary steps to install the supporting
-     * Python C extension for the generated program.
-     *
-     * @note Only needed if no-compile is set to true
-     */
-    public static String generateSetupInfo(FileConfig fileConfig) {
-        return String.join("\n",
-            "",
-            "#####################################",
-            "To compile and install the generated code, do:",
-            "    ",
-            "    cd "+fileConfig.getSrcGenPath()+File.separator,
-            "    python3 -m pip install --force-reinstall .",
-            ""
-        );
-    }
+  /**
+   * Print information about necessary steps to install the supporting Python C extension for the
+   * generated program.
+   *
+   * @note Only needed if no-compile is set to true
+   */
+  public static String generateSetupInfo(FileConfig fileConfig) {
+    return String.join(
+        "\n",
+        "",
+        "#####################################",
+        "To compile and install the generated code, do:",
+        "    ",
+        "    cd " + fileConfig.getSrcGenPath() + File.separator,
+        "    python3 -m pip install --force-reinstall .",
+        "");
+  }
 
-    /**
-     * Print information on how to execute the generated program.
-     */
-    public static String generateRunInfo(FileConfig fileConfig, String lfModuleName) {
-        return String.join("\n",
-            "",
-            "#####################################",
-            "To run the generated program, use:",
-            "    ",
-            "    python3 "+fileConfig.getSrcGenPath()+File.separator+lfModuleName+".py",
-            "",
-            "#####################################",
-            ""
-        );
-    }
+  /** Print information on how to execute the generated program. */
+  public static String generateRunInfo(FileConfig fileConfig, String lfModuleName) {
+    return String.join(
+        "\n",
+        "",
+        "#####################################",
+        "To run the generated program, use:",
+        "    ",
+        "    python3 " + fileConfig.getSrcGenPath() + File.separator + lfModuleName + ".py",
+        "",
+        "#####################################",
+        "");
+  }
 
-    /**
-     * Print information on how to execute the generated federation.
-     */
-    public static String generateFedRunInfo(FileConfig fileConfig) {
-        return String.join("\n",
-            "",
-            "#####################################",
-            "To run the generated program, run:",
-            "    ",
-            "    bash "+fileConfig.binPath+"/"+fileConfig.name,
-            "",
-            "#####################################",
-            ""
-        );
-    }
+  /** Print information on how to execute the generated federation. */
+  public static String generateFedRunInfo(FileConfig fileConfig) {
+    return String.join(
+        "\n",
+        "",
+        "#####################################",
+        "To run the generated program, run:",
+        "    ",
+        "    bash " + fileConfig.binPath + "/" + fileConfig.name,
+        "",
+        "#####################################",
+        "");
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonMainFunctionGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonMainFunctionGenerator.java
index a655402408..5a43788138 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonMainFunctionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonMainFunctionGenerator.java
@@ -26,29 +26,26 @@
 package org.lflang.generator.python;
 
 /**
- * Responsible for creating the main function for
- * the generated Python target programs.
+ * Responsible for creating the main function for the generated Python target programs.
  *
  * @author Soroush Bateni
- *
  */
 public final class PythonMainFunctionGenerator {
 
-    /*
-     * Generate the main function code
-     */
-    public static String generateCode() {
-        StringBuilder code = new StringBuilder();
-        code.append(
-                  "# The main function\n"
-                + "def main(argv):\n"
-                + "    start(argv)\n"
-                + "\n"
-                + "# As is customary in Python programs, the main() function\n"
-                + "# should only be executed if the main module is active.\n"
-                + "if __name__==\"__main__\":\n"
-                + "    main(sys.argv)\n"
-       );
-       return code.toString();
-    }
+  /*
+   * Generate the main function code
+   */
+  public static String generateCode() {
+    StringBuilder code = new StringBuilder();
+    code.append(
+        "# The main function\n"
+            + "def main(argv):\n"
+            + "    start(argv)\n"
+            + "\n"
+            + "# As is customary in Python programs, the main() function\n"
+            + "# should only be executed if the main module is active.\n"
+            + "if __name__==\"__main__\":\n"
+            + "    main(sys.argv)\n");
+    return code.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonMethodGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonMethodGenerator.java
index a2d1e240d1..e2d2e85a6b 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonMethodGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonMethodGenerator.java
@@ -1,7 +1,6 @@
 package org.lflang.generator.python;
 
 import java.util.stream.Collectors;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Method;
 import org.lflang.lf.MethodArgument;
@@ -14,39 +13,30 @@
  */
 public class PythonMethodGenerator {
 
-    /**
-     * Generate a Python method definition for {@code method}.
-     */
-    public static String generateMethod(Method method) {
-        return String.join("\n",
-                           "# Implementation of method "+method.getName()+"().",
-                           "def "+method.getName()+"(self, "+generateMethodArgumentList(method)+"):",
-                           ASTUtils.toText(method.getCode()).indent(4)
-        );
-    }
+  /** Generate a Python method definition for {@code method}. */
+  public static String generateMethod(Method method) {
+    return String.join(
+        "\n",
+        "# Implementation of method " + method.getName() + "().",
+        "def " + method.getName() + "(self, " + generateMethodArgumentList(method) + "):",
+        ASTUtils.toText(method.getCode()).indent(4));
+  }
 
-    /**
-     * Generate methods for a reactor class.
-     *
-     * @param reactor The reactor.
-     */
-    public static String generateMethods(
-        Reactor reactor
-    ) {
-        return ASTUtils.allMethods(reactor)
-                       .stream()
-                       .map(m -> generateMethod(m))
-                       .collect(Collectors.joining());
-    }
+  /**
+   * Generate methods for a reactor class.
+   *
+   * @param reactor The reactor.
+   */
+  public static String generateMethods(Reactor reactor) {
+    return ASTUtils.allMethods(reactor).stream()
+        .map(m -> generateMethod(m))
+        .collect(Collectors.joining());
+  }
 
-    /**
-     * Generate a list of arguments for {@code method} delimited with ', '.
-     */
-    private static String generateMethodArgumentList(Method method) {
-        return String.join(", ",
-                           method.getArguments()
-                                 .stream()
-                                 .map(MethodArgument::getName)
-                                 .collect(Collectors.toList()));
-    }
+  /** Generate a list of arguments for {@code method} delimited with ', '. */
+  private static String generateMethodArgumentList(Method method) {
+    return String.join(
+        ", ",
+        method.getArguments().stream().map(MethodArgument::getName).collect(Collectors.toList()));
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonModeGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonModeGenerator.java
index 90af635727..9bcbe6607d 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonModeGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonModeGenerator.java
@@ -1,7 +1,6 @@
 package org.lflang.generator.python;
 
 import java.util.List;
-
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.lf.BuiltinTrigger;
@@ -15,86 +14,94 @@
  * Helper class to handle modes in Python programs.
  *
  * @author Soroush Bateni
- *
  */
 public class PythonModeGenerator {
-    /**
-     * Generate reset reactions in modes to reset state variables.
-     *
-     * @param reactors A list of reactors in the program, some of which could contain modes.
-     */
-    public static void generateResetReactionsIfNeeded(List<Reactor> reactors) {
-        for (Reactor reactor : reactors) {
-            generateStartupReactionsInReactor(reactor);
-        }
+  /**
+   * Generate reset reactions in modes to reset state variables.
+   *
+   * @param reactors A list of reactors in the program, some of which could contain modes.
+   */
+  public static void generateResetReactionsIfNeeded(List<Reactor> reactors) {
+    for (Reactor reactor : reactors) {
+      generateStartupReactionsInReactor(reactor);
     }
+  }
 
-    /**
-     * Generate reset reactions that reset state variables in
-     * <ul>
-     * <li>the reactor, and,</li>
-     * <li>the modes within the reactor.</li>
-     * </ul>
-     *
-     * @param reactor The reactor.
-     */
-    private static void generateStartupReactionsInReactor(Reactor reactor) {
-
-        // Create a reaction with a reset trigger
-        BuiltinTriggerRef resetTrigger = LfFactory.eINSTANCE.createBuiltinTriggerRef();
-        resetTrigger.setType(BuiltinTrigger.RESET);
-        Reaction baseReaction = LfFactory.eINSTANCE.createReaction();
-        baseReaction.getTriggers().add(resetTrigger);
+  /**
+   * Generate reset reactions that reset state variables in
+   *
+   * <ul>
+   *   <li>the reactor, and,
+   *   <li>the modes within the reactor.
+   * </ul>
+   *
+   * @param reactor The reactor.
+   */
+  private static void generateStartupReactionsInReactor(Reactor reactor) {
 
-        if (!reactor.getStateVars().isEmpty() && reactor.getStateVars().stream().anyMatch(s -> s.isReset())) {
-            // Create a reaction body that resets all state variables (that are not in a mode)
-            // to their initial value.
-            var reactionBody = LfFactory.eINSTANCE.createCode();
-            CodeBuilder code = new CodeBuilder();
-            code.pr("# Reset the following state variables to their initial value.");
-            for (var state: reactor.getStateVars()) {
-                if (state.isReset()) {
-                    code.pr("self."+state.getName()+" = "+ PythonStateGenerator.generatePythonInitializer(state));
-                }
-            }
-            reactionBody.setBody(code.toString());
-            baseReaction.setCode(reactionBody);
+    // Create a reaction with a reset trigger
+    BuiltinTriggerRef resetTrigger = LfFactory.eINSTANCE.createBuiltinTriggerRef();
+    resetTrigger.setType(BuiltinTrigger.RESET);
+    Reaction baseReaction = LfFactory.eINSTANCE.createReaction();
+    baseReaction.getTriggers().add(resetTrigger);
 
-            reactor.getReactions().add(0, baseReaction);
+    if (!reactor.getStateVars().isEmpty()
+        && reactor.getStateVars().stream().anyMatch(s -> s.isReset())) {
+      // Create a reaction body that resets all state variables (that are not in a mode)
+      // to their initial value.
+      var reactionBody = LfFactory.eINSTANCE.createCode();
+      CodeBuilder code = new CodeBuilder();
+      code.pr("# Reset the following state variables to their initial value.");
+      for (var state : reactor.getStateVars()) {
+        if (state.isReset()) {
+          code.pr(
+              "self."
+                  + state.getName()
+                  + " = "
+                  + PythonStateGenerator.generatePythonInitializer(state));
         }
+      }
+      reactionBody.setBody(code.toString());
+      baseReaction.setCode(reactionBody);
 
+      reactor.getReactions().add(0, baseReaction);
+    }
 
-        var reactorModes = reactor.getModes();
-        if (!reactorModes.isEmpty()) {
-            for (Mode mode : reactorModes) {
-                if (mode.getStateVars().isEmpty() || mode.getStateVars().stream().allMatch(s -> !s.isReset())) {
-                    continue;
-                }
-                Reaction reaction = EcoreUtil.copy(baseReaction);
-
-                // Create a reaction body that resets all state variables to their initial value.
-                var reactionBody = LfFactory.eINSTANCE.createCode();
-                CodeBuilder code = new CodeBuilder();
-                code.pr("# Reset the following state variables to their initial value.");
-                for (var state: mode.getStateVars()) {
-                    if (state.isReset()) {
-                        code.pr("self."+state.getName()+" = "+ PythonStateGenerator.generatePythonInitializer(state));
-                    }
-                }
-                reactionBody.setBody(code.toString());
-                reaction.setCode(reactionBody);
+    var reactorModes = reactor.getModes();
+    if (!reactorModes.isEmpty()) {
+      for (Mode mode : reactorModes) {
+        if (mode.getStateVars().isEmpty()
+            || mode.getStateVars().stream().allMatch(s -> !s.isReset())) {
+          continue;
+        }
+        Reaction reaction = EcoreUtil.copy(baseReaction);
 
-                try {
-                    mode.getReactions().add(0, reaction);
-                } catch (IndexOutOfBoundsException e) {
-                    // There are no scoping for state variables.
-                    // We add this reaction for now so that it
-                    // still resets state variables even if there
-                    // are no reactions in this mode.
-                    mode.getReactions().add(reaction);
-                }
+        // Create a reaction body that resets all state variables to their initial value.
+        var reactionBody = LfFactory.eINSTANCE.createCode();
+        CodeBuilder code = new CodeBuilder();
+        code.pr("# Reset the following state variables to their initial value.");
+        for (var state : mode.getStateVars()) {
+          if (state.isReset()) {
+            code.pr(
+                "self."
+                    + state.getName()
+                    + " = "
+                    + PythonStateGenerator.generatePythonInitializer(state));
+          }
+        }
+        reactionBody.setBody(code.toString());
+        reaction.setCode(reactionBody);
 
-            }
+        try {
+          mode.getReactions().add(0, reaction);
+        } catch (IndexOutOfBoundsException e) {
+          // There are no scoping for state variables.
+          // We add this reaction for now so that it
+          // still resets state variables even if there
+          // are no reactions in this mode.
+          mode.getReactions().add(reaction);
         }
+      }
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonParameterGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonParameterGenerator.java
index 838e7a27a3..0c13b111f7 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonParameterGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonParameterGenerator.java
@@ -2,107 +2,103 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.ParameterInstance;
-import org.lflang.lf.ReactorDecl;
 import org.lflang.lf.Parameter;
-
+import org.lflang.lf.ReactorDecl;
 
 public class PythonParameterGenerator {
-    /**
-     * Generate Python code that instantiates and initializes parameters for a reactor 'decl'.
-     *
-     * @param decl The reactor declaration
-     * @return The generated code as a StringBuilder
-     */
-    public static String generatePythonInstantiations(ReactorDecl decl, PythonTypes types) {
-        List<String> lines = new ArrayList<>();
-        lines.add("# Define parameters and their default values");
+  /**
+   * Generate Python code that instantiates and initializes parameters for a reactor 'decl'.
+   *
+   * @param decl The reactor declaration
+   * @return The generated code as a StringBuilder
+   */
+  public static String generatePythonInstantiations(ReactorDecl decl, PythonTypes types) {
+    List<String> lines = new ArrayList<>();
+    lines.add("# Define parameters and their default values");
 
-        for (Parameter param : getAllParameters(decl)) {
-            if (!types.getTargetType(param).equals("PyObject*")) {
-                // If type is given, use it
-                String type = types.getPythonType(ASTUtils.getInferredType(param));
-                lines.add("self._"+param.getName()+":"+type+" = "+generatePythonInitializer(param));
-            } else {
-                // If type is not given, just pass along the initialization
-                lines.add("self._"+param.getName()+" = "+generatePythonInitializer(param));
-            }
-        }
-        // Handle parameters that are set in instantiation
-        lines.addAll(List.of(
+    for (Parameter param : getAllParameters(decl)) {
+      if (!types.getTargetType(param).equals("PyObject*")) {
+        // If type is given, use it
+        String type = types.getPythonType(ASTUtils.getInferredType(param));
+        lines.add(
+            "self._" + param.getName() + ":" + type + " = " + generatePythonInitializer(param));
+      } else {
+        // If type is not given, just pass along the initialization
+        lines.add("self._" + param.getName() + " = " + generatePythonInitializer(param));
+      }
+    }
+    // Handle parameters that are set in instantiation
+    lines.addAll(
+        List.of(
             "# Handle parameters that are set in instantiation",
             "self.__dict__.update(kwargs)",
-            ""
-        ));
-        return String.join("\n", lines);
-    }
+            ""));
+    return String.join("\n", lines);
+  }
 
-    /**
-     * Generate Python code getters for parameters of reactor 'decl'.
-     *
-     * @param decl The reactor declaration
-     * @return The generated code as a StringBuilder
-     */
-    public static String generatePythonGetters(ReactorDecl decl) {
-        List<String> lines = new ArrayList<>();
-        for (Parameter param : getAllParameters(decl)) {
-            if (!param.getName().equals("bank_index")) {
-                lines.addAll(List.of(
-                    "",
-                    "@property",
-                    "def "+param.getName()+"(self):",
-                    "    return self._"+param.getName()+" # pylint: disable=no-member",
-                    ""
-                ));
-            }
-        }
-        // Create a special property for bank_index
-        lines.addAll(List.of(
+  /**
+   * Generate Python code getters for parameters of reactor 'decl'.
+   *
+   * @param decl The reactor declaration
+   * @return The generated code as a StringBuilder
+   */
+  public static String generatePythonGetters(ReactorDecl decl) {
+    List<String> lines = new ArrayList<>();
+    for (Parameter param : getAllParameters(decl)) {
+      if (!param.getName().equals("bank_index")) {
+        lines.addAll(
+            List.of(
+                "",
+                "@property",
+                "def " + param.getName() + "(self):",
+                "    return self._" + param.getName() + " # pylint: disable=no-member",
+                ""));
+      }
+    }
+    // Create a special property for bank_index
+    lines.addAll(
+        List.of(
             "",
             "@property",
             "def bank_index(self):",
             "    return self._bank_index # pylint: disable=no-member",
-            ""
-        ));
-        lines.add("\n");
-        return String.join("\n", lines);
-    }
-
-    /**
-     * Return a list of all parameters of reactor 'decl'.
-     *
-     * @param decl The reactor declaration
-     * @return The list of all parameters of 'decl'
-     */
-    private static List<Parameter> getAllParameters(ReactorDecl decl) {
-        return ASTUtils.allParameters(ASTUtils.toDefinition(decl));
-    }
+            ""));
+    lines.add("\n");
+    return String.join("\n", lines);
+  }
 
-    /**
-     * Create a Python list for parameter initialization in target code.
-     *
-     * @param p The parameter to create initializers for
-     * @return Initialization code
-     */
-    private static String generatePythonInitializer(Parameter p) {
-        return PythonTypes.getInstance().getTargetInitializer(p.getInit(), p.getType());
-    }
+  /**
+   * Return a list of all parameters of reactor 'decl'.
+   *
+   * @param decl The reactor declaration
+   * @return The list of all parameters of 'decl'
+   */
+  private static List<Parameter> getAllParameters(ReactorDecl decl) {
+    return ASTUtils.allParameters(ASTUtils.toDefinition(decl));
+  }
 
-    /**
-     * Return a Python expression that can be used to initialize the specified
-     * parameter instance. If the parameter initializer refers to other
-     * parameters, then those parameter references are replaced with
-     * accesses to the Python reactor instance class of the parents of
-     * those parameters.
-     *
-     * @param p The parameter instance to create initializer for
-     * @return Initialization code
-     */
-    public static String generatePythonInitializer(ParameterInstance p) {
-        PythonTypes pyTypes = PythonTypes.generateParametersIn(p.getParent().getParent());
-        return pyTypes.getTargetInitializer(p.getActualValue(), p.getDefinition().getType());
-    }
+  /**
+   * Create a Python list for parameter initialization in target code.
+   *
+   * @param p The parameter to create initializers for
+   * @return Initialization code
+   */
+  private static String generatePythonInitializer(Parameter p) {
+    return PythonTypes.getInstance().getTargetInitializer(p.getInit(), p.getType());
+  }
 
+  /**
+   * Return a Python expression that can be used to initialize the specified parameter instance. If
+   * the parameter initializer refers to other parameters, then those parameter references are
+   * replaced with accesses to the Python reactor instance class of the parents of those parameters.
+   *
+   * @param p The parameter instance to create initializer for
+   * @return Initialization code
+   */
+  public static String generatePythonInitializer(ParameterInstance p) {
+    PythonTypes pyTypes = PythonTypes.generateParametersIn(p.getParent().getParent());
+    return pyTypes.getTargetInitializer(p.getActualValue(), p.getDefinition().getType());
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonPortGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonPortGenerator.java
index 5109c322c3..d8ece7d206 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonPortGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonPortGenerator.java
@@ -1,237 +1,260 @@
 package org.lflang.generator.python;
 
+import static org.lflang.generator.c.CUtil.generateWidthVariable;
+
+import java.util.List;
+import org.lflang.ast.ASTUtils;
+import org.lflang.generator.CodeBuilder;
+import org.lflang.generator.c.CGenerator;
 import org.lflang.generator.c.TypeParameterizedReactor;
+import org.lflang.lf.Action;
 import org.lflang.lf.Input;
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.Output;
 import org.lflang.lf.Port;
-import org.lflang.lf.Action;
 import org.lflang.lf.ReactorDecl;
 import org.lflang.lf.VarRef;
-import java.util.List;
-import org.lflang.ast.ASTUtils;
-import org.lflang.generator.CodeBuilder;
-import org.lflang.generator.c.CGenerator;
-import static org.lflang.generator.c.CUtil.generateWidthVariable;
 
 public class PythonPortGenerator {
-    public static final String NONMULTIPORT_WIDTHSPEC = "-2";
+  public static final String NONMULTIPORT_WIDTHSPEC = "-2";
 
-    /**
-     * Generate code to convert C actions to Python action capsules. See
-     * pythontarget.h for details.
-     * @param pyObjects A string containing a list of comma-separated expressions that will create the
-     *  action capsules.
-     * @param action The action itself.
-     * @param decl The reactor decl that contains the action.
-     */
-    public static void generateActionVariableToSendToPythonReaction(List<String> pyObjects,
-        Action action, ReactorDecl decl) {
-        // Values passed to an action are always stored in the token->value.
-        // However, sometimes token might not be initialized. Therefore, this function has an internal check for NULL in case token is not initialized.
-        pyObjects.add(String.format("convert_C_action_to_py(%s)", action.getName()));
-    }
+  /**
+   * Generate code to convert C actions to Python action capsules. See pythontarget.h for details.
+   *
+   * @param pyObjects A string containing a list of comma-separated expressions that will create the
+   *     action capsules.
+   * @param action The action itself.
+   * @param decl The reactor decl that contains the action.
+   */
+  public static void generateActionVariableToSendToPythonReaction(
+      List<String> pyObjects, Action action, ReactorDecl decl) {
+    // Values passed to an action are always stored in the token->value.
+    // However, sometimes token might not be initialized. Therefore, this function has an internal
+    // check for NULL in case token is not initialized.
+    pyObjects.add(String.format("convert_C_action_to_py(%s)", action.getName()));
+  }
 
-    /**
-     * Generate code to convert C ports to Python ports capsules (@see pythontarget.h).
-     *
-     * The port may be an input of the reactor or an output of a contained reactor.
-     * @param pyObjects A string containing a list of comma-separated expressions that will create the
-     *  port capsules.
-     * @param port The port itself.
-     * @param decl The reactor decl that contains the port.
-     */
-    public static String generatePortVariablesToSendToPythonReaction(
-        List<String> pyObjects,
-        VarRef port,
-        ReactorDecl decl
-    ) {
-        if (port.getVariable() instanceof Input) {
-            generateInputVariablesToSendToPythonReaction(pyObjects, (Input) port.getVariable(), decl);
-            return "";
-        } else {
-            // port is an output of a contained reactor.
-            return generateVariablesForSendingToContainedReactors(pyObjects, port.getContainer(), (Port) port.getVariable());
-        }
+  /**
+   * Generate code to convert C ports to Python ports capsules (@see pythontarget.h).
+   *
+   * <p>The port may be an input of the reactor or an output of a contained reactor.
+   *
+   * @param pyObjects A string containing a list of comma-separated expressions that will create the
+   *     port capsules.
+   * @param port The port itself.
+   * @param decl The reactor decl that contains the port.
+   */
+  public static String generatePortVariablesToSendToPythonReaction(
+      List<String> pyObjects, VarRef port, ReactorDecl decl) {
+    if (port.getVariable() instanceof Input) {
+      generateInputVariablesToSendToPythonReaction(pyObjects, (Input) port.getVariable(), decl);
+      return "";
+    } else {
+      // port is an output of a contained reactor.
+      return generateVariablesForSendingToContainedReactors(
+          pyObjects, port.getContainer(), (Port) port.getVariable());
     }
+  }
 
-    /** Generate into the specified string builder the code to
-     *  send local variables for output ports to a Python reaction function
-     *  from the "self" struct.
-     *  @param output The output port.
-     */
-    public static void generateOutputVariablesToSendToPythonReaction(
-        List<String> pyObjects,
-        Output output
-    ) {
-        // Unfortunately, for the lf_set macros to work out-of-the-box for
-        // multiports, we need an array of <strong>pointers</strong> to the output structs,
-        // but what we have on the self struct is an array of output structs.
-        // So we have to handle multiports specially here a construct that
-        // array of pointers.
-        // FIXME: The C Generator also has this awkwardness. It makes the code generators
-        // unnecessarily difficult to maintain, and it may have performance consequences as well.
-        // Maybe we should change the lf_set macros.
-        if (!ASTUtils.isMultiport(output)) {
-            pyObjects.add(generateConvertCPortToPy(output.getName(), NONMULTIPORT_WIDTHSPEC));
-        } else {
-            pyObjects.add(generateConvertCPortToPy(output.getName()));
-        }
+  /**
+   * Generate into the specified string builder the code to send local variables for output ports to
+   * a Python reaction function from the "self" struct.
+   *
+   * @param output The output port.
+   */
+  public static void generateOutputVariablesToSendToPythonReaction(
+      List<String> pyObjects, Output output) {
+    // Unfortunately, for the lf_set macros to work out-of-the-box for
+    // multiports, we need an array of <strong>pointers</strong> to the output structs,
+    // but what we have on the self struct is an array of output structs.
+    // So we have to handle multiports specially here a construct that
+    // array of pointers.
+    // FIXME: The C Generator also has this awkwardness. It makes the code generators
+    // unnecessarily difficult to maintain, and it may have performance consequences as well.
+    // Maybe we should change the lf_set macros.
+    if (!ASTUtils.isMultiport(output)) {
+      pyObjects.add(generateConvertCPortToPy(output.getName(), NONMULTIPORT_WIDTHSPEC));
+    } else {
+      pyObjects.add(generateConvertCPortToPy(output.getName()));
     }
+  }
 
-    /** Generate into the specified string builder the code to
-     *  send local variables for input ports to a Python reaction function
-     *  from the "self" struct.
-     *  @param input The input port.
-     */
-    public static void generateInputVariablesToSendToPythonReaction(
-        List<String> pyObjects,
-        Input input,
-        ReactorDecl decl
-    ) {
-        // Create the local variable whose name matches the input.getName().
-        // If the input has not been declared mutable, then this is a pointer
-        // to the upstream output. Otherwise, it is a copy of the upstream output,
-        // which nevertheless points to the same token and value. There are 8 cases,
-        // depending on whether the input is mutable, whether it is a multiport,
-        // and whether it is a token type.
-        // Easy case first.
-        if (!input.isMutable() && !ASTUtils.isMultiport(input)) {
-            // Non-mutable, non-multiport, primitive type.
-            pyObjects.add(generateConvertCPortToPy(input.getName()));
-        } else if (input.isMutable() && !ASTUtils.isMultiport(input)) {
-            // Mutable, non-multiport, primitive type.
-            // TODO: handle mutable
-            pyObjects.add(generateConvertCPortToPy(input.getName()));
-        } else if (!input.isMutable() && ASTUtils.isMultiport(input)) {
-            // Non-mutable, multiport, primitive.
-            // TODO: support multiports
-            pyObjects.add(generateConvertCPortToPy(input.getName()));
-        } else {
-            // Mutable, multiport, primitive type
-            // TODO: support mutable multiports
-            pyObjects.add(generateConvertCPortToPy(input.getName()));
-        }
+  /**
+   * Generate into the specified string builder the code to send local variables for input ports to
+   * a Python reaction function from the "self" struct.
+   *
+   * @param input The input port.
+   */
+  public static void generateInputVariablesToSendToPythonReaction(
+      List<String> pyObjects, Input input, ReactorDecl decl) {
+    // Create the local variable whose name matches the input.getName().
+    // If the input has not been declared mutable, then this is a pointer
+    // to the upstream output. Otherwise, it is a copy of the upstream output,
+    // which nevertheless points to the same token and value. There are 8 cases,
+    // depending on whether the input is mutable, whether it is a multiport,
+    // and whether it is a token type.
+    // Easy case first.
+    if (!input.isMutable() && !ASTUtils.isMultiport(input)) {
+      // Non-mutable, non-multiport, primitive type.
+      pyObjects.add(generateConvertCPortToPy(input.getName()));
+    } else if (input.isMutable() && !ASTUtils.isMultiport(input)) {
+      // Mutable, non-multiport, primitive type.
+      // TODO: handle mutable
+      pyObjects.add(generateConvertCPortToPy(input.getName()));
+    } else if (!input.isMutable() && ASTUtils.isMultiport(input)) {
+      // Non-mutable, multiport, primitive.
+      // TODO: support multiports
+      pyObjects.add(generateConvertCPortToPy(input.getName()));
+    } else {
+      // Mutable, multiport, primitive type
+      // TODO: support mutable multiports
+      pyObjects.add(generateConvertCPortToPy(input.getName()));
     }
+  }
 
-    /** Generate into the specified string builder the code to
-     *  pass local variables for sending data to an input
-     *  of a contained reaction (e.g. for a deadline violation).
-     *  @param definition AST node defining the reactor within which this occurs
-     *  @param port Input of the contained reactor.
-     */
-    public static String generateVariablesForSendingToContainedReactors(
-        List<String> pyObjects,
-        Instantiation definition,
-        Port port
-    ) {
-        CodeBuilder code = new CodeBuilder();
-        if (definition.getWidthSpec() != null) {
-            String widthSpec = NONMULTIPORT_WIDTHSPEC;
-            if (ASTUtils.isMultiport(port)) {
-                widthSpec = "self->_lf_"+definition.getName()+"[i]."+generateWidthVariable(port.getName());
-            }
-            // Contained reactor is a bank.
-            // Create a Python list
-            code.pr(generatePythonListForContainedBank(definition.getName(), port, widthSpec));
-            pyObjects.add(definition.getName()+"_py_list");
-        }
-        else {
-            if (ASTUtils.isMultiport(port)) {
-                pyObjects.add(generateConvertCPortToPy(definition.getName()+"."+port.getName()));
-            } else {
-                pyObjects.add(generateConvertCPortToPy(definition.getName()+"."+port.getName(), NONMULTIPORT_WIDTHSPEC));
-            }
-        }
-        return code.toString();
+  /**
+   * Generate into the specified string builder the code to pass local variables for sending data to
+   * an input of a contained reaction (e.g. for a deadline violation).
+   *
+   * @param definition AST node defining the reactor within which this occurs
+   * @param port Input of the contained reactor.
+   */
+  public static String generateVariablesForSendingToContainedReactors(
+      List<String> pyObjects, Instantiation definition, Port port) {
+    CodeBuilder code = new CodeBuilder();
+    if (definition.getWidthSpec() != null) {
+      String widthSpec = NONMULTIPORT_WIDTHSPEC;
+      if (ASTUtils.isMultiport(port)) {
+        widthSpec =
+            "self->_lf_" + definition.getName() + "[i]." + generateWidthVariable(port.getName());
+      }
+      // Contained reactor is a bank.
+      // Create a Python list
+      code.pr(generatePythonListForContainedBank(definition.getName(), port, widthSpec));
+      pyObjects.add(definition.getName() + "_py_list");
+    } else {
+      if (ASTUtils.isMultiport(port)) {
+        pyObjects.add(generateConvertCPortToPy(definition.getName() + "." + port.getName()));
+      } else {
+        pyObjects.add(
+            generateConvertCPortToPy(
+                definition.getName() + "." + port.getName(), NONMULTIPORT_WIDTHSPEC));
+      }
     }
+    return code.toString();
+  }
 
+  /**
+   * Generate code that creates a Python list (i.e., []) for contained banks to be passed to Python reactions.
+   * The Python reaction will then subsequently be able to address each individual bank member of the contained
+   * bank using an index or an iterator. Each list member will contain the given <code>port<code>
+   * (which could be a multiport with a width determined by <code>widthSpec<code>).
+   *
+   * This is to accommodate reactions like <code>reaction() -> s.out<code> where s is a bank. In this example,
+   * the generated Python function will have the signature <code>reaction_function_0(self, s_out)<code>, where
+   * s_out is a list of out ports. This will later be turned into the proper <code>s.out<code> format using the
+   * Python code generated in {@link #generatePythonPortVariableInReaction}.
+   *
+   * @param reactorName The name of the bank of reactors (which is the name of the reactor class).
+   * @param port The port that should be put in the Python list.
+   * @param widthSpec A string that should be -2 for non-multiports and the width expression for multiports.
+   */
+  public static String generatePythonListForContainedBank(
+      String reactorName, Port port, String widthSpec) {
+    return String.join(
+        "\n",
+        "PyObject* "
+            + reactorName
+            + "_py_list = PyList_New("
+            + generateWidthVariable(reactorName)
+            + ");",
+        "if(" + reactorName + "_py_list == NULL) {",
+        "    lf_print_error(\"Could not create the list needed for " + reactorName + ".\");",
+        "    if (PyErr_Occurred()) {",
+        "        PyErr_PrintEx(0);",
+        "        PyErr_Clear(); // this will reset the error indicator so we can run Python code"
+            + " again",
+        "    }",
+        "    /* Release the thread. No Python API allowed beyond this point. */",
+        "    PyGILState_Release(gstate);",
+        "    Py_FinalizeEx();",
+        "    exit(1);",
+        "}",
+        "for (int i = 0; i < " + generateWidthVariable(reactorName) + "; i++) {",
+        "    if (PyList_SetItem(" + reactorName + "_py_list,",
+        "            i,",
+        "            " + generateConvertCPortToPy(reactorName + "[i]." + port.getName(), widthSpec),
+        "        ) != 0) {",
+        "        lf_print_error(\"Could not add elements to the list for " + reactorName + ".\");",
+        "        if (PyErr_Occurred()) {",
+        "            PyErr_PrintEx(0);",
+        "            PyErr_Clear(); // this will reset the error indicator so we can run Python"
+            + " code again",
+        "        }",
+        "        /* Release the thread. No Python API allowed beyond this point. */",
+        "        PyGILState_Release(gstate);",
+        "        Py_FinalizeEx();",
+        "        exit(1);",
+        "    }",
+        "}");
+  }
 
-    /**
-     * Generate code that creates a Python list (i.e., []) for contained banks to be passed to Python reactions.
-     * The Python reaction will then subsequently be able to address each individual bank member of the contained
-     * bank using an index or an iterator. Each list member will contain the given <code>port<code>
-     * (which could be a multiport with a width determined by <code>widthSpec<code>).
-     *
-     * This is to accommodate reactions like <code>reaction() -> s.out<code> where s is a bank. In this example,
-     * the generated Python function will have the signature <code>reaction_function_0(self, s_out)<code>, where
-     * s_out is a list of out ports. This will later be turned into the proper <code>s.out<code> format using the
-     * Python code generated in {@link #generatePythonPortVariableInReaction}.
-     *
-     * @param reactorName The name of the bank of reactors (which is the name of the reactor class).
-     * @param port The port that should be put in the Python list.
-     * @param widthSpec A string that should be -2 for non-multiports and the width expression for multiports.
-     */
-    public static String generatePythonListForContainedBank(String reactorName, Port port, String widthSpec) {
-        return String.join("\n",
-            "PyObject* "+reactorName+"_py_list = PyList_New("+generateWidthVariable(reactorName)+");",
-            "if("+reactorName+"_py_list == NULL) {",
-            "    lf_print_error(\"Could not create the list needed for "+reactorName+".\");",
-            "    if (PyErr_Occurred()) {",
-            "        PyErr_PrintEx(0);",
-            "        PyErr_Clear(); // this will reset the error indicator so we can run Python code again",
-            "    }",
-            "    /* Release the thread. No Python API allowed beyond this point. */",
-            "    PyGILState_Release(gstate);",
-            "    Py_FinalizeEx();",
-            "    exit(1);",
-            "}",
-            "for (int i = 0; i < "+generateWidthVariable(reactorName)+"; i++) {",
-            "    if (PyList_SetItem("+reactorName+"_py_list,",
-            "            i,",
-            "            "+generateConvertCPortToPy(reactorName + "[i]." + port.getName(), widthSpec),
-            "        ) != 0) {",
-            "        lf_print_error(\"Could not add elements to the list for "+reactorName+".\");",
-            "        if (PyErr_Occurred()) {",
-            "            PyErr_PrintEx(0);",
-            "            PyErr_Clear(); // this will reset the error indicator so we can run Python code again",
-            "        }",
-            "        /* Release the thread. No Python API allowed beyond this point. */",
-            "        PyGILState_Release(gstate);",
-            "        Py_FinalizeEx();",
-            "        exit(1);",
-            "    }",
-            "}"
-        );
-    }
+  public static String generateAliasTypeDef(
+      TypeParameterizedReactor tpr, Port port, boolean isTokenType, String genericPortType) {
+    return "typedef "
+        + genericPortType
+        + " "
+        + CGenerator.variableStructType(port, tpr, false)
+        + ";";
+  }
 
-    public static String generateAliasTypeDef(TypeParameterizedReactor tpr, Port port, boolean isTokenType, String genericPortType) {
-        return "typedef "+genericPortType+" "+CGenerator.variableStructType(port, tpr, false)+";";
-    }
-
-    private static String generateConvertCPortToPy(String port) {
-        return String.format("convert_C_port_to_py(%s, %s)", port, generateWidthVariable(port));
-    }
+  private static String generateConvertCPortToPy(String port) {
+    return String.format("convert_C_port_to_py(%s, %s)", port, generateWidthVariable(port));
+  }
 
-    private static String generateConvertCPortToPy(String port, String widthSpec) {
-        return String.format("convert_C_port_to_py(%s, %s)", port, widthSpec);
-    }
+  private static String generateConvertCPortToPy(String port, String widthSpec) {
+    return String.format("convert_C_port_to_py(%s, %s)", port, widthSpec);
+  }
 
-    /**
-     * Generate into the specified string builder (<code>inits<code>) the code to
-     * initialize local variable for <code>port<code> so that it can be used in the body of
-     * the Python reaction.
-     * @param port The port to generate code for.
-     */
-    public static String generatePythonPortVariableInReaction(VarRef port) {
-        String containerName = port.getContainer().getName();
-        String variableName = port.getVariable().getName();
-        String tryStatement = "try: "+containerName+"  # pylint: disable=used-before-assignment";
-        if (port.getContainer().getWidthSpec() != null) {
-            // It's a bank
-            return String.join("\n",
-                tryStatement,
-                "except NameError: "+containerName+" = [None] * len("+containerName+"_"+variableName+")",
-                "for i in range(len("+containerName+"_"+variableName+")):",
-                "    if "+containerName+"[i] is None: "+containerName+"[i] = Make()",
-                "    "+containerName+"[i]."+variableName+" = "+containerName+"_"+variableName+"[i]"
-            );
-        } else {
-            return String.join("\n",
-                tryStatement,
-                "except NameError: "+containerName+" = Make()",
-                containerName+"."+variableName+" = "+containerName+"_"+variableName
-            );
-        }
+  /**
+   * Generate into the specified string builder (<code>inits<code>) the code to
+   * initialize local variable for <code>port<code> so that it can be used in the body of
+   * the Python reaction.
+   * @param port The port to generate code for.
+   */
+  public static String generatePythonPortVariableInReaction(VarRef port) {
+    String containerName = port.getContainer().getName();
+    String variableName = port.getVariable().getName();
+    String tryStatement = "try: " + containerName + "  # pylint: disable=used-before-assignment";
+    if (port.getContainer().getWidthSpec() != null) {
+      // It's a bank
+      return String.join(
+          "\n",
+          tryStatement,
+          "except NameError: "
+              + containerName
+              + " = [None] * len("
+              + containerName
+              + "_"
+              + variableName
+              + ")",
+          "for i in range(len(" + containerName + "_" + variableName + ")):",
+          "    if " + containerName + "[i] is None: " + containerName + "[i] = Make()",
+          "    "
+              + containerName
+              + "[i]."
+              + variableName
+              + " = "
+              + containerName
+              + "_"
+              + variableName
+              + "[i]");
+    } else {
+      return String.join(
+          "\n",
+          tryStatement,
+          "except NameError: " + containerName + " = Make()",
+          containerName + "." + variableName + " = " + containerName + "_" + variableName);
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonPreambleGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonPreambleGenerator.java
index b69320f6af..bd1291425f 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonPreambleGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonPreambleGenerator.java
@@ -3,60 +3,53 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import org.lflang.ast.ASTUtils;
 import org.lflang.TargetConfig;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.c.CPreambleGenerator;
 import org.lflang.lf.Preamble;
 
-
 /**
- * Generates user-defined preambles and #define and #include directives
- * for the Python target.
+ * Generates user-defined preambles and #define and #include directives for the Python target.
  *
  * @author Edward A. Lee
  * @author Soroush Bateni
  * @author Hou Seng Wong
  */
 public class PythonPreambleGenerator {
-    /**
-     * Generates preambles defined by user for a given reactor.
-     * The preamble code is put inside the reactor class.
-     */
-    public static String generatePythonPreambles(List<Preamble> preambles) {
-        List<String> preamblesCode = new ArrayList<>();
-        preambles.forEach(p -> preamblesCode.add(ASTUtils.toText(p.getCode())));
-        return preamblesCode.size() > 0 ? String.join("\n",
+  /**
+   * Generates preambles defined by user for a given reactor. The preamble code is put inside the
+   * reactor class.
+   */
+  public static String generatePythonPreambles(List<Preamble> preambles) {
+    List<String> preamblesCode = new ArrayList<>();
+    preambles.forEach(p -> preamblesCode.add(ASTUtils.toText(p.getCode())));
+    return preamblesCode.size() > 0
+        ? String.join(
+            "\n",
             "# From the preamble, verbatim:",
             String.join("\n", preamblesCode),
-            "# End of preamble."
-        ) : "";
-    }
+            "# End of preamble.")
+        : "";
+  }
 
-    public static String generateCDefineDirectives(
-        TargetConfig targetConfig,
-        Path srcGenPath,
-        boolean hasModalReactors
-    ) {
-        // TODO: Delete all of this. It is not used.
-        CodeBuilder code = new CodeBuilder();
-        code.pr(CPreambleGenerator.generateDefineDirectives(
-            targetConfig, srcGenPath, hasModalReactors)
-        );
-        return code.toString();
-    }
+  public static String generateCDefineDirectives(
+      TargetConfig targetConfig, Path srcGenPath, boolean hasModalReactors) {
+    // TODO: Delete all of this. It is not used.
+    CodeBuilder code = new CodeBuilder();
+    code.pr(
+        CPreambleGenerator.generateDefineDirectives(targetConfig, srcGenPath, hasModalReactors));
+    return code.toString();
+  }
 
-    public static String generateCIncludeStatements(
-        TargetConfig targetConfig,
-        boolean CCppMode,
-        boolean hasModalReactors
-    ) {
-        CodeBuilder code = new CodeBuilder();
-        code.pr(CPreambleGenerator.generateIncludeStatements(targetConfig, CCppMode));
-        code.pr("#include \"pythontarget.h\"");
-        if (hasModalReactors) {
-            code.pr("#include \"include/modal_models/definitions.h\"");
-        }
-        return code.toString();
+  public static String generateCIncludeStatements(
+      TargetConfig targetConfig, boolean CCppMode, boolean hasModalReactors) {
+    CodeBuilder code = new CodeBuilder();
+    code.pr(CPreambleGenerator.generateIncludeStatements(targetConfig, CCppMode));
+    code.pr("#include \"pythontarget.h\"");
+    if (hasModalReactors) {
+      code.pr("#include \"include/modal_models/definitions.h\"");
     }
+    return code.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonReactionGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonReactionGenerator.java
index 3d307b6b52..87f594a71a 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonReactionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonReactionGenerator.java
@@ -4,560 +4,632 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.AttributeUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.Target;
-
+import org.lflang.ast.ASTUtils;
+import org.lflang.generator.CodeBuilder;
+import org.lflang.generator.ReactionInstance;
+import org.lflang.generator.ReactorInstance;
+import org.lflang.generator.c.CCoreFilesUtils;
 import org.lflang.generator.c.CReactionGenerator;
+import org.lflang.generator.c.CTypes;
+import org.lflang.generator.c.CUtil;
 import org.lflang.generator.c.TypeParameterizedReactor;
-import org.lflang.lf.ReactorDecl;
-import org.lflang.lf.Reaction;
-import org.lflang.lf.Reactor;
 import org.lflang.lf.Action;
 import org.lflang.lf.Code;
+import org.lflang.lf.Input;
+import org.lflang.lf.Instantiation;
+import org.lflang.lf.Mode;
+import org.lflang.lf.Output;
+import org.lflang.lf.Port;
+import org.lflang.lf.Reaction;
+import org.lflang.lf.Reactor;
+import org.lflang.lf.ReactorDecl;
 import org.lflang.lf.TriggerRef;
 import org.lflang.lf.VarRef;
 import org.lflang.util.StringUtil;
-import org.lflang.lf.Instantiation;
-import org.lflang.lf.Port;
-import org.lflang.lf.Input;
-import org.lflang.lf.Output;
-import org.lflang.generator.c.CCoreFilesUtils;
-import org.lflang.generator.c.CTypes;
-import org.lflang.generator.c.CUtil;
-import org.lflang.generator.CodeBuilder;
-import org.lflang.generator.ReactionInstance;
-import org.lflang.generator.ReactorInstance;
-import org.lflang.lf.Mode;
 
 public class PythonReactionGenerator {
-    /**
-     * Generate code to call reaction numbered "reactionIndex" in reactor "reactor".
-     * @param reactor The reactor containing the reaction
-     * @param reactionIndex The index of the reaction
-     * @param pyObjects CPython related objects
-     */
-    public static String generateCPythonReactionCaller(TypeParameterizedReactor reactor,
-                                                        int reactionIndex,
-                                                        List<String> pyObjects,
-                                                        String inits) {
-        String pythonFunctionName = generatePythonReactionFunctionName(reactionIndex);
-        String cpythonFunctionName = generateCPythonReactionFunctionName(reactionIndex);
-        return generateCPythonFunctionCaller(CUtil.getName(reactor), pythonFunctionName, cpythonFunctionName, pyObjects, inits);
-    }
-
-    /**
-     * Generate code to call deadline function numbered "reactionIndex" in reactor "r".
-     * @param r The reactor containing the reaction
-     * @param reactionIndex The index of the reaction
-     * @param pyObjects CPython related objects
-     */
-    public static String generateCPythonDeadlineCaller(TypeParameterizedReactor r,
-                                                       int reactionIndex,
-                                                       List<String> pyObjects) {
-        String pythonFunctionName = generatePythonDeadlineFunctionName(reactionIndex);
-        String cpythonFunctionName = generateCPythonDeadlineFunctionName(reactionIndex);
-        return generateCPythonFunctionCaller(CUtil.getName(r), pythonFunctionName, cpythonFunctionName, pyObjects, "");
-    }
-
-    /**
-     * Generate code to call deadline function numbered "reactionIndex" in reactor "r".
-     * @param r The reactor containing the reaction
-     * @param reactionIndex The index of the reaction
-     * @param pyObjects CPython related objects
-     */
-    public static String generateCPythonSTPCaller(TypeParameterizedReactor r,
-                                                       int reactionIndex,
-                                                       List<String> pyObjects) {
-        String pythonFunctionName = generatePythonSTPFunctionName(reactionIndex);
-        String cpythonFunctionName = generateCPythonSTPFunctionName(reactionIndex);
-        return generateCPythonFunctionCaller(CUtil.getName(r), pythonFunctionName, cpythonFunctionName, pyObjects, "");
+  /**
+   * Generate code to call reaction numbered "reactionIndex" in reactor "reactor".
+   *
+   * @param reactor The reactor containing the reaction
+   * @param reactionIndex The index of the reaction
+   * @param pyObjects CPython related objects
+   */
+  public static String generateCPythonReactionCaller(
+      TypeParameterizedReactor reactor, int reactionIndex, List<String> pyObjects, String inits) {
+    String pythonFunctionName = generatePythonReactionFunctionName(reactionIndex);
+    String cpythonFunctionName = generateCPythonReactionFunctionName(reactionIndex);
+    return generateCPythonFunctionCaller(
+        CUtil.getName(reactor), pythonFunctionName, cpythonFunctionName, pyObjects, inits);
+  }
+
+  /**
+   * Generate code to call deadline function numbered "reactionIndex" in reactor "r".
+   *
+   * @param r The reactor containing the reaction
+   * @param reactionIndex The index of the reaction
+   * @param pyObjects CPython related objects
+   */
+  public static String generateCPythonDeadlineCaller(
+      TypeParameterizedReactor r, int reactionIndex, List<String> pyObjects) {
+    String pythonFunctionName = generatePythonDeadlineFunctionName(reactionIndex);
+    String cpythonFunctionName = generateCPythonDeadlineFunctionName(reactionIndex);
+    return generateCPythonFunctionCaller(
+        CUtil.getName(r), pythonFunctionName, cpythonFunctionName, pyObjects, "");
+  }
+
+  /**
+   * Generate code to call deadline function numbered "reactionIndex" in reactor "r".
+   *
+   * @param r The reactor containing the reaction
+   * @param reactionIndex The index of the reaction
+   * @param pyObjects CPython related objects
+   */
+  public static String generateCPythonSTPCaller(
+      TypeParameterizedReactor r, int reactionIndex, List<String> pyObjects) {
+    String pythonFunctionName = generatePythonSTPFunctionName(reactionIndex);
+    String cpythonFunctionName = generateCPythonSTPFunctionName(reactionIndex);
+    return generateCPythonFunctionCaller(
+        CUtil.getName(r), pythonFunctionName, cpythonFunctionName, pyObjects, "");
+  }
+
+  /**
+   * Generate code to call a CPython function.
+   *
+   * @param reactorDeclName The name of the reactor for debugging purposes
+   * @param pythonFunctionName The name of the function in the .py file.
+   * @param cpythonFunctionName The name of the function in self struct of the .c file.
+   * @param pyObjects CPython related objects
+   */
+  private static String generateCPythonFunctionCaller(
+      String reactorDeclName,
+      String pythonFunctionName,
+      String cpythonFunctionName,
+      List<String> pyObjects,
+      String inits) {
+    String pyObjectsJoined = pyObjects.size() > 0 ? ", " + String.join(", ", pyObjects) : "";
+    CodeBuilder code = new CodeBuilder();
+    code.pr(PyUtil.generateGILAcquireCode());
+    code.pr(inits);
+    code.pr(
+        String.join(
+            "\n",
+            "LF_PRINT_DEBUG(\"Calling reaction function "
+                + reactorDeclName
+                + "."
+                + pythonFunctionName
+                + "\");",
+            "PyObject *rValue = PyObject_CallObject(",
+            "    self->" + cpythonFunctionName + ", ",
+            "    Py_BuildValue(\"(" + "O".repeat(pyObjects.size()) + ")\"" + pyObjectsJoined + ")",
+            ");",
+            "if (rValue == NULL) {",
+            "    lf_print_error(\"FATAL: Calling reaction "
+                + reactorDeclName
+                + "."
+                + pythonFunctionName
+                + " failed.\");",
+            "    if (PyErr_Occurred()) {",
+            "        PyErr_PrintEx(0);",
+            "        PyErr_Clear(); // this will reset the error indicator so we can run Python"
+                + " code again",
+            "    }",
+            "    " + PyUtil.generateGILReleaseCode(),
+            "    Py_FinalizeEx();",
+            "    exit(1);",
+            "}",
+            "",
+            "/* Release the thread. No Python API allowed beyond this point. */",
+            PyUtil.generateGILReleaseCode()));
+    return code.toString();
+  }
+
+  /**
+   * Generate the reaction in the .c file, which calls the Python reaction through the CPython interface.
+   *
+   * @param reaction The reaction to generate Python-specific initialization for.
+   * @param r The reactor to which <code>reaction<code> belongs to.
+   * @param reactionIndex The index number of the reaction in decl.
+   * @param mainDef The main reactor.
+   * @param errorReporter An error reporter.
+   * @param types A helper class for type-related stuff.
+   */
+  public static String generateCReaction(
+      Reaction reaction,
+      TypeParameterizedReactor tpr,
+      Reactor r,
+      int reactionIndex,
+      Instantiation mainDef,
+      ErrorReporter errorReporter,
+      CTypes types) {
+    // Contains the actual comma separated list of inputs to the reaction of type
+    // generic_port_instance_struct.
+    // Each input must be cast to (PyObject *) (aka their descriptors for Py_BuildValue are "O")
+    List<String> pyObjects = new ArrayList<>();
+    CodeBuilder code = new CodeBuilder();
+    String cPyInit = generateCPythonInitializers(reaction, r, pyObjects, errorReporter);
+    String cInit =
+        CReactionGenerator.generateInitializationForReaction(
+            "",
+            reaction,
+            tpr,
+            reactionIndex,
+            types,
+            errorReporter,
+            mainDef,
+            Target.Python.requiresTypes);
+    code.pr("#include " + StringUtil.addDoubleQuotes(CCoreFilesUtils.getCTargetSetHeader()));
+    code.pr(
+        generateFunction(
+            CReactionGenerator.generateReactionFunctionHeader(tpr, reactionIndex),
+            cInit,
+            reaction.getCode(),
+            generateCPythonReactionCaller(tpr, reactionIndex, pyObjects, cPyInit)));
+
+    // Generate code for the STP violation handler, if there is one.
+    if (reaction.getStp() != null) {
+      code.pr(
+          generateFunction(
+              CReactionGenerator.generateStpFunctionHeader(tpr, reactionIndex),
+              cInit,
+              reaction.getStp().getCode(),
+              generateCPythonSTPCaller(tpr, reactionIndex, pyObjects)));
     }
-
-    /**
-     * Generate code to call a CPython function.
-     * @param reactorDeclName The name of the reactor for debugging purposes
-     * @param pythonFunctionName The name of the function in the .py file.
-     * @param cpythonFunctionName The name of the function in self struct of the .c file.
-     * @param pyObjects CPython related objects
-     */
-    private static String generateCPythonFunctionCaller(String reactorDeclName,
-                                                        String pythonFunctionName,
-                                                        String cpythonFunctionName,
-                                                        List<String> pyObjects,
-                                                        String inits) {
-        String pyObjectsJoined = pyObjects.size() > 0 ? ", " + String.join(", ", pyObjects) : "";
-        CodeBuilder code = new CodeBuilder();
-        code.pr(PyUtil.generateGILAcquireCode());
-        code.pr(inits);
-        code.pr(String.join("\n",
-                "LF_PRINT_DEBUG(\"Calling reaction function "+reactorDeclName+"."+pythonFunctionName+"\");",
-                "PyObject *rValue = PyObject_CallObject(",
-                "    self->"+cpythonFunctionName+", ",
-                "    Py_BuildValue(\"("+"O".repeat(pyObjects.size())+")\""+pyObjectsJoined+")",
-                ");",
-                "if (rValue == NULL) {",
-                "    lf_print_error(\"FATAL: Calling reaction "+reactorDeclName+"."+pythonFunctionName+" failed.\");",
-                "    if (PyErr_Occurred()) {",
-                "        PyErr_PrintEx(0);",
-                "        PyErr_Clear(); // this will reset the error indicator so we can run Python code again",
-                "    }",
-                "    "+PyUtil.generateGILReleaseCode(),
-                "    Py_FinalizeEx();",
-                "    exit(1);",
-                "}",
-                "",
-                "/* Release the thread. No Python API allowed beyond this point. */",
-                PyUtil.generateGILReleaseCode()
-        ));
-        return code.toString();
+    // Generate code for the deadline violation function, if there is one.
+    if (reaction.getDeadline() != null) {
+      code.pr(
+          generateFunction(
+              CReactionGenerator.generateDeadlineFunctionHeader(tpr, reactionIndex),
+              cInit,
+              reaction.getDeadline().getCode(),
+              generateCPythonDeadlineCaller(tpr, reactionIndex, pyObjects)));
     }
-
-    /**
-     * Generate the reaction in the .c file, which calls the Python reaction through the CPython interface.
-     *
-     * @param reaction The reaction to generate Python-specific initialization for.
-     * @param r The reactor to which <code>reaction<code> belongs to.
-     * @param reactionIndex The index number of the reaction in decl.
-     * @param mainDef The main reactor.
-     * @param errorReporter An error reporter.
-     * @param types A helper class for type-related stuff.
-     */
-    public static String generateCReaction(
-        Reaction reaction,
-        TypeParameterizedReactor tpr,
-        Reactor r,
-        int reactionIndex,
-        Instantiation mainDef,
-        ErrorReporter errorReporter,
-        CTypes types
-    ) {
-        // Contains the actual comma separated list of inputs to the reaction of type generic_port_instance_struct.
-        // Each input must be cast to (PyObject *) (aka their descriptors for Py_BuildValue are "O")
-        List<String> pyObjects = new ArrayList<>();
-        CodeBuilder code = new CodeBuilder();
-        String cPyInit = generateCPythonInitializers(reaction, r, pyObjects, errorReporter);
-        String cInit = CReactionGenerator.generateInitializationForReaction(
-                                                "", reaction, tpr, reactionIndex,
-                                                types, errorReporter, mainDef,
-                                                Target.Python.requiresTypes);
+    code.pr("#include " + StringUtil.addDoubleQuotes(CCoreFilesUtils.getCTargetSetUndefHeader()));
+    return code.toString();
+  }
+
+  public static String generateFunction(String header, String init, Code code, String pyCaller) {
+    var function = new CodeBuilder();
+    function.pr(header + "{");
+    function.indent();
+    function.pr(init);
+    function.prSourceLineNumber(code);
+    function.pr(pyCaller);
+    function.unindent();
+    function.pr("}");
+    return function.toString();
+  }
+
+  /**
+   * Generate necessary Python-specific initialization code for <code>reaction<code> that belongs to reactor
+   * <code>decl<code>.
+   *
+   * @param reaction The reaction to generate Python-specific initialization for.
+   * @param decl The reactor to which <code>reaction<code> belongs to.
+   * @param pyObjects A list of expressions that can be used as additional arguments to <code>Py_BuildValue<code>
+   *  (@see <a href="https://docs.python.org/3/c-api/arg.html#c.Py_BuildValue">docs.python.org/3/c-api</a>).
+   *  We will use as a format string, "(O...O)" where the number of O's is equal to the length of the list.
+   */
+  private static String generateCPythonInitializers(
+      Reaction reaction, ReactorDecl decl, List<String> pyObjects, ErrorReporter errorReporter) {
+    Set<Action> actionsAsTriggers = new LinkedHashSet<>();
+    Reactor reactor = ASTUtils.toDefinition(decl);
+    CodeBuilder code = new CodeBuilder();
+    // Next, add the triggers (input and actions; timers are not needed).
+    // TODO: handle triggers
+    for (TriggerRef trigger : ASTUtils.convertToEmptyListIfNull(reaction.getTriggers())) {
+      if (trigger instanceof VarRef triggerAsVarRef) {
         code.pr(
-            "#include " + StringUtil.addDoubleQuotes(
-                CCoreFilesUtils.getCTargetSetHeader()));
-        code.pr(generateFunction(
-                    CReactionGenerator.generateReactionFunctionHeader(tpr, reactionIndex),
-                    cInit, reaction.getCode(),
-                    generateCPythonReactionCaller(tpr, reactionIndex, pyObjects, cPyInit)
-        ));
-
-        // Generate code for the STP violation handler, if there is one.
-        if (reaction.getStp() != null) {
-            code.pr(generateFunction(
-                    CReactionGenerator.generateStpFunctionHeader(tpr, reactionIndex),
-                    cInit, reaction.getStp().getCode(),
-                    generateCPythonSTPCaller(tpr, reactionIndex, pyObjects)
-                ));
-        }
-        // Generate code for the deadline violation function, if there is one.
-        if (reaction.getDeadline() != null) {
-            code.pr(generateFunction(
-                CReactionGenerator.generateDeadlineFunctionHeader(tpr, reactionIndex),
-                cInit, reaction.getDeadline().getCode(),
-                generateCPythonDeadlineCaller(tpr, reactionIndex, pyObjects)
-            ));
-        }
-        code.pr(
-            "#include " + StringUtil.addDoubleQuotes(
-                CCoreFilesUtils.getCTargetSetUndefHeader()));
-        return code.toString();
+            generateVariableToSendPythonReaction(
+                triggerAsVarRef, actionsAsTriggers, decl, pyObjects));
+      }
     }
-
-    public static String generateFunction(
-        String header, String init, Code code, String pyCaller
-    ) {
-        var function = new CodeBuilder();
-        function.pr(header + "{");
-        function.indent();
-        function.pr(init);
-        function.prSourceLineNumber(code);
-        function.pr(pyCaller);
-        function.unindent();
-        function.pr("}");
-        return function.toString();
+    if (reaction.getTriggers() == null || reaction.getTriggers().size() == 0) {
+      // No triggers are given, which means react to any input.
+      // Declare an argument for every input.
+      // NOTE: this does not include contained outputs.
+      for (Input input : reactor.getInputs()) {
+        PythonPortGenerator.generateInputVariablesToSendToPythonReaction(pyObjects, input, decl);
+      }
     }
 
-    /**
-     * Generate necessary Python-specific initialization code for <code>reaction<code> that belongs to reactor
-     * <code>decl<code>.
-     *
-     * @param reaction The reaction to generate Python-specific initialization for.
-     * @param decl The reactor to which <code>reaction<code> belongs to.
-     * @param pyObjects A list of expressions that can be used as additional arguments to <code>Py_BuildValue<code>
-     *  (@see <a href="https://docs.python.org/3/c-api/arg.html#c.Py_BuildValue">docs.python.org/3/c-api</a>).
-     *  We will use as a format string, "(O...O)" where the number of O's is equal to the length of the list.
-     */
-    private static String generateCPythonInitializers(Reaction reaction,
-                                                      ReactorDecl decl,
-                                                      List<String> pyObjects,
-                                                      ErrorReporter errorReporter) {
-        Set<Action> actionsAsTriggers = new LinkedHashSet<>();
-        Reactor reactor = ASTUtils.toDefinition(decl);
-        CodeBuilder code = new CodeBuilder();
-        // Next, add the triggers (input and actions; timers are not needed).
-        // TODO: handle triggers
-        for (TriggerRef trigger : ASTUtils.convertToEmptyListIfNull(reaction.getTriggers())) {
-            if (trigger instanceof VarRef triggerAsVarRef) {
-                code.pr(generateVariableToSendPythonReaction(triggerAsVarRef, actionsAsTriggers, decl, pyObjects));
-            }
-        }
-        if (reaction.getTriggers() == null || reaction.getTriggers().size() == 0) {
-            // No triggers are given, which means react to any input.
-            // Declare an argument for every input.
-            // NOTE: this does not include contained outputs.
-            for (Input input : reactor.getInputs()) {
-                PythonPortGenerator.generateInputVariablesToSendToPythonReaction(pyObjects, input, decl);
-            }
-        }
-
-        // Next add non-triggering inputs.
-        for (VarRef src : ASTUtils.convertToEmptyListIfNull(reaction.getSources())) {
-            code.pr(generateVariableToSendPythonReaction(src, actionsAsTriggers, decl, pyObjects));
-        }
-
-        // Next, handle effects
-        if (reaction.getEffects() != null) {
-            for (VarRef effect : reaction.getEffects()) {
-                if (effect.getVariable() instanceof Action) {
-                    // It is an action, not an output.
-                    // If it has already appeared as trigger, do not redefine it.
-                    if (!actionsAsTriggers.contains(effect.getVariable())) {
-                        PythonPortGenerator.generateActionVariableToSendToPythonReaction(pyObjects,
-                            (Action) effect.getVariable(), decl);
-                    }
-                } else if (effect.getVariable() instanceof Mode) {
-                    String name = effect.getVariable().getName();
-                    pyObjects.add("convert_C_mode_to_py("+name+",(self_base_t*)self, _lf_"+name+"_change_type)");
-                } else {
-                    if (effect.getVariable() instanceof Output) {
-                        PythonPortGenerator.generateOutputVariablesToSendToPythonReaction(pyObjects, (Output) effect.getVariable());
-                    } else if (effect.getVariable() instanceof Input) {
-                        // It is the input of a contained reactor.
-                        code.pr(PythonPortGenerator.generateVariablesForSendingToContainedReactors(pyObjects, effect.getContainer(), (Input) effect.getVariable()));
-                    } else {
-                        errorReporter.reportError(
-                            reaction,
-                            "In generateReaction(): " + effect.getVariable().getName() + " is neither an input nor an output."
-                        );
-                    }
-                }
-            }
-        }
-        return code.toString();
+    // Next add non-triggering inputs.
+    for (VarRef src : ASTUtils.convertToEmptyListIfNull(reaction.getSources())) {
+      code.pr(generateVariableToSendPythonReaction(src, actionsAsTriggers, decl, pyObjects));
     }
 
-    /**
-     * Generate parameters and their respective initialization code for a reaction function
-     * The initialization code is put at the beginning of the reaction before user code
-     * @param parameters The parameters used for function definition
-     * @param inits The initialization code for those paramters
-     * @param decl Reactor declaration
-     * @param reaction The reaction to be used to generate parameters for
-     */
-    public static void generatePythonReactionParametersAndInitializations(List<String> parameters, CodeBuilder inits,
-                                                                          ReactorDecl decl, Reaction reaction) {
-        Reactor reactor = ASTUtils.toDefinition(decl);
-        LinkedHashSet<String> generatedParams = new LinkedHashSet<>();
-
-        // Handle triggers
-        for (TriggerRef trigger : ASTUtils.convertToEmptyListIfNull(reaction.getTriggers())) {
-            if (!(trigger instanceof VarRef triggerAsVarRef)) {
-                continue;
-            }
-            if (triggerAsVarRef.getVariable() instanceof Port) {
-                if (triggerAsVarRef.getVariable() instanceof Input) {
-                    if (((Input) triggerAsVarRef.getVariable()).isMutable()) {
-                        generatedParams.add("mutable_"+triggerAsVarRef.getVariable().getName());
-
-                        // Create a deep copy
-                        if (ASTUtils.isMultiport((Input) triggerAsVarRef.getVariable())) {
-                            inits.
-                                pr(triggerAsVarRef.getVariable().getName()+" = [Make() for i in range(len(mutable_"+triggerAsVarRef.getVariable().getName()+"))]");
-                            inits.pr("for i in range(len(mutable_"+triggerAsVarRef.getVariable().getName()+")):");
-                            inits.pr("    "+triggerAsVarRef.getVariable().getName()+"[i].value = copy.deepcopy(mutable_"+triggerAsVarRef.getVariable().getName()+"[i].value)");
-                        } else {
-                            inits.pr(triggerAsVarRef.getVariable().getName()+" = Make()");
-                            inits.
-                                pr(triggerAsVarRef.getVariable().getName()+".value = copy.deepcopy(mutable_"+triggerAsVarRef.getVariable().getName()+".value)");
-                        }
-                    } else {
-                        generatedParams.add(triggerAsVarRef.getVariable().getName());
-                    }
-                } else {
-                    // Handle contained reactors' ports
-                    generatedParams.add(triggerAsVarRef.getContainer().getName()+"_"+triggerAsVarRef.getVariable().getName());
-                    inits.pr(PythonPortGenerator.generatePythonPortVariableInReaction(triggerAsVarRef));
-                }
-            } else if (triggerAsVarRef.getVariable() instanceof Action) {
-                generatedParams.add(triggerAsVarRef.getVariable().getName());
-            }
-        }
-
-        // Handle non-triggering inputs
-        if (reaction.getTriggers() == null || reaction.getTriggers().size() == 0) {
-            for (Input input : ASTUtils.convertToEmptyListIfNull(reactor.getInputs())) {
-                generatedParams.add(input.getName());
-                if (input.isMutable()) {
-                    // Create a deep copy
-                    inits.pr(input.getName()+" = copy.deepcopy("+input.getName()+")");
-                }
-            }
-        }
-        for (VarRef src : ASTUtils.convertToEmptyListIfNull(reaction.getSources())) {
-            if (src.getVariable() instanceof Output) {
-                // Output of a contained reactor
-                generatedParams.add(src.getContainer().getName()+"_"+src.getVariable().getName());
-                inits.pr(PythonPortGenerator.generatePythonPortVariableInReaction(src));
-            } else {
-                generatedParams.add(src.getVariable().getName());
-                if (src.getVariable() instanceof Input) {
-                    if (((Input) src.getVariable()).isMutable()) {
-                        // Create a deep copy
-                        inits.pr(src.getVariable().getName()+" = copy.deepcopy("+src.getVariable().getName()+")");
-                    }
-                }
-            }
+    // Next, handle effects
+    if (reaction.getEffects() != null) {
+      for (VarRef effect : reaction.getEffects()) {
+        if (effect.getVariable() instanceof Action) {
+          // It is an action, not an output.
+          // If it has already appeared as trigger, do not redefine it.
+          if (!actionsAsTriggers.contains(effect.getVariable())) {
+            PythonPortGenerator.generateActionVariableToSendToPythonReaction(
+                pyObjects, (Action) effect.getVariable(), decl);
+          }
+        } else if (effect.getVariable() instanceof Mode) {
+          String name = effect.getVariable().getName();
+          pyObjects.add(
+              "convert_C_mode_to_py("
+                  + name
+                  + ",(self_base_t*)self, _lf_"
+                  + name
+                  + "_change_type)");
+        } else {
+          if (effect.getVariable() instanceof Output) {
+            PythonPortGenerator.generateOutputVariablesToSendToPythonReaction(
+                pyObjects, (Output) effect.getVariable());
+          } else if (effect.getVariable() instanceof Input) {
+            // It is the input of a contained reactor.
+            code.pr(
+                PythonPortGenerator.generateVariablesForSendingToContainedReactors(
+                    pyObjects, effect.getContainer(), (Input) effect.getVariable()));
+          } else {
+            errorReporter.reportError(
+                reaction,
+                "In generateReaction(): "
+                    + effect.getVariable().getName()
+                    + " is neither an input nor an output.");
+          }
         }
-
-        // Handle effects
-        for (VarRef effect : ASTUtils.convertToEmptyListIfNull(reaction.getEffects())) {
-            if (effect.getVariable() instanceof Input) {
-                generatedParams.add(effect.getContainer().getName()+"_"+effect.getVariable().getName());
-                inits.pr(PythonPortGenerator.generatePythonPortVariableInReaction(effect));
+      }
+    }
+    return code.toString();
+  }
+
+  /**
+   * Generate parameters and their respective initialization code for a reaction function The
+   * initialization code is put at the beginning of the reaction before user code
+   *
+   * @param parameters The parameters used for function definition
+   * @param inits The initialization code for those paramters
+   * @param decl Reactor declaration
+   * @param reaction The reaction to be used to generate parameters for
+   */
+  public static void generatePythonReactionParametersAndInitializations(
+      List<String> parameters, CodeBuilder inits, ReactorDecl decl, Reaction reaction) {
+    Reactor reactor = ASTUtils.toDefinition(decl);
+    LinkedHashSet<String> generatedParams = new LinkedHashSet<>();
+
+    // Handle triggers
+    for (TriggerRef trigger : ASTUtils.convertToEmptyListIfNull(reaction.getTriggers())) {
+      if (!(trigger instanceof VarRef triggerAsVarRef)) {
+        continue;
+      }
+      if (triggerAsVarRef.getVariable() instanceof Port) {
+        if (triggerAsVarRef.getVariable() instanceof Input) {
+          if (((Input) triggerAsVarRef.getVariable()).isMutable()) {
+            generatedParams.add("mutable_" + triggerAsVarRef.getVariable().getName());
+
+            // Create a deep copy
+            if (ASTUtils.isMultiport((Input) triggerAsVarRef.getVariable())) {
+              inits.pr(
+                  triggerAsVarRef.getVariable().getName()
+                      + " = [Make() for i in range(len(mutable_"
+                      + triggerAsVarRef.getVariable().getName()
+                      + "))]");
+              inits.pr(
+                  "for i in range(len(mutable_" + triggerAsVarRef.getVariable().getName() + ")):");
+              inits.pr(
+                  "    "
+                      + triggerAsVarRef.getVariable().getName()
+                      + "[i].value = copy.deepcopy(mutable_"
+                      + triggerAsVarRef.getVariable().getName()
+                      + "[i].value)");
             } else {
-                generatedParams.add(effect.getVariable().getName());
-                if (effect.getVariable() instanceof Port) {
-                    if (ASTUtils.isMultiport((Port) effect.getVariable())) {
-                        // Handle multiports
-                    }
-                }
+              inits.pr(triggerAsVarRef.getVariable().getName() + " = Make()");
+              inits.pr(
+                  triggerAsVarRef.getVariable().getName()
+                      + ".value = copy.deepcopy(mutable_"
+                      + triggerAsVarRef.getVariable().getName()
+                      + ".value)");
             }
+          } else {
+            generatedParams.add(triggerAsVarRef.getVariable().getName());
+          }
+        } else {
+          // Handle contained reactors' ports
+          generatedParams.add(
+              triggerAsVarRef.getContainer().getName()
+                  + "_"
+                  + triggerAsVarRef.getVariable().getName());
+          inits.pr(PythonPortGenerator.generatePythonPortVariableInReaction(triggerAsVarRef));
         }
-
-        for (String s : generatedParams) {
-            parameters.add(s);
-        }
+      } else if (triggerAsVarRef.getVariable() instanceof Action) {
+        generatedParams.add(triggerAsVarRef.getVariable().getName());
+      }
     }
 
-    private static String generateVariableToSendPythonReaction(VarRef varRef,
-                                                             Set<Action> actionsAsTriggers,
-                                                             ReactorDecl decl,
-                                                             List<String> pyObjects) {
-        if (varRef.getVariable() instanceof Port) {
-            return PythonPortGenerator.generatePortVariablesToSendToPythonReaction(pyObjects, varRef, decl);
-        } else if (varRef.getVariable() instanceof Action) {
-            actionsAsTriggers.add((Action) varRef.getVariable());
-            PythonPortGenerator.generateActionVariableToSendToPythonReaction(pyObjects, (Action) varRef.getVariable(), decl);
+    // Handle non-triggering inputs
+    if (reaction.getTriggers() == null || reaction.getTriggers().size() == 0) {
+      for (Input input : ASTUtils.convertToEmptyListIfNull(reactor.getInputs())) {
+        generatedParams.add(input.getName());
+        if (input.isMutable()) {
+          // Create a deep copy
+          inits.pr(input.getName() + " = copy.deepcopy(" + input.getName() + ")");
         }
-        return "";
+      }
     }
-
-    /**
-     * Generate Python code to link cpython functions to python functions for each reaction.
-     * @param instance The reactor instance.
-     * @param mainDef The definition of the main reactor
-     */
-    public static String generateCPythonReactionLinkers(
-            ReactorInstance instance,
-            Instantiation mainDef
-    ) {
-        String nameOfSelfStruct = CUtil.reactorRef(instance);
-        Reactor reactor = ASTUtils.toDefinition(instance.getDefinition().getReactorClass());
-        CodeBuilder code = new CodeBuilder();
-
-        // Initialize the name field to the unique name of the instance
-        code.pr(nameOfSelfStruct+"->_lf_name = \""+instance.uniqueID()+"_lf\";");
-
-        for (ReactionInstance reaction : instance.reactions) {
-            // Reactions marked with a {@code @_c_body} attribute are generated in C
-            if (AttributeUtils.hasCBody(reaction.getDefinition())) continue;
-            // Create a PyObject for each reaction
-            code.pr(generateCPythonReactionLinker(instance, reaction, nameOfSelfStruct));
+    for (VarRef src : ASTUtils.convertToEmptyListIfNull(reaction.getSources())) {
+      if (src.getVariable() instanceof Output) {
+        // Output of a contained reactor
+        generatedParams.add(src.getContainer().getName() + "_" + src.getVariable().getName());
+        inits.pr(PythonPortGenerator.generatePythonPortVariableInReaction(src));
+      } else {
+        generatedParams.add(src.getVariable().getName());
+        if (src.getVariable() instanceof Input) {
+          if (((Input) src.getVariable()).isMutable()) {
+            // Create a deep copy
+            inits.pr(
+                src.getVariable().getName()
+                    + " = copy.deepcopy("
+                    + src.getVariable().getName()
+                    + ")");
+          }
         }
-        return code.toString();
+      }
     }
 
-    /**
-     * Generate Python code to link cpython functions to python functions for a reaction.
-     * @param instance The reactor instance.
-     * @param reaction The reaction of this instance to link.
-     * @param nameOfSelfStruct The name of the self struct in cpython.
-     */
-    public static String generateCPythonReactionLinker(
-            ReactorInstance instance,
-            ReactionInstance reaction,
-            String nameOfSelfStruct
-    ) {
-        CodeBuilder code = new CodeBuilder();
-        code.pr(generateCPythonFunctionLinker(
-            nameOfSelfStruct, generateCPythonReactionFunctionName(reaction.index),
-            instance, generatePythonReactionFunctionName(reaction.index))
-        );
-        if (reaction.getDefinition().getStp() != null) {
-            code.pr(generateCPythonFunctionLinker(
-                nameOfSelfStruct, generateCPythonSTPFunctionName(reaction.index),
-                instance, generatePythonSTPFunctionName(reaction.index))
-            );
-        }
-        if (reaction.getDefinition().getDeadline() != null) {
-            code.pr(generateCPythonFunctionLinker(
-                nameOfSelfStruct, generateCPythonDeadlineFunctionName(reaction.index),
-                instance, generatePythonDeadlineFunctionName(reaction.index))
-            );
+    // Handle effects
+    for (VarRef effect : ASTUtils.convertToEmptyListIfNull(reaction.getEffects())) {
+      if (effect.getVariable() instanceof Input) {
+        generatedParams.add(effect.getContainer().getName() + "_" + effect.getVariable().getName());
+        inits.pr(PythonPortGenerator.generatePythonPortVariableInReaction(effect));
+      } else {
+        generatedParams.add(effect.getVariable().getName());
+        if (effect.getVariable() instanceof Port) {
+          if (ASTUtils.isMultiport((Port) effect.getVariable())) {
+            // Handle multiports
+          }
         }
-        return code.toString();
+      }
     }
 
-    /**
-     * Generate code to link "pythonFunctionName" to "cpythonFunctionName" in "nameOfSelfStruct" of "instance".
-     * @param nameOfSelfStruct the self struct name of instance
-     * @param cpythonFunctionName the name of the cpython function
-     * @param instance the reactor instance
-     * @param pythonFunctionName the name of the python function
-     */
-    private static String generateCPythonFunctionLinker(String nameOfSelfStruct, String cpythonFunctionName, ReactorInstance instance, String pythonFunctionName) {
-        return String.join("\n",
-            nameOfSelfStruct+"->"+cpythonFunctionName+" = ",
-            "get_python_function(\"__main__\", ",
-            "    "+nameOfSelfStruct+"->_lf_name,",
-            "    "+CUtil.runtimeIndex(instance)+",",
-            "    \""+pythonFunctionName+"\");",
-            "if("+nameOfSelfStruct+"->"+cpythonFunctionName+" == NULL) {",
-            "    lf_print_error_and_exit(\"Could not load function "+pythonFunctionName+"\");",
-            "}"
-        );
+    for (String s : generatedParams) {
+      parameters.add(s);
     }
-
-    /**
-     * Generate the function that is executed whenever the deadline of the reaction
-     * with the given reaction index is missed
-     * @param reaction The reaction to generate deadline miss code for
-     * @param reactionIndex The agreed-upon index of the reaction in the reactor (should match the C generated code)
-     * @param reactionParameters The parameters to the deadline violation function, which are the same as the reaction function
-     */
-    public static String generatePythonFunction(String pythonFunctionName, String inits, String reactionBody, List<String> reactionParameters) {
-        String params = reactionParameters.size() > 0 ? ", " + String.join(", ", reactionParameters) : "";
-        CodeBuilder code = new CodeBuilder();
-        code.pr("def "+pythonFunctionName+"(self"+params+"):");
-        code.indent();
-        code.pr(inits);
-        code.pr(reactionBody);
-        code.pr("return 0");
-        return code.toString();
-    }
-
-
-    /**
-     * Generate the Python code for reactions in reactor
-     * @param reactor The reactor
-     * @param reactions The reactions of reactor
-     */
-    public static String generatePythonReactions(Reactor reactor, List<Reaction> reactions) {
-        CodeBuilder code = new CodeBuilder();
-        int reactionIndex = 0;
-        for (Reaction reaction : reactions) {
-            code.pr(generatePythonReaction(reactor, reaction, reactionIndex));
-            reactionIndex++;
-        }
-        return code.toString();
-    }
-
-    /**
-     * Generate the Python code for reaction in reactor
-     * @param reactor The reactor
-     * @param reaction The reaction of reactor
-     */
-    public static String generatePythonReaction(Reactor reactor, Reaction reaction, int reactionIndex) {
-        // Reactions marked with a {@code @_c_body} attribute are generated in C
-        if (AttributeUtils.hasCBody(reaction))  return "";
-
-        CodeBuilder code = new CodeBuilder();
-        List<String> reactionParameters = new ArrayList<>(); // Will contain parameters for the function (e.g., Foo(x,y,z,...)
-        CodeBuilder inits = new CodeBuilder(); // Will contain initialization code for some parameters
-        PythonReactionGenerator.generatePythonReactionParametersAndInitializations(reactionParameters, inits, reactor, reaction);
-        code.pr(generatePythonFunction(
-            generatePythonReactionFunctionName(reactionIndex),
-            inits.toString(),
-            ASTUtils.toText(reaction.getCode()),
-            reactionParameters
-        ));
-        // Generate code for the STP violation handler function, if there is one.
-        if (reaction.getStp() != null) {
-            code.pr(generatePythonFunction(
-                generatePythonSTPFunctionName(reactionIndex),
-                "",
-                ASTUtils.toText(reaction.getStp().getCode()),
-                reactionParameters
-            ));
-        }
-        // Generate code for the deadline violation function, if there is one.
-        if (reaction.getDeadline() != null) {
-            code.pr(generatePythonFunction(
-                generatePythonDeadlineFunctionName(reactionIndex),
-                "",
-                ASTUtils.toText(reaction.getDeadline().getCode()),
-                reactionParameters
-            ));
-        }
-        return code.toString();
+  }
+
+  private static String generateVariableToSendPythonReaction(
+      VarRef varRef, Set<Action> actionsAsTriggers, ReactorDecl decl, List<String> pyObjects) {
+    if (varRef.getVariable() instanceof Port) {
+      return PythonPortGenerator.generatePortVariablesToSendToPythonReaction(
+          pyObjects, varRef, decl);
+    } else if (varRef.getVariable() instanceof Action) {
+      actionsAsTriggers.add((Action) varRef.getVariable());
+      PythonPortGenerator.generateActionVariableToSendToPythonReaction(
+          pyObjects, (Action) varRef.getVariable(), decl);
     }
-
-    /** Return the function name of the reaction inside the self struct in the .c file.
-     *  @param reactionIndex The reaction index.
-     *  @return The function name for the reaction.
-     */
-    public static String generateCPythonReactionFunctionName(int reactionIndex) {
-        return "_lf_py_reaction_function_"+reactionIndex;
+    return "";
+  }
+
+  /**
+   * Generate Python code to link cpython functions to python functions for each reaction.
+   *
+   * @param instance The reactor instance.
+   * @param mainDef The definition of the main reactor
+   */
+  public static String generateCPythonReactionLinkers(
+      ReactorInstance instance, Instantiation mainDef) {
+    String nameOfSelfStruct = CUtil.reactorRef(instance);
+    Reactor reactor = ASTUtils.toDefinition(instance.getDefinition().getReactorClass());
+    CodeBuilder code = new CodeBuilder();
+
+    // Initialize the name field to the unique name of the instance
+    code.pr(nameOfSelfStruct + "->_lf_name = \"" + instance.uniqueID() + "_lf\";");
+
+    for (ReactionInstance reaction : instance.reactions) {
+      // Reactions marked with a {@code @_c_body} attribute are generated in C
+      if (AttributeUtils.hasCBody(reaction.getDefinition())) continue;
+      // Create a PyObject for each reaction
+      code.pr(generateCPythonReactionLinker(instance, reaction, nameOfSelfStruct));
     }
-
-    /** Return the function name of the deadline function inside the self struct in the .c file.
-     *  @param reactionIndex The reaction index.
-     *  @return The function name for the reaction.
-     */
-    public static String generateCPythonDeadlineFunctionName(int reactionIndex) {
-        return "_lf_py_deadline_function_"+reactionIndex;
+    return code.toString();
+  }
+
+  /**
+   * Generate Python code to link cpython functions to python functions for a reaction.
+   *
+   * @param instance The reactor instance.
+   * @param reaction The reaction of this instance to link.
+   * @param nameOfSelfStruct The name of the self struct in cpython.
+   */
+  public static String generateCPythonReactionLinker(
+      ReactorInstance instance, ReactionInstance reaction, String nameOfSelfStruct) {
+    CodeBuilder code = new CodeBuilder();
+    code.pr(
+        generateCPythonFunctionLinker(
+            nameOfSelfStruct, generateCPythonReactionFunctionName(reaction.index),
+            instance, generatePythonReactionFunctionName(reaction.index)));
+    if (reaction.getDefinition().getStp() != null) {
+      code.pr(
+          generateCPythonFunctionLinker(
+              nameOfSelfStruct, generateCPythonSTPFunctionName(reaction.index),
+              instance, generatePythonSTPFunctionName(reaction.index)));
     }
-
-    /** Return the function name of the STP violation handler function inside the self struct in the .c file.
-     *  @param reactionIndex The reaction index.
-     *  @return The function name for the reaction.
-     */
-    public static String generateCPythonSTPFunctionName(int reactionIndex) {
-        return "_lf_py_STP_function_"+reactionIndex;
+    if (reaction.getDefinition().getDeadline() != null) {
+      code.pr(
+          generateCPythonFunctionLinker(
+              nameOfSelfStruct, generateCPythonDeadlineFunctionName(reaction.index),
+              instance, generatePythonDeadlineFunctionName(reaction.index)));
     }
-
-    /** Return the function name of the reaction in the .py file.
-     *  @param reactionIndex The reaction index.
-     *  @return The function name for the reaction.
-     */
-    public static String generatePythonReactionFunctionName(int reactionIndex) {
-        return "reaction_function_" + reactionIndex;
+    return code.toString();
+  }
+
+  /**
+   * Generate code to link "pythonFunctionName" to "cpythonFunctionName" in "nameOfSelfStruct" of
+   * "instance".
+   *
+   * @param nameOfSelfStruct the self struct name of instance
+   * @param cpythonFunctionName the name of the cpython function
+   * @param instance the reactor instance
+   * @param pythonFunctionName the name of the python function
+   */
+  private static String generateCPythonFunctionLinker(
+      String nameOfSelfStruct,
+      String cpythonFunctionName,
+      ReactorInstance instance,
+      String pythonFunctionName) {
+    return String.join(
+        "\n",
+        nameOfSelfStruct + "->" + cpythonFunctionName + " = ",
+        "get_python_function(\"__main__\", ",
+        "    " + nameOfSelfStruct + "->_lf_name,",
+        "    " + CUtil.runtimeIndex(instance) + ",",
+        "    \"" + pythonFunctionName + "\");",
+        "if(" + nameOfSelfStruct + "->" + cpythonFunctionName + " == NULL) {",
+        "    lf_print_error_and_exit(\"Could not load function " + pythonFunctionName + "\");",
+        "}");
+  }
+
+  /**
+   * Generate the function that is executed whenever the deadline of the reaction with the given
+   * reaction index is missed
+   *
+   * @param reaction The reaction to generate deadline miss code for
+   * @param reactionIndex The agreed-upon index of the reaction in the reactor (should match the C
+   *     generated code)
+   * @param reactionParameters The parameters to the deadline violation function, which are the same
+   *     as the reaction function
+   */
+  public static String generatePythonFunction(
+      String pythonFunctionName,
+      String inits,
+      String reactionBody,
+      List<String> reactionParameters) {
+    String params =
+        reactionParameters.size() > 0 ? ", " + String.join(", ", reactionParameters) : "";
+    CodeBuilder code = new CodeBuilder();
+    code.pr("def " + pythonFunctionName + "(self" + params + "):");
+    code.indent();
+    code.pr(inits);
+    code.pr(reactionBody);
+    code.pr("return 0");
+    return code.toString();
+  }
+
+  /**
+   * Generate the Python code for reactions in reactor
+   *
+   * @param reactor The reactor
+   * @param reactions The reactions of reactor
+   */
+  public static String generatePythonReactions(Reactor reactor, List<Reaction> reactions) {
+    CodeBuilder code = new CodeBuilder();
+    int reactionIndex = 0;
+    for (Reaction reaction : reactions) {
+      code.pr(generatePythonReaction(reactor, reaction, reactionIndex));
+      reactionIndex++;
     }
-
-    /** Return the function name of the deadline function in the .py file.
-     *  @param reactionIndex The reaction index.
-     *  @return The function name for the reaction.
-     */
-    public static String generatePythonDeadlineFunctionName(int reactionIndex) {
-        return "deadline_function_" + reactionIndex;
+    return code.toString();
+  }
+
+  /**
+   * Generate the Python code for reaction in reactor
+   *
+   * @param reactor The reactor
+   * @param reaction The reaction of reactor
+   */
+  public static String generatePythonReaction(
+      Reactor reactor, Reaction reaction, int reactionIndex) {
+    // Reactions marked with a {@code @_c_body} attribute are generated in C
+    if (AttributeUtils.hasCBody(reaction)) return "";
+
+    CodeBuilder code = new CodeBuilder();
+    List<String> reactionParameters =
+        new ArrayList<>(); // Will contain parameters for the function (e.g., Foo(x,y,z,...)
+    CodeBuilder inits = new CodeBuilder(); // Will contain initialization code for some parameters
+    PythonReactionGenerator.generatePythonReactionParametersAndInitializations(
+        reactionParameters, inits, reactor, reaction);
+    code.pr(
+        generatePythonFunction(
+            generatePythonReactionFunctionName(reactionIndex),
+            inits.toString(),
+            ASTUtils.toText(reaction.getCode()),
+            reactionParameters));
+    // Generate code for the STP violation handler function, if there is one.
+    if (reaction.getStp() != null) {
+      code.pr(
+          generatePythonFunction(
+              generatePythonSTPFunctionName(reactionIndex),
+              "",
+              ASTUtils.toText(reaction.getStp().getCode()),
+              reactionParameters));
     }
-
-    /** Return the function name of the STP violation handler function in the .py file.
-     *  @param reactionIndex The reaction index.
-     *  @return The function name for the reaction.
-     */
-    public static String generatePythonSTPFunctionName(int reactionIndex) {
-        return "STP_function_" + reactionIndex;
+    // Generate code for the deadline violation function, if there is one.
+    if (reaction.getDeadline() != null) {
+      code.pr(
+          generatePythonFunction(
+              generatePythonDeadlineFunctionName(reactionIndex),
+              "",
+              ASTUtils.toText(reaction.getDeadline().getCode()),
+              reactionParameters));
     }
+    return code.toString();
+  }
+
+  /**
+   * Return the function name of the reaction inside the self struct in the .c file.
+   *
+   * @param reactionIndex The reaction index.
+   * @return The function name for the reaction.
+   */
+  public static String generateCPythonReactionFunctionName(int reactionIndex) {
+    return "_lf_py_reaction_function_" + reactionIndex;
+  }
+
+  /**
+   * Return the function name of the deadline function inside the self struct in the .c file.
+   *
+   * @param reactionIndex The reaction index.
+   * @return The function name for the reaction.
+   */
+  public static String generateCPythonDeadlineFunctionName(int reactionIndex) {
+    return "_lf_py_deadline_function_" + reactionIndex;
+  }
+
+  /**
+   * Return the function name of the STP violation handler function inside the self struct in the .c
+   * file.
+   *
+   * @param reactionIndex The reaction index.
+   * @return The function name for the reaction.
+   */
+  public static String generateCPythonSTPFunctionName(int reactionIndex) {
+    return "_lf_py_STP_function_" + reactionIndex;
+  }
+
+  /**
+   * Return the function name of the reaction in the .py file.
+   *
+   * @param reactionIndex The reaction index.
+   * @return The function name for the reaction.
+   */
+  public static String generatePythonReactionFunctionName(int reactionIndex) {
+    return "reaction_function_" + reactionIndex;
+  }
+
+  /**
+   * Return the function name of the deadline function in the .py file.
+   *
+   * @param reactionIndex The reaction index.
+   * @return The function name for the reaction.
+   */
+  public static String generatePythonDeadlineFunctionName(int reactionIndex) {
+    return "deadline_function_" + reactionIndex;
+  }
+
+  /**
+   * Return the function name of the STP violation handler function in the .py file.
+   *
+   * @param reactionIndex The reaction index.
+   * @return The function name for the reaction.
+   */
+  public static String generatePythonSTPFunctionName(int reactionIndex) {
+    return "STP_function_" + reactionIndex;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonReactorGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonReactorGenerator.java
index 6e1a7f0183..8f2d3fd8ad 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonReactorGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonReactorGenerator.java
@@ -11,149 +11,162 @@
 import org.lflang.lf.ReactorDecl;
 
 public class PythonReactorGenerator {
-    /**
-     * Wrapper function for the more elaborate generatePythonReactorClass that keeps track
-     * of visited reactors to avoid duplicate generation
-     * @param instance The reactor instance to be generated
-     */
-    public static String generatePythonClass(ReactorInstance instance, ReactorInstance main, PythonTypes types) {
-        List<String> instantiatedClasses = new ArrayList<>();
-        return generatePythonClass(instance, instantiatedClasses, main, types);
-    }
-
-    /**
-     * Generate a Python class corresponding to decl
-     * @param instance The reactor instance to be generated
-     * @param instantiatedClasses A list of visited instances to avoid generating duplicates
-     */
-    public static String generatePythonClass(ReactorInstance instance,
-                                           List<String> instantiatedClasses,
-                                           ReactorInstance main, PythonTypes types) {
-        CodeBuilder pythonClasses = new CodeBuilder();
-        ReactorDecl decl = instance.getDefinition().getReactorClass();
-        Reactor reactor = ASTUtils.toDefinition(decl);
-        String className = PyUtil.getName(instance.tpr);
-        if (instantiatedClasses == null) {
-            return "";
-        }
-
-        if (!instantiatedClasses.contains(className)) {
-            pythonClasses.pr(generatePythonClassHeader(className));
-            // Generate preamble code
-            pythonClasses.indent();
-            pythonClasses.pr(PythonPreambleGenerator.generatePythonPreambles(reactor.getPreambles()));
-            // Handle runtime initializations
-            pythonClasses.pr(generatePythonConstructor(decl, types));
-            pythonClasses.pr(PythonParameterGenerator.generatePythonGetters(decl));
-            // Generate methods
-            pythonClasses.pr(PythonMethodGenerator.generateMethods(reactor));
-            // Generate reactions
-            List<Reaction> reactionToGenerate = ASTUtils.allReactions(reactor);
-            pythonClasses.pr(PythonReactionGenerator.generatePythonReactions(reactor, reactionToGenerate));
-            pythonClasses.unindent();
-            pythonClasses.pr("\n");
-            instantiatedClasses.add(className);
-        }
+  /**
+   * Wrapper function for the more elaborate generatePythonReactorClass that keeps track of visited
+   * reactors to avoid duplicate generation
+   *
+   * @param instance The reactor instance to be generated
+   */
+  public static String generatePythonClass(
+      ReactorInstance instance, ReactorInstance main, PythonTypes types) {
+    List<String> instantiatedClasses = new ArrayList<>();
+    return generatePythonClass(instance, instantiatedClasses, main, types);
+  }
 
-        for (ReactorInstance child : instance.children) {
-            pythonClasses.pr(generatePythonClass(child, instantiatedClasses, main, types));
-        }
-        return pythonClasses.getCode();
+  /**
+   * Generate a Python class corresponding to decl
+   *
+   * @param instance The reactor instance to be generated
+   * @param instantiatedClasses A list of visited instances to avoid generating duplicates
+   */
+  public static String generatePythonClass(
+      ReactorInstance instance,
+      List<String> instantiatedClasses,
+      ReactorInstance main,
+      PythonTypes types) {
+    CodeBuilder pythonClasses = new CodeBuilder();
+    ReactorDecl decl = instance.getDefinition().getReactorClass();
+    Reactor reactor = ASTUtils.toDefinition(decl);
+    String className = PyUtil.getName(instance.tpr);
+    if (instantiatedClasses == null) {
+      return "";
     }
 
-    private static String generatePythonClassHeader(String className) {
-        return String.join("\n",
-            "# Python class for reactor "+className+"",
-            "class _"+className+":"
-        );
+    if (!instantiatedClasses.contains(className)) {
+      pythonClasses.pr(generatePythonClassHeader(className));
+      // Generate preamble code
+      pythonClasses.indent();
+      pythonClasses.pr(PythonPreambleGenerator.generatePythonPreambles(reactor.getPreambles()));
+      // Handle runtime initializations
+      pythonClasses.pr(generatePythonConstructor(decl, types));
+      pythonClasses.pr(PythonParameterGenerator.generatePythonGetters(decl));
+      // Generate methods
+      pythonClasses.pr(PythonMethodGenerator.generateMethods(reactor));
+      // Generate reactions
+      List<Reaction> reactionToGenerate = ASTUtils.allReactions(reactor);
+      pythonClasses.pr(
+          PythonReactionGenerator.generatePythonReactions(reactor, reactionToGenerate));
+      pythonClasses.unindent();
+      pythonClasses.pr("\n");
+      instantiatedClasses.add(className);
     }
 
-    /**
-     * Generate code that instantiates and initializes parameters and state variables for a reactor 'decl'.
-     *
-     * @param decl The reactor declaration
-     * @return The generated code as a StringBuilder
-     */
-     private static String generatePythonConstructor(ReactorDecl decl, PythonTypes types) {
-        CodeBuilder code = new CodeBuilder();
-        code.pr("# Constructor");
-        code.pr("def __init__(self, **kwargs):");
-        code.indent();
-        code.pr(PythonParameterGenerator.generatePythonInstantiations(decl, types));
-        code.pr(PythonStateGenerator.generatePythonInstantiations(decl));
-        return code.toString();
+    for (ReactorInstance child : instance.children) {
+      pythonClasses.pr(generatePythonClass(child, instantiatedClasses, main, types));
     }
+    return pythonClasses.getCode();
+  }
 
-    /**
-     * Generate code to instantiate a Python list that will hold the Python
-     * class instance of reactor <code>instance<code>. Will recursively do
-     * the same for the children of <code>instance<code> as well.
-     *
-     * @param instance The reactor instance for which the Python list will be created.
-     */
-    public static String generateListsToHoldClassInstances(ReactorInstance instance) {
-        CodeBuilder code = new CodeBuilder();
-        code.pr(PyUtil.reactorRefName(instance)+" = [None] * "+instance.getTotalWidth());
-        for (ReactorInstance child : instance.children) {
-            code.pr(generateListsToHoldClassInstances(child));
-        }
-        return code.toString();
+  private static String generatePythonClassHeader(String className) {
+    return String.join(
+        "\n", "# Python class for reactor " + className + "", "class _" + className + ":");
+  }
+
+  /**
+   * Generate code that instantiates and initializes parameters and state variables for a reactor
+   * 'decl'.
+   *
+   * @param decl The reactor declaration
+   * @return The generated code as a StringBuilder
+   */
+  private static String generatePythonConstructor(ReactorDecl decl, PythonTypes types) {
+    CodeBuilder code = new CodeBuilder();
+    code.pr("# Constructor");
+    code.pr("def __init__(self, **kwargs):");
+    code.indent();
+    code.pr(PythonParameterGenerator.generatePythonInstantiations(decl, types));
+    code.pr(PythonStateGenerator.generatePythonInstantiations(decl));
+    return code.toString();
+  }
+
+  /**
+   * Generate code to instantiate a Python list that will hold the Python
+   * class instance of reactor <code>instance<code>. Will recursively do
+   * the same for the children of <code>instance<code> as well.
+   *
+   * @param instance The reactor instance for which the Python list will be created.
+   */
+  public static String generateListsToHoldClassInstances(ReactorInstance instance) {
+    CodeBuilder code = new CodeBuilder();
+    code.pr(PyUtil.reactorRefName(instance) + " = [None] * " + instance.getTotalWidth());
+    for (ReactorInstance child : instance.children) {
+      code.pr(generateListsToHoldClassInstances(child));
     }
+    return code.toString();
+  }
 
-    /**
-     * Instantiate classes in Python, as well as subclasses.
-     * Instances are always instantiated as a list of className = [_className, _className, ...] depending on the size of the bank.
-     * If there is no bank or the size is 1, the instance would be generated as className = [_className]
-     * @param instance The reactor instance to be instantiated
-     * @param main The main reactor
-     */
-    public static String generatePythonClassInstantiations(ReactorInstance instance,
-                        ReactorInstance main) {
-        CodeBuilder code = new CodeBuilder();
+  /**
+   * Instantiate classes in Python, as well as subclasses. Instances are always instantiated as a
+   * list of className = [_className, _className, ...] depending on the size of the bank. If there
+   * is no bank or the size is 1, the instance would be generated as className = [_className]
+   *
+   * @param instance The reactor instance to be instantiated
+   * @param main The main reactor
+   */
+  public static String generatePythonClassInstantiations(
+      ReactorInstance instance, ReactorInstance main) {
+    CodeBuilder code = new CodeBuilder();
 
-        String className = PyUtil.getName(instance.tpr);
+    String className = PyUtil.getName(instance.tpr);
 
-        if (instance.getWidth() > 0) {
-            // For each reactor instance, create a list regardless of whether it is a bank or not.
-            // Non-bank reactor instances will be a list of size 1.
-            String fullName = instance.getFullName();
-            code.pr(String.join("\n",
-                "# Start initializing "+fullName+" of class "+className,
-                "for "+PyUtil.bankIndexName(instance)+" in range("+instance.getWidth()+"):"
-            ));
-            code.indent();
-            // Define a bank_index local variable so that it can be used while
-            // setting parameter values.
-            code.pr("bank_index = "+PyUtil.bankIndexName(instance));
-            code.pr(generatePythonClassInstantiation(instance, className));
-        }
+    if (instance.getWidth() > 0) {
+      // For each reactor instance, create a list regardless of whether it is a bank or not.
+      // Non-bank reactor instances will be a list of size 1.
+      String fullName = instance.getFullName();
+      code.pr(
+          String.join(
+              "\n",
+              "# Start initializing " + fullName + " of class " + className,
+              "for " + PyUtil.bankIndexName(instance) + " in range(" + instance.getWidth() + "):"));
+      code.indent();
+      // Define a bank_index local variable so that it can be used while
+      // setting parameter values.
+      code.pr("bank_index = " + PyUtil.bankIndexName(instance));
+      code.pr(generatePythonClassInstantiation(instance, className));
+    }
 
-        for (ReactorInstance child : instance.children) {
-            code.pr(generatePythonClassInstantiations(child, main));
-        }
-        code.unindent();
-        return code.toString();
+    for (ReactorInstance child : instance.children) {
+      code.pr(generatePythonClassInstantiations(child, main));
     }
+    code.unindent();
+    return code.toString();
+  }
 
-    /**
-     * Instantiate a class with className in instance.
-     * @param instance The reactor instance to be instantiated
-     * @param className The name of the class to instantiate
-     */
-    private static String generatePythonClassInstantiation(ReactorInstance instance,
-                                                           String className) {
-        CodeBuilder code = new CodeBuilder();
-        code.pr(PyUtil.reactorRef(instance)+" = _"+className+"(");
-        code.indent();
-        // Always add the bank_index
-        code.pr("_bank_index = "+PyUtil.bankIndex(instance)+",");
-        for (ParameterInstance param : instance.parameters) {
-            if (!param.getName().equals("bank_index")) {
-                code.pr("_"+param.getName()+"="+ PythonParameterGenerator.generatePythonInitializer(param)+",");
-            }
-        }
-        code.unindent();
-        code.pr(")");
-        return code.toString();
+  /**
+   * Instantiate a class with className in instance.
+   *
+   * @param instance The reactor instance to be instantiated
+   * @param className The name of the class to instantiate
+   */
+  private static String generatePythonClassInstantiation(
+      ReactorInstance instance, String className) {
+    CodeBuilder code = new CodeBuilder();
+    code.pr(PyUtil.reactorRef(instance) + " = _" + className + "(");
+    code.indent();
+    // Always add the bank_index
+    code.pr("_bank_index = " + PyUtil.bankIndex(instance) + ",");
+    for (ParameterInstance param : instance.parameters) {
+      if (!param.getName().equals("bank_index")) {
+        code.pr(
+            "_"
+                + param.getName()
+                + "="
+                + PythonParameterGenerator.generatePythonInitializer(param)
+                + ",");
+      }
     }
+    code.unindent();
+    code.pr(")");
+    return code.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonStateGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonStateGenerator.java
index e318a8812c..45dc8cf7d5 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonStateGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonStateGenerator.java
@@ -2,36 +2,38 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.ReactorDecl;
 import org.lflang.lf.StateVar;
 
 public class PythonStateGenerator {
-    /**
-     * Generate state variable instantiations for reactor "decl"
-     * @param decl The reactor declaration to generate state variables.
-     */
-    public static String generatePythonInstantiations(ReactorDecl decl) {
-        List<String> lines = new ArrayList<>();
-        lines.add("# Define state variables");
-        // Next, handle state variables
-        for (StateVar state : ASTUtils.allStateVars(ASTUtils.toDefinition(decl))) {
-            lines.add("self."+state.getName()+" = "+generatePythonInitializer(state));
-        }
-        lines.add("");
-        return String.join("\n", lines);
+  /**
+   * Generate state variable instantiations for reactor "decl"
+   *
+   * @param decl The reactor declaration to generate state variables.
+   */
+  public static String generatePythonInstantiations(ReactorDecl decl) {
+    List<String> lines = new ArrayList<>();
+    lines.add("# Define state variables");
+    // Next, handle state variables
+    for (StateVar state : ASTUtils.allStateVars(ASTUtils.toDefinition(decl))) {
+      lines.add("self." + state.getName() + " = " + generatePythonInitializer(state));
     }
+    lines.add("");
+    return String.join("\n", lines);
+  }
 
-    /**
-     * Handle initialization for state variable
-     * @param state a state variable
-     */
-    public static String generatePythonInitializer(StateVar state) {
-        if (!ASTUtils.isInitialized(state)) {
-            return "None";
-        }
-        List<String> list = state.getInit().getExprs().stream().map(PyUtil::getPythonTargetValue).toList();
-        return list.size() > 1 ? "[" + String.join(", ", list) + "]" : list.get(0);
+  /**
+   * Handle initialization for state variable
+   *
+   * @param state a state variable
+   */
+  public static String generatePythonInitializer(StateVar state) {
+    if (!ASTUtils.isInitialized(state)) {
+      return "None";
     }
+    List<String> list =
+        state.getInit().getExprs().stream().map(PyUtil::getPythonTargetValue).toList();
+    return list.size() > 1 ? "[" + String.join(", ", list) + "]" : list.get(0);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonTypes.java b/org.lflang/src/org/lflang/generator/python/PythonTypes.java
index 5b62ee5f97..66abfabf5f 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonTypes.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonTypes.java
@@ -3,74 +3,74 @@
 import java.util.List;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-
 import org.lflang.InferredType;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.generator.c.CTypes;
-import org.lflang.generator.c.CUtil;
 import org.lflang.lf.ParameterReference;
 
 public class PythonTypes extends CTypes {
 
-    // Regular expression pattern for pointer types. The star at the end has to be visible.
-    static final Pattern pointerPatternVariable = Pattern.compile("^\\s*+(\\w+)\\s*\\*\\s*$");
-    private static final PythonTypes INSTANCE = new PythonTypes();
+  // Regular expression pattern for pointer types. The star at the end has to be visible.
+  static final Pattern pointerPatternVariable = Pattern.compile("^\\s*+(\\w+)\\s*\\*\\s*$");
+  private static final PythonTypes INSTANCE = new PythonTypes();
 
-    @Override
-    public String getTargetUndefinedType() {
-        return "PyObject*";
-    }
+  @Override
+  public String getTargetUndefinedType() {
+    return "PyObject*";
+  }
 
-    /**
-     * This generator inherits types from the CGenerator.
-     * This function reverts them back to Python types
-     * For example, the types double is converted to float,
-     * the * for pointer types is removed, etc.
-     * @param type The type
-     * @return The Python equivalent of a C type
-     */
-    public String getPythonType(InferredType type) {
-        var result = super.getTargetType(type);
+  /**
+   * This generator inherits types from the CGenerator. This function reverts them back to Python
+   * types For example, the types double is converted to float, the * for pointer types is removed,
+   * etc.
+   *
+   * @param type The type
+   * @return The Python equivalent of a C type
+   */
+  public String getPythonType(InferredType type) {
+    var result = super.getTargetType(type);
 
-        result = switch (result) {
-            case "double" -> "float";
-            case "string" -> "object";
-            default -> result;
+    result =
+        switch (result) {
+          case "double" -> "float";
+          case "string" -> "object";
+          default -> result;
         };
 
-        var matcher = pointerPatternVariable.matcher(result);
-        if (matcher.find()) {
-            return matcher.group(1);
-        }
-
-        return result;
+    var matcher = pointerPatternVariable.matcher(result);
+    if (matcher.find()) {
+      return matcher.group(1);
     }
 
-    @Override
-    public String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
-        return "self." + expr.getParameter().getName();
-    }
+    return result;
+  }
 
-    @Override
-    public String getFixedSizeListInitExpression(List<String> contents, int listSize, boolean withBraces) {
-        return contents.stream().collect(Collectors.joining(", ", "[ ", " ]"));
-    }
+  @Override
+  public String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
+    return "self." + expr.getParameter().getName();
+  }
 
-    @Override
-    public String getVariableSizeListInitExpression(List<String> contents, boolean withBraces) {
-        return contents.stream().collect(Collectors.joining(", ", "[ ", " ]"));
-    }
+  @Override
+  public String getFixedSizeListInitExpression(
+      List<String> contents, int listSize, boolean withBraces) {
+    return contents.stream().collect(Collectors.joining(", ", "[ ", " ]"));
+  }
 
-    public static PythonTypes getInstance() {
-        return INSTANCE;
-    }
+  @Override
+  public String getVariableSizeListInitExpression(List<String> contents, boolean withBraces) {
+    return contents.stream().collect(Collectors.joining(", ", "[ ", " ]"));
+  }
 
-    public static PythonTypes generateParametersIn(ReactorInstance instance) {
-        return new PythonTypes() {
-            @Override
-            public String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
-                return PyUtil.reactorRef(instance) + "." + expr.getParameter().getName();
-            }
-        };
-    }
+  public static PythonTypes getInstance() {
+    return INSTANCE;
+  }
+
+  public static PythonTypes generateParametersIn(ReactorInstance instance) {
+    return new PythonTypes() {
+      @Override
+      public String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
+        return PyUtil.reactorRef(instance) + "." + expr.getParameter().getName();
+      }
+    };
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonValidator.java b/org.lflang/src/org/lflang/generator/python/PythonValidator.java
index 989d4181fc..dc87417c51 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonValidator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonValidator.java
@@ -1,5 +1,11 @@
 package org.lflang.generator.python;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.List;
@@ -8,9 +14,7 @@
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.generator.CodeMap;
@@ -20,13 +24,6 @@
 import org.lflang.generator.ValidationStrategy;
 import org.lflang.util.LFCommand;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-
 /**
  * A validator for generated Python.
  *
@@ -34,317 +31,375 @@
  */
 public class PythonValidator extends org.lflang.generator.Validator {
 
-    /** The pattern that diagnostics from the Python compiler typically follow. */
-    private static final Pattern DIAGNOSTIC_MESSAGE_PATTERN = Pattern.compile(
-        "(\\*\\*\\*)?\\s*File \"(?<path>.*?\\.py)\", line (?<line>\\d+)"
-    );
-    /** The pattern typically followed by the message that typically follows the main diagnostic line. */
-    private static final Pattern MESSAGE = Pattern.compile("\\w*Error: .*");
-    /** An alternative pattern that at least some diagnostics from the Python compiler may follow. */
-    private static final Pattern ALT_DIAGNOSTIC_MESSAGE_PATTERN = Pattern.compile(
-        ".*Error:.*line (?<line>\\d+)\\)"
-    );
-
-    /** The JSON parser. */
-    private static final ObjectMapper mapper = new ObjectMapper()
-        .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-
-    private final Set<String> protoNames;
-
-    /**
-     * The message format of Pylint's JSON output.
-     */
-    @SuppressWarnings( {"FieldCanBeLocal", "unused"})  // Unused fields are included for completeness.
-    private static final class PylintMessage {
-        private String type;
-        private String module;
-        private String obj;
-        private Integer line;
-        private Integer column;
-        private Integer endLine;
-        private Integer endColumn;
-        private Path path;
-        private String symbol;
-        private String message;
-        private String messageId;
-        public void setType(String type) { this.type = type; }
-        public void setModule(String module) { this.module = module; }
-        public void setObj(String obj) { this.obj = obj; }
-        public void setLine(int line) { this.line = line; }
-        public void setColumn(int column) { this.column = column; }
-        public void setEndLine(int endLine) { this.endLine = endLine; }
-        public void setEndColumn(int endColumn) { this.endColumn = endColumn; }
-        public void setPath(String path) { this.path = Path.of(path); }
-        public void setSymbol(String symbol) { this.symbol = symbol; }
-        public void setMessage(String message) { this.message = message; }
-        @JsonProperty("message-id")
-        public void setMessageId(String messageId) { this.messageId = messageId; }
-        public Position getStart() {
-            if (line != null && column != null) return Position.fromZeroBased(line - 1, column);
-            // Use 0 as fallback for the column. This will cause bugs by taking some positions out of the line
-            // adjuster's range.
-            if (line != null) return Position.fromZeroBased(line - 1, 0);
-            // This fallback will always fail with the line adjuster, but at least the program will not crash.
-            return Position.ORIGIN;
-        }
-        public Position getEnd() {
-            return endLine == null || endColumn == null ? getStart().plus(" ") :
-                   Position.fromZeroBased(endLine - 1, endColumn);
-        }
-        public Path getPath(Path relativeTo) { return relativeTo.resolve(path); }
-        public DiagnosticSeverity getSeverity() {
-            // The following is consistent with VS Code's default behavior for pure Python:
-            // https://code.visualstudio.com/docs/python/linting#_pylint
-            switch (type.toLowerCase()) {
-            case "refactor":
-                return DiagnosticSeverity.Hint;
-            case "warning":
-                return DiagnosticSeverity.Warning;
-            case "error":
-            case "fatal":
-                return DiagnosticSeverity.Error;
-            case "convention":
-            default:
-                return DiagnosticSeverity.Information;
-            }
-        }
+  /** The pattern that diagnostics from the Python compiler typically follow. */
+  private static final Pattern DIAGNOSTIC_MESSAGE_PATTERN =
+      Pattern.compile("(\\*\\*\\*)?\\s*File \"(?<path>.*?\\.py)\", line (?<line>\\d+)");
+  /**
+   * The pattern typically followed by the message that typically follows the main diagnostic line.
+   */
+  private static final Pattern MESSAGE = Pattern.compile("\\w*Error: .*");
+  /** An alternative pattern that at least some diagnostics from the Python compiler may follow. */
+  private static final Pattern ALT_DIAGNOSTIC_MESSAGE_PATTERN =
+      Pattern.compile(".*Error:.*line (?<line>\\d+)\\)");
+
+  /** The JSON parser. */
+  private static final ObjectMapper mapper =
+      new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+  private final Set<String> protoNames;
+
+  /** The message format of Pylint's JSON output. */
+  @SuppressWarnings({"FieldCanBeLocal", "unused"}) // Unused fields are included for completeness.
+  private static final class PylintMessage {
+    private String type;
+    private String module;
+    private String obj;
+    private Integer line;
+    private Integer column;
+    private Integer endLine;
+    private Integer endColumn;
+    private Path path;
+    private String symbol;
+    private String message;
+    private String messageId;
+
+    public void setType(String type) {
+      this.type = type;
     }
 
-    private static final Pattern PylintNoNamePattern = Pattern.compile("Instance of '(?<name>\\w+)' has no .*");
-
-    private final FileConfig fileConfig;
-    private final ErrorReporter errorReporter;
-    private final ImmutableMap<Path, CodeMap> codeMaps;
-
-    /**
-     * Initialize a {@code PythonValidator} for a build process using {@code fileConfig} and
-     * report errors to {@code errorReporter}.
-     * @param fileConfig The file configuration of this build.
-     * @param errorReporter The reporter to which diagnostics should be sent.
-     * @param codeMaps A mapping from generated file paths to code maps that map them back to
-     *                 LF sources.
-     * @param protoNames The names of any protocol buffer message types that are used in the LF
-     *                   program being built.
-     */
-    public PythonValidator(
-        FileConfig fileConfig,
-        ErrorReporter errorReporter,
-        Map<Path,CodeMap> codeMaps,
-        Set<String> protoNames
-    ) {
-        super(errorReporter, codeMaps);
-        this.fileConfig = fileConfig;
-        this.errorReporter = errorReporter;
-        this.codeMaps = ImmutableMap.copyOf(codeMaps);
-        this.protoNames = ImmutableSet.copyOf(protoNames);
+    public void setModule(String module) {
+      this.module = module;
     }
 
-    @Override
-    protected Collection<ValidationStrategy> getPossibleStrategies() { return List.of(
+    public void setObj(String obj) {
+      this.obj = obj;
+    }
+
+    public void setLine(int line) {
+      this.line = line;
+    }
+
+    public void setColumn(int column) {
+      this.column = column;
+    }
+
+    public void setEndLine(int endLine) {
+      this.endLine = endLine;
+    }
+
+    public void setEndColumn(int endColumn) {
+      this.endColumn = endColumn;
+    }
+
+    public void setPath(String path) {
+      this.path = Path.of(path);
+    }
+
+    public void setSymbol(String symbol) {
+      this.symbol = symbol;
+    }
+
+    public void setMessage(String message) {
+      this.message = message;
+    }
+
+    @JsonProperty("message-id")
+    public void setMessageId(String messageId) {
+      this.messageId = messageId;
+    }
+
+    public Position getStart() {
+      if (line != null && column != null) return Position.fromZeroBased(line - 1, column);
+      // Use 0 as fallback for the column. This will cause bugs by taking some positions out of the
+      // line
+      // adjuster's range.
+      if (line != null) return Position.fromZeroBased(line - 1, 0);
+      // This fallback will always fail with the line adjuster, but at least the program will not
+      // crash.
+      return Position.ORIGIN;
+    }
+
+    public Position getEnd() {
+      return endLine == null || endColumn == null
+          ? getStart().plus(" ")
+          : Position.fromZeroBased(endLine - 1, endColumn);
+    }
+
+    public Path getPath(Path relativeTo) {
+      return relativeTo.resolve(path);
+    }
+
+    public DiagnosticSeverity getSeverity() {
+      // The following is consistent with VS Code's default behavior for pure Python:
+      // https://code.visualstudio.com/docs/python/linting#_pylint
+      switch (type.toLowerCase()) {
+        case "refactor":
+          return DiagnosticSeverity.Hint;
+        case "warning":
+          return DiagnosticSeverity.Warning;
+        case "error":
+        case "fatal":
+          return DiagnosticSeverity.Error;
+        case "convention":
+        default:
+          return DiagnosticSeverity.Information;
+      }
+    }
+  }
+
+  private static final Pattern PylintNoNamePattern =
+      Pattern.compile("Instance of '(?<name>\\w+)' has no .*");
+
+  private final FileConfig fileConfig;
+  private final ErrorReporter errorReporter;
+  private final ImmutableMap<Path, CodeMap> codeMaps;
+
+  /**
+   * Initialize a {@code PythonValidator} for a build process using {@code fileConfig} and report
+   * errors to {@code errorReporter}.
+   *
+   * @param fileConfig The file configuration of this build.
+   * @param errorReporter The reporter to which diagnostics should be sent.
+   * @param codeMaps A mapping from generated file paths to code maps that map them back to LF
+   *     sources.
+   * @param protoNames The names of any protocol buffer message types that are used in the LF
+   *     program being built.
+   */
+  public PythonValidator(
+      FileConfig fileConfig,
+      ErrorReporter errorReporter,
+      Map<Path, CodeMap> codeMaps,
+      Set<String> protoNames) {
+    super(errorReporter, codeMaps);
+    this.fileConfig = fileConfig;
+    this.errorReporter = errorReporter;
+    this.codeMaps = ImmutableMap.copyOf(codeMaps);
+    this.protoNames = ImmutableSet.copyOf(protoNames);
+  }
+
+  @Override
+  protected Collection<ValidationStrategy> getPossibleStrategies() {
+    return List.of(
         new ValidationStrategy() {
-            @Override
-            public LFCommand getCommand(Path generatedFile) {
-                return LFCommand.get(
-                    "python3",
-                    List.of("-c", "import compileall; compileall.compile_dir('.', quiet=1)"),
-                    true,
-                    fileConfig.getSrcGenPkgPath()
-                );
-            }
+          @Override
+          public LFCommand getCommand(Path generatedFile) {
+            return LFCommand.get(
+                "python3",
+                List.of("-c", "import compileall; compileall.compile_dir('.', quiet=1)"),
+                true,
+                fileConfig.getSrcGenPkgPath());
+          }
 
-            @Override
-            public Strategy getErrorReportingStrategy() {
-                return (a, b, c) -> {};
-            }
+          @Override
+          public Strategy getErrorReportingStrategy() {
+            return (a, b, c) -> {};
+          }
 
-            @Override
-            public Strategy getOutputReportingStrategy() {
-                return (String validationOutput, ErrorReporter errorReporter, Map<Path, CodeMap> map) -> {
-                    String[] lines = (validationOutput + "\n\n\n").lines().toArray(String[]::new);
-                    for (int i = 0; i < lines.length - 3; i++) {
-                        if (!tryReportTypical(lines, i)) {
-                            tryReportAlternative(lines, i);
-                        }
-                    }
-                };
-            }
+          @Override
+          public Strategy getOutputReportingStrategy() {
+            return (String validationOutput,
+                ErrorReporter errorReporter,
+                Map<Path, CodeMap> map) -> {
+              String[] lines = (validationOutput + "\n\n\n").lines().toArray(String[]::new);
+              for (int i = 0; i < lines.length - 3; i++) {
+                if (!tryReportTypical(lines, i)) {
+                  tryReportAlternative(lines, i);
+                }
+              }
+            };
+          }
 
-            /**
-             * Try to report a typical error message from the Python compiler.
-             *
-             * @param lines The lines of output from the compiler.
-             * @param i     The current index at which a message may start. Guaranteed to be less
-             *              than
-             *              {@code lines.length - 3}.
-             * @return Whether an error message was reported.
-             */
-            private boolean tryReportTypical(String[] lines, int i) {
-                Matcher main = DIAGNOSTIC_MESSAGE_PATTERN.matcher(lines[i]);
-                Matcher messageMatcher = MESSAGE.matcher(lines[i + 3]);
-                String message = messageMatcher.matches() ? messageMatcher.group() : "Syntax Error";
-                if (main.matches()) {
-                    int line = Integer.parseInt(main.group("line"));
-                    CodeMap map = codeMaps.get(fileConfig.getSrcGenPkgPath().resolve(Path.of(main.group("path"))).normalize());
-                    Position genPosition = Position.fromOneBased(line, Integer.MAX_VALUE); // Column is just a placeholder.
-                    if (map == null) {
-                        errorReporter.report(null, DiagnosticSeverity.Error, message, 1);  // Undesirable fallback
-                    } else {
-                        for (Path lfFile : map.lfSourcePaths()) {
-                            Position lfPosition = map.adjusted(lfFile, genPosition);
-                            // TODO: We could be more precise than just getting the right line, but the way the output
-                            //  is formatted (with leading whitespace possibly trimmed) does not make it easy.
-                            errorReporter.report(lfFile, DiagnosticSeverity.Error, message, lfPosition.getOneBasedLine());
-                        }
-                    }
-                    return true;
+          /**
+           * Try to report a typical error message from the Python compiler.
+           *
+           * @param lines The lines of output from the compiler.
+           * @param i The current index at which a message may start. Guaranteed to be less than
+           *     {@code lines.length - 3}.
+           * @return Whether an error message was reported.
+           */
+          private boolean tryReportTypical(String[] lines, int i) {
+            Matcher main = DIAGNOSTIC_MESSAGE_PATTERN.matcher(lines[i]);
+            Matcher messageMatcher = MESSAGE.matcher(lines[i + 3]);
+            String message = messageMatcher.matches() ? messageMatcher.group() : "Syntax Error";
+            if (main.matches()) {
+              int line = Integer.parseInt(main.group("line"));
+              CodeMap map =
+                  codeMaps.get(
+                      fileConfig
+                          .getSrcGenPkgPath()
+                          .resolve(Path.of(main.group("path")))
+                          .normalize());
+              Position genPosition =
+                  Position.fromOneBased(line, Integer.MAX_VALUE); // Column is just a placeholder.
+              if (map == null) {
+                errorReporter.report(
+                    null, DiagnosticSeverity.Error, message, 1); // Undesirable fallback
+              } else {
+                for (Path lfFile : map.lfSourcePaths()) {
+                  Position lfPosition = map.adjusted(lfFile, genPosition);
+                  // TODO: We could be more precise than just getting the right line, but the way
+                  // the output
+                  //  is formatted (with leading whitespace possibly trimmed) does not make it easy.
+                  errorReporter.report(
+                      lfFile, DiagnosticSeverity.Error, message, lfPosition.getOneBasedLine());
                 }
-                return false;
+              }
+              return true;
             }
+            return false;
+          }
 
-            /**
-             * Try to report an alternative error message from the Python compiler.
-             *
-             * @param lines The lines of output from the compiler.
-             * @param i     The current index at which a message may start.
-             */
-            private void tryReportAlternative(String[] lines, int i) {
-                Matcher main = ALT_DIAGNOSTIC_MESSAGE_PATTERN.matcher(lines[i]);
-                if (main.matches()) {
-                    int line = Integer.parseInt(main.group("line"));
-                    Iterable<CodeMap> relevantMaps = codeMaps.keySet().stream()
-                                                             .filter(p -> main.group().contains(p.getFileName().toString()))
-                                                             .map(codeMaps::get)::iterator;
-                    for (CodeMap map : relevantMaps) {  // There should almost always be exactly one of these
-                        for (Path lfFile : map.lfSourcePaths()) {
-                            errorReporter.report(
-                                lfFile,
-                                DiagnosticSeverity.Error,
-                                main.group().replace("*** ", "").replace("Sorry: ", ""),
-                                map.adjusted(lfFile, Position.fromOneBased(line, 1)).getOneBasedLine()
-                            );
-                        }
-                    }
+          /**
+           * Try to report an alternative error message from the Python compiler.
+           *
+           * @param lines The lines of output from the compiler.
+           * @param i The current index at which a message may start.
+           */
+          private void tryReportAlternative(String[] lines, int i) {
+            Matcher main = ALT_DIAGNOSTIC_MESSAGE_PATTERN.matcher(lines[i]);
+            if (main.matches()) {
+              int line = Integer.parseInt(main.group("line"));
+              Iterable<CodeMap> relevantMaps =
+                  codeMaps.keySet().stream()
+                          .filter(p -> main.group().contains(p.getFileName().toString()))
+                          .map(codeMaps::get)
+                      ::iterator;
+              for (CodeMap map :
+                  relevantMaps) { // There should almost always be exactly one of these
+                for (Path lfFile : map.lfSourcePaths()) {
+                  errorReporter.report(
+                      lfFile,
+                      DiagnosticSeverity.Error,
+                      main.group().replace("*** ", "").replace("Sorry: ", ""),
+                      map.adjusted(lfFile, Position.fromOneBased(line, 1)).getOneBasedLine());
                 }
+              }
             }
+          }
 
-            @Override
-            public boolean isFullBatch() {
-                return true;
-            }
+          @Override
+          public boolean isFullBatch() {
+            return true;
+          }
 
-            @Override
-            public int getPriority() {
-                return 0;
-            }
+          @Override
+          public int getPriority() {
+            return 0;
+          }
         },
         new ValidationStrategy() {
-            @Override
-            public LFCommand getCommand(Path generatedFile) {
-                return LFCommand.get(
-                    "pylint",
-                    List.of("--output-format=json", generatedFile.getFileName().toString()),
-                    true,
-                    fileConfig.getSrcGenPath()
-                );
-            }
+          @Override
+          public LFCommand getCommand(Path generatedFile) {
+            return LFCommand.get(
+                "pylint",
+                List.of("--output-format=json", generatedFile.getFileName().toString()),
+                true,
+                fileConfig.getSrcGenPath());
+          }
 
-            @Override
-            public Strategy getErrorReportingStrategy() {
-                return (a, b, c) -> {};
-            }
+          @Override
+          public Strategy getErrorReportingStrategy() {
+            return (a, b, c) -> {};
+          }
 
-            @Override
-            public Strategy getOutputReportingStrategy() {
-                return (validationOutput, errorReporter, codeMaps) -> {
-                    if (validationOutput.isBlank()) return;
-                    try {
-                        for (PylintMessage message : mapper.readValue(validationOutput, PylintMessage[].class)) {
-                            if (shouldIgnore(message)) continue;
-                            CodeMap map = codeMaps.get(message.getPath(fileConfig.getSrcGenPath()));
-                            if (map != null) {
-                                for (Path lfFile : map.lfSourcePaths()) {
-                                    Function<Position, Position> adjust = p -> map.adjusted(lfFile, p);
-                                    String humanMessage = DiagnosticReporting.messageOf(
-                                        message.message,
-                                        message.getPath(fileConfig.getSrcGenPath()),
-                                        message.getStart()
-                                    );
-                                    Position lfStart = adjust.apply(message.getStart());
-                                    Position lfEnd = adjust.apply(message.getEnd());
-                                    bestEffortReport(
-                                        errorReporter,
-                                        adjust,
-                                        lfStart,
-                                        lfEnd,
-                                        lfFile,
-                                        message.getSeverity(),
-                                        humanMessage
-                                    );
-                                }
-                            }
-                        }
-                    } catch (JsonProcessingException e) {
-                        System.err.printf("Failed to parse \"%s\":%n", validationOutput);
-                        e.printStackTrace();
-                        errorReporter.reportWarning(
-                            "Failed to parse linter output. The Lingua Franca code generator is tested with Pylint "
-                             + "version 2.12.2. Consider updating Pylint if you have an older version."
-                        );
+          @Override
+          public Strategy getOutputReportingStrategy() {
+            return (validationOutput, errorReporter, codeMaps) -> {
+              if (validationOutput.isBlank()) return;
+              try {
+                for (PylintMessage message :
+                    mapper.readValue(validationOutput, PylintMessage[].class)) {
+                  if (shouldIgnore(message)) continue;
+                  CodeMap map = codeMaps.get(message.getPath(fileConfig.getSrcGenPath()));
+                  if (map != null) {
+                    for (Path lfFile : map.lfSourcePaths()) {
+                      Function<Position, Position> adjust = p -> map.adjusted(lfFile, p);
+                      String humanMessage =
+                          DiagnosticReporting.messageOf(
+                              message.message,
+                              message.getPath(fileConfig.getSrcGenPath()),
+                              message.getStart());
+                      Position lfStart = adjust.apply(message.getStart());
+                      Position lfEnd = adjust.apply(message.getEnd());
+                      bestEffortReport(
+                          errorReporter,
+                          adjust,
+                          lfStart,
+                          lfEnd,
+                          lfFile,
+                          message.getSeverity(),
+                          humanMessage);
                     }
-                };
-            }
+                  }
+                }
+              } catch (JsonProcessingException e) {
+                System.err.printf("Failed to parse \"%s\":%n", validationOutput);
+                e.printStackTrace();
+                errorReporter.reportWarning(
+                    "Failed to parse linter output. The Lingua Franca code generator is tested with"
+                        + " Pylint version 2.12.2. Consider updating Pylint if you have an older"
+                        + " version.");
+              }
+            };
+          }
 
-            /**
-             * Return whether the given message should be ignored.
-             * @param message A Pylint message that is a candidate to be reported.
-             * @return whether {@code message} should be reported.
-             */
-            private boolean shouldIgnore(PylintMessage message) {
-                // Code generation does not preserve whitespace, so this check is unreliable.
-                if (message.symbol.equals("trailing-whitespace") || message.symbol.equals("line-too-long")) return true;
-                // This filters out Pylint messages concerning missing members in types defined by protocol buffers.
-                // FIXME: Make this unnecessary, perhaps using https://github.com/nelfin/pylint-protobuf.
-                Matcher matcher = PylintNoNamePattern.matcher(message.message);
-                return message.symbol.equals("no-member")
-                        && matcher.matches() && protoNames.contains(matcher.group("name"));
-            }
+          /**
+           * Return whether the given message should be ignored.
+           *
+           * @param message A Pylint message that is a candidate to be reported.
+           * @return whether {@code message} should be reported.
+           */
+          private boolean shouldIgnore(PylintMessage message) {
+            // Code generation does not preserve whitespace, so this check is unreliable.
+            if (message.symbol.equals("trailing-whitespace")
+                || message.symbol.equals("line-too-long")) return true;
+            // This filters out Pylint messages concerning missing members in types defined by
+            // protocol buffers.
+            // FIXME: Make this unnecessary, perhaps using
+            // https://github.com/nelfin/pylint-protobuf.
+            Matcher matcher = PylintNoNamePattern.matcher(message.message);
+            return message.symbol.equals("no-member")
+                && matcher.matches()
+                && protoNames.contains(matcher.group("name"));
+          }
 
-            /** Make a best-effort attempt to place the diagnostic on the correct line. */
-            private void bestEffortReport(
-                ErrorReporter errorReporter,
-                Function<Position, Position> adjust,
-                Position lfStart,
-                Position lfEnd,
-                Path file,
-                DiagnosticSeverity severity,
-                String humanMessage
-            ) {
-                if (!lfEnd.equals(Position.ORIGIN) && !lfStart.equals(Position.ORIGIN)) { // Ideal case
-                    errorReporter.report(file, severity, humanMessage, lfStart, lfEnd);
-                } else {  // Fallback: Try to report on the correct line, or failing that, just line 1.
-                    if (lfStart.equals(Position.ORIGIN)) lfStart = adjust.apply(
-                        Position.fromZeroBased(lfStart.getZeroBasedLine(), Integer.MAX_VALUE)
-                    );
-                    // FIXME: It might be better to improve style of generated code instead of quietly returning here.
-                    if (lfStart.equals(Position.ORIGIN) && severity != DiagnosticSeverity.Error) return;
-                    errorReporter.report(file, severity, humanMessage, lfStart.getOneBasedLine());
-                }
+          /** Make a best-effort attempt to place the diagnostic on the correct line. */
+          private void bestEffortReport(
+              ErrorReporter errorReporter,
+              Function<Position, Position> adjust,
+              Position lfStart,
+              Position lfEnd,
+              Path file,
+              DiagnosticSeverity severity,
+              String humanMessage) {
+            if (!lfEnd.equals(Position.ORIGIN) && !lfStart.equals(Position.ORIGIN)) { // Ideal case
+              errorReporter.report(file, severity, humanMessage, lfStart, lfEnd);
+            } else { // Fallback: Try to report on the correct line, or failing that, just line 1.
+              if (lfStart.equals(Position.ORIGIN))
+                lfStart =
+                    adjust.apply(
+                        Position.fromZeroBased(lfStart.getZeroBasedLine(), Integer.MAX_VALUE));
+              // FIXME: It might be better to improve style of generated code instead of quietly
+              // returning here.
+              if (lfStart.equals(Position.ORIGIN) && severity != DiagnosticSeverity.Error) return;
+              errorReporter.report(file, severity, humanMessage, lfStart.getOneBasedLine());
             }
+          }
 
-            @Override
-            public boolean isFullBatch() {
-                return false;
-            }
+          @Override
+          public boolean isFullBatch() {
+            return false;
+          }
 
-            @Override
-            public int getPriority() {
-                return 1;
-            }
-        }
-    ); }
+          @Override
+          public int getPriority() {
+            return 1;
+          }
+        });
+  }
 
-    @Override
-    protected Pair<Strategy, Strategy> getBuildReportingStrategies() {
-        return new Pair<>((a, b, c) -> {}, (a, b, c) -> {});
-    }
+  @Override
+  protected Pair<Strategy, Strategy> getBuildReportingStrategies() {
+    return new Pair<>((a, b, c) -> {}, (a, b, c) -> {});
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/rust/CargoDependencySpec.java b/org.lflang/src/org/lflang/generator/rust/CargoDependencySpec.java
index 69efcd3fab..ff97860970 100644
--- a/org.lflang/src/org/lflang/generator/rust/CargoDependencySpec.java
+++ b/org.lflang/src/org/lflang/generator/rust/CargoDependencySpec.java
@@ -31,9 +31,9 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.lflang.ast.ASTUtils;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.TargetPropertyType;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.InvalidLfSourceException;
 import org.lflang.lf.Array;
 import org.lflang.lf.Element;
@@ -202,14 +202,12 @@ private static CargoDependencySpec parseValue(Element element, boolean isRuntime
               pair.getValue(), "Expected string literal for key '" + name + "'");
         }
         switch (name) {
-        case "version" -> version = literal;
-        case "git" -> gitRepo = literal;
-        case "rev" -> rev = literal;
-        case "tag" -> tag = literal;
-        case "path" -> localPath = literal;
-        default -> throw new InvalidLfSourceException(pair,
-                                                      "Unknown key: '" + name
-                                                          + "'");
+          case "version" -> version = literal;
+          case "git" -> gitRepo = literal;
+          case "rev" -> rev = literal;
+          case "tag" -> tag = literal;
+          case "path" -> localPath = literal;
+          default -> throw new InvalidLfSourceException(pair, "Unknown key: '" + name + "'");
         }
       }
       if (isRuntimeCrate || version != null || localPath != null || gitRepo != null) {
diff --git a/org.lflang/src/org/lflang/generator/rust/RustTargetConfig.java b/org.lflang/src/org/lflang/generator/rust/RustTargetConfig.java
index f2ff9d9c3f..b4e9a1778b 100644
--- a/org.lflang/src/org/lflang/generator/rust/RustTargetConfig.java
+++ b/org.lflang/src/org/lflang/generator/rust/RustTargetConfig.java
@@ -29,11 +29,8 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.lflang.ErrorReporter;
 import org.lflang.TargetProperty.BuildType;
 
@@ -44,83 +41,66 @@
  */
 public final class RustTargetConfig {
 
-
-    /**
-     * List of Cargo features of the generated crate to enable.
-     */
-    private List<String> cargoFeatures = new ArrayList<>();
-
-    /**
-     * Map of Cargo dependency to dependency properties.
-     */
-    private Map<String, CargoDependencySpec> cargoDependencies = new HashMap<>();
-
-    /**
-     * List of top-level modules, those are absolute paths.
-     */
-    private final List<Path> rustTopLevelModules = new ArrayList<>();
-
-    /**
-     * Cargo profile, default is debug (corresponds to cargo dev profile).
-     */
-    private BuildType profile = BuildType.DEBUG;
-
-    public void setCargoFeatures(List<String> cargoFeatures) {
-        this.cargoFeatures = cargoFeatures;
-    }
-
-    public void setCargoDependencies(Map<String, CargoDependencySpec> cargoDependencies) {
-        this.cargoDependencies = cargoDependencies;
+  /** List of Cargo features of the generated crate to enable. */
+  private List<String> cargoFeatures = new ArrayList<>();
+
+  /** Map of Cargo dependency to dependency properties. */
+  private Map<String, CargoDependencySpec> cargoDependencies = new HashMap<>();
+
+  /** List of top-level modules, those are absolute paths. */
+  private final List<Path> rustTopLevelModules = new ArrayList<>();
+
+  /** Cargo profile, default is debug (corresponds to cargo dev profile). */
+  private BuildType profile = BuildType.DEBUG;
+
+  public void setCargoFeatures(List<String> cargoFeatures) {
+    this.cargoFeatures = cargoFeatures;
+  }
+
+  public void setCargoDependencies(Map<String, CargoDependencySpec> cargoDependencies) {
+    this.cargoDependencies = cargoDependencies;
+  }
+
+  public void addAndCheckTopLevelModule(Path path, EObject errorOwner, ErrorReporter err) {
+    String fileName = path.getFileName().toString();
+    if (!Files.exists(path)) {
+      err.reportError(errorOwner, "File not found");
+    } else if (Files.isRegularFile(path) && !fileName.endsWith(".rs")) {
+      err.reportError(errorOwner, "Not a rust file");
+    } else if (fileName.equals("main.rs")) {
+      err.reportError(errorOwner, "Cannot use 'main.rs' as a module name (reserved)");
+    } else if (fileName.equals("reactors") || fileName.equals("reactors.rs")) {
+      err.reportError(errorOwner, "Cannot use 'reactors' as a module name (reserved)");
+    } else if (Files.isDirectory(path) && !Files.exists(path.resolve("mod.rs"))) {
+      err.reportError(errorOwner, "Cannot find module descriptor in directory");
     }
-
-    public void addAndCheckTopLevelModule(Path path, EObject errorOwner, ErrorReporter err) {
-        String fileName = path.getFileName().toString();
-        if (!Files.exists(path)) {
-            err.reportError(errorOwner, "File not found");
-        } else if (Files.isRegularFile(path) && !fileName.endsWith(".rs")) {
-            err.reportError(errorOwner, "Not a rust file");
-        } else if (fileName.equals("main.rs")) {
-            err.reportError(errorOwner, "Cannot use 'main.rs' as a module name (reserved)");
-        } else if (fileName.equals("reactors") || fileName.equals("reactors.rs")) {
-            err.reportError(errorOwner, "Cannot use 'reactors' as a module name (reserved)");
-        } else if (Files.isDirectory(path) && !Files.exists(path.resolve("mod.rs"))) {
-            err.reportError(errorOwner, "Cannot find module descriptor in directory");
-        }
-        this.rustTopLevelModules.add(path);
-    }
-
-    public List<String> getCargoFeatures() {
-        return cargoFeatures;
-    }
-
-    /**
-     * Returns a map of cargo dependencies.
-     */
-    public Map<String, CargoDependencySpec> getCargoDependencies() {
-        return cargoDependencies;
-    }
-
-    /**
-     * Returns the list of top-level module files to include in main.rs.
-     * Those files were checked to exists previously.
-     */
-    public List<Path> getRustTopLevelModules() {
-        return rustTopLevelModules;
-    }
-
-    /**
-     * The build type to use. Corresponds to a Cargo profile.
-     */
-    public BuildType getBuildType() {
-        return profile;
-    }
-
-
-    /**
-     * Set a build profile chosen based on a cmake profile.
-     */
-    public void setBuildType(BuildType profile) {
-        this.profile = profile;
-    }
-
+    this.rustTopLevelModules.add(path);
+  }
+
+  public List<String> getCargoFeatures() {
+    return cargoFeatures;
+  }
+
+  /** Returns a map of cargo dependencies. */
+  public Map<String, CargoDependencySpec> getCargoDependencies() {
+    return cargoDependencies;
+  }
+
+  /**
+   * Returns the list of top-level module files to include in main.rs. Those files were checked to
+   * exists previously.
+   */
+  public List<Path> getRustTopLevelModules() {
+    return rustTopLevelModules;
+  }
+
+  /** The build type to use. Corresponds to a Cargo profile. */
+  public BuildType getBuildType() {
+    return profile;
+  }
+
+  /** Set a build profile chosen based on a cmake profile. */
+  public void setBuildType(BuildType profile) {
+    this.profile = profile;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/ts/TSDockerGenerator.java b/org.lflang/src/org/lflang/generator/ts/TSDockerGenerator.java
index cf89596a56..1e88ba4c12 100644
--- a/org.lflang/src/org/lflang/generator/ts/TSDockerGenerator.java
+++ b/org.lflang/src/org/lflang/generator/ts/TSDockerGenerator.java
@@ -10,20 +10,19 @@
  */
 public class TSDockerGenerator extends DockerGenerator {
 
-    /** Construct a new Docker generator. */
-    public TSDockerGenerator(LFGeneratorContext context) {
-        super(context);
-    }
+  /** Construct a new Docker generator. */
+  public TSDockerGenerator(LFGeneratorContext context) {
+    super(context);
+  }
 
-    /**
-    * Return the content of the docker file for [tsFileName].
-    */
-    public String generateDockerFileContent() {
-        return """
+  /** Return the content of the docker file for [tsFileName]. */
+  public String generateDockerFileContent() {
+    return """
         |FROM node:alpine
         |WORKDIR /linguafranca/$name
         |COPY . .
         |ENTRYPOINT ["node", "dist/%s.js"]
-        """.formatted(context.getFileConfig().name);
-    }
+        """
+        .formatted(context.getFileConfig().name);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/ts/TSTypes.java b/org.lflang/src/org/lflang/generator/ts/TSTypes.java
index 2e2c6a6dff..0fe4fc8a5e 100644
--- a/org.lflang/src/org/lflang/generator/ts/TSTypes.java
+++ b/org.lflang/src/org/lflang/generator/ts/TSTypes.java
@@ -1,75 +1,73 @@
 package org.lflang.generator.ts;
 
 import java.util.List;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.TargetTypes;
 import org.lflang.generator.UnsupportedGeneratorFeatureException;
 import org.lflang.lf.StateVar;
 
 public class TSTypes implements TargetTypes {
 
-    private static TSTypes INSTANCE = new TSTypes();
-
-    private TSTypes() {
-
-    }
-
-    @Override
-    public String getTargetType(StateVar s) {
-        var type = TargetTypes.super.getTargetType(s);
-        if (!ASTUtils.isInitialized(s)) {
-            return "%s | undefined".formatted(type);
-        } else {
-            return type;
-        }
-    }
-
-    @Override
-    public boolean supportsGenerics() {
-        return true;
-    }
-
-    @Override
-    public String getTargetTimeType() {
-        return "TimeValue";
-    }
-
-    @Override
-    public String getTargetTagType() {
-        return "TimeValue";
-    }
+  private static TSTypes INSTANCE = new TSTypes();
 
-    @Override
-    public String getTargetUndefinedType() {
-        return "Present";
-    }
-
-    public String getTargetTimeExpr(TimeValue value) {
-        if (value.unit != null) {
-            return "TimeValue.%s(%s)".formatted(value.unit.getCanonicalName(), value.time);
-        } else {
-            // The value must be zero.
-            return "TimeValue.zero()";
-        }
-    }
+  private TSTypes() {}
 
-    @Override
-    public String getTargetFixedSizeListType(String baseType, int size) {
-        throw new UnsupportedGeneratorFeatureException("TypeScript does not support fixed-size array types.");
+  @Override
+  public String getTargetType(StateVar s) {
+    var type = TargetTypes.super.getTargetType(s);
+    if (!ASTUtils.isInitialized(s)) {
+      return "%s | undefined".formatted(type);
+    } else {
+      return type;
     }
-
-    @Override
-    public String getTargetVariableSizeListType(String baseType) {
-        return "Array<%s>".formatted(baseType); // same as "$baseType[]"
-    }
-
-    public String getVariableSizeListInitExpression(List<String> contents, boolean withBraces) {
-        return "[" + String.join(", ", contents) + "]";
-    }
-
-    public static TSTypes getInstance() {
-        return INSTANCE;
+  }
+
+  @Override
+  public boolean supportsGenerics() {
+    return true;
+  }
+
+  @Override
+  public String getTargetTimeType() {
+    return "TimeValue";
+  }
+
+  @Override
+  public String getTargetTagType() {
+    return "TimeValue";
+  }
+
+  @Override
+  public String getTargetUndefinedType() {
+    return "Present";
+  }
+
+  public String getTargetTimeExpr(TimeValue value) {
+    if (value.unit != null) {
+      return "TimeValue.%s(%s)".formatted(value.unit.getCanonicalName(), value.time);
+    } else {
+      // The value must be zero.
+      return "TimeValue.zero()";
     }
+  }
+
+  @Override
+  public String getTargetFixedSizeListType(String baseType, int size) {
+    throw new UnsupportedGeneratorFeatureException(
+        "TypeScript does not support fixed-size array types.");
+  }
+
+  @Override
+  public String getTargetVariableSizeListType(String baseType) {
+    return "Array<%s>".formatted(baseType); // same as "$baseType[]"
+  }
+
+  public String getVariableSizeListInitExpression(List<String> contents, boolean withBraces) {
+    return "[" + String.join(", ", contents) + "]";
+  }
+
+  public static TSTypes getInstance() {
+    return INSTANCE;
+  }
 }
diff --git a/org.lflang/src/org/lflang/graph/DirectedGraph.java b/org.lflang/src/org/lflang/graph/DirectedGraph.java
index 771bbca539..0e506dbe30 100644
--- a/org.lflang/src/org/lflang/graph/DirectedGraph.java
+++ b/org.lflang/src/org/lflang/graph/DirectedGraph.java
@@ -1,25 +1,25 @@
 /*************
- Copyright (c) 2019, The University of California at Berkeley.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
 
 package org.lflang.graph;
@@ -27,7 +27,6 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
-
 import org.lflang.util.CollectionUtil;
 
 /**
@@ -38,287 +37,254 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  */
 public class DirectedGraph<T> implements Graph<T> {
 
-    // Note that while both those maps are mutable, the sets
-    // they use as values may not be. They should only be
-    // manipulated through CollectionUtil
-
-    // If a node has no neighbors, it is still in the map with an empty set as a value.
-
-    /**
-     * Adjacency map from vertices to their downstream immediate neighbors.
-     */
-    private final Map<T, Set<T>> downstreamAdjacentNodes = new LinkedHashMap<>();
-
-    /**
-     * Adjacency map from vertices to their upstream immediate neighbors.
-     */
-    private final Map<T, Set<T>> upstreamAdjacentNodes = new LinkedHashMap<>();
-
-
-    /**
-     * Mark the graph to have changed so that any cached analysis is refreshed
-     * accordingly.
-     */
-    protected void graphChanged() {
-        // To be overridden by subclasses that perform analysis.
-    }
-
-
-    /**
-     * Return true if this graph has the given node in it.
-     *
-     * @param node The node to look for.
-     */
-    @Override
-    public boolean hasNode(T node) {
-        return nodes().contains(node);
-    }
-
-
-    /**
-     * Return all immediate upstream neighbors of a given node.
-     *
-     * @param node The node to report the immediate upstream neighbors of.
-     */
-    public Set<T> getUpstreamAdjacentNodes(T node) {
-        return Collections.unmodifiableSet(this.upstreamAdjacentNodes.getOrDefault(node, Set.of()));
-    }
-
-
-    /**
-     * Return all immediate downstream neighbors of a given node.
-     *
-     * @param node The node to report the immediate downstream neighbors of.
-     */
-    public Set<T> getDownstreamAdjacentNodes(T node) {
-        return Collections.unmodifiableSet(this.downstreamAdjacentNodes.getOrDefault(node, Set.of()));
-    }
-
-
-    @Override
-    public void addNode(T node) {
-        this.graphChanged();
-        this.upstreamAdjacentNodes.putIfAbsent(node, Set.of());
-        this.downstreamAdjacentNodes.putIfAbsent(node, Set.of());
-    }
-
-
-    @Override
-    public void removeNode(T node) {
-        this.graphChanged();
-        this.upstreamAdjacentNodes.remove(node);
-        this.downstreamAdjacentNodes.remove(node);
-        // The node also needs to be removed from the sets that represent connections to the node.
-        CollectionUtil.removeFromValues(this.upstreamAdjacentNodes, node);
-        CollectionUtil.removeFromValues(this.downstreamAdjacentNodes, node);
-    }
-
-
-    /**
-     * Add a new directed edge to the graph. The first argument is
-     * the downstream node, the second argument the upstream node.
-     * If either argument is null, do nothing.
-     *
-     * @param sink   The downstream immediate neighbor.
-     * @param source The upstream immediate neighbor.
-     */
-    @Override
-    public void addEdge(T sink, T source) {
-        this.graphChanged();
-        if (sink != null && source != null) {
-            this.downstreamAdjacentNodes.compute(source, (k, set) -> CollectionUtil.plus(set, sink));
-            this.upstreamAdjacentNodes.compute(sink, (k, set) -> CollectionUtil.plus(set, source));
-        }
-    }
-
-
-    /**
-     * Add new directed edges to the graph. The first argument is the
-     * downstream node, the second argument a set of upstream nodes.
-     *
-     * @param sink    The downstream immediate neighbor.
-     * @param sources The upstream immediate neighbors.
-     */
-    @Override
-    public void addEdges(T sink, List<T> sources) {
-        for (T source : sources) {
-            this.addEdge(sink, source);
-        }
-    }
-
-
-    /**
-     * Remove a directed edge from the graph.
-     *
-     * @param sink   The downstream immediate neighbor.
-     * @param source The upstream immediate neighbor.
-     */
-    @Override
-    public void removeEdge(T sink, T source) {
-        this.graphChanged();
-        this.upstreamAdjacentNodes.computeIfPresent(sink, (k, upstream) -> CollectionUtil.minus(upstream, source));
-        this.downstreamAdjacentNodes.computeIfPresent(source, (k, downstream) -> CollectionUtil.minus(downstream, sink));
-    }
-
-
-    /**
-     * Obtain a copy of this graph by creating an new instance and copying
-     * the adjacency maps.
-     */
-    public DirectedGraph<T> copy() {
-        var graph = new DirectedGraph<T>();
-        for (var entry : this.upstreamAdjacentNodes.entrySet()) {
-            graph.upstreamAdjacentNodes.put(entry.getKey(), CollectionUtil.copy(entry.getValue()));
-        }
-        for (var entry : this.downstreamAdjacentNodes.entrySet()) {
-            graph.downstreamAdjacentNodes.put(entry.getKey(), CollectionUtil.copy(entry.getValue()));
-        }
-        return graph;
-    }
-
-
-    /**
-     * For a given a two adjacency maps, copy missing edges from the first
-     * map to the second.
-     *
-     * @param srcMap The adjacency map to copy edges from.
-     * @param dstMap The adjacency map to copy edges to.
-     */
-    private void mirror(Map<T, Set<T>> srcMap, Map<T, Set<T>> dstMap) {
-        if (srcMap != null && dstMap != null) {
-            for (Entry<T, Set<T>> entry : srcMap.entrySet()) {
-                var node = entry.getKey();
-                var srcEdges = entry.getValue();
-                dstMap.compute(node, (_node, dstEdges) -> {
-                    // Node does not exist; add it.
-                    if (dstEdges == null) {
-                        return CollectionUtil.copy(srcEdges);
-                    }
-
-                    // Node does exist; add the missing edges.
-                    var set = dstEdges;
-                    for (T edge : srcEdges) {
-                        set = CollectionUtil.plus(set, edge);
-                    }
-                    return set;
-                });
-            }
-        }
-    }
-
-
-    /**
-     * Merge another directed graph into this one.
-     *
-     * @param another The graph to merge into this one.
-     */
-    public void merge(DirectedGraph<T> another) {
-        this.graphChanged();
-        mirror(another.upstreamAdjacentNodes, this.upstreamAdjacentNodes);
-        mirror(another.downstreamAdjacentNodes, this.downstreamAdjacentNodes);
-    }
-
-
-    /**
-     * Return the set of nodes that have no neighbors listed in the given
-     * adjacency map.
-     */
-    private Set<T> independentNodes(Map<T, Set<T>> adjacencyMap) {
-        var independent = new LinkedHashSet<T>();
-        for (T node : nodes()) {
-            var neighbors = adjacencyMap.get(node);
-            if (neighbors == null || neighbors.size() == 0) {
-                independent.add(node);
-            }
-        }
-        return independent;
+  // Note that while both those maps are mutable, the sets
+  // they use as values may not be. They should only be
+  // manipulated through CollectionUtil
+
+  // If a node has no neighbors, it is still in the map with an empty set as a value.
+
+  /** Adjacency map from vertices to their downstream immediate neighbors. */
+  private final Map<T, Set<T>> downstreamAdjacentNodes = new LinkedHashMap<>();
+
+  /** Adjacency map from vertices to their upstream immediate neighbors. */
+  private final Map<T, Set<T>> upstreamAdjacentNodes = new LinkedHashMap<>();
+
+  /** Mark the graph to have changed so that any cached analysis is refreshed accordingly. */
+  protected void graphChanged() {
+    // To be overridden by subclasses that perform analysis.
+  }
+
+  /**
+   * Return true if this graph has the given node in it.
+   *
+   * @param node The node to look for.
+   */
+  @Override
+  public boolean hasNode(T node) {
+    return nodes().contains(node);
+  }
+
+  /**
+   * Return all immediate upstream neighbors of a given node.
+   *
+   * @param node The node to report the immediate upstream neighbors of.
+   */
+  public Set<T> getUpstreamAdjacentNodes(T node) {
+    return Collections.unmodifiableSet(this.upstreamAdjacentNodes.getOrDefault(node, Set.of()));
+  }
+
+  /**
+   * Return all immediate downstream neighbors of a given node.
+   *
+   * @param node The node to report the immediate downstream neighbors of.
+   */
+  public Set<T> getDownstreamAdjacentNodes(T node) {
+    return Collections.unmodifiableSet(this.downstreamAdjacentNodes.getOrDefault(node, Set.of()));
+  }
+
+  @Override
+  public void addNode(T node) {
+    this.graphChanged();
+    this.upstreamAdjacentNodes.putIfAbsent(node, Set.of());
+    this.downstreamAdjacentNodes.putIfAbsent(node, Set.of());
+  }
+
+  @Override
+  public void removeNode(T node) {
+    this.graphChanged();
+    this.upstreamAdjacentNodes.remove(node);
+    this.downstreamAdjacentNodes.remove(node);
+    // The node also needs to be removed from the sets that represent connections to the node.
+    CollectionUtil.removeFromValues(this.upstreamAdjacentNodes, node);
+    CollectionUtil.removeFromValues(this.downstreamAdjacentNodes, node);
+  }
+
+  /**
+   * Add a new directed edge to the graph. The first argument is the downstream node, the second
+   * argument the upstream node. If either argument is null, do nothing.
+   *
+   * @param sink The downstream immediate neighbor.
+   * @param source The upstream immediate neighbor.
+   */
+  @Override
+  public void addEdge(T sink, T source) {
+    this.graphChanged();
+    if (sink != null && source != null) {
+      this.downstreamAdjacentNodes.compute(source, (k, set) -> CollectionUtil.plus(set, sink));
+      this.upstreamAdjacentNodes.compute(sink, (k, set) -> CollectionUtil.plus(set, source));
     }
-
-
-    /**
-     * Return the root nodes of this graph.
-     * Root nodes have no upstream neighbors.
-     */
-    public Set<T> rootNodes() {
-        return independentNodes(this.upstreamAdjacentNodes);
+  }
+
+  /**
+   * Add new directed edges to the graph. The first argument is the downstream node, the second
+   * argument a set of upstream nodes.
+   *
+   * @param sink The downstream immediate neighbor.
+   * @param sources The upstream immediate neighbors.
+   */
+  @Override
+  public void addEdges(T sink, List<T> sources) {
+    for (T source : sources) {
+      this.addEdge(sink, source);
     }
-
-
-    /**
-     * Return the leaf nodes of this graph.
-     * Leaf nodes have no downstream neighbors.
-     */
-    public Set<T> leafNodes() {
-        return independentNodes(this.downstreamAdjacentNodes);
+  }
+
+  /**
+   * Remove a directed edge from the graph.
+   *
+   * @param sink The downstream immediate neighbor.
+   * @param source The upstream immediate neighbor.
+   */
+  @Override
+  public void removeEdge(T sink, T source) {
+    this.graphChanged();
+    this.upstreamAdjacentNodes.computeIfPresent(
+        sink, (k, upstream) -> CollectionUtil.minus(upstream, source));
+    this.downstreamAdjacentNodes.computeIfPresent(
+        source, (k, downstream) -> CollectionUtil.minus(downstream, sink));
+  }
+
+  /** Obtain a copy of this graph by creating an new instance and copying the adjacency maps. */
+  public DirectedGraph<T> copy() {
+    var graph = new DirectedGraph<T>();
+    for (var entry : this.upstreamAdjacentNodes.entrySet()) {
+      graph.upstreamAdjacentNodes.put(entry.getKey(), CollectionUtil.copy(entry.getValue()));
     }
-
-
-    @Override
-    public int nodeCount() {
-        return downstreamAdjacentNodes.size();
+    for (var entry : this.downstreamAdjacentNodes.entrySet()) {
+      graph.downstreamAdjacentNodes.put(entry.getKey(), CollectionUtil.copy(entry.getValue()));
     }
-
-
-    @Override
-    public int edgeCount() {
-        return this.upstreamAdjacentNodes.values().stream().mapToInt(Set::size).sum();
+    return graph;
+  }
+
+  /**
+   * For a given a two adjacency maps, copy missing edges from the first map to the second.
+   *
+   * @param srcMap The adjacency map to copy edges from.
+   * @param dstMap The adjacency map to copy edges to.
+   */
+  private void mirror(Map<T, Set<T>> srcMap, Map<T, Set<T>> dstMap) {
+    if (srcMap != null && dstMap != null) {
+      for (Entry<T, Set<T>> entry : srcMap.entrySet()) {
+        var node = entry.getKey();
+        var srcEdges = entry.getValue();
+        dstMap.compute(
+            node,
+            (_node, dstEdges) -> {
+              // Node does not exist; add it.
+              if (dstEdges == null) {
+                return CollectionUtil.copy(srcEdges);
+              }
+
+              // Node does exist; add the missing edges.
+              var set = dstEdges;
+              for (T edge : srcEdges) {
+                set = CollectionUtil.plus(set, edge);
+              }
+              return set;
+            });
+      }
     }
-
-
-    @Override
-    public Set<T> nodes() {
-        return Collections.unmodifiableSet(this.downstreamAdjacentNodes.keySet());
+  }
+
+  /**
+   * Merge another directed graph into this one.
+   *
+   * @param another The graph to merge into this one.
+   */
+  public void merge(DirectedGraph<T> another) {
+    this.graphChanged();
+    mirror(another.upstreamAdjacentNodes, this.upstreamAdjacentNodes);
+    mirror(another.downstreamAdjacentNodes, this.downstreamAdjacentNodes);
+  }
+
+  /** Return the set of nodes that have no neighbors listed in the given adjacency map. */
+  private Set<T> independentNodes(Map<T, Set<T>> adjacencyMap) {
+    var independent = new LinkedHashSet<T>();
+    for (T node : nodes()) {
+      var neighbors = adjacencyMap.get(node);
+      if (neighbors == null || neighbors.size() == 0) {
+        independent.add(node);
+      }
     }
-
-
-    public void clear() {
-        this.graphChanged();
-        this.downstreamAdjacentNodes.clear();
-        this.upstreamAdjacentNodes.clear();
+    return independent;
+  }
+
+  /** Return the root nodes of this graph. Root nodes have no upstream neighbors. */
+  public Set<T> rootNodes() {
+    return independentNodes(this.upstreamAdjacentNodes);
+  }
+
+  /** Return the leaf nodes of this graph. Leaf nodes have no downstream neighbors. */
+  public Set<T> leafNodes() {
+    return independentNodes(this.downstreamAdjacentNodes);
+  }
+
+  @Override
+  public int nodeCount() {
+    return downstreamAdjacentNodes.size();
+  }
+
+  @Override
+  public int edgeCount() {
+    return this.upstreamAdjacentNodes.values().stream().mapToInt(Set::size).sum();
+  }
+
+  @Override
+  public Set<T> nodes() {
+    return Collections.unmodifiableSet(this.downstreamAdjacentNodes.keySet());
+  }
+
+  public void clear() {
+    this.graphChanged();
+    this.downstreamAdjacentNodes.clear();
+    this.upstreamAdjacentNodes.clear();
+  }
+
+  /** Return a textual list of the nodes. */
+  @Override
+  public String toString() {
+    return nodes().stream().map(Objects::toString).collect(Collectors.joining(", ", "{", "}"));
+  }
+
+  /** Return the DOT (GraphViz) representation of the graph. */
+  @Override
+  public String toDOT() {
+    StringBuilder dotRepresentation = new StringBuilder();
+    StringBuilder edges = new StringBuilder();
+
+    // Start the digraph with a left-write rank
+    dotRepresentation.append("digraph {\n");
+    dotRepresentation.append("    rankdir=LF;\n");
+
+    Set<T> nodes = nodes();
+    for (T node : nodes) {
+      // Draw the node
+      dotRepresentation.append(
+          "    node_"
+              + (node.toString().hashCode() & 0xfffffff)
+              + " [label=\""
+              + node.toString()
+              + "\"]\n");
+
+      // Draw the edges
+      Set<T> downstreamNodes = getDownstreamAdjacentNodes(node);
+      for (T downstreamNode : downstreamNodes) {
+        edges.append(
+            "    node_"
+                + (node.toString().hashCode() & 0xfffffff)
+                + " -> node_"
+                + (downstreamNode.toString().hashCode() & 0xfffffff)
+                + "\n");
+      }
     }
 
+    // Add the edges to the definition of the graph at the bottom
+    dotRepresentation.append(edges);
 
-    /**
-     * Return a textual list of the nodes.
-     */
-    @Override
-    public String toString() {
-        return nodes().stream().map(Objects::toString).collect(Collectors.joining(", ", "{", "}"));
-    }
+    // Close the digraph
+    dotRepresentation.append("}\n");
 
-    /**
-     * Return the DOT (GraphViz) representation of the graph.
-     */
-    @Override
-    public String toDOT() {
-        StringBuilder dotRepresentation = new StringBuilder();
-        StringBuilder edges = new StringBuilder();
-
-        // Start the digraph with a left-write rank
-        dotRepresentation.append("digraph {\n");
-        dotRepresentation.append("    rankdir=LF;\n");
-
-        Set<T> nodes = nodes();
-        for (T node: nodes) {
-            // Draw the node
-            dotRepresentation.append("    node_" + (node.toString().hashCode() & 0xfffffff)
-            + " [label=\""+ node.toString() +"\"]\n");
-
-            // Draw the edges
-            Set<T> downstreamNodes = getDownstreamAdjacentNodes(node);
-            for (T downstreamNode: downstreamNodes) {
-                edges.append("    node_" + (node.toString().hashCode() & 0xfffffff)
-                                 + " -> node_" + (downstreamNode.toString().hashCode() & 0xfffffff) + "\n");
-            }
-        }
-
-        // Add the edges to the definition of the graph at the bottom
-        dotRepresentation.append(edges);
-
-        // Close the digraph
-        dotRepresentation.append("}\n");
-
-        // Return the DOT representation
-        return dotRepresentation.toString();
-    }
+    // Return the DOT representation
+    return dotRepresentation.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/graph/Graph.java b/org.lflang/src/org/lflang/graph/Graph.java
index 4e9a1723d9..07371c1255 100644
--- a/org.lflang/src/org/lflang/graph/Graph.java
+++ b/org.lflang/src/org/lflang/graph/Graph.java
@@ -1,26 +1,26 @@
 /*************
- Copyright (c) 2020, The University of California at Berkeley.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) 2020, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
 
 package org.lflang.graph;
@@ -35,49 +35,36 @@
  */
 public interface Graph<T> {
 
-    /**
-     * Return an unmodifiable set of nodes in this graph.
-     */
-    Set<T> nodes();
-
-
-    boolean hasNode(T node);
-
-
-    /** Add the given node to the graph. */
-    void addNode(T node);
-
-
-    /**
-     * Remove the given node from the graph. This also eliminates any
-     * edges from upstream and to downstream neighbors of this node.
-     *
-     * @param node The node to remove.
-     */
-    void removeNode(T node);
-
-
-    // todo order of parameters here is unintuitive... from -> to is more usual
-
-    void addEdge(T to, T from);
+  /** Return an unmodifiable set of nodes in this graph. */
+  Set<T> nodes();
 
+  boolean hasNode(T node);
 
-    void addEdges(T to, List<T> from);
+  /** Add the given node to the graph. */
+  void addNode(T node);
 
+  /**
+   * Remove the given node from the graph. This also eliminates any edges from upstream and to
+   * downstream neighbors of this node.
+   *
+   * @param node The node to remove.
+   */
+  void removeNode(T node);
 
-    void removeEdge(T to, T from);
+  // todo order of parameters here is unintuitive... from -> to is more usual
 
+  void addEdge(T to, T from);
 
-    /**
-     * Return the number of nodes in this graph.
-     */
-    int nodeCount();
+  void addEdges(T to, List<T> from);
 
+  void removeEdge(T to, T from);
 
-    /** Return the number of directed edges in this graph. */
-    int edgeCount();
+  /** Return the number of nodes in this graph. */
+  int nodeCount();
 
+  /** Return the number of directed edges in this graph. */
+  int edgeCount();
 
-    /** Return the DOT (GraphViz) representation of the graph. */
-    String toDOT();
+  /** Return the DOT (GraphViz) representation of the graph. */
+  String toDOT();
 }
diff --git a/org.lflang/src/org/lflang/graph/InstantiationGraph.java b/org.lflang/src/org/lflang/graph/InstantiationGraph.java
index b32c97e2f2..dca5492fd0 100644
--- a/org.lflang/src/org/lflang/graph/InstantiationGraph.java
+++ b/org.lflang/src/org/lflang/graph/InstantiationGraph.java
@@ -1,35 +1,34 @@
 /**
  * Copyright (c) 2020, The University of California at Berkeley.
  *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
+ * <p>Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
  *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
+ * <p>1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
  *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
+ * <p>2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials provided with
+ * the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package org.lflang.graph;
 
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Iterables;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-
 import org.eclipse.emf.ecore.resource.Resource;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Instantiation;
@@ -38,138 +37,124 @@
 import org.lflang.lf.ReactorDecl;
 import org.lflang.util.IteratorUtil;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Iterables;
-
 /**
- * A graph with vertices that are Reactors (not ReactorInstances) and edges that denote
- * dependencies between them. A "dependency" from reactor class A to
- * reactor class B (A depends on B) means that A instantiates within
- * it at least one instance of B. Note that there a potentially
- * confusing and subtle distinction here between an "instantiation"
- * and an "instance". They are not the same thing at all. An
- * "instantiation" is an AST node representing a statement like
- * {@code a = new A();}. This can result in many instances of reactor
- * class A (if the containing reactor class is instantiated multiple times).
+ * A graph with vertices that are Reactors (not ReactorInstances) and edges that denote dependencies
+ * between them. A "dependency" from reactor class A to reactor class B (A depends on B) means that
+ * A instantiates within it at least one instance of B. Note that there a potentially confusing and
+ * subtle distinction here between an "instantiation" and an "instance". They are not the same thing
+ * at all. An "instantiation" is an AST node representing a statement like {@code a = new A();}.
+ * This can result in many instances of reactor class A (if the containing reactor class is
+ * instantiated multiple times).
  *
- * In addition to the graph, this class keeps track of the instantiations
- * that induce the dependencies. These can be retrieved using the method
- * {@code getInstantiations(Reactor)}.
+ * <p>In addition to the graph, this class keeps track of the instantiations that induce the
+ * dependencies. These can be retrieved using the method {@code getInstantiations(Reactor)}.
  *
  * @author Marten Lohstroh
  */
 public class InstantiationGraph extends PrecedenceGraph<Reactor> {
-    /**
-     * A mapping from reactors to the sites of their instantiation.
-     */
-    protected final HashMultimap<Reactor, Instantiation> reactorToInstantiation =
-        HashMultimap.create();
+  /** A mapping from reactors to the sites of their instantiation. */
+  protected final HashMultimap<Reactor, Instantiation> reactorToInstantiation =
+      HashMultimap.create();
 
-    /**
-     * A mapping from reactor classes to their declarations.
-     */
-    protected final HashMultimap<Reactor, ReactorDecl> reactorToDecl =
-        HashMultimap.create();
+  /** A mapping from reactor classes to their declarations. */
+  protected final HashMultimap<Reactor, ReactorDecl> reactorToDecl = HashMultimap.create();
 
-    /**
-     * Return the instantiations that point to a given reactor definition.
-     * If none are known, returns an empty set. * The returned set may be
-     * unmodifiable.
-     */
-    public Set<Instantiation> getInstantiations(final Reactor definition) {
-        Set<Instantiation> instantiations = this.reactorToInstantiation.get(definition);
-        if (instantiations != null) {
-            return instantiations;
-        } else {
-            return Collections.emptySet();
-        }
+  /**
+   * Return the instantiations that point to a given reactor definition. If none are known, returns
+   * an empty set. * The returned set may be unmodifiable.
+   */
+  public Set<Instantiation> getInstantiations(final Reactor definition) {
+    Set<Instantiation> instantiations = this.reactorToInstantiation.get(definition);
+    if (instantiations != null) {
+      return instantiations;
+    } else {
+      return Collections.emptySet();
     }
+  }
 
-    /**
-     * Return the declarations that point to a given reactor definition.
-     * A declaration is either a reactor definition or an import statement.
-     */
-    public Set<ReactorDecl> getDeclarations(final Reactor definition) {
-        return this.reactorToDecl.get(definition);
-    }
+  /**
+   * Return the declarations that point to a given reactor definition. A declaration is either a
+   * reactor definition or an import statement.
+   */
+  public Set<ReactorDecl> getDeclarations(final Reactor definition) {
+    return this.reactorToDecl.get(definition);
+  }
 
-    /**
-     * Return the reactor definitions referenced by instantiations in this graph
-     * ordered topologically. Each reactor in the returned list is preceded by
-     * any reactors that it may instantiate.
-     */
-    public List<Reactor> getReactors() {
-        return this.nodesInTopologicalOrder();
-    }
+  /**
+   * Return the reactor definitions referenced by instantiations in this graph ordered
+   * topologically. Each reactor in the returned list is preceded by any reactors that it may
+   * instantiate.
+   */
+  public List<Reactor> getReactors() {
+    return this.nodesInTopologicalOrder();
+  }
 
-    /**
-     * Construct an instantiation graph based on the given AST and, if the
-     * detectCycles argument is true, run Tarjan's algorithm to detect cyclic
-     * dependencies between instantiations.
-     * @param resource The resource associated with the AST.
-     * @param detectCycles Whether or not to detect cycles.
-     */
-    public InstantiationGraph(final Resource resource, final boolean detectCycles) {
-        final Iterable<Instantiation> instantiations = Iterables.filter(
-                IteratorUtil.asIterable(resource.getAllContents()),
-                Instantiation.class);
-        Optional<Reactor> main = IteratorUtil
-                .asFilteredStream(resource.getAllContents(), Reactor.class)
-                .filter(reactor -> reactor.isMain() || reactor.isFederated())
-                .findFirst();
+  /**
+   * Construct an instantiation graph based on the given AST and, if the detectCycles argument is
+   * true, run Tarjan's algorithm to detect cyclic dependencies between instantiations.
+   *
+   * @param resource The resource associated with the AST.
+   * @param detectCycles Whether or not to detect cycles.
+   */
+  public InstantiationGraph(final Resource resource, final boolean detectCycles) {
+    final Iterable<Instantiation> instantiations =
+        Iterables.filter(IteratorUtil.asIterable(resource.getAllContents()), Instantiation.class);
+    Optional<Reactor> main =
+        IteratorUtil.asFilteredStream(resource.getAllContents(), Reactor.class)
+            .filter(reactor -> reactor.isMain() || reactor.isFederated())
+            .findFirst();
 
-        if (main.isPresent()) {
-            this.addNode(main.get());
-        }
-        for (final Instantiation i : instantiations) {
-            this.buildGraph(i, new HashSet<>());
-        }
-        if (detectCycles) {
-            this.detectCycles();
-        }
+    if (main.isPresent()) {
+      this.addNode(main.get());
+    }
+    for (final Instantiation i : instantiations) {
+      this.buildGraph(i, new HashSet<>());
+    }
+    if (detectCycles) {
+      this.detectCycles();
     }
+  }
 
-    /**
-     * Construct an instantiation graph based on the given AST and, if the
-     * detectCycles argument is true, run Tarjan's algorithm to detect cyclic
-     * dependencies between instantiations.
-     * @param model The root of the AST.
-     * @param detectCycles Whether or not to detect cycles.
-     */
-    public InstantiationGraph(final Model model, final boolean detectCycles) {
-        for (final Reactor r : model.getReactors()) {
-            for (final Instantiation i : r.getInstantiations()) {
-                this.buildGraph(i, new HashSet<>());
-            }
-        }
-        if (detectCycles) {
-            this.detectCycles();
-        }
+  /**
+   * Construct an instantiation graph based on the given AST and, if the detectCycles argument is
+   * true, run Tarjan's algorithm to detect cyclic dependencies between instantiations.
+   *
+   * @param model The root of the AST.
+   * @param detectCycles Whether or not to detect cycles.
+   */
+  public InstantiationGraph(final Model model, final boolean detectCycles) {
+    for (final Reactor r : model.getReactors()) {
+      for (final Instantiation i : r.getInstantiations()) {
+        this.buildGraph(i, new HashSet<>());
+      }
+    }
+    if (detectCycles) {
+      this.detectCycles();
     }
+  }
 
-    /**
-     * Traverse the AST and build this precedence graph relating the
-     * encountered instantiations. Also map each reactor to all
-     * declarations associated with it and each reactor to the sites of
-     * its instantiations.
-     */
-    private void buildGraph(final Instantiation instantiation, final Set<Instantiation> visited) {
-        final ReactorDecl decl = instantiation.getReactorClass();
-        final Reactor reactor = ASTUtils.toDefinition(decl);
-        if (reactor != null) {
-            Reactor container = ASTUtils.getEnclosingReactor(instantiation);
-            if (visited.add(instantiation)) {
-                this.reactorToInstantiation.put(reactor, instantiation);
-                this.reactorToDecl.put(reactor, decl);
-                if (container != null) {
-                    this.addEdge(container, reactor);
-                } else {
-                    this.addNode(reactor);
-                }
-                for (final Instantiation inst : reactor.getInstantiations()) {
-                    this.buildGraph(inst, visited);
-                }
-            }
+  /**
+   * Traverse the AST and build this precedence graph relating the encountered instantiations. Also
+   * map each reactor to all declarations associated with it and each reactor to the sites of its
+   * instantiations.
+   */
+  private void buildGraph(final Instantiation instantiation, final Set<Instantiation> visited) {
+    final ReactorDecl decl = instantiation.getReactorClass();
+    final Reactor reactor = ASTUtils.toDefinition(decl);
+    if (reactor != null) {
+      Reactor container = ASTUtils.getEnclosingReactor(instantiation);
+      if (visited.add(instantiation)) {
+        this.reactorToInstantiation.put(reactor, instantiation);
+        this.reactorToDecl.put(reactor, decl);
+        if (container != null) {
+          this.addEdge(container, reactor);
+        } else {
+          this.addNode(reactor);
+        }
+        for (final Instantiation inst : reactor.getInstantiations()) {
+          this.buildGraph(inst, visited);
         }
+      }
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/graph/NodeAnnotation.java b/org.lflang/src/org/lflang/graph/NodeAnnotation.java
index b8b91c92ad..191967d043 100644
--- a/org.lflang/src/org/lflang/graph/NodeAnnotation.java
+++ b/org.lflang/src/org/lflang/graph/NodeAnnotation.java
@@ -1,66 +1,54 @@
 /**
  * Copyright (c) 2019, The University of California at Berkeley.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * <p>Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * <p>1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * <p>2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials provided with
+ * the distribution.
+ *
+ * <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package org.lflang.graph;
 
 /**
- * Note annotations used in Tarjan's algorithm for finding strongly connected
- * components.
- * 
+ * Note annotations used in Tarjan's algorithm for finding strongly connected components.
+ *
  * @author Marten Lohstroh
  */
 public class NodeAnnotation {
-    /**
-     * Sequence number that is assigned when this node is discovered.
-     * A node with a lower index was discovered later than this one;
-     * a node with a higher index was discovered later than this one.
-     */
-    public int index = -1;
-    
-    /**
-     * Temporary mark do be used in topological sort algorithm.
-     */
-    public boolean hasTempMark = false;
-    
-    /**
-     * Temporary mark do be used in topological sort algorithm.
-     */
-    public boolean hasPermMark = false;
-    
-    /**
-     * The smallest index of any node known to be reachable from this node.
-     */
-    public int lowLink = -1;
-    
-    /**
-     * Whether or not this node is currently on the stack that
-     * keeps track of visited nodes that potentially form a cycle.
-     */
-    public boolean onStack = false;
-    
-    /**
-     * Whether or not this node has a dependency on itself.
-     */
-    public boolean selfLoop = false;
-}
+  /**
+   * Sequence number that is assigned when this node is discovered. A node with a lower index was
+   * discovered later than this one; a node with a higher index was discovered later than this one.
+   */
+  public int index = -1;
+
+  /** Temporary mark do be used in topological sort algorithm. */
+  public boolean hasTempMark = false;
+
+  /** Temporary mark do be used in topological sort algorithm. */
+  public boolean hasPermMark = false;
 
+  /** The smallest index of any node known to be reachable from this node. */
+  public int lowLink = -1;
+
+  /**
+   * Whether or not this node is currently on the stack that keeps track of visited nodes that
+   * potentially form a cycle.
+   */
+  public boolean onStack = false;
+
+  /** Whether or not this node has a dependency on itself. */
+  public boolean selfLoop = false;
+}
diff --git a/org.lflang/src/org/lflang/graph/NodeAnnotations.java b/org.lflang/src/org/lflang/graph/NodeAnnotations.java
index 346149a8c4..6efe85760a 100644
--- a/org.lflang/src/org/lflang/graph/NodeAnnotations.java
+++ b/org.lflang/src/org/lflang/graph/NodeAnnotations.java
@@ -1,46 +1,42 @@
 /**
  * Copyright (c) 2019, The University of California at Berkeley.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * <p>Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * <p>1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * <p>2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials provided with
+ * the distribution.
+ *
+ * <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package org.lflang.graph;
 
 import java.util.HashMap;
 
-/**
- * Maps a node in the graph to its annotation.
- * Creates a new annotation if no annotation exists.
- */
+/** Maps a node in the graph to its annotation. Creates a new annotation if no annotation exists. */
 public class NodeAnnotations<T extends Object> {
   private HashMap<T, NodeAnnotation> annotations = new HashMap<T, NodeAnnotation>();
-  
+
   public NodeAnnotation get(final T node) {
     NodeAnnotation annotation = this.annotations.get(node);
     if (annotation == null) {
-        annotation = new NodeAnnotation();
-        this.annotations.put(node, annotation);
+      annotation = new NodeAnnotation();
+      this.annotations.put(node, annotation);
     }
     return annotation;
   }
-  
+
   public NodeAnnotation put(final T node, final NodeAnnotation annotation) {
     return this.annotations.put(node, annotation);
   }
diff --git a/org.lflang/src/org/lflang/graph/PrecedenceGraph.java b/org.lflang/src/org/lflang/graph/PrecedenceGraph.java
index 03fd266f6a..80abb21455 100644
--- a/org.lflang/src/org/lflang/graph/PrecedenceGraph.java
+++ b/org.lflang/src/org/lflang/graph/PrecedenceGraph.java
@@ -1,242 +1,219 @@
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.graph;
 
+import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.Stack;
-
 import org.eclipse.xtext.xbase.lib.ListExtensions;
 
-import java.util.ArrayList;
-
-/** 
- * Elaboration of {@code DirectedGraph} that is capable of identifying strongly
- * connected components and topologically sorting its nodes.
- * 
+/**
+ * Elaboration of {@code DirectedGraph} that is capable of identifying strongly connected components
+ * and topologically sorting its nodes.
+ *
  * @author Marten Lohstroh
  */
 public class PrecedenceGraph<T extends Object> extends DirectedGraph<T> {
 
-    /**
-     * Annotations used during the execution of Tarjan's algorithm.
-     */
-    private NodeAnnotations<T> annotations = new NodeAnnotations<T>();
-
-    /**
-     * Indicates whether or not the graph has been analyzed for cycles.
-     * If this variable is false, Tarjan's algorithm need to be ran to find out
-     * whether or not this graph has cycles.
-     */
-    private boolean cycleAnalysisDone = false;
-
-    /**
-     * Indicates whether or not the graph has been sorted.
-     * If this variable is false, a new DFS has to be done to compute a
-     * topological sort.
-     */
-    private boolean isSorted = false;
-    
-    /**
-     * Index used in Tarjan's algorithm.
-     */
-    private int index = 0;
-    
-    /**
-     * After analysis has completed, this list contains all nodes in reverse
-     * topological order.
-     */
-    private List<T> sortedNodes = new ArrayList<>();
-    
-    /**
-     * Stack used in Tarjan's algorithm.
-     */
-    private Stack<T> stack = new Stack<>();
-    
-    /**
-     * After analysis has completed, this list contains all all sets of nodes
-     * that are part of the same strongly connected component.
-     */
-    protected List<Set<T>> cycles = new ArrayList<>();
-
-    /**
-     * Invalidate cached analysis due to changes in the graph structure.
-     */
-    @Override
-    public void graphChanged() {
-        this.cycleAnalysisDone = false;
-        this.isSorted = false;
-    }
-
-    /**
-     * Construct a new dependency graph.
-     */
-    public PrecedenceGraph() {}
-
-    /**
-     * Topologically sort the nodes in the graph.
-     */
-    private void sortNodes() {
-        if (!this.isSorted) {
-            // Cleanup.
-            this.sortedNodes = new ArrayList<>();
-            this.nodes().forEach(
-                it -> {
-                    this.annotations.get(it).hasTempMark = false;
-                    this.annotations.get(it).hasPermMark = false;
-                }
-            );
-
-            // Start sorting.
-            for (T node : this.nodes()) {
-                if (!this.annotations.get(node).hasPermMark) {
-                    // Unmarked node.
-                    this.visit(node);
-                }
-            }
-            this.isSorted = true;
+  /** Annotations used during the execution of Tarjan's algorithm. */
+  private NodeAnnotations<T> annotations = new NodeAnnotations<T>();
+
+  /**
+   * Indicates whether or not the graph has been analyzed for cycles. If this variable is false,
+   * Tarjan's algorithm need to be ran to find out whether or not this graph has cycles.
+   */
+  private boolean cycleAnalysisDone = false;
+
+  /**
+   * Indicates whether or not the graph has been sorted. If this variable is false, a new DFS has to
+   * be done to compute a topological sort.
+   */
+  private boolean isSorted = false;
+
+  /** Index used in Tarjan's algorithm. */
+  private int index = 0;
+
+  /** After analysis has completed, this list contains all nodes in reverse topological order. */
+  private List<T> sortedNodes = new ArrayList<>();
+
+  /** Stack used in Tarjan's algorithm. */
+  private Stack<T> stack = new Stack<>();
+
+  /**
+   * After analysis has completed, this list contains all all sets of nodes that are part of the
+   * same strongly connected component.
+   */
+  protected List<Set<T>> cycles = new ArrayList<>();
+
+  /** Invalidate cached analysis due to changes in the graph structure. */
+  @Override
+  public void graphChanged() {
+    this.cycleAnalysisDone = false;
+    this.isSorted = false;
+  }
+
+  /** Construct a new dependency graph. */
+  public PrecedenceGraph() {}
+
+  /** Topologically sort the nodes in the graph. */
+  private void sortNodes() {
+    if (!this.isSorted) {
+      // Cleanup.
+      this.sortedNodes = new ArrayList<>();
+      this.nodes()
+          .forEach(
+              it -> {
+                this.annotations.get(it).hasTempMark = false;
+                this.annotations.get(it).hasPermMark = false;
+              });
+
+      // Start sorting.
+      for (T node : this.nodes()) {
+        if (!this.annotations.get(node).hasPermMark) {
+          // Unmarked node.
+          this.visit(node);
         }
+      }
+      this.isSorted = true;
     }
-    
-    /**
-     * Recursively visit all nodes reachable from the given node; after all
-     * those nodes have been visited add the current node to a list which will
-     * be sorted in reverse order.
-     */
-    private void visit(T node) {
-        NodeAnnotation annotation = this.annotations.get(node);
-        if (annotation.hasPermMark) {
-            return;
-        }
-        if (annotation.hasTempMark) {
-            // Not a DAG.
-            throw new Error("Cannot order nodes due to cycle in the graph.");
-        }
-        annotation.hasTempMark = true;
-        for (T dep : this.getDownstreamAdjacentNodes(node)) {
-            visit(dep);
-        }
-        annotation.hasTempMark = false;
-        annotation.hasPermMark = true;
-        this.sortedNodes.add(node);
-    }
-    
-    /**
-     * Run Tarjan's algorithm for finding strongly connected components.
-     * After invoking this method, the detected cycles with be listed 
-     * in the class variable {@code cycles}.
-     */
-    public void detectCycles() {
-        if (!this.cycleAnalysisDone) {
-            this.index = 0;
-            this.stack = new Stack<>();
-            this.cycles = new ArrayList<>();
-            this.nodes().forEach(it -> { 
-                this.annotations.get(it).index = -1; 
-            });
-            for (T node : this.nodes()) {
-                if (this.annotations.get(node).index == -1) {
-                    this.strongConnect(node);
-                }
-            }
-            this.cycleAnalysisDone = true;
-            stack = null;
-        }
+  }
+
+  /**
+   * Recursively visit all nodes reachable from the given node; after all those nodes have been
+   * visited add the current node to a list which will be sorted in reverse order.
+   */
+  private void visit(T node) {
+    NodeAnnotation annotation = this.annotations.get(node);
+    if (annotation.hasPermMark) {
+      return;
     }
-    
-    /**
-     * Report whether this graph has any cycles in it.
-     */
-    public boolean hasCycles() {
-        this.detectCycles();
-        return this.cycles.size() > 0;
+    if (annotation.hasTempMark) {
+      // Not a DAG.
+      throw new Error("Cannot order nodes due to cycle in the graph.");
     }
-    
-    /**
-     * Return a list of strongly connected components that exist in this graph.
-     */
-    public List<Set<T>> getCycles() {
-        this.detectCycles();
-        return this.cycles;
+    annotation.hasTempMark = true;
+    for (T dep : this.getDownstreamAdjacentNodes(node)) {
+      visit(dep);
     }
-    
-    /**
-     * Traverse the graph to visit unvisited dependencies and determine
-     * whether they are part of a cycle. 
-     */
-    public void strongConnect(T node) {
-        NodeAnnotation annotation = this.annotations.get(node);
-        annotation.index = this.index;
-        annotation.lowLink = this.index;
-        annotation.onStack = true;
-        this.index++;
-        this.stack.push(node);
-        for (T dep : this.getUpstreamAdjacentNodes(node)) {
-            NodeAnnotation depAnnotation = this.annotations.get(dep);
-            if (depAnnotation.onStack) {
-                annotation.lowLink = Math.min(annotation.lowLink, depAnnotation.index);
-                if (node.equals(dep)) {
-                    annotation.selfLoop = true;
-                }
-            } else if (depAnnotation.index == -1) {
-                strongConnect(dep);
-                annotation.lowLink = Math.min(annotation.lowLink, depAnnotation.lowLink);
-            }
-        }
-
-        if (annotation.lowLink == annotation.index) {
-            Set<T> scc = new LinkedHashSet<>();
-            T dep = null;
-            do {
-                dep = this.stack.pop();
-                this.annotations.get(dep).onStack = false;
-                scc.add(dep);
-            } while (!node.equals(dep));
-            // Only report self loops or cycles with two or more nodes.
-            if (scc.size() > 1 || annotation.selfLoop) {
-                this.cycles.add(scc);
-            }
+    annotation.hasTempMark = false;
+    annotation.hasPermMark = true;
+    this.sortedNodes.add(node);
+  }
+
+  /**
+   * Run Tarjan's algorithm for finding strongly connected components. After invoking this method,
+   * the detected cycles with be listed in the class variable {@code cycles}.
+   */
+  public void detectCycles() {
+    if (!this.cycleAnalysisDone) {
+      this.index = 0;
+      this.stack = new Stack<>();
+      this.cycles = new ArrayList<>();
+      this.nodes()
+          .forEach(
+              it -> {
+                this.annotations.get(it).index = -1;
+              });
+      for (T node : this.nodes()) {
+        if (this.annotations.get(node).index == -1) {
+          this.strongConnect(node);
         }
+      }
+      this.cycleAnalysisDone = true;
+      stack = null;
     }
-    
-    /**
-     * Return the nodes of this graph in reverse topological order. Each node
-     * in the returned list is succeeded by the nodes that it depends on.
-     */
-    public List<T> nodesInReverseTopologicalOrder() {
-        this.sortNodes();
-        return this.sortedNodes;
+  }
+
+  /** Report whether this graph has any cycles in it. */
+  public boolean hasCycles() {
+    this.detectCycles();
+    return this.cycles.size() > 0;
+  }
+
+  /** Return a list of strongly connected components that exist in this graph. */
+  public List<Set<T>> getCycles() {
+    this.detectCycles();
+    return this.cycles;
+  }
+
+  /**
+   * Traverse the graph to visit unvisited dependencies and determine whether they are part of a
+   * cycle.
+   */
+  public void strongConnect(T node) {
+    NodeAnnotation annotation = this.annotations.get(node);
+    annotation.index = this.index;
+    annotation.lowLink = this.index;
+    annotation.onStack = true;
+    this.index++;
+    this.stack.push(node);
+    for (T dep : this.getUpstreamAdjacentNodes(node)) {
+      NodeAnnotation depAnnotation = this.annotations.get(dep);
+      if (depAnnotation.onStack) {
+        annotation.lowLink = Math.min(annotation.lowLink, depAnnotation.index);
+        if (node.equals(dep)) {
+          annotation.selfLoop = true;
+        }
+      } else if (depAnnotation.index == -1) {
+        strongConnect(dep);
+        annotation.lowLink = Math.min(annotation.lowLink, depAnnotation.lowLink);
+      }
     }
-    
-    /**
-     * Return the nodes of this graph in reverse topological order. Each node
-     * in the returned list is preceded by the nodes that it depends on.
-     */
-    public List<T> nodesInTopologicalOrder() {
-        this.sortNodes();
-        return ListExtensions.reverse(this.sortedNodes);
+
+    if (annotation.lowLink == annotation.index) {
+      Set<T> scc = new LinkedHashSet<>();
+      T dep = null;
+      do {
+        dep = this.stack.pop();
+        this.annotations.get(dep).onStack = false;
+        scc.add(dep);
+      } while (!node.equals(dep));
+      // Only report self loops or cycles with two or more nodes.
+      if (scc.size() > 1 || annotation.selfLoop) {
+        this.cycles.add(scc);
+      }
     }
+  }
+
+  /**
+   * Return the nodes of this graph in reverse topological order. Each node in the returned list is
+   * succeeded by the nodes that it depends on.
+   */
+  public List<T> nodesInReverseTopologicalOrder() {
+    this.sortNodes();
+    return this.sortedNodes;
+  }
+
+  /**
+   * Return the nodes of this graph in reverse topological order. Each node in the returned list is
+   * preceded by the nodes that it depends on.
+   */
+  public List<T> nodesInTopologicalOrder() {
+    this.sortNodes();
+    return ListExtensions.reverse(this.sortedNodes);
+  }
 }
diff --git a/org.lflang/src/org/lflang/graph/TopologyGraph.java b/org.lflang/src/org/lflang/graph/TopologyGraph.java
index f790de65a7..31d6de9500 100644
--- a/org.lflang/src/org/lflang/graph/TopologyGraph.java
+++ b/org.lflang/src/org/lflang/graph/TopologyGraph.java
@@ -1,16 +1,16 @@
 /*************
  * Copyright (c) 2020, The University of California at Berkeley.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  * this list of conditions and the following disclaimer.
- * 
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  * this list of conditions and the following disclaimer in the documentation
  * and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -28,7 +28,6 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-
 import org.lflang.generator.NamedInstance;
 import org.lflang.generator.PortInstance;
 import org.lflang.generator.ReactionInstance;
@@ -39,142 +38,143 @@
 import org.lflang.lf.Variable;
 
 /**
- * A graph with vertices that are ports or reactions and edges that denote
- * dependencies between them.
- * 
- * NOTE: This is not used anywhere anymore, but we keep it in case this particular
- * graph structure proves useful in the future.
- * 
+ * A graph with vertices that are ports or reactions and edges that denote dependencies between
+ * them.
+ *
+ * <p>NOTE: This is not used anywhere anymore, but we keep it in case this particular graph
+ * structure proves useful in the future.
+ *
  * @author Marten Lohstroh
  */
 public class TopologyGraph extends PrecedenceGraph<NamedInstance<?>> {
 
-    /**
-     * Construct a graph with vertices that are reactions or ports and edges
-     * that represent (zero-delay) dependencies.
-     * 
-     * After constructing the graph, run Tarjan's algorithm to detect cyclic
-     * dependencies between reactions. It is assumed that no instantiation
-     * cycles are present in the program. Checks for instantiation cycles thus
-     * must be carried out prior to constructing this graph.
-     * 
-     * @param reactors The reactor instances to construct the graph for.
-     */
-    public TopologyGraph(Collection<? extends ReactorInstance> reactors) {
-        for (var r : reactors) {
-            collectNodesFrom(r);
-        }
-        this.detectCycles();
+  /**
+   * Construct a graph with vertices that are reactions or ports and edges that represent
+   * (zero-delay) dependencies.
+   *
+   * <p>After constructing the graph, run Tarjan's algorithm to detect cyclic dependencies between
+   * reactions. It is assumed that no instantiation cycles are present in the program. Checks for
+   * instantiation cycles thus must be carried out prior to constructing this graph.
+   *
+   * @param reactors The reactor instances to construct the graph for.
+   */
+  public TopologyGraph(Collection<? extends ReactorInstance> reactors) {
+    for (var r : reactors) {
+      collectNodesFrom(r);
     }
+    this.detectCycles();
+  }
 
-    /** See description on other constructor. */
-    public TopologyGraph(ReactorInstance... reactors) {
-        this(Arrays.asList(reactors));
-    }
+  /** See description on other constructor. */
+  public TopologyGraph(ReactorInstance... reactors) {
+    this(Arrays.asList(reactors));
+  }
 
-    /**
-     * Build the graph by recursively visiting reactor instances contained in
-     * the passed in reactor instance.
-     * 
-     * @param reactor A reactor instance to harvest dependencies from.
-     */
-    public void collectNodesFrom(ReactorInstance reactor) {
-        ReactionInstance previousReaction = null;
-        for (var reaction : reactor.reactions) {
-            this.addNode(reaction);
+  /**
+   * Build the graph by recursively visiting reactor instances contained in the passed in reactor
+   * instance.
+   *
+   * @param reactor A reactor instance to harvest dependencies from.
+   */
+  public void collectNodesFrom(ReactorInstance reactor) {
+    ReactionInstance previousReaction = null;
+    for (var reaction : reactor.reactions) {
+      this.addNode(reaction);
 
-            this.addSources(reaction);
-            this.addEffects(reaction);
+      this.addSources(reaction);
+      this.addEffects(reaction);
 
-            // If this is not an unordered reaction, then create a dependency
-            // on any previously defined reaction.
-            if (!reaction.isUnordered) {
-                // If there is an earlier reaction in this same reactor, then
-                // create a link in the reaction graph.
-                if (previousReaction != null) {
-                    this.addEdge(reaction, previousReaction);
-                }
-                previousReaction = reaction;
-            }
-        }
-        // Recursively add nodes and edges from contained reactors.
-        for (var child : reactor.children) {
-            collectNodesFrom(child);
+      // If this is not an unordered reaction, then create a dependency
+      // on any previously defined reaction.
+      if (!reaction.isUnordered) {
+        // If there is an earlier reaction in this same reactor, then
+        // create a link in the reaction graph.
+        if (previousReaction != null) {
+          this.addEdge(reaction, previousReaction);
         }
+        previousReaction = reaction;
+      }
     }
+    // Recursively add nodes and edges from contained reactors.
+    for (var child : reactor.children) {
+      collectNodesFrom(child);
+    }
+  }
 
-    /**
-     * Given a reaction instance, record dependencies implied by its effects.
-     * 
-     * Excluded from the recorded dependencies are those that are broken by
-     * physical connections or "after" delays.
-     * 
-     * @param reaction The reaction to record the dependencies of.
-     */
-    private void addEffects(ReactionInstance reaction) {
-        for (TriggerInstance<? extends Variable> effect : reaction.effects) {
-            if (effect instanceof PortInstance) {
-                addEdge(effect, reaction);
-                PortInstance orig = (PortInstance) effect;
-                for (SendRange sendRange : orig.getDependentPorts()) {
-                    sendRange.destinations.forEach(dest -> {
-                        recordDependency(reaction, orig, dest.instance, sendRange.connection);
-                    });
-                }
-            }
+  /**
+   * Given a reaction instance, record dependencies implied by its effects.
+   *
+   * <p>Excluded from the recorded dependencies are those that are broken by physical connections or
+   * "after" delays.
+   *
+   * @param reaction The reaction to record the dependencies of.
+   */
+  private void addEffects(ReactionInstance reaction) {
+    for (TriggerInstance<? extends Variable> effect : reaction.effects) {
+      if (effect instanceof PortInstance) {
+        addEdge(effect, reaction);
+        PortInstance orig = (PortInstance) effect;
+        for (SendRange sendRange : orig.getDependentPorts()) {
+          sendRange.destinations.forEach(
+              dest -> {
+                recordDependency(reaction, orig, dest.instance, sendRange.connection);
+              });
         }
+      }
     }
+  }
 
-    /**
-     * Given a reaction instance, record dependencies implied by its sources.
-     * 
-     * Excluded from the recorded dependencies are those that are broken by
-     * physical connections or "after" delays.
-     * 
-     * @param reaction The reaction to record the dependencies of.
-     */
-    private void addSources(ReactionInstance reaction) {
-        for (TriggerInstance<? extends Variable> source : reaction.sources) {
-            if (source instanceof PortInstance) {
-                addEdge(reaction, source);
-                PortInstance dest = (PortInstance) source;
-                dest.getDependsOnPorts().forEach(orig -> {
-                    // FIXME: Don't have connection information here, hence the null argument.
-                    // This will like result in invalid cycle detection.
-                    recordDependency(reaction, orig.instance, dest, null);
+  /**
+   * Given a reaction instance, record dependencies implied by its sources.
+   *
+   * <p>Excluded from the recorded dependencies are those that are broken by physical connections or
+   * "after" delays.
+   *
+   * @param reaction The reaction to record the dependencies of.
+   */
+  private void addSources(ReactionInstance reaction) {
+    for (TriggerInstance<? extends Variable> source : reaction.sources) {
+      if (source instanceof PortInstance) {
+        addEdge(reaction, source);
+        PortInstance dest = (PortInstance) source;
+        dest.getDependsOnPorts()
+            .forEach(
+                orig -> {
+                  // FIXME: Don't have connection information here, hence the null argument.
+                  // This will like result in invalid cycle detection.
+                  recordDependency(reaction, orig.instance, dest, null);
                 });
-            }
-        }
+      }
     }
+  }
 
-    /**
-     * Record a dependency between two port instances, but only if there is a
-     * zero-delay path from origin to destination.
-     * 
-     * @param reaction A reaction that has one of the given ports as a source or
-     *                 effect.
-     * @param orig     The upstream port.
-     * @param dest     The downstream port.
-     * @param connection The connection creating this dependency or null if not
-     *  created by a connection.
-     */
-    private void recordDependency(ReactionInstance reaction, PortInstance orig,
-            PortInstance dest, Connection connection) {
-        if (!dependencyBroken(connection)) {
-            addEdge(dest, orig);
-        }
+  /**
+   * Record a dependency between two port instances, but only if there is a zero-delay path from
+   * origin to destination.
+   *
+   * @param reaction A reaction that has one of the given ports as a source or effect.
+   * @param orig The upstream port.
+   * @param dest The downstream port.
+   * @param connection The connection creating this dependency or null if not created by a
+   *     connection.
+   */
+  private void recordDependency(
+      ReactionInstance reaction, PortInstance orig, PortInstance dest, Connection connection) {
+    if (!dependencyBroken(connection)) {
+      addEdge(dest, orig);
     }
+  }
 
-    /**
-     * Report whether or not the given connection breaks dependencies or not.
-     * 
-     * @param c An AST object that represents a connection.
-     * @return true if the connection is physical or has a delay.
-     */
-    private boolean dependencyBroken(Connection c) {
-        if (c != null && (c.isPhysical() || c.getDelay() != null)) {
-            return true;
-        }
-        return false;
+  /**
+   * Report whether or not the given connection breaks dependencies or not.
+   *
+   * @param c An AST object that represents a connection.
+   * @return true if the connection is physical or has a delay.
+   */
+  private boolean dependencyBroken(Connection c) {
+    if (c != null && (c.isPhysical() || c.getDelay() != null)) {
+      return true;
     }
+    return false;
+  }
 }
diff --git a/org.lflang/src/org/lflang/ide/LFIdeModule.java b/org.lflang/src/org/lflang/ide/LFIdeModule.java
index 6c63d9c6e0..81aa863bd1 100644
--- a/org.lflang/src/org/lflang/ide/LFIdeModule.java
+++ b/org.lflang/src/org/lflang/ide/LFIdeModule.java
@@ -3,9 +3,5 @@
  */
 package org.lflang.ide;
 
-
-/**
- * Use this class to register ide components.
- */
-public class LFIdeModule extends AbstractLFIdeModule {
-}
+/** Use this class to register ide components. */
+public class LFIdeModule extends AbstractLFIdeModule {}
diff --git a/org.lflang/src/org/lflang/ide/LFIdeSetup.java b/org.lflang/src/org/lflang/ide/LFIdeSetup.java
index 2e6b969952..7465bda78b 100644
--- a/org.lflang/src/org/lflang/ide/LFIdeSetup.java
+++ b/org.lflang/src/org/lflang/ide/LFIdeSetup.java
@@ -6,17 +6,14 @@
 import org.lflang.LFRuntimeModule;
 import org.lflang.LFStandaloneSetup;
 
-/**
- * Initialization support for running Xtext languages as language servers.
- */
+/** Initialization support for running Xtext languages as language servers. */
 public class LFIdeSetup extends LFStandaloneSetup {
 
-	public LFIdeSetup() {
-		super(new LFRuntimeModule(), new LFIdeModule());
-	}
-
-	public static void doSetup() {
-		new LFIdeSetup().createInjectorAndDoEMFRegistration();
-	}
+  public LFIdeSetup() {
+    super(new LFRuntimeModule(), new LFIdeModule());
+  }
 
+  public static void doSetup() {
+    new LFIdeSetup().createInjectorAndDoEMFRegistration();
+  }
 }
diff --git a/org.lflang/src/org/lflang/scoping/LFGlobalScopeProvider.java b/org.lflang/src/org/lflang/scoping/LFGlobalScopeProvider.java
index 119ccae842..18c7a3a8af 100644
--- a/org.lflang/src/org/lflang/scoping/LFGlobalScopeProvider.java
+++ b/org.lflang/src/org/lflang/scoping/LFGlobalScopeProvider.java
@@ -25,134 +25,121 @@
 import com.google.common.base.Splitter;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
-
 import java.util.LinkedHashSet;
 import java.util.Set;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.EcoreUtil2;
 import org.eclipse.xtext.resource.IResourceDescription;
 import org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider;
 import org.eclipse.xtext.util.IResourceScopeCache;
-
-import org.lflang.lf.LfPackage;
 import org.lflang.LFResourceDescriptionStrategy;
+import org.lflang.lf.LfPackage;
 
 /**
- * Global scope provider that limits access to only those files that were
- * explicitly imported.
- * <p>
- * Adapted from from Xtext manual, Chapter 8.7.
+ * Global scope provider that limits access to only those files that were explicitly imported.
+ *
+ * <p>Adapted from from Xtext manual, Chapter 8.7.
  *
  * @author Marten Lohstroh
- * @see <a href="https://www.eclipse.org/Xtext/documentation/2.6.0/Xtext%20Documentation.pdf">xtext doc</a>
+ * @see <a href="https://www.eclipse.org/Xtext/documentation/2.6.0/Xtext%20Documentation.pdf">xtext
+ *     doc</a>
  */
 public class LFGlobalScopeProvider extends ImportUriGlobalScopeProvider {
 
-    /**
-     * Splitter used to process user-data annotations of Model nodes.
-     */
-    static final Splitter SPLITTER = Splitter.on(LFResourceDescriptionStrategy.DELIMITER);
-
-    static final String IMPORTED_URIS = "IMPORTED_URIS";
-
-    static final String IMPORTED_RESOURCES = "IMPORTED_RESOURCES";
-
-    @Inject
-    private IResourceDescription.Manager descriptionManager;
-
-    @Inject
-    private IResourceScopeCache cache;
-
-    /**
-     * Return the set of URI objects pointing to the resources that must be
-     * included for compilation.
-     */
-    @Override
-    protected LinkedHashSet<URI> getImportedUris(Resource resource) {
-        return cache.get(IMPORTED_URIS, resource,
-                         new Provider<LinkedHashSet<URI>>() {
-                             /**
-                              * Collect unique URIs in case the cache is not populated yet.
-                              */
-                             @Override
-                             public LinkedHashSet<URI> get() {
-                                 var uniqueImportURIs = new LinkedHashSet<URI>(5);
-                                 collectImportUris(resource, uniqueImportURIs);
-                                 uniqueImportURIs.removeIf(uri -> !EcoreUtil2.isValidUri(resource, uri));
-                                 return uniqueImportURIs;
-                             }
-
-                             /**
-                              * Helper method to recursively collect unique URIs.
-                              */
-                             void collectImportUris(Resource resource, LinkedHashSet<URI> uniqueImportURIs) {
-                                 for (var imported : getImportedResources(resource, uniqueImportURIs)) {
-                                     collectImportUris(imported, uniqueImportURIs);
-                                 }
-                             }
-                         });
-    }
-
-    /**
-     * Return the resources imported by the given resource.
-     */
-    public Set<Resource> getImportedResources(Resource resource) {
-        return cache.get(IMPORTED_RESOURCES, resource, () -> getImportedResources(resource, null));
-    }
-
-    /**
-     * Resolve a resource identifier.
-     *
-     * @param uriStr   resource identifier to resolve.
-     * @param resource resource to (initially) resolve it relative to.
-     */
-    protected URI resolve(String uriStr, Resource resource) {
-        var uriObj = URI.createURI(uriStr);
-        if (uriObj != null && "lf".equalsIgnoreCase(uriObj.fileExtension())) {
-            // FIXME: If this doesn't work, try other things:
-            // (1) Look for a .project file up the file structure and try to
-            // resolve relative to the directory in which it is found.
-            // (2) Look for package description files try to resolve relative
-            // to the paths it includes.
-            // FIXME: potentially use a cache here to speed things up.
-            // See OnChangeEvictingCache
-            return uriObj.resolve(resource.getURI());
-        }
-        return null;
+  /** Splitter used to process user-data annotations of Model nodes. */
+  static final Splitter SPLITTER = Splitter.on(LFResourceDescriptionStrategy.DELIMITER);
+
+  static final String IMPORTED_URIS = "IMPORTED_URIS";
+
+  static final String IMPORTED_RESOURCES = "IMPORTED_RESOURCES";
+
+  @Inject private IResourceDescription.Manager descriptionManager;
+
+  @Inject private IResourceScopeCache cache;
+
+  /**
+   * Return the set of URI objects pointing to the resources that must be included for compilation.
+   */
+  @Override
+  protected LinkedHashSet<URI> getImportedUris(Resource resource) {
+    return cache.get(
+        IMPORTED_URIS,
+        resource,
+        new Provider<LinkedHashSet<URI>>() {
+          /** Collect unique URIs in case the cache is not populated yet. */
+          @Override
+          public LinkedHashSet<URI> get() {
+            var uniqueImportURIs = new LinkedHashSet<URI>(5);
+            collectImportUris(resource, uniqueImportURIs);
+            uniqueImportURIs.removeIf(uri -> !EcoreUtil2.isValidUri(resource, uri));
+            return uniqueImportURIs;
+          }
+
+          /** Helper method to recursively collect unique URIs. */
+          void collectImportUris(Resource resource, LinkedHashSet<URI> uniqueImportURIs) {
+            for (var imported : getImportedResources(resource, uniqueImportURIs)) {
+              collectImportUris(imported, uniqueImportURIs);
+            }
+          }
+        });
+  }
+
+  /** Return the resources imported by the given resource. */
+  public Set<Resource> getImportedResources(Resource resource) {
+    return cache.get(IMPORTED_RESOURCES, resource, () -> getImportedResources(resource, null));
+  }
+
+  /**
+   * Resolve a resource identifier.
+   *
+   * @param uriStr resource identifier to resolve.
+   * @param resource resource to (initially) resolve it relative to.
+   */
+  protected URI resolve(String uriStr, Resource resource) {
+    var uriObj = URI.createURI(uriStr);
+    if (uriObj != null && "lf".equalsIgnoreCase(uriObj.fileExtension())) {
+      // FIXME: If this doesn't work, try other things:
+      // (1) Look for a .project file up the file structure and try to
+      // resolve relative to the directory in which it is found.
+      // (2) Look for package description files try to resolve relative
+      // to the paths it includes.
+      // FIXME: potentially use a cache here to speed things up.
+      // See OnChangeEvictingCache
+      return uriObj.resolve(resource.getURI());
     }
-
-    /**
-     * Return the resources imported by a given resource, excluding those
-     * already discovered and therefore are present in the given set of
-     * import URIs.
-     *
-     * @param resource         The resource to analyze.
-     * @param uniqueImportURIs The set of discovered import URIs
-     */
-    protected Set<Resource> getImportedResources(Resource resource, LinkedHashSet<URI> uniqueImportURIs) {
-        var resourceDescription = descriptionManager.getResourceDescription(resource);
-        var models = resourceDescription.getExportedObjectsByType(LfPackage.Literals.MODEL);
-        var resources = new LinkedHashSet<Resource>();
-        for (var model : models) {
-            var userData = model.getUserData(LFResourceDescriptionStrategy.INCLUDES);
-            if (userData != null) {
-                for (String uri : SPLITTER.split(userData)) {// Attempt to resolve the URI
-                    var includedUri = this.resolve(uri, resource);
-                    if (includedUri != null) {
-                        try {
-                            if (uniqueImportURIs == null || uniqueImportURIs.add(includedUri)) {
-                                resources.add(resource.getResourceSet().getResource(includedUri, true));
-                            }
-                        } catch (RuntimeException e) {
-                            System.err.println("Unable to import " + includedUri + ": " + e.getMessage());
-                        }
-                    }
-
-                }
+    return null;
+  }
+
+  /**
+   * Return the resources imported by a given resource, excluding those already discovered and
+   * therefore are present in the given set of import URIs.
+   *
+   * @param resource The resource to analyze.
+   * @param uniqueImportURIs The set of discovered import URIs
+   */
+  protected Set<Resource> getImportedResources(
+      Resource resource, LinkedHashSet<URI> uniqueImportURIs) {
+    var resourceDescription = descriptionManager.getResourceDescription(resource);
+    var models = resourceDescription.getExportedObjectsByType(LfPackage.Literals.MODEL);
+    var resources = new LinkedHashSet<Resource>();
+    for (var model : models) {
+      var userData = model.getUserData(LFResourceDescriptionStrategy.INCLUDES);
+      if (userData != null) {
+        for (String uri : SPLITTER.split(userData)) { // Attempt to resolve the URI
+          var includedUri = this.resolve(uri, resource);
+          if (includedUri != null) {
+            try {
+              if (uniqueImportURIs == null || uniqueImportURIs.add(includedUri)) {
+                resources.add(resource.getResourceSet().getResource(includedUri, true));
+              }
+            } catch (RuntimeException e) {
+              System.err.println("Unable to import " + includedUri + ": " + e.getMessage());
             }
+          }
         }
-        return resources;
+      }
     }
+    return resources;
+  }
 }
diff --git a/org.lflang/src/org/lflang/scoping/LFScopeProvider.java b/org.lflang/src/org/lflang/scoping/LFScopeProvider.java
index 9967ddaabe..6a303b0eaf 100644
--- a/org.lflang/src/org/lflang/scoping/LFScopeProvider.java
+++ b/org.lflang/src/org/lflang/scoping/LFScopeProvider.java
@@ -3,13 +3,10 @@
  */
 package org.lflang.scoping;
 
-
 /**
  * This class contains custom scoping description.
- * 
- * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#scoping
- * on how and when to use it.
+ *
+ * <p>See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#scoping on how and
+ * when to use it.
  */
-public class LFScopeProvider extends LFScopeProviderImpl {
-
-}
+public class LFScopeProvider extends LFScopeProviderImpl {}
diff --git a/org.lflang/src/org/lflang/scoping/LFScopeProviderImpl.java b/org.lflang/src/org/lflang/scoping/LFScopeProviderImpl.java
index 0e521e8cc4..c5cbea4e7e 100644
--- a/org.lflang/src/org/lflang/scoping/LFScopeProviderImpl.java
+++ b/org.lflang/src/org/lflang/scoping/LFScopeProviderImpl.java
@@ -1,27 +1,27 @@
 /*************
-Copyright (c) 2020, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.scoping;
 
@@ -29,16 +29,13 @@
 import static org.lflang.ast.ASTUtils.*;
 
 import com.google.inject.Inject;
-
 import java.util.ArrayList;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.xtext.naming.SimpleNameProvider;
 import org.eclipse.xtext.scoping.IScope;
 import org.eclipse.xtext.scoping.Scopes;
 import org.eclipse.xtext.scoping.impl.SelectableBasedScope;
-
 import org.lflang.lf.Assignment;
 import org.lflang.lf.Connection;
 import org.lflang.lf.Deadline;
@@ -63,220 +60,220 @@
  */
 public class LFScopeProviderImpl extends AbstractLFScopeProvider {
 
-    @Inject
-    private SimpleNameProvider nameProvider;
+  @Inject private SimpleNameProvider nameProvider;
 
-    @Inject
-    private LFGlobalScopeProvider scopeProvider;
+  @Inject private LFGlobalScopeProvider scopeProvider;
 
-    /**
-     * Enumerate of the kinds of references.
-     */
-    enum RefType {
-        NULL,
-        TRIGGER,
-        SOURCE,
-        EFFECT,
-        WATCHDOG,
-        DEADLINE,
-        CLEFT,
-        CRIGHT
-    }
+  /** Enumerate of the kinds of references. */
+  enum RefType {
+    NULL,
+    TRIGGER,
+    SOURCE,
+    EFFECT,
+    WATCHDOG,
+    DEADLINE,
+    CLEFT,
+    CRIGHT
+  }
 
-    /**
-     * Depending on the provided context, construct the appropriate scope
-     * for the given reference.
-     *
-     * @param context   The AST node in which a to-be-resolved reference occurs.
-     * @param reference The reference to resolve.
-     */
-    @Override
-    public IScope getScope(EObject context, EReference reference) {
-        if (context instanceof VarRef) {
-            return getScopeForVarRef((VarRef) context, reference);
-        } else if (context instanceof Assignment) {
-            return getScopeForAssignment((Assignment) context, reference);
-        } else if (context instanceof Instantiation) {
-            return getScopeForReactorDecl(context, reference);
-        } else if (context instanceof Reactor) {
-            return getScopeForReactorDecl(context, reference);
-        } else if (context instanceof ImportedReactor) {
-            return getScopeForImportedReactor((ImportedReactor) context, reference);
-        }
-        return super.getScope(context, reference);
+  /**
+   * Depending on the provided context, construct the appropriate scope for the given reference.
+   *
+   * @param context The AST node in which a to-be-resolved reference occurs.
+   * @param reference The reference to resolve.
+   */
+  @Override
+  public IScope getScope(EObject context, EReference reference) {
+    if (context instanceof VarRef) {
+      return getScopeForVarRef((VarRef) context, reference);
+    } else if (context instanceof Assignment) {
+      return getScopeForAssignment((Assignment) context, reference);
+    } else if (context instanceof Instantiation) {
+      return getScopeForReactorDecl(context, reference);
+    } else if (context instanceof Reactor) {
+      return getScopeForReactorDecl(context, reference);
+    } else if (context instanceof ImportedReactor) {
+      return getScopeForImportedReactor((ImportedReactor) context, reference);
     }
+    return super.getScope(context, reference);
+  }
 
-    /**
-     * Filter out candidates that do not originate from the file listed in
-     * this particular import statement.
-     */
-    protected IScope getScopeForImportedReactor(ImportedReactor context, EReference reference) {
-        String importURI = ((Import) context.eContainer()).getImportURI();
-        var importedURI = scopeProvider.resolve(importURI == null ? "" : importURI, context.eResource());
-        if (importedURI != null) {
-            var uniqueImportURIs = scopeProvider.getImportedUris(context.eResource());
-            var descriptions = scopeProvider.getResourceDescriptions(context.eResource(), uniqueImportURIs);
-            var description = descriptions.getResourceDescription(importedURI);
-            return SelectableBasedScope.createScope(IScope.NULLSCOPE, description, null, reference.getEReferenceType(), false);
-        }
-        return Scopes.scopeFor(emptyList());
+  /**
+   * Filter out candidates that do not originate from the file listed in this particular import
+   * statement.
+   */
+  protected IScope getScopeForImportedReactor(ImportedReactor context, EReference reference) {
+    String importURI = ((Import) context.eContainer()).getImportURI();
+    var importedURI =
+        scopeProvider.resolve(importURI == null ? "" : importURI, context.eResource());
+    if (importedURI != null) {
+      var uniqueImportURIs = scopeProvider.getImportedUris(context.eResource());
+      var descriptions =
+          scopeProvider.getResourceDescriptions(context.eResource(), uniqueImportURIs);
+      var description = descriptions.getResourceDescription(importedURI);
+      return SelectableBasedScope.createScope(
+          IScope.NULLSCOPE, description, null, reference.getEReferenceType(), false);
     }
+    return Scopes.scopeFor(emptyList());
+  }
 
-    /**
-     * @param obj       Instantiation or Reactor that has a ReactorDecl to resolve.
-     * @param reference The reference to link to a ReactorDecl node.
-     */
-    protected IScope getScopeForReactorDecl(EObject obj, EReference reference) {
+  /**
+   * @param obj Instantiation or Reactor that has a ReactorDecl to resolve.
+   * @param reference The reference to link to a ReactorDecl node.
+   */
+  protected IScope getScopeForReactorDecl(EObject obj, EReference reference) {
 
-        // Find the local Model
-        Model model = null;
-        EObject container = obj;
-        while(model == null && container != null) {
-            container = container.eContainer();
-            if (container instanceof Model) {
-                model = (Model)container;
-            }
-        }
-        if (model == null) {
-            return Scopes.scopeFor(emptyList());
-        }
+    // Find the local Model
+    Model model = null;
+    EObject container = obj;
+    while (model == null && container != null) {
+      container = container.eContainer();
+      if (container instanceof Model) {
+        model = (Model) container;
+      }
+    }
+    if (model == null) {
+      return Scopes.scopeFor(emptyList());
+    }
 
-        // Collect eligible candidates, all of which are local (i.e., not in other files).
-        var locals = new ArrayList<ReactorDecl>(model.getReactors());
+    // Collect eligible candidates, all of which are local (i.e., not in other files).
+    var locals = new ArrayList<ReactorDecl>(model.getReactors());
 
-        // Either point to the import statement (if it is renamed)
-        // or directly to the reactor definition.
-        for (Import it : model.getImports()) {
-            for (ImportedReactor ir : it.getReactorClasses()) {
-                if (ir.getName() != null) {
-                    locals.add(ir);
-                } else if (ir.getReactorClass() != null) {
-                    locals.add(ir.getReactorClass());
-                }
-            }
+    // Either point to the import statement (if it is renamed)
+    // or directly to the reactor definition.
+    for (Import it : model.getImports()) {
+      for (ImportedReactor ir : it.getReactorClasses()) {
+        if (ir.getName() != null) {
+          locals.add(ir);
+        } else if (ir.getReactorClass() != null) {
+          locals.add(ir.getReactorClass());
         }
-        return Scopes.scopeFor(locals);
+      }
     }
+    return Scopes.scopeFor(locals);
+  }
 
-    protected IScope getScopeForAssignment(Assignment assignment, EReference reference) {
+  protected IScope getScopeForAssignment(Assignment assignment, EReference reference) {
 
-        if (reference == LfPackage.Literals.ASSIGNMENT__LHS) {
-            var defn = toDefinition(((Instantiation) assignment.eContainer()).getReactorClass());
-            if (defn != null) {
-                return Scopes.scopeFor(allParameters(defn));
-            }
-        }
-        if (reference == LfPackage.Literals.ASSIGNMENT__RHS) {
-            return Scopes.scopeFor(((Reactor) assignment.eContainer().eContainer()).getParameters());
-        }
-        return Scopes.scopeFor(emptyList());
+    if (reference == LfPackage.Literals.ASSIGNMENT__LHS) {
+      var defn = toDefinition(((Instantiation) assignment.eContainer()).getReactorClass());
+      if (defn != null) {
+        return Scopes.scopeFor(allParameters(defn));
+      }
+    }
+    if (reference == LfPackage.Literals.ASSIGNMENT__RHS) {
+      return Scopes.scopeFor(((Reactor) assignment.eContainer().eContainer()).getParameters());
     }
+    return Scopes.scopeFor(emptyList());
+  }
 
-    protected IScope getScopeForVarRef(VarRef variable, EReference reference) {
-        if (reference == LfPackage.Literals.VAR_REF__VARIABLE) {
-            // Resolve hierarchical reference
-            Reactor reactor;
-            Mode mode = null;
-            if (variable.eContainer().eContainer() instanceof Reactor) {
-                reactor = (Reactor) variable.eContainer().eContainer();
-            } else if (variable.eContainer().eContainer() instanceof Mode) {
-                mode = (Mode) variable.eContainer().eContainer();
-                reactor = (Reactor) variable.eContainer().eContainer().eContainer();
-            } else {
-                return Scopes.scopeFor(emptyList());
-            }
+  protected IScope getScopeForVarRef(VarRef variable, EReference reference) {
+    if (reference == LfPackage.Literals.VAR_REF__VARIABLE) {
+      // Resolve hierarchical reference
+      Reactor reactor;
+      Mode mode = null;
+      if (variable.eContainer().eContainer() instanceof Reactor) {
+        reactor = (Reactor) variable.eContainer().eContainer();
+      } else if (variable.eContainer().eContainer() instanceof Mode) {
+        mode = (Mode) variable.eContainer().eContainer();
+        reactor = (Reactor) variable.eContainer().eContainer().eContainer();
+      } else {
+        return Scopes.scopeFor(emptyList());
+      }
 
-            RefType type = getRefType(variable);
+      RefType type = getRefType(variable);
 
-            if (variable.getContainer() != null) { // Resolve hierarchical port reference
-                var instanceName = nameProvider.getFullyQualifiedName(variable.getContainer());
-                var instances = new ArrayList<Instantiation>(reactor.getInstantiations());
-                if (mode != null) {
-                    instances.addAll(mode.getInstantiations());
-                }
+      if (variable.getContainer() != null) { // Resolve hierarchical port reference
+        var instanceName = nameProvider.getFullyQualifiedName(variable.getContainer());
+        var instances = new ArrayList<Instantiation>(reactor.getInstantiations());
+        if (mode != null) {
+          instances.addAll(mode.getInstantiations());
+        }
 
-                if (instanceName != null) {
-                    for (var instance : instances) {
-                        var defn = toDefinition(instance.getReactorClass());
-                        if (defn != null && instance.getName().equals(instanceName.toString())) {
-                            switch (type) {
-                            case TRIGGER:
-                            case SOURCE:
-                            case CLEFT:
-                                return Scopes.scopeFor(allOutputs(defn));
-                            case EFFECT:
-                            case DEADLINE:
-                            case CRIGHT:
-                                return Scopes.scopeFor(allInputs(defn));
-                            }
-                        }
-                    }
-                }
-                return Scopes.scopeFor(emptyList());
-            } else {
-                // Resolve local reference
-                switch (type) {
-                case TRIGGER: {
-                    var candidates = new ArrayList<EObject>();
-                    if (mode != null) {
-                        candidates.addAll(mode.getActions());
-                        candidates.addAll(mode.getTimers());
-                    }
-                    candidates.addAll(allInputs(reactor));
-                    candidates.addAll(allActions(reactor));
-                    candidates.addAll(allTimers(reactor));
-                    candidates.addAll(allWatchdogs(reactor));
-                    return Scopes.scopeFor(candidates);
-                }
+        if (instanceName != null) {
+          for (var instance : instances) {
+            var defn = toDefinition(instance.getReactorClass());
+            if (defn != null && instance.getName().equals(instanceName.toString())) {
+              switch (type) {
+                case TRIGGER:
                 case SOURCE:
-                    return super.getScope(variable, reference);
-                case EFFECT: {
-                    var candidates = new ArrayList<EObject>();
-                    if (mode != null) {
-                        candidates.addAll(mode.getActions());
-                        candidates.addAll(reactor.getModes());
-                    }
-                    candidates.addAll(allOutputs(reactor));
-                    candidates.addAll(allActions(reactor));
-                    candidates.addAll(allWatchdogs(reactor));
-                    return Scopes.scopeFor(candidates);
-                }
-                case WATCHDOG:
-                    return Scopes.scopeFor(allWatchdogs(reactor));
-                case DEADLINE:
                 case CLEFT:
-                    return Scopes.scopeFor(allInputs(reactor));
+                  return Scopes.scopeFor(allOutputs(defn));
+                case EFFECT:
+                case DEADLINE:
                 case CRIGHT:
-                    return Scopes.scopeFor(allOutputs(reactor));
-                default:
-                    return Scopes.scopeFor(emptyList());
-                }
+                  return Scopes.scopeFor(allInputs(defn));
+              }
             }
-        } else { // Resolve instance
-            return super.getScope(variable, reference);
+          }
         }
-    }
-
-    private RefType getRefType(VarRef variable) {
-        if (variable.eContainer() instanceof Deadline) {
-            return RefType.DEADLINE;
-        } else if (variable.eContainer() instanceof Reaction) {
-            var reaction = (Reaction) variable.eContainer();
-            if (reaction.getTriggers().contains(variable)) {
-                return RefType.TRIGGER;
-            } else if (reaction.getSources().contains(variable)) {
-                return RefType.SOURCE;
-            } else if (reaction.getEffects().contains(variable)) {
-                return RefType.EFFECT;
+        return Scopes.scopeFor(emptyList());
+      } else {
+        // Resolve local reference
+        switch (type) {
+          case TRIGGER:
+            {
+              var candidates = new ArrayList<EObject>();
+              if (mode != null) {
+                candidates.addAll(mode.getActions());
+                candidates.addAll(mode.getTimers());
+              }
+              candidates.addAll(allInputs(reactor));
+              candidates.addAll(allActions(reactor));
+              candidates.addAll(allTimers(reactor));
+              candidates.addAll(allWatchdogs(reactor));
+              return Scopes.scopeFor(candidates);
             }
-        } else if (variable.eContainer() instanceof Connection) {
-            var conn = (Connection) variable.eContainer();
-            if (conn.getLeftPorts().contains(variable)) {
-                return RefType.CLEFT;
-            } else if (conn.getRightPorts().contains(variable)) {
-                return RefType.CRIGHT;
+          case SOURCE:
+            return super.getScope(variable, reference);
+          case EFFECT:
+            {
+              var candidates = new ArrayList<EObject>();
+              if (mode != null) {
+                candidates.addAll(mode.getActions());
+                candidates.addAll(reactor.getModes());
+              }
+              candidates.addAll(allOutputs(reactor));
+              candidates.addAll(allActions(reactor));
+              candidates.addAll(allWatchdogs(reactor));
+              return Scopes.scopeFor(candidates);
             }
+          case WATCHDOG:
+            return Scopes.scopeFor(allWatchdogs(reactor));
+          case DEADLINE:
+          case CLEFT:
+            return Scopes.scopeFor(allInputs(reactor));
+          case CRIGHT:
+            return Scopes.scopeFor(allOutputs(reactor));
+          default:
+            return Scopes.scopeFor(emptyList());
         }
-        return RefType.NULL;
+      }
+    } else { // Resolve instance
+      return super.getScope(variable, reference);
+    }
+  }
+
+  private RefType getRefType(VarRef variable) {
+    if (variable.eContainer() instanceof Deadline) {
+      return RefType.DEADLINE;
+    } else if (variable.eContainer() instanceof Reaction) {
+      var reaction = (Reaction) variable.eContainer();
+      if (reaction.getTriggers().contains(variable)) {
+        return RefType.TRIGGER;
+      } else if (reaction.getSources().contains(variable)) {
+        return RefType.SOURCE;
+      } else if (reaction.getEffects().contains(variable)) {
+        return RefType.EFFECT;
+      }
+    } else if (variable.eContainer() instanceof Connection) {
+      var conn = (Connection) variable.eContainer();
+      if (conn.getLeftPorts().contains(variable)) {
+        return RefType.CLEFT;
+      } else if (conn.getRightPorts().contains(variable)) {
+        return RefType.CRIGHT;
+      }
     }
+    return RefType.NULL;
+  }
 }
diff --git a/org.lflang/src/org/lflang/util/ArduinoUtil.java b/org.lflang/src/org/lflang/util/ArduinoUtil.java
index 85eac8ae8f..af741da7f2 100644
--- a/org.lflang/src/org/lflang/util/ArduinoUtil.java
+++ b/org.lflang/src/org/lflang/util/ArduinoUtil.java
@@ -5,123 +5,153 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.List;
-
+import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 import org.lflang.generator.GeneratorCommandFactory;
 import org.lflang.generator.LFGeneratorContext;
 
-import org.eclipse.xtext.xbase.lib.Exceptions;
-
 /**
  * Utilities for Building using Arduino CLI.
  *
- * We take in a Generator Context, Command Factory, and Error Reporter and 
- * make subsequent calls to arduino-cli given a FileConfig and TargetConfig.
- * 
- * This should be used immediately after CodeGen to compile if the user provides
- * a board type within their LF file. If the user also provides a port with flash enabled,
- * we will also attempt to upload the compiled sketch directly to the board.
+ * <p>We take in a Generator Context, Command Factory, and Error Reporter and make subsequent calls
+ * to arduino-cli given a FileConfig and TargetConfig.
+ *
+ * <p>This should be used immediately after CodeGen to compile if the user provides a board type
+ * within their LF file. If the user also provides a port with flash enabled, we will also attempt
+ * to upload the compiled sketch directly to the board.
  */
 public class ArduinoUtil {
 
-    private LFGeneratorContext context;
-    private GeneratorCommandFactory commandFactory;
-    private ErrorReporter errorReporter;
+  private LFGeneratorContext context;
+  private GeneratorCommandFactory commandFactory;
+  private ErrorReporter errorReporter;
 
-    public ArduinoUtil (LFGeneratorContext context, GeneratorCommandFactory commandFactory, ErrorReporter errorReporter) {
-        this.context = context;
-        this.commandFactory = commandFactory;
-        this.errorReporter = errorReporter;
-    }
+  public ArduinoUtil(
+      LFGeneratorContext context,
+      GeneratorCommandFactory commandFactory,
+      ErrorReporter errorReporter) {
+    this.context = context;
+    this.commandFactory = commandFactory;
+    this.errorReporter = errorReporter;
+  }
 
-    /**
-     * Return true if arduino-cli exists, false otherwise.
-     */
-    private boolean checkArduinoCLIExists() {
-        LFCommand checkCommand = LFCommand.get("arduino-cli", List.of("version"));
-        return checkCommand != null && checkCommand.run() == 0;
-    }
+  /** Return true if arduino-cli exists, false otherwise. */
+  private boolean checkArduinoCLIExists() {
+    LFCommand checkCommand = LFCommand.get("arduino-cli", List.of("version"));
+    return checkCommand != null && checkCommand.run() == 0;
+  }
 
-    /**
-     * Generate an LF style command for Arduino compilation based on FQBN
-     * @param fileConfig
-     * @param targetConfig
-     * @return LFCommand to compile an Arduino program given an FQBN.
-     * @throws IOException
-     */
-    private LFCommand arduinoCompileCommand(FileConfig fileConfig, TargetConfig targetConfig) throws IOException {
-        if (!checkArduinoCLIExists()) {
-            throw new IOException("Must have arduino-cli installed to auto-compile.");
-        } else {
-            var srcGenPath = fileConfig.getSrcGenPath();
-            try {
-                // Write to a temporary file to execute since ProcessBuilder does not like spaces and double quotes in its arguments.
-                File testScript = File.createTempFile("arduino", null);
-                testScript.deleteOnExit();
-                if (!testScript.setExecutable(true)) {
-                    throw new IOException("Failed to make compile script executable");
-                }
-                var fileWriter = new FileWriter(testScript.getAbsoluteFile(), true);
-                BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
-                String board = targetConfig.platformOptions.board != null ? targetConfig.platformOptions.board : "arduino:avr:leonardo";
-                String isThreaded = targetConfig.platformOptions.board.contains("mbed") ? "-DLF_THREADED" : "-DLF_UNTHREADED";
-                bufferedWriter.write("arduino-cli compile -b " + board + " --build-property " +
-                    "compiler.c.extra_flags=\"" + isThreaded + " -DPLATFORM_ARDUINO -DINITIAL_EVENT_QUEUE_SIZE=10 -DINITIAL_REACT_QUEUE_SIZE=10\" " +
-                    "--build-property compiler.cpp.extra_flags=\"" + isThreaded + " -DPLATFORM_ARDUINO -DINITIAL_EVENT_QUEUE_SIZE=10 -DINITIAL_REACT_QUEUE_SIZE=10\" "
-                    + srcGenPath.toString());
-                bufferedWriter.close();
-                return commandFactory.createCommand(
-                    testScript.getAbsolutePath(), List.of(), null);
-            } catch (IOException e) {
-               e.printStackTrace();
-               throw new IOException(e);
-            }
+  /**
+   * Generate an LF style command for Arduino compilation based on FQBN
+   *
+   * @param fileConfig
+   * @param targetConfig
+   * @return LFCommand to compile an Arduino program given an FQBN.
+   * @throws IOException
+   */
+  private LFCommand arduinoCompileCommand(FileConfig fileConfig, TargetConfig targetConfig)
+      throws IOException {
+    if (!checkArduinoCLIExists()) {
+      throw new IOException("Must have arduino-cli installed to auto-compile.");
+    } else {
+      var srcGenPath = fileConfig.getSrcGenPath();
+      try {
+        // Write to a temporary file to execute since ProcessBuilder does not like spaces and double
+        // quotes in its arguments.
+        File testScript = File.createTempFile("arduino", null);
+        testScript.deleteOnExit();
+        if (!testScript.setExecutable(true)) {
+          throw new IOException("Failed to make compile script executable");
         }
+        var fileWriter = new FileWriter(testScript.getAbsoluteFile(), true);
+        BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
+        String board =
+            targetConfig.platformOptions.board != null
+                ? targetConfig.platformOptions.board
+                : "arduino:avr:leonardo";
+        String isThreaded =
+            targetConfig.platformOptions.board.contains("mbed")
+                ? "-DLF_THREADED"
+                : "-DLF_UNTHREADED";
+        bufferedWriter.write(
+            "arduino-cli compile -b "
+                + board
+                + " --build-property "
+                + "compiler.c.extra_flags=\""
+                + isThreaded
+                + " -DPLATFORM_ARDUINO -DINITIAL_EVENT_QUEUE_SIZE=10"
+                + " -DINITIAL_REACT_QUEUE_SIZE=10\" --build-property compiler.cpp.extra_flags=\""
+                + isThreaded
+                + " -DPLATFORM_ARDUINO -DINITIAL_EVENT_QUEUE_SIZE=10"
+                + " -DINITIAL_REACT_QUEUE_SIZE=10\" "
+                + srcGenPath.toString());
+        bufferedWriter.close();
+        return commandFactory.createCommand(testScript.getAbsolutePath(), List.of(), null);
+      } catch (IOException e) {
+        e.printStackTrace();
+        throw new IOException(e);
+      }
     }
+  }
 
-    /**
-     * Compiles (and possibly auto-flashes) an Arduino program once code generation is completed.
-     * @param fileConfig
-     * @param targetConfig
-     */
-    public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
-        System.out.println("Retrieving Arduino Compile Script");
-        try {
-            LFCommand command = arduinoCompileCommand(fileConfig, targetConfig); // Use ProcessBuilder for finer control.
-            int retCode = 0;
-            retCode = command.run(context.getCancelIndicator());
-            if (retCode != 0 && context.getMode() == LFGeneratorContext.Mode.STANDALONE) {
-                errorReporter.reportError("arduino-cli failed with error code " + retCode);
-                throw new IOException("arduino-cli failure");
-            }
-        } catch (IOException e){
-            Exceptions.sneakyThrow(e);
+  /**
+   * Compiles (and possibly auto-flashes) an Arduino program once code generation is completed.
+   *
+   * @param fileConfig
+   * @param targetConfig
+   */
+  public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
+    System.out.println("Retrieving Arduino Compile Script");
+    try {
+      LFCommand command =
+          arduinoCompileCommand(fileConfig, targetConfig); // Use ProcessBuilder for finer control.
+      int retCode = 0;
+      retCode = command.run(context.getCancelIndicator());
+      if (retCode != 0 && context.getMode() == LFGeneratorContext.Mode.STANDALONE) {
+        errorReporter.reportError("arduino-cli failed with error code " + retCode);
+        throw new IOException("arduino-cli failure");
+      }
+    } catch (IOException e) {
+      Exceptions.sneakyThrow(e);
+    }
+    System.out.println(
+        "SUCCESS: Compiling generated code for " + fileConfig.name + " finished with no errors.");
+    if (targetConfig.platformOptions.flash) {
+      if (targetConfig.platformOptions.port != null) {
+        System.out.println("Invoking flash command for Arduino");
+        LFCommand flash =
+            commandFactory.createCommand(
+                "arduino-cli",
+                List.of(
+                    "upload",
+                    "-b",
+                    targetConfig.platformOptions.board,
+                    "-p",
+                    targetConfig.platformOptions.port),
+                fileConfig.getSrcGenPath());
+        if (flash == null) {
+          errorReporter.reportError("Could not create arduino-cli flash command.");
         }
-        System.out.println("SUCCESS: Compiling generated code for " + fileConfig.name + " finished with no errors.");
-        if (targetConfig.platformOptions.flash) {
-            if (targetConfig.platformOptions.port != null) {
-                System.out.println("Invoking flash command for Arduino");
-                LFCommand flash = commandFactory.createCommand(
-                    "arduino-cli", List.of("upload", "-b", targetConfig.platformOptions.board, "-p", targetConfig.platformOptions.port), fileConfig.getSrcGenPath());
-                if (flash == null) {
-                    errorReporter.reportError(
-                    "Could not create arduino-cli flash command."
-                    );
-                }
-                int flashRet = flash.run();
-                if (flashRet != 0) {
-                    errorReporter.reportError("arduino-cli flash command failed with error code " + flashRet);
-                } else {
-                    System.out.println("SUCCESS: Flashed board using arduino-cli");
-                }
-            } else {
-                errorReporter.reportError("Need to provide a port on which to automatically flash.");
-            }
+        int flashRet = flash.run();
+        if (flashRet != 0) {
+          errorReporter.reportError("arduino-cli flash command failed with error code " + flashRet);
         } else {
-            System.out.println("********");
-            System.out.println("To flash your program, run the following command to see information about the board you plugged in:\n\n\tarduino-cli board list\n\nGrab the FQBN and PORT from the command and run the following command in the generated sources directory:\n\n\tarduino-cli upload -b <FQBN> -p <PORT>\n");
+          System.out.println("SUCCESS: Flashed board using arduino-cli");
         }
+      } else {
+        errorReporter.reportError("Need to provide a port on which to automatically flash.");
+      }
+    } else {
+      System.out.println("********");
+      System.out.println(
+          "To flash your program, run the following command to see information about the board you"
+              + " plugged in:\n\n"
+              + "\tarduino-cli board list\n\n"
+              + "Grab the FQBN and PORT from the command and run the following command in the"
+              + " generated sources directory:\n\n"
+              + "\tarduino-cli upload -b <FQBN> -p <PORT>\n");
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/util/Averager.java b/org.lflang/src/org/lflang/util/Averager.java
index 81349c9db1..f156eafb22 100644
--- a/org.lflang/src/org/lflang/util/Averager.java
+++ b/org.lflang/src/org/lflang/util/Averager.java
@@ -1,27 +1,26 @@
 package org.lflang.util;
 
 import java.util.Arrays;
-
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
 
 /** Average asynchronously reported numbers and do something with them. */
 public class Averager {
-    private final int n;
-    private final int[] reports;
+  private final int n;
+  private final int[] reports;
 
-    /** Create an averager of reports from {@code n} processes. */
-    public Averager(int n) {
-        this.n = n;
-        reports = new int[n];
-    }
+  /** Create an averager of reports from {@code n} processes. */
+  public Averager(int n) {
+    this.n = n;
+    reports = new int[n];
+  }
 
-    /**
-     * Receive {@code x} from process {@code id} and invoke {@code callback}
-     * on the mean of the numbers most recently reported by the processes.
-     */
-    public synchronized void report(int id, int x, Procedure1<Integer> callback) {
-        assert 0 <= id && id < n;
-        reports[id] = x;
-        callback.apply(Arrays.stream(reports).sum() / n);
-    }
+  /**
+   * Receive {@code x} from process {@code id} and invoke {@code callback} on the mean of the
+   * numbers most recently reported by the processes.
+   */
+  public synchronized void report(int id, int x, Procedure1<Integer> callback) {
+    assert 0 <= id && id < n;
+    reports[id] = x;
+    callback.apply(Arrays.stream(reports).sum() / n);
+  }
 }
diff --git a/org.lflang/src/org/lflang/util/CollectionUtil.java b/org.lflang/src/org/lflang/util/CollectionUtil.java
index 221cbc68ec..8510856c78 100644
--- a/org.lflang/src/org/lflang/util/CollectionUtil.java
+++ b/org.lflang/src/org/lflang/util/CollectionUtil.java
@@ -14,176 +14,159 @@
 /**
  * Utilities to manipulate collections.
  *
- * <p>Most of these methods are using specialized collection
- * implementations (possibly unmodifiable) for small collection
- * sizes. No guarantee is made on the mutability of the collections
- * returned from these functions, meaning, callers should always
- * assume they are unmodifiable. Functions that take a collection
- * parameter as input to produce a new one with a transformation
- * require the input collection to have been obtained from one of
- * the utility functions of this class in the first place.
+ * <p>Most of these methods are using specialized collection implementations (possibly unmodifiable)
+ * for small collection sizes. No guarantee is made on the mutability of the collections returned
+ * from these functions, meaning, callers should always assume they are unmodifiable. Functions that
+ * take a collection parameter as input to produce a new one with a transformation require the input
+ * collection to have been obtained from one of the utility functions of this class in the first
+ * place.
  */
 public class CollectionUtil {
 
-    /**
-     * Returns a set which contains the elements of the given
-     * set plus the given element. The returned set should be
-     * considered unmodifiable.
-     *
-     * @param set initial set, nullable
-     * @param t   new element
-     * @param <T> Type of elements
-     * @return A new set, or the same
-     */
-    public static <T> Set<T> plus(Set<T> set, T t) {
-        if (set == null || set.isEmpty()) {
-            return Set.of(t);
-        } else if (set.size() == 1) {
-            if (set.contains(t)) {
-                return set;
-            }
-            // make mutable
-            set = new LinkedHashSet<>(set);
-        } // else it's already mutable.
-
-        set.add(t);
+  /**
+   * Returns a set which contains the elements of the given set plus the given element. The returned
+   * set should be considered unmodifiable.
+   *
+   * @param set initial set, nullable
+   * @param t new element
+   * @param <T> Type of elements
+   * @return A new set, or the same
+   */
+  public static <T> Set<T> plus(Set<T> set, T t) {
+    if (set == null || set.isEmpty()) {
+      return Set.of(t);
+    } else if (set.size() == 1) {
+      if (set.contains(t)) {
         return set;
+      }
+      // make mutable
+      set = new LinkedHashSet<>(set);
+    } // else it's already mutable.
+
+    set.add(t);
+    return set;
+  }
+
+  public static <K, V> Map<K, V> plus(Map<K, V> map, K k, V v) {
+    if (map == null || map.isEmpty()) {
+      return Collections.singletonMap(k, v);
+    } else if (map.size() == 1) {
+      Entry<K, V> e = map.entrySet().iterator().next();
+      if (e.getKey().equals(k)) {
+        return Map.of(k, v);
+      }
+      // make mutable
+      map = new LinkedHashMap<>(map);
+    } // else it's already mutable.
+
+    map.put(k, v);
+    return map;
+  }
+
+  /**
+   * Remove the given value from all the sets that are values in the given map. Use this if the
+   * values of the map (the sets) were build with {@link #plus(Set, Object)}.
+   *
+   * <p>In {@link org.lflang.graph.DirectedGraph}, this is used to properly remove nodes from a
+   * graph. There, we use maps to represent edges, where a value in a map is a set of nodes adjacent
+   * to the key for that value. Hence, when a node is removed, it needs to be removed not just as a
+   * key, but it also needs to be removed from the neighbors sets of any other keys that may contain
+   * it.
+   *
+   * @param map A modifiable map
+   * @param valueToRemove Value to remove
+   */
+  public static <K, V> void removeFromValues(Map<K, Set<V>> map, V valueToRemove) {
+    mapValuesInPlace(map, set -> minus(set, valueToRemove));
+  }
+
+  /**
+   * Apply a transform to the values of the map. If the mapping function returns null, the entry is
+   * removed.
+   */
+  private static <K, V> void mapValuesInPlace(Map<K, V> map, Function<V, V> mapper) {
+    Iterator<Entry<K, V>> iterator = map.entrySet().iterator();
+    while (iterator.hasNext()) {
+      Entry<K, V> e = iterator.next();
+      V existing = e.getValue();
+      V mapped = mapper.apply(existing);
+      if (mapped == null) {
+        iterator.remove();
+      } else if (mapped != existing) {
+        e.setValue(mapped);
+      }
     }
-
-
-    public static <K, V> Map<K, V> plus(Map<K, V> map, K k, V v) {
-        if (map == null || map.isEmpty()) {
-            return Collections.singletonMap(k, v);
-        } else if (map.size() == 1) {
-            Entry<K, V> e = map.entrySet().iterator().next();
-            if (e.getKey().equals(k)) {
-                return Map.of(k, v);
-            }
-            // make mutable
-            map = new LinkedHashMap<>(map);
-        } // else it's already mutable.
-
-        map.put(k, v);
-        return map;
+  }
+
+  /**
+   * Returns a set that contains the elements of the given set minus one element. An empty set is
+   * considered empty.
+   */
+  public static <T> Set<T> minus(Set<T> set, T eltToRemove) {
+    if (set instanceof LinkedHashSet) {
+      set.remove(eltToRemove);
+      return set;
     }
 
-
-    /**
-     * Remove the given value from all the sets that are values
-     * in the given map. Use this if the values of the map (the
-     * sets) were build with {@link #plus(Set, Object)}.
-     * <p>
-     * In {@link org.lflang.graph.DirectedGraph}, this is used
-     * to properly remove nodes from a graph. There, we use
-     * maps to represent edges, where a value in a map is a
-     * set of nodes adjacent to the key for that value.
-     * Hence, when a node is removed, it needs to be removed
-     * not just as a key, but it also needs to be removed
-     * from the neighbors sets of any other keys that may contain it.
-     *
-     * @param map           A modifiable map
-     * @param valueToRemove Value to remove
-     */
-    public static <K, V> void removeFromValues(Map<K, Set<V>> map, V valueToRemove) {
-        mapValuesInPlace(map, set -> minus(set, valueToRemove));
+    if (set == null || set.isEmpty()) {
+      return Collections.emptySet();
+    } else if (set.size() == 1) {
+      return set.contains(eltToRemove) ? Collections.emptySet() : set;
     }
-
-
-    /**
-     * Apply a transform to the values of the map. If the mapping
-     * function returns null, the entry is removed.
-     */
-    private static <K, V> void mapValuesInPlace(Map<K, V> map, Function<V, V> mapper) {
-        Iterator<Entry<K, V>> iterator = map.entrySet().iterator();
-        while (iterator.hasNext()) {
-            Entry<K, V> e = iterator.next();
-            V existing = e.getValue();
-            V mapped = mapper.apply(existing);
-            if (mapped == null) {
-                iterator.remove();
-            } else if (mapped != existing) {
-                e.setValue(mapped);
-            }
-        }
+    throw new AssertionError("should be unreachable");
+  }
+
+  /**
+   * Returns a map that is identical to the original map, except the value for key {@code k} is
+   * transformed using the given function. The transformation function takes the key and current
+   * value (null if the key is not present) as inputs, and returns the new value to associate to the
+   * key (null if the mapping should be removed).
+   *
+   * @see Map#compute(Object, BiFunction)
+   */
+  public static <K, V> Map<K, V> compute(Map<K, V> map, K k, BiFunction<K, V, V> computation) {
+    if (map == null || map.isEmpty()) {
+      return Collections.singletonMap(k, computation.apply(k, null));
+    } else if (map.size() == 1) {
+      Entry<K, V> e = map.entrySet().iterator().next();
+      if (e.getKey().equals(k)) {
+        return Collections.singletonMap(k, computation.apply(k, e.getValue()));
+      }
+      // make mutable
+      map = new LinkedHashMap<>(map);
+    } // else it's already mutable.
+
+    map.compute(k, computation);
+    return map;
+  }
+
+  /**
+   * Returns a copy of the set. The returned set should be considered unmodifiable.
+   *
+   * @param set initial set, nullable
+   * @param <T> Type of elements
+   * @return A new set, or the same
+   */
+  public static <T> Set<T> copy(Set<T> set) {
+    if (set == null || set.size() <= 1) {
+      return set; // it's unmodifiable
+    } else {
+      return new LinkedHashSet<>(set);
     }
-
-
-    /**
-     * Returns a set that contains the elements of the given
-     * set minus one element. An empty set is considered empty.
-     */
-    public static <T> Set<T> minus(Set<T> set, T eltToRemove) {
-        if (set instanceof LinkedHashSet) {
-            set.remove(eltToRemove);
-            return set;
-        }
-
-        if (set == null || set.isEmpty()) {
-            return Collections.emptySet();
-        } else if (set.size() == 1) {
-            return set.contains(eltToRemove) ? Collections.emptySet() : set;
-        }
-        throw new AssertionError("should be unreachable");
+  }
+
+  /**
+   * Returns an immutable Set that contains all argument values. Duplicate elements are removed
+   * without error (contrary to {@link Set#of()} and friends).
+   */
+  @SafeVarargs
+  public static <T> Set<T> immutableSetOf(T first, T... rest) {
+    if (rest.length == 0) {
+      return Set.of(first);
     }
-
-
-    /**
-     * Returns a map that is identical to the original map,
-     * except the value for key {@code k} is transformed using
-     * the given function. The transformation function takes the
-     * key and current value (null if the key is not present) as inputs,
-     * and returns the new value to associate to the key (null if the mapping should be removed).
-     *
-     * @see Map#compute(Object, BiFunction)
-     */
-    public static <K, V> Map<K, V> compute(Map<K, V> map, K k, BiFunction<K, V, V> computation) {
-        if (map == null || map.isEmpty()) {
-            return Collections.singletonMap(k, computation.apply(k, null));
-        } else if (map.size() == 1) {
-            Entry<K, V> e = map.entrySet().iterator().next();
-            if (e.getKey().equals(k)) {
-                return Collections.singletonMap(k, computation.apply(k, e.getValue()));
-            }
-            // make mutable
-            map = new LinkedHashMap<>(map);
-        } // else it's already mutable.
-
-        map.compute(k, computation);
-        return map;
-    }
-
-
-    /**
-     * Returns a copy of the set. The returned set should be
-     * considered unmodifiable.
-     *
-     * @param set initial set, nullable
-     * @param <T> Type of elements
-     * @return A new set, or the same
-     */
-    public static <T> Set<T> copy(Set<T> set) {
-        if (set == null || set.size() <= 1) {
-            return set; // it's unmodifiable
-        } else {
-            return new LinkedHashSet<>(set);
-        }
-    }
-
-
-    /**
-     * Returns an immutable Set that contains all argument values.
-     * Duplicate elements are removed without error (contrary
-     * to {@link Set#of()} and friends).
-     */
-    @SafeVarargs
-    public static <T> Set<T> immutableSetOf(T first, T... rest) {
-        if (rest.length == 0) {
-            return Set.of(first);
-        }
-        Set<T> result = new LinkedHashSet<>();
-        result.add(first);
-        result.addAll(Arrays.asList(rest));
-        return result;
-    }
-
+    Set<T> result = new LinkedHashSet<>();
+    result.add(first);
+    result.addAll(Arrays.asList(rest));
+    return result;
+  }
 }
diff --git a/org.lflang/src/org/lflang/util/FileUtil.java b/org.lflang/src/org/lflang/util/FileUtil.java
index eb2550127e..e46a30d501 100644
--- a/org.lflang/src/org/lflang/util/FileUtil.java
+++ b/org.lflang/src/org/lflang/util/FileUtil.java
@@ -23,9 +23,7 @@
 import java.util.jar.JarFile;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRoot;
@@ -35,890 +33,906 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.util.RuntimeIOException;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 
 public class FileUtil {
 
-    /**
-     * Return the name of the file excluding its file extension.
-     * @param file A Path object
-     * @return The name of the file excluding its file extension.
-     */
-    public static String nameWithoutExtension(Path file) {
-        String name = file.getFileName().toString();
-        int idx = name.lastIndexOf('.');
-        return idx < 0 ? name : name.substring(0, idx);
-    }
-
-    /**
-     * Return the name of the file associated with the given resource,
-     * excluding its file extension.
-     * @param r Any {@code Resource}.
-     * @return The name of the file associated with the given resource,
-     * excluding its file extension.
-     * @throws IOException If the resource has an invalid URI.
-     */
-    public static String nameWithoutExtension(Resource r) throws IOException {
-        return nameWithoutExtension(toPath(r));
-    }
-
-    /**
-     * Return a java.nio.Path object corresponding to the given URI.
-     * @throws IOException If the given URI is invalid.
-     */
-    public static Path toPath(URI uri) throws IOException {
-        return Paths.get(toIPath(uri).toFile().getAbsolutePath());
-    }
-
-    /**
-     * Return a java.nio.Path object corresponding to the given Resource.
-     * @throws IOException If the given resource has an invalid URI.
-     */
-    public static Path toPath(Resource resource) throws IOException {
-        return toPath(resource.getURI());
-    }
-
-    /**
-     * Return an org.eclipse.core.runtime.Path object corresponding to the
-     * given URI.
-     * @throws IOException If the given URI is invalid.
-     */
-    public static IPath toIPath(URI uri) throws IOException {
-        if (uri.isPlatform()) {
-            IPath path = new org.eclipse.core.runtime.Path(uri.toPlatformString(true));
-            if (path.segmentCount() == 1) {
-                return ResourcesPlugin.getWorkspace().getRoot().getProject(path.lastSegment()).getLocation();
-            } else {
-                return ResourcesPlugin.getWorkspace().getRoot().getFile(path).getLocation();
-            }
-        } else if (uri.isFile()) {
-            return new org.eclipse.core.runtime.Path(uri.toFileString());
-        } else {
-            throw new IOException("Unrecognized file protocol in URI " + uri);
-        }
-    }
-
-    /**
-     * Convert a given path to a unix-style string.
-     *
-     * This ensures that '/' is used instead of '\' as file separator.
-     */
-    public static String toUnixString(Path path) {
-        return path.toString().replace('\\', '/');
-    }
-    
-    /**
-     * Parse the string as file location and return it as URI.
-     * Supports URIs, plain file paths, and paths relative to a model.
-     * 
-     * @param path the file location as string.
-     * @param resource the model resource this file should be resolved relatively. May be null.
-     * @return the (Java) URI or null if no file can be located.
-     */
-    public static java.net.URI locateFile(String path, Resource resource) {
-        // Check if path is URL
+  /**
+   * Return the name of the file excluding its file extension.
+   *
+   * @param file A Path object
+   * @return The name of the file excluding its file extension.
+   */
+  public static String nameWithoutExtension(Path file) {
+    String name = file.getFileName().toString();
+    int idx = name.lastIndexOf('.');
+    return idx < 0 ? name : name.substring(0, idx);
+  }
+
+  /**
+   * Return the name of the file associated with the given resource, excluding its file extension.
+   *
+   * @param r Any {@code Resource}.
+   * @return The name of the file associated with the given resource, excluding its file extension.
+   * @throws IOException If the resource has an invalid URI.
+   */
+  public static String nameWithoutExtension(Resource r) throws IOException {
+    return nameWithoutExtension(toPath(r));
+  }
+
+  /**
+   * Return a java.nio.Path object corresponding to the given URI.
+   *
+   * @throws IOException If the given URI is invalid.
+   */
+  public static Path toPath(URI uri) throws IOException {
+    return Paths.get(toIPath(uri).toFile().getAbsolutePath());
+  }
+
+  /**
+   * Return a java.nio.Path object corresponding to the given Resource.
+   *
+   * @throws IOException If the given resource has an invalid URI.
+   */
+  public static Path toPath(Resource resource) throws IOException {
+    return toPath(resource.getURI());
+  }
+
+  /**
+   * Return an org.eclipse.core.runtime.Path object corresponding to the given URI.
+   *
+   * @throws IOException If the given URI is invalid.
+   */
+  public static IPath toIPath(URI uri) throws IOException {
+    if (uri.isPlatform()) {
+      IPath path = new org.eclipse.core.runtime.Path(uri.toPlatformString(true));
+      if (path.segmentCount() == 1) {
+        return ResourcesPlugin.getWorkspace()
+            .getRoot()
+            .getProject(path.lastSegment())
+            .getLocation();
+      } else {
+        return ResourcesPlugin.getWorkspace().getRoot().getFile(path).getLocation();
+      }
+    } else if (uri.isFile()) {
+      return new org.eclipse.core.runtime.Path(uri.toFileString());
+    } else {
+      throw new IOException("Unrecognized file protocol in URI " + uri);
+    }
+  }
+
+  /**
+   * Convert a given path to a unix-style string.
+   *
+   * <p>This ensures that '/' is used instead of '\' as file separator.
+   */
+  public static String toUnixString(Path path) {
+    return path.toString().replace('\\', '/');
+  }
+
+  /**
+   * Parse the string as file location and return it as URI. Supports URIs, plain file paths, and
+   * paths relative to a model.
+   *
+   * @param path the file location as string.
+   * @param resource the model resource this file should be resolved relatively. May be null.
+   * @return the (Java) URI or null if no file can be located.
+   */
+  public static java.net.URI locateFile(String path, Resource resource) {
+    // Check if path is URL
+    try {
+      var uri = new java.net.URI(path);
+      if (uri.getScheme() != null) { // check if path was meant to be a URI
+        return uri;
+      }
+    } catch (Exception e) {
+      // nothing
+    }
+    // Check if path exists as it is
+    File file = new File(path);
+    if (file.exists()) {
+      try {
+        return file.toURI();
+      } catch (Exception e) {
+        // nothing
+      }
+    }
+    // Check if path is relative to LF file
+    if (resource != null) {
+      URI eURI = resource.getURI();
+      if (eURI != null) {
+        java.net.URI sourceURI = null;
         try {
-            var uri = new java.net.URI(path);
-            if(uri.getScheme() != null) { // check if path was meant to be a URI
-                return uri;
-            }
+          if (eURI.isFile()) {
+            sourceURI = new java.net.URI(eURI.toString());
+            sourceURI =
+                new java.net.URI(
+                    sourceURI.getScheme(),
+                    null,
+                    sourceURI.getPath().substring(0, sourceURI.getPath().lastIndexOf("/")),
+                    null);
+          } else if (eURI.isPlatformResource()) {
+            IResource iFile =
+                ResourcesPlugin.getWorkspace().getRoot().findMember(eURI.toPlatformString(true));
+            sourceURI =
+                iFile != null ? iFile.getRawLocation().toFile().getParentFile().toURI() : null;
+          }
+          if (sourceURI != null) {
+            return sourceURI.resolve(path);
+          }
         } catch (Exception e) {
-            // nothing
-        }
-        // Check if path exists as it is
-        File file = new File(path);
-        if (file.exists()) {
-            try {
-                return file.toURI();
-            } catch (Exception e) {
-                // nothing
-            }
-        }
-        // Check if path is relative to LF file
-        if (resource != null) {
-            URI eURI = resource.getURI();
-            if (eURI != null) {
-                java.net.URI sourceURI = null;
-                try {
-                    if (eURI.isFile()) {
-                        sourceURI = new java.net.URI(eURI.toString());
-                        sourceURI = new java.net.URI(sourceURI.getScheme(), null,
-                                sourceURI.getPath().substring(0, sourceURI.getPath().lastIndexOf("/")), null);
-                    } else if (eURI.isPlatformResource()) {
-                        IResource iFile = ResourcesPlugin.getWorkspace().getRoot().findMember(eURI.toPlatformString(true));
-                        sourceURI = iFile != null ? iFile.getRawLocation().toFile().getParentFile().toURI() : null; 
-                    }
-                    if (sourceURI != null) {
-                        return sourceURI.resolve(path);
-                    }
-                } catch (Exception e) {
-                    // nothing
-                }
+          // nothing
+        }
+      }
+    }
+    // fail
+    return null;
+  }
+
+  /**
+   * Recursively copy the contents of the given source directory into the given destination
+   * directory. Existing files of the destination may be overwritten.
+   *
+   * @param srcDir The source directory path.
+   * @param dstDir The destination directory path.
+   * @param skipIfUnchanged If true, don't overwrite anything in the destination if its content
+   *     would not be changed.
+   * @throws IOException If the operation fails.
+   */
+  public static void copyDirectoryContents(
+      final Path srcDir, final Path dstDir, final boolean skipIfUnchanged) throws IOException {
+    try (Stream<Path> stream = Files.walk(srcDir)) {
+      stream.forEach(
+          source -> {
+            // Handling checked exceptions in lambda expressions is
+            // hard. See
+            // https://www.baeldung.com/java-lambda-exceptions#handling-checked-exceptions.
+            // An alternative would be to create a custom Consumer interface and use that
+            // here.
+            if (Files.isRegularFile(source)) { // do not copy directories
+              try {
+                Path target = dstDir.resolve(srcDir.relativize(source));
+                Files.createDirectories(target.getParent());
+                copyFile(source, target, skipIfUnchanged);
+              } catch (IOException e) {
+                throw new RuntimeIOException(e);
+              } catch (Exception e) {
+                throw new RuntimeException(e);
+              }
             }
-        }
-        // fail
+          });
+    }
+  }
+
+  /**
+   * Copy the given source directory into the given destination directory. For example, if the
+   * source directory is {@code foo/bar} and the destination is {@code baz}, then copies of the
+   * contents of {@code foo/bar} will be located in {@code baz/bar}.
+   *
+   * @param srcDir The source directory path.
+   * @param dstDir The destination directory path.
+   * @param skipIfUnchanged If true, don't overwrite anything in the destination if its content
+   *     would not be changed.
+   * @throws IOException If the operation fails.
+   */
+  public static void copyDirectory(
+      final Path srcDir, final Path dstDir, final boolean skipIfUnchanged) throws IOException {
+    copyDirectoryContents(srcDir, dstDir.resolve(srcDir.getFileName()), skipIfUnchanged);
+  }
+
+  /**
+   * Recursively copy the contents of the given source directory into the given destination
+   * directory. Existing files of the destination may be overwritten.
+   *
+   * @param srcDir The directory to copy files from.
+   * @param dstDir The directory to copy files to.
+   * @throws IOException if copy fails.
+   */
+  public static void copyDirectoryContents(final Path srcDir, final Path dstDir)
+      throws IOException {
+    copyDirectoryContents(srcDir, dstDir, false);
+  }
+
+  /**
+   * Copy a given source file to a given destination file.
+   *
+   * <p>This also creates new directories on the path to {@code dstFile} that do not yet exist.
+   *
+   * @param srcFile The source file path.
+   * @param dstFile The destination file path.
+   * @param skipIfUnchanged If true, don't overwrite the destination file if its content would not
+   *     be changed.
+   * @throws IOException If the operation fails.
+   */
+  public static void copyFile(Path srcFile, Path dstFile, boolean skipIfUnchanged)
+      throws IOException {
+    BufferedInputStream stream = new BufferedInputStream(new FileInputStream(srcFile.toFile()));
+    try (stream) {
+      copyInputStream(stream, dstFile, skipIfUnchanged);
+    }
+  }
+
+  /**
+   * Copy a given source file to a given destination file.
+   *
+   * <p>This also creates new directories for any directories on the path to {@code dstFile} that do
+   * not yet exist.
+   *
+   * @param srcFile The source file path.
+   * @param dstFile The destination file path.
+   * @throws IOException if copy fails.
+   */
+  public static void copyFile(Path srcFile, Path dstFile) throws IOException {
+    copyFile(srcFile, dstFile, false);
+  }
+
+  /**
+   * Find the given {@code file} in the package and return the path to the file that was found; null
+   * if it was not found.
+   *
+   * @param file The file to look for.
+   * @param dstDir The directory to copy it to.
+   * @param fileConfig The file configuration that specifies where look for the file.
+   * @return The path to the file that was found, or null if it was not found.
+   */
+  public static Path findAndCopyFile(String file, Path dstDir, FileConfig fileConfig) {
+    var path = Paths.get(file);
+    var found = FileUtil.findInPackage(path, fileConfig);
+    if (found != null) {
+      try {
+        FileUtil.copyFile(found, dstDir.resolve(path.getFileName()));
+        return found;
+      } catch (IOException e) {
         return null;
-    }
-
-    /**
-     * Recursively copy the contents of the given source directory into the given destination
-     * directory. Existing files of the destination may be overwritten.
-     *
-     * @param srcDir The source directory path.
-     * @param dstDir The destination directory path.
-     * @param skipIfUnchanged If true, don't overwrite anything in the destination if its content
-     * would not be changed.
-     * @throws IOException If the operation fails.
-     */
-    public static void copyDirectoryContents(final Path srcDir, final Path dstDir, final boolean skipIfUnchanged) throws IOException {
-        try (Stream<Path> stream = Files.walk(srcDir)) {
-            stream.forEach(source -> {
-                // Handling checked exceptions in lambda expressions is
-                // hard. See
-                // https://www.baeldung.com/java-lambda-exceptions#handling-checked-exceptions.
-                // An alternative would be to create a custom Consumer interface and use that
-                // here.
-                if (Files.isRegularFile(source)) { // do not copy directories
-                    try {
-                        Path target = dstDir.resolve(srcDir.relativize(source));
-                        Files.createDirectories(target.getParent());
-                        copyFile(source, target, skipIfUnchanged);
-                    } catch (IOException e) {
-                        throw new RuntimeIOException(e);
-                    } catch (Exception e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-            });
-        }
-    }
-
-    /**
-     * Copy the given source directory into the given destination directory. For example, if the
-     * source directory is {@code foo/bar} and the destination is {@code baz}, then copies of the
-     * contents of {@code foo/bar} will be located in {@code baz/bar}.
-     * @param srcDir The source directory path.
-     * @param dstDir The destination directory path.
-     * @param skipIfUnchanged If true, don't overwrite anything in the destination if its content
-     * would not be changed.
-     * @throws IOException If the operation fails.
-     */
-    public static void copyDirectory(
-        final Path srcDir, final Path dstDir, final boolean skipIfUnchanged) throws IOException {
-        copyDirectoryContents(srcDir, dstDir.resolve(srcDir.getFileName()), skipIfUnchanged);
-    }
-
-    /**
-     * Recursively copy the contents of the given source directory into the given destination
-     * directory. Existing files of the destination may be overwritten.
-     *
-     * @param srcDir The directory to copy files from.
-     * @param dstDir The directory to copy files to.
-     * @throws IOException if copy fails.
-     */
-    public static void copyDirectoryContents(final Path srcDir, final Path dstDir) throws IOException {
-        copyDirectoryContents(srcDir, dstDir, false);
-    }
-
-    /**
-     * Copy a given source file to a given destination file.
-     *
-     * This also creates new directories on the path to {@code dstFile} that do not yet exist.
-     *
-     * @param srcFile The source file path.
-     * @param dstFile The destination file path.
-     * @param skipIfUnchanged If true, don't overwrite the destination file if its content
-     * would not be changed.
-     * @throws IOException If the operation fails.
-     */
-    public static void copyFile(Path srcFile, Path dstFile, boolean skipIfUnchanged)  throws IOException {
-        BufferedInputStream stream = new BufferedInputStream(new FileInputStream(srcFile.toFile()));
-        try (stream) {
-            copyInputStream(stream, dstFile, skipIfUnchanged);
-        }
-    }
-
-    /**
-     * Copy a given source file to a given destination file.
-     *
-     * This also creates new directories for any directories
-     * on the path to {@code dstFile} that do not yet exist.
-     *
-     * @param srcFile The source file path.
-     * @param dstFile The destination file path.
-     * @throws IOException if copy fails.
-     */
-    public static void copyFile(Path srcFile, Path dstFile)  throws IOException {
-        copyFile(srcFile, dstFile, false);
-    }
-
-    /**
-     * Find the given {@code file} in the package and return the path to the file that was found; null
-     * if it was not found.
-     *
-     * @param file The file to look for.
-     * @param dstDir The directory to copy it to.
-     * @param fileConfig The file configuration that specifies where look for the file.
-     * @return The path to the file that was found, or null if it was not found.
-     */
-    public static Path findAndCopyFile(
-        String file,
-        Path dstDir,
-        FileConfig fileConfig
-    ) {
-        var path = Paths.get(file);
-        var found = FileUtil.findInPackage(path, fileConfig);
-        if (found != null) {
-            try {
-                FileUtil.copyFile(found, dstDir.resolve(path.getFileName()));
-                return found;
-            } catch (IOException e) {
-                return null;
-            }
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Given a list of files or directories, attempt to find each entry based on the given generator
-     * context and copy it to the destination directory. Entries are searched for in the file system
-     * first, relative to the source file and relative to the package root. Entries that cannot be
-     * found in the file system are looked for on the class path.
-     * <p>
-     * If {@code contentsOnly} is true, then for each entry that is a directory, only its contents
-     * are copied, not the directory itself.
-     * For example, if the entry is a directory {@code foo/bar} and the destination is {@code baz},
-     * then copies of the contents of {@code foo/bar} will be located directly in {@code baz}.
-     * If {@code contentsOnly} is false, then copies of the contents of {@code foo/bar} will be
-     * located in {@code baz/bar}.
-     *
-     * @param entries The files or directories to copy from.
-     * @param dstDir The location to copy the files to.
-     * @param fileConfig The file configuration that specifies where the find entries the given entries.
-     * @param errorReporter An error reporter to report problems.
-     */
-    public static void copyFilesOrDirectories(
-        List<String> entries,
-        Path dstDir,
-        FileConfig fileConfig,
-        ErrorReporter errorReporter,
-        boolean fileEntriesOnly
-    ) {
-        for (String fileOrDirectory : entries) {
-            var path = Paths.get(fileOrDirectory);
-            var found = FileUtil.findInPackage(path, fileConfig);
-            if (found != null) {
-                try {
-                    if (fileEntriesOnly) {
-                        FileUtil.copyFile(found, dstDir.resolve(path.getFileName()));
-                    } else {
-                        FileUtil.copyFromFileSystem(found, dstDir, false);
-                    }
-                    System.out.println("Copied '" + fileOrDirectory + "' from the file system.");
-                } catch (IOException e) {
-                    errorReporter.reportError(
-                        "Unable to copy '" + fileOrDirectory + "' from the file system. Reason: " + e.toString()
-                    );
-                }
-            } else {
-                try {
-                    if (fileEntriesOnly) {
-                          copyFileFromClassPath(fileOrDirectory, dstDir, false);
-                    } else {
-                        FileUtil.copyFromClassPath(
-                            fileOrDirectory,
-                            dstDir,
-                            false,
-                            false
-                        );
-                        System.out.println("Copied '" + fileOrDirectory + "' from the class path.");
-                    }
-                } catch(IOException e) {
-                    errorReporter.reportError(
-                        "Unable to copy '" + fileOrDirectory + "' from the class path. Reason: " + e.toString()
-                    );
-                }
-            }
-        }
-    }
-
-    /**
-     * If the given {@code entry} is a file, then copy it into the destination. If the {@code entry}
-     * is a directory and {@code contentsOnly} is true, then copy its contents to the destination
-     * directory. If the {@code entry} is a directory and {@code contentsOnly} is true, then copy it
-     * including its contents to the destination directory.
-     *
-     * @param entry A file or directory to copy to the destination directory.
-     * @param dstDir A directory to copy the entry or its contents to.
-     * @param contentsOnly If true and {@code entry} is a directory, then copy its contents but not
-     * the directory itself.
-     * @throws IOException If the operation fails.
-     */
-    public static void copyFromFileSystem(Path entry, Path dstDir, boolean contentsOnly) throws IOException {
-        if (Files.isDirectory(entry)) {
-            if (contentsOnly) {
-                copyDirectoryContents(entry, dstDir);
-            } else {
-                copyDirectory(entry, dstDir, false);
-            }
-        } else if (Files.isRegularFile(entry)) {
-            FileUtil.copyFile(entry, dstDir.resolve(entry.getFileName()));
-        } else {
-            throw new IllegalArgumentException("Source is neither a directory nor a regular file.");
-        }
-    }
-    /**
-     * Copy a given input stream to a destination file.
-     *
-     * This also creates new directories for any directories on the destination
-     * path that do not yet exist.
-     *
-     * @param source The source input stream.
-     * @param destination The destination file path.
-     * @param skipIfUnchanged If true, don't overwrite the destination file if its content would
-     * not be changed.
-     * @throws IOException If the operation fails.
-     */
-    private static void copyInputStream(InputStream source, Path destination, boolean skipIfUnchanged) throws IOException {
-        // Read the stream once and keep a copy of all bytes. This is required as a stream cannot be read twice.
-        final var bytes = source.readAllBytes();
-        final var parent = destination.getParent();
-        if (Files.isRegularFile(destination)) {
-            if (skipIfUnchanged) {
-                if (Arrays.equals(bytes, Files.readAllBytes(destination))) {
-                    // Abort if the file contents are the same.
-                    return;
-                }
-            } else {
-                // Delete the file exists but the contents don't match.
-                Files.delete(destination);
-            }
-        } else if (Files.isDirectory(destination)) {
-            deleteDirectory(destination);
-        } else if (!Files.exists(parent)) {
-            Files.createDirectories(parent);
-        }
-
-        Files.write(destination, bytes);
-    }
-
-    /**
-     * Look up the given {@code entry} in the classpath. If it is found and is a file, copy it into
-     * the destination directory. If the entry is not found or not a file, throw an exception.
-     *
-     * @param entry A file copy to the destination directory.
-     * @param dstDir A directory to copy the entry to.
-     * @param skipIfUnchanged If true, don't overwrite the destination file if its content would
-     * not be changed.
-     * @throws IOException If the operation failed.
-     */
-    public static void copyFileFromClassPath(final String entry, final Path dstDir, final boolean skipIfUnchanged) throws IOException {
-        final URL resource = FileConfig.class.getResource(entry);
-
-        if (resource == null) {
-            throw new TargetResourceNotFoundException(entry);
-        }
+      }
+    } else {
+      return null;
+    }
+  }
+
+  /**
+   * Given a list of files or directories, attempt to find each entry based on the given generator
+   * context and copy it to the destination directory. Entries are searched for in the file system
+   * first, relative to the source file and relative to the package root. Entries that cannot be
+   * found in the file system are looked for on the class path.
+   *
+   * <p>If {@code contentsOnly} is true, then for each entry that is a directory, only its contents
+   * are copied, not the directory itself. For example, if the entry is a directory {@code foo/bar}
+   * and the destination is {@code baz}, then copies of the contents of {@code foo/bar} will be
+   * located directly in {@code baz}. If {@code contentsOnly} is false, then copies of the contents
+   * of {@code foo/bar} will be located in {@code baz/bar}.
+   *
+   * @param entries The files or directories to copy from.
+   * @param dstDir The location to copy the files to.
+   * @param fileConfig The file configuration that specifies where the find entries the given
+   *     entries.
+   * @param errorReporter An error reporter to report problems.
+   */
+  public static void copyFilesOrDirectories(
+      List<String> entries,
+      Path dstDir,
+      FileConfig fileConfig,
+      ErrorReporter errorReporter,
+      boolean fileEntriesOnly) {
+    for (String fileOrDirectory : entries) {
+      var path = Paths.get(fileOrDirectory);
+      var found = FileUtil.findInPackage(path, fileConfig);
+      if (found != null) {
+        try {
+          if (fileEntriesOnly) {
+            FileUtil.copyFile(found, dstDir.resolve(path.getFileName()));
+          } else {
+            FileUtil.copyFromFileSystem(found, dstDir, false);
+          }
+          System.out.println("Copied '" + fileOrDirectory + "' from the file system.");
+        } catch (IOException e) {
+          errorReporter.reportError(
+              "Unable to copy '"
+                  + fileOrDirectory
+                  + "' from the file system. Reason: "
+                  + e.toString());
+        }
+      } else {
+        try {
+          if (fileEntriesOnly) {
+            copyFileFromClassPath(fileOrDirectory, dstDir, false);
+          } else {
+            FileUtil.copyFromClassPath(fileOrDirectory, dstDir, false, false);
+            System.out.println("Copied '" + fileOrDirectory + "' from the class path.");
+          }
+        } catch (IOException e) {
+          errorReporter.reportError(
+              "Unable to copy '"
+                  + fileOrDirectory
+                  + "' from the class path. Reason: "
+                  + e.toString());
+        }
+      }
+    }
+  }
+
+  /**
+   * If the given {@code entry} is a file, then copy it into the destination. If the {@code entry}
+   * is a directory and {@code contentsOnly} is true, then copy its contents to the destination
+   * directory. If the {@code entry} is a directory and {@code contentsOnly} is true, then copy it
+   * including its contents to the destination directory.
+   *
+   * @param entry A file or directory to copy to the destination directory.
+   * @param dstDir A directory to copy the entry or its contents to.
+   * @param contentsOnly If true and {@code entry} is a directory, then copy its contents but not
+   *     the directory itself.
+   * @throws IOException If the operation fails.
+   */
+  public static void copyFromFileSystem(Path entry, Path dstDir, boolean contentsOnly)
+      throws IOException {
+    if (Files.isDirectory(entry)) {
+      if (contentsOnly) {
+        copyDirectoryContents(entry, dstDir);
+      } else {
+        copyDirectory(entry, dstDir, false);
+      }
+    } else if (Files.isRegularFile(entry)) {
+      FileUtil.copyFile(entry, dstDir.resolve(entry.getFileName()));
+    } else {
+      throw new IllegalArgumentException("Source is neither a directory nor a regular file.");
+    }
+  }
+  /**
+   * Copy a given input stream to a destination file.
+   *
+   * <p>This also creates new directories for any directories on the destination path that do not
+   * yet exist.
+   *
+   * @param source The source input stream.
+   * @param destination The destination file path.
+   * @param skipIfUnchanged If true, don't overwrite the destination file if its content would not
+   *     be changed.
+   * @throws IOException If the operation fails.
+   */
+  private static void copyInputStream(InputStream source, Path destination, boolean skipIfUnchanged)
+      throws IOException {
+    // Read the stream once and keep a copy of all bytes. This is required as a stream cannot be
+    // read twice.
+    final var bytes = source.readAllBytes();
+    final var parent = destination.getParent();
+    if (Files.isRegularFile(destination)) {
+      if (skipIfUnchanged) {
+        if (Arrays.equals(bytes, Files.readAllBytes(destination))) {
+          // Abort if the file contents are the same.
+          return;
+        }
+      } else {
+        // Delete the file exists but the contents don't match.
+        Files.delete(destination);
+      }
+    } else if (Files.isDirectory(destination)) {
+      deleteDirectory(destination);
+    } else if (!Files.exists(parent)) {
+      Files.createDirectories(parent);
+    }
+
+    Files.write(destination, bytes);
+  }
+
+  /**
+   * Look up the given {@code entry} in the classpath. If it is found and is a file, copy it into
+   * the destination directory. If the entry is not found or not a file, throw an exception.
+   *
+   * @param entry A file copy to the destination directory.
+   * @param dstDir A directory to copy the entry to.
+   * @param skipIfUnchanged If true, don't overwrite the destination file if its content would not
+   *     be changed.
+   * @throws IOException If the operation failed.
+   */
+  public static void copyFileFromClassPath(
+      final String entry, final Path dstDir, final boolean skipIfUnchanged) throws IOException {
+    final URL resource = FileConfig.class.getResource(entry);
+
+    if (resource == null) {
+      throw new TargetResourceNotFoundException(entry);
+    }
+
+    final URLConnection connection = resource.openConnection();
+    if (connection instanceof JarURLConnection) {
+      if (!copyFileFromJar((JarURLConnection) connection, dstDir, skipIfUnchanged)) {
+        throw new IOException("'" + entry + "' is not a file");
+      }
+    } else {
+      try {
+        Path path = Paths.get(FileLocator.toFileURL(resource).toURI());
+        copyFile(path, dstDir.resolve(path.getFileName()), skipIfUnchanged);
+      } catch (URISyntaxException e) {
+        // This should never happen as toFileURL should always return a valid URL
+        throw new IOException("Unexpected error while resolving " + entry + " on the classpath");
+      }
+    }
+  }
+
+  /**
+   * Look up the given {@code entry} in the classpath. If it is a file, copy it into the destination
+   * directory. If the {@code entry} is a directory and {@code contentsOnly} is true, then copy its
+   * contents to the destination directory. If the {@code entry} is a directory and {@code
+   * contentsOnly} is true, then copy it including its contents to the destination directory.
+   *
+   * <p>This also creates new directories for any directories on the destination path that do not
+   * yet exist.
+   *
+   * @param entry The entry to be found on the class path and copied to the given destination.
+   * @param dstDir The file system path that found files are to be copied to.
+   * @param skipIfUnchanged If true, don't overwrite the file or directory if its content would not
+   *     be changed
+   * @param contentsOnly If true and the entry is a directory, then copy its contents but not the
+   *     directory itself.
+   * @throws IOException If the operation failed.
+   */
+  public static void copyFromClassPath(
+      final String entry,
+      final Path dstDir,
+      final boolean skipIfUnchanged,
+      final boolean contentsOnly)
+      throws IOException {
+    final URL resource = FileConfig.class.getResource(entry);
+
+    if (resource == null) {
+      throw new TargetResourceNotFoundException(entry);
+    }
+
+    final URLConnection connection = resource.openConnection();
+    if (connection instanceof JarURLConnection) {
+      boolean copiedFiles =
+          copyFromJar((JarURLConnection) connection, dstDir, skipIfUnchanged, contentsOnly);
+      if (!copiedFiles) {
+        throw new TargetResourceNotFoundException(entry);
+      }
+    } else {
+      try {
+        Path path = Paths.get(FileLocator.toFileURL(resource).toURI());
+        if (path.toFile().isDirectory()) {
+          if (contentsOnly) {
+            copyDirectoryContents(path, dstDir, skipIfUnchanged);
+          } else {
+            copyDirectory(path, dstDir, skipIfUnchanged);
+          }
 
-        final URLConnection connection = resource.openConnection();
-        if (connection instanceof JarURLConnection) {
-            if (!copyFileFromJar((JarURLConnection) connection, dstDir, skipIfUnchanged)) {
-                throw new IOException("'" + entry + "' is not a file");
-            }
         } else {
-            try {
-                Path path = Paths.get(FileLocator.toFileURL(resource).toURI());
-                copyFile(path, dstDir.resolve(path.getFileName()), skipIfUnchanged);
-            } catch(URISyntaxException e) {
-                // This should never happen as toFileURL should always return a valid URL
-                throw new IOException("Unexpected error while resolving " + entry + " on the classpath");
-            }
-        }
-    }
-
-    /**
-     * Look up the given {@code entry} in the classpath. If it is a file, copy it into the destination
-     * directory.
-     * If the {@code entry} is a directory and {@code contentsOnly} is true, then copy its contents
-     * to the destination directory. If the {@code entry} is a directory and {@code contentsOnly} is
-     * true, then copy it including its contents to the destination directory.
-     *
-     * This also creates new directories for any directories on the destination
-     * path that do not yet exist.
-     *
-     * @param entry The entry to be found on the class path and copied to the given destination.
-     * @param dstDir The file system path that found files are to be copied to.
-     * @param skipIfUnchanged If true, don't overwrite the file or directory if its content would not be changed
-     * @param contentsOnly If true and the entry is a directory, then copy its contents but not the directory itself.
-     * @throws IOException If the operation failed.
-     */
-    public static void copyFromClassPath(
-        final String entry,
-        final Path dstDir,
-        final boolean skipIfUnchanged,
-        final boolean contentsOnly
-    ) throws IOException {
-        final URL resource = FileConfig.class.getResource(entry);
-
-        if (resource == null) {
-            throw new TargetResourceNotFoundException(entry);
-        }
-
-        final URLConnection connection = resource.openConnection();
-        if (connection instanceof JarURLConnection) {
-            boolean copiedFiles = copyFromJar((JarURLConnection) connection, dstDir, skipIfUnchanged, contentsOnly);
-            if (!copiedFiles) {
-                throw new TargetResourceNotFoundException(entry);
-            }
+          copyFile(path, dstDir.resolve(path.getFileName()), skipIfUnchanged);
+        }
+      } catch (URISyntaxException e) {
+        // This should never happen as toFileURL should always return a valid URL
+        throw new IOException("Unexpected error while resolving " + entry + " on the classpath");
+      }
+    }
+  }
+
+  /**
+   * Return true if the given connection points to a file.
+   *
+   * @param connection A connection to a JAR file.
+   * @throws IOException If the connection is faulty.
+   */
+  private static boolean isFileInJar(JarURLConnection connection) throws IOException {
+    return connection.getJarFile().stream()
+        .anyMatch(it -> it.getName().equals(connection.getEntryName()));
+  }
+
+  /**
+   * Given a JAR file and a {@code srcFile} entry, copy it into the given destination directory.
+   *
+   * @param jar The JAR file from which to copy {@code srcFile}.
+   * @param srcFile The source file to copy from the given {@code jar}.
+   * @param dstDir The directory to top the source file into.
+   * @param skipIfUnchanged If true, don't overwrite the destination file if its content would * not
+   *     be changed.
+   * @throws IOException If the operation fails.
+   */
+  private static void copyFileFromJar(
+      JarFile jar, String srcFile, Path dstDir, boolean skipIfUnchanged) throws IOException {
+    var entry = jar.getJarEntry(srcFile);
+    var filename = Paths.get(entry.getName()).getFileName();
+    InputStream is = jar.getInputStream(entry);
+    try (is) {
+      copyInputStream(is, dstDir.resolve(filename), skipIfUnchanged);
+    }
+  }
+
+  /**
+   * Copy the contents from an entry in a JAR to destination directory in the filesystem. The entry
+   * may be a file, in which case it will be copied under the same name into the destination
+   * directory. If the entry is a directory, then if {@code contentsOnly} is true, only the contents
+   * of the directory will be copied into the destination directory (not the directory itself). A
+   * directory will be copied as a whole, including its contents, if {@code contentsOnly} is false.
+   *
+   * <p>This method should only be used in standalone mode (lfc).
+   *
+   * <p>This also creates new directories for any directories on the destination path that do not
+   * yet exist.
+   *
+   * @param connection a URLConnection to the source entry within the jar
+   * @param dstDir The file system path that entries are copied to.
+   * @param skipIfUnchanged If true, don't overwrite the file if its content would not be changed.
+   * @param contentsOnly If true, and the connection points to a directory, copy its contents only
+   *     (not the directory itself).
+   * @return true if any files were copied
+   * @throws IOException If the given source cannot be copied.
+   */
+  private static boolean copyFromJar(
+      JarURLConnection connection,
+      Path dstDir,
+      final boolean skipIfUnchanged,
+      final boolean contentsOnly)
+      throws IOException {
+
+    if (copyFileFromJar(connection, dstDir, skipIfUnchanged)) {
+      return true;
+    }
+    return copyDirectoryFromJar(connection, dstDir, skipIfUnchanged, contentsOnly);
+  }
+
+  /**
+   * Given a connection to a JAR file that points to an entry that is a directory, recursively copy
+   * all entries located in that directory into the given {@code dstDir}.
+   *
+   * <p>If {@code contentsOnly} is true, only the contents of the directory will be copied into the
+   * destination directory (not the directory itself). The directory will be copied as a whole,
+   * including its contents, if {@code contentsOnly} is false.
+   *
+   * @param connection A connection to a JAR file that points to a directory entry.
+   * @param dstDir The destination directory to copy the matching entries to.
+   * @param skipIfUnchanged
+   * @param contentsOnly
+   * @return
+   * @throws IOException
+   */
+  private static boolean copyDirectoryFromJar(
+      JarURLConnection connection,
+      Path dstDir,
+      final boolean skipIfUnchanged,
+      final boolean contentsOnly)
+      throws IOException {
+    final JarFile jar = connection.getJarFile();
+    final String source = connection.getEntryName();
+
+    boolean copiedFiles = false;
+    if (!contentsOnly) {
+      dstDir = dstDir.resolve(Paths.get(source).getFileName());
+    }
+    // Iterate all entries in the jar file.
+    for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements(); ) {
+      final JarEntry entry = e.nextElement();
+      final String entryName = entry.getName();
+      if (entryName.startsWith(source)) {
+        String filename = entry.getName().substring(source.length() + 1);
+        Path currentFile = dstDir.resolve(filename);
+        if (entry.isDirectory()) {
+          Files.createDirectories(currentFile);
         } else {
-            try {
-                Path path = Paths.get(FileLocator.toFileURL(resource).toURI());
-                if (path.toFile().isDirectory()) {
-                    if (contentsOnly) {
-                        copyDirectoryContents(path, dstDir, skipIfUnchanged);
-                    } else {
-                        copyDirectory(path, dstDir, skipIfUnchanged);
-                    }
-
-                } else {
-                    copyFile(path, dstDir.resolve(path.getFileName()), skipIfUnchanged);
-                }
-            } catch(URISyntaxException e) {
-                // This should never happen as toFileURL should always return a valid URL
-                throw new IOException("Unexpected error while resolving " + entry + " on the classpath");
-            }
-        }
-    }
-
-    /**
-     * Return true if the given connection points to a file.
-     * @param connection A connection to a JAR file.
-     * @throws IOException If the connection is faulty.
-     */
-    private static boolean isFileInJar(JarURLConnection connection) throws IOException {
-        return connection.getJarFile().stream().anyMatch(
-            it -> it.getName().equals(connection.getEntryName())
-        );
-    }
-
-    /**
-     * Given a JAR file and a {@code srcFile} entry, copy it into the given destination directory.
-     *
-     * @param jar The JAR file from which to copy {@code srcFile}.
-     * @param srcFile The source file to copy from the given {@code jar}.
-     * @param dstDir The directory to top the source file into.
-     * @param skipIfUnchanged If true, don't overwrite the destination file if its content would
-     *      * not be changed.
-     * @throws IOException If the operation fails.
-     */
-    private static void copyFileFromJar(JarFile jar, String srcFile, Path dstDir, boolean skipIfUnchanged) throws IOException {
-        var entry = jar.getJarEntry(srcFile);
-        var filename = Paths.get(entry.getName()).getFileName();
-        InputStream is = jar.getInputStream(entry);
-        try (is) {
-            copyInputStream(is, dstDir.resolve(filename), skipIfUnchanged);
-        }
-    }
-
-    /**
-     * Copy the contents from an entry in a JAR to destination directory in the filesystem. The entry
-     * may be a file, in which case it will be copied under the same name into the destination
-     * directory. If the entry is a directory, then if {@code contentsOnly} is true, only the
-     * contents of the directory will be copied into the destination directory (not the directory
-     * itself). A directory will be copied as a whole, including its contents, if
-     * {@code contentsOnly} is false.
-     *
-     * This method should only be used in standalone mode (lfc).
-     *
-     * This also creates new directories for any directories on
-     * the destination path that do not yet exist.
-     *
-     * @param connection a URLConnection to the source entry within the jar
-     * @param dstDir The file system path that entries are copied to.
-     * @param skipIfUnchanged If true, don't overwrite the file if its content would not be changed.
-     * @param contentsOnly If true, and the connection points to a directory, copy its contents only
-     * (not the directory itself).
-     * @return true if any files were copied
-     * @throws IOException If the given source cannot be copied.
-     */
-    private static boolean copyFromJar(
-        JarURLConnection connection,
-        Path dstDir,
-        final boolean skipIfUnchanged,
-        final boolean contentsOnly
-    ) throws IOException {
-
-        if (copyFileFromJar(connection, dstDir, skipIfUnchanged)) {
-            return true;
-        }
-        return copyDirectoryFromJar(connection, dstDir, skipIfUnchanged, contentsOnly);
-    }
-
-    /**
-     * Given a connection to a JAR file that points to an entry that is a directory, recursively copy
-     * all entries located in that directory into the given {@code dstDir}.
-     * <p>
-     * If {@code contentsOnly} is true, only the contents of the directory will be copied into the
-     * destination directory (not the directory itself). The directory will be copied as a whole,
-     * including its contents, if {@code contentsOnly} is false.
-     * @param connection A connection to a JAR file that points to a directory entry.
-     * @param dstDir The destination directory to copy the matching entries to.
-     * @param skipIfUnchanged
-     * @param contentsOnly
-     * @return
-     * @throws IOException
-     */
-    private static boolean copyDirectoryFromJar(JarURLConnection connection,
-        Path dstDir,
-        final boolean skipIfUnchanged,
-        final boolean contentsOnly) throws IOException {
-        final JarFile jar = connection.getJarFile();
-        final String source = connection.getEntryName();
-
-        boolean copiedFiles = false;
-        if (!contentsOnly) {
-            dstDir = dstDir.resolve(Paths.get(source).getFileName());
-        }
-        // Iterate all entries in the jar file.
-        for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements(); ) {
-            final JarEntry entry = e.nextElement();
-            final String entryName = entry.getName();
-            if (entryName.startsWith(source)) {
-                String filename = entry.getName().substring(source.length() + 1);
-                Path currentFile = dstDir.resolve(filename);
-                if (entry.isDirectory()) {
-                    Files.createDirectories(currentFile);
-                } else {
-                    InputStream is = jar.getInputStream(entry);
-                    try (is) {
-                        copyInputStream(is, currentFile, skipIfUnchanged);
-                        copiedFiles = true;
-                    }
-                }
-            }
-        }
-        return copiedFiles;
-    }
-
-    /**
-     * Given a connection to a JAR file that points to an entry that is a file, copy the file into the
-     * given {@code dstDir}.
-     * @param connection A connection to a JAR file that points to a directory entry.
-     * @param dstDir The destination directory to copy the file to.
-     * @param skipIfUnchanged
-     * @return {@code true} the connection entry is a file, and it was copied successfully;
-     * {@code false} if the connection entry is not a file and the copy operation was aborted.
-     * @throws IOException If the operation failed.
-     */
-    private static boolean copyFileFromJar(
-        JarURLConnection connection,
-        Path dstDir,
-        final boolean skipIfUnchanged
-    ) throws IOException {
-        final JarFile jar = connection.getJarFile();
-        final String source = connection.getEntryName();
-
-        if (!isFileInJar(connection)) {
-            return false;
-        }
-        copyFileFromJar(jar, source, dstDir, skipIfUnchanged);
-
-        return true;
-    }
-
-    /**
-     * Delete unused Files from Arduino-CLI based compilation.
-     *
-     * Arduino-CLI (the build system) uses lazy compilation (i.e. compiles every file recursively from 
-     * a source directory). This does the work of CMake by explicitly deleting files that 
-     * shouldn't get compiled by the CLI. Generally, we delete all CMake artifacts and multithreaded
-     * support files (including semaphores and thread folders)
-     *
-     * @param dir The folder to search for folders and files to delete. 
-     * @throws IOException If the given folder and unneeded files cannot be deleted.
-     */
-    public static void arduinoDeleteHelper(Path dir, boolean threadingOn) throws IOException {
-        deleteDirectory(dir.resolve("core/federated")); // TODO: Add Federated Support to Arduino
-        deleteDirectory(dir.resolve("include/core/federated")); // TODO: Add Federated Support to Arduino
-        
-        if (!threadingOn) {
-            deleteDirectory(dir.resolve("core/threaded")); // No Threaded Support for Arduino
-            deleteDirectory(dir.resolve("include/core/threaded")); // No Threaded Support for Arduino
-            deleteDirectory(dir.resolve("core/platform/arduino_mbed")); // No Threaded Support for Arduino
-        } 
-
-        List<Path> allPaths = Files.walk(dir)
-                    .sorted(Comparator.reverseOrder())
-                    .toList();
-        for (Path path : allPaths) {
-            String toCheck = path.toString().toLowerCase();
-            if (toCheck.contains("cmake")) {
-                Files.delete(path);
-            }
-        }
-    }
-
-    /**
-     * Helper function for getting the string representation of the relative path 
-     * to take to get from one file (currPath) to get to the other (fileName).
-     *
-     * Generally, this is useful for converting includes to have relative pathing when 
-     * you lack access to adding additional include paths when compiling.
-     * 
-     * @param fileName File to search for.
-     * @param currPath The current path to the file whose include statements we are modifying.
-     * @param fileStringToFilePath Mapping of File Names to their paths.
-     */
-    private static String fileNameMatchConverter(String fileName, Path currPath, Map<String, Path> fileStringToFilePath) 
-        throws NullPointerException {
-        // First get the child file
-        int lastPath = fileName.lastIndexOf(File.separator);
-        if (lastPath != -1){
-            fileName = fileName.substring(lastPath+1);
-        }
-        Path p = fileStringToFilePath.get(fileName);
-        if(p == null) {
-            return "#include \"" + fileName + "\"";
-        }
-        String relativePath = currPath.getParent().relativize(p).toString();
-        return "#include \"" + relativePath + "\"";
-    }
-
-    /**
-     * Return true if the given path points to a C file, false otherwise.
-     */
-    public static boolean isCFile(Path path) {
-        String fileName = path.getFileName().toString();
-        return fileName.endsWith(".c") || fileName.endsWith(".cpp") || fileName.endsWith(".h");
-    }
-
-    /**
-     * Convert all includes recursively inside files within a specified folder to relative links
-     *
-     * @param dir The folder to search for includes to change. 
-     * @throws IOException If the given set of files cannot be relativized.
-     */
-    public static void relativeIncludeHelper(Path dir, Path includePath) throws IOException {
-        System.out.println("Relativizing all includes in " + dir.toString());
-        List<Path> includePaths = Files.walk(includePath)
+          InputStream is = jar.getInputStream(entry);
+          try (is) {
+            copyInputStream(is, currentFile, skipIfUnchanged);
+            copiedFiles = true;
+          }
+        }
+      }
+    }
+    return copiedFiles;
+  }
+
+  /**
+   * Given a connection to a JAR file that points to an entry that is a file, copy the file into the
+   * given {@code dstDir}.
+   *
+   * @param connection A connection to a JAR file that points to a directory entry.
+   * @param dstDir The destination directory to copy the file to.
+   * @param skipIfUnchanged
+   * @return {@code true} the connection entry is a file, and it was copied successfully; {@code
+   *     false} if the connection entry is not a file and the copy operation was aborted.
+   * @throws IOException If the operation failed.
+   */
+  private static boolean copyFileFromJar(
+      JarURLConnection connection, Path dstDir, final boolean skipIfUnchanged) throws IOException {
+    final JarFile jar = connection.getJarFile();
+    final String source = connection.getEntryName();
+
+    if (!isFileInJar(connection)) {
+      return false;
+    }
+    copyFileFromJar(jar, source, dstDir, skipIfUnchanged);
+
+    return true;
+  }
+
+  /**
+   * Delete unused Files from Arduino-CLI based compilation.
+   *
+   * <p>Arduino-CLI (the build system) uses lazy compilation (i.e. compiles every file recursively
+   * from a source directory). This does the work of CMake by explicitly deleting files that
+   * shouldn't get compiled by the CLI. Generally, we delete all CMake artifacts and multithreaded
+   * support files (including semaphores and thread folders)
+   *
+   * @param dir The folder to search for folders and files to delete.
+   * @throws IOException If the given folder and unneeded files cannot be deleted.
+   */
+  public static void arduinoDeleteHelper(Path dir, boolean threadingOn) throws IOException {
+    deleteDirectory(dir.resolve("core/federated")); // TODO: Add Federated Support to Arduino
+    deleteDirectory(
+        dir.resolve("include/core/federated")); // TODO: Add Federated Support to Arduino
+
+    if (!threadingOn) {
+      deleteDirectory(dir.resolve("core/threaded")); // No Threaded Support for Arduino
+      deleteDirectory(dir.resolve("include/core/threaded")); // No Threaded Support for Arduino
+      deleteDirectory(dir.resolve("core/platform/arduino_mbed")); // No Threaded Support for Arduino
+    }
+
+    List<Path> allPaths = Files.walk(dir).sorted(Comparator.reverseOrder()).toList();
+    for (Path path : allPaths) {
+      String toCheck = path.toString().toLowerCase();
+      if (toCheck.contains("cmake")) {
+        Files.delete(path);
+      }
+    }
+  }
+
+  /**
+   * Helper function for getting the string representation of the relative path to take to get from
+   * one file (currPath) to get to the other (fileName).
+   *
+   * <p>Generally, this is useful for converting includes to have relative pathing when you lack
+   * access to adding additional include paths when compiling.
+   *
+   * @param fileName File to search for.
+   * @param currPath The current path to the file whose include statements we are modifying.
+   * @param fileStringToFilePath Mapping of File Names to their paths.
+   */
+  private static String fileNameMatchConverter(
+      String fileName, Path currPath, Map<String, Path> fileStringToFilePath)
+      throws NullPointerException {
+    // First get the child file
+    int lastPath = fileName.lastIndexOf(File.separator);
+    if (lastPath != -1) {
+      fileName = fileName.substring(lastPath + 1);
+    }
+    Path p = fileStringToFilePath.get(fileName);
+    if (p == null) {
+      return "#include \"" + fileName + "\"";
+    }
+    String relativePath = currPath.getParent().relativize(p).toString();
+    return "#include \"" + relativePath + "\"";
+  }
+
+  /** Return true if the given path points to a C file, false otherwise. */
+  public static boolean isCFile(Path path) {
+    String fileName = path.getFileName().toString();
+    return fileName.endsWith(".c") || fileName.endsWith(".cpp") || fileName.endsWith(".h");
+  }
+
+  /**
+   * Convert all includes recursively inside files within a specified folder to relative links
+   *
+   * @param dir The folder to search for includes to change.
+   * @throws IOException If the given set of files cannot be relativized.
+   */
+  public static void relativeIncludeHelper(Path dir, Path includePath) throws IOException {
+    System.out.println("Relativizing all includes in " + dir.toString());
+    List<Path> includePaths =
+        Files.walk(includePath)
             .filter(Files::isRegularFile)
             .filter(FileUtil::isCFile)
             .sorted(Comparator.reverseOrder())
             .toList();
-        List<Path> srcPaths = Files.walk(dir)
+    List<Path> srcPaths =
+        Files.walk(dir)
             .filter(Files::isRegularFile)
             .filter(FileUtil::isCFile)
             .sorted(Comparator.reverseOrder())
             .toList();
-        Map<String, Path> fileStringToFilePath = new HashMap<String, Path>();
-        for (Path path : includePaths) {
-            String fileName = path.getFileName().toString();
-            if (path.getFileName().toString().contains("CMakeLists.txt")) continue;
-            if (fileStringToFilePath.put(fileName, path) != null) {
-                throw new IOException("Directory has different files with the same name. Cannot Relativize.");
-            }
-        }
-        Pattern regexExpression = Pattern.compile("#include\s+[\"]([^\"]+)*[\"]");
-        for (Path path : srcPaths) {
-            String fileContents = Files.readString(path);
-            Matcher matcher = regexExpression.matcher(fileContents);
-            int lastIndex = 0;
-            StringBuilder output = new StringBuilder();
-            while (matcher.find()) {
-                output.append(fileContents, lastIndex, matcher.start())
-                    .append(fileNameMatchConverter(matcher.group(1), path, fileStringToFilePath));
-                lastIndex = matcher.end();
-            }
-            if (lastIndex < fileContents.length()) {
-                output.append(fileContents, lastIndex, fileContents.length());
-            }
-            writeToFile(output.toString(), path);
-        }
-    }
-
-    /**
-     * Delete the given file or directory if it exists. If {@code fileOrDirectory} is a directory,
-     * deletion is recursive.
-     *
-     * @param fileOrDirectory The file or directory to delete.
-     * @throws IOException If the operation failed.
-     */
-    public static void delete(Path fileOrDirectory) throws IOException {
-        if (Files.isRegularFile(fileOrDirectory)) {
-            Files.deleteIfExists(fileOrDirectory);
-        }
-        if (Files.isDirectory(fileOrDirectory)) {
-            deleteDirectory(fileOrDirectory);
-        }
-    }
-
-    /**
-     * Recursively delete a directory if it exists.
-     *
-     * @throws IOException If an I/O error occurs.
-     */
-    public static void deleteDirectory(Path dir) throws IOException {
-        if (Files.isDirectory(dir)) {
-            System.out.println("Cleaning " + dir);
-            List<Path> pathsToDelete = Files.walk(dir)
-                    .sorted(Comparator.reverseOrder())
-                    .toList();
-            for (Path path : pathsToDelete) {
-                Files.deleteIfExists(path);
-            }
-        }
-    }
-
-    /**
-     * Return an absolute path to the given file or directory if it can be found within the package.
-     * Otherwise, return null.
-     *
-     * NOTE: If the given file or directory is given as an absolute path but cannot be found, it is
-     * interpreted as a relative path with respect to the project root.
-     *
-     * @param fileOrDirectory The file or directory to look for.
-     * @param fileConfig A file configuration that determines where the package is located.
-     * @return An absolute path of the file or directory was found; null otherwise.
-     */
-    public static Path findInPackage(Path fileOrDirectory, FileConfig fileConfig) {
-        if (fileOrDirectory.isAbsolute() && Files.exists(fileOrDirectory)) {
-            return fileOrDirectory;
+    Map<String, Path> fileStringToFilePath = new HashMap<String, Path>();
+    for (Path path : includePaths) {
+      String fileName = path.getFileName().toString();
+      if (path.getFileName().toString().contains("CMakeLists.txt")) continue;
+      if (fileStringToFilePath.put(fileName, path) != null) {
+        throw new IOException(
+            "Directory has different files with the same name. Cannot Relativize.");
+      }
+    }
+    Pattern regexExpression = Pattern.compile("#include\s+[\"]([^\"]+)*[\"]");
+    for (Path path : srcPaths) {
+      String fileContents = Files.readString(path);
+      Matcher matcher = regexExpression.matcher(fileContents);
+      int lastIndex = 0;
+      StringBuilder output = new StringBuilder();
+      while (matcher.find()) {
+        output
+            .append(fileContents, lastIndex, matcher.start())
+            .append(fileNameMatchConverter(matcher.group(1), path, fileStringToFilePath));
+        lastIndex = matcher.end();
+      }
+      if (lastIndex < fileContents.length()) {
+        output.append(fileContents, lastIndex, fileContents.length());
+      }
+      writeToFile(output.toString(), path);
+    }
+  }
+
+  /**
+   * Delete the given file or directory if it exists. If {@code fileOrDirectory} is a directory,
+   * deletion is recursive.
+   *
+   * @param fileOrDirectory The file or directory to delete.
+   * @throws IOException If the operation failed.
+   */
+  public static void delete(Path fileOrDirectory) throws IOException {
+    if (Files.isRegularFile(fileOrDirectory)) {
+      Files.deleteIfExists(fileOrDirectory);
+    }
+    if (Files.isDirectory(fileOrDirectory)) {
+      deleteDirectory(fileOrDirectory);
+    }
+  }
+
+  /**
+   * Recursively delete a directory if it exists.
+   *
+   * @throws IOException If an I/O error occurs.
+   */
+  public static void deleteDirectory(Path dir) throws IOException {
+    if (Files.isDirectory(dir)) {
+      System.out.println("Cleaning " + dir);
+      List<Path> pathsToDelete = Files.walk(dir).sorted(Comparator.reverseOrder()).toList();
+      for (Path path : pathsToDelete) {
+        Files.deleteIfExists(path);
+      }
+    }
+  }
+
+  /**
+   * Return an absolute path to the given file or directory if it can be found within the package.
+   * Otherwise, return null.
+   *
+   * <p>NOTE: If the given file or directory is given as an absolute path but cannot be found, it is
+   * interpreted as a relative path with respect to the project root.
+   *
+   * @param fileOrDirectory The file or directory to look for.
+   * @param fileConfig A file configuration that determines where the package is located.
+   * @return An absolute path of the file or directory was found; null otherwise.
+   */
+  public static Path findInPackage(Path fileOrDirectory, FileConfig fileConfig) {
+    if (fileOrDirectory.isAbsolute() && Files.exists(fileOrDirectory)) {
+      return fileOrDirectory;
+    } else {
+      Path relPath;
+      // Disregard root and interpret as relative path
+      if (fileOrDirectory.isAbsolute()) {
+        relPath =
+            Paths.get(
+                String.valueOf(fileOrDirectory)
+                    .replaceFirst(String.valueOf(fileOrDirectory.getRoot()), ""));
+      } else {
+        relPath = fileOrDirectory;
+      }
+
+      // Look relative to the source file and relative to the package root.
+      var locations = List.of(fileConfig.srcPath, fileConfig.srcPkgPath);
+      var found = locations.stream().filter(loc -> Files.exists(loc.resolve(relPath))).findFirst();
+      if (found.isPresent()) {
+        return found.get().resolve(relPath).toAbsolutePath();
+      }
+    }
+    return null;
+  }
+
+  /** Get the iResource corresponding to the provided resource if it can be found. */
+  public static IResource getIResource(Resource r) throws IOException {
+    return getIResource(FileUtil.toPath(r).toFile().toURI());
+  }
+
+  /** Get the specified path as an Eclipse IResource or null if it is not found. */
+  public static IResource getIResource(Path path) {
+    IResource ret = getIResource(path.toUri());
+    if (ret != null) return ret;
+    try {
+      // Handle a bug that not everyone can reproduce in which a path originating in the Ecore model
+      // is a relative
+      // path prefixed with a segment named "resource".
+      return ResourcesPlugin.getWorkspace()
+          .getRoot()
+          .findMember(
+              org.eclipse.core.runtime.Path.fromOSString(
+                  path.subpath(1, path.getNameCount()).toString()));
+    } catch (IllegalStateException e) {
+      // We are outside of Eclipse.
+    }
+    return null;
+  }
+
+  /**
+   * Get the specified uri as an Eclipse IResource or null if it is not found.
+   *
+   * <p>Also returns null if this is not called from within a running Eclipse instance.
+   *
+   * @param uri A java.net.uri of the form "file://path".
+   */
+  public static IResource getIResource(java.net.URI uri) {
+    // For some peculiar reason known only to Eclipse developers,
+    // the resource cannot be used directly but has to be converted
+    // a resource relative to the workspace root.
+    try {
+      IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
+
+      IFile[] files = workspaceRoot.findFilesForLocationURI(uri);
+      if (files != null && files.length > 0 && files[0] != null) {
+        return files[0];
+      }
+    } catch (IllegalStateException e) {
+      // We are outside of Eclipse.
+    }
+    return null;
+  }
+
+  /**
+   * Write text to a file.
+   *
+   * @param text The text to be written.
+   * @param path The file to write the code to.
+   * @param skipIfUnchanged If true, don't overwrite the destination file if its content would not
+   *     be changed
+   */
+  public static void writeToFile(String text, Path path, boolean skipIfUnchanged)
+      throws IOException {
+    Files.createDirectories(path.getParent());
+    final byte[] bytes = text.getBytes();
+    if (skipIfUnchanged && Files.isRegularFile(path)) {
+      if (Arrays.equals(bytes, Files.readAllBytes(path))) {
+        return;
+      }
+    }
+    Files.write(path, text.getBytes());
+  }
+
+  /**
+   * Write text to a file.
+   *
+   * @param text The text to be written.
+   * @param path The file to write the code to.
+   */
+  public static void writeToFile(String text, Path path) throws IOException {
+    writeToFile(text, path, false);
+  }
+
+  /**
+   * Write text to a file.
+   *
+   * @param text The text to be written.
+   * @param path The file to write the code to.
+   */
+  public static void writeToFile(CharSequence text, Path path) throws IOException {
+    writeToFile(text.toString(), path, false);
+  }
+
+  public static void createDirectoryIfDoesNotExist(File dir) {
+    if (!dir.exists()) dir.mkdirs();
+  }
+
+  /**
+   * Return a list of files ending with "str".
+   *
+   * @param currentDir The current directory.
+   * @param str The pattern to match against.
+   */
+  public static List<Path> globFilesEndsWith(Path currentDir, String str) {
+    List<Path> matches = new ArrayList<>();
+    File[] files = currentDir.toFile().listFiles();
+    if (files != null) {
+      for (File file : files) {
+        if (file.isDirectory()) {
+          matches.addAll(globFilesEndsWith(file.toPath(), str));
         } else {
-            Path relPath;
-            // Disregard root and interpret as relative path
-            if (fileOrDirectory.isAbsolute()) {
-                relPath = Paths.get(
-                    String.valueOf(fileOrDirectory).replaceFirst(
-                        String.valueOf(fileOrDirectory.getRoot()),
-                        "")
-                );
-            } else {
-                relPath = fileOrDirectory;
-            }
-
-            // Look relative to the source file and relative to the package root.
-            var locations = List.of(fileConfig.srcPath, fileConfig.srcPkgPath);
-            var found = locations.stream().filter(
-                    loc -> Files.exists(loc.resolve(relPath))
-                ).findFirst();
-            if (found.isPresent()) {
-                return found.get().resolve(relPath).toAbsolutePath();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Get the iResource corresponding to the provided resource if it can be
-     * found.
-     */
-    public static IResource getIResource(Resource r) throws IOException {
-        return getIResource(FileUtil.toPath(r).toFile().toURI());
-    }
-
-    /**
-     * Get the specified path as an Eclipse IResource or null if it is not found.
-     */
-    public static IResource getIResource(Path path) {
-        IResource ret = getIResource(path.toUri());
-        if (ret != null) return ret;
-        try {
-            // Handle a bug that not everyone can reproduce in which a path originating in the Ecore model is a relative
-            // path prefixed with a segment named "resource".
-            return ResourcesPlugin.getWorkspace().getRoot().findMember(org.eclipse.core.runtime.Path.fromOSString(
-                path.subpath(1, path.getNameCount()).toString()
-            ));
-        } catch (IllegalStateException e) {
-            // We are outside of Eclipse.
-        }
-        return null;
-    }
-
-    /**
-     * Get the specified uri as an Eclipse IResource or null if it is not found.
-     *
-     * Also returns null if this is not called from within a running Eclipse instance.
-     *
-     * @param uri A java.net.uri of the form "file://path".
-     */
-    public static IResource getIResource(java.net.URI uri) {
-        // For some peculiar reason known only to Eclipse developers,
-        // the resource cannot be used directly but has to be converted
-        // a resource relative to the workspace root.
-        try {
-            IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-
-            IFile[] files = workspaceRoot.findFilesForLocationURI(uri);
-            if (files != null && files.length > 0 && files[0] != null) {
-                return files[0];
-            }
-        } catch (IllegalStateException e) {
-            // We are outside of Eclipse.
-        }
-        return null;
-    }
-
-    /**
-     * Write text to a file.
-     * @param text The text to be written.
-     * @param path The file to write the code to.
-     * @param skipIfUnchanged If true, don't overwrite the destination file if its content would not be changed
-     */
-    public static void writeToFile(String text, Path path, boolean skipIfUnchanged) throws IOException {
-        Files.createDirectories(path.getParent());
-        final byte[] bytes = text.getBytes();
-        if (skipIfUnchanged && Files.isRegularFile(path)) {
-            if (Arrays.equals(bytes, Files.readAllBytes(path))) {
-                return;
-            }
-        }
-        Files.write(path, text.getBytes());
-    }
-
-    /**
-     * Write text to a file.
-     * @param text The text to be written.
-     * @param path The file to write the code to.
-     */
-    public static void writeToFile(String text, Path path) throws IOException {
-        writeToFile(text, path, false);
-    }
-
-    /**
-     * Write text to a file.
-     * @param text The text to be written.
-     * @param path The file to write the code to.
-     */
-    public static void writeToFile(CharSequence text, Path path) throws IOException {
-        writeToFile(text.toString(), path, false);
-    }
-
-    public static void createDirectoryIfDoesNotExist(File dir) {
-        if (!dir.exists()) dir.mkdirs();
-    }
-
-    /**
-     * Return a list of files ending with "str".
-     *
-     * @param currentDir The current directory.
-     * @param str The pattern to match against.
-     */
-    public static List<Path> globFilesEndsWith(Path currentDir, String str) {
-        List<Path> matches = new ArrayList<>();
-        File[] files = currentDir.toFile().listFiles();
-        if (files != null) {
-            for (File file : files) {
-                if (file.isDirectory()) {
-                    matches.addAll(globFilesEndsWith(file.toPath(), str));
-                } else {
-                    if (file.getName().endsWith(str)) {
-                        matches.add(file.getAbsoluteFile().toPath());
-                    }
-                }
-            }
+          if (file.getName().endsWith(str)) {
+            matches.add(file.getAbsoluteFile().toPath());
+          }
         }
-        return matches;
+      }
     }
+    return matches;
+  }
 }
diff --git a/org.lflang/src/org/lflang/util/IteratorUtil.java b/org.lflang/src/org/lflang/util/IteratorUtil.java
index 37ddadf56d..559739ed00 100644
--- a/org.lflang/src/org/lflang/util/IteratorUtil.java
+++ b/org.lflang/src/org/lflang/util/IteratorUtil.java
@@ -4,8 +4,6 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import org.lflang.lf.Reactor;
-
 /**
  * A utility class for Iterator.
  *
@@ -14,55 +12,53 @@
  */
 public final class IteratorUtil {
 
-    private IteratorUtil() {
-        // Don't let anyone instantiate this class.
-    }
+  private IteratorUtil() {
+    // Don't let anyone instantiate this class.
+  }
+
+  /**
+   * Turn an iterator into a sequential stream.
+   *
+   * @param iterator The iterator to create a sequential stream for.
+   * @return A stream.
+   */
+  public static <T> Stream<T> asStream(Iterator<T> iterator) {
+    return asStream(iterator, false);
+  }
 
-    /**
-     * Turn an iterator into a sequential stream.
-     *
-     * @param iterator The iterator to create a sequential stream for.
-     * @return A stream.
-     */
-    public static <T> Stream<T> asStream(Iterator<T> iterator) {
-        return asStream(iterator, false);
-    }
+  /**
+   * Given an iterator of type T, turn it into a stream containing only the instances of the given
+   * class of type S.
+   *
+   * @param <T> The type of elements the iterator iterates over.
+   * @param <S> The type of class to filter out instance of.
+   * @param iterator An iterator of type T.
+   * @param cls A given class of type S.
+   * @return A filtered stream that only has in it instances of the given class.
+   */
+  public static <T, S> Stream<S> asFilteredStream(Iterator<T> iterator, Class<S> cls) {
+    return asStream(iterator, false).filter(cls::isInstance).map(cls::cast);
+  }
 
-    /**
-     * Given an iterator of type T, turn it into a stream containing only the
-     * instances of the given class of type S.
-     * 
-     * @param <T>      The type of elements the iterator iterates over.
-     * @param <S>      The type of class to filter out instance of.
-     * @param iterator An iterator of type T.
-     * @param cls      A given class of type S.
-     * @return A filtered stream that only has in it instances of the given
-     *         class.
-     */
-    public static <T, S> Stream<S> asFilteredStream(Iterator<T> iterator,
-            Class<S> cls) {
-        return asStream(iterator, false).filter(cls::isInstance).map(cls::cast);
-    }
-    
-    /**
-     * Turn an iterator into a sequential or parallel stream.
-     *
-     * @param iterator The iterator to create a stream for.
-     * @param parallel Whether or not the stream should be parallel.
-     * @return A stream.
-     */
-    public static <T> Stream<T> asStream(Iterator<T> iterator, boolean parallel) {
-        Iterable<T> iterable = () -> iterator;
-        return StreamSupport.stream(iterable.spliterator(), parallel);
-    }
+  /**
+   * Turn an iterator into a sequential or parallel stream.
+   *
+   * @param iterator The iterator to create a stream for.
+   * @param parallel Whether or not the stream should be parallel.
+   * @return A stream.
+   */
+  public static <T> Stream<T> asStream(Iterator<T> iterator, boolean parallel) {
+    Iterable<T> iterable = () -> iterator;
+    return StreamSupport.stream(iterable.spliterator(), parallel);
+  }
 
-    /**
-     * Function to get Iterable from Iterator.
-     *
-     * @param iterator The iterator to get an iterable from.
-     * @return An iterable.
-     */
-    public static <T> Iterable<T> asIterable(Iterator<T> iterator) {
-        return () -> iterator;
-    }
+  /**
+   * Function to get Iterable from Iterator.
+   *
+   * @param iterator The iterator to get an iterable from.
+   * @return An iterable.
+   */
+  public static <T> Iterable<T> asIterable(Iterator<T> iterator) {
+    return () -> iterator;
+  }
 }
diff --git a/org.lflang/src/org/lflang/util/LFCommand.java b/org.lflang/src/org/lflang/util/LFCommand.java
index 4f6927dcf0..4b4116f264 100644
--- a/org.lflang/src/org/lflang/util/LFCommand.java
+++ b/org.lflang/src/org/lflang/util/LFCommand.java
@@ -1,26 +1,26 @@
 /*************
- Copyright (c) 2019-2021 TU Dresden
- Copyright (c) 2019-2021 UC Berkeley
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) 2019-2021 TU Dresden
+ * Copyright (c) 2019-2021 UC Berkeley
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
 
 package org.lflang.util;
@@ -42,370 +42,353 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
 import org.eclipse.xtext.util.CancelIndicator;
 
 /**
  * An abstraction for an external command
- * <p>
- * This is a wrapper around ProcessBuilder which allows for a more convenient usage in our code base.
+ *
+ * <p>This is a wrapper around ProcessBuilder which allows for a more convenient usage in our code
+ * base.
  */
 public class LFCommand {
 
-    /**
-     * The period with which the cancel indicator is
-     * checked and the output and error streams are
-     * forwarded.
-     */
-    private static final int PERIOD_MILLISECONDS = 200;
-    /**
-     * The maximum amount of time to wait for the
-     * forwarding of output and error streams to finish.
-     */
-    private static final int READ_TIMEOUT_MILLISECONDS = 1000;
-
-    protected ProcessBuilder processBuilder;
-    protected boolean didRun = false;
-    protected ByteArrayOutputStream output = new ByteArrayOutputStream();
-    protected ByteArrayOutputStream errors = new ByteArrayOutputStream();
-    protected boolean quiet;
-
-
-    /**
-     * Construct an LFCommand that executes the command carried by {@code pb}.
-     */
-    protected LFCommand(ProcessBuilder pb, boolean quiet) {
-        this.processBuilder = pb;
-        this.quiet = quiet;
-    }
-
-
-    /**
-     * Get the output collected during command execution
-     */
-    public OutputStream getOutput() { return output; }
-
-
-    /**
-     * Get the error output collected during command execution
-     */
-    public OutputStream getErrors() { return errors; }
-
-    /** Get this command's program and arguments. */
-    public List<String> command() { return processBuilder.command(); }
-
-    /** Get this command's working directory. */
-    public File directory() { return processBuilder.directory(); }
-
-    /**
-     * Get a String representation of the stored command
-     */
-    public String toString() { return String.join(" ", processBuilder.command()); }
-
-
-    /**
-     * Collect as much output as possible from {@code in} without blocking, print it to
-     * {@code print} if not quiet, and store it in {@code store}.
-     */
-    private void collectOutput(InputStream in, ByteArrayOutputStream store, PrintStream print) {
-        byte[] buffer = new byte[64];
-        int len;
-        do {
-            try {
-                // This depends on in.available() being
-                //  greater than zero if data is available
-                //  (so that all data is collected)
-                //  and upper-bounded by maximum number of
-                //  bytes that can be read without blocking.
-                //  Only the latter of these two conditions
-                //  is guaranteed by the spec.
-                len = in.read(buffer, 0, Math.min(in.available(), buffer.length));
-                if (len > 0) {
-                    store.write(buffer, 0, len);
-                    if (!quiet) print.write(buffer, 0, len);
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-                break;
-            }
-        } while (len > 0);  // Do not necessarily continue
-        // to EOF (len == -1) because a blocking read
-        // operation is hard to interrupt.
-    }
-
-    /**
-     * Handle user cancellation if necessary, and handle any output from {@code process}
-     * otherwise.
-     * @param process a {@code Process}
-     * @param cancelIndicator a flag indicating whether a
-     *                        cancellation of {@code process}
-     *                        is requested
-     * directly to stderr and stdout).
-     */
-    private void poll(Process process, CancelIndicator cancelIndicator) {
-        if (cancelIndicator != null && cancelIndicator.isCanceled()) {
-            process.descendants().forEach(ProcessHandle::destroyForcibly);
-            process.destroyForcibly();
-        } else {
-            collectOutput(process.getInputStream(), output, System.out);
-            collectOutput(process.getErrorStream(), errors, System.err);
+  /**
+   * The period with which the cancel indicator is checked and the output and error streams are
+   * forwarded.
+   */
+  private static final int PERIOD_MILLISECONDS = 200;
+  /**
+   * The maximum amount of time to wait for the forwarding of output and error streams to finish.
+   */
+  private static final int READ_TIMEOUT_MILLISECONDS = 1000;
+
+  protected ProcessBuilder processBuilder;
+  protected boolean didRun = false;
+  protected ByteArrayOutputStream output = new ByteArrayOutputStream();
+  protected ByteArrayOutputStream errors = new ByteArrayOutputStream();
+  protected boolean quiet;
+
+  /** Construct an LFCommand that executes the command carried by {@code pb}. */
+  protected LFCommand(ProcessBuilder pb, boolean quiet) {
+    this.processBuilder = pb;
+    this.quiet = quiet;
+  }
+
+  /** Get the output collected during command execution */
+  public OutputStream getOutput() {
+    return output;
+  }
+
+  /** Get the error output collected during command execution */
+  public OutputStream getErrors() {
+    return errors;
+  }
+
+  /** Get this command's program and arguments. */
+  public List<String> command() {
+    return processBuilder.command();
+  }
+
+  /** Get this command's working directory. */
+  public File directory() {
+    return processBuilder.directory();
+  }
+
+  /** Get a String representation of the stored command */
+  public String toString() {
+    return String.join(" ", processBuilder.command());
+  }
+
+  /**
+   * Collect as much output as possible from {@code in} without blocking, print it to {@code print}
+   * if not quiet, and store it in {@code store}.
+   */
+  private void collectOutput(InputStream in, ByteArrayOutputStream store, PrintStream print) {
+    byte[] buffer = new byte[64];
+    int len;
+    do {
+      try {
+        // This depends on in.available() being
+        //  greater than zero if data is available
+        //  (so that all data is collected)
+        //  and upper-bounded by maximum number of
+        //  bytes that can be read without blocking.
+        //  Only the latter of these two conditions
+        //  is guaranteed by the spec.
+        len = in.read(buffer, 0, Math.min(in.available(), buffer.length));
+        if (len > 0) {
+          store.write(buffer, 0, len);
+          if (!quiet) print.write(buffer, 0, len);
         }
+      } catch (IOException e) {
+        e.printStackTrace();
+        break;
+      }
+    } while (len > 0); // Do not necessarily continue
+    // to EOF (len == -1) because a blocking read
+    // operation is hard to interrupt.
+  }
+
+  /**
+   * Handle user cancellation if necessary, and handle any output from {@code process} otherwise.
+   *
+   * @param process a {@code Process}
+   * @param cancelIndicator a flag indicating whether a cancellation of {@code process} is requested
+   *     directly to stderr and stdout).
+   */
+  private void poll(Process process, CancelIndicator cancelIndicator) {
+    if (cancelIndicator != null && cancelIndicator.isCanceled()) {
+      process.descendants().forEach(ProcessHandle::destroyForcibly);
+      process.destroyForcibly();
+    } else {
+      collectOutput(process.getInputStream(), output, System.out);
+      collectOutput(process.getErrorStream(), errors, System.err);
     }
-
-
-    /**
-     * Execute the command.
-     * <p>
-     * Executing a process directly with {@code processBuilder.start()} could
-     * lead to a deadlock as the subprocess blocks when output or error
-     * buffers are full. This method ensures that output and error messages
-     * are continuously read and forwards them to the system output and
-     * error streams as well as to the output and error streams hold in
-     * this class.
-     * </p>
-     * <p>
-     * If the current operation is cancelled (as indicated
-     * by <code>cancelIndicator</code>), the subprocess
-     * is destroyed. Output and error streams until that
-     * point are still collected.
-     * </p>
-     *
-     * @param cancelIndicator The indicator of whether the underlying process
-     * should be terminated.
-     * @return the process' return code
-     * @author Christian Menard
-     */
-    public int run(CancelIndicator cancelIndicator) {
-        assert !didRun;
-        didRun = true;
-
-        System.out.println("--- Current working directory: " + processBuilder.directory().toString());
-        System.out.println("--- Executing command: " + String.join(" ", processBuilder.command()));
-
-        final Process process = startProcess();
-        if (process == null) return -1;
-
-        ScheduledExecutorService poller = Executors.newSingleThreadScheduledExecutor();
-        poller.scheduleAtFixedRate(
-            () -> poll(process, cancelIndicator),
-            0, PERIOD_MILLISECONDS, TimeUnit.MILLISECONDS
-        );
-
-        try {
-            final int returnCode = process.waitFor();
-            poller.shutdown();
-            poller.awaitTermination(READ_TIMEOUT_MILLISECONDS, TimeUnit.MILLISECONDS);
-            // Finish collecting any remaining data
-            poll(process, cancelIndicator);
-            return returnCode;
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-            return -2;
-        }
+  }
+
+  /**
+   * Execute the command.
+   *
+   * <p>Executing a process directly with {@code processBuilder.start()} could lead to a deadlock as
+   * the subprocess blocks when output or error buffers are full. This method ensures that output
+   * and error messages are continuously read and forwards them to the system output and error
+   * streams as well as to the output and error streams hold in this class.
+   *
+   * <p>If the current operation is cancelled (as indicated by <code>cancelIndicator</code>), the
+   * subprocess is destroyed. Output and error streams until that point are still collected.
+   *
+   * @param cancelIndicator The indicator of whether the underlying process should be terminated.
+   * @return the process' return code
+   * @author Christian Menard
+   */
+  public int run(CancelIndicator cancelIndicator) {
+    assert !didRun;
+    didRun = true;
+
+    System.out.println("--- Current working directory: " + processBuilder.directory().toString());
+    System.out.println("--- Executing command: " + String.join(" ", processBuilder.command()));
+
+    final Process process = startProcess();
+    if (process == null) return -1;
+
+    ScheduledExecutorService poller = Executors.newSingleThreadScheduledExecutor();
+    poller.scheduleAtFixedRate(
+        () -> poll(process, cancelIndicator), 0, PERIOD_MILLISECONDS, TimeUnit.MILLISECONDS);
+
+    try {
+      final int returnCode = process.waitFor();
+      poller.shutdown();
+      poller.awaitTermination(READ_TIMEOUT_MILLISECONDS, TimeUnit.MILLISECONDS);
+      // Finish collecting any remaining data
+      poll(process, cancelIndicator);
+      return returnCode;
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      return -2;
     }
-
-    /**
-     * Execute the command. Do not allow user cancellation.
-     * @return the process' return code
-     */
-    public int run() {
-        return run(null);
-    }
-
-
-    /**
-     * Add the given variables and their values to the command's environment.
-     *
-     * @param variables A map of variable names and their values
-     */
-    public void setEnvironmentVariables(Map<String, String> variables) {
-        processBuilder.environment().putAll(variables);
+  }
+
+  /**
+   * Execute the command. Do not allow user cancellation.
+   *
+   * @return the process' return code
+   */
+  public int run() {
+    return run(null);
+  }
+
+  /**
+   * Add the given variables and their values to the command's environment.
+   *
+   * @param variables A map of variable names and their values
+   */
+  public void setEnvironmentVariables(Map<String, String> variables) {
+    processBuilder.environment().putAll(variables);
+  }
+
+  /**
+   * Add the given variable and its value to the command's environment.
+   *
+   * @param variableName name of the variable to add
+   * @param value the variable's value
+   */
+  public void setEnvironmentVariable(String variableName, String value) {
+    processBuilder.environment().put(variableName, value);
+  }
+
+  /**
+   * Replace the given variable and its value in the command's environment.
+   *
+   * @param variableName name of the variable to add
+   * @param value the variable's value
+   */
+  public void replaceEnvironmentVariable(String variableName, String value) {
+    processBuilder.environment().remove(variableName);
+    processBuilder.environment().put(variableName, value);
+  }
+
+  /** Require this to be quiet, overriding the verbosity specified at construction time. */
+  public void setQuiet() {
+    quiet = true;
+  }
+
+  /**
+   * Create a LFCommand instance from a given command and argument list in the current working
+   * directory.
+   *
+   * @see #get(String, List, boolean, Path)
+   */
+  public static LFCommand get(final String cmd, final List<String> args) {
+    return get(cmd, args, false, Paths.get(""));
+  }
+
+  /**
+   * Create a LFCommand instance from a given command and argument list in the current working
+   * directory.
+   *
+   * @see #get(String, List, boolean, Path)
+   */
+  public static LFCommand get(final String cmd, final List<String> args, boolean quiet) {
+    return get(cmd, args, quiet, Paths.get(""));
+  }
+
+  /**
+   * Create a LFCommand instance from a given command, an argument list and a directory.
+   *
+   * <p>This will check first if the command can actually be found and executed. If the command is
+   * not found, null is returned. In order to find the command, different methods are applied in the
+   * following order:
+   *
+   * <p>1. Check if the given command {@code cmd} is an executable file within {@code dir}. 2. If
+   * the above fails 'which <cmd>' (or 'where <cmd>' on Windows) is executed to see if the command
+   * is available on the PATH. 3. If both points above fail, a third attempt is started using bash
+   * to indirectly execute the command (see below for an explanation).
+   *
+   * <p>A bit more context: If the command cannot be found directly, then a second attempt is made
+   * using a Bash shell with the --login option, which sources the user's ~/.bash_profile,
+   * ~/.bash_login, or ~/.bashrc (whichever is first found) before running the command. This helps
+   * to ensure that the user's PATH variable is set according to their usual environment, assuming
+   * that they use a bash shell.
+   *
+   * <p>More information: Unfortunately, at least on a Mac if you are running within Eclipse, the
+   * PATH variable is extremely limited; supposedly, it is given by the default provided in
+   * /etc/paths, but at least on my machine, it does not even include directories in that file for
+   * some reason. One way to add a directory like /usr/local/bin to the path once-and-for-all is
+   * this:
+   *
+   * <p>sudo launchctl config user path /usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
+   *
+   * <p>But asking users to do that is not ideal. Hence, we try a more hack-y approach of just
+   * trying to execute using a bash shell. Also note that while ProcessBuilder can be configured to
+   * use custom environment variables, these variables do not affect the command that is to be
+   * executed but merely the environment in which the command executes.
+   *
+   * @param cmd The command
+   * @param args A list of arguments to pass to the command
+   * @param quiet If true, the commands stdout and stderr will be suppressed
+   * @param dir The directory in which the command should be executed
+   * @return Returns an LFCommand if the given command could be found or null otherwise.
+   */
+  public static LFCommand get(final String cmd, final List<String> args, boolean quiet, Path dir) {
+    assert cmd != null && args != null && dir != null;
+    dir = dir.toAbsolutePath();
+
+    // a list containing the command as first element and then all arguments
+    List<String> cmdList = new ArrayList<>();
+    cmdList.add(cmd);
+    cmdList.addAll(args);
+
+    ProcessBuilder builder = null;
+
+    // First, see if the command is a local executable file
+    final File cmdFile = dir.resolve(cmd).toFile();
+    if (cmdFile.exists() && cmdFile.canExecute()) {
+      builder = new ProcessBuilder(cmdList);
+    } else if (findCommand(cmd) != null) {
+      builder = new ProcessBuilder(cmdList);
+    } else if (checkIfCommandIsExecutableWithBash(cmd, dir)) {
+      builder =
+          new ProcessBuilder(
+              "bash", "--login", "-c", String.format("\"%s\"", String.join(" ", cmdList)));
     }
 
-
-    /**
-     * Add the given variable and its value to the command's environment.
-     *
-     * @param variableName name of the variable to add
-     * @param value        the variable's value
-     */
-    public void setEnvironmentVariable(String variableName, String value) {
-        processBuilder.environment().put(variableName, value);
-    }
-    
-    /**
-     * Replace the given variable and its value in the command's environment.
-     * 
-     * @param variableName name of the variable to add
-     * @param value        the variable's value
-     */
-    public void replaceEnvironmentVariable(String variableName, String value) {
-        processBuilder.environment().remove(variableName);
-        processBuilder.environment().put(variableName, value);
+    if (builder != null) {
+      builder.directory(dir.toFile());
+      return new LFCommand(builder, quiet);
     }
 
-    /**
-     * Require this to be quiet, overriding the verbosity specified at construction time.
-     */
-    public void setQuiet() {
-        quiet = true;
+    return null;
+  }
+
+  /**
+   * Search for matches to the given command by following the PATH environment variable.
+   *
+   * @param command A command for which to search.
+   * @return The file locations of matches to the given command.
+   */
+  private static List<File> findCommand(final String command) {
+    final String whichCmd = System.getProperty("os.name").startsWith("Windows") ? "where" : "which";
+    final ProcessBuilder whichBuilder = new ProcessBuilder(List.of(whichCmd, command));
+    try {
+      Process p = whichBuilder.start();
+      if (p.waitFor() != 0) return null;
+      return Arrays.stream(new String(p.getInputStream().readAllBytes()).split("\n"))
+          .map(String::strip)
+          .map(File::new)
+          .filter(File::canExecute)
+          .collect(Collectors.toList());
+    } catch (InterruptedException | IOException e) {
+      e.printStackTrace();
+      return null;
     }
-
-    /**
-     * Create a LFCommand instance from a given command and argument list in the current working directory.
-     *
-     * @see #get(String, List, boolean, Path)
-     */
-    public static LFCommand get(final String cmd, final List<String> args) {
-        return get(cmd, args, false, Paths.get(""));
+  }
+
+  /**
+   * Attempt to start the execution of this command.
+   *
+   * <p>First collect a list of paths where the executable might be found, then select an executable
+   * that successfully executes from the list of paths. Return the {@code Process} instance that is
+   * the result of a successful execution, or {@code null} if no successful execution happened.
+   *
+   * @return The {@code Process} that is started by this command, or {@code null} in case of
+   *     failure.
+   */
+  private Process startProcess() {
+    ArrayDeque<String> commands = new ArrayDeque<>();
+    List<File> matchesOnPath = findCommand(processBuilder.command().get(0));
+    if (matchesOnPath != null) {
+      matchesOnPath.stream().map(File::toString).forEach(commands::addLast);
     }
-
-    /**
-     * Create a LFCommand instance from a given command and argument list in the current working directory.
-     *
-     * @see #get(String, List, boolean, Path)
-     */
-    public static LFCommand get(final String cmd, final List<String> args, boolean quiet) {
-        return get(cmd, args, quiet, Paths.get(""));
-    }
-
-
-    /**
-     * Create a LFCommand instance from a given command, an argument list and a directory.
-     * <p>
-     * This will check first if the command can actually be found and executed. If the command is not found, null is
-     * returned. In order to find the command, different methods are applied in the following order:
-     * <p>
-     * 1. Check if the given command {@code cmd} is an executable file within {@code dir}.
-     * 2. If the above fails 'which <cmd>' (or 'where <cmd>' on Windows) is executed to see if the command is available
-     * on the PATH.
-     * 3. If both points above fail, a third attempt is started using bash to indirectly execute the command (see below
-     * for an explanation).
-     * <p>
-     * A bit more context:
-     * If the command cannot be found directly, then a second attempt is made using a Bash shell with the --login
-     * option, which sources the user's ~/.bash_profile, ~/.bash_login, or ~/.bashrc (whichever is first found) before
-     * running the command. This helps to ensure that the user's PATH variable is set according to their usual
-     * environment, assuming that they use a bash shell.
-     * <p>
-     * More information: Unfortunately, at least on a Mac if you are running within Eclipse, the PATH variable is
-     * extremely limited; supposedly, it is given by the default provided in /etc/paths, but at least on my machine, it
-     * does not even include directories in that file for some reason. One way to add a directory like /usr/local/bin
-     * to
-     * the path once-and-for-all is this:
-     * <p>
-     * sudo launchctl config user path /usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
-     * <p>
-     * But asking users to do that is not ideal. Hence, we try a more hack-y approach of just trying to execute using a
-     * bash shell. Also note that while ProcessBuilder can be configured to use custom environment variables, these
-     * variables do not affect the command that is to be executed but merely the environment in which the command
-     * executes.
-     *
-     * @param cmd  The command
-     * @param args A list of arguments to pass to the command
-     * @param quiet If true, the commands stdout and stderr will be suppressed
-     * @param dir  The directory in which the command should be executed
-     * @return Returns an LFCommand if the given command could be found or null otherwise.
-     */
-    public static LFCommand get(final String cmd, final List<String> args, boolean quiet, Path dir) {
-        assert cmd != null && args != null && dir != null;
-        dir = dir.toAbsolutePath();
-
-        // a list containing the command as first element and then all arguments
-        List<String> cmdList = new ArrayList<>();
-        cmdList.add(cmd);
-        cmdList.addAll(args);
-
-        ProcessBuilder builder = null;
-
-        // First, see if the command is a local executable file
-        final File cmdFile = dir.resolve(cmd).toFile();
-        if (cmdFile.exists() && cmdFile.canExecute()) {
-            builder = new ProcessBuilder(cmdList);
-        } else if (findCommand(cmd) != null) {
-            builder = new ProcessBuilder(cmdList);
-        } else if (checkIfCommandIsExecutableWithBash(cmd, dir)) {
-            builder = new ProcessBuilder("bash", "--login", "-c", String.format("\"%s\"", String.join(" ", cmdList)));
-        }
-
-        if (builder != null) {
-            builder.directory(dir.toFile());
-            return new LFCommand(builder, quiet);
-        }
-
-        return null;
-    }
-
-
-    /**
-     * Search for matches to the given command by following the PATH environment variable.
-     * @param command A command for which to search.
-     * @return The file locations of matches to the given command.
-     */
-    private static List<File> findCommand(final String command) {
-        final String whichCmd = System.getProperty("os.name").startsWith("Windows") ? "where" : "which";
-        final ProcessBuilder whichBuilder = new ProcessBuilder(List.of(whichCmd, command));
-        try {
-            Process p = whichBuilder.start();
-            if (p.waitFor() != 0) return null;
-            return Arrays.stream(new String(p.getInputStream().readAllBytes()).split("\n"))
-                .map(String::strip).map(File::new).filter(File::canExecute).collect(Collectors.toList());
-        } catch (InterruptedException | IOException e) {
-            e.printStackTrace();
-            return null;
+    while (true) {
+      try {
+        return processBuilder.start();
+      } catch (IOException e) {
+        if (commands.isEmpty()) {
+          e.printStackTrace();
+          return null;
         }
+      }
+      processBuilder.command().set(0, commands.removeFirst());
     }
+  }
 
-    /**
-     * Attempt to start the execution of this command.
-     * 
-     * First collect a list of paths where the executable might be found,
-     * then select an executable that successfully executes from the 
-     * list of paths. Return the {@code Process} instance that is the 
-     * result of a successful execution, or {@code null} if no successful
-     * execution happened.
-     * @return The {@code Process} that is started by this command, or {@code null} in case of failure.
-     */
-    private Process startProcess() {
-        ArrayDeque<String> commands = new ArrayDeque<>();
-        List<File> matchesOnPath = findCommand(processBuilder.command().get(0));
-        if (matchesOnPath != null) {
-            matchesOnPath.stream().map(File::toString).forEach(commands::addLast);
-        }
-        while (true) {
-            try {
-                return processBuilder.start();
-            } catch (IOException e) {
-                if (commands.isEmpty()) {
-                    e.printStackTrace();
-                    return null;
-                }
-            }
-            processBuilder.command().set(0, commands.removeFirst());
-        }
+  private static boolean checkIfCommandIsExecutableWithBash(final String command, final Path dir) {
+    // check first if bash is installed
+    if (findCommand("bash") == null) {
+      return false;
     }
 
-
-    private static boolean checkIfCommandIsExecutableWithBash(final String command, final Path dir) {
-        // check first if bash is installed
-        if (findCommand("bash") == null) {
-            return false;
-        }
-
-        // then try to find command with bash
-        final ProcessBuilder bashBuilder = new ProcessBuilder(List.of(
-            "bash",
-            "--login",
-            "-c",
-            String.format("\"which %s\"", command)
-        ));
-        bashBuilder.directory(dir.toFile());
-        try {
-            int bashReturn = bashBuilder.start().waitFor();
-            return bashReturn == 0;
-        } catch (InterruptedException | IOException e) {
-            e.printStackTrace();
-            return false;
-        }
+    // then try to find command with bash
+    final ProcessBuilder bashBuilder =
+        new ProcessBuilder(
+            List.of("bash", "--login", "-c", String.format("\"which %s\"", command)));
+    bashBuilder.directory(dir.toFile());
+    try {
+      int bashReturn = bashBuilder.start().waitFor();
+      return bashReturn == 0;
+    } catch (InterruptedException | IOException e) {
+      e.printStackTrace();
+      return false;
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/util/StringUtil.java b/org.lflang/src/org/lflang/util/StringUtil.java
index 31beef8a9b..516f340c06 100644
--- a/org.lflang/src/org/lflang/util/StringUtil.java
+++ b/org.lflang/src/org/lflang/util/StringUtil.java
@@ -36,137 +36,133 @@
  */
 public final class StringUtil {
 
-    /**
-     * Matches the boundary of a camel-case word. That's a zero-length match.
-     */
-    private static final Pattern CAMEL_WORD_BOUNDARY =
-        Pattern.compile("(?<![A-Z])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])");
+  /** Matches the boundary of a camel-case word. That's a zero-length match. */
+  private static final Pattern CAMEL_WORD_BOUNDARY =
+      Pattern.compile("(?<![A-Z])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])");
 
-    private StringUtil() {
-        // utility class
-    }
+  private StringUtil() {
+    // utility class
+  }
 
-    /**
-     * Convert a string in Camel case to snake case. E.g.
-     * {@code MinimalReactor} will be converted to {@code minimal_reactor}.
-     * The string is assumed to be a single camel case identifier
-     * (no whitespace).
-     */
-    public static String camelToSnakeCase(String str) {
-        return CAMEL_WORD_BOUNDARY.splitAsStream(str)
-                                  .filter(it -> !it.isEmpty())
-                                  .map(it -> it.toLowerCase(Locale.ROOT))
-                                  .collect(Collectors.joining("_"));
-    }
+  /**
+   * Convert a string in Camel case to snake case. E.g. {@code MinimalReactor} will be converted to
+   * {@code minimal_reactor}. The string is assumed to be a single camel case identifier (no
+   * whitespace).
+   */
+  public static String camelToSnakeCase(String str) {
+    return CAMEL_WORD_BOUNDARY
+        .splitAsStream(str)
+        .filter(it -> !it.isEmpty())
+        .map(it -> it.toLowerCase(Locale.ROOT))
+        .collect(Collectors.joining("_"));
+  }
 
-    /**
-     * If the given string is surrounded by single or double
-     * quotes, returns what's inside the quotes. Otherwise
-     * returns the same string.
-     *
-     * <p>Returns null if the parameter is null.
-     */
-    public static String removeQuotes(String str) {
-        if (str == null) {
-            return null;
-        }
-        if (str.length() < 2) {
-            return str;
-        }
-        if (hasQuotes(str)) {
-            return str.substring(1, str.length() - 1);
-        }
-        return str;
+  /**
+   * If the given string is surrounded by single or double quotes, returns what's inside the quotes.
+   * Otherwise returns the same string.
+   *
+   * <p>Returns null if the parameter is null.
+   */
+  public static String removeQuotes(String str) {
+    if (str == null) {
+      return null;
+    }
+    if (str.length() < 2) {
+      return str;
+    }
+    if (hasQuotes(str)) {
+      return str.substring(1, str.length() - 1);
     }
+    return str;
+  }
 
-    /**
-     * Return true if the given string is surrounded by single or double
-     * quotes,
-     */
-    public static boolean hasQuotes(String str) {
-        if (str == null) {
-            return false;
-        }
-        return str.startsWith("\"") && str.endsWith("\"") || str.startsWith("'") && str.endsWith("'");
+  /** Return true if the given string is surrounded by single or double quotes, */
+  public static boolean hasQuotes(String str) {
+    if (str == null) {
+      return false;
     }
+    return str.startsWith("\"") && str.endsWith("\"") || str.startsWith("'") && str.endsWith("'");
+  }
 
-    /**
-     * Intelligently trim the white space in a code block.
-	 *
-	 * The leading whitespaces of the first non-empty
-	 * code line is considered as a common prefix across all code lines. If the
-	 * remaining code lines indeed start with this prefix, it removes the prefix
-	 * from the code line.
-	 *
-     * For examples, this code
-     * <pre>{@code
-     *        int test = 4;
-     *        if (test == 42) {
-     *            printf("Hello\n");
-     *        }
-     * }</pre>
-     * will be trimmed to this:
-     * <pre>{@code
-     * int test = 4;
-     * if (test == 42) {
-     *     printf("Hello\n");
-     * }
-     * }</pre>
-     *
-     * @param code the code block to be trimmed
-     * @param firstLineToConsider The first line not to ignore.
-     * @return trimmed code block
-     */
-    public static String trimCodeBlock(String code, int firstLineToConsider) {
-        String[] codeLines = code.split("(\r\n?)|\n");
-        int prefix = getWhitespacePrefix(code, firstLineToConsider);
-        StringBuilder buffer = new StringBuilder();
-        boolean stillProcessingLeadingBlankLines = true;
-        for (int i = 0; i < firstLineToConsider; i++) {
-            var endIndex = codeLines[i].contains("//") ?
-                codeLines[i].indexOf("//") : codeLines[i].length();
-            // The following will break Rust attributes in multiline code blocks
-            // where they appear next to the opening {= brace.
-            endIndex = codeLines[i].contains("#") ?
-                Math.min(endIndex, codeLines[i].indexOf("#")) : endIndex;
-            String toAppend = codeLines[i].substring(0, endIndex).strip();
-            if (!toAppend.isBlank()) buffer.append(toAppend).append("\n");
-        }
-        for (int i = firstLineToConsider; i < codeLines.length; i++) {
-            final String line = codeLines[i];
-            if (!line.isBlank()) stillProcessingLeadingBlankLines = false;
-            if (stillProcessingLeadingBlankLines) continue;
-            if (!line.isBlank()) buffer.append(line.substring(prefix));
-            buffer.append("\n");
-        }
-        return buffer.toString().stripTrailing();
+  /**
+   * Intelligently trim the white space in a code block.
+   *
+   * <p>The leading whitespaces of the first non-empty code line is considered as a common prefix
+   * across all code lines. If the remaining code lines indeed start with this prefix, it removes
+   * the prefix from the code line.
+   *
+   * <p>For examples, this code
+   *
+   * <pre>{@code
+   * int test = 4;
+   * if (test == 42) {
+   *     printf("Hello\n");
+   * }
+   * }</pre>
+   *
+   * will be trimmed to this:
+   *
+   * <pre>{@code
+   * int test = 4;
+   * if (test == 42) {
+   *     printf("Hello\n");
+   * }
+   * }</pre>
+   *
+   * @param code the code block to be trimmed
+   * @param firstLineToConsider The first line not to ignore.
+   * @return trimmed code block
+   */
+  public static String trimCodeBlock(String code, int firstLineToConsider) {
+    String[] codeLines = code.split("(\r\n?)|\n");
+    int prefix = getWhitespacePrefix(code, firstLineToConsider);
+    StringBuilder buffer = new StringBuilder();
+    boolean stillProcessingLeadingBlankLines = true;
+    for (int i = 0; i < firstLineToConsider; i++) {
+      var endIndex =
+          codeLines[i].contains("//") ? codeLines[i].indexOf("//") : codeLines[i].length();
+      // The following will break Rust attributes in multiline code blocks
+      // where they appear next to the opening {= brace.
+      endIndex =
+          codeLines[i].contains("#") ? Math.min(endIndex, codeLines[i].indexOf("#")) : endIndex;
+      String toAppend = codeLines[i].substring(0, endIndex).strip();
+      if (!toAppend.isBlank()) buffer.append(toAppend).append("\n");
+    }
+    for (int i = firstLineToConsider; i < codeLines.length; i++) {
+      final String line = codeLines[i];
+      if (!line.isBlank()) stillProcessingLeadingBlankLines = false;
+      if (stillProcessingLeadingBlankLines) continue;
+      if (!line.isBlank()) buffer.append(line.substring(prefix));
+      buffer.append("\n");
     }
+    return buffer.toString().stripTrailing();
+  }
 
-    private static int getWhitespacePrefix(String code, int firstLineToConsider) {
-        String[] codeLines = code.split("(\r\n?)|\n");
-        int minLength = Integer.MAX_VALUE;
-        for (int j = firstLineToConsider; j < codeLines.length; j++) {
-            String line = codeLines[j];
-            for (var i = 0; i < line.length(); i++) {
-                if (!Character.isWhitespace(line.charAt(i))) {
-                    minLength = Math.min(minLength, i);
-                    break;
-                }
-            }
+  private static int getWhitespacePrefix(String code, int firstLineToConsider) {
+    String[] codeLines = code.split("(\r\n?)|\n");
+    int minLength = Integer.MAX_VALUE;
+    for (int j = firstLineToConsider; j < codeLines.length; j++) {
+      String line = codeLines[j];
+      for (var i = 0; i < line.length(); i++) {
+        if (!Character.isWhitespace(line.charAt(i))) {
+          minLength = Math.min(minLength, i);
+          break;
         }
-        return minLength == Integer.MAX_VALUE ? 0 : minLength;
+      }
     }
+    return minLength == Integer.MAX_VALUE ? 0 : minLength;
+  }
 
-    public static String addDoubleQuotes(String str) {
-        return "\""+str+"\"";
-    }
+  public static String addDoubleQuotes(String str) {
+    return "\"" + str + "\"";
+  }
 
-    public static <T> String joinObjects(List<T> things, String delimiter) {
-        return things.stream().map(T::toString).collect(Collectors.joining(delimiter));
-    }
+  public static <T> String joinObjects(List<T> things, String delimiter) {
+    return things.stream().map(T::toString).collect(Collectors.joining(delimiter));
+  }
 
-    /** Normalize end-of-line sequences to the Linux style. */
-    public static String normalizeEol(String s) {
-        return s.replaceAll("(\\r\\n?)|\\n", "\n");
-    }
+  /** Normalize end-of-line sequences to the Linux style. */
+  public static String normalizeEol(String s) {
+    return s.replaceAll("(\\r\\n?)|\\n", "\n");
+  }
 }
diff --git a/org.lflang/src/org/lflang/util/TargetResourceNotFoundException.java b/org.lflang/src/org/lflang/util/TargetResourceNotFoundException.java
index dfcc1d671a..acc55fb0f3 100644
--- a/org.lflang/src/org/lflang/util/TargetResourceNotFoundException.java
+++ b/org.lflang/src/org/lflang/util/TargetResourceNotFoundException.java
@@ -3,12 +3,15 @@
 import java.io.IOException;
 
 public class TargetResourceNotFoundException extends IOException {
-    public TargetResourceNotFoundException(String resourcePath) {
-        super(String.format("""
+  public TargetResourceNotFoundException(String resourcePath) {
+    super(
+        String.format(
+            """
             A required resource could not be found on the classpath or is an empty directory: %s
             Perhaps a git submodule is missing or not up to date.
             Try running 'git submodule update --init --recursive' and rebuild.
-            Also see https://www.lf-lang.org/docs/handbook/developer-setup. 
-            """, resourcePath));
-    }
+            Also see https://www.lf-lang.org/docs/handbook/developer-setup.
+            """,
+            resourcePath));
+  }
 }
diff --git a/org.lflang/src/org/lflang/validation/AttributeSpec.java b/org.lflang/src/org/lflang/validation/AttributeSpec.java
index 48b10a140a..45c984204e 100644
--- a/org.lflang/src/org/lflang/validation/AttributeSpec.java
+++ b/org.lflang/src/org/lflang/validation/AttributeSpec.java
@@ -1,16 +1,16 @@
 /*************
  * Copyright (c) 2019-2022, The University of California at Berkeley.
-
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
-
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
-
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
-
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -31,7 +31,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.AttrParm;
 import org.lflang.lf.Attribute;
@@ -40,191 +39,189 @@
 
 /**
  * Specification of the structure of an attribute annotation.
+ *
  * @author Clément Fournier
  * @author Shaokai Lin
  */
 public class AttributeSpec {
 
-    private final Map<String, AttrParamSpec> paramSpecByName;
+  private final Map<String, AttrParamSpec> paramSpecByName;
 
-    public static final String VALUE_ATTR = "value";
-    public static final String NETWORK_MESSAGE_ACTIONS = "network_message_actions";
-    public static final String EACH_ATTR = "each";
+  public static final String VALUE_ATTR = "value";
+  public static final String NETWORK_MESSAGE_ACTIONS = "network_message_actions";
+  public static final String EACH_ATTR = "each";
 
-    /** A map from a string to a supported AttributeSpec */
-    public static final Map<String, AttributeSpec> ATTRIBUTE_SPECS_BY_NAME = new HashMap<>();
+  /** A map from a string to a supported AttributeSpec */
+  public static final Map<String, AttributeSpec> ATTRIBUTE_SPECS_BY_NAME = new HashMap<>();
 
-    public AttributeSpec(List<AttrParamSpec> params) {
-        if (params != null) {
-            paramSpecByName = params.stream().collect(Collectors.toMap(it -> it.name, it -> it));
-        } else {
-            paramSpecByName = null;
-        }
+  public AttributeSpec(List<AttrParamSpec> params) {
+    if (params != null) {
+      paramSpecByName = params.stream().collect(Collectors.toMap(it -> it.name, it -> it));
+    } else {
+      paramSpecByName = null;
+    }
+  }
+
+  /** Check that the attribute conforms to this spec and whether attr has the correct name. */
+  public void check(LFValidator validator, Attribute attr) {
+    Set<String> seen;
+    // If there is just one parameter, it is required to be named "value".
+    if (attr.getAttrParms() != null
+        && attr.getAttrParms().size() == 1
+        && attr.getAttrParms().get(0).getName() == null) {
+      // If we are in this branch,
+      // then the user has provided @attr("value"),
+      // which is a shorthand for @attr(value="value").
+      if (paramSpecByName == null) {
+        validator.error("Attribute doesn't take a parameter.", Literals.ATTRIBUTE__ATTR_NAME);
+        return;
+      }
+      AttrParamSpec valueSpec = paramSpecByName.get(VALUE_ATTR);
+      if (valueSpec == null) {
+        validator.error("Attribute doesn't have a 'value' parameter.", Literals.ATTR_PARM__NAME);
+        return;
+      }
+
+      valueSpec.check(validator, attr.getAttrParms().get(0));
+      seen = Set.of(VALUE_ATTR);
+    } else {
+      // Process multiple parameters, each of which has to be named.
+      seen = processNamedAttrParms(validator, attr);
     }
 
-    /**
-     * Check that the attribute conforms to this spec and whether
-     * attr has the correct name.
-     */
-    public void check(LFValidator validator, Attribute attr) {
-        Set<String> seen;
-        // If there is just one parameter, it is required to be named "value".
-        if (attr.getAttrParms() != null
-                && attr.getAttrParms().size() == 1
-                && attr.getAttrParms().get(0).getName() == null) {
-            // If we are in this branch,
-            // then the user has provided @attr("value"),
-            // which is a shorthand for @attr(value="value").
-            if (paramSpecByName == null) {
-                validator.error("Attribute doesn't take a parameter.", Literals.ATTRIBUTE__ATTR_NAME);
-                return;
+    // Check if there are any missing parameters required by this attribute.
+    if (paramSpecByName != null) {
+      Map<String, AttrParamSpec> missingParams = new HashMap<>(paramSpecByName);
+      missingParams.keySet().removeAll(seen);
+      missingParams.forEach(
+          (name, paramSpec) -> {
+            if (!paramSpec.isOptional) {
+              validator.error(
+                  "Missing required attribute parameter '" + name + "'.",
+                  Literals.ATTRIBUTE__ATTR_PARMS);
             }
-            AttrParamSpec valueSpec = paramSpecByName.get(VALUE_ATTR);
-            if (valueSpec == null) {
-                validator.error("Attribute doesn't have a 'value' parameter.", Literals.ATTR_PARM__NAME);
-                return;
-            }
-
-            valueSpec.check(validator, attr.getAttrParms().get(0));
-            seen = Set.of(VALUE_ATTR);
-        } else {
-            // Process multiple parameters, each of which has to be named.
-            seen = processNamedAttrParms(validator, attr);
+          });
+    }
+  }
+
+  /**
+   * Check whether the attribute parameters are named, whether these names are known, and whether
+   * the named parameters conform to the param spec (whether the param has the right type, etc.).
+   *
+   * @param validator The current validator in use.
+   * @param attr The attribute being checked.
+   * @return A set of named attribute parameters the user provides.
+   */
+  private Set<String> processNamedAttrParms(LFValidator validator, Attribute attr) {
+    Set<String> seen = new HashSet<>();
+    if (attr.getAttrParms() != null) {
+      for (AttrParm parm : attr.getAttrParms()) {
+        if (paramSpecByName == null) {
+          validator.error("Attribute does not take parameters.", Literals.ATTRIBUTE__ATTR_NAME);
+          break;
         }
-
-        // Check if there are any missing parameters required by this attribute.
-        if (paramSpecByName != null) {
-            Map<String, AttrParamSpec> missingParams = new HashMap<>(paramSpecByName);
-            missingParams.keySet().removeAll(seen);
-            missingParams.forEach((name, paramSpec) -> {
-                if (!paramSpec.isOptional) {
-                    validator.error("Missing required attribute parameter '" + name + "'.", Literals.ATTRIBUTE__ATTR_PARMS);
-                }
-            });
+        if (parm.getName() == null) {
+          validator.error("Missing name for attribute parameter.", Literals.ATTRIBUTE__ATTR_NAME);
+          continue;
         }
-    }
 
-    /**
-     * Check whether the attribute parameters are named, whether
-     * these names are known, and whether the named parameters
-     * conform to the param spec (whether the param has the
-     * right type, etc.).
-     *
-     * @param validator The current validator in use.
-     * @param attr The attribute being checked.
-     * @return A set of named attribute parameters the user provides.
-     */
-    private Set<String> processNamedAttrParms(LFValidator validator, Attribute attr) {
-        Set<String> seen = new HashSet<>();
-        if (attr.getAttrParms() != null) {
-            for (AttrParm parm : attr.getAttrParms()) {
-                if (paramSpecByName == null) {
-                    validator.error("Attribute does not take parameters.", Literals.ATTRIBUTE__ATTR_NAME);
-                    break;
-                }
-                if (parm.getName() == null) {
-                    validator.error("Missing name for attribute parameter.", Literals.ATTRIBUTE__ATTR_NAME);
-                    continue;
-                }
-
-                AttrParamSpec parmSpec = paramSpecByName.get(parm.getName());
-                if (parmSpec == null) {
-                    validator.error("\"" + parm.getName() + "\"" + " is an unknown attribute parameter.",
-                                    Literals.ATTRIBUTE__ATTR_NAME);
-                    continue;
-                }
-                // Check whether a parameter conforms to its spec.
-                parmSpec.check(validator, parm);
-                seen.add(parm.getName());
-            }
+        AttrParamSpec parmSpec = paramSpecByName.get(parm.getName());
+        if (parmSpec == null) {
+          validator.error(
+              "\"" + parm.getName() + "\"" + " is an unknown attribute parameter.",
+              Literals.ATTRIBUTE__ATTR_NAME);
+          continue;
         }
-        return seen;
+        // Check whether a parameter conforms to its spec.
+        parmSpec.check(validator, parm);
+        seen.add(parm.getName());
+      }
     }
-
-    /**
-     * The specification of the attribute parameter.
-     *
-     * @param name The name of the attribute parameter
-     * @param type The type of the parameter
-     * @param isOptional True if the parameter is optional.
-     */
-    record AttrParamSpec(String name, AttrParamType type, boolean isOptional) {
-
-        // Check if a parameter has the right type.
-        // Currently, only String, Int, Boolean, Float, and target language are supported.
-        public void check(LFValidator validator, AttrParm parm) {
-            switch (type) {
-            case STRING -> {
-                if (!StringUtil.hasQuotes(parm.getValue())) {
-                    validator.error("Incorrect type: \"" + parm.getName() + "\""
-                            + " should have type String.",
-                        Literals.ATTRIBUTE__ATTR_NAME);
-                }
-            }
-            case INT -> {
-                if (!ASTUtils.isInteger(parm.getValue())) {
-                    validator.error(
-                        "Incorrect type: \"" + parm.getName() + "\""
-                            + " should have type Int.",
-                        Literals.ATTRIBUTE__ATTR_NAME);
-                }
-            }
-            case BOOLEAN -> {
-                if (!ASTUtils.isBoolean(parm.getValue())) {
-                    validator.error(
-                        "Incorrect type: \"" + parm.getName() + "\""
-                            + " should have type Boolean.",
-                        Literals.ATTRIBUTE__ATTR_NAME);
-                }
-            }
-            case FLOAT -> {
-                if (!ASTUtils.isFloat(parm.getValue())) {
-                    validator.error(
-                        "Incorrect type: \"" + parm.getName() + "\""
-                            + " should have type Float.",
-                        Literals.ATTRIBUTE__ATTR_NAME);
-                }
-            }
-            default -> throw new IllegalArgumentException("unexpected type");
-            }
+    return seen;
+  }
+
+  /**
+   * The specification of the attribute parameter.
+   *
+   * @param name The name of the attribute parameter
+   * @param type The type of the parameter
+   * @param isOptional True if the parameter is optional.
+   */
+  record AttrParamSpec(String name, AttrParamType type, boolean isOptional) {
+
+    // Check if a parameter has the right type.
+    // Currently, only String, Int, Boolean, Float, and target language are supported.
+    public void check(LFValidator validator, AttrParm parm) {
+      switch (type) {
+        case STRING -> {
+          if (!StringUtil.hasQuotes(parm.getValue())) {
+            validator.error(
+                "Incorrect type: \"" + parm.getName() + "\"" + " should have type String.",
+                Literals.ATTRIBUTE__ATTR_NAME);
+          }
         }
+        case INT -> {
+          if (!ASTUtils.isInteger(parm.getValue())) {
+            validator.error(
+                "Incorrect type: \"" + parm.getName() + "\"" + " should have type Int.",
+                Literals.ATTRIBUTE__ATTR_NAME);
+          }
+        }
+        case BOOLEAN -> {
+          if (!ASTUtils.isBoolean(parm.getValue())) {
+            validator.error(
+                "Incorrect type: \"" + parm.getName() + "\"" + " should have type Boolean.",
+                Literals.ATTRIBUTE__ATTR_NAME);
+          }
+        }
+        case FLOAT -> {
+          if (!ASTUtils.isFloat(parm.getValue())) {
+            validator.error(
+                "Incorrect type: \"" + parm.getName() + "\"" + " should have type Float.",
+                Literals.ATTRIBUTE__ATTR_NAME);
+          }
+        }
+        default -> throw new IllegalArgumentException("unexpected type");
+      }
     }
-
-    /**
-     * The type of attribute parameters currently supported.
-     */
-    enum AttrParamType {
-        STRING,
-        INT,
-        BOOLEAN,
-        FLOAT,
-    }
-
-    /*
-     * The specs of the known annotations are declared here.
-     * Note: If an attribute only has one parameter, the parameter name should be "value."
-     */
-    static {
-        // @label("value")
-        ATTRIBUTE_SPECS_BY_NAME.put("label", new AttributeSpec(
-            List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))
-        ));
-        // @sparse
-        ATTRIBUTE_SPECS_BY_NAME.put("sparse", new AttributeSpec(null));
-        // @icon("value")
-        ATTRIBUTE_SPECS_BY_NAME.put("icon", new AttributeSpec(
-            List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))
-        ));
-        // @enclave(each=boolean)
-        ATTRIBUTE_SPECS_BY_NAME.put("enclave", new AttributeSpec(
-            List.of(new AttrParamSpec(EACH_ATTR, AttrParamType.BOOLEAN, true))
-        ));
-
-        // attributes that are used internally only by the federated code generation
-        ATTRIBUTE_SPECS_BY_NAME.put("_unordered", new AttributeSpec(null));
-        ATTRIBUTE_SPECS_BY_NAME.put("_fed_config", new AttributeSpec(
-            List.of(new AttrParamSpec(AttributeSpec.NETWORK_MESSAGE_ACTIONS,
-                                      AttrParamType.STRING, false))));
-        ATTRIBUTE_SPECS_BY_NAME.put("_c_body", new AttributeSpec(null));
-    }
+  }
+
+  /** The type of attribute parameters currently supported. */
+  enum AttrParamType {
+    STRING,
+    INT,
+    BOOLEAN,
+    FLOAT,
+  }
+
+  /*
+   * The specs of the known annotations are declared here.
+   * Note: If an attribute only has one parameter, the parameter name should be "value."
+   */
+  static {
+    // @label("value")
+    ATTRIBUTE_SPECS_BY_NAME.put(
+        "label",
+        new AttributeSpec(List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))));
+    // @sparse
+    ATTRIBUTE_SPECS_BY_NAME.put("sparse", new AttributeSpec(null));
+    // @icon("value")
+    ATTRIBUTE_SPECS_BY_NAME.put(
+        "icon",
+        new AttributeSpec(List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))));
+    // @enclave(each=boolean)
+    ATTRIBUTE_SPECS_BY_NAME.put(
+        "enclave",
+        new AttributeSpec(List.of(new AttrParamSpec(EACH_ATTR, AttrParamType.BOOLEAN, true))));
+
+    // attributes that are used internally only by the federated code generation
+    ATTRIBUTE_SPECS_BY_NAME.put("_unordered", new AttributeSpec(null));
+    ATTRIBUTE_SPECS_BY_NAME.put(
+        "_fed_config",
+        new AttributeSpec(
+            List.of(
+                new AttrParamSpec(
+                    AttributeSpec.NETWORK_MESSAGE_ACTIONS, AttrParamType.STRING, false))));
+    ATTRIBUTE_SPECS_BY_NAME.put("_c_body", new AttributeSpec(null));
+  }
 }
diff --git a/org.lflang/src/org/lflang/validation/BaseLFValidator.java b/org.lflang/src/org/lflang/validation/BaseLFValidator.java
index 34e184a720..bcdc14dd94 100644
--- a/org.lflang/src/org/lflang/validation/BaseLFValidator.java
+++ b/org.lflang/src/org/lflang/validation/BaseLFValidator.java
@@ -28,55 +28,53 @@
 
 import java.lang.reflect.Method;
 import java.util.Map;
-
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.validation.Check;
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.CheckType;
-import org.lflang.ast.ASTUtils;
 import org.lflang.TimeUnit;
+import org.lflang.ast.ASTUtils;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Time;
 
 public class BaseLFValidator extends AbstractLFValidator {
 
-    @Check(CheckType.FAST)
-    public void checkTime(Time time) {
-        if (!ASTUtils.isValidTime(time)) {
-            error("Invalid time unit. " +
-                  "Should be one of " +
-                  TimeUnit.list() + ".", Literals.TIME__UNIT);
-        }
+  @Check(CheckType.FAST)
+  public void checkTime(Time time) {
+    if (!ASTUtils.isValidTime(time)) {
+      error(
+          "Invalid time unit. " + "Should be one of " + TimeUnit.list() + ".", Literals.TIME__UNIT);
     }
+  }
 
-    /**
-     * Provides convenient access to the inner state of the validator.
-     * <p>
-     * The validator only gives protected access to its own state. With
-     * this class, we can grant access to the inner state to other objects.
-     *
-     * @author Christian Menard
-     */
-    protected class ValidatorStateAccess {
-        public EObject getCurrentObject() {
-            return BaseLFValidator.this.getCurrentObject();
-        }
+  /**
+   * Provides convenient access to the inner state of the validator.
+   *
+   * <p>The validator only gives protected access to its own state. With this class, we can grant
+   * access to the inner state to other objects.
+   *
+   * @author Christian Menard
+   */
+  protected class ValidatorStateAccess {
+    public EObject getCurrentObject() {
+      return BaseLFValidator.this.getCurrentObject();
+    }
 
-        public Method getCurrentMethod() {
-            return BaseLFValidator.this.getCurrentMethod();
-        }
+    public Method getCurrentMethod() {
+      return BaseLFValidator.this.getCurrentMethod();
+    }
 
-        public DiagnosticChain getChain() {
-            return BaseLFValidator.this.getChain();
-        }
+    public DiagnosticChain getChain() {
+      return BaseLFValidator.this.getChain();
+    }
 
-        public CheckMode getCheckMode() {
-            return BaseLFValidator.this.getCheckMode();
-        }
+    public CheckMode getCheckMode() {
+      return BaseLFValidator.this.getCheckMode();
+    }
 
-        public Map<Object, Object> getContext() {
-            return BaseLFValidator.this.getContext();
-        }
+    public Map<Object, Object> getContext() {
+      return BaseLFValidator.this.getContext();
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/validation/LFNamesAreUniqueValidationHelper.java b/org.lflang/src/org/lflang/validation/LFNamesAreUniqueValidationHelper.java
index 75020fdc2b..9c6267cb0a 100644
--- a/org.lflang/src/org/lflang/validation/LFNamesAreUniqueValidationHelper.java
+++ b/org.lflang/src/org/lflang/validation/LFNamesAreUniqueValidationHelper.java
@@ -2,27 +2,24 @@
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.xtext.validation.NamesAreUniqueValidationHelper;
-
 import org.lflang.lf.LfPackage;
 
 public class LFNamesAreUniqueValidationHelper extends NamesAreUniqueValidationHelper {
 
-    /**
-     * Lump all inputs, outputs, timers, actions, parameters, and 
-     * instantiations in the same cluster type. This ensures that
-     * names amongst them are checked for uniqueness.
-     */
-    @Override public EClass getAssociatedClusterType(EClass eClass) {
-        if (LfPackage.Literals.INPUT == eClass || 
-            LfPackage.Literals.OUTPUT == eClass ||
-            LfPackage.Literals.TIMER == eClass ||
-            LfPackage.Literals.ACTION == eClass ||
-            LfPackage.Literals.PARAMETER == eClass ||
-            LfPackage.Literals.INSTANTIATION == eClass
-        )  {
-            return LfPackage.Literals.VARIABLE;
-        }
-        return super.getAssociatedClusterType(eClass);
+  /**
+   * Lump all inputs, outputs, timers, actions, parameters, and instantiations in the same cluster
+   * type. This ensures that names amongst them are checked for uniqueness.
+   */
+  @Override
+  public EClass getAssociatedClusterType(EClass eClass) {
+    if (LfPackage.Literals.INPUT == eClass
+        || LfPackage.Literals.OUTPUT == eClass
+        || LfPackage.Literals.TIMER == eClass
+        || LfPackage.Literals.ACTION == eClass
+        || LfPackage.Literals.PARAMETER == eClass
+        || LfPackage.Literals.INSTANTIATION == eClass) {
+      return LfPackage.Literals.VARIABLE;
     }
-    
+    return super.getAssociatedClusterType(eClass);
+  }
 }
diff --git a/org.lflang/src/org/lflang/validation/LFValidator.java b/org.lflang/src/org/lflang/validation/LFValidator.java
index 36c09cf678..747b22ffc3 100644
--- a/org.lflang/src/org/lflang/validation/LFValidator.java
+++ b/org.lflang/src/org/lflang/validation/LFValidator.java
@@ -2,17 +2,17 @@
 
 /*************
  * Copyright (c) 2019-2020, The University of California at Berkeley.
-
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
-
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
-
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
-
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -28,12 +28,10 @@
 
 import static org.lflang.ast.ASTUtils.inferPortWidth;
 import static org.lflang.ast.ASTUtils.isGeneric;
-import static org.lflang.ast.ASTUtils.isInteger;
-import static org.lflang.ast.ASTUtils.isOfTimeType;
-import static org.lflang.ast.ASTUtils.isZero;
 import static org.lflang.ast.ASTUtils.toDefinition;
 import static org.lflang.ast.ASTUtils.toOriginalText;
 
+import com.google.inject.Inject;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -46,7 +44,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EAttribute;
@@ -56,13 +53,13 @@
 import org.eclipse.xtext.validation.Check;
 import org.eclipse.xtext.validation.CheckType;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
-import org.lflang.ast.ASTUtils;
 import org.lflang.AttributeUtils;
 import org.lflang.InferredType;
 import org.lflang.ModelInfo;
 import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.serialization.SupportedSerializers;
 import org.lflang.federated.validation.FedValidator;
 import org.lflang.generator.NamedInstance;
@@ -117,12 +114,10 @@
 import org.lflang.lf.WidthTerm;
 import org.lflang.util.FileUtil;
 
-import com.google.inject.Inject;
-
 /**
  * Custom validation checks for Lingua Franca programs.
  *
- * Also see: https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#validation
+ * <p>Also see: https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#validation
  *
  * @author Edward A. Lee
  * @author Marten Lohstroh
@@ -133,1763 +128,1853 @@
  */
 public class LFValidator extends BaseLFValidator {
 
-    //////////////////////////////////////////////////////////////
-    //// Public check methods.
-
-    // These methods are automatically invoked on AST nodes matching
-    // the types of their arguments.
-    // CheckType.FAST ensures that these checks run whenever a file is modified.
-    // Alternatives are CheckType.NORMAL (when saving) and
-    // CheckType.EXPENSIVE (only when right-click, validate).
-    // FIXME: What is the default when nothing is specified?
-
-    // These methods are listed in alphabetical order, and, although
-    // it is isn't strictly required, follow a naming convention
-    // checkClass, where Class is the AST class, where possible.
-
-    @Check(CheckType.FAST)
-    public void checkAction(Action action) {
-        checkName(action.getName(), Literals.VARIABLE__NAME);
-        if (action.getOrigin() == ActionOrigin.NONE) {
-            error(
-                "Action must have modifier {@code logical} or {@code physical}.",
-                Literals.ACTION__ORIGIN
-            );
-        }
-        if (action.getPolicy() != null &&
-            !SPACING_VIOLATION_POLICIES.contains(action.getPolicy())) {
-            error(
-                "Unrecognized spacing violation policy: " + action.getPolicy() +
-                    ". Available policies are: " +
-                    String.join(", ", SPACING_VIOLATION_POLICIES) + ".",
-                Literals.ACTION__POLICY);
-        }
-        checkExpressionIsTime(action.getMinDelay(), Literals.ACTION__MIN_DELAY);
-        checkExpressionIsTime(action.getMinSpacing(), Literals.ACTION__MIN_SPACING);
+  //////////////////////////////////////////////////////////////
+  //// Public check methods.
+
+  // These methods are automatically invoked on AST nodes matching
+  // the types of their arguments.
+  // CheckType.FAST ensures that these checks run whenever a file is modified.
+  // Alternatives are CheckType.NORMAL (when saving) and
+  // CheckType.EXPENSIVE (only when right-click, validate).
+  // FIXME: What is the default when nothing is specified?
+
+  // These methods are listed in alphabetical order, and, although
+  // it is isn't strictly required, follow a naming convention
+  // checkClass, where Class is the AST class, where possible.
+
+  @Check(CheckType.FAST)
+  public void checkAction(Action action) {
+    checkName(action.getName(), Literals.VARIABLE__NAME);
+    if (action.getOrigin() == ActionOrigin.NONE) {
+      error(
+          "Action must have modifier {@code logical} or {@code physical}.",
+          Literals.ACTION__ORIGIN);
     }
-
-
-    @Check(CheckType.FAST)
-    public void checkInitializer(Initializer init) {
-        if (init.isBraces() && target != Target.CPP) {
-            error("Brace initializers are only supported for the C++ target", Literals.INITIALIZER__BRACES);
-        } else if (init.isParens() && target.mandatesEqualsInitializers()) {
-            var message = "This syntax is deprecated in the " + target
-                + " target, use an equal sign instead of parentheses for assignment.";
-            if (init.getExprs().size() == 1) {
-                message += " (run the formatter to fix this automatically)";
-            }
-            warning(message, Literals.INITIALIZER__PARENS);
-        } else if (!init.isAssign() && init.eContainer() instanceof Assignment) {
-            var feature = init.isBraces() ? Literals.INITIALIZER__BRACES
-                : Literals.INITIALIZER__PARENS;
-            var message = "This syntax is deprecated, do not use parentheses or braces but an equal sign.";
-            if (init.getExprs().size() == 1) {
-                message += " (run the formatter to fix this automatically)";
-            }
-            warning(message, feature);
-        }
+    if (action.getPolicy() != null && !SPACING_VIOLATION_POLICIES.contains(action.getPolicy())) {
+      error(
+          "Unrecognized spacing violation policy: "
+              + action.getPolicy()
+              + ". Available policies are: "
+              + String.join(", ", SPACING_VIOLATION_POLICIES)
+              + ".",
+          Literals.ACTION__POLICY);
     }
-
-    @Check(CheckType.FAST)
-    public void checkBracedExpression(BracedListExpression expr) {
-        if (!target.allowsBracedListExpressions()) {
-            var message = "Braced expression lists are not a valid expression for the " + target
-                + " target.";
-            error(message, Literals.BRACED_LIST_EXPRESSION.eContainmentFeature());
-        }
+    checkExpressionIsTime(action.getMinDelay(), Literals.ACTION__MIN_DELAY);
+    checkExpressionIsTime(action.getMinSpacing(), Literals.ACTION__MIN_SPACING);
+  }
+
+  @Check(CheckType.FAST)
+  public void checkInitializer(Initializer init) {
+    if (init.isBraces() && target != Target.CPP) {
+      error(
+          "Brace initializers are only supported for the C++ target", Literals.INITIALIZER__BRACES);
+    } else if (init.isParens() && target.mandatesEqualsInitializers()) {
+      var message =
+          "This syntax is deprecated in the "
+              + target
+              + " target, use an equal sign instead of parentheses for assignment.";
+      if (init.getExprs().size() == 1) {
+        message += " (run the formatter to fix this automatically)";
+      }
+      warning(message, Literals.INITIALIZER__PARENS);
+    } else if (!init.isAssign() && init.eContainer() instanceof Assignment) {
+      var feature = init.isBraces() ? Literals.INITIALIZER__BRACES : Literals.INITIALIZER__PARENS;
+      var message =
+          "This syntax is deprecated, do not use parentheses or braces but an equal sign.";
+      if (init.getExprs().size() == 1) {
+        message += " (run the formatter to fix this automatically)";
+      }
+      warning(message, feature);
     }
-
-    @Check(CheckType.FAST)
-    public void checkAssignment(Assignment assignment) {
-
-        // If the left-hand side is a time parameter, make sure the assignment has units
-        typeCheck(assignment.getRhs(), ASTUtils.getInferredType(assignment.getLhs()), Literals.ASSIGNMENT__RHS);
-        // If this assignment overrides a parameter that is used in a deadline,
-        // report possible overflow.
-        if (isCBasedTarget() &&
-            this.info.overflowingAssignments.contains(assignment)) {
-            error(
-                "Time value used to specify a deadline exceeds the maximum of " +
-                    TimeValue.MAX_LONG_DEADLINE + " nanoseconds.",
-                Literals.ASSIGNMENT__RHS);
-        }
-
+  }
+
+  @Check(CheckType.FAST)
+  public void checkBracedExpression(BracedListExpression expr) {
+    if (!target.allowsBracedListExpressions()) {
+      var message =
+          "Braced expression lists are not a valid expression for the " + target + " target.";
+      error(message, Literals.BRACED_LIST_EXPRESSION.eContainmentFeature());
     }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkAssignment(Assignment assignment) {
+
+    // If the left-hand side is a time parameter, make sure the assignment has units
+    typeCheck(
+        assignment.getRhs(),
+        ASTUtils.getInferredType(assignment.getLhs()),
+        Literals.ASSIGNMENT__RHS);
+    // If this assignment overrides a parameter that is used in a deadline,
+    // report possible overflow.
+    if (isCBasedTarget() && this.info.overflowingAssignments.contains(assignment)) {
+      error(
+          "Time value used to specify a deadline exceeds the maximum of "
+              + TimeValue.MAX_LONG_DEADLINE
+              + " nanoseconds.",
+          Literals.ASSIGNMENT__RHS);
+    }
+  }
 
-    @Check(CheckType.FAST)
-    public void checkConnection(Connection connection) {
-
-        // Report if connection is part of a cycle.
-        Set<NamedInstance<?>> cycles = this.info.topologyCycles();
-        for (VarRef lp : connection.getLeftPorts()) {
-            for (VarRef rp : connection.getRightPorts()) {
-                boolean leftInCycle = false;
-
-                for (NamedInstance<?> it : cycles) {
-                    if ((lp.getContainer() == null && it.getDefinition().equals(lp.getVariable()))
-                        || (it.getDefinition().equals(lp.getVariable()) && it.getParent().equals(lp.getContainer()))) {
-                        leftInCycle = true;
-                        break;
-                    }
-                }
-
-                for (NamedInstance<?> it : cycles) {
-                    if ((rp.getContainer() == null && it.getDefinition().equals(rp.getVariable()))
-                        || (it.getDefinition().equals(rp.getVariable()) && it.getParent().equals(rp.getContainer()))) {
-                        if (leftInCycle) {
-                            Reactor reactor = ASTUtils.getEnclosingReactor(connection);
-                            String reactorName = reactor.getName();
-                            error(String.format("Connection in reactor %s creates", reactorName) +
-                                  String.format("a cyclic dependency between %s and %s.", toOriginalText(lp), toOriginalText(rp)),
-                                  Literals.CONNECTION__DELAY);
-                        }
-                    }
-                }
-            }
-        }
-
-        // FIXME: look up all ReactorInstance objects that have a definition equal to the
-        // container of this connection. For each of those occurrences, the widths have to match.
-        // For the C target, since C has such a weak type system, check that
-        // the types on both sides of every connection match. For other languages,
-        // we leave type compatibility that language's compiler or interpreter.
-        if (isCBasedTarget()) {
-            Type type = (Type) null;
-            for (VarRef port : (Iterable<? extends VarRef>) () -> Stream.concat(
-                        connection.getLeftPorts().stream(),
-                        connection.getRightPorts().stream()
-                    ).iterator()) {
-                // If the variable is not a port, then there is some other
-                // error. Avoid a class cast exception.
-                if (port.getVariable() instanceof Port) {
-                    if (type == null) {
-                        type = ((Port) port.getVariable()).getType();
-                    } else {
-                        var portType = ((Port) port.getVariable()).getType();
-                        portType = port.getContainer() == null ? portType : new TypeParameterizedReactor(port.getContainer()).resolveType(portType);
-                        if (!sameType(type, portType)) {
-                            error("Types do not match.", Literals.CONNECTION__LEFT_PORTS);
-                        }
-                    }
-                }
-            }
-        }
+  @Check(CheckType.FAST)
+  public void checkConnection(Connection connection) {
 
-        // Check whether the total width of the left side of the connection
-        // matches the total width of the right side. This cannot be determined
-        // here if the width is not given as a constant. In that case, it is up
-        // to the code generator to check it.
-        int leftWidth = 0;
-        for (VarRef port : connection.getLeftPorts()) {
-            int width = inferPortWidth(port, null, null); // null args imply incomplete check.
-            if (width < 0 || leftWidth < 0) {
-                // Cannot determine the width of the left ports.
-                leftWidth = -1;
-            } else {
-                leftWidth += width;
-            }
-        }
-        int rightWidth = 0;
-        for (VarRef port : connection.getRightPorts()) {
-            int width = inferPortWidth(port, null, null); // null args imply incomplete check.
-            if (width < 0 || rightWidth < 0) {
-                // Cannot determine the width of the left ports.
-                rightWidth = -1;
-            } else {
-                rightWidth += width;
-            }
-        }
+    // Report if connection is part of a cycle.
+    Set<NamedInstance<?>> cycles = this.info.topologyCycles();
+    for (VarRef lp : connection.getLeftPorts()) {
+      for (VarRef rp : connection.getRightPorts()) {
+        boolean leftInCycle = false;
 
-        if (leftWidth != -1 && rightWidth != -1 && leftWidth != rightWidth) {
-            if (connection.isIterated()) {
-                if (leftWidth == 0 || rightWidth % leftWidth != 0) {
-                    // FIXME: The second argument should be Literals.CONNECTION, but
-                    // stupidly, xtext will not accept that. There seems to be no way to
-                    // report an error for the whole connection statement.
-                    warning(String.format("Left width %s does not divide right width %s", leftWidth, rightWidth),
-                            Literals.CONNECTION__LEFT_PORTS
-                    );
-                }
-            } else {
-                // FIXME: The second argument should be Literals.CONNECTION, but
-                // stupidly, xtext will not accept that. There seems to be no way to
-                // report an error for the whole connection statement.
-                warning(String.format("Left width %s does not match right width %s", leftWidth, rightWidth),
-                        Literals.CONNECTION__LEFT_PORTS
-                );
-            }
-        }
-
-        Reactor reactor = ASTUtils.getEnclosingReactor(connection);
-
-        // Make sure the right port is not already an effect of a reaction.
-        for (Reaction reaction : ASTUtils.allReactions(reactor)) {
-            for (VarRef effect : reaction.getEffects()) {
-                for (VarRef rightPort : connection.getRightPorts()) {
-                    if (rightPort.getVariable().equals(effect.getVariable()) && // Refers to the same variable
-                        rightPort.getContainer() == effect.getContainer() && // Refers to the same instance
-                        (   reaction.eContainer() instanceof Reactor || // Either is not part of a mode
-                            connection.eContainer() instanceof Reactor ||
-                            connection.eContainer() == reaction.eContainer() // Or they are in the same mode
-                        )) {
-                        error("Cannot connect: Port named '" + effect.getVariable().getName() +
-                            "' is already effect of a reaction.",
-                            Literals.CONNECTION__RIGHT_PORTS);
-                    }
-                }
-            }
+        for (NamedInstance<?> it : cycles) {
+          if ((lp.getContainer() == null && it.getDefinition().equals(lp.getVariable()))
+              || (it.getDefinition().equals(lp.getVariable())
+                  && it.getParent().equals(lp.getContainer()))) {
+            leftInCycle = true;
+            break;
+          }
         }
 
-        // Check that the right port does not already have some other
-        // upstream connection.
-        for (Connection c : reactor.getConnections()) {
-            if (c != connection) {
-                for (VarRef thisRightPort : connection.getRightPorts()) {
-                    for (VarRef thatRightPort : c.getRightPorts()) {
-                        if (thisRightPort.getVariable().equals(thatRightPort.getVariable()) && // Refers to the same variable
-                            thisRightPort.getContainer() == thatRightPort.getContainer() && // Refers to the same instance
-                            (   connection.eContainer() instanceof Reactor || // Or either of the connections in not part of a mode
-                                c.eContainer() instanceof Reactor ||
-                                connection.eContainer() == c.eContainer() // Or they are in the same mode
-                            )) {
-                            error(
-                                "Cannot connect: Port named '" + thisRightPort.getVariable().getName() +
-                                    "' may only appear once on the right side of a connection.",
-                                Literals.CONNECTION__RIGHT_PORTS);
-                        }
-                    }
-                }
+        for (NamedInstance<?> it : cycles) {
+          if ((rp.getContainer() == null && it.getDefinition().equals(rp.getVariable()))
+              || (it.getDefinition().equals(rp.getVariable())
+                  && it.getParent().equals(rp.getContainer()))) {
+            if (leftInCycle) {
+              Reactor reactor = ASTUtils.getEnclosingReactor(connection);
+              String reactorName = reactor.getName();
+              error(
+                  String.format("Connection in reactor %s creates", reactorName)
+                      + String.format(
+                          "a cyclic dependency between %s and %s.",
+                          toOriginalText(lp), toOriginalText(rp)),
+                  Literals.CONNECTION__DELAY);
             }
+          }
         }
+      }
+    }
 
-        // Check the after delay
-        if (connection.getDelay() != null) {
-            final var delay = connection.getDelay();
-            if (delay instanceof ParameterReference || delay instanceof Time || delay instanceof Literal) {
-                checkExpressionIsTime(delay, Literals.CONNECTION__DELAY);
-            } else {
-                error("After delays can only be given by time literals or parameters.",
-                      Literals.CONNECTION__DELAY);
+    // FIXME: look up all ReactorInstance objects that have a definition equal to the
+    // container of this connection. For each of those occurrences, the widths have to match.
+    // For the C target, since C has such a weak type system, check that
+    // the types on both sides of every connection match. For other languages,
+    // we leave type compatibility that language's compiler or interpreter.
+    if (isCBasedTarget()) {
+      Type type = (Type) null;
+      for (VarRef port :
+          (Iterable<? extends VarRef>)
+              () ->
+                  Stream.concat(
+                          connection.getLeftPorts().stream(), connection.getRightPorts().stream())
+                      .iterator()) {
+        // If the variable is not a port, then there is some other
+        // error. Avoid a class cast exception.
+        if (port.getVariable() instanceof Port) {
+          if (type == null) {
+            type = ((Port) port.getVariable()).getType();
+          } else {
+            var portType = ((Port) port.getVariable()).getType();
+            portType =
+                port.getContainer() == null
+                    ? portType
+                    : new TypeParameterizedReactor(port.getContainer()).resolveType(portType);
+            if (!sameType(type, portType)) {
+              error("Types do not match.", Literals.CONNECTION__LEFT_PORTS);
             }
+          }
         }
+      }
     }
 
-    @Check(CheckType.FAST)
-    public void checkDeadline(Deadline deadline) {
-        if (isCBasedTarget() &&
-            this.info.overflowingDeadlines.contains(deadline)) {
-            error(
-                "Deadline exceeds the maximum of " +
-                    TimeValue.MAX_LONG_DEADLINE + " nanoseconds.",
-                Literals.DEADLINE__DELAY);
-        }
-        checkExpressionIsTime(deadline.getDelay(), Literals.DEADLINE__DELAY);
+    // Check whether the total width of the left side of the connection
+    // matches the total width of the right side. This cannot be determined
+    // here if the width is not given as a constant. In that case, it is up
+    // to the code generator to check it.
+    int leftWidth = 0;
+    for (VarRef port : connection.getLeftPorts()) {
+      int width = inferPortWidth(port, null, null); // null args imply incomplete check.
+      if (width < 0 || leftWidth < 0) {
+        // Cannot determine the width of the left ports.
+        leftWidth = -1;
+      } else {
+        leftWidth += width;
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkHost(Host host) {
-        String addr = host.getAddr();
-        String user = host.getUser();
-        if (user != null && !user.matches(USERNAME_REGEX)) {
-            warning(
-                "Invalid user name.",
-                Literals.HOST__USER
-            );
-        }
-        if (host instanceof IPV4Host && !addr.matches(IPV4_REGEX)) {
-            warning(
-                "Invalid IP address.",
-                Literals.HOST__ADDR
-            );
-        } else if (host instanceof IPV6Host && !addr.matches(IPV6_REGEX)) {
-            warning(
-                "Invalid IP address.",
-                Literals.HOST__ADDR
-            );
-        } else if (host instanceof NamedHost && !addr.matches(HOST_OR_FQN_REGEX)) {
-            warning(
-                "Invalid host name or fully qualified domain name.",
-                Literals.HOST__ADDR
-            );
-        }
+    int rightWidth = 0;
+    for (VarRef port : connection.getRightPorts()) {
+      int width = inferPortWidth(port, null, null); // null args imply incomplete check.
+      if (width < 0 || rightWidth < 0) {
+        // Cannot determine the width of the left ports.
+        rightWidth = -1;
+      } else {
+        rightWidth += width;
+      }
     }
 
-   @Check
-    public void checkImport(Import imp) {
-        if (toDefinition(imp.getReactorClasses().get(0)).eResource().getErrors().size() > 0) {
-            error("Error loading resource.", Literals.IMPORT__IMPORT_URI); // FIXME: print specifics.
-            return;
-        }
-
-        // FIXME: report error if resource cannot be resolved.
-        for (ImportedReactor reactor : imp.getReactorClasses()) {
-            if (!isUnused(reactor)) {
-                return;
-            }
-        }
-        warning("Unused import.", Literals.IMPORT__IMPORT_URI);
+    if (leftWidth != -1 && rightWidth != -1 && leftWidth != rightWidth) {
+      if (connection.isIterated()) {
+        if (leftWidth == 0 || rightWidth % leftWidth != 0) {
+          // FIXME: The second argument should be Literals.CONNECTION, but
+          // stupidly, xtext will not accept that. There seems to be no way to
+          // report an error for the whole connection statement.
+          warning(
+              String.format("Left width %s does not divide right width %s", leftWidth, rightWidth),
+              Literals.CONNECTION__LEFT_PORTS);
+        }
+      } else {
+        // FIXME: The second argument should be Literals.CONNECTION, but
+        // stupidly, xtext will not accept that. There seems to be no way to
+        // report an error for the whole connection statement.
+        warning(
+            String.format("Left width %s does not match right width %s", leftWidth, rightWidth),
+            Literals.CONNECTION__LEFT_PORTS);
+      }
     }
 
-    @Check
-    public void checkImportedReactor(ImportedReactor reactor) {
-        if (isUnused(reactor)) {
-            warning("Unused reactor class.",
-                Literals.IMPORTED_REACTOR__REACTOR_CLASS);
-        }
-
-        if (info.instantiationGraph.hasCycles()) {
-            Set<Reactor> cycleSet = new HashSet<>();
-            for (Set<Reactor> cycle : info.instantiationGraph.getCycles()) {
-                cycleSet.addAll(cycle);
-            }
-            if (dependsOnCycle(toDefinition(reactor), cycleSet, new HashSet<>())) {
-                error("Imported reactor '" + toDefinition(reactor).getName() +
-                      "' has cyclic instantiation in it.", Literals.IMPORTED_REACTOR__REACTOR_CLASS);
-            }
+    Reactor reactor = ASTUtils.getEnclosingReactor(connection);
+
+    // Make sure the right port is not already an effect of a reaction.
+    for (Reaction reaction : ASTUtils.allReactions(reactor)) {
+      for (VarRef effect : reaction.getEffects()) {
+        for (VarRef rightPort : connection.getRightPorts()) {
+          if (rightPort.getVariable().equals(effect.getVariable())
+              && // Refers to the same variable
+              rightPort.getContainer() == effect.getContainer()
+              && // Refers to the same instance
+              (reaction.eContainer() instanceof Reactor
+                  || // Either is not part of a mode
+                  connection.eContainer() instanceof Reactor
+                  || connection.eContainer()
+                      == reaction.eContainer() // Or they are in the same mode
+              )) {
+            error(
+                "Cannot connect: Port named '"
+                    + effect.getVariable().getName()
+                    + "' is already effect of a reaction.",
+                Literals.CONNECTION__RIGHT_PORTS);
+          }
         }
+      }
     }
 
-    @Check(CheckType.FAST)
-    public void checkInput(Input input) {
-        Reactor parent = (Reactor)input.eContainer();
-        if (parent.isMain() || parent.isFederated()) {
-            error("Main reactor cannot have inputs.", Literals.VARIABLE__NAME);
-        }
-        checkName(input.getName(), Literals.VARIABLE__NAME);
-        if (target.requiresTypes) {
-            if (input.getType() == null) {
-                error("Input must have a type.", Literals.TYPED_VARIABLE__TYPE);
+    // Check that the right port does not already have some other
+    // upstream connection.
+    for (Connection c : reactor.getConnections()) {
+      if (c != connection) {
+        for (VarRef thisRightPort : connection.getRightPorts()) {
+          for (VarRef thatRightPort : c.getRightPorts()) {
+            if (thisRightPort.getVariable().equals(thatRightPort.getVariable())
+                && // Refers to the same variable
+                thisRightPort.getContainer() == thatRightPort.getContainer()
+                && // Refers to the same instance
+                (connection.eContainer() instanceof Reactor
+                    || // Or either of the connections in not part of a mode
+                    c.eContainer() instanceof Reactor
+                    || connection.eContainer() == c.eContainer() // Or they are in the same mode
+                )) {
+              error(
+                  "Cannot connect: Port named '"
+                      + thisRightPort.getVariable().getName()
+                      + "' may only appear once on the right side of a connection.",
+                  Literals.CONNECTION__RIGHT_PORTS);
             }
+          }
         }
-
-        // mutable has no meaning in C++
-        if (input.isMutable() && this.target == Target.CPP) {
-            warning(
-                "The mutable qualifier has no meaning for the C++ target and should be removed. " +
-                "In C++, any value can be made mutable by calling get_mutable_copy().",
-                Literals.INPUT__MUTABLE
-            );
-        }
-
-        // Variable width multiports are not supported (yet?).
-        if (input.getWidthSpec() != null && input.getWidthSpec().isOfVariableLength()) {
-            error("Variable-width multiports are not supported.", Literals.PORT__WIDTH_SPEC);
-        }
+      }
     }
 
-    @Check(CheckType.FAST)
-    public void checkInstantiation(Instantiation instantiation) {
-        checkName(instantiation.getName(), Literals.INSTANTIATION__NAME);
-        Reactor reactor = toDefinition(instantiation.getReactorClass());
-        if (reactor.isMain() || reactor.isFederated()) {
-            error(
-                "Cannot instantiate a main (or federated) reactor: " +
-                    instantiation.getReactorClass().getName(),
-                Literals.INSTANTIATION__REACTOR_CLASS
-            );
-        }
+    // Check the after delay
+    if (connection.getDelay() != null) {
+      final var delay = connection.getDelay();
+      if (delay instanceof ParameterReference
+          || delay instanceof Time
+          || delay instanceof Literal) {
+        checkExpressionIsTime(delay, Literals.CONNECTION__DELAY);
+      } else {
+        error(
+            "After delays can only be given by time literals or parameters.",
+            Literals.CONNECTION__DELAY);
+      }
+    }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkDeadline(Deadline deadline) {
+    if (isCBasedTarget() && this.info.overflowingDeadlines.contains(deadline)) {
+      error(
+          "Deadline exceeds the maximum of " + TimeValue.MAX_LONG_DEADLINE + " nanoseconds.",
+          Literals.DEADLINE__DELAY);
+    }
+    checkExpressionIsTime(deadline.getDelay(), Literals.DEADLINE__DELAY);
+  }
+
+  @Check(CheckType.FAST)
+  public void checkHost(Host host) {
+    String addr = host.getAddr();
+    String user = host.getUser();
+    if (user != null && !user.matches(USERNAME_REGEX)) {
+      warning("Invalid user name.", Literals.HOST__USER);
+    }
+    if (host instanceof IPV4Host && !addr.matches(IPV4_REGEX)) {
+      warning("Invalid IP address.", Literals.HOST__ADDR);
+    } else if (host instanceof IPV6Host && !addr.matches(IPV6_REGEX)) {
+      warning("Invalid IP address.", Literals.HOST__ADDR);
+    } else if (host instanceof NamedHost && !addr.matches(HOST_OR_FQN_REGEX)) {
+      warning("Invalid host name or fully qualified domain name.", Literals.HOST__ADDR);
+    }
+  }
 
-        // Report error if this instantiation is part of a cycle.
-        // FIXME: improve error message.
-        // FIXME: Also report if there exists a cycle within.
-        if (this.info.instantiationGraph.getCycles().size() > 0) {
-            for (Set<Reactor> cycle : this.info.instantiationGraph.getCycles()) {
-                Reactor container = (Reactor) instantiation.eContainer();
-                if (cycle.contains(container) && cycle.contains(reactor)) {
-                    List<String> names = new ArrayList<>();
-                    for (Reactor r : cycle) {
-                        names.add(r.getName());
-                    }
-
-                    error(
-                        "Instantiation is part of a cycle: " + String.join(", ", names) + ".",
-                        Literals.INSTANTIATION__REACTOR_CLASS
-                    );
-                }
-            }
-        }
-        // Variable width multiports are not supported (yet?).
-        if (instantiation.getWidthSpec() != null
-                && instantiation.getWidthSpec().isOfVariableLength()
-        ) {
-            if (isCBasedTarget()) {
-                warning("Variable-width banks are for internal use only.",
-                    Literals.INSTANTIATION__WIDTH_SPEC
-                );
-            } else {
-                error("Variable-width banks are not supported.",
-                    Literals.INSTANTIATION__WIDTH_SPEC
-                );
-            }
-        }
+  @Check
+  public void checkImport(Import imp) {
+    if (toDefinition(imp.getReactorClasses().get(0)).eResource().getErrors().size() > 0) {
+      error("Error loading resource.", Literals.IMPORT__IMPORT_URI); // FIXME: print specifics.
+      return;
     }
 
-    /** Check target parameters, which are key-value pairs. */
-    @Check(CheckType.FAST)
-    public void checkKeyValuePair(KeyValuePair param) {
-        // Check only if the container's container is a Target.
-        if (param.eContainer().eContainer() instanceof TargetDecl) {
-            TargetProperty prop = TargetProperty.forName(param.getName());
-
-            // Make sure the key is valid.
-            if (prop == null) {
-                String options = TargetProperty.getOptions().stream()
-                                               .map(p -> p.description).sorted()
-                                               .collect(Collectors.joining(", "));
-                warning(
-                    "Unrecognized target parameter: " + param.getName() +
-                        ". Recognized parameters are: " + options,
-                    Literals.KEY_VALUE_PAIR__NAME);
-            } else {
-                // Check whether the property is supported by the target.
-                if (!prop.supportedBy.contains(this.target)) {
-                    warning(
-                        "The target parameter: " + param.getName() +
-                            " is not supported by the " + this.target +
-                            " target and will thus be ignored.",
-                        Literals.KEY_VALUE_PAIR__NAME);
-                }
+    // FIXME: report error if resource cannot be resolved.
+    for (ImportedReactor reactor : imp.getReactorClasses()) {
+      if (!isUnused(reactor)) {
+        return;
+      }
+    }
+    warning("Unused import.", Literals.IMPORT__IMPORT_URI);
+  }
 
-                // Report problem with the assigned value.
-                prop.type.check(param.getValue(), param.getName(), this);
-            }
+  @Check
+  public void checkImportedReactor(ImportedReactor reactor) {
+    if (isUnused(reactor)) {
+      warning("Unused reactor class.", Literals.IMPORTED_REACTOR__REACTOR_CLASS);
+    }
 
-            for (String it : targetPropertyErrors) {
-                error(it, Literals.KEY_VALUE_PAIR__VALUE);
-            }
-            targetPropertyErrors.clear();
+    if (info.instantiationGraph.hasCycles()) {
+      Set<Reactor> cycleSet = new HashSet<>();
+      for (Set<Reactor> cycle : info.instantiationGraph.getCycles()) {
+        cycleSet.addAll(cycle);
+      }
+      if (dependsOnCycle(toDefinition(reactor), cycleSet, new HashSet<>())) {
+        error(
+            "Imported reactor '"
+                + toDefinition(reactor).getName()
+                + "' has cyclic instantiation in it.",
+            Literals.IMPORTED_REACTOR__REACTOR_CLASS);
+      }
+    }
+  }
 
-            for (String it : targetPropertyWarnings) {
-                error(it, Literals.KEY_VALUE_PAIR__VALUE);
-            }
-            targetPropertyWarnings.clear();
-        }
+  @Check(CheckType.FAST)
+  public void checkInput(Input input) {
+    Reactor parent = (Reactor) input.eContainer();
+    if (parent.isMain() || parent.isFederated()) {
+      error("Main reactor cannot have inputs.", Literals.VARIABLE__NAME);
+    }
+    checkName(input.getName(), Literals.VARIABLE__NAME);
+    if (target.requiresTypes) {
+      if (input.getType() == null) {
+        error("Input must have a type.", Literals.TYPED_VARIABLE__TYPE);
+      }
     }
 
-    @Check(CheckType.FAST)
-    public void checkModel(Model model) {
-        // Since we're doing a fast check, we only want to update
-        // if the model info hasn't been initialized yet. If it has,
-        // we use the old information and update it during a normal
-        // check (see below).
-        if (!info.updated) {
-            info.update(model, errorReporter);
-        }
+    // mutable has no meaning in C++
+    if (input.isMutable() && this.target == Target.CPP) {
+      warning(
+          "The mutable qualifier has no meaning for the C++ target and should be removed. "
+              + "In C++, any value can be made mutable by calling get_mutable_copy().",
+          Literals.INPUT__MUTABLE);
     }
 
-    @Check(CheckType.NORMAL)
-    public void updateModelInfo(Model model) {
-        info.update(model, errorReporter);
+    // Variable width multiports are not supported (yet?).
+    if (input.getWidthSpec() != null && input.getWidthSpec().isOfVariableLength()) {
+      error("Variable-width multiports are not supported.", Literals.PORT__WIDTH_SPEC);
+    }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkInstantiation(Instantiation instantiation) {
+    checkName(instantiation.getName(), Literals.INSTANTIATION__NAME);
+    Reactor reactor = toDefinition(instantiation.getReactorClass());
+    if (reactor.isMain() || reactor.isFederated()) {
+      error(
+          "Cannot instantiate a main (or federated) reactor: "
+              + instantiation.getReactorClass().getName(),
+          Literals.INSTANTIATION__REACTOR_CLASS);
     }
 
-    @Check(CheckType.FAST)
-    public void checkOutput(Output output) {
-        Reactor parent = (Reactor)output.eContainer();
-        if (parent.isMain() || parent.isFederated()) {
-            error("Main reactor cannot have outputs.", Literals.VARIABLE__NAME);
-        }
-        checkName(output.getName(), Literals.VARIABLE__NAME);
-        if (this.target.requiresTypes) {
-            if (output.getType() == null) {
-                error("Output must have a type.", Literals.TYPED_VARIABLE__TYPE);
-            }
-        }
+    // Report error if this instantiation is part of a cycle.
+    // FIXME: improve error message.
+    // FIXME: Also report if there exists a cycle within.
+    if (this.info.instantiationGraph.getCycles().size() > 0) {
+      for (Set<Reactor> cycle : this.info.instantiationGraph.getCycles()) {
+        Reactor container = (Reactor) instantiation.eContainer();
+        if (cycle.contains(container) && cycle.contains(reactor)) {
+          List<String> names = new ArrayList<>();
+          for (Reactor r : cycle) {
+            names.add(r.getName());
+          }
 
-        // Variable width multiports are not supported (yet?).
-        if (output.getWidthSpec() != null && output.getWidthSpec().isOfVariableLength()) {
-            error("Variable-width multiports are not supported.", Literals.PORT__WIDTH_SPEC);
+          error(
+              "Instantiation is part of a cycle: " + String.join(", ", names) + ".",
+              Literals.INSTANTIATION__REACTOR_CLASS);
         }
+      }
+    }
+    // Variable width multiports are not supported (yet?).
+    if (instantiation.getWidthSpec() != null && instantiation.getWidthSpec().isOfVariableLength()) {
+      if (isCBasedTarget()) {
+        warning(
+            "Variable-width banks are for internal use only.", Literals.INSTANTIATION__WIDTH_SPEC);
+      } else {
+        error("Variable-width banks are not supported.", Literals.INSTANTIATION__WIDTH_SPEC);
+      }
+    }
+  }
+
+  /** Check target parameters, which are key-value pairs. */
+  @Check(CheckType.FAST)
+  public void checkKeyValuePair(KeyValuePair param) {
+    // Check only if the container's container is a Target.
+    if (param.eContainer().eContainer() instanceof TargetDecl) {
+      TargetProperty prop = TargetProperty.forName(param.getName());
+
+      // Make sure the key is valid.
+      if (prop == null) {
+        String options =
+            TargetProperty.getOptions().stream()
+                .map(p -> p.description)
+                .sorted()
+                .collect(Collectors.joining(", "));
+        warning(
+            "Unrecognized target parameter: "
+                + param.getName()
+                + ". Recognized parameters are: "
+                + options,
+            Literals.KEY_VALUE_PAIR__NAME);
+      } else {
+        // Check whether the property is supported by the target.
+        if (!prop.supportedBy.contains(this.target)) {
+          warning(
+              "The target parameter: "
+                  + param.getName()
+                  + " is not supported by the "
+                  + this.target
+                  + " target and will thus be ignored.",
+              Literals.KEY_VALUE_PAIR__NAME);
+        }
+
+        // Report problem with the assigned value.
+        prop.type.check(param.getValue(), param.getName(), this);
+      }
+
+      for (String it : targetPropertyErrors) {
+        error(it, Literals.KEY_VALUE_PAIR__VALUE);
+      }
+      targetPropertyErrors.clear();
+
+      for (String it : targetPropertyWarnings) {
+        error(it, Literals.KEY_VALUE_PAIR__VALUE);
+      }
+      targetPropertyWarnings.clear();
+    }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkModel(Model model) {
+    // Since we're doing a fast check, we only want to update
+    // if the model info hasn't been initialized yet. If it has,
+    // we use the old information and update it during a normal
+    // check (see below).
+    if (!info.updated) {
+      info.update(model, errorReporter);
+    }
+  }
+
+  @Check(CheckType.NORMAL)
+  public void updateModelInfo(Model model) {
+    info.update(model, errorReporter);
+  }
+
+  @Check(CheckType.FAST)
+  public void checkOutput(Output output) {
+    Reactor parent = (Reactor) output.eContainer();
+    if (parent.isMain() || parent.isFederated()) {
+      error("Main reactor cannot have outputs.", Literals.VARIABLE__NAME);
+    }
+    checkName(output.getName(), Literals.VARIABLE__NAME);
+    if (this.target.requiresTypes) {
+      if (output.getType() == null) {
+        error("Output must have a type.", Literals.TYPED_VARIABLE__TYPE);
+      }
     }
 
-    @Check(CheckType.FAST)
-    public void checkParameter(Parameter param) {
-        checkName(param.getName(), Literals.PARAMETER__NAME);
-
-        if (param.getInit() == null) {
-            // todo make initialization non-mandatory
-            //  https://github.com/lf-lang/lingua-franca/issues/623
-            error("Parameter must have a default value.", Literals.PARAMETER__INIT);
-            return;
-        }
+    // Variable width multiports are not supported (yet?).
+    if (output.getWidthSpec() != null && output.getWidthSpec().isOfVariableLength()) {
+      error("Variable-width multiports are not supported.", Literals.PORT__WIDTH_SPEC);
+    }
+  }
 
-        if (this.target.requiresTypes) {
-            // Report missing target type. param.inferredType.undefine
-            if (ASTUtils.getInferredType(param).isUndefined()) {
-                error("Type declaration missing.", Literals.PARAMETER__TYPE);
-            }
-        }
+  @Check(CheckType.FAST)
+  public void checkParameter(Parameter param) {
+    checkName(param.getName(), Literals.PARAMETER__NAME);
 
-        if (param.getType() != null) {
-            typeCheck(param.getInit(), ASTUtils.getInferredType(param), Literals.PARAMETER__INIT);
-        }
+    if (param.getInit() == null) {
+      // todo make initialization non-mandatory
+      //  https://github.com/lf-lang/lingua-franca/issues/623
+      error("Parameter must have a default value.", Literals.PARAMETER__INIT);
+      return;
+    }
 
-        if (param.getInit() != null) {
-            for (Expression expr : param.getInit().getExprs()) {
-                if (expr instanceof ParameterReference) {
-                    // Initialization using parameters is forbidden.
-                    error("Parameter cannot be initialized using parameter.",
-                        Literals.PARAMETER__INIT);
-                }
-            }
-        }
+    if (this.target.requiresTypes) {
+      // Report missing target type. param.inferredType.undefine
+      if (ASTUtils.getInferredType(param).isUndefined()) {
+        error("Type declaration missing.", Literals.PARAMETER__TYPE);
+      }
+    }
 
-        if (this.target == Target.CPP) {
-            EObject container = param.eContainer();
-            Reactor reactor = (Reactor) container;
-            if (reactor.isMain()) {
-                // we need to check for the cli parameters that are always taken
-                List<String> cliParams = List.of("t", "threads", "o", "timeout", "f", "fast", "help");
-                if (cliParams.contains(param.getName())) {
-                    error("Parameter '" + param.getName()
-                            + "' is already in use as command line argument by Lingua Franca,",
-                        Literals.PARAMETER__NAME);
-                }
-            }
-        }
+    if (param.getType() != null) {
+      typeCheck(param.getInit(), ASTUtils.getInferredType(param), Literals.PARAMETER__INIT);
+    }
 
-        if (isCBasedTarget() &&
-            this.info.overflowingParameters.contains(param)) {
-            error(
-                "Time value used to specify a deadline exceeds the maximum of " +
-                    TimeValue.MAX_LONG_DEADLINE + " nanoseconds.",
-                Literals.PARAMETER__INIT);
+    if (param.getInit() != null) {
+      for (Expression expr : param.getInit().getExprs()) {
+        if (expr instanceof ParameterReference) {
+          // Initialization using parameters is forbidden.
+          error("Parameter cannot be initialized using parameter.", Literals.PARAMETER__INIT);
         }
+      }
+    }
 
+    if (this.target == Target.CPP) {
+      EObject container = param.eContainer();
+      Reactor reactor = (Reactor) container;
+      if (reactor.isMain()) {
+        // we need to check for the cli parameters that are always taken
+        List<String> cliParams = List.of("t", "threads", "o", "timeout", "f", "fast", "help");
+        if (cliParams.contains(param.getName())) {
+          error(
+              "Parameter '"
+                  + param.getName()
+                  + "' is already in use as command line argument by Lingua Franca,",
+              Literals.PARAMETER__NAME);
+        }
+      }
     }
 
-    @Check(CheckType.FAST)
-    public void checkPreamble(Preamble preamble) {
-        if (this.target == Target.CPP) {
-            if (preamble.getVisibility() == Visibility.NONE) {
-                error(
-                    "Preambles for the C++ target need a visibility qualifier (private or public)!",
-                    Literals.PREAMBLE__VISIBILITY
-                );
-            } else if (preamble.getVisibility() == Visibility.PRIVATE) {
-                EObject container = preamble.eContainer();
-                if (container != null && container instanceof Reactor) {
-                    Reactor reactor = (Reactor) container;
-                    if (isGeneric(reactor)) {
-                        warning(
-                            "Private preambles in generic reactors are not truly private. " +
-                                "Since the generated code is placed in a *_impl.hh file, it will " +
-                                "be visible on the public interface. Consider using a public " +
-                                "preamble within the reactor or a private preamble on file scope.",
-                            Literals.PREAMBLE__VISIBILITY);
-                    }
-                }
-            }
-        } else if (preamble.getVisibility() != Visibility.NONE) {
+    if (isCBasedTarget() && this.info.overflowingParameters.contains(param)) {
+      error(
+          "Time value used to specify a deadline exceeds the maximum of "
+              + TimeValue.MAX_LONG_DEADLINE
+              + " nanoseconds.",
+          Literals.PARAMETER__INIT);
+    }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkPreamble(Preamble preamble) {
+    if (this.target == Target.CPP) {
+      if (preamble.getVisibility() == Visibility.NONE) {
+        error(
+            "Preambles for the C++ target need a visibility qualifier (private or public)!",
+            Literals.PREAMBLE__VISIBILITY);
+      } else if (preamble.getVisibility() == Visibility.PRIVATE) {
+        EObject container = preamble.eContainer();
+        if (container != null && container instanceof Reactor) {
+          Reactor reactor = (Reactor) container;
+          if (isGeneric(reactor)) {
             warning(
-                String.format("The %s qualifier has no meaning for the %s target. It should be removed.",
-                              preamble.getVisibility(), this.target.name()),
-                Literals.PREAMBLE__VISIBILITY
-            );
+                "Private preambles in generic reactors are not truly private. "
+                    + "Since the generated code is placed in a *_impl.hh file, it will "
+                    + "be visible on the public interface. Consider using a public "
+                    + "preamble within the reactor or a private preamble on file scope.",
+                Literals.PREAMBLE__VISIBILITY);
+          }
         }
+      }
+    } else if (preamble.getVisibility() != Visibility.NONE) {
+      warning(
+          String.format(
+              "The %s qualifier has no meaning for the %s target. It should be removed.",
+              preamble.getVisibility(), this.target.name()),
+          Literals.PREAMBLE__VISIBILITY);
     }
+  }
 
-    @Check(CheckType.FAST)
-    public void checkReaction(Reaction reaction) {
-
-        if (reaction.getTriggers() == null || reaction.getTriggers().size() == 0) {
-            warning("Reaction has no trigger.", Literals.REACTION__TRIGGERS);
-        }
-        HashSet<Variable> triggers = new HashSet<>();
-        // Make sure input triggers have no container and output sources do.
-        for (TriggerRef trigger : reaction.getTriggers()) {
-            if (trigger instanceof VarRef) {
-                VarRef triggerVarRef = (VarRef) trigger;
-                triggers.add(triggerVarRef.getVariable());
-                if (triggerVarRef instanceof Input) {
-                    if (triggerVarRef.getContainer() != null) {
-                        error(String.format("Cannot have an input of a contained reactor as a trigger: %s.%s", triggerVarRef.getContainer().getName(), triggerVarRef.getVariable().getName()),
-                        Literals.REACTION__TRIGGERS);
-                    }
-                } else if (triggerVarRef.getVariable() instanceof Output) {
-                    if (triggerVarRef.getContainer() == null) {
-                        error(String.format("Cannot have an output of this reactor as a trigger: %s", triggerVarRef.getVariable().getName()),
-                            Literals.REACTION__TRIGGERS);
-                    }
-                }
-            }
-        }
-
-        // Make sure input sources have no container and output sources do.
-        // Also check that a source is not already listed as a trigger.
-        for (VarRef source : reaction.getSources()) {
-            if (triggers.contains(source.getVariable())) {
-                error(String.format("Source is already listed as a trigger: %s", source.getVariable().getName()),
-                    Literals.REACTION__SOURCES);
-            }
-            if (source.getVariable() instanceof Input) {
-                if (source.getContainer() != null) {
-                    error(String.format("Cannot have an input of a contained reactor as a source: %s.%s", source.getContainer().getName(), source.getVariable().getName()),
-                        Literals.REACTION__SOURCES);
-                }
-            } else if (source.getVariable() instanceof Output) {
-                if (source.getContainer() == null) {
-                    error(String.format("Cannot have an output of this reactor as a source: %s", source.getVariable().getName()),
-                        Literals.REACTION__SOURCES);
-                }
-            }
-        }
-
-        // Make sure output effects have no container and input effects do.
-        for (VarRef effect : reaction.getEffects()) {
-            if (effect.getVariable() instanceof Input) {
-                if (effect.getContainer() == null) {
-                    error(String.format("Cannot have an input of this reactor as an effect: %s", effect.getVariable().getName()),
-                        Literals.REACTION__EFFECTS);
-                }
-            } else if (effect.getVariable() instanceof Output) {
-                if (effect.getContainer() != null) {
-                    error(String.format("Cannot have an output of a contained reactor as an effect: %s.%s", effect.getContainer().getName(), effect.getVariable().getName()),
-                        Literals.REACTION__EFFECTS);
-                }
-            }
-        }
-
-        // // Report error if this reaction is part of a cycle.
-        Set<NamedInstance<?>> cycles = this.info.topologyCycles();
-        Reactor reactor = ASTUtils.getEnclosingReactor(reaction);
-        boolean reactionInCycle = false;
-        for (NamedInstance<?> it : cycles) {
-            if (it.getDefinition().equals(reaction)) {
-                reactionInCycle = true;
-                break;
-            }
-        }
-        if (reactionInCycle) {
-            // Report involved triggers.
-            List<CharSequence> trigs = new ArrayList<>();
-            for (TriggerRef t : reaction.getTriggers()) {
-                if (!(t instanceof VarRef)) {
-                    continue;
-                }
-                VarRef tVarRef = (VarRef) t;
-                boolean triggerExistsInCycle = false;
-                for (NamedInstance<?> c : cycles) {
-                    if (c.getDefinition().equals(tVarRef.getVariable())) {
-                        triggerExistsInCycle = true;
-                        break;
-                    }
-                }
-                if (triggerExistsInCycle) {
-                    trigs.add(toOriginalText(tVarRef));
-                }
-            }
-            if (trigs.size() > 0) {
-                error(String.format("Reaction triggers involved in cyclic dependency in reactor %s: %s.", reactor.getName(), String.join(", ", trigs)),
-                    Literals.REACTION__TRIGGERS);
-            }
+  @Check(CheckType.FAST)
+  public void checkReaction(Reaction reaction) {
 
-            // Report involved sources.
-            List<CharSequence> sources = new ArrayList<>();
-            for (VarRef t : reaction.getSources()) {
-                boolean sourceExistInCycle = false;
-                for (NamedInstance<?> c : cycles) {
-                    if (c.getDefinition().equals(t.getVariable())) {
-                        sourceExistInCycle = true;
-                        break;
-                    }
-                }
-                if (sourceExistInCycle) {
-                    sources.add(toOriginalText(t));
-                }
-            }
-            if (sources.size() > 0) {
-                error(String.format("Reaction sources involved in cyclic dependency in reactor %s: %s.", reactor.getName(), String.join(", ", sources)),
-                    Literals.REACTION__SOURCES);
-            }
-
-            // Report involved effects.
-            List<CharSequence> effects = new ArrayList<>();
-            for (VarRef t : reaction.getEffects()) {
-                boolean effectExistInCycle = false;
-                for (NamedInstance<?> c : cycles) {
-                    if (c.getDefinition().equals(t.getVariable())) {
-                        effectExistInCycle = true;
-                        break;
-                    }
-                }
-                if (effectExistInCycle) {
-                    effects.add(toOriginalText(t));
-                }
-            }
-            if (effects.size() > 0) {
-                error(String.format("Reaction effects involved in cyclic dependency in reactor %s: %s.", reactor.getName(), String.join(", ", effects)),
-                    Literals.REACTION__EFFECTS);
-            }
-
-            if (trigs.size() + sources.size() == 0) {
-                error(
-                    String.format("Cyclic dependency due to preceding reaction. Consider reordering reactions within reactor %s to avoid causality loop.", reactor.getName()),
-                    reaction.eContainer(),
-                    Literals.REACTOR__REACTIONS,
-                    reactor.getReactions().indexOf(reaction)
-                );
-            } else if (effects.size() == 0) {
-                error(
-                    String.format("Cyclic dependency due to succeeding reaction. Consider reordering reactions within reactor %s to avoid causality loop.", reactor.getName()),
-                    reaction.eContainer(),
-                    Literals.REACTOR__REACTIONS,
-                    reactor.getReactions().indexOf(reaction)
-                );
-            }
-            // Not reporting reactions that are part of cycle _only_ due to reaction ordering.
-            // Moving them won't help solve the problem.
-        }
-    // FIXME: improve error message.
+    if (reaction.getTriggers() == null || reaction.getTriggers().size() == 0) {
+      warning("Reaction has no trigger.", Literals.REACTION__TRIGGERS);
     }
-
-    public void checkReactorName(String name) throws IOException {
-        // Check for illegal names.
-        checkName(name, Literals.REACTOR_DECL__NAME);
-
-        // C++ reactors may not be called 'preamble'
-        if (this.target == Target.CPP &&  name.equalsIgnoreCase("preamble")) {
+    HashSet<Variable> triggers = new HashSet<>();
+    // Make sure input triggers have no container and output sources do.
+    for (TriggerRef trigger : reaction.getTriggers()) {
+      if (trigger instanceof VarRef) {
+        VarRef triggerVarRef = (VarRef) trigger;
+        triggers.add(triggerVarRef.getVariable());
+        if (triggerVarRef instanceof Input) {
+          if (triggerVarRef.getContainer() != null) {
             error(
-                "Reactor cannot be named '" + name + "'",
-                Literals.REACTOR_DECL__NAME
-            );
+                String.format(
+                    "Cannot have an input of a contained reactor as a trigger: %s.%s",
+                    triggerVarRef.getContainer().getName(), triggerVarRef.getVariable().getName()),
+                Literals.REACTION__TRIGGERS);
+          }
+        } else if (triggerVarRef.getVariable() instanceof Output) {
+          if (triggerVarRef.getContainer() == null) {
+            error(
+                String.format(
+                    "Cannot have an output of this reactor as a trigger: %s",
+                    triggerVarRef.getVariable().getName()),
+                Literals.REACTION__TRIGGERS);
+          }
         }
+      }
     }
 
-    @Check(CheckType.FAST)
-    public void checkReactor(Reactor reactor) throws IOException {
-        String fileName = FileUtil.nameWithoutExtension(reactor.eResource());
-
-        if (reactor.isFederated() || reactor.isMain()) {
-            // Do not allow multiple main/federated reactors.
-            TreeIterator<EObject> iter = reactor.eResource().getAllContents();
-            int nMain = countMainOrFederated(iter);
-            if (nMain > 1) {
-                EAttribute attribute = Literals.REACTOR__MAIN;
-                if (reactor.isFederated()) {
-                    attribute = Literals.REACTOR__FEDERATED;
-                }
-                error(
-                    "Multiple definitions of main or federated reactor.",
-                    attribute
-                );
-            }
-
-            if(reactor.getName() != null && !reactor.getName().equals(fileName)) {
-                // Make sure that if the name is given, it matches the expected name.
-                error(
-                    "Name of main reactor must match the file name (or be omitted).",
-                    Literals.REACTOR_DECL__NAME
-                );
-            }
-
-            // check the reactor name indicated by the file name
-            // Skip this check if the file is named __synthetic0. This Name is used during testing,
-            // and we would get an unexpected error due to the '__' prefix otherwise.
-            if (!fileName.equals("__synthetic0")) {
-                checkReactorName(fileName);
-            }
-        } else {
-            // Not federated or main.
-            if (reactor.getName() == null) {
-                error(
-                    "Reactor must be named.",
-                    Literals.REACTOR_DECL__NAME
-                );
-            } else {
-                checkReactorName(reactor.getName());
-
-                TreeIterator<EObject> iter = reactor.eResource().getAllContents();
-                int nMain = countMainOrFederated(iter);
-                if (nMain > 0 && reactor.getName().equals(fileName)) {
-                    error(
-                        "Name conflict with main reactor.",
-                        Literals.REACTOR_DECL__NAME
-                    );
-                }
-            }
-        }
+    // Make sure input sources have no container and output sources do.
+    // Also check that a source is not already listed as a trigger.
+    for (VarRef source : reaction.getSources()) {
+      if (triggers.contains(source.getVariable())) {
+        error(
+            String.format(
+                "Source is already listed as a trigger: %s", source.getVariable().getName()),
+            Literals.REACTION__SOURCES);
+      }
+      if (source.getVariable() instanceof Input) {
+        if (source.getContainer() != null) {
+          error(
+              String.format(
+                  "Cannot have an input of a contained reactor as a source: %s.%s",
+                  source.getContainer().getName(), source.getVariable().getName()),
+              Literals.REACTION__SOURCES);
+        }
+      } else if (source.getVariable() instanceof Output) {
+        if (source.getContainer() == null) {
+          error(
+              String.format(
+                  "Cannot have an output of this reactor as a source: %s",
+                  source.getVariable().getName()),
+              Literals.REACTION__SOURCES);
+        }
+      }
+    }
 
+    // Make sure output effects have no container and input effects do.
+    for (VarRef effect : reaction.getEffects()) {
+      if (effect.getVariable() instanceof Input) {
+        if (effect.getContainer() == null) {
+          error(
+              String.format(
+                  "Cannot have an input of this reactor as an effect: %s",
+                  effect.getVariable().getName()),
+              Literals.REACTION__EFFECTS);
+        }
+      } else if (effect.getVariable() instanceof Output) {
+        if (effect.getContainer() != null) {
+          error(
+              String.format(
+                  "Cannot have an output of a contained reactor as an effect: %s.%s",
+                  effect.getContainer().getName(), effect.getVariable().getName()),
+              Literals.REACTION__EFFECTS);
+        }
+      }
+    }
 
-        Set<Reactor> superClasses = ASTUtils.superClasses(reactor);
-        if (superClasses == null) {
-            error(
-                    "Problem with superclasses: Either they form a cycle or are not defined",
-                    Literals.REACTOR_DECL__NAME
-            );
-            // Continue checks, but without any superclasses.
-            superClasses = new LinkedHashSet<>();
+    // // Report error if this reaction is part of a cycle.
+    Set<NamedInstance<?>> cycles = this.info.topologyCycles();
+    Reactor reactor = ASTUtils.getEnclosingReactor(reaction);
+    boolean reactionInCycle = false;
+    for (NamedInstance<?> it : cycles) {
+      if (it.getDefinition().equals(reaction)) {
+        reactionInCycle = true;
+        break;
+      }
+    }
+    if (reactionInCycle) {
+      // Report involved triggers.
+      List<CharSequence> trigs = new ArrayList<>();
+      for (TriggerRef t : reaction.getTriggers()) {
+        if (!(t instanceof VarRef)) {
+          continue;
+        }
+        VarRef tVarRef = (VarRef) t;
+        boolean triggerExistsInCycle = false;
+        for (NamedInstance<?> c : cycles) {
+          if (c.getDefinition().equals(tVarRef.getVariable())) {
+            triggerExistsInCycle = true;
+            break;
+          }
         }
-
-        if (reactor.getHost() != null) {
-            if (!reactor.isFederated()) {
-                error(
-                    "Cannot assign a host to reactor '" + reactor.getName() +
-                    "' because it is not federated.",
-                    Literals.REACTOR__HOST
-                );
-            }
+        if (triggerExistsInCycle) {
+          trigs.add(toOriginalText(tVarRef));
+        }
+      }
+      if (trigs.size() > 0) {
+        error(
+            String.format(
+                "Reaction triggers involved in cyclic dependency in reactor %s: %s.",
+                reactor.getName(), String.join(", ", trigs)),
+            Literals.REACTION__TRIGGERS);
+      }
+
+      // Report involved sources.
+      List<CharSequence> sources = new ArrayList<>();
+      for (VarRef t : reaction.getSources()) {
+        boolean sourceExistInCycle = false;
+        for (NamedInstance<?> c : cycles) {
+          if (c.getDefinition().equals(t.getVariable())) {
+            sourceExistInCycle = true;
+            break;
+          }
         }
-
-        List<Variable> variables = new ArrayList<>();
-        variables.addAll(reactor.getInputs());
-        variables.addAll(reactor.getOutputs());
-        variables.addAll(reactor.getActions());
-        variables.addAll(reactor.getTimers());
-
-        if (!reactor.getSuperClasses().isEmpty() && !target.supportsInheritance()) {
-            error("The " + target.getDisplayName() + " target does not support reactor inheritance.",
-                Literals.REACTOR__SUPER_CLASSES);
+        if (sourceExistInCycle) {
+          sources.add(toOriginalText(t));
+        }
+      }
+      if (sources.size() > 0) {
+        error(
+            String.format(
+                "Reaction sources involved in cyclic dependency in reactor %s: %s.",
+                reactor.getName(), String.join(", ", sources)),
+            Literals.REACTION__SOURCES);
+      }
+
+      // Report involved effects.
+      List<CharSequence> effects = new ArrayList<>();
+      for (VarRef t : reaction.getEffects()) {
+        boolean effectExistInCycle = false;
+        for (NamedInstance<?> c : cycles) {
+          if (c.getDefinition().equals(t.getVariable())) {
+            effectExistInCycle = true;
+            break;
+          }
         }
+        if (effectExistInCycle) {
+          effects.add(toOriginalText(t));
+        }
+      }
+      if (effects.size() > 0) {
+        error(
+            String.format(
+                "Reaction effects involved in cyclic dependency in reactor %s: %s.",
+                reactor.getName(), String.join(", ", effects)),
+            Literals.REACTION__EFFECTS);
+      }
+
+      if (trigs.size() + sources.size() == 0) {
+        error(
+            String.format(
+                "Cyclic dependency due to preceding reaction. Consider reordering reactions within"
+                    + " reactor %s to avoid causality loop.",
+                reactor.getName()),
+            reaction.eContainer(),
+            Literals.REACTOR__REACTIONS,
+            reactor.getReactions().indexOf(reaction));
+      } else if (effects.size() == 0) {
+        error(
+            String.format(
+                "Cyclic dependency due to succeeding reaction. Consider reordering reactions within"
+                    + " reactor %s to avoid causality loop.",
+                reactor.getName()),
+            reaction.eContainer(),
+            Literals.REACTOR__REACTIONS,
+            reactor.getReactions().indexOf(reaction));
+      }
+      // Not reporting reactions that are part of cycle _only_ due to reaction ordering.
+      // Moving them won't help solve the problem.
+    }
+    // FIXME: improve error message.
+  }
 
-        // Perform checks on super classes.
-        for (Reactor superClass : superClasses) {
-            HashSet<Variable> conflicts = new HashSet<>();
-
-            // Detect input conflicts
-            checkConflict(superClass.getInputs(), reactor.getInputs(), variables, conflicts);
-            // Detect output conflicts
-            checkConflict(superClass.getOutputs(), reactor.getOutputs(), variables, conflicts);
-            // Detect output conflicts
-            checkConflict(superClass.getActions(), reactor.getActions(), variables, conflicts);
-            // Detect conflicts
-            for (Timer timer : superClass.getTimers()) {
-                List<Variable> filteredVariables = new ArrayList<>(variables);
-                filteredVariables.removeIf(it -> reactor.getTimers().contains(it));
-                if (hasNameConflict(timer, filteredVariables)) {
-                    conflicts.add(timer);
-                } else {
-                    variables.add(timer);
-                }
-            }
-
-            // Report conflicts.
-            if (conflicts.size() > 0) {
-                List<String> names = new ArrayList<>();
-                for (Variable it : conflicts) {
-                    names.add(it.getName());
-                }
-                error(
-                    String.format("Cannot extend %s due to the following conflicts: %s.",
-                            superClass.getName(), String.join(",", names)),
-                    Literals.REACTOR__SUPER_CLASSES
-                );
-            }
-        }
+  public void checkReactorName(String name) throws IOException {
+    // Check for illegal names.
+    checkName(name, Literals.REACTOR_DECL__NAME);
 
+    // C++ reactors may not be called 'preamble'
+    if (this.target == Target.CPP && name.equalsIgnoreCase("preamble")) {
+      error("Reactor cannot be named '" + name + "'", Literals.REACTOR_DECL__NAME);
+    }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkReactor(Reactor reactor) throws IOException {
+    String fileName = FileUtil.nameWithoutExtension(reactor.eResource());
+
+    if (reactor.isFederated() || reactor.isMain()) {
+      // Do not allow multiple main/federated reactors.
+      TreeIterator<EObject> iter = reactor.eResource().getAllContents();
+      int nMain = countMainOrFederated(iter);
+      if (nMain > 1) {
+        EAttribute attribute = Literals.REACTOR__MAIN;
         if (reactor.isFederated()) {
-            if (!target.supportsFederated()) {
-                error("The " + target.getDisplayName() + " target does not support federated execution.",
-                    Literals.REACTOR__FEDERATED);
-            }
+          attribute = Literals.REACTOR__FEDERATED;
+        }
+        error("Multiple definitions of main or federated reactor.", attribute);
+      }
+
+      if (reactor.getName() != null && !reactor.getName().equals(fileName)) {
+        // Make sure that if the name is given, it matches the expected name.
+        error(
+            "Name of main reactor must match the file name (or be omitted).",
+            Literals.REACTOR_DECL__NAME);
+      }
+
+      // check the reactor name indicated by the file name
+      // Skip this check if the file is named __synthetic0. This Name is used during testing,
+      // and we would get an unexpected error due to the '__' prefix otherwise.
+      if (!fileName.equals("__synthetic0")) {
+        checkReactorName(fileName);
+      }
+    } else {
+      // Not federated or main.
+      if (reactor.getName() == null) {
+        error("Reactor must be named.", Literals.REACTOR_DECL__NAME);
+      } else {
+        checkReactorName(reactor.getName());
+
+        TreeIterator<EObject> iter = reactor.eResource().getAllContents();
+        int nMain = countMainOrFederated(iter);
+        if (nMain > 0 && reactor.getName().equals(fileName)) {
+          error("Name conflict with main reactor.", Literals.REACTOR_DECL__NAME);
+        }
+      }
+    }
 
-            FedValidator.validateFederatedReactor(reactor, this.errorReporter);
-        }
+    Set<Reactor> superClasses = ASTUtils.superClasses(reactor);
+    if (superClasses == null) {
+      error(
+          "Problem with superclasses: Either they form a cycle or are not defined",
+          Literals.REACTOR_DECL__NAME);
+      // Continue checks, but without any superclasses.
+      superClasses = new LinkedHashSet<>();
     }
 
-    /**
-     * Check if the requested serialization is supported.
-     */
-    @Check(CheckType.FAST)
-    public void checkSerializer(Serializer serializer) {
-        boolean isValidSerializer = false;
-        for (SupportedSerializers method : SupportedSerializers.values()) {
-          if (method.name().equalsIgnoreCase(serializer.getType())){
-              isValidSerializer = true;
-          }
-        }
+    if (reactor.getHost() != null) {
+      if (!reactor.isFederated()) {
+        error(
+            "Cannot assign a host to reactor '"
+                + reactor.getName()
+                + "' because it is not federated.",
+            Literals.REACTOR__HOST);
+      }
+    }
 
-        if (!isValidSerializer) {
-            error(
-                "Serializer can be " + Arrays.asList(SupportedSerializers.values()),
-                Literals.SERIALIZER__TYPE
-            );
-        }
+    List<Variable> variables = new ArrayList<>();
+    variables.addAll(reactor.getInputs());
+    variables.addAll(reactor.getOutputs());
+    variables.addAll(reactor.getActions());
+    variables.addAll(reactor.getTimers());
+
+    if (!reactor.getSuperClasses().isEmpty() && !target.supportsInheritance()) {
+      error(
+          "The " + target.getDisplayName() + " target does not support reactor inheritance.",
+          Literals.REACTOR__SUPER_CLASSES);
     }
 
-    @Check(CheckType.FAST)
-    public void checkState(StateVar stateVar) {
-        checkName(stateVar.getName(), Literals.STATE_VAR__NAME);
-        if (stateVar.getInit() != null && stateVar.getInit().getExprs().size() != 0) {
-            typeCheck(stateVar.getInit(), ASTUtils.getInferredType(stateVar), Literals.STATE_VAR__INIT);
-        }
+    // Perform checks on super classes.
+    for (Reactor superClass : superClasses) {
+      HashSet<Variable> conflicts = new HashSet<>();
+
+      // Detect input conflicts
+      checkConflict(superClass.getInputs(), reactor.getInputs(), variables, conflicts);
+      // Detect output conflicts
+      checkConflict(superClass.getOutputs(), reactor.getOutputs(), variables, conflicts);
+      // Detect output conflicts
+      checkConflict(superClass.getActions(), reactor.getActions(), variables, conflicts);
+      // Detect conflicts
+      for (Timer timer : superClass.getTimers()) {
+        List<Variable> filteredVariables = new ArrayList<>(variables);
+        filteredVariables.removeIf(it -> reactor.getTimers().contains(it));
+        if (hasNameConflict(timer, filteredVariables)) {
+          conflicts.add(timer);
+        } else {
+          variables.add(timer);
+        }
+      }
+
+      // Report conflicts.
+      if (conflicts.size() > 0) {
+        List<String> names = new ArrayList<>();
+        for (Variable it : conflicts) {
+          names.add(it.getName());
+        }
+        error(
+            String.format(
+                "Cannot extend %s due to the following conflicts: %s.",
+                superClass.getName(), String.join(",", names)),
+            Literals.REACTOR__SUPER_CLASSES);
+      }
+    }
 
-        if (this.target.requiresTypes && ASTUtils.getInferredType(stateVar).isUndefined()) {
-            // Report if a type is missing
-            error("State must have a type.", Literals.STATE_VAR__TYPE);
-        }
+    if (reactor.isFederated()) {
+      if (!target.supportsFederated()) {
+        error(
+            "The " + target.getDisplayName() + " target does not support federated execution.",
+            Literals.REACTOR__FEDERATED);
+      }
 
-        if (isCBasedTarget()
-            && ASTUtils.isListInitializer(stateVar.getInit())
-            && stateVar.getInit().getExprs().stream().anyMatch(it -> it instanceof ParameterReference)) {
-            // In C, if initialization is done with a list, elements cannot
-            // refer to parameters.
-            error("List items cannot refer to a parameter.",
-                Literals.STATE_VAR__INIT);
-        }
+      FedValidator.validateFederatedReactor(reactor, this.errorReporter);
+    }
+  }
+
+  /** Check if the requested serialization is supported. */
+  @Check(CheckType.FAST)
+  public void checkSerializer(Serializer serializer) {
+    boolean isValidSerializer = false;
+    for (SupportedSerializers method : SupportedSerializers.values()) {
+      if (method.name().equalsIgnoreCase(serializer.getType())) {
+        isValidSerializer = true;
+      }
+    }
 
+    if (!isValidSerializer) {
+      error(
+          "Serializer can be " + Arrays.asList(SupportedSerializers.values()),
+          Literals.SERIALIZER__TYPE);
     }
+  }
 
-    @Check(CheckType.FAST)
-    public void checkSTPOffset(STP stp) {
-        if (isCBasedTarget() &&
-            this.info.overflowingSTP.contains(stp)) {
-            error(
-                "STP offset exceeds the maximum of " +
-                    TimeValue.MAX_LONG_DEADLINE + " nanoseconds.",
-                Literals.STP__VALUE);
-        }
+  @Check(CheckType.FAST)
+  public void checkState(StateVar stateVar) {
+    checkName(stateVar.getName(), Literals.STATE_VAR__NAME);
+    if (stateVar.getInit() != null && stateVar.getInit().getExprs().size() != 0) {
+      typeCheck(stateVar.getInit(), ASTUtils.getInferredType(stateVar), Literals.STATE_VAR__INIT);
     }
 
-    @Check(CheckType.FAST)
-    public void checkTargetDecl(TargetDecl target) throws IOException {
-        Optional<Target> targetOpt = Target.forName(target.getName());
-        if (targetOpt.isEmpty()) {
-            error("Unrecognized target: " + target.getName(),
-                Literals.TARGET_DECL__NAME);
-        } else {
-            this.target = targetOpt.get();
-        }
-        String lfFileName = FileUtil.nameWithoutExtension(target.eResource());
-        if (Character.isDigit(lfFileName.charAt(0))) {
-            errorReporter.reportError("LF file names must not start with a number");
-        }
+    if (this.target.requiresTypes && ASTUtils.getInferredType(stateVar).isUndefined()) {
+      // Report if a type is missing
+      error("State must have a type.", Literals.STATE_VAR__TYPE);
     }
 
-    /**
-     * Check for consistency of the target properties, which are
-     * defined as KeyValuePairs.
-     *
-     * @param targetProperties The target properties defined
-     *  in the current Lingua Franca program.
-     */
-    @Check(CheckType.EXPENSIVE)
-    public void checkTargetProperties(KeyValuePairs targetProperties) {
-        validateFastTargetProperty(targetProperties);
-        validateClockSyncTargetProperties(targetProperties);
-        validateSchedulerTargetProperties(targetProperties);
-        validateRos2TargetProperties(targetProperties);
-        validateKeepalive(targetProperties);
-    }
-
-    private KeyValuePair getKeyValuePair(KeyValuePairs targetProperties, TargetProperty property) {
-        List<KeyValuePair> properties = targetProperties.getPairs().stream()
+    if (isCBasedTarget()
+        && ASTUtils.isListInitializer(stateVar.getInit())
+        && stateVar.getInit().getExprs().stream()
+            .anyMatch(it -> it instanceof ParameterReference)) {
+      // In C, if initialization is done with a list, elements cannot
+      // refer to parameters.
+      error("List items cannot refer to a parameter.", Literals.STATE_VAR__INIT);
+    }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkSTPOffset(STP stp) {
+    if (isCBasedTarget() && this.info.overflowingSTP.contains(stp)) {
+      error(
+          "STP offset exceeds the maximum of " + TimeValue.MAX_LONG_DEADLINE + " nanoseconds.",
+          Literals.STP__VALUE);
+    }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkTargetDecl(TargetDecl target) throws IOException {
+    Optional<Target> targetOpt = Target.forName(target.getName());
+    if (targetOpt.isEmpty()) {
+      error("Unrecognized target: " + target.getName(), Literals.TARGET_DECL__NAME);
+    } else {
+      this.target = targetOpt.get();
+    }
+    String lfFileName = FileUtil.nameWithoutExtension(target.eResource());
+    if (Character.isDigit(lfFileName.charAt(0))) {
+      errorReporter.reportError("LF file names must not start with a number");
+    }
+  }
+
+  /**
+   * Check for consistency of the target properties, which are defined as KeyValuePairs.
+   *
+   * @param targetProperties The target properties defined in the current Lingua Franca program.
+   */
+  @Check(CheckType.EXPENSIVE)
+  public void checkTargetProperties(KeyValuePairs targetProperties) {
+    validateFastTargetProperty(targetProperties);
+    validateClockSyncTargetProperties(targetProperties);
+    validateSchedulerTargetProperties(targetProperties);
+    validateRos2TargetProperties(targetProperties);
+    validateKeepalive(targetProperties);
+  }
+
+  private KeyValuePair getKeyValuePair(KeyValuePairs targetProperties, TargetProperty property) {
+    List<KeyValuePair> properties =
+        targetProperties.getPairs().stream()
             .filter(pair -> pair.getName().equals(property.description))
             .toList();
-        assert (properties.size() <= 1);
-        return properties.size() > 0 ? properties.get(0) : null;
-    }
-    private void validateFastTargetProperty(KeyValuePairs targetProperties) {
-        KeyValuePair fastTargetProperty = getKeyValuePair(targetProperties, TargetProperty.FAST);
-
-        if (fastTargetProperty != null) {
-            // Check for federated
-            for (Reactor reactor : info.model.getReactors()) {
-                // Check to see if the program has a federated reactor
-                if (reactor.isFederated()) {
-                    error(
-                        "The fast target property is incompatible with federated programs.",
-                        fastTargetProperty,
-                        Literals.KEY_VALUE_PAIR__NAME
-                    );
-                    break;
-                }
-            }
+    assert (properties.size() <= 1);
+    return properties.size() > 0 ? properties.get(0) : null;
+  }
 
-            // Check for physical actions
-            for (Reactor reactor : info.model.getReactors()) {
-                // Check to see if the program has a physical action in a reactor
-                for (Action action : reactor.getActions()) {
-                    if (action.getOrigin().equals(ActionOrigin.PHYSICAL)) {
-                        error(
-                            "The fast target property is incompatible with physical actions.",
-                            fastTargetProperty,
-                            Literals.KEY_VALUE_PAIR__NAME
-                        );
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    private void validateClockSyncTargetProperties(KeyValuePairs targetProperties) {
-        KeyValuePair clockSyncTargetProperty = getKeyValuePair(targetProperties, TargetProperty.CLOCK_SYNC);
+  private void validateFastTargetProperty(KeyValuePairs targetProperties) {
+    KeyValuePair fastTargetProperty = getKeyValuePair(targetProperties, TargetProperty.FAST);
 
-        if (clockSyncTargetProperty != null) {
-            boolean federatedExists = false;
-            for (Reactor reactor : info.model.getReactors()) {
-                if (reactor.isFederated()) {
-                    federatedExists = true;
-                }
-            }
-            if (!federatedExists) {
-                warning(
-                    "The clock-sync target property is incompatible with non-federated programs.",
-                    clockSyncTargetProperty,
-                    Literals.KEY_VALUE_PAIR__NAME
-                );
-            }
+    if (fastTargetProperty != null) {
+      // Check for federated
+      for (Reactor reactor : info.model.getReactors()) {
+        // Check to see if the program has a federated reactor
+        if (reactor.isFederated()) {
+          error(
+              "The fast target property is incompatible with federated programs.",
+              fastTargetProperty,
+              Literals.KEY_VALUE_PAIR__NAME);
+          break;
+        }
+      }
+
+      // Check for physical actions
+      for (Reactor reactor : info.model.getReactors()) {
+        // Check to see if the program has a physical action in a reactor
+        for (Action action : reactor.getActions()) {
+          if (action.getOrigin().equals(ActionOrigin.PHYSICAL)) {
+            error(
+                "The fast target property is incompatible with physical actions.",
+                fastTargetProperty,
+                Literals.KEY_VALUE_PAIR__NAME);
+            break;
+          }
         }
+      }
     }
+  }
 
-    private void validateSchedulerTargetProperties(KeyValuePairs targetProperties) {
-        KeyValuePair schedulerTargetProperty = getKeyValuePair(targetProperties, TargetProperty.SCHEDULER);
-        if (schedulerTargetProperty != null) {
-            String schedulerName = ASTUtils.elementToSingleString(schedulerTargetProperty.getValue());
-            try {
-                if (!TargetProperty.SchedulerOption.valueOf(schedulerName)
-                                                   .prioritizesDeadline()) {
-                    // Check if a deadline is assigned to any reaction
-                    // Filter reactors that contain at least one reaction that
-                    // has a deadline handler.
-                    if (info.model.getReactors().stream().anyMatch(
-                        // Filter reactors that contain at least one reaction that
-                        // has a deadline handler.
-                        reactor -> ASTUtils.allReactions(reactor).stream().anyMatch(
-                            reaction -> reaction.getDeadline() != null
-                        ))
-                    ) {
-                        warning("This program contains deadlines, but the chosen "
-                                    + schedulerName
-                                    + " scheduler does not prioritize reaction execution "
-                                    + "based on deadlines. This might result in a sub-optimal "
-                                    + "scheduling.", schedulerTargetProperty,
-                                Literals.KEY_VALUE_PAIR__VALUE);
-                    }
-                }
-            } catch (IllegalArgumentException e) {
-                // the given scheduler is invalid, but this is already checked by
-                // checkTargetProperties
-            }
-        }
-    }
+  private void validateClockSyncTargetProperties(KeyValuePairs targetProperties) {
+    KeyValuePair clockSyncTargetProperty =
+        getKeyValuePair(targetProperties, TargetProperty.CLOCK_SYNC);
 
-    private void validateKeepalive(KeyValuePairs targetProperties) {
-        KeyValuePair keepalive = getKeyValuePair(targetProperties, TargetProperty.KEEPALIVE);
-        if (keepalive != null && target == Target.CPP) {
-            warning("The keepalive property is inferred automatically by the C++ " +
-                "runtime and the value given here is ignored", keepalive, Literals.KEY_VALUE_PAIR__NAME);
-        }
+    if (clockSyncTargetProperty != null) {
+      boolean federatedExists = false;
+      for (Reactor reactor : info.model.getReactors()) {
+        if (reactor.isFederated()) {
+          federatedExists = true;
+        }
+      }
+      if (!federatedExists) {
+        warning(
+            "The clock-sync target property is incompatible with non-federated programs.",
+            clockSyncTargetProperty,
+            Literals.KEY_VALUE_PAIR__NAME);
+      }
     }
-
-    private void validateRos2TargetProperties(KeyValuePairs targetProperties) {
-        KeyValuePair ros2 = getKeyValuePair(targetProperties, TargetProperty.ROS2);
-        KeyValuePair ros2Dependencies = getKeyValuePair(targetProperties, TargetProperty.ROS2_DEPENDENCIES);
-        if (ros2Dependencies != null && (ros2 == null || !ASTUtils.toBoolean(ros2.getValue()))) {
+  }
+
+  private void validateSchedulerTargetProperties(KeyValuePairs targetProperties) {
+    KeyValuePair schedulerTargetProperty =
+        getKeyValuePair(targetProperties, TargetProperty.SCHEDULER);
+    if (schedulerTargetProperty != null) {
+      String schedulerName = ASTUtils.elementToSingleString(schedulerTargetProperty.getValue());
+      try {
+        if (!TargetProperty.SchedulerOption.valueOf(schedulerName).prioritizesDeadline()) {
+          // Check if a deadline is assigned to any reaction
+          // Filter reactors that contain at least one reaction that
+          // has a deadline handler.
+          if (info.model.getReactors().stream()
+              .anyMatch(
+                  // Filter reactors that contain at least one reaction that
+                  // has a deadline handler.
+                  reactor ->
+                      ASTUtils.allReactions(reactor).stream()
+                          .anyMatch(reaction -> reaction.getDeadline() != null))) {
             warning(
-                "Ignoring ros2-dependencies as ros2 compilation is disabled",
-                ros2Dependencies,
-                Literals.KEY_VALUE_PAIR__NAME
-            );
+                "This program contains deadlines, but the chosen "
+                    + schedulerName
+                    + " scheduler does not prioritize reaction execution "
+                    + "based on deadlines. This might result in a sub-optimal "
+                    + "scheduling.",
+                schedulerTargetProperty,
+                Literals.KEY_VALUE_PAIR__VALUE);
+          }
         }
+      } catch (IllegalArgumentException e) {
+        // the given scheduler is invalid, but this is already checked by
+        // checkTargetProperties
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkTimer(Timer timer) {
-        checkName(timer.getName(), Literals.VARIABLE__NAME);
-        checkExpressionIsTime(timer.getOffset(), Literals.TIMER__OFFSET);
-        checkExpressionIsTime(timer.getPeriod(), Literals.TIMER__PERIOD);
+  }
+
+  private void validateKeepalive(KeyValuePairs targetProperties) {
+    KeyValuePair keepalive = getKeyValuePair(targetProperties, TargetProperty.KEEPALIVE);
+    if (keepalive != null && target == Target.CPP) {
+      warning(
+          "The keepalive property is inferred automatically by the C++ "
+              + "runtime and the value given here is ignored",
+          keepalive,
+          Literals.KEY_VALUE_PAIR__NAME);
     }
-
-    @Check(CheckType.FAST)
-    public void checkType(Type type) {
-        // FIXME: disallow the use of generics in C
-        if (this.target == Target.Python) {
-            if (type != null) {
-                error(
-                    "Types are not allowed in the Python target",
-                    Literals.TYPE__ID
-                );
-            }
-        }
+  }
+
+  private void validateRos2TargetProperties(KeyValuePairs targetProperties) {
+    KeyValuePair ros2 = getKeyValuePair(targetProperties, TargetProperty.ROS2);
+    KeyValuePair ros2Dependencies =
+        getKeyValuePair(targetProperties, TargetProperty.ROS2_DEPENDENCIES);
+    if (ros2Dependencies != null && (ros2 == null || !ASTUtils.toBoolean(ros2.getValue()))) {
+      warning(
+          "Ignoring ros2-dependencies as ros2 compilation is disabled",
+          ros2Dependencies,
+          Literals.KEY_VALUE_PAIR__NAME);
     }
-
-    @Check(CheckType.FAST)
-    public void checkVarRef(VarRef varRef) {
-        // check correct usage of interleaved
-        if (varRef.isInterleaved()) {
-            var supportedTargets = List.of(Target.CPP, Target.Python, Target.Rust);
-            if (!supportedTargets.contains(this.target) && !isCBasedTarget()) {
-                error("This target does not support interleaved port references.", Literals.VAR_REF__INTERLEAVED);
-            }
-            if (!(varRef.eContainer() instanceof Connection)) {
-                error("interleaved can only be used in connections.", Literals.VAR_REF__INTERLEAVED);
-            }
-
-            if (varRef.getVariable() instanceof Port) {
-                // This test only works correctly if the variable is actually a port. If it is not a port, other
-                // validator rules will produce error messages.
-                if (varRef.getContainer() == null || varRef.getContainer().getWidthSpec() == null ||
-                    ((Port) varRef.getVariable()).getWidthSpec() == null
-                ) {
-                    error("interleaved can only be used for multiports contained within banks.", Literals.VAR_REF__INTERLEAVED);
-                }
-            }
-        }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkTimer(Timer timer) {
+    checkName(timer.getName(), Literals.VARIABLE__NAME);
+    checkExpressionIsTime(timer.getOffset(), Literals.TIMER__OFFSET);
+    checkExpressionIsTime(timer.getPeriod(), Literals.TIMER__PERIOD);
+  }
+
+  @Check(CheckType.FAST)
+  public void checkType(Type type) {
+    // FIXME: disallow the use of generics in C
+    if (this.target == Target.Python) {
+      if (type != null) {
+        error("Types are not allowed in the Python target", Literals.TYPE__ID);
+      }
     }
-
-    /**
-     * Check whether an attribute is supported
-     * and the validity of the attribute.
-     *
-     * @param attr The attribute being checked
-     */
-    @Check(CheckType.FAST)
-    public void checkAttributes(Attribute attr) {
-        String name = attr.getAttrName().toString();
-        AttributeSpec spec = AttributeSpec.ATTRIBUTE_SPECS_BY_NAME.get(name);
-        if (spec == null) {
-            error("Unknown attribute.", Literals.ATTRIBUTE__ATTR_NAME);
-            return;
-        }
-        // Check the validity of the attribute.
-        spec.check(this, attr);
+  }
+
+  @Check(CheckType.FAST)
+  public void checkVarRef(VarRef varRef) {
+    // check correct usage of interleaved
+    if (varRef.isInterleaved()) {
+      var supportedTargets = List.of(Target.CPP, Target.Python, Target.Rust);
+      if (!supportedTargets.contains(this.target) && !isCBasedTarget()) {
+        error(
+            "This target does not support interleaved port references.",
+            Literals.VAR_REF__INTERLEAVED);
+      }
+      if (!(varRef.eContainer() instanceof Connection)) {
+        error("interleaved can only be used in connections.", Literals.VAR_REF__INTERLEAVED);
+      }
+
+      if (varRef.getVariable() instanceof Port) {
+        // This test only works correctly if the variable is actually a port. If it is not a port,
+        // other
+        // validator rules will produce error messages.
+        if (varRef.getContainer() == null
+            || varRef.getContainer().getWidthSpec() == null
+            || ((Port) varRef.getVariable()).getWidthSpec() == null) {
+          error(
+              "interleaved can only be used for multiports contained within banks.",
+              Literals.VAR_REF__INTERLEAVED);
+        }
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkWidthSpec(WidthSpec widthSpec) {
-        if (!this.target.supportsMultiports()) {
-            error("Multiports and banks are currently not supported by the given target.",
+  }
+
+  /**
+   * Check whether an attribute is supported and the validity of the attribute.
+   *
+   * @param attr The attribute being checked
+   */
+  @Check(CheckType.FAST)
+  public void checkAttributes(Attribute attr) {
+    String name = attr.getAttrName().toString();
+    AttributeSpec spec = AttributeSpec.ATTRIBUTE_SPECS_BY_NAME.get(name);
+    if (spec == null) {
+      error("Unknown attribute.", Literals.ATTRIBUTE__ATTR_NAME);
+      return;
+    }
+    // Check the validity of the attribute.
+    spec.check(this, attr);
+  }
+
+  @Check(CheckType.FAST)
+  public void checkWidthSpec(WidthSpec widthSpec) {
+    if (!this.target.supportsMultiports()) {
+      error(
+          "Multiports and banks are currently not supported by the given target.",
+          Literals.WIDTH_SPEC__TERMS);
+    } else {
+      for (WidthTerm term : widthSpec.getTerms()) {
+        if (term.getParameter() != null) {
+          if (!this.target.supportsParameterizedWidths()) {
+            error(
+                "Parameterized widths are not supported by this target.",
                 Literals.WIDTH_SPEC__TERMS);
-        } else {
-            for (WidthTerm term : widthSpec.getTerms()) {
-                if (term.getParameter() != null) {
-                    if (!this.target.supportsParameterizedWidths()) {
-                        error("Parameterized widths are not supported by this target.", Literals.WIDTH_SPEC__TERMS);
-                    }
-                } else if (term.getPort() != null) {
-                    // Widths given with {@code widthof()} are not supported (yet?).
-                    // This feature is currently only used for after delays.
-                    error("widthof is not supported.", Literals.WIDTH_SPEC__TERMS);
-                } else if (term.getCode() != null) {
-                     if (this.target != Target.CPP) {
-                        error("This target does not support width given as code.", Literals.WIDTH_SPEC__TERMS);
-                    }
-                } else if (term.getWidth() < 0) {
-                    error("Width must be a positive integer.", Literals.WIDTH_SPEC__TERMS);
-                }
-            }
+          }
+        } else if (term.getPort() != null) {
+          // Widths given with {@code widthof()} are not supported (yet?).
+          // This feature is currently only used for after delays.
+          error("widthof is not supported.", Literals.WIDTH_SPEC__TERMS);
+        } else if (term.getCode() != null) {
+          if (this.target != Target.CPP) {
+            error("This target does not support width given as code.", Literals.WIDTH_SPEC__TERMS);
+          }
+        } else if (term.getWidth() < 0) {
+          error("Width must be a positive integer.", Literals.WIDTH_SPEC__TERMS);
         }
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkReactorIconAttribute(Reactor reactor) {
-        var path = AttributeUtils.getIconPath(reactor);
-        if (path != null) {
-            var param = AttributeUtils.findAttributeByName(reactor, "icon").getAttrParms().get(0);
-            // Check file extension
-            var validExtensions = Set.of("bmp", "png", "gif", "ico", "jpeg");
-            var extensionStrart = path.lastIndexOf(".");
-            var extension = extensionStrart != -1 ? path.substring(extensionStrart + 1) : "";
-            if (!validExtensions.contains(extension.toLowerCase())) {
-                warning("File extension '" + extension + "' is not supported. Provide any of: " + String.join(", ", validExtensions),
-                        param, Literals.ATTR_PARM__VALUE);
-                return;
-            }
-
-            // Check file location
-            var iconLocation = FileUtil.locateFile(path, reactor.eResource());
-            if (iconLocation == null) {
-                warning("Cannot locate icon file.", param, Literals.ATTR_PARM__VALUE);
-            }
-            if (("file".equals(iconLocation.getScheme()) || iconLocation.getScheme() == null) && !(new File(iconLocation.getPath()).exists())) {
-                warning("Icon does not exist.", param, Literals.ATTR_PARM__VALUE);
-            }
-        }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkReactorIconAttribute(Reactor reactor) {
+    var path = AttributeUtils.getIconPath(reactor);
+    if (path != null) {
+      var param = AttributeUtils.findAttributeByName(reactor, "icon").getAttrParms().get(0);
+      // Check file extension
+      var validExtensions = Set.of("bmp", "png", "gif", "ico", "jpeg");
+      var extensionStrart = path.lastIndexOf(".");
+      var extension = extensionStrart != -1 ? path.substring(extensionStrart + 1) : "";
+      if (!validExtensions.contains(extension.toLowerCase())) {
+        warning(
+            "File extension '"
+                + extension
+                + "' is not supported. Provide any of: "
+                + String.join(", ", validExtensions),
+            param,
+            Literals.ATTR_PARM__VALUE);
+        return;
+      }
+
+      // Check file location
+      var iconLocation = FileUtil.locateFile(path, reactor.eResource());
+      if (iconLocation == null) {
+        warning("Cannot locate icon file.", param, Literals.ATTR_PARM__VALUE);
+      }
+      if (("file".equals(iconLocation.getScheme()) || iconLocation.getScheme() == null)
+          && !(new File(iconLocation.getPath()).exists())) {
+        warning("Icon does not exist.", param, Literals.ATTR_PARM__VALUE);
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkInitialMode(Reactor reactor) {
-        if (!reactor.getModes().isEmpty()) {
-            long initialModesCount = reactor.getModes().stream().filter(m -> m.isInitial()).count();
-            if (initialModesCount == 0) {
-                error("Every modal reactor requires one initial mode.", Literals.REACTOR__MODES, 0);
-            } else if (initialModesCount > 1) {
-                reactor.getModes().stream().filter(m -> m.isInitial()).skip(1).forEach(m -> {
-                    error("A modal reactor can only have one initial mode.",
-                        Literals.REACTOR__MODES, reactor.getModes().indexOf(m));
+  }
+
+  @Check(CheckType.FAST)
+  public void checkInitialMode(Reactor reactor) {
+    if (!reactor.getModes().isEmpty()) {
+      long initialModesCount = reactor.getModes().stream().filter(m -> m.isInitial()).count();
+      if (initialModesCount == 0) {
+        error("Every modal reactor requires one initial mode.", Literals.REACTOR__MODES, 0);
+      } else if (initialModesCount > 1) {
+        reactor.getModes().stream()
+            .filter(m -> m.isInitial())
+            .skip(1)
+            .forEach(
+                m -> {
+                  error(
+                      "A modal reactor can only have one initial mode.",
+                      Literals.REACTOR__MODES,
+                      reactor.getModes().indexOf(m));
                 });
-            }
+      }
+    }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkModeStateNamespace(Reactor reactor) {
+    if (!reactor.getModes().isEmpty()) {
+      var names = new ArrayList<String>();
+      reactor.getStateVars().stream().map(it -> it.getName()).forEach(it -> names.add(it));
+      for (var mode : reactor.getModes()) {
+        for (var stateVar : mode.getStateVars()) {
+          if (names.contains(stateVar.getName())) {
+            error(
+                String.format(
+                    "Duplicate state variable '%s'. (State variables are currently scoped on"
+                        + " reactor level not modes)",
+                    stateVar.getName()),
+                stateVar,
+                Literals.STATE_VAR__NAME);
+          }
+          names.add(stateVar.getName());
         }
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkModeStateNamespace(Reactor reactor) {
-        if (!reactor.getModes().isEmpty()) {
-            var names = new ArrayList<String>();
-            reactor.getStateVars().stream().map(it -> it.getName()).forEach(it -> names.add(it));
-            for (var mode : reactor.getModes()) {
-                for (var stateVar : mode.getStateVars()) {
-                    if (names.contains(stateVar.getName())) {
-                        error(String.format("Duplicate state variable '%s'. (State variables are currently scoped on reactor level not modes)",
-                            stateVar.getName()), stateVar, Literals.STATE_VAR__NAME);
-                    }
-                    names.add(stateVar.getName());
-                }
-            }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkModeTimerNamespace(Reactor reactor) {
+    if (!reactor.getModes().isEmpty()) {
+      var names = new ArrayList<String>();
+      reactor.getTimers().stream().map(it -> it.getName()).forEach(it -> names.add(it));
+      for (var mode : reactor.getModes()) {
+        for (var timer : mode.getTimers()) {
+          if (names.contains(timer.getName())) {
+            error(
+                String.format(
+                    "Duplicate Timer '%s'. (Timers are currently scoped on reactor level not"
+                        + " modes)",
+                    timer.getName()),
+                timer,
+                Literals.VARIABLE__NAME);
+          }
+          names.add(timer.getName());
         }
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkModeTimerNamespace(Reactor reactor) {
-        if (!reactor.getModes().isEmpty()) {
-            var names = new ArrayList<String>();
-            reactor.getTimers().stream().map(it -> it.getName()).forEach(it -> names.add(it));
-            for (var mode : reactor.getModes()) {
-                for (var timer : mode.getTimers()) {
-                    if (names.contains(timer.getName())) {
-                        error(String.format("Duplicate Timer '%s'. (Timers are currently scoped on reactor level not modes)",
-                            timer.getName()), timer, Literals.VARIABLE__NAME);
-                    }
-                    names.add(timer.getName());
-                }
-            }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkModeActionNamespace(Reactor reactor) {
+    if (!reactor.getModes().isEmpty()) {
+      var names = new ArrayList<String>();
+      reactor.getActions().stream().map(it -> it.getName()).forEach(it -> names.add(it));
+      for (var mode : reactor.getModes()) {
+        for (var action : mode.getActions()) {
+          if (names.contains(action.getName())) {
+            error(
+                String.format(
+                    "Duplicate Action '%s'. (Actions are currently scoped on reactor level not"
+                        + " modes)",
+                    action.getName()),
+                action,
+                Literals.VARIABLE__NAME);
+          }
+          names.add(action.getName());
         }
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkModeActionNamespace(Reactor reactor) {
-        if (!reactor.getModes().isEmpty()) {
-            var names = new ArrayList<String>();
-            reactor.getActions().stream().map(it -> it.getName()).forEach(it -> names.add(it));
-            for (var mode : reactor.getModes()) {
-                for (var action : mode.getActions()) {
-                    if (names.contains(action.getName())) {
-                        error(String.format("Duplicate Action '%s'. (Actions are currently scoped on reactor level not modes)",
-                            action.getName()), action, Literals.VARIABLE__NAME);
-                    }
-                    names.add(action.getName());
-                }
-            }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkModeInstanceNamespace(Reactor reactor) {
+    if (!reactor.getModes().isEmpty()) {
+      var names = new ArrayList<String>();
+      reactor.getActions().stream().map(it -> it.getName()).forEach(it -> names.add(it));
+      for (var mode : reactor.getModes()) {
+        for (var instantiation : mode.getInstantiations()) {
+          if (names.contains(instantiation.getName())) {
+            error(
+                String.format(
+                    "Duplicate Instantiation '%s'. (Instantiations are currently scoped on reactor"
+                        + " level not modes)",
+                    instantiation.getName()),
+                instantiation,
+                Literals.INSTANTIATION__NAME);
+          }
+          names.add(instantiation.getName());
         }
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkModeInstanceNamespace(Reactor reactor) {
-        if (!reactor.getModes().isEmpty()) {
-            var names = new ArrayList<String>();
-            reactor.getActions().stream().map(it -> it.getName()).forEach(it -> names.add(it));
-            for (var mode : reactor.getModes()) {
-                for (var instantiation : mode.getInstantiations()) {
-                    if (names.contains(instantiation.getName())) {
-                        error(String.format("Duplicate Instantiation '%s'. (Instantiations are currently scoped on reactor level not modes)",
-                            instantiation.getName()), instantiation, Literals.INSTANTIATION__NAME);
-                    }
-                    names.add(instantiation.getName());
-                }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkMissingStateResetInMode(Reactor reactor) {
+    if (!reactor.getModes().isEmpty()) {
+      var resetModes = new HashSet<Mode>();
+      // Collect all modes that may be reset
+      for (var m : reactor.getModes()) {
+        for (var r : m.getReactions()) {
+          for (var e : r.getEffects()) {
+            if (e.getVariable() instanceof Mode && e.getTransition() != ModeTransition.HISTORY) {
+              resetModes.add((Mode) e.getVariable());
             }
+          }
         }
-    }
-
-    @Check(CheckType.FAST)
-    public void checkMissingStateResetInMode(Reactor reactor) {
-        if (!reactor.getModes().isEmpty()) {
-            var resetModes = new HashSet<Mode>();
-            // Collect all modes that may be reset
-            for (var m : reactor.getModes()) {
-                for (var r : m.getReactions()) {
-                    for (var e : r.getEffects()) {
-                        if (e.getVariable() instanceof Mode && e.getTransition() != ModeTransition.HISTORY) {
-                            resetModes.add((Mode) e.getVariable());
-                        }
-                    }
-                }
+      }
+      for (var m : resetModes) {
+        // Check state variables in this mode
+        if (!m.getStateVars().isEmpty()) {
+          var hasResetReaction =
+              m.getReactions().stream()
+                  .anyMatch(
+                      r ->
+                          r.getTriggers().stream()
+                              .anyMatch(
+                                  t ->
+                                      (t instanceof BuiltinTriggerRef
+                                          && ((BuiltinTriggerRef) t).getType()
+                                              == BuiltinTrigger.RESET)));
+          if (!hasResetReaction) {
+            for (var s : m.getStateVars()) {
+              if (!s.isReset()) {
+                error(
+                    "State variable is not reset upon mode entry. It is neither marked for"
+                        + " automatic reset nor is there a reset reaction.",
+                    m,
+                    Literals.MODE__STATE_VARS,
+                    m.getStateVars().indexOf(s));
+              }
             }
-            for (var m : resetModes) {
-                // Check state variables in this mode
-                if (!m.getStateVars().isEmpty()) {
-                    var hasResetReaction = m.getReactions().stream().anyMatch(
-                            r -> r.getTriggers().stream().anyMatch(
-                                    t -> (t instanceof BuiltinTriggerRef &&
-                                         ((BuiltinTriggerRef) t).getType() == BuiltinTrigger.RESET)));
-                    if (!hasResetReaction) {
-                        for (var s : m.getStateVars()) {
-                            if (!s.isReset()) {
-                                error("State variable is not reset upon mode entry. It is neither marked for automatic reset nor is there a reset reaction.",
-                                        m, Literals.MODE__STATE_VARS, m.getStateVars().indexOf(s));
-                            }
-                        }
-                    }
+          }
+        }
+        // Check state variables in instantiated reactors
+        if (!m.getInstantiations().isEmpty()) {
+          for (var i : m.getInstantiations()) {
+            var error = new LinkedHashSet<StateVar>();
+            var checked = new HashSet<Reactor>();
+            var toCheck = new LinkedList<Reactor>();
+            toCheck.add((Reactor) i.getReactorClass());
+            while (!toCheck.isEmpty()) {
+              var check = toCheck.pop();
+              checked.add(check);
+              if (!check.getStateVars().isEmpty()) {
+                var hasResetReaction =
+                    check.getReactions().stream()
+                        .anyMatch(
+                            r ->
+                                r.getTriggers().stream()
+                                    .anyMatch(
+                                        t ->
+                                            (t instanceof BuiltinTriggerRef
+                                                && ((BuiltinTriggerRef) t).getType()
+                                                    == BuiltinTrigger.RESET)));
+                if (!hasResetReaction) {
+                  // Add state vars that are not self-resetting to the error
+                  check.getStateVars().stream()
+                      .filter(s -> !s.isReset())
+                      .forEachOrdered(error::add);
                 }
-                // Check state variables in instantiated reactors
-                if (!m.getInstantiations().isEmpty()) {
-                    for (var i : m.getInstantiations()) {
-                        var error = new LinkedHashSet<StateVar>();
-                        var checked = new HashSet<Reactor>();
-                        var toCheck = new LinkedList<Reactor>();
-                        toCheck.add((Reactor) i.getReactorClass());
-                        while (!toCheck.isEmpty()) {
-                            var check = toCheck.pop();
-                            checked.add(check);
-                            if (!check.getStateVars().isEmpty()) {
-                                var hasResetReaction = check.getReactions().stream().anyMatch(
-                                        r -> r.getTriggers().stream().anyMatch(
-                                                t -> (t instanceof BuiltinTriggerRef &&
-                                                     ((BuiltinTriggerRef) t).getType() == BuiltinTrigger.RESET)));
-                                if (!hasResetReaction) {
-                                    // Add state vars that are not self-resetting to the error
-                                    check.getStateVars().stream().filter(s -> !s.isReset()).forEachOrdered(error::add);
-                                }
-                            }
-                            // continue with inner
-                            for (var innerInstance : check.getInstantiations()) {
-                                var next = (Reactor) innerInstance.getReactorClass();
-                                if (!checked.contains(next)) {
-                                    toCheck.push(next);
-                                }
-                            }
-                        }
-                        if (!error.isEmpty()) {
-                            error("This reactor contains state variables that are not reset upon mode entry: "
-                                    + error.stream().map(e -> e.getName() + " in "
-                                            + ASTUtils.getEnclosingReactor(e).getName()).collect(Collectors.joining(", "))
-                                    + ".\nThe state variables are neither marked for automatic reset nor have a dedicated reset reaction. "
-                                    + "It is unsafe to instantiate this reactor inside a mode entered with reset.",
-                                    m, Literals.MODE__INSTANTIATIONS,
-                                    m.getInstantiations().indexOf(i));
-                        }
-                    }
+              }
+              // continue with inner
+              for (var innerInstance : check.getInstantiations()) {
+                var next = (Reactor) innerInstance.getReactorClass();
+                if (!checked.contains(next)) {
+                  toCheck.push(next);
                 }
+              }
+            }
+            if (!error.isEmpty()) {
+              error(
+                  "This reactor contains state variables that are not reset upon mode entry: "
+                      + error.stream()
+                          .map(
+                              e -> e.getName() + " in " + ASTUtils.getEnclosingReactor(e).getName())
+                          .collect(Collectors.joining(", "))
+                      + ".\n"
+                      + "The state variables are neither marked for automatic reset nor have a"
+                      + " dedicated reset reaction. It is unsafe to instantiate this reactor inside"
+                      + " a mode entered with reset.",
+                  m,
+                  Literals.MODE__INSTANTIATIONS,
+                  m.getInstantiations().indexOf(i));
             }
+          }
         }
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkStateResetWithoutInitialValue(StateVar state) {
-        if (state.isReset() && (state.getInit() == null || state.getInit().getExprs().isEmpty())) {
-            error("The state variable can not be automatically reset without an initial value.", state, Literals.STATE_VAR__RESET);
-        }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkStateResetWithoutInitialValue(StateVar state) {
+    if (state.isReset() && (state.getInit() == null || state.getInit().getExprs().isEmpty())) {
+      error(
+          "The state variable can not be automatically reset without an initial value.",
+          state,
+          Literals.STATE_VAR__RESET);
     }
-
-    @Check(CheckType.FAST)
-    public void checkUnspecifiedTransitionType(Reaction reaction) {
-        for (var effect : reaction.getEffects()) {
-            var variable = effect.getVariable();
-            if (variable instanceof Mode) {
-                // The transition type is always set to default by Xtext.
-                // Hence, check if there is an explicit node for the transition type in the AST.
-                var transitionAssignment = NodeModelUtils.findNodesForFeature((EObject) effect, Literals.VAR_REF__TRANSITION);
-                if (transitionAssignment.isEmpty()) { // Transition type not explicitly specified.
-                    var mode = (Mode) variable;
-                    // Check if reset or history transition would make a difference.
-                    var makesDifference = !mode.getStateVars().isEmpty()
-                            || !mode.getTimers().isEmpty()
-                            || !mode.getActions().isEmpty()
-                            || mode.getConnections().stream().anyMatch(c -> c.getDelay() != null);
-                    if (!makesDifference && !mode.getInstantiations().isEmpty()) {
-                        // Also check instantiated reactors
-                        for (var i : mode.getInstantiations()) {
-                            var checked = new HashSet<Reactor>();
-                            var toCheck = new LinkedList<Reactor>();
-                            toCheck.add((Reactor) i.getReactorClass());
-                            while (!toCheck.isEmpty() && !makesDifference) {
-                                var check = toCheck.pop();
-                                checked.add(check);
-
-                                makesDifference |= !check.getModes().isEmpty()
-                                        || !ASTUtils.allStateVars(check).isEmpty()
-                                        || !ASTUtils.allTimers(check).isEmpty()
-                                        || !ASTUtils.allActions(check).isEmpty()
-                                        || ASTUtils.allConnections(check).stream().anyMatch(c -> c.getDelay() != null);
-
-                                // continue with inner
-                                for (var innerInstance : check.getInstantiations()) {
-                                    var next = (Reactor) innerInstance.getReactorClass();
-                                    if (!checked.contains(next)) {
-                                        toCheck.push(next);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    if (makesDifference) {
-                        warning("You should specify a transition type! "
-                                + "Reset and history transitions have different effects on this target mode. "
-                                + "Currently, a reset type is implicitly assumed.",
-                                reaction, Literals.REACTION__EFFECTS, reaction.getEffects().indexOf(effect));
-                    }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkUnspecifiedTransitionType(Reaction reaction) {
+    for (var effect : reaction.getEffects()) {
+      var variable = effect.getVariable();
+      if (variable instanceof Mode) {
+        // The transition type is always set to default by Xtext.
+        // Hence, check if there is an explicit node for the transition type in the AST.
+        var transitionAssignment =
+            NodeModelUtils.findNodesForFeature((EObject) effect, Literals.VAR_REF__TRANSITION);
+        if (transitionAssignment.isEmpty()) { // Transition type not explicitly specified.
+          var mode = (Mode) variable;
+          // Check if reset or history transition would make a difference.
+          var makesDifference =
+              !mode.getStateVars().isEmpty()
+                  || !mode.getTimers().isEmpty()
+                  || !mode.getActions().isEmpty()
+                  || mode.getConnections().stream().anyMatch(c -> c.getDelay() != null);
+          if (!makesDifference && !mode.getInstantiations().isEmpty()) {
+            // Also check instantiated reactors
+            for (var i : mode.getInstantiations()) {
+              var checked = new HashSet<Reactor>();
+              var toCheck = new LinkedList<Reactor>();
+              toCheck.add((Reactor) i.getReactorClass());
+              while (!toCheck.isEmpty() && !makesDifference) {
+                var check = toCheck.pop();
+                checked.add(check);
+
+                makesDifference |=
+                    !check.getModes().isEmpty()
+                        || !ASTUtils.allStateVars(check).isEmpty()
+                        || !ASTUtils.allTimers(check).isEmpty()
+                        || !ASTUtils.allActions(check).isEmpty()
+                        || ASTUtils.allConnections(check).stream()
+                            .anyMatch(c -> c.getDelay() != null);
+
+                // continue with inner
+                for (var innerInstance : check.getInstantiations()) {
+                  var next = (Reactor) innerInstance.getReactorClass();
+                  if (!checked.contains(next)) {
+                    toCheck.push(next);
+                  }
                 }
+              }
             }
+          }
+          if (makesDifference) {
+            warning(
+                "You should specify a transition type! "
+                    + "Reset and history transitions have different effects on this target mode. "
+                    + "Currently, a reset type is implicitly assumed.",
+                reaction,
+                Literals.REACTION__EFFECTS,
+                reaction.getEffects().indexOf(effect));
+          }
         }
+      }
+    }
+  }
+
+  //////////////////////////////////////////////////////////////
+  //// Public methods.
+
+  /** Return the error reporter for this validator. */
+  public ValidatorErrorReporter getErrorReporter() {
+    return this.errorReporter;
+  }
+
+  /** Implementation required by xtext to report validation errors. */
+  @Override
+  public ValidationMessageAcceptor getMessageAcceptor() {
+    return messageAcceptor == null ? this : messageAcceptor;
+  }
+
+  /** Return a list of error messages for the target declaration. */
+  public List<String> getTargetPropertyErrors() {
+    return this.targetPropertyErrors;
+  }
+
+  //////////////////////////////////////////////////////////////
+  //// Protected methods.
+
+  /** Generate an error message for an AST node. */
+  @Override
+  protected void error(java.lang.String message, org.eclipse.emf.ecore.EStructuralFeature feature) {
+    super.error(message, feature);
+  }
+
+  //////////////////////////////////////////////////////////////
+  //// Private methods.
+
+  /**
+   * For each input, report a conflict if: 1) the input exists and the type doesn't match; or 2) the
+   * input has a name clash with variable that is not an input.
+   *
+   * @param superVars List of typed variables of a particular kind (i.e., inputs, outputs, or
+   *     actions), found in a super class.
+   * @param sameKind Typed variables of the same kind, found in the subclass.
+   * @param allOwn Accumulator of non-conflicting variables incorporated in the subclass.
+   * @param conflicts Set of variables that are in conflict, to be used by this function to report
+   *     conflicts.
+   */
+  private <T extends TypedVariable> void checkConflict(
+      EList<T> superVars, EList<T> sameKind, List<Variable> allOwn, HashSet<Variable> conflicts) {
+    for (T superVar : superVars) {
+      T match = null;
+      for (T it : sameKind) {
+        if (it.getName().equals(superVar.getName())) {
+          match = it;
+          break;
+        }
+      }
+      List<Variable> rest = new ArrayList<>(allOwn);
+      rest.removeIf(it -> sameKind.contains(it));
+
+      if ((match != null && superVar.getType() != match.getType())
+          || hasNameConflict(superVar, rest)) {
+        conflicts.add(superVar);
+      } else {
+        allOwn.add(superVar);
+      }
+    }
+  }
+
+  /**
+   * Check the name of a feature for illegal substrings such as reserved identifiers and names with
+   * double leading underscores.
+   *
+   * @param name The name.
+   * @param feature The feature containing the name (for error reporting).
+   */
+  private void checkName(String name, EStructuralFeature feature) {
+
+    // Raises an error if the string starts with two underscores.
+    if (name.length() >= 2 && name.substring(0, 2).equals("__")) {
+      error(UNDERSCORE_MESSAGE + name, feature);
     }
 
-    //////////////////////////////////////////////////////////////
-    //// Public methods.
-
-    /**
-     * Return the error reporter for this validator.
-     */
-    public ValidatorErrorReporter getErrorReporter() {
-        return this.errorReporter;
-    }
-
-    /**
-     * Implementation required by xtext to report validation errors.
-     */
-    @Override
-    public ValidationMessageAcceptor getMessageAcceptor() {
-        return messageAcceptor == null ? this : messageAcceptor;
-    }
-
-    /**
-     * Return a list of error messages for the target declaration.
-     */
-    public List<String> getTargetPropertyErrors() {
-        return this.targetPropertyErrors;
-    }
-
-    //////////////////////////////////////////////////////////////
-    //// Protected methods.
-
-    /**
-     * Generate an error message for an AST node.
-     */
-    @Override
-    protected void error(java.lang.String message,
-        org.eclipse.emf.ecore.EStructuralFeature feature) {
-        super.error(message, feature);
-    }
-
-    //////////////////////////////////////////////////////////////
-    //// Private methods.
-
-    /**
-     * For each input, report a conflict if:
-     *   1) the input exists and the type doesn't match; or
-     *   2) the input has a name clash with variable that is not an input.
-     * @param superVars List of typed variables of a particular kind (i.e.,
-     *  inputs, outputs, or actions), found in a super class.
-     * @param sameKind Typed variables of the same kind, found in the subclass.
-     * @param allOwn Accumulator of non-conflicting variables incorporated in the
-     *  subclass.
-     * @param conflicts Set of variables that are in conflict, to be used by this
-     *  function to report conflicts.
-     */
-    private <T extends TypedVariable> void checkConflict (
-            EList<T> superVars, EList<T> sameKind, List<Variable> allOwn, HashSet<Variable> conflicts
-    ) {
-        for (T superVar : superVars) {
-            T match = null;
-            for (T it : sameKind) {
-                if (it.getName().equals(superVar.getName())) {
-                    match = it;
-                    break;
-                }
-            }
-            List<Variable> rest = new ArrayList<>(allOwn);
-            rest.removeIf(it -> sameKind.contains(it));
+    if (this.target.isReservedIdent(name)) {
+      error(RESERVED_MESSAGE + name, feature);
+    }
 
-            if ((match != null && superVar.getType() != match.getType()) || hasNameConflict(superVar, rest)) {
-                conflicts.add(superVar);
-            } else {
-                allOwn.add(superVar);
-            }
-        }
+    if (this.target == Target.TS) {
+      // "actions" is a reserved word within a TS reaction
+      if (name.equals("actions")) {
+        error(ACTIONS_MESSAGE + name, feature);
+      }
+    }
+  }
+
+  /**
+   * Check that the initializer is compatible with the type. Note that if the type is inferred it
+   * will necessarily be compatible so this method is not harmful.
+   */
+  public void typeCheck(Initializer init, InferredType type, EStructuralFeature feature) {
+    if (init == null) {
+      return;
     }
 
-    /**
-     * Check the name of a feature for illegal substrings such as reserved
-     * identifiers and names with double leading underscores.
-     * @param name The name.
-     * @param feature The feature containing the name (for error reporting).
-     */
-    private void checkName(String name, EStructuralFeature feature) {
+    // TODO:
+    //  type is list => init is list
+    //  type is fixed with size n => init is fixed with size n
+    // Specifically for C: list can only be literal or time lists
 
-        // Raises an error if the string starts with two underscores.
-        if (name.length() >= 2 && name.substring(0, 2).equals("__")) {
-            error(UNDERSCORE_MESSAGE + name, feature);
+    if (type.isTime) {
+      if (type.isList) {
+        // list of times
+        var exprs = init.getExprs();
+        if (exprs.isEmpty()) {
+          error("Expected at least one time value.", feature);
+          return;
         }
-
-        if (this.target.isReservedIdent(name)) {
-            error(RESERVED_MESSAGE + name, feature);
+        if (exprs.size() == 1 && exprs.get(0) instanceof BracedListExpression) {
+          exprs = ((BracedListExpression) exprs.get(0)).getItems();
         }
-
-        if (this.target == Target.TS) {
-            // "actions" is a reserved word within a TS reaction
-            if (name.equals("actions")) {
-                error(ACTIONS_MESSAGE + name, feature);
-            }
+        for (var component : exprs) {
+          checkExpressionIsTime(component, feature);
         }
+      } else {
+        checkExpressionIsTime(init, feature);
+      }
     }
+  }
 
-
-    /**
-     * Check that the initializer is compatible with the type.
-     * Note that if the type is inferred it will necessarily be compatible
-     * so this method is not harmful.
-     */
-    public void typeCheck(Initializer init, InferredType type, EStructuralFeature feature) {
-        if (init == null) {
-            return;
-        }
-
-        // TODO:
-        //  type is list => init is list
-        //  type is fixed with size n => init is fixed with size n
-        // Specifically for C: list can only be literal or time lists
-
-        if (type.isTime) {
-            if (type.isList) {
-                // list of times
-                var exprs = init.getExprs();
-                if (exprs.isEmpty()) {
-                    error("Expected at least one time value.", feature);
-                    return;
-                }
-                if (exprs.size() == 1 && exprs.get(0) instanceof BracedListExpression) {
-                    exprs = ((BracedListExpression) exprs.get(0)).getItems();
-                }
-                for (var component : exprs) {
-                    checkExpressionIsTime(component, feature);
-                }
-            } else {
-                checkExpressionIsTime(init, feature);
-            }
-        }
+  private void checkExpressionIsTime(Initializer init, EStructuralFeature feature) {
+    if (init == null) {
+      return;
     }
 
-    private void checkExpressionIsTime(Initializer init, EStructuralFeature feature) {
-        if (init == null) {
-            return;
-        }
-
-        if (init.getExprs().size() != 1) {
-            error("Expected exactly one time value.", feature);
-        } else {
-            checkExpressionIsTime(ASTUtils.asSingleExpr(init), feature);
-        }
+    if (init.getExprs().size() != 1) {
+      error("Expected exactly one time value.", feature);
+    } else {
+      checkExpressionIsTime(ASTUtils.asSingleExpr(init), feature);
     }
+  }
 
-    private void checkExpressionIsTime(Expression value, EStructuralFeature feature) {
-        if (value == null || value instanceof Time) {
-            return;
-        }
-
-        if (value instanceof ParameterReference) {
-            if (!ASTUtils.isOfTimeType(((ParameterReference) value).getParameter())
-                && target.requiresTypes) {
-                error("Referenced parameter is not of time type.", feature);
-            }
-            return;
-        } else if (value instanceof Literal) {
-            if (ASTUtils.isZero(((Literal) value).getLiteral())) {
-                return;
-            }
-
-            if (ASTUtils.isInteger(((Literal) value).getLiteral())) {
-                error("Missing time unit.", feature);
-                return;
-            }
-            // fallthrough
-        }
-
-        error("Invalid time value.", feature);
+  private void checkExpressionIsTime(Expression value, EStructuralFeature feature) {
+    if (value == null || value instanceof Time) {
+      return;
     }
 
-    /**
-     * Return the number of main or federated reactors declared.
-     *
-     * @param iter An iterator over all objects in the resource.
-     */
-    private int countMainOrFederated(TreeIterator<EObject> iter) {
-        int nMain = 0;
-        while (iter.hasNext()) {
-            EObject obj = iter.next();
-            if (!(obj instanceof Reactor)) {
-                continue;
-            }
-            Reactor r = (Reactor) obj;
-            if (r.isMain() || r.isFederated()) {
-                nMain++;
-            }
-        }
-        return nMain;
-    }
-
-    /**
-     * Report whether a given reactor has dependencies on a cyclic
-     * instantiation pattern. This means the reactor has an instantiation
-     * in it -- directly or in one of its contained reactors -- that is
-     * self-referential.
-     * @param reactor The reactor definition to find out whether it has any
-     * dependencies on cyclic instantiations.
-     * @param cycleSet The set of all reactors that are part of an
-     * instantiation cycle.
-     * @param visited The set of nodes already visited in this graph traversal.
-     */
-    private boolean dependsOnCycle(
-            Reactor reactor, Set<Reactor> cycleSet, Set<Reactor> visited
-    ) {
-        Set<Reactor> origins = info.instantiationGraph.getUpstreamAdjacentNodes(reactor);
-        if (visited.contains(reactor)) {
-            return false;
-        } else {
-            visited.add(reactor);
-            for (Reactor it : origins) {
-                if (cycleSet.contains(it) || dependsOnCycle(it, cycleSet, visited)) {
-                    // Reached a cycle.
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Report whether the name of the given element matches any variable in
-     * the ones to check against.
-     * @param element The element to compare against all variables in the given iterable.
-     * @param toCheckAgainst Iterable variables to compare the given element against.
-     */
-    private boolean hasNameConflict(Variable element,
-        Iterable<Variable> toCheckAgainst) {
-        int numNameConflicts = 0;
-        for (Variable it : toCheckAgainst) {
-            if (it.getName().equals(element.getName())) {
-                numNameConflicts++;
-            }
-        }
-        return numNameConflicts > 0;
+    if (value instanceof ParameterReference) {
+      if (!ASTUtils.isOfTimeType(((ParameterReference) value).getParameter())
+          && target.requiresTypes) {
+        error("Referenced parameter is not of time type.", feature);
+      }
+      return;
+    } else if (value instanceof Literal) {
+      if (ASTUtils.isZero(((Literal) value).getLiteral())) {
+        return;
+      }
+
+      if (ASTUtils.isInteger(((Literal) value).getLiteral())) {
+        error("Missing time unit.", feature);
+        return;
+      }
+      // fallthrough
     }
 
-    /**
-     * Return true if target is C or a C-based target like CCpp.
-     */
-    private boolean isCBasedTarget() {
-        return (this.target == Target.C || this.target == Target.CCPP);
+    error("Invalid time value.", feature);
+  }
+
+  /**
+   * Return the number of main or federated reactors declared.
+   *
+   * @param iter An iterator over all objects in the resource.
+   */
+  private int countMainOrFederated(TreeIterator<EObject> iter) {
+    int nMain = 0;
+    while (iter.hasNext()) {
+      EObject obj = iter.next();
+      if (!(obj instanceof Reactor)) {
+        continue;
+      }
+      Reactor r = (Reactor) obj;
+      if (r.isMain() || r.isFederated()) {
+        nMain++;
+      }
     }
-
-    /**
-     * Report whether a given imported reactor is used in this resource or not.
-     * @param reactor The imported reactor to check whether it is used.
-     */
-    private boolean isUnused(ImportedReactor reactor) {
-        TreeIterator<EObject> instantiations = reactor.eResource().getAllContents();
-        TreeIterator<EObject> subclasses = reactor.eResource().getAllContents();
-
-        boolean instantiationsCheck = true;
-        while (instantiations.hasNext() && instantiationsCheck) {
-            EObject obj = instantiations.next();
-            if (!(obj instanceof Instantiation)) {
-                continue;
-            }
-            Instantiation inst = (Instantiation) obj;
-            instantiationsCheck &= (inst.getReactorClass() != reactor && inst.getReactorClass() != reactor.getReactorClass());
-        }
-
-        boolean subclassesCheck = true;
-        while (subclasses.hasNext() && subclassesCheck) {
-            EObject obj = subclasses.next();
-            if (!(obj instanceof Reactor)) {
-                continue;
-            }
-            Reactor subclass = (Reactor) obj;
-            for (ReactorDecl decl : subclass.getSuperClasses()) {
-                subclassesCheck &= (decl != reactor && decl != reactor.getReactorClass());
-            }
-        }
-        return instantiationsCheck && subclassesCheck;
+    return nMain;
+  }
+
+  /**
+   * Report whether a given reactor has dependencies on a cyclic instantiation pattern. This means
+   * the reactor has an instantiation in it -- directly or in one of its contained reactors -- that
+   * is self-referential.
+   *
+   * @param reactor The reactor definition to find out whether it has any dependencies on cyclic
+   *     instantiations.
+   * @param cycleSet The set of all reactors that are part of an instantiation cycle.
+   * @param visited The set of nodes already visited in this graph traversal.
+   */
+  private boolean dependsOnCycle(Reactor reactor, Set<Reactor> cycleSet, Set<Reactor> visited) {
+    Set<Reactor> origins = info.instantiationGraph.getUpstreamAdjacentNodes(reactor);
+    if (visited.contains(reactor)) {
+      return false;
+    } else {
+      visited.add(reactor);
+      for (Reactor it : origins) {
+        if (cycleSet.contains(it) || dependsOnCycle(it, cycleSet, visited)) {
+          // Reached a cycle.
+          return true;
+        }
+      }
     }
-
-    /**
-     * Return true if the two types match. Unfortunately, xtext does not
-     * seem to create a suitable equals() method for Type, so we have to
-     * do this manually.
-     */
-    private boolean sameType(Type type1, Type type2) {
-        if (type1 == null) {
-            return type2 == null;
-        }
-        if (type2 == null) {
-            return type1 == null;
-        }
-        // Most common case first.
-        if (type1.getId() != null) {
-            if (type1.getStars() != null) {
-                if (type2.getStars() == null) return false;
-                if (type1.getStars().size() != type2.getStars().size()) return false;
-            }
-            return (type1.getId().equals(type2.getId()));
-        }
-
-        // Type specification in the grammar is:
-        // (time?='time' (arraySpec=ArraySpec)?) | ((id=(DottedName) (stars+='*')* ('<' typeParms+=TypeParm (',' typeParms+=TypeParm)* '>')? (arraySpec=ArraySpec)?) | code=Code);
-        if (type1.isTime()) {
-            if (!type2.isTime()) return false;
-            // Ignore the arraySpec because that is checked when connection
-            // is checked for balance.
-            return true;
-        }
-        // Type must be given in a code body
-        return type1.getCode().getBody().equals(type2.getCode().getBody());
+    return false;
+  }
+
+  /**
+   * Report whether the name of the given element matches any variable in the ones to check against.
+   *
+   * @param element The element to compare against all variables in the given iterable.
+   * @param toCheckAgainst Iterable variables to compare the given element against.
+   */
+  private boolean hasNameConflict(Variable element, Iterable<Variable> toCheckAgainst) {
+    int numNameConflicts = 0;
+    for (Variable it : toCheckAgainst) {
+      if (it.getName().equals(element.getName())) {
+        numNameConflicts++;
+      }
+    }
+    return numNameConflicts > 0;
+  }
+
+  /** Return true if target is C or a C-based target like CCpp. */
+  private boolean isCBasedTarget() {
+    return (this.target == Target.C || this.target == Target.CCPP);
+  }
+
+  /**
+   * Report whether a given imported reactor is used in this resource or not.
+   *
+   * @param reactor The imported reactor to check whether it is used.
+   */
+  private boolean isUnused(ImportedReactor reactor) {
+    TreeIterator<EObject> instantiations = reactor.eResource().getAllContents();
+    TreeIterator<EObject> subclasses = reactor.eResource().getAllContents();
+
+    boolean instantiationsCheck = true;
+    while (instantiations.hasNext() && instantiationsCheck) {
+      EObject obj = instantiations.next();
+      if (!(obj instanceof Instantiation)) {
+        continue;
+      }
+      Instantiation inst = (Instantiation) obj;
+      instantiationsCheck &=
+          (inst.getReactorClass() != reactor
+              && inst.getReactorClass() != reactor.getReactorClass());
     }
 
-    //////////////////////////////////////////////////////////////
-    //// Private fields.
-
-    /** The error reporter. */
-    private ValidatorErrorReporter errorReporter
-        = new ValidatorErrorReporter(getMessageAcceptor(), new ValidatorStateAccess());
-
-    /** Helper class containing information about the model. */
-    private ModelInfo info = new ModelInfo();
-
-    @Inject(optional = true)
-    private ValidationMessageAcceptor messageAcceptor;
-
-    /** The declared target. */
-    private Target target;
-
-    private List<String> targetPropertyErrors = new ArrayList<>();
-
-    private List<String> targetPropertyWarnings = new ArrayList<>();
-
-    //////////////////////////////////////////////////////////////
-    //// Private static constants.
-
-    private static String ACTIONS_MESSAGE
-        = "\"actions\" is a reserved word for the TypeScript target for objects "
-                + "(inputs, outputs, actions, timers, parameters, state, reactor definitions, "
-                + "and reactor instantiation): ";
-
-    private static String HOST_OR_FQN_REGEX
-        = "^([a-z0-9]+(-[a-z0-9]+)*)|(([a-z0-9]+(-[a-z0-9]+)*\\.)+[a-z]{2,})$";
-
-    /**
-     * Regular expression to check the validity of IPV4 addresses (due to David M. Syzdek).
-     */
-    private static String IPV4_REGEX = "((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}" +
-                                      "(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])";
-
-    /**
-     * Regular expression to check the validity of IPV6 addresses (due to David M. Syzdek),
-     * with minor adjustment to allow up to six IPV6 segments (without truncation) in front
-     * of an embedded IPv4-address.
-     **/
-    private static String IPV6_REGEX =
-                "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|" +
-                "([0-9a-fA-F]{1,4}:){1,7}:|" +
-                "([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|" +
-                "([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|" +
-                "([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|" +
-                "([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|" +
-                "([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|" +
-                 "[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|" +
-                                 ":((:[0-9a-fA-F]{1,4}){1,7}|:)|" +
-        "fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|" +
-        "::(ffff(:0{1,4}){0,1}:){0,1}" + IPV4_REGEX + "|" +
-        "([0-9a-fA-F]{1,4}:){1,4}:"    + IPV4_REGEX + "|" +
-        "([0-9a-fA-F]{1,4}:){1,6}"     + IPV4_REGEX + ")";
-
-    private static String RESERVED_MESSAGE = "Reserved words in the target language are not allowed for objects "
-            + "(inputs, outputs, actions, timers, parameters, state, reactor definitions, and reactor instantiation): ";
-
-    private static List<String> SPACING_VIOLATION_POLICIES = List.of("defer", "drop", "replace");
-
-    private static String UNDERSCORE_MESSAGE = "Names of objects (inputs, outputs, actions, timers, parameters, "
-            + "state, reactor definitions, and reactor instantiation) may not start with \"__\": ";
-
-    private static String USERNAME_REGEX = "^[a-z_]([a-z0-9_-]{0,31}|[a-z0-9_-]{0,30}\\$)$";
+    boolean subclassesCheck = true;
+    while (subclasses.hasNext() && subclassesCheck) {
+      EObject obj = subclasses.next();
+      if (!(obj instanceof Reactor)) {
+        continue;
+      }
+      Reactor subclass = (Reactor) obj;
+      for (ReactorDecl decl : subclass.getSuperClasses()) {
+        subclassesCheck &= (decl != reactor && decl != reactor.getReactorClass());
+      }
+    }
+    return instantiationsCheck && subclassesCheck;
+  }
+
+  /**
+   * Return true if the two types match. Unfortunately, xtext does not seem to create a suitable
+   * equals() method for Type, so we have to do this manually.
+   */
+  private boolean sameType(Type type1, Type type2) {
+    if (type1 == null) {
+      return type2 == null;
+    }
+    if (type2 == null) {
+      return type1 == null;
+    }
+    // Most common case first.
+    if (type1.getId() != null) {
+      if (type1.getStars() != null) {
+        if (type2.getStars() == null) return false;
+        if (type1.getStars().size() != type2.getStars().size()) return false;
+      }
+      return (type1.getId().equals(type2.getId()));
+    }
 
+    // Type specification in the grammar is:
+    // (time?='time' (arraySpec=ArraySpec)?) | ((id=(DottedName) (stars+='*')* ('<'
+    // typeParms+=TypeParm (',' typeParms+=TypeParm)* '>')? (arraySpec=ArraySpec)?) | code=Code);
+    if (type1.isTime()) {
+      if (!type2.isTime()) return false;
+      // Ignore the arraySpec because that is checked when connection
+      // is checked for balance.
+      return true;
+    }
+    // Type must be given in a code body
+    return type1.getCode().getBody().equals(type2.getCode().getBody());
+  }
+
+  //////////////////////////////////////////////////////////////
+  //// Private fields.
+
+  /** The error reporter. */
+  private ValidatorErrorReporter errorReporter =
+      new ValidatorErrorReporter(getMessageAcceptor(), new ValidatorStateAccess());
+
+  /** Helper class containing information about the model. */
+  private ModelInfo info = new ModelInfo();
+
+  @Inject(optional = true)
+  private ValidationMessageAcceptor messageAcceptor;
+
+  /** The declared target. */
+  private Target target;
+
+  private List<String> targetPropertyErrors = new ArrayList<>();
+
+  private List<String> targetPropertyWarnings = new ArrayList<>();
+
+  //////////////////////////////////////////////////////////////
+  //// Private static constants.
+
+  private static String ACTIONS_MESSAGE =
+      "\"actions\" is a reserved word for the TypeScript target for objects "
+          + "(inputs, outputs, actions, timers, parameters, state, reactor definitions, "
+          + "and reactor instantiation): ";
+
+  private static String HOST_OR_FQN_REGEX =
+      "^([a-z0-9]+(-[a-z0-9]+)*)|(([a-z0-9]+(-[a-z0-9]+)*\\.)+[a-z]{2,})$";
+
+  /** Regular expression to check the validity of IPV4 addresses (due to David M. Syzdek). */
+  private static String IPV4_REGEX =
+      "((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}"
+          + "(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])";
+
+  /**
+   * Regular expression to check the validity of IPV6 addresses (due to David M. Syzdek), with minor
+   * adjustment to allow up to six IPV6 segments (without truncation) in front of an embedded
+   * IPv4-address.
+   */
+  private static String IPV6_REGEX =
+      "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|"
+          + "([0-9a-fA-F]{1,4}:){1,7}:|"
+          + "([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|"
+          + "([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|"
+          + "([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|"
+          + "([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|"
+          + "([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|"
+          + "[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|"
+          + ":((:[0-9a-fA-F]{1,4}){1,7}|:)|"
+          + "fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|"
+          + "::(ffff(:0{1,4}){0,1}:){0,1}"
+          + IPV4_REGEX
+          + "|"
+          + "([0-9a-fA-F]{1,4}:){1,4}:"
+          + IPV4_REGEX
+          + "|"
+          + "([0-9a-fA-F]{1,4}:){1,6}"
+          + IPV4_REGEX
+          + ")";
+
+  private static String RESERVED_MESSAGE =
+      "Reserved words in the target language are not allowed for objects (inputs, outputs, actions,"
+          + " timers, parameters, state, reactor definitions, and reactor instantiation): ";
+
+  private static List<String> SPACING_VIOLATION_POLICIES = List.of("defer", "drop", "replace");
+
+  private static String UNDERSCORE_MESSAGE =
+      "Names of objects (inputs, outputs, actions, timers, parameters, "
+          + "state, reactor definitions, and reactor instantiation) may not start with \"__\": ";
+
+  private static String USERNAME_REGEX = "^[a-z_]([a-z0-9_-]{0,31}|[a-z0-9_-]{0,30}\\$)$";
 }
diff --git a/org.lflang/src/org/lflang/validation/ValidatorErrorReporter.java b/org.lflang/src/org/lflang/validation/ValidatorErrorReporter.java
index ace55683f6..d21458a3a9 100644
--- a/org.lflang/src/org/lflang/validation/ValidatorErrorReporter.java
+++ b/org.lflang/src/org/lflang/validation/ValidatorErrorReporter.java
@@ -1,16 +1,16 @@
 /*************
  * Copyright (c) 2021, TU Dresden.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  * this list of conditions and the following disclaimer.
- * 
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  * this list of conditions and the following disclaimer in the documentation
  * and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -27,155 +27,160 @@
 package org.lflang.validation;
 
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
-
 import org.lflang.ErrorReporter;
 
 /**
- * This class translates messages reported via the ErrorReporrter interface to
- * the interface of a given ValidationMessageAcceptor.
- * 
- * Effectively this allows to report errors via the ErrorReporter interface
- * during validator checks, while having the validator still track all the
- * reported warnings and messages. This is required for some functionality, like
- * the construction of an instance graph in LFValidator.checkModel(). Since the
- * instance graph is also used in other components, it does not report directly
- * to the validator, but uses our custom ErrorReporter interface that we use
- * during code generation. This class bridges the gap between the ErrorReporter
- * interface and the messages that the validator expects.
- * 
+ * This class translates messages reported via the ErrorReporrter interface to the interface of a
+ * given ValidationMessageAcceptor.
+ *
+ * <p>Effectively this allows to report errors via the ErrorReporter interface during validator
+ * checks, while having the validator still track all the reported warnings and messages. This is
+ * required for some functionality, like the construction of an instance graph in
+ * LFValidator.checkModel(). Since the instance graph is also used in other components, it does not
+ * report directly to the validator, but uses our custom ErrorReporter interface that we use during
+ * code generation. This class bridges the gap between the ErrorReporter interface and the messages
+ * that the validator expects.
+ *
  * @author Christian Menard
  */
 public class ValidatorErrorReporter implements ErrorReporter {
 
-    private ValidationMessageAcceptor acceptor;
-    private BaseLFValidator.ValidatorStateAccess validatorState;
-    private boolean errorsOccurred = false;
-
-    public ValidatorErrorReporter(ValidationMessageAcceptor acceptor,
-            BaseLFValidator.ValidatorStateAccess stateAccess) {
-        this.acceptor = acceptor;
-        this.validatorState = stateAccess;
-    }
-
-    /**
-     * Report the given message as an error on the object currently under
-     * validation.
-     */
-    @Override
-    public String reportError(String message) {
-        errorsOccurred = true;
-        acceptor.acceptError(message, validatorState.getCurrentObject(), null,
-                ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-        return message;
-    }
-
-    /**
-     * Report the given message as an error on the given object.
-     */
-    @Override
-    public String reportError(EObject object, String message) {
-        errorsOccurred = true;
-        acceptor.acceptError(message, object, null,
-                ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-        return message;
-    }
-
-    /**
-     * Report the given message as an error on the current object.
-     * 
-     * Unfortunately, there is no way to provide a path and a line number to the
-     * ValidationMessageAcceptor as messages can only be reported directly as
-     * EObjects. While it is not an ideal solution, this method composes a
-     * messages indicating the location of the error and reports this on the
-     * object currently under validation. This way, the error message is not
-     * lost, but it is not necessarily reported precisely at the location of the
-     * actual error.
-     */
-    @Override
-    public String reportError(Path file, Integer line, String message) {
-        errorsOccurred = true;
-        String fullMessage = message + " (Reported from " + file.toString() + " on line "
-            + line.toString() + ")";
-        acceptor.acceptError(fullMessage, validatorState.getCurrentObject(),
-                null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-        return fullMessage;
-    }
-
-    /**
-     * Report the given message as a waring on the object currently under
-     * validation.
-     */
-    @Override
-    public String reportWarning(String message) {
-        acceptor.acceptWarning(message, validatorState.getCurrentObject(), null,
-                ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-        return message;
-    }
-
-    @Override
-    public String reportInfo(String message) {
-        acceptor.acceptInfo(message, validatorState.getCurrentObject(), null,
-                               ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-        return message;
-    }
-
-    /**
-     * Report the given message as a warning on the given object.
-     */
-    @Override
-    public String reportWarning(EObject object, String message) {
-        acceptor.acceptWarning(message, object, null,
-                ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-        return message;
-    }
-
-    @Override
-    public String reportInfo(EObject object, String message) {
-        acceptor.acceptInfo(message, object, null,
-                               ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-        return message;
-    }
-
-
-    /**
-     * Report the given message as an warning on the current object.
-     * 
-     * Unfortunately, there is no way to provide a path and a line number to the
-     * ValidationMessageAcceptor as messages can only be reported directly as
-     * EObjects. While it is not an ideal solution, this method composes a
-     * messages indicating the location of the warning and reports this on the
-     * object currently under validation. This way, the warning message is not
-     * lost, but it is not necessarily reported precisely at the location of the
-     * actual warning.
-     */
-    @Override
-    public String reportWarning(Path file, Integer line, String message) {
-        String fullMessage = message + " (Reported from " + file.toString() + " on line "
-            + line.toString() + ")";
-        acceptor.acceptWarning(fullMessage, validatorState.getCurrentObject(),
-                null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-        return fullMessage;
-    }
-
-    @Override
-    public String reportInfo(Path file, Integer line, String message) {
-        String fullMessage = message + " (Reported from " + file.toString() + " on line "
-            + line.toString() + ")";
-        acceptor.acceptInfo(fullMessage, validatorState.getCurrentObject(),
-                               null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-        return fullMessage;
-    }
-
-    /**
-     * Check if errors where reported.
-     *
-     * @return true if errors where reported
-     */
-    @Override
-    public boolean getErrorsOccurred() {
-        return errorsOccurred;
-    }
+  private ValidationMessageAcceptor acceptor;
+  private BaseLFValidator.ValidatorStateAccess validatorState;
+  private boolean errorsOccurred = false;
+
+  public ValidatorErrorReporter(
+      ValidationMessageAcceptor acceptor, BaseLFValidator.ValidatorStateAccess stateAccess) {
+    this.acceptor = acceptor;
+    this.validatorState = stateAccess;
+  }
+
+  /** Report the given message as an error on the object currently under validation. */
+  @Override
+  public String reportError(String message) {
+    errorsOccurred = true;
+    acceptor.acceptError(
+        message,
+        validatorState.getCurrentObject(),
+        null,
+        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
+        null);
+    return message;
+  }
+
+  /** Report the given message as an error on the given object. */
+  @Override
+  public String reportError(EObject object, String message) {
+    errorsOccurred = true;
+    acceptor.acceptError(
+        message, object, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+    return message;
+  }
+
+  /**
+   * Report the given message as an error on the current object.
+   *
+   * <p>Unfortunately, there is no way to provide a path and a line number to the
+   * ValidationMessageAcceptor as messages can only be reported directly as EObjects. While it is
+   * not an ideal solution, this method composes a messages indicating the location of the error and
+   * reports this on the object currently under validation. This way, the error message is not lost,
+   * but it is not necessarily reported precisely at the location of the actual error.
+   */
+  @Override
+  public String reportError(Path file, Integer line, String message) {
+    errorsOccurred = true;
+    String fullMessage =
+        message + " (Reported from " + file.toString() + " on line " + line.toString() + ")";
+    acceptor.acceptError(
+        fullMessage,
+        validatorState.getCurrentObject(),
+        null,
+        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
+        null);
+    return fullMessage;
+  }
+
+  /** Report the given message as a waring on the object currently under validation. */
+  @Override
+  public String reportWarning(String message) {
+    acceptor.acceptWarning(
+        message,
+        validatorState.getCurrentObject(),
+        null,
+        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
+        null);
+    return message;
+  }
+
+  @Override
+  public String reportInfo(String message) {
+    acceptor.acceptInfo(
+        message,
+        validatorState.getCurrentObject(),
+        null,
+        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
+        null);
+    return message;
+  }
+
+  /** Report the given message as a warning on the given object. */
+  @Override
+  public String reportWarning(EObject object, String message) {
+    acceptor.acceptWarning(
+        message, object, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+    return message;
+  }
+
+  @Override
+  public String reportInfo(EObject object, String message) {
+    acceptor.acceptInfo(message, object, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+    return message;
+  }
+
+  /**
+   * Report the given message as an warning on the current object.
+   *
+   * <p>Unfortunately, there is no way to provide a path and a line number to the
+   * ValidationMessageAcceptor as messages can only be reported directly as EObjects. While it is
+   * not an ideal solution, this method composes a messages indicating the location of the warning
+   * and reports this on the object currently under validation. This way, the warning message is not
+   * lost, but it is not necessarily reported precisely at the location of the actual warning.
+   */
+  @Override
+  public String reportWarning(Path file, Integer line, String message) {
+    String fullMessage =
+        message + " (Reported from " + file.toString() + " on line " + line.toString() + ")";
+    acceptor.acceptWarning(
+        fullMessage,
+        validatorState.getCurrentObject(),
+        null,
+        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
+        null);
+    return fullMessage;
+  }
+
+  @Override
+  public String reportInfo(Path file, Integer line, String message) {
+    String fullMessage =
+        message + " (Reported from " + file.toString() + " on line " + line.toString() + ")";
+    acceptor.acceptInfo(
+        fullMessage,
+        validatorState.getCurrentObject(),
+        null,
+        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
+        null);
+    return fullMessage;
+  }
+
+  /**
+   * Check if errors where reported.
+   *
+   * @return true if errors where reported
+   */
+  @Override
+  public boolean getErrorsOccurred() {
+    return errorsOccurred;
+  }
 }

From 6786aaa3954b49b76c48ad06555a9d98fe43482c Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 23 May 2023 14:44:24 -0700
Subject: [PATCH 0142/1114] Fix mistake from merge.

---
 org.lflang/src/org/lflang/generator/ReactorInstance.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/org.lflang/src/org/lflang/generator/ReactorInstance.java b/org.lflang/src/org/lflang/generator/ReactorInstance.java
index 3314d81fba..837ccf7e5c 100644
--- a/org.lflang/src/org/lflang/generator/ReactorInstance.java
+++ b/org.lflang/src/org/lflang/generator/ReactorInstance.java
@@ -163,6 +163,8 @@ public ReactorInstance(Reactor reactor, ReactorInstance parent, ErrorReporter re
   /** Indicator that this reactor has itself as a parent, an error condition. */
   public final boolean recursive;
 
+  // An enclave object if this ReactorInstance is an enclave. null if not
+  public EnclaveInfo enclaveInfo = null;
   public TypeParameterizedReactor tpr;
 
   //////////////////////////////////////////////////////

From 4343136addd5d702e66d455f1fe3378abac92a98 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 23 May 2023 15:07:24 -0700
Subject: [PATCH 0143/1114] Fix typo in  some names

---
 .../org/lflang/generator/c/CTriggerObjectsGenerator.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 3a80d15ca6..67d731211e 100644
--- a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -71,9 +71,9 @@ public static String generateInitializeTriggerObjects(
 
         // Create arrays of counters for managing pointer arrays of startup, shutdown, reset and triggers
         code.pr(String.join("\n",
-            "int startup_reaction_count[_num_enclaves] = {0};",
-            "int shutdown_reaction_count[_num_enclaves] = {0};",
-            "int reset_reaction_count[_num_enclaves] = {0};",
+            "int startup_reactions_count[_num_enclaves] = {0};",
+            "int shutdown_reactions_count[_num_enclaves] = {0};",
+            "int reset_reactions_count[_num_enclaves] = {0};",
             "int timer_triggers_count[_num_enclaves] = {0};"
             ));
 

From 5b8e479fa7df65e27d48ef276323a59a617aca75 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 23 May 2023 15:07:51 -0700
Subject: [PATCH 0144/1114] Mark NonCommunicating test as @enclave

---
 test/C/src/enclaves/NonCommunicating.lf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/C/src/enclaves/NonCommunicating.lf b/test/C/src/enclaves/NonCommunicating.lf
index 1532479f19..525cab6eb6 100644
--- a/test/C/src/enclaves/NonCommunicating.lf
+++ b/test/C/src/enclaves/NonCommunicating.lf
@@ -16,11 +16,13 @@ reactor Fast {
     reaction(t) {=
 
     =} deadline(10 msec) {=
-        lf_print_error_and_exit("Fast Reactor was stalled");
+        time_t lag = lf_time_physical() - lf_time_logical();
+        lf_print_error_and_exit("Fast Reactor was stalled lag=" PRINTF_TIME, lag);
     =}
 }
 
 main reactor {
     s = new Slow()
+    @enclave
     f = new Fast()
 }
\ No newline at end of file

From 13b870b25cb5b77a11dceca8cfe73465e0b7135e Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 23 May 2023 15:10:39 -0700
Subject: [PATCH 0145/1114] Typos

---
 org.lflang/src/org/lflang/generator/c/CGenerator.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
index 7f00badc92..e53830a8b6 100644
--- a/org.lflang/src/org/lflang/generator/c/CGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -1432,7 +1432,7 @@ private void recordBuiltinTriggers(ReactorInstance instance) {
         if (trigger.isStartup()) {
           temp.pr(
               enclaveStruct
-                  + "._lf_startup_reactions[startup_reactions_count["
+                  + "._lf_startup_reactions[startup_reaction_count["
                   + enclaveId
                   + "]++] = &"
                   + reactionRef
@@ -1442,7 +1442,7 @@ private void recordBuiltinTriggers(ReactorInstance instance) {
         } else if (trigger.isShutdown()) {
           temp.pr(
               enclaveStruct
-                  + "._lf_shutdown_reactions[shutdown_reactions_count["
+                  + "._lf_shutdown_reactions[shutdown_reaction_count["
                   + enclaveId
                   + "]++] = &"
                   + reactionRef
@@ -1466,7 +1466,7 @@ private void recordBuiltinTriggers(ReactorInstance instance) {
         } else if (trigger.isReset()) {
           temp.pr(
               enclaveStruct
-                  + "._lf_reset_reactions[reset_reactions_count["
+                  + "._lf_reset_reactions[reset_reaction_count["
                   + enclaveId
                   + "]++] = &"
                   + reactionRef

From cd1c747ab65d8ea2da258375279eac2eebfdefc2 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 23 May 2023 15:25:24 -0700
Subject: [PATCH 0146/1114] Bump reactor-c

---
 org.lflang/src/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index be695c0a36..96504f9612 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit be695c0a365de77760637ead1715109962bff1e7
+Subproject commit 96504f9612a2b590e99749fbe83b9c4a29ad71a2

From 33c029b31cbf0a11cd6914b947f612525244a4ca Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 23 May 2023 16:26:55 -0700
Subject: [PATCH 0147/1114] Run formatter

---
 test/C/src/enclaves/DelayedCommunication.lf | 20 +++++++++-----------
 test/C/src/enclaves/NonCommunicating.lf     | 12 ++++--------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/test/C/src/enclaves/DelayedCommunication.lf b/test/C/src/enclaves/DelayedCommunication.lf
index 65d48255a0..186d65f1c4 100644
--- a/test/C/src/enclaves/DelayedCommunication.lf
+++ b/test/C/src/enclaves/DelayedCommunication.lf
@@ -1,25 +1,24 @@
-target C;
+target C
 
 reactor Sender {
-    output out:int
+    output out: int
 
     timer t(0, 50 msec)
-    state cnt:int(0)
-    reaction(t) -> out {=
-        lf_set(out, self->cnt++);
-    =}
+    state cnt: int = 0
+
+    reaction(t) -> out {= lf_set(out, self->cnt++); =}
 }
 
 reactor Receiver {
     input in: int
-    state last:time_t(0)
-    state cnt:int(0)
+    state last: time_t = 0
+    state cnt: int = 0
 
     reaction(in) {=
         time_t now = lf_time_logical_elapsed();
         if (now - self->last != MSEC(50)) {
             lf_print_error_and_exit("now=%lli last=%lli", now, self->last);
-        } 
+        }
         if (self->cnt++ != in->value) {
             lf_print_error_and_exit("recv=%u exp=%u", in->value, self->cnt);
         }
@@ -28,10 +27,9 @@ reactor Receiver {
     =}
 }
 
-
 main reactor {
     sender = new Sender()
     receiver = new Receiver()
 
     sender.out -> receiver.in after 50 msec
-}
\ No newline at end of file
+}
diff --git a/test/C/src/enclaves/NonCommunicating.lf b/test/C/src/enclaves/NonCommunicating.lf
index 525cab6eb6..0f939e5ce4 100644
--- a/test/C/src/enclaves/NonCommunicating.lf
+++ b/test/C/src/enclaves/NonCommunicating.lf
@@ -1,21 +1,17 @@
 target C {
     scheduler: NP
-};
+}
 
 reactor Slow {
     timer t(0, 100 msec)
 
-    reaction(t) {=
-        lf_sleep(MSEC(50));
-    =}
+    reaction(t) {= lf_sleep(MSEC(50)); =}
 }
 
 reactor Fast {
     timer t(0, 20 msec)
 
-    reaction(t) {=
-
-    =} deadline(10 msec) {=
+    reaction(t) {=  =} deadline(10 msec) {=
         time_t lag = lf_time_physical() - lf_time_logical();
         lf_print_error_and_exit("Fast Reactor was stalled lag=" PRINTF_TIME, lag);
     =}
@@ -25,4 +21,4 @@ main reactor {
     s = new Slow()
     @enclave
     f = new Fast()
-}
\ No newline at end of file
+}

From 18d498588cc88d4d1f7f7a7149f74dc0854704b7 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 23 May 2023 16:35:40 -0700
Subject: [PATCH 0148/1114] Start towards supporting federated execution as
 well

---
 org.lflang/src/lib/c/reactor-c                              | 2 +-
 .../src/org/lflang/federated/extensions/CExtension.java     | 6 ++++--
 .../org/lflang/generator/c/CTriggerObjectsGenerator.java    | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index 96504f9612..43b3d3eae8 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 96504f9612a2b590e99749fbe83b9c4a29ad71a2
+Subproject commit 43b3d3eae89b65fc89bbc5e521813d0c4d10adb0
diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtension.java b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
index 121cf5d817..ba1bdc53f0 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
@@ -309,6 +309,7 @@ public String generateNetworkSenderBody(
     String commonArgs =
         String.join(
             ", ",
+            "self->base.environment",
             additionalDelayString,
             messageType,
             receivingPortID + "",
@@ -484,6 +485,7 @@ public String generateNetworkOutputControlReactionBody(
             "if (" + sendRef + " == NULL || !" + sendRef + "->is_present) {",
             "    // The output port is NULL or it is not present.",
             "    send_port_absent_to_federate("
+                + "self->base.environment, "
                 + additionalDelayString
                 + ", "
                 + receivingPortID
@@ -620,7 +622,7 @@ private String generateExecutablePreamble(
     code.pr(CExtensionUtils.allocateTriggersForFederate(federate));
 
     return """
-            void _lf_executable_preamble() {
+            void _lf_executable_preamble(enviroment* env) {
             %s
             }
             """
@@ -641,7 +643,7 @@ private String generateCodeToInitializeFederate(FederateInstance federate, RtiCo
             "\n",
             "// Initialize the socket mutex",
             "lf_mutex_init(&outbound_socket_mutex);",
-            "lf_cond_init(&port_status_changed, &mutex);"));
+            "lf_cond_init(&port_status_changed, &env->mutex);"));
 
     // Find the STA (A.K.A. the global STP offset) for this federate.
     if (federate.targetConfig.coordination == CoordinationType.DECENTRALIZED) {
diff --git a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 5f3ea0df7b..2e339b0f99 100644
--- a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -90,10 +90,11 @@ public static String generateInitializeTriggerObjects(
     code.pr(setReactionPriorities(main));
     code.pr(generateSchedulerInitializerMain(main, targetConfig));
 
+    // FIXME: This is a little hack since we know top-level/main is always first (has index 0)
     code.pr(
         """
         #ifdef EXECUTABLE_PREAMBLE
-        _lf_executable_preamble();
+        _lf_executable_preamble(&envs[0]);
         #endif
         """);
 

From e99391141a94a3e0108d4ea4e544ba5eff061369 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 23 May 2023 17:32:20 -0700
Subject: [PATCH 0149/1114] Code-generate correct terminate_execution function

---
 org.lflang/src/org/lflang/generator/c/CGenerator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
index e53830a8b6..a411fe404c 100644
--- a/org.lflang/src/org/lflang/generator/c/CGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -693,7 +693,7 @@ private void generateCodeFor(String lfModuleName) throws IOException {
       code.pr(
           """
                 #ifndef FEDERATED
-                void terminate_execution() {}
+                void terminate_execution(environment_t* env) {}
                 #endif""");
 
       // Generate functions for modes

From 7d3e1fae8f6df54fcefc39f1ba8ba4fa6b19c458 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 23 May 2023 17:32:36 -0700
Subject: [PATCH 0150/1114] Bump reactor-C

---
 org.lflang/src/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index 43b3d3eae8..ad3a11f8df 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 43b3d3eae89b65fc89bbc5e521813d0c4d10adb0
+Subproject commit ad3a11f8df473fc3968fb1dd3946a3f2e4884254

From ad84238aa0b992fa2e8fbf2c65928ea2c32830f2 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 23 May 2023 17:46:21 -0700
Subject: [PATCH 0151/1114] Code-generate the correct call to create the p2p
 federated thread creation

---
 .../src/org/lflang/federated/extensions/CExtension.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtension.java b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
index ba1bdc53f0..3427f132cc 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
@@ -622,7 +622,7 @@ private String generateExecutablePreamble(
     code.pr(CExtensionUtils.allocateTriggersForFederate(federate));
 
     return """
-            void _lf_executable_preamble(enviroment* env) {
+            void _lf_executable_preamble(environment_t* env) {
             %s
             }
             """
@@ -748,7 +748,7 @@ private String generateCodeToInitializeFederate(FederateInstance federate, RtiCo
               "// physical connections. The thread will live until all connections",
               "// have been established.",
               "lf_thread_create(&_fed.inbound_p2p_handling_thread_id,"
-                  + " handle_p2p_connections_from_federates, NULL);"));
+                  + " handle_p2p_connections_from_federates, env);"));
     }
 
     for (FederateInstance remoteFederate : federate.outboundP2PConnections) {

From 499c02e7a3387cb81934f9d0f69eef9f0aebc14e Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 23 May 2023 17:51:22 -0700
Subject: [PATCH 0152/1114] Code generate correct call to
 wait_until_port_status_known

---
 org.lflang/src/org/lflang/federated/extensions/CExtension.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtension.java b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
index 3427f132cc..e21c31fbce 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
@@ -447,7 +447,7 @@ public String generateNetworkInputControlReactionBody(
       result.pr("max_STP = " + CTypes.getInstance().getTargetTimeExpr(maxSTP) + ";");
     }
     result.pr("// Wait until the port status is known");
-    result.pr("wait_until_port_status_known(" + receivingPortID + ", max_STP);");
+    result.pr("wait_until_port_status_known(self->base.environment" + receivingPortID + ", max_STP);");
     return result.toString();
   }
 

From 0d67cc00c64c3a980b3a6b7c1c50308f1b2a1a2e Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 23 May 2023 18:40:18 -0700
Subject: [PATCH 0153/1114] typo

---
 org.lflang/src/org/lflang/federated/extensions/CExtension.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtension.java b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
index e21c31fbce..f5c940eac2 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
@@ -447,7 +447,7 @@ public String generateNetworkInputControlReactionBody(
       result.pr("max_STP = " + CTypes.getInstance().getTargetTimeExpr(maxSTP) + ";");
     }
     result.pr("// Wait until the port status is known");
-    result.pr("wait_until_port_status_known(self->base.environment" + receivingPortID + ", max_STP);");
+    result.pr("wait_until_port_status_known(self->base.environment, " + receivingPortID + ", max_STP);");
     return result.toString();
   }
 

From 82eaed1a7287f5c14753bfb37134d7c6e04faf35 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 23 May 2023 18:40:34 -0700
Subject: [PATCH 0154/1114] update

---
 org.lflang/src/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index ad3a11f8df..cbe4bea3cc 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit ad3a11f8df473fc3968fb1dd3946a3f2e4884254
+Subproject commit cbe4bea3cc5dec83abe3c674cbec7a3e3dfb3d0b

From 5cfff864b0f77312e8ae86dd504d69db037c6211 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 24 May 2023 08:21:22 -0700
Subject: [PATCH 0155/1114] bump reactor-c

---
 org.lflang/src/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index cbe4bea3cc..b55badb419 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit cbe4bea3cc5dec83abe3c674cbec7a3e3dfb3d0b
+Subproject commit b55badb419868217feac20e3d59cd965062e96a7

From c3659c09a6bd5008fe5e8e8ccc330c6b62d5453a Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 24 May 2023 14:25:26 -0700
Subject: [PATCH 0156/1114] Minor fixes

---
 org.lflang/src/org/lflang/generator/c/CReactionGenerator.java | 4 ++--
 .../src/org/lflang/generator/c/CTriggerObjectsGenerator.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
index 7d687b9ecf..8745888660 100644
--- a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
@@ -688,7 +688,7 @@ private static String generateInputVariablesInReaction(
               "    " + inputName + "->length = " + inputName + "->token->length;",
               "    "
                   + inputName
-                  + "->token = lf_writable_copy(self->base.environment, (lf_port_base_t*)self->_lf_"
+                  + "->token = lf_writable_copy((lf_port_base_t*)self->_lf_"
                   + inputName
                   + ");",
               "    "
@@ -729,7 +729,7 @@ private static String generateInputVariablesInReaction(
                   + "[i];",
               "        "
                   + inputName
-                  + "[i]->token = lf_writable_copy(self->base.environment,"
+                  + "[i]->token = lf_writable_copy("
                   + " (lf_port_base_t*)_lf_input);",
               "        "
                   + inputName
diff --git a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 2e339b0f99..5abb7ba234 100644
--- a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -845,7 +845,7 @@ private static String deferredCreateTemplateTokens(ReactorInstance reactor, CTyp
         code.pr(
             String.join(
                 "\n",
-                "_lf_initialize_template(env, (token_template_t*)",
+                "_lf_initialize_template((token_template_t*)",
                 "        &(" + CUtil.portRef(output) + "),",
                 size + ");"));
         code.endChannelIteration(output);

From d6b0130c0bd0508490e014b6ee3c262a3e098cdc Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 24 May 2023 14:45:19 -0700
Subject: [PATCH 0157/1114] Update SheduleAt test to use new API

---
 test/C/src/concurrent/ScheduleAt.lf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/C/src/concurrent/ScheduleAt.lf b/test/C/src/concurrent/ScheduleAt.lf
index 2ef6af7af6..97c3188965 100644
--- a/test/C/src/concurrent/ScheduleAt.lf
+++ b/test/C/src/concurrent/ScheduleAt.lf
@@ -76,7 +76,7 @@ reactor Scheduler {
 
     reaction(startup) -> act {=
         for (int i=0; i < 16; i++) {
-            _lf_schedule_at_tag(act->trigger,
+            _lf_schedule_at_tag(self->base.environment, act->trigger,
                 (tag_t) { .time = self->times[i] + lf_time_logical(), .microstep = self->microstep_delay_list[i]},
                 NULL);
         }

From f5657913bc25c717470bb52712a30b8500b657dd Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 24 May 2023 14:54:06 -0700
Subject: [PATCH 0158/1114] Code-generate environment pointer for watchdogs

---
 org.lflang/src/org/lflang/generator/c/CWatchdogGenerator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/org/lflang/generator/c/CWatchdogGenerator.java b/org.lflang/src/org/lflang/generator/c/CWatchdogGenerator.java
index f864ca2661..e55017dbbc 100644
--- a/org.lflang/src/org/lflang/generator/c/CWatchdogGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CWatchdogGenerator.java
@@ -259,7 +259,7 @@ private static String generateFunction(String header, String init, Watchdog watc
     function.pr(header + " {");
     function.indent();
     function.pr(init);
-    function.pr("_lf_schedule((*" + watchdog.getName() + ").trigger, 0, NULL);");
+    function.pr("_lf_schedule(self->base.environment, (*" + watchdog.getName() + ").trigger, 0, NULL);");
     function.prSourceLineNumber(watchdog.getCode());
     function.pr(ASTUtils.toText(watchdog.getCode()));
     function.unindent();

From d9aed97808ad7ed197e2a61ed3ceb2b2dfad1f08 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 24 May 2023 14:59:00 -0700
Subject: [PATCH 0159/1114] Move DelayedCommunication test into failing

---
 test/C/src/enclaves/{ => failing}/DelayedCommunication.lf | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/C/src/enclaves/{ => failing}/DelayedCommunication.lf (100%)

diff --git a/test/C/src/enclaves/DelayedCommunication.lf b/test/C/src/enclaves/failing/DelayedCommunication.lf
similarity index 100%
rename from test/C/src/enclaves/DelayedCommunication.lf
rename to test/C/src/enclaves/failing/DelayedCommunication.lf

From 8c71565ae8e86ee9dec9bd7cc4498953f780583e Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 24 May 2023 15:57:20 -0700
Subject: [PATCH 0160/1114] Add timeouts to enclave tests

---
 test/C/src/enclaves/NonCommunicating.lf             | 3 ++-
 test/C/src/enclaves/failing/DelayedCommunication.lf | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/C/src/enclaves/NonCommunicating.lf b/test/C/src/enclaves/NonCommunicating.lf
index 0f939e5ce4..e969c65a71 100644
--- a/test/C/src/enclaves/NonCommunicating.lf
+++ b/test/C/src/enclaves/NonCommunicating.lf
@@ -1,5 +1,6 @@
 target C {
-    scheduler: NP
+    scheduler: NP,
+    timeout: 1 sec
 }
 
 reactor Slow {
diff --git a/test/C/src/enclaves/failing/DelayedCommunication.lf b/test/C/src/enclaves/failing/DelayedCommunication.lf
index 186d65f1c4..cb66e52897 100644
--- a/test/C/src/enclaves/failing/DelayedCommunication.lf
+++ b/test/C/src/enclaves/failing/DelayedCommunication.lf
@@ -1,4 +1,6 @@
-target C
+target C {
+    timeout: 2 sec
+}
 
 reactor Sender {
     output out: int

From a0d2318185084880b9e871dab99b3cbbb4f71030 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 24 May 2023 16:31:27 -0700
Subject: [PATCH 0161/1114] Move all enclaved tests to failing

---
 test/C/src/enclaves/{ => failing}/NonCommunicating.lf | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/C/src/enclaves/{ => failing}/NonCommunicating.lf (100%)

diff --git a/test/C/src/enclaves/NonCommunicating.lf b/test/C/src/enclaves/failing/NonCommunicating.lf
similarity index 100%
rename from test/C/src/enclaves/NonCommunicating.lf
rename to test/C/src/enclaves/failing/NonCommunicating.lf

From dd4580e45a6fa3847b9c81d8696519a35b18936f Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 24 May 2023 18:14:16 -0700
Subject: [PATCH 0162/1114] Initial support for modal reactors

---
 .../src/org/lflang/generator/EnclaveInfo.java |  2 +
 .../c/CEnvironmentFunctionGenerator.java      |  2 +
 .../org/lflang/generator/c/CGenerator.java    | 26 ++++++-----
 .../lflang/generator/c/CModesGenerator.java   | 38 ++++++----------
 .../lflang/generator/c/CPortGenerator.java    |  6 +--
 .../generator/c/CReactionGenerator.java       | 43 ++++++++++---------
 .../lflang/generator/c/CTimerGenerator.java   | 14 +++---
 .../generator/c/CTriggerObjectsGenerator.java |  4 +-
 8 files changed, 64 insertions(+), 71 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/EnclaveInfo.java b/org.lflang/src/org/lflang/generator/EnclaveInfo.java
index ba249bfe44..e933e25665 100644
--- a/org.lflang/src/org/lflang/generator/EnclaveInfo.java
+++ b/org.lflang/src/org/lflang/generator/EnclaveInfo.java
@@ -7,6 +7,8 @@ public class EnclaveInfo {
   public int numTimerTriggers = 0;
   public int numResetReactions = 0;
   public int numWorkers = 1;
+  public int numModalReactors = 1;
+  public int numModalResetStates = 0;
 
   private ReactorInstance instance;
 
diff --git a/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
index d7df4b8e37..abb4d7c3c7 100644
--- a/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -87,6 +87,8 @@ private String generateCreateEnvironments() {
               + enclave.enclaveInfo.numResetReactions
               + ","
               + enclave.enclaveInfo.numIsPresentFields
+              + ","
+              + enclave.enclaveInfo.numModalReactors
               + ");");
     }
     code.unindent();
diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
index a411fe404c..bb2be35b93 100644
--- a/org.lflang/src/org/lflang/generator/c/CGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -227,20 +227,20 @@
  *       <h2 id="runtime-tables">Runtime Tables</h2>
  *       This generator creates an populates the following tables used at run time. These tables may
  *       have to be resized and adjusted when mutations occur.
- *   <li>_lf_is_present_fields: An array of pointers to booleans indicating whether an event is
+ *   <li>is_present_fields: An array of pointers to booleans indicating whether an event is
  *       present. The _lf_start_time_step() function in reactor_common.c uses this to mark every
  *       event absent at the start of a time step. The size of this table is contained in the
- *       variable _lf_is_present_fields_size.
+ *       variable is_present_fields_size.
  *       <ul>
- *         <li>This table is accompanied by another list, _lf_is_present_fields_abbreviated, which
+ *         <li>This table is accompanied by another list, is_present_fields_abbreviated, which
  *             only contains the is_present fields that have been set to true in the current tag.
  *             This list can allow a performance improvement if most ports are seldom present
  *             because only fields that have been set to true need to be reset to false.
  *       </ul>
  *   <li>_lf_shutdown_triggers: An array of pointers to trigger_t structs for shutdown reactions.
  *       The length of this table is in the _lf_shutdown_triggers_size variable.
- *   <li>_lf_timer_triggers: An array of pointers to trigger_t structs for timers that need to be
- *       started when the program runs. The length of this table is in the _lf_timer_triggers_size
+ *   <li>timer_triggers: An array of pointers to trigger_t structs for timers that need to be
+ *       started when the program runs. The length of this table is in the timer_triggers_size
  *       variable.
  *   <li>_lf_action_table: For a federated execution, each federate will have this table that maps
  *       port IDs to the corresponding action struct, which can be cast to action_base_t.
@@ -616,8 +616,6 @@ private void generateCodeFor(String lfModuleName) throws IOException {
     // Note that any main reactors in imported files are ignored.
     // Skip generation if there are cycles.
     if (main != null) {
-      initializeTriggerObjects.pr(
-          CModesGenerator.generateModalInitalizationCounters(hasModalReactors));
       var envFuncGen = new CEnvironmentFunctionGenerator(main);
 
       code.pr(envFuncGen.generateDeclarations());
@@ -1432,7 +1430,7 @@ private void recordBuiltinTriggers(ReactorInstance instance) {
         if (trigger.isStartup()) {
           temp.pr(
               enclaveStruct
-                  + "._lf_startup_reactions[startup_reaction_count["
+                  + ".startup_reactions[startup_reaction_count["
                   + enclaveId
                   + "]++] = &"
                   + reactionRef
@@ -1442,7 +1440,7 @@ private void recordBuiltinTriggers(ReactorInstance instance) {
         } else if (trigger.isShutdown()) {
           temp.pr(
               enclaveStruct
-                  + "._lf_shutdown_reactions[shutdown_reaction_count["
+                  + ".shutdown_reactions[shutdown_reaction_count["
                   + enclaveId
                   + "]++] = &"
                   + reactionRef
@@ -1466,7 +1464,7 @@ private void recordBuiltinTriggers(ReactorInstance instance) {
         } else if (trigger.isReset()) {
           temp.pr(
               enclaveStruct
-                  + "._lf_reset_reactions[reset_reaction_count["
+                  + ".reset_reactions[reset_reaction_count["
                   + enclaveId
                   + "]++] = &"
                   + reactionRef
@@ -1529,7 +1527,7 @@ private void generateStartTimeStep(ReactorInstance instance) {
 
           temp.pr(
               enclaveStruct
-                  + "._lf_is_present_fields["
+                  + ".is_present_fields["
                   + enclaveInfo.numIsPresentFields
                   + " + count] = &"
                   + portRef
@@ -1571,7 +1569,7 @@ private void generateStartTimeStep(ReactorInstance instance) {
           String.join(
               "\n",
               "// Add action " + action.getFullName() + " to array of is_present fields.",
-              enclaveStruct + "._lf_is_present_fields[" + enclaveInfo.numIsPresentFields + "] ",
+              enclaveStruct + ".is_present_fields[" + enclaveInfo.numIsPresentFields + "] ",
               "        = &"
                   + containerSelfStructName
                   + "->_lf_"
@@ -1618,7 +1616,7 @@ private void generateStartTimeStep(ReactorInstance instance) {
             temp.startChannelIteration(output);
             temp.pr(
                 enclaveStruct
-                    + "._lf_is_present_fields["
+                    + ".is_present_fields["
                     + enclaveInfo.numIsPresentFields
                     + " + count] = &"
                     + CUtil.portRef(output)
@@ -1655,7 +1653,7 @@ private void generateStartTimeStep(ReactorInstance instance) {
    * For each timer in the given reactor, generate initialization code for the offset and period
    * fields.
    *
-   * <p>This method will also populate the global _lf_timer_triggers array, which is used to start
+   * <p>This method will also populate the global timer_triggers array, which is used to start
    * all timers at the start of execution.
    *
    * @param instance A reactor instance.
diff --git a/org.lflang/src/org/lflang/generator/c/CModesGenerator.java b/org.lflang/src/org/lflang/generator/c/CModesGenerator.java
index 7d72890639..8330f07cfd 100644
--- a/org.lflang/src/org/lflang/generator/c/CModesGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CModesGenerator.java
@@ -79,10 +79,8 @@ public static String generateModeStatesTable(
       boolean hasModalReactors, int modalReactorCount, int modalStateResetCount) {
     if (hasModalReactors) {
       return String.join(
+          // FIXME: Fix the mode_state_variable_reset-data_t thingy
           "\n",
-          "// Array of pointers to mode states to be handled in _lf_handle_mode_changes().",
-          "reactor_mode_state_t* _lf_modal_reactor_states[" + modalReactorCount + "];",
-          "int _lf_modal_reactor_states_size = " + modalReactorCount + ";",
           (modalStateResetCount > 0
               ? String.join(
                   "\n",
@@ -97,19 +95,6 @@ public static String generateModeStatesTable(
     return "";
   }
 
-  /**
-   * Generate counter variable declarations used for registering modal reactors.
-   *
-   * @param hasModalReactors True if there is modal model reactors, false otherwise
-   */
-  public static String generateModalInitalizationCounters(boolean hasModalReactors) {
-    if (hasModalReactors) {
-      return String.join(
-          "\n", "int _lf_modal_reactor_states_count = 0;", "int _lf_modal_state_reset_count = 0;");
-    }
-    return "";
-  }
-
   /**
    * Generate code for modal reactor registration and hierarchy.
    *
@@ -167,7 +152,8 @@ public static void generateModeStructure(ReactorInstance instance, CodeBuilder c
     if (!instance.modes.isEmpty()) {
       code.pr("// Register for transition handling");
       code.pr(
-          "_lf_modal_reactor_states[_lf_modal_reactor_states_count++] = &((self_base_t*)"
+          CUtil.getEnvironmentStruct(instance)
+              + ".modes->modal_reactor_states[modal_reactor_state_count["+CUtil.getEnvironmentId(instance)+"]++] = &((self_base_t*)"
               + nameOfSelfStruct
               + ")->_lf__mode_state;");
     }
@@ -211,14 +197,15 @@ public static String generateLfHandleModeChanges(
     }
     return String.join(
         "\n",
-        "void _lf_handle_mode_changes() {",
+        "void _lf_handle_mode_changes(environment_t* env) {",
         "    _lf_process_mode_changes(",
-        "        _lf_modal_reactor_states, ",
-        "        _lf_modal_reactor_states_size, ",
+        "        env, ",
+        "        env->modes->modal_reactor_states, ",
+        "        env->modes->modal_reactor_states_size, ",
         "        " + (modalStateResetCount > 0 ? "_lf_modal_state_reset" : "NULL") + ", ",
         "        " + (modalStateResetCount > 0 ? "_lf_modal_state_reset_size" : "0") + ", ",
-        "        _lf_timer_triggers, ",
-        "        _lf_timer_triggers_size",
+        "        env->timer_triggers, ",
+        "        env->timer_triggers_size",
         "    );",
         "}");
   }
@@ -234,10 +221,11 @@ public static String generateLfInitializeModes(boolean hasModalReactors) {
     }
     return String.join(
         "\n",
-        "void _lf_initialize_modes() {",
+        "void _lf_initialize_modes(environment_t* env) {",
         "    _lf_initialize_mode_states(",
-        "        _lf_modal_reactor_states, ",
-        "        _lf_modal_reactor_states_size);",
+        "        env, ",
+        "        env->modes->modal_reactor_states, ",
+        "        env->modes->modal_reactor_states_size);",
         "}");
   }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CPortGenerator.java b/org.lflang/src/org/lflang/generator/c/CPortGenerator.java
index 02697f4a85..b6a9fc2726 100644
--- a/org.lflang/src/org/lflang/generator/c/CPortGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CPortGenerator.java
@@ -130,10 +130,10 @@ public static String initializeInputMultiport(PortInstance input, String reactor
                 + "__sparse->capacity = "
                 + input.getWidth()
                 + "/LF_SPARSE_CAPACITY_DIVIDER;",
-            "    if (_lf_sparse_io_record_sizes.start == NULL) {",
-            "        _lf_sparse_io_record_sizes = vector_new(1);",
+            "    if (sparse_io_record_sizes.start == NULL) {",
+            "        sparse_io_record_sizes = vector_new(1);",
             "    }",
-            "    vector_push(&_lf_sparse_io_record_sizes, (void*)&"
+            "    vector_push(&sparse_io_record_sizes, (void*)&"
                 + portRefName
                 + "__sparse->size);",
             "}");
diff --git a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
index 8745888660..70bb7d80c8 100644
--- a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
@@ -1145,26 +1145,27 @@ public static String generateLfTriggerStartupReactions(boolean hasModalReactors)
       s.append(
           String.join(
               "\n",
-              "    for (int i = 0; i < env->_lf_startup_reactions_size; i++) {",
-              "        if (env->_lf_startup_reactions[i] != NULL) {",
-              "            if (env->_lf_startup_reactions[i]->mode != NULL) {",
+              "    for (int i = 0; i < env->startup_reactions_size; i++) {",
+              "        if (env->startup_reactions[i] != NULL) {",
+              "            if (env->startup_reactions[i]->mode != NULL) {",
               "                // Skip reactions in modes",
               "                continue;",
               "            }",
-              "            _lf_trigger_reaction(env, env->_lf_startup_reactions[i], -1);",
+              "            _lf_trigger_reaction(env, env->startup_reactions[i], -1);",
               "        }",
               "    }",
               "    _lf_handle_mode_startup_reset_reactions(",
-              "        env->_lf_startup_reactions, env->_lf_startup_reactions_size,",
+              "        env,",
+              "        env->startup_reactions, env->startup_reactions_size,",
               "        NULL, 0,",
-              "        _lf_modal_reactor_states, _lf_modal_reactor_states_size);"));
+              "        env->modes->modal_reactor_states, env->modes->modal_reactor_states_size);"));
     } else {
       s.append(
           String.join(
               "\n",
-              "    for (int i = 0; i < env->_lf_startup_reactions_size; i++) {",
-              "        if (env->_lf_startup_reactions[i] != NULL) {",
-              "            _lf_trigger_reaction(env, env->_lf_startup_reactions[i], -1);",
+              "    for (int i = 0; i < env->startup_reactions_size; i++) {",
+              "        if (env->startup_reactions[i] != NULL) {",
+              "            _lf_trigger_reaction(env, env->startup_reactions[i], -1);",
               "        }",
               "    }"));
     }
@@ -1183,26 +1184,26 @@ public static String generateLfTriggerShutdownReactions(
         s.append(
             String.join(
                 "\n",
-                "    for (int i = 0; i < _lf_shutdown_reactions_size; i++) {",
-                "        if (_lf_shutdown_reactions[i] != NULL) {",
-                "            if (_lf_shutdown_reactions[i]->mode != NULL) {",
+                "    for (int i = 0; i < shutdown_reactions_size; i++) {",
+                "        if (shutdown_reactions[i] != NULL) {",
+                "            if (shutdown_reactions[i]->mode != NULL) {",
                 "                // Skip reactions in modes",
                 "                continue;",
                 "            }",
-                "            _lf_trigger_reaction(env, _lf_shutdown_reactions[i], -1);", // FIXME:
+                "            _lf_trigger_reaction(env, shutdown_reactions[i], -1);", // FIXME:
                 // Enclaves
                 // hack
                 "        }",
                 "    }",
-                "    _lf_handle_mode_shutdown_reactions(env, _lf_shutdown_reactions_size);",
+                "    _lf_handle_mode_shutdown_reactions(env, shutdown_reactions_size);",
                 "    return true;"));
       } else {
         s.append(
             String.join(
                 "\n",
-                "    for (int i = 0; i < _lf_shutdown_reactions_size; i++) {",
-                "        if (_lf_shutdown_reactions[i] != NULL) {",
-                "            _lf_trigger_reaction(env, _lf_shutdown_reactions[i], -1);", // FIXME:
+                "    for (int i = 0; i < shutdown_reactions_size; i++) {",
+                "        if (shutdown_reactions[i] != NULL) {",
+                "            _lf_trigger_reaction(env, shutdown_reactions[i], -1);", // FIXME:
                 // Enclaves
                 // hack
                 "        }",
@@ -1224,11 +1225,11 @@ public static String generateLfModeTriggeredReactions(
       return "";
     }
     var s = new StringBuilder();
-    s.append("void _lf_handle_mode_triggered_reactions() {\n");
+    s.append("void _lf_handle_mode_triggered_reactions(environment_t* env) {\n");
     s.append("    _lf_handle_mode_startup_reset_reactions(\n");
-    s.append("        _lf_startup_reactions, _lf_startup_reactions_size,\n");
-    s.append("        _lf_reset_reactions, _lf_reset_reactions_size,\n");
-    s.append("        _lf_modal_reactor_states, _lf_modal_reactor_states_size);\n");
+    s.append("        env, env->startup_reactions, env->startup_reactions_size,\n");
+    s.append("        env->reset_reactions, env->reset_reactions_size,\n");
+    s.append("        env->modes->modal_reactor_states, env->modes->modal_reactor_states_size);\n");
     s.append("}\n");
     return s.toString();
   }
diff --git a/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java b/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
index 15155122be..742220a2b0 100644
--- a/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
@@ -39,7 +39,7 @@ public static String generateInitializer(TimerInstance timer) {
             "// Associate timer with the environment of its parent",
             "envs["
                 + envId
-                + "]._lf_timer_triggers[timer_triggers_count["
+                + "].timer_triggers[timer_triggers_count["
                 + envId
                 + "]++] = &"
                 + triggerStructName
@@ -58,10 +58,10 @@ public static String generateDeclarations(int timerCount) {
         List.of(
             "// Array of pointers to timer triggers to be scheduled in _lf_initialize_timers().",
             (timerCount > 0
-                    ? "trigger_t* _lf_timer_triggers[" + timerCount + "]"
-                    : "trigger_t** _lf_timer_triggers = NULL")
+                    ? "trigger_t* timer_triggers[" + timerCount + "]"
+                    : "trigger_t** timer_triggers = NULL")
                 + ";",
-            "int _lf_timer_triggers_size = " + timerCount + ";"));
+            "int timer_triggers_size = " + timerCount + ";"));
   }
 
   /**
@@ -73,9 +73,9 @@ public static String generateLfInitializeTimer() {
     return String.join(
         "\n",
         "void _lf_initialize_timers(environment_t *env) {",
-        "   for (int i = 0; i < env->_lf_timer_triggers_size; i++) {",
-        "       if (env->_lf_timer_triggers[i] != NULL) {",
-        "            _lf_initialize_timer(env, env->_lf_timer_triggers[i]);",
+        "   for (int i = 0; i < env->timer_triggers_size; i++) {",
+        "       if (env->timer_triggers[i] != NULL) {",
+        "            _lf_initialize_timer(env, env->timer_triggers[i]);",
         "        }",
         "    }",
         "}");
diff --git a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 5abb7ba234..4d7fc4d1f1 100644
--- a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -70,7 +70,9 @@ public static String generateInitializeTriggerObjects(
             "int startup_reaction_count[_num_enclaves] = {0};",
             "int shutdown_reaction_count[_num_enclaves] = {0};",
             "int reset_reaction_count[_num_enclaves] = {0};",
-            "int timer_triggers_count[_num_enclaves] = {0};"));
+            "int timer_triggers_count[_num_enclaves] = {0};",
+            "int modal_reactor_state_reset_count[_num_enclaves] = {0};",
+            "int modal_reactor_state_count[_num_enclaves] = {0};"));
 
     // Create the table to initialize intended tag fields to 0 between time
     // steps.

From b02202a4c47639c2a148e95ecf4050e3e7768fe9 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 24 May 2023 23:59:21 -0700
Subject: [PATCH 0163/1114] no_inlining tests are moved to failure since the
 self pointer forwarded is not adequate for environments

---
 .../{ => failing}/BankMultiportToReactionNoInlining.lf            | 0
 test/C/src/no_inlining/{ => failing}/BankToReactionNoInlining.lf  | 0
 test/C/src/no_inlining/{ => failing}/Count.lf                     | 0
 test/C/src/no_inlining/{ => failing}/CountHierarchy.lf            | 0
 test/C/src/no_inlining/{ => failing}/IntPrint.lf                  | 0
 .../no_inlining/{ => failing}/MultiportToReactionNoInlining.lf    | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename test/C/src/no_inlining/{ => failing}/BankMultiportToReactionNoInlining.lf (100%)
 rename test/C/src/no_inlining/{ => failing}/BankToReactionNoInlining.lf (100%)
 rename test/C/src/no_inlining/{ => failing}/Count.lf (100%)
 rename test/C/src/no_inlining/{ => failing}/CountHierarchy.lf (100%)
 rename test/C/src/no_inlining/{ => failing}/IntPrint.lf (100%)
 rename test/C/src/no_inlining/{ => failing}/MultiportToReactionNoInlining.lf (100%)

diff --git a/test/C/src/no_inlining/BankMultiportToReactionNoInlining.lf b/test/C/src/no_inlining/failing/BankMultiportToReactionNoInlining.lf
similarity index 100%
rename from test/C/src/no_inlining/BankMultiportToReactionNoInlining.lf
rename to test/C/src/no_inlining/failing/BankMultiportToReactionNoInlining.lf
diff --git a/test/C/src/no_inlining/BankToReactionNoInlining.lf b/test/C/src/no_inlining/failing/BankToReactionNoInlining.lf
similarity index 100%
rename from test/C/src/no_inlining/BankToReactionNoInlining.lf
rename to test/C/src/no_inlining/failing/BankToReactionNoInlining.lf
diff --git a/test/C/src/no_inlining/Count.lf b/test/C/src/no_inlining/failing/Count.lf
similarity index 100%
rename from test/C/src/no_inlining/Count.lf
rename to test/C/src/no_inlining/failing/Count.lf
diff --git a/test/C/src/no_inlining/CountHierarchy.lf b/test/C/src/no_inlining/failing/CountHierarchy.lf
similarity index 100%
rename from test/C/src/no_inlining/CountHierarchy.lf
rename to test/C/src/no_inlining/failing/CountHierarchy.lf
diff --git a/test/C/src/no_inlining/IntPrint.lf b/test/C/src/no_inlining/failing/IntPrint.lf
similarity index 100%
rename from test/C/src/no_inlining/IntPrint.lf
rename to test/C/src/no_inlining/failing/IntPrint.lf
diff --git a/test/C/src/no_inlining/MultiportToReactionNoInlining.lf b/test/C/src/no_inlining/failing/MultiportToReactionNoInlining.lf
similarity index 100%
rename from test/C/src/no_inlining/MultiportToReactionNoInlining.lf
rename to test/C/src/no_inlining/failing/MultiportToReactionNoInlining.lf

From d331ece82cd05be5e25992b8205bfc34b1ad04d9 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Fri, 26 May 2023 13:43:24 +0200
Subject: [PATCH 0164/1114] Only do CI on ubuntu. Will adrress Windows failures
 later

---
 .github/workflows/c-tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml
index 0764128a1b..9ab4359ad0 100644
--- a/.github/workflows/c-tests.yml
+++ b/.github/workflows/c-tests.yml
@@ -21,7 +21,8 @@ jobs:
   run:
     strategy:
       matrix:
-        platform: [ubuntu-latest, macos-latest, windows-latest]
+        # platform: [ubuntu-latest, macos-latest, windows-latest]
+        platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Check out lingua-franca repository

From 10b807e5b81e5cefea747e55f7a1aa62b9528a53 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Fri, 26 May 2023 13:56:49 +0200
Subject: [PATCH 0165/1114] Count the numModalReactors inside EnclaveInfo

---
 org.lflang/src/org/lflang/generator/c/CGenerator.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
index bb2be35b93..fefd1addc4 100644
--- a/org.lflang/src/org/lflang/generator/c/CGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -300,7 +300,6 @@ public class CGenerator extends GeneratorBase {
   private int shutdownReactionCount = 0;
 
   private int resetReactionCount = 0;
-  private int modalReactorCount = 0;
   private int modalStateResetCount = 0;
   private int watchdogCount = 0;
 
@@ -650,7 +649,7 @@ private void generateCodeFor(String lfModuleName) throws IOException {
       // If there are modes, create a table of mode state to be checked for transitions.
       code.pr(
           CModesGenerator.generateModeStatesTable(
-              hasModalReactors, modalReactorCount, modalStateResetCount));
+              hasModalReactors, 0, modalStateResetCount));
 
       // Generate function to initialize the trigger objects for all reactors.
       code.pr(
@@ -1908,7 +1907,7 @@ private void generateSetDeadline(ReactorInstance instance) {
   private void generateModeStructure(ReactorInstance instance) {
     CModesGenerator.generateModeStructure(instance, initializeTriggerObjects);
     if (!instance.modes.isEmpty()) {
-      modalReactorCount += instance.getTotalWidth();
+      CUtil.getClosestEnclave(instance).enclaveInfo.numModalReactors += instance.getTotalWidth();
     }
   }
 

From 236c2b02a3bc80c37f0a7ef5586e5ada5e6e5f48 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Sat, 27 May 2023 06:00:31 +0200
Subject: [PATCH 0166/1114] Handle auto reset of modal state. All modal tests
 pass locally

---
 org.lflang/src/lib/c/reactor-c                |  2 +-
 .../src/org/lflang/generator/EnclaveInfo.java |  2 +-
 .../c/CEnvironmentFunctionGenerator.java      | 27 ++++------
 .../org/lflang/generator/c/CGenerator.java    | 10 +---
 .../lflang/generator/c/CModesGenerator.java   | 53 +++++--------------
 .../lflang/generator/c/CStateGenerator.java   |  4 +-
 .../generator/c/CTriggerObjectsGenerator.java |  4 +-
 7 files changed, 31 insertions(+), 71 deletions(-)

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index b55badb419..3398a59c82 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit b55badb419868217feac20e3d59cd965062e96a7
+Subproject commit 3398a59c82e6cb084bd619f946b4e4c768acb2ad
diff --git a/org.lflang/src/org/lflang/generator/EnclaveInfo.java b/org.lflang/src/org/lflang/generator/EnclaveInfo.java
index e933e25665..1898d82124 100644
--- a/org.lflang/src/org/lflang/generator/EnclaveInfo.java
+++ b/org.lflang/src/org/lflang/generator/EnclaveInfo.java
@@ -7,7 +7,7 @@ public class EnclaveInfo {
   public int numTimerTriggers = 0;
   public int numResetReactions = 0;
   public int numWorkers = 1;
-  public int numModalReactors = 1;
+  public int numModalReactors = 0;
   public int numModalResetStates = 0;
 
   private ReactorInstance instance;
diff --git a/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
index abb4d7c3c7..479649187c 100644
--- a/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -72,23 +72,16 @@ private String generateCreateEnvironments() {
     for (ReactorInstance enclave : enclaves) {
       code.pr(
           "environment_init(&"
-              + CUtil.getEnvironmentStruct(enclave)
-              + ","
-              + CUtil.getEnvironmentId(enclave)
-              + ","
-              + enclave.enclaveInfo.numWorkers
-              + ","
-              + enclave.enclaveInfo.numTimerTriggers
-              + ","
-              + enclave.enclaveInfo.numStartupReactions
-              + ","
-              + enclave.enclaveInfo.numShutdownReactions
-              + ","
-              + enclave.enclaveInfo.numResetReactions
-              + ","
-              + enclave.enclaveInfo.numIsPresentFields
-              + ","
-              + enclave.enclaveInfo.numModalReactors
+              + CUtil.getEnvironmentStruct(enclave) + ","
+              + CUtil.getEnvironmentId(enclave)+ ","
+              + enclave.enclaveInfo.numWorkers + ","
+              + enclave.enclaveInfo.numTimerTriggers + ","
+              + enclave.enclaveInfo.numStartupReactions + ","
+              + enclave.enclaveInfo.numShutdownReactions + ","
+              + enclave.enclaveInfo.numResetReactions + ","
+              + enclave.enclaveInfo.numIsPresentFields + ","
+              + enclave.enclaveInfo.numModalReactors + ","
+              + enclave.enclaveInfo.numModalResetStates
               + ");");
     }
     code.unindent();
diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
index fefd1addc4..3767df7e96 100644
--- a/org.lflang/src/org/lflang/generator/c/CGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -300,7 +300,6 @@ public class CGenerator extends GeneratorBase {
   private int shutdownReactionCount = 0;
 
   private int resetReactionCount = 0;
-  private int modalStateResetCount = 0;
   private int watchdogCount = 0;
 
   // Indicate whether the generator is in Cpp mode or not
@@ -646,11 +645,6 @@ private void generateCodeFor(String lfModuleName) throws IOException {
       // If there are watchdogs, create a table of triggers.
       code.pr(CWatchdogGenerator.generateWatchdogTable(watchdogCount));
 
-      // If there are modes, create a table of mode state to be checked for transitions.
-      code.pr(
-          CModesGenerator.generateModeStatesTable(
-              hasModalReactors, 0, modalStateResetCount));
-
       // Generate function to initialize the trigger objects for all reactors.
       code.pr(
           CTriggerObjectsGenerator.generateInitializeTriggerObjects(
@@ -695,7 +689,7 @@ void terminate_execution(environment_t* env) {}
 
       // Generate functions for modes
       code.pr(CModesGenerator.generateLfInitializeModes(hasModalReactors));
-      code.pr(CModesGenerator.generateLfHandleModeChanges(hasModalReactors, modalStateResetCount));
+      code.pr(CModesGenerator.generateLfHandleModeChanges(hasModalReactors));
       code.pr(
           CReactionGenerator.generateLfModeTriggeredReactions(
               resetReactionCount, hasModalReactors));
@@ -1875,7 +1869,7 @@ protected void generateStateVariableInitializations(ReactorInstance instance) {
         initializeTriggerObjects.pr(
             CStateGenerator.generateInitializer(instance, selfRef, stateVar, mode, types));
         if (mode != null && stateVar.isReset()) {
-          modalStateResetCount += instance.getTotalWidth();
+          CUtil.getClosestEnclave(instance).enclaveInfo.numModalResetStates += instance.getTotalWidth();
         }
       }
     }
diff --git a/org.lflang/src/org/lflang/generator/c/CModesGenerator.java b/org.lflang/src/org/lflang/generator/c/CModesGenerator.java
index 8330f07cfd..1780a69803 100644
--- a/org.lflang/src/org/lflang/generator/c/CModesGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CModesGenerator.java
@@ -68,33 +68,6 @@ public static void generateDeclarations(
     }
   }
 
-  /**
-   * Generate the declaration of modal models state table.
-   *
-   * @param hasModalReactors True if there is modal model reactors, false otherwise
-   * @param modalReactorCount The number of modal model reactors
-   * @param modalStateResetCount The number of modal model state resets
-   */
-  public static String generateModeStatesTable(
-      boolean hasModalReactors, int modalReactorCount, int modalStateResetCount) {
-    if (hasModalReactors) {
-      return String.join(
-          // FIXME: Fix the mode_state_variable_reset-data_t thingy
-          "\n",
-          (modalStateResetCount > 0
-              ? String.join(
-                  "\n",
-                  "// Array of reset data for state variables nested in modes. Used in"
-                      + " _lf_handle_mode_changes().",
-                  "mode_state_variable_reset_data_t _lf_modal_state_reset["
-                      + modalStateResetCount
-                      + "];",
-                  "int _lf_modal_state_reset_size = " + modalStateResetCount + ";")
-              : ""));
-    }
-    return "";
-  }
-
   /**
    * Generate code for modal reactor registration and hierarchy.
    *
@@ -153,7 +126,7 @@ public static void generateModeStructure(ReactorInstance instance, CodeBuilder c
       code.pr("// Register for transition handling");
       code.pr(
           CUtil.getEnvironmentStruct(instance)
-              + ".modes->modal_reactor_states[modal_reactor_state_count["+CUtil.getEnvironmentId(instance)+"]++] = &((self_base_t*)"
+              + ".modes->modal_reactor_states[modal_reactor_count["+CUtil.getEnvironmentId(instance)+"]++] = &((self_base_t*)"
               + nameOfSelfStruct
               + ")->_lf__mode_state;");
     }
@@ -169,29 +142,29 @@ public static void generateModeStructure(ReactorInstance instance, CodeBuilder c
    * @param type The size of the initial value
    */
   public static String generateStateResetStructure(
-      String modeRef, String selfRef, String varName, String source, String type) {
+      ReactorInstance instance, String modeRef, String selfRef, String varName, String source, String type) {
+    var env = CUtil.getEnvironmentStruct(instance);
+    var envId = CUtil.getEnvironmentId(instance);
     return String.join(
         "\n",
         "// Register for automatic reset",
-        "_lf_modal_state_reset[_lf_modal_state_reset_count].mode = " + modeRef + ";",
-        "_lf_modal_state_reset[_lf_modal_state_reset_count].target = &("
+        env+".modes->state_resets[modal_state_reset_count["+envId+"]].mode = " + modeRef + ";",
+        env+".modes->state_resets[modal_state_reset_count["+envId+"]].target = &("
             + selfRef
             + "->"
             + varName
             + ");",
-        "_lf_modal_state_reset[_lf_modal_state_reset_count].source = &" + source + ";",
-        "_lf_modal_state_reset[_lf_modal_state_reset_count].size = sizeof(" + type + ");",
-        "_lf_modal_state_reset_count++;");
+        env+".modes->state_resets[modal_state_reset_count["+envId+"]].source = &" + source + ";",
+        env+".modes->state_resets[modal_state_reset_count["+envId+"]].size = sizeof(" + type + ");",
+        "modal_state_reset_count["+envId+"]++;");
   }
 
   /**
    * Generate code to call {@code _lf_process_mode_changes}.
-   *
-   * @param hasModalReactors True if there is modal model reactors, false otherwise
-   * @param modalStateResetCount The number of modal model state resets
+   ** @param hasModalReactors True if there is modal model reactors, false otherwise
    */
   public static String generateLfHandleModeChanges(
-      boolean hasModalReactors, int modalStateResetCount) {
+      boolean hasModalReactors) {
     if (!hasModalReactors) {
       return "";
     }
@@ -202,8 +175,8 @@ public static String generateLfHandleModeChanges(
         "        env, ",
         "        env->modes->modal_reactor_states, ",
         "        env->modes->modal_reactor_states_size, ",
-        "        " + (modalStateResetCount > 0 ? "_lf_modal_state_reset" : "NULL") + ", ",
-        "        " + (modalStateResetCount > 0 ? "_lf_modal_state_reset_size" : "0") + ", ",
+        "        env->modes->state_resets, ",
+        "        env->modes->state_resets_size, ",
         "        env->timer_triggers, ",
         "        env->timer_triggers_size",
         "    );",
diff --git a/org.lflang/src/org/lflang/generator/c/CStateGenerator.java b/org.lflang/src/org/lflang/generator/c/CStateGenerator.java
index 69e41d1008..225320bfe7 100644
--- a/org.lflang/src/org/lflang/generator/c/CStateGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CStateGenerator.java
@@ -91,7 +91,7 @@ private static String generateModalReset(
     if (ASTUtils.isOfTimeType(stateVar)
         || ASTUtils.isParameterized(stateVar) && !stateVar.getInit().getExprs().isEmpty()) {
       return CModesGenerator.generateStateResetStructure(
-          modeRef, selfRef, stateVar.getName(), initExpr, type);
+          instance, modeRef, selfRef, stateVar.getName(), initExpr, type);
     } else {
       CodeBuilder code = new CodeBuilder();
       var source = "_initial";
@@ -103,7 +103,7 @@ private static String generateModalReset(
       code.pr("static " + declaration + " = " + initExpr + ";");
       code.pr(
           CModesGenerator.generateStateResetStructure(
-              modeRef, selfRef, stateVar.getName(), source, type));
+              instance, modeRef, selfRef, stateVar.getName(), source, type));
       code.unindent();
       code.pr("} // End scoping.");
       return code.toString();
diff --git a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 4d7fc4d1f1..adfb2dc064 100644
--- a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -71,8 +71,8 @@ public static String generateInitializeTriggerObjects(
             "int shutdown_reaction_count[_num_enclaves] = {0};",
             "int reset_reaction_count[_num_enclaves] = {0};",
             "int timer_triggers_count[_num_enclaves] = {0};",
-            "int modal_reactor_state_reset_count[_num_enclaves] = {0};",
-            "int modal_reactor_state_count[_num_enclaves] = {0};"));
+            "int modal_state_reset_count[_num_enclaves] = {0};",
+            "int modal_reactor_count[_num_enclaves] = {0};"));
 
     // Create the table to initialize intended tag fields to 0 between time
     // steps.

From ab46a695959c2607c2c1a285440ccd0cf02d9c91 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Sat, 27 May 2023 07:36:35 +0200
Subject: [PATCH 0167/1114] Use updated version of send_timed_message in
 federated test

---
 test/C/src/federated/DistributedNetworkOrder.lf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/C/src/federated/DistributedNetworkOrder.lf b/test/C/src/federated/DistributedNetworkOrder.lf
index 42f3da6134..5082efa104 100644
--- a/test/C/src/federated/DistributedNetworkOrder.lf
+++ b/test/C/src/federated/DistributedNetworkOrder.lf
@@ -30,11 +30,11 @@ reactor Sender {
     reaction(t) -> out {=
         int payload = 1;
         if (lf_time_logical_elapsed() == 0LL) {
-            send_timed_message(MSEC(10), MSG_TYPE_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
+            send_timed_message(self->base.environment, MSEC(10), MSG_TYPE_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
                                 (unsigned char*)&payload);
         } else if (lf_time_logical_elapsed() == MSEC(5)) {
             payload = 2;
-            send_timed_message(MSEC(5), MSG_TYPE_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
+            send_timed_message(self->base.environment, MSEC(5), MSG_TYPE_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
                                 (unsigned char*)&payload);
         }
     =}

From ba4b8ac656f9e08c10449f154b6f55ca91985ea3 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Sat, 27 May 2023 07:37:22 +0200
Subject: [PATCH 0168/1114] Have top-level enclave use the global
 _lf_number_of_workers. Other enclaves defaults to 1

---
 .../generator/c/CEnvironmentFunctionGenerator.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
index 479649187c..74419e27fd 100644
--- a/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -70,11 +70,19 @@ private String generateCreateEnvironments() {
     code.pr("void _lf_create_environments() {");
     code.indent();
     for (ReactorInstance enclave : enclaves) {
+      // Decide the number of workers to use. If this is the top-level
+      // use the global variable _lf_number_of_workers which accounts for federation etc.
+      String numWorkers = String.valueOf(enclave.enclaveInfo.numWorkers);
+      if (enclave.isMainOrFederated()) {
+        numWorkers = "_lf_number_of_workers";
+      }
+
+
       code.pr(
           "environment_init(&"
               + CUtil.getEnvironmentStruct(enclave) + ","
               + CUtil.getEnvironmentId(enclave)+ ","
-              + enclave.enclaveInfo.numWorkers + ","
+              + numWorkers + ","
               + enclave.enclaveInfo.numTimerTriggers + ","
               + enclave.enclaveInfo.numStartupReactions + ","
               + enclave.enclaveInfo.numShutdownReactions + ","

From 9bca6ab801217d65e28e9edf770e594e07556ffa Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Sat, 27 May 2023 07:37:31 +0200
Subject: [PATCH 0169/1114] Bump reactor-c

---
 org.lflang/src/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index 3398a59c82..f8b073788a 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 3398a59c82e6cb084bd619f946b4e4c768acb2ad
+Subproject commit f8b073788aa5755eada43751e512d37399146703

From 93a84edb13b5b8aaf61ab236072595ce7c9afb19 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Sat, 27 May 2023 17:56:36 +0200
Subject: [PATCH 0170/1114] Fix modal shutdown code-generation

---
 .../org/lflang/generator/c/CGenerator.java    |  4 +-
 .../generator/c/CReactionGenerator.java       | 56 +++++--------------
 2 files changed, 16 insertions(+), 44 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
index 3767df7e96..f332a90093 100644
--- a/org.lflang/src/org/lflang/generator/c/CGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -673,9 +673,7 @@ private void generateCodeFor(String lfModuleName) throws IOException {
 
       // Generate function to schedule shutdown reactions if any
       // reactors have reactions to shutdown.
-      code.pr(
-          CReactionGenerator.generateLfTriggerShutdownReactions(
-              shutdownReactionCount, hasModalReactors));
+      code.pr(CReactionGenerator.generateLfTriggerShutdownReactions());
 
       // Generate an empty termination function for non-federated
       // execution. For federated execution, an implementation is
diff --git a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
index 70bb7d80c8..ea3ffb1f57 100644
--- a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
@@ -1175,47 +1175,21 @@ public static String generateLfTriggerStartupReactions(boolean hasModalReactors)
   }
 
   /** Generate the _lf_trigger_shutdown_reactions function. */
-  public static String generateLfTriggerShutdownReactions(
-      int shutdownReactionCount, boolean hasModalReactors) {
-    var s = new StringBuilder();
-    s.append("bool _lf_trigger_shutdown_reactions(environment_t *env) {\n");
-    if (shutdownReactionCount > 0) {
-      if (hasModalReactors) {
-        s.append(
-            String.join(
-                "\n",
-                "    for (int i = 0; i < shutdown_reactions_size; i++) {",
-                "        if (shutdown_reactions[i] != NULL) {",
-                "            if (shutdown_reactions[i]->mode != NULL) {",
-                "                // Skip reactions in modes",
-                "                continue;",
-                "            }",
-                "            _lf_trigger_reaction(env, shutdown_reactions[i], -1);", // FIXME:
-                // Enclaves
-                // hack
-                "        }",
-                "    }",
-                "    _lf_handle_mode_shutdown_reactions(env, shutdown_reactions_size);",
-                "    return true;"));
-      } else {
-        s.append(
-            String.join(
-                "\n",
-                "    for (int i = 0; i < shutdown_reactions_size; i++) {",
-                "        if (shutdown_reactions[i] != NULL) {",
-                "            _lf_trigger_reaction(env, shutdown_reactions[i], -1);", // FIXME:
-                // Enclaves
-                // hack
-                "        }",
-                "    }",
-                "    return true;"));
-      }
-      s.append("\n");
-    } else {
-      s.append("    return false;\n");
-    }
-    s.append("}\n");
-    return s.toString();
+  public static String generateLfTriggerShutdownReactions() {
+    return String.join("\n",
+        "void _lf_trigger_shutdown_reactions(environment_t *env) {",
+            "    for (int i = 0; i < env->shutdown_reactions_size; i++) {",
+            "        if (env->shutdown_reactions[i] != NULL) {",
+            "            if (env->shutdown_reactions[i]->mode != NULL) {",
+            "                // Skip reactions in modes",
+            "                continue;",
+            "            }",
+            "            _lf_trigger_reaction(env, env->shutdown_reactions[i], -1);", //
+            "        }",
+            "    }",
+            "    _lf_handle_mode_shutdown_reactions(env, env->shutdown_reactions, env->shutdown_reactions_size);",
+            "}"
+    );
   }
 
   /** Generate the _lf_handle_mode_triggered_reactions function. */

From d0a914f7b9eaa8b1d9a1804e29536f7d304f39ec Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Sat, 27 May 2023 18:17:37 +0200
Subject: [PATCH 0171/1114] Move environment include behind CPP ifdef

---
 org.lflang/src/org/lflang/generator/c/CPreambleGenerator.java | 2 ++
 org.lflang/src/org/lflang/generator/c/CReactionGenerator.java | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/org.lflang/src/org/lflang/generator/c/CPreambleGenerator.java b/org.lflang/src/org/lflang/generator/c/CPreambleGenerator.java
index 45b81caab6..30095ec598 100644
--- a/org.lflang/src/org/lflang/generator/c/CPreambleGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CPreambleGenerator.java
@@ -46,6 +46,8 @@ public static String generateIncludeStatements(TargetConfig targetConfig, boolea
     }
     code.pr("#include \"include/core/mixed_radix.h\"");
     code.pr("#include \"include/core/port.h\"");
+    code.pr("#include \"include/core/environment.h\"");
+
     code.pr("int lf_reactor_c_main(int argc, const char* argv[]);");
     if (targetConfig.fedSetupPreamble != null) {
       code.pr("#include \"include/core/federated/federate.h\"");
diff --git a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
index ea3ffb1f57..6d7741f3d5 100644
--- a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
@@ -1180,14 +1180,18 @@ public static String generateLfTriggerShutdownReactions() {
         "void _lf_trigger_shutdown_reactions(environment_t *env) {",
             "    for (int i = 0; i < env->shutdown_reactions_size; i++) {",
             "        if (env->shutdown_reactions[i] != NULL) {",
+            "#ifdef MODAL_REACTORS",
             "            if (env->shutdown_reactions[i]->mode != NULL) {",
             "                // Skip reactions in modes",
             "                continue;",
             "            }",
+            "#endif",
             "            _lf_trigger_reaction(env, env->shutdown_reactions[i], -1);", //
             "        }",
             "    }",
+            "#ifdef MODAL_REACTORS",
             "    _lf_handle_mode_shutdown_reactions(env, env->shutdown_reactions, env->shutdown_reactions_size);",
+            "#endif",
             "}"
     );
   }

From fbc417155ce00bacdaea679c13c0766a467bbd45 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 30 May 2023 09:58:59 +0200
Subject: [PATCH 0172/1114] also update testing gradle config

---
 org.lflang.tests/build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/org.lflang.tests/build.gradle b/org.lflang.tests/build.gradle
index 97f664c1a8..e1311fc5b3 100644
--- a/org.lflang.tests/build.gradle
+++ b/org.lflang.tests/build.gradle
@@ -2,7 +2,8 @@ repositories {
     mavenCentral()
     // TODO Replace this unofficial maven repository as soon as Klighd is released to maven central in the future.
     maven {
-        url "https://rtsys.informatik.uni-kiel.de/~kieler/files/repo/"
+        url "http://rtsys.informatik.uni-kiel.de/~kieler/files/repo/"
+        allowInsecureProtocol = true
     }
 }
 dependencies {

From 27db4a18d1c6f98aa4259dc2fdaa329047f045d2 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 30 May 2023 09:15:54 +0200
Subject: [PATCH 0173/1114] hotfix: fallback to insecure protocol for fetching
 from kieler repo

---
 org.lflang/build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/org.lflang/build.gradle b/org.lflang/build.gradle
index 5155c0a6e2..11ceb91b18 100644
--- a/org.lflang/build.gradle
+++ b/org.lflang/build.gradle
@@ -4,7 +4,8 @@ repositories {
     mavenCentral()
     // TODO Replace this unofficial maven repository as soon as Klighd is released to maven central in the future.
     maven {
-        url "https://rtsys.informatik.uni-kiel.de/~kieler/files/repo/"
+        url "http://rtsys.informatik.uni-kiel.de/~kieler/files/repo/"
+        allowInsecureProtocol = true
     }
 }
 dependencies {

From 84bfe36ebdf31db7505c1cafade4c03727c5b058 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 30 May 2023 20:05:04 +0200
Subject: [PATCH 0174/1114] Bump reactor-c

---
 org.lflang/src/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index f8b073788a..55fce6e8b5 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit f8b073788aa5755eada43751e512d37399146703
+Subproject commit 55fce6e8b5b696325a5fd754cb589069eb7461ce

From 72ca9bf5f51e84a3b66e742c74659ae0d976dd0b Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 30 May 2023 23:47:40 +0200
Subject: [PATCH 0175/1114] Remove duplicate environment include

---
 .../lflang/generator/c/CEnvironmentFunctionGenerator.java    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
index 74419e27fd..6881badefb 100644
--- a/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -13,7 +13,6 @@ public CEnvironmentFunctionGenerator(ReactorInstance main) {
 
   public String generateDeclarations() {
     CodeBuilder code = new CodeBuilder();
-    code.pr(generateEnvironmentInclude());
     code.pr(generateEnvironmentEnum());
     code.pr(generateEnvironmentArray());
     return code.toString();
@@ -28,10 +27,6 @@ public String generateDefinitions() {
 
   private List<ReactorInstance> enclaves = new ArrayList<>();
 
-  private String generateEnvironmentInclude() {
-    return "#include \"environment.h\"";
-  }
-
   private String generateEnvironmentArray() {
     return String.join(
         "\n",

From f6fd57e7b5874d52243a12990cd11f9a47c29c43 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 31 May 2023 14:41:02 +0200
Subject: [PATCH 0176/1114] Move clock initialization into runtime

---
 .../src/org/lflang/generator/c/CTriggerObjectsGenerator.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
index adfb2dc064..fd276ceda0 100644
--- a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -44,8 +44,6 @@ public static String generateInitializeTriggerObjects(
     var code = new CodeBuilder();
     code.pr("void _lf_initialize_trigger_objects() {");
     code.indent();
-    // Initialize the LF clock.
-    code.pr(String.join("\n", "// Initialize the _lf_clock", "lf_initialize_clock();"));
 
     // Initialize tracing if it is enabled
     if (targetConfig.tracing != null) {

From 4af3a35cf0ce770ab9c51a37fa8fe6454c017285 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 31 May 2023 14:41:12 +0200
Subject: [PATCH 0177/1114] Bump reactor-c

---
 org.lflang/src/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index 55fce6e8b5..050f5be753 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 55fce6e8b5b696325a5fd754cb589069eb7461ce
+Subproject commit 050f5be753bea18073cb5c6c1ecd4b44fadea69c

From 4259aa2d64740c175dfcfe5a199bc0d21af8b326 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 31 May 2023 22:37:02 +0200
Subject: [PATCH 0178/1114] Bump reactor-c

---
 org.lflang/src/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index 050f5be753..689336a5ed 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 050f5be753bea18073cb5c6c1ecd4b44fadea69c
+Subproject commit 689336a5edb66f9f9f4dd991b06fedc8dc3f086f

From 332ea0103df21ecc3f414f73c250b32eec138519 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 31 May 2023 22:44:35 +0200
Subject: [PATCH 0179/1114] Surpress som unused warnings

---
 .../lflang/generator/c/CTriggerObjectsGenerator.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 7b9dacc774..12f971b756 100644
--- a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -65,12 +65,12 @@ public static String generateInitializeTriggerObjects(
     code.pr(
         String.join(
             "\n",
-            "int startup_reaction_count[_num_enclaves] = {0};",
-            "int shutdown_reaction_count[_num_enclaves] = {0};",
-            "int reset_reaction_count[_num_enclaves] = {0};",
-            "int timer_triggers_count[_num_enclaves] = {0};",
-            "int modal_state_reset_count[_num_enclaves] = {0};",
-            "int modal_reactor_count[_num_enclaves] = {0};"));
+            "int startup_reaction_count[_num_enclaves] = {0}; SUPPRESS_UNUSED_WARNING(startup_reaction_count);",
+            "int shutdown_reaction_count[_num_enclaves] = {0}; SUPPRESS_UNUSED_WARNING(shutdown_reaction_count);",
+            "int reset_reaction_count[_num_enclaves] = {0}; SUPPRESS_UNUSED_WARNING(reset_reaction_count);",
+            "int timer_triggers_count[_num_enclaves] = {0} SUPPRESS_UNUSED_WARNING(timer_triggers_count);;",
+            "int modal_state_reset_count[_num_enclaves] = {0}; SUPPRESS_UNUSED_WARNING(modal_state_reset_count);",
+            "int modal_reactor_count[_num_enclaves] = {0}; SUPPRESS_UNUSED_WARNING(modal_reactor_count);"));
 
     // Create the table to initialize intended tag fields to 0 between time
     // steps.

From c6c8c39c56b4e7e54d87f829d58489b1e361725c Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 31 May 2023 23:27:24 +0200
Subject: [PATCH 0180/1114] Minor typos

---
 org.lflang/src/org/lflang/generator/c/CGenerator.java           | 2 +-
 .../src/org/lflang/generator/c/CTriggerObjectsGenerator.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
index 82ec809d8e..da204e6a68 100644
--- a/org.lflang/src/org/lflang/generator/c/CGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -685,7 +685,7 @@ private void generateCodeFor(String lfModuleName) throws IOException {
       code.pr(
           """
                  #ifndef FEDERATED
-                 void terminate_execution() {}
+                 void terminate_execution(environment_t* env) {}
                  #endif""");
 
       // Generate functions for modes
diff --git a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 12f971b756..d88d68f7c8 100644
--- a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -68,7 +68,7 @@ public static String generateInitializeTriggerObjects(
             "int startup_reaction_count[_num_enclaves] = {0}; SUPPRESS_UNUSED_WARNING(startup_reaction_count);",
             "int shutdown_reaction_count[_num_enclaves] = {0}; SUPPRESS_UNUSED_WARNING(shutdown_reaction_count);",
             "int reset_reaction_count[_num_enclaves] = {0}; SUPPRESS_UNUSED_WARNING(reset_reaction_count);",
-            "int timer_triggers_count[_num_enclaves] = {0} SUPPRESS_UNUSED_WARNING(timer_triggers_count);;",
+            "int timer_triggers_count[_num_enclaves] = {0}; SUPPRESS_UNUSED_WARNING(timer_triggers_count);",
             "int modal_state_reset_count[_num_enclaves] = {0}; SUPPRESS_UNUSED_WARNING(modal_state_reset_count);",
             "int modal_reactor_count[_num_enclaves] = {0}; SUPPRESS_UNUSED_WARNING(modal_reactor_count);"));
 

From df1afb44ac8292c3ffd3d2243de6c30cd2382370 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Thu, 1 Jun 2023 00:12:11 +0200
Subject: [PATCH 0181/1114] High-level architecure of the
 EnclaveReactorTransformation

---
 .../c/CEnclavedReactorTransformation.java     | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 org.lflang/src/org/lflang/generator/c/CEnclavedReactorTransformation.java

diff --git a/org.lflang/src/org/lflang/generator/c/CEnclavedReactorTransformation.java b/org.lflang/src/org/lflang/generator/c/CEnclavedReactorTransformation.java
new file mode 100644
index 0000000000..5ba9ddda54
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/c/CEnclavedReactorTransformation.java
@@ -0,0 +1,76 @@
+package org.lflang.generator.c;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.lflang.ast.ASTUtils;
+import org.lflang.ast.AstTransformation;
+import org.lflang.lf.Connection;
+import org.lflang.lf.LfFactory;
+import org.lflang.lf.Reactor;
+import org.lflang.lf.ReactorDecl;
+
+public class CEnclavedReactorTransformation implements AstTransformation {
+
+    public static final LfFactory factory = ASTUtils.factory;
+
+    Map<ReactorDecl, ReactorDecl> enclaveToWrapperMap = new LinkedHashMap<>();
+    public void applyTransformation(List<Reactor> reactors) {
+        // This function performs the whole AST transformation consisting in
+        // 1. Get all Enclave Reactors
+        List<Reactor> enclaves = getEnclaves(reactors);
+
+        // 2. create ReactorWrappers for all of them.
+        createEnclaveWrappers(enclaves);
+
+        // 2. Replace enclave Reactors with enclave Wrappers. Make new instances and re-wire the connections
+        List<Reactor> wrappers = replaceEnclavesWithWrappers(enclaves);
+
+        // 3. Create ConnectionReactors for connections between enclave and parent
+        insertConnectionReactorsForEnclaveOutputs(reactors);
+
+        setEnclaveWrapperParams(reactors);
+
+        setFreeConnectionReactorParams(reactors);
+    }
+    private List<Reactor> getEnclaves(List<Reactor> reactors) {
+        List<Reactor> enclaves = new ArrayList<>();
+        return enclaves;
+    }
+
+    // Side-effect: Fills the enclaveToWrapperMap with the newly created EnclaveWrappers
+    private void createEnclaveWrappers(List<Reactor> enclaves) {
+
+    }
+    // Side effect: We overwrite the Reactor-list passed into the AST. We remove and add Reactors as
+    // children into the hierarchy. This function should also remove all old connections between reactors
+    // and original enclaves with new instances.
+    private List<Reactor> replaceEnclavesWithWrappers(List<Reactor> enclaves) {
+        List<Reactor> enclaveWrappers= new ArrayList<>();
+        return enclaveWrappers;
+    }
+
+    // In the case where the output port of an enclave is not connected to the top-level port of another enclave.
+    // E.g. a contained enclave is connected to the parents output. Or it is connected to another childs input.
+    // Or it is directly connected to a reaction in the parent (this requires some more thought)
+    // In this case we must generate a ConnectionReactor and put it into the receiving environment. Which is the parent
+    // in this case.
+
+    private void insertConnectionReactorsForEnclaveOutputs(List<Reactor> reactors) {
+
+    }
+
+    // This sets the in_delay and is_physical parameters for all the enclaveWrappers.
+    // It is based on the class and any delay on the connections to its ports.
+    // The connections should be replaced with ordinary connections
+    private void setEnclaveWrapperParams(List<Reactor> reactors) {
+
+    }
+
+    // This function finds all the free ConnectionReactors and sets their parameters.
+    private void setFreeConnectionReactorParams(List<Reactor> reactors) {
+
+    }
+}

From 9e0109a22cf19da2502438954bf6d37944fa0edd Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Thu, 1 Jun 2023 02:51:19 +0200
Subject: [PATCH 0182/1114] Fix ScheduleAt.lf

---
 test/C/src/concurrent/ScheduleAt.lf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/C/src/concurrent/ScheduleAt.lf b/test/C/src/concurrent/ScheduleAt.lf
index 97c3188965..2032c83ada 100644
--- a/test/C/src/concurrent/ScheduleAt.lf
+++ b/test/C/src/concurrent/ScheduleAt.lf
@@ -76,7 +76,7 @@ reactor Scheduler {
 
     reaction(startup) -> act {=
         for (int i=0; i < 16; i++) {
-            _lf_schedule_at_tag(self->base.environment, act->trigger,
+            _lf_schedule_at_tag(self->base.environment, act->_base.trigger,
                 (tag_t) { .time = self->times[i] + lf_time_logical(), .microstep = self->microstep_delay_list[i]},
                 NULL);
         }

From 31d51a2e85e75895ad5268c58d8b5497a37e80c9 Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Thu, 1 Jun 2023 10:31:00 +0200
Subject: [PATCH 0183/1114] Added annotation to influence port side or switch
 to free port placement

---
 org.lflang/src/org/lflang/AttributeUtils.java |   5 +
 .../synthesis/LinguaFrancaSynthesis.java      |  96 +++++++---
 .../synthesis/SynthesisRegistration.java      |  12 +-
 .../postprocessor/ReactionPortAdjustment.java |   7 +-
 .../postprocessor/ReactorPortAdjustment.java  | 172 ++++++++++++++++++
 .../styles/LinguaFrancaShapeExtensions.java   |  14 +-
 .../org/lflang/validation/AttributeSpec.java  |   4 +
 7 files changed, 270 insertions(+), 40 deletions(-)
 create mode 100644 org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactorPortAdjustment.java

diff --git a/org.lflang/src/org/lflang/AttributeUtils.java b/org.lflang/src/org/lflang/AttributeUtils.java
index 6703df2d0e..2da57d5c2f 100644
--- a/org.lflang/src/org/lflang/AttributeUtils.java
+++ b/org.lflang/src/org/lflang/AttributeUtils.java
@@ -230,6 +230,11 @@ public static String getLabel(EObject node) {
   public static String getIconPath(EObject node) {
     return getAttributeValue(node, "icon");
   }
+  
+  /** Return the declared side of the port, as given by the @side annotation. */
+  public static String getPortSide(EObject node) {
+    return getAttributeValue(node, "side");
+  }
 
   /**
    * Return the {@code @enclave} attribute annotated on the given node.
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/org.lflang/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index 45f3342a0a..cdea160a53 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -102,6 +102,7 @@
 import org.lflang.diagram.synthesis.action.MemorizingExpandCollapseAction;
 import org.lflang.diagram.synthesis.action.ShowCycleAction;
 import org.lflang.diagram.synthesis.postprocessor.ReactionPortAdjustment;
+import org.lflang.diagram.synthesis.postprocessor.ReactorPortAdjustment;
 import org.lflang.diagram.synthesis.styles.LinguaFrancaShapeExtensions;
 import org.lflang.diagram.synthesis.styles.LinguaFrancaStyleExtensions;
 import org.lflang.diagram.synthesis.styles.ReactorFigureComponents;
@@ -163,6 +164,8 @@ public class LinguaFrancaSynthesis extends AbstractDiagramSynthesis<Model> {
           "org.lflang.linguafranca.diagram.synthesis.reactor.recursive.instantiation", false);
   public static final Property<Boolean> REACTOR_HAS_BANK_PORT_OFFSET =
       new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.bank.offset", false);
+  public static final Property<Boolean> REACTOR_MULTIPORT =
+          new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.multiport", false);
   public static final Property<Boolean> REACTOR_INPUT =
       new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.input", false);
   public static final Property<Boolean> REACTOR_OUTPUT =
@@ -244,6 +247,8 @@ public class LinguaFrancaSynthesis extends AbstractDiagramSynthesis<Model> {
       SynthesisOption.<Integer>createRangeOption("Reactor Parameter/Variable Columns", 1, 10, 1)
           .setCategory(APPEARANCE);
 
+  public static final SynthesisOption FIXED_PORT_SIDE = 
+          SynthesisOption.createCheckOption("Fixed Port Sides", true).setCategory(LAYOUT);
   public static final SynthesisOption SPACING =
       SynthesisOption.<Integer>createRangeOption("Spacing (%)", 0, 150, 5, 75).setCategory(LAYOUT);
 
@@ -280,6 +285,7 @@ public List<SynthesisOption> getDisplayedSynthesisOptions() {
         SHOW_STATE_VARIABLES,
         REACTOR_BODY_TABLE_COLS,
         LAYOUT,
+        FIXED_PORT_SIDE,
         LayoutPostProcessing.MODEL_ORDER,
         SPACING);
   }
@@ -481,6 +487,11 @@ private Collection<KNode> createReactorNode(
         _kRenderingExtensions.addDoubleClickAction(figure, MemorizingExpandCollapseAction.ID);
       }
       _reactorIcons.handleIcon(comps.getReactor(), reactor, false);
+      
+      if (!getBooleanValue(FIXED_PORT_SIDE)) {
+        // Port figures will need post-processing to fix IO indication if portside is not fixed
+        ReactorPortAdjustment.apply(node, comps.getFigures());
+      }
 
       if (getBooleanValue(SHOW_HYPERLINKS)) {
         // Collapse button
@@ -607,6 +618,11 @@ private Collection<KNode> createReactorNode(
         }
       }
       _reactorIcons.handleIcon(comps.getReactor(), reactor, true);
+      
+      if (!getBooleanValue(FIXED_PORT_SIDE)) {
+        // Port figures will need post-processing to fix IO indication if portside is not fixed
+        ReactorPortAdjustment.apply(node, comps.getFigures());
+      }
 
       if (getBooleanValue(SHOW_HYPERLINKS)) {
         // Expand button
@@ -728,16 +744,24 @@ public KNode configureReactorNodeLayout(KNode node, boolean main) {
         node,
         CoreOptions.NODE_SIZE_CONSTRAINTS,
         EnumSet.of(SizeConstraint.MINIMUM_SIZE, SizeConstraint.PORTS));
-
-    // Allows to freely shuffle ports on each side
-    setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FIXED_SIDE);
-    // Adjust port label spacing to be closer to edge but not overlap with port figure
-    // TODO: Add PortLabelPlacement.NEXT_TO_PORT_IF_POSSIBLE back into the configuration, as soon as
-    // ELK provides a fix for LF issue #1273
+    
+    
+    if (getBooleanValue(FIXED_PORT_SIDE)) {
+      // Allows to freely shuffle ports on each side
+      setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FIXED_SIDE);
+    } else {
+      // Ports are no longer fixed based on input or output
+      setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FREE);
+    }
+    
     setLayoutOption(
         node,
         CoreOptions.PORT_LABELS_PLACEMENT,
         EnumSet.of(PortLabelPlacement.ALWAYS_OTHER_SAME_SIDE, PortLabelPlacement.OUTSIDE));
+    // TODO: Add PortLabelPlacement.NEXT_TO_PORT_IF_POSSIBLE back into the configuration, as soon as
+    // ELK provides a fix for LF issue #1273
+    
+    // Adjust port label spacing to be closer to edge but not overlap with port figure
     setLayoutOption(node, CoreOptions.SPACING_LABEL_PORT_HORIZONTAL, 2.0);
     setLayoutOption(node, CoreOptions.SPACING_LABEL_PORT_VERTICAL, -3.0);
 
@@ -1034,8 +1058,8 @@ private Collection<KNode> transformReactorNetwork(
       int outputSize = reaction.effects.size();
       if (!getBooleanValue(REACTIONS_USE_HYPEREDGES) && (inputSize > 1 || outputSize > 1)) {
         // If this node will have more than one input/output port, the port positions must be
-        // adjusted to the
-        // pointy shape. However, this is only possible after the layout.
+        // adjusted to the pointy shape.
+        // However, this is only possible after the layout.
         ReactionPortAdjustment.apply(node, figure);
       }
 
@@ -1577,27 +1601,32 @@ private KEdge connect(KEdge edge, KPort src, KPort dst) {
   }
 
   /** Translate an input/output into a port. */
-  private KPort addIOPort(
-      KNode node, PortInstance lfPort, boolean input, boolean multiport, boolean bank) {
+  private KPort addIOPort(KNode node, PortInstance lfPort, 
+          boolean input, boolean multiport, boolean bank) {
     KPort port = _kPortExtensions.createPort();
     node.getPorts().add(port);
     associateWith(port, lfPort.getDefinition());
     NamedInstanceUtil.linkInstance(port, lfPort);
     _kPortExtensions.setPortSize(port, 6, 6);
-
-    if (input) {
-      // multiports are smaller by an offset at the right, hence compensate in inputs
-      double offset = multiport ? -3.4 : -3.3;
-      setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.WEST);
-      setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET, offset);
-    } else {
-      double offset = multiport ? -2.6 : -3.3; // multiports are smaller
-      offset =
-          bank
-              ? offset - LinguaFrancaShapeExtensions.BANK_FIGURE_X_OFFSET_SUM
-              : offset; // compensate bank figure width
-      setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.EAST);
-      setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET, offset);
+    
+    var side = input ? PortSide.WEST : PortSide.EAST;
+    var userSideAttr = AttributeUtils.getPortSide(lfPort.getDefinition());
+    if (userSideAttr != null) {
+      try {
+        var userSide = PortSide.valueOf(userSideAttr.toUpperCase());
+        if (userSide != null) {
+            side = userSide;
+        }
+      } catch(Exception e) {
+        // ignore and use default
+      }
+    }
+    double offset = getReactorPortOffset(side == PortSide.WEST, multiport, bank);
+    setLayoutOption(port, CoreOptions.PORT_SIDE, side);
+    setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET, offset);
+    
+    if (multiport) {
+      node.setProperty(REACTOR_MULTIPORT, true);
     }
 
     if (bank && !node.getProperty(REACTOR_HAS_BANK_PORT_OFFSET)) { // compensate bank figure height
@@ -1608,7 +1637,9 @@ private KPort addIOPort(
       node.setProperty(REACTOR_HAS_BANK_PORT_OFFSET, true); // only once
     }
 
-    _linguaFrancaShapeExtensions.addTrianglePort(port, multiport);
+    // If fixed port sides are active and the port is put on the opposite side, reverse it
+    var reverse = getBooleanValue(FIXED_PORT_SIDE) && input != (side == PortSide.WEST);
+    _linguaFrancaShapeExtensions.addTrianglePort(port, multiport, reverse);
 
     String label = lfPort.getName();
     if (!getBooleanValue(SHOW_PORT_NAMES)) {
@@ -1622,6 +1653,21 @@ private KPort addIOPort(
     associateWith(_kLabelExtensions.addOutsidePortLabel(port, label, 8), lfPort.getDefinition());
     return port;
   }
+  
+  public static double getReactorPortOffset(boolean sideLeft, boolean multiport, boolean bank) {
+    var offset = -3.3;
+    
+    if (multiport) {
+        offset = sideLeft ? -3.4 : -2.6;
+    }
+    
+    if (bank && !sideLeft) {
+      // compensate bank figure width
+      offset -= LinguaFrancaShapeExtensions.BANK_FIGURE_X_OFFSET_SUM;
+    }
+    
+    return offset;
+  }
 
   private KPort addInvisiblePort(KNode node) {
     KPort port = _kPortExtensions.createPort();
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/SynthesisRegistration.java b/org.lflang/src/org/lflang/diagram/synthesis/SynthesisRegistration.java
index c48d2e59ee..bf78f2862d 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/SynthesisRegistration.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/SynthesisRegistration.java
@@ -1,17 +1,19 @@
 package org.lflang.diagram.synthesis;
 
-import de.cau.cs.kieler.klighd.IKlighdStartupHook;
-import de.cau.cs.kieler.klighd.KlighdDataManager;
 import org.lflang.diagram.synthesis.action.CollapseAllReactorsAction;
 import org.lflang.diagram.synthesis.action.ExpandAllReactorsAction;
 import org.lflang.diagram.synthesis.action.FilterCycleAction;
 import org.lflang.diagram.synthesis.action.MemorizingExpandCollapseAction;
 import org.lflang.diagram.synthesis.action.ShowCycleAction;
 import org.lflang.diagram.synthesis.postprocessor.ReactionPortAdjustment;
+import org.lflang.diagram.synthesis.postprocessor.ReactorPortAdjustment;
 import org.lflang.diagram.synthesis.styles.LinguaFrancaShapeExtensions;
 import org.lflang.diagram.synthesis.styles.LinguaFrancaStyleExtensions;
 import org.lflang.diagram.synthesis.util.NamedInstanceUtil;
 
+import de.cau.cs.kieler.klighd.IKlighdStartupHook;
+import de.cau.cs.kieler.klighd.KlighdDataManager;
+
 /**
  * Registration of all diagram synthesis related classes in Klighd.
  *
@@ -35,6 +37,7 @@ public void execute() {
 
     // Style Mod
     reg.registerStyleModifier(ReactionPortAdjustment.ID, new ReactionPortAdjustment());
+    reg.registerStyleModifier(ReactorPortAdjustment.ID, new ReactorPortAdjustment());
 
     // Blacklist LF-specific properties that should be removed when a diagram is sent from the
     // diagram server to a client.
@@ -46,8 +49,7 @@ public void execute() {
     reg.registerBlacklistedProperty(ReactionPortAdjustment.PROCESSED);
     reg.registerBlacklistedProperty(LinguaFrancaShapeExtensions.REACTOR_CONTENT_CONTAINER);
     reg.registerBlacklistedProperty(LinguaFrancaStyleExtensions.LABEL_PARENT_BACKGROUND);
-    reg.registerBlacklistedProperty(
-        NamedInstanceUtil
-            .LINKED_INSTANCE); // Very important since its values can not be synthesized easily!
+    // Very important since its values can not be synthesized easily!
+    reg.registerBlacklistedProperty(NamedInstanceUtil.LINKED_INSTANCE); 
   }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactionPortAdjustment.java b/org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactionPortAdjustment.java
index 4507039b28..64c517a336 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactionPortAdjustment.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactionPortAdjustment.java
@@ -66,9 +66,10 @@ public class ReactionPortAdjustment implements IStyleModifier {
   public static void apply(KNode node, KRendering rendering) {
     // Add modifier that fixes port positions such that edges are properly attached to the shape
     var invisible = _kRenderingFactory.createKInvisibility();
-    invisible.setInvisible(false); // make it ineffective (just for purpose of holding modifier)
-    invisible.setModifierId(
-        ReactionPortAdjustment.ID); // Add modifier to receive callback after layout
+    // make it ineffective (just for purpose of holding modifier)
+    invisible.setInvisible(false);
+    // Add modifier to receive callback after layout
+    invisible.setModifierId(ReactionPortAdjustment.ID);
     rendering.getStyles().add(invisible);
     node.setProperty(PROCESSED, false);
   }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactorPortAdjustment.java b/org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactorPortAdjustment.java
new file mode 100644
index 0000000000..3548fd5aa1
--- /dev/null
+++ b/org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactorPortAdjustment.java
@@ -0,0 +1,172 @@
+/*************
+ * Copyright (c) 2023, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
+package org.lflang.diagram.synthesis.postprocessor;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.eclipse.elk.core.options.CoreOptions;
+import org.eclipse.elk.graph.properties.Property;
+import org.eclipse.xtext.xbase.lib.Extension;
+import org.lflang.diagram.synthesis.LinguaFrancaSynthesis;
+import org.lflang.diagram.synthesis.styles.LinguaFrancaShapeExtensions;
+
+import com.google.inject.Binder;
+import com.google.inject.Guice;
+import com.google.inject.Scopes;
+import com.google.inject.TypeLiteral;
+
+import de.cau.cs.kieler.klighd.IStyleModifier;
+import de.cau.cs.kieler.klighd.IViewer;
+import de.cau.cs.kieler.klighd.internal.ILayoutRecorder;
+import de.cau.cs.kieler.klighd.kgraph.KGraphElement;
+import de.cau.cs.kieler.klighd.kgraph.KGraphFactory;
+import de.cau.cs.kieler.klighd.kgraph.KNode;
+import de.cau.cs.kieler.klighd.krendering.KRendering;
+import de.cau.cs.kieler.klighd.krendering.KRenderingFactory;
+import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
+import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis;
+
+/**
+ * Adjusts the port figures of reactors when fixed side are off to keep the input output indication correct.
+ *
+ * @author Alexander Schulz-Rosengarten
+ */
+public class ReactorPortAdjustment implements IStyleModifier {
+
+  public static final String ID =
+      "org.lflang.diagram.synthesis.postprocessor.ReactorPortAdjustment";
+
+  /** INTERNAL property to mark node as flipped. */
+  public static final Property<Boolean> FLIPPED =
+      new Property<>("org.lflang.diagram.synthesis.postprocessor.reactor.ports.flipped", false);
+  
+  @Inject @Extension private LinguaFrancaShapeExtensions _linguaFrancaShapeExtensions;
+  @Extension private KGraphFactory _kGraphFactory = KGraphFactory.eINSTANCE;
+  private static KRenderingFactory _kRenderingFactory = KRenderingFactory.eINSTANCE;
+
+  /** Register this modifier on a reaction rendering. */
+  public static void apply(KNode node, List<KRendering> renderings) {
+    var rendering = renderings.get(0); // Get first in bank
+    // Add modifier that fixes port positions such that edges are properly attached to the shape
+    var invisible = _kRenderingFactory.createKRotation();
+    // make it ineffective (just for purpose of holding modifier)
+    invisible.setRotation(0);
+    // Add modifier to receive callback after layout
+    invisible.setModifierId(ID);
+    rendering.getStyles().add(invisible);
+  }
+  
+  public ReactorPortAdjustment() {
+    // Inject extension
+    if (_linguaFrancaShapeExtensions == null) {
+      var injector = Guice.createInjector(new com.google.inject.Module() {
+        // This Module is created to satisfy ViewSynthesisShared scope of used synthesis-extensions
+        public void configure(Binder binder) {
+          binder.bindScope(ViewSynthesisShared.class, Scopes.SINGLETON);
+          binder.bind(new TypeLiteral<AbstractDiagramSynthesis<?>>(){}).toInstance(new LinguaFrancaSynthesis());
+        }
+      });
+      _linguaFrancaShapeExtensions = injector.getInstance(LinguaFrancaShapeExtensions.class);
+    }
+  }
+
+  @Override
+  public boolean modify(IStyleModifier.StyleModificationContext context) {
+    try {
+      KGraphElement node = context.getGraphElement();
+      if (node instanceof KNode) {
+        KNode knode = (KNode) node;
+
+        // Find root node
+        KNode parent = knode;
+        while (parent.eContainer() != null) {
+          parent = (KNode) parent.eContainer();
+        }
+
+        // Get viewer (this is a bit brittle because it fetches the viewer from some internal
+        // property)
+        Object viewer =
+            parent.getAllProperties().entrySet().stream()
+                .filter(
+                    entry ->
+                        entry.getKey().getId().equals("de.cau.cs.kieler.klighd.viewer")
+                            || entry.getKey().getId().equals("klighd.layout.viewer"))
+                .findAny()
+                .map(entry -> entry.getValue())
+                .orElse(null);
+
+        ILayoutRecorder recorder = null;
+        if (viewer instanceof IViewer) {
+          recorder = ((IViewer) viewer).getViewContext().getLayoutRecorder();
+        }
+
+        if (recorder != null) {
+          recorder.startRecording();
+        }
+        for (var port : knode.getPorts()) {
+          var isInput = port.getProperty(LinguaFrancaSynthesis.REACTOR_INPUT).booleanValue();
+          if (!isInput && !port.getProperty(LinguaFrancaSynthesis.REACTOR_OUTPUT)) {
+              continue; // skip
+          }
+          
+          var xPos = port.getXpos();
+          var isLeft = xPos < 0;
+          var flip = isInput != isLeft;
+          var isFlipped = port.getProperty(FLIPPED).booleanValue();
+          var needsUpdate = flip != isFlipped;
+          
+          if (needsUpdate) {
+            // Remove figure
+            port.getData().removeIf(it -> it instanceof KRendering);
+            
+            // Get port type
+            var isMultiport = port.getProperty(LinguaFrancaSynthesis.REACTOR_MULTIPORT);
+            var isBank = port.getProperty(LinguaFrancaSynthesis.REACTOR_HAS_BANK_PORT_OFFSET);
+            
+            // Add new figure
+            _linguaFrancaShapeExtensions.addTrianglePort(port, isMultiport, flip);
+            port.setProperty(FLIPPED, flip);
+            
+            // Compute new offset
+            var oldOffset = port.getProperty(CoreOptions.PORT_BORDER_OFFSET);
+            var newOffset = LinguaFrancaSynthesis.getReactorPortOffset(!isLeft, isMultiport, isBank);
+            
+            // Apply offset directly
+            port.setPos((float) (port.getXpos() + (oldOffset - newOffset)), port.getYpos());
+          }
+        }
+        if (recorder != null) {
+          recorder.stopRecording(0);
+        }
+      }
+    } catch (Exception e) {
+      e.printStackTrace();
+      // do not disturb rendering process
+    }
+    return false;
+  }
+}
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java b/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
index efdc2ff4d5..3d7d45e86b 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
@@ -802,7 +802,7 @@ public KEllipse addResetFigure(KNode node) {
   }
 
   /** Creates the visual representation of a reactor port. */
-  public KPolygon addTrianglePort(KPort port, boolean multiport) {
+  public KPolygon addTrianglePort(KPort port, boolean multiport, boolean reverse) {
     port.setSize(8, 8);
 
     // Create triangle port
@@ -822,15 +822,15 @@ public KPolygon addTrianglePort(KPort port, boolean multiport) {
       // between parallel connections
       pointsToAdd =
           List.of(
-              _kRenderingExtensions.createKPosition(LEFT, 0, 0, TOP, 0.6f, 0),
-              _kRenderingExtensions.createKPosition(RIGHT, 1.2f, 0, TOP, 0, 0.5f),
-              _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0.6f, 0));
+              _kRenderingExtensions.createKPosition(reverse ? RIGHT : LEFT, 0, 0, TOP, 0.6f, 0),
+              _kRenderingExtensions.createKPosition(reverse ? LEFT: RIGHT, 1.2f, 0, TOP, 0, 0.5f),
+              _kRenderingExtensions.createKPosition(reverse ? RIGHT : LEFT, 0, 0, BOTTOM, 0.6f, 0));
     } else {
       pointsToAdd =
           List.of(
-              _kRenderingExtensions.createKPosition(LEFT, 0, 0, TOP, 0, 0),
-              _kRenderingExtensions.createKPosition(RIGHT, 0, 0, TOP, 0, 0.5f),
-              _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0, 0));
+              _kRenderingExtensions.createKPosition(reverse ? RIGHT : LEFT, 0, 0, TOP, 0, 0),
+              _kRenderingExtensions.createKPosition(reverse ? LEFT: RIGHT, 0, 0, TOP, 0, 0.5f),
+              _kRenderingExtensions.createKPosition(reverse ? RIGHT : LEFT, 0, 0, BOTTOM, 0, 0));
     }
     trianglePort.getPoints().addAll(pointsToAdd);
     return trianglePort;
diff --git a/org.lflang/src/org/lflang/validation/AttributeSpec.java b/org.lflang/src/org/lflang/validation/AttributeSpec.java
index 45c984204e..90e7f9cf6d 100644
--- a/org.lflang/src/org/lflang/validation/AttributeSpec.java
+++ b/org.lflang/src/org/lflang/validation/AttributeSpec.java
@@ -209,6 +209,10 @@ enum AttrParamType {
     ATTRIBUTE_SPECS_BY_NAME.put(
         "icon",
         new AttributeSpec(List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))));
+    // @side("value")
+    ATTRIBUTE_SPECS_BY_NAME.put(
+        "side",
+        new AttributeSpec(List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))));
     // @enclave(each=boolean)
     ATTRIBUTE_SPECS_BY_NAME.put(
         "enclave",

From 3a8a202c51665e8107bf468374c51b9e6148b452 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Thu, 1 Jun 2023 11:25:50 +0200
Subject: [PATCH 0184/1114] Bump reactor-c

---
 org.lflang/src/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index 689336a5ed..4749906b64 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 689336a5edb66f9f9f4dd991b06fedc8dc3f086f
+Subproject commit 4749906b640f8f75bcf0396d79222cf11e1259ca

From a4b30b7b74d9073d466e3dbd1aab0b554f067459 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Thu, 1 Jun 2023 16:22:27 +0200
Subject: [PATCH 0185/1114] FIx init of source_reactor pointer of ports

---
 .../src/org/lflang/generator/c/CTriggerObjectsGenerator.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
index d88d68f7c8..a8da3c175a 100644
--- a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -727,7 +727,7 @@ private static String deferredInputNumDestinations(
                 CUtil.portRefNested(port, sr, sb, sc)
                     + connector
                     + "_base.source_reactor = (self_base_t*)"
-                    + CUtil.reactorRef(reaction.getParent(), sb)
+                    + CUtil.reactorRef(reaction.getParent(), sr)
                     + ";");
 
             // Initialize token types.
@@ -789,7 +789,7 @@ private static String deferredOutputNumDestinations(ReactorInstance reactor) {
         code.pr(
             CUtil.portRef(output, sr, sb, sc)
                 + "._base.source_reactor = (self_base_t*)"
-                + CUtil.reactorRef(reactor, sb)
+                + CUtil.reactorRef(reactor, sr)
                 + ";");
         code.endScopedRangeBlock(sendingRange);
       }

From aea09c866bf742204279a0d61d2dd1e569a4b6c5 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Thu, 1 Jun 2023 17:10:18 +0200
Subject: [PATCH 0186/1114] Try out qemu_cortex_m3 for zephyr tests

---
 org.lflang.tests/src/org/lflang/tests/Configurators.java | 4 ++--
 org.lflang/src/lib/c/reactor-c                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/org.lflang.tests/src/org/lflang/tests/Configurators.java b/org.lflang.tests/src/org/lflang/tests/Configurators.java
index 85a8465c29..3dbf0fa562 100644
--- a/org.lflang.tests/src/org/lflang/tests/Configurators.java
+++ b/org.lflang.tests/src/org/lflang/tests/Configurators.java
@@ -70,7 +70,7 @@ public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
     test.getContext().getTargetConfig().setByUser.add(TargetProperty.THREADING);
     test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
     test.getContext().getTargetConfig().platformOptions.flash = false;
-    test.getContext().getTargetConfig().platformOptions.board = "qemu_riscv32";
+    test.getContext().getTargetConfig().platformOptions.board = "qemu_cortex_m3";
     // FIXME: Zephyr qemu emulations fails with debug log-levels.
     test.getContext().getTargetConfig().logLevel = LogLevel.WARN;
     test.getContext().getArgs().setProperty("logging", "warning");
@@ -81,7 +81,7 @@ public static boolean makeZephyrCompatible(LFTest test) {
     test.getContext().getArgs().setProperty("tracing", "false");
     test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
     test.getContext().getTargetConfig().platformOptions.flash = false;
-    test.getContext().getTargetConfig().platformOptions.board = "qemu_riscv32";
+    test.getContext().getTargetConfig().platformOptions.board = "qemu_cortex_m3";
     // FIXME: Zephyr qemu emulations fails with debug log-levels.
     test.getContext().getTargetConfig().logLevel = LogLevel.WARN;
     test.getContext().getArgs().setProperty("logging", "warning");
diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index 4749906b64..1d793796f6 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 4749906b640f8f75bcf0396d79222cf11e1259ca
+Subproject commit 1d793796f67dae4e12431d91825c5bd0710e52eb

From ada3748bcba668cf42a068a8496046c41ce3afdf Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Thu, 1 Jun 2023 17:44:06 +0200
Subject: [PATCH 0187/1114] Set source_reactor pointer, also of dangling
 pointer.

---
 .../org/lflang/generator/c/CTriggerObjectsGenerator.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
index a8da3c175a..05c394c515 100644
--- a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -793,6 +793,15 @@ private static String deferredOutputNumDestinations(ReactorInstance reactor) {
                 + ";");
         code.endScopedRangeBlock(sendingRange);
       }
+      
+      if (output.eventualDestinations().size() == 0) {
+        // Dangling output. Still set the source reactor
+        code.pr(
+            CUtil.portRef(output)
+                + "._base.source_reactor = (self_base_t*)"
+                + CUtil.reactorRef(reactor)
+                + ";");
+      }
     }
     return code.toString();
   }

From 3dc707e9b7870c6a7634dbaa2d2a3a487267778f Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Thu, 1 Jun 2023 18:01:55 +0200
Subject: [PATCH 0188/1114] Due to alot of problems with qemu emulations. Try
 using just native execution instead.

---
 org.lflang.tests/src/org/lflang/tests/Configurators.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.lflang.tests/src/org/lflang/tests/Configurators.java b/org.lflang.tests/src/org/lflang/tests/Configurators.java
index 3dbf0fa562..a90f85d94e 100644
--- a/org.lflang.tests/src/org/lflang/tests/Configurators.java
+++ b/org.lflang.tests/src/org/lflang/tests/Configurators.java
@@ -70,7 +70,7 @@ public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
     test.getContext().getTargetConfig().setByUser.add(TargetProperty.THREADING);
     test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
     test.getContext().getTargetConfig().platformOptions.flash = false;
-    test.getContext().getTargetConfig().platformOptions.board = "qemu_cortex_m3";
+    test.getContext().getTargetConfig().platformOptions.board = "native_posix";
     // FIXME: Zephyr qemu emulations fails with debug log-levels.
     test.getContext().getTargetConfig().logLevel = LogLevel.WARN;
     test.getContext().getArgs().setProperty("logging", "warning");
@@ -81,7 +81,7 @@ public static boolean makeZephyrCompatible(LFTest test) {
     test.getContext().getArgs().setProperty("tracing", "false");
     test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
     test.getContext().getTargetConfig().platformOptions.flash = false;
-    test.getContext().getTargetConfig().platformOptions.board = "qemu_cortex_m3";
+    test.getContext().getTargetConfig().platformOptions.board = "native_posix";
     // FIXME: Zephyr qemu emulations fails with debug log-levels.
     test.getContext().getTargetConfig().logLevel = LogLevel.WARN;
     test.getContext().getArgs().setProperty("logging", "warning");

From 8cb9a0520da179520b31daef64b909b04c0fd147 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Thu, 1 Jun 2023 18:05:03 +0200
Subject: [PATCH 0189/1114] Debug output seems to not be a problem for zephyr
 native execution

---
 org.lflang.tests/src/org/lflang/tests/Configurators.java | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/org.lflang.tests/src/org/lflang/tests/Configurators.java b/org.lflang.tests/src/org/lflang/tests/Configurators.java
index a90f85d94e..387acc934a 100644
--- a/org.lflang.tests/src/org/lflang/tests/Configurators.java
+++ b/org.lflang.tests/src/org/lflang/tests/Configurators.java
@@ -71,9 +71,6 @@ public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
     test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
     test.getContext().getTargetConfig().platformOptions.flash = false;
     test.getContext().getTargetConfig().platformOptions.board = "native_posix";
-    // FIXME: Zephyr qemu emulations fails with debug log-levels.
-    test.getContext().getTargetConfig().logLevel = LogLevel.WARN;
-    test.getContext().getArgs().setProperty("logging", "warning");
     return true;
   }
 
@@ -82,9 +79,6 @@ public static boolean makeZephyrCompatible(LFTest test) {
     test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
     test.getContext().getTargetConfig().platformOptions.flash = false;
     test.getContext().getTargetConfig().platformOptions.board = "native_posix";
-    // FIXME: Zephyr qemu emulations fails with debug log-levels.
-    test.getContext().getTargetConfig().logLevel = LogLevel.WARN;
-    test.getContext().getArgs().setProperty("logging", "warning");
 
     return true;
   }

From 6630c340901bc8c9204a579e9dfdf04b3e123ad1 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Thu, 1 Jun 2023 18:06:05 +0200
Subject: [PATCH 0190/1114] Bump reactor-C

---
 org.lflang/src/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index 1d793796f6..e0f790bc3a 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 1d793796f67dae4e12431d91825c5bd0710e52eb
+Subproject commit e0f790bc3ae9698c94c11c8f76f81dfb99166bc4

From 66f8f836b463f5dca5291e9ed16a73925ceba85c Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Thu, 1 Jun 2023 18:20:39 +0200
Subject: [PATCH 0191/1114] Move to native execution of Zephyr CI tests, then
 we dont need the run-script either

---
 .github/workflows/c-zephyr-tests.yml                        | 3 +--
 org.lflang.tests/src/org/lflang/tests/Configurators.java    | 4 ++--
 .../src/org/lflang/tests/runtime/CZephyrTest.java           | 6 +++---
 org.lflang/src/lib/c/reactor-c                              | 2 +-
 org.lflang/src/org/lflang/generator/c/CCompiler.java        | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index 2af2d2d534..362b739450 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -41,8 +41,7 @@ jobs:
         if: ${{ inputs.runtime-ref }}
       - name: Perform Zephyr tests for C target with default scheduler
         run: |
-          ./gradlew test --tests org.lflang.tests.runtime.CZephyrTest.build*
-          util/RunZephyrTests.sh test/C/src-gen
+          ./gradlew test --tests org.lflang.tests.runtime.CZephyrTest.run*
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
diff --git a/org.lflang.tests/src/org/lflang/tests/Configurators.java b/org.lflang.tests/src/org/lflang/tests/Configurators.java
index 387acc934a..c1b15e9e8b 100644
--- a/org.lflang.tests/src/org/lflang/tests/Configurators.java
+++ b/org.lflang.tests/src/org/lflang/tests/Configurators.java
@@ -69,7 +69,7 @@ public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
     test.getContext().getTargetConfig().threading = false;
     test.getContext().getTargetConfig().setByUser.add(TargetProperty.THREADING);
     test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
-    test.getContext().getTargetConfig().platformOptions.flash = false;
+    test.getContext().getTargetConfig().platformOptions.flash = true;
     test.getContext().getTargetConfig().platformOptions.board = "native_posix";
     return true;
   }
@@ -77,7 +77,7 @@ public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
   public static boolean makeZephyrCompatible(LFTest test) {
     test.getContext().getArgs().setProperty("tracing", "false");
     test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
-    test.getContext().getTargetConfig().platformOptions.flash = false;
+    test.getContext().getTargetConfig().platformOptions.flash = true;
     test.getContext().getTargetConfig().platformOptions.board = "native_posix";
 
     return true;
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/CZephyrTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/CZephyrTest.java
index b29c2755d1..2e928bfa8d 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/CZephyrTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/CZephyrTest.java
@@ -44,7 +44,7 @@ public CZephyrTest() {
   }
 
   @Test
-  public void buildZephyrTests() {
+  public void runZephyrTests() {
     Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
     super.runTestsFor(
         List.of(Target.C),
@@ -56,7 +56,7 @@ public void buildZephyrTests() {
   }
 
   @Test
-  public void buildGenericTests() {
+  public void runGenericTests() {
     Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
     super.runTestsFor(
         List.of(Target.C),
@@ -68,7 +68,7 @@ public void buildGenericTests() {
   }
 
   @Test
-  public void buildConcurrentTests() {
+  public void runConcurrentTests() {
     Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
 
     super.runTestsFor(
diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index e0f790bc3a..ea8240ca8e 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit e0f790bc3ae9698c94c11c8f76f81dfb99166bc4
+Subproject commit ea8240ca8e26f5d6a8c57498437ecf32d20f7962
diff --git a/org.lflang/src/org/lflang/generator/c/CCompiler.java b/org.lflang/src/org/lflang/generator/c/CCompiler.java
index f919977ba5..27bb06af14 100644
--- a/org.lflang/src/org/lflang/generator/c/CCompiler.java
+++ b/org.lflang/src/org/lflang/generator/c/CCompiler.java
@@ -309,7 +309,7 @@ public LFCommand buildWestFlashCommand() {
     Path buildPath = fileConfig.getSrcGenPath().resolve("build");
     String board = targetConfig.platformOptions.board;
     LFCommand cmd;
-    if (board == null || board.startsWith("qemu")) {
+    if (board == null || board.startsWith("qemu") || board.equals("native_posix")) {
       cmd = commandFactory.createCommand("west", List.of("build", "-t", "run"), buildPath);
     } else {
       cmd = commandFactory.createCommand("west", List.of("flash"), buildPath);

From effd7328b73fc025733f49092a56f73415d5b8fe Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 1 Jun 2023 15:41:53 -0700
Subject: [PATCH 0192/1114] Apply formatter.

---
 org.lflang/src/org/lflang/AttributeUtils.java |  2 +-
 .../synthesis/LinguaFrancaSynthesis.java      | 39 ++++++------
 .../synthesis/SynthesisRegistration.java      |  7 +--
 .../postprocessor/ReactorPortAdjustment.java  | 61 ++++++++++---------
 .../styles/LinguaFrancaShapeExtensions.java   |  4 +-
 5 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/org.lflang/src/org/lflang/AttributeUtils.java b/org.lflang/src/org/lflang/AttributeUtils.java
index 2da57d5c2f..15013ac6ba 100644
--- a/org.lflang/src/org/lflang/AttributeUtils.java
+++ b/org.lflang/src/org/lflang/AttributeUtils.java
@@ -230,7 +230,7 @@ public static String getLabel(EObject node) {
   public static String getIconPath(EObject node) {
     return getAttributeValue(node, "icon");
   }
-  
+
   /** Return the declared side of the port, as given by the @side annotation. */
   public static String getPortSide(EObject node) {
     return getAttributeValue(node, "side");
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/org.lflang/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index cdea160a53..060e73507d 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -165,7 +165,7 @@ public class LinguaFrancaSynthesis extends AbstractDiagramSynthesis<Model> {
   public static final Property<Boolean> REACTOR_HAS_BANK_PORT_OFFSET =
       new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.bank.offset", false);
   public static final Property<Boolean> REACTOR_MULTIPORT =
-          new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.multiport", false);
+      new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.multiport", false);
   public static final Property<Boolean> REACTOR_INPUT =
       new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.input", false);
   public static final Property<Boolean> REACTOR_OUTPUT =
@@ -247,8 +247,8 @@ public class LinguaFrancaSynthesis extends AbstractDiagramSynthesis<Model> {
       SynthesisOption.<Integer>createRangeOption("Reactor Parameter/Variable Columns", 1, 10, 1)
           .setCategory(APPEARANCE);
 
-  public static final SynthesisOption FIXED_PORT_SIDE = 
-          SynthesisOption.createCheckOption("Fixed Port Sides", true).setCategory(LAYOUT);
+  public static final SynthesisOption FIXED_PORT_SIDE =
+      SynthesisOption.createCheckOption("Fixed Port Sides", true).setCategory(LAYOUT);
   public static final SynthesisOption SPACING =
       SynthesisOption.<Integer>createRangeOption("Spacing (%)", 0, 150, 5, 75).setCategory(LAYOUT);
 
@@ -487,7 +487,7 @@ private Collection<KNode> createReactorNode(
         _kRenderingExtensions.addDoubleClickAction(figure, MemorizingExpandCollapseAction.ID);
       }
       _reactorIcons.handleIcon(comps.getReactor(), reactor, false);
-      
+
       if (!getBooleanValue(FIXED_PORT_SIDE)) {
         // Port figures will need post-processing to fix IO indication if portside is not fixed
         ReactorPortAdjustment.apply(node, comps.getFigures());
@@ -618,7 +618,7 @@ private Collection<KNode> createReactorNode(
         }
       }
       _reactorIcons.handleIcon(comps.getReactor(), reactor, true);
-      
+
       if (!getBooleanValue(FIXED_PORT_SIDE)) {
         // Port figures will need post-processing to fix IO indication if portside is not fixed
         ReactorPortAdjustment.apply(node, comps.getFigures());
@@ -744,8 +744,7 @@ public KNode configureReactorNodeLayout(KNode node, boolean main) {
         node,
         CoreOptions.NODE_SIZE_CONSTRAINTS,
         EnumSet.of(SizeConstraint.MINIMUM_SIZE, SizeConstraint.PORTS));
-    
-    
+
     if (getBooleanValue(FIXED_PORT_SIDE)) {
       // Allows to freely shuffle ports on each side
       setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FIXED_SIDE);
@@ -753,14 +752,14 @@ public KNode configureReactorNodeLayout(KNode node, boolean main) {
       // Ports are no longer fixed based on input or output
       setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FREE);
     }
-    
+
     setLayoutOption(
         node,
         CoreOptions.PORT_LABELS_PLACEMENT,
         EnumSet.of(PortLabelPlacement.ALWAYS_OTHER_SAME_SIDE, PortLabelPlacement.OUTSIDE));
     // TODO: Add PortLabelPlacement.NEXT_TO_PORT_IF_POSSIBLE back into the configuration, as soon as
     // ELK provides a fix for LF issue #1273
-    
+
     // Adjust port label spacing to be closer to edge but not overlap with port figure
     setLayoutOption(node, CoreOptions.SPACING_LABEL_PORT_HORIZONTAL, 2.0);
     setLayoutOption(node, CoreOptions.SPACING_LABEL_PORT_VERTICAL, -3.0);
@@ -1601,30 +1600,30 @@ private KEdge connect(KEdge edge, KPort src, KPort dst) {
   }
 
   /** Translate an input/output into a port. */
-  private KPort addIOPort(KNode node, PortInstance lfPort, 
-          boolean input, boolean multiport, boolean bank) {
+  private KPort addIOPort(
+      KNode node, PortInstance lfPort, boolean input, boolean multiport, boolean bank) {
     KPort port = _kPortExtensions.createPort();
     node.getPorts().add(port);
     associateWith(port, lfPort.getDefinition());
     NamedInstanceUtil.linkInstance(port, lfPort);
     _kPortExtensions.setPortSize(port, 6, 6);
-    
+
     var side = input ? PortSide.WEST : PortSide.EAST;
     var userSideAttr = AttributeUtils.getPortSide(lfPort.getDefinition());
     if (userSideAttr != null) {
       try {
         var userSide = PortSide.valueOf(userSideAttr.toUpperCase());
         if (userSide != null) {
-            side = userSide;
+          side = userSide;
         }
-      } catch(Exception e) {
+      } catch (Exception e) {
         // ignore and use default
       }
     }
     double offset = getReactorPortOffset(side == PortSide.WEST, multiport, bank);
     setLayoutOption(port, CoreOptions.PORT_SIDE, side);
     setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET, offset);
-    
+
     if (multiport) {
       node.setProperty(REACTOR_MULTIPORT, true);
     }
@@ -1653,19 +1652,19 @@ private KPort addIOPort(KNode node, PortInstance lfPort,
     associateWith(_kLabelExtensions.addOutsidePortLabel(port, label, 8), lfPort.getDefinition());
     return port;
   }
-  
+
   public static double getReactorPortOffset(boolean sideLeft, boolean multiport, boolean bank) {
     var offset = -3.3;
-    
+
     if (multiport) {
-        offset = sideLeft ? -3.4 : -2.6;
+      offset = sideLeft ? -3.4 : -2.6;
     }
-    
+
     if (bank && !sideLeft) {
       // compensate bank figure width
       offset -= LinguaFrancaShapeExtensions.BANK_FIGURE_X_OFFSET_SUM;
     }
-    
+
     return offset;
   }
 
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/SynthesisRegistration.java b/org.lflang/src/org/lflang/diagram/synthesis/SynthesisRegistration.java
index bf78f2862d..577e0c26ba 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/SynthesisRegistration.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/SynthesisRegistration.java
@@ -1,5 +1,7 @@
 package org.lflang.diagram.synthesis;
 
+import de.cau.cs.kieler.klighd.IKlighdStartupHook;
+import de.cau.cs.kieler.klighd.KlighdDataManager;
 import org.lflang.diagram.synthesis.action.CollapseAllReactorsAction;
 import org.lflang.diagram.synthesis.action.ExpandAllReactorsAction;
 import org.lflang.diagram.synthesis.action.FilterCycleAction;
@@ -11,9 +13,6 @@
 import org.lflang.diagram.synthesis.styles.LinguaFrancaStyleExtensions;
 import org.lflang.diagram.synthesis.util.NamedInstanceUtil;
 
-import de.cau.cs.kieler.klighd.IKlighdStartupHook;
-import de.cau.cs.kieler.klighd.KlighdDataManager;
-
 /**
  * Registration of all diagram synthesis related classes in Klighd.
  *
@@ -50,6 +49,6 @@ public void execute() {
     reg.registerBlacklistedProperty(LinguaFrancaShapeExtensions.REACTOR_CONTENT_CONTAINER);
     reg.registerBlacklistedProperty(LinguaFrancaStyleExtensions.LABEL_PARENT_BACKGROUND);
     // Very important since its values can not be synthesized easily!
-    reg.registerBlacklistedProperty(NamedInstanceUtil.LINKED_INSTANCE); 
+    reg.registerBlacklistedProperty(NamedInstanceUtil.LINKED_INSTANCE);
   }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactorPortAdjustment.java b/org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactorPortAdjustment.java
index 3548fd5aa1..315eb0ebf4 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactorPortAdjustment.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactorPortAdjustment.java
@@ -24,21 +24,10 @@
  ***************/
 package org.lflang.diagram.synthesis.postprocessor;
 
-import java.util.List;
-
-import javax.inject.Inject;
-
-import org.eclipse.elk.core.options.CoreOptions;
-import org.eclipse.elk.graph.properties.Property;
-import org.eclipse.xtext.xbase.lib.Extension;
-import org.lflang.diagram.synthesis.LinguaFrancaSynthesis;
-import org.lflang.diagram.synthesis.styles.LinguaFrancaShapeExtensions;
-
 import com.google.inject.Binder;
 import com.google.inject.Guice;
 import com.google.inject.Scopes;
 import com.google.inject.TypeLiteral;
-
 import de.cau.cs.kieler.klighd.IStyleModifier;
 import de.cau.cs.kieler.klighd.IViewer;
 import de.cau.cs.kieler.klighd.internal.ILayoutRecorder;
@@ -49,9 +38,17 @@
 import de.cau.cs.kieler.klighd.krendering.KRenderingFactory;
 import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
 import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis;
+import java.util.List;
+import javax.inject.Inject;
+import org.eclipse.elk.core.options.CoreOptions;
+import org.eclipse.elk.graph.properties.Property;
+import org.eclipse.xtext.xbase.lib.Extension;
+import org.lflang.diagram.synthesis.LinguaFrancaSynthesis;
+import org.lflang.diagram.synthesis.styles.LinguaFrancaShapeExtensions;
 
 /**
- * Adjusts the port figures of reactors when fixed side are off to keep the input output indication correct.
+ * Adjusts the port figures of reactors when fixed side are off to keep the input output indication
+ * correct.
  *
  * @author Alexander Schulz-Rosengarten
  */
@@ -63,7 +60,7 @@ public class ReactorPortAdjustment implements IStyleModifier {
   /** INTERNAL property to mark node as flipped. */
   public static final Property<Boolean> FLIPPED =
       new Property<>("org.lflang.diagram.synthesis.postprocessor.reactor.ports.flipped", false);
-  
+
   @Inject @Extension private LinguaFrancaShapeExtensions _linguaFrancaShapeExtensions;
   @Extension private KGraphFactory _kGraphFactory = KGraphFactory.eINSTANCE;
   private static KRenderingFactory _kRenderingFactory = KRenderingFactory.eINSTANCE;
@@ -79,17 +76,22 @@ public static void apply(KNode node, List<KRendering> renderings) {
     invisible.setModifierId(ID);
     rendering.getStyles().add(invisible);
   }
-  
+
   public ReactorPortAdjustment() {
     // Inject extension
     if (_linguaFrancaShapeExtensions == null) {
-      var injector = Guice.createInjector(new com.google.inject.Module() {
-        // This Module is created to satisfy ViewSynthesisShared scope of used synthesis-extensions
-        public void configure(Binder binder) {
-          binder.bindScope(ViewSynthesisShared.class, Scopes.SINGLETON);
-          binder.bind(new TypeLiteral<AbstractDiagramSynthesis<?>>(){}).toInstance(new LinguaFrancaSynthesis());
-        }
-      });
+      var injector =
+          Guice.createInjector(
+              new com.google.inject.Module() {
+                // This Module is created to satisfy ViewSynthesisShared scope of used
+                // synthesis-extensions
+                public void configure(Binder binder) {
+                  binder.bindScope(ViewSynthesisShared.class, Scopes.SINGLETON);
+                  binder
+                      .bind(new TypeLiteral<AbstractDiagramSynthesis<?>>() {})
+                      .toInstance(new LinguaFrancaSynthesis());
+                }
+              });
       _linguaFrancaShapeExtensions = injector.getInstance(LinguaFrancaShapeExtensions.class);
     }
   }
@@ -130,31 +132,32 @@ public boolean modify(IStyleModifier.StyleModificationContext context) {
         for (var port : knode.getPorts()) {
           var isInput = port.getProperty(LinguaFrancaSynthesis.REACTOR_INPUT).booleanValue();
           if (!isInput && !port.getProperty(LinguaFrancaSynthesis.REACTOR_OUTPUT)) {
-              continue; // skip
+            continue; // skip
           }
-          
+
           var xPos = port.getXpos();
           var isLeft = xPos < 0;
           var flip = isInput != isLeft;
           var isFlipped = port.getProperty(FLIPPED).booleanValue();
           var needsUpdate = flip != isFlipped;
-          
+
           if (needsUpdate) {
             // Remove figure
             port.getData().removeIf(it -> it instanceof KRendering);
-            
+
             // Get port type
             var isMultiport = port.getProperty(LinguaFrancaSynthesis.REACTOR_MULTIPORT);
             var isBank = port.getProperty(LinguaFrancaSynthesis.REACTOR_HAS_BANK_PORT_OFFSET);
-            
+
             // Add new figure
             _linguaFrancaShapeExtensions.addTrianglePort(port, isMultiport, flip);
             port.setProperty(FLIPPED, flip);
-            
+
             // Compute new offset
             var oldOffset = port.getProperty(CoreOptions.PORT_BORDER_OFFSET);
-            var newOffset = LinguaFrancaSynthesis.getReactorPortOffset(!isLeft, isMultiport, isBank);
-            
+            var newOffset =
+                LinguaFrancaSynthesis.getReactorPortOffset(!isLeft, isMultiport, isBank);
+
             // Apply offset directly
             port.setPos((float) (port.getXpos() + (oldOffset - newOffset)), port.getYpos());
           }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java b/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
index 3d7d45e86b..b8ee69fa1c 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
@@ -823,13 +823,13 @@ public KPolygon addTrianglePort(KPort port, boolean multiport, boolean reverse)
       pointsToAdd =
           List.of(
               _kRenderingExtensions.createKPosition(reverse ? RIGHT : LEFT, 0, 0, TOP, 0.6f, 0),
-              _kRenderingExtensions.createKPosition(reverse ? LEFT: RIGHT, 1.2f, 0, TOP, 0, 0.5f),
+              _kRenderingExtensions.createKPosition(reverse ? LEFT : RIGHT, 1.2f, 0, TOP, 0, 0.5f),
               _kRenderingExtensions.createKPosition(reverse ? RIGHT : LEFT, 0, 0, BOTTOM, 0.6f, 0));
     } else {
       pointsToAdd =
           List.of(
               _kRenderingExtensions.createKPosition(reverse ? RIGHT : LEFT, 0, 0, TOP, 0, 0),
-              _kRenderingExtensions.createKPosition(reverse ? LEFT: RIGHT, 0, 0, TOP, 0, 0.5f),
+              _kRenderingExtensions.createKPosition(reverse ? LEFT : RIGHT, 0, 0, TOP, 0, 0.5f),
               _kRenderingExtensions.createKPosition(reverse ? RIGHT : LEFT, 0, 0, BOTTOM, 0, 0));
     }
     trianglePort.getPoints().addAll(pointsToAdd);

From 559ae5ae7ee4c8d7abb6abd4b44d84bcdaa7a56e Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 1 Jun 2023 23:24:38 -0700
Subject: [PATCH 0193/1114] Update
 org.lflang/src/org/lflang/AttributeUtils.java

Co-authored-by: Edward A. Lee <eal@eecs.berkeley.edu>
---
 org.lflang/src/org/lflang/AttributeUtils.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/org.lflang/src/org/lflang/AttributeUtils.java b/org.lflang/src/org/lflang/AttributeUtils.java
index 15013ac6ba..23e2b82c3b 100644
--- a/org.lflang/src/org/lflang/AttributeUtils.java
+++ b/org.lflang/src/org/lflang/AttributeUtils.java
@@ -231,7 +231,10 @@ public static String getIconPath(EObject node) {
     return getAttributeValue(node, "icon");
   }
 
-  /** Return the declared side of the port, as given by the @side annotation. */
+  /**
+   * Return the {@code @side} annotation for the given node (presumably a port)
+   * or null if there is no such annotation.
+   */
   public static String getPortSide(EObject node) {
     return getAttributeValue(node, "side");
   }

From da050b41e8df984881fd0017325028699c113aef Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Fri, 2 Jun 2023 12:47:22 +0200
Subject: [PATCH 0194/1114] Bump reactor-c

---
 org.lflang/src/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
index ea8240ca8e..6ad2cc42d9 160000
--- a/org.lflang/src/lib/c/reactor-c
+++ b/org.lflang/src/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit ea8240ca8e26f5d6a8c57498437ecf32d20f7962
+Subproject commit 6ad2cc42d9a129dca8deec99d0f7d0bb7da3bddf

From 99e73960dc45a5a96cb0319bd2bf7ff29aff8499 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 2 Jun 2023 12:57:08 -0700
Subject: [PATCH 0195/1114] Fix compilation errors from merge.

---
 .../src/org/lflang/federated/extensions/CExtension.java    | 7 ++-----
 .../org/lflang/federated/extensions/CExtensionUtils.java   | 2 +-
 .../src/org/lflang/federated/generator/FedMainEmitter.java | 6 ++++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtension.java b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
index f2b30caac3..a38b557ed5 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
@@ -541,12 +541,9 @@ protected String makePreamble(
             staa_t* staa_lst[%1$s];
             size_t staa_lst_size = %1$s;
         """.formatted(numOfSTAAOffsets)));
-        
-
-        code.pr(generateSerializationPreamble(federate, fileConfig));
 
         code.pr(generateExecutablePreamble(federate, rtiConfig, errorReporter));
-        
+
         code.pr(generateSTAAInitialization(federate, rtiConfig, errorReporter));
 
         code.pr(generateInitializeTriggers(federate, errorReporter));
@@ -623,7 +620,7 @@ void _lf_executable_preamble() {
     private String generateSTAAInitialization(FederateInstance federate, RtiConfig rtiConfig, ErrorReporter errorReporter) {
         CodeBuilder code = new CodeBuilder();
         code.pr(CExtensionUtils.surroundWithIfFederatedDecentralized(CExtensionUtils.stpStructs(federate, errorReporter)));
-        
+
         //code.pr(CExtensionUtils.allocateTriggersForFederate(federate));
 
         return """
diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
index fd01e850aa..b8f3e2cd11 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.regex.Pattern;
 
-import org.lflang.ASTUtils;
+import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig.ClockSyncOptions;
diff --git a/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java b/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java
index 486b6548b3..d54d7fb068 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java
@@ -1,5 +1,7 @@
 package org.lflang.federated.generator;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -78,7 +80,7 @@ private static String getDependencyList(FederateInstance federate, Pair<PortInst
 
 
 
-        
+
     }
 
     /**
@@ -103,7 +105,7 @@ private CharSequence generateMainSignature(FederateInstance federate, Reactor or
             .stream()
             .map(Variable::getName)
             .collect(Collectors.joining(","));
-        
+
         List<String> vals = new ArrayList<>();
         for (var pair: federate.networkReactionDependencyPairs){
             vals.add(getDependencyList(federate, pair));

From 9c810600d83a62f833fe23e37a6b0699306f9f59 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 2 Jun 2023 13:10:35 -0700
Subject: [PATCH 0196/1114] Format all Java files.

---
 .../src/org/lflang/tests/Configurators.java   |  107 +-
 .../src/org/lflang/tests/LFParsingTest.java   |  227 +-
 .../src/org/lflang/tests/LFTest.java          |  480 +-
 .../src/org/lflang/tests/LfParsingUtil.java   |  129 +-
 .../org/lflang/tests/RunSingleTestMain.java   |   77 +-
 .../src/org/lflang/tests/RuntimeTest.java     |  391 +-
 .../src/org/lflang/tests/TestBase.java        | 1193 ++---
 .../src/org/lflang/tests/TestError.java       |   44 +-
 .../src/org/lflang/tests/TestRegistry.java    |  647 ++-
 .../src/org/lflang/tests/TestUtils.java       |  242 +-
 .../lflang/tests/cli/CliToolTestFixture.java  |  186 +-
 .../src/org/lflang/tests/cli/LfcCliTest.java  |  439 +-
 .../src/org/lflang/tests/cli/LffCliTest.java  |  167 +-
 .../tests/compiler/EquivalenceUnitTests.java  |   97 +-
 .../tests/compiler/FormattingUnitTests.java   |   89 +-
 .../tests/compiler/LetInferenceTests.java     |  205 +-
 .../compiler/LinguaFrancaASTUtilsTest.java    |  301 +-
 .../LinguaFrancaDependencyAnalysisTest.java   |  206 +-
 .../compiler/LinguaFrancaParsingTest.java     |  126 +-
 .../compiler/LinguaFrancaScopingTest.java     |  302 +-
 .../compiler/LinguaFrancaValidationTest.java  | 2665 ++++++-----
 .../tests/compiler/MixedRadixIntTest.java     |  191 +-
 .../tests/compiler/PortInstanceTests.java     |  398 +-
 .../org/lflang/tests/compiler/RangeTests.java |  169 +-
 .../lflang/tests/compiler/RoundTripTests.java |   74 +-
 .../tests/compiler/TargetConfigTests.java     |  125 +-
 .../org/lflang/tests/lsp/ErrorInserter.java   |  616 +--
 .../src/org/lflang/tests/lsp/LspTests.java    |  385 +-
 .../lflang/tests/lsp/MockLanguageClient.java  |   79 +-
 .../lflang/tests/lsp/MockReportProgress.java  |   43 +-
 .../lflang/tests/runtime/CArduinoTest.java    |   28 +-
 .../org/lflang/tests/runtime/CCppTest.java    |   64 +-
 .../lflang/tests/runtime/CSchedulerTest.java  |  103 +-
 .../src/org/lflang/tests/runtime/CTest.java   |  230 +-
 .../org/lflang/tests/runtime/CZephyrTest.java |   99 +-
 .../org/lflang/tests/runtime/CppRos2Test.java |   35 +-
 .../src/org/lflang/tests/runtime/CppTest.java |  138 +-
 .../org/lflang/tests/runtime/PythonTest.java  |  213 +-
 .../org/lflang/tests/runtime/RustTest.java    |   20 +-
 .../lflang/tests/runtime/TypeScriptTest.java  |  110 +-
 .../serialization/SerializationTest.java      |   59 +-
 .../org/lflang/tests/util/StringUtilTest.java |   38 +-
 org.lflang/src/org/lflang/AttributeUtils.java |  345 +-
 .../src/org/lflang/DefaultErrorReporter.java  |  104 +-
 org.lflang/src/org/lflang/ErrorReporter.java  |  311 +-
 org.lflang/src/org/lflang/FileConfig.java     |  545 ++-
 org.lflang/src/org/lflang/InferredType.java   |  349 +-
 .../lflang/LFResourceDescriptionStrategy.java |  118 +-
 .../src/org/lflang/LFResourceProvider.java    |   30 +-
 .../src/org/lflang/LFRuntimeModule.java       |   72 +-
 .../src/org/lflang/LFStandaloneSetup.java     |   31 +-
 .../lflang/LFSyntaxErrorMessageProvider.java  |  124 +-
 org.lflang/src/org/lflang/LocalStrings.java   |    8 +-
 .../src/org/lflang/MainConflictChecker.java   |  147 +-
 org.lflang/src/org/lflang/ModelInfo.java      |  422 +-
 org.lflang/src/org/lflang/Target.java         | 1131 +++--
 org.lflang/src/org/lflang/TargetConfig.java   |  716 ++-
 org.lflang/src/org/lflang/TargetProperty.java | 3332 +++++++-------
 org.lflang/src/org/lflang/TimeUnit.java       |  127 +-
 org.lflang/src/org/lflang/TimeValue.java      |  340 +-
 org.lflang/src/org/lflang/ast/ASTUtils.java   | 3468 ++++++++-------
 .../src/org/lflang/ast/AstTransformation.java |   11 +-
 .../ast/DelayedConnectionTransformation.java  |  690 +--
 .../src/org/lflang/ast/FormattingUtils.java   |  427 +-
 org.lflang/src/org/lflang/ast/IsEqual.java    | 1201 +++--
 org.lflang/src/org/lflang/ast/ToLf.java       |    7 +-
 org.lflang/src/org/lflang/ast/ToText.java     |  204 +-
 org.lflang/src/org/lflang/cli/CliBase.java    |  582 ++-
 .../org/lflang/cli/LFStandaloneModule.java    |   58 +-
 org.lflang/src/org/lflang/cli/Lfc.java        |  515 +--
 org.lflang/src/org/lflang/cli/Lff.java        |  306 +-
 .../lflang/cli/StandaloneErrorReporter.java   |  143 +-
 .../lflang/cli/StandaloneIssueAcceptor.java   |  186 +-
 .../src/org/lflang/cli/VersionProvider.java   |   30 +-
 .../lflang/diagram/lsp/LFLanguageServer.java  |   36 +-
 .../lsp/LFLanguageServerExtension.java        |  196 +-
 .../diagram/lsp/LanguageDiagramServer.java    |  162 +-
 .../src/org/lflang/diagram/lsp/Progress.java  |  156 +-
 .../AbstractSynthesisExtensions.java          |   98 +-
 .../synthesis/LinguaFrancaSynthesis.java      | 2773 ++++++------
 .../ReactorParameterDisplayModes.java         |   76 +-
 .../synthesis/SynthesisRegistration.java      |   69 +-
 .../synthesis/action/AbstractAction.java      |   79 +-
 .../action/CollapseAllReactorsAction.java     |   88 +-
 .../action/ExpandAllReactorsAction.java       |   84 +-
 .../synthesis/action/FilterCycleAction.java   |  238 +-
 .../MemorizingExpandCollapseAction.java       |  204 +-
 .../synthesis/action/ShowCycleAction.java     |  131 +-
 .../postprocessor/ReactionPortAdjustment.java |  315 +-
 .../styles/LinguaFrancaShapeExtensions.java   | 2091 +++++----
 .../styles/LinguaFrancaStyleExtensions.java   |  862 ++--
 .../styles/ReactorFigureComponents.java       |  170 +-
 .../synthesis/util/CycleVisualization.java    |  243 +-
 .../InterfaceDependenciesVisualization.java   |  340 +-
 .../synthesis/util/LayoutPostProcessing.java  |  697 +--
 .../diagram/synthesis/util/ModeDiagrams.java  | 1206 ++---
 .../synthesis/util/NamedInstanceUtil.java     |   78 +-
 .../diagram/synthesis/util/ReactorIcons.java  |  254 +-
 .../util/SynthesisErrorReporter.java          |  138 +-
 .../synthesis/util/UtilityExtensions.java     |  311 +-
 .../federated/extensions/CExtension.java      | 1382 +++---
 .../federated/extensions/CExtensionUtils.java | 1282 +++---
 .../extensions/FedTargetExtension.java        |  199 +-
 .../extensions/FedTargetExtensionFactory.java |   26 +-
 .../federated/extensions/PythonExtension.java |  254 +-
 .../federated/extensions/TSExtension.java     |  277 +-
 .../federated/generator/FedASTUtils.java      | 1723 ++++----
 .../generator/FedConnectionInstance.java      |  140 +-
 .../federated/generator/FedEmitter.java       |  105 +-
 .../federated/generator/FedFileConfig.java    |  196 +-
 .../federated/generator/FedGenerator.java     | 1059 +++--
 .../federated/generator/FedImportEmitter.java |   77 +-
 .../federated/generator/FedMainEmitter.java   |  202 +-
 .../generator/FedPreambleEmitter.java         |   62 +-
 .../generator/FedReactorEmitter.java          |   20 +-
 .../federated/generator/FedTargetConfig.java  |  104 +-
 .../federated/generator/FedTargetEmitter.java |   48 +-
 .../lflang/federated/generator/FedUtils.java  |   46 +-
 .../federated/generator/FederateInstance.java | 1256 +++---
 .../generator/LineAdjustingErrorReporter.java |  210 +-
 .../generator/SynchronizedErrorReporter.java  |  144 +-
 .../federated/launcher/BuildConfig.java       |   93 +-
 .../federated/launcher/CBuildConfig.java      |   68 +-
 .../launcher/FedLauncherGenerator.java        |  898 ++--
 .../federated/launcher/PyBuildConfig.java     |   37 +-
 .../lflang/federated/launcher/RtiConfig.java  |  115 +-
 .../federated/launcher/TsBuildConfig.java     |   64 +-
 .../FedNativePythonSerialization.java         |  172 +-
 .../FedROS2CPPSerialization.java              |  348 +-
 .../serialization/FedSerialization.java       |  133 +-
 .../serialization/SupportedSerializers.java   |   32 +-
 .../federated/validation/FedValidator.java    |   95 +-
 .../org/lflang/formatting2/LFFormatter.java   |   48 +-
 .../org/lflang/generator/ActionInstance.java  |  150 +-
 .../src/org/lflang/generator/CodeBuilder.java | 1018 ++---
 .../src/org/lflang/generator/CodeMap.java     |  554 ++-
 .../lflang/generator/DeadlineInstance.java    |  100 +-
 .../lflang/generator/DelayBodyGenerator.java  |   93 +-
 .../lflang/generator/DiagnosticReporting.java |   89 +-
 .../generator/DockerComposeGenerator.java     |  156 +-
 .../src/org/lflang/generator/DockerData.java  |   55 +-
 .../org/lflang/generator/DockerGenerator.java |   82 +-
 .../generator/FedDockerComposeGenerator.java  |   79 +-
 .../lflang/generator/GenerationException.java |   68 +-
 .../org/lflang/generator/GeneratorBase.java   | 1091 +++--
 .../generator/GeneratorCommandFactory.java    |  260 +-
 .../org/lflang/generator/GeneratorResult.java |  188 +-
 .../org/lflang/generator/GeneratorUtils.java  |  299 +-
 .../HumanReadableReportingStrategy.java       |  282 +-
 .../lflang/generator/IntegratedBuilder.java   |  248 +-
 .../generator/InvalidLfSourceException.java   |   37 +-
 .../generator/InvalidSourceException.java     |   18 +-
 .../src/org/lflang/generator/LFGenerator.java |  320 +-
 .../lflang/generator/LFGeneratorContext.java  |  258 +-
 .../src/org/lflang/generator/LFResource.java  |   65 +-
 .../LanguageServerErrorReporter.java          |  349 +-
 .../lflang/generator/LfExpressionVisitor.java |  209 +-
 .../src/org/lflang/generator/MainContext.java |  290 +-
 .../org/lflang/generator/MixedRadixInt.java   |  418 +-
 .../org/lflang/generator/ModeInstance.java    |  365 +-
 .../org/lflang/generator/NamedInstance.java   |  600 ++-
 .../lflang/generator/ParameterInstance.java   |  193 +-
 .../org/lflang/generator/PortInstance.java    |  801 ++--
 .../src/org/lflang/generator/Position.java    |  435 +-
 .../src/org/lflang/generator/Range.java       |  223 +-
 .../lflang/generator/ReactionInstance.java    |  991 ++---
 .../generator/ReactionInstanceGraph.java      |  820 ++--
 .../org/lflang/generator/ReactorInstance.java | 2081 +++++----
 .../org/lflang/generator/RuntimeRange.java    |  839 ++--
 .../src/org/lflang/generator/SendRange.java   |  491 +--
 .../src/org/lflang/generator/SubContext.java  |  148 +-
 .../src/org/lflang/generator/TargetTypes.java |  457 +-
 .../org/lflang/generator/TimerInstance.java   |  129 +-
 .../org/lflang/generator/TriggerInstance.java |  299 +-
 .../UnsupportedGeneratorFeatureException.java |   17 +-
 .../lflang/generator/ValidationStrategy.java  |   67 +-
 .../src/org/lflang/generator/Validator.java   |  329 +-
 .../lflang/generator/WatchdogInstance.java    |    4 +-
 .../lflang/generator/c/CActionGenerator.java  |  290 +-
 .../lflang/generator/c/CCmakeGenerator.java   |  673 +--
 .../src/org/lflang/generator/c/CCompiler.java |  729 ++-
 .../generator/c/CConstructorGenerator.java    |   52 +-
 .../lflang/generator/c/CCoreFilesUtils.java   |   34 +-
 .../generator/c/CDelayBodyGenerator.java      |   97 +-
 .../lflang/generator/c/CDockerGenerator.java  |  112 +-
 .../org/lflang/generator/c/CFileConfig.java   |   33 +-
 .../org/lflang/generator/c/CGenerator.java    | 3907 +++++++++--------
 .../generator/c/CMainFunctionGenerator.java   |  203 +-
 .../lflang/generator/c/CMethodGenerator.java  |  280 +-
 .../generator/c/CMixedRadixGenerator.java     |   24 +-
 .../lflang/generator/c/CModesGenerator.java   |  386 +-
 .../generator/c/CParameterGenerator.java      |   61 +-
 .../lflang/generator/c/CPortGenerator.java    |  496 ++-
 .../generator/c/CPreambleGenerator.java       |  137 +-
 .../generator/c/CReactionGenerator.java       | 2326 +++++-----
 .../c/CReactorHeaderFileGenerator.java        |  376 +-
 .../lflang/generator/c/CStateGenerator.java   |  213 +-
 .../lflang/generator/c/CTimerGenerator.java   |  111 +-
 .../lflang/generator/c/CTracingGenerator.java |   92 +-
 .../generator/c/CTriggerObjectsGenerator.java | 2005 +++++----
 .../src/org/lflang/generator/c/CTypes.java    |  286 +-
 .../src/org/lflang/generator/c/CUtil.java     | 1510 ++++---
 .../generator/c/CWatchdogGenerator.java       |   98 +-
 .../c/InteractingContainedReactors.java       |  229 +-
 .../generator/c/TypeParameterizedReactor.java |  111 +-
 .../lflang/generator/python/PyFileConfig.java |   38 +-
 .../org/lflang/generator/python/PyUtil.java   |  262 +-
 .../python/PythonActionGenerator.java         |   15 +-
 .../python/PythonDelayBodyGenerator.java      |  126 +-
 .../python/PythonDockerGenerator.java         |   41 +-
 .../generator/python/PythonGenerator.java     | 1142 +++--
 .../generator/python/PythonInfoGenerator.java |   90 +-
 .../python/PythonMainFunctionGenerator.java   |   37 +-
 .../python/PythonMethodGenerator.java         |   58 +-
 .../generator/python/PythonModeGenerator.java |  147 +-
 .../python/PythonParameterGenerator.java      |  170 +-
 .../generator/python/PythonPortGenerator.java |  443 +-
 .../python/PythonPreambleGenerator.java       |   71 +-
 .../python/PythonReactionGenerator.java       | 1100 ++---
 .../python/PythonReactorGenerator.java        |  273 +-
 .../python/PythonStateGenerator.java          |   50 +-
 .../lflang/generator/python/PythonTypes.java  |  104 +-
 .../generator/python/PythonValidator.java     |  647 +--
 .../generator/rust/CargoDependencySpec.java   |   16 +-
 .../generator/rust/RustTargetConfig.java      |  142 +-
 .../generator/ts/TSDockerGenerator.java       |   21 +-
 .../src/org/lflang/generator/ts/TSTypes.java  |  118 +-
 .../src/org/lflang/graph/DirectedGraph.java   |  556 ++-
 org.lflang/src/org/lflang/graph/Graph.java    |  101 +-
 .../org/lflang/graph/InstantiationGraph.java  |  251 +-
 .../src/org/lflang/graph/NodeAnnotation.java  |  100 +-
 .../src/org/lflang/graph/NodeAnnotations.java |   52 +-
 .../src/org/lflang/graph/PrecedenceGraph.java |  413 +-
 .../src/org/lflang/graph/TopologyGraph.java   |  238 +-
 .../src/org/lflang/ide/LFIdeModule.java       |    8 +-
 org.lflang/src/org/lflang/ide/LFIdeSetup.java |   17 +-
 .../lflang/scoping/LFGlobalScopeProvider.java |  207 +-
 .../org/lflang/scoping/LFScopeProvider.java   |   11 +-
 .../lflang/scoping/LFScopeProviderImpl.java   |  425 +-
 .../src/org/lflang/util/ArduinoUtil.java      |  224 +-
 org.lflang/src/org/lflang/util/Averager.java  |   33 +-
 .../src/org/lflang/util/CollectionUtil.java   |  307 +-
 org.lflang/src/org/lflang/util/FileUtil.java  | 1744 ++++----
 .../src/org/lflang/util/IteratorUtil.java     |   96 +-
 org.lflang/src/org/lflang/util/LFCommand.java |  715 ++-
 org.lflang/src/org/lflang/util/Pair.java      |   26 +-
 .../src/org/lflang/util/StringUtil.java       |  234 +-
 .../util/TargetResourceNotFoundException.java |   13 +-
 .../org/lflang/validation/AttributeSpec.java  |  346 +-
 .../lflang/validation/BaseLFValidator.java    |   64 +-
 .../LFNamesAreUniqueValidationHelper.java     |   33 +-
 .../org/lflang/validation/LFValidator.java    | 3325 +++++++-------
 .../validation/ValidatorErrorReporter.java    |  297 +-
 253 files changed, 48052 insertions(+), 47458 deletions(-)

diff --git a/org.lflang.tests/src/org/lflang/tests/Configurators.java b/org.lflang.tests/src/org/lflang/tests/Configurators.java
index e3fe6c5508..24ee6f38f3 100644
--- a/org.lflang.tests/src/org/lflang/tests/Configurators.java
+++ b/org.lflang.tests/src/org/lflang/tests/Configurators.java
@@ -26,7 +26,6 @@
 
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.Platform;
-import org.lflang.generator.LFGeneratorContext.BuildParm;
 import org.lflang.tests.TestRegistry.TestCategory;
 
 /**
@@ -37,62 +36,60 @@
  */
 public class Configurators {
 
-    /** Test configuration function. */
-    @FunctionalInterface
-    public interface Configurator {
-
-        /**
-         * Apply a side effect to the given test case to change its default configuration.
-         * Return true if configuration succeeded, false otherwise.
-         */
-        boolean configure(LFTest test);
-    }
+  /** Test configuration function. */
+  @FunctionalInterface
+  public interface Configurator {
 
     /**
-     * Configure the given test to use single-threaded execution.
-     *
-     * For targets that provide a threaded and an unthreaded runtime,
-     * this configures using the unthreaded runtime. For targets that
-     * do not distinguish threaded and unthreaded runtime, the number
-     * of workers is set to 1.
-     *
-     * @param test The test to configure.
-     * @return True if successful, false otherwise.
+     * Apply a side effect to the given test case to change its default configuration. Return true
+     * if configuration succeeded, false otherwise.
      */
-    public static boolean disableThreading(LFTest test) {
-        test.getContext().getArgs().setProperty("threading", "false");
-        test.getContext().getArgs().setProperty("workers", "1");
-        return true;
-    }
+    boolean configure(LFTest test);
+  }
 
-    public static boolean makeZephyrCompatible(LFTest test) {
-        test.getContext().getArgs().setProperty("tracing", "false");
-        test.getContext().getTargetConfig().threading = false;
-        test.getContext().getTargetConfig().setByUser.add(TargetProperty.THREADING);
-        test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
-        test.getContext().getTargetConfig().platformOptions.flash = false;
-        test.getContext().getTargetConfig().platformOptions.board = "qemu_cortex_a53";
-        return true;
-    }
-    /**
-     * Make no changes to the configuration.
-     *
-     * @param ignoredTest The test to configure.
-     * @return True
-     */
-    public static boolean noChanges(LFTest ignoredTest) {
-        return true;
-    }
+  /**
+   * Configure the given test to use single-threaded execution.
+   *
+   * <p>For targets that provide a threaded and an unthreaded runtime, this configures using the
+   * unthreaded runtime. For targets that do not distinguish threaded and unthreaded runtime, the
+   * number of workers is set to 1.
+   *
+   * @param test The test to configure.
+   * @return True if successful, false otherwise.
+   */
+  public static boolean disableThreading(LFTest test) {
+    test.getContext().getArgs().setProperty("threading", "false");
+    test.getContext().getArgs().setProperty("workers", "1");
+    return true;
+  }
 
-    /**
-     * Given a test category, return true if it is compatible with single-threaded execution.
-     */
-    public static boolean compatibleWithThreadingOff(TestCategory category) {
+  public static boolean makeZephyrCompatible(LFTest test) {
+    test.getContext().getArgs().setProperty("tracing", "false");
+    test.getContext().getTargetConfig().threading = false;
+    test.getContext().getTargetConfig().setByUser.add(TargetProperty.THREADING);
+    test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
+    test.getContext().getTargetConfig().platformOptions.flash = false;
+    test.getContext().getTargetConfig().platformOptions.board = "qemu_cortex_a53";
+    return true;
+  }
+  /**
+   * Make no changes to the configuration.
+   *
+   * @param ignoredTest The test to configure.
+   * @return True
+   */
+  public static boolean noChanges(LFTest ignoredTest) {
+    return true;
+  }
+
+  /** Given a test category, return true if it is compatible with single-threaded execution. */
+  public static boolean compatibleWithThreadingOff(TestCategory category) {
 
-        // CONCURRENT, FEDERATED, DOCKER_FEDERATED, DOCKER
-        // are not compatible with single-threaded execution.
-        // ARDUINO and ZEPHYR have their own test suites, so we don't need to rerun.
-        boolean excluded = category == TestCategory.CONCURRENT
+    // CONCURRENT, FEDERATED, DOCKER_FEDERATED, DOCKER
+    // are not compatible with single-threaded execution.
+    // ARDUINO and ZEPHYR have their own test suites, so we don't need to rerun.
+    boolean excluded =
+        category == TestCategory.CONCURRENT
             || category == TestCategory.SERIALIZATION
             || category == TestCategory.FEDERATED
             || category == TestCategory.DOCKER_FEDERATED
@@ -100,8 +97,8 @@ public static boolean compatibleWithThreadingOff(TestCategory category) {
             || category == TestCategory.ARDUINO
             || category == TestCategory.ZEPHYR;
 
-        // SERIALIZATION and TARGET tests are excluded on Windows.
-        excluded |= TestBase.isWindows() && (category == TestCategory.TARGET);
-        return !excluded;
-    }
+    // SERIALIZATION and TARGET tests are excluded on Windows.
+    excluded |= TestBase.isWindows() && (category == TestCategory.TARGET);
+    return !excluded;
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/LFParsingTest.java b/org.lflang.tests/src/org/lflang/tests/LFParsingTest.java
index 487c3b21e5..f0e96ee7d0 100644
--- a/org.lflang.tests/src/org/lflang/tests/LFParsingTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/LFParsingTest.java
@@ -3,8 +3,8 @@
  */
 package org.lflang.tests;
 
+import com.google.inject.Inject;
 import java.util.List;
-
 import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
@@ -13,127 +13,118 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.lflang.lf.Model;
 
-import com.google.inject.Inject;
-
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
 public class LFParsingTest {
 
-    @Inject
-    private ParseHelper<Model> parseHelper;
-
-
-    @Test
-    public void testLexingEmptyTargetProperties() throws Exception {
-        assertNoParsingErrorsIn("target C { };      \nreactor Foo {}");
-        assertNoParsingErrorsIn("target C {a:b,};   \nreactor Foo {}");
-        expectParsingErrorIn("target C {,};      \nreactor Foo {}");
-
-        // array elements
-        // assertNoParsingErrorsIn("target C {x:[ ]};  \nreactor Foo {}");
-        // assertNoParsingErrorsIn("target C {x:[]};   \nreactor Foo {}");
-        // assertNoParsingErrorsIn("target C {x:[,]};  \nreactor Foo {}");
-    }
-
-    @Test
-    public void testLexingLifetimeAnnots() throws Exception {
-        assertNoParsingErrorsIn(makeLfTargetCode("Rust",
-                                                 "        struct Hello<'a> { \n"
-                                                     + "            r: &'a str,\n"
-                                                     + "            r2: &'a Box<Hello<'a>>,\n"
-                                                     + "        }"));
-    }
-
-
-    @Test
-    public void testLexingSingleLifetimeAnnot() throws Exception {
-        // just to be sure, have a single lifetime annot.
-        assertNoParsingErrorsIn(makeLfTargetCode("Rust",
-                                                 "        struct Hello { \n"
-                                                     + "            r: &'static str,\n"
-                                                     + "        }"));
-    }
-
-
-    @Test
-    public void testLexingNewlineCont() throws Exception {
-        /*
-        This example looks like this:
-        "a\
-        bcde"
-
-        This is valid C++ to escape a newline.
-         */
-
-        assertNoParsingErrorsIn(makeLfTargetCode("Cpp",
-                                                 "        \"a\\\n"
-                                                     + "        bcde\"\n"
-        ));
-    }
-
-
-    @Test
-    public void testLexingSquotedString() throws Exception {
-        // we can't do that anymore
-        expectParsingErrorIn(makeLfTargetCode("Python", "a = ' a string '"));
-    }
-
-
-    @Test
-    public void testLexingDquotedString() throws Exception {
-        assertNoParsingErrorsIn(makeLfTargetCode("Python", "a = \" a string \""));
-    }
-
-    @Test
-    public void testLexingMultilineString() throws Exception {
-        assertNoParsingErrorsIn(makeLfTargetCode("Python", "a = \"\"\" a 'string' \"\"\""));
-        assertNoParsingErrorsIn(makeLfTargetCode("Python", "a = \"\"\" a 'strin\ng' \"\"\""));
-        assertNoParsingErrorsIn(makeLfTargetCode("Python", "a = \"\"\" \na 'string'\n \"\"\""));
-    }
-
-    @Test
-    public void testLexingDquotedStringWithEscape() throws Exception {
-        assertNoParsingErrorsIn(makeLfTargetCode("C", "printf(\"Hello World.\\n\");\n"));
-    }
-
-
-    @Test
-    public void testLexingCharLiteral() throws Exception {
-        assertNoParsingErrorsIn(makeLfTargetCode("C", "char c0 = 'c';"));
-    }
-
-    @Test
-    public void testLexingEscapedCharLiteral() throws Exception {
-        assertNoParsingErrorsIn(makeLfTargetCode("C", "char c0 = '\\n';"));
-    }
-
-    private String makeLfTargetCode(final String target, final String code) {
-        return "target " + target + ";\n"
-            + "reactor Foo {\n"
-            + "    preamble {=\n"
-            + "       " + code + "\n"
-            + "    =}\n"
-            + "}";
-    }
-
-    private void assertNoParsingErrorsIn(String source) throws Exception {
-        List<Diagnostic> errors = doParse(source);
-        Assertions.assertTrue(errors.isEmpty(), "Unexpected errors: " + IterableExtensions.join(errors, ", "));
-    }
-
-
-    private void expectParsingErrorIn(String source) throws Exception {
-        List<Diagnostic> errors = doParse(source);
-        Assertions.assertFalse(errors.isEmpty(), "Expected a parsing error, none occurred");
-    }
-
-
-    private List<Diagnostic> doParse(String source) throws Exception {
-        Model result = parseHelper.parse(source);
-        Assertions.assertNotNull(result);
-        return result.eResource().getErrors();
-    }
+  @Inject private ParseHelper<Model> parseHelper;
+
+  @Test
+  public void testLexingEmptyTargetProperties() throws Exception {
+    assertNoParsingErrorsIn("target C { };      \nreactor Foo {}");
+    assertNoParsingErrorsIn("target C {a:b,};   \nreactor Foo {}");
+    expectParsingErrorIn("target C {,};      \nreactor Foo {}");
+
+    // array elements
+    // assertNoParsingErrorsIn("target C {x:[ ]};  \nreactor Foo {}");
+    // assertNoParsingErrorsIn("target C {x:[]};   \nreactor Foo {}");
+    // assertNoParsingErrorsIn("target C {x:[,]};  \nreactor Foo {}");
+  }
+
+  @Test
+  public void testLexingLifetimeAnnots() throws Exception {
+    assertNoParsingErrorsIn(
+        makeLfTargetCode(
+            "Rust",
+            "        struct Hello<'a> { \n"
+                + "            r: &'a str,\n"
+                + "            r2: &'a Box<Hello<'a>>,\n"
+                + "        }"));
+  }
+
+  @Test
+  public void testLexingSingleLifetimeAnnot() throws Exception {
+    // just to be sure, have a single lifetime annot.
+    assertNoParsingErrorsIn(
+        makeLfTargetCode(
+            "Rust", "        struct Hello { \n" + "            r: &'static str,\n" + "        }"));
+  }
+
+  @Test
+  public void testLexingNewlineCont() throws Exception {
+    /*
+    This example looks like this:
+    "a\
+    bcde"
+
+    This is valid C++ to escape a newline.
+     */
+
+    assertNoParsingErrorsIn(makeLfTargetCode("Cpp", "        \"a\\\n" + "        bcde\"\n"));
+  }
+
+  @Test
+  public void testLexingSquotedString() throws Exception {
+    // we can't do that anymore
+    expectParsingErrorIn(makeLfTargetCode("Python", "a = ' a string '"));
+  }
+
+  @Test
+  public void testLexingDquotedString() throws Exception {
+    assertNoParsingErrorsIn(makeLfTargetCode("Python", "a = \" a string \""));
+  }
+
+  @Test
+  public void testLexingMultilineString() throws Exception {
+    assertNoParsingErrorsIn(makeLfTargetCode("Python", "a = \"\"\" a 'string' \"\"\""));
+    assertNoParsingErrorsIn(makeLfTargetCode("Python", "a = \"\"\" a 'strin\ng' \"\"\""));
+    assertNoParsingErrorsIn(makeLfTargetCode("Python", "a = \"\"\" \na 'string'\n \"\"\""));
+  }
+
+  @Test
+  public void testLexingDquotedStringWithEscape() throws Exception {
+    assertNoParsingErrorsIn(makeLfTargetCode("C", "printf(\"Hello World.\\n\");\n"));
+  }
+
+  @Test
+  public void testLexingCharLiteral() throws Exception {
+    assertNoParsingErrorsIn(makeLfTargetCode("C", "char c0 = 'c';"));
+  }
+
+  @Test
+  public void testLexingEscapedCharLiteral() throws Exception {
+    assertNoParsingErrorsIn(makeLfTargetCode("C", "char c0 = '\\n';"));
+  }
+
+  private String makeLfTargetCode(final String target, final String code) {
+    return "target "
+        + target
+        + ";\n"
+        + "reactor Foo {\n"
+        + "    preamble {=\n"
+        + "       "
+        + code
+        + "\n"
+        + "    =}\n"
+        + "}";
+  }
+
+  private void assertNoParsingErrorsIn(String source) throws Exception {
+    List<Diagnostic> errors = doParse(source);
+    Assertions.assertTrue(
+        errors.isEmpty(), "Unexpected errors: " + IterableExtensions.join(errors, ", "));
+  }
+
+  private void expectParsingErrorIn(String source) throws Exception {
+    List<Diagnostic> errors = doParse(source);
+    Assertions.assertFalse(errors.isEmpty(), "Expected a parsing error, none occurred");
+  }
+
+  private List<Diagnostic> doParse(String source) throws Exception {
+    Model result = parseHelper.parse(source);
+    Assertions.assertNotNull(result);
+    return result.eResource().getErrors();
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/LFTest.java b/org.lflang.tests/src/org/lflang/tests/LFTest.java
index cc69dea77a..58b3cbf846 100644
--- a/org.lflang.tests/src/org/lflang/tests/LFTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/LFTest.java
@@ -8,286 +8,286 @@
 import java.io.Reader;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-
 import org.eclipse.xtext.util.RuntimeIOException;
-
 import org.lflang.FileConfig;
 import org.lflang.Target;
 import org.lflang.generator.LFGeneratorContext;
 
 /**
  * Information about an indexed Lingua Franca test program.
- * 
- * @author Marten Lohstroh
  *
+ * @author Marten Lohstroh
  */
 public class LFTest implements Comparable<LFTest> {
 
-    /** The path to the test. */
-    private final Path srcPath;
-
-    /** The name of the test. */
-    private final String name;
-
-    /** The result of the test. */
-    private Result result = Result.UNKNOWN;
-
-    /** Context provided to the code generators */
-    private LFGeneratorContext context;
-
-    /** Path of the test program relative to the package root. */
-    private final Path relativePath;
-
-    /** Records compilation stdout/stderr. */
-    private final ByteArrayOutputStream compilationLog = new ByteArrayOutputStream();
-
-    /** Specialized object for capturing output streams while executing the test. */
-    private final ExecutionLogger execLog = new ExecutionLogger();
-
-    /** String builder for collecting issues encountered during test execution. */
-    private final StringBuilder issues = new StringBuilder();
-
-    /** The target of the test program. */
-    private final Target target;
-
-    /**
-     * Create a new test.
-     *
-     * @param target The target of the test program.
-     * @param srcFile The path to the file of the test program.
-     */
-    public LFTest(Target target, Path srcFile) {
-        this.target = target;
-        this.srcPath = srcFile;
-        this.name = FileConfig.findPackageRoot(srcFile, s -> {}).relativize(srcFile).toString();
-        this.relativePath = Paths.get(name);
+  /** The path to the test. */
+  private final Path srcPath;
+
+  /** The name of the test. */
+  private final String name;
+
+  /** The result of the test. */
+  private Result result = Result.UNKNOWN;
+
+  /** Context provided to the code generators */
+  private LFGeneratorContext context;
+
+  /** Path of the test program relative to the package root. */
+  private final Path relativePath;
+
+  /** Records compilation stdout/stderr. */
+  private final ByteArrayOutputStream compilationLog = new ByteArrayOutputStream();
+
+  /** Specialized object for capturing output streams while executing the test. */
+  private final ExecutionLogger execLog = new ExecutionLogger();
+
+  /** String builder for collecting issues encountered during test execution. */
+  private final StringBuilder issues = new StringBuilder();
+
+  /** The target of the test program. */
+  private final Target target;
+
+  /**
+   * Create a new test.
+   *
+   * @param target The target of the test program.
+   * @param srcFile The path to the file of the test program.
+   */
+  public LFTest(Target target, Path srcFile) {
+    this.target = target;
+    this.srcPath = srcFile;
+    this.name = FileConfig.findPackageRoot(srcFile, s -> {}).relativize(srcFile).toString();
+    this.relativePath = Paths.get(name);
+  }
+
+  /** Copy constructor */
+  public LFTest(LFTest test) {
+    this(test.target, test.srcPath);
+  }
+
+  /** Stream object for capturing standard and error output. */
+  public OutputStream getOutputStream() {
+    return compilationLog;
+  }
+
+  public FileConfig getFileConfig() {
+    return context.getFileConfig();
+  }
+
+  public LFGeneratorContext getContext() {
+    return context;
+  }
+
+  public Path getSrcPath() {
+    return srcPath;
+  }
+
+  /**
+   * Comparison implementation to allow for tests to be sorted (e.g., when added to a tree set)
+   * based on their path (relative to the root of the test directory).
+   */
+  public int compareTo(LFTest t) {
+    return this.relativePath.compareTo(t.relativePath);
+  }
+
+  /**
+   * Return true if the given object is an LFTest instance with a name identical to this test.
+   *
+   * @param o The object to test for equality with respect to this one.
+   * @return True if the given object is equal to this one, false otherwise.
+   */
+  @Override
+  public boolean equals(Object o) {
+    return o instanceof LFTest && ((LFTest) o).name.equals(this.name);
+  }
+
+  /**
+   * Return a string representing the name of this test.
+   *
+   * @return The name of this test.
+   */
+  @Override
+  public String toString() {
+    return this.name;
+  }
+
+  /**
+   * Identify tests uniquely on the basis of their name.
+   *
+   * @return The hash code of the name of this test.
+   */
+  @Override
+  public int hashCode() {
+    return this.name.hashCode();
+  }
+
+  /**
+   * Report whether this test has failed.
+   *
+   * @return True if the test has failed, false otherwise.
+   */
+  public boolean hasFailed() {
+    return result != Result.TEST_PASS;
+  }
+
+  public boolean hasPassed() {
+    return result == Result.TEST_PASS;
+  }
+
+  /**
+   * Compile a string that contains all collected errors and return it.
+   *
+   * @return A string that contains all collected errors.
+   */
+  public void reportErrors() {
+    if (this.hasFailed()) {
+      System.out.println(
+          "+---------------------------------------------------------------------------+");
+      System.out.println("Failed: " + this);
+      System.out.println(
+          "-----------------------------------------------------------------------------");
+      System.out.println("Reason: " + this.result.message);
+      printIfNotEmpty("Reported issues", this.issues.toString());
+      printIfNotEmpty("Compilation output", this.compilationLog.toString());
+      printIfNotEmpty("Execution output", this.execLog.toString());
+      System.out.println(
+          "+---------------------------------------------------------------------------+");
     }
+  }
 
-    /** Copy constructor */
-    public LFTest(LFTest test) {
-        this(test.target, test.srcPath);
+  public void handleTestError(TestError e) {
+    result = e.getResult();
+    if (e.getMessage() != null) {
+      issues.append(e.getMessage());
     }
-
-    /** Stream object for capturing standard and error output. */
-    public OutputStream getOutputStream() {
-        return compilationLog;
+    if (e.getException() != null) {
+      issues.append(System.lineSeparator());
+      issues.append(TestBase.stackTraceToString(e.getException()));
     }
-
-    public FileConfig getFileConfig() { return context.getFileConfig(); }
-
-    public LFGeneratorContext getContext() { return context; }
-
-    public Path getSrcPath() { return srcPath; }
-
-    /**
-     * Comparison implementation to allow for tests to be sorted (e.g., when added to a
-     * tree set) based on their path (relative to the root of the test directory).
-     */
-    public int compareTo(LFTest t) {
-        return this.relativePath.compareTo(t.relativePath);
+  }
+
+  public void markPassed() {
+    result = Result.TEST_PASS;
+    // clear the execution log to free memory
+    execLog.clear();
+  }
+
+  void configure(LFGeneratorContext context) {
+    this.context = context;
+  }
+
+  /**
+   * Print the message to the system output, but only if the message is not empty.
+   *
+   * @param header Header for the message to be printed.
+   * @param message The log message to print.
+   */
+  private static void printIfNotEmpty(String header, String message) {
+    if (!message.isEmpty()) {
+      System.out.println(header + ":");
+      System.out.println(message);
     }
+  }
+
+  /** Enumeration of test outcomes. */
+  public enum Result {
+    UNKNOWN("No information available."),
+    CONFIG_FAIL("Could not apply configuration."),
+    PARSE_FAIL("Unable to parse test."),
+    VALIDATE_FAIL("Unable to validate test."),
+    CODE_GEN_FAIL("Error while generating code for test."),
+    NO_EXEC_FAIL("Did not execute test."),
+    TEST_FAIL("Test did not pass."),
+    TEST_EXCEPTION("Test exited with an exception."),
+    TEST_TIMEOUT("Test timed out."),
+    TEST_PASS("Test passed.");
+
+    /** Description of the outcome. */
+    public final String message;
 
     /**
-     * Return true if the given object is an LFTest instance with a name identical to this test.
-     * @param o The object to test for equality with respect to this one.
-     * @return True if the given object is equal to this one, false otherwise.
-     */
-    @Override
-    public boolean equals(Object o) {
-        return o instanceof LFTest && ((LFTest) o).name.equals(this.name);
-    }
-
-    /**
-     * Return a string representing the name of this test.
-     * @return The name of this test.
-     */
-    @Override
-    public String toString() {
-        return this.name;
-    }
-
-    /**
-     * Identify tests uniquely on the basis of their name.
+     * Private constructor.
      *
-     * @return The hash code of the name of this test.
+     * @param message Description of the test outcome.
      */
-    @Override
-    public int hashCode() {
-        return this.name.hashCode();
+    Result(String message) {
+      this.message = message;
     }
+  }
 
-    /**
-     * Report whether this test has failed.
-     * @return True if the test has failed, false otherwise.
-     */
-    public boolean hasFailed() {
-        return result != Result.TEST_PASS;
-    }
-
-    public boolean hasPassed() {
-        return result == Result.TEST_PASS;
-    }
+  /**
+   * Inner class for capturing streams during execution of a test, capable of recording output
+   * streams up until the moment that a test is interrupted upon timing out.
+   *
+   * @author Marten Lohstroh
+   */
+  public static final class ExecutionLogger {
 
     /**
-     * Compile a string that contains all collected errors and return it.
-     * @return A string that contains all collected errors.
+     * String buffer used to record the standard output and error streams from the input process.
      */
-    public void reportErrors() {
-        if (this.hasFailed()) {
-            System.out.println("+---------------------------------------------------------------------------+");
-            System.out.println("Failed: " + this);
-            System.out.println("-----------------------------------------------------------------------------");
-            System.out.println("Reason: " + this.result.message);
-            printIfNotEmpty("Reported issues", this.issues.toString());
-            printIfNotEmpty("Compilation output", this.compilationLog.toString());
-            printIfNotEmpty("Execution output", this.execLog.toString());
-            System.out.println("+---------------------------------------------------------------------------+");
-        }
-    }
-
-    public void handleTestError(TestError e) {
-        result = e.getResult();
-        if (e.getMessage() != null) {
-            issues.append(e.getMessage());
-        }
-        if (e.getException() != null) {
-            issues.append(System.lineSeparator());
-            issues.append(TestBase.stackTraceToString(e.getException()));
-        }
-    }
-
-    public void markPassed() {
-        result = Result.TEST_PASS;
-        // clear the execution log to free memory
-        execLog.clear();
-    }
-
-    void configure(LFGeneratorContext context) {
-        this.context = context;
-    }
+    StringBuffer buffer = new StringBuffer();
 
     /**
-     * Print the message to the system output, but only if the message is not empty.
-     *
-     * @param header Header for the message to be printed.
-     * @param message The log message to print.
+     * Return a thread responsible for recording the standard output stream of the given process. A
+     * separate thread is used so that the activity can be preempted.
      */
-    private static void printIfNotEmpty(String header, String message) {
-        if (!message.isEmpty()) {
-            System.out.println(header + ":");
-            System.out.println(message);
-        }
+    public Thread recordStdOut(Process process) {
+      return recordStream(buffer, process.getInputStream());
     }
 
     /**
-     * Enumeration of test outcomes.
+     * Return a thread responsible for recording the error stream of the given process. A separate
+     * thread is used so that the activity can be preempted.
      */
-    public enum Result {
-        UNKNOWN("No information available."),
-        CONFIG_FAIL("Could not apply configuration."),
-        PARSE_FAIL("Unable to parse test."),
-        VALIDATE_FAIL("Unable to validate test."),
-        CODE_GEN_FAIL("Error while generating code for test."),
-        NO_EXEC_FAIL("Did not execute test."),
-        TEST_FAIL("Test did not pass."),
-        TEST_EXCEPTION("Test exited with an exception."),
-        TEST_TIMEOUT("Test timed out."),
-        TEST_PASS("Test passed.");
-
-        /**
-         * Description of the outcome.
-         */
-        public final String message;
-
-        /**
-         * Private constructor.
-         * @param message Description of the test outcome.
-         */
-        Result(String message) {
-            this.message = message;
-        }
+    public Thread recordStdErr(Process process) {
+      return recordStream(buffer, process.getErrorStream());
     }
 
-
     /**
-     * Inner class for capturing streams during execution of a test, capable of
-     * recording output streams up until the moment that a test is interrupted
-     * upon timing out.
-     *
-     * @author Marten Lohstroh
+     * Return a thread responsible for recording the given stream.
      *
+     * @param builder The builder to append to.
+     * @param inputStream The stream to read from.
      */
-    public static final class ExecutionLogger {
-
-        /**
-         * String buffer used to record the standard output and error
-         * streams from the input process.
-         */
-        StringBuffer buffer = new StringBuffer();
-
-        /**
-         * Return a thread responsible for recording the standard output stream
-         * of the given process.
-         * A separate thread is used so that the activity can be preempted.
-         */
-        public Thread recordStdOut(Process process) {
-            return recordStream(buffer, process.getInputStream());
-        }
-
-        /**
-         * Return a thread responsible for recording the error stream of the
-         * given process.
-         * A separate thread is used so that the activity can be preempted.
-         */
-        public Thread recordStdErr(Process process) {
-            return recordStream(buffer, process.getErrorStream());
-        }
-
-        /**
-         * Return a thread responsible for recording the given stream.
-         *
-         * @param builder     The builder to append to.
-         * @param inputStream The stream to read from.
-         */
-        private Thread recordStream(StringBuffer builder, InputStream inputStream) {
-            return new Thread(() -> {
-                try (Reader reader = new InputStreamReader(inputStream)) {
-                    int len;
-                    char[] buf = new char[1024];
-                    while ((len = reader.read(buf)) > 0) {
-                        builder.append(buf, 0, len);
-                    }
-                } catch (IOException e) {
-                    throw new RuntimeIOException(e);
-                }
-
-            });
-        }
-
-        @Override
-        public String toString() {
-            return buffer.toString();
-        }
-
-        public void clear() {
-            buffer = null;
-        }
+    private Thread recordStream(StringBuffer builder, InputStream inputStream) {
+      return new Thread(
+          () -> {
+            try (Reader reader = new InputStreamReader(inputStream)) {
+              int len;
+              char[] buf = new char[1024];
+              while ((len = reader.read(buf)) > 0) {
+                builder.append(buf, 0, len);
+              }
+            } catch (IOException e) {
+              throw new RuntimeIOException(e);
+            }
+          });
     }
 
-
-    /**
-     * Return a thread responsible for recording the standard output stream of the given process.
-     * A separate thread is used so that the activity can be preempted.
-     */
-    public Thread recordStdOut(Process process) {
-        return execLog.recordStdOut(process);
+    @Override
+    public String toString() {
+      return buffer.toString();
     }
 
-    /**
-     * Return a thread responsible for recording the error stream of the given process.
-     * A separate thread is used so that the activity can be preempted.
-     */
-    public Thread recordStdErr(Process process) {
-        return execLog.recordStdErr(process);
+    public void clear() {
+      buffer = null;
     }
+  }
+
+  /**
+   * Return a thread responsible for recording the standard output stream of the given process. A
+   * separate thread is used so that the activity can be preempted.
+   */
+  public Thread recordStdOut(Process process) {
+    return execLog.recordStdOut(process);
+  }
+
+  /**
+   * Return a thread responsible for recording the error stream of the given process. A separate
+   * thread is used so that the activity can be preempted.
+   */
+  public Thread recordStdErr(Process process) {
+    return execLog.recordStdErr(process);
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/LfParsingUtil.java b/org.lflang.tests/src/org/lflang/tests/LfParsingUtil.java
index fd9ffa2a2e..ae45bf4e7c 100644
--- a/org.lflang.tests/src/org/lflang/tests/LfParsingUtil.java
+++ b/org.lflang.tests/src/org/lflang/tests/LfParsingUtil.java
@@ -1,100 +1,87 @@
 package org.lflang.tests;
 
+import com.google.inject.Injector;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.resource.XtextResourceSet;
 import org.junit.jupiter.api.Assertions;
-
 import org.lflang.LFStandaloneSetup;
 import org.lflang.lf.Model;
 
-import com.google.inject.Injector;
-
 /**
  * @author Clément Fournier
  */
 public class LfParsingUtil {
 
-    /**
-     * Parse the given file, asserts that there are no parsing errors.
-     */
-    public static Model parseValidModel(
-        String fileName,
-        String reformattedTestCase
-    ) {
-        Model resultingModel = parse(reformattedTestCase);
-        checkValid(fileName, resultingModel);
-        return resultingModel;
-    }
+  /** Parse the given file, asserts that there are no parsing errors. */
+  public static Model parseValidModel(String fileName, String reformattedTestCase) {
+    Model resultingModel = parse(reformattedTestCase);
+    checkValid(fileName, resultingModel);
+    return resultingModel;
+  }
 
-    private static void checkValid(String fileName, Model resultingModel) {
-        Assertions.assertNotNull(resultingModel);
-        if (!resultingModel.eResource().getErrors().isEmpty()) {
-            resultingModel.eResource().getErrors().forEach(System.err::println);
-            Assertions.assertTrue(resultingModel.eResource().getErrors().isEmpty(),
-                "Parsing errors in " + fileName);
-        }
+  private static void checkValid(String fileName, Model resultingModel) {
+    Assertions.assertNotNull(resultingModel);
+    if (!resultingModel.eResource().getErrors().isEmpty()) {
+      resultingModel.eResource().getErrors().forEach(System.err::println);
+      Assertions.assertTrue(
+          resultingModel.eResource().getErrors().isEmpty(), "Parsing errors in " + fileName);
     }
+  }
 
-    public static Model parseSourceAsIfInDirectory(
-        Path directory,
-        String sourceText
-    ) {
-        int num = 0;
-        while (Files.exists(directory.resolve("file" + num + ".lf"))) {
-            num++;
-        }
-        Path file = directory.resolve("file" + num + ".lf");
-        try {
-            Files.writeString(file, sourceText);
-            Model resultingModel = parse(file);
-            checkValid("file in " + directory, resultingModel);
-            return resultingModel;
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        } finally {
-            try {
-                Files.deleteIfExists(file);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
+  public static Model parseSourceAsIfInDirectory(Path directory, String sourceText) {
+    int num = 0;
+    while (Files.exists(directory.resolve("file" + num + ".lf"))) {
+      num++;
+    }
+    Path file = directory.resolve("file" + num + ".lf");
+    try {
+      Files.writeString(file, sourceText);
+      Model resultingModel = parse(file);
+      checkValid("file in " + directory, resultingModel);
+      return resultingModel;
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    } finally {
+      try {
+        Files.deleteIfExists(file);
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
     }
+  }
 
-    public static Model parse(String fileContents) {
-        Path file = null;
+  public static Model parse(String fileContents) {
+    Path file = null;
+    try {
+      file = Files.createTempFile("lftests", ".lf");
+      Files.writeString(file, fileContents);
+      return parse(file);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    } finally {
+      if (file != null) {
         try {
-            file = Files.createTempFile("lftests", ".lf");
-            Files.writeString(file, fileContents);
-            return parse(file);
+          Files.deleteIfExists(file);
         } catch (IOException e) {
-            throw new RuntimeException(e);
-        } finally {
-            if (file != null) {
-                try {
-                    Files.deleteIfExists(file);
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            }
+          throw new RuntimeException(e);
         }
+      }
     }
+  }
 
-    public static Model parse(Path file) {
-        // Source: https://wiki.eclipse.org/Xtext/FAQ#How_do_I_load_my_model_in_a_standalone_Java_application_.3F
-        Injector injector = new LFStandaloneSetup().createInjectorAndDoEMFRegistration();
-        XtextResourceSet resourceSet = injector.getInstance(XtextResourceSet.class);
-        resourceSet.addLoadOption(XtextResource.OPTION_RESOLVE_ALL, Boolean.TRUE);
-        Resource resource = resourceSet.getResource(
-            URI.createFileURI(file.toFile().getAbsolutePath()),
-            true
-        );
-        return (Model) resource.getContents().get(0);
-    }
+  public static Model parse(Path file) {
+    // Source:
+    // https://wiki.eclipse.org/Xtext/FAQ#How_do_I_load_my_model_in_a_standalone_Java_application_.3F
+    Injector injector = new LFStandaloneSetup().createInjectorAndDoEMFRegistration();
+    XtextResourceSet resourceSet = injector.getInstance(XtextResourceSet.class);
+    resourceSet.addLoadOption(XtextResource.OPTION_RESOLVE_ALL, Boolean.TRUE);
+    Resource resource =
+        resourceSet.getResource(URI.createFileURI(file.toFile().getAbsolutePath()), true);
+    return (Model) resource.getContents().get(0);
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/RunSingleTestMain.java b/org.lflang.tests/src/org/lflang/tests/RunSingleTestMain.java
index 0f7e919174..fdb26de7f5 100644
--- a/org.lflang.tests/src/org/lflang/tests/RunSingleTestMain.java
+++ b/org.lflang.tests/src/org/lflang/tests/RunSingleTestMain.java
@@ -29,7 +29,6 @@
 import java.nio.file.Paths;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.lflang.Target;
 import org.lflang.tests.runtime.CCppTest;
 import org.lflang.tests.runtime.CTest;
@@ -39,55 +38,55 @@
 import org.lflang.tests.runtime.TypeScriptTest;
 
 /**
- * Execute a single test case. Use it with the gradle task
- * {@code gradle runSingleTest --args test/Python/src/Minimal.lf}
+ * Execute a single test case. Use it with the gradle task {@code gradle runSingleTest --args
+ * test/Python/src/Minimal.lf}
  *
  * @author Clément Fournier
  */
 public class RunSingleTestMain {
 
+  private static final Pattern TEST_FILE_PATTERN =
+      Pattern.compile("(test/(\\w+))/src/([^/]++/)*(\\w+.lf)");
 
-    private static final Pattern TEST_FILE_PATTERN = Pattern.compile("(test/(\\w+))/src/([^/]++/)*(\\w+.lf)");
-
-    public static void main(String[] args) throws FileNotFoundException {
-        if (args.length != 1) {
-            throw new IllegalArgumentException("Expected 1 path to an LF file");
-        }
-        var path = Paths.get(args[0]);
-        if (!Files.exists(path)) {
-            throw new FileNotFoundException("No such test file: " + path);
-        }
+  public static void main(String[] args) throws FileNotFoundException {
+    if (args.length != 1) {
+      throw new IllegalArgumentException("Expected 1 path to an LF file");
+    }
+    var path = Paths.get(args[0]);
+    if (!Files.exists(path)) {
+      throw new FileNotFoundException("No such test file: " + path);
+    }
 
-        Matcher matcher = TEST_FILE_PATTERN.matcher(args[0]);
-        if (!matcher.matches()) {
-            throw new FileNotFoundException("Not a test: " + path);
-        }
+    Matcher matcher = TEST_FILE_PATTERN.matcher(args[0]);
+    if (!matcher.matches()) {
+      throw new FileNotFoundException("Not a test: " + path);
+    }
 
-        Target target = Target.forName(matcher.group(2)).get();
+    Target target = Target.forName(matcher.group(2)).get();
 
-        Class<? extends TestBase> testClass = getTestInstance(target);
+    Class<? extends TestBase> testClass = getTestInstance(target);
 
-        LFTest testCase = new LFTest(target, path.toAbsolutePath());
+    LFTest testCase = new LFTest(target, path.toAbsolutePath());
 
-        TestBase.runSingleTestAndPrintResults(testCase, testClass, TestBase.pathToLevel(path));
-    }
+    TestBase.runSingleTestAndPrintResults(testCase, testClass, TestBase.pathToLevel(path));
+  }
 
-    private static Class<? extends TestBase> getTestInstance(Target target) {
-        switch (target) {
-        case C:
-            return CTest.class;
-        case CCPP:
-            return CCppTest.class;
-        case CPP:
-            return CppTest.class;
-        case TS:
-            return TypeScriptTest.class;
-        case Python:
-            return PythonTest.class;
-        case Rust:
-            return RustTest.class;
-        default:
-            throw new IllegalArgumentException();
-        }
+  private static Class<? extends TestBase> getTestInstance(Target target) {
+    switch (target) {
+      case C:
+        return CTest.class;
+      case CCPP:
+        return CCppTest.class;
+      case CPP:
+        return CppTest.class;
+      case TS:
+        return TypeScriptTest.class;
+      case Python:
+        return PythonTest.class;
+      case Rust:
+        return RustTest.class;
+      default:
+        throw new IllegalArgumentException();
     }
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/RuntimeTest.java b/org.lflang.tests/src/org/lflang/tests/RuntimeTest.java
index 77bc6d8034..2dfd42d38b 100644
--- a/org.lflang.tests/src/org/lflang/tests/RuntimeTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/RuntimeTest.java
@@ -2,207 +2,216 @@
 
 import java.util.EnumSet;
 import java.util.List;
-
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
-import org.lflang.ast.ASTUtils;
 import org.lflang.Target;
+import org.lflang.ast.ASTUtils;
 import org.lflang.tests.TestRegistry.TestCategory;
 
 /**
  * A collection of JUnit tests to perform on a given set of targets.
  *
  * @author Marten Lohstroh
- *
  */
 public abstract class RuntimeTest extends TestBase {
 
-    /**
-     * Construct a test instance that runs tests for a single target.
-     *
-     * @param target The target to run tests for.
-     */
-    protected RuntimeTest(Target target) {
-        super(target);
-    }
-
-    /**
-     * Construct a test instance that runs tests for a list of targets.
-     * @param targets The targets to run tests for.
-     */
-    protected RuntimeTest(List<Target> targets) {
-        super(targets);
-    }
-
-    /**
-     * Whether to enable {@link #runEnclaveTests()}.
-     */
-    protected boolean supportsEnclaves() { return false; }
-
-    /**
-     * Whether to enable {@link #runFederatedTests()}.
-     */
-    protected boolean supportsFederatedExecution() {
-        return false;
-    }
-
-    /**
-     * Whether to enable {@link #runTypeParameterTests()}.
-     */
-    protected boolean supportsGenericTypes() {
-        return false;
-    }
-
-    /**
-     * Whether to enable {@link #runDockerTests()} and {@link #runDockerFederatedTests()}.
-     */
-    protected boolean supportsDockerOption() {
-        return false;
-    }
-
-    @Test
-    public void runGenericTests() {
-        runTestsForTargets(Message.DESC_GENERIC,
-                           TestCategory.GENERIC::equals, Configurators::noChanges,
-                            TestLevel.EXECUTION,
-                           false);
-    }
-
-    @Test
-    public void runTargetSpecificTests() {
-        runTestsForTargets(Message.DESC_TARGET_SPECIFIC,
-                           TestCategory.TARGET::equals, Configurators::noChanges,
-                            TestLevel.EXECUTION,
-                           false);
-    }
-
-    @Test
-    public void runMultiportTests() {
-        runTestsForTargets(Message.DESC_MULTIPORT,
-                           TestCategory.MULTIPORT::equals, Configurators::noChanges,
-                           TestLevel.EXECUTION,
-                           false);
-    }
-
-    @Test
-    public void runTypeParameterTests() {
-        Assumptions.assumeTrue(supportsGenericTypes(), Message.NO_GENERICS_SUPPORT);
-        runTestsForTargets(Message.DESC_TYPE_PARMS,
-                           TestCategory.GENERICS::equals, Configurators::noChanges,
-                           TestLevel.EXECUTION,
-                           false);
-    }
-
-    @Test
-    public void runAsFederated() {
-        Assumptions.assumeTrue(supportsFederatedExecution(), Message.NO_FEDERATION_SUPPORT);
-
-        EnumSet<TestCategory> categories = EnumSet.allOf(TestCategory.class);
-        categories.removeAll(EnumSet.of(TestCategory.CONCURRENT,
-                                        TestCategory.FEDERATED,
-                                        // FIXME: also run the multiport tests once these are supported.
-                                        TestCategory.MULTIPORT));
-
-        runTestsFor(List.of(Target.C),
-                    Message.DESC_AS_FEDERATED,
-                    categories::contains,
-                    it -> ASTUtils.makeFederated(it.getFileConfig().resource),
-                    TestLevel.EXECUTION,
-                    true);
-    }
-
-    @Test
-    public void runConcurrentTests() {
-        runTestsForTargets(Message.DESC_CONCURRENT,
-                           TestCategory.CONCURRENT::equals, Configurators::noChanges,
-                           TestLevel.EXECUTION,
-                           false);
-
-    }
-
-    @Test
-    public void runFederatedTests() {
-        Assumptions.assumeTrue(supportsFederatedExecution(), Message.NO_FEDERATION_SUPPORT);
-        runTestsForTargets(Message.DESC_FEDERATED,
-                           TestCategory.FEDERATED::equals, Configurators::noChanges,
-                           TestLevel.EXECUTION,
-                           false);
-    }
-
-    /**
-     * Run the tests for modal reactors.
-     */
-    @Test
-    public void runModalTests() {
-        runTestsForTargets(Message.DESC_MODAL,
-            TestCategory.MODAL_MODELS::equals, Configurators::noChanges,
-            TestLevel.EXECUTION,
-            false);
-    }
-
-    /**
-     * Run the tests for non-inlined reaction bodies.
-     */
-    @Test
-    public void runNoInliningTests() {
-        runTestsForTargets(Message.DESC_MODAL,
-            TestCategory.NO_INLINING::equals, Configurators::noChanges,
-            TestLevel.EXECUTION,
-            false);
-    }
-
-    /**
-      * Run docker tests, provided that the platform is Linux and the target supports Docker.
-      * Skip if platform is not Linux or target does not support Docker.
-      */
-    @Test
-    public void runDockerTests() {
-        Assumptions.assumeTrue(isLinux(), Message.NO_DOCKER_TEST_SUPPORT);
-        Assumptions.assumeTrue(supportsDockerOption(), Message.NO_DOCKER_SUPPORT);
-        runTestsForTargets(Message.DESC_DOCKER,
-                           TestCategory.DOCKER::equals, Configurators::noChanges,
-                            TestLevel.EXECUTION,
-                           false);
-    }
-
-    /**
-      * Run federated docker tests, provided that the platform is Linux, the target supports Docker,
-      * and the target supports federated execution. If any of these requirements are not met, skip
-      * the tests.
-      */
-    @Test
-    public void runDockerFederatedTests() {
-        Assumptions.assumeTrue(isLinux(), Message.NO_DOCKER_TEST_SUPPORT);
-        Assumptions.assumeTrue(supportsDockerOption(), Message.NO_DOCKER_SUPPORT);
-        Assumptions.assumeTrue(supportsFederatedExecution(), Message.NO_FEDERATION_SUPPORT);
-        runTestsForTargets(Message.DESC_DOCKER_FEDERATED,
-                           TestCategory.DOCKER_FEDERATED::equals, Configurators::noChanges,
-                           TestLevel.EXECUTION,
-                           false);
-    }
-
-    @Test
-    public void runWithThreadingOff() {
-        Assumptions.assumeTrue(supportsSingleThreadedExecution(), Message.NO_SINGLE_THREADED_SUPPORT);
-        this.runTestsForTargets(
-            Message.DESC_SINGLE_THREADED,
-            Configurators::compatibleWithThreadingOff,
-            Configurators::disableThreading,
-            TestLevel.EXECUTION,
-            true
-        );
-    }
-
-    /**
-     * Run enclave tests if the target supports enclaves.
-     */
-    @Test
-    public void runEnclaveTests() {
-        Assumptions.assumeTrue(supportsEnclaves(), Message.NO_ENCLAVE_SUPPORT);
-        runTestsForTargets(Message.DESC_ENCLAVE,
-            TestCategory.ENCLAVE::equals, Configurators::noChanges,
-            TestLevel.EXECUTION,
-            false);
-    }
-
+  /**
+   * Construct a test instance that runs tests for a single target.
+   *
+   * @param target The target to run tests for.
+   */
+  protected RuntimeTest(Target target) {
+    super(target);
+  }
+
+  /**
+   * Construct a test instance that runs tests for a list of targets.
+   *
+   * @param targets The targets to run tests for.
+   */
+  protected RuntimeTest(List<Target> targets) {
+    super(targets);
+  }
+
+  /** Whether to enable {@link #runEnclaveTests()}. */
+  protected boolean supportsEnclaves() {
+    return false;
+  }
+
+  /** Whether to enable {@link #runFederatedTests()}. */
+  protected boolean supportsFederatedExecution() {
+    return false;
+  }
+
+  /** Whether to enable {@link #runTypeParameterTests()}. */
+  protected boolean supportsGenericTypes() {
+    return false;
+  }
+
+  /** Whether to enable {@link #runDockerTests()} and {@link #runDockerFederatedTests()}. */
+  protected boolean supportsDockerOption() {
+    return false;
+  }
+
+  @Test
+  public void runGenericTests() {
+    runTestsForTargets(
+        Message.DESC_GENERIC,
+        TestCategory.GENERIC::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  @Test
+  public void runTargetSpecificTests() {
+    runTestsForTargets(
+        Message.DESC_TARGET_SPECIFIC,
+        TestCategory.TARGET::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  @Test
+  public void runMultiportTests() {
+    runTestsForTargets(
+        Message.DESC_MULTIPORT,
+        TestCategory.MULTIPORT::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  @Test
+  public void runTypeParameterTests() {
+    Assumptions.assumeTrue(supportsGenericTypes(), Message.NO_GENERICS_SUPPORT);
+    runTestsForTargets(
+        Message.DESC_TYPE_PARMS,
+        TestCategory.GENERICS::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  @Test
+  public void runAsFederated() {
+    Assumptions.assumeTrue(supportsFederatedExecution(), Message.NO_FEDERATION_SUPPORT);
+
+    EnumSet<TestCategory> categories = EnumSet.allOf(TestCategory.class);
+    categories.removeAll(
+        EnumSet.of(
+            TestCategory.CONCURRENT,
+            TestCategory.FEDERATED,
+            // FIXME: also run the multiport tests once these are supported.
+            TestCategory.MULTIPORT));
+
+    runTestsFor(
+        List.of(Target.C),
+        Message.DESC_AS_FEDERATED,
+        categories::contains,
+        it -> ASTUtils.makeFederated(it.getFileConfig().resource),
+        TestLevel.EXECUTION,
+        true);
+  }
+
+  @Test
+  public void runConcurrentTests() {
+    runTestsForTargets(
+        Message.DESC_CONCURRENT,
+        TestCategory.CONCURRENT::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  @Test
+  public void runFederatedTests() {
+    Assumptions.assumeTrue(supportsFederatedExecution(), Message.NO_FEDERATION_SUPPORT);
+    runTestsForTargets(
+        Message.DESC_FEDERATED,
+        TestCategory.FEDERATED::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  /** Run the tests for modal reactors. */
+  @Test
+  public void runModalTests() {
+    runTestsForTargets(
+        Message.DESC_MODAL,
+        TestCategory.MODAL_MODELS::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  /** Run the tests for non-inlined reaction bodies. */
+  @Test
+  public void runNoInliningTests() {
+    runTestsForTargets(
+        Message.DESC_MODAL,
+        TestCategory.NO_INLINING::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  /**
+   * Run docker tests, provided that the platform is Linux and the target supports Docker. Skip if
+   * platform is not Linux or target does not support Docker.
+   */
+  @Test
+  public void runDockerTests() {
+    Assumptions.assumeTrue(isLinux(), Message.NO_DOCKER_TEST_SUPPORT);
+    Assumptions.assumeTrue(supportsDockerOption(), Message.NO_DOCKER_SUPPORT);
+    runTestsForTargets(
+        Message.DESC_DOCKER,
+        TestCategory.DOCKER::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  /**
+   * Run federated docker tests, provided that the platform is Linux, the target supports Docker,
+   * and the target supports federated execution. If any of these requirements are not met, skip the
+   * tests.
+   */
+  @Test
+  public void runDockerFederatedTests() {
+    Assumptions.assumeTrue(isLinux(), Message.NO_DOCKER_TEST_SUPPORT);
+    Assumptions.assumeTrue(supportsDockerOption(), Message.NO_DOCKER_SUPPORT);
+    Assumptions.assumeTrue(supportsFederatedExecution(), Message.NO_FEDERATION_SUPPORT);
+    runTestsForTargets(
+        Message.DESC_DOCKER_FEDERATED,
+        TestCategory.DOCKER_FEDERATED::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
+
+  @Test
+  public void runWithThreadingOff() {
+    Assumptions.assumeTrue(supportsSingleThreadedExecution(), Message.NO_SINGLE_THREADED_SUPPORT);
+    this.runTestsForTargets(
+        Message.DESC_SINGLE_THREADED,
+        Configurators::compatibleWithThreadingOff,
+        Configurators::disableThreading,
+        TestLevel.EXECUTION,
+        true);
+  }
+
+  /** Run enclave tests if the target supports enclaves. */
+  @Test
+  public void runEnclaveTests() {
+    Assumptions.assumeTrue(supportsEnclaves(), Message.NO_ENCLAVE_SUPPORT);
+    runTestsForTargets(
+        Message.DESC_ENCLAVE,
+        TestCategory.ENCLAVE::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/TestBase.java b/org.lflang.tests/src/org/lflang/tests/TestBase.java
index 192a531828..9ae075780a 100644
--- a/org.lflang.tests/src/org/lflang/tests/TestBase.java
+++ b/org.lflang.tests/src/org/lflang/tests/TestBase.java
@@ -3,7 +3,11 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.io.FileWriter;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.Provider;
+import java.io.BufferedWriter;
+import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.PrintWriter;
@@ -12,8 +16,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.io.File;
-import java.io.BufferedWriter;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -24,7 +26,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
 import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -37,7 +38,6 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.lflang.DefaultErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.LFRuntimeModule;
@@ -48,18 +48,11 @@
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.LFGeneratorContext.BuildParm;
 import org.lflang.generator.MainContext;
-import org.lflang.generator.GeneratorCommandFactory;
 import org.lflang.tests.Configurators.Configurator;
 import org.lflang.tests.LFTest.Result;
 import org.lflang.tests.TestRegistry.TestCategory;
 import org.lflang.util.FileUtil;
 import org.lflang.util.LFCommand;
-import org.lflang.util.ArduinoUtil;
-
-
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.Provider;
 
 /**
  * Base class for test classes that define JUnit tests.
@@ -70,501 +63,518 @@
 @InjectWith(LFInjectorProvider.class)
 public abstract class TestBase {
 
-    @Inject
-    IResourceValidator validator;
-    @Inject
-    LFGenerator generator;
-    @Inject
-    JavaIoFileSystemAccess fileAccess;
-    @Inject
-    Provider<ResourceSet> resourceSetProvider;
-
-
-    /** Reference to System.out. */
-    private static final PrintStream out = System.out;
-
-    /** Reference to System.err. */
-    private static final PrintStream err = System.err;
-
-    /** Execution timeout enforced for all tests. */
-    private static final long MAX_EXECUTION_TIME_SECONDS = 180;
-
-    /** Content separator used in test output, 78 characters wide. */
-    public static final String THIN_LINE =
-        "------------------------------------------------------------------------------" +
-            System.lineSeparator();
-
-    /** Content separator used in test output, 78 characters wide. */
-    public static final String THICK_LINE =
-        "==============================================================================" +
-            System.lineSeparator();
-
-    /** The targets for which to run the tests. */
-    private final List<Target> targets;
-
-    /**
-     * An enumeration of test levels.
-     * @author Marten Lohstroh
-     *
-     */
-    public enum TestLevel {VALIDATION, CODE_GEN, BUILD, EXECUTION}
-
-    /**
-     * Static function for converting a path to its associated test level.
-     * @author Anirudh Rengarajan
-     */
-    public static TestLevel pathToLevel(Path path) {
-        while(path.getParent() != null) {
-            String name = path.getFileName().toString();
-            for (var category: TestCategory.values()) {
-                if (category.name().equalsIgnoreCase(name)) {
-                    return category.level;
-                }
-            }
-            path = path.getParent();
+  @Inject IResourceValidator validator;
+  @Inject LFGenerator generator;
+  @Inject JavaIoFileSystemAccess fileAccess;
+  @Inject Provider<ResourceSet> resourceSetProvider;
+
+  /** Reference to System.out. */
+  private static final PrintStream out = System.out;
+
+  /** Reference to System.err. */
+  private static final PrintStream err = System.err;
+
+  /** Execution timeout enforced for all tests. */
+  private static final long MAX_EXECUTION_TIME_SECONDS = 180;
+
+  /** Content separator used in test output, 78 characters wide. */
+  public static final String THIN_LINE =
+      "------------------------------------------------------------------------------"
+          + System.lineSeparator();
+
+  /** Content separator used in test output, 78 characters wide. */
+  public static final String THICK_LINE =
+      "=============================================================================="
+          + System.lineSeparator();
+
+  /** The targets for which to run the tests. */
+  private final List<Target> targets;
+
+  /**
+   * An enumeration of test levels.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum TestLevel {
+    VALIDATION,
+    CODE_GEN,
+    BUILD,
+    EXECUTION
+  }
+
+  /**
+   * Static function for converting a path to its associated test level.
+   *
+   * @author Anirudh Rengarajan
+   */
+  public static TestLevel pathToLevel(Path path) {
+    while (path.getParent() != null) {
+      String name = path.getFileName().toString();
+      for (var category : TestCategory.values()) {
+        if (category.name().equalsIgnoreCase(name)) {
+          return category.level;
         }
-        return TestLevel.EXECUTION;
+      }
+      path = path.getParent();
     }
-
-    /**
-     * A collection messages often used throughout the test package.
-     *
-     * @author Marten Lohstroh
-     *
-     */
-    public static class Message {
-        /* Reasons for not running tests. */
-        public static final String NO_WINDOWS_SUPPORT = "Not (yet) supported on Windows.";
-        public static final String NO_SINGLE_THREADED_SUPPORT = "Target does not support single-threaded execution.";
-        public static final String NO_FEDERATION_SUPPORT = "Target does not support federated execution.";
-        public static final String NO_ENCLAVE_SUPPORT = "Targeet does not support the enclave feature.";
-        public static final String NO_DOCKER_SUPPORT = "Target does not support the 'docker' property.";
-        public static final String NO_DOCKER_TEST_SUPPORT = "Docker tests are only supported on Linux.";
-        public static final String NO_GENERICS_SUPPORT = "Target does not support generic types.";
-
-        /* Descriptions of collections of tests. */
-        public static final String DESC_SERIALIZATION = "Run serialization tests.";
-        public static final String DESC_GENERIC = "Run generic tests.";
-        public static final String DESC_TYPE_PARMS = "Run tests for reactors with type parameters.";
-        public static final String DESC_MULTIPORT = "Run multiport tests.";
-        public static final String DESC_AS_FEDERATED = "Run non-federated tests in federated mode.";
-        public static final String DESC_FEDERATED = "Run federated tests.";
-        public static final String DESC_DOCKER = "Run docker tests.";
-        public static final String DESC_DOCKER_FEDERATED = "Run docker federated tests.";
-        public static final String DESC_ENCLAVE = "Run enclave tests.";
-        public static final String DESC_CONCURRENT = "Run concurrent tests.";
-        public static final String DESC_TARGET_SPECIFIC = "Run target-specific tests";
-        public static final String DESC_ARDUINO = "Running Arduino tests.";
-        public static final String DESC_ZEPHYR = "Running Zephyr tests.";
-        public static final String DESC_AS_CCPP = "Running C tests as CCpp.";
-        public static final String DESC_SINGLE_THREADED = "Run non-concurrent and non-federated tests with threading = off.";
-        public static final String DESC_SCHED_SWAPPING = "Running with non-default runtime scheduler ";
-        public static final String DESC_ROS2 = "Running tests using ROS2.";
-        public static final String DESC_MODAL = "Run modal reactor tests.";
-
-        /* Missing dependency messages */
-        public static final String MISSING_DOCKER = "Executable 'docker' not found or 'docker' daemon thread not running";
-        public static final String MISSING_ARDUINO_CLI = "Executable 'arduino-cli' not found";
+    return TestLevel.EXECUTION;
+  }
+
+  /**
+   * A collection messages often used throughout the test package.
+   *
+   * @author Marten Lohstroh
+   */
+  public static class Message {
+    /* Reasons for not running tests. */
+    public static final String NO_WINDOWS_SUPPORT = "Not (yet) supported on Windows.";
+    public static final String NO_SINGLE_THREADED_SUPPORT =
+        "Target does not support single-threaded execution.";
+    public static final String NO_FEDERATION_SUPPORT =
+        "Target does not support federated execution.";
+    public static final String NO_ENCLAVE_SUPPORT = "Targeet does not support the enclave feature.";
+    public static final String NO_DOCKER_SUPPORT = "Target does not support the 'docker' property.";
+    public static final String NO_DOCKER_TEST_SUPPORT = "Docker tests are only supported on Linux.";
+    public static final String NO_GENERICS_SUPPORT = "Target does not support generic types.";
+
+    /* Descriptions of collections of tests. */
+    public static final String DESC_SERIALIZATION = "Run serialization tests.";
+    public static final String DESC_GENERIC = "Run generic tests.";
+    public static final String DESC_TYPE_PARMS = "Run tests for reactors with type parameters.";
+    public static final String DESC_MULTIPORT = "Run multiport tests.";
+    public static final String DESC_AS_FEDERATED = "Run non-federated tests in federated mode.";
+    public static final String DESC_FEDERATED = "Run federated tests.";
+    public static final String DESC_DOCKER = "Run docker tests.";
+    public static final String DESC_DOCKER_FEDERATED = "Run docker federated tests.";
+    public static final String DESC_ENCLAVE = "Run enclave tests.";
+    public static final String DESC_CONCURRENT = "Run concurrent tests.";
+    public static final String DESC_TARGET_SPECIFIC = "Run target-specific tests";
+    public static final String DESC_ARDUINO = "Running Arduino tests.";
+    public static final String DESC_ZEPHYR = "Running Zephyr tests.";
+    public static final String DESC_AS_CCPP = "Running C tests as CCpp.";
+    public static final String DESC_SINGLE_THREADED =
+        "Run non-concurrent and non-federated tests with threading = off.";
+    public static final String DESC_SCHED_SWAPPING = "Running with non-default runtime scheduler ";
+    public static final String DESC_ROS2 = "Running tests using ROS2.";
+    public static final String DESC_MODAL = "Run modal reactor tests.";
+
+    /* Missing dependency messages */
+    public static final String MISSING_DOCKER =
+        "Executable 'docker' not found or 'docker' daemon thread not running";
+    public static final String MISSING_ARDUINO_CLI = "Executable 'arduino-cli' not found";
+  }
+
+  /** Constructor for test classes that test a single target. */
+  protected TestBase(Target first) {
+    this(Collections.singletonList(first));
+  }
+
+  /** Special ctor for the code coverage test */
+  protected TestBase(List<Target> targets) {
+    assertFalse(targets.isEmpty(), "empty target list");
+    this.targets = Collections.unmodifiableList(targets);
+    TestRegistry.initialize();
+  }
+
+  /**
+   * Run selected tests for a given target and configurator up to the specified level.
+   *
+   * @param target The target to run tests for.
+   * @param selected A predicate that given a test category returns whether it should be included in
+   *     this test run or not.
+   * @param configurator A procedure for configuring the tests.
+   * @param copy Whether or not to work on copies of tests in the test. registry.
+   */
+  protected final void runTestsAndPrintResults(
+      Target target,
+      Predicate<TestCategory> selected,
+      TestLevel level,
+      Configurator configurator,
+      boolean copy) {
+    var categories = Arrays.stream(TestCategory.values()).filter(selected).toList();
+    for (var category : categories) {
+      System.out.println(category.getHeader());
+      var tests = TestRegistry.getRegisteredTests(target, category, copy);
+      try {
+        validateAndRun(tests, configurator, level);
+      } catch (IOException e) {
+        throw new RuntimeIOException(e);
+      }
+      System.out.println(TestRegistry.getCoverageReport(target, category));
+      checkAndReportFailures(tests);
     }
-
-    /** Constructor for test classes that test a single target. */
-    protected TestBase(Target first) {
-        this(Collections.singletonList(first));
+  }
+
+  /**
+   * Run tests in the given selection for all targets enabled in this class.
+   *
+   * @param description A string that describes the collection of tests.
+   * @param selected A predicate that given a test category returns whether it should be included in
+   *     this test run or not.
+   * @param configurator A procedure for configuring the tests.
+   * @param copy Whether or not to work on copies of tests in the test. registry.
+   */
+  protected void runTestsForTargets(
+      String description,
+      Predicate<TestCategory> selected,
+      Configurator configurator,
+      TestLevel level,
+      boolean copy) {
+    for (Target target : this.targets) {
+      runTestsFor(List.of(target), description, selected, configurator, level, copy);
     }
-
-    /** Special ctor for the code coverage test */
-    protected TestBase(List<Target> targets) {
-        assertFalse(targets.isEmpty(), "empty target list");
-        this.targets = Collections.unmodifiableList(targets);
-        TestRegistry.initialize();
+  }
+
+  /**
+   * Run tests in the given selection for a subset of given targets.
+   *
+   * @param subset The subset of targets to run the selected tests for.
+   * @param description A string that describes the collection of tests.
+   * @param selected A predicate that given a test category returns whether it should be included in
+   *     this test run or not.
+   * @param configurator A procedure for configuring the tests.
+   * @param copy Whether to work on copies of tests in the test. registry.
+   */
+  protected void runTestsFor(
+      List<Target> subset,
+      String description,
+      Predicate<TestCategory> selected,
+      Configurator configurator,
+      TestLevel level,
+      boolean copy) {
+    for (Target target : subset) {
+      printTestHeader(target, description);
+      runTestsAndPrintResults(target, selected, level, configurator, copy);
     }
-
-    /**
-     * Run selected tests for a given target and configurator up to the specified level.
-     *
-     * @param target The target to run tests for.
-     * @param selected A predicate that given a test category returns whether
-     * it should be included in this test run or not.
-     * @param configurator  A procedure for configuring the tests.
-     * @param copy Whether or not to work on copies of tests in the test.
-     * registry.
-     */
-    protected final void runTestsAndPrintResults(Target target,
-                                                 Predicate<TestCategory> selected,
-                                                 TestLevel level,
-                                                 Configurator configurator,
-                                                 boolean copy) {
-        var categories = Arrays.stream(TestCategory.values()).filter(selected).toList();
-        for (var category : categories) {
-            System.out.println(category.getHeader());
-            var tests = TestRegistry.getRegisteredTests(target, category, copy);
-            try {
-                validateAndRun(tests, configurator, level);
-            } catch (IOException e) {
-                throw new RuntimeIOException(e);
-            }
-            System.out.println(TestRegistry.getCoverageReport(target, category));
-            checkAndReportFailures(tests);
-        }
+  }
+
+  /** Whether to enable threading. */
+  protected boolean supportsSingleThreadedExecution() {
+    return false;
+  }
+
+  /**
+   * Determine whether the current platform is Windows.
+   *
+   * @return true if the current platform is Windwos, false otherwise.
+   */
+  protected static boolean isWindows() {
+    String OS = System.getProperty("os.name").toLowerCase();
+    return OS.contains("win");
+  }
+
+  /**
+   * Determine whether the current platform is MacOS.
+   *
+   * @return true if the current platform is MacOS, false otherwise.
+   */
+  protected static boolean isMac() {
+    String OS = System.getProperty("os.name").toLowerCase();
+    return OS.contains("mac");
+  }
+
+  /**
+   * Determine whether the current platform is Linux.
+   *
+   * @return true if the current platform is Linux, false otherwise.
+   */
+  protected static boolean isLinux() {
+    String OS = System.getProperty("os.name").toLowerCase();
+    return OS.contains("linux");
+  }
+
+  /** End output redirection. */
+  private static void restoreOutputs() {
+    System.out.flush();
+    System.err.flush();
+    System.setOut(out);
+    System.setErr(err);
+  }
+
+  /**
+   * Redirect outputs to the given tests for recording.
+   *
+   * @param test The test to redirect outputs to.
+   */
+  private static void redirectOutputs(LFTest test) {
+    System.setOut(new PrintStream(test.getOutputStream()));
+    System.setErr(new PrintStream(test.getOutputStream()));
+  }
+
+  /**
+   * Run a test, print results on stderr.
+   *
+   * @param test Test case.
+   * @param testClass The test class that will execute the test. This is target-specific, it may
+   *     provide some target-specific configuration. We pass a class and not a new instance because
+   *     this method needs to ensure the object is properly injected, and so, it needs to control
+   *     its entire lifecycle.
+   * @param level Level to which to run the test.
+   */
+  public static void runSingleTestAndPrintResults(
+      LFTest test, Class<? extends TestBase> testClass, TestLevel level) {
+    Injector injector =
+        new LFStandaloneSetup(new LFRuntimeModule()).createInjectorAndDoEMFRegistration();
+    TestBase runner;
+    try {
+      @SuppressWarnings("unchecked")
+      Constructor<? extends TestBase> constructor =
+          (Constructor<? extends TestBase>) testClass.getConstructors()[0];
+      runner = constructor.newInstance();
+    } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+      throw new IllegalStateException(e);
     }
+    injector.injectMembers(runner);
 
-    /**
-     * Run tests in the given selection for all targets enabled in this class.
-     *
-     * @param description A string that describes the collection of tests.
-     * @param selected A predicate that given a test category returns whether
-     * it should be included in this test run or not.
-     * @param configurator A procedure for configuring the tests.
-     * @param copy Whether or not to work on copies of tests in the test.
-     * registry.
-     */
-    protected void runTestsForTargets(String description,
-                                      Predicate<TestCategory> selected,
-                                      Configurator configurator,
-                                      TestLevel level,
-                                      boolean copy) {
-        for (Target target : this.targets) {
-            runTestsFor(List.of(target), description, selected,
-                        configurator, level, copy);
-        }
+    Set<LFTest> tests = Set.of(test);
+    try {
+      runner.validateAndRun(tests, t -> true, level);
+    } catch (IOException e) {
+      throw new RuntimeIOException(e);
     }
-
-    /**
-     * Run tests in the given selection for a subset of given targets.
-     *
-     * @param subset The subset of targets to run the selected tests for.
-     * @param description A string that describes the collection of tests.
-     * @param selected A predicate that given a test category returns whether
-     * it should be included in this test run or not.
-     * @param configurator A procedure for configuring the tests.
-     * @param copy Whether to work on copies of tests in the test.
-     * registry.
-     */
-    protected void runTestsFor(List<Target> subset,
-                               String description,
-                               Predicate<TestCategory> selected,
-                               Configurator configurator,
-                               TestLevel level,
-                               boolean copy) {
-        for (Target target : subset) {
-            printTestHeader(target, description);
-            runTestsAndPrintResults(target, selected, level, configurator, copy);
-        }
+    checkAndReportFailures(tests);
+  }
+
+  /**
+   * Print a header that describes a collection of tests.
+   *
+   * @param target The target for which the tests are being performed.
+   * @param description A string the describes the collection of tests.
+   */
+  protected static void printTestHeader(Target target, String description) {
+    System.out.print(TestBase.THICK_LINE);
+    System.out.println("Target: " + target);
+    if (description.startsWith("Description: ")) {
+      System.out.println(description);
+    } else {
+      System.out.println("Description: " + description);
     }
-
-    /**
-     * Whether to enable threading.
-     */
-    protected boolean supportsSingleThreadedExecution() {
-        return false;
+    System.out.println(TestBase.THICK_LINE);
+  }
+
+  /**
+   * Iterate over given tests and evaluate their outcome, report errors if there are any.
+   *
+   * @param tests The tests to inspect the results of.
+   */
+  private static void checkAndReportFailures(Set<LFTest> tests) {
+    var passed = tests.stream().filter(it -> it.hasPassed()).collect(Collectors.toList());
+    var s = new StringBuffer();
+    s.append(THIN_LINE);
+    s.append("Passing: " + passed.size() + "/" + tests.size() + "\n");
+    s.append(THIN_LINE);
+    passed.forEach(test -> s.append("Passed: ").append(test).append("\n"));
+    s.append(THIN_LINE);
+    System.out.print(s.toString());
+
+    for (var test : tests) {
+      test.reportErrors();
     }
-
-    /**
-     * Determine whether the current platform is Windows.
-     * @return true if the current platform is Windwos, false otherwise.
-     */
-    protected static boolean isWindows() {
-        String OS = System.getProperty("os.name").toLowerCase();
-        return OS.contains("win");
-    }
-
-     /**
-     * Determine whether the current platform is MacOS.
-     * @return true if the current platform is MacOS, false otherwise.
-     */
-    protected static boolean isMac() {
-        String OS = System.getProperty("os.name").toLowerCase();
-        return OS.contains("mac");
-    }
-
-    /**
-     * Determine whether the current platform is Linux.
-     * @return true if the current platform is Linux, false otherwise.
-     */
-    protected static boolean isLinux() {
-        String OS = System.getProperty("os.name").toLowerCase();
-        return OS.contains("linux");
+    for (LFTest lfTest : tests) {
+      assertTrue(lfTest.hasPassed());
     }
-
-    /**
-     * End output redirection.
-     */
-    private static void restoreOutputs() {
-        System.out.flush();
-        System.err.flush();
-        System.setOut(out);
-        System.setErr(err);
+  }
+
+  /**
+   * Configure a test by applying the given configurator and return a generator context. Also, if
+   * the given level is less than {@code TestLevel.BUILD}, add a {@code no-compile} flag to the
+   * generator context. If the configurator was not applied successfully, throw an AssertionError.
+   *
+   * @param test the test to configure.
+   * @param configurator The configurator to apply to the test.
+   * @param level The level of testing in which the generator context will be used.
+   */
+  private void configure(LFTest test, Configurator configurator, TestLevel level)
+      throws IOException, TestError {
+    var props = new Properties();
+    props.setProperty("hierarchical-bin", "true");
+    addExtraLfcArgs(props);
+
+    var sysProps = System.getProperties();
+    // Set the external-runtime-path property if it was specified.
+    if (sysProps.containsKey("runtime")) {
+      var rt = sysProps.get("runtime").toString();
+      if (!rt.isEmpty()) {
+        props.setProperty(BuildParm.EXTERNAL_RUNTIME_PATH.getKey(), rt);
+        System.out.println("Using runtime: " + sysProps.get("runtime").toString());
+      }
+    } else {
+      System.out.println("Using default runtime.");
     }
 
-    /**
-     * Redirect outputs to the given tests for recording.
-     *
-     * @param test The test to redirect outputs to.
-     */
-    private static void redirectOutputs(LFTest test) {
-        System.setOut(new PrintStream(test.getOutputStream()));
-        System.setErr(new PrintStream(test.getOutputStream()));
+    var r =
+        resourceSetProvider
+            .get()
+            .getResource(URI.createFileURI(test.getSrcPath().toFile().getAbsolutePath()), true);
+
+    if (r.getErrors().size() > 0) {
+      String message =
+          r.getErrors().stream()
+              .map(Diagnostic::toString)
+              .collect(Collectors.joining(System.lineSeparator()));
+      throw new TestError(message, Result.PARSE_FAIL);
     }
 
-
-    /**
-     * Run a test, print results on stderr.
-     *
-     * @param test      Test case.
-     * @param testClass The test class that will execute the test. This is target-specific,
-     *                  it may provide some target-specific configuration. We pass a class
-     *                  and not a new instance because this method needs to ensure the object
-     *                  is properly injected, and so, it needs to control its entire lifecycle.
-     * @param level     Level to which to run the test.
-     */
-    public static void runSingleTestAndPrintResults(LFTest test, Class<? extends TestBase> testClass, TestLevel level) {
-        Injector injector = new LFStandaloneSetup(new LFRuntimeModule()).createInjectorAndDoEMFRegistration();
-        TestBase runner;
-        try {
-            @SuppressWarnings("unchecked")
-            Constructor<? extends TestBase> constructor = (Constructor<? extends TestBase>) testClass.getConstructors()[0];
-            runner = constructor.newInstance();
-        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
-            throw new IllegalStateException(e);
-        }
-        injector.injectMembers(runner);
-
-        Set<LFTest> tests = Set.of(test);
-        try {
-            runner.validateAndRun(tests, t -> true, level);
-        } catch (IOException e) {
-            throw new RuntimeIOException(e);
-        }
-        checkAndReportFailures(tests);
+    fileAccess.setOutputPath(
+        FileConfig.findPackageRoot(test.getSrcPath(), s -> {})
+            .resolve(FileConfig.DEFAULT_SRC_GEN_DIR)
+            .toString());
+    var context =
+        new MainContext(
+            LFGeneratorContext.Mode.STANDALONE,
+            CancelIndicator.NullImpl,
+            (m, p) -> {},
+            props,
+            r,
+            fileAccess,
+            fileConfig -> new DefaultErrorReporter());
+
+    test.configure(context);
+
+    // Set the no-compile flag the test is not supposed to reach the build stage.
+    if (level.compareTo(TestLevel.BUILD) < 0) {
+      context.getArgs().setProperty("no-compile", "");
     }
 
-    /**
-     * Print a header that describes a collection of tests.
-     * @param target The target for which the tests are being performed.
-     * @param description A string the describes the collection of tests.
-     */
-    protected static void printTestHeader(Target target, String description) {
-        System.out.print(TestBase.THICK_LINE);
-        System.out.println("Target: " + target);
-        if (description.startsWith("Description: ")) {
-            System.out.println(description);
-        } else {
-            System.out.println("Description: " + description);
-        }
-        System.out.println(TestBase.THICK_LINE);
+    // Reload in case target properties have changed.
+    context.loadTargetConfig();
+    // Update the test by applying the configuration. E.g., to carry out an AST transformation.
+    if (configurator != null) {
+      if (!configurator.configure(test)) {
+        throw new TestError("Test configuration unsuccessful.", Result.CONFIG_FAIL);
+      }
     }
-
-    /**
-     * Iterate over given tests and evaluate their outcome, report errors if
-     * there are any.
-     *
-     * @param tests The tests to inspect the results of.
-     */
-    private static void checkAndReportFailures(Set<LFTest> tests) {
-        var passed = tests.stream().filter(it -> it.hasPassed()).collect(Collectors.toList());
-        var s = new StringBuffer();
-        s.append(THIN_LINE);
-        s.append("Passing: " + passed.size() + "/" + tests.size() + "\n");
-        s.append(THIN_LINE);
-        passed.forEach(test -> s.append("Passed: ").append(test).append("\n"));
-        s.append(THIN_LINE);
-        System.out.print(s.toString());
-
-        for (var test : tests) {
-            test.reportErrors();
-        }
-        for (LFTest lfTest : tests) {
-            assertTrue(lfTest.hasPassed());
+  }
+
+  /** Validate the given test. Throw an TestError if validation failed. */
+  private void validate(LFTest test) throws TestError {
+    // Validate the resource and store issues in the test object.
+    try {
+      var context = test.getContext();
+      var issues =
+          validator.validate(
+              context.getFileConfig().resource, CheckMode.ALL, context.getCancelIndicator());
+      if (issues != null && !issues.isEmpty()) {
+        if (issues.stream().anyMatch(it -> it.getSeverity() == Severity.ERROR)) {
+          String message =
+              issues.stream()
+                  .map(Objects::toString)
+                  .collect(Collectors.joining(System.lineSeparator()));
+          throw new TestError(message, Result.VALIDATE_FAIL);
         }
+      }
+    } catch (TestError e) {
+      throw e;
+    } catch (Throwable e) {
+      throw new TestError("Exception during validation.", Result.VALIDATE_FAIL, e);
     }
-
-    /**
-     * Configure a test by applying the given configurator and return a
-     * generator context. Also, if the given level is less than
-     * {@code TestLevel.BUILD}, add a {@code no-compile} flag to the generator context. If
-     * the configurator was not applied successfully, throw an AssertionError.
-     *
-     * @param test the test to configure.
-     * @param configurator The configurator to apply to the test.
-     * @param level The level of testing in which the generator context will be
-     * used.
-     */
-    private void configure(LFTest test, Configurator configurator, TestLevel level) throws IOException, TestError {
-        var props = new Properties();
-        props.setProperty("hierarchical-bin", "true");
-        addExtraLfcArgs(props);
-
-        var sysProps = System.getProperties();
-        // Set the external-runtime-path property if it was specified.
-        if (sysProps.containsKey("runtime")) {
-            var rt = sysProps.get("runtime").toString();
-            if (!rt.isEmpty()) {
-                props.setProperty(BuildParm.EXTERNAL_RUNTIME_PATH.getKey(), rt);
-                System.out.println("Using runtime: " + sysProps.get("runtime").toString());
-            }
-        } else {
-            System.out.println("Using default runtime.");
-        }
-
-        var r = resourceSetProvider.get().getResource(
-            URI.createFileURI(test.getSrcPath().toFile().getAbsolutePath()),
-            true);
-
-        if (r.getErrors().size() > 0) {
-            String message = r.getErrors().stream().map(Diagnostic::toString).collect(Collectors.joining(System.lineSeparator()));
-            throw new TestError(message, Result.PARSE_FAIL);
-        }
-
-        fileAccess.setOutputPath(FileConfig.findPackageRoot(test.getSrcPath(), s -> {}).resolve(FileConfig.DEFAULT_SRC_GEN_DIR).toString());
-        var context = new MainContext(
-            LFGeneratorContext.Mode.STANDALONE, CancelIndicator.NullImpl, (m, p) -> {}, props, r, fileAccess,
-            fileConfig -> new DefaultErrorReporter()
-        );
-
-        test.configure(context);
-
-        // Set the no-compile flag the test is not supposed to reach the build stage.
-        if (level.compareTo(TestLevel.BUILD) < 0) {
-            context.getArgs().setProperty("no-compile", "");
-        }
-        
-        // Reload in case target properties have changed.
-        context.loadTargetConfig();
-        // Update the test by applying the configuration. E.g., to carry out an AST transformation.
-        if (configurator != null) {
-            if (!configurator.configure(test)) {
-                throw new TestError("Test configuration unsuccessful.", Result.CONFIG_FAIL);
-            }
-        }
+  }
+
+  /** Override to add some LFC arguments to all runs of this test class. */
+  protected void addExtraLfcArgs(Properties args) {
+    args.setProperty("build-type", "Test");
+    args.setProperty("logging", "Debug");
+  }
+
+  /**
+   * Invoke the code generator for the given test.
+   *
+   * @param test The test to generate code for.
+   */
+  private GeneratorResult generateCode(LFTest test) throws TestError {
+    if (test.getFileConfig().resource == null) {
+      return GeneratorResult.NOTHING;
     }
-
-    /**
-     * Validate the given test. Throw an TestError if validation failed.
-     */
-    private void validate(LFTest test) throws TestError {
-        // Validate the resource and store issues in the test object.
-        try {
-            var context = test.getContext();
-            var issues = validator.validate(context.getFileConfig().resource,
-                                            CheckMode.ALL, context.getCancelIndicator());
-            if (issues != null && !issues.isEmpty()) {
-                if (issues.stream().anyMatch(it -> it.getSeverity() == Severity.ERROR)) {
-                    String message = issues.stream().map(Objects::toString).collect(Collectors.joining(System.lineSeparator()));
-                    throw new TestError(message, Result.VALIDATE_FAIL);
-                }
-            }
-        } catch (TestError e) {
-            throw e;
-        } catch (Throwable e) {
-            throw new TestError("Exception during validation.", Result.VALIDATE_FAIL, e);
-        }
+    try {
+      generator.doGenerate(test.getFileConfig().resource, fileAccess, test.getContext());
+    } catch (Throwable e) {
+      throw new TestError("Code generation unsuccessful.", Result.CODE_GEN_FAIL, e);
     }
-
-
-    /**
-     * Override to add some LFC arguments to all runs of this test class.
-     */
-    protected void addExtraLfcArgs(Properties args) {
-        args.setProperty("build-type", "Test");
-        args.setProperty("logging", "Debug");
+    if (generator.errorsOccurred()) {
+      throw new TestError("Code generation unsuccessful.", Result.CODE_GEN_FAIL);
     }
 
-    /**
-     * Invoke the code generator for the given test.
-     *
-     * @param test The test to generate code for.
-     */
-    private GeneratorResult generateCode(LFTest test) throws TestError {
-        if (test.getFileConfig().resource == null) {
-            return GeneratorResult.NOTHING;
-        }
-        try {
-            generator.doGenerate(test.getFileConfig().resource, fileAccess, test.getContext());
-        } catch (Throwable e) {
-            throw new TestError("Code generation unsuccessful.", Result.CODE_GEN_FAIL, e);
-        }
-        if (generator.errorsOccurred()) {
-            throw new TestError("Code generation unsuccessful.", Result.CODE_GEN_FAIL);
+    return test.getContext().getResult();
+  }
+
+  /**
+   * Given an indexed test, execute it and label the test as failing if it did not execute, took too
+   * long to execute, or executed but exited with an error code.
+   */
+  private void execute(LFTest test) throws TestError {
+    final var pb = getExecCommand(test);
+    try {
+      var p = pb.start();
+      var stdout = test.recordStdOut(p);
+      var stderr = test.recordStdErr(p);
+
+      var stdoutException = new AtomicReference<Throwable>(null);
+      var stderrException = new AtomicReference<Throwable>(null);
+
+      stdout.setUncaughtExceptionHandler((thread, throwable) -> stdoutException.set(throwable));
+      stderr.setUncaughtExceptionHandler((thread, throwable) -> stderrException.set(throwable));
+
+      stderr.start();
+      stdout.start();
+
+      if (!p.waitFor(MAX_EXECUTION_TIME_SECONDS, TimeUnit.SECONDS)) {
+        stdout.interrupt();
+        stderr.interrupt();
+        p.destroyForcibly();
+        throw new TestError(Result.TEST_TIMEOUT);
+      } else {
+        if (stdoutException.get() != null || stderrException.get() != null) {
+          StringBuffer sb = new StringBuffer();
+          if (stdoutException.get() != null) {
+            sb.append("Error during stdout handling:" + System.lineSeparator());
+            sb.append(stackTraceToString(stdoutException.get()));
+          }
+          if (stderrException.get() != null) {
+            sb.append("Error during stderr handling:" + System.lineSeparator());
+            sb.append(stackTraceToString(stderrException.get()));
+          }
+          throw new TestError(sb.toString(), Result.TEST_EXCEPTION);
         }
-
-        return test.getContext().getResult();
-    }
-
-
-    /**
-     * Given an indexed test, execute it and label the test as failing if it
-     * did not execute, took too long to execute, or executed but exited with
-     * an error code.
-     */
-    private void execute(LFTest test) throws TestError {
-        final var pb = getExecCommand(test);
-        try {
-            var p = pb.start();
-            var stdout = test.recordStdOut(p);
-            var stderr = test.recordStdErr(p);
-
-            var stdoutException = new AtomicReference<Throwable>(null);
-            var stderrException = new AtomicReference<Throwable>(null);
-
-            stdout.setUncaughtExceptionHandler((thread, throwable) -> stdoutException.set(throwable));
-            stderr.setUncaughtExceptionHandler((thread, throwable) -> stderrException.set(throwable));
-
-            stderr.start();
-            stdout.start();
-
-            if (!p.waitFor(MAX_EXECUTION_TIME_SECONDS, TimeUnit.SECONDS)) {
-                stdout.interrupt();
-                stderr.interrupt();
-                p.destroyForcibly();
-                throw new TestError(Result.TEST_TIMEOUT);
-            } else {
-                if (stdoutException.get() != null || stderrException.get() != null) {
-                    StringBuffer sb = new StringBuffer();
-                    if (stdoutException.get() != null) {
-                        sb.append("Error during stdout handling:" + System.lineSeparator());
-                        sb.append(stackTraceToString(stdoutException.get()));
-                    }
-                    if (stderrException.get() != null) {
-                        sb.append("Error during stderr handling:" + System.lineSeparator());
-                        sb.append(stackTraceToString(stderrException.get()));
-                    }
-                    throw new TestError(sb.toString(), Result.TEST_EXCEPTION);
-                }
-                if (p.exitValue() != 0) {
-                    String message = "Exit code: " + p.exitValue();
-                    if (p.exitValue() == 139) {
-                        // The java ProcessBuilder and Process interface does not allow us to reliably retrieve stderr and stdout
-                        // from a process that segfaults. We can only print a message indicating that the putput is incomplete.
-                        message += System.lineSeparator() +
-                            "This exit code typically indicates a segfault. In this case, the execution output is likely missing or incomplete.";
-                    }
-                    throw new TestError(message, Result.TEST_FAIL);
-                }
-            }
-        } catch (TestError e) {
-            throw e;
-        } catch (Throwable e) {
-            e.printStackTrace();
-            throw new TestError("Exception during test execution.", Result.TEST_EXCEPTION, e);
+        if (p.exitValue() != 0) {
+          String message = "Exit code: " + p.exitValue();
+          if (p.exitValue() == 139) {
+            // The java ProcessBuilder and Process interface does not allow us to reliably retrieve
+            // stderr and stdout
+            // from a process that segfaults. We can only print a message indicating that the putput
+            // is incomplete.
+            message +=
+                System.lineSeparator()
+                    + "This exit code typically indicates a segfault. In this case, the execution"
+                    + " output is likely missing or incomplete.";
+          }
+          throw new TestError(message, Result.TEST_FAIL);
         }
+      }
+    } catch (TestError e) {
+      throw e;
+    } catch (Throwable e) {
+      e.printStackTrace();
+      throw new TestError("Exception during test execution.", Result.TEST_EXCEPTION, e);
     }
-
-    static public String stackTraceToString(Throwable t) {
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = new PrintWriter(sw);
-        t.printStackTrace(pw);
-        pw.flush();
-        pw.close();
-        return sw.toString();
-    }
-
-    /** Bash script that is used to execute docker tests. */
-    static private String DOCKER_RUN_SCRIPT = """
+  }
+
+  public static String stackTraceToString(Throwable t) {
+    StringWriter sw = new StringWriter();
+    PrintWriter pw = new PrintWriter(sw);
+    t.printStackTrace(pw);
+    pw.flush();
+    pw.close();
+    return sw.toString();
+  }
+
+  /** Bash script that is used to execute docker tests. */
+  private static String DOCKER_RUN_SCRIPT =
+      """
             #!/bin/bash
 
             # exit when any command fails
             set -e
-            
+
             docker compose -f "$1" rm -f
             docker compose -f "$1" up --build | tee docker_log.txt
             docker compose -f "$1" down --rmi local
@@ -583,129 +593,128 @@ static public String stackTraceToString(Throwable t) {
             exit 0
             """;
 
-    /**
-     * Path to a bash script containing DOCKER_RUN_SCRIPT.
-     */
-    private static Path dockerRunScript = null;
-
-    /**
-     * Return the path to a bash script containing DOCKER_RUN_SCRIPT.
-     *
-     * If the script does not yet exist, it is created.
-     */
-    private Path getDockerRunScript() throws TestError {
-        if (dockerRunScript != null) {
-            return dockerRunScript;
-        }
-
-        try {
-            var file = File.createTempFile("run_docker_test", "sh");
-            file.deleteOnExit();
-            file.setExecutable(true);
-            var path = file.toPath();
-            try (BufferedWriter writer = Files.newBufferedWriter(path)) {
-                writer.write(DOCKER_RUN_SCRIPT);
-            }
-            dockerRunScript = path;
-        } catch (IOException e) {
-            throw new TestError("IO Error during test preparation.", Result.TEST_EXCEPTION, e);
-        }
-
-        return dockerRunScript;
+  /** Path to a bash script containing DOCKER_RUN_SCRIPT. */
+  private static Path dockerRunScript = null;
+
+  /**
+   * Return the path to a bash script containing DOCKER_RUN_SCRIPT.
+   *
+   * <p>If the script does not yet exist, it is created.
+   */
+  private Path getDockerRunScript() throws TestError {
+    if (dockerRunScript != null) {
+      return dockerRunScript;
     }
 
-    /**
-     * Throws TestError if docker does not exist. Does nothing otherwise.
-     */
-    private void checkDockerExists() throws TestError {
-        if (LFCommand.get("docker", List.of()) == null) {
-            throw new TestError("Executable 'docker' not found" , Result.NO_EXEC_FAIL);
-        }
-        if (LFCommand.get("docker-compose", List.of()) == null) {
-            throw new TestError("Executable 'docker-compose' not found" , Result.NO_EXEC_FAIL);
-        }
+    try {
+      var file = File.createTempFile("run_docker_test", "sh");
+      file.deleteOnExit();
+      file.setExecutable(true);
+      var path = file.toPath();
+      try (BufferedWriter writer = Files.newBufferedWriter(path)) {
+        writer.write(DOCKER_RUN_SCRIPT);
+      }
+      dockerRunScript = path;
+    } catch (IOException e) {
+      throw new TestError("IO Error during test preparation.", Result.TEST_EXCEPTION, e);
     }
 
-    /**
-     * Return a ProcessBuilder used to test the docker execution.
-     * @param test The test to get the execution command for.
-     */
-    private ProcessBuilder getDockerExecCommand(LFTest test) throws TestError {
-        checkDockerExists();
-        var srcGenPath = test.getFileConfig().getSrcGenPath();
-        var dockerComposeFile = FileUtil.globFilesEndsWith(srcGenPath, "docker-compose.yml").get(0);
-        return new ProcessBuilder(getDockerRunScript().toString(), dockerComposeFile.toString());
-    }
+    return dockerRunScript;
+  }
 
-    /**
-     * Return a preconfigured ProcessBuilder for executing the test program.
-     * @param test The test to get the execution command for.
-     */
-    private ProcessBuilder getExecCommand(LFTest test) throws TestError {
-
-        var srcBasePath = test.getFileConfig().srcPkgPath.resolve("src");
-        var relativePathName = srcBasePath.relativize(test.getFileConfig().srcPath).toString();
-
-        // special case to test docker file generation
-        if (relativePathName.equalsIgnoreCase(TestCategory.DOCKER.getPath()) ||
-            relativePathName.equalsIgnoreCase(TestCategory.DOCKER_FEDERATED.getPath())) {
-            return getDockerExecCommand(test);
-        } else {
-            LFCommand command = test.getFileConfig().getCommand();
-            if (command == null) {
-                throw new TestError("File: " + test.getFileConfig().getExecutable(), Result.NO_EXEC_FAIL);
-            }
-            return new ProcessBuilder(command.command()).directory(command.directory());
-        }
+  /** Throws TestError if docker does not exist. Does nothing otherwise. */
+  private void checkDockerExists() throws TestError {
+    if (LFCommand.get("docker", List.of()) == null) {
+      throw new TestError("Executable 'docker' not found", Result.NO_EXEC_FAIL);
     }
-
-    /**
-     * Validate and run the given tests, using the specified configuratator and level.
-     *
-     * While performing tests, this method prints a header that reaches completion
-     * once all tests have been run.
-     *
-     * @param tests A set of tests to run.
-     * @param configurator A procedure for configuring the tests.
-     * @param level The level of testing.
-     * @throws IOException If initial file configuration fails
-     */
-    private void validateAndRun(Set<LFTest> tests, Configurator configurator, TestLevel level) throws IOException {
-        final var x = 78f / tests.size();
-        var marks = 0;
-        var done = 0;
-
-        for (var test : tests) {
-            try {
-                redirectOutputs(test);
-                configure(test, configurator, level);
-                validate(test);
-                if (level.compareTo(TestLevel.CODE_GEN) >= 0) {
-                    generateCode(test);
-                }
-                if (level == TestLevel.EXECUTION) {
-                    execute(test);
-                }
-                test.markPassed();
-            } catch (TestError e) {
-                test.handleTestError(e);
-            } catch (Throwable e) {
-                test.handleTestError(new TestError(
-                    "Unknown exception during test execution", Result.TEST_EXCEPTION, e));
-            } finally {
-                restoreOutputs();
-            }
-            done++;
-            while (Math.floor(done * x) >= marks && marks < 78) {
-                System.out.print("=");
-                marks++;
-            }
+    if (LFCommand.get("docker-compose", List.of()) == null) {
+      throw new TestError("Executable 'docker-compose' not found", Result.NO_EXEC_FAIL);
+    }
+  }
+
+  /**
+   * Return a ProcessBuilder used to test the docker execution.
+   *
+   * @param test The test to get the execution command for.
+   */
+  private ProcessBuilder getDockerExecCommand(LFTest test) throws TestError {
+    checkDockerExists();
+    var srcGenPath = test.getFileConfig().getSrcGenPath();
+    var dockerComposeFile = FileUtil.globFilesEndsWith(srcGenPath, "docker-compose.yml").get(0);
+    return new ProcessBuilder(getDockerRunScript().toString(), dockerComposeFile.toString());
+  }
+
+  /**
+   * Return a preconfigured ProcessBuilder for executing the test program.
+   *
+   * @param test The test to get the execution command for.
+   */
+  private ProcessBuilder getExecCommand(LFTest test) throws TestError {
+
+    var srcBasePath = test.getFileConfig().srcPkgPath.resolve("src");
+    var relativePathName = srcBasePath.relativize(test.getFileConfig().srcPath).toString();
+
+    // special case to test docker file generation
+    if (relativePathName.equalsIgnoreCase(TestCategory.DOCKER.getPath())
+        || relativePathName.equalsIgnoreCase(TestCategory.DOCKER_FEDERATED.getPath())) {
+      return getDockerExecCommand(test);
+    } else {
+      LFCommand command = test.getFileConfig().getCommand();
+      if (command == null) {
+        throw new TestError("File: " + test.getFileConfig().getExecutable(), Result.NO_EXEC_FAIL);
+      }
+      return new ProcessBuilder(command.command()).directory(command.directory());
+    }
+  }
+
+  /**
+   * Validate and run the given tests, using the specified configuratator and level.
+   *
+   * <p>While performing tests, this method prints a header that reaches completion once all tests
+   * have been run.
+   *
+   * @param tests A set of tests to run.
+   * @param configurator A procedure for configuring the tests.
+   * @param level The level of testing.
+   * @throws IOException If initial file configuration fails
+   */
+  private void validateAndRun(Set<LFTest> tests, Configurator configurator, TestLevel level)
+      throws IOException {
+    final var x = 78f / tests.size();
+    var marks = 0;
+    var done = 0;
+
+    for (var test : tests) {
+      try {
+        redirectOutputs(test);
+        configure(test, configurator, level);
+        validate(test);
+        if (level.compareTo(TestLevel.CODE_GEN) >= 0) {
+          generateCode(test);
         }
-        while (marks < 78) {
-            System.out.print("=");
-            marks++;
+        if (level == TestLevel.EXECUTION) {
+          execute(test);
         }
-
-        System.out.print(System.lineSeparator());
+        test.markPassed();
+      } catch (TestError e) {
+        test.handleTestError(e);
+      } catch (Throwable e) {
+        test.handleTestError(
+            new TestError("Unknown exception during test execution", Result.TEST_EXCEPTION, e));
+      } finally {
+        restoreOutputs();
+      }
+      done++;
+      while (Math.floor(done * x) >= marks && marks < 78) {
+        System.out.print("=");
+        marks++;
+      }
     }
+    while (marks < 78) {
+      System.out.print("=");
+      marks++;
+    }
+
+    System.out.print(System.lineSeparator());
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/TestError.java b/org.lflang.tests/src/org/lflang/tests/TestError.java
index 0c261c6865..efb7d50048 100644
--- a/org.lflang.tests/src/org/lflang/tests/TestError.java
+++ b/org.lflang.tests/src/org/lflang/tests/TestError.java
@@ -5,24 +5,28 @@
 /// Indicates an error during test execution
 public class TestError extends Exception {
 
-    private Throwable exception;
-    private Result result;
-
-    public TestError(String errorMessage, Result result, Throwable exception) {
-        super(errorMessage);
-        this.exception = exception;
-        this.result = result;
-    }
-
-    public TestError(String errorMessage, Result result) {
-        this(errorMessage, result, null);
-    }
-
-    public TestError(Result result) {
-        this(null, result, null);
-    }
-
-    public Result getResult() {return result;}
-
-    public Throwable getException() {return exception;}
+  private Throwable exception;
+  private Result result;
+
+  public TestError(String errorMessage, Result result, Throwable exception) {
+    super(errorMessage);
+    this.exception = exception;
+    this.result = result;
+  }
+
+  public TestError(String errorMessage, Result result) {
+    this(errorMessage, result, null);
+  }
+
+  public TestError(Result result) {
+    this(null, result, null);
+  }
+
+  public Result getResult() {
+    return result;
+  }
+
+  public Throwable getException() {
+    return exception;
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/TestRegistry.java b/org.lflang.tests/src/org/lflang/tests/TestRegistry.java
index 1249ea25be..2c59740e0a 100644
--- a/org.lflang.tests/src/org/lflang/tests/TestRegistry.java
+++ b/org.lflang.tests/src/org/lflang/tests/TestRegistry.java
@@ -18,12 +18,10 @@
 import java.util.Set;
 import java.util.Stack;
 import java.util.TreeSet;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-
 import org.lflang.LFResourceProvider;
 import org.lflang.LFStandaloneSetup;
 import org.lflang.Target;
@@ -37,378 +35,349 @@
  */
 public class TestRegistry {
 
-    static class TestMap {
-        /**
-         * Registry that maps targets to maps from categories to sets of tests.
-         */
-        protected final Map<Target,
-                Map<TestCategory, Set<LFTest>>> map = new HashMap<>();
-
-        /**
-         * Create a new test map.
-         */
-        public TestMap() {
-            // Populate the internal datastructures.
-            for (Target target : Target.values()) {
-                Map<TestCategory, Set<LFTest>> categories = new HashMap<>();
-                for (TestCategory cat : TestCategory.values()) {
-                    categories.put(cat, new TreeSet<>());
-                }
-                map.put(target, categories);
-            }
-        }
-
-        /**
-         * Return a set of tests given a target and test category.
-         * @param t The target.
-         * @param c The test category.
-         * @return A set of tests for the given target and test category.
-         */
-        public Set<LFTest> getTests(Target t, TestCategory c) {
-            return this.map.get(t).get(c);
+  static class TestMap {
+    /** Registry that maps targets to maps from categories to sets of tests. */
+    protected final Map<Target, Map<TestCategory, Set<LFTest>>> map = new HashMap<>();
+
+    /** Create a new test map. */
+    public TestMap() {
+      // Populate the internal datastructures.
+      for (Target target : Target.values()) {
+        Map<TestCategory, Set<LFTest>> categories = new HashMap<>();
+        for (TestCategory cat : TestCategory.values()) {
+          categories.put(cat, new TreeSet<>());
         }
+        map.put(target, categories);
+      }
     }
 
     /**
-     * List of directories that should be skipped when indexing test files. Any
-     * test file that has a directory in its path that matches an entry in this
-     * array will not be discovered.
-     */
-    public static final String[] IGNORED_DIRECTORIES = {"failing", "knownfailed", "failed", "fed-gen"};
-
-    /**
-     * Path to the root of the repository.
-     */
-    public static final Path LF_REPO_PATH = Paths.get("").toAbsolutePath();
-
-    /**
-     * Path to the test directory in the repository.
+     * Return a set of tests given a target and test category.
+     *
+     * @param t The target.
+     * @param c The test category.
+     * @return A set of tests for the given target and test category.
      */
-    public static final Path LF_TEST_PATH = LF_REPO_PATH.resolve("test");
+    public Set<LFTest> getTests(Target t, TestCategory c) {
+      return this.map.get(t).get(c);
+    }
+  }
+
+  /**
+   * List of directories that should be skipped when indexing test files. Any test file that has a
+   * directory in its path that matches an entry in this array will not be discovered.
+   */
+  public static final String[] IGNORED_DIRECTORIES = {
+    "failing", "knownfailed", "failed", "fed-gen"
+  };
+
+  /** Path to the root of the repository. */
+  public static final Path LF_REPO_PATH = Paths.get("").toAbsolutePath();
+
+  /** Path to the test directory in the repository. */
+  public static final Path LF_TEST_PATH = LF_REPO_PATH.resolve("test");
+
+  /** Internal data structure that stores registered tests. */
+  protected static final TestMap registered = new TestMap();
+
+  /**
+   * Internal data structure that stores ignored tests. For instance, source files with no main
+   * reactor are indexed here.
+   */
+  protected static final TestMap ignored = new TestMap();
+
+  /**
+   * A map from each test category to a set of tests that is the union of all registered tests in
+   * that category across all targets.
+   */
+  protected static final Map<TestCategory, Set<LFTest>> allTargets = new HashMap<>();
+
+  /**
+   * Enumeration of test categories, used to map tests to categories. The nearest containing
+   * directory that matches any of the categories will determine the category that the test is
+   * mapped to. Matching is case insensitive.
+   *
+   * <p>For example, the following files will all map to THREADED:
+   *
+   * <ul>
+   *   <li>C/threaded/Foo.lf
+   *   <li>C/THREADED/Foo.lf
+   *   <li>C/Threaded/Foo.lf
+   *   <li>C/foo/threaded/Bar.lf
+   *   <li>C/foo/bar/threaded/Threaded.lf
+   *   <li>C/federated/threaded/bar.lf but the following will not:
+   *   <li>C/Foo.lf (maps to COMMON)
+   *   <li>C/Threaded.lf (maps to COMMON)
+   *   <li>C/threaded/federated/foo.lf (maps to FEDERATED)
+   * </ul>
+   *
+   * @author Marten Lohstroh
+   */
+  public enum TestCategory {
+    /** Tests about concurrent execution. */
+    CONCURRENT(true),
+    /** Test about enclaves */
+    ENCLAVE(false),
+    /** Generic tests, ie, tests that all targets are supposed to implement. */
+    GENERIC(true),
+    /** Tests about generics, not to confuse with {@link #GENERIC}. */
+    GENERICS(true),
+    /** Tests about multiports and banks of reactors. */
+    MULTIPORT(true),
+    /** Tests about federated execution. */
+    FEDERATED(true),
+    /** Tests about specific target properties. */
+    PROPERTIES(true),
+    /** Tests concerning modal reactors */
+    MODAL_MODELS(true),
+    NO_INLINING(false),
+    // non-shared tests
+    DOCKER(true),
+    DOCKER_FEDERATED(true, "docker" + File.separator + "federated"),
+    SERIALIZATION(false),
+    ARDUINO(false, TestLevel.BUILD),
+    ZEPHYR(false, TestLevel.BUILD),
+    TARGET(false);
+
+    /** Whether we should compare coverage against other targets. */
+    public final boolean isCommon;
+
+    public final String path;
+    public final TestLevel level;
+
+    /** Create a new test category. */
+    TestCategory(boolean isCommon) {
+      this.isCommon = isCommon;
+      this.path = this.name().toLowerCase();
+      this.level = TestLevel.EXECUTION;
+    }
 
-    /**
-     * Internal data structure that stores registered tests.
-     */
-    protected static final TestMap registered = new TestMap();
+    /** Create a new test category. */
+    TestCategory(boolean isCommon, TestLevel level) {
+      this.isCommon = isCommon;
+      this.path = this.name().toLowerCase();
+      this.level = level;
+    }
 
-    /**
-     * Internal data structure that stores ignored tests. For instance,
-     * source files with no main reactor are indexed here.
-     */
-    protected static final TestMap ignored = new TestMap();
+    /** Create a new test category. */
+    TestCategory(boolean isCommon, String path) {
+      this.isCommon = isCommon;
+      this.path = path;
+      this.level = TestLevel.EXECUTION;
+    }
 
-    /**
-     * A map from each test category to a set of tests that is the union of
-     * all registered tests in that category across all targets.
-     */
-    protected static final Map<TestCategory, Set<LFTest>> allTargets = new HashMap<>();
+    public String getPath() {
+      return path;
+    }
 
     /**
-     * Enumeration of test categories, used to map tests to categories. The
-     * nearest containing directory that matches any of the categories will
-     * determine the category that the test is mapped to. Matching is case
-     * insensitive.
-     *
-     * For example, the following files will all map to THREADED:
-     * <ul>
-     * <li>C/threaded/Foo.lf</li>
-     * <li>C/THREADED/Foo.lf</li>
-     * <li>C/Threaded/Foo.lf</li>
-     * <li>C/foo/threaded/Bar.lf</li>
-     * <li>C/foo/bar/threaded/Threaded.lf</li>
-     * <li>C/federated/threaded/bar.lf
-     * but the following will not:</li>
-     * <li>C/Foo.lf (maps to COMMON)</li>
-     * <li>C/Threaded.lf (maps to COMMON)</li>
-     * <li>C/threaded/federated/foo.lf (maps to FEDERATED)</li>
-     * </ul>
+     * Return a header associated with the category.
      *
-     * @author Marten Lohstroh
+     * @return A header to print in the test report.
      */
-    public enum TestCategory {
-        /** Tests about concurrent execution. */
-        CONCURRENT(true),
-        /** Test about enclaves */
-        ENCLAVE(false),
-        /** Generic tests, ie, tests that all targets are supposed to implement. */
-        GENERIC(true),
-        /** Tests about generics, not to confuse with {@link #GENERIC}. */
-        GENERICS(true),
-        /** Tests about multiports and banks of reactors. */
-        MULTIPORT(true),
-        /** Tests about federated execution. */
-        FEDERATED(true),
-        /** Tests about specific target properties. */
-        PROPERTIES(true),
-        /** Tests concerning modal reactors */
-        MODAL_MODELS(true),
-        NO_INLINING(false),
-        // non-shared tests
-        DOCKER(true),
-        DOCKER_FEDERATED(true, "docker" + File.separator + "federated"),
-        SERIALIZATION(false),
-        ARDUINO(false, TestLevel.BUILD),
-        ZEPHYR(false, TestLevel.BUILD),
-        TARGET(false);
-
-        /**
-         * Whether we should compare coverage against other targets.
-         */
-        public final boolean isCommon;
-        public final String path;
-        public final TestLevel level ;
-
-        /**
-         * Create a new test category.
-         */
-        TestCategory(boolean isCommon) {
-            this.isCommon = isCommon;
-            this.path = this.name().toLowerCase();
-            this.level = TestLevel.EXECUTION;
-        }
-
-        /**
-         * Create a new test category.
-         */
-        TestCategory(boolean isCommon, TestLevel level) {
-            this.isCommon = isCommon;
-            this.path = this.name().toLowerCase();
-            this.level = level;
-        }
-
-        /**
-         * Create a new test category.
-         */
-        TestCategory(boolean isCommon, String path) {
-            this.isCommon = isCommon;
-            this.path = path;
-            this.level = TestLevel.EXECUTION;
-        }
-
-        public String getPath() {
-            return path;
-        }
-
-        /**
-         * Return a header associated with the category.
-         *
-         * @return A header to print in the test report.
-         */
-        public String getHeader() {
-            return TestBase.THICK_LINE + "Category: " + this.name();
-        }
+    public String getHeader() {
+      return TestBase.THICK_LINE + "Category: " + this.name();
     }
-
-    // Static code that performs the file system traversal and discovers
-    // all .lf files to be included in the registry.
-    static {
-        System.out.println("Indexing...");
-        ResourceSet rs = new LFStandaloneSetup()
+  }
+
+  // Static code that performs the file system traversal and discovers
+  // all .lf files to be included in the registry.
+  static {
+    System.out.println("Indexing...");
+    ResourceSet rs =
+        new LFStandaloneSetup()
             .createInjectorAndDoEMFRegistration()
-            .getInstance(LFResourceProvider.class).getResourceSet();
+            .getInstance(LFResourceProvider.class)
+            .getResourceSet();
 
-        // Prepare for the collection of tests per category.
-        for (TestCategory t: TestCategory.values()) {
-            allTargets.put(t, new TreeSet<>());
-        }
-        // Populate the registry.
-        for (Target target : Target.values()) {
-
-            // Walk the tree.
-            try {
-                Path dir = LF_TEST_PATH.resolve(target.getDirectoryName()).resolve("src");
-                if (Files.exists(dir)) {
-                    new TestDirVisitor(rs, target, dir).walk();
-                } else {
-                    System.out.println("WARNING: No test directory for target " + target + "\n");
-                }
-
-            } catch (IOException e) {
-                System.err.println(
-                        "ERROR: Caught exception while indexing tests for target " + target);
-                e.printStackTrace();
-            }
-            // Record the tests for later use when reporting coverage.
-            Arrays.asList(TestCategory.values()).forEach(
-                    c -> allTargets.get(c).addAll(getRegisteredTests(target, c, false)));
+    // Prepare for the collection of tests per category.
+    for (TestCategory t : TestCategory.values()) {
+      allTargets.put(t, new TreeSet<>());
+    }
+    // Populate the registry.
+    for (Target target : Target.values()) {
+
+      // Walk the tree.
+      try {
+        Path dir = LF_TEST_PATH.resolve(target.getDirectoryName()).resolve("src");
+        if (Files.exists(dir)) {
+          new TestDirVisitor(rs, target, dir).walk();
+        } else {
+          System.out.println("WARNING: No test directory for target " + target + "\n");
         }
+
+      } catch (IOException e) {
+        System.err.println("ERROR: Caught exception while indexing tests for target " + target);
+        e.printStackTrace();
+      }
+      // Record the tests for later use when reporting coverage.
+      Arrays.asList(TestCategory.values())
+          .forEach(c -> allTargets.get(c).addAll(getRegisteredTests(target, c, false)));
+    }
+  }
+
+  /**
+   * Calling this function forces the lazy initialization of the static code that indexes all files.
+   * It is advisable to do this prior to executing other code that prints to standard out so that
+   * any error messages printed while indexing are printed first.
+   */
+  public static void initialize() {}
+
+  /**
+   * Return the tests that were indexed for a given target and category.
+   *
+   * @param target The target to get indexed tests for.
+   * @param category The category of tests to include in the returned tests.
+   * @param copy Whether to return copies of the indexed tests instead of the indexed tests
+   *     themselves.
+   * @return A set of tests for the given target/category.
+   */
+  public static Set<LFTest> getRegisteredTests(Target target, TestCategory category, boolean copy) {
+    if (copy) {
+      Set<LFTest> copies = new TreeSet<>();
+      for (LFTest test : registered.getTests(target, category)) {
+        copies.add(new LFTest(test));
+      }
+      return copies;
+    } else {
+      return registered.getTests(target, category);
+    }
+  }
+
+  /** Return the test that were found but not indexed because they did not have a main reactor. */
+  public static Set<LFTest> getIgnoredTests(Target target, TestCategory category) {
+    return ignored.getTests(target, category);
+  }
+
+  public static String getCoverageReport(Target target, TestCategory category) {
+    StringBuilder s = new StringBuilder();
+    Set<LFTest> ignored = TestRegistry.getIgnoredTests(target, category);
+    s.append(TestBase.THIN_LINE);
+    s.append("Ignored: ").append(ignored.size()).append("\n");
+    s.append(TestBase.THIN_LINE);
+
+    for (LFTest test : ignored) {
+      s.append("No main reactor in: ").append(test).append("\n");
     }
 
-    /**
-     * Calling this function forces the lazy initialization of the static code
-     * that indexes all files. It is advisable to do this prior to executing
-     * other code that prints to standard out so that any error messages
-     * printed while indexing are printed first.
-     */
-    public static void initialize() {}
+    Set<LFTest> own = getRegisteredTests(target, category, false);
+    if (category.isCommon) {
+      Set<LFTest> all = allTargets.get(category);
+      s.append("\n").append(TestBase.THIN_LINE);
+      s.append("Covered: ").append(own.size()).append("/").append(all.size()).append("\n");
+      s.append(TestBase.THIN_LINE);
+      int missing = all.size() - own.size();
+      if (missing > 0) {
+        all.stream()
+            .filter(test -> !own.contains(test))
+            .forEach(test -> s.append("Missing: ").append(test).append("\n"));
+      }
+    } else {
+      s.append("\n").append(TestBase.THIN_LINE);
+      s.append("Covered: ").append(own.size()).append("/").append(own.size()).append("\n");
+      s.append(TestBase.THIN_LINE);
+    }
+    return s.toString();
+  }
+
+  /**
+   * FileVisitor implementation that maintains a stack to map found tests to the appropriate
+   * category and excludes directories that are listed as "ignored" from walks.
+   *
+   * <p>Specifically, when a directory is encountered that matches a category, this category is
+   * pushed onto the stack. Similarly, when the DFS leaves such a directory, its corresponding
+   * category is popped from the stack. Any test (*.lf) file that is encountered will be mapped to
+   * the category that is on top of the stack. Initially, the stack has one element that is
+   * TestCategory.COMMON, meaning that test files in the top-level test directory for a given target
+   * will be mapped to that category.
+   *
+   * @author Marten Lohstroh
+   */
+  public static class TestDirVisitor extends SimpleFileVisitor<Path> {
+
+    /** The stack of which the top element indicates the "current" category. */
+    protected Stack<TestCategory> stack = new Stack<>();
+
+    /** The target that all encountered tests belong to. */
+    protected Target target;
+
+    protected ResourceSet rs;
+
+    protected Path srcBasePath;
 
     /**
-     * Return the tests that were indexed for a given target and category.
+     * Create a new file visitor based on a given target.
      *
-     * @param target The target to get indexed tests for.
-     * @param category The category of tests to include in the returned tests.
-     * @param copy Whether to return copies of the indexed tests instead of the indexed tests themselves.
-     * @return A set of tests for the given target/category.
+     * @param target The target that all encountered tests belong to.
+     * @param srcBasePath The test sources directory
      */
-    public static Set<LFTest> getRegisteredTests(Target target,
-            TestCategory category, boolean copy) {
-        if (copy) {
-            Set<LFTest> copies = new TreeSet<>();
-            for (LFTest test : registered.getTests(target, category)) {
-                copies.add(new LFTest(test));
-            }
-            return copies;
-        } else {
-            return registered.getTests(target, category);
-        }
+    public TestDirVisitor(ResourceSet rs, Target target, Path srcBasePath) {
+      stack.push(TestCategory.GENERIC);
+      this.rs = rs;
+      this.target = target;
+      this.srcBasePath = srcBasePath;
     }
 
     /**
-     * Return the test that were found but not indexed because they did not
-     * have a main reactor.
+     * Push categories onto the stack as appropriate and skip directories that should be ignored.
      */
-    public static Set<LFTest> getIgnoredTests(Target target, TestCategory category) {
-        return ignored.getTests(target, category);
-    }
-
-    public static String getCoverageReport(Target target, TestCategory category) {
-        StringBuilder s = new StringBuilder();
-        Set<LFTest> ignored = TestRegistry.getIgnoredTests(target, category);
-        s.append(TestBase.THIN_LINE);
-        s.append("Ignored: ").append(ignored.size()).append("\n");
-        s.append(TestBase.THIN_LINE);
-
-        for (LFTest test : ignored) {
-            s.append("No main reactor in: ").append(test).append("\n");
+    @Override
+    public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
+      for (String ignored : IGNORED_DIRECTORIES) {
+        if (dir.getFileName().toString().equalsIgnoreCase(ignored)) {
+          return SKIP_SUBTREE;
         }
+      }
+      for (TestCategory category : TestCategory.values()) {
+        var relativePathName = srcBasePath.relativize(dir).toString();
+        if (relativePathName.equalsIgnoreCase(category.getPath())) {
+          stack.push(category);
+        }
+      }
+      return CONTINUE;
+    }
 
-        Set<LFTest> own = getRegisteredTests(target, category, false);
-        if (category.isCommon) {
-            Set<LFTest> all = allTargets.get(category);
-            s.append("\n").append(TestBase.THIN_LINE);
-            s.append("Covered: ").append(own.size()).append("/").append(all.size()).append("\n");
-            s.append(TestBase.THIN_LINE);
-            int missing = all.size() - own.size();
-            if (missing > 0) {
-                all.stream().filter(test -> !own.contains(test))
-                        .forEach(test -> s.append("Missing: ").append(test).append("\n"));
-            }
-        } else {
-            s.append("\n").append(TestBase.THIN_LINE);
-            s.append("Covered: ").append(own.size()).append("/").append(own.size()).append("\n");
-            s.append(TestBase.THIN_LINE);
+    /** Pop categories from the stack as appropriate. */
+    @Override
+    public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
+      for (TestCategory category : TestCategory.values()) {
+        var relativePathName = srcBasePath.relativize(dir).toString();
+        if (relativePathName.equalsIgnoreCase(category.getPath())) {
+          this.stack.pop();
         }
-        return s.toString();
+      }
+      return CONTINUE;
     }
 
     /**
-     * FileVisitor implementation that maintains a stack to map found tests to
-     * the appropriate category and excludes directories that are listed as
-     * "ignored" from walks.
-     *
-     * Specifically, when a directory is encountered that matches a category,
-     * this category is pushed onto the stack. Similarly, when the DFS leaves
-     * such a directory, its corresponding category is popped from the stack.
-     * Any test (*.lf) file that is encountered will be mapped to the category
-     * that is on top of the stack. Initially, the stack has one element that
-     * is TestCategory.COMMON, meaning that test files in the top-level test
-     * directory for a given target will be mapped to that category.
-     *
-     * @author Marten Lohstroh
+     * Add test files to the registry if they end with ".lf", but only if they have a main reactor.
      */
-    public static class TestDirVisitor extends SimpleFileVisitor<Path> {
-
-        /**
-         * The stack of which the top element indicates the "current" category.
-         */
-        protected Stack<TestCategory> stack = new Stack<>();
-
-        /**
-         * The target that all encountered tests belong to.
-         */
-        protected Target target;
-
-        protected ResourceSet rs;
-
-        protected Path srcBasePath;
-
-        /**
-         * Create a new file visitor based on a given target.
-         *
-         * @param target The target that all encountered tests belong to.
-         * @param srcBasePath The test sources directory
-         */
-        public TestDirVisitor(ResourceSet rs, Target target, Path srcBasePath) {
-            stack.push(TestCategory.GENERIC);
-            this.rs = rs;
-            this.target = target;
-            this.srcBasePath = srcBasePath;
+    @Override
+    public FileVisitResult visitFile(Path path, BasicFileAttributes attr) {
+      if (attr.isRegularFile() && path.toString().endsWith(".lf")) {
+        // Try to parse the file.
+        Resource r = rs.getResource(URI.createFileURI(path.toFile().getAbsolutePath()), true);
+        // FIXME: issue warning if target doesn't match!
+        LFTest test = new LFTest(target, path);
+
+        Iterator<Reactor> reactors = IteratorExtensions.filter(r.getAllContents(), Reactor.class);
+
+        if (r.getErrors().isEmpty()
+            && !IteratorExtensions.exists(reactors, it -> it.isMain() || it.isFederated())) {
+          // If the test compiles but doesn't have a main reactor,
+          // _do not add the file_. We assume it is a library
+          // file.
+          ignored.getTests(this.target, this.stack.peek()).add(test);
+          return CONTINUE;
         }
 
-        /**
-         * Push categories onto the stack as appropriate and skip directories
-         * that should be ignored.
-         */
-        @Override
-        public FileVisitResult preVisitDirectory(Path dir,
-                BasicFileAttributes attrs) {
-            for (String ignored : IGNORED_DIRECTORIES) {
-                if (dir.getFileName().toString().equalsIgnoreCase(ignored)) {
-                    return SKIP_SUBTREE;
-                }
-            }
-            for (TestCategory category : TestCategory.values()) {
-                var relativePathName = srcBasePath.relativize(dir).toString();
-                if (relativePathName.equalsIgnoreCase(category.getPath())) {
-                    stack.push(category);
-                }
-            }
-            return CONTINUE;
-        }
-
-        /**
-         * Pop categories from the stack as appropriate.
-         */
-        @Override
-        public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
-            for (TestCategory category : TestCategory.values()) {
-                var relativePathName = srcBasePath.relativize(dir).toString();
-                if (relativePathName.equalsIgnoreCase(category.getPath())) {
-                    this.stack.pop();
-                }
-            }
-            return CONTINUE;
-        }
-
-        /**
-         * Add test files to the registry if they end with ".lf", but only if they have a main reactor.
-         */
-        @Override
-        public FileVisitResult visitFile(Path path, BasicFileAttributes attr) {
-            if (attr.isRegularFile() && path.toString().endsWith(".lf")) {
-                // Try to parse the file.
-                Resource r = rs.getResource(URI.createFileURI(path.toFile().getAbsolutePath()),true);
-                // FIXME: issue warning if target doesn't match!
-                LFTest test = new LFTest(target, path);
-
-                Iterator<Reactor> reactors = IteratorExtensions.filter(r.getAllContents(), Reactor.class);
-
-                if (r.getErrors().isEmpty() && !IteratorExtensions.exists(reactors,
-                    it -> it.isMain() || it.isFederated())) {
-                    // If the test compiles but doesn't have a main reactor,
-                    // _do not add the file_. We assume it is a library
-                    // file.
-                    ignored.getTests(this.target, this.stack.peek()).add(test);
-                    return CONTINUE;
-                }
-
-                registered.getTests(this.target, this.stack.peek()).add(test);
-            }
-            return CONTINUE;
-        }
+        registered.getTests(this.target, this.stack.peek()).add(test);
+      }
+      return CONTINUE;
+    }
 
-        public void walk() throws IOException {
-            Files.walkFileTree(srcBasePath, this);
-        }
+    public void walk() throws IOException {
+      Files.walkFileTree(srcBasePath, this);
     }
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/TestUtils.java b/org.lflang.tests/src/org/lflang/tests/TestUtils.java
index c868acb771..9e7cb4218a 100644
--- a/org.lflang.tests/src/org/lflang/tests/TestUtils.java
+++ b/org.lflang.tests/src/org/lflang/tests/TestUtils.java
@@ -31,7 +31,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.function.Predicate;
-
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
@@ -41,139 +40,136 @@
  */
 public class TestUtils {
 
-    private static Matcher<Path> pathMatcher(String description, Predicate<Path> predicate) {
-        return new BaseMatcher<>() {
-            @Override
-            public boolean matches(Object item) {
-                return item instanceof Path && predicate.test((Path) item);
-            }
-
-            @Override
-            public void describeTo(Description describer) {
-                describer.appendText(description);
-            }
-        };
+  private static Matcher<Path> pathMatcher(String description, Predicate<Path> predicate) {
+    return new BaseMatcher<>() {
+      @Override
+      public boolean matches(Object item) {
+        return item instanceof Path && predicate.test((Path) item);
+      }
+
+      @Override
+      public void describeTo(Description describer) {
+        describer.appendText(description);
+      }
+    };
+  }
+
+  public static Matcher<Path> isDirectory() {
+    return pathMatcher("is a directory", Files::isDirectory);
+  }
+
+  public static Matcher<Path> isRegularFile() {
+    return pathMatcher("is a regular file", Files::isRegularFile);
+  }
+
+  public static Matcher<Path> exists() {
+    return pathMatcher("exists", Files::exists);
+  }
+
+  /** Builder for a directory. Useful to create a fake LF project. */
+  public static class TempDirBuilder {
+
+    private final Path curDir;
+
+    private TempDirBuilder(Path path) {
+      this.curDir = path;
+      if (!Files.isDirectory(path)) {
+        throw new IllegalArgumentException("Not a directory: " + path);
+      }
     }
 
-    public static Matcher<Path> isDirectory() {
-        return pathMatcher("is a directory", Files::isDirectory);
+    public static TempDirBuilder dirBuilder(Path path) {
+      return new TempDirBuilder(path);
     }
 
-    public static Matcher<Path> isRegularFile() {
-        return pathMatcher("is a regular file", Files::isRegularFile);
+    /** Create a directory at the given path. Return a new temp dir builder for that subdir. */
+    public TempDirBuilder cd(String relativePath) throws IOException {
+      Path relPath = Paths.get(relativePath);
+      if (relPath.isAbsolute()) {
+        throw new IllegalArgumentException("Should be a relative path: " + relativePath);
+      }
+      Path dir = curDir.resolve(relPath);
+      Files.createDirectories(dir);
+      return new TempDirBuilder(dir);
     }
 
-    public static Matcher<Path> exists() {
-        return pathMatcher("exists", Files::exists);
+    /** Create a directory at the given path. Return this instance. */
+    public TempDirBuilder mkdirs(String relativePath) throws IOException {
+      Path relPath = Paths.get(relativePath);
+      if (relPath.isAbsolute()) {
+        throw new IllegalArgumentException("Should be a relative path: " + relativePath);
+      }
+      Path dir = curDir.resolve(relPath);
+      Files.createDirectories(dir);
+      return this;
     }
 
-    /**
-     * Builder for a directory. Useful to create a fake LF project.
-     */
-    public static class TempDirBuilder {
-
-        private final Path curDir;
-
-        private TempDirBuilder(Path path) {
-            this.curDir = path;
-            if (!Files.isDirectory(path)) {
-                throw new IllegalArgumentException("Not a directory: " + path);
-            }
-        }
-
-        public static TempDirBuilder dirBuilder(Path path) {
-            return new TempDirBuilder(path);
-        }
-
-        /** Create a directory at the given path. Return a new temp dir builder for that subdir. */
-        public TempDirBuilder cd(String relativePath) throws IOException {
-            Path relPath = Paths.get(relativePath);
-            if (relPath.isAbsolute()) {
-                throw new IllegalArgumentException("Should be a relative path: " + relativePath);
-            }
-            Path dir = curDir.resolve(relPath);
-            Files.createDirectories(dir);
-            return new TempDirBuilder(dir);
-        }
-
-        /** Create a directory at the given path. Return this instance. */
-        public TempDirBuilder mkdirs(String relativePath) throws IOException {
-            Path relPath = Paths.get(relativePath);
-            if (relPath.isAbsolute()) {
-                throw new IllegalArgumentException("Should be a relative path: " + relativePath);
-            }
-            Path dir = curDir.resolve(relPath);
-            Files.createDirectories(dir);
-            return this;
-        }
-
-        /** Create a file in the given subpath. Return this instance. */
-        public TempDirBuilder file(String relativePath, String contents) throws IOException {
-            Path relPath = Paths.get(relativePath);
-            if (relPath.isAbsolute()) {
-                throw new IllegalArgumentException("Should be a relative path: " + relativePath);
-            }
-            Path filePath = curDir.resolve(relPath);
-            Files.createDirectories(filePath.getParent());
-            Files.writeString(filePath, contents);
-            return this;
-        }
+    /** Create a file in the given subpath. Return this instance. */
+    public TempDirBuilder file(String relativePath, String contents) throws IOException {
+      Path relPath = Paths.get(relativePath);
+      if (relPath.isAbsolute()) {
+        throw new IllegalArgumentException("Should be a relative path: " + relativePath);
+      }
+      Path filePath = curDir.resolve(relPath);
+      Files.createDirectories(filePath.getParent());
+      Files.writeString(filePath, contents);
+      return this;
+    }
+  }
+
+  /** Builder for a directory. Useful to create a fake LF project. */
+  public static class TempDirChecker {
+
+    private final Path curDir;
+
+    private TempDirChecker(Path path) {
+      this.curDir = path;
+      if (!Files.isDirectory(path)) {
+        throw new IllegalArgumentException("Not a directory: " + path);
+      }
+    }
+
+    public static TempDirChecker dirChecker(Path path) {
+      return new TempDirChecker(path);
+    }
+
+    /** Create a directory at the given path. Return a new temp dir builder for that subdir. */
+    public TempDirBuilder cd(String relativePath) throws IOException {
+      Path relPath = Paths.get(relativePath);
+      if (relPath.isAbsolute()) {
+        throw new IllegalArgumentException("Should be a relative path: " + relativePath);
+      }
+      Path dir = curDir.resolve(relPath);
+      Files.createDirectories(dir);
+      return new TempDirBuilder(dir);
     }
 
     /**
-     * Builder for a directory. Useful to create a fake LF project.
+     * Check the contents of the file match the matcher. The file should be a UTF-8 encoded text
+     * file. Return this instance.
      */
-    public static class TempDirChecker {
-
-        private final Path curDir;
-
-        private TempDirChecker(Path path) {
-            this.curDir = path;
-            if (!Files.isDirectory(path)) {
-                throw new IllegalArgumentException("Not a directory: " + path);
-            }
-        }
-
-        public static TempDirChecker dirChecker(Path path) {
-            return new TempDirChecker(path);
-        }
-
-        /** Create a directory at the given path. Return a new temp dir builder for that subdir. */
-        public TempDirBuilder cd(String relativePath) throws IOException {
-            Path relPath = Paths.get(relativePath);
-            if (relPath.isAbsolute()) {
-                throw new IllegalArgumentException("Should be a relative path: " + relativePath);
-            }
-            Path dir = curDir.resolve(relPath);
-            Files.createDirectories(dir);
-            return new TempDirBuilder(dir);
-        }
-
-        /**
-         * Check the contents of the file match the matcher.
-         * The file should be a UTF-8 encoded text file. Return
-         * this instance.
-         */
-        public TempDirChecker checkContentsOf(String relativePath, Matcher<? super String> contentsMatcher) throws IOException {
-            Path relPath = Paths.get(relativePath);
-            if (relPath.isAbsolute()) {
-                throw new IllegalArgumentException("Should be a relative path: " + relativePath);
-            }
-            Path filePath = curDir.resolve(relPath);
-
-            assertThat(Files.readString(filePath), contentsMatcher);
-            return this;
-        }
-
-        public TempDirChecker check(String relativePath, Matcher<? super Path> pathMatcher) throws IOException {
-            Path relPath = Paths.get(relativePath);
-            if (relPath.isAbsolute()) {
-                throw new IllegalArgumentException("Should be a relative path: " + relativePath);
-            }
-            Path filePath = curDir.resolve(relPath);
-
-            assertThat(filePath, pathMatcher);
-            return this;
-        }
+    public TempDirChecker checkContentsOf(
+        String relativePath, Matcher<? super String> contentsMatcher) throws IOException {
+      Path relPath = Paths.get(relativePath);
+      if (relPath.isAbsolute()) {
+        throw new IllegalArgumentException("Should be a relative path: " + relativePath);
+      }
+      Path filePath = curDir.resolve(relPath);
+
+      assertThat(Files.readString(filePath), contentsMatcher);
+      return this;
+    }
+
+    public TempDirChecker check(String relativePath, Matcher<? super Path> pathMatcher)
+        throws IOException {
+      Path relPath = Paths.get(relativePath);
+      if (relPath.isAbsolute()) {
+        throw new IllegalArgumentException("Should be a relative path: " + relativePath);
+      }
+      Path filePath = curDir.resolve(relPath);
+
+      assertThat(filePath, pathMatcher);
+      return this;
     }
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/cli/CliToolTestFixture.java b/org.lflang.tests/src/org/lflang/tests/cli/CliToolTestFixture.java
index 83e7817618..257da7ad06 100644
--- a/org.lflang.tests/src/org/lflang/tests/cli/CliToolTestFixture.java
+++ b/org.lflang.tests/src/org/lflang/tests/cli/CliToolTestFixture.java
@@ -32,130 +32,108 @@
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.nio.file.Path;
-import java.util.concurrent.Callable;
-import java.util.function.Consumer;
-
 import org.hamcrest.Matcher;
-import org.opentest4j.AssertionFailedError;
-
 import org.lflang.cli.Io;
+import org.opentest4j.AssertionFailedError;
 
 /**
- * Test utilities for a CLI tool, eg {@link org.lflang.cli.Lfc},
- * {@link org.lflang.cli.Lff}.
+ * Test utilities for a CLI tool, eg {@link org.lflang.cli.Lfc}, {@link org.lflang.cli.Lff}.
  *
  * @author Clément Fournier
  */
 abstract class CliToolTestFixture {
 
-    /**
-     * Override to call the relevant main.
-     */
-    protected abstract void runCliProgram(Io io, String[] args);
-
-
-    /**
-     * Run the tool with the given arguments, in the system
-     * working directory.
-     *
-     * @param args Arguments
-     * @return The execution result
-     */
-    public ExecutionResult run(String... args) {
-        return run(Io.SYSTEM.getWd(), args);
+  /** Override to call the relevant main. */
+  protected abstract void runCliProgram(Io io, String[] args);
+
+  /**
+   * Run the tool with the given arguments, in the system working directory.
+   *
+   * @param args Arguments
+   * @return The execution result
+   */
+  public ExecutionResult run(String... args) {
+    return run(Io.SYSTEM.getWd(), args);
+  }
+
+  /**
+   * Run the tool with the given arguments, in the given working directory.
+   *
+   * @param wd working directory
+   * @param args Arguments
+   * @return The execution result
+   */
+  public ExecutionResult run(Path wd, String... args) {
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    ByteArrayOutputStream err = new ByteArrayOutputStream();
+
+    Io testIo = new Io(new PrintStream(err), new PrintStream(out), wd);
+    int exitCode = testIo.fakeSystemExit(io -> runCliProgram(io, args));
+
+    return new ExecutionResult(out, err, exitCode);
+  }
+
+  /**
+   * The result of an execution of a CLI program like LFC.
+   *
+   * @param out Output stream
+   * @param err Error stream
+   * @param exitCode Exit code of the process
+   */
+  record ExecutionResult(ByteArrayOutputStream out, ByteArrayOutputStream err, int exitCode) {
+
+    public String getOut() {
+      return out.toString();
     }
 
-    /**
-     * Run the tool with the given arguments, in the given
-     * working directory.
-     *
-     * @param wd working directory
-     * @param args Arguments
-     * @return The execution result
-     */
-    public ExecutionResult run(Path wd, String... args) {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ByteArrayOutputStream err = new ByteArrayOutputStream();
-
-        Io testIo = new Io(
-            new PrintStream(err),
-            new PrintStream(out),
-            wd
-        );
-        int exitCode = testIo.fakeSystemExit(io -> runCliProgram(io, args));
-
-        return new ExecutionResult(out, err, exitCode);
+    public String getErr() {
+      return err.toString();
     }
 
-    /**
-     * The result of an execution of a CLI program like LFC.
-     *
-     * @param out Output stream
-     * @param err Error stream
-     * @param exitCode Exit code of the process
-     */
-    record ExecutionResult(
-        ByteArrayOutputStream out,
-        ByteArrayOutputStream err,
-        int exitCode
-    ) {
-
-        public String getOut() {
-            return out.toString();
-        }
-
-        public String getErr() {
-            return err.toString();
-        }
-
-
-        public void checkOk() {
-            assertEquals(0, exitCode);
-        }
+    public void checkOk() {
+      assertEquals(0, exitCode);
+    }
 
-        public void checkFailed() {
-            assertTrue(exitCode > 0);
-        }
+    public void checkFailed() {
+      assertTrue(exitCode > 0);
+    }
 
-        public void checkNoErrorOutput() {
-            checkStdErr(equalTo(""));
-        }
+    public void checkNoErrorOutput() {
+      checkStdErr(equalTo(""));
+    }
 
-        public void checkStdOut(Matcher<? super String> matcher) {
-            assertThat(getOut(), matcher);
-        }
+    public void checkStdOut(Matcher<? super String> matcher) {
+      assertThat(getOut(), matcher);
+    }
 
-        public void checkStdErr(Matcher<? super String> matcher) {
-            assertThat(getErr(), matcher);
-        }
+    public void checkStdErr(Matcher<? super String> matcher) {
+      assertThat(getErr(), matcher);
+    }
 
-        /**
-         * Use this method to wrap assertions.
-         */
-        public void verify(ThrowingConsumer<ExecutionResult> actions) {
-            try {
-                actions.accept(this);
-            } catch (Exception | AssertionFailedError e) {
-                System.out.println("TEST FAILED");
-                System.out.println("> Return code: " + exitCode);
-                System.out.println("> Standard output -------------------------");
-                System.err.println(out.toString());
-                System.out.println("> Standard error --------------------------");
-                System.err.println(err.toString());
-                System.out.println("> -----------------------------------------");
-
-                if (e instanceof Exception) {
-                    throw new AssertionFailedError("Expected no exception to be thrown", e);
-                }
-                throw (AssertionFailedError) e;
-            }
+    /** Use this method to wrap assertions. */
+    public void verify(ThrowingConsumer<ExecutionResult> actions) {
+      try {
+        actions.accept(this);
+      } catch (Exception | AssertionFailedError e) {
+        System.out.println("TEST FAILED");
+        System.out.println("> Return code: " + exitCode);
+        System.out.println("> Standard output -------------------------");
+        System.err.println(out.toString());
+        System.out.println("> Standard error --------------------------");
+        System.err.println(err.toString());
+        System.out.println("> -----------------------------------------");
+
+        if (e instanceof Exception) {
+          throw new AssertionFailedError("Expected no exception to be thrown", e);
         }
+        throw (AssertionFailedError) e;
+      }
+    }
 
+    @FunctionalInterface
+    interface ThrowingConsumer<T> {
 
-        @FunctionalInterface
-        interface ThrowingConsumer<T> {
-
-            void accept(T t) throws Exception;
-        }
+      void accept(T t) throws Exception;
     }
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/cli/LfcCliTest.java b/org.lflang.tests/src/org/lflang/tests/cli/LfcCliTest.java
index d16193faad..d9e81a0e68 100644
--- a/org.lflang.tests/src/org/lflang/tests/cli/LfcCliTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/cli/LfcCliTest.java
@@ -33,15 +33,12 @@
 import static org.lflang.tests.TestUtils.isRegularFile;
 
 import com.google.inject.Injector;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Properties;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
-
 import org.lflang.LocalStrings;
 import org.lflang.cli.Io;
 import org.lflang.cli.Lfc;
@@ -54,16 +51,18 @@
  */
 public class LfcCliTest {
 
-    LfcTestFixture lfcTester = new LfcTestFixture();
+  LfcTestFixture lfcTester = new LfcTestFixture();
 
-    static final String LF_PYTHON_FILE = """
+  static final String LF_PYTHON_FILE =
+      """
         target Python
         main reactor {
             reaction(startup) {==}
         }
         """;
 
-    static final String JSON_STRING = """
+  static final String JSON_STRING =
+      """
         {
             "src": "src/File.lf",
             "out": "src",
@@ -87,230 +86,262 @@ public class LfcCliTest {
         }
         """;
 
-    @Test
-    public void testHelpArg() {
-        lfcTester.run("--help", "--version")
-            .verify(result -> {
-                result.checkOk();
-                result.checkNoErrorOutput();
-                result.checkStdOut(containsString("Usage: lfc"));
+  @Test
+  public void testHelpArg() {
+    lfcTester
+        .run("--help", "--version")
+        .verify(
+            result -> {
+              result.checkOk();
+              result.checkNoErrorOutput();
+              result.checkStdOut(containsString("Usage: lfc"));
             });
-    }
-
-    @Test
-    public void testMutuallyExclusiveCliArgs() {
-        lfcTester.run("File.lf", "--json", JSON_STRING)
-            .verify(result -> {
-                result.checkStdErr(containsString(
-                            "are mutually exclusive (specify only one)"));
-                result.checkFailed();
+  }
+
+  @Test
+  public void testMutuallyExclusiveCliArgs() {
+    lfcTester
+        .run("File.lf", "--json", JSON_STRING)
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("are mutually exclusive (specify only one)"));
+              result.checkFailed();
             });
 
-        lfcTester.run("File.lf", "--json-file", "test.json")
-            .verify(result -> {
-                result.checkStdErr(containsString(
-                            "are mutually exclusive (specify only one)"));
-                result.checkFailed();
+    lfcTester
+        .run("File.lf", "--json-file", "test.json")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("are mutually exclusive (specify only one)"));
+              result.checkFailed();
             });
 
-        lfcTester.run("--json", JSON_STRING, "--json-file", "test.json")
-            .verify(result -> {
-                result.checkStdErr(containsString(
-                            "are mutually exclusive (specify only one)"));
-                result.checkFailed();
+    lfcTester
+        .run("--json", JSON_STRING, "--json-file", "test.json")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("are mutually exclusive (specify only one)"));
+              result.checkFailed();
             });
-    }
-
-    @Test
-    public void testVersion() {
-        lfcTester.run("--version")
-            .verify(result -> {
-                result.checkOk();
-                result.checkNoErrorOutput();
-                result.checkStdOut(equalTo(
-                    "lfc " + LocalStrings.VERSION + System.lineSeparator()));
+  }
+
+  @Test
+  public void testVersion() {
+    lfcTester
+        .run("--version")
+        .verify(
+            result -> {
+              result.checkOk();
+              result.checkNoErrorOutput();
+              result.checkStdOut(equalTo("lfc " + LocalStrings.VERSION + System.lineSeparator()));
             });
-    }
-
-
-    @Test
-    public void testWrongCliArg() {
-        lfcTester.run("--notanargument", "File.lf")
-            .verify(result -> {
-                result.checkStdErr(containsString("Unknown option: '--notanargument'"));
-                result.checkFailed();
+  }
+
+  @Test
+  public void testWrongCliArg() {
+    lfcTester
+        .run("--notanargument", "File.lf")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("Unknown option: '--notanargument'"));
+              result.checkFailed();
             });
-    }
-
-    @Test
-    public void testInvalidArgs(@TempDir Path tempDir) throws IOException {
-        dirBuilder(tempDir).file("src/File.lf", LF_PYTHON_FILE);
-        LfcOneShotTestFixture fixture = new LfcOneShotTestFixture();
-
-        // Invalid src file.
-        fixture.run(tempDir, "unknown.lf")
-            .verify(result -> {
-                result.checkStdErr(containsString("No such file or directory."));
-                result.checkFailed();
+  }
+
+  @Test
+  public void testInvalidArgs(@TempDir Path tempDir) throws IOException {
+    dirBuilder(tempDir).file("src/File.lf", LF_PYTHON_FILE);
+    LfcOneShotTestFixture fixture = new LfcOneShotTestFixture();
+
+    // Invalid src file.
+    fixture
+        .run(tempDir, "unknown.lf")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("No such file or directory."));
+              result.checkFailed();
             });
 
-        // Invalid output path.
-        fixture.run(tempDir, "--output-path", "unknown/output/path", "src/File.lf")
-            .verify(result -> {
-                result.checkStdErr(containsString("Output location does not exist."));
-                result.checkFailed();
+    // Invalid output path.
+    fixture
+        .run(tempDir, "--output-path", "unknown/output/path", "src/File.lf")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("Output location does not exist."));
+              result.checkFailed();
             });
 
-        // Invalid build type.
-        fixture.run(tempDir, "--build-type", "unknown-build-type", "src/File.lf")
-            .verify(result -> {
-                result.checkStdErr(containsString("Invalid build type."));
-                result.checkFailed();
+    // Invalid build type.
+    fixture
+        .run(tempDir, "--build-type", "unknown-build-type", "src/File.lf")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("Invalid build type."));
+              result.checkFailed();
             });
 
-        // Invalid logging level.
-        fixture.run(tempDir, "--logging", "unknown_level", "src/File.lf")
-            .verify(result -> {
-                result.checkStdErr(containsString("Invalid log level."));
-                result.checkFailed();
+    // Invalid logging level.
+    fixture
+        .run(tempDir, "--logging", "unknown_level", "src/File.lf")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("Invalid log level."));
+              result.checkFailed();
             });
 
-        // Invalid RTI path.
-        fixture.run(tempDir, "--rti", "unknown/rti/path", "src/File.lf")
-            .verify(result -> {
-                result.checkStdErr(containsString("Invalid RTI path."));
-                result.checkFailed();
+    // Invalid RTI path.
+    fixture
+        .run(tempDir, "--rti", "unknown/rti/path", "src/File.lf")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("Invalid RTI path."));
+              result.checkFailed();
             });
 
-        // Invalid scheduler.
-        fixture.run(tempDir, "--scheduler", "unknown-scheduler", "src/File.lf")
-            .verify(result -> {
-                result.checkStdErr(containsString("Invalid scheduler."));
-                result.checkFailed();
+    // Invalid scheduler.
+    fixture
+        .run(tempDir, "--scheduler", "unknown-scheduler", "src/File.lf")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("Invalid scheduler."));
+              result.checkFailed();
             });
 
-        // Invalid workers.
-        fixture.run(tempDir, "--workers", "notaninteger", "src/File.lf")
-            .verify(result -> {
-                result.checkStdErr(containsString("Invalid value for option '--workers'"));
-                result.checkStdErr(containsString("is not an int"));
-                result.checkFailed();
+    // Invalid workers.
+    fixture
+        .run(tempDir, "--workers", "notaninteger", "src/File.lf")
+        .verify(
+            result -> {
+              result.checkStdErr(containsString("Invalid value for option '--workers'"));
+              result.checkStdErr(containsString("is not an int"));
+              result.checkFailed();
             });
-
-    }
-
-    @Test
-    public void testGenInSrcDir(@TempDir Path tempDir) throws IOException {
-        dirBuilder(tempDir).file("src/File.lf", LF_PYTHON_FILE);
-
-        lfcTester.run(tempDir, "src/File.lf", "--no-compile")
-            .verify(result -> {
-                result.checkOk();
-                dirChecker(tempDir)
-                    .check("src-gen", isDirectory())
-                    .check("bin", isDirectory())
-                    .check("src-gen/File/File.py", isRegularFile());
+  }
+
+  @Test
+  public void testGenInSrcDir(@TempDir Path tempDir) throws IOException {
+    dirBuilder(tempDir).file("src/File.lf", LF_PYTHON_FILE);
+
+    lfcTester
+        .run(tempDir, "src/File.lf", "--no-compile")
+        .verify(
+            result -> {
+              result.checkOk();
+              dirChecker(tempDir)
+                  .check("src-gen", isDirectory())
+                  .check("bin", isDirectory())
+                  .check("src-gen/File/File.py", isRegularFile());
             });
-    }
-
-    // Helper method for comparing argument values in tests testGeneratorArgs,
-    // testGeneratorArgsJsonString and testGeneratorArgsJsonFile.
-    public void verifyGeneratorArgs(Path tempDir, String[] args) {
-        LfcOneShotTestFixture fixture = new LfcOneShotTestFixture();
-
-        fixture.run(tempDir, args)
-            .verify(result -> {
-                // Don't validate execution because args are dummy args.
-                Properties properties = fixture.lfc.getGeneratorArgs();
-                assertEquals(properties.getProperty(BuildParm.BUILD_TYPE.getKey()), "Release");
-                assertEquals(properties.getProperty(BuildParm.CLEAN.getKey()), "true");
-                assertEquals(properties.getProperty(BuildParm.TARGET_COMPILER.getKey()), "gcc");
-                assertEquals(properties.getProperty(BuildParm.EXTERNAL_RUNTIME_PATH.getKey()), "src");
-                assertEquals(properties.getProperty(BuildParm.LOGGING.getKey()), "info");
-                assertEquals(properties.getProperty(BuildParm.LINT.getKey()), "true");
-                assertEquals(properties.getProperty(BuildParm.NO_COMPILE.getKey()), "true");
-                assertEquals(properties.getProperty(BuildParm.PRINT_STATISTICS.getKey()), "true");
-                assertEquals(properties.getProperty(BuildParm.QUIET.getKey()), "true");
-                assertEquals(properties.getProperty(BuildParm.RTI.getKey()),
-                        "path" + File.separator + "to" + File.separator + "rti");
-                assertEquals(properties.getProperty(BuildParm.RUNTIME_VERSION.getKey()), "rs");
-                assertEquals(properties.getProperty(BuildParm.SCHEDULER.getKey()), "GEDF_NP");
-                assertEquals(properties.getProperty(BuildParm.THREADING.getKey()), "false");
-                assertEquals(properties.getProperty(BuildParm.WORKERS.getKey()), "1");
+  }
+
+  // Helper method for comparing argument values in tests testGeneratorArgs,
+  // testGeneratorArgsJsonString and testGeneratorArgsJsonFile.
+  public void verifyGeneratorArgs(Path tempDir, String[] args) {
+    LfcOneShotTestFixture fixture = new LfcOneShotTestFixture();
+
+    fixture
+        .run(tempDir, args)
+        .verify(
+            result -> {
+              // Don't validate execution because args are dummy args.
+              Properties properties = fixture.lfc.getGeneratorArgs();
+              assertEquals(properties.getProperty(BuildParm.BUILD_TYPE.getKey()), "Release");
+              assertEquals(properties.getProperty(BuildParm.CLEAN.getKey()), "true");
+              assertEquals(properties.getProperty(BuildParm.TARGET_COMPILER.getKey()), "gcc");
+              assertEquals(properties.getProperty(BuildParm.EXTERNAL_RUNTIME_PATH.getKey()), "src");
+              assertEquals(properties.getProperty(BuildParm.LOGGING.getKey()), "info");
+              assertEquals(properties.getProperty(BuildParm.LINT.getKey()), "true");
+              assertEquals(properties.getProperty(BuildParm.NO_COMPILE.getKey()), "true");
+              assertEquals(properties.getProperty(BuildParm.PRINT_STATISTICS.getKey()), "true");
+              assertEquals(properties.getProperty(BuildParm.QUIET.getKey()), "true");
+              assertEquals(
+                  properties.getProperty(BuildParm.RTI.getKey()),
+                  "path" + File.separator + "to" + File.separator + "rti");
+              assertEquals(properties.getProperty(BuildParm.RUNTIME_VERSION.getKey()), "rs");
+              assertEquals(properties.getProperty(BuildParm.SCHEDULER.getKey()), "GEDF_NP");
+              assertEquals(properties.getProperty(BuildParm.THREADING.getKey()), "false");
+              assertEquals(properties.getProperty(BuildParm.WORKERS.getKey()), "1");
             });
+  }
+
+  @Test
+  public void testGeneratorArgs(@TempDir Path tempDir) throws IOException {
+    TempDirBuilder dir = dirBuilder(tempDir);
+    dir.file("src/File.lf", LF_PYTHON_FILE);
+    dir.mkdirs("path//to/rti");
+
+    String[] args = {
+      "src/File.lf",
+      "--output-path",
+      "src",
+      "--build-type",
+      "Release",
+      "--clean",
+      "--target-compiler",
+      "gcc",
+      "--external-runtime-path",
+      "src",
+      "--federated",
+      "--logging",
+      "info",
+      "--lint",
+      "--no-compile",
+      "--print-statistics",
+      "--quiet",
+      "--rti",
+      "path/to/rti",
+      "--runtime-version",
+      "rs",
+      "--scheduler",
+      "GEDF_NP",
+      "--threading",
+      "false",
+      "--workers",
+      "1",
+    };
+    verifyGeneratorArgs(tempDir, args);
+  }
+
+  @Test
+  public void testGeneratorArgsJsonString(@TempDir Path tempDir) throws IOException {
+    TempDirBuilder dir = dirBuilder(tempDir);
+    dir.file("src/File.lf", LF_PYTHON_FILE);
+    dir.mkdirs("path/to/rti");
+
+    String[] args = {"--json", JSON_STRING};
+    verifyGeneratorArgs(tempDir, args);
+  }
+
+  @Test
+  public void testGeneratorArgsJsonFile(@TempDir Path tempDir) throws IOException {
+    TempDirBuilder dir = dirBuilder(tempDir);
+    dir.file("src/File.lf", LF_PYTHON_FILE);
+    dir.file("src/test.json", JSON_STRING);
+    dir.mkdirs("path/to/rti");
+
+    String[] args = {"--json-file", "src/test.json"};
+    verifyGeneratorArgs(tempDir, args);
+  }
+
+  static class LfcTestFixture extends CliToolTestFixture {
+
+    @Override
+    protected void runCliProgram(Io io, String[] args) {
+      Lfc.main(io, args);
     }
+  }
 
-    @Test
-    public void testGeneratorArgs(@TempDir Path tempDir)
-            throws IOException {
-        TempDirBuilder dir = dirBuilder(tempDir);
-        dir.file("src/File.lf", LF_PYTHON_FILE);
-        dir.mkdirs("path//to/rti");
-
-        String[] args = {
-            "src/File.lf",
-            "--output-path", "src",
-            "--build-type", "Release",
-            "--clean",
-            "--target-compiler", "gcc",
-            "--external-runtime-path", "src",
-            "--federated",
-            "--logging", "info",
-            "--lint",
-            "--no-compile",
-            "--print-statistics",
-            "--quiet",
-            "--rti", "path/to/rti",
-            "--runtime-version", "rs",
-            "--scheduler", "GEDF_NP",
-            "--threading", "false",
-            "--workers", "1",
-        };
-        verifyGeneratorArgs(tempDir, args);
-    }
-
-    @Test
-    public void testGeneratorArgsJsonString(@TempDir Path tempDir)
-            throws IOException {
-        TempDirBuilder dir = dirBuilder(tempDir);
-        dir.file("src/File.lf", LF_PYTHON_FILE);
-        dir.mkdirs("path/to/rti");
+  static class LfcOneShotTestFixture extends CliToolTestFixture {
 
-        String[] args = {"--json", JSON_STRING};
-        verifyGeneratorArgs(tempDir, args);
-    }
-
-    @Test
-    public void testGeneratorArgsJsonFile(@TempDir Path tempDir)
-            throws IOException {
-        TempDirBuilder dir = dirBuilder(tempDir);
-        dir.file("src/File.lf", LF_PYTHON_FILE);
-        dir.file("src/test.json", JSON_STRING);
-        dir.mkdirs("path/to/rti");
-
-        String[] args = {"--json-file", "src/test.json"};
-        verifyGeneratorArgs(tempDir, args);
-    }
+    private Lfc lfc;
 
-    static class LfcTestFixture extends CliToolTestFixture {
-
-        @Override
-        protected void runCliProgram(Io io, String[] args) {
-            Lfc.main(io, args);
-        }
-    }
-
-    static class LfcOneShotTestFixture extends CliToolTestFixture {
-
-        private Lfc lfc;
-
-        @Override
-        protected void runCliProgram(Io io, String[] args) {
-            // Injector used to obtain Main instance.
-            final Injector injector = Lfc.getInjector("lfc", io);
-            // Main instance.
-            this.lfc = injector.getInstance(Lfc.class);
-            lfc.doExecute(io, args);
-        }
+    @Override
+    protected void runCliProgram(Io io, String[] args) {
+      // Injector used to obtain Main instance.
+      final Injector injector = Lfc.getInjector("lfc", io);
+      // Main instance.
+      this.lfc = injector.getInstance(Lfc.class);
+      lfc.doExecute(io, args);
     }
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/cli/LffCliTest.java b/org.lflang.tests/src/org/lflang/tests/cli/LffCliTest.java
index 16a4e9b32d..a9da20239f 100644
--- a/org.lflang.tests/src/org/lflang/tests/cli/LffCliTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/cli/LffCliTest.java
@@ -26,153 +26,136 @@
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.lflang.tests.TestUtils.TempDirBuilder.dirBuilder;
 import static org.lflang.tests.TestUtils.TempDirChecker.dirChecker;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
-
 import org.lflang.LocalStrings;
-import org.lflang.tests.cli.CliToolTestFixture.ExecutionResult;
 import org.lflang.cli.Io;
 import org.lflang.cli.Lff;
+import org.lflang.tests.cli.CliToolTestFixture.ExecutionResult;
 
 /**
  * @author Clément Fournier
  */
 public class LffCliTest {
 
-    private static final String FILE_BEFORE_REFORMAT = """
+  private static final String FILE_BEFORE_REFORMAT =
+      """
         target Python;
         main   reactor {
             reaction(startup) {=
                =}
         }
         """;
-    private static final String FILE_AFTER_REFORMAT = """
+  private static final String FILE_AFTER_REFORMAT =
+      """
         target Python
-            
+
         main reactor {
             reaction(startup) {=  =}
         }
         """;
-    LffTestFixture lffTester = new LffTestFixture();
+  LffTestFixture lffTester = new LffTestFixture();
 
+  @Test
+  public void testHelpArg() {
+    ExecutionResult result = lffTester.run("--help", "--version");
+    result.checkOk();
+    result.checkNoErrorOutput();
+    result.checkStdOut(containsString("Usage: lff"));
+  }
 
-    @Test
-    public void testHelpArg() {
-        ExecutionResult result = lffTester.run("--help", "--version");
-        result.checkOk();
-        result.checkNoErrorOutput();
-        result.checkStdOut(containsString("Usage: lff"));
-    }
+  @Test
+  public void testVersion() {
+    ExecutionResult result = lffTester.run("--version");
+    result.checkOk();
+    result.checkNoErrorOutput();
+    result.checkStdOut(equalTo("lff " + LocalStrings.VERSION + System.lineSeparator()));
+  }
 
-    @Test
-    public void testVersion() {
-        ExecutionResult result = lffTester.run("--version");
-        result.checkOk();
-        result.checkNoErrorOutput();
-        result.checkStdOut(
-            equalTo("lff " + LocalStrings.VERSION + System.lineSeparator()));
-    }
+  @Test
+  public void testWrongCliArg() {
+    ExecutionResult result = lffTester.run("--notanargument", "File.lf");
+    result.checkStdErr(containsString("Unknown option: '--notanargument'"));
+    result.checkFailed();
+  }
 
+  @Test
+  public void testFormatSingleFileInPlace(@TempDir Path tempDir) throws IOException {
+    dirBuilder(tempDir).file("src/File.lf", FILE_BEFORE_REFORMAT);
 
-    @Test
-    public void testWrongCliArg() {
-        ExecutionResult result = lffTester.run("--notanargument", "File.lf");
-        result.checkStdErr(containsString("Unknown option: '--notanargument'"));
-        result.checkFailed();
-    }
+    ExecutionResult result = lffTester.run(tempDir, "src/File.lf");
 
-    @Test
-    public void testFormatSingleFileInPlace(@TempDir Path tempDir) throws IOException {
-        dirBuilder(tempDir).file("src/File.lf", FILE_BEFORE_REFORMAT);
+    result.checkOk();
 
-        ExecutionResult result = lffTester.run(tempDir, "src/File.lf");
+    dirChecker(tempDir).checkContentsOf("src/File.lf", equalTo(FILE_AFTER_REFORMAT));
+  }
 
-        result.checkOk();
+  @Test
+  public void testFormatDirectory(@TempDir Path tempDir) throws IOException {
+    dirBuilder(tempDir).file("src/File.lf", FILE_BEFORE_REFORMAT);
 
-        dirChecker(tempDir).checkContentsOf("src/File.lf", equalTo(FILE_AFTER_REFORMAT));
-    }
+    ExecutionResult result = lffTester.run(tempDir, "src");
 
+    result.checkOk();
 
-    @Test
-    public void testFormatDirectory(@TempDir Path tempDir) throws IOException {
-        dirBuilder(tempDir).file("src/File.lf", FILE_BEFORE_REFORMAT);
+    dirChecker(tempDir).checkContentsOf("src/File.lf", equalTo(FILE_AFTER_REFORMAT));
+  }
 
-        ExecutionResult result = lffTester.run(tempDir, "src");
+  @Test
+  public void testFormatDirectoryVerbose(@TempDir Path tempDir) throws IOException {
+    dirBuilder(tempDir).file("src/File.lf", FILE_BEFORE_REFORMAT);
 
-        result.checkOk();
+    ExecutionResult result = lffTester.run(tempDir, "-v", "src");
 
-        dirChecker(tempDir).checkContentsOf("src/File.lf", equalTo(FILE_AFTER_REFORMAT));
-    }
+    result.checkOk();
 
+    result.checkStdOut(containsString("Formatted src" + File.separator + "File.lf"));
+    dirChecker(tempDir).checkContentsOf("src/File.lf", equalTo(FILE_AFTER_REFORMAT));
+  }
 
-    @Test
-    public void testFormatDirectoryVerbose(@TempDir Path tempDir) throws IOException {
-        dirBuilder(tempDir).file("src/File.lf", FILE_BEFORE_REFORMAT);
+  @Test
+  public void testNoSuchFile(@TempDir Path tempDir) {
+    ExecutionResult result = lffTester.run(tempDir, "-v", "nosuchdir");
 
-        ExecutionResult result = lffTester.run(tempDir, "-v", "src");
+    result.checkFailed();
 
-        result.checkOk();
+    result.checkStdErr(
+        containsString(tempDir.resolve("nosuchdir") + ": No such file or directory."));
+  }
 
-        result.checkStdOut(containsString(
-            "Formatted src" + File.separator + "File.lf"));
-        dirChecker(tempDir).checkContentsOf("src/File.lf", equalTo(FILE_AFTER_REFORMAT));
-    }
+  @Test
+  public void testOutputPathWithDirArg(@TempDir Path tempDir) throws IOException {
+    dirBuilder(tempDir).file("src/a/File.lf", FILE_BEFORE_REFORMAT).mkdirs("out/");
 
-    @Test
-    public void testNoSuchFile(@TempDir Path tempDir) {
-        ExecutionResult result = lffTester.run(tempDir, "-v", "nosuchdir");
+    ExecutionResult result = lffTester.run(tempDir, "src", "--output-path", "out");
 
-        result.checkFailed();
+    result.checkOk();
 
-        result.checkStdErr(containsString(
-            tempDir.resolve("nosuchdir") + ": No such file or directory."));
-    }
+    dirChecker(tempDir).checkContentsOf("out/a/File.lf", equalTo(FILE_AFTER_REFORMAT));
+  }
 
+  @Test
+  public void testOutputPathWithFileArg(@TempDir Path tempDir) throws IOException {
+    dirBuilder(tempDir).file("src/a/File.lf", FILE_BEFORE_REFORMAT).mkdirs("out/");
 
-    @Test
-    public void testOutputPathWithDirArg(@TempDir Path tempDir) throws IOException {
-        dirBuilder(tempDir)
-            .file("src/a/File.lf", FILE_BEFORE_REFORMAT)
-            .mkdirs("out/");
+    ExecutionResult result = lffTester.run(tempDir, "src/a/File.lf", "--output-path", "out");
 
-        ExecutionResult result = lffTester.run(tempDir, "src", "--output-path", "out");
+    result.checkOk();
 
-        result.checkOk();
+    dirChecker(tempDir).checkContentsOf("out/File.lf", equalTo(FILE_AFTER_REFORMAT));
+  }
 
-        dirChecker(tempDir)
-            .checkContentsOf("out/a/File.lf", equalTo(FILE_AFTER_REFORMAT));
-    }
-
-    @Test
-    public void testOutputPathWithFileArg(@TempDir Path tempDir) throws IOException {
-        dirBuilder(tempDir)
-            .file("src/a/File.lf", FILE_BEFORE_REFORMAT)
-            .mkdirs("out/");
-
-        ExecutionResult result = lffTester.run(tempDir, "src/a/File.lf", "--output-path", "out");
+  static class LffTestFixture extends CliToolTestFixture {
 
-        result.checkOk();
-
-        dirChecker(tempDir)
-            .checkContentsOf("out/File.lf", equalTo(FILE_AFTER_REFORMAT));
+    @Override
+    protected void runCliProgram(Io io, String[] args) {
+      Lff.main(io, args);
     }
-
-
-    static class LffTestFixture extends CliToolTestFixture {
-
-
-        @Override
-        protected void runCliProgram(Io io, String[] args) {
-            Lff.main(io, args);
-        }
-    }
-
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/EquivalenceUnitTests.java b/org.lflang.tests/src/org/lflang/tests/compiler/EquivalenceUnitTests.java
index 931a0edae0..5d4fe9940c 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/EquivalenceUnitTests.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/EquivalenceUnitTests.java
@@ -5,7 +5,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.lflang.ast.IsEqual;
 import org.lflang.lf.Model;
 import org.lflang.tests.LFInjectorProvider;
@@ -15,10 +14,10 @@
 @InjectWith(LFInjectorProvider.class)
 public class EquivalenceUnitTests {
 
-    @Test
-    public void testSimple() {
-        assertSelfEquivalence(
-            """
+  @Test
+  public void testSimple() {
+    assertSelfEquivalence(
+        """
                 target C
 
                 reactor Destination {
@@ -26,14 +25,13 @@ public void testSimple() {
                     input in: int
                     state last_invoked: tag_t({= NEVER_TAG_INITIALIZER =})
                 }
-                """
-        );
-    }
+                """);
+  }
 
-    @Test
-    public void testCodeExprEqItselfModuloIndent() {
-        assertEquivalent(
-            """
+  @Test
+  public void testCodeExprEqItselfModuloIndent() {
+    assertEquivalent(
+        """
                 target C
                 reactor Destination {
                     state s: tag_t({=
@@ -41,67 +39,56 @@ public void testCodeExprEqItselfModuloIndent() {
                     =})
                 }
                 """,
-            """
+        """
                 target C
                 reactor Destination {
                     state s: tag_t({= NEVER_TAG_INITIALIZER =})
                 }
-                """
-        );
-    }
+                """);
+  }
 
-    @Test
-    public void testInitializerParensAreIrrelevantInAssignment() {
-        assertEquivalent(
-            """
+  @Test
+  public void testInitializerParensAreIrrelevantInAssignment() {
+    assertEquivalent(
+        """
                 target C
                 reactor A(a: int(0)) {}
                 main reactor {
                     a = new A(a = 1)
                 }
                 """,
-            """
+        """
                 target C
                 reactor A(a: int(0)) {}
                 main reactor {
                     a = new A(a = (1)) // mind the parens here.
                 }
-                """
-        );
-    }
-
-    private void assertSelfEquivalence(String input) {
-        Model inputModel = LfParsingUtil.parseValidModel("test input", input);
-        // need to parse twice otherwise they are trivially equivalent
-        // because they're the same object.
-        Model otherModel = LfParsingUtil.parseValidModel("other", input);
-
-        // test equivalence of the models.
-        Assertions.assertTrue(
-            new IsEqual(inputModel).doSwitch(otherModel),
-            String.format(
-                "Model is not equivalent to itself. Source:%n%s",
-                input
-            )
-        );
-    }
+                """);
+  }
 
-    private void assertEquivalent(String input, String other) {
-        Model inputModel = LfParsingUtil.parseValidModel("test input", input);
-        Model outputModel = LfParsingUtil.parseValidModel("other", other);
+  private void assertSelfEquivalence(String input) {
+    Model inputModel = LfParsingUtil.parseValidModel("test input", input);
+    // need to parse twice otherwise they are trivially equivalent
+    // because they're the same object.
+    Model otherModel = LfParsingUtil.parseValidModel("other", input);
 
-        // test equivalence of the models.
-        Assertions.assertTrue(
-            new IsEqual(inputModel).doSwitch(outputModel),
-            String.format(
-                "The reformatted model is not equivalent to the original file.%n"
-                    + "Input file:%n%s%n%n"
-                    + "Comparand file:%n%s%n%n",
-                input,
-                other
-            )
-        );
-    }
+    // test equivalence of the models.
+    Assertions.assertTrue(
+        new IsEqual(inputModel).doSwitch(otherModel),
+        String.format("Model is not equivalent to itself. Source:%n%s", input));
+  }
 
+  private void assertEquivalent(String input, String other) {
+    Model inputModel = LfParsingUtil.parseValidModel("test input", input);
+    Model outputModel = LfParsingUtil.parseValidModel("other", other);
 
+    // test equivalence of the models.
+    Assertions.assertTrue(
+        new IsEqual(inputModel).doSwitch(outputModel),
+        String.format(
+            "The reformatted model is not equivalent to the original file.%n"
+                + "Input file:%n%s%n%n"
+                + "Comparand file:%n%s%n%n",
+            input, other));
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/FormattingUnitTests.java b/org.lflang.tests/src/org/lflang/tests/compiler/FormattingUnitTests.java
index d7862e5d25..79aa6ac1f2 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/FormattingUnitTests.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/FormattingUnitTests.java
@@ -5,9 +5,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.lflang.ast.FormattingUtils;
-import org.lflang.ast.IsEqual;
 import org.lflang.lf.Model;
 import org.lflang.tests.LFInjectorProvider;
 import org.lflang.tests.LfParsingUtil;
@@ -16,26 +14,25 @@
 @InjectWith(LFInjectorProvider.class)
 public class FormattingUnitTests {
 
-    @Test
-    public void testSimple() {
-        assertFormatsTo(
-            """
+  @Test
+  public void testSimple() {
+    assertFormatsTo(
+        """
                 target C
                 reactor Main{ }
                 """,
-            """
+        """
                 target C
-                            
+
                 reactor Main {
                 }
-                """
-        );
-    }
+                """);
+  }
 
-    @Test
-    public void testAssignments() {
-        assertFormatsTo(
-            """
+  @Test
+  public void testAssignments() {
+    assertFormatsTo(
+        """
                 target C
 
                 reactor Destination {
@@ -44,7 +41,7 @@ public void testAssignments() {
                     state last_invoked: tag_t({= NEVER_TAG_INITIALIZER =})
                 }
                 """,
-            """
+        """
                 target C
 
                 reactor Destination {
@@ -52,14 +49,13 @@ public void testAssignments() {
                     input in: int
                     state last_invoked: tag_t = {= NEVER_TAG_INITIALIZER =}
                 }
-                """
-        );
-    }
+                """);
+  }
 
-    @Test
-    public void testState() {
-        assertFormatsTo(
-            """
+  @Test
+  public void testState() {
+    assertFormatsTo(
+        """
                 target Python
 
                 reactor Destination {
@@ -68,7 +64,7 @@ public void testState() {
                      state list_init(1,2) // this syntax is deprecated
                 }
                 """,
-            """
+        """
                 target Python
 
                 reactor Destination {
@@ -76,14 +72,13 @@ state list_init(1,2) // this syntax is deprecated
                     state no_init: tag_t
                     state list_init(1, 2)  # this syntax is deprecated
                 }
-                """
-        );
-    }
+                """);
+  }
 
-    @Test
-    public void testCppInits() {
-        assertIsFormatted(
-            """
+  @Test
+  public void testCppInits() {
+    assertIsFormatted(
+        """
                 target Cpp
 
                 reactor Destination {
@@ -94,23 +89,17 @@ public void testCppInits() {
                     state brace: std::vector<int>{1, 2}
                     state paren_list: std::vector<int>(1, 2)
                 }
-                """
-        );
-    }
-
-    private void assertIsFormatted(String input) {
-        assertFormatsTo(input, input);
-    }
-
-    private void assertFormatsTo(String input, String expectedOutput) {
-        Model inputModel = LfParsingUtil.parseValidModel("test input", input);
-        String formattedString = FormattingUtils.render(inputModel);
-        Assertions.assertEquals(
-            expectedOutput,
-            formattedString,
-            "Formatted output is different from what was expected"
-        );
-    }
-
-
+                """);
+  }
+
+  private void assertIsFormatted(String input) {
+    assertFormatsTo(input, input);
+  }
+
+  private void assertFormatsTo(String input, String expectedOutput) {
+    Model inputModel = LfParsingUtil.parseValidModel("test input", input);
+    String formattedString = FormattingUtils.render(inputModel);
+    Assertions.assertEquals(
+        expectedOutput, formattedString, "Formatted output is different from what was expected");
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/LetInferenceTests.java b/org.lflang.tests/src/org/lflang/tests/compiler/LetInferenceTests.java
index b3e7814f96..38387ac8a4 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/LetInferenceTests.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/LetInferenceTests.java
@@ -1,34 +1,33 @@
-package org.lflang.tests.compiler;/* Parsing unit tests. */
+package org.lflang.tests.compiler; /* Parsing unit tests. */
 
 /*************
- Copyright (c) 2022, The University of California at Berkeley.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) 2022, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
 
 import static org.lflang.ast.ASTUtils.toDefinition;
 
 import javax.inject.Inject;
-
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.testing.InjectWith;
@@ -37,11 +36,10 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.DefaultErrorReporter;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.ast.DelayedConnectionTransformation;
 import org.lflang.generator.ReactionInstance;
 import org.lflang.generator.ReactorInstance;
@@ -49,7 +47,6 @@
 import org.lflang.generator.c.CTypes;
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.LfFactory;
-
 import org.lflang.lf.Model;
 import org.lflang.lf.Reactor;
 import org.lflang.tests.LFInjectorProvider;
@@ -58,89 +55,93 @@
 @InjectWith(LFInjectorProvider.class)
 
 /**
- * Test for getting minimum delay in reactions.
- * Checking the actions and port's delay,then get the minimum reaction delay.
+ * Test for getting minimum delay in reactions. Checking the actions and port's delay,then get the
+ * minimum reaction delay.
+ *
  * @author Wonseo Choi
  * @author Yunsang Cho
  * @author Marten Lohstroh
  * @author Hokeun Kim
  */
-class LetInferenceTest  {
-
-    @Inject
-    ParseHelper<Model> parser;
-
-
-    @Test
-    public void testLet() throws Exception {
-        Model model = parser.parse(String.join(
-            System.getProperty("line.separator"),
-            "target C;",
-            "main reactor {",
-            "    ramp = new Ramp();",
-            "    print = new Print();",
-            "    print2 = new Print();",
-            "    ramp.y -> print.x after 20 msec;",
-            "    ramp.y -> print2.x after 30 msec;",
-            "}",
-            "reactor Ramp {",
-            "    logical action a(60 msec):int;",
-            "    logical action b(100 msec):int;",
-            "    input x:int;",
-            "    output y:int;",
-            "    output z:int;",
-            "    reaction(startup) -> y, z, a, b{=",
-            "    =}",
-            "}",
-            "reactor Print {",
-            "    input x:int;",
-            "    output z:int;",
-            "    reaction(x) -> z {=",
-            "    =}",
-            "}"
-        ));
-
-        Assertions.assertNotNull(model);
-        final var ctypes = CTypes.getInstance();
-        final var resource = model.eResource();
-        final var transformation = new DelayedConnectionTransformation(new CDelayBodyGenerator(ctypes), ctypes, resource, true, true);
-        transformation.applyTransformation(ASTUtils.getAllReactors(resource));
-
-        Assertions.assertTrue(model.eResource().getErrors().isEmpty(),
-                              "Encountered unexpected error while parsing: " +
-                                  model.eResource().getErrors());
+class LetInferenceTest {
+
+  @Inject ParseHelper<Model> parser;
+
+  @Test
+  public void testLet() throws Exception {
+    Model model =
+        parser.parse(
+            String.join(
+                System.getProperty("line.separator"),
+                "target C;",
+                "main reactor {",
+                "    ramp = new Ramp();",
+                "    print = new Print();",
+                "    print2 = new Print();",
+                "    ramp.y -> print.x after 20 msec;",
+                "    ramp.y -> print2.x after 30 msec;",
+                "}",
+                "reactor Ramp {",
+                "    logical action a(60 msec):int;",
+                "    logical action b(100 msec):int;",
+                "    input x:int;",
+                "    output y:int;",
+                "    output z:int;",
+                "    reaction(startup) -> y, z, a, b{=",
+                "    =}",
+                "}",
+                "reactor Print {",
+                "    input x:int;",
+                "    output z:int;",
+                "    reaction(x) -> z {=",
+                "    =}",
+                "}"));
+
+    Assertions.assertNotNull(model);
+    final var ctypes = CTypes.getInstance();
+    final var resource = model.eResource();
+    final var transformation =
+        new DelayedConnectionTransformation(
+            new CDelayBodyGenerator(ctypes), ctypes, resource, true, true);
+    transformation.applyTransformation(ASTUtils.getAllReactors(resource));
+
+    Assertions.assertTrue(
+        model.eResource().getErrors().isEmpty(),
+        "Encountered unexpected error while parsing: " + model.eResource().getErrors());
+
+    Instantiation mainDef = null;
+
+    TreeIterator<EObject> it = model.eResource().getAllContents();
+    while (it.hasNext()) {
+      EObject obj = it.next();
+      if (!(obj instanceof Reactor reactor)) {
+        continue;
+      }
+      if (reactor.isMain()) {
+        mainDef = LfFactory.eINSTANCE.createInstantiation();
+        mainDef.setName(reactor.getName());
+        mainDef.setReactorClass(reactor);
+      }
+    }
 
-        Instantiation mainDef = null;
+    ReactorInstance mainInstance =
+        new ReactorInstance(toDefinition(mainDef.getReactorClass()), new DefaultErrorReporter());
 
-        TreeIterator<EObject> it = model.eResource().getAllContents();
-        while (it.hasNext()) {
-            EObject obj = it.next();
-            if (!(obj instanceof Reactor reactor)) {
-                continue;
-            }
-            if (reactor.isMain()) {
-                mainDef = LfFactory.eINSTANCE.createInstantiation();
-                mainDef.setName(reactor.getName());
-                mainDef.setReactorClass(reactor);
-            }
+    for (ReactorInstance reactorInstance : mainInstance.children) {
+      if (reactorInstance.isGeneratedDelay()) {
+        for (ReactionInstance reactionInstance : reactorInstance.reactions) {
+          Assertions.assertEquals(reactionInstance.assignLogicalExecutionTime(), TimeValue.ZERO);
         }
-
-        ReactorInstance mainInstance = new ReactorInstance(toDefinition(mainDef.getReactorClass()), new DefaultErrorReporter());
-
-        for (ReactorInstance reactorInstance : mainInstance.children) {
-            if (reactorInstance.isGeneratedDelay()) {
-                for (ReactionInstance reactionInstance : reactorInstance.reactions) {
-                    Assertions.assertEquals(reactionInstance.assignLogicalExecutionTime(), TimeValue.ZERO);
-                }
-            } else if (reactorInstance.getName().contains("ramp")) {
-                for (ReactionInstance reactionInstance : reactorInstance.reactions) {
-                    Assertions.assertEquals(new TimeValue(20L, TimeUnit.MILLI), reactionInstance.assignLogicalExecutionTime());
-                }
-            } else if (reactorInstance.getName().contains("print")) {
-                for (ReactionInstance reactionInstance : reactorInstance.reactions) {
-                    Assertions.assertEquals(TimeValue.ZERO, reactionInstance.assignLogicalExecutionTime());
-                }
-            }
+      } else if (reactorInstance.getName().contains("ramp")) {
+        for (ReactionInstance reactionInstance : reactorInstance.reactions) {
+          Assertions.assertEquals(
+              new TimeValue(20L, TimeUnit.MILLI), reactionInstance.assignLogicalExecutionTime());
+        }
+      } else if (reactorInstance.getName().contains("print")) {
+        for (ReactionInstance reactionInstance : reactorInstance.reactions) {
+          Assertions.assertEquals(TimeValue.ZERO, reactionInstance.assignLogicalExecutionTime());
         }
+      }
     }
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaASTUtilsTest.java b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaASTUtilsTest.java
index 0122e03d8d..61fcf74328 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaASTUtilsTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaASTUtilsTest.java
@@ -1,29 +1,29 @@
 /* ASTUtils Unit Tests. */
 
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.tests.compiler;
 
@@ -34,14 +34,12 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
-
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.eclipse.xtext.testing.util.ParseHelper;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.Literal;
@@ -55,20 +53,17 @@
  *
  * @author Christian Menard
  */
-
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
-
 class LinguaFrancaASTUtilsTest {
-    @Inject
-    ParseHelper<Model> parser;
-
-    /**
-     * Test that isInititialized returns true for inititialized state variables
-     */
-    @Test
-    public void initializedState() throws Exception {
-        Model model = parser.parse("""
+  @Inject ParseHelper<Model> parser;
+
+  /** Test that isInititialized returns true for inititialized state variables */
+  @Test
+  public void initializedState() throws Exception {
+    Model model =
+        parser.parse(
+            """
             target Cpp;
             main reactor Foo {
                 state a();
@@ -79,26 +74,27 @@ public void initializedState() throws Exception {
             }
         """);
 
-
-
-        Assertions.assertNotNull(model);
-        Assertions.assertTrue(model.eResource().getErrors().isEmpty(),
-            "Encountered unexpected error while parsing: " +
-                model.eResource().getErrors());
-
-        model.eAllContents().forEachRemaining((obj) -> {
-            if (obj instanceof StateVar) {
-                Assertions.assertTrue(isInitialized((StateVar)obj));
-            }
-        });
-    }
-
-    /**
-     * Test that isInititialized returns false for uninititialized state variables
-     */
-    @Test
-    public void uninitializedState() throws Exception {
-        Model model = parser.parse("""
+    Assertions.assertNotNull(model);
+    Assertions.assertTrue(
+        model.eResource().getErrors().isEmpty(),
+        "Encountered unexpected error while parsing: " + model.eResource().getErrors());
+
+    model
+        .eAllContents()
+        .forEachRemaining(
+            (obj) -> {
+              if (obj instanceof StateVar) {
+                Assertions.assertTrue(isInitialized((StateVar) obj));
+              }
+            });
+  }
+
+  /** Test that isInititialized returns false for uninititialized state variables */
+  @Test
+  public void uninitializedState() throws Exception {
+    Model model =
+        parser.parse(
+            """
             target Cpp;
             main reactor Foo {
                 state a;
@@ -109,39 +105,42 @@ public void uninitializedState() throws Exception {
             }
         """);
 
-        Assertions.assertNotNull(model);
-        Assertions.assertTrue(model.eResource().getErrors().isEmpty(),
-            "Encountered unexpected error while parsing: " +
-                model.eResource().getErrors());
-
-        model.eAllContents().forEachRemaining((obj) -> {
-            if (obj instanceof StateVar) {
-                Assertions.assertFalse(isInitialized((StateVar)obj));
-            }
-        });
-
-    }
-    /**
-     * Return a map from strings to instantiations given a model.
-     *
-     * @param model The model to discover instantiations in.
-     */
-    private Map<String, Instantiation> getInsts(Model model) {
-       return asStream(model.eAllContents())
-                .filter(obj -> obj instanceof Instantiation)
-                .map(obj -> (Instantiation) obj)
-                .collect(Collectors.toMap(Instantiation::getName, it -> it));
-    }
-
-    /**
-     * Test reading initial values of parameters.
-     * This checks that the example given in the documentation of the
-     * ASTUtils.initialValue() function behaves as stated in the docs.
-     */
-     @Test
-     public void initialValue() throws Exception {
-
-       Model model = parser.parse("""
+    Assertions.assertNotNull(model);
+    Assertions.assertTrue(
+        model.eResource().getErrors().isEmpty(),
+        "Encountered unexpected error while parsing: " + model.eResource().getErrors());
+
+    model
+        .eAllContents()
+        .forEachRemaining(
+            (obj) -> {
+              if (obj instanceof StateVar) {
+                Assertions.assertFalse(isInitialized((StateVar) obj));
+              }
+            });
+  }
+  /**
+   * Return a map from strings to instantiations given a model.
+   *
+   * @param model The model to discover instantiations in.
+   */
+  private Map<String, Instantiation> getInsts(Model model) {
+    return asStream(model.eAllContents())
+        .filter(obj -> obj instanceof Instantiation)
+        .map(obj -> (Instantiation) obj)
+        .collect(Collectors.toMap(Instantiation::getName, it -> it));
+  }
+
+  /**
+   * Test reading initial values of parameters. This checks that the example given in the
+   * documentation of the ASTUtils.initialValue() function behaves as stated in the docs.
+   */
+  @Test
+  public void initialValue() throws Exception {
+
+    Model model =
+        parser.parse(
+            """
            target C;
            reactor A(x:int(1)) {}
            reactor B(y:int(2)) {
@@ -154,76 +153,80 @@ reactor C(z:int(3)) {
            }
        """);
 
-        Assertions.assertNotNull(model);
-        Assertions.assertTrue(model.eResource().getErrors().isEmpty(),
-                "Encountered unexpected error while parsing: " +
-                model.eResource().getErrors());
-
-        var map = getInsts(model);
-
-        /* Check for this:
-         *     initialValue(x, null) returns 1
-         *     initialValue(x, [a1]) returns 2
-         *     initialValue(x, [a2]) returns -1
-         *     initialValue(x, [a1, b1]) returns 3
-         *     initialValue(x, [a2, b1]) returns -1
-         *     initialValue(x, [a1, b2]) returns -2
-         *     initialValue(x, [a2, b2]) returns -1
-         *
-         *     initialValue(y, null) returns 2
-         *     initialValue(y, [a1]) throws an IllegalArgumentException
-         *     initialValue(y, [b1]) returns 3
-         *     initialValue(y, [b2]) returns -2
-         */
-
-        model.eAllContents().forEachRemaining((obj) -> {
-            if (obj instanceof Parameter) {
-                Parameter parameter = (Parameter)obj;
+    Assertions.assertNotNull(model);
+    Assertions.assertTrue(
+        model.eResource().getErrors().isEmpty(),
+        "Encountered unexpected error while parsing: " + model.eResource().getErrors());
+
+    var map = getInsts(model);
+
+    /* Check for this:
+     *     initialValue(x, null) returns 1
+     *     initialValue(x, [a1]) returns 2
+     *     initialValue(x, [a2]) returns -1
+     *     initialValue(x, [a1, b1]) returns 3
+     *     initialValue(x, [a2, b1]) returns -1
+     *     initialValue(x, [a1, b2]) returns -2
+     *     initialValue(x, [a2, b2]) returns -1
+     *
+     *     initialValue(y, null) returns 2
+     *     initialValue(y, [a1]) throws an IllegalArgumentException
+     *     initialValue(y, [b1]) returns 3
+     *     initialValue(y, [b2]) returns -2
+     */
+
+    model
+        .eAllContents()
+        .forEachRemaining(
+            (obj) -> {
+              if (obj instanceof Parameter) {
+                Parameter parameter = (Parameter) obj;
                 if (parameter.getName() == "x") {
-                    var values = ASTUtils.initialValue(parameter, null);
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "1");
+                  var values = ASTUtils.initialValue(parameter, null);
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "1");
 
-                    values = ASTUtils.initialValue(parameter, List.of(map.get("a1")));
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "2");
+                  values = ASTUtils.initialValue(parameter, List.of(map.get("a1")));
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "2");
 
-                    values = ASTUtils.initialValue(parameter, List.of(map.get("a2")));
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "-1");
+                  values = ASTUtils.initialValue(parameter, List.of(map.get("a2")));
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "-1");
 
-                    values = ASTUtils.initialValue(parameter, List.of(map.get("a1"), map.get("b1")));
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "3");
+                  values = ASTUtils.initialValue(parameter, List.of(map.get("a1"), map.get("b1")));
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "3");
 
-                    values = ASTUtils.initialValue(parameter, List.of(map.get("a2"), map.get("b1")));
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "-1");
+                  values = ASTUtils.initialValue(parameter, List.of(map.get("a2"), map.get("b1")));
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "-1");
 
-                    values = ASTUtils.initialValue(parameter, List.of(map.get("a1"), map.get("b2")));
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "-2");
+                  values = ASTUtils.initialValue(parameter, List.of(map.get("a1"), map.get("b2")));
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "-2");
 
-                    values = ASTUtils.initialValue(parameter, List.of(map.get("a2"), map.get("b2")));
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "-1");
+                  values = ASTUtils.initialValue(parameter, List.of(map.get("a2"), map.get("b2")));
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "-1");
                 } else if (parameter.getName() == "y") {
-                    var values = ASTUtils.initialValue(parameter, null);
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "2");
+                  var values = ASTUtils.initialValue(parameter, null);
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "2");
 
-                    Assertions.assertThrows(IllegalArgumentException.class,
-                                            () -> ASTUtils.initialValue(parameter, List.of(map.get("a1"))));
+                  Assertions.assertThrows(
+                      IllegalArgumentException.class,
+                      () -> ASTUtils.initialValue(parameter, List.of(map.get("a1"))));
 
-                    values = ASTUtils.initialValue(parameter, List.of(map.get("b1")));
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "3");
+                  values = ASTUtils.initialValue(parameter, List.of(map.get("b1")));
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "3");
 
-                    values = ASTUtils.initialValue(parameter, List.of(map.get("b2")));
-                    Assertions.assertInstanceOf(Literal.class, values.get(0));
-                    Assertions.assertEquals(((Literal)values.get(0)).getLiteral(), "-2");
+                  values = ASTUtils.initialValue(parameter, List.of(map.get("b2")));
+                  Assertions.assertInstanceOf(Literal.class, values.get(0));
+                  Assertions.assertEquals(((Literal) values.get(0)).getLiteral(), "-2");
                 }
-            }
-        });
-    }
+              }
+            });
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaDependencyAnalysisTest.java b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaDependencyAnalysisTest.java
index d7e2af48fc..516c712498 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaDependencyAnalysisTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaDependencyAnalysisTest.java
@@ -1,33 +1,34 @@
 /* Dependency analysis unit tests. */
 
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.tests.compiler;
 
-import com.google.inject.Inject;
+import static org.lflang.ast.ASTUtils.*;
 
+import com.google.inject.Inject;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.testing.InjectWith;
@@ -44,57 +45,56 @@
 import org.lflang.lf.Model;
 import org.lflang.lf.Reactor;
 import org.lflang.tests.LFInjectorProvider;
-import static org.lflang.ast.ASTUtils.*;
 
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
 
 /**
  * A collection of tests to ensure dependency analysis is done correctly.
+ *
  * @author Marten Lohstroh
  */
 class LinguaFrancaDependencyAnalysisTest {
-	@Inject
-    ParseHelper<Model> parser;
-
-    /**
-     * Check that circular dependencies between reactions are detected.
-     */
-    @Test
-    public void cyclicDependency() throws Exception {
-        // Java 17:
-//         String testCase = """
-//             target C;
-//
-//             reactor Clock {
-//                 timer t(0, 10 msec);
-//                 input x:int;
-//                 output y:int;
-//                 reaction(t) -> y {=
-//
-//                 =}
-//                 reaction(x) -> y {=
-//
-//                 =}
-//             }
-//
-//             reactor A {
-//                 input x:int;
-//                 output y:int;
-//                 reaction(x) -> y {=
-//
-//                 =}
-//             }
-//
-//             main reactor Loop {
-//                 c = new Clock();
-//                 a = new A();
-//                 c.y -> a.x;
-//                 a.y -> c.x;
-//             }
-//         """
-// Java 11:
-        String testCase = String.join(System.getProperty("line.separator"),
+  @Inject ParseHelper<Model> parser;
+
+  /** Check that circular dependencies between reactions are detected. */
+  @Test
+  public void cyclicDependency() throws Exception {
+    // Java 17:
+    //         String testCase = """
+    //             target C;
+    //
+    //             reactor Clock {
+    //                 timer t(0, 10 msec);
+    //                 input x:int;
+    //                 output y:int;
+    //                 reaction(t) -> y {=
+    //
+    //                 =}
+    //                 reaction(x) -> y {=
+    //
+    //                 =}
+    //             }
+    //
+    //             reactor A {
+    //                 input x:int;
+    //                 output y:int;
+    //                 reaction(x) -> y {=
+    //
+    //                 =}
+    //             }
+    //
+    //             main reactor Loop {
+    //                 c = new Clock();
+    //                 a = new A();
+    //                 c.y -> a.x;
+    //                 a.y -> c.x;
+    //             }
+    //         """
+    // Java 11:
+    String testCase =
+        String.join(
+            System.getProperty("line.separator"),
             "target C;",
             "",
             "reactor Clock {",
@@ -122,38 +122,37 @@ public void cyclicDependency() throws Exception {
             "    a = new A();",
             "    c.y -> a.x;",
             "    a.y -> c.x;",
-            "}"
-        );
-        Model model = parser.parse(testCase);
-
-        Assertions.assertNotNull(model);
-        Instantiation mainDef = null;
-        TreeIterator<EObject> it = model.eResource().getAllContents();
-        while (it.hasNext()) {
-            EObject obj = it.next();
-            if (!(obj instanceof Reactor)) {
-                continue;
-            }
-            Reactor reactor = (Reactor) obj;
-            if (reactor.isMain()) {
-                // Creating an definition for the main reactor because
-                // there isn't one.
-                mainDef = LfFactory.eINSTANCE.createInstantiation();
-                mainDef.setName(reactor.getName());
-                mainDef.setReactorClass(reactor);
-            }
-        }
-
-        ReactorInstance instance = new ReactorInstance(toDefinition(mainDef.getReactorClass()), new DefaultErrorReporter());
-        Assertions.assertFalse(instance.getCycles().isEmpty());
+            "}");
+    Model model = parser.parse(testCase);
+
+    Assertions.assertNotNull(model);
+    Instantiation mainDef = null;
+    TreeIterator<EObject> it = model.eResource().getAllContents();
+    while (it.hasNext()) {
+      EObject obj = it.next();
+      if (!(obj instanceof Reactor)) {
+        continue;
+      }
+      Reactor reactor = (Reactor) obj;
+      if (reactor.isMain()) {
+        // Creating an definition for the main reactor because
+        // there isn't one.
+        mainDef = LfFactory.eINSTANCE.createInstantiation();
+        mainDef.setName(reactor.getName());
+        mainDef.setReactorClass(reactor);
+      }
     }
 
-    /**
-     * Check that circular instantiations are detected.
-     */
-    @Test
-    public void circularInstantiation() throws Exception {
-        String testCase = """
+    ReactorInstance instance =
+        new ReactorInstance(toDefinition(mainDef.getReactorClass()), new DefaultErrorReporter());
+    Assertions.assertFalse(instance.getCycles().isEmpty());
+  }
+
+  /** Check that circular instantiations are detected. */
+  @Test
+  public void circularInstantiation() throws Exception {
+    String testCase =
+        """
              target C;
 
              reactor X {
@@ -167,14 +166,13 @@ public void circularInstantiation() throws Exception {
                  q = new X();
              }
          """;
-        Model model = parser.parse(testCase);
-
-        Assertions.assertNotNull(model);
+    Model model = parser.parse(testCase);
 
-		ModelInfo info = new ModelInfo();
-		info.update(model, new DefaultErrorReporter());
-		Assertions.assertTrue(info.instantiationGraph.hasCycles() == true,
-        	"Did not detect cyclic instantiation.");
-    }
+    Assertions.assertNotNull(model);
 
+    ModelInfo info = new ModelInfo();
+    info.update(model, new DefaultErrorReporter());
+    Assertions.assertTrue(
+        info.instantiationGraph.hasCycles() == true, "Did not detect cyclic instantiation.");
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaParsingTest.java b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaParsingTest.java
index fc66c7ed57..377e3e7a32 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaParsingTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaParsingTest.java
@@ -1,66 +1,63 @@
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.tests.compiler;
 
+import com.google.inject.Inject;
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.eclipse.xtext.testing.util.ParseHelper;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.lflang.lf.Model;
 import org.lflang.tests.LFInjectorProvider;
 
-import com.google.inject.Inject;
-
-/**
- * Test harness for ensuring that grammar captures
- * all corner cases.
- */
+/** Test harness for ensuring that grammar captures all corner cases. */
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
 class LinguaFrancaParsingTest {
-    @Inject
-    ParseHelper<Model> parser;
+  @Inject ParseHelper<Model> parser;
 
-    @Test
-    public void checkForTarget() throws Exception {
-        String testCase = """
+  @Test
+  public void checkForTarget() throws Exception {
+    String testCase =
+        """
             targett C;
             reactor Foo {
             }
         """;
-        Model result = parser.parse(testCase);
-        Assertions.assertNotNull(result);
-        Assertions.assertFalse(result.eResource().getErrors().isEmpty(), "Failed to catch misspelled target keyword.");
-    }
+    Model result = parser.parse(testCase);
+    Assertions.assertNotNull(result);
+    Assertions.assertFalse(
+        result.eResource().getErrors().isEmpty(), "Failed to catch misspelled target keyword.");
+  }
 
-    @Test
-    public void testAttributes() throws Exception {
-        String testCase = """
+  @Test
+  public void testAttributes() throws Exception {
+    String testCase =
+        """
                 target C;
                 @label("somethign", "else")
                 @ohio()
@@ -74,16 +71,17 @@ public void testAttributes() throws Exception {
 
                 }
             """;
-        parseWithoutError(testCase);
-    }
+    parseWithoutError(testCase);
+  }
 
-    @Test
-    public void testAttributeContexts() throws Exception {
-        String testCase = """
+  @Test
+  public void testAttributeContexts() throws Exception {
+    String testCase =
+        """
                 target C;
                 @a
                 main reactor(@b parm: int) {
-                
+
                     @ohio reaction() {==}
                     @ohio logical action f;
                     @ohio timer t;
@@ -91,28 +89,28 @@ main reactor(@b parm: int) {
                     @ohio output q2: int;
                 }
             """;
-        parseWithoutError(testCase);
-    }
+    parseWithoutError(testCase);
+  }
 
-    @Test
-    public void testTokenizeEmptyWidth() throws Exception {
-        String testCase = """
+  @Test
+  public void testTokenizeEmptyWidth() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     state foo: int[];
                     state foo: int[   ]; //spaces are allowed
                 }
             """;
-        parseWithoutError(testCase);
-    }
-
-    private Model parseWithoutError(String s) throws Exception {
-        Model model = parser.parse(s);
-        Assertions.assertNotNull(model);
-        Assertions.assertTrue(model.eResource().getErrors().isEmpty(),
-                              "Encountered unexpected error while parsing: " +
-                                  model.eResource().getErrors());
-        return model;
-    }
+    parseWithoutError(testCase);
+  }
 
+  private Model parseWithoutError(String s) throws Exception {
+    Model model = parser.parse(s);
+    Assertions.assertNotNull(model);
+    Assertions.assertTrue(
+        model.eResource().getErrors().isEmpty(),
+        "Encountered unexpected error while parsing: " + model.eResource().getErrors());
+    return model;
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaScopingTest.java b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaScopingTest.java
index 8587675479..404d948264 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaScopingTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaScopingTest.java
@@ -1,129 +1,125 @@
 /* Scoping unit tests. */
 
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.tests.compiler;
 
 import com.google.inject.Inject;
+import com.google.inject.Provider;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
+import org.eclipse.xtext.linking.impl.XtextLinkingDiagnostic;
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.eclipse.xtext.testing.util.ParseHelper;
-import org.lflang.lf.Model;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Assertions;
 import org.eclipse.xtext.testing.validation.ValidationTestHelper;
-import org.lflang.lf.LfPackage;
-import org.eclipse.xtext.linking.impl.XtextLinkingDiagnostic;
-import org.lflang.tests.LFInjectorProvider;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.lflang.generator.LFGenerator;
-import com.google.inject.Provider;
+import org.lflang.lf.LfPackage;
+import org.lflang.lf.Model;
+import org.lflang.tests.LFInjectorProvider;
 
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
 
 /**
- * Test harness for ensuring that cross-references are 
- * established correctly and reported when faulty.
+ * Test harness for ensuring that cross-references are established correctly and reported when
+ * faulty.
  */
 public class LinguaFrancaScopingTest {
-    @Inject 
-    ParseHelper<Model> parser;
-    
-    @Inject
-    LFGenerator generator;
-    
-    @Inject
-    JavaIoFileSystemAccess fileAccess;
-    
-    @Inject
-    Provider<ResourceSet> resourceSetProvider;
-    
-    @Inject
-    ValidationTestHelper validator;
-    
-    /**
-     * Ensure that invalid references to contained reactors are reported.
-     */
-    @Test
-    public void unresolvedReactorReference() throws Exception {
-// Java 17:
-//        Model model = """
-//            target C;
-//            reactor From {
-//                output y:int;
-//            }
-//            reactor To {
-//                input x:int;
-//            }
-//            
-//            main reactor {
-//                a = new From();
-//                d = new To();
-//                s.y -> d.x;
-//            }
-//        """;
-// Java 11:
-        Model model = parser.parse(String.join(
-            System.getProperty("line.separator"),
-            "target C;", 
-            "reactor From {",
-            "    output y:int;",
-            "}",
-            "reactor To {",
-            "    input x:int;",
-            "}",
-            "",
-            "main reactor {",
-            "    a = new From();",
-            "    d = new To();",
-            "    s.y -> d.x;",
-            "}"
-        ));
-                
-        Assertions.assertNotNull(model);
-        Assertions.assertTrue(model.eResource().getErrors().isEmpty(),
-            "Encountered unexpected error while parsing.");
-        validator.assertError(model, LfPackage.eINSTANCE.getVarRef(),
-            XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
-            "Couldn't resolve reference to Instantiation 's'");
-        validator.assertError(model, LfPackage.eINSTANCE.getVarRef(),
-            XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
-            "Couldn't resolve reference to Variable 'y'");
-    }
-    
-    
-    /**
-     * Ensure that invalid references to ports
-     * of contained reactors are reported.
-     */
-    @Test
-    public void unresolvedHierarchicalPortReference() throws Exception {
-        Model model = parser.parse("""
+  @Inject ParseHelper<Model> parser;
+
+  @Inject LFGenerator generator;
+
+  @Inject JavaIoFileSystemAccess fileAccess;
+
+  @Inject Provider<ResourceSet> resourceSetProvider;
+
+  @Inject ValidationTestHelper validator;
+
+  /** Ensure that invalid references to contained reactors are reported. */
+  @Test
+  public void unresolvedReactorReference() throws Exception {
+    // Java 17:
+    //        Model model = """
+    //            target C;
+    //            reactor From {
+    //                output y:int;
+    //            }
+    //            reactor To {
+    //                input x:int;
+    //            }
+    //
+    //            main reactor {
+    //                a = new From();
+    //                d = new To();
+    //                s.y -> d.x;
+    //            }
+    //        """;
+    // Java 11:
+    Model model =
+        parser.parse(
+            String.join(
+                System.getProperty("line.separator"),
+                "target C;",
+                "reactor From {",
+                "    output y:int;",
+                "}",
+                "reactor To {",
+                "    input x:int;",
+                "}",
+                "",
+                "main reactor {",
+                "    a = new From();",
+                "    d = new To();",
+                "    s.y -> d.x;",
+                "}"));
+
+    Assertions.assertNotNull(model);
+    Assertions.assertTrue(
+        model.eResource().getErrors().isEmpty(), "Encountered unexpected error while parsing.");
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getVarRef(),
+        XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
+        "Couldn't resolve reference to Instantiation 's'");
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getVarRef(),
+        XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
+        "Couldn't resolve reference to Variable 'y'");
+  }
+
+  /** Ensure that invalid references to ports of contained reactors are reported. */
+  @Test
+  public void unresolvedHierarchicalPortReference() throws Exception {
+    Model model =
+        parser.parse(
+            """
             target C;
             reactor From {
                 output y:int;
@@ -138,59 +134,73 @@ public void unresolvedHierarchicalPortReference() throws Exception {
                 a.x -> d.y;
             }
         """);
-        
-        Assertions.assertNotNull(model);
-        Assertions.assertTrue(model.eResource().getErrors().isEmpty(),
-            "Encountered unexpected error while parsing.");
-        validator.assertError(model, LfPackage.eINSTANCE.getVarRef(),
-            XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
-            "Couldn't resolve reference to Variable 'x'");
-        validator.assertError(model, LfPackage.eINSTANCE.getVarRef(),
-            XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
-            "Couldn't resolve reference to Variable 'y'");
-    }
-
-    @Test
-    public void unresolvedReferenceInTriggerClause() throws Exception {
-        Model model = parser.parse("""
+
+    Assertions.assertNotNull(model);
+    Assertions.assertTrue(
+        model.eResource().getErrors().isEmpty(), "Encountered unexpected error while parsing.");
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getVarRef(),
+        XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
+        "Couldn't resolve reference to Variable 'x'");
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getVarRef(),
+        XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
+        "Couldn't resolve reference to Variable 'y'");
+  }
+
+  @Test
+  public void unresolvedReferenceInTriggerClause() throws Exception {
+    Model model =
+        parser.parse(
+            """
             target C;
             main reactor {
                 reaction(unknown) {==}
             }
         """);
-        
-    validator.assertError(model, LfPackage.eINSTANCE.getVarRef(),
-            XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
-            "Couldn't resolve reference to Variable 'unknown'.");
-    }
-
-    @Test
-    public void unresolvedReferenceInUseClause() throws Exception {
-        Model model = parser.parse("""
+
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getVarRef(),
+        XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
+        "Couldn't resolve reference to Variable 'unknown'.");
+  }
+
+  @Test
+  public void unresolvedReferenceInUseClause() throws Exception {
+    Model model =
+        parser.parse(
+            """
             target C;
             main reactor {
                 reaction() unknown {==}
             }
         """);
-        
-        
-        validator.assertError(model, LfPackage.eINSTANCE.getVarRef(),
-            XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
-            "Couldn't resolve reference to Variable 'unknown'.");
-    }
-
-    @Test
-    public void unresolvedReferenceInEffectsClause() throws Exception {
-        Model model = parser.parse("""
+
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getVarRef(),
+        XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
+        "Couldn't resolve reference to Variable 'unknown'.");
+  }
+
+  @Test
+  public void unresolvedReferenceInEffectsClause() throws Exception {
+    Model model =
+        parser.parse(
+            """
             target C;
             main reactor {
                 reaction() -> unknown {==}
             }
         """);
 
-        validator.assertError(model, LfPackage.eINSTANCE.getVarRef(),
-            XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
-            "Couldn't resolve reference to Variable 'unknown'.");
-    }
-
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getVarRef(),
+        XtextLinkingDiagnostic.LINKING_DIAGNOSTIC,
+        "Couldn't resolve reference to Variable 'unknown'.");
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index aa285a2e32..72e3574b33 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -1,36 +1,36 @@
 /* Scoping unit tests. */
 
 /*************
- Copyright (c) 2019, The University of California at Berkeley.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
 
 package org.lflang.tests.compiler;
 
+import com.google.inject.Inject;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.eclipse.xtext.testing.util.ParseHelper;
@@ -39,7 +39,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.ArrayType;
@@ -56,12 +55,9 @@
 import org.lflang.tests.LFInjectorProvider;
 import org.lflang.util.StringUtil;
 
-import com.google.inject.Inject;
-
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
 
-
 /**
  * Collection of unit tests to ensure validation is done correctly.
  *
@@ -73,75 +69,76 @@
  */
 public class LinguaFrancaValidationTest {
 
-    @Inject
-    ParseHelper<Model> parser;
-
-    @Inject
-    ValidationTestHelper validator;
-
-    /**
-     * Helper function to parse a Lingua Franca program and expect no errors.
-     *
-     * @return A model representing the parsed string.
-     */
-    private Model parseWithoutError(String s) throws Exception {
-        Model model = parser.parse(s);
-        Assertions.assertNotNull(model);
-        Assertions.assertTrue(model.eResource().getErrors().isEmpty(),
-            "Encountered unexpected error while parsing: " +
-                model.eResource().getErrors());
-        return model;
-    }
-
-    /**
-     * Helper function to parse a Lingua Franca program and expect errors.
-     *
-     * @return A model representing the parsed string.
-     */
-    private Model parseWithError(String s) throws Exception {
-        Model model = parser.parse(s);
-        Assertions.assertNotNull(model);
-        Assertions.assertFalse(model.eResource().getErrors().isEmpty());
-        return model;
-    }
-
-    /**
-     * Ensure that duplicate identifiers for actions reported.
-     */
-    @Test
-    public void duplicateVariable() throws Exception {
-        String testCase = """
+  @Inject ParseHelper<Model> parser;
+
+  @Inject ValidationTestHelper validator;
+
+  /**
+   * Helper function to parse a Lingua Franca program and expect no errors.
+   *
+   * @return A model representing the parsed string.
+   */
+  private Model parseWithoutError(String s) throws Exception {
+    Model model = parser.parse(s);
+    Assertions.assertNotNull(model);
+    Assertions.assertTrue(
+        model.eResource().getErrors().isEmpty(),
+        "Encountered unexpected error while parsing: " + model.eResource().getErrors());
+    return model;
+  }
+
+  /**
+   * Helper function to parse a Lingua Franca program and expect errors.
+   *
+   * @return A model representing the parsed string.
+   */
+  private Model parseWithError(String s) throws Exception {
+    Model model = parser.parse(s);
+    Assertions.assertNotNull(model);
+    Assertions.assertFalse(model.eResource().getErrors().isEmpty());
+    return model;
+  }
+
+  /** Ensure that duplicate identifiers for actions reported. */
+  @Test
+  public void duplicateVariable() throws Exception {
+    String testCase =
+        """
                 target TypeScript;
                 main reactor Foo {
                     logical action bar;
                     physical action bar;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase),
-            LfPackage.eINSTANCE.getAction(),
-            null,
-            "Duplicate Variable 'bar' in Reactor 'Foo'");
-    }
-
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getAction(),
+        null,
+        "Duplicate Variable 'bar' in Reactor 'Foo'");
+  }
 
-    /**
-     * Check that reactors in C++ cannot be named preamble
-     */
-    @Test
-    public void disallowReactorCalledPreamble() throws Exception {
-        Model model_no_errors = parser.parse("""
+  /** Check that reactors in C++ cannot be named preamble */
+  @Test
+  public void disallowReactorCalledPreamble() throws Exception {
+    Model model_no_errors =
+        parser.parse(
+            """
                 target Cpp;
                 main reactor {
                 }
             """);
 
-        Model model_error_1 = parser.parse("""
+    Model model_error_1 =
+        parser.parse(
+            """
                 target Cpp;
                 reactor Preamble {
                 }
             """);
 
-        Model model_error_2 = parser.parse("""
+    Model model_error_2 =
+        parser.parse(
+            """
                 target Cpp;
                 reactor Preamble {
                 }
@@ -149,151 +146,177 @@ public void disallowReactorCalledPreamble() throws Exception {
                 }
             """);
 
-        Assertions.assertNotNull(model_no_errors);
-        Assertions.assertNotNull(model_error_1);
-        Assertions.assertNotNull(model_error_2);
-        Assertions.assertTrue(model_no_errors.eResource().getErrors().isEmpty(),
-            "Encountered unexpected error while parsing: "
-                + model_no_errors.eResource().getErrors());
-        Assertions.assertTrue(model_error_1.eResource().getErrors().isEmpty(),
-            "Encountered unexpected error while parsing: " + model_error_1.eResource().getErrors());
-        Assertions.assertTrue(model_error_2.eResource().getErrors().isEmpty(),
-            "Encountered unexpected error while parsing: " + model_error_2.eResource().getErrors());
-
-        validator.assertNoIssues(model_no_errors);
-        validator.assertError(model_error_1,
-            LfPackage.eINSTANCE.getReactor(),
-            null,
-            "Reactor cannot be named 'Preamble'");
-        validator.assertError(model_error_2,
-            LfPackage.eINSTANCE.getReactor(),
-            null,
-            "Reactor cannot be named 'Preamble'");
-    }
-
-
-    /**
-     * Ensure that "__" is not allowed at the start of an input name.
-     */
-    @Test
-    public void disallowUnderscoreInputs() throws Exception {
-        String testCase = """
+    Assertions.assertNotNull(model_no_errors);
+    Assertions.assertNotNull(model_error_1);
+    Assertions.assertNotNull(model_error_2);
+    Assertions.assertTrue(
+        model_no_errors.eResource().getErrors().isEmpty(),
+        "Encountered unexpected error while parsing: " + model_no_errors.eResource().getErrors());
+    Assertions.assertTrue(
+        model_error_1.eResource().getErrors().isEmpty(),
+        "Encountered unexpected error while parsing: " + model_error_1.eResource().getErrors());
+    Assertions.assertTrue(
+        model_error_2.eResource().getErrors().isEmpty(),
+        "Encountered unexpected error while parsing: " + model_error_2.eResource().getErrors());
+
+    validator.assertNoIssues(model_no_errors);
+    validator.assertError(
+        model_error_1,
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Reactor cannot be named 'Preamble'");
+    validator.assertError(
+        model_error_2,
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Reactor cannot be named 'Preamble'");
+  }
+
+  /** Ensure that "__" is not allowed at the start of an input name. */
+  @Test
+  public void disallowUnderscoreInputs() throws Exception {
+    String testCase =
+        """
                 target TypeScript;
                 main reactor {
                     input __bar;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getInput(), null,
-            "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor definitions, and reactor instantiation) may not start with \"__\": __bar");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getInput(),
+        null,
+        "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor"
+            + " definitions, and reactor instantiation) may not start with \"__\": __bar");
+  }
 
-    @Test
-    public void disallowMainWithDifferentNameThanFile() throws Exception {
-        String testCase = """
+  @Test
+  public void disallowMainWithDifferentNameThanFile() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor Foo {}
             """;
 
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getReactor(), null,
-            "Name of main reactor must match the file name (or be omitted)");
-    }
-
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Name of main reactor must match the file name (or be omitted)");
+  }
 
-    /**
-     * Ensure that "__" is not allowed at the start of an output name.
-     */
-    @Test
-    public void disallowUnderscoreOutputs() throws Exception {
-        String testCase = """
+  /** Ensure that "__" is not allowed at the start of an output name. */
+  @Test
+  public void disallowUnderscoreOutputs() throws Exception {
+    String testCase =
+        """
             target TypeScript;
                 main reactor Foo {
                     output __bar;
                 }
             """;
 
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getOutput(), null,
-            "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor definitions, and reactor instantiation) may not start with \"__\": __bar");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getOutput(),
+        null,
+        "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor"
+            + " definitions, and reactor instantiation) may not start with \"__\": __bar");
+  }
 
-    /**
-     * Ensure that "__" is not allowed at the start of an action name.
-     */
-    @Test
-    public void disallowUnderscoreActions() throws Exception {
-        String testCase = """
+  /** Ensure that "__" is not allowed at the start of an action name. */
+  @Test
+  public void disallowUnderscoreActions() throws Exception {
+    String testCase =
+        """
                 target TypeScript;
                 main reactor Foo {
                     logical action __bar;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getAction(), null,
-            "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor definitions, and reactor instantiation) may not start with \"__\": __bar");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getAction(),
+        null,
+        "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor"
+            + " definitions, and reactor instantiation) may not start with \"__\": __bar");
+  }
 
-    /**
-     * Ensure that "__" is not allowed at the start of a timer name.
-     */
-    @Test
-    public void disallowUnderscoreTimers() throws Exception {
-        String testCase = """
+  /** Ensure that "__" is not allowed at the start of a timer name. */
+  @Test
+  public void disallowUnderscoreTimers() throws Exception {
+    String testCase =
+        """
                 target TypeScript;
                 main reactor Foo {
                     timer __bar(0);
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getTimer(), null,
-            "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor definitions, and reactor instantiation) may not start with \"__\": __bar");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getTimer(),
+        null,
+        "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor"
+            + " definitions, and reactor instantiation) may not start with \"__\": __bar");
+  }
 
-    /**
-     * Ensure that "__" is not allowed at the start of a parameter name.
-     */
-    @Test
-    public void disallowUnderscoreParameters() throws Exception {
-        String testCase = """
+  /** Ensure that "__" is not allowed at the start of a parameter name. */
+  @Test
+  public void disallowUnderscoreParameters() throws Exception {
+    String testCase =
+        """
                 target TypeScript;
                 main reactor Foo(__bar) {
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getParameter(), null,
-            "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor definitions, and reactor instantiation) may not start with \"__\": __bar");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getParameter(),
+        null,
+        "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor"
+            + " definitions, and reactor instantiation) may not start with \"__\": __bar");
+  }
 
-    /**
-     * Ensure that "__" is not allowed at the start of an state name.
-     */
-    @Test
-    public void disallowUnderscoreStates() throws Exception {
-        String testCase = """
+  /** Ensure that "__" is not allowed at the start of an state name. */
+  @Test
+  public void disallowUnderscoreStates() throws Exception {
+    String testCase =
+        """
                 target TypeScript;
                 main reactor Foo {
                     state __bar;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getStateVar(), null,
-            "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor definitions, and reactor instantiation) may not start with \"__\": __bar");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getStateVar(),
+        null,
+        "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor"
+            + " definitions, and reactor instantiation) may not start with \"__\": __bar");
+  }
 
-    /**
-     * Ensure that "__" is not allowed at the start of a reactor definition name.
-     */
-    @Test
-    public void disallowUnderscoreReactorDef() throws Exception {
-        String testCase = """
+  /** Ensure that "__" is not allowed at the start of a reactor definition name. */
+  @Test
+  public void disallowUnderscoreReactorDef() throws Exception {
+    String testCase =
+        """
                 target TypeScript;
                 reactor __Foo {
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getReactor(), null,
-            "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor definitions, and reactor instantiation) may not start with \"__\": __Foo");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor"
+            + " definitions, and reactor instantiation) may not start with \"__\": __Foo");
+  }
 
-    /**
-     * Ensure that "__" is not allowed at the start of a reactor instantiation name.
-     */
-    @Test
-    public void disallowUnderscoreReactorInstantiation() throws Exception {
-        String testCase = """
+  /** Ensure that "__" is not allowed at the start of a reactor instantiation name. */
+  @Test
+  public void disallowUnderscoreReactorInstantiation() throws Exception {
+    String testCase =
+        """
                 target TypeScript;
                 reactor Foo {
                 }
@@ -301,16 +324,19 @@ public void disallowUnderscoreReactorInstantiation() throws Exception {
                     __x = new Foo();
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getInstantiation(), null,
-            "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor definitions, and reactor instantiation) may not start with \"__\": __x");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getInstantiation(),
+        null,
+        "Names of objects (inputs, outputs, actions, timers, parameters, state, reactor"
+            + " definitions, and reactor instantiation) may not start with \"__\": __x");
+  }
 
-    /**
-     * Disallow connection to port that is effect of reaction.
-     */
-    @Test
-    public void connectionToEffectPort() throws Exception {
-        String testCase = """
+  /** Disallow connection to port that is effect of reaction. */
+  @Test
+  public void connectionToEffectPort() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor Foo {
                     output out:int;
@@ -319,20 +345,22 @@ public void connectionToEffectPort() throws Exception {
                     output out:int;
                     x = new Foo();
                     x.out -> out;
-                    reaction(startup) -> out {=                    
+                    reaction(startup) -> out {=
                     =}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getConnection(), null,
-            "Cannot connect: Port named 'out' is already effect of a reaction.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getConnection(),
+        null,
+        "Cannot connect: Port named 'out' is already effect of a reaction.");
+  }
 
-    /**
-     * Disallow connection to port that is effect of reaction.
-     */
-    @Test
-    public void connectionToEffectPort2() throws Exception {
-        String testCase = """
+  /** Disallow connection to port that is effect of reaction. */
+  @Test
+  public void connectionToEffectPort2() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor Foo {
                     input inp:int;
@@ -344,21 +372,25 @@ public void connectionToEffectPort2() throws Exception {
                     y = new Foo();
 
                     y.out -> x.inp;
-                    reaction(startup) -> x.inp {=                    
+                    reaction(startup) -> x.inp {=
                     =}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getConnection(), null,
-            "Cannot connect: Port named 'inp' is already effect of a reaction.");
-    }
-
-    /**
-     * Allow connection to the port of a contained reactor if another port with same name is effect
-     * of a reaction.
-     */
-    @Test
-    public void connectionToEffectPort3() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getConnection(),
+        null,
+        "Cannot connect: Port named 'inp' is already effect of a reaction.");
+  }
+
+  /**
+   * Allow connection to the port of a contained reactor if another port with same name is effect of
+   * a reaction.
+   */
+  @Test
+  public void connectionToEffectPort3() throws Exception {
+    String testCase =
+        """
                 target C;
 
                 reactor Foo {
@@ -373,16 +405,17 @@ public void connectionToEffectPort3() throws Exception {
                     =}
                 }
             """;
-        validator.assertNoErrors(parseWithoutError(testCase));
-    }
+    validator.assertNoErrors(parseWithoutError(testCase));
+  }
 
-    /**
-     * Allow connection to the port of a contained reactor if another port with same name is effect
-     * of a reaction.
-     */
-    @Test
-    public void connectionToEffectPort3_5() throws Exception {
-        String testCase = """
+  /**
+   * Allow connection to the port of a contained reactor if another port with same name is effect of
+   * a reaction.
+   */
+  @Test
+  public void connectionToEffectPort3_5() throws Exception {
+    String testCase =
+        """
                 target C;
 
                 reactor Foo {
@@ -397,19 +430,23 @@ public void connectionToEffectPort3_5() throws Exception {
                     =}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getVariable(), null,
-            "Main reactor cannot have inputs.");
-    }
-
-    /**
-     * Disallow connection to the port of a contained reactor if the same port is effect of a
-     * reaction.
-     */
-    @Test
-    public void connectionToEffectPort4() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getVariable(),
+        null,
+        "Main reactor cannot have inputs.");
+  }
+
+  /**
+   * Disallow connection to the port of a contained reactor if the same port is effect of a
+   * reaction.
+   */
+  @Test
+  public void connectionToEffectPort4() throws Exception {
+    String testCase =
+        """
                 target C;
-                   
+
                 reactor Foo {
                     input in:int;
                 }
@@ -421,16 +458,18 @@ public void connectionToEffectPort4() throws Exception {
                     =}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getConnection(), null,
-            "Cannot connect: Port named 'in' is already effect of a reaction.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getConnection(),
+        null,
+        "Cannot connect: Port named 'in' is already effect of a reaction.");
+  }
 
-    /**
-     * Disallow connection of multiple ports to the same input port.
-     */
-    @Test
-    public void multipleConnectionsToInputTest() throws Exception {
-        String testCase = """
+  /** Disallow connection of multiple ports to the same input port. */
+  @Test
+  public void multipleConnectionsToInputTest() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor Source {
                     output out:int;
@@ -446,32 +485,35 @@ public void multipleConnectionsToInputTest() throws Exception {
                     src.out -> sink.in;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getConnection(), null,
-            "Cannot connect: Port named 'in' may only appear once on the right side of a connection.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getConnection(),
+        null,
+        "Cannot connect: Port named 'in' may only appear once on the right side of a connection.");
+  }
 
-    /**
-     * Detect cycles in the instantiation graph.
-     */
-    @Test
-    public void detectInstantiationCycle() throws Exception {
-        String testCase = """
+  /** Detect cycles in the instantiation graph. */
+  @Test
+  public void detectInstantiationCycle() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor Contained {
                     x = new Contained();
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getInstantiation(),
-            null, "Instantiation is part of a cycle: Contained");
-    }
-
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getInstantiation(),
+        null,
+        "Instantiation is part of a cycle: Contained");
+  }
 
-    /**
-     * Detect cycles in the instantiation graph.
-     */
-    @Test
-    public void detectInstantiationCycle2() throws Exception {
-        String testCase = """
+  /** Detect cycles in the instantiation graph. */
+  @Test
+  public void detectInstantiationCycle2() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor Intermediate {
                     x = new Contained();
@@ -481,20 +523,25 @@ public void detectInstantiationCycle2() throws Exception {
                 }
             """;
 
-        Model model = parseWithoutError(testCase);
-        validator.assertError(model, LfPackage.eINSTANCE.getInstantiation(),
-            null, "Instantiation is part of a cycle: Intermediate, Contained.");
-        validator.assertError(model, LfPackage.eINSTANCE.getInstantiation(),
-            null, "Instantiation is part of a cycle: Intermediate, Contained.");
-    }
+    Model model = parseWithoutError(testCase);
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getInstantiation(),
+        null,
+        "Instantiation is part of a cycle: Intermediate, Contained.");
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getInstantiation(),
+        null,
+        "Instantiation is part of a cycle: Intermediate, Contained.");
+  }
 
-    /**
-     * Detect causality loop.
-     */
-    @Test
-    public void detectCausalityLoop() throws Exception {
+  /** Detect causality loop. */
+  @Test
+  public void detectCausalityLoop() throws Exception {
 
-        String testCase = """
+    String testCase =
+        """
                 target C;
 
                 reactor X {
@@ -511,19 +558,24 @@ public void detectCausalityLoop() throws Exception {
                     b.y -> a.x
                 }
             """;
-        Model model = parseWithoutError(testCase);
-        validator.assertError(model, LfPackage.eINSTANCE.getReaction(),
-            null, "Reaction triggers involved in cyclic dependency in reactor X: x.");
-        validator.assertError(model, LfPackage.eINSTANCE.getReaction(),
-            null, "Reaction effects involved in cyclic dependency in reactor X: y.");
-    }
-
-    /**
-     * Let cyclic dependencies be broken by "after" clauses.
-     */
-    @Test
-    public void afterBreaksCycle() throws Exception {
-        String testCase = """
+    Model model = parseWithoutError(testCase);
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getReaction(),
+        null,
+        "Reaction triggers involved in cyclic dependency in reactor X: x.");
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getReaction(),
+        null,
+        "Reaction effects involved in cyclic dependency in reactor X: y.");
+  }
+
+  /** Let cyclic dependencies be broken by "after" clauses. */
+  @Test
+  public void afterBreaksCycle() throws Exception {
+    String testCase =
+        """
                 target C
 
                 reactor X {
@@ -541,16 +593,14 @@ public void afterBreaksCycle() throws Exception {
                 }
             """;
 
-        validator.assertNoErrors(parseWithoutError(testCase));
-    }
-
+    validator.assertNoErrors(parseWithoutError(testCase));
+  }
 
-    /**
-     * Let cyclic dependencies be broken by "after" clauses with zero delay.
-     */
-    @Test
-    public void afterBreaksCycle2() throws Exception {
-        String testCase = """
+  /** Let cyclic dependencies be broken by "after" clauses with zero delay. */
+  @Test
+  public void afterBreaksCycle2() throws Exception {
+    String testCase =
+        """
                 target C
 
                 reactor X {
@@ -567,16 +617,14 @@ public void afterBreaksCycle2() throws Exception {
                     b.y -> a.x
                 }
             """;
-        validator.assertNoErrors(parseWithoutError(testCase));
-    }
+    validator.assertNoErrors(parseWithoutError(testCase));
+  }
 
-
-    /**
-     * Let cyclic dependencies be broken by "after" clauses with zero delay and no units.
-     */
-    @Test
-    public void afterBreaksCycle3() throws Exception {
-        String testCase = """
+  /** Let cyclic dependencies be broken by "after" clauses with zero delay and no units. */
+  @Test
+  public void afterBreaksCycle3() throws Exception {
+    String testCase =
+        """
                 target C
 
                 reactor X {
@@ -593,15 +641,14 @@ public void afterBreaksCycle3() throws Exception {
                     b.y -> a.x
                 }
             """;
-        validator.assertNoErrors(parseWithoutError(testCase));
-    }
+    validator.assertNoErrors(parseWithoutError(testCase));
+  }
 
-    /**
-     * Detect missing units in "after" clauses with delay greater than zero.
-     */
-    @Test
-    public void nonzeroAfterMustHaveUnits() throws Exception {
-        String testCase = """
+  /** Detect missing units in "after" clauses with delay greater than zero. */
+  @Test
+  public void nonzeroAfterMustHaveUnits() throws Exception {
+    String testCase =
+        """
                 target C
 
                 reactor X {
@@ -617,17 +664,18 @@ public void nonzeroAfterMustHaveUnits() throws Exception {
                     a.y -> b.x after 1
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getConnection(),
-            null, "Missing time unit.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getConnection(),
+        null,
+        "Missing time unit.");
+  }
 
-
-    /**
-     * Report non-zero time value without units.
-     */
-    @Test
-    public void nonZeroTimeValueWithoutUnits() throws Exception {
-        String testCase = """
+  /** Report non-zero time value without units. */
+  @Test
+  public void nonZeroTimeValueWithoutUnits() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     timer t(42, 1 sec);
@@ -636,15 +684,15 @@ public void nonZeroTimeValueWithoutUnits() throws Exception {
                     =}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getTimer(), null, "Missing time unit.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase), LfPackage.eINSTANCE.getTimer(), null, "Missing time unit.");
+  }
 
-    /**
-     * Report reference to non-time parameter in time argument.
-     */
-    @Test
-    public void parameterTypeMismatch() throws Exception {
-        String testCase = """
+  /** Report reference to non-time parameter in time argument. */
+  @Test
+  public void parameterTypeMismatch() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor (p:int(0)) {
                     timer t(p, 1 sec);
@@ -653,16 +701,18 @@ main reactor (p:int(0)) {
                     =}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getTimer(),
-            null, "Referenced parameter is not of time type.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getTimer(),
+        null,
+        "Referenced parameter is not of time type.");
+  }
 
-    /**
-     * Report inappropriate literal in time argument.
-     */
-    @Test
-    public void targetCodeInTimeArgument() throws Exception {
-        String testCase = """
+  /** Report inappropriate literal in time argument. */
+  @Test
+  public void targetCodeInTimeArgument() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     timer t({=foo()=}, 1 sec);
@@ -671,17 +721,15 @@ public void targetCodeInTimeArgument() throws Exception {
                     =}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getTimer(),
-            null, "Invalid time value.");
-    }
-
+    validator.assertError(
+        parseWithoutError(testCase), LfPackage.eINSTANCE.getTimer(), null, "Invalid time value.");
+  }
 
-    /**
-     * Report overflowing deadline.
-     */
-    @Test
-    public void overflowingDeadlineC() throws Exception {
-        String testCase = """
+  /** Report overflowing deadline. */
+  @Test
+  public void overflowingDeadlineC() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                 timer t;
@@ -691,18 +739,18 @@ public void overflowingDeadlineC() throws Exception {
                     =}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getDeadline(), null,
-            "Deadline exceeds the maximum of " + TimeValue.MAX_LONG_DEADLINE +
-                " nanoseconds.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getDeadline(),
+        null,
+        "Deadline exceeds the maximum of " + TimeValue.MAX_LONG_DEADLINE + " nanoseconds.");
+  }
 
-
-    /**
-     * Report overflowing parameter.
-     */
-    @Test
-    public void overflowingParameterC() throws Exception {
-        String testCase = """
+  /** Report overflowing parameter. */
+  @Test
+  public void overflowingParameterC() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor(d:time(40 hours)) {
                 timer t;
@@ -712,18 +760,20 @@ main reactor(d:time(40 hours)) {
                     =}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getParameter(), null,
-            "Time value used to specify a deadline exceeds the maximum of " +
-                TimeValue.MAX_LONG_DEADLINE + " nanoseconds.");
-    }
-
-
-    /**
-     * Report overflowing assignment.
-     */
-    @Test
-    public void overflowingAssignmentC() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getParameter(),
+        null,
+        "Time value used to specify a deadline exceeds the maximum of "
+            + TimeValue.MAX_LONG_DEADLINE
+            + " nanoseconds.");
+  }
+
+  /** Report overflowing assignment. */
+  @Test
+  public void overflowingAssignmentC() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor Print(d:time(39 hours)) {
                     timer t;
@@ -736,17 +786,20 @@ reactor Print(d:time(39 hours)) {
                     p = new Print(d=40 hours);
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getAssignment(), null,
-            "Time value used to specify a deadline exceeds the maximum of " +
-                TimeValue.MAX_LONG_DEADLINE + " nanoseconds.");
-    }
-
-    /**
-     * Report missing trigger.
-     */
-    @Test
-    public void missingTrigger() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getAssignment(),
+        null,
+        "Time value used to specify a deadline exceeds the maximum of "
+            + TimeValue.MAX_LONG_DEADLINE
+            + " nanoseconds.");
+  }
+
+  /** Report missing trigger. */
+  @Test
+  public void missingTrigger() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor X {
                     reaction() {=
@@ -754,112 +807,148 @@ public void missingTrigger() throws Exception {
                     =}
                 }
             """;
-        validator.assertWarning(parseWithoutError(testCase), LfPackage.eINSTANCE.getReaction(), null,
-            "Reaction has no trigger.");
-    }
+    validator.assertWarning(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReaction(),
+        null,
+        "Reaction has no trigger.");
+  }
 
-    /**
-     * Test warnings and errors for the target dependent preamble visibility qualifiers
-     */
-    @Test
-    public void testPreambleVisibility() throws Exception {
-        for (Target target : Target.values()) {
-            for (Visibility visibility : Visibility.values()) {
-                Model model_reactor_scope = parseWithoutError("""
+  /** Test warnings and errors for the target dependent preamble visibility qualifiers */
+  @Test
+  public void testPreambleVisibility() throws Exception {
+    for (Target target : Target.values()) {
+      for (Visibility visibility : Visibility.values()) {
+        Model model_reactor_scope =
+            parseWithoutError(
+                """
                         target %s;
                         reactor Foo {
                             %spreamble {==}
                         }
-                    """.formatted(target, visibility != Visibility.NONE ? visibility + " " : ""));
+                    """
+                    .formatted(target, visibility != Visibility.NONE ? visibility + " " : ""));
 
-                Model model_file_scope = parseWithoutError("""
+        Model model_file_scope =
+            parseWithoutError(
+                """
                         target %s;
                         %spreamble {==}
                         reactor Foo {
                         }
-                    """.formatted(target, visibility != Visibility.NONE ? visibility + " " : ""));
+                    """
+                    .formatted(target, visibility != Visibility.NONE ? visibility + " " : ""));
 
-                Model model_no_preamble = parseWithoutError("""
+        Model model_no_preamble =
+            parseWithoutError(
+                """
                         target %s;
                         reactor Foo {
                         }
-                    """.formatted(target));
-
-                validator.assertNoIssues(model_no_preamble);
-
-                if (target == Target.CPP) {
-                    if (visibility == Visibility.NONE) {
-                        validator.assertError(model_file_scope, LfPackage.eINSTANCE.getPreamble(), null,
-                            "Preambles for the C++ target need a visibility qualifier (private or public)!");
-                        validator.assertError(model_reactor_scope, LfPackage.eINSTANCE.getPreamble(), null,
-                            "Preambles for the C++ target need a visibility qualifier (private or public)!");
-                    } else {
-                        validator.assertNoIssues(model_file_scope);
-                        validator.assertNoIssues(model_reactor_scope);
-                    }
-                } else {
-                    if (visibility == Visibility.NONE) {
-                        validator.assertNoIssues(model_file_scope);
-                        validator.assertNoIssues(model_reactor_scope);
-                    } else {
-                        validator.assertWarning(model_file_scope, LfPackage.eINSTANCE.getPreamble(), null,
-                            String.format("The %s qualifier has no meaning for the %s target. It should be removed.", visibility, target.name()));
-                        validator.assertWarning(model_reactor_scope, LfPackage.eINSTANCE.getPreamble(), null,
-                            String.format("The %s qualifier has no meaning for the %s target. It should be removed.", visibility, target.name()));
-                    }
-                }
-            }
+                    """
+                    .formatted(target));
+
+        validator.assertNoIssues(model_no_preamble);
+
+        if (target == Target.CPP) {
+          if (visibility == Visibility.NONE) {
+            validator.assertError(
+                model_file_scope,
+                LfPackage.eINSTANCE.getPreamble(),
+                null,
+                "Preambles for the C++ target need a visibility qualifier (private or public)!");
+            validator.assertError(
+                model_reactor_scope,
+                LfPackage.eINSTANCE.getPreamble(),
+                null,
+                "Preambles for the C++ target need a visibility qualifier (private or public)!");
+          } else {
+            validator.assertNoIssues(model_file_scope);
+            validator.assertNoIssues(model_reactor_scope);
+          }
+        } else {
+          if (visibility == Visibility.NONE) {
+            validator.assertNoIssues(model_file_scope);
+            validator.assertNoIssues(model_reactor_scope);
+          } else {
+            validator.assertWarning(
+                model_file_scope,
+                LfPackage.eINSTANCE.getPreamble(),
+                null,
+                String.format(
+                    "The %s qualifier has no meaning for the %s target. It should be removed.",
+                    visibility, target.name()));
+            validator.assertWarning(
+                model_reactor_scope,
+                LfPackage.eINSTANCE.getPreamble(),
+                null,
+                String.format(
+                    "The %s qualifier has no meaning for the %s target. It should be removed.",
+                    visibility, target.name()));
+          }
         }
+      }
     }
+  }
 
-    @Test
-    public void testInheritanceSupport() throws Exception {
-        for (Target target : Target.values()) {
-            Model model = parseWithoutError("""
+  @Test
+  public void testInheritanceSupport() throws Exception {
+    for (Target target : Target.values()) {
+      Model model =
+          parseWithoutError(
+              """
                     target %s
                     reactor A{}
                     reactor B extends A{}
-                """.formatted(target));
-
-            if (target.supportsInheritance()) {
-                validator.assertNoIssues(model);
-            } else {
-                validator.assertError(model, LfPackage.eINSTANCE.getReactor(), null,
-                    "The " + target.getDisplayName() + " target does not support reactor inheritance.");
-            }
-        }
+                """
+                  .formatted(target));
+
+      if (target.supportsInheritance()) {
+        validator.assertNoIssues(model);
+      } else {
+        validator.assertError(
+            model,
+            LfPackage.eINSTANCE.getReactor(),
+            null,
+            "The " + target.getDisplayName() + " target does not support reactor inheritance.");
+      }
     }
+  }
 
-    @Test
-    public void testFederationSupport() throws Exception {
-        for (Target target : Target.values()) {
-            Model model = parseWithoutError("""
+  @Test
+  public void testFederationSupport() throws Exception {
+    for (Target target : Target.values()) {
+      Model model =
+          parseWithoutError(
+              """
                     target %s
                     federated reactor {}
-                """.formatted(target));
-
-            if (target.supportsFederated()) {
-                validator.assertNoIssues(model);
-            } else {
-                validator.assertError(model, LfPackage.eINSTANCE.getReactor(), null,
-                    "The " + target.getDisplayName() + " target does not support federated execution.");
-            }
-        }
+                """
+                  .formatted(target));
+
+      if (target.supportsFederated()) {
+        validator.assertNoIssues(model);
+      } else {
+        validator.assertError(
+            model,
+            LfPackage.eINSTANCE.getReactor(),
+            null,
+            "The " + target.getDisplayName() + " target does not support federated execution.");
+      }
     }
+  }
 
-
-    /**
-     * Tests for state and parameter declarations, including native lists.
-     */
-    @Test
-    public void stateAndParameterDeclarationsInC() throws Exception {
-        String testCase = """
+  /** Tests for state and parameter declarations, including native lists. */
+  @Test
+  public void stateAndParameterDeclarationsInC() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor Bar(a(0),                // ERROR: type missing
                             b:int,               // ERROR: uninitialized
                             t:time = 42,          // ERROR: units missing
                             x:int = 0,
-                            h:time = "bla",       // ERROR: not a type 
+                            h:time = "bla",       // ERROR: not a type
                             q:time(1 msec, 2 msec),  // ERROR: not a list
                             y:int = t             // ERROR: init using parameter
                 ) {
@@ -870,878 +959,1039 @@ reactor Bar(a(0),                // ERROR: type missing
                 }
             """;
 
-        Model model = parseWithoutError(testCase);
-
-
-        validator.assertError(model, LfPackage.eINSTANCE.getParameter(), null,
-            "Type declaration missing.");
-        validator.assertError(model, LfPackage.eINSTANCE.getParameter(), null,
-            "Parameter must have a default value.");
-        validator.assertError(model, LfPackage.eINSTANCE.getParameter(), null,
-            "Missing time unit.");
-        validator.assertError(model, LfPackage.eINSTANCE.getParameter(), null,
-            "Invalid time value.");
-        validator.assertError(model, LfPackage.eINSTANCE.getParameter(), null,
-            "Expected exactly one time value.");
-        validator.assertError(model, LfPackage.eINSTANCE.getParameter(), null,
-            "Parameter cannot be initialized using parameter.");
-        validator.assertError(model, LfPackage.eINSTANCE.getStateVar(), null,
-            "Missing time unit.");
-        validator.assertError(model, LfPackage.eINSTANCE.getStateVar(), null,
-            "Referenced parameter is not of time type.");
-        validator.assertError(model, LfPackage.eINSTANCE.getStateVar(), null,
-            "Invalid time value.");
-        validator.assertError(model, LfPackage.eINSTANCE.getTimer(), null,
-            "Missing time unit.");
-    }
-
-
-    /**
-     * Recognize valid IPV4 addresses, report invalid ones.
-     */
-    @Test
-    public void recognizeIPV4() throws Exception {
-        List<String> correct = List.of("127.0.0.1", "10.0.0.1", "192.168.1.1", "0.0.0.0", "192.168.1.1");
-        List<String> parseError = List.of("10002.3.4", "1.2.3.4.5");
-        List<String> validationError = List.of("256.0.0.0", "260.0.0.0");
-
-        // Correct IP addresses.
-        for (String addr : correct) {
-
-            String testCase = """
+    Model model = parseWithoutError(testCase);
+
+    validator.assertError(
+        model, LfPackage.eINSTANCE.getParameter(), null, "Type declaration missing.");
+    validator.assertError(
+        model, LfPackage.eINSTANCE.getParameter(), null, "Parameter must have a default value.");
+    validator.assertError(model, LfPackage.eINSTANCE.getParameter(), null, "Missing time unit.");
+    validator.assertError(model, LfPackage.eINSTANCE.getParameter(), null, "Invalid time value.");
+    validator.assertError(
+        model, LfPackage.eINSTANCE.getParameter(), null, "Expected exactly one time value.");
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getParameter(),
+        null,
+        "Parameter cannot be initialized using parameter.");
+    validator.assertError(model, LfPackage.eINSTANCE.getStateVar(), null, "Missing time unit.");
+    validator.assertError(
+        model,
+        LfPackage.eINSTANCE.getStateVar(),
+        null,
+        "Referenced parameter is not of time type.");
+    validator.assertError(model, LfPackage.eINSTANCE.getStateVar(), null, "Invalid time value.");
+    validator.assertError(model, LfPackage.eINSTANCE.getTimer(), null, "Missing time unit.");
+  }
+
+  /** Recognize valid IPV4 addresses, report invalid ones. */
+  @Test
+  public void recognizeIPV4() throws Exception {
+    List<String> correct =
+        List.of("127.0.0.1", "10.0.0.1", "192.168.1.1", "0.0.0.0", "192.168.1.1");
+    List<String> parseError = List.of("10002.3.4", "1.2.3.4.5");
+    List<String> validationError = List.of("256.0.0.0", "260.0.0.0");
+
+    // Correct IP addresses.
+    for (String addr : correct) {
+
+      String testCase =
+          """
                     target C;
                     reactor Y {}
                     federated reactor X at foo@%s:4242 {
-                        y = new Y() at %s:2424; 
+                        y = new Y() at %s:2424;
                     }
-                """.formatted(addr, addr);
-            parseWithoutError(
-                testCase
-            );
-        }
+                """
+              .formatted(addr, addr);
+      parseWithoutError(testCase);
+    }
 
-        // IP addresses that don't parse.
-        for (String addr : parseError) {
-            String testCase = """
+    // IP addresses that don't parse.
+    for (String addr : parseError) {
+      String testCase =
+          """
                     target C;
                     reactor Y {}
                     federated reactor X at foo@%s:4242 {
-                        y = new Y() at %s:2424; 
+                        y = new Y() at %s:2424;
                     }
-                """.formatted(addr, addr);
-            parseWithError(testCase);
-        }
+                """
+              .formatted(addr, addr);
+      parseWithError(testCase);
+    }
 
-        // IP addresses that parse but are invalid.
-        for (String addr : validationError) {
-            Model model = parseWithoutError("""
+    // IP addresses that parse but are invalid.
+    for (String addr : validationError) {
+      Model model =
+          parseWithoutError(
+              """
                     target C;
                     reactor Y {}
                     federated reactor X at foo@%s:4242 {
-                        y = new Y() at %s:2424; 
+                        y = new Y() at %s:2424;
                     }
-                """.formatted(addr, addr));
-            validator.assertWarning(model, LfPackage.eINSTANCE.getHost(), null, "Invalid IP address.");
-        }
-    }
-
-    /**
-     * Recognize valid IPV6 addresses, report invalid ones.
-     */
-    @Test
-    public void recognizeIPV6() throws Exception {
-        List<String> correct = List.of("1:2:3:4:5:6:7:8", "1:2:3:4:5:6:7::", "1:2:3:4:5:6::8",
-            "1:2:3:4:5::8", "1:2:3:4::8", "1:2:3::8", "1:2::8", "1::8", "::8",
-            "::", "1::3:4:5:6:7:8", "1::4:5:6:7:8", "1::5:6:7:8", "1::6:7:8",
-            "1::7:8", "1::8", "1::", "1:2:3:4:5::7:8", "1:2:3:4::6:7:8",
-            "1:2:3::5:6:7:8", "1:2::4:5:6:7:8", "1::3:4:5:6:7:8",
-            "::2:3:4:5:6:7:8", "fe80::7:8", "fe80::7:8%eth0", "fe80::7:8%1",
-            "::255.255.255.255", "::ffff:255.255.255.255",
-            "::ffff:0:255.255.255.0", "::ffff:00:255.255.255.0",
-            "::ffff:000:255.255.255.0", "::ffff:0000:255.255.255.0",
-            "::ffff:0.0.0.0", "::ffff:1.2.3.4", "::ffff:10.0.0.1",
-            "1:2:3:4:5:6:77:88", "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
-            "2001:db8:3:4::192.0.2.33", "64:ff9b::192.0.2.33", "0:0:0:0:0:0:10.0.0.1");
-
-        List<String> validationError = List.of("1:2:3:4:5:6:7:8:9", "1:2:3:4:5:6::7:8",
-            "1:2:3:4:5:6:7:8:", "::1:2:3:4:5:6:7:8", "1:2:3:4:5:6:7:8::",
-            "1:2:3:4:5:6:7:88888", "2001:db8:3:4:5::192.0.2.33",
-            "fe08::7:8interface", "fe08::7:8interface", "fe08::7:8i");
-
-        List<String> parseError = List.of("fe08::7:8%", ":1:2:3:4:5:6:7:8");
-
-        // Correct IP addresses.
-        for (String addr : correct) {
-            String testCase = """
+                """
+                  .formatted(addr, addr));
+      validator.assertWarning(model, LfPackage.eINSTANCE.getHost(), null, "Invalid IP address.");
+    }
+  }
+
+  /** Recognize valid IPV6 addresses, report invalid ones. */
+  @Test
+  public void recognizeIPV6() throws Exception {
+    List<String> correct =
+        List.of(
+            "1:2:3:4:5:6:7:8",
+            "1:2:3:4:5:6:7::",
+            "1:2:3:4:5:6::8",
+            "1:2:3:4:5::8",
+            "1:2:3:4::8",
+            "1:2:3::8",
+            "1:2::8",
+            "1::8",
+            "::8",
+            "::",
+            "1::3:4:5:6:7:8",
+            "1::4:5:6:7:8",
+            "1::5:6:7:8",
+            "1::6:7:8",
+            "1::7:8",
+            "1::8",
+            "1::",
+            "1:2:3:4:5::7:8",
+            "1:2:3:4::6:7:8",
+            "1:2:3::5:6:7:8",
+            "1:2::4:5:6:7:8",
+            "1::3:4:5:6:7:8",
+            "::2:3:4:5:6:7:8",
+            "fe80::7:8",
+            "fe80::7:8%eth0",
+            "fe80::7:8%1",
+            "::255.255.255.255",
+            "::ffff:255.255.255.255",
+            "::ffff:0:255.255.255.0",
+            "::ffff:00:255.255.255.0",
+            "::ffff:000:255.255.255.0",
+            "::ffff:0000:255.255.255.0",
+            "::ffff:0.0.0.0",
+            "::ffff:1.2.3.4",
+            "::ffff:10.0.0.1",
+            "1:2:3:4:5:6:77:88",
+            "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
+            "2001:db8:3:4::192.0.2.33",
+            "64:ff9b::192.0.2.33",
+            "0:0:0:0:0:0:10.0.0.1");
+
+    List<String> validationError =
+        List.of(
+            "1:2:3:4:5:6:7:8:9",
+            "1:2:3:4:5:6::7:8",
+            "1:2:3:4:5:6:7:8:",
+            "::1:2:3:4:5:6:7:8",
+            "1:2:3:4:5:6:7:8::",
+            "1:2:3:4:5:6:7:88888",
+            "2001:db8:3:4:5::192.0.2.33",
+            "fe08::7:8interface",
+            "fe08::7:8interface",
+            "fe08::7:8i");
+
+    List<String> parseError = List.of("fe08::7:8%", ":1:2:3:4:5:6:7:8");
+
+    // Correct IP addresses.
+    for (String addr : correct) {
+      String testCase =
+          """
                     target C;
                     reactor Y {}
                     federated reactor at [foo@%s]:4242 {
-                        y = new Y() at [%s]:2424; 
+                        y = new Y() at [%s]:2424;
                     }
-                """.formatted(addr, addr);
-            Model model = parseWithoutError(testCase);
-            validator.assertNoIssues(model);
-        }
-
+                """
+              .formatted(addr, addr);
+      Model model = parseWithoutError(testCase);
+      validator.assertNoIssues(model);
+    }
 
-        // IP addresses that don't parse.
-        for (String addr : parseError) {
-            String testCase = """
+    // IP addresses that don't parse.
+    for (String addr : parseError) {
+      String testCase =
+          """
                     target C;
                     reactor Y {}
                     federated reactor X at [foo@%s]:4242 {
-                        y = new Y() at [%s]:2424; 
+                        y = new Y() at [%s]:2424;
                     }
-                """.formatted(addr, addr);
-            parseWithError(testCase);
-        }
+                """
+              .formatted(addr, addr);
+      parseWithError(testCase);
+    }
 
-        // IP addresses that parse but are invalid.
-        for (String addr : validationError) {
-            String testCase = """
+    // IP addresses that parse but are invalid.
+    for (String addr : validationError) {
+      String testCase =
+          """
                     target C;
                     reactor Y {}
                     federated reactor X at [foo@%s]:4242 {
-                        y = new Y() at [%s]:2424; 
+                        y = new Y() at [%s]:2424;
                     }
-                """.formatted(addr, addr);
-            Model model = parseWithoutError(
-                testCase
-            );
-            validator.assertWarning(model, LfPackage.eINSTANCE.getHost(), null, "Invalid IP address.");
-        }
+                """
+              .formatted(addr, addr);
+      Model model = parseWithoutError(testCase);
+      validator.assertWarning(model, LfPackage.eINSTANCE.getHost(), null, "Invalid IP address.");
     }
+  }
 
-    /**
-     * Recognize valid host names and fully qualified names, report invalid ones.
-     */
-    @Test
-    public void recognizeHostNames() throws Exception {
-
-        List<String> correct = List.of("localhost"); // FIXME: add more
+  /** Recognize valid host names and fully qualified names, report invalid ones. */
+  @Test
+  public void recognizeHostNames() throws Exception {
 
-        List<String> validationError = List.of("x.y.z"); // FIXME: add more
+    List<String> correct = List.of("localhost"); // FIXME: add more
 
-        List<String> parseError = List.of("..xyz"); // FIXME: add more
+    List<String> validationError = List.of("x.y.z"); // FIXME: add more
 
+    List<String> parseError = List.of("..xyz"); // FIXME: add more
 
-        // Correct names.
-        for (String addr : correct) {
-            String testCase = """
+    // Correct names.
+    for (String addr : correct) {
+      String testCase =
+          """
                     target C;
                     reactor Y {}
                     federated reactor X at foo@%s:4242 {
-                        y = new Y() at %s:2424; 
+                        y = new Y() at %s:2424;
                     }
-                """.formatted(addr, addr);
-            parseWithoutError(
-                testCase
-            );
-        }
+                """
+              .formatted(addr, addr);
+      parseWithoutError(testCase);
+    }
 
-        // Names that don't parse.
-        for (String addr : parseError) {
-            String testCase = """
+    // Names that don't parse.
+    for (String addr : parseError) {
+      String testCase =
+          """
                     target C;
                     reactor Y {}
                     federated reactor X at foo@%s:4242 {
-                        y = new Y() at %s:2424; 
+                        y = new Y() at %s:2424;
                     }
-                """.formatted(addr, addr);
-            parseWithError(
-                testCase
-            );
-        }
+                """
+              .formatted(addr, addr);
+      parseWithError(testCase);
+    }
 
-        // Names that parse but are invalid.
-        for (String addr : validationError) {
-            String testCase = """
+    // Names that parse but are invalid.
+    for (String addr : validationError) {
+      String testCase =
+          """
                     target C;
                     reactor Y {}
                     federated reactor X at foo@%s:4242 {
-                        y = new Y() at %s:2424; 
+                        y = new Y() at %s:2424;
                     }
-                """.formatted(addr, addr);
-            Model model = parseWithoutError(
-                testCase
-            );
-            validator.assertWarning(model, LfPackage.eINSTANCE.getHost(), null,
-                "Invalid host name or fully qualified domain name.");
-        }
-    }
-
-    /**
-     * Maps a type to a list of known good values.
-     */
-    Map<PrimitiveType, List<String>> primitiveTypeToKnownGood = Map.of(
-        PrimitiveType.BOOLEAN, List.of("true", "\"true\"", "false", "\"false\""),
-        PrimitiveType.INTEGER, List.of("0", "1", "\"42\"", "\"-1\"", "-2"),
-        PrimitiveType.NON_NEGATIVE_INTEGER, List.of("0", "1", "42"),
-        PrimitiveType.TIME_VALUE, List.of("1 msec", "2 sec"),
-        PrimitiveType.STRING, List.of("1", "\"foo\"", "bar"),
-        PrimitiveType.FILE, List.of("valid.file", "something.json", "\"foobar.proto\"")
-    );
-
-    /**
-     * Maps a type to a list of known bad values.
-     */
-    Map<PrimitiveType, List<String>> primitiveTypeToKnownBad = Map.of(
-        PrimitiveType.BOOLEAN, List.of("1 sec", "foo", "\"foo\"", "[1]", "{baz: 42}", "'c'"),
-        PrimitiveType.INTEGER, List.of("foo", "\"bar\"", "1 sec", "[1, 2]", "{foo: \"bar\"}", "'c'"),
-        PrimitiveType.NON_NEGATIVE_INTEGER, List.of("-42", "foo", "\"bar\"", "1 sec", "[1, 2]", "{foo: \"bar\"}", "'c'"),
-        PrimitiveType.TIME_VALUE, List.of("foo", "\"bar\"", "\"3 sec\"", "\"4 weeks\"", "[1, 2]", "{foo: \"bar\"}", "'c'"),
-        PrimitiveType.STRING, List.of("1 msec", "[1, 2]", "{foo: \"bar\"}", "'c'")
-    );
-
-    /**
-     * Maps a type to a list, each entry of which represents a list with
-     * three entries: a known wrong value, the suffix to add to the reported
-     * name, and the type that it should be.
-     */
-    Map<TargetPropertyType, List<List<Object>>> compositeTypeToKnownBad = Map.of(
-        ArrayType.STRING_ARRAY, List.of(
-            List.of("[1 msec]", "[0]", PrimitiveType.STRING),
-            List.of("[foo, {bar: baz}]", "[1]", PrimitiveType.STRING),
-            List.of("{bar: baz}", "", ArrayType.STRING_ARRAY)
-        ),
-        UnionType.STRING_OR_STRING_ARRAY, List.of(
-            List.of("[1 msec]", "[0]", PrimitiveType.STRING),
-            List.of("[foo, {bar: baz}]", "[1]", PrimitiveType.STRING),
-            List.of("{bar: baz}", "", UnionType.STRING_OR_STRING_ARRAY)
-        ),
-        UnionType.PLATFORM_STRING_OR_DICTIONARY, List.of(
-            List.of("[bar, baz]", "", UnionType.PLATFORM_STRING_OR_DICTIONARY),
-            List.of("{name: [1, 2, 3]}", ".name", PrimitiveType.STRING),
-            List.of("{name: {bar: baz}}", ".name", PrimitiveType.STRING),
-            List.of("{board: [1, 2, 3]}", ".board", PrimitiveType.STRING),
-            List.of("{board: {bar: baz}}", ".board", PrimitiveType.STRING),
-            List.of("{baud-rate: [1, 2, 3]}", ".baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER),
-            List.of("{baud-rate: {bar: baz}}", ".baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER)
-        ),
-        UnionType.FILE_OR_FILE_ARRAY, List.of(
-            List.of("[1 msec]", "[0]", PrimitiveType.FILE),
-            List.of("[foo, {bar: baz}]", "[1]", PrimitiveType.FILE),
-            List.of("{bar: baz}", "", UnionType.FILE_OR_FILE_ARRAY)
-        ),
-        UnionType.DOCKER_UNION, List.of(
-            List.of("foo", "", UnionType.DOCKER_UNION),
-            List.of("[1]", "", UnionType.DOCKER_UNION),
-            List.of("{bar: baz}", "", DictionaryType.DOCKER_DICT),
-            List.of("{FROM: [1, 2, 3]}", ".FROM", PrimitiveType.STRING)
-        ),
-        UnionType.TRACING_UNION, List.of(
-            List.of("foo", "", UnionType.TRACING_UNION),
-            List.of("[1]", "", UnionType.TRACING_UNION),
-            List.of("{bar: baz}", "", DictionaryType.TRACING_DICT),
-            List.of("{trace-file-name: [1, 2, 3]}", ".trace-file-name", PrimitiveType.STRING)
-        )
-    );
-
-    /**
-     * Given an array type, return a list of good or bad examples,
-     * depending on the value of the second parameter.
-     */
-    private List<String> synthesizeExamples(ArrayType type, boolean correct) {
-        Map<PrimitiveType, List<String>> values = correct ? primitiveTypeToKnownGood
-            : primitiveTypeToKnownBad;
-        List<String> examples = new LinkedList<>();
-        if (correct) {
-            // Produce an array that has an entry for each value.
-            List<String> entries = values.get(type.type);
-            if (!(entries == null || entries.isEmpty())) {
-                examples.add(String.format("[%s]", String.join(", ", entries)));
-            }
-        }
-        return examples;
-    }
-
-    /**
-     * Given an union type, return a list of good or bad examples,
-     * depending on the value of the second parameter.
-     */
-    private List<String> synthesizeExamples(UnionType type, boolean correct) {
-        List<String> examples = new LinkedList<>();
-        if (correct) {
-            for (Enum<?> it : type.options) {
-                if (it instanceof TargetPropertyType) {
-                    synthesizeExamples((TargetPropertyType) it, correct).forEach(ex -> examples.add(ex));
-                } else {
-                    examples.add(it.toString());
-                }
-            }
-        } else {
-            // Return some obviously bad examples for the common
-            // case where the options are from an ordinary Enum<?>.
-            if (!type.options.stream().anyMatch(it -> it instanceof TargetPropertyType)) {
-                return List.of("foo", "\"bar\"", "1", "-1", "{x: 42}", "[1, 2, 3]");
-            }
-        }
-        return examples;
-    }
-
-    /**
-     * Given an union type, return a list of good or bad examples,
-     * depending on the value of the second parameter.
-     */
-    private List<String> synthesizeExamples(DictionaryType type, boolean correct) {
-        List<String> examples = new LinkedList<>();
-        // Produce a set of singleton dictionaries.
-        // If incorrect examples are wanted, garble the key.
-        for (DictionaryElement option : type.options) {
-            synthesizeExamples(option.getType(), correct).forEach(it -> examples.add(
-                "{" + option + (!correct ? "iamwrong: " : ": ") + it + "}"));
-        }
-        return examples;
-    }
-
-    private List<String> synthesizeExamples(StringDictionaryType type, boolean correct) {
-        List<String> examples = new LinkedList<>();
-        // Produce a set of singleton dictionaries.
-        // If incorrect examples are wanted, use non-strings for values.
-        List<String> goodStrs = synthesizeExamples(PrimitiveType.STRING, true);
-        List<String> badStrs = synthesizeExamples(PrimitiveType.STRING, false);
-        List<String> goodIDs = List.of("foo", "Bar", "__ab0_9fC", "f1o_O2B_a3r");
-        if (correct) {
-            for (String gs : goodStrs) {
-                goodIDs.forEach(it -> examples.add("{" + it + ": " + gs + "}"));
-            }
-        } else {
-            for (String bs : badStrs) {
-                goodIDs.forEach(it -> examples.add("{" + it + ": " + bs + "}"));
-            }
-        }
-        return examples;
-    }
-
-    /**
-     * Synthesize a list of values that either conform to the given type or
-     * do not, depending on whether the second argument 'correct' is true.
-     * Return an empty set if it is too complicated to generate examples
-     * (e.g., because the resulting errors are more sophisticated).
-     * <p>
-     * Not all cases are covered by this function. Currently, the only cases not
-     * covered are known bad examples for composite types, which should be added
-     * to the compositeTypeToKnownBad map.
-     *
-     * @param correct True to synthesize correct examples automatically, otherwise
-     * synthesize incorrect examples.
-     */
-    private List<String> synthesizeExamples(TargetPropertyType type, boolean correct) {
-        if (type instanceof PrimitiveType) {
-            Map<PrimitiveType, List<String>> values = correct ? primitiveTypeToKnownGood
-                : primitiveTypeToKnownBad;
-            List<String> examples = values.get(type);
-            Assertions.assertNotNull(examples);
-            return examples;
+                """
+              .formatted(addr, addr);
+      Model model = parseWithoutError(testCase);
+      validator.assertWarning(
+          model,
+          LfPackage.eINSTANCE.getHost(),
+          null,
+          "Invalid host name or fully qualified domain name.");
+    }
+  }
+
+  /** Maps a type to a list of known good values. */
+  Map<PrimitiveType, List<String>> primitiveTypeToKnownGood =
+      Map.of(
+          PrimitiveType.BOOLEAN, List.of("true", "\"true\"", "false", "\"false\""),
+          PrimitiveType.INTEGER, List.of("0", "1", "\"42\"", "\"-1\"", "-2"),
+          PrimitiveType.NON_NEGATIVE_INTEGER, List.of("0", "1", "42"),
+          PrimitiveType.TIME_VALUE, List.of("1 msec", "2 sec"),
+          PrimitiveType.STRING, List.of("1", "\"foo\"", "bar"),
+          PrimitiveType.FILE, List.of("valid.file", "something.json", "\"foobar.proto\""));
+
+  /** Maps a type to a list of known bad values. */
+  Map<PrimitiveType, List<String>> primitiveTypeToKnownBad =
+      Map.of(
+          PrimitiveType.BOOLEAN, List.of("1 sec", "foo", "\"foo\"", "[1]", "{baz: 42}", "'c'"),
+          PrimitiveType.INTEGER,
+              List.of("foo", "\"bar\"", "1 sec", "[1, 2]", "{foo: \"bar\"}", "'c'"),
+          PrimitiveType.NON_NEGATIVE_INTEGER,
+              List.of("-42", "foo", "\"bar\"", "1 sec", "[1, 2]", "{foo: \"bar\"}", "'c'"),
+          PrimitiveType.TIME_VALUE,
+              List.of(
+                  "foo", "\"bar\"", "\"3 sec\"", "\"4 weeks\"", "[1, 2]", "{foo: \"bar\"}", "'c'"),
+          PrimitiveType.STRING, List.of("1 msec", "[1, 2]", "{foo: \"bar\"}", "'c'"));
+
+  /**
+   * Maps a type to a list, each entry of which represents a list with three entries: a known wrong
+   * value, the suffix to add to the reported name, and the type that it should be.
+   */
+  Map<TargetPropertyType, List<List<Object>>> compositeTypeToKnownBad =
+      Map.of(
+          ArrayType.STRING_ARRAY,
+              List.of(
+                  List.of("[1 msec]", "[0]", PrimitiveType.STRING),
+                  List.of("[foo, {bar: baz}]", "[1]", PrimitiveType.STRING),
+                  List.of("{bar: baz}", "", ArrayType.STRING_ARRAY)),
+          UnionType.STRING_OR_STRING_ARRAY,
+              List.of(
+                  List.of("[1 msec]", "[0]", PrimitiveType.STRING),
+                  List.of("[foo, {bar: baz}]", "[1]", PrimitiveType.STRING),
+                  List.of("{bar: baz}", "", UnionType.STRING_OR_STRING_ARRAY)),
+          UnionType.PLATFORM_STRING_OR_DICTIONARY,
+              List.of(
+                  List.of("[bar, baz]", "", UnionType.PLATFORM_STRING_OR_DICTIONARY),
+                  List.of("{name: [1, 2, 3]}", ".name", PrimitiveType.STRING),
+                  List.of("{name: {bar: baz}}", ".name", PrimitiveType.STRING),
+                  List.of("{board: [1, 2, 3]}", ".board", PrimitiveType.STRING),
+                  List.of("{board: {bar: baz}}", ".board", PrimitiveType.STRING),
+                  List.of(
+                      "{baud-rate: [1, 2, 3]}", ".baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER),
+                  List.of(
+                      "{baud-rate: {bar: baz}}", ".baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER)),
+          UnionType.FILE_OR_FILE_ARRAY,
+              List.of(
+                  List.of("[1 msec]", "[0]", PrimitiveType.FILE),
+                  List.of("[foo, {bar: baz}]", "[1]", PrimitiveType.FILE),
+                  List.of("{bar: baz}", "", UnionType.FILE_OR_FILE_ARRAY)),
+          UnionType.DOCKER_UNION,
+              List.of(
+                  List.of("foo", "", UnionType.DOCKER_UNION),
+                  List.of("[1]", "", UnionType.DOCKER_UNION),
+                  List.of("{bar: baz}", "", DictionaryType.DOCKER_DICT),
+                  List.of("{FROM: [1, 2, 3]}", ".FROM", PrimitiveType.STRING)),
+          UnionType.TRACING_UNION,
+              List.of(
+                  List.of("foo", "", UnionType.TRACING_UNION),
+                  List.of("[1]", "", UnionType.TRACING_UNION),
+                  List.of("{bar: baz}", "", DictionaryType.TRACING_DICT),
+                  List.of(
+                      "{trace-file-name: [1, 2, 3]}", ".trace-file-name", PrimitiveType.STRING)));
+
+  /**
+   * Given an array type, return a list of good or bad examples, depending on the value of the
+   * second parameter.
+   */
+  private List<String> synthesizeExamples(ArrayType type, boolean correct) {
+    Map<PrimitiveType, List<String>> values =
+        correct ? primitiveTypeToKnownGood : primitiveTypeToKnownBad;
+    List<String> examples = new LinkedList<>();
+    if (correct) {
+      // Produce an array that has an entry for each value.
+      List<String> entries = values.get(type.type);
+      if (!(entries == null || entries.isEmpty())) {
+        examples.add(String.format("[%s]", String.join(", ", entries)));
+      }
+    }
+    return examples;
+  }
+
+  /**
+   * Given an union type, return a list of good or bad examples, depending on the value of the
+   * second parameter.
+   */
+  private List<String> synthesizeExamples(UnionType type, boolean correct) {
+    List<String> examples = new LinkedList<>();
+    if (correct) {
+      for (Enum<?> it : type.options) {
+        if (it instanceof TargetPropertyType) {
+          synthesizeExamples((TargetPropertyType) it, correct).forEach(ex -> examples.add(ex));
         } else {
-            if (type instanceof UnionType) {
-                return synthesizeExamples((UnionType) type, correct);
-            } else if (type instanceof ArrayType) {
-                return synthesizeExamples((ArrayType) type, correct);
-            } else if (type instanceof DictionaryType) {
-                return synthesizeExamples((DictionaryType) type, correct);
-            } else if (type instanceof StringDictionaryType) {
-                return synthesizeExamples((StringDictionaryType) type, correct);
-            } else {
-                Assertions.fail("Encountered an unknown type: " + type);
-            }
+          examples.add(it.toString());
         }
-        return new LinkedList<>();
-    }
-
-    /**
-     * Create an LF program with the given key and value as a target property,
-     * parse it, and return the resulting model.
-     */
-    private Model createModel(TargetProperty key, String value) throws Exception {
-        String target = key.supportedBy.get(0).getDisplayName();
-        System.out.printf("%s: %s%n", key, value);
-        return parseWithoutError("""
+      }
+    } else {
+      // Return some obviously bad examples for the common
+      // case where the options are from an ordinary Enum<?>.
+      if (!type.options.stream().anyMatch(it -> it instanceof TargetPropertyType)) {
+        return List.of("foo", "\"bar\"", "1", "-1", "{x: 42}", "[1, 2, 3]");
+      }
+    }
+    return examples;
+  }
+
+  /**
+   * Given an union type, return a list of good or bad examples, depending on the value of the
+   * second parameter.
+   */
+  private List<String> synthesizeExamples(DictionaryType type, boolean correct) {
+    List<String> examples = new LinkedList<>();
+    // Produce a set of singleton dictionaries.
+    // If incorrect examples are wanted, garble the key.
+    for (DictionaryElement option : type.options) {
+      synthesizeExamples(option.getType(), correct)
+          .forEach(it -> examples.add("{" + option + (!correct ? "iamwrong: " : ": ") + it + "}"));
+    }
+    return examples;
+  }
+
+  private List<String> synthesizeExamples(StringDictionaryType type, boolean correct) {
+    List<String> examples = new LinkedList<>();
+    // Produce a set of singleton dictionaries.
+    // If incorrect examples are wanted, use non-strings for values.
+    List<String> goodStrs = synthesizeExamples(PrimitiveType.STRING, true);
+    List<String> badStrs = synthesizeExamples(PrimitiveType.STRING, false);
+    List<String> goodIDs = List.of("foo", "Bar", "__ab0_9fC", "f1o_O2B_a3r");
+    if (correct) {
+      for (String gs : goodStrs) {
+        goodIDs.forEach(it -> examples.add("{" + it + ": " + gs + "}"));
+      }
+    } else {
+      for (String bs : badStrs) {
+        goodIDs.forEach(it -> examples.add("{" + it + ": " + bs + "}"));
+      }
+    }
+    return examples;
+  }
+
+  /**
+   * Synthesize a list of values that either conform to the given type or do not, depending on
+   * whether the second argument 'correct' is true. Return an empty set if it is too complicated to
+   * generate examples (e.g., because the resulting errors are more sophisticated).
+   *
+   * <p>Not all cases are covered by this function. Currently, the only cases not covered are known
+   * bad examples for composite types, which should be added to the compositeTypeToKnownBad map.
+   *
+   * @param correct True to synthesize correct examples automatically, otherwise synthesize
+   *     incorrect examples.
+   */
+  private List<String> synthesizeExamples(TargetPropertyType type, boolean correct) {
+    if (type instanceof PrimitiveType) {
+      Map<PrimitiveType, List<String>> values =
+          correct ? primitiveTypeToKnownGood : primitiveTypeToKnownBad;
+      List<String> examples = values.get(type);
+      Assertions.assertNotNull(examples);
+      return examples;
+    } else {
+      if (type instanceof UnionType) {
+        return synthesizeExamples((UnionType) type, correct);
+      } else if (type instanceof ArrayType) {
+        return synthesizeExamples((ArrayType) type, correct);
+      } else if (type instanceof DictionaryType) {
+        return synthesizeExamples((DictionaryType) type, correct);
+      } else if (type instanceof StringDictionaryType) {
+        return synthesizeExamples((StringDictionaryType) type, correct);
+      } else {
+        Assertions.fail("Encountered an unknown type: " + type);
+      }
+    }
+    return new LinkedList<>();
+  }
+
+  /**
+   * Create an LF program with the given key and value as a target property, parse it, and return
+   * the resulting model.
+   */
+  private Model createModel(TargetProperty key, String value) throws Exception {
+    String target = key.supportedBy.get(0).getDisplayName();
+    System.out.printf("%s: %s%n", key, value);
+    return parseWithoutError(
+        """
                 target %s {%s: %s};
                 reactor Y {}
                 main reactor {
-                    y = new Y() 
-                }
-            """.formatted(target, key, value));
-    }
-
-    /**
-     * Perform checks on target properties.
-     */
-    @Test
-    public void checkTargetProperties() throws Exception {
-        for (TargetProperty prop : TargetProperty.getOptions()) {
-            if (prop == TargetProperty.CARGO_DEPENDENCIES) {
-                // we test that separately as it has better error messages
-                return;
-            }
-            System.out.printf("Testing target property %s which is %s%n", prop, prop.type);
-            System.out.println("====");
-            System.out.println("Known good assignments:");
-            List<String> knownCorrect = synthesizeExamples(prop.type, true);
-
-            for (String it : knownCorrect) {
-                Model model = createModel(prop, it);
-                validator.assertNoErrors(model);
-                // Also make sure warnings are produced when files are not present.
-                if (prop.type == PrimitiveType.FILE) {
-                    validator.assertWarning(model, LfPackage.eINSTANCE.getKeyValuePair(),
-                        null, String.format("Could not find file: '%s'.", StringUtil.removeQuotes(it)));
-                }
-            }
-
-            // Extra checks for filenames. (This piece of code was commented out in the original xtend file)
-            // Temporarily disabled because we need a more sophisticated check that looks for files in different places.
-//            if (prop.type == prop.type == ArrayType.FILE_ARRAY ||
-//                prop.type == UnionType.FILE_OR_FILE_ARRAY) {
-//                val model = prop.createModel(
-//                    synthesizeExamples(ArrayType.FILE_ARRAY, true).get(0))
-//                primitiveTypeToKnownGood.get(PrimitiveType.FILE).forEach [
-//                    model.assertWarning(
-//                        LfPackage.eINSTANCE.keyValuePair,
-//                        null, '''Could not find file: '«it.withoutQuotes»'.''')
-//                ]
-//            }
-
-            System.out.println("Known bad assignments:");
-            List<String> knownIncorrect = synthesizeExamples(prop.type, false);
-            if (!(knownIncorrect == null || knownIncorrect.isEmpty())) {
-                for (String it : knownIncorrect) {
-                    if (prop.type instanceof StringDictionaryType) {
-                        validator.assertError(createModel(prop, it),
-                            LfPackage.eINSTANCE.getKeyValuePair(), null,
-                            String.format("Target property '%s.", prop), "' is required to be a string.");
-                    } else {
-                        validator.assertError(createModel(prop, it),
-                            LfPackage.eINSTANCE.getKeyValuePair(), null,
-                            String.format("Target property '%s' is required to be %s.", prop, prop.type));
-                    }
-                }
-            } else {
-                // No type was synthesized. It must be a composite type.
-                List<List<Object>> list = compositeTypeToKnownBad.get(prop.type);
-                if (list == null) {
-                    System.out.printf("No known incorrect values provided for target property '%s'. Aborting test.%n", prop);
-                    Assertions.fail();
-                } else {
-                    for (List<Object> it : list) {
-                        validator.assertError(createModel(prop, it.get(0).toString()),
-                            LfPackage.eINSTANCE.getKeyValuePair(), null,
-                            String.format("Target property '%s%s' is required to be %s.", prop, it.get(1), it.get(2)));
-                    }
-                }
-            }
-            System.out.println("====");
+                    y = new Y()
+                }
+            """
+            .formatted(target, key, value));
+  }
+
+  /** Perform checks on target properties. */
+  @Test
+  public void checkTargetProperties() throws Exception {
+    for (TargetProperty prop : TargetProperty.getOptions()) {
+      if (prop == TargetProperty.CARGO_DEPENDENCIES) {
+        // we test that separately as it has better error messages
+        return;
+      }
+      System.out.printf("Testing target property %s which is %s%n", prop, prop.type);
+      System.out.println("====");
+      System.out.println("Known good assignments:");
+      List<String> knownCorrect = synthesizeExamples(prop.type, true);
+
+      for (String it : knownCorrect) {
+        Model model = createModel(prop, it);
+        validator.assertNoErrors(model);
+        // Also make sure warnings are produced when files are not present.
+        if (prop.type == PrimitiveType.FILE) {
+          validator.assertWarning(
+              model,
+              LfPackage.eINSTANCE.getKeyValuePair(),
+              null,
+              String.format("Could not find file: '%s'.", StringUtil.removeQuotes(it)));
         }
-        System.out.println("Done!");
-    }
-
-
-    @Test
-    public void checkCargoDependencyProperty() throws Exception {
-        TargetProperty prop = TargetProperty.CARGO_DEPENDENCIES;
-        List<String> knownCorrect = List.of("{}", "{ dep: \"8.2\" }", "{ dep: { version: \"8.2\"} }", "{ dep: { version: \"8.2\", features: [\"foo\"]} }");
-        for (String it : knownCorrect) {
-            validator.assertNoErrors(createModel(prop, it));
+      }
+
+      // Extra checks for filenames. (This piece of code was commented out in the original xtend
+      // file)
+      // Temporarily disabled because we need a more sophisticated check that looks for files in
+      // different places.
+      //            if (prop.type == prop.type == ArrayType.FILE_ARRAY ||
+      //                prop.type == UnionType.FILE_OR_FILE_ARRAY) {
+      //                val model = prop.createModel(
+      //                    synthesizeExamples(ArrayType.FILE_ARRAY, true).get(0))
+      //                primitiveTypeToKnownGood.get(PrimitiveType.FILE).forEach [
+      //                    model.assertWarning(
+      //                        LfPackage.eINSTANCE.keyValuePair,
+      //                        null, '''Could not find file: '«it.withoutQuotes»'.''')
+      //                ]
+      //            }
+
+      System.out.println("Known bad assignments:");
+      List<String> knownIncorrect = synthesizeExamples(prop.type, false);
+      if (!(knownIncorrect == null || knownIncorrect.isEmpty())) {
+        for (String it : knownIncorrect) {
+          if (prop.type instanceof StringDictionaryType) {
+            validator.assertError(
+                createModel(prop, it),
+                LfPackage.eINSTANCE.getKeyValuePair(),
+                null,
+                String.format("Target property '%s.", prop),
+                "' is required to be a string.");
+          } else {
+            validator.assertError(
+                createModel(prop, it),
+                LfPackage.eINSTANCE.getKeyValuePair(),
+                null,
+                String.format("Target property '%s' is required to be %s.", prop, prop.type));
+          }
         }
-
-        //                                               vvvvvvvvvvv
-        validator.assertError(createModel(prop, "{ dep: {/*empty*/} }"),
-            LfPackage.eINSTANCE.getKeyValuePairs(), null, "Must specify one of 'version', 'path', or 'git'"
-        );
-
-        //                                                vvvvvvvvvvv
-        validator.assertError(createModel(prop, "{ dep: { unknown_key: \"\"} }"),
-            LfPackage.eINSTANCE.getKeyValuePair(), null, "Unknown key: 'unknown_key'"
-        );
-
-        //                                                          vvvv
-        validator.assertError(createModel(prop, "{ dep: { features: \"\" } }"),
-            LfPackage.eINSTANCE.getElement(), null, "Expected an array of strings for key 'features'"
-        );
-    }
-
-    @Test
-    public void testImportedCyclicReactor() throws Exception {
-        // File tempFile = File.createTempFile("lf-validation", ".lf");
-        // tempFile.deleteOnExit();
-        // // Java 17:
-        // //         String fileToBeImported = """
-        // //             target C;
-        // //             reactor A {
-        // //                 a = new A();
-        // //             }
-        // //         """
-        // // Java 11:
-        // String fileToBeImported = String.join(System.getProperty("line.separator"),
-        //     "target C;",
-        //     "reactor A {",
-        //     "    a = new A();",
-        //     "}"
-        // );
-        // BufferedWriter writer = new BufferedWriter(new FileWriter(tempFile));
-        // writer.write(fileToBeImported);
-        // writer.close();
-
-        // // Java 17:
-        // //         String testCase = """
-        // //             target C;
-        // //             import A from ...
-        // //             main reactor {
-        // //             }
-        // //         """
-        // // Java 11:
-        // String testCase = String.join(System.getProperty("line.separator"),
-        //     "target C;",
-        //     String.format("import A from \"%s\"", tempFile.getAbsolutePath()),
-        //     "main reactor {",
-        //     "}"
-        // );
-        // Model model = parseWithoutError(testCase);
-        // TODO: Uncomment the lines below and resolve the weird error. (java.lang.IllegalArgumentException: resolve against non-hierarchical or relative base)
-        // validator.assertError(model, LfPackage.eINSTANCE.getImportedReactor(), null, "Imported reactor 'A' has cyclic instantiation in it.");
-    }
-
-    @Test
-    public void testUnusedImport() throws Exception {
-        // File tempFile = File.createTempFile("lf-validation", ".lf");
-        // tempFile.deleteOnExit();
-        // // Java 17:
-        // //         String fileToBeImported = """
-        // //             target C;
-        // //             reactor A {}
-        // //         """
-        // // Java 11:
-        // String fileToBeImported = String.join(System.getProperty("line.separator"),
-        //     "target C;",
-        //     "reactor A{}"
-        // );
-        // BufferedWriter writer = new BufferedWriter(new FileWriter(tempFile));
-        // writer.write(fileToBeImported);
-        // writer.close();
-
-        // // Java 17:
-        // //         String testCase = """
-        // //             target C;
-        // //             import A from ...
-        // //             main reactor {}
-        // //         """
-        // // Java 11:
-        // String testCase = String.join(System.getProperty("line.separator"),
-        //     "target C;",
-        //     String.format("import A from \"%s\"", tempFile.getAbsolutePath()),
-        //     "main reactor{}"
-        // );
-        // Model model = parseWithoutError(testCase);
-        // TODO: Uncomment the lines below and resolve the weird error. (java.lang.IllegalArgumentException: resolve against non-hierarchical or relative base)
-        // validator.assertWarning(model, LfPackage.eINSTANCE.getImport(), null, "Unused import.");
-        // validator.assertWarning(parseWithoutError(testCase), LfPackage.eINSTANCE.getImportedReactor(), null, "Unused reactor class.");
-    }
-
-    @Test
-    public void testMissingInputType() throws Exception {
-        String testCase = """
+      } else {
+        // No type was synthesized. It must be a composite type.
+        List<List<Object>> list = compositeTypeToKnownBad.get(prop.type);
+        if (list == null) {
+          System.out.printf(
+              "No known incorrect values provided for target property '%s'. Aborting test.%n",
+              prop);
+          Assertions.fail();
+        } else {
+          for (List<Object> it : list) {
+            validator.assertError(
+                createModel(prop, it.get(0).toString()),
+                LfPackage.eINSTANCE.getKeyValuePair(),
+                null,
+                String.format(
+                    "Target property '%s%s' is required to be %s.", prop, it.get(1), it.get(2)));
+          }
+        }
+      }
+      System.out.println("====");
+    }
+    System.out.println("Done!");
+  }
+
+  @Test
+  public void checkCargoDependencyProperty() throws Exception {
+    TargetProperty prop = TargetProperty.CARGO_DEPENDENCIES;
+    List<String> knownCorrect =
+        List.of(
+            "{}",
+            "{ dep: \"8.2\" }",
+            "{ dep: { version: \"8.2\"} }",
+            "{ dep: { version: \"8.2\", features: [\"foo\"]} }");
+    for (String it : knownCorrect) {
+      validator.assertNoErrors(createModel(prop, it));
+    }
+
+    //                                               vvvvvvvvvvv
+    validator.assertError(
+        createModel(prop, "{ dep: {/*empty*/} }"),
+        LfPackage.eINSTANCE.getKeyValuePairs(),
+        null,
+        "Must specify one of 'version', 'path', or 'git'");
+
+    //                                                vvvvvvvvvvv
+    validator.assertError(
+        createModel(prop, "{ dep: { unknown_key: \"\"} }"),
+        LfPackage.eINSTANCE.getKeyValuePair(),
+        null,
+        "Unknown key: 'unknown_key'");
+
+    //                                                          vvvv
+    validator.assertError(
+        createModel(prop, "{ dep: { features: \"\" } }"),
+        LfPackage.eINSTANCE.getElement(),
+        null,
+        "Expected an array of strings for key 'features'");
+  }
+
+  @Test
+  public void testImportedCyclicReactor() throws Exception {
+    // File tempFile = File.createTempFile("lf-validation", ".lf");
+    // tempFile.deleteOnExit();
+    // // Java 17:
+    // //         String fileToBeImported = """
+    // //             target C;
+    // //             reactor A {
+    // //                 a = new A();
+    // //             }
+    // //         """
+    // // Java 11:
+    // String fileToBeImported = String.join(System.getProperty("line.separator"),
+    //     "target C;",
+    //     "reactor A {",
+    //     "    a = new A();",
+    //     "}"
+    // );
+    // BufferedWriter writer = new BufferedWriter(new FileWriter(tempFile));
+    // writer.write(fileToBeImported);
+    // writer.close();
+
+    // // Java 17:
+    // //         String testCase = """
+    // //             target C;
+    // //             import A from ...
+    // //             main reactor {
+    // //             }
+    // //         """
+    // // Java 11:
+    // String testCase = String.join(System.getProperty("line.separator"),
+    //     "target C;",
+    //     String.format("import A from \"%s\"", tempFile.getAbsolutePath()),
+    //     "main reactor {",
+    //     "}"
+    // );
+    // Model model = parseWithoutError(testCase);
+    // TODO: Uncomment the lines below and resolve the weird error.
+    // (java.lang.IllegalArgumentException: resolve against non-hierarchical or relative base)
+    // validator.assertError(model, LfPackage.eINSTANCE.getImportedReactor(), null, "Imported
+    // reactor 'A' has cyclic instantiation in it.");
+  }
+
+  @Test
+  public void testUnusedImport() throws Exception {
+    // File tempFile = File.createTempFile("lf-validation", ".lf");
+    // tempFile.deleteOnExit();
+    // // Java 17:
+    // //         String fileToBeImported = """
+    // //             target C;
+    // //             reactor A {}
+    // //         """
+    // // Java 11:
+    // String fileToBeImported = String.join(System.getProperty("line.separator"),
+    //     "target C;",
+    //     "reactor A{}"
+    // );
+    // BufferedWriter writer = new BufferedWriter(new FileWriter(tempFile));
+    // writer.write(fileToBeImported);
+    // writer.close();
+
+    // // Java 17:
+    // //         String testCase = """
+    // //             target C;
+    // //             import A from ...
+    // //             main reactor {}
+    // //         """
+    // // Java 11:
+    // String testCase = String.join(System.getProperty("line.separator"),
+    //     "target C;",
+    //     String.format("import A from \"%s\"", tempFile.getAbsolutePath()),
+    //     "main reactor{}"
+    // );
+    // Model model = parseWithoutError(testCase);
+    // TODO: Uncomment the lines below and resolve the weird error.
+    // (java.lang.IllegalArgumentException: resolve against non-hierarchical or relative base)
+    // validator.assertWarning(model, LfPackage.eINSTANCE.getImport(), null, "Unused import.");
+    // validator.assertWarning(parseWithoutError(testCase),
+    // LfPackage.eINSTANCE.getImportedReactor(), null, "Unused reactor class.");
+  }
+
+  @Test
+  public void testMissingInputType() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     input i;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getInput(), null,
-            "Input must have a type.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getInput(),
+        null,
+        "Input must have a type.");
+  }
 
-    @Test
-    public void testMissingOutputType() throws Exception {
-        String testCase = """
+  @Test
+  public void testMissingOutputType() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     output i;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getOutput(), null,
-            "Output must have a type.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getOutput(),
+        null,
+        "Output must have a type.");
+  }
 
-    @Test
-    public void testMissingStateType() throws Exception {
-        String testCase = """
+  @Test
+  public void testMissingStateType() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     state i;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getStateVar(), null,
-            "State must have a type.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getStateVar(),
+        null,
+        "State must have a type.");
+  }
 
-    @Test
-    public void testListWithParam() throws Exception {
-        String testCase = """
+  @Test
+  public void testListWithParam() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor (A:int(1)) { state i:int(A, 2, 3) }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getStateVar(), null,
-            "List items cannot refer to a parameter.");
-    }
-
-    @Test
-    public void testCppMutableInput() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getStateVar(),
+        null,
+        "List items cannot refer to a parameter.");
+  }
+
+  @Test
+  public void testCppMutableInput() throws Exception {
+    String testCase =
+        """
                 target Cpp;
                 main reactor {
                     mutable input i:int;
                 }
             """;
-        validator.assertWarning(parseWithoutError(testCase), LfPackage.eINSTANCE.getInput(), null,
-            "The mutable qualifier has no meaning for the C++ target and should be removed. " +
-                "In C++, any value can be made mutable by calling get_mutable_copy().");
-    }
+    validator.assertWarning(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getInput(),
+        null,
+        "The mutable qualifier has no meaning for the C++ target and should be removed. "
+            + "In C++, any value can be made mutable by calling get_mutable_copy().");
+  }
 
-    @Test
-    public void testOverflowingSTP() throws Exception {
-        String testCase = """
+  @Test
+  public void testOverflowingSTP() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     reaction(startup) {==} STP(2147483648) {==}
                 }
             """;
 
-        // TODO: Uncomment and fix failing test. See issue #903 on Github.
-        // validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getSTP(), null,
-        // "STP offset exceeds the maximum of " + TimeValue.MAX_LONG_DEADLINE + " nanoseconds.");
-    }
+    // TODO: Uncomment and fix failing test. See issue #903 on Github.
+    // validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getSTP(), null,
+    // "STP offset exceeds the maximum of " + TimeValue.MAX_LONG_DEADLINE + " nanoseconds.");
+  }
 
-    @Test
-    public void testOverflowingDeadline() throws Exception {
-        String testCase = """
+  @Test
+  public void testOverflowingDeadline() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     reaction(startup) {==} STP(2147483648) {==}
                 }
             """;
 
-        // TODO: Uncomment and fix failing test. See issue #903 on Github.
-        // validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getDeadline(), null,
-        // "Deadline exceeds the maximum of " + TimeValue.MAX_LONG_DEADLINE + " nanoseconds.");
-    }
+    // TODO: Uncomment and fix failing test. See issue #903 on Github.
+    // validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getDeadline(), null,
+    // "Deadline exceeds the maximum of " + TimeValue.MAX_LONG_DEADLINE + " nanoseconds.");
+  }
 
-    @Test
-    public void testInvalidTargetParam() throws Exception {
-        String testCase = """
+  @Test
+  public void testInvalidTargetParam() throws Exception {
+    String testCase =
+        """
                 target C { beefyDesktop: true }
                 main reactor {}
             """;
-        List<Issue> issues = validator.validate(parseWithoutError(testCase));
-        Assertions.assertTrue(issues.size() == 1
+    List<Issue> issues = validator.validate(parseWithoutError(testCase));
+    Assertions.assertTrue(
+        issues.size() == 1
             && issues.get(0).getMessage().contains("Unrecognized target parameter: beefyDesktop"));
-    }
+  }
 
-    @Test
-    public void testTargetParamNotSupportedForTarget() throws Exception {
-        String testCase = """
+  @Test
+  public void testTargetParamNotSupportedForTarget() throws Exception {
+    String testCase =
+        """
                 target Python { build: "" }
                 main reactor {}
             """;
-        List<Issue> issues = validator.validate(parseWithoutError(testCase));
-        Assertions.assertTrue(issues.size() == 1 && issues.get(0).getMessage().contains(
-            "The target parameter: build" +
-                " is not supported by the Python target and will thus be ignored."));
-    }
-
-    @Test
-    public void testUnnamedReactor() throws Exception {
-        String testCase = """
+    List<Issue> issues = validator.validate(parseWithoutError(testCase));
+    Assertions.assertTrue(
+        issues.size() == 1
+            && issues
+                .get(0)
+                .getMessage()
+                .contains(
+                    "The target parameter: build"
+                        + " is not supported by the Python target and will thus be ignored."));
+  }
+
+  @Test
+  public void testUnnamedReactor() throws Exception {
+    String testCase = """
                 target C;
                 reactor {}
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getReactor(), null,
-            "Reactor must be named.");
-    }
-
-    @Test
-    public void testMainHasInput() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Reactor must be named.");
+  }
+
+  @Test
+  public void testMainHasInput() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     input x:int;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getInput(), null,
-            "Main reactor cannot have inputs.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getInput(),
+        null,
+        "Main reactor cannot have inputs.");
+  }
 
-    @Test
-    public void testFederatedHasInput() throws Exception {
+  @Test
+  public void testFederatedHasInput() throws Exception {
 
-        String testCase = """
+    String testCase =
+        """
                 target C;
                 federated reactor {
                     input x:int;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getInput(), null,
-            "Main reactor cannot have inputs.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getInput(),
+        null,
+        "Main reactor cannot have inputs.");
+  }
 
-    @Test
-    public void testMainHasOutput() throws Exception {
+  @Test
+  public void testMainHasOutput() throws Exception {
 
-        String testCase = """
+    String testCase =
+        """
                 target C;
                 main reactor {
                     output x:int;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getOutput(), null,
-            "Main reactor cannot have outputs.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getOutput(),
+        null,
+        "Main reactor cannot have outputs.");
+  }
 
-    @Test
-    public void testFederatedHasOutput() throws Exception {
+  @Test
+  public void testFederatedHasOutput() throws Exception {
 
-        String testCase = """
+    String testCase =
+        """
                 target C;
                 federated reactor {
                     output x:int;
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getOutput(), null,
-            "Main reactor cannot have outputs.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getOutput(),
+        null,
+        "Main reactor cannot have outputs.");
+  }
 
-    @Test
-    public void testMultipleMainReactor() throws Exception {
+  @Test
+  public void testMultipleMainReactor() throws Exception {
 
-        String testCase = """
+    String testCase =
+        """
                 target C;
                 main reactor A {}
                 main reactor A {}
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getReactor(), null,
-            "Multiple definitions of main or federated reactor.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Multiple definitions of main or federated reactor.");
+  }
 
-    @Test
-    public void testMultipleMainReactorUnnamed() throws Exception {
+  @Test
+  public void testMultipleMainReactorUnnamed() throws Exception {
 
-        String testCase = """
+    String testCase =
+        """
                 target C;
                 main reactor {}
                 main reactor {}
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getReactor(), null,
-            "Multiple definitions of main or federated reactor.");
-    }
-
-    @Test
-    public void testMultipleFederatedReactor() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Multiple definitions of main or federated reactor.");
+  }
+
+  @Test
+  public void testMultipleFederatedReactor() throws Exception {
+    String testCase =
+        """
                 target C;
                 federated reactor A {}
                 federated reactor A {}
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getReactor(), null,
-            "Multiple definitions of main or federated reactor.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Multiple definitions of main or federated reactor.");
+  }
 
-    @Test
-    public void testMultipleMainOrFederatedReactor() throws Exception {
+  @Test
+  public void testMultipleMainOrFederatedReactor() throws Exception {
 
-        String testCase = """
+    String testCase =
+        """
                 target C;
                 federated reactor A {}
                 federated reactor A {}
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getReactor(), null,
-            "Multiple definitions of main or federated reactor.");
-    }
-
-    @Test
-    public void testMainReactorHasHost() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Multiple definitions of main or federated reactor.");
+  }
+
+  @Test
+  public void testMainReactorHasHost() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor at 127.0.0.1{}
             """;
-        // TODO: Uncomment and fix test
-        // List<Issue> issues = validator.validate(parseWithoutError(testCase));
-        // Assertions.assertTrue(issues.size() == 1 &&
-        //     issues.get(0).getMessage().contains("Cannot assign a host to reactor '") &&
-        //     issues.get(0).getMessage().contains("' because it is not federated."));
-    }
+    // TODO: Uncomment and fix test
+    // List<Issue> issues = validator.validate(parseWithoutError(testCase));
+    // Assertions.assertTrue(issues.size() == 1 &&
+    //     issues.get(0).getMessage().contains("Cannot assign a host to reactor '") &&
+    //     issues.get(0).getMessage().contains("' because it is not federated."));
+  }
 
-    @Test
-    public void testUnrecognizedTarget() throws Exception {
+  @Test
+  public void testUnrecognizedTarget() throws Exception {
 
-        String testCase = """
+    String testCase =
+        """
                 target Pjthon;
                 main reactor {}
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getTargetDecl(), null,
-            "Unrecognized target: Pjthon");
-    }
-
-
-    @Test
-    public void testWrongStructureForLabelAttribute() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getTargetDecl(),
+        null,
+        "Unrecognized target: Pjthon");
+  }
+
+  @Test
+  public void testWrongStructureForLabelAttribute() throws Exception {
+    String testCase =
+        """
                 target C;
                 @label(name="something")
                 main reactor { }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getAttribute(), null,
-            "Unknown attribute parameter.");
-    }
-
-    @Test
-    public void testMissingName() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getAttribute(),
+        null,
+        "Unknown attribute parameter.");
+  }
+
+  @Test
+  public void testMissingName() throws Exception {
+    String testCase =
+        """
                 target C;
                 @label("something", "else")
                 main reactor { }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getAttribute(), null,
-            "Missing name for attribute parameter.");
-    }
-
-    @Test
-    public void testWrongParamType() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getAttribute(),
+        null,
+        "Missing name for attribute parameter.");
+  }
+
+  @Test
+  public void testWrongParamType() throws Exception {
+    String testCase =
+        """
                 target C;
                 @label(value=1)
                 main reactor { }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getAttribute(), null,
-            "Incorrect type: \"value\" should have type String.");
-    }
-
-    @Test
-    public void testInitialMode() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getAttribute(),
+        null,
+        "Incorrect type: \"value\" should have type String.");
+  }
+
+  @Test
+  public void testInitialMode() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     mode M {}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getReactor(), null,
-            "Every modal reactor requires one initial mode.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "Every modal reactor requires one initial mode.");
+  }
 
-    @Test
-    public void testInitialModes() throws Exception {
-        String testCase = """
+  @Test
+  public void testInitialModes() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     initial mode IM1 {}
                     initial mode IM2 {}
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getReactor(), null,
-            "A modal reactor can only have one initial mode.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReactor(),
+        null,
+        "A modal reactor can only have one initial mode.");
+  }
 
-    @Test
-    public void testModeStateNamespace() throws Exception {
-        String testCase = """
+  @Test
+  public void testModeStateNamespace() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     initial mode IM {
@@ -1752,13 +2002,18 @@ public void testModeStateNamespace() throws Exception {
                     }
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getStateVar(), null,
-            "Duplicate state variable 's'. (State variables are currently scoped on reactor level not modes)");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getStateVar(),
+        null,
+        "Duplicate state variable 's'. (State variables are currently scoped on reactor level not"
+            + " modes)");
+  }
 
-    @Test
-    public void testModeTimerNamespace() throws Exception {
-        String testCase = """
+  @Test
+  public void testModeTimerNamespace() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     initial mode IM {
@@ -1769,13 +2024,17 @@ public void testModeTimerNamespace() throws Exception {
                     }
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getTimer(), null,
-            "Duplicate Timer 't'. (Timers are currently scoped on reactor level not modes)");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getTimer(),
+        null,
+        "Duplicate Timer 't'. (Timers are currently scoped on reactor level not modes)");
+  }
 
-    @Test
-    public void testModeActionNamespace() throws Exception {
-        String testCase = """
+  @Test
+  public void testModeActionNamespace() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     initial mode IM {
@@ -1786,13 +2045,17 @@ public void testModeActionNamespace() throws Exception {
                     }
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getAction(), null,
-            "Duplicate Action 'a'. (Actions are currently scoped on reactor level not modes)");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getAction(),
+        null,
+        "Duplicate Action 'a'. (Actions are currently scoped on reactor level not modes)");
+  }
 
-    @Test
-    public void testModeInstanceNamespace() throws Exception {
-        String testCase = """
+  @Test
+  public void testModeInstanceNamespace() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor R {}
                 main reactor {
@@ -1804,13 +2067,18 @@ public void testModeInstanceNamespace() throws Exception {
                     }
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getInstantiation(), null,
-            "Duplicate Instantiation 'r'. (Instantiations are currently scoped on reactor level not modes)");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getInstantiation(),
+        null,
+        "Duplicate Instantiation 'r'. (Instantiations are currently scoped on reactor level not"
+            + " modes)");
+  }
 
-    @Test
-    public void testMissingModeStateReset() throws Exception {
-        String testCase = """
+  @Test
+  public void testMissingModeStateReset() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     initial mode IM {
@@ -1821,13 +2089,18 @@ public void testMissingModeStateReset() throws Exception {
                     }
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getMode(), null,
-            "State variable is not reset upon mode entry. It is neither marked for automatic reset nor is there a reset reaction.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getMode(),
+        null,
+        "State variable is not reset upon mode entry. It is neither marked for automatic reset nor"
+            + " is there a reset reaction.");
+  }
 
-    @Test
-    public void testMissingModeStateResetInstance() throws Exception {
-        String testCase = """
+  @Test
+  public void testMissingModeStateResetInstance() throws Exception {
+    String testCase =
+        """
                 target C;
                 reactor R {
                     state s:int = 0;
@@ -1841,16 +2114,20 @@ public void testMissingModeStateResetInstance() throws Exception {
                     }
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getMode(), null,
-            "This reactor contains state variables that are not reset upon mode entry: "
-                + "s in R"
-                + ".\nThe state variables are neither marked for automatic reset nor have a dedicated reset reaction. "
-                + "It is unsafe to instantiate this reactor inside a mode entered with reset.");
-    }
-
-    @Test
-    public void testModeStateResetWithoutInitialValue() throws Exception {
-        String testCase = """
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getMode(),
+        null,
+        "This reactor contains state variables that are not reset upon mode entry: s in R.\n"
+            + "The state variables are neither marked for automatic reset nor have a dedicated"
+            + " reset reaction. It is unsafe to instantiate this reactor inside a mode entered with"
+            + " reset.");
+  }
+
+  @Test
+  public void testModeStateResetWithoutInitialValue() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     initial mode IM {
@@ -1858,13 +2135,17 @@ public void testModeStateResetWithoutInitialValue() throws Exception {
                     }
                 }
             """;
-        validator.assertError(parseWithoutError(testCase), LfPackage.eINSTANCE.getStateVar(), null,
-            "The state variable can not be automatically reset without an initial value.");
-    }
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getStateVar(),
+        null,
+        "The state variable can not be automatically reset without an initial value.");
+  }
 
-    @Test
-    public void testUnspecifiedTransitionType() throws Exception {
-        String testCase = """
+  @Test
+  public void testUnspecifiedTransitionType() throws Exception {
+    String testCase =
+        """
                 target C;
                 main reactor {
                     initial mode IM {
@@ -1875,10 +2156,12 @@ public void testUnspecifiedTransitionType() throws Exception {
                     }
                 }
             """;
-        validator.assertWarning(parseWithoutError(testCase), LfPackage.eINSTANCE.getReaction(), null,
-            "You should specify a transition type! "
-                + "Reset and history transitions have different effects on this target mode. "
-                + "Currently, a reset type is implicitly assumed.");
-    }
-
+    validator.assertWarning(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReaction(),
+        null,
+        "You should specify a transition type! "
+            + "Reset and history transitions have different effects on this target mode. "
+            + "Currently, a reset type is implicitly assumed.");
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/MixedRadixIntTest.java b/org.lflang.tests/src/org/lflang/tests/compiler/MixedRadixIntTest.java
index 2cee2468c8..b119da05c2 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/MixedRadixIntTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/MixedRadixIntTest.java
@@ -2,111 +2,110 @@
 
 import java.util.Arrays;
 import java.util.List;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.lflang.generator.MixedRadixInt;
 
 public class MixedRadixIntTest {
-    
-    // Constants used many times below.
-    List<Integer> radixes = Arrays.asList(2, 3, 4, 5);
-    List<Integer> digits = Arrays.asList(1, 2, 3, 4);
 
-    @Test
-    public void create() throws Exception {
-        MixedRadixInt num = new MixedRadixInt(digits, radixes, null);
-        Assertions.assertEquals("1%2, 2%3, 3%4, 4%5", num.toString());
-        Assertions.assertEquals(1 + 2*2 + 3*6 + 4*24, num.get());
-        
-        List<Integer> altDigits = List.of(1, 2, 1);
-        MixedRadixInt altNum = new MixedRadixInt(altDigits, radixes, null);
-        Assertions.assertEquals(11, altNum.get());
-    }
+  // Constants used many times below.
+  List<Integer> radixes = Arrays.asList(2, 3, 4, 5);
+  List<Integer> digits = Arrays.asList(1, 2, 3, 4);
 
-    @Test
-    public void createWithInfinity() throws Exception {
-        List<Integer> radixes = List.of(2, 3, 4, 10000);
-        MixedRadixInt num = new MixedRadixInt(digits, radixes, null);
-        Assertions.assertEquals(1 + 2*2 + 3*6 + 4*24, num.get());
-    }
+  @Test
+  public void create() throws Exception {
+    MixedRadixInt num = new MixedRadixInt(digits, radixes, null);
+    Assertions.assertEquals("1%2, 2%3, 3%4, 4%5", num.toString());
+    Assertions.assertEquals(1 + 2 * 2 + 3 * 6 + 4 * 24, num.get());
 
-    @Test
-    public void createWithError() throws Exception {
-        List<Integer> radixes = List.of(2, 3);
-        try {
-            new MixedRadixInt(digits, radixes, null);
-        } catch (IllegalArgumentException ex) {
-            Assertions.assertTrue(ex.getMessage().startsWith("Invalid"));
-            return;
-        }
-        Assertions.assertTrue(false, "Expected exception did not occur.");
-    }
-    
-    @Test
-    public void createWithNullAndSet() throws Exception {
-        MixedRadixInt num = new MixedRadixInt(null, radixes, null);
-        Assertions.assertEquals(0, num.get());
-        Assertions.assertEquals("0%2", num.toString());
-        num.set(1 + 2*2 + 3*6 + 4*24);
-        Assertions.assertEquals(1 + 2*2 + 3*6 + 4*24, num.get());
-        int mag = num.magnitude();
-        Assertions.assertEquals(1 + 2*2 + 3*6 + 4*24, mag);
-        num.increment(); // wrap to zero.
-        Assertions.assertEquals(0, num.get());
-        Assertions.assertEquals(0, num.magnitude());
-        
-        num = new MixedRadixInt(null, radixes, null);
-        num.setMagnitude(mag);
-        Assertions.assertEquals(mag, num.magnitude());
-    }
-    
-    @Test
-    public void testPermutation() throws Exception {
-        List<Integer> radixes = Arrays.asList(2, 5);
-        List<Integer> digits = Arrays.asList(1, 2);
-        List<Integer> permutation = Arrays.asList(1, 0);
-        MixedRadixInt num = new MixedRadixInt(digits, radixes, permutation);
-        Assertions.assertEquals(5, num.get());
-        Assertions.assertEquals(2, num.get(1));
-        Assertions.assertEquals(7, num.magnitude());
-        num.increment();
-        Assertions.assertEquals(7, num.get());
-        Assertions.assertEquals(8, num.magnitude());
-        
-        num = new MixedRadixInt(null, radixes, permutation);
-        num.setMagnitude(8);
-        Assertions.assertEquals(8, num.magnitude());
-        Assertions.assertEquals(7, num.get());
+    List<Integer> altDigits = List.of(1, 2, 1);
+    MixedRadixInt altNum = new MixedRadixInt(altDigits, radixes, null);
+    Assertions.assertEquals(11, altNum.get());
+  }
 
-        // Test radix infinity digit (effectively).
-        digits = Arrays.asList(1, 2, 1);
-        radixes = Arrays.asList(2, 5, 1000000);
-        num = new MixedRadixInt(digits, radixes, null);
-        Assertions.assertEquals(15, num.get());
-        Assertions.assertEquals(7, num.get(1));
-        Assertions.assertEquals(15, num.magnitude());
-        
-        permutation = Arrays.asList(1, 0, 2);
-        num = new MixedRadixInt(digits, radixes, permutation);
-        num.increment();
-        Assertions.assertEquals(17, num.get());
-        Assertions.assertEquals(18, num.magnitude());
+  @Test
+  public void createWithInfinity() throws Exception {
+    List<Integer> radixes = List.of(2, 3, 4, 10000);
+    MixedRadixInt num = new MixedRadixInt(digits, radixes, null);
+    Assertions.assertEquals(1 + 2 * 2 + 3 * 6 + 4 * 24, num.get());
+  }
 
-        num = new MixedRadixInt(null, radixes, permutation);
-        num.setMagnitude(18);
-        Assertions.assertEquals(18, num.magnitude());
-        Assertions.assertEquals(17, num.get());
-    }
-    
-    @Test
-    public void testIncrement() throws Exception {
-        List<Integer> radixes = Arrays.asList(2, 3);
-        List<Integer> digits = Arrays.asList(0, 2);
-        MixedRadixInt num = new MixedRadixInt(digits, radixes, null);
-        num.increment();
-        Assertions.assertEquals(5, num.get());
-        num.increment(); // Wrap around to zero.
-        Assertions.assertEquals(0, num.get());
+  @Test
+  public void createWithError() throws Exception {
+    List<Integer> radixes = List.of(2, 3);
+    try {
+      new MixedRadixInt(digits, radixes, null);
+    } catch (IllegalArgumentException ex) {
+      Assertions.assertTrue(ex.getMessage().startsWith("Invalid"));
+      return;
     }
+    Assertions.assertTrue(false, "Expected exception did not occur.");
+  }
+
+  @Test
+  public void createWithNullAndSet() throws Exception {
+    MixedRadixInt num = new MixedRadixInt(null, radixes, null);
+    Assertions.assertEquals(0, num.get());
+    Assertions.assertEquals("0%2", num.toString());
+    num.set(1 + 2 * 2 + 3 * 6 + 4 * 24);
+    Assertions.assertEquals(1 + 2 * 2 + 3 * 6 + 4 * 24, num.get());
+    int mag = num.magnitude();
+    Assertions.assertEquals(1 + 2 * 2 + 3 * 6 + 4 * 24, mag);
+    num.increment(); // wrap to zero.
+    Assertions.assertEquals(0, num.get());
+    Assertions.assertEquals(0, num.magnitude());
+
+    num = new MixedRadixInt(null, radixes, null);
+    num.setMagnitude(mag);
+    Assertions.assertEquals(mag, num.magnitude());
+  }
+
+  @Test
+  public void testPermutation() throws Exception {
+    List<Integer> radixes = Arrays.asList(2, 5);
+    List<Integer> digits = Arrays.asList(1, 2);
+    List<Integer> permutation = Arrays.asList(1, 0);
+    MixedRadixInt num = new MixedRadixInt(digits, radixes, permutation);
+    Assertions.assertEquals(5, num.get());
+    Assertions.assertEquals(2, num.get(1));
+    Assertions.assertEquals(7, num.magnitude());
+    num.increment();
+    Assertions.assertEquals(7, num.get());
+    Assertions.assertEquals(8, num.magnitude());
+
+    num = new MixedRadixInt(null, radixes, permutation);
+    num.setMagnitude(8);
+    Assertions.assertEquals(8, num.magnitude());
+    Assertions.assertEquals(7, num.get());
+
+    // Test radix infinity digit (effectively).
+    digits = Arrays.asList(1, 2, 1);
+    radixes = Arrays.asList(2, 5, 1000000);
+    num = new MixedRadixInt(digits, radixes, null);
+    Assertions.assertEquals(15, num.get());
+    Assertions.assertEquals(7, num.get(1));
+    Assertions.assertEquals(15, num.magnitude());
+
+    permutation = Arrays.asList(1, 0, 2);
+    num = new MixedRadixInt(digits, radixes, permutation);
+    num.increment();
+    Assertions.assertEquals(17, num.get());
+    Assertions.assertEquals(18, num.magnitude());
+
+    num = new MixedRadixInt(null, radixes, permutation);
+    num.setMagnitude(18);
+    Assertions.assertEquals(18, num.magnitude());
+    Assertions.assertEquals(17, num.get());
+  }
+
+  @Test
+  public void testIncrement() throws Exception {
+    List<Integer> radixes = Arrays.asList(2, 3);
+    List<Integer> digits = Arrays.asList(0, 2);
+    MixedRadixInt num = new MixedRadixInt(digits, radixes, null);
+    num.increment();
+    Assertions.assertEquals(5, num.get());
+    num.increment(); // Wrap around to zero.
+    Assertions.assertEquals(0, num.get());
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/PortInstanceTests.java b/org.lflang.tests/src/org/lflang/tests/compiler/PortInstanceTests.java
index f5f2ba387b..8b8ef52a8f 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/PortInstanceTests.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/PortInstanceTests.java
@@ -1,15 +1,14 @@
 package org.lflang.tests.compiler;
 
 import java.util.List;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.lflang.DefaultErrorReporter;
 import org.lflang.ErrorReporter;
 import org.lflang.generator.PortInstance;
-import org.lflang.generator.RuntimeRange;
 import org.lflang.generator.ReactionInstance;
 import org.lflang.generator.ReactorInstance;
+import org.lflang.generator.RuntimeRange;
 import org.lflang.generator.SendRange;
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.Port;
@@ -18,204 +17,205 @@
 
 public class PortInstanceTests {
 
-    private ErrorReporter reporter = new DefaultErrorReporter();
-    private static LfFactory factory = LfFactory.eINSTANCE;
-    
-    @Test
-    public void createRange() throws Exception {
-        Reactor main = factory.createReactor();
-        ReactorInstance maini = new ReactorInstance(main, reporter);
-        
-        ReactorInstance a = newReactor("A", maini);
-        ReactorInstance b = newReactor("B", maini);
-        ReactorInstance c = newReactor("C", maini);
-        
-        PortInstance p = newOutputPort("p", a);
-        PortInstance q = newInputPort("q", b);
-        PortInstance r = newInputPort("r", c);
-
-        Assertions.assertEquals(".A.p", p.getFullName());
-        
-        connect(p, q);
-        connect(p, r);
-        
-        List<SendRange> sr = p.eventualDestinations();
-        // Destinations should be empty because there are no reactions.
-        Assertions.assertEquals("[]", sr.toString());
-        
-        // Clear caches to make a mutation.
-        maini.clearCaches();
-        newReaction(q);
-        // Re-retrieve destinations.
-        sr = p.eventualDestinations();
-        Assertions.assertEquals("[.A.p(0,1)->[.B.q(0,1)]]", sr.toString());
-
-        maini.clearCaches();
-        newReaction(r);
-        // Re-retrieve destinations.
-        sr = p.eventualDestinations();
-        Assertions.assertEquals("[.A.p(0,1)->[.B.q(0,1), .C.r(0,1)]]", sr.toString());
-        
-        // Now test multiports.
-        p.setWidth(3);
-        r.setWidth(2);
-        // Have to redo the connections.
-        clearConnections(maini);
-        maini.clearCaches();
-        connect(p, 0, 1, q, 0, 1);
-        connect(p, 1, 2, r, 0, 2);
-        
-        // Re-retrieve destinations.
-        sr = p.eventualDestinations();
-        Assertions.assertEquals("[.A.p(0,1)->[.B.q(0,1)], .A.p(1,2)->[.C.r(0,2)]]", sr.toString());
-
-        // More complicated multiport connection.
-        clearConnections(maini);
-        maini.clearCaches();
-
-        ReactorInstance d = newReactor("D", maini);
-        PortInstance v = newOutputPort("v", d);
-        v.setWidth(2);
-        q.setWidth(3);
-        connect(v, 0, 2, q, 0, 2);
-        connect(p, 0, 1, q, 2, 1);
-        connect(p, 1, 2, r, 0, 2);
-        
-        sr = p.eventualDestinations();
-        Assertions.assertEquals("[.A.p(0,1)->[.B.q(2,1)], .A.p(1,2)->[.C.r(0,2)]]", sr.toString());
-
-        // Additional multicast connection.
-        maini.clearCaches();
-        ReactorInstance e = newReactor("E", maini);
-        PortInstance s = newPort("s", e);
-        s.setWidth(3);
-        newReaction(s);
-        connect(p, s);
-
-        sr = p.eventualDestinations();
-        Assertions.assertEquals("[.A.p(0,1)->[.B.q(2,1), .E.s(0,1)], .A.p(1,2)->[.C.r(0,2), .E.s(1,2)]]", sr.toString());
-
-        // Add hierarchical reactors that further split the ranges.
-        maini.clearCaches();
-        ReactorInstance f = newReactor("F", e);
-        PortInstance t = newPort("t", f);
-        newReaction(t);
-        ReactorInstance g = newReactor("G", e);
-        PortInstance u = newPort("u", g);
-        u.setWidth(2);
-        newReaction(u);
-        connect(s, 0, 1, t, 0, 1);
-        connect(s, 1, 2, u, 0, 2);
-
-        sr = p.eventualDestinations();
-        // FIXME: Multicast destinations should be able to be reported in arbitrary order.
-        Assertions.assertEquals("[.A.p(0,1)->[.E.F.t(0,1), .E.s(0,1), .B.q(2,1)], .A.p(1,2)->[.E.G.u(0,2), .E.s(1,2), .C.r(0,2)]]", sr.toString());
-    }
-    
-    @Test
-    public void multiportDestination() throws Exception {
-        Reactor main = factory.createReactor();
-        ReactorInstance maini = new ReactorInstance(main, reporter);
-        
-        ReactorInstance a = newReactor("A", maini);
-        ReactorInstance b = newReactor("B", maini);
-        b.setWidth(4);
-        
-        PortInstance p = newOutputPort("p", a);
-        PortInstance q = newInputPort("q", b);
-
-        connect(p, 0, 1, q, 0, 4);
-
-        List<SendRange> sr = p.eventualDestinations();
-        // Destination has no reactions, so empty list is right.
-        Assertions.assertEquals("[]", sr.toString());
-
-        maini.clearCaches();
-        newReaction(q);
-        sr = p.eventualDestinations();
-        Assertions.assertEquals("[.A.p(0,1)->[.B.q(0,4)]]", sr.toString());
-}
-    
-    /**
-     * Clear connections. This recursively clears them for all contained reactors.
-     */
-    protected void clearConnections(ReactorInstance r) {
-        for (PortInstance p: r.inputs) {
-            p.getDependentPorts().clear();
-        }
-        for (PortInstance p: r.outputs) {
-            p.getDependentPorts().clear();
-        }
-        for (ReactorInstance child: r.children) {
-            clearConnections(child);
-        }
-    }
-
-    /**
-     * Simple connection of two ports. This should be used only
-     * for connections that would be allowed in the syntax (i.e., no
-     * cross-hierarchy connections), but this is not checked. 
-     * @param src The sending port.
-     * @param dst The receiving port.
-     */
-    protected void connect(PortInstance src, PortInstance dst) {
-        RuntimeRange<PortInstance> srcRange = new RuntimeRange.Port(src);
-        RuntimeRange<PortInstance> dstRange = new RuntimeRange.Port(dst);
-        ReactorInstance.connectPortInstances(srcRange, dstRange, null);
+  private ErrorReporter reporter = new DefaultErrorReporter();
+  private static LfFactory factory = LfFactory.eINSTANCE;
+
+  @Test
+  public void createRange() throws Exception {
+    Reactor main = factory.createReactor();
+    ReactorInstance maini = new ReactorInstance(main, reporter);
+
+    ReactorInstance a = newReactor("A", maini);
+    ReactorInstance b = newReactor("B", maini);
+    ReactorInstance c = newReactor("C", maini);
+
+    PortInstance p = newOutputPort("p", a);
+    PortInstance q = newInputPort("q", b);
+    PortInstance r = newInputPort("r", c);
+
+    Assertions.assertEquals(".A.p", p.getFullName());
+
+    connect(p, q);
+    connect(p, r);
+
+    List<SendRange> sr = p.eventualDestinations();
+    // Destinations should be empty because there are no reactions.
+    Assertions.assertEquals("[]", sr.toString());
+
+    // Clear caches to make a mutation.
+    maini.clearCaches();
+    newReaction(q);
+    // Re-retrieve destinations.
+    sr = p.eventualDestinations();
+    Assertions.assertEquals("[.A.p(0,1)->[.B.q(0,1)]]", sr.toString());
+
+    maini.clearCaches();
+    newReaction(r);
+    // Re-retrieve destinations.
+    sr = p.eventualDestinations();
+    Assertions.assertEquals("[.A.p(0,1)->[.B.q(0,1), .C.r(0,1)]]", sr.toString());
+
+    // Now test multiports.
+    p.setWidth(3);
+    r.setWidth(2);
+    // Have to redo the connections.
+    clearConnections(maini);
+    maini.clearCaches();
+    connect(p, 0, 1, q, 0, 1);
+    connect(p, 1, 2, r, 0, 2);
+
+    // Re-retrieve destinations.
+    sr = p.eventualDestinations();
+    Assertions.assertEquals("[.A.p(0,1)->[.B.q(0,1)], .A.p(1,2)->[.C.r(0,2)]]", sr.toString());
+
+    // More complicated multiport connection.
+    clearConnections(maini);
+    maini.clearCaches();
+
+    ReactorInstance d = newReactor("D", maini);
+    PortInstance v = newOutputPort("v", d);
+    v.setWidth(2);
+    q.setWidth(3);
+    connect(v, 0, 2, q, 0, 2);
+    connect(p, 0, 1, q, 2, 1);
+    connect(p, 1, 2, r, 0, 2);
+
+    sr = p.eventualDestinations();
+    Assertions.assertEquals("[.A.p(0,1)->[.B.q(2,1)], .A.p(1,2)->[.C.r(0,2)]]", sr.toString());
+
+    // Additional multicast connection.
+    maini.clearCaches();
+    ReactorInstance e = newReactor("E", maini);
+    PortInstance s = newPort("s", e);
+    s.setWidth(3);
+    newReaction(s);
+    connect(p, s);
+
+    sr = p.eventualDestinations();
+    Assertions.assertEquals(
+        "[.A.p(0,1)->[.B.q(2,1), .E.s(0,1)], .A.p(1,2)->[.C.r(0,2), .E.s(1,2)]]", sr.toString());
+
+    // Add hierarchical reactors that further split the ranges.
+    maini.clearCaches();
+    ReactorInstance f = newReactor("F", e);
+    PortInstance t = newPort("t", f);
+    newReaction(t);
+    ReactorInstance g = newReactor("G", e);
+    PortInstance u = newPort("u", g);
+    u.setWidth(2);
+    newReaction(u);
+    connect(s, 0, 1, t, 0, 1);
+    connect(s, 1, 2, u, 0, 2);
+
+    sr = p.eventualDestinations();
+    // FIXME: Multicast destinations should be able to be reported in arbitrary order.
+    Assertions.assertEquals(
+        "[.A.p(0,1)->[.E.F.t(0,1), .E.s(0,1), .B.q(2,1)], .A.p(1,2)->[.E.G.u(0,2), .E.s(1,2),"
+            + " .C.r(0,2)]]",
+        sr.toString());
+  }
+
+  @Test
+  public void multiportDestination() throws Exception {
+    Reactor main = factory.createReactor();
+    ReactorInstance maini = new ReactorInstance(main, reporter);
+
+    ReactorInstance a = newReactor("A", maini);
+    ReactorInstance b = newReactor("B", maini);
+    b.setWidth(4);
+
+    PortInstance p = newOutputPort("p", a);
+    PortInstance q = newInputPort("q", b);
+
+    connect(p, 0, 1, q, 0, 4);
+
+    List<SendRange> sr = p.eventualDestinations();
+    // Destination has no reactions, so empty list is right.
+    Assertions.assertEquals("[]", sr.toString());
+
+    maini.clearCaches();
+    newReaction(q);
+    sr = p.eventualDestinations();
+    Assertions.assertEquals("[.A.p(0,1)->[.B.q(0,4)]]", sr.toString());
+  }
+
+  /** Clear connections. This recursively clears them for all contained reactors. */
+  protected void clearConnections(ReactorInstance r) {
+    for (PortInstance p : r.inputs) {
+      p.getDependentPorts().clear();
     }
-    
-    /**
-     * Connection between multiports. This should be used only
-     * for connections that would be allowed in the syntax (i.e., no
-     * cross-hierarchy connections), but this is not checked. 
-     * @param src The sending port.
-     * @param dst The receiving port.
-     */
-    protected void connect(
-            PortInstance src, int srcStart, int srcWidth,
-            PortInstance dst, int dstStart, int dstWidth
-    ) {
-        RuntimeRange<PortInstance> srcRange = new RuntimeRange.Port(src, srcStart, srcWidth, null);
-        RuntimeRange<PortInstance> dstRange = new RuntimeRange.Port(dst, dstStart, dstWidth, null);
-        ReactorInstance.connectPortInstances(srcRange, dstRange, null);
+    for (PortInstance p : r.outputs) {
+      p.getDependentPorts().clear();
     }
-
-    protected PortInstance newPort(String name, ReactorInstance container) {
-        Port p = factory.createPort();
-        p.setName(name);
-        return new PortInstance(p, container, reporter);
-    }
-
-    protected PortInstance newInputPort(String name, ReactorInstance container) {
-        PortInstance pi = newPort(name, container);
-        container.inputs.add(pi);
-        return pi;
-    }
-    
-    protected PortInstance newOutputPort(String name, ReactorInstance container) {
-        PortInstance pi = newPort(name, container);
-        container.outputs.add(pi);
-        return pi;
-    }
-
-    /**
-     * Return a new reaction triggered by the specified port.
-     * @param trigger The triggering port.
-     */
-    protected ReactionInstance newReaction(PortInstance trigger) {
-        Reaction r = factory.createReaction();
-        ReactionInstance result = new ReactionInstance(
-                r, trigger.getParent(), false, trigger.getDependentReactions().size());
-        trigger.getDependentReactions().add(result);
-        trigger.getParent().reactions.add(result);
-        return result;
-    }
-
-    protected ReactorInstance newReactor(String name, ReactorInstance container) {
-        Reactor r = factory.createReactor();
-        r.setName(name);
-        ReactorInstance ri = new ReactorInstance(r, container, reporter);
-        container.children.add(ri);
-        return ri;
+    for (ReactorInstance child : r.children) {
+      clearConnections(child);
     }
+  }
+
+  /**
+   * Simple connection of two ports. This should be used only for connections that would be allowed
+   * in the syntax (i.e., no cross-hierarchy connections), but this is not checked.
+   *
+   * @param src The sending port.
+   * @param dst The receiving port.
+   */
+  protected void connect(PortInstance src, PortInstance dst) {
+    RuntimeRange<PortInstance> srcRange = new RuntimeRange.Port(src);
+    RuntimeRange<PortInstance> dstRange = new RuntimeRange.Port(dst);
+    ReactorInstance.connectPortInstances(srcRange, dstRange, null);
+  }
+
+  /**
+   * Connection between multiports. This should be used only for connections that would be allowed
+   * in the syntax (i.e., no cross-hierarchy connections), but this is not checked.
+   *
+   * @param src The sending port.
+   * @param dst The receiving port.
+   */
+  protected void connect(
+      PortInstance src, int srcStart, int srcWidth, PortInstance dst, int dstStart, int dstWidth) {
+    RuntimeRange<PortInstance> srcRange = new RuntimeRange.Port(src, srcStart, srcWidth, null);
+    RuntimeRange<PortInstance> dstRange = new RuntimeRange.Port(dst, dstStart, dstWidth, null);
+    ReactorInstance.connectPortInstances(srcRange, dstRange, null);
+  }
+
+  protected PortInstance newPort(String name, ReactorInstance container) {
+    Port p = factory.createPort();
+    p.setName(name);
+    return new PortInstance(p, container, reporter);
+  }
+
+  protected PortInstance newInputPort(String name, ReactorInstance container) {
+    PortInstance pi = newPort(name, container);
+    container.inputs.add(pi);
+    return pi;
+  }
+
+  protected PortInstance newOutputPort(String name, ReactorInstance container) {
+    PortInstance pi = newPort(name, container);
+    container.outputs.add(pi);
+    return pi;
+  }
+
+  /**
+   * Return a new reaction triggered by the specified port.
+   *
+   * @param trigger The triggering port.
+   */
+  protected ReactionInstance newReaction(PortInstance trigger) {
+    Reaction r = factory.createReaction();
+    ReactionInstance result =
+        new ReactionInstance(r, trigger.getParent(), false, trigger.getDependentReactions().size());
+    trigger.getDependentReactions().add(result);
+    trigger.getParent().reactions.add(result);
+    return result;
+  }
+
+  protected ReactorInstance newReactor(String name, ReactorInstance container) {
+    Reactor r = factory.createReactor();
+    r.setName(name);
+    ReactorInstance ri = new ReactorInstance(r, container, reporter);
+    container.children.add(ri);
+    return ri;
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/RangeTests.java b/org.lflang.tests/src/org/lflang/tests/compiler/RangeTests.java
index 5cd489d0f7..2c17145aaa 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/RangeTests.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/RangeTests.java
@@ -2,14 +2,13 @@
 
 import java.util.List;
 import java.util.Set;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.lflang.DefaultErrorReporter;
 import org.lflang.ErrorReporter;
 import org.lflang.generator.PortInstance;
-import org.lflang.generator.RuntimeRange;
 import org.lflang.generator.ReactorInstance;
+import org.lflang.generator.RuntimeRange;
 import org.lflang.generator.SendRange;
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.Port;
@@ -17,87 +16,87 @@
 
 public class RangeTests {
 
-    private ErrorReporter reporter = new DefaultErrorReporter();
-    private static LfFactory factory = LfFactory.eINSTANCE;
-    
-    @Test
-    public void createRange() throws Exception {
-        Reactor main = factory.createReactor();
-        ReactorInstance maini = new ReactorInstance(main, reporter);
-        
-        Reactor a = factory.createReactor();
-        a.setName("A");
-        ReactorInstance ai = new ReactorInstance(a, maini, reporter);
-        ai.setWidth(2);
-        
-        Reactor b = factory.createReactor();
-        b.setName("B");
-        ReactorInstance bi = new ReactorInstance(b, ai, reporter);
-        bi.setWidth(2);
-
-        Port p = factory.createPort();
-        p.setName("P");
-        PortInstance pi = new PortInstance(p, bi, reporter);
-        pi.setWidth(2);
-
-        Assertions.assertEquals(".A.B.P", pi.getFullName());
-        
-        RuntimeRange<PortInstance> range = new RuntimeRange.Port(pi, 3, 4, null);
-        
-        Assertions.assertEquals(8, range.maxWidth);
-        
-        Assertions.assertEquals(".A.B.P(3,4)", range.toString());
-
-        // The results expected below are derived from the class comment for RuntimeRange,
-        // which includes this example.
-        List<Integer> instances = range.instances();
-        Assertions.assertEquals(List.of(3, 4, 5, 6), instances);
-        Set<Integer> parents = range.parentInstances(1);
-        Assertions.assertEquals(Set.of(1, 2, 3), parents);
-        
-        parents = range.parentInstances(2);
-        Assertions.assertEquals(Set.of(0, 1), parents);
-        
-        // Test startMR().getDigits.
-        Assertions.assertEquals(List.of(1, 1, 0), range.startMR().getDigits());
-        
-        // Create a SendRange sending from and to this range.
-        SendRange sendRange = new SendRange(pi, 3, 4, null, null);
-        sendRange.destinations.add(range);
-        
-        // Test getNumberOfDestinationReactors.
-        Assertions.assertEquals(3, sendRange.getNumberOfDestinationReactors());
-        
-        // Make first interleaved version.
-        range = range.toggleInterleaved(bi);
-        instances = range.instances();
-        Assertions.assertEquals(List.of(3, 4, 6, 5), instances);
-
-        // Test startMR().getDigits.
-        Assertions.assertEquals(List.of(1, 1, 0), range.startMR().getDigits());
-
-        // Make second interleaved version.
-        range = range.toggleInterleaved(ai);
-        instances = range.instances();
-        Assertions.assertEquals(List.of(6, 1, 5, 3), instances);
-
-        // Test startMR().getDigits.
-        Assertions.assertEquals(List.of(0, 1, 1), range.startMR().getDigits());
-        
-        // Test instances of the parent.
-        Assertions.assertEquals(Set.of(3, 0, 2, 1), range.parentInstances(1));
-        
-        // Add this range to the sendRange destinations and verify
-        // that the number of destination reactors becomes 4.
-        sendRange.addDestination(range);
-        Assertions.assertEquals(4, sendRange.getNumberOfDestinationReactors());
-
-        // Make third interleaved version.
-        range = range.toggleInterleaved(bi);
-        instances = range.instances();
-        Assertions.assertEquals(List.of(5, 2, 6, 3), instances);
-
-        // Test startMR().getDigits.
-        Assertions.assertEquals(List.of(1, 0, 1), range.startMR().getDigits());
-    }
+  private ErrorReporter reporter = new DefaultErrorReporter();
+  private static LfFactory factory = LfFactory.eINSTANCE;
+
+  @Test
+  public void createRange() throws Exception {
+    Reactor main = factory.createReactor();
+    ReactorInstance maini = new ReactorInstance(main, reporter);
+
+    Reactor a = factory.createReactor();
+    a.setName("A");
+    ReactorInstance ai = new ReactorInstance(a, maini, reporter);
+    ai.setWidth(2);
+
+    Reactor b = factory.createReactor();
+    b.setName("B");
+    ReactorInstance bi = new ReactorInstance(b, ai, reporter);
+    bi.setWidth(2);
+
+    Port p = factory.createPort();
+    p.setName("P");
+    PortInstance pi = new PortInstance(p, bi, reporter);
+    pi.setWidth(2);
+
+    Assertions.assertEquals(".A.B.P", pi.getFullName());
+
+    RuntimeRange<PortInstance> range = new RuntimeRange.Port(pi, 3, 4, null);
+
+    Assertions.assertEquals(8, range.maxWidth);
+
+    Assertions.assertEquals(".A.B.P(3,4)", range.toString());
+
+    // The results expected below are derived from the class comment for RuntimeRange,
+    // which includes this example.
+    List<Integer> instances = range.instances();
+    Assertions.assertEquals(List.of(3, 4, 5, 6), instances);
+    Set<Integer> parents = range.parentInstances(1);
+    Assertions.assertEquals(Set.of(1, 2, 3), parents);
+
+    parents = range.parentInstances(2);
+    Assertions.assertEquals(Set.of(0, 1), parents);
+
+    // Test startMR().getDigits.
+    Assertions.assertEquals(List.of(1, 1, 0), range.startMR().getDigits());
+
+    // Create a SendRange sending from and to this range.
+    SendRange sendRange = new SendRange(pi, 3, 4, null, null);
+    sendRange.destinations.add(range);
+
+    // Test getNumberOfDestinationReactors.
+    Assertions.assertEquals(3, sendRange.getNumberOfDestinationReactors());
+
+    // Make first interleaved version.
+    range = range.toggleInterleaved(bi);
+    instances = range.instances();
+    Assertions.assertEquals(List.of(3, 4, 6, 5), instances);
+
+    // Test startMR().getDigits.
+    Assertions.assertEquals(List.of(1, 1, 0), range.startMR().getDigits());
+
+    // Make second interleaved version.
+    range = range.toggleInterleaved(ai);
+    instances = range.instances();
+    Assertions.assertEquals(List.of(6, 1, 5, 3), instances);
+
+    // Test startMR().getDigits.
+    Assertions.assertEquals(List.of(0, 1, 1), range.startMR().getDigits());
+
+    // Test instances of the parent.
+    Assertions.assertEquals(Set.of(3, 0, 2, 1), range.parentInstances(1));
+
+    // Add this range to the sendRange destinations and verify
+    // that the number of destination reactors becomes 4.
+    sendRange.addDestination(range);
+    Assertions.assertEquals(4, sendRange.getNumberOfDestinationReactors());
+
+    // Make third interleaved version.
+    range = range.toggleInterleaved(bi);
+    instances = range.instances();
+    Assertions.assertEquals(List.of(5, 2, 6, 3), instances);
+
+    // Test startMR().getDigits.
+    Assertions.assertEquals(List.of(1, 0, 1), range.startMR().getDigits());
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/RoundTripTests.java b/org.lflang.tests/src/org/lflang/tests/compiler/RoundTripTests.java
index 801211be23..8087d552a8 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/RoundTripTests.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/RoundTripTests.java
@@ -7,13 +7,11 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.lflang.Target;
 import org.lflang.ast.FormattingUtils;
 import org.lflang.ast.IsEqual;
@@ -28,46 +26,42 @@
 @InjectWith(LFInjectorProvider.class)
 public class RoundTripTests {
 
-    @Test
-    public void roundTripTest() {
-        for (Target target : Target.values()) {
-            for (TestCategory category : TestCategory.values()) {
-                for (LFTest test : TestRegistry.getRegisteredTests(target, category, false)) {
-                    try {
-                        run(test.getSrcPath());
-                    } catch (Throwable thrown) {
-                        fail("Test case " + test.getSrcPath() + " failed", thrown);
-                    }
-                }
-            }
+  @Test
+  public void roundTripTest() {
+    for (Target target : Target.values()) {
+      for (TestCategory category : TestCategory.values()) {
+        for (LFTest test : TestRegistry.getRegisteredTests(target, category, false)) {
+          try {
+            run(test.getSrcPath());
+          } catch (Throwable thrown) {
+            fail("Test case " + test.getSrcPath() + " failed", thrown);
+          }
         }
+      }
     }
+  }
 
-    private void run(Path file) throws Exception {
-        Model originalModel = LfParsingUtil.parse(file);
-        System.out.println(file);
-        assertThat(originalModel.eResource().getErrors(), equalTo(emptyList()));
-        // TODO: Check that the output is a fixed point
-        final int smallLineLength = 20;
-        final String squishedTestCase = FormattingUtils.render(originalModel, smallLineLength);
-        final Model resultingModel = LfParsingUtil.parseSourceAsIfInDirectory(file.getParent(), squishedTestCase);
-
-        assertThat(resultingModel.eResource().getErrors(), equalTo(emptyList()));
-        Assertions.assertTrue(
-            new IsEqual(originalModel).doSwitch(resultingModel),
-            String.format(
-                "The reformatted version of %s was not equivalent to the original file.%n"
-                    + "Formatted file:%n%s%n%n",
-                file,
-                squishedTestCase
-            )
-        );
-        final String normalTestCase = FormattingUtils.render(originalModel);
-        Assertions.assertEquals(
-            Files.readString(file).replaceAll("\\r\\n?", "\n"),
-            normalTestCase,
-            "File is not formatted properly, or formatter is bugged. Check " + file
-        );
-    }
+  private void run(Path file) throws Exception {
+    Model originalModel = LfParsingUtil.parse(file);
+    System.out.println(file);
+    assertThat(originalModel.eResource().getErrors(), equalTo(emptyList()));
+    // TODO: Check that the output is a fixed point
+    final int smallLineLength = 20;
+    final String squishedTestCase = FormattingUtils.render(originalModel, smallLineLength);
+    final Model resultingModel =
+        LfParsingUtil.parseSourceAsIfInDirectory(file.getParent(), squishedTestCase);
 
+    assertThat(resultingModel.eResource().getErrors(), equalTo(emptyList()));
+    Assertions.assertTrue(
+        new IsEqual(originalModel).doSwitch(resultingModel),
+        String.format(
+            "The reformatted version of %s was not equivalent to the original file.%n"
+                + "Formatted file:%n%s%n%n",
+            file, squishedTestCase));
+    final String normalTestCase = FormattingUtils.render(originalModel);
+    Assertions.assertEquals(
+        Files.readString(file).replaceAll("\\r\\n?", "\n"),
+        normalTestCase,
+        "File is not formatted properly, or formatter is bugged. Check " + file);
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/TargetConfigTests.java b/org.lflang.tests/src/org/lflang/tests/compiler/TargetConfigTests.java
index eede6a6831..e949ab6f9f 100644
--- a/org.lflang.tests/src/org/lflang/tests/compiler/TargetConfigTests.java
+++ b/org.lflang.tests/src/org/lflang/tests/compiler/TargetConfigTests.java
@@ -12,7 +12,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGenerator;
@@ -24,79 +23,81 @@
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
 
-/**
- * Tests for checking that target properties adequately translate into the target configuration.
- */
+/** Tests for checking that target properties adequately translate into the target configuration. */
 class TargetConfigTests {
 
-    @Inject
-    ParseHelper<Model> parser;
-
-    @Inject
-    LFGenerator generator;
-
-    @Inject
-    JavaIoFileSystemAccess fileAccess;
-
-    @Inject
-    Provider<ResourceSet> resourceSetProvider;
-
-    private void assertHasTargetProperty(Model model, String name) {
-        Assertions.assertNotNull(model);
-        Assertions.assertTrue(
-            model.getTarget().getConfig().getPairs().stream().anyMatch(
-                p -> p.getName().equals(name)
-            )
-        );
-    }
-
-    /**
-     * Check that tracing target property affects the target configuration.
-     * @throws Exception
-     */
-    @Test
-    public void testParsing() throws Exception {
-        assertHasTargetProperty(parser.parse("""
+  @Inject ParseHelper<Model> parser;
+
+  @Inject LFGenerator generator;
+
+  @Inject JavaIoFileSystemAccess fileAccess;
+
+  @Inject Provider<ResourceSet> resourceSetProvider;
+
+  private void assertHasTargetProperty(Model model, String name) {
+    Assertions.assertNotNull(model);
+    Assertions.assertTrue(
+        model.getTarget().getConfig().getPairs().stream().anyMatch(p -> p.getName().equals(name)));
+  }
+
+  /**
+   * Check that tracing target property affects the target configuration.
+   *
+   * @throws Exception
+   */
+  @Test
+  public void testParsing() throws Exception {
+    assertHasTargetProperty(
+        parser.parse(
+            """
             target C {
               tracing: true
             }
-            """), "tracing");
-    }
-
-    /**
-     * Check that when a federation has the "tracing" target property set, the generated federates
-     * will also have it set.
-     * @throws Exception
-     */
-    @Test
-    public void testFederation() throws Exception {
-        fileAccess.setOutputPath("src-gen");
-
-        Model federation = parser.parse("""
+            """),
+        "tracing");
+  }
+
+  /**
+   * Check that when a federation has the "tracing" target property set, the generated federates
+   * will also have it set.
+   *
+   * @throws Exception
+   */
+  @Test
+  public void testFederation() throws Exception {
+    fileAccess.setOutputPath("src-gen");
+
+    Model federation =
+        parser.parse(
+            """
             target C {
               tracing: true
             }
             reactor Foo {
-            
+
             }
             federated reactor {
                 a = new Foo()
                 b = new Foo()
             }
-            """, URI.createFileURI("tmp/src/Federation.lf"), resourceSetProvider.get());
-        assertHasTargetProperty(federation, "tracing");
-
-        var resource = federation.eResource();
-        var context = new MainContext(Mode.STANDALONE, resource, fileAccess, () -> false);
-
-        if (GeneratorUtils.isHostWindows()) return;
-
-        generator.doGenerate(resource, fileAccess, context);
-
-        String lfSrc = Files.readAllLines(
-            ((FedFileConfig)context.getFileConfig()).getSrcPath().resolve("federate__a.lf")
-        ).stream().reduce("\n", String::concat);
-        Model federate = parser.parse(lfSrc);
-        assertHasTargetProperty(federate, "tracing");
-    }
+            """,
+            URI.createFileURI("tmp/src/Federation.lf"),
+            resourceSetProvider.get());
+    assertHasTargetProperty(federation, "tracing");
+
+    var resource = federation.eResource();
+    var context = new MainContext(Mode.STANDALONE, resource, fileAccess, () -> false);
+
+    if (GeneratorUtils.isHostWindows()) return;
+
+    generator.doGenerate(resource, fileAccess, context);
+
+    String lfSrc =
+        Files.readAllLines(
+                ((FedFileConfig) context.getFileConfig()).getSrcPath().resolve("federate__a.lf"))
+            .stream()
+            .reduce("\n", String::concat);
+    Model federate = parser.parse(lfSrc);
+    assertHasTargetProperty(federate, "tracing");
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/lsp/ErrorInserter.java b/org.lflang.tests/src/org/lflang/tests/lsp/ErrorInserter.java
index a7b1c9d8ec..a1948821eb 100644
--- a/org.lflang.tests/src/org/lflang/tests/lsp/ErrorInserter.java
+++ b/org.lflang.tests/src/org/lflang/tests/lsp/ErrorInserter.java
@@ -1,5 +1,6 @@
 package org.lflang.tests.lsp;
 
+import com.google.common.collect.ImmutableList;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -17,339 +18,364 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import com.google.common.collect.ImmutableList;
-
 /**
  * Insert problems into integration tests.
+ *
  * @author Peter Donovan
  */
 @SuppressWarnings("ClassCanBeRecord")
 class ErrorInserter {
 
-    /** A basic error inserter builder on which more specific error inserters can be built. */
-    private static final Builder BASE_ERROR_INSERTER = new Builder()
-        .insertCondition((s0, s1) -> Stream.of(s0, s1).allMatch(it -> Stream.of(";", "}", "{").anyMatch(it::endsWith)))
-        .insertCondition((s0, s1) -> !s1.trim().startsWith("else"))
-        .insertable("    0 = 1;").insertable("some_undeclared_var1524263 = 9;").insertable("        ++;");
-    public static final Builder C = BASE_ERROR_INSERTER
-        .replacer("lf_set(", "UNDEFINED_NAME2828376(")
-        .replacer("lf_schedule(", "undefined_name15291838(");
-    public static final Builder CPP = BASE_ERROR_INSERTER
-        .replacer(".get", ".undefined_name15291838")
-        .replacer("std::", "undefined_name3286634::");
-    public static final Builder PYTHON_SYNTAX_ONLY = new Builder()
-        .insertable("        +++++;").insertable("        ..");
-    public static final Builder PYTHON = PYTHON_SYNTAX_ONLY
-        .replacer("print(", "undefined_name15291838(");
-    public static final Builder RUST = BASE_ERROR_INSERTER
-        .replacer("println!", "undefined_name15291838!")
-        .replacer("ctx.", "undefined_name3286634.");
-    public static final Builder TYPESCRIPT = BASE_ERROR_INSERTER
-        .replacer("requestErrorStop(", "not_an_attribute_of_util9764(")
-        .replacer("const ", "var ");
-
-    /** An {@code AlteredTest} represents an altered version of what was a valid LF file. */
-    static class AlteredTest implements Closeable {
-
-        /** A {@code OnceTrue} is randomly true once, and then never again. */
-        private static class OnceTrue {
-            boolean beenTrue;
-            Random random;
-            private OnceTrue(Random random) {
-                this.beenTrue = false;
-                this.random = random;
-            }
-            private boolean get() {
-                if (beenTrue) return false;
-                return beenTrue = random.nextBoolean() && random.nextBoolean();
-            }
-        }
-
-        /** The zero-based indices of the touched lines. */
-        private final List<Integer> badLines;
-        /** The original test on which this is based. */
-        private final Path srcFile;
-        /** The content of this test. */
-        private final LinkedList<String> lines;
-        /** Whether the error inserter is permitted to insert a line before the current line. */
-        private final Predicate<ListIterator<String>> insertCondition;
-
-        /**
-         * Initialize a possibly altered copy of {@code originalTest}.
-         * @param originalTest A path to an LF file that serves as a test.
-         * @param insertCondition Whether the error inserter is permitted to insert a line between two given lines.
-         * @throws IOException if the content of {@code originalTest} cannot be read.
-         */
-        private AlteredTest(Path originalTest, BiPredicate<String, String> insertCondition) throws IOException {
-            this.badLines = new ArrayList<>();
-            this.srcFile = originalTest;
-            this.lines = new LinkedList<>();  // Constant-time insertion during iteration is desired.
-            this.lines.addAll(Files.readAllLines(srcFile));
-            this.insertCondition = it -> {
-                it.previous();
-                String s0 = it.previous();
-                it.next();
-                String s1 = it.next();
-                return insertCondition.test(s0, s1);
-            };
-        }
+  /** A basic error inserter builder on which more specific error inserters can be built. */
+  private static final Builder BASE_ERROR_INSERTER =
+      new Builder()
+          .insertCondition(
+              (s0, s1) ->
+                  Stream.of(s0, s1).allMatch(it -> Stream.of(";", "}", "{").anyMatch(it::endsWith)))
+          .insertCondition((s0, s1) -> !s1.trim().startsWith("else"))
+          .insertable("    0 = 1;")
+          .insertable("some_undeclared_var1524263 = 9;")
+          .insertable("        ++;");
+
+  public static final Builder C =
+      BASE_ERROR_INSERTER
+          .replacer("lf_set(", "UNDEFINED_NAME2828376(")
+          .replacer("lf_schedule(", "undefined_name15291838(");
+  public static final Builder CPP =
+      BASE_ERROR_INSERTER
+          .replacer(".get", ".undefined_name15291838")
+          .replacer("std::", "undefined_name3286634::");
+  public static final Builder PYTHON_SYNTAX_ONLY =
+      new Builder().insertable("        +++++;").insertable("        ..");
+  public static final Builder PYTHON =
+      PYTHON_SYNTAX_ONLY.replacer("print(", "undefined_name15291838(");
+  public static final Builder RUST =
+      BASE_ERROR_INSERTER
+          .replacer("println!", "undefined_name15291838!")
+          .replacer("ctx.", "undefined_name3286634.");
+  public static final Builder TYPESCRIPT =
+      BASE_ERROR_INSERTER
+          .replacer("requestErrorStop(", "not_an_attribute_of_util9764(")
+          .replacer("const ", "var ");
+
+  /** An {@code AlteredTest} represents an altered version of what was a valid LF file. */
+  static class AlteredTest implements Closeable {
+
+    /** A {@code OnceTrue} is randomly true once, and then never again. */
+    private static class OnceTrue {
+      boolean beenTrue;
+      Random random;
+
+      private OnceTrue(Random random) {
+        this.beenTrue = false;
+        this.random = random;
+      }
 
-        /** Return the location where the content of {@code this} lives. */
-        public Path getSrcFile() {
-            return srcFile;
-        }
+      private boolean get() {
+        if (beenTrue) return false;
+        return beenTrue = random.nextBoolean() && random.nextBoolean();
+      }
+    }
 
-        /**
-         * Write the altered version of the test to the file system.
-         * @throws IOException If an I/O error occurred.
-         */
-        public void write() throws IOException {
-            Path src = srcFile;
-            if (!src.toFile().renameTo(swapFile(src).toFile())) {
-                throw new IOException("Failed to create a swap file.");
-            }
-            try (PrintWriter writer = new PrintWriter(src.toFile())) {
-                lines.forEach(writer::println);
-            }
-        }
+    /** The zero-based indices of the touched lines. */
+    private final List<Integer> badLines;
+    /** The original test on which this is based. */
+    private final Path srcFile;
+    /** The content of this test. */
+    private final LinkedList<String> lines;
+    /** Whether the error inserter is permitted to insert a line before the current line. */
+    private final Predicate<ListIterator<String>> insertCondition;
 
-        /**
-         * Restore the file associated with this test to its original state.
-         */
-        @Override
-        public void close() throws IOException {
-            Path src = srcFile;
-            if (!swapFile(src).toFile().exists()) throw new IllegalStateException("Swap file does not exist.");
-            if (!src.toFile().delete()) {
-                throw new IOException("Failed to delete the file associated with the original test.");
-            }
-            if (!swapFile(src).toFile().renameTo(src.toFile())) {
-                throw new IOException("Failed to restore the altered LF file to its original state.");
-            }
-        }
+    /**
+     * Initialize a possibly altered copy of {@code originalTest}.
+     *
+     * @param originalTest A path to an LF file that serves as a test.
+     * @param insertCondition Whether the error inserter is permitted to insert a line between two
+     *     given lines.
+     * @throws IOException if the content of {@code originalTest} cannot be read.
+     */
+    private AlteredTest(Path originalTest, BiPredicate<String, String> insertCondition)
+        throws IOException {
+      this.badLines = new ArrayList<>();
+      this.srcFile = originalTest;
+      this.lines = new LinkedList<>(); // Constant-time insertion during iteration is desired.
+      this.lines.addAll(Files.readAllLines(srcFile));
+      this.insertCondition =
+          it -> {
+            it.previous();
+            String s0 = it.previous();
+            it.next();
+            String s1 = it.next();
+            return insertCondition.test(s0, s1);
+          };
+    }
 
-        @Override
-        public String toString() {
-            int lengthOfPrefix = 6;
-            StringBuilder ret = new StringBuilder(
-                lines.stream().mapToInt(String::length).reduce(0, Integer::sum)
-                + lines.size() * lengthOfPrefix
-            );
-            for (int i = 0; i < lines.size(); i++) {
-                ret.append(badLines.contains(i) ? "-> " : "   ")
-                   .append(String.format("%1$2s ", i))
-                   .append(lines.get(i)).append("\n");
-            }
-            return ret.toString();
-        }
+    /** Return the location where the content of {@code this} lives. */
+    public Path getSrcFile() {
+      return srcFile;
+    }
 
-        /** Return the lines where this differs from the test from which it was derived. */
-        public ImmutableList<Integer> getBadLines() {
-            return ImmutableList.copyOf(badLines);
-        }
+    /**
+     * Write the altered version of the test to the file system.
+     *
+     * @throws IOException If an I/O error occurred.
+     */
+    public void write() throws IOException {
+      Path src = srcFile;
+      if (!src.toFile().renameTo(swapFile(src).toFile())) {
+        throw new IOException("Failed to create a swap file.");
+      }
+      try (PrintWriter writer = new PrintWriter(src.toFile())) {
+        lines.forEach(writer::println);
+      }
+    }
 
-        /**
-         * Attempt to replace a line of this test with a different line of target language code.
-         * @param replacer A function that replaces lines of code with possibly different lines.
-         */
-        public void replace(Function<String, String> replacer, Random random) {
-            OnceTrue onceTrue = new OnceTrue(random);
-            alter((it, current) -> {
-                if (!onceTrue.get()) return false;
-                String newLine = replacer.apply(current);
-                it.remove();
-                it.add(newLine);
-                return !newLine.equals(current);
-            });
-        }
+    /** Restore the file associated with this test to its original state. */
+    @Override
+    public void close() throws IOException {
+      Path src = srcFile;
+      if (!swapFile(src).toFile().exists())
+        throw new IllegalStateException("Swap file does not exist.");
+      if (!src.toFile().delete()) {
+        throw new IOException("Failed to delete the file associated with the original test.");
+      }
+      if (!swapFile(src).toFile().renameTo(src.toFile())) {
+        throw new IOException("Failed to restore the altered LF file to its original state.");
+      }
+    }
 
-        /**
-         * Attempt to insert a new line of target language code into this test.
-         * @param line The line to be inserted.
-         */
-        public void insert(String line, Random random) {
-            OnceTrue onceTrue = new OnceTrue(random);
-            alter((it, current) -> {
-                if (insertCondition.test(it) && onceTrue.get()) {
-                    it.previous();
-                    it.add(line);
-                    it.next();
-                    return true;
-                }
-                return false;
-            });
-        }
+    @Override
+    public String toString() {
+      int lengthOfPrefix = 6;
+      StringBuilder ret =
+          new StringBuilder(
+              lines.stream().mapToInt(String::length).reduce(0, Integer::sum)
+                  + lines.size() * lengthOfPrefix);
+      for (int i = 0; i < lines.size(); i++) {
+        ret.append(badLines.contains(i) ? "-> " : "   ")
+            .append(String.format("%1$2s ", i))
+            .append(lines.get(i))
+            .append("\n");
+      }
+      return ret.toString();
+    }
 
-        /**
-         * Alter the content of this test.
-         * @param alterer A function whose first argument is an iterator over the lines of {@code this}, whose second
-         *                argument is the line most recently returned by that iterator, and whose return value is
-         *                whether an alteration was successfully performed. This function is only applied within
-         *                multiline code blocks.
-         */
-        private void alter(BiFunction<ListIterator<String>, String, Boolean> alterer) {
-            ListIterator<String> it = lines.listIterator();
-            boolean inCodeBlock = false;
-            int lineNumber = 0;
-            while (it.hasNext()) {
-                String current = it.next();
-                String uncommented = current.contains("//") ?
-                    current.substring(0, current.indexOf("//")) : current;
-                uncommented = uncommented.contains("#") ?
-                    uncommented.substring(0, uncommented.indexOf("#")) : current;
-                if (uncommented.contains("=}")) inCodeBlock = false;
-                if (inCodeBlock && alterer.apply(it, current)) badLines.add(lineNumber);
-                if (uncommented.contains("{=")) inCodeBlock = true;
-                if (uncommented.contains("{=") && uncommented.contains("=}")) {
-                    inCodeBlock = uncommented.lastIndexOf("{=") > uncommented.lastIndexOf("=}");
-                }
-                lineNumber++;
-            }
-        }
+    /** Return the lines where this differs from the test from which it was derived. */
+    public ImmutableList<Integer> getBadLines() {
+      return ImmutableList.copyOf(badLines);
+    }
 
-        /** Return the swap file associated with {@code f}. */
-        private static Path swapFile(Path p) {
-            return p.getParent().resolve("." + p.getFileName() + ".swp");
-        }
+    /**
+     * Attempt to replace a line of this test with a different line of target language code.
+     *
+     * @param replacer A function that replaces lines of code with possibly different lines.
+     */
+    public void replace(Function<String, String> replacer, Random random) {
+      OnceTrue onceTrue = new OnceTrue(random);
+      alter(
+          (it, current) -> {
+            if (!onceTrue.get()) return false;
+            String newLine = replacer.apply(current);
+            it.remove();
+            it.add(newLine);
+            return !newLine.equals(current);
+          });
     }
 
-    /** A builder for an error inserter. */
-    public static class Builder {
-        private static class Node<T> implements Iterable<T> {
-            private final Node<T> previous;
-            private final T item;
-            private Node(Node<T> previous, T item) {
-                this.previous = previous;
-                this.item = item;
+    /**
+     * Attempt to insert a new line of target language code into this test.
+     *
+     * @param line The line to be inserted.
+     */
+    public void insert(String line, Random random) {
+      OnceTrue onceTrue = new OnceTrue(random);
+      alter(
+          (it, current) -> {
+            if (insertCondition.test(it) && onceTrue.get()) {
+              it.previous();
+              it.add(line);
+              it.next();
+              return true;
             }
+            return false;
+          });
+    }
 
-            @Override
-            public Iterator<T> iterator() {
-                NodeIterator<T> ret = new NodeIterator<>();
-                ret.current = this;
-                return ret;
-            }
+    /**
+     * Alter the content of this test.
+     *
+     * @param alterer A function whose first argument is an iterator over the lines of {@code this},
+     *     whose second argument is the line most recently returned by that iterator, and whose
+     *     return value is whether an alteration was successfully performed. This function is only
+     *     applied within multiline code blocks.
+     */
+    private void alter(BiFunction<ListIterator<String>, String, Boolean> alterer) {
+      ListIterator<String> it = lines.listIterator();
+      boolean inCodeBlock = false;
+      int lineNumber = 0;
+      while (it.hasNext()) {
+        String current = it.next();
+        String uncommented =
+            current.contains("//") ? current.substring(0, current.indexOf("//")) : current;
+        uncommented =
+            uncommented.contains("#")
+                ? uncommented.substring(0, uncommented.indexOf("#"))
+                : current;
+        if (uncommented.contains("=}")) inCodeBlock = false;
+        if (inCodeBlock && alterer.apply(it, current)) badLines.add(lineNumber);
+        if (uncommented.contains("{=")) inCodeBlock = true;
+        if (uncommented.contains("{=") && uncommented.contains("=}")) {
+          inCodeBlock = uncommented.lastIndexOf("{=") > uncommented.lastIndexOf("=}");
+        }
+        lineNumber++;
+      }
+    }
 
-            private static class NodeIterator<T> implements Iterator<T> {
-                private Node<T> current;
+    /** Return the swap file associated with {@code f}. */
+    private static Path swapFile(Path p) {
+      return p.getParent().resolve("." + p.getFileName() + ".swp");
+    }
+  }
 
-                @Override
-                public boolean hasNext() {
-                    return current != null;
-                }
+  /** A builder for an error inserter. */
+  public static class Builder {
+    private static class Node<T> implements Iterable<T> {
+      private final Node<T> previous;
+      private final T item;
 
-                @Override
-                public T next() {
-                    T ret = current.item;
-                    current = current.previous;
-                    return ret;
-                }
-            }
-        }
-        private final Node<Function<String, String>> replacers;
-        private final Node<String> insertables;
-        private final BiPredicate<String, String> insertCondition;
+      private Node(Node<T> previous, T item) {
+        this.previous = previous;
+        this.item = item;
+      }
 
-        /** Initializes a builder for error inserters. */
-        public Builder() {
-            this(null, null, (s0, s1) -> true);
-        }
+      @Override
+      public Iterator<T> iterator() {
+        NodeIterator<T> ret = new NodeIterator<>();
+        ret.current = this;
+        return ret;
+      }
 
-        /** Construct a builder with the given replacers and insertables. */
-        private Builder(
-            Node<Function<String, String>> replacers,
-            Node<String> insertables,
-            BiPredicate<String, String> insertCondition
-        ) {
-            this.replacers = replacers;
-            this.insertables = insertables;
-            this.insertCondition = insertCondition;
-        }
+      private static class NodeIterator<T> implements Iterator<T> {
+        private Node<T> current;
 
-        /**
-         * Record that the resulting {@code ErrorInserter} may replace {@code phrase} with {@code alternativePhrase}.
-         * @param phrase A phrase in target language code.
-         * @param alternativePhrase A phrase that {@code phrase} may be replaced with in order to introduce an error.
-         * @return A {@code Builder} that knows about all the edits that {@code this} knows about, plus the edit that
-         * replaces {@code phrase} with {@code alternativePhrase}.
-         */
-        public Builder replacer(String phrase, String alternativePhrase) {
-            return new Builder(
-                new Node<>(
-                    replacers,
-                    line -> {
-                        int changeableEnd = line.length();
-                        for (String bad : new String[]{"#", "//", "\""}) {
-                            if (line.contains(bad)) changeableEnd = Math.min(changeableEnd, line.indexOf(bad));
-                        }
-                        return line.substring(0, changeableEnd).replace(phrase, alternativePhrase)
-                            + line.substring(changeableEnd);
-                    }
-                ),
-                insertables,
-                insertCondition
-            );
+        @Override
+        public boolean hasNext() {
+          return current != null;
         }
 
-        /** Record that {@code} line may be inserted in order to introduce an error. */
-        public Builder insertable(String line) {
-            return new Builder(replacers, new Node<>(insertables, line), insertCondition);
+        @Override
+        public T next() {
+          T ret = current.item;
+          current = current.previous;
+          return ret;
         }
+      }
+    }
 
-        /**
-         * Record that for any lines X, Y, insertCondition(X, Y) is a necessary condition that a line may be inserted
-         * between X and Y.
-         */
-        public Builder insertCondition(BiPredicate<String, String> insertCondition) {
-            return new Builder(replacers, insertables, this.insertCondition.and(insertCondition));
-        }
+    private final Node<Function<String, String>> replacers;
+    private final Node<String> insertables;
+    private final BiPredicate<String, String> insertCondition;
 
-        /** Get the error inserter generated by {@code this}. */
-        public ErrorInserter get(Random random) {
-            return new ErrorInserter(
-                random,
-                replacers == null ? ImmutableList.of() : ImmutableList.copyOf(replacers),
-                insertables == null ? ImmutableList.of() : ImmutableList.copyOf(insertables),
-                insertCondition
-            );
-        }
+    /** Initializes a builder for error inserters. */
+    public Builder() {
+      this(null, null, (s0, s1) -> true);
     }
 
-    private static final int MAX_ALTERATION_ATTEMPTS = 100;
+    /** Construct a builder with the given replacers and insertables. */
+    private Builder(
+        Node<Function<String, String>> replacers,
+        Node<String> insertables,
+        BiPredicate<String, String> insertCondition) {
+      this.replacers = replacers;
+      this.insertables = insertables;
+      this.insertCondition = insertCondition;
+    }
 
-    private final Random random;
-    private final ImmutableList<Function<String, String>> replacers;
-    private final ImmutableList<String> insertables;
-    private final BiPredicate<String, String> insertCondition;
+    /**
+     * Record that the resulting {@code ErrorInserter} may replace {@code phrase} with {@code
+     * alternativePhrase}.
+     *
+     * @param phrase A phrase in target language code.
+     * @param alternativePhrase A phrase that {@code phrase} may be replaced with in order to
+     *     introduce an error.
+     * @return A {@code Builder} that knows about all the edits that {@code this} knows about, plus
+     *     the edit that replaces {@code phrase} with {@code alternativePhrase}.
+     */
+    public Builder replacer(String phrase, String alternativePhrase) {
+      return new Builder(
+          new Node<>(
+              replacers,
+              line -> {
+                int changeableEnd = line.length();
+                for (String bad : new String[] {"#", "//", "\""}) {
+                  if (line.contains(bad))
+                    changeableEnd = Math.min(changeableEnd, line.indexOf(bad));
+                }
+                return line.substring(0, changeableEnd).replace(phrase, alternativePhrase)
+                    + line.substring(changeableEnd);
+              }),
+          insertables,
+          insertCondition);
+    }
 
-    private ErrorInserter(
-        Random random,
-        ImmutableList<Function<String, String>> replacers,
-        ImmutableList<String> insertables,
-        BiPredicate<String, String> insertCondition
-    ) {
-        this.random = random;
-        this.replacers = replacers;
-        this.insertables = insertables;
-        this.insertCondition = insertCondition;
+    /** Record that {@code} line may be inserted in order to introduce an error. */
+    public Builder insertable(String line) {
+      return new Builder(replacers, new Node<>(insertables, line), insertCondition);
     }
 
     /**
-     * Alter the given test and return the altered version.
-     * @param test The path to the test.
-     * @return An {@code AlteredTest} that is based on {@code test}.
+     * Record that for any lines X, Y, insertCondition(X, Y) is a necessary condition that a line
+     * may be inserted between X and Y.
      */
-    public AlteredTest alterTest(Path test) throws IOException {
-        AlteredTest alterable = new AlteredTest(test, insertCondition);
-        int remainingAlterationAttempts = MAX_ALTERATION_ATTEMPTS;
-        while (alterable.getBadLines().isEmpty() && remainingAlterationAttempts-- > 0) {
-            if (random.nextBoolean() && !replacers.isEmpty()) {
-                alterable.replace(replacers.get(random.nextInt(replacers.size())), random);
-            } else if (!insertables.isEmpty()) {
-                alterable.insert(insertables.get(random.nextInt(insertables.size())), random);
-            }
-        }
-        alterable.write();
-        return alterable;
+    public Builder insertCondition(BiPredicate<String, String> insertCondition) {
+      return new Builder(replacers, insertables, this.insertCondition.and(insertCondition));
+    }
+
+    /** Get the error inserter generated by {@code this}. */
+    public ErrorInserter get(Random random) {
+      return new ErrorInserter(
+          random,
+          replacers == null ? ImmutableList.of() : ImmutableList.copyOf(replacers),
+          insertables == null ? ImmutableList.of() : ImmutableList.copyOf(insertables),
+          insertCondition);
+    }
+  }
+
+  private static final int MAX_ALTERATION_ATTEMPTS = 100;
+
+  private final Random random;
+  private final ImmutableList<Function<String, String>> replacers;
+  private final ImmutableList<String> insertables;
+  private final BiPredicate<String, String> insertCondition;
+
+  private ErrorInserter(
+      Random random,
+      ImmutableList<Function<String, String>> replacers,
+      ImmutableList<String> insertables,
+      BiPredicate<String, String> insertCondition) {
+    this.random = random;
+    this.replacers = replacers;
+    this.insertables = insertables;
+    this.insertCondition = insertCondition;
+  }
+
+  /**
+   * Alter the given test and return the altered version.
+   *
+   * @param test The path to the test.
+   * @return An {@code AlteredTest} that is based on {@code test}.
+   */
+  public AlteredTest alterTest(Path test) throws IOException {
+    AlteredTest alterable = new AlteredTest(test, insertCondition);
+    int remainingAlterationAttempts = MAX_ALTERATION_ATTEMPTS;
+    while (alterable.getBadLines().isEmpty() && remainingAlterationAttempts-- > 0) {
+      if (random.nextBoolean() && !replacers.isEmpty()) {
+        alterable.replace(replacers.get(random.nextInt(replacers.size())), random);
+      } else if (!insertables.isEmpty()) {
+        alterable.insert(insertables.get(random.nextInt(insertables.size())), random);
+      }
     }
+    alterable.write();
+    return alterable;
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/lsp/LspTests.java b/org.lflang.tests/src/org/lflang/tests/lsp/LspTests.java
index 99c1260d44..fe52d6016c 100644
--- a/org.lflang.tests/src/org/lflang/tests/lsp/LspTests.java
+++ b/org.lflang.tests/src/org/lflang/tests/lsp/LspTests.java
@@ -9,12 +9,10 @@
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
-
-import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.lsp4j.Diagnostic;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-
 import org.lflang.LFRuntimeModule;
 import org.lflang.LFStandaloneSetup;
 import org.lflang.Target;
@@ -33,188 +31,211 @@
  */
 class LspTests {
 
-    /** The test categories that should be excluded from LSP tests. */
-    private static final TestCategory[] EXCLUDED_CATEGORIES = {
-        TestCategory.SERIALIZATION, TestCategory.DOCKER, TestCategory.DOCKER_FEDERATED
-    };
-    private static final Predicate<List<Diagnostic>> NOT_SUPPORTED = diagnosticsHaveKeyword("supported");
-    private static final Predicate<List<Diagnostic>> MISSING_DEPENDENCY = diagnosticsHaveKeyword("libprotoc")
-        .or(diagnosticsHaveKeyword("protoc-c")).or(diagnosticsIncludeText("could not be found"));
-    /** The number of samples to take from each test category (with replacement) when doing validation tests. */
-    private static final int SAMPLES_PER_CATEGORY_VALIDATION_TESTS = 3;
-
-    /** The {@code IntegratedBuilder} instance whose behavior is to be tested. */
-    private static final IntegratedBuilder builder = new LFStandaloneSetup(new LFRuntimeModule())
-        .createInjectorAndDoEMFRegistration().getInstance(IntegratedBuilder.class);
-
-    /** Test for false negatives in Python syntax-only validation. */
-    @Test
-    void pythonValidationTestSyntaxOnly() throws IOException {
-        targetLanguageValidationTest(Target.Python, ErrorInserter.PYTHON_SYNTAX_ONLY);
-    }
-
-    /** Test for false negatives in C++ validation. */
-    @Test
-    void cppValidationTest() throws IOException {
-        targetLanguageValidationTest(Target.CPP, ErrorInserter.CPP);
-    }
-
-    /** Test for false negatives in Python validation. */
-    @Test
-    void pythonValidationTest() throws IOException {
-        targetLanguageValidationTest(Target.Python, ErrorInserter.PYTHON);
-    }
-
-    /** Test for false negatives in Rust validation. */
-    @Test
-    void rustValidationTest() throws IOException {
-        targetLanguageValidationTest(Target.Rust, ErrorInserter.RUST);
-    }
-
-    /** Test for false negatives in TypeScript validation. */
-    @Test
-    void typescriptValidationTest() throws IOException {
-        targetLanguageValidationTest(Target.TS, ErrorInserter.TYPESCRIPT);
-    }
-
-    /**
-     * Test for false negatives in the validation of LF files.
-     * @param target The target language of the LF files to be validated.
-     * @param builder A builder for the error inserter that will be used.
-     */
-    private void targetLanguageValidationTest(Target target, ErrorInserter.Builder builder) throws IOException {
-        long seed = new Random().nextLong();
-        System.out.printf("Running validation tests for %s with random seed %d.%n", target.getDisplayName(), seed);
-        Random random = new Random(seed);
-        int i = SAMPLES_PER_CATEGORY_VALIDATION_TESTS;
-        while (i-- > 0) checkDiagnostics(
-            target,
-            alteredTest -> MISSING_DEPENDENCY.or(diagnostics -> alteredTest.getBadLines().stream().allMatch(
-                badLine -> {
-                    System.out.print("Expecting an error to be reported at line " + badLine + "...");
-                    boolean result = NOT_SUPPORTED.test(diagnostics) || diagnostics.stream().anyMatch(
-                        diagnostic -> diagnostic.getRange().getStart().getLine() == badLine
-                    );
-                    if (result) {
-                        System.out.println(" Success.");
-                    } else {
-                        System.out.println(" but the expected error could not be found.");
-                        System.out.printf(
-                            "%s failed. Content of altered version of %s:%n%s%n",
-                            alteredTest.getSrcFile(),
-                            alteredTest.getSrcFile(),
-                            TestBase.THIN_LINE
-                        );
-                        System.out.println(alteredTest + "\n" + TestBase.THIN_LINE);
-                    }
-                    return result;
-                }
-            )),
-            builder.get(random),
-            random
-        );
-    }
-
-    /**
-     * Verify that the diagnostics that result from fully validating tests associated with {@code target} satisfy
-     * {@code requirementGetter}.
-     * @param target Any target language.
-     * @param requirementGetter A map from altered tests to the requirements that diagnostics regarding those tests
-     * must meet.
-     * @param alterer The means of inserting problems into the tests, or {@code null} if problems are not to be
-     * inserted.
-     * @param random The {@code Random} instance that determines which tests are selected.
-     * @throws IOException upon failure to write an altered copy of some test to storage.
-     */
-    private void checkDiagnostics(
-        Target target,
-        Function<AlteredTest, Predicate<List<Diagnostic>>> requirementGetter,
-        ErrorInserter alterer,
-        Random random
-    ) throws IOException {
-        MockLanguageClient client = new MockLanguageClient();
-        LanguageServerErrorReporter.setClient(client);
-        for (LFTest test : selectTests(target, random)) {
-            client.clearDiagnostics();
-            if (alterer != null) {
-                try (AlteredTest altered = alterer.alterTest(test.getSrcPath())) {
-                    runTest(altered.getSrcFile());
-                    Assertions.assertTrue(requirementGetter.apply(altered).test(client.getReceivedDiagnostics()));
-                }
-            } else {
-                runTest(test.getSrcPath());
-                Assertions.assertTrue(requirementGetter.apply(null).test(client.getReceivedDiagnostics()));
-            }
+  /** The test categories that should be excluded from LSP tests. */
+  private static final TestCategory[] EXCLUDED_CATEGORIES = {
+    TestCategory.SERIALIZATION, TestCategory.DOCKER, TestCategory.DOCKER_FEDERATED
+  };
+
+  private static final Predicate<List<Diagnostic>> NOT_SUPPORTED =
+      diagnosticsHaveKeyword("supported");
+  private static final Predicate<List<Diagnostic>> MISSING_DEPENDENCY =
+      diagnosticsHaveKeyword("libprotoc")
+          .or(diagnosticsHaveKeyword("protoc-c"))
+          .or(diagnosticsIncludeText("could not be found"));
+  /**
+   * The number of samples to take from each test category (with replacement) when doing validation
+   * tests.
+   */
+  private static final int SAMPLES_PER_CATEGORY_VALIDATION_TESTS = 3;
+
+  /** The {@code IntegratedBuilder} instance whose behavior is to be tested. */
+  private static final IntegratedBuilder builder =
+      new LFStandaloneSetup(new LFRuntimeModule())
+          .createInjectorAndDoEMFRegistration()
+          .getInstance(IntegratedBuilder.class);
+
+  /** Test for false negatives in Python syntax-only validation. */
+  @Test
+  void pythonValidationTestSyntaxOnly() throws IOException {
+    targetLanguageValidationTest(Target.Python, ErrorInserter.PYTHON_SYNTAX_ONLY);
+  }
+
+  /** Test for false negatives in C++ validation. */
+  @Test
+  void cppValidationTest() throws IOException {
+    targetLanguageValidationTest(Target.CPP, ErrorInserter.CPP);
+  }
+
+  /** Test for false negatives in Python validation. */
+  @Test
+  void pythonValidationTest() throws IOException {
+    targetLanguageValidationTest(Target.Python, ErrorInserter.PYTHON);
+  }
+
+  /** Test for false negatives in Rust validation. */
+  @Test
+  void rustValidationTest() throws IOException {
+    targetLanguageValidationTest(Target.Rust, ErrorInserter.RUST);
+  }
+
+  /** Test for false negatives in TypeScript validation. */
+  @Test
+  void typescriptValidationTest() throws IOException {
+    targetLanguageValidationTest(Target.TS, ErrorInserter.TYPESCRIPT);
+  }
+
+  /**
+   * Test for false negatives in the validation of LF files.
+   *
+   * @param target The target language of the LF files to be validated.
+   * @param builder A builder for the error inserter that will be used.
+   */
+  private void targetLanguageValidationTest(Target target, ErrorInserter.Builder builder)
+      throws IOException {
+    long seed = new Random().nextLong();
+    System.out.printf(
+        "Running validation tests for %s with random seed %d.%n", target.getDisplayName(), seed);
+    Random random = new Random(seed);
+    int i = SAMPLES_PER_CATEGORY_VALIDATION_TESTS;
+    while (i-- > 0)
+      checkDiagnostics(
+          target,
+          alteredTest ->
+              MISSING_DEPENDENCY.or(
+                  diagnostics ->
+                      alteredTest.getBadLines().stream()
+                          .allMatch(
+                              badLine -> {
+                                System.out.print(
+                                    "Expecting an error to be reported at line " + badLine + "...");
+                                boolean result =
+                                    NOT_SUPPORTED.test(diagnostics)
+                                        || diagnostics.stream()
+                                            .anyMatch(
+                                                diagnostic ->
+                                                    diagnostic.getRange().getStart().getLine()
+                                                        == badLine);
+                                if (result) {
+                                  System.out.println(" Success.");
+                                } else {
+                                  System.out.println(" but the expected error could not be found.");
+                                  System.out.printf(
+                                      "%s failed. Content of altered version of %s:%n%s%n",
+                                      alteredTest.getSrcFile(),
+                                      alteredTest.getSrcFile(),
+                                      TestBase.THIN_LINE);
+                                  System.out.println(alteredTest + "\n" + TestBase.THIN_LINE);
+                                }
+                                return result;
+                              })),
+          builder.get(random),
+          random);
+  }
+
+  /**
+   * Verify that the diagnostics that result from fully validating tests associated with {@code
+   * target} satisfy {@code requirementGetter}.
+   *
+   * @param target Any target language.
+   * @param requirementGetter A map from altered tests to the requirements that diagnostics
+   *     regarding those tests must meet.
+   * @param alterer The means of inserting problems into the tests, or {@code null} if problems are
+   *     not to be inserted.
+   * @param random The {@code Random} instance that determines which tests are selected.
+   * @throws IOException upon failure to write an altered copy of some test to storage.
+   */
+  private void checkDiagnostics(
+      Target target,
+      Function<AlteredTest, Predicate<List<Diagnostic>>> requirementGetter,
+      ErrorInserter alterer,
+      Random random)
+      throws IOException {
+    MockLanguageClient client = new MockLanguageClient();
+    LanguageServerErrorReporter.setClient(client);
+    for (LFTest test : selectTests(target, random)) {
+      client.clearDiagnostics();
+      if (alterer != null) {
+        try (AlteredTest altered = alterer.alterTest(test.getSrcPath())) {
+          runTest(altered.getSrcFile());
+          Assertions.assertTrue(
+              requirementGetter.apply(altered).test(client.getReceivedDiagnostics()));
         }
+      } else {
+        runTest(test.getSrcPath());
+        Assertions.assertTrue(requirementGetter.apply(null).test(client.getReceivedDiagnostics()));
+      }
     }
-
-    /**
-     * Select a test from each test category.
-     * @param target The target language of the desired tests.
-     * @param random The {@code Random} instance that determines which tests are selected.
-     * @return A sample of one integration test per target, per category.
-     */
-    private Set<LFTest> selectTests(Target target, Random random) {
-        Set<LFTest> ret = new HashSet<>();
-        for (TestCategory category : selectedCategories()) {
-            Set<LFTest> registeredTests = TestRegistry.getRegisteredTests(target, category, false);
-            if (registeredTests.size() == 0) continue;
-            int relativeIndex = random.nextInt(registeredTests.size());
-            for (LFTest t : registeredTests) {
-                if (relativeIndex-- == 0) {
-                    ret.add(t);
-                    break;
-                }
-            }
+  }
+
+  /**
+   * Select a test from each test category.
+   *
+   * @param target The target language of the desired tests.
+   * @param random The {@code Random} instance that determines which tests are selected.
+   * @return A sample of one integration test per target, per category.
+   */
+  private Set<LFTest> selectTests(Target target, Random random) {
+    Set<LFTest> ret = new HashSet<>();
+    for (TestCategory category : selectedCategories()) {
+      Set<LFTest> registeredTests = TestRegistry.getRegisteredTests(target, category, false);
+      if (registeredTests.size() == 0) continue;
+      int relativeIndex = random.nextInt(registeredTests.size());
+      for (LFTest t : registeredTests) {
+        if (relativeIndex-- == 0) {
+          ret.add(t);
+          break;
         }
-        return ret;
-    }
-
-    /** Return the non-excluded categories. */
-    private Iterable<? extends TestCategory> selectedCategories() {
-        return () -> Arrays.stream(TestCategory.values()).filter(
-            category -> Arrays.stream(EXCLUDED_CATEGORIES).noneMatch(category::equals)
-        ).iterator();
+      }
     }
-
-    /**
-     * Return the predicate that a list of diagnostics contains the given keyword.
-     * @param keyword A keyword that a list of diagnostics should be searched for.
-     * @return The predicate, "X mentions {@code keyword}."
-     */
-    private static Predicate<List<Diagnostic>> diagnosticsHaveKeyword(String keyword) {
-        return diagnostics -> diagnostics.stream().anyMatch(
-            d -> Arrays.asList(d.getMessage().toLowerCase().split("\\b")).contains(keyword)
-        );
-    }
-
-    /**
-     * Return the predicate that a list of diagnostics contains the given text.
-     * @param requiredText A keyword that a list of diagnostics should be searched for.
-     * @return The predicate, "X includes {@code requiredText}."
-     */
-    private static Predicate<List<Diagnostic>> diagnosticsIncludeText(@SuppressWarnings("SameParameterValue") String requiredText) {
-        return diagnostics -> diagnostics.stream().anyMatch(
-            d -> d.getMessage().toLowerCase().contains(requiredText)
-        );
-    }
-
-    /**
-     * Run the given test.
-     * @param test The test b
-     */
-    private void runTest(Path test) {
-        MockReportProgress reportProgress = new MockReportProgress();
-        try {
-            builder.run(
-                URI.createFileURI(test.toString()),
-                false, reportProgress,
-                () -> false
-            );
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw e;
-        }
-        Assertions.assertFalse(reportProgress.failed());
+    return ret;
+  }
+
+  /** Return the non-excluded categories. */
+  private Iterable<? extends TestCategory> selectedCategories() {
+    return () ->
+        Arrays.stream(TestCategory.values())
+            .filter(category -> Arrays.stream(EXCLUDED_CATEGORIES).noneMatch(category::equals))
+            .iterator();
+  }
+
+  /**
+   * Return the predicate that a list of diagnostics contains the given keyword.
+   *
+   * @param keyword A keyword that a list of diagnostics should be searched for.
+   * @return The predicate, "X mentions {@code keyword}."
+   */
+  private static Predicate<List<Diagnostic>> diagnosticsHaveKeyword(String keyword) {
+    return diagnostics ->
+        diagnostics.stream()
+            .anyMatch(
+                d -> Arrays.asList(d.getMessage().toLowerCase().split("\\b")).contains(keyword));
+  }
+
+  /**
+   * Return the predicate that a list of diagnostics contains the given text.
+   *
+   * @param requiredText A keyword that a list of diagnostics should be searched for.
+   * @return The predicate, "X includes {@code requiredText}."
+   */
+  private static Predicate<List<Diagnostic>> diagnosticsIncludeText(
+      @SuppressWarnings("SameParameterValue") String requiredText) {
+    return diagnostics ->
+        diagnostics.stream().anyMatch(d -> d.getMessage().toLowerCase().contains(requiredText));
+  }
+
+  /**
+   * Run the given test.
+   *
+   * @param test The test b
+   */
+  private void runTest(Path test) {
+    MockReportProgress reportProgress = new MockReportProgress();
+    try {
+      builder.run(URI.createFileURI(test.toString()), false, reportProgress, () -> false);
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw e;
     }
+    Assertions.assertFalse(reportProgress.failed());
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/lsp/MockLanguageClient.java b/org.lflang.tests/src/org/lflang/tests/lsp/MockLanguageClient.java
index 8aad48c547..1e3e06ef05 100644
--- a/org.lflang.tests/src/org/lflang/tests/lsp/MockLanguageClient.java
+++ b/org.lflang.tests/src/org/lflang/tests/lsp/MockLanguageClient.java
@@ -4,7 +4,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-
 import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.lsp4j.MessageActionItem;
@@ -20,49 +19,53 @@
  */
 public class MockLanguageClient implements LanguageClient {
 
-    private List<Diagnostic> receivedDiagnostics = new ArrayList<>();
+  private List<Diagnostic> receivedDiagnostics = new ArrayList<>();
 
-    @Override
-    public void telemetryEvent(Object object) {
-        // Do nothing.
-    }
+  @Override
+  public void telemetryEvent(Object object) {
+    // Do nothing.
+  }
 
-    @Override
-    public void publishDiagnostics(PublishDiagnosticsParams diagnostics) {
-        receivedDiagnostics.addAll(diagnostics.getDiagnostics());
-        for (Diagnostic d : diagnostics.getDiagnostics()) {
-            (
-                (d.getSeverity() == DiagnosticSeverity.Error || d.getSeverity() == DiagnosticSeverity.Warning) ?
-                System.err : System.out
-            ).println(
-                "Test client received diagnostic at line " + d.getRange().getStart().getLine() + ": " + d.getMessage()
-            );
-        }
+  @Override
+  public void publishDiagnostics(PublishDiagnosticsParams diagnostics) {
+    receivedDiagnostics.addAll(diagnostics.getDiagnostics());
+    for (Diagnostic d : diagnostics.getDiagnostics()) {
+      ((d.getSeverity() == DiagnosticSeverity.Error
+                  || d.getSeverity() == DiagnosticSeverity.Warning)
+              ? System.err
+              : System.out)
+          .println(
+              "Test client received diagnostic at line "
+                  + d.getRange().getStart().getLine()
+                  + ": "
+                  + d.getMessage());
     }
+  }
 
-    @Override
-    public void showMessage(MessageParams messageParams) {
-        System.out.println("Test client received message: " + messageParams.getMessage());
-    }
+  @Override
+  public void showMessage(MessageParams messageParams) {
+    System.out.println("Test client received message: " + messageParams.getMessage());
+  }
 
-    @Override
-    public CompletableFuture<MessageActionItem> showMessageRequest(ShowMessageRequestParams requestParams) {
-        showMessage(requestParams);
-        return null;
-    }
+  @Override
+  public CompletableFuture<MessageActionItem> showMessageRequest(
+      ShowMessageRequestParams requestParams) {
+    showMessage(requestParams);
+    return null;
+  }
 
-    @Override
-    public void logMessage(MessageParams message) {
-        showMessage(message);
-    }
+  @Override
+  public void logMessage(MessageParams message) {
+    showMessage(message);
+  }
 
-    /** Return the diagnostics that {@code this} has received. */
-    public List<Diagnostic> getReceivedDiagnostics() {
-        return Collections.unmodifiableList(receivedDiagnostics);
-    }
+  /** Return the diagnostics that {@code this} has received. */
+  public List<Diagnostic> getReceivedDiagnostics() {
+    return Collections.unmodifiableList(receivedDiagnostics);
+  }
 
-    /** Clear the diagnostics recorded by {@code this}. */
-    public void clearDiagnostics() {
-        receivedDiagnostics.clear();
-    }
+  /** Clear the diagnostics recorded by {@code this}. */
+  public void clearDiagnostics() {
+    receivedDiagnostics.clear();
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/lsp/MockReportProgress.java b/org.lflang.tests/src/org/lflang/tests/lsp/MockReportProgress.java
index 014fcc7276..f0cfb088c1 100644
--- a/org.lflang.tests/src/org/lflang/tests/lsp/MockReportProgress.java
+++ b/org.lflang.tests/src/org/lflang/tests/lsp/MockReportProgress.java
@@ -8,26 +8,29 @@
  * @author Peter Donovan
  */
 public class MockReportProgress implements IntegratedBuilder.ReportProgress {
-    private int previousPercentProgress;
-    private boolean failed;
-    public MockReportProgress() {
-        previousPercentProgress = 0;
-        failed = false;
-    }
+  private int previousPercentProgress;
+  private boolean failed;
 
-    @Override
-    public void apply(String message, Integer percentage) {
-        System.out.printf("MockReportProgress: %s [%d -> %d]%n", message, previousPercentProgress, percentage);
-        if (percentage == null) return;
-        if (percentage < previousPercentProgress || percentage < 0 || percentage > 100) failed = true;
-        previousPercentProgress = percentage;
-    }
+  public MockReportProgress() {
+    previousPercentProgress = 0;
+    failed = false;
+  }
 
-    /**
-     * Returns whether an invalid sequence of progress reports was received.
-     * @return whether an invalid sequence of progress reports was received
-     */
-    public boolean failed() {
-        return failed;
-    }
+  @Override
+  public void apply(String message, Integer percentage) {
+    System.out.printf(
+        "MockReportProgress: %s [%d -> %d]%n", message, previousPercentProgress, percentage);
+    if (percentage == null) return;
+    if (percentage < previousPercentProgress || percentage < 0 || percentage > 100) failed = true;
+    previousPercentProgress = percentage;
+  }
+
+  /**
+   * Returns whether an invalid sequence of progress reports was received.
+   *
+   * @return whether an invalid sequence of progress reports was received
+   */
+  public boolean failed() {
+    return failed;
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/CArduinoTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/CArduinoTest.java
index e783c335a0..95363fd30b 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/CArduinoTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/CArduinoTest.java
@@ -2,9 +2,7 @@
 
 import java.util.List;
 import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-
 import org.lflang.Target;
 import org.lflang.tests.Configurators;
 import org.lflang.tests.RuntimeTest;
@@ -17,17 +15,19 @@
  */
 public class CArduinoTest extends RuntimeTest {
 
-    public CArduinoTest() {
-        super(Target.C);
-    }
+  public CArduinoTest() {
+    super(Target.C);
+  }
 
-    @Test
-    public void buildArduinoTests() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runTestsFor(List.of(Target.C),
-            Message.DESC_ARDUINO,
-            TestCategory.ARDUINO::equals, Configurators::noChanges,
-            TestLevel.BUILD,
-            false);
-    }
+  @Test
+  public void buildArduinoTests() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runTestsFor(
+        List.of(Target.C),
+        Message.DESC_ARDUINO,
+        TestCategory.ARDUINO::equals,
+        Configurators::noChanges,
+        TestLevel.BUILD,
+        false);
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/CCppTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/CCppTest.java
index c8c2fc5b93..ba1865e870 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/CCppTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/CCppTest.java
@@ -2,51 +2,49 @@
 
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
-import org.lflang.ast.ASTUtils;
 import org.lflang.Target;
+import org.lflang.ast.ASTUtils;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry.TestCategory;
 
 /**
  * Collection of tests for the CCpp target.
  *
- * NOTE: This test does not inherit any tests because it directly extends TestBase.
+ * <p>NOTE: This test does not inherit any tests because it directly extends TestBase.
  *
  * @author Marten Lohstroh
  */
 public class CCppTest extends TestBase {
 
-    /**
-     * This target selects the C target it has no tests defined for it.
-     * Instead, it reconfigures existing C tests to adopt the CCpp target.
-     */
-    public CCppTest() {
-        super(Target.C);
-    }
+  /**
+   * This target selects the C target it has no tests defined for it. Instead, it reconfigures
+   * existing C tests to adopt the CCpp target.
+   */
+  public CCppTest() {
+    super(Target.C);
+  }
 
-    /**
-     * Run C tests with the target CCpp.
-     */
-    @Test
-    public void runAsCCpp() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        runTestsForTargets(Message.DESC_AS_CCPP, CCppTest::isExcludedFromCCpp,
-                           it -> ASTUtils.changeTargetName(it.getFileConfig().resource,
-                                                           Target.CCPP.getDisplayName()),
-                           TestLevel.EXECUTION,
-                           true);
-    }
+  /** Run C tests with the target CCpp. */
+  @Test
+  public void runAsCCpp() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    runTestsForTargets(
+        Message.DESC_AS_CCPP,
+        CCppTest::isExcludedFromCCpp,
+        it -> ASTUtils.changeTargetName(it.getFileConfig().resource, Target.CCPP.getDisplayName()),
+        TestLevel.EXECUTION,
+        true);
+  }
 
-    /**
-     * Exclusion function for runAsCCpp test
-     */
-    private static boolean isExcludedFromCCpp(TestCategory category) {
-        boolean excluded = category == TestCategory.SERIALIZATION;
-        excluded |= isWindows() && (category == TestCategory.DOCKER_FEDERATED);
-        excluded |= isMac() && (category == TestCategory.DOCKER_FEDERATED || category == TestCategory.DOCKER);
-        excluded |= category == TestCategory.ZEPHYR;
-        excluded |= category == TestCategory.ARDUINO;
-        excluded |= category == TestCategory.NO_INLINING;
-        return !excluded;
-    }
+  /** Exclusion function for runAsCCpp test */
+  private static boolean isExcludedFromCCpp(TestCategory category) {
+    boolean excluded = category == TestCategory.SERIALIZATION;
+    excluded |= isWindows() && (category == TestCategory.DOCKER_FEDERATED);
+    excluded |=
+        isMac() && (category == TestCategory.DOCKER_FEDERATED || category == TestCategory.DOCKER);
+    excluded |= category == TestCategory.ZEPHYR;
+    excluded |= category == TestCategory.ARDUINO;
+    excluded |= category == TestCategory.NO_INLINING;
+    return !excluded;
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/CSchedulerTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/CSchedulerTest.java
index fa387d8a00..fd2345723f 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/CSchedulerTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/CSchedulerTest.java
@@ -1,74 +1,65 @@
 package org.lflang.tests.runtime;
 
 import java.util.EnumSet;
-
 import org.junit.jupiter.api.Test;
-
 import org.lflang.Target;
 import org.lflang.TargetProperty.SchedulerOption;
 import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry.TestCategory;
 
-/**
- */
+/** */
 public class CSchedulerTest extends TestBase {
 
+  public CSchedulerTest() {
+    super(Target.C);
+  }
 
-    public CSchedulerTest() {
-        super(Target.C);
-    }
-
-    /**
-     * Swap the default runtime scheduler with other supported versions and
-     * run all the supported tests. Only run tests for a specific non-default
-     * scheduler if specified using a system property (e.g., -Dscheduler=GEDF_NP).
-     */
-    @Test
-    public void runWithNonDefaultSchedulers() {
-        EnumSet<TestCategory> categories = EnumSet.of(TestCategory.CONCURRENT,
-                                                      TestCategory.MULTIPORT);
-        
-        // Add federated and docker tests if supported
-        if (!isWindows()) {
-            categories.add(TestCategory.FEDERATED);
-            if (isLinux()) {
-                categories.add(TestCategory.DOCKER_FEDERATED);
-            }
-        }
-        var name = System.getProperty("scheduler");
+  /**
+   * Swap the default runtime scheduler with other supported versions and run all the supported
+   * tests. Only run tests for a specific non-default scheduler if specified using a system property
+   * (e.g., -Dscheduler=GEDF_NP).
+   */
+  @Test
+  public void runWithNonDefaultSchedulers() {
+    EnumSet<TestCategory> categories = EnumSet.of(TestCategory.CONCURRENT, TestCategory.MULTIPORT);
 
-        if (name != null) {
-            var option = EnumSet.allOf(SchedulerOption.class).stream()
-                                .filter(it -> it.name().equals(name)).findFirst();
-            if (option.isPresent()) {
-                this.runTest(option.get(), categories);
-            } else {
-                throw new RuntimeException("Cannot find runtime scheduler called " + name);
-            }
-        } else {
-            for (SchedulerOption scheduler: EnumSet.allOf(SchedulerOption.class)) {
-                if (scheduler == SchedulerOption.getDefault()) continue;
-                this.runTest(scheduler, categories);
-            }
-        }
+    // Add federated and docker tests if supported
+    if (!isWindows()) {
+      categories.add(TestCategory.FEDERATED);
+      if (isLinux()) {
+        categories.add(TestCategory.DOCKER_FEDERATED);
+      }
     }
+    var name = System.getProperty("scheduler");
 
-    private void runTest(SchedulerOption scheduler, EnumSet<TestCategory> categories) {
-        this.runTestsForTargets(
-            Message.DESC_SCHED_SWAPPING + scheduler.toString() +".",
-            categories::contains,
-            test -> {
-                test.getContext().getArgs()
-                    .setProperty(
-                        "scheduler",
-                        scheduler.toString()
-                    );
-                return Configurators.noChanges(test);
-            },
-            TestLevel.EXECUTION,
-            true
-        );
+    if (name != null) {
+      var option =
+          EnumSet.allOf(SchedulerOption.class).stream()
+              .filter(it -> it.name().equals(name))
+              .findFirst();
+      if (option.isPresent()) {
+        this.runTest(option.get(), categories);
+      } else {
+        throw new RuntimeException("Cannot find runtime scheduler called " + name);
+      }
+    } else {
+      for (SchedulerOption scheduler : EnumSet.allOf(SchedulerOption.class)) {
+        if (scheduler == SchedulerOption.getDefault()) continue;
+        this.runTest(scheduler, categories);
+      }
     }
-}
+  }
 
+  private void runTest(SchedulerOption scheduler, EnumSet<TestCategory> categories) {
+    this.runTestsForTargets(
+        Message.DESC_SCHED_SWAPPING + scheduler.toString() + ".",
+        categories::contains,
+        test -> {
+          test.getContext().getArgs().setProperty("scheduler", scheduler.toString());
+          return Configurators.noChanges(test);
+        },
+        TestLevel.EXECUTION,
+        true);
+  }
+}
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/CTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/CTest.java
index eba4f7bc71..4902550661 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/CTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/CTest.java
@@ -1,133 +1,131 @@
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.tests.runtime;
 
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-
 import org.lflang.Target;
 import org.lflang.tests.RuntimeTest;
 
 /**
  * Collection of tests for the C target.
  *
- * Tests that are implemented in the base class are still overridden so that
- * each test can be easily invoked individually from IDEs with JUnit support
- * like Eclipse and IntelliJ.
- * This is typically done by right-clicking on the name of the test method and
- * then clicking "Run".*
+ * <p>Tests that are implemented in the base class are still overridden so that each test can be
+ * easily invoked individually from IDEs with JUnit support like Eclipse and IntelliJ. This is
+ * typically done by right-clicking on the name of the test method and then clicking "Run".*
+ *
  * @author Marten Lohstroh
  */
 public class CTest extends RuntimeTest {
 
-    public CTest() {
-        super(Target.C);
-    }
-
-    @Override
-    protected boolean supportsSingleThreadedExecution() {
-        return true;
-    }
-
-    @Override
-    protected boolean supportsFederatedExecution() {
-        return true;
-    }
-
-    @Override
-    protected boolean supportsDockerOption() {
-        return true;
-    }
-
-    @Test
-    @Override
-    public void runGenericTests() {
-        super.runGenericTests();
-    }
-
-    @Test
-    @Override
-    public void runTargetSpecificTests() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runTargetSpecificTests();
-    }
-
-    @Test
-    @Override
-    public void runMultiportTests() {
-        super.runMultiportTests();
-    }
-
-    @Test
-    @Override
-    public void runWithThreadingOff() {
-        super.runWithThreadingOff();
-    }
-
-    @Test
-    @Disabled("TODO only 27/96 tests pass")
-    @Override
-    public void runAsFederated() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runAsFederated();
-    }
-
-    @Test
-    @Override
-    public void runConcurrentTests() {
-        super.runConcurrentTests();
-    }
-
-    @Test
-    @Override
-    public void runFederatedTests() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runFederatedTests();
-    }
-
-    @Test
-    public void runModalTests() {
-        super.runModalTests();
-    }
-
-    @Test
-    public void runNoInliningTests() {
-        super.runNoInliningTests();
-    }
-
-    @Test
-    @Override
-    public void runDockerTests() {
-        super.runDockerTests();
-    }
-
-    @Test
-    @Override
-    public void runDockerFederatedTests() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runDockerFederatedTests();
-    }
+  public CTest() {
+    super(Target.C);
+  }
+
+  @Override
+  protected boolean supportsSingleThreadedExecution() {
+    return true;
+  }
+
+  @Override
+  protected boolean supportsFederatedExecution() {
+    return true;
+  }
+
+  @Override
+  protected boolean supportsDockerOption() {
+    return true;
+  }
+
+  @Test
+  @Override
+  public void runGenericTests() {
+    super.runGenericTests();
+  }
+
+  @Test
+  @Override
+  public void runTargetSpecificTests() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runTargetSpecificTests();
+  }
+
+  @Test
+  @Override
+  public void runMultiportTests() {
+    super.runMultiportTests();
+  }
+
+  @Test
+  @Override
+  public void runWithThreadingOff() {
+    super.runWithThreadingOff();
+  }
+
+  @Test
+  @Disabled("TODO only 27/96 tests pass")
+  @Override
+  public void runAsFederated() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runAsFederated();
+  }
+
+  @Test
+  @Override
+  public void runConcurrentTests() {
+    super.runConcurrentTests();
+  }
+
+  @Test
+  @Override
+  public void runFederatedTests() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runFederatedTests();
+  }
+
+  @Test
+  public void runModalTests() {
+    super.runModalTests();
+  }
+
+  @Test
+  public void runNoInliningTests() {
+    super.runNoInliningTests();
+  }
+
+  @Test
+  @Override
+  public void runDockerTests() {
+    super.runDockerTests();
+  }
+
+  @Test
+  @Override
+  public void runDockerFederatedTests() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runDockerFederatedTests();
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/CZephyrTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/CZephyrTest.java
index afe1646829..c151c1bb76 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/CZephyrTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/CZephyrTest.java
@@ -1,35 +1,32 @@
 /*************
-Copyright (c) 2023, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2023, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.tests.runtime;
 
 import java.util.List;
-
 import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-
 import org.lflang.Target;
 import org.lflang.tests.Configurators;
 import org.lflang.tests.RuntimeTest;
@@ -42,29 +39,31 @@
  */
 public class CZephyrTest extends RuntimeTest {
 
-    public CZephyrTest() {
-        super(Target.C);
-    }
+  public CZephyrTest() {
+    super(Target.C);
+  }
 
-    @Test
-    public void buildZephyrTests() {
-        Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
-        super.runTestsFor(List.of(Target.C),
-            Message.DESC_ZEPHYR,
-            TestCategory.ZEPHYR::equals,
-            Configurators::makeZephyrCompatible,
-            TestLevel.BUILD,
-            false);
-    }
-    @Test
-    public void buildGenericTests() {
-        Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
-        super.runTestsFor(List.of(Target.C),
-            Message.DESC_GENERIC,
-            TestCategory.GENERIC::equals,
-            Configurators::makeZephyrCompatible,
-            TestLevel.BUILD,
-            false);
-    }
-}
+  @Test
+  public void buildZephyrTests() {
+    Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
+    super.runTestsFor(
+        List.of(Target.C),
+        Message.DESC_ZEPHYR,
+        TestCategory.ZEPHYR::equals,
+        Configurators::makeZephyrCompatible,
+        TestLevel.BUILD,
+        false);
+  }
 
+  @Test
+  public void buildGenericTests() {
+    Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
+    super.runTestsFor(
+        List.of(Target.C),
+        Message.DESC_GENERIC,
+        TestCategory.GENERIC::equals,
+        Configurators::makeZephyrCompatible,
+        TestLevel.BUILD,
+        false);
+  }
+}
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/CppRos2Test.java b/org.lflang.tests/src/org/lflang/tests/runtime/CppRos2Test.java
index 2e4f6b78d3..dc2612c14b 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/CppRos2Test.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/CppRos2Test.java
@@ -2,9 +2,8 @@
 
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.Target;
+import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.LfFactory;
 import org.lflang.tests.TestBase;
@@ -12,25 +11,27 @@
 /**
  * Run C++ tests using the ROS2 platform.
  *
- * NOTE: This test does not inherit any tests because it directly extends TestBase.
+ * <p>NOTE: This test does not inherit any tests because it directly extends TestBase.
  *
  * @author Christian Menard
  */
 public class CppRos2Test extends TestBase {
 
-    public CppRos2Test() { super(Target.CPP); }
+  public CppRos2Test() {
+    super(Target.CPP);
+  }
 
-    /**
-     * Run C++ tests with the ros2 target property set
-     */
-    @Test
-    public void runWithRos2() {
-        Assumptions.assumeTrue(isLinux(), "Only supported on Linux");
-        Element trueLiteral = LfFactory.eINSTANCE.createElement();
-        trueLiteral.setLiteral("true");
-        runTestsForTargets(Message.DESC_ROS2, it -> true,
-                           it -> ASTUtils.addTargetProperty(it.getFileConfig().resource, "ros2", trueLiteral),
-                           TestLevel.EXECUTION,
-                           true);
-    }
+  /** Run C++ tests with the ros2 target property set */
+  @Test
+  public void runWithRos2() {
+    Assumptions.assumeTrue(isLinux(), "Only supported on Linux");
+    Element trueLiteral = LfFactory.eINSTANCE.createElement();
+    trueLiteral.setLiteral("true");
+    runTestsForTargets(
+        Message.DESC_ROS2,
+        it -> true,
+        it -> ASTUtils.addTargetProperty(it.getFileConfig().resource, "ros2", trueLiteral),
+        TestLevel.EXECUTION,
+        true);
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/CppTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/CppTest.java
index 77bf4e664a..20973189b9 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/CppTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/CppTest.java
@@ -1,86 +1,84 @@
 /* Integration tests for the C++ target. */
 
 /*************
-Copyright (c) 2021, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2021, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.tests.runtime;
 
-import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.lflang.Target;
 import org.lflang.tests.RuntimeTest;
 
 /**
- * Collection of tests for the Cpp target.
- * Even though all tests are implemented in the base class, we override them
- * here so that each test can be easily invoked individually from IDEs with
- * JUnit support like Eclipse and IntelliJ.
- * This is typically done by right-clicking on the name of the test method and
- * then clicking "Run".
+ * Collection of tests for the Cpp target. Even though all tests are implemented in the base class,
+ * we override them here so that each test can be easily invoked individually from IDEs with JUnit
+ * support like Eclipse and IntelliJ. This is typically done by right-clicking on the name of the
+ * test method and then clicking "Run".
  *
  * @author Marten Lohstroh
  */
 public class CppTest extends RuntimeTest {
 
-    public CppTest() {
-        super(Target.CPP);
-    }
-
-    @Override
-    protected boolean supportsEnclaves() { return true; }
-
-    @Test
-    @Override
-    public void runGenericTests() {
-        super.runGenericTests();
-    }
-
-    @Test
-    @Override
-    public void runTargetSpecificTests() {
-        super.runTargetSpecificTests();
-    }
-
-    @Test
-    @Override
-    public void runMultiportTests() {
-        super.runMultiportTests();
-    }
-
-    @Test
-    @Override
-    public void runConcurrentTests() {
-        super.runConcurrentTests();
-    }
-
-    @Test
-    @Override
-    public void runFederatedTests() {
-        super.runFederatedTests();
-    }
-
-    @Test
-    public void runRos2Tests() { }
-
+  public CppTest() {
+    super(Target.CPP);
+  }
+
+  @Override
+  protected boolean supportsEnclaves() {
+    return true;
+  }
+
+  @Test
+  @Override
+  public void runGenericTests() {
+    super.runGenericTests();
+  }
+
+  @Test
+  @Override
+  public void runTargetSpecificTests() {
+    super.runTargetSpecificTests();
+  }
+
+  @Test
+  @Override
+  public void runMultiportTests() {
+    super.runMultiportTests();
+  }
+
+  @Test
+  @Override
+  public void runConcurrentTests() {
+    super.runConcurrentTests();
+  }
+
+  @Test
+  @Override
+  public void runFederatedTests() {
+    super.runFederatedTests();
+  }
+
+  @Test
+  public void runRos2Tests() {}
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/PythonTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/PythonTest.java
index e028e6ac4d..1c258b7481 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/PythonTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/PythonTest.java
@@ -1,31 +1,30 @@
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.tests.runtime;
 
 import java.util.Properties;
-
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -35,94 +34,92 @@
 /**
  * Collection of tests for the Python target.
  *
- * Even though all tests are implemented in the base class, we override them
- * here so that each test can be easily invoked individually from IDEs with
- * JUnit support like Eclipse and IntelliJ.
- * This is typically done by right-clicking on the name of the test method and
- * then clicking "Run".
+ * <p>Even though all tests are implemented in the base class, we override them here so that each
+ * test can be easily invoked individually from IDEs with JUnit support like Eclipse and IntelliJ.
+ * This is typically done by right-clicking on the name of the test method and then clicking "Run".
  *
  * @author Marten Lohstroh
  */
 public class PythonTest extends RuntimeTest {
 
-    public PythonTest() {
-        super(Target.Python);
-    }
-
-    @Override
-    protected void addExtraLfcArgs(Properties args) {
-        super.addExtraLfcArgs(args);
-        if (System.getProperty("os.name").startsWith("Windows")) {
-            // Use the RelWithDebInfo build type on Windows as the Debug/Test build type produces linker Errors in CI
-            args.setProperty("build-type", "RelWithDebInfo");
-        }
-    }
-
-    @Override
-    protected boolean supportsFederatedExecution() {
-        return true;
-    }
-
-    @Override
-    protected boolean supportsSingleThreadedExecution() {
-        return true;
-    }
-
-    @Override
-    protected boolean supportsDockerOption() {
-        return false; // FIXME: https://issues.lf-lang.org/1564
-    }
-
-    @Test
-    @Override 
-    public void runGenericTests() {
-        super.runGenericTests();
-    }
-
-    @Test
-    @Override 
-    public void runTargetSpecificTests() {
-        super.runTargetSpecificTests();
-    }
-
-    @Test
-    @Override 
-    public void runMultiportTests() {
-        super.runMultiportTests();
-    }
-
-    @Test
-    @Disabled("TODO")
-    @Override 
-    public void runAsFederated() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runAsFederated();
-    }
-
-
-    @Test
-    @Override 
-    public void runConcurrentTests() {
-        super.runConcurrentTests();
-    }
-
-    @Test
-    @Override
-    public void runFederatedTests() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runFederatedTests();
-    }
-
-    @Test
-    @Override 
-    public void runDockerTests() {
-        super.runDockerTests();
-    }
-
-    @Test
-    @Override 
-    public void runDockerFederatedTests() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runDockerFederatedTests();
+  public PythonTest() {
+    super(Target.Python);
+  }
+
+  @Override
+  protected void addExtraLfcArgs(Properties args) {
+    super.addExtraLfcArgs(args);
+    if (System.getProperty("os.name").startsWith("Windows")) {
+      // Use the RelWithDebInfo build type on Windows as the Debug/Test build type produces linker
+      // Errors in CI
+      args.setProperty("build-type", "RelWithDebInfo");
     }
+  }
+
+  @Override
+  protected boolean supportsFederatedExecution() {
+    return true;
+  }
+
+  @Override
+  protected boolean supportsSingleThreadedExecution() {
+    return true;
+  }
+
+  @Override
+  protected boolean supportsDockerOption() {
+    return false; // FIXME: https://issues.lf-lang.org/1564
+  }
+
+  @Test
+  @Override
+  public void runGenericTests() {
+    super.runGenericTests();
+  }
+
+  @Test
+  @Override
+  public void runTargetSpecificTests() {
+    super.runTargetSpecificTests();
+  }
+
+  @Test
+  @Override
+  public void runMultiportTests() {
+    super.runMultiportTests();
+  }
+
+  @Test
+  @Disabled("TODO")
+  @Override
+  public void runAsFederated() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runAsFederated();
+  }
+
+  @Test
+  @Override
+  public void runConcurrentTests() {
+    super.runConcurrentTests();
+  }
+
+  @Test
+  @Override
+  public void runFederatedTests() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runFederatedTests();
+  }
+
+  @Test
+  @Override
+  public void runDockerTests() {
+    super.runDockerTests();
+  }
+
+  @Test
+  @Override
+  public void runDockerFederatedTests() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runDockerFederatedTests();
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/RustTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/RustTest.java
index 2601fe79d0..e41d358ac0 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/RustTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/RustTest.java
@@ -24,22 +24,18 @@
 
 package org.lflang.tests.runtime;
 
-import java.util.Properties;
-
 import org.lflang.Target;
 import org.lflang.tests.RuntimeTest;
 
-/**
- *
- */
+/** */
 public class RustTest extends RuntimeTest {
 
-    public RustTest() {
-        super(Target.Rust);
-    }
+  public RustTest() {
+    super(Target.Rust);
+  }
 
-    @Override
-    protected boolean supportsGenericTypes() {
-        return true;
-    }
+  @Override
+  protected boolean supportsGenericTypes() {
+    return true;
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/TypeScriptTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/TypeScriptTest.java
index 295a1961ed..036211607a 100644
--- a/org.lflang.tests/src/org/lflang/tests/runtime/TypeScriptTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/runtime/TypeScriptTest.java
@@ -8,74 +8,72 @@
 /**
  * Collection of tests for the TypeScript target.
  *
- * Even though all tests are implemented in the base class, we override them
- * here so that each test can be easily invoked individually from IDEs with
- * JUnit support like Eclipse and IntelliJ.
- * This is typically done by right-clicking on the name of the test method and
- * then clicking "Run".
+ * <p>Even though all tests are implemented in the base class, we override them here so that each
+ * test can be easily invoked individually from IDEs with JUnit support like Eclipse and IntelliJ.
+ * This is typically done by right-clicking on the name of the test method and then clicking "Run".
  *
  * @author Marten Lohstroh
  */
 public class TypeScriptTest extends RuntimeTest {
-    public TypeScriptTest() {
-        super(Target.TS);
-    }
+  public TypeScriptTest() {
+    super(Target.TS);
+  }
 
-    @Override
-    protected boolean supportsDockerOption() {
-        return true;
-    }
+  @Override
+  protected boolean supportsDockerOption() {
+    return true;
+  }
 
-    @Override
-    protected boolean supportsFederatedExecution() {
-        return true;
-    }
+  @Override
+  protected boolean supportsFederatedExecution() {
+    return true;
+  }
 
-    @Test
-    @Override
-    public void runGenericTests() {
-        super.runGenericTests();
-    }
+  @Test
+  @Override
+  public void runGenericTests() {
+    super.runGenericTests();
+  }
 
-    @Test
-    @Override
-    public void runTargetSpecificTests() {
-        super.runTargetSpecificTests();
-    }
+  @Test
+  @Override
+  public void runTargetSpecificTests() {
+    super.runTargetSpecificTests();
+  }
 
-    @Test
-    @Override
-    public void runMultiportTests() {
-        super.runMultiportTests();
-    }
+  @Test
+  @Override
+  public void runMultiportTests() {
+    super.runMultiportTests();
+  }
 
-    @Test
-    @Override
-    public void runConcurrentTests() {
-        super.runConcurrentTests();
-    }
+  @Test
+  @Override
+  public void runConcurrentTests() {
+    super.runConcurrentTests();
+  }
 
-    @Test
-    @Override
-    public void runFederatedTests() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runFederatedTests();
-    }
+  @Test
+  @Override
+  public void runFederatedTests() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runFederatedTests();
+  }
 
-    @Test
-    @Override
-    public void runDockerTests() {
-        super.runDockerTests();
-    }
+  @Test
+  @Override
+  public void runDockerTests() {
+    super.runDockerTests();
+  }
 
-    @Test
-    @Override
-    public void runDockerFederatedTests() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        super.runDockerFederatedTests();
-    }
+  @Test
+  @Override
+  public void runDockerFederatedTests() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    super.runDockerFederatedTests();
+  }
 
-    @Test
-    @Override
-    public void runAsFederated() {}
+  @Test
+  @Override
+  public void runAsFederated() {}
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/serialization/SerializationTest.java b/org.lflang.tests/src/org/lflang/tests/serialization/SerializationTest.java
index 35dfa9f6de..26f3ec37af 100644
--- a/org.lflang.tests/src/org/lflang/tests/serialization/SerializationTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/serialization/SerializationTest.java
@@ -1,7 +1,6 @@
 package org.lflang.tests.serialization;
 
 import java.util.Properties;
-
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.lflang.Target;
@@ -11,32 +10,36 @@
 
 public class SerializationTest extends TestBase {
 
-    protected SerializationTest() {
-        super(Target.ALL);        
-    }
+  protected SerializationTest() {
+    super(Target.ALL);
+  }
+
+  @Override
+  protected void addExtraLfcArgs(Properties args) {
+    super.addExtraLfcArgs(args);
+    // Use the Debug build type as coverage generation does not work for the serialization tests
+    args.setProperty("build-type", "Debug");
+  }
+
+  @Test
+  public void runSerializationTestsWithThreadingOff() {
+    Assumptions.assumeTrue(supportsSingleThreadedExecution(), Message.NO_SINGLE_THREADED_SUPPORT);
+    runTestsForTargets(
+        Message.DESC_SERIALIZATION,
+        TestCategory.SERIALIZATION::equals,
+        Configurators::disableThreading,
+        TestLevel.EXECUTION,
+        false);
+  }
 
-    @Override
-    protected void addExtraLfcArgs(Properties args) {
-        super.addExtraLfcArgs(args);
-        // Use the Debug build type as coverage generation does not work for the serialization tests
-        args.setProperty("build-type", "Debug");
-    }
-    
-    @Test
-    public void runSerializationTestsWithThreadingOff() {
-        Assumptions.assumeTrue(supportsSingleThreadedExecution(), Message.NO_SINGLE_THREADED_SUPPORT);
-        runTestsForTargets(Message.DESC_SERIALIZATION,
-                TestCategory.SERIALIZATION::equals, Configurators::disableThreading,
-                TestLevel.EXECUTION,
-                false);
-    }
-    
-    @Test
-    public void runSerializationTests() {
-        Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
-        runTestsForTargets(Message.DESC_SERIALIZATION,
-                TestCategory.SERIALIZATION::equals, Configurators::noChanges,
-                TestLevel.EXECUTION,
-                false);
-    }
+  @Test
+  public void runSerializationTests() {
+    Assumptions.assumeFalse(isWindows(), Message.NO_WINDOWS_SUPPORT);
+    runTestsForTargets(
+        Message.DESC_SERIALIZATION,
+        TestCategory.SERIALIZATION::equals,
+        Configurators::noChanges,
+        TestLevel.EXECUTION,
+        false);
+  }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/util/StringUtilTest.java b/org.lflang.tests/src/org/lflang/tests/util/StringUtilTest.java
index fb15cda64c..7c8ca60b83 100644
--- a/org.lflang.tests/src/org/lflang/tests/util/StringUtilTest.java
+++ b/org.lflang.tests/src/org/lflang/tests/util/StringUtilTest.java
@@ -33,24 +33,24 @@
 
 public class StringUtilTest {
 
-    @Test
-    public void testRemoveQuotes() {
-        assertEquals("abc", removeQuotes("\"abc\""));
-        assertEquals("a", removeQuotes("'a'"));
-        assertEquals("'a", removeQuotes("'a"));
-        assertEquals("a\"", removeQuotes("a\""));
-        assertEquals("\"", removeQuotes("\""));
-        assertEquals("'", removeQuotes("'"));
-        assertEquals("", removeQuotes(""));
-        assertNull(removeQuotes(null));
-    }
+  @Test
+  public void testRemoveQuotes() {
+    assertEquals("abc", removeQuotes("\"abc\""));
+    assertEquals("a", removeQuotes("'a'"));
+    assertEquals("'a", removeQuotes("'a"));
+    assertEquals("a\"", removeQuotes("a\""));
+    assertEquals("\"", removeQuotes("\""));
+    assertEquals("'", removeQuotes("'"));
+    assertEquals("", removeQuotes(""));
+    assertNull(removeQuotes(null));
+  }
 
-    @Test
-    public void testCamelToSnakeCase() {
-        assertEquals("some_string", camelToSnakeCase("someString"));
-        assertEquals("abc_str", camelToSnakeCase("AbcStr"));
-        assertEquals("ast", camelToSnakeCase("AST"));
-        assertEquals("ast_builder", camelToSnakeCase("ASTBuilder"));
-        assertEquals("something_with_a_preamble", camelToSnakeCase("SomethingWithAPreamble"));
-    }
+  @Test
+  public void testCamelToSnakeCase() {
+    assertEquals("some_string", camelToSnakeCase("someString"));
+    assertEquals("abc_str", camelToSnakeCase("AbcStr"));
+    assertEquals("ast", camelToSnakeCase("AST"));
+    assertEquals("ast_builder", camelToSnakeCase("ASTBuilder"));
+    assertEquals("something_with_a_preamble", camelToSnakeCase("SomethingWithAPreamble"));
+  }
 }
diff --git a/org.lflang/src/org/lflang/AttributeUtils.java b/org.lflang/src/org/lflang/AttributeUtils.java
index 0c95134539..e956cfc0c4 100644
--- a/org.lflang/src/org/lflang/AttributeUtils.java
+++ b/org.lflang/src/org/lflang/AttributeUtils.java
@@ -27,12 +27,10 @@
 
 import java.util.List;
 import java.util.Objects;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.nodemodel.ICompositeNode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.resource.XtextResource;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Action;
 import org.lflang.lf.AttrParm;
@@ -56,187 +54,184 @@
  */
 public class AttributeUtils {
 
-    /**
-     * Return the attributes declared on the given node. Throws
-     * if the node does not support declaring attributes.
-     *
-     * @throws IllegalArgumentException If the node cannot have attributes
-     */
-    public static List<Attribute> getAttributes(EObject node) {
-        if (node instanceof Reactor) {
-            return ((Reactor) node).getAttributes();
-        } else if (node instanceof Reaction) {
-            return ((Reaction) node).getAttributes();
-        } else if (node instanceof Action) {
-            return ((Action) node).getAttributes();
-        } else if (node instanceof Timer) {
-            return ((Timer) node).getAttributes();
-        } else if (node instanceof StateVar) {
-            return ((StateVar) node).getAttributes();
-        } else if (node instanceof Parameter) {
-            return ((Parameter) node).getAttributes();
-        } else if (node instanceof Input) {
-            return ((Input) node).getAttributes();
-        } else if (node instanceof Output) {
-            return ((Output) node).getAttributes();
-        } else if (node instanceof Instantiation) {
-            return ((Instantiation) node).getAttributes();
-        }
-        throw new IllegalArgumentException("Not annotatable: " + node);
+  /**
+   * Return the attributes declared on the given node. Throws if the node does not support declaring
+   * attributes.
+   *
+   * @throws IllegalArgumentException If the node cannot have attributes
+   */
+  public static List<Attribute> getAttributes(EObject node) {
+    if (node instanceof Reactor) {
+      return ((Reactor) node).getAttributes();
+    } else if (node instanceof Reaction) {
+      return ((Reaction) node).getAttributes();
+    } else if (node instanceof Action) {
+      return ((Action) node).getAttributes();
+    } else if (node instanceof Timer) {
+      return ((Timer) node).getAttributes();
+    } else if (node instanceof StateVar) {
+      return ((StateVar) node).getAttributes();
+    } else if (node instanceof Parameter) {
+      return ((Parameter) node).getAttributes();
+    } else if (node instanceof Input) {
+      return ((Input) node).getAttributes();
+    } else if (node instanceof Output) {
+      return ((Output) node).getAttributes();
+    } else if (node instanceof Instantiation) {
+      return ((Instantiation) node).getAttributes();
     }
-
-    /**
-     * Return the attribute with the given name
-     * if present, otherwise return null.
-     *
-     * @throws IllegalArgumentException If the node cannot have attributes
-     */
-    public static Attribute findAttributeByName(EObject node, String name) {
-        List<Attribute> attrs = getAttributes(node);
-        return attrs.stream()
-                    .filter(it -> it.getAttrName().equalsIgnoreCase(name)) // case-insensitive search (more user-friendly)
-                    .findFirst()
-                    .orElse(null);
+    throw new IllegalArgumentException("Not annotatable: " + node);
+  }
+
+  /**
+   * Return the attribute with the given name if present, otherwise return null.
+   *
+   * @throws IllegalArgumentException If the node cannot have attributes
+   */
+  public static Attribute findAttributeByName(EObject node, String name) {
+    List<Attribute> attrs = getAttributes(node);
+    return attrs.stream()
+        .filter(
+            it ->
+                it.getAttrName()
+                    .equalsIgnoreCase(name)) // case-insensitive search (more user-friendly)
+        .findFirst()
+        .orElse(null);
+  }
+
+  /**
+   * Return the first argument specified for the attribute.
+   *
+   * <p>This should be used if the attribute is expected to have a single argument. If there is no
+   * argument, null is returned.
+   */
+  public static String getFirstArgumentValue(Attribute attr) {
+    if (attr == null || attr.getAttrParms().isEmpty()) {
+      return null;
     }
-
-    /**
-     * Return the first argument specified for the attribute.
-     *
-     * This should be used if the attribute is expected to have a single argument.
-     * If there is no argument, null is returned.
-     */
-    public static String getFirstArgumentValue(Attribute attr) {
-        if (attr == null || attr.getAttrParms().isEmpty()) {
-            return null;
-        }
-        return StringUtil.removeQuotes(attr.getAttrParms().get(0).getValue());
+    return StringUtil.removeQuotes(attr.getAttrParms().get(0).getValue());
+  }
+
+  /**
+   * Search for an attribute with the given name on the given AST node and return its first argument
+   * as a String.
+   *
+   * <p>This should only be used on attributes that are expected to have a single argument.
+   *
+   * <p>Returns null if the attribute is not found or if it does not have any arguments.
+   */
+  public static String getAttributeValue(EObject node, String attrName) {
+    final var attr = findAttributeByName(node, attrName);
+    String value = getFirstArgumentValue(attr);
+    // Attribute annotations in comments are deprecated, but we still check for then for backwards
+    // compatibility
+    if (value == null) {
+      return findAnnotationInComments(node, "@" + attrName);
     }
-
-    /**
-     * Search for an attribute with the given name on the given AST node and return its first
-     * argument as a String.
-     *
-     * This should only be used on attributes that are expected to have a single argument.
-     *
-     * Returns null if the attribute is not found or if it does not have any arguments.
-     */
-    public static String getAttributeValue(EObject node, String attrName) {
-        final var attr = findAttributeByName(node, attrName);
-        String value = getFirstArgumentValue(attr);
-        // Attribute annotations in comments are deprecated, but we still check for then for backwards
-        // compatibility
-        if (value == null) {
-            return findAnnotationInComments(node, "@" + attrName);
-        }
-        return value;
-    }
-
-    /**
-     * Retrieve a specific annotation in a comment associated with the given model element in the AST.
-     *
-     * This will look for a comment. If one is found, it searches for the given annotation {@code key}.
-     * and extracts any string that follows the annotation marker.
-     *
-     * @param object the AST model element to search a comment for
-     * @param key the specific annotation key to be extracted
-     * @return {@code null} if no JavaDoc style comment was found or if it does not contain the given key.
-     *     The string immediately following the annotation marker otherwise.
-     */
-    public static String findAnnotationInComments(EObject object, String key) {
-        if (!(object.eResource() instanceof XtextResource)) return null;
-        ICompositeNode node = NodeModelUtils.findActualNodeFor(object);
-        return ASTUtils.getPrecedingComments(node, n -> true).flatMap(String::lines)
-            .filter(line -> line.contains(key))
-            .map(String::trim)
-            .map(it -> it.substring(it.indexOf(key) + key.length()))
-            .map(it -> it.endsWith("*/") ? it.substring(0, it.length() - "*/".length()) : it)
-            .findFirst().orElse(null);
-    }
-
-    /**
-     * Return the parameter of the given attribute with the given name.
-     *
-     * Returns null if no such parameter is found.
-     */
-    public static String getAttributeParameter(Attribute attribute, String parameterName) {
-        return (attribute == null) ? null : attribute.getAttrParms().stream()
+    return value;
+  }
+
+  /**
+   * Retrieve a specific annotation in a comment associated with the given model element in the AST.
+   *
+   * <p>This will look for a comment. If one is found, it searches for the given annotation {@code
+   * key}. and extracts any string that follows the annotation marker.
+   *
+   * @param object the AST model element to search a comment for
+   * @param key the specific annotation key to be extracted
+   * @return {@code null} if no JavaDoc style comment was found or if it does not contain the given
+   *     key. The string immediately following the annotation marker otherwise.
+   */
+  public static String findAnnotationInComments(EObject object, String key) {
+    if (!(object.eResource() instanceof XtextResource)) return null;
+    ICompositeNode node = NodeModelUtils.findActualNodeFor(object);
+    return ASTUtils.getPrecedingComments(node, n -> true)
+        .flatMap(String::lines)
+        .filter(line -> line.contains(key))
+        .map(String::trim)
+        .map(it -> it.substring(it.indexOf(key) + key.length()))
+        .map(it -> it.endsWith("*/") ? it.substring(0, it.length() - "*/".length()) : it)
+        .findFirst()
+        .orElse(null);
+  }
+
+  /**
+   * Return the parameter of the given attribute with the given name.
+   *
+   * <p>Returns null if no such parameter is found.
+   */
+  public static String getAttributeParameter(Attribute attribute, String parameterName) {
+    return (attribute == null)
+        ? null
+        : attribute.getAttrParms().stream()
             .filter(param -> Objects.equals(param.getName(), parameterName))
             .map(AttrParm::getValue)
             .map(StringUtil::removeQuotes)
             .findFirst()
             .orElse(null);
+  }
+
+  /**
+   * Return the parameter of the given attribute with the given name and interpret it as a boolean.
+   *
+   * <p>Returns null if no such parameter is found.
+   */
+  public static Boolean getBooleanAttributeParameter(Attribute attribute, String parameterName) {
+    if (attribute == null || parameterName == null) {
+      return null;
     }
-
-    /**
-     * Return the parameter of the given attribute with the given name and interpret it as a boolean.
-     *
-     * Returns null if no such parameter is found.
-     */
-    public static Boolean getBooleanAttributeParameter(Attribute attribute, String parameterName) {
-        if (attribute == null || parameterName == null) {
-            return null;
-        }
-        final var param = getAttributeParameter(attribute, parameterName);
-        if (param == null) {
-            return null;
-        }
-        return param.equalsIgnoreCase("true");
-    }
-
-    /**
-     * Return true if the specified node is an Input and has an {@code @sparse}
-     * attribute.
-     * @param node An AST node.
-     */
-    public static boolean isSparse(EObject node) {
-        return findAttributeByName(node, "sparse") != null;
+    final var param = getAttributeParameter(attribute, parameterName);
+    if (param == null) {
+      return null;
     }
-
-    /**
-     * Return true if the reactor is marked to be a federate.
-     */
-    public static boolean isFederate(Reactor reactor) {
-        return findAttributeByName(reactor, "_fed_config") != null;
-    }
-
-    /**
-     * Return true if the reaction is marked to have a C code body.
-     *
-     * Currently, this is only used for synthesized reactions in the context of
-     * federated execution in Python.
-     */
-    public static boolean hasCBody(Reaction reaction) {
-        return findAttributeByName(reaction, "_c_body") != null;
-    }
-
-    /**
-     * Return the declared label of the node, as given by the @label annotation.
-     */
-    public static String getLabel(EObject node) {
-        return getAttributeValue(node, "label");
-    }
-
-    /**
-     * Return the declared icon of the node, as given by the @icon annotation.
-     */
-    public static  String getIconPath(EObject node) {
-        return getAttributeValue(node, "icon");
-    }
-
-    /**
-     * Return the {@code @enclave} attribute annotated on the given node.
-     *
-     * Returns null if there is no such attribute.
-     */
-    public static Attribute getEnclaveAttribute(Instantiation node) {
-        return findAttributeByName(node, "enclave");
-    }
-
-    /**
-     * Return true if the specified instance has an {@code @enclave} attribute.
-     */
-    public static boolean isEnclave(Instantiation node) {
-        return getEnclaveAttribute(node) != null;
-    }
-
+    return param.equalsIgnoreCase("true");
+  }
+
+  /**
+   * Return true if the specified node is an Input and has an {@code @sparse} attribute.
+   *
+   * @param node An AST node.
+   */
+  public static boolean isSparse(EObject node) {
+    return findAttributeByName(node, "sparse") != null;
+  }
+
+  /** Return true if the reactor is marked to be a federate. */
+  public static boolean isFederate(Reactor reactor) {
+    return findAttributeByName(reactor, "_fed_config") != null;
+  }
+
+  /**
+   * Return true if the reaction is marked to have a C code body.
+   *
+   * <p>Currently, this is only used for synthesized reactions in the context of federated execution
+   * in Python.
+   */
+  public static boolean hasCBody(Reaction reaction) {
+    return findAttributeByName(reaction, "_c_body") != null;
+  }
+
+  /** Return the declared label of the node, as given by the @label annotation. */
+  public static String getLabel(EObject node) {
+    return getAttributeValue(node, "label");
+  }
+
+  /** Return the declared icon of the node, as given by the @icon annotation. */
+  public static String getIconPath(EObject node) {
+    return getAttributeValue(node, "icon");
+  }
+
+  /**
+   * Return the {@code @enclave} attribute annotated on the given node.
+   *
+   * <p>Returns null if there is no such attribute.
+   */
+  public static Attribute getEnclaveAttribute(Instantiation node) {
+    return findAttributeByName(node, "enclave");
+  }
+
+  /** Return true if the specified instance has an {@code @enclave} attribute. */
+  public static boolean isEnclave(Instantiation node) {
+    return getEnclaveAttribute(node) != null;
+  }
 }
diff --git a/org.lflang/src/org/lflang/DefaultErrorReporter.java b/org.lflang/src/org/lflang/DefaultErrorReporter.java
index 704e19951c..2698d2b582 100644
--- a/org.lflang/src/org/lflang/DefaultErrorReporter.java
+++ b/org.lflang/src/org/lflang/DefaultErrorReporter.java
@@ -1,72 +1,68 @@
 package org.lflang;
 
-import org.eclipse.emf.ecore.EObject;
-
 import java.nio.file.Path;
+import org.eclipse.emf.ecore.EObject;
 
-/**
- * Simple implementation of the ErrorReport interface that simply prints to
- * standard out.
- */
+/** Simple implementation of the ErrorReport interface that simply prints to standard out. */
 public class DefaultErrorReporter implements ErrorReporter {
 
-    private boolean errorsOccurred = false;
+  private boolean errorsOccurred = false;
 
-    private String println(String s) {
-        System.out.println(s);
-        return s;
-    }
+  private String println(String s) {
+    System.out.println(s);
+    return s;
+  }
 
-    @Override
-    public String reportError(String message) {
-        errorsOccurred = true;
-        return println("ERROR: " + message);
-    }
+  @Override
+  public String reportError(String message) {
+    errorsOccurred = true;
+    return println("ERROR: " + message);
+  }
 
-    @Override
-    public String reportError(EObject object, String message) {
-        errorsOccurred = true;
-        return println("ERROR: " + message);
-    }
+  @Override
+  public String reportError(EObject object, String message) {
+    errorsOccurred = true;
+    return println("ERROR: " + message);
+  }
 
-    @Override
-    public String reportError(Path file, Integer line, String message) {
-        errorsOccurred = true;
-        return println("ERROR: " + message);
-    }
+  @Override
+  public String reportError(Path file, Integer line, String message) {
+    errorsOccurred = true;
+    return println("ERROR: " + message);
+  }
 
-    @Override
-    public String reportWarning(String message) {
-        return println("WARNING: " + message);
-    }
+  @Override
+  public String reportWarning(String message) {
+    return println("WARNING: " + message);
+  }
 
-    @Override
-    public String reportInfo(String message) {
-        return println("INFO: " + message);
-    }
+  @Override
+  public String reportInfo(String message) {
+    return println("INFO: " + message);
+  }
 
-    @Override
-    public String reportWarning(EObject object, String message) {
-        return println("WARNING: " + message);
-    }
+  @Override
+  public String reportWarning(EObject object, String message) {
+    return println("WARNING: " + message);
+  }
 
-    @Override
-    public String reportInfo(EObject object, String message) {
-        return println("INFO: " + message);
-    }
+  @Override
+  public String reportInfo(EObject object, String message) {
+    return println("INFO: " + message);
+  }
 
-    @Override
-    public String reportWarning(Path file, Integer line, String message) {
-        return println("WARNING: " + message);
-    }
+  @Override
+  public String reportWarning(Path file, Integer line, String message) {
+    return println("WARNING: " + message);
+  }
 
-    @Override
-    public String reportInfo(Path file, Integer line, String message) {
-        return println("INFO: " + message);
-    }
+  @Override
+  public String reportInfo(Path file, Integer line, String message) {
+    return println("INFO: " + message);
+  }
 
-    @Override
-    public boolean getErrorsOccurred() {
-        return errorsOccurred;
-    }
+  @Override
+  public boolean getErrorsOccurred() {
+    return errorsOccurred;
+  }
 }
diff --git a/org.lflang/src/org/lflang/ErrorReporter.java b/org.lflang/src/org/lflang/ErrorReporter.java
index 0a01e252ee..f7fe6dcb31 100644
--- a/org.lflang/src/org/lflang/ErrorReporter.java
+++ b/org.lflang/src/org/lflang/ErrorReporter.java
@@ -1,10 +1,8 @@
 package org.lflang;
 
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.generator.Position;
 
 /**
@@ -16,164 +14,157 @@
  */
 public interface ErrorReporter {
 
-    /**
-     * Report an error.
-     *
-     * @param message The error message.
-     * @return a string that describes the error.
-     */
-    String reportError(String message);
-
-
-    /**
-     * Report a warning.
-     *
-     * @param message The warning message.
-     * @return a string that describes the warning.
-     */
-    String reportWarning(String message);
-
-    /**
-     * Report an informational message.
-     *
-     * @param message The message to report
-     * @return a string that describes the error
-     */
-    String reportInfo(String message);
-
-
-    /**
-     * Report an error on the specified parse tree object.
-     *
-     * @param object  The parse tree object.
-     * @param message The error message.
-     * @return a string that describes the error.
-     */
-    String reportError(EObject object, String message);
-
-
-    /**
-     * Report a warning on the specified parse tree object.
-     *
-     * @param object  The parse tree object.
-     * @param message The error message.
-     * @return a string that describes the warning.
-     */
-    String reportWarning(EObject object, String message);
-
-    /**
-     * Report an informational message on the specified parse tree object.
-     *
-     * @param object The parse tree object.
-     * @param message The informational message
-     * @return a string that describes the info
-     */
-    String reportInfo(EObject object, String message);
-
-
-    /**
-     * Report an error at the specified line within a file.
-     *
-     * @param message The error message.
-     * @param line    The one-based line number to report at.
-     * @param file    The file to report at.
-     * @return a string that describes the error.
-     */
-    String reportError(Path file, Integer line, String message);
-
-
-    /**
-     * Report a warning at the specified line within a file.
-     *
-     * @param message The error message.
-     * @param line    The one-based line number to report at.
-     * @param file    The file to report at.
-     * @return a string that describes the warning.
-     */
-    String reportWarning(Path file, Integer line, String message);
-
-
-    /**
-     * Report an informational message at the specified line within a file.
-     *
-     * @param file The file to report at.
-     * @param line The one-based line number to report at.
-     * @param message The error message.
-     * @return
-     */
-    String reportInfo(Path file, Integer line, String message);
-
-    /**
-     * Report a message of severity {@code severity}.
-     * @param file The file to which the message pertains, or {@code null} if the file is unknown.
-     * @param severity the severity of the message
-     * @param message the message to send to the IDE
-     * @return a string that describes the diagnostic
-     */
-    default String report(Path file, DiagnosticSeverity severity, String message) {
-        switch (severity) {
-        case Error:
-            return reportError(message);
-        case Warning:
-        case Hint:
-        case Information:
-            return reportInfo(message);
-        default:
-            return reportWarning(message);
-        }
-    }
-
-    /**
-     * Report a message of severity {@code severity} that
-     * pertains to line {@code line} of an LF source file.
-     * @param file The file to which the message pertains, or {@code null} if the file is unknown.
-     * @param severity the severity of the message
-     * @param message the message to send to the IDE
-     * @param line the one-based line number associated
-     *             with the message
-     * @return a string that describes the diagnostic
-     */
-    default String report(Path file, DiagnosticSeverity severity, String message, int line) {
-        switch (severity) {
-        case Error:
-            return reportError(file, line, message);
-        case Warning:
-        case Hint:
-        case Information:
-            return reportInfo(file, line, message);
-        default:
-            return reportWarning(file, line, message);
-        }
+  /**
+   * Report an error.
+   *
+   * @param message The error message.
+   * @return a string that describes the error.
+   */
+  String reportError(String message);
+
+  /**
+   * Report a warning.
+   *
+   * @param message The warning message.
+   * @return a string that describes the warning.
+   */
+  String reportWarning(String message);
+
+  /**
+   * Report an informational message.
+   *
+   * @param message The message to report
+   * @return a string that describes the error
+   */
+  String reportInfo(String message);
+
+  /**
+   * Report an error on the specified parse tree object.
+   *
+   * @param object The parse tree object.
+   * @param message The error message.
+   * @return a string that describes the error.
+   */
+  String reportError(EObject object, String message);
+
+  /**
+   * Report a warning on the specified parse tree object.
+   *
+   * @param object The parse tree object.
+   * @param message The error message.
+   * @return a string that describes the warning.
+   */
+  String reportWarning(EObject object, String message);
+
+  /**
+   * Report an informational message on the specified parse tree object.
+   *
+   * @param object The parse tree object.
+   * @param message The informational message
+   * @return a string that describes the info
+   */
+  String reportInfo(EObject object, String message);
+
+  /**
+   * Report an error at the specified line within a file.
+   *
+   * @param message The error message.
+   * @param line The one-based line number to report at.
+   * @param file The file to report at.
+   * @return a string that describes the error.
+   */
+  String reportError(Path file, Integer line, String message);
+
+  /**
+   * Report a warning at the specified line within a file.
+   *
+   * @param message The error message.
+   * @param line The one-based line number to report at.
+   * @param file The file to report at.
+   * @return a string that describes the warning.
+   */
+  String reportWarning(Path file, Integer line, String message);
+
+  /**
+   * Report an informational message at the specified line within a file.
+   *
+   * @param file The file to report at.
+   * @param line The one-based line number to report at.
+   * @param message The error message.
+   * @return
+   */
+  String reportInfo(Path file, Integer line, String message);
+
+  /**
+   * Report a message of severity {@code severity}.
+   *
+   * @param file The file to which the message pertains, or {@code null} if the file is unknown.
+   * @param severity the severity of the message
+   * @param message the message to send to the IDE
+   * @return a string that describes the diagnostic
+   */
+  default String report(Path file, DiagnosticSeverity severity, String message) {
+    switch (severity) {
+      case Error:
+        return reportError(message);
+      case Warning:
+      case Hint:
+      case Information:
+        return reportInfo(message);
+      default:
+        return reportWarning(message);
     }
-
-    /**
-     * Report a message of severity {@code severity} that
-     * pertains to the range [{@code startPos}, {@code endPos})
-     * of an LF source file.
-     * @param file The file to which the message pertains, or {@code null} if the file is unknown.
-     * @param severity the severity of the message
-     * @param message the message to send to the IDE
-     * @param startPos the position of the first character
-     *                 of the range of interest
-     * @param endPos the position immediately AFTER the
-     *               final character of the range of
-     *               interest
-     * @return a string that describes the diagnostic
-     */
-    default String report(Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
-        return report(file, severity, message, startPos.getOneBasedLine());
+  }
+
+  /**
+   * Report a message of severity {@code severity} that pertains to line {@code line} of an LF
+   * source file.
+   *
+   * @param file The file to which the message pertains, or {@code null} if the file is unknown.
+   * @param severity the severity of the message
+   * @param message the message to send to the IDE
+   * @param line the one-based line number associated with the message
+   * @return a string that describes the diagnostic
+   */
+  default String report(Path file, DiagnosticSeverity severity, String message, int line) {
+    switch (severity) {
+      case Error:
+        return reportError(file, line, message);
+      case Warning:
+      case Hint:
+      case Information:
+        return reportInfo(file, line, message);
+      default:
+        return reportWarning(file, line, message);
     }
-
-    /**
-     * Check if errors where reported.
-     *
-     * @return true if errors where reported
-     */
-    boolean getErrorsOccurred();
-
-    /**
-     * Clear error history, if exists.
-     * This is usually only the case for error markers in Epoch (Eclipse).
-     */
-    default void clearHistory() {}
+  }
+
+  /**
+   * Report a message of severity {@code severity} that pertains to the range [{@code startPos},
+   * {@code endPos}) of an LF source file.
+   *
+   * @param file The file to which the message pertains, or {@code null} if the file is unknown.
+   * @param severity the severity of the message
+   * @param message the message to send to the IDE
+   * @param startPos the position of the first character of the range of interest
+   * @param endPos the position immediately AFTER the final character of the range of interest
+   * @return a string that describes the diagnostic
+   */
+  default String report(
+      Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
+    return report(file, severity, message, startPos.getOneBasedLine());
+  }
+
+  /**
+   * Check if errors where reported.
+   *
+   * @return true if errors where reported
+   */
+  boolean getErrorsOccurred();
+
+  /**
+   * Clear error history, if exists. This is usually only the case for error markers in Epoch
+   * (Eclipse).
+   */
+  default void clearHistory() {}
 }
diff --git a/org.lflang/src/org/lflang/FileConfig.java b/org.lflang/src/org/lflang/FileConfig.java
index e2d3313a61..831cb7957f 100644
--- a/org.lflang/src/org/lflang/FileConfig.java
+++ b/org.lflang/src/org/lflang/FileConfig.java
@@ -5,15 +5,12 @@
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.function.Consumer;
-
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
-
-
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.util.FileUtil;
 import org.lflang.util.LFCommand;
@@ -22,297 +19,267 @@
  * Base class that governs the interactions between code generators and the file system.
  *
  * @author Marten Lohstroh
- *
  */
 public abstract class FileConfig {
 
-    // Public static fields.
-
-    public static final String DEFAULT_SRC_DIR = "src";
-
-    /**
-     * Default name of the directory to store binaries in.
-     */
-    public static final String DEFAULT_BIN_DIR = "bin";
-
-    /**
-     * Default name of the directory to store generated sources in.
-     */
-    public static final String DEFAULT_SRC_GEN_DIR = "src-gen";
-
-    // Public fields.
-
-    /**
-     * The directory in which to put binaries, if the code generator produces any.
-     */
-    public final Path binPath;
-
-    /**
-     * The name of the main reactor, which has to match the file name (without
-     * the '.lf' extension).
-     */
-    public final String name;
-
-    /**
-     * The directory that is the root of the package in which the .lf source file resides. This path is determined
-     * differently depending on whether the compiler is invoked through the IDE or from the command line. In the former
-     * case, the package is the project root that the source resides in. In the latter case, it is the parent directory
-     * of the nearest {@code src} directory up the hierarchy, if there is one, or just the {@code outPath} if there is none. It is
-     * recommended to always keep the sources in a {@code src} directory regardless of the workflow, in which case the
-     * output behavior will be identical irrespective of the way the compiler is invoked.
-     */
-    public final Path srcPkgPath;
-
-    /**
-     * The file containing the main source code.
-     * This is the Eclipse eCore view of the file, which is distinct
-     * from the XText view of the file and the OS view of the file.
-     */
-    public final Resource resource;
-
-    /**
-     * If running in an Eclipse IDE, the iResource refers to the
-     * IFile representing the Lingua Franca program.
-     * This is the XText view of the file, which is distinct
-     * from the Eclipse eCore view of the file and the OS view of the file.
-     * <p>
-     * This is null if running outside an Eclipse IDE.
-     */
-    public final IResource iResource;
-
-    /**
-     * The full path to the file containing the .lf file including the
-     * full filename with the .lf extension.
-     */
-    public final Path srcFile;
-
-    /**
-     * The directory in which the source .lf file was found.
-     */
-    public final Path srcPath; // FIXME: rename this to srcDir?
-
-    /**
-     * Indicate whether the bin directory should be hierarchical.
-     */
-    public final boolean useHierarchicalBin;
-
-    // Protected fields.
-
-    /**
-     * Path representation of srcGenRoot, the root directory for generated
-     * sources.
-     */
-    protected Path srcGenBasePath;
-
-    /**
-     * The directory in which to put the generated sources.
-     * This takes into account the location of the source file relative to the
-     * package root. Specifically, if the source file is x/y/Z.lf relative
-     * to the package root, then the generated sources will be put in x/y/Z
-     * relative to srcGenBasePath.
-     */
-    protected Path srcGenPath;
-
-    // private fields
-
-    /**
-     * The parent of the directory designated for placing generated sources into ({@code ./src-gen} by default). Additional
-     * directories (such as {@code bin} or {@code build}) should be created as siblings of the directory for generated sources,
-     * which means that such directories should be created relative to the path assigned to this class variable.
-     * <p>
-     * The generated source directory is specified in the IDE (Project Properties->LF->Compiler->Output Folder). When
-     * invoking the standalone compiler, the output path is specified directly using the {@code -o} or {@code --output-path} option.
-     */
-    private final Path outPath;
-
-    /**
-     * The directory that denotes the root of the package to which the
-     * generated sources belong. Even if the target language does not have a
-     * notion of packages, this directory groups all files associated with a
-     * single main reactor.
-     * of packages.
-     */
-    private final Path srcGenPkgPath;
-
-    public FileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchicalBin) throws IOException {
-        this.resource = resource;
-        this.useHierarchicalBin = useHierarchicalBin;
-
-        this.srcFile = FileUtil.toPath(this.resource);
-
-        this.srcPath = srcFile.getParent();
-        this.srcPkgPath = getPkgPath(resource);
-
-        this.srcGenBasePath = srcGenBasePath;
-        this.name = FileUtil.nameWithoutExtension(this.srcFile);
-        this.srcGenPath = srcGenBasePath.resolve(getSubPkgPath(srcPath)).resolve(name);
-        this.srcGenPkgPath = this.srcGenPath;
-        this.outPath = srcGenBasePath.getParent();
-
-        Path binRoot = outPath.resolve(DEFAULT_BIN_DIR);
-        this.binPath = useHierarchicalBin ? binRoot.resolve(getSubPkgPath(srcPath)) : binRoot;
-
-        this.iResource = FileUtil.getIResource(resource);
-    }
-
-    /**
-     * Get the directory a resource is located in relative to the root package
-     */
-    public Path getDirectory(Resource r) throws IOException {
-        return getSubPkgPath(FileUtil.toPath(r).getParent());
-    }
-
-    /**
-     * The parent of the directory designated for placing generated sources into ({@code ./src-gen} by default). Additional
-     * directories (such as {@code bin} or {@code build}) should be created as siblings of the directory for generated sources,
-     * which means that such directories should be created relative to the path assigned to this class variable.
-     * <p>
-     * The generated source directory is specified in the IDE (Project Properties->LF->Compiler->Output Folder). When
-     * invoking the standalone compiler, the output path is specified directly using the {@code -o} or {@code --output-path} option.
-     */
-    public Path getOutPath() {
-        return outPath;
+  // Public static fields.
+
+  public static final String DEFAULT_SRC_DIR = "src";
+
+  /** Default name of the directory to store binaries in. */
+  public static final String DEFAULT_BIN_DIR = "bin";
+
+  /** Default name of the directory to store generated sources in. */
+  public static final String DEFAULT_SRC_GEN_DIR = "src-gen";
+
+  // Public fields.
+
+  /** The directory in which to put binaries, if the code generator produces any. */
+  public final Path binPath;
+
+  /**
+   * The name of the main reactor, which has to match the file name (without the '.lf' extension).
+   */
+  public final String name;
+
+  /**
+   * The directory that is the root of the package in which the .lf source file resides. This path
+   * is determined differently depending on whether the compiler is invoked through the IDE or from
+   * the command line. In the former case, the package is the project root that the source resides
+   * in. In the latter case, it is the parent directory of the nearest {@code src} directory up the
+   * hierarchy, if there is one, or just the {@code outPath} if there is none. It is recommended to
+   * always keep the sources in a {@code src} directory regardless of the workflow, in which case
+   * the output behavior will be identical irrespective of the way the compiler is invoked.
+   */
+  public final Path srcPkgPath;
+
+  /**
+   * The file containing the main source code. This is the Eclipse eCore view of the file, which is
+   * distinct from the XText view of the file and the OS view of the file.
+   */
+  public final Resource resource;
+
+  /**
+   * If running in an Eclipse IDE, the iResource refers to the IFile representing the Lingua Franca
+   * program. This is the XText view of the file, which is distinct from the Eclipse eCore view of
+   * the file and the OS view of the file.
+   *
+   * <p>This is null if running outside an Eclipse IDE.
+   */
+  public final IResource iResource;
+
+  /**
+   * The full path to the file containing the .lf file including the full filename with the .lf
+   * extension.
+   */
+  public final Path srcFile;
+
+  /** The directory in which the source .lf file was found. */
+  public final Path srcPath; // FIXME: rename this to srcDir?
+
+  /** Indicate whether the bin directory should be hierarchical. */
+  public final boolean useHierarchicalBin;
+
+  // Protected fields.
+
+  /** Path representation of srcGenRoot, the root directory for generated sources. */
+  protected Path srcGenBasePath;
+
+  /**
+   * The directory in which to put the generated sources. This takes into account the location of
+   * the source file relative to the package root. Specifically, if the source file is x/y/Z.lf
+   * relative to the package root, then the generated sources will be put in x/y/Z relative to
+   * srcGenBasePath.
+   */
+  protected Path srcGenPath;
+
+  // private fields
+
+  /**
+   * The parent of the directory designated for placing generated sources into ({@code ./src-gen} by
+   * default). Additional directories (such as {@code bin} or {@code build}) should be created as
+   * siblings of the directory for generated sources, which means that such directories should be
+   * created relative to the path assigned to this class variable.
+   *
+   * <p>The generated source directory is specified in the IDE (Project
+   * Properties->LF->Compiler->Output Folder). When invoking the standalone compiler, the output
+   * path is specified directly using the {@code -o} or {@code --output-path} option.
+   */
+  private final Path outPath;
+
+  /**
+   * The directory that denotes the root of the package to which the generated sources belong. Even
+   * if the target language does not have a notion of packages, this directory groups all files
+   * associated with a single main reactor. of packages.
+   */
+  private final Path srcGenPkgPath;
+
+  public FileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchicalBin)
+      throws IOException {
+    this.resource = resource;
+    this.useHierarchicalBin = useHierarchicalBin;
+
+    this.srcFile = FileUtil.toPath(this.resource);
+
+    this.srcPath = srcFile.getParent();
+    this.srcPkgPath = getPkgPath(resource);
+
+    this.srcGenBasePath = srcGenBasePath;
+    this.name = FileUtil.nameWithoutExtension(this.srcFile);
+    this.srcGenPath = srcGenBasePath.resolve(getSubPkgPath(srcPath)).resolve(name);
+    this.srcGenPkgPath = this.srcGenPath;
+    this.outPath = srcGenBasePath.getParent();
+
+    Path binRoot = outPath.resolve(DEFAULT_BIN_DIR);
+    this.binPath = useHierarchicalBin ? binRoot.resolve(getSubPkgPath(srcPath)) : binRoot;
+
+    this.iResource = FileUtil.getIResource(resource);
+  }
+
+  /** Get the directory a resource is located in relative to the root package */
+  public Path getDirectory(Resource r) throws IOException {
+    return getSubPkgPath(FileUtil.toPath(r).getParent());
+  }
+
+  /**
+   * The parent of the directory designated for placing generated sources into ({@code ./src-gen} by
+   * default). Additional directories (such as {@code bin} or {@code build}) should be created as
+   * siblings of the directory for generated sources, which means that such directories should be
+   * created relative to the path assigned to this class variable.
+   *
+   * <p>The generated source directory is specified in the IDE (Project
+   * Properties->LF->Compiler->Output Folder). When invoking the standalone compiler, the output
+   * path is specified directly using the {@code -o} or {@code --output-path} option.
+   */
+  public Path getOutPath() {
+    return outPath;
+  }
+
+  /**
+   * The directory in which to put the generated sources. This takes into account the location of
+   * the source file relative to the package root. Specifically, if the source file is x/y/Z.lf
+   * relative to the package root, then the generated sources will be put in x/y/Z relative to
+   * srcGenBasePath.
+   */
+  public Path getSrcGenPath() {
+    return srcGenPath;
+  }
+
+  /**
+   * Path representation of srcGenRoot, the root directory for generated sources. This is the root,
+   * meaning that if the source file is x/y/Z.lf relative to the package root, then the generated
+   * sources will be put in x/y/Z relative to this URI.
+   */
+  public Path getSrcGenBasePath() {
+    return srcGenBasePath;
+  }
+
+  /**
+   * The directory that denotes the root of the package to which the generated sources belong. Even
+   * if the target language does not have a notion of packages, this directory groups all files
+   * associated with a single main reactor.
+   */
+  public Path getSrcGenPkgPath() {
+    return srcGenPkgPath;
+  }
+
+  /** Returns the root directory for generated sources. */
+  public static Path getSrcGenRoot(IFileSystemAccess2 fsa) throws IOException {
+    URI srcGenURI = fsa.getURI("");
+    if (srcGenURI.hasTrailingPathSeparator()) {
+      srcGenURI = srcGenURI.trimSegments(1);
     }
-
-    /**
-     * The directory in which to put the generated sources.
-     * This takes into account the location of the source file relative to the
-     * package root. Specifically, if the source file is x/y/Z.lf relative
-     * to the package root, then the generated sources will be put in x/y/Z
-     * relative to srcGenBasePath.
-     */
-    public Path getSrcGenPath() {
-        return srcGenPath;
-    }
-
-
-    /**
-     * Path representation of srcGenRoot, the root directory for generated
-     * sources. This is the root, meaning that if the source file is x/y/Z.lf
-     * relative to the package root, then the generated sources will be put in x/y/Z
-     * relative to this URI.
-     */
-    public Path getSrcGenBasePath() {
-        return srcGenBasePath;
+    return FileUtil.toPath(srcGenURI);
+  }
+
+  /**
+   * Given a path that denotes the full path to a source file (not including the file itself),
+   * return the relative path from the root of the 'src' directory, or, if there is no 'src'
+   * directory, the relative path from the root of the package.
+   *
+   * @param srcPath The path to the source.
+   * @return the relative path from the root of the 'src' directory, or, if there is no 'src'
+   *     directory, the relative path from the root of the package
+   */
+  protected Path getSubPkgPath(Path srcPath) {
+    Path relSrcPath = srcPkgPath.relativize(srcPath);
+    if (relSrcPath.startsWith(DEFAULT_SRC_DIR)) {
+      int segments = relSrcPath.getNameCount();
+      if (segments == 1) {
+        return Paths.get("");
+      } else {
+        relSrcPath = relSrcPath.subpath(1, segments);
+      }
     }
-
-    /**
-     * The directory that denotes the root of the package to which the
-     * generated sources belong. Even if the target language does not have a
-     * notion of packages, this directory groups all files associated with a
-     * single main reactor.
-     */
-    public Path getSrcGenPkgPath() {
-        return srcGenPkgPath;
-    }
-
-    /**
-     * Returns the root directory for generated sources.
-     */
-    public static Path getSrcGenRoot(IFileSystemAccess2 fsa) throws IOException {
-        URI srcGenURI = fsa.getURI("");
-        if (srcGenURI.hasTrailingPathSeparator()) {
-            srcGenURI = srcGenURI.trimSegments(1);
+    return relSrcPath;
+  }
+
+  /**
+   * Clean any artifacts produced by the code generator and target compilers.
+   *
+   * <p>The base implementation deletes the bin and src-gen directories. If the target code
+   * generator creates additional files or directories, the corresponding generator should override
+   * this method.
+   *
+   * @throws IOException If an I/O error occurs.
+   */
+  public void doClean() throws IOException {
+    FileUtil.deleteDirectory(binPath);
+    FileUtil.deleteDirectory(srcGenBasePath);
+  }
+
+  private static Path getPkgPath(Resource resource) throws IOException {
+    if (resource.getURI().isPlatform()) {
+      // We are in the RCA.
+      Path srcFile = FileUtil.toPath(resource);
+      for (IProject r : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
+        Path p = Paths.get(r.getLocation().toFile().getAbsolutePath());
+        Path f = srcFile.toAbsolutePath();
+        if (f.startsWith(p)) {
+          return p;
         }
-        return FileUtil.toPath(srcGenURI);
-    }
-
-    /**
-     * Given a path that denotes the full path to a source file (not including the
-     * file itself), return the relative path from the root of the 'src'
-     * directory, or, if there is no 'src' directory, the relative path
-     * from the root of the package.
-     * @param srcPath The path to the source.
-     * @return the relative path from the root of the 'src'
-     * directory, or, if there is no 'src' directory, the relative path
-     * from the root of the package
-     */
-    protected Path getSubPkgPath(Path srcPath) {
-        Path relSrcPath = srcPkgPath.relativize(srcPath);
-        if (relSrcPath.startsWith(DEFAULT_SRC_DIR)) {
-            int segments = relSrcPath.getNameCount();
-            if (segments == 1) {
-                return Paths.get("");
-            } else {
-                relSrcPath = relSrcPath.subpath(1, segments);
-            }
-        }
-        return relSrcPath;
-    }
-
-    /**
-     * Clean any artifacts produced by the code generator and target compilers.
-     * <p>
-     * The base implementation deletes the bin and src-gen directories. If the
-     * target code generator creates additional files or directories, the
-     * corresponding generator should override this method.
-     *
-     * @throws IOException If an I/O error occurs.
-     */
-    public void doClean() throws IOException {
-        FileUtil.deleteDirectory(binPath);
-        FileUtil.deleteDirectory(srcGenBasePath);
-    }
-
-    private static Path getPkgPath(Resource resource) throws IOException {
-        if (resource.getURI().isPlatform()) {
-            // We are in the RCA.
-            Path srcFile = FileUtil.toPath(resource);
-            for (IProject r : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
-                Path p = Paths.get(r.getLocation().toFile().getAbsolutePath());
-                Path f = srcFile.toAbsolutePath();
-                if (f.startsWith(p)) {
-                    return p;
-                }
-            }
-        }
-        return findPackageRoot(FileUtil.toPath(resource), s -> {});
-    }
-
-    /**
-     * Find the package root by looking for an 'src'
-     * directory. If none can be found, return the current
-     * working directory instead.
-     *
-     * @param input The *.lf file to find the package root
-     *              for.
-     * @return The package root, or the current working
-     * directory if none exists.
-     */
-    public static Path findPackageRoot(final Path input, final Consumer<String> printWarning) {
-        Path p = input;
-        do {
-            p = p.getParent();
-            if (p == null) {
-                printWarning.accept("File '" + input.getFileName() + "' is not located in an 'src' directory.");
-                printWarning.accept("Adopting the current working directory as the package root.");
-                return Paths.get(".").toAbsolutePath(); // todo #1478 replace with Io::getWd
-            }
-        } while (!p.toFile().getName().equals("src"));
-        return p.getParent();
-    }
-
-    /**
-     * Return an LFCommand instance that can be used to execute the program under compilation.
-     */
-    public LFCommand getCommand() {
-        String cmd = GeneratorUtils.isHostWindows() ?
-            getExecutable().toString() :
-            srcPkgPath.relativize(getExecutable()).toString();
-        return LFCommand.get(cmd, List.of(), true, srcPkgPath);
-    }
-
-    /**
-     * Return the extension used for binaries on the platform on which compilation takes place.
-     */
-    protected String getExecutableExtension() {
-        return GeneratorUtils.isHostWindows() ? ".exe" : "";
-    }
-
-    /**
-     * Return a path to an executable version of the program under compilation.
-     */
-    public Path getExecutable() {
-        return binPath.resolve(name + getExecutableExtension());
+      }
     }
+    return findPackageRoot(FileUtil.toPath(resource), s -> {});
+  }
+
+  /**
+   * Find the package root by looking for an 'src' directory. If none can be found, return the
+   * current working directory instead.
+   *
+   * @param input The *.lf file to find the package root for.
+   * @return The package root, or the current working directory if none exists.
+   */
+  public static Path findPackageRoot(final Path input, final Consumer<String> printWarning) {
+    Path p = input;
+    do {
+      p = p.getParent();
+      if (p == null) {
+        printWarning.accept(
+            "File '" + input.getFileName() + "' is not located in an 'src' directory.");
+        printWarning.accept("Adopting the current working directory as the package root.");
+        return Paths.get(".").toAbsolutePath(); // todo #1478 replace with Io::getWd
+      }
+    } while (!p.toFile().getName().equals("src"));
+    return p.getParent();
+  }
+
+  /** Return an LFCommand instance that can be used to execute the program under compilation. */
+  public LFCommand getCommand() {
+    String cmd =
+        GeneratorUtils.isHostWindows()
+            ? getExecutable().toString()
+            : srcPkgPath.relativize(getExecutable()).toString();
+    return LFCommand.get(cmd, List.of(), true, srcPkgPath);
+  }
+
+  /** Return the extension used for binaries on the platform on which compilation takes place. */
+  protected String getExecutableExtension() {
+    return GeneratorUtils.isHostWindows() ? ".exe" : "";
+  }
+
+  /** Return a path to an executable version of the program under compilation. */
+  public Path getExecutable() {
+    return binPath.resolve(name + getExecutableExtension());
+  }
 }
diff --git a/org.lflang/src/org/lflang/InferredType.java b/org.lflang/src/org/lflang/InferredType.java
index 41931e0e32..5e9b4a8aa3 100644
--- a/org.lflang/src/org/lflang/InferredType.java
+++ b/org.lflang/src/org/lflang/InferredType.java
@@ -1,209 +1,184 @@
 /*************
-Copyright (c) 2020, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang;
 
 import java.util.function.Function;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Type;
 
 /**
  * A helper class that represents an inferred type.
  *
- * <p>This class helps to separate the rules of type inference from code generation
- * for types. It is particularly useful in cases when the type is not given directly
- * in LF code, but is inferred from the context. In this case it could happen that
- * no ASTNode representing the type does not exist. For instance when a
- * parameter type is inferred from a time value. All in all, this class provides a
- * clean interface between type inference in ASTUtils and code generation.
+ * <p>This class helps to separate the rules of type inference from code generation for types. It is
+ * particularly useful in cases when the type is not given directly in LF code, but is inferred from
+ * the context. In this case it could happen that no ASTNode representing the type does not exist.
+ * For instance when a parameter type is inferred from a time value. All in all, this class provides
+ * a clean interface between type inference in ASTUtils and code generation.
  *
- * <p>ASTUtils provides functionality to create an inferred type from
- * Lingua Franca variables (getInferredType). This inferred type can than be
- * translated to target code using the code generators or be converted to a general
- * textual representation using toText().
+ * <p>ASTUtils provides functionality to create an inferred type from Lingua Franca variables
+ * (getInferredType). This inferred type can than be translated to target code using the code
+ * generators or be converted to a general textual representation using toText().
  *
  * @author Christian Menard
  */
 public class InferredType {
 
-    /**
-     * The AST node representing the inferred type if such a node exists.
-     */
-    public final Type astType;
-    /**
-     * A flag indicating whether the inferred type has the base type time.
-     */
-    public final boolean isTime;
-    /**
-     * A flag indicating whether the inferred type is a list.
-     */
-    public final boolean isList;
-    /**
-     * A flag indicating whether the inferred type is a list of variable size.
-     */
-    public final boolean isVariableSizeList;
-    /**
-     * A flag indicating whether the inferred type is a list of fixed size.
-     */
-    public final boolean isFixedSizeList;
-    /**
-     * The list size if the inferred type is a fixed size list.
-     * Otherwise, null.
-     */
-    public final Integer listSize;
-
-
-    /**
-     * Private constructor
-     */
-    private InferredType(Type astType, boolean isTime, boolean isVariableSizeList,
-                         boolean isFixedSizeList, Integer listSize) {
-        this.astType = astType;
-        this.isTime = isTime;
-        this.isList = isVariableSizeList || isFixedSizeList;
-        this.isVariableSizeList = isVariableSizeList;
-        this.isFixedSizeList = isFixedSizeList;
-        this.listSize = listSize;
+  /** The AST node representing the inferred type if such a node exists. */
+  public final Type astType;
+  /** A flag indicating whether the inferred type has the base type time. */
+  public final boolean isTime;
+  /** A flag indicating whether the inferred type is a list. */
+  public final boolean isList;
+  /** A flag indicating whether the inferred type is a list of variable size. */
+  public final boolean isVariableSizeList;
+  /** A flag indicating whether the inferred type is a list of fixed size. */
+  public final boolean isFixedSizeList;
+  /** The list size if the inferred type is a fixed size list. Otherwise, null. */
+  public final Integer listSize;
+
+  /** Private constructor */
+  private InferredType(
+      Type astType,
+      boolean isTime,
+      boolean isVariableSizeList,
+      boolean isFixedSizeList,
+      Integer listSize) {
+    this.astType = astType;
+    this.isTime = isTime;
+    this.isList = isVariableSizeList || isFixedSizeList;
+    this.isVariableSizeList = isVariableSizeList;
+    this.isFixedSizeList = isFixedSizeList;
+    this.listSize = listSize;
+  }
+
+  /** Check if the inferred type is undefined. */
+  public boolean isUndefined() {
+    return astType == null && !isTime;
+  }
+
+  /**
+   * Convert the inferred type to its textual representation as it would appear in LF code, with
+   * CodeMap tags inserted.
+   */
+  public String toText() {
+    return toTextHelper(ASTUtils::toText);
+  }
+
+  /**
+   * Convert the inferred type to its textual representation as it would appear in LF code, without
+   * CodeMap tags inserted.
+   */
+  public String toOriginalText() {
+    return toTextHelper(ASTUtils::toOriginalText);
+  }
+
+  private String toTextHelper(Function<EObject, String> toText) {
+    if (astType != null) {
+      return toText.apply(astType);
+    } else if (isTime) {
+      if (isFixedSizeList) {
+        return "time[" + listSize + "]";
+      } else if (isVariableSizeList) {
+        return "time[]";
+      } else {
+        return "time";
+      }
     }
-
-
-    /**
-     * Check if the inferred type is undefined.
-     */
-    public boolean isUndefined() {
-        return astType == null && !isTime;
-    }
-
-    /**
-     * Convert the inferred type to its textual representation as it would appear in LF code,
-     * with CodeMap tags inserted.
-     */
-    public String toText() { return toTextHelper(ASTUtils::toText); }
-
-    /**
-     * Convert the inferred type to its textual representation as it would appear in LF code,
-     * without CodeMap tags inserted.
-     */
-    public String toOriginalText() { return toTextHelper(ASTUtils::toOriginalText); }
-
-    private String toTextHelper(Function<EObject, String> toText) {
-        if (astType != null) {
-            return toText.apply(astType);
-        } else if (isTime) {
-            if (isFixedSizeList) {
-                return "time[" + listSize + "]";
-            } else if (isVariableSizeList) {
-                return "time[]";
-            } else {
-                return "time";
-            }
-        }
-        return "";
-    }
-
-    /**
-     * Convert the inferred type to its textual representation
-     * while ignoring any list qualifiers or type arguments.
-     *
-     * @return Textual representation of this inferred type without list qualifiers
-     */
-    public String baseType() {
-        if (astType != null) {
-            return ASTUtils.baseType(astType);
-        } else if (isTime) {
-            return "time";
-        }
-        return "";
+    return "";
+  }
+
+  /**
+   * Convert the inferred type to its textual representation while ignoring any list qualifiers or
+   * type arguments.
+   *
+   * @return Textual representation of this inferred type without list qualifiers
+   */
+  public String baseType() {
+    if (astType != null) {
+      return ASTUtils.baseType(astType);
+    } else if (isTime) {
+      return "time";
     }
-
-    /**
-     * Create an inferred type from an AST node.
-     *
-     * @param type an AST node
-     * @return A new inferred type representing the given AST node
-     */
-    public static InferredType fromAST(Type type) {
-        if (type == null) {
-            return undefined();
-        }
-        return new InferredType(
-            type,
-            type.isTime(),
-            type.getArraySpec() != null && type.getArraySpec().isOfVariableLength(),
-            type.getArraySpec() != null && !type.getArraySpec().isOfVariableLength(),
-            type.getArraySpec() != null ? type.getArraySpec().getLength() : null
-        );
-    }
-
-    /**
-     * Create an undefined inferred type.
-     */
-    public static InferredType undefined() {
-        return new InferredType(null, false, false, false, null);
-    }
-
-    /**
-     * Create an inferred type representing time.
-     */
-    public static InferredType time() {
-        return new InferredType(null, true, false, false, null);
-    }
-
-    /**
-     * Create an inferred type representing a list of time values.
-     *
-     * <p>This creates a fixed size list if size is non-null,
-     * otherwise a variable size list.
-     *
-     * @param size The list size, may be null
-     */
-    public static InferredType timeList(Integer size) {
-        return new InferredType(null, true, size == null, size != null, size);
-    }
-
-    /**
-     * Create an inferred type representing a variable size time list.
-     */
-    public static InferredType timeList() {
-        return timeList(null);
-    }
-
-    /**
-     * Returns the component type, if this is a first-class
-     * list type. Eg returns {@code time} for the type {@code time[]}.
-     * If this is not a first-class list type, returns null.
-     *
-     * <p>Todo this does not return int for int[], we need to
-     *  make the parser production left-recursive. OTOH only
-     *  time and time[] are first class in our framework so
-     *  this doesn't contradict the contract of this method.
-     */
-    public InferredType getComponentType() {
-        return isTime && isList ? time() : null;
+    return "";
+  }
+
+  /**
+   * Create an inferred type from an AST node.
+   *
+   * @param type an AST node
+   * @return A new inferred type representing the given AST node
+   */
+  public static InferredType fromAST(Type type) {
+    if (type == null) {
+      return undefined();
     }
+    return new InferredType(
+        type,
+        type.isTime(),
+        type.getArraySpec() != null && type.getArraySpec().isOfVariableLength(),
+        type.getArraySpec() != null && !type.getArraySpec().isOfVariableLength(),
+        type.getArraySpec() != null ? type.getArraySpec().getLength() : null);
+  }
+
+  /** Create an undefined inferred type. */
+  public static InferredType undefined() {
+    return new InferredType(null, false, false, false, null);
+  }
+
+  /** Create an inferred type representing time. */
+  public static InferredType time() {
+    return new InferredType(null, true, false, false, null);
+  }
+
+  /**
+   * Create an inferred type representing a list of time values.
+   *
+   * <p>This creates a fixed size list if size is non-null, otherwise a variable size list.
+   *
+   * @param size The list size, may be null
+   */
+  public static InferredType timeList(Integer size) {
+    return new InferredType(null, true, size == null, size != null, size);
+  }
+
+  /** Create an inferred type representing a variable size time list. */
+  public static InferredType timeList() {
+    return timeList(null);
+  }
+
+  /**
+   * Returns the component type, if this is a first-class list type. Eg returns {@code time} for the
+   * type {@code time[]}. If this is not a first-class list type, returns null.
+   *
+   * <p>Todo this does not return int for int[], we need to make the parser production
+   * left-recursive. OTOH only time and time[] are first class in our framework so this doesn't
+   * contradict the contract of this method.
+   */
+  public InferredType getComponentType() {
+    return isTime && isList ? time() : null;
+  }
 }
diff --git a/org.lflang/src/org/lflang/LFResourceDescriptionStrategy.java b/org.lflang/src/org/lflang/LFResourceDescriptionStrategy.java
index 548d5e0ea6..487e63374b 100644
--- a/org.lflang/src/org/lflang/LFResourceDescriptionStrategy.java
+++ b/org.lflang/src/org/lflang/LFResourceDescriptionStrategy.java
@@ -1,32 +1,32 @@
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang;
 
+import com.google.inject.Inject;
 import java.util.Map;
 import java.util.stream.Collectors;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.naming.QualifiedName;
 import org.eclipse.xtext.resource.EObjectDescription;
@@ -34,56 +34,52 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.eclipse.xtext.resource.impl.DefaultResourceDescriptionStrategy;
 import org.eclipse.xtext.scoping.impl.ImportUriResolver;
 import org.eclipse.xtext.util.IAcceptor;
-
 import org.lflang.lf.Model;
 
-import com.google.inject.Inject;
-
 /**
- * Resource description strategy designed to limit global scope to only those
- * files that were explicitly imported.
- * <p>
- * Adapted from example provided by Itemis.
+ * Resource description strategy designed to limit global scope to only those files that were
+ * explicitly imported.
+ *
+ * <p>Adapted from example provided by Itemis.
  *
  * @author Marten Lohstroh
  * @see "https://blogs.itemis.com/en/in-five-minutes-to-transitive-imports-within-a-dsl-with-xtext"
  */
 public class LFResourceDescriptionStrategy extends DefaultResourceDescriptionStrategy {
 
-    /**
-     * Key used in user data attached to description of a Model.
-     */
-    public static final String INCLUDES = "includes";
+  /** Key used in user data attached to description of a Model. */
+  public static final String INCLUDES = "includes";
 
-    /**
-     * Delimiter used in the values associated with INCLUDES keys in the
-     * user-data descriptions of Models.
-     */
-    public static final String DELIMITER = ",";
+  /**
+   * Delimiter used in the values associated with INCLUDES keys in the user-data descriptions of
+   * Models.
+   */
+  public static final String DELIMITER = ",";
 
-    @Inject
-    private ImportUriResolver uriResolver;
+  @Inject private ImportUriResolver uriResolver;
 
-    @Override
-    public boolean createEObjectDescriptions(EObject eObject, IAcceptor<IEObjectDescription> acceptor) {
-        if (eObject instanceof Model) {
-            this.createEObjectDescriptionForModel((Model) eObject, acceptor);
-            return true;
-        } else {
-            return super.createEObjectDescriptions(eObject, acceptor);
-        }
+  @Override
+  public boolean createEObjectDescriptions(
+      EObject eObject, IAcceptor<IEObjectDescription> acceptor) {
+    if (eObject instanceof Model) {
+      this.createEObjectDescriptionForModel((Model) eObject, acceptor);
+      return true;
+    } else {
+      return super.createEObjectDescriptions(eObject, acceptor);
     }
+  }
 
-    /**
-     * Build an index containing the strings of the URIs imported resources.
-     * <p>
-     * All the URIs are added to comma-separated string and stored under the
-     * key "includes" in the userData map of the object description.
-     **/
-    private void createEObjectDescriptionForModel(Model model, IAcceptor<IEObjectDescription> acceptor) {
-        var uris = model.getImports().stream().map(uriResolver).collect(Collectors.joining(DELIMITER));
-        var userData = Map.of(INCLUDES, uris);
-        QualifiedName qname = QualifiedName.create(model.eResource().getURI().toString());
-        acceptor.accept(EObjectDescription.create(qname, model, userData));
-    }
+  /**
+   * Build an index containing the strings of the URIs imported resources.
+   *
+   * <p>All the URIs are added to comma-separated string and stored under the key "includes" in the
+   * userData map of the object description.
+   */
+  private void createEObjectDescriptionForModel(
+      Model model, IAcceptor<IEObjectDescription> acceptor) {
+    var uris = model.getImports().stream().map(uriResolver).collect(Collectors.joining(DELIMITER));
+    var userData = Map.of(INCLUDES, uris);
+    QualifiedName qname = QualifiedName.create(model.eResource().getURI().toString());
+    acceptor.accept(EObjectDescription.create(qname, model, userData));
+  }
 }
diff --git a/org.lflang/src/org/lflang/LFResourceProvider.java b/org.lflang/src/org/lflang/LFResourceProvider.java
index 51db96a6d5..03c7b9ea47 100644
--- a/org.lflang/src/org/lflang/LFResourceProvider.java
+++ b/org.lflang/src/org/lflang/LFResourceProvider.java
@@ -1,28 +1,24 @@
 package org.lflang;
 
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
 import com.google.inject.Inject;
 import com.google.inject.Provider;
+import org.eclipse.emf.ecore.resource.ResourceSet;
 
 /**
  * Class that provides access to a resource set.
- * 
- * @author Marten Lohstroh
  *
+ * @author Marten Lohstroh
  */
 public class LFResourceProvider {
-    /**
-     * Injected resource set provider.
-     */
-    @Inject
-    private Provider<ResourceSet> resourceSetProvider;
-    
-    /**
-     * Return a resource set obtained from the injected provider.
-     * @return
-     */
-    public ResourceSet getResourceSet() {
-        return this.resourceSetProvider.get();
-    }
+  /** Injected resource set provider. */
+  @Inject private Provider<ResourceSet> resourceSetProvider;
+
+  /**
+   * Return a resource set obtained from the injected provider.
+   *
+   * @return
+   */
+  public ResourceSet getResourceSet() {
+    return this.resourceSetProvider.get();
+  }
 }
diff --git a/org.lflang/src/org/lflang/LFRuntimeModule.java b/org.lflang/src/org/lflang/LFRuntimeModule.java
index a7c1e80a19..a01986dfb3 100644
--- a/org.lflang/src/org/lflang/LFRuntimeModule.java
+++ b/org.lflang/src/org/lflang/LFRuntimeModule.java
@@ -8,50 +8,50 @@
 import org.eclipse.xtext.resource.IDefaultResourceDescriptionStrategy;
 import org.eclipse.xtext.scoping.IGlobalScopeProvider;
 import org.eclipse.xtext.validation.INamesAreUniqueValidationHelper;
-
 import org.lflang.formatting2.LFFormatter;
 import org.lflang.scoping.LFGlobalScopeProvider;
 import org.lflang.validation.LFNamesAreUniqueValidationHelper;
 
 /**
- * Binds services that are available both when running LFC
- * standalone, and when running within the IDE.
+ * Binds services that are available both when running LFC standalone, and when running within the
+ * IDE.
+ *
  * <ul>
- * <li>LfIdeModule overrides this module with additional
- * bindings when running in the IDE.
- * <li>{@code org.lflang.lfc.LFStandaloneModule} overrides this module when
- * running LFC standalone.
+ *   <li>LfIdeModule overrides this module with additional bindings when running in the IDE.
+ *   <li>{@code org.lflang.lfc.LFStandaloneModule} overrides this module when running LFC
+ *       standalone.
  * </ul>
  */
 public class LFRuntimeModule extends AbstractLFRuntimeModule {
 
-    /** Establish a binding to our custom resource description strategy. */
-    public Class<? extends IDefaultResourceDescriptionStrategy> bindIDefaultResourceDescriptionStrategy() {
-        return LFResourceDescriptionStrategy.class;
-    }
-
-    /** Establish a binding to our custom global scope provider. */
-    @Override
-    public Class<? extends IGlobalScopeProvider> bindIGlobalScopeProvider() {
-        return LFGlobalScopeProvider.class;
-    }
-
-    /** Establish a binding to a helper that checks that names are unique. */
-    public Class<? extends INamesAreUniqueValidationHelper> bindNamesAreUniqueValidationHelper() {
-        return LFNamesAreUniqueValidationHelper.class;
-    }
-    
-    public Class<? extends ISyntaxErrorMessageProvider> bindISyntaxErrorMessageProvider() {
-        return LFSyntaxErrorMessageProvider.class;
-    }
-
-    /** The error reporter. {@code org.lflang.lfc.LFStandaloneModule} overrides this binding. */
-    public Class<? extends ErrorReporter> bindErrorReporter() {
-        return DefaultErrorReporter.class;
-    }
-
-    @Override
-    public Class<? extends IFormatter2> bindIFormatter2() {
-        return LFFormatter.class;
-    }
+  /** Establish a binding to our custom resource description strategy. */
+  public Class<? extends IDefaultResourceDescriptionStrategy>
+      bindIDefaultResourceDescriptionStrategy() {
+    return LFResourceDescriptionStrategy.class;
+  }
+
+  /** Establish a binding to our custom global scope provider. */
+  @Override
+  public Class<? extends IGlobalScopeProvider> bindIGlobalScopeProvider() {
+    return LFGlobalScopeProvider.class;
+  }
+
+  /** Establish a binding to a helper that checks that names are unique. */
+  public Class<? extends INamesAreUniqueValidationHelper> bindNamesAreUniqueValidationHelper() {
+    return LFNamesAreUniqueValidationHelper.class;
+  }
+
+  public Class<? extends ISyntaxErrorMessageProvider> bindISyntaxErrorMessageProvider() {
+    return LFSyntaxErrorMessageProvider.class;
+  }
+
+  /** The error reporter. {@code org.lflang.lfc.LFStandaloneModule} overrides this binding. */
+  public Class<? extends ErrorReporter> bindErrorReporter() {
+    return DefaultErrorReporter.class;
+  }
+
+  @Override
+  public Class<? extends IFormatter2> bindIFormatter2() {
+    return LFFormatter.class;
+  }
 }
diff --git a/org.lflang/src/org/lflang/LFStandaloneSetup.java b/org.lflang/src/org/lflang/LFStandaloneSetup.java
index c1b5e85ecf..13264adabe 100644
--- a/org.lflang/src/org/lflang/LFStandaloneSetup.java
+++ b/org.lflang/src/org/lflang/LFStandaloneSetup.java
@@ -4,33 +4,30 @@
 
 package org.lflang;
 
-
-import org.eclipse.xtext.util.Modules2;
-
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Module;
+import org.eclipse.xtext.util.Modules2;
 
 /**
- * Initialization support for running Xtext languages without
- * Equinox extension registry.
+ * Initialization support for running Xtext languages without Equinox extension registry.
  *
- * See {@link LFRuntimeModule}, the base Guice module for LF services.
+ * <p>See {@link LFRuntimeModule}, the base Guice module for LF services.
  */
 public class LFStandaloneSetup extends LFStandaloneSetupGenerated {
 
-	private final Module module;
+  private final Module module;
 
-	public LFStandaloneSetup() {
-		this.module = new LFRuntimeModule();
-	}
+  public LFStandaloneSetup() {
+    this.module = new LFRuntimeModule();
+  }
 
-	public LFStandaloneSetup(Module... modules) {
-		this.module = Modules2.mixin(modules);
-	}
+  public LFStandaloneSetup(Module... modules) {
+    this.module = Modules2.mixin(modules);
+  }
 
-	@Override
-	public Injector createInjector() {
-		return Guice.createInjector(this.module);
-	}
+  @Override
+  public Injector createInjector() {
+    return Guice.createInjector(this.module);
+  }
 }
diff --git a/org.lflang/src/org/lflang/LFSyntaxErrorMessageProvider.java b/org.lflang/src/org/lflang/LFSyntaxErrorMessageProvider.java
index ac5511980a..d1ddb312e1 100644
--- a/org.lflang/src/org/lflang/LFSyntaxErrorMessageProvider.java
+++ b/org.lflang/src/org/lflang/LFSyntaxErrorMessageProvider.java
@@ -1,8 +1,8 @@
 package org.lflang;
 
+import com.google.inject.Inject;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.antlr.runtime.RecognitionException;
 import org.antlr.runtime.Token;
 import org.eclipse.xtext.GrammarUtil;
@@ -10,78 +10,70 @@
 import org.eclipse.xtext.nodemodel.SyntaxErrorMessage;
 import org.eclipse.xtext.parser.antlr.SyntaxErrorMessageProvider;
 
-import com.google.inject.Inject;
-
 /**
  * Custom error message provider that intercepts syntax errors.
- * 
+ *
  * @author Marten Lohstroh
  */
 public class LFSyntaxErrorMessageProvider extends SyntaxErrorMessageProvider {
-    
-    /**
-     * Issue code for syntax error due to misused keyword.
-     */
-    public static String USED_RESERVED_KEYWORD = "USED_RESERVED_KEYWORD";
-    
-    /**
-     * Issue code for syntax error due to misused single quotes.
-     */
-    public static String SINGLY_QUOTED_STRING = "SINGLE_QUOTED_STRING";
-    
-    /**
-     * Helper that provides access to the grammar.
-     */
-    @Inject IGrammarAccess grammarAccess;
-    
-    /**
-     * Set of keywords that otherwise would be valid identifiers. 
-     * For example, 'reaction' is part of this set, but '{=' is not.
-     */
-    public Set<String> keywords;
-        
-    /**
-     * Customize intercepted error messages.
-     * 
-     * @Override
-     */
-    public SyntaxErrorMessage getSyntaxErrorMessage(IParserErrorContext context) {
-        
-        if (context != null) {
-            String message = context.getDefaultMessage(); 
-            
-            // Describe situation where an unexpected token was encountered where a closing single quote was expected.
-            if (message.contains("expecting '''")) {
-                return new SyntaxErrorMessage("Single quotes can only be used around single characters, not strings. "
-                        + "Please use double quotes instead.", SINGLY_QUOTED_STRING);
+
+  /** Issue code for syntax error due to misused keyword. */
+  public static String USED_RESERVED_KEYWORD = "USED_RESERVED_KEYWORD";
+
+  /** Issue code for syntax error due to misused single quotes. */
+  public static String SINGLY_QUOTED_STRING = "SINGLE_QUOTED_STRING";
+
+  /** Helper that provides access to the grammar. */
+  @Inject IGrammarAccess grammarAccess;
+
+  /**
+   * Set of keywords that otherwise would be valid identifiers. For example, 'reaction' is part of
+   * this set, but '{=' is not.
+   */
+  public Set<String> keywords;
+
+  /** Customize intercepted error messages. @Override */
+  public SyntaxErrorMessage getSyntaxErrorMessage(IParserErrorContext context) {
+
+    if (context != null) {
+      String message = context.getDefaultMessage();
+
+      // Describe situation where an unexpected token was encountered where a closing single quote
+      // was expected.
+      if (message.contains("expecting '''")) {
+        return new SyntaxErrorMessage(
+            "Single quotes can only be used around single characters, not strings. "
+                + "Please use double quotes instead.",
+            SINGLY_QUOTED_STRING);
+      }
+
+      RecognitionException e = context.getRecognitionException();
+      if (e != null) {
+        Token token = e.token;
+        if (token != null) {
+          String text = token.getText();
+          if (text != null) {
+            // Update keywords if not yet set.
+            if (keywords == null) {
+              // ('a'..'z'|'A'..'Z'|'_')('a'..'z'|'A'..'Z'|'_'|'0'..'9')*
+              this.keywords =
+                  GrammarUtil.getAllKeywords(grammarAccess.getGrammar()).stream()
+                      .filter(k -> k.matches("^([a-z]|[A-Z]|_)+(\\w|_)*$"))
+                      .collect(Collectors.toSet());
             }
-            
-            RecognitionException e = context.getRecognitionException();
-            if (e != null) {
-                Token token = e.token;
-                if (token != null) {
-                    String text = token.getText();
-                    if (text != null) {
-                        // Update keywords if not yet set.
-                        if (keywords == null) {
-                            // ('a'..'z'|'A'..'Z'|'_')('a'..'z'|'A'..'Z'|'_'|'0'..'9')*
-                            this.keywords = GrammarUtil
-                                    .getAllKeywords(grammarAccess.getGrammar())
-                                    .stream()
-                                    .filter(k -> k
-                                            .matches("^([a-z]|[A-Z]|_)+(\\w|_)*$"))
-                                    .collect(Collectors.toSet());
-                            
-                        }
-                        // Describe situation where a keyword is used as an identifier.
-                        if (keywords.contains(text)) {
-                            return new SyntaxErrorMessage("'" + text + "' is a reserved keyword "
-                                    + "which cannot be used as an identifier.", USED_RESERVED_KEYWORD);
-                        }
-                    }
-                }
+            // Describe situation where a keyword is used as an identifier.
+            if (keywords.contains(text)) {
+              return new SyntaxErrorMessage(
+                  "'"
+                      + text
+                      + "' is a reserved keyword "
+                      + "which cannot be used as an identifier.",
+                  USED_RESERVED_KEYWORD);
             }
+          }
         }
-        return super.getSyntaxErrorMessage(context);
+      }
     }
+    return super.getSyntaxErrorMessage(context);
+  }
 }
diff --git a/org.lflang/src/org/lflang/LocalStrings.java b/org.lflang/src/org/lflang/LocalStrings.java
index 79f338b39d..314839c3f1 100644
--- a/org.lflang/src/org/lflang/LocalStrings.java
+++ b/org.lflang/src/org/lflang/LocalStrings.java
@@ -2,10 +2,8 @@
 
 import java.util.ResourceBundle;
 
-/**
- * Static class for managing strings.
- */
+/** Static class for managing strings. */
 public class LocalStrings {
-    public static final ResourceBundle res = ResourceBundle.getBundle("org.lflang.StringsBundle");
-    public static final String VERSION = res.getString("VERSION");
+  public static final ResourceBundle res = ResourceBundle.getBundle("org.lflang.StringsBundle");
+  public static final String VERSION = res.getString("VERSION");
 }
diff --git a/org.lflang/src/org/lflang/MainConflictChecker.java b/org.lflang/src/org/lflang/MainConflictChecker.java
index 6ee3ebf569..1805cda5d7 100644
--- a/org.lflang/src/org/lflang/MainConflictChecker.java
+++ b/org.lflang/src/org/lflang/MainConflictChecker.java
@@ -2,6 +2,7 @@
 
 import static java.nio.file.FileVisitResult.CONTINUE;
 
+import com.google.common.collect.Iterables;
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
@@ -11,7 +12,6 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -20,92 +20,79 @@
 import org.lflang.lf.Reactor;
 import org.lflang.util.FileUtil;
 
-import com.google.common.collect.Iterables;
-
 /**
- * Class that (upon instantiation) determines whether there are any conflicting main reactors in the current package.
- * Conflicts are reported in the instance's conflicts list.
- * 
- * @author Marten Lohstroh
+ * Class that (upon instantiation) determines whether there are any conflicting main reactors in the
+ * current package. Conflicts are reported in the instance's conflicts list.
  *
+ * @author Marten Lohstroh
  */
 public class MainConflictChecker {
 
-    /**
-     * List of conflict encountered while traversing the package.
-     */
-    public final List<String> conflicts = new LinkedList<String>();
-    
-    /**
-     * The current file configuration.
-     */
-    protected FileConfig fileConfig;
-    
-    /**
-     * Resource set used to obtain resources from.
-     */
-    protected static final ResourceSet rs = new LFStandaloneSetup()
-            .createInjectorAndDoEMFRegistration()
-            .<LFResourceProvider>getInstance(LFResourceProvider.class).getResourceSet();
-    
-    /**
-     * Create a new instance that walks the file tree of the package to find conflicts.
-     * 
-     * @param fileConfig The current file configuration.
-     */
-    public MainConflictChecker(FileConfig fileConfig) {
-        // FIXME: See if there is a faster way to do this check that does not involve parsing all
-        //  files in the current package (which happens when we get the resources)
-        this.fileConfig = fileConfig;
-        try {
-            Files.walkFileTree(fileConfig.srcPkgPath, new PackageVisitor());
-        } catch (IOException e) {
-            System.err.println("Error while checking for name conflicts in package.");
-            e.printStackTrace();
-        }
+  /** List of conflict encountered while traversing the package. */
+  public final List<String> conflicts = new LinkedList<String>();
+
+  /** The current file configuration. */
+  protected FileConfig fileConfig;
+
+  /** Resource set used to obtain resources from. */
+  protected static final ResourceSet rs =
+      new LFStandaloneSetup()
+          .createInjectorAndDoEMFRegistration()
+          .<LFResourceProvider>getInstance(LFResourceProvider.class)
+          .getResourceSet();
+
+  /**
+   * Create a new instance that walks the file tree of the package to find conflicts.
+   *
+   * @param fileConfig The current file configuration.
+   */
+  public MainConflictChecker(FileConfig fileConfig) {
+    // FIXME: See if there is a faster way to do this check that does not involve parsing all
+    //  files in the current package (which happens when we get the resources)
+    this.fileConfig = fileConfig;
+    try {
+      Files.walkFileTree(fileConfig.srcPkgPath, new PackageVisitor());
+    } catch (IOException e) {
+      System.err.println("Error while checking for name conflicts in package.");
+      e.printStackTrace();
     }
-    
-    /**
-     * Extension of a SimpleFileVisitor that adds entries to the conflicts list in the outer class.
-     * 
-     * Specifically, each visited file is checked against the name present in the current file configuration.
-     * If the name matches the current file (but is not the file itself), then parse that file and determine whether 
-     * there is a main reactor declared. If there is one, report a conflict.
-     * 
-     * @author Marten Lohstroh
-     *
-     */
-    public class PackageVisitor extends SimpleFileVisitor<Path> {
+  }
+
+  /**
+   * Extension of a SimpleFileVisitor that adds entries to the conflicts list in the outer class.
+   *
+   * <p>Specifically, each visited file is checked against the name present in the current file
+   * configuration. If the name matches the current file (but is not the file itself), then parse
+   * that file and determine whether there is a main reactor declared. If there is one, report a
+   * conflict.
+   *
+   * @author Marten Lohstroh
+   */
+  public class PackageVisitor extends SimpleFileVisitor<Path> {
 
-        /**
-         * Report a conflicting main reactors in visited files.
-         */
-        @Override
-        public FileVisitResult visitFile(Path path, BasicFileAttributes attr) {
-            path = path.normalize();
-            if (attr.isRegularFile() && path.toString().endsWith(".lf")) {
-                // Parse the file.
-                Resource r = rs.getResource(
-                        URI.createFileURI(path.toFile().getAbsolutePath()),
-                        true);
-                if (r.getErrors().isEmpty()) {
-                    // No errors. Find the main reactor.
-                    Iterator<Reactor> reactors = Iterables
-                            .<Reactor>filter(IteratorExtensions
-                                    .<EObject>toIterable(r.getAllContents()),
-                                    Reactor.class)
-                            .iterator();
-                    // If this is not the same file, but it has a main reactor
-                    // and the name matches, then report the conflict.
-                    if (!fileConfig.srcFile.equals(path)
-                            && IteratorExtensions.exists(reactors, it -> it.isMain() || it.isFederated())
-                            && fileConfig.name.equals(FileUtil.nameWithoutExtension(path))) {
-                        conflicts.add(
-                                fileConfig.srcPath.relativize(path).toString());
-                    }
-                }
-            }
-            return CONTINUE;
+    /** Report a conflicting main reactors in visited files. */
+    @Override
+    public FileVisitResult visitFile(Path path, BasicFileAttributes attr) {
+      path = path.normalize();
+      if (attr.isRegularFile() && path.toString().endsWith(".lf")) {
+        // Parse the file.
+        Resource r = rs.getResource(URI.createFileURI(path.toFile().getAbsolutePath()), true);
+        if (r.getErrors().isEmpty()) {
+          // No errors. Find the main reactor.
+          Iterator<Reactor> reactors =
+              Iterables.<Reactor>filter(
+                      IteratorExtensions.<EObject>toIterable(r.getAllContents()), Reactor.class)
+                  .iterator();
+          // If this is not the same file, but it has a main reactor
+          // and the name matches, then report the conflict.
+          if (!fileConfig.srcFile.equals(path)
+              && IteratorExtensions.exists(reactors, it -> it.isMain() || it.isFederated())
+              && fileConfig.name.equals(FileUtil.nameWithoutExtension(path))) {
+            conflicts.add(fileConfig.srcPath.relativize(path).toString());
+          }
         }
+      }
+      return CONTINUE;
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/ModelInfo.java b/org.lflang/src/org/lflang/ModelInfo.java
index 24d5c447c2..17ee7cfb76 100644
--- a/org.lflang/src/org/lflang/ModelInfo.java
+++ b/org.lflang/src/org/lflang/ModelInfo.java
@@ -1,27 +1,27 @@
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang;
 
@@ -35,7 +35,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.NamedInstance;
 import org.lflang.generator.ReactorInstance;
@@ -51,214 +50,209 @@
 import org.lflang.lf.STP;
 import org.lflang.util.FileUtil;
 
-
 /**
  * A helper class for analyzing the AST. This class is instantiated once for each compilation.
- * <p>
- * NOTE: the validator used on imported files uses the same instance! Hence, this class should not contain any info
- * specific to any particular resource that is involved in the compilation.
+ *
+ * <p>NOTE: the validator used on imported files uses the same instance! Hence, this class should
+ * not contain any info specific to any particular resource that is involved in the compilation.
  *
  * @author Marten Lohstroh
  */
 public class ModelInfo {
 
-    /**
-     * Data structure for tracking dependencies between reactor classes. An
-     * instantiation of class A inside of class B implies that B depends on A.
-     */
-    public InstantiationGraph instantiationGraph;
-
-    /**
-     * The AST that the info gathered in this class pertains to.
-     */
-    public Model model;
-
-    /**
-     * The set of assignments that assign a too-large constant to a parameter
-     * that is used to specify a deadline. These assignments are to be reported
-     * during validation.
-     */
-    public Set<Assignment> overflowingAssignments;
-
-    /**
-     * The set of deadlines that use a too-large constant to specify their time
-     * interval.
-     */
-    public Set<Deadline> overflowingDeadlines;
-
-    /**
-     * The set of STP offsets that use a too-large constant to specify their time
-     * interval.
-     */
-    public Set<STP> overflowingSTP;
-
-    /**
-     * The set of parameters used to specify a deadline while having been
-     * assigned a default value the is too large for this purpose. These
-     * parameters are to be reported during validation.
-     */
-    public Set<Parameter> overflowingParameters;
-
-    /** Cycles found during topology analysis. */
-    private Set<NamedInstance<?>> topologyCycles = new LinkedHashSet<NamedInstance<?>>();
-
-    /**
-     * Whether or not the model information has been updated at least once.
-     */
-    public boolean updated;
-
-    /**
-     * Redo all analysis based on the given model.
-     *
-     * @param model the model to analyze.
-     */
-    public void update(Model model, ErrorReporter reporter) {
-        this.updated = true;
-        this.model = model;
-        this.instantiationGraph = new InstantiationGraph(model, true);
-
-        if (this.instantiationGraph.getCycles().size() == 0) {
-            List<ReactorInstance> topLevelReactorInstances = new LinkedList<>();
-            var main = model.getReactors().stream().filter(it -> it.isMain() || it.isFederated()).findFirst();
-            if (main.isPresent()) {
-                var inst = new ReactorInstance(main.get(), reporter);
-                topLevelReactorInstances.add(inst);
-            } else {
-                model.getReactors().forEach(
-                    it -> topLevelReactorInstances.add(new ReactorInstance(it, reporter))
-                );
-            }
-            // don't store the graph into a field, only the cycles.
-            for (ReactorInstance top : topLevelReactorInstances) {
-                this.topologyCycles.addAll(top.getCycles());
-            }
-        }
-
-        // may be null if the target is invalid
-        var target = Target.forName(model.getTarget().getName()).orElse(null);
+  /**
+   * Data structure for tracking dependencies between reactor classes. An instantiation of class A
+   * inside of class B implies that B depends on A.
+   */
+  public InstantiationGraph instantiationGraph;
+
+  /** The AST that the info gathered in this class pertains to. */
+  public Model model;
+
+  /**
+   * The set of assignments that assign a too-large constant to a parameter that is used to specify
+   * a deadline. These assignments are to be reported during validation.
+   */
+  public Set<Assignment> overflowingAssignments;
+
+  /** The set of deadlines that use a too-large constant to specify their time interval. */
+  public Set<Deadline> overflowingDeadlines;
+
+  /** The set of STP offsets that use a too-large constant to specify their time interval. */
+  public Set<STP> overflowingSTP;
+
+  /**
+   * The set of parameters used to specify a deadline while having been assigned a default value the
+   * is too large for this purpose. These parameters are to be reported during validation.
+   */
+  public Set<Parameter> overflowingParameters;
+
+  /** Cycles found during topology analysis. */
+  private Set<NamedInstance<?>> topologyCycles = new LinkedHashSet<NamedInstance<?>>();
+
+  /** Whether or not the model information has been updated at least once. */
+  public boolean updated;
+
+  /**
+   * Redo all analysis based on the given model.
+   *
+   * @param model the model to analyze.
+   */
+  public void update(Model model, ErrorReporter reporter) {
+    this.updated = true;
+    this.model = model;
+    this.instantiationGraph = new InstantiationGraph(model, true);
+
+    if (this.instantiationGraph.getCycles().size() == 0) {
+      List<ReactorInstance> topLevelReactorInstances = new LinkedList<>();
+      var main =
+          model.getReactors().stream().filter(it -> it.isMain() || it.isFederated()).findFirst();
+      if (main.isPresent()) {
+        var inst = new ReactorInstance(main.get(), reporter);
+        topLevelReactorInstances.add(inst);
+      } else {
+        model
+            .getReactors()
+            .forEach(it -> topLevelReactorInstances.add(new ReactorInstance(it, reporter)));
+      }
+      // don't store the graph into a field, only the cycles.
+      for (ReactorInstance top : topLevelReactorInstances) {
+        this.topologyCycles.addAll(top.getCycles());
+      }
+    }
 
-        // Perform C-specific traversals.
-        if (target == Target.C) {
-            this.collectOverflowingNodes();
-        }
+    // may be null if the target is invalid
+    var target = Target.forName(model.getTarget().getName()).orElse(null);
 
-        checkCaseInsensitiveNameCollisions(model, reporter);
+    // Perform C-specific traversals.
+    if (target == Target.C) {
+      this.collectOverflowingNodes();
     }
 
-    public void checkCaseInsensitiveNameCollisions(Model model, ErrorReporter reporter) {
-        var reactorNames = new HashSet<>();
-        var bad = new ArrayList<>();
-        for (var reactor : model.getReactors()) {
-            var lowerName = getName(reactor).toLowerCase();
-            if (reactorNames.contains(lowerName)) bad.add(lowerName);
-            reactorNames.add(lowerName);
-        }
-        for (var badName : bad) {
-            model.getReactors().stream()
-                .filter(it -> getName(it).toLowerCase().equals(badName))
-                .forEach(it -> reporter.reportError(it, "Multiple reactors have the same name up to case differences."));
-        }
-    }
+    checkCaseInsensitiveNameCollisions(model, reporter);
+  }
 
-    private String getName(Reactor r) {
-        return r.getName() != null ? r.getName() : FileUtil.nameWithoutExtension(Path.of(model.eResource().getURI().toFileString()));
+  public void checkCaseInsensitiveNameCollisions(Model model, ErrorReporter reporter) {
+    var reactorNames = new HashSet<>();
+    var bad = new ArrayList<>();
+    for (var reactor : model.getReactors()) {
+      var lowerName = getName(reactor).toLowerCase();
+      if (reactorNames.contains(lowerName)) bad.add(lowerName);
+      reactorNames.add(lowerName);
     }
-
-    public Set<NamedInstance<?>> topologyCycles() {
-        return this.topologyCycles;
+    for (var badName : bad) {
+      model.getReactors().stream()
+          .filter(it -> getName(it).toLowerCase().equals(badName))
+          .forEach(
+              it ->
+                  reporter.reportError(
+                      it, "Multiple reactors have the same name up to case differences."));
     }
-
-    /**
-     * Collect all assignments, deadlines, and parameters that can cause the
-     * time interval of a deadline to overflow. In the C target, only 48 bits
-     * are allotted for deadline intervals, which are specified in nanosecond
-     * precision.
-     */
-    private void collectOverflowingNodes() {
-
-        this.overflowingAssignments = new HashSet<>();
-        this.overflowingDeadlines = new HashSet<>();
-        this.overflowingParameters = new HashSet<>();
-        this.overflowingSTP = new HashSet<>();
-
-        // Visit all deadlines in the model; detect possible overflow.
-        for (var deadline : filter(toIterable(model.eAllContents()), Deadline.class)) {
-            // If the time value overflows, mark this deadline as overflowing.
-            if (isTooLarge(ASTUtils.getLiteralTimeValue(deadline.getDelay()))) {
-                this.overflowingDeadlines.add(deadline);
-            }
-
-            // If any of the upstream parameters overflow, report this deadline.
-            final var delay = deadline.getDelay();
-            if (delay instanceof ParameterReference
-                && detectOverflow(new HashSet<>(), ((ParameterReference) deadline.getDelay()).getParameter())) {
-                this.overflowingDeadlines.add(deadline);
-            }
-        }
-        // Visit all STP offsets in the model; detect possible overflow.
-        for (var stp : filter(toIterable(model.eAllContents()), STP.class)) {
-            // If the time value overflows, mark this deadline as overflowing.
-            if (isTooLarge(ASTUtils.getLiteralTimeValue(stp.getValue()))) {
-                this.overflowingSTP.add(stp);
-            }
-        }
+  }
+
+  private String getName(Reactor r) {
+    return r.getName() != null
+        ? r.getName()
+        : FileUtil.nameWithoutExtension(Path.of(model.eResource().getURI().toFileString()));
+  }
+
+  public Set<NamedInstance<?>> topologyCycles() {
+    return this.topologyCycles;
+  }
+
+  /**
+   * Collect all assignments, deadlines, and parameters that can cause the time interval of a
+   * deadline to overflow. In the C target, only 48 bits are allotted for deadline intervals, which
+   * are specified in nanosecond precision.
+   */
+  private void collectOverflowingNodes() {
+
+    this.overflowingAssignments = new HashSet<>();
+    this.overflowingDeadlines = new HashSet<>();
+    this.overflowingParameters = new HashSet<>();
+    this.overflowingSTP = new HashSet<>();
+
+    // Visit all deadlines in the model; detect possible overflow.
+    for (var deadline : filter(toIterable(model.eAllContents()), Deadline.class)) {
+      // If the time value overflows, mark this deadline as overflowing.
+      if (isTooLarge(ASTUtils.getLiteralTimeValue(deadline.getDelay()))) {
+        this.overflowingDeadlines.add(deadline);
+      }
+
+      // If any of the upstream parameters overflow, report this deadline.
+      final var delay = deadline.getDelay();
+      if (delay instanceof ParameterReference
+          && detectOverflow(
+              new HashSet<>(), ((ParameterReference) deadline.getDelay()).getParameter())) {
+        this.overflowingDeadlines.add(deadline);
+      }
     }
-
-    /**
-     * In the C target, only 48 bits are allotted for deadline intervals, which
-     * are specified in nanosecond precision. Check whether the given time value
-     * exceeds the maximum specified value.
-     *
-     * @return true if the time value is greater than the specified maximum,
-     * false otherwise.
-     */
-    private boolean isTooLarge(TimeValue time) {
-        return time != null && time.toNanoSeconds() > TimeValue.MAX_LONG_DEADLINE;
+    // Visit all STP offsets in the model; detect possible overflow.
+    for (var stp : filter(toIterable(model.eAllContents()), STP.class)) {
+      // If the time value overflows, mark this deadline as overflowing.
+      if (isTooLarge(ASTUtils.getLiteralTimeValue(stp.getValue()))) {
+        this.overflowingSTP.add(stp);
+      }
+    }
+  }
+
+  /**
+   * In the C target, only 48 bits are allotted for deadline intervals, which are specified in
+   * nanosecond precision. Check whether the given time value exceeds the maximum specified value.
+   *
+   * @return true if the time value is greater than the specified maximum, false otherwise.
+   */
+  private boolean isTooLarge(TimeValue time) {
+    return time != null && time.toNanoSeconds() > TimeValue.MAX_LONG_DEADLINE;
+  }
+
+  /**
+   * Given a parameter that is used in a deadline specification, recursively track down its
+   * definition and check whether it is overflowing. Also detect and report overrides that are
+   * overflowing.
+   *
+   * @return true if there exists a parameter corresponding to a value that does not fit in the
+   *     available bits.
+   */
+  private boolean detectOverflow(Set<Instantiation> visited, Parameter current) {
+    var overflow = false;
+
+    // Determine whether the parameter's default value overflows or not.
+    if (isTooLarge(ASTUtils.getDefaultAsTimeValue(current))) {
+      this.overflowingParameters.add(current);
+      overflow = true;
     }
 
-    /**
-     * Given a parameter that is used in a deadline specification, recursively
-     * track down its definition and check whether it is overflowing. Also
-     * detect and report overrides that are overflowing.
-     * @return true if there exists a parameter corresponding to a value that
-     * does not fit in the available bits.
-     */
-    private boolean detectOverflow(Set<Instantiation> visited, Parameter current) {
-        var overflow = false;
-
-        // Determine whether the parameter's default value overflows or not.
-        if (isTooLarge(ASTUtils.getDefaultAsTimeValue(current))) {
-            this.overflowingParameters.add(current);
-            overflow = true;
-        }
-
-        // Iterate over the instantiations of the reactor in which the
-        // current parameter was found.
-        Set<Instantiation> instantiations = this.instantiationGraph.getInstantiations((Reactor) current.eContainer());
-        for (var instantiation : instantiations) {
-            // Only visit each instantiation once per deadline to avoid cycles.
-            if (!visited.contains(instantiation)) {
-                visited.add(instantiation);
-                // Find assignments that override the current parameter.
-                for (var assignment : instantiation.getParameters()) {
-                    if (assignment.getLhs().equals(current)) {
-                        if (assignment.getRhs().getExprs().isEmpty()) continue;  // This error should be caught elsewhere.
-                        Expression expr = ASTUtils.asSingleExpr(assignment.getRhs());
-                        if (expr instanceof ParameterReference) {
-                            // Check for overflow in the referenced parameter.
-                            overflow = detectOverflow(visited, ((ParameterReference)expr).getParameter()) || overflow;
-                        } else {
-                            // The right-hand side of the assignment is a
-                            // constant; check whether it is too large.
-                            if (isTooLarge(ASTUtils.getLiteralTimeValue(expr))) {
-                                this.overflowingAssignments.add(assignment);
-                                overflow = true;
-                            }
-                        }
-                    }
-                }
+    // Iterate over the instantiations of the reactor in which the
+    // current parameter was found.
+    Set<Instantiation> instantiations =
+        this.instantiationGraph.getInstantiations((Reactor) current.eContainer());
+    for (var instantiation : instantiations) {
+      // Only visit each instantiation once per deadline to avoid cycles.
+      if (!visited.contains(instantiation)) {
+        visited.add(instantiation);
+        // Find assignments that override the current parameter.
+        for (var assignment : instantiation.getParameters()) {
+          if (assignment.getLhs().equals(current)) {
+            if (assignment.getRhs().getExprs().isEmpty())
+              continue; // This error should be caught elsewhere.
+            Expression expr = ASTUtils.asSingleExpr(assignment.getRhs());
+            if (expr instanceof ParameterReference) {
+              // Check for overflow in the referenced parameter.
+              overflow =
+                  detectOverflow(visited, ((ParameterReference) expr).getParameter()) || overflow;
+            } else {
+              // The right-hand side of the assignment is a
+              // constant; check whether it is too large.
+              if (isTooLarge(ASTUtils.getLiteralTimeValue(expr))) {
+                this.overflowingAssignments.add(assignment);
+                overflow = true;
+              }
             }
+          }
         }
-        return overflow;
+      }
     }
+    return overflow;
+  }
 }
diff --git a/org.lflang/src/org/lflang/Target.java b/org.lflang/src/org/lflang/Target.java
index 2a0e0e8700..8f08e89fcc 100644
--- a/org.lflang/src/org/lflang/Target.java
+++ b/org.lflang/src/org/lflang/Target.java
@@ -1,22 +1,19 @@
 /* Static information about targets. */
 /**
- * Copyright (c) 2019, The University of California at Berkeley.
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) 2019, The University of California at Berkeley. Redistribution and use in source
+ * and binary forms, with or without modification, are permitted provided that the following
+ * conditions are met: 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in binary form must
+ * reproduce the above copyright notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY
+ * THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package org.lflang;
 
@@ -27,574 +24,552 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-
 import org.lflang.lf.TargetDecl;
 
-/** 
- * Enumeration of targets and their associated properties. These classes are
- * written in Java, not Xtend, because the enum implementation in Xtend more
- * primitive. It is safer to use enums rather than string values since it allows
- * faulty references to be caught at compile time. Switch statements that take
- * as input an enum but do not have cases for all members of the enum are also
+/**
+ * Enumeration of targets and their associated properties. These classes are written in Java, not
+ * Xtend, because the enum implementation in Xtend more primitive. It is safer to use enums rather
+ * than string values since it allows faulty references to be caught at compile time. Switch
+ * statements that take as input an enum but do not have cases for all members of the enum are also
  * reported by Xtend with a warning message.
- * 
+ *
  * @author Marten Lohstroh
  */
 public enum Target {
-    C("C", true, Arrays.asList(
-                // List via: https://en.cppreference.com/w/c/keyword
-                "auto",
-                "break",
-                "case",
-                "char",
-                "const",
-                "continue",
-                "default",
-                "do",
-                "double",
-                "else",
-                "enum",
-                "extern",
-                "float",
-                "for",
-                "goto",
-                "if",
-                "inline", // (since C99)
-                "int",
-                "long",
-                "register",
-                "restrict", // (since C99)
-                "return",
-                "short",
-                "signed",
-                "sizeof",
-                "static",
-                "struct",
-                "switch",
-                "typedef",
-                "union",
-                "unsigned",
-                "void",
-                "volatile",
-                "while",
-                "_Alignas", // (since C11)
-                "_Alignof", // (since C11)
-                "_Atomic", // (since C11)
-                "_Bool", // (since C99)
-                "_Complex", // (since C99)
-                "_Generic", // (since C11)
-                "_Imaginary", // (since C99)
-                "_Noreturn", // (since C11)
-                "_Static_assert", // (since C11)
-                "_Thread_local" // (since C11)
-                )
-    ), 
-    CCPP("CCpp", true, Target.C.keywords), 
-    CPP("Cpp", true, "cpp", "Cpp", Arrays.asList(
-                // List via: https://en.cppreference.com/w/cpp/keyword
-                "alignas", // (since C++11)
-                "alignof", // (since C++11)
-                "and",
-                "and_eq",
-                "asm",
-                "atomic_cancel", // (TM TS)
-                "atomic_commit", // (TM TS)
-                "atomic_noexcept", // (TM TS)
-                "auto(1)",
-                "bitand",
-                "bitor",
-                "bool",
-                "break",
-                "case",
-                "catch",
-                "char",
-                "char8_t", // (since C++20)
-                "char16_t", // (since C++11)
-                "char32_t", // (since C++11)
-                "class(1)",
-                "compl",
-                "concept", // (since C++20)
-                "const",
-                "consteval", // (since C++20)
-                "constexpr", // (since C++11)
-                "constinit", // (since C++20)
-                "const_cast",
-                "continue",
-                "co_await", // (since C++20)
-                "co_return", // (since C++20)
-                "co_yield", // (since C++20)
-                "decltype", // (since C++11)
-                "default(1)",
-                "delete(1)",
-                "do",
-                "double",
-                "dynamic_cast",
-                "else",
-                "enum",
-                "explicit",
-                "export(1)(3)",
-                "extern(1)",
-                "false",
-                "float",
-                "for",
-                "friend",
-                "goto",
-                "if",
-                "inline(1)",
-                "int",
-                "long",
-                "mutable(1)",
-                "namespace",
-                "new",
-                "noexcept", // (since C++11)
-                "not",
-                "not_eq",
-                "nullptr", // (since C++11)
-                "operator",
-                "or",
-                "or_eq",
-                "private",
-                "protected",
-                "public",
-                "reflexpr", // (reflection TS)
-                "register(2)",
-                "reinterpret_cast",
-                "requires", // (since C++20)
-                "return",
-                "short",
-                "signed",
-                "sizeof(1)",
-                "static",
-                "static_assert", // (since C++11)
-                "static_cast",
-                "struct(1)",
-                "switch",
-                "synchronized", // (TM TS)
-                "template",
-                "this",
-                "thread_local", // (since C++11)
-                "throw",
-                "true",
-                "try",
-                "typedef",
-                "typeid",
-                "typename",
-                "union",
-                "unsigned",
-                "using(1)",
-                "virtual",
-                "void",
-                "volatile",
-                "wchar_t",
-                "while",
-                "xor",
-                "xor_eq"
-                )
-    ),
-    TS("TypeScript", false, "ts", "TS", Arrays.asList(
-                // List via: https://github.com/Microsoft/TypeScript/issues/2536 
-                // Reserved words
-                "break",
-                "case",
-                "catch",
-                "class",
-                "const",
-                "continue",
-                "debugger",
-                "default",
-                "delete",
-                "do",
-                "else",
-                "enum",
-                "export",
-                "extends",
-                "false",
-                "finally",
-                "for",
-                "function",
-                "if",
-                "import",
-                "in",
-                "instanceof",
-                "new",
-                "null",
-                "return",
-                "super",
-                "switch",
-                "this",
-                "throw",
-                "true",
-                "try",
-                "typeof",
-                "var",
-                "void",
-                "while",
-                "with",
-                
-                // Strict Mode Reserved Words
-                "as",
-                "implements",
-                "interface",
-                "let",
-                "package",
-                "private",
-                "protected",
-                "public",
-                "static",
-                "yield",
-                
-                // Contextual Keywords
-                "any",
-                "boolean",
-                "constructor",
-                "declare",
-                "get",
-                "module",
-                "require",
-                "number",
-                "set",
-                "string",
-                "symbol",
-                "type",
-                "from",
-                "of",
-                
-                // Reactor-TS specific keywords (other classes, which are less user-facing, have double underscores)
-                "TimeUnit",
-                "TimeValue",
-                "Present",
-                "Sched",
-                "Read",
-                "Write",
-                "ReadWrite"
-                )
-    ), 
-    Python("Python", false, Arrays.asList(
-            // List via: https://www.w3schools.com/python/python_ref_keywords.asp
-            // and https://en.cppreference.com/w/c/keyword (due to reliance on the C lib).
-            "and",
-            "as",
-            "assert",
-            "auto",
-            "break",
-            "case",
-            "char",
-            "class",
-            "const",
-            "continue",
-            "def",
-            "default",
-            "del",
-            "do",
-            "double",
-            "elif",
-            "else",
-            "enum",
-            "except",
-            "extern",
-            "False",
-            "finally",
-            "float",
-            "for",
-            "from",
-            "global",
-            "goto",
-            "if",
-            "import",
-            "inline", // (since C99)
-            "int",
-            "in",
-            "is",
-            "lambda",
-            "long",
-            "None",
-            "nonlocal",
-            "not",
-            "or",
-            "pass",
-            "raise",
-            "register",
-            "restrict", // (since C99)
-            "return",
-            "short",
-            "signed",
-            "sizeof",
-            "static",
-            "struct",
-            "switch",
-            "True",
-            "try",
-            "typedef",
-            "union",
-            "unsigned",
-            "void",
-            "volatile",
-            "while",
-            "with",
-            "yield",
-            "_Alignas", // (since C11)
-            "_Alignof", // (since C11)
-            "_Atomic", // (since C11)
-            "_Bool", // (since C99)
-            "_Complex", // (since C99)
-            "_Generic", // (since C11)
-            "_Imaginary", // (since C99)
-            "_Noreturn", // (since C11)
-            "_Static_assert", // (since C11)
-            "_Thread_local" // (since C11)
-            )
-    ),
-    Rust("Rust", true,
-         "rust", "Rust",
-         // In our Rust implementation, the only reserved keywords
-         // are those that are a valid expression. Others may be escaped
-         // with the syntax r#keyword.
-         Arrays.asList("self", "true", "false")
-    );
-
-    /**
-     * String representation of this target.
-     */
-    private final String displayName;
-
-    /**
-     * Name of package containing Kotlin classes for the target language.
-     */
-    public final String packageName;
-
-    /**
-     * Prefix of names of Kotlin classes for the target language.
-     */
-    public final String classNamePrefix;
-
-    /**
-     * Whether or not this target requires types.
-     */
-    public final boolean requiresTypes;
-
-    /**
-     * Reserved words in the target language.
-     */
-    public final Set<String> keywords;
-
-    /**
-     *An unmodifiable list of all known targets.
-     */
-    public static final List<Target> ALL = List.of(Target.values());
-
-    /**
-     * Private constructor for targets.
-     *
-     * @param displayName     String representation of this target.
-     * @param requiresTypes   Types Whether this target requires type annotations or not.
-     * @param packageName     Name of package containing Kotlin classes for the target language.
-     * @param classNamePrefix Prefix of names of Kotlin classes for the target language.
-     * @param keywords        List of reserved strings in the target language.
-     */
-    Target(String displayName, boolean requiresTypes, String packageName,
-           String classNamePrefix, Collection<String> keywords) {
-        this.displayName = displayName;
-        this.requiresTypes = requiresTypes;
-        this.keywords = Collections.unmodifiableSet(new LinkedHashSet<>(keywords));
-        this.packageName = packageName;
-        this.classNamePrefix = classNamePrefix;
-    }
-
-
-    /**
-     * Private constructor for targets without packageName and classNamePrefix.
-     */
-    Target(String displayName, boolean requiresTypes, Collection<String> keywords) {
-        this(displayName, requiresTypes, "N/A", "N/A", keywords); // FIXME: prefix
-    }
-
-
-    /**
-     * Return the target whose {@linkplain #getDisplayName() display name}
-     * is the given string (modulo character case), or an empty
-     * optional if there is no such target.
-     */
-    public static Optional<Target> forName(String name) {
-        return Arrays.stream(Target.values())
-                     .filter(it -> it.getDisplayName().equalsIgnoreCase(name))
-                     .findFirst();
-    }
-
-    /**
-     * Return the display name of the target, as it should be
-     * written in LF code. This is hence a single identifier.
-     * Eg for {@link #CPP} returns {@code "Cpp"}, for {@link #Python}
-     * returns {@code "Python"}. Avoid using either {@link #name()}
-     * or {@link #toString()}, which have unrelated contracts.
-     */
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    /**
-     * Returns the conventional directory name for this target.
-     * This is used to divide e.g. the {@code test} and {@code example}
-     * directories by target language. For instance, {@code test/Cpp}
-     * is the path of {@link #CPP}'s test directory, and this
-     * method returns {@code "Cpp"}.
-     */
-    public String getDirectoryName() {
-        return displayName;
-    }
-
-    /**
-     * Return the description. Avoid depending on this, toString
-     * is supposed to be debug information. Prefer {@link #getDisplayName()}.
-     */
-    @Override
-    public String toString() {
-        return displayName;
-    }
-
-    /**
-     * Returns whether the given identifier is invalid as the
-     * name of an LF construct. This usually means that the identifier
-     * is a keyword in the target language. In Rust, many
-     * keywords may be escaped with the syntax {@code r#keyword},
-     * and they are considered valid identifiers.
-     */
-    public boolean isReservedIdent(String ident) {
-        return this.keywords.contains(ident);
-    }
-
-    /**
-     * Return true if the target supports federated execution.
-     */
-    public boolean supportsFederated() {
-        return switch (this) {
-            case C, CCPP, Python, TS -> true;
-            default -> false;
-        };
-    }
-
-    /**
-     * Return true if the target supports reactor inheritance (extends keyword).
-     */
-    public boolean supportsInheritance() {
-        return switch (this) {
-            case C, CCPP, Python -> true;
-            default -> false;
-        };
-    }
-
-    /**
-     * Return true if the target supports multiports and banks
-     * of reactors.
-     */
-    public boolean supportsMultiports() {
-        switch (this) {
-        case C:
-        case CCPP:
-        case CPP:
-        case Python:
-        case Rust:
-        case TS:
-            return true;
-        }
-        return false;
-    }
-
-
-    /**
-     * Return true if the target supports widths of banks and
-     * multiports that depend on reactor parameters (not only
-     * on constants).
-     */
-    public boolean supportsParameterizedWidths() {
+  C(
+      "C",
+      true,
+      Arrays.asList(
+          // List via: https://en.cppreference.com/w/c/keyword
+          "auto",
+          "break",
+          "case",
+          "char",
+          "const",
+          "continue",
+          "default",
+          "do",
+          "double",
+          "else",
+          "enum",
+          "extern",
+          "float",
+          "for",
+          "goto",
+          "if",
+          "inline", // (since C99)
+          "int",
+          "long",
+          "register",
+          "restrict", // (since C99)
+          "return",
+          "short",
+          "signed",
+          "sizeof",
+          "static",
+          "struct",
+          "switch",
+          "typedef",
+          "union",
+          "unsigned",
+          "void",
+          "volatile",
+          "while",
+          "_Alignas", // (since C11)
+          "_Alignof", // (since C11)
+          "_Atomic", // (since C11)
+          "_Bool", // (since C99)
+          "_Complex", // (since C99)
+          "_Generic", // (since C11)
+          "_Imaginary", // (since C99)
+          "_Noreturn", // (since C11)
+          "_Static_assert", // (since C11)
+          "_Thread_local" // (since C11)
+          )),
+  CCPP("CCpp", true, Target.C.keywords),
+  CPP(
+      "Cpp",
+      true,
+      "cpp",
+      "Cpp",
+      Arrays.asList(
+          // List via: https://en.cppreference.com/w/cpp/keyword
+          "alignas", // (since C++11)
+          "alignof", // (since C++11)
+          "and",
+          "and_eq",
+          "asm",
+          "atomic_cancel", // (TM TS)
+          "atomic_commit", // (TM TS)
+          "atomic_noexcept", // (TM TS)
+          "auto(1)",
+          "bitand",
+          "bitor",
+          "bool",
+          "break",
+          "case",
+          "catch",
+          "char",
+          "char8_t", // (since C++20)
+          "char16_t", // (since C++11)
+          "char32_t", // (since C++11)
+          "class(1)",
+          "compl",
+          "concept", // (since C++20)
+          "const",
+          "consteval", // (since C++20)
+          "constexpr", // (since C++11)
+          "constinit", // (since C++20)
+          "const_cast",
+          "continue",
+          "co_await", // (since C++20)
+          "co_return", // (since C++20)
+          "co_yield", // (since C++20)
+          "decltype", // (since C++11)
+          "default(1)",
+          "delete(1)",
+          "do",
+          "double",
+          "dynamic_cast",
+          "else",
+          "enum",
+          "explicit",
+          "export(1)(3)",
+          "extern(1)",
+          "false",
+          "float",
+          "for",
+          "friend",
+          "goto",
+          "if",
+          "inline(1)",
+          "int",
+          "long",
+          "mutable(1)",
+          "namespace",
+          "new",
+          "noexcept", // (since C++11)
+          "not",
+          "not_eq",
+          "nullptr", // (since C++11)
+          "operator",
+          "or",
+          "or_eq",
+          "private",
+          "protected",
+          "public",
+          "reflexpr", // (reflection TS)
+          "register(2)",
+          "reinterpret_cast",
+          "requires", // (since C++20)
+          "return",
+          "short",
+          "signed",
+          "sizeof(1)",
+          "static",
+          "static_assert", // (since C++11)
+          "static_cast",
+          "struct(1)",
+          "switch",
+          "synchronized", // (TM TS)
+          "template",
+          "this",
+          "thread_local", // (since C++11)
+          "throw",
+          "true",
+          "try",
+          "typedef",
+          "typeid",
+          "typename",
+          "union",
+          "unsigned",
+          "using(1)",
+          "virtual",
+          "void",
+          "volatile",
+          "wchar_t",
+          "while",
+          "xor",
+          "xor_eq")),
+  TS(
+      "TypeScript",
+      false,
+      "ts",
+      "TS",
+      Arrays.asList(
+          // List via: https://github.com/Microsoft/TypeScript/issues/2536
+          // Reserved words
+          "break",
+          "case",
+          "catch",
+          "class",
+          "const",
+          "continue",
+          "debugger",
+          "default",
+          "delete",
+          "do",
+          "else",
+          "enum",
+          "export",
+          "extends",
+          "false",
+          "finally",
+          "for",
+          "function",
+          "if",
+          "import",
+          "in",
+          "instanceof",
+          "new",
+          "null",
+          "return",
+          "super",
+          "switch",
+          "this",
+          "throw",
+          "true",
+          "try",
+          "typeof",
+          "var",
+          "void",
+          "while",
+          "with",
+
+          // Strict Mode Reserved Words
+          "as",
+          "implements",
+          "interface",
+          "let",
+          "package",
+          "private",
+          "protected",
+          "public",
+          "static",
+          "yield",
+
+          // Contextual Keywords
+          "any",
+          "boolean",
+          "constructor",
+          "declare",
+          "get",
+          "module",
+          "require",
+          "number",
+          "set",
+          "string",
+          "symbol",
+          "type",
+          "from",
+          "of",
+
+          // Reactor-TS specific keywords (other classes, which are less user-facing, have double
+          // underscores)
+          "TimeUnit",
+          "TimeValue",
+          "Present",
+          "Sched",
+          "Read",
+          "Write",
+          "ReadWrite")),
+  Python(
+      "Python",
+      false,
+      Arrays.asList(
+          // List via: https://www.w3schools.com/python/python_ref_keywords.asp
+          // and https://en.cppreference.com/w/c/keyword (due to reliance on the C lib).
+          "and",
+          "as",
+          "assert",
+          "auto",
+          "break",
+          "case",
+          "char",
+          "class",
+          "const",
+          "continue",
+          "def",
+          "default",
+          "del",
+          "do",
+          "double",
+          "elif",
+          "else",
+          "enum",
+          "except",
+          "extern",
+          "False",
+          "finally",
+          "float",
+          "for",
+          "from",
+          "global",
+          "goto",
+          "if",
+          "import",
+          "inline", // (since C99)
+          "int",
+          "in",
+          "is",
+          "lambda",
+          "long",
+          "None",
+          "nonlocal",
+          "not",
+          "or",
+          "pass",
+          "raise",
+          "register",
+          "restrict", // (since C99)
+          "return",
+          "short",
+          "signed",
+          "sizeof",
+          "static",
+          "struct",
+          "switch",
+          "True",
+          "try",
+          "typedef",
+          "union",
+          "unsigned",
+          "void",
+          "volatile",
+          "while",
+          "with",
+          "yield",
+          "_Alignas", // (since C11)
+          "_Alignof", // (since C11)
+          "_Atomic", // (since C11)
+          "_Bool", // (since C99)
+          "_Complex", // (since C99)
+          "_Generic", // (since C11)
+          "_Imaginary", // (since C99)
+          "_Noreturn", // (since C11)
+          "_Static_assert", // (since C11)
+          "_Thread_local" // (since C11)
+          )),
+  Rust(
+      "Rust",
+      true,
+      "rust",
+      "Rust",
+      // In our Rust implementation, the only reserved keywords
+      // are those that are a valid expression. Others may be escaped
+      // with the syntax r#keyword.
+      Arrays.asList("self", "true", "false"));
+
+  /** String representation of this target. */
+  private final String displayName;
+
+  /** Name of package containing Kotlin classes for the target language. */
+  public final String packageName;
+
+  /** Prefix of names of Kotlin classes for the target language. */
+  public final String classNamePrefix;
+
+  /** Whether or not this target requires types. */
+  public final boolean requiresTypes;
+
+  /** Reserved words in the target language. */
+  public final Set<String> keywords;
+
+  /** An unmodifiable list of all known targets. */
+  public static final List<Target> ALL = List.of(Target.values());
+
+  /**
+   * Private constructor for targets.
+   *
+   * @param displayName String representation of this target.
+   * @param requiresTypes Types Whether this target requires type annotations or not.
+   * @param packageName Name of package containing Kotlin classes for the target language.
+   * @param classNamePrefix Prefix of names of Kotlin classes for the target language.
+   * @param keywords List of reserved strings in the target language.
+   */
+  Target(
+      String displayName,
+      boolean requiresTypes,
+      String packageName,
+      String classNamePrefix,
+      Collection<String> keywords) {
+    this.displayName = displayName;
+    this.requiresTypes = requiresTypes;
+    this.keywords = Collections.unmodifiableSet(new LinkedHashSet<>(keywords));
+    this.packageName = packageName;
+    this.classNamePrefix = classNamePrefix;
+  }
+
+  /** Private constructor for targets without packageName and classNamePrefix. */
+  Target(String displayName, boolean requiresTypes, Collection<String> keywords) {
+    this(displayName, requiresTypes, "N/A", "N/A", keywords); // FIXME: prefix
+  }
+
+  /**
+   * Return the target whose {@linkplain #getDisplayName() display name} is the given string (modulo
+   * character case), or an empty optional if there is no such target.
+   */
+  public static Optional<Target> forName(String name) {
+    return Arrays.stream(Target.values())
+        .filter(it -> it.getDisplayName().equalsIgnoreCase(name))
+        .findFirst();
+  }
+
+  /**
+   * Return the display name of the target, as it should be written in LF code. This is hence a
+   * single identifier. Eg for {@link #CPP} returns {@code "Cpp"}, for {@link #Python} returns
+   * {@code "Python"}. Avoid using either {@link #name()} or {@link #toString()}, which have
+   * unrelated contracts.
+   */
+  public String getDisplayName() {
+    return displayName;
+  }
+
+  /**
+   * Returns the conventional directory name for this target. This is used to divide e.g. the {@code
+   * test} and {@code example} directories by target language. For instance, {@code test/Cpp} is the
+   * path of {@link #CPP}'s test directory, and this method returns {@code "Cpp"}.
+   */
+  public String getDirectoryName() {
+    return displayName;
+  }
+
+  /**
+   * Return the description. Avoid depending on this, toString is supposed to be debug information.
+   * Prefer {@link #getDisplayName()}.
+   */
+  @Override
+  public String toString() {
+    return displayName;
+  }
+
+  /**
+   * Returns whether the given identifier is invalid as the name of an LF construct. This usually
+   * means that the identifier is a keyword in the target language. In Rust, many keywords may be
+   * escaped with the syntax {@code r#keyword}, and they are considered valid identifiers.
+   */
+  public boolean isReservedIdent(String ident) {
+    return this.keywords.contains(ident);
+  }
+
+  /** Return true if the target supports federated execution. */
+  public boolean supportsFederated() {
+    return switch (this) {
+      case C, CCPP, Python, TS -> true;
+      default -> false;
+    };
+  }
+
+  /** Return true if the target supports reactor inheritance (extends keyword). */
+  public boolean supportsInheritance() {
+    return switch (this) {
+      case C, CCPP, Python -> true;
+      default -> false;
+    };
+  }
+
+  /** Return true if the target supports multiports and banks of reactors. */
+  public boolean supportsMultiports() {
+    switch (this) {
+      case C:
+      case CCPP:
+      case CPP:
+      case Python:
+      case Rust:
+      case TS:
         return true;
     }
-
-    /**
-     * Return true if this code for this target should be built using Docker if Docker is used.
-     * @return
-     */
-    public boolean buildsUsingDocker() {
-        return switch (this) {
-            case TS -> false;
-            case C, CCPP, CPP, Python, Rust -> true;
-        };
-    }
-
-    /**
-     * Whether the target requires using an equal sign to assign a default value to a parameter,
-     * or initialize a state variable. All targets mandate an equal sign when passing
-     * arguments to a reactor constructor call, regardless of this method.
-     */
-    public boolean mandatesEqualsInitializers() {
-        return this != CPP;
+    return false;
+  }
+
+  /**
+   * Return true if the target supports widths of banks and multiports that depend on reactor
+   * parameters (not only on constants).
+   */
+  public boolean supportsParameterizedWidths() {
+    return true;
+  }
+
+  /**
+   * Return true if this code for this target should be built using Docker if Docker is used.
+   *
+   * @return
+   */
+  public boolean buildsUsingDocker() {
+    return switch (this) {
+      case TS -> false;
+      case C, CCPP, CPP, Python, Rust -> true;
+    };
+  }
+
+  /**
+   * Whether the target requires using an equal sign to assign a default value to a parameter, or
+   * initialize a state variable. All targets mandate an equal sign when passing arguments to a
+   * reactor constructor call, regardless of this method.
+   */
+  public boolean mandatesEqualsInitializers() {
+    return this != CPP;
+  }
+
+  /** Allow expressions of the form {@code {a, b, c}}. */
+  public boolean allowsBracedListExpressions() {
+    return this == C || this == CCPP || this == CPP;
+  }
+
+  /** Return a string that demarcates the beginning of a single-line comment. */
+  public String getSingleLineCommentPrefix() {
+    return this.equals(Target.Python) ? "#" : "//";
+  }
+
+  /**
+   * Return true if the keepalive option is set automatically for this target if physical actions
+   * are detected in the program (and keepalive was not explicitly unset by the user).
+   */
+  public boolean setsKeepAliveOptionAutomatically() {
+    return this != Rust && this != CPP;
+  }
+
+  /**
+   * Given a string and a list of candidate objects, return the first candidate that matches, or
+   * null if no candidate matches.
+   *
+   * <p>todo move to CollectionUtil (introduced in #442)
+   *
+   * @param string The string to match against candidates.
+   * @param candidates The candidates to match the string against.
+   */
+  public static <T> T match(final String string, final Iterable<T> candidates) {
+    // kotlin: candidates.firstOrNull { it.toString().equalsIgnoreCase(string) }
+    for (T candidate : candidates) {
+      if (candidate.toString().equalsIgnoreCase(string)) {
+        return candidate;
+      }
     }
-
-    /** Allow expressions of the form {@code {a, b, c}}. */
-    public boolean allowsBracedListExpressions() {
-        return this == C || this == CCPP || this == CPP;
-    }
-
-    /**
-     * Return a string that demarcates the beginning of a single-line comment.
-     */
-    public String getSingleLineCommentPrefix() {
-        return this.equals(Target.Python) ? "#" : "//";
-    }
-
-    /**
-     * Return true if the keepalive option is set automatically
-     * for this target if physical actions are detected in the
-     * program (and keepalive was not explicitly unset by the user).
-     */
-    public boolean setsKeepAliveOptionAutomatically() {
-        return this != Rust && this != CPP;
-    }
-
-    /**
-     * Given a string and a list of candidate objects, return the first
-     * candidate that matches, or null if no candidate matches.
-     *
-     * todo move to CollectionUtil (introduced in #442)
-     *
-     * @param string     The string to match against candidates.
-     * @param candidates The candidates to match the string against.
-     */
-    public static <T> T match(final String string, final Iterable<T> candidates) {
-        // kotlin: candidates.firstOrNull { it.toString().equalsIgnoreCase(string) }
-        for (T candidate : candidates) {
-            if (candidate.toString().equalsIgnoreCase(string)) {
-                return candidate;
-            }
-        }
-        return null;
-    }
-
-
-    /**
-     * Given a string and a list of candidate objects, return the first
-     * candidate that matches, or null if no candidate matches.
-     *
-     * todo move to CollectionUtil (introduced in #442)
-     *
-     * @param string     The string to match against candidates.
-     * @param candidates The candidates to match the string against.
-     */
-    public static <T> T match(final String string, final T[] candidates) {
-        return match(string, Arrays.asList(candidates));
-    }
-
-
-    /**
-     * Return the target constant corresponding to given target
-     * declaration among. Return a non-null result, will throw
-     * if invalid.
-     *
-     * @throws RuntimeException If no {@link TargetDecl} is present or if it is invalid.
-     */
-    public static Target fromDecl(TargetDecl targetDecl) {
-        String name = targetDecl.getName();
-        return Target.forName(name)
-                     .orElseThrow(() -> new RuntimeException("Invalid target name '" + name + "'"));
-    }
-
+    return null;
+  }
+
+  /**
+   * Given a string and a list of candidate objects, return the first candidate that matches, or
+   * null if no candidate matches.
+   *
+   * <p>todo move to CollectionUtil (introduced in #442)
+   *
+   * @param string The string to match against candidates.
+   * @param candidates The candidates to match the string against.
+   */
+  public static <T> T match(final String string, final T[] candidates) {
+    return match(string, Arrays.asList(candidates));
+  }
+
+  /**
+   * Return the target constant corresponding to given target declaration among. Return a non-null
+   * result, will throw if invalid.
+   *
+   * @throws RuntimeException If no {@link TargetDecl} is present or if it is invalid.
+   */
+  public static Target fromDecl(TargetDecl targetDecl) {
+    String name = targetDecl.getName();
+    return Target.forName(name)
+        .orElseThrow(() -> new RuntimeException("Invalid target name '" + name + "'"));
+  }
 }
diff --git a/org.lflang/src/org/lflang/TargetConfig.java b/org.lflang/src/org/lflang/TargetConfig.java
index 84770be5d1..c4794b4b1a 100644
--- a/org.lflang/src/org/lflang/TargetConfig.java
+++ b/org.lflang/src/org/lflang/TargetConfig.java
@@ -1,27 +1,27 @@
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang;
 
 import java.util.ArrayList;
@@ -32,7 +32,6 @@
 import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
-
 import org.lflang.TargetProperty.BuildType;
 import org.lflang.TargetProperty.ClockSyncMode;
 import org.lflang.TargetProperty.CoordinationType;
@@ -48,453 +47,376 @@
 /**
  * A class for keeping the current target configuration.
  *
- * Class members of type String are initialized as empty strings,
- * unless otherwise stated.
+ * <p>Class members of type String are initialized as empty strings, unless otherwise stated.
+ *
  * @author Marten Lohstroh
  */
 public class TargetConfig {
 
-    /**
-     * The target of this configuration (e.g., C, TypeScript, Python).
-     */
-    public final Target target;
-
-    /**
-     * Create a new target configuration based on the given target declaration AST node only.
-     * @param target AST node of a target declaration.
-     */
-    public TargetConfig(TargetDecl target) { // FIXME: eliminate this constructor if we can
-        this.target = Target.fromDecl(target);
+  /** The target of this configuration (e.g., C, TypeScript, Python). */
+  public final Target target;
+
+  /**
+   * Create a new target configuration based on the given target declaration AST node only.
+   *
+   * @param target AST node of a target declaration.
+   */
+  public TargetConfig(TargetDecl target) { // FIXME: eliminate this constructor if we can
+    this.target = Target.fromDecl(target);
+  }
+
+  /**
+   * Create a new target configuration based on the given commandline arguments and target
+   * declaration AST node.
+   *
+   * @param cliArgs Arguments passed on the commandline.
+   * @param target AST node of a target declaration.
+   * @param errorReporter An error reporter to report problems.
+   */
+  public TargetConfig(Properties cliArgs, TargetDecl target, ErrorReporter errorReporter) {
+    this(target);
+    if (target.getConfig() != null) {
+      List<KeyValuePair> pairs = target.getConfig().getPairs();
+      TargetProperty.set(this, pairs != null ? pairs : List.of(), errorReporter);
     }
-
-    /**
-     * Create a new target configuration based on the given commandline arguments and target
-     * declaration AST node.
-     * @param cliArgs Arguments passed on the commandline.
-     * @param target AST node of a target declaration.
-     * @param errorReporter An error reporter to report problems.
-     */
-    public TargetConfig(
-        Properties cliArgs,
-        TargetDecl target,
-        ErrorReporter errorReporter
-    ) {
-        this(target);
-        if (target.getConfig() != null) {
-            List<KeyValuePair> pairs = target.getConfig().getPairs();
-            TargetProperty.set(this, pairs != null ? pairs : List.of(), errorReporter);
-        }
-        if (cliArgs.containsKey("no-compile")) {
-            this.noCompile = true;
-        }
-        if (cliArgs.containsKey("docker")) {
-            var arg = cliArgs.getProperty("docker");
-            if (Boolean.parseBoolean(arg)) {
-                this.dockerOptions = new DockerOptions();
-            } else {
-                this.dockerOptions = null;
-            }
-            // FIXME: this is pretty ad-hoc and does not account for more complex overrides yet.
-        }
-        if (cliArgs.containsKey("build-type")) {
-            this.cmakeBuildType = (BuildType) UnionType.BUILD_TYPE_UNION.forName(cliArgs.getProperty("build-type"));
-        }
-        if (cliArgs.containsKey("logging")) {
-            this.logLevel = LogLevel.valueOf(cliArgs.getProperty("logging").toUpperCase());
-        }
-        if (cliArgs.containsKey("workers")) {
-            this.workers = Integer.parseInt(cliArgs.getProperty("workers"));
-        }
-        if (cliArgs.containsKey("threading")) {
-            this.threading = Boolean.parseBoolean(cliArgs.getProperty("threading"));
-        }
-        if (cliArgs.containsKey("target-compiler")) {
-            this.compiler = cliArgs.getProperty("target-compiler");
-        }
-        if (cliArgs.containsKey("tracing")) {
-            this.tracing = new TracingOptions();
-        }
-        if (cliArgs.containsKey("scheduler")) {
-            this.schedulerType = SchedulerOption.valueOf(
-                cliArgs.getProperty("scheduler")
-            );
-            this.setByUser.add(TargetProperty.SCHEDULER);
-        }
-        if (cliArgs.containsKey("target-flags")) {
-            this.compilerFlags.clear();
-            if (!cliArgs.getProperty("target-flags").isEmpty()) {
-                this.compilerFlags.addAll(List.of(
-                    cliArgs.getProperty("target-flags").split(" ")
-                ));
-            }
-        }
-        if (cliArgs.containsKey("runtime-version")) {
-            this.runtimeVersion = cliArgs.getProperty("runtime-version");
-        }
-        if (cliArgs.containsKey("external-runtime-path")) {
-            this.externalRuntimePath = cliArgs.getProperty("external-runtime-path");
-        }
-        if (cliArgs.containsKey(TargetProperty.KEEPALIVE.description)) {
-            this.keepalive = Boolean.parseBoolean(
-                cliArgs.getProperty(TargetProperty.KEEPALIVE.description));
-        }
-        if (cliArgs.containsKey(BuildParm.PRINT_STATISTICS.getKey())) {
-            this.printStatistics = true;
-        }
+    if (cliArgs.containsKey("no-compile")) {
+      this.noCompile = true;
+    }
+    if (cliArgs.containsKey("docker")) {
+      var arg = cliArgs.getProperty("docker");
+      if (Boolean.parseBoolean(arg)) {
+        this.dockerOptions = new DockerOptions();
+      } else {
+        this.dockerOptions = null;
+      }
+      // FIXME: this is pretty ad-hoc and does not account for more complex overrides yet.
+    }
+    if (cliArgs.containsKey("build-type")) {
+      this.cmakeBuildType =
+          (BuildType) UnionType.BUILD_TYPE_UNION.forName(cliArgs.getProperty("build-type"));
+    }
+    if (cliArgs.containsKey("logging")) {
+      this.logLevel = LogLevel.valueOf(cliArgs.getProperty("logging").toUpperCase());
+    }
+    if (cliArgs.containsKey("workers")) {
+      this.workers = Integer.parseInt(cliArgs.getProperty("workers"));
+    }
+    if (cliArgs.containsKey("threading")) {
+      this.threading = Boolean.parseBoolean(cliArgs.getProperty("threading"));
+    }
+    if (cliArgs.containsKey("target-compiler")) {
+      this.compiler = cliArgs.getProperty("target-compiler");
+    }
+    if (cliArgs.containsKey("tracing")) {
+      this.tracing = new TracingOptions();
+    }
+    if (cliArgs.containsKey("scheduler")) {
+      this.schedulerType = SchedulerOption.valueOf(cliArgs.getProperty("scheduler"));
+      this.setByUser.add(TargetProperty.SCHEDULER);
+    }
+    if (cliArgs.containsKey("target-flags")) {
+      this.compilerFlags.clear();
+      if (!cliArgs.getProperty("target-flags").isEmpty()) {
+        this.compilerFlags.addAll(List.of(cliArgs.getProperty("target-flags").split(" ")));
+      }
+    }
+    if (cliArgs.containsKey("runtime-version")) {
+      this.runtimeVersion = cliArgs.getProperty("runtime-version");
+    }
+    if (cliArgs.containsKey("external-runtime-path")) {
+      this.externalRuntimePath = cliArgs.getProperty("external-runtime-path");
+    }
+    if (cliArgs.containsKey(TargetProperty.KEEPALIVE.description)) {
+      this.keepalive =
+          Boolean.parseBoolean(cliArgs.getProperty(TargetProperty.KEEPALIVE.description));
     }
+    if (cliArgs.containsKey(BuildParm.PRINT_STATISTICS.getKey())) {
+      this.printStatistics = true;
+    }
+  }
 
-    /**
-     * Keep track of every target property that is explicitly set by the user.
-     */
-    public Set<TargetProperty> setByUser = new HashSet<>();
+  /** Keep track of every target property that is explicitly set by the user. */
+  public Set<TargetProperty> setByUser = new HashSet<>();
 
-    /**
-     * A list of custom build commands that replace the default build process of
-     * directly invoking a designated compiler. A common usage of this target
-     * property is to set the command to build on the basis of a Makefile.
-     */
-    public List<String> buildCommands = new ArrayList<>();
+  /**
+   * A list of custom build commands that replace the default build process of directly invoking a
+   * designated compiler. A common usage of this target property is to set the command to build on
+   * the basis of a Makefile.
+   */
+  public List<String> buildCommands = new ArrayList<>();
 
-    /**
-     * The mode of clock synchronization to be used in federated programs.
-     * The default is 'initial'.
-     */
-    public ClockSyncMode clockSync = ClockSyncMode.INIT;
+  /**
+   * The mode of clock synchronization to be used in federated programs. The default is 'initial'.
+   */
+  public ClockSyncMode clockSync = ClockSyncMode.INIT;
 
-    /**
-     * Clock sync options.
-     */
-    public ClockSyncOptions clockSyncOptions = new ClockSyncOptions();
+  /** Clock sync options. */
+  public ClockSyncOptions clockSyncOptions = new ClockSyncOptions();
 
-    /**
-     * Parameter passed to cmake. The default is 'Release'.
-     */
-    public BuildType cmakeBuildType = BuildType.RELEASE;
+  /** Parameter passed to cmake. The default is 'Release'. */
+  public BuildType cmakeBuildType = BuildType.RELEASE;
 
-    /**
-     * Optional additional extensions to include in the generated CMakeLists.txt.
-     */
-    public List<String> cmakeIncludes = new ArrayList<>();
+  /** Optional additional extensions to include in the generated CMakeLists.txt. */
+  public List<String> cmakeIncludes = new ArrayList<>();
 
-    /**
-     * The compiler to invoke, unless a build command has been specified.
-     */
-    public String compiler = "";
+  /** The compiler to invoke, unless a build command has been specified. */
+  public String compiler = "";
 
-    /**
-     * Additional sources to add to the compile command if appropriate.
-     */
-    public List<String> compileAdditionalSources = new ArrayList<>();
+  /** Additional sources to add to the compile command if appropriate. */
+  public List<String> compileAdditionalSources = new ArrayList<>();
 
-    /**
-     * Additional (preprocessor) definitions to add to the compile command if appropriate.
-     *
-     * The first string is the definition itself, and the second string is the value to attribute to that definition, if any.
-     * The second value could be left empty.
-     */
-    public Map<String, String> compileDefinitions = new HashMap<>();
+  /**
+   * Additional (preprocessor) definitions to add to the compile command if appropriate.
+   *
+   * <p>The first string is the definition itself, and the second string is the value to attribute
+   * to that definition, if any. The second value could be left empty.
+   */
+  public Map<String, String> compileDefinitions = new HashMap<>();
 
-    /**
-     * Additional libraries to add to the compile command using the "-l" command-line option.
-     */
-    public List<String> compileLibraries = new ArrayList<>();
+  /** Additional libraries to add to the compile command using the "-l" command-line option. */
+  public List<String> compileLibraries = new ArrayList<>();
 
-    /**
-     * Flags to pass to the compiler, unless a build command has been specified.
-     */
-    public List<String> compilerFlags = new ArrayList<>();
+  /** Flags to pass to the compiler, unless a build command has been specified. */
+  public List<String> compilerFlags = new ArrayList<>();
 
-    /**
-     * The type of coordination used during the execution of a federated program.
-     * The default is 'centralized'.
-     */
-    public CoordinationType coordination = CoordinationType.CENTRALIZED;
+  /**
+   * The type of coordination used during the execution of a federated program. The default is
+   * 'centralized'.
+   */
+  public CoordinationType coordination = CoordinationType.CENTRALIZED;
+
+  /** Docker options. */
+  public DockerOptions dockerOptions = null;
 
-    /**
-     * Docker options.
-     */
-    public DockerOptions dockerOptions = null;
+  /** Coordination options. */
+  public CoordinationOptions coordinationOptions = new CoordinationOptions();
 
-    /**
-     * Coordination options.
-     */
-    public CoordinationOptions coordinationOptions = new CoordinationOptions();
+  /** Link to an external runtime library instead of the default one. */
+  public String externalRuntimePath = null;
 
-    /**
-     * Link to an external runtime library instead of the default one.
-     */
-    public String externalRuntimePath = null;
+  /**
+   * If true, configure the execution environment such that it does not wait for physical time to
+   * match logical time. The default is false.
+   */
+  public boolean fastMode = false;
 
-    /**
-     * If true, configure the execution environment such that it does not
-     * wait for physical time to match logical time. The default is false.
-     */
-    public boolean fastMode = false;
+  /** List of files to be copied to src-gen. */
+  public List<String> files = new ArrayList<>();
 
-    /**
-     * List of files to be copied to src-gen.
-     */
-    public List<String> files = new ArrayList<>();
+  /**
+   * If true, configure the execution environment to keep executing if there are no more events on
+   * the event queue. The default is false.
+   */
+  public boolean keepalive = false;
 
-    /**
-     * If true, configure the execution environment to keep executing if there
-     * are no more events on the event queue. The default is false.
-     */
-    public boolean keepalive = false;
+  /** The level of logging during execution. The default is INFO. */
+  public LogLevel logLevel = LogLevel.INFO;
 
-    /**
-     * The level of logging during execution. The default is INFO.
-     */
-    public LogLevel logLevel = LogLevel.INFO;
+  /** Flags to pass to the linker, unless a build command has been specified. */
+  public String linkerFlags = "";
 
-    /**
-     * Flags to pass to the linker, unless a build command has been specified.
-     */
-    public String linkerFlags = "";
+  /** If true, do not invoke the target compiler or build command. The default is false. */
+  public boolean noCompile = false;
 
-    /**
-     * If true, do not invoke the target compiler or build command.
-     * The default is false.
-     */
-    public boolean noCompile = false;
+  /** If true, do not perform runtime validation. The default is false. */
+  public boolean noRuntimeValidation = false;
 
-    /**
-     * If true, do not perform runtime validation. The default is false.
-     */
-    public boolean noRuntimeValidation = false;
+  /**
+   * Set the target platform config. This tells the build system what platform-specific support
+   * files it needs to incorporate at compile time.
+   *
+   * <p>This is now a wrapped class to account for overloaded definitions of defining platform
+   * (either a string or dictionary of values)
+   */
+  public PlatformOptions platformOptions = new PlatformOptions();
 
-    /**
-     * Set the target platform config.
-     * This tells the build system what platform-specific support
-     * files it needs to incorporate at compile time.
-     * 
-     * This is now a wrapped class to account for overloaded definitions 
-     * of defining platform (either a string or dictionary of values)
-     */
-    public PlatformOptions platformOptions = new PlatformOptions();
+  /** If true, instruct the runtime to collect and print execution statistics. */
+  public boolean printStatistics = false;
 
-    /**
-     * If true, instruct the runtime to collect and print execution statistics.
-     */
-    public boolean printStatistics = false;
+  /** List of proto files to be processed by the code generator. */
+  public List<String> protoFiles = new ArrayList<>();
 
-    /**
-     * List of proto files to be processed by the code generator.
-     */
-    public List<String> protoFiles = new ArrayList<>();
+  /** If true, generate ROS2 specific code. */
+  public boolean ros2 = false;
 
-    /**
-     * If true, generate ROS2 specific code.
-     */
-    public boolean ros2 = false;
+  /** Additional ROS2 packages that the LF program depends on. */
+  public List<String> ros2Dependencies = null;
 
-    /**
-     * Additional ROS2 packages that the LF program depends on.
-     */
-    public List<String> ros2Dependencies = null;
+  /** The version of the runtime library to be used in the generated target. */
+  public String runtimeVersion = null;
 
-    /**
-     * The version of the runtime library to be used in the generated target.
-     */
-    public String runtimeVersion = null;
+  /** Whether all reactors are to be generated into a single target language file. */
+  public boolean singleFileProject = false;
+
+  /** What runtime scheduler to use. */
+  public SchedulerOption schedulerType = SchedulerOption.getDefault();
+
+  /**
+   * The number of worker threads to deploy. The default is zero, which indicates that the runtime
+   * is allowed to freely choose the number of workers.
+   */
+  public int workers = 0;
+
+  /** Indicate whether HMAC authentication is used. */
+  public boolean auth = false;
+
+  /** Indicate whether the runtime should use multithreaded execution. */
+  public boolean threading = true;
+
+  /** The timeout to be observed during execution of the program. */
+  public TimeValue timeout;
+
+  /** If non-null, configure the runtime environment to perform tracing. The default is null. */
+  public TracingOptions tracing = null;
+
+  /**
+   * If true, the resulting binary will output a graph visualizing all reaction dependencies.
+   *
+   * <p>This option is currently only used for C++ and Rust. This export function is a valuable tool
+   * for debugging LF programs and helps to understand the dependencies inferred by the runtime.
+   */
+  public boolean exportDependencyGraph = false;
 
-    /** Whether all reactors are to be generated into a single target language file. */
-    public boolean singleFileProject = false;
+  /**
+   * If true, the resulting binary will output a yaml file describing the whole reactor structure of
+   * the program.
+   *
+   * <p>This option is currently only used for C++. This export function is a valuable tool for
+   * debugging LF programs and performing external analysis.
+   */
+  public boolean exportToYaml = false;
 
-    /** What runtime scheduler to use. */
-    public SchedulerOption schedulerType = SchedulerOption.getDefault();
+  /** Rust-specific configuration. */
+  public final RustTargetConfig rust =
+      new RustTargetConfig(); // FIXME: https://issue.lf-lang.org/1558
+
+  /** Path to a C file used by the Python target to setup federated execution. */
+  public String fedSetupPreamble = null; // FIXME: https://issue.lf-lang.org/1558
+
+  /** Settings related to clock synchronization. */
+  public static class ClockSyncOptions {
 
     /**
-     * The number of worker threads to deploy. The default is zero, which indicates that
-     * the runtime is allowed to freely choose the number of workers.
+     * Dampen the adjustments to the clock synchronization offset by this rate. The default is 10.
      */
-    public int workers = 0;
+    public int attenuation = 10;
 
     /**
-     * Indicate whether HMAC authentication is used.
+     * Whether to collect statistics while performing clock synchronization. This setting is only
+     * considered when clock synchronization has been activated. The default is true.
      */
-    public boolean auth = false;
+    public boolean collectStats = true;
+
+    /** Enable clock synchronization for federates on the same machine. Default is false. */
+    public boolean localFederatesOn = false;
 
     /**
-     * Indicate whether the runtime should use multithreaded execution.
+     * Interval at which clock synchronization is initiated by the RTI (will be passed to it as an
+     * argument on the command-line). The default is 5 milliseconds.
      */
-    public boolean threading = true;
+    public TimeValue period = new TimeValue(5, TimeUnit.MILLI);
 
     /**
-     * The timeout to be observed during execution of the program.
+     * Indicate the number of exchanges to be had per each clock synchronization round. See
+     * /lib/core/federated/clock-sync.h for more details. The default is 10.
      */
-    public TimeValue timeout;
+    public int trials = 10;
 
     /**
-     * If non-null, configure the runtime environment to perform tracing.
-     * The default is null.
+     * Used to create an artificial clock synchronization error for the purpose of testing. The
+     * default is null.
      */
-    public TracingOptions tracing = null;
+    public TimeValue testOffset;
+  }
 
+  /** Settings related to coordination of federated execution. */
+  public static class CoordinationOptions {
 
     /**
-     * If true, the resulting binary will output a graph visualizing all reaction dependencies.
-     *
-     * This option is currently only used for C++ and Rust. This export function is a valuable tool
-     * for debugging LF programs and helps to understand the dependencies inferred by the runtime.
+     * For centralized coordination, if a federate has a physical action that can trigger an output,
+     * directly or indirectly, then it will send NET (next event tag) messages to the RTI
+     * periodically as its physical clock advances. This option sets the amount of time to wait
+     * between sending such messages. Increasing this value results in downstream federates that lag
+     * further behind physical time (if the "after" delays are insufficient). The default is null,
+     * which means it is up the implementation to choose an interval.
      */
-    public boolean exportDependencyGraph = false;
-
+    public TimeValue advance_message_interval = null;
+  }
 
+  /** Settings related to Docker options. */
+  public static class DockerOptions {
     /**
-     * If true, the resulting binary will output a yaml file describing the whole reactor structure
-     * of the program.
-     *
-     * This option is currently only used for C++. This export function is a valuable tool for debugging
-     * LF programs and performing external analysis.
+     * The base image and tag from which to build the Docker image. The default is "alpine:latest".
      */
-    public boolean exportToYaml = false;
+    public String from = "alpine:latest";
 
-    /** Rust-specific configuration. */
-    public final RustTargetConfig rust = new RustTargetConfig(); // FIXME: https://issue.lf-lang.org/1558
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      DockerOptions that = (DockerOptions) o;
+      return from.equals(that.from);
+    }
+  }
 
-    /** Path to a C file used by the Python target to setup federated execution. */
-    public String fedSetupPreamble = null; // FIXME: https://issue.lf-lang.org/1558
+  /** Settings related to Platform Options. */
+  public static class PlatformOptions {
 
     /**
-     * Settings related to clock synchronization.
+     * The base platform we build our LF Files on. Should be set to AUTO by default unless
+     * developing for specific OS/Embedded Platform
      */
-    public static class ClockSyncOptions {
-
-        /**
-         * Dampen the adjustments to the clock synchronization offset by this rate.
-         * The default is 10.
-         */
-        public int attenuation = 10;
-
-        /**
-         * Whether to collect statistics while performing clock synchronization.
-         * This setting is only considered when clock synchronization has been activated.
-         * The default is true.
-         */
-        public boolean collectStats = true;
-
-        /**
-         * Enable clock synchronization for federates on the same machine.
-         * Default is false.
-         */
-        public boolean localFederatesOn = false;
-
-
-        /**
-         * Interval at which clock synchronization is initiated by the RTI (will be passed
-         * to it as an argument on the command-line).
-         * The default is 5 milliseconds.
-         */
-        public TimeValue period = new TimeValue(5, TimeUnit.MILLI);
-
-        /**
-         * Indicate the number of exchanges to be had per each clock synchronization round.
-         * See /lib/core/federated/clock-sync.h for more details.
-         * The default is 10.
-         */
-        public int trials = 10;
-
-        /**
-         * Used to create an artificial clock synchronization error for the purpose of testing.
-         * The default is null.
-         */
-        public TimeValue testOffset;
-    }
+    public Platform platform = Platform.AUTO;
 
     /**
-     * Settings related to coordination of federated execution.
+     * The string value used to determine what type of embedded board we work with and can be used
+     * to simplify the build process. For example, when we want to flash to an Arduino Nano 33 BLE
+     * board, we can use the string arduino:mbed_nano:nano33ble
      */
-    public static class CoordinationOptions {
-
-        /**
-         * For centralized coordination, if a federate has a physical action that can trigger
-         * an output, directly or indirectly, then it will send NET (next event tag) messages
-         * to the RTI periodically as its physical clock advances. This option sets the amount
-         * of time to wait between sending such messages. Increasing this value results in
-         * downstream federates that lag further behind physical time (if the "after" delays
-         * are insufficient).
-         * The default is null, which means it is up the implementation to choose an interval.
-         */
-        public TimeValue advance_message_interval = null;
-    }
+    public String board = null;
 
     /**
-     * Settings related to Docker options.
+     * The string value used to determine the port on which to flash the compiled program (i.e.
+     * /dev/cu.usbmodem21301)
      */
-    public static class DockerOptions {
-        /**
-         * The base image and tag from which to build the Docker image. The default is "alpine:latest".
-         */
-        public String from = "alpine:latest";
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            DockerOptions that = (DockerOptions) o;
-            return from.equals(that.from);
-        }
-    }
+    public String port = null;
+
+    /**
+     * The baud rate used as a parameter to certain embedded platforms. 9600 is a standard rate
+     * amongst systems like Arduino, so it's the default value.
+     */
+    public int baudRate = 9600;
 
     /**
-     * Settings related to Platform Options.
+     * The boolean statement used to determine whether we should automatically attempt to flash once
+     * we compile. This may require the use of board and port values depending on the infrastructure
+     * you use to flash the boards.
      */
-    public static class PlatformOptions {
-        
-        /**
-         * The base platform we build our LF Files on. Should be set to AUTO by default unless developing for specific OS/Embedded Platform
-         */
-        public Platform platform = Platform.AUTO;
-
-        /**
-         * The string value used to determine what type of embedded board we work with and can be used to simplify the build process. For example,
-         * when we want to flash to an Arduino Nano 33 BLE board, we can use the string arduino:mbed_nano:nano33ble
-         */
-        public String board = null;
-
-
-        /**
-         * The string value used to determine the port on which to flash the compiled program (i.e. /dev/cu.usbmodem21301)
-         */
-        public String port = null;
-
-        /**
-         * The baud rate used as a parameter to certain embedded platforms. 9600 is a standard rate amongst systems like Arduino, so it's the default value.
-         */
-        public int baudRate = 9600;
-
-        /**
-         * The boolean statement used to determine whether we should automatically attempt to flash once we compile. This may require the use of board and
-         * port values depending on the infrastructure you use to flash the boards.
-         */
-        public boolean flash = false;
-    }   
+    public boolean flash = false;
+  }
 
+  /** Settings related to tracing options. */
+  public static class TracingOptions {
     /**
-     * Settings related to tracing options.
+     * The name to use as the root of the trace file produced. This defaults to the name of the .lf
+     * file.
      */
-    public static class TracingOptions {
-        /**
-         * The name to use as the root of the trace file produced.
-         * This defaults to the name of the .lf file.
-         */
-        public String traceFileName = null;
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            TracingOptions that = (TracingOptions) o;
-            return Objects.equals(traceFileName, that.traceFileName); // traceFileName may be null
-        }
+    public String traceFileName = null;
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      TracingOptions that = (TracingOptions) o;
+      return Objects.equals(traceFileName, that.traceFileName); // traceFileName may be null
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/TargetProperty.java b/org.lflang/src/org/lflang/TargetProperty.java
index fe5c7dd0b2..b3abf815a3 100644
--- a/org.lflang/src/org/lflang/TargetProperty.java
+++ b/org.lflang/src/org/lflang/TargetProperty.java
@@ -1,30 +1,31 @@
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang;
 
+import com.google.common.collect.ImmutableList;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -33,7 +34,6 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
 import org.eclipse.xtext.util.RuntimeIOException;
 import org.lflang.TargetConfig.DockerOptions;
 import org.lflang.TargetConfig.PlatformOptions;
@@ -52,1819 +52,1761 @@
 import org.lflang.util.StringUtil;
 import org.lflang.validation.LFValidator;
 
-import com.google.common.collect.ImmutableList;
-
 /**
- * A target properties along with a type and a list of supporting targets
- * that supports it, as well as a function for configuration updates.
+ * A target properties along with a type and a list of supporting targets that supports it, as well
+ * as a function for configuration updates.
  *
  * @author Marten Lohstroh
  */
 public enum TargetProperty {
-    /**
-     * Directive to allow including OpenSSL libraries and process HMAC authentication.
-     */
-    AUTH("auth", PrimitiveType.BOOLEAN,
-            Arrays.asList(Target.C, Target.CCPP),
-         (config) -> ASTUtils.toElement(config.auth),
-         (config, value, err) -> {
-                config.auth = ASTUtils.toBoolean(value);
-            }),
-    /**
-     * Directive to let the generator use the custom build command.
-     */
-    BUILD("build", UnionType.STRING_OR_STRING_ARRAY,
-            Arrays.asList(Target.C, Target.CCPP),
-            (config) -> ASTUtils.toElement(config.buildCommands),
-            (config, value, err) -> {
-                config.buildCommands = ASTUtils.elementToListOfStrings(value);
-            }),
-
-    /**
-     * Directive to specify the target build type such as 'Release' or 'Debug'.
-     * This is also used in the Rust target to select a Cargo profile.
-     */
-    BUILD_TYPE("build-type", UnionType.BUILD_TYPE_UNION,
-            Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Rust),
-            (config) -> ASTUtils.toElement(config.cmakeBuildType.toString()),
-            (config, value, err) -> {
-                config.cmakeBuildType = (BuildType) UnionType.BUILD_TYPE_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-                // set it there too, because the default is different.
-                config.rust.setBuildType(config.cmakeBuildType);
-            }),
-
-    /**
-     * Directive to let the federate execution handle clock synchronization in software.
-     */
-    CLOCK_SYNC("clock-sync", UnionType.CLOCK_SYNC_UNION,
-               Arrays.asList(Target.C, Target.CCPP, Target.Python),
-               (config) -> ASTUtils.toElement(config.clockSync.toString()),
-               (config, value, err) -> {
-                    config.clockSync = (ClockSyncMode) UnionType.CLOCK_SYNC_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-               }),
-    /**
-     * Key-value pairs giving options for clock synchronization.
-     */
-    CLOCK_SYNC_OPTIONS("clock-sync-options",
-            DictionaryType.CLOCK_SYNC_OPTION_DICT, Arrays.asList(Target.C, Target.CCPP, Target.Python),
-            (config) -> {
-                Element e = LfFactory.eINSTANCE.createElement();
-                KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                for (ClockSyncOption opt : ClockSyncOption.values()) {
-                    KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                    pair.setName(opt.toString());
-                    switch (opt) {
-                        case ATTENUATION:
-                            pair.setValue(ASTUtils.toElement(config.clockSyncOptions.attenuation));
-                            break;
-                        case COLLECT_STATS:
-                            pair.setValue(ASTUtils.toElement(config.clockSyncOptions.collectStats));
-                            break;
-                        case LOCAL_FEDERATES_ON:
-                            pair.setValue(ASTUtils.toElement(config.clockSyncOptions.localFederatesOn));
-                            break;
-                        case PERIOD:
-                            if (config.clockSyncOptions.period == null) continue; // don't set if null
-                            pair.setValue(ASTUtils.toElement(config.clockSyncOptions.period));
-                            break;
-                        case TEST_OFFSET:
-                            if (config.clockSyncOptions.testOffset == null) continue; // don't set if null
-                            pair.setValue(ASTUtils.toElement(config.clockSyncOptions.testOffset));
-                            break;
-                        case TRIALS:
-                            pair.setValue(ASTUtils.toElement(config.clockSyncOptions.trials));
-                            break;
-                    }
-                    kvp.getPairs().add(pair);
-                }
-                e.setKeyvalue(kvp);
-                // kvp will never be empty
-                return e;
-            },
-            (config, value, err) -> {
-                for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                    ClockSyncOption option = (ClockSyncOption) DictionaryType.CLOCK_SYNC_OPTION_DICT
-                            .forName(entry.getName());
-                    switch (option) {
-                        case ATTENUATION:
-                            config.clockSyncOptions.attenuation = ASTUtils
-                                    .toInteger(entry.getValue());
-                            break;
-                        case COLLECT_STATS:
-                            config.clockSyncOptions.collectStats = ASTUtils
-                                    .toBoolean(entry.getValue());
-                            break;
-                        case LOCAL_FEDERATES_ON:
-                            config.clockSyncOptions.localFederatesOn = ASTUtils
-                                    .toBoolean(entry.getValue());
-                            break;
-                        case PERIOD:
-                            config.clockSyncOptions.period = ASTUtils
-                                    .toTimeValue(entry.getValue());
-                            break;
-                        case TEST_OFFSET:
-                            config.clockSyncOptions.testOffset = ASTUtils
-                                    .toTimeValue(entry.getValue());
-                            break;
-                        case TRIALS:
-                            config.clockSyncOptions.trials = ASTUtils
-                                    .toInteger(entry.getValue());
-                            break;
-                        default:
-                            break;
-                    }
-                }
-            }),
-
-    /**
-     * Directive to specify a cmake to be included by the generated build
-     * systems.
-     *
-     * This gives full control over the C/C++ build as any cmake parameters
-     * can be adjusted in the included file.
-     */
-    CMAKE_INCLUDE("cmake-include", UnionType.FILE_OR_FILE_ARRAY,
-            Arrays.asList(Target.CPP, Target.C, Target.CCPP),
-            (config) -> ASTUtils.toElement(config.cmakeIncludes),
-            (config, value, err) -> {
-                config.cmakeIncludes = ASTUtils.elementToListOfStrings(value);
-            },
-            // FIXME: This merging of lists is potentially dangerous since
-            // the incoming list of cmake-includes can belong to a .lf file that is
-            // located in a different location, and keeping just filename
-            // strings like this without absolute paths is incorrect.
-            (config, value, err) -> {
-                config.cmakeIncludes.addAll(ASTUtils.elementToListOfStrings(value));
-            }),
-    /**
-     * Directive to specify the target compiler.
-     */
-    COMPILER("compiler", PrimitiveType.STRING, Target.ALL,
-            (config) -> ASTUtils.toElement(config.compiler),
-            (config, value, err) -> {
-                config.compiler = ASTUtils.elementToSingleString(value);
-            }),
-
-    /**
-     * Directive to specify compile-time definitions.
-     */
-    COMPILE_DEFINITIONS("compile-definitions", StringDictionaryType.COMPILE_DEFINITION,
-            Arrays.asList(Target.C, Target.CCPP, Target.Python),
-            (config) -> ASTUtils.toElement(config.compileDefinitions),
-            (config, value, err) -> {
-                config.compileDefinitions = ASTUtils.elementToStringMaps(value);
-            }),
-
-    /**
-     * Directive to generate a Dockerfile. This is either a boolean,
-     * true or false, or a dictionary of options.
-     */
-    DOCKER("docker", UnionType.DOCKER_UNION,
-            Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS),
-            (config) -> {
-                if (config.dockerOptions == null) {
-                    return null;
-                } else if(config.dockerOptions.equals(new DockerOptions())) {
-                    // default configuration
-                    return ASTUtils.toElement(true);
-                } else {
-                    Element e = LfFactory.eINSTANCE.createElement();
-                    KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                    for (DockerOption opt : DockerOption.values()) {
-                        KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                        pair.setName(opt.toString());
-                        switch (opt) {
-                            case FROM:
-                                if (config.dockerOptions.from == null) continue;
-                                pair.setValue(ASTUtils.toElement(config.dockerOptions.from));
-                                break;
-                        }
-                        kvp.getPairs().add(pair);
-                    }
-                    e.setKeyvalue(kvp);
-                    if (kvp.getPairs().isEmpty()) return null;
-                    return e;
-                }
-            },
-            (config, value, err) -> setDockerProperty(config, value),
-            (config, value, err) -> setDockerProperty(config, value)),
-
-    /**
-     * Directive for specifying a path to an external runtime to be used for the
-     * compiled binary.
-     */
-    EXTERNAL_RUNTIME_PATH("external-runtime-path", PrimitiveType.STRING,
-            List.of(Target.CPP),
-            (config) -> ASTUtils.toElement(config.externalRuntimePath),
-            (config, value, err) -> {
-                config.externalRuntimePath = ASTUtils.elementToSingleString(value);
-            }),
-
-    /**
-     * Directive to let the execution engine allow logical time to elapse
-     * faster than physical time.
-     */
-    FAST("fast", PrimitiveType.BOOLEAN, Target.ALL,
-            (config) -> ASTUtils.toElement(config.fastMode),
-            (config, value, err) -> {
-                config.fastMode = ASTUtils.toBoolean(value);
-            }),
-
-    /**
-     * Directive to stage particular files on the class path to be
-     * processed by the code generator.
-     */
-    FILES("files", UnionType.FILE_OR_FILE_ARRAY, List.of(Target.C, Target.CCPP, Target.Python),
-            (config) -> ASTUtils.toElement(config.files),
-            (config, value, err) -> {
-                config.files = ASTUtils.elementToListOfStrings(value);
-            },
-            // FIXME: This merging of lists is potentially dangerous since
-            // the incoming list of files can belong to a .lf file that is
-            // located in a different location, and keeping just filename
-            // strings like this without absolute paths is incorrect.
-            (config, value, err) -> {
-                config.files.addAll(ASTUtils.elementToListOfStrings(value));
-            }),
-
-    /**
-     * Flags to be passed on to the target compiler.
-     */
-    FLAGS("flags", UnionType.STRING_OR_STRING_ARRAY,
-            Arrays.asList(Target.C, Target.CCPP),
-            (config) -> ASTUtils.toElement(config.compilerFlags),
-            (config, value, err) -> {
-                config.compilerFlags = ASTUtils.elementToListOfStrings(value);
-            }),
-
-    /**
-     * Directive to specify the coordination mode
-     */
-    COORDINATION("coordination", UnionType.COORDINATION_UNION,
-            Arrays.asList(Target.C, Target.CCPP, Target.Python),
-            (config) -> ASTUtils.toElement(config.coordination.toString()),
-            (config, value, err) -> {
-                config.coordination = (CoordinationType) UnionType.COORDINATION_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-            },
-            (config, value, err) -> {
-                config.coordination = (CoordinationType) UnionType.COORDINATION_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-            }),
-
-    /**
-     * Key-value pairs giving options for clock synchronization.
-     */
-    COORDINATION_OPTIONS("coordination-options",
-            DictionaryType.COORDINATION_OPTION_DICT, Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS),
-            (config) -> {
-                Element e = LfFactory.eINSTANCE.createElement();
-                KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                for (CoordinationOption opt : CoordinationOption.values()) {
-                    KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                    pair.setName(opt.toString());
-                    switch (opt) {
-                        case ADVANCE_MESSAGE_INTERVAL:
-                            if (config.coordinationOptions.advance_message_interval == null) continue;
-                            pair.setValue(ASTUtils.toElement(config.coordinationOptions.advance_message_interval));
-                            break;
-                    }
-                    kvp.getPairs().add(pair);
-                }
-                e.setKeyvalue(kvp);
-                if (kvp.getPairs().isEmpty()) return null;
-                return e;
-            },
-            (config, value, err) -> {
-                for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                    CoordinationOption option = (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT
-                            .forName(entry.getName());
-                    switch (option) {
-                        case ADVANCE_MESSAGE_INTERVAL:
-                            config.coordinationOptions.advance_message_interval = ASTUtils
-                                    .toTimeValue(entry.getValue());
-                            break;
-                        default:
-                            break;
-                    }
-                }
-            },
-            (config, value, err) -> {
-             for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                 CoordinationOption option = (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT
-                     .forName(entry.getName());
-                 switch (option) {
-                 case ADVANCE_MESSAGE_INTERVAL:
-                     config.coordinationOptions.advance_message_interval = ASTUtils
-                         .toTimeValue(entry.getValue());
-                     break;
-                 default:
-                     break;
-                 }
-             }
-            }),
-
-    /**
-     * Directive to let the execution engine remain active also if there
-     * are no more events in the event queue.
-     */
-    KEEPALIVE("keepalive", PrimitiveType.BOOLEAN, Target.ALL,
-            (config) -> ASTUtils.toElement(config.keepalive),
-            (config, value, err) -> {
-                config.keepalive = ASTUtils.toBoolean(value);
-            }),
-
-    /**
-     * Directive to specify the grain at which to report log messages during execution.
-     */
-    LOGGING("logging", UnionType.LOGGING_UNION, Target.ALL,
-            (config) -> ASTUtils.toElement(config.logLevel.toString()),
-            (config, value, err) -> {
-                config.logLevel = (LogLevel) UnionType.LOGGING_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-            }),
-
-    /**
-     * Directive to not invoke the target compiler.
-     */
-    NO_COMPILE("no-compile", PrimitiveType.BOOLEAN,
-            Arrays.asList(Target.C, Target.CPP, Target.CCPP, Target.Python),
-            (config) -> ASTUtils.toElement(config.noCompile),
-            (config, value, err) -> {
-                config.noCompile = ASTUtils.toBoolean(value);
-            }),
-
-    /**
-     * Directive to disable validation of reactor rules at runtime.
-     */
-    NO_RUNTIME_VALIDATION("no-runtime-validation", PrimitiveType.BOOLEAN,
-            Arrays.asList(Target.CPP),
-            (config) -> ASTUtils.toElement(config.noRuntimeValidation),
-            (config, value, err) -> {
-                config.noRuntimeValidation = ASTUtils.toBoolean(value);
-            }),
-
-    /**
-     * Directive to specify the platform for cross code generation. This is either a string of the platform
-     * or a dictionary of options that includes the string name.
-     */
-    PLATFORM("platform", UnionType.PLATFORM_STRING_OR_DICTIONARY, Target.ALL,
-            (config) -> {
-                Element e = LfFactory.eINSTANCE.createElement();
-                KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                for (PlatformOption opt : PlatformOption.values()) {
-                    KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                    pair.setName(opt.toString());
-                    switch (opt) {
-                        case NAME:
-                            pair.setValue(ASTUtils.toElement(config.platformOptions.platform.toString()));
-                            break;
-                        case BAUDRATE:
-                            pair.setValue(ASTUtils.toElement(config.platformOptions.baudRate));
-                            break;
-                        case BOARD:
-                            pair.setValue(ASTUtils.toElement(config.platformOptions.board));
-                            break;
-                        case FLASH:
-                            pair.setValue(ASTUtils.toElement(config.platformOptions.flash));
-                            break;
-                        case PORT:
-                            pair.setValue(ASTUtils.toElement(config.platformOptions.port));
-                            break;
-                    }
-                    kvp.getPairs().add(pair);
-                }
-                e.setKeyvalue(kvp);
-                if (kvp.getPairs().isEmpty()) return null;
-                return e;
-            },
-            (config, value, err) -> {
-                if (value.getLiteral() != null) {
-                    config.platformOptions = new PlatformOptions();
-                    config.platformOptions.platform = (Platform) UnionType.PLATFORM_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-                } else {
-                    config.platformOptions= new PlatformOptions();
-                    for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                        PlatformOption option = (PlatformOption) DictionaryType.PLATFORM_DICT
-                                .forName(entry.getName());
-                        switch (option) {
-                            case NAME:
-                                Platform p = (Platform) UnionType.PLATFORM_UNION
-                                    .forName(ASTUtils.elementToSingleString(entry.getValue()));
-                                if(p == null) {
-                                    String s = "Unidentified Platform Type, LF supports the following platform types: " + Arrays.asList(Platform.values()).toString();
-                                    err.reportError(s);
-                                    throw new AssertionError(s);
-                                }
-                                config.platformOptions.platform = p;
-                                break;
-                            case BAUDRATE:
-                                config.platformOptions.baudRate = ASTUtils.toInteger(entry.getValue());
-                                break;
-                            case BOARD:
-                                config.platformOptions.board = ASTUtils.elementToSingleString(entry.getValue());
-                                break;
-                            case FLASH:
-                                config.platformOptions.flash = ASTUtils.toBoolean(entry.getValue());
-                                break;
-                            case PORT:
-                                config.platformOptions.port = ASTUtils.elementToSingleString(entry.getValue());
-                                break;
-                            default:
-                                break;
-                        }
-                    }
-                }
-            }),
-
-    /**
-     * Directive to instruct the runtime to collect and print execution statistics.
-     */
-    PRINT_STATISTICS("print-statistics", PrimitiveType.BOOLEAN,
-        Arrays.asList(Target.CPP),
-        (config) -> ASTUtils.toElement(config.printStatistics),
-        (config, value, err) -> {
-            config.printStatistics = ASTUtils.toBoolean(value);
-        }),
-
-    /**
-     * Directive for specifying .proto files that need to be compiled and their
-     * code included in the sources.
-     */
-    PROTOBUFS("protobufs", UnionType.FILE_OR_FILE_ARRAY,
-            Arrays.asList(Target.C, Target.CCPP, Target.TS, Target.Python),
-            (config) -> ASTUtils.toElement(config.protoFiles),
-            (config, value, err) -> {
-                config.protoFiles = ASTUtils.elementToListOfStrings(value);
-            }),
-
-
-    /**
-     * Directive to specify that ROS2 specific code is generated,
-     */
-    ROS2("ros2", PrimitiveType.BOOLEAN,
-         List.of(Target.CPP),
-         (config) -> ASTUtils.toElement(config.ros2),
-         (config, value, err) -> {
-             config.ros2 = ASTUtils.toBoolean(value);
-    }),
-
-    /**
-     * Directive to specify additional ROS2 packages that this LF program depends on.
-     */
-    ROS2_DEPENDENCIES("ros2-dependencies", ArrayType.STRING_ARRAY,
-        List.of(Target.CPP),
-                      (config) -> ASTUtils.toElement(config.ros2Dependencies),
-                      (config, value, err) -> {
-            config.ros2Dependencies = ASTUtils.elementToListOfStrings(value);
-    }),
-
-    /**
-     * Directive for specifying a specific version of the reactor runtime library.
-     */
-    RUNTIME_VERSION("runtime-version", PrimitiveType.STRING,
-            Arrays.asList(Target.CPP),
-            (config) -> ASTUtils.toElement(config.runtimeVersion),
-            (config, value, err) -> {
-                config.runtimeVersion = ASTUtils.elementToSingleString(value);
-            }),
-
-
-    /**
-     * Directive for specifying a specific runtime scheduler, if supported.
-     */
-    SCHEDULER("scheduler", UnionType.SCHEDULER_UNION,
-            Arrays.asList(Target.C, Target.CCPP, Target.Python),
-            (config) -> ASTUtils.toElement(config.schedulerType.toString()),
-            (config, value, err) -> {
-                config.schedulerType = (SchedulerOption) UnionType.SCHEDULER_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-            }),
-
-    /**
-     * Directive to specify that all code is generated in a single file.
-     */
-    SINGLE_FILE_PROJECT("single-file-project", PrimitiveType.BOOLEAN,
-            List.of(Target.Rust),
-            (config) -> ASTUtils.toElement(config.singleFileProject),
-            (config, value, err) -> {
-                config.singleFileProject = ASTUtils.toBoolean(value);
-            }),
-
-    /**
-     * Directive to indicate whether the runtime should use multi-threading.
-     */
-    THREADING("threading", PrimitiveType.BOOLEAN,
-              List.of(Target.C, Target.CCPP, Target.Python),
-              (config) -> ASTUtils.toElement(config.threading),
-              (config, value, err) -> {
-                  config.threading = ASTUtils.toBoolean(value);
-              }),
-
-    /**
-     * Directive to specify the number of worker threads used by the runtime.
-     */
-    WORKERS("workers", PrimitiveType.NON_NEGATIVE_INTEGER,
-            List.of(Target.C, Target.CCPP, Target.Python, Target.CPP, Target.Rust),
-            (config) -> ASTUtils.toElement(config.workers),
-            (config, value, err) -> {
-                config.workers = ASTUtils.toInteger(value);
-            }),
-
-    /**
-     * Directive to specify the execution timeout.
-     */
-    TIMEOUT("timeout", PrimitiveType.TIME_VALUE, Target.ALL,
-            (config) -> ASTUtils.toElement(config.timeout),
-            (config, value, err) -> {
-                config.timeout = ASTUtils.toTimeValue(value);
-            },
-            (config, value, err) -> {
-                config.timeout = ASTUtils.toTimeValue(value);
-            }),
-
-    /**
-     * Directive to enable tracing.
-     */
-    TRACING("tracing", UnionType.TRACING_UNION,
-            Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Python),
-            (config) -> {
-                if (config.tracing == null) {
-                    return null;
-                } else if (config.tracing.equals(new TracingOptions())) {
-                    // default values
-                    return ASTUtils.toElement(true);
-                } else {
-                    Element e = LfFactory.eINSTANCE.createElement();
-                    KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                    for (TracingOption opt : TracingOption.values()) {
-                        KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                        pair.setName(opt.toString());
-                        switch (opt) {
-                            case TRACE_FILE_NAME:
-                                 if (config.tracing.traceFileName == null) continue;
-                                 pair.setValue(ASTUtils.toElement(config.tracing.traceFileName));
-                        }
-                        kvp.getPairs().add(pair);
-                    }
-                    e.setKeyvalue(kvp);
-                    if (kvp.getPairs().isEmpty()) return null;
-                    return e;
-                }
-            },
-            (config, value, err) -> {
-                if (value.getLiteral() != null) {
-                    if (ASTUtils.toBoolean(value)) {
-                        config.tracing = new TracingOptions();
-                    } else {
-                        config.tracing = null;
-                    }
-                } else {
-                    config.tracing = new TracingOptions();
-                    for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                        TracingOption option = (TracingOption) DictionaryType.TRACING_DICT
-                            .forName(entry.getName());
-                        switch (option) {
-                        case TRACE_FILE_NAME:
-                            config.tracing.traceFileName = ASTUtils.elementToSingleString(entry.getValue());
-                            break;
-                        default:
-                            break;
-                        }
-                    }
-                }
-            }),
-
-    /**
-     * Directive to let the runtime export its internal dependency graph.
-     *
-     * This is a debugging feature and currently only used for C++ and Rust programs.
-     */
-    EXPORT_DEPENDENCY_GRAPH("export-dependency-graph", PrimitiveType.BOOLEAN,
-                           List.of(Target.CPP, Target.Rust),
-                           (config) -> ASTUtils.toElement(config.exportDependencyGraph),
-                           (config, value, err) -> {
-        config.exportDependencyGraph = ASTUtils.toBoolean(value);
-    }),
-
-    /**
-     * Directive to let the runtime export the program structure to a yaml file.
-     *
-     * This is a debugging feature and currently only used for C++ programs.
-     */
-    EXPORT_TO_YAML("export-to-yaml", PrimitiveType.BOOLEAN,
-                           List.of(Target.CPP),
-                           (config) -> ASTUtils.toElement(config.exportToYaml),
-                           (config, value, err) -> {
-                               config.exportToYaml = ASTUtils.toBoolean(value);
-                           }),
-
-    /**
-     * List of module files to link into the crate as top-level.
-     * For instance, a {@code target Rust { rust-modules: [ "foo.rs" ] }}
-     * will cause the file to be copied into the generated project,
-     * and the generated {@code main.rs} will include it with a {@code mod foo;}.
-     * If one of the paths is a directory, it must contain a {@code mod.rs}
-     * file, and all its contents are copied.
-     */
-    RUST_INCLUDE("rust-include",
-                 UnionType.FILE_OR_FILE_ARRAY,
-                 List.of(Target.Rust),
-                 (config) -> {
-                    // do not check paths here, and simply copy the absolute path over
-                    List<Path> paths = config.rust.getRustTopLevelModules();
-                    if (paths.isEmpty()) return null;
-                    else if (paths.size() == 1) {
-                        return ASTUtils.toElement(paths.get(0).toString());
-                    } else {
-                        Element e = LfFactory.eINSTANCE.createElement();
-                        Array arr = LfFactory.eINSTANCE.createArray();
-                        for (Path p : paths) {
-                            arr.getElements().add(ASTUtils.toElement(p.toString()));
-                        }
-                        e.setArray(arr);
-                        return e;
-                    }
-                 },
-                (config, value, err) -> {
-                    Path referencePath;
-                    try {
-                        referencePath = FileUtil.toPath(value.eResource().getURI()).toAbsolutePath();
-                    } catch (IOException e) {
-                        err.reportError(value, "Invalid path? " + e.getMessage());
-                        throw new RuntimeIOException(e);
-                    }
-
-                    // we'll resolve relative paths to check that the files
-                    // are as expected.
-
-                    if (value.getLiteral() != null) {
-                        Path resolved = referencePath.resolveSibling(StringUtil.removeQuotes(value.getLiteral()));
-
-                        config.rust.addAndCheckTopLevelModule(resolved, value, err);
-                    } else if (value.getArray() != null) {
-                        for (Element element : value.getArray().getElements()) {
-                            String literal = StringUtil.removeQuotes(element.getLiteral());
-                            Path resolved = referencePath.resolveSibling(literal);
-                            config.rust.addAndCheckTopLevelModule(resolved, element, err);
-                        }
-                    }
-                }),
-
-    /**
-     * Directive for specifying Cargo features of the generated
-     * program to enable.
-     */
-    CARGO_FEATURES("cargo-features", ArrayType.STRING_ARRAY,
-                   List.of(Target.Rust),
-                   (config) -> ASTUtils.toElement(config.rust.getCargoFeatures()),
-                   (config, value, err) -> {
-        config.rust.setCargoFeatures(ASTUtils.elementToListOfStrings(value));
-    }),
-
-    /**
-     * Dependency specifications for Cargo. This property looks like this:
-     * <pre>{@code
-     * cargo-dependencies: {
-     *    // Name-of-the-crate: "version"
-     *    rand: "0.8",
-     *    // Equivalent to using an explicit map:
-     *    rand: {
-     *      version: "0.8"
-     *    },
-     *    // The map allows specifying more details
-     *    rand: {
-     *      // A path to a local unpublished crate.
-     *      // Note 'path' is mutually exclusive with 'version'.
-     *      path: "/home/me/Git/local-rand-clone"
-     *    },
-     *    rand: {
-     *      version: "0.8",
-     *      // you can specify cargo features
-     *      features: ["some-cargo-feature",]
-     *    }
-     * }
-     * }</pre>
-     */
-    CARGO_DEPENDENCIES("cargo-dependencies",
-                       CargoDependenciesPropertyType.INSTANCE,
-                       List.of(Target.Rust),
-                       (config) -> {
-                            var deps = config.rust.getCargoDependencies();
-                            if (deps.size() == 0) return null;
-                            else {
-                                Element e = LfFactory.eINSTANCE.createElement();
-                                KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                                for (var ent : deps.entrySet()) {
-                                    KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                                    pair.setName(ent.getKey());
-                                    pair.setValue(CargoDependencySpec.extractSpec(ent.getValue()));
-                                    kvp.getPairs().add(pair);
-                                }
-                                e.setKeyvalue(kvp);
-                                return e;
-                            }
-                       },
-                       (config, value, err) -> {
-                            config.rust.setCargoDependencies(CargoDependencySpec.parseAll(value));
-    }),
-
-    /**
-     * Directs the C or Python target to include the associated C file used for
-     * setting up federated execution before processing the first tag.
-     */
-    FED_SETUP("_fed_setup", PrimitiveType.FILE,
-              Arrays.asList(Target.C, Target.CCPP, Target.Python),
-              (config) -> ASTUtils.toElement(config.fedSetupPreamble),
-              (config, value, err) ->
-                  config.fedSetupPreamble = StringUtil.removeQuotes(ASTUtils.elementToSingleString(value))
-    )
-    ;
-
-    /**
-     * Update {@code config}.dockerOptions based on value.
-     */
-    private static void setDockerProperty(TargetConfig config, Element value) {
-        if (value.getLiteral() != null) {
-            if (ASTUtils.toBoolean(value)) {
-                config.dockerOptions = new DockerOptions();
-            } else {
-                config.dockerOptions = null;
+  /** Directive to allow including OpenSSL libraries and process HMAC authentication. */
+  AUTH(
+      "auth",
+      PrimitiveType.BOOLEAN,
+      Arrays.asList(Target.C, Target.CCPP),
+      (config) -> ASTUtils.toElement(config.auth),
+      (config, value, err) -> {
+        config.auth = ASTUtils.toBoolean(value);
+      }),
+  /** Directive to let the generator use the custom build command. */
+  BUILD(
+      "build",
+      UnionType.STRING_OR_STRING_ARRAY,
+      Arrays.asList(Target.C, Target.CCPP),
+      (config) -> ASTUtils.toElement(config.buildCommands),
+      (config, value, err) -> {
+        config.buildCommands = ASTUtils.elementToListOfStrings(value);
+      }),
+
+  /**
+   * Directive to specify the target build type such as 'Release' or 'Debug'. This is also used in
+   * the Rust target to select a Cargo profile.
+   */
+  BUILD_TYPE(
+      "build-type",
+      UnionType.BUILD_TYPE_UNION,
+      Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Rust),
+      (config) -> ASTUtils.toElement(config.cmakeBuildType.toString()),
+      (config, value, err) -> {
+        config.cmakeBuildType =
+            (BuildType) UnionType.BUILD_TYPE_UNION.forName(ASTUtils.elementToSingleString(value));
+        // set it there too, because the default is different.
+        config.rust.setBuildType(config.cmakeBuildType);
+      }),
+
+  /** Directive to let the federate execution handle clock synchronization in software. */
+  CLOCK_SYNC(
+      "clock-sync",
+      UnionType.CLOCK_SYNC_UNION,
+      Arrays.asList(Target.C, Target.CCPP, Target.Python),
+      (config) -> ASTUtils.toElement(config.clockSync.toString()),
+      (config, value, err) -> {
+        config.clockSync =
+            (ClockSyncMode)
+                UnionType.CLOCK_SYNC_UNION.forName(ASTUtils.elementToSingleString(value));
+      }),
+  /** Key-value pairs giving options for clock synchronization. */
+  CLOCK_SYNC_OPTIONS(
+      "clock-sync-options",
+      DictionaryType.CLOCK_SYNC_OPTION_DICT,
+      Arrays.asList(Target.C, Target.CCPP, Target.Python),
+      (config) -> {
+        Element e = LfFactory.eINSTANCE.createElement();
+        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+        for (ClockSyncOption opt : ClockSyncOption.values()) {
+          KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+          pair.setName(opt.toString());
+          switch (opt) {
+            case ATTENUATION:
+              pair.setValue(ASTUtils.toElement(config.clockSyncOptions.attenuation));
+              break;
+            case COLLECT_STATS:
+              pair.setValue(ASTUtils.toElement(config.clockSyncOptions.collectStats));
+              break;
+            case LOCAL_FEDERATES_ON:
+              pair.setValue(ASTUtils.toElement(config.clockSyncOptions.localFederatesOn));
+              break;
+            case PERIOD:
+              if (config.clockSyncOptions.period == null) continue; // don't set if null
+              pair.setValue(ASTUtils.toElement(config.clockSyncOptions.period));
+              break;
+            case TEST_OFFSET:
+              if (config.clockSyncOptions.testOffset == null) continue; // don't set if null
+              pair.setValue(ASTUtils.toElement(config.clockSyncOptions.testOffset));
+              break;
+            case TRIALS:
+              pair.setValue(ASTUtils.toElement(config.clockSyncOptions.trials));
+              break;
+          }
+          kvp.getPairs().add(pair);
+        }
+        e.setKeyvalue(kvp);
+        // kvp will never be empty
+        return e;
+      },
+      (config, value, err) -> {
+        for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+          ClockSyncOption option =
+              (ClockSyncOption) DictionaryType.CLOCK_SYNC_OPTION_DICT.forName(entry.getName());
+          switch (option) {
+            case ATTENUATION:
+              config.clockSyncOptions.attenuation = ASTUtils.toInteger(entry.getValue());
+              break;
+            case COLLECT_STATS:
+              config.clockSyncOptions.collectStats = ASTUtils.toBoolean(entry.getValue());
+              break;
+            case LOCAL_FEDERATES_ON:
+              config.clockSyncOptions.localFederatesOn = ASTUtils.toBoolean(entry.getValue());
+              break;
+            case PERIOD:
+              config.clockSyncOptions.period = ASTUtils.toTimeValue(entry.getValue());
+              break;
+            case TEST_OFFSET:
+              config.clockSyncOptions.testOffset = ASTUtils.toTimeValue(entry.getValue());
+              break;
+            case TRIALS:
+              config.clockSyncOptions.trials = ASTUtils.toInteger(entry.getValue());
+              break;
+            default:
+              break;
+          }
+        }
+      }),
+
+  /**
+   * Directive to specify a cmake to be included by the generated build systems.
+   *
+   * <p>This gives full control over the C/C++ build as any cmake parameters can be adjusted in the
+   * included file.
+   */
+  CMAKE_INCLUDE(
+      "cmake-include",
+      UnionType.FILE_OR_FILE_ARRAY,
+      Arrays.asList(Target.CPP, Target.C, Target.CCPP),
+      (config) -> ASTUtils.toElement(config.cmakeIncludes),
+      (config, value, err) -> {
+        config.cmakeIncludes = ASTUtils.elementToListOfStrings(value);
+      },
+      // FIXME: This merging of lists is potentially dangerous since
+      // the incoming list of cmake-includes can belong to a .lf file that is
+      // located in a different location, and keeping just filename
+      // strings like this without absolute paths is incorrect.
+      (config, value, err) -> {
+        config.cmakeIncludes.addAll(ASTUtils.elementToListOfStrings(value));
+      }),
+  /** Directive to specify the target compiler. */
+  COMPILER(
+      "compiler",
+      PrimitiveType.STRING,
+      Target.ALL,
+      (config) -> ASTUtils.toElement(config.compiler),
+      (config, value, err) -> {
+        config.compiler = ASTUtils.elementToSingleString(value);
+      }),
+
+  /** Directive to specify compile-time definitions. */
+  COMPILE_DEFINITIONS(
+      "compile-definitions",
+      StringDictionaryType.COMPILE_DEFINITION,
+      Arrays.asList(Target.C, Target.CCPP, Target.Python),
+      (config) -> ASTUtils.toElement(config.compileDefinitions),
+      (config, value, err) -> {
+        config.compileDefinitions = ASTUtils.elementToStringMaps(value);
+      }),
+
+  /**
+   * Directive to generate a Dockerfile. This is either a boolean, true or false, or a dictionary of
+   * options.
+   */
+  DOCKER(
+      "docker",
+      UnionType.DOCKER_UNION,
+      Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS),
+      (config) -> {
+        if (config.dockerOptions == null) {
+          return null;
+        } else if (config.dockerOptions.equals(new DockerOptions())) {
+          // default configuration
+          return ASTUtils.toElement(true);
+        } else {
+          Element e = LfFactory.eINSTANCE.createElement();
+          KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+          for (DockerOption opt : DockerOption.values()) {
+            KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+            pair.setName(opt.toString());
+            switch (opt) {
+              case FROM:
+                if (config.dockerOptions.from == null) continue;
+                pair.setValue(ASTUtils.toElement(config.dockerOptions.from));
+                break;
             }
+            kvp.getPairs().add(pair);
+          }
+          e.setKeyvalue(kvp);
+          if (kvp.getPairs().isEmpty()) return null;
+          return e;
+        }
+      },
+      (config, value, err) -> setDockerProperty(config, value),
+      (config, value, err) -> setDockerProperty(config, value)),
+
+  /** Directive for specifying a path to an external runtime to be used for the compiled binary. */
+  EXTERNAL_RUNTIME_PATH(
+      "external-runtime-path",
+      PrimitiveType.STRING,
+      List.of(Target.CPP),
+      (config) -> ASTUtils.toElement(config.externalRuntimePath),
+      (config, value, err) -> {
+        config.externalRuntimePath = ASTUtils.elementToSingleString(value);
+      }),
+
+  /**
+   * Directive to let the execution engine allow logical time to elapse faster than physical time.
+   */
+  FAST(
+      "fast",
+      PrimitiveType.BOOLEAN,
+      Target.ALL,
+      (config) -> ASTUtils.toElement(config.fastMode),
+      (config, value, err) -> {
+        config.fastMode = ASTUtils.toBoolean(value);
+      }),
+
+  /**
+   * Directive to stage particular files on the class path to be processed by the code generator.
+   */
+  FILES(
+      "files",
+      UnionType.FILE_OR_FILE_ARRAY,
+      List.of(Target.C, Target.CCPP, Target.Python),
+      (config) -> ASTUtils.toElement(config.files),
+      (config, value, err) -> {
+        config.files = ASTUtils.elementToListOfStrings(value);
+      },
+      // FIXME: This merging of lists is potentially dangerous since
+      // the incoming list of files can belong to a .lf file that is
+      // located in a different location, and keeping just filename
+      // strings like this without absolute paths is incorrect.
+      (config, value, err) -> {
+        config.files.addAll(ASTUtils.elementToListOfStrings(value));
+      }),
+
+  /** Flags to be passed on to the target compiler. */
+  FLAGS(
+      "flags",
+      UnionType.STRING_OR_STRING_ARRAY,
+      Arrays.asList(Target.C, Target.CCPP),
+      (config) -> ASTUtils.toElement(config.compilerFlags),
+      (config, value, err) -> {
+        config.compilerFlags = ASTUtils.elementToListOfStrings(value);
+      }),
+
+  /** Directive to specify the coordination mode */
+  COORDINATION(
+      "coordination",
+      UnionType.COORDINATION_UNION,
+      Arrays.asList(Target.C, Target.CCPP, Target.Python),
+      (config) -> ASTUtils.toElement(config.coordination.toString()),
+      (config, value, err) -> {
+        config.coordination =
+            (CoordinationType)
+                UnionType.COORDINATION_UNION.forName(ASTUtils.elementToSingleString(value));
+      },
+      (config, value, err) -> {
+        config.coordination =
+            (CoordinationType)
+                UnionType.COORDINATION_UNION.forName(ASTUtils.elementToSingleString(value));
+      }),
+
+  /** Key-value pairs giving options for clock synchronization. */
+  COORDINATION_OPTIONS(
+      "coordination-options",
+      DictionaryType.COORDINATION_OPTION_DICT,
+      Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS),
+      (config) -> {
+        Element e = LfFactory.eINSTANCE.createElement();
+        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+        for (CoordinationOption opt : CoordinationOption.values()) {
+          KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+          pair.setName(opt.toString());
+          switch (opt) {
+            case ADVANCE_MESSAGE_INTERVAL:
+              if (config.coordinationOptions.advance_message_interval == null) continue;
+              pair.setValue(
+                  ASTUtils.toElement(config.coordinationOptions.advance_message_interval));
+              break;
+          }
+          kvp.getPairs().add(pair);
+        }
+        e.setKeyvalue(kvp);
+        if (kvp.getPairs().isEmpty()) return null;
+        return e;
+      },
+      (config, value, err) -> {
+        for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+          CoordinationOption option =
+              (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT.forName(entry.getName());
+          switch (option) {
+            case ADVANCE_MESSAGE_INTERVAL:
+              config.coordinationOptions.advance_message_interval =
+                  ASTUtils.toTimeValue(entry.getValue());
+              break;
+            default:
+              break;
+          }
+        }
+      },
+      (config, value, err) -> {
+        for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+          CoordinationOption option =
+              (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT.forName(entry.getName());
+          switch (option) {
+            case ADVANCE_MESSAGE_INTERVAL:
+              config.coordinationOptions.advance_message_interval =
+                  ASTUtils.toTimeValue(entry.getValue());
+              break;
+            default:
+              break;
+          }
+        }
+      }),
+
+  /**
+   * Directive to let the execution engine remain active also if there are no more events in the
+   * event queue.
+   */
+  KEEPALIVE(
+      "keepalive",
+      PrimitiveType.BOOLEAN,
+      Target.ALL,
+      (config) -> ASTUtils.toElement(config.keepalive),
+      (config, value, err) -> {
+        config.keepalive = ASTUtils.toBoolean(value);
+      }),
+
+  /** Directive to specify the grain at which to report log messages during execution. */
+  LOGGING(
+      "logging",
+      UnionType.LOGGING_UNION,
+      Target.ALL,
+      (config) -> ASTUtils.toElement(config.logLevel.toString()),
+      (config, value, err) -> {
+        config.logLevel =
+            (LogLevel) UnionType.LOGGING_UNION.forName(ASTUtils.elementToSingleString(value));
+      }),
+
+  /** Directive to not invoke the target compiler. */
+  NO_COMPILE(
+      "no-compile",
+      PrimitiveType.BOOLEAN,
+      Arrays.asList(Target.C, Target.CPP, Target.CCPP, Target.Python),
+      (config) -> ASTUtils.toElement(config.noCompile),
+      (config, value, err) -> {
+        config.noCompile = ASTUtils.toBoolean(value);
+      }),
+
+  /** Directive to disable validation of reactor rules at runtime. */
+  NO_RUNTIME_VALIDATION(
+      "no-runtime-validation",
+      PrimitiveType.BOOLEAN,
+      Arrays.asList(Target.CPP),
+      (config) -> ASTUtils.toElement(config.noRuntimeValidation),
+      (config, value, err) -> {
+        config.noRuntimeValidation = ASTUtils.toBoolean(value);
+      }),
+
+  /**
+   * Directive to specify the platform for cross code generation. This is either a string of the
+   * platform or a dictionary of options that includes the string name.
+   */
+  PLATFORM(
+      "platform",
+      UnionType.PLATFORM_STRING_OR_DICTIONARY,
+      Target.ALL,
+      (config) -> {
+        Element e = LfFactory.eINSTANCE.createElement();
+        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+        for (PlatformOption opt : PlatformOption.values()) {
+          KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+          pair.setName(opt.toString());
+          switch (opt) {
+            case NAME:
+              pair.setValue(ASTUtils.toElement(config.platformOptions.platform.toString()));
+              break;
+            case BAUDRATE:
+              pair.setValue(ASTUtils.toElement(config.platformOptions.baudRate));
+              break;
+            case BOARD:
+              pair.setValue(ASTUtils.toElement(config.platformOptions.board));
+              break;
+            case FLASH:
+              pair.setValue(ASTUtils.toElement(config.platformOptions.flash));
+              break;
+            case PORT:
+              pair.setValue(ASTUtils.toElement(config.platformOptions.port));
+              break;
+          }
+          kvp.getPairs().add(pair);
+        }
+        e.setKeyvalue(kvp);
+        if (kvp.getPairs().isEmpty()) return null;
+        return e;
+      },
+      (config, value, err) -> {
+        if (value.getLiteral() != null) {
+          config.platformOptions = new PlatformOptions();
+          config.platformOptions.platform =
+              (Platform) UnionType.PLATFORM_UNION.forName(ASTUtils.elementToSingleString(value));
         } else {
-            config.dockerOptions = new DockerOptions();
-            for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                DockerOption option = (DockerOption) DictionaryType.DOCKER_DICT
-                        .forName(entry.getName());
-                switch (option) {
-                    case FROM:
-                        config.dockerOptions.from = ASTUtils.elementToSingleString(entry.getValue());
-                        break;
-                    default:
-                        break;
+          config.platformOptions = new PlatformOptions();
+          for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+            PlatformOption option =
+                (PlatformOption) DictionaryType.PLATFORM_DICT.forName(entry.getName());
+            switch (option) {
+              case NAME:
+                Platform p =
+                    (Platform)
+                        UnionType.PLATFORM_UNION.forName(
+                            ASTUtils.elementToSingleString(entry.getValue()));
+                if (p == null) {
+                  String s =
+                      "Unidentified Platform Type, LF supports the following platform types: "
+                          + Arrays.asList(Platform.values()).toString();
+                  err.reportError(s);
+                  throw new AssertionError(s);
                 }
+                config.platformOptions.platform = p;
+                break;
+              case BAUDRATE:
+                config.platformOptions.baudRate = ASTUtils.toInteger(entry.getValue());
+                break;
+              case BOARD:
+                config.platformOptions.board = ASTUtils.elementToSingleString(entry.getValue());
+                break;
+              case FLASH:
+                config.platformOptions.flash = ASTUtils.toBoolean(entry.getValue());
+                break;
+              case PORT:
+                config.platformOptions.port = ASTUtils.elementToSingleString(entry.getValue());
+                break;
+              default:
+                break;
             }
+          }
+        }
+      }),
+
+  /** Directive to instruct the runtime to collect and print execution statistics. */
+  PRINT_STATISTICS(
+      "print-statistics",
+      PrimitiveType.BOOLEAN,
+      Arrays.asList(Target.CPP),
+      (config) -> ASTUtils.toElement(config.printStatistics),
+      (config, value, err) -> {
+        config.printStatistics = ASTUtils.toBoolean(value);
+      }),
+
+  /**
+   * Directive for specifying .proto files that need to be compiled and their code included in the
+   * sources.
+   */
+  PROTOBUFS(
+      "protobufs",
+      UnionType.FILE_OR_FILE_ARRAY,
+      Arrays.asList(Target.C, Target.CCPP, Target.TS, Target.Python),
+      (config) -> ASTUtils.toElement(config.protoFiles),
+      (config, value, err) -> {
+        config.protoFiles = ASTUtils.elementToListOfStrings(value);
+      }),
+
+  /** Directive to specify that ROS2 specific code is generated, */
+  ROS2(
+      "ros2",
+      PrimitiveType.BOOLEAN,
+      List.of(Target.CPP),
+      (config) -> ASTUtils.toElement(config.ros2),
+      (config, value, err) -> {
+        config.ros2 = ASTUtils.toBoolean(value);
+      }),
+
+  /** Directive to specify additional ROS2 packages that this LF program depends on. */
+  ROS2_DEPENDENCIES(
+      "ros2-dependencies",
+      ArrayType.STRING_ARRAY,
+      List.of(Target.CPP),
+      (config) -> ASTUtils.toElement(config.ros2Dependencies),
+      (config, value, err) -> {
+        config.ros2Dependencies = ASTUtils.elementToListOfStrings(value);
+      }),
+
+  /** Directive for specifying a specific version of the reactor runtime library. */
+  RUNTIME_VERSION(
+      "runtime-version",
+      PrimitiveType.STRING,
+      Arrays.asList(Target.CPP),
+      (config) -> ASTUtils.toElement(config.runtimeVersion),
+      (config, value, err) -> {
+        config.runtimeVersion = ASTUtils.elementToSingleString(value);
+      }),
+
+  /** Directive for specifying a specific runtime scheduler, if supported. */
+  SCHEDULER(
+      "scheduler",
+      UnionType.SCHEDULER_UNION,
+      Arrays.asList(Target.C, Target.CCPP, Target.Python),
+      (config) -> ASTUtils.toElement(config.schedulerType.toString()),
+      (config, value, err) -> {
+        config.schedulerType =
+            (SchedulerOption)
+                UnionType.SCHEDULER_UNION.forName(ASTUtils.elementToSingleString(value));
+      }),
+
+  /** Directive to specify that all code is generated in a single file. */
+  SINGLE_FILE_PROJECT(
+      "single-file-project",
+      PrimitiveType.BOOLEAN,
+      List.of(Target.Rust),
+      (config) -> ASTUtils.toElement(config.singleFileProject),
+      (config, value, err) -> {
+        config.singleFileProject = ASTUtils.toBoolean(value);
+      }),
+
+  /** Directive to indicate whether the runtime should use multi-threading. */
+  THREADING(
+      "threading",
+      PrimitiveType.BOOLEAN,
+      List.of(Target.C, Target.CCPP, Target.Python),
+      (config) -> ASTUtils.toElement(config.threading),
+      (config, value, err) -> {
+        config.threading = ASTUtils.toBoolean(value);
+      }),
+
+  /** Directive to specify the number of worker threads used by the runtime. */
+  WORKERS(
+      "workers",
+      PrimitiveType.NON_NEGATIVE_INTEGER,
+      List.of(Target.C, Target.CCPP, Target.Python, Target.CPP, Target.Rust),
+      (config) -> ASTUtils.toElement(config.workers),
+      (config, value, err) -> {
+        config.workers = ASTUtils.toInteger(value);
+      }),
+
+  /** Directive to specify the execution timeout. */
+  TIMEOUT(
+      "timeout",
+      PrimitiveType.TIME_VALUE,
+      Target.ALL,
+      (config) -> ASTUtils.toElement(config.timeout),
+      (config, value, err) -> {
+        config.timeout = ASTUtils.toTimeValue(value);
+      },
+      (config, value, err) -> {
+        config.timeout = ASTUtils.toTimeValue(value);
+      }),
+
+  /** Directive to enable tracing. */
+  TRACING(
+      "tracing",
+      UnionType.TRACING_UNION,
+      Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Python),
+      (config) -> {
+        if (config.tracing == null) {
+          return null;
+        } else if (config.tracing.equals(new TracingOptions())) {
+          // default values
+          return ASTUtils.toElement(true);
+        } else {
+          Element e = LfFactory.eINSTANCE.createElement();
+          KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+          for (TracingOption opt : TracingOption.values()) {
+            KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+            pair.setName(opt.toString());
+            switch (opt) {
+              case TRACE_FILE_NAME:
+                if (config.tracing.traceFileName == null) continue;
+                pair.setValue(ASTUtils.toElement(config.tracing.traceFileName));
+            }
+            kvp.getPairs().add(pair);
+          }
+          e.setKeyvalue(kvp);
+          if (kvp.getPairs().isEmpty()) return null;
+          return e;
+        }
+      },
+      (config, value, err) -> {
+        if (value.getLiteral() != null) {
+          if (ASTUtils.toBoolean(value)) {
+            config.tracing = new TracingOptions();
+          } else {
+            config.tracing = null;
+          }
+        } else {
+          config.tracing = new TracingOptions();
+          for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+            TracingOption option =
+                (TracingOption) DictionaryType.TRACING_DICT.forName(entry.getName());
+            switch (option) {
+              case TRACE_FILE_NAME:
+                config.tracing.traceFileName = ASTUtils.elementToSingleString(entry.getValue());
+                break;
+              default:
+                break;
+            }
+          }
+        }
+      }),
+
+  /**
+   * Directive to let the runtime export its internal dependency graph.
+   *
+   * <p>This is a debugging feature and currently only used for C++ and Rust programs.
+   */
+  EXPORT_DEPENDENCY_GRAPH(
+      "export-dependency-graph",
+      PrimitiveType.BOOLEAN,
+      List.of(Target.CPP, Target.Rust),
+      (config) -> ASTUtils.toElement(config.exportDependencyGraph),
+      (config, value, err) -> {
+        config.exportDependencyGraph = ASTUtils.toBoolean(value);
+      }),
+
+  /**
+   * Directive to let the runtime export the program structure to a yaml file.
+   *
+   * <p>This is a debugging feature and currently only used for C++ programs.
+   */
+  EXPORT_TO_YAML(
+      "export-to-yaml",
+      PrimitiveType.BOOLEAN,
+      List.of(Target.CPP),
+      (config) -> ASTUtils.toElement(config.exportToYaml),
+      (config, value, err) -> {
+        config.exportToYaml = ASTUtils.toBoolean(value);
+      }),
+
+  /**
+   * List of module files to link into the crate as top-level. For instance, a {@code target Rust {
+   * rust-modules: [ "foo.rs" ] }} will cause the file to be copied into the generated project, and
+   * the generated {@code main.rs} will include it with a {@code mod foo;}. If one of the paths is a
+   * directory, it must contain a {@code mod.rs} file, and all its contents are copied.
+   */
+  RUST_INCLUDE(
+      "rust-include",
+      UnionType.FILE_OR_FILE_ARRAY,
+      List.of(Target.Rust),
+      (config) -> {
+        // do not check paths here, and simply copy the absolute path over
+        List<Path> paths = config.rust.getRustTopLevelModules();
+        if (paths.isEmpty()) return null;
+        else if (paths.size() == 1) {
+          return ASTUtils.toElement(paths.get(0).toString());
+        } else {
+          Element e = LfFactory.eINSTANCE.createElement();
+          Array arr = LfFactory.eINSTANCE.createArray();
+          for (Path p : paths) {
+            arr.getElements().add(ASTUtils.toElement(p.toString()));
+          }
+          e.setArray(arr);
+          return e;
+        }
+      },
+      (config, value, err) -> {
+        Path referencePath;
+        try {
+          referencePath = FileUtil.toPath(value.eResource().getURI()).toAbsolutePath();
+        } catch (IOException e) {
+          err.reportError(value, "Invalid path? " + e.getMessage());
+          throw new RuntimeIOException(e);
         }
-    }
-
-    /**
-     * String representation of this target property.
-     */
-    public final String description;
-
-    /**
-     * List of targets that support this property. If a property is used for
-     * a target that does not support it, a warning reported during
-     * validation.
-     */
-    public final List<Target> supportedBy;
-
-    /**
-     * The type of values that can be assigned to this property.
-     */
-    public final TargetPropertyType type;
 
-    /**
-     * Function that given a configuration object and an Element AST node
-     * sets the configuration. It is assumed that validation already
-     * occurred, so this code should be straightforward.
-     */
-    public final PropertyParser setter;
+        // we'll resolve relative paths to check that the files
+        // are as expected.
 
-    /**
-     * Function that given a configuration object and an Element AST node
-     * sets the configuration. It is assumed that validation already
-     * occurred, so this code should be straightforward.
-     */
-    public final PropertyParser updater;
+        if (value.getLiteral() != null) {
+          Path resolved = referencePath.resolveSibling(StringUtil.removeQuotes(value.getLiteral()));
+
+          config.rust.addAndCheckTopLevelModule(resolved, value, err);
+        } else if (value.getArray() != null) {
+          for (Element element : value.getArray().getElements()) {
+            String literal = StringUtil.removeQuotes(element.getLiteral());
+            Path resolved = referencePath.resolveSibling(literal);
+            config.rust.addAndCheckTopLevelModule(resolved, element, err);
+          }
+        }
+      }),
+
+  /** Directive for specifying Cargo features of the generated program to enable. */
+  CARGO_FEATURES(
+      "cargo-features",
+      ArrayType.STRING_ARRAY,
+      List.of(Target.Rust),
+      (config) -> ASTUtils.toElement(config.rust.getCargoFeatures()),
+      (config, value, err) -> {
+        config.rust.setCargoFeatures(ASTUtils.elementToListOfStrings(value));
+      }),
+
+  /**
+   * Dependency specifications for Cargo. This property looks like this:
+   *
+   * <pre>{@code
+   * cargo-dependencies: {
+   *    // Name-of-the-crate: "version"
+   *    rand: "0.8",
+   *    // Equivalent to using an explicit map:
+   *    rand: {
+   *      version: "0.8"
+   *    },
+   *    // The map allows specifying more details
+   *    rand: {
+   *      // A path to a local unpublished crate.
+   *      // Note 'path' is mutually exclusive with 'version'.
+   *      path: "/home/me/Git/local-rand-clone"
+   *    },
+   *    rand: {
+   *      version: "0.8",
+   *      // you can specify cargo features
+   *      features: ["some-cargo-feature",]
+   *    }
+   * }
+   * }</pre>
+   */
+  CARGO_DEPENDENCIES(
+      "cargo-dependencies",
+      CargoDependenciesPropertyType.INSTANCE,
+      List.of(Target.Rust),
+      (config) -> {
+        var deps = config.rust.getCargoDependencies();
+        if (deps.size() == 0) return null;
+        else {
+          Element e = LfFactory.eINSTANCE.createElement();
+          KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+          for (var ent : deps.entrySet()) {
+            KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+            pair.setName(ent.getKey());
+            pair.setValue(CargoDependencySpec.extractSpec(ent.getValue()));
+            kvp.getPairs().add(pair);
+          }
+          e.setKeyvalue(kvp);
+          return e;
+        }
+      },
+      (config, value, err) -> {
+        config.rust.setCargoDependencies(CargoDependencySpec.parseAll(value));
+      }),
+
+  /**
+   * Directs the C or Python target to include the associated C file used for setting up federated
+   * execution before processing the first tag.
+   */
+  FED_SETUP(
+      "_fed_setup",
+      PrimitiveType.FILE,
+      Arrays.asList(Target.C, Target.CCPP, Target.Python),
+      (config) -> ASTUtils.toElement(config.fedSetupPreamble),
+      (config, value, err) ->
+          config.fedSetupPreamble = StringUtil.removeQuotes(ASTUtils.elementToSingleString(value)));
+
+  /** Update {@code config}.dockerOptions based on value. */
+  private static void setDockerProperty(TargetConfig config, Element value) {
+    if (value.getLiteral() != null) {
+      if (ASTUtils.toBoolean(value)) {
+        config.dockerOptions = new DockerOptions();
+      } else {
+        config.dockerOptions = null;
+      }
+    } else {
+      config.dockerOptions = new DockerOptions();
+      for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+        DockerOption option = (DockerOption) DictionaryType.DOCKER_DICT.forName(entry.getName());
+        switch (option) {
+          case FROM:
+            config.dockerOptions.from = ASTUtils.elementToSingleString(entry.getValue());
+            break;
+          default:
+            break;
+        }
+      }
+    }
+  }
+
+  /** String representation of this target property. */
+  public final String description;
+
+  /**
+   * List of targets that support this property. If a property is used for a target that does not
+   * support it, a warning reported during validation.
+   */
+  public final List<Target> supportedBy;
+
+  /** The type of values that can be assigned to this property. */
+  public final TargetPropertyType type;
+
+  /**
+   * Function that given a configuration object and an Element AST node sets the configuration. It
+   * is assumed that validation already occurred, so this code should be straightforward.
+   */
+  public final PropertyParser setter;
+
+  /**
+   * Function that given a configuration object and an Element AST node sets the configuration. It
+   * is assumed that validation already occurred, so this code should be straightforward.
+   */
+  public final PropertyParser updater;
+
+  @FunctionalInterface
+  private interface PropertyParser {
+
+    /**
+     * Parse the given element into the given target config. May use the error reporter to report
+     * format errors.
+     */
+    void parseIntoTargetConfig(TargetConfig config, Element element, ErrorReporter err);
+  }
+
+  public final PropertyGetter getter;
+
+  @FunctionalInterface
+  private interface PropertyGetter {
+
+    /**
+     * Read this property from the target config and build an element which represents it for the
+     * AST. May return null if the given value of this property is the same as the default.
+     */
+    Element getPropertyElement(TargetConfig config);
+  }
+
+  /**
+   * Private constructor for target properties.
+   *
+   * @param description String representation of this property.
+   * @param type The type that values assigned to this property should conform to.
+   * @param supportedBy List of targets that support this property.
+   * @param setter Function for configuration updates.
+   */
+  TargetProperty(
+      String description,
+      TargetPropertyType type,
+      List<Target> supportedBy,
+      PropertyGetter getter,
+      PropertyParser setter) {
+    this.description = description;
+    this.type = type;
+    this.supportedBy = supportedBy;
+    this.getter = getter;
+    this.setter = setter;
+    this.updater = setter; // (Re)set by default
+  }
+
+  /**
+   * Private constructor for target properties. This will take an additional {@code updater}, which
+   * will be used to merge target properties from imported resources.
+   *
+   * @param description String representation of this property.
+   * @param type The type that values assigned to this property should conform to.
+   * @param supportedBy List of targets that support this property.
+   * @param setter Function for setting configuration values.
+   * @param updater Function for updating configuration values.
+   */
+  TargetProperty(
+      String description,
+      TargetPropertyType type,
+      List<Target> supportedBy,
+      PropertyGetter getter,
+      PropertyParser setter,
+      PropertyParser updater) {
+    this.description = description;
+    this.type = type;
+    this.supportedBy = supportedBy;
+    this.getter = getter;
+    this.setter = setter;
+    this.updater = updater;
+  }
+
+  /**
+   * Return the name of the property in lingua franca. This is suitable for use as a key in a target
+   * properties block. It may be an invalid identifier in other languages (may contains dashes
+   * {@code -}).
+   */
+  public String getDisplayName() {
+    return description;
+  }
+
+  /**
+   * Set the given configuration using the given target properties.
+   *
+   * @param config The configuration object to update.
+   * @param properties AST node that holds all the target properties.
+   * @param err Error reporter on which property format errors will be reported
+   */
+  public static void set(TargetConfig config, List<KeyValuePair> properties, ErrorReporter err) {
+    properties.forEach(
+        property -> {
+          TargetProperty p = forName(property.getName());
+          if (p != null) {
+            // Mark the specified target property as set by the user
+            config.setByUser.add(p);
+            try {
+              p.setter.parseIntoTargetConfig(config, property.getValue(), err);
+            } catch (InvalidLfSourceException e) {
+              err.reportError(e.getNode(), e.getProblem());
+            }
+          }
+        });
+  }
+
+  /**
+   * Extracts all properties as a list of key-value pairs from a TargetConfig. Only extracts
+   * properties explicitly set by user.
+   *
+   * @param config The TargetConfig to extract from.
+   * @return The extracted properties.
+   */
+  public static List<KeyValuePair> extractProperties(TargetConfig config) {
+    var res = new LinkedList<KeyValuePair>();
+    for (TargetProperty p : config.setByUser) {
+      KeyValuePair kv = LfFactory.eINSTANCE.createKeyValuePair();
+      kv.setName(p.toString());
+      kv.setValue(p.getter.getPropertyElement(config));
+      if (kv.getValue() != null) res.add(kv);
+    }
+    return res;
+  }
+
+  /**
+   * Constructs a TargetDecl by extracting the fields of the given TargetConfig.
+   *
+   * @param target The target to generate for.
+   * @param config The TargetConfig to extract from.
+   * @return A generated TargetDecl.
+   */
+  public static TargetDecl extractTargetDecl(Target target, TargetConfig config) {
+    TargetDecl decl = LfFactory.eINSTANCE.createTargetDecl();
+    KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+    for (KeyValuePair p : extractProperties(config)) {
+      kvp.getPairs().add(p);
+    }
+    decl.setName(target.toString());
+    decl.setConfig(kvp);
+    return decl;
+  }
+
+  /**
+   * Update the given configuration using the given target properties.
+   *
+   * @param config The configuration object to update.
+   * @param properties AST node that holds all the target properties.
+   */
+  public static void update(TargetConfig config, List<KeyValuePair> properties, ErrorReporter err) {
+    properties.forEach(
+        property -> {
+          TargetProperty p = forName(property.getName());
+          if (p != null) {
+            // Mark the specified target property as set by the user
+            config.setByUser.add(p);
+            p.updater.parseIntoTargetConfig(config, property.getValue(), err);
+          }
+        });
+  }
+
+  /**
+   * Update one of the target properties, given by 'propertyName'. For convenience, a list of target
+   * properties (e.g., taken from a file or resource) can be passed without any filtering. This
+   * function will do nothing if the list of target properties doesn't include the property given by
+   * 'propertyName'.
+   *
+   * @param config The target config to apply the update to.
+   * @param property The target property.
+   * @param properties AST node that holds all the target properties.
+   * @param err Error reporter on which property format errors will be reported
+   */
+  public static void updateOne(
+      TargetConfig config,
+      TargetProperty property,
+      List<KeyValuePair> properties,
+      ErrorReporter err) {
+    properties.stream()
+        .filter(p -> p.getName().equals(property.getDisplayName()))
+        .findFirst()
+        .map(KeyValuePair::getValue)
+        .ifPresent(value -> property.updater.parseIntoTargetConfig(config, value, err));
+  }
+
+  /**
+   * Return the entry that matches the given string.
+   *
+   * @param name The string to match against.
+   */
+  public static TargetProperty forName(String name) {
+    return Target.match(name, TargetProperty.values());
+  }
+
+  /**
+   * Return a list with all target properties.
+   *
+   * @return All existing target properties.
+   */
+  public static List<TargetProperty> getOptions() {
+    return Arrays.asList(TargetProperty.values());
+  }
+
+  /** Return the description. */
+  @Override
+  public String toString() {
+    return this.description;
+  }
+
+  // Inner classes for the various supported types.
+
+  /** Dictionary type that allows for keys that will be interpreted as strings and string values. */
+  public enum StringDictionaryType implements TargetPropertyType {
+    COMPILE_DEFINITION();
 
-    @FunctionalInterface
-    private interface PropertyParser {
+    @Override
+    public boolean validate(Element e) {
+      if (e.getKeyvalue() != null) {
+        return true;
+      }
+      return false;
+    }
 
-        /**
-         * Parse the given element into the given target config.
-         * May use the error reporter to report format errors.
-         */
-        void parseIntoTargetConfig(TargetConfig config, Element element, ErrorReporter err);
+    @Override
+    public void check(Element e, String name, LFValidator v) {
+      KeyValuePairs kv = e.getKeyvalue();
+      if (kv == null) {
+        TargetPropertyType.produceError(name, this.toString(), v);
+      } else {
+        for (KeyValuePair pair : kv.getPairs()) {
+          String key = pair.getName();
+          Element val = pair.getValue();
+
+          // Make sure the type is string
+          PrimitiveType.STRING.check(val, name + "." + key, v);
+        }
+      }
     }
+  }
 
-    public final PropertyGetter getter;
+  /** Interface for dictionary elements. It associates an entry with a type. */
+  public interface DictionaryElement {
 
-    @FunctionalInterface
-    private interface PropertyGetter {
+    TargetPropertyType getType();
+  }
 
-        /**
-         * Read this property from the target config and build an element which represents it for the AST.
-         * May return null if the given value of this property is the same as the default.
-         */
-        Element getPropertyElement(TargetConfig config);
-    }
+  /**
+   * A dictionary type with a predefined set of possible keys and assignable types.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum DictionaryType implements TargetPropertyType {
+    CLOCK_SYNC_OPTION_DICT(Arrays.asList(ClockSyncOption.values())),
+    DOCKER_DICT(Arrays.asList(DockerOption.values())),
+    PLATFORM_DICT(Arrays.asList(PlatformOption.values())),
+    COORDINATION_OPTION_DICT(Arrays.asList(CoordinationOption.values())),
+    TRACING_DICT(Arrays.asList(TracingOption.values()));
 
-    /**
-     * Private constructor for target properties.
-     *
-     * @param description String representation of this property.
-     * @param type        The type that values assigned to this property
-     *                    should conform to.
-     * @param supportedBy List of targets that support this property.
-     * @param setter      Function for configuration updates.
-     */
-    TargetProperty(String description, TargetPropertyType type,
-                   List<Target> supportedBy,
-                   PropertyGetter getter,
-                   PropertyParser setter) {
-        this.description = description;
-        this.type = type;
-        this.supportedBy = supportedBy;
-        this.getter = getter;
-        this.setter = setter;
-        this.updater = setter; // (Re)set by default
-    }
+    /** The keys and assignable types that are allowed in this dictionary. */
+    public List<DictionaryElement> options;
 
     /**
-     * Private constructor for target properties. This will take an additional
-     * {@code updater}, which will be used to merge target properties from imported resources.
+     * A dictionary type restricted to sets of predefined keys and types of values.
      *
-     * @param description String representation of this property.
-     * @param type        The type that values assigned to this property
-     *                    should conform to.
-     * @param supportedBy List of targets that support this property.
-     * @param setter      Function for setting configuration values.
-     * @param updater     Function for updating configuration values.
-     */
-    TargetProperty(String description, TargetPropertyType type,
-                   List<Target> supportedBy,
-                   PropertyGetter getter,
-                   PropertyParser setter,
-                   PropertyParser updater) {
-        this.description = description;
-        this.type = type;
-        this.supportedBy = supportedBy;
-        this.getter = getter;
-        this.setter = setter;
-        this.updater = updater;
-    }
-
-    /**
-     * Return the name of the property in lingua franca. This
-     * is suitable for use as a key in a target properties block.
-     * It may be an invalid identifier in other languages (may
-     * contains dashes {@code -}).
+     * @param options The dictionary elements allowed by this type.
      */
-    public String getDisplayName() {
-        return description;
+    private DictionaryType(List<DictionaryElement> options) {
+      this.options = options;
     }
 
     /**
-     * Set the given configuration using the given target properties.
+     * Return the dictionary element of which the key matches the given string.
      *
-     * @param config     The configuration object to update.
-     * @param properties AST node that holds all the target properties.
-     * @param err        Error reporter on which property format errors will be reported
+     * @param name The string to match against.
+     * @return The matching dictionary element (or null if there is none).
      */
-    public static void set(TargetConfig config, List<KeyValuePair> properties, ErrorReporter err) {
-        properties.forEach(property ->  {
-            TargetProperty p = forName(property.getName());
-            if (p != null) {
-                // Mark the specified target property as set by the user
-                config.setByUser.add(p);
-                try {
-                    p.setter.parseIntoTargetConfig(config, property.getValue(), err);
-                } catch (InvalidLfSourceException e) {
-                    err.reportError(e.getNode(), e.getProblem());
-                }
-            }
-        });
+    public DictionaryElement forName(String name) {
+      return Target.match(name, options);
     }
 
-    /**
-     * Extracts all properties as a list of key-value pairs from a TargetConfig. Only extracts properties explicitly set by user.
-     * @param config The TargetConfig to extract from.
-     * @return The extracted properties.
-     */
-    public static List<KeyValuePair> extractProperties(TargetConfig config) {
-        var res = new LinkedList<KeyValuePair>();
-        for (TargetProperty p : config.setByUser) {
-            KeyValuePair kv = LfFactory.eINSTANCE.createKeyValuePair();
-            kv.setName(p.toString());
-            kv.setValue(p.getter.getPropertyElement(config));
-            if (kv.getValue() != null)
-                res.add(kv);
+    /** Recursively check that the passed in element conforms to the rules of this dictionary. */
+    @Override
+    public void check(Element e, String name, LFValidator v) {
+      KeyValuePairs kv = e.getKeyvalue();
+      if (kv == null) {
+        TargetPropertyType.produceError(name, this.toString(), v);
+      } else {
+        for (KeyValuePair pair : kv.getPairs()) {
+          String key = pair.getName();
+          Element val = pair.getValue();
+          Optional<DictionaryElement> match =
+              this.options.stream()
+                  .filter(element -> key.equalsIgnoreCase(element.toString()))
+                  .findAny();
+          if (match.isPresent()) {
+            // Make sure the type is correct, too.
+            TargetPropertyType type = match.get().getType();
+            type.check(val, name + "." + key, v);
+          } else {
+            // No match found; report error.
+            TargetPropertyType.produceError(name, this.toString(), v);
+          }
         }
-        return res;
+      }
     }
 
-    /**
-     * Constructs a TargetDecl by extracting the fields of the given TargetConfig.
-     * @param target  The target to generate for.
-     * @param config  The TargetConfig to extract from.
-     * @return        A generated TargetDecl.
-     */
-    public static TargetDecl extractTargetDecl(Target target, TargetConfig config) {
-        TargetDecl decl = LfFactory.eINSTANCE.createTargetDecl();
-        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-        for (KeyValuePair p : extractProperties(config)) {
-            kvp.getPairs().add(p);
-        }
-        decl.setName(target.toString());
-        decl.setConfig(kvp);
-        return decl;
+    /** Return true if the given element represents a dictionary, false otherwise. */
+    @Override
+    public boolean validate(Element e) {
+      if (e.getKeyvalue() != null) {
+        return true;
+      }
+      return false;
     }
 
-    /**
-     * Update the given configuration using the given target properties.
-     *
-     * @param config     The configuration object to update.
-     * @param properties AST node that holds all the target properties.
-     */
-    public static void update(TargetConfig config, List<KeyValuePair> properties, ErrorReporter err) {
-        properties.forEach(property ->  {
-            TargetProperty p = forName(property.getName());
-            if (p != null) {
-                // Mark the specified target property as set by the user
-                config.setByUser.add(p);
-                p.updater.parseIntoTargetConfig(config, property.getValue(), err);
-            }
-        });
+    /** Return a human-readable description of this type. */
+    @Override
+    public String toString() {
+      return "a dictionary with one or more of the following keys: "
+          + options.stream().map(option -> option.toString()).collect(Collectors.joining(", "));
     }
-
-    /**
-     * Update one of the target properties, given by 'propertyName'.
-     * For convenience, a list of target properties (e.g., taken from
-     * a file or resource) can be passed without any filtering. This
-     * function will do nothing if the list of target properties doesn't
-     * include the property given by 'propertyName'.
+  }
+  /**
+   * A type that can assume one of several types.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum UnionType implements TargetPropertyType {
+    STRING_OR_STRING_ARRAY(Arrays.asList(PrimitiveType.STRING, ArrayType.STRING_ARRAY), null),
+    PLATFORM_STRING_OR_DICTIONARY(
+        Arrays.asList(PrimitiveType.STRING, DictionaryType.PLATFORM_DICT), null),
+    FILE_OR_FILE_ARRAY(Arrays.asList(PrimitiveType.FILE, ArrayType.FILE_ARRAY), null),
+    BUILD_TYPE_UNION(Arrays.asList(BuildType.values()), null),
+    COORDINATION_UNION(Arrays.asList(CoordinationType.values()), CoordinationType.CENTRALIZED),
+    SCHEDULER_UNION(Arrays.asList(SchedulerOption.values()), SchedulerOption.getDefault()),
+    LOGGING_UNION(Arrays.asList(LogLevel.values()), LogLevel.INFO),
+    PLATFORM_UNION(Arrays.asList(Platform.values()), Platform.AUTO),
+    CLOCK_SYNC_UNION(Arrays.asList(ClockSyncMode.values()), ClockSyncMode.INIT),
+    DOCKER_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.DOCKER_DICT), null),
+    TRACING_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.TRACING_DICT), null);
+
+    /** The constituents of this type union. */
+    public final List<Enum<?>> options;
+
+    /** The default type, if there is one. */
+    private final Enum<?> defaultOption;
+
+    /**
+     * Private constructor for creating unions types.
      *
-     * @param config     The target config to apply the update to.
-     * @param property   The target property.
-     * @param properties AST node that holds all the target properties.
-     * @param err        Error reporter on which property format errors will be reported
+     * @param options The types that that are part of the union.
+     * @param defaultOption The default type.
      */
-    public static void updateOne(TargetConfig config, TargetProperty property, List<KeyValuePair> properties, ErrorReporter err) {
-        properties.stream()
-            .filter(p -> p.getName().equals(property.getDisplayName()))
-            .findFirst()
-            .map(KeyValuePair::getValue)
-            .ifPresent(value -> property.updater.parseIntoTargetConfig(
-                config,
-                value,
-                err
-            ));
+    private UnionType(List<Enum<?>> options, Enum<?> defaultOption) {
+      this.options = options;
+      this.defaultOption = defaultOption;
     }
 
     /**
-     * Return the entry that matches the given string.
-     * @param name The string to match against.
-     */
-    public static TargetProperty forName(String name) {
-        return Target.match(name, TargetProperty.values());
-    }
-
-    /**
-     * Return a list with all target properties.
+     * Return the type among those in this type union that matches the given name.
      *
-     * @return All existing target properties.
+     * @param name The string to match against.
+     * @return The matching dictionary element (or null if there is none).
      */
-    public static List<TargetProperty> getOptions() {
-        return Arrays.asList(TargetProperty.values());
+    public Enum<?> forName(String name) {
+      return Target.match(name, options);
     }
 
-    /**
-     * Return the description.
-     */
+    /** Recursively check that the passed in element conforms to the rules of this union. */
     @Override
-    public String toString() {
-        return this.description;
+    public void check(Element e, String name, LFValidator v) {
+      Optional<Enum<?>> match = this.match(e);
+      if (match.isPresent()) {
+        // Go deeper if the element is an array or dictionary.
+        Enum<?> type = match.get();
+        if (type instanceof DictionaryType) {
+          ((DictionaryType) type).check(e, name, v);
+        } else if (type instanceof ArrayType) {
+          ((ArrayType) type).check(e, name, v);
+        } else if (type instanceof PrimitiveType) {
+          ((PrimitiveType) type).check(e, name, v);
+        } else if (!(type instanceof Enum<?>)) {
+          throw new RuntimeException("Encountered an unknown type.");
+        }
+      } else {
+        // No match found; report error.
+        TargetPropertyType.produceError(name, this.toString(), v);
+      }
     }
 
-    // Inner classes for the various supported types.
-
     /**
-     * Dictionary type that allows for keys that will be interpreted as strings
-     * and string values.
+     * Internal method for matching a given element against the allowable types.
+     *
+     * @param e AST node that represents the value of a target property.
+     * @return The matching type wrapped in an Optional object.
      */
-    public enum StringDictionaryType implements TargetPropertyType {
-        COMPILE_DEFINITION();
-        @Override
-        public boolean validate(Element e) {
-            if (e.getKeyvalue() != null) {
-                return true;
-            }
-            return false;
-        }
-
-        @Override
-        public void check(Element e, String name, LFValidator v) {
-            KeyValuePairs kv = e.getKeyvalue();
-            if (kv == null) {
-                TargetPropertyType.produceError(name, this.toString(), v);
-            } else {
-                for (KeyValuePair pair : kv.getPairs()) {
-                    String key = pair.getName();
-                    Element val = pair.getValue();
-
-                    // Make sure the type is string
-                    PrimitiveType.STRING.check(val, name + "." + key, v);
+    private Optional<Enum<?>> match(Element e) {
+      return this.options.stream()
+          .filter(
+              option -> {
+                if (option instanceof TargetPropertyType) {
+                  return ((TargetPropertyType) option).validate(e);
+                } else {
+                  return ASTUtils.elementToSingleString(e).equalsIgnoreCase(option.toString());
                 }
-            }
-
-        }
+              })
+          .findAny();
     }
 
     /**
-     * Interface for dictionary elements. It associates an entry with a type.
+     * Return true if this union has an option that matches the given element.
+     *
+     * @param e The element to match against this type.
      */
-    public interface DictionaryElement {
-
-        TargetPropertyType getType();
+    @Override
+    public boolean validate(Element e) {
+      if (this.match(e).isPresent()) {
+        return true;
+      }
+      return false;
     }
 
     /**
-     * A dictionary type with a predefined set of possible keys and assignable
-     * types.
-     *
-     * @author Marten Lohstroh
-     *
+     * Return a human-readable description of this type. If three is a default option, then indicate
+     * it.
      */
-    public enum DictionaryType implements TargetPropertyType {
-        CLOCK_SYNC_OPTION_DICT(Arrays.asList(ClockSyncOption.values())),
-        DOCKER_DICT(Arrays.asList(DockerOption.values())),
-        PLATFORM_DICT(Arrays.asList(PlatformOption.values())),
-        COORDINATION_OPTION_DICT(Arrays.asList(CoordinationOption.values())),
-        TRACING_DICT(Arrays.asList(TracingOption.values()));
-
-        /**
-         * The keys and assignable types that are allowed in this dictionary.
-         */
-        public List<DictionaryElement> options;
-
-        /**
-         * A dictionary type restricted to sets of predefined keys and types of
-         * values.
-         *
-         * @param options The dictionary elements allowed by this type.
-         */
-        private DictionaryType(List<DictionaryElement> options) {
-            this.options = options;
-        }
-
-        /**
-         * Return the dictionary element of which the key matches the given
-         * string.
-         *
-         * @param name The string to match against.
-         * @return The matching dictionary element (or null if there is none).
-         */
-        public DictionaryElement forName(String name) {
-            return Target.match(name, options);
-        }
-
-        /**
-         * Recursively check that the passed in element conforms to the rules of
-         * this dictionary.
-         */
-        @Override
-        public void check(Element e, String name, LFValidator v) {
-            KeyValuePairs kv = e.getKeyvalue();
-            if (kv == null) {
-                TargetPropertyType.produceError(name, this.toString(), v);
-            } else {
-                for (KeyValuePair pair : kv.getPairs()) {
-                    String key = pair.getName();
-                    Element val = pair.getValue();
-                    Optional<DictionaryElement> match = this.options.stream()
-                            .filter(element -> key.equalsIgnoreCase(element.toString())).findAny();
-                    if (match.isPresent()) {
-                        // Make sure the type is correct, too.
-                        TargetPropertyType type = match.get().getType();
-                        type.check(val, name + "." + key, v);
+    @Override
+    public String toString() {
+      return "one of the following: "
+          + options.stream()
+              .map(
+                  option -> {
+                    if (option == this.defaultOption) {
+                      return option.toString() + " (default)";
                     } else {
-                        // No match found; report error.
-                        TargetPropertyType.produceError(name,
-                                this.toString(), v);
+                      return option.toString();
                     }
-                }
-            }
-        }
-
-        /**
-         * Return true if the given element represents a dictionary, false
-         * otherwise.
-         */
-        @Override
-        public boolean validate(Element e) {
-            if (e.getKeyvalue() != null) {
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Return a human-readable description of this type.
-         */
-        @Override
-        public String toString() {
-            return "a dictionary with one or more of the following keys: "
-                    + options.stream().map(option -> option.toString())
-                            .collect(Collectors.joining(", "));
-        }
+                  })
+              .collect(Collectors.joining(", "));
     }
-    /**
-     * A type that can assume one of several types.
-     *
-     * @author Marten Lohstroh
-     *
-     */
-    public enum UnionType implements TargetPropertyType {
-        STRING_OR_STRING_ARRAY(
-                Arrays.asList(PrimitiveType.STRING, ArrayType.STRING_ARRAY),
-                null),
-        PLATFORM_STRING_OR_DICTIONARY(
-                Arrays.asList(PrimitiveType.STRING, DictionaryType.PLATFORM_DICT),
-                null),
-        FILE_OR_FILE_ARRAY(
-                Arrays.asList(PrimitiveType.FILE, ArrayType.FILE_ARRAY), null),
-        BUILD_TYPE_UNION(Arrays.asList(BuildType.values()), null),
-        COORDINATION_UNION(Arrays.asList(CoordinationType.values()),
-                CoordinationType.CENTRALIZED),
-        SCHEDULER_UNION(Arrays.asList(SchedulerOption.values()), SchedulerOption.getDefault()),
-        LOGGING_UNION(Arrays.asList(LogLevel.values()), LogLevel.INFO),
-        PLATFORM_UNION(Arrays.asList(Platform.values()), Platform.AUTO),
-        CLOCK_SYNC_UNION(Arrays.asList(ClockSyncMode.values()),
-                ClockSyncMode.INIT),
-        DOCKER_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.DOCKER_DICT),
-                null),
-        TRACING_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.TRACING_DICT),
-                null);
-
-        /**
-         * The constituents of this type union.
-         */
-        public final List<Enum<?>> options;
-
-        /**
-         * The default type, if there is one.
-         */
-        private final Enum<?> defaultOption;
-
-        /**
-         * Private constructor for creating unions types.
-         *
-         * @param options The types that that are part of the union.
-         * @param defaultOption The default type.
-         */
-        private UnionType(List<Enum<?>> options, Enum<?> defaultOption) {
-            this.options = options;
-            this.defaultOption = defaultOption;
-        }
-
-        /**
-         * Return the type among those in this type union that matches the given
-         * name.
-         *
-         * @param name The string to match against.
-         * @return The matching dictionary element (or null if there is none).
-         */
-        public Enum<?> forName(String name) {
-            return Target.match(name, options);
-        }
-
-        /**
-         * Recursively check that the passed in element conforms to the rules of
-         * this union.
-         */
-        @Override
-        public void check(Element e, String name, LFValidator v) {
-            Optional<Enum<?>> match = this.match(e);
-            if (match.isPresent()) {
-                // Go deeper if the element is an array or dictionary.
-                Enum<?> type = match.get();
-                if (type instanceof DictionaryType) {
-                    ((DictionaryType) type).check(e, name, v);
-                } else if (type instanceof ArrayType) {
-                    ((ArrayType) type).check(e, name, v);
-                } else if (type instanceof PrimitiveType) {
-                    ((PrimitiveType) type).check(e, name, v);
-                } else if (!(type instanceof Enum<?>)) {
-                    throw new RuntimeException("Encountered an unknown type.");
-                }
-            } else {
-                // No match found; report error.
-                TargetPropertyType.produceError(name, this.toString(), v);
-            }
-        }
-
-        /**
-         * Internal method for matching a given element against the allowable
-         * types.
-         *
-         * @param e AST node that represents the value of a target property.
-         * @return The matching type wrapped in an Optional object.
-         */
-        private Optional<Enum<?>> match(Element e) {
-            return this.options.stream().filter(option -> {
-                if (option instanceof TargetPropertyType) {
-                    return ((TargetPropertyType) option).validate(e);
-                } else {
-                    return ASTUtils.elementToSingleString(e)
-                            .equalsIgnoreCase(option.toString());
-                }
-            }).findAny();
-        }
+  }
 
-        /**
-         * Return true if this union has an option that matches the given
-         * element.
-         * @param e The element to match against this type.
-         */
-        @Override
-        public boolean validate(Element e) {
-            if (this.match(e).isPresent()) {
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Return a human-readable description of this type. If three is a
-         * default option, then indicate it.
-         */
-        @Override
-        public String toString() {
-            return "one of the following: " + options.stream().map(option -> {
-                if (option == this.defaultOption) {
-                    return option.toString() + " (default)";
-                } else {
-                    return option.toString();
-                }
-            }).collect(Collectors.joining(", "));
-        }
+  /**
+   * An array type of which the elements confirm to a given type.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum ArrayType implements TargetPropertyType {
+    STRING_ARRAY(PrimitiveType.STRING),
+    FILE_ARRAY(PrimitiveType.FILE);
 
-    }
+    /** Type parameter of this array type. */
+    public TargetPropertyType type;
 
     /**
-     * An array type of which the elements confirm to a given type.
-     *
-     * @author Marten Lohstroh
+     * Private constructor to create a new array type.
      *
+     * @param type The type of elements in the array.
      */
-    public enum ArrayType implements TargetPropertyType {
-        STRING_ARRAY(PrimitiveType.STRING),
-        FILE_ARRAY(PrimitiveType.FILE);
-
-        /**
-         * Type parameter of this array type.
-         */
-        public TargetPropertyType type;
-
-        /**
-         * Private constructor to create a new array type.
-         *
-         * @param type The type of elements in the array.
-         */
-        private ArrayType(TargetPropertyType type) {
-            this.type = type;
-        }
-
-        /**
-         * Check that the passed in element represents an array and ensure that
-         * its elements are all of the correct type.
-         */
-        @Override
-        public void check(Element e, String name, LFValidator v) {
-            Array array = e.getArray();
-            if (array == null) {
-                TargetPropertyType.produceError(name, this.toString(), v);
-            } else {
-                List<Element> elements = array.getElements();
-                for (int i = 0; i < elements.size(); i++) {
-                    this.type.check(elements.get(i), name + "[" + i + "]", v);
-                }
-            }
-        }
-
-        /**
-         * Return true of the given element is an array.
-         */
-        @Override
-        public boolean validate(Element e) {
-            if (e.getArray() != null) {
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Return a human-readable description of this type.
-         */
-        @Override
-        public String toString() {
-            return "an array of which each element is " + this.type.toString();
-        }
+    private ArrayType(TargetPropertyType type) {
+      this.type = type;
     }
 
     /**
-     * Enumeration of Cmake build types. These are also mapped
-     * to Cargo profiles for the Rust target (see {@link org.lflang.generator.rust.RustTargetConfig})
-     *
-     * @author Christian Menard
+     * Check that the passed in element represents an array and ensure that its elements are all of
+     * the correct type.
      */
-    public enum BuildType {
-        RELEASE("Release"),
-        DEBUG("Debug"),
-        TEST("Test"),
-        REL_WITH_DEB_INFO("RelWithDebInfo"),
-        MIN_SIZE_REL("MinSizeRel");
-
-        /**
-         * Alias used in toString method.
-         */
-        private final String alias;
-
-        /**
-         * Private constructor for Cmake build types.
-         */
-        BuildType(String alias) {
-            this.alias = alias;
+    @Override
+    public void check(Element e, String name, LFValidator v) {
+      Array array = e.getArray();
+      if (array == null) {
+        TargetPropertyType.produceError(name, this.toString(), v);
+      } else {
+        List<Element> elements = array.getElements();
+        for (int i = 0; i < elements.size(); i++) {
+          this.type.check(elements.get(i), name + "[" + i + "]", v);
         }
+      }
+    }
 
-        /**
-         * Return the alias.
-         */
-        @Override
-        public String toString() {
-            return this.alias;
-        }
+    /** Return true of the given element is an array. */
+    @Override
+    public boolean validate(Element e) {
+      if (e.getArray() != null) {
+        return true;
+      }
+      return false;
     }
 
-    /**
-     * Enumeration of coordination types.
-     *
-     * @author Marten Lohstroh
-     */
-    public enum CoordinationType {
-        CENTRALIZED, DECENTRALIZED;
-
-        /**
-         * Return the name in lower case.
-         */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
+    /** Return a human-readable description of this type. */
+    @Override
+    public String toString() {
+      return "an array of which each element is " + this.type.toString();
+    }
+  }
+
+  /**
+   * Enumeration of Cmake build types. These are also mapped to Cargo profiles for the Rust target
+   * (see {@link org.lflang.generator.rust.RustTargetConfig})
+   *
+   * @author Christian Menard
+   */
+  public enum BuildType {
+    RELEASE("Release"),
+    DEBUG("Debug"),
+    TEST("Test"),
+    REL_WITH_DEB_INFO("RelWithDebInfo"),
+    MIN_SIZE_REL("MinSizeRel");
+
+    /** Alias used in toString method. */
+    private final String alias;
+
+    /** Private constructor for Cmake build types. */
+    BuildType(String alias) {
+      this.alias = alias;
+    }
+
+    /** Return the alias. */
+    @Override
+    public String toString() {
+      return this.alias;
+    }
+  }
+
+  /**
+   * Enumeration of coordination types.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum CoordinationType {
+    CENTRALIZED,
+    DECENTRALIZED;
+
+    /** Return the name in lower case. */
+    @Override
+    public String toString() {
+      return this.name().toLowerCase();
+    }
+  }
+
+  /**
+   * Enumeration of clock synchronization modes.
+   *
+   * <ul>
+   *   <li>OFF: The clock synchronization is universally off.
+   *   <li>STARTUP: Clock synchronization occurs at startup only.
+   *   <li>ON: Clock synchronization occurs at startup and at runtime.
+   * </ul>
+   *
+   * @author Edward A. Lee
+   */
+  public enum ClockSyncMode {
+    OFF,
+    INIT,
+    ON; // TODO Discuss initial in now a mode keyword (same as startup) and cannot be used as target
+    // property value, thus changed it to init
+    // FIXME I could not test if this change breaks anything
+
+    /** Return the name in lower case. */
+    @Override
+    public String toString() {
+      return this.name().toLowerCase();
     }
+  }
 
+  /**
+   * An interface for types associated with target properties.
+   *
+   * @author Marten Lohstroh
+   */
+  public interface TargetPropertyType {
 
     /**
-     * Enumeration of clock synchronization modes.
+     * Return true if the the given Element is a valid instance of this type.
      *
-     * <ul>
-     * <li>OFF: The clock synchronization is universally off.</li>
-     * <li>STARTUP: Clock synchronization occurs at startup only.</li>
-     * <li>ON: Clock synchronization occurs at startup and at runtime.</li>
-     * </ul>
-     *
-     * @author Edward A. Lee
+     * @param e The Element to validate.
+     * @return True if the element conforms to this type, false otherwise.
      */
-    public enum ClockSyncMode {
-        OFF, INIT, ON; // TODO Discuss initial in now a mode keyword (same as startup) and cannot be used as target property value, thus changed it to init
-        // FIXME I could not test if this change breaks anything
-
-        /**
-         * Return the name in lower case.
-         */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
-    }
+    public boolean validate(Element e);
 
     /**
-     * An interface for types associated with target properties.
+     * Check (recursively) the given Element against its associated type(s) and add found problems
+     * to the given list of errors.
      *
-     * @author Marten Lohstroh
+     * @param e The Element to type check.
+     * @param name The name of the target property.
+     * @param v A reference to the validator to report errors to.
      */
-    public interface TargetPropertyType {
-
-        /**
-         * Return true if the the given Element is a valid instance of this
-         * type.
-         *
-         * @param e The Element to validate.
-         * @return True if the element conforms to this type, false otherwise.
-         */
-        public boolean validate(Element e);
-
-        /**
-         * Check (recursively) the given Element against its associated type(s)
-         * and add found problems to the given list of errors.
-         *
-         * @param e    The Element to type check.
-         * @param name The name of the target property.
-         * @param v    A reference to the validator to report errors to.
-         */
-        public void check(Element e, String name, LFValidator v);
-
-        /**
-         * Helper function to produce an error during type checking.
-         *
-         * @param name        The description of the target property.
-         * @param description The description of the type.
-         * @param v           A reference to the validator to report errors to.
-         */
-        public static void produceError(String name, String description,
-                LFValidator v) {
-            v.getTargetPropertyErrors().add("Target property '" + name
-                    + "' is required to be " + description + ".");
-        }
-    }
+    public void check(Element e, String name, LFValidator v);
 
     /**
-     * Primitive types for target properties, each with a description used in
-     * error messages and predicate used for validating values.
+     * Helper function to produce an error during type checking.
      *
-     * @author Marten Lohstroh
+     * @param name The description of the target property.
+     * @param description The description of the type.
+     * @param v A reference to the validator to report errors to.
      */
-    public enum PrimitiveType implements TargetPropertyType {
-        BOOLEAN("'true' or 'false'",
-                v -> ASTUtils.elementToSingleString(v).equalsIgnoreCase("true")
-                        || ASTUtils.elementToSingleString(v).equalsIgnoreCase("false")),
-        INTEGER("an integer", v -> {
-            try {
-                Integer.parseInt(ASTUtils.elementToSingleString(v));
-            } catch (NumberFormatException e) {
-                return false;
-            }
-            return true;
+    public static void produceError(String name, String description, LFValidator v) {
+      v.getTargetPropertyErrors()
+          .add("Target property '" + name + "' is required to be " + description + ".");
+    }
+  }
+
+  /**
+   * Primitive types for target properties, each with a description used in error messages and
+   * predicate used for validating values.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum PrimitiveType implements TargetPropertyType {
+    BOOLEAN(
+        "'true' or 'false'",
+        v ->
+            ASTUtils.elementToSingleString(v).equalsIgnoreCase("true")
+                || ASTUtils.elementToSingleString(v).equalsIgnoreCase("false")),
+    INTEGER(
+        "an integer",
+        v -> {
+          try {
+            Integer.parseInt(ASTUtils.elementToSingleString(v));
+          } catch (NumberFormatException e) {
+            return false;
+          }
+          return true;
         }),
-        NON_NEGATIVE_INTEGER("a non-negative integer", v -> {
-            try {
-                int result = Integer.parseInt(ASTUtils.elementToSingleString(v));
-                if (result < 0)
-                    return false;
-            } catch (NumberFormatException e) {
-                return false;
-            }
-            return true;
+    NON_NEGATIVE_INTEGER(
+        "a non-negative integer",
+        v -> {
+          try {
+            int result = Integer.parseInt(ASTUtils.elementToSingleString(v));
+            if (result < 0) return false;
+          } catch (NumberFormatException e) {
+            return false;
+          }
+          return true;
         }),
-        TIME_VALUE("a time value with units", v ->
-            v.getKeyvalue() == null && v.getArray() == null
-                && v.getLiteral() == null && v.getId() == null
+    TIME_VALUE(
+        "a time value with units",
+        v ->
+            v.getKeyvalue() == null
+                && v.getArray() == null
+                && v.getLiteral() == null
+                && v.getId() == null
                 && (v.getTime() == 0 || v.getUnit() != null)),
-        STRING("a string", v -> v.getLiteral() != null && !isCharLiteral(v.getLiteral()) || v.getId() != null),
-        FILE("a path to a file", STRING.validator);
-
-        /**
-         * A description of this type, featured in error messages.
-         */
-        private final String description;
-
-        /**
-         * A predicate for determining whether a given Element conforms to this
-         * type.
-         */
-        public final Predicate<Element> validator;
-
-        /**
-         * Private constructor to create a new primitive type.
-         * @param description A textual description of the type that should
-         * start with "a/an".
-         * @param validator A predicate that returns true if a given Element
-         * conforms to this type.
-         */
-        private PrimitiveType(String description,
-                Predicate<Element> validator) {
-            this.description = description;
-            this.validator = validator;
-        }
+    STRING(
+        "a string",
+        v -> v.getLiteral() != null && !isCharLiteral(v.getLiteral()) || v.getId() != null),
+    FILE("a path to a file", STRING.validator);
 
-        /**
-         * Return true if the the given Element is a valid instance of this type.
-         */
-        public boolean validate(Element e) {
-            return this.validator.test(e);
-        }
+    /** A description of this type, featured in error messages. */
+    private final String description;
 
-        /**
-         * Check (recursively) the given Element against its associated type(s)
-         * and add found problems to the given list of errors.
-         *
-         * @param e      The element to type check.
-         * @param name   The name of the target property.
-         * @param v      The LFValidator to append errors to.
-         */
-        public void check(Element e, String name, LFValidator v) {
-            if (!this.validate(e)) {
-                TargetPropertyType.produceError(name, this.description, v);
-            }
-            // If this is a file, perform an additional check to make sure
-            // the file actually exists.
-            // FIXME: premature because we first need a mechanism for looking up files!
-            // Looking in the same directory is too restrictive. Disabling this check for now.
-            /*
-            if (this == FILE) {
-                String file = ASTUtils.toSingleString(e);
-
-                if (!FileConfig.fileExists(file, FileConfig.toPath(e.eResource().getURI()).toFile().getParent())) {
-                    v.targetPropertyWarnings
-                            .add("Could not find file: '" + file + "'.");
-                }
-            }
-            */
-        }
-
-        /**
-         * Return a textual description of this type.
-         */
-        @Override
-        public String toString() {
-            return this.description;
-        }
-
-
-        private static boolean isCharLiteral(String s) {
-            return s.length() > 2
-                && '\'' == s.charAt(0)
-                && '\'' == s.charAt(s.length() - 1);
-        }
-    }
+    /** A predicate for determining whether a given Element conforms to this type. */
+    public final Predicate<Element> validator;
 
     /**
-     * Clock synchronization options.
-     * @author Marten Lohstroh
+     * Private constructor to create a new primitive type.
+     *
+     * @param description A textual description of the type that should start with "a/an".
+     * @param validator A predicate that returns true if a given Element conforms to this type.
      */
-    public enum ClockSyncOption implements DictionaryElement {
-        ATTENUATION("attenuation", PrimitiveType.NON_NEGATIVE_INTEGER),
-        LOCAL_FEDERATES_ON("local-federates-on", PrimitiveType.BOOLEAN),
-        PERIOD("period", PrimitiveType.TIME_VALUE),
-        TEST_OFFSET("test-offset", PrimitiveType.TIME_VALUE),
-        TRIALS("trials", PrimitiveType.NON_NEGATIVE_INTEGER),
-        COLLECT_STATS("collect-stats", PrimitiveType.BOOLEAN);
-
-        public final PrimitiveType type;
-
-        private final String description;
-
-        private ClockSyncOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
-
-
-        /**
-         * Return the description of this dictionary element.
-         */
-        @Override
-        public String toString() {
-            return this.description;
-        }
+    private PrimitiveType(String description, Predicate<Element> validator) {
+      this.description = description;
+      this.validator = validator;
+    }
 
-        /**
-         * Return the type associated with this dictionary element.
-         */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
+    /** Return true if the the given Element is a valid instance of this type. */
+    public boolean validate(Element e) {
+      return this.validator.test(e);
     }
 
     /**
-     * Docker options.
-     * @author Edward A. Lee
-     */
-    public enum DockerOption implements DictionaryElement {
-        FROM("FROM", PrimitiveType.STRING);
-
-        public final PrimitiveType type;
-
-        private final String description;
-
-        private DockerOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
-
-        /**
-         * Return the description of this dictionary element.
-         */
-        @Override
-        public String toString() {
-            return this.description;
-        }
+     * Check (recursively) the given Element against its associated type(s) and add found problems
+     * to the given list of errors.
+     *
+     * @param e The element to type check.
+     * @param name The name of the target property.
+     * @param v The LFValidator to append errors to.
+     */
+    public void check(Element e, String name, LFValidator v) {
+      if (!this.validate(e)) {
+        TargetPropertyType.produceError(name, this.description, v);
+      }
+      // If this is a file, perform an additional check to make sure
+      // the file actually exists.
+      // FIXME: premature because we first need a mechanism for looking up files!
+      // Looking in the same directory is too restrictive. Disabling this check for now.
+      /*
+      if (this == FILE) {
+          String file = ASTUtils.toSingleString(e);
+
+          if (!FileConfig.fileExists(file, FileConfig.toPath(e.eResource().getURI()).toFile().getParent())) {
+              v.targetPropertyWarnings
+                      .add("Could not find file: '" + file + "'.");
+          }
+      }
+      */
+    }
 
-        /**
-         * Return the type associated with this dictionary element.
-         */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
+    /** Return a textual description of this type. */
+    @Override
+    public String toString() {
+      return this.description;
     }
 
+    private static boolean isCharLiteral(String s) {
+      return s.length() > 2 && '\'' == s.charAt(0) && '\'' == s.charAt(s.length() - 1);
+    }
+  }
+
+  /**
+   * Clock synchronization options.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum ClockSyncOption implements DictionaryElement {
+    ATTENUATION("attenuation", PrimitiveType.NON_NEGATIVE_INTEGER),
+    LOCAL_FEDERATES_ON("local-federates-on", PrimitiveType.BOOLEAN),
+    PERIOD("period", PrimitiveType.TIME_VALUE),
+    TEST_OFFSET("test-offset", PrimitiveType.TIME_VALUE),
+    TRIALS("trials", PrimitiveType.NON_NEGATIVE_INTEGER),
+    COLLECT_STATS("collect-stats", PrimitiveType.BOOLEAN);
+
+    public final PrimitiveType type;
+
+    private final String description;
+
+    private ClockSyncOption(String alias, PrimitiveType type) {
+      this.description = alias;
+      this.type = type;
+    }
 
-    /**
-     * Platform options.
-     * @author Anirudh Rengarajan
-     */
-    public enum PlatformOption implements DictionaryElement {
-        NAME("name", PrimitiveType.STRING),
-        BAUDRATE("baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER),
-        BOARD("board", PrimitiveType.STRING),
-        FLASH("flash", PrimitiveType.BOOLEAN),
-        PORT("port", PrimitiveType.STRING);
+    /** Return the description of this dictionary element. */
+    @Override
+    public String toString() {
+      return this.description;
+    }
 
-        public final PrimitiveType type;
+    /** Return the type associated with this dictionary element. */
+    public TargetPropertyType getType() {
+      return this.type;
+    }
+  }
 
-        private final String description;
+  /**
+   * Docker options.
+   *
+   * @author Edward A. Lee
+   */
+  public enum DockerOption implements DictionaryElement {
+    FROM("FROM", PrimitiveType.STRING);
 
-        private PlatformOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
+    public final PrimitiveType type;
 
+    private final String description;
 
-        /**
-         * Return the description of this dictionary element.
-         */
-        @Override
-        public String toString() {
-            return this.description;
-        }
+    private DockerOption(String alias, PrimitiveType type) {
+      this.description = alias;
+      this.type = type;
+    }
 
-        /**
-         * Return the type associated with this dictionary element.
-         */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
+    /** Return the description of this dictionary element. */
+    @Override
+    public String toString() {
+      return this.description;
     }
 
-    /**
-     * Coordination options.
-     * @author Edward A. Lee
-     */
-    public enum CoordinationOption implements DictionaryElement {
-        ADVANCE_MESSAGE_INTERVAL("advance-message-interval", PrimitiveType.TIME_VALUE);
+    /** Return the type associated with this dictionary element. */
+    public TargetPropertyType getType() {
+      return this.type;
+    }
+  }
+
+  /**
+   * Platform options.
+   *
+   * @author Anirudh Rengarajan
+   */
+  public enum PlatformOption implements DictionaryElement {
+    NAME("name", PrimitiveType.STRING),
+    BAUDRATE("baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER),
+    BOARD("board", PrimitiveType.STRING),
+    FLASH("flash", PrimitiveType.BOOLEAN),
+    PORT("port", PrimitiveType.STRING);
+
+    public final PrimitiveType type;
+
+    private final String description;
+
+    private PlatformOption(String alias, PrimitiveType type) {
+      this.description = alias;
+      this.type = type;
+    }
 
-        public final PrimitiveType type;
+    /** Return the description of this dictionary element. */
+    @Override
+    public String toString() {
+      return this.description;
+    }
 
-        private final String description;
+    /** Return the type associated with this dictionary element. */
+    public TargetPropertyType getType() {
+      return this.type;
+    }
+  }
 
-        private CoordinationOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
+  /**
+   * Coordination options.
+   *
+   * @author Edward A. Lee
+   */
+  public enum CoordinationOption implements DictionaryElement {
+    ADVANCE_MESSAGE_INTERVAL("advance-message-interval", PrimitiveType.TIME_VALUE);
 
+    public final PrimitiveType type;
 
-        /**
-         * Return the description of this dictionary element.
-         */
-        @Override
-        public String toString() {
-            return this.description;
-        }
+    private final String description;
 
-        /**
-         * Return the type associated with this dictionary element.
-         */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
+    private CoordinationOption(String alias, PrimitiveType type) {
+      this.description = alias;
+      this.type = type;
     }
 
-    /**
-     * Log levels in descending order of severity.
-     * @author Marten Lohstroh
-     */
-    public enum LogLevel {
-        ERROR, WARN, INFO, LOG, DEBUG;
-
-        /**
-         * Return the name in lower case.
-         */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
+    /** Return the description of this dictionary element. */
+    @Override
+    public String toString() {
+      return this.description;
     }
 
-    /**
-     * Enumeration of supported platforms
-     */
-    public enum Platform {
-        AUTO,
-        ARDUINO,
-        NRF52("Nrf52"),
-        LINUX("Linux"),
-        MAC("Darwin"),
-        ZEPHYR("Zephyr"),
-        WINDOWS("Windows");
-
-        String cMakeName;
-        Platform() {
-            this.cMakeName = this.toString();
-        }
-        Platform(String cMakeName) {
-            this.cMakeName = cMakeName;
-        }
+    /** Return the type associated with this dictionary element. */
+    public TargetPropertyType getType() {
+      return this.type;
+    }
+  }
+
+  /**
+   * Log levels in descending order of severity.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum LogLevel {
+    ERROR,
+    WARN,
+    INFO,
+    LOG,
+    DEBUG;
+
+    /** Return the name in lower case. */
+    @Override
+    public String toString() {
+      return this.name().toLowerCase();
+    }
+  }
+
+  /** Enumeration of supported platforms */
+  public enum Platform {
+    AUTO,
+    ARDUINO,
+    NRF52("Nrf52"),
+    LINUX("Linux"),
+    MAC("Darwin"),
+    ZEPHYR("Zephyr"),
+    WINDOWS("Windows");
+
+    String cMakeName;
+
+    Platform() {
+      this.cMakeName = this.toString();
+    }
 
-        /**
-         * Return the name in lower case.
-         */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
+    Platform(String cMakeName) {
+      this.cMakeName = cMakeName;
+    }
 
-        /**
-         * Get the CMake name for the platform.
-         */
-        public String getcMakeName() {
-            return this.cMakeName;
-        }
+    /** Return the name in lower case. */
+    @Override
+    public String toString() {
+      return this.name().toLowerCase();
     }
 
-    /**
-     * Supported schedulers.
-     * @author Soroush Bateni
-     */
-    public enum SchedulerOption {
-        NP(false),         // Non-preemptive
-        ADAPTIVE(false, List.of(
+    /** Get the CMake name for the platform. */
+    public String getcMakeName() {
+      return this.cMakeName;
+    }
+  }
+
+  /**
+   * Supported schedulers.
+   *
+   * @author Soroush Bateni
+   */
+  public enum SchedulerOption {
+    NP(false), // Non-preemptive
+    ADAPTIVE(
+        false,
+        List.of(
             Path.of("scheduler_adaptive.c"),
             Path.of("worker_assignments.h"),
             Path.of("worker_states.h"),
-            Path.of("data_collection.h")
-        )),
-        GEDF_NP(true),    // Global EDF non-preemptive
-        GEDF_NP_CI(true); // Global EDF non-preemptive with chain ID
-        // PEDF_NP(true);    // Partitioned EDF non-preemptive (FIXME: To be re-added in a future PR)
-
-        /**
-         * Indicate whether or not the scheduler prioritizes reactions by deadline.
-         */
-        private final boolean prioritizesDeadline;
-
-        /** Relative paths to files required by this scheduler. */
-        private final List<Path> relativePaths;
-
-        SchedulerOption(boolean prioritizesDeadline) {
-            this(prioritizesDeadline, null);
-        }
+            Path.of("data_collection.h"))),
+    GEDF_NP(true), // Global EDF non-preemptive
+    GEDF_NP_CI(true); // Global EDF non-preemptive with chain ID
+    // PEDF_NP(true);    // Partitioned EDF non-preemptive (FIXME: To be re-added in a future PR)
 
-        SchedulerOption(boolean prioritizesDeadline, List<Path> relativePaths) {
-            this.prioritizesDeadline = prioritizesDeadline;
-            this.relativePaths = relativePaths;
-        }
+    /** Indicate whether or not the scheduler prioritizes reactions by deadline. */
+    private final boolean prioritizesDeadline;
 
-        /**
-         * Return true if the scheduler prioritizes reactions by deadline.
-         */
-        public boolean prioritizesDeadline() {
-            return this.prioritizesDeadline;
-        }
+    /** Relative paths to files required by this scheduler. */
+    private final List<Path> relativePaths;
 
-        public List<Path> getRelativePaths() {
-            return relativePaths != null ? ImmutableList.copyOf(relativePaths) :
-                   List.of(Path.of("scheduler_" + this + ".c"));
-        }
+    SchedulerOption(boolean prioritizesDeadline) {
+      this(prioritizesDeadline, null);
+    }
 
-        public static SchedulerOption getDefault() {
-            return NP;
-        }
+    SchedulerOption(boolean prioritizesDeadline, List<Path> relativePaths) {
+      this.prioritizesDeadline = prioritizesDeadline;
+      this.relativePaths = relativePaths;
     }
 
-    /**
-     * Tracing options.
-     * @author Edward A. Lee
-     */
-    public enum TracingOption implements DictionaryElement {
-        TRACE_FILE_NAME("trace-file-name", PrimitiveType.STRING);
+    /** Return true if the scheduler prioritizes reactions by deadline. */
+    public boolean prioritizesDeadline() {
+      return this.prioritizesDeadline;
+    }
 
-        public final PrimitiveType type;
+    public List<Path> getRelativePaths() {
+      return relativePaths != null
+          ? ImmutableList.copyOf(relativePaths)
+          : List.of(Path.of("scheduler_" + this + ".c"));
+    }
 
-        private final String description;
+    public static SchedulerOption getDefault() {
+      return NP;
+    }
+  }
 
-        private TracingOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
+  /**
+   * Tracing options.
+   *
+   * @author Edward A. Lee
+   */
+  public enum TracingOption implements DictionaryElement {
+    TRACE_FILE_NAME("trace-file-name", PrimitiveType.STRING);
 
-        /**
-         * Return the description of this dictionary element.
-         */
-        @Override
-        public String toString() {
-            return this.description;
-        }
+    public final PrimitiveType type;
 
-        /**
-         * Return the type associated with this dictionary element.
-         */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
+    private final String description;
+
+    private TracingOption(String alias, PrimitiveType type) {
+      this.description = alias;
+      this.type = type;
     }
 
+    /** Return the description of this dictionary element. */
+    @Override
+    public String toString() {
+      return this.description;
+    }
+
+    /** Return the type associated with this dictionary element. */
+    public TargetPropertyType getType() {
+      return this.type;
+    }
+  }
 }
diff --git a/org.lflang/src/org/lflang/TimeUnit.java b/org.lflang/src/org/lflang/TimeUnit.java
index 00c6314e51..a39bd505e8 100644
--- a/org.lflang/src/org/lflang/TimeUnit.java
+++ b/org.lflang/src/org/lflang/TimeUnit.java
@@ -38,82 +38,73 @@
  * @author Clément Fournier, TU Dresden, INSA Rennes
  */
 public enum TimeUnit {
-    /** Nanoseconds. */
-    NANO("nsec", "ns", "nsecs"),
-    /** Microseconds. */
-    MICRO("usec", "us", "usecs"),
-    /** Milliseconds. */
-    MILLI("msec", "ms", "msecs"),
-    /** Seconds. */
-    SECOND("sec", "s", "secs", "second", "seconds"),
-    /** Minute. */ // NOTE: Do not use MIN as the first entry. Common macro for minimum.
-    MINUTE("minute", "min", "mins", "minutes"),
-    /** Hour. */
-    HOUR("hour", "h", "hours"),
-    /** Day. */
-    DAY("day", "d", "days"),
-    WEEK("week", "weeks"),
-    ;
+  /** Nanoseconds. */
+  NANO("nsec", "ns", "nsecs"),
+  /** Microseconds. */
+  MICRO("usec", "us", "usecs"),
+  /** Milliseconds. */
+  MILLI("msec", "ms", "msecs"),
+  /** Seconds. */
+  SECOND("sec", "s", "secs", "second", "seconds"),
+  /** Minute. */
+  // NOTE: Do not use MIN as the first entry. Common macro for minimum.
+  MINUTE("minute", "min", "mins", "minutes"),
+  /** Hour. */
+  HOUR("hour", "h", "hours"),
+  /** Day. */
+  DAY("day", "d", "days"),
+  WEEK("week", "weeks"),
+  ;
 
-    private final Set<String> allNames;
-    private final String canonicalName;
+  private final Set<String> allNames;
+  private final String canonicalName;
 
-    TimeUnit(String canonicalName, String... aliases) {
-        this.canonicalName = canonicalName;
-        this.allNames = immutableSetOf(canonicalName, aliases);
-    }
+  TimeUnit(String canonicalName, String... aliases) {
+    this.canonicalName = canonicalName;
+    this.allNames = immutableSetOf(canonicalName, aliases);
+  }
 
+  /** Returns the name that is preferred when displaying this unit. */
+  public String getCanonicalName() {
+    return canonicalName;
+  }
 
-    /**
-     * Returns the name that is preferred when displaying this unit.
-     */
-    public String getCanonicalName() {
-        return canonicalName;
-    }
+  /** Returns true if the given name is one of the aliases of this unit. */
+  public boolean hasAlias(String name) {
+    return allNames.contains(name);
+  }
 
-    /** Returns true if the given name is one of the aliases of this unit. */
-    public boolean hasAlias(String name) {
-        return allNames.contains(name);
+  /**
+   * Returns the constant corresponding to the given name. The comparison is case-sensitive.
+   *
+   * @return Null if the parameter is null, otherwise a non-null constant
+   * @throws IllegalArgumentException If the name doesn't correspond to any constant
+   */
+  public static TimeUnit fromName(String name) {
+    if (name == null) {
+      return null;
     }
+    return Arrays.stream(values())
+        .filter(it -> it.hasAlias(name))
+        .findFirst()
+        .orElseThrow(() -> new IllegalArgumentException("invalid name '" + name + "'"));
+  }
 
-
-    /**
-     * Returns the constant corresponding to the given name.
-     * The comparison is case-sensitive.
-     *
-     * @return Null if the parameter is null, otherwise a non-null constant
-     * @throws IllegalArgumentException If the name doesn't correspond to any constant
-     */
-    public static TimeUnit fromName(String name) {
-        if (name == null) {
-            return null;
-        }
-        return Arrays.stream(values())
-                     .filter(it -> it.hasAlias(name))
-                     .findFirst()
-                     .orElseThrow(() -> new IllegalArgumentException("invalid name '" + name + "'"));
+  /** Returns true if the parameter is null, or it is the alias of a valid time unit. */
+  public static boolean isValidUnit(String name) {
+    if (name == null) {
+      return false;
     }
+    return Arrays.stream(values()).anyMatch(it -> it.hasAlias(name));
+  }
 
-    /**
-     * Returns true if the parameter is null, or it is the
-     * alias of a valid time unit.
-     */
-    public static boolean isValidUnit(String name) {
-        if (name == null) {
-            return false;
-        }
-        return Arrays.stream(values()).anyMatch(it -> it.hasAlias(name));
-    }
+  /** Returns a list of all possible aliases for time values. */
+  public static List<String> list() {
+    return Arrays.stream(values()).flatMap(it -> it.allNames.stream()).collect(Collectors.toList());
+  }
 
-    /**
-     * Returns a list of all possible aliases for time values.
-     */
-    public static List<String> list() {
-        return Arrays.stream(values()).flatMap(it -> it.allNames.stream()).collect(Collectors.toList());
-    }
-
-    @Override
-    public String toString() {
-        return this.canonicalName;
-    }
+  @Override
+  public String toString() {
+    return this.canonicalName;
+  }
 }
diff --git a/org.lflang/src/org/lflang/TimeValue.java b/org.lflang/src/org/lflang/TimeValue.java
index f008a0ae4b..f0bb94820c 100644
--- a/org.lflang/src/org/lflang/TimeValue.java
+++ b/org.lflang/src/org/lflang/TimeValue.java
@@ -1,27 +1,27 @@
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang;
 
@@ -33,172 +33,152 @@
  */
 public final class TimeValue implements Comparable<TimeValue> {
 
-    /**
-     * The maximum value of this type. This is approximately equal to 292 years.
-     */
-    public static final TimeValue MAX_VALUE = new TimeValue(Long.MAX_VALUE, TimeUnit.NANO);
-    /**
-     * A time value equal to zero.
-     */
-    public static final TimeValue ZERO = new TimeValue(0, null);
-
-
-    /**
-     * Primitive numerical representation of this time value,
-     * to be interpreted in terms the associated time unit.
-     */
-    public final long time;
-
-    /**
-     * Units associated with this time value. May be null.
-     */
-    public final TimeUnit unit;
-
-    /**
-     * Maximum size of a deadline in primitive representation.
-     * NOTE: if we were to use an unsigned data type this would be
-     * 0xFFFFFFFFFFFF
-     */
-    public static final long MAX_LONG_DEADLINE = Long.decode("0x7FFFFFFFFFFF");
-
-    /**
-     * Create a new time value.
-     *
-     * @throws IllegalArgumentException If time is non-zero and the unit is null
-     */
-    public TimeValue(long time, TimeUnit unit) {
-        if (unit == null && time != 0) {
-            throw new IllegalArgumentException("Non-zero time values must have a unit");
-        }
-        this.time = time;
-        this.unit = unit;
-    }
-
-    @Override
-    public boolean equals(Object t1) {
-        if (t1 instanceof TimeValue) {
-            return this.compareTo((TimeValue) t1) == 0;
-        }
-        return false;
-    }
-    
-    public static int compare(TimeValue t1, TimeValue t2) {
-        if (t1.isEarlierThan(t2)) {
-            return -1;
-        }
-        if (t2.isEarlierThan(t1)) {
-            return 1;
-        }
-        return 0;
-    }
-    
-    private static long makeNanosecs(long time, TimeUnit unit) {
-        if (unit == null) {
-            return time; // == 0, see constructor.
-        }
-        switch (unit) {
-        case NANO:
-            return time;
-        case MICRO:
-            return time * 1000;
-        case MILLI:
-            return time * 1_000_000;
-        case SECOND:
-            return time * 1_000_000_000;
-        case MINUTE:
-            return time * 60_000_000_000L;
-        case HOUR:
-            return time * 3_600_000_000_000L;
-        case DAY:
-            return time * 86_400_000_000_000L;
-        case WEEK:
-            return time * 604_800_016_558_522L;
-        }
-        throw new AssertionError("unreachable");
-    }
-
-    /**
-     * Returns whether this time value is earlier than another.
-     */
-    public boolean isEarlierThan(TimeValue other) {
-        return this.compareTo(other) < 0;
+  /** The maximum value of this type. This is approximately equal to 292 years. */
+  public static final TimeValue MAX_VALUE = new TimeValue(Long.MAX_VALUE, TimeUnit.NANO);
+  /** A time value equal to zero. */
+  public static final TimeValue ZERO = new TimeValue(0, null);
+
+  /**
+   * Primitive numerical representation of this time value, to be interpreted in terms the
+   * associated time unit.
+   */
+  public final long time;
+
+  /** Units associated with this time value. May be null. */
+  public final TimeUnit unit;
+
+  /**
+   * Maximum size of a deadline in primitive representation. NOTE: if we were to use an unsigned
+   * data type this would be 0xFFFFFFFFFFFF
+   */
+  public static final long MAX_LONG_DEADLINE = Long.decode("0x7FFFFFFFFFFF");
+
+  /**
+   * Create a new time value.
+   *
+   * @throws IllegalArgumentException If time is non-zero and the unit is null
+   */
+  public TimeValue(long time, TimeUnit unit) {
+    if (unit == null && time != 0) {
+      throw new IllegalArgumentException("Non-zero time values must have a unit");
     }
-
-    @Override
-    public int compareTo(TimeValue o) {
-        return Long.compare(this.toNanoSeconds(), o.toNanoSeconds());
+    this.time = time;
+    this.unit = unit;
+  }
+
+  @Override
+  public boolean equals(Object t1) {
+    if (t1 instanceof TimeValue) {
+      return this.compareTo((TimeValue) t1) == 0;
     }
+    return false;
+  }
 
-    /**
-     * Return the magnitude of this value, as expressed in the
-     * {@linkplain #getUnit() unit} of this value.
-     */
-    public long getMagnitude() {
-        return time;
+  public static int compare(TimeValue t1, TimeValue t2) {
+    if (t1.isEarlierThan(t2)) {
+      return -1;
     }
-
-    /**
-     * Units associated with this time value. May be null,
-     * but only if the magnitude is zero.
-     */
-    public TimeUnit getUnit() {
-        return unit;
+    if (t2.isEarlierThan(t1)) {
+      return 1;
     }
+    return 0;
+  }
 
-    /**
-     * Get this time value in number of nanoseconds.
-     */
-    public long toNanoSeconds() {
-        return makeNanosecs(time, unit);
+  private static long makeNanosecs(long time, TimeUnit unit) {
+    if (unit == null) {
+      return time; // == 0, see constructor.
     }
-
-    /**
-     * Return a string representation of this time value.
-     */
-    public String toString() {
-        return unit != null ? time + " " + unit.getCanonicalName()
-                                     : Long.toString(time);
+    switch (unit) {
+      case NANO:
+        return time;
+      case MICRO:
+        return time * 1000;
+      case MILLI:
+        return time * 1_000_000;
+      case SECOND:
+        return time * 1_000_000_000;
+      case MINUTE:
+        return time * 60_000_000_000L;
+      case HOUR:
+        return time * 3_600_000_000_000L;
+      case DAY:
+        return time * 86_400_000_000_000L;
+      case WEEK:
+        return time * 604_800_016_558_522L;
     }
-
-    /** Return the latest of both values. */
-    public static TimeValue max(TimeValue t1, TimeValue t2) {
-        return t1.isEarlierThan(t2) ? t2 : t1;
+    throw new AssertionError("unreachable");
+  }
+
+  /** Returns whether this time value is earlier than another. */
+  public boolean isEarlierThan(TimeValue other) {
+    return this.compareTo(other) < 0;
+  }
+
+  @Override
+  public int compareTo(TimeValue o) {
+    return Long.compare(this.toNanoSeconds(), o.toNanoSeconds());
+  }
+
+  /**
+   * Return the magnitude of this value, as expressed in the {@linkplain #getUnit() unit} of this
+   * value.
+   */
+  public long getMagnitude() {
+    return time;
+  }
+
+  /** Units associated with this time value. May be null, but only if the magnitude is zero. */
+  public TimeUnit getUnit() {
+    return unit;
+  }
+
+  /** Get this time value in number of nanoseconds. */
+  public long toNanoSeconds() {
+    return makeNanosecs(time, unit);
+  }
+
+  /** Return a string representation of this time value. */
+  public String toString() {
+    return unit != null ? time + " " + unit.getCanonicalName() : Long.toString(time);
+  }
+
+  /** Return the latest of both values. */
+  public static TimeValue max(TimeValue t1, TimeValue t2) {
+    return t1.isEarlierThan(t2) ? t2 : t1;
+  }
+
+  /** Return the earliest of both values. */
+  public static TimeValue min(TimeValue t1, TimeValue t2) {
+    return t1.isEarlierThan(t2) ? t1 : t2;
+  }
+
+  /**
+   * Return the sum of this duration and the one represented by b.
+   *
+   * <p>The unit of the returned TimeValue will be the minimum of the units of both operands except
+   * if only one of the units is TimeUnit.NONE. In that case, the unit of the other input is used.
+   *
+   * @param b The right operand
+   * @return A new TimeValue (the current value will not be affected)
+   */
+  public TimeValue add(TimeValue b) {
+    // Figure out the actual sum
+    final long sumOfNumbers;
+    try {
+      sumOfNumbers = Math.addExact(this.toNanoSeconds(), b.toNanoSeconds());
+    } catch (ArithmeticException overflow) {
+      return MAX_VALUE;
     }
 
-    /** Return the earliest of both values. */
-    public static TimeValue min(TimeValue t1, TimeValue t2) {
-        return t1.isEarlierThan(t2) ? t1 : t2;
+    if (this.unit == null || b.unit == null) {
+      // A time value with no unit is necessarily zero. So
+      // if this is null, (this + b) == b, if b is none, (this+b) == this.
+      return b.unit == null ? this : b;
     }
-    
-    /**
-     * Return the sum of this duration and the one represented by b.
-     * <p>
-     * The unit of the returned TimeValue will be the minimum
-     * of the units of both operands except if only one of the units
-     * is TimeUnit.NONE. In that case, the unit of the other input is used.
-     *
-     * @param b The right operand
-     * @return A new TimeValue (the current value will not be affected)
-     */
-    public TimeValue add(TimeValue b) {
-        // Figure out the actual sum
-        final long sumOfNumbers;
-        try {
-            sumOfNumbers = Math.addExact(this.toNanoSeconds(), b.toNanoSeconds());
-        } catch (ArithmeticException overflow) {
-            return MAX_VALUE;
-        }
-
-        if (this.unit == null || b.unit == null) {
-            // A time value with no unit is necessarily zero. So
-            // if this is null, (this + b) == b, if b is none, (this+b) == this.
-            return b.unit == null ? this : b;
-        }
-        boolean isThisUnitSmallerThanBUnit = this.unit.compareTo(b.unit) <= 0;
-        TimeUnit smallestUnit = isThisUnitSmallerThanBUnit ? this.unit : b.unit;
-        // Find the appropriate divider to bring sumOfNumbers from nanoseconds to returnUnit
-        var unitDivider = makeNanosecs(1, smallestUnit);
-        return new TimeValue(sumOfNumbers / unitDivider, smallestUnit);
-    }
-
+    boolean isThisUnitSmallerThanBUnit = this.unit.compareTo(b.unit) <= 0;
+    TimeUnit smallestUnit = isThisUnitSmallerThanBUnit ? this.unit : b.unit;
+    // Find the appropriate divider to bring sumOfNumbers from nanoseconds to returnUnit
+    var unitDivider = makeNanosecs(1, smallestUnit);
+    return new TimeValue(sumOfNumbers / unitDivider, smallestUnit);
+  }
 }
diff --git a/org.lflang/src/org/lflang/ast/ASTUtils.java b/org.lflang/src/org/lflang/ast/ASTUtils.java
index 26d4e0d6b0..91ff7ac69a 100644
--- a/org.lflang/src/org/lflang/ast/ASTUtils.java
+++ b/org.lflang/src/org/lflang/ast/ASTUtils.java
@@ -25,6 +25,9 @@
 
 package org.lflang.ast;
 
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Iterators;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -39,7 +42,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
-
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -54,7 +56,6 @@
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
-
 import org.lflang.InferredType;
 import org.lflang.Target;
 import org.lflang.TimeUnit;
@@ -100,1793 +101,1768 @@
 import org.lflang.lf.WidthTerm;
 import org.lflang.util.StringUtil;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Iterators;
-
 /**
  * A helper class for modifying and analyzing the AST.
+ *
  * @author Marten Lohstroh
  * @author Edward A. Lee
  * @author Christian Menard
  */
 public class ASTUtils {
 
-    /**
-     * The Lingua Franca factory for creating new AST nodes.
-     */
-    public static final LfFactory factory = LfFactory.eINSTANCE;
-
-    /**
-     * The Lingua Franca feature package.
-     */
-    public static final LfPackage featurePackage = LfPackage.eINSTANCE;
-
-    /* Match an abbreviated form of a float literal. */
-    private static final Pattern ABBREVIATED_FLOAT = Pattern.compile("[+\\-]?\\.\\d+[\\deE+\\-]*");
-
-    /**
-     * A mapping from Reactor features to corresponding Mode features for collecting contained elements.
-     */
-    private static final Map<EStructuralFeature, EStructuralFeature> reactorModeFeatureMap = Map.of(
-            featurePackage.getReactor_Actions(),        featurePackage.getMode_Actions(),
-            featurePackage.getReactor_Connections(),    featurePackage.getMode_Connections(),
-            featurePackage.getReactor_Instantiations(), featurePackage.getMode_Instantiations(),
-            featurePackage.getReactor_Reactions(),      featurePackage.getMode_Reactions(),
-            featurePackage.getReactor_StateVars(),      featurePackage.getMode_StateVars(),
-            featurePackage.getReactor_Timers(),         featurePackage.getMode_Timers()
-            );
-
-
-    /**
-     * Get all reactors defined in the given resource.
-     * @param resource the resource to extract reactors from
-     * @return An iterable over all reactors found in the resource
-     */
-    public static List<Reactor> getAllReactors(Resource resource) {
-        return StreamSupport.stream(IteratorExtensions.toIterable(resource.getAllContents()).spliterator(), false)
-                     .filter(Reactor.class::isInstance)
-                     .map(Reactor.class::cast)
-                     .collect(Collectors.toList());
-    }
-
-    /**
-     * Find connections in the given resource that would be conflicting writes if they were not located in mutually
-     * exclusive modes.
-     *
-     * @param resource The AST.
-     * @return a list of connections being able to be transformed
-     */
-    public static Collection<Connection> findConflictingConnectionsInModalReactors(Resource resource) {
-        var transform = new HashSet<Connection>();
-
-        for (Reactor reactor : getAllReactors(resource)) {
-            if (!reactor.getModes().isEmpty()) { // Only for modal reactors
-                var allWriters = HashMultimap.<Pair<Instantiation, Variable>, EObject>create();
-
-                // Collect destinations
-                for (var rea : allReactions(reactor)) {
-                    for (var eff : rea.getEffects()) {
-                        if (eff.getVariable() instanceof Port) {
-                            allWriters.put(Tuples.pair(eff.getContainer(), eff.getVariable()), rea);
-                        }
-                    }
-                }
-                for (var con : ASTUtils.<Connection>collectElements(reactor, featurePackage.getReactor_Connections(), false, true)) {
-                    for (var port : con.getRightPorts()) {
-                        allWriters.put(Tuples.pair(port.getContainer(), port.getVariable()), con);
-                    }
-                }
-
-                // Handle conflicting writers
-                for (var key : allWriters.keySet()) {
-                    var writers = allWriters.get(key);
-                    if (writers.size() > 1) { // has multiple sources
-                        var writerModes = HashMultimap.<Mode, EObject>create();
-                        // find modes
-                        for (var writer : writers) {
-                            if (writer.eContainer() instanceof Mode) {
-                                writerModes.put((Mode) writer.eContainer(), writer);
-                            } else {
-                                writerModes.put(null, writer);
-                            }
-                        }
-                        // Conflicting connection can only be handled if..
-                        if (!writerModes.containsKey(null) && // no writer is on root level (outside of modes) and...
-                            writerModes.keySet().stream().map(writerModes::get).allMatch(writersInMode -> // all writers in a mode are either...
-                                writersInMode.size() == 1 || // the only writer or...
-                                writersInMode.stream().allMatch(w -> w instanceof Reaction) // all are reactions and hence ordered
-                            )) {
-                            // Add connections to transform list
-                            writers.stream().filter(w -> w instanceof Connection).forEach(c -> transform.add((Connection) c));
-                        }
-                    }
-                }
-            }
-        }
-
-        return transform;
-    }
-
-    /**
-     * Return the enclosing reactor of an LF EObject in a reactor or mode.
-     * @param obj the LF model element
-     * @return the reactor or null
-     */
-    public static Reactor getEnclosingReactor(EObject obj) {
-        if (obj.eContainer() instanceof Reactor) {
-            return (Reactor) obj.eContainer();
-        } else if (obj.eContainer() instanceof Mode) {
-            return (Reactor) obj.eContainer().eContainer();
-        }
-        return null;
-    }
-
-    /**
-     * Return the main reactor in the given resource if there is one, null otherwise.
-     */
-    public static Reactor findMainReactor(Resource resource) {
-        return IteratorExtensions.findFirst(
-                Iterators.filter(resource.getAllContents(), Reactor.class),
-                Reactor::isMain
-        );
-    }
-
-    /**
-     * Find the main reactor and change it to a federated reactor.
-     * Return true if the transformation was successful (or the given resource
-     * already had a federated reactor); return false otherwise.
-     */
-    public static boolean makeFederated(Resource resource) {
-        // Find the main reactor
-        Reactor r = findMainReactor(resource);
-        if (r == null) {
-            return false;
-        }
-        r.setMain(false);
-        r.setFederated(true);
-        return true;
-    }
-
-    /**
-     * Change the target name to 'newTargetName'.
-     * For example, change C to CCpp.
-     */
-    public static boolean changeTargetName(Resource resource, String newTargetName) {
-        targetDecl(resource).setName(newTargetName);
-        return true;
-    }
-
-    /**
-     * Return the target of the file in which the given node lives.
-     */
-    public static Target getTarget(EObject object) {
-        TargetDecl targetDecl = targetDecl(object.eResource());
-        return Target.fromDecl(targetDecl);
-    }
-
-    /**
-     * Add a new target property to the given resource.
-     * This also creates a config object if the resource does not yey have one.
-     *
-     * @param resource The resource to modify
-     * @param name Name of the property to add
-     * @param value Value to be assigned to the property
-     */
-    public static boolean addTargetProperty(final Resource resource, final String name, final Element value) {
-        var config = targetDecl(resource).getConfig();
-        if (config == null) {
-            config = LfFactory.eINSTANCE.createKeyValuePairs();
-            targetDecl(resource).setConfig(config);
-        }
-        final var newProperty = LfFactory.eINSTANCE.createKeyValuePair();
-        newProperty.setName(name);
-        newProperty.setValue(value);
-        config.getPairs().add(newProperty);
-        return true;
-    }
-
-    /**
-     * Return true if the connection involves multiple ports on the left or right side of the connection, or
-     * if the port on the left or right of the connection involves a bank of reactors or a multiport.
-     * @param connection The connection.
-     */
-    public static boolean hasMultipleConnections(Connection connection) {
-        if (connection.getLeftPorts().size() > 1 || connection.getRightPorts().size() > 1) {
-            return true;
-        }
-        VarRef leftPort = connection.getLeftPorts().get(0);
-        VarRef rightPort = connection.getRightPorts().get(0);
-        Instantiation leftContainer = leftPort.getContainer();
-        Instantiation rightContainer = rightPort.getContainer();
-        Port leftPortAsPort = (Port) leftPort.getVariable();
-        Port rightPortAsPort = (Port) rightPort.getVariable();
-        return leftPortAsPort.getWidthSpec() != null
-            || leftContainer != null && leftContainer.getWidthSpec() != null
-            || rightPortAsPort.getWidthSpec() != null
-            || rightContainer != null && rightContainer.getWidthSpec() != null;
-    }
-
-    /**
-     * Produce a unique identifier within a reactor based on a
-     * given based name. If the name does not exists, it is returned;
-     * if does exist, an index is appended that makes the name unique.
-     * @param reactor The reactor to find a unique identifier within.
-     * @param name The name to base the returned identifier on.
-     */
-    public static String getUniqueIdentifier(Reactor reactor, String name) {
-        LinkedHashSet<String> vars = new LinkedHashSet<>();
-        allActions(reactor).forEach(it -> vars.add(it.getName()));
-        allTimers(reactor).forEach(it -> vars.add(it.getName()));
-        allParameters(reactor).forEach(it -> vars.add(it.getName()));
-        allInputs(reactor).forEach(it -> vars.add(it.getName()));
-        allOutputs(reactor).forEach(it -> vars.add(it.getName()));
-        allStateVars(reactor).forEach(it -> vars.add(it.getName()));
-        allInstantiations(reactor).forEach(it -> vars.add(it.getName()));
-
-        int index = 0;
-        String suffix = "";
-        boolean exists = true;
-        while (exists) {
-            String id = name + suffix;
-            if (IterableExtensions.exists(vars, it -> it.equals(id))) {
-                suffix = "_" + index;
-                index++;
-            } else {
-                exists = false;
-            }
-        }
-        return name + suffix;
-    }
-
-    ////////////////////////////////
-    //// Utility functions for supporting inheritance and modes
-
-    /**
-     * Given a reactor class, return a list of all its actions,
-     * which includes actions of base classes that it extends.
-     * This also includes actions in modes, returning a flattened
-     * view over all modes.
-     * @param definition Reactor class definition.
-     */
-    public static List<Action> allActions(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Actions());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its connections,
-     * which includes connections of base classes that it extends.
-     * This also includes connections in modes, returning a flattened
-     * view over all modes.
-     * @param definition Reactor class definition.
-     */
-    public static List<Connection> allConnections(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Connections());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its inputs,
-     * which includes inputs of base classes that it extends.
-     * If the base classes include a cycle, where X extends Y and Y extends X,
-     * then return only the input defined in the base class.
-     * The returned list may be empty.
-     * @param definition Reactor class definition.
-     */
-    public static List<Input> allInputs(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Inputs());
-    }
-
-    /** A list of all ports of {@code definition}, in an unspecified order. */
-    public static List<Port> allPorts(Reactor definition) {
-        return Stream.concat(ASTUtils.allInputs(definition).stream(), ASTUtils.allOutputs(definition).stream()).toList();
-    }
-
-    /**
-     * Given a reactor class, return a list of all its preambles,
-     * which includes preambles of base classes that it extends.
-     * If the base classes include a cycle, where X extends Y and Y extends X,
-     * then return only the input defined in the base class.
-     * The returned list may be empty.
-     * @param definition Reactor class definition.
-     */
-    public static List<Preamble> allPreambles(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Preambles());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its instantiations,
-     * which includes instantiations of base classes that it extends.
-     * This also includes instantiations in modes, returning a flattened
-     * view over all modes.
-     * @param definition Reactor class definition.
-     */
-    public static List<Instantiation> allInstantiations(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Instantiations());
-    }
-
-    /**
-     * Given a reactor Class, return a set of include names for
-     * interacting reactors which includes all instantiations of base class that it extends.
-     *
-     * @param r Reactor Class
-     * */
-    public static HashSet<String> allIncludes(Reactor r) {
-        var set = new HashSet<String>();
-        for (var i : allInstantiations(r))
-        {
-            set.add(CUtil.getName(new TypeParameterizedReactor(i)));
-        }
-        return set;
-    }
-
-    /*
-     * Given a reactor class, return a stream of reactor classes that it instantiates.
-     * @param definition Reactor class definition.
-     * @return A stream of reactor classes.
-     */
-    public static Stream<Reactor> allNestedClasses(Reactor definition) {
-        return new HashSet<>(ASTUtils.allInstantiations(definition)).stream()
-            .map(Instantiation::getReactorClass)
-            .map(ASTUtils::toDefinition);
-    }
-
-    /**
-     * Given a reactor class, return a list of all its methods,
-     * which includes methods of base classes that it extends.
-     * @param definition Reactor class definition.
-     */
-    public static List<Method> allMethods(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Methods());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its outputs,
-     * which includes outputs of base classes that it extends.
-     * @param definition Reactor class definition.
-     */
-    public static List<Output> allOutputs(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Outputs());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its parameters,
-     * which includes parameters of base classes that it extends.
-     * @param definition Reactor class definition.
-     */
-    public static List<Parameter> allParameters(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Parameters());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its reactions,
-     * which includes reactions of base classes that it extends.
-     * This also includes reactions in modes, returning a flattened
-     * view over all modes.
-     * @param definition Reactor class definition.
-     */
-    public static List<Reaction> allReactions(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Reactions());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its watchdogs.
-     *
-     * @param definition Reactor class definition
-     * @return List<Watchdog>
-     */
-    public static List<Watchdog> allWatchdogs(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Watchdogs());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its state variables,
-     * which includes state variables of base classes that it extends.
-     * This also includes reactions in modes, returning a flattened
-     * view over all modes.
-     * @param definition Reactor class definition.
-     */
-    public static List<StateVar> allStateVars(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_StateVars());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its timers,
-     * which includes timers of base classes that it extends.
-     * This also includes reactions in modes, returning a flattened
-     * view over all modes.
-     * @param definition Reactor class definition.
-     */
-    public static List<Timer> allTimers(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Timers());
-    }
-
-    /**
-     * Given a reactor class, returns a list of all its modes,
-     * which includes modes of base classes that it extends.
-     * @param definition Reactor class definition.
-     */
-    public static List<Mode> allModes(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Modes());
-    }
-
-    public static List<ReactorInstance> recursiveChildren(ReactorInstance r) {
-        List<ReactorInstance> ret = new ArrayList<>();
-        ret.add(r);
-        for (var child: r.children) {
-            ret.addAll(recursiveChildren(child));
-        }
-        return ret;
-    }
-
-    /**
-     * Return all the superclasses of the specified reactor
-     * in deepest-first order. For example, if A extends B and C, and
-     * B and C both extend D, this will return the list [D, B, C, A].
-     * Duplicates are removed. If the specified reactor does not extend
-     * any other reactor, then return an empty list.
-     * If a cycle is found, where X extends Y and Y extends X, or if
-     * a superclass is declared that is not found, then return null.
-     * @param reactor The specified reactor.
-     */
-    public static LinkedHashSet<Reactor> superClasses(Reactor reactor) {
-        return superClasses(reactor, new LinkedHashSet<>());
-    }
-
-    /**
-     * Return all the file-level preambles in the files that define the
-     * specified class and its superclasses in deepest-first order.
-     * Duplicates are removed. If there are no file-level preambles,
-     * then return an empty list.
-     * If a cycle is found, where X extends Y and Y extends X, or if
-     * a superclass is declared that is not found, then return null.
-     * @param reactor The specified reactor.
-     */
-    public static LinkedHashSet<Preamble> allFileLevelPreambles(Reactor reactor) {
-        return allFileLevelPreambles(reactor, new LinkedHashSet<>());
-    }
-
-    /**
-     * Collect elements of type T from the class hierarchy and modes
-     * defined by a given reactor definition.
-     * @param definition The reactor definition.
-     * @param <T> The type of elements to collect (e.g., Port, Timer, etc.)
-     * @return A list of all elements of type T found
-     */
-    public static <T extends EObject> List<T> collectElements(Reactor definition, EStructuralFeature feature) {
-        return ASTUtils.collectElements(definition, feature, true, true);
-    }
-
-    /**
-     * Collect elements of type T contained in given reactor definition, including
-     * modes and the class hierarchy defined depending on configuration.
-     * @param definition The reactor definition.
-     * @param feature The structual model elements to collect.
-     * @param includeSuperClasses Whether to include elements in super classes.
-     * @param includeModes Whether to include elements in modes.
-     * @param <T> The type of elements to collect (e.g., Port, Timer, etc.)
-     * @return A list of all elements of type T found
-     */
-    @SuppressWarnings("unchecked")
-    public static <T extends EObject> List<T> collectElements(Reactor definition, EStructuralFeature feature, boolean includeSuperClasses, boolean includeModes) {
-        List<T> result = new ArrayList<>();
-
-        if (includeSuperClasses) {
-            // Add elements of elements defined in superclasses.
-            LinkedHashSet<Reactor> s = superClasses(definition);
-            if (s != null) {
-                for (Reactor superClass : s) {
-                    result.addAll((EList<T>) superClass.eGet(feature));
-                }
+  /** The Lingua Franca factory for creating new AST nodes. */
+  public static final LfFactory factory = LfFactory.eINSTANCE;
+
+  /** The Lingua Franca feature package. */
+  public static final LfPackage featurePackage = LfPackage.eINSTANCE;
+
+  /* Match an abbreviated form of a float literal. */
+  private static final Pattern ABBREVIATED_FLOAT = Pattern.compile("[+\\-]?\\.\\d+[\\deE+\\-]*");
+
+  /**
+   * A mapping from Reactor features to corresponding Mode features for collecting contained
+   * elements.
+   */
+  private static final Map<EStructuralFeature, EStructuralFeature> reactorModeFeatureMap =
+      Map.of(
+          featurePackage.getReactor_Actions(), featurePackage.getMode_Actions(),
+          featurePackage.getReactor_Connections(), featurePackage.getMode_Connections(),
+          featurePackage.getReactor_Instantiations(), featurePackage.getMode_Instantiations(),
+          featurePackage.getReactor_Reactions(), featurePackage.getMode_Reactions(),
+          featurePackage.getReactor_StateVars(), featurePackage.getMode_StateVars(),
+          featurePackage.getReactor_Timers(), featurePackage.getMode_Timers());
+
+  /**
+   * Get all reactors defined in the given resource.
+   *
+   * @param resource the resource to extract reactors from
+   * @return An iterable over all reactors found in the resource
+   */
+  public static List<Reactor> getAllReactors(Resource resource) {
+    return StreamSupport.stream(
+            IteratorExtensions.toIterable(resource.getAllContents()).spliterator(), false)
+        .filter(Reactor.class::isInstance)
+        .map(Reactor.class::cast)
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Find connections in the given resource that would be conflicting writes if they were not
+   * located in mutually exclusive modes.
+   *
+   * @param resource The AST.
+   * @return a list of connections being able to be transformed
+   */
+  public static Collection<Connection> findConflictingConnectionsInModalReactors(
+      Resource resource) {
+    var transform = new HashSet<Connection>();
+
+    for (Reactor reactor : getAllReactors(resource)) {
+      if (!reactor.getModes().isEmpty()) { // Only for modal reactors
+        var allWriters = HashMultimap.<Pair<Instantiation, Variable>, EObject>create();
+
+        // Collect destinations
+        for (var rea : allReactions(reactor)) {
+          for (var eff : rea.getEffects()) {
+            if (eff.getVariable() instanceof Port) {
+              allWriters.put(Tuples.pair(eff.getContainer(), eff.getVariable()), rea);
             }
+          }
         }
-
-        // Add elements of the current reactor.
-        result.addAll((EList<T>) definition.eGet(feature));
-
-        if (includeModes && reactorModeFeatureMap.containsKey(feature)) {
-            var modeFeature = reactorModeFeatureMap.get(feature);
-            // Add elements of elements defined in modes.
-            for (Mode mode : includeSuperClasses ? allModes(definition) : definition.getModes()) {
-                insertModeElementsAtTextualPosition(result, (EList<T>) mode.eGet(modeFeature), mode);
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Adds the elements into the given list at a location matching to their textual position.
-     *
-     * When creating a flat view onto reactor elements including modes, the final list must be ordered according
-     * to the textual positions.
-     *
-     * Example:
-     * reactor R {
-     *   reaction // -> is R.reactions[0]
-     *   mode M {
-     *      reaction // -> is R.mode[0].reactions[0]
-     *      reaction // -> is R.mode[0].reactions[1]
-     *   }
-     *   reaction // -> is R.reactions[1]
-     * }
-     * In this example, it is important that the reactions in the mode are inserted between the top-level
-     * reactions to retain the correct global reaction ordering, which will be derived from this flattened view.
-     *
-     * @param list The list to add the elements into.
-     * @param elements The elements to add.
-     * @param mode The mode containing the elements.
-     * @param <T> The type of elements to add (e.g., Port, Timer, etc.)
-     */
-    private static <T extends EObject> void insertModeElementsAtTextualPosition(List<T> list, List<T> elements, Mode mode) {
-        if (elements.isEmpty()) {
-            return; // Nothing to add
+        for (var con :
+            ASTUtils.<Connection>collectElements(
+                reactor, featurePackage.getReactor_Connections(), false, true)) {
+          for (var port : con.getRightPorts()) {
+            allWriters.put(Tuples.pair(port.getContainer(), port.getVariable()), con);
+          }
         }
 
-        var idx = list.size();
-        if (idx > 0) {
-            // If there are elements in the list, first check if the last element has the same container as the mode.
-            // I.e. we don't want to compare textual positions of different reactors (super classes)
-            if (mode.eContainer() == list.get(list.size() - 1).eContainer()) {
-                var modeAstNode = NodeModelUtils.getNode(mode);
-                if (modeAstNode != null) {
-                    var modePos = modeAstNode.getOffset();
-                    // Now move the insertion index from the last element forward as long as this element has a textual
-                    // position after the mode.
-                    do {
-                        var astNode = NodeModelUtils.getNode(list.get(idx - 1));
-                        if (astNode != null && astNode.getOffset() > modePos) {
-                            idx--;
-                        } else {
-                            break; // Insertion index is ok.
-                        }
-                    } while (idx > 0);
-                }
+        // Handle conflicting writers
+        for (var key : allWriters.keySet()) {
+          var writers = allWriters.get(key);
+          if (writers.size() > 1) { // has multiple sources
+            var writerModes = HashMultimap.<Mode, EObject>create();
+            // find modes
+            for (var writer : writers) {
+              if (writer.eContainer() instanceof Mode) {
+                writerModes.put((Mode) writer.eContainer(), writer);
+              } else {
+                writerModes.put(null, writer);
+              }
             }
-        }
-        list.addAll(idx, elements);
-    }
-
-    public static <T extends EObject> Iterable<T> allElementsOfClass(
-        Resource resource,
-        Class<T> elementClass
-    ) {
-        //noinspection StaticPseudoFunctionalStyleMethod
-        return Iterables.filter(IteratorExtensions.toIterable(resource.getAllContents()), elementClass);
-    }
-
-    ////////////////////////////////
-    //// Utility functions for translating AST nodes into text
-
-    /**
-     * Translate the given code into its textual representation
-     * with {@code CodeMap.Correspondence} tags inserted, or
-     * return the empty string if {@code node} is {@code null}.
-     * This method should be used to generate code.
-     * @param node AST node to render as string.
-     * @return Textual representation of the given argument.
-     */
-    public static String toText(EObject node) {
-        if (node == null) return "";
-        return CodeMap.Correspondence.tag(node, toOriginalText(node), node instanceof Code);
-    }
-
-    /**
-     * Translate the given code into its textual representation
-     * without {@code CodeMap.Correspondence} tags, or return
-     * the empty string if {@code node} is {@code null}.
-     * This method should be used for analyzing AST nodes in
-     * cases where they are easiest to analyze as strings.
-     * @param node AST node to render as string.
-     * @return Textual representation of the given argument.
-     */
-    public static String toOriginalText(EObject node) {
-        if (node == null) return "";
-        return ToText.instance.doSwitch(node);
-    }
-
-    /**
-     * Return an integer representation of the given element.
-     *
-     * Internally, this method uses Integer.decode, so it will
-     * also understand hexadecimal, binary, etc.
-     *
-     * @param e The element to be rendered as an integer.
-     */
-    public static Integer toInteger(Element e) {
-        return Integer.decode(e.getLiteral());
-    }
-
-    /**
-     * Return a time value based on the given element.
-     *
-     * @param e The element to be rendered as a time value.
-     */
-    public static TimeValue toTimeValue(Element e) {
-        return new TimeValue(e.getTime(), TimeUnit.fromName(e.getUnit()));
-    }
-
-    /**
-     * Returns the time value represented by the given AST node.
-     */
-    public static TimeValue toTimeValue(Time e) {
-        if (!isValidTime(e)) {
-            // invalid unit, will have been reported by validator
-            throw new IllegalArgumentException();
-        }
-        return new TimeValue(e.getInterval(), TimeUnit.fromName(e.getUnit()));
-    }
-
-    /**
-     * Return a boolean based on the given element.
-     *
-     * @param e The element to be rendered as a boolean.
-     */
-    public static boolean toBoolean(Element e) {
-        return elementToSingleString(e).equalsIgnoreCase("true");
-    }
-
-    /**
-     * Given the right-hand side of a target property, return a string that
-     * represents the given value/
-     *
-     * If the given value is not a literal or and id (but for instance and array or dict),
-     * an empty string is returned. If the element is a string, any quotes are removed.
-     *
-     * @param e The right-hand side of a target property.
-     */
-    public static String elementToSingleString(Element e) {
-        if (e.getLiteral() != null) {
-            return StringUtil.removeQuotes(e.getLiteral()).trim();
-        } else if (e.getId() != null) {
-            return e.getId();
-        }
-        return "";
-    }
-
-    /**
-     * Given the right-hand side of a target property, return a list with all
-     * the strings that the property lists.
-     *
-     * Arrays are traversed, so strings are collected recursively. Empty strings
-     * are ignored; they are not added to the list.
-     * @param value The right-hand side of a target property.
-     */
-    public static List<String> elementToListOfStrings(Element value) {
-        List<String> elements = new ArrayList<>();
-        if (value.getArray() != null) {
-            for (Element element : value.getArray().getElements()) {
-                elements.addAll(elementToListOfStrings(element));
-            }
-            return elements;
-        } else {
-            String v = elementToSingleString(value);
-            if (!v.isEmpty()) {
-                elements.add(v);
+            // Conflicting connection can only be handled if..
+            if (!writerModes.containsKey(null)
+                && // no writer is on root level (outside of modes) and...
+                writerModes.keySet().stream()
+                    .map(writerModes::get)
+                    .allMatch(
+                        writersInMode -> // all writers in a mode are either...
+                        writersInMode.size() == 1
+                                || // the only writer or...
+                                writersInMode.stream()
+                                    .allMatch(
+                                        w ->
+                                            w
+                                                instanceof
+                                                Reaction) // all are reactions and hence ordered
+                        )) {
+              // Add connections to transform list
+              writers.stream()
+                  .filter(w -> w instanceof Connection)
+                  .forEach(c -> transform.add((Connection) c));
             }
+          }
         }
-        return elements;
-    }
-
-    /**
-     * Convert key-value pairs in an Element to a map, assuming that both the key
-     * and the value are strings.
-     */
-    public static Map<String, String> elementToStringMaps(Element value) {
-        Map<String, String> elements = new HashMap<>();
-        for (var element: value.getKeyvalue().getPairs()) {
-            elements.put(
-                element.getName().trim(),
-                StringUtil.removeQuotes(elementToSingleString(element.getValue()))
-            );
-        }
-        return elements;
-    }
-
-    // Various utility methods to convert various data types to Elements
-
-    /**
-     * Convert a <String, String> map to key-value pairs in an Element.
-     */
-    public static Element toElement(Map<String, String> map) {
-        Element e = LfFactory.eINSTANCE.createElement();
-        if (map.size() == 0) return null;
-        else {
-            var kv = LfFactory.eINSTANCE.createKeyValuePairs();
-            for (var entry : map.entrySet()) {
-                var pair = LfFactory.eINSTANCE.createKeyValuePair();
-                pair.setName(entry.getKey());
-                var element = LfFactory.eINSTANCE.createElement();
-                element.setLiteral(StringUtil.addDoubleQuotes(entry.getValue()));
-                pair.setValue(element);
-                kv.getPairs().add(pair);
-            }
-            e.setKeyvalue(kv);
-        }
-
-        return e;
-    }
-
-    /**
-     * Given a single string, convert it into its AST representation.
-     * {@code addQuotes} controls if the generated representation should be
-     * accompanied by double quotes ("") or not.
-     */
-    private static Element toElement(String str, boolean addQuotes) {
-        if (str == null) return null;
-        var strToReturn = addQuotes? StringUtil.addDoubleQuotes(str):str;
-        Element e = LfFactory.eINSTANCE.createElement();
-        e.setLiteral(strToReturn);
-        return e;
-    }
-
-    /**
-     * Given a single string, convert it into its AST representation.
-     */
-    public static Element toElement(String str) {
-        return toElement(str, true);
-    }
-
-    /**
-     * Given a list of strings, convert it into its AST representation.
-     * Stores the list in the Array field of the element, unless the list only has one string,
-     * in which case it is stored in the Literal field. Returns null if the provided list is empty.
-     */
-    public static Element toElement(List<String> list) {
-        Element e = LfFactory.eINSTANCE.createElement();
-        if (list.size() == 0) return null;
-        else if (list.size() == 1) {
-            return toElement(list.get(0));
-        } else {
-            var arr = LfFactory.eINSTANCE.createArray();
-            for (String s : list) {
-                arr.getElements().add(ASTUtils.toElement(s));
-            }
-            e.setArray(arr);
+      }
+    }
+
+    return transform;
+  }
+
+  /**
+   * Return the enclosing reactor of an LF EObject in a reactor or mode.
+   *
+   * @param obj the LF model element
+   * @return the reactor or null
+   */
+  public static Reactor getEnclosingReactor(EObject obj) {
+    if (obj.eContainer() instanceof Reactor) {
+      return (Reactor) obj.eContainer();
+    } else if (obj.eContainer() instanceof Mode) {
+      return (Reactor) obj.eContainer().eContainer();
+    }
+    return null;
+  }
+
+  /** Return the main reactor in the given resource if there is one, null otherwise. */
+  public static Reactor findMainReactor(Resource resource) {
+    return IteratorExtensions.findFirst(
+        Iterators.filter(resource.getAllContents(), Reactor.class), Reactor::isMain);
+  }
+
+  /**
+   * Find the main reactor and change it to a federated reactor. Return true if the transformation
+   * was successful (or the given resource already had a federated reactor); return false otherwise.
+   */
+  public static boolean makeFederated(Resource resource) {
+    // Find the main reactor
+    Reactor r = findMainReactor(resource);
+    if (r == null) {
+      return false;
+    }
+    r.setMain(false);
+    r.setFederated(true);
+    return true;
+  }
+
+  /** Change the target name to 'newTargetName'. For example, change C to CCpp. */
+  public static boolean changeTargetName(Resource resource, String newTargetName) {
+    targetDecl(resource).setName(newTargetName);
+    return true;
+  }
+
+  /** Return the target of the file in which the given node lives. */
+  public static Target getTarget(EObject object) {
+    TargetDecl targetDecl = targetDecl(object.eResource());
+    return Target.fromDecl(targetDecl);
+  }
+
+  /**
+   * Add a new target property to the given resource. This also creates a config object if the
+   * resource does not yey have one.
+   *
+   * @param resource The resource to modify
+   * @param name Name of the property to add
+   * @param value Value to be assigned to the property
+   */
+  public static boolean addTargetProperty(
+      final Resource resource, final String name, final Element value) {
+    var config = targetDecl(resource).getConfig();
+    if (config == null) {
+      config = LfFactory.eINSTANCE.createKeyValuePairs();
+      targetDecl(resource).setConfig(config);
+    }
+    final var newProperty = LfFactory.eINSTANCE.createKeyValuePair();
+    newProperty.setName(name);
+    newProperty.setValue(value);
+    config.getPairs().add(newProperty);
+    return true;
+  }
+
+  /**
+   * Return true if the connection involves multiple ports on the left or right side of the
+   * connection, or if the port on the left or right of the connection involves a bank of reactors
+   * or a multiport.
+   *
+   * @param connection The connection.
+   */
+  public static boolean hasMultipleConnections(Connection connection) {
+    if (connection.getLeftPorts().size() > 1 || connection.getRightPorts().size() > 1) {
+      return true;
+    }
+    VarRef leftPort = connection.getLeftPorts().get(0);
+    VarRef rightPort = connection.getRightPorts().get(0);
+    Instantiation leftContainer = leftPort.getContainer();
+    Instantiation rightContainer = rightPort.getContainer();
+    Port leftPortAsPort = (Port) leftPort.getVariable();
+    Port rightPortAsPort = (Port) rightPort.getVariable();
+    return leftPortAsPort.getWidthSpec() != null
+        || leftContainer != null && leftContainer.getWidthSpec() != null
+        || rightPortAsPort.getWidthSpec() != null
+        || rightContainer != null && rightContainer.getWidthSpec() != null;
+  }
+
+  /**
+   * Produce a unique identifier within a reactor based on a given based name. If the name does not
+   * exists, it is returned; if does exist, an index is appended that makes the name unique.
+   *
+   * @param reactor The reactor to find a unique identifier within.
+   * @param name The name to base the returned identifier on.
+   */
+  public static String getUniqueIdentifier(Reactor reactor, String name) {
+    LinkedHashSet<String> vars = new LinkedHashSet<>();
+    allActions(reactor).forEach(it -> vars.add(it.getName()));
+    allTimers(reactor).forEach(it -> vars.add(it.getName()));
+    allParameters(reactor).forEach(it -> vars.add(it.getName()));
+    allInputs(reactor).forEach(it -> vars.add(it.getName()));
+    allOutputs(reactor).forEach(it -> vars.add(it.getName()));
+    allStateVars(reactor).forEach(it -> vars.add(it.getName()));
+    allInstantiations(reactor).forEach(it -> vars.add(it.getName()));
+
+    int index = 0;
+    String suffix = "";
+    boolean exists = true;
+    while (exists) {
+      String id = name + suffix;
+      if (IterableExtensions.exists(vars, it -> it.equals(id))) {
+        suffix = "_" + index;
+        index++;
+      } else {
+        exists = false;
+      }
+    }
+    return name + suffix;
+  }
+
+  ////////////////////////////////
+  //// Utility functions for supporting inheritance and modes
+
+  /**
+   * Given a reactor class, return a list of all its actions, which includes actions of base classes
+   * that it extends. This also includes actions in modes, returning a flattened view over all
+   * modes.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Action> allActions(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Actions());
+  }
+
+  /**
+   * Given a reactor class, return a list of all its connections, which includes connections of base
+   * classes that it extends. This also includes connections in modes, returning a flattened view
+   * over all modes.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Connection> allConnections(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Connections());
+  }
+
+  /**
+   * Given a reactor class, return a list of all its inputs, which includes inputs of base classes
+   * that it extends. If the base classes include a cycle, where X extends Y and Y extends X, then
+   * return only the input defined in the base class. The returned list may be empty.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Input> allInputs(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Inputs());
+  }
+
+  /** A list of all ports of {@code definition}, in an unspecified order. */
+  public static List<Port> allPorts(Reactor definition) {
+    return Stream.concat(
+            ASTUtils.allInputs(definition).stream(), ASTUtils.allOutputs(definition).stream())
+        .toList();
+  }
+
+  /**
+   * Given a reactor class, return a list of all its preambles, which includes preambles of base
+   * classes that it extends. If the base classes include a cycle, where X extends Y and Y extends
+   * X, then return only the input defined in the base class. The returned list may be empty.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Preamble> allPreambles(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Preambles());
+  }
+
+  /**
+   * Given a reactor class, return a list of all its instantiations, which includes instantiations
+   * of base classes that it extends. This also includes instantiations in modes, returning a
+   * flattened view over all modes.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Instantiation> allInstantiations(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Instantiations());
+  }
+
+  /**
+   * Given a reactor Class, return a set of include names for interacting reactors which includes
+   * all instantiations of base class that it extends.
+   *
+   * @param r Reactor Class
+   */
+  public static HashSet<String> allIncludes(Reactor r) {
+    var set = new HashSet<String>();
+    for (var i : allInstantiations(r)) {
+      set.add(CUtil.getName(new TypeParameterizedReactor(i)));
+    }
+    return set;
+  }
+
+  /*
+   * Given a reactor class, return a stream of reactor classes that it instantiates.
+   * @param definition Reactor class definition.
+   * @return A stream of reactor classes.
+   */
+  public static Stream<Reactor> allNestedClasses(Reactor definition) {
+    return new HashSet<>(ASTUtils.allInstantiations(definition))
+        .stream().map(Instantiation::getReactorClass).map(ASTUtils::toDefinition);
+  }
+
+  /**
+   * Given a reactor class, return a list of all its methods, which includes methods of base classes
+   * that it extends.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Method> allMethods(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Methods());
+  }
+
+  /**
+   * Given a reactor class, return a list of all its outputs, which includes outputs of base classes
+   * that it extends.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Output> allOutputs(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Outputs());
+  }
+
+  /**
+   * Given a reactor class, return a list of all its parameters, which includes parameters of base
+   * classes that it extends.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Parameter> allParameters(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Parameters());
+  }
+
+  /**
+   * Given a reactor class, return a list of all its reactions, which includes reactions of base
+   * classes that it extends. This also includes reactions in modes, returning a flattened view over
+   * all modes.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Reaction> allReactions(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Reactions());
+  }
+
+  /**
+   * Given a reactor class, return a list of all its watchdogs.
+   *
+   * @param definition Reactor class definition
+   * @return List<Watchdog>
+   */
+  public static List<Watchdog> allWatchdogs(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Watchdogs());
+  }
+
+  /**
+   * Given a reactor class, return a list of all its state variables, which includes state variables
+   * of base classes that it extends. This also includes reactions in modes, returning a flattened
+   * view over all modes.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<StateVar> allStateVars(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_StateVars());
+  }
+
+  /**
+   * Given a reactor class, return a list of all its timers, which includes timers of base classes
+   * that it extends. This also includes reactions in modes, returning a flattened view over all
+   * modes.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Timer> allTimers(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Timers());
+  }
+
+  /**
+   * Given a reactor class, returns a list of all its modes, which includes modes of base classes
+   * that it extends.
+   *
+   * @param definition Reactor class definition.
+   */
+  public static List<Mode> allModes(Reactor definition) {
+    return ASTUtils.collectElements(definition, featurePackage.getReactor_Modes());
+  }
+
+  public static List<ReactorInstance> recursiveChildren(ReactorInstance r) {
+    List<ReactorInstance> ret = new ArrayList<>();
+    ret.add(r);
+    for (var child : r.children) {
+      ret.addAll(recursiveChildren(child));
+    }
+    return ret;
+  }
+
+  /**
+   * Return all the superclasses of the specified reactor in deepest-first order. For example, if A
+   * extends B and C, and B and C both extend D, this will return the list [D, B, C, A]. Duplicates
+   * are removed. If the specified reactor does not extend any other reactor, then return an empty
+   * list. If a cycle is found, where X extends Y and Y extends X, or if a superclass is declared
+   * that is not found, then return null.
+   *
+   * @param reactor The specified reactor.
+   */
+  public static LinkedHashSet<Reactor> superClasses(Reactor reactor) {
+    return superClasses(reactor, new LinkedHashSet<>());
+  }
+
+  /**
+   * Return all the file-level preambles in the files that define the specified class and its
+   * superclasses in deepest-first order. Duplicates are removed. If there are no file-level
+   * preambles, then return an empty list. If a cycle is found, where X extends Y and Y extends X,
+   * or if a superclass is declared that is not found, then return null.
+   *
+   * @param reactor The specified reactor.
+   */
+  public static LinkedHashSet<Preamble> allFileLevelPreambles(Reactor reactor) {
+    return allFileLevelPreambles(reactor, new LinkedHashSet<>());
+  }
+
+  /**
+   * Collect elements of type T from the class hierarchy and modes defined by a given reactor
+   * definition.
+   *
+   * @param definition The reactor definition.
+   * @param <T> The type of elements to collect (e.g., Port, Timer, etc.)
+   * @return A list of all elements of type T found
+   */
+  public static <T extends EObject> List<T> collectElements(
+      Reactor definition, EStructuralFeature feature) {
+    return ASTUtils.collectElements(definition, feature, true, true);
+  }
+
+  /**
+   * Collect elements of type T contained in given reactor definition, including modes and the class
+   * hierarchy defined depending on configuration.
+   *
+   * @param definition The reactor definition.
+   * @param feature The structual model elements to collect.
+   * @param includeSuperClasses Whether to include elements in super classes.
+   * @param includeModes Whether to include elements in modes.
+   * @param <T> The type of elements to collect (e.g., Port, Timer, etc.)
+   * @return A list of all elements of type T found
+   */
+  @SuppressWarnings("unchecked")
+  public static <T extends EObject> List<T> collectElements(
+      Reactor definition,
+      EStructuralFeature feature,
+      boolean includeSuperClasses,
+      boolean includeModes) {
+    List<T> result = new ArrayList<>();
+
+    if (includeSuperClasses) {
+      // Add elements of elements defined in superclasses.
+      LinkedHashSet<Reactor> s = superClasses(definition);
+      if (s != null) {
+        for (Reactor superClass : s) {
+          result.addAll((EList<T>) superClass.eGet(feature));
         }
-        return e;
-    }
-
-    /**
-     * Convert a TimeValue to its AST representation. The value is type-cast to int in order to fit inside an Element.
-     */
-    public static Element toElement(TimeValue tv) {
-        Element e = LfFactory.eINSTANCE.createElement();
-        e.setTime((int)tv.time);
-        if (tv.unit != null) {
-            e.setUnit(tv.unit.toString());
-        }
-        return e;
-    }
-
-    public static Element toElement(boolean val) {
-        return toElement(Boolean.toString(val), false);
-    }
-
-    public static Element toElement(int val) {
-        return toElement(Integer.toString(val), false);
-    }
-
-    /**
-     * Translate the given type into its textual representation, but
-     * do not append any array specifications or type arguments.
-     * @param type AST node to render as string.
-     * @return Textual representation of the given argument.
-     */
-    public static String baseType(Type type) {
-        if (type != null) {
-            if (type.getCode() != null) {
-                return toText(type.getCode());
+      }
+    }
+
+    // Add elements of the current reactor.
+    result.addAll((EList<T>) definition.eGet(feature));
+
+    if (includeModes && reactorModeFeatureMap.containsKey(feature)) {
+      var modeFeature = reactorModeFeatureMap.get(feature);
+      // Add elements of elements defined in modes.
+      for (Mode mode : includeSuperClasses ? allModes(definition) : definition.getModes()) {
+        insertModeElementsAtTextualPosition(result, (EList<T>) mode.eGet(modeFeature), mode);
+      }
+    }
+
+    return result;
+  }
+
+  /**
+   * Adds the elements into the given list at a location matching to their textual position.
+   *
+   * <p>When creating a flat view onto reactor elements including modes, the final list must be
+   * ordered according to the textual positions.
+   *
+   * <p>Example: reactor R { reaction // -> is R.reactions[0] mode M { reaction // -> is
+   * R.mode[0].reactions[0] reaction // -> is R.mode[0].reactions[1] } reaction // -> is
+   * R.reactions[1] } In this example, it is important that the reactions in the mode are inserted
+   * between the top-level reactions to retain the correct global reaction ordering, which will be
+   * derived from this flattened view.
+   *
+   * @param list The list to add the elements into.
+   * @param elements The elements to add.
+   * @param mode The mode containing the elements.
+   * @param <T> The type of elements to add (e.g., Port, Timer, etc.)
+   */
+  private static <T extends EObject> void insertModeElementsAtTextualPosition(
+      List<T> list, List<T> elements, Mode mode) {
+    if (elements.isEmpty()) {
+      return; // Nothing to add
+    }
+
+    var idx = list.size();
+    if (idx > 0) {
+      // If there are elements in the list, first check if the last element has the same container
+      // as the mode.
+      // I.e. we don't want to compare textual positions of different reactors (super classes)
+      if (mode.eContainer() == list.get(list.size() - 1).eContainer()) {
+        var modeAstNode = NodeModelUtils.getNode(mode);
+        if (modeAstNode != null) {
+          var modePos = modeAstNode.getOffset();
+          // Now move the insertion index from the last element forward as long as this element has
+          // a textual
+          // position after the mode.
+          do {
+            var astNode = NodeModelUtils.getNode(list.get(idx - 1));
+            if (astNode != null && astNode.getOffset() > modePos) {
+              idx--;
             } else {
-                if (type.isTime()) {
-                    return "time";
-                } else {
-                    StringBuilder result = new StringBuilder(type.getId());
-
-                    for (String s : convertToEmptyListIfNull(type.getStars())) {
-                        result.append(s);
-                    }
-                    return result.toString();
-                }
-            }
-        }
-        return "";
-    }
-
-    /**
-     * Report whether the given literal is zero or not.
-     * @param literal AST node to inspect.
-     * @return True if the given literal denotes the constant {@code 0}, false
-     * otherwise.
-     */
-    public static boolean isZero(String literal) {
-        try {
-            if (literal != null &&
-                Integer.parseInt(literal) == 0) {
-                return true;
+              break; // Insertion index is ok.
             }
-        } catch (NumberFormatException e) {
-            // Not an int.
+          } while (idx > 0);
         }
-        return false;
-    }
-
-    /**
-     * Report whether the given expression is zero or not.
-     *
-     * @param expr AST node to inspect.
-     * @return True if the given value denotes the constant {@code 0}, false otherwise.
-     */
-    public static boolean isZero(Expression expr) {
-        if (expr instanceof Literal) {
-            return isZero(((Literal) expr).getLiteral());
-        }
-        return false;
-    }
-
-    /**
-     * Report whether the given string literal is an integer number or not.
-     *
-     * @param literal AST node to inspect.
-     * @return True if the given value is an integer, false otherwise.
-     */
-    public static boolean isInteger(String literal) {
-        try {
-            //noinspection ResultOfMethodCallIgnored
-            Integer.decode(literal);
-        } catch (NumberFormatException e) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Report whether the given string literal is a boolean value or not.
-     * @param literal AST node to inspect.
-     * @return True if the given value is a boolean, false otherwise.
-     */
-    public static boolean isBoolean(String literal) {
-        return literal.equalsIgnoreCase("true") || literal.equalsIgnoreCase("false");
-    }
+      }
+    }
+    list.addAll(idx, elements);
+  }
+
+  public static <T extends EObject> Iterable<T> allElementsOfClass(
+      Resource resource, Class<T> elementClass) {
+    //noinspection StaticPseudoFunctionalStyleMethod
+    return Iterables.filter(IteratorExtensions.toIterable(resource.getAllContents()), elementClass);
+  }
+
+  ////////////////////////////////
+  //// Utility functions for translating AST nodes into text
+
+  /**
+   * Translate the given code into its textual representation with {@code CodeMap.Correspondence}
+   * tags inserted, or return the empty string if {@code node} is {@code null}. This method should
+   * be used to generate code.
+   *
+   * @param node AST node to render as string.
+   * @return Textual representation of the given argument.
+   */
+  public static String toText(EObject node) {
+    if (node == null) return "";
+    return CodeMap.Correspondence.tag(node, toOriginalText(node), node instanceof Code);
+  }
+
+  /**
+   * Translate the given code into its textual representation without {@code CodeMap.Correspondence}
+   * tags, or return the empty string if {@code node} is {@code null}. This method should be used
+   * for analyzing AST nodes in cases where they are easiest to analyze as strings.
+   *
+   * @param node AST node to render as string.
+   * @return Textual representation of the given argument.
+   */
+  public static String toOriginalText(EObject node) {
+    if (node == null) return "";
+    return ToText.instance.doSwitch(node);
+  }
+
+  /**
+   * Return an integer representation of the given element.
+   *
+   * <p>Internally, this method uses Integer.decode, so it will also understand hexadecimal, binary,
+   * etc.
+   *
+   * @param e The element to be rendered as an integer.
+   */
+  public static Integer toInteger(Element e) {
+    return Integer.decode(e.getLiteral());
+  }
+
+  /**
+   * Return a time value based on the given element.
+   *
+   * @param e The element to be rendered as a time value.
+   */
+  public static TimeValue toTimeValue(Element e) {
+    return new TimeValue(e.getTime(), TimeUnit.fromName(e.getUnit()));
+  }
+
+  /** Returns the time value represented by the given AST node. */
+  public static TimeValue toTimeValue(Time e) {
+    if (!isValidTime(e)) {
+      // invalid unit, will have been reported by validator
+      throw new IllegalArgumentException();
+    }
+    return new TimeValue(e.getInterval(), TimeUnit.fromName(e.getUnit()));
+  }
+
+  /**
+   * Return a boolean based on the given element.
+   *
+   * @param e The element to be rendered as a boolean.
+   */
+  public static boolean toBoolean(Element e) {
+    return elementToSingleString(e).equalsIgnoreCase("true");
+  }
+
+  /**
+   * Given the right-hand side of a target property, return a string that represents the given
+   * value/
+   *
+   * <p>If the given value is not a literal or and id (but for instance and array or dict), an empty
+   * string is returned. If the element is a string, any quotes are removed.
+   *
+   * @param e The right-hand side of a target property.
+   */
+  public static String elementToSingleString(Element e) {
+    if (e.getLiteral() != null) {
+      return StringUtil.removeQuotes(e.getLiteral()).trim();
+    } else if (e.getId() != null) {
+      return e.getId();
+    }
+    return "";
+  }
+
+  /**
+   * Given the right-hand side of a target property, return a list with all the strings that the
+   * property lists.
+   *
+   * <p>Arrays are traversed, so strings are collected recursively. Empty strings are ignored; they
+   * are not added to the list.
+   *
+   * @param value The right-hand side of a target property.
+   */
+  public static List<String> elementToListOfStrings(Element value) {
+    List<String> elements = new ArrayList<>();
+    if (value.getArray() != null) {
+      for (Element element : value.getArray().getElements()) {
+        elements.addAll(elementToListOfStrings(element));
+      }
+      return elements;
+    } else {
+      String v = elementToSingleString(value);
+      if (!v.isEmpty()) {
+        elements.add(v);
+      }
+    }
+    return elements;
+  }
+
+  /**
+   * Convert key-value pairs in an Element to a map, assuming that both the key and the value are
+   * strings.
+   */
+  public static Map<String, String> elementToStringMaps(Element value) {
+    Map<String, String> elements = new HashMap<>();
+    for (var element : value.getKeyvalue().getPairs()) {
+      elements.put(
+          element.getName().trim(),
+          StringUtil.removeQuotes(elementToSingleString(element.getValue())));
+    }
+    return elements;
+  }
+
+  // Various utility methods to convert various data types to Elements
+
+  /** Convert a <String, String> map to key-value pairs in an Element. */
+  public static Element toElement(Map<String, String> map) {
+    Element e = LfFactory.eINSTANCE.createElement();
+    if (map.size() == 0) return null;
+    else {
+      var kv = LfFactory.eINSTANCE.createKeyValuePairs();
+      for (var entry : map.entrySet()) {
+        var pair = LfFactory.eINSTANCE.createKeyValuePair();
+        pair.setName(entry.getKey());
+        var element = LfFactory.eINSTANCE.createElement();
+        element.setLiteral(StringUtil.addDoubleQuotes(entry.getValue()));
+        pair.setValue(element);
+        kv.getPairs().add(pair);
+      }
+      e.setKeyvalue(kv);
+    }
+
+    return e;
+  }
+
+  /**
+   * Given a single string, convert it into its AST representation. {@code addQuotes} controls if
+   * the generated representation should be accompanied by double quotes ("") or not.
+   */
+  private static Element toElement(String str, boolean addQuotes) {
+    if (str == null) return null;
+    var strToReturn = addQuotes ? StringUtil.addDoubleQuotes(str) : str;
+    Element e = LfFactory.eINSTANCE.createElement();
+    e.setLiteral(strToReturn);
+    return e;
+  }
+
+  /** Given a single string, convert it into its AST representation. */
+  public static Element toElement(String str) {
+    return toElement(str, true);
+  }
+
+  /**
+   * Given a list of strings, convert it into its AST representation. Stores the list in the Array
+   * field of the element, unless the list only has one string, in which case it is stored in the
+   * Literal field. Returns null if the provided list is empty.
+   */
+  public static Element toElement(List<String> list) {
+    Element e = LfFactory.eINSTANCE.createElement();
+    if (list.size() == 0) return null;
+    else if (list.size() == 1) {
+      return toElement(list.get(0));
+    } else {
+      var arr = LfFactory.eINSTANCE.createArray();
+      for (String s : list) {
+        arr.getElements().add(ASTUtils.toElement(s));
+      }
+      e.setArray(arr);
+    }
+    return e;
+  }
+
+  /**
+   * Convert a TimeValue to its AST representation. The value is type-cast to int in order to fit
+   * inside an Element.
+   */
+  public static Element toElement(TimeValue tv) {
+    Element e = LfFactory.eINSTANCE.createElement();
+    e.setTime((int) tv.time);
+    if (tv.unit != null) {
+      e.setUnit(tv.unit.toString());
+    }
+    return e;
+  }
+
+  public static Element toElement(boolean val) {
+    return toElement(Boolean.toString(val), false);
+  }
+
+  public static Element toElement(int val) {
+    return toElement(Integer.toString(val), false);
+  }
+
+  /**
+   * Translate the given type into its textual representation, but do not append any array
+   * specifications or type arguments.
+   *
+   * @param type AST node to render as string.
+   * @return Textual representation of the given argument.
+   */
+  public static String baseType(Type type) {
+    if (type != null) {
+      if (type.getCode() != null) {
+        return toText(type.getCode());
+      } else {
+        if (type.isTime()) {
+          return "time";
+        } else {
+          StringBuilder result = new StringBuilder(type.getId());
 
-    /**
-     * Report whether the given string literal is a float value or not.
-     * @param literal AST node to inspect.
-     * @return True if the given value is a float, false otherwise.
-     */
-    public static boolean isFloat(String literal) {
-        try {
-            //noinspection ResultOfMethodCallIgnored
-            Float.parseFloat(literal);
-        } catch (NumberFormatException e) {
-            return false;
+          for (String s : convertToEmptyListIfNull(type.getStars())) {
+            result.append(s);
+          }
+          return result.toString();
         }
+      }
+    }
+    return "";
+  }
+
+  /**
+   * Report whether the given literal is zero or not.
+   *
+   * @param literal AST node to inspect.
+   * @return True if the given literal denotes the constant {@code 0}, false otherwise.
+   */
+  public static boolean isZero(String literal) {
+    try {
+      if (literal != null && Integer.parseInt(literal) == 0) {
         return true;
-    }
-
-    /**
-     * Report whether the given code is an integer number or not.
-     * @param code AST node to inspect.
-     * @return True if the given code is an integer, false otherwise.
-     */
-    public static boolean isInteger(Code code) {
-        return isInteger(toText(code));
-    }
-
-    /**
-     * Report whether the given expression is an integer number or not.
-     * @param expr AST node to inspect.
-     * @return True if the given value is an integer, false otherwise.
-     */
-    public static boolean isInteger(Expression expr) {
-        if (expr instanceof Literal) {
-            return isInteger(((Literal) expr).getLiteral());
-        } else if (expr instanceof Code) {
-            return isInteger((Code) expr);
+      }
+    } catch (NumberFormatException e) {
+      // Not an int.
+    }
+    return false;
+  }
+
+  /**
+   * Report whether the given expression is zero or not.
+   *
+   * @param expr AST node to inspect.
+   * @return True if the given value denotes the constant {@code 0}, false otherwise.
+   */
+  public static boolean isZero(Expression expr) {
+    if (expr instanceof Literal) {
+      return isZero(((Literal) expr).getLiteral());
+    }
+    return false;
+  }
+
+  /**
+   * Report whether the given string literal is an integer number or not.
+   *
+   * @param literal AST node to inspect.
+   * @return True if the given value is an integer, false otherwise.
+   */
+  public static boolean isInteger(String literal) {
+    try {
+      //noinspection ResultOfMethodCallIgnored
+      Integer.decode(literal);
+    } catch (NumberFormatException e) {
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * Report whether the given string literal is a boolean value or not.
+   *
+   * @param literal AST node to inspect.
+   * @return True if the given value is a boolean, false otherwise.
+   */
+  public static boolean isBoolean(String literal) {
+    return literal.equalsIgnoreCase("true") || literal.equalsIgnoreCase("false");
+  }
+
+  /**
+   * Report whether the given string literal is a float value or not.
+   *
+   * @param literal AST node to inspect.
+   * @return True if the given value is a float, false otherwise.
+   */
+  public static boolean isFloat(String literal) {
+    try {
+      //noinspection ResultOfMethodCallIgnored
+      Float.parseFloat(literal);
+    } catch (NumberFormatException e) {
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * Report whether the given code is an integer number or not.
+   *
+   * @param code AST node to inspect.
+   * @return True if the given code is an integer, false otherwise.
+   */
+  public static boolean isInteger(Code code) {
+    return isInteger(toText(code));
+  }
+
+  /**
+   * Report whether the given expression is an integer number or not.
+   *
+   * @param expr AST node to inspect.
+   * @return True if the given value is an integer, false otherwise.
+   */
+  public static boolean isInteger(Expression expr) {
+    if (expr instanceof Literal) {
+      return isInteger(((Literal) expr).getLiteral());
+    } else if (expr instanceof Code) {
+      return isInteger((Code) expr);
+    }
+    return false;
+  }
+
+  /**
+   * Report whether the given expression denotes a valid time or not.
+   *
+   * @param expr AST node to inspect.
+   * @return True if the argument denotes a valid time, false otherwise.
+   */
+  public static boolean isValidTime(Expression expr) {
+    if (expr instanceof ParameterReference) {
+      return isOfTimeType(((ParameterReference) expr).getParameter());
+    } else if (expr instanceof Time) {
+      return isValidTime((Time) expr);
+    } else if (expr instanceof Literal) {
+      return isZero(((Literal) expr).getLiteral());
+    }
+    return false;
+  }
+
+  /**
+   * Report whether the given time denotes a valid time or not.
+   *
+   * @param t AST node to inspect.
+   * @return True if the argument denotes a valid time, false otherwise.
+   */
+  public static boolean isValidTime(Time t) {
+    if (t == null) return false;
+    String unit = t.getUnit();
+    return t.getInterval() == 0 || TimeUnit.isValidUnit(unit);
+  }
+
+  /** If the initializer contains exactly one expression, return it. Otherwise, return null. */
+  public static Expression asSingleExpr(Initializer init) {
+    if (init == null) {
+      return null;
+    }
+    var exprs = init.getExprs();
+    return exprs.size() == 1 ? exprs.get(0) : null;
+  }
+
+  public static boolean isSingleExpr(Initializer init) {
+    // todo expand that to = initialization
+    if (init == null) {
+      return false;
+    }
+    var exprs = init.getExprs();
+    return exprs.size() == 1;
+  }
+
+  public static boolean isListInitializer(Initializer init) {
+    return init != null && !isSingleExpr(init);
+  }
+
+  /**
+   * Return the type of a declaration with the given (nullable) explicit type, and the given
+   * (nullable) initializer. If the explicit type is null, then the type is inferred from the
+   * initializer. Only two types can be inferred: "time" and "timeList". Return the "undefined" type
+   * if neither can be inferred.
+   *
+   * @param type Explicit type declared on the declaration
+   * @param init The initializer expression
+   * @return The inferred type, or "undefined" if none could be inferred.
+   */
+  public static InferredType getInferredType(Type type, Initializer init) {
+    if (type != null) {
+      return InferredType.fromAST(type);
+    } else if (init == null) {
+      return InferredType.undefined();
+    }
+
+    var single = asSingleExpr(init);
+    if (single != null) {
+      // If there is a single element in the list, and it is a proper
+      // time value with units, we infer the type "time".
+      if (single instanceof ParameterReference) {
+        return getInferredType(((ParameterReference) single).getParameter());
+      } else if (single instanceof Time) {
+        return InferredType.time();
+      }
+    } else if (init.getExprs().size() > 1) {
+      // If there are multiple elements in the list, and there is at
+      // least one proper time value with units, and all other elements
+      // are valid times (including zero without units), we infer the
+      // type "time list".
+      var allValidTime = true;
+      var foundNonZero = false;
+
+      for (var e : init.getExprs()) {
+        if (!ASTUtils.isValidTime(e)) {
+          allValidTime = false;
         }
-        return false;
-    }
-
-    /**
-     * Report whether the given expression denotes a valid time or not.
-     * @param expr AST node to inspect.
-     * @return True if the argument denotes a valid time, false otherwise.
-     */
-    public static boolean isValidTime(Expression expr) {
-        if (expr instanceof ParameterReference) {
-            return isOfTimeType(((ParameterReference) expr).getParameter());
-        } else if (expr instanceof Time) {
-            return isValidTime((Time) expr);
-        } else if (expr instanceof Literal) {
-            return isZero(((Literal) expr).getLiteral());
+        if (!ASTUtils.isZero(e)) {
+          foundNonZero = true;
         }
-        return false;
-    }
-
-    /**
-     * Report whether the given time denotes a valid time or not.
-     * @param t AST node to inspect.
-     * @return True if the argument denotes a valid time, false otherwise.
-     */
-    public static boolean isValidTime(Time t) {
-        if (t == null) return false;
-        String unit = t.getUnit();
-        return t.getInterval() == 0 ||
-               TimeUnit.isValidUnit(unit);
-    }
-
-    /**
-     * If the initializer contains exactly one expression,
-     * return it. Otherwise, return null.
-     */
-    public static Expression asSingleExpr(Initializer init) {
-        if (init == null) {
-            return null;
+      }
+
+      if (allValidTime && foundNonZero) {
+        // Conservatively, no bounds are inferred; the returned type
+        // is a variable-size list.
+        return InferredType.timeList();
+      }
+    }
+    return InferredType.undefined();
+  }
+
+  /**
+   * Given a parameter, return an inferred type. Only two types can be inferred: "time" and
+   * "timeList". Return the "undefined" type if neither can be inferred.
+   *
+   * @param p A parameter to infer the type of.
+   * @return The inferred type, or "undefined" if none could be inferred.
+   */
+  public static InferredType getInferredType(Parameter p) {
+    return getInferredType(p.getType(), p.getInit());
+  }
+
+  /**
+   * Given a state variable, return an inferred type. Only two types can be inferred: "time" and
+   * "timeList". Return the "undefined" type if neither can be inferred.
+   *
+   * @param s A state variable to infer the type of.
+   * @return The inferred type, or "undefined" if none could be inferred.
+   */
+  public static InferredType getInferredType(StateVar s) {
+    return getInferredType(s.getType(), s.getInit());
+  }
+
+  /**
+   * Construct an inferred type from an "action" AST node based on its declared type. If no type is
+   * declared, return the "undefined" type.
+   *
+   * @param a An action to construct an inferred type object for.
+   * @return The inferred type, or "undefined" if none was declared.
+   */
+  public static InferredType getInferredType(Action a) {
+    return getInferredType(a.getType(), null);
+  }
+
+  /**
+   * Construct an inferred type from a "port" AST node based on its declared type. If no type is
+   * declared, return the "undefined" type.
+   *
+   * @param p A port to construct an inferred type object for.
+   * @return The inferred type, or "undefined" if none was declared.
+   */
+  public static InferredType getInferredType(Port p) {
+    return getInferredType(p.getType(), null);
+  }
+
+  /**
+   * If the given string can be recognized as a floating-point number that has a leading decimal
+   * point, prepend the string with a zero and return it. Otherwise, return the original string.
+   *
+   * @param literal A string might be recognizable as a floating point number with a leading decimal
+   *     point.
+   * @return an equivalent representation of <code>literal
+   * </code>
+   */
+  public static String addZeroToLeadingDot(String literal) {
+    Matcher m = ABBREVIATED_FLOAT.matcher(literal);
+    if (m.matches()) {
+      return literal.replace(".", "0.");
+    }
+    return literal;
+  }
+
+  /**
+   * Return true if the specified port is a multiport.
+   *
+   * @param port The port.
+   * @return True if the port is a multiport.
+   */
+  public static boolean isMultiport(Port port) {
+    return port.getWidthSpec() != null;
+  }
+
+  ////////////////////////////////
+  //// Utility functions for translating AST nodes into text
+  // This is a continuation of a large section of ASTUtils.xtend
+  // with the same name.
+
+  /**
+   * Generate code for referencing a port, action, or timer.
+   *
+   * @param reference The reference to the variable.
+   */
+  public static String generateVarRef(VarRef reference) {
+    var prefix = "";
+    if (reference.getContainer() != null) {
+      prefix = reference.getContainer().getName() + ".";
+    }
+    return prefix + reference.getVariable().getName();
+  }
+
+  /** Assuming that the given expression denotes a valid time literal, return a time value. */
+  public static TimeValue getLiteralTimeValue(Expression expr) {
+    if (expr instanceof Time) {
+      return toTimeValue((Time) expr);
+    } else if (expr instanceof Literal && isZero(((Literal) expr).getLiteral())) {
+      return TimeValue.ZERO;
+    } else {
+      return null;
+    }
+  }
+
+  /** If the parameter is of time type, return its default value. Otherwise, return null. */
+  public static TimeValue getDefaultAsTimeValue(Parameter p) {
+    if (isOfTimeType(p)) {
+      var init = asSingleExpr(p.getInit());
+      if (init != null) {
+        return getLiteralTimeValue(init);
+      }
+    }
+    return null;
+  }
+
+  /** Return whether the given state variable is inferred to a time type. */
+  public static boolean isOfTimeType(StateVar state) {
+    InferredType t = getInferredType(state);
+    return t.isTime && !t.isList;
+  }
+
+  /** Return whether the given parameter is inferred to a time type. */
+  public static boolean isOfTimeType(Parameter param) {
+    InferredType t = getInferredType(param);
+    return t.isTime && !t.isList;
+  }
+
+  /**
+   * Given a parameter, return its initial value. The initial value is a list of instances of
+   * Expressions.
+   *
+   * <p>If the instantiations argument is null or an empty list, then the value returned is simply
+   * the default value given when the parameter is defined.
+   *
+   * <p>If a list of instantiations is given, then the first instantiation is required to be an
+   * instantiation of the reactor class that is parameterized by the parameter. I.e.,
+   *
+   * <pre>
+   * <code>     <span class="hljs-keyword">parameter</span>.eContainer <span class="hljs-comment">== instantiations.get(0).reactorClass</span>
+   * </code></pre>
+   *
+   * <p>If a second instantiation is given, then it is required to be an instantiation of a reactor
+   * class that contains the first instantiation. That is,
+   *
+   * <pre>
+   * <code>     instantiations.<span class="hljs-keyword">get</span>(<span class="hljs-number">0</span>).eContainer == instantiations.<span class="hljs-keyword">get</span>(<span class="hljs-number">1</span>).reactorClass
+   * </code></pre>
+   *
+   * <p>More generally, for all 0 &lt;= i &lt; instantiations.size - 1,
+   *
+   * <pre>
+   * <code>     instantiations.get(i)<span class="hljs-selector-class">.eContainer</span> == instantiations.get(<span class="hljs-selector-tag">i</span> + <span class="hljs-number">1</span>).reactorClass
+   * </code></pre>
+   *
+   * <p>If any of these conditions is not satisfied, then an IllegalArgumentException will be
+   * thrown.
+   *
+   * <p>Note that this chain of reactions cannot be inferred from the parameter because in each of
+   * the predicates above, there may be more than one instantiation that can appear on the right
+   * hand side of the predicate.
+   *
+   * <p>For example, consider the following program:
+   *
+   * <pre><code>     reactor A(x:int(<span class="hljs-number">1</span>)) {}
+   *      reactor <span class="hljs-keyword">B(y:int(2)) </span>{
+   *          <span class="hljs-built_in">a1</span> = new A(x = y)<span class="hljs-comment">;</span>
+   *          <span class="hljs-built_in">a2</span> = new A(x = -<span class="hljs-number">1</span>)<span class="hljs-comment">;</span>
+   *      }
+   *      reactor C(z:int(<span class="hljs-number">3</span>)) {
+   *          <span class="hljs-keyword">b1 </span>= new <span class="hljs-keyword">B(y </span>= z)<span class="hljs-comment">;</span>
+   *          <span class="hljs-keyword">b2 </span>= new <span class="hljs-keyword">B(y </span>= -<span class="hljs-number">2</span>)<span class="hljs-comment">;</span>
+   *      }
+   * </code></pre>
+   *
+   * <p>Notice that there are a total of four instances of reactor class A. Then
+   *
+   * <pre>
+   * <code>     initialValue(<span class="hljs-name">x</span>, null) returns <span class="hljs-number">1</span>
+   *      initialValue(<span class="hljs-name">x</span>, [a1]) returns <span class="hljs-number">2</span>
+   *      initialValue(<span class="hljs-name">x</span>, [a2]) returns <span class="hljs-number">-1</span>
+   *      initialValue(<span class="hljs-name">x</span>, [a1, b1]) returns <span class="hljs-number">3</span>
+   *      initialValue(<span class="hljs-name">x</span>, [a2, b1]) returns <span class="hljs-number">-1</span>
+   *      initialValue(<span class="hljs-name">x</span>, [a1, b2]) returns <span class="hljs-number">-2</span>
+   *      initialValue(<span class="hljs-name">x</span>, [a2, b2]) returns <span class="hljs-number">-1</span>
+   * </code></pre>
+   *
+   * <p>(Actually, in each of the above cases, the returned value is a list with one entry, a
+   * Literal, e.g. [&quot;1&quot;]).
+   *
+   * <p>There are two instances of reactor class B.
+   *
+   * <pre>
+   * <code>     initialValue(<span class="hljs-name">y</span>, null) returns <span class="hljs-number">2</span>
+   *      initialValue(<span class="hljs-name">y</span>, [a1]) throws an IllegalArgumentException
+   *      initialValue(<span class="hljs-name">y</span>, [b1]) returns <span class="hljs-number">3</span>
+   *      initialValue(<span class="hljs-name">y</span>, [b2]) returns <span class="hljs-number">-2</span>
+   * </code></pre>
+   *
+   * @param parameter The parameter.
+   * @param instantiations The (optional) list of instantiations.
+   * @return The value of the parameter.
+   * @throws IllegalArgumentException If an instantiation provided is not an instantiation of the
+   *     reactor class that is parameterized by the respective parameter or if the chain of
+   *     instantiations is not nested.
+   */
+  public static List<Expression> initialValue(
+      Parameter parameter, List<Instantiation> instantiations) {
+    // If instantiations are given, then check to see whether this parameter gets overridden in
+    // the first of those instantiations.
+    if (instantiations != null && instantiations.size() > 0) {
+      // Check to be sure that the instantiation is in fact an instantiation
+      // of the reactor class for which this is a parameter.
+      Instantiation instantiation = instantiations.get(0);
+
+      if (!belongsTo(parameter, instantiation)) {
+        throw new IllegalArgumentException(
+            "Parameter "
+                + parameter.getName()
+                + " is not a parameter of reactor instance "
+                + instantiation.getName()
+                + ".");
+      }
+      // In case there is more than one assignment to this parameter, we need to
+      // find the last one.
+      Assignment lastAssignment = null;
+      for (Assignment assignment : instantiation.getParameters()) {
+        if (assignment.getLhs().equals(parameter)) {
+          lastAssignment = assignment;
         }
-        var exprs = init.getExprs();
-        return exprs.size() == 1 ? exprs.get(0) : null;
-    }
-
-    public static boolean isSingleExpr(Initializer init) {
-        // todo expand that to = initialization
-        if (init == null) {
-            return false;
-        }
-        var exprs = init.getExprs();
-        return exprs.size() == 1;
-    }
-
-    public static boolean isListInitializer(Initializer init) {
-        return init != null && !isSingleExpr(init);
-    }
-
-    /**
-     * Return the type of a declaration with the given
-     * (nullable) explicit type, and the given (nullable)
-     * initializer. If the explicit type is null, then the
-     * type is inferred from the initializer. Only two types
-     * can be inferred: "time" and "timeList". Return the
-     * "undefined" type if neither can be inferred.
-     *
-     * @param type Explicit type declared on the declaration
-     * @param init The initializer expression
-     * @return The inferred type, or "undefined" if none could be inferred.
-     */
-    public static InferredType getInferredType(Type type, Initializer init) {
-        if (type != null) {
-            return InferredType.fromAST(type);
-        } else if (init == null) {
-            return InferredType.undefined();
-        }
-
-        var single = asSingleExpr(init);
-        if (single != null) {
-            // If there is a single element in the list, and it is a proper
-            // time value with units, we infer the type "time".
-            if (single instanceof ParameterReference) {
-                return getInferredType(((ParameterReference) single).getParameter());
-            } else if (single instanceof Time) {
-                return InferredType.time();
-            }
-        } else if (init.getExprs().size() > 1) {
-            // If there are multiple elements in the list, and there is at
-            // least one proper time value with units, and all other elements
-            // are valid times (including zero without units), we infer the
-            // type "time list".
-            var allValidTime = true;
-            var foundNonZero = false;
-
-            for (var e : init.getExprs()) {
-                if (!ASTUtils.isValidTime(e)) {
-                    allValidTime = false;
-                }
-                if (!ASTUtils.isZero(e)) {
-                    foundNonZero = true;
-                }
-            }
-
-            if (allValidTime && foundNonZero) {
-                // Conservatively, no bounds are inferred; the returned type
-                // is a variable-size list.
-                return InferredType.timeList();
-            }
-        }
-        return InferredType.undefined();
-    }
-
-    /**
-     * Given a parameter, return an inferred type. Only two types can be
-     * inferred: "time" and "timeList". Return the "undefined" type if
-     * neither can be inferred.
-     *
-     * @param p A parameter to infer the type of.
-     * @return The inferred type, or "undefined" if none could be inferred.
-     */
-    public static InferredType getInferredType(Parameter p) {
-        return getInferredType(p.getType(), p.getInit());
-    }
-
-    /**
-     * Given a state variable, return an inferred type. Only two types can be
-     * inferred: "time" and "timeList". Return the "undefined" type if
-     * neither can be inferred.
-     *
-     * @param s A state variable to infer the type of.
-     * @return The inferred type, or "undefined" if none could be inferred.
-     */
-    public static InferredType getInferredType(StateVar s) {
-        return getInferredType(s.getType(), s.getInit());
-    }
-
-    /**
-     * Construct an inferred type from an "action" AST node based
-     * on its declared type. If no type is declared, return the "undefined"
-     * type.
-     *
-     * @param a An action to construct an inferred type object for.
-     * @return The inferred type, or "undefined" if none was declared.
-     */
-    public static InferredType getInferredType(Action a) {
-        return getInferredType(a.getType(), null);
-    }
-
-    /**
-     * Construct an inferred type from a "port" AST node based on its declared
-     * type. If no type is declared, return the "undefined" type.
-     *
-     * @param p A port to construct an inferred type object for.
-     * @return The inferred type, or "undefined" if none was declared.
-     */
-    public static InferredType getInferredType(Port p) {
-        return getInferredType(p.getType(), null);
-    }
-
-    /**
-     * If the given string can be recognized as a floating-point number that has a leading decimal point,
-     * prepend the string with a zero and return it. Otherwise, return the original string.
-     *
-     * @param literal A string might be recognizable as a floating point number with a leading decimal point.
-     * @return an equivalent representation of <code>literal
-     * </code>
-     */
-    public static String addZeroToLeadingDot(String literal) {
-        Matcher m = ABBREVIATED_FLOAT.matcher(literal);
-        if (m.matches()) {
-            return literal.replace(".", "0.");
-        }
-        return literal;
-    }
-
-    /**
-     * Return true if the specified port is a multiport.
-     * @param port The port.
-     * @return True if the port is a multiport.
-     */
-    public static boolean isMultiport(Port port) {
-        return port.getWidthSpec() != null;
-    }
-
-    ////////////////////////////////
-    //// Utility functions for translating AST nodes into text
-    // This is a continuation of a large section of ASTUtils.xtend
-    // with the same name.
-
-    /**
-     * Generate code for referencing a port, action, or timer.
-     * @param reference The reference to the variable.
-     */
-    public static String generateVarRef(VarRef reference) {
-        var prefix = "";
-        if (reference.getContainer() != null) {
-            prefix = reference.getContainer().getName() + ".";
-        }
-        return prefix + reference.getVariable().getName();
-    }
-
-    /**
-     * Assuming that the given expression denotes a valid time literal,
-     * return a time value.
-     */
-    public static TimeValue getLiteralTimeValue(Expression expr) {
-        if (expr instanceof Time) {
-            return toTimeValue((Time)expr);
-        } else if (expr instanceof Literal && isZero(((Literal) expr).getLiteral())) {
-            return TimeValue.ZERO;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * If the parameter is of time type, return its default value.
-     * Otherwise, return null.
-     */
-    public static TimeValue getDefaultAsTimeValue(Parameter p) {
-        if (isOfTimeType(p)) {
-            var init = asSingleExpr(p.getInit());
-            if (init != null) {
-                return getLiteralTimeValue(init);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Return whether the given state variable is inferred
-     * to a time type.
-     */
-    public static boolean isOfTimeType(StateVar state) {
-        InferredType t = getInferredType(state);
-        return t.isTime && !t.isList;
-    }
-
-    /**
-     * Return whether the given parameter is inferred
-     * to a time type.
-     */
-    public static boolean isOfTimeType(Parameter param) {
-        InferredType t = getInferredType(param);
-        return t.isTime && !t.isList;
-    }
-
-    /**
-     *  Given a parameter, return its initial value.
-     *  The initial value is a list of instances of Expressions.
-     *
-     *  If the instantiations argument is null or an empty list, then the
-     *  value returned is simply the default value given when the parameter
-     *  is defined.
-     *
-     *  If a list of instantiations is given, then the first instantiation
-     *  is required to be an instantiation of the reactor class that is
-     *  parameterized by the parameter. I.e.,
-     *  <pre><code>     <span class="hljs-keyword">parameter</span>.eContainer <span class="hljs-comment">== instantiations.get(0).reactorClass</span>
-     * </code></pre><p> If a second instantiation is given, then it is required to be an instantiation of a
-     *  reactor class that contains the first instantiation.  That is,</p>
-     * <pre><code>     instantiations.<span class="hljs-keyword">get</span>(<span class="hljs-number">0</span>).eContainer == instantiations.<span class="hljs-keyword">get</span>(<span class="hljs-number">1</span>).reactorClass
-     * </code></pre><p> More generally, for all 0 &lt;= i &lt; instantiations.size - 1,</p>
-     * <pre><code>     instantiations.get(i)<span class="hljs-selector-class">.eContainer</span> == instantiations.get(<span class="hljs-selector-tag">i</span> + <span class="hljs-number">1</span>).reactorClass
-     * </code></pre><p> If any of these conditions is not satisfied, then an IllegalArgumentException
-     *  will be thrown.</p>
-     * <p> Note that this chain of reactions cannot be inferred from the parameter because
-     *  in each of the predicates above, there may be more than one instantiation that
-     *  can appear on the right hand side of the predicate.</p>
-     * <p> For example, consider the following program:</p>
-     * <pre><code>     reactor A(x:int(<span class="hljs-number">1</span>)) {}
-     *      reactor <span class="hljs-keyword">B(y:int(2)) </span>{
-     *          <span class="hljs-built_in">a1</span> = new A(x = y)<span class="hljs-comment">;</span>
-     *          <span class="hljs-built_in">a2</span> = new A(x = -<span class="hljs-number">1</span>)<span class="hljs-comment">;</span>
-     *      }
-     *      reactor C(z:int(<span class="hljs-number">3</span>)) {
-     *          <span class="hljs-keyword">b1 </span>= new <span class="hljs-keyword">B(y </span>= z)<span class="hljs-comment">;</span>
-     *          <span class="hljs-keyword">b2 </span>= new <span class="hljs-keyword">B(y </span>= -<span class="hljs-number">2</span>)<span class="hljs-comment">;</span>
-     *      }
-     * </code></pre><p> Notice that there are a total of four instances of reactor class A.
-     *  Then</p>
-     * <pre><code>     initialValue(<span class="hljs-name">x</span>, null) returns <span class="hljs-number">1</span>
-     *      initialValue(<span class="hljs-name">x</span>, [a1]) returns <span class="hljs-number">2</span>
-     *      initialValue(<span class="hljs-name">x</span>, [a2]) returns <span class="hljs-number">-1</span>
-     *      initialValue(<span class="hljs-name">x</span>, [a1, b1]) returns <span class="hljs-number">3</span>
-     *      initialValue(<span class="hljs-name">x</span>, [a2, b1]) returns <span class="hljs-number">-1</span>
-     *      initialValue(<span class="hljs-name">x</span>, [a1, b2]) returns <span class="hljs-number">-2</span>
-     *      initialValue(<span class="hljs-name">x</span>, [a2, b2]) returns <span class="hljs-number">-1</span>
-     * </code></pre><p> (Actually, in each of the above cases, the returned value is a list with
-     *  one entry, a Literal, e.g. [&quot;1&quot;]).</p>
-     * <p> There are two instances of reactor class B.</p>
-     * <pre><code>     initialValue(<span class="hljs-name">y</span>, null) returns <span class="hljs-number">2</span>
-     *      initialValue(<span class="hljs-name">y</span>, [a1]) throws an IllegalArgumentException
-     *      initialValue(<span class="hljs-name">y</span>, [b1]) returns <span class="hljs-number">3</span>
-     *      initialValue(<span class="hljs-name">y</span>, [b2]) returns <span class="hljs-number">-2</span>
-     * </code></pre>
-     * @param parameter The parameter.
-     * @param instantiations The (optional) list of instantiations.
-     *
-     * @return The value of the parameter.
-     *
-     * @throws IllegalArgumentException If an instantiation provided is not an
-     *  instantiation of the reactor class that is parameterized by the
-     *  respective parameter or if the chain of instantiations is not nested.
-     */
-    public static List<Expression> initialValue(Parameter parameter, List<Instantiation> instantiations) {
-        // If instantiations are given, then check to see whether this parameter gets overridden in
-        // the first of those instantiations.
-        if (instantiations != null && instantiations.size() > 0) {
-            // Check to be sure that the instantiation is in fact an instantiation
-            // of the reactor class for which this is a parameter.
-            Instantiation instantiation = instantiations.get(0);
-
-            if (!belongsTo(parameter, instantiation)) {
-                throw new IllegalArgumentException("Parameter "
-                    + parameter.getName()
-                    + " is not a parameter of reactor instance "
-                    + instantiation.getName()
-                    + "."
-                );
-            }
-            // In case there is more than one assignment to this parameter, we need to
-            // find the last one.
-            Assignment lastAssignment = null;
-            for (Assignment assignment: instantiation.getParameters()) {
-                if (assignment.getLhs().equals(parameter)) {
-                    lastAssignment = assignment;
-                }
-            }
-            if (lastAssignment != null) {
-                // Right hand side can be a list. Collect the entries.
-                List<Expression> result = new ArrayList<>();
-                for (Expression expr: lastAssignment.getRhs().getExprs()) {
-                    if (expr instanceof ParameterReference) {
-                        if (instantiations.size() > 1
-                            && instantiation.eContainer() != instantiations.get(1).getReactorClass()
-                        ) {
-                            throw new IllegalArgumentException("Reactor instance "
-                                    + instantiation.getName()
-                                    + " is not contained by instance "
-                                    + instantiations.get(1).getName()
-                                    + "."
-                            );
-                        }
-                        result.addAll(initialValue(((ParameterReference)expr).getParameter(),
-                                instantiations.subList(1, instantiations.size())));
-                    } else {
-                        result.add(expr);
-                    }
-                }
-                return result;
-            }
-        }
-        // If we reach here, then either no instantiation was supplied or
-        // there was no assignment in the instantiation. So just use the
-        // parameter's initial value.
-        return parameter.getInit().getExprs();
-    }
-
-    /**
-     * Return true if the specified object (a Parameter, Port, Action, or Timer)
-     * belongs to the specified instantiation, meaning that it is defined in
-     * the reactor class being instantiated or one of its base classes.
-     * @param eobject The object.
-     * @param instantiation The instantiation.
-     */
-    public static boolean belongsTo(EObject eobject, Instantiation instantiation) {
-        Reactor reactor = toDefinition(instantiation.getReactorClass());
-        return belongsTo(eobject, reactor);
-    }
-
-    /**
-     * Return true if the specified object (a Parameter, Port, Action, or Timer)
-     * belongs to the specified reactor, meaning that it is defined in
-     * reactor class or one of its base classes.
-     * @param eobject The object.
-     * @param reactor The reactor.
-     */
-    public static boolean belongsTo(EObject eobject, Reactor reactor) {
-        if (eobject.eContainer() == reactor) return true;
-        for (ReactorDecl baseClass : reactor.getSuperClasses()) {
-            if (belongsTo(eobject, toDefinition(baseClass))) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Given a parameter return its integer value or null
-     * if it does not have an integer value.
-     * If the value of the parameter is a list of integers,
-     * return the sum of value in the list.
-     * The instantiations parameter is as in
-     * {@link #initialValue(Parameter, List)}.
-     *
-     * @param parameter The parameter.
-     * @param instantiations The (optional) list of instantiations.
-     *
-     * @return The integer value of the parameter, or null if it does not have an integer value.
-     *
-     * @throws IllegalArgumentException If an instantiation provided is not an
-     *  instantiation of the reactor class that is parameterized by the
-     *  respective parameter or if the chain of instantiations is not nested.
-     */
-    public static Integer initialValueInt(Parameter parameter, List<Instantiation> instantiations) {
-        List<Expression> expressions = initialValue(parameter, instantiations);
-        int result = 0;
-        for (Expression expr: expressions) {
-            if (!(expr instanceof Literal)) {
-                return null;
-            }
-            try {
-                result += Integer.decode(((Literal) expr).getLiteral());
-            } catch (NumberFormatException ex) {
-                return null;
+      }
+      if (lastAssignment != null) {
+        // Right hand side can be a list. Collect the entries.
+        List<Expression> result = new ArrayList<>();
+        for (Expression expr : lastAssignment.getRhs().getExprs()) {
+          if (expr instanceof ParameterReference) {
+            if (instantiations.size() > 1
+                && instantiation.eContainer() != instantiations.get(1).getReactorClass()) {
+              throw new IllegalArgumentException(
+                  "Reactor instance "
+                      + instantiation.getName()
+                      + " is not contained by instance "
+                      + instantiations.get(1).getName()
+                      + ".");
             }
+            result.addAll(
+                initialValue(
+                    ((ParameterReference) expr).getParameter(),
+                    instantiations.subList(1, instantiations.size())));
+          } else {
+            result.add(expr);
+          }
         }
         return result;
-    }
-
-    /**
-     * Given the width specification of port or instantiation
-     * and an (optional) list of nested instantiations, return
-     * the width if it can be determined and -1 if not.
-     * It will not be able to be determined if either the
-     * width is variable (in which case you should use
-     * {@link #inferPortWidth(VarRef, Connection, List)} )
-     * or the list of instantiations is incomplete or missing.
-     * If there are parameter references in the width, they are
-     * evaluated to the extent possible given the instantiations list.
-     *
-     * The instantiations list is as in
-     * {@link #initialValue(Parameter, List)}.
-     * If the spec belongs to an instantiation (for a bank of reactors),
-     * then the first element on this list should be the instantiation
-     * that contains this instantiation. If the spec belongs to a port,
-     * then the first element on the list should be the instantiation
-     * of the reactor that contains the port.
-     *
-     * @param spec The width specification or null (to return 1).
-     * @param instantiations The (optional) list of instantiations.
-     *
-     * @return The width, or -1 if the width could not be determined.
-     *
-     * @throws IllegalArgumentException If an instantiation provided is not as
-     *  given above or if the chain of instantiations is not nested.
-     */
-    public static int width(WidthSpec spec, List<Instantiation> instantiations) {
-        if (spec == null) {
-            return 1;
-        }
-        if (spec.isOfVariableLength() && spec.eContainer() instanceof Instantiation) {
-            return inferWidthFromConnections(spec, instantiations);
-        }
-        var result = 0;
-        for (WidthTerm term: spec.getTerms()) {
-            if (term.getParameter() != null) {
-                Integer termWidth = initialValueInt(term.getParameter(), instantiations);
-                if (termWidth != null) {
-                    result += termWidth;
-                } else {
-                    return -1;
-                }
-            } else if (term.getWidth() > 0) {
-                result += term.getWidth();
-            } else {
-                // If the width cannot be determined because term's width <= 0, which means the term's width
-                // must be inferred, try to infer the width using connections.
-                if (spec.eContainer() instanceof Instantiation) {
-                    try {
-                        return inferWidthFromConnections(spec, instantiations);
-                    } catch (InvalidSourceException e) {
-                        // If the inference fails, return -1.
-                        return -1;
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Infer the width of a port reference in a connection.
-     * The port reference one or two parts, a port and an (optional) container
-     * which is an Instantiation that may refer to a bank of reactors.
-     * The width will be the product of the bank width and the port width.
-     * The returned value will be 1 if the port is not in a bank and is not a multiport.
-     *
-     * If the width cannot be determined, this will return -1.
-     * The width cannot be determined if the list of instantiations is
-     * missing or incomplete.
-     *
-     * The instantiations list is as in
-     * {@link #initialValue(Parameter, List)}.
-     * The first element on this list should be the instantiation
-     * that contains the specified connection.
-     *
-     * @param reference A port reference.
-     * @param connection A connection, or null if not in the context of a connection.
-     * @param instantiations The (optional) list of instantiations.
-     *
-     * @return The width or -1 if it could not be determined.
-     *
-     * @throws IllegalArgumentException If an instantiation provided is not as
-     *  given above or if the chain of instantiations is not nested.
-     */
-    public static int inferPortWidth(
-        VarRef reference, Connection connection, List<Instantiation> instantiations
-    ) {
-        if (reference.getVariable() instanceof Port) {
-            // If the port is given as a.b, then we want to prepend a to
-            // the list of instantiations to determine the width of this port.
-            List<Instantiation> extended = instantiations;
-            if (reference.getContainer() != null) {
-                extended = new ArrayList<>();
-                extended.add(reference.getContainer());
-                if (instantiations != null) {
-                    extended.addAll(instantiations);
-                }
-            }
-
-            int portWidth = width(((Port) reference.getVariable()).getWidthSpec(), extended);
-            if (portWidth < 0) {
-                // Could not determine port width.
-                return -1;
-            }
-
-            // Next determine the bank width. This may be unspecified, in which
-            // case it has to be inferred using the connection.
-            int bankWidth = 1;
-            if (reference.getContainer() != null) {
-                bankWidth = width(reference.getContainer().getWidthSpec(), instantiations);
-                if (bankWidth < 0 && connection != null) {
-                    // Try to infer the bank width from the connection.
-                    if (reference.getContainer().getWidthSpec().isOfVariableLength()) {
-                        // This occurs for a bank of delays.
-                        int leftWidth = 0;
-                        int rightWidth = 0;
-                        int leftOrRight = 0;
-                        for (VarRef leftPort : connection.getLeftPorts()) {
-                            if (leftPort == reference) {
-                                if (leftOrRight != 0) {
-                                    throw new InvalidSourceException("Multiple ports with variable width on a connection.");
-                                }
-                                // Indicate that this port is on the left.
-                                leftOrRight = -1;
-                            } else {
-                                // The left port is not the same as this reference.
-                                int otherWidth = inferPortWidth(leftPort, connection, instantiations);
-                                if (otherWidth < 0) {
-                                    // Cannot determine width.
-                                    return -1;
-                                }
-                                leftWidth += otherWidth;
-                            }
-                        }
-                        for (VarRef rightPort : connection.getRightPorts()) {
-                            if (rightPort == reference) {
-                                if (leftOrRight != 0) {
-                                    throw new InvalidSourceException("Multiple ports with variable width on a connection.");
-                                }
-                                // Indicate that this port is on the right.
-                                leftOrRight = 1;
-                            } else {
-                                int otherWidth = inferPortWidth(rightPort, connection, instantiations);
-                                if (otherWidth < 0) {
-                                    // Cannot determine width.
-                                    return -1;
-                                }
-                                rightWidth += otherWidth;
-                            }
-                        }
-                        int discrepancy = 0;
-                        if (leftOrRight < 0) {
-                            // This port is on the left.
-                            discrepancy = rightWidth - leftWidth;
-                        } else if (leftOrRight > 0) {
-                            // This port is on the right.
-                            discrepancy = leftWidth - rightWidth;
-                        }
-                        // Check that portWidth divides the discrepancy.
-                        if (discrepancy % portWidth != 0) {
-                            // This is an error.
-                            return -1;
-                        }
-                        bankWidth = discrepancy / portWidth;
-                    } else {
-                        // Could not determine the bank width.
-                        return -1;
-                    }
-                }
-            }
-            return portWidth * bankWidth;
-        }
-        // Argument is not a port.
-        return -1;
-    }
-
-    /**
-     * Given an instantiation of a reactor or bank of reactors, return
-     * the width. This will be 1 if this is not a reactor bank. Otherwise,
-     * this will attempt to determine the width. If the width is declared
-     * as a literal constant, it will return that constant. If the width
-     * is specified as a reference to a parameter, this will throw an
-     * exception. If the width is variable, this will find
-     * connections in the enclosing reactor and attempt to infer the
-     * width. If the width cannot be determined, it will throw an exception.
-     *
-     * IMPORTANT: This method should not be used you really need to
-     * determine the width! It will not evaluate parameter values.
-     * @see #width(WidthSpec, List)
-     *
-     * @param instantiation A reactor instantiation.
-     *
-     * @return The width, if it can be determined.
-     * @deprecated
-     */
-    @Deprecated
-    public static int widthSpecification(Instantiation instantiation) {
-        int result = width(instantiation.getWidthSpec(), null);
-        if (result < 0) {
-            throw new InvalidSourceException("Cannot determine width for the instance "
-                    + instantiation.getName());
-        }
-        return result;
-    }
-
-    /**
-     * Report whether a state variable has been initialized or not.
-     * @param v The state variable to be checked.
-     * @return True if the variable was initialized, false otherwise.
-     */
-    public static boolean isInitialized(StateVar v) {
-        return v != null && v.getInit() != null;
-    }
-
-    /**
-     * Report whether the given time state variable is initialized using a
-     * parameter or not.
-     * @param s A state variable.
-     * @return True if the argument is initialized using a parameter, false
-     * otherwise.
-     */
-    public static boolean isParameterized(StateVar s) {
-        return s.getInit() != null &&
-               IterableExtensions.exists(s.getInit().getExprs(), it -> it instanceof ParameterReference);
-    }
-
-    /**
-     * Check if the reactor class uses generics
-     * @param r the reactor to check
-     * @return true if the reactor uses generics
-     */
-    public static boolean isGeneric(Reactor r) {
-        if (r == null) {
-            return false;
-        }
-        return r.getTypeParms().size() != 0;
-    }
-
-    /**
-     * If the specified reactor declaration is an import, then
-     * return the imported reactor class definition. Otherwise,
-     * just return the argument.
-     * @param r A Reactor or an ImportedReactor.
-     * @return The Reactor class definition or null if no definition is found.
-     */
-    public static Reactor toDefinition(ReactorDecl r) {
-        if (r == null)
-            return null;
-        if (r instanceof Reactor) {
-            return (Reactor) r;
-        } else if (r instanceof ImportedReactor) {
-            return ((ImportedReactor) r).getReactorClass();
-        }
+      }
+    }
+    // If we reach here, then either no instantiation was supplied or
+    // there was no assignment in the instantiation. So just use the
+    // parameter's initial value.
+    return parameter.getInit().getExprs();
+  }
+
+  /**
+   * Return true if the specified object (a Parameter, Port, Action, or Timer) belongs to the
+   * specified instantiation, meaning that it is defined in the reactor class being instantiated or
+   * one of its base classes.
+   *
+   * @param eobject The object.
+   * @param instantiation The instantiation.
+   */
+  public static boolean belongsTo(EObject eobject, Instantiation instantiation) {
+    Reactor reactor = toDefinition(instantiation.getReactorClass());
+    return belongsTo(eobject, reactor);
+  }
+
+  /**
+   * Return true if the specified object (a Parameter, Port, Action, or Timer) belongs to the
+   * specified reactor, meaning that it is defined in reactor class or one of its base classes.
+   *
+   * @param eobject The object.
+   * @param reactor The reactor.
+   */
+  public static boolean belongsTo(EObject eobject, Reactor reactor) {
+    if (eobject.eContainer() == reactor) return true;
+    for (ReactorDecl baseClass : reactor.getSuperClasses()) {
+      if (belongsTo(eobject, toDefinition(baseClass))) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Given a parameter return its integer value or null if it does not have an integer value. If the
+   * value of the parameter is a list of integers, return the sum of value in the list. The
+   * instantiations parameter is as in {@link #initialValue(Parameter, List)}.
+   *
+   * @param parameter The parameter.
+   * @param instantiations The (optional) list of instantiations.
+   * @return The integer value of the parameter, or null if it does not have an integer value.
+   * @throws IllegalArgumentException If an instantiation provided is not an instantiation of the
+   *     reactor class that is parameterized by the respective parameter or if the chain of
+   *     instantiations is not nested.
+   */
+  public static Integer initialValueInt(Parameter parameter, List<Instantiation> instantiations) {
+    List<Expression> expressions = initialValue(parameter, instantiations);
+    int result = 0;
+    for (Expression expr : expressions) {
+      if (!(expr instanceof Literal)) {
         return null;
-    }
-
-    /**
-     * Return all single-line or multi-line comments immediately preceding the
-     * given EObject.
-     */
-    public static Stream<String> getPrecedingComments(
-        ICompositeNode compNode,
-        Predicate<INode> filter
-    ) {
-        return getPrecedingCommentNodes(compNode, filter).map(INode::getText);
-    }
-
-    /**
-     * Return all single-line or multi-line comments immediately preceding the
-     * given EObject.
-     */
-    public static Stream<INode> getPrecedingCommentNodes(
-        ICompositeNode compNode,
-        Predicate<INode> filter
-    ) {
-        if (compNode == null) return Stream.of();
-        List<INode> ret = new ArrayList<>();
-        for (INode node : compNode.getAsTreeIterable()) {
-            if (!(node instanceof ICompositeNode)) {
-                if (isComment(node)) {
-                    if (filter.test(node)) ret.add(node);
-                } else if (!node.getText().isBlank()) {
-                    break;
-                }
-            }
-        }
-        return ret.stream();
-    }
-
-    /** Return whether {@code node} is a comment. */
-    public static boolean isComment(INode node) {
-        return node instanceof HiddenLeafNode hlNode
-            && hlNode.getGrammarElement() instanceof TerminalRule tRule
-            && tRule.getName().endsWith("_COMMENT");
-    }
-
-    /**
-     * Return true if the given node starts on the same line as the given other
-     * node.
-     */
-    public static Predicate<INode> sameLine(ICompositeNode compNode) {
-        return other -> {
-            for (INode node : compNode.getAsTreeIterable()) {
-                if (!(node instanceof ICompositeNode) && !node.getText().isBlank() && !isComment(node)) {
-                    return node.getStartLine() == other.getStartLine();
-                }
-            }
-            return false;
-        };
-    }
-
-    /**
-     * Find the main reactor and set its name if none was defined.
-     * @param resource The resource to find the main reactor in.
-     */
-    public static void setMainName(Resource resource, String name) {
-        Reactor main = IteratorExtensions.findFirst(Iterators.filter(resource.getAllContents(), Reactor.class),
-            it -> it.isMain() || it.isFederated()
-        );
-        if (main != null && StringExtensions.isNullOrEmpty(main.getName())) {
-            main.setName(name);
-        }
-    }
-
-    /**
-     * Create a new instantiation node with the given reactor as its defining class.
-     * @param reactor The reactor class to create an instantiation of.
-     */
-    public static Instantiation createInstantiation(Reactor reactor) {
-        Instantiation inst = LfFactory.eINSTANCE.createInstantiation();
-        inst.setReactorClass(reactor);
-        // If the reactor is federated or at the top level, then it
-        // may not have a name. In the generator's doGenerate()
-        // method, the name gets set using setMainName().
-        // But this may be called before that, e.g. during
-        // diagram synthesis.  We assign a temporary name here.
-        if (reactor.getName() == null) {
-            if (reactor.isFederated() || reactor.isMain()) {
-                inst.setName("main");
-            } else {
-                inst.setName("");
-            }
-
+      }
+      try {
+        result += Integer.decode(((Literal) expr).getLiteral());
+      } catch (NumberFormatException ex) {
+        return null;
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Given the width specification of port or instantiation and an (optional) list of nested
+   * instantiations, return the width if it can be determined and -1 if not. It will not be able to
+   * be determined if either the width is variable (in which case you should use {@link
+   * #inferPortWidth(VarRef, Connection, List)} ) or the list of instantiations is incomplete or
+   * missing. If there are parameter references in the width, they are evaluated to the extent
+   * possible given the instantiations list.
+   *
+   * <p>The instantiations list is as in {@link #initialValue(Parameter, List)}. If the spec belongs
+   * to an instantiation (for a bank of reactors), then the first element on this list should be the
+   * instantiation that contains this instantiation. If the spec belongs to a port, then the first
+   * element on the list should be the instantiation of the reactor that contains the port.
+   *
+   * @param spec The width specification or null (to return 1).
+   * @param instantiations The (optional) list of instantiations.
+   * @return The width, or -1 if the width could not be determined.
+   * @throws IllegalArgumentException If an instantiation provided is not as given above or if the
+   *     chain of instantiations is not nested.
+   */
+  public static int width(WidthSpec spec, List<Instantiation> instantiations) {
+    if (spec == null) {
+      return 1;
+    }
+    if (spec.isOfVariableLength() && spec.eContainer() instanceof Instantiation) {
+      return inferWidthFromConnections(spec, instantiations);
+    }
+    var result = 0;
+    for (WidthTerm term : spec.getTerms()) {
+      if (term.getParameter() != null) {
+        Integer termWidth = initialValueInt(term.getParameter(), instantiations);
+        if (termWidth != null) {
+          result += termWidth;
         } else {
-            inst.setName(reactor.getName());
+          return -1;
         }
-        return inst;
-    }
-
-    /**
-     * Returns the target declaration in the given model.
-     * Non-null because it would cause a parse error.
-     */
-    public static TargetDecl targetDecl(Model model) {
-        return IteratorExtensions.head(Iterators.filter(model.eAllContents(), TargetDecl.class));
-    }
-
-    /**
-     * Returns the target declaration in the given resource.
-     * Non-null because it would cause a parse error.
-     */
-    public static TargetDecl targetDecl(Resource model) {
-        return IteratorExtensions.head(Iterators.filter(model.getAllContents(), TargetDecl.class));
-    }
-
-    /////////////////////////////////////////////////////////
-    //// Private methods
-
-    /**
-     * Returns the list if it is not null. Otherwise, return an empty list.
-     */
-    public static <T> List<T> convertToEmptyListIfNull(List<T> list) {
-        return list != null ? list : new ArrayList<>();
-    }
-
-    /**
-     * Return all the superclasses of the specified reactor
-     * in deepest-first order. For example, if A extends B and C, and
-     * B and C both extend D, this will return the list [D, B, C, A].
-     * Duplicates are removed. If the specified reactor does not extend
-     * any other reactor, then return an empty list.
-     * If a cycle is found, where X extends Y and Y extends X, or if
-     * a superclass is declared that is not found, then return null.
-     * @param reactor The specified reactor.
-     * @param extensions A set of reactors extending the specified reactor
-     *  (used to detect circular extensions).
-     */
-    private static LinkedHashSet<Reactor> superClasses(Reactor reactor, Set<Reactor> extensions) {
-        LinkedHashSet<Reactor> result = new LinkedHashSet<>();
-        for (ReactorDecl superDecl : convertToEmptyListIfNull(reactor.getSuperClasses())) {
-            Reactor r = toDefinition(superDecl);
-            if (r == reactor || r == null) return null;
-            // If r is in the extensions, then we have a circular inheritance structure.
-            if (extensions.contains(r)) return null;
-            extensions.add(r);
-            LinkedHashSet<Reactor> baseExtends = superClasses(r, extensions);
-            extensions.remove(r);
-            if (baseExtends == null) return null;
-            result.addAll(baseExtends);
-            result.add(r);
+      } else if (term.getWidth() > 0) {
+        result += term.getWidth();
+      } else {
+        // If the width cannot be determined because term's width <= 0, which means the term's width
+        // must be inferred, try to infer the width using connections.
+        if (spec.eContainer() instanceof Instantiation) {
+          try {
+            return inferWidthFromConnections(spec, instantiations);
+          } catch (InvalidSourceException e) {
+            // If the inference fails, return -1.
+            return -1;
+          }
         }
-        return result;
-    }
-
-    /**
-     * Return all the file-level preambles in the files that define the
-     * specified class and its superclasses in deepest-first order.
-     * Duplicates are removed. If there are no file-level preambles,
-     * then return an empty list.
-     * If a cycle is found, where X extends Y and Y extends X, or if
-     * a superclass is declared that is not found, then return null.
-     * @param reactor The specified reactor.
-     * @param extensions A set of reactors extending the specified reactor
-     *  (used to detect circular extensions).
-     */
-    private static LinkedHashSet<Preamble> allFileLevelPreambles(Reactor reactor, Set<Reactor> extensions) {
-        LinkedHashSet<Preamble> result = new LinkedHashSet<>();
-        for (ReactorDecl superDecl : convertToEmptyListIfNull(reactor.getSuperClasses())) {
-            Reactor r = toDefinition(superDecl);
-            if (r == reactor || r == null) return null;
-            // If r is in the extensions, then we have a circular inheritance structure.
-            if (extensions.contains(r)) return null;
-            extensions.add(r);
-            LinkedHashSet<Preamble> basePreambles = allFileLevelPreambles(r, extensions);
-            extensions.remove(r);
-            if (basePreambles == null) return null;
-            result.addAll(basePreambles);
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Infer the width of a port reference in a connection. The port reference one or two parts, a
+   * port and an (optional) container which is an Instantiation that may refer to a bank of
+   * reactors. The width will be the product of the bank width and the port width. The returned
+   * value will be 1 if the port is not in a bank and is not a multiport.
+   *
+   * <p>If the width cannot be determined, this will return -1. The width cannot be determined if
+   * the list of instantiations is missing or incomplete.
+   *
+   * <p>The instantiations list is as in {@link #initialValue(Parameter, List)}. The first element
+   * on this list should be the instantiation that contains the specified connection.
+   *
+   * @param reference A port reference.
+   * @param connection A connection, or null if not in the context of a connection.
+   * @param instantiations The (optional) list of instantiations.
+   * @return The width or -1 if it could not be determined.
+   * @throws IllegalArgumentException If an instantiation provided is not as given above or if the
+   *     chain of instantiations is not nested.
+   */
+  public static int inferPortWidth(
+      VarRef reference, Connection connection, List<Instantiation> instantiations) {
+    if (reference.getVariable() instanceof Port) {
+      // If the port is given as a.b, then we want to prepend a to
+      // the list of instantiations to determine the width of this port.
+      List<Instantiation> extended = instantiations;
+      if (reference.getContainer() != null) {
+        extended = new ArrayList<>();
+        extended.add(reference.getContainer());
+        if (instantiations != null) {
+          extended.addAll(instantiations);
         }
-        result.addAll(((Model) reactor.eContainer()).getPreambles());
-        return result;
-    }
+      }
 
-    /**
-     * We may be able to infer the width by examining the connections of
-     * the enclosing reactor definition. This works, for example, with
-     * delays between multiports or banks of reactors.
-     * Attempt to infer the width from connections and return -1 if the width cannot be inferred.
-     *
-     * @param spec The width specification or null (to return 1).
-     * @param instantiations The (optional) list of instantiations.
-     *
-     * @return The width, or -1 if the width could not be inferred from connections.
-     */
-    private static int inferWidthFromConnections(WidthSpec spec, List<Instantiation> instantiations) {
-        for (Connection c : ((Reactor) spec.eContainer().eContainer()).getConnections()) {
+      int portWidth = width(((Port) reference.getVariable()).getWidthSpec(), extended);
+      if (portWidth < 0) {
+        // Could not determine port width.
+        return -1;
+      }
+
+      // Next determine the bank width. This may be unspecified, in which
+      // case it has to be inferred using the connection.
+      int bankWidth = 1;
+      if (reference.getContainer() != null) {
+        bankWidth = width(reference.getContainer().getWidthSpec(), instantiations);
+        if (bankWidth < 0 && connection != null) {
+          // Try to infer the bank width from the connection.
+          if (reference.getContainer().getWidthSpec().isOfVariableLength()) {
+            // This occurs for a bank of delays.
             int leftWidth = 0;
             int rightWidth = 0;
             int leftOrRight = 0;
-            for (VarRef leftPort : c.getLeftPorts()) {
-                if (leftPort.getContainer() == spec.eContainer()) {
-                    if (leftOrRight != 0) {
-                        throw new InvalidSourceException("Multiple ports with variable width on a connection.");
-                    }
-                    // Indicate that the port is on the left.
-                    leftOrRight = -1;
-                } else {
-                    leftWidth += inferPortWidth(leftPort, c, instantiations);
+            for (VarRef leftPort : connection.getLeftPorts()) {
+              if (leftPort == reference) {
+                if (leftOrRight != 0) {
+                  throw new InvalidSourceException(
+                      "Multiple ports with variable width on a connection.");
+                }
+                // Indicate that this port is on the left.
+                leftOrRight = -1;
+              } else {
+                // The left port is not the same as this reference.
+                int otherWidth = inferPortWidth(leftPort, connection, instantiations);
+                if (otherWidth < 0) {
+                  // Cannot determine width.
+                  return -1;
                 }
+                leftWidth += otherWidth;
+              }
             }
-            for (VarRef rightPort : c.getRightPorts()) {
-                if (rightPort.getContainer() == spec.eContainer()) {
-                    if (leftOrRight != 0) {
-                        throw new InvalidSourceException("Multiple ports with variable width on a connection.");
-                    }
-                    // Indicate that the port is on the right.
-                    leftOrRight = 1;
-                } else {
-                    rightWidth += inferPortWidth(rightPort, c, instantiations);
+            for (VarRef rightPort : connection.getRightPorts()) {
+              if (rightPort == reference) {
+                if (leftOrRight != 0) {
+                  throw new InvalidSourceException(
+                      "Multiple ports with variable width on a connection.");
                 }
+                // Indicate that this port is on the right.
+                leftOrRight = 1;
+              } else {
+                int otherWidth = inferPortWidth(rightPort, connection, instantiations);
+                if (otherWidth < 0) {
+                  // Cannot determine width.
+                  return -1;
+                }
+                rightWidth += otherWidth;
+              }
             }
+            int discrepancy = 0;
             if (leftOrRight < 0) {
-                return rightWidth - leftWidth;
+              // This port is on the left.
+              discrepancy = rightWidth - leftWidth;
             } else if (leftOrRight > 0) {
-                return leftWidth - rightWidth;
+              // This port is on the right.
+              discrepancy = leftWidth - rightWidth;
+            }
+            // Check that portWidth divides the discrepancy.
+            if (discrepancy % portWidth != 0) {
+              // This is an error.
+              return -1;
             }
+            bankWidth = discrepancy / portWidth;
+          } else {
+            // Could not determine the bank width.
+            return -1;
+          }
         }
-        // A connection was not found with the instantiation.
-        return -1;
-    }
-
-    public static void addReactionAttribute(Reaction reaction, String name) {
-        var fedAttr = factory.createAttribute();
-        fedAttr.setAttrName(name);
-        reaction.getAttributes().add(fedAttr);
-    }
+      }
+      return portWidth * bankWidth;
+    }
+    // Argument is not a port.
+    return -1;
+  }
+
+  /**
+   * Given an instantiation of a reactor or bank of reactors, return the width. This will be 1 if
+   * this is not a reactor bank. Otherwise, this will attempt to determine the width. If the width
+   * is declared as a literal constant, it will return that constant. If the width is specified as a
+   * reference to a parameter, this will throw an exception. If the width is variable, this will
+   * find connections in the enclosing reactor and attempt to infer the width. If the width cannot
+   * be determined, it will throw an exception.
+   *
+   * <p>IMPORTANT: This method should not be used you really need to determine the width! It will
+   * not evaluate parameter values.
+   *
+   * @see #width(WidthSpec, List)
+   * @param instantiation A reactor instantiation.
+   * @return The width, if it can be determined.
+   * @deprecated
+   */
+  @Deprecated
+  public static int widthSpecification(Instantiation instantiation) {
+    int result = width(instantiation.getWidthSpec(), null);
+    if (result < 0) {
+      throw new InvalidSourceException(
+          "Cannot determine width for the instance " + instantiation.getName());
+    }
+    return result;
+  }
+
+  /**
+   * Report whether a state variable has been initialized or not.
+   *
+   * @param v The state variable to be checked.
+   * @return True if the variable was initialized, false otherwise.
+   */
+  public static boolean isInitialized(StateVar v) {
+    return v != null && v.getInit() != null;
+  }
+
+  /**
+   * Report whether the given time state variable is initialized using a parameter or not.
+   *
+   * @param s A state variable.
+   * @return True if the argument is initialized using a parameter, false otherwise.
+   */
+  public static boolean isParameterized(StateVar s) {
+    return s.getInit() != null
+        && IterableExtensions.exists(
+            s.getInit().getExprs(), it -> it instanceof ParameterReference);
+  }
+
+  /**
+   * Check if the reactor class uses generics
+   *
+   * @param r the reactor to check
+   * @return true if the reactor uses generics
+   */
+  public static boolean isGeneric(Reactor r) {
+    if (r == null) {
+      return false;
+    }
+    return r.getTypeParms().size() != 0;
+  }
+
+  /**
+   * If the specified reactor declaration is an import, then return the imported reactor class
+   * definition. Otherwise, just return the argument.
+   *
+   * @param r A Reactor or an ImportedReactor.
+   * @return The Reactor class definition or null if no definition is found.
+   */
+  public static Reactor toDefinition(ReactorDecl r) {
+    if (r == null) return null;
+    if (r instanceof Reactor) {
+      return (Reactor) r;
+    } else if (r instanceof ImportedReactor) {
+      return ((ImportedReactor) r).getReactorClass();
+    }
+    return null;
+  }
+
+  /** Return all single-line or multi-line comments immediately preceding the given EObject. */
+  public static Stream<String> getPrecedingComments(
+      ICompositeNode compNode, Predicate<INode> filter) {
+    return getPrecedingCommentNodes(compNode, filter).map(INode::getText);
+  }
+
+  /** Return all single-line or multi-line comments immediately preceding the given EObject. */
+  public static Stream<INode> getPrecedingCommentNodes(
+      ICompositeNode compNode, Predicate<INode> filter) {
+    if (compNode == null) return Stream.of();
+    List<INode> ret = new ArrayList<>();
+    for (INode node : compNode.getAsTreeIterable()) {
+      if (!(node instanceof ICompositeNode)) {
+        if (isComment(node)) {
+          if (filter.test(node)) ret.add(node);
+        } else if (!node.getText().isBlank()) {
+          break;
+        }
+      }
+    }
+    return ret.stream();
+  }
+
+  /** Return whether {@code node} is a comment. */
+  public static boolean isComment(INode node) {
+    return node instanceof HiddenLeafNode hlNode
+        && hlNode.getGrammarElement() instanceof TerminalRule tRule
+        && tRule.getName().endsWith("_COMMENT");
+  }
+
+  /** Return true if the given node starts on the same line as the given other node. */
+  public static Predicate<INode> sameLine(ICompositeNode compNode) {
+    return other -> {
+      for (INode node : compNode.getAsTreeIterable()) {
+        if (!(node instanceof ICompositeNode) && !node.getText().isBlank() && !isComment(node)) {
+          return node.getStartLine() == other.getStartLine();
+        }
+      }
+      return false;
+    };
+  }
+
+  /**
+   * Find the main reactor and set its name if none was defined.
+   *
+   * @param resource The resource to find the main reactor in.
+   */
+  public static void setMainName(Resource resource, String name) {
+    Reactor main =
+        IteratorExtensions.findFirst(
+            Iterators.filter(resource.getAllContents(), Reactor.class),
+            it -> it.isMain() || it.isFederated());
+    if (main != null && StringExtensions.isNullOrEmpty(main.getName())) {
+      main.setName(name);
+    }
+  }
+
+  /**
+   * Create a new instantiation node with the given reactor as its defining class.
+   *
+   * @param reactor The reactor class to create an instantiation of.
+   */
+  public static Instantiation createInstantiation(Reactor reactor) {
+    Instantiation inst = LfFactory.eINSTANCE.createInstantiation();
+    inst.setReactorClass(reactor);
+    // If the reactor is federated or at the top level, then it
+    // may not have a name. In the generator's doGenerate()
+    // method, the name gets set using setMainName().
+    // But this may be called before that, e.g. during
+    // diagram synthesis.  We assign a temporary name here.
+    if (reactor.getName() == null) {
+      if (reactor.isFederated() || reactor.isMain()) {
+        inst.setName("main");
+      } else {
+        inst.setName("");
+      }
+
+    } else {
+      inst.setName(reactor.getName());
+    }
+    return inst;
+  }
+
+  /**
+   * Returns the target declaration in the given model. Non-null because it would cause a parse
+   * error.
+   */
+  public static TargetDecl targetDecl(Model model) {
+    return IteratorExtensions.head(Iterators.filter(model.eAllContents(), TargetDecl.class));
+  }
+
+  /**
+   * Returns the target declaration in the given resource. Non-null because it would cause a parse
+   * error.
+   */
+  public static TargetDecl targetDecl(Resource model) {
+    return IteratorExtensions.head(Iterators.filter(model.getAllContents(), TargetDecl.class));
+  }
+
+  /////////////////////////////////////////////////////////
+  //// Private methods
+
+  /** Returns the list if it is not null. Otherwise, return an empty list. */
+  public static <T> List<T> convertToEmptyListIfNull(List<T> list) {
+    return list != null ? list : new ArrayList<>();
+  }
+
+  /**
+   * Return all the superclasses of the specified reactor in deepest-first order. For example, if A
+   * extends B and C, and B and C both extend D, this will return the list [D, B, C, A]. Duplicates
+   * are removed. If the specified reactor does not extend any other reactor, then return an empty
+   * list. If a cycle is found, where X extends Y and Y extends X, or if a superclass is declared
+   * that is not found, then return null.
+   *
+   * @param reactor The specified reactor.
+   * @param extensions A set of reactors extending the specified reactor (used to detect circular
+   *     extensions).
+   */
+  private static LinkedHashSet<Reactor> superClasses(Reactor reactor, Set<Reactor> extensions) {
+    LinkedHashSet<Reactor> result = new LinkedHashSet<>();
+    for (ReactorDecl superDecl : convertToEmptyListIfNull(reactor.getSuperClasses())) {
+      Reactor r = toDefinition(superDecl);
+      if (r == reactor || r == null) return null;
+      // If r is in the extensions, then we have a circular inheritance structure.
+      if (extensions.contains(r)) return null;
+      extensions.add(r);
+      LinkedHashSet<Reactor> baseExtends = superClasses(r, extensions);
+      extensions.remove(r);
+      if (baseExtends == null) return null;
+      result.addAll(baseExtends);
+      result.add(r);
+    }
+    return result;
+  }
+
+  /**
+   * Return all the file-level preambles in the files that define the specified class and its
+   * superclasses in deepest-first order. Duplicates are removed. If there are no file-level
+   * preambles, then return an empty list. If a cycle is found, where X extends Y and Y extends X,
+   * or if a superclass is declared that is not found, then return null.
+   *
+   * @param reactor The specified reactor.
+   * @param extensions A set of reactors extending the specified reactor (used to detect circular
+   *     extensions).
+   */
+  private static LinkedHashSet<Preamble> allFileLevelPreambles(
+      Reactor reactor, Set<Reactor> extensions) {
+    LinkedHashSet<Preamble> result = new LinkedHashSet<>();
+    for (ReactorDecl superDecl : convertToEmptyListIfNull(reactor.getSuperClasses())) {
+      Reactor r = toDefinition(superDecl);
+      if (r == reactor || r == null) return null;
+      // If r is in the extensions, then we have a circular inheritance structure.
+      if (extensions.contains(r)) return null;
+      extensions.add(r);
+      LinkedHashSet<Preamble> basePreambles = allFileLevelPreambles(r, extensions);
+      extensions.remove(r);
+      if (basePreambles == null) return null;
+      result.addAll(basePreambles);
+    }
+    result.addAll(((Model) reactor.eContainer()).getPreambles());
+    return result;
+  }
+
+  /**
+   * We may be able to infer the width by examining the connections of the enclosing reactor
+   * definition. This works, for example, with delays between multiports or banks of reactors.
+   * Attempt to infer the width from connections and return -1 if the width cannot be inferred.
+   *
+   * @param spec The width specification or null (to return 1).
+   * @param instantiations The (optional) list of instantiations.
+   * @return The width, or -1 if the width could not be inferred from connections.
+   */
+  private static int inferWidthFromConnections(WidthSpec spec, List<Instantiation> instantiations) {
+    for (Connection c : ((Reactor) spec.eContainer().eContainer()).getConnections()) {
+      int leftWidth = 0;
+      int rightWidth = 0;
+      int leftOrRight = 0;
+      for (VarRef leftPort : c.getLeftPorts()) {
+        if (leftPort.getContainer() == spec.eContainer()) {
+          if (leftOrRight != 0) {
+            throw new InvalidSourceException("Multiple ports with variable width on a connection.");
+          }
+          // Indicate that the port is on the left.
+          leftOrRight = -1;
+        } else {
+          leftWidth += inferPortWidth(leftPort, c, instantiations);
+        }
+      }
+      for (VarRef rightPort : c.getRightPorts()) {
+        if (rightPort.getContainer() == spec.eContainer()) {
+          if (leftOrRight != 0) {
+            throw new InvalidSourceException("Multiple ports with variable width on a connection.");
+          }
+          // Indicate that the port is on the right.
+          leftOrRight = 1;
+        } else {
+          rightWidth += inferPortWidth(rightPort, c, instantiations);
+        }
+      }
+      if (leftOrRight < 0) {
+        return rightWidth - leftWidth;
+      } else if (leftOrRight > 0) {
+        return leftWidth - rightWidth;
+      }
+    }
+    // A connection was not found with the instantiation.
+    return -1;
+  }
+
+  public static void addReactionAttribute(Reaction reaction, String name) {
+    var fedAttr = factory.createAttribute();
+    fedAttr.setAttrName(name);
+    reaction.getAttributes().add(fedAttr);
+  }
 }
diff --git a/org.lflang/src/org/lflang/ast/AstTransformation.java b/org.lflang/src/org/lflang/ast/AstTransformation.java
index 80a93da4b9..cf5c5843ff 100644
--- a/org.lflang/src/org/lflang/ast/AstTransformation.java
+++ b/org.lflang/src/org/lflang/ast/AstTransformation.java
@@ -1,16 +1,11 @@
 package org.lflang.ast;
 
 import java.util.List;
-
 import org.lflang.lf.Reactor;
 
-/**
- * Interface for AST Transfomations
- */
+/** Interface for AST Transfomations */
 public interface AstTransformation {
 
-    /**
-     * Apply the AST transformation to all given reactors.
-     */
-    void applyTransformation(List<Reactor> reactors);
+  /** Apply the AST transformation to all given reactors. */
+  void applyTransformation(List<Reactor> reactors);
 }
diff --git a/org.lflang/src/org/lflang/ast/DelayedConnectionTransformation.java b/org.lflang/src/org/lflang/ast/DelayedConnectionTransformation.java
index 953b9bdfdb..882019ac44 100644
--- a/org.lflang/src/org/lflang/ast/DelayedConnectionTransformation.java
+++ b/org.lflang/src/org/lflang/ast/DelayedConnectionTransformation.java
@@ -6,13 +6,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-
 import org.lflang.InferredType;
 import org.lflang.generator.DelayBodyGenerator;
 import org.lflang.generator.TargetTypes;
@@ -40,365 +38,371 @@
 import org.lflang.lf.WidthTerm;
 
 /**
- This class implements AST transformations for delayed connections.
- There are two types of delayed connections:
- 1) Connections with {@code after}-delays
- 2) Physical connections
+ * This class implements AST transformations for delayed connections. There are two types of delayed
+ * connections: 1) Connections with {@code after}-delays 2) Physical connections
  */
 public class DelayedConnectionTransformation implements AstTransformation {
 
-    /**
-     * The Lingua Franca factory for creating new AST nodes.
-     */
-    public static final LfFactory factory = ASTUtils.factory;
-
-    /**
-     * A code generator used to insert reaction bodies for the generated delay reactors.
-     */
-    private final DelayBodyGenerator generator;
-
-    /**
-     * A target type instance that is used during the transformation to manage target specific types
-     */
-    private final TargetTypes targetTypes;
-
-    /**
-     * The Eclipse eCore view of the main LF file.
-     */
-    private final Resource mainResource;
-
-    private boolean transformAfterDelays = false;
-    private boolean transformPhysicalConnection = false;
-    /**
-     * Collection of generated delay classes.
-     */
-    private final LinkedHashSet<Reactor> delayClasses = new LinkedHashSet<>();
-
-    public DelayedConnectionTransformation(DelayBodyGenerator generator, TargetTypes targetTypes, Resource mainResource, boolean transformAfterDelays, boolean transformPhysicalConnections) {
-        this.generator = generator;
-        this.targetTypes = targetTypes;
-        this.mainResource = mainResource;
-        this.transformAfterDelays = transformAfterDelays;
-        this.transformPhysicalConnection = transformPhysicalConnections;
-    }
-
-    /**
-     * Transform all after delay connections by inserting generated delay reactors.
-     */
-    @Override
-    public void applyTransformation(List<Reactor> reactors) {
-        insertGeneratedDelays(reactors);
-    }
-
-    /**
-     * Find connections in the given resource that have a delay associated with them,
-     * and reroute them via a generated delay reactor.
-     * @param reactors A list of reactors to apply the transformation to.
-     */
-    private void insertGeneratedDelays(List<Reactor> reactors) {
-        // The resulting changes to the AST are performed _after_ iterating
-        // in order to avoid concurrent modification problems.
-        List<Connection> oldConnections = new ArrayList<>();
-        Map<EObject, List<Connection>> newConnections = new LinkedHashMap<>();
-        Map<EObject, List<Instantiation>> delayInstances = new LinkedHashMap<>();
-
-        // Iterate over the connections in the tree.
-        for (Reactor container : reactors) {
-            for (Connection connection : ASTUtils.allConnections(container)) {
-                if ( transformAfterDelays && connection.getDelay() != null ||
-                    transformPhysicalConnection && connection.isPhysical()) {
-                    EObject parent = connection.eContainer();
-                    // Assume all the types are the same, so just use the first on the right.
-                    Type type = ((Port) connection.getRightPorts().get(0).getVariable()).getType();
-                    Reactor delayClass = getDelayClass(type, connection.isPhysical());
-                    String generic = targetTypes.supportsGenerics()
-                        ? targetTypes.getTargetType(type) : null;
-
-                    Instantiation delayInstance = getDelayInstance(delayClass, connection, generic,
-                        !generator.generateAfterDelaysWithVariableWidth(), connection.isPhysical());
-
-                    // Stage the new connections for insertion into the tree.
-                    List<Connection> connections = ASTUtils.convertToEmptyListIfNull(newConnections.get(parent));
-                    connections.addAll(rerouteViaDelay(connection, delayInstance));
-                    newConnections.put(parent, connections);
-                    // Stage the original connection for deletion from the tree.
-                    oldConnections.add(connection);
-
-                    // Stage the newly created delay reactor instance for insertion
-                    List<Instantiation> instances = ASTUtils.convertToEmptyListIfNull(delayInstances.get(parent));
-                    instances.add(delayInstance);
-                    delayInstances.put(parent, instances);
-                }
-            }
+  /** The Lingua Franca factory for creating new AST nodes. */
+  public static final LfFactory factory = ASTUtils.factory;
+
+  /** A code generator used to insert reaction bodies for the generated delay reactors. */
+  private final DelayBodyGenerator generator;
+
+  /**
+   * A target type instance that is used during the transformation to manage target specific types
+   */
+  private final TargetTypes targetTypes;
+
+  /** The Eclipse eCore view of the main LF file. */
+  private final Resource mainResource;
+
+  private boolean transformAfterDelays = false;
+  private boolean transformPhysicalConnection = false;
+  /** Collection of generated delay classes. */
+  private final LinkedHashSet<Reactor> delayClasses = new LinkedHashSet<>();
+
+  public DelayedConnectionTransformation(
+      DelayBodyGenerator generator,
+      TargetTypes targetTypes,
+      Resource mainResource,
+      boolean transformAfterDelays,
+      boolean transformPhysicalConnections) {
+    this.generator = generator;
+    this.targetTypes = targetTypes;
+    this.mainResource = mainResource;
+    this.transformAfterDelays = transformAfterDelays;
+    this.transformPhysicalConnection = transformPhysicalConnections;
+  }
+
+  /** Transform all after delay connections by inserting generated delay reactors. */
+  @Override
+  public void applyTransformation(List<Reactor> reactors) {
+    insertGeneratedDelays(reactors);
+  }
+
+  /**
+   * Find connections in the given resource that have a delay associated with them, and reroute them
+   * via a generated delay reactor.
+   *
+   * @param reactors A list of reactors to apply the transformation to.
+   */
+  private void insertGeneratedDelays(List<Reactor> reactors) {
+    // The resulting changes to the AST are performed _after_ iterating
+    // in order to avoid concurrent modification problems.
+    List<Connection> oldConnections = new ArrayList<>();
+    Map<EObject, List<Connection>> newConnections = new LinkedHashMap<>();
+    Map<EObject, List<Instantiation>> delayInstances = new LinkedHashMap<>();
+
+    // Iterate over the connections in the tree.
+    for (Reactor container : reactors) {
+      for (Connection connection : ASTUtils.allConnections(container)) {
+        if (transformAfterDelays && connection.getDelay() != null
+            || transformPhysicalConnection && connection.isPhysical()) {
+          EObject parent = connection.eContainer();
+          // Assume all the types are the same, so just use the first on the right.
+          Type type = ((Port) connection.getRightPorts().get(0).getVariable()).getType();
+          Reactor delayClass = getDelayClass(type, connection.isPhysical());
+          String generic = targetTypes.supportsGenerics() ? targetTypes.getTargetType(type) : null;
+
+          Instantiation delayInstance =
+              getDelayInstance(
+                  delayClass,
+                  connection,
+                  generic,
+                  !generator.generateAfterDelaysWithVariableWidth(),
+                  connection.isPhysical());
+
+          // Stage the new connections for insertion into the tree.
+          List<Connection> connections =
+              ASTUtils.convertToEmptyListIfNull(newConnections.get(parent));
+          connections.addAll(rerouteViaDelay(connection, delayInstance));
+          newConnections.put(parent, connections);
+          // Stage the original connection for deletion from the tree.
+          oldConnections.add(connection);
+
+          // Stage the newly created delay reactor instance for insertion
+          List<Instantiation> instances =
+              ASTUtils.convertToEmptyListIfNull(delayInstances.get(parent));
+          instances.add(delayInstance);
+          delayInstances.put(parent, instances);
         }
+      }
+    }
 
-        // Remove old connections; insert new ones.
-        oldConnections.forEach(connection -> {
-            var container = connection.eContainer();
-            if (container instanceof Reactor) {
-                ((Reactor) container).getConnections().remove(connection);
-            } else if (container instanceof Mode) {
-                ((Mode) container).getConnections().remove(connection);
-            }
+    // Remove old connections; insert new ones.
+    oldConnections.forEach(
+        connection -> {
+          var container = connection.eContainer();
+          if (container instanceof Reactor) {
+            ((Reactor) container).getConnections().remove(connection);
+          } else if (container instanceof Mode) {
+            ((Mode) container).getConnections().remove(connection);
+          }
         });
-        newConnections.forEach((container, connections) -> {
-            if (container instanceof Reactor) {
-                ((Reactor) container).getConnections().addAll(connections);
-            } else if (container instanceof Mode) {
-                ((Mode) container).getConnections().addAll(connections);
-            }
+    newConnections.forEach(
+        (container, connections) -> {
+          if (container instanceof Reactor) {
+            ((Reactor) container).getConnections().addAll(connections);
+          } else if (container instanceof Mode) {
+            ((Mode) container).getConnections().addAll(connections);
+          }
         });
-        // Finally, insert the instances and, before doing so, assign them a unique name.
-        delayInstances.forEach((container, instantiations) ->
-            instantiations.forEach(instantiation -> {
-                if (container instanceof Reactor) {
-                    instantiation.setName(ASTUtils.getUniqueIdentifier((Reactor) container, "delay"));
+    // Finally, insert the instances and, before doing so, assign them a unique name.
+    delayInstances.forEach(
+        (container, instantiations) ->
+            instantiations.forEach(
+                instantiation -> {
+                  if (container instanceof Reactor) {
+                    instantiation.setName(
+                        ASTUtils.getUniqueIdentifier((Reactor) container, "delay"));
                     ((Reactor) container).getInstantiations().add(instantiation);
-                } else if (container instanceof Mode) {
-                    instantiation.setName(ASTUtils.getUniqueIdentifier((Reactor) container.eContainer(), "delay"));
+                  } else if (container instanceof Mode) {
+                    instantiation.setName(
+                        ASTUtils.getUniqueIdentifier((Reactor) container.eContainer(), "delay"));
                     ((Mode) container).getInstantiations().add(instantiation);
-                }
-            })
-        );
-    }
-
-    /**
-     * Take a connection and reroute it via an instance of a generated delay
-     * reactor. This method returns a list to new connections to substitute
-     * the original one.
-     * @param connection The connection to reroute.
-     * @param delayInstance The delay instance to route the connection through.
-     */
-    private static List<Connection> rerouteViaDelay(Connection connection,
-        Instantiation delayInstance) {
-        List<Connection> connections = new ArrayList<>();
-        Connection upstream = factory.createConnection();
-        Connection downstream = factory.createConnection();
-        VarRef input = factory.createVarRef();
-        VarRef output = factory.createVarRef();
-
-        Reactor delayClass = ASTUtils.toDefinition(delayInstance.getReactorClass());
-
-        // Establish references to the involved ports.
-        input.setContainer(delayInstance);
-        input.setVariable(delayClass.getInputs().get(0));
-        output.setContainer(delayInstance);
-        output.setVariable(delayClass.getOutputs().get(0));
-        upstream.getLeftPorts().addAll(connection.getLeftPorts());
-        upstream.getRightPorts().add(input);
-        downstream.getLeftPorts().add(output);
-        downstream.getRightPorts().addAll(connection.getRightPorts());
-        downstream.setIterated(connection.isIterated());
-        connections.add(upstream);
-        connections.add(downstream);
-        return connections;
+                  }
+                }));
+  }
+
+  /**
+   * Take a connection and reroute it via an instance of a generated delay reactor. This method
+   * returns a list to new connections to substitute the original one.
+   *
+   * @param connection The connection to reroute.
+   * @param delayInstance The delay instance to route the connection through.
+   */
+  private static List<Connection> rerouteViaDelay(
+      Connection connection, Instantiation delayInstance) {
+    List<Connection> connections = new ArrayList<>();
+    Connection upstream = factory.createConnection();
+    Connection downstream = factory.createConnection();
+    VarRef input = factory.createVarRef();
+    VarRef output = factory.createVarRef();
+
+    Reactor delayClass = ASTUtils.toDefinition(delayInstance.getReactorClass());
+
+    // Establish references to the involved ports.
+    input.setContainer(delayInstance);
+    input.setVariable(delayClass.getInputs().get(0));
+    output.setContainer(delayInstance);
+    output.setVariable(delayClass.getOutputs().get(0));
+    upstream.getLeftPorts().addAll(connection.getLeftPorts());
+    upstream.getRightPorts().add(input);
+    downstream.getLeftPorts().add(output);
+    downstream.getRightPorts().addAll(connection.getRightPorts());
+    downstream.setIterated(connection.isIterated());
+    connections.add(upstream);
+    connections.add(downstream);
+    return connections;
+  }
+
+  /**
+   * Create a new instance delay instances using the given reactor class. The supplied time value is
+   * used to override the default interval (which is zero). If the target supports parametric
+   * polymorphism, then a single class may be used for each instantiation, in which case a non-empty
+   * string must be supplied to parameterize the instance. A default name ("delay") is assigned to
+   * the instantiation, but this name must be overridden at the call site, where checks can be done
+   * to avoid name collisions in the container in which the instantiation is to be placed. Such
+   * checks (or modifications of the AST) are not performed in this method in order to avoid causing
+   * concurrent modification exceptions.
+   *
+   * @param delayClass The class to create an instantiation for
+   * @param connection The connection to create a delay instantiation foe
+   * @param genericArg A string that denotes the appropriate type parameter, which should be null or
+   *     empty if the target does not support generics.
+   * @param defineWidthFromConnection If this is true and if the connection is a wide connection,
+   *     then instantiate a bank of delays where the width is given by ports involved in the
+   *     connection. Otherwise, the width will be unspecified indicating a variable length.
+   * @param isPhysical Is this a delay instance using a physical action. These are used for
+   *     implementing Physical Connections. If true we will accept zero delay on the connection.
+   */
+  private static Instantiation getDelayInstance(
+      Reactor delayClass,
+      Connection connection,
+      String genericArg,
+      Boolean defineWidthFromConnection,
+      Boolean isPhysical) {
+    Instantiation delayInstance = factory.createInstantiation();
+    delayInstance.setReactorClass(delayClass);
+    if (genericArg != null) {
+      Code code = factory.createCode();
+      code.setBody(genericArg);
+      Type type = factory.createType();
+      type.setCode(code);
+      delayInstance.getTypeArgs().add(type);
     }
-
-    /**
-     * Create a new instance delay instances using the given reactor class.
-     * The supplied time value is used to override the default interval (which
-     * is zero).
-     * If the target supports parametric polymorphism, then a single class may
-     * be used for each instantiation, in which case a non-empty string must
-     * be supplied to parameterize the instance.
-     * A default name ("delay") is assigned to the instantiation, but this
-     * name must be overridden at the call site, where checks can be done to
-     * avoid name collisions in the container in which the instantiation is
-     * to be placed. Such checks (or modifications of the AST) are not
-     * performed in this method in order to avoid causing concurrent
-     * modification exceptions.
-     * @param delayClass The class to create an instantiation for
-     * @param connection The connection to create a delay instantiation foe
-     * @param genericArg A string that denotes the appropriate type parameter,
-     *  which should be null or empty if the target does not support generics.
-     * @param defineWidthFromConnection If this is true and if the connection
-     *  is a wide connection, then instantiate a bank of delays where the width
-     *  is given by ports involved in the connection. Otherwise, the width will
-     *  be  unspecified indicating a variable length.
-     *  @param isPhysical Is this a delay instance using a physical action.
-     *   These are used for implementing Physical Connections. If true
-     *   we will accept zero delay on the connection.
-     */
-    private static Instantiation getDelayInstance(Reactor delayClass,
-        Connection connection, String genericArg, Boolean defineWidthFromConnection, Boolean isPhysical) {
-        Instantiation delayInstance = factory.createInstantiation();
-        delayInstance.setReactorClass(delayClass);
-        if (genericArg != null) {
-            Code code = factory.createCode();
-            code.setBody(genericArg);
-            Type type = factory.createType();
-            type.setCode(code);
-            delayInstance.getTypeArgs().add(type);
-        }
-        if (ASTUtils.hasMultipleConnections(connection)) {
-            WidthSpec widthSpec = factory.createWidthSpec();
-            if (defineWidthFromConnection) {
-                // Add all left ports of the connection to the WidthSpec of the generated delay instance.
-                // This allows the code generator to later infer the width from the involved ports.
-                // We only consider the left ports here, as they could be part of a broadcast. In this case, we want
-                // to delay the ports first, and then broadcast the output of the delays.
-                for (VarRef port : connection.getLeftPorts()) {
-                    WidthTerm term = factory.createWidthTerm();
-                    term.setPort(EcoreUtil.copy(port));
-                    widthSpec.getTerms().add(term);
-                }
-            } else {
-                widthSpec.setOfVariableLength(true);
-            }
-            delayInstance.setWidthSpec(widthSpec);
-        }
-        // Allow physical connections with no after delay
-        //  they will use the default min_delay of 0.
-        if (!isPhysical || connection.getDelay() != null) {
-            Assignment assignment = factory.createAssignment();
-            assignment.setLhs(delayClass.getParameters().get(0));
-            Initializer init = factory.createInitializer();
-            init.getExprs().add(Objects.requireNonNull(connection.getDelay(), "null delay"));
-            assignment.setRhs(init);
-            delayInstance.getParameters().add(assignment);
+    if (ASTUtils.hasMultipleConnections(connection)) {
+      WidthSpec widthSpec = factory.createWidthSpec();
+      if (defineWidthFromConnection) {
+        // Add all left ports of the connection to the WidthSpec of the generated delay instance.
+        // This allows the code generator to later infer the width from the involved ports.
+        // We only consider the left ports here, as they could be part of a broadcast. In this case,
+        // we want
+        // to delay the ports first, and then broadcast the output of the delays.
+        for (VarRef port : connection.getLeftPorts()) {
+          WidthTerm term = factory.createWidthTerm();
+          term.setPort(EcoreUtil.copy(port));
+          widthSpec.getTerms().add(term);
         }
-
-        delayInstance.setName("delay");  // This has to be overridden.
-        return delayInstance;
+      } else {
+        widthSpec.setOfVariableLength(true);
+      }
+      delayInstance.setWidthSpec(widthSpec);
+    }
+    // Allow physical connections with no after delay
+    //  they will use the default min_delay of 0.
+    if (!isPhysical || connection.getDelay() != null) {
+      Assignment assignment = factory.createAssignment();
+      assignment.setLhs(delayClass.getParameters().get(0));
+      Initializer init = factory.createInitializer();
+      init.getExprs().add(Objects.requireNonNull(connection.getDelay(), "null delay"));
+      assignment.setRhs(init);
+      delayInstance.getParameters().add(assignment);
     }
 
-    /**
-     * Return a synthesized AST node that represents the definition of a delay
-     * reactor. Depending on whether the target supports generics, either this
-     * method will synthesize a generic definition and keep returning it upon
-     * subsequent calls, or otherwise, it will synthesize a new definition for
-     * each new type it hasn't yet created a compatible delay reactor for.
-     * @param type The type the delay class must be compatible with.
-     * @param isPhysical Is this delay reactor using a physical action.
-     */
-    private Reactor getDelayClass(Type type, boolean isPhysical) {
-        String className;
-        if (targetTypes.supportsGenerics()) {
-            className = DelayBodyGenerator.GEN_DELAY_CLASS_NAME;
-        } else {
-            String id = Integer.toHexString(InferredType.fromAST(type).toText().hashCode());
-            className = String.format("%s_%s", DelayBodyGenerator.GEN_DELAY_CLASS_NAME, id);
-        }
-
-        // Only add class definition if it is not already there.
-        Reactor classDef = findDelayClass(className);
-        if (classDef != null) {
-            return classDef;
-        }
-
-        Reactor delayClass = factory.createReactor();
-        Parameter delayParameter = factory.createParameter();
-        Action action = factory.createAction();
-        VarRef triggerRef = factory.createVarRef();
-        VarRef effectRef = factory.createVarRef();
-        Input input = factory.createInput();
-        Output output = factory.createOutput();
-        VarRef inRef = factory.createVarRef();
-        VarRef outRef = factory.createVarRef();
-
-        Reaction r1 = factory.createReaction();
-        Reaction r2 = factory.createReaction();
-
-        delayParameter.setName("delay");
-        delayParameter.setType(factory.createType());
-        delayParameter.getType().setId("time");
-        delayParameter.getType().setTime(true);
-        Time defaultTime = factory.createTime();
-        defaultTime.setUnit(null);
-        defaultTime.setInterval(0);
-        Initializer init = factory.createInitializer();
-        init.setParens(true);
-        init.setBraces(false);
-        init.getExprs().add(defaultTime);
-        delayParameter.setInit(init);
-
-        // Name the newly created action; set its delay and type.
-        action.setName("act");
-        var paramRef = factory.createParameterReference();
-        paramRef.setParameter(delayParameter);
-        action.setMinDelay(paramRef);
-        if (isPhysical) {
-            action.setOrigin(ActionOrigin.PHYSICAL);
-        } else {
-            action.setOrigin(ActionOrigin.LOGICAL);
-        }
+    delayInstance.setName("delay"); // This has to be overridden.
+    return delayInstance;
+  }
+
+  /**
+   * Return a synthesized AST node that represents the definition of a delay reactor. Depending on
+   * whether the target supports generics, either this method will synthesize a generic definition
+   * and keep returning it upon subsequent calls, or otherwise, it will synthesize a new definition
+   * for each new type it hasn't yet created a compatible delay reactor for.
+   *
+   * @param type The type the delay class must be compatible with.
+   * @param isPhysical Is this delay reactor using a physical action.
+   */
+  private Reactor getDelayClass(Type type, boolean isPhysical) {
+    String className;
+    if (targetTypes.supportsGenerics()) {
+      className = DelayBodyGenerator.GEN_DELAY_CLASS_NAME;
+    } else {
+      String id = Integer.toHexString(InferredType.fromAST(type).toText().hashCode());
+      className = String.format("%s_%s", DelayBodyGenerator.GEN_DELAY_CLASS_NAME, id);
+    }
 
-        if (targetTypes.supportsGenerics()) {
-            action.setType(factory.createType());
-            action.getType().setId("T");
-        } else {
-            action.setType(EcoreUtil.copy(type));
-        }
+    // Only add class definition if it is not already there.
+    Reactor classDef = findDelayClass(className);
+    if (classDef != null) {
+      return classDef;
+    }
 
-        input.setName("inp");
-        input.setType(EcoreUtil.copy(action.getType()));
-
-        output.setName("out");
-        output.setType(EcoreUtil.copy(action.getType()));
-
-        // Establish references to the involved ports.
-        inRef.setVariable(input);
-        outRef.setVariable(output);
-
-        // Establish references to the action.
-        triggerRef.setVariable(action);
-        effectRef.setVariable(action);
-
-        // Add the action to the reactor.
-        delayClass.setName(className);
-        delayClass.getActions().add(action);
-
-        // Configure the second reaction, which reads the input.
-        r1.getTriggers().add(inRef);
-        r1.getEffects().add(effectRef);
-        r1.setCode(factory.createCode());
-        r1.getCode().setBody(generator.generateDelayBody(action, inRef));
-
-        // Configure the first reaction, which produces the output.
-        r2.getTriggers().add(triggerRef);
-        r2.getEffects().add(outRef);
-        r2.setCode(factory.createCode());
-        r2.getCode().setBody(generator.generateForwardBody(action, outRef));
-
-        generator.finalizeReactions(r1, r2);
-
-        // Add the reactions to the newly created reactor class.
-        // These need to go in the opposite order in case
-        // a new input arrives at the same time the delayed
-        // output is delivered!
-        delayClass.getReactions().add(r2);
-        delayClass.getReactions().add(r1);
-
-        // Add a type parameter if the target supports it.
-        if (targetTypes.supportsGenerics()) {
-            TypeParm parm = factory.createTypeParm();
-            parm.setLiteral(generator.generateDelayGeneric());
-            delayClass.getTypeParms().add(parm);
-        }
-        delayClass.getInputs().add(input);
-        delayClass.getOutputs().add(output);
-        delayClass.getParameters().add(delayParameter);
-        addDelayClass(delayClass);
-        return delayClass;
+    Reactor delayClass = factory.createReactor();
+    Parameter delayParameter = factory.createParameter();
+    Action action = factory.createAction();
+    VarRef triggerRef = factory.createVarRef();
+    VarRef effectRef = factory.createVarRef();
+    Input input = factory.createInput();
+    Output output = factory.createOutput();
+    VarRef inRef = factory.createVarRef();
+    VarRef outRef = factory.createVarRef();
+
+    Reaction r1 = factory.createReaction();
+    Reaction r2 = factory.createReaction();
+
+    delayParameter.setName("delay");
+    delayParameter.setType(factory.createType());
+    delayParameter.getType().setId("time");
+    delayParameter.getType().setTime(true);
+    Time defaultTime = factory.createTime();
+    defaultTime.setUnit(null);
+    defaultTime.setInterval(0);
+    Initializer init = factory.createInitializer();
+    init.setParens(true);
+    init.setBraces(false);
+    init.getExprs().add(defaultTime);
+    delayParameter.setInit(init);
+
+    // Name the newly created action; set its delay and type.
+    action.setName("act");
+    var paramRef = factory.createParameterReference();
+    paramRef.setParameter(delayParameter);
+    action.setMinDelay(paramRef);
+    if (isPhysical) {
+      action.setOrigin(ActionOrigin.PHYSICAL);
+    } else {
+      action.setOrigin(ActionOrigin.LOGICAL);
     }
 
-    /**
-     * Store the given reactor in the collection of generated delay classes
-     * and insert it in the AST under the top-level reactor's node.
-     */
-    private void addDelayClass(Reactor generatedDelay) {
-        // Record this class, so it can be reused.
-        delayClasses.add(generatedDelay);
-        // And hook it into the AST.
-        EObject node = IteratorExtensions.findFirst(mainResource.getAllContents(), Model.class::isInstance);
-        ((Model) node).getReactors().add(generatedDelay);
+    if (targetTypes.supportsGenerics()) {
+      action.setType(factory.createType());
+      action.getType().setId("T");
+    } else {
+      action.setType(EcoreUtil.copy(type));
     }
 
-    /**
-     * Return the generated delay reactor that corresponds to the given class
-     * name if it had been created already, {@code null} otherwise.
-     */
-    private Reactor findDelayClass(String className) {
-        return IterableExtensions.findFirst(delayClasses, it -> it.getName().equals(className));
+    input.setName("inp");
+    input.setType(EcoreUtil.copy(action.getType()));
+
+    output.setName("out");
+    output.setType(EcoreUtil.copy(action.getType()));
+
+    // Establish references to the involved ports.
+    inRef.setVariable(input);
+    outRef.setVariable(output);
+
+    // Establish references to the action.
+    triggerRef.setVariable(action);
+    effectRef.setVariable(action);
+
+    // Add the action to the reactor.
+    delayClass.setName(className);
+    delayClass.getActions().add(action);
+
+    // Configure the second reaction, which reads the input.
+    r1.getTriggers().add(inRef);
+    r1.getEffects().add(effectRef);
+    r1.setCode(factory.createCode());
+    r1.getCode().setBody(generator.generateDelayBody(action, inRef));
+
+    // Configure the first reaction, which produces the output.
+    r2.getTriggers().add(triggerRef);
+    r2.getEffects().add(outRef);
+    r2.setCode(factory.createCode());
+    r2.getCode().setBody(generator.generateForwardBody(action, outRef));
+
+    generator.finalizeReactions(r1, r2);
+
+    // Add the reactions to the newly created reactor class.
+    // These need to go in the opposite order in case
+    // a new input arrives at the same time the delayed
+    // output is delivered!
+    delayClass.getReactions().add(r2);
+    delayClass.getReactions().add(r1);
+
+    // Add a type parameter if the target supports it.
+    if (targetTypes.supportsGenerics()) {
+      TypeParm parm = factory.createTypeParm();
+      parm.setLiteral(generator.generateDelayGeneric());
+      delayClass.getTypeParms().add(parm);
     }
+    delayClass.getInputs().add(input);
+    delayClass.getOutputs().add(output);
+    delayClass.getParameters().add(delayParameter);
+    addDelayClass(delayClass);
+    return delayClass;
+  }
+
+  /**
+   * Store the given reactor in the collection of generated delay classes and insert it in the AST
+   * under the top-level reactor's node.
+   */
+  private void addDelayClass(Reactor generatedDelay) {
+    // Record this class, so it can be reused.
+    delayClasses.add(generatedDelay);
+    // And hook it into the AST.
+    EObject node =
+        IteratorExtensions.findFirst(mainResource.getAllContents(), Model.class::isInstance);
+    ((Model) node).getReactors().add(generatedDelay);
+  }
+
+  /**
+   * Return the generated delay reactor that corresponds to the given class name if it had been
+   * created already, {@code null} otherwise.
+   */
+  private Reactor findDelayClass(String className) {
+    return IterableExtensions.findFirst(delayClasses, it -> it.getName().equals(className));
+  }
 }
diff --git a/org.lflang/src/org/lflang/ast/FormattingUtils.java b/org.lflang/src/org/lflang/ast/FormattingUtils.java
index 860e3d6bb2..9b47440391 100644
--- a/org.lflang/src/org/lflang/ast/FormattingUtils.java
+++ b/org.lflang/src/org/lflang/ast/FormattingUtils.java
@@ -8,264 +8,241 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.lflang.Target;
 import org.lflang.lf.Model;
 
 /**
  * Utility functions that determine the specific behavior of the LF formatter.
+ *
  * @author Peter Donovan
  * @author Billy Bao
  */
 public class FormattingUtils {
-    /**
-     * The minimum number of columns that should be allotted to a comment.
-     * This is relevant in case of high indentation/small wrapLength.
-     */
-    private static final int MINIMUM_COMMENT_WIDTH_IN_COLUMNS = 15;
+  /**
+   * The minimum number of columns that should be allotted to a comment. This is relevant in case of
+   * high indentation/small wrapLength.
+   */
+  private static final int MINIMUM_COMMENT_WIDTH_IN_COLUMNS = 15;
 
-    /** Match a multiline comment. */
-    private static final Pattern MULTILINE_COMMENT = Pattern.compile(
-        "\\s*/\\*\\v?(\\V*\\v+)*\\V*"
-    );
+  /** Match a multiline comment. */
+  private static final Pattern MULTILINE_COMMENT = Pattern.compile("\\s*/\\*\\v?(\\V*\\v+)*\\V*");
 
-    /** The number of spaces to prepend to a line per indentation level. */
-    private static final int INDENTATION = 4;
+  /** The number of spaces to prepend to a line per indentation level. */
+  private static final int INDENTATION = 4;
 
-    public static final int DEFAULT_LINE_LENGTH = 80;
+  public static final int DEFAULT_LINE_LENGTH = 80;
 
-    static final int MAX_WHITESPACE_USED_FOR_ALIGNMENT = 20;
+  static final int MAX_WHITESPACE_USED_FOR_ALIGNMENT = 20;
 
-    static final long BADNESS_PER_CHARACTER_VIOLATING_LINE_LENGTH = 20;
+  static final long BADNESS_PER_CHARACTER_VIOLATING_LINE_LENGTH = 20;
 
-    static final long BADNESS_PER_LEVEL_OF_COMMENT_DISPLACEMENT = 1000;
+  static final long BADNESS_PER_LEVEL_OF_COMMENT_DISPLACEMENT = 1000;
 
-    static final long BADNESS_PER_NEWLINE = 1;
+  static final long BADNESS_PER_NEWLINE = 1;
 
-    /**
-     * Return a String representation of {@code object}, with lines wrapped at
-     * {@code lineLength}.
-     */
-    public static String render(EObject object, int lineLength) {
-        return render(object, lineLength, inferTarget(object), false);
-    }
+  /** Return a String representation of {@code object}, with lines wrapped at {@code lineLength}. */
+  public static String render(EObject object, int lineLength) {
+    return render(object, lineLength, inferTarget(object), false);
+  }
 
-    /** Return a function that renders AST nodes for the given target. */
-    public static Function<EObject, String> renderer(Target target) {
-        return object -> render(object, DEFAULT_LINE_LENGTH, target, true);
-    }
+  /** Return a function that renders AST nodes for the given target. */
+  public static Function<EObject, String> renderer(Target target) {
+    return object -> render(object, DEFAULT_LINE_LENGTH, target, true);
+  }
 
-    /**
-     * Return a String representation of {@code object}, with lines wrapped at
-     * {@code lineLength}, with the assumption that the target language is
-     * {@code target}.
-     */
-    public static String render(EObject object, int lineLength, Target target, boolean codeMapTags) {
-        MalleableString ms = ToLf.instance.doSwitch(object);
-        String singleLineCommentPrefix = target.getSingleLineCommentPrefix();
-        ms.findBestRepresentation(
-            () -> ms.render(INDENTATION, singleLineCommentPrefix, codeMapTags, null),
-            r -> r.levelsOfCommentDisplacement() * BADNESS_PER_LEVEL_OF_COMMENT_DISPLACEMENT
+  /**
+   * Return a String representation of {@code object}, with lines wrapped at {@code lineLength},
+   * with the assumption that the target language is {@code target}.
+   */
+  public static String render(EObject object, int lineLength, Target target, boolean codeMapTags) {
+    MalleableString ms = ToLf.instance.doSwitch(object);
+    String singleLineCommentPrefix = target.getSingleLineCommentPrefix();
+    ms.findBestRepresentation(
+        () -> ms.render(INDENTATION, singleLineCommentPrefix, codeMapTags, null),
+        r ->
+            r.levelsOfCommentDisplacement() * BADNESS_PER_LEVEL_OF_COMMENT_DISPLACEMENT
                 + countCharactersViolatingLineLength(lineLength).applyAsLong(r.rendering())
                     * BADNESS_PER_CHARACTER_VIOLATING_LINE_LENGTH
                 + countNewlines(r.rendering()) * BADNESS_PER_NEWLINE,
-            lineLength,
-            INDENTATION,
-            singleLineCommentPrefix
-        );
-        var optimizedRendering = ms.render(INDENTATION, singleLineCommentPrefix, codeMapTags, null);
-        List<String> comments = optimizedRendering.unplacedComments().toList();
-        return comments.stream().allMatch(String::isBlank) ? optimizedRendering.rendering()
-            : lineWrapComments(comments, lineLength, singleLineCommentPrefix)
-                + "\n" + optimizedRendering.rendering();
+        lineLength,
+        INDENTATION,
+        singleLineCommentPrefix);
+    var optimizedRendering = ms.render(INDENTATION, singleLineCommentPrefix, codeMapTags, null);
+    List<String> comments = optimizedRendering.unplacedComments().toList();
+    return comments.stream().allMatch(String::isBlank)
+        ? optimizedRendering.rendering()
+        : lineWrapComments(comments, lineLength, singleLineCommentPrefix)
+            + "\n"
+            + optimizedRendering.rendering();
+  }
+
+  /** Infer the target language of the object. */
+  private static Target inferTarget(EObject object) {
+    if (object instanceof Model model) {
+      var targetDecl = ASTUtils.targetDecl(model);
+      if (targetDecl != null) {
+        return Target.fromDecl(targetDecl);
+      }
     }
-
-    /**
-     * Infer the target language of the object.
-     */
-    private static Target inferTarget(EObject object) {
-        if (object instanceof Model model) {
-            var targetDecl = ASTUtils.targetDecl(model);
-            if (targetDecl != null) {
-                return Target.fromDecl(targetDecl);
-            }
-        }
-        throw new IllegalArgumentException("Unable to determine target based on given EObject.");
-    }
-
-    /**
-     * Return a String representation of {@code object} using a reasonable
-     * default line length.
-     */
-    public static String render(EObject object) { return render(object, DEFAULT_LINE_LENGTH); }
-
-    /**
-     * Return the number of characters appearing in columns exceeding {@code lineLength}.
-     */
-    private static ToLongFunction<String> countCharactersViolatingLineLength(int lineLength) {
-        return s -> s.lines().mapToInt(it -> Math.max(0, it.length() - lineLength)).sum();
-    }
-
-    private static long countNewlines(String s) {
-        return s.lines().count();
-    }
-
-    /**
-     * Break lines at spaces so that each line is no more than {@code width}
-     * columns long, if possible. Normalize whitespace. Merge consecutive
-     * single-line comments.
-     */
-    static String lineWrapComments(
-        List<String> comments,
-        int width,
-        String singleLineCommentPrefix
-    ) {
-        StringBuilder ret = new StringBuilder();
-        StringBuilder current = new StringBuilder();
-        for (String comment : comments) {
-            if (comment.stripLeading().startsWith("/*")) {
-                if (!ret.isEmpty() && !current.isEmpty()) ret.append("\n");
-                ret.append(lineWrapComment(current.toString(), width, singleLineCommentPrefix));
-                current.setLength(0);
-                if (!ret.isEmpty()) ret.append("\n");
-                ret.append(lineWrapComment(comment.strip(), width, singleLineCommentPrefix));
-            } else {
-                if (!current.isEmpty()) current.append("\n");
-                current.append(comment.strip());
-            }
-        }
+    throw new IllegalArgumentException("Unable to determine target based on given EObject.");
+  }
+
+  /** Return a String representation of {@code object} using a reasonable default line length. */
+  public static String render(EObject object) {
+    return render(object, DEFAULT_LINE_LENGTH);
+  }
+
+  /** Return the number of characters appearing in columns exceeding {@code lineLength}. */
+  private static ToLongFunction<String> countCharactersViolatingLineLength(int lineLength) {
+    return s -> s.lines().mapToInt(it -> Math.max(0, it.length() - lineLength)).sum();
+  }
+
+  private static long countNewlines(String s) {
+    return s.lines().count();
+  }
+
+  /**
+   * Break lines at spaces so that each line is no more than {@code width} columns long, if
+   * possible. Normalize whitespace. Merge consecutive single-line comments.
+   */
+  static String lineWrapComments(List<String> comments, int width, String singleLineCommentPrefix) {
+    StringBuilder ret = new StringBuilder();
+    StringBuilder current = new StringBuilder();
+    for (String comment : comments) {
+      if (comment.stripLeading().startsWith("/*")) {
         if (!ret.isEmpty() && !current.isEmpty()) ret.append("\n");
         ret.append(lineWrapComment(current.toString(), width, singleLineCommentPrefix));
-        return ret.toString();
+        current.setLength(0);
+        if (!ret.isEmpty()) ret.append("\n");
+        ret.append(lineWrapComment(comment.strip(), width, singleLineCommentPrefix));
+      } else {
+        if (!current.isEmpty()) current.append("\n");
+        current.append(comment.strip());
+      }
     }
-    /** Wrap lines. Do not merge lines that start with weird characters. */
-    private static String lineWrapComment(
-        String comment,
-        int width,
-        String singleLineCommentPrefix
-    ) {
-        width = Math.max(width, MINIMUM_COMMENT_WIDTH_IN_COLUMNS);
-        List<List<String>> paragraphs = Arrays.stream(
-            comment.strip()
-                .replaceAll("^/?((\\*|//|#)\\s*)+", "")
-                .replaceAll("\\s*\\*/$", "")
-                .replaceAll("(?<=(\\r\\n|\\r|\\n))\\h*(\\*|//|#)\\h*", "")
-                .split("(\n\\s*){2,}")
-            ).map(s -> Arrays.stream(s.split("(\\r\\n|\\r|\\n)\\h*(?=[@#$%^&*\\-+=:;<>/])")))
+    if (!ret.isEmpty() && !current.isEmpty()) ret.append("\n");
+    ret.append(lineWrapComment(current.toString(), width, singleLineCommentPrefix));
+    return ret.toString();
+  }
+  /** Wrap lines. Do not merge lines that start with weird characters. */
+  private static String lineWrapComment(String comment, int width, String singleLineCommentPrefix) {
+    width = Math.max(width, MINIMUM_COMMENT_WIDTH_IN_COLUMNS);
+    List<List<String>> paragraphs =
+        Arrays.stream(
+                comment
+                    .strip()
+                    .replaceAll("^/?((\\*|//|#)\\s*)+", "")
+                    .replaceAll("\\s*\\*/$", "")
+                    .replaceAll("(?<=(\\r\\n|\\r|\\n))\\h*(\\*|//|#)\\h*", "")
+                    .split("(\n\\s*){2,}"))
+            .map(s -> Arrays.stream(s.split("(\\r\\n|\\r|\\n)\\h*(?=[@#$%^&*\\-+=:;<>/])")))
             .map(stream -> stream.map(s -> s.replaceAll("\\s+", " ")))
             .map(Stream::toList)
             .toList();
-        if (MULTILINE_COMMENT.matcher(comment).matches()) {
-            if (paragraphs.size() == 1 && paragraphs.get(0).size() == 1) {
-                String singleLineRepresentation = String.format(
-                    "/** %s */", paragraphs.get(0).get(0)
-                );
-                if (singleLineRepresentation.length() <= width) return singleLineRepresentation;
-            }
-            return String.format("/**\n%s\n */", lineWrapComment(paragraphs, width, " * "));
-        }
-        return lineWrapComment(paragraphs, width, singleLineCommentPrefix + " ");
-    }
-
-    /**
-     * Wrap lines.
-     * @param paragraphs A list of lists of subparagraphs.
-     * @param width The preferred maximum number of columns per line.
-     * @param linePrefix A string to prepend to each line of comment.
-     */
-    private static String lineWrapComment(
-        List<List<String>> paragraphs,
-        int width,
-        String linePrefix
-    ) {
-        int widthAfterPrefix = Math.max(
-            width - linePrefix.length(),
-            MINIMUM_COMMENT_WIDTH_IN_COLUMNS
-        );
-        return paragraphs.stream()
-            .map(paragraph -> wrapLines(paragraph, widthAfterPrefix)
-                .map(s -> (linePrefix + s.stripLeading()).stripTrailing())
-                .collect(Collectors.joining("\n"))
-            ).collect(Collectors.joining(String.format("\n%s\n", linePrefix.stripTrailing())));
+    if (MULTILINE_COMMENT.matcher(comment).matches()) {
+      if (paragraphs.size() == 1 && paragraphs.get(0).size() == 1) {
+        String singleLineRepresentation = String.format("/** %s */", paragraphs.get(0).get(0));
+        if (singleLineRepresentation.length() <= width) return singleLineRepresentation;
+      }
+      return String.format("/**\n%s\n */", lineWrapComment(paragraphs, width, " * "));
     }
-
-    /** Wrap a given paragraph. */
-    private static Stream<String> wrapLines(List<String> subparagraphs, int width) {
-        var ret = new ArrayList<String>();
-        for (String s : subparagraphs) {
-            int numCharactersProcessed = 0;
-            while (numCharactersProcessed + width < s.length()) {
-                // try to wrap at space
-                int breakAt = s.lastIndexOf(' ', numCharactersProcessed + width);
-                // if unable to find space in limit, extend to the first space we find
-                if (breakAt < numCharactersProcessed) {
-                    breakAt = s.indexOf(' ', numCharactersProcessed + width);
-                }
-                if (breakAt < numCharactersProcessed) breakAt = s.length();
-                ret.add(s.substring(numCharactersProcessed, breakAt));
-                numCharactersProcessed = breakAt + 1;
-            }
-            if (numCharactersProcessed < s.length()) ret.add(s.substring(numCharactersProcessed));
+    return lineWrapComment(paragraphs, width, singleLineCommentPrefix + " ");
+  }
+
+  /**
+   * Wrap lines.
+   *
+   * @param paragraphs A list of lists of subparagraphs.
+   * @param width The preferred maximum number of columns per line.
+   * @param linePrefix A string to prepend to each line of comment.
+   */
+  private static String lineWrapComment(
+      List<List<String>> paragraphs, int width, String linePrefix) {
+    int widthAfterPrefix = Math.max(width - linePrefix.length(), MINIMUM_COMMENT_WIDTH_IN_COLUMNS);
+    return paragraphs.stream()
+        .map(
+            paragraph ->
+                wrapLines(paragraph, widthAfterPrefix)
+                    .map(s -> (linePrefix + s.stripLeading()).stripTrailing())
+                    .collect(Collectors.joining("\n")))
+        .collect(Collectors.joining(String.format("\n%s\n", linePrefix.stripTrailing())));
+  }
+
+  /** Wrap a given paragraph. */
+  private static Stream<String> wrapLines(List<String> subparagraphs, int width) {
+    var ret = new ArrayList<String>();
+    for (String s : subparagraphs) {
+      int numCharactersProcessed = 0;
+      while (numCharactersProcessed + width < s.length()) {
+        // try to wrap at space
+        int breakAt = s.lastIndexOf(' ', numCharactersProcessed + width);
+        // if unable to find space in limit, extend to the first space we find
+        if (breakAt < numCharactersProcessed) {
+          breakAt = s.indexOf(' ', numCharactersProcessed + width);
         }
-        return ret.stream();
+        if (breakAt < numCharactersProcessed) breakAt = s.length();
+        ret.add(s.substring(numCharactersProcessed, breakAt));
+        numCharactersProcessed = breakAt + 1;
+      }
+      if (numCharactersProcessed < s.length()) ret.add(s.substring(numCharactersProcessed));
     }
-
-    /**
-     * Merge {@code comment} into the given list of strings without changing the
-     * length of the list, preferably in a place that indicates that
-     * {@code comment} is associated with the {@code i}th string.
-     * @param comment A comment associated with an element of
-     * {@code components}.
-     * @param components A list of strings that will be rendered in sequence.
-     * @param i The position of the component associated with {@code comment}.
-     * @param width The ideal number of columns available for comments that
-     * appear on their own line.
-     * @param keepCommentsOnSameLine Whether to make a best-effort attempt to
-     * keep the comment on the same line as the associated string.
-     * @param singleLineCommentPrefix The prefix that marks the start of a
-     * single-line comment.
-     * @param startColumn The ideal starting column of a comment
-     * @return Whether the comment placement succeeded.
-     */
-    static boolean placeComment(
-        List<String> comment,
-        List<String> components,
-        int i,
-        int width,
-        boolean keepCommentsOnSameLine,
-        String singleLineCommentPrefix,
-        int startColumn
-    ) {
-        if (comment.stream().allMatch(String::isBlank)) return true;
-        String wrapped = FormattingUtils.lineWrapComments(comment, width, singleLineCommentPrefix);
-        if (keepCommentsOnSameLine && wrapped.lines().count() == 1 && !wrapped.startsWith("/**")) {
-            int sum = 0;
-            for (int j = 0; j < components.size(); j++) {
-                String current = components.get(j);
-                if (j >= i && current.contains("\n")) {
-                    components.set(j, components.get(j).replaceFirst(
-                        "\n",
-                        " ".repeat(Math.max(
-                            2,
-                            startColumn - sum - components.get(j).indexOf("\n")
-                        )) + wrapped + "\n"
-                    ));
-                    return true;
-                } else if (current.contains("\n")) {
-                    sum = current.length() - current.lastIndexOf("\n") - 1;
-                } else {
-                    sum += current.length();
-                }
-            }
+    return ret.stream();
+  }
+
+  /**
+   * Merge {@code comment} into the given list of strings without changing the length of the list,
+   * preferably in a place that indicates that {@code comment} is associated with the {@code i}th
+   * string.
+   *
+   * @param comment A comment associated with an element of {@code components}.
+   * @param components A list of strings that will be rendered in sequence.
+   * @param i The position of the component associated with {@code comment}.
+   * @param width The ideal number of columns available for comments that appear on their own line.
+   * @param keepCommentsOnSameLine Whether to make a best-effort attempt to keep the comment on the
+   *     same line as the associated string.
+   * @param singleLineCommentPrefix The prefix that marks the start of a single-line comment.
+   * @param startColumn The ideal starting column of a comment
+   * @return Whether the comment placement succeeded.
+   */
+  static boolean placeComment(
+      List<String> comment,
+      List<String> components,
+      int i,
+      int width,
+      boolean keepCommentsOnSameLine,
+      String singleLineCommentPrefix,
+      int startColumn) {
+    if (comment.stream().allMatch(String::isBlank)) return true;
+    String wrapped = FormattingUtils.lineWrapComments(comment, width, singleLineCommentPrefix);
+    if (keepCommentsOnSameLine && wrapped.lines().count() == 1 && !wrapped.startsWith("/**")) {
+      int sum = 0;
+      for (int j = 0; j < components.size(); j++) {
+        String current = components.get(j);
+        if (j >= i && current.contains("\n")) {
+          components.set(
+              j,
+              components
+                  .get(j)
+                  .replaceFirst(
+                      "\n",
+                      " ".repeat(Math.max(2, startColumn - sum - components.get(j).indexOf("\n")))
+                          + wrapped
+                          + "\n"));
+          return true;
+        } else if (current.contains("\n")) {
+          sum = current.length() - current.lastIndexOf("\n") - 1;
+        } else {
+          sum += current.length();
         }
-        for (int j = i - 1; j >= 0; j--) {
-            if (components.get(j).endsWith("\n")) {
-                components.set(j, String.format("%s%s\n", components.get(j), wrapped));
-                return true;
-            }
-        }
-        return false;
+      }
+    }
+    for (int j = i - 1; j >= 0; j--) {
+      if (components.get(j).endsWith("\n")) {
+        components.set(j, String.format("%s%s\n", components.get(j), wrapped));
+        return true;
+      }
     }
+    return false;
+  }
 }
diff --git a/org.lflang/src/org/lflang/ast/IsEqual.java b/org.lflang/src/org/lflang/ast/IsEqual.java
index af0274ea2a..bc0fc31abf 100644
--- a/org.lflang/src/org/lflang/ast/IsEqual.java
+++ b/org.lflang/src/org/lflang/ast/IsEqual.java
@@ -6,9 +6,7 @@
 import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.lflang.TimeUnit;
 import org.lflang.lf.Action;
 import org.lflang.lf.Array;
@@ -66,620 +64,603 @@
 import org.lflang.lf.util.LfSwitch;
 
 /**
- * Switch class that checks if subtrees of the AST are semantically equivalent
- * to each other. Return {@code false} if they are not equivalent; return
- * {@code true} or {@code false} (but preferably {@code true}) if they are
- * equivalent.
+ * Switch class that checks if subtrees of the AST are semantically equivalent to each other. Return
+ * {@code false} if they are not equivalent; return {@code true} or {@code false} (but preferably
+ * {@code true}) if they are equivalent.
  */
 public class IsEqual extends LfSwitch<Boolean> {
 
-    private final EObject otherObject;
-
-    public IsEqual(EObject other) {
-        this.otherObject = other;
-    }
-
-    @Override
-    public Boolean doSwitch(EObject eObject) {
-        if (otherObject == eObject) return true;
-        if (eObject == null) return false;
-        return super.doSwitch(eObject);
-    }
-
-    @Override
-    public Boolean caseModel(Model object) {
-        return new ComparisonMachine<>(object, Model.class)
-            .equivalent(Model::getTarget)
-            .listsEquivalent(Model::getImports)
-            .listsEquivalent(Model::getPreambles)
-            .listsEquivalent(Model::getReactors).conclusion;
-    }
-
-    @Override
-    public Boolean caseImport(Import object) {
-        return new ComparisonMachine<>(object, Import.class)
-            .equalAsObjects(Import::getImportURI)
-            .listsEquivalent(Import::getReactorClasses).conclusion;
-    }
-
-    @Override
-    public Boolean caseReactorDecl(ReactorDecl object) {
-        return new ComparisonMachine<>(object, ReactorDecl.class)
-            .equalAsObjects(ReactorDecl::getName)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseImportedReactor(ImportedReactor object) {
-        return new ComparisonMachine<>(object, ImportedReactor.class)
-            .equalAsObjects(ImportedReactor::getName)
-            .equivalent(ImportedReactor::getReactorClass)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseReactor(Reactor object) {
-        return new ComparisonMachine<>(object, Reactor.class)
-            .listsEquivalent(Reactor::getAttributes)
-            .equalAsObjects(Reactor::isFederated)
-            .equalAsObjects(Reactor::isRealtime)
-            .equalAsObjects(Reactor::isMain)
-            .equalAsObjects(Reactor::getName)
-            .listsEquivalent(Reactor::getTypeParms)
-            .listsEquivalent(Reactor::getParameters)
-            .equivalent(Reactor::getHost)
-            .listsEquivalent(Reactor::getSuperClasses)
-            .listsEquivalent(Reactor::getPreambles)
-            .listsEquivalent(Reactor::getInputs)
-            .listsEquivalent(Reactor::getOutputs)
-            .listsEquivalent(Reactor::getTimers)
-            .listsEquivalent(Reactor::getActions)
-            .listsEquivalent(Reactor::getInstantiations)
-            .listsEquivalent(Reactor::getConnections)
-            .listsEquivalent(Reactor::getStateVars)
-            .listsEquivalent(Reactor::getReactions)
-            .listsEquivalent(Reactor::getMethods)
-            .listsEquivalent(Reactor::getModes)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseTypeParm(TypeParm object) {
-        return new ComparisonMachine<>(object, TypeParm.class)
-            .equalAsObjects(TypeParm::getLiteral)
-            .equivalent(TypeParm::getCode)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseTargetDecl(TargetDecl object) {
-        return new ComparisonMachine<>(object, TargetDecl.class)
-            .equalAsObjects(TargetDecl::getName)
-            .equivalentModulo(
-                TargetDecl::getConfig,
-                (KeyValuePairs it) -> it != null && it.getPairs().isEmpty() ? null : it
-            )
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseStateVar(StateVar object) {
-        return new ComparisonMachine<>(object, StateVar.class)
-            .listsEquivalent(StateVar::getAttributes)
-            .equalAsObjects(StateVar::getName)
-            .equivalent(StateVar::getType)
-            .equivalent(StateVar::getInit)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseInitializer(Initializer object) {
-        // Empty braces are not equivalent to no init.
-        return new ComparisonMachine<>(object, Initializer.class)
-            .equalAsObjects(Initializer::isBraces)
-            // An initializer with no parens is equivalent to one with parens,
-            // if the list has a single element. This is probably going to change
-            // when we introduce equals initializers.
-            // .equalAsObjects(Initializer::isParens)
-            .listsEquivalent(Initializer::getExprs)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseMethod(Method object) {
-        return new ComparisonMachine<>(object, Method.class)
-            .equalAsObjects(Method::isConst)
-            .equalAsObjects(Method::getName)
-            .listsEquivalent(Method::getArguments)
-            .equivalent(Method::getReturn)
-            .equivalent(Method::getCode)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseMethodArgument(MethodArgument object) {
-        return new ComparisonMachine<>(object, MethodArgument.class)
-            .equalAsObjects(MethodArgument::getName)
-            .equivalent(MethodArgument::getType)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseInput(Input object) {
-        return new ComparisonMachine<>(object, Input.class)
-            .listsEquivalent(Input::getAttributes)
-            .equalAsObjects(Input::isMutable)
-            .equivalent(Input::getWidthSpec)
-            .equivalent(Input::getType)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseOutput(Output object) {
-        return new ComparisonMachine<>(object, Output.class)
-            .listsEquivalent(Output::getAttributes)
-            .equivalent(Output::getWidthSpec)
-            .equalAsObjects(Output::getName)
-            .equivalent(Output::getType)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseTimer(Timer object) {
-        return new ComparisonMachine<>(object, Timer.class)
-            .listsEquivalent(Timer::getAttributes)
-            .equalAsObjects(Timer::getName)
-            .equivalent(Timer::getOffset)
-            .equivalent(Timer::getPeriod)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseMode(Mode object) {
-        return new ComparisonMachine<>(object, Mode.class)
-            .equalAsObjects(Mode::isInitial)
-            .equalAsObjects(Mode::getName)
-            .listsEquivalent(Mode::getStateVars)
-            .listsEquivalent(Mode::getTimers)
-            .listsEquivalent(Mode::getActions)
-            .listsEquivalent(Mode::getInstantiations)
-            .listsEquivalent(Mode::getConnections)
-            .listsEquivalent(Mode::getReactions)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseAction(Action object) {
-        return new ComparisonMachine<>(object, Action.class)
-            .listsEquivalent(Action::getAttributes)
-            .equalAsObjects(Action::getOrigin) // This is an enum
-            .equalAsObjects(Action::getName)
-            .equivalent(Action::getMinDelay)
-            .equivalent(Action::getMinSpacing)
-            .equalAsObjects(Action::getPolicy)
-            .equivalent(Action::getType)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseAttribute(Attribute object) {
-        return new ComparisonMachine<>(object, Attribute.class)
-            .equalAsObjects(Attribute::getAttrName)
-            .listsEquivalent(Attribute::getAttrParms)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseAttrParm(AttrParm object) {
-        return new ComparisonMachine<>(object, AttrParm.class)
-            .equalAsObjects(AttrParm::getName)
-            .equalAsObjects(AttrParm::getValue)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseReaction(Reaction object) {
-        return new ComparisonMachine<>(object, Reaction.class)
-            .listsEquivalent(Reaction::getAttributes)
-            .listsEquivalent(Reaction::getTriggers)
-            .listsEquivalent(Reaction::getSources)
-            .listsEquivalent(Reaction::getEffects)
-            .equalAsObjects(Reaction::isMutation)
-            .equalAsObjects(Reaction::getName)
-            .equivalent(Reaction::getCode)
-            .equivalent(Reaction::getStp)
-            .equivalent(Reaction::getDeadline)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseTriggerRef(TriggerRef object) {
-        throw thereIsAMoreSpecificCase(TriggerRef.class, BuiltinTriggerRef.class, VarRef.class);
-    }
-
-    @Override
-    public Boolean caseBuiltinTriggerRef(BuiltinTriggerRef object) {
-        return new ComparisonMachine<>(object, BuiltinTriggerRef.class)
-            .equalAsObjects(BuiltinTriggerRef::getType)  // This is an enum
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseDeadline(Deadline object) {
-        return new ComparisonMachine<>(object, Deadline.class)
-            .equivalent(Deadline::getDelay)
-            .equivalent(Deadline::getCode)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseSTP(STP object) {
-        return new ComparisonMachine<>(object, STP.class)
-            .equivalent(STP::getValue)
-            .equivalent(STP::getCode)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean casePreamble(Preamble object) {
-        return new ComparisonMachine<>(object, Preamble.class)
-            .equalAsObjects(Preamble::getVisibility)  // This is an enum
-            .equivalent(Preamble::getCode)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseInstantiation(Instantiation object) {
-        return new ComparisonMachine<>(object, Instantiation.class)
-            .equalAsObjects(Instantiation::getName)
-            .equivalent(Instantiation::getWidthSpec)
-            .equivalent(Instantiation::getReactorClass)
-            .listsEquivalent(Instantiation::getTypeArgs)
-            .listsEquivalent(Instantiation::getParameters)
-            .equivalent(Instantiation::getHost)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseConnection(Connection object) {
-        return new ComparisonMachine<>(object, Connection.class)
-            .listsEquivalent(Connection::getLeftPorts)
-            .equalAsObjects(Connection::isIterated)
-            .equalAsObjects(Connection::isPhysical)
-            .listsEquivalent(Connection::getRightPorts)
-            .equivalent(Connection::getDelay)
-            .equivalent(Connection::getSerializer)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseSerializer(Serializer object) {
-        return new ComparisonMachine<>(object, Serializer.class)
-            .equalAsObjects(Serializer::getType)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseKeyValuePairs(KeyValuePairs object) {
-        return new ComparisonMachine<>(object, KeyValuePairs.class)
-            .listsEquivalent(KeyValuePairs::getPairs)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseKeyValuePair(KeyValuePair object) {
-        return new ComparisonMachine<>(object, KeyValuePair.class)
-            .equalAsObjects(KeyValuePair::getName)
-            .equivalent(KeyValuePair::getValue)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseArray(Array object) {
-        return new ComparisonMachine<>(object, Array.class)
-            .listsEquivalent(Array::getElements)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseElement(Element object) {
-        return new ComparisonMachine<>(object, Element.class)
-            .equivalent(Element::getKeyvalue)
-            .equivalent(Element::getArray)
-            .equalAsObjects(Element::getLiteral)
-            .equalAsObjects(Element::getId)
-            .equalAsObjects(Element::getUnit)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseTypedVariable(TypedVariable object) {
-        throw thereIsAMoreSpecificCase(TypedVariable.class, Port.class, Action.class);
-    }
-
-    @Override
-    public Boolean caseVariable(Variable object) {
-        throw thereIsAMoreSpecificCase(Variable.class, TypedVariable.class, Timer.class, Mode.class);
-    }
-
-    @Override
-    public Boolean caseVarRef(VarRef object) {
-        return new ComparisonMachine<>(object, VarRef.class)
-            .equalAsObjects(varRef -> varRef.getVariable() instanceof Mode ? null : varRef.getVariable().getName())
-            .equivalent(varRef -> varRef.getVariable() instanceof Mode ? null : varRef.getVariable())
-            .equalAsObjects(varRef -> varRef.getContainer() == null ? null : varRef.getContainer().getName())
-            .equalAsObjects(VarRef::isInterleaved)
-            .equalAsObjects(VarRef::getTransition)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseAssignment(Assignment object) {
-        return new ComparisonMachine<>(object, Assignment.class)
-            .equivalent(Assignment::getLhs)
-            .equivalent(Assignment::getRhs)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseParameter(Parameter object) {
-        return new ComparisonMachine<>(object, Parameter.class)
-            .listsEquivalent(Parameter::getAttributes)
-            .equalAsObjects(Parameter::getName)
-            .equivalent(Parameter::getType)
-            .equivalent(Parameter::getInit)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseExpression(Expression object) {
-        throw thereIsAMoreSpecificCase(
-            Expression.class,
-            Literal.class,
-            Time.class,
-            ParameterReference.class,
-            Code.class,
-            BracedListExpression.class
-        );
-    }
-
-    @Override
-    public Boolean caseBracedListExpression(BracedListExpression object) {
-        return new ComparisonMachine<>(object, BracedListExpression.class)
-            .listsEquivalent(BracedListExpression::getItems)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseParameterReference(ParameterReference object) {
-        return new ComparisonMachine<>(object, ParameterReference.class)
-            .equivalent(ParameterReference::getParameter)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseTime(Time object) {
-        return new ComparisonMachine<>(object, Time.class)
-            .equalAsObjects(Time::getInterval)
-            .equalAsObjectsModulo(
-                Time::getUnit,
-                ((Function<TimeUnit, String>) TimeUnit::getCanonicalName)
-                    .compose(TimeUnit::fromName)
-            )
-            .conclusion;
-    }
-
-    @Override
-    public Boolean casePort(Port object) {
-        throw thereIsAMoreSpecificCase(Port.class, Input.class, Output.class);
-    }
-
-    @Override
-    public Boolean caseType(Type object) {
-        return new ComparisonMachine<>(object, Type.class)
-            .equivalent(Type::getCode)
-            .equalAsObjects(Type::isTime)
-            .equivalent(Type::getArraySpec)
-            .equalAsObjects(Type::getId)
-            .listsEquivalent(Type::getTypeArgs)
-            .listsEqualAsObjects(Type::getStars)
-            .equivalent(Type::getArraySpec)
-            .equivalent(Type::getCode)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseArraySpec(ArraySpec object) {
-        return new ComparisonMachine<>(object, ArraySpec.class)
-            .equalAsObjects(ArraySpec::isOfVariableLength)
-            .equalAsObjects(ArraySpec::getLength)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseWatchdog(Watchdog object) {
-        return new ComparisonMachine<>(object, Watchdog.class)
-            .equalAsObjects(Watchdog::getName)
-            .equivalent(Watchdog::getTimeout)
-            .listsEquivalent(Watchdog::getEffects)
-            .equivalent(Watchdog::getCode)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseWidthSpec(WidthSpec object) {
-        return new ComparisonMachine<>(object, WidthSpec.class)
-            .equalAsObjects(WidthSpec::isOfVariableLength)
-            .listsEquivalent(WidthSpec::getTerms)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseWidthTerm(WidthTerm object) {
-        return new ComparisonMachine<>(object, WidthTerm.class)
-            .equalAsObjects(WidthTerm::getWidth)
-            .equivalent(WidthTerm::getParameter)
-            .equivalent(WidthTerm::getPort)
-            .equivalent(WidthTerm::getCode)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseIPV4Host(IPV4Host object) {
-        return caseHost(object);
-    }
-
-    @Override
-    public Boolean caseIPV6Host(IPV6Host object) {
-        return caseHost(object);
-    }
-
-    @Override
-    public Boolean caseNamedHost(NamedHost object) {
-        return caseHost(object);
-    }
-
-    @Override
-    public Boolean caseHost(Host object) {
-        return new ComparisonMachine<>(object, Host.class)
-            .equalAsObjects(Host::getUser)
-            .equalAsObjects(Host::getAddr)
-            .equalAsObjects(Host::getPort)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseCodeExpr(CodeExpr object) {
-        return new ComparisonMachine<>(object, CodeExpr.class).equivalent(CodeExpr::getCode).conclusion;
-    }
-
-    @Override
-    public Boolean caseCode(Code object) {
-        return new ComparisonMachine<>(object, Code.class)
-            .equalAsObjectsModulo(
-                Code::getBody,
-                s -> s == null ? null : s.strip().stripIndent()
-            )
-            .conclusion;
-    }
-
-    @Override
-    public Boolean caseLiteral(Literal object) {
-        return new ComparisonMachine<>(object, Literal.class)
-            .equalAsObjects(Literal::getLiteral)
-            .conclusion;
-    }
-
-    @Override
-    public Boolean defaultCase(EObject object) {
-        return super.defaultCase(object);
-    }
-
-    @SafeVarargs
-    private UnsupportedOperationException thereIsAMoreSpecificCase(
-        Class<? extends EObject> thisCase,
-        Class<? extends EObject>... moreSpecificCases
-    ) {
-        return new UnsupportedOperationException(String.format(
+  private final EObject otherObject;
+
+  public IsEqual(EObject other) {
+    this.otherObject = other;
+  }
+
+  @Override
+  public Boolean doSwitch(EObject eObject) {
+    if (otherObject == eObject) return true;
+    if (eObject == null) return false;
+    return super.doSwitch(eObject);
+  }
+
+  @Override
+  public Boolean caseModel(Model object) {
+    return new ComparisonMachine<>(object, Model.class)
+        .equivalent(Model::getTarget)
+        .listsEquivalent(Model::getImports)
+        .listsEquivalent(Model::getPreambles)
+        .listsEquivalent(Model::getReactors)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseImport(Import object) {
+    return new ComparisonMachine<>(object, Import.class)
+        .equalAsObjects(Import::getImportURI)
+        .listsEquivalent(Import::getReactorClasses)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseReactorDecl(ReactorDecl object) {
+    return new ComparisonMachine<>(object, ReactorDecl.class)
+        .equalAsObjects(ReactorDecl::getName)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseImportedReactor(ImportedReactor object) {
+    return new ComparisonMachine<>(object, ImportedReactor.class)
+        .equalAsObjects(ImportedReactor::getName)
+        .equivalent(ImportedReactor::getReactorClass)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseReactor(Reactor object) {
+    return new ComparisonMachine<>(object, Reactor.class)
+        .listsEquivalent(Reactor::getAttributes)
+        .equalAsObjects(Reactor::isFederated)
+        .equalAsObjects(Reactor::isRealtime)
+        .equalAsObjects(Reactor::isMain)
+        .equalAsObjects(Reactor::getName)
+        .listsEquivalent(Reactor::getTypeParms)
+        .listsEquivalent(Reactor::getParameters)
+        .equivalent(Reactor::getHost)
+        .listsEquivalent(Reactor::getSuperClasses)
+        .listsEquivalent(Reactor::getPreambles)
+        .listsEquivalent(Reactor::getInputs)
+        .listsEquivalent(Reactor::getOutputs)
+        .listsEquivalent(Reactor::getTimers)
+        .listsEquivalent(Reactor::getActions)
+        .listsEquivalent(Reactor::getInstantiations)
+        .listsEquivalent(Reactor::getConnections)
+        .listsEquivalent(Reactor::getStateVars)
+        .listsEquivalent(Reactor::getReactions)
+        .listsEquivalent(Reactor::getMethods)
+        .listsEquivalent(Reactor::getModes)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseTypeParm(TypeParm object) {
+    return new ComparisonMachine<>(object, TypeParm.class)
+        .equalAsObjects(TypeParm::getLiteral)
+        .equivalent(TypeParm::getCode)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseTargetDecl(TargetDecl object) {
+    return new ComparisonMachine<>(object, TargetDecl.class)
+        .equalAsObjects(TargetDecl::getName)
+        .equivalentModulo(
+            TargetDecl::getConfig,
+            (KeyValuePairs it) -> it != null && it.getPairs().isEmpty() ? null : it)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseStateVar(StateVar object) {
+    return new ComparisonMachine<>(object, StateVar.class)
+        .listsEquivalent(StateVar::getAttributes)
+        .equalAsObjects(StateVar::getName)
+        .equivalent(StateVar::getType)
+        .equivalent(StateVar::getInit)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseInitializer(Initializer object) {
+    // Empty braces are not equivalent to no init.
+    return new ComparisonMachine<>(object, Initializer.class)
+        .equalAsObjects(Initializer::isBraces)
+        // An initializer with no parens is equivalent to one with parens,
+        // if the list has a single element. This is probably going to change
+        // when we introduce equals initializers.
+        // .equalAsObjects(Initializer::isParens)
+        .listsEquivalent(Initializer::getExprs)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseMethod(Method object) {
+    return new ComparisonMachine<>(object, Method.class)
+        .equalAsObjects(Method::isConst)
+        .equalAsObjects(Method::getName)
+        .listsEquivalent(Method::getArguments)
+        .equivalent(Method::getReturn)
+        .equivalent(Method::getCode)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseMethodArgument(MethodArgument object) {
+    return new ComparisonMachine<>(object, MethodArgument.class)
+        .equalAsObjects(MethodArgument::getName)
+        .equivalent(MethodArgument::getType)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseInput(Input object) {
+    return new ComparisonMachine<>(object, Input.class)
+        .listsEquivalent(Input::getAttributes)
+        .equalAsObjects(Input::isMutable)
+        .equivalent(Input::getWidthSpec)
+        .equivalent(Input::getType)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseOutput(Output object) {
+    return new ComparisonMachine<>(object, Output.class)
+        .listsEquivalent(Output::getAttributes)
+        .equivalent(Output::getWidthSpec)
+        .equalAsObjects(Output::getName)
+        .equivalent(Output::getType)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseTimer(Timer object) {
+    return new ComparisonMachine<>(object, Timer.class)
+        .listsEquivalent(Timer::getAttributes)
+        .equalAsObjects(Timer::getName)
+        .equivalent(Timer::getOffset)
+        .equivalent(Timer::getPeriod)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseMode(Mode object) {
+    return new ComparisonMachine<>(object, Mode.class)
+        .equalAsObjects(Mode::isInitial)
+        .equalAsObjects(Mode::getName)
+        .listsEquivalent(Mode::getStateVars)
+        .listsEquivalent(Mode::getTimers)
+        .listsEquivalent(Mode::getActions)
+        .listsEquivalent(Mode::getInstantiations)
+        .listsEquivalent(Mode::getConnections)
+        .listsEquivalent(Mode::getReactions)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseAction(Action object) {
+    return new ComparisonMachine<>(object, Action.class)
+        .listsEquivalent(Action::getAttributes)
+        .equalAsObjects(Action::getOrigin) // This is an enum
+        .equalAsObjects(Action::getName)
+        .equivalent(Action::getMinDelay)
+        .equivalent(Action::getMinSpacing)
+        .equalAsObjects(Action::getPolicy)
+        .equivalent(Action::getType)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseAttribute(Attribute object) {
+    return new ComparisonMachine<>(object, Attribute.class)
+        .equalAsObjects(Attribute::getAttrName)
+        .listsEquivalent(Attribute::getAttrParms)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseAttrParm(AttrParm object) {
+    return new ComparisonMachine<>(object, AttrParm.class)
+        .equalAsObjects(AttrParm::getName)
+        .equalAsObjects(AttrParm::getValue)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseReaction(Reaction object) {
+    return new ComparisonMachine<>(object, Reaction.class)
+        .listsEquivalent(Reaction::getAttributes)
+        .listsEquivalent(Reaction::getTriggers)
+        .listsEquivalent(Reaction::getSources)
+        .listsEquivalent(Reaction::getEffects)
+        .equalAsObjects(Reaction::isMutation)
+        .equalAsObjects(Reaction::getName)
+        .equivalent(Reaction::getCode)
+        .equivalent(Reaction::getStp)
+        .equivalent(Reaction::getDeadline)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseTriggerRef(TriggerRef object) {
+    throw thereIsAMoreSpecificCase(TriggerRef.class, BuiltinTriggerRef.class, VarRef.class);
+  }
+
+  @Override
+  public Boolean caseBuiltinTriggerRef(BuiltinTriggerRef object) {
+    return new ComparisonMachine<>(object, BuiltinTriggerRef.class)
+        .equalAsObjects(BuiltinTriggerRef::getType) // This is an enum
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseDeadline(Deadline object) {
+    return new ComparisonMachine<>(object, Deadline.class)
+        .equivalent(Deadline::getDelay)
+        .equivalent(Deadline::getCode)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseSTP(STP object) {
+    return new ComparisonMachine<>(object, STP.class)
+        .equivalent(STP::getValue)
+        .equivalent(STP::getCode)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean casePreamble(Preamble object) {
+    return new ComparisonMachine<>(object, Preamble.class)
+        .equalAsObjects(Preamble::getVisibility) // This is an enum
+        .equivalent(Preamble::getCode)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseInstantiation(Instantiation object) {
+    return new ComparisonMachine<>(object, Instantiation.class)
+        .equalAsObjects(Instantiation::getName)
+        .equivalent(Instantiation::getWidthSpec)
+        .equivalent(Instantiation::getReactorClass)
+        .listsEquivalent(Instantiation::getTypeArgs)
+        .listsEquivalent(Instantiation::getParameters)
+        .equivalent(Instantiation::getHost)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseConnection(Connection object) {
+    return new ComparisonMachine<>(object, Connection.class)
+        .listsEquivalent(Connection::getLeftPorts)
+        .equalAsObjects(Connection::isIterated)
+        .equalAsObjects(Connection::isPhysical)
+        .listsEquivalent(Connection::getRightPorts)
+        .equivalent(Connection::getDelay)
+        .equivalent(Connection::getSerializer)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseSerializer(Serializer object) {
+    return new ComparisonMachine<>(object, Serializer.class)
+        .equalAsObjects(Serializer::getType)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseKeyValuePairs(KeyValuePairs object) {
+    return new ComparisonMachine<>(object, KeyValuePairs.class)
+        .listsEquivalent(KeyValuePairs::getPairs)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseKeyValuePair(KeyValuePair object) {
+    return new ComparisonMachine<>(object, KeyValuePair.class)
+        .equalAsObjects(KeyValuePair::getName)
+        .equivalent(KeyValuePair::getValue)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseArray(Array object) {
+    return new ComparisonMachine<>(object, Array.class)
+        .listsEquivalent(Array::getElements)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseElement(Element object) {
+    return new ComparisonMachine<>(object, Element.class)
+        .equivalent(Element::getKeyvalue)
+        .equivalent(Element::getArray)
+        .equalAsObjects(Element::getLiteral)
+        .equalAsObjects(Element::getId)
+        .equalAsObjects(Element::getUnit)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseTypedVariable(TypedVariable object) {
+    throw thereIsAMoreSpecificCase(TypedVariable.class, Port.class, Action.class);
+  }
+
+  @Override
+  public Boolean caseVariable(Variable object) {
+    throw thereIsAMoreSpecificCase(Variable.class, TypedVariable.class, Timer.class, Mode.class);
+  }
+
+  @Override
+  public Boolean caseVarRef(VarRef object) {
+    return new ComparisonMachine<>(object, VarRef.class)
+        .equalAsObjects(
+            varRef -> varRef.getVariable() instanceof Mode ? null : varRef.getVariable().getName())
+        .equivalent(varRef -> varRef.getVariable() instanceof Mode ? null : varRef.getVariable())
+        .equalAsObjects(
+            varRef -> varRef.getContainer() == null ? null : varRef.getContainer().getName())
+        .equalAsObjects(VarRef::isInterleaved)
+        .equalAsObjects(VarRef::getTransition)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseAssignment(Assignment object) {
+    return new ComparisonMachine<>(object, Assignment.class)
+        .equivalent(Assignment::getLhs)
+        .equivalent(Assignment::getRhs)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseParameter(Parameter object) {
+    return new ComparisonMachine<>(object, Parameter.class)
+        .listsEquivalent(Parameter::getAttributes)
+        .equalAsObjects(Parameter::getName)
+        .equivalent(Parameter::getType)
+        .equivalent(Parameter::getInit)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseExpression(Expression object) {
+    throw thereIsAMoreSpecificCase(
+        Expression.class,
+        Literal.class,
+        Time.class,
+        ParameterReference.class,
+        Code.class,
+        BracedListExpression.class);
+  }
+
+  @Override
+  public Boolean caseBracedListExpression(BracedListExpression object) {
+    return new ComparisonMachine<>(object, BracedListExpression.class)
+        .listsEquivalent(BracedListExpression::getItems)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseParameterReference(ParameterReference object) {
+    return new ComparisonMachine<>(object, ParameterReference.class)
+        .equivalent(ParameterReference::getParameter)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseTime(Time object) {
+    return new ComparisonMachine<>(object, Time.class)
+        .equalAsObjects(Time::getInterval)
+        .equalAsObjectsModulo(
+            Time::getUnit,
+            ((Function<TimeUnit, String>) TimeUnit::getCanonicalName).compose(TimeUnit::fromName))
+        .conclusion;
+  }
+
+  @Override
+  public Boolean casePort(Port object) {
+    throw thereIsAMoreSpecificCase(Port.class, Input.class, Output.class);
+  }
+
+  @Override
+  public Boolean caseType(Type object) {
+    return new ComparisonMachine<>(object, Type.class)
+        .equivalent(Type::getCode)
+        .equalAsObjects(Type::isTime)
+        .equivalent(Type::getArraySpec)
+        .equalAsObjects(Type::getId)
+        .listsEquivalent(Type::getTypeArgs)
+        .listsEqualAsObjects(Type::getStars)
+        .equivalent(Type::getArraySpec)
+        .equivalent(Type::getCode)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseArraySpec(ArraySpec object) {
+    return new ComparisonMachine<>(object, ArraySpec.class)
+        .equalAsObjects(ArraySpec::isOfVariableLength)
+        .equalAsObjects(ArraySpec::getLength)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseWatchdog(Watchdog object) {
+    return new ComparisonMachine<>(object, Watchdog.class)
+        .equalAsObjects(Watchdog::getName)
+        .equivalent(Watchdog::getTimeout)
+        .listsEquivalent(Watchdog::getEffects)
+        .equivalent(Watchdog::getCode)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseWidthSpec(WidthSpec object) {
+    return new ComparisonMachine<>(object, WidthSpec.class)
+        .equalAsObjects(WidthSpec::isOfVariableLength)
+        .listsEquivalent(WidthSpec::getTerms)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseWidthTerm(WidthTerm object) {
+    return new ComparisonMachine<>(object, WidthTerm.class)
+        .equalAsObjects(WidthTerm::getWidth)
+        .equivalent(WidthTerm::getParameter)
+        .equivalent(WidthTerm::getPort)
+        .equivalent(WidthTerm::getCode)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseIPV4Host(IPV4Host object) {
+    return caseHost(object);
+  }
+
+  @Override
+  public Boolean caseIPV6Host(IPV6Host object) {
+    return caseHost(object);
+  }
+
+  @Override
+  public Boolean caseNamedHost(NamedHost object) {
+    return caseHost(object);
+  }
+
+  @Override
+  public Boolean caseHost(Host object) {
+    return new ComparisonMachine<>(object, Host.class)
+        .equalAsObjects(Host::getUser)
+        .equalAsObjects(Host::getAddr)
+        .equalAsObjects(Host::getPort)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseCodeExpr(CodeExpr object) {
+    return new ComparisonMachine<>(object, CodeExpr.class).equivalent(CodeExpr::getCode).conclusion;
+  }
+
+  @Override
+  public Boolean caseCode(Code object) {
+    return new ComparisonMachine<>(object, Code.class)
+        .equalAsObjectsModulo(Code::getBody, s -> s == null ? null : s.strip().stripIndent())
+        .conclusion;
+  }
+
+  @Override
+  public Boolean caseLiteral(Literal object) {
+    return new ComparisonMachine<>(object, Literal.class)
+        .equalAsObjects(Literal::getLiteral)
+        .conclusion;
+  }
+
+  @Override
+  public Boolean defaultCase(EObject object) {
+    return super.defaultCase(object);
+  }
+
+  @SafeVarargs
+  private UnsupportedOperationException thereIsAMoreSpecificCase(
+      Class<? extends EObject> thisCase, Class<? extends EObject>... moreSpecificCases) {
+    return new UnsupportedOperationException(
+        String.format(
             "%ss are %s, so the methods "
                 + "corresponding to those types should be invoked instead.",
             thisCase.getName(),
             Arrays.stream(moreSpecificCases)
-                  .map(Class::getName)
-                  .map(it -> it + (it.endsWith("s") ? "es" : "s"))
-                  .collect(Collectors.joining(" or "))
-        ));
-    }
-
-    /** Fluently compare a pair of parse tree nodes for equivalence. */
-    private class ComparisonMachine<E extends EObject> {
-        private final E object;
-        private final E other;
-        private boolean conclusion;
-
-        ComparisonMachine(E object, Class<E> clz) {
-            this.object = object;
-            this.conclusion = clz.isInstance(otherObject);
-            this.other = conclusion ? clz.cast(otherObject) : null;
-        }
-
-        /**
-         * Conclude false if the two given Lists are different as EObject
-         * sequences. Order matters.
-         */
-        <T extends EObject> ComparisonMachine<E> listsEquivalent(Function<E, List<T>> listGetter) {
-            if (conclusion) conclusion = listsEqualish(listGetter, (T a, T b) -> new IsEqual(a).doSwitch(b));
-            return this;
-        }
-
-        /**
-         * Conclude false if the two given Lists are different as object
-         * sequences. Order matters.
-         */
-        <T> ComparisonMachine<E> listsEqualAsObjects(Function<E, List<T>> listGetter) {
-            if (conclusion) conclusion = listsEqualish(listGetter, Objects::equals);
-            return this;
-        }
-
-        <T> boolean listsEqualish(Function<E, ? extends List<T>> listGetter, BiPredicate<T, T> equalish) {
-            if (!conclusion) return false;
-            List<T> list0 = listGetter.apply(object);
-            List<T> list1 = listGetter.apply(other);
-            if (list0 == list1) return true;  // e.g., they are both null
-            if (list0.size() != list1.size()) return false;
-            for (int i = 0; i < list0.size(); i++) {
-                if (!equalish.test(list0.get(i), list1.get(i))) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /** Conclude false if the two properties are not equal as objects. */
-        <T> ComparisonMachine<E> equalAsObjects(Function<E, T> propertyGetter) {
-            return equalAsObjectsModulo(propertyGetter, Function.identity());
-        }
-
-        /**
-         * Conclude false if the two properties are not equal as objects,
-         * given that {@code projectionToClassRepresentatives} maps each
-         * object to some semantically equivalent object.
-         */
-        <T> ComparisonMachine<E> equalAsObjectsModulo(
-            Function<E, T> propertyGetter,
-            Function<T, T> projectionToClassRepresentatives
-        ) {
-            if (propertyGetter.apply(object) instanceof EObject) {
-                throw new IllegalArgumentException(
-                    "EObjects should be compared for semantic equivalence, not object equality."
-                );
-            }
-            propertyGetter = projectionToClassRepresentatives.compose(propertyGetter);
-            if (conclusion) conclusion = Objects.equals(propertyGetter.apply(object), propertyGetter.apply(other));
-            return this;
-        }
-
-        /**
-         * Conclude false if the two properties are not semantically equivalent
-         * parse nodes.
-         */
-        <T extends EObject> ComparisonMachine<E> equivalent(Function<E, T> propertyGetter) {
-            return equivalentModulo(propertyGetter, Function.identity());
-        }
-
-        /**
-         * Conclude false if the two properties are not semantically equivalent
-         * parse nodes, given that {@code projectionToClassRepresentatives}
-         * maps each parse node to some semantically equivalent node.
-         */
-        <T extends EObject> ComparisonMachine<E> equivalentModulo(
-            Function<E, T> propertyGetter,
-            Function<T, T> projectionToClassRepresentatives
-        ) {
-            propertyGetter = projectionToClassRepresentatives.compose(propertyGetter);
-            if (conclusion) conclusion = new IsEqual(propertyGetter.apply(object))
-                .doSwitch(propertyGetter.apply(other));
-            return this;
+                .map(Class::getName)
+                .map(it -> it + (it.endsWith("s") ? "es" : "s"))
+                .collect(Collectors.joining(" or "))));
+  }
+
+  /** Fluently compare a pair of parse tree nodes for equivalence. */
+  private class ComparisonMachine<E extends EObject> {
+    private final E object;
+    private final E other;
+    private boolean conclusion;
+
+    ComparisonMachine(E object, Class<E> clz) {
+      this.object = object;
+      this.conclusion = clz.isInstance(otherObject);
+      this.other = conclusion ? clz.cast(otherObject) : null;
+    }
+
+    /** Conclude false if the two given Lists are different as EObject sequences. Order matters. */
+    <T extends EObject> ComparisonMachine<E> listsEquivalent(Function<E, List<T>> listGetter) {
+      if (conclusion)
+        conclusion = listsEqualish(listGetter, (T a, T b) -> new IsEqual(a).doSwitch(b));
+      return this;
+    }
+
+    /** Conclude false if the two given Lists are different as object sequences. Order matters. */
+    <T> ComparisonMachine<E> listsEqualAsObjects(Function<E, List<T>> listGetter) {
+      if (conclusion) conclusion = listsEqualish(listGetter, Objects::equals);
+      return this;
+    }
+
+    <T> boolean listsEqualish(
+        Function<E, ? extends List<T>> listGetter, BiPredicate<T, T> equalish) {
+      if (!conclusion) return false;
+      List<T> list0 = listGetter.apply(object);
+      List<T> list1 = listGetter.apply(other);
+      if (list0 == list1) return true; // e.g., they are both null
+      if (list0.size() != list1.size()) return false;
+      for (int i = 0; i < list0.size(); i++) {
+        if (!equalish.test(list0.get(i), list1.get(i))) {
+          return false;
         }
-    }
+      }
+      return true;
+    }
+
+    /** Conclude false if the two properties are not equal as objects. */
+    <T> ComparisonMachine<E> equalAsObjects(Function<E, T> propertyGetter) {
+      return equalAsObjectsModulo(propertyGetter, Function.identity());
+    }
+
+    /**
+     * Conclude false if the two properties are not equal as objects, given that {@code
+     * projectionToClassRepresentatives} maps each object to some semantically equivalent object.
+     */
+    <T> ComparisonMachine<E> equalAsObjectsModulo(
+        Function<E, T> propertyGetter, Function<T, T> projectionToClassRepresentatives) {
+      if (propertyGetter.apply(object) instanceof EObject) {
+        throw new IllegalArgumentException(
+            "EObjects should be compared for semantic equivalence, not object equality.");
+      }
+      propertyGetter = projectionToClassRepresentatives.compose(propertyGetter);
+      if (conclusion)
+        conclusion = Objects.equals(propertyGetter.apply(object), propertyGetter.apply(other));
+      return this;
+    }
+
+    /** Conclude false if the two properties are not semantically equivalent parse nodes. */
+    <T extends EObject> ComparisonMachine<E> equivalent(Function<E, T> propertyGetter) {
+      return equivalentModulo(propertyGetter, Function.identity());
+    }
+
+    /**
+     * Conclude false if the two properties are not semantically equivalent parse nodes, given that
+     * {@code projectionToClassRepresentatives} maps each parse node to some semantically equivalent
+     * node.
+     */
+    <T extends EObject> ComparisonMachine<E> equivalentModulo(
+        Function<E, T> propertyGetter, Function<T, T> projectionToClassRepresentatives) {
+      propertyGetter = projectionToClassRepresentatives.compose(propertyGetter);
+      if (conclusion)
+        conclusion =
+            new IsEqual(propertyGetter.apply(object)).doSwitch(propertyGetter.apply(other));
+      return this;
+    }
+  }
 }
diff --git a/org.lflang/src/org/lflang/ast/ToLf.java b/org.lflang/src/org/lflang/ast/ToLf.java
index 7ecf04684f..9505c57478 100644
--- a/org.lflang/src/org/lflang/ast/ToLf.java
+++ b/org.lflang/src/org/lflang/ast/ToLf.java
@@ -20,7 +20,6 @@
 import org.eclipse.xtext.nodemodel.INode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
-
 import org.lflang.Target;
 import org.lflang.ast.MalleableString.Builder;
 import org.lflang.ast.MalleableString.Joiner;
@@ -219,11 +218,7 @@ public MalleableString caseCode(Code code) {
             .map(String::stripTrailing)
             .collect(Collectors.joining("\n"));
     MalleableString singleLineRepresentation =
-        new Builder()
-            .append("{= ")
-            .append(content.strip())
-            .append(" =}")
-            .get();
+        new Builder().append("{= ").append(content.strip()).append(" =}").get();
     MalleableString multilineRepresentation =
         new Builder()
             .append(String.format("{=%n"))
diff --git a/org.lflang/src/org/lflang/ast/ToText.java b/org.lflang/src/org/lflang/ast/ToText.java
index 4d02d4ed08..f1d47b7c69 100644
--- a/org.lflang/src/org/lflang/ast/ToText.java
+++ b/org.lflang/src/org/lflang/ast/ToText.java
@@ -4,7 +4,6 @@
 import org.eclipse.xtext.nodemodel.ICompositeNode;
 import org.eclipse.xtext.nodemodel.ILeafNode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
-
 import org.lflang.lf.ArraySpec;
 import org.lflang.lf.BracedListExpression;
 import org.lflang.lf.Code;
@@ -19,112 +18,115 @@
 import org.lflang.lf.util.LfSwitch;
 import org.lflang.util.StringUtil;
 
-
 /**
- * Switch class for converting AST nodes to some textual representation that seems likely
- * to be useful for as many code generators as possible.
+ * Switch class for converting AST nodes to some textual representation that seems likely to be
+ * useful for as many code generators as possible.
  */
 public class ToText extends LfSwitch<String> {
 
-    /// public instance initialized when loading the class
-    public static final ToText instance = new ToText();
-
-    // private constructor
-    private ToText() { super(); }
-
-    @Override
-    public String caseArraySpec(ArraySpec spec) {
-        return ToLf.instance.doSwitch(spec).toString();
-    }
-
-    @Override
-    public String caseCodeExpr(CodeExpr object) {
-        return caseCode(object.getCode());
+  /// public instance initialized when loading the class
+  public static final ToText instance = new ToText();
+
+  // private constructor
+  private ToText() {
+    super();
+  }
+
+  @Override
+  public String caseArraySpec(ArraySpec spec) {
+    return ToLf.instance.doSwitch(spec).toString();
+  }
+
+  @Override
+  public String caseCodeExpr(CodeExpr object) {
+    return caseCode(object.getCode());
+  }
+
+  @Override
+  public String caseCode(Code code) {
+    ICompositeNode node = NodeModelUtils.getNode(code);
+    if (node != null) {
+      StringBuilder builder = new StringBuilder(Math.max(node.getTotalLength(), 1));
+      for (ILeafNode leaf : node.getLeafNodes()) {
+        builder.append(leaf.getText());
+      }
+      String str = builder.toString().trim();
+      // Remove the code delimiters (and any surrounding comments).
+      // This assumes any comment before {= does not include {=.
+      int start = str.indexOf("{=");
+      int end = str.lastIndexOf("=}");
+      if (start == -1 || end == -1) {
+        // Silent failure is needed here because toText is needed to create the intermediate
+        // representation,
+        // which the validator uses.
+        return str;
+      }
+      str = str.substring(start + 2, end);
+      if (str.split("\n").length > 1) {
+        // multi line code
+        return StringUtil.trimCodeBlock(str, 1);
+      } else {
+        // single line code
+        return str.trim();
+      }
+    } else if (code.getBody() != null) {
+      // Code must have been added as a simple string.
+      return code.getBody();
     }
-
-    @Override
-    public String caseCode(Code code) {
-        ICompositeNode node = NodeModelUtils.getNode(code);
-        if (node != null) {
-            StringBuilder builder = new StringBuilder(Math.max(node.getTotalLength(), 1));
-            for (ILeafNode leaf : node.getLeafNodes()) {
-                builder.append(leaf.getText());
-            }
-            String str = builder.toString().trim();
-            // Remove the code delimiters (and any surrounding comments).
-            // This assumes any comment before {= does not include {=.
-            int start = str.indexOf("{=");
-            int end = str.lastIndexOf("=}");
-            if (start == -1 || end == -1) {
-                // Silent failure is needed here because toText is needed to create the intermediate representation,
-                // which the validator uses.
-                return str;
-            }
-            str = str.substring(start + 2, end);
-            if (str.split("\n").length > 1) {
-                // multi line code
-                return StringUtil.trimCodeBlock(str, 1);
-            } else {
-                // single line code
-                return str.trim();
-            }
-        } else if (code.getBody() != null) {
-            // Code must have been added as a simple string.
-            return code.getBody();
-        }
-        return "";
-    }
-
-    @Override
-    public String caseBracedListExpression(BracedListExpression object) {
-        return ToLf.instance.caseBracedListExpression(object).toString();
+    return "";
+  }
+
+  @Override
+  public String caseBracedListExpression(BracedListExpression object) {
+    return ToLf.instance.caseBracedListExpression(object).toString();
+  }
+
+  @Override
+  public String caseHost(Host host) {
+    return ToLf.instance.caseHost(host).toString();
+  }
+
+  @Override
+  public String caseLiteral(Literal l) {
+    return ToLf.instance.caseLiteral(l).toString();
+  }
+
+  @Override
+  public String caseParameterReference(ParameterReference p) {
+    return ToLf.instance.caseParameterReference(p).toString();
+  }
+
+  @Override
+  public String caseTime(Time t) {
+    return ToLf.instance.caseTime(t).toString();
+  }
+
+  @Override
+  public String caseType(Type type) {
+    if (type.getCode() != null) {
+      return caseCode(type.getCode());
     }
-
-    @Override
-    public String caseHost(Host host) {
-        return ToLf.instance.caseHost(host).toString();
-    }
-
-    @Override
-    public String caseLiteral(Literal l) {
-        return ToLf.instance.caseLiteral(l).toString();
+    return ToLf.instance.caseType(type).toString();
+  }
+
+  @Override
+  public String caseTypeParm(TypeParm t) {
+    if (t.getCode() != null) return doSwitch(t.getCode());
+    return ToLf.instance.caseTypeParm(t).toString();
+  }
+
+  @Override
+  public String caseVarRef(VarRef v) {
+    if (v.getContainer() != null) {
+      return String.format("%s.%s", v.getContainer().getName(), v.getVariable().getName());
+    } else {
+      return v.getVariable().getName();
     }
+  }
 
-    @Override
-    public String caseParameterReference(ParameterReference p) {
-        return ToLf.instance.caseParameterReference(p).toString();
-    }
-
-    @Override
-    public String caseTime(Time t) {
-        return ToLf.instance.caseTime(t).toString();
-    }
-
-    @Override
-    public String caseType(Type type) {
-        if (type.getCode() != null) {
-            return caseCode(type.getCode());
-        }
-        return ToLf.instance.caseType(type).toString();
-    }
-
-    @Override
-    public String caseTypeParm(TypeParm t) {
-        if (t.getCode() != null) return doSwitch(t.getCode());
-        return ToLf.instance.caseTypeParm(t).toString();
-    }
-
-    @Override
-    public String caseVarRef(VarRef v) {
-        if (v.getContainer() != null) {
-            return String.format("%s.%s", v.getContainer().getName(), v.getVariable().getName());
-        } else {
-            return v.getVariable().getName();
-        }
-    }
-
-    @Override
-    public String defaultCase(EObject object) {
-        throw new UnsupportedOperationException("ToText has no case for " + object.getClass().getName());
-    }
+  @Override
+  public String defaultCase(EObject object) {
+    throw new UnsupportedOperationException(
+        "ToText has no case for " + object.getClass().getName());
+  }
 }
diff --git a/org.lflang/src/org/lflang/cli/CliBase.java b/org.lflang/src/org/lflang/cli/CliBase.java
index 2f4a9d849c..a6c1c805ed 100644
--- a/org.lflang/src/org/lflang/cli/CliBase.java
+++ b/org.lflang/src/org/lflang/cli/CliBase.java
@@ -1,26 +1,21 @@
 package org.lflang.cli;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonParser;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.Provider;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Arrays;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map.Entry;
-import java.util.Properties;
 import java.util.Set;
 import java.util.stream.Collectors;
-
-import picocli.CommandLine;
-import picocli.CommandLine.ArgGroup;
-import picocli.CommandLine.Command;
-import picocli.CommandLine.Model.CommandSpec;
-import picocli.CommandLine.Option;
-import picocli.CommandLine.Parameters;
-import picocli.CommandLine.Spec;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -28,18 +23,16 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.eclipse.xtext.validation.Issue;
-
 import org.lflang.ErrorReporter;
 import org.lflang.LFRuntimeModule;
 import org.lflang.LFStandaloneSetup;
 import org.lflang.util.FileUtil;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonParseException;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.Provider;
+import picocli.CommandLine;
+import picocli.CommandLine.ArgGroup;
+import picocli.CommandLine.Model.CommandSpec;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.Parameters;
+import picocli.CommandLine.Spec;
 
 /**
  * Base class for standalone CLI applications.
@@ -50,318 +43,277 @@
  * @author Atharva Patil
  */
 public abstract class CliBase implements Runnable {
-    /**
-     * Models a command specification, including the options, positional
-     * parameters and subcommands supported by the command.
-     */
-    @Spec CommandSpec spec;
-
-    /**
-     * Options and parameters present in both Lfc and Lff.
-     */
-    static class MutuallyExclusive {
-         @Parameters(
-         arity = "1..",
-         paramLabel = "FILES",
-         description = "Paths to one or more Lingua Franca programs.")
-             protected List<Path> files;
-
-         @Option(
-         names="--json",
-         description="JSON object containing CLI arguments.")
-             private String jsonString;
-
-         @Option(
-         names="--json-file",
-         description="JSON file containing CLI arguments.")
-             private Path jsonFile;
-     }
-
-     @ArgGroup(exclusive = true, multiplicity = "1")
-     MutuallyExclusive topLevelArg;
-
-     @Option(
-     names = {"-o", "--output-path"},
-     defaultValue = "",
-     fallbackValue = "",
-     description = "Specify the root output directory.")
-         private Path outputPath;
-
-    /**
-     * Used to collect all errors that happen during validation/generation.
-     */
-    @Inject
-    protected IssueCollector issueCollector;
-
-    /**
-     * Used to report error messages at the end.
-     */
-    @Inject
-    protected ReportingBackend reporter;
-
-    /**
-     * Used to report error messages at the end.
-     */
-    @Inject
-    protected ErrorReporter errorReporter;
-
-    /**
-     * IO context of this run.
-     */
-    @Inject
-    protected Io io;
-    
-    /**
-     * Injected resource provider.
-     */
-    @Inject
-    private Provider<ResourceSet> resourceSetProvider;
-    
-    /**
-     * Injected resource validator.
-     */
-    @Inject
-    private IResourceValidator validator;
-
-    protected static void cliMain(
-            String toolName, Class<? extends CliBase> toolClass,
-            Io io, String[] args) {
-        // Injector used to obtain Main instance.
-        final Injector injector = getInjector(toolName, io);
-        // Main instance.
-        final CliBase main = injector.getInstance(toolClass);
-        // Parse arguments and execute main logic.
-        main.doExecute(io, args);
-    }
-
-    public void doExecute(Io io, String[] args) {
-        CommandLine cmd = new CommandLine(this)
+  /**
+   * Models a command specification, including the options, positional parameters and subcommands
+   * supported by the command.
+   */
+  @Spec CommandSpec spec;
+
+  /** Options and parameters present in both Lfc and Lff. */
+  static class MutuallyExclusive {
+    @Parameters(
+        arity = "1..",
+        paramLabel = "FILES",
+        description = "Paths to one or more Lingua Franca programs.")
+    protected List<Path> files;
+
+    @Option(names = "--json", description = "JSON object containing CLI arguments.")
+    private String jsonString;
+
+    @Option(names = "--json-file", description = "JSON file containing CLI arguments.")
+    private Path jsonFile;
+  }
+
+  @ArgGroup(exclusive = true, multiplicity = "1")
+  MutuallyExclusive topLevelArg;
+
+  @Option(
+      names = {"-o", "--output-path"},
+      defaultValue = "",
+      fallbackValue = "",
+      description = "Specify the root output directory.")
+  private Path outputPath;
+
+  /** Used to collect all errors that happen during validation/generation. */
+  @Inject protected IssueCollector issueCollector;
+
+  /** Used to report error messages at the end. */
+  @Inject protected ReportingBackend reporter;
+
+  /** Used to report error messages at the end. */
+  @Inject protected ErrorReporter errorReporter;
+
+  /** IO context of this run. */
+  @Inject protected Io io;
+
+  /** Injected resource provider. */
+  @Inject private Provider<ResourceSet> resourceSetProvider;
+
+  /** Injected resource validator. */
+  @Inject private IResourceValidator validator;
+
+  protected static void cliMain(
+      String toolName, Class<? extends CliBase> toolClass, Io io, String[] args) {
+    // Injector used to obtain Main instance.
+    final Injector injector = getInjector(toolName, io);
+    // Main instance.
+    final CliBase main = injector.getInstance(toolClass);
+    // Parse arguments and execute main logic.
+    main.doExecute(io, args);
+  }
+
+  public void doExecute(Io io, String[] args) {
+    CommandLine cmd =
+        new CommandLine(this)
             .setOut(new PrintWriter(io.getOut()))
             .setErr(new PrintWriter(io.getErr()));
-        int exitCode = cmd.execute(args);
-        io.callSystemExit(exitCode);
+    int exitCode = cmd.execute(args);
+    io.callSystemExit(exitCode);
+  }
+
+  /**
+   * The entrypoint of Picocli applications - the first method called when CliBase, which implements
+   * the Runnable interface, is instantiated.
+   */
+  public void run() {
+    // If args are given in a json file, store its contents in jsonString.
+    if (topLevelArg.jsonFile != null) {
+      try {
+        topLevelArg.jsonString =
+            new String(Files.readAllBytes(io.getWd().resolve(topLevelArg.jsonFile)));
+      } catch (IOException e) {
+        reporter.printFatalErrorAndExit("No such file: " + topLevelArg.jsonFile);
+      }
     }
-
-    /**
-     * The entrypoint of Picocli applications - the first method called when 
-     * CliBase, which implements the Runnable interface, is instantiated.
-     */ 
-    public void run() {
-        // If args are given in a json file, store its contents in jsonString.
-        if (topLevelArg.jsonFile != null) {
-            try {
-                topLevelArg.jsonString = new String(Files.readAllBytes(
-                        io.getWd().resolve(topLevelArg.jsonFile)));
-            } catch (IOException e) {
-                reporter.printFatalErrorAndExit(
-                        "No such file: " + topLevelArg.jsonFile);
-            }
-        }
-        // If args are given in a json string, unpack them and re-run
-        // picocli argument validation.
-        if (topLevelArg.jsonString != null) {
-            // Unpack args from json string.
-            String[] args = jsonStringToArgs(topLevelArg.jsonString);
-            // Execute application on unpacked args.
-            CommandLine cmd = spec.commandLine();
-            cmd.execute(args);
-        // If args are already unpacked, invoke tool-specific logic.
-        } else {
-            doRun();
-        }
+    // If args are given in a json string, unpack them and re-run
+    // picocli argument validation.
+    if (topLevelArg.jsonString != null) {
+      // Unpack args from json string.
+      String[] args = jsonStringToArgs(topLevelArg.jsonString);
+      // Execute application on unpacked args.
+      CommandLine cmd = spec.commandLine();
+      cmd.execute(args);
+      // If args are already unpacked, invoke tool-specific logic.
+    } else {
+      doRun();
     }
-
-    /*
-     * The entrypoint of tool-specific logic.
-     * Lfc and Lff have their own specific implementations for this method.
-     */
-    public abstract void doRun();
-
-    public static Injector getInjector(String toolName, Io io) {
-        final ReportingBackend reporter 
-            = new ReportingBackend(io, toolName + ": ");
-
-        // Injector used to obtain Main instance.
-        return new LFStandaloneSetup(
-            new LFRuntimeModule(),
-            new LFStandaloneModule(reporter, io)
-        ).createInjectorAndDoEMFRegistration();
+  }
+
+  /*
+   * The entrypoint of tool-specific logic.
+   * Lfc and Lff have their own specific implementations for this method.
+   */
+  public abstract void doRun();
+
+  public static Injector getInjector(String toolName, Io io) {
+    final ReportingBackend reporter = new ReportingBackend(io, toolName + ": ");
+
+    // Injector used to obtain Main instance.
+    return new LFStandaloneSetup(new LFRuntimeModule(), new LFStandaloneModule(reporter, io))
+        .createInjectorAndDoEMFRegistration();
+  }
+
+  /** Resolve to an absolute path, in the given {@link #io} context. */
+  protected Path toAbsolutePath(Path other) {
+    return io.getWd().resolve(other).toAbsolutePath();
+  }
+
+  /**
+   * Returns the validated input paths.
+   *
+   * @return Validated input paths.
+   */
+  protected List<Path> getInputPaths() {
+    List<Path> paths =
+        topLevelArg.files.stream().map(io.getWd()::resolve).collect(Collectors.toList());
+
+    for (Path path : paths) {
+      if (!Files.exists(path)) {
+        reporter.printFatalErrorAndExit(path + ": No such file or directory.");
+      }
     }
 
-    /**
-     * Resolve to an absolute path, in the given {@link #io} context.
-     */
-    protected Path toAbsolutePath(Path other) {
-        return io.getWd().resolve(other).toAbsolutePath();
+    return paths;
+  }
+
+  /**
+   * Returns the validated, normalized output path.
+   *
+   * @return Validated, normalized output path.
+   */
+  protected Path getOutputRoot() {
+    Path root = null;
+    if (!outputPath.toString().isEmpty()) {
+      root = io.getWd().resolve(outputPath).normalize();
+      if (!Files.exists(root)) { // FIXME: Create it instead?
+        reporter.printFatalErrorAndExit(root + ": Output location does not exist.");
+      }
+      if (!Files.isDirectory(root)) {
+        reporter.printFatalErrorAndExit(root + ": Output location is not a directory.");
+      }
     }
 
-    /**
-     * Returns the validated input paths.
-     *
-     * @return Validated input paths.
-     */
-    protected List<Path> getInputPaths() {
-        List<Path> paths = topLevelArg.files.stream()
-            .map(io.getWd()::resolve)
-            .collect(Collectors.toList());
-
-        for (Path path : paths) {
-            if (!Files.exists(path)) {
-                reporter.printFatalErrorAndExit(
-                    path + ": No such file or directory.");
-            }
-        }
-
-        return paths;
+    return root;
+  }
+
+  /** If some errors were collected, print them and abort execution. Otherwise, return. */
+  protected void exitIfCollectedErrors() {
+    if (issueCollector.getErrorsOccurred()) {
+      // if there are errors, don't print warnings.
+      List<LfIssue> errors = printErrorsIfAny();
+      String cause = errors.size() + " previous error";
+      if (errors.size() > 1) {
+        cause += 's';
+      }
+      reporter.printFatalErrorAndExit("Aborting due to " + cause + '.');
     }
-
-    /**
-     * Returns the validated, normalized output path.
-     *
-     * @return Validated, normalized output path.
-     */
-    protected Path getOutputRoot() {
-        Path root = null;
-        if (!outputPath.toString().isEmpty()) {
-            root = io.getWd().resolve(outputPath).normalize();
-            if (!Files.exists(root)) { // FIXME: Create it instead?
-                reporter.printFatalErrorAndExit(
-                    root + ": Output location does not exist.");
-            }
-            if (!Files.isDirectory(root)) {
-                reporter.printFatalErrorAndExit(
-                    root + ": Output location is not a directory.");
-            }
+  }
+
+  /**
+   * If any errors were collected, print them, then return them.
+   *
+   * @return A list of collected errors.
+   */
+  public List<LfIssue> printErrorsIfAny() {
+    List<LfIssue> errors = issueCollector.getErrors();
+    errors.forEach(reporter::printIssue);
+    return errors;
+  }
+
+  /**
+   * Validates a given resource. If issues arise during validation, these are recorded using the
+   * issue collector.
+   *
+   * @param resource The resource to validate.
+   */
+  public void validateResource(Resource resource) {
+    assert resource != null;
+
+    List<Issue> issues = this.validator.validate(resource, CheckMode.ALL, CancelIndicator.NullImpl);
+
+    for (Issue issue : issues) {
+      // Issues may also relate to imported resources.
+      URI uri = issue.getUriToProblem();
+      Path path = null;
+      if (uri != null) {
+        try {
+          path = FileUtil.toPath(uri);
+        } catch (IOException e) {
+          reporter.printError("Unable to convert '" + uri + "' to path." + e);
         }
-
-        return root;
+      }
+      issueCollector.accept(
+          new LfIssue(
+              issue.getMessage(),
+              issue.getSeverity(),
+              issue.getLineNumber(),
+              issue.getColumn(),
+              issue.getLineNumberEnd(),
+              issue.getColumnEnd(),
+              issue.getLength(),
+              path));
     }
-
-    /**
-     * If some errors were collected, print them and abort execution.
-     * Otherwise, return.
-     */
-    protected void exitIfCollectedErrors() {
-        if (issueCollector.getErrorsOccurred()) {
-            // if there are errors, don't print warnings.
-            List<LfIssue> errors = printErrorsIfAny();
-            String cause = errors.size() + " previous error";
-            if (errors.size() > 1) {
-                cause += 's';
-            }
-            reporter.printFatalErrorAndExit("Aborting due to " + cause + '.');
-        }
+  }
+
+  /**
+   * Obtains a resource from a path. Returns null if path is not an LF file.
+   *
+   * @param path The path to obtain the resource from.
+   * @return The obtained resource. Set to null if path is not an LF file.
+   */
+  public Resource getResource(Path path) {
+    final ResourceSet set = this.resourceSetProvider.get();
+    try {
+      return set.getResource(URI.createFileURI(path.toString()), true);
+    } catch (RuntimeException e) {
+      return null;
     }
+  }
 
-    /**
-     * If any errors were collected, print them, then return them.
-     * @return A list of collected errors.
-     */
-    public List<LfIssue> printErrorsIfAny() {
-        List<LfIssue> errors = issueCollector.getErrors();
-        errors.forEach(reporter::printIssue);
-        return errors;
-    }
+  private String[] jsonStringToArgs(String jsonString) {
+    ArrayList<String> argsList = new ArrayList<>();
+    JsonObject jsonObject = new JsonObject();
 
-    /**
-     * Validates a given resource. If issues arise during validation,
-     * these are recorded using the issue collector.
-     *
-     * @param resource The resource to validate.
-     */
-    public void validateResource(Resource resource) {
-        assert resource != null;
-
-        List<Issue> issues = this.validator.validate(
-            resource, CheckMode.ALL, CancelIndicator.NullImpl);
-
-        for (Issue issue : issues) {
-            // Issues may also relate to imported resources.
-            URI uri = issue.getUriToProblem();
-            Path path = null;
-            if (uri != null) {
-                try {
-                    path = FileUtil.toPath(uri);
-                } catch (IOException e) {
-                    reporter.printError("Unable to convert '" + uri + "' to path." + e);
-                }
-            }
-            issueCollector.accept(
-                new LfIssue(
-                    issue.getMessage(),
-                    issue.getSeverity(),
-                    issue.getLineNumber(),
-                    issue.getColumn(),
-                    issue.getLineNumberEnd(),
-                    issue.getColumnEnd(),
-                    issue.getLength(),
-                    path));
-        }
+    // Parse JSON string and get top-level JSON object.
+    try {
+      jsonObject = JsonParser.parseString(jsonString).getAsJsonObject();
+    } catch (JsonParseException e) {
+      reporter.printFatalErrorAndExit(String.format("Invalid JSON string:%n %s", jsonString));
     }
-
-    /**
-     * Obtains a resource from a path. Returns null if path is not an LF file.
-     *
-     * @param path The path to obtain the resource from.
-     * @return The obtained resource. Set to null if path is not an LF file.
-     */
-    public Resource getResource(Path path) {
-        final ResourceSet set = this.resourceSetProvider.get();
-        try {
-            return set.getResource(URI.createFileURI(path.toString()), true);
-        } catch (RuntimeException e) {
-            return null;
-        }
+    // Append input paths.
+    JsonElement src = jsonObject.get("src");
+    if (src == null) {
+      reporter.printFatalErrorAndExit("JSON Parse Exception: field \"src\" not found.");
+    }
+    argsList.add(src.getAsString());
+    // Append output path if given.
+    JsonElement out = jsonObject.get("out");
+    if (out != null) {
+      argsList.add("--output-path");
+      argsList.add(out.getAsString());
     }
 
-    private String[] jsonStringToArgs(String jsonString) {
-        ArrayList<String> argsList = new ArrayList<>();
-        JsonObject jsonObject = new JsonObject();
-
-        // Parse JSON string and get top-level JSON object.
-        try {
-            jsonObject = JsonParser.parseString(jsonString).getAsJsonObject();
-        } catch (JsonParseException e) {
-            reporter.printFatalErrorAndExit(
-                    String.format("Invalid JSON string:%n %s", jsonString));
-        }
-        // Append input paths.
-        JsonElement src = jsonObject.get("src");
-        if (src == null) {
-            reporter.printFatalErrorAndExit(
-                    "JSON Parse Exception: field \"src\" not found.");
-        }
-        argsList.add(src.getAsString());
-        // Append output path if given.
-        JsonElement out = jsonObject.get("out");
-        if (out != null) {
-            argsList.add("--output-path");
-            argsList.add(out.getAsString());
-        }
-
-        // If there are no other properties, return args array.
-        JsonElement properties = jsonObject.get("properties");
-        if (properties != null) {
-            // Get the remaining properties.
-            Set<Entry<String, JsonElement>> entrySet = properties
-                .getAsJsonObject()
-                .entrySet();
-            // Append the remaining properties to the args array.
-            for(Entry<String,JsonElement> entry : entrySet) {
-                String property = entry.getKey();
-                String value = entry.getValue().getAsString();
-
-                // Append option.
-                argsList.add("--" + property);
-                // Append argument for non-boolean options.
-                if (value != "true" || property == "threading") {
-                    argsList.add(value);
-                }
-            }
+    // If there are no other properties, return args array.
+    JsonElement properties = jsonObject.get("properties");
+    if (properties != null) {
+      // Get the remaining properties.
+      Set<Entry<String, JsonElement>> entrySet = properties.getAsJsonObject().entrySet();
+      // Append the remaining properties to the args array.
+      for (Entry<String, JsonElement> entry : entrySet) {
+        String property = entry.getKey();
+        String value = entry.getValue().getAsString();
+
+        // Append option.
+        argsList.add("--" + property);
+        // Append argument for non-boolean options.
+        if (value != "true" || property == "threading") {
+          argsList.add(value);
         }
-
-        // Return as String[].
-        String[] args = argsList.toArray(new String[argsList.size()]);
-        return args;
+      }
     }
+
+    // Return as String[].
+    String[] args = argsList.toArray(new String[argsList.size()]);
+    return args;
+  }
 }
diff --git a/org.lflang/src/org/lflang/cli/LFStandaloneModule.java b/org.lflang/src/org/lflang/cli/LFStandaloneModule.java
index 8b85e49282..abf01bfcd3 100644
--- a/org.lflang/src/org/lflang/cli/LFStandaloneModule.java
+++ b/org.lflang/src/org/lflang/cli/LFStandaloneModule.java
@@ -28,49 +28,45 @@
 
 package org.lflang.cli;
 
+import com.google.inject.Binder;
+import com.google.inject.Module;
 import java.util.Objects;
-
 import org.eclipse.emf.ecore.EValidator;
 import org.eclipse.emf.ecore.impl.EValidatorRegistryImpl;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
-
 import org.lflang.ErrorReporter;
 import org.lflang.LFRuntimeModule;
 
-import com.google.inject.Binder;
-import com.google.inject.Module;
-
 /**
- * Module that is only available when running LFC as a
- * standalone program.
+ * Module that is only available when running LFC as a standalone program.
  *
  * @see LFRuntimeModule
  */
 public class LFStandaloneModule implements Module {
-    // Note that xtext's base module classes has broken support
-    // for @Provides, which would allow us to bind this field.
-    // So we directly implement Module, instead of extending eg LFRuntimeModule.
-    private final ReportingBackend helper;
-    private final Io io;
+  // Note that xtext's base module classes has broken support
+  // for @Provides, which would allow us to bind this field.
+  // So we directly implement Module, instead of extending eg LFRuntimeModule.
+  private final ReportingBackend helper;
+  private final Io io;
 
-    public LFStandaloneModule(ReportingBackend helper, Io io) {
-        this.helper = Objects.requireNonNull(helper);
-        this.io = Objects.requireNonNull(io);
-    }
+  public LFStandaloneModule(ReportingBackend helper, Io io) {
+    this.helper = Objects.requireNonNull(helper);
+    this.io = Objects.requireNonNull(io);
+  }
 
-    @Override
-    public void configure(Binder binder) {
-        binder.bind(ErrorReporter.class).to(StandaloneErrorReporter.class);
-        binder.bind(ReportingBackend.class).toInstance(helper);
-        binder.bind(Io.class).toInstance(io);
-        binder.bind(ValidationMessageAcceptor.class).to(StandaloneIssueAcceptor.class);
-        // This is required to force the ResourceValidator to
-        // use a new registry instance (which is reused by the injector as a singleton).
-        // Otherwise, it uses the static EValidator.Registry.INSTANCE which is bad
-        // as the first validator to be created would persist in that static instance.
-        // New injectors would reuse the existing instance, but
-        // its fields would have been injected by an older injector
-        // and be out of sync with the rest of the application.
-        binder.bind(EValidator.Registry.class).to(EValidatorRegistryImpl.class).asEagerSingleton();
-    }
+  @Override
+  public void configure(Binder binder) {
+    binder.bind(ErrorReporter.class).to(StandaloneErrorReporter.class);
+    binder.bind(ReportingBackend.class).toInstance(helper);
+    binder.bind(Io.class).toInstance(io);
+    binder.bind(ValidationMessageAcceptor.class).to(StandaloneIssueAcceptor.class);
+    // This is required to force the ResourceValidator to
+    // use a new registry instance (which is reused by the injector as a singleton).
+    // Otherwise, it uses the static EValidator.Registry.INSTANCE which is bad
+    // as the first validator to be created would persist in that static instance.
+    // New injectors would reuse the existing instance, but
+    // its fields would have been injected by an older injector
+    // and be out of sync with the rest of the application.
+    binder.bind(EValidator.Registry.class).to(EValidatorRegistryImpl.class).asEagerSingleton();
+  }
 }
diff --git a/org.lflang/src/org/lflang/cli/Lfc.java b/org.lflang/src/org/lflang/cli/Lfc.java
index 3ef52e54a0..19869f9394 100644
--- a/org.lflang/src/org/lflang/cli/Lfc.java
+++ b/org.lflang/src/org/lflang/cli/Lfc.java
@@ -1,27 +1,22 @@
 package org.lflang.cli;
 
-
+import com.google.inject.Inject;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Properties;
-
-import picocli.CommandLine.Command;
-import picocli.CommandLine.Option;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.GeneratorDelegate;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
 import org.eclipse.xtext.util.CancelIndicator;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.FileConfig;
 import org.lflang.TargetProperty.UnionType;
-
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.LFGeneratorContext.BuildParm;
 import org.lflang.generator.MainContext;
-
-import com.google.inject.Inject;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
 
 /**
  * Standalone version of the Lingua Franca compiler (lfc).
@@ -36,287 +31,261 @@
     mixinStandardHelpOptions = true,
     versionProvider = VersionProvider.class)
 public class Lfc extends CliBase {
-    /**
-     * Injected code generator.
-     */
-    @Inject
-    private GeneratorDelegate generator;
-
-    /**
-     * Injected file access object.
-     */
-    @Inject
-    private JavaIoFileSystemAccess fileAccess;
-
-    /*
-     * Supported CLI options.
-     */
-
-    @Option(
-        names = "--build-type",
-        description = "The build type to use.")
-    private String buildType;
-
-    @Option(
-        names = {"-c", "--clean"},
-        arity = "0",
-        description = "Clean before building.")
-    private boolean clean;
-
-    @Option(
-        names = "--target-compiler",
-        description = "Target compiler to invoke.")
-    private String targetCompiler;
-
-    @Option(
-        names = "--external-runtime-path",
-        description = "Specify an external runtime library to be used by the"
-                    + " compiled binary.")
-    private Path externalRuntimePath;
-
-    @Option(
-        names = {"-f", "--federated"},
-        arity = "0",
-        description = "Treat main reactor as federated.")
-    private boolean federated;
-
-    @Option(
-        names = "--logging",
-        description = "The logging level to use by the generated binary")
-    private String logging;
-
-    @Option(
-        names = {"-l", "--lint"},
-        arity = "0",
-        description = "Enable linting of generated code.")
-    private boolean lint;
-
-    @Option(
-        names = {"-n", "--no-compile"},
-        arity = "0",
-        description = "Do not invoke target compiler.")
-    private boolean noCompile;
-
-    @Option(
-        names = {"--print-statistics"},
-        arity = "0",
-        description = "Instruct the runtime to collect and print statistics.")
-    private boolean printStatistics;
-
-    @Option(
-        names = {"-q", "--quiet"},
-        arity = "0",
-        description =
-            "Suppress output of the target compiler and other commands")
-    private boolean quiet;
-
-    @Option(
-        names = {"-r", "--rti"},
-        description = "Specify the location of the RTI.")
-    private Path rti;
-
-    @Option(
-        names = "--runtime-version",
-        description = "Specify the version of the runtime library used for"
-                    + " compiling LF programs.")
-    private String runtimeVersion;
-
-    @Option(
-        names = {"-s", "--scheduler"},
-        description = "Specify the runtime scheduler (if supported).")
-    private String scheduler;
-
-    @Option(
-        names = {"-t", "--threading"},
-        paramLabel = "<true/false>",
-        description = "Specify whether the runtime should use multi-threading"
-                    + " (true/false).")
-    private String threading;
-
-    @Option(
-        names = {"-w", "--workers"},
-        description = "Specify the default number of worker threads.")
-    private Integer workers;
-
-    /**
-     * Main function of the stand-alone compiler.
-     * Caution: this will invoke System.exit.
-     *
-     * @param args CLI arguments
-     */
-    public static void main(final String[] args) {
-        main(Io.SYSTEM, args);
+  /** Injected code generator. */
+  @Inject private GeneratorDelegate generator;
+
+  /** Injected file access object. */
+  @Inject private JavaIoFileSystemAccess fileAccess;
+
+  /*
+   * Supported CLI options.
+   */
+
+  @Option(names = "--build-type", description = "The build type to use.")
+  private String buildType;
+
+  @Option(
+      names = {"-c", "--clean"},
+      arity = "0",
+      description = "Clean before building.")
+  private boolean clean;
+
+  @Option(names = "--target-compiler", description = "Target compiler to invoke.")
+  private String targetCompiler;
+
+  @Option(
+      names = "--external-runtime-path",
+      description = "Specify an external runtime library to be used by the" + " compiled binary.")
+  private Path externalRuntimePath;
+
+  @Option(
+      names = {"-f", "--federated"},
+      arity = "0",
+      description = "Treat main reactor as federated.")
+  private boolean federated;
+
+  @Option(names = "--logging", description = "The logging level to use by the generated binary")
+  private String logging;
+
+  @Option(
+      names = {"-l", "--lint"},
+      arity = "0",
+      description = "Enable linting of generated code.")
+  private boolean lint;
+
+  @Option(
+      names = {"-n", "--no-compile"},
+      arity = "0",
+      description = "Do not invoke target compiler.")
+  private boolean noCompile;
+
+  @Option(
+      names = {"--print-statistics"},
+      arity = "0",
+      description = "Instruct the runtime to collect and print statistics.")
+  private boolean printStatistics;
+
+  @Option(
+      names = {"-q", "--quiet"},
+      arity = "0",
+      description = "Suppress output of the target compiler and other commands")
+  private boolean quiet;
+
+  @Option(
+      names = {"-r", "--rti"},
+      description = "Specify the location of the RTI.")
+  private Path rti;
+
+  @Option(
+      names = "--runtime-version",
+      description =
+          "Specify the version of the runtime library used for" + " compiling LF programs.")
+  private String runtimeVersion;
+
+  @Option(
+      names = {"-s", "--scheduler"},
+      description = "Specify the runtime scheduler (if supported).")
+  private String scheduler;
+
+  @Option(
+      names = {"-t", "--threading"},
+      paramLabel = "<true/false>",
+      description = "Specify whether the runtime should use multi-threading" + " (true/false).")
+  private String threading;
+
+  @Option(
+      names = {"-w", "--workers"},
+      description = "Specify the default number of worker threads.")
+  private Integer workers;
+
+  /**
+   * Main function of the stand-alone compiler. Caution: this will invoke System.exit.
+   *
+   * @param args CLI arguments
+   */
+  public static void main(final String[] args) {
+    main(Io.SYSTEM, args);
+  }
+
+  /**
+   * Main function of the standalone compiler, with a custom IO.
+   *
+   * @param io IO streams.
+   * @param args Command-line arguments.
+   */
+  public static void main(Io io, final String... args) {
+    cliMain("lfc", Lfc.class, io, args);
+  }
+
+  /** Load the resource, validate it, and, invoke the code generator. */
+  @Override
+  public void doRun() {
+    List<Path> paths = getInputPaths();
+    final Path outputRoot = getOutputRoot();
+    // Hard code the props based on the options we want.
+    Properties properties = this.getGeneratorArgs();
+
+    try {
+      // Invoke the generator on all input file paths.
+      invokeGenerator(paths, outputRoot, properties);
+    } catch (RuntimeException e) {
+      reporter.printFatalErrorAndExit("An unexpected error occurred:", e);
     }
-
-    /**
-     * Main function of the standalone compiler, with a custom IO.
-     *
-     * @param io IO streams.
-     * @param args Command-line arguments.
-     */
-    public static void main(Io io, final String... args) {
-        cliMain("lfc", Lfc.class, io, args);
-    }
-
-    /**
-     * Load the resource, validate it, and, invoke the code generator.
-     */
-    @Override
-    public void doRun() {
-        List<Path> paths = getInputPaths();
-        final Path outputRoot = getOutputRoot();
-        // Hard code the props based on the options we want.
-        Properties properties = this.getGeneratorArgs();
-
-        try {
-            // Invoke the generator on all input file paths.
-            invokeGenerator(paths, outputRoot, properties);
-        } catch (RuntimeException e) {
-            reporter.printFatalErrorAndExit("An unexpected error occurred:", e);
+  }
+
+  /** Invoke the code generator on the given validated file paths. */
+  private void invokeGenerator(List<Path> files, Path root, Properties properties) {
+    for (Path path : files) {
+      path = toAbsolutePath(path);
+      String outputPath = getActualOutputPath(root, path).toString();
+      this.fileAccess.setOutputPath(outputPath);
+
+      final Resource resource = getResource(path);
+      if (resource == null) {
+        reporter.printFatalErrorAndExit(
+            path + " is not an LF file. Use the .lf file extension to" + " denote LF files.");
+      } else if (federated) {
+        if (!ASTUtils.makeFederated(resource)) {
+          reporter.printError("Unable to change main reactor to federated reactor.");
         }
+      }
+
+      validateResource(resource);
+      exitIfCollectedErrors();
+
+      LFGeneratorContext context =
+          new MainContext(
+              LFGeneratorContext.Mode.STANDALONE,
+              CancelIndicator.NullImpl,
+              (m, p) -> {},
+              properties,
+              resource,
+              this.fileAccess,
+              fileConfig -> errorReporter);
+
+      try {
+        this.generator.generate(resource, this.fileAccess, context);
+      } catch (Exception e) {
+        reporter.printFatalErrorAndExit("Error running generator", e);
+      }
+
+      exitIfCollectedErrors();
+      // Print all other issues (not errors).
+      issueCollector.getAllIssues().forEach(reporter::printIssue);
+
+      this.io.getOut().println("Code generation finished.");
     }
-
-    /**
-     * Invoke the code generator on the given validated file paths.
-     */
-    private void invokeGenerator(
-            List<Path> files, Path root, Properties properties) {
-        for (Path path : files) {
-            path = toAbsolutePath(path);
-            String outputPath = getActualOutputPath(root, path).toString();
-            this.fileAccess.setOutputPath(outputPath);
-
-            final Resource resource = getResource(path);
-            if (resource == null) {
-                reporter.printFatalErrorAndExit(path
-                    + " is not an LF file. Use the .lf file extension to"
-                    + " denote LF files.");
-            } else if (federated) {
-                if (!ASTUtils.makeFederated(resource)) {
-                    reporter.printError(
-                        "Unable to change main reactor to federated reactor.");
-                }
-            }
-
-            validateResource(resource);
-            exitIfCollectedErrors();
-
-            LFGeneratorContext context = new MainContext(
-                LFGeneratorContext.Mode.STANDALONE, CancelIndicator.NullImpl,
-                (m, p) -> {}, properties, resource, this.fileAccess,
-                fileConfig -> errorReporter
-            );
-
-            try {
-                this.generator.generate(resource, this.fileAccess, context);
-            } catch (Exception e) {
-                reporter.printFatalErrorAndExit("Error running generator", e);
-            }
-
-            exitIfCollectedErrors();
-            // Print all other issues (not errors).
-            issueCollector.getAllIssues().forEach(reporter::printIssue);
-
-            this.io.getOut().println("Code generation finished.");
-        }
+  }
+
+  private Path getActualOutputPath(Path root, Path path) {
+    if (root != null) {
+      return root.resolve("src-gen");
+    } else {
+      Path pkgRoot = FileConfig.findPackageRoot(path, reporter::printWarning);
+      return pkgRoot.resolve("src-gen");
     }
-
-    private Path getActualOutputPath(Path root, Path path) {
-        if (root != null) {
-            return root.resolve("src-gen");
-        } else {
-            Path pkgRoot = FileConfig.findPackageRoot(
-                path, reporter::printWarning);
-            return pkgRoot.resolve("src-gen");
-        }
+  }
+
+  /**
+   * Filter the command-line arguments needed by the code generator, and return them as properties.
+   *
+   * @return Properties for the code generator.
+   */
+  public Properties getGeneratorArgs() {
+    Properties props = new Properties();
+
+    if (buildType != null) {
+      // Validate build type.
+      if (UnionType.BUILD_TYPE_UNION.forName(buildType) == null) {
+        reporter.printFatalErrorAndExit(buildType + ": Invalid build type.");
+      }
+      props.setProperty(BuildParm.BUILD_TYPE.getKey(), buildType);
     }
 
-    /**
-     * Filter the command-line arguments needed by the code generator, and
-     * return them as properties.
-     *
-     * @return Properties for the code generator.
-     */
-    public Properties getGeneratorArgs() {
-        Properties props = new Properties();
-
-        if (buildType != null) {
-            // Validate build type.
-            if (UnionType.BUILD_TYPE_UNION.forName(buildType) == null) {
-                reporter.printFatalErrorAndExit(
-                    buildType + ": Invalid build type.");
-            }
-            props.setProperty(BuildParm.BUILD_TYPE.getKey(), buildType);
-        }
-
-        if (clean) {
-            props.setProperty(BuildParm.CLEAN.getKey(), "true");
-        }
-
-        if (externalRuntimePath != null) {
-            props.setProperty(BuildParm.EXTERNAL_RUNTIME_PATH.getKey(),
-                    externalRuntimePath.toString());
-        }
+    if (clean) {
+      props.setProperty(BuildParm.CLEAN.getKey(), "true");
+    }
 
-        if (lint) {
-            props.setProperty(BuildParm.LINT.getKey(), "true");
-        }
+    if (externalRuntimePath != null) {
+      props.setProperty(BuildParm.EXTERNAL_RUNTIME_PATH.getKey(), externalRuntimePath.toString());
+    }
 
-        if (logging != null) {
-            // Validate log level.
-            if (UnionType.LOGGING_UNION.forName(logging) == null) {
-                reporter.printFatalErrorAndExit(
-                    logging + ": Invalid log level.");
-            }
-            props.setProperty(BuildParm.LOGGING.getKey(), logging);
-        }
+    if (lint) {
+      props.setProperty(BuildParm.LINT.getKey(), "true");
+    }
 
-        if(printStatistics) {
-            props.setProperty(BuildParm.PRINT_STATISTICS.getKey(), "true");
-        }
+    if (logging != null) {
+      // Validate log level.
+      if (UnionType.LOGGING_UNION.forName(logging) == null) {
+        reporter.printFatalErrorAndExit(logging + ": Invalid log level.");
+      }
+      props.setProperty(BuildParm.LOGGING.getKey(), logging);
+    }
 
-        if (noCompile) {
-            props.setProperty(BuildParm.NO_COMPILE.getKey(), "true");
-        }
+    if (printStatistics) {
+      props.setProperty(BuildParm.PRINT_STATISTICS.getKey(), "true");
+    }
 
-        if (targetCompiler != null) {
-            props.setProperty(BuildParm.TARGET_COMPILER.getKey(), targetCompiler);
-        }
+    if (noCompile) {
+      props.setProperty(BuildParm.NO_COMPILE.getKey(), "true");
+    }
 
-        if (quiet) {
-            props.setProperty(BuildParm.QUIET.getKey(), "true");
-        }
+    if (targetCompiler != null) {
+      props.setProperty(BuildParm.TARGET_COMPILER.getKey(), targetCompiler);
+    }
 
-        if (rti != null) {
-            // Validate RTI path.
-            if (!Files.exists(io.getWd().resolve(rti))) {
-                reporter.printFatalErrorAndExit(
-                    rti + ": Invalid RTI path.");
-            }
-            props.setProperty(BuildParm.RTI.getKey(), rti.toString());
-        }
+    if (quiet) {
+      props.setProperty(BuildParm.QUIET.getKey(), "true");
+    }
 
-        if (runtimeVersion != null) {
-            props.setProperty(BuildParm.RUNTIME_VERSION.getKey(), runtimeVersion);
-        }
+    if (rti != null) {
+      // Validate RTI path.
+      if (!Files.exists(io.getWd().resolve(rti))) {
+        reporter.printFatalErrorAndExit(rti + ": Invalid RTI path.");
+      }
+      props.setProperty(BuildParm.RTI.getKey(), rti.toString());
+    }
 
-        if (scheduler != null) {
-            // Validate scheduler.
-            if (UnionType.SCHEDULER_UNION.forName(scheduler) == null) {
-                reporter.printFatalErrorAndExit(
-                    scheduler + ": Invalid scheduler.");
-            }
-            props.setProperty(BuildParm.SCHEDULER.getKey(), scheduler);
-        }
+    if (runtimeVersion != null) {
+      props.setProperty(BuildParm.RUNTIME_VERSION.getKey(), runtimeVersion);
+    }
 
-        if (threading != null) {
-            props.setProperty(BuildParm.THREADING.getKey(), threading);
-        }
+    if (scheduler != null) {
+      // Validate scheduler.
+      if (UnionType.SCHEDULER_UNION.forName(scheduler) == null) {
+        reporter.printFatalErrorAndExit(scheduler + ": Invalid scheduler.");
+      }
+      props.setProperty(BuildParm.SCHEDULER.getKey(), scheduler);
+    }
 
-        if (workers != null) {
-            props.setProperty(BuildParm.WORKERS.getKey(), workers.toString());
-        }
+    if (threading != null) {
+      props.setProperty(BuildParm.THREADING.getKey(), threading);
+    }
 
-        return props;
+    if (workers != null) {
+      props.setProperty(BuildParm.WORKERS.getKey(), workers.toString());
     }
+
+    return props;
+  }
 }
diff --git a/org.lflang/src/org/lflang/cli/Lff.java b/org.lflang/src/org/lflang/cli/Lff.java
index 297bc5ad84..f4f7714119 100644
--- a/org.lflang/src/org/lflang/cli/Lff.java
+++ b/org.lflang/src/org/lflang/cli/Lff.java
@@ -8,13 +8,11 @@
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.List;
-
-import picocli.CommandLine.Command;
-import picocli.CommandLine.Option;
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.lflang.ast.FormattingUtils;
 import org.lflang.util.FileUtil;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
 
 /**
  * Standalone version of the Lingua Franca formatter (lff). Based on lfc.
@@ -31,169 +29,163 @@
     versionProvider = VersionProvider.class)
 public class Lff extends CliBase {
 
-    /**
-     * Supported CLI options for Lff.
-     */
-    @Option(
-        names = {"-d", "--dry-run"},
-        description = "Send the formatted file contents to stdout"
-                        + " without writing to the file system.")
-    private boolean dryRun = false;
-
-    @Option(
-        names = {"-w", "--wrap"},
-        description = "Causes the formatter to line wrap the files to a"
-                        + " specified length.",
-        defaultValue = "" + FormattingUtils.DEFAULT_LINE_LENGTH,
-        fallbackValue = "" + FormattingUtils.DEFAULT_LINE_LENGTH)
-    private int lineLength;
-
-    @Option(
-        names = "--no-recurse",
-        description = "Do not format files in subdirectories of the"
-            + " specified paths.")
-    private boolean noRecurse = false;
-
-    @Option(
-        names = {"-v", "--verbose"},
-        description = "Print more details on files affected.")
-    private boolean verbose = false;
-
-    @Option(
-        names = {"--ignore-errors"},
-        description = "Ignore validation errors in files and format them anyway.")
-    private boolean ignoreErrors = false;
-
-    /**
-     * Main function of the formatter.
-     * Caution: this will invoke System.exit.
-     *
-     * @param args CLI arguments
-     */
-    public static void main(String[] args) {
-        main(Io.SYSTEM, args);
+  /** Supported CLI options for Lff. */
+  @Option(
+      names = {"-d", "--dry-run"},
+      description =
+          "Send the formatted file contents to stdout" + " without writing to the file system.")
+  private boolean dryRun = false;
+
+  @Option(
+      names = {"-w", "--wrap"},
+      description = "Causes the formatter to line wrap the files to a" + " specified length.",
+      defaultValue = "" + FormattingUtils.DEFAULT_LINE_LENGTH,
+      fallbackValue = "" + FormattingUtils.DEFAULT_LINE_LENGTH)
+  private int lineLength;
+
+  @Option(
+      names = "--no-recurse",
+      description = "Do not format files in subdirectories of the" + " specified paths.")
+  private boolean noRecurse = false;
+
+  @Option(
+      names = {"-v", "--verbose"},
+      description = "Print more details on files affected.")
+  private boolean verbose = false;
+
+  @Option(
+      names = {"--ignore-errors"},
+      description = "Ignore validation errors in files and format them anyway.")
+  private boolean ignoreErrors = false;
+
+  /**
+   * Main function of the formatter. Caution: this will invoke System.exit.
+   *
+   * @param args CLI arguments
+   */
+  public static void main(String[] args) {
+    main(Io.SYSTEM, args);
+  }
+
+  /**
+   * Programmatic entry point, with a custom IO.
+   *
+   * @param io IO streams.
+   * @param args Command-line arguments.
+   */
+  public static void main(Io io, final String... args) {
+    cliMain("lff", Lff.class, io, args);
+  }
+
+  /** Validates all paths and invokes the formatter on the input paths. */
+  @Override
+  public void doRun() {
+    List<Path> paths = getInputPaths();
+    final Path outputRoot = getOutputRoot();
+
+    try {
+      // Format all files defined by the list of paths.
+      formatAllFiles(paths, outputRoot);
+
+      exitIfCollectedErrors();
+      if (!dryRun || verbose) {
+        reporter.printInfo("Done formatting.");
+      }
+    } catch (RuntimeException e) {
+      reporter.printFatalErrorAndExit("An unexpected error occurred:", e);
     }
-
-    /**
-     * Programmatic entry point, with a custom IO.
-     *
-     * @param io IO streams.
-     * @param args Command-line arguments.
-     */
-    public static void main(Io io, final String... args) {
-        cliMain("lff", Lff.class, io, args);
-    }
-
-    /**
-     * Validates all paths and invokes the formatter on the input paths.
-     */
-    @Override
-    public void doRun() {
-        List<Path> paths = getInputPaths();
-        final Path outputRoot = getOutputRoot();
-
+  }
+
+  /*
+   * Invokes the formatter on all files defined by the list of paths.
+   */
+  private void formatAllFiles(List<Path> paths, Path outputRoot) {
+    for (Path relativePath : paths) {
+      if (verbose) {
+        reporter.printInfo("Formatting " + io.getWd().relativize(relativePath) + ":");
+      }
+
+      Path path = toAbsolutePath(relativePath);
+      if (Files.isDirectory(path) && !noRecurse) {
+        // Walk the contents of this directory.
         try {
-            // Format all files defined by the list of paths.
-            formatAllFiles(paths, outputRoot);
-
-            exitIfCollectedErrors();
-            if (!dryRun || verbose) {
-                reporter.printInfo("Done formatting.");
-            }
-        } catch (RuntimeException e) {
-            reporter.printFatalErrorAndExit("An unexpected error occurred:", e);
-        }
-    }
-
-    /*
-     * Invokes the formatter on all files defined by the list of paths.
-     */
-    private void formatAllFiles(List<Path> paths, Path outputRoot) {
-        for (Path relativePath : paths) {
-            if (verbose) {
-                reporter.printInfo("Formatting "
-                        + io.getWd().relativize(relativePath) + ":");
-            }
-
-            Path path = toAbsolutePath(relativePath);
-            if (Files.isDirectory(path) && !noRecurse) {
-                // Walk the contents of this directory.
-                try {
-                    Files.walkFileTree(path, new SimpleFileVisitor<>() {
-                        @Override
-                        public FileVisitResult visitFile(
-                                Path file, BasicFileAttributes attrs) {
-                            formatSingleFile(file, path, outputRoot);
-                            return FileVisitResult.CONTINUE;
-                        }
-                    });
-                } catch (IOException e) {
-                    reporter.printError("IO error: " + e);
+          Files.walkFileTree(
+              path,
+              new SimpleFileVisitor<>() {
+                @Override
+                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
+                  formatSingleFile(file, path, outputRoot);
+                  return FileVisitResult.CONTINUE;
                 }
-            } else {
-                // Simple file.
-                formatSingleFile(path, path.getParent(), outputRoot);
-            }
+              });
+        } catch (IOException e) {
+          reporter.printError("IO error: " + e);
         }
+      } else {
+        // Simple file.
+        formatSingleFile(path, path.getParent(), outputRoot);
+      }
     }
-
-    /*
-     * Invokes the formatter on a single file defined by the given path.
-     */
-    private void formatSingleFile(Path path, Path inputRoot, Path outputRoot) {
-        path = path.normalize();
-        Path outputPath = outputRoot == null
+  }
+
+  /*
+   * Invokes the formatter on a single file defined by the given path.
+   */
+  private void formatSingleFile(Path path, Path inputRoot, Path outputRoot) {
+    path = path.normalize();
+    Path outputPath =
+        outputRoot == null
             ? path // Format in place.
             : outputRoot.resolve(inputRoot.relativize(path)).normalize();
 
-        final Resource resource = getResource(path);
-        // Skip file if not an LF file.
-        if (resource == null) {
-            if (verbose) {
-                reporter.printInfo("Skipped " + path + ": not an LF file");
-            }
-            return;
-        }
-        validateResource(resource);
+    final Resource resource = getResource(path);
+    // Skip file if not an LF file.
+    if (resource == null) {
+      if (verbose) {
+        reporter.printInfo("Skipped " + path + ": not an LF file");
+      }
+      return;
+    }
+    validateResource(resource);
 
-        if (!ignoreErrors) {
-            exitIfCollectedErrors();
-        }
-        final String formattedFileContents =
-            FormattingUtils.render(resource.getContents().get(0), lineLength);
-
-        if (dryRun) {
-            io.getOut().print(formattedFileContents);
-        } else {
-            try {
-                FileUtil.writeToFile(formattedFileContents, outputPath, true);
-            } catch (IOException e) {
-                if (e instanceof FileAlreadyExistsException) {
-                    // Only happens if a subdirectory is named with
-                    // ".lf" at the end.
-                    reporter.printFatalErrorAndExit(
-                        "Error writing to "
-                        + outputPath
-                        + ": file already exists. Make sure that no file or"
-                        + " directory within provided input paths have the"
-                        + " same relative paths.");
-                }
-            }
+    if (!ignoreErrors) {
+      exitIfCollectedErrors();
+    }
+    final String formattedFileContents =
+        FormattingUtils.render(resource.getContents().get(0), lineLength);
+
+    if (dryRun) {
+      io.getOut().print(formattedFileContents);
+    } else {
+      try {
+        FileUtil.writeToFile(formattedFileContents, outputPath, true);
+      } catch (IOException e) {
+        if (e instanceof FileAlreadyExistsException) {
+          // Only happens if a subdirectory is named with
+          // ".lf" at the end.
+          reporter.printFatalErrorAndExit(
+              "Error writing to "
+                  + outputPath
+                  + ": file already exists. Make sure that no file or"
+                  + " directory within provided input paths have the"
+                  + " same relative paths.");
         }
+      }
+    }
 
-        if (!ignoreErrors) {
-            exitIfCollectedErrors();
-        }
-        // Only errors are printed. Warnings are not helpful for LFF
-        // and since they don't prevent the file from being formatted,
-        // the position of the issue may be wrong in the formatted file.
-        // issueCollector.getAllIssues().forEach(reporter::printIssue);
-        if (verbose) {
-            String msg = "Formatted " + io.getWd().relativize(path);
-            if (path != outputPath) {
-              msg += " -> " + io.getWd().relativize(outputPath);
-            }
-            reporter.printInfo(msg);
-        }
+    if (!ignoreErrors) {
+      exitIfCollectedErrors();
+    }
+    // Only errors are printed. Warnings are not helpful for LFF
+    // and since they don't prevent the file from being formatted,
+    // the position of the issue may be wrong in the formatted file.
+    // issueCollector.getAllIssues().forEach(reporter::printIssue);
+    if (verbose) {
+      String msg = "Formatted " + io.getWd().relativize(path);
+      if (path != outputPath) {
+        msg += " -> " + io.getWd().relativize(outputPath);
+      }
+      reporter.printInfo(msg);
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/cli/StandaloneErrorReporter.java b/org.lflang/src/org/lflang/cli/StandaloneErrorReporter.java
index 2b4ae6fe46..83e58eb15c 100644
--- a/org.lflang/src/org/lflang/cli/StandaloneErrorReporter.java
+++ b/org.lflang/src/org/lflang/cli/StandaloneErrorReporter.java
@@ -27,90 +27,79 @@
 
 package org.lflang.cli;
 
+import com.google.inject.Inject;
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.diagnostics.Severity;
-
 import org.lflang.ErrorReporter;
 
-import com.google.inject.Inject;
-
 /**
- * An error reporter that forwards all messages to an {@link IssueCollector}.
- * They'll be sorted out later.
+ * An error reporter that forwards all messages to an {@link IssueCollector}. They'll be sorted out
+ * later.
  */
 public class StandaloneErrorReporter implements ErrorReporter {
 
-    @Inject
-    private StandaloneIssueAcceptor issueAcceptor;
-
-    private String reportWithNode(String message, Severity severity, EObject obj) {
-        issueAcceptor.accept(severity, message, obj, null, 0, null);
-        return message;
-    }
-
-    private String reportSimpleFileCtx(String message, Severity severity, Integer line, Path path) {
-        LfIssue issue = new LfIssue(message, severity, line, 1, line, 1, 0, path);
-        issueAcceptor.accept(issue);
-        // Return a string that can be inserted into the generated code.
-        return message;
-    }
-
-
-    @Override
-    public String reportError(String message) {
-        return reportSimpleFileCtx(message, Severity.ERROR, null, null);
-    }
-
-
-    @Override
-    public String reportWarning(String message) {
-        return reportSimpleFileCtx(message, Severity.WARNING, null, null);
-    }
-
-    @Override
-    public String reportInfo(String message) {
-        return reportSimpleFileCtx(message, Severity.INFO, null, null);
-    }
-
-
-    @Override
-    public String reportError(EObject obj, String message) {
-        return reportWithNode(message, Severity.ERROR, obj);
-    }
-
-
-    @Override
-    public String reportWarning(EObject obj, String message) {
-        return reportWithNode(message, Severity.WARNING, obj);
-    }
-
-    @Override
-    public String reportInfo(EObject obj, String message) {
-        return reportWithNode(message, Severity.INFO, obj);
-    }
-
-
-    @Override
-    public String reportError(Path file, Integer line, String message) {
-        return reportSimpleFileCtx(message, Severity.ERROR, line, file);
-    }
-
-
-    @Override
-    public String reportWarning(Path file, Integer line, String message) {
-        return reportSimpleFileCtx(message, Severity.WARNING, line, file);
-    }
-
-    @Override
-    public String reportInfo(Path file, Integer line, String message) {
-        return reportSimpleFileCtx(message, Severity.INFO, line, file);
-    }
-
-
-    @Override
-    public boolean getErrorsOccurred() {
-        return issueAcceptor.getErrorsOccurred();
-    }
+  @Inject private StandaloneIssueAcceptor issueAcceptor;
+
+  private String reportWithNode(String message, Severity severity, EObject obj) {
+    issueAcceptor.accept(severity, message, obj, null, 0, null);
+    return message;
+  }
+
+  private String reportSimpleFileCtx(String message, Severity severity, Integer line, Path path) {
+    LfIssue issue = new LfIssue(message, severity, line, 1, line, 1, 0, path);
+    issueAcceptor.accept(issue);
+    // Return a string that can be inserted into the generated code.
+    return message;
+  }
+
+  @Override
+  public String reportError(String message) {
+    return reportSimpleFileCtx(message, Severity.ERROR, null, null);
+  }
+
+  @Override
+  public String reportWarning(String message) {
+    return reportSimpleFileCtx(message, Severity.WARNING, null, null);
+  }
+
+  @Override
+  public String reportInfo(String message) {
+    return reportSimpleFileCtx(message, Severity.INFO, null, null);
+  }
+
+  @Override
+  public String reportError(EObject obj, String message) {
+    return reportWithNode(message, Severity.ERROR, obj);
+  }
+
+  @Override
+  public String reportWarning(EObject obj, String message) {
+    return reportWithNode(message, Severity.WARNING, obj);
+  }
+
+  @Override
+  public String reportInfo(EObject obj, String message) {
+    return reportWithNode(message, Severity.INFO, obj);
+  }
+
+  @Override
+  public String reportError(Path file, Integer line, String message) {
+    return reportSimpleFileCtx(message, Severity.ERROR, line, file);
+  }
+
+  @Override
+  public String reportWarning(Path file, Integer line, String message) {
+    return reportSimpleFileCtx(message, Severity.WARNING, line, file);
+  }
+
+  @Override
+  public String reportInfo(Path file, Integer line, String message) {
+    return reportSimpleFileCtx(message, Severity.INFO, line, file);
+  }
+
+  @Override
+  public boolean getErrorsOccurred() {
+    return issueAcceptor.getErrorsOccurred();
+  }
 }
diff --git a/org.lflang/src/org/lflang/cli/StandaloneIssueAcceptor.java b/org.lflang/src/org/lflang/cli/StandaloneIssueAcceptor.java
index 73ca4bea9e..cb9712a7cb 100644
--- a/org.lflang/src/org/lflang/cli/StandaloneIssueAcceptor.java
+++ b/org.lflang/src/org/lflang/cli/StandaloneIssueAcceptor.java
@@ -1,42 +1,41 @@
 package org.lflang.cli;
 
+import com.google.inject.Inject;
 import java.io.IOException;
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.xtext.diagnostics.Severity;
 import org.eclipse.xtext.validation.EObjectDiagnosticImpl;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
-
 import org.lflang.util.FileUtil;
 
-import com.google.inject.Inject;
-
-/**
- *
- */
+/** */
 public class StandaloneIssueAcceptor implements ValidationMessageAcceptor {
 
-    @Inject
-    private IssueCollector collector;
-
-
-    boolean getErrorsOccurred() {
-        return collector.getErrorsOccurred();
-    }
-
-
-    void accept(LfIssue lfIssue) {
-        collector.accept(lfIssue);
-    }
-
-
-    void accept(Severity severity, String message, EObject object, EStructuralFeature feature, int index, String code, String... issueData) {
-        EObjectDiagnosticImpl diagnostic =
-            new EObjectDiagnosticImpl(severity, code, message, object, feature, index, issueData);
-
-        LfIssue lfIssue = new LfIssue(
+  @Inject private IssueCollector collector;
+
+  boolean getErrorsOccurred() {
+    return collector.getErrorsOccurred();
+  }
+
+  void accept(LfIssue lfIssue) {
+    collector.accept(lfIssue);
+  }
+
+  void accept(
+      Severity severity,
+      String message,
+      EObject object,
+      EStructuralFeature feature,
+      int index,
+      String code,
+      String... issueData) {
+    EObjectDiagnosticImpl diagnostic =
+        new EObjectDiagnosticImpl(severity, code, message, object, feature, index, issueData);
+
+    LfIssue lfIssue =
+        new LfIssue(
             message,
             severity,
             diagnostic.getLine(),
@@ -44,64 +43,81 @@ void accept(Severity severity, String message, EObject object, EStructuralFeatur
             diagnostic.getLineEnd(),
             diagnostic.getColumnEnd(),
             diagnostic.getLength(),
-            getPath(diagnostic)
-        );
-
-        accept(lfIssue);
-    }
-
-
-    /**
-     * Best effort to get a fileName. May return null.
-     */
-    private Path getPath(EObjectDiagnosticImpl diagnostic) {
-        Path file = null;
-        try {
-            file = FileUtil.toPath(diagnostic.getUriToProblem());
-        } catch (IOException e) {
-            // just continue with null
-        }
-        return file;
-    }
-
-
-    private void accept(Severity severity, String message, EObject object, int offset, int length, String code, String... issueData) {
-        throw new UnsupportedOperationException("not implemented: range based diagnostics");
-    }
-
-
-    @Override
-    public void acceptError(String message, EObject object, EStructuralFeature feature, int index, String code, String... issueData) {
-        accept(Severity.ERROR, message, object, feature, index, code, issueData);
-    }
-
-
-    @Override
-    public void acceptError(String message, EObject object, int offset, int length, String code, String... issueData) {
-        accept(Severity.ERROR, message, object, offset, length, code, issueData);
-    }
-
-
-    @Override
-    public void acceptWarning(String message, EObject object, EStructuralFeature feature, int index, String code, String... issueData) {
-        accept(Severity.WARNING, message, object, feature, index, code, issueData);
-    }
-
-
-    @Override
-    public void acceptWarning(String message, EObject object, int offset, int length, String code, String... issueData) {
-        accept(Severity.WARNING, message, object, offset, length, code, issueData);
-    }
-
-
-    @Override
-    public void acceptInfo(String message, EObject object, EStructuralFeature feature, int index, String code, String... issueData) {
-        accept(Severity.INFO, message, object, feature, index, code, issueData);
-    }
-
-
-    @Override
-    public void acceptInfo(String message, EObject object, int offset, int length, String code, String... issueData) {
-        accept(Severity.INFO, message, object, offset, length, code, issueData);
+            getPath(diagnostic));
+
+    accept(lfIssue);
+  }
+
+  /** Best effort to get a fileName. May return null. */
+  private Path getPath(EObjectDiagnosticImpl diagnostic) {
+    Path file = null;
+    try {
+      file = FileUtil.toPath(diagnostic.getUriToProblem());
+    } catch (IOException e) {
+      // just continue with null
     }
+    return file;
+  }
+
+  private void accept(
+      Severity severity,
+      String message,
+      EObject object,
+      int offset,
+      int length,
+      String code,
+      String... issueData) {
+    throw new UnsupportedOperationException("not implemented: range based diagnostics");
+  }
+
+  @Override
+  public void acceptError(
+      String message,
+      EObject object,
+      EStructuralFeature feature,
+      int index,
+      String code,
+      String... issueData) {
+    accept(Severity.ERROR, message, object, feature, index, code, issueData);
+  }
+
+  @Override
+  public void acceptError(
+      String message, EObject object, int offset, int length, String code, String... issueData) {
+    accept(Severity.ERROR, message, object, offset, length, code, issueData);
+  }
+
+  @Override
+  public void acceptWarning(
+      String message,
+      EObject object,
+      EStructuralFeature feature,
+      int index,
+      String code,
+      String... issueData) {
+    accept(Severity.WARNING, message, object, feature, index, code, issueData);
+  }
+
+  @Override
+  public void acceptWarning(
+      String message, EObject object, int offset, int length, String code, String... issueData) {
+    accept(Severity.WARNING, message, object, offset, length, code, issueData);
+  }
+
+  @Override
+  public void acceptInfo(
+      String message,
+      EObject object,
+      EStructuralFeature feature,
+      int index,
+      String code,
+      String... issueData) {
+    accept(Severity.INFO, message, object, feature, index, code, issueData);
+  }
+
+  @Override
+  public void acceptInfo(
+      String message, EObject object, int offset, int length, String code, String... issueData) {
+    accept(Severity.INFO, message, object, offset, length, code, issueData);
+  }
 }
diff --git a/org.lflang/src/org/lflang/cli/VersionProvider.java b/org.lflang/src/org/lflang/cli/VersionProvider.java
index ce9c8f6252..ca9c3d6bbb 100644
--- a/org.lflang/src/org/lflang/cli/VersionProvider.java
+++ b/org.lflang/src/org/lflang/cli/VersionProvider.java
@@ -1,11 +1,10 @@
 package org.lflang.cli;
 
+import org.lflang.LocalStrings;
 import picocli.CommandLine.IVersionProvider;
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.Spec;
 
-import org.lflang.LocalStrings;
-
 /*
  * Dynamically provides version information to the Lingua Franca CLI.
  * Picocli will instantiate this class and invoke it to collect version
@@ -14,19 +13,18 @@
  * @author Atharva Patil
  */
 class VersionProvider implements IVersionProvider {
-    /* 
-     * Here, picocli will inject the CommandSpec (full command hierarchy) of the
-     * command that uses this version provider. This allows this version 
-     * provider to be reused among multiple commands.
-     */ 
-    @Spec CommandSpec spec;
+  /*
+   * Here, picocli will inject the CommandSpec (full command hierarchy) of the
+   * command that uses this version provider. This allows this version
+   * provider to be reused among multiple commands.
+   */
+  @Spec CommandSpec spec;
 
-    // Method invoked by picocli to get the version info.
-    public String[] getVersion() {
-        return new String[] {
-            // "lfc", "lff", etc.
-            spec.qualifiedName()
-                + " " + LocalStrings.VERSION
-        };
-    }
+  // Method invoked by picocli to get the version info.
+  public String[] getVersion() {
+    return new String[] {
+      // "lfc", "lff", etc.
+      spec.qualifiedName() + " " + LocalStrings.VERSION
+    };
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/lsp/LFLanguageServer.java b/org.lflang/src/org/lflang/diagram/lsp/LFLanguageServer.java
index 1971fbc081..405e322a88 100644
--- a/org.lflang/src/org/lflang/diagram/lsp/LFLanguageServer.java
+++ b/org.lflang/src/org/lflang/diagram/lsp/LFLanguageServer.java
@@ -1,10 +1,9 @@
 package org.lflang.diagram.lsp;
 
-import org.eclipse.lsp4j.WorkDoneProgressCancelParams;
 import de.cau.cs.kieler.klighd.lsp.KGraphLanguageServerExtension;
-
 import org.eclipse.lsp4j.Hover;
 import org.eclipse.lsp4j.HoverParams;
+import org.eclipse.lsp4j.WorkDoneProgressCancelParams;
 import org.eclipse.xtext.ide.server.hover.IHoverService;
 import org.eclipse.xtext.util.CancelIndicator;
 
@@ -14,21 +13,24 @@
  * @author Peter Donovan
  */
 public class LFLanguageServer extends KGraphLanguageServerExtension {
-    @Override
-    public void cancelProgress(WorkDoneProgressCancelParams params) {
-        Progress.cancel(params.getToken().getRight().intValue());
-    }
+  @Override
+  public void cancelProgress(WorkDoneProgressCancelParams params) {
+    Progress.cancel(params.getToken().getRight().intValue());
+  }
 
-    @Override
-    protected Hover hover(HoverParams params, CancelIndicator cancelIndicator) {
-        // This override is just a hacky little patch that is being applied downstream of the original mistake and
-        //  upstream of the ungraceful handling (IndexOutOfBoundsException) of said mistake. This patch is applied here
-        //  simply because it is easy. This would be done differently were it not for the fact that we plan to rebuild
-        //  this infrastructure from scratch anyway.
-        try {
-            return super.hover(params, cancelIndicator);
-        } catch (IndexOutOfBoundsException e) {
-            return IHoverService.EMPTY_HOVER;  // Fail silently
-        }
+  @Override
+  protected Hover hover(HoverParams params, CancelIndicator cancelIndicator) {
+    // This override is just a hacky little patch that is being applied downstream of the original
+    // mistake and
+    //  upstream of the ungraceful handling (IndexOutOfBoundsException) of said mistake. This patch
+    // is applied here
+    //  simply because it is easy. This would be done differently were it not for the fact that we
+    // plan to rebuild
+    //  this infrastructure from scratch anyway.
+    try {
+      return super.hover(params, cancelIndicator);
+    } catch (IndexOutOfBoundsException e) {
+      return IHoverService.EMPTY_HOVER; // Fail silently
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/lsp/LFLanguageServerExtension.java b/org.lflang/src/org/lflang/diagram/lsp/LFLanguageServerExtension.java
index fd25b0fc0a..18de51f482 100644
--- a/org.lflang/src/org/lflang/diagram/lsp/LFLanguageServerExtension.java
+++ b/org.lflang/src/org/lflang/diagram/lsp/LFLanguageServerExtension.java
@@ -1,125 +1,125 @@
 package org.lflang.diagram.lsp;
 
-import java.util.concurrent.CompletableFuture;
 import java.util.ArrayList;
-
+import java.util.concurrent.CompletableFuture;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.services.LanguageClient;
-import org.eclipse.xtext.ide.server.ILanguageServerExtension;
 import org.eclipse.xtext.ide.server.ILanguageServerAccess;
-
+import org.eclipse.xtext.ide.server.ILanguageServerExtension;
+import org.lflang.LFRuntimeModule;
+import org.lflang.LFStandaloneSetup;
+import org.lflang.generator.GeneratorResult;
 import org.lflang.generator.GeneratorResult.Status;
 import org.lflang.generator.IntegratedBuilder;
-import org.lflang.generator.GeneratorResult;
-import org.lflang.LFStandaloneSetup;
-import org.lflang.LFRuntimeModule;
 import org.lflang.util.LFCommand;
 
 /**
- * Provide Lingua-Franca-specific extensions to the
- * language server's behavior.
+ * Provide Lingua-Franca-specific extensions to the language server's behavior.
  *
  * @author Peter Donovan
  */
 class LFLanguageServerExtension implements ILanguageServerExtension {
 
-    /** The IntegratedBuilder instance that handles all build requests for the current session. */
-    private static final IntegratedBuilder builder = new LFStandaloneSetup(new LFRuntimeModule())
-        .createInjectorAndDoEMFRegistration().getInstance(IntegratedBuilder.class);
+  /** The IntegratedBuilder instance that handles all build requests for the current session. */
+  private static final IntegratedBuilder builder =
+      new LFStandaloneSetup(new LFRuntimeModule())
+          .createInjectorAndDoEMFRegistration()
+          .getInstance(IntegratedBuilder.class);
 
-    /** The access point for reading documents, communicating with the language client, etc. */
-    private LanguageClient client;
+  /** The access point for reading documents, communicating with the language client, etc. */
+  private LanguageClient client;
 
-    @Override
-    public void initialize(ILanguageServerAccess access) {
-        // This method is never invoked.
-    }
+  @Override
+  public void initialize(ILanguageServerAccess access) {
+    // This method is never invoked.
+  }
 
-    public void setClient(LanguageClient client) {
-        this.client = client;
-    }
+  public void setClient(LanguageClient client) {
+    this.client = client;
+  }
 
-    /**
-     * Handle a request for a complete build of the Lingua
-     * Franca file specified by {@code uri}.
-     * @param uri the URI of the LF file of interest
-     * @return A message describing the outcome of the build
-     * process.
-     */
-    @JsonRequest("generator/build")
-    public CompletableFuture<String> build(String uri) {
-        if (client == null) return CompletableFuture.completedFuture(
-            "Please wait for the Lingua Franca language server to be fully initialized."
-        );
-        return CompletableFuture.supplyAsync(
-            () -> {
-                try {
-                    return buildWithProgress(client, uri, true).getUserMessage();
-                } catch (Exception e) {
-                    return "An internal error occurred:\n" + e;
-                }
-            }
-        );
-    }
+  /**
+   * Handle a request for a complete build of the Lingua Franca file specified by {@code uri}.
+   *
+   * @param uri the URI of the LF file of interest
+   * @return A message describing the outcome of the build process.
+   */
+  @JsonRequest("generator/build")
+  public CompletableFuture<String> build(String uri) {
+    if (client == null)
+      return CompletableFuture.completedFuture(
+          "Please wait for the Lingua Franca language server to be fully initialized.");
+    return CompletableFuture.supplyAsync(
+        () -> {
+          try {
+            return buildWithProgress(client, uri, true).getUserMessage();
+          } catch (Exception e) {
+            return "An internal error occurred:\n" + e;
+          }
+        });
+  }
 
-    /**
-     * Handles a request for the most complete build of the
-     * specified Lingua Franca file that can be done in a
-     * limited amount of time.
-     * @param uri the URI of the LF file of interest
-     */
-    @JsonNotification("generator/partialBuild")
-    public void partialBuild(String uri) {
-        if (client == null) return;
-        buildWithProgress(client, uri, false);
-    }
+  /**
+   * Handles a request for the most complete build of the specified Lingua Franca file that can be
+   * done in a limited amount of time.
+   *
+   * @param uri the URI of the LF file of interest
+   */
+  @JsonNotification("generator/partialBuild")
+  public void partialBuild(String uri) {
+    if (client == null) return;
+    buildWithProgress(client, uri, false);
+  }
 
-    /**
-     * Completely build the specified LF program and provide information that is sufficient to
-     * run it.
-     * @param uri The URI of the LF program to be built.
-     * @return An array consisting of the directory in which the execute command should be
-     * executed, the program of the execute command, and the arguments of the execute command.
-     */
-    @JsonNotification("generator/buildAndRun")
-    public CompletableFuture<String[]> buildAndRun(String uri) {
-        return new CompletableFuture<String[]>().completeAsync(() -> {
-            var result = buildWithProgress(client, uri, true);
-            if (!result.getStatus().equals(Status.COMPILED)) return null;
-            LFCommand cmd = result.getContext().getFileConfig().getCommand();
-            ArrayList<String> ret = new ArrayList<>();
-            ret.add(cmd.directory().toString());
-            ret.addAll(cmd.command());
-            return ret.toArray(new String[0]);
-        });
-    }
+  /**
+   * Completely build the specified LF program and provide information that is sufficient to run it.
+   *
+   * @param uri The URI of the LF program to be built.
+   * @return An array consisting of the directory in which the execute command should be executed,
+   *     the program of the execute command, and the arguments of the execute command.
+   */
+  @JsonNotification("generator/buildAndRun")
+  public CompletableFuture<String[]> buildAndRun(String uri) {
+    return new CompletableFuture<String[]>()
+        .completeAsync(
+            () -> {
+              var result = buildWithProgress(client, uri, true);
+              if (!result.getStatus().equals(Status.COMPILED)) return null;
+              LFCommand cmd = result.getContext().getFileConfig().getCommand();
+              ArrayList<String> ret = new ArrayList<>();
+              ret.add(cmd.directory().toString());
+              ret.addAll(cmd.command());
+              return ret.toArray(new String[0]);
+            });
+  }
 
-    /**
-     * Describes a build process that has a progress.
-     */
-    private GeneratorResult buildWithProgress(LanguageClient client, String uri, boolean mustComplete) {
-        URI parsedUri;
-        try {
-            parsedUri = URI.createFileURI(new java.net.URI(uri).getPath());
-        } catch (java.net.URISyntaxException e) {
-            // This error will appear as a silent failure to most users, but that is acceptable because this error
-            // should be impossible. The URI is not the result of user input -- the language client provides it --
-            // so it should be valid.
-            System.err.println(e);
-            return GeneratorResult.NOTHING;
-        }
-        Progress progress = new Progress(client, "Build \"" + parsedUri.lastSegment() + "\"", mustComplete);
-        progress.begin();
-        GeneratorResult result = null;
-        try {
-            result = builder.run(
-                parsedUri, mustComplete, progress::report, progress.getCancelIndicator()
-            );
-        } finally {
-            progress.end(result == null ? "An internal error occurred." : result.getUserMessage());
-        }
-        return result;
+  /** Describes a build process that has a progress. */
+  private GeneratorResult buildWithProgress(
+      LanguageClient client, String uri, boolean mustComplete) {
+    URI parsedUri;
+    try {
+      parsedUri = URI.createFileURI(new java.net.URI(uri).getPath());
+    } catch (java.net.URISyntaxException e) {
+      // This error will appear as a silent failure to most users, but that is acceptable because
+      // this error
+      // should be impossible. The URI is not the result of user input -- the language client
+      // provides it --
+      // so it should be valid.
+      System.err.println(e);
+      return GeneratorResult.NOTHING;
+    }
+    Progress progress =
+        new Progress(client, "Build \"" + parsedUri.lastSegment() + "\"", mustComplete);
+    progress.begin();
+    GeneratorResult result = null;
+    try {
+      result =
+          builder.run(parsedUri, mustComplete, progress::report, progress.getCancelIndicator());
+    } finally {
+      progress.end(result == null ? "An internal error occurred." : result.getUserMessage());
     }
+    return result;
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/lsp/LanguageDiagramServer.java b/org.lflang/src/org/lflang/diagram/lsp/LanguageDiagramServer.java
index c4d7804453..96e887d242 100644
--- a/org.lflang/src/org/lflang/diagram/lsp/LanguageDiagramServer.java
+++ b/org.lflang/src/org/lflang/diagram/lsp/LanguageDiagramServer.java
@@ -1,20 +1,8 @@
 package org.lflang.diagram.lsp;
 
-import java.util.List;
-
-import org.eclipse.xtext.Constants;
-import org.eclipse.xtext.IGrammarAccess;
-import org.eclipse.xtext.ide.server.ILanguageServerExtension;
-import org.eclipse.xtext.ide.server.LanguageServerImpl;
-import org.eclipse.xtext.service.AbstractGenericModule;
-import org.eclipse.xtext.util.Modules2;
-import org.lflang.generator.LanguageServerErrorReporter;
-import org.lflang.ide.LFIdeSetup;
-
 import com.google.inject.Module;
 import com.google.inject.name.Names;
 import com.google.inject.util.Modules;
-
 import de.cau.cs.kieler.kgraph.text.services.KGraphGrammarAccess;
 import de.cau.cs.kieler.klighd.lsp.KGraphLanguageClient;
 import de.cau.cs.kieler.klighd.lsp.interactive.layered.LayeredInteractiveLanguageServerExtension;
@@ -24,82 +12,102 @@
 import de.cau.cs.kieler.klighd.lsp.launch.AbstractRegistrationLanguageServerExtension;
 import de.cau.cs.kieler.klighd.lsp.launch.ILanguageRegistration;
 import de.cau.cs.kieler.klighd.lsp.launch.Language;
+import java.util.List;
+import org.eclipse.xtext.Constants;
+import org.eclipse.xtext.IGrammarAccess;
+import org.eclipse.xtext.ide.server.ILanguageServerExtension;
+import org.eclipse.xtext.ide.server.LanguageServerImpl;
+import org.eclipse.xtext.service.AbstractGenericModule;
+import org.eclipse.xtext.util.Modules2;
+import org.lflang.generator.LanguageServerErrorReporter;
+import org.lflang.ide.LFIdeSetup;
 
 /**
  * Language server with extended diagram communication.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class LanguageDiagramServer extends AbstractLanguageServer {
-    
-    private static class LFLsCreator extends AbstractLsCreator {
 
-        @Override
-        public Module createLSModules(boolean socket) {
-            return Modules2.mixin(Modules.override(super.createLSModules(socket)).with(new AbstractGenericModule() {
-                public Class<? extends LanguageServerImpl> bindLanguageServerImpl() {
-                    return LFLanguageServer.class;
-                }
-            }), it -> {
-                // Temporary fix for an issue of Klighd with Xtext 2.28 (https://github.com/kieler/KLighD/issues/144)
-                it.bind(IGrammarAccess.class).to(KGraphGrammarAccess.class);
-                it.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance("de.cau.cs.kieler.kgraph.text.KGraph");    
-            });
-        }
-        
-        LayeredInteractiveLanguageServerExtension constraints;
-        RectpackingInteractiveLanguageServerExtension rectPack;
-        LFLanguageServerExtension lfExtension;
-        
-        @Override
-        public List<ILanguageServerExtension> getLanguageServerExtensions() {
-            constraints = injector.getInstance(LayeredInteractiveLanguageServerExtension.class);
-            rectPack = injector.getInstance(RectpackingInteractiveLanguageServerExtension.class);
-            lfExtension = injector.getInstance(LFLanguageServerExtension.class);
-            return List.of(
-                injector.getInstance(LFRegistrationLanguageServerExtension.class), constraints, rectPack, lfExtension
-            );
-        }
-        
-        @Override
-        public Class<? extends KGraphLanguageClient> getRemoteInterface() {
-            return KGraphLanguageClient.class;
-        }
-        
-        @Override
-        public void onConnect() {
-            super.onConnect();
-            constraints.setClient((KGraphLanguageClient) languageClient);
-            rectPack.setClient((KGraphLanguageClient) languageClient);
-            LanguageServerErrorReporter.setClient(languageClient);
-            lfExtension.setClient(languageClient);
-            // The following is needed because VS Code treats System.err like System.out and System.out like a shout
-            // into the void.
-            System.setOut(System.err);
-        }
+  private static class LFLsCreator extends AbstractLsCreator {
+
+    @Override
+    public Module createLSModules(boolean socket) {
+      return Modules2.mixin(
+          Modules.override(super.createLSModules(socket))
+              .with(
+                  new AbstractGenericModule() {
+                    public Class<? extends LanguageServerImpl> bindLanguageServerImpl() {
+                      return LFLanguageServer.class;
+                    }
+                  }),
+          it -> {
+            // Temporary fix for an issue of Klighd with Xtext 2.28
+            // (https://github.com/kieler/KLighD/issues/144)
+            it.bind(IGrammarAccess.class).to(KGraphGrammarAccess.class);
+            it.bind(String.class)
+                .annotatedWith(Names.named(Constants.LANGUAGE_NAME))
+                .toInstance("de.cau.cs.kieler.kgraph.text.KGraph");
+          });
+    }
+
+    LayeredInteractiveLanguageServerExtension constraints;
+    RectpackingInteractiveLanguageServerExtension rectPack;
+    LFLanguageServerExtension lfExtension;
+
+    @Override
+    public List<ILanguageServerExtension> getLanguageServerExtensions() {
+      constraints = injector.getInstance(LayeredInteractiveLanguageServerExtension.class);
+      rectPack = injector.getInstance(RectpackingInteractiveLanguageServerExtension.class);
+      lfExtension = injector.getInstance(LFLanguageServerExtension.class);
+      return List.of(
+          injector.getInstance(LFRegistrationLanguageServerExtension.class),
+          constraints,
+          rectPack,
+          lfExtension);
     }
-    
-    private static class LFLanguageRegistration implements ILanguageRegistration {
-        
-        @Override
-        public void bindAndRegisterLanguages() {
-            LFIdeSetup.doSetup();
-        }
+
+    @Override
+    public Class<? extends KGraphLanguageClient> getRemoteInterface() {
+      return KGraphLanguageClient.class;
     }
 
-    private static class LFRegistrationLanguageServerExtension extends AbstractRegistrationLanguageServerExtension {
-        
-        @Override
-        public List<Language> getLanguageExtensions() {
-            return List.of(new Language("lf", "Lingua Franca", List.of()));
-        }
+    @Override
+    public void onConnect() {
+      super.onConnect();
+      constraints.setClient((KGraphLanguageClient) languageClient);
+      rectPack.setClient((KGraphLanguageClient) languageClient);
+      LanguageServerErrorReporter.setClient(languageClient);
+      lfExtension.setClient(languageClient);
+      // The following is needed because VS Code treats System.err like System.out and System.out
+      // like a shout
+      // into the void.
+      System.setOut(System.err);
     }
-    
-    public static void main(String[] args) {
-        new LanguageDiagramServer().start();
+  }
+
+  private static class LFLanguageRegistration implements ILanguageRegistration {
+
+    @Override
+    public void bindAndRegisterLanguages() {
+      LFIdeSetup.doSetup();
     }
-    
-    public void start() {
-        configureAndRun(new LFLanguageRegistration(), new LFLsCreator());
+  }
+
+  private static class LFRegistrationLanguageServerExtension
+      extends AbstractRegistrationLanguageServerExtension {
+
+    @Override
+    public List<Language> getLanguageExtensions() {
+      return List.of(new Language("lf", "Lingua Franca", List.of()));
     }
+  }
+
+  public static void main(String[] args) {
+    new LanguageDiagramServer().start();
+  }
+
+  public void start() {
+    configureAndRun(new LFLanguageRegistration(), new LFLsCreator());
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/lsp/Progress.java b/org.lflang/src/org/lflang/diagram/lsp/Progress.java
index 2c1bb2f7fe..56c6788ea8 100644
--- a/org.lflang/src/org/lflang/diagram/lsp/Progress.java
+++ b/org.lflang/src/org/lflang/diagram/lsp/Progress.java
@@ -2,15 +2,14 @@
 
 import java.util.HashMap;
 import java.util.Map;
-
-import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.ProgressParams;
-import org.eclipse.lsp4j.services.LanguageClient;
-import org.eclipse.lsp4j.WorkDoneProgressCreateParams;
 import org.eclipse.lsp4j.WorkDoneProgressBegin;
+import org.eclipse.lsp4j.WorkDoneProgressCreateParams;
 import org.eclipse.lsp4j.WorkDoneProgressEnd;
 import org.eclipse.lsp4j.WorkDoneProgressNotification;
 import org.eclipse.lsp4j.WorkDoneProgressReport;
+import org.eclipse.lsp4j.jsonrpc.messages.Either;
+import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.xtext.util.CancelIndicator;
 
 /**
@@ -19,88 +18,85 @@
  * @author Peter Donovan
  */
 public class Progress {
-    private static int nextToken = 0;
-    private static final Map<Integer, Boolean> cancellations = new HashMap<>();
+  private static int nextToken = 0;
+  private static final Map<Integer, Boolean> cancellations = new HashMap<>();
 
-    private final LanguageClient client;
-    private final String title;
-    private final int token;
-    private final boolean cancellable;
+  private final LanguageClient client;
+  private final String title;
+  private final int token;
+  private final boolean cancellable;
 
-    /**
-     * Initialize the {@code Progress} of a task titled {@code title} that is
-     * triggered via {@code client}.
-     * @param client A language client through which a task was triggered.
-     * @param title The title of the task.
-     * @param cancellable Whether the task tracked by {@code this} can be
-     * cancelled.
-     */
-    public Progress(LanguageClient client, String title, boolean cancellable) {
-        this.client = client;
-        this.title = title;
-        this.token = nextToken++;
-        this.cancellable = cancellable;
-        if (cancellable) cancellations.put(token, false);
-        client.createProgress(new WorkDoneProgressCreateParams(Either.forRight(token)));
-    }
+  /**
+   * Initialize the {@code Progress} of a task titled {@code title} that is triggered via {@code
+   * client}.
+   *
+   * @param client A language client through which a task was triggered.
+   * @param title The title of the task.
+   * @param cancellable Whether the task tracked by {@code this} can be cancelled.
+   */
+  public Progress(LanguageClient client, String title, boolean cancellable) {
+    this.client = client;
+    this.title = title;
+    this.token = nextToken++;
+    this.cancellable = cancellable;
+    if (cancellable) cancellations.put(token, false);
+    client.createProgress(new WorkDoneProgressCreateParams(Either.forRight(token)));
+  }
 
-    /**
-     * Cancel the task tracked by the {@code Progress} that has token
-     * {@code token}.
-     */
-    public static void cancel(int token) {
-        if (cancellations.containsKey(token)) cancellations.put(token, true);
-    }
+  /** Cancel the task tracked by the {@code Progress} that has token {@code token}. */
+  public static void cancel(int token) {
+    if (cancellations.containsKey(token)) cancellations.put(token, true);
+  }
 
-    /**
-     * Returns the cancel indicator for the task tracked by this
-     * {@code Progress}.
-     * @return the cancel indicator for the task tracked by this
-     * {@code Progress}
-     */
-    public CancelIndicator getCancelIndicator() {
-        if (cancellable) return () -> cancellations.get(token);
-        return () -> false;
-    }
+  /**
+   * Returns the cancel indicator for the task tracked by this {@code Progress}.
+   *
+   * @return the cancel indicator for the task tracked by this {@code Progress}
+   */
+  public CancelIndicator getCancelIndicator() {
+    if (cancellable) return () -> cancellations.get(token);
+    return () -> false;
+  }
 
-    /**
-     * Report that the task tracked by {@code this} is done.
-     */
-    public void begin() {
-        WorkDoneProgressBegin begin = new WorkDoneProgressBegin();
-        begin.setTitle(title);
-        begin.setCancellable(cancellable);
-        begin.setPercentage(0);
-        notifyProgress(begin);
-    }
+  /** Report that the task tracked by {@code this} is done. */
+  public void begin() {
+    WorkDoneProgressBegin begin = new WorkDoneProgressBegin();
+    begin.setTitle(title);
+    begin.setCancellable(cancellable);
+    begin.setPercentage(0);
+    notifyProgress(begin);
+  }
 
-    /**
-     * Report the progress of the task tracked by {@code this}.
-     * @param message A message describing the progress of the task.
-     */
-    public void report(String message, Integer percentage) {
-        WorkDoneProgressReport report = new WorkDoneProgressReport();
-        report.setMessage(message);
-        report.setCancellable(cancellable);
-        report.setPercentage(percentage);
-        notifyProgress(report);
-    }
+  /**
+   * Report the progress of the task tracked by {@code this}.
+   *
+   * @param message A message describing the progress of the task.
+   */
+  public void report(String message, Integer percentage) {
+    WorkDoneProgressReport report = new WorkDoneProgressReport();
+    report.setMessage(message);
+    report.setCancellable(cancellable);
+    report.setPercentage(percentage);
+    notifyProgress(report);
+  }
 
-    /**
-     * Marks the task tracked by {@code this} as terminated.
-     * @param message A message describing the outcome of the task.
-     */
-    public void end(String message) {
-        WorkDoneProgressEnd end = new WorkDoneProgressEnd();
-        end.setMessage(message);
-        notifyProgress(end);
-    }
+  /**
+   * Marks the task tracked by {@code this} as terminated.
+   *
+   * @param message A message describing the outcome of the task.
+   */
+  public void end(String message) {
+    WorkDoneProgressEnd end = new WorkDoneProgressEnd();
+    end.setMessage(message);
+    notifyProgress(end);
+  }
 
-    /**
-     * Send the given progress notification to the client.
-     * @param notification
-     */
-    private void notifyProgress(WorkDoneProgressNotification notification) {
-        client.notifyProgress(new ProgressParams(Either.forRight(token), Either.forLeft(notification)));
-    }
+  /**
+   * Send the given progress notification to the client.
+   *
+   * @param notification
+   */
+  private void notifyProgress(WorkDoneProgressNotification notification) {
+    client.notifyProgress(new ProgressParams(Either.forRight(token), Either.forLeft(notification)));
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/AbstractSynthesisExtensions.java b/org.lflang/src/org/lflang/diagram/synthesis/AbstractSynthesisExtensions.java
index 1041af3ce7..4d32af61ef 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/AbstractSynthesisExtensions.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/AbstractSynthesisExtensions.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis;
 
 import de.cau.cs.kieler.klighd.SynthesisOption;
@@ -30,33 +30,33 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * Abstract super class for extension classes used in for the diagram synthesis that provides some convince methods.
- * 
+ * Abstract super class for extension classes used in for the diagram synthesis that provides some
+ * convince methods.
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public abstract class AbstractSynthesisExtensions {
-    
-    @Inject
-    private AbstractDiagramSynthesis<?> delegate;
-    
-    public boolean getBooleanValue(SynthesisOption option) {
-        return delegate.getBooleanValue(option);
-    }
-    
-    public float getFloatValue(SynthesisOption option) {
-        return delegate.getFloatValue(option);
-    }
-
-    public Object getObjectValue(final SynthesisOption option) {
-        return delegate.getObjectValue(option);
-    }
-      
-    public <T extends EObject> T associateWith(T derived, Object source) {
-        return delegate.associateWith(derived, source);
-    }
-    
-    @SuppressWarnings("unchecked")
-    public <T extends AbstractDiagramSynthesis<?>> T getRootSynthesis() {
-        return (T) delegate;
-    }
+
+  @Inject private AbstractDiagramSynthesis<?> delegate;
+
+  public boolean getBooleanValue(SynthesisOption option) {
+    return delegate.getBooleanValue(option);
+  }
+
+  public float getFloatValue(SynthesisOption option) {
+    return delegate.getFloatValue(option);
+  }
+
+  public Object getObjectValue(final SynthesisOption option) {
+    return delegate.getObjectValue(option);
+  }
+
+  public <T extends EObject> T associateWith(T derived, Object source) {
+    return delegate.associateWith(derived, source);
+  }
+
+  @SuppressWarnings("unchecked")
+  public <T extends AbstractDiagramSynthesis<?>> T getRootSynthesis() {
+    return (T) delegate;
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/org.lflang/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index 2b1a2a1bf6..45f3342a0a 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -1,29 +1,61 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis;
 
+import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Table;
+import de.cau.cs.kieler.klighd.DisplayedActionData;
+import de.cau.cs.kieler.klighd.SynthesisOption;
+import de.cau.cs.kieler.klighd.kgraph.KEdge;
+import de.cau.cs.kieler.klighd.kgraph.KLabel;
+import de.cau.cs.kieler.klighd.kgraph.KNode;
+import de.cau.cs.kieler.klighd.kgraph.KPort;
+import de.cau.cs.kieler.klighd.krendering.Colors;
+import de.cau.cs.kieler.klighd.krendering.HorizontalAlignment;
+import de.cau.cs.kieler.klighd.krendering.KContainerRendering;
+import de.cau.cs.kieler.klighd.krendering.KPolyline;
+import de.cau.cs.kieler.klighd.krendering.KRectangle;
+import de.cau.cs.kieler.klighd.krendering.KRendering;
+import de.cau.cs.kieler.klighd.krendering.KRoundedRectangle;
+import de.cau.cs.kieler.klighd.krendering.KStyle;
+import de.cau.cs.kieler.klighd.krendering.KText;
+import de.cau.cs.kieler.klighd.krendering.LineCap;
+import de.cau.cs.kieler.klighd.krendering.LineStyle;
+import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
+import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KEdgeExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KLabelExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions;
+import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis;
+import de.cau.cs.kieler.klighd.util.KlighdProperties;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.EnumSet;
@@ -35,9 +67,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import javax.inject.Inject;
-
 import org.eclipse.elk.alg.layered.options.LayerConstraint;
 import org.eclipse.elk.alg.layered.options.LayeredOptions;
 import org.eclipse.elk.alg.layered.options.NodePlacementStrategy;
@@ -62,9 +92,9 @@
 import org.eclipse.xtext.xbase.lib.ListExtensions;
 import org.eclipse.xtext.xbase.lib.Pair;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.lflang.ast.ASTUtils;
 import org.lflang.AttributeUtils;
 import org.lflang.InferredType;
+import org.lflang.ast.ASTUtils;
 import org.lflang.ast.FormattingUtils;
 import org.lflang.diagram.synthesis.action.CollapseAllReactorsAction;
 import org.lflang.diagram.synthesis.action.ExpandAllReactorsAction;
@@ -99,40 +129,6 @@
 import org.lflang.lf.StateVar;
 import org.lflang.util.FileUtil;
 
-import com.google.common.collect.HashBasedTable;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Table;
-
-import de.cau.cs.kieler.klighd.DisplayedActionData;
-import de.cau.cs.kieler.klighd.SynthesisOption;
-import de.cau.cs.kieler.klighd.kgraph.KEdge;
-import de.cau.cs.kieler.klighd.kgraph.KLabel;
-import de.cau.cs.kieler.klighd.kgraph.KNode;
-import de.cau.cs.kieler.klighd.kgraph.KPort;
-import de.cau.cs.kieler.klighd.krendering.Colors;
-import de.cau.cs.kieler.klighd.krendering.HorizontalAlignment;
-import de.cau.cs.kieler.klighd.krendering.KContainerRendering;
-import de.cau.cs.kieler.klighd.krendering.KPolyline;
-import de.cau.cs.kieler.klighd.krendering.KRectangle;
-import de.cau.cs.kieler.klighd.krendering.KRendering;
-import de.cau.cs.kieler.klighd.krendering.KRoundedRectangle;
-import de.cau.cs.kieler.klighd.krendering.KStyle;
-import de.cau.cs.kieler.klighd.krendering.KText;
-import de.cau.cs.kieler.klighd.krendering.LineCap;
-import de.cau.cs.kieler.klighd.krendering.LineStyle;
-import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
-import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KEdgeExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KLabelExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions;
-import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis;
-import de.cau.cs.kieler.klighd.util.KlighdProperties;
-
 /**
  * Diagram synthesis for Lingua Franca programs.
  *
@@ -140,1270 +136,1537 @@
  */
 @ViewSynthesisShared
 public class LinguaFrancaSynthesis extends AbstractDiagramSynthesis<Model> {
-    @Inject @Extension private KNodeExtensions _kNodeExtensions;
-    @Inject @Extension private KEdgeExtensions _kEdgeExtensions;
-    @Inject @Extension private KPortExtensions _kPortExtensions;
-    @Inject @Extension private KLabelExtensions _kLabelExtensions;
-    @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
-    @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
-    @Inject @Extension private KPolylineExtensions _kPolylineExtensions;
-    @Inject @Extension private LinguaFrancaStyleExtensions _linguaFrancaStyleExtensions;
-    @Inject @Extension private LinguaFrancaShapeExtensions _linguaFrancaShapeExtensions;
-    @Inject @Extension private UtilityExtensions _utilityExtensions;
-    @Inject @Extension private CycleVisualization _cycleVisualization;
-    @Inject @Extension private InterfaceDependenciesVisualization _interfaceDependenciesVisualization;
-    @Inject @Extension private FilterCycleAction _filterCycleAction;
-    @Inject @Extension private ReactorIcons _reactorIcons;
-    @Inject @Extension private ModeDiagrams _modeDiagrams;
-    @Inject @Extension private LayoutPostProcessing _layoutPostProcessing;
-
-    // -------------------------------------------------------------------------
-
-    public static final String ID = "org.lflang.diagram.synthesis.LinguaFrancaSynthesis";
-
-    // -- INTERNAL --
-    public static final Property<Boolean> REACTOR_RECURSIVE_INSTANTIATION = new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.recursive.instantiation", false);
-    public static final Property<Boolean> REACTOR_HAS_BANK_PORT_OFFSET = new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.bank.offset", false);
-    public static final Property<Boolean> REACTOR_INPUT = new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.input", false);
-    public static final Property<Boolean> REACTOR_OUTPUT = new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.output", false);
-    public static final Property<Boolean> REACTION_SPECIAL_TRIGGER = new Property<>("org.lflang.linguafranca.diagram.synthesis.reaction.special.trigger", false);
-
-    // -- STYLE --
-    public static final List<Float> ALTERNATIVE_DASH_PATTERN = List.of(3.0f);
-
-    // -- TEXT --
-    public static final String TEXT_ERROR_RECURSIVE = "Recursive reactor instantiation!";
-    public static final String TEXT_ERROR_CONTAINS_RECURSION = "Reactor contains recursive instantiation!";
-    public static final String TEXT_ERROR_CONTAINS_CYCLE = "Reactor contains cyclic dependencies!";
-    public static final String TEXT_ERROR_CYCLE_DETECTION = "Dependency cycle detection failed.\nCould not detect dependency cycles due to unexpected graph structure.";
-    public static final String TEXT_ERROR_CYCLE_BTN_SHOW = "Show Cycle";
-    public static final String TEXT_ERROR_CYCLE_BTN_FILTER = "Filter Cycle";
-    public static final String TEXT_ERROR_CYCLE_BTN_UNFILTER = "Remove Cycle Filter";
-    public static final String TEXT_NO_MAIN_REACTOR = "No Main Reactor";
-    public static final String TEXT_REACTOR_NULL = "Reactor is null";
-    public static final String TEXT_HIDE_ACTION = "[Hide]";
-    public static final String TEXT_SHOW_ACTION = "[Details]";
-
-    // -------------------------------------------------------------------------
-
-    /** Synthesis category */
-    public static final SynthesisOption APPEARANCE = SynthesisOption.createCategory("Appearance", true);
-    public static final SynthesisOption EXPERIMENTAL = SynthesisOption.createCategory("Experimental", true);
-    public static final SynthesisOption LAYOUT = SynthesisOption.createCategory("Layout", false).setCategory(LinguaFrancaSynthesis.APPEARANCE);
-
-    /** Synthesis options */
-    public static final SynthesisOption SHOW_ALL_REACTORS = SynthesisOption.createCheckOption("All Reactors", false);
-    public static final SynthesisOption CYCLE_DETECTION = SynthesisOption.createCheckOption("Dependency Cycle Detection", true);
-
-    public static final SynthesisOption SHOW_USER_LABELS = SynthesisOption.createCheckOption("User Labels (@label in JavaDoc)", true).setCategory(APPEARANCE);
-    public static final SynthesisOption SHOW_HYPERLINKS = SynthesisOption.createCheckOption("Expand/Collapse Hyperlinks", false).setCategory(APPEARANCE);
-    public static final SynthesisOption REACTIONS_USE_HYPEREDGES = SynthesisOption.createCheckOption("Bundled Dependencies", false).setCategory(APPEARANCE);
-    public static final SynthesisOption USE_ALTERNATIVE_DASH_PATTERN = SynthesisOption.createCheckOption("Alternative Dependency Line Style", false).setCategory(APPEARANCE);
-    public static final SynthesisOption SHOW_PORT_NAMES = SynthesisOption.createCheckOption("Port names", true).setCategory(APPEARANCE);
-    public static final SynthesisOption SHOW_MULTIPORT_WIDTH = SynthesisOption.createCheckOption("Multiport Widths", false).setCategory(APPEARANCE);
-    public static final SynthesisOption SHOW_REACTION_CODE = SynthesisOption.createCheckOption("Reaction Code", false).setCategory(APPEARANCE);
-    public static final SynthesisOption SHOW_REACTION_LEVEL = SynthesisOption.createCheckOption("Reaction Level", false).setCategory(APPEARANCE);
-    public static final SynthesisOption SHOW_REACTION_ORDER_EDGES = SynthesisOption.createCheckOption("Reaction Order Edges", false).setCategory(APPEARANCE);
-    public static final SynthesisOption SHOW_REACTOR_HOST = SynthesisOption.createCheckOption("Reactor Host Addresses", true).setCategory(APPEARANCE);
-    public static final SynthesisOption SHOW_INSTANCE_NAMES = SynthesisOption.createCheckOption("Reactor Instance Names", false).setCategory(APPEARANCE);
-    public static final SynthesisOption REACTOR_PARAMETER_MODE = SynthesisOption.createChoiceOption("Reactor Parameters", ((List<?>)Conversions.doWrapArray(ReactorParameterDisplayModes.values())), ReactorParameterDisplayModes.NONE).setCategory(APPEARANCE);
-    public static final SynthesisOption SHOW_STATE_VARIABLES = SynthesisOption.createCheckOption("Reactor State Variables", false).setCategory(APPEARANCE);
-    public static final SynthesisOption REACTOR_BODY_TABLE_COLS = SynthesisOption.<Integer>createRangeOption("Reactor Parameter/Variable Columns", 1, 10, 1).setCategory(APPEARANCE);
-
-    public static final SynthesisOption SPACING = SynthesisOption.<Integer>createRangeOption("Spacing (%)", 0, 150, 5, 75).setCategory(LAYOUT);
-
-    /** Synthesis actions */
-    public static final DisplayedActionData COLLAPSE_ALL = DisplayedActionData.create(CollapseAllReactorsAction.ID, "Hide all Details");
-    public static final DisplayedActionData EXPAND_ALL = DisplayedActionData.create(ExpandAllReactorsAction.ID, "Show all Details");
-
-    @Override
-    public List<SynthesisOption> getDisplayedSynthesisOptions() {
-        return List.of(
-            SHOW_ALL_REACTORS,
-            MemorizingExpandCollapseAction.MEMORIZE_EXPANSION_STATES,
-            CYCLE_DETECTION,
-            APPEARANCE,
-            ModeDiagrams.MODES_CATEGORY,
-            ModeDiagrams.SHOW_TRANSITION_LABELS,
-            ModeDiagrams.INITIALLY_COLLAPSE_MODES,
-            SHOW_USER_LABELS,
-            SHOW_HYPERLINKS,
-            //LinguaFrancaSynthesisInterfaceDependencies.SHOW_INTERFACE_DEPENDENCIES,
-            REACTIONS_USE_HYPEREDGES,
-            USE_ALTERNATIVE_DASH_PATTERN,
-            SHOW_PORT_NAMES,
-            SHOW_MULTIPORT_WIDTH,
-            SHOW_REACTION_CODE,
-            SHOW_REACTION_LEVEL,
-            SHOW_REACTION_ORDER_EDGES,
-            SHOW_REACTOR_HOST,
-            SHOW_INSTANCE_NAMES,
-            REACTOR_PARAMETER_MODE,
-            SHOW_STATE_VARIABLES,
-            REACTOR_BODY_TABLE_COLS,
-            LAYOUT,
-            LayoutPostProcessing.MODEL_ORDER,
-            SPACING
-        );
-    }
-
-    @Override
-    public List<DisplayedActionData> getDisplayedActions() {
-        return List.of(COLLAPSE_ALL, EXPAND_ALL);
-    }
-
-    // -------------------------------------------------------------------------
-
-    @Override
-    public KNode transform(final Model model) {
-        KNode rootNode = _kNodeExtensions.createNode();
-        setLayoutOption(rootNode, CoreOptions.ALGORITHM, LayeredOptions.ALGORITHM_ID);
-        setLayoutOption(rootNode, CoreOptions.DIRECTION, Direction.RIGHT);
-        setLayoutOption(rootNode, CoreOptions.PADDING, new ElkPadding(0));
-
-        try {
-            // Find main
-            Reactor main = IterableExtensions.findFirst(model.getReactors(), _utilityExtensions::isMainOrFederated);
-            if (main != null) {
-                ReactorInstance reactorInstance = new ReactorInstance(main, new SynthesisErrorReporter());
-                rootNode.getChildren().addAll(createReactorNode(reactorInstance, true, null, null, new HashMap<>()));
-            } else if (!getBooleanValue(SHOW_ALL_REACTORS)) {
-                KNode messageNode = _kNodeExtensions.createNode();
-                _linguaFrancaShapeExtensions.addErrorMessage(messageNode, TEXT_NO_MAIN_REACTOR, null);
-                rootNode.getChildren().add(messageNode);
-            }
-
-            // Show all reactors
-            if (main == null || getBooleanValue(SHOW_ALL_REACTORS)) {
-                List<KNode> reactorNodes = new ArrayList<>();
-                for (Reactor reactor : model.getReactors()) {
-                    if (reactor == main) continue;
-                    ReactorInstance reactorInstance = new ReactorInstance(reactor, new SynthesisErrorReporter());
-                    reactorNodes.addAll(createReactorNode(reactorInstance, main == null,
-                            HashBasedTable.<ReactorInstance, PortInstance, KPort>create(),
-                            HashBasedTable.<ReactorInstance, PortInstance, KPort>create(),
-                            new HashMap<>()));
-                }
-                if (!reactorNodes.isEmpty()) {
-                    // To allow ordering, we need box layout but we also need layered layout for ports thus wrap all node
-                    reactorNodes.add(0, IterableExtensions.head(rootNode.getChildren()));
-
-                    int index = 0;
-                    for (KNode node : reactorNodes) {
-                        // Element could be null if there is no main reactor and Show All Reactors is checked.
-                        if (node == null) continue;
-                        if (node.getProperty(CoreOptions.COMMENT_BOX)) continue;
-                        KNode child = _kNodeExtensions.createNode();
-                        child.getChildren().add(node);
-                        // Add comment nodes
-                        for (KEdge edge : node.getIncomingEdges()) {
-                            if (!edge.getSource().getProperty(CoreOptions.COMMENT_BOX)) continue;
-                            child.getChildren().add(edge.getSource());
-                        }
-                        _kRenderingExtensions.addInvisibleContainerRendering(child);
-                        setLayoutOption(child, CoreOptions.ALGORITHM, LayeredOptions.ALGORITHM_ID);
-                        setLayoutOption(child, CoreOptions.DIRECTION, Direction.RIGHT);
-                        setLayoutOption(child, CoreOptions.PADDING, new ElkPadding(0));
-                        // Legacy ordering option.
-                        setLayoutOption(child, CoreOptions.PRIORITY, reactorNodes.size() - index); // Order!
-                        rootNode.getChildren().add(child);
-                        index++;
-                    }
-
-                    setLayoutOption(rootNode, CoreOptions.ALGORITHM, BoxLayouterOptions.ALGORITHM_ID);
-                    setLayoutOption(rootNode, CoreOptions.SPACING_NODE_NODE, 25.0);
-                }
+  @Inject @Extension private KNodeExtensions _kNodeExtensions;
+  @Inject @Extension private KEdgeExtensions _kEdgeExtensions;
+  @Inject @Extension private KPortExtensions _kPortExtensions;
+  @Inject @Extension private KLabelExtensions _kLabelExtensions;
+  @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
+  @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
+  @Inject @Extension private KPolylineExtensions _kPolylineExtensions;
+  @Inject @Extension private LinguaFrancaStyleExtensions _linguaFrancaStyleExtensions;
+  @Inject @Extension private LinguaFrancaShapeExtensions _linguaFrancaShapeExtensions;
+  @Inject @Extension private UtilityExtensions _utilityExtensions;
+  @Inject @Extension private CycleVisualization _cycleVisualization;
+  @Inject @Extension private InterfaceDependenciesVisualization _interfaceDependenciesVisualization;
+  @Inject @Extension private FilterCycleAction _filterCycleAction;
+  @Inject @Extension private ReactorIcons _reactorIcons;
+  @Inject @Extension private ModeDiagrams _modeDiagrams;
+  @Inject @Extension private LayoutPostProcessing _layoutPostProcessing;
+
+  // -------------------------------------------------------------------------
+
+  public static final String ID = "org.lflang.diagram.synthesis.LinguaFrancaSynthesis";
+
+  // -- INTERNAL --
+  public static final Property<Boolean> REACTOR_RECURSIVE_INSTANTIATION =
+      new Property<>(
+          "org.lflang.linguafranca.diagram.synthesis.reactor.recursive.instantiation", false);
+  public static final Property<Boolean> REACTOR_HAS_BANK_PORT_OFFSET =
+      new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.bank.offset", false);
+  public static final Property<Boolean> REACTOR_INPUT =
+      new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.input", false);
+  public static final Property<Boolean> REACTOR_OUTPUT =
+      new Property<>("org.lflang.linguafranca.diagram.synthesis.reactor.output", false);
+  public static final Property<Boolean> REACTION_SPECIAL_TRIGGER =
+      new Property<>("org.lflang.linguafranca.diagram.synthesis.reaction.special.trigger", false);
+
+  // -- STYLE --
+  public static final List<Float> ALTERNATIVE_DASH_PATTERN = List.of(3.0f);
+
+  // -- TEXT --
+  public static final String TEXT_ERROR_RECURSIVE = "Recursive reactor instantiation!";
+  public static final String TEXT_ERROR_CONTAINS_RECURSION =
+      "Reactor contains recursive instantiation!";
+  public static final String TEXT_ERROR_CONTAINS_CYCLE = "Reactor contains cyclic dependencies!";
+  public static final String TEXT_ERROR_CYCLE_DETECTION =
+      "Dependency cycle detection failed.\n"
+          + "Could not detect dependency cycles due to unexpected graph structure.";
+  public static final String TEXT_ERROR_CYCLE_BTN_SHOW = "Show Cycle";
+  public static final String TEXT_ERROR_CYCLE_BTN_FILTER = "Filter Cycle";
+  public static final String TEXT_ERROR_CYCLE_BTN_UNFILTER = "Remove Cycle Filter";
+  public static final String TEXT_NO_MAIN_REACTOR = "No Main Reactor";
+  public static final String TEXT_REACTOR_NULL = "Reactor is null";
+  public static final String TEXT_HIDE_ACTION = "[Hide]";
+  public static final String TEXT_SHOW_ACTION = "[Details]";
+
+  // -------------------------------------------------------------------------
+
+  /** Synthesis category */
+  public static final SynthesisOption APPEARANCE =
+      SynthesisOption.createCategory("Appearance", true);
+
+  public static final SynthesisOption EXPERIMENTAL =
+      SynthesisOption.createCategory("Experimental", true);
+  public static final SynthesisOption LAYOUT =
+      SynthesisOption.createCategory("Layout", false).setCategory(LinguaFrancaSynthesis.APPEARANCE);
+
+  /** Synthesis options */
+  public static final SynthesisOption SHOW_ALL_REACTORS =
+      SynthesisOption.createCheckOption("All Reactors", false);
+
+  public static final SynthesisOption CYCLE_DETECTION =
+      SynthesisOption.createCheckOption("Dependency Cycle Detection", true);
+
+  public static final SynthesisOption SHOW_USER_LABELS =
+      SynthesisOption.createCheckOption("User Labels (@label in JavaDoc)", true)
+          .setCategory(APPEARANCE);
+  public static final SynthesisOption SHOW_HYPERLINKS =
+      SynthesisOption.createCheckOption("Expand/Collapse Hyperlinks", false)
+          .setCategory(APPEARANCE);
+  public static final SynthesisOption REACTIONS_USE_HYPEREDGES =
+      SynthesisOption.createCheckOption("Bundled Dependencies", false).setCategory(APPEARANCE);
+  public static final SynthesisOption USE_ALTERNATIVE_DASH_PATTERN =
+      SynthesisOption.createCheckOption("Alternative Dependency Line Style", false)
+          .setCategory(APPEARANCE);
+  public static final SynthesisOption SHOW_PORT_NAMES =
+      SynthesisOption.createCheckOption("Port names", true).setCategory(APPEARANCE);
+  public static final SynthesisOption SHOW_MULTIPORT_WIDTH =
+      SynthesisOption.createCheckOption("Multiport Widths", false).setCategory(APPEARANCE);
+  public static final SynthesisOption SHOW_REACTION_CODE =
+      SynthesisOption.createCheckOption("Reaction Code", false).setCategory(APPEARANCE);
+  public static final SynthesisOption SHOW_REACTION_LEVEL =
+      SynthesisOption.createCheckOption("Reaction Level", false).setCategory(APPEARANCE);
+  public static final SynthesisOption SHOW_REACTION_ORDER_EDGES =
+      SynthesisOption.createCheckOption("Reaction Order Edges", false).setCategory(APPEARANCE);
+  public static final SynthesisOption SHOW_REACTOR_HOST =
+      SynthesisOption.createCheckOption("Reactor Host Addresses", true).setCategory(APPEARANCE);
+  public static final SynthesisOption SHOW_INSTANCE_NAMES =
+      SynthesisOption.createCheckOption("Reactor Instance Names", false).setCategory(APPEARANCE);
+  public static final SynthesisOption REACTOR_PARAMETER_MODE =
+      SynthesisOption.createChoiceOption(
+              "Reactor Parameters",
+              ((List<?>) Conversions.doWrapArray(ReactorParameterDisplayModes.values())),
+              ReactorParameterDisplayModes.NONE)
+          .setCategory(APPEARANCE);
+  public static final SynthesisOption SHOW_STATE_VARIABLES =
+      SynthesisOption.createCheckOption("Reactor State Variables", false).setCategory(APPEARANCE);
+  public static final SynthesisOption REACTOR_BODY_TABLE_COLS =
+      SynthesisOption.<Integer>createRangeOption("Reactor Parameter/Variable Columns", 1, 10, 1)
+          .setCategory(APPEARANCE);
+
+  public static final SynthesisOption SPACING =
+      SynthesisOption.<Integer>createRangeOption("Spacing (%)", 0, 150, 5, 75).setCategory(LAYOUT);
+
+  /** Synthesis actions */
+  public static final DisplayedActionData COLLAPSE_ALL =
+      DisplayedActionData.create(CollapseAllReactorsAction.ID, "Hide all Details");
+
+  public static final DisplayedActionData EXPAND_ALL =
+      DisplayedActionData.create(ExpandAllReactorsAction.ID, "Show all Details");
+
+  @Override
+  public List<SynthesisOption> getDisplayedSynthesisOptions() {
+    return List.of(
+        SHOW_ALL_REACTORS,
+        MemorizingExpandCollapseAction.MEMORIZE_EXPANSION_STATES,
+        CYCLE_DETECTION,
+        APPEARANCE,
+        ModeDiagrams.MODES_CATEGORY,
+        ModeDiagrams.SHOW_TRANSITION_LABELS,
+        ModeDiagrams.INITIALLY_COLLAPSE_MODES,
+        SHOW_USER_LABELS,
+        SHOW_HYPERLINKS,
+        // LinguaFrancaSynthesisInterfaceDependencies.SHOW_INTERFACE_DEPENDENCIES,
+        REACTIONS_USE_HYPEREDGES,
+        USE_ALTERNATIVE_DASH_PATTERN,
+        SHOW_PORT_NAMES,
+        SHOW_MULTIPORT_WIDTH,
+        SHOW_REACTION_CODE,
+        SHOW_REACTION_LEVEL,
+        SHOW_REACTION_ORDER_EDGES,
+        SHOW_REACTOR_HOST,
+        SHOW_INSTANCE_NAMES,
+        REACTOR_PARAMETER_MODE,
+        SHOW_STATE_VARIABLES,
+        REACTOR_BODY_TABLE_COLS,
+        LAYOUT,
+        LayoutPostProcessing.MODEL_ORDER,
+        SPACING);
+  }
+
+  @Override
+  public List<DisplayedActionData> getDisplayedActions() {
+    return List.of(COLLAPSE_ALL, EXPAND_ALL);
+  }
+
+  // -------------------------------------------------------------------------
+
+  @Override
+  public KNode transform(final Model model) {
+    KNode rootNode = _kNodeExtensions.createNode();
+    setLayoutOption(rootNode, CoreOptions.ALGORITHM, LayeredOptions.ALGORITHM_ID);
+    setLayoutOption(rootNode, CoreOptions.DIRECTION, Direction.RIGHT);
+    setLayoutOption(rootNode, CoreOptions.PADDING, new ElkPadding(0));
+
+    try {
+      // Find main
+      Reactor main =
+          IterableExtensions.findFirst(model.getReactors(), _utilityExtensions::isMainOrFederated);
+      if (main != null) {
+        ReactorInstance reactorInstance = new ReactorInstance(main, new SynthesisErrorReporter());
+        rootNode
+            .getChildren()
+            .addAll(createReactorNode(reactorInstance, true, null, null, new HashMap<>()));
+      } else if (!getBooleanValue(SHOW_ALL_REACTORS)) {
+        KNode messageNode = _kNodeExtensions.createNode();
+        _linguaFrancaShapeExtensions.addErrorMessage(messageNode, TEXT_NO_MAIN_REACTOR, null);
+        rootNode.getChildren().add(messageNode);
+      }
+
+      // Show all reactors
+      if (main == null || getBooleanValue(SHOW_ALL_REACTORS)) {
+        List<KNode> reactorNodes = new ArrayList<>();
+        for (Reactor reactor : model.getReactors()) {
+          if (reactor == main) continue;
+          ReactorInstance reactorInstance =
+              new ReactorInstance(reactor, new SynthesisErrorReporter());
+          reactorNodes.addAll(
+              createReactorNode(
+                  reactorInstance,
+                  main == null,
+                  HashBasedTable.<ReactorInstance, PortInstance, KPort>create(),
+                  HashBasedTable.<ReactorInstance, PortInstance, KPort>create(),
+                  new HashMap<>()));
+        }
+        if (!reactorNodes.isEmpty()) {
+          // To allow ordering, we need box layout but we also need layered layout for ports thus
+          // wrap all node
+          reactorNodes.add(0, IterableExtensions.head(rootNode.getChildren()));
+
+          int index = 0;
+          for (KNode node : reactorNodes) {
+            // Element could be null if there is no main reactor and Show All Reactors is checked.
+            if (node == null) continue;
+            if (node.getProperty(CoreOptions.COMMENT_BOX)) continue;
+            KNode child = _kNodeExtensions.createNode();
+            child.getChildren().add(node);
+            // Add comment nodes
+            for (KEdge edge : node.getIncomingEdges()) {
+              if (!edge.getSource().getProperty(CoreOptions.COMMENT_BOX)) continue;
+              child.getChildren().add(edge.getSource());
             }
-        } catch (Exception e) {
-            e.printStackTrace();
+            _kRenderingExtensions.addInvisibleContainerRendering(child);
+            setLayoutOption(child, CoreOptions.ALGORITHM, LayeredOptions.ALGORITHM_ID);
+            setLayoutOption(child, CoreOptions.DIRECTION, Direction.RIGHT);
+            setLayoutOption(child, CoreOptions.PADDING, new ElkPadding(0));
+            // Legacy ordering option.
+            setLayoutOption(child, CoreOptions.PRIORITY, reactorNodes.size() - index); // Order!
+            rootNode.getChildren().add(child);
+            index++;
+          }
 
-            KNode messageNode = _kNodeExtensions.createNode();
-            _linguaFrancaShapeExtensions.addErrorMessage(messageNode, "Error in Diagram Synthesis",
-                    e.getClass().getSimpleName() + " occurred. Could not create diagram.");
-            rootNode.getChildren().add(messageNode);
+          setLayoutOption(rootNode, CoreOptions.ALGORITHM, BoxLayouterOptions.ALGORITHM_ID);
+          setLayoutOption(rootNode, CoreOptions.SPACING_NODE_NODE, 25.0);
         }
+      }
+    } catch (Exception e) {
+      e.printStackTrace();
+
+      KNode messageNode = _kNodeExtensions.createNode();
+      _linguaFrancaShapeExtensions.addErrorMessage(
+          messageNode,
+          "Error in Diagram Synthesis",
+          e.getClass().getSimpleName() + " occurred. Could not create diagram.");
+      rootNode.getChildren().add(messageNode);
+    }
 
-        return rootNode;
+    return rootNode;
+  }
+
+  private Collection<KNode> createReactorNode(
+      ReactorInstance reactorInstance,
+      boolean expandDefault,
+      Table<ReactorInstance, PortInstance, KPort> inputPortsReg,
+      Table<ReactorInstance, PortInstance, KPort> outputPortsReg,
+      Map<ReactorInstance, KNode> allReactorNodes) {
+    Reactor reactor = reactorInstance.reactorDefinition;
+    KNode node = _kNodeExtensions.createNode();
+    allReactorNodes.put(reactorInstance, node);
+    associateWith(node, reactor);
+    _utilityExtensions.setID(node, reactorInstance.uniqueID());
+    // save to distinguish nodes associated with the same reactor
+    NamedInstanceUtil.linkInstance(node, reactorInstance);
+
+    List<KNode> nodes = new ArrayList<>();
+    nodes.add(node);
+    String label = createReactorLabel(reactorInstance);
+
+    if (reactorInstance.recursive) {
+      // Mark this node
+      node.setProperty(REACTOR_RECURSIVE_INSTANTIATION, true);
+      // Mark root
+      allReactorNodes
+          .get(reactorInstance.root())
+          .setProperty(REACTOR_RECURSIVE_INSTANTIATION, true);
     }
 
-    private Collection<KNode> createReactorNode(
-        ReactorInstance reactorInstance,
-        boolean expandDefault,
-        Table<ReactorInstance, PortInstance, KPort> inputPortsReg,
-        Table<ReactorInstance, PortInstance, KPort> outputPortsReg,
-        Map<ReactorInstance, KNode> allReactorNodes
-    ) {
-        Reactor reactor = reactorInstance.reactorDefinition;
-        KNode node = _kNodeExtensions.createNode();
-        allReactorNodes.put(reactorInstance, node);
-        associateWith(node, reactor);
-        _utilityExtensions.setID(node, reactorInstance.uniqueID());
-        // save to distinguish nodes associated with the same reactor
-        NamedInstanceUtil.linkInstance(node, reactorInstance);
-
-        List<KNode> nodes = new ArrayList<>();
-        nodes.add(node);
-        String label = createReactorLabel(reactorInstance);
-
-        if (reactorInstance.recursive) {
-            // Mark this node
-            node.setProperty(REACTOR_RECURSIVE_INSTANTIATION, true);
-            // Mark root
-            allReactorNodes.get(reactorInstance.root()).setProperty(REACTOR_RECURSIVE_INSTANTIATION, true);
+    if (reactor == null) {
+      _linguaFrancaShapeExtensions.addErrorMessage(node, TEXT_REACTOR_NULL, null);
+    } else if (reactorInstance.isMainOrFederated()) {
+      KRoundedRectangle figure =
+          _linguaFrancaShapeExtensions.addMainReactorFigure(node, reactorInstance, label);
+
+      if (getObjectValue(REACTOR_PARAMETER_MODE) == ReactorParameterDisplayModes.TABLE
+          && !reactorInstance.parameters.isEmpty()) {
+        KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(figure);
+        _kRenderingExtensions.setInvisible(rectangle, true);
+        _kRenderingExtensions.to(
+            _kRenderingExtensions.from(
+                _kRenderingExtensions.setGridPlacementData(rectangle),
+                _kRenderingExtensions.LEFT,
+                6,
+                0,
+                _kRenderingExtensions.TOP,
+                0,
+                0),
+            _kRenderingExtensions.RIGHT,
+            6,
+            0,
+            _kRenderingExtensions.BOTTOM,
+            4,
+            0);
+        _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
+        addParameterList(rectangle, reactorInstance.parameters);
+      }
+
+      if (getBooleanValue(SHOW_STATE_VARIABLES)) {
+        var variables =
+            ASTUtils.<StateVar>collectElements(
+                reactor, LfPackage.eINSTANCE.getReactor_StateVars(), true, false);
+        if (!variables.isEmpty()) {
+          KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(figure);
+          _kRenderingExtensions.setInvisible(rectangle, true);
+          _kRenderingExtensions.to(
+              _kRenderingExtensions.from(
+                  _kRenderingExtensions.setGridPlacementData(rectangle),
+                  _kRenderingExtensions.LEFT,
+                  6,
+                  0,
+                  _kRenderingExtensions.TOP,
+                  0,
+                  0),
+              _kRenderingExtensions.RIGHT,
+              6,
+              0,
+              _kRenderingExtensions.BOTTOM,
+              4,
+              0);
+          _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
+          addStateVariableList(rectangle, variables);
         }
-
-        if (reactor == null) {
-            _linguaFrancaShapeExtensions.addErrorMessage(node, TEXT_REACTOR_NULL, null);
-        } else if (reactorInstance.isMainOrFederated()) {
-            KRoundedRectangle figure = _linguaFrancaShapeExtensions.addMainReactorFigure(node, reactorInstance, label);
-
-            if (getObjectValue(REACTOR_PARAMETER_MODE) == ReactorParameterDisplayModes.TABLE
-                && !reactorInstance.parameters.isEmpty()
-            ) {
-                KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(figure);
-                _kRenderingExtensions.setInvisible(rectangle, true);
-                _kRenderingExtensions.to(
-                        _kRenderingExtensions.from(
-                                _kRenderingExtensions.setGridPlacementData(rectangle),
-                                _kRenderingExtensions.LEFT, 6, 0,
-                                _kRenderingExtensions.TOP, 0, 0),
-                        _kRenderingExtensions.RIGHT, 6, 0,
-                        _kRenderingExtensions.BOTTOM, 4, 0);
-                _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
-                addParameterList(rectangle, reactorInstance.parameters);
-            }
-
-            if (getBooleanValue(SHOW_STATE_VARIABLES)) {
-                var variables = ASTUtils.<StateVar>collectElements(reactor, LfPackage.eINSTANCE.getReactor_StateVars(), true, false);
-                if (!variables.isEmpty()) {
-                    KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(figure);
-                    _kRenderingExtensions.setInvisible(rectangle, true);
-                    _kRenderingExtensions.to(
-                            _kRenderingExtensions.from(
-                                    _kRenderingExtensions.setGridPlacementData(rectangle),
-                                    _kRenderingExtensions.LEFT, 6, 0,
-                                    _kRenderingExtensions.TOP, 0, 0),
-                            _kRenderingExtensions.RIGHT, 6, 0,
-                            _kRenderingExtensions.BOTTOM, 4, 0);
-                    _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
-                    addStateVariableList(rectangle, variables);
-                }
-            }
-
-            if (reactorInstance.recursive) {
-                nodes.add(addErrorComment(node, TEXT_ERROR_RECURSIVE));
-                _linguaFrancaStyleExtensions.errorStyle(figure);
-            } else {
-                _kContainerRenderingExtensions.addChildArea(figure);
-                node.getChildren().addAll(transformReactorNetwork(reactorInstance,
-                        new HashMap<>(),
-                        new HashMap<>(),
-                        allReactorNodes));
-            }
-            Iterables.addAll(nodes, createUserComments(reactor, node));
-            configureReactorNodeLayout(node, true);
-            _layoutPostProcessing.configureMainReactor(node);
+      }
+
+      if (reactorInstance.recursive) {
+        nodes.add(addErrorComment(node, TEXT_ERROR_RECURSIVE));
+        _linguaFrancaStyleExtensions.errorStyle(figure);
+      } else {
+        _kContainerRenderingExtensions.addChildArea(figure);
+        node.getChildren()
+            .addAll(
+                transformReactorNetwork(
+                    reactorInstance, new HashMap<>(), new HashMap<>(), allReactorNodes));
+      }
+      Iterables.addAll(nodes, createUserComments(reactor, node));
+      configureReactorNodeLayout(node, true);
+      _layoutPostProcessing.configureMainReactor(node);
+    } else {
+      ReactorInstance instance = reactorInstance;
+
+      // Expanded Rectangle
+      ReactorFigureComponents comps =
+          _linguaFrancaShapeExtensions.addReactorFigure(node, reactorInstance, label);
+      comps.getOuter().setProperty(KlighdProperties.EXPANDED_RENDERING, true);
+      for (KRendering figure : comps.getFigures()) {
+        associateWith(figure, reactor);
+        _kRenderingExtensions.addDoubleClickAction(figure, MemorizingExpandCollapseAction.ID);
+      }
+      _reactorIcons.handleIcon(comps.getReactor(), reactor, false);
+
+      if (getBooleanValue(SHOW_HYPERLINKS)) {
+        // Collapse button
+        KText button =
+            _linguaFrancaShapeExtensions.addTextButton(comps.getReactor(), TEXT_HIDE_ACTION);
+        _kRenderingExtensions.to(
+            _kRenderingExtensions.from(
+                _kRenderingExtensions.setGridPlacementData(button),
+                _kRenderingExtensions.LEFT,
+                8,
+                0,
+                _kRenderingExtensions.TOP,
+                0,
+                0),
+            _kRenderingExtensions.RIGHT,
+            8,
+            0,
+            _kRenderingExtensions.BOTTOM,
+            0,
+            0);
+        _kRenderingExtensions.addSingleClickAction(button, MemorizingExpandCollapseAction.ID);
+        _kRenderingExtensions.addDoubleClickAction(button, MemorizingExpandCollapseAction.ID);
+      }
+
+      if (getObjectValue(REACTOR_PARAMETER_MODE) == ReactorParameterDisplayModes.TABLE
+          && !instance.parameters.isEmpty()) {
+        KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(comps.getReactor());
+        _kRenderingExtensions.setInvisible(rectangle, true);
+        if (!getBooleanValue(SHOW_HYPERLINKS)) {
+          _kRenderingExtensions.to(
+              _kRenderingExtensions.from(
+                  _kRenderingExtensions.setGridPlacementData(rectangle),
+                  _kRenderingExtensions.LEFT,
+                  6,
+                  0,
+                  _kRenderingExtensions.TOP,
+                  0,
+                  0),
+              _kRenderingExtensions.RIGHT,
+              6,
+              0,
+              _kRenderingExtensions.BOTTOM,
+              4,
+              0);
         } else {
-            ReactorInstance instance = reactorInstance;
-
-            // Expanded Rectangle
-            ReactorFigureComponents comps = _linguaFrancaShapeExtensions.addReactorFigure(node, reactorInstance, label);
-            comps.getOuter().setProperty(KlighdProperties.EXPANDED_RENDERING, true);
-            for (KRendering figure : comps.getFigures()) {
-                associateWith(figure, reactor);
-                _kRenderingExtensions.addDoubleClickAction(figure, MemorizingExpandCollapseAction.ID);
-            }
-            _reactorIcons.handleIcon(comps.getReactor(), reactor, false);
-
-            if (getBooleanValue(SHOW_HYPERLINKS)) {
-                // Collapse button
-                KText button = _linguaFrancaShapeExtensions.addTextButton(comps.getReactor(), TEXT_HIDE_ACTION);
-                _kRenderingExtensions.to(
-                        _kRenderingExtensions.from(
-                                _kRenderingExtensions.setGridPlacementData(button),
-                                _kRenderingExtensions.LEFT, 8, 0,
-                                _kRenderingExtensions.TOP, 0, 0),
-                        _kRenderingExtensions.RIGHT, 8, 0,
-                        _kRenderingExtensions.BOTTOM, 0, 0);
-                _kRenderingExtensions.addSingleClickAction(button, MemorizingExpandCollapseAction.ID);
-                _kRenderingExtensions.addDoubleClickAction(button, MemorizingExpandCollapseAction.ID);
-            }
-
-            if (getObjectValue(REACTOR_PARAMETER_MODE) == ReactorParameterDisplayModes.TABLE
-                    && !instance.parameters.isEmpty()) {
-                KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(comps.getReactor());
-                _kRenderingExtensions.setInvisible(rectangle, true);
-                if (!getBooleanValue(SHOW_HYPERLINKS)) {
-                    _kRenderingExtensions.to(
-                            _kRenderingExtensions.from(
-                                    _kRenderingExtensions.setGridPlacementData(rectangle),
-                                    _kRenderingExtensions.LEFT, 6, 0,
-                                    _kRenderingExtensions.TOP, 0, 0),
-                            _kRenderingExtensions.RIGHT, 6, 0,
-                            _kRenderingExtensions.BOTTOM, 4, 0);
-                } else {
-                    _kRenderingExtensions.to(
-                            _kRenderingExtensions.from(
-                                    _kRenderingExtensions.setGridPlacementData(rectangle),
-                                    _kRenderingExtensions.LEFT, 6, 0,
-                                    _kRenderingExtensions.TOP, 4, 0),
-                            _kRenderingExtensions.RIGHT, 6, 0,
-                            _kRenderingExtensions.BOTTOM, 0, 0);
-                }
-                _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
-                addParameterList(rectangle, instance.parameters);
-            }
-
-            if (getBooleanValue(SHOW_STATE_VARIABLES)) {
-                var variables = ASTUtils.<StateVar>collectElements(reactor, LfPackage.eINSTANCE.getReactor_StateVars(), true, false);
-                if (!variables.isEmpty()) {
-                    KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(comps.getReactor());
-                    _kRenderingExtensions.setInvisible(rectangle, true);
-                    if (!getBooleanValue(SHOW_HYPERLINKS)) {
-                        _kRenderingExtensions.to(
-                                _kRenderingExtensions.from(
-                                        _kRenderingExtensions.setGridPlacementData(rectangle),
-                                        _kRenderingExtensions.LEFT, 6, 0,
-                                        _kRenderingExtensions.TOP, 0, 0),
-                                _kRenderingExtensions.RIGHT, 6, 0,
-                                _kRenderingExtensions.BOTTOM, 4, 0);
-                    } else {
-                        _kRenderingExtensions.to(
-                                _kRenderingExtensions.from(
-                                        _kRenderingExtensions.setGridPlacementData(rectangle),
-                                        _kRenderingExtensions.LEFT, 6, 0,
-                                        _kRenderingExtensions.TOP, 4, 0),
-                                _kRenderingExtensions.RIGHT, 6, 0,
-                                _kRenderingExtensions.BOTTOM, 0, 0);
-                    }
-                    _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
-                    addStateVariableList(rectangle, variables);
-                }
-            }
-
-            if (instance.recursive) {
-                comps.getFigures().forEach(_linguaFrancaStyleExtensions::errorStyle);
-            } else {
-                _kContainerRenderingExtensions.addChildArea(comps.getReactor());
-            }
-
-            // Collapse Rectangle
-            comps = _linguaFrancaShapeExtensions.addReactorFigure(node, reactorInstance, label);
-            comps.getOuter().setProperty(KlighdProperties.COLLAPSED_RENDERING, true);
-            for (KRendering figure : comps.getFigures()) {
-                associateWith(figure, reactor);
-                if (_utilityExtensions.hasContent(instance) && !instance.recursive) {
-                    _kRenderingExtensions.addDoubleClickAction(figure, MemorizingExpandCollapseAction.ID);
-                }
-            }
-            _reactorIcons.handleIcon(comps.getReactor(), reactor, true);
-
-            if (getBooleanValue(SHOW_HYPERLINKS)) {
-                // Expand button
-                if (_utilityExtensions.hasContent(instance) && !instance.recursive) {
-                    KText button = _linguaFrancaShapeExtensions.addTextButton(comps.getReactor(), TEXT_SHOW_ACTION);
-                    _kRenderingExtensions.to(
-                            _kRenderingExtensions.from(
-                                    _kRenderingExtensions.setGridPlacementData(button),
-                                    _kRenderingExtensions.LEFT, 8, 0,
-                                    _kRenderingExtensions.TOP, 0, 0),
-                            _kRenderingExtensions.RIGHT, 8, 0,
-                            _kRenderingExtensions.BOTTOM, 8, 0);
-                    _kRenderingExtensions.addSingleClickAction(button, MemorizingExpandCollapseAction.ID);
-                    _kRenderingExtensions.addDoubleClickAction(button, MemorizingExpandCollapseAction.ID);
-                }
-            }
-
-            if (instance.recursive) {
-                comps.getFigures().forEach(_linguaFrancaStyleExtensions::errorStyle);
-            }
-
-
-            // Create ports
-            Map<PortInstance, KPort> inputPorts = new HashMap<>();
-            Map<PortInstance, KPort> outputPorts = new HashMap<>();
-            List<PortInstance> inputs = instance.inputs;
-            if (LayoutPostProcessing.LEGACY.equals((String) getObjectValue(LayoutPostProcessing.MODEL_ORDER))) {
-                inputs = ListExtensions.reverseView(instance.inputs);
-            }
-            for (PortInstance input : inputs) {
-                inputPorts.put(input, addIOPort(node, input, true, input.isMultiport(), reactorInstance.isBank()));
-            }
-            for (PortInstance output : instance.outputs) {
-                outputPorts.put(output, addIOPort(node, output, false, output.isMultiport(), reactorInstance.isBank()));
-            }
-            // Mark ports
-            inputPorts.values().forEach(it -> it.setProperty(REACTOR_INPUT, true));
-            outputPorts.values().forEach(it -> it.setProperty(REACTOR_OUTPUT, true));
-
-            // Add content
-            if (_utilityExtensions.hasContent(instance) && !instance.recursive) {
-                node.getChildren().addAll(transformReactorNetwork(instance, inputPorts, outputPorts, allReactorNodes));
-            }
-
-            // Pass port to given tables
-            if (!_utilityExtensions.isRoot(instance)) {
-                if (inputPortsReg != null) {
-                    for (Map.Entry<PortInstance, KPort> entry : inputPorts.entrySet()) {
-                        inputPortsReg.put(instance, entry.getKey(), entry.getValue());
-                    }
-                }
-                if (outputPortsReg != null) {
-                    for (Map.Entry<PortInstance, KPort> entry : outputPorts.entrySet()) {
-                        outputPortsReg.put(instance, entry.getKey(), entry.getValue());
-                    }
-                }
-            }
-
-            if (instance.recursive) {
-                setLayoutOption(node, KlighdProperties.EXPAND, false);
-                nodes.add(addErrorComment(node, TEXT_ERROR_RECURSIVE));
-            } else {
-                setLayoutOption(node, KlighdProperties.EXPAND, expandDefault);
-
-                // Interface Dependencies
-                _interfaceDependenciesVisualization.addInterfaceDependencies(node, expandDefault);
-            }
-
-            if (!_utilityExtensions.isRoot(instance)) {
-                // If all reactors are being shown, then only put the label on
-                // the reactor definition, not on its instances. Otherwise,
-                // add the annotation now.
-                if (!getBooleanValue(SHOW_ALL_REACTORS)) {
-                    Iterables.addAll(nodes, createUserComments(reactor, node));
-                }
-            } else {
-                Iterables.addAll(nodes, createUserComments(reactor, node));
-            }
-            configureReactorNodeLayout(node, false);
-            _layoutPostProcessing.configureReactor(node);
+          _kRenderingExtensions.to(
+              _kRenderingExtensions.from(
+                  _kRenderingExtensions.setGridPlacementData(rectangle),
+                  _kRenderingExtensions.LEFT,
+                  6,
+                  0,
+                  _kRenderingExtensions.TOP,
+                  4,
+                  0),
+              _kRenderingExtensions.RIGHT,
+              6,
+              0,
+              _kRenderingExtensions.BOTTOM,
+              0,
+              0);
         }
-
-        // Find and annotate cycles
-        if (getBooleanValue(CYCLE_DETECTION) &&
-                _utilityExtensions.isRoot(reactorInstance)) {
-            KNode errNode = detectAndAnnotateCycles(node, reactorInstance, allReactorNodes);
-            if (errNode != null) {
-                nodes.add(errNode);
-            }
+        _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
+        addParameterList(rectangle, instance.parameters);
+      }
+
+      if (getBooleanValue(SHOW_STATE_VARIABLES)) {
+        var variables =
+            ASTUtils.<StateVar>collectElements(
+                reactor, LfPackage.eINSTANCE.getReactor_StateVars(), true, false);
+        if (!variables.isEmpty()) {
+          KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(comps.getReactor());
+          _kRenderingExtensions.setInvisible(rectangle, true);
+          if (!getBooleanValue(SHOW_HYPERLINKS)) {
+            _kRenderingExtensions.to(
+                _kRenderingExtensions.from(
+                    _kRenderingExtensions.setGridPlacementData(rectangle),
+                    _kRenderingExtensions.LEFT,
+                    6,
+                    0,
+                    _kRenderingExtensions.TOP,
+                    0,
+                    0),
+                _kRenderingExtensions.RIGHT,
+                6,
+                0,
+                _kRenderingExtensions.BOTTOM,
+                4,
+                0);
+          } else {
+            _kRenderingExtensions.to(
+                _kRenderingExtensions.from(
+                    _kRenderingExtensions.setGridPlacementData(rectangle),
+                    _kRenderingExtensions.LEFT,
+                    6,
+                    0,
+                    _kRenderingExtensions.TOP,
+                    4,
+                    0),
+                _kRenderingExtensions.RIGHT,
+                6,
+                0,
+                _kRenderingExtensions.BOTTOM,
+                0,
+                0);
+          }
+          _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
+          addStateVariableList(rectangle, variables);
         }
-
-        return nodes;
-    }
-
-    public KNode configureReactorNodeLayout(KNode node, boolean main) {
-        // Set layered algorithm
-        setLayoutOption(node, CoreOptions.ALGORITHM, LayeredOptions.ALGORITHM_ID);
-        // Left to right layout
-        setLayoutOption(node, CoreOptions.DIRECTION, Direction.RIGHT);
-        // Center free floating children
-        setLayoutOption(node, CoreOptions.CONTENT_ALIGNMENT, ContentAlignment.centerCenter());
-
-        // Balanced placement with straight long edges.
-        setLayoutOption(node, LayeredOptions.NODE_PLACEMENT_STRATEGY, NodePlacementStrategy.NETWORK_SIMPLEX);
-        // Do not shrink nodes below content
-        setLayoutOption(node, CoreOptions.NODE_SIZE_CONSTRAINTS, EnumSet.of(SizeConstraint.MINIMUM_SIZE, SizeConstraint.PORTS));
-
-        // Allows to freely shuffle ports on each side
-        setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FIXED_SIDE);
-        // Adjust port label spacing to be closer to edge but not overlap with port figure
-        // TODO: Add PortLabelPlacement.NEXT_TO_PORT_IF_POSSIBLE back into the configuration, as soon as ELK provides a fix for LF issue #1273
-        setLayoutOption(node, CoreOptions.PORT_LABELS_PLACEMENT, EnumSet.of(PortLabelPlacement.ALWAYS_OTHER_SAME_SIDE, PortLabelPlacement.OUTSIDE));
-        setLayoutOption(node, CoreOptions.SPACING_LABEL_PORT_HORIZONTAL, 2.0);
-        setLayoutOption(node, CoreOptions.SPACING_LABEL_PORT_VERTICAL, -3.0);
-
-        // Configure spacing
-        if (!getBooleanValue(SHOW_HYPERLINKS)) { // Hyperlink version is more relaxed in terms of space
-            var factor = (double) getIntValue(SPACING) / 100;
-
-            setLayoutOption(node, LayeredOptions.SPACING_COMPONENT_COMPONENT, LayeredOptions.SPACING_COMPONENT_COMPONENT.getDefault() * factor);
-
-            setLayoutOption(node, LayeredOptions.SPACING_NODE_NODE, LayeredOptions.SPACING_NODE_NODE.getDefault() * factor);
-            setLayoutOption(node, LayeredOptions.SPACING_NODE_NODE_BETWEEN_LAYERS, LayeredOptions.SPACING_NODE_NODE_BETWEEN_LAYERS.getDefault() * factor);
-
-            setLayoutOption(node, LayeredOptions.SPACING_PORT_PORT, LayeredOptions.SPACING_PORT_PORT.getDefault() * factor);
-
-            setLayoutOption(node, LayeredOptions.SPACING_EDGE_NODE, LayeredOptions.SPACING_EDGE_NODE.getDefault() * factor);
-            setLayoutOption(node, LayeredOptions.SPACING_EDGE_NODE_BETWEEN_LAYERS, LayeredOptions.SPACING_EDGE_NODE_BETWEEN_LAYERS.getDefault() * factor);
-            setLayoutOption(node, LayeredOptions.SPACING_EDGE_EDGE, LayeredOptions.SPACING_EDGE_EDGE.getDefault() * factor);
-            setLayoutOption(node, LayeredOptions.SPACING_EDGE_EDGE_BETWEEN_LAYERS, LayeredOptions.SPACING_EDGE_EDGE_BETWEEN_LAYERS.getDefault() * factor);
-            setLayoutOption(node, LayeredOptions.SPACING_EDGE_EDGE, LayeredOptions.SPACING_EDGE_EDGE.getDefault() * factor);
-            setLayoutOption(node, LayeredOptions.SPACING_EDGE_EDGE_BETWEEN_LAYERS, LayeredOptions.SPACING_EDGE_EDGE_BETWEEN_LAYERS.getDefault() * factor);
-            setLayoutOption(node, LayeredOptions.SPACING_EDGE_LABEL, LayeredOptions.SPACING_EDGE_LABEL.getDefault() * factor);
-
-            // Padding for sub graph
-            if (main) { // Special handing for main reactors
-                setLayoutOption(node, CoreOptions.PADDING, new ElkPadding(-1, 6, 6, 6));
-            } else {
-                setLayoutOption(node, CoreOptions.PADDING, new ElkPadding(2, 6, 6, 6));
-            }
+      }
+
+      if (instance.recursive) {
+        comps.getFigures().forEach(_linguaFrancaStyleExtensions::errorStyle);
+      } else {
+        _kContainerRenderingExtensions.addChildArea(comps.getReactor());
+      }
+
+      // Collapse Rectangle
+      comps = _linguaFrancaShapeExtensions.addReactorFigure(node, reactorInstance, label);
+      comps.getOuter().setProperty(KlighdProperties.COLLAPSED_RENDERING, true);
+      for (KRendering figure : comps.getFigures()) {
+        associateWith(figure, reactor);
+        if (_utilityExtensions.hasContent(instance) && !instance.recursive) {
+          _kRenderingExtensions.addDoubleClickAction(figure, MemorizingExpandCollapseAction.ID);
         }
-
-        return node;
-    }
-
-    private KNode detectAndAnnotateCycles(KNode node, ReactorInstance reactorInstance, Map<ReactorInstance, KNode> allReactorNodes) {
-        if (node.getProperty(REACTOR_RECURSIVE_INSTANTIATION)) {
-            _filterCycleAction.resetCycleFiltering(node);
-            return addErrorComment(node, TEXT_ERROR_CONTAINS_RECURSION);
-        } else { // only detect dependency cycles if not recursive
-            try {
-                boolean hasCycle = _cycleVisualization.detectAndHighlightCycles(reactorInstance,
-                        allReactorNodes, it -> {
-                            if (it instanceof KNode) {
-                                List<KRendering> renderings = IterableExtensions.toList(
-                                        Iterables.filter(((KNode) it).getData(), KRendering.class));
-                                if (renderings.size() == 1) {
-                                     _linguaFrancaStyleExtensions.errorStyle(IterableExtensions.head(renderings));
-                                } else {
-                                    IterableExtensions.filter(renderings, rendering -> {
-                                        return rendering.getProperty(KlighdProperties.COLLAPSED_RENDERING);
-                                    }).forEach(_linguaFrancaStyleExtensions::errorStyle);
-                                }
-                            } else if (it instanceof KEdge) {
-                                Iterables.filter(((KEdge) it).getData(),
-                                        KRendering.class).forEach(_linguaFrancaStyleExtensions::errorStyle);
-                                // TODO initiallyHide does not work with incremental (https://github.com/kieler/KLighD/issues/37)
-                                // cycleEgde.initiallyShow() // Show hidden order dependencies
-                                _kRenderingExtensions.setInvisible(_kRenderingExtensions.getKRendering(it), false);
-                            } else if (it instanceof KPort) {
-                                Iterables.filter(((KPort) it).getData(),
-                                        KRendering.class).forEach(_linguaFrancaStyleExtensions::errorStyle);
-                                //it.reverseTrianglePort()
-                            }
-                        });
-
-                if (hasCycle) {
-                    KNode err = addErrorComment(node, TEXT_ERROR_CONTAINS_CYCLE);
-
-                    // Add to existing figure
-                    KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(_kRenderingExtensions.getKContainerRendering(err));
-                    _kRenderingExtensions.to(
-                            _kRenderingExtensions.from(
-                                    _kRenderingExtensions.setGridPlacementData(rectangle),
-                                    _kRenderingExtensions.LEFT, 3, 0,
-                                    _kRenderingExtensions.TOP, (-1), 0),
-                            _kRenderingExtensions.RIGHT, 3, 0,
-                            _kRenderingExtensions.BOTTOM, 3, 0);
-                    _linguaFrancaStyleExtensions.noSelectionStyle(rectangle);
-                    _kRenderingExtensions.setInvisible(rectangle, true);
-                    _kContainerRenderingExtensions.setGridPlacement(rectangle, 2);
-
-                    KRectangle subrectangle = _kContainerRenderingExtensions.addRectangle(rectangle);
-                    _kRenderingExtensions.to(
-                            _kRenderingExtensions.from(
-                                    _kRenderingExtensions.setGridPlacementData(subrectangle),
-                                    _kRenderingExtensions.LEFT, 0, 0,
-                                    _kRenderingExtensions.TOP, 0, 0),
-                            _kRenderingExtensions.RIGHT, 2, 0,
-                            _kRenderingExtensions.BOTTOM, 0, 0);
-                    _linguaFrancaStyleExtensions.noSelectionStyle(subrectangle);
-                    _kRenderingExtensions.addSingleClickAction(subrectangle, ShowCycleAction.ID);
-
-                    KText subrectangleText = _kContainerRenderingExtensions.addText(subrectangle, TEXT_ERROR_CYCLE_BTN_SHOW);
-                    // Copy text style
-                    List<KStyle> styles = ListExtensions.map(
-                            IterableExtensions.head(
-                                    _kRenderingExtensions.getKContainerRendering(err).getChildren()).getStyles(),
-                            EcoreUtil::copy);
-                    subrectangleText.getStyles().addAll(styles);
-                    _kRenderingExtensions.setFontSize(subrectangleText, 5);
-                    _kRenderingExtensions.setSurroundingSpace(subrectangleText, 1, 0);
-                    _linguaFrancaStyleExtensions.noSelectionStyle(subrectangleText);
-                    _kRenderingExtensions.addSingleClickAction(subrectangleText, ShowCycleAction.ID);
-
-                    subrectangle = _kContainerRenderingExtensions.addRectangle(rectangle);
-                    _kRenderingExtensions.to(
-                            _kRenderingExtensions.from(
-                                    _kRenderingExtensions.setGridPlacementData(subrectangle),
-                                    _kRenderingExtensions.LEFT, 0, 0,
-                                    _kRenderingExtensions.TOP, 0, 0),
-                            _kRenderingExtensions.RIGHT, 0, 0,
-                            _kRenderingExtensions.BOTTOM, 0, 0);
-                    _linguaFrancaStyleExtensions.noSelectionStyle(subrectangle);
-                    _kRenderingExtensions.addSingleClickAction(subrectangle, FilterCycleAction.ID);
-
-                    subrectangleText = _kContainerRenderingExtensions.addText(subrectangle,
-                            _filterCycleAction.isCycleFiltered(node) ?
-                                    TEXT_ERROR_CYCLE_BTN_UNFILTER : TEXT_ERROR_CYCLE_BTN_FILTER);
-                    // Copy text style
-                    styles = ListExtensions.map(
-                            IterableExtensions.head(
-                                    _kRenderingExtensions.getKContainerRendering(err).getChildren()).getStyles(),
-                            EcoreUtil::copy);
-                    subrectangleText.getStyles().addAll(styles);
-                    _kRenderingExtensions.setFontSize(subrectangleText, 5);
-                    _kRenderingExtensions.setSurroundingSpace(subrectangleText, 1, 0);
-                    _linguaFrancaStyleExtensions.noSelectionStyle(subrectangleText);
-                    _kRenderingExtensions.addSingleClickAction(subrectangleText, FilterCycleAction.ID);
-                    _filterCycleAction.markCycleFilterText(subrectangleText, err);
-
-                    // if user interactively requested a filtered diagram keep it filtered during updates
-                    if (_filterCycleAction.isCycleFiltered(node)) {
-                        _filterCycleAction.filterCycle(node);
-                    }
-                    return err;
-                }
-            } catch(Exception e) {
-                _filterCycleAction.resetCycleFiltering(node);
-                e.printStackTrace();
-                return addErrorComment(node, TEXT_ERROR_CYCLE_DETECTION);
-            }
+      }
+      _reactorIcons.handleIcon(comps.getReactor(), reactor, true);
+
+      if (getBooleanValue(SHOW_HYPERLINKS)) {
+        // Expand button
+        if (_utilityExtensions.hasContent(instance) && !instance.recursive) {
+          KText button =
+              _linguaFrancaShapeExtensions.addTextButton(comps.getReactor(), TEXT_SHOW_ACTION);
+          _kRenderingExtensions.to(
+              _kRenderingExtensions.from(
+                  _kRenderingExtensions.setGridPlacementData(button),
+                  _kRenderingExtensions.LEFT,
+                  8,
+                  0,
+                  _kRenderingExtensions.TOP,
+                  0,
+                  0),
+              _kRenderingExtensions.RIGHT,
+              8,
+              0,
+              _kRenderingExtensions.BOTTOM,
+              8,
+              0);
+          _kRenderingExtensions.addSingleClickAction(button, MemorizingExpandCollapseAction.ID);
+          _kRenderingExtensions.addDoubleClickAction(button, MemorizingExpandCollapseAction.ID);
         }
-        return null;
-    }
-
-    private Collection<KNode> transformReactorNetwork(
-        ReactorInstance reactorInstance,
-        Map<PortInstance, KPort> parentInputPorts,
-        Map<PortInstance, KPort> parentOutputPorts,
-        Map<ReactorInstance, KNode> allReactorNodes
-    ) {
-        List<KNode> nodes = new ArrayList<>();
-        Table<ReactorInstance, PortInstance, KPort> inputPorts = HashBasedTable.create();
-        Table<ReactorInstance, PortInstance, KPort> outputPorts = HashBasedTable.create();
-        Map<ReactionInstance, KNode> reactionNodes = new HashMap<>();
-        Map<KPort, KNode> directConnectionDummyNodes = new HashMap<>();
-        Multimap<ActionInstance, KPort> actionDestinations = HashMultimap.create();
-        Multimap<ActionInstance, KPort> actionSources = HashMultimap.create();
-        Map<TimerInstance, KNode> timerNodes = new HashMap<>();
-        KNode startupNode = _kNodeExtensions.createNode();
-        TriggerInstance<?> startup = null;
-        KNode shutdownNode = _kNodeExtensions.createNode();
-        TriggerInstance<?> shutdown = null;
-        KNode resetNode = _kNodeExtensions.createNode();
-        TriggerInstance<?> reset = null;
-
-        // Transform instances
-        int index = 0;
-        for (ReactorInstance child : reactorInstance.children) {
-            Boolean expansionState = MemorizingExpandCollapseAction.getExpansionState(child);
-            Collection<KNode> rNodes = createReactorNode(
-                    child,
-                    expansionState != null ? expansionState : false,
-                    inputPorts,
-                    outputPorts,
-                    allReactorNodes);
-            nodes.addAll(rNodes);
-            index++;
+      }
+
+      if (instance.recursive) {
+        comps.getFigures().forEach(_linguaFrancaStyleExtensions::errorStyle);
+      }
+
+      // Create ports
+      Map<PortInstance, KPort> inputPorts = new HashMap<>();
+      Map<PortInstance, KPort> outputPorts = new HashMap<>();
+      List<PortInstance> inputs = instance.inputs;
+      if (LayoutPostProcessing.LEGACY.equals(
+          (String) getObjectValue(LayoutPostProcessing.MODEL_ORDER))) {
+        inputs = ListExtensions.reverseView(instance.inputs);
+      }
+      for (PortInstance input : inputs) {
+        inputPorts.put(
+            input, addIOPort(node, input, true, input.isMultiport(), reactorInstance.isBank()));
+      }
+      for (PortInstance output : instance.outputs) {
+        outputPorts.put(
+            output, addIOPort(node, output, false, output.isMultiport(), reactorInstance.isBank()));
+      }
+      // Mark ports
+      inputPorts.values().forEach(it -> it.setProperty(REACTOR_INPUT, true));
+      outputPorts.values().forEach(it -> it.setProperty(REACTOR_OUTPUT, true));
+
+      // Add content
+      if (_utilityExtensions.hasContent(instance) && !instance.recursive) {
+        node.getChildren()
+            .addAll(transformReactorNetwork(instance, inputPorts, outputPorts, allReactorNodes));
+      }
+
+      // Pass port to given tables
+      if (!_utilityExtensions.isRoot(instance)) {
+        if (inputPortsReg != null) {
+          for (Map.Entry<PortInstance, KPort> entry : inputPorts.entrySet()) {
+            inputPortsReg.put(instance, entry.getKey(), entry.getValue());
+          }
         }
-
-        // Create timers
-        for (TimerInstance timer : reactorInstance.timers) {
-            KNode node = associateWith(_kNodeExtensions.createNode(), timer.getDefinition());
-            NamedInstanceUtil.linkInstance(node, timer);
-            _utilityExtensions.setID(node, timer.uniqueID());
-            nodes.add(node);
-            Iterables.addAll(nodes, createUserComments(timer.getDefinition(), node));
-            timerNodes.put(timer, node);
-            _linguaFrancaShapeExtensions.addTimerFigure(node, timer);
-            _layoutPostProcessing.configureTimer(node);
+        if (outputPortsReg != null) {
+          for (Map.Entry<PortInstance, KPort> entry : outputPorts.entrySet()) {
+            outputPortsReg.put(instance, entry.getKey(), entry.getValue());
+          }
         }
+      }
+
+      if (instance.recursive) {
+        setLayoutOption(node, KlighdProperties.EXPAND, false);
+        nodes.add(addErrorComment(node, TEXT_ERROR_RECURSIVE));
+      } else {
+        setLayoutOption(node, KlighdProperties.EXPAND, expandDefault);
+
+        // Interface Dependencies
+        _interfaceDependenciesVisualization.addInterfaceDependencies(node, expandDefault);
+      }
+
+      if (!_utilityExtensions.isRoot(instance)) {
+        // If all reactors are being shown, then only put the label on
+        // the reactor definition, not on its instances. Otherwise,
+        // add the annotation now.
+        if (!getBooleanValue(SHOW_ALL_REACTORS)) {
+          Iterables.addAll(nodes, createUserComments(reactor, node));
+        }
+      } else {
+        Iterables.addAll(nodes, createUserComments(reactor, node));
+      }
+      configureReactorNodeLayout(node, false);
+      _layoutPostProcessing.configureReactor(node);
+    }
 
-        // Create reactions
-        for (ReactionInstance reaction : reactorInstance.reactions) {
-            int idx = reactorInstance.reactions.indexOf(reaction);
-            KNode node = associateWith(_kNodeExtensions.createNode(), reaction.getDefinition());
-            NamedInstanceUtil.linkInstance(node, reaction);
-            _utilityExtensions.setID(node, reaction.uniqueID());
-            nodes.add(node);
-            Iterables.addAll(nodes, createUserComments(reaction.getDefinition(), node));
-            reactionNodes.put(reaction, node);
-
-            setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FIXED_SIDE);
-            _layoutPostProcessing.configureReaction(node);
-            setLayoutOption(node, LayeredOptions.POSITION, new KVector(0, idx + 1)); // try order reactions vertically if in one layer (+1 to account for startup)
-
-            var figure = _linguaFrancaShapeExtensions.addReactionFigure(node, reaction);
-
-            int inputSize = Stream.concat(reaction.triggers.stream(), reaction.sources.stream()).collect(Collectors.toSet()).size();
-            int outputSize = reaction.effects.size();
-            if (!getBooleanValue(REACTIONS_USE_HYPEREDGES) && (inputSize > 1 || outputSize > 1)) {
-                // If this node will have more than one input/output port, the port positions must be adjusted to the
-                // pointy shape. However, this is only possible after the layout.
-                ReactionPortAdjustment.apply(node, figure);
-            }
-
-            // connect input
-            KPort port = null;
-            for (TriggerInstance<?> trigger : reaction.triggers) {
-                // Create new port if there is no previous one or each dependency should have its own one
-                if (port == null || !getBooleanValue(REACTIONS_USE_HYPEREDGES)) {
-                    port = addInvisiblePort(node);
-                    setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.WEST);
-
-                    if (getBooleanValue(REACTIONS_USE_HYPEREDGES) || inputSize == 1) {
-                        // manual adjustment disabling automatic one
-                        setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET,
-                                (double) -LinguaFrancaShapeExtensions.REACTION_POINTINESS);
-                    }
-                }
-
-                if (trigger.isStartup()) {
-                    connect(createDependencyEdge(((TriggerInstance.BuiltinTriggerVariable) trigger.getDefinition()).definition),
-                            startupNode,
-                            port);
-                    startup = trigger;
-                } else if (trigger.isShutdown()) {
-                    connect(createDelayEdge(((TriggerInstance.BuiltinTriggerVariable) trigger.getDefinition()).definition),
-                            shutdownNode,
-                            port);
-                    shutdown = trigger;
-                } else if (trigger.isReset()) {
-                    connect(createDependencyEdge(((TriggerInstance.BuiltinTriggerVariable) trigger.getDefinition()).definition),
-                            resetNode,
-                            port);
-                    reset = trigger;
-                } else if (trigger instanceof ActionInstance) {
-                    actionDestinations.put(((ActionInstance) trigger), port);
-                } else if (trigger instanceof PortInstance) {
-                    KPort src = null;
-                    PortInstance triggerAsPort = (PortInstance) trigger;
-                    if (triggerAsPort.getParent() == reactorInstance) {
-                        src = parentInputPorts.get(trigger);
-                    } else {
-                        src = outputPorts.get(triggerAsPort.getParent(), trigger);
-                    }
-                    if (src != null) {
-                        connect(createDependencyEdge(triggerAsPort.getDefinition()), src, port);
-                    }
-                } else if (trigger instanceof TimerInstance) {
-                    KNode src = timerNodes.get(trigger);
-                    if (src != null) {
-                        connect(createDependencyEdge(trigger.getDefinition()), src, port);
-                    }
-                }
-            }
-
-            // connect dependencies
-            for (TriggerInstance<?> dep : reaction.sources) {
-                if (reaction.triggers.contains(dep)) continue; // skip
-
-                // Create new port if there is no previous one or each dependency should have its own one
-                if (port == null || !getBooleanValue(REACTIONS_USE_HYPEREDGES)) {
-                    port = addInvisiblePort(node);
-                    setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.WEST);
+    // Find and annotate cycles
+    if (getBooleanValue(CYCLE_DETECTION) && _utilityExtensions.isRoot(reactorInstance)) {
+      KNode errNode = detectAndAnnotateCycles(node, reactorInstance, allReactorNodes);
+      if (errNode != null) {
+        nodes.add(errNode);
+      }
+    }
 
-                    if (getBooleanValue(REACTIONS_USE_HYPEREDGES) || inputSize == 1) {
-                        // manual adjustment disabling automatic one
-                        setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET,
-                                (double) -LinguaFrancaShapeExtensions.REACTION_POINTINESS);
-                    }
-                }
+    return nodes;
+  }
+
+  public KNode configureReactorNodeLayout(KNode node, boolean main) {
+    // Set layered algorithm
+    setLayoutOption(node, CoreOptions.ALGORITHM, LayeredOptions.ALGORITHM_ID);
+    // Left to right layout
+    setLayoutOption(node, CoreOptions.DIRECTION, Direction.RIGHT);
+    // Center free floating children
+    setLayoutOption(node, CoreOptions.CONTENT_ALIGNMENT, ContentAlignment.centerCenter());
+
+    // Balanced placement with straight long edges.
+    setLayoutOption(
+        node, LayeredOptions.NODE_PLACEMENT_STRATEGY, NodePlacementStrategy.NETWORK_SIMPLEX);
+    // Do not shrink nodes below content
+    setLayoutOption(
+        node,
+        CoreOptions.NODE_SIZE_CONSTRAINTS,
+        EnumSet.of(SizeConstraint.MINIMUM_SIZE, SizeConstraint.PORTS));
+
+    // Allows to freely shuffle ports on each side
+    setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FIXED_SIDE);
+    // Adjust port label spacing to be closer to edge but not overlap with port figure
+    // TODO: Add PortLabelPlacement.NEXT_TO_PORT_IF_POSSIBLE back into the configuration, as soon as
+    // ELK provides a fix for LF issue #1273
+    setLayoutOption(
+        node,
+        CoreOptions.PORT_LABELS_PLACEMENT,
+        EnumSet.of(PortLabelPlacement.ALWAYS_OTHER_SAME_SIDE, PortLabelPlacement.OUTSIDE));
+    setLayoutOption(node, CoreOptions.SPACING_LABEL_PORT_HORIZONTAL, 2.0);
+    setLayoutOption(node, CoreOptions.SPACING_LABEL_PORT_VERTICAL, -3.0);
+
+    // Configure spacing
+    if (!getBooleanValue(SHOW_HYPERLINKS)) { // Hyperlink version is more relaxed in terms of space
+      var factor = (double) getIntValue(SPACING) / 100;
+
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_COMPONENT_COMPONENT,
+          LayeredOptions.SPACING_COMPONENT_COMPONENT.getDefault() * factor);
+
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_NODE_NODE,
+          LayeredOptions.SPACING_NODE_NODE.getDefault() * factor);
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_NODE_NODE_BETWEEN_LAYERS,
+          LayeredOptions.SPACING_NODE_NODE_BETWEEN_LAYERS.getDefault() * factor);
+
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_PORT_PORT,
+          LayeredOptions.SPACING_PORT_PORT.getDefault() * factor);
+
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_EDGE_NODE,
+          LayeredOptions.SPACING_EDGE_NODE.getDefault() * factor);
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_EDGE_NODE_BETWEEN_LAYERS,
+          LayeredOptions.SPACING_EDGE_NODE_BETWEEN_LAYERS.getDefault() * factor);
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_EDGE_EDGE,
+          LayeredOptions.SPACING_EDGE_EDGE.getDefault() * factor);
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_EDGE_EDGE_BETWEEN_LAYERS,
+          LayeredOptions.SPACING_EDGE_EDGE_BETWEEN_LAYERS.getDefault() * factor);
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_EDGE_EDGE,
+          LayeredOptions.SPACING_EDGE_EDGE.getDefault() * factor);
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_EDGE_EDGE_BETWEEN_LAYERS,
+          LayeredOptions.SPACING_EDGE_EDGE_BETWEEN_LAYERS.getDefault() * factor);
+      setLayoutOption(
+          node,
+          LayeredOptions.SPACING_EDGE_LABEL,
+          LayeredOptions.SPACING_EDGE_LABEL.getDefault() * factor);
+
+      // Padding for sub graph
+      if (main) { // Special handing for main reactors
+        setLayoutOption(node, CoreOptions.PADDING, new ElkPadding(-1, 6, 6, 6));
+      } else {
+        setLayoutOption(node, CoreOptions.PADDING, new ElkPadding(2, 6, 6, 6));
+      }
+    }
 
-                if (dep instanceof PortInstance) {
-                    KPort src = null;
-                    PortInstance depAsPort = (PortInstance) dep;
-                    if (dep.getParent() == reactorInstance) {
-                        src = parentInputPorts.get(dep);
+    return node;
+  }
+
+  private KNode detectAndAnnotateCycles(
+      KNode node, ReactorInstance reactorInstance, Map<ReactorInstance, KNode> allReactorNodes) {
+    if (node.getProperty(REACTOR_RECURSIVE_INSTANTIATION)) {
+      _filterCycleAction.resetCycleFiltering(node);
+      return addErrorComment(node, TEXT_ERROR_CONTAINS_RECURSION);
+    } else { // only detect dependency cycles if not recursive
+      try {
+        boolean hasCycle =
+            _cycleVisualization.detectAndHighlightCycles(
+                reactorInstance,
+                allReactorNodes,
+                it -> {
+                  if (it instanceof KNode) {
+                    List<KRendering> renderings =
+                        IterableExtensions.toList(
+                            Iterables.filter(((KNode) it).getData(), KRendering.class));
+                    if (renderings.size() == 1) {
+                      _linguaFrancaStyleExtensions.errorStyle(IterableExtensions.head(renderings));
                     } else {
-                        src = outputPorts.get(depAsPort.getParent(), dep);
+                      IterableExtensions.filter(
+                              renderings,
+                              rendering -> {
+                                return rendering.getProperty(KlighdProperties.COLLAPSED_RENDERING);
+                              })
+                          .forEach(_linguaFrancaStyleExtensions::errorStyle);
                     }
-                    if (src != null) {
-                        connect(createDependencyEdge(dep.getDefinition()), src, port);
-                    }
-                }
-            }
-
-            // connect outputs
-            port = null; // enforce new ports for outputs
-            Set<TriggerInstance<?>> iterSet = reaction.effects != null ? reaction.effects : new HashSet<>();
-            for (TriggerInstance<?> effect : iterSet) {
-                // Create new port if there is no previous one or each dependency should have its own one
-                if (port == null || !getBooleanValue(REACTIONS_USE_HYPEREDGES)) {
-                    port = addInvisiblePort(node);
-                    setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.EAST);
-                }
+                  } else if (it instanceof KEdge) {
+                    Iterables.filter(((KEdge) it).getData(), KRendering.class)
+                        .forEach(_linguaFrancaStyleExtensions::errorStyle);
+                    // TODO initiallyHide does not work with incremental
+                    // (https://github.com/kieler/KLighD/issues/37)
+                    // cycleEgde.initiallyShow() // Show hidden order dependencies
+                    _kRenderingExtensions.setInvisible(
+                        _kRenderingExtensions.getKRendering(it), false);
+                  } else if (it instanceof KPort) {
+                    Iterables.filter(((KPort) it).getData(), KRendering.class)
+                        .forEach(_linguaFrancaStyleExtensions::errorStyle);
+                    // it.reverseTrianglePort()
+                  }
+                });
 
-                if (effect instanceof ActionInstance) {
-                    actionSources.put((ActionInstance) effect, port);
-                } else if (effect instanceof PortInstance) {
-                    KPort dst = null;
-                    PortInstance effectAsPort = (PortInstance) effect;
-                    if (effectAsPort.isOutput()) {
-                        dst = parentOutputPorts.get(effect);
-                    } else {
-                        dst = inputPorts.get(effectAsPort.getParent(), effect);
-                    }
-                    if (dst != null) {
-                        connect(createDependencyEdge(effect), port, dst);
-                    }
-                }
-            }
+        if (hasCycle) {
+          KNode err = addErrorComment(node, TEXT_ERROR_CONTAINS_CYCLE);
+
+          // Add to existing figure
+          KRectangle rectangle =
+              _kContainerRenderingExtensions.addRectangle(
+                  _kRenderingExtensions.getKContainerRendering(err));
+          _kRenderingExtensions.to(
+              _kRenderingExtensions.from(
+                  _kRenderingExtensions.setGridPlacementData(rectangle),
+                  _kRenderingExtensions.LEFT,
+                  3,
+                  0,
+                  _kRenderingExtensions.TOP,
+                  (-1),
+                  0),
+              _kRenderingExtensions.RIGHT,
+              3,
+              0,
+              _kRenderingExtensions.BOTTOM,
+              3,
+              0);
+          _linguaFrancaStyleExtensions.noSelectionStyle(rectangle);
+          _kRenderingExtensions.setInvisible(rectangle, true);
+          _kContainerRenderingExtensions.setGridPlacement(rectangle, 2);
+
+          KRectangle subrectangle = _kContainerRenderingExtensions.addRectangle(rectangle);
+          _kRenderingExtensions.to(
+              _kRenderingExtensions.from(
+                  _kRenderingExtensions.setGridPlacementData(subrectangle),
+                  _kRenderingExtensions.LEFT,
+                  0,
+                  0,
+                  _kRenderingExtensions.TOP,
+                  0,
+                  0),
+              _kRenderingExtensions.RIGHT,
+              2,
+              0,
+              _kRenderingExtensions.BOTTOM,
+              0,
+              0);
+          _linguaFrancaStyleExtensions.noSelectionStyle(subrectangle);
+          _kRenderingExtensions.addSingleClickAction(subrectangle, ShowCycleAction.ID);
+
+          KText subrectangleText =
+              _kContainerRenderingExtensions.addText(subrectangle, TEXT_ERROR_CYCLE_BTN_SHOW);
+          // Copy text style
+          List<KStyle> styles =
+              ListExtensions.map(
+                  IterableExtensions.head(
+                          _kRenderingExtensions.getKContainerRendering(err).getChildren())
+                      .getStyles(),
+                  EcoreUtil::copy);
+          subrectangleText.getStyles().addAll(styles);
+          _kRenderingExtensions.setFontSize(subrectangleText, 5);
+          _kRenderingExtensions.setSurroundingSpace(subrectangleText, 1, 0);
+          _linguaFrancaStyleExtensions.noSelectionStyle(subrectangleText);
+          _kRenderingExtensions.addSingleClickAction(subrectangleText, ShowCycleAction.ID);
+
+          subrectangle = _kContainerRenderingExtensions.addRectangle(rectangle);
+          _kRenderingExtensions.to(
+              _kRenderingExtensions.from(
+                  _kRenderingExtensions.setGridPlacementData(subrectangle),
+                  _kRenderingExtensions.LEFT,
+                  0,
+                  0,
+                  _kRenderingExtensions.TOP,
+                  0,
+                  0),
+              _kRenderingExtensions.RIGHT,
+              0,
+              0,
+              _kRenderingExtensions.BOTTOM,
+              0,
+              0);
+          _linguaFrancaStyleExtensions.noSelectionStyle(subrectangle);
+          _kRenderingExtensions.addSingleClickAction(subrectangle, FilterCycleAction.ID);
+
+          subrectangleText =
+              _kContainerRenderingExtensions.addText(
+                  subrectangle,
+                  _filterCycleAction.isCycleFiltered(node)
+                      ? TEXT_ERROR_CYCLE_BTN_UNFILTER
+                      : TEXT_ERROR_CYCLE_BTN_FILTER);
+          // Copy text style
+          styles =
+              ListExtensions.map(
+                  IterableExtensions.head(
+                          _kRenderingExtensions.getKContainerRendering(err).getChildren())
+                      .getStyles(),
+                  EcoreUtil::copy);
+          subrectangleText.getStyles().addAll(styles);
+          _kRenderingExtensions.setFontSize(subrectangleText, 5);
+          _kRenderingExtensions.setSurroundingSpace(subrectangleText, 1, 0);
+          _linguaFrancaStyleExtensions.noSelectionStyle(subrectangleText);
+          _kRenderingExtensions.addSingleClickAction(subrectangleText, FilterCycleAction.ID);
+          _filterCycleAction.markCycleFilterText(subrectangleText, err);
+
+          // if user interactively requested a filtered diagram keep it filtered during updates
+          if (_filterCycleAction.isCycleFiltered(node)) {
+            _filterCycleAction.filterCycle(node);
+          }
+          return err;
         }
+      } catch (Exception e) {
+        _filterCycleAction.resetCycleFiltering(node);
+        e.printStackTrace();
+        return addErrorComment(node, TEXT_ERROR_CYCLE_DETECTION);
+      }
+    }
+    return null;
+  }
+
+  private Collection<KNode> transformReactorNetwork(
+      ReactorInstance reactorInstance,
+      Map<PortInstance, KPort> parentInputPorts,
+      Map<PortInstance, KPort> parentOutputPorts,
+      Map<ReactorInstance, KNode> allReactorNodes) {
+    List<KNode> nodes = new ArrayList<>();
+    Table<ReactorInstance, PortInstance, KPort> inputPorts = HashBasedTable.create();
+    Table<ReactorInstance, PortInstance, KPort> outputPorts = HashBasedTable.create();
+    Map<ReactionInstance, KNode> reactionNodes = new HashMap<>();
+    Map<KPort, KNode> directConnectionDummyNodes = new HashMap<>();
+    Multimap<ActionInstance, KPort> actionDestinations = HashMultimap.create();
+    Multimap<ActionInstance, KPort> actionSources = HashMultimap.create();
+    Map<TimerInstance, KNode> timerNodes = new HashMap<>();
+    KNode startupNode = _kNodeExtensions.createNode();
+    TriggerInstance<?> startup = null;
+    KNode shutdownNode = _kNodeExtensions.createNode();
+    TriggerInstance<?> shutdown = null;
+    KNode resetNode = _kNodeExtensions.createNode();
+    TriggerInstance<?> reset = null;
+
+    // Transform instances
+    int index = 0;
+    for (ReactorInstance child : reactorInstance.children) {
+      Boolean expansionState = MemorizingExpandCollapseAction.getExpansionState(child);
+      Collection<KNode> rNodes =
+          createReactorNode(
+              child,
+              expansionState != null ? expansionState : false,
+              inputPorts,
+              outputPorts,
+              allReactorNodes);
+      nodes.addAll(rNodes);
+      index++;
+    }
 
-        // Connect actions
-        Set<ActionInstance> actions = new HashSet<>();
-        actions.addAll(actionSources.keySet());
-        actions.addAll(actionDestinations.keySet());
-
-        for (ActionInstance action : actions) {
-            KNode node = associateWith(_kNodeExtensions.createNode(), action.getDefinition());
-            NamedInstanceUtil.linkInstance(node, action);
-            _utilityExtensions.setID(node, action.uniqueID());
-            nodes.add(node);
-            Iterables.addAll(nodes, createUserComments(action.getDefinition(), node));
-            setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FIXED_SIDE);
-            _layoutPostProcessing.configureAction(node);
-            Pair<KPort, KPort> ports = _linguaFrancaShapeExtensions.addActionFigureAndPorts(
-                    node,
-                    action.isPhysical() ? "P" : "L");
-            // TODO handle variables?
-            if (action.getMinDelay() != null && action.getMinDelay() != ActionInstance.DEFAULT_MIN_DELAY) {
-                _kLabelExtensions.addOutsideBottomCenteredNodeLabel(
-                        node,
-                        String.format("min delay: %s", action.getMinDelay().toString()),
-                        7);
-            }
-            // TODO default value?
-            if (action.getDefinition().getMinSpacing() != null) {
-                _kLabelExtensions.addOutsideBottomCenteredNodeLabel(node,
-                        String.format("min spacing: %s", action.getMinSpacing().toString()),
-                        7);
-            }
-            if (!StringExtensions.isNullOrEmpty(action.getDefinition().getPolicy())) {
-                _kLabelExtensions.addOutsideBottomCenteredNodeLabel(node,
-                        String.format("policy: %s", action.getPolicy().toString()),
-                        7);
-            }
-            // connect source
-            for (KPort source : actionSources.get(action)) {
-                connect(createDelayEdge(action), source, ports.getKey());
-            }
+    // Create timers
+    for (TimerInstance timer : reactorInstance.timers) {
+      KNode node = associateWith(_kNodeExtensions.createNode(), timer.getDefinition());
+      NamedInstanceUtil.linkInstance(node, timer);
+      _utilityExtensions.setID(node, timer.uniqueID());
+      nodes.add(node);
+      Iterables.addAll(nodes, createUserComments(timer.getDefinition(), node));
+      timerNodes.put(timer, node);
+      _linguaFrancaShapeExtensions.addTimerFigure(node, timer);
+      _layoutPostProcessing.configureTimer(node);
+    }
 
-            // connect targets
-            for (KPort target : actionDestinations.get(action)) {
-                connect(createDelayEdge(action), ports.getValue(), target);
-            }
+    // Create reactions
+    for (ReactionInstance reaction : reactorInstance.reactions) {
+      int idx = reactorInstance.reactions.indexOf(reaction);
+      KNode node = associateWith(_kNodeExtensions.createNode(), reaction.getDefinition());
+      NamedInstanceUtil.linkInstance(node, reaction);
+      _utilityExtensions.setID(node, reaction.uniqueID());
+      nodes.add(node);
+      Iterables.addAll(nodes, createUserComments(reaction.getDefinition(), node));
+      reactionNodes.put(reaction, node);
+
+      setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FIXED_SIDE);
+      _layoutPostProcessing.configureReaction(node);
+      setLayoutOption(
+          node,
+          LayeredOptions.POSITION,
+          new KVector(
+              0, idx + 1)); // try order reactions vertically if in one layer (+1 to account for
+      // startup)
+
+      var figure = _linguaFrancaShapeExtensions.addReactionFigure(node, reaction);
+
+      int inputSize =
+          Stream.concat(reaction.triggers.stream(), reaction.sources.stream())
+              .collect(Collectors.toSet())
+              .size();
+      int outputSize = reaction.effects.size();
+      if (!getBooleanValue(REACTIONS_USE_HYPEREDGES) && (inputSize > 1 || outputSize > 1)) {
+        // If this node will have more than one input/output port, the port positions must be
+        // adjusted to the
+        // pointy shape. However, this is only possible after the layout.
+        ReactionPortAdjustment.apply(node, figure);
+      }
+
+      // connect input
+      KPort port = null;
+      for (TriggerInstance<?> trigger : reaction.triggers) {
+        // Create new port if there is no previous one or each dependency should have its own one
+        if (port == null || !getBooleanValue(REACTIONS_USE_HYPEREDGES)) {
+          port = addInvisiblePort(node);
+          setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.WEST);
+
+          if (getBooleanValue(REACTIONS_USE_HYPEREDGES) || inputSize == 1) {
+            // manual adjustment disabling automatic one
+            setLayoutOption(
+                port,
+                CoreOptions.PORT_BORDER_OFFSET,
+                (double) -LinguaFrancaShapeExtensions.REACTION_POINTINESS);
+          }
         }
 
-        // Transform connections.
-        // First, collect all the source ports.
-        List<PortInstance> sourcePorts = new LinkedList<>(reactorInstance.inputs);
-        for (ReactorInstance child : reactorInstance.children) {
-            sourcePorts.addAll(child.outputs);
+        if (trigger.isStartup()) {
+          connect(
+              createDependencyEdge(
+                  ((TriggerInstance.BuiltinTriggerVariable) trigger.getDefinition()).definition),
+              startupNode,
+              port);
+          startup = trigger;
+        } else if (trigger.isShutdown()) {
+          connect(
+              createDelayEdge(
+                  ((TriggerInstance.BuiltinTriggerVariable) trigger.getDefinition()).definition),
+              shutdownNode,
+              port);
+          shutdown = trigger;
+        } else if (trigger.isReset()) {
+          connect(
+              createDependencyEdge(
+                  ((TriggerInstance.BuiltinTriggerVariable) trigger.getDefinition()).definition),
+              resetNode,
+              port);
+          reset = trigger;
+        } else if (trigger instanceof ActionInstance) {
+          actionDestinations.put(((ActionInstance) trigger), port);
+        } else if (trigger instanceof PortInstance) {
+          KPort src = null;
+          PortInstance triggerAsPort = (PortInstance) trigger;
+          if (triggerAsPort.getParent() == reactorInstance) {
+            src = parentInputPorts.get(trigger);
+          } else {
+            src = outputPorts.get(triggerAsPort.getParent(), trigger);
+          }
+          if (src != null) {
+            connect(createDependencyEdge(triggerAsPort.getDefinition()), src, port);
+          }
+        } else if (trigger instanceof TimerInstance) {
+          KNode src = timerNodes.get(trigger);
+          if (src != null) {
+            connect(createDependencyEdge(trigger.getDefinition()), src, port);
+          }
         }
-
-        for (PortInstance leftPort : sourcePorts) {
-            KPort source = leftPort.getParent() == reactorInstance ?
-                    parentInputPorts.get(leftPort) :
-                    outputPorts.get(leftPort.getParent(), leftPort);
-
-            for (SendRange sendRange : leftPort.getDependentPorts()) {
-                for (RuntimeRange<PortInstance> rightRange : sendRange.destinations) {
-                    PortInstance rightPort = rightRange.instance;
-                    KPort target = rightPort.getParent() == reactorInstance ?
-                            parentOutputPorts.get(rightPort) :
-                            inputPorts.get(rightPort.getParent(), rightPort);
-                    // There should be a connection, but skip if not.
-                    Connection connection = sendRange.connection;
-                    if (connection != null) {
-                        KEdge edge = createIODependencyEdge(connection, (leftPort.isMultiport() || rightPort.isMultiport()));
-                        if (connection.getDelay() != null) {
-                            KLabel delayLabel = _kLabelExtensions.addCenterEdgeLabel(edge, ASTUtils.toOriginalText(connection.getDelay()));
-                            associateWith(delayLabel, connection.getDelay());
-                            if (connection.isPhysical()) {
-                                _linguaFrancaStyleExtensions.applyOnEdgePysicalDelayStyle(delayLabel,
-                                        reactorInstance.isMainOrFederated() ? Colors.WHITE : Colors.GRAY_95);
-                            } else {
-                                _linguaFrancaStyleExtensions.applyOnEdgeDelayStyle(delayLabel);
-                            }
-                        } else if (connection.isPhysical()) {
-                            KLabel physicalConnectionLabel = _kLabelExtensions.addCenterEdgeLabel(edge, "---");
-                            _linguaFrancaStyleExtensions.applyOnEdgePysicalStyle(physicalConnectionLabel,
-                                    reactorInstance.isMainOrFederated() ? Colors.WHITE : Colors.GRAY_95);
-                        }
-                        if (source != null && target != null) {
-                            // check for inside loop (direct in -> out connection with delay)
-                            if (parentInputPorts.values().contains(source) &&
-                                    parentOutputPorts.values().contains(target)) {
-                                // edge.setLayoutOption(CoreOptions.INSIDE_SELF_LOOPS_YO, true) // Does not work as expected
-                                // Introduce dummy node to enable direct connection (that is also hidden when collapsed)
-                                KNode dummy = _kNodeExtensions.createNode();
-                                if (directConnectionDummyNodes.containsKey(target)) {
-                                    dummy = directConnectionDummyNodes.get(target);
-                                } else {
-                                    nodes.add(dummy);
-                                    directConnectionDummyNodes.put(target, dummy);
-                                    _kRenderingExtensions.addInvisibleContainerRendering(dummy);
-                                    _kNodeExtensions.setNodeSize(dummy, 0, 0);
-                                    KEdge extraEdge = createIODependencyEdge(null,
-                                            (leftPort.isMultiport() || rightPort.isMultiport()));
-                                    connect(extraEdge, dummy, target);
-                                }
-                                connect(edge, source, dummy);
-                            } else {
-                                connect(edge, source, target);
-                            }
-                        }
-                    }
-                }
-            }
+      }
+
+      // connect dependencies
+      for (TriggerInstance<?> dep : reaction.sources) {
+        if (reaction.triggers.contains(dep)) continue; // skip
+
+        // Create new port if there is no previous one or each dependency should have its own one
+        if (port == null || !getBooleanValue(REACTIONS_USE_HYPEREDGES)) {
+          port = addInvisiblePort(node);
+          setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.WEST);
+
+          if (getBooleanValue(REACTIONS_USE_HYPEREDGES) || inputSize == 1) {
+            // manual adjustment disabling automatic one
+            setLayoutOption(
+                port,
+                CoreOptions.PORT_BORDER_OFFSET,
+                (double) -LinguaFrancaShapeExtensions.REACTION_POINTINESS);
+          }
         }
 
-        // Add startup/shutdown
-        if (startup != null) {
-            _linguaFrancaShapeExtensions.addStartupFigure(startupNode);
-            _utilityExtensions.setID(startupNode, reactorInstance.uniqueID() + "_startup");
-            NamedInstanceUtil.linkInstance(startupNode, startup);
-            startupNode.setProperty(REACTION_SPECIAL_TRIGGER, true);
-            nodes.add(0, startupNode); // add at the start (ordered first)
-            // try to order with reactions vertically if in one layer
-            setLayoutOption(startupNode, LayeredOptions.POSITION, new KVector(0, 0));
-            setLayoutOption(startupNode, LayeredOptions.LAYERING_LAYER_CONSTRAINT, LayerConstraint.FIRST);
-            _layoutPostProcessing.configureAction(startupNode);
-
-            if (getBooleanValue(REACTIONS_USE_HYPEREDGES)) {
-                KPort port = addInvisiblePort(startupNode);
-                startupNode.getOutgoingEdges().forEach(it -> {
-                    it.setSourcePort(port);
-                });
-            }
+        if (dep instanceof PortInstance) {
+          KPort src = null;
+          PortInstance depAsPort = (PortInstance) dep;
+          if (dep.getParent() == reactorInstance) {
+            src = parentInputPorts.get(dep);
+          } else {
+            src = outputPorts.get(depAsPort.getParent(), dep);
+          }
+          if (src != null) {
+            connect(createDependencyEdge(dep.getDefinition()), src, port);
+          }
         }
-        if (shutdown != null) {
-            _linguaFrancaShapeExtensions.addShutdownFigure(shutdownNode);
-            _utilityExtensions.setID(shutdownNode, reactorInstance.uniqueID() + "_shutdown");
-            NamedInstanceUtil.linkInstance(shutdownNode, shutdown);
-            shutdownNode.setProperty(REACTION_SPECIAL_TRIGGER, true);
-            nodes.add(shutdownNode); // add at the end (ordered last)
-            // try to order with reactions vertically if in one layer
-            _layoutPostProcessing.configureShutDown(shutdownNode);
-            setLayoutOption(shutdownNode, LayeredOptions.POSITION, new KVector(0, reactorInstance.reactions.size() + 1));
-
-            if (getBooleanValue(REACTIONS_USE_HYPEREDGES)) { // connect all edges to one port
-                KPort port = addInvisiblePort(shutdownNode);
-                shutdownNode.getOutgoingEdges().forEach(it -> {
-                    it.setSourcePort(port);
-                });
-            }
-        }
-        if (reset != null) {
-            _linguaFrancaShapeExtensions.addResetFigure(resetNode);
-            _utilityExtensions.setID(resetNode, reactorInstance.uniqueID() + "_reset");
-            NamedInstanceUtil.linkInstance(resetNode, reset);
-            resetNode.setProperty(REACTION_SPECIAL_TRIGGER, true);
-            nodes.add(startup != null ? 1 : 0, resetNode); // after startup
-            // try to order with reactions vertically if in one layer
-            setLayoutOption(resetNode, LayeredOptions.POSITION, new KVector(0, 0.5));
-            setLayoutOption(resetNode, LayeredOptions.LAYERING_LAYER_CONSTRAINT, LayerConstraint.FIRST);
-
-            if (getBooleanValue(REACTIONS_USE_HYPEREDGES)) { // connect all edges to one port
-                KPort port = addInvisiblePort(resetNode);
-                resetNode.getOutgoingEdges().forEach(it -> {
-                    it.setSourcePort(port);
-                });
-            }
-        }
-
-        // Postprocess timer nodes
-        if (getBooleanValue(REACTIONS_USE_HYPEREDGES)) { // connect all edges to one port
-            for (KNode timerNode : timerNodes.values()) {
-                KPort port = addInvisiblePort(timerNode);
-                timerNode.getOutgoingEdges().forEach(it -> {
-                    it.setSourcePort(port);
-                });
-            }
+      }
+
+      // connect outputs
+      port = null; // enforce new ports for outputs
+      Set<TriggerInstance<?>> iterSet =
+          reaction.effects != null ? reaction.effects : new HashSet<>();
+      for (TriggerInstance<?> effect : iterSet) {
+        // Create new port if there is no previous one or each dependency should have its own one
+        if (port == null || !getBooleanValue(REACTIONS_USE_HYPEREDGES)) {
+          port = addInvisiblePort(node);
+          setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.EAST);
         }
 
-        // Add reaction order edges (add last to have them on top of other edges)
-        if (reactorInstance.reactions.size() > 1) {
-            KNode prevNode = reactionNodes.get(IterableExtensions.head(reactorInstance.reactions));
-            Iterable<KNode> iterList = IterableExtensions.map(
-                    IterableExtensions.drop(reactorInstance.reactions, 1),
-                    reactionNodes::get);
-            for (KNode node : iterList) {
-                KEdge edge = createOrderEdge();
-                edge.setSource(prevNode);
-                edge.setTarget(node);
-                edge.setProperty(CoreOptions.NO_LAYOUT, true);
-
-                // Do not remove them, as they are needed for cycle detection
-                KRendering edgeRendering = _kRenderingExtensions.getKRendering(edge);
-                _kRenderingExtensions.setInvisible(edgeRendering, !getBooleanValue(SHOW_REACTION_ORDER_EDGES));
-                _kRenderingExtensions.getInvisible(edgeRendering).setPropagateToChildren(true);
-               // TODO this does not work work with incremental update (https://github.com/kieler/KLighD/issues/37)
-               // if (!getBooleanValue(SHOW_REACTION_ORDER_EDGES)) edge.initiallyHide()
-
-                prevNode = node;
-            }
+        if (effect instanceof ActionInstance) {
+          actionSources.put((ActionInstance) effect, port);
+        } else if (effect instanceof PortInstance) {
+          KPort dst = null;
+          PortInstance effectAsPort = (PortInstance) effect;
+          if (effectAsPort.isOutput()) {
+            dst = parentOutputPorts.get(effect);
+          } else {
+            dst = inputPorts.get(effectAsPort.getParent(), effect);
+          }
+          if (dst != null) {
+            connect(createDependencyEdge(effect), port, dst);
+          }
         }
+      }
+    }
 
-        _layoutPostProcessing.orderChildren(nodes);
-        _modeDiagrams.handleModes(nodes, reactorInstance);
+    // Connect actions
+    Set<ActionInstance> actions = new HashSet<>();
+    actions.addAll(actionSources.keySet());
+    actions.addAll(actionDestinations.keySet());
+
+    for (ActionInstance action : actions) {
+      KNode node = associateWith(_kNodeExtensions.createNode(), action.getDefinition());
+      NamedInstanceUtil.linkInstance(node, action);
+      _utilityExtensions.setID(node, action.uniqueID());
+      nodes.add(node);
+      Iterables.addAll(nodes, createUserComments(action.getDefinition(), node));
+      setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FIXED_SIDE);
+      _layoutPostProcessing.configureAction(node);
+      Pair<KPort, KPort> ports =
+          _linguaFrancaShapeExtensions.addActionFigureAndPorts(
+              node, action.isPhysical() ? "P" : "L");
+      // TODO handle variables?
+      if (action.getMinDelay() != null
+          && action.getMinDelay() != ActionInstance.DEFAULT_MIN_DELAY) {
+        _kLabelExtensions.addOutsideBottomCenteredNodeLabel(
+            node, String.format("min delay: %s", action.getMinDelay().toString()), 7);
+      }
+      // TODO default value?
+      if (action.getDefinition().getMinSpacing() != null) {
+        _kLabelExtensions.addOutsideBottomCenteredNodeLabel(
+            node, String.format("min spacing: %s", action.getMinSpacing().toString()), 7);
+      }
+      if (!StringExtensions.isNullOrEmpty(action.getDefinition().getPolicy())) {
+        _kLabelExtensions.addOutsideBottomCenteredNodeLabel(
+            node, String.format("policy: %s", action.getPolicy().toString()), 7);
+      }
+      // connect source
+      for (KPort source : actionSources.get(action)) {
+        connect(createDelayEdge(action), source, ports.getKey());
+      }
+
+      // connect targets
+      for (KPort target : actionDestinations.get(action)) {
+        connect(createDelayEdge(action), ports.getValue(), target);
+      }
+    }
 
-        return nodes;
+    // Transform connections.
+    // First, collect all the source ports.
+    List<PortInstance> sourcePorts = new LinkedList<>(reactorInstance.inputs);
+    for (ReactorInstance child : reactorInstance.children) {
+      sourcePorts.addAll(child.outputs);
     }
 
-    private String createReactorLabel(ReactorInstance reactorInstance) {
-        StringBuilder b = new StringBuilder();
-        if (getBooleanValue(SHOW_INSTANCE_NAMES) && !_utilityExtensions.isRoot(reactorInstance)) {
-            if (!reactorInstance.isMainOrFederated()) {
-                b.append(reactorInstance.getName()).append(" : ");
-            }
-        }
-        if (reactorInstance.isMainOrFederated()) {
-            try {
-                b.append(FileUtil.nameWithoutExtension(reactorInstance.reactorDeclaration.eResource()));
-            } catch (Exception e) {
-                throw Exceptions.sneakyThrow(e);
+    for (PortInstance leftPort : sourcePorts) {
+      KPort source =
+          leftPort.getParent() == reactorInstance
+              ? parentInputPorts.get(leftPort)
+              : outputPorts.get(leftPort.getParent(), leftPort);
+
+      for (SendRange sendRange : leftPort.getDependentPorts()) {
+        for (RuntimeRange<PortInstance> rightRange : sendRange.destinations) {
+          PortInstance rightPort = rightRange.instance;
+          KPort target =
+              rightPort.getParent() == reactorInstance
+                  ? parentOutputPorts.get(rightPort)
+                  : inputPorts.get(rightPort.getParent(), rightPort);
+          // There should be a connection, but skip if not.
+          Connection connection = sendRange.connection;
+          if (connection != null) {
+            KEdge edge =
+                createIODependencyEdge(
+                    connection, (leftPort.isMultiport() || rightPort.isMultiport()));
+            if (connection.getDelay() != null) {
+              KLabel delayLabel =
+                  _kLabelExtensions.addCenterEdgeLabel(
+                      edge, ASTUtils.toOriginalText(connection.getDelay()));
+              associateWith(delayLabel, connection.getDelay());
+              if (connection.isPhysical()) {
+                _linguaFrancaStyleExtensions.applyOnEdgePysicalDelayStyle(
+                    delayLabel,
+                    reactorInstance.isMainOrFederated() ? Colors.WHITE : Colors.GRAY_95);
+              } else {
+                _linguaFrancaStyleExtensions.applyOnEdgeDelayStyle(delayLabel);
+              }
+            } else if (connection.isPhysical()) {
+              KLabel physicalConnectionLabel = _kLabelExtensions.addCenterEdgeLabel(edge, "---");
+              _linguaFrancaStyleExtensions.applyOnEdgePysicalStyle(
+                  physicalConnectionLabel,
+                  reactorInstance.isMainOrFederated() ? Colors.WHITE : Colors.GRAY_95);
             }
-        } else if (reactorInstance.reactorDeclaration == null) {
-            // There is an error in the graph.
-            b.append("<Unresolved Reactor>");
-        } else {
-            b.append(reactorInstance.reactorDeclaration.getName());
-        }
-        if (getObjectValue(REACTOR_PARAMETER_MODE) == ReactorParameterDisplayModes.TITLE) {
-            if (reactorInstance.parameters.isEmpty()) {
-                b.append("()");
-            } else {
-                b.append(IterableExtensions.join(reactorInstance.parameters, "(", ", ", ")",
-                        it -> {
-                            return createParameterLabel(it);
-                        }));
+            if (source != null && target != null) {
+              // check for inside loop (direct in -> out connection with delay)
+              if (parentInputPorts.values().contains(source)
+                  && parentOutputPorts.values().contains(target)) {
+                // edge.setLayoutOption(CoreOptions.INSIDE_SELF_LOOPS_YO, true) // Does not work as
+                // expected
+                // Introduce dummy node to enable direct connection (that is also hidden when
+                // collapsed)
+                KNode dummy = _kNodeExtensions.createNode();
+                if (directConnectionDummyNodes.containsKey(target)) {
+                  dummy = directConnectionDummyNodes.get(target);
+                } else {
+                  nodes.add(dummy);
+                  directConnectionDummyNodes.put(target, dummy);
+                  _kRenderingExtensions.addInvisibleContainerRendering(dummy);
+                  _kNodeExtensions.setNodeSize(dummy, 0, 0);
+                  KEdge extraEdge =
+                      createIODependencyEdge(
+                          null, (leftPort.isMultiport() || rightPort.isMultiport()));
+                  connect(extraEdge, dummy, target);
+                }
+                connect(edge, source, dummy);
+              } else {
+                connect(edge, source, target);
+              }
             }
+          }
         }
-        return b.toString();
+      }
     }
 
-    private void addParameterList(KContainerRendering container, List<ParameterInstance> parameters) {
-        int cols = 1;
-        try {
-            cols = getIntValue(REACTOR_BODY_TABLE_COLS);
-        } catch (Exception e) {} // ignore
-        if (cols > parameters.size()) {
-            cols = parameters.size();
-        }
-        _kContainerRenderingExtensions.setGridPlacement(container, cols);
-        for (ParameterInstance param : parameters) {
-            var entry = _linguaFrancaShapeExtensions.addParameterEntry(
-                    container, param.getDefinition(), createParameterLabel(param));
-            _kRenderingExtensions.setHorizontalAlignment(entry, HorizontalAlignment.LEFT);
-        }
+    // Add startup/shutdown
+    if (startup != null) {
+      _linguaFrancaShapeExtensions.addStartupFigure(startupNode);
+      _utilityExtensions.setID(startupNode, reactorInstance.uniqueID() + "_startup");
+      NamedInstanceUtil.linkInstance(startupNode, startup);
+      startupNode.setProperty(REACTION_SPECIAL_TRIGGER, true);
+      nodes.add(0, startupNode); // add at the start (ordered first)
+      // try to order with reactions vertically if in one layer
+      setLayoutOption(startupNode, LayeredOptions.POSITION, new KVector(0, 0));
+      setLayoutOption(startupNode, LayeredOptions.LAYERING_LAYER_CONSTRAINT, LayerConstraint.FIRST);
+      _layoutPostProcessing.configureAction(startupNode);
+
+      if (getBooleanValue(REACTIONS_USE_HYPEREDGES)) {
+        KPort port = addInvisiblePort(startupNode);
+        startupNode
+            .getOutgoingEdges()
+            .forEach(
+                it -> {
+                  it.setSourcePort(port);
+                });
+      }
     }
-
-    private String createParameterLabel(ParameterInstance param) {
-        StringBuilder b = new StringBuilder();
-        b.append(param.getName());
-        String t = param.type.toOriginalText();
-        if (!StringExtensions.isNullOrEmpty(t)) {
-            b.append(": ").append(t);
-        }
-        if (param.getOverride() != null) {
-            b.append(" = ");
-            var init = param.getActualValue();
-            b.append(FormattingUtils.render(init));
-        }
-        return b.toString();
+    if (shutdown != null) {
+      _linguaFrancaShapeExtensions.addShutdownFigure(shutdownNode);
+      _utilityExtensions.setID(shutdownNode, reactorInstance.uniqueID() + "_shutdown");
+      NamedInstanceUtil.linkInstance(shutdownNode, shutdown);
+      shutdownNode.setProperty(REACTION_SPECIAL_TRIGGER, true);
+      nodes.add(shutdownNode); // add at the end (ordered last)
+      // try to order with reactions vertically if in one layer
+      _layoutPostProcessing.configureShutDown(shutdownNode);
+      setLayoutOption(
+          shutdownNode,
+          LayeredOptions.POSITION,
+          new KVector(0, reactorInstance.reactions.size() + 1));
+
+      if (getBooleanValue(REACTIONS_USE_HYPEREDGES)) { // connect all edges to one port
+        KPort port = addInvisiblePort(shutdownNode);
+        shutdownNode
+            .getOutgoingEdges()
+            .forEach(
+                it -> {
+                  it.setSourcePort(port);
+                });
+      }
     }
-
-    public void addStateVariableList(KContainerRendering container, List<StateVar> variables) {
-        int cols = 1;
-        try {
-            cols = getIntValue(REACTOR_BODY_TABLE_COLS);
-        } catch (Exception e) {} // ignore
-        if (cols > variables.size()) {
-            cols = variables.size();
-        }
-        _kContainerRenderingExtensions.setGridPlacement(container, cols);
-        for (var variable : variables) {
-            var entry = _linguaFrancaShapeExtensions.addStateEntry(
-                    container, variable, createStateVariableLabel(variable), variable.isReset());
-            _kRenderingExtensions.setHorizontalAlignment(entry, HorizontalAlignment.LEFT);
-        }
+    if (reset != null) {
+      _linguaFrancaShapeExtensions.addResetFigure(resetNode);
+      _utilityExtensions.setID(resetNode, reactorInstance.uniqueID() + "_reset");
+      NamedInstanceUtil.linkInstance(resetNode, reset);
+      resetNode.setProperty(REACTION_SPECIAL_TRIGGER, true);
+      nodes.add(startup != null ? 1 : 0, resetNode); // after startup
+      // try to order with reactions vertically if in one layer
+      setLayoutOption(resetNode, LayeredOptions.POSITION, new KVector(0, 0.5));
+      setLayoutOption(resetNode, LayeredOptions.LAYERING_LAYER_CONSTRAINT, LayerConstraint.FIRST);
+
+      if (getBooleanValue(REACTIONS_USE_HYPEREDGES)) { // connect all edges to one port
+        KPort port = addInvisiblePort(resetNode);
+        resetNode
+            .getOutgoingEdges()
+            .forEach(
+                it -> {
+                  it.setSourcePort(port);
+                });
+      }
     }
 
-    private String createStateVariableLabel(StateVar variable) {
-        StringBuilder b = new StringBuilder();
-        b.append(variable.getName());
-        if (variable.getType() != null) {
-            var t = InferredType.fromAST(variable.getType());
-            b.append(":").append(t.toOriginalText());
-        }
-        if (variable.getInit() != null) {
-            b.append(FormattingUtils.render(variable.getInit()));
-        }
-        return b.toString();
+    // Postprocess timer nodes
+    if (getBooleanValue(REACTIONS_USE_HYPEREDGES)) { // connect all edges to one port
+      for (KNode timerNode : timerNodes.values()) {
+        KPort port = addInvisiblePort(timerNode);
+        timerNode
+            .getOutgoingEdges()
+            .forEach(
+                it -> {
+                  it.setSourcePort(port);
+                });
+      }
     }
 
-    private KEdge createDelayEdge(Object associate) {
-        KEdge edge = _kEdgeExtensions.createEdge();
-        associateWith(edge, associate);
-        KPolyline line = _kEdgeExtensions.addPolyline(edge);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(line);
-        _kPolylineExtensions.addJunctionPointDecorator(line);
-        if (getBooleanValue(USE_ALTERNATIVE_DASH_PATTERN)) {
-            _kRenderingExtensions.setLineStyle(line, LineStyle.CUSTOM);
-            _kRenderingExtensions.getLineStyle(line).getDashPattern().addAll(ALTERNATIVE_DASH_PATTERN);
-        } else {
-            _kRenderingExtensions.setLineStyle(line, LineStyle.DASH);
-        }
-        return edge;
+    // Add reaction order edges (add last to have them on top of other edges)
+    if (reactorInstance.reactions.size() > 1) {
+      KNode prevNode = reactionNodes.get(IterableExtensions.head(reactorInstance.reactions));
+      Iterable<KNode> iterList =
+          IterableExtensions.map(
+              IterableExtensions.drop(reactorInstance.reactions, 1), reactionNodes::get);
+      for (KNode node : iterList) {
+        KEdge edge = createOrderEdge();
+        edge.setSource(prevNode);
+        edge.setTarget(node);
+        edge.setProperty(CoreOptions.NO_LAYOUT, true);
+
+        // Do not remove them, as they are needed for cycle detection
+        KRendering edgeRendering = _kRenderingExtensions.getKRendering(edge);
+        _kRenderingExtensions.setInvisible(
+            edgeRendering, !getBooleanValue(SHOW_REACTION_ORDER_EDGES));
+        _kRenderingExtensions.getInvisible(edgeRendering).setPropagateToChildren(true);
+        // TODO this does not work work with incremental update
+        // (https://github.com/kieler/KLighD/issues/37)
+        // if (!getBooleanValue(SHOW_REACTION_ORDER_EDGES)) edge.initiallyHide()
+
+        prevNode = node;
+      }
     }
 
-    private KEdge createIODependencyEdge(Object associate, boolean multiport) {
-        KEdge edge = _kEdgeExtensions.createEdge();
-        if (associate != null) {
-            associateWith(edge, associate);
-        }
-        KPolyline line = _kEdgeExtensions.addPolyline(edge);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(line);
-        _kPolylineExtensions.addJunctionPointDecorator(line);
-        if (multiport) {
-            // Render multiport connections and bank connections in bold.
-            _kRenderingExtensions.setLineWidth(line, 2.2f);
-            _kRenderingExtensions.setLineCap(line, LineCap.CAP_SQUARE);
-            // Adjust junction point size
-            _kPolylineExtensions.setJunctionPointDecorator(line, line.getJunctionPointRendering(), 6, 6);
-        }
-        return edge;
-    }
+    _layoutPostProcessing.orderChildren(nodes);
+    _modeDiagrams.handleModes(nodes, reactorInstance);
 
-    private KEdge createDependencyEdge(Object associate) {
-        KEdge edge = _kEdgeExtensions.createEdge();
-        if (associate != null) {
-            associateWith(edge, associate);
-        }
-        KPolyline line = _kEdgeExtensions.addPolyline(edge);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(line);
-        _kPolylineExtensions.addJunctionPointDecorator(line);
-        if (getBooleanValue(USE_ALTERNATIVE_DASH_PATTERN)) {
-            _kRenderingExtensions.setLineStyle(line, LineStyle.CUSTOM);
-            _kRenderingExtensions.getLineStyle(line).getDashPattern().addAll(ALTERNATIVE_DASH_PATTERN);
-        } else {
-            _kRenderingExtensions.setLineStyle(line, LineStyle.DASH);
-        }
-        return edge;
-    }
+    return nodes;
+  }
 
-    private KEdge createOrderEdge() {
-        KEdge edge = _kEdgeExtensions.createEdge();
-        KPolyline line = _kEdgeExtensions.addPolyline(edge);
-        _kRenderingExtensions.setLineWidth(line, 1.5f);
-        _kRenderingExtensions.setLineStyle(line, LineStyle.DOT);
-        _kRenderingExtensions.setForeground(line, Colors.CHOCOLATE_1);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(line);
-        //addFixedTailArrowDecorator() // Fix for bug: https://github.com/kieler/KLighD/issues/38
-        _kPolylineExtensions.addHeadArrowDecorator(line);
-        return edge;
+  private String createReactorLabel(ReactorInstance reactorInstance) {
+    StringBuilder b = new StringBuilder();
+    if (getBooleanValue(SHOW_INSTANCE_NAMES) && !_utilityExtensions.isRoot(reactorInstance)) {
+      if (!reactorInstance.isMainOrFederated()) {
+        b.append(reactorInstance.getName()).append(" : ");
+      }
     }
-
-    private KEdge connect(KEdge edge, KNode src, KNode dst) {
-        edge.setSource(src);
-        edge.setTarget(dst);
-        return edge;
+    if (reactorInstance.isMainOrFederated()) {
+      try {
+        b.append(FileUtil.nameWithoutExtension(reactorInstance.reactorDeclaration.eResource()));
+      } catch (Exception e) {
+        throw Exceptions.sneakyThrow(e);
+      }
+    } else if (reactorInstance.reactorDeclaration == null) {
+      // There is an error in the graph.
+      b.append("<Unresolved Reactor>");
+    } else {
+      b.append(reactorInstance.reactorDeclaration.getName());
     }
-
-    private KEdge connect(KEdge edge, KNode src, KPort dst) {
-        edge.setSource(src);
-        edge.setTargetPort(dst);
-        edge.setTarget(dst != null ? dst.getNode() : null);
-        return edge;
+    if (getObjectValue(REACTOR_PARAMETER_MODE) == ReactorParameterDisplayModes.TITLE) {
+      if (reactorInstance.parameters.isEmpty()) {
+        b.append("()");
+      } else {
+        b.append(
+            IterableExtensions.join(
+                reactorInstance.parameters,
+                "(",
+                ", ",
+                ")",
+                it -> {
+                  return createParameterLabel(it);
+                }));
+      }
     }
-
-    private KEdge connect(KEdge edge, KPort src, KNode dst) {
-        edge.setSourcePort(src);
-        edge.setSource(src != null ? src.getNode() : null);
-        edge.setTarget(dst);
-        return edge;
+    return b.toString();
+  }
+
+  private void addParameterList(KContainerRendering container, List<ParameterInstance> parameters) {
+    int cols = 1;
+    try {
+      cols = getIntValue(REACTOR_BODY_TABLE_COLS);
+    } catch (Exception e) {
+    } // ignore
+    if (cols > parameters.size()) {
+      cols = parameters.size();
+    }
+    _kContainerRenderingExtensions.setGridPlacement(container, cols);
+    for (ParameterInstance param : parameters) {
+      var entry =
+          _linguaFrancaShapeExtensions.addParameterEntry(
+              container, param.getDefinition(), createParameterLabel(param));
+      _kRenderingExtensions.setHorizontalAlignment(entry, HorizontalAlignment.LEFT);
+    }
+  }
+
+  private String createParameterLabel(ParameterInstance param) {
+    StringBuilder b = new StringBuilder();
+    b.append(param.getName());
+    String t = param.type.toOriginalText();
+    if (!StringExtensions.isNullOrEmpty(t)) {
+      b.append(": ").append(t);
+    }
+    if (param.getOverride() != null) {
+      b.append(" = ");
+      var init = param.getActualValue();
+      b.append(FormattingUtils.render(init));
+    }
+    return b.toString();
+  }
+
+  public void addStateVariableList(KContainerRendering container, List<StateVar> variables) {
+    int cols = 1;
+    try {
+      cols = getIntValue(REACTOR_BODY_TABLE_COLS);
+    } catch (Exception e) {
+    } // ignore
+    if (cols > variables.size()) {
+      cols = variables.size();
+    }
+    _kContainerRenderingExtensions.setGridPlacement(container, cols);
+    for (var variable : variables) {
+      var entry =
+          _linguaFrancaShapeExtensions.addStateEntry(
+              container, variable, createStateVariableLabel(variable), variable.isReset());
+      _kRenderingExtensions.setHorizontalAlignment(entry, HorizontalAlignment.LEFT);
     }
+  }
+
+  private String createStateVariableLabel(StateVar variable) {
+    StringBuilder b = new StringBuilder();
+    b.append(variable.getName());
+    if (variable.getType() != null) {
+      var t = InferredType.fromAST(variable.getType());
+      b.append(":").append(t.toOriginalText());
+    }
+    if (variable.getInit() != null) {
+      b.append(FormattingUtils.render(variable.getInit()));
+    }
+    return b.toString();
+  }
+
+  private KEdge createDelayEdge(Object associate) {
+    KEdge edge = _kEdgeExtensions.createEdge();
+    associateWith(edge, associate);
+    KPolyline line = _kEdgeExtensions.addPolyline(edge);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(line);
+    _kPolylineExtensions.addJunctionPointDecorator(line);
+    if (getBooleanValue(USE_ALTERNATIVE_DASH_PATTERN)) {
+      _kRenderingExtensions.setLineStyle(line, LineStyle.CUSTOM);
+      _kRenderingExtensions.getLineStyle(line).getDashPattern().addAll(ALTERNATIVE_DASH_PATTERN);
+    } else {
+      _kRenderingExtensions.setLineStyle(line, LineStyle.DASH);
+    }
+    return edge;
+  }
 
-    private KEdge connect(KEdge edge, KPort src, KPort dst) {
-        edge.setSourcePort(src);
-        edge.setSource(src != null ? src.getNode() : null);
-        edge.setTargetPort(dst);
-        edge.setTarget(dst != null ? dst.getNode() : null);
-        return edge;
+  private KEdge createIODependencyEdge(Object associate, boolean multiport) {
+    KEdge edge = _kEdgeExtensions.createEdge();
+    if (associate != null) {
+      associateWith(edge, associate);
+    }
+    KPolyline line = _kEdgeExtensions.addPolyline(edge);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(line);
+    _kPolylineExtensions.addJunctionPointDecorator(line);
+    if (multiport) {
+      // Render multiport connections and bank connections in bold.
+      _kRenderingExtensions.setLineWidth(line, 2.2f);
+      _kRenderingExtensions.setLineCap(line, LineCap.CAP_SQUARE);
+      // Adjust junction point size
+      _kPolylineExtensions.setJunctionPointDecorator(line, line.getJunctionPointRendering(), 6, 6);
     }
+    return edge;
+  }
 
-    /**
-     * Translate an input/output into a port.
-     */
-    private KPort addIOPort(KNode node, PortInstance lfPort, boolean input, boolean multiport, boolean bank) {
-        KPort port = _kPortExtensions.createPort();
-        node.getPorts().add(port);
-        associateWith(port, lfPort.getDefinition());
-        NamedInstanceUtil.linkInstance(port, lfPort);
-        _kPortExtensions.setPortSize(port, 6, 6);
-
-        if (input) {
-            // multiports are smaller by an offset at the right, hence compensate in inputs
-            double offset = multiport ? -3.4 : -3.3;
-            setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.WEST);
-            setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET, offset);
-        } else {
-            double offset = multiport ? -2.6 : -3.3; // multiports are smaller
-            offset = bank ? offset - LinguaFrancaShapeExtensions.BANK_FIGURE_X_OFFSET_SUM : offset; // compensate bank figure width
-            setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.EAST);
-            setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET, offset);
-        }
+  private KEdge createDependencyEdge(Object associate) {
+    KEdge edge = _kEdgeExtensions.createEdge();
+    if (associate != null) {
+      associateWith(edge, associate);
+    }
+    KPolyline line = _kEdgeExtensions.addPolyline(edge);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(line);
+    _kPolylineExtensions.addJunctionPointDecorator(line);
+    if (getBooleanValue(USE_ALTERNATIVE_DASH_PATTERN)) {
+      _kRenderingExtensions.setLineStyle(line, LineStyle.CUSTOM);
+      _kRenderingExtensions.getLineStyle(line).getDashPattern().addAll(ALTERNATIVE_DASH_PATTERN);
+    } else {
+      _kRenderingExtensions.setLineStyle(line, LineStyle.DASH);
+    }
+    return edge;
+  }
+
+  private KEdge createOrderEdge() {
+    KEdge edge = _kEdgeExtensions.createEdge();
+    KPolyline line = _kEdgeExtensions.addPolyline(edge);
+    _kRenderingExtensions.setLineWidth(line, 1.5f);
+    _kRenderingExtensions.setLineStyle(line, LineStyle.DOT);
+    _kRenderingExtensions.setForeground(line, Colors.CHOCOLATE_1);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(line);
+    // addFixedTailArrowDecorator() // Fix for bug: https://github.com/kieler/KLighD/issues/38
+    _kPolylineExtensions.addHeadArrowDecorator(line);
+    return edge;
+  }
+
+  private KEdge connect(KEdge edge, KNode src, KNode dst) {
+    edge.setSource(src);
+    edge.setTarget(dst);
+    return edge;
+  }
+
+  private KEdge connect(KEdge edge, KNode src, KPort dst) {
+    edge.setSource(src);
+    edge.setTargetPort(dst);
+    edge.setTarget(dst != null ? dst.getNode() : null);
+    return edge;
+  }
+
+  private KEdge connect(KEdge edge, KPort src, KNode dst) {
+    edge.setSourcePort(src);
+    edge.setSource(src != null ? src.getNode() : null);
+    edge.setTarget(dst);
+    return edge;
+  }
+
+  private KEdge connect(KEdge edge, KPort src, KPort dst) {
+    edge.setSourcePort(src);
+    edge.setSource(src != null ? src.getNode() : null);
+    edge.setTargetPort(dst);
+    edge.setTarget(dst != null ? dst.getNode() : null);
+    return edge;
+  }
+
+  /** Translate an input/output into a port. */
+  private KPort addIOPort(
+      KNode node, PortInstance lfPort, boolean input, boolean multiport, boolean bank) {
+    KPort port = _kPortExtensions.createPort();
+    node.getPorts().add(port);
+    associateWith(port, lfPort.getDefinition());
+    NamedInstanceUtil.linkInstance(port, lfPort);
+    _kPortExtensions.setPortSize(port, 6, 6);
+
+    if (input) {
+      // multiports are smaller by an offset at the right, hence compensate in inputs
+      double offset = multiport ? -3.4 : -3.3;
+      setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.WEST);
+      setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET, offset);
+    } else {
+      double offset = multiport ? -2.6 : -3.3; // multiports are smaller
+      offset =
+          bank
+              ? offset - LinguaFrancaShapeExtensions.BANK_FIGURE_X_OFFSET_SUM
+              : offset; // compensate bank figure width
+      setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.EAST);
+      setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET, offset);
+    }
 
-        if (bank && !node.getProperty(REACTOR_HAS_BANK_PORT_OFFSET)) {// compensate bank figure height
-            // https://github.com/eclipse/elk/issues/693
-            _utilityExtensions.getPortMarginsInitIfAbsent(node).add(
-                    new ElkMargin(0, 0, LinguaFrancaShapeExtensions.BANK_FIGURE_Y_OFFSET_SUM, 0));
-            node.setProperty(REACTOR_HAS_BANK_PORT_OFFSET, true); // only once
-        }
+    if (bank && !node.getProperty(REACTOR_HAS_BANK_PORT_OFFSET)) { // compensate bank figure height
+      // https://github.com/eclipse/elk/issues/693
+      _utilityExtensions
+          .getPortMarginsInitIfAbsent(node)
+          .add(new ElkMargin(0, 0, LinguaFrancaShapeExtensions.BANK_FIGURE_Y_OFFSET_SUM, 0));
+      node.setProperty(REACTOR_HAS_BANK_PORT_OFFSET, true); // only once
+    }
 
-        _linguaFrancaShapeExtensions.addTrianglePort(port, multiport);
+    _linguaFrancaShapeExtensions.addTrianglePort(port, multiport);
 
-        String label = lfPort.getName();
-        if (!getBooleanValue(SHOW_PORT_NAMES)) {
-            label = "";
-        }
-        if (getBooleanValue(SHOW_MULTIPORT_WIDTH)) {
-            if (lfPort.isMultiport()) {
-                label += (lfPort.getWidth() >= 0) ?
-                        "[" + lfPort.getWidth() + "]" :
-                        "[?]";
-            }
-        }
-        associateWith(_kLabelExtensions.addOutsidePortLabel(port, label, 8), lfPort.getDefinition());
-        return port;
+    String label = lfPort.getName();
+    if (!getBooleanValue(SHOW_PORT_NAMES)) {
+      label = "";
     }
-
-    private KPort addInvisiblePort(KNode node) {
-        KPort port = _kPortExtensions.createPort();
-        node.getPorts().add(port);
-        port.setSize(0, 0); // invisible
-        return port;
+    if (getBooleanValue(SHOW_MULTIPORT_WIDTH)) {
+      if (lfPort.isMultiport()) {
+        label += (lfPort.getWidth() >= 0) ? "[" + lfPort.getWidth() + "]" : "[?]";
+      }
     }
-
-    private KNode addErrorComment(KNode node, String message) {
+    associateWith(_kLabelExtensions.addOutsidePortLabel(port, label, 8), lfPort.getDefinition());
+    return port;
+  }
+
+  private KPort addInvisiblePort(KNode node) {
+    KPort port = _kPortExtensions.createPort();
+    node.getPorts().add(port);
+    port.setSize(0, 0); // invisible
+    return port;
+  }
+
+  private KNode addErrorComment(KNode node, String message) {
+    KNode comment = _kNodeExtensions.createNode();
+    setLayoutOption(comment, CoreOptions.COMMENT_BOX, true);
+    KRoundedRectangle commentFigure =
+        _linguaFrancaShapeExtensions.addCommentFigure(comment, message);
+    _linguaFrancaStyleExtensions.errorStyle(commentFigure);
+    _kRenderingExtensions.setBackground(commentFigure, Colors.PEACH_PUFF_2);
+
+    // connect
+    KEdge edge = _kEdgeExtensions.createEdge();
+    edge.setSource(comment);
+    edge.setTarget(node);
+    _linguaFrancaStyleExtensions.errorStyle(_linguaFrancaShapeExtensions.addCommentPolyline(edge));
+    return comment;
+  }
+
+  private Iterable<KNode> createUserComments(EObject element, KNode targetNode) {
+    if (getBooleanValue(SHOW_USER_LABELS)) {
+      String commentText = AttributeUtils.getLabel(element);
+
+      if (!StringExtensions.isNullOrEmpty(commentText)) {
         KNode comment = _kNodeExtensions.createNode();
         setLayoutOption(comment, CoreOptions.COMMENT_BOX, true);
-        KRoundedRectangle commentFigure = _linguaFrancaShapeExtensions.addCommentFigure(comment, message);
-        _linguaFrancaStyleExtensions.errorStyle(commentFigure);
-        _kRenderingExtensions.setBackground(commentFigure, Colors.PEACH_PUFF_2);
+        KRoundedRectangle commentFigure =
+            _linguaFrancaShapeExtensions.addCommentFigure(comment, commentText);
+        _linguaFrancaStyleExtensions.commentStyle(commentFigure);
 
         // connect
         KEdge edge = _kEdgeExtensions.createEdge();
         edge.setSource(comment);
-        edge.setTarget(node);
-        _linguaFrancaStyleExtensions.errorStyle(_linguaFrancaShapeExtensions.addCommentPolyline(edge));
-        return comment;
-    }
-
-    private Iterable<KNode> createUserComments(EObject element, KNode targetNode) {
-        if (getBooleanValue(SHOW_USER_LABELS)) {
-            String commentText = AttributeUtils.getLabel(element);
-
-            if (!StringExtensions.isNullOrEmpty(commentText)) {
-                KNode comment = _kNodeExtensions.createNode();
-                setLayoutOption(comment, CoreOptions.COMMENT_BOX, true);
-                KRoundedRectangle commentFigure = _linguaFrancaShapeExtensions.addCommentFigure(comment, commentText);
-                _linguaFrancaStyleExtensions.commentStyle(commentFigure);
+        edge.setTarget(targetNode);
+        _linguaFrancaStyleExtensions.commentStyle(
+            _linguaFrancaShapeExtensions.addCommentPolyline(edge));
 
-                // connect
-                KEdge edge = _kEdgeExtensions.createEdge();
-                edge.setSource(comment);
-                edge.setTarget(targetNode);
-                _linguaFrancaStyleExtensions.commentStyle(_linguaFrancaShapeExtensions.addCommentPolyline(edge));
-
-                return List.of(comment);
-            }
-        }
-        return List.of();
+        return List.of(comment);
+      }
     }
-
+    return List.of();
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/ReactorParameterDisplayModes.java b/org.lflang/src/org/lflang/diagram/synthesis/ReactorParameterDisplayModes.java
index 23365eeff9..dba7c94dde 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/ReactorParameterDisplayModes.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/ReactorParameterDisplayModes.java
@@ -1,47 +1,51 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.diagram.synthesis;
 
 /**
  * Enumeration of different display options for reactor parameters.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public enum ReactorParameterDisplayModes {
-    NONE,
-    TITLE,
-    TABLE;
-    
-    @Override
-    public String toString() {
-        switch(this) {
-            case NONE: return "None";
-            case TITLE: return "List in Title";
-            case TABLE: return "Table in Body";
-            default: return "";
-        }
+  NONE,
+  TITLE,
+  TABLE;
+
+  @Override
+  public String toString() {
+    switch (this) {
+      case NONE:
+        return "None";
+      case TITLE:
+        return "List in Title";
+      case TABLE:
+        return "Table in Body";
+      default:
+        return "";
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/SynthesisRegistration.java b/org.lflang/src/org/lflang/diagram/synthesis/SynthesisRegistration.java
index f1e217b9f1..c48d2e59ee 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/SynthesisRegistration.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/SynthesisRegistration.java
@@ -1,5 +1,7 @@
 package org.lflang.diagram.synthesis;
 
+import de.cau.cs.kieler.klighd.IKlighdStartupHook;
+import de.cau.cs.kieler.klighd.KlighdDataManager;
 import org.lflang.diagram.synthesis.action.CollapseAllReactorsAction;
 import org.lflang.diagram.synthesis.action.ExpandAllReactorsAction;
 import org.lflang.diagram.synthesis.action.FilterCycleAction;
@@ -10,43 +12,42 @@
 import org.lflang.diagram.synthesis.styles.LinguaFrancaStyleExtensions;
 import org.lflang.diagram.synthesis.util.NamedInstanceUtil;
 
-import de.cau.cs.kieler.klighd.IKlighdStartupHook;
-import de.cau.cs.kieler.klighd.KlighdDataManager;
-
 /**
  * Registration of all diagram synthesis related classes in Klighd.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class SynthesisRegistration implements IKlighdStartupHook {
-    
-    @Override
-    public void execute() {
-        KlighdDataManager reg = KlighdDataManager.getInstance();
-        
-        // Synthesis
-        reg.registerDiagramSynthesisClass(LinguaFrancaSynthesis.ID, LinguaFrancaSynthesis.class);
-        
-        // Actions
-        reg.registerAction(MemorizingExpandCollapseAction.ID, new MemorizingExpandCollapseAction());
-        reg.registerAction(ExpandAllReactorsAction.ID, new ExpandAllReactorsAction());
-        reg.registerAction(CollapseAllReactorsAction.ID, new CollapseAllReactorsAction());
-        reg.registerAction(ShowCycleAction.ID, new ShowCycleAction());
-        reg.registerAction(FilterCycleAction.ID, new FilterCycleAction());
-        
-        // Style Mod
-        reg.registerStyleModifier(ReactionPortAdjustment.ID, new ReactionPortAdjustment());
-        
-        // Blacklist LF-specific properties that should be removed when a diagram is sent from the diagram server to a client.
-        reg.registerBlacklistedProperty(FilterCycleAction.FILTER_BUTTON);
-        reg.registerBlacklistedProperty(LinguaFrancaSynthesis.REACTOR_HAS_BANK_PORT_OFFSET);
-        reg.registerBlacklistedProperty(LinguaFrancaSynthesis.REACTOR_INPUT);
-        reg.registerBlacklistedProperty(LinguaFrancaSynthesis.REACTOR_OUTPUT);
-        reg.registerBlacklistedProperty(LinguaFrancaSynthesis.REACTION_SPECIAL_TRIGGER);
-        reg.registerBlacklistedProperty(ReactionPortAdjustment.PROCESSED);
-        reg.registerBlacklistedProperty(LinguaFrancaShapeExtensions.REACTOR_CONTENT_CONTAINER);
-        reg.registerBlacklistedProperty(LinguaFrancaStyleExtensions.LABEL_PARENT_BACKGROUND);
-        reg.registerBlacklistedProperty(NamedInstanceUtil.LINKED_INSTANCE); // Very important since its values can not be synthesized easily!
-    }
-    
+
+  @Override
+  public void execute() {
+    KlighdDataManager reg = KlighdDataManager.getInstance();
+
+    // Synthesis
+    reg.registerDiagramSynthesisClass(LinguaFrancaSynthesis.ID, LinguaFrancaSynthesis.class);
+
+    // Actions
+    reg.registerAction(MemorizingExpandCollapseAction.ID, new MemorizingExpandCollapseAction());
+    reg.registerAction(ExpandAllReactorsAction.ID, new ExpandAllReactorsAction());
+    reg.registerAction(CollapseAllReactorsAction.ID, new CollapseAllReactorsAction());
+    reg.registerAction(ShowCycleAction.ID, new ShowCycleAction());
+    reg.registerAction(FilterCycleAction.ID, new FilterCycleAction());
+
+    // Style Mod
+    reg.registerStyleModifier(ReactionPortAdjustment.ID, new ReactionPortAdjustment());
+
+    // Blacklist LF-specific properties that should be removed when a diagram is sent from the
+    // diagram server to a client.
+    reg.registerBlacklistedProperty(FilterCycleAction.FILTER_BUTTON);
+    reg.registerBlacklistedProperty(LinguaFrancaSynthesis.REACTOR_HAS_BANK_PORT_OFFSET);
+    reg.registerBlacklistedProperty(LinguaFrancaSynthesis.REACTOR_INPUT);
+    reg.registerBlacklistedProperty(LinguaFrancaSynthesis.REACTOR_OUTPUT);
+    reg.registerBlacklistedProperty(LinguaFrancaSynthesis.REACTION_SPECIAL_TRIGGER);
+    reg.registerBlacklistedProperty(ReactionPortAdjustment.PROCESSED);
+    reg.registerBlacklistedProperty(LinguaFrancaShapeExtensions.REACTOR_CONTENT_CONTAINER);
+    reg.registerBlacklistedProperty(LinguaFrancaStyleExtensions.LABEL_PARENT_BACKGROUND);
+    reg.registerBlacklistedProperty(
+        NamedInstanceUtil
+            .LINKED_INSTANCE); // Very important since its values can not be synthesized easily!
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/action/AbstractAction.java b/org.lflang/src/org/lflang/diagram/synthesis/action/AbstractAction.java
index d665dff433..e840b99077 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/action/AbstractAction.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/action/AbstractAction.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.action;
 
 import de.cau.cs.kieler.klighd.IAction;
@@ -32,24 +32,23 @@
 
 /**
  * Abstract super class for diagram actions that provides some convince methods.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public abstract class AbstractAction implements IAction {
-    public Object sourceElement(final KGraphElement elem) {
-        return elem.getProperty(KlighdInternalProperties.MODEL_ELEMEMT);
-    }
-    
-    public boolean sourceIs(KNode node, Class<?> clazz) {
-        return clazz.isInstance(sourceElement(node));
-    }
-    
-    public boolean sourceIsReactor(final KNode node) {
-        return sourceElement(node) instanceof Reactor;
-    }
-    
-    public Reactor sourceAsReactor(final KNode node) {
-        return sourceIsReactor(node) ? (Reactor) sourceElement(node) : null;
-    }
+  public Object sourceElement(final KGraphElement elem) {
+    return elem.getProperty(KlighdInternalProperties.MODEL_ELEMEMT);
+  }
+
+  public boolean sourceIs(KNode node, Class<?> clazz) {
+    return clazz.isInstance(sourceElement(node));
+  }
+
+  public boolean sourceIsReactor(final KNode node) {
+    return sourceElement(node) instanceof Reactor;
+  }
+
+  public Reactor sourceAsReactor(final KNode node) {
+    return sourceIsReactor(node) ? (Reactor) sourceElement(node) : null;
+  }
 }
-  
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/action/CollapseAllReactorsAction.java b/org.lflang/src/org/lflang/diagram/synthesis/action/CollapseAllReactorsAction.java
index 0927caeb37..712e9d9e66 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/action/CollapseAllReactorsAction.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/action/CollapseAllReactorsAction.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.action;
 
 import de.cau.cs.kieler.klighd.IAction;
@@ -29,36 +29,32 @@
 import de.cau.cs.kieler.klighd.kgraph.KNode;
 import de.cau.cs.kieler.klighd.util.ModelingUtil;
 import java.util.Iterator;
-import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.lflang.diagram.synthesis.util.NamedInstanceUtil;
 import org.lflang.lf.Mode;
 
 /**
  * Action that expands (shows details) of all reactor nodes.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class CollapseAllReactorsAction extends AbstractAction {
-    
-    public static final String ID = "org.lflang.diagram.synthesis.action.CollapseAllReactorsAction";
-    
-    @Override
-    public IAction.ActionResult execute(final IAction.ActionContext context) {
-        ViewContext vc = context.getViewContext();
-        Iterator<KNode> nodes = ModelingUtil.eAllContentsOfType(vc.getViewModel(), KNode.class);
-        
-        while(nodes.hasNext()) {
-            var node = nodes.next();
-            if (sourceIs(node, Mode.class) || (sourceIsReactor(node) &&
-                    !(sourceAsReactor(node).isMain() || sourceAsReactor(node).isFederated()))) {
-                MemorizingExpandCollapseAction.setExpansionState(
-                    node, 
-                    NamedInstanceUtil.getLinkedInstance(node), 
-                    vc.getViewer(), 
-                    false
-                );
-            }
-        }
-        return IAction.ActionResult.createResult(true);
+
+  public static final String ID = "org.lflang.diagram.synthesis.action.CollapseAllReactorsAction";
+
+  @Override
+  public IAction.ActionResult execute(final IAction.ActionContext context) {
+    ViewContext vc = context.getViewContext();
+    Iterator<KNode> nodes = ModelingUtil.eAllContentsOfType(vc.getViewModel(), KNode.class);
+
+    while (nodes.hasNext()) {
+      var node = nodes.next();
+      if (sourceIs(node, Mode.class)
+          || (sourceIsReactor(node)
+              && !(sourceAsReactor(node).isMain() || sourceAsReactor(node).isFederated()))) {
+        MemorizingExpandCollapseAction.setExpansionState(
+            node, NamedInstanceUtil.getLinkedInstance(node), vc.getViewer(), false);
+      }
     }
+    return IAction.ActionResult.createResult(true);
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/action/ExpandAllReactorsAction.java b/org.lflang/src/org/lflang/diagram/synthesis/action/ExpandAllReactorsAction.java
index 08f8b5a115..bdd7c173d6 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/action/ExpandAllReactorsAction.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/action/ExpandAllReactorsAction.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.action;
 
 import de.cau.cs.kieler.klighd.IAction;
@@ -29,36 +29,30 @@
 import de.cau.cs.kieler.klighd.kgraph.KNode;
 import de.cau.cs.kieler.klighd.util.ModelingUtil;
 import java.util.Iterator;
-import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.lflang.diagram.synthesis.util.NamedInstanceUtil;
 import org.lflang.lf.Mode;
 
 /**
  * Action that collapses (hides details) of all reactor nodes.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class ExpandAllReactorsAction extends AbstractAction {
 
-    public static final String ID = "org.lflang.diagram.synthesis.action.ExpandAllReactorsAction";
-    
-    @Override
-    public IAction.ActionResult execute(final IAction.ActionContext context) {
-        ViewContext vc = context.getViewContext();
-        Iterator<KNode> nodes = ModelingUtil.eAllContentsOfType(vc.getViewModel(), KNode.class);
-        
-        while(nodes.hasNext()) {
-            var node = nodes.next();
-            if (sourceIs(node, Mode.class) || sourceIsReactor(node)) {
-                MemorizingExpandCollapseAction.setExpansionState(
-                        node, 
-                        NamedInstanceUtil.getLinkedInstance(node), 
-                        vc.getViewer(), 
-                        true
-                );
-            }
-        }
-        return IAction.ActionResult.createResult(true);
+  public static final String ID = "org.lflang.diagram.synthesis.action.ExpandAllReactorsAction";
+
+  @Override
+  public IAction.ActionResult execute(final IAction.ActionContext context) {
+    ViewContext vc = context.getViewContext();
+    Iterator<KNode> nodes = ModelingUtil.eAllContentsOfType(vc.getViewModel(), KNode.class);
+
+    while (nodes.hasNext()) {
+      var node = nodes.next();
+      if (sourceIs(node, Mode.class) || sourceIsReactor(node)) {
+        MemorizingExpandCollapseAction.setExpansionState(
+            node, NamedInstanceUtil.getLinkedInstance(node), vc.getViewer(), true);
+      }
     }
+    return IAction.ActionResult.createResult(true);
+  }
 }
-  
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/action/FilterCycleAction.java b/org.lflang/src/org/lflang/diagram/synthesis/action/FilterCycleAction.java
index 6daf07a1b3..bbe20806a3 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/action/FilterCycleAction.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/action/FilterCycleAction.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.action;
 
 import com.google.common.collect.Iterables;
@@ -31,7 +31,6 @@
 import de.cau.cs.kieler.klighd.kgraph.KEdge;
 import de.cau.cs.kieler.klighd.kgraph.KNode;
 import de.cau.cs.kieler.klighd.krendering.KText;
-
 import java.util.Iterator;
 import java.util.List;
 import java.util.WeakHashMap;
@@ -46,112 +45,115 @@
 
 /**
  * Action that filters the diagram for only those elements included in a cycle.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class FilterCycleAction extends AbstractAction {
-    
-    public static final String ID = "org.lflang.diagram.synthesis.action.FilterCycleAction";
-    
-    /**
-     * Memory-leak-free cache of filtered states
-     */
-    private static final WeakHashMap<Object, Boolean> FILTERING_STATES = new WeakHashMap<>();
-    
-    /**
-     * INTERNAL property to mark filter button.
-     */
-    public static final Property<Boolean> FILTER_BUTTON = new Property<>("org.lflang.diagram.synthesis.action.cyclefilter.button", false);
-    
-    @Override
-    public IAction.ActionResult execute(final IAction.ActionContext context) {
-        ViewContext vc = context.getViewContext();
-        Object all = vc.getOptionValue(LinguaFrancaSynthesis.SHOW_ALL_REACTORS);
-        List<KNode> nodes = vc.getViewModel().getChildren();
-
-        if (all instanceof Boolean && (Boolean) all) {
-            nodes = IterableExtensions.toList(
-                        Iterables.concat(
-                            ListExtensions.map(
-                                nodes, it -> { return it.getChildren(); }
-                            )
-                        )
-                    );
-        }
 
-        if (IterableExtensions.exists(nodes, this::isCycleFiltered)) {
-            // undo
-            nodes.forEach(this::resetCycleFiltering);
-            
-            // re-synthesize everything
-            vc.getViewModel().getChildren().clear();
-              vc.update();
-        } else {
-            // filter
-            nodes.forEach(it -> {
-                this.markCycleFiltered(it);
-                this.filterCycle(it);
-            });
-
-            Function1<KNode, Boolean> knodeFilterButton = it -> { 
-                return it.getProperty(FILTER_BUTTON); 
-            };
-            
-            Function1<KText, Boolean> ktextFilterButton = it -> { 
-                return it.getProperty(FILTER_BUTTON); 
-            };
-
-            // switch filter label
-            for (KNode node : IterableExtensions.filter(nodes, knodeFilterButton)) {
-                Iterator<KText> ktexts = Iterators.filter(node.eAllContents(), KText.class);
-                KText text = IteratorExtensions.findFirst(ktexts, ktextFilterButton);
-                if (text != null) {
-                    text.setText(LinguaFrancaSynthesis.TEXT_ERROR_CYCLE_BTN_UNFILTER);
-                }
-            }
+  public static final String ID = "org.lflang.diagram.synthesis.action.FilterCycleAction";
+
+  /** Memory-leak-free cache of filtered states */
+  private static final WeakHashMap<Object, Boolean> FILTERING_STATES = new WeakHashMap<>();
+
+  /** INTERNAL property to mark filter button. */
+  public static final Property<Boolean> FILTER_BUTTON =
+      new Property<>("org.lflang.diagram.synthesis.action.cyclefilter.button", false);
+
+  @Override
+  public IAction.ActionResult execute(final IAction.ActionContext context) {
+    ViewContext vc = context.getViewContext();
+    Object all = vc.getOptionValue(LinguaFrancaSynthesis.SHOW_ALL_REACTORS);
+    List<KNode> nodes = vc.getViewModel().getChildren();
+
+    if (all instanceof Boolean && (Boolean) all) {
+      nodes =
+          IterableExtensions.toList(
+              Iterables.concat(
+                  ListExtensions.map(
+                      nodes,
+                      it -> {
+                        return it.getChildren();
+                      })));
+    }
+
+    if (IterableExtensions.exists(nodes, this::isCycleFiltered)) {
+      // undo
+      nodes.forEach(this::resetCycleFiltering);
+
+      // re-synthesize everything
+      vc.getViewModel().getChildren().clear();
+      vc.update();
+    } else {
+      // filter
+      nodes.forEach(
+          it -> {
+            this.markCycleFiltered(it);
+            this.filterCycle(it);
+          });
+
+      Function1<KNode, Boolean> knodeFilterButton =
+          it -> {
+            return it.getProperty(FILTER_BUTTON);
+          };
+
+      Function1<KText, Boolean> ktextFilterButton =
+          it -> {
+            return it.getProperty(FILTER_BUTTON);
+          };
+
+      // switch filter label
+      for (KNode node : IterableExtensions.filter(nodes, knodeFilterButton)) {
+        Iterator<KText> ktexts = Iterators.filter(node.eAllContents(), KText.class);
+        KText text = IteratorExtensions.findFirst(ktexts, ktextFilterButton);
+        if (text != null) {
+          text.setText(LinguaFrancaSynthesis.TEXT_ERROR_CYCLE_BTN_UNFILTER);
         }
-        
-        return IAction.ActionResult.createResult(true);
+      }
     }
-    
-    public void filterCycle(KNode root) {
-        Predicate<KNode> knodeNotInCycle = it -> {
-            return !it.getProperty(CycleVisualization.DEPENDENCY_CYCLE);
+
+    return IAction.ActionResult.createResult(true);
+  }
+
+  public void filterCycle(KNode root) {
+    Predicate<KNode> knodeNotInCycle =
+        it -> {
+          return !it.getProperty(CycleVisualization.DEPENDENCY_CYCLE);
         };
-        
-        Predicate<KEdge> kedgeNotInCycle = it -> {
-            return !it.getProperty(CycleVisualization.DEPENDENCY_CYCLE);
+
+    Predicate<KEdge> kedgeNotInCycle =
+        it -> {
+          return !it.getProperty(CycleVisualization.DEPENDENCY_CYCLE);
         };
-        
-        root.getChildren().removeIf(knodeNotInCycle);
-        for (KNode node : root.getChildren()) {
-            node.getOutgoingEdges().removeIf(kedgeNotInCycle);
-            this.filterCycle(node);
-        }
-    }
 
-    public void markCycleFiltered(KNode node) {
-        Object source = this.sourceElement(node);
-        if (source != null) {
-            FILTERING_STATES.put(source, true);
-        }
-    }
-    
-    public void resetCycleFiltering(KNode node) {
-        Object source = this.sourceElement(node);
-        if (source != null) {
-            FILTERING_STATES.remove(source);
-        }
+    root.getChildren().removeIf(knodeNotInCycle);
+    for (KNode node : root.getChildren()) {
+      node.getOutgoingEdges().removeIf(kedgeNotInCycle);
+      this.filterCycle(node);
     }
+  }
 
-    public boolean isCycleFiltered(KNode node) {
-        Object source = this.sourceElement(node);
-        Boolean result = FILTERING_STATES.get(source);
-        return result == null ? false : result;
+  public void markCycleFiltered(KNode node) {
+    Object source = this.sourceElement(node);
+    if (source != null) {
+      FILTERING_STATES.put(source, true);
     }
+  }
 
-    public void markCycleFilterText(KText text, KNode node) {
-        text.setProperty(FILTER_BUTTON, true);
-        node.setProperty(FILTER_BUTTON, true);
+  public void resetCycleFiltering(KNode node) {
+    Object source = this.sourceElement(node);
+    if (source != null) {
+      FILTERING_STATES.remove(source);
     }
+  }
+
+  public boolean isCycleFiltered(KNode node) {
+    Object source = this.sourceElement(node);
+    Boolean result = FILTERING_STATES.get(source);
+    return result == null ? false : result;
+  }
+
+  public void markCycleFilterText(KText text, KNode node) {
+    text.setProperty(FILTER_BUTTON, true);
+    node.setProperty(FILTER_BUTTON, true);
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/action/MemorizingExpandCollapseAction.java b/org.lflang/src/org/lflang/diagram/synthesis/action/MemorizingExpandCollapseAction.java
index 20347e2c22..b9a91fe08c 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/action/MemorizingExpandCollapseAction.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/action/MemorizingExpandCollapseAction.java
@@ -1,123 +1,119 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.action;
 
-import java.util.WeakHashMap;
-
-import org.lflang.diagram.synthesis.util.InterfaceDependenciesVisualization;
-import org.lflang.diagram.synthesis.util.NamedInstanceUtil;
-import org.lflang.generator.NamedInstance;
-import org.lflang.generator.ReactorInstance;
-
 import com.google.common.base.Preconditions;
-
 import de.cau.cs.kieler.klighd.IAction;
 import de.cau.cs.kieler.klighd.IViewer;
 import de.cau.cs.kieler.klighd.SynthesisOption;
 import de.cau.cs.kieler.klighd.ViewContext;
 import de.cau.cs.kieler.klighd.kgraph.KNode;
+import java.util.WeakHashMap;
+import org.lflang.diagram.synthesis.util.InterfaceDependenciesVisualization;
+import org.lflang.diagram.synthesis.util.NamedInstanceUtil;
+import org.lflang.generator.NamedInstance;
+import org.lflang.generator.ReactorInstance;
 
 /**
- * Action for toggling collapse/expand state of reactors that memorizes the state and
- * allows correct initialization synthesis runs for the same model.
- * Prevents automatic collapsing of manually expanded nodes.
- * 
+ * Action for toggling collapse/expand state of reactors that memorizes the state and allows correct
+ * initialization synthesis runs for the same model. Prevents automatic collapsing of manually
+ * expanded nodes.
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class MemorizingExpandCollapseAction extends AbstractAction {
-    
-    public static final String ID = "org.lflang.diagram.synthesis.action.MemorizingExpandCollapseAction";
-    
-    /**
-     * The related synthesis option
-     */
-    public static final SynthesisOption MEMORIZE_EXPANSION_STATES = SynthesisOption.createCheckOption("Remember Collapsed/Expanded Reactors", true);
-    
-    /**
-     * Memory-leak-free cache of expansion states
-     */
-    private static final WeakHashMap<Object, Boolean> EXPANSION_STATES = new WeakHashMap<>();
-        
-    /**
-     * Sets the expansion state of a node and saves it for future synthesis.
-     */
-    public static void setExpansionState(final KNode node, final Object memorizableObj, final IViewer viewer, final boolean expand) {
 
-        Preconditions.checkNotNull(node);
-        
-        // Store new state if activated
-        if (((Boolean) viewer.getViewContext().getOptionValue(MEMORIZE_EXPANSION_STATES)) && memorizableObj != null) {
-            if (memorizableObj instanceof NamedInstance<?>) {
-                EXPANSION_STATES.put(((NamedInstance<?>) memorizableObj).uniqueID(), expand);
-            } else {
-                EXPANSION_STATES.put(memorizableObj, expand);
-            }
-        }
-        
-        // Apply state
-        if (expand) {
-            viewer.expand(node);
-        } else {
-            viewer.collapse(node);
-        }
-        
-        // Handle edges that should only appear for one of the renderings
-        InterfaceDependenciesVisualization.updateInterfaceDependencyVisibility(node, expand);
+  public static final String ID =
+      "org.lflang.diagram.synthesis.action.MemorizingExpandCollapseAction";
+
+  /** The related synthesis option */
+  public static final SynthesisOption MEMORIZE_EXPANSION_STATES =
+      SynthesisOption.createCheckOption("Remember Collapsed/Expanded Reactors", true);
+
+  /** Memory-leak-free cache of expansion states */
+  private static final WeakHashMap<Object, Boolean> EXPANSION_STATES = new WeakHashMap<>();
+
+  /** Sets the expansion state of a node and saves it for future synthesis. */
+  public static void setExpansionState(
+      final KNode node, final Object memorizableObj, final IViewer viewer, final boolean expand) {
+
+    Preconditions.checkNotNull(node);
+
+    // Store new state if activated
+    if (((Boolean) viewer.getViewContext().getOptionValue(MEMORIZE_EXPANSION_STATES))
+        && memorizableObj != null) {
+      if (memorizableObj instanceof NamedInstance<?>) {
+        EXPANSION_STATES.put(((NamedInstance<?>) memorizableObj).uniqueID(), expand);
+      } else {
+        EXPANSION_STATES.put(memorizableObj, expand);
+      }
     }
-    
-    /**
-     * @return the memorized expansion state of the given model element or null if not memorized
-     */
-    public static Boolean getExpansionState(final Object obj) {
-        if (obj instanceof NamedInstance<?>) {
-            return EXPANSION_STATES.get(((NamedInstance<?>) obj).uniqueID());
-        }
-        return EXPANSION_STATES.get(obj);
+
+    // Apply state
+    if (expand) {
+      viewer.expand(node);
+    } else {
+      viewer.collapse(node);
     }
-    
-    //-----------------------------------------------------------------------------------------------------------------
-    
-    @Override
-    public IAction.ActionResult execute(final IAction.ActionContext context) {
-        ViewContext vc = context.getViewContext();
-        IViewer v = vc.getViewer();
-        KNode node = context.getKNode();
-        NamedInstance<?> linkedInstance = NamedInstanceUtil.getLinkedInstance(node);
-        
-        // Find node that is properly linked
-        while(node != null && linkedInstance == null) {
-            node = node.getParent();
-            linkedInstance = NamedInstanceUtil.getLinkedInstance(node);
-        }
-        
-        if (node == null || (linkedInstance instanceof ReactorInstance && ((ReactorInstance) linkedInstance).isMainOrFederated())) {
-            return IAction.ActionResult.createResult(false);
-        } else {
-            setExpansionState(node, linkedInstance, v, !v.isExpanded(node)); // toggle
-            return IAction.ActionResult.createResult(true);
-        }
+
+    // Handle edges that should only appear for one of the renderings
+    InterfaceDependenciesVisualization.updateInterfaceDependencyVisibility(node, expand);
+  }
+
+  /**
+   * @return the memorized expansion state of the given model element or null if not memorized
+   */
+  public static Boolean getExpansionState(final Object obj) {
+    if (obj instanceof NamedInstance<?>) {
+      return EXPANSION_STATES.get(((NamedInstance<?>) obj).uniqueID());
+    }
+    return EXPANSION_STATES.get(obj);
+  }
+
+  // -----------------------------------------------------------------------------------------------------------------
+
+  @Override
+  public IAction.ActionResult execute(final IAction.ActionContext context) {
+    ViewContext vc = context.getViewContext();
+    IViewer v = vc.getViewer();
+    KNode node = context.getKNode();
+    NamedInstance<?> linkedInstance = NamedInstanceUtil.getLinkedInstance(node);
+
+    // Find node that is properly linked
+    while (node != null && linkedInstance == null) {
+      node = node.getParent();
+      linkedInstance = NamedInstanceUtil.getLinkedInstance(node);
+    }
+
+    if (node == null
+        || (linkedInstance instanceof ReactorInstance
+            && ((ReactorInstance) linkedInstance).isMainOrFederated())) {
+      return IAction.ActionResult.createResult(false);
+    } else {
+      setExpansionState(node, linkedInstance, v, !v.isExpanded(node)); // toggle
+      return IAction.ActionResult.createResult(true);
     }
-    
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/action/ShowCycleAction.java b/org.lflang/src/org/lflang/diagram/synthesis/action/ShowCycleAction.java
index fb947511e4..5640adc424 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/action/ShowCycleAction.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/action/ShowCycleAction.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.action;
 
 import de.cau.cs.kieler.klighd.IAction;
@@ -31,61 +31,58 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Set;
-
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.lflang.diagram.synthesis.util.CycleVisualization;
 import org.lflang.diagram.synthesis.util.NamedInstanceUtil;
 
 /**
  * Action that expands all reactor nodes that are included in a cycle.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class ShowCycleAction extends AbstractAction {
-    
-    public static final String ID = "org.lflang.diagram.synthesis.action.ShowCycleAction";
 
-    private static final CollapseAllReactorsAction collapseAll = new CollapseAllReactorsAction();
-    
-    @Override
-    public IAction.ActionResult execute(final IAction.ActionContext context) {
-        ViewContext vc = context.getViewContext();
-        
-        // Collapse all
-        collapseAll.execute(context);
-        
-        // Expand only errors
-        Iterator<KNode> knodes = ModelingUtil.eAllContentsOfType(vc.getViewModel(), KNode.class);
-        
-        // Filter out nodes that are not in cycle or not a reactor
-        knodes = IteratorExtensions.filter(knodes, it -> {
-            return it.getProperty(CycleVisualization.DEPENDENCY_CYCLE) && sourceIsReactor(it);
-        });
-        
-        // Remove duplicates
-        Set<KNode> cycleNodes = IteratorExtensions.toSet(knodes);
+  public static final String ID = "org.lflang.diagram.synthesis.action.ShowCycleAction";
+
+  private static final CollapseAllReactorsAction collapseAll = new CollapseAllReactorsAction();
+
+  @Override
+  public IAction.ActionResult execute(final IAction.ActionContext context) {
+    ViewContext vc = context.getViewContext();
+
+    // Collapse all
+    collapseAll.execute(context);
+
+    // Expand only errors
+    Iterator<KNode> knodes = ModelingUtil.eAllContentsOfType(vc.getViewModel(), KNode.class);
 
-        // Include parents
-        LinkedList<KNode> check = new LinkedList<>(cycleNodes);
+    // Filter out nodes that are not in cycle or not a reactor
+    knodes =
+        IteratorExtensions.filter(
+            knodes,
+            it -> {
+              return it.getProperty(CycleVisualization.DEPENDENCY_CYCLE) && sourceIsReactor(it);
+            });
+
+    // Remove duplicates
+    Set<KNode> cycleNodes = IteratorExtensions.toSet(knodes);
+
+    // Include parents
+    LinkedList<KNode> check = new LinkedList<>(cycleNodes);
+
+    while (!check.isEmpty()) {
+      KNode parent = check.pop().getParent();
+      if (parent != null && !cycleNodes.contains(parent)) {
+        cycleNodes.add(parent);
+        check.add(parent);
+      }
+    }
 
-        while (!check.isEmpty()) {
-            KNode parent = check.pop().getParent();
-            if (parent != null && !cycleNodes.contains(parent)) {
-                cycleNodes.add(parent);
-                check.add(parent);
-            }
-        }
-        
-        // Expand
-        for (KNode node : cycleNodes) {
-            MemorizingExpandCollapseAction.setExpansionState(
-                node, 
-                NamedInstanceUtil.getLinkedInstance(node), 
-                vc.getViewer(), 
-                true
-            );
-        }
-        return IAction.ActionResult.createResult(true);
+    // Expand
+    for (KNode node : cycleNodes) {
+      MemorizingExpandCollapseAction.setExpansionState(
+          node, NamedInstanceUtil.getLinkedInstance(node), vc.getViewer(), true);
     }
-    
+    return IAction.ActionResult.createResult(true);
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactionPortAdjustment.java b/org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactionPortAdjustment.java
index db3a42fd7a..4507039b28 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactionPortAdjustment.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/postprocessor/ReactionPortAdjustment.java
@@ -1,39 +1,29 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.postprocessor;
 
-import java.util.stream.Collectors;
-
-import org.eclipse.elk.core.options.CoreOptions;
-import org.eclipse.elk.core.options.PortSide;
-import org.eclipse.elk.graph.properties.Property;
-import org.eclipse.xtext.xbase.lib.Extension;
-import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.Pair;
-import org.lflang.diagram.synthesis.styles.LinguaFrancaShapeExtensions;
-
 import de.cau.cs.kieler.klighd.IStyleModifier;
 import de.cau.cs.kieler.klighd.IViewer;
 import de.cau.cs.kieler.klighd.internal.ILayoutRecorder;
@@ -45,142 +35,159 @@
 import de.cau.cs.kieler.klighd.kgraph.KPort;
 import de.cau.cs.kieler.klighd.krendering.KRendering;
 import de.cau.cs.kieler.klighd.krendering.KRenderingFactory;
+import java.util.stream.Collectors;
+import org.eclipse.elk.core.options.CoreOptions;
+import org.eclipse.elk.core.options.PortSide;
+import org.eclipse.elk.graph.properties.Property;
+import org.eclipse.xtext.xbase.lib.Extension;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.Pair;
+import org.lflang.diagram.synthesis.styles.LinguaFrancaShapeExtensions;
 
 /**
- * Adjusts the port position of reactions node AFTER layout, to allow free port order but also adapt (snuggle) to pointy shape of reaction node.
- * 
+ * Adjusts the port position of reactions node AFTER layout, to allow free port order but also adapt
+ * (snuggle) to pointy shape of reaction node.
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class ReactionPortAdjustment implements IStyleModifier {
 
-    public static final String ID = "org.lflang.diagram.synthesis.postprocessor.ReactionPortAdjustment";
-    
-    /** 
-     * INTERNAL property to mark node as processed.
-     */
-    public static final Property<Boolean> PROCESSED = new Property<>("org.lflang.diagram.synthesis.postprocessor.reaction.ports.processed", false);
-    
-    @Extension
-    private KGraphFactory _kGraphFactory = KGraphFactory.eINSTANCE;
-    private static KRenderingFactory _kRenderingFactory = KRenderingFactory.eINSTANCE;
-    
-    /**
-     * Register this modifier on a reaction rendering.
-     */
-    public static void apply(KNode node, KRendering rendering) {
-        // Add modifier that fixes port positions such that edges are properly attached to the shape
-        var invisible = _kRenderingFactory.createKInvisibility();
-        invisible.setInvisible(false); // make it ineffective (just for purpose of holding modifier)
-        invisible.setModifierId(ReactionPortAdjustment.ID); // Add modifier to receive callback after layout
-        rendering.getStyles().add(invisible);
-        node.setProperty(PROCESSED, false);
-    }
+  public static final String ID =
+      "org.lflang.diagram.synthesis.postprocessor.ReactionPortAdjustment";
 
-    @Override
-    public boolean modify(IStyleModifier.StyleModificationContext context) {
-        try {
-            KGraphElement node = context.getGraphElement();
-            if (node instanceof KNode) {
-                KNode knode = (KNode) node;
-                
-                // Find root node
-                KNode parent = knode;
-                while (parent.eContainer() != null) {
-                    parent = (KNode) parent.eContainer();
-                }
-                
-                // Get viewer (this is a bit brittle because it fetches the viewer from some internal property)
-                Object viewer = 
-                        parent.getAllProperties().entrySet().stream().filter(entry -> 
-                                    entry.getKey().getId().equals("de.cau.cs.kieler.klighd.viewer")
-                                    || entry.getKey().getId().equals("klighd.layout.viewer"))
-                                .findAny().map(entry -> entry.getValue()).orElse(null);
-                                
-                ILayoutRecorder recorder = null;
-                if (viewer instanceof IViewer) {
-                    recorder = ((IViewer) viewer).getViewContext().getLayoutRecorder();
-                }
-                
-                if (!knode.getPorts().isEmpty()) {
-                    if (IterableExtensions.head(knode.getPorts()).getYpos() != 0 && 
-                             // Only adjust if layout is already applied important for incremental update animation
-                            !knode.getProperty(ReactionPortAdjustment.PROCESSED)) {
-                        if (recorder != null) {
-                            recorder.startRecording();
-                        }
-                        
-                        var in = knode.getPorts().stream().filter(p -> 
-                            p.getProperty(CoreOptions.PORT_SIDE) == PortSide.WEST).sorted((p1, p2) ->  
-                                Float.compare(p1.getYpos(), p2.getYpos())).collect(Collectors.toList());
-                        
-                        var out = knode.getPorts().stream().filter(p -> 
-                            p.getProperty(CoreOptions.PORT_SIDE) == PortSide.EAST).sorted((p1, p2) ->  
-                                Float.compare(p1.getYpos(), p2.getYpos())).collect(Collectors.toList());
-
-                        // Adjust
-                        if (in.stream().anyMatch(p -> !p.hasProperty(CoreOptions.PORT_BORDER_OFFSET))) {
-                            adjustPositions(IterableExtensions.indexed(in), in.size(), true);
-                        }
-                        if (out.stream().anyMatch(p -> !p.hasProperty(CoreOptions.PORT_BORDER_OFFSET))) {
-                            adjustPositions(IterableExtensions.indexed(out), out.size(), false);
-                        }
-                        knode.setProperty(ReactionPortAdjustment.PROCESSED, true);
-                        
-                        if (recorder!=null) {
-                          recorder.stopRecording(0);
-                        }
-                        
-                    } else if (IterableExtensions.head(knode.getPorts()).getYpos() == 0) {
-                        knode.setProperty(PROCESSED, false);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            // do not disturb rendering process
+  /** INTERNAL property to mark node as processed. */
+  public static final Property<Boolean> PROCESSED =
+      new Property<>("org.lflang.diagram.synthesis.postprocessor.reaction.ports.processed", false);
+
+  @Extension private KGraphFactory _kGraphFactory = KGraphFactory.eINSTANCE;
+  private static KRenderingFactory _kRenderingFactory = KRenderingFactory.eINSTANCE;
+
+  /** Register this modifier on a reaction rendering. */
+  public static void apply(KNode node, KRendering rendering) {
+    // Add modifier that fixes port positions such that edges are properly attached to the shape
+    var invisible = _kRenderingFactory.createKInvisibility();
+    invisible.setInvisible(false); // make it ineffective (just for purpose of holding modifier)
+    invisible.setModifierId(
+        ReactionPortAdjustment.ID); // Add modifier to receive callback after layout
+    rendering.getStyles().add(invisible);
+    node.setProperty(PROCESSED, false);
+  }
+
+  @Override
+  public boolean modify(IStyleModifier.StyleModificationContext context) {
+    try {
+      KGraphElement node = context.getGraphElement();
+      if (node instanceof KNode) {
+        KNode knode = (KNode) node;
+
+        // Find root node
+        KNode parent = knode;
+        while (parent.eContainer() != null) {
+          parent = (KNode) parent.eContainer();
         }
-        return false;
-    }
 
-    public void adjustPositions(Iterable<Pair<Integer, KPort>> indexedPorts, int count, boolean input) {
-        float segments = LinguaFrancaShapeExtensions.REACTION_POINTINESS * 2 / (count + 1);
-        for (Pair<Integer, KPort> indexedPort : indexedPorts) {
-            KPort port = indexedPort.getValue();
-            int idx = indexedPort.getKey();
-            float offset = 0;
-            
-            if (count % 2 != 0 && idx == count / 2) {
-                offset += LinguaFrancaShapeExtensions.REACTION_POINTINESS;
-            } else if (idx < count / 2) {
-                offset += segments * (idx + 1);
-            } else {
-                offset += segments * (count - idx);
+        // Get viewer (this is a bit brittle because it fetches the viewer from some internal
+        // property)
+        Object viewer =
+            parent.getAllProperties().entrySet().stream()
+                .filter(
+                    entry ->
+                        entry.getKey().getId().equals("de.cau.cs.kieler.klighd.viewer")
+                            || entry.getKey().getId().equals("klighd.layout.viewer"))
+                .findAny()
+                .map(entry -> entry.getValue())
+                .orElse(null);
+
+        ILayoutRecorder recorder = null;
+        if (viewer instanceof IViewer) {
+          recorder = ((IViewer) viewer).getViewContext().getLayoutRecorder();
+        }
+
+        if (!knode.getPorts().isEmpty()) {
+          if (IterableExtensions.head(knode.getPorts()).getYpos() != 0
+              &&
+              // Only adjust if layout is already applied important for incremental update animation
+              !knode.getProperty(ReactionPortAdjustment.PROCESSED)) {
+            if (recorder != null) {
+              recorder.startRecording();
             }
-            
-            if (!input) { // reverse
-                offset -= LinguaFrancaShapeExtensions.REACTION_POINTINESS;
+
+            var in =
+                knode.getPorts().stream()
+                    .filter(p -> p.getProperty(CoreOptions.PORT_SIDE) == PortSide.WEST)
+                    .sorted((p1, p2) -> Float.compare(p1.getYpos(), p2.getYpos()))
+                    .collect(Collectors.toList());
+
+            var out =
+                knode.getPorts().stream()
+                    .filter(p -> p.getProperty(CoreOptions.PORT_SIDE) == PortSide.EAST)
+                    .sorted((p1, p2) -> Float.compare(p1.getYpos(), p2.getYpos()))
+                    .collect(Collectors.toList());
+
+            // Adjust
+            if (in.stream().anyMatch(p -> !p.hasProperty(CoreOptions.PORT_BORDER_OFFSET))) {
+              adjustPositions(IterableExtensions.indexed(in), in.size(), true);
+            }
+            if (out.stream().anyMatch(p -> !p.hasProperty(CoreOptions.PORT_BORDER_OFFSET))) {
+              adjustPositions(IterableExtensions.indexed(out), out.size(), false);
             }
-            
-            // apply
-            port.setPos(port.getXpos() + offset, port.getYpos());
-            for (KEdge edge : port.getEdges()) {
-                if (input) {
-                    edge.setTargetPoint(adjustedKPoint(edge.getTargetPoint(), offset));
-                } else {
-                    edge.setSourcePoint(adjustedKPoint(edge.getSourcePoint(), offset));
-                }
+            knode.setProperty(ReactionPortAdjustment.PROCESSED, true);
+
+            if (recorder != null) {
+              recorder.stopRecording(0);
             }
-            
-            // Save for future layout
-            port.setProperty(CoreOptions.PORT_BORDER_OFFSET, (double) (input ? -offset : offset));
+
+          } else if (IterableExtensions.head(knode.getPorts()).getYpos() == 0) {
+            knode.setProperty(PROCESSED, false);
+          }
         }
+      }
+    } catch (Exception e) {
+      e.printStackTrace();
+      // do not disturb rendering process
     }
+    return false;
+  }
+
+  public void adjustPositions(
+      Iterable<Pair<Integer, KPort>> indexedPorts, int count, boolean input) {
+    float segments = LinguaFrancaShapeExtensions.REACTION_POINTINESS * 2 / (count + 1);
+    for (Pair<Integer, KPort> indexedPort : indexedPorts) {
+      KPort port = indexedPort.getValue();
+      int idx = indexedPort.getKey();
+      float offset = 0;
+
+      if (count % 2 != 0 && idx == count / 2) {
+        offset += LinguaFrancaShapeExtensions.REACTION_POINTINESS;
+      } else if (idx < count / 2) {
+        offset += segments * (idx + 1);
+      } else {
+        offset += segments * (count - idx);
+      }
+
+      if (!input) { // reverse
+        offset -= LinguaFrancaShapeExtensions.REACTION_POINTINESS;
+      }
+
+      // apply
+      port.setPos(port.getXpos() + offset, port.getYpos());
+      for (KEdge edge : port.getEdges()) {
+        if (input) {
+          edge.setTargetPoint(adjustedKPoint(edge.getTargetPoint(), offset));
+        } else {
+          edge.setSourcePoint(adjustedKPoint(edge.getSourcePoint(), offset));
+        }
+      }
 
-    public KPoint adjustedKPoint(KPoint point, float xOffset) {
-        KPoint kPoint = _kGraphFactory.createKPoint();
-        kPoint.setX(point.getX() + xOffset);
-        kPoint.setY(point.getY());
-        return kPoint;
+      // Save for future layout
+      port.setProperty(CoreOptions.PORT_BORDER_OFFSET, (double) (input ? -offset : offset));
     }
+  }
 
+  public KPoint adjustedKPoint(KPoint point, float xOffset) {
+    KPoint kPoint = _kGraphFactory.createKPoint();
+    kPoint.setX(point.getX() + xOffset);
+    kPoint.setY(point.getY());
+    return kPoint;
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java b/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
index 260e2c98db..efdc2ff4d5 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.styles;
 
 import static de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceX.LEFT;
@@ -29,29 +29,6 @@
 import static de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceY.BOTTOM;
 import static de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceY.TOP;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import org.eclipse.elk.core.options.CoreOptions;
-import org.eclipse.elk.core.options.PortSide;
-import org.eclipse.elk.graph.properties.Property;
-import org.eclipse.xtext.xbase.lib.Extension;
-import org.eclipse.xtext.xbase.lib.Functions.Function1;
-import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.Pair;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.lflang.ast.ASTUtils;
-import org.lflang.diagram.synthesis.AbstractSynthesisExtensions;
-import org.lflang.diagram.synthesis.LinguaFrancaSynthesis;
-import org.lflang.diagram.synthesis.util.UtilityExtensions;
-import org.lflang.generator.ReactionInstance;
-import org.lflang.generator.ReactorInstance;
-import org.lflang.generator.TimerInstance;
-import org.lflang.lf.Parameter;
-import org.lflang.lf.StateVar;
-
 import de.cau.cs.kieler.klighd.KlighdConstants;
 import de.cau.cs.kieler.klighd.kgraph.KEdge;
 import de.cau.cs.kieler.klighd.kgraph.KNode;
@@ -87,6 +64,26 @@
 import de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceX;
 import de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceY;
 import de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses;
+import java.util.ArrayList;
+import java.util.List;
+import javax.inject.Inject;
+import org.eclipse.elk.core.options.CoreOptions;
+import org.eclipse.elk.core.options.PortSide;
+import org.eclipse.elk.graph.properties.Property;
+import org.eclipse.xtext.xbase.lib.Extension;
+import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.Pair;
+import org.eclipse.xtext.xbase.lib.StringExtensions;
+import org.lflang.ast.ASTUtils;
+import org.lflang.diagram.synthesis.AbstractSynthesisExtensions;
+import org.lflang.diagram.synthesis.LinguaFrancaSynthesis;
+import org.lflang.diagram.synthesis.util.UtilityExtensions;
+import org.lflang.generator.ReactionInstance;
+import org.lflang.generator.ReactorInstance;
+import org.lflang.generator.TimerInstance;
+import org.lflang.lf.Parameter;
+import org.lflang.lf.StateVar;
 
 /**
  * Extension class that provides shapes and figures for the Lingua France diagram synthesis.
@@ -96,873 +93,1207 @@
 @ViewSynthesisShared
 public class LinguaFrancaShapeExtensions extends AbstractSynthesisExtensions {
 
-    public static final float REACTION_POINTINESS = 6; // arrow point length
-    // Property for marking the KContainterRendering in Reactor figures that is supposed to hold the content
-    public static final Property<Boolean> REACTOR_CONTENT_CONTAINER = new Property<>(
-            "org.lflang.diagram.synthesis.shapes.reactor.content", false);
-
-    @Inject
-    @Extension
-    private KNodeExtensions _kNodeExtensions;
-    @Inject
-    @Extension
-    private KEdgeExtensions _kEdgeExtensions;
-    @Inject
-    @Extension
-    private KPortExtensions _kPortExtensions;
-    @Inject
-    @Extension
-    private KLabelExtensions _kLabelExtensions;
-    @Inject
-    @Extension
-    private KRenderingExtensions _kRenderingExtensions;
-    @Inject
-    @Extension
-    private KContainerRenderingExtensions _kContainerRenderingExtensions;
-    @Inject
-    @Extension
-    private KPolylineExtensions _kPolylineExtensions;
-    @Inject
-    @Extension
-    private KColorExtensions _kColorExtensions;
-    @Inject
-    @Extension
-    private LinguaFrancaStyleExtensions _linguaFrancaStyleExtensions;
-    @Inject
-    @Extension
-    private UtilityExtensions _utilityExtensions;
-    @Extension
-    private KRenderingFactory _kRenderingFactory = KRenderingFactory.eINSTANCE;
-
-    public static final float BANK_FIGURE_X_OFFSET_SUM = 6.0f;
-    public static final float BANK_FIGURE_Y_OFFSET_SUM = 9.0f;
-
-    /**
-     * Creates the main reactor frame.
-     */
-    public KRoundedRectangle addMainReactorFigure(KNode node, ReactorInstance reactorInstance, String text) {
-        int padding = getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS) ? 8 : 6;
-        KRoundedRectangle figure = _kRenderingExtensions.addRoundedRectangle(node, 8, 8, 1);
-        _kContainerRenderingExtensions.setGridPlacement(figure, 1);
-        _kRenderingExtensions.setLineWidth(figure, 1);
-        _kRenderingExtensions.setForeground(figure, Colors.GRAY);
-        _kRenderingExtensions.setBackground(figure, Colors.WHITE);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
-
-        // Create parent container
-        KRectangle parentContainer = _kContainerRenderingExtensions.addRectangle(figure);
-        _kRenderingExtensions.setInvisible(parentContainer, true);
-        setGridPlacementDataFromPointToPoint(parentContainer,
-            LEFT, padding, 0, TOP, padding, 0,
-            RIGHT, padding, 0, BOTTOM, 4, 0
-        );
-
-        // Create child container
-        KRectangle childContainer = _kContainerRenderingExtensions.addRectangle(parentContainer);
-        _kRenderingExtensions.setInvisible(childContainer, true);
-        _kRenderingExtensions.setPointPlacementData(childContainer,
-                _kRenderingExtensions.LEFT, 0, 0.5f,
-                _kRenderingExtensions.TOP, 0, 0.5f,
-                _kRenderingExtensions.H_CENTRAL, _kRenderingExtensions.V_CENTRAL, 0,
-                0, 0, 0);
-        KGridPlacement placement = _kContainerRenderingExtensions.setGridPlacement(childContainer, 1);
-
-        // Add text to the child container
-        KText childText = _kContainerRenderingExtensions.addText(childContainer, text);
-        DiagramSyntheses.suppressSelectability(childText);
-        _linguaFrancaStyleExtensions.underlineSelectionStyle(childText);
-
-        if (reactorInstance.reactorDefinition.isFederated()) {
-            KContainerRendering cloudIcon = _linguaFrancaStyleExtensions.addCloudIcon(childContainer);
-            setGridPlacementDataFromPointToPoint(cloudIcon,
-                LEFT, 3, 0, TOP, 0, 0,
-                RIGHT, 0, 0, BOTTOM, 0, 0
-            );
-            placement.setNumColumns(2);
-
-            if (reactorInstance.reactorDefinition.getHost() != null &&
-                    getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTOR_HOST)) {
-                KText hostNameText = _kContainerRenderingExtensions.addText(childContainer,
-                        ASTUtils.toOriginalText(reactorInstance.reactorDefinition.getHost()));
-                DiagramSyntheses.suppressSelectability(hostNameText);
-                _linguaFrancaStyleExtensions.underlineSelectionStyle(hostNameText);
-                setGridPlacementDataFromPointToPoint(hostNameText,
-                    LEFT, 3, 0, TOP, 0, 0,
-                    RIGHT, 0, 0, BOTTOM, 0, 0
-                );
-                placement.setNumColumns(3);
-            }
-        }
-        return figure;
+  public static final float REACTION_POINTINESS = 6; // arrow point length
+  // Property for marking the KContainterRendering in Reactor figures that is supposed to hold the
+  // content
+  public static final Property<Boolean> REACTOR_CONTENT_CONTAINER =
+      new Property<>("org.lflang.diagram.synthesis.shapes.reactor.content", false);
+
+  @Inject @Extension private KNodeExtensions _kNodeExtensions;
+  @Inject @Extension private KEdgeExtensions _kEdgeExtensions;
+  @Inject @Extension private KPortExtensions _kPortExtensions;
+  @Inject @Extension private KLabelExtensions _kLabelExtensions;
+  @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
+  @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
+  @Inject @Extension private KPolylineExtensions _kPolylineExtensions;
+  @Inject @Extension private KColorExtensions _kColorExtensions;
+  @Inject @Extension private LinguaFrancaStyleExtensions _linguaFrancaStyleExtensions;
+  @Inject @Extension private UtilityExtensions _utilityExtensions;
+  @Extension private KRenderingFactory _kRenderingFactory = KRenderingFactory.eINSTANCE;
+
+  public static final float BANK_FIGURE_X_OFFSET_SUM = 6.0f;
+  public static final float BANK_FIGURE_Y_OFFSET_SUM = 9.0f;
+
+  /** Creates the main reactor frame. */
+  public KRoundedRectangle addMainReactorFigure(
+      KNode node, ReactorInstance reactorInstance, String text) {
+    int padding = getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS) ? 8 : 6;
+    KRoundedRectangle figure = _kRenderingExtensions.addRoundedRectangle(node, 8, 8, 1);
+    _kContainerRenderingExtensions.setGridPlacement(figure, 1);
+    _kRenderingExtensions.setLineWidth(figure, 1);
+    _kRenderingExtensions.setForeground(figure, Colors.GRAY);
+    _kRenderingExtensions.setBackground(figure, Colors.WHITE);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
+
+    // Create parent container
+    KRectangle parentContainer = _kContainerRenderingExtensions.addRectangle(figure);
+    _kRenderingExtensions.setInvisible(parentContainer, true);
+    setGridPlacementDataFromPointToPoint(
+        parentContainer, LEFT, padding, 0, TOP, padding, 0, RIGHT, padding, 0, BOTTOM, 4, 0);
+
+    // Create child container
+    KRectangle childContainer = _kContainerRenderingExtensions.addRectangle(parentContainer);
+    _kRenderingExtensions.setInvisible(childContainer, true);
+    _kRenderingExtensions.setPointPlacementData(
+        childContainer,
+        _kRenderingExtensions.LEFT,
+        0,
+        0.5f,
+        _kRenderingExtensions.TOP,
+        0,
+        0.5f,
+        _kRenderingExtensions.H_CENTRAL,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        0,
+        0);
+    KGridPlacement placement = _kContainerRenderingExtensions.setGridPlacement(childContainer, 1);
+
+    // Add text to the child container
+    KText childText = _kContainerRenderingExtensions.addText(childContainer, text);
+    DiagramSyntheses.suppressSelectability(childText);
+    _linguaFrancaStyleExtensions.underlineSelectionStyle(childText);
+
+    if (reactorInstance.reactorDefinition.isFederated()) {
+      KContainerRendering cloudIcon = _linguaFrancaStyleExtensions.addCloudIcon(childContainer);
+      setGridPlacementDataFromPointToPoint(
+          cloudIcon, LEFT, 3, 0, TOP, 0, 0, RIGHT, 0, 0, BOTTOM, 0, 0);
+      placement.setNumColumns(2);
+
+      if (reactorInstance.reactorDefinition.getHost() != null
+          && getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTOR_HOST)) {
+        KText hostNameText =
+            _kContainerRenderingExtensions.addText(
+                childContainer,
+                ASTUtils.toOriginalText(reactorInstance.reactorDefinition.getHost()));
+        DiagramSyntheses.suppressSelectability(hostNameText);
+        _linguaFrancaStyleExtensions.underlineSelectionStyle(hostNameText);
+        setGridPlacementDataFromPointToPoint(
+            hostNameText, LEFT, 3, 0, TOP, 0, 0, RIGHT, 0, 0, BOTTOM, 0, 0);
+        placement.setNumColumns(3);
+      }
     }
-
-    /**
-     * Creates the visual representation of a reactor node
-     */
-    public ReactorFigureComponents addReactorFigure(KNode node, ReactorInstance reactorInstance, String text) {
-        int padding = getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS) ? 8 : 6;
-
-        Function1<KRoundedRectangle, KRendering> style = r -> {
-            _kRenderingExtensions.setLineWidth(r, 1);
-            _kRenderingExtensions.setForeground(r, Colors.GRAY);
-            _kRenderingExtensions.setBackground(r, Colors.GRAY_95);
-            return _linguaFrancaStyleExtensions.boldLineSelectionStyle(r);
+    return figure;
+  }
+
+  /** Creates the visual representation of a reactor node */
+  public ReactorFigureComponents addReactorFigure(
+      KNode node, ReactorInstance reactorInstance, String text) {
+    int padding = getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS) ? 8 : 6;
+
+    Function1<KRoundedRectangle, KRendering> style =
+        r -> {
+          _kRenderingExtensions.setLineWidth(r, 1);
+          _kRenderingExtensions.setForeground(r, Colors.GRAY);
+          _kRenderingExtensions.setBackground(r, Colors.GRAY_95);
+          return _linguaFrancaStyleExtensions.boldLineSelectionStyle(r);
         };
 
-        KRoundedRectangle figure = _kRenderingExtensions.addRoundedRectangle(node, 8, 8, 1);
-        _kContainerRenderingExtensions.setGridPlacement(figure, 1);
-        style.apply(figure);
-        figure.setProperty(REACTOR_CONTENT_CONTAINER, true);
-
-        // minimal node size is necessary if no text will be added
-        List<Float> minSize = List.of(2 * figure.getCornerWidth(), 2 * figure.getCornerHeight());
-        _kNodeExtensions.setMinimalNodeSize(node, minSize.get(0), minSize.get(1));
-
-        // Add parent container
-        KRectangle parentContainer = _kContainerRenderingExtensions.addRectangle(figure);
-        _kRenderingExtensions.setInvisible(parentContainer, true);
-        setGridPlacementDataFromPointToPoint(parentContainer,
-                LEFT, padding, 0,
-                TOP, padding, 0,
-                RIGHT, padding, 0, BOTTOM,
-                _utilityExtensions.hasContent(reactorInstance) ? 4 : padding, 0
-        );
-
-        // Add centered child container
-        KRectangle childContainer = _kContainerRenderingExtensions.addRectangle(parentContainer);
-        _kRenderingExtensions.setInvisible(childContainer, true);
-        _kRenderingExtensions.setPointPlacementData(childContainer,
-                _kRenderingExtensions.LEFT, 0, 0.5f,
-                _kRenderingExtensions.TOP, 0, 0.5f,
-                _kRenderingExtensions.H_CENTRAL, _kRenderingExtensions.V_CENTRAL, 0,
-                0, 0, 0);
-        KGridPlacement placement = _kContainerRenderingExtensions.setGridPlacement(childContainer, 1);
-
-        KText childText = _kContainerRenderingExtensions.addText(childContainer, text);
-        DiagramSyntheses.suppressSelectability(childText);
-        _linguaFrancaStyleExtensions.underlineSelectionStyle(childText);
-
-        if (!_utilityExtensions.isRoot(reactorInstance) &&
-                reactorInstance.getDefinition().getHost() != null) {
-            KRendering cloudUploadIcon = _linguaFrancaStyleExtensions.addCloudUploadIcon(childContainer);
-            setGridPlacementDataFromPointToPoint(cloudUploadIcon,
-                    LEFT, 3, 0, TOP, 0, 0,
-                    RIGHT, 0, 0, BOTTOM, 0, 0
-            );
-            placement.setNumColumns(2);
-
-            if (getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTOR_HOST)) {
-                KText reactorHostText = _kContainerRenderingExtensions.addText(childContainer,
-                        ASTUtils.toOriginalText(reactorInstance.getDefinition().getHost()));
-                DiagramSyntheses.suppressSelectability(reactorHostText);
-                _linguaFrancaStyleExtensions.underlineSelectionStyle(reactorHostText);
-                setGridPlacementDataFromPointToPoint(reactorHostText,
-                        LEFT, 3, 0, TOP, 0, 0,
-                        RIGHT, 0, 0, BOTTOM, 0, 0
-                );
-                placement.setNumColumns(3);
-            }
-        }
-
-        if (reactorInstance.isBank()) {
-            List<KRendering> bank = new ArrayList<>();
-            KContainerRendering container = _kRenderingExtensions.addInvisibleContainerRendering(node);
-            // TODO handle unresolved width
-            KRoundedRectangle banks;
-            banks = _kContainerRenderingExtensions.addRoundedRectangle(container, 8, 8, 1);
-            style.apply(banks);
-            setGridPlacementDataFromPointToPoint(banks,
-                LEFT, BANK_FIGURE_X_OFFSET_SUM, 0, TOP, BANK_FIGURE_Y_OFFSET_SUM, 0,
-                RIGHT, 0, 0, BOTTOM, 0, 0
-            );
-            if (reactorInstance.getWidth() == 3) {
-                banks = _kContainerRenderingExtensions.addRoundedRectangle(container, 8, 8, 1);
-                style.apply(banks);
-                setGridPlacementDataFromPointToPoint(banks,
-                    LEFT, BANK_FIGURE_X_OFFSET_SUM / 2, 0, TOP, BANK_FIGURE_Y_OFFSET_SUM / 2, 0,
-                    RIGHT, BANK_FIGURE_X_OFFSET_SUM / 2, 0, BOTTOM, BANK_FIGURE_Y_OFFSET_SUM / 2, 0
-                );
-            } else if (reactorInstance.getWidth() != 2 && reactorInstance.getWidth() != 3) {
-                banks = _kContainerRenderingExtensions.addRoundedRectangle(container, 8, 8, 1);
-                style.apply(banks);
-                setGridPlacementDataFromPointToPoint(banks,
-                    LEFT, 2 * BANK_FIGURE_X_OFFSET_SUM / 3, 0, TOP, 2 * BANK_FIGURE_Y_OFFSET_SUM / 3, 0,
-                    RIGHT, BANK_FIGURE_X_OFFSET_SUM / 3, 0, BOTTOM, BANK_FIGURE_Y_OFFSET_SUM / 3, 0
-                );
-
-                banks = _kContainerRenderingExtensions.addRoundedRectangle(container, 8, 8, 1);
-                style.apply(banks);
-                setGridPlacementDataFromPointToPoint(banks,
-                    LEFT, BANK_FIGURE_X_OFFSET_SUM / 3, 0, TOP, BANK_FIGURE_Y_OFFSET_SUM / 3, 0,
-                    RIGHT, 2 * BANK_FIGURE_X_OFFSET_SUM / 3, 0, BOTTOM, 2 * BANK_FIGURE_Y_OFFSET_SUM / 3, 0
-                );
-            }
-
-            container.getChildren().add(figure);
-            setGridPlacementDataFromPointToPoint(figure,
-                LEFT, 0, 0, TOP, 0, 0,
-                RIGHT, BANK_FIGURE_X_OFFSET_SUM, 0, BOTTOM, BANK_FIGURE_Y_OFFSET_SUM, 0
-            );
-            bank.addAll(container.getChildren());
-
-            KRectangle widthLabelContainer = _kContainerRenderingExtensions.addRectangle(container);
-            _kRenderingExtensions.setInvisible(widthLabelContainer, true);
-            setGridPlacementDataFromPointToPoint(widthLabelContainer,
-                LEFT, 12, 0, BOTTOM, 9, 0,
-                RIGHT, 6, 0, BOTTOM, 0.5f, 0
-            );
-            // Handle unresolved width.
-            String widthLabel = reactorInstance.getWidth() >= 0 ? Integer.toString(reactorInstance.getWidth()) : "?";
-            KText widthLabelText = _kContainerRenderingExtensions.addText(widthLabelContainer, widthLabel);
-            _kRenderingExtensions.setHorizontalAlignment(widthLabelText, HorizontalAlignment.LEFT);
-            _kRenderingExtensions.setVerticalAlignment(widthLabelText, VerticalAlignment.BOTTOM);
-            _kRenderingExtensions.setFontSize(widthLabelText, 6);
-            _linguaFrancaStyleExtensions.noSelectionStyle(widthLabelText);
-            associateWith(widthLabelText, reactorInstance.getDefinition().getWidthSpec());
-            return new ReactorFigureComponents(container, figure, bank);
-        } else {
-            return new ReactorFigureComponents(figure, figure, List.of(figure));
-        }
+    KRoundedRectangle figure = _kRenderingExtensions.addRoundedRectangle(node, 8, 8, 1);
+    _kContainerRenderingExtensions.setGridPlacement(figure, 1);
+    style.apply(figure);
+    figure.setProperty(REACTOR_CONTENT_CONTAINER, true);
+
+    // minimal node size is necessary if no text will be added
+    List<Float> minSize = List.of(2 * figure.getCornerWidth(), 2 * figure.getCornerHeight());
+    _kNodeExtensions.setMinimalNodeSize(node, minSize.get(0), minSize.get(1));
+
+    // Add parent container
+    KRectangle parentContainer = _kContainerRenderingExtensions.addRectangle(figure);
+    _kRenderingExtensions.setInvisible(parentContainer, true);
+    setGridPlacementDataFromPointToPoint(
+        parentContainer,
+        LEFT,
+        padding,
+        0,
+        TOP,
+        padding,
+        0,
+        RIGHT,
+        padding,
+        0,
+        BOTTOM,
+        _utilityExtensions.hasContent(reactorInstance) ? 4 : padding,
+        0);
+
+    // Add centered child container
+    KRectangle childContainer = _kContainerRenderingExtensions.addRectangle(parentContainer);
+    _kRenderingExtensions.setInvisible(childContainer, true);
+    _kRenderingExtensions.setPointPlacementData(
+        childContainer,
+        _kRenderingExtensions.LEFT,
+        0,
+        0.5f,
+        _kRenderingExtensions.TOP,
+        0,
+        0.5f,
+        _kRenderingExtensions.H_CENTRAL,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        0,
+        0);
+    KGridPlacement placement = _kContainerRenderingExtensions.setGridPlacement(childContainer, 1);
+
+    KText childText = _kContainerRenderingExtensions.addText(childContainer, text);
+    DiagramSyntheses.suppressSelectability(childText);
+    _linguaFrancaStyleExtensions.underlineSelectionStyle(childText);
+
+    if (!_utilityExtensions.isRoot(reactorInstance)
+        && reactorInstance.getDefinition().getHost() != null) {
+      KRendering cloudUploadIcon = _linguaFrancaStyleExtensions.addCloudUploadIcon(childContainer);
+      setGridPlacementDataFromPointToPoint(
+          cloudUploadIcon, LEFT, 3, 0, TOP, 0, 0, RIGHT, 0, 0, BOTTOM, 0, 0);
+      placement.setNumColumns(2);
+
+      if (getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTOR_HOST)) {
+        KText reactorHostText =
+            _kContainerRenderingExtensions.addText(
+                childContainer, ASTUtils.toOriginalText(reactorInstance.getDefinition().getHost()));
+        DiagramSyntheses.suppressSelectability(reactorHostText);
+        _linguaFrancaStyleExtensions.underlineSelectionStyle(reactorHostText);
+        setGridPlacementDataFromPointToPoint(
+            reactorHostText, LEFT, 3, 0, TOP, 0, 0, RIGHT, 0, 0, BOTTOM, 0, 0);
+        placement.setNumColumns(3);
+      }
     }
 
-    /**
-     * Creates the visual representation of a reaction node
-     */
-    public KPolygon addReactionFigure(KNode node, ReactionInstance reaction) {
-        int minHeight = 22;
-        int minWidth = 45;
-        ReactorInstance reactor = reaction.getParent();
-        _kNodeExtensions.setMinimalNodeSize(node, minWidth, minHeight);
-
-        // Create base shape
-        KPolygon baseShape = _kRenderingExtensions.addPolygon(node);
-        associateWith(baseShape, reaction);
-        _kRenderingExtensions.setLineWidth(baseShape, 1);
-        _kRenderingExtensions.setForeground(baseShape, Colors.GRAY_45);
-        _kRenderingExtensions.setBackground(baseShape, Colors.GRAY_65);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(baseShape);
-        baseShape.getPoints().addAll(
+    if (reactorInstance.isBank()) {
+      List<KRendering> bank = new ArrayList<>();
+      KContainerRendering container = _kRenderingExtensions.addInvisibleContainerRendering(node);
+      // TODO handle unresolved width
+      KRoundedRectangle banks;
+      banks = _kContainerRenderingExtensions.addRoundedRectangle(container, 8, 8, 1);
+      style.apply(banks);
+      setGridPlacementDataFromPointToPoint(
+          banks,
+          LEFT,
+          BANK_FIGURE_X_OFFSET_SUM,
+          0,
+          TOP,
+          BANK_FIGURE_Y_OFFSET_SUM,
+          0,
+          RIGHT,
+          0,
+          0,
+          BOTTOM,
+          0,
+          0);
+      if (reactorInstance.getWidth() == 3) {
+        banks = _kContainerRenderingExtensions.addRoundedRectangle(container, 8, 8, 1);
+        style.apply(banks);
+        setGridPlacementDataFromPointToPoint(
+            banks,
+            LEFT,
+            BANK_FIGURE_X_OFFSET_SUM / 2,
+            0,
+            TOP,
+            BANK_FIGURE_Y_OFFSET_SUM / 2,
+            0,
+            RIGHT,
+            BANK_FIGURE_X_OFFSET_SUM / 2,
+            0,
+            BOTTOM,
+            BANK_FIGURE_Y_OFFSET_SUM / 2,
+            0);
+      } else if (reactorInstance.getWidth() != 2 && reactorInstance.getWidth() != 3) {
+        banks = _kContainerRenderingExtensions.addRoundedRectangle(container, 8, 8, 1);
+        style.apply(banks);
+        setGridPlacementDataFromPointToPoint(
+            banks,
+            LEFT,
+            2 * BANK_FIGURE_X_OFFSET_SUM / 3,
+            0,
+            TOP,
+            2 * BANK_FIGURE_Y_OFFSET_SUM / 3,
+            0,
+            RIGHT,
+            BANK_FIGURE_X_OFFSET_SUM / 3,
+            0,
+            BOTTOM,
+            BANK_FIGURE_Y_OFFSET_SUM / 3,
+            0);
+
+        banks = _kContainerRenderingExtensions.addRoundedRectangle(container, 8, 8, 1);
+        style.apply(banks);
+        setGridPlacementDataFromPointToPoint(
+            banks,
+            LEFT,
+            BANK_FIGURE_X_OFFSET_SUM / 3,
+            0,
+            TOP,
+            BANK_FIGURE_Y_OFFSET_SUM / 3,
+            0,
+            RIGHT,
+            2 * BANK_FIGURE_X_OFFSET_SUM / 3,
+            0,
+            BOTTOM,
+            2 * BANK_FIGURE_Y_OFFSET_SUM / 3,
+            0);
+      }
+
+      container.getChildren().add(figure);
+      setGridPlacementDataFromPointToPoint(
+          figure,
+          LEFT,
+          0,
+          0,
+          TOP,
+          0,
+          0,
+          RIGHT,
+          BANK_FIGURE_X_OFFSET_SUM,
+          0,
+          BOTTOM,
+          BANK_FIGURE_Y_OFFSET_SUM,
+          0);
+      bank.addAll(container.getChildren());
+
+      KRectangle widthLabelContainer = _kContainerRenderingExtensions.addRectangle(container);
+      _kRenderingExtensions.setInvisible(widthLabelContainer, true);
+      setGridPlacementDataFromPointToPoint(
+          widthLabelContainer, LEFT, 12, 0, BOTTOM, 9, 0, RIGHT, 6, 0, BOTTOM, 0.5f, 0);
+      // Handle unresolved width.
+      String widthLabel =
+          reactorInstance.getWidth() >= 0 ? Integer.toString(reactorInstance.getWidth()) : "?";
+      KText widthLabelText =
+          _kContainerRenderingExtensions.addText(widthLabelContainer, widthLabel);
+      _kRenderingExtensions.setHorizontalAlignment(widthLabelText, HorizontalAlignment.LEFT);
+      _kRenderingExtensions.setVerticalAlignment(widthLabelText, VerticalAlignment.BOTTOM);
+      _kRenderingExtensions.setFontSize(widthLabelText, 6);
+      _linguaFrancaStyleExtensions.noSelectionStyle(widthLabelText);
+      associateWith(widthLabelText, reactorInstance.getDefinition().getWidthSpec());
+      return new ReactorFigureComponents(container, figure, bank);
+    } else {
+      return new ReactorFigureComponents(figure, figure, List.of(figure));
+    }
+  }
+
+  /** Creates the visual representation of a reaction node */
+  public KPolygon addReactionFigure(KNode node, ReactionInstance reaction) {
+    int minHeight = 22;
+    int minWidth = 45;
+    ReactorInstance reactor = reaction.getParent();
+    _kNodeExtensions.setMinimalNodeSize(node, minWidth, minHeight);
+
+    // Create base shape
+    KPolygon baseShape = _kRenderingExtensions.addPolygon(node);
+    associateWith(baseShape, reaction);
+    _kRenderingExtensions.setLineWidth(baseShape, 1);
+    _kRenderingExtensions.setForeground(baseShape, Colors.GRAY_45);
+    _kRenderingExtensions.setBackground(baseShape, Colors.GRAY_65);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(baseShape);
+    baseShape
+        .getPoints()
+        .addAll(
             List.of(
                 _kRenderingExtensions.createKPosition(LEFT, 0, 0, TOP, 0, 0),
                 _kRenderingExtensions.createKPosition(RIGHT, REACTION_POINTINESS, 0, TOP, 0, 0),
                 _kRenderingExtensions.createKPosition(RIGHT, 0, 0, TOP, 0, 0.5f),
                 _kRenderingExtensions.createKPosition(RIGHT, REACTION_POINTINESS, 0, BOTTOM, 0, 0),
                 _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0, 0),
-                _kRenderingExtensions.createKPosition(LEFT, REACTION_POINTINESS, 0, BOTTOM, 0, 0.5f)
-            )
-        );
-
-        KRectangle contentContainer = _kContainerRenderingExtensions.addRectangle(baseShape);
-        associateWith(contentContainer, reaction);
-        _kRenderingExtensions.setInvisible(contentContainer, true);
-        _kRenderingExtensions.<KRectangle>setPointPlacementData(contentContainer,
-                _kRenderingExtensions.LEFT, REACTION_POINTINESS, 0,
-                _kRenderingExtensions.TOP, 0, 0,
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_TOP, REACTION_POINTINESS,
-                0, minWidth - REACTION_POINTINESS * 2, minHeight);
-        _kContainerRenderingExtensions.setGridPlacement(contentContainer, 1);
-
-        if (reactor.reactions.size() > 1) {
-            KText textToAdd = _kContainerRenderingExtensions.addText(contentContainer,
-                    Integer.toString(reactor.reactions.indexOf(reaction) + 1));
-            _kRenderingExtensions.setFontBold(textToAdd, true);
-            _linguaFrancaStyleExtensions.noSelectionStyle(textToAdd);
-            DiagramSyntheses.suppressSelectability(textToAdd);
-        }
-
-        // optional reaction level
-        if (getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTION_LEVEL)) {
-            // Force calculation of levels for reactions. This calculation
-            // will only be done once. Note that if this fails due to a causality loop,
-            // then some reactions will have level -1.
-            try {
-                String levels = IterableExtensions.join(reaction.getLevels(), ", ");
-                KText levelsText = _kContainerRenderingExtensions.addText(contentContainer, ("level: " + levels));
-                _kRenderingExtensions.setFontBold(levelsText, false);
-                _linguaFrancaStyleExtensions.noSelectionStyle(levelsText);
-                DiagramSyntheses.suppressSelectability(levelsText);
-            } catch (Exception ex) {
-                // If the graph has cycles, the above fails. Continue without showing levels.
-            }
-        }
-
-        // optional code content
-        boolean hasCode = getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTION_CODE) &&
-                !StringExtensions.isNullOrEmpty(reaction.getDefinition().getCode().getBody());
-        if (hasCode) {
-            KText hasCodeText = _kContainerRenderingExtensions.addText(contentContainer,
-                    _utilityExtensions.trimCode(reaction.getDefinition().getCode()));
-            associateWith(hasCodeText, reaction);
-            _kRenderingExtensions.setFontSize(hasCodeText, 6);
-            _kRenderingExtensions.setFontName(hasCodeText, KlighdConstants.DEFAULT_MONOSPACE_FONT_NAME);
-            _linguaFrancaStyleExtensions.noSelectionStyle(hasCodeText);
-            _kRenderingExtensions.setHorizontalAlignment(hasCodeText, HorizontalAlignment.LEFT);
-            _kRenderingExtensions.setVerticalAlignment(hasCodeText, VerticalAlignment.TOP);
-            setGridPlacementDataFromPointToPoint(hasCodeText,
-                    _kRenderingExtensions.LEFT, 5, 0,
-                    _kRenderingExtensions.TOP, 5, 0,
-                    _kRenderingExtensions.RIGHT, 5, 0,
-                    _kRenderingExtensions.BOTTOM, 5, 0
-            );
-        }
-
-        if (reaction.declaredDeadline != null) {
-            boolean hasDeadlineCode = getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTION_CODE) &&
-                    !StringExtensions.isNullOrEmpty(reaction.getDefinition().getDeadline().getCode().getBody());
-            if (hasCode || hasDeadlineCode) {
-                KPolyline line = _kContainerRenderingExtensions.addHorizontalLine(contentContainer, 0);
-                setGridPlacementDataFromPointToPoint(line,
-                    _kRenderingExtensions.LEFT, 5, 0,
-                    _kRenderingExtensions.TOP, 3, 0,
-                    _kRenderingExtensions.RIGHT, 5, 0,
-                    _kRenderingExtensions.BOTTOM, 6, 0
-                );
-            }
-
-            // delay with stopwatch
-            KRectangle labelContainer = _kContainerRenderingExtensions.addRectangle(contentContainer);
-            _kRenderingExtensions.setInvisible(labelContainer, true);
-            KRendering placement = setGridPlacementDataFromPointToPoint(labelContainer,
-                _kRenderingExtensions.LEFT, hasDeadlineCode ? 0 : -REACTION_POINTINESS * 0.5f, 0,
-                _kRenderingExtensions.TOP, 0, reactor.reactions.size() > 1 || hasCode || hasDeadlineCode ? 0 : 0.5f,
-                _kRenderingExtensions.RIGHT, 0, 0,
-                _kRenderingExtensions.BOTTOM, 0, 0
-            );
-            _kRenderingExtensions.setHorizontalAlignment(placement, HorizontalAlignment.LEFT);
-
-            KRectangle stopWatchFigure = addStopwatchFigure(labelContainer);
-            _kRenderingExtensions.setLeftTopAlignedPointPlacementData(stopWatchFigure, 0, 0, 0, 0);
-
-            KText stopWatchText = _kContainerRenderingExtensions.addText(labelContainer,
-                    reaction.declaredDeadline.maxDelay.toString());
-            associateWith(stopWatchText, reaction.getDefinition().getDeadline().getDelay());
-            _kRenderingExtensions.setForeground(stopWatchText, Colors.BROWN);
-            _kRenderingExtensions.setFontBold(stopWatchText, true);
-            _kRenderingExtensions.setFontSize(stopWatchText, 7);
-            _linguaFrancaStyleExtensions.underlineSelectionStyle(stopWatchText);
-            _kRenderingExtensions.setLeftTopAlignedPointPlacementData(stopWatchText, 15, 0, 0, 0);
-
-            // optional code content
-            if (hasDeadlineCode) {
-                KText contentContainerText = _kContainerRenderingExtensions.addText(contentContainer,
-                        _utilityExtensions.trimCode(reaction.getDefinition().getDeadline().getCode()));
-                associateWith(contentContainerText, reaction.declaredDeadline);
-                _kRenderingExtensions.setForeground(contentContainerText, Colors.BROWN);
-                _kRenderingExtensions.setFontSize(contentContainerText, 6);
-                _kRenderingExtensions.setFontName(contentContainerText, KlighdConstants.DEFAULT_MONOSPACE_FONT_NAME);
-                setGridPlacementDataFromPointToPoint(contentContainerText,
-                        _kRenderingExtensions.LEFT, 5, 0,
-                        _kRenderingExtensions.TOP, 0, 0,
-                        _kRenderingExtensions.RIGHT, 5, 0,
-                        _kRenderingExtensions.BOTTOM, 5, 0
-                );
-                _kRenderingExtensions.setHorizontalAlignment(contentContainerText, HorizontalAlignment.LEFT);
-                _linguaFrancaStyleExtensions.noSelectionStyle(contentContainerText);
-            }
-        }
-
-        return baseShape;
+                _kRenderingExtensions.createKPosition(
+                    LEFT, REACTION_POINTINESS, 0, BOTTOM, 0, 0.5f)));
+
+    KRectangle contentContainer = _kContainerRenderingExtensions.addRectangle(baseShape);
+    associateWith(contentContainer, reaction);
+    _kRenderingExtensions.setInvisible(contentContainer, true);
+    _kRenderingExtensions.<KRectangle>setPointPlacementData(
+        contentContainer,
+        _kRenderingExtensions.LEFT,
+        REACTION_POINTINESS,
+        0,
+        _kRenderingExtensions.TOP,
+        0,
+        0,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_TOP,
+        REACTION_POINTINESS,
+        0,
+        minWidth - REACTION_POINTINESS * 2,
+        minHeight);
+    _kContainerRenderingExtensions.setGridPlacement(contentContainer, 1);
+
+    if (reactor.reactions.size() > 1) {
+      KText textToAdd =
+          _kContainerRenderingExtensions.addText(
+              contentContainer, Integer.toString(reactor.reactions.indexOf(reaction) + 1));
+      _kRenderingExtensions.setFontBold(textToAdd, true);
+      _linguaFrancaStyleExtensions.noSelectionStyle(textToAdd);
+      DiagramSyntheses.suppressSelectability(textToAdd);
     }
 
-    /**
-     * Stopwatch figure for deadlines.
-     */
-    public KRectangle addStopwatchFigure(KContainerRendering parent) {
-        final int size = 12;
-        KRectangle container = _kContainerRenderingExtensions.addRectangle(parent);
-        _kRenderingExtensions.setInvisible(container, true);
-        _kRenderingExtensions.setPointPlacementData(container,
-                _kRenderingExtensions.LEFT, 0, 0,
-                _kRenderingExtensions.TOP, 0, 0,
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_TOP, 0,
-                0, size, size);
-
-        KPolyline polyline = _kContainerRenderingExtensions.addPolyline(container, 2,
-            List.of(
-                _kRenderingExtensions.createKPosition(LEFT, 3, 0.5f, TOP, (-2), 0),
-                _kRenderingExtensions.createKPosition(LEFT, (-3), 0.5f, TOP, (-2), 0)
-            )
-        );
-        _kRenderingExtensions.setForeground(polyline, Colors.BROWN);
+    // optional reaction level
+    if (getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTION_LEVEL)) {
+      // Force calculation of levels for reactions. This calculation
+      // will only be done once. Note that if this fails due to a causality loop,
+      // then some reactions will have level -1.
+      try {
+        String levels = IterableExtensions.join(reaction.getLevels(), ", ");
+        KText levelsText =
+            _kContainerRenderingExtensions.addText(contentContainer, ("level: " + levels));
+        _kRenderingExtensions.setFontBold(levelsText, false);
+        _linguaFrancaStyleExtensions.noSelectionStyle(levelsText);
+        DiagramSyntheses.suppressSelectability(levelsText);
+      } catch (Exception ex) {
+        // If the graph has cycles, the above fails. Continue without showing levels.
+      }
+    }
 
-        polyline = _kContainerRenderingExtensions.addPolyline(container, 2,
-            List.of(
-                _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, (-2), 0),
-                _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, 1, 0)
-            )
-        );
-        _kRenderingExtensions.setForeground(polyline, Colors.BROWN);
-
-        KEllipse body = _kContainerRenderingExtensions.addEllipse(container);
-        _kRenderingExtensions.setLineWidth(body, 1);
-        _kRenderingExtensions.setForeground(body, Colors.BROWN);
-        _kRenderingExtensions.<KEllipse>setPointPlacementData(body,
-                _kRenderingExtensions.LEFT, 0, 0,
-                _kRenderingExtensions.TOP, 0, 0,
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_TOP, 0,
-                0, size, size);
-        _linguaFrancaStyleExtensions.noSelectionStyle(body);
-
-        KArc arc = _kContainerRenderingExtensions.addArc(body);
-        arc.setStartAngle((-20));
-        arc.setArcAngle(110);
-        arc.setArcType(Arc.PIE);
-        _kRenderingExtensions.setLineWidth(arc, 0);
-        _kRenderingExtensions.setBackground(arc, Colors.BROWN);
-        _kRenderingExtensions.setPointPlacementData(arc,
-                _kRenderingExtensions.LEFT, 2, 0,
-                _kRenderingExtensions.TOP, 2, 0,
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_TOP, 2,
-                2, size - 4, size - 4);
-        _linguaFrancaStyleExtensions.noSelectionStyle(arc);
-
-        return container;
+    // optional code content
+    boolean hasCode =
+        getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTION_CODE)
+            && !StringExtensions.isNullOrEmpty(reaction.getDefinition().getCode().getBody());
+    if (hasCode) {
+      KText hasCodeText =
+          _kContainerRenderingExtensions.addText(
+              contentContainer, _utilityExtensions.trimCode(reaction.getDefinition().getCode()));
+      associateWith(hasCodeText, reaction);
+      _kRenderingExtensions.setFontSize(hasCodeText, 6);
+      _kRenderingExtensions.setFontName(hasCodeText, KlighdConstants.DEFAULT_MONOSPACE_FONT_NAME);
+      _linguaFrancaStyleExtensions.noSelectionStyle(hasCodeText);
+      _kRenderingExtensions.setHorizontalAlignment(hasCodeText, HorizontalAlignment.LEFT);
+      _kRenderingExtensions.setVerticalAlignment(hasCodeText, VerticalAlignment.TOP);
+      setGridPlacementDataFromPointToPoint(
+          hasCodeText,
+          _kRenderingExtensions.LEFT,
+          5,
+          0,
+          _kRenderingExtensions.TOP,
+          5,
+          0,
+          _kRenderingExtensions.RIGHT,
+          5,
+          0,
+          _kRenderingExtensions.BOTTOM,
+          5,
+          0);
     }
 
-    /**
-     * Creates the visual representation of a timer node
-     */
-    public KEllipse addTimerFigure(KNode node, TimerInstance timer) {
-        _kNodeExtensions.setMinimalNodeSize(node, 30, 30);
+    if (reaction.declaredDeadline != null) {
+      boolean hasDeadlineCode =
+          getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTION_CODE)
+              && !StringExtensions.isNullOrEmpty(
+                  reaction.getDefinition().getDeadline().getCode().getBody());
+      if (hasCode || hasDeadlineCode) {
+        KPolyline line = _kContainerRenderingExtensions.addHorizontalLine(contentContainer, 0);
+        setGridPlacementDataFromPointToPoint(
+            line,
+            _kRenderingExtensions.LEFT,
+            5,
+            0,
+            _kRenderingExtensions.TOP,
+            3,
+            0,
+            _kRenderingExtensions.RIGHT,
+            5,
+            0,
+            _kRenderingExtensions.BOTTOM,
+            6,
+            0);
+      }
+
+      // delay with stopwatch
+      KRectangle labelContainer = _kContainerRenderingExtensions.addRectangle(contentContainer);
+      _kRenderingExtensions.setInvisible(labelContainer, true);
+      KRendering placement =
+          setGridPlacementDataFromPointToPoint(
+              labelContainer,
+              _kRenderingExtensions.LEFT,
+              hasDeadlineCode ? 0 : -REACTION_POINTINESS * 0.5f,
+              0,
+              _kRenderingExtensions.TOP,
+              0,
+              reactor.reactions.size() > 1 || hasCode || hasDeadlineCode ? 0 : 0.5f,
+              _kRenderingExtensions.RIGHT,
+              0,
+              0,
+              _kRenderingExtensions.BOTTOM,
+              0,
+              0);
+      _kRenderingExtensions.setHorizontalAlignment(placement, HorizontalAlignment.LEFT);
+
+      KRectangle stopWatchFigure = addStopwatchFigure(labelContainer);
+      _kRenderingExtensions.setLeftTopAlignedPointPlacementData(stopWatchFigure, 0, 0, 0, 0);
+
+      KText stopWatchText =
+          _kContainerRenderingExtensions.addText(
+              labelContainer, reaction.declaredDeadline.maxDelay.toString());
+      associateWith(stopWatchText, reaction.getDefinition().getDeadline().getDelay());
+      _kRenderingExtensions.setForeground(stopWatchText, Colors.BROWN);
+      _kRenderingExtensions.setFontBold(stopWatchText, true);
+      _kRenderingExtensions.setFontSize(stopWatchText, 7);
+      _linguaFrancaStyleExtensions.underlineSelectionStyle(stopWatchText);
+      _kRenderingExtensions.setLeftTopAlignedPointPlacementData(stopWatchText, 15, 0, 0, 0);
+
+      // optional code content
+      if (hasDeadlineCode) {
+        KText contentContainerText =
+            _kContainerRenderingExtensions.addText(
+                contentContainer,
+                _utilityExtensions.trimCode(reaction.getDefinition().getDeadline().getCode()));
+        associateWith(contentContainerText, reaction.declaredDeadline);
+        _kRenderingExtensions.setForeground(contentContainerText, Colors.BROWN);
+        _kRenderingExtensions.setFontSize(contentContainerText, 6);
+        _kRenderingExtensions.setFontName(
+            contentContainerText, KlighdConstants.DEFAULT_MONOSPACE_FONT_NAME);
+        setGridPlacementDataFromPointToPoint(
+            contentContainerText,
+            _kRenderingExtensions.LEFT,
+            5,
+            0,
+            _kRenderingExtensions.TOP,
+            0,
+            0,
+            _kRenderingExtensions.RIGHT,
+            5,
+            0,
+            _kRenderingExtensions.BOTTOM,
+            5,
+            0);
+        _kRenderingExtensions.setHorizontalAlignment(
+            contentContainerText, HorizontalAlignment.LEFT);
+        _linguaFrancaStyleExtensions.noSelectionStyle(contentContainerText);
+      }
+    }
 
-        KEllipse figure = _kRenderingExtensions.addEllipse(node);
-        _kRenderingExtensions.setBackground(figure, Colors.GRAY_95);
-        _linguaFrancaStyleExtensions.noSelectionStyle(figure);
-        _kRenderingExtensions.setLineWidth(figure, 1);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
+    return baseShape;
+  }
+
+  /** Stopwatch figure for deadlines. */
+  public KRectangle addStopwatchFigure(KContainerRendering parent) {
+    final int size = 12;
+    KRectangle container = _kContainerRenderingExtensions.addRectangle(parent);
+    _kRenderingExtensions.setInvisible(container, true);
+    _kRenderingExtensions.setPointPlacementData(
+        container,
+        _kRenderingExtensions.LEFT,
+        0,
+        0,
+        _kRenderingExtensions.TOP,
+        0,
+        0,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_TOP,
+        0,
+        0,
+        size,
+        size);
+
+    KPolyline polyline =
+        _kContainerRenderingExtensions.addPolyline(
+            container,
+            2,
+            List.of(
+                _kRenderingExtensions.createKPosition(LEFT, 3, 0.5f, TOP, (-2), 0),
+                _kRenderingExtensions.createKPosition(LEFT, (-3), 0.5f, TOP, (-2), 0)));
+    _kRenderingExtensions.setForeground(polyline, Colors.BROWN);
 
-        List<KPosition> polylinePoints = List.of(
+    polyline =
+        _kContainerRenderingExtensions.addPolyline(
+            container,
+            2,
+            List.of(
+                _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, (-2), 0),
+                _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, 1, 0)));
+    _kRenderingExtensions.setForeground(polyline, Colors.BROWN);
+
+    KEllipse body = _kContainerRenderingExtensions.addEllipse(container);
+    _kRenderingExtensions.setLineWidth(body, 1);
+    _kRenderingExtensions.setForeground(body, Colors.BROWN);
+    _kRenderingExtensions.<KEllipse>setPointPlacementData(
+        body,
+        _kRenderingExtensions.LEFT,
+        0,
+        0,
+        _kRenderingExtensions.TOP,
+        0,
+        0,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_TOP,
+        0,
+        0,
+        size,
+        size);
+    _linguaFrancaStyleExtensions.noSelectionStyle(body);
+
+    KArc arc = _kContainerRenderingExtensions.addArc(body);
+    arc.setStartAngle((-20));
+    arc.setArcAngle(110);
+    arc.setArcType(Arc.PIE);
+    _kRenderingExtensions.setLineWidth(arc, 0);
+    _kRenderingExtensions.setBackground(arc, Colors.BROWN);
+    _kRenderingExtensions.setPointPlacementData(
+        arc,
+        _kRenderingExtensions.LEFT,
+        2,
+        0,
+        _kRenderingExtensions.TOP,
+        2,
+        0,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_TOP,
+        2,
+        2,
+        size - 4,
+        size - 4);
+    _linguaFrancaStyleExtensions.noSelectionStyle(arc);
+
+    return container;
+  }
+
+  /** Creates the visual representation of a timer node */
+  public KEllipse addTimerFigure(KNode node, TimerInstance timer) {
+    _kNodeExtensions.setMinimalNodeSize(node, 30, 30);
+
+    KEllipse figure = _kRenderingExtensions.addEllipse(node);
+    _kRenderingExtensions.setBackground(figure, Colors.GRAY_95);
+    _linguaFrancaStyleExtensions.noSelectionStyle(figure);
+    _kRenderingExtensions.setLineWidth(figure, 1);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
+
+    List<KPosition> polylinePoints =
+        List.of(
             _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, 0, 0.1f),
             _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, 0, 0.5f),
-            _kRenderingExtensions.createKPosition(LEFT, 0, 0.7f, TOP, 0, 0.7f)
-        );
-        KPolyline polyline = _kContainerRenderingExtensions.addPolyline(figure, 1, polylinePoints);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(polyline);
-
-        List<String> labelParts = new ArrayList<>();
-        if (timer.getOffset() != TimerInstance.DEFAULT_OFFSET && timer.getOffset() != null) {
-            labelParts.add(timer.getOffset().toString());
-        }
-        if (timer.getPeriod() != TimerInstance.DEFAULT_PERIOD && timer.getPeriod() != null) {
-            if (timer.getOffset() == TimerInstance.DEFAULT_OFFSET) {
-                labelParts.add(timer.getOffset().toString());
-            }
-            labelParts.add(timer.getPeriod().toString());
-        }
-        if (!labelParts.isEmpty()) {
-            _kLabelExtensions.addOutsideBottomCenteredNodeLabel(node,
-                "(" + String.join(", ", labelParts) + ")", 8);
-        }
-        return figure;
-    }
+            _kRenderingExtensions.createKPosition(LEFT, 0, 0.7f, TOP, 0, 0.7f));
+    KPolyline polyline = _kContainerRenderingExtensions.addPolyline(figure, 1, polylinePoints);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(polyline);
 
-    /**
-     * Creates the visual representation of a startup trigger.
-     */
-    public KEllipse addStartupFigure(KNode node) {
-        _kNodeExtensions.setMinimalNodeSize(node, 18, 18);
-        KEllipse figure = _kRenderingExtensions.addEllipse(node);
-        _kRenderingExtensions.setLineWidth(figure, 1);
-        _kRenderingExtensions.setBackground(figure, Colors.WHITE);
-        _linguaFrancaStyleExtensions.noSelectionStyle(figure);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
-        return figure;
+    List<String> labelParts = new ArrayList<>();
+    if (timer.getOffset() != TimerInstance.DEFAULT_OFFSET && timer.getOffset() != null) {
+      labelParts.add(timer.getOffset().toString());
     }
-
-    /**
-     * Creates the visual representation of a shutdown trigger.
-     */
-    public KPolygon addShutdownFigure(KNode node) {
-        _kNodeExtensions.setMinimalNodeSize(node, 18, 18);
-        KPolygon figure = _kRenderingExtensions.addPolygon(node);
-        _kRenderingExtensions.setLineWidth(figure, 1);
-        _kRenderingExtensions.setBackground(figure, Colors.WHITE);
-        _linguaFrancaStyleExtensions.noSelectionStyle(figure);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
-
-        List<KPosition> pointsToAdd = List.of(
+    if (timer.getPeriod() != TimerInstance.DEFAULT_PERIOD && timer.getPeriod() != null) {
+      if (timer.getOffset() == TimerInstance.DEFAULT_OFFSET) {
+        labelParts.add(timer.getOffset().toString());
+      }
+      labelParts.add(timer.getPeriod().toString());
+    }
+    if (!labelParts.isEmpty()) {
+      _kLabelExtensions.addOutsideBottomCenteredNodeLabel(
+          node, "(" + String.join(", ", labelParts) + ")", 8);
+    }
+    return figure;
+  }
+
+  /** Creates the visual representation of a startup trigger. */
+  public KEllipse addStartupFigure(KNode node) {
+    _kNodeExtensions.setMinimalNodeSize(node, 18, 18);
+    KEllipse figure = _kRenderingExtensions.addEllipse(node);
+    _kRenderingExtensions.setLineWidth(figure, 1);
+    _kRenderingExtensions.setBackground(figure, Colors.WHITE);
+    _linguaFrancaStyleExtensions.noSelectionStyle(figure);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
+    return figure;
+  }
+
+  /** Creates the visual representation of a shutdown trigger. */
+  public KPolygon addShutdownFigure(KNode node) {
+    _kNodeExtensions.setMinimalNodeSize(node, 18, 18);
+    KPolygon figure = _kRenderingExtensions.addPolygon(node);
+    _kRenderingExtensions.setLineWidth(figure, 1);
+    _kRenderingExtensions.setBackground(figure, Colors.WHITE);
+    _linguaFrancaStyleExtensions.noSelectionStyle(figure);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
+
+    List<KPosition> pointsToAdd =
+        List.of(
             _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, 0, 0),
             _kRenderingExtensions.createKPosition(RIGHT, 0, 0, TOP, 0, 0.5f),
             _kRenderingExtensions.createKPosition(RIGHT, 0, 0.5f, BOTTOM, 0, 0),
-            _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0, 0.5f)
-        );
-
-        figure.getPoints().addAll(pointsToAdd);
-        return figure;
-    }
-
-    /**
-     * Creates the visual representation of a shutdown trigger.
-     */
-    public KEllipse addResetFigure(KNode node) {
-        _kNodeExtensions.setMinimalNodeSize(node, 18, 18);
-        KEllipse figure = _kRenderingExtensions.addEllipse(node);
-        _kRenderingExtensions.setLineWidth(figure, 1);
-        _kRenderingExtensions.setBackground(figure, Colors.WHITE);
-        _linguaFrancaStyleExtensions.noSelectionStyle(figure);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
-
-        KEllipse resetCircle = _kContainerRenderingExtensions.addEllipse(figure);
-        _kRenderingExtensions.setSurroundingSpace(resetCircle, 3f, 0);
-        _kRenderingExtensions.setLineWidth(resetCircle, 1.5f);
-        _kRenderingExtensions.setBackground(resetCircle, Colors.WHITE);
-        _linguaFrancaStyleExtensions.noSelectionStyle(resetCircle);
-
-        var resetCycleGap = _kContainerRenderingExtensions.addPolygon(resetCircle);
-        resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 0, 0, PositionReferenceY.TOP, 0.0f, 0));
-        resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.RIGHT, 0, 0, PositionReferenceY.TOP, 0.0f, 0));
-        resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.RIGHT, 1.1f, 0, PositionReferenceY.BOTTOM, 0, 0));
-        resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 1.1f, 0, PositionReferenceY.BOTTOM, 0, 0));
-        _kRenderingExtensions.setLineWidth(resetCycleGap, 0.3f);
-        _kRenderingExtensions.setForeground(resetCycleGap, Colors.WHITE);
-        _kRenderingExtensions.setBackground(resetCycleGap, Colors.WHITE);
-        _linguaFrancaStyleExtensions.noSelectionStyle(resetCycleGap);
-        _kRenderingExtensions.setPointPlacementData(resetCycleGap,
-                _kRenderingExtensions.LEFT, -2, 0.5f,
-                _kRenderingExtensions.TOP, 1.5f, 0,
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_CENTRAL,
-                0, 0, 4.0f, 3.0f);
-
-        var resetArrow = _kContainerRenderingExtensions.addPolygon(resetCircle);
-        resetArrow.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 0, 0, PositionReferenceY.TOP, 0.0f, 0.1f));
-        resetArrow.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 0.0f, 0.3f, PositionReferenceY.BOTTOM, 0, 0));
-        resetArrow.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.RIGHT, 0.0f, 0, PositionReferenceY.TOP, 0.0f, 0.0f));
-        _kRenderingExtensions.setLineWidth(resetArrow, 0.3f);
-        _kRenderingExtensions.setBackground(resetArrow, Colors.BLACK);
-        _linguaFrancaStyleExtensions.noSelectionStyle(resetArrow);
-        _kRenderingExtensions.setPointPlacementData(resetArrow,
-                _kRenderingExtensions.LEFT, 1.0f, 0.5f,
-                _kRenderingExtensions.TOP, 1.8f, 0,
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_CENTRAL,
-                0, 0, 3.2f, 3.2f);
-
-        return figure;
+            _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0, 0.5f));
+
+    figure.getPoints().addAll(pointsToAdd);
+    return figure;
+  }
+
+  /** Creates the visual representation of a shutdown trigger. */
+  public KEllipse addResetFigure(KNode node) {
+    _kNodeExtensions.setMinimalNodeSize(node, 18, 18);
+    KEllipse figure = _kRenderingExtensions.addEllipse(node);
+    _kRenderingExtensions.setLineWidth(figure, 1);
+    _kRenderingExtensions.setBackground(figure, Colors.WHITE);
+    _linguaFrancaStyleExtensions.noSelectionStyle(figure);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
+
+    KEllipse resetCircle = _kContainerRenderingExtensions.addEllipse(figure);
+    _kRenderingExtensions.setSurroundingSpace(resetCircle, 3f, 0);
+    _kRenderingExtensions.setLineWidth(resetCircle, 1.5f);
+    _kRenderingExtensions.setBackground(resetCircle, Colors.WHITE);
+    _linguaFrancaStyleExtensions.noSelectionStyle(resetCircle);
+
+    var resetCycleGap = _kContainerRenderingExtensions.addPolygon(resetCircle);
+    resetCycleGap
+        .getPoints()
+        .add(
+            _kRenderingExtensions.createKPosition(
+                PositionReferenceX.LEFT, 0, 0, PositionReferenceY.TOP, 0.0f, 0));
+    resetCycleGap
+        .getPoints()
+        .add(
+            _kRenderingExtensions.createKPosition(
+                PositionReferenceX.RIGHT, 0, 0, PositionReferenceY.TOP, 0.0f, 0));
+    resetCycleGap
+        .getPoints()
+        .add(
+            _kRenderingExtensions.createKPosition(
+                PositionReferenceX.RIGHT, 1.1f, 0, PositionReferenceY.BOTTOM, 0, 0));
+    resetCycleGap
+        .getPoints()
+        .add(
+            _kRenderingExtensions.createKPosition(
+                PositionReferenceX.LEFT, 1.1f, 0, PositionReferenceY.BOTTOM, 0, 0));
+    _kRenderingExtensions.setLineWidth(resetCycleGap, 0.3f);
+    _kRenderingExtensions.setForeground(resetCycleGap, Colors.WHITE);
+    _kRenderingExtensions.setBackground(resetCycleGap, Colors.WHITE);
+    _linguaFrancaStyleExtensions.noSelectionStyle(resetCycleGap);
+    _kRenderingExtensions.setPointPlacementData(
+        resetCycleGap,
+        _kRenderingExtensions.LEFT,
+        -2,
+        0.5f,
+        _kRenderingExtensions.TOP,
+        1.5f,
+        0,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        4.0f,
+        3.0f);
+
+    var resetArrow = _kContainerRenderingExtensions.addPolygon(resetCircle);
+    resetArrow
+        .getPoints()
+        .add(
+            _kRenderingExtensions.createKPosition(
+                PositionReferenceX.LEFT, 0, 0, PositionReferenceY.TOP, 0.0f, 0.1f));
+    resetArrow
+        .getPoints()
+        .add(
+            _kRenderingExtensions.createKPosition(
+                PositionReferenceX.LEFT, 0.0f, 0.3f, PositionReferenceY.BOTTOM, 0, 0));
+    resetArrow
+        .getPoints()
+        .add(
+            _kRenderingExtensions.createKPosition(
+                PositionReferenceX.RIGHT, 0.0f, 0, PositionReferenceY.TOP, 0.0f, 0.0f));
+    _kRenderingExtensions.setLineWidth(resetArrow, 0.3f);
+    _kRenderingExtensions.setBackground(resetArrow, Colors.BLACK);
+    _linguaFrancaStyleExtensions.noSelectionStyle(resetArrow);
+    _kRenderingExtensions.setPointPlacementData(
+        resetArrow,
+        _kRenderingExtensions.LEFT,
+        1.0f,
+        0.5f,
+        _kRenderingExtensions.TOP,
+        1.8f,
+        0,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        3.2f,
+        3.2f);
+
+    return figure;
+  }
+
+  /** Creates the visual representation of a reactor port. */
+  public KPolygon addTrianglePort(KPort port, boolean multiport) {
+    port.setSize(8, 8);
+
+    // Create triangle port
+    KPolygon trianglePort = _kRenderingExtensions.addPolygon(port);
+
+    // Set line width and background color according to multiport or not
+    float lineWidth = multiport ? 2.2f : 1;
+    _kRenderingExtensions.setLineWidth(trianglePort, lineWidth);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(trianglePort);
+    Colors background = multiport ? Colors.WHITE : Colors.BLACK;
+    _kRenderingExtensions.setBackground(trianglePort, background);
+
+    List<KPosition> pointsToAdd;
+    if (multiport) {
+      // Compensate for line width by making triangle smaller
+      // Do not adjust by port size because this will affect port distribution and cause offsets
+      // between parallel connections
+      pointsToAdd =
+          List.of(
+              _kRenderingExtensions.createKPosition(LEFT, 0, 0, TOP, 0.6f, 0),
+              _kRenderingExtensions.createKPosition(RIGHT, 1.2f, 0, TOP, 0, 0.5f),
+              _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0.6f, 0));
+    } else {
+      pointsToAdd =
+          List.of(
+              _kRenderingExtensions.createKPosition(LEFT, 0, 0, TOP, 0, 0),
+              _kRenderingExtensions.createKPosition(RIGHT, 0, 0, TOP, 0, 0.5f),
+              _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0, 0));
     }
-
-    /**
-     * Creates the visual representation of a reactor port.
-     */
-    public KPolygon addTrianglePort(KPort port, boolean multiport) {
-        port.setSize(8, 8);
-
-        // Create triangle port
-        KPolygon trianglePort = _kRenderingExtensions.addPolygon(port);
-
-        // Set line width and background color according to multiport or not
-        float lineWidth = multiport ? 2.2f : 1;
-        _kRenderingExtensions.setLineWidth(trianglePort, lineWidth);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(trianglePort);
-        Colors background = multiport ? Colors.WHITE : Colors.BLACK;
-        _kRenderingExtensions.setBackground(trianglePort, background);
-
-        List<KPosition> pointsToAdd;
-        if (multiport) {
-            // Compensate for line width by making triangle smaller
-            // Do not adjust by port size because this will affect port distribution and cause offsets between parallel connections
-            pointsToAdd = List.of(
-                _kRenderingExtensions.createKPosition(LEFT, 0, 0, TOP, 0.6f, 0),
-                _kRenderingExtensions.createKPosition(RIGHT, 1.2f, 0, TOP, 0, 0.5f),
-                _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0.6f, 0)
-            );
-        } else {
-            pointsToAdd = List.of(
-                _kRenderingExtensions.createKPosition(LEFT, 0, 0, TOP, 0, 0),
-                _kRenderingExtensions.createKPosition(RIGHT, 0, 0, TOP, 0, 0.5f),
-                _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0, 0)
-            );
-        }
-        trianglePort.getPoints().addAll(pointsToAdd);
-        return trianglePort;
-    }
-
-    /**
-     * Added a text as collapse expand button.
-     */
-    public KText addTextButton(KContainerRendering container, String text) {
-        KText textToAdd = _kContainerRenderingExtensions.addText(container, text);
-        _kRenderingExtensions.setForeground(textToAdd, Colors.BLUE);
-        _kRenderingExtensions.setFontSize(textToAdd, 8);
-        _linguaFrancaStyleExtensions.noSelectionStyle(textToAdd);
-        return textToAdd;
-    }
-
-    /**
-     * Creates the triangular line decorator with text.
-     */
-    public KPolygon addActionDecorator(KPolyline line, String text) {
-        final float size = 18;
-
-        // Create action decorator
-        KPolygon actionDecorator = _kContainerRenderingExtensions.addPolygon(line);
-        _kRenderingExtensions.setBackground(actionDecorator, Colors.WHITE);
-        List<KPosition> pointsToAdd = List.of(
+    trianglePort.getPoints().addAll(pointsToAdd);
+    return trianglePort;
+  }
+
+  /** Added a text as collapse expand button. */
+  public KText addTextButton(KContainerRendering container, String text) {
+    KText textToAdd = _kContainerRenderingExtensions.addText(container, text);
+    _kRenderingExtensions.setForeground(textToAdd, Colors.BLUE);
+    _kRenderingExtensions.setFontSize(textToAdd, 8);
+    _linguaFrancaStyleExtensions.noSelectionStyle(textToAdd);
+    return textToAdd;
+  }
+
+  /** Creates the triangular line decorator with text. */
+  public KPolygon addActionDecorator(KPolyline line, String text) {
+    final float size = 18;
+
+    // Create action decorator
+    KPolygon actionDecorator = _kContainerRenderingExtensions.addPolygon(line);
+    _kRenderingExtensions.setBackground(actionDecorator, Colors.WHITE);
+    List<KPosition> pointsToAdd =
+        List.of(
             _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, 0, 0),
             _kRenderingExtensions.createKPosition(RIGHT, 0, 0, BOTTOM, 0, 0),
-            _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0, 0)
-        );
-        actionDecorator.getPoints().addAll(pointsToAdd);
-
-        // Set placement data of the action decorator
-        KDecoratorPlacementData placementData = _kRenderingFactory.createKDecoratorPlacementData();
-        placementData.setRelative(0.5f);
-        placementData.setAbsolute(-size / 2);
-        placementData.setWidth(size);
-        placementData.setHeight(size);
-        placementData.setYOffset(-size * 0.66f);
-        placementData.setRotateWithLine(true);
-        actionDecorator.setPlacementData(placementData);
-
-        // Add text to the action decorator
-        KText textToAdd = _kContainerRenderingExtensions.addText(actionDecorator, text);
-        _kRenderingExtensions.setFontSize(textToAdd, 8);
-        _linguaFrancaStyleExtensions.noSelectionStyle(textToAdd);
-        DiagramSyntheses.suppressSelectability(textToAdd);
-        _kRenderingExtensions.setPointPlacementData(textToAdd,
-                _kRenderingExtensions.LEFT, 0, 0.5f,
-                _kRenderingExtensions.TOP, size * 0.15f, 0.5f,
-                _kRenderingExtensions.H_CENTRAL, _kRenderingExtensions.V_CENTRAL, 0,
-                0, size, size);
-
-        return actionDecorator;
-    }
-
-    /**
-     * Creates the triangular action node with text and ports.
-     */
-    public Pair<KPort, KPort> addActionFigureAndPorts(KNode node, String text) {
-        final float size = 18;
-        _kNodeExtensions.setMinimalNodeSize(node, size, size);
-        KPolygon figure = _kRenderingExtensions.addPolygon(node);
-        _kRenderingExtensions.setBackground(figure, Colors.WHITE);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
-
-        List<KPosition> pointsToAdd = List.of(
+            _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0, 0));
+    actionDecorator.getPoints().addAll(pointsToAdd);
+
+    // Set placement data of the action decorator
+    KDecoratorPlacementData placementData = _kRenderingFactory.createKDecoratorPlacementData();
+    placementData.setRelative(0.5f);
+    placementData.setAbsolute(-size / 2);
+    placementData.setWidth(size);
+    placementData.setHeight(size);
+    placementData.setYOffset(-size * 0.66f);
+    placementData.setRotateWithLine(true);
+    actionDecorator.setPlacementData(placementData);
+
+    // Add text to the action decorator
+    KText textToAdd = _kContainerRenderingExtensions.addText(actionDecorator, text);
+    _kRenderingExtensions.setFontSize(textToAdd, 8);
+    _linguaFrancaStyleExtensions.noSelectionStyle(textToAdd);
+    DiagramSyntheses.suppressSelectability(textToAdd);
+    _kRenderingExtensions.setPointPlacementData(
+        textToAdd,
+        _kRenderingExtensions.LEFT,
+        0,
+        0.5f,
+        _kRenderingExtensions.TOP,
+        size * 0.15f,
+        0.5f,
+        _kRenderingExtensions.H_CENTRAL,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        size,
+        size);
+
+    return actionDecorator;
+  }
+
+  /** Creates the triangular action node with text and ports. */
+  public Pair<KPort, KPort> addActionFigureAndPorts(KNode node, String text) {
+    final float size = 18;
+    _kNodeExtensions.setMinimalNodeSize(node, size, size);
+    KPolygon figure = _kRenderingExtensions.addPolygon(node);
+    _kRenderingExtensions.setBackground(figure, Colors.WHITE);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
+
+    List<KPosition> pointsToAdd =
+        List.of(
             _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, 0, 0),
             _kRenderingExtensions.createKPosition(RIGHT, 0, 0, BOTTOM, 0, 0),
-            _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0, 0)
-        );
-        figure.getPoints().addAll(pointsToAdd);
-
-        // Add text to the action figure
-        KText textToAdd = _kContainerRenderingExtensions.addText(figure, text);
-        _kRenderingExtensions.setFontSize(textToAdd, 8);
-        _linguaFrancaStyleExtensions.noSelectionStyle(textToAdd);
-        DiagramSyntheses.suppressSelectability(textToAdd);
-        _kRenderingExtensions.setPointPlacementData(textToAdd,
-                _kRenderingExtensions.LEFT, 0, 0.5f,
-                _kRenderingExtensions.TOP, (size * 0.15f), 0.5f,
-                _kRenderingExtensions.H_CENTRAL,
-                _kRenderingExtensions.V_CENTRAL, 0, 0, size, size);
-
-        // Add input port
-        KPort in = _kPortExtensions.createPort();
-        node.getPorts().add(in);
-        in.setSize(0, 0);
-        DiagramSyntheses.setLayoutOption(in, CoreOptions.PORT_SIDE, PortSide.WEST);
-        DiagramSyntheses.setLayoutOption(in, CoreOptions.PORT_BORDER_OFFSET, -size / ((double) 4));
-
-        // Add output port
-        KPort out = _kPortExtensions.createPort();
-        node.getPorts().add(out);
-        DiagramSyntheses.setLayoutOption(out, CoreOptions.PORT_SIDE, PortSide.EAST);
-        DiagramSyntheses.setLayoutOption(out, CoreOptions.PORT_BORDER_OFFSET, -size / ((double) 4));
-        return new Pair<KPort, KPort>(in, out);
+            _kRenderingExtensions.createKPosition(LEFT, 0, 0, BOTTOM, 0, 0));
+    figure.getPoints().addAll(pointsToAdd);
+
+    // Add text to the action figure
+    KText textToAdd = _kContainerRenderingExtensions.addText(figure, text);
+    _kRenderingExtensions.setFontSize(textToAdd, 8);
+    _linguaFrancaStyleExtensions.noSelectionStyle(textToAdd);
+    DiagramSyntheses.suppressSelectability(textToAdd);
+    _kRenderingExtensions.setPointPlacementData(
+        textToAdd,
+        _kRenderingExtensions.LEFT,
+        0,
+        0.5f,
+        _kRenderingExtensions.TOP,
+        (size * 0.15f),
+        0.5f,
+        _kRenderingExtensions.H_CENTRAL,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        size,
+        size);
+
+    // Add input port
+    KPort in = _kPortExtensions.createPort();
+    node.getPorts().add(in);
+    in.setSize(0, 0);
+    DiagramSyntheses.setLayoutOption(in, CoreOptions.PORT_SIDE, PortSide.WEST);
+    DiagramSyntheses.setLayoutOption(in, CoreOptions.PORT_BORDER_OFFSET, -size / ((double) 4));
+
+    // Add output port
+    KPort out = _kPortExtensions.createPort();
+    node.getPorts().add(out);
+    DiagramSyntheses.setLayoutOption(out, CoreOptions.PORT_SIDE, PortSide.EAST);
+    DiagramSyntheses.setLayoutOption(out, CoreOptions.PORT_BORDER_OFFSET, -size / ((double) 4));
+    return new Pair<KPort, KPort>(in, out);
+  }
+
+  /** Creates and adds an error message figure */
+  public KRectangle addErrorMessage(KNode node, String title, String message) {
+    // Create figure for error message
+    KRectangle figure = _kRenderingExtensions.addRectangle(node);
+    _kRenderingExtensions.setInvisible(figure, true);
+
+    // Add error message box
+    KRoundedRectangle errMsgBox = _kContainerRenderingExtensions.addRoundedRectangle(figure, 7, 7);
+    _kContainerRenderingExtensions.setGridPlacement(errMsgBox, 1);
+    _kRenderingExtensions.setLineWidth(errMsgBox, 2);
+    _linguaFrancaStyleExtensions.noSelectionStyle(errMsgBox);
+
+    if (title != null) {
+      // Add title to error message box
+      KText titleText = _kContainerRenderingExtensions.addText(errMsgBox, title);
+      _kRenderingExtensions.setFontSize(titleText, 12);
+      _kRenderingExtensions.setFontBold(titleText, true);
+      _kRenderingExtensions.setForeground(titleText, Colors.RED);
+      setGridPlacementDataFromPointToPoint(
+          titleText,
+          _kRenderingExtensions.LEFT,
+          8,
+          0,
+          _kRenderingExtensions.TOP,
+          8,
+          0,
+          _kRenderingExtensions.RIGHT,
+          8,
+          0,
+          _kRenderingExtensions.BOTTOM,
+          4,
+          0);
+      DiagramSyntheses.suppressSelectability(titleText);
+      _linguaFrancaStyleExtensions.noSelectionStyle(titleText);
     }
 
-    /**
-     * Creates and adds an error message figure
-     */
-    public KRectangle addErrorMessage(KNode node, String title, String message) {
-        // Create figure for error message
-        KRectangle figure = _kRenderingExtensions.addRectangle(node);
-        _kRenderingExtensions.setInvisible(figure, true);
-
-        // Add error message box
-        KRoundedRectangle errMsgBox = _kContainerRenderingExtensions.addRoundedRectangle(figure, 7, 7);
-        _kContainerRenderingExtensions.setGridPlacement(errMsgBox, 1);
-        _kRenderingExtensions.setLineWidth(errMsgBox, 2);
-        _linguaFrancaStyleExtensions.noSelectionStyle(errMsgBox);
-
-        if (title != null) {
-            // Add title to error message box
-            KText titleText = _kContainerRenderingExtensions.addText(errMsgBox, title);
-            _kRenderingExtensions.setFontSize(titleText, 12);
-            _kRenderingExtensions.setFontBold(titleText, true);
-            _kRenderingExtensions.setForeground(titleText, Colors.RED);
-            setGridPlacementDataFromPointToPoint(titleText,
-                    _kRenderingExtensions.LEFT, 8, 0,
-                    _kRenderingExtensions.TOP, 8, 0,
-                    _kRenderingExtensions.RIGHT, 8, 0,
-                    _kRenderingExtensions.BOTTOM, 4, 0);
-            DiagramSyntheses.suppressSelectability(titleText);
-            _linguaFrancaStyleExtensions.noSelectionStyle(titleText);
-        }
-
-        if (message != null) {
-            // Add message to error message box
-            KText msgText = _kContainerRenderingExtensions.addText(errMsgBox, message);
-            if (title != null) {
-                setGridPlacementDataFromPointToPoint(msgText,
-                        _kRenderingExtensions.LEFT, 8, 0,
-                        _kRenderingExtensions.TOP, 0, 0,
-                        _kRenderingExtensions.RIGHT, 8, 0,
-                        _kRenderingExtensions.BOTTOM, 4, 0);
-            } else {
-                setGridPlacementDataFromPointToPoint(msgText,
-                        _kRenderingExtensions.LEFT, 8, 0,
-                        _kRenderingExtensions.TOP, 8, 0,
-                        _kRenderingExtensions.RIGHT, 8, 0,
-                        _kRenderingExtensions.BOTTOM, 8, 0);
-            }
-            _linguaFrancaStyleExtensions.noSelectionStyle(msgText);
-        }
-        return figure;
+    if (message != null) {
+      // Add message to error message box
+      KText msgText = _kContainerRenderingExtensions.addText(errMsgBox, message);
+      if (title != null) {
+        setGridPlacementDataFromPointToPoint(
+            msgText,
+            _kRenderingExtensions.LEFT,
+            8,
+            0,
+            _kRenderingExtensions.TOP,
+            0,
+            0,
+            _kRenderingExtensions.RIGHT,
+            8,
+            0,
+            _kRenderingExtensions.BOTTOM,
+            4,
+            0);
+      } else {
+        setGridPlacementDataFromPointToPoint(
+            msgText,
+            _kRenderingExtensions.LEFT,
+            8,
+            0,
+            _kRenderingExtensions.TOP,
+            8,
+            0,
+            _kRenderingExtensions.RIGHT,
+            8,
+            0,
+            _kRenderingExtensions.BOTTOM,
+            8,
+            0);
+      }
+      _linguaFrancaStyleExtensions.noSelectionStyle(msgText);
     }
-
-    public KRoundedRectangle addCommentFigure(KNode node, String message) {
-        // Create rectangle for comment figure
-        KRoundedRectangle commentFigure = _kRenderingExtensions.addRoundedRectangle(node, 1, 1, 1);
-        _kContainerRenderingExtensions.setGridPlacement(commentFigure, 1);
-
-        // Add message
-        KText text = _kContainerRenderingExtensions.addText(commentFigure, message);
-        _kRenderingExtensions.setFontSize(text, 6);
-        setGridPlacementDataFromPointToPoint(text,
-                _kRenderingExtensions.LEFT, 3, 0,
-                _kRenderingExtensions.TOP, 3, 0,
-                _kRenderingExtensions.RIGHT, 3, 0,
-                _kRenderingExtensions.BOTTOM, 3, 0);
-        _linguaFrancaStyleExtensions.noSelectionStyle(text);
-        return commentFigure;
-    }
-
-    private KRendering setGridPlacementDataFromPointToPoint(KRendering rendering,
-            PositionReferenceX fPx, float fAbsoluteLR, float fRelativeLR,
-            PositionReferenceY fPy, float fAbsoluteTB, float fRelativeTB,
-            PositionReferenceX tPx, float tAbsoluteLR, float tRelativeLR,
-            PositionReferenceY tPy, float tAbsoluteTB, float tRelativeTB) {
-        KAreaPlacementData fromPoint = _kRenderingExtensions.from(
-                _kRenderingExtensions.setGridPlacementData(rendering),
-                fPx, fAbsoluteLR, fRelativeLR,
-                fPy, fAbsoluteTB, fRelativeTB);
-        return _kRenderingExtensions.to(fromPoint,
-                tPx, tAbsoluteLR, tRelativeLR,
-                tPy, tAbsoluteTB, tRelativeTB);
-    }
-
-
-    public KPolyline addCommentPolyline(KEdge edge) {
-        KPolyline polyline = _kEdgeExtensions.addPolyline(edge);
-        _kRenderingExtensions.setLineWidth(polyline, 1);
-        _kRenderingExtensions.setLineStyle(polyline, LineStyle.DOT);
-        return polyline;
-    }
-
-    public KContainerRendering addParameterEntry(KContainerRendering parent, Parameter associate, String text) {
-        KRectangle container = _kContainerRenderingExtensions.addRectangle(parent);
-         _kRenderingExtensions.setInvisible(container, true);
-
-        var ktext = _kContainerRenderingExtensions.addText(container, text);
-        _kRenderingExtensions.setFontSize(ktext, 8);
-        _kRenderingExtensions.setPointPlacementData(ktext,
-                _kRenderingExtensions.LEFT, 10, 0,
-                _kRenderingExtensions.TOP, 0, 0.5f,
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_CENTRAL,
-                0, 0, 0, 0);
-        associateWith(ktext, associate);
-
-        var dot = _kContainerRenderingExtensions.addEllipse(container);
-        _kRenderingExtensions.setLineWidth(dot, 1);
-        _linguaFrancaStyleExtensions.noSelectionStyle(dot);
-        _kRenderingExtensions.setPointPlacementData(dot,
-                _kRenderingExtensions.LEFT, 2, 0,
-                _kRenderingExtensions.TOP, 0, 0.5f,
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_CENTRAL,
-                0, 0, 5, 5);
-
-        return container;
-    }
-
-
-    public KContainerRendering addStateEntry(KContainerRendering parent, StateVar associate, String text, boolean reset) {
-        KRectangle container = _kContainerRenderingExtensions.addRectangle(parent);
-         _kRenderingExtensions.setInvisible(container, true);
-
-        var ktext = _kContainerRenderingExtensions.addText(container, text);
-        _kRenderingExtensions.setFontSize(ktext, 8);
-        _kRenderingExtensions.setPointPlacementData(ktext,
-                _kRenderingExtensions.LEFT, 10, 0,
-                _kRenderingExtensions.TOP, 0, 0.5f,
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_CENTRAL,
-                0, 0, 0, 0);
-        associateWith(ktext, associate);
-
-        KEllipse outerCircle;
-
-        if (reset) {
-            outerCircle = _kContainerRenderingExtensions.addEllipse(container);
-            _kRenderingExtensions.setLineWidth(outerCircle, 0.9f);
-            _kRenderingExtensions.setBackground(outerCircle, Colors.WHITE);
-            _linguaFrancaStyleExtensions.noSelectionStyle(outerCircle);
-            _kRenderingExtensions.setPointPlacementData(outerCircle,
-                    _kRenderingExtensions.LEFT, 1.5f, 0,
-                    _kRenderingExtensions.TOP, 0, 0.5f,
-                    _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_CENTRAL,
-                    0, 0, 6.3f, 6.3f);
-
-            var resetCycleGap = _kContainerRenderingExtensions.addPolygon(outerCircle);
-            resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 0, 0, PositionReferenceY.TOP, 0.26f, 0));
-            resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 0, 0.2f, PositionReferenceY.TOP, 0.1f, 0));
-            resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 0, 0.5f, PositionReferenceY.TOP, 0.0f, 0));
-            resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.RIGHT, 0, 0.2f, PositionReferenceY.TOP, 0.1f, 0));
-            resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.RIGHT, 0, 0, PositionReferenceY.TOP, 0.26f, 0));
-            resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.RIGHT, 0.5f, 0, PositionReferenceY.BOTTOM, 0, 0));
-            resetCycleGap.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 0.5f, 0, PositionReferenceY.BOTTOM, 0, 0));
-            _kRenderingExtensions.setLineWidth(resetCycleGap, 0.3f);
-            _kRenderingExtensions.setForeground(resetCycleGap, Colors.WHITE);
-            _kRenderingExtensions.setBackground(resetCycleGap, Colors.WHITE);
-            _linguaFrancaStyleExtensions.noSelectionStyle(resetCycleGap);
-            _kRenderingExtensions.setPointPlacementData(resetCycleGap,
-                    _kRenderingExtensions.LEFT, -1.2f, 0.5f,
-                    _kRenderingExtensions.TOP, 0.75f, 0,
-                    _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_CENTRAL,
-                    0, 0, 2.5f, 1.3f);
-
-            var resetArrow = _kContainerRenderingExtensions.addPolygon(outerCircle);
-            resetArrow.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 0, 0, PositionReferenceY.TOP, 0.0f, 0.1f));
-            resetArrow.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.LEFT, 0.0f, 0.3f, PositionReferenceY.BOTTOM, 0, 0));
-            resetArrow.getPoints().add(_kRenderingExtensions.createKPosition(PositionReferenceX.RIGHT, 0.0f, 0, PositionReferenceY.TOP, 0.0f, 0.0f));
-            _kRenderingExtensions.setLineWidth(resetArrow, 0.3f);
-            _kRenderingExtensions.setBackground(resetArrow, Colors.BLACK);
-            _linguaFrancaStyleExtensions.noSelectionStyle(resetArrow);
-            _kRenderingExtensions.setPointPlacementData(resetArrow,
-                    _kRenderingExtensions.LEFT, 0.8f, 0.5f,
-                    _kRenderingExtensions.TOP, 1.1f, 0,
-                    _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_CENTRAL,
-                    0, 0, 1.5f, 1.5f);
-        } else {
-            outerCircle = _kContainerRenderingExtensions.addEllipse(container);
-            _kRenderingExtensions.setLineWidth(outerCircle, 1);
-            _kRenderingExtensions.setBackground(outerCircle, Colors.WHITE);
-            _linguaFrancaStyleExtensions.noSelectionStyle(outerCircle);
-            _kRenderingExtensions.setPointPlacementData(outerCircle,
-                    _kRenderingExtensions.LEFT, 1.5f, 0,
-                    _kRenderingExtensions.TOP, 0, 0.5f,
-                    _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_CENTRAL,
-                    0, 0, 6, 6);
-        }
-
-        var innerDot = _kContainerRenderingExtensions.addEllipse(outerCircle);
-        _kRenderingExtensions.setLineWidth(innerDot, 0.5f);
-        _kRenderingExtensions.setBackground(innerDot, Colors.BLACK);
-        _linguaFrancaStyleExtensions.noSelectionStyle(innerDot);
-        _kRenderingExtensions.setPointPlacementData(innerDot,
-                _kRenderingExtensions.LEFT, 0, 0.5f,
-                _kRenderingExtensions.TOP, 0, 0.5f,
-                _kRenderingExtensions.H_CENTRAL, _kRenderingExtensions.V_CENTRAL,
-                0, 0, 2.5f, 2.5f);
-
-        return container;
+    return figure;
+  }
+
+  public KRoundedRectangle addCommentFigure(KNode node, String message) {
+    // Create rectangle for comment figure
+    KRoundedRectangle commentFigure = _kRenderingExtensions.addRoundedRectangle(node, 1, 1, 1);
+    _kContainerRenderingExtensions.setGridPlacement(commentFigure, 1);
+
+    // Add message
+    KText text = _kContainerRenderingExtensions.addText(commentFigure, message);
+    _kRenderingExtensions.setFontSize(text, 6);
+    setGridPlacementDataFromPointToPoint(
+        text,
+        _kRenderingExtensions.LEFT,
+        3,
+        0,
+        _kRenderingExtensions.TOP,
+        3,
+        0,
+        _kRenderingExtensions.RIGHT,
+        3,
+        0,
+        _kRenderingExtensions.BOTTOM,
+        3,
+        0);
+    _linguaFrancaStyleExtensions.noSelectionStyle(text);
+    return commentFigure;
+  }
+
+  private KRendering setGridPlacementDataFromPointToPoint(
+      KRendering rendering,
+      PositionReferenceX fPx,
+      float fAbsoluteLR,
+      float fRelativeLR,
+      PositionReferenceY fPy,
+      float fAbsoluteTB,
+      float fRelativeTB,
+      PositionReferenceX tPx,
+      float tAbsoluteLR,
+      float tRelativeLR,
+      PositionReferenceY tPy,
+      float tAbsoluteTB,
+      float tRelativeTB) {
+    KAreaPlacementData fromPoint =
+        _kRenderingExtensions.from(
+            _kRenderingExtensions.setGridPlacementData(rendering),
+            fPx,
+            fAbsoluteLR,
+            fRelativeLR,
+            fPy,
+            fAbsoluteTB,
+            fRelativeTB);
+    return _kRenderingExtensions.to(
+        fromPoint, tPx, tAbsoluteLR, tRelativeLR, tPy, tAbsoluteTB, tRelativeTB);
+  }
+
+  public KPolyline addCommentPolyline(KEdge edge) {
+    KPolyline polyline = _kEdgeExtensions.addPolyline(edge);
+    _kRenderingExtensions.setLineWidth(polyline, 1);
+    _kRenderingExtensions.setLineStyle(polyline, LineStyle.DOT);
+    return polyline;
+  }
+
+  public KContainerRendering addParameterEntry(
+      KContainerRendering parent, Parameter associate, String text) {
+    KRectangle container = _kContainerRenderingExtensions.addRectangle(parent);
+    _kRenderingExtensions.setInvisible(container, true);
+
+    var ktext = _kContainerRenderingExtensions.addText(container, text);
+    _kRenderingExtensions.setFontSize(ktext, 8);
+    _kRenderingExtensions.setPointPlacementData(
+        ktext,
+        _kRenderingExtensions.LEFT,
+        10,
+        0,
+        _kRenderingExtensions.TOP,
+        0,
+        0.5f,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        0,
+        0);
+    associateWith(ktext, associate);
+
+    var dot = _kContainerRenderingExtensions.addEllipse(container);
+    _kRenderingExtensions.setLineWidth(dot, 1);
+    _linguaFrancaStyleExtensions.noSelectionStyle(dot);
+    _kRenderingExtensions.setPointPlacementData(
+        dot,
+        _kRenderingExtensions.LEFT,
+        2,
+        0,
+        _kRenderingExtensions.TOP,
+        0,
+        0.5f,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        5,
+        5);
+
+    return container;
+  }
+
+  public KContainerRendering addStateEntry(
+      KContainerRendering parent, StateVar associate, String text, boolean reset) {
+    KRectangle container = _kContainerRenderingExtensions.addRectangle(parent);
+    _kRenderingExtensions.setInvisible(container, true);
+
+    var ktext = _kContainerRenderingExtensions.addText(container, text);
+    _kRenderingExtensions.setFontSize(ktext, 8);
+    _kRenderingExtensions.setPointPlacementData(
+        ktext,
+        _kRenderingExtensions.LEFT,
+        10,
+        0,
+        _kRenderingExtensions.TOP,
+        0,
+        0.5f,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        0,
+        0);
+    associateWith(ktext, associate);
+
+    KEllipse outerCircle;
+
+    if (reset) {
+      outerCircle = _kContainerRenderingExtensions.addEllipse(container);
+      _kRenderingExtensions.setLineWidth(outerCircle, 0.9f);
+      _kRenderingExtensions.setBackground(outerCircle, Colors.WHITE);
+      _linguaFrancaStyleExtensions.noSelectionStyle(outerCircle);
+      _kRenderingExtensions.setPointPlacementData(
+          outerCircle,
+          _kRenderingExtensions.LEFT,
+          1.5f,
+          0,
+          _kRenderingExtensions.TOP,
+          0,
+          0.5f,
+          _kRenderingExtensions.H_LEFT,
+          _kRenderingExtensions.V_CENTRAL,
+          0,
+          0,
+          6.3f,
+          6.3f);
+
+      var resetCycleGap = _kContainerRenderingExtensions.addPolygon(outerCircle);
+      resetCycleGap
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.LEFT, 0, 0, PositionReferenceY.TOP, 0.26f, 0));
+      resetCycleGap
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.LEFT, 0, 0.2f, PositionReferenceY.TOP, 0.1f, 0));
+      resetCycleGap
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.LEFT, 0, 0.5f, PositionReferenceY.TOP, 0.0f, 0));
+      resetCycleGap
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.RIGHT, 0, 0.2f, PositionReferenceY.TOP, 0.1f, 0));
+      resetCycleGap
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.RIGHT, 0, 0, PositionReferenceY.TOP, 0.26f, 0));
+      resetCycleGap
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.RIGHT, 0.5f, 0, PositionReferenceY.BOTTOM, 0, 0));
+      resetCycleGap
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.LEFT, 0.5f, 0, PositionReferenceY.BOTTOM, 0, 0));
+      _kRenderingExtensions.setLineWidth(resetCycleGap, 0.3f);
+      _kRenderingExtensions.setForeground(resetCycleGap, Colors.WHITE);
+      _kRenderingExtensions.setBackground(resetCycleGap, Colors.WHITE);
+      _linguaFrancaStyleExtensions.noSelectionStyle(resetCycleGap);
+      _kRenderingExtensions.setPointPlacementData(
+          resetCycleGap,
+          _kRenderingExtensions.LEFT,
+          -1.2f,
+          0.5f,
+          _kRenderingExtensions.TOP,
+          0.75f,
+          0,
+          _kRenderingExtensions.H_LEFT,
+          _kRenderingExtensions.V_CENTRAL,
+          0,
+          0,
+          2.5f,
+          1.3f);
+
+      var resetArrow = _kContainerRenderingExtensions.addPolygon(outerCircle);
+      resetArrow
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.LEFT, 0, 0, PositionReferenceY.TOP, 0.0f, 0.1f));
+      resetArrow
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.LEFT, 0.0f, 0.3f, PositionReferenceY.BOTTOM, 0, 0));
+      resetArrow
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  PositionReferenceX.RIGHT, 0.0f, 0, PositionReferenceY.TOP, 0.0f, 0.0f));
+      _kRenderingExtensions.setLineWidth(resetArrow, 0.3f);
+      _kRenderingExtensions.setBackground(resetArrow, Colors.BLACK);
+      _linguaFrancaStyleExtensions.noSelectionStyle(resetArrow);
+      _kRenderingExtensions.setPointPlacementData(
+          resetArrow,
+          _kRenderingExtensions.LEFT,
+          0.8f,
+          0.5f,
+          _kRenderingExtensions.TOP,
+          1.1f,
+          0,
+          _kRenderingExtensions.H_LEFT,
+          _kRenderingExtensions.V_CENTRAL,
+          0,
+          0,
+          1.5f,
+          1.5f);
+    } else {
+      outerCircle = _kContainerRenderingExtensions.addEllipse(container);
+      _kRenderingExtensions.setLineWidth(outerCircle, 1);
+      _kRenderingExtensions.setBackground(outerCircle, Colors.WHITE);
+      _linguaFrancaStyleExtensions.noSelectionStyle(outerCircle);
+      _kRenderingExtensions.setPointPlacementData(
+          outerCircle,
+          _kRenderingExtensions.LEFT,
+          1.5f,
+          0,
+          _kRenderingExtensions.TOP,
+          0,
+          0.5f,
+          _kRenderingExtensions.H_LEFT,
+          _kRenderingExtensions.V_CENTRAL,
+          0,
+          0,
+          6,
+          6);
     }
 
+    var innerDot = _kContainerRenderingExtensions.addEllipse(outerCircle);
+    _kRenderingExtensions.setLineWidth(innerDot, 0.5f);
+    _kRenderingExtensions.setBackground(innerDot, Colors.BLACK);
+    _linguaFrancaStyleExtensions.noSelectionStyle(innerDot);
+    _kRenderingExtensions.setPointPlacementData(
+        innerDot,
+        _kRenderingExtensions.LEFT,
+        0,
+        0.5f,
+        _kRenderingExtensions.TOP,
+        0,
+        0.5f,
+        _kRenderingExtensions.H_CENTRAL,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        2.5f,
+        2.5f);
+
+    return container;
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaStyleExtensions.java b/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaStyleExtensions.java
index f4c0aefd98..6eb2cfd7f0 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaStyleExtensions.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/styles/LinguaFrancaStyleExtensions.java
@@ -1,29 +1,32 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.styles;
 
+import static de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceX.*;
+import static de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceY.*;
+
 import de.cau.cs.kieler.klighd.internal.util.KlighdInternalProperties;
 import de.cau.cs.kieler.klighd.kgraph.KEdge;
 import de.cau.cs.kieler.klighd.kgraph.KLabel;
@@ -48,7 +51,6 @@
 import de.cau.cs.kieler.klighd.labels.decoration.IDecoratorRenderingProvider;
 import de.cau.cs.kieler.klighd.labels.decoration.LabelDecorationConfigurator;
 import java.util.List;
-
 import javax.inject.Inject;
 import org.eclipse.elk.core.math.ElkPadding;
 import org.eclipse.elk.graph.properties.Property;
@@ -56,415 +58,469 @@
 import org.eclipse.xtext.xbase.lib.Extension;
 import org.lflang.diagram.synthesis.AbstractSynthesisExtensions;
 
-import static de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceX.*;
-import static de.cau.cs.kieler.klighd.krendering.extensions.PositionReferenceY.*;
-
 /**
  * Extension class that provides styles and coloring for the Lingua France diagram synthesis.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 @ViewSynthesisShared
 public class LinguaFrancaStyleExtensions extends AbstractSynthesisExtensions {
-    
-    /** 
-     * INTERNAL property to communicate a node's background color. 
-     */
-    public static final Property<Colors> LABEL_PARENT_BACKGROUND = new Property<>(
-            "org.lflang.linguafranca.diagram.synthesis.styles.label.parent.background", Colors.WHITE);
-    
-    @Inject
-    @Extension
-    private KRenderingExtensions _kRenderingExtensions;
-    @Inject
-    @Extension
-    private KContainerRenderingExtensions _kContainerRenderingExtensions;
-    @Inject
-    @Extension
-    private KPolylineExtensions _kPolylineExtensions;
-    @Extension
-    private KRenderingFactory _kRenderingFactory = KRenderingFactory.eINSTANCE;
-
-    public KRendering noSelectionStyle(KRendering r) {
-        return _kRenderingExtensions.setSelectionTextStrikeout(r, false);
-    }
-  
-    public KRendering underlineSelectionStyle(KRendering r) {
-        return _kRenderingExtensions.setSelectionTextUnderline(r, Underline.SINGLE);
-    }
-  
-    public KRendering boldLineSelectionStyle(KRendering r) {
-        float lineWidthValue = _kRenderingExtensions.getLineWidthValue(r);
-        return _kRenderingExtensions.setSelectionLineWidth(r, lineWidthValue * 2);
-    }
-  
-    public KText boldTextSelectionStyle(KText t) {
-        return _kRenderingExtensions.setSelectionFontBold(t, true);
-    }
-    
-    public void errorStyle(KRendering r) {
-        _kRenderingExtensions.setForeground(r, Colors.RED);
-        _kRenderingExtensions.setLineWidth(r, 2);
-        _kRenderingExtensions.setSelectionLineWidth(r, 3);
-        
-        // Set background color the body if its a port or an line decorator
-        if (r.eContainer() instanceof KPort || r.eContainer() instanceof KPolyline) {
-            _kRenderingExtensions.setBackground(r, Colors.RED);
-            _kRenderingExtensions.getBackground(r).setPropagateToChildren(true);
-            _kRenderingExtensions.getForeground(r).setPropagateToChildren(true);
-            _kRenderingExtensions.getLineWidth(r).setPropagateToChildren(true);
-        } else if (r.eContainer() instanceof KEdge && r instanceof KPolyline) {
-            // As a workaround for a rendering issue in Klighd VSCode, the style is applied to polyline
-            // children directly because a propagated background would lead to a filled edge area.
-            // See https://github.com/kieler/klighd-vscode/issues/67
-            // If fixed this commit can be reverted
-            ((KPolyline) r).getChildren().stream().forEach(c -> errorStyle(c));
-        }
-    }
-    
-    public void commentStyle(KRendering r) {
-        _kRenderingExtensions.setForeground(r, Colors.LIGHT_GOLDENROD);
-        _kRenderingExtensions.setBackground(r, Colors.PALE_GOLDENROD);
-        _kRenderingExtensions.setLineWidth(r, 1);
-        _kRenderingExtensions.setSelectionLineWidth(r, 2);
-
-        if (r.eContainer() instanceof KEdge) {  // also color potential arrow heads
-            _kRenderingExtensions.setBackground(r, Colors.LIGHT_GOLDENROD);
-            _kRenderingExtensions.getBackground(r).setPropagateToChildren(true);
-            _kRenderingExtensions.getForeground(r).setPropagateToChildren(true);
-            _kRenderingExtensions.getLineWidth(r).setPropagateToChildren(true);
-        }
+
+  /** INTERNAL property to communicate a node's background color. */
+  public static final Property<Colors> LABEL_PARENT_BACKGROUND =
+      new Property<>(
+          "org.lflang.linguafranca.diagram.synthesis.styles.label.parent.background", Colors.WHITE);
+
+  @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
+  @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
+  @Inject @Extension private KPolylineExtensions _kPolylineExtensions;
+  @Extension private KRenderingFactory _kRenderingFactory = KRenderingFactory.eINSTANCE;
+
+  public KRendering noSelectionStyle(KRendering r) {
+    return _kRenderingExtensions.setSelectionTextStrikeout(r, false);
+  }
+
+  public KRendering underlineSelectionStyle(KRendering r) {
+    return _kRenderingExtensions.setSelectionTextUnderline(r, Underline.SINGLE);
+  }
+
+  public KRendering boldLineSelectionStyle(KRendering r) {
+    float lineWidthValue = _kRenderingExtensions.getLineWidthValue(r);
+    return _kRenderingExtensions.setSelectionLineWidth(r, lineWidthValue * 2);
+  }
+
+  public KText boldTextSelectionStyle(KText t) {
+    return _kRenderingExtensions.setSelectionFontBold(t, true);
+  }
+
+  public void errorStyle(KRendering r) {
+    _kRenderingExtensions.setForeground(r, Colors.RED);
+    _kRenderingExtensions.setLineWidth(r, 2);
+    _kRenderingExtensions.setSelectionLineWidth(r, 3);
+
+    // Set background color the body if its a port or an line decorator
+    if (r.eContainer() instanceof KPort || r.eContainer() instanceof KPolyline) {
+      _kRenderingExtensions.setBackground(r, Colors.RED);
+      _kRenderingExtensions.getBackground(r).setPropagateToChildren(true);
+      _kRenderingExtensions.getForeground(r).setPropagateToChildren(true);
+      _kRenderingExtensions.getLineWidth(r).setPropagateToChildren(true);
+    } else if (r.eContainer() instanceof KEdge && r instanceof KPolyline) {
+      // As a workaround for a rendering issue in Klighd VSCode, the style is applied to polyline
+      // children directly because a propagated background would lead to a filled edge area.
+      // See https://github.com/kieler/klighd-vscode/issues/67
+      // If fixed this commit can be reverted
+      ((KPolyline) r).getChildren().stream().forEach(c -> errorStyle(c));
     }
-    
-    private static final int CLOUD_WIDTH = 20;
-    public KContainerRendering addCloudIcon(final KContainerRendering parent) {
-        KRectangle figure = _kContainerRenderingExtensions.addRectangle(parent);
-        _kRenderingExtensions.setInvisible(figure, true);
-        
-        KRoundedRectangle roundRectangle = _kContainerRenderingExtensions.addRoundedRectangle(
-                figure, 
-                CLOUD_WIDTH / 7, 
-                CLOUD_WIDTH / 7
-        );
-        _kRenderingExtensions.setBackground(roundRectangle, Colors.GRAY);
-        _kRenderingExtensions.setForeground(roundRectangle, Colors.GRAY);
-        _kRenderingExtensions.setPointPlacementData(roundRectangle, 
-                _kRenderingExtensions.LEFT, 2, 0, 
-                _kRenderingExtensions.TOP, 0, 0.5f, 
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_TOP, 0, 
-                0, CLOUD_WIDTH, CLOUD_WIDTH / 3);
-        
-        KEllipse childEllipse = _kContainerRenderingExtensions.addEllipse(figure);
-        _kRenderingExtensions.setBackground(childEllipse, Colors.GRAY);
-        _kRenderingExtensions.setForeground(childEllipse, Colors.GRAY);
-        _kRenderingExtensions.setPointPlacementData(childEllipse, 
-                _kRenderingExtensions.LEFT, 0, 0f,
-                _kRenderingExtensions.TOP, 0, 0.38f, 
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_TOP, 0, 
-                0, CLOUD_WIDTH / 2.5f, CLOUD_WIDTH / 2.5f);
-        
-        childEllipse = _kContainerRenderingExtensions.addEllipse(figure);
-        _kRenderingExtensions.setBackground(childEllipse, Colors.GRAY);
-        _kRenderingExtensions.setForeground(childEllipse, Colors.GRAY);
-        _kRenderingExtensions.setPointPlacementData(childEllipse, 
-                _kRenderingExtensions.LEFT, 0, 0.5f, 
-                _kRenderingExtensions.TOP, 0, 0.25f, 
-                _kRenderingExtensions.H_RIGHT, _kRenderingExtensions.V_TOP, 0, 
-                0, CLOUD_WIDTH / 3f, CLOUD_WIDTH / 3f);
-        
-        childEllipse = _kContainerRenderingExtensions.addEllipse(figure);
-        _kRenderingExtensions.setBackground(childEllipse, Colors.GRAY);
-        _kRenderingExtensions.setForeground(childEllipse, Colors.GRAY);
-        _kRenderingExtensions.setPointPlacementData(childEllipse, 
-                _kRenderingExtensions.LEFT, 0, 0.4f,
-                _kRenderingExtensions.TOP, CLOUD_WIDTH / 10, 0, 
-                _kRenderingExtensions.H_LEFT, _kRenderingExtensions.V_TOP, 0, 
-                0, CLOUD_WIDTH / 2, CLOUD_WIDTH / 2);
-        
-        return figure;
+  }
+
+  public void commentStyle(KRendering r) {
+    _kRenderingExtensions.setForeground(r, Colors.LIGHT_GOLDENROD);
+    _kRenderingExtensions.setBackground(r, Colors.PALE_GOLDENROD);
+    _kRenderingExtensions.setLineWidth(r, 1);
+    _kRenderingExtensions.setSelectionLineWidth(r, 2);
+
+    if (r.eContainer() instanceof KEdge) { // also color potential arrow heads
+      _kRenderingExtensions.setBackground(r, Colors.LIGHT_GOLDENROD);
+      _kRenderingExtensions.getBackground(r).setPropagateToChildren(true);
+      _kRenderingExtensions.getForeground(r).setPropagateToChildren(true);
+      _kRenderingExtensions.getLineWidth(r).setPropagateToChildren(true);
     }
-    
-    public KRendering addCloudUploadIcon(KContainerRendering parent) {
-        KContainerRendering cloudIcon = addCloudIcon(parent);
-        KPolygon cloudPolygon = _kContainerRenderingExtensions.addPolygon(cloudIcon);
-        _kRenderingExtensions.setBackground(cloudPolygon, Colors.WHITE);
-        _kRenderingExtensions.setForeground(cloudPolygon, Colors.WHITE);
-        cloudPolygon.getPoints().addAll(
+  }
+
+  private static final int CLOUD_WIDTH = 20;
+
+  public KContainerRendering addCloudIcon(final KContainerRendering parent) {
+    KRectangle figure = _kContainerRenderingExtensions.addRectangle(parent);
+    _kRenderingExtensions.setInvisible(figure, true);
+
+    KRoundedRectangle roundRectangle =
+        _kContainerRenderingExtensions.addRoundedRectangle(
+            figure, CLOUD_WIDTH / 7, CLOUD_WIDTH / 7);
+    _kRenderingExtensions.setBackground(roundRectangle, Colors.GRAY);
+    _kRenderingExtensions.setForeground(roundRectangle, Colors.GRAY);
+    _kRenderingExtensions.setPointPlacementData(
+        roundRectangle,
+        _kRenderingExtensions.LEFT,
+        2,
+        0,
+        _kRenderingExtensions.TOP,
+        0,
+        0.5f,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_TOP,
+        0,
+        0,
+        CLOUD_WIDTH,
+        CLOUD_WIDTH / 3);
+
+    KEllipse childEllipse = _kContainerRenderingExtensions.addEllipse(figure);
+    _kRenderingExtensions.setBackground(childEllipse, Colors.GRAY);
+    _kRenderingExtensions.setForeground(childEllipse, Colors.GRAY);
+    _kRenderingExtensions.setPointPlacementData(
+        childEllipse,
+        _kRenderingExtensions.LEFT,
+        0,
+        0f,
+        _kRenderingExtensions.TOP,
+        0,
+        0.38f,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_TOP,
+        0,
+        0,
+        CLOUD_WIDTH / 2.5f,
+        CLOUD_WIDTH / 2.5f);
+
+    childEllipse = _kContainerRenderingExtensions.addEllipse(figure);
+    _kRenderingExtensions.setBackground(childEllipse, Colors.GRAY);
+    _kRenderingExtensions.setForeground(childEllipse, Colors.GRAY);
+    _kRenderingExtensions.setPointPlacementData(
+        childEllipse,
+        _kRenderingExtensions.LEFT,
+        0,
+        0.5f,
+        _kRenderingExtensions.TOP,
+        0,
+        0.25f,
+        _kRenderingExtensions.H_RIGHT,
+        _kRenderingExtensions.V_TOP,
+        0,
+        0,
+        CLOUD_WIDTH / 3f,
+        CLOUD_WIDTH / 3f);
+
+    childEllipse = _kContainerRenderingExtensions.addEllipse(figure);
+    _kRenderingExtensions.setBackground(childEllipse, Colors.GRAY);
+    _kRenderingExtensions.setForeground(childEllipse, Colors.GRAY);
+    _kRenderingExtensions.setPointPlacementData(
+        childEllipse,
+        _kRenderingExtensions.LEFT,
+        0,
+        0.4f,
+        _kRenderingExtensions.TOP,
+        CLOUD_WIDTH / 10,
+        0,
+        _kRenderingExtensions.H_LEFT,
+        _kRenderingExtensions.V_TOP,
+        0,
+        0,
+        CLOUD_WIDTH / 2,
+        CLOUD_WIDTH / 2);
+
+    return figure;
+  }
+
+  public KRendering addCloudUploadIcon(KContainerRendering parent) {
+    KContainerRendering cloudIcon = addCloudIcon(parent);
+    KPolygon cloudPolygon = _kContainerRenderingExtensions.addPolygon(cloudIcon);
+    _kRenderingExtensions.setBackground(cloudPolygon, Colors.WHITE);
+    _kRenderingExtensions.setForeground(cloudPolygon, Colors.WHITE);
+    cloudPolygon
+        .getPoints()
+        .addAll(
             List.of(
-                _kRenderingExtensions.createKPosition(LEFT, -1.5f, 0.5f, TOP, CLOUD_WIDTH / 3, 0.5f),
+                _kRenderingExtensions.createKPosition(
+                    LEFT, -1.5f, 0.5f, TOP, CLOUD_WIDTH / 3, 0.5f),
                 _kRenderingExtensions.createKPosition(LEFT, -1.5f, 0.5f, TOP, 0, 0.58f),
                 _kRenderingExtensions.createKPosition(LEFT, (-4), 0.5f, TOP, 0, 0.58f),
                 _kRenderingExtensions.createKPosition(LEFT, 0, 0.5f, TOP, 0, 0.35f),
                 _kRenderingExtensions.createKPosition(LEFT, 4, 0.5f, TOP, 0, 0.58f),
                 _kRenderingExtensions.createKPosition(LEFT, 1.5f, 0.5f, TOP, 0, 0.58f),
-                _kRenderingExtensions.createKPosition(LEFT, 1.5f, 0.5f, TOP, CLOUD_WIDTH / 3, 0.5f)
-            )
-        );
-        return cloudIcon;
-    }
-    
-    private static LabelDecorationConfigurator _onEdgeLabelConfigurator; // ONLY for use in applyOnEdgeStyle
-    public void applyOnEdgeStyle(KLabel label) {
-        if (_onEdgeLabelConfigurator == null) {
-            LabelDecorationConfigurator configurator = LabelDecorationConfigurator.create().withInlineLabels(true);
-            _onEdgeLabelConfigurator = configurator.withLabelTextRenderingProvider(
-                    (KContainerRendering container, KLabel klabel) -> {
+                _kRenderingExtensions.createKPosition(
+                    LEFT, 1.5f, 0.5f, TOP, CLOUD_WIDTH / 3, 0.5f)));
+    return cloudIcon;
+  }
+
+  private static LabelDecorationConfigurator
+      _onEdgeLabelConfigurator; // ONLY for use in applyOnEdgeStyle
+
+  public void applyOnEdgeStyle(KLabel label) {
+    if (_onEdgeLabelConfigurator == null) {
+      LabelDecorationConfigurator configurator =
+          LabelDecorationConfigurator.create().withInlineLabels(true);
+      _onEdgeLabelConfigurator =
+          configurator.withLabelTextRenderingProvider(
+              (KContainerRendering container, KLabel klabel) -> {
                 KText kText = _kRenderingFactory.createKText();
                 _kRenderingExtensions.setFontSize(kText, 9);
                 container.getChildren().add(kText);
                 return kText;
-            });
-        }
-        _onEdgeLabelConfigurator.applyTo(label);
+              });
     }
-   
-    private static LabelDecorationConfigurator _onEdgeDelayLabelConfigurator; // ONLY for use in applyOnEdgeDelayStyle
-    public void applyOnEdgeDelayStyle(KLabel label) {
-        if (_onEdgeDelayLabelConfigurator == null) {
-            LabelDecorationConfigurator configurator = LabelDecorationConfigurator.create().withInlineLabels(true);
-            configurator = configurator.withLabelTextRenderingProvider(
-                (KContainerRendering container, KLabel klabel) -> {
-                    KText kText = _kRenderingFactory.createKText();
-                    _kRenderingExtensions.setFontSize(kText, 8);
-                    boldTextSelectionStyle(kText);
-                    kText.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, 
-                            klabel.getProperty(KlighdInternalProperties.MODEL_ELEMEMT));
-                    container.getChildren().add(kText);
-                    return kText;
-                }
-            );
-            configurator = configurator.addDecoratorRenderingProvider(new IDecoratorRenderingProvider() {
+    _onEdgeLabelConfigurator.applyTo(label);
+  }
+
+  private static LabelDecorationConfigurator
+      _onEdgeDelayLabelConfigurator; // ONLY for use in applyOnEdgeDelayStyle
+
+  public void applyOnEdgeDelayStyle(KLabel label) {
+    if (_onEdgeDelayLabelConfigurator == null) {
+      LabelDecorationConfigurator configurator =
+          LabelDecorationConfigurator.create().withInlineLabels(true);
+      configurator =
+          configurator.withLabelTextRenderingProvider(
+              (KContainerRendering container, KLabel klabel) -> {
+                KText kText = _kRenderingFactory.createKText();
+                _kRenderingExtensions.setFontSize(kText, 8);
+                boldTextSelectionStyle(kText);
+                kText.setProperty(
+                    KlighdInternalProperties.MODEL_ELEMEMT,
+                    klabel.getProperty(KlighdInternalProperties.MODEL_ELEMEMT));
+                container.getChildren().add(kText);
+                return kText;
+              });
+      configurator =
+          configurator.addDecoratorRenderingProvider(
+              new IDecoratorRenderingProvider() {
                 @Override
                 public ElkPadding createDecoratorRendering(
-                        KContainerRendering container, KLabel label, 
-                        LabelDecorationConfigurator.LayoutMode layoutMode) {
-                    ElkPadding padding =  new ElkPadding();
-                    padding.top = 1;
-                    padding.bottom = 1;
-                    padding.left = 2;
-                    padding.right = 2;
-                    
-                    KPolygon polygon = _kRenderingFactory.createKPolygon();
-                    _kRenderingExtensions.from(polygon, LEFT, (-2), 0, BOTTOM, 0, 0);
-                    _kRenderingExtensions.to(polygon, LEFT, 2, 0, TOP, 0, 0);
-                    _kRenderingExtensions.to(polygon, RIGHT, (-2), 0, TOP, 0, 0);
-                    _kRenderingExtensions.to(polygon, RIGHT, 2, 0, BOTTOM, 0, 0);
-                    _kRenderingExtensions.setBackground(polygon, Colors.WHITE);
-                    _kRenderingExtensions.setForeground(polygon, Colors.WHITE);
-                    container.getChildren().add(polygon);
-                    
-                    KPolyline polyline = _kRenderingFactory.createKPolyline();
-                    _kRenderingExtensions.from(polyline, LEFT, (-2), 0, BOTTOM, 0, 0);
-                    _kRenderingExtensions.to(polyline, LEFT, 2, 0, TOP, 0, 0);
-                    container.getChildren().add(polyline);
-                    
-                    polyline = _kRenderingFactory.createKPolyline();
-                    _kRenderingExtensions.from(polyline, RIGHT, 2, 0, BOTTOM, 0, 0);
-                    _kRenderingExtensions.to(polyline, RIGHT, (-2), 0, TOP, 0, 0);
-                    container.getChildren().add(polyline);
-                    
-                    return padding;
+                    KContainerRendering container,
+                    KLabel label,
+                    LabelDecorationConfigurator.LayoutMode layoutMode) {
+                  ElkPadding padding = new ElkPadding();
+                  padding.top = 1;
+                  padding.bottom = 1;
+                  padding.left = 2;
+                  padding.right = 2;
+
+                  KPolygon polygon = _kRenderingFactory.createKPolygon();
+                  _kRenderingExtensions.from(polygon, LEFT, (-2), 0, BOTTOM, 0, 0);
+                  _kRenderingExtensions.to(polygon, LEFT, 2, 0, TOP, 0, 0);
+                  _kRenderingExtensions.to(polygon, RIGHT, (-2), 0, TOP, 0, 0);
+                  _kRenderingExtensions.to(polygon, RIGHT, 2, 0, BOTTOM, 0, 0);
+                  _kRenderingExtensions.setBackground(polygon, Colors.WHITE);
+                  _kRenderingExtensions.setForeground(polygon, Colors.WHITE);
+                  container.getChildren().add(polygon);
+
+                  KPolyline polyline = _kRenderingFactory.createKPolyline();
+                  _kRenderingExtensions.from(polyline, LEFT, (-2), 0, BOTTOM, 0, 0);
+                  _kRenderingExtensions.to(polyline, LEFT, 2, 0, TOP, 0, 0);
+                  container.getChildren().add(polyline);
+
+                  polyline = _kRenderingFactory.createKPolyline();
+                  _kRenderingExtensions.from(polyline, RIGHT, 2, 0, BOTTOM, 0, 0);
+                  _kRenderingExtensions.to(polyline, RIGHT, (-2), 0, TOP, 0, 0);
+                  container.getChildren().add(polyline);
+
+                  return padding;
                 }
-            });
-            _onEdgeDelayLabelConfigurator = configurator;
-        }
-        _onEdgeDelayLabelConfigurator.applyTo(label);
+              });
+      _onEdgeDelayLabelConfigurator = configurator;
     }
+    _onEdgeDelayLabelConfigurator.applyTo(label);
+  }
 
-    private static LabelDecorationConfigurator _onEdgePysicalDelayLabelConfigurator; // ONLY for use in applyOnEdgePysicalDelayStyle
-    public void applyOnEdgePysicalDelayStyle(KLabel label, Colors parentBackgroundColor) {
-        if (_onEdgePysicalDelayLabelConfigurator == null) {
-            LabelDecorationConfigurator configurator = LabelDecorationConfigurator.create().withInlineLabels(true);
-            configurator = configurator.withLabelTextRenderingProvider(
-                (KContainerRendering container, KLabel klabel) -> {
-                    KText kText = _kRenderingFactory.createKText();
-                    _kRenderingExtensions.setFontSize(kText, 8);
-                    boldTextSelectionStyle(kText);
-                    kText.setProperty(KlighdInternalProperties.MODEL_ELEMEMT,
-                            klabel.getProperty(KlighdInternalProperties.MODEL_ELEMEMT));
-                    container.getChildren().add(kText);
-                    return kText;
-                }
-            );
-            configurator = configurator.addDecoratorRenderingProvider(new IDecoratorRenderingProvider() {
+  private static LabelDecorationConfigurator
+      _onEdgePysicalDelayLabelConfigurator; // ONLY for use in applyOnEdgePysicalDelayStyle
+
+  public void applyOnEdgePysicalDelayStyle(KLabel label, Colors parentBackgroundColor) {
+    if (_onEdgePysicalDelayLabelConfigurator == null) {
+      LabelDecorationConfigurator configurator =
+          LabelDecorationConfigurator.create().withInlineLabels(true);
+      configurator =
+          configurator.withLabelTextRenderingProvider(
+              (KContainerRendering container, KLabel klabel) -> {
+                KText kText = _kRenderingFactory.createKText();
+                _kRenderingExtensions.setFontSize(kText, 8);
+                boldTextSelectionStyle(kText);
+                kText.setProperty(
+                    KlighdInternalProperties.MODEL_ELEMEMT,
+                    klabel.getProperty(KlighdInternalProperties.MODEL_ELEMEMT));
+                container.getChildren().add(kText);
+                return kText;
+              });
+      configurator =
+          configurator.addDecoratorRenderingProvider(
+              new IDecoratorRenderingProvider() {
                 @Override
                 public ElkPadding createDecoratorRendering(
-                        KContainerRendering container, 
-                        KLabel label, 
-                        LabelDecorationConfigurator.LayoutMode layoutMode) {
-                    ElkPadding padding = new ElkPadding();
-                    padding.top = 1;
-                    padding.bottom = 1;
-                    padding.left = 8;
-                    padding.right = 16;
-                    
-                    KPolygon polygon = _kRenderingFactory.createKPolygon();
-                    _kRenderingExtensions.from(polygon, LEFT, 0, 0, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.to(polygon, LEFT, 0, 0, TOP, 1, 0.5f);
-                    _kRenderingExtensions.to(polygon, RIGHT, 0, 0, TOP, 1, 0.5f);
-                    _kRenderingExtensions.to(polygon, RIGHT, 0, 0, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.setBackground(polygon, label.getProperty(LABEL_PARENT_BACKGROUND));
-                    _kRenderingExtensions.setForeground(polygon, label.getProperty(LABEL_PARENT_BACKGROUND));
-                    container.getChildren().add(polygon);
-                    
-                    KSpline kSpline = _kRenderingFactory.createKSpline();
-                    _kRenderingExtensions.from(kSpline, LEFT, -0.66f, 0, BOTTOM, -0.5f, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 1, 0, BOTTOM, -0.5f, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 3, 0, BOTTOM, 8, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 5, 0, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 5.5f, 0, BOTTOM, -1.5f, 0.5f);
-                    container.getChildren().add(kSpline);
-                    
-                    kSpline = _kRenderingFactory.createKSpline();
-                    _kRenderingExtensions.from(kSpline, RIGHT, 15f, 0, BOTTOM, 3.5f, 0.5f);
-                    _kRenderingExtensions.to(kSpline, RIGHT, 14f, 0, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.to(kSpline, RIGHT, 11, 0, BOTTOM, -8, 0.5f);
-                    _kRenderingExtensions.to(kSpline, RIGHT, 9, 0, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.to(kSpline, RIGHT, 7, 0, BOTTOM, 8, 0.5f);
-                    _kRenderingExtensions.to(kSpline, RIGHT, 4f, 0, BOTTOM, 2, 0.5f);
-                    _kRenderingExtensions.to(kSpline, RIGHT, 1.5f, 0, BOTTOM, 0.5f, 0.5f);
-                    _kRenderingExtensions.to(kSpline, RIGHT, 0.2f, 0, BOTTOM, -0.5f, 0.5f);
-                    _kRenderingExtensions.to(kSpline, RIGHT, -0.7f, 0, BOTTOM, -0.5f, 0.5f);
-                    container.getChildren().add(kSpline);
-                    
-                    polygon = _kRenderingFactory.createKPolygon();
-                    _kRenderingExtensions.from(polygon, LEFT, 4, 0, BOTTOM, 0, 0);
-                    _kRenderingExtensions.to(polygon, LEFT, 8, 0, TOP, 0, 0);
-                    _kRenderingExtensions.to(polygon, RIGHT, 12, 0, TOP, 0, 0);
-                    _kRenderingExtensions.to(polygon, RIGHT, 16, 0, BOTTOM, 0, 0);
-                    _kRenderingExtensions.setBackground(polygon, Colors.WHITE);
-                    _kRenderingExtensions.setForeground(polygon, Colors.WHITE);
-                    container.getChildren().add(polygon);
-                    
-                    KPolyline polyline = _kRenderingFactory.createKPolyline();
-                    _kRenderingExtensions.from(polyline, LEFT, 4, 0, BOTTOM, 0, 0);
-                    _kRenderingExtensions.to(polyline, LEFT, 8, 0, TOP, 0, 0);
-                    container.getChildren().add(polyline);
-                    
-                    polyline = _kRenderingFactory.createKPolyline();
-                    _kRenderingExtensions.from(polyline, RIGHT, 16, 0, BOTTOM, 0, 0);
-                    _kRenderingExtensions.to(polyline, RIGHT, 12, 0, TOP, 0, 0);
-                    container.getChildren().add(polyline);
-                    
-                    return padding;
+                    KContainerRendering container,
+                    KLabel label,
+                    LabelDecorationConfigurator.LayoutMode layoutMode) {
+                  ElkPadding padding = new ElkPadding();
+                  padding.top = 1;
+                  padding.bottom = 1;
+                  padding.left = 8;
+                  padding.right = 16;
+
+                  KPolygon polygon = _kRenderingFactory.createKPolygon();
+                  _kRenderingExtensions.from(polygon, LEFT, 0, 0, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.to(polygon, LEFT, 0, 0, TOP, 1, 0.5f);
+                  _kRenderingExtensions.to(polygon, RIGHT, 0, 0, TOP, 1, 0.5f);
+                  _kRenderingExtensions.to(polygon, RIGHT, 0, 0, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.setBackground(
+                      polygon, label.getProperty(LABEL_PARENT_BACKGROUND));
+                  _kRenderingExtensions.setForeground(
+                      polygon, label.getProperty(LABEL_PARENT_BACKGROUND));
+                  container.getChildren().add(polygon);
+
+                  KSpline kSpline = _kRenderingFactory.createKSpline();
+                  _kRenderingExtensions.from(kSpline, LEFT, -0.66f, 0, BOTTOM, -0.5f, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 1, 0, BOTTOM, -0.5f, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 3, 0, BOTTOM, 8, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 5, 0, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 5.5f, 0, BOTTOM, -1.5f, 0.5f);
+                  container.getChildren().add(kSpline);
+
+                  kSpline = _kRenderingFactory.createKSpline();
+                  _kRenderingExtensions.from(kSpline, RIGHT, 15f, 0, BOTTOM, 3.5f, 0.5f);
+                  _kRenderingExtensions.to(kSpline, RIGHT, 14f, 0, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.to(kSpline, RIGHT, 11, 0, BOTTOM, -8, 0.5f);
+                  _kRenderingExtensions.to(kSpline, RIGHT, 9, 0, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.to(kSpline, RIGHT, 7, 0, BOTTOM, 8, 0.5f);
+                  _kRenderingExtensions.to(kSpline, RIGHT, 4f, 0, BOTTOM, 2, 0.5f);
+                  _kRenderingExtensions.to(kSpline, RIGHT, 1.5f, 0, BOTTOM, 0.5f, 0.5f);
+                  _kRenderingExtensions.to(kSpline, RIGHT, 0.2f, 0, BOTTOM, -0.5f, 0.5f);
+                  _kRenderingExtensions.to(kSpline, RIGHT, -0.7f, 0, BOTTOM, -0.5f, 0.5f);
+                  container.getChildren().add(kSpline);
+
+                  polygon = _kRenderingFactory.createKPolygon();
+                  _kRenderingExtensions.from(polygon, LEFT, 4, 0, BOTTOM, 0, 0);
+                  _kRenderingExtensions.to(polygon, LEFT, 8, 0, TOP, 0, 0);
+                  _kRenderingExtensions.to(polygon, RIGHT, 12, 0, TOP, 0, 0);
+                  _kRenderingExtensions.to(polygon, RIGHT, 16, 0, BOTTOM, 0, 0);
+                  _kRenderingExtensions.setBackground(polygon, Colors.WHITE);
+                  _kRenderingExtensions.setForeground(polygon, Colors.WHITE);
+                  container.getChildren().add(polygon);
+
+                  KPolyline polyline = _kRenderingFactory.createKPolyline();
+                  _kRenderingExtensions.from(polyline, LEFT, 4, 0, BOTTOM, 0, 0);
+                  _kRenderingExtensions.to(polyline, LEFT, 8, 0, TOP, 0, 0);
+                  container.getChildren().add(polyline);
+
+                  polyline = _kRenderingFactory.createKPolyline();
+                  _kRenderingExtensions.from(polyline, RIGHT, 16, 0, BOTTOM, 0, 0);
+                  _kRenderingExtensions.to(polyline, RIGHT, 12, 0, TOP, 0, 0);
+                  container.getChildren().add(polyline);
+
+                  return padding;
                 }
-            });
-            _onEdgePysicalDelayLabelConfigurator = configurator;
-        }
-        label.setProperty(LABEL_PARENT_BACKGROUND, parentBackgroundColor);
-        _onEdgePysicalDelayLabelConfigurator.applyTo(label);
+              });
+      _onEdgePysicalDelayLabelConfigurator = configurator;
     }
-    
-    private static LabelDecorationConfigurator _onEdgePysicalLabelConfigurator; // ONLY for use in applyOnEdgePysicalStyle
-    public void applyOnEdgePysicalStyle(KLabel label, Colors parentBackgroundColor) {
-        if (_onEdgePysicalLabelConfigurator == null) {
-            LabelDecorationConfigurator configurator = LabelDecorationConfigurator.create().withInlineLabels(true);
-            configurator = configurator.withLabelTextRenderingProvider(
-                (KContainerRendering container, KLabel klabel) -> {
-                    KText kText = _kRenderingFactory.createKText();
-                    _kRenderingExtensions.setInvisible(kText, true);
-                    container.getChildren().add(kText);
-                    return kText;
-                }
-            );
-            configurator = configurator.addDecoratorRenderingProvider(new IDecoratorRenderingProvider() {
+    label.setProperty(LABEL_PARENT_BACKGROUND, parentBackgroundColor);
+    _onEdgePysicalDelayLabelConfigurator.applyTo(label);
+  }
+
+  private static LabelDecorationConfigurator
+      _onEdgePysicalLabelConfigurator; // ONLY for use in applyOnEdgePysicalStyle
+
+  public void applyOnEdgePysicalStyle(KLabel label, Colors parentBackgroundColor) {
+    if (_onEdgePysicalLabelConfigurator == null) {
+      LabelDecorationConfigurator configurator =
+          LabelDecorationConfigurator.create().withInlineLabels(true);
+      configurator =
+          configurator.withLabelTextRenderingProvider(
+              (KContainerRendering container, KLabel klabel) -> {
+                KText kText = _kRenderingFactory.createKText();
+                _kRenderingExtensions.setInvisible(kText, true);
+                container.getChildren().add(kText);
+                return kText;
+              });
+      configurator =
+          configurator.addDecoratorRenderingProvider(
+              new IDecoratorRenderingProvider() {
                 @Override
-                public ElkPadding createDecoratorRendering(final KContainerRendering container, final KLabel label, final LabelDecorationConfigurator.LayoutMode layoutMode) {
-                    ElkPadding padding = new ElkPadding();
-                    padding.top = 1;
-                    padding.bottom = 1;
-                    padding.left = 3;
-                    padding.right = 3;
-                    
-                    KPolygon polygon = _kRenderingFactory.createKPolygon();
-                    _kRenderingExtensions.from(polygon, LEFT, 0, 0, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.to(polygon, LEFT, 0, 0, TOP, 1, 0.5f);
-                    _kRenderingExtensions.to(polygon, RIGHT, 0, 0, TOP, 1, 0.5f);
-                    _kRenderingExtensions.to(polygon, RIGHT, 0, 0, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.setBackground(polygon, label.getProperty(LABEL_PARENT_BACKGROUND));
-                    _kRenderingExtensions.setForeground(polygon, label.getProperty(LABEL_PARENT_BACKGROUND));
-                    container.getChildren().add(polygon);
-                    
-                    KSpline kSpline = _kRenderingFactory.createKSpline();
-                    _kRenderingExtensions.from(kSpline, LEFT, (-0.66f), 0, BOTTOM, (-0.5f), 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 1, 0, BOTTOM, (-0.5f), 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.1f, BOTTOM, 8, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.2f, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.3f, BOTTOM, (-8), 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.4f, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.45f, BOTTOM, 4f, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.5f, BOTTOM, 8, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.55f, BOTTOM, 4f, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.6f, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.65f, BOTTOM, (-4), 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.7f, BOTTOM, (-8), 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.8f, BOTTOM, (-4), 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0, 0.9f, BOTTOM, 0, 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, (-1), 1, BOTTOM, (-0.5f), 0.5f);
-                    _kRenderingExtensions.to(kSpline, LEFT, 0.66f, 1, BOTTOM, (-0.5f), 0.5f);
-                    container.getChildren().add(kSpline);
-                    return padding;
+                public ElkPadding createDecoratorRendering(
+                    final KContainerRendering container,
+                    final KLabel label,
+                    final LabelDecorationConfigurator.LayoutMode layoutMode) {
+                  ElkPadding padding = new ElkPadding();
+                  padding.top = 1;
+                  padding.bottom = 1;
+                  padding.left = 3;
+                  padding.right = 3;
+
+                  KPolygon polygon = _kRenderingFactory.createKPolygon();
+                  _kRenderingExtensions.from(polygon, LEFT, 0, 0, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.to(polygon, LEFT, 0, 0, TOP, 1, 0.5f);
+                  _kRenderingExtensions.to(polygon, RIGHT, 0, 0, TOP, 1, 0.5f);
+                  _kRenderingExtensions.to(polygon, RIGHT, 0, 0, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.setBackground(
+                      polygon, label.getProperty(LABEL_PARENT_BACKGROUND));
+                  _kRenderingExtensions.setForeground(
+                      polygon, label.getProperty(LABEL_PARENT_BACKGROUND));
+                  container.getChildren().add(polygon);
+
+                  KSpline kSpline = _kRenderingFactory.createKSpline();
+                  _kRenderingExtensions.from(kSpline, LEFT, (-0.66f), 0, BOTTOM, (-0.5f), 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 1, 0, BOTTOM, (-0.5f), 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.1f, BOTTOM, 8, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.2f, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.3f, BOTTOM, (-8), 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.4f, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.45f, BOTTOM, 4f, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.5f, BOTTOM, 8, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.55f, BOTTOM, 4f, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.6f, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.65f, BOTTOM, (-4), 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.7f, BOTTOM, (-8), 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.8f, BOTTOM, (-4), 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0, 0.9f, BOTTOM, 0, 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, (-1), 1, BOTTOM, (-0.5f), 0.5f);
+                  _kRenderingExtensions.to(kSpline, LEFT, 0.66f, 1, BOTTOM, (-0.5f), 0.5f);
+                  container.getChildren().add(kSpline);
+                  return padding;
                 }
-            });
-            _onEdgePysicalLabelConfigurator = configurator;
-        }
-        label.setProperty(LABEL_PARENT_BACKGROUND, parentBackgroundColor);
-        _onEdgePysicalLabelConfigurator.applyTo(label);
+              });
+      _onEdgePysicalLabelConfigurator = configurator;
     }
+    label.setProperty(LABEL_PARENT_BACKGROUND, parentBackgroundColor);
+    _onEdgePysicalLabelConfigurator.applyTo(label);
+  }
 
-    public KRendering addFixedTailArrowDecorator(KPolyline pl) {
-        KRendering head = _kPolylineExtensions.addTailArrowDecorator(pl);
-        KDecoratorPlacementData placement = _kRenderingFactory.createKDecoratorPlacementData();
-        placement.setRotateWithLine(true);
-        placement.setRelative(0f);
-        placement.setAbsolute(2f);
-        placement.setWidth(8);
-        placement.setHeight(6);
-        placement.setXOffset(-3f);
-        placement.setYOffset(-4f);
-        head.setPlacementData(placement);
-        return head;
-    }
-    
-    public void addArrayDecorator(KEdge edge, Integer size) {
-        final KRendering line = _kRenderingExtensions.getKRendering(edge);
-        if (line instanceof KPolyline) {
-            KDecoratorPlacementData placement = _kRenderingFactory.createKDecoratorPlacementData();
-            placement.setRotateWithLine(true);
-            placement.setRelative(0f);
-            placement.setAbsolute(6f);
-            
-            KPolyline slash = _kContainerRenderingExtensions.addChild(
-                    (KContainerRendering) line, 
-                    _kRenderingFactory.createKPolyline());
-            slash.getPoints().add(
-            _kRenderingExtensions.createKPosition(
-                _kRenderingExtensions.RIGHT, 0, 0, 
-                _kRenderingExtensions.TOP, 0, 0)
-            );
-            slash.getPoints().add(
-            _kRenderingExtensions.createKPosition(
-                _kRenderingExtensions.LEFT, 0, 0, 
-                _kRenderingExtensions.BOTTOM, 0, 0)
-            );
-            KDecoratorPlacementData slashPlacement = EcoreUtil.copy(placement);
-            slashPlacement.setWidth(5);
-            slashPlacement.setHeight(10);
-            slashPlacement.setYOffset(-5f);
-            slash.setPlacementData(slashPlacement);
-            
-            if (size != null) {
-                KText num = _kContainerRenderingExtensions.addChild(
-                    (KContainerRendering) line, 
-                    _kRenderingFactory.createKText()
-                );
-                num.setText(size.toString());
-                _kRenderingExtensions.setFontSize(num, 5);
-                noSelectionStyle(num);
-                KDecoratorPlacementData numPlacement = EcoreUtil.copy(placement);
-                numPlacement.setXOffset(2f);
-                num.setPlacementData(numPlacement);
-            }
-        }
+  public KRendering addFixedTailArrowDecorator(KPolyline pl) {
+    KRendering head = _kPolylineExtensions.addTailArrowDecorator(pl);
+    KDecoratorPlacementData placement = _kRenderingFactory.createKDecoratorPlacementData();
+    placement.setRotateWithLine(true);
+    placement.setRelative(0f);
+    placement.setAbsolute(2f);
+    placement.setWidth(8);
+    placement.setHeight(6);
+    placement.setXOffset(-3f);
+    placement.setYOffset(-4f);
+    head.setPlacementData(placement);
+    return head;
+  }
+
+  public void addArrayDecorator(KEdge edge, Integer size) {
+    final KRendering line = _kRenderingExtensions.getKRendering(edge);
+    if (line instanceof KPolyline) {
+      KDecoratorPlacementData placement = _kRenderingFactory.createKDecoratorPlacementData();
+      placement.setRotateWithLine(true);
+      placement.setRelative(0f);
+      placement.setAbsolute(6f);
+
+      KPolyline slash =
+          _kContainerRenderingExtensions.addChild(
+              (KContainerRendering) line, _kRenderingFactory.createKPolyline());
+      slash
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  _kRenderingExtensions.RIGHT, 0, 0, _kRenderingExtensions.TOP, 0, 0));
+      slash
+          .getPoints()
+          .add(
+              _kRenderingExtensions.createKPosition(
+                  _kRenderingExtensions.LEFT, 0, 0, _kRenderingExtensions.BOTTOM, 0, 0));
+      KDecoratorPlacementData slashPlacement = EcoreUtil.copy(placement);
+      slashPlacement.setWidth(5);
+      slashPlacement.setHeight(10);
+      slashPlacement.setYOffset(-5f);
+      slash.setPlacementData(slashPlacement);
+
+      if (size != null) {
+        KText num =
+            _kContainerRenderingExtensions.addChild(
+                (KContainerRendering) line, _kRenderingFactory.createKText());
+        num.setText(size.toString());
+        _kRenderingExtensions.setFontSize(num, 5);
+        noSelectionStyle(num);
+        KDecoratorPlacementData numPlacement = EcoreUtil.copy(placement);
+        numPlacement.setXOffset(2f);
+        num.setPlacementData(numPlacement);
+      }
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/styles/ReactorFigureComponents.java b/org.lflang/src/org/lflang/diagram/synthesis/styles/ReactorFigureComponents.java
index a7ca735f29..aab539926b 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/styles/ReactorFigureComponents.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/styles/ReactorFigureComponents.java
@@ -1,26 +1,24 @@
 /**
  * Copyright (c) 2020, Kiel University.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * <p>Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * <p>1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * <p>2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials provided with
+ * the distribution.
+ *
+ * <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package org.lflang.diagram.synthesis.styles;
 
@@ -31,81 +29,77 @@
 import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
 
 public class ReactorFigureComponents {
-    private final KContainerRendering outer;
+  private final KContainerRendering outer;
 
-    private final KContainerRendering reactor;
+  private final KContainerRendering reactor;
 
-    private final List<KRendering> figures;
+  private final List<KRendering> figures;
 
-    public ReactorFigureComponents(KContainerRendering outer, 
-                                   KContainerRendering reactor,
-                                   List<KRendering> figures) {
-        super();
-        this.outer = outer;
-        this.reactor = reactor;
-        this.figures = figures;
-    }
+  public ReactorFigureComponents(
+      KContainerRendering outer, KContainerRendering reactor, List<KRendering> figures) {
+    super();
+    this.outer = outer;
+    this.reactor = reactor;
+    this.figures = figures;
+  }
 
-    @Override
-    @Pure
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((this.outer== null) ? 0 : this.outer.hashCode());
-        result = prime * result + ((this.reactor== null) ? 0 : this.reactor.hashCode());
-        return prime * result + ((this.figures== null) ? 0 : this.figures.hashCode());
-    }
+  @Override
+  @Pure
+  public int hashCode() {
+    final int prime = 31;
+    int result = 1;
+    result = prime * result + ((this.outer == null) ? 0 : this.outer.hashCode());
+    result = prime * result + ((this.reactor == null) ? 0 : this.reactor.hashCode());
+    return prime * result + ((this.figures == null) ? 0 : this.figures.hashCode());
+  }
 
-    @Override
-    @Pure
-    public boolean equals(final Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        ReactorFigureComponents other = (ReactorFigureComponents) obj;
-        if (this.outer == null && other.outer != null) {
-            return false;
-        } else if (!this.outer.equals(other.outer)) {
-            return false;
-        }
-        if (this.reactor == null && other.reactor != null) {
-            return false;
-        } else if (!this.reactor.equals(other.reactor)) {
-            return false;
-        }
-        if (this.figures == null && other.figures != null) {
-            return false;
-        } else if (!this.figures.equals(other.figures)) {
-            return false;
-        }
-        return true;
+  @Override
+  @Pure
+  public boolean equals(final Object obj) {
+    if (this == obj) return true;
+    if (obj == null) return false;
+    if (getClass() != obj.getClass()) return false;
+    ReactorFigureComponents other = (ReactorFigureComponents) obj;
+    if (this.outer == null && other.outer != null) {
+      return false;
+    } else if (!this.outer.equals(other.outer)) {
+      return false;
     }
-
-    @Override
-    @Pure
-    public String toString() {
-        ToStringBuilder b = new ToStringBuilder(this);
-        b.add("outer", this.outer);
-        b.add("reactor", this.reactor);
-        b.add("figures", this.figures);
-        return b.toString();
+    if (this.reactor == null && other.reactor != null) {
+      return false;
+    } else if (!this.reactor.equals(other.reactor)) {
+      return false;
     }
-
-    @Pure
-    public KContainerRendering getOuter() {
-        return this.outer;
+    if (this.figures == null && other.figures != null) {
+      return false;
+    } else if (!this.figures.equals(other.figures)) {
+      return false;
     }
+    return true;
+  }
 
-    @Pure
-    public KContainerRendering getReactor() {
-        return this.reactor;
-    }
+  @Override
+  @Pure
+  public String toString() {
+    ToStringBuilder b = new ToStringBuilder(this);
+    b.add("outer", this.outer);
+    b.add("reactor", this.reactor);
+    b.add("figures", this.figures);
+    return b.toString();
+  }
 
-    @Pure
-    public List<KRendering> getFigures() {
-        return this.figures;
-    }
+  @Pure
+  public KContainerRendering getOuter() {
+    return this.outer;
+  }
+
+  @Pure
+  public KContainerRendering getReactor() {
+    return this.reactor;
+  }
+
+  @Pure
+  public List<KRendering> getFigures() {
+    return this.figures;
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/util/CycleVisualization.java b/org.lflang/src/org/lflang/diagram/synthesis/util/CycleVisualization.java
index 0fc52b0665..4fb313fe4b 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/util/CycleVisualization.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/util/CycleVisualization.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.util;
 
 import com.google.common.collect.HashMultimap;
@@ -43,115 +43,114 @@
 
 /**
  * Dependency cycle detection for Lingua Franca diagrams.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 @ViewSynthesisShared
 public class CycleVisualization extends AbstractSynthesisExtensions {
-    
-    // Properties for marking diagram elements
-    public static final Property<Boolean> DEPENDENCY_CYCLE = new Property<>("org.lflang.diagram.synthesis.dependency.cycle", false);
 
-    @Inject @Extension private UtilityExtensions _utilityExtensions;
-    
-    /**
-     * Performs cycle detection based on the diagram's graph structure and applies given highlighting to the included elements
-     */
-    public boolean detectAndHighlightCycles(ReactorInstance rootReactorInstance, 
-            Map<ReactorInstance, KNode> allReactorNodes, 
-            Consumer<KGraphElement> highlighter) {
-        
-        if (rootReactorInstance.hasCycles() && highlighter != null) {
-            // Highlight cycles
-            // A cycle consists of reactions and ports.
-            HashMultimap<ReactorInstance, NamedInstance<?>> cycleElementsByReactor = HashMultimap.create();
-            Set<NamedInstance<?>> cycles = rootReactorInstance.getCycles();
-            for (NamedInstance<?> element : cycles) {
-                // First find the involved reactor instances
-                if (element instanceof ReactorInstance) {
-                    cycleElementsByReactor.put((ReactorInstance) element, element);
-                } else {
-                    cycleElementsByReactor.put(element.getParent(), element);
-                }
-            }
-                
-            for (ReactorInstance reactor  : cycleElementsByReactor.keySet()) {
-                KNode node = allReactorNodes.get(reactor);
-                if (node != null) {
-                    node.setProperty(DEPENDENCY_CYCLE, true);
-                    highlighter.accept(node);
+  // Properties for marking diagram elements
+  public static final Property<Boolean> DEPENDENCY_CYCLE =
+      new Property<>("org.lflang.diagram.synthesis.dependency.cycle", false);
+
+  @Inject @Extension private UtilityExtensions _utilityExtensions;
 
-                    Set<NamedInstance<?>> reactorContentInCycle = cycleElementsByReactor.get(reactor);
-                    
-                    // Reactor edges
-                    for (KEdge edge : node.getOutgoingEdges()) {
-                        if (connectsCycleElements(edge, cycles)) {
-                            edge.setProperty(DEPENDENCY_CYCLE, true);
-                            highlighter.accept(edge);
-                        }
-                    }
+  /**
+   * Performs cycle detection based on the diagram's graph structure and applies given highlighting
+   * to the included elements
+   */
+  public boolean detectAndHighlightCycles(
+      ReactorInstance rootReactorInstance,
+      Map<ReactorInstance, KNode> allReactorNodes,
+      Consumer<KGraphElement> highlighter) {
 
-                    // Reactor ports
-                    for (KPort port : node.getPorts()) {
-                        if (reactorContentInCycle.contains(NamedInstanceUtil.getLinkedInstance(port))) {
-                            port.setProperty(DEPENDENCY_CYCLE, true);
-                            highlighter.accept(port);
-                        }
-                    }
+    if (rootReactorInstance.hasCycles() && highlighter != null) {
+      // Highlight cycles
+      // A cycle consists of reactions and ports.
+      HashMultimap<ReactorInstance, NamedInstance<?>> cycleElementsByReactor =
+          HashMultimap.create();
+      Set<NamedInstance<?>> cycles = rootReactorInstance.getCycles();
+      for (NamedInstance<?> element : cycles) {
+        // First find the involved reactor instances
+        if (element instanceof ReactorInstance) {
+          cycleElementsByReactor.put((ReactorInstance) element, element);
+        } else {
+          cycleElementsByReactor.put(element.getParent(), element);
+        }
+      }
 
-                    // Child Nodes
-                    for (KNode childNode : node.getChildren()) {
-                        if (reactorContentInCycle.contains(NamedInstanceUtil.getLinkedInstance(childNode)) && 
-                                !_utilityExtensions.sourceIsReactor(childNode)) {
-                            childNode.setProperty(DEPENDENCY_CYCLE, true);
-                            highlighter.accept(childNode);
+      for (ReactorInstance reactor : cycleElementsByReactor.keySet()) {
+        KNode node = allReactorNodes.get(reactor);
+        if (node != null) {
+          node.setProperty(DEPENDENCY_CYCLE, true);
+          highlighter.accept(node);
+
+          Set<NamedInstance<?>> reactorContentInCycle = cycleElementsByReactor.get(reactor);
+
+          // Reactor edges
+          for (KEdge edge : node.getOutgoingEdges()) {
+            if (connectsCycleElements(edge, cycles)) {
+              edge.setProperty(DEPENDENCY_CYCLE, true);
+              highlighter.accept(edge);
+            }
+          }
 
-                            for (KEdge edge : childNode.getOutgoingEdges()) {
-                                if (connectsCycleElements(edge, cycles)) {
-                                    edge.setProperty(DEPENDENCY_CYCLE, true);
-                                    highlighter.accept(edge);
-                                }
-                            }
-                        }
-                    }
+          // Reactor ports
+          for (KPort port : node.getPorts()) {
+            if (reactorContentInCycle.contains(NamedInstanceUtil.getLinkedInstance(port))) {
+              port.setProperty(DEPENDENCY_CYCLE, true);
+              highlighter.accept(port);
+            }
+          }
+
+          // Child Nodes
+          for (KNode childNode : node.getChildren()) {
+            if (reactorContentInCycle.contains(NamedInstanceUtil.getLinkedInstance(childNode))
+                && !_utilityExtensions.sourceIsReactor(childNode)) {
+              childNode.setProperty(DEPENDENCY_CYCLE, true);
+              highlighter.accept(childNode);
+
+              for (KEdge edge : childNode.getOutgoingEdges()) {
+                if (connectsCycleElements(edge, cycles)) {
+                  edge.setProperty(DEPENDENCY_CYCLE, true);
+                  highlighter.accept(edge);
                 }
+              }
             }
-            return true;
-         }
-         return false;
-    }
-    
-    /**
-     * Checks whether an edge connects two elements that are part of the cycle.
-     * Assumes that the source node is always part of the cycle!
-     */
-    private boolean connectsCycleElements(KEdge edge, Set<NamedInstance<?>> cycle) {
-        return (
-                // if source is not a reactor, there is nothing to check
-                !_utilityExtensions.sourceIsReactor(edge.getSource())
-                ||
-                // otherwise, the source port must be on the cycle
-                cycle.contains(NamedInstanceUtil.getLinkedInstance(edge.getSourcePort()))
-            ) && (
-                // leads to reactor port in cycle
-                _utilityExtensions.sourceIsReactor(edge.getTarget()) 
-                && 
-                cycle.contains(NamedInstanceUtil.getLinkedInstance(edge.getTargetPort()))
-                ||
-                // leads to reaction in cycle
-                !_utilityExtensions.sourceIsReactor(edge.getTarget()) 
-                && 
-                cycle.contains(NamedInstanceUtil.getLinkedInstance(edge.getTarget()))
-            ) && (
-                // Special case only for connections
-                !(_utilityExtensions.sourceElement(edge) instanceof Connection)
-                || (
-                    // If the edge represents a connections between two ports in the cycle (checked before),
-                    // then it is only included in the actual cycle, if it is neither delayed nor physical.
-                    ((Connection) _utilityExtensions.sourceElement(edge)).getDelay() == null
-                    &&
-                    !((Connection) _utilityExtensions.sourceElement(edge)).isPhysical()
-                )
-            );
+          }
+        }
+      }
+      return true;
     }
+    return false;
+  }
+
+  /**
+   * Checks whether an edge connects two elements that are part of the cycle. Assumes that the
+   * source node is always part of the cycle!
+   */
+  private boolean connectsCycleElements(KEdge edge, Set<NamedInstance<?>> cycle) {
+    return (
+        // if source is not a reactor, there is nothing to check
+        !_utilityExtensions.sourceIsReactor(edge.getSource())
+            ||
+            // otherwise, the source port must be on the cycle
+            cycle.contains(NamedInstanceUtil.getLinkedInstance(edge.getSourcePort())))
+        && (
+        // leads to reactor port in cycle
+        _utilityExtensions.sourceIsReactor(edge.getTarget())
+                && cycle.contains(NamedInstanceUtil.getLinkedInstance(edge.getTargetPort()))
+            ||
+            // leads to reaction in cycle
+            !_utilityExtensions.sourceIsReactor(edge.getTarget())
+                && cycle.contains(NamedInstanceUtil.getLinkedInstance(edge.getTarget())))
+        && (
+        // Special case only for connections
+        !(_utilityExtensions.sourceElement(edge) instanceof Connection)
+            || (
+            // If the edge represents a connections between two ports in the cycle (checked before),
+            // then it is only included in the actual cycle, if it is neither delayed nor physical.
+            ((Connection) _utilityExtensions.sourceElement(edge)).getDelay() == null
+                && !((Connection) _utilityExtensions.sourceElement(edge)).isPhysical()));
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/util/InterfaceDependenciesVisualization.java b/org.lflang/src/org/lflang/diagram/synthesis/util/InterfaceDependenciesVisualization.java
index 41635fb7c7..e3de923847 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/util/InterfaceDependenciesVisualization.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/util/InterfaceDependenciesVisualization.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.util;
 
 import com.google.common.collect.ImmutableList;
@@ -64,143 +64,177 @@
 
 /**
  * Utility class to handle dependency edges for collapsed reactors in Lingua Franca diagrams.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 @ViewSynthesisShared
 public class InterfaceDependenciesVisualization extends AbstractSynthesisExtensions {
-    
-    // Related synthesis option
-    public static final SynthesisOption SHOW_INTERFACE_DEPENDENCIES = SynthesisOption.createCheckOption("Port Dependencies in Collapsed Reactors", false).setCategory(LinguaFrancaSynthesis.APPEARANCE);
-    
-    // Properties for marking diagram elements
-    public static final Property<Boolean> INTERFACE_DEPENDENCY = new Property<>("org.lflang.linguafranca.diagram.synthesis.dependency.interface", false);
-  
-    @Inject @Extension private KEdgeExtensions _kEdgeExtensions;
-    @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
-    @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
-    @Inject @Extension private LinguaFrancaStyleExtensions _linguaFrancaStyleExtensions;
-    @Inject @Extension private UtilityExtensions _utilityExtensions;
-    
-    /**
-     * Updates the visibility of interface dependencies edges based on the expansion state.
-     */
-    public static void updateInterfaceDependencyVisibility(KNode node, boolean expanded) {
-        Iterable<KEdge> edges = IterableExtensions.filter(node.getOutgoingEdges(),  it -> {
-            return it.getProperty(INTERFACE_DEPENDENCY);
-        });
-        
-        Iterable<Iterable<KRendering>> renders = IterableExtensions.map(edges, (KEdge it) -> {
-            return Iterables.<KRendering>filter(it.getData(), KRendering.class);
-        });
-        
-        Iterables.concat(renders).forEach(
+
+  // Related synthesis option
+  public static final SynthesisOption SHOW_INTERFACE_DEPENDENCIES =
+      SynthesisOption.createCheckOption("Port Dependencies in Collapsed Reactors", false)
+          .setCategory(LinguaFrancaSynthesis.APPEARANCE);
+
+  // Properties for marking diagram elements
+  public static final Property<Boolean> INTERFACE_DEPENDENCY =
+      new Property<>("org.lflang.linguafranca.diagram.synthesis.dependency.interface", false);
+
+  @Inject @Extension private KEdgeExtensions _kEdgeExtensions;
+  @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
+  @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
+  @Inject @Extension private LinguaFrancaStyleExtensions _linguaFrancaStyleExtensions;
+  @Inject @Extension private UtilityExtensions _utilityExtensions;
+
+  /** Updates the visibility of interface dependencies edges based on the expansion state. */
+  public static void updateInterfaceDependencyVisibility(KNode node, boolean expanded) {
+    Iterable<KEdge> edges =
+        IterableExtensions.filter(
+            node.getOutgoingEdges(),
             it -> {
-                KInvisibility inv = IterableExtensions.last(Iterables.filter(it.getStyles(), KInvisibility.class));
-                if (inv == null) {
-                    inv = KRenderingFactory.eINSTANCE.createKInvisibility();
-                    it.getStyles().add(inv);
-                }
-                inv.setInvisible(expanded);
-            }
-        );
-    }
+              return it.getProperty(INTERFACE_DEPENDENCY);
+            });
+
+    Iterable<Iterable<KRendering>> renders =
+        IterableExtensions.map(
+            edges,
+            (KEdge it) -> {
+              return Iterables.<KRendering>filter(it.getData(), KRendering.class);
+            });
+
+    Iterables.concat(renders)
+        .forEach(
+            it -> {
+              KInvisibility inv =
+                  IterableExtensions.last(Iterables.filter(it.getStyles(), KInvisibility.class));
+              if (inv == null) {
+                inv = KRenderingFactory.eINSTANCE.createKInvisibility();
+                it.getStyles().add(inv);
+              }
+              inv.setInvisible(expanded);
+            });
+  }
+
+  /**
+   * Adds interface dependencies to the node if this option is active. Visibility will be adjusted
+   * based on expansion state.
+   */
+  public Spacing addInterfaceDependencies(KNode node, boolean expanded) {
+    Spacing marginInit = null;
+    if (getBooleanValue(SHOW_INTERFACE_DEPENDENCIES)) {
+      List<Pair<KPort, KPort>> deps = getPortDependencies(node);
+      if (!deps.isEmpty()) {
+        for (Pair<KPort, KPort> pair : deps) {
+          createDependencyEdge(pair, expanded);
+        }
 
-    /**
-     * Adds interface dependencies to the node if this option is active.
-     * Visibility will be adjusted based on expansion state.
-     */
-    public Spacing addInterfaceDependencies(KNode node, boolean expanded) {
-        Spacing marginInit = null;
-        if (getBooleanValue(SHOW_INTERFACE_DEPENDENCIES)) {
-            List<Pair<KPort, KPort>> deps = getPortDependencies(node);
-            if (!deps.isEmpty()) {
-                for (Pair<KPort, KPort> pair : deps) {
-                    createDependencyEdge(pair, expanded);
-                }
-                
-                // Fix content (label) of collapsed rendering
-                KContainerRendering contentContainer = IterableExtensions.findFirst(
-                        Iterables.filter(node.getData(), KContainerRendering.class), 
-                        it -> { return it.getProperty(KlighdProperties.COLLAPSED_RENDERING); }
-                );
-                if (contentContainer != null) {
-                    if (!contentContainer.getProperty(LinguaFrancaShapeExtensions.REACTOR_CONTENT_CONTAINER)) {
-                        contentContainer = IteratorExtensions.findFirst(
-                            Iterators.filter(contentContainer.eAllContents(), KContainerRendering.class), 
-                            it -> { return it.getProperty(LinguaFrancaShapeExtensions.REACTOR_CONTENT_CONTAINER); }
-                        );
-                    }
-                    if (contentContainer != null) {
-                        List<KRendering> content = ImmutableList.copyOf(contentContainer.getChildren());
-                        // Put into two new containers such that they are not centered/maximized
-                        KRectangle firstContainer = _kContainerRenderingExtensions.addRectangle(contentContainer);
-                        _kRenderingExtensions.setInvisible(firstContainer, true);
-                        
-                        KRectangle secondContainer = _kContainerRenderingExtensions.addRectangle(firstContainer);
-                        _kRenderingExtensions.setInvisible(secondContainer, true);
-                        _kContainerRenderingExtensions.setGridPlacement(secondContainer, 1);
-                        Iterables.addAll(secondContainer.getChildren(), content);
-                        _kRenderingExtensions.setPointPlacementData(secondContainer, 
-                                _kRenderingExtensions.LEFT, 0, 0.5f, 
-                                _kRenderingExtensions.TOP, 0, 0, 
-                                _kRenderingExtensions.H_CENTRAL, _kRenderingExtensions.V_TOP, 0, 
-                                0, 0, 0);
-                      
-                        
-                        // Adjust ports separate dependency edges from label/content
-                        if (content.size() > 0) {
-                            marginInit = _utilityExtensions.getPortMarginsInitIfAbsent(node).add(
-                                new ElkMargin((content.size() * 20) - 8, 0, 0, 0)
-                            );
-                        }
-                    }
-                }
+        // Fix content (label) of collapsed rendering
+        KContainerRendering contentContainer =
+            IterableExtensions.findFirst(
+                Iterables.filter(node.getData(), KContainerRendering.class),
+                it -> {
+                  return it.getProperty(KlighdProperties.COLLAPSED_RENDERING);
+                });
+        if (contentContainer != null) {
+          if (!contentContainer.getProperty(
+              LinguaFrancaShapeExtensions.REACTOR_CONTENT_CONTAINER)) {
+            contentContainer =
+                IteratorExtensions.findFirst(
+                    Iterators.filter(contentContainer.eAllContents(), KContainerRendering.class),
+                    it -> {
+                      return it.getProperty(LinguaFrancaShapeExtensions.REACTOR_CONTENT_CONTAINER);
+                    });
+          }
+          if (contentContainer != null) {
+            List<KRendering> content = ImmutableList.copyOf(contentContainer.getChildren());
+            // Put into two new containers such that they are not centered/maximized
+            KRectangle firstContainer =
+                _kContainerRenderingExtensions.addRectangle(contentContainer);
+            _kRenderingExtensions.setInvisible(firstContainer, true);
+
+            KRectangle secondContainer =
+                _kContainerRenderingExtensions.addRectangle(firstContainer);
+            _kRenderingExtensions.setInvisible(secondContainer, true);
+            _kContainerRenderingExtensions.setGridPlacement(secondContainer, 1);
+            Iterables.addAll(secondContainer.getChildren(), content);
+            _kRenderingExtensions.setPointPlacementData(
+                secondContainer,
+                _kRenderingExtensions.LEFT,
+                0,
+                0.5f,
+                _kRenderingExtensions.TOP,
+                0,
+                0,
+                _kRenderingExtensions.H_CENTRAL,
+                _kRenderingExtensions.V_TOP,
+                0,
+                0,
+                0,
+                0);
+
+            // Adjust ports separate dependency edges from label/content
+            if (content.size() > 0) {
+              marginInit =
+                  _utilityExtensions
+                      .getPortMarginsInitIfAbsent(node)
+                      .add(new ElkMargin((content.size() * 20) - 8, 0, 0, 0));
             }
+          }
         }
-        return marginInit;
-    }
-    
-    /**
-     * Find dependencies between ports.
-     */
-    private List<Pair<KPort, KPort>> getPortDependencies(KNode node) {
-        Set<KPort> inputPorts = IterableExtensions.toSet(IterableExtensions.filter(
-                node.getPorts(), 
-                it -> { return it.getProperty(LinguaFrancaSynthesis.REACTOR_INPUT); })
-        );
-        Set<KPort> outputPorts = IterableExtensions.toSet(IterableExtensions.filter(
-                node.getPorts(), 
-                it -> { return it.getProperty(LinguaFrancaSynthesis.REACTOR_OUTPUT); })
-        );
-        
-        // FIXME Replace with real logic
-        Random rand = new Random();
-        return IterableExtensions.toList(
-                IterableExtensions.map(IterableExtensions.filter(
-                        Sets.cartesianProduct(inputPorts, outputPorts), 
-                        it -> { return rand.nextBoolean(); }), 
-                it -> { return new Pair<KPort, KPort>(it.get(0), it.get(1)); }));
-    }
-    
-    /**
-     * Create an edges for interface dependencies and adjust visibility based on the expansion state of the node.
-     */
-    private KEdge createDependencyEdge(final Pair<KPort, KPort> connection, final boolean expanded) {
-        KEdge depEdge = _kEdgeExtensions.createEdge();
-        depEdge.setSource(connection.getKey().getNode());
-        depEdge.setSourcePort(connection.getKey());
-        depEdge.setTarget(connection.getValue().getNode());
-        depEdge.setTargetPort(connection.getValue());
-        depEdge.setProperty(InterfaceDependenciesVisualization.INTERFACE_DEPENDENCY, true);
-        depEdge.setProperty(CoreOptions.NO_LAYOUT, true);  // no routing!
-        DiagramSyntheses.suppressSelectability(depEdge);
-        
-        KPolyline polyline = _kEdgeExtensions.addPolyline(depEdge);
-        _kRenderingExtensions.setLineStyle(polyline, LineStyle.DOT);
-        _linguaFrancaStyleExtensions.noSelectionStyle(polyline);
-        _kRenderingExtensions.setInvisible(polyline, expanded); // make sure there is a style to toggle!
-        
-        return depEdge;
+      }
     }
+    return marginInit;
+  }
+
+  /** Find dependencies between ports. */
+  private List<Pair<KPort, KPort>> getPortDependencies(KNode node) {
+    Set<KPort> inputPorts =
+        IterableExtensions.toSet(
+            IterableExtensions.filter(
+                node.getPorts(),
+                it -> {
+                  return it.getProperty(LinguaFrancaSynthesis.REACTOR_INPUT);
+                }));
+    Set<KPort> outputPorts =
+        IterableExtensions.toSet(
+            IterableExtensions.filter(
+                node.getPorts(),
+                it -> {
+                  return it.getProperty(LinguaFrancaSynthesis.REACTOR_OUTPUT);
+                }));
+
+    // FIXME Replace with real logic
+    Random rand = new Random();
+    return IterableExtensions.toList(
+        IterableExtensions.map(
+            IterableExtensions.filter(
+                Sets.cartesianProduct(inputPorts, outputPorts),
+                it -> {
+                  return rand.nextBoolean();
+                }),
+            it -> {
+              return new Pair<KPort, KPort>(it.get(0), it.get(1));
+            }));
+  }
+
+  /**
+   * Create an edges for interface dependencies and adjust visibility based on the expansion state
+   * of the node.
+   */
+  private KEdge createDependencyEdge(final Pair<KPort, KPort> connection, final boolean expanded) {
+    KEdge depEdge = _kEdgeExtensions.createEdge();
+    depEdge.setSource(connection.getKey().getNode());
+    depEdge.setSourcePort(connection.getKey());
+    depEdge.setTarget(connection.getValue().getNode());
+    depEdge.setTargetPort(connection.getValue());
+    depEdge.setProperty(InterfaceDependenciesVisualization.INTERFACE_DEPENDENCY, true);
+    depEdge.setProperty(CoreOptions.NO_LAYOUT, true); // no routing!
+    DiagramSyntheses.suppressSelectability(depEdge);
+
+    KPolyline polyline = _kEdgeExtensions.addPolyline(depEdge);
+    _kRenderingExtensions.setLineStyle(polyline, LineStyle.DOT);
+    _linguaFrancaStyleExtensions.noSelectionStyle(polyline);
+    _kRenderingExtensions.setInvisible(polyline, expanded); // make sure there is a style to toggle!
+
+    return depEdge;
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/util/LayoutPostProcessing.java b/org.lflang/src/org/lflang/diagram/synthesis/util/LayoutPostProcessing.java
index e3264c4b75..33a9b02167 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/util/LayoutPostProcessing.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/util/LayoutPostProcessing.java
@@ -1,33 +1,36 @@
 /*************
-* Copyright (c) 2022, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2022, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.util;
 
+import de.cau.cs.kieler.klighd.SynthesisOption;
+import de.cau.cs.kieler.klighd.kgraph.KNode;
+import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
+import de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
-
 import org.eclipse.elk.alg.layered.components.ComponentOrderingStrategy;
 import org.eclipse.elk.alg.layered.options.CrossingMinimizationStrategy;
 import org.eclipse.elk.alg.layered.options.CycleBreakingStrategy;
@@ -41,326 +44,392 @@
 import org.lflang.diagram.synthesis.LinguaFrancaSynthesis;
 import org.lflang.generator.TriggerInstance.BuiltinTriggerVariable;
 
-import de.cau.cs.kieler.klighd.SynthesisOption;
-import de.cau.cs.kieler.klighd.kgraph.KNode;
-import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
-import de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses;
-
 /**
  * Set layout configuration options for the Lingua Franca diagram synthesis.
- * 
+ *
  * @author Sören Domrös
  */
 @ViewSynthesisShared
 public class LayoutPostProcessing extends AbstractSynthesisExtensions {
 
-    /** Synthesis option to control the order of nodes and edges by model order. */
-    public static final String MODEL_ORDER_OPTION = "Model Order";
-    /** Uses semi-automatic layout. */
-    public static final String LEGACY = "Legacy";
-    /** Only reactions are strictly ordered by their model order. */
-    public static final String STRICT_REACTION_ONLY = "Reactions Only";
-    /** Reactions and reactor are strictly ordered by their model order. */
-    public static final String STRICT = "Reactions and Reactors";
-    /** Reactions and reactors are ordered by their model order if no additional crossing are created. */
-    public static final String TIE_BREAKER = "Optimize Crossings";
-    /**
-     * No crossing minimization is done at all. This requires that actions and timers are sorted based on their model
-     * order.
-     */
-    public static final String FULL_CONTROL = "Full Control";
-    
-    
-    public static final SynthesisOption MODEL_ORDER = 
-            SynthesisOption.createChoiceOption(
-                    MODEL_ORDER_OPTION,
-                    Arrays.asList(TIE_BREAKER, STRICT_REACTION_ONLY, STRICT, FULL_CONTROL),
-                    STRICT_REACTION_ONLY).setCategory(LinguaFrancaSynthesis.LAYOUT);
+  /** Synthesis option to control the order of nodes and edges by model order. */
+  public static final String MODEL_ORDER_OPTION = "Model Order";
+  /** Uses semi-automatic layout. */
+  public static final String LEGACY = "Legacy";
+  /** Only reactions are strictly ordered by their model order. */
+  public static final String STRICT_REACTION_ONLY = "Reactions Only";
+  /** Reactions and reactor are strictly ordered by their model order. */
+  public static final String STRICT = "Reactions and Reactors";
+  /**
+   * Reactions and reactors are ordered by their model order if no additional crossing are created.
+   */
+  public static final String TIE_BREAKER = "Optimize Crossings";
+  /**
+   * No crossing minimization is done at all. This requires that actions and timers are sorted based
+   * on their model order.
+   */
+  public static final String FULL_CONTROL = "Full Control";
 
-    /**
-     * Comparator to sort KNodes based on the textual order of their linked instances.
-     * 
-     * Startup, reset and shutdown actions are not in the model and are handled separately:
-     * Startup actions will always be first.
-     * Reset actions follow after the startup action.
-     * Shutdown is always sorted last. However, shutdown actions will not have a model order set and are, therefore,
-     * implicitly ordered by their connection.
-     */
-    public static final Comparator<KNode> TEXTUAL_ORDER = new Comparator<KNode>() {
+  public static final SynthesisOption MODEL_ORDER =
+      SynthesisOption.createChoiceOption(
+              MODEL_ORDER_OPTION,
+              Arrays.asList(TIE_BREAKER, STRICT_REACTION_ONLY, STRICT, FULL_CONTROL),
+              STRICT_REACTION_ONLY)
+          .setCategory(LinguaFrancaSynthesis.LAYOUT);
+
+  /**
+   * Comparator to sort KNodes based on the textual order of their linked instances.
+   *
+   * <p>Startup, reset and shutdown actions are not in the model and are handled separately: Startup
+   * actions will always be first. Reset actions follow after the startup action. Shutdown is always
+   * sorted last. However, shutdown actions will not have a model order set and are, therefore,
+   * implicitly ordered by their connection.
+   */
+  public static final Comparator<KNode> TEXTUAL_ORDER =
+      new Comparator<KNode>() {
 
         @Override
         public int compare(KNode node1, KNode node2) {
-            var pos1 = getTextPosition(node1);
-            var pos2 = getTextPosition(node2);
-            if (pos1 >= 0 && pos1 >= 0) {
-                return Integer.compare(pos1, pos2); // textual order
-            } else if (pos1 >= 0) {
-                return -1; // unassociated elements last
-            } else if (pos2 >= 0) {
-                return 1; // unassociated elements last
-            }
-            return Integer.compare(node1.hashCode(), node2.hashCode()); // any stable order between unassociated elements
+          var pos1 = getTextPosition(node1);
+          var pos2 = getTextPosition(node2);
+          if (pos1 >= 0 && pos1 >= 0) {
+            return Integer.compare(pos1, pos2); // textual order
+          } else if (pos1 >= 0) {
+            return -1; // unassociated elements last
+          } else if (pos2 >= 0) {
+            return 1; // unassociated elements last
+          }
+          return Integer.compare(
+              node1.hashCode(), node2.hashCode()); // any stable order between unassociated elements
         }
-        
+
         private int getTextPosition(KNode node) {
-            var instance = NamedInstanceUtil.getLinkedInstance(node);
-            if (instance != null) {
-                var definition = instance.getDefinition();
-                if (definition instanceof BuiltinTriggerVariable) {
-                    // special handling for built-in triggers
-                    switch(((BuiltinTriggerVariable)definition).type) {
-                        case STARTUP: return 0; // first
-                        case RESET: return 1; // second
-                        case SHUTDOWN: return Integer.MAX_VALUE; // last
-                    }
-                } else if (definition instanceof EObject) {
-                    var ast = NodeModelUtils.getNode((EObject) definition);
-                    if (ast != null) {
-                        return ast.getOffset();
-                    }
-                }
+          var instance = NamedInstanceUtil.getLinkedInstance(node);
+          if (instance != null) {
+            var definition = instance.getDefinition();
+            if (definition instanceof BuiltinTriggerVariable) {
+              // special handling for built-in triggers
+              switch (((BuiltinTriggerVariable) definition).type) {
+                case STARTUP:
+                  return 0; // first
+                case RESET:
+                  return 1; // second
+                case SHUTDOWN:
+                  return Integer.MAX_VALUE; // last
+              }
+            } else if (definition instanceof EObject) {
+              var ast = NodeModelUtils.getNode((EObject) definition);
+              if (ast != null) {
+                return ast.getOffset();
+              }
             }
-            return -1;
+          }
+          return -1;
         }
-    };
+      };
 
-    /**
-     * Configures layout options for main reactor.
-     * 
-     * @param node The KNode of the main reactor.
-     */
-    public void configureMainReactor(KNode node) {
-        configureReactor(node);
-    }
+  /**
+   * Configures layout options for main reactor.
+   *
+   * @param node The KNode of the main reactor.
+   */
+  public void configureMainReactor(KNode node) {
+    configureReactor(node);
+  }
 
-    /**
-     * Configures layout options for a reactor.
-     * 
-     * @param node The KNode of a reactor. 
-     */
-    public void configureReactor(KNode node) {
-        String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
-        
-        switch (modelOrderStrategy) {
-            case LEGACY:
-                // Otherwise nodes are not sorted if they are not connected
-                DiagramSyntheses.setLayoutOption(node, CoreOptions.SEPARATE_CONNECTED_COMPONENTS, false);
-                // Needed to enforce node positions.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CROSSING_MINIMIZATION_SEMI_INTERACTIVE, true);
-                // Costs a little more time but layout is quick, therefore, we can do that.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.THOROUGHNESS, 100);
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CROSSING_MINIMIZATION_GREEDY_SWITCH_TYPE, GreedySwitchType.TWO_SIDED);
-                break;
-            case STRICT_REACTION_ONLY:
-                // Only set model order for reactions.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
-                // Do tie-breaking model order cycle breaking. 
-                // Minimize number of backward edges but make decisions based on the model order if no greedy best alternative exists.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CYCLE_BREAKING_STRATEGY, CycleBreakingStrategy.GREEDY_MODEL_ORDER);
-                // Before crossing minimization sort all nodes and edges/ports but also consider the node model order.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_STRATEGY, OrderingStrategy.NODES_AND_EDGES);
-                // Separate connected components should be drawn separately.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.SEPARATE_CONNECTED_COMPONENTS, true);
-                // Component order is enforced by looking at the minimum element with respect to model order of each component.
-                // Remember that the startUp action is always the first node.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS, ComponentOrderingStrategy.FORCE_MODEL_ORDER);
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
+  /**
+   * Configures layout options for a reactor.
+   *
+   * @param node The KNode of a reactor.
+   */
+  public void configureReactor(KNode node) {
+    String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
 
-                // Node order should not change during crossing minimization.
-                // Since only reactions will have a model order set in this approach the order of reactions in their respective
-                // separate connected components always respects the model order.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CROSSING_MINIMIZATION_FORCE_NODE_MODEL_ORDER, true);
-                // Disable greedy switch since this does otherwise change the node order after crossing minimization.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CROSSING_MINIMIZATION_GREEDY_SWITCH_TYPE, GreedySwitchType.OFF);
-                break;
-            case STRICT:
-                // Do tie-breaking model order cycle breaking. 
-                // Minimize number of backward edges but make decisions based on the model order if no greedy best alternative exists.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CYCLE_BREAKING_STRATEGY, CycleBreakingStrategy.GREEDY_MODEL_ORDER);
-                // Before crossing minimization sort all nodes and edges/ports but also consider the node model order.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_STRATEGY, OrderingStrategy.NODES_AND_EDGES);
-                // Separate connected components should be drawn separately.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.SEPARATE_CONNECTED_COMPONENTS, true);
-                // Component order is enforced by looking at the minimum element with respect to model order of each component.
-                // Remember that the startUp action is always the first node.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS, ComponentOrderingStrategy.FORCE_MODEL_ORDER);
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
-                
-                // Node order should not change during crossing minimization.
-                // Since only reactions and reactors will have a model order set in this approach the order of reactions and reactors in their respective
-                // separate connected components always respects the model order.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CROSSING_MINIMIZATION_FORCE_NODE_MODEL_ORDER, true);
-                // Disable greedy switch since this does otherwise change the node order after crossing minimization.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CROSSING_MINIMIZATION_GREEDY_SWITCH_TYPE, GreedySwitchType.OFF);
-                break;
-            case TIE_BREAKER:
-                // Do tie-breaking model order cycle breaking. 
-                // Minimize number of backward edges but make decisions based on the model order if no greedy best alternative exists.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CYCLE_BREAKING_STRATEGY, CycleBreakingStrategy.GREEDY_MODEL_ORDER);
-                // Before crossing minimization sort all nodes and edges/ports but also consider the node model order.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_STRATEGY, OrderingStrategy.NODES_AND_EDGES);
-                // Separate connected components should be drawn separately.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.SEPARATE_CONNECTED_COMPONENTS, true);
-                // Component order is enforced by looking at the minimum element with respect to model order of each component.
-                // Remember that the startUp action is always the first node.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS, ComponentOrderingStrategy.FORCE_MODEL_ORDER);
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
-                // During crossing minimization 10 node order violations are regarded as important as 1 edge crossing.
-                // In reality this chooses the best node order from all tries.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_CROSSING_COUNTER_NODE_INFLUENCE, 0.1);
-                // Increase the number of tries with different starting configurations.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.THOROUGHNESS, 100);
+    switch (modelOrderStrategy) {
+      case LEGACY:
+        // Otherwise nodes are not sorted if they are not connected
+        DiagramSyntheses.setLayoutOption(node, CoreOptions.SEPARATE_CONNECTED_COMPONENTS, false);
+        // Needed to enforce node positions.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CROSSING_MINIMIZATION_SEMI_INTERACTIVE, true);
+        // Costs a little more time but layout is quick, therefore, we can do that.
+        DiagramSyntheses.setLayoutOption(node, LayeredOptions.THOROUGHNESS, 100);
+        DiagramSyntheses.setLayoutOption(
+            node,
+            LayeredOptions.CROSSING_MINIMIZATION_GREEDY_SWITCH_TYPE,
+            GreedySwitchType.TWO_SIDED);
+        break;
+      case STRICT_REACTION_ONLY:
+        // Only set model order for reactions.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
+        // Do tie-breaking model order cycle breaking.
+        // Minimize number of backward edges but make decisions based on the model order if no
+        // greedy best alternative exists.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CYCLE_BREAKING_STRATEGY, CycleBreakingStrategy.GREEDY_MODEL_ORDER);
+        // Before crossing minimization sort all nodes and edges/ports but also consider the node
+        // model order.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_STRATEGY, OrderingStrategy.NODES_AND_EDGES);
+        // Separate connected components should be drawn separately.
+        DiagramSyntheses.setLayoutOption(node, LayeredOptions.SEPARATE_CONNECTED_COMPONENTS, true);
+        // Component order is enforced by looking at the minimum element with respect to model order
+        // of each component.
+        // Remember that the startUp action is always the first node.
+        DiagramSyntheses.setLayoutOption(
+            node,
+            LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS,
+            ComponentOrderingStrategy.FORCE_MODEL_ORDER);
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
 
-                break;
-            case FULL_CONTROL:
-                // Do strict model order cycle breaking. This may introduce unnecessary backward edges.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CYCLE_BREAKING_STRATEGY, CycleBreakingStrategy.MODEL_ORDER);
-                // Before crossing minimization sort all nodes and edges/ports but also consider the node model order.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_STRATEGY, OrderingStrategy.NODES_AND_EDGES);
-                // Separate connected components should be drawn separately.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.SEPARATE_CONNECTED_COMPONENTS, true);
-                // Component order is enforced by looking at the minimum element with respect to model order of each component.
-                // Remember that the startUp action is always the first node.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS, ComponentOrderingStrategy.FORCE_MODEL_ORDER);
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
-                // Disable all kinds of crossing minimization entirely. Just take what is in the model and just do it.
-                // This requires that the list of nodes is not ordered by type, e.g. first all reactions, then all reactors, then all actions, ...
-                // but by their model order. In other approaches ordering actions between the reactions has no effect.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CROSSING_MINIMIZATION_STRATEGY, CrossingMinimizationStrategy.NONE);
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CROSSING_MINIMIZATION_GREEDY_SWITCH_TYPE, GreedySwitchType.OFF);  
-                
-                break;
-            default:
-                // Do nothing.
-        }
-    }
+        // Node order should not change during crossing minimization.
+        // Since only reactions will have a model order set in this approach the order of reactions
+        // in their respective
+        // separate connected components always respects the model order.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CROSSING_MINIMIZATION_FORCE_NODE_MODEL_ORDER, true);
+        // Disable greedy switch since this does otherwise change the node order after crossing
+        // minimization.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CROSSING_MINIMIZATION_GREEDY_SWITCH_TYPE, GreedySwitchType.OFF);
+        break;
+      case STRICT:
+        // Do tie-breaking model order cycle breaking.
+        // Minimize number of backward edges but make decisions based on the model order if no
+        // greedy best alternative exists.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CYCLE_BREAKING_STRATEGY, CycleBreakingStrategy.GREEDY_MODEL_ORDER);
+        // Before crossing minimization sort all nodes and edges/ports but also consider the node
+        // model order.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_STRATEGY, OrderingStrategy.NODES_AND_EDGES);
+        // Separate connected components should be drawn separately.
+        DiagramSyntheses.setLayoutOption(node, LayeredOptions.SEPARATE_CONNECTED_COMPONENTS, true);
+        // Component order is enforced by looking at the minimum element with respect to model order
+        // of each component.
+        // Remember that the startUp action is always the first node.
+        DiagramSyntheses.setLayoutOption(
+            node,
+            LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS,
+            ComponentOrderingStrategy.FORCE_MODEL_ORDER);
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
 
-    /**
-     * Configures layout options for an action.
-     * 
-     * @param node The KNode of an action.
-     */
-    public void configureAction(KNode node) {
-        String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
-        
-        switch (modelOrderStrategy) {
-            case STRICT_REACTION_ONLY:
-            case STRICT:
-            case TIE_BREAKER:
-                // Actions have no model order since their ordering in the model cannot be compared to the order of
-                // for example reactions since they are generally defined below in inputs/outputs and above the reactions.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
-                break;
-            case FULL_CONTROL:
-                // Give actions a model order since they should be controllable too.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, false);
-                break;
-            default:
-                // Do nothing.
-        }
-    }
+        // Node order should not change during crossing minimization.
+        // Since only reactions and reactors will have a model order set in this approach the order
+        // of reactions and reactors in their respective
+        // separate connected components always respects the model order.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CROSSING_MINIMIZATION_FORCE_NODE_MODEL_ORDER, true);
+        // Disable greedy switch since this does otherwise change the node order after crossing
+        // minimization.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CROSSING_MINIMIZATION_GREEDY_SWITCH_TYPE, GreedySwitchType.OFF);
+        break;
+      case TIE_BREAKER:
+        // Do tie-breaking model order cycle breaking.
+        // Minimize number of backward edges but make decisions based on the model order if no
+        // greedy best alternative exists.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CYCLE_BREAKING_STRATEGY, CycleBreakingStrategy.GREEDY_MODEL_ORDER);
+        // Before crossing minimization sort all nodes and edges/ports but also consider the node
+        // model order.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_STRATEGY, OrderingStrategy.NODES_AND_EDGES);
+        // Separate connected components should be drawn separately.
+        DiagramSyntheses.setLayoutOption(node, LayeredOptions.SEPARATE_CONNECTED_COMPONENTS, true);
+        // Component order is enforced by looking at the minimum element with respect to model order
+        // of each component.
+        // Remember that the startUp action is always the first node.
+        DiagramSyntheses.setLayoutOption(
+            node,
+            LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS,
+            ComponentOrderingStrategy.FORCE_MODEL_ORDER);
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
+        // During crossing minimization 10 node order violations are regarded as important as 1 edge
+        // crossing.
+        // In reality this chooses the best node order from all tries.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_CROSSING_COUNTER_NODE_INFLUENCE, 0.1);
+        // Increase the number of tries with different starting configurations.
+        DiagramSyntheses.setLayoutOption(node, LayeredOptions.THOROUGHNESS, 100);
 
-    /**
-     * Configures layout options for a timer.
-     * 
-     * @param node The KNode of a timer.
-     */
-    public void configureTimer(KNode node) {
-        String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
-        
-        switch (modelOrderStrategy) {
-            case STRICT_REACTION_ONLY:
-            case STRICT:
-            case TIE_BREAKER:
-                // Timers have no model order since their ordering in the model cannot be compared to the order of
-                // for example reactions since they are generally defined below in inputs/outputs and above the reactions.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
-                break;
-            case FULL_CONTROL:
-                // Give timers a model order since they should be controllable too.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, false);
-                break;
-            default:
-                // Do nothing.
-        }
+        break;
+      case FULL_CONTROL:
+        // Do strict model order cycle breaking. This may introduce unnecessary backward edges.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CYCLE_BREAKING_STRATEGY, CycleBreakingStrategy.MODEL_ORDER);
+        // Before crossing minimization sort all nodes and edges/ports but also consider the node
+        // model order.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_STRATEGY, OrderingStrategy.NODES_AND_EDGES);
+        // Separate connected components should be drawn separately.
+        DiagramSyntheses.setLayoutOption(node, LayeredOptions.SEPARATE_CONNECTED_COMPONENTS, true);
+        // Component order is enforced by looking at the minimum element with respect to model order
+        // of each component.
+        // Remember that the startUp action is always the first node.
+        DiagramSyntheses.setLayoutOption(
+            node,
+            LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS,
+            ComponentOrderingStrategy.FORCE_MODEL_ORDER);
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
+        // Disable all kinds of crossing minimization entirely. Just take what is in the model and
+        // just do it.
+        // This requires that the list of nodes is not ordered by type, e.g. first all reactions,
+        // then all reactors, then all actions, ...
+        // but by their model order. In other approaches ordering actions between the reactions has
+        // no effect.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CROSSING_MINIMIZATION_STRATEGY, CrossingMinimizationStrategy.NONE);
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CROSSING_MINIMIZATION_GREEDY_SWITCH_TYPE, GreedySwitchType.OFF);
+
+        break;
+      default:
+        // Do nothing.
     }
+  }
+
+  /**
+   * Configures layout options for an action.
+   *
+   * @param node The KNode of an action.
+   */
+  public void configureAction(KNode node) {
+    String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
 
-    /**
-     * Configures layout options for a startup action.
-     * 
-     * @param node The KNode of a startup action.
-     */
-    public void configureStartUp(KNode node) {
-        // Nothing should be done. Model order is considered per default value.
-        // The actual ordering of this node has to be done in the synthesis.
+    switch (modelOrderStrategy) {
+      case STRICT_REACTION_ONLY:
+      case STRICT:
+      case TIE_BREAKER:
+        // Actions have no model order since their ordering in the model cannot be compared to the
+        // order of
+        // for example reactions since they are generally defined below in inputs/outputs and above
+        // the reactions.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
+        break;
+      case FULL_CONTROL:
+        // Give actions a model order since they should be controllable too.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, false);
+        break;
+      default:
+        // Do nothing.
     }
+  }
 
-    /**
-     * Configures layout options for a shutdown action.
-     * 
-     * @param node The KNode of a shutdown action.
-     */
-    public void configureShutDown(KNode node) {
-        String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
-        
-        switch (modelOrderStrategy) {
-            case STRICT_REACTION_ONLY:
-            case STRICT:
-            case TIE_BREAKER:
-            case FULL_CONTROL:
-                // The shutdown node cannot have a high model order, since this would confuse cycle breaking.
-                // It  also cannot have a low model order.
-                // It should have none at all and the other nodes should define its position.
-                // This is no problem since the shutdown node has only outgoing edges.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
-                break;
-            default:
-                // Do nothing.
-        }
+  /**
+   * Configures layout options for a timer.
+   *
+   * @param node The KNode of a timer.
+   */
+  public void configureTimer(KNode node) {
+    String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
+
+    switch (modelOrderStrategy) {
+      case STRICT_REACTION_ONLY:
+      case STRICT:
+      case TIE_BREAKER:
+        // Timers have no model order since their ordering in the model cannot be compared to the
+        // order of
+        // for example reactions since they are generally defined below in inputs/outputs and above
+        // the reactions.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
+        break;
+      case FULL_CONTROL:
+        // Give timers a model order since they should be controllable too.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, false);
+        break;
+      default:
+        // Do nothing.
     }
+  }
+
+  /**
+   * Configures layout options for a startup action.
+   *
+   * @param node The KNode of a startup action.
+   */
+  public void configureStartUp(KNode node) {
+    // Nothing should be done. Model order is considered per default value.
+    // The actual ordering of this node has to be done in the synthesis.
+  }
 
-    /**
-     * Configures layout options for a reaction.
-     * Currently a reaction does not have internal behavior that is visualized and its order is always considered,
-     * therefore, nothing needs to be done.
-     * 
-     * @param node The KNode of a reaction.
-     */
-    public void configureReaction(KNode node) {
-        // Has no internal behavior and model order is set by default.
+  /**
+   * Configures layout options for a shutdown action.
+   *
+   * @param node The KNode of a shutdown action.
+   */
+  public void configureShutDown(KNode node) {
+    String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
+
+    switch (modelOrderStrategy) {
+      case STRICT_REACTION_ONLY:
+      case STRICT:
+      case TIE_BREAKER:
+      case FULL_CONTROL:
+        // The shutdown node cannot have a high model order, since this would confuse cycle
+        // breaking.
+        // It  also cannot have a low model order.
+        // It should have none at all and the other nodes should define its position.
+        // This is no problem since the shutdown node has only outgoing edges.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
+        break;
+      default:
+        // Do nothing.
     }
+  }
 
-    /**
-     * Configures layout options for a dummy node.
-     * 
-     * @param node The KNode of a dummy node.
-     */
-    public void configureDummy(KNode node) {
-        String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
-        
-        switch (modelOrderStrategy) {
-            case STRICT_REACTION_ONLY:
-            case STRICT:
-            case TIE_BREAKER:
-            case FULL_CONTROL:
-                // A dummy node has no model order.
-                DiagramSyntheses.setLayoutOption(node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
-                break;
-            default:
-                // Do nothing.
-        }
+  /**
+   * Configures layout options for a reaction. Currently a reaction does not have internal behavior
+   * that is visualized and its order is always considered, therefore, nothing needs to be done.
+   *
+   * @param node The KNode of a reaction.
+   */
+  public void configureReaction(KNode node) {
+    // Has no internal behavior and model order is set by default.
+  }
+
+  /**
+   * Configures layout options for a dummy node.
+   *
+   * @param node The KNode of a dummy node.
+   */
+  public void configureDummy(KNode node) {
+    String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
+
+    switch (modelOrderStrategy) {
+      case STRICT_REACTION_ONLY:
+      case STRICT:
+      case TIE_BREAKER:
+      case FULL_CONTROL:
+        // A dummy node has no model order.
+        DiagramSyntheses.setLayoutOption(
+            node, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
+        break;
+      default:
+        // Do nothing.
     }
+  }
 
-    /**
-     * Orders a list of nodes by their corresponding linked instance if synthesis option for full control is enabled.
-     * Ordering is done by the {@link #TEXTUAL_ORDER} comparator.
-     * 
-     * @param nodes List of KNodes to be ordered.
-     */
-    public void orderChildren(List<KNode> nodes) {
-        String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
-        if (FULL_CONTROL.equals(modelOrderStrategy)) {
-            nodes.sort(TEXTUAL_ORDER);
-        }
+  /**
+   * Orders a list of nodes by their corresponding linked instance if synthesis option for full
+   * control is enabled. Ordering is done by the {@link #TEXTUAL_ORDER} comparator.
+   *
+   * @param nodes List of KNodes to be ordered.
+   */
+  public void orderChildren(List<KNode> nodes) {
+    String modelOrderStrategy = (String) getObjectValue(MODEL_ORDER);
+    if (FULL_CONTROL.equals(modelOrderStrategy)) {
+      nodes.sort(TEXTUAL_ORDER);
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/util/ModeDiagrams.java b/org.lflang/src/org/lflang/diagram/synthesis/util/ModeDiagrams.java
index 7222df3cf1..18c13e2b1f 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/util/ModeDiagrams.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/util/ModeDiagrams.java
@@ -1,30 +1,62 @@
 /*************
-* Copyright (c) 2021, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2021, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.util;
 
-
+import com.google.common.collect.LinkedHashMultimap;
+import com.google.inject.Inject;
+import de.cau.cs.kieler.klighd.SynthesisOption;
+import de.cau.cs.kieler.klighd.kgraph.KEdge;
+import de.cau.cs.kieler.klighd.kgraph.KIdentifier;
+import de.cau.cs.kieler.klighd.kgraph.KLabel;
+import de.cau.cs.kieler.klighd.kgraph.KNode;
+import de.cau.cs.kieler.klighd.kgraph.KPort;
+import de.cau.cs.kieler.klighd.krendering.Colors;
+import de.cau.cs.kieler.klighd.krendering.HorizontalAlignment;
+import de.cau.cs.kieler.klighd.krendering.KContainerRendering;
+import de.cau.cs.kieler.klighd.krendering.KDecoratorPlacementData;
+import de.cau.cs.kieler.klighd.krendering.KEllipse;
+import de.cau.cs.kieler.klighd.krendering.KPolyline;
+import de.cau.cs.kieler.klighd.krendering.KRectangle;
+import de.cau.cs.kieler.klighd.krendering.KRendering;
+import de.cau.cs.kieler.klighd.krendering.KRenderingFactory;
+import de.cau.cs.kieler.klighd.krendering.KText;
+import de.cau.cs.kieler.klighd.krendering.LineStyle;
+import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
+import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KEdgeExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KLabelExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions;
+import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions;
+import de.cau.cs.kieler.klighd.labels.decoration.ITextRenderingProvider;
+import de.cau.cs.kieler.klighd.labels.decoration.LabelDecorationConfigurator;
+import de.cau.cs.kieler.klighd.labels.decoration.LinesDecorator;
+import de.cau.cs.kieler.klighd.labels.decoration.RectangleDecorator;
+import de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses;
+import de.cau.cs.kieler.klighd.util.KlighdProperties;
 import java.awt.Color;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -33,7 +65,6 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.eclipse.elk.alg.layered.options.CenterEdgeLabelPlacementStrategy;
 import org.eclipse.elk.alg.layered.options.EdgeStraighteningStrategy;
 import org.eclipse.elk.alg.layered.options.FixedAlignment;
@@ -57,8 +88,8 @@
 import org.lflang.diagram.synthesis.styles.LinguaFrancaShapeExtensions;
 import org.lflang.diagram.synthesis.styles.LinguaFrancaStyleExtensions;
 import org.lflang.generator.ModeInstance;
-import org.lflang.generator.NamedInstance;
 import org.lflang.generator.ModeInstance.Transition;
+import org.lflang.generator.NamedInstance;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Action;
 import org.lflang.lf.Mode;
@@ -66,531 +97,648 @@
 import org.lflang.lf.Reactor;
 import org.lflang.lf.Timer;
 
-import com.google.common.collect.LinkedHashMultimap;
-import com.google.inject.Inject;
-
-import de.cau.cs.kieler.klighd.SynthesisOption;
-import de.cau.cs.kieler.klighd.kgraph.KEdge;
-import de.cau.cs.kieler.klighd.kgraph.KIdentifier;
-import de.cau.cs.kieler.klighd.kgraph.KLabel;
-import de.cau.cs.kieler.klighd.kgraph.KNode;
-import de.cau.cs.kieler.klighd.kgraph.KPort;
-import de.cau.cs.kieler.klighd.krendering.Colors;
-import de.cau.cs.kieler.klighd.krendering.HorizontalAlignment;
-import de.cau.cs.kieler.klighd.krendering.KContainerRendering;
-import de.cau.cs.kieler.klighd.krendering.KDecoratorPlacementData;
-import de.cau.cs.kieler.klighd.krendering.KEllipse;
-import de.cau.cs.kieler.klighd.krendering.KPolyline;
-import de.cau.cs.kieler.klighd.krendering.KRectangle;
-import de.cau.cs.kieler.klighd.krendering.KRendering;
-import de.cau.cs.kieler.klighd.krendering.KRenderingFactory;
-import de.cau.cs.kieler.klighd.krendering.KText;
-import de.cau.cs.kieler.klighd.krendering.LineStyle;
-import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
-import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KEdgeExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KLabelExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions;
-import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions;
-import de.cau.cs.kieler.klighd.labels.decoration.ITextRenderingProvider;
-import de.cau.cs.kieler.klighd.labels.decoration.LabelDecorationConfigurator;
-import de.cau.cs.kieler.klighd.labels.decoration.LinesDecorator;
-import de.cau.cs.kieler.klighd.labels.decoration.RectangleDecorator;
-import de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses;
-import de.cau.cs.kieler.klighd.util.KlighdProperties;
-
 /**
  * Transformations to support modes in the Lingua Franca diagram synthesis.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 @ViewSynthesisShared
 public class ModeDiagrams extends AbstractSynthesisExtensions {
-    
-    // Related synthesis option
-    public static final SynthesisOption MODES_CATEGORY = 
-            SynthesisOption.createCategory("Modes", false).setCategory(LinguaFrancaSynthesis.APPEARANCE);
-    public static final SynthesisOption SHOW_TRANSITION_LABELS = 
-            SynthesisOption.createCheckOption("Transition Labels", true).setCategory(MODES_CATEGORY);
-    public static final SynthesisOption INITIALLY_COLLAPSE_MODES = 
-            SynthesisOption.createCheckOption("Initially Collapse Modes", true).setCategory(MODES_CATEGORY);
-    
-    private static final Colors MODE_FG = Colors.SLATE_GRAY;
-    private static final Colors MODE_BG = Colors.SLATE_GRAY_3;
-    private static final int MODE_BG_ALPHA = 50;
-    
-    @Inject @Extension private KNodeExtensions _kNodeExtensions;
-    @Inject @Extension private KEdgeExtensions _kEdgeExtensions;
-    @Inject @Extension private KPortExtensions _kPortExtensions;
-    @Inject @Extension private KLabelExtensions _kLabelExtensions;
-    @Inject @Extension private KPolylineExtensions _kPolylineExtensions;
-    @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
-    @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
-    @Inject @Extension private LinguaFrancaShapeExtensions _linguaFrancaShapeExtensions;
-    @Inject @Extension private LinguaFrancaStyleExtensions _linguaFrancaStyleExtensions;
-    @Inject @Extension private UtilityExtensions _utilityExtensions;
-    @Inject @Extension private LayoutPostProcessing _layoutPostProcessing;
-        
-    @Extension private KRenderingFactory _kRenderingFactory = KRenderingFactory.eINSTANCE;
-    
-    public void handleModes(List<KNode> nodes, ReactorInstance reactor) {
-        if (!reactor.modes.isEmpty()) {
-            var modeNodes = new LinkedHashMap<ModeInstance, KNode>();
-            var modeDefinitionMap = new LinkedHashMap<Mode, ModeInstance>();
-            for (ModeInstance mode : reactor.modes) {
-                var node = _kNodeExtensions.createNode();
-                associateWith(node, mode.getDefinition());
-                NamedInstanceUtil.linkInstance(node, mode);
-                _utilityExtensions.setID(node, mode.uniqueID());
-                
-                modeNodes.put(mode, node);
-                modeDefinitionMap.put(mode.getDefinition(), mode);
-                
-                // Layout
-                if (mode.isInitial()) {
-                    DiagramSyntheses.setLayoutOption(node, LayeredOptions.LAYERING_LAYER_CONSTRAINT, LayerConstraint.FIRST);
-                }
-                // Use general layout configuration of reactors
-                this.<LinguaFrancaSynthesis>getRootSynthesis().configureReactorNodeLayout(node, false); 
-                _layoutPostProcessing.configureReactor(node);
-                // Adjust for modes
-                DiagramSyntheses.setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FREE);
-                
-                var expansionState = MemorizingExpandCollapseAction.getExpansionState(mode);
-                DiagramSyntheses.setLayoutOption(node, KlighdProperties.EXPAND, 
-                        expansionState != null ? expansionState : !this.getBooleanValue(INITIALLY_COLLAPSE_MODES));
-                
-                // Expanded Rectangle
-                var expandFigure = addModeFigure(node, mode, true);
-                expandFigure.setProperty(KlighdProperties.EXPANDED_RENDERING, true);
-                _kRenderingExtensions.addDoubleClickAction(expandFigure, MemorizingExpandCollapseAction.ID);
-                
-                if (getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS)) {
-                    // Collapse button
-                    KText textButton = _linguaFrancaShapeExtensions.addTextButton(expandFigure, LinguaFrancaSynthesis.TEXT_HIDE_ACTION);
-                    _kRenderingExtensions.to(
-                            _kRenderingExtensions.from(_kRenderingExtensions.setGridPlacementData(textButton),
-                                                       _kRenderingExtensions.LEFT, 8, 0, _kRenderingExtensions.TOP, 0, 0),
-                            _kRenderingExtensions.RIGHT, 8, 0, _kRenderingExtensions.BOTTOM, 0, 0);
-                    _kRenderingExtensions.addSingleClickAction(textButton, MemorizingExpandCollapseAction.ID);
-                    _kRenderingExtensions.addDoubleClickAction(textButton, MemorizingExpandCollapseAction.ID);
-                }
-                
-                if (getBooleanValue(LinguaFrancaSynthesis.SHOW_STATE_VARIABLES)) {
-                    // Add mode-local state variables
-                    var variables = mode.getDefinition().getStateVars();
-                    if (!variables.isEmpty()) {
-                        KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(expandFigure);
-                        _kRenderingExtensions.setInvisible(rectangle, true);
-                        if (!getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS)) {
-                            _kRenderingExtensions.to(
-                                    _kRenderingExtensions.from(
-                                            _kRenderingExtensions.setGridPlacementData(rectangle), 
-                                            _kRenderingExtensions.LEFT, 6, 0, 
-                                            _kRenderingExtensions.TOP, 0, 0), 
-                                    _kRenderingExtensions.RIGHT, 6, 0, 
-                                    _kRenderingExtensions.BOTTOM, 4, 0);
-                        } else {
-                            _kRenderingExtensions.to(
-                                    _kRenderingExtensions.from(
-                                            _kRenderingExtensions.setGridPlacementData(rectangle), 
-                                            _kRenderingExtensions.LEFT, 6, 0, 
-                                            _kRenderingExtensions.TOP, 4, 0), 
-                                    _kRenderingExtensions.RIGHT, 6, 0, 
-                                    _kRenderingExtensions.BOTTOM, 0, 0);
-                        }
-                        _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
-                        this.<LinguaFrancaSynthesis>getRootSynthesis().addStateVariableList(rectangle, variables);
-                    }
-                }
-                
-                _kContainerRenderingExtensions.addChildArea(expandFigure);
-    
-                // Collapse Rectangle
-                var collapseFigure = addModeFigure(node, mode, false);
-                collapseFigure.setProperty(KlighdProperties.COLLAPSED_RENDERING, true);
-                if (this.hasContent(mode)) {
-                    _kRenderingExtensions.addDoubleClickAction(collapseFigure, MemorizingExpandCollapseAction.ID);
-                    
-                    if (getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS)) {
-                        // Expand button
-                        KText textButton = _linguaFrancaShapeExtensions.addTextButton(collapseFigure, LinguaFrancaSynthesis.TEXT_SHOW_ACTION);
-                        _kRenderingExtensions.to(_kRenderingExtensions.from(
-                                    _kRenderingExtensions.setGridPlacementData(textButton), 
-                                    _kRenderingExtensions.LEFT, 8, 0, _kRenderingExtensions.TOP, 0, 0), 
-                                _kRenderingExtensions.RIGHT, 8, 0, _kRenderingExtensions.BOTTOM, 8, 0);
-                        _kRenderingExtensions.addSingleClickAction(textButton, MemorizingExpandCollapseAction.ID);
-                        _kRenderingExtensions.addDoubleClickAction(textButton, MemorizingExpandCollapseAction.ID);
-                    }
-                }
+
+  // Related synthesis option
+  public static final SynthesisOption MODES_CATEGORY =
+      SynthesisOption.createCategory("Modes", false).setCategory(LinguaFrancaSynthesis.APPEARANCE);
+  public static final SynthesisOption SHOW_TRANSITION_LABELS =
+      SynthesisOption.createCheckOption("Transition Labels", true).setCategory(MODES_CATEGORY);
+  public static final SynthesisOption INITIALLY_COLLAPSE_MODES =
+      SynthesisOption.createCheckOption("Initially Collapse Modes", true)
+          .setCategory(MODES_CATEGORY);
+
+  private static final Colors MODE_FG = Colors.SLATE_GRAY;
+  private static final Colors MODE_BG = Colors.SLATE_GRAY_3;
+  private static final int MODE_BG_ALPHA = 50;
+
+  @Inject @Extension private KNodeExtensions _kNodeExtensions;
+  @Inject @Extension private KEdgeExtensions _kEdgeExtensions;
+  @Inject @Extension private KPortExtensions _kPortExtensions;
+  @Inject @Extension private KLabelExtensions _kLabelExtensions;
+  @Inject @Extension private KPolylineExtensions _kPolylineExtensions;
+  @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
+  @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
+  @Inject @Extension private LinguaFrancaShapeExtensions _linguaFrancaShapeExtensions;
+  @Inject @Extension private LinguaFrancaStyleExtensions _linguaFrancaStyleExtensions;
+  @Inject @Extension private UtilityExtensions _utilityExtensions;
+  @Inject @Extension private LayoutPostProcessing _layoutPostProcessing;
+
+  @Extension private KRenderingFactory _kRenderingFactory = KRenderingFactory.eINSTANCE;
+
+  public void handleModes(List<KNode> nodes, ReactorInstance reactor) {
+    if (!reactor.modes.isEmpty()) {
+      var modeNodes = new LinkedHashMap<ModeInstance, KNode>();
+      var modeDefinitionMap = new LinkedHashMap<Mode, ModeInstance>();
+      for (ModeInstance mode : reactor.modes) {
+        var node = _kNodeExtensions.createNode();
+        associateWith(node, mode.getDefinition());
+        NamedInstanceUtil.linkInstance(node, mode);
+        _utilityExtensions.setID(node, mode.uniqueID());
+
+        modeNodes.put(mode, node);
+        modeDefinitionMap.put(mode.getDefinition(), mode);
+
+        // Layout
+        if (mode.isInitial()) {
+          DiagramSyntheses.setLayoutOption(
+              node, LayeredOptions.LAYERING_LAYER_CONSTRAINT, LayerConstraint.FIRST);
+        }
+        // Use general layout configuration of reactors
+        this.<LinguaFrancaSynthesis>getRootSynthesis().configureReactorNodeLayout(node, false);
+        _layoutPostProcessing.configureReactor(node);
+        // Adjust for modes
+        DiagramSyntheses.setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FREE);
+
+        var expansionState = MemorizingExpandCollapseAction.getExpansionState(mode);
+        DiagramSyntheses.setLayoutOption(
+            node,
+            KlighdProperties.EXPAND,
+            expansionState != null
+                ? expansionState
+                : !this.getBooleanValue(INITIALLY_COLLAPSE_MODES));
+
+        // Expanded Rectangle
+        var expandFigure = addModeFigure(node, mode, true);
+        expandFigure.setProperty(KlighdProperties.EXPANDED_RENDERING, true);
+        _kRenderingExtensions.addDoubleClickAction(expandFigure, MemorizingExpandCollapseAction.ID);
+
+        if (getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS)) {
+          // Collapse button
+          KText textButton =
+              _linguaFrancaShapeExtensions.addTextButton(
+                  expandFigure, LinguaFrancaSynthesis.TEXT_HIDE_ACTION);
+          _kRenderingExtensions.to(
+              _kRenderingExtensions.from(
+                  _kRenderingExtensions.setGridPlacementData(textButton),
+                  _kRenderingExtensions.LEFT,
+                  8,
+                  0,
+                  _kRenderingExtensions.TOP,
+                  0,
+                  0),
+              _kRenderingExtensions.RIGHT,
+              8,
+              0,
+              _kRenderingExtensions.BOTTOM,
+              0,
+              0);
+          _kRenderingExtensions.addSingleClickAction(textButton, MemorizingExpandCollapseAction.ID);
+          _kRenderingExtensions.addDoubleClickAction(textButton, MemorizingExpandCollapseAction.ID);
+        }
+
+        if (getBooleanValue(LinguaFrancaSynthesis.SHOW_STATE_VARIABLES)) {
+          // Add mode-local state variables
+          var variables = mode.getDefinition().getStateVars();
+          if (!variables.isEmpty()) {
+            KRectangle rectangle = _kContainerRenderingExtensions.addRectangle(expandFigure);
+            _kRenderingExtensions.setInvisible(rectangle, true);
+            if (!getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS)) {
+              _kRenderingExtensions.to(
+                  _kRenderingExtensions.from(
+                      _kRenderingExtensions.setGridPlacementData(rectangle),
+                      _kRenderingExtensions.LEFT,
+                      6,
+                      0,
+                      _kRenderingExtensions.TOP,
+                      0,
+                      0),
+                  _kRenderingExtensions.RIGHT,
+                  6,
+                  0,
+                  _kRenderingExtensions.BOTTOM,
+                  4,
+                  0);
+            } else {
+              _kRenderingExtensions.to(
+                  _kRenderingExtensions.from(
+                      _kRenderingExtensions.setGridPlacementData(rectangle),
+                      _kRenderingExtensions.LEFT,
+                      6,
+                      0,
+                      _kRenderingExtensions.TOP,
+                      4,
+                      0),
+                  _kRenderingExtensions.RIGHT,
+                  6,
+                  0,
+                  _kRenderingExtensions.BOTTOM,
+                  0,
+                  0);
             }
-            
-            var modeChildren =  LinkedHashMultimap.<ModeInstance, KNode>create();
-            var nodeModes =  new HashMap<KNode, ModeInstance>();
-            for (var node : nodes) {
-                var instance = NamedInstanceUtil.getLinkedInstance(node);
-                if (instance == null && node.getProperty(CoreOptions.COMMENT_BOX)) {
-                    var firstEdge = IterableExtensions.<KEdge>head(node.getOutgoingEdges());
-                    if (firstEdge != null && firstEdge.getTarget() != null) {
-                        instance = NamedInstanceUtil.getLinkedInstance(firstEdge.getTarget());
-                    }
-                }
-                if (instance != null) {
-                    var mode = instance.getMode(true);
-                    modeChildren.put(mode, node);
-                    nodeModes.put(node, mode);
-                } else {
-                    modeChildren.put(null, node);
-                }
+            _kRenderingExtensions.setHorizontalAlignment(rectangle, HorizontalAlignment.LEFT);
+            this.<LinguaFrancaSynthesis>getRootSynthesis()
+                .addStateVariableList(rectangle, variables);
+          }
+        }
+
+        _kContainerRenderingExtensions.addChildArea(expandFigure);
+
+        // Collapse Rectangle
+        var collapseFigure = addModeFigure(node, mode, false);
+        collapseFigure.setProperty(KlighdProperties.COLLAPSED_RENDERING, true);
+        if (this.hasContent(mode)) {
+          _kRenderingExtensions.addDoubleClickAction(
+              collapseFigure, MemorizingExpandCollapseAction.ID);
+
+          if (getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS)) {
+            // Expand button
+            KText textButton =
+                _linguaFrancaShapeExtensions.addTextButton(
+                    collapseFigure, LinguaFrancaSynthesis.TEXT_SHOW_ACTION);
+            _kRenderingExtensions.to(
+                _kRenderingExtensions.from(
+                    _kRenderingExtensions.setGridPlacementData(textButton),
+                    _kRenderingExtensions.LEFT,
+                    8,
+                    0,
+                    _kRenderingExtensions.TOP,
+                    0,
+                    0),
+                _kRenderingExtensions.RIGHT,
+                8,
+                0,
+                _kRenderingExtensions.BOTTOM,
+                8,
+                0);
+            _kRenderingExtensions.addSingleClickAction(
+                textButton, MemorizingExpandCollapseAction.ID);
+            _kRenderingExtensions.addDoubleClickAction(
+                textButton, MemorizingExpandCollapseAction.ID);
+          }
+        }
+      }
+
+      var modeChildren = LinkedHashMultimap.<ModeInstance, KNode>create();
+      var nodeModes = new HashMap<KNode, ModeInstance>();
+      for (var node : nodes) {
+        var instance = NamedInstanceUtil.getLinkedInstance(node);
+        if (instance == null && node.getProperty(CoreOptions.COMMENT_BOX)) {
+          var firstEdge = IterableExtensions.<KEdge>head(node.getOutgoingEdges());
+          if (firstEdge != null && firstEdge.getTarget() != null) {
+            instance = NamedInstanceUtil.getLinkedInstance(firstEdge.getTarget());
+          }
+        }
+        if (instance != null) {
+          var mode = instance.getMode(true);
+          modeChildren.put(mode, node);
+          nodeModes.put(node, mode);
+        } else {
+          modeChildren.put(null, node);
+        }
+      }
+
+      var modeContainer = _kNodeExtensions.createNode();
+      modeContainer.getChildren().addAll(modeNodes.values());
+      var modeContainerFigure = addModeContainerFigure(modeContainer);
+      _kRenderingExtensions.addDoubleClickAction(
+          modeContainerFigure, MemorizingExpandCollapseAction.ID);
+
+      // Use general layout configuration of reactors
+      this.<LinguaFrancaSynthesis>getRootSynthesis()
+          .configureReactorNodeLayout(modeContainer, false);
+      _layoutPostProcessing.configureReactor(modeContainer);
+      // Adjust for state machine style
+      // Create alternating directions to make the model more compact
+      DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.DIRECTION, Direction.DOWN);
+      // More state machine like node placement
+      DiagramSyntheses.setLayoutOption(
+          modeContainer,
+          LayeredOptions.NODE_PLACEMENT_STRATEGY,
+          NodePlacementStrategy.BRANDES_KOEPF);
+      DiagramSyntheses.setLayoutOption(
+          modeContainer, LayeredOptions.NODE_PLACEMENT_BK_FIXED_ALIGNMENT, FixedAlignment.BALANCED);
+      DiagramSyntheses.setLayoutOption(
+          modeContainer,
+          LayeredOptions.NODE_PLACEMENT_BK_EDGE_STRAIGHTENING,
+          EdgeStraighteningStrategy.IMPROVE_STRAIGHTNESS);
+      // Splines
+      DiagramSyntheses.setLayoutOption(
+          modeContainer, CoreOptions.EDGE_ROUTING, EdgeRouting.SPLINES);
+      DiagramSyntheses.setLayoutOption(
+          modeContainer,
+          LayeredOptions.EDGE_LABELS_CENTER_LABEL_PLACEMENT_STRATEGY,
+          CenterEdgeLabelPlacementStrategy.TAIL_LAYER);
+      DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.SPACING_NODE_SELF_LOOP, 18.0);
+      // Unreachable states are unlikely
+      DiagramSyntheses.setLayoutOption(
+          modeContainer, CoreOptions.SEPARATE_CONNECTED_COMPONENTS, false);
+      // Equal padding
+      DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.PADDING, new ElkPadding(6));
+      if (reactor.modes.stream()
+          .anyMatch(m -> m.transitions.stream().anyMatch(t -> t.type == ModeTransition.HISTORY))) {
+        // Make additional space for history indicator
+        DiagramSyntheses.setLayoutOption(
+            modeContainer,
+            LayeredOptions.SPACING_NODE_NODE_BETWEEN_LAYERS,
+            modeContainer.getProperty(LayeredOptions.SPACING_NODE_NODE_BETWEEN_LAYERS)
+                + (getBooleanValue(SHOW_TRANSITION_LABELS) ? 6.0 : 10.0));
+      }
+
+      var modeContainerPorts = new HashMap<KPort, KPort>();
+      for (var mode : reactor.modes) {
+        var modeNode = modeNodes.get(mode);
+        var edges = new LinkedHashSet<KEdge>();
+        // add children
+        for (var child : modeChildren.get(mode)) {
+          nodes.remove(child);
+          modeNode.getChildren().add(child);
+
+          edges.addAll(child.getIncomingEdges());
+          edges.addAll(child.getOutgoingEdges());
+        }
+
+        // add transitions
+        var representedTargets = new HashSet<Pair<ModeInstance, ModeTransition>>();
+        for (var transition : mode.transitions) {
+          if (!representedTargets.contains(
+              new Pair<ModeInstance, ModeTransition>(transition.target, transition.type))) {
+            var edge = _kEdgeExtensions.createEdge();
+            edge.setSource(modeNode);
+            edge.setTarget(modeNodes.get(transition.target));
+            addTransitionFigure(edge, transition);
+
+            if (getBooleanValue(SHOW_TRANSITION_LABELS)) {
+              associateWith(edge, transition.getDefinition());
+            } else {
+              // Bundle similar transitions
+              representedTargets.add(
+                  new Pair<ModeInstance, ModeTransition>(transition.target, transition.type));
+            }
+          }
+        }
+
+        // handle cross hierarchy edges
+        var portCopies = new HashMap<KPort, KPort>();
+        var triggerCopies = new HashMap<KNode, KNode>();
+        for (var edge : edges) {
+          if (!edge.getProperty(CoreOptions.NO_LAYOUT)) {
+            var sourceNodeMode = nodeModes.get(edge.getSource());
+            if (sourceNodeMode == null) {
+              sourceNodeMode = nodeModes.get(edge.getSource().getParent());
             }
-            
-            var modeContainer = _kNodeExtensions.createNode();
-            modeContainer.getChildren().addAll(modeNodes.values());
-            var modeContainerFigure = addModeContainerFigure(modeContainer);
-            _kRenderingExtensions.addDoubleClickAction(modeContainerFigure, MemorizingExpandCollapseAction.ID);
-            
-            // Use general layout configuration of reactors
-            this.<LinguaFrancaSynthesis>getRootSynthesis().configureReactorNodeLayout(modeContainer, false); 
-            _layoutPostProcessing.configureReactor(modeContainer);
-            // Adjust for state machine style
-            // Create alternating directions to make the model more compact
-            DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.DIRECTION, Direction.DOWN);
-            // More state machine like node placement
-            DiagramSyntheses.setLayoutOption(modeContainer, LayeredOptions.NODE_PLACEMENT_STRATEGY, NodePlacementStrategy.BRANDES_KOEPF);
-            DiagramSyntheses.setLayoutOption(modeContainer, LayeredOptions.NODE_PLACEMENT_BK_FIXED_ALIGNMENT, FixedAlignment.BALANCED);
-            DiagramSyntheses.setLayoutOption(modeContainer, LayeredOptions.NODE_PLACEMENT_BK_EDGE_STRAIGHTENING, EdgeStraighteningStrategy.IMPROVE_STRAIGHTNESS);
-            // Splines
-            DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.EDGE_ROUTING, EdgeRouting.SPLINES);
-            DiagramSyntheses.setLayoutOption(modeContainer, LayeredOptions.EDGE_LABELS_CENTER_LABEL_PLACEMENT_STRATEGY, CenterEdgeLabelPlacementStrategy.TAIL_LAYER);
-            DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.SPACING_NODE_SELF_LOOP, 18.0);
-            // Unreachable states are unlikely
-            DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.SEPARATE_CONNECTED_COMPONENTS, false);
-            // Equal padding
-            DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.PADDING, new ElkPadding(6));
-            if (reactor.modes.stream().anyMatch(m -> m.transitions.stream().anyMatch(t -> t.type == ModeTransition.HISTORY))) {
-                // Make additional space for history indicator
-                DiagramSyntheses.setLayoutOption(modeContainer, LayeredOptions.SPACING_NODE_NODE_BETWEEN_LAYERS, 
-                        modeContainer.getProperty(LayeredOptions.SPACING_NODE_NODE_BETWEEN_LAYERS) 
-                        + (getBooleanValue(SHOW_TRANSITION_LABELS) ? 6.0 : 10.0));
+            var sourceIsInMode = sourceNodeMode != null;
+            var targetNodeMode = nodeModes.get(edge.getTarget());
+            if (targetNodeMode == null) {
+              targetNodeMode = nodeModes.get(edge.getTarget().getParent());
             }
+            var targetIsInMode = targetNodeMode != null;
+
+            if (!sourceIsInMode || !targetIsInMode) {
+              var node = sourceIsInMode ? edge.getTarget() : edge.getSource();
+
+              if (node.getProperty(LinguaFrancaSynthesis.REACTION_SPECIAL_TRIGGER)) {
+                // Duplicate trigger node
+                if (!triggerCopies.containsKey(node)) {
+                  var copy = EcoreUtil.copy(node);
+                  modeNode
+                      .getChildren()
+                      .add(modeNode.getChildren().indexOf(edge.getTarget()), copy);
+                  triggerCopies.put(node, copy);
 
-            var modeContainerPorts = new HashMap<KPort, KPort>();
-            for (var mode : reactor.modes) {
-                var modeNode = modeNodes.get(mode);
-                var edges = new LinkedHashSet<KEdge>();
-                // add children
-                for (var child : modeChildren.get(mode)) {
-                    nodes.remove(child);
-                    modeNode.getChildren().add(child);
-                    
-                    edges.addAll(child.getIncomingEdges());
-                    edges.addAll(child.getOutgoingEdges());
+                  // Adjust copy
+                  copy.getOutgoingEdges()
+                      .forEach(
+                          e -> {
+                            e.setTarget(null);
+                            e.setTargetPort(null);
+                          });
+                  copy.getOutgoingEdges().clear();
+                  copy.getData().stream()
+                      .filter(d -> d instanceof KIdentifier)
+                      .forEach(
+                          d -> {
+                            var kid = (KIdentifier) d;
+                            kid.setId(kid.getId() + "_" + mode.getName());
+                          });
                 }
-                
-                // add transitions
-                var representedTargets = new HashSet<Pair<ModeInstance, ModeTransition>>();
-                for (var transition : mode.transitions) {
-                    if (!representedTargets.contains(new Pair<ModeInstance, ModeTransition>(transition.target, transition.type))) {
-                        var edge = _kEdgeExtensions.createEdge();
-                        edge.setSource(modeNode);
-                        edge.setTarget(modeNodes.get(transition.target));
-                        addTransitionFigure(edge, transition);
-                        
-                        if (getBooleanValue(SHOW_TRANSITION_LABELS)) {
-                            associateWith(edge, transition.getDefinition());
-                        } else {
-                            // Bundle similar transitions
-                            representedTargets.add(new Pair<ModeInstance, ModeTransition>(transition.target, transition.type));
-                        }
-                    }
+
+                var newNode = triggerCopies.get(node);
+                edge.setSource(newNode);
+
+                // Remove trigger on top level if only used in modes
+                if (node.getOutgoingEdges().isEmpty()) {
+                  nodes.remove(node);
                 }
-                
-                // handle cross hierarchy edges
-                var portCopies = new HashMap<KPort, KPort>();
-                var triggerCopies = new HashMap<KNode, KNode>();
-                for (var edge : edges) {
-                    if (!edge.getProperty(CoreOptions.NO_LAYOUT)) {
-                        var sourceNodeMode = nodeModes.get(edge.getSource());
-                        if (sourceNodeMode == null) {
-                            sourceNodeMode = nodeModes.get(edge.getSource().getParent());
-                        }
-                        var sourceIsInMode = sourceNodeMode != null;
-                        var targetNodeMode = nodeModes.get(edge.getTarget());
-                        if (targetNodeMode == null) {
-                            targetNodeMode = nodeModes.get(edge.getTarget().getParent());
-                        }
-                        var targetIsInMode = targetNodeMode != null;
-                        
-                        if (!sourceIsInMode || !targetIsInMode) {
-                            var node = sourceIsInMode ? edge.getTarget() : edge.getSource();
-                            
-                            if (node.getProperty(LinguaFrancaSynthesis.REACTION_SPECIAL_TRIGGER)) {
-                                // Duplicate trigger node
-                                if (!triggerCopies.containsKey(node)) {
-                                    var copy = EcoreUtil.copy(node);
-                                    modeNode.getChildren().add(modeNode.getChildren().indexOf(edge.getTarget()), copy);
-                                    triggerCopies.put(node, copy);
-                                    
-                                    // Adjust copy
-                                    copy.getOutgoingEdges().forEach(e -> {e.setTarget(null);e.setTargetPort(null);});
-                                    copy.getOutgoingEdges().clear();
-                                    copy.getData().stream().filter(d -> d instanceof KIdentifier).forEach(d -> {
-                                        var kid = (KIdentifier) d;
-                                        kid.setId(kid.getId() + "_" + mode.getName());
-                                    });
-                                }
-                                
-                                var newNode = triggerCopies.get(node);
-                                edge.setSource(newNode);
-                                
-                                // Remove trigger on top level if only used in modes
-                                if (node.getOutgoingEdges().isEmpty()) {
-                                    nodes.remove(node);
-                                }
-                            } else {
-                                var port = sourceIsInMode ? edge.getTargetPort() : edge.getSourcePort();
-                                var isLocal = modeChildren.get(null).contains(node);
-                                if (isLocal) {
-                                    // Add port to mode container
-                                    if (modeContainerPorts.containsKey(port)) {
-                                        node = modeContainer;
-                                        port = modeContainerPorts.get(port);
-                                    } else {
-                                        var containerPort = _kPortExtensions.createPort();
-                                        modeContainerPorts.put(port, containerPort);
-                                        modeContainer.getPorts().add(containerPort);
-                                        
-                                        _kPortExtensions.setPortSize(containerPort, 8, 8);
-                                        KRectangle rect = _kRenderingExtensions.addRectangle(containerPort);
-                                        _kRenderingExtensions.setPointPlacementData(rect,
-                                                _kRenderingExtensions.LEFT, 0, 0.5f,
-                                                _kRenderingExtensions.BOTTOM, 0, 0.5f,
-                                                _kRenderingExtensions.H_CENTRAL, _kRenderingExtensions.V_CENTRAL,
-                                                0, 0, 8, 4);
-                                        _kRenderingExtensions.setBackground(rect, Colors.BLACK);
-                                        _linguaFrancaStyleExtensions.boldLineSelectionStyle(rect);
-                                        
-                                        DiagramSyntheses.setLayoutOption(containerPort, CoreOptions.PORT_BORDER_OFFSET, -4.0);
-                                        DiagramSyntheses.setLayoutOption(containerPort, CoreOptions.PORT_SIDE, sourceIsInMode ? PortSide.EAST : PortSide.WEST);
-                                        
-                                        var source = _utilityExtensions.sourceElement(node);
-                                        var label = "";
-                                        if (source instanceof Action) {
-                                            label = ((Action) source).getName();
-                                        } else if (source instanceof Timer) {
-                                            label = ((Timer) source).getName();
-                                        } else if (!port.getLabels().isEmpty()) {
-                                            label = port.getLabels().get(0).getText();
-                                            if (source instanceof Reactor && getBooleanValue(LinguaFrancaSynthesis.SHOW_INSTANCE_NAMES)) {
-                                                NamedInstance<?> linkedInstance = NamedInstanceUtil.getLinkedInstance(node);
-                                                if (linkedInstance instanceof ReactorInstance) {
-                                                    label = ((ReactorInstance) linkedInstance).getName() + "." + label;
-                                                }
-                                            }
-                                        }
-                                        var portLabel = _kLabelExtensions.createLabel(containerPort);
-                                        portLabel.setText(label);
-                                        var portLabelKText = _kRenderingFactory.createKText();
-                                        _kRenderingExtensions.setFontSize(portLabelKText, 8);
-                                        portLabel.getData().add(portLabelKText);
-                                        
-                                        // new connection
-                                        var copy = EcoreUtil.copy(edge);
-                                        if (sourceIsInMode) {
-                                            copy.setSource(modeContainer);
-                                            copy.setSourcePort(containerPort);
-                                            copy.setTarget(edge.getTarget());
-                                        } else {
-                                            copy.setTarget(modeContainer);
-                                            copy.setTargetPort(containerPort);
-                                            copy.setSource(edge.getSource());
-                                        }
-                                        
-                                        node = modeContainer;
-                                        port = containerPort;
-                                    }
-                                }
-                                
-                                // Duplicate port
-                                if (!portCopies.containsKey(port)) {
-                                    var copy = EcoreUtil.copy(port);
-                                    portCopies.put(port, copy);
-                                    
-                                    var dummyNode = _kNodeExtensions.createNode();
-                                    var newID = mode.uniqueID() + "_";
-                                    if (!port.getLabels().isEmpty()) {
-                                        newID += IterableExtensions.head(port.getLabels()).getText();
-                                    }
-                                    _utilityExtensions.setID(dummyNode, newID);
-                                    _kRenderingExtensions.addInvisibleContainerRendering(dummyNode);
-                                    dummyNode.getPorts().add(copy);
-                                    // Assign layer
-                                    DiagramSyntheses.setLayoutOption(dummyNode, LayeredOptions.LAYERING_LAYER_CONSTRAINT,
-                                            port.getProperty(CoreOptions.PORT_SIDE) == PortSide.WEST ? LayerConstraint.FIRST : LayerConstraint.LAST);
-                                    // Configure port spacing
-                                    DiagramSyntheses.setLayoutOption(dummyNode, CoreOptions.PORT_LABELS_PLACEMENT, EnumSet.of(PortLabelPlacement.ALWAYS_OTHER_SAME_SIDE, PortLabelPlacement.OUTSIDE));
-                                    // Place freely
-                                    DiagramSyntheses.setLayoutOption(dummyNode, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
-                                    // Switch port side
-                                    DiagramSyntheses.setLayoutOption(copy, CoreOptions.PORT_SIDE, 
-                                            port.getProperty(CoreOptions.PORT_SIDE) == PortSide.WEST ? PortSide.EAST : PortSide.WEST);
-                                    
-                                    modeNode.getChildren().add(dummyNode);
-                                }
-                                var newPort = portCopies.get(port);
-                                if (sourceIsInMode) {
-                                    edge.setTarget(newPort.getNode());
-                                    edge.setTargetPort(newPort);
-                                } else {
-                                    edge.setSource(newPort.getNode());
-                                    edge.setSourcePort(newPort);
-                                }
-                            }
+              } else {
+                var port = sourceIsInMode ? edge.getTargetPort() : edge.getSourcePort();
+                var isLocal = modeChildren.get(null).contains(node);
+                if (isLocal) {
+                  // Add port to mode container
+                  if (modeContainerPorts.containsKey(port)) {
+                    node = modeContainer;
+                    port = modeContainerPorts.get(port);
+                  } else {
+                    var containerPort = _kPortExtensions.createPort();
+                    modeContainerPorts.put(port, containerPort);
+                    modeContainer.getPorts().add(containerPort);
+
+                    _kPortExtensions.setPortSize(containerPort, 8, 8);
+                    KRectangle rect = _kRenderingExtensions.addRectangle(containerPort);
+                    _kRenderingExtensions.setPointPlacementData(
+                        rect,
+                        _kRenderingExtensions.LEFT,
+                        0,
+                        0.5f,
+                        _kRenderingExtensions.BOTTOM,
+                        0,
+                        0.5f,
+                        _kRenderingExtensions.H_CENTRAL,
+                        _kRenderingExtensions.V_CENTRAL,
+                        0,
+                        0,
+                        8,
+                        4);
+                    _kRenderingExtensions.setBackground(rect, Colors.BLACK);
+                    _linguaFrancaStyleExtensions.boldLineSelectionStyle(rect);
+
+                    DiagramSyntheses.setLayoutOption(
+                        containerPort, CoreOptions.PORT_BORDER_OFFSET, -4.0);
+                    DiagramSyntheses.setLayoutOption(
+                        containerPort,
+                        CoreOptions.PORT_SIDE,
+                        sourceIsInMode ? PortSide.EAST : PortSide.WEST);
+
+                    var source = _utilityExtensions.sourceElement(node);
+                    var label = "";
+                    if (source instanceof Action) {
+                      label = ((Action) source).getName();
+                    } else if (source instanceof Timer) {
+                      label = ((Timer) source).getName();
+                    } else if (!port.getLabels().isEmpty()) {
+                      label = port.getLabels().get(0).getText();
+                      if (source instanceof Reactor
+                          && getBooleanValue(LinguaFrancaSynthesis.SHOW_INSTANCE_NAMES)) {
+                        NamedInstance<?> linkedInstance = NamedInstanceUtil.getLinkedInstance(node);
+                        if (linkedInstance instanceof ReactorInstance) {
+                          label = ((ReactorInstance) linkedInstance).getName() + "." + label;
                         }
+                      }
+                    }
+                    var portLabel = _kLabelExtensions.createLabel(containerPort);
+                    portLabel.setText(label);
+                    var portLabelKText = _kRenderingFactory.createKText();
+                    _kRenderingExtensions.setFontSize(portLabelKText, 8);
+                    portLabel.getData().add(portLabelKText);
+
+                    // new connection
+                    var copy = EcoreUtil.copy(edge);
+                    if (sourceIsInMode) {
+                      copy.setSource(modeContainer);
+                      copy.setSourcePort(containerPort);
+                      copy.setTarget(edge.getTarget());
+                    } else {
+                      copy.setTarget(modeContainer);
+                      copy.setTargetPort(containerPort);
+                      copy.setSource(edge.getSource());
                     }
+
+                    node = modeContainer;
+                    port = containerPort;
+                  }
                 }
-            }
-            
-            // If mode container is unused (no ports for local connections) -> hide it
-            if (modeContainer.getPorts().isEmpty()) {
-                _kRenderingExtensions.setInvisible(modeContainerFigure, true);
-                DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.PADDING, new ElkPadding(2));
-            } else if (getBooleanValue(LinguaFrancaSynthesis.SHOW_INSTANCE_NAMES)) {
-                // Remove mode container port labels of ports representing internal connections
-                // because their association to reactor instances is unambiguous due to instance names
-                for (var p : modeContainer.getPorts()) {
-                    p.getLabels().removeIf(l -> l.getText().contains("."));
+
+                // Duplicate port
+                if (!portCopies.containsKey(port)) {
+                  var copy = EcoreUtil.copy(port);
+                  portCopies.put(port, copy);
+
+                  var dummyNode = _kNodeExtensions.createNode();
+                  var newID = mode.uniqueID() + "_";
+                  if (!port.getLabels().isEmpty()) {
+                    newID += IterableExtensions.head(port.getLabels()).getText();
+                  }
+                  _utilityExtensions.setID(dummyNode, newID);
+                  _kRenderingExtensions.addInvisibleContainerRendering(dummyNode);
+                  dummyNode.getPorts().add(copy);
+                  // Assign layer
+                  DiagramSyntheses.setLayoutOption(
+                      dummyNode,
+                      LayeredOptions.LAYERING_LAYER_CONSTRAINT,
+                      port.getProperty(CoreOptions.PORT_SIDE) == PortSide.WEST
+                          ? LayerConstraint.FIRST
+                          : LayerConstraint.LAST);
+                  // Configure port spacing
+                  DiagramSyntheses.setLayoutOption(
+                      dummyNode,
+                      CoreOptions.PORT_LABELS_PLACEMENT,
+                      EnumSet.of(
+                          PortLabelPlacement.ALWAYS_OTHER_SAME_SIDE, PortLabelPlacement.OUTSIDE));
+                  // Place freely
+                  DiagramSyntheses.setLayoutOption(
+                      dummyNode, LayeredOptions.CONSIDER_MODEL_ORDER_NO_MODEL_ORDER, true);
+                  // Switch port side
+                  DiagramSyntheses.setLayoutOption(
+                      copy,
+                      CoreOptions.PORT_SIDE,
+                      port.getProperty(CoreOptions.PORT_SIDE) == PortSide.WEST
+                          ? PortSide.EAST
+                          : PortSide.WEST);
+
+                  modeNode.getChildren().add(dummyNode);
+                }
+                var newPort = portCopies.get(port);
+                if (sourceIsInMode) {
+                  edge.setTarget(newPort.getNode());
+                  edge.setTargetPort(newPort);
+                } else {
+                  edge.setSource(newPort.getNode());
+                  edge.setSourcePort(newPort);
                 }
+              }
             }
-            
-            nodes.add(modeContainer);
+          }
         }
-    }
-    
-    private boolean hasContent(ModeInstance mode) {
-        return !mode.reactions.isEmpty() || !mode.instantiations.isEmpty();
-    }
-    
-    private KContainerRendering addModeFigure(KNode node, ModeInstance mode, boolean expanded) {
-        int padding = getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS) ? 8 : 6;
-        
-        var figure = _kRenderingExtensions.addRoundedRectangle(node, 13, 13, 1);
-        _kContainerRenderingExtensions.setGridPlacement(figure, 1);
-        _kRenderingExtensions.setLineWidth(figure, mode.isInitial() ? 3f : 1.5f);
-        _kRenderingExtensions.setForeground(figure, MODE_FG);
-        _kRenderingExtensions.setBackground(figure, MODE_BG);
-        var background = _kRenderingExtensions.getBackground(figure);
-        background.setAlpha(MODE_BG_ALPHA);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
-        
-        // Invisible container
-        KRectangle container = _kContainerRenderingExtensions.addRectangle(figure);
-        _kRenderingExtensions.setInvisible(container, true);
-        int bottomPadding = this.hasContent(mode) && expanded ? 4 : padding;
-        var from = _kRenderingExtensions.from(
-                _kRenderingExtensions.setGridPlacementData(container),
-                _kRenderingExtensions.LEFT, padding, 0, _kRenderingExtensions.TOP, padding, 0);
-        _kRenderingExtensions.to(from, _kRenderingExtensions.RIGHT, padding, 0, _kRenderingExtensions.BOTTOM, bottomPadding, 0);
-        
-        // Centered child container
-        KRectangle childContainer = _kContainerRenderingExtensions.addRectangle(container);
-        this._kRenderingExtensions.setInvisible(childContainer, true);
-        this._kRenderingExtensions.setPointPlacementData(childContainer,
-                _kRenderingExtensions.LEFT, 0, 0.5f, _kRenderingExtensions.TOP, 0, 0.5f,
-                _kRenderingExtensions.H_CENTRAL, _kRenderingExtensions.V_CENTRAL, 0, 0, 0, 0);
-        this._kContainerRenderingExtensions.setGridPlacement(childContainer, 1);
-        
-        KText text = _kContainerRenderingExtensions.addText(childContainer, mode.getName());
-        DiagramSyntheses.suppressSelectability(text);
-        _linguaFrancaStyleExtensions.underlineSelectionStyle(text);
-        
-        return figure;
-    }
-    
-    private KContainerRendering addModeContainerFigure(KNode node) {
-        var rect = _kRenderingExtensions.addRectangle(node);
-        _kRenderingExtensions.setLineWidth(rect, 1);
-        _kRenderingExtensions.setLineStyle(rect, LineStyle.DOT);
-        _kRenderingExtensions.setForeground(rect, MODE_FG);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(rect);
-        return rect;
-    }
-    
-    private void addTransitionFigure(KEdge edge, Transition transition) {
-        var spline = _kEdgeExtensions.addSpline(edge);
-        _kRenderingExtensions.setLineWidth(spline, 1.5f);
-        _kRenderingExtensions.setForeground(spline, MODE_FG);
-        _linguaFrancaStyleExtensions.boldLineSelectionStyle(spline);
-
-        if (transition.type == ModeTransition.HISTORY) {
-            addHistoryDecorator(spline);
-        } else {
-            KRendering arrowDecorator = _kPolylineExtensions.addHeadArrowDecorator(spline);
-            this._kRenderingExtensions.setForeground(arrowDecorator, MODE_FG);
-            this._kRenderingExtensions.setBackground(arrowDecorator, MODE_FG);
-        }
-            
-        if (getBooleanValue(SHOW_TRANSITION_LABELS)) {
-            associateWith(spline, transition.getDefinition());
-            
-            KLabel centerEdgeLabel = _kLabelExtensions.addCenterEdgeLabel(edge, this.toTransitionLabel(transition));
-            associateWith(centerEdgeLabel, transition.getDefinition());
-            applyTransitionOnEdgeStyle(centerEdgeLabel);
+      }
+
+      // If mode container is unused (no ports for local connections) -> hide it
+      if (modeContainer.getPorts().isEmpty()) {
+        _kRenderingExtensions.setInvisible(modeContainerFigure, true);
+        DiagramSyntheses.setLayoutOption(modeContainer, CoreOptions.PADDING, new ElkPadding(2));
+      } else if (getBooleanValue(LinguaFrancaSynthesis.SHOW_INSTANCE_NAMES)) {
+        // Remove mode container port labels of ports representing internal connections
+        // because their association to reactor instances is unambiguous due to instance names
+        for (var p : modeContainer.getPorts()) {
+          p.getLabels().removeIf(l -> l.getText().contains("."));
         }
+      }
+
+      nodes.add(modeContainer);
     }
-    
-    private String toTransitionLabel(Transition transition) {
-        var text = new StringBuilder();
-        
-        text.append(transition.reaction.triggers.stream().map(t -> t.getDefinition().getName()).collect(Collectors.joining(", ")));
-        return text.toString();
+  }
+
+  private boolean hasContent(ModeInstance mode) {
+    return !mode.reactions.isEmpty() || !mode.instantiations.isEmpty();
+  }
+
+  private KContainerRendering addModeFigure(KNode node, ModeInstance mode, boolean expanded) {
+    int padding = getBooleanValue(LinguaFrancaSynthesis.SHOW_HYPERLINKS) ? 8 : 6;
+
+    var figure = _kRenderingExtensions.addRoundedRectangle(node, 13, 13, 1);
+    _kContainerRenderingExtensions.setGridPlacement(figure, 1);
+    _kRenderingExtensions.setLineWidth(figure, mode.isInitial() ? 3f : 1.5f);
+    _kRenderingExtensions.setForeground(figure, MODE_FG);
+    _kRenderingExtensions.setBackground(figure, MODE_BG);
+    var background = _kRenderingExtensions.getBackground(figure);
+    background.setAlpha(MODE_BG_ALPHA);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(figure);
+
+    // Invisible container
+    KRectangle container = _kContainerRenderingExtensions.addRectangle(figure);
+    _kRenderingExtensions.setInvisible(container, true);
+    int bottomPadding = this.hasContent(mode) && expanded ? 4 : padding;
+    var from =
+        _kRenderingExtensions.from(
+            _kRenderingExtensions.setGridPlacementData(container),
+            _kRenderingExtensions.LEFT,
+            padding,
+            0,
+            _kRenderingExtensions.TOP,
+            padding,
+            0);
+    _kRenderingExtensions.to(
+        from,
+        _kRenderingExtensions.RIGHT,
+        padding,
+        0,
+        _kRenderingExtensions.BOTTOM,
+        bottomPadding,
+        0);
+
+    // Centered child container
+    KRectangle childContainer = _kContainerRenderingExtensions.addRectangle(container);
+    this._kRenderingExtensions.setInvisible(childContainer, true);
+    this._kRenderingExtensions.setPointPlacementData(
+        childContainer,
+        _kRenderingExtensions.LEFT,
+        0,
+        0.5f,
+        _kRenderingExtensions.TOP,
+        0,
+        0.5f,
+        _kRenderingExtensions.H_CENTRAL,
+        _kRenderingExtensions.V_CENTRAL,
+        0,
+        0,
+        0,
+        0);
+    this._kContainerRenderingExtensions.setGridPlacement(childContainer, 1);
+
+    KText text = _kContainerRenderingExtensions.addText(childContainer, mode.getName());
+    DiagramSyntheses.suppressSelectability(text);
+    _linguaFrancaStyleExtensions.underlineSelectionStyle(text);
+
+    return figure;
+  }
+
+  private KContainerRendering addModeContainerFigure(KNode node) {
+    var rect = _kRenderingExtensions.addRectangle(node);
+    _kRenderingExtensions.setLineWidth(rect, 1);
+    _kRenderingExtensions.setLineStyle(rect, LineStyle.DOT);
+    _kRenderingExtensions.setForeground(rect, MODE_FG);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(rect);
+    return rect;
+  }
+
+  private void addTransitionFigure(KEdge edge, Transition transition) {
+    var spline = _kEdgeExtensions.addSpline(edge);
+    _kRenderingExtensions.setLineWidth(spline, 1.5f);
+    _kRenderingExtensions.setForeground(spline, MODE_FG);
+    _linguaFrancaStyleExtensions.boldLineSelectionStyle(spline);
+
+    if (transition.type == ModeTransition.HISTORY) {
+      addHistoryDecorator(spline);
+    } else {
+      KRendering arrowDecorator = _kPolylineExtensions.addHeadArrowDecorator(spline);
+      this._kRenderingExtensions.setForeground(arrowDecorator, MODE_FG);
+      this._kRenderingExtensions.setBackground(arrowDecorator, MODE_FG);
+    }
+
+    if (getBooleanValue(SHOW_TRANSITION_LABELS)) {
+      associateWith(spline, transition.getDefinition());
+
+      KLabel centerEdgeLabel =
+          _kLabelExtensions.addCenterEdgeLabel(edge, this.toTransitionLabel(transition));
+      associateWith(centerEdgeLabel, transition.getDefinition());
+      applyTransitionOnEdgeStyle(centerEdgeLabel);
     }
-    
-    private static LabelDecorationConfigurator _onEdgeTransitionLabelConfigurator; // ONLY for use in applyTransitionOnEdgeStyle
-    private void applyTransitionOnEdgeStyle(KLabel label) {
-        if (_onEdgeTransitionLabelConfigurator == null) {
-            var foreground = new Color(MODE_FG.getRed(), MODE_FG.getGreen(), MODE_FG.getBlue());
-            var background = new Color(Colors.GRAY_95.getRed(), Colors.GRAY_95.getGreen(), Colors.GRAY_95.getBlue());
-            _onEdgeTransitionLabelConfigurator = LabelDecorationConfigurator.create()
-                .withInlineLabels(true)
-                .withLabelTextRenderingProvider(new ITextRenderingProvider() {
+  }
+
+  private String toTransitionLabel(Transition transition) {
+    var text = new StringBuilder();
+
+    text.append(
+        transition.reaction.triggers.stream()
+            .map(t -> t.getDefinition().getName())
+            .collect(Collectors.joining(", ")));
+    return text.toString();
+  }
+
+  private static LabelDecorationConfigurator
+      _onEdgeTransitionLabelConfigurator; // ONLY for use in applyTransitionOnEdgeStyle
+
+  private void applyTransitionOnEdgeStyle(KLabel label) {
+    if (_onEdgeTransitionLabelConfigurator == null) {
+      var foreground = new Color(MODE_FG.getRed(), MODE_FG.getGreen(), MODE_FG.getBlue());
+      var background =
+          new Color(Colors.GRAY_95.getRed(), Colors.GRAY_95.getGreen(), Colors.GRAY_95.getBlue());
+      _onEdgeTransitionLabelConfigurator =
+          LabelDecorationConfigurator.create()
+              .withInlineLabels(true)
+              .withLabelTextRenderingProvider(
+                  new ITextRenderingProvider() {
                     @Override
                     public KRendering createTextRendering(
-                            KContainerRendering container, KLabel llabel) {
-                        var kText = _kRenderingFactory.createKText();
-                        _kRenderingExtensions.setFontSize(kText, 8);
-                        container.getChildren().add(kText);
-                        return kText;
+                        KContainerRendering container, KLabel llabel) {
+                      var kText = _kRenderingFactory.createKText();
+                      _kRenderingExtensions.setFontSize(kText, 8);
+                      container.getChildren().add(kText);
+                      return kText;
                     }
-                })
-                .addDecoratorRenderingProvider(RectangleDecorator.create().withBackground(background))
-                .addDecoratorRenderingProvider(LinesDecorator.create().withColor(foreground));
-        }
-        _onEdgeTransitionLabelConfigurator.applyTo(label);
-    }
-    
-    private void addHistoryDecorator(KPolyline line) {
-        var decorator = _kPolylineExtensions.addHeadArrowDecorator(line);
-        ((KDecoratorPlacementData) decorator.getPlacementData()).setAbsolute((-15.0f));
-
-        var ellipse = _kContainerRenderingExtensions.addEllipse(line);
-        _kRenderingExtensions.<KEllipse>setDecoratorPlacementData(ellipse, 16, 16, (-6), 1, false);
-        _kRenderingExtensions.setLineWidth(ellipse, 0.8f);
-        _kRenderingExtensions.setForeground(ellipse, MODE_FG);
-        _kRenderingExtensions.setBackground(ellipse, Colors.WHITE);
-        
-        var innerLine = _kContainerRenderingExtensions.addPolyline(ellipse);
-        _kRenderingExtensions.setLineWidth(innerLine, 2);
-        var points = innerLine.getPoints();
-        points.add(_kRenderingExtensions.createKPosition(_kRenderingExtensions.LEFT, 5, 0, _kRenderingExtensions.TOP, 4, 0));
-        points.add(_kRenderingExtensions.createKPosition(_kRenderingExtensions.LEFT, 5, 0, _kRenderingExtensions.BOTTOM, 4, 0));
-        points.add(_kRenderingExtensions.createKPosition(_kRenderingExtensions.LEFT, 5, 0, _kRenderingExtensions.TOP, 0, 0.5f));
-        points.add(_kRenderingExtensions.createKPosition(_kRenderingExtensions.RIGHT, 5, 0, _kRenderingExtensions.TOP, 0, 0.5f));
-        points.add(_kRenderingExtensions.createKPosition(_kRenderingExtensions.RIGHT, 5, 0, _kRenderingExtensions.BOTTOM, 4, 0));
-        points.add(_kRenderingExtensions.createKPosition(_kRenderingExtensions.RIGHT, 5, 0, _kRenderingExtensions.TOP, 4, 0));
-        _kRenderingExtensions.setForeground(innerLine, MODE_FG);
+                  })
+              .addDecoratorRenderingProvider(RectangleDecorator.create().withBackground(background))
+              .addDecoratorRenderingProvider(LinesDecorator.create().withColor(foreground));
     }
-    
-}
\ No newline at end of file
+    _onEdgeTransitionLabelConfigurator.applyTo(label);
+  }
+
+  private void addHistoryDecorator(KPolyline line) {
+    var decorator = _kPolylineExtensions.addHeadArrowDecorator(line);
+    ((KDecoratorPlacementData) decorator.getPlacementData()).setAbsolute((-15.0f));
+
+    var ellipse = _kContainerRenderingExtensions.addEllipse(line);
+    _kRenderingExtensions.<KEllipse>setDecoratorPlacementData(ellipse, 16, 16, (-6), 1, false);
+    _kRenderingExtensions.setLineWidth(ellipse, 0.8f);
+    _kRenderingExtensions.setForeground(ellipse, MODE_FG);
+    _kRenderingExtensions.setBackground(ellipse, Colors.WHITE);
+
+    var innerLine = _kContainerRenderingExtensions.addPolyline(ellipse);
+    _kRenderingExtensions.setLineWidth(innerLine, 2);
+    var points = innerLine.getPoints();
+    points.add(
+        _kRenderingExtensions.createKPosition(
+            _kRenderingExtensions.LEFT, 5, 0, _kRenderingExtensions.TOP, 4, 0));
+    points.add(
+        _kRenderingExtensions.createKPosition(
+            _kRenderingExtensions.LEFT, 5, 0, _kRenderingExtensions.BOTTOM, 4, 0));
+    points.add(
+        _kRenderingExtensions.createKPosition(
+            _kRenderingExtensions.LEFT, 5, 0, _kRenderingExtensions.TOP, 0, 0.5f));
+    points.add(
+        _kRenderingExtensions.createKPosition(
+            _kRenderingExtensions.RIGHT, 5, 0, _kRenderingExtensions.TOP, 0, 0.5f));
+    points.add(
+        _kRenderingExtensions.createKPosition(
+            _kRenderingExtensions.RIGHT, 5, 0, _kRenderingExtensions.BOTTOM, 4, 0));
+    points.add(
+        _kRenderingExtensions.createKPosition(
+            _kRenderingExtensions.RIGHT, 5, 0, _kRenderingExtensions.TOP, 4, 0));
+    _kRenderingExtensions.setForeground(innerLine, MODE_FG);
+  }
+}
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/util/NamedInstanceUtil.java b/org.lflang/src/org/lflang/diagram/synthesis/util/NamedInstanceUtil.java
index e7143b44fc..ab2edc658a 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/util/NamedInstanceUtil.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/util/NamedInstanceUtil.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.util;
 
 import de.cau.cs.kieler.klighd.kgraph.KGraphElement;
@@ -31,28 +31,24 @@
 
 /**
  * Utility class to link KGraphElements to NamedInstances.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class NamedInstanceUtil {
-    public static final Property<NamedInstance<?>> LINKED_INSTANCE = new Property<>(
-            "org.lflang.linguafranca.diagram.synthesis.graph.instance");
+  public static final Property<NamedInstance<?>> LINKED_INSTANCE =
+      new Property<>("org.lflang.linguafranca.diagram.synthesis.graph.instance");
 
-    /**
-     * Establishes a link between KGraphElement and NamedInstance.
-     */
-    public static IPropertyHolder linkInstance(KGraphElement elem, NamedInstance<?> instance) {
-        return elem.setProperty(LINKED_INSTANCE, instance);
-    }
+  /** Establishes a link between KGraphElement and NamedInstance. */
+  public static IPropertyHolder linkInstance(KGraphElement elem, NamedInstance<?> instance) {
+    return elem.setProperty(LINKED_INSTANCE, instance);
+  }
 
-    /**
-     * Returns the linked NamedInstance for the given KGraphElement.
-     */
-    public static NamedInstance<?> getLinkedInstance(KGraphElement elem) {
-        var instance = elem.getProperty(LINKED_INSTANCE);
-        if (instance != null) {
-            return instance;
-        }
-        return null;
+  /** Returns the linked NamedInstance for the given KGraphElement. */
+  public static NamedInstance<?> getLinkedInstance(KGraphElement elem) {
+    var instance = elem.getProperty(LINKED_INSTANCE);
+    if (instance != null) {
+      return instance;
     }
+    return null;
+  }
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/util/ReactorIcons.java b/org.lflang/src/org/lflang/diagram/synthesis/util/ReactorIcons.java
index e740ebf653..a69b7d3e4f 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/util/ReactorIcons.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/util/ReactorIcons.java
@@ -1,146 +1,148 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.util;
 
-//import org.eclipse.swt.graphics.ImageData;
-//import org.eclipse.swt.graphics.ImageLoader;
-import org.eclipse.xtext.xbase.lib.Extension;
-import org.lflang.AttributeUtils;
-import org.lflang.diagram.synthesis.AbstractSynthesisExtensions;
-import org.lflang.lf.ReactorDecl;
-import org.lflang.util.FileUtil;
-
+// import org.eclipse.swt.graphics.ImageData;
+// import org.eclipse.swt.graphics.ImageLoader;
 import com.google.inject.Inject;
-
 import de.cau.cs.kieler.klighd.krendering.KContainerRendering;
 import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
 import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensions;
 import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions;
+import org.eclipse.xtext.xbase.lib.Extension;
+import org.lflang.AttributeUtils;
+import org.lflang.diagram.synthesis.AbstractSynthesisExtensions;
+import org.lflang.lf.ReactorDecl;
+import org.lflang.util.FileUtil;
 
 /**
  * Utility class to handle icons for reactors in Lingua Franca diagrams.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 @ViewSynthesisShared
 public class ReactorIcons extends AbstractSynthesisExtensions {
 
-    @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
-    @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
-    
-//    private static final ImageLoader LOADER = new ImageLoader();
-    
-    // Image cache during synthesis
-//    private final HashMap<java.net.URI, ImageData> cache = new HashMap<>();
-    
-    // Error message
-    private String error = null;
+  @Inject @Extension private KRenderingExtensions _kRenderingExtensions;
+  @Inject @Extension private KContainerRenderingExtensions _kContainerRenderingExtensions;
+
+  //    private static final ImageLoader LOADER = new ImageLoader();
+
+  // Image cache during synthesis
+  //    private final HashMap<java.net.URI, ImageData> cache = new HashMap<>();
+
+  // Error message
+  private String error = null;
 
-    public void handleIcon(KContainerRendering rendering, ReactorDecl reactor, boolean collapsed) {
-        if (!collapsed) {
-            return;
-        }
-        
-        // Reset error
-        error = null;
-        
-        // Get annotation
-        var iconPath = AttributeUtils.getIconPath(reactor);
-        if (iconPath != null && !iconPath.isEmpty()) {
-            var iconLocation = FileUtil.locateFile(iconPath, reactor.eResource());
-            if (iconLocation == null) {
-                error = "Cannot find given icon file.";
-            } else {
-                /*
-                 * This code was disabled because it cannot be compiled for the language server with Gradle.
-                 * As soon as the Klighd API is extended to support URI-based images in both Eclipse and VSCode,
-                 * this code should be reactivated and adapted.
-                 * See: https://github.com/kieler/KLighD/issues/146
-                 */
-//                ImageData data = loadImage(iconLocation);
-//                if (data != null) {
-//                    KRectangle figure = _kContainerRenderingExtensions.addRectangle(rendering);
-//                    _kRenderingExtensions.setInvisible(figure, true);
-//                    KGridPlacementData figurePlacement = _kRenderingExtensions.setGridPlacementData(figure, data.width, data.height);
-//                    _kRenderingExtensions.to(
-//                            _kRenderingExtensions.from(
-//                                    figurePlacement, 
-//                                    _kRenderingExtensions.LEFT, 3, 0,
-//                                    _kRenderingExtensions.TOP, 0, 0), 
-//                            _kRenderingExtensions.RIGHT, 3, 0, 
-//                            _kRenderingExtensions.BOTTOM, 3, 0);
-//                    
-//                    KRectangle icon = _kContainerRenderingExtensions.addRectangle(figure);
-//                    _kRenderingExtensions.setInvisible(icon, true);
-//                    _kContainerRenderingExtensions.addImage(icon, data);
-//                    _kRenderingExtensions.setPointPlacementData(icon, 
-//                            _kRenderingExtensions.createKPosition(
-//                                    _kRenderingExtensions.LEFT, 0, 0.5f, 
-//                                    _kRenderingExtensions.TOP, 0, 0.5f), 
-//                            _kRenderingExtensions.H_CENTRAL, _kRenderingExtensions.V_CENTRAL, 0,
-//                            0, data.width, data.height);
-//                }
-//                if (error != null) {
-//                    var errorText = _kContainerRenderingExtensions.addText(rendering, "Icon not found!\n"+error);
-//                    _kRenderingExtensions.setForeground(errorText, Colors.RED);
-//                    _kRenderingExtensions.setFontBold(errorText, true);
-//                    _kRenderingExtensions.setSurroundingSpaceGrid(errorText, 8, 0);
-//                }
-            }
-        }
+  public void handleIcon(KContainerRendering rendering, ReactorDecl reactor, boolean collapsed) {
+    if (!collapsed) {
+      return;
     }
 
-//    private ImageData loadImage(final java.net.URI uri) {
-//        try {
-//            if (cache.containsKey(uri)) {
-//                return cache.get(uri);
-//            }
-//            synchronized (LOADER) {
-//                InputStream inStream = null;
-//                try {
-//                    inStream = uri.toURL().openStream();
-//                    ImageData[] data = LOADER.load(inStream);
-//                    if (data != null && data.length > 0) {
-//                        ImageData img = data[0];
-//                        cache.put(uri, img);
-//                        return img;
-//                    } else {
-//                        error = "Could not load icon image.";
-//                        return null;
-//                    }
-//                } finally {
-//                    if (inStream != null) {
-//                        inStream.close();
-//                    }
-//                }
-//            }
-//        } catch (Exception ex) {
-//            ex.printStackTrace();
-//            error = "Could not load icon image.";
-//            return null;
-//        }
-//    }
-    
+    // Reset error
+    error = null;
+
+    // Get annotation
+    var iconPath = AttributeUtils.getIconPath(reactor);
+    if (iconPath != null && !iconPath.isEmpty()) {
+      var iconLocation = FileUtil.locateFile(iconPath, reactor.eResource());
+      if (iconLocation == null) {
+        error = "Cannot find given icon file.";
+      } else {
+        /*
+         * This code was disabled because it cannot be compiled for the language server with Gradle.
+         * As soon as the Klighd API is extended to support URI-based images in both Eclipse and VSCode,
+         * this code should be reactivated and adapted.
+         * See: https://github.com/kieler/KLighD/issues/146
+         */
+        //                ImageData data = loadImage(iconLocation);
+        //                if (data != null) {
+        //                    KRectangle figure =
+        // _kContainerRenderingExtensions.addRectangle(rendering);
+        //                    _kRenderingExtensions.setInvisible(figure, true);
+        //                    KGridPlacementData figurePlacement =
+        // _kRenderingExtensions.setGridPlacementData(figure, data.width, data.height);
+        //                    _kRenderingExtensions.to(
+        //                            _kRenderingExtensions.from(
+        //                                    figurePlacement,
+        //                                    _kRenderingExtensions.LEFT, 3, 0,
+        //                                    _kRenderingExtensions.TOP, 0, 0),
+        //                            _kRenderingExtensions.RIGHT, 3, 0,
+        //                            _kRenderingExtensions.BOTTOM, 3, 0);
+        //
+        //                    KRectangle icon = _kContainerRenderingExtensions.addRectangle(figure);
+        //                    _kRenderingExtensions.setInvisible(icon, true);
+        //                    _kContainerRenderingExtensions.addImage(icon, data);
+        //                    _kRenderingExtensions.setPointPlacementData(icon,
+        //                            _kRenderingExtensions.createKPosition(
+        //                                    _kRenderingExtensions.LEFT, 0, 0.5f,
+        //                                    _kRenderingExtensions.TOP, 0, 0.5f),
+        //                            _kRenderingExtensions.H_CENTRAL,
+        // _kRenderingExtensions.V_CENTRAL, 0,
+        //                            0, data.width, data.height);
+        //                }
+        //                if (error != null) {
+        //                    var errorText = _kContainerRenderingExtensions.addText(rendering,
+        // "Icon not found!\n"+error);
+        //                    _kRenderingExtensions.setForeground(errorText, Colors.RED);
+        //                    _kRenderingExtensions.setFontBold(errorText, true);
+        //                    _kRenderingExtensions.setSurroundingSpaceGrid(errorText, 8, 0);
+        //                }
+      }
+    }
+  }
+
+  //    private ImageData loadImage(final java.net.URI uri) {
+  //        try {
+  //            if (cache.containsKey(uri)) {
+  //                return cache.get(uri);
+  //            }
+  //            synchronized (LOADER) {
+  //                InputStream inStream = null;
+  //                try {
+  //                    inStream = uri.toURL().openStream();
+  //                    ImageData[] data = LOADER.load(inStream);
+  //                    if (data != null && data.length > 0) {
+  //                        ImageData img = data[0];
+  //                        cache.put(uri, img);
+  //                        return img;
+  //                    } else {
+  //                        error = "Could not load icon image.";
+  //                        return null;
+  //                    }
+  //                } finally {
+  //                    if (inStream != null) {
+  //                        inStream.close();
+  //                    }
+  //                }
+  //            }
+  //        } catch (Exception ex) {
+  //            ex.printStackTrace();
+  //            error = "Could not load icon image.";
+  //            return null;
+  //        }
+  //    }
+
 }
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java b/org.lflang/src/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
index fdf5070713..a249c009fd 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
@@ -1,27 +1,27 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.util;
 
 import java.nio.file.Path;
@@ -32,53 +32,53 @@
  * @author Alexander Schulz-Rosengarten
  */
 public class SynthesisErrorReporter implements ErrorReporter {
-    @Override
-    public String reportError(String message) {
-        return null;
-    }
-    
-    @Override
-    public String reportError(EObject object, String message) {
-        return null;
-    }
-    
-    @Override
-    public String reportError(Path file, Integer line, String message) {
-        return null;
-    }
-    
-    @Override
-    public String reportWarning(String message) {
-        return null;
-    }
-    
-    @Override
-    public String reportWarning(EObject object, String message) {
-        return null;
-    }
-    
-    @Override
-    public String reportWarning(Path file, Integer line, String message) {
-        return null;
-    }
+  @Override
+  public String reportError(String message) {
+    return null;
+  }
 
-    @Override
-    public String reportInfo(String message) {
-        return null;
-    }
+  @Override
+  public String reportError(EObject object, String message) {
+    return null;
+  }
 
-    @Override
-    public String reportInfo(EObject object, String message) {
-        return null;
-    }
+  @Override
+  public String reportError(Path file, Integer line, String message) {
+    return null;
+  }
 
-    @Override
-    public String reportInfo(Path file, Integer line, String message) {
-        return null;
-    }
+  @Override
+  public String reportWarning(String message) {
+    return null;
+  }
 
-    @Override
-    public boolean getErrorsOccurred() {
-        return false;
-    }
-}
\ No newline at end of file
+  @Override
+  public String reportWarning(EObject object, String message) {
+    return null;
+  }
+
+  @Override
+  public String reportWarning(Path file, Integer line, String message) {
+    return null;
+  }
+
+  @Override
+  public String reportInfo(String message) {
+    return null;
+  }
+
+  @Override
+  public String reportInfo(EObject object, String message) {
+    return null;
+  }
+
+  @Override
+  public String reportInfo(Path file, Integer line, String message) {
+    return null;
+  }
+
+  @Override
+  public boolean getErrorsOccurred() {
+    return false;
+  }
+}
diff --git a/org.lflang/src/org/lflang/diagram/synthesis/util/UtilityExtensions.java b/org.lflang/src/org/lflang/diagram/synthesis/util/UtilityExtensions.java
index fb97bd1449..ca83da41a8 100644
--- a/org.lflang/src/org/lflang/diagram/synthesis/util/UtilityExtensions.java
+++ b/org.lflang/src/org/lflang/diagram/synthesis/util/UtilityExtensions.java
@@ -1,33 +1,38 @@
 /*************
-* Copyright (c) 2020, Kiel University.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.diagram.synthesis.util;
 
+import de.cau.cs.kieler.klighd.internal.util.KlighdInternalProperties;
+import de.cau.cs.kieler.klighd.kgraph.KGraphElement;
+import de.cau.cs.kieler.klighd.kgraph.KGraphFactory;
+import de.cau.cs.kieler.klighd.kgraph.KIdentifier;
+import de.cau.cs.kieler.klighd.kgraph.KNode;
+import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import org.eclipse.elk.core.math.ElkMargin;
 import org.eclipse.elk.core.options.CoreOptions;
 import org.eclipse.elk.core.util.IndividualSpacings;
@@ -39,163 +44,133 @@
 import org.lflang.diagram.synthesis.AbstractSynthesisExtensions;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Code;
-import org.lflang.lf.Expression;
-import org.lflang.lf.Host;
-import org.lflang.lf.Literal;
-import org.lflang.lf.ParameterReference;
 import org.lflang.lf.Reactor;
-import org.lflang.lf.Time;
-import org.lflang.util.StringUtil;
-
-import de.cau.cs.kieler.klighd.internal.util.KlighdInternalProperties;
-import de.cau.cs.kieler.klighd.kgraph.KGraphElement;
-import de.cau.cs.kieler.klighd.kgraph.KGraphFactory;
-import de.cau.cs.kieler.klighd.kgraph.KIdentifier;
-import de.cau.cs.kieler.klighd.kgraph.KNode;
-import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared;
 
 /**
  * Extension class that provides various utility methods for the synthesis.
- * 
+ *
  * @author Alexander Schulz-Rosengarten
  */
 @ViewSynthesisShared
 public class UtilityExtensions extends AbstractSynthesisExtensions {
-    
-    @Extension
-    private KGraphFactory _kGraphFactory = KGraphFactory.eINSTANCE;
-
-    
-    /**
-     * Returns true if the reactor is the primary reactor
-     */
-    public boolean isMainOrFederated(Reactor reactor) {
-        return reactor.isMain() || reactor.isFederated();
-    }
-    
-    /**
-     * Returns true if the instance is a bank of reactors
-     */
-//    def boolean isBank(Instantiation ins) {
-//        return ins?.widthSpec !== null ? ins.widthSpec.width !== 1 : false
-//    }
-    
-    /**
-     * Returns true if the reactor as has inner reactions or instances
-     */
-    public boolean hasContent(final ReactorInstance reactor) {
-        return !reactor.reactions.isEmpty() || !reactor.instantiations().isEmpty();
-    }
-    
-    /**
-     * 
-     */
-    public boolean isRoot(final ReactorInstance ri) {
-        return ri.getParent() == null;
+
+  @Extension private KGraphFactory _kGraphFactory = KGraphFactory.eINSTANCE;
+
+  /** Returns true if the reactor is the primary reactor */
+  public boolean isMainOrFederated(Reactor reactor) {
+    return reactor.isMain() || reactor.isFederated();
+  }
+
+  /** Returns true if the instance is a bank of reactors */
+  //    def boolean isBank(Instantiation ins) {
+  //        return ins?.widthSpec !== null ? ins.widthSpec.width !== 1 : false
+  //    }
+
+  /** Returns true if the reactor as has inner reactions or instances */
+  public boolean hasContent(final ReactorInstance reactor) {
+    return !reactor.reactions.isEmpty() || !reactor.instantiations().isEmpty();
+  }
+
+  /** */
+  public boolean isRoot(final ReactorInstance ri) {
+    return ri.getParent() == null;
+  }
+
+  /** Trims the hostcode of reactions. */
+  public String trimCode(final Code tokenizedCode) {
+    if (tokenizedCode == null || StringExtensions.isNullOrEmpty(tokenizedCode.getBody())) {
+      return "";
     }
-    
-    /**
-     * Trims the hostcode of reactions.
-     */
-    public String trimCode(final Code tokenizedCode) {
-        if (tokenizedCode == null || StringExtensions.isNullOrEmpty(tokenizedCode.getBody())) {
-            return "";
+    try {
+      ICompositeNode node = NodeModelUtils.findActualNodeFor(tokenizedCode);
+      String code = node != null ? node.getText() : null;
+      int contentStart = 0;
+      List<String> lines = new ArrayList<>();
+      Arrays.stream(code.split("\n"))
+          .dropWhile(line -> !line.contains("{="))
+          .forEachOrdered(lines::add);
+
+      // Remove start pattern
+      if (!lines.isEmpty()) {
+        if (IterableExtensions.head(lines).trim().equals("{=")) {
+          lines.remove(0); // skip
+        } else {
+          lines.set(0, IterableExtensions.head(lines).replace("{=", "").trim());
+          contentStart = 1;
         }
-        try {
-            ICompositeNode node = NodeModelUtils.findActualNodeFor(tokenizedCode);
-            String code = node != null ? node.getText() : null;
-            int contentStart = 0;
-            List<String> lines = new ArrayList<>();
-            Arrays.stream(code.split("\n")).dropWhile(line -> !line.contains("{=")).forEachOrdered(lines::add);
-            
-            // Remove start pattern
-            if (!lines.isEmpty()) {
-                if (IterableExtensions.head(lines).trim().equals("{=")) {
-                    lines.remove(0); // skip
-                } else {
-                    lines.set(0, IterableExtensions.head(lines).replace("{=", "").trim());
-                    contentStart = 1;
-                }
-            }
-            
-            // Remove end pattern
-            if (!lines.isEmpty()) {
-                if (IterableExtensions.last(lines).trim().equals("=}")) {
-                    lines.remove(lines.size() - 1); // skip
-                } else {
-                    lines.set(lines.size() - 1, IterableExtensions.last(lines).replace("=}", ""));
-                }
-            }
-            
-            // Find indentation
-            String indentation = null;
-            while (indentation == null && lines.size() > contentStart) {
-                String firstLine = lines.get(contentStart);
-                String trimmed = firstLine.trim();
-                if (trimmed.isEmpty()) {
-                    lines.set(contentStart, "");
-                    contentStart++;
-                } else {
-                    int firstCharIdx = firstLine.indexOf(trimmed.charAt(0));
-                    indentation = firstLine.substring(0, firstCharIdx);
-                }
-            }
-            
-            // Remove root indentation
-            if (!lines.isEmpty()) {
-                for (int i = 0; i < lines.size(); i++) {
-                    if (lines.get(i).startsWith(indentation)) {
-                        lines.set(i, lines.get(i).substring(indentation.length()));
-                    }
-                }
-            }
-            
-            return String.join("\n", lines);
-        } catch(Exception e) {
-            e.printStackTrace();
-            return tokenizedCode.getBody();
+      }
+
+      // Remove end pattern
+      if (!lines.isEmpty()) {
+        if (IterableExtensions.last(lines).trim().equals("=}")) {
+          lines.remove(lines.size() - 1); // skip
+        } else {
+          lines.set(lines.size() - 1, IterableExtensions.last(lines).replace("=}", ""));
         }
-    }
-    
-    /**
-     * Sets KGE ID.
-     */
-    public boolean setID(KGraphElement kge, String id) {
-        KIdentifier identifier  = _kGraphFactory.createKIdentifier();
-        identifier.setId(id);
-        return kge.getData().add(identifier);
-    }
-    
-    /**
-     * Retrieves the source element of the given diagram element
-     */
-    public Object sourceElement(KGraphElement elem) {
-        return elem.getProperty(KlighdInternalProperties.MODEL_ELEMEMT);
-    }
-    
-    /**
-     * Checks if the source element of the given diagram element is a reactor
-     */
-    public boolean sourceIsReactor(KNode node) {
-        return sourceElement(node) instanceof Reactor;
-    }
+      }
 
-    /**
-     * Returns the port placement margins for the node.
-     * If this spacing does not yet exist, the properties are initialized.
-     */
-    public ElkMargin getPortMarginsInitIfAbsent(KNode node) {
-        IndividualSpacings spacing = node.getProperty(CoreOptions.SPACING_INDIVIDUAL);
-        if (spacing == null) {
-            spacing = new IndividualSpacings();
-            node.setProperty(CoreOptions.SPACING_INDIVIDUAL, spacing);
+      // Find indentation
+      String indentation = null;
+      while (indentation == null && lines.size() > contentStart) {
+        String firstLine = lines.get(contentStart);
+        String trimmed = firstLine.trim();
+        if (trimmed.isEmpty()) {
+          lines.set(contentStart, "");
+          contentStart++;
+        } else {
+          int firstCharIdx = firstLine.indexOf(trimmed.charAt(0));
+          indentation = firstLine.substring(0, firstCharIdx);
         }
-        ElkMargin margin = spacing.getProperty(CoreOptions.SPACING_PORTS_SURROUNDING);
-        if (margin == null) {
-            margin = new ElkMargin();
-            node.setProperty(CoreOptions.SPACING_PORTS_SURROUNDING, margin);
+      }
+
+      // Remove root indentation
+      if (!lines.isEmpty()) {
+        for (int i = 0; i < lines.size(); i++) {
+          if (lines.get(i).startsWith(indentation)) {
+            lines.set(i, lines.get(i).substring(indentation.length()));
+          }
         }
-        return margin;
-    }    
+      }
+
+      return String.join("\n", lines);
+    } catch (Exception e) {
+      e.printStackTrace();
+      return tokenizedCode.getBody();
+    }
+  }
+
+  /** Sets KGE ID. */
+  public boolean setID(KGraphElement kge, String id) {
+    KIdentifier identifier = _kGraphFactory.createKIdentifier();
+    identifier.setId(id);
+    return kge.getData().add(identifier);
+  }
 
+  /** Retrieves the source element of the given diagram element */
+  public Object sourceElement(KGraphElement elem) {
+    return elem.getProperty(KlighdInternalProperties.MODEL_ELEMEMT);
+  }
+
+  /** Checks if the source element of the given diagram element is a reactor */
+  public boolean sourceIsReactor(KNode node) {
+    return sourceElement(node) instanceof Reactor;
+  }
+
+  /**
+   * Returns the port placement margins for the node. If this spacing does not yet exist, the
+   * properties are initialized.
+   */
+  public ElkMargin getPortMarginsInitIfAbsent(KNode node) {
+    IndividualSpacings spacing = node.getProperty(CoreOptions.SPACING_INDIVIDUAL);
+    if (spacing == null) {
+      spacing = new IndividualSpacings();
+      node.setProperty(CoreOptions.SPACING_INDIVIDUAL, spacing);
+    }
+    ElkMargin margin = spacing.getProperty(CoreOptions.SPACING_PORTS_SURROUNDING);
+    if (margin == null) {
+      margin = new ElkMargin();
+      node.setProperty(CoreOptions.SPACING_PORTS_SURROUNDING, margin);
+    }
+    return margin;
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtension.java b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
index a38b557ed5..5a41efbbd0 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtension.java
@@ -33,14 +33,13 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedASTUtils;
 import org.lflang.federated.generator.FedConnectionInstance;
 import org.lflang.federated.generator.FedFileConfig;
@@ -49,7 +48,6 @@
 import org.lflang.federated.serialization.FedROS2CPPSerialization;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.LFGeneratorContext;
-import org.lflang.generator.ReactionInstance;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.generator.c.CTypes;
 import org.lflang.generator.c.CUtil;
@@ -59,735 +57,799 @@
 import org.lflang.lf.VarRef;
 
 /**
- * An extension class to the CGenerator that enables certain federated
- * functionalities. Currently, this class offers the following features:
+ * An extension class to the CGenerator that enables certain federated functionalities. Currently,
+ * this class offers the following features:
  *
  * <ul>
- * <li>Allocating and initializing C structures for federated communication</li>
- * <li>Creating status field for network input ports that help the receiver logic in
- * federate.c communicate the status of a network input port with network input
- * control reactions.</li>
+ *   <li>Allocating and initializing C structures for federated communication
+ *   <li>Creating status field for network input ports that help the receiver logic in federate.c
+ *       communicate the status of a network input port with network input control reactions.
  * </ul>
  *
  * @author {Soroush Bateni <soroush@berkeley.edu>}
  * @author {Hou Seng Wong <housengw@berkeley.edu>}
  * @author {Billy Bao <billybao@berkeley.edu>}
- *
  */
 public class CExtension implements FedTargetExtension {
 
-    @Override
-    public void initializeTargetConfig(
-        LFGeneratorContext context,
-        int numOfFederates, FederateInstance federate,
-        FedFileConfig fileConfig,
-        ErrorReporter errorReporter,
-        RtiConfig rtiConfig
-    ) throws IOException {
-
-        CExtensionUtils.handleCompileDefinitions(federate, numOfFederates, rtiConfig);
-
-        generateCMakeInclude(federate, fileConfig);
-
-        federate.targetConfig.keepalive = true;
-        federate.targetConfig.setByUser.add(TargetProperty.KEEPALIVE);
-
-        // If there are federates, copy the required files for that.
-        // Also, create the RTI C file and the launcher script.
-        // Handle target parameters.
-        // If the program is federated, then ensure that threading is enabled.
-        federate.targetConfig.threading = true;
-        federate.targetConfig.setByUser.add(TargetProperty.THREADING);
-
-        // Include the fed setup file for this federate in the target property
-        String relPath = getPreamblePath(federate);
-        federate.targetConfig.fedSetupPreamble = relPath;
-        federate.targetConfig.setByUser.add(TargetProperty.FED_SETUP);
+  @Override
+  public void initializeTargetConfig(
+      LFGeneratorContext context,
+      int numOfFederates,
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      ErrorReporter errorReporter,
+      RtiConfig rtiConfig)
+      throws IOException {
+
+    CExtensionUtils.handleCompileDefinitions(federate, numOfFederates, rtiConfig);
+
+    generateCMakeInclude(federate, fileConfig);
+
+    federate.targetConfig.keepalive = true;
+    federate.targetConfig.setByUser.add(TargetProperty.KEEPALIVE);
+
+    // If there are federates, copy the required files for that.
+    // Also, create the RTI C file and the launcher script.
+    // Handle target parameters.
+    // If the program is federated, then ensure that threading is enabled.
+    federate.targetConfig.threading = true;
+    federate.targetConfig.setByUser.add(TargetProperty.THREADING);
+
+    // Include the fed setup file for this federate in the target property
+    String relPath = getPreamblePath(federate);
+    federate.targetConfig.fedSetupPreamble = relPath;
+    federate.targetConfig.setByUser.add(TargetProperty.FED_SETUP);
+  }
+
+  /** Generate a cmake-include file for {@code federate} if needed. */
+  protected void generateCMakeInclude(FederateInstance federate, FedFileConfig fileConfig)
+      throws IOException {
+    CExtensionUtils.generateCMakeInclude(federate, fileConfig);
+  }
+
+  /**
+   * Generate code for the body of a reaction that handles the action that is triggered by receiving
+   * a message from a remote federate.
+   *
+   * @param action The action.
+   * @param sendingPort The output port providing the data to send.
+   * @param receivingPort The ID of the destination port.
+   * @param connection FIXME
+   * @param type FIXME
+   * @param coordinationType The coordination type
+   * @param errorReporter
+   */
+  public String generateNetworkReceiverBody(
+      Action action,
+      VarRef sendingPort,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      CoordinationType coordinationType,
+      ErrorReporter errorReporter) {
+    var receiveRef =
+        CUtil.portRefInReaction(receivingPort, connection.getDstBank(), connection.getDstChannel());
+    var result = new CodeBuilder();
+    // Transfer the physical time of arrival from the action to the port
+    result.pr(
+        receiveRef
+            + "->physical_time_of_arrival = self->_lf__"
+            + action.getName()
+            + ".physical_time_of_arrival;");
+    if (coordinationType == CoordinationType.DECENTRALIZED
+        && !connection.getDefinition().isPhysical()) {
+      // Transfer the intended tag.
+      result.pr(
+          receiveRef + "->intended_tag = self->_lf__" + action.getName() + ".intended_tag;\n");
     }
 
-    /**
-     * Generate a cmake-include file for {@code federate} if needed.
-     */
-    protected void generateCMakeInclude(FederateInstance federate, FedFileConfig fileConfig) throws IOException {
-        CExtensionUtils.generateCMakeInclude(federate, fileConfig);
+    deserialize(action, receivingPort, connection, type, receiveRef, result, errorReporter);
+    return result.toString();
+  }
+
+  /**
+   * Generate code to deserialize a message received over the network.
+   *
+   * @param action The network action that is mapped to the {@code receivingPort}
+   * @param receivingPort The receiving port
+   * @param connection The connection used to receive the message
+   * @param type Type for the port
+   * @param receiveRef A target language reference to the receiving port
+   * @param result Used to put generated code in
+   * @param errorReporter Used to report errors, if any
+   */
+  protected void deserialize(
+      Action action,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      String receiveRef,
+      CodeBuilder result,
+      ErrorReporter errorReporter) {
+    CTypes types = new CTypes();
+    // Adjust the type of the action and the receivingPort.
+    // If it is "string", then change it to "char*".
+    // This string is dynamically allocated, and type 'string' is to be
+    // used only for statically allocated strings. This would force the
+    // CGenerator to treat the port and action as token types.
+    if (types.getTargetType(action).equals("string")) {
+      action.getType().setCode(null);
+      action.getType().setId("char*");
     }
-
-    /**
-     * Generate code for the body of a reaction that handles the
-     * action that is triggered by receiving a message from a remote
-     * federate.
-     * @param action The action.
-     * @param sendingPort The output port providing the data to send.
-     * @param receivingPort The ID of the destination port.
-     * @param connection FIXME
-     * @param type FIXME
-     * @param coordinationType The coordination type
-     * @param errorReporter
-     */
-    public String generateNetworkReceiverBody(
-        Action action,
-        VarRef sendingPort,
-        VarRef receivingPort,
-        FedConnectionInstance connection,
-        InferredType type,
-        CoordinationType coordinationType,
-        ErrorReporter errorReporter
-    ) {
-        var receiveRef = CUtil.portRefInReaction(receivingPort, connection.getDstBank(), connection.getDstChannel());
-        var result = new CodeBuilder();
-        // Transfer the physical time of arrival from the action to the port
-        result.pr(receiveRef+"->physical_time_of_arrival = self->_lf__"+action.getName()+".physical_time_of_arrival;");
-        if (coordinationType == CoordinationType.DECENTRALIZED && !connection.getDefinition().isPhysical()) {
-            // Transfer the intended tag.
-            result.pr(receiveRef+"->intended_tag = self->_lf__"+action.getName()+".intended_tag;\n");
-        }
-
-        deserialize(action, receivingPort, connection, type, receiveRef, result, errorReporter);
-        return result.toString();
+    if (types.getTargetType((Port) receivingPort.getVariable()).equals("string")) {
+      ((Port) receivingPort.getVariable()).getType().setCode(null);
+      ((Port) receivingPort.getVariable()).getType().setId("char*");
     }
-
-    /**
-     * Generate code to deserialize a message received over the network.
-     * @param action The network action that is mapped to the {@code receivingPort}
-     * @param receivingPort The receiving port
-     * @param connection The connection used to receive the message
-     * @param type Type for the port
-     * @param receiveRef A target language reference to the receiving port
-     * @param result Used to put generated code in
-     * @param errorReporter Used to report errors, if any
-     */
-    protected void deserialize(
-        Action action,
-        VarRef receivingPort,
-        FedConnectionInstance connection,
-        InferredType type,
-        String receiveRef,
-        CodeBuilder result,
-        ErrorReporter errorReporter
-    ) {
-        CTypes types = new CTypes();
-        // Adjust the type of the action and the receivingPort.
-        // If it is "string", then change it to "char*".
-        // This string is dynamically allocated, and type 'string' is to be
-        // used only for statically allocated strings. This would force the
-        // CGenerator to treat the port and action as token types.
-        if (types.getTargetType(action).equals("string")) {
-            action.getType().setCode(null);
-            action.getType().setId("char*");
-        }
-        if (types.getTargetType((Port) receivingPort.getVariable()).equals("string")) {
-            ((Port) receivingPort.getVariable()).getType().setCode(null);
-            ((Port) receivingPort.getVariable()).getType().setId("char*");
+    var value = "";
+    switch (connection.getSerializer()) {
+      case NATIVE:
+        {
+          // NOTE: Docs say that malloc'd char* is freed on conclusion of the time step.
+          // So passing it downstream should be OK.
+          value = action.getName() + "->value";
+          if (CUtil.isTokenType(type, types)) {
+            result.pr("lf_set_token(" + receiveRef + ", " + action.getName() + "->token);");
+          } else {
+            result.pr("lf_set(" + receiveRef + ", " + value + ");");
+          }
+          break;
         }
-        var value = "";
-        switch (connection.getSerializer()) {
-        case NATIVE: {
-            // NOTE: Docs say that malloc'd char* is freed on conclusion of the time step.
-            // So passing it downstream should be OK.
-            value = action.getName()+"->value";
-            if (CUtil.isTokenType(type, types)) {
-                result.pr("lf_set_token("+ receiveRef +", "+ action.getName()+"->token);");
-            } else {
-                result.pr("lf_set("+ receiveRef +", "+value+");");
-            }
-            break;
-        }
-        case PROTO: {
-            throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
+      case PROTO:
+        {
+          throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
         }
-        case ROS2: {
-            var portType = ASTUtils.getInferredType(((Port) receivingPort.getVariable()));
-            var portTypeStr = types.getTargetType(portType);
-            if (CUtil.isTokenType(portType, types)) {
-                throw new UnsupportedOperationException("Cannot handle ROS serialization when ports are pointers.");
-            } else if (CExtensionUtils.isSharedPtrType(portType, types)) {
-                var matcher = CExtensionUtils.sharedPointerVariable.matcher(portTypeStr);
-                if (matcher.find()) {
-                    portTypeStr = matcher.group("type");
-                }
+      case ROS2:
+        {
+          var portType = ASTUtils.getInferredType(((Port) receivingPort.getVariable()));
+          var portTypeStr = types.getTargetType(portType);
+          if (CUtil.isTokenType(portType, types)) {
+            throw new UnsupportedOperationException(
+                "Cannot handle ROS serialization when ports are pointers.");
+          } else if (CExtensionUtils.isSharedPtrType(portType, types)) {
+            var matcher = CExtensionUtils.sharedPointerVariable.matcher(portTypeStr);
+            if (matcher.find()) {
+              portTypeStr = matcher.group("type");
             }
-            var ROSDeserializer = new FedROS2CPPSerialization();
-            value = FedROS2CPPSerialization.deserializedVarName;
+          }
+          var ROSDeserializer = new FedROS2CPPSerialization();
+          value = FedROS2CPPSerialization.deserializedVarName;
+          result.pr(
+              ROSDeserializer.generateNetworkDeserializerCode(
+                  "self->_lf__" + action.getName(), portTypeStr));
+          if (CExtensionUtils.isSharedPtrType(portType, types)) {
             result.pr(
-                ROSDeserializer.generateNetworkDeserializerCode(
-                    "self->_lf__"+ action.getName(),
-                    portTypeStr
-                )
-            );
-            if (CExtensionUtils.isSharedPtrType(portType, types)) {
-                result.pr("auto msg_shared_ptr = std::make_shared<"+portTypeStr+">("+value+");");
-                result.pr("lf_set("+ receiveRef +", msg_shared_ptr);");
-            } else {
-                result.pr("lf_set("+ receiveRef +", std::move("+value+"));");
-            }
-            break;
-        }
+                "auto msg_shared_ptr = std::make_shared<" + portTypeStr + ">(" + value + ");");
+            result.pr("lf_set(" + receiveRef + ", msg_shared_ptr);");
+          } else {
+            result.pr("lf_set(" + receiveRef + ", std::move(" + value + "));");
+          }
+          break;
         }
     }
+  }
+
+  /**
+   * Generate code for the body of a reaction that handles an output that is to be sent over the
+   * network.
+   *
+   * @param sendingPort The output port providing the data to send.
+   * @param receivingPort The variable reference to the destination port.
+   * @param connection
+   * @param type
+   * @param coordinationType
+   * @param errorReporter FIXME
+   */
+  public String generateNetworkSenderBody(
+      VarRef sendingPort,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      CoordinationType coordinationType,
+      ErrorReporter errorReporter) {
+    var sendRef =
+        CUtil.portRefInReaction(sendingPort, connection.getSrcBank(), connection.getSrcChannel());
+    var receiveRef =
+        ASTUtils.generateVarRef(
+            receivingPort); // Used for comments only, so no need for bank/multiport index.
+    var result = new CodeBuilder();
+    // The ID of the receiving port (rightPort) is the position
+    // of the action in this list.
+    int receivingPortID = connection.getDstFederate().networkMessageActions.size();
+
+    result.pr(
+        "// Sending from "
+            + sendRef
+            + " in federate "
+            + connection.getSrcFederate().name
+            + " to "
+            + receiveRef
+            + " in federate "
+            + connection.getDstFederate().name);
+
+    // In case sendRef is a multiport or is in a bank, this reaction will be triggered when any
+    // channel or bank index of sendRef is present
+    // ex. if a.out[i] is present, the entire output a.out is triggered.
+    if (connection.getSrcBank() != -1 || connection.getSrcChannel() != -1) {
+      result.pr("if (!" + sendRef + "->is_present) return;");
+    }
 
-    /**
-     * Generate code for the body of a reaction that handles an output
-     * that is to be sent over the network.
-     * @param sendingPort The output port providing the data to send.
-     * @param receivingPort The variable reference to the destination port.
-     * @param connection
-     * @param type
-     * @param coordinationType
-     * @param errorReporter FIXME
-     */
-    public String generateNetworkSenderBody(
-        VarRef sendingPort,
-        VarRef receivingPort,
-        FedConnectionInstance connection,
-        InferredType type,
-        CoordinationType coordinationType,
-        ErrorReporter errorReporter
-    ) {
-        var sendRef = CUtil.portRefInReaction(sendingPort, connection.getSrcBank(), connection.getSrcChannel());
-        var receiveRef = ASTUtils.generateVarRef(receivingPort); // Used for comments only, so no need for bank/multiport index.
-        var result = new CodeBuilder();
-        // The ID of the receiving port (rightPort) is the position
-        // of the action in this list.
-        int receivingPortID = connection.getDstFederate().networkMessageActions.size();
-
-        result.pr("// Sending from " + sendRef + " in federate "
-                      + connection.getSrcFederate().name + " to " + receiveRef
-                      + " in federate " + connection.getDstFederate().name);
-
-        // In case sendRef is a multiport or is in a bank, this reaction will be triggered when any channel or bank index of sendRef is present
-        // ex. if a.out[i] is present, the entire output a.out is triggered.
-        if (connection.getSrcBank() != -1 || connection.getSrcChannel() != -1) {
-            result.pr("if (!"+sendRef+"->is_present) return;");
-        }
-
-        // If the connection is physical and the receiving federate is remote, send it directly on a socket.
-        // If the connection is logical and the coordination mode is centralized, send via RTI.
-        // If the connection is logical and the coordination mode is decentralized, send directly
-        String messageType;
-        // Name of the next immediate destination of this message
-        var next_destination_name = "\"federate "+connection.getDstFederate().id+"\"";
-
-        // Get the delay literal
-        String additionalDelayString = CExtensionUtils.getNetworkDelayLiteral(connection.getDefinition().getDelay());
-
-        if (connection.getDefinition().isPhysical()) {
-            messageType = "MSG_TYPE_P2P_MESSAGE";
-        } else if (coordinationType == CoordinationType.DECENTRALIZED) {
-            messageType = "MSG_TYPE_P2P_TAGGED_MESSAGE";
-        } else {
-            // Logical connection
-            // Send the message via rti
-            messageType = "MSG_TYPE_TAGGED_MESSAGE";
-            next_destination_name = "\"federate "+connection.getDstFederate().id+" via the RTI\"";
-        }
-
-
-        String sendingFunction = "send_timed_message";
-        String commonArgs = String.join(", ",
-                                        additionalDelayString,
-                                        messageType,
-                                        receivingPortID + "",
-                                        connection.getDstFederate().id + "",
-                                        next_destination_name,
-                                        "message_length"
-        );
-        if (connection.getDefinition().isPhysical()) {
-            // Messages going on a physical connection do not
-            // carry a timestamp or require the delay;
-            sendingFunction = "send_message";
-            commonArgs = messageType+", "+receivingPortID+", "+connection.getDstFederate().id+", "+next_destination_name+", message_length";
-        }
+    // If the connection is physical and the receiving federate is remote, send it directly on a
+    // socket.
+    // If the connection is logical and the coordination mode is centralized, send via RTI.
+    // If the connection is logical and the coordination mode is decentralized, send directly
+    String messageType;
+    // Name of the next immediate destination of this message
+    var next_destination_name = "\"federate " + connection.getDstFederate().id + "\"";
+
+    // Get the delay literal
+    String additionalDelayString =
+        CExtensionUtils.getNetworkDelayLiteral(connection.getDefinition().getDelay());
+
+    if (connection.getDefinition().isPhysical()) {
+      messageType = "MSG_TYPE_P2P_MESSAGE";
+    } else if (coordinationType == CoordinationType.DECENTRALIZED) {
+      messageType = "MSG_TYPE_P2P_TAGGED_MESSAGE";
+    } else {
+      // Logical connection
+      // Send the message via rti
+      messageType = "MSG_TYPE_TAGGED_MESSAGE";
+      next_destination_name = "\"federate " + connection.getDstFederate().id + " via the RTI\"";
+    }
 
-        serializeAndSend(
-            connection,
-            type,
-            sendRef,
-            result,
-            sendingFunction,
-            commonArgs,
-            errorReporter
-        );
-        return result.toString();
+    String sendingFunction = "send_timed_message";
+    String commonArgs =
+        String.join(
+            ", ",
+            additionalDelayString,
+            messageType,
+            receivingPortID + "",
+            connection.getDstFederate().id + "",
+            next_destination_name,
+            "message_length");
+    if (connection.getDefinition().isPhysical()) {
+      // Messages going on a physical connection do not
+      // carry a timestamp or require the delay;
+      sendingFunction = "send_message";
+      commonArgs =
+          messageType
+              + ", "
+              + receivingPortID
+              + ", "
+              + connection.getDstFederate().id
+              + ", "
+              + next_destination_name
+              + ", message_length";
     }
 
-    /**
-     * FIXME
-     * @param connection
-     * @param type
-     * @param sendRef
-     * @param result
-     * @param sendingFunction
-     * @param commonArgs
-     * @param errorReporter
-     */
-    protected void serializeAndSend(
-        FedConnectionInstance connection,
-        InferredType type,
-        String sendRef,
-        CodeBuilder result,
-        String sendingFunction,
-        String commonArgs,
-        ErrorReporter errorReporter
-    ) {
-        CTypes types = new CTypes();
-        var lengthExpression = "";
-        var pointerExpression = "";
-        switch (connection.getSerializer()) {
-        case NATIVE: {
-            // Handle native types.
-            if (CUtil.isTokenType(type, types)) {
-                // NOTE: Transporting token types this way is likely to only work if the sender and receiver
-                // both have the same endianness. Otherwise, you have to use protobufs or some other serialization scheme.
-                result.pr("size_t message_length = "+ sendRef +"->token->length * "+ sendRef
-                              +"->token->type->element_size;");
-                result.pr(sendingFunction +"("+ commonArgs +", (unsigned char*) "+ sendRef
-                              +"->value);");
-            } else {
-                // string types need to be dealt with specially because they are hidden pointers.
-                // void type is odd, but it avoids generating non-standard expression sizeof(void),
-                // which some compilers reject.
-                lengthExpression = "sizeof("+ types.getTargetType(type)+")";
-                pointerExpression = "(unsigned char*)&"+ sendRef +"->value";
-                var targetType = types.getTargetType(type);
-                if (targetType.equals("string")) {
-                    lengthExpression = "strlen("+ sendRef +"->value) + 1";
-                    pointerExpression = "(unsigned char*) "+ sendRef +"->value";
-                } else if (targetType.equals("void")) {
-                    lengthExpression = "0";
-                }
-                result.pr("size_t message_length = "+lengthExpression+";");
-                result.pr(
-                    sendingFunction +"("+ commonArgs +", "+pointerExpression+");");
+    serializeAndSend(connection, type, sendRef, result, sendingFunction, commonArgs, errorReporter);
+    return result.toString();
+  }
+
+  /**
+   * FIXME
+   *
+   * @param connection
+   * @param type
+   * @param sendRef
+   * @param result
+   * @param sendingFunction
+   * @param commonArgs
+   * @param errorReporter
+   */
+  protected void serializeAndSend(
+      FedConnectionInstance connection,
+      InferredType type,
+      String sendRef,
+      CodeBuilder result,
+      String sendingFunction,
+      String commonArgs,
+      ErrorReporter errorReporter) {
+    CTypes types = new CTypes();
+    var lengthExpression = "";
+    var pointerExpression = "";
+    switch (connection.getSerializer()) {
+      case NATIVE:
+        {
+          // Handle native types.
+          if (CUtil.isTokenType(type, types)) {
+            // NOTE: Transporting token types this way is likely to only work if the sender and
+            // receiver
+            // both have the same endianness. Otherwise, you have to use protobufs or some other
+            // serialization scheme.
+            result.pr(
+                "size_t message_length = "
+                    + sendRef
+                    + "->token->length * "
+                    + sendRef
+                    + "->token->type->element_size;");
+            result.pr(
+                sendingFunction + "(" + commonArgs + ", (unsigned char*) " + sendRef + "->value);");
+          } else {
+            // string types need to be dealt with specially because they are hidden pointers.
+            // void type is odd, but it avoids generating non-standard expression sizeof(void),
+            // which some compilers reject.
+            lengthExpression = "sizeof(" + types.getTargetType(type) + ")";
+            pointerExpression = "(unsigned char*)&" + sendRef + "->value";
+            var targetType = types.getTargetType(type);
+            if (targetType.equals("string")) {
+              lengthExpression = "strlen(" + sendRef + "->value) + 1";
+              pointerExpression = "(unsigned char*) " + sendRef + "->value";
+            } else if (targetType.equals("void")) {
+              lengthExpression = "0";
             }
-            break;
+            result.pr("size_t message_length = " + lengthExpression + ";");
+            result.pr(sendingFunction + "(" + commonArgs + ", " + pointerExpression + ");");
+          }
+          break;
         }
-        case PROTO: {
-            throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
+      case PROTO:
+        {
+          throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
         }
-        case ROS2: {
-            var variableToSerialize = sendRef;
-            var typeStr = types.getTargetType(type);
-            if (CUtil.isTokenType(type, types)) {
-                throw new UnsupportedOperationException("Cannot handle ROS serialization when ports are pointers.");
-            } else if (CExtensionUtils.isSharedPtrType(type, types)) {
-                var matcher = CExtensionUtils.sharedPointerVariable.matcher(typeStr);
-                if (matcher.find()) {
-                    typeStr = matcher.group("type");
-                }
+      case ROS2:
+        {
+          var variableToSerialize = sendRef;
+          var typeStr = types.getTargetType(type);
+          if (CUtil.isTokenType(type, types)) {
+            throw new UnsupportedOperationException(
+                "Cannot handle ROS serialization when ports are pointers.");
+          } else if (CExtensionUtils.isSharedPtrType(type, types)) {
+            var matcher = CExtensionUtils.sharedPointerVariable.matcher(typeStr);
+            if (matcher.find()) {
+              typeStr = matcher.group("type");
             }
-            var ROSSerializer = new FedROS2CPPSerialization();
-            lengthExpression = ROSSerializer.serializedBufferLength();
-            pointerExpression = ROSSerializer.seializedBufferVar();
-            result.pr(
-                ROSSerializer.generateNetworkSerializerCode(variableToSerialize, typeStr, CExtensionUtils.isSharedPtrType(type, types))
-            );
-            result.pr("size_t message_length = "+lengthExpression+";");
-            result.pr(sendingFunction +"("+ commonArgs +", "+pointerExpression+");");
-            break;
-        }
-
-        }
-    }
-
-    /**
-     * Generate code for the body of a reaction that decides whether the trigger for the given
-     * port is going to be present or absent for the current logical time.
-     * This reaction is put just before the first reaction that is triggered by the network
-     * input port "port" or has it in its sources. If there are only connections to contained
-     * reactors, in the top-level reactor.
-     *
-     * @param receivingPortID The port to generate the control reaction for
-     * @param maxSTP The maximum value of STP is assigned to reactions (if any)
-     *  that have port as their trigger or source
-     */
-    public String generateNetworkInputControlReactionBody(
-        int receivingPortID,
-        TimeValue maxSTP,
-        CoordinationType coordination
-    ) {
-        // Store the code
-        var result = new CodeBuilder();
-        result.pr("interval_t max_STP = 0LL;");
-
-        // Find the maximum STP for decentralized coordination
-        if(coordination == CoordinationType.DECENTRALIZED) {
-            result.pr("max_STP = "+ CTypes.getInstance().getTargetTimeExpr(maxSTP) +";");
+          }
+          var ROSSerializer = new FedROS2CPPSerialization();
+          lengthExpression = ROSSerializer.serializedBufferLength();
+          pointerExpression = ROSSerializer.seializedBufferVar();
+          result.pr(
+              ROSSerializer.generateNetworkSerializerCode(
+                  variableToSerialize, typeStr, CExtensionUtils.isSharedPtrType(type, types)));
+          result.pr("size_t message_length = " + lengthExpression + ";");
+          result.pr(sendingFunction + "(" + commonArgs + ", " + pointerExpression + ");");
+          break;
         }
-        result.pr("// Wait until the port status is known");
-        result.pr("wait_until_port_status_known("+receivingPortID+", max_STP);");
-        return result.toString();
     }
-
-    /**
-     * Generate code for the body of a reaction that sends a port status message for the given
-     * port if it is absent.
-     *
-     * @oaram srcOutputPort FIXME
-     * @param connection FIXME
-     */
-    public String generateNetworkOutputControlReactionBody(
-        VarRef srcOutputPort,
-        FedConnectionInstance connection
-    ) {
-        // Store the code
-        var result = new CodeBuilder();
-        // The ID of the receiving port (rightPort) is the position
-        // of the networkAction (see below) in this list.
-        int receivingPortID = connection.getDstFederate().networkMessageActions.size();
-        var sendRef = CUtil.portRefInReaction(srcOutputPort, connection.getSrcBank(), connection.getSrcChannel());
-        // Get the delay literal
-        var additionalDelayString = CExtensionUtils.getNetworkDelayLiteral(connection.getDefinition().getDelay());
-        result.pr(String.join("\n",
-                              "// If the output port has not been lf_set for the current logical time,",
-                              "// send an ABSENT message to the receiving federate            ",
-                              "LF_PRINT_LOG(\"Contemplating whether to send port \"",
-                              "          \"absent for port %d to federate %d.\", ",
-                              "          "+receivingPortID+", "+connection.getDstFederate().id+");",
-                              "if ("+sendRef+" == NULL || !"+sendRef+"->is_present) {",
-                              "    // The output port is NULL or it is not present.",
-                              "    send_port_absent_to_federate("+additionalDelayString+", "+receivingPortID+", "+connection.getDstFederate().id+");",
-                              "}"
-        ));
-        return result.toString();
+  }
+
+  /**
+   * Generate code for the body of a reaction that decides whether the trigger for the given port is
+   * going to be present or absent for the current logical time. This reaction is put just before
+   * the first reaction that is triggered by the network input port "port" or has it in its sources.
+   * If there are only connections to contained reactors, in the top-level reactor.
+   *
+   * @param receivingPortID The port to generate the control reaction for
+   * @param maxSTP The maximum value of STP is assigned to reactions (if any) that have port as
+   *     their trigger or source
+   */
+  public String generateNetworkInputControlReactionBody(
+      int receivingPortID, TimeValue maxSTP, CoordinationType coordination) {
+    // Store the code
+    var result = new CodeBuilder();
+    result.pr("interval_t max_STP = 0LL;");
+
+    // Find the maximum STP for decentralized coordination
+    if (coordination == CoordinationType.DECENTRALIZED) {
+      result.pr("max_STP = " + CTypes.getInstance().getTargetTimeExpr(maxSTP) + ";");
     }
-
-
-    public String getNetworkBufferType() {
-        return "uint8_t*";
+    result.pr("// Wait until the port status is known");
+    result.pr("wait_until_port_status_known(" + receivingPortID + ", max_STP);");
+    return result.toString();
+  }
+
+  /**
+   * Generate code for the body of a reaction that sends a port status message for the given port if
+   * it is absent.
+   *
+   * @oaram srcOutputPort FIXME
+   * @param connection FIXME
+   */
+  public String generateNetworkOutputControlReactionBody(
+      VarRef srcOutputPort, FedConnectionInstance connection) {
+    // Store the code
+    var result = new CodeBuilder();
+    // The ID of the receiving port (rightPort) is the position
+    // of the networkAction (see below) in this list.
+    int receivingPortID = connection.getDstFederate().networkMessageActions.size();
+    var sendRef =
+        CUtil.portRefInReaction(srcOutputPort, connection.getSrcBank(), connection.getSrcChannel());
+    // Get the delay literal
+    var additionalDelayString =
+        CExtensionUtils.getNetworkDelayLiteral(connection.getDefinition().getDelay());
+    result.pr(
+        String.join(
+            "\n",
+            "// If the output port has not been lf_set for the current logical time,",
+            "// send an ABSENT message to the receiving federate            ",
+            "LF_PRINT_LOG(\"Contemplating whether to send port \"",
+            "          \"absent for port %d to federate %d.\", ",
+            "          " + receivingPortID + ", " + connection.getDstFederate().id + ");",
+            "if (" + sendRef + " == NULL || !" + sendRef + "->is_present) {",
+            "    // The output port is NULL or it is not present.",
+            "    send_port_absent_to_federate("
+                + additionalDelayString
+                + ", "
+                + receivingPortID
+                + ", "
+                + connection.getDstFederate().id
+                + ");",
+            "}"));
+    return result.toString();
+  }
+
+  public String getNetworkBufferType() {
+    return "uint8_t*";
+  }
+
+  /**
+   * Add preamble to a separate file to set up federated execution. Return an empty string since no
+   * code generated needs to go in the source.
+   */
+  @Override
+  public String generatePreamble(
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      RtiConfig rtiConfig,
+      ErrorReporter errorReporter)
+      throws IOException {
+    // Put the C preamble in a {@code include/_federate.name + _preamble.h} file
+    String cPreamble = makePreamble(federate, fileConfig, rtiConfig, errorReporter);
+    String relPath = getPreamblePath(federate);
+    Path fedPreamblePath = fileConfig.getSrcPath().resolve(relPath);
+    Files.createDirectories(fedPreamblePath.getParent());
+    try (var writer = Files.newBufferedWriter(fedPreamblePath)) {
+      writer.write(cPreamble);
     }
-
-    /**
-     * Add preamble to a separate file to set up federated execution.
-     * Return an empty string since no code generated needs to go in the source.
-     */
-    @Override
-    public String generatePreamble(
-        FederateInstance federate,
-        FedFileConfig fileConfig,
-        RtiConfig rtiConfig,
-        ErrorReporter errorReporter
-    ) throws IOException {
-        // Put the C preamble in a {@code include/_federate.name + _preamble.h} file
-        String cPreamble = makePreamble(federate, fileConfig, rtiConfig, errorReporter);
-        String relPath = getPreamblePath(federate);
-        Path fedPreamblePath = fileConfig.getSrcPath().resolve(relPath);
-        Files.createDirectories(fedPreamblePath.getParent());
-        try (var writer = Files.newBufferedWriter(fedPreamblePath)) {
-            writer.write(cPreamble);
-        }
-        var includes = new CodeBuilder();
-        if (federate.targetConfig.target != Target.Python) {
-            includes.pr("#ifdef __cplusplus\n"
-                + "extern \"C\" {\n"
-                + "#endif");
-            includes.pr("#include \"core/federated/federate.h\"");
-            includes.pr("#include \"core/federated/net_common.h\"");
-            includes.pr("#include \"core/federated/net_util.h\"");
-            includes.pr("#include \"core/federated/clock-sync.h\"");
-            includes.pr("#include \"core/threaded/reactor_threaded.h\"");
-            includes.pr("#include \"core/utils/util.h\"");
-            includes.pr("extern federate_instance_t _fed;");
-            includes.pr("#ifdef __cplusplus\n"
-                + "}\n"
-                + "#endif");
-            includes.pr(generateSerializationIncludes(federate, fileConfig));
-        }
-
-        return includes.toString();
+    var includes = new CodeBuilder();
+    if (federate.targetConfig.target != Target.Python) {
+      includes.pr("#ifdef __cplusplus\n" + "extern \"C\" {\n" + "#endif");
+      includes.pr("#include \"core/federated/federate.h\"");
+      includes.pr("#include \"core/federated/net_common.h\"");
+      includes.pr("#include \"core/federated/net_util.h\"");
+      includes.pr("#include \"core/federated/clock-sync.h\"");
+      includes.pr("#include \"core/threaded/reactor_threaded.h\"");
+      includes.pr("#include \"core/utils/util.h\"");
+      includes.pr("extern federate_instance_t _fed;");
+      includes.pr("#ifdef __cplusplus\n" + "}\n" + "#endif");
+      includes.pr(generateSerializationIncludes(federate, fileConfig));
     }
 
-    /**
-     * Generate the preamble to setup federated execution in C.
-     */
-    protected String makePreamble(
-        FederateInstance federate,
-        FedFileConfig fileConfig,
-        RtiConfig rtiConfig,
-        ErrorReporter errorReporter) {
-
-        var code = new CodeBuilder();
-
-        code.pr("#include \"core/federated/federate.h\"");
-        code.pr("#include \"core/federated/net_common.h\"");
-        code.pr("#include \"core/federated/net_util.h\"");
-        code.pr("#include \"core/threaded/reactor_threaded.h\"");
-        code.pr("#include \"core/utils/util.h\"");
-        code.pr("extern federate_instance_t _fed;");
-
-        // Generate function to return a pointer to the action trigger_t
-        // that handles incoming network messages destined to the specified
-        // port. This will only be used if there are federates.
-        int numOfNetworkActions = federate.networkMessageActions.size();
-        code.pr("""
+    return includes.toString();
+  }
+
+  /** Generate the preamble to setup federated execution in C. */
+  protected String makePreamble(
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      RtiConfig rtiConfig,
+      ErrorReporter errorReporter) {
+
+    var code = new CodeBuilder();
+
+    code.pr("#include \"core/federated/federate.h\"");
+    code.pr("#include \"core/federated/net_common.h\"");
+    code.pr("#include \"core/federated/net_util.h\"");
+    code.pr("#include \"core/threaded/reactor_threaded.h\"");
+    code.pr("#include \"core/utils/util.h\"");
+    code.pr("extern federate_instance_t _fed;");
+
+    // Generate function to return a pointer to the action trigger_t
+    // that handles incoming network messages destined to the specified
+    // port. This will only be used if there are federates.
+    int numOfNetworkActions = federate.networkMessageActions.size();
+    code.pr(
+        """
         lf_action_base_t* _lf_action_table[%1$s];
         size_t _lf_action_table_size = %1$s;
-        """.formatted(numOfNetworkActions));
+        """
+            .formatted(numOfNetworkActions));
 
-        int numOfNetworkReactions = federate.networkReceiverReactions.size();
-        code.pr("""
+    int numOfNetworkReactions = federate.networkReceiverReactions.size();
+    code.pr(
+        """
         reaction_t* networkInputReactions[%1$s];
         size_t numNetworkInputReactions = %1$s;
-        """.formatted(numOfNetworkReactions));
+        """
+            .formatted(numOfNetworkReactions));
 
-        int numOfNetworkSenderControlReactions = federate.networkSenderControlReactions.size();
-        code.pr("""
+    int numOfNetworkSenderControlReactions = federate.networkSenderControlReactions.size();
+    code.pr(
+        """
         reaction_t* portAbsentReaction[%1$s];
         size_t numSenderReactions = %1$s;
-        """.formatted(numOfNetworkSenderControlReactions));
+        """
+            .formatted(numOfNetworkSenderControlReactions));
 
-
-        int numOfSTAAOffsets = federate.stpOffsets.size();
-        code.pr(CExtensionUtils.surroundWithIfFederatedDecentralized("""
+    int numOfSTAAOffsets = federate.stpOffsets.size();
+    code.pr(
+        CExtensionUtils.surroundWithIfFederatedDecentralized(
+            """
             staa_t* staa_lst[%1$s];
             size_t staa_lst_size = %1$s;
-        """.formatted(numOfSTAAOffsets)));
-
-        code.pr(generateExecutablePreamble(federate, rtiConfig, errorReporter));
-
-        code.pr(generateSTAAInitialization(federate, rtiConfig, errorReporter));
-
-        code.pr(generateInitializeTriggers(federate, errorReporter));
-
-        code.pr(CExtensionUtils.generateFederateNeighborStructure(federate));
-
-        return code.getCode();
-    }
-
-    /**
-     * Generate preamble code needed for enabled serializers of the federate.
-     */
-    protected String generateSerializationIncludes(FederateInstance federate, FedFileConfig fileConfig) {
-        return CExtensionUtils.generateSerializationIncludes(federate, fileConfig);
-    }
-
-    /**
-     * Create a function that initializes necessary triggers for federated execution,
-     * which are the triggers for control reactions and references to all network
-     * actions (which are triggered upon receiving network messages).
-     *
-     * @param federate The federate to initialize triggers for.
-     * @param errorReporter Used to report errors.
-     * @return The generated code for the macro.
-     */
-    private String generateInitializeTriggers(FederateInstance federate, ErrorReporter errorReporter) {
-        CodeBuilder code = new CodeBuilder();
-        // Temporarily change the original federate reactor's name in the AST to
-        // the federate's name so that trigger references are accurate.
-        var federatedReactor = FedASTUtils.findFederatedReactor(federate.instantiation.eResource());
-        var oldFederatedReactorName = federatedReactor.getName();
-        federatedReactor.setName(federate.name);
-        var main = new ReactorInstance(federatedReactor, errorReporter, -1);
-        code.pr(CExtensionUtils.initializeTriggersForNetworkActions(federate, main, errorReporter));
-        code.pr("staa_initialization(); \\");
-        //code.pr(CExtensionUtils.initializeTriggersForControlReactions(federate, main, errorReporter));
-        //code.pr(CExtensionUtils.networkInputReactions(federate, main));
-        //code.pr(CExtensionUtils.portAbsentReaction(federate, main));
-        federatedReactor.setName(oldFederatedReactorName);
-
-        return """
+        """
+                .formatted(numOfSTAAOffsets)));
+
+    code.pr(generateExecutablePreamble(federate, rtiConfig, errorReporter));
+
+    code.pr(generateSTAAInitialization(federate, rtiConfig, errorReporter));
+
+    code.pr(generateInitializeTriggers(federate, errorReporter));
+
+    code.pr(CExtensionUtils.generateFederateNeighborStructure(federate));
+
+    return code.getCode();
+  }
+
+  /** Generate preamble code needed for enabled serializers of the federate. */
+  protected String generateSerializationIncludes(
+      FederateInstance federate, FedFileConfig fileConfig) {
+    return CExtensionUtils.generateSerializationIncludes(federate, fileConfig);
+  }
+
+  /**
+   * Create a function that initializes necessary triggers for federated execution, which are the
+   * triggers for control reactions and references to all network actions (which are triggered upon
+   * receiving network messages).
+   *
+   * @param federate The federate to initialize triggers for.
+   * @param errorReporter Used to report errors.
+   * @return The generated code for the macro.
+   */
+  private String generateInitializeTriggers(
+      FederateInstance federate, ErrorReporter errorReporter) {
+    CodeBuilder code = new CodeBuilder();
+    // Temporarily change the original federate reactor's name in the AST to
+    // the federate's name so that trigger references are accurate.
+    var federatedReactor = FedASTUtils.findFederatedReactor(federate.instantiation.eResource());
+    var oldFederatedReactorName = federatedReactor.getName();
+    federatedReactor.setName(federate.name);
+    var main = new ReactorInstance(federatedReactor, errorReporter, -1);
+    code.pr(CExtensionUtils.initializeTriggersForNetworkActions(federate, main, errorReporter));
+    code.pr("staa_initialization(); \\");
+    // code.pr(CExtensionUtils.initializeTriggersForControlReactions(federate, main,
+    // errorReporter));
+    // code.pr(CExtensionUtils.networkInputReactions(federate, main));
+    // code.pr(CExtensionUtils.portAbsentReaction(federate, main));
+    federatedReactor.setName(oldFederatedReactorName);
+
+    return """
             #define initialize_triggers_for_federate() \\
             do { \\
             %s
             } \\
             while (0)
-            """.formatted((code.getCode().isBlank() ? "\\" : code.getCode()).indent(4).stripTrailing());
-    }
+            """
+        .formatted((code.getCode().isBlank() ? "\\" : code.getCode()).indent(4).stripTrailing());
+  }
 
-    /**
-     * Generate code for an executed preamble.
-     *
-     */
-    private String generateExecutablePreamble(FederateInstance federate, RtiConfig rtiConfig, ErrorReporter errorReporter) {
-        CodeBuilder code = new CodeBuilder();
+  /** Generate code for an executed preamble. */
+  private String generateExecutablePreamble(
+      FederateInstance federate, RtiConfig rtiConfig, ErrorReporter errorReporter) {
+    CodeBuilder code = new CodeBuilder();
 
-        code.pr(generateCodeForPhysicalActions(federate, errorReporter));
+    code.pr(generateCodeForPhysicalActions(federate, errorReporter));
 
-        code.pr(generateCodeToInitializeFederate(federate, rtiConfig));
+    code.pr(generateCodeToInitializeFederate(federate, rtiConfig));
 
-        //code.pr(CExtensionUtils.allocateTriggersForFederate(federate));
+    // code.pr(CExtensionUtils.allocateTriggersForFederate(federate));
 
-        return """
+    return """
             void _lf_executable_preamble() {
             %s
             }
-            """.formatted(code.toString().indent(4).stripTrailing());
-    }
+            """
+        .formatted(code.toString().indent(4).stripTrailing());
+  }
 
-     /**
-     * Generate code for an executed preamble.
-     *
-     */
-    private String generateSTAAInitialization(FederateInstance federate, RtiConfig rtiConfig, ErrorReporter errorReporter) {
-        CodeBuilder code = new CodeBuilder();
-        code.pr(CExtensionUtils.surroundWithIfFederatedDecentralized(CExtensionUtils.stpStructs(federate, errorReporter)));
+  /** Generate code for an executed preamble. */
+  private String generateSTAAInitialization(
+      FederateInstance federate, RtiConfig rtiConfig, ErrorReporter errorReporter) {
+    CodeBuilder code = new CodeBuilder();
+    code.pr(
+        CExtensionUtils.surroundWithIfFederatedDecentralized(
+            CExtensionUtils.stpStructs(federate, errorReporter)));
 
-        //code.pr(CExtensionUtils.allocateTriggersForFederate(federate));
+    // code.pr(CExtensionUtils.allocateTriggersForFederate(federate));
 
-        return """
+    return """
             void staa_initialization() {
             %s
             }
-            """.formatted(code.toString().indent(4).stripTrailing());
+            """
+        .formatted(code.toString().indent(4).stripTrailing());
+  }
+
+  /**
+   * Generate code to initialize the {@code federate}.
+   *
+   * @param rtiConfig
+   * @return The generated code
+   */
+  private String generateCodeToInitializeFederate(FederateInstance federate, RtiConfig rtiConfig) {
+    CodeBuilder code = new CodeBuilder();
+    code.pr("// ***** Start initializing the federated execution. */");
+    code.pr(
+        String.join(
+            "\n",
+            "// Initialize the socket mutex",
+            "lf_mutex_init(&outbound_socket_mutex);",
+            "lf_cond_init(&port_status_changed, &mutex);",
+            CExtensionUtils.surroundWithIfFederatedDecentralized(
+                "lf_cond_init(&logical_time_changed, &mutex);")));
+
+    // Find the STA (A.K.A. the global STP offset) for this federate.
+    if (federate.targetConfig.coordination == CoordinationType.DECENTRALIZED) {
+      var reactor = ASTUtils.toDefinition(federate.instantiation.getReactorClass());
+      var stpParam =
+          reactor.getParameters().stream()
+              .filter(
+                  param ->
+                      param.getName().equalsIgnoreCase("STP_offset")
+                          && (param.getType() == null || param.getType().isTime()))
+              .findFirst();
+
+      if (stpParam.isPresent()) {
+        var globalSTP =
+            ASTUtils.initialValue(stpParam.get(), List.of(federate.instantiation)).get(0);
+        var globalSTPTV = ASTUtils.getLiteralTimeValue(globalSTP);
+        code.pr("lf_set_stp_offset(" + CTypes.getInstance().getTargetTimeExpr(globalSTPTV) + ");");
+      }
     }
 
-    /**
-     * Generate code to initialize the {@code federate}.
-     * @param rtiConfig
-     * @return The generated code
-     */
-    private String generateCodeToInitializeFederate(FederateInstance federate, RtiConfig rtiConfig) {
-        CodeBuilder code = new CodeBuilder();
-        code.pr("// ***** Start initializing the federated execution. */");
-        code.pr(String.join("\n",
-                            "// Initialize the socket mutex",
-                            "lf_mutex_init(&outbound_socket_mutex);",
-                            "lf_cond_init(&port_status_changed, &mutex);",
-                            CExtensionUtils.surroundWithIfFederatedDecentralized("lf_cond_init(&logical_time_changed, &mutex);")
-        ));
-
-        // Find the STA (A.K.A. the global STP offset) for this federate.
-        if (federate.targetConfig.coordination == CoordinationType.DECENTRALIZED) {
-            var reactor = ASTUtils.toDefinition(federate.instantiation.getReactorClass());
-            var stpParam = reactor.getParameters().stream().filter(
-                    param ->
-                        param.getName().equalsIgnoreCase("STP_offset")
-                            && (param.getType() == null || param.getType().isTime())
-            ).findFirst();
-
-            if (stpParam.isPresent()) {
-                var globalSTP = ASTUtils.initialValue(stpParam.get(), List.of(federate.instantiation)).get(0);
-                var globalSTPTV = ASTUtils.getLiteralTimeValue(globalSTP);
-                code.pr("lf_set_stp_offset("+ CTypes.getInstance().getTargetTimeExpr(globalSTPTV) +");");
-            }
-        }
-
-        // Set indicator variables that specify whether the federate has
-        // upstream logical connections.
-        if (federate.dependsOn.size() > 0) {
-            code.pr("_fed.has_upstream  = true;");
-        }
-        if (federate.sendsTo.size() > 0) {
-            code.pr("_fed.has_downstream = true;");
-        }
-        // Set global variable identifying the federate.
-        code.pr("_lf_my_fed_id = "+ federate.id+";");
-
-        // We keep separate record for incoming and outgoing p2p connections to allow incoming traffic to be processed in a separate
-        // thread without requiring a mutex lock.
-        var numberOfInboundConnections = federate.inboundP2PConnections.size();
-        var numberOfOutboundConnections  = federate.outboundP2PConnections.size();
-
-        code.pr(String.join("\n",
-                            "_fed.number_of_inbound_p2p_connections = "+numberOfInboundConnections+";",
-                            "_fed.number_of_outbound_p2p_connections = "+numberOfOutboundConnections+";"
-        ));
-        if (numberOfInboundConnections > 0) {
-            code.pr(String.join("\n",
-                                "// Initialize the array of socket for incoming connections to -1.",
-                                "for (int i = 0; i < NUMBER_OF_FEDERATES; i++) {",
-                                "    _fed.sockets_for_inbound_p2p_connections[i] = -1;",
-                                "}"
-            ));
-        }
-        if (numberOfOutboundConnections > 0) {
-            code.pr(String.join("\n",
-                                "// Initialize the array of socket for outgoing connections to -1.",
-                                "for (int i = 0; i < NUMBER_OF_FEDERATES; i++) {",
-                                "    _fed.sockets_for_outbound_p2p_connections[i] = -1;",
-                                "}"
-            ));
-        }
+    // Set indicator variables that specify whether the federate has
+    // upstream logical connections.
+    if (federate.dependsOn.size() > 0) {
+      code.pr("_fed.has_upstream  = true;");
+    }
+    if (federate.sendsTo.size() > 0) {
+      code.pr("_fed.has_downstream = true;");
+    }
+    // Set global variable identifying the federate.
+    code.pr("_lf_my_fed_id = " + federate.id + ";");
+
+    // We keep separate record for incoming and outgoing p2p connections to allow incoming traffic
+    // to be processed in a separate
+    // thread without requiring a mutex lock.
+    var numberOfInboundConnections = federate.inboundP2PConnections.size();
+    var numberOfOutboundConnections = federate.outboundP2PConnections.size();
+
+    code.pr(
+        String.join(
+            "\n",
+            "_fed.number_of_inbound_p2p_connections = " + numberOfInboundConnections + ";",
+            "_fed.number_of_outbound_p2p_connections = " + numberOfOutboundConnections + ";"));
+    if (numberOfInboundConnections > 0) {
+      code.pr(
+          String.join(
+              "\n",
+              "// Initialize the array of socket for incoming connections to -1.",
+              "for (int i = 0; i < NUMBER_OF_FEDERATES; i++) {",
+              "    _fed.sockets_for_inbound_p2p_connections[i] = -1;",
+              "}"));
+    }
+    if (numberOfOutboundConnections > 0) {
+      code.pr(
+          String.join(
+              "\n",
+              "// Initialize the array of socket for outgoing connections to -1.",
+              "for (int i = 0; i < NUMBER_OF_FEDERATES; i++) {",
+              "    _fed.sockets_for_outbound_p2p_connections[i] = -1;",
+              "}"));
+    }
 
-        // If a test clock offset has been specified, insert code to set it here.
-        if (federate.targetConfig.clockSyncOptions.testOffset != null) {
-            code.pr("lf_set_physical_clock_offset((1 + "+ federate.id+") * "+ federate.targetConfig.clockSyncOptions.testOffset.toNanoSeconds()+"LL);");
-        }
+    // If a test clock offset has been specified, insert code to set it here.
+    if (federate.targetConfig.clockSyncOptions.testOffset != null) {
+      code.pr(
+          "lf_set_physical_clock_offset((1 + "
+              + federate.id
+              + ") * "
+              + federate.targetConfig.clockSyncOptions.testOffset.toNanoSeconds()
+              + "LL);");
+    }
 
-        code.pr(String.join("\n",
-                            "// Connect to the RTI. This sets _fed.socket_TCP_RTI and _lf_rti_socket_UDP.",
-                            "connect_to_rti("+addDoubleQuotes(rtiConfig.getHost())+", "+ rtiConfig.getPort()+");"
-        ));
+    code.pr(
+        String.join(
+            "\n",
+            "// Connect to the RTI. This sets _fed.socket_TCP_RTI and _lf_rti_socket_UDP.",
+            "connect_to_rti("
+                + addDoubleQuotes(rtiConfig.getHost())
+                + ", "
+                + rtiConfig.getPort()
+                + ");"));
+
+    // Disable clock synchronization for the federate if it resides on the same host as the RTI,
+    // unless that is overridden with the clock-sync-options target property.
+    if (CExtensionUtils.clockSyncIsOn(federate, rtiConfig)) {
+      code.pr("synchronize_initial_physical_clock_with_rti(_fed.socket_TCP_RTI);");
+    }
 
-        // Disable clock synchronization for the federate if it resides on the same host as the RTI,
-        // unless that is overridden with the clock-sync-options target property.
-        if (CExtensionUtils.clockSyncIsOn(federate, rtiConfig)) {
-            code.pr("synchronize_initial_physical_clock_with_rti(_fed.socket_TCP_RTI);");
-        }
+    if (numberOfInboundConnections > 0) {
+      code.pr(
+          String.join(
+              "\n",
+              "// Create a socket server to listen to other federates.",
+              "// If a port is specified by the user, that will be used",
+              "// as the only possibility for the server. If not, the port",
+              "// will start from STARTING_PORT. The function will",
+              "// keep incrementing the port until the number of tries reaches PORT_RANGE_LIMIT.",
+              "create_server(" + federate.port + ");",
+              "// Connect to remote federates for each physical connection.",
+              "// This is done in a separate thread because this thread will call",
+              "// connect_to_federate for each outbound physical connection at the same",
+              "// time that the new thread is listening for such connections for inbound",
+              "// physical connections. The thread will live until all connections",
+              "// have been established.",
+              "lf_thread_create(&_fed.inbound_p2p_handling_thread_id,"
+                  + " handle_p2p_connections_from_federates, NULL);"));
+    }
 
-        if (numberOfInboundConnections > 0) {
-            code.pr(String.join("\n",
-                                "// Create a socket server to listen to other federates.",
-                                "// If a port is specified by the user, that will be used",
-                                "// as the only possibility for the server. If not, the port",
-                                "// will start from STARTING_PORT. The function will",
-                                "// keep incrementing the port until the number of tries reaches PORT_RANGE_LIMIT.",
-                                "create_server("+ federate.port+");",
-                                "// Connect to remote federates for each physical connection.",
-                                "// This is done in a separate thread because this thread will call",
-                                "// connect_to_federate for each outbound physical connection at the same",
-                                "// time that the new thread is listening for such connections for inbound",
-                                "// physical connections. The thread will live until all connections",
-                                "// have been established.",
-                                "lf_thread_create(&_fed.inbound_p2p_handling_thread_id, handle_p2p_connections_from_federates, NULL);"
-            ));
+    for (FederateInstance remoteFederate : federate.outboundP2PConnections) {
+      code.pr("connect_to_federate(" + remoteFederate.id + ");");
+    }
+    return code.getCode();
+  }
+
+  /**
+   * Generate code to handle physical actions in the {@code federate}.
+   *
+   * @param errorReporter Used to report errors.
+   * @return Generated code.
+   */
+  private String generateCodeForPhysicalActions(
+      FederateInstance federate, ErrorReporter errorReporter) {
+    CodeBuilder code = new CodeBuilder();
+    if (federate.targetConfig.coordination.equals(CoordinationType.CENTRALIZED)) {
+      // If this program uses centralized coordination then check
+      // for outputs that depend on physical actions so that null messages can be
+      // sent to the RTI.
+      var federateClass = ASTUtils.toDefinition(federate.instantiation.getReactorClass());
+      var main =
+          new ReactorInstance(
+              FedASTUtils.findFederatedReactor(federate.instantiation.eResource()),
+              errorReporter,
+              1);
+      var instance = new ReactorInstance(federateClass, main, errorReporter);
+      var outputDelayMap = federate.findOutputsConnectedToPhysicalActions(instance);
+      var minDelay = TimeValue.MAX_VALUE;
+      Output outputFound = null;
+      for (Output output : outputDelayMap.keySet()) {
+        var outputDelay = outputDelayMap.get(output);
+        if (outputDelay.isEarlierThan(minDelay)) {
+          minDelay = outputDelay;
+          outputFound = output;
         }
-
-        for (FederateInstance remoteFederate : federate.outboundP2PConnections) {
-            code.pr("connect_to_federate("+remoteFederate.id+");");
+      }
+      if (minDelay != TimeValue.MAX_VALUE) {
+        // Unless silenced, issue a warning.
+        if (federate.targetConfig.coordinationOptions.advance_message_interval == null) {
+          errorReporter.reportWarning(
+              outputFound,
+              String.join(
+                  "\n",
+                  "Found a path from a physical action to output for reactor "
+                      + addDoubleQuotes(instance.getName())
+                      + ". ",
+                  "The amount of delay is " + minDelay + ".",
+                  "With centralized coordination, this can result in a large number of messages to"
+                      + " the RTI.",
+                  "Consider refactoring the code so that the output does not depend on the physical"
+                      + " action,",
+                  "or consider using decentralized coordination. To silence this warning, set the"
+                      + " target",
+                  "parameter coordination-options with a value like {advance-message-interval: 10"
+                      + " msec}"));
         }
-        return code.getCode();
+        code.pr(
+            "_fed.min_delay_from_physical_action_to_federate_output = "
+                + CTypes.getInstance().getTargetTimeExpr(minDelay)
+                + ";");
+      }
     }
+    return code.getCode();
+  }
 
-    /**
-     * Generate code to handle physical actions in the {@code federate}.
-     * @param errorReporter Used to report errors.
-     * @return Generated code.
-     */
-    private String generateCodeForPhysicalActions(FederateInstance federate, ErrorReporter errorReporter) {
-        CodeBuilder code = new CodeBuilder();
-        if (federate.targetConfig.coordination.equals(CoordinationType.CENTRALIZED)) {
-            // If this program uses centralized coordination then check
-            // for outputs that depend on physical actions so that null messages can be
-            // sent to the RTI.
-            var federateClass = ASTUtils.toDefinition(federate.instantiation.getReactorClass());
-            var main = new ReactorInstance(FedASTUtils.findFederatedReactor(federate.instantiation.eResource()), errorReporter, 1);
-            var instance = new ReactorInstance(federateClass, main, errorReporter);
-            var outputDelayMap = federate
-                .findOutputsConnectedToPhysicalActions(instance);
-            var minDelay = TimeValue.MAX_VALUE;
-            Output outputFound = null;
-            for (Output output : outputDelayMap.keySet()) {
-                var outputDelay = outputDelayMap.get(output);
-                if (outputDelay.isEarlierThan(minDelay)) {
-                    minDelay = outputDelay;
-                    outputFound = output;
-                }
-            }
-            if (minDelay != TimeValue.MAX_VALUE) {
-                // Unless silenced, issue a warning.
-                if (federate.targetConfig.coordinationOptions.advance_message_interval
-                    == null) {
-                    errorReporter.reportWarning(outputFound, String.join("\n",
-                                                                         "Found a path from a physical action to output for reactor "
-                                                                             + addDoubleQuotes(instance.getName())
-                                                                             + ". ",
-                                                                         "The amount of delay is "
-                                                                             + minDelay
-                                                                             + ".",
-                                                                         "With centralized coordination, this can result in a large number of messages to the RTI.",
-                                                                         "Consider refactoring the code so that the output does not depend on the physical action,",
-                                                                         "or consider using decentralized coordination. To silence this warning, set the target",
-                                                                         "parameter coordination-options with a value like {advance-message-interval: 10 msec}"
-                    ));
-                }
-                code.pr(
-                    "_fed.min_delay_from_physical_action_to_federate_output = "
-                        + CTypes.getInstance().getTargetTimeExpr(minDelay) + ";");
-            }
-        }
-        return code.getCode();
-    }
-    private String getPreamblePath(FederateInstance f) {
-        return "include" + File.separator + "_" + f.name + "_preamble.h";
-    }
+  private String getPreamblePath(FederateInstance f) {
+    return "include" + File.separator + "_" + f.name + "_preamble.h";
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
index b8f3e2cd11..1f9fbc2454 100644
--- a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java
@@ -8,14 +8,13 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.regex.Pattern;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig.ClockSyncOptions;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.ClockSyncMode;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
 import org.lflang.federated.launcher.RtiConfig;
@@ -29,675 +28,704 @@
 import org.lflang.lf.Expression;
 import org.lflang.lf.Input;
 import org.lflang.lf.ParameterReference;
-import org.lflang.lf.Reactor;
-import org.lflang.lf.ReactorDecl;
-import org.lflang.lf.VarRef;
 
 public class CExtensionUtils {
 
-    // Regular expression pattern for shared_ptr types.
-    static final Pattern sharedPointerVariable = Pattern.compile("^(/\\*.*?\\*/)?std::shared_ptr<(?<type>((/\\*.*?\\*/)?(\\S+))+)>$");
-
-    /**
-     * Generate C code that allocates sufficient memory for the following two
-     * critical data structures that support network control reactions:
-     * <ul>
-     *   <li>{@code triggers_for_network_input_control_reactions}: These are triggers that
-     *      are used at runtime to insert network input control reactions into the
-     *      reaction queue.</li>
-     *   <li>{@code trigger_for_network_output_control_reactions}: Triggers for
-     * network output control reactions, which are unique per each output port.
-     * There could be multiple network output control reactions for each
-     * network
-     * output port if it is connected to multiple downstream federates.</li>
-     * </ul>
-     *
-     * @param federate The top-level federate instance
-     * @return A string that allocates memory for the aforementioned three
-     * structures.
-     */
-    public static String allocateTriggersForFederate(
-        FederateInstance federate
-    ) {
-
-        CodeBuilder builder = new CodeBuilder();
-        if (federate.networkInputControlReactionsTriggers.size() > 0) {
-            // Proliferate the network input control reaction trigger array
-            builder.pr(
-                """
+  // Regular expression pattern for shared_ptr types.
+  static final Pattern sharedPointerVariable =
+      Pattern.compile("^(/\\*.*?\\*/)?std::shared_ptr<(?<type>((/\\*.*?\\*/)?(\\S+))+)>$");
+
+  /**
+   * Generate C code that allocates sufficient memory for the following two critical data structures
+   * that support network control reactions:
+   *
+   * <ul>
+   *   <li>{@code triggers_for_network_input_control_reactions}: These are triggers that are used at
+   *       runtime to insert network input control reactions into the reaction queue.
+   *   <li>{@code trigger_for_network_output_control_reactions}: Triggers for network output control
+   *       reactions, which are unique per each output port. There could be multiple network output
+   *       control reactions for each network output port if it is connected to multiple downstream
+   *       federates.
+   * </ul>
+   *
+   * @param federate The top-level federate instance
+   * @return A string that allocates memory for the aforementioned three structures.
+   */
+  public static String allocateTriggersForFederate(FederateInstance federate) {
+
+    CodeBuilder builder = new CodeBuilder();
+    if (federate.networkInputControlReactionsTriggers.size() > 0) {
+      // Proliferate the network input control reaction trigger array
+      builder.pr(
+          """
                 // Initialize the array of pointers to network input port triggers
                 _fed.triggers_for_network_input_control_reactions_size = %s;
                 _fed.triggers_for_network_input_control_reactions = (trigger_t**)malloc(
                     _fed.triggers_for_network_input_control_reactions_size * sizeof(trigger_t*));
-                """.formatted(federate.networkInputControlReactionsTriggers.size()));
-
-        }
-        return builder.getCode();
+                """
+              .formatted(federate.networkInputControlReactionsTriggers.size()));
     }
-
-    /**
-     * Generate C code that initializes network actions.
-     *
-     * These network actions will be triggered by federate.c whenever a message
-     * is received from the network.
-     * @param federate The federate.
-     * @param main The main reactor that contains the federate (used to lookup references).
-     * @return
-     */
-    public static String initializeTriggersForNetworkActions(FederateInstance federate, ReactorInstance main, ErrorReporter errorReporter) {
-        CodeBuilder code = new CodeBuilder();
-        if (federate.networkMessageActions.size() > 0) {
-            // Create a static array of trigger_t pointers.
-            // networkMessageActions is a list of Actions, but we
-            // need a list of trigger struct names for ActionInstances.
-            // There should be exactly one ActionInstance in the
-            // main reactor for each Action.
-            var triggers = new LinkedList<String>();
-            for (int i = 0; i < federate.networkMessageActions.size(); ++i) {
-                // Find the corresponding ActionInstance.
-                Action action = federate.networkMessageActions.get(i);
-                var reactor = main.lookupReactorInstance(federate.networkReceiverInstantiations.get(i));
-                var actionInstance = reactor.lookupActionInstance(action);
-                triggers.add(CUtil.actionRef(actionInstance, null));
-            }
-            var actionTableCount = 0;
-            for (String trigger : triggers) {
-                code.pr("_lf_action_table[" + (actionTableCount++) + "] = (lf_action_base_t*)&"
-                            + trigger + "; \\");
-            }
-        }
-        return code.getCode();
+    return builder.getCode();
+  }
+
+  /**
+   * Generate C code that initializes network actions.
+   *
+   * <p>These network actions will be triggered by federate.c whenever a message is received from
+   * the network.
+   *
+   * @param federate The federate.
+   * @param main The main reactor that contains the federate (used to lookup references).
+   * @return
+   */
+  public static String initializeTriggersForNetworkActions(
+      FederateInstance federate, ReactorInstance main, ErrorReporter errorReporter) {
+    CodeBuilder code = new CodeBuilder();
+    if (federate.networkMessageActions.size() > 0) {
+      // Create a static array of trigger_t pointers.
+      // networkMessageActions is a list of Actions, but we
+      // need a list of trigger struct names for ActionInstances.
+      // There should be exactly one ActionInstance in the
+      // main reactor for each Action.
+      var triggers = new LinkedList<String>();
+      for (int i = 0; i < federate.networkMessageActions.size(); ++i) {
+        // Find the corresponding ActionInstance.
+        Action action = federate.networkMessageActions.get(i);
+        var reactor = main.lookupReactorInstance(federate.networkReceiverInstantiations.get(i));
+        var actionInstance = reactor.lookupActionInstance(action);
+        triggers.add(CUtil.actionRef(actionInstance, null));
+      }
+      var actionTableCount = 0;
+      for (String trigger : triggers) {
+        code.pr(
+            "_lf_action_table["
+                + (actionTableCount++)
+                + "] = (lf_action_base_t*)&"
+                + trigger
+                + "; \\");
+      }
     }
-
-    /**
-     * Generate C code that holds a sorted list of STP structs by time.
-     *
-     * For decentralized execution, on every logical timestep, a thread will iterate through 
-     * each staa struct, wait for the designated offset time, and set the associated port status to absent
-     * if it isn't known.
-     * @param federate The federate.
-     * @param main The main reactor that contains the federate (used to lookup references).
-     * @return
-     */
-    public static String stpStructs(FederateInstance federate, ErrorReporter errorReporter) {
-        CodeBuilder code = new CodeBuilder();
-        Collections.sort(federate.stpOffsets, (d1, d2) -> {
-            return (int) (d1.time - d2.time);
+    return code.getCode();
+  }
+
+  /**
+   * Generate C code that holds a sorted list of STP structs by time.
+   *
+   * <p>For decentralized execution, on every logical timestep, a thread will iterate through each
+   * staa struct, wait for the designated offset time, and set the associated port status to absent
+   * if it isn't known.
+   *
+   * @param federate The federate.
+   * @param main The main reactor that contains the federate (used to lookup references).
+   * @return
+   */
+  public static String stpStructs(FederateInstance federate, ErrorReporter errorReporter) {
+    CodeBuilder code = new CodeBuilder();
+    Collections.sort(
+        federate.stpOffsets,
+        (d1, d2) -> {
+          return (int) (d1.time - d2.time);
         });
-        if (!federate.stpOffsets.isEmpty()) {
-            // Create a static array of trigger_t pointers.
-            // networkMessageActions is a list of Actions, but we
-            // need a list of trigger struct names for ActionInstances.
-            // There should be exactly one ActionInstance in the
-            // main reactor for each Action.
-            for (int i = 0; i < federate.stpOffsets.size(); ++i) {
-                // Find the corresponding ActionInstance.
-                List<Action> networkActions = federate.stpToNetworkActionMap.get(federate.stpOffsets.get(i));
-                
-                code.pr("staa_lst[" + i + "] = (staa_t*) malloc(sizeof(staa_t));");
-                code.pr("staa_lst[" + i + "]->STAA = " + CTypes.getInstance().getTargetTimeExpr(federate.stpOffsets.get(i)) + ";");
-                code.pr("staa_lst[" + i + "]->numActions = " + networkActions.size() + ";");
-                code.pr("staa_lst[" + i + "]->actions = (lf_action_base_t**) malloc(sizeof(lf_action_base_t*) * " + networkActions.size() + ");");
-                var tableCount = 0;
-                for(Action action: networkActions){
-                    code.pr("staa_lst[" + i + "]->actions[" + (tableCount++) + "] = _lf_action_table["
-                            + federate.networkMessageActions.indexOf(action) + "];");
-                }
-            }
+    if (!federate.stpOffsets.isEmpty()) {
+      // Create a static array of trigger_t pointers.
+      // networkMessageActions is a list of Actions, but we
+      // need a list of trigger struct names for ActionInstances.
+      // There should be exactly one ActionInstance in the
+      // main reactor for each Action.
+      for (int i = 0; i < federate.stpOffsets.size(); ++i) {
+        // Find the corresponding ActionInstance.
+        List<Action> networkActions =
+            federate.stpToNetworkActionMap.get(federate.stpOffsets.get(i));
+
+        code.pr("staa_lst[" + i + "] = (staa_t*) malloc(sizeof(staa_t));");
+        code.pr(
+            "staa_lst["
+                + i
+                + "]->STAA = "
+                + CTypes.getInstance().getTargetTimeExpr(federate.stpOffsets.get(i))
+                + ";");
+        code.pr("staa_lst[" + i + "]->numActions = " + networkActions.size() + ";");
+        code.pr(
+            "staa_lst["
+                + i
+                + "]->actions = (lf_action_base_t**) malloc(sizeof(lf_action_base_t*) * "
+                + networkActions.size()
+                + ");");
+        var tableCount = 0;
+        for (Action action : networkActions) {
+          code.pr(
+              "staa_lst["
+                  + i
+                  + "]->actions["
+                  + (tableCount++)
+                  + "] = _lf_action_table["
+                  + federate.networkMessageActions.indexOf(action)
+                  + "];");
         }
-        return code.getCode();
+      }
     }
-
-    /**
-     * Generate C code that initializes three critical structures that support
-     * network control reactions:
-     *  - triggers_for_network_input_control_reactions: These are triggers that are
-     *  used at runtime to insert network input control reactions into the
-     *  reaction queue. There could be multiple network input control reactions
-     *  for one network input at multiple levels in the hierarchy.
-     *  - trigger_for_network_output_control_reactions: Triggers for
-     *  network output control reactions, which are unique per each output port.
-     *  There could be multiple network output control reactions for each network
-     *  output port if it is connected to multiple downstream federates.
-     *
-     * @param instance  The reactor instance that is at any level of the
-     *                  hierarchy within the federate.
-     * @param errorReporter  The top-level federate
-     * @return A string that initializes the aforementioned three structures.
-     */
-    // public static String initializeTriggersForControlReactions(
-    //         FederateInstance instance,
-    //         ReactorInstance main,
-    //         ErrorReporter errorReporter
-    // ) {
-    //     CodeBuilder builder = new CodeBuilder();
-
-    //     if (federate.networkSenderControlReactions.size() > 0) {
-    //         // Create a static array of trigger_t pointers.
-    //         // networkMessageActions is a list of Actions, but we
-    //         // need a list of trigger struct names for ActionInstances.
-    //         // There should be exactly one ActionInstance in the
-    //         // main reactor for each Action.
-    //         var triggers = new LinkedList<String>();
-    //         for (int i = 0; i < federate.networkSenderControlReactions.size(); ++i) {
-    //             // Find the corresponding ActionInstance.
-    //             Action action = federate.networkMessageActions.get(i);
-    //             var reactor = main.lookupReactorInstance(federate.networkReceiverInstantiations.get(i));
-    //             var actionInstance = reactor.lookupActionInstance(action);
-    //             triggers.add(CUtil.actionRef(actionInstance, null));
-    //         }
-    //         var actionTableCount = 0;
-    //         for (String trigger : triggers) {
-    //             code.pr("_lf_action_table[" + (actionTableCount++) + "] = (lf_action_base_t*)&"
-    //                         + trigger + "; \\");
-    //         }
-    //     }
-
-    //     ReactorDecl reactorClass = instance.getDefinition().getReactorClass();
-    //     Reactor reactor = ASTUtils.toDefinition(reactorClass);
-    //     String nameOfSelfStruct = CUtil.reactorRef(instance);
-
-    //     // Initialize triggers for network input control reactions
-    //     for (Action trigger : errorReporter.networkInputControlReactionsTriggers) {
-    //         // Check if the trigger belongs to this reactor instance
-    //         if (ASTUtils.allReactions(reactor).stream().anyMatch(r -> {
-    //             return r.getTriggers().stream().anyMatch(t -> {
-    //                 if (t instanceof VarRef) {
-    //                     return ((VarRef) t).getVariable().equals(trigger);
-    //                 } else {
-    //                     return false;
-    //                 }
-    //             });
-    //         })) {
-    //             // Initialize the triggers_for_network_input_control_reactions for the input
-    //             builder.pr(
-    //                 String.join("\n",
-    //                     "/* Add trigger " + nameOfSelfStruct + "->_lf__"+trigger.getName()+" to the global list of network input ports. */ \\",
-    //                     "_fed.triggers_for_network_input_control_reactions["+errorReporter.networkInputControlReactionsTriggers.indexOf(trigger)+"]= \\",
-    //                     "    &"+nameOfSelfStruct+"->_lf__"+trigger.getName()+"; \\"
-    //                 )
-    //             );
-    //         }
-    //     }
-
-    //     nameOfSelfStruct = CUtil.reactorRef(instance);
-
-    //     // Initialize the trigger for network output control reactions if it doesn't exist.
-    //     if (errorReporter.networkOutputControlReactionsTrigger != null) {
-    //         builder.pr("_fed.trigger_for_network_output_control_reactions=&"
-    //                 + nameOfSelfStruct
-    //                 + "->_lf__outputControlReactionTrigger; \\");
-    //     }
-
-    //     return builder.getCode();
-    // }
-
-    /**
-     * Create a port status field variable for a network input port "input" in
-     * the self struct of a reactor.
-     *
-     * @param input     The network input port
-     * @return A string containing the appropriate variable
-     */
-    public static String createPortStatusFieldForInput(Input input) {
-        StringBuilder builder = new StringBuilder();
-        // Check if the port is a multiport
-        if (ASTUtils.isMultiport(input)) {
-            // If it is a multiport, then create an auxiliary list of port
-            // triggers for each channel of
-            // the multiport to keep track of the status of each channel
-            // individually
-            builder.append("trigger_t* _lf__" + input.getName()
-            + "_network_port_status;\n");
-        } else {
-            // If it is not a multiport, then we could re-use the port trigger,
-            // and nothing needs to be
-            // done
-        }
-        return builder.toString();
+    return code.getCode();
+  }
+
+  /**
+   * Generate C code that initializes three critical structures that support network control
+   * reactions: - triggers_for_network_input_control_reactions: These are triggers that are used at
+   * runtime to insert network input control reactions into the reaction queue. There could be
+   * multiple network input control reactions for one network input at multiple levels in the
+   * hierarchy. - trigger_for_network_output_control_reactions: Triggers for network output control
+   * reactions, which are unique per each output port. There could be multiple network output
+   * control reactions for each network output port if it is connected to multiple downstream
+   * federates.
+   *
+   * @param instance The reactor instance that is at any level of the hierarchy within the federate.
+   * @param errorReporter The top-level federate
+   * @return A string that initializes the aforementioned three structures.
+   */
+  // public static String initializeTriggersForControlReactions(
+  //         FederateInstance instance,
+  //         ReactorInstance main,
+  //         ErrorReporter errorReporter
+  // ) {
+  //     CodeBuilder builder = new CodeBuilder();
+
+  //     if (federate.networkSenderControlReactions.size() > 0) {
+  //         // Create a static array of trigger_t pointers.
+  //         // networkMessageActions is a list of Actions, but we
+  //         // need a list of trigger struct names for ActionInstances.
+  //         // There should be exactly one ActionInstance in the
+  //         // main reactor for each Action.
+  //         var triggers = new LinkedList<String>();
+  //         for (int i = 0; i < federate.networkSenderControlReactions.size(); ++i) {
+  //             // Find the corresponding ActionInstance.
+  //             Action action = federate.networkMessageActions.get(i);
+  //             var reactor =
+  // main.lookupReactorInstance(federate.networkReceiverInstantiations.get(i));
+  //             var actionInstance = reactor.lookupActionInstance(action);
+  //             triggers.add(CUtil.actionRef(actionInstance, null));
+  //         }
+  //         var actionTableCount = 0;
+  //         for (String trigger : triggers) {
+  //             code.pr("_lf_action_table[" + (actionTableCount++) + "] = (lf_action_base_t*)&"
+  //                         + trigger + "; \\");
+  //         }
+  //     }
+
+  //     ReactorDecl reactorClass = instance.getDefinition().getReactorClass();
+  //     Reactor reactor = ASTUtils.toDefinition(reactorClass);
+  //     String nameOfSelfStruct = CUtil.reactorRef(instance);
+
+  //     // Initialize triggers for network input control reactions
+  //     for (Action trigger : errorReporter.networkInputControlReactionsTriggers) {
+  //         // Check if the trigger belongs to this reactor instance
+  //         if (ASTUtils.allReactions(reactor).stream().anyMatch(r -> {
+  //             return r.getTriggers().stream().anyMatch(t -> {
+  //                 if (t instanceof VarRef) {
+  //                     return ((VarRef) t).getVariable().equals(trigger);
+  //                 } else {
+  //                     return false;
+  //                 }
+  //             });
+  //         })) {
+  //             // Initialize the triggers_for_network_input_control_reactions for the input
+  //             builder.pr(
+  //                 String.join("\n",
+  //                     "/* Add trigger " + nameOfSelfStruct + "->_lf__"+trigger.getName()+" to the
+  // global list of network input ports. */ \\",
+  //
+  // "_fed.triggers_for_network_input_control_reactions["+errorReporter.networkInputControlReactionsTriggers.indexOf(trigger)+"]= \\",
+  //                     "    &"+nameOfSelfStruct+"->_lf__"+trigger.getName()+"; \\"
+  //                 )
+  //             );
+  //         }
+  //     }
+
+  //     nameOfSelfStruct = CUtil.reactorRef(instance);
+
+  //     // Initialize the trigger for network output control reactions if it doesn't exist.
+  //     if (errorReporter.networkOutputControlReactionsTrigger != null) {
+  //         builder.pr("_fed.trigger_for_network_output_control_reactions=&"
+  //                 + nameOfSelfStruct
+  //                 + "->_lf__outputControlReactionTrigger; \\");
+  //     }
+
+  //     return builder.getCode();
+  // }
+
+  /**
+   * Create a port status field variable for a network input port "input" in the self struct of a
+   * reactor.
+   *
+   * @param input The network input port
+   * @return A string containing the appropriate variable
+   */
+  public static String createPortStatusFieldForInput(Input input) {
+    StringBuilder builder = new StringBuilder();
+    // Check if the port is a multiport
+    if (ASTUtils.isMultiport(input)) {
+      // If it is a multiport, then create an auxiliary list of port
+      // triggers for each channel of
+      // the multiport to keep track of the status of each channel
+      // individually
+      builder.append("trigger_t* _lf__" + input.getName() + "_network_port_status;\n");
+    } else {
+      // If it is not a multiport, then we could re-use the port trigger,
+      // and nothing needs to be
+      // done
     }
-
-    /**
-     * Given a connection 'delay' predicate, return a string that represents the
-     * interval_t value of the additional delay that needs to be applied to the
-     * outgoing message.
-     *
-     * The returned additional delay in absence of after on network connection
-     * (i.e., if delay is passed as a null) is  NEVER. This has a special
-     * meaning in C library functions that send network messages that carry
-     * timestamps (@see send_timed_message and send_port_absent_to_federate
-     * in lib/core/federate.c). In this case, the sender will send its current
-     * tag as the timestamp of the outgoing message without adding a microstep delay.
-     * If the user has assigned an after delay to the network connection (that
-     * can be zero) either as a time value (e.g., 200 msec) or as a literal
-     * (e.g., a parameter), that delay in nsec will be returned.
-     *
-     * @param delay
-     * @return
-     */
-    public static String getNetworkDelayLiteral(Expression delay) {
-        String additionalDelayString = "NEVER";
-        if (delay != null) {
-            TimeValue tv;
-            if (delay instanceof ParameterReference) {
-                // The parameter has to be parameter of the main reactor.
-                // And that value has to be a Time.
-                tv = ASTUtils.getDefaultAsTimeValue(((ParameterReference)delay).getParameter());
-            } else {
-                tv = ASTUtils.getLiteralTimeValue(delay);
-            }
-            additionalDelayString = Long.toString(tv.toNanoSeconds());
-        }
-        return additionalDelayString;
+    return builder.toString();
+  }
+
+  /**
+   * Given a connection 'delay' predicate, return a string that represents the interval_t value of
+   * the additional delay that needs to be applied to the outgoing message.
+   *
+   * <p>The returned additional delay in absence of after on network connection (i.e., if delay is
+   * passed as a null) is NEVER. This has a special meaning in C library functions that send network
+   * messages that carry timestamps (@see send_timed_message and send_port_absent_to_federate in
+   * lib/core/federate.c). In this case, the sender will send its current tag as the timestamp of
+   * the outgoing message without adding a microstep delay. If the user has assigned an after delay
+   * to the network connection (that can be zero) either as a time value (e.g., 200 msec) or as a
+   * literal (e.g., a parameter), that delay in nsec will be returned.
+   *
+   * @param delay
+   * @return
+   */
+  public static String getNetworkDelayLiteral(Expression delay) {
+    String additionalDelayString = "NEVER";
+    if (delay != null) {
+      TimeValue tv;
+      if (delay instanceof ParameterReference) {
+        // The parameter has to be parameter of the main reactor.
+        // And that value has to be a Time.
+        tv = ASTUtils.getDefaultAsTimeValue(((ParameterReference) delay).getParameter());
+      } else {
+        tv = ASTUtils.getLiteralTimeValue(delay);
+      }
+      additionalDelayString = Long.toString(tv.toNanoSeconds());
     }
-
-    static boolean isSharedPtrType(InferredType type, CTypes types) {
-        return !type.isUndefined() && sharedPointerVariable.matcher(types.getTargetType(type)).find();
+    return additionalDelayString;
+  }
+
+  static boolean isSharedPtrType(InferredType type, CTypes types) {
+    return !type.isUndefined() && sharedPointerVariable.matcher(types.getTargetType(type)).find();
+  }
+
+  public static void handleCompileDefinitions(
+      FederateInstance federate, int numOfFederates, RtiConfig rtiConfig) {
+    federate.targetConfig.setByUser.add(TargetProperty.COMPILE_DEFINITIONS);
+    federate.targetConfig.compileDefinitions.put("FEDERATED", "");
+    federate.targetConfig.compileDefinitions.put(
+        "FEDERATED_" + federate.targetConfig.coordination.toString().toUpperCase(), "");
+    if (federate.targetConfig.auth) {
+      federate.targetConfig.compileDefinitions.put("FEDERATED_AUTHENTICATED", "");
     }
-
-    public static void handleCompileDefinitions(
-        FederateInstance federate,
-        int numOfFederates,
-        RtiConfig rtiConfig
-    ) {
-        federate.targetConfig.setByUser.add(TargetProperty.COMPILE_DEFINITIONS);
-        federate.targetConfig.compileDefinitions.put("FEDERATED", "");
-        federate.targetConfig.compileDefinitions.put("FEDERATED_"+federate.targetConfig.coordination.toString().toUpperCase(), "");
-        if (federate.targetConfig.auth) {
-            federate.targetConfig.compileDefinitions.put("FEDERATED_AUTHENTICATED", "");
-        }
-        federate.targetConfig.compileDefinitions.put("NUMBER_OF_FEDERATES", String.valueOf(numOfFederates));
-        federate.targetConfig.compileDefinitions.put("EXECUTABLE_PREAMBLE", "");
-        federate.targetConfig.compileDefinitions.put("WORKERS_NEEDED_FOR_FEDERATE", String.valueOf(minThreadsToHandleInputPorts(federate)));
-
-        handleAdvanceMessageInterval(federate);
-
-        initializeClockSynchronization(federate, rtiConfig);
-    }
-
-    /**
-     * The number of threads needs to be at least one larger than the input ports
-     * to allow the federate to wait on all input ports while allowing an additional
-     * worker thread to process incoming messages.
-     * @return The minimum number of threads needed.
-     */
-    public static int minThreadsToHandleInputPorts(FederateInstance federate) {
-        int nthreads = 1;
-        nthreads = Math.max(nthreads, federate.networkMessageActions.size() + 1);
-        return nthreads;
+    federate.targetConfig.compileDefinitions.put(
+        "NUMBER_OF_FEDERATES", String.valueOf(numOfFederates));
+    federate.targetConfig.compileDefinitions.put("EXECUTABLE_PREAMBLE", "");
+    federate.targetConfig.compileDefinitions.put(
+        "WORKERS_NEEDED_FOR_FEDERATE", String.valueOf(minThreadsToHandleInputPorts(federate)));
+
+    handleAdvanceMessageInterval(federate);
+
+    initializeClockSynchronization(federate, rtiConfig);
+  }
+
+  /**
+   * The number of threads needs to be at least one larger than the input ports to allow the
+   * federate to wait on all input ports while allowing an additional worker thread to process
+   * incoming messages.
+   *
+   * @return The minimum number of threads needed.
+   */
+  public static int minThreadsToHandleInputPorts(FederateInstance federate) {
+    int nthreads = 1;
+    nthreads = Math.max(nthreads, federate.networkMessageActions.size() + 1);
+    return nthreads;
+  }
+
+  private static void handleAdvanceMessageInterval(FederateInstance federate) {
+    var advanceMessageInterval = federate.targetConfig.coordinationOptions.advance_message_interval;
+    federate.targetConfig.setByUser.remove(TargetProperty.COORDINATION_OPTIONS);
+    if (advanceMessageInterval != null) {
+      federate.targetConfig.compileDefinitions.put(
+          "ADVANCE_MESSAGE_INTERVAL", String.valueOf(advanceMessageInterval.toNanoSeconds()));
     }
+  }
 
-    private static void handleAdvanceMessageInterval(FederateInstance federate) {
-        var advanceMessageInterval = federate.targetConfig.coordinationOptions.advance_message_interval;
-        federate.targetConfig.setByUser.remove(TargetProperty.COORDINATION_OPTIONS);
-        if (advanceMessageInterval != null) {
-            federate.targetConfig.compileDefinitions.put(
-                "ADVANCE_MESSAGE_INTERVAL",
-                String.valueOf(advanceMessageInterval.toNanoSeconds())
-            );
+  static boolean clockSyncIsOn(FederateInstance federate, RtiConfig rtiConfig) {
+    return federate.targetConfig.clockSync != ClockSyncMode.OFF
+        && (!rtiConfig.getHost().equals(federate.host)
+            || federate.targetConfig.clockSyncOptions.localFederatesOn);
+  }
+
+  /**
+   * Initialize clock synchronization (if enabled) and its related options for a given federate.
+   *
+   * <p>Clock synchronization can be enabled using the clock-sync target property.
+   *
+   * @see <a
+   *     href="https://github.com/icyphy/lingua-franca/wiki/Distributed-Execution#clock-synchronization">Documentation</a>
+   */
+  public static void initializeClockSynchronization(
+      FederateInstance federate, RtiConfig rtiConfig) {
+    // Check if clock synchronization should be enabled for this federate in the first place
+    if (clockSyncIsOn(federate, rtiConfig)) {
+      System.out.println("Initial clock synchronization is enabled for federate " + federate.id);
+      if (federate.targetConfig.clockSync == ClockSyncMode.ON) {
+        if (federate.targetConfig.clockSyncOptions.collectStats) {
+          System.out.println("Will collect clock sync statistics for federate " + federate.id);
+          // Add libm to the compiler flags
+          // FIXME: This is a linker flag not compile flag but we don't have a way to add linker
+          // flags
+          // FIXME: This is probably going to fail on MacOS (especially using clang)
+          // because libm functions are builtin
+          federate.targetConfig.compilerFlags.add("-lm");
+          federate.targetConfig.setByUser.add(TargetProperty.FLAGS);
         }
-    }
+        System.out.println("Runtime clock synchronization is enabled for federate " + federate.id);
+      }
 
-    static boolean clockSyncIsOn(FederateInstance federate, RtiConfig rtiConfig) {
-        return federate.targetConfig.clockSync != ClockSyncMode.OFF
-            && (!rtiConfig.getHost().equals(federate.host)
-            || federate.targetConfig.clockSyncOptions.localFederatesOn);
+      addClockSyncCompileDefinitions(federate);
     }
-
-    /**
-     * Initialize clock synchronization (if enabled) and its related options for a given federate.
-     *
-     * Clock synchronization can be enabled using the clock-sync target property.
-     * @see <a href="https://github.com/icyphy/lingua-franca/wiki/Distributed-Execution#clock-synchronization">Documentation</a>
-     */
-    public static void initializeClockSynchronization(
-        FederateInstance federate,
-        RtiConfig rtiConfig
-    ) {
-        // Check if clock synchronization should be enabled for this federate in the first place
-        if (clockSyncIsOn(federate, rtiConfig)) {
-            System.out.println("Initial clock synchronization is enabled for federate "
-                                   + federate.id
-            );
-            if (federate.targetConfig.clockSync == ClockSyncMode.ON) {
-                if (federate.targetConfig.clockSyncOptions.collectStats) {
-                    System.out.println("Will collect clock sync statistics for federate " + federate.id);
-                    // Add libm to the compiler flags
-                    // FIXME: This is a linker flag not compile flag but we don't have a way to add linker flags
-                    // FIXME: This is probably going to fail on MacOS (especially using clang)
-                    // because libm functions are builtin
-                    federate.targetConfig.compilerFlags.add("-lm");
-                    federate.targetConfig.setByUser.add(TargetProperty.FLAGS);
-                }
-                System.out.println("Runtime clock synchronization is enabled for federate "
-                                       + federate.id
-                );
-            }
-
-            addClockSyncCompileDefinitions(federate);
-        }
+  }
+
+  /**
+   * Initialize clock synchronization (if enabled) and its related options for a given federate.
+   *
+   * <p>Clock synchronization can be enabled using the clock-sync target property.
+   *
+   * @see <a
+   *     href="https://github.com/icyphy/lingua-franca/wiki/Distributed-Execution#clock-synchronization">Documentation</a>
+   */
+  public static void addClockSyncCompileDefinitions(FederateInstance federate) {
+
+    ClockSyncMode mode = federate.targetConfig.clockSync;
+    ClockSyncOptions options = federate.targetConfig.clockSyncOptions;
+
+    federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_INITIAL", "");
+    federate.targetConfig.compileDefinitions.put(
+        "_LF_CLOCK_SYNC_PERIOD_NS", String.valueOf(options.period.toNanoSeconds()));
+    federate.targetConfig.compileDefinitions.put(
+        "_LF_CLOCK_SYNC_EXCHANGES_PER_INTERVAL", String.valueOf(options.trials));
+    federate.targetConfig.compileDefinitions.put(
+        "_LF_CLOCK_SYNC_ATTENUATION", String.valueOf(options.attenuation));
+
+    if (mode == ClockSyncMode.ON) {
+      federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_ON", "");
+      if (options.collectStats) {
+        federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_COLLECT_STATS", "");
+      }
     }
+  }
 
+  /** Generate a file to be included by CMake. */
+  public static void generateCMakeInclude(FederateInstance federate, FedFileConfig fileConfig)
+      throws IOException {
+    Files.createDirectories(fileConfig.getSrcPath().resolve("include"));
 
-    /**
-     * Initialize clock synchronization (if enabled) and its related options for a given federate.
-     *
-     * Clock synchronization can be enabled using the clock-sync target property.
-     * @see <a href="https://github.com/icyphy/lingua-franca/wiki/Distributed-Execution#clock-synchronization">Documentation</a>
-     */
-    public static void addClockSyncCompileDefinitions(FederateInstance federate) {
-
-        ClockSyncMode mode = federate.targetConfig.clockSync;
-        ClockSyncOptions options = federate.targetConfig.clockSyncOptions;
-
-
-        federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_INITIAL", "");
-        federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_PERIOD_NS", String.valueOf(options.period.toNanoSeconds()));
-        federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_EXCHANGES_PER_INTERVAL", String.valueOf(options.trials));
-        federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_ATTENUATION", String.valueOf(options.attenuation));
+    Path cmakeIncludePath =
+        fileConfig
+            .getSrcPath()
+            .resolve("include" + File.separator + federate.name + "_extension.cmake");
 
-        if (mode == ClockSyncMode.ON) {
-            federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_ON", "");
-            if (options.collectStats) {
-                federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_COLLECT_STATS", "");
-            }
-        }
-    }
+    CodeBuilder cmakeIncludeCode = new CodeBuilder();
 
+    cmakeIncludeCode.pr(generateSerializationCMakeExtension(federate));
+    cmakeIncludeCode.pr(
+        "add_compile_definitions(LF_SOURCE_DIRECTORY=\"" + fileConfig.srcPath + "\")");
+    cmakeIncludeCode.pr(
+        "add_compile_definitions(LF_PACKAGE_DIRECTORY=\"" + fileConfig.srcPkgPath + "\")");
 
-    /**
-     * Generate a file to be included by CMake.
-     */
-    public static void generateCMakeInclude(
-        FederateInstance federate,
-        FedFileConfig fileConfig
-    ) throws IOException {
-        Files.createDirectories(fileConfig.getSrcPath().resolve("include"));
-
-        Path cmakeIncludePath = fileConfig.getSrcPath()
-                                          .resolve("include" + File.separator + federate.name + "_extension.cmake");
-
-        CodeBuilder cmakeIncludeCode = new CodeBuilder();
-
-        cmakeIncludeCode.pr(generateSerializationCMakeExtension(federate));
-        cmakeIncludeCode.pr(
-            "add_compile_definitions(LF_SOURCE_DIRECTORY=\""
-            + fileConfig.srcPath
-            + "\")"
-        );
-        cmakeIncludeCode.pr(
-            "add_compile_definitions(LF_PACKAGE_DIRECTORY=\""
-                + fileConfig.srcPkgPath
-                + "\")"
-        );
-
-        try (var srcWriter = Files.newBufferedWriter(cmakeIncludePath)) {
-            srcWriter.write(cmakeIncludeCode.getCode());
-        }
-
-        federate.targetConfig.cmakeIncludes.add(fileConfig.getSrcPath().relativize(cmakeIncludePath).toString());
-        federate.targetConfig.setByUser.add(TargetProperty.CMAKE_INCLUDE);
+    try (var srcWriter = Files.newBufferedWriter(cmakeIncludePath)) {
+      srcWriter.write(cmakeIncludeCode.getCode());
     }
 
-
-    /**
-     * Generate code that sends the neighbor structure message to the RTI.
-     * See {@code MSG_TYPE_NEIGHBOR_STRUCTURE} in {@code federated/net_common.h}.
-     *
-     * @param federate The federate that is sending its neighbor structure
-     */
-    public static String generateFederateNeighborStructure(FederateInstance federate) {
-        var code = new CodeBuilder();
-        code.pr(String.join("\n",
-                            "/**",
-                            "* Generated function that sends information about connections between this federate and",
-                            "* other federates where messages are routed through the RTI. Currently, this",
-                            "* only includes logical connections when the coordination is centralized. This",
-                            "* information is needed for the RTI to perform the centralized coordination.",
-                            "* @see MSG_TYPE_NEIGHBOR_STRUCTURE in net_common.h",
-                            "*/",
-                            "void send_neighbor_structure_to_RTI(int rti_socket) {"
-        ));
-        code.indent();
-        // Initialize the array of information about the federate's immediate upstream
-        // and downstream relayed (through the RTI) logical connections, to send to the
-        // RTI.
-        code.pr(String.join("\n",
-                            "interval_t candidate_tmp;",
-                            "size_t buffer_size = 1 + 8 + ",
-                            "                "+federate.dependsOn.keySet().size()+" * ( sizeof(uint16_t) + sizeof(int64_t) ) +",
-                            "                "+federate.sendsTo.keySet().size()+" * sizeof(uint16_t);",
-                            "unsigned char buffer_to_send[buffer_size];",
-                            "",
-                            "size_t message_head = 0;",
-                            "buffer_to_send[message_head] = MSG_TYPE_NEIGHBOR_STRUCTURE;",
-                            "message_head++;",
-                            "encode_int32((int32_t)"+federate.dependsOn.keySet().size()+", &(buffer_to_send[message_head]));",
-                            "message_head+=sizeof(int32_t);",
-                            "encode_int32((int32_t)"+federate.sendsTo.keySet().size()+", &(buffer_to_send[message_head]));",
-                            "message_head+=sizeof(int32_t);"
-        ));
-
-        if (!federate.dependsOn.keySet().isEmpty()) {
-            // Next, populate these arrays.
-            // Find the minimum delay in the process.
-            // FIXME: Zero delay is not really the same as a microstep delay.
-            for (FederateInstance upstreamFederate : federate.dependsOn.keySet()) {
-                code.pr(String.join("\n",
-                                    "encode_uint16((uint16_t)"+upstreamFederate.id+", &(buffer_to_send[message_head]));",
-                                    "message_head += sizeof(uint16_t);"
-                ));
-                // The minimum delay calculation needs to be made in the C code because it
-                // may depend on parameter values.
-                // FIXME: These would have to be top-level parameters, which don't really
-                // have any support yet. Ideally, they could be overridden on the command line.
-                // When that is done, they will need to be in scope here.
-                var delays = federate.dependsOn.get(upstreamFederate);
-                if (delays != null) {
-                    // There is at least one delay, so find the minimum.
-                    // If there is no delay at all, this is encoded as NEVER.
-                    code.pr("candidate_tmp = FOREVER;");
-                    for (Expression delay : delays) {
-                        if (delay == null) {
-                            // Use NEVER to encode no delay at all.
-                            code.pr("candidate_tmp = NEVER;");
-                        } else {
-                            var delayTime =
-                                delay instanceof ParameterReference
-                                    // In that case use the default value.
-                                    ? CTypes.getInstance().getTargetTimeExpr(ASTUtils.getDefaultAsTimeValue(((ParameterReference) delay).getParameter()))
-                                    : CTypes.getInstance().getTargetExpr(delay, InferredType.time());
-
-                            code.pr(String.join("\n",
-                                "if (" + delayTime + " < candidate_tmp) {",
-                                "    candidate_tmp = " + delayTime + ";",
-                                "}"
-                            ));
-                        }
-                    }
-                    code.pr(String.join("\n",
-                                        "encode_int64((int64_t)candidate_tmp, &(buffer_to_send[message_head]));",
-                                        "message_head += sizeof(int64_t);"
-                    ));
-                } else {
-                    // Use NEVER to encode no delay at all.
-                    code.pr(String.join("\n",
-                                        "encode_int64(NEVER, &(buffer_to_send[message_head]));",
-                                        "message_head += sizeof(int64_t);"
-                    ));
-                }
-            }
-        }
-
-        // Next, set up the downstream array.
-        if (!federate.sendsTo.keySet().isEmpty()) {
-            // Next, populate the array.
-            // Find the minimum delay in the process.
-            // FIXME: Zero delay is not really the same as a microstep delay.
-            for (FederateInstance downstreamFederate : federate.sendsTo.keySet()) {
-                code.pr(String.join("\n",
-                                    "encode_uint16("+downstreamFederate.id+", &(buffer_to_send[message_head]));",
-                                    "message_head += sizeof(uint16_t);"
-                ));
+    federate.targetConfig.cmakeIncludes.add(
+        fileConfig.getSrcPath().relativize(cmakeIncludePath).toString());
+    federate.targetConfig.setByUser.add(TargetProperty.CMAKE_INCLUDE);
+  }
+
+  /**
+   * Generate code that sends the neighbor structure message to the RTI. See {@code
+   * MSG_TYPE_NEIGHBOR_STRUCTURE} in {@code federated/net_common.h}.
+   *
+   * @param federate The federate that is sending its neighbor structure
+   */
+  public static String generateFederateNeighborStructure(FederateInstance federate) {
+    var code = new CodeBuilder();
+    code.pr(
+        String.join(
+            "\n",
+            "/**",
+            "* Generated function that sends information about connections between this federate"
+                + " and",
+            "* other federates where messages are routed through the RTI. Currently, this",
+            "* only includes logical connections when the coordination is centralized. This",
+            "* information is needed for the RTI to perform the centralized coordination.",
+            "* @see MSG_TYPE_NEIGHBOR_STRUCTURE in net_common.h",
+            "*/",
+            "void send_neighbor_structure_to_RTI(int rti_socket) {"));
+    code.indent();
+    // Initialize the array of information about the federate's immediate upstream
+    // and downstream relayed (through the RTI) logical connections, to send to the
+    // RTI.
+    code.pr(
+        String.join(
+            "\n",
+            "interval_t candidate_tmp;",
+            "size_t buffer_size = 1 + 8 + ",
+            "                "
+                + federate.dependsOn.keySet().size()
+                + " * ( sizeof(uint16_t) + sizeof(int64_t) ) +",
+            "                " + federate.sendsTo.keySet().size() + " * sizeof(uint16_t);",
+            "unsigned char buffer_to_send[buffer_size];",
+            "",
+            "size_t message_head = 0;",
+            "buffer_to_send[message_head] = MSG_TYPE_NEIGHBOR_STRUCTURE;",
+            "message_head++;",
+            "encode_int32((int32_t)"
+                + federate.dependsOn.keySet().size()
+                + ", &(buffer_to_send[message_head]));",
+            "message_head+=sizeof(int32_t);",
+            "encode_int32((int32_t)"
+                + federate.sendsTo.keySet().size()
+                + ", &(buffer_to_send[message_head]));",
+            "message_head+=sizeof(int32_t);"));
+
+    if (!federate.dependsOn.keySet().isEmpty()) {
+      // Next, populate these arrays.
+      // Find the minimum delay in the process.
+      // FIXME: Zero delay is not really the same as a microstep delay.
+      for (FederateInstance upstreamFederate : federate.dependsOn.keySet()) {
+        code.pr(
+            String.join(
+                "\n",
+                "encode_uint16((uint16_t)"
+                    + upstreamFederate.id
+                    + ", &(buffer_to_send[message_head]));",
+                "message_head += sizeof(uint16_t);"));
+        // The minimum delay calculation needs to be made in the C code because it
+        // may depend on parameter values.
+        // FIXME: These would have to be top-level parameters, which don't really
+        // have any support yet. Ideally, they could be overridden on the command line.
+        // When that is done, they will need to be in scope here.
+        var delays = federate.dependsOn.get(upstreamFederate);
+        if (delays != null) {
+          // There is at least one delay, so find the minimum.
+          // If there is no delay at all, this is encoded as NEVER.
+          code.pr("candidate_tmp = FOREVER;");
+          for (Expression delay : delays) {
+            if (delay == null) {
+              // Use NEVER to encode no delay at all.
+              code.pr("candidate_tmp = NEVER;");
+            } else {
+              var delayTime =
+                  delay instanceof ParameterReference
+                      // In that case use the default value.
+                      ? CTypes.getInstance()
+                          .getTargetTimeExpr(
+                              ASTUtils.getDefaultAsTimeValue(
+                                  ((ParameterReference) delay).getParameter()))
+                      : CTypes.getInstance().getTargetExpr(delay, InferredType.time());
+
+              code.pr(
+                  String.join(
+                      "\n",
+                      "if (" + delayTime + " < candidate_tmp) {",
+                      "    candidate_tmp = " + delayTime + ";",
+                      "}"));
             }
+          }
+          code.pr(
+              String.join(
+                  "\n",
+                  "encode_int64((int64_t)candidate_tmp, &(buffer_to_send[message_head]));",
+                  "message_head += sizeof(int64_t);"));
+        } else {
+          // Use NEVER to encode no delay at all.
+          code.pr(
+              String.join(
+                  "\n",
+                  "encode_int64(NEVER, &(buffer_to_send[message_head]));",
+                  "message_head += sizeof(int64_t);"));
         }
-        code.pr(String.join("\n",
-                            "write_to_socket_errexit(",
-                            "    rti_socket, ",
-                            "    buffer_size,",
-                            "    buffer_to_send,",
-                            "    \"Failed to send the neighbor structure message to the RTI.\"",
-                            ");"
-        ));
-        code.unindent();
-        code.pr("}");
-        return code.toString();
+      }
     }
 
-
-    public static List<String> getFederatedFiles() {
-        return List.of(
-            "federated/net_util.c",
-            "federated/net_util.h",
-            "federated/net_common.h",
-            "federated/federate.c",
-            "federated/federate.h",
-            "federated/clock-sync.h",
-            "federated/clock-sync.c"
-        );
+    // Next, set up the downstream array.
+    if (!federate.sendsTo.keySet().isEmpty()) {
+      // Next, populate the array.
+      // Find the minimum delay in the process.
+      // FIXME: Zero delay is not really the same as a microstep delay.
+      for (FederateInstance downstreamFederate : federate.sendsTo.keySet()) {
+        code.pr(
+            String.join(
+                "\n",
+                "encode_uint16(" + downstreamFederate.id + ", &(buffer_to_send[message_head]));",
+                "message_head += sizeof(uint16_t);"));
+      }
     }
-
-    /**
-     * Surround {@code code} with blocks to ensure that code only executes
-     * if the program is federated.
-     */
-    public static String surroundWithIfFederated(String code) {
-        return """
+    code.pr(
+        String.join(
+            "\n",
+            "write_to_socket_errexit(",
+            "    rti_socket, ",
+            "    buffer_size,",
+            "    buffer_to_send,",
+            "    \"Failed to send the neighbor structure message to the RTI.\"",
+            ");"));
+    code.unindent();
+    code.pr("}");
+    return code.toString();
+  }
+
+  public static List<String> getFederatedFiles() {
+    return List.of(
+        "federated/net_util.c",
+        "federated/net_util.h",
+        "federated/net_common.h",
+        "federated/federate.c",
+        "federated/federate.h",
+        "federated/clock-sync.h",
+        "federated/clock-sync.c");
+  }
+
+  /**
+   * Surround {@code code} with blocks to ensure that code only executes if the program is
+   * federated.
+   */
+  public static String surroundWithIfFederated(String code) {
+    return """
             #ifdef FEDERATED
             %s
             #endif // FEDERATED
-            """.formatted(code);
-    }
-
-    /**
-     * Surround {@code code} with blocks to ensure that code only executes
-     * if the program is federated and has a centralized coordination.
-     */
-    public static String surroundWithIfFederatedCentralized(String code) {
-        return """
+            """
+        .formatted(code);
+  }
+
+  /**
+   * Surround {@code code} with blocks to ensure that code only executes if the program is federated
+   * and has a centralized coordination.
+   */
+  public static String surroundWithIfFederatedCentralized(String code) {
+    return """
             #ifdef FEDERATED_CENTRALIZED
             %s
             #endif // FEDERATED_CENTRALIZED
-            """.formatted(code);
-    }
-
-    /**
-     * Surround {@code code} with blocks to ensure that code only executes
-     * if the program is federated and has a decentralized coordination.
-     */
-    public static String surroundWithIfFederatedDecentralized(String code) {
-        return """
+            """
+        .formatted(code);
+  }
+
+  /**
+   * Surround {@code code} with blocks to ensure that code only executes if the program is federated
+   * and has a decentralized coordination.
+   */
+  public static String surroundWithIfFederatedDecentralized(String code) {
+    return """
             #ifdef FEDERATED_DECENTRALIZED
             %s
             #endif // FEDERATED_DECENTRALIZED
-            """.formatted(code);
+            """
+        .formatted(code);
+  }
+
+  /** Generate preamble code needed for enabled serializers of the federate. */
+  public static String generateSerializationIncludes(
+      FederateInstance federate, FedFileConfig fileConfig) {
+    CodeBuilder code = new CodeBuilder();
+    for (SupportedSerializers serializer : federate.enabledSerializers) {
+      switch (serializer) {
+        case NATIVE:
+        case PROTO:
+          {
+            // No need to do anything at this point.
+            break;
+          }
+        case ROS2:
+          {
+            var ROSSerializer = new FedROS2CPPSerialization();
+            code.pr(ROSSerializer.generatePreambleForSupport().toString());
+            break;
+          }
+      }
     }
-
-    /**
-     * Generate preamble code needed for enabled serializers of the federate.
-     */
-    public static String generateSerializationIncludes(
-        FederateInstance federate,
-        FedFileConfig fileConfig
-    ) {
-        CodeBuilder code = new CodeBuilder();
-        for (SupportedSerializers serializer : federate.enabledSerializers) {
-            switch (serializer) {
-            case NATIVE:
-            case PROTO: {
-                // No need to do anything at this point.
-                break;
-            }
-            case ROS2: {
-                var ROSSerializer = new FedROS2CPPSerialization();
-                code.pr(ROSSerializer.generatePreambleForSupport().toString());
-                break;
-            }
-            }
-        }
-        return code.getCode();
-    }
-
-    /**
-     * Generate cmake-include code needed for enabled serializers of the federate.
-     */
-    public static String generateSerializationCMakeExtension(
-        FederateInstance federate
-    ) {
-        CodeBuilder code = new CodeBuilder();
-        for (SupportedSerializers serializer : federate.enabledSerializers) {
-            switch (serializer) {
-            case NATIVE:
-            case PROTO: {
-                // No CMake code is needed for now
-                break;
-            }
-            case ROS2: {
-                var ROSSerializer = new FedROS2CPPSerialization();
-                code.pr(ROSSerializer.generateCompilerExtensionForSupport());
-                break;
-            }
-            }
-        }
-        return code.getCode();
+    return code.getCode();
+  }
+
+  /** Generate cmake-include code needed for enabled serializers of the federate. */
+  public static String generateSerializationCMakeExtension(FederateInstance federate) {
+    CodeBuilder code = new CodeBuilder();
+    for (SupportedSerializers serializer : federate.enabledSerializers) {
+      switch (serializer) {
+        case NATIVE:
+        case PROTO:
+          {
+            // No CMake code is needed for now
+            break;
+          }
+        case ROS2:
+          {
+            var ROSSerializer = new FedROS2CPPSerialization();
+            code.pr(ROSSerializer.generateCompilerExtensionForSupport());
+            break;
+          }
+      }
     }
-
-    public static CharSequence upstreamPortReactions(FederateInstance federate, ReactorInstance main) {
-        CodeBuilder code = new CodeBuilder();
-        if (!federate.networkMessageActions.isEmpty()) {
-            // Create a static array of trigger_t pointers.
-            // networkMessageActions is a list of Actions, but we
-            // need a list of trigger struct names for ActionInstances.
-            // There should be exactly one ActionInstance in the
-            // main reactor for each Action.
-            var reactions = new LinkedList<String>();
-            for (int i = 0; i < federate.networkMessageActions.size(); ++i) {
-                // Find the corresponding ActionInstance.
-                var reaction = federate.networkReceiverReactions.get(i);
-                var reactor = main.lookupReactorInstance(federate.networkReceiverInstantiations.get(i));
-                var reactionInstance = reactor.lookupReactionInstance(reaction);
-                reactions.add(CUtil.reactionRef(reactionInstance));
-            }
-            var tableCount = 0;
-            for (String react: reactions) {
-                code.pr("upstreamPortReactions[" + (tableCount++) + "] = (reaction_t*)&" + react + "; \\");
-            }
-        }
-        return code.getCode();
+    return code.getCode();
+  }
+
+  public static CharSequence upstreamPortReactions(
+      FederateInstance federate, ReactorInstance main) {
+    CodeBuilder code = new CodeBuilder();
+    if (!federate.networkMessageActions.isEmpty()) {
+      // Create a static array of trigger_t pointers.
+      // networkMessageActions is a list of Actions, but we
+      // need a list of trigger struct names for ActionInstances.
+      // There should be exactly one ActionInstance in the
+      // main reactor for each Action.
+      var reactions = new LinkedList<String>();
+      for (int i = 0; i < federate.networkMessageActions.size(); ++i) {
+        // Find the corresponding ActionInstance.
+        var reaction = federate.networkReceiverReactions.get(i);
+        var reactor = main.lookupReactorInstance(federate.networkReceiverInstantiations.get(i));
+        var reactionInstance = reactor.lookupReactionInstance(reaction);
+        reactions.add(CUtil.reactionRef(reactionInstance));
+      }
+      var tableCount = 0;
+      for (String react : reactions) {
+        code.pr("upstreamPortReactions[" + (tableCount++) + "] = (reaction_t*)&" + react + "; \\");
+      }
     }
-
-    public static CharSequence downstreamControlPortReactions(FederateInstance federate, ReactorInstance main) {
-        CodeBuilder code = new CodeBuilder();
-        if (!federate.networkSenderControlReactions.isEmpty()) {
-            // Create a static array of trigger_t pointers.
-            // networkMessageActions is a list of Actions, but we
-            // need a list of trigger struct names for ActionInstances.
-            // There should be exactly one ActionInstance in the
-            // main reactor for each Action.
-            var reactions = new LinkedList<String>();
-            for (int i = 0; i < federate.networkSenderControlReactions.size(); ++i) {
-                // Find the corresponding ActionInstance.
-                var reaction = federate.networkSenderControlReactions.get(i);
-                var reactor = main.lookupReactorInstance(federate.networkSenderInstantiations.get(i));
-                var reactionInstance = reactor.lookupReactionInstance(reaction);
-                reactions.add(CUtil.reactionRef(reactionInstance));
-            }
-            var tableCount = 0;
-            for (String react: reactions) {
-                code.pr("downstreamControlPortReactions[" + (tableCount++) + "] = (reaction_t*)&" + react + "; \\");
-            }
-        }
-        return code.getCode();
+    return code.getCode();
+  }
+
+  public static CharSequence downstreamControlPortReactions(
+      FederateInstance federate, ReactorInstance main) {
+    CodeBuilder code = new CodeBuilder();
+    if (!federate.networkSenderControlReactions.isEmpty()) {
+      // Create a static array of trigger_t pointers.
+      // networkMessageActions is a list of Actions, but we
+      // need a list of trigger struct names for ActionInstances.
+      // There should be exactly one ActionInstance in the
+      // main reactor for each Action.
+      var reactions = new LinkedList<String>();
+      for (int i = 0; i < federate.networkSenderControlReactions.size(); ++i) {
+        // Find the corresponding ActionInstance.
+        var reaction = federate.networkSenderControlReactions.get(i);
+        var reactor = main.lookupReactorInstance(federate.networkSenderInstantiations.get(i));
+        var reactionInstance = reactor.lookupReactionInstance(reaction);
+        reactions.add(CUtil.reactionRef(reactionInstance));
+      }
+      var tableCount = 0;
+      for (String react : reactions) {
+        code.pr(
+            "downstreamControlPortReactions["
+                + (tableCount++)
+                + "] = (reaction_t*)&"
+                + react
+                + "; \\");
+      }
     }
+    return code.getCode();
+  }
 }
-
diff --git a/org.lflang/src/org/lflang/federated/extensions/FedTargetExtension.java b/org.lflang/src/org/lflang/federated/extensions/FedTargetExtension.java
index d50a801617..17ac198781 100644
--- a/org.lflang/src/org/lflang/federated/extensions/FedTargetExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/FedTargetExtension.java
@@ -1,7 +1,6 @@
 package org.lflang.federated.extensions;
 
 import java.io.IOException;
-
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetProperty.CoordinationType;
@@ -17,110 +16,110 @@
 
 public interface FedTargetExtension {
 
-    /**
-     * Perform necessary actions to initialize the target config.
-     *
-     * @param context
-     * @param numOfFederates
-     * @param federate       The federate instance.
-     * @param fileConfig     An instance of {@code FedFileConfig}.
-     * @param errorReporter  Used to report errors.
-     */
-    void initializeTargetConfig(LFGeneratorContext context, int numOfFederates, FederateInstance federate, FedFileConfig fileConfig,
-                                ErrorReporter errorReporter, RtiConfig rtiConfig) throws IOException;
+  /**
+   * Perform necessary actions to initialize the target config.
+   *
+   * @param context
+   * @param numOfFederates
+   * @param federate The federate instance.
+   * @param fileConfig An instance of {@code FedFileConfig}.
+   * @param errorReporter Used to report errors.
+   */
+  void initializeTargetConfig(
+      LFGeneratorContext context,
+      int numOfFederates,
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      ErrorReporter errorReporter,
+      RtiConfig rtiConfig)
+      throws IOException;
 
-    /**
-     * Generate code for the body of a reaction that handles the
-     * action that is triggered by receiving a message from a remote
-     * federate.
-     * @param action The action.
-     * @param sendingPort The output port providing the data to send.
-     * @param receivingPort The ID of the destination port.
-     * @param connection FIXME
-     * @param type FIXME
-     * @param coordinationType The coordination type
-     * @param errorReporter
-     */
-    String generateNetworkReceiverBody(
-        Action action,
-        VarRef sendingPort,
-        VarRef receivingPort,
-        FedConnectionInstance connection,
-        InferredType type,
-        CoordinationType coordinationType,
-        ErrorReporter errorReporter
-    );
+  /**
+   * Generate code for the body of a reaction that handles the action that is triggered by receiving
+   * a message from a remote federate.
+   *
+   * @param action The action.
+   * @param sendingPort The output port providing the data to send.
+   * @param receivingPort The ID of the destination port.
+   * @param connection FIXME
+   * @param type FIXME
+   * @param coordinationType The coordination type
+   * @param errorReporter
+   */
+  String generateNetworkReceiverBody(
+      Action action,
+      VarRef sendingPort,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      CoordinationType coordinationType,
+      ErrorReporter errorReporter);
 
-    /**
-     * Generate code for the body of a reaction that handles an output
-     * that is to be sent over the network.
-     * @param sendingPort The output port providing the data to send.
-     * @param receivingPort The variable reference to the destination port.
-     * @param connection
-     * @param type
-     * @param coordinationType
-     * @param errorReporter FIXME
-     */
-    String generateNetworkSenderBody(
-        VarRef sendingPort,
-        VarRef receivingPort,
-        FedConnectionInstance connection,
-        InferredType type,
-        CoordinationType coordinationType,
-        ErrorReporter errorReporter
-    );
+  /**
+   * Generate code for the body of a reaction that handles an output that is to be sent over the
+   * network.
+   *
+   * @param sendingPort The output port providing the data to send.
+   * @param receivingPort The variable reference to the destination port.
+   * @param connection
+   * @param type
+   * @param coordinationType
+   * @param errorReporter FIXME
+   */
+  String generateNetworkSenderBody(
+      VarRef sendingPort,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      CoordinationType coordinationType,
+      ErrorReporter errorReporter);
 
-    /**
-     * Generate code for the body of a reaction that decides whether the trigger for the given
-     * port is going to be present or absent for the current logical time.
-     * This reaction is put just before the first reaction that is triggered by the network
-     * input port "port" or has it in its sources. If there are only connections to contained
-     * reactors, in the top-level reactor.
-     *
-     * @param receivingPortID The port to generate the control reaction for
-     * @param maxSTP The maximum value of STP is assigned to reactions (if any)
-     *  that have port as their trigger or source
-     * @param coordination FIXME
-     */
-    String generateNetworkInputControlReactionBody(
-        int receivingPortID,
-        TimeValue maxSTP,
-        CoordinationType coordination
-    );
+  /**
+   * Generate code for the body of a reaction that decides whether the trigger for the given port is
+   * going to be present or absent for the current logical time. This reaction is put just before
+   * the first reaction that is triggered by the network input port "port" or has it in its sources.
+   * If there are only connections to contained reactors, in the top-level reactor.
+   *
+   * @param receivingPortID The port to generate the control reaction for
+   * @param maxSTP The maximum value of STP is assigned to reactions (if any) that have port as
+   *     their trigger or source
+   * @param coordination FIXME
+   */
+  String generateNetworkInputControlReactionBody(
+      int receivingPortID, TimeValue maxSTP, CoordinationType coordination);
 
-    /**
-     * Generate code for the body of a reaction that sends a port status message for the given
-     * port if it is absent.
-     *
-     * @oaram srcOutputPort FIXME
-     * @param connection FIXME
-     */
-    String generateNetworkOutputControlReactionBody(
-        VarRef srcOutputPort,
-        FedConnectionInstance connection
-    );
+  /**
+   * Generate code for the body of a reaction that sends a port status message for the given port if
+   * it is absent.
+   *
+   * @oaram srcOutputPort FIXME
+   * @param connection FIXME
+   */
+  String generateNetworkOutputControlReactionBody(
+      VarRef srcOutputPort, FedConnectionInstance connection);
 
-    /** Optionally apply additional annotations to the reaction. */
-    default void annotateReaction(Reaction reaction) {}
+  /** Optionally apply additional annotations to the reaction. */
+  default void annotateReaction(Reaction reaction) {}
 
-    /**
-     * Return the type for the raw network buffer in the target language (e.g., {@code uint_8} in C). This would be the type of the 
-     * network messages after serialization and before deserialization. It is primarily used to determine the type for the 
-     * network action at the receiver.
-     */
-    String getNetworkBufferType();
+  /**
+   * Return the type for the raw network buffer in the target language (e.g., {@code uint_8} in C).
+   * This would be the type of the network messages after serialization and before deserialization.
+   * It is primarily used to determine the type for the network action at the receiver.
+   */
+  String getNetworkBufferType();
 
-    /**
-     * Add necessary preamble to the source to set up federated execution.
-     *
-     * @param federate
-     * @param rtiConfig
-     * @param errorReporter
-     * @return
-     */
-    String generatePreamble(FederateInstance federate,
-                            FedFileConfig fileConfig,
-                            RtiConfig rtiConfig,
-                            ErrorReporter errorReporter)
-        throws IOException;
+  /**
+   * Add necessary preamble to the source to set up federated execution.
+   *
+   * @param federate
+   * @param rtiConfig
+   * @param errorReporter
+   * @return
+   */
+  String generatePreamble(
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      RtiConfig rtiConfig,
+      ErrorReporter errorReporter)
+      throws IOException;
 }
diff --git a/org.lflang/src/org/lflang/federated/extensions/FedTargetExtensionFactory.java b/org.lflang/src/org/lflang/federated/extensions/FedTargetExtensionFactory.java
index 5caafc1c0c..ca16d1d445 100644
--- a/org.lflang/src/org/lflang/federated/extensions/FedTargetExtensionFactory.java
+++ b/org.lflang/src/org/lflang/federated/extensions/FedTargetExtensionFactory.java
@@ -1,24 +1,26 @@
 package org.lflang.federated.extensions;
 
 import org.lflang.Target;
-import org.lflang.lf.TargetDecl;
 
 /**
  * Class for instantiating target extensions.
+ *
  * @author Soroush Bateni
  */
 public class FedTargetExtensionFactory {
 
-    /**
-     * Given a target, return the appropriate extension.
-     */
-    public static FedTargetExtension getExtension(Target target) {
-        switch (target) {
-        case CCPP:
-        case C: return new CExtension();
-        case Python: return new PythonExtension();
-        case TS: return new TSExtension();
-        default: throw new RuntimeException("Target not supported");
-        }
+  /** Given a target, return the appropriate extension. */
+  public static FedTargetExtension getExtension(Target target) {
+    switch (target) {
+      case CCPP:
+      case C:
+        return new CExtension();
+      case Python:
+        return new PythonExtension();
+      case TS:
+        return new TSExtension();
+      default:
+        throw new RuntimeException("Target not supported");
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/extensions/PythonExtension.java b/org.lflang/src/org/lflang/federated/extensions/PythonExtension.java
index 0e6be72d31..ee598d8e26 100644
--- a/org.lflang/src/org/lflang/federated/extensions/PythonExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/PythonExtension.java
@@ -27,11 +27,10 @@
 package org.lflang.federated.extensions;
 
 import java.io.IOException;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetProperty.CoordinationType;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedConnectionInstance;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
@@ -39,164 +38,147 @@
 import org.lflang.federated.serialization.FedSerialization;
 import org.lflang.federated.serialization.SupportedSerializers;
 import org.lflang.generator.CodeBuilder;
-import org.lflang.generator.ReactionInstance;
 import org.lflang.generator.python.PyUtil;
 import org.lflang.lf.Action;
 import org.lflang.lf.Reaction;
 import org.lflang.lf.VarRef;
 
 /**
- * An extension class to the PythonGenerator that enables certain federated
- * functionalities.
+ * An extension class to the PythonGenerator that enables certain federated functionalities.
  *
  * @author Soroush Bateni
  */
 public class PythonExtension extends CExtension {
 
-    @Override
-    protected void generateCMakeInclude(FederateInstance federate, FedFileConfig fileConfig) throws IOException {}
-
-    @Override
-    protected String generateSerializationIncludes(FederateInstance federate, FedFileConfig fileConfig) {
-        CodeBuilder code = new CodeBuilder();
-        for (SupportedSerializers serialization : federate.enabledSerializers) {
-            switch (serialization) {
-            case NATIVE: {
-                FedNativePythonSerialization pickler = new FedNativePythonSerialization();
-                code.pr(pickler.generatePreambleForSupport().toString());
-            }
-            case PROTO: {
-                // Nothing needs to be done
-            }
-            case ROS2: {
-                // FIXME: Not supported yet
-            }
-            }
-        }
-        return code.getCode();
-    }
+  @Override
+  protected void generateCMakeInclude(FederateInstance federate, FedFileConfig fileConfig)
+      throws IOException {}
 
-    @Override
-    public String generateNetworkSenderBody(
-        VarRef sendingPort,
-        VarRef receivingPort,
-        FedConnectionInstance connection,
-        InferredType type,
-        CoordinationType coordinationType,
-        ErrorReporter errorReporter
-    ) {
-        var result = new CodeBuilder();
-        result.pr(PyUtil.generateGILAcquireCode() + "\n");
-        result.pr(
-            super.generateNetworkSenderBody(
-                sendingPort,
-                receivingPort,
-                connection,
-                type,
-                coordinationType,
-                errorReporter
-            )
-        );
-        result.pr(PyUtil.generateGILReleaseCode() + "\n");
-        return result.getCode();
+  @Override
+  protected String generateSerializationIncludes(
+      FederateInstance federate, FedFileConfig fileConfig) {
+    CodeBuilder code = new CodeBuilder();
+    for (SupportedSerializers serialization : federate.enabledSerializers) {
+      switch (serialization) {
+        case NATIVE:
+          {
+            FedNativePythonSerialization pickler = new FedNativePythonSerialization();
+            code.pr(pickler.generatePreambleForSupport().toString());
+          }
+        case PROTO:
+          {
+            // Nothing needs to be done
+          }
+        case ROS2:
+          {
+            // FIXME: Not supported yet
+          }
+      }
     }
+    return code.getCode();
+  }
 
-    @Override
-    public String generateNetworkReceiverBody(
-        Action action,
-        VarRef sendingPort,
-        VarRef receivingPort,
-        FedConnectionInstance connection,
-        InferredType type,
-        CoordinationType coordinationType,
-        ErrorReporter errorReporter
-    ) {
-        var result = new CodeBuilder();
-        result.pr(PyUtil.generateGILAcquireCode() + "\n");
-        result.pr(
-            super.generateNetworkReceiverBody(
-                action,
-                sendingPort,
-                receivingPort,
-                connection,
-                type,
-                coordinationType,
-                errorReporter
-            )
-        );
-        result.pr(PyUtil.generateGILReleaseCode() + "\n");
-        return result.getCode();
+  @Override
+  public String generateNetworkSenderBody(
+      VarRef sendingPort,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      CoordinationType coordinationType,
+      ErrorReporter errorReporter) {
+    var result = new CodeBuilder();
+    result.pr(PyUtil.generateGILAcquireCode() + "\n");
+    result.pr(
+        super.generateNetworkSenderBody(
+            sendingPort, receivingPort, connection, type, coordinationType, errorReporter));
+    result.pr(PyUtil.generateGILReleaseCode() + "\n");
+    return result.getCode();
+  }
 
-    }
+  @Override
+  public String generateNetworkReceiverBody(
+      Action action,
+      VarRef sendingPort,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      CoordinationType coordinationType,
+      ErrorReporter errorReporter) {
+    var result = new CodeBuilder();
+    result.pr(PyUtil.generateGILAcquireCode() + "\n");
+    result.pr(
+        super.generateNetworkReceiverBody(
+            action, sendingPort, receivingPort, connection, type, coordinationType, errorReporter));
+    result.pr(PyUtil.generateGILReleaseCode() + "\n");
+    return result.getCode();
+  }
 
-    @Override
-    protected void deserialize(
-        Action action,
-        VarRef receivingPort,
-        FedConnectionInstance connection,
-        InferredType type,
-        String receiveRef,
-        CodeBuilder result,
-        ErrorReporter errorReporter
-    ) {
-        String value = "";
-        switch (connection.getSerializer()) {
-        case NATIVE: {
-            value = action.getName();
-            FedNativePythonSerialization pickler = new FedNativePythonSerialization();
-            result.pr(pickler.generateNetworkDeserializerCode(value, null));
-            result.pr("lf_set(" + receiveRef + ", "
-                          + FedSerialization.deserializedVarName + ");\n");
-            break;
-        }
-        case PROTO: {
-            throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
+  @Override
+  protected void deserialize(
+      Action action,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      String receiveRef,
+      CodeBuilder result,
+      ErrorReporter errorReporter) {
+    String value = "";
+    switch (connection.getSerializer()) {
+      case NATIVE:
+        {
+          value = action.getName();
+          FedNativePythonSerialization pickler = new FedNativePythonSerialization();
+          result.pr(pickler.generateNetworkDeserializerCode(value, null));
+          result.pr("lf_set(" + receiveRef + ", " + FedSerialization.deserializedVarName + ");\n");
+          break;
         }
-        case ROS2: {
-            throw new UnsupportedOperationException("ROS2 serialization is not supported yet.");
+      case PROTO:
+        {
+          throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
         }
-
+      case ROS2:
+        {
+          throw new UnsupportedOperationException("ROS2 serialization is not supported yet.");
         }
     }
+  }
 
-    @Override
-    protected void serializeAndSend(
-        FedConnectionInstance connection,
-        InferredType type,
-        String sendRef,
-        CodeBuilder result,
-        String sendingFunction,
-        String commonArgs,
-        ErrorReporter errorReporter
-    ) {
-        String lengthExpression = "";
-        String pointerExpression = "";
-        switch (connection.getSerializer()) {
-        case NATIVE: {
-            var variableToSerialize = sendRef + "->value";
-            FedNativePythonSerialization pickler = new FedNativePythonSerialization();
-            lengthExpression = pickler.serializedBufferLength();
-            pointerExpression = pickler.seializedBufferVar();
-            result.pr(pickler.generateNetworkSerializerCode(variableToSerialize, null));
-            result.pr(
-                "size_t message_length = " + lengthExpression + ";");
-            result.pr(
-                sendingFunction + "(" + commonArgs + ", " + pointerExpression
-                    + ");\n");
-            break;
+  @Override
+  protected void serializeAndSend(
+      FedConnectionInstance connection,
+      InferredType type,
+      String sendRef,
+      CodeBuilder result,
+      String sendingFunction,
+      String commonArgs,
+      ErrorReporter errorReporter) {
+    String lengthExpression = "";
+    String pointerExpression = "";
+    switch (connection.getSerializer()) {
+      case NATIVE:
+        {
+          var variableToSerialize = sendRef + "->value";
+          FedNativePythonSerialization pickler = new FedNativePythonSerialization();
+          lengthExpression = pickler.serializedBufferLength();
+          pointerExpression = pickler.seializedBufferVar();
+          result.pr(pickler.generateNetworkSerializerCode(variableToSerialize, null));
+          result.pr("size_t message_length = " + lengthExpression + ";");
+          result.pr(sendingFunction + "(" + commonArgs + ", " + pointerExpression + ");\n");
+          break;
         }
-        case PROTO: {
-            throw new UnsupportedOperationException("Protbuf serialization is not supported yet.");
+      case PROTO:
+        {
+          throw new UnsupportedOperationException("Protbuf serialization is not supported yet.");
         }
-        case ROS2: {
-            throw new UnsupportedOperationException("ROS2 serialization is not supported yet.");
-        }
-
+      case ROS2:
+        {
+          throw new UnsupportedOperationException("ROS2 serialization is not supported yet.");
         }
     }
+  }
 
-    @Override
-    public void annotateReaction(Reaction reaction) {
-        ASTUtils.addReactionAttribute(reaction, "_c_body");
-    }
+  @Override
+  public void annotateReaction(Reaction reaction) {
+    ASTUtils.addReactionAttribute(reaction, "_c_body");
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/extensions/TSExtension.java b/org.lflang/src/org/lflang/federated/extensions/TSExtension.java
index 4a70f4cc6b..b52b739803 100644
--- a/org.lflang/src/org/lflang/federated/extensions/TSExtension.java
+++ b/org.lflang/src/org/lflang/federated/extensions/TSExtension.java
@@ -6,12 +6,11 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedASTUtils;
 import org.lflang.federated.generator.FedConnectionInstance;
 import org.lflang.federated.generator.FedFileConfig;
@@ -27,73 +26,94 @@
 import org.lflang.lf.Variable;
 
 public class TSExtension implements FedTargetExtension {
-    @Override
-    public void initializeTargetConfig(LFGeneratorContext context, int numOfFederates, FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter, RtiConfig rtiConfig) throws IOException {
-
-    }
+  @Override
+  public void initializeTargetConfig(
+      LFGeneratorContext context,
+      int numOfFederates,
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      ErrorReporter errorReporter,
+      RtiConfig rtiConfig)
+      throws IOException {}
 
-    @Override
-    public String generateNetworkReceiverBody(Action action, VarRef sendingPort, VarRef receivingPort, FedConnectionInstance connection, InferredType type, CoordinationType coordinationType, ErrorReporter errorReporter) {
-        return """
+  @Override
+  public String generateNetworkReceiverBody(
+      Action action,
+      VarRef sendingPort,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      CoordinationType coordinationType,
+      ErrorReporter errorReporter) {
+    return """
         // generateNetworkReceiverBody
         if (%1$s !== undefined) {
             %2$s.%3$s = %1$s;
         }
-        """.formatted(
+        """
+        .formatted(
             action.getName(),
             receivingPort.getContainer().getName(),
-            receivingPort.getVariable().getName()
-        );
-    }
+            receivingPort.getVariable().getName());
+  }
 
-    @Override
-    public String generateNetworkSenderBody(VarRef sendingPort, VarRef receivingPort, FedConnectionInstance connection, InferredType type, CoordinationType coordinationType, ErrorReporter errorReporter) {
-        return"""
+  @Override
+  public String generateNetworkSenderBody(
+      VarRef sendingPort,
+      VarRef receivingPort,
+      FedConnectionInstance connection,
+      InferredType type,
+      CoordinationType coordinationType,
+      ErrorReporter errorReporter) {
+    return """
         if (%1$s.%2$s !== undefined) {
             this.util.sendRTITimedMessage(%1$s.%2$s, %3$s, %4$s, %5$s);
         }
-        """.formatted(
+        """
+        .formatted(
             sendingPort.getContainer().getName(),
             sendingPort.getVariable().getName(),
             connection.getDstFederate().id,
             connection.getDstFederate().networkMessageActions.size(),
-            getNetworkDelayLiteral(connection.getDefinition().getDelay())
-        );
-    }
+            getNetworkDelayLiteral(connection.getDefinition().getDelay()));
+  }
 
-    private String getNetworkDelayLiteral(Expression e) {
-        var cLiteral = CExtensionUtils.getNetworkDelayLiteral(e);
-        return cLiteral.equals("NEVER") ? "0" : cLiteral;
-    }
+  private String getNetworkDelayLiteral(Expression e) {
+    var cLiteral = CExtensionUtils.getNetworkDelayLiteral(e);
+    return cLiteral.equals("NEVER") ? "0" : cLiteral;
+  }
 
-    @Override
-    public String generateNetworkInputControlReactionBody(int receivingPortID, TimeValue maxSTP, CoordinationType coordination) {
-        return "// TODO(hokeun): Figure out what to do for generateNetworkInputControlReactionBody";
-    }
+  @Override
+  public String generateNetworkInputControlReactionBody(
+      int receivingPortID, TimeValue maxSTP, CoordinationType coordination) {
+    return "// TODO(hokeun): Figure out what to do for generateNetworkInputControlReactionBody";
+  }
 
-    @Override
-    public String generateNetworkOutputControlReactionBody(VarRef srcOutputPort, FedConnectionInstance connection) {
-        return "// TODO(hokeun): Figure out what to do for generateNetworkOutputControlReactionBody";
-    }
+  @Override
+  public String generateNetworkOutputControlReactionBody(
+      VarRef srcOutputPort, FedConnectionInstance connection) {
+    return "// TODO(hokeun): Figure out what to do for generateNetworkOutputControlReactionBody";
+  }
 
-    @Override
-    public String getNetworkBufferType() {
-        return "";
-    }
+  @Override
+  public String getNetworkBufferType() {
+    return "";
+  }
 
-    /**
-     * Add necessary preamble to the source to set up federated execution.
-     *
-     * @return
-     */
-    @Override
-    public String generatePreamble(FederateInstance federate, FedFileConfig fileConfig,
-                                   RtiConfig rtiConfig,
-                                   ErrorReporter errorReporter) {
-        var minOutputDelay = getMinOutputDelay(federate, fileConfig, errorReporter);
-        var upstreamConnectionDelays = getUpstreamConnectionDelays(federate);
-        return
-        """
+  /**
+   * Add necessary preamble to the source to set up federated execution.
+   *
+   * @return
+   */
+  @Override
+  public String generatePreamble(
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      RtiConfig rtiConfig,
+      ErrorReporter errorReporter) {
+    var minOutputDelay = getMinOutputDelay(federate, fileConfig, errorReporter);
+    var upstreamConnectionDelays = getUpstreamConnectionDelays(federate);
+    return """
         const defaultFederateConfig: __FederateConfig = {
             dependsOn: [%s],
             executionTimeout: undefined,
@@ -108,94 +128,101 @@ public String generatePreamble(FederateInstance federate, FedFileConfig fileConf
             sendsTo: [%s],
             upstreamConnectionDelays: [%s]
         }
-            """.formatted(
+            """
+        .formatted(
             federate.dependsOn.keySet().stream()
-                              .map(e->String.valueOf(e.id))
-                              .collect(Collectors.joining(",")),
+                .map(e -> String.valueOf(e.id))
+                .collect(Collectors.joining(",")),
             federate.id,
-            minOutputDelay == null ? "undefined"
-                                   : "%s".formatted(TSTypes.getInstance().getTargetTimeExpr(minOutputDelay)),
-            federate.networkMessageActions
-                .stream()
+            minOutputDelay == null
+                ? "undefined"
+                : "%s".formatted(TSTypes.getInstance().getTargetTimeExpr(minOutputDelay)),
+            federate.networkMessageActions.stream()
                 .map(Variable::getName)
                 .collect(Collectors.joining(",", "\"", "\"")),
             rtiConfig.getHost(),
             rtiConfig.getPort(),
             federate.sendsTo.keySet().stream()
-                            .map(e->String.valueOf(e.id))
-                            .collect(Collectors.joining(",")),
-            upstreamConnectionDelays.stream().collect(Collectors.joining(","))
-        );
-    }
+                .map(e -> String.valueOf(e.id))
+                .collect(Collectors.joining(",")),
+            upstreamConnectionDelays.stream().collect(Collectors.joining(",")));
+  }
 
-    private TimeValue getMinOutputDelay(FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-        if (federate.targetConfig.coordination.equals(CoordinationType.CENTRALIZED)) {
-            // If this program uses centralized coordination then check
-            // for outputs that depend on physical actions so that null messages can be
-            // sent to the RTI.
-            var federateClass = ASTUtils.toDefinition(federate.instantiation.getReactorClass());
-            var main = new ReactorInstance(FedASTUtils.findFederatedReactor(federate.instantiation.eResource()), errorReporter, 1);
-            var instance = new ReactorInstance(federateClass, main, errorReporter);
-            var outputDelayMap = federate
-                .findOutputsConnectedToPhysicalActions(instance);
-            var minOutputDelay = TimeValue.MAX_VALUE;
-            Output outputFound = null;
-            for (Output output : outputDelayMap.keySet()) {
-                var outputDelay = outputDelayMap.get(output);
-                if (outputDelay.isEarlierThan(minOutputDelay)) {
-                    minOutputDelay = outputDelay;
-                    outputFound = output;
-                }
-            }
-            if (minOutputDelay != TimeValue.MAX_VALUE) {
-                // Unless silenced, issue a warning.
-                if (federate.targetConfig.coordinationOptions.advance_message_interval
-                    == null) {
-                    errorReporter.reportWarning(outputFound, String.join("\n",
-                                                                         "Found a path from a physical action to output for reactor "
-                                                                             + addDoubleQuotes(instance.getName())
-                                                                             + ". ",
-                                                                         "The amount of delay is "
-                                                                             + minOutputDelay
-                                                                             + ".",
-                                                                         "With centralized coordination, this can result in a large number of messages to the RTI.",
-                                                                         "Consider refactoring the code so that the output does not depend on the physical action,",
-                                                                         "or consider using decentralized coordination. To silence this warning, set the target",
-                                                                         "parameter coordination-options with a value like {advance-message-interval: 10 msec}"
-                    ));
-                }
-                return minOutputDelay;
-            }
+  private TimeValue getMinOutputDelay(
+      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+    if (federate.targetConfig.coordination.equals(CoordinationType.CENTRALIZED)) {
+      // If this program uses centralized coordination then check
+      // for outputs that depend on physical actions so that null messages can be
+      // sent to the RTI.
+      var federateClass = ASTUtils.toDefinition(federate.instantiation.getReactorClass());
+      var main =
+          new ReactorInstance(
+              FedASTUtils.findFederatedReactor(federate.instantiation.eResource()),
+              errorReporter,
+              1);
+      var instance = new ReactorInstance(federateClass, main, errorReporter);
+      var outputDelayMap = federate.findOutputsConnectedToPhysicalActions(instance);
+      var minOutputDelay = TimeValue.MAX_VALUE;
+      Output outputFound = null;
+      for (Output output : outputDelayMap.keySet()) {
+        var outputDelay = outputDelayMap.get(output);
+        if (outputDelay.isEarlierThan(minOutputDelay)) {
+          minOutputDelay = outputDelay;
+          outputFound = output;
         }
-        return null;
+      }
+      if (minOutputDelay != TimeValue.MAX_VALUE) {
+        // Unless silenced, issue a warning.
+        if (federate.targetConfig.coordinationOptions.advance_message_interval == null) {
+          errorReporter.reportWarning(
+              outputFound,
+              String.join(
+                  "\n",
+                  "Found a path from a physical action to output for reactor "
+                      + addDoubleQuotes(instance.getName())
+                      + ". ",
+                  "The amount of delay is " + minOutputDelay + ".",
+                  "With centralized coordination, this can result in a large number of messages to"
+                      + " the RTI.",
+                  "Consider refactoring the code so that the output does not depend on the physical"
+                      + " action,",
+                  "or consider using decentralized coordination. To silence this warning, set the"
+                      + " target",
+                  "parameter coordination-options with a value like {advance-message-interval: 10"
+                      + " msec}"));
+        }
+        return minOutputDelay;
+      }
     }
+    return null;
+  }
 
-    private List<String> getUpstreamConnectionDelays(FederateInstance federate) {
-        List<String> candidates = new ArrayList<>();
-        if (!federate.dependsOn.keySet().isEmpty()) {
-            for (FederateInstance upstreamFederate: federate.dependsOn.keySet()) {
-                String element = "[";
-                var delays = federate.dependsOn.get(upstreamFederate);
-                int cnt = 0;
-                if (delays != null) {
-                    for (Expression delay : delays) {
-                        if (delay == null) {
-                            element += "TimeValue.NEVER()";
-                        } else {
-                            element += "TimeValue.nsec(" + getNetworkDelayLiteral(delay) + ")";
-                        }
-                        cnt++;
-                        if (cnt != delays.size()) {
-                            element += ", ";
-                        }
-                    }
-                } else {
-                    element += "TimeValue.NEVER()";
-                }
-                element += "]";
-                candidates.add(element);
+  private List<String> getUpstreamConnectionDelays(FederateInstance federate) {
+    List<String> candidates = new ArrayList<>();
+    if (!federate.dependsOn.keySet().isEmpty()) {
+      for (FederateInstance upstreamFederate : federate.dependsOn.keySet()) {
+        String element = "[";
+        var delays = federate.dependsOn.get(upstreamFederate);
+        int cnt = 0;
+        if (delays != null) {
+          for (Expression delay : delays) {
+            if (delay == null) {
+              element += "TimeValue.NEVER()";
+            } else {
+              element += "TimeValue.nsec(" + getNetworkDelayLiteral(delay) + ")";
+            }
+            cnt++;
+            if (cnt != delays.size()) {
+              element += ", ";
             }
+          }
+        } else {
+          element += "TimeValue.NEVER()";
         }
-        return candidates;
+        element += "]";
+        candidates.add(element);
+      }
     }
+    return candidates;
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java b/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
index 74390c936b..b191a07427 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
@@ -27,6 +27,7 @@
 
 package org.lflang.federated.generator;
 
+import com.google.common.collect.Iterators;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -36,21 +37,18 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.ModelInfo;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.extensions.FedTargetExtensionFactory;
 import org.lflang.federated.serialization.SupportedSerializers;
 import org.lflang.generator.PortInstance;
@@ -73,926 +71,881 @@
 import org.lflang.lf.Variable;
 import org.lflang.util.Pair;
 
-import com.google.common.collect.Iterators;
-
-
 /**
- * A helper class for AST transformations needed for federated
- * execution.
+ * A helper class for AST transformations needed for federated execution.
  *
  * @author Soroush Bateni
  * @author Edward A. Lee
  */
 public class FedASTUtils {
 
-    /**
-     * Map from reactions to bank indices
-     */
-    private static Map<Reaction,Integer> reactionBankIndices = null;
-
-    /**
-     * Mark the specified reaction to belong to only the specified
-     * bank index. This is needed because reactions cannot declare
-     * a specific bank index as an effect or trigger. Reactions that
-     * send messages between federates, including absent messages,
-     * need to be specific to a bank member.
-     * @param reaction The reaction.
-     * @param bankIndex The bank index, or -1 if there is no bank.
-     */
-    public static void setReactionBankIndex(Reaction reaction, int bankIndex) {
-        if (bankIndex < 0) {
-            return;
-        }
-        if (reactionBankIndices == null) {
-            reactionBankIndices = new LinkedHashMap<>();
-        }
-        reactionBankIndices.put(reaction, bankIndex);
+  /** Map from reactions to bank indices */
+  private static Map<Reaction, Integer> reactionBankIndices = null;
+
+  /**
+   * Mark the specified reaction to belong to only the specified bank index. This is needed because
+   * reactions cannot declare a specific bank index as an effect or trigger. Reactions that send
+   * messages between federates, including absent messages, need to be specific to a bank member.
+   *
+   * @param reaction The reaction.
+   * @param bankIndex The bank index, or -1 if there is no bank.
+   */
+  public static void setReactionBankIndex(Reaction reaction, int bankIndex) {
+    if (bankIndex < 0) {
+      return;
     }
-
-    /**
-     * Return the reaction bank index.
-     * @see #setReactionBankIndex(Reaction reaction, int bankIndex)
-     * @param reaction The reaction.
-     * @return The reaction bank index, if one has been set, and -1 otherwise.
-     */
-    public static int getReactionBankIndex(Reaction reaction) {
-        if (reactionBankIndices == null) return -1;
-        if (reactionBankIndices.get(reaction) == null) return -1;
-        return reactionBankIndices.get(reaction);
+    if (reactionBankIndices == null) {
+      reactionBankIndices = new LinkedHashMap<>();
     }
-
-    /**
-     * Find the federated reactor in a .lf file.
-     *
-     * @param resource Resource representing a .lf file.
-     * @return The federated reactor if found.
-     */
-    public static Reactor findFederatedReactor(Resource resource) {
-        return IteratorExtensions.findFirst(
-            Iterators.filter(resource.getAllContents(), Reactor.class),
-            Reactor::isFederated
-        );
+    reactionBankIndices.put(reaction, bankIndex);
+  }
+
+  /**
+   * Return the reaction bank index.
+   *
+   * @see #setReactionBankIndex(Reaction reaction, int bankIndex)
+   * @param reaction The reaction.
+   * @return The reaction bank index, if one has been set, and -1 otherwise.
+   */
+  public static int getReactionBankIndex(Reaction reaction) {
+    if (reactionBankIndices == null) return -1;
+    if (reactionBankIndices.get(reaction) == null) return -1;
+    return reactionBankIndices.get(reaction);
+  }
+
+  /**
+   * Find the federated reactor in a .lf file.
+   *
+   * @param resource Resource representing a .lf file.
+   * @return The federated reactor if found.
+   */
+  public static Reactor findFederatedReactor(Resource resource) {
+    return IteratorExtensions.findFirst(
+        Iterators.filter(resource.getAllContents(), Reactor.class), Reactor::isFederated);
+  }
+
+  /**
+   * Replace the specified connection with communication between federates.
+   *
+   * @param connection Network connection between two federates.
+   * @param resource
+   * @param mainDef
+   * @param coordination One of CoordinationType.DECENTRALIZED or CoordinationType.CENTRALIZED.
+   * @param errorReporter Used to report errors encountered.
+   */
+  public static void makeCommunication(
+      FedConnectionInstance connection,
+      Resource resource,
+      CoordinationType coordination,
+      ErrorReporter errorReporter) {
+
+    // Add the sender reactor.
+    addNetworkSenderReactor(connection, coordination, resource, errorReporter);
+
+    // Next, generate control reactions
+    // if (
+    //     !connection.getDefinition().isPhysical() &&
+    //         // Connections that are physical don't need control reactions
+    //         connection.getDefinition().getDelay()
+    //             == null // Connections that have delays don't need control reactions
+    // ) {
+    // Add the network output control reaction to the parent
+    FedASTUtils.addNetworkOutputControlReaction(connection);
+
+    // Add the network input control reaction to the parent
+    // FedASTUtils.addNetworkInputControlReaction(connection, coordination, errorReporter);
+    // }
+
+    // Add the network receiver reactor in the destinationFederate
+    addNetworkReceiverReactor(connection, coordination, resource, errorReporter);
+  }
+
+  public static int networkMessageActionID = 0;
+
+  /**
+   * Create a "network action" in the reactor that contains the given connection and return it.
+   *
+   * <p>The purpose of this action is to serve as a trigger for a "network input reaction" that is
+   * responsible for relaying messages to the port that is on the receiving side of the given
+   * connection. The connection is assumed to be between two reactors that reside in distinct
+   * federates. Hence, the container of the connection is assumed to be top-level.
+   *
+   * @param connection A connection between two federates
+   * @return The newly created action.
+   */
+  private static Action createNetworkAction(FedConnectionInstance connection) {
+    // Reactor top = (Reactor) connection.getDefinition().eContainer();
+    LfFactory factory = LfFactory.eINSTANCE;
+
+    Action action = factory.createAction();
+    // Name the newly created action; set its delay and type.
+    action.setName("networkMessage_" + networkMessageActionID++);
+    if (connection.serializer == SupportedSerializers.NATIVE) {
+      action.setType(EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getType()));
+    } else {
+      Type action_type = factory.createType();
+      action_type.setId(
+          FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
+              .getNetworkBufferType());
+      action.setType(action_type);
     }
 
-    /**
-     * Replace the specified connection with communication between federates.
-     *
-     * @param connection   Network connection between two federates.
-     * @param resource
-     * @param mainDef
-     * @param coordination One of CoordinationType.DECENTRALIZED or
-     *                     CoordinationType.CENTRALIZED.
-     * @param errorReporter Used to report errors encountered.
-     */
-    public static void makeCommunication(
-        FedConnectionInstance connection,
-        Resource resource, CoordinationType coordination,
-        ErrorReporter errorReporter
-    ) {
-
-        // Add the sender reactor.
-        addNetworkSenderReactor(
-            connection,
-            coordination,
-            resource,
-            errorReporter
-        );
-
-        // Next, generate control reactions
-        // if (
-        //     !connection.getDefinition().isPhysical() &&
-        //         // Connections that are physical don't need control reactions
-        //         connection.getDefinition().getDelay()
-        //             == null // Connections that have delays don't need control reactions
-        // ) {
-            // Add the network output control reaction to the parent
-        FedASTUtils.addNetworkOutputControlReaction(connection);
-
-            // Add the network input control reaction to the parent
-            //FedASTUtils.addNetworkInputControlReaction(connection, coordination, errorReporter);
-        //}
-
-        // Add the network receiver reactor in the destinationFederate
-        addNetworkReceiverReactor(
-            connection,
-            coordination,
-            resource,
-            errorReporter
-        );
-
+    // The connection is 'physical' if it uses the ~> notation.
+    if (connection.getDefinition().isPhysical()) {
+      action.setOrigin(ActionOrigin.PHYSICAL);
+      // Messages sent on physical connections do not
+      // carry a timestamp, or a delay. The delay
+      // provided using after is enforced by setting
+      // the minDelay.
+      if (connection.getDefinition().getDelay() != null) {
+        action.setMinDelay(connection.getDefinition().getDelay());
+      }
+    } else {
+      action.setOrigin(ActionOrigin.LOGICAL);
     }
 
-    public static int networkMessageActionID = 0;
-
-    /**
-     * Create a "network action" in the reactor that contains the given
-     * connection and return it.
-     *
-     * The purpose of this action is to serve as a trigger for a "network
-     * input reaction" that is responsible for relaying messages to the
-     * port that is on the receiving side of the given connection. The
-     * connection is assumed to be between two reactors that reside in
-     * distinct federates. Hence, the container of the connection is
-     * assumed to be top-level.
-     *
-     * @param connection A connection between two federates
-     * @return The newly created action.
-     */
-    private static Action createNetworkAction(FedConnectionInstance connection) {
-        //Reactor top = (Reactor) connection.getDefinition().eContainer();
-        LfFactory factory = LfFactory.eINSTANCE;
-
-        Action action = factory.createAction();
-        // Name the newly created action; set its delay and type.
-        action.setName("networkMessage_" + networkMessageActionID++);
-        if (connection.serializer == SupportedSerializers.NATIVE) {
-            action.setType(EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getType()));
-        } else {
-            Type action_type = factory.createType();
-            action_type.setId(
-                FedTargetExtensionFactory.getExtension(
-                    connection.srcFederate.targetConfig.target
-                                   ).getNetworkBufferType()
-            );
-            action.setType(action_type);
-        }
-
-        // The connection is 'physical' if it uses the ~> notation.
-        if (connection.getDefinition().isPhysical()) {
-            action.setOrigin(ActionOrigin.PHYSICAL);
-            // Messages sent on physical connections do not
-            // carry a timestamp, or a delay. The delay
-            // provided using after is enforced by setting
-            // the minDelay.
-            if (connection.getDefinition().getDelay() != null) {
-                action.setMinDelay(connection.getDefinition().getDelay());
-            }
-        } else {
-            action.setOrigin(ActionOrigin.LOGICAL);
+    return action;
+  }
+
+  /**
+   * Add a network receiver reactor for a given input port 'destination' to destination's parent
+   * reactor. This reaction will react to a generated 'networkAction' (triggered asynchronously,
+   * e.g., by federate.c). This 'networkAction' will contain the actual message that is sent by the
+   * sender in 'action->value'. This value is forwarded to 'destination' in the network receiver
+   * reaction.
+   *
+   * @param connection FIXME
+   * @param coordination One of CoordinationType.DECENTRALIZED or CoordinationType.CENTRALIZED.
+   * @param resource
+   * @note: Used in federated execution
+   */
+  private static void addNetworkReceiverReactor(
+      FedConnectionInstance connection,
+      CoordinationType coordination,
+      Resource resource,
+      ErrorReporter errorReporter) {
+    LfFactory factory = LfFactory.eINSTANCE;
+    Type type = EcoreUtil.copy(connection.getDestinationPortInstance().getDefinition().getType());
+
+    VarRef sourceRef = factory.createVarRef(); // source fed
+    VarRef instRef = factory.createVarRef(); // instantiation connection
+    VarRef destRef = factory.createVarRef(); // destination connection
+
+    Reactor receiver = factory.createReactor();
+    Reaction networkReceiverReaction = factory.createReaction();
+
+    Output out = factory.createOutput();
+    VarRef outRef = factory.createVarRef(); // out port
+    Connection receiverFromReaction = factory.createConnection();
+    Instantiation networkInstance = factory.createInstantiation();
+
+    Reactor top =
+        connection
+            .getSourcePortInstance()
+            .getParent()
+            .getParent()
+            .reactorDefinition; // Top-level reactor.
+
+    receiver.getReactions().add(networkReceiverReaction);
+    receiver.getOutputs().add(out);
+    EObject node = IteratorExtensions.findFirst(resource.getAllContents(), Model.class::isInstance);
+    ((Model) node).getReactors().add(receiver);
+    receiver.setName("NetworkReceiver_" + networkIDReceiver++);
+    // networkReceiverReaction.setName("NetworkReceiverReaction_" + networkIDReceiver++);
+
+    networkInstance.setReactorClass(receiver);
+    networkInstance.setName(
+        ASTUtils.getUniqueIdentifier(top, "nr_" + connection.getDstFederate().name));
+    top.getInstantiations().add(networkInstance);
+
+    receiverFromReaction.getLeftPorts().add(instRef);
+    receiverFromReaction.getRightPorts().add(destRef);
+
+    // Create the network action (@see createNetworkAction)
+    Action networkAction = createNetworkAction(connection);
+
+    // Keep track of this action in the destination federate.
+    connection.dstFederate.networkMessageActions.add(networkAction);
+
+    TimeValue maxSTP = findMaxSTP(connection, coordination);
+
+    if (!connection.dstFederate.currentSTPOffsets.contains(maxSTP.time)) {
+      connection.dstFederate.currentSTPOffsets.add(maxSTP.time);
+      connection.dstFederate.stpOffsets.add(maxSTP);
+      connection.dstFederate.stpToNetworkActionMap.put(maxSTP, new ArrayList<>());
+    } else {
+      // TODO: Find more efficient way to reuse timevalues
+      for (var offset : connection.dstFederate.stpOffsets) {
+        if (maxSTP.time == offset.time) {
+          maxSTP = offset;
+          break;
         }
-
-        return action;
+      }
     }
 
-    /**
-     * Add a network receiver reactor for a given input port 'destination' to
-     * destination's parent reactor. This reaction will react to a generated
-     * 'networkAction' (triggered asynchronously, e.g., by federate.c). This
-     * 'networkAction' will contain the actual message that is sent by the
-     * sender
-     * in 'action->value'. This value is forwarded to 'destination' in the
-     * network
-     * receiver reaction.
-     *
-     * @param connection          FIXME
-     * @param coordination        One of CoordinationType.DECENTRALIZED or
-     *                            CoordinationType.CENTRALIZED.
-     * @param resource
-     * @note: Used in federated execution
-     */
-    private static void addNetworkReceiverReactor(
-        FedConnectionInstance connection,
-
-        CoordinationType coordination,
-        Resource resource, ErrorReporter errorReporter
-    ) {
-        LfFactory factory = LfFactory.eINSTANCE;
-        Type type = EcoreUtil.copy(connection.getDestinationPortInstance().getDefinition().getType());
-        
-        VarRef sourceRef = factory.createVarRef(); //source fed
-        VarRef instRef = factory.createVarRef(); //instantiation connection
-        VarRef destRef = factory.createVarRef(); //destination connection
-
-        Reactor receiver = factory.createReactor();
-        Reaction networkReceiverReaction = factory.createReaction();
-
-
-        Output out = factory.createOutput();
-        VarRef outRef = factory.createVarRef(); //out port
-        Connection receiverFromReaction = factory.createConnection();
-        Instantiation networkInstance = factory.createInstantiation();
-
-        Reactor top = connection.getSourcePortInstance()
-                                .getParent()
-                                .getParent().reactorDefinition; // Top-level reactor.
-
-        receiver.getReactions().add(networkReceiverReaction);
-        receiver.getOutputs().add(out);
-        EObject node = IteratorExtensions.findFirst(resource.getAllContents(), Model.class::isInstance);
-        ((Model) node).getReactors().add(receiver);
-        receiver.setName("NetworkReceiver_" + networkIDReceiver++);
-        //networkReceiverReaction.setName("NetworkReceiverReaction_" + networkIDReceiver++);
-
-
-        networkInstance.setReactorClass(receiver);
-        networkInstance.setName(ASTUtils.getUniqueIdentifier(top, "nr_" + connection.getDstFederate().name));
-        top.getInstantiations().add(networkInstance);
-
-        receiverFromReaction.getLeftPorts().add(instRef);
-        receiverFromReaction.getRightPorts().add(destRef);
-
-        // Create the network action (@see createNetworkAction)
-        Action networkAction = createNetworkAction(connection);
-
-        // Keep track of this action in the destination federate.
-        connection.dstFederate.networkMessageActions.add(networkAction);
-
-
-        TimeValue maxSTP = findMaxSTP(connection, coordination);
-
-        if(!connection.dstFederate.currentSTPOffsets.contains(maxSTP.time)) {
-            connection.dstFederate.currentSTPOffsets.add(maxSTP.time);
-            connection.dstFederate.stpOffsets.add(maxSTP);
-            connection.dstFederate.stpToNetworkActionMap.put(maxSTP, new ArrayList<>());
-        } else {
-            // TODO: Find more efficient way to reuse timevalues
-            for(var offset: connection.dstFederate.stpOffsets){
-                if(maxSTP.time == offset.time) {
-                    maxSTP = offset;
-                    break;
-                }
-            }
-        }
-
-        connection.dstFederate.stpToNetworkActionMap.get(maxSTP).add(networkAction);
-
-        // Add the action definition to the parent reactor.
-        receiver.getActions().add(networkAction);
-
-        // If the sender or receiver is in a bank of reactors, then we want
-        // these reactions to appear only in the federate whose bank ID matches.
-        setReactionBankIndex(networkReceiverReaction, connection.getDstBank());
-
-        // FIXME: do not create a new extension every time it is used
-        FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
-                                 .annotateReaction(networkReceiverReaction);
-
-        // The connection is 'physical' if it uses the ~> notation.
-        if (connection.getDefinition().isPhysical()) {
-            connection.dstFederate.inboundP2PConnections.add(connection.srcFederate);
-        } else {
-            // If the connection is logical but coordination
-            // is decentralized, we would need
-            // to make P2P connections
-            if (coordination == CoordinationType.DECENTRALIZED) {
-                connection.dstFederate.inboundP2PConnections.add(connection.srcFederate);
-            }
-        }
+    connection.dstFederate.stpToNetworkActionMap.get(maxSTP).add(networkAction);
+
+    // Add the action definition to the parent reactor.
+    receiver.getActions().add(networkAction);
+
+    // If the sender or receiver is in a bank of reactors, then we want
+    // these reactions to appear only in the federate whose bank ID matches.
+    setReactionBankIndex(networkReceiverReaction, connection.getDstBank());
+
+    // FIXME: do not create a new extension every time it is used
+    FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
+        .annotateReaction(networkReceiverReaction);
+
+    // The connection is 'physical' if it uses the ~> notation.
+    if (connection.getDefinition().isPhysical()) {
+      connection.dstFederate.inboundP2PConnections.add(connection.srcFederate);
+    } else {
+      // If the connection is logical but coordination
+      // is decentralized, we would need
+      // to make P2P connections
+      if (coordination == CoordinationType.DECENTRALIZED) {
+        connection.dstFederate.inboundP2PConnections.add(connection.srcFederate);
+      }
+    }
 
-        // Establish references to the involved ports.
-        sourceRef.setContainer(connection.getSourcePortInstance().getParent().getDefinition());
-        sourceRef.setVariable(connection.getSourcePortInstance().getDefinition());
-        destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
-        destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
-        instRef.setContainer(networkInstance);
-        instRef.setVariable(out);
-
-        out.setName("msg");
-        out.setType(type);
-        out.setWidthSpec(EcoreUtil.copy(connection.getDestinationPortInstance().getDefinition().getWidthSpec()));
-        outRef.setVariable(out);
-
-        // Add the output port at the receiver reactor as an effect
-        //networkReceiverReaction.getEffects().add(outRef);
-
-        VarRef triggerRef = factory.createVarRef();
-        // Establish references to the action.
-        triggerRef.setVariable(networkAction);
-        // Add the action as a trigger to the receiver reaction
-        networkReceiverReaction.getTriggers().add(triggerRef);
-        networkReceiverReaction.getEffects().add(outRef);
-
-        // Generate code for the network receiver reaction
-        networkReceiverReaction.setCode(factory.createCode());
-        networkReceiverReaction.getCode().setBody(
-            FedTargetExtensionFactory.getExtension(
-                connection.dstFederate.targetConfig.target).generateNetworkReceiverBody(
+    // Establish references to the involved ports.
+    sourceRef.setContainer(connection.getSourcePortInstance().getParent().getDefinition());
+    sourceRef.setVariable(connection.getSourcePortInstance().getDefinition());
+    destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
+    destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
+    instRef.setContainer(networkInstance);
+    instRef.setVariable(out);
+
+    out.setName("msg");
+    out.setType(type);
+    out.setWidthSpec(
+        EcoreUtil.copy(connection.getDestinationPortInstance().getDefinition().getWidthSpec()));
+    outRef.setVariable(out);
+
+    // Add the output port at the receiver reactor as an effect
+    // networkReceiverReaction.getEffects().add(outRef);
+
+    VarRef triggerRef = factory.createVarRef();
+    // Establish references to the action.
+    triggerRef.setVariable(networkAction);
+    // Add the action as a trigger to the receiver reaction
+    networkReceiverReaction.getTriggers().add(triggerRef);
+    networkReceiverReaction.getEffects().add(outRef);
+
+    // Generate code for the network receiver reaction
+    networkReceiverReaction.setCode(factory.createCode());
+    networkReceiverReaction
+        .getCode()
+        .setBody(
+            FedTargetExtensionFactory.getExtension(connection.dstFederate.targetConfig.target)
+                .generateNetworkReceiverBody(
                     networkAction,
                     sourceRef,
                     outRef,
                     connection,
                     ASTUtils.getInferredType(networkAction),
                     coordination,
-                    errorReporter
-            ));
-
-        // Add the receiver reaction to the parent
-        // parent.getReactions().add(networkReceiverReaction);
-
-        // Add the network receiver reaction to the federate instance's list
-        // of network reactions
-        connection.dstFederate.networkReceiverReactions.add(networkReceiverReaction);
-        connection.dstFederate.networkReactors.add(receiver);
-        connection.dstFederate.networkConnections.add(receiverFromReaction);
-        connection.dstFederate.networkReceiverInstantiations.add(networkInstance);
-        connection.dstFederate.networkPortToInstantiation.put(connection.getDestinationPortInstance(), networkInstance);
-        connection.dstFederate.networkActionToInstantiation.put(networkAction, networkInstance);
-        //System.out.println(connection.getSourcePortInstance());
-
-        if (
-            !connection.getDefinition().isPhysical() &&
-                // Connections that are physical don't need control reactions
-                connection.getDefinition().getDelay()
-                    == null // Connections that have delays don't need control reactions
-        ) {
-            // Add necessary dependency annotations to federate to ensure the level 
-            // assigner has enough information to correctly assign levels without introducing deadlock
-            addRelativeDependencyAnnotation(connection, networkReceiverReaction, errorReporter);
-        }
-    }
-
-    /**
-     * Add a network control reaction for a given input port 'destination' to
-     * destination's parent reactor. This reaction will block for
-     * any valid logical time until it is known whether the trigger for the
-     * action corresponding to the given port is present or absent.
-     *
-     * @param connection    FIXME
-     * @param coordination  FIXME
-     * @param errorReporter
-     * @note Used in federated execution
-     */
-    private static void addNetworkInputControlReaction(
-        FedConnectionInstance connection,
-        CoordinationType coordination,
-        ErrorReporter errorReporter) {
-
-        LfFactory factory = LfFactory.eINSTANCE;
-        Reaction reaction = factory.createReaction();
-        VarRef destRef = factory.createVarRef();
-        int receivingPortID = connection.dstFederate.networkMessageActions.size();
-
-        // If the sender or receiver is in a bank of reactors, then we want
-        // these reactions to appear only in the federate whose bank ID matches.
-        setReactionBankIndex(reaction, connection.getDstBank());
-
-        // FIXME: do not create a new extension every time it is used
-        FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
-                                 .annotateReaction(reaction);
-
-        // Create a new action that will be used to trigger the
-        // input control reactions.
-        Action newTriggerForControlReactionInput = factory.createAction();
-        newTriggerForControlReactionInput.setOrigin(ActionOrigin.LOGICAL);
-
-        // Set the container and variable according to the network port
-        destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
-        destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
-
-        Reactor top = connection.getDestinationPortInstance()
-                                .getParent()
-                                .getParent().reactorDefinition;
-
-        newTriggerForControlReactionInput.setName(
-            ASTUtils.getUniqueIdentifier(top, "inputControlReactionTrigger"));
-
-        // Add the newly created Action to the action list of the federated reactor.
-        top.getActions().add(newTriggerForControlReactionInput);
-
-        // Create the trigger for the reaction
-        VarRef newTriggerForControlReaction = factory.createVarRef();
-        newTriggerForControlReaction.setVariable(newTriggerForControlReactionInput);
-
-        // Add the appropriate triggers to the list of triggers of the reaction
-        reaction.getTriggers().add(newTriggerForControlReaction);
-
-        // Add the destination port as an effect of the reaction
-        reaction.getEffects().add(destRef);
-
-        // Generate code for the network input control reaction
-        reaction.setCode(factory.createCode());
-
-        TimeValue maxSTP = findMaxSTP(connection, coordination);
-
-        reaction.getCode()
-                .setBody(
-                    FedTargetExtensionFactory
-                        .getExtension(connection.dstFederate.targetConfig.target)
-                        .generateNetworkInputControlReactionBody(
-                            receivingPortID,
-                            maxSTP,
-                            coordination
-                        )
-                );
-
-        // Insert the reaction
-        top.getReactions().add(reaction);
-
-        // Add the trigger for this reaction to the list of triggers, used to actually
-        // trigger the reaction at the beginning of each logical time.
-        connection.dstFederate.networkInputControlReactionsTriggers.add(newTriggerForControlReactionInput);
-
-        // Add the network input control reaction to the federate instance's list
-        // of network reactions
-        //connection.dstFederate.networkReactions.add(reaction);
-
-        // Add necessary dependencies to reaction to ensure that it executes correctly
-        // relative to other network input control reactions in the federate.
-        // addRelativeDependency(connection, reaction, errorReporter);
-    }
-
-    /**
-     * Add necessary dependency information to the signature of {@code networkInputReaction} so that
-     * it can execute in the correct order relative to other network reactions in the federate.
-     *
-     * In particular, we want to avoid a deadlock if multiple network input control reactions in federate
-     * are in a zero-delay cycle through other federates in the federation. To avoid the deadlock, we encode the
-     * zero-delay cycle inside the federate by adding an artificial dependency from the output port of this federate
-     * that is involved in the cycle to the signature of {@code networkInputReaction} as a source.
-     */
-    private static void addRelativeDependencyAnnotation(
-        FedConnectionInstance connection,
-        Reaction networkInputReaction,
-        ErrorReporter errorReporter) {
-        var upstreamOutputPortsInFederate =
-            findUpstreamPortsInFederate(
-                connection.dstFederate,
-                connection.getSourcePortInstance(),
-                new HashSet<>(),
-                new HashSet<>()
-            );
-
-        ModelInfo info = new ModelInfo();
-        for (var port: upstreamOutputPortsInFederate) {
-            //VarRef sourceRef = ASTUtils.factory.createVarRef();
-            connection.dstFederate.networkReactionDependencyPairs.add(
-                new Pair<PortInstance, PortInstance>(connection.getDestinationPortInstance(), port)
-            );
-
-            //sourceRef.setContainer(port.getParent().getDefinition());
-            //sourceRef.setVariable(port.getDefinition());
-            // networkInputReaction.getSources().add(sourceRef);
-
-            // // Remove the port if it introduces cycles
-            // info.update(
-            //        (Model)networkInputReaction.eContainer().eContainer(),
-            //         errorReporter
-            //         );
-            // if (!info.topologyCycles().isEmpty()) {
-            //         networkInputReaction.getSources().remove(sourceRef);
-            //     }
-        }
-        //System.out.println(connection.dstFederate.networkReactionDependencyPairs);
-
-    }
-
-    /**
-     * Go upstream from input port {@code port} until we reach one or more output
-     * ports that belong to the same federate.
-     *
-     * Along the path, we follow direct connections, as well as reactions, as long
-     * as there is no logical delay. When following reactions, we also follow
-     * dependant reactions (because we are traversing a potential cycle backwards).
-     *
-     * @return A set of {@link PortInstance}. If no port exist that match the
-     * criteria, return an empty set.
-     */
-    private static Set<PortInstance> findUpstreamPortsInFederate(
-        FederateInstance federate,
-        PortInstance port,
-        Set<PortInstance> visitedPorts,
-        Set<ReactionInstance>  reactionVisited
+                    errorReporter));
+
+    // Add the receiver reaction to the parent
+    // parent.getReactions().add(networkReceiverReaction);
+
+    // Add the network receiver reaction to the federate instance's list
+    // of network reactions
+    connection.dstFederate.networkReceiverReactions.add(networkReceiverReaction);
+    connection.dstFederate.networkReactors.add(receiver);
+    connection.dstFederate.networkConnections.add(receiverFromReaction);
+    connection.dstFederate.networkReceiverInstantiations.add(networkInstance);
+    connection.dstFederate.networkPortToInstantiation.put(
+        connection.getDestinationPortInstance(), networkInstance);
+    connection.dstFederate.networkActionToInstantiation.put(networkAction, networkInstance);
+    // System.out.println(connection.getSourcePortInstance());
+
+    if (!connection.getDefinition().isPhysical()
+        &&
+        // Connections that are physical don't need control reactions
+        connection.getDefinition().getDelay()
+            == null // Connections that have delays don't need control reactions
     ) {
-        Set<PortInstance> toReturn = new HashSet<>();
-        if (port == null) return toReturn;
-        else if (federate.contains(port.getParent())) {
-            // Reached the requested federate
-            toReturn.add(port);
-            visitedPorts.add(port);
-        } else if (visitedPorts.contains(port)) {
-            return toReturn;
-        } else {
-            visitedPorts.add(port);
-            // Follow depends on reactions
-            port.getDependsOnReactions().forEach(
-                reaction -> {
-                    followReactionUpstream(federate, visitedPorts, toReturn, reaction, reactionVisited);
-                }
-            );
-            // Follow depends on ports
-            port.getDependsOnPorts().forEach(
-                it -> toReturn.addAll(
-                    findUpstreamPortsInFederate(federate, it.instance, visitedPorts, reactionVisited)
-                )
-            );
-        }
-        return toReturn;
+      // Add necessary dependency annotations to federate to ensure the level
+      // assigner has enough information to correctly assign levels without introducing deadlock
+      addRelativeDependencyAnnotation(connection, networkReceiverReaction, errorReporter);
     }
-
-    /**
-     * Follow reactions upstream. This is part of the algorithm of
-     * {@link #findUpstreamPortsInFederate(FederateInstance, PortInstance, Set)}.
-     */
-    private static void followReactionUpstream(
-        FederateInstance federate,
-        Set<PortInstance> visitedPorts,
-        Set<PortInstance> toReturn,
-        ReactionInstance reaction,
-        Set<ReactionInstance>  reactionVisited
-    ) {
-        if (reactionVisited.contains(reaction)) return;
-        reactionVisited.add(reaction);
-        // Add triggers
-        Set<VarRef> varRefsToFollow = new HashSet<>();
-        varRefsToFollow.addAll(
-            reaction.getDefinition()
-                    .getTriggers()
-                    .stream()
-                    .filter(
-                  trigger -> !(trigger instanceof BuiltinTriggerRef)
-              )
-              .map(VarRef.class::cast).toList());
-        // Add sources
-        varRefsToFollow.addAll(reaction.getDefinition().getSources());
-
-        // Follow everything upstream
-        varRefsToFollow.forEach(
-            varRef ->
-                toReturn.addAll(
-                    findUpstreamPortsInFederate(
-                        federate,
-                        reaction.getParent()
-                            .lookupPortInstance(varRef),
-                        visitedPorts,
-                        reactionVisited
-                    )
-                )
-        );
-
-        reaction.dependsOnReactions()
-                .stream()
-                .filter(
-                    // Stay within the reactor
-                    it -> it.getParent().equals(reaction.getParent())
-                )
-                .forEach(
-                    it -> followReactionUpstream(federate, visitedPorts, toReturn, it, reactionVisited)
-                );
-
-        // FIXME: This is most certainly wrong. Please fix it.
-        reaction.dependentReactions()
-                .stream()
-                .filter(
-                    // Stay within the reactor
-                    it -> it.getParent().equals(reaction.getParent())
-                )
-                .forEach(
-                    it -> followReactionUpstream(federate, visitedPorts, toReturn, it, reactionVisited)
-                );
+  }
+
+  /**
+   * Add a network control reaction for a given input port 'destination' to destination's parent
+   * reactor. This reaction will block for any valid logical time until it is known whether the
+   * trigger for the action corresponding to the given port is present or absent.
+   *
+   * @param connection FIXME
+   * @param coordination FIXME
+   * @param errorReporter
+   * @note Used in federated execution
+   */
+  private static void addNetworkInputControlReaction(
+      FedConnectionInstance connection,
+      CoordinationType coordination,
+      ErrorReporter errorReporter) {
+
+    LfFactory factory = LfFactory.eINSTANCE;
+    Reaction reaction = factory.createReaction();
+    VarRef destRef = factory.createVarRef();
+    int receivingPortID = connection.dstFederate.networkMessageActions.size();
+
+    // If the sender or receiver is in a bank of reactors, then we want
+    // these reactions to appear only in the federate whose bank ID matches.
+    setReactionBankIndex(reaction, connection.getDstBank());
+
+    // FIXME: do not create a new extension every time it is used
+    FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
+        .annotateReaction(reaction);
+
+    // Create a new action that will be used to trigger the
+    // input control reactions.
+    Action newTriggerForControlReactionInput = factory.createAction();
+    newTriggerForControlReactionInput.setOrigin(ActionOrigin.LOGICAL);
+
+    // Set the container and variable according to the network port
+    destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
+    destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
+
+    Reactor top = connection.getDestinationPortInstance().getParent().getParent().reactorDefinition;
+
+    newTriggerForControlReactionInput.setName(
+        ASTUtils.getUniqueIdentifier(top, "inputControlReactionTrigger"));
+
+    // Add the newly created Action to the action list of the federated reactor.
+    top.getActions().add(newTriggerForControlReactionInput);
+
+    // Create the trigger for the reaction
+    VarRef newTriggerForControlReaction = factory.createVarRef();
+    newTriggerForControlReaction.setVariable(newTriggerForControlReactionInput);
+
+    // Add the appropriate triggers to the list of triggers of the reaction
+    reaction.getTriggers().add(newTriggerForControlReaction);
+
+    // Add the destination port as an effect of the reaction
+    reaction.getEffects().add(destRef);
+
+    // Generate code for the network input control reaction
+    reaction.setCode(factory.createCode());
+
+    TimeValue maxSTP = findMaxSTP(connection, coordination);
+
+    reaction
+        .getCode()
+        .setBody(
+            FedTargetExtensionFactory.getExtension(connection.dstFederate.targetConfig.target)
+                .generateNetworkInputControlReactionBody(receivingPortID, maxSTP, coordination));
+
+    // Insert the reaction
+    top.getReactions().add(reaction);
+
+    // Add the trigger for this reaction to the list of triggers, used to actually
+    // trigger the reaction at the beginning of each logical time.
+    connection.dstFederate.networkInputControlReactionsTriggers.add(
+        newTriggerForControlReactionInput);
+
+    // Add the network input control reaction to the federate instance's list
+    // of network reactions
+    // connection.dstFederate.networkReactions.add(reaction);
+
+    // Add necessary dependencies to reaction to ensure that it executes correctly
+    // relative to other network input control reactions in the federate.
+    // addRelativeDependency(connection, reaction, errorReporter);
+  }
+
+  /**
+   * Add necessary dependency information to the signature of {@code networkInputReaction} so that
+   * it can execute in the correct order relative to other network reactions in the federate.
+   *
+   * <p>In particular, we want to avoid a deadlock if multiple network input control reactions in
+   * federate are in a zero-delay cycle through other federates in the federation. To avoid the
+   * deadlock, we encode the zero-delay cycle inside the federate by adding an artificial dependency
+   * from the output port of this federate that is involved in the cycle to the signature of {@code
+   * networkInputReaction} as a source.
+   */
+  private static void addRelativeDependencyAnnotation(
+      FedConnectionInstance connection,
+      Reaction networkInputReaction,
+      ErrorReporter errorReporter) {
+    var upstreamOutputPortsInFederate =
+        findUpstreamPortsInFederate(
+            connection.dstFederate,
+            connection.getSourcePortInstance(),
+            new HashSet<>(),
+            new HashSet<>());
+
+    ModelInfo info = new ModelInfo();
+    for (var port : upstreamOutputPortsInFederate) {
+      // VarRef sourceRef = ASTUtils.factory.createVarRef();
+      connection.dstFederate.networkReactionDependencyPairs.add(
+          new Pair<PortInstance, PortInstance>(connection.getDestinationPortInstance(), port));
+
+      // sourceRef.setContainer(port.getParent().getDefinition());
+      // sourceRef.setVariable(port.getDefinition());
+      // networkInputReaction.getSources().add(sourceRef);
+
+      // // Remove the port if it introduces cycles
+      // info.update(
+      //        (Model)networkInputReaction.eContainer().eContainer(),
+      //         errorReporter
+      //         );
+      // if (!info.topologyCycles().isEmpty()) {
+      //         networkInputReaction.getSources().remove(sourceRef);
+      //     }
     }
-
-    /**
-     * Find the maximum STP offset for the given 'port'.
-     *
-     * An STP offset predicate can be nested in contained reactors in
-     * the federate.
-     *
-     * @param connection The connection to find the max STP offset for.
-     * @param coordination The coordination scheme.
-     * @return The maximum STP as a TimeValue
-     */
-    private static TimeValue findMaxSTP(FedConnectionInstance connection,
-                                        CoordinationType coordination) {
-        Variable port = connection.getDestinationPortInstance().getDefinition();
-        FederateInstance instance = connection.dstFederate;
-        Reactor reactor = connection.getDestinationPortInstance().getParent().reactorDefinition;
-
-        // Find a list of STP offsets (if any exists)
-        List<Expression> STPList = new LinkedList<>();
-
-        // First, check if there are any connections to contained reactors that
-        // need to be handled
-        List<Connection> connectionsWithPort = ASTUtils
-            .allConnections(reactor).stream().filter(c -> c.getLeftPorts()
-                                                           .stream()
-                                                           .anyMatch((VarRef v) -> v
-                                                               .getVariable().equals(port)))
+    // System.out.println(connection.dstFederate.networkReactionDependencyPairs);
+
+  }
+
+  /**
+   * Go upstream from input port {@code port} until we reach one or more output ports that belong to
+   * the same federate.
+   *
+   * <p>Along the path, we follow direct connections, as well as reactions, as long as there is no
+   * logical delay. When following reactions, we also follow dependant reactions (because we are
+   * traversing a potential cycle backwards).
+   *
+   * @return A set of {@link PortInstance}. If no port exist that match the criteria, return an
+   *     empty set.
+   */
+  private static Set<PortInstance> findUpstreamPortsInFederate(
+      FederateInstance federate,
+      PortInstance port,
+      Set<PortInstance> visitedPorts,
+      Set<ReactionInstance> reactionVisited) {
+    Set<PortInstance> toReturn = new HashSet<>();
+    if (port == null) return toReturn;
+    else if (federate.contains(port.getParent())) {
+      // Reached the requested federate
+      toReturn.add(port);
+      visitedPorts.add(port);
+    } else if (visitedPorts.contains(port)) {
+      return toReturn;
+    } else {
+      visitedPorts.add(port);
+      // Follow depends on reactions
+      port.getDependsOnReactions()
+          .forEach(
+              reaction -> {
+                followReactionUpstream(federate, visitedPorts, toReturn, reaction, reactionVisited);
+              });
+      // Follow depends on ports
+      port.getDependsOnPorts()
+          .forEach(
+              it ->
+                  toReturn.addAll(
+                      findUpstreamPortsInFederate(
+                          federate, it.instance, visitedPorts, reactionVisited)));
+    }
+    return toReturn;
+  }
+
+  /**
+   * Follow reactions upstream. This is part of the algorithm of {@link
+   * #findUpstreamPortsInFederate(FederateInstance, PortInstance, Set)}.
+   */
+  private static void followReactionUpstream(
+      FederateInstance federate,
+      Set<PortInstance> visitedPorts,
+      Set<PortInstance> toReturn,
+      ReactionInstance reaction,
+      Set<ReactionInstance> reactionVisited) {
+    if (reactionVisited.contains(reaction)) return;
+    reactionVisited.add(reaction);
+    // Add triggers
+    Set<VarRef> varRefsToFollow = new HashSet<>();
+    varRefsToFollow.addAll(
+        reaction.getDefinition().getTriggers().stream()
+            .filter(trigger -> !(trigger instanceof BuiltinTriggerRef))
+            .map(VarRef.class::cast)
+            .toList());
+    // Add sources
+    varRefsToFollow.addAll(reaction.getDefinition().getSources());
+
+    // Follow everything upstream
+    varRefsToFollow.forEach(
+        varRef ->
+            toReturn.addAll(
+                findUpstreamPortsInFederate(
+                    federate,
+                    reaction.getParent().lookupPortInstance(varRef),
+                    visitedPorts,
+                    reactionVisited)));
+
+    reaction.dependsOnReactions().stream()
+        .filter(
+            // Stay within the reactor
+            it -> it.getParent().equals(reaction.getParent()))
+        .forEach(
+            it -> followReactionUpstream(federate, visitedPorts, toReturn, it, reactionVisited));
+
+    // FIXME: This is most certainly wrong. Please fix it.
+    reaction.dependentReactions().stream()
+        .filter(
+            // Stay within the reactor
+            it -> it.getParent().equals(reaction.getParent()))
+        .forEach(
+            it -> followReactionUpstream(federate, visitedPorts, toReturn, it, reactionVisited));
+  }
+
+  /**
+   * Find the maximum STP offset for the given 'port'.
+   *
+   * <p>An STP offset predicate can be nested in contained reactors in the federate.
+   *
+   * @param connection The connection to find the max STP offset for.
+   * @param coordination The coordination scheme.
+   * @return The maximum STP as a TimeValue
+   */
+  private static TimeValue findMaxSTP(
+      FedConnectionInstance connection, CoordinationType coordination) {
+    Variable port = connection.getDestinationPortInstance().getDefinition();
+    FederateInstance instance = connection.dstFederate;
+    Reactor reactor = connection.getDestinationPortInstance().getParent().reactorDefinition;
+
+    // Find a list of STP offsets (if any exists)
+    List<Expression> STPList = new LinkedList<>();
+
+    // First, check if there are any connections to contained reactors that
+    // need to be handled
+    List<Connection> connectionsWithPort =
+        ASTUtils.allConnections(reactor).stream()
+            .filter(
+                c -> c.getLeftPorts().stream().anyMatch((VarRef v) -> v.getVariable().equals(port)))
             .collect(Collectors.toList());
 
+    // Find the list of reactions that have the port as trigger or source
+    // (could be a variable name)
+    List<Reaction> reactionsWithPort =
+        ASTUtils.allReactions(reactor).stream()
+            .filter(
+                r -> {
+                  // Check the triggers of reaction r first
+                  return r.getTriggers().stream()
+                          .anyMatch(
+                              t -> {
+                                if (t instanceof VarRef) {
+                                  // Check if the variables match
+                                  return ((VarRef) t).getVariable() == port;
+                                } else {
+                                  // Not a network port (startup or shutdown)
+                                  return false;
+                                }
+                              })
+                      || // Then check the sources of reaction r
+                      r.getSources().stream().anyMatch(s -> s.getVariable() == port);
+                })
+            .collect(Collectors.toList());
 
-        // Find the list of reactions that have the port as trigger or source
-        // (could be a variable name)
-        List<Reaction> reactionsWithPort = ASTUtils
-            .allReactions(reactor).stream().filter(r -> {
-                // Check the triggers of reaction r first
-                return r.getTriggers().stream().anyMatch(t -> {
-                    if (t instanceof VarRef) {
-                        // Check if the variables match
-                        return ((VarRef) t).getVariable() == port;
-                    } else {
-                        // Not a network port (startup or shutdown)
-                        return false;
-                    }
-                }) || // Then check the sources of reaction r
-                    r.getSources().stream().anyMatch(s -> s.getVariable()
-                        == port);
-            }).collect(Collectors.toList());
-
-        // Find a list of STP offsets (if any exists)
-        if (coordination == CoordinationType.DECENTRALIZED) {
-            for (Reaction r : safe(reactionsWithPort)) {
-                // If STP offset is determined, add it
-                // If not, assume it is zero
-                if (r.getStp() != null) {
-                    if (r.getStp().getValue() instanceof ParameterReference) {
-                        List<Instantiation> instantList = new ArrayList<>();
-                        instantList.add(instance.instantiation);
-                        final var param = ((ParameterReference) r.getStp().getValue()).getParameter();
-                        STPList.addAll(ASTUtils.initialValue(param, instantList));
-                    } else {
-                        STPList.add(r.getStp().getValue());
-                    }
-                }
-            }
-            // Check the children for STPs as well
-            for (Connection c : safe(connectionsWithPort)) {
-                VarRef childPort = c.getRightPorts().get(0);
-                Reactor childReactor = (Reactor) childPort.getVariable()
-                                                          .eContainer();
-                // Find the list of reactions that have the port as trigger or
-                // source (could be a variable name)
-                List<Reaction> childReactionsWithPort =
-                    ASTUtils.allReactions(childReactor)
-                            .stream()
-                            .filter(r ->
-                                        r.getTriggers().stream().anyMatch(t -> {
-                                            if (t instanceof VarRef) {
-                                                // Check if the variables match
-                                                return
-                                                    ((VarRef) t).getVariable()
-                                                        == childPort.getVariable();
-                                            } else {
-                                                // Not a network port (startup or shutdown)
-                                                return false;
-                                            }
-                                        }) ||
-                                            r.getSources()
-                                             .stream()
-                                             .anyMatch(s ->
-                                                           s.getVariable()
-                                                               == childPort.getVariable())
-                            ).collect(Collectors.toList());
-
-                for (Reaction r : safe(childReactionsWithPort)) {
-                    // If STP offset is determined, add it
-                    // If not, assume it is zero
-                    if (r.getStp() != null) {
-                        if (r.getStp().getValue() instanceof ParameterReference) {
-                            List<Instantiation> instantList = new ArrayList<>();
-                            instantList.add(childPort.getContainer());
-                            final var param = ((ParameterReference) r.getStp().getValue()).getParameter();
-                            STPList.addAll(ASTUtils.initialValue(param, instantList));
-                        } else {
-                            STPList.add(r.getStp().getValue());
-                        }
-                    }
-                }
+    // Find a list of STP offsets (if any exists)
+    if (coordination == CoordinationType.DECENTRALIZED) {
+      for (Reaction r : safe(reactionsWithPort)) {
+        // If STP offset is determined, add it
+        // If not, assume it is zero
+        if (r.getStp() != null) {
+          if (r.getStp().getValue() instanceof ParameterReference) {
+            List<Instantiation> instantList = new ArrayList<>();
+            instantList.add(instance.instantiation);
+            final var param = ((ParameterReference) r.getStp().getValue()).getParameter();
+            STPList.addAll(ASTUtils.initialValue(param, instantList));
+          } else {
+            STPList.add(r.getStp().getValue());
+          }
+        }
+      }
+      // Check the children for STPs as well
+      for (Connection c : safe(connectionsWithPort)) {
+        VarRef childPort = c.getRightPorts().get(0);
+        Reactor childReactor = (Reactor) childPort.getVariable().eContainer();
+        // Find the list of reactions that have the port as trigger or
+        // source (could be a variable name)
+        List<Reaction> childReactionsWithPort =
+            ASTUtils.allReactions(childReactor).stream()
+                .filter(
+                    r ->
+                        r.getTriggers().stream()
+                                .anyMatch(
+                                    t -> {
+                                      if (t instanceof VarRef) {
+                                        // Check if the variables match
+                                        return ((VarRef) t).getVariable()
+                                            == childPort.getVariable();
+                                      } else {
+                                        // Not a network port (startup or shutdown)
+                                        return false;
+                                      }
+                                    })
+                            || r.getSources().stream()
+                                .anyMatch(s -> s.getVariable() == childPort.getVariable()))
+                .collect(Collectors.toList());
+
+        for (Reaction r : safe(childReactionsWithPort)) {
+          // If STP offset is determined, add it
+          // If not, assume it is zero
+          if (r.getStp() != null) {
+            if (r.getStp().getValue() instanceof ParameterReference) {
+              List<Instantiation> instantList = new ArrayList<>();
+              instantList.add(childPort.getContainer());
+              final var param = ((ParameterReference) r.getStp().getValue()).getParameter();
+              STPList.addAll(ASTUtils.initialValue(param, instantList));
+            } else {
+              STPList.add(r.getStp().getValue());
             }
+          }
         }
-
-        return STPList.stream()
-                      .map(ASTUtils::getLiteralTimeValue)
-                      .filter(Objects::nonNull)
-                      .reduce(TimeValue.ZERO, TimeValue::max);
-    }
-
-    /**
-     * Return a null-safe List
-     *
-     * @param <E>  The type of the list
-     * @param list The potentially null List
-     * @return Empty list or the original list
-     */
-    public static <E> List<E> safe(List<E> list) {
-        return list == null ? Collections.emptyList() : list;
+      }
     }
 
-    public static int networkIDSender = 0;
-    public static int networkIDReceiver = 0;
-
-    private static Map<FedConnectionInstance, Reactor> networkSenderReactors = new HashMap<>();
-    private static Map<FederateInstance, Instantiation> networkSenderInstantiations  = new HashMap<>();
-
-
-    private static Reactor getNetworkSenderReactor(FedConnectionInstance connection, 
-    CoordinationType coordination, Resource resource, ErrorReporter errorReporter) {
-        LfFactory factory = LfFactory.eINSTANCE;
-        Type type = EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getType());
-
-        //Initialize Reactor and Reaction AST Nodes
-        Reactor sender = factory.createReactor();
-        Reaction networkSenderReaction = factory.createReaction();
-
-        VarRef inRef = factory.createVarRef(); //in port to network reaction
-        VarRef destRef = factory.createVarRef(); //destination fed
-
-        Input in = factory.createInput();
-
-        sender.getReactions().add(networkSenderReaction);
-        sender.getInputs().add(in);
-
-        EObject node = IteratorExtensions.findFirst(resource.getAllContents(), Model.class::isInstance);
-        ((Model) node).getReactors().add(sender);
-        sender.setName("NetworkSender_" + networkIDSender++);
-        //networkSenderReaction.setName("NetworkSenderReaction_" + networkIDSender++);
-
-        // FIXME: do not create a new extension every time it is used
-        FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
-                                 .annotateReaction(networkSenderReaction);
-
-        // If the sender or receiver is in a bank of reactors, then we want
-        // these reactions to appear only in the federate whose bank ID matches.
-        setReactionBankIndex(networkSenderReaction, connection.getSrcBank());
-
-
-        in.setName("msg");
-        in.setType(type);
-        in.setWidthSpec(EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getWidthSpec()));
-        inRef.setVariable(in);
-
-        destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
-        destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
-        
-        // Configure the sending reaction.
-        networkSenderReaction.getTriggers().add(inRef);
-        networkSenderReaction.setCode(factory.createCode());
-        networkSenderReaction.getCode().setBody(
+    return STPList.stream()
+        .map(ASTUtils::getLiteralTimeValue)
+        .filter(Objects::nonNull)
+        .reduce(TimeValue.ZERO, TimeValue::max);
+  }
+
+  /**
+   * Return a null-safe List
+   *
+   * @param <E> The type of the list
+   * @param list The potentially null List
+   * @return Empty list or the original list
+   */
+  public static <E> List<E> safe(List<E> list) {
+    return list == null ? Collections.emptyList() : list;
+  }
+
+  public static int networkIDSender = 0;
+  public static int networkIDReceiver = 0;
+
+  private static Map<FedConnectionInstance, Reactor> networkSenderReactors = new HashMap<>();
+  private static Map<FederateInstance, Instantiation> networkSenderInstantiations = new HashMap<>();
+
+  private static Reactor getNetworkSenderReactor(
+      FedConnectionInstance connection,
+      CoordinationType coordination,
+      Resource resource,
+      ErrorReporter errorReporter) {
+    LfFactory factory = LfFactory.eINSTANCE;
+    Type type = EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getType());
+
+    // Initialize Reactor and Reaction AST Nodes
+    Reactor sender = factory.createReactor();
+    Reaction networkSenderReaction = factory.createReaction();
+
+    VarRef inRef = factory.createVarRef(); // in port to network reaction
+    VarRef destRef = factory.createVarRef(); // destination fed
+
+    Input in = factory.createInput();
+
+    sender.getReactions().add(networkSenderReaction);
+    sender.getInputs().add(in);
+
+    EObject node = IteratorExtensions.findFirst(resource.getAllContents(), Model.class::isInstance);
+    ((Model) node).getReactors().add(sender);
+    sender.setName("NetworkSender_" + networkIDSender++);
+    // networkSenderReaction.setName("NetworkSenderReaction_" + networkIDSender++);
+
+    // FIXME: do not create a new extension every time it is used
+    FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
+        .annotateReaction(networkSenderReaction);
+
+    // If the sender or receiver is in a bank of reactors, then we want
+    // these reactions to appear only in the federate whose bank ID matches.
+    setReactionBankIndex(networkSenderReaction, connection.getSrcBank());
+
+    in.setName("msg");
+    in.setType(type);
+    in.setWidthSpec(
+        EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getWidthSpec()));
+    inRef.setVariable(in);
+
+    destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
+    destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
+
+    // Configure the sending reaction.
+    networkSenderReaction.getTriggers().add(inRef);
+    networkSenderReaction.setCode(factory.createCode());
+    networkSenderReaction
+        .getCode()
+        .setBody(
             FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
-                                     .generateNetworkSenderBody(
-                                   inRef,
-                                   destRef,
-                                   connection,
-                                   InferredType.fromAST(type),
-                                   coordination,
-                                   errorReporter
-                               ));
-        
-        // Add the network sender reaction to the federate instance's list
-        // of network reactions
-        connection.srcFederate.networkSenderReactions.add(networkSenderReaction);
-        connection.srcFederate.networkReactors.add(sender);
-
-        networkSenderReactors.put(connection, sender);
-        return sender;
-                               
-    }
-
-    /**
-     * Add a network sender reactor for a given input port 'source' to
-     * source's parent reactor. This reaction will react to the 'source'
-     * and then send a message on the network destined for the
-     * destinationFederate.
-     *
-     * @param connection   Network connection between two federates.
-     * @param coordination One of CoordinationType.DECENTRALIZED or
-     *                     CoordinationType.CENTRALIZED.
-     * @param resource
-     * @param mainDef
-     * @param errorReporter FIXME
-     * @note Used in federated execution
-     */
-    private static void addNetworkSenderReactor(
-        FedConnectionInstance connection,
-        CoordinationType coordination,
-        Resource resource, ErrorReporter errorReporter
-    ) {
-        LfFactory factory = LfFactory.eINSTANCE;
-        // Assume all the types are the same, so just use the first on the right.
-        
-        Reactor sender = getNetworkSenderReactor(connection, coordination, resource, errorReporter);
-        
-        Instantiation networkInstance = factory.createInstantiation();
-
-        VarRef sourceRef = factory.createVarRef(); //out port from federate
-        VarRef instRef = factory.createVarRef(); //out port from federate
-
-        Reactor top = connection.getSourcePortInstance()
-                                .getParent()
-                                .getParent().reactorDefinition; // Top-level reactor.
-
-
-        networkInstance.setReactorClass(sender);
-        networkInstance.setName(ASTUtils.getUniqueIdentifier(top, "ns_" + connection.getDstFederate().name));
-        top.getInstantiations().add(networkInstance);
-
-        Connection senderToReaction = factory.createConnection();
-
-        // Establish references to the involved ports.
-        sourceRef.setContainer(connection.getSourcePortInstance().getParent().getDefinition());
-        sourceRef.setVariable(connection.getSourcePortInstance().getDefinition());
-        instRef.setContainer(networkInstance);
-        instRef.setVariable(sender.getInputs().get(0));
-
-        senderToReaction.getLeftPorts().add(sourceRef);
-        senderToReaction.getRightPorts().add(instRef);
-
-        // The connection is 'physical' if it uses the ~> notation.
-        if (connection.getDefinition().isPhysical()) {
-            connection.srcFederate.outboundP2PConnections.add(connection.dstFederate);
-        } else {
-            // If the connection is logical but coordination
-            // is decentralized, we would need
-            // to make P2P connections
-            if (coordination == CoordinationType.DECENTRALIZED) {
-                connection.srcFederate.outboundP2PConnections.add(connection.dstFederate);
-            }
-        }
-
-        connection.srcFederate.networkConnections.add(senderToReaction);
-        connection.srcFederate.networkSenderInstantiations.add(networkInstance);
-        connection.srcFederate.networkPortToInstantiation.put(connection.getSourcePortInstance(), networkInstance);
+                .generateNetworkSenderBody(
+                    inRef,
+                    destRef,
+                    connection,
+                    InferredType.fromAST(type),
+                    coordination,
+                    errorReporter));
+
+    // Add the network sender reaction to the federate instance's list
+    // of network reactions
+    connection.srcFederate.networkSenderReactions.add(networkSenderReaction);
+    connection.srcFederate.networkReactors.add(sender);
+
+    networkSenderReactors.put(connection, sender);
+    return sender;
+  }
+
+  /**
+   * Add a network sender reactor for a given input port 'source' to source's parent reactor. This
+   * reaction will react to the 'source' and then send a message on the network destined for the
+   * destinationFederate.
+   *
+   * @param connection Network connection between two federates.
+   * @param coordination One of CoordinationType.DECENTRALIZED or CoordinationType.CENTRALIZED.
+   * @param resource
+   * @param mainDef
+   * @param errorReporter FIXME
+   * @note Used in federated execution
+   */
+  private static void addNetworkSenderReactor(
+      FedConnectionInstance connection,
+      CoordinationType coordination,
+      Resource resource,
+      ErrorReporter errorReporter) {
+    LfFactory factory = LfFactory.eINSTANCE;
+    // Assume all the types are the same, so just use the first on the right.
+
+    Reactor sender = getNetworkSenderReactor(connection, coordination, resource, errorReporter);
+
+    Instantiation networkInstance = factory.createInstantiation();
+
+    VarRef sourceRef = factory.createVarRef(); // out port from federate
+    VarRef instRef = factory.createVarRef(); // out port from federate
+
+    Reactor top =
+        connection
+            .getSourcePortInstance()
+            .getParent()
+            .getParent()
+            .reactorDefinition; // Top-level reactor.
+
+    networkInstance.setReactorClass(sender);
+    networkInstance.setName(
+        ASTUtils.getUniqueIdentifier(top, "ns_" + connection.getDstFederate().name));
+    top.getInstantiations().add(networkInstance);
+
+    Connection senderToReaction = factory.createConnection();
+
+    // Establish references to the involved ports.
+    sourceRef.setContainer(connection.getSourcePortInstance().getParent().getDefinition());
+    sourceRef.setVariable(connection.getSourcePortInstance().getDefinition());
+    instRef.setContainer(networkInstance);
+    instRef.setVariable(sender.getInputs().get(0));
+
+    senderToReaction.getLeftPorts().add(sourceRef);
+    senderToReaction.getRightPorts().add(instRef);
+
+    // The connection is 'physical' if it uses the ~> notation.
+    if (connection.getDefinition().isPhysical()) {
+      connection.srcFederate.outboundP2PConnections.add(connection.dstFederate);
+    } else {
+      // If the connection is logical but coordination
+      // is decentralized, we would need
+      // to make P2P connections
+      if (coordination == CoordinationType.DECENTRALIZED) {
+        connection.srcFederate.outboundP2PConnections.add(connection.dstFederate);
+      }
     }
 
-    /**
-     * Add a network control reaction for a given output port 'source' to
-     * source's parent reactor. This reaction will send a port absent
-     * message if the status of the output port is absent.
-     *
-     * @param connection FIXME
-     * @note Used in federated execution
-     */
-    private static void addNetworkOutputControlReaction(FedConnectionInstance connection) {
-        LfFactory factory = LfFactory.eINSTANCE;
-        Reaction reaction = factory.createReaction();
-        Reactor top = networkSenderReactors.getOrDefault(connection, null);
-        
-        // Add the output from the contained reactor as a source to
-        // the reaction to preserve precedence order.
-        VarRef newPortRef = factory.createVarRef();
-        newPortRef.setVariable(top.getInputs().get(0));
-        reaction.getSources().add(newPortRef);
-
-        // If the sender or receiver is in a bank of reactors, then we want
-        // these reactions to appear only in the federate whose bank ID matches.
-        setReactionBankIndex(reaction, connection.getSrcBank());
-
-        // FIXME: do not create a new extension every time it is used
-        FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
-                                 .annotateReaction(reaction);
-
-        // We use an action at the top-level to manually
-        // trigger output control reactions. That action is created once
-        // and recorded in the federate instance.
-        // Check whether the action already has been created.
-        // if (connection.srcFederate.networkOutputControlReactionsTrigger == null) {
-        //     // The port has not been created.
-        //     String triggerName = "outputControlReactionTrigger";
-
-        //     // Find the trigger definition in the reactor definition, which could have been
-        //     // generated for another federate instance if there are multiple instances
-        //     // of the same reactor that are each distinct federates.
-        //     Optional<Action> optTriggerInput
-        //         = top.getActions().stream().filter(
-        //         I -> I.getName().equals(triggerName)).findFirst();
-
-            // if (optTriggerInput.isEmpty()) {
-                // If no trigger with the name "outputControlReactionTrigger" is
-                // already added to the reactor definition, we need to create it
-                // for the first time. The trigger is a logical action.
-        Action newTriggerForControlReactionVariable = factory.createAction();
-        newTriggerForControlReactionVariable.setName("outputControlReactionTrigger");
-        newTriggerForControlReactionVariable.setOrigin(ActionOrigin.LOGICAL);
-        top.getActions().add(newTriggerForControlReactionVariable);
-
-                // // Now that the variable is created, store it in the federate instance
-                // connection.srcFederate.networkOutputControlReactionsTrigger
-            //         = newTriggerForControlReactionVariable;
-            // } else {
-                // If the "outputControlReactionTrigger" trigger is already
-                // there, we can re-use it for this new reaction since a single trigger
-                // will trigger
-            //     // all network output control reactions.
-            //     connection.srcFederate.networkOutputControlReactionsTrigger = optTriggerInput.get();
-            // }
-        //}
-
-        // Add the trigger for all output control reactions to the list of triggers
-        VarRef triggerRef = factory.createVarRef();
-        triggerRef.setVariable(newTriggerForControlReactionVariable);
-        reaction.getTriggers().add(triggerRef);
-        //int val = networkIDSender-1;
-        //reaction.setName("NetworkSenderControlReaction_" + val);
-
-        // Generate the code
-        reaction.setCode(factory.createCode());
-
-        reaction.getCode().setBody(
+    connection.srcFederate.networkConnections.add(senderToReaction);
+    connection.srcFederate.networkSenderInstantiations.add(networkInstance);
+    connection.srcFederate.networkPortToInstantiation.put(
+        connection.getSourcePortInstance(), networkInstance);
+  }
+
+  /**
+   * Add a network control reaction for a given output port 'source' to source's parent reactor.
+   * This reaction will send a port absent message if the status of the output port is absent.
+   *
+   * @param connection FIXME
+   * @note Used in federated execution
+   */
+  private static void addNetworkOutputControlReaction(FedConnectionInstance connection) {
+    LfFactory factory = LfFactory.eINSTANCE;
+    Reaction reaction = factory.createReaction();
+    Reactor top = networkSenderReactors.getOrDefault(connection, null);
+
+    // Add the output from the contained reactor as a source to
+    // the reaction to preserve precedence order.
+    VarRef newPortRef = factory.createVarRef();
+    newPortRef.setVariable(top.getInputs().get(0));
+    reaction.getSources().add(newPortRef);
+
+    // If the sender or receiver is in a bank of reactors, then we want
+    // these reactions to appear only in the federate whose bank ID matches.
+    setReactionBankIndex(reaction, connection.getSrcBank());
+
+    // FIXME: do not create a new extension every time it is used
+    FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
+        .annotateReaction(reaction);
+
+    // We use an action at the top-level to manually
+    // trigger output control reactions. That action is created once
+    // and recorded in the federate instance.
+    // Check whether the action already has been created.
+    // if (connection.srcFederate.networkOutputControlReactionsTrigger == null) {
+    //     // The port has not been created.
+    //     String triggerName = "outputControlReactionTrigger";
+
+    //     // Find the trigger definition in the reactor definition, which could have been
+    //     // generated for another federate instance if there are multiple instances
+    //     // of the same reactor that are each distinct federates.
+    //     Optional<Action> optTriggerInput
+    //         = top.getActions().stream().filter(
+    //         I -> I.getName().equals(triggerName)).findFirst();
+
+    // if (optTriggerInput.isEmpty()) {
+    // If no trigger with the name "outputControlReactionTrigger" is
+    // already added to the reactor definition, we need to create it
+    // for the first time. The trigger is a logical action.
+    Action newTriggerForControlReactionVariable = factory.createAction();
+    newTriggerForControlReactionVariable.setName("outputControlReactionTrigger");
+    newTriggerForControlReactionVariable.setOrigin(ActionOrigin.LOGICAL);
+    top.getActions().add(newTriggerForControlReactionVariable);
+
+    // // Now that the variable is created, store it in the federate instance
+    // connection.srcFederate.networkOutputControlReactionsTrigger
+    //         = newTriggerForControlReactionVariable;
+    // } else {
+    // If the "outputControlReactionTrigger" trigger is already
+    // there, we can re-use it for this new reaction since a single trigger
+    // will trigger
+    //     // all network output control reactions.
+    //     connection.srcFederate.networkOutputControlReactionsTrigger = optTriggerInput.get();
+    // }
+    // }
+
+    // Add the trigger for all output control reactions to the list of triggers
+    VarRef triggerRef = factory.createVarRef();
+    triggerRef.setVariable(newTriggerForControlReactionVariable);
+    reaction.getTriggers().add(triggerRef);
+    // int val = networkIDSender-1;
+    // reaction.setName("NetworkSenderControlReaction_" + val);
+
+    // Generate the code
+    reaction.setCode(factory.createCode());
+
+    reaction
+        .getCode()
+        .setBody(
             FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
-                                     .generateNetworkOutputControlReactionBody(newPortRef, connection));
-
+                .generateNetworkOutputControlReactionBody(newPortRef, connection));
 
-        // Insert the newly generated reaction after the generated sender and
-        // receiver top-level reactions.
-        top.getReactions().add(reaction);
+    // Insert the newly generated reaction after the generated sender and
+    // receiver top-level reactions.
+    top.getReactions().add(reaction);
 
-        // Add the network output control reaction to the federate instance's list
-        // of network reactions
-        connection.srcFederate.networkSenderReactions.add(reaction);
-        connection.srcFederate.networkSenderControlReactions.add(reaction);
+    // Add the network output control reaction to the federate instance's list
+    // of network reactions
+    connection.srcFederate.networkSenderReactions.add(reaction);
+    connection.srcFederate.networkSenderControlReactions.add(reaction);
 
-        //connection.srcFederate.networkPortToControlReaction.put(connection.getSourcePortInstance(), reaction);
-        //connection.srcFederate.networkOutputControlReactionsTriggers.add(newTriggerForControlReactionVariable);
+    // connection.srcFederate.networkPortToControlReaction.put(connection.getSourcePortInstance(),
+    // reaction);
+    // connection.srcFederate.networkOutputControlReactionsTriggers.add(newTriggerForControlReactionVariable);
 
-
-    }
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedConnectionInstance.java b/org.lflang/src/org/lflang/federated/generator/FedConnectionInstance.java
index a82e1d2dfa..d08aa5f850 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedConnectionInstance.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedConnectionInstance.java
@@ -9,102 +9,100 @@
 /**
  * Class representing a federated connection.
  *
- * This is an undocumented class written by a previous contributor who is no longer active.
- * It merely serves as a record, presumably to make it easier to pass around information
- * around.
+ * <p>This is an undocumented class written by a previous contributor who is no longer active. It
+ * merely serves as a record, presumably to make it easier to pass around information around.
  *
  * @author Soroush Bateni
  */
 public class FedConnectionInstance {
 
-    SendRange srcRange;
+  SendRange srcRange;
 
-    RuntimeRange<PortInstance> dstRange;
+  RuntimeRange<PortInstance> dstRange;
 
-    int srcChannel;
+  int srcChannel;
 
-    int srcBank;
+  int srcBank;
 
-    int dstChannel;
+  int dstChannel;
 
-    int dstBank;
+  int dstBank;
 
-    FederateInstance srcFederate;
+  FederateInstance srcFederate;
 
-    FederateInstance dstFederate;
+  FederateInstance dstFederate;
 
-    SupportedSerializers serializer;
+  SupportedSerializers serializer;
 
-    public FedConnectionInstance(
-        SendRange srcRange,
-        RuntimeRange<PortInstance> dstRange,
-        int srcChannel,
-        int srcBank,
-        int dstChannel,
-        int dstBank,
-        FederateInstance srcFederate,
-        FederateInstance dstFederate,
-        SupportedSerializers serializer
-    ) {
-        this.srcRange = srcRange;
-        this.srcChannel = srcChannel;
-        this.srcBank = srcBank;
-        this.dstChannel = dstChannel;
-        this.dstBank = dstBank;
-        this.srcFederate = srcFederate;
-        this.dstFederate = dstFederate;
-        this.dstRange = dstRange;
-        this.serializer = serializer;
+  public FedConnectionInstance(
+      SendRange srcRange,
+      RuntimeRange<PortInstance> dstRange,
+      int srcChannel,
+      int srcBank,
+      int dstChannel,
+      int dstBank,
+      FederateInstance srcFederate,
+      FederateInstance dstFederate,
+      SupportedSerializers serializer) {
+    this.srcRange = srcRange;
+    this.srcChannel = srcChannel;
+    this.srcBank = srcBank;
+    this.dstChannel = dstChannel;
+    this.dstBank = dstBank;
+    this.srcFederate = srcFederate;
+    this.dstFederate = dstFederate;
+    this.dstRange = dstRange;
+    this.serializer = serializer;
 
-        this.srcFederate.connections.add(this);
-        this.dstFederate.connections.add(this);
-    }
+    this.srcFederate.connections.add(this);
+    this.dstFederate.connections.add(this);
+  }
 
-    public SendRange getSrcRange() {
-        return srcRange;
-    }
+  public SendRange getSrcRange() {
+    return srcRange;
+  }
 
-    public RuntimeRange<PortInstance> getDstRange() {
-        return dstRange;
-    }
+  public RuntimeRange<PortInstance> getDstRange() {
+    return dstRange;
+  }
 
-    public int getSrcChannel() {
-        return srcChannel;
-    }
+  public int getSrcChannel() {
+    return srcChannel;
+  }
 
-    public int getSrcBank() {
-        return srcBank;
-    }
+  public int getSrcBank() {
+    return srcBank;
+  }
 
-    public int getDstChannel() {
-        return dstChannel;
-    }
+  public int getDstChannel() {
+    return dstChannel;
+  }
 
-    public int getDstBank() {
-        return dstBank;
-    }
+  public int getDstBank() {
+    return dstBank;
+  }
 
-    public FederateInstance getSrcFederate() {
-        return srcFederate;
-    }
+  public FederateInstance getSrcFederate() {
+    return srcFederate;
+  }
 
-    public FederateInstance getDstFederate() {
-        return dstFederate;
-    }
+  public FederateInstance getDstFederate() {
+    return dstFederate;
+  }
 
-    public SupportedSerializers getSerializer() {
-        return serializer;
-    }
+  public SupportedSerializers getSerializer() {
+    return serializer;
+  }
 
-    public Connection getDefinition() {
-        return srcRange.connection;
-    }
+  public Connection getDefinition() {
+    return srcRange.connection;
+  }
 
-    public PortInstance getSourcePortInstance() {
-        return srcRange.instance;
-    }
+  public PortInstance getSourcePortInstance() {
+    return srcRange.instance;
+  }
 
-    public PortInstance getDestinationPortInstance() {
-        return dstRange.instance;
-    }
+  public PortInstance getDestinationPortInstance() {
+    return dstRange.instance;
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedEmitter.java b/org.lflang/src/org/lflang/federated/generator/FedEmitter.java
index 212ec6a86a..bdf912d0c8 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedEmitter.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedEmitter.java
@@ -4,77 +4,70 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.Map;
-
 import org.lflang.ErrorReporter;
 import org.lflang.federated.launcher.RtiConfig;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.LFGeneratorContext;
-import org.lflang.lf.Model;
 import org.lflang.lf.Reactor;
 
-/**
- * Helper class to generate code for federates.
- */
+/** Helper class to generate code for federates. */
 public class FedEmitter {
 
-    private final FedFileConfig fileConfig;
-    private final Reactor originalMainReactor;
-    private final ErrorReporter errorReporter;
-    private final RtiConfig rtiConfig;
+  private final FedFileConfig fileConfig;
+  private final Reactor originalMainReactor;
+  private final ErrorReporter errorReporter;
+  private final RtiConfig rtiConfig;
 
-    public FedEmitter(
-        FedFileConfig fileConfig,
-        Reactor originalMainReactor,
-        ErrorReporter errorReporter,
-        RtiConfig rtiConfig
-    ) {
-        this.fileConfig = fileConfig;
-        this.originalMainReactor = originalMainReactor;
-        this.errorReporter = errorReporter;
-        this.rtiConfig = rtiConfig;
-    }
+  public FedEmitter(
+      FedFileConfig fileConfig,
+      Reactor originalMainReactor,
+      ErrorReporter errorReporter,
+      RtiConfig rtiConfig) {
+    this.fileConfig = fileConfig;
+    this.originalMainReactor = originalMainReactor;
+    this.errorReporter = errorReporter;
+    this.rtiConfig = rtiConfig;
+  }
 
-    /**
-     * Generate a .lf file for federate {@code federate}.
-     *
-     * @throws IOException
-     */
-    Map<Path, CodeMap> generateFederate(
-        LFGeneratorContext context,
-        FederateInstance federate,
-        int numOfFederates
-    ) throws IOException {
-        String fedName = federate.name;
-        Files.createDirectories(fileConfig.getSrcPath());
-        System.out.println("##### Generating code for federate " + fedName
-                               + " in directory "
-                               + fileConfig.getSrcPath());
+  /**
+   * Generate a .lf file for federate {@code federate}.
+   *
+   * @throws IOException
+   */
+  Map<Path, CodeMap> generateFederate(
+      LFGeneratorContext context, FederateInstance federate, int numOfFederates)
+      throws IOException {
+    String fedName = federate.name;
+    Files.createDirectories(fileConfig.getSrcPath());
+    System.out.println(
+        "##### Generating code for federate "
+            + fedName
+            + " in directory "
+            + fileConfig.getSrcPath());
 
-        String federateCode = String.join(
+    String federateCode =
+        String.join(
             "\n",
-            new FedTargetEmitter().generateTarget(context, numOfFederates, federate, fileConfig, errorReporter, rtiConfig),
+            new FedTargetEmitter()
+                .generateTarget(
+                    context, numOfFederates, federate, fileConfig, errorReporter, rtiConfig),
             new FedImportEmitter().generateImports(federate, fileConfig),
-            new FedPreambleEmitter().generatePreamble(federate, fileConfig, rtiConfig, errorReporter),
+            new FedPreambleEmitter()
+                .generatePreamble(federate, fileConfig, rtiConfig, errorReporter),
             new FedReactorEmitter().generateReactorDefinitions(federate),
-            new FedMainEmitter().generateMainReactor(
-                federate,
-                originalMainReactor,
-                errorReporter
-            )
-        );
-        Map<Path, CodeMap> codeMapMap = new HashMap<>();
-        var lfFilePath = lfFilePath(fileConfig, federate);
-        try (var srcWriter = Files.newBufferedWriter(lfFilePath)) {
-            var codeMap = CodeMap.fromGeneratedCode(federateCode);
-            codeMapMap.put(lfFilePath, codeMap);
-            srcWriter.write(codeMap.getGeneratedCode());
-        }
-        return codeMapMap;
+            new FedMainEmitter().generateMainReactor(federate, originalMainReactor, errorReporter));
+    Map<Path, CodeMap> codeMapMap = new HashMap<>();
+    var lfFilePath = lfFilePath(fileConfig, federate);
+    try (var srcWriter = Files.newBufferedWriter(lfFilePath)) {
+      var codeMap = CodeMap.fromGeneratedCode(federateCode);
+      codeMapMap.put(lfFilePath, codeMap);
+      srcWriter.write(codeMap.getGeneratedCode());
     }
+    return codeMapMap;
+  }
 
-    public static Path lfFilePath(FedFileConfig fileConfig, FederateInstance federate) {
-        return fileConfig.getSrcPath().resolve(federate.name + ".lf");
-    }
+  public static Path lfFilePath(FedFileConfig fileConfig, FederateInstance federate) {
+    return fileConfig.getSrcPath().resolve(federate.name + ".lf");
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedFileConfig.java b/org.lflang/src/org/lflang/federated/generator/FedFileConfig.java
index e434501825..cb12c90a7d 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedFileConfig.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedFileConfig.java
@@ -1,16 +1,16 @@
 /*************
  * Copyright (c) 2019-2021, The University of California at Berkeley.
-
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
-
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
-
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
-
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -30,113 +30,105 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.lflang.FileConfig;
 import org.lflang.util.FileUtil;
 
 /**
- * A subclass of @see FileConfig that extends the base functionality to add support
- * for compiling federated LF programs. The code generator should create one instance
- * of this class for each federate.
+ * A subclass of @see FileConfig that extends the base functionality to add support for compiling
+ * federated LF programs. The code generator should create one instance of this class for each
+ * federate.
  *
  * @author Soroush Bateni
- *
  */
 public class FedFileConfig extends FileConfig {
 
-    public FedFileConfig(
-        Resource resource,
-        Path srcGenBasePath,
-        boolean useHierarchicalBin
-    ) throws IOException {
-        super(resource, srcGenBasePath, useHierarchicalBin);
-    }
-
-    public FedFileConfig(FileConfig fileConfig) throws IOException {
-        super(fileConfig.resource, fileConfig.getSrcGenBasePath(), fileConfig.useHierarchicalBin);
-    }
-
-    /**
-     * Return the path to the root of a LF project generated on the basis of a
-     * federated LF program currently under compilation.
-     */
-    public Path getGenPath() {
-        return srcPkgPath.resolve("fed-gen").resolve(name);
-    }
-
-    /**
-     * Return the path for storing generated LF sources that jointly constitute a
-     * federation.
-     */
-    public Path getSrcPath() {
-        return getGenPath().resolve("src");
-    }
-
-    /**
-     * The directory in which to put the generated sources.
-     * This takes into account the location of the source file relative to the
-     * package root. Specifically, if the source file is x/y/Z.lf relative
-     * to the package root, then the generated sources will be put in x/y/Z
-     * relative to srcGenBasePath.
-     */
-    @Override
-    public Path getSrcGenPath() {
-        return getGenPath().resolve("src-gen");
-    }
-
-    /**
-     * Return the path to the root of a LF project generated on the basis of a
-     * federated LF program currently under compilation.
-     */
-    public Path getFedGenPath() {
-        return srcPkgPath.resolve("fed-gen").resolve(this.name);
-    }
-
-    /**
-     * Return the path to the directory in which the executables of compiled federates are stored.
-     */
-    public Path getFedBinPath() { return getFedGenPath().resolve("bin"); }
-
-    @Override
-    public void doClean() throws IOException {
-        super.doClean();
-        FileUtil.deleteDirectory(this.getFedGenPath());
-    }
-
-    /**
-     * Relativize target properties that involve paths like files and cmake-include to be
-     * relative to the generated .lf file for the federate.
-     */
-    public void relativizePaths(FedTargetConfig targetConfig) {
-        relativizePathList(targetConfig.protoFiles);
-        relativizePathList(targetConfig.files);
-        relativizePathList(targetConfig.cmakeIncludes);
-    }
-
-    /**
-     * Relativize each path in the given list.
-     * @param paths The paths to relativize.
-     */
-    private void relativizePathList(List<String> paths) {
-        List<String> tempList = new ArrayList<>();
-        paths.forEach(f -> tempList.add(relativizePath(Paths.get(f))));
-        paths.clear();
-        paths.addAll(tempList);
-    }
-
-    /**
-     * Relativize a single path, but only if it points to a local resource in the project (i.e., not
-     * on the class path).
-     * @param path The path to relativize.
-     */
-    private String relativizePath(Path path) {
-        if (FileUtil.findInPackage(path, this) == null) {
-            return String.valueOf(path);
-        } else {
-            Path resolvedPath = this.srcPath.resolve(path).toAbsolutePath();
-            return this.getSrcPath().relativize(resolvedPath).toString();
-        }
+  public FedFileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchicalBin)
+      throws IOException {
+    super(resource, srcGenBasePath, useHierarchicalBin);
+  }
+
+  public FedFileConfig(FileConfig fileConfig) throws IOException {
+    super(fileConfig.resource, fileConfig.getSrcGenBasePath(), fileConfig.useHierarchicalBin);
+  }
+
+  /**
+   * Return the path to the root of a LF project generated on the basis of a federated LF program
+   * currently under compilation.
+   */
+  public Path getGenPath() {
+    return srcPkgPath.resolve("fed-gen").resolve(name);
+  }
+
+  /** Return the path for storing generated LF sources that jointly constitute a federation. */
+  public Path getSrcPath() {
+    return getGenPath().resolve("src");
+  }
+
+  /**
+   * The directory in which to put the generated sources. This takes into account the location of
+   * the source file relative to the package root. Specifically, if the source file is x/y/Z.lf
+   * relative to the package root, then the generated sources will be put in x/y/Z relative to
+   * srcGenBasePath.
+   */
+  @Override
+  public Path getSrcGenPath() {
+    return getGenPath().resolve("src-gen");
+  }
+
+  /**
+   * Return the path to the root of a LF project generated on the basis of a federated LF program
+   * currently under compilation.
+   */
+  public Path getFedGenPath() {
+    return srcPkgPath.resolve("fed-gen").resolve(this.name);
+  }
+
+  /** Return the path to the directory in which the executables of compiled federates are stored. */
+  public Path getFedBinPath() {
+    return getFedGenPath().resolve("bin");
+  }
+
+  @Override
+  public void doClean() throws IOException {
+    super.doClean();
+    FileUtil.deleteDirectory(this.getFedGenPath());
+  }
+
+  /**
+   * Relativize target properties that involve paths like files and cmake-include to be relative to
+   * the generated .lf file for the federate.
+   */
+  public void relativizePaths(FedTargetConfig targetConfig) {
+    relativizePathList(targetConfig.protoFiles);
+    relativizePathList(targetConfig.files);
+    relativizePathList(targetConfig.cmakeIncludes);
+  }
+
+  /**
+   * Relativize each path in the given list.
+   *
+   * @param paths The paths to relativize.
+   */
+  private void relativizePathList(List<String> paths) {
+    List<String> tempList = new ArrayList<>();
+    paths.forEach(f -> tempList.add(relativizePath(Paths.get(f))));
+    paths.clear();
+    paths.addAll(tempList);
+  }
+
+  /**
+   * Relativize a single path, but only if it points to a local resource in the project (i.e., not
+   * on the class path).
+   *
+   * @param path The path to relativize.
+   */
+  private String relativizePath(Path path) {
+    if (FileUtil.findInPackage(path, this) == null) {
+      return String.valueOf(path);
+    } else {
+      Path resolvedPath = this.srcPath.resolve(path).toAbsolutePath();
+      return this.getSrcPath().relativize(resolvedPath).toString();
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedGenerator.java b/org.lflang/src/org/lflang/federated/generator/FedGenerator.java
index 3d2d118067..424705e06b 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedGenerator.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedGenerator.java
@@ -2,6 +2,7 @@
 
 import static org.lflang.generator.DockerGenerator.dockerGeneratorFactory;
 
+import com.google.inject.Injector;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -19,7 +20,6 @@
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
@@ -27,14 +27,13 @@
 import org.eclipse.xtext.resource.XtextResourceSet;
 import org.eclipse.xtext.util.RuntimeIOException;
 import org.eclipse.xtext.xbase.lib.Exceptions;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.LFStandaloneSetup;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty.CoordinationType;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.launcher.FedLauncherGenerator;
 import org.lflang.federated.launcher.RtiConfig;
 import org.lflang.generator.CodeMap;
@@ -58,574 +57,544 @@
 import org.lflang.lf.Reactor;
 import org.lflang.util.Averager;
 
-import com.google.inject.Injector;
-
 public class FedGenerator {
 
-
-    /**
-     *
-     */
-    private final ErrorReporter errorReporter;
-
-    /**
-     * A list of federate instances.
-     */
-    private final List<FederateInstance> federates = new ArrayList<>();
-
-    /**
-     * File configuration to be used during the LF code generation stage (not the target code
-     * generation stage of individual federates).
-     */
-    private final FedFileConfig fileConfig;
-
-    /**
-     * Configuration of the RTI.
-     */
-    final RtiConfig rtiConfig = new RtiConfig();
-
-    /**
-     * Target configuration of the federation; drawn from the file
-     * in which the federated reactor is defined.
-     */
-    private final TargetConfig targetConfig;
-
-    /**
-     * A map from instantiations to the federate instances for that
-     * instantiation.
-     * If the instantiation has a width, there may be more than one federate
-     * instance.
-     */
-    private Map<Instantiation, List<FederateInstance>> federatesByInstantiation;
-
-    /**
-     * Definition of the main (top-level) reactor.
-     * This is an automatically generated AST node for the top-level
-     * reactor.
-     */
-    private Instantiation mainDef;
-
-    /**
-     * Create a new generator and initialize a file configuration, target configuration, and error
-     * reporter.
-     * @param context
-     */
-    public FedGenerator(LFGeneratorContext context) {
-        this.fileConfig = (FedFileConfig) context.getFileConfig();
-        this.targetConfig = context.getTargetConfig();
-        this.errorReporter = context.getErrorReporter();
+  /** */
+  private final ErrorReporter errorReporter;
+
+  /** A list of federate instances. */
+  private final List<FederateInstance> federates = new ArrayList<>();
+
+  /**
+   * File configuration to be used during the LF code generation stage (not the target code
+   * generation stage of individual federates).
+   */
+  private final FedFileConfig fileConfig;
+
+  /** Configuration of the RTI. */
+  final RtiConfig rtiConfig = new RtiConfig();
+
+  /**
+   * Target configuration of the federation; drawn from the file in which the federated reactor is
+   * defined.
+   */
+  private final TargetConfig targetConfig;
+
+  /**
+   * A map from instantiations to the federate instances for that instantiation. If the
+   * instantiation has a width, there may be more than one federate instance.
+   */
+  private Map<Instantiation, List<FederateInstance>> federatesByInstantiation;
+
+  /**
+   * Definition of the main (top-level) reactor. This is an automatically generated AST node for the
+   * top-level reactor.
+   */
+  private Instantiation mainDef;
+
+  /**
+   * Create a new generator and initialize a file configuration, target configuration, and error
+   * reporter.
+   *
+   * @param context
+   */
+  public FedGenerator(LFGeneratorContext context) {
+    this.fileConfig = (FedFileConfig) context.getFileConfig();
+    this.targetConfig = context.getTargetConfig();
+    this.errorReporter = context.getErrorReporter();
+  }
+
+  /**
+   * Produce LF code for each federate in a separate file, then invoke a target-specific code
+   * generator for each of those files.
+   *
+   * @param resource The resource that has the federated main reactor in it
+   * @param context The context in which to carry out the code generation.
+   * @return False if no errors have occurred, true otherwise.
+   * @throws IOException
+   */
+  public boolean doGenerate(Resource resource, LFGeneratorContext context) throws IOException {
+    if (!federatedExecutionIsSupported(resource)) return true;
+    cleanIfNeeded(context);
+
+    // In a federated execution, we need keepalive to be true,
+    // otherwise a federate could exit simply because it hasn't received
+    // any messages.
+    targetConfig.keepalive = true;
+
+    // Process command-line arguments
+    processCLIArguments(context);
+
+    // Find the federated reactor
+    Reactor federation = FedASTUtils.findFederatedReactor(resource);
+
+    // Extract some useful information about the federation
+    analyzeFederates(federation, context);
+
+    // Find all the connections between federates.
+    // For each connection between federates, replace it in the
+    // AST with an action (which inherits the delay) and three reactions.
+    // The action will be physical for physical connections and logical
+    // for logical connections.
+    replaceFederateConnectionsWithProxies(federation, resource);
+
+    FedEmitter fedEmitter =
+        new FedEmitter(
+            fileConfig, ASTUtils.toDefinition(mainDef.getReactorClass()), errorReporter, rtiConfig);
+
+    // Generate LF code for each federate.
+    Map<Path, CodeMap> lf2lfCodeMapMap = new HashMap<>();
+    for (FederateInstance federate : federates) {
+      lf2lfCodeMapMap.putAll(fedEmitter.generateFederate(context, federate, federates.size()));
     }
 
-    /**
-     * Produce LF code for each federate in a separate file, then invoke a target-specific code
-     * generator for each of those files.
-     *
-     * @param resource The resource that has the federated main reactor in it
-     * @param context The context in which to carry out the code generation.
-     * @return False if no errors have occurred, true otherwise.
-     * @throws IOException
-     */
-    public boolean doGenerate(Resource resource, LFGeneratorContext context) throws IOException {
-        if (!federatedExecutionIsSupported(resource)) return true;
-        cleanIfNeeded(context);
-
-        // In a federated execution, we need keepalive to be true,
-        // otherwise a federate could exit simply because it hasn't received
-        // any messages.
-        targetConfig.keepalive = true;
-
-        // Process command-line arguments
-        processCLIArguments(context);
-
-        // Find the federated reactor
-        Reactor federation = FedASTUtils.findFederatedReactor(resource);
-
-        // Extract some useful information about the federation
-        analyzeFederates(federation, context);
-
-        // Find all the connections between federates.
-        // For each connection between federates, replace it in the
-        // AST with an action (which inherits the delay) and three reactions.
-        // The action will be physical for physical connections and logical
-        // for logical connections.
-        replaceFederateConnectionsWithProxies(federation, resource);
-
-        FedEmitter fedEmitter = new FedEmitter(
-            fileConfig,
-            ASTUtils.toDefinition(mainDef.getReactorClass()),
-            errorReporter,
-            rtiConfig
-        );
-
-        // Generate LF code for each federate.
-        Map<Path, CodeMap> lf2lfCodeMapMap = new HashMap<>();
-        for (FederateInstance federate : federates) {
-            lf2lfCodeMapMap.putAll(fedEmitter.generateFederate(
-                context, federate, federates.size()
-            ));
-        }
-
-        // Do not invoke target code generators if --no-compile flag is used.
-        if (context.getTargetConfig().noCompile) {
-            context.finish(Status.GENERATED, lf2lfCodeMapMap);
-            return false;
-        }
+    // Do not invoke target code generators if --no-compile flag is used.
+    if (context.getTargetConfig().noCompile) {
+      context.finish(Status.GENERATED, lf2lfCodeMapMap);
+      return false;
+    }
 
-        Map<Path, CodeMap> codeMapMap = compileFederates(context, lf2lfCodeMapMap, subContexts -> {
-            createDockerFiles(context, subContexts);
-            generateLaunchScript();
-        });
+    Map<Path, CodeMap> codeMapMap =
+        compileFederates(
+            context,
+            lf2lfCodeMapMap,
+            subContexts -> {
+              createDockerFiles(context, subContexts);
+              generateLaunchScript();
+            });
 
-        context.finish(Status.COMPILED, codeMapMap);
-        return false;
+    context.finish(Status.COMPILED, codeMapMap);
+    return false;
+  }
+
+  private void generateLaunchScript() {
+    new FedLauncherGenerator(this.targetConfig, this.fileConfig, this.errorReporter)
+        .doGenerate(federates, rtiConfig);
+  }
+
+  /**
+   * Generate a Dockerfile for each federate and a docker-compose.yml for the federation.
+   *
+   * @param context The main context in which the federation has been compiled.
+   * @param subContexts The subcontexts in which the federates have been compiled.
+   */
+  private void createDockerFiles(LFGeneratorContext context, List<SubContext> subContexts) {
+    if (context.getTargetConfig().dockerOptions == null) return;
+    final List<DockerData> services = new ArrayList<>();
+    // 1. create a Dockerfile for each federate
+    for (SubContext subContext : subContexts) { // Inherit Docker options from main context
+      subContext.getTargetConfig().dockerOptions = context.getTargetConfig().dockerOptions;
+      var dockerGenerator = dockerGeneratorFactory(subContext);
+      var dockerData = dockerGenerator.generateDockerData();
+      try {
+        dockerData.writeDockerFile();
+      } catch (IOException e) {
+        throw new RuntimeIOException(e);
+      }
+      services.add(dockerData);
     }
-
-    private void generateLaunchScript() {
-        new FedLauncherGenerator(
-            this.targetConfig,
-            this.fileConfig,
-            this.errorReporter
-        ).doGenerate(federates, rtiConfig);
+    // 2. create a docker-compose.yml for the federation
+    try {
+      new FedDockerComposeGenerator(context, rtiConfig.getHost()).writeDockerComposeFile(services);
+    } catch (IOException e) {
+      throw new RuntimeIOException(e);
     }
-
-    /**
-     * Generate a Dockerfile for each federate and a docker-compose.yml for the federation.
-     * @param context The main context in which the federation has been compiled.
-     * @param subContexts The subcontexts in which the federates have been compiled.
-     */
-    private void createDockerFiles(LFGeneratorContext context, List<SubContext> subContexts) {
-        if (context.getTargetConfig().dockerOptions == null) return;
-        final List<DockerData> services = new ArrayList<>();
-        // 1. create a Dockerfile for each federate
-        for (SubContext subContext : subContexts) {// Inherit Docker options from main context
-            subContext.getTargetConfig().dockerOptions = context.getTargetConfig().dockerOptions;
-            var dockerGenerator = dockerGeneratorFactory(subContext);
-            var dockerData = dockerGenerator.generateDockerData();
-            try {
-                dockerData.writeDockerFile();
-            } catch (IOException e) {
-                throw new RuntimeIOException(e);
-            }
-            services.add(dockerData);
-        }
-        // 2. create a docker-compose.yml for the federation
-        try {
-            new FedDockerComposeGenerator(
-                context,
-                rtiConfig.getHost()
-            ).writeDockerComposeFile(services);
-        } catch (IOException e) {
-            throw new RuntimeIOException(e);
-        }
+  }
+
+  /**
+   * Check if a clean was requested from the standalone compiler and perform the clean step.
+   *
+   * @param context Context in which the generator operates
+   */
+  private void cleanIfNeeded(LFGeneratorContext context) {
+    if (context.getArgs().containsKey(BuildParm.CLEAN.getKey())) {
+      try {
+        fileConfig.doClean();
+      } catch (IOException e) {
+        System.err.println("WARNING: IO Error during clean");
+      }
     }
-
-    /**
-     * Check if a clean was requested from the standalone compiler and perform
-     * the clean step.
-     * @param context Context in which the generator operates
-     */
-    private void cleanIfNeeded(LFGeneratorContext context) {
-        if (context.getArgs().containsKey(BuildParm.CLEAN.getKey())) {
-            try {
-                fileConfig.doClean();
-            } catch (IOException e) {
-                System.err.println("WARNING: IO Error during clean");
-            }
-        }
+  }
+
+  /** Return whether federated execution is supported for {@code resource}. */
+  private boolean federatedExecutionIsSupported(Resource resource) {
+    var target = Target.fromDecl(GeneratorUtils.findTargetDecl(resource));
+    var targetOK =
+        List.of(Target.C, Target.Python, Target.TS, Target.CPP, Target.CCPP).contains(target);
+    if (!targetOK) {
+      errorReporter.reportError("Federated execution is not supported with target " + target + ".");
     }
-
-    /** Return whether federated execution is supported for {@code resource}. */
-    private boolean federatedExecutionIsSupported(Resource resource) {
-        var target = Target.fromDecl(GeneratorUtils.findTargetDecl(resource));
-        var targetOK = List.of(
-            Target.C, Target.Python, Target.TS, Target.CPP, Target.CCPP
-        ).contains(target);
-        if (!targetOK) {
-            errorReporter.reportError(
-                "Federated execution is not supported with target " + target + "."
-            );
-        }
-        if(target.equals(Target.C) && GeneratorUtils.isHostWindows()) {
-            errorReporter.reportError(
-                "Federated LF programs with a C target are currently not supported on Windows."
-            );
-            targetOK = false;
-        }
-
-        return targetOK;
+    if (target.equals(Target.C) && GeneratorUtils.isHostWindows()) {
+      errorReporter.reportError(
+          "Federated LF programs with a C target are currently not supported on Windows.");
+      targetOK = false;
     }
 
-    private Map<Path, CodeMap> compileFederates(
-            LFGeneratorContext context,
-            Map<Path, CodeMap> lf2lfCodeMapMap,
-            Consumer<List<SubContext>> finalizer) {
-
-        // FIXME: Use the appropriate resource set instead of always using standalone
-        Injector inj = new LFStandaloneSetup()
-            .createInjectorAndDoEMFRegistration();
-        XtextResourceSet rs = inj.getInstance(XtextResourceSet.class);
-        rs.addLoadOption(XtextResource.OPTION_RESOLVE_ALL, Boolean.TRUE);
-        // define output path here
-        JavaIoFileSystemAccess fsa = inj.getInstance(JavaIoFileSystemAccess.class);
-        fsa.setOutputPath("DEFAULT_OUTPUT", fileConfig.getSrcGenPath().toString());
-
-        var numOfCompileThreads = Math.min(6,
-                                           Math.min(
-                                               Math.max(federates.size(), 1),
-                                               Runtime.getRuntime().availableProcessors()
-                                           )
-        );
-        var compileThreadPool = Executors.newFixedThreadPool(numOfCompileThreads);
-        System.out.println("******** Using "+numOfCompileThreads+" threads to compile the program.");
-        Map<Path, CodeMap> codeMapMap = new ConcurrentHashMap<>();
-        List<SubContext> subContexts = Collections.synchronizedList(new ArrayList<>());
-        Averager averager = new Averager(federates.size());
-        final var threadSafeErrorReporter = new SynchronizedErrorReporter(errorReporter);
-        for (int i = 0; i < federates.size(); i++) {
-            FederateInstance fed = federates.get(i);
-            final int id = i;
-            compileThreadPool.execute(() -> {
-                Resource res = rs.getResource(URI.createFileURI(
-                    FedEmitter.lfFilePath(fileConfig, fed).toAbsolutePath().toString()
-                ), true);
-                FileConfig subFileConfig = LFGenerator.createFileConfig(res, fileConfig.getSrcGenPath(), true);
-                ErrorReporter subContextErrorReporter = new LineAdjustingErrorReporter(threadSafeErrorReporter, lf2lfCodeMapMap);
-
-                var props = new Properties();
-                if (targetConfig.dockerOptions != null && targetConfig.target.buildsUsingDocker()) {
-                    props.put("no-compile", "true");
-                }
-                props.put("docker", "false");
-
-                TargetConfig subConfig = new TargetConfig(
-                    props, GeneratorUtils.findTargetDecl(subFileConfig.resource), subContextErrorReporter
-                );
-                SubContext subContext = new SubContext(context, IntegratedBuilder.VALIDATED_PERCENT_PROGRESS, 100) {
-                    @Override
-                    public ErrorReporter getErrorReporter() {
-                        return subContextErrorReporter;
-                    }
-
-                    @Override
-                    public void reportProgress(String message, int percentage) {
-                        averager.report(id, percentage, meanPercentage -> super.reportProgress(message, meanPercentage));
-                    }
-
-                    @Override
-                    public FileConfig getFileConfig() {
-                        return subFileConfig;
-                    }
-
-                    @Override
-                    public TargetConfig getTargetConfig() {
-                        return subConfig;
-                    }
+    return targetOK;
+  }
+
+  private Map<Path, CodeMap> compileFederates(
+      LFGeneratorContext context,
+      Map<Path, CodeMap> lf2lfCodeMapMap,
+      Consumer<List<SubContext>> finalizer) {
+
+    // FIXME: Use the appropriate resource set instead of always using standalone
+    Injector inj = new LFStandaloneSetup().createInjectorAndDoEMFRegistration();
+    XtextResourceSet rs = inj.getInstance(XtextResourceSet.class);
+    rs.addLoadOption(XtextResource.OPTION_RESOLVE_ALL, Boolean.TRUE);
+    // define output path here
+    JavaIoFileSystemAccess fsa = inj.getInstance(JavaIoFileSystemAccess.class);
+    fsa.setOutputPath("DEFAULT_OUTPUT", fileConfig.getSrcGenPath().toString());
+
+    var numOfCompileThreads =
+        Math.min(
+            6, Math.min(Math.max(federates.size(), 1), Runtime.getRuntime().availableProcessors()));
+    var compileThreadPool = Executors.newFixedThreadPool(numOfCompileThreads);
+    System.out.println(
+        "******** Using " + numOfCompileThreads + " threads to compile the program.");
+    Map<Path, CodeMap> codeMapMap = new ConcurrentHashMap<>();
+    List<SubContext> subContexts = Collections.synchronizedList(new ArrayList<>());
+    Averager averager = new Averager(federates.size());
+    final var threadSafeErrorReporter = new SynchronizedErrorReporter(errorReporter);
+    for (int i = 0; i < federates.size(); i++) {
+      FederateInstance fed = federates.get(i);
+      final int id = i;
+      compileThreadPool.execute(
+          () -> {
+            Resource res =
+                rs.getResource(
+                    URI.createFileURI(
+                        FedEmitter.lfFilePath(fileConfig, fed).toAbsolutePath().toString()),
+                    true);
+            FileConfig subFileConfig =
+                LFGenerator.createFileConfig(res, fileConfig.getSrcGenPath(), true);
+            ErrorReporter subContextErrorReporter =
+                new LineAdjustingErrorReporter(threadSafeErrorReporter, lf2lfCodeMapMap);
+
+            var props = new Properties();
+            if (targetConfig.dockerOptions != null && targetConfig.target.buildsUsingDocker()) {
+              props.put("no-compile", "true");
+            }
+            props.put("docker", "false");
+
+            TargetConfig subConfig =
+                new TargetConfig(
+                    props,
+                    GeneratorUtils.findTargetDecl(subFileConfig.resource),
+                    subContextErrorReporter);
+            SubContext subContext =
+                new SubContext(context, IntegratedBuilder.VALIDATED_PERCENT_PROGRESS, 100) {
+                  @Override
+                  public ErrorReporter getErrorReporter() {
+                    return subContextErrorReporter;
+                  }
+
+                  @Override
+                  public void reportProgress(String message, int percentage) {
+                    averager.report(
+                        id,
+                        percentage,
+                        meanPercentage -> super.reportProgress(message, meanPercentage));
+                  }
+
+                  @Override
+                  public FileConfig getFileConfig() {
+                    return subFileConfig;
+                  }
+
+                  @Override
+                  public TargetConfig getTargetConfig() {
+                    return subConfig;
+                  }
                 };
 
-                inj.getInstance(LFGenerator.class).doGenerate(res, fsa, subContext);
-                codeMapMap.putAll(subContext.getResult().getCodeMaps());
-                subContexts.add(subContext);
-            });
-        }
-        // Initiate an orderly shutdown in which previously submitted tasks are
-        // executed, but no new tasks will be accepted.
-        compileThreadPool.shutdown();
-
-        // Wait for all compile threads to finish (NOTE: Can block forever)
-        try {
-            compileThreadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
-        } catch (Exception e) {
-            Exceptions.sneakyThrow(e);
-        } finally {
-            finalizer.accept(subContexts);
-        }
-        return codeMapMap;
+            inj.getInstance(LFGenerator.class).doGenerate(res, fsa, subContext);
+            codeMapMap.putAll(subContext.getResult().getCodeMaps());
+            subContexts.add(subContext);
+          });
     }
-
-    /**
-     * Process command-line arguments passed on to the generator.
-     *
-     * @param context Context of the build process.
-     */
-    private void processCLIArguments(LFGeneratorContext context) {
-        if (context.getArgs().containsKey("rti")) {
-            setFederationRTIProperties(context);
-        }
+    // Initiate an orderly shutdown in which previously submitted tasks are
+    // executed, but no new tasks will be accepted.
+    compileThreadPool.shutdown();
+
+    // Wait for all compile threads to finish (NOTE: Can block forever)
+    try {
+      compileThreadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
+    } catch (Exception e) {
+      Exceptions.sneakyThrow(e);
+    } finally {
+      finalizer.accept(subContexts);
     }
-
-    /**
-     * Set the RTI hostname, port and username if given as compiler arguments
-     *
-     * @param context Context of the build process.
-     */
-    private void setFederationRTIProperties(LFGeneratorContext context) {
-        String rtiAddr = context.getArgs().getProperty("rti");
-        Pattern pattern = Pattern.compile("([a-zA-Z0-9]+@)?([a-zA-Z0-9]+\\.?[a-z]{2,}|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+):?([0-9]+)?");
-        Matcher matcher = pattern.matcher(rtiAddr);
-
-        if (!matcher.find()) {
-            return;
-        }
-
-        // the user match group contains a trailing "@" which needs to be removed.
-        String userWithAt = matcher.group(1);
-        String user = (userWithAt == null) ? null : userWithAt.substring(0,
-                                                                       userWithAt.length()
-                                                                           - 1);
-        String host = matcher.group(2);
-        String port = matcher.group(3);
-
-        if (host != null) {
-            rtiConfig.setHost(host);
-        }
-        if (port != null) {
-            rtiConfig.setPort(Integer.parseInt(port));
-        }
-        if (user != null) {
-            rtiConfig.setUser(user);
-        }
+    return codeMapMap;
+  }
+
+  /**
+   * Process command-line arguments passed on to the generator.
+   *
+   * @param context Context of the build process.
+   */
+  private void processCLIArguments(LFGeneratorContext context) {
+    if (context.getArgs().containsKey("rti")) {
+      setFederationRTIProperties(context);
+    }
+  }
+
+  /**
+   * Set the RTI hostname, port and username if given as compiler arguments
+   *
+   * @param context Context of the build process.
+   */
+  private void setFederationRTIProperties(LFGeneratorContext context) {
+    String rtiAddr = context.getArgs().getProperty("rti");
+    Pattern pattern =
+        Pattern.compile(
+            "([a-zA-Z0-9]+@)?([a-zA-Z0-9]+\\.?[a-z]{2,}|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+):?([0-9]+)?");
+    Matcher matcher = pattern.matcher(rtiAddr);
+
+    if (!matcher.find()) {
+      return;
     }
 
-    /**
-     * Analyze the federation and record various properties of it.
-     *
-     * @param federation The federated reactor that contains all federates' instances.
-     */
-    private void analyzeFederates(Reactor federation, LFGeneratorContext context) {
-        // Create an instantiation for the fed reactor because there isn't one.
-        // Creating a definition for the main reactor because there isn't one.
-        mainDef = LfFactory.eINSTANCE.createInstantiation();
-        mainDef.setName(federation.getName());
-        mainDef.setReactorClass(federation);
-
-        // Make sure that if no federation RTI properties were given in the
-        // cmdline, then those specified in the lf file are not lost
-        if (rtiConfig.getHost().equals("localhost") &&
-            federation.getHost() != null &&
-            !federation.getHost().getAddr().equals("localhost")) {
-            rtiConfig.setHost(federation.getHost().getAddr());
-        }
+    // the user match group contains a trailing "@" which needs to be removed.
+    String userWithAt = matcher.group(1);
+    String user = (userWithAt == null) ? null : userWithAt.substring(0, userWithAt.length() - 1);
+    String host = matcher.group(2);
+    String port = matcher.group(3);
 
-        // Since federates are always within the main (federated) reactor,
-        // create a list containing just that one containing instantiation.
-        // This will be used to look up parameter values.
-        List<Instantiation> mainReactorContext = new ArrayList<>();
-        mainReactorContext.add(mainDef);
-
-        // Create a FederateInstance for each instance in the top-level reactor.
-        for (Instantiation instantiation : ASTUtils.allInstantiations(federation)) {
-            int bankWidth = ASTUtils.width(instantiation.getWidthSpec(), mainReactorContext);
-            if (bankWidth < 0) {
-                errorReporter.reportError(instantiation, "Cannot determine bank width! Assuming width of 1.");
-                // Continue with a bank width of 1.
-                bankWidth = 1;
-            }
-            List<FederateInstance> federateInstances = getFederateInstances(instantiation, bankWidth, context);
-            if (federatesByInstantiation == null) {
-                federatesByInstantiation = new LinkedHashMap<>();
-            }
-            federatesByInstantiation.put(instantiation, federateInstances);
-        }
+    if (host != null) {
+      rtiConfig.setHost(host);
     }
-
-    /**
-     * Get federate instances for a given {@code instantiation}. A bank will
-     * result in the creation of multiple federate instances (one for each
-     * member of the bank).
-     *
-     * @param instantiation An instantiation that corresponds to a federate.
-     * @param bankWidth     The width specified for the instantiation.
-     * @return A list of federate instance (of type @see FederateInstance).
-     */
-    private List<FederateInstance> getFederateInstances(Instantiation instantiation, int bankWidth, LFGeneratorContext context) {
-        // Create one federate instance for each instance in a bank of reactors.
-        List<FederateInstance> federateInstances = new ArrayList<>(bankWidth);
-
-        for (int i = 0; i < bankWidth; i++) {
-            // Assign an integer ID to the federate.
-            int federateID = federates.size();
-            var resource = instantiation.getReactorClass().eResource();
-            var federateTargetConfig = new FedTargetConfig(context, resource);
-            FederateInstance federateInstance = new FederateInstance(
-                instantiation,
-                federateID,
-                i,
-                federateTargetConfig,
-                errorReporter);
-            federates.add(federateInstance);
-            federateInstances.add(federateInstance);
-
-            if (instantiation.getHost() != null) {
-                federateInstance.host = instantiation.getHost().getAddr();
-                // The following could be 0.
-                federateInstance.port = instantiation.getHost().getPort();
-                // The following could be null.
-                federateInstance.user = instantiation.getHost().getUser();
-                /* FIXME: The at keyword should support a directory component.
-                 * federateInstance.dir = instantiation.getHost().dir
-                 */
-                if (federateInstance.host != null
-                    && !federateInstance.host.equals("localhost")
-                    && !federateInstance.host.equals("0.0.0.0")) {
-                    federateInstance.isRemote = true;
-                }
-            }
-        }
-        return federateInstances;
+    if (port != null) {
+      rtiConfig.setPort(Integer.parseInt(port));
     }
-
-    /**
-     * Replace connections between federates in the AST with proxies that
-     * handle sending and receiving data.
-     *
-     * @param federation Reactor class of the federation.
-     * @param resource
-     */
-    private void replaceFederateConnectionsWithProxies(Reactor federation, Resource resource) {
-        // Each connection in the AST may represent more than one connection between
-        // federation instances because of banks and multiports. We need to generate communication
-        // for each of these. To do this, we create a ReactorInstance so that we don't have
-        // to duplicate the rather complicated logic in that class. We specify a depth of 1,
-        // so it only creates the reactors immediately within the top level, not reactors
-        // that those contain.
-        ReactorInstance mainInstance = new ReactorInstance(federation, errorReporter);
-
-        for (ReactorInstance child : mainInstance.children) {
-            for (PortInstance output : child.outputs) {
-                replaceConnectionFromOutputPort(output, resource);
-            }
-        }
-
-        // Remove the connections at the top level
-        federation.getConnections().clear();
-
-        // There will be AST transformations that invalidate some info
-        // cached in ReactorInstance. FIXME: most likely not needed anymore
-        mainInstance.clearCaches(false);
+    if (user != null) {
+      rtiConfig.setUser(user);
     }
-
-    /**
-     * Replace the connections from the specified output port.
-     *
-     * @param output The output port instance.
-     * @param resource
-     */
-    private void replaceConnectionFromOutputPort(PortInstance output, Resource resource) {
-        // Iterate through ranges of the output port
-        for (SendRange srcRange : output.getDependentPorts()) {
-            if (srcRange.connection == null) {
-                // This should not happen.
-                errorReporter.reportError(
-                    output.getDefinition(),
-                    "Unexpected error. Cannot find output connection for port"
-                );
-                continue;
-            }
-            // Iterate through destinations
-            for (RuntimeRange<PortInstance> dstRange : srcRange.destinations) {
-                replaceOneToManyConnection(
-                    srcRange,
-                    dstRange,
-                    resource
-                );
-            }
-        }
+  }
+
+  /**
+   * Analyze the federation and record various properties of it.
+   *
+   * @param federation The federated reactor that contains all federates' instances.
+   */
+  private void analyzeFederates(Reactor federation, LFGeneratorContext context) {
+    // Create an instantiation for the fed reactor because there isn't one.
+    // Creating a definition for the main reactor because there isn't one.
+    mainDef = LfFactory.eINSTANCE.createInstantiation();
+    mainDef.setName(federation.getName());
+    mainDef.setReactorClass(federation);
+
+    // Make sure that if no federation RTI properties were given in the
+    // cmdline, then those specified in the lf file are not lost
+    if (rtiConfig.getHost().equals("localhost")
+        && federation.getHost() != null
+        && !federation.getHost().getAddr().equals("localhost")) {
+      rtiConfig.setHost(federation.getHost().getAddr());
     }
 
-    /**
-     * Replace (potentially multiple) connection(s) that originate from an
-     * output port to multiple destinations.
-     *
-     * @param srcRange A range of an output port that sources data for this
-     *                 connection.
-     * @param dstRange A range of input ports that receive the data.
-     * @param resource
-     */
-    private void replaceOneToManyConnection(
-        SendRange srcRange,
-        RuntimeRange<PortInstance> dstRange, Resource resource
-    ) {
-        MixedRadixInt srcID = srcRange.startMR();
-        MixedRadixInt dstID = dstRange.startMR();
-        int dstCount = 0;
-        int srcCount = 0;
-
-        while (dstCount++ < dstRange.width) {
-            int srcChannel = srcID.getDigits().get(0);
-            int srcBank = srcID.get(1);
-            int dstChannel = dstID.getDigits().get(0);
-            int dstBank = dstID.get(1);
-
-            FederateInstance srcFederate = federatesByInstantiation.get(
-                srcRange.instance.getParent().getDefinition()
-            ).get(srcBank);
-            FederateInstance dstFederate = federatesByInstantiation.get(
-                dstRange.instance.getParent().getDefinition()
-            ).get(dstBank);
-
-            // Clear banks
-            srcFederate.instantiation.setWidthSpec(null);
-            dstFederate.instantiation.setWidthSpec(null);
-
-            FedConnectionInstance fedConnection = new FedConnectionInstance(
-                srcRange,
-                dstRange,
-                srcChannel,
-                srcBank,
-                dstChannel,
-                dstBank,
-                srcFederate,
-                dstFederate,
-                FedUtils.getSerializer(srcRange.connection, srcFederate, dstFederate)
-            );
-
-            replaceFedConnection(fedConnection, resource);
-
-            dstID.increment();
-            srcID.increment();
-            srcCount++;
-            if (srcCount == srcRange.width) {
-                srcID = srcRange.startMR(); // Multicast. Start over.
-            }
-        }
+    // Since federates are always within the main (federated) reactor,
+    // create a list containing just that one containing instantiation.
+    // This will be used to look up parameter values.
+    List<Instantiation> mainReactorContext = new ArrayList<>();
+    mainReactorContext.add(mainDef);
+
+    // Create a FederateInstance for each instance in the top-level reactor.
+    for (Instantiation instantiation : ASTUtils.allInstantiations(federation)) {
+      int bankWidth = ASTUtils.width(instantiation.getWidthSpec(), mainReactorContext);
+      if (bankWidth < 0) {
+        errorReporter.reportError(
+            instantiation, "Cannot determine bank width! Assuming width of 1.");
+        // Continue with a bank width of 1.
+        bankWidth = 1;
+      }
+      List<FederateInstance> federateInstances =
+          getFederateInstances(instantiation, bankWidth, context);
+      if (federatesByInstantiation == null) {
+        federatesByInstantiation = new LinkedHashMap<>();
+      }
+      federatesByInstantiation.put(instantiation, federateInstances);
     }
-
-    /**
-     * Replace a one-to-one federated connection with proxies.
-     *
-     * @param connection A connection between two federates.
-     * @param resource
-     */
-    private void replaceFedConnection(FedConnectionInstance connection, Resource resource) {
-        if (!connection.getDefinition().isPhysical()
-            && targetConfig.coordination != CoordinationType.DECENTRALIZED) {
-            // Map the delays on connections between federates.
-            Set<Expression> dependsOnDelays =
-                connection.dstFederate.dependsOn.computeIfAbsent(
-                    connection.srcFederate,
-                    k -> new LinkedHashSet<>()
-                );
-            // Put the delay on the cache.
-            if (connection.getDefinition().getDelay() != null) {
-                dependsOnDelays.add(connection.getDefinition().getDelay());
-            } else {
-                // To indicate that at least one connection has no delay, add a null entry.
-                dependsOnDelays.add(null);
-            }
-            // Map the connections between federates.
-            Set<Expression> sendsToDelays =
-                connection.srcFederate.sendsTo.computeIfAbsent(
-                    connection.dstFederate,
-                    k -> new LinkedHashSet<>()
-                );
-            if (connection.getDefinition().getDelay() != null) {
-                sendsToDelays.add(connection.getDefinition().getDelay());
-            } else {
-                // To indicate that at least one connection has no delay, add a null entry.
-                sendsToDelays.add(null);
-            }
+  }
+
+  /**
+   * Get federate instances for a given {@code instantiation}. A bank will result in the creation of
+   * multiple federate instances (one for each member of the bank).
+   *
+   * @param instantiation An instantiation that corresponds to a federate.
+   * @param bankWidth The width specified for the instantiation.
+   * @return A list of federate instance (of type @see FederateInstance).
+   */
+  private List<FederateInstance> getFederateInstances(
+      Instantiation instantiation, int bankWidth, LFGeneratorContext context) {
+    // Create one federate instance for each instance in a bank of reactors.
+    List<FederateInstance> federateInstances = new ArrayList<>(bankWidth);
+
+    for (int i = 0; i < bankWidth; i++) {
+      // Assign an integer ID to the federate.
+      int federateID = federates.size();
+      var resource = instantiation.getReactorClass().eResource();
+      var federateTargetConfig = new FedTargetConfig(context, resource);
+      FederateInstance federateInstance =
+          new FederateInstance(instantiation, federateID, i, federateTargetConfig, errorReporter);
+      federates.add(federateInstance);
+      federateInstances.add(federateInstance);
+
+      if (instantiation.getHost() != null) {
+        federateInstance.host = instantiation.getHost().getAddr();
+        // The following could be 0.
+        federateInstance.port = instantiation.getHost().getPort();
+        // The following could be null.
+        federateInstance.user = instantiation.getHost().getUser();
+        /* FIXME: The at keyword should support a directory component.
+         * federateInstance.dir = instantiation.getHost().dir
+         */
+        if (federateInstance.host != null
+            && !federateInstance.host.equals("localhost")
+            && !federateInstance.host.equals("0.0.0.0")) {
+          federateInstance.isRemote = true;
         }
+      }
+    }
+    return federateInstances;
+  }
+
+  /**
+   * Replace connections between federates in the AST with proxies that handle sending and receiving
+   * data.
+   *
+   * @param federation Reactor class of the federation.
+   * @param resource
+   */
+  private void replaceFederateConnectionsWithProxies(Reactor federation, Resource resource) {
+    // Each connection in the AST may represent more than one connection between
+    // federation instances because of banks and multiports. We need to generate communication
+    // for each of these. To do this, we create a ReactorInstance so that we don't have
+    // to duplicate the rather complicated logic in that class. We specify a depth of 1,
+    // so it only creates the reactors immediately within the top level, not reactors
+    // that those contain.
+    ReactorInstance mainInstance = new ReactorInstance(federation, errorReporter);
+
+    for (ReactorInstance child : mainInstance.children) {
+      for (PortInstance output : child.outputs) {
+        replaceConnectionFromOutputPort(output, resource);
+      }
+    }
 
-        FedASTUtils.makeCommunication(connection, resource, targetConfig.coordination, errorReporter);
+    // Remove the connections at the top level
+    federation.getConnections().clear();
+
+    // There will be AST transformations that invalidate some info
+    // cached in ReactorInstance. FIXME: most likely not needed anymore
+    mainInstance.clearCaches(false);
+  }
+
+  /**
+   * Replace the connections from the specified output port.
+   *
+   * @param output The output port instance.
+   * @param resource
+   */
+  private void replaceConnectionFromOutputPort(PortInstance output, Resource resource) {
+    // Iterate through ranges of the output port
+    for (SendRange srcRange : output.getDependentPorts()) {
+      if (srcRange.connection == null) {
+        // This should not happen.
+        errorReporter.reportError(
+            output.getDefinition(), "Unexpected error. Cannot find output connection for port");
+        continue;
+      }
+      // Iterate through destinations
+      for (RuntimeRange<PortInstance> dstRange : srcRange.destinations) {
+        replaceOneToManyConnection(srcRange, dstRange, resource);
+      }
+    }
+  }
+
+  /**
+   * Replace (potentially multiple) connection(s) that originate from an output port to multiple
+   * destinations.
+   *
+   * @param srcRange A range of an output port that sources data for this connection.
+   * @param dstRange A range of input ports that receive the data.
+   * @param resource
+   */
+  private void replaceOneToManyConnection(
+      SendRange srcRange, RuntimeRange<PortInstance> dstRange, Resource resource) {
+    MixedRadixInt srcID = srcRange.startMR();
+    MixedRadixInt dstID = dstRange.startMR();
+    int dstCount = 0;
+    int srcCount = 0;
+
+    while (dstCount++ < dstRange.width) {
+      int srcChannel = srcID.getDigits().get(0);
+      int srcBank = srcID.get(1);
+      int dstChannel = dstID.getDigits().get(0);
+      int dstBank = dstID.get(1);
+
+      FederateInstance srcFederate =
+          federatesByInstantiation.get(srcRange.instance.getParent().getDefinition()).get(srcBank);
+      FederateInstance dstFederate =
+          federatesByInstantiation.get(dstRange.instance.getParent().getDefinition()).get(dstBank);
+
+      // Clear banks
+      srcFederate.instantiation.setWidthSpec(null);
+      dstFederate.instantiation.setWidthSpec(null);
+
+      FedConnectionInstance fedConnection =
+          new FedConnectionInstance(
+              srcRange,
+              dstRange,
+              srcChannel,
+              srcBank,
+              dstChannel,
+              dstBank,
+              srcFederate,
+              dstFederate,
+              FedUtils.getSerializer(srcRange.connection, srcFederate, dstFederate));
+
+      replaceFedConnection(fedConnection, resource);
+
+      dstID.increment();
+      srcID.increment();
+      srcCount++;
+      if (srcCount == srcRange.width) {
+        srcID = srcRange.startMR(); // Multicast. Start over.
+      }
     }
+  }
+
+  /**
+   * Replace a one-to-one federated connection with proxies.
+   *
+   * @param connection A connection between two federates.
+   * @param resource
+   */
+  private void replaceFedConnection(FedConnectionInstance connection, Resource resource) {
+    if (!connection.getDefinition().isPhysical()
+        && targetConfig.coordination != CoordinationType.DECENTRALIZED) {
+      // Map the delays on connections between federates.
+      Set<Expression> dependsOnDelays =
+          connection.dstFederate.dependsOn.computeIfAbsent(
+              connection.srcFederate, k -> new LinkedHashSet<>());
+      // Put the delay on the cache.
+      if (connection.getDefinition().getDelay() != null) {
+        dependsOnDelays.add(connection.getDefinition().getDelay());
+      } else {
+        // To indicate that at least one connection has no delay, add a null entry.
+        dependsOnDelays.add(null);
+      }
+      // Map the connections between federates.
+      Set<Expression> sendsToDelays =
+          connection.srcFederate.sendsTo.computeIfAbsent(
+              connection.dstFederate, k -> new LinkedHashSet<>());
+      if (connection.getDefinition().getDelay() != null) {
+        sendsToDelays.add(connection.getDefinition().getDelay());
+      } else {
+        // To indicate that at least one connection has no delay, add a null entry.
+        sendsToDelays.add(null);
+      }
+    }
+
+    FedASTUtils.makeCommunication(connection, resource, targetConfig.coordination, errorReporter);
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedImportEmitter.java b/org.lflang/src/org/lflang/federated/generator/FedImportEmitter.java
index 95351237a7..baf13d6a0a 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedImportEmitter.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedImportEmitter.java
@@ -4,9 +4,7 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.eclipse.emf.ecore.util.EcoreUtil;
-
 import org.lflang.ast.FormattingUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.lf.Import;
@@ -19,44 +17,41 @@
  */
 public class FedImportEmitter {
 
-    private static Set<Import> visitedImports = new HashSet<>();
-
-    /**
-     * Generate import statements for {@code federate}.
-     */
-    String generateImports(FederateInstance federate, FedFileConfig fileConfig) {
-        var imports = ((Model) federate.instantiation.eContainer().eContainer())
-            .getImports()
-            .stream()
-            .filter(federate::contains).toList();
-
-        // Transform the URIs
+  private static Set<Import> visitedImports = new HashSet<>();
+
+  /** Generate import statements for {@code federate}. */
+  String generateImports(FederateInstance federate, FedFileConfig fileConfig) {
+    var imports =
+        ((Model) federate.instantiation.eContainer().eContainer())
+            .getImports().stream().filter(federate::contains).toList();
+
+    // Transform the URIs
+    imports.stream()
+        .filter(i -> !visitedImports.contains(i))
+        .forEach(
+            i -> {
+              visitedImports.add(i);
+              Path importPath = fileConfig.srcPath.resolve(i.getImportURI()).toAbsolutePath();
+              i.setImportURI(
+                  fileConfig.getSrcPath().relativize(importPath).toString().replace('\\', '/'));
+            });
+
+    var importStatements = new CodeBuilder();
+
+    // Add import statements needed for the ordinary functionality of the federate
+    importStatements.pr(
         imports.stream()
-               .filter(i -> !visitedImports.contains(i))
-               .forEach(i -> {
-                   visitedImports.add(i);
-                   Path importPath =
-                       fileConfig.srcPath
-                           .resolve(i.getImportURI()).toAbsolutePath();
-                   i.setImportURI(fileConfig.getSrcPath().relativize(importPath)
-                                      .toString().replace('\\', '/')
-                   );
-               });
-
-        var importStatements = new CodeBuilder();
-
-        // Add import statements needed for the ordinary functionality of the federate
-        importStatements.pr(imports.stream()
-                                   .map(i -> {
-                                       var new_import = EcoreUtil.copy(i);
-                                       new_import.getReactorClasses().removeIf(
-                                           importedReactor -> !federate.contains(importedReactor)
-                                       );
-                                       return new_import;
-                                   })
-                                   .map(FormattingUtils.renderer(federate.targetConfig.target))
-                                   .collect(Collectors.joining("\n")));
-
-        return importStatements.getCode();
-    }
+            .map(
+                i -> {
+                  var new_import = EcoreUtil.copy(i);
+                  new_import
+                      .getReactorClasses()
+                      .removeIf(importedReactor -> !federate.contains(importedReactor));
+                  return new_import;
+                })
+            .map(FormattingUtils.renderer(federate.targetConfig.target))
+            .collect(Collectors.joining("\n")));
+
+    return importStatements.getCode();
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java b/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java
index d54d7fb068..ecedc3b583 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedMainEmitter.java
@@ -4,120 +4,128 @@
 import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
 import org.eclipse.emf.ecore.EObject;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
+import org.lflang.ast.ASTUtils;
 import org.lflang.ast.FormattingUtils;
-import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.PortInstance;
-import org.lflang.generator.ReactorInstance;
-import org.lflang.lf.Instantiation;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.Variable;
-
 import org.lflang.util.Pair;
 
-
-/**
- * Helper class to generate a main reactor
- */
+/** Helper class to generate a main reactor */
 public class FedMainEmitter {
 
-    /**
-     * Generate a main reactor for {@code federate}.
-     *
-     * @param federate
-     * @param originalMainReactor The original main reactor.
-     * @param errorReporter       Used to report errors.
-     * @return The main reactor.
-     */
-    String generateMainReactor(FederateInstance federate, Reactor originalMainReactor, ErrorReporter errorReporter) {
-        // FIXME: Handle modes at the top-level
-        if (!ASTUtils.allModes(originalMainReactor).isEmpty()) {
-            errorReporter.reportError(
-                ASTUtils.allModes(originalMainReactor).stream().findFirst().get(),
-                "Modes at the top level are not supported under federated execution."
-            );
-        }
-        var renderer = FormattingUtils.renderer(federate.targetConfig.target);
-
-        return String
-            .join(
-                "\n",
-                generateMainSignature(federate, originalMainReactor, renderer),
-               String.join(
-                   "\n",
-                   renderer.apply(federate.instantiation),
-                   ASTUtils.allStateVars(originalMainReactor).stream().filter(federate::contains).map(renderer).collect(Collectors.joining("\n")),
-                   ASTUtils.allActions(originalMainReactor).stream().filter(federate::contains).map(renderer).collect(Collectors.joining("\n")),
-                   ASTUtils.allTimers(originalMainReactor).stream().filter(federate::contains).map(renderer).collect(Collectors.joining("\n")),
-                   ASTUtils.allMethods(originalMainReactor).stream().filter(federate::contains).map(renderer).collect(Collectors.joining("\n")),
-                   ASTUtils.allReactions(originalMainReactor).stream().filter(federate::contains).map(renderer).collect(Collectors.joining("\n")),
-                   federate.networkSenderInstantiations.stream().map(renderer).collect(Collectors.joining("\n")),
-                   federate.networkReceiverInstantiations.stream().map(renderer).collect(Collectors.joining("\n")),
-                   federate.networkConnections.stream().map(renderer).collect(Collectors.joining("\n"))
-               ).indent(4).stripTrailing(),
-               "}"
-            );
+  /**
+   * Generate a main reactor for {@code federate}.
+   *
+   * @param federate
+   * @param originalMainReactor The original main reactor.
+   * @param errorReporter Used to report errors.
+   * @return The main reactor.
+   */
+  String generateMainReactor(
+      FederateInstance federate, Reactor originalMainReactor, ErrorReporter errorReporter) {
+    // FIXME: Handle modes at the top-level
+    if (!ASTUtils.allModes(originalMainReactor).isEmpty()) {
+      errorReporter.reportError(
+          ASTUtils.allModes(originalMainReactor).stream().findFirst().get(),
+          "Modes at the top level are not supported under federated execution.");
     }
+    var renderer = FormattingUtils.renderer(federate.targetConfig.target);
 
-    private static String getDependencyList(FederateInstance federate, Pair<PortInstance, PortInstance> p){
-        //StringBuilder lst = new StringBuilder();
-        var inputPort = p.getFirst();
-        var outputPort = p.getSecond();
-        var inputPortInstance = federate.networkPortToInstantiation.getOrDefault(inputPort, null);
-        var outputPortInstance = federate.networkPortToInstantiation.getOrDefault(outputPort, null);
-        //var outputPortControlReaction = federate.networkPortToInstantiation.getOrDefault(outputPort, null);
-        if(inputPortInstance == null) return "";
-        //System.out.println("IP: " + inputPortReaction.getCode());
-        if(outputPortInstance != null){
-            //System.out.println("OP: " + outputPortReaction.toString());
-            return inputPortInstance.getName() + "," + outputPortInstance.getName();
-        }
-        return "";
-
-
-
-
+    return String.join(
+        "\n",
+        generateMainSignature(federate, originalMainReactor, renderer),
+        String.join(
+                "\n",
+                renderer.apply(federate.instantiation),
+                ASTUtils.allStateVars(originalMainReactor).stream()
+                    .filter(federate::contains)
+                    .map(renderer)
+                    .collect(Collectors.joining("\n")),
+                ASTUtils.allActions(originalMainReactor).stream()
+                    .filter(federate::contains)
+                    .map(renderer)
+                    .collect(Collectors.joining("\n")),
+                ASTUtils.allTimers(originalMainReactor).stream()
+                    .filter(federate::contains)
+                    .map(renderer)
+                    .collect(Collectors.joining("\n")),
+                ASTUtils.allMethods(originalMainReactor).stream()
+                    .filter(federate::contains)
+                    .map(renderer)
+                    .collect(Collectors.joining("\n")),
+                ASTUtils.allReactions(originalMainReactor).stream()
+                    .filter(federate::contains)
+                    .map(renderer)
+                    .collect(Collectors.joining("\n")),
+                federate.networkSenderInstantiations.stream()
+                    .map(renderer)
+                    .collect(Collectors.joining("\n")),
+                federate.networkReceiverInstantiations.stream()
+                    .map(renderer)
+                    .collect(Collectors.joining("\n")),
+                federate.networkConnections.stream()
+                    .map(renderer)
+                    .collect(Collectors.joining("\n")))
+            .indent(4)
+            .stripTrailing(),
+        "}");
+  }
+
+  private static String getDependencyList(
+      FederateInstance federate, Pair<PortInstance, PortInstance> p) {
+    // StringBuilder lst = new StringBuilder();
+    var inputPort = p.getFirst();
+    var outputPort = p.getSecond();
+    var inputPortInstance = federate.networkPortToInstantiation.getOrDefault(inputPort, null);
+    var outputPortInstance = federate.networkPortToInstantiation.getOrDefault(outputPort, null);
+    // var outputPortControlReaction = federate.networkPortToInstantiation.getOrDefault(outputPort,
+    // null);
+    if (inputPortInstance == null) return "";
+    // System.out.println("IP: " + inputPortReaction.getCode());
+    if (outputPortInstance != null) {
+      // System.out.println("OP: " + outputPortReaction.toString());
+      return inputPortInstance.getName() + "," + outputPortInstance.getName();
     }
-
-    /**
-     * Generate the signature of the main reactor.
-     * @param federate The federate.
-     * @param originalMainReactor The original main reactor of the original .lf file.
-     * @param renderer Used to render EObjects (in String representation).
-     */
-    private CharSequence generateMainSignature(FederateInstance federate, Reactor originalMainReactor, Function<EObject, String> renderer) {
-        var paramList = ASTUtils.allParameters(originalMainReactor)
-                                .stream()
-                                .filter(federate::contains)
-                                .map(renderer)
-                                .collect(
-                                    Collectors.joining(
-                                        ",", "(", ")"
-                                    )
-                                );
-        // Empty "()" is currently not allowed by the syntax
-
-        var networkMessageActionsListString = federate.networkMessageActions
-            .stream()
+    return "";
+  }
+
+  /**
+   * Generate the signature of the main reactor.
+   *
+   * @param federate The federate.
+   * @param originalMainReactor The original main reactor of the original .lf file.
+   * @param renderer Used to render EObjects (in String representation).
+   */
+  private CharSequence generateMainSignature(
+      FederateInstance federate, Reactor originalMainReactor, Function<EObject, String> renderer) {
+    var paramList =
+        ASTUtils.allParameters(originalMainReactor).stream()
+            .filter(federate::contains)
+            .map(renderer)
+            .collect(Collectors.joining(",", "(", ")"));
+    // Empty "()" is currently not allowed by the syntax
+
+    var networkMessageActionsListString =
+        federate.networkMessageActions.stream()
             .map(Variable::getName)
             .collect(Collectors.joining(","));
 
-        List<String> vals = new ArrayList<>();
-        for (var pair: federate.networkReactionDependencyPairs){
-            vals.add(getDependencyList(federate, pair));
-        }
+    List<String> vals = new ArrayList<>();
+    for (var pair : federate.networkReactionDependencyPairs) {
+      vals.add(getDependencyList(federate, pair));
+    }
 
-        String intraDependencies = String.join(";", vals);
-        return
-        """
+    String intraDependencies = String.join(";", vals);
+    return """
         @_fed_config(network_message_actions="%s", dependencyPairs="%s")
         main reactor %s {
-        """.formatted(networkMessageActionsListString,
-                      intraDependencies,
-                      paramList.equals("()") ? "" : paramList);
-    }
+        """
+        .formatted(
+            networkMessageActionsListString,
+            intraDependencies,
+            paramList.equals("()") ? "" : paramList);
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedPreambleEmitter.java b/org.lflang/src/org/lflang/federated/generator/FedPreambleEmitter.java
index 154919c816..9cb35b2949 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedPreambleEmitter.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedPreambleEmitter.java
@@ -3,9 +3,8 @@
 import static org.lflang.ast.ASTUtils.toText;
 
 import java.io.IOException;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.extensions.FedTargetExtensionFactory;
 import org.lflang.federated.launcher.RtiConfig;
 import org.lflang.generator.CodeBuilder;
@@ -14,38 +13,43 @@
 
 public class FedPreambleEmitter {
 
-    public FedPreambleEmitter() {}
-
-    /**
-     * Add necessary code to the source and necessary build support to
-     * enable the requested serializations in 'enabledSerializations'
-     */
-    String generatePreamble(FederateInstance federate, FedFileConfig fileConfig, RtiConfig rtiConfig, ErrorReporter errorReporter)
-        throws IOException {
-        CodeBuilder preambleCode = new CodeBuilder();
-
-        // Transfer top-level preambles
-        var mainModel = (Model) ASTUtils.toDefinition(federate.instantiation.getReactorClass()).eContainer();
-        for (Preamble p : mainModel.getPreambles()) {
-            preambleCode.pr(
-            """
+  public FedPreambleEmitter() {}
+
+  /**
+   * Add necessary code to the source and necessary build support to enable the requested
+   * serializations in 'enabledSerializations'
+   */
+  String generatePreamble(
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      RtiConfig rtiConfig,
+      ErrorReporter errorReporter)
+      throws IOException {
+    CodeBuilder preambleCode = new CodeBuilder();
+
+    // Transfer top-level preambles
+    var mainModel =
+        (Model) ASTUtils.toDefinition(federate.instantiation.getReactorClass()).eContainer();
+    for (Preamble p : mainModel.getPreambles()) {
+      preambleCode.pr(
+          """
             %spreamble {=
             %s
             =}
-            """.formatted(
-                p.getVisibility() == null ? "" : p.getVisibility() + " ",
-                toText(p.getCode())
-            ));
-        }
+            """
+              .formatted(
+                  p.getVisibility() == null ? "" : p.getVisibility() + " ", toText(p.getCode())));
+    }
 
-        preambleCode.pr("""
+    preambleCode.pr(
+        """
             preamble {=
             %s
-            =}""".formatted(FedTargetExtensionFactory.getExtension(federate.targetConfig.target).generatePreamble(
-                federate, fileConfig, rtiConfig, errorReporter
-            ))
-        );
+            =}"""
+            .formatted(
+                FedTargetExtensionFactory.getExtension(federate.targetConfig.target)
+                    .generatePreamble(federate, fileConfig, rtiConfig, errorReporter)));
 
-        return preambleCode.getCode();
-    }
+    return preambleCode.getCode();
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedReactorEmitter.java b/org.lflang/src/org/lflang/federated/generator/FedReactorEmitter.java
index 976049601c..69a6342486 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedReactorEmitter.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedReactorEmitter.java
@@ -1,24 +1,22 @@
 package org.lflang.federated.generator;
 
 import java.util.stream.Collectors;
-
 import org.lflang.ast.FormattingUtils;
 import org.lflang.lf.Model;
 
 public class FedReactorEmitter {
 
-    public FedReactorEmitter() {}
+  public FedReactorEmitter() {}
 
-    /**
-     * @param federate
-     * @return
-     */
-    String generateReactorDefinitions(FederateInstance federate) {
-        return ((Model) federate.instantiation.eContainer().eContainer())
-            .getReactors()
-            .stream()
+  /**
+   * @param federate
+   * @return
+   */
+  String generateReactorDefinitions(FederateInstance federate) {
+    return ((Model) federate.instantiation.eContainer().eContainer())
+        .getReactors().stream()
             .filter(federate::contains)
             .map(FormattingUtils.renderer(federate.targetConfig.target))
             .collect(Collectors.joining("\n"));
-    }
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedTargetConfig.java b/org.lflang/src/org/lflang/federated/generator/FedTargetConfig.java
index af83d1f919..3252f31a39 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedTargetConfig.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedTargetConfig.java
@@ -2,77 +2,69 @@
 
 import static org.lflang.ast.ASTUtils.convertToEmptyListIfNull;
 
+import org.eclipse.emf.ecore.resource.Resource;
 import org.lflang.ErrorReporter;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGeneratorContext;
-import org.eclipse.emf.ecore.resource.Resource;
 
 /**
- * Subclass of TargetConfig with a specialized constructor for creating configurations for federates.
+ * Subclass of TargetConfig with a specialized constructor for creating configurations for
+ * federates.
+ *
  * @author Marten Lohstroh
  */
 public class FedTargetConfig extends TargetConfig {
 
-    /**
-     * Create a configuration for a federate given a main context and the resource in which the class
-     * of the federate is specified.
-     * @param context The generator context.
-     * @param federateResource The resource in which to find the reactor class of the federate.
-     */
-    public FedTargetConfig(LFGeneratorContext context, Resource federateResource) {
-        // Create target config based on the main .lf file
-        super(
-            context.getArgs(),
-            GeneratorUtils.findTargetDecl(context.getFileConfig().resource),
-            context.getErrorReporter()
-        );
+  /**
+   * Create a configuration for a federate given a main context and the resource in which the class
+   * of the federate is specified.
+   *
+   * @param context The generator context.
+   * @param federateResource The resource in which to find the reactor class of the federate.
+   */
+  public FedTargetConfig(LFGeneratorContext context, Resource federateResource) {
+    // Create target config based on the main .lf file
+    super(
+        context.getArgs(),
+        GeneratorUtils.findTargetDecl(context.getFileConfig().resource),
+        context.getErrorReporter());
 
-        mergeImportedConfig(
-            federateResource,
-            context.getFileConfig().resource,
-            context.getErrorReporter()
-        );
+    mergeImportedConfig(
+        federateResource, context.getFileConfig().resource, context.getErrorReporter());
 
-        clearPropertiesToIgnore();
+    clearPropertiesToIgnore();
 
-        ((FedFileConfig)context.getFileConfig()).relativizePaths(this);
+    ((FedFileConfig) context.getFileConfig()).relativizePaths(this);
+  }
 
+  /**
+   * If the federate that target configuration applies to is imported, merge target properties
+   * declared in the file that it was imported from.
+   *
+   * @param federateResource The resource where the class of the federate is specified.
+   * @param mainResource The resource in which the federation (i.e., main reactor) is specified.
+   * @param errorReporter An error reporter to use when problems are encountered.
+   */
+  private void mergeImportedConfig(
+      Resource federateResource, Resource mainResource, ErrorReporter errorReporter) {
+    // If the federate is imported, then update the configuration based on target properties
+    // in the imported file.
+    if (!federateResource.equals(mainResource)) {
+      var importedTargetDecl = GeneratorUtils.findTargetDecl(federateResource);
+      var targetProperties = importedTargetDecl.getConfig();
+      if (targetProperties != null) {
+        // Merge properties
+        TargetProperty.update(
+            this, convertToEmptyListIfNull(targetProperties.getPairs()), errorReporter);
+      }
     }
+  }
 
-    /**
-     * If the federate that target configuration applies to is imported, merge target properties
-     * declared in the file that it was imported from.
-     * @param federateResource The resource where the class of the federate is specified.
-     * @param mainResource The resource in which the federation (i.e., main reactor) is specified.
-     * @param errorReporter An error reporter to use when problems are encountered.
-     */
-    private void mergeImportedConfig(
-        Resource federateResource,
-        Resource mainResource,
-        ErrorReporter errorReporter) {
-        // If the federate is imported, then update the configuration based on target properties
-        // in the imported file.
-        if (!federateResource.equals(mainResource)) {
-            var importedTargetDecl = GeneratorUtils.findTargetDecl(federateResource);
-            var targetProperties = importedTargetDecl.getConfig();
-            if (targetProperties != null) {
-                // Merge properties
-                TargetProperty.update(
-                    this,
-                    convertToEmptyListIfNull(targetProperties.getPairs()),
-                    errorReporter
-                );
-            }
-        }
-    }
-
-    /**
-     * Method for the removal of things that should not appear in the target config of a federate.
-     */
-    private void clearPropertiesToIgnore() {
-        this.setByUser.remove(TargetProperty.CLOCK_SYNC);
-        this.setByUser.remove(TargetProperty.CLOCK_SYNC_OPTIONS);
-    }
+  /** Method for the removal of things that should not appear in the target config of a federate. */
+  private void clearPropertiesToIgnore() {
+    this.setByUser.remove(TargetProperty.CLOCK_SYNC);
+    this.setByUser.remove(TargetProperty.CLOCK_SYNC_OPTIONS);
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedTargetEmitter.java b/org.lflang/src/org/lflang/federated/generator/FedTargetEmitter.java
index 1616286048..402138f283 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedTargetEmitter.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedTargetEmitter.java
@@ -1,7 +1,6 @@
 package org.lflang.federated.generator;
 
 import java.io.IOException;
-
 import org.lflang.ErrorReporter;
 import org.lflang.TargetProperty;
 import org.lflang.ast.FormattingUtils;
@@ -11,34 +10,25 @@
 
 public class FedTargetEmitter {
 
-    String generateTarget(
-        LFGeneratorContext context,
-        int numOfFederates,
-        FederateInstance federate,
-        FedFileConfig fileConfig,
-        ErrorReporter errorReporter,
-        RtiConfig rtiConfig
-    ) throws IOException {
+  String generateTarget(
+      LFGeneratorContext context,
+      int numOfFederates,
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      ErrorReporter errorReporter,
+      RtiConfig rtiConfig)
+      throws IOException {
 
-        // FIXME: First of all, this is not an initialization; there is all sorts of stuff happening
-        // in the C implementation of this method. Second, true initialization stuff should happen
-        // when the target config is constructed, not when we're doing code generation.
-        // See https://issues.lf-lang.org/1667
-        FedTargetExtensionFactory.getExtension(federate.targetConfig.target)
-                                 .initializeTargetConfig(
-                                     context,
-                                     numOfFederates,
-                                     federate,
-                                     fileConfig,
-                                     errorReporter,
-                                     rtiConfig
-                                 );
+    // FIXME: First of all, this is not an initialization; there is all sorts of stuff happening
+    // in the C implementation of this method. Second, true initialization stuff should happen
+    // when the target config is constructed, not when we're doing code generation.
+    // See https://issues.lf-lang.org/1667
+    FedTargetExtensionFactory.getExtension(federate.targetConfig.target)
+        .initializeTargetConfig(
+            context, numOfFederates, federate, fileConfig, errorReporter, rtiConfig);
 
-        return FormattingUtils.renderer(federate.targetConfig.target).apply(
-            TargetProperty.extractTargetDecl(
-                federate.targetConfig.target,
-                federate.targetConfig
-            )
-        );
-    }
+    return FormattingUtils.renderer(federate.targetConfig.target)
+        .apply(
+            TargetProperty.extractTargetDecl(federate.targetConfig.target, federate.targetConfig));
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FedUtils.java b/org.lflang/src/org/lflang/federated/generator/FedUtils.java
index dd5ee6a9b3..2970be7c2a 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedUtils.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedUtils.java
@@ -1,38 +1,24 @@
 package org.lflang.federated.generator;
 
-import java.util.List;
-
 import org.lflang.federated.serialization.SupportedSerializers;
-import org.lflang.generator.PortInstance;
-import org.lflang.generator.ReactionInstance;
-import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Connection;
-import org.lflang.lf.Reaction;
-import org.lflang.lf.VarRef;
 
-/**
- * A collection of utility methods for the federated generator.
- */
+/** A collection of utility methods for the federated generator. */
 public class FedUtils {
-    /**
-     * Get the serializer for the {@code connection} between {@code srcFederate} and {@code dstFederate}.
-     */
-    public static SupportedSerializers getSerializer(
-        Connection connection,
-        FederateInstance srcFederate,
-        FederateInstance dstFederate
-    ) {
-        // Get the serializer
-        SupportedSerializers serializer = SupportedSerializers.NATIVE;
-        if (connection.getSerializer() != null) {
-            serializer = SupportedSerializers.valueOf(
-                connection.getSerializer().getType().toUpperCase()
-            );
-        }
-        // Add it to the list of enabled serializers for the source and destination federates
-        srcFederate.enabledSerializers.add(serializer);
-        dstFederate.enabledSerializers.add(serializer);
-        return serializer;
+  /**
+   * Get the serializer for the {@code connection} between {@code srcFederate} and {@code
+   * dstFederate}.
+   */
+  public static SupportedSerializers getSerializer(
+      Connection connection, FederateInstance srcFederate, FederateInstance dstFederate) {
+    // Get the serializer
+    SupportedSerializers serializer = SupportedSerializers.NATIVE;
+    if (connection.getSerializer() != null) {
+      serializer = SupportedSerializers.valueOf(connection.getSerializer().getType().toUpperCase());
     }
-
+    // Add it to the list of enabled serializers for the source and destination federates
+    srcFederate.enabledSerializers.add(serializer);
+    dstFederate.enabledSerializers.add(serializer);
+    return serializer;
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/FederateInstance.java b/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
index 12ca3207b2..8929831f40 100644
--- a/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
+++ b/org.lflang/src/org/lflang/federated/generator/FederateInstance.java
@@ -1,30 +1,31 @@
-/** Instance of a federate specification.
+/**
+ * Instance of a federate specification.
  *
-Copyright (c) 2020, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
-
+ * <p>Copyright (c) 2020, The University of California at Berkeley.
+ *
+ * <p>Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * <p>1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * <p>2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials provided with
+ * the distribution.
+ *
+ * <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * *************
+ */
 package org.lflang.federated.generator;
 
+import com.google.common.base.Objects;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -35,13 +36,11 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.eclipse.emf.ecore.EObject;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.TargetConfig;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.serialization.SupportedSerializers;
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.PortInstance;
@@ -69,669 +68,622 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.lf.Variable;
 import org.lflang.util.Pair;
 
-import com.google.common.base.Objects;
-
-
-
 /**
- * Instance of a federate, or marker that no federation has been defined
- * (if isSingleton() returns true) FIXME: this comment makes no sense.
- * Every top-level reactor (contained
- * directly by the main reactor) is a federate, so there will be one
- * instance of this class for each top-level reactor.
+ * Instance of a federate, or marker that no federation has been defined (if isSingleton() returns
+ * true) FIXME: this comment makes no sense. Every top-level reactor (contained directly by the main
+ * reactor) is a federate, so there will be one instance of this class for each top-level reactor.
  *
  * @author Edward A. Lee
  * @author Soroush Bateni
  */
 public class FederateInstance { // why does this not extend ReactorInstance?
 
-    /**
-     * Construct a new instance with the specified instantiation of
-     * of a top-level reactor. The federate will be given the specified
-     * integer ID.
-     * @param instantiation The instantiation of a top-level reactor,
-     *  or null if no federation has been defined.
-     * @param id The federate ID.
-     * @param bankIndex If instantiation.widthSpec !== null, this gives the bank position.
-     * @param errorReporter The error reporter
-     */
-    public FederateInstance(
-            Instantiation instantiation,
-            int id,
-            int bankIndex,
-            TargetConfig targetConfig,
-            ErrorReporter errorReporter) {
-        this.instantiation = instantiation;
-        this.id = id;
-        this.bankIndex = bankIndex;
-        this.errorReporter = errorReporter;
-        this.targetConfig = targetConfig;
-
-        if (instantiation != null) {
-            // If the instantiation is in a bank, then we have to append
-            // the bank index to the name.
-            if (instantiation.getWidthSpec() != null) {
-                this.name = "federate__" + instantiation.getName() + "__" + bankIndex;
-            } else {
-                this.name = "federate__" + instantiation.getName();
-            }
-        }
+  /**
+   * Construct a new instance with the specified instantiation of of a top-level reactor. The
+   * federate will be given the specified integer ID.
+   *
+   * @param instantiation The instantiation of a top-level reactor, or null if no federation has
+   *     been defined.
+   * @param id The federate ID.
+   * @param bankIndex If instantiation.widthSpec !== null, this gives the bank position.
+   * @param errorReporter The error reporter
+   */
+  public FederateInstance(
+      Instantiation instantiation,
+      int id,
+      int bankIndex,
+      TargetConfig targetConfig,
+      ErrorReporter errorReporter) {
+    this.instantiation = instantiation;
+    this.id = id;
+    this.bankIndex = bankIndex;
+    this.errorReporter = errorReporter;
+    this.targetConfig = targetConfig;
+
+    if (instantiation != null) {
+      // If the instantiation is in a bank, then we have to append
+      // the bank index to the name.
+      if (instantiation.getWidthSpec() != null) {
+        this.name = "federate__" + instantiation.getName() + "__" + bankIndex;
+      } else {
+        this.name = "federate__" + instantiation.getName();
+      }
     }
-
-    /////////////////////////////////////////////
-    //// Public Fields
-
-    /**
-     * The position within a bank of reactors for this federate.
-     * This is 0 if the instantiation is not a bank of reactors.
-     */
-    public int bankIndex = 0;
-
-    /**
-     * A list of outputs that can be triggered directly or indirectly by physical actions.
-     */
-    public Set<Expression> outputsConnectedToPhysicalActions = new LinkedHashSet<>();
-
-    /**
-     * The host, if specified using the 'at' keyword.
-     */
-    public String host = "localhost";
-
-
-    /**
-     * The instantiation of the top-level reactor, or null if there is no federation.
-     */
-    public Instantiation instantiation;
-    public Instantiation getInstantiation() {
-        return instantiation;
+  }
+
+  /////////////////////////////////////////////
+  //// Public Fields
+
+  /**
+   * The position within a bank of reactors for this federate. This is 0 if the instantiation is not
+   * a bank of reactors.
+   */
+  public int bankIndex = 0;
+
+  /** A list of outputs that can be triggered directly or indirectly by physical actions. */
+  public Set<Expression> outputsConnectedToPhysicalActions = new LinkedHashSet<>();
+
+  /** The host, if specified using the 'at' keyword. */
+  public String host = "localhost";
+
+  /** The instantiation of the top-level reactor, or null if there is no federation. */
+  public Instantiation instantiation;
+
+  public Instantiation getInstantiation() {
+    return instantiation;
+  }
+
+  /** A list of individual connections between federates */
+  public Set<FedConnectionInstance> connections = new HashSet<>();
+
+  /**
+   * Map from the federates that this federate receives messages from to the delays on connections
+   * from that federate. The delay set may include null, meaning that there is a connection from the
+   * federate instance that has no delay.
+   */
+  public Map<FederateInstance, Set<Expression>> dependsOn = new LinkedHashMap<>();
+
+  /** The directory, if specified using the 'at' keyword. */
+  public String dir = null;
+
+  /** The port, if specified using the 'at' keyword. */
+  public int port = 0;
+
+  /**
+   * Map from the federates that this federate sends messages to to the delays on connections to
+   * that federate. The delay set may may include null, meaning that there is a connection from the
+   * federate instance that has no delay.
+   */
+  public Map<FederateInstance, Set<Expression>> sendsTo = new LinkedHashMap<>();
+
+  /** The user, if specified using the 'at' keyword. */
+  public String user = null;
+
+  /** The integer ID of this federate. */
+  public int id = 0;
+
+  /**
+   * The name of this federate instance. This will be the instantiation name, possibly appended with
+   * "__n", where n is the bank position of this instance if the instantiation is of a bank of
+   * reactors.
+   */
+  public String name = "Unnamed";
+
+  /**
+   * List of networkMessage actions. Each of these handles a message received from another federate
+   * over the network. The ID of receiving port is simply the position of the action in the list.
+   * The sending federate needs to specify this ID.
+   */
+  public List<Action> networkMessageActions = new ArrayList<>();
+
+  /**
+   * A set of federates with which this federate has an inbound connection There will only be one
+   * physical connection even if federate A has defined multiple physical connections to federate B.
+   * The message handler on federate A will be responsible for including the appropriate information
+   * in the message header (such as port ID) to help the receiver distinguish different events.
+   */
+  public Set<FederateInstance> inboundP2PConnections = new LinkedHashSet<>();
+
+  /**
+   * A list of federate with which this federate has an outbound physical connection. There will
+   * only be one physical connection even if federate A has defined multiple physical connections to
+   * federate B. The message handler on federate B will be responsible for distinguishing the
+   * incoming messages by parsing their header and scheduling the appropriate action.
+   */
+  public Set<FederateInstance> outboundP2PConnections = new LinkedHashSet<>();
+
+  /**
+   * A list of triggers for network input control reactions. This is used to trigger all the input
+   * network control reactions that might be nested in a hierarchy.
+   */
+  public List<Action> networkInputControlReactionsTriggers = new ArrayList<>();
+
+  /**
+   * The triggers that trigger the output control reactions of this federate.
+   *
+   * <p>The network output control reactions send a PORT_ABSENT message for a network output port,
+   * if it is absent at the current tag, to notify all downstream federates that no value will be
+   * present on the given network port, allowing input control reactions on those federates to stop
+   * blocking.
+   */
+  public List<Action> networkOutputControlReactionsTriggers = new ArrayList<>();
+
+  /** Indicates whether the federate is remote or local */
+  public boolean isRemote = false;
+
+  /**
+   * List of generated network reactions (network receivers) that belong to this federate instance.
+   */
+  public List<Reaction> networkReceiverReactions = new ArrayList<>();
+
+  /** List of generated network reactions (network sender) that belong to this federate instance. */
+  public List<Reaction> networkSenderReactions = new ArrayList<>();
+
+  /**
+   * List of generated network control reactions (network sender) that belong to this federate
+   * instance.
+   */
+  public List<Reaction> networkSenderControlReactions = new ArrayList<>();
+
+  /**
+   * List of generated network reactors (network input and outputs) that belong to this federate
+   * instance.
+   */
+  public List<Reactor> networkReactors = new ArrayList<>();
+
+  /**
+   * List of relative dependencies between network input and output reactions belonging to the same
+   * federate that have zero logical delay between them.
+   */
+  public List<Pair<PortInstance, PortInstance>> networkReactionDependencyPairs = new ArrayList<>();
+
+  /**
+   * Mapping from a port instance of a connection to its associated network reaction. We populate
+   * this map as we process connections as a means of annotating intra-federate dependencies
+   */
+  public Map<PortInstance, Instantiation> networkPortToInstantiation = new HashMap<>();
+
+  /**
+   * List of generated network connections (network input and outputs) that belong to this federate
+   * instance.
+   */
+  public List<Connection> networkConnections = new ArrayList<>();
+
+  /**
+   * List of generated network instantiations (network input and outputs) that belong to this
+   * federate instance.
+   */
+  public List<Instantiation> networkSenderInstantiations = new ArrayList<>();
+
+  /**
+   * List of generated network instantiations (network input and outputs) that belong to this
+   * federate instance.
+   */
+  public List<Instantiation> networkReceiverInstantiations = new ArrayList<>();
+
+  /** Parsed target config of the federate. */
+  public TargetConfig targetConfig;
+
+  /** Keep a unique list of enabled serializers */
+  public HashSet<SupportedSerializers> enabledSerializers = new HashSet<>();
+
+  /** Keep a unique list of enabled serializers */
+  public List<TimeValue> stpOffsets = new ArrayList<>();
+
+  public Set<Long> currentSTPOffsets = new HashSet<>();
+
+  /** Keep a map of STP values to a list of network actions */
+  public HashMap<TimeValue, List<Action>> stpToNetworkActionMap = new HashMap<>();
+
+  /** Keep a map of network actions to their associated instantiations */
+  public HashMap<Action, Instantiation> networkActionToInstantiation = new HashMap<>();
+
+  /**
+   * Return true if the specified EObject should be included in the code generated for this
+   * federate.
+   *
+   * @param object An {@code EObject}
+   * @return True if this federate contains the EObject.
+   */
+  public boolean contains(EObject object) {
+    if (object instanceof Action) {
+      return contains((Action) object);
+    } else if (object instanceof Reaction) {
+      return contains((Reaction) object);
+    } else if (object instanceof Timer) {
+      return contains((Timer) object);
+    } else if (object instanceof ReactorDecl) {
+      return contains(this.instantiation, (ReactorDecl) object);
+    } else if (object instanceof Import) {
+      return contains((Import) object);
+    } else if (object instanceof Parameter) {
+      return contains((Parameter) object);
+    } else if (object instanceof StateVar) {
+      return true; // FIXME: Should we disallow state vars at the top level?
     }
-
-    /**
-     * A list of individual connections between federates
-     */
-    public Set<FedConnectionInstance> connections = new HashSet<>();
-
-    /**
-     * Map from the federates that this federate receives messages from
-     * to the delays on connections from that federate. The delay set
-     * may include null, meaning that there is a connection
-     * from the federate instance that has no delay.
-     */
-    public Map<FederateInstance, Set<Expression>> dependsOn = new LinkedHashMap<>();
-
-    /**
-     * The directory, if specified using the 'at' keyword.
-     */
-    public String dir = null;
-
-    /**
-     * The port, if specified using the 'at' keyword.
-     */
-    public int port = 0;
-
-    /**
-     * Map from the federates that this federate sends messages to
-     * to the delays on connections to that federate. The delay set
-     * may may include null, meaning that there is a connection
-     * from the federate instance that has no delay.
-     */
-    public Map<FederateInstance, Set<Expression>> sendsTo = new LinkedHashMap<>();
-
-    /**
-     * The user, if specified using the 'at' keyword.
-     */
-    public String user = null;
-
-    /**
-     * The integer ID of this federate.
-     */
-    public int id = 0;
-
-
-    /**
-     * The name of this federate instance. This will be the instantiation
-     * name, possibly appended with "__n", where n is the bank position of
-     * this instance if the instantiation is of a bank of reactors.
-     */
-    public String name = "Unnamed";
-
-    /**
-     * List of networkMessage actions. Each of these handles a message
-     *  received from another federate over the network. The ID of
-     *  receiving port is simply the position of the action in the list.
-     *  The sending federate needs to specify this ID.
-     */
-    public List<Action> networkMessageActions = new ArrayList<>();
-
-    /**
-     * A set of federates with which this federate has an inbound connection
-     * There will only be one physical connection even if federate A has defined multiple
-     * physical connections to federate B. The message handler on federate A will be
-     * responsible for including the appropriate information in the message header (such as port ID)
-     * to help the receiver distinguish different events.
-     */
-    public Set<FederateInstance> inboundP2PConnections = new LinkedHashSet<>();
-
-    /**
-     * A list of federate with which this federate has an outbound physical connection.
-     * There will only be one physical connection even if federate A has defined multiple
-     * physical connections to federate B. The message handler on federate B will be
-     * responsible for distinguishing the incoming messages by parsing their header and
-     * scheduling the appropriate action.
-     */
-    public Set<FederateInstance> outboundP2PConnections = new LinkedHashSet<>();
-
-    /**
-     * A list of triggers for network input control reactions. This is used to trigger
-     * all the input network control reactions that might be nested in a hierarchy.
-     */
-    public List<Action> networkInputControlReactionsTriggers = new ArrayList<>();
-
-    /**
-     * The triggers that trigger the output control reactions of this
-     * federate.
-     *
-     * The network output control reactions send a PORT_ABSENT message for a network output port,
-     * if it is absent at the current tag, to notify all downstream federates that no value will
-     * be present on the given network port, allowing input control reactions on those federates
-     * to stop blocking.
-     */
-    public List<Action> networkOutputControlReactionsTriggers = new ArrayList<>();
-    
-    /**
-     * Indicates whether the federate is remote or local
-     */
-    public boolean isRemote = false;
-
-    /**
-     * List of generated network reactions (network receivers) that belong to this federate instance.
-     */
-    public List<Reaction> networkReceiverReactions = new ArrayList<>();
-
-    /**
-     * List of generated network reactions (network sender) that belong to this federate instance.
-     */
-    public List<Reaction> networkSenderReactions = new ArrayList<>();
-
-    /**
-     * List of generated network control reactions (network sender) that belong to this federate instance.
-     */
-    public List<Reaction> networkSenderControlReactions = new ArrayList<>();
-    
-
-    /**
-     * List of generated network reactors (network input and outputs) that
-     * belong to this federate instance.
-     */
-    public List<Reactor> networkReactors = new ArrayList<>();
-
-
-    /**
-     * List of relative dependencies between network input and output reactions belonging to
-     * the same federate that have zero logical delay between them.
-     */
-    public List<Pair<PortInstance, PortInstance>> networkReactionDependencyPairs = new ArrayList<>();
-
-    /**
-     * Mapping from a port instance of a connection to its associated network reaction. We populate
-     * this map as we process connections as a means of annotating intra-federate dependencies
-     */
-    public Map<PortInstance, Instantiation> networkPortToInstantiation = new HashMap<>();
-
-    /**
-     * List of generated network connections (network input and outputs) that
-     * belong to this federate instance.
-     */
-    public List<Connection> networkConnections = new ArrayList<>();
-
-
-    /**
-     * List of generated network instantiations (network input and outputs) that
-     * belong to this federate instance.
-     */
-    public List<Instantiation> networkSenderInstantiations = new ArrayList<>();
-
-    /**
-     * List of generated network instantiations (network input and outputs) that
-     * belong to this federate instance.
-     */
-    public List<Instantiation> networkReceiverInstantiations = new ArrayList<>();
-
-    /**
-     * Parsed target config of the federate.
-     */
-    public TargetConfig targetConfig;
-
-    /**
-     * Keep a unique list of enabled serializers
-     */
-    public HashSet<SupportedSerializers> enabledSerializers = new HashSet<>();
-
-    /**
-     * Keep a unique list of enabled serializers
-     */
-    public List<TimeValue> stpOffsets = new ArrayList<>();
-
-    public Set<Long> currentSTPOffsets = new HashSet<>();
-
-    /**
-     * Keep a map of STP values to a list of network actions
-     */
-    public HashMap<TimeValue, List<Action>> stpToNetworkActionMap = new HashMap<>(); 
-
-    /**
-     * Keep a map of network actions to their associated instantiations
-     */
-    public HashMap<Action, Instantiation> networkActionToInstantiation = new HashMap<>(); 
-
-    /**
-     * Return true if the specified EObject should be included in the code
-     * generated for this federate.
-     *
-     * @param object An {@code EObject}
-     * @return True if this federate contains the EObject.
-     */
-    public boolean contains(EObject object) {
-        if (object instanceof Action) {
-            return contains((Action)object);
-        } else if (object instanceof Reaction) {
-            return contains((Reaction)object);
-        } else if (object instanceof Timer) {
-            return contains((Timer)object);
-        } else if (object instanceof ReactorDecl) {
-            return contains(this.instantiation, (ReactorDecl)object);
-        } else if (object instanceof Import) {
-            return contains((Import)object);
-        } else if (object instanceof Parameter) {
-            return contains((Parameter)object);
-        } else if (object instanceof StateVar) {
-            return true; // FIXME: Should we disallow state vars at the top level?
-        }
-        throw new UnsupportedOperationException("EObject class "+object.eClass().getName()+" not supported.");
+    throw new UnsupportedOperationException(
+        "EObject class " + object.eClass().getName() + " not supported.");
+  }
+
+  /**
+   * Return true if the specified reactor belongs to this federate.
+   *
+   * @param instantiation The instantiation to look inside
+   * @param reactor The reactor declaration to find
+   */
+  private boolean contains(Instantiation instantiation, ReactorDecl reactor) {
+
+    if (instantiation.getReactorClass().equals(ASTUtils.toDefinition(reactor))) {
+      return true;
     }
 
-    /**
-     * Return true if the specified reactor belongs to this federate.
-     * @param instantiation The instantiation to look inside
-     * @param reactor The reactor declaration to find
-     */
-    private boolean contains(
-        Instantiation instantiation,
-        ReactorDecl reactor
-    ) {
-
-        if (instantiation.getReactorClass().equals(ASTUtils.toDefinition(reactor))) {
-            return true;
-        }
-
-        boolean instantiationsCheck = false;
-        if (networkReactors.contains(ASTUtils.toDefinition(reactor))){
-            return true;
-        }
-        // For a federate, we don't need to look inside imported reactors.
-        if (instantiation.getReactorClass() instanceof Reactor reactorDef) {
-            for (Instantiation child : reactorDef.getInstantiations()) {
-                instantiationsCheck |= contains(child, reactor);
-            }
-        }
-        return instantiationsCheck;
+    boolean instantiationsCheck = false;
+    if (networkReactors.contains(ASTUtils.toDefinition(reactor))) {
+      return true;
     }
-
-    /**
-     * Return true if the specified import should be included in the code generated for this federate.
-     * @param imp The import
-     */
-    private boolean contains(Import imp) {
-        for (ImportedReactor reactor : imp.getReactorClasses()) {
-            if (contains(reactor)) {
-                return true;
-            }
-        }
-        return false;
+    // For a federate, we don't need to look inside imported reactors.
+    if (instantiation.getReactorClass() instanceof Reactor reactorDef) {
+      for (Instantiation child : reactorDef.getInstantiations()) {
+        instantiationsCheck |= contains(child, reactor);
+      }
     }
-
-    /**
-     * Return true if the specified parameter should be included in the code generated for this federate.
-     * @param param The parameter
-     */
-    private boolean contains(Parameter param) {
-        boolean returnValue = false;
-        // Check if param is referenced in this federate's instantiation
-        returnValue = instantiation.getParameters().stream().anyMatch(
-            assignment -> assignment.getRhs()
-                                    .getExprs()
-                                    .stream()
-                                    .filter(
-                                        it -> it instanceof ParameterReference
-                                    )
-                                    .map(it -> ((ParameterReference) it).getParameter())
-                                    .toList()
-                                    .contains(param)
-        );
-        // If there are any user-defined top-level reactions, they could access
-        // the parameters, so we need to include the parameter.
-        var topLevelUserDefinedReactions = ((Reactor) instantiation.eContainer())
-            .getReactions().stream().filter(
-                r -> !networkReceiverReactions.contains(r) && !networkSenderReactions.contains(r) && contains(r)
-            ).collect(Collectors.toCollection(ArrayList::new));
-        returnValue |= !topLevelUserDefinedReactions.isEmpty();
-        return returnValue;
+    return instantiationsCheck;
+  }
+
+  /**
+   * Return true if the specified import should be included in the code generated for this federate.
+   *
+   * @param imp The import
+   */
+  private boolean contains(Import imp) {
+    for (ImportedReactor reactor : imp.getReactorClasses()) {
+      if (contains(reactor)) {
+        return true;
+      }
     }
-
-    /**
-     * Return true if the specified action should be included in the code generated
-     * for this federate. This means that either the action is used as a trigger,
-     * a source, or an effect in a top-level reaction that belongs to this federate.
-     * This returns true if the program is not federated.
-     *
-     * @param action The action
-     * @return True if this federate contains the action.
-     */
-    private boolean contains(Action action) {
-        Reactor reactor  = ASTUtils.getEnclosingReactor(action);
-
-        // If the action is used as a trigger, a source, or an effect for a top-level reaction
-        // that belongs to this federate, then generate it.
-        for (Reaction react : ASTUtils.allReactions(reactor)) {
-            if (contains(react)) {
-                // Look in triggers
-                for (TriggerRef trigger : convertToEmptyListIfNull(react.getTriggers())) {
-                    if (trigger instanceof VarRef triggerAsVarRef) {
-                        if (Objects.equal(triggerAsVarRef.getVariable(), action)) {
-                            return true;
-                        }
-                    }
-                }
-                // Look in sources
-                for (VarRef source : convertToEmptyListIfNull(react.getSources())) {
-                    if (Objects.equal(source.getVariable(), action)) {
-                        return true;
-                    }
-                }
-                // Look in effects
-                for (VarRef effect : convertToEmptyListIfNull(react.getEffects())) {
-                    if (Objects.equal(effect.getVariable(), action)) {
-                        return true;
-                    }
-                }
+    return false;
+  }
+
+  /**
+   * Return true if the specified parameter should be included in the code generated for this
+   * federate.
+   *
+   * @param param The parameter
+   */
+  private boolean contains(Parameter param) {
+    boolean returnValue = false;
+    // Check if param is referenced in this federate's instantiation
+    returnValue =
+        instantiation.getParameters().stream()
+            .anyMatch(
+                assignment ->
+                    assignment.getRhs().getExprs().stream()
+                        .filter(it -> it instanceof ParameterReference)
+                        .map(it -> ((ParameterReference) it).getParameter())
+                        .toList()
+                        .contains(param));
+    // If there are any user-defined top-level reactions, they could access
+    // the parameters, so we need to include the parameter.
+    var topLevelUserDefinedReactions =
+        ((Reactor) instantiation.eContainer())
+            .getReactions().stream()
+                .filter(
+                    r ->
+                        !networkReceiverReactions.contains(r)
+                            && !networkSenderReactions.contains(r)
+                            && contains(r))
+                .collect(Collectors.toCollection(ArrayList::new));
+    returnValue |= !topLevelUserDefinedReactions.isEmpty();
+    return returnValue;
+  }
+
+  /**
+   * Return true if the specified action should be included in the code generated for this federate.
+   * This means that either the action is used as a trigger, a source, or an effect in a top-level
+   * reaction that belongs to this federate. This returns true if the program is not federated.
+   *
+   * @param action The action
+   * @return True if this federate contains the action.
+   */
+  private boolean contains(Action action) {
+    Reactor reactor = ASTUtils.getEnclosingReactor(action);
+
+    // If the action is used as a trigger, a source, or an effect for a top-level reaction
+    // that belongs to this federate, then generate it.
+    for (Reaction react : ASTUtils.allReactions(reactor)) {
+      if (contains(react)) {
+        // Look in triggers
+        for (TriggerRef trigger : convertToEmptyListIfNull(react.getTriggers())) {
+          if (trigger instanceof VarRef triggerAsVarRef) {
+            if (Objects.equal(triggerAsVarRef.getVariable(), action)) {
+              return true;
             }
+          }
         }
-
-        return false;
-    }
-
-    /**
-     * Return true if the specified reaction should be included in the code generated for this
-     * federate at the top-level. This means that if the reaction is triggered by or
-     * sends data to a port of a contained reactor, then that reaction
-     * is in the federate. Otherwise, return false.
-     *
-     * NOTE: This method assumes that it will not be called with reaction arguments
-     * that are within other federates. It should only be called on reactions that are
-     * either at the top level or within this federate. For this reason, for any reaction
-     * not at the top level, it returns true.
-     *
-     * @param reaction The reaction.
-     */
-    private boolean contains(Reaction reaction) {
-        Reactor reactor  = ASTUtils.getEnclosingReactor(reaction);
-
-        assert reactor != null;
-        if (!reactor.getReactions().contains(reaction)) return false;
-        
-        if (networkReceiverReactions.contains(reaction) || networkSenderReactions.contains(reaction)) {
-            // Reaction is a network reaction that belongs to this federate
+        // Look in sources
+        for (VarRef source : convertToEmptyListIfNull(react.getSources())) {
+          if (Objects.equal(source.getVariable(), action)) {
             return true;
+          }
         }
-
-
-        int reactionBankIndex = FedASTUtils.getReactionBankIndex(reaction);
-        if (reactionBankIndex >= 0 && this.bankIndex >= 0 && reactionBankIndex != this.bankIndex) {
-            return false;
-        }
-
-        // If this has been called before, then the result of the
-        // following check is cached.
-        if (excludeReactions != null) {
-            return !excludeReactions.contains(reaction);
+        // Look in effects
+        for (VarRef effect : convertToEmptyListIfNull(react.getEffects())) {
+          if (Objects.equal(effect.getVariable(), action)) {
+            return true;
+          }
         }
+      }
+    }
 
-        indexExcludedTopLevelReactions(reactor);
-
-        return !excludeReactions.contains(reaction);
+    return false;
+  }
+
+  /**
+   * Return true if the specified reaction should be included in the code generated for this
+   * federate at the top-level. This means that if the reaction is triggered by or sends data to a
+   * port of a contained reactor, then that reaction is in the federate. Otherwise, return false.
+   *
+   * <p>NOTE: This method assumes that it will not be called with reaction arguments that are within
+   * other federates. It should only be called on reactions that are either at the top level or
+   * within this federate. For this reason, for any reaction not at the top level, it returns true.
+   *
+   * @param reaction The reaction.
+   */
+  private boolean contains(Reaction reaction) {
+    Reactor reactor = ASTUtils.getEnclosingReactor(reaction);
+
+    assert reactor != null;
+    if (!reactor.getReactions().contains(reaction)) return false;
+
+    if (networkReceiverReactions.contains(reaction) || networkSenderReactions.contains(reaction)) {
+      // Reaction is a network reaction that belongs to this federate
+      return true;
     }
 
-    /**
-     * Return true if the specified timer should be included in the code generated
-     * for the federate. This means that the timer is used as a trigger
-     * in a top-level reaction that belongs to this federate.
-     * This also returns true if the program is not federated.
-     *
-     * @return True if this federate contains the action in the specified reactor
-     */
-    private boolean contains(Timer timer) {
-        Reactor reactor  = ASTUtils.getEnclosingReactor(timer);
-
-        // If the action is used as a trigger, a source, or an effect for a top-level reaction
-        // that belongs to this federate, then generate it.
-        for (Reaction r : ASTUtils.allReactions(reactor)) {
-            if (contains(r)) {
-                // Look in triggers
-                for (TriggerRef trigger : convertToEmptyListIfNull(r.getTriggers())) {
-                    if (trigger instanceof VarRef triggerAsVarRef) {
-                        if (Objects.equal(triggerAsVarRef.getVariable(), timer)) {
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
+    int reactionBankIndex = FedASTUtils.getReactionBankIndex(reaction);
+    if (reactionBankIndex >= 0 && this.bankIndex >= 0 && reactionBankIndex != this.bankIndex) {
+      return false;
+    }
 
-        return false;
+    // If this has been called before, then the result of the
+    // following check is cached.
+    if (excludeReactions != null) {
+      return !excludeReactions.contains(reaction);
     }
 
-    /**
-     * Return true if the specified reactor instance or any parent
-     * reactor instance is contained by this federate.
-     * If the specified instance is the top-level reactor, return true
-     * (the top-level reactor belongs to all federates).
-     * If this federate instance is a singleton, then return true if the
-     * instance is non null.
-     *
-     * NOTE: If the instance is bank within the top level, then this
-     * returns true even though only one of the bank members is in the federate.
-     *
-     * @param instance The reactor instance.
-     * @return True if this federate contains the reactor instance
-     */
-    public boolean contains(ReactorInstance instance) {
-        if (instance.getParent() == null) {
-            return true; // Top-level reactor
-        }
-        // Start with this instance, then check its parents.
-        ReactorInstance i = instance;
-        while (i != null) {
-            if (i.getDefinition() == instantiation) {
-                return true;
+    indexExcludedTopLevelReactions(reactor);
+
+    return !excludeReactions.contains(reaction);
+  }
+
+  /**
+   * Return true if the specified timer should be included in the code generated for the federate.
+   * This means that the timer is used as a trigger in a top-level reaction that belongs to this
+   * federate. This also returns true if the program is not federated.
+   *
+   * @return True if this federate contains the action in the specified reactor
+   */
+  private boolean contains(Timer timer) {
+    Reactor reactor = ASTUtils.getEnclosingReactor(timer);
+
+    // If the action is used as a trigger, a source, or an effect for a top-level reaction
+    // that belongs to this federate, then generate it.
+    for (Reaction r : ASTUtils.allReactions(reactor)) {
+      if (contains(r)) {
+        // Look in triggers
+        for (TriggerRef trigger : convertToEmptyListIfNull(r.getTriggers())) {
+          if (trigger instanceof VarRef triggerAsVarRef) {
+            if (Objects.equal(triggerAsVarRef.getVariable(), timer)) {
+              return true;
             }
-            i = i.getParent();
+          }
         }
-        return false;
+      }
     }
 
-    /**
-     * Build an index of reactions at the top-level (in the
-     * federatedReactor) that don't belong to this federate
-     * instance. This index is put in the excludeReactions
-     * class variable.
-     *
-     * @param federatedReactor The top-level federated reactor
-     */
-    private void indexExcludedTopLevelReactions(Reactor federatedReactor) {
-        boolean inFederate = false;
-        if (excludeReactions != null) {
-            throw new IllegalStateException("The index for excluded reactions at the top level is already built.");
-        }
+    return false;
+  }
+
+  /**
+   * Return true if the specified reactor instance or any parent reactor instance is contained by
+   * this federate. If the specified instance is the top-level reactor, return true (the top-level
+   * reactor belongs to all federates). If this federate instance is a singleton, then return true
+   * if the instance is non null.
+   *
+   * <p>NOTE: If the instance is bank within the top level, then this returns true even though only
+   * one of the bank members is in the federate.
+   *
+   * @param instance The reactor instance.
+   * @return True if this federate contains the reactor instance
+   */
+  public boolean contains(ReactorInstance instance) {
+    if (instance.getParent() == null) {
+      return true; // Top-level reactor
+    }
+    // Start with this instance, then check its parents.
+    ReactorInstance i = instance;
+    while (i != null) {
+      if (i.getDefinition() == instantiation) {
+        return true;
+      }
+      i = i.getParent();
+    }
+    return false;
+  }
+
+  /**
+   * Build an index of reactions at the top-level (in the federatedReactor) that don't belong to
+   * this federate instance. This index is put in the excludeReactions class variable.
+   *
+   * @param federatedReactor The top-level federated reactor
+   */
+  private void indexExcludedTopLevelReactions(Reactor federatedReactor) {
+    boolean inFederate = false;
+    if (excludeReactions != null) {
+      throw new IllegalStateException(
+          "The index for excluded reactions at the top level is already built.");
+    }
 
-        excludeReactions = new LinkedHashSet<>();
-
-        // Construct the set of excluded reactions for this federate.
-        // If a reaction is a network reaction that belongs to this federate, we
-        // don't need to perform this analysis.
-        Iterable<Reaction> reactions = ASTUtils.allReactions(federatedReactor).stream().filter(it -> !networkReceiverReactions.contains(it))
-            .filter(it -> !networkSenderReactions.contains(it)).collect(Collectors.toList());
-        for (Reaction react : reactions) {
-            // Create a collection of all the VarRefs (i.e., triggers, sources, and effects) in the react
-            // signature that are ports that reference federates.
-            // We then later check that all these VarRefs reference this federate. If not, we will add this
-            // react to the list of reactions that have to be excluded (note that mixing VarRefs from
-            // different federates is not allowed).
-            List<VarRef> allVarRefsReferencingFederates = new ArrayList<>();
-            // Add all the triggers that are outputs
-            Stream<VarRef> triggersAsVarRef = react.getTriggers().stream().filter(it -> it instanceof VarRef).map(it -> (VarRef) it);
-            allVarRefsReferencingFederates.addAll(
-                triggersAsVarRef.filter(it -> it.getVariable() instanceof Output).toList()
-            );
-            // Add all the sources that are outputs
-            allVarRefsReferencingFederates.addAll(
-                react.getSources().stream().filter(it -> it.getVariable() instanceof Output).toList()
-            );
-            // Add all the effects that are inputs
-            allVarRefsReferencingFederates.addAll(
-                react.getEffects().stream().filter(it -> it.getVariable() instanceof Input).toList()
-            );
-            inFederate = containsAllVarRefs(allVarRefsReferencingFederates);
-            if (!inFederate) {
-                excludeReactions.add(react);
-            }
+    excludeReactions = new LinkedHashSet<>();
+
+    // Construct the set of excluded reactions for this federate.
+    // If a reaction is a network reaction that belongs to this federate, we
+    // don't need to perform this analysis.
+    Iterable<Reaction> reactions =
+        ASTUtils.allReactions(federatedReactor).stream()
+            .filter(it -> !networkReceiverReactions.contains(it))
+            .filter(it -> !networkSenderReactions.contains(it))
+            .collect(Collectors.toList());
+    for (Reaction react : reactions) {
+      // Create a collection of all the VarRefs (i.e., triggers, sources, and effects) in the react
+      // signature that are ports that reference federates.
+      // We then later check that all these VarRefs reference this federate. If not, we will add
+      // this
+      // react to the list of reactions that have to be excluded (note that mixing VarRefs from
+      // different federates is not allowed).
+      List<VarRef> allVarRefsReferencingFederates = new ArrayList<>();
+      // Add all the triggers that are outputs
+      Stream<VarRef> triggersAsVarRef =
+          react.getTriggers().stream().filter(it -> it instanceof VarRef).map(it -> (VarRef) it);
+      allVarRefsReferencingFederates.addAll(
+          triggersAsVarRef.filter(it -> it.getVariable() instanceof Output).toList());
+      // Add all the sources that are outputs
+      allVarRefsReferencingFederates.addAll(
+          react.getSources().stream().filter(it -> it.getVariable() instanceof Output).toList());
+      // Add all the effects that are inputs
+      allVarRefsReferencingFederates.addAll(
+          react.getEffects().stream().filter(it -> it.getVariable() instanceof Input).toList());
+      inFederate = containsAllVarRefs(allVarRefsReferencingFederates);
+      if (!inFederate) {
+        excludeReactions.add(react);
+      }
+    }
+  }
+
+  /**
+   * Return true if all members of 'varRefs' belong to this federate.
+   *
+   * <p>As a convenience measure, if some members of 'varRefs' are from different federates, also
+   * report an error.
+   *
+   * @param varRefs A collection of VarRefs
+   */
+  private boolean containsAllVarRefs(Iterable<VarRef> varRefs) {
+    var referencesFederate = false;
+    var inFederate = true;
+    for (VarRef varRef : varRefs) {
+      if (varRef.getContainer() == this.instantiation) {
+        referencesFederate = true;
+      } else {
+        if (referencesFederate) {
+          errorReporter.reportError(
+              varRef,
+              "Mixed triggers and effects from" + " different federates. This is not permitted");
         }
+        inFederate = false;
+      }
     }
-
-    /**
-     * Return true if all members of 'varRefs' belong to this federate.
-     *
-     * As a convenience measure, if some members of 'varRefs' are from
-     * different federates, also report an error.
-     *
-     * @param varRefs A collection of VarRefs
-     */
-    private boolean containsAllVarRefs(Iterable<VarRef> varRefs) {
-        var referencesFederate = false;
-        var inFederate = true;
-        for (VarRef varRef : varRefs) {
-            if (varRef.getContainer() == this.instantiation) {
-                referencesFederate = true;
-            } else {
-                if (referencesFederate) {
-                    errorReporter.reportError(varRef,
-                                              "Mixed triggers and effects from"
-                                                  +
-                                                  " different federates. This is not permitted");
-                }
-                inFederate = false;
-            }
+    return inFederate;
+  }
+
+  /**
+   * Find output ports that are connected to a physical action trigger upstream in the same reactor.
+   * Return a list of such outputs paired with the minimum delay from the nearest physical action.
+   *
+   * @param instance The reactor instance containing the output ports
+   * @return A LinkedHashMap<Output, TimeValue>
+   */
+  public LinkedHashMap<Output, TimeValue> findOutputsConnectedToPhysicalActions(
+      ReactorInstance instance) {
+    LinkedHashMap<Output, TimeValue> physicalActionToOutputMinDelay = new LinkedHashMap<>();
+    // Find reactions that write to the output port of the reactor
+    for (PortInstance output : instance.outputs) {
+      for (ReactionInstance reaction : output.getDependsOnReactions()) {
+        TimeValue minDelay = findNearestPhysicalActionTrigger(reaction);
+        if (!Objects.equal(minDelay, TimeValue.MAX_VALUE)) {
+          physicalActionToOutputMinDelay.put((Output) output.getDefinition(), minDelay);
         }
-        return inFederate;
+      }
     }
-
-    /**
-     * Find output ports that are connected to a physical action trigger upstream
-     * in the same reactor. Return a list of such outputs paired with the minimum delay
-     * from the nearest physical action.
-     * @param instance The reactor instance containing the output ports
-     * @return A LinkedHashMap<Output, TimeValue>
-     */
-    public LinkedHashMap<Output, TimeValue> findOutputsConnectedToPhysicalActions(ReactorInstance instance) {
-        LinkedHashMap<Output, TimeValue> physicalActionToOutputMinDelay = new LinkedHashMap<>();
-        // Find reactions that write to the output port of the reactor
-        for (PortInstance output : instance.outputs) {
-            for (ReactionInstance reaction : output.getDependsOnReactions()) {
-                TimeValue minDelay = findNearestPhysicalActionTrigger(reaction);
-                if (!Objects.equal(minDelay, TimeValue.MAX_VALUE)) {
-                    physicalActionToOutputMinDelay.put((Output) output.getDefinition(), minDelay);
-                }
+    return physicalActionToOutputMinDelay;
+  }
+
+  /**
+   * Return a list of federates that are upstream of this federate and have a zero-delay (direct)
+   * connection to this federate.
+   */
+  public List<FederateInstance> getZeroDelayImmediateUpstreamFederates() {
+    return this.dependsOn.entrySet().stream()
+        .filter(e -> e.getValue().contains(null))
+        .map(Map.Entry::getKey)
+        .toList();
+  }
+
+  @Override
+  public String toString() {
+    return "Federate "
+        + id
+        + ": "
+        + ((instantiation != null) ? instantiation.getName() : "no name");
+  }
+
+  /////////////////////////////////////////////
+  //// Private Fields
+
+  /** Cached result of analysis of which reactions to exclude from main. */
+  private Set<Reaction> excludeReactions = null;
+
+  /** An error reporter */
+  private final ErrorReporter errorReporter;
+
+  /**
+   * Find the nearest (shortest) path to a physical action trigger from this 'reaction' in terms of
+   * minimum delay.
+   *
+   * @param reaction The reaction to start with
+   * @return The minimum delay found to the nearest physical action and TimeValue.MAX_VALUE
+   *     otherwise
+   */
+  public TimeValue findNearestPhysicalActionTrigger(ReactionInstance reaction) {
+    TimeValue minDelay = TimeValue.MAX_VALUE;
+    for (TriggerInstance<? extends Variable> trigger : reaction.triggers) {
+      if (trigger.getDefinition() instanceof Action action) {
+        ActionInstance actionInstance = (ActionInstance) trigger;
+        if (action.getOrigin() == ActionOrigin.PHYSICAL) {
+          if (actionInstance.getMinDelay().isEarlierThan(minDelay)) {
+            minDelay = actionInstance.getMinDelay();
+          }
+        } else if (action.getOrigin() == ActionOrigin.LOGICAL) {
+          // Logical action
+          // Follow it upstream inside the reactor
+          for (ReactionInstance uReaction : actionInstance.getDependsOnReactions()) {
+            // Avoid a loop
+            if (!Objects.equal(uReaction, reaction)) {
+              TimeValue uMinDelay =
+                  actionInstance.getMinDelay().add(findNearestPhysicalActionTrigger(uReaction));
+              if (uMinDelay.isEarlierThan(minDelay)) {
+                minDelay = uMinDelay;
+              }
             }
+          }
         }
-        return physicalActionToOutputMinDelay;
-    }
-
-    /**
-     * Return a list of federates that are upstream of this federate and have a
-     * zero-delay (direct) connection to this federate.
-     */
-    public List<FederateInstance> getZeroDelayImmediateUpstreamFederates() {
-        return this.dependsOn.entrySet()
-                                 .stream()
-                                 .filter(e -> e.getValue().contains(null))
-                                 .map(Map.Entry::getKey).toList();
-    }
 
-    @Override
-    public String toString() {
-        return "Federate " + id + ": "
-            + ((instantiation != null) ? instantiation.getName() : "no name");
-    }
-
-    /////////////////////////////////////////////
-    //// Private Fields
-
-    /**
-     * Cached result of analysis of which reactions to exclude from main.
-     */
-    private Set<Reaction> excludeReactions = null;
-
-    /**
-     * An error reporter
-     */
-    private final ErrorReporter errorReporter;
-
-    /**
-     * Find the nearest (shortest) path to a physical action trigger from this
-     * 'reaction' in terms of minimum delay.
-     *
-     * @param reaction The reaction to start with
-     * @return The minimum delay found to the nearest physical action and
-     *  TimeValue.MAX_VALUE otherwise
-     */
-    public TimeValue findNearestPhysicalActionTrigger(ReactionInstance reaction) {
-        TimeValue minDelay = TimeValue.MAX_VALUE;
-        for (TriggerInstance<? extends Variable> trigger : reaction.triggers) {
-            if (trigger.getDefinition() instanceof Action action) {
-                ActionInstance actionInstance = (ActionInstance) trigger;
-                if (action.getOrigin() == ActionOrigin.PHYSICAL) {
-                    if (actionInstance.getMinDelay().isEarlierThan(minDelay)) {
-                        minDelay = actionInstance.getMinDelay();
-                    }
-                } else if (action.getOrigin() == ActionOrigin.LOGICAL) {
-                    // Logical action
-                    // Follow it upstream inside the reactor
-                    for (ReactionInstance uReaction: actionInstance.getDependsOnReactions()) {
-                        // Avoid a loop
-                        if (!Objects.equal(uReaction, reaction)) {
-                            TimeValue uMinDelay = actionInstance.getMinDelay().add(findNearestPhysicalActionTrigger(uReaction));
-                            if (uMinDelay.isEarlierThan(minDelay)) {
-                                minDelay = uMinDelay;
-                            }
-                        }
-                    }
-                }
-
-            } else if (trigger.getDefinition() instanceof Output) {
-                // Outputs of contained reactions
-                PortInstance outputInstance = (PortInstance) trigger;
-                for (ReactionInstance uReaction: outputInstance.getDependsOnReactions()) {
-                    TimeValue uMinDelay = findNearestPhysicalActionTrigger(uReaction);
-                    if (uMinDelay.isEarlierThan(minDelay)) {
-                        minDelay = uMinDelay;
-                    }
-                }
-            }
+      } else if (trigger.getDefinition() instanceof Output) {
+        // Outputs of contained reactions
+        PortInstance outputInstance = (PortInstance) trigger;
+        for (ReactionInstance uReaction : outputInstance.getDependsOnReactions()) {
+          TimeValue uMinDelay = findNearestPhysicalActionTrigger(uReaction);
+          if (uMinDelay.isEarlierThan(minDelay)) {
+            minDelay = uMinDelay;
+          }
         }
-        return minDelay;
+      }
     }
+    return minDelay;
+  }
 
-    // TODO: Put this function into a utils file instead
-    private <T> List<T> convertToEmptyListIfNull(List<T> list) {
-        return list == null ? new ArrayList<>() : list;
-    }
+  // TODO: Put this function into a utils file instead
+  private <T> List<T> convertToEmptyListIfNull(List<T> list) {
+    return list == null ? new ArrayList<>() : list;
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/LineAdjustingErrorReporter.java b/org.lflang/src/org/lflang/federated/generator/LineAdjustingErrorReporter.java
index f483c228db..aa2f49b6da 100644
--- a/org.lflang/src/org/lflang/federated/generator/LineAdjustingErrorReporter.java
+++ b/org.lflang/src/org/lflang/federated/generator/LineAdjustingErrorReporter.java
@@ -2,10 +2,8 @@
 
 import java.nio.file.Path;
 import java.util.Map;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.ErrorReporter;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.Position;
@@ -13,116 +11,102 @@
 
 public class LineAdjustingErrorReporter implements ErrorReporter {
 
-    private final ErrorReporter parent;
-    private final Map<Path, CodeMap> codeMapMap;
-
-    public LineAdjustingErrorReporter(ErrorReporter parent, Map<Path, CodeMap> codeMapMap) {
-        this.parent = parent;
-        this.codeMapMap = codeMapMap;
-    }
-
-    @Override
-    public String reportError(String message) {
-        return parent.reportError(message);
-    }
-
-    @Override
-    public String reportWarning(String message) {
-        return parent.reportWarning(message);
-    }
-
-    @Override
-    public String reportInfo(String message) {
-        return parent.reportInfo(message);
-    }
-
-    @Override
-    public String reportError(EObject object, String message) {
-        return parent.reportError(object, message);
-    }
-
-    @Override
-    public String reportWarning(EObject object, String message) {
-        return parent.reportWarning(object, message);
-    }
-
-    @Override
-    public String reportInfo(EObject object, String message) {
-        return parent.reportInfo(object, message);
-    }
-
-    @Override
-    public String reportError(Path file, Integer line, String message) {
-        return report(file, line, message, DiagnosticSeverity.Error);
-    }
-
-    @Override
-    public String reportWarning(Path file, Integer line, String message) {
-        return report(file, line, message, DiagnosticSeverity.Warning);
-    }
-
-    @Override
-    public String reportInfo(Path file, Integer line, String message) {
-        return report(file, line, message, DiagnosticSeverity.Information);
-    }
-
-    private String report(Path file, Integer line, String message, DiagnosticSeverity severity) {
-        if (line == null) return report(file, severity, message);
-        var position = Position.fromOneBased(line, Integer.MAX_VALUE);
-        return report(
-            file,
-            severity,
-            message,
-            Position.fromZeroBased(position.getZeroBasedLine(), 0),
-            position
-        );
-    }
-
-    @Override
-    public String report(Path file, DiagnosticSeverity severity, String message) {
-        return ErrorReporter.super.report(file, severity, message);
-    }
-
-    @Override
-    public String report(Path file, DiagnosticSeverity severity, String message, int line) {
-        return ErrorReporter.super.report(file, severity, message, line);
-    }
-
-    @Override
-    public String report(
-        Path file,
-        DiagnosticSeverity severity,
-        String message,
-        Position startPos,
-        Position endPos
-    ) {
-        String ret = null;
-        if (codeMapMap.containsKey(file)) {
-            var relevantMap = codeMapMap.get(file);
-            for (Path lfSource : relevantMap.lfSourcePaths()) {
-                var adjustedRange = relevantMap.adjusted(
-                    lfSource,
-                    new Range(startPos, endPos)
-                );
-                ret = parent.report(
-                    lfSource,
-                    severity,
-                    message,
-                    adjustedRange.getStartInclusive().equals(Position.ORIGIN) ?
-                        Position.fromZeroBased(
-                            adjustedRange.getEndExclusive().getZeroBasedLine(),
-                            0
-                        ) : adjustedRange.getStartInclusive(),
-                    adjustedRange.getEndExclusive()
-                );
-            }
-        }
-        if (ret == null) return severity == DiagnosticSeverity.Error ? reportError(message) : reportWarning(message);
-        return ret;
-    }
-
-    @Override
-    public boolean getErrorsOccurred() {
-        return parent.getErrorsOccurred();
+  private final ErrorReporter parent;
+  private final Map<Path, CodeMap> codeMapMap;
+
+  public LineAdjustingErrorReporter(ErrorReporter parent, Map<Path, CodeMap> codeMapMap) {
+    this.parent = parent;
+    this.codeMapMap = codeMapMap;
+  }
+
+  @Override
+  public String reportError(String message) {
+    return parent.reportError(message);
+  }
+
+  @Override
+  public String reportWarning(String message) {
+    return parent.reportWarning(message);
+  }
+
+  @Override
+  public String reportInfo(String message) {
+    return parent.reportInfo(message);
+  }
+
+  @Override
+  public String reportError(EObject object, String message) {
+    return parent.reportError(object, message);
+  }
+
+  @Override
+  public String reportWarning(EObject object, String message) {
+    return parent.reportWarning(object, message);
+  }
+
+  @Override
+  public String reportInfo(EObject object, String message) {
+    return parent.reportInfo(object, message);
+  }
+
+  @Override
+  public String reportError(Path file, Integer line, String message) {
+    return report(file, line, message, DiagnosticSeverity.Error);
+  }
+
+  @Override
+  public String reportWarning(Path file, Integer line, String message) {
+    return report(file, line, message, DiagnosticSeverity.Warning);
+  }
+
+  @Override
+  public String reportInfo(Path file, Integer line, String message) {
+    return report(file, line, message, DiagnosticSeverity.Information);
+  }
+
+  private String report(Path file, Integer line, String message, DiagnosticSeverity severity) {
+    if (line == null) return report(file, severity, message);
+    var position = Position.fromOneBased(line, Integer.MAX_VALUE);
+    return report(
+        file, severity, message, Position.fromZeroBased(position.getZeroBasedLine(), 0), position);
+  }
+
+  @Override
+  public String report(Path file, DiagnosticSeverity severity, String message) {
+    return ErrorReporter.super.report(file, severity, message);
+  }
+
+  @Override
+  public String report(Path file, DiagnosticSeverity severity, String message, int line) {
+    return ErrorReporter.super.report(file, severity, message, line);
+  }
+
+  @Override
+  public String report(
+      Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
+    String ret = null;
+    if (codeMapMap.containsKey(file)) {
+      var relevantMap = codeMapMap.get(file);
+      for (Path lfSource : relevantMap.lfSourcePaths()) {
+        var adjustedRange = relevantMap.adjusted(lfSource, new Range(startPos, endPos));
+        ret =
+            parent.report(
+                lfSource,
+                severity,
+                message,
+                adjustedRange.getStartInclusive().equals(Position.ORIGIN)
+                    ? Position.fromZeroBased(adjustedRange.getEndExclusive().getZeroBasedLine(), 0)
+                    : adjustedRange.getStartInclusive(),
+                adjustedRange.getEndExclusive());
+      }
     }
+    if (ret == null)
+      return severity == DiagnosticSeverity.Error ? reportError(message) : reportWarning(message);
+    return ret;
+  }
+
+  @Override
+  public boolean getErrorsOccurred() {
+    return parent.getErrorsOccurred();
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/generator/SynchronizedErrorReporter.java b/org.lflang/src/org/lflang/federated/generator/SynchronizedErrorReporter.java
index 571d2de5c7..08c47c4cd3 100644
--- a/org.lflang/src/org/lflang/federated/generator/SynchronizedErrorReporter.java
+++ b/org.lflang/src/org/lflang/federated/generator/SynchronizedErrorReporter.java
@@ -1,83 +1,83 @@
 package org.lflang.federated.generator;
 
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.ErrorReporter;
 import org.lflang.generator.Position;
 
 public class SynchronizedErrorReporter implements ErrorReporter {
 
-    private final ErrorReporter parent;
-
-    public SynchronizedErrorReporter(ErrorReporter parent) {
-        this.parent = parent;
-    }
-
-    @Override
-    public synchronized String reportError(String message) {
-        return parent.reportError(message);
-    }
-
-    @Override
-    public synchronized String reportWarning(String message) {
-        return parent.reportWarning(message);
-    }
-
-    @Override
-    public synchronized String reportInfo(String message) {
-        return parent.reportInfo(message);
-    }
-
-    @Override
-    public synchronized String reportError(EObject object, String message) {
-        return parent.reportError(object, message);
-    }
-
-    @Override
-    public synchronized String reportWarning(EObject object, String message) {
-        return parent.reportWarning(object, message);
-    }
-
-    @Override
-    public synchronized String reportInfo(EObject object, String message) {
-        return parent.reportInfo(object, message);
-    }
-
-    @Override
-    public synchronized String reportError(Path file, Integer line, String message) {
-        return parent.reportError(file, line, message);
-    }
-
-    @Override
-    public synchronized String reportWarning(Path file, Integer line, String message) {
-        return parent.reportWarning(file, line, message);
-    }
-
-    @Override
-    public synchronized String reportInfo(Path file, Integer line, String message) {
-        return parent.reportInfo(file, line, message);
-    }
-
-    @Override
-    public synchronized String report(Path file, DiagnosticSeverity severity, String message) {
-        return parent.report(file, severity, message);
-    }
-
-    @Override
-    public synchronized String report(Path file, DiagnosticSeverity severity, String message, int line) {
-        return parent.report(file, severity, message, line);
-    }
-
-    @Override
-    public synchronized String report(Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
-        return parent.report(file, severity, message, startPos, endPos);
-    }
-
-    @Override
-    public synchronized boolean getErrorsOccurred() {
-        return parent.getErrorsOccurred();
-    }
+  private final ErrorReporter parent;
+
+  public SynchronizedErrorReporter(ErrorReporter parent) {
+    this.parent = parent;
+  }
+
+  @Override
+  public synchronized String reportError(String message) {
+    return parent.reportError(message);
+  }
+
+  @Override
+  public synchronized String reportWarning(String message) {
+    return parent.reportWarning(message);
+  }
+
+  @Override
+  public synchronized String reportInfo(String message) {
+    return parent.reportInfo(message);
+  }
+
+  @Override
+  public synchronized String reportError(EObject object, String message) {
+    return parent.reportError(object, message);
+  }
+
+  @Override
+  public synchronized String reportWarning(EObject object, String message) {
+    return parent.reportWarning(object, message);
+  }
+
+  @Override
+  public synchronized String reportInfo(EObject object, String message) {
+    return parent.reportInfo(object, message);
+  }
+
+  @Override
+  public synchronized String reportError(Path file, Integer line, String message) {
+    return parent.reportError(file, line, message);
+  }
+
+  @Override
+  public synchronized String reportWarning(Path file, Integer line, String message) {
+    return parent.reportWarning(file, line, message);
+  }
+
+  @Override
+  public synchronized String reportInfo(Path file, Integer line, String message) {
+    return parent.reportInfo(file, line, message);
+  }
+
+  @Override
+  public synchronized String report(Path file, DiagnosticSeverity severity, String message) {
+    return parent.report(file, severity, message);
+  }
+
+  @Override
+  public synchronized String report(
+      Path file, DiagnosticSeverity severity, String message, int line) {
+    return parent.report(file, severity, message, line);
+  }
+
+  @Override
+  public synchronized String report(
+      Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
+    return parent.report(file, severity, message, startPos, endPos);
+  }
+
+  @Override
+  public synchronized boolean getErrorsOccurred() {
+    return parent.getErrorsOccurred();
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/launcher/BuildConfig.java b/org.lflang/src/org/lflang/federated/launcher/BuildConfig.java
index c1a01bfa47..47345af147 100644
--- a/org.lflang/src/org/lflang/federated/launcher/BuildConfig.java
+++ b/org.lflang/src/org/lflang/federated/launcher/BuildConfig.java
@@ -4,57 +4,48 @@
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
 
-/**
- * A collection of methods used for building target code for federates.
- */
+/** A collection of methods used for building target code for federates. */
 public abstract class BuildConfig {
 
-    /**
-     * The federate that this configuration applies to.
-     */
-    protected final FederateInstance federate;
-
-    /**
-     * An error reporter to report problems.
-     */
-    protected final ErrorReporter errorReporter;
-
-    /**
-     * The file configuration of the federation that the federate belongs to.
-     */
-    protected final FedFileConfig fileConfig;
-
-    /**
-     * Create a new build configuration.
-     *
-     * @param federate The federate that this configuration applies to.
-     * @param fileConfig The file configuration of the federation that the federate belongs to.
-     * @param errorReporter An error reporter to report problems.
-     */
-    public BuildConfig(FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-        this.errorReporter = errorReporter;
-        this.federate = federate;
-        this.fileConfig = fileConfig;
-    }
-
-    /**
-     * Return the compile command for the federate that this build configuration belongs to.
-     */
-    public String compileCommand() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Return the command that will execute the federate that this build configuration belongs to
-     * locally, assuming that the current directory is the top-level project folder.
-     */
-    public abstract String localExecuteCommand();
-
-    /**
-     * Return the command that will execute the federate that this build configuration belongs to
-     * remotely, assuming that the current directory is the top-level project folder.
-     */
-    public String remoteExecuteCommand() {
-        throw new UnsupportedOperationException();
-    }
+  /** The federate that this configuration applies to. */
+  protected final FederateInstance federate;
+
+  /** An error reporter to report problems. */
+  protected final ErrorReporter errorReporter;
+
+  /** The file configuration of the federation that the federate belongs to. */
+  protected final FedFileConfig fileConfig;
+
+  /**
+   * Create a new build configuration.
+   *
+   * @param federate The federate that this configuration applies to.
+   * @param fileConfig The file configuration of the federation that the federate belongs to.
+   * @param errorReporter An error reporter to report problems.
+   */
+  public BuildConfig(
+      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+    this.errorReporter = errorReporter;
+    this.federate = federate;
+    this.fileConfig = fileConfig;
+  }
+
+  /** Return the compile command for the federate that this build configuration belongs to. */
+  public String compileCommand() {
+    throw new UnsupportedOperationException();
+  }
+
+  /**
+   * Return the command that will execute the federate that this build configuration belongs to
+   * locally, assuming that the current directory is the top-level project folder.
+   */
+  public abstract String localExecuteCommand();
+
+  /**
+   * Return the command that will execute the federate that this build configuration belongs to
+   * remotely, assuming that the current directory is the top-level project folder.
+   */
+  public String remoteExecuteCommand() {
+    throw new UnsupportedOperationException();
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/launcher/CBuildConfig.java b/org.lflang/src/org/lflang/federated/launcher/CBuildConfig.java
index bd88a719b4..d77ea3988c 100644
--- a/org.lflang/src/org/lflang/federated/launcher/CBuildConfig.java
+++ b/org.lflang/src/org/lflang/federated/launcher/CBuildConfig.java
@@ -1,16 +1,16 @@
 /*************
  * Copyright (c) 2019-2021, The University of California at Berkeley.
-
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
-
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
-
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
-
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -26,51 +26,51 @@
 package org.lflang.federated.launcher;
 
 import java.io.File;
-
 import org.lflang.ErrorReporter;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
 import org.lflang.generator.c.CCompiler;
 
 /**
- * Utility class that can be used to create a launcher for federated LF programs
- * that are written in C.
+ * Utility class that can be used to create a launcher for federated LF programs that are written in
+ * C.
  *
  * @author Soroush Bateni
  * @author Marten Lohstroh
  */
 public class CBuildConfig extends BuildConfig {
 
-    public CBuildConfig(FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-        super(federate, fileConfig, errorReporter);
-    }
+  public CBuildConfig(
+      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+    super(federate, fileConfig, errorReporter);
+  }
 
-    @Override
-    public String compileCommand() {
+  @Override
+  public String compileCommand() {
 
-        String commandToReturn = "";
-        // FIXME: Hack to add platform support only for linux systems.
-        // We need to fix the CMake build command for remote federates.
-        String linuxPlatformSupport = "core" + File.separator + "platform" + File.separator + "lf_linux_support.c";
-        if (!federate.targetConfig.compileAdditionalSources.contains(linuxPlatformSupport)) {
-            federate.targetConfig.compileAdditionalSources.add(linuxPlatformSupport);
-        }
-        CCompiler cCompiler= new CCompiler(federate.targetConfig, fileConfig, errorReporter, false);
-        commandToReturn = String.join(" ",
-                cCompiler.compileCCommand(
-                        fileConfig.name+"_"+federate.name,
-                        false
-                    ).toString());
-        return commandToReturn;
+    String commandToReturn = "";
+    // FIXME: Hack to add platform support only for linux systems.
+    // We need to fix the CMake build command for remote federates.
+    String linuxPlatformSupport =
+        "core" + File.separator + "platform" + File.separator + "lf_linux_support.c";
+    if (!federate.targetConfig.compileAdditionalSources.contains(linuxPlatformSupport)) {
+      federate.targetConfig.compileAdditionalSources.add(linuxPlatformSupport);
     }
+    CCompiler cCompiler = new CCompiler(federate.targetConfig, fileConfig, errorReporter, false);
+    commandToReturn =
+        String.join(
+            " ",
+            cCompiler.compileCCommand(fileConfig.name + "_" + federate.name, false).toString());
+    return commandToReturn;
+  }
 
-    @Override
-    public String remoteExecuteCommand() {
-        return "bin/"+fileConfig.name+"_"+federate.name+" -i '$FEDERATION_ID'";
-    }
+  @Override
+  public String remoteExecuteCommand() {
+    return "bin/" + fileConfig.name + "_" + federate.name + " -i '$FEDERATION_ID'";
+  }
 
-    @Override
-    public String localExecuteCommand() {
-        return fileConfig.getFedBinPath().resolve(federate.name)+" -i $FEDERATION_ID";
-    }
+  @Override
+  public String localExecuteCommand() {
+    return fileConfig.getFedBinPath().resolve(federate.name) + " -i $FEDERATION_ID";
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/launcher/FedLauncherGenerator.java b/org.lflang/src/org/lflang/federated/launcher/FedLauncherGenerator.java
index 3ad08e2450..23547ca1d0 100644
--- a/org.lflang/src/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/org.lflang/src/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -1,25 +1,25 @@
 /*************
  * Copyright (c) 2019-2021, The University of California at Berkeley.
-
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
-
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
-
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
-
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
 
@@ -33,9 +33,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.lflang.ErrorReporter;
-import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty.ClockSyncMode;
 import org.lflang.federated.generator.FedFileConfig;
@@ -43,453 +41,477 @@
 
 /**
  * Utility class that can be used to create a launcher for federated LF programs.
- * 
+ *
  * @author Edward A. Lee
  * @author Soroush Bateni
  */
 public class FedLauncherGenerator {
-    protected TargetConfig targetConfig;
-    protected FedFileConfig fileConfig;
-    protected ErrorReporter errorReporter;
-
-    /**
-     * @param targetConfig The current target configuration.
-     * @param fileConfig The current file configuration.
-     * @param errorReporter A error reporter for reporting any errors or warnings during the code generation
-     */
-    public FedLauncherGenerator(TargetConfig targetConfig, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-        this.targetConfig = targetConfig;
-        this.fileConfig = fileConfig;
-        this.errorReporter = errorReporter;
+  protected TargetConfig targetConfig;
+  protected FedFileConfig fileConfig;
+  protected ErrorReporter errorReporter;
+
+  /**
+   * @param targetConfig The current target configuration.
+   * @param fileConfig The current file configuration.
+   * @param errorReporter A error reporter for reporting any errors or warnings during the code
+   *     generation
+   */
+  public FedLauncherGenerator(
+      TargetConfig targetConfig, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+    this.targetConfig = targetConfig;
+    this.fileConfig = fileConfig;
+    this.errorReporter = errorReporter;
+  }
+
+  /**
+   * Create the launcher shell scripts. This will create one or two files in the output path (bin
+   * directory). The first has name equal to the filename of the source file without the ".lf"
+   * extension. This will be a shell script that launches the RTI and the federates. If, in
+   * addition, either the RTI or any federate is mapped to a particular machine (anything other than
+   * the default "localhost" or "0.0.0.0"), then this will generate a shell script in the bin
+   * directory with name filename_distribute.sh that copies the relevant source files to the remote
+   * host and compiles them so that they are ready to execute using the launcher.
+   *
+   * <p>A precondition for this to work is that the user invoking this code generator can log into
+   * the remote host without supplying a password. Specifically, you have to have installed your
+   * public key (typically found in ~/.ssh/id_rsa.pub) in ~/.ssh/authorized_keys on the remote host.
+   * In addition, the remote host must be running an ssh service. On an Arch Linux system using
+   * systemd, for example, this means running:
+   *
+   * <p>sudo systemctl <start|enable> ssh.service
+   *
+   * <p>Enable means to always start the service at startup, whereas start means to just start it
+   * this once.
+   *
+   * <p>On macOS, open System Preferences from the Apple menu and click on the "Sharing" preference
+   * panel. Select the checkbox next to "Remote Login" to enable it.
+   *
+   * <p>In addition, every host must have OpenSSL installed, with at least version 1.1.1a. You can
+   * check the version with
+   *
+   * <p>openssl version
+   *
+   * @param federates A list of federate instances in the federation
+   * @param rtiConfig Can have values for 'host', 'dir', and 'user'
+   */
+  public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
+    // NOTE: It might be good to use screen when invoking the RTI
+    // or federates remotely, so you can detach and the process keeps running.
+    // However, I was unable to get it working properly.
+    // What this means is that the shell that invokes the launcher
+    // needs to remain live for the duration of the federation.
+    // If that shell is killed, the federation will die.
+    // Hence, it is reasonable to launch the federation on a
+    // machine that participates in the federation, for example,
+    // on the machine that runs the RTI.  The command I tried
+    // to get screen to work looks like this:
+    // ssh -t «target» cd «path»; screen -S «filename»_«federate.name» -L
+    // bin/«filename»_«federate.name» 2>&1
+    // var outPath = binGenPath
+    StringBuilder shCode = new StringBuilder();
+    StringBuilder distCode = new StringBuilder();
+    shCode.append(getSetupCode() + "\n");
+    String distHeader = getDistHeader();
+    String host = rtiConfig.getHost();
+    String target = host;
+
+    String user = rtiConfig.getUser();
+    if (user != null) {
+      target = user + "@" + host;
     }
 
-    /**
-     * Create the launcher shell scripts. This will create one or two files
-     * in the output path (bin directory). The first has name equal to
-     * the filename of the source file without the ".lf" extension.
-     * This will be a shell script that launches the
-     * RTI and the federates.  If, in addition, either the RTI or any
-     * federate is mapped to a particular machine (anything other than
-     * the default "localhost" or "0.0.0.0"), then this will generate
-     * a shell script in the bin directory with name filename_distribute.sh
-     * that copies the relevant source files to the remote host and compiles
-     * them so that they are ready to execute using the launcher.
-     * 
-     * A precondition for this to work is that the user invoking this
-     * code generator can log into the remote host without supplying
-     * a password. Specifically, you have to have installed your
-     * public key (typically found in ~/.ssh/id_rsa.pub) in
-     * ~/.ssh/authorized_keys on the remote host. In addition, the
-     * remote host must be running an ssh service.
-     * On an Arch Linux system using systemd, for example, this means
-     * running:
-     * 
-     *     sudo systemctl <start|enable> ssh.service
-     * 
-     * Enable means to always start the service at startup, whereas
-     * start means to just start it this once.
-     * 
-     * On macOS, open System Preferences from the Apple menu and
-     * click on the "Sharing" preference panel. Select the checkbox
-     * next to "Remote Login" to enable it.
-     * 
-     * In addition, every host must have OpenSSL installed, with at least
-     * version 1.1.1a.  You can check the version with
-     *
-     *     openssl version
-     *
-     * @param federates A list of federate instances in the federation
-     * @param rtiConfig
-     *  Can have values for 'host', 'dir', and 'user'
-     */
-    public void doGenerate(
-        List<FederateInstance> federates,
-        RtiConfig rtiConfig
-    ) {
-        // NOTE: It might be good to use screen when invoking the RTI
-        // or federates remotely, so you can detach and the process keeps running.
-        // However, I was unable to get it working properly.
-        // What this means is that the shell that invokes the launcher
-        // needs to remain live for the duration of the federation.
-        // If that shell is killed, the federation will die.
-        // Hence, it is reasonable to launch the federation on a
-        // machine that participates in the federation, for example,
-        // on the machine that runs the RTI.  The command I tried
-        // to get screen to work looks like this:
-        // ssh -t «target» cd «path»; screen -S «filename»_«federate.name» -L bin/«filename»_«federate.name» 2>&1
-        // var outPath = binGenPath
-        StringBuilder shCode = new StringBuilder();
-        StringBuilder distCode = new StringBuilder();
-        shCode.append(getSetupCode() + "\n");
-        String distHeader = getDistHeader(); 
-        String host = rtiConfig.getHost();
-        String target = host;
-
-        String user = rtiConfig.getUser();
-        if (user != null) {
-            target = user + "@" + host;
-        }
-
-        shCode.append("#### Host is " + host);
-        
-        // Launch the RTI in the foreground.
-        if (host.equals("localhost") || host.equals("0.0.0.0")) {
-            // FIXME: the paths below will not work on Windows
-            shCode.append(getLaunchCode(getRtiCommand(federates, false)) + "\n");
-        } else {
-            // Start the RTI on the remote machine.
-            // FIXME: Should $FEDERATION_ID be used to ensure unique directories, executables, on the remote host?
-            // Copy the source code onto the remote machine and compile it there.
-            if(distCode.length() == 0) distCode.append(distHeader + "\n");
-
-            String logFileName = String.format("log/%s_RTI.log", fileConfig.name);
-
-            // Launch the RTI on the remote machine using ssh and screen.
-            // The -t argument to ssh creates a virtual terminal, which is needed by screen.
-            // The -S gives the session a name.
-            // The -L option turns on logging. Unfortunately, the -Logfile giving the log file name
-            // is not standardized in screen. Logs go to screenlog.0 (or screenlog.n).
-            // FIXME: Remote errors are not reported back via ssh from screen.
-            // How to get them back to the local machine?
-            // Perhaps use -c and generate a screen command file to control the logfile name,
-            // but screen apparently doesn't write anything to the log file!
-            //
-            // The cryptic 2>&1 reroutes stderr to stdout so that both are returned.
-            // The sleep at the end prevents screen from exiting before outgoing messages from
-            // the federate have had time to go out to the RTI through the socket.
-
-            shCode.append(getRemoteLaunchCode(host, target, logFileName, 
-                    getRtiCommand(federates, true)) + "\n");
-        }
-
-        // Index used for storing pids of federates
-        int federateIndex = 0;
-        for (FederateInstance federate : federates) {
-            var buildConfig = getBuildConfig(federate, fileConfig, errorReporter);
-            if (federate.isRemote) {
-                Path fedRelSrcGenPath = fileConfig.getOutPath().relativize(fileConfig.getSrcGenPath()).resolve(federate.name);
-                if(distCode.length() == 0) distCode.append(distHeader + "\n");
-                String logFileName = String.format("log/%s_%s.log", fileConfig.name, federate.name);
-                String compileCommand = buildConfig.compileCommand();
-                // FIXME: Should $FEDERATION_ID be used to ensure unique directories, executables, on the remote host?
-                distCode.append(getDistCode(rtiConfig.getDirectory(), federate, fedRelSrcGenPath, logFileName, fileConfig.getSrcGenPath(), compileCommand) + "\n");
-                String executeCommand = buildConfig.remoteExecuteCommand();
-                shCode.append(getFedRemoteLaunchCode(federate, rtiConfig.getDirectory(), logFileName, executeCommand, federateIndex++) + "\n");
-            } else {
-                String executeCommand = buildConfig.localExecuteCommand();
-                shCode.append(getFedLocalLaunchCode(federate, executeCommand, federateIndex++) + "\n");
-            }
-        }
-        if (host.equals("localhost") || host.equals("0.0.0.0")) {
-            // Local PID managements
-            shCode.append("echo \"#### Bringing the RTI back to foreground so it can receive Control-C.\"" + "\n");
-            shCode.append("fg %1" + "\n");
-        }
-        // Wait for launched processes to finish
-        shCode.append(String.join("\n", 
-            "echo \"RTI has exited. Wait for federates to exit.\"",
-            "# Wait for launched processes to finish.",
-            "# The errors are handled separately via trap.",
-            "for pid in \"${pids[@]}\"",
-            "do",
-            "    wait $pid",
-            "done",
-            "echo \"All done.\""
-        ) + "\n");
-
-        // Create bin directory for the script.
-        if (!Files.exists(fileConfig.binPath)) {
-            try {
-                Files.createDirectories(fileConfig.binPath);
-            } catch (IOException e) {
-                errorReporter.reportError("Unable to create directory: " + fileConfig.binPath);
-            }
-        }
-
-        System.out.println("##### Generating launcher for federation "
-                               + " in directory "
-                               + fileConfig.binPath);
-
-        // Write the launcher file.
-        // Delete file previously produced, if any.
-        File file = fileConfig.binPath.resolve(fileConfig.name).toFile();
-        if (file.exists()) {
-            file.delete();
-        }
+    shCode.append("#### Host is " + host);
+
+    // Launch the RTI in the foreground.
+    if (host.equals("localhost") || host.equals("0.0.0.0")) {
+      // FIXME: the paths below will not work on Windows
+      shCode.append(getLaunchCode(getRtiCommand(federates, false)) + "\n");
+    } else {
+      // Start the RTI on the remote machine.
+      // FIXME: Should $FEDERATION_ID be used to ensure unique directories, executables, on the
+      // remote host?
+      // Copy the source code onto the remote machine and compile it there.
+      if (distCode.length() == 0) distCode.append(distHeader + "\n");
+
+      String logFileName = String.format("log/%s_RTI.log", fileConfig.name);
+
+      // Launch the RTI on the remote machine using ssh and screen.
+      // The -t argument to ssh creates a virtual terminal, which is needed by screen.
+      // The -S gives the session a name.
+      // The -L option turns on logging. Unfortunately, the -Logfile giving the log file name
+      // is not standardized in screen. Logs go to screenlog.0 (or screenlog.n).
+      // FIXME: Remote errors are not reported back via ssh from screen.
+      // How to get them back to the local machine?
+      // Perhaps use -c and generate a screen command file to control the logfile name,
+      // but screen apparently doesn't write anything to the log file!
+      //
+      // The cryptic 2>&1 reroutes stderr to stdout so that both are returned.
+      // The sleep at the end prevents screen from exiting before outgoing messages from
+      // the federate have had time to go out to the RTI through the socket.
+
+      shCode.append(
+          getRemoteLaunchCode(host, target, logFileName, getRtiCommand(federates, true)) + "\n");
+    }
 
-        FileOutputStream fOut = null;
-        try {
-            fOut = new FileOutputStream(file);
-        } catch (FileNotFoundException e) {
-            errorReporter.reportError("Unable to find file: " + file);
-        }
-        try {
-            fOut.write(shCode.toString().getBytes());
-            fOut.close();
-        } catch (IOException e) {
-            errorReporter.reportError("Unable to write to file: " + file);
-        }
+    // Index used for storing pids of federates
+    int federateIndex = 0;
+    for (FederateInstance federate : federates) {
+      var buildConfig = getBuildConfig(federate, fileConfig, errorReporter);
+      if (federate.isRemote) {
+        Path fedRelSrcGenPath =
+            fileConfig.getOutPath().relativize(fileConfig.getSrcGenPath()).resolve(federate.name);
+        if (distCode.length() == 0) distCode.append(distHeader + "\n");
+        String logFileName = String.format("log/%s_%s.log", fileConfig.name, federate.name);
+        String compileCommand = buildConfig.compileCommand();
+        // FIXME: Should $FEDERATION_ID be used to ensure unique directories, executables, on the
+        // remote host?
+        distCode.append(
+            getDistCode(
+                    rtiConfig.getDirectory(),
+                    federate,
+                    fedRelSrcGenPath,
+                    logFileName,
+                    fileConfig.getSrcGenPath(),
+                    compileCommand)
+                + "\n");
+        String executeCommand = buildConfig.remoteExecuteCommand();
+        shCode.append(
+            getFedRemoteLaunchCode(
+                    federate,
+                    rtiConfig.getDirectory(),
+                    logFileName,
+                    executeCommand,
+                    federateIndex++)
+                + "\n");
+      } else {
+        String executeCommand = buildConfig.localExecuteCommand();
+        shCode.append(getFedLocalLaunchCode(federate, executeCommand, federateIndex++) + "\n");
+      }
+    }
+    if (host.equals("localhost") || host.equals("0.0.0.0")) {
+      // Local PID managements
+      shCode.append(
+          "echo \"#### Bringing the RTI back to foreground so it can receive Control-C.\"" + "\n");
+      shCode.append("fg %1" + "\n");
+    }
+    // Wait for launched processes to finish
+    shCode.append(
+        String.join(
+                "\n",
+                "echo \"RTI has exited. Wait for federates to exit.\"",
+                "# Wait for launched processes to finish.",
+                "# The errors are handled separately via trap.",
+                "for pid in \"${pids[@]}\"",
+                "do",
+                "    wait $pid",
+                "done",
+                "echo \"All done.\"")
+            + "\n");
+
+    // Create bin directory for the script.
+    if (!Files.exists(fileConfig.binPath)) {
+      try {
+        Files.createDirectories(fileConfig.binPath);
+      } catch (IOException e) {
+        errorReporter.reportError("Unable to create directory: " + fileConfig.binPath);
+      }
+    }
 
-        if (!file.setExecutable(true, false)) {
-            errorReporter.reportWarning("Unable to make launcher script executable.");
-        }
+    System.out.println(
+        "##### Generating launcher for federation " + " in directory " + fileConfig.binPath);
 
-        // Write the distributor file.
-        // Delete the file even if it does not get generated.
-        file = fileConfig.binPath.resolve(fileConfig.name + "_distribute.sh").toFile();
-        if (file.exists()) {
-            file.delete();
-        }
-        if (distCode.length() > 0) {
-            try {
-                fOut = new FileOutputStream(file);
-                fOut.write(distCode.toString().getBytes());
-                fOut.close();
-                if (!file.setExecutable(true, false)) {
-                    errorReporter.reportWarning("Unable to make file executable: " + file);
-                }
-            } catch (FileNotFoundException e) {
-                errorReporter.reportError("Unable to find file: " + file);
-            } catch (IOException e) {
-                errorReporter.reportError("Unable to write to file " + file);
-            }
-        }
+    // Write the launcher file.
+    // Delete file previously produced, if any.
+    File file = fileConfig.binPath.resolve(fileConfig.name).toFile();
+    if (file.exists()) {
+      file.delete();
     }
 
-    private String getSetupCode() {
-        return String.join("\n", 
-            "#!/bin/bash",
-            "# Launcher for federated " + fileConfig.name + ".lf Lingua Franca program.",
-            "# Uncomment to specify to behave as close as possible to the POSIX standard.",
-            "# set -o posix",
-            "",
-            "# Enable job control",
-            "set -m",
-            "shopt -s huponexit",
-            "",
-            "# Set a trap to kill all background jobs on error or control-C",
-            "# Use two distinct traps so we can see which signal causes this.",
-            "cleanup() {",
-            "    printf \"Killing federate %s.\\n\" ${pids[*]}",
-            "    # The || true clause means this is not an error if kill fails.",
-            "    kill ${pids[@]} || true",
-            "    printf \"#### Killing RTI %s.\\n\" ${RTI}",
-            "    kill ${RTI} || true",
-            "    exit 1",
-            "}",
-            "cleanup_err() {",
-            "    echo \"#### Received ERR signal on line $1. Invoking cleanup().\"",
-            "    cleanup",
-            "}",
-            "cleanup_sigint() {",
-            "    echo \"#### Received SIGINT signal on line $1. Invoking cleanup().\"",
-            "    cleanup",
-            "}",
-            "",
-            "trap 'cleanup_err $LINENO' ERR",
-            "trap 'cleanup_sigint $LINENO' SIGINT",
-            "",
-            "# Create a random 48-byte text ID for this federation.",
-            "# The likelihood of two federations having the same ID is 1/16,777,216 (1/2^24).",
-            "FEDERATION_ID=`openssl rand -hex 24`",
-            "echo \"Federate " + fileConfig.name + " in Federation ID '$FEDERATION_ID'\"",
-            "# Launch the federates:"
-        );
+    FileOutputStream fOut = null;
+    try {
+      fOut = new FileOutputStream(file);
+    } catch (FileNotFoundException e) {
+      errorReporter.reportError("Unable to find file: " + file);
+    }
+    try {
+      fOut.write(shCode.toString().getBytes());
+      fOut.close();
+    } catch (IOException e) {
+      errorReporter.reportError("Unable to write to file: " + file);
     }
 
-    private String getDistHeader() {
-        return String.join("\n", 
-            "#!/bin/bash",
-            "# Distributor for federated "+ fileConfig.name + ".lf Lingua Franca program.",
-            "# Uncomment to specify to behave as close as possible to the POSIX standard.",
-            "# set -o posix"
-        );
+    if (!file.setExecutable(true, false)) {
+      errorReporter.reportWarning("Unable to make launcher script executable.");
     }
 
-    private String getRtiCommand(List<FederateInstance> federates, boolean isRemote) {
-        List<String> commands = new ArrayList<>();
-        if (isRemote) {
-            commands.add("RTI -i '${FEDERATION_ID}' \\");
-        } else {
-            commands.add("RTI -i ${FEDERATION_ID} \\");
-        }
-        if (targetConfig.auth) {
-            commands.add("                        -a \\");
-        }
-        if (targetConfig.tracing != null) {
-            commands.add("                        -t \\");
-        }
-        commands.addAll(List.of(
-            "                        -n "+federates.size()+" \\",
-            "                        -c "+targetConfig.clockSync.toString()+" \\"
-        ));
-        if (targetConfig.clockSync.equals(ClockSyncMode.ON)) {
-            commands.add("period " + targetConfig.clockSyncOptions.period.toNanoSeconds()+" \\");
-        }
-        if (targetConfig.clockSync.equals(ClockSyncMode.ON) || 
-                targetConfig.clockSync.equals(ClockSyncMode.INIT)) {
-            commands.add("exchanges-per-interval "+targetConfig.clockSyncOptions.trials+" \\");
+    // Write the distributor file.
+    // Delete the file even if it does not get generated.
+    file = fileConfig.binPath.resolve(fileConfig.name + "_distribute.sh").toFile();
+    if (file.exists()) {
+      file.delete();
+    }
+    if (distCode.length() > 0) {
+      try {
+        fOut = new FileOutputStream(file);
+        fOut.write(distCode.toString().getBytes());
+        fOut.close();
+        if (!file.setExecutable(true, false)) {
+          errorReporter.reportWarning("Unable to make file executable: " + file);
         }
-        commands.add("&");
-        return String.join("\n", commands);
+      } catch (FileNotFoundException e) {
+        errorReporter.reportError("Unable to find file: " + file);
+      } catch (IOException e) {
+        errorReporter.reportError("Unable to write to file " + file);
+      }
     }
-
-    private String getLaunchCode(String rtiLaunchCode) {
-        return String.join("\n", 
-            "echo \"#### Launching the runtime infrastructure (RTI).\"",
-            "# First, check if the RTI is on the PATH",
-            "if ! command -v RTI &> /dev/null",
-            "then",
-            "    echo \"RTI could not be found.\"",
-            "    echo \"The source code can be obtained from https://github.com/lf-lang/reactor-c/tree/main/core/federated/RTI\"",
-            "    exit",
-            "fi                ",
-            "# The RTI is started first to allow proper boot-up",
-            "# before federates will try to connect.",
-            "# The RTI will be brought back to foreground",
-            "# to be responsive to user inputs after all federates",
-            "# are launched.",
-            rtiLaunchCode,
-            "# Store the PID of the RTI",
-            "RTI=$!",
-            "# Wait for the RTI to boot up before",
-            "# starting federates (this could be done by waiting for a specific output",
-            "# from the RTI, but here we use sleep)",
-            "sleep 1"
-        );
+  }
+
+  private String getSetupCode() {
+    return String.join(
+        "\n",
+        "#!/bin/bash",
+        "# Launcher for federated " + fileConfig.name + ".lf Lingua Franca program.",
+        "# Uncomment to specify to behave as close as possible to the POSIX standard.",
+        "# set -o posix",
+        "",
+        "# Enable job control",
+        "set -m",
+        "shopt -s huponexit",
+        "",
+        "# Set a trap to kill all background jobs on error or control-C",
+        "# Use two distinct traps so we can see which signal causes this.",
+        "cleanup() {",
+        "    printf \"Killing federate %s.\\n\" ${pids[*]}",
+        "    # The || true clause means this is not an error if kill fails.",
+        "    kill ${pids[@]} || true",
+        "    printf \"#### Killing RTI %s.\\n\" ${RTI}",
+        "    kill ${RTI} || true",
+        "    exit 1",
+        "}",
+        "cleanup_err() {",
+        "    echo \"#### Received ERR signal on line $1. Invoking cleanup().\"",
+        "    cleanup",
+        "}",
+        "cleanup_sigint() {",
+        "    echo \"#### Received SIGINT signal on line $1. Invoking cleanup().\"",
+        "    cleanup",
+        "}",
+        "",
+        "trap 'cleanup_err $LINENO' ERR",
+        "trap 'cleanup_sigint $LINENO' SIGINT",
+        "",
+        "# Create a random 48-byte text ID for this federation.",
+        "# The likelihood of two federations having the same ID is 1/16,777,216 (1/2^24).",
+        "FEDERATION_ID=`openssl rand -hex 24`",
+        "echo \"Federate " + fileConfig.name + " in Federation ID '$FEDERATION_ID'\"",
+        "# Launch the federates:");
+  }
+
+  private String getDistHeader() {
+    return String.join(
+        "\n",
+        "#!/bin/bash",
+        "# Distributor for federated " + fileConfig.name + ".lf Lingua Franca program.",
+        "# Uncomment to specify to behave as close as possible to the POSIX standard.",
+        "# set -o posix");
+  }
+
+  private String getRtiCommand(List<FederateInstance> federates, boolean isRemote) {
+    List<String> commands = new ArrayList<>();
+    if (isRemote) {
+      commands.add("RTI -i '${FEDERATION_ID}' \\");
+    } else {
+      commands.add("RTI -i ${FEDERATION_ID} \\");
     }
-
-    private String getRemoteLaunchCode(Object host, Object target, String logFileName, String rtiLaunchString) {
-        return String.join("\n", 
-            "echo \"#### Launching the runtime infrastructure (RTI) on remote host " + host + ".\"",
-            "# FIXME: Killing this ssh does not kill the remote process.",
-            "# A double -t -t option to ssh forces creation of a virtual terminal, which",
-            "# fixes the problem, but then the ssh command does not execute. The remote",
-            "# federate does not start!",
-            "ssh " + target + " 'mkdir -p log; \\",
-            "    echo \"-------------- Federation ID: \"'$FEDERATION_ID' >> " + logFileName + "; \\",
-            "    date >> " + logFileName + "; \\",
-            "    echo \"Executing RTI: " + rtiLaunchString + "\" 2>&1 | tee -a " + logFileName + "; \\",
-            "    # First, check if the RTI is on the PATH",
-            "    if ! command -v RTI &> /dev/null",
-            "    then",
-            "        echo \"RTI could not be found.\"",
-            "        echo \"The source code can be found in org.lflang/src/lib/core/federated/RTI\"",
-            "        exit",
-            "    fi",
-            "    " + rtiLaunchString + " 2>&1 | tee -a " + logFileName + "' &",
-            "# Store the PID of the channel to RTI",
-            "RTI=$!",
-            "# Wait for the RTI to boot up before",
-            "# starting federates (this could be done by waiting for a specific output",
-            "# from the RTI, but here we use sleep)",
-            "sleep 5"
-        );
+    if (targetConfig.auth) {
+      commands.add("                        -a \\");
     }
-
-    private String getDistCode(
-            Path remoteBase,
-            FederateInstance federate, 
-            Path remoteRelSrcGenPath,
-            String logFileName,
-            Path localAbsSrcGenPath,
-            String compileCommand) {
-        return String.join("\n",
-                           "echo \"Making directory " + remoteBase
-                               + " and subdirectories src-gen, bin, and log on host "
-                               + getUserHost(federate.user, federate.host)
-                               + "\"",
-                           "# The >> syntax appends stdout to a file. The 2>&1 appends stderr to the same file.",
-                           "ssh " + getUserHost(federate.user, federate.host)
-                               + " '\\",
-                           "    mkdir -p " + remoteBase.resolve(remoteRelSrcGenPath).resolve("core")
-                               + " " + remoteBase.resolve("bin") + " "
-                               + remoteBase + "/log; \\",
-                           "    echo \"--------------\" >> " + remoteBase + "/"
-                               + logFileName + "; \\",
-                           "    date >> " + remoteBase + "/" + logFileName + ";",
-                           "'",
-                           "pushd " + localAbsSrcGenPath
-                               + " > /dev/null",
-                           "echo \"Copying source files to host "
-                               + getUserHost(federate.user, federate.host)
-                               + "\"",
-                           "scp -r * "
-                               + getUserHost(federate.user, federate.host) + ":"
-                               + remoteBase.resolve(remoteRelSrcGenPath),
-                           "popd > /dev/null",
-                           "echo \"Compiling on host "
-                               + getUserHost(federate.user, federate.host)
-                               + " using: " + compileCommand + "\"",
-                           "ssh " + getUserHost(federate.user, federate.host)
-                               + " 'cd " + remoteBase + "; \\",
-                           "    echo \"In " + remoteBase + " compiling with: "
-                               + compileCommand + "\" >> " + logFileName
-                               + " 2>&1; \\",
-                           "    # Capture the output in the log file and stdout. \\",
-                           "    " + compileCommand + " 2>&1 | tee -a "
-                               + logFileName + ";' "
-        );
+    if (targetConfig.tracing != null) {
+      commands.add("                        -t \\");
     }
-
-    private String getUserHost(Object user, Object host) {
-        if (user == null) {
-            return host.toString();
-        }
-        return user + "@" + host;
+    commands.addAll(
+        List.of(
+            "                        -n " + federates.size() + " \\",
+            "                        -c " + targetConfig.clockSync.toString() + " \\"));
+    if (targetConfig.clockSync.equals(ClockSyncMode.ON)) {
+      commands.add("period " + targetConfig.clockSyncOptions.period.toNanoSeconds() + " \\");
     }
-
-    private String getFedRemoteLaunchCode(
-            FederateInstance federate, 
-            Path path,
-            String logFileName,
-            String executeCommand,
-            int federateIndex
-        ) {
-        return String.join("\n", 
-            "echo \"#### Launching the federate "+federate.name+" on host "+getUserHost(federate.user, federate.host)+"\"",
-            "# FIXME: Killing this ssh does not kill the remote process.",
-            "# A double -t -t option to ssh forces creation of a virtual terminal, which",
-            "# fixes the problem, but then the ssh command does not execute. The remote",
-            "# federate does not start!",
-            "ssh "+getUserHost(federate.user, federate.host)+" '\\",
-            "    cd "+path+"; \\",
-            "    echo \"-------------- Federation ID: \"'$FEDERATION_ID' >> "+logFileName+"; \\",
-            "    date >> "+logFileName+"; \\",
-            "    echo \"In "+path+", executing: "+executeCommand+"\" 2>&1 | tee -a "+logFileName+"; \\",
-            "    "+executeCommand+" 2>&1 | tee -a "+logFileName+"' &",
-            "pids["+federateIndex+"]=$!"
-        );
+    if (targetConfig.clockSync.equals(ClockSyncMode.ON)
+        || targetConfig.clockSync.equals(ClockSyncMode.INIT)) {
+      commands.add("exchanges-per-interval " + targetConfig.clockSyncOptions.trials + " \\");
     }
-
-    private String getFedLocalLaunchCode(FederateInstance federate, String executeCommand, int federateIndex) {
-        return String.format(String.join("\n", 
-            "echo \"#### Launching the federate %s.\"",
-            "%s &",
-            "pids[%s]=$!"
-        ),
+    commands.add("&");
+    return String.join("\n", commands);
+  }
+
+  private String getLaunchCode(String rtiLaunchCode) {
+    return String.join(
+        "\n",
+        "echo \"#### Launching the runtime infrastructure (RTI).\"",
+        "# First, check if the RTI is on the PATH",
+        "if ! command -v RTI &> /dev/null",
+        "then",
+        "    echo \"RTI could not be found.\"",
+        "    echo \"The source code can be obtained from"
+            + " https://github.com/lf-lang/reactor-c/tree/main/core/federated/RTI\"",
+        "    exit",
+        "fi                ",
+        "# The RTI is started first to allow proper boot-up",
+        "# before federates will try to connect.",
+        "# The RTI will be brought back to foreground",
+        "# to be responsive to user inputs after all federates",
+        "# are launched.",
+        rtiLaunchCode,
+        "# Store the PID of the RTI",
+        "RTI=$!",
+        "# Wait for the RTI to boot up before",
+        "# starting federates (this could be done by waiting for a specific output",
+        "# from the RTI, but here we use sleep)",
+        "sleep 1");
+  }
+
+  private String getRemoteLaunchCode(
+      Object host, Object target, String logFileName, String rtiLaunchString) {
+    return String.join(
+        "\n",
+        "echo \"#### Launching the runtime infrastructure (RTI) on remote host " + host + ".\"",
+        "# FIXME: Killing this ssh does not kill the remote process.",
+        "# A double -t -t option to ssh forces creation of a virtual terminal, which",
+        "# fixes the problem, but then the ssh command does not execute. The remote",
+        "# federate does not start!",
+        "ssh " + target + " 'mkdir -p log; \\",
+        "    echo \"-------------- Federation ID: \"'$FEDERATION_ID' >> " + logFileName + "; \\",
+        "    date >> " + logFileName + "; \\",
+        "    echo \"Executing RTI: " + rtiLaunchString + "\" 2>&1 | tee -a " + logFileName + "; \\",
+        "    # First, check if the RTI is on the PATH",
+        "    if ! command -v RTI &> /dev/null",
+        "    then",
+        "        echo \"RTI could not be found.\"",
+        "        echo \"The source code can be found in org.lflang/src/lib/core/federated/RTI\"",
+        "        exit",
+        "    fi",
+        "    " + rtiLaunchString + " 2>&1 | tee -a " + logFileName + "' &",
+        "# Store the PID of the channel to RTI",
+        "RTI=$!",
+        "# Wait for the RTI to boot up before",
+        "# starting federates (this could be done by waiting for a specific output",
+        "# from the RTI, but here we use sleep)",
+        "sleep 5");
+  }
+
+  private String getDistCode(
+      Path remoteBase,
+      FederateInstance federate,
+      Path remoteRelSrcGenPath,
+      String logFileName,
+      Path localAbsSrcGenPath,
+      String compileCommand) {
+    return String.join(
+        "\n",
+        "echo \"Making directory "
+            + remoteBase
+            + " and subdirectories src-gen, bin, and log on host "
+            + getUserHost(federate.user, federate.host)
+            + "\"",
+        "# The >> syntax appends stdout to a file. The 2>&1 appends stderr to the same file.",
+        "ssh " + getUserHost(federate.user, federate.host) + " '\\",
+        "    mkdir -p "
+            + remoteBase.resolve(remoteRelSrcGenPath).resolve("core")
+            + " "
+            + remoteBase.resolve("bin")
+            + " "
+            + remoteBase
+            + "/log; \\",
+        "    echo \"--------------\" >> " + remoteBase + "/" + logFileName + "; \\",
+        "    date >> " + remoteBase + "/" + logFileName + ";",
+        "'",
+        "pushd " + localAbsSrcGenPath + " > /dev/null",
+        "echo \"Copying source files to host " + getUserHost(federate.user, federate.host) + "\"",
+        "scp -r * "
+            + getUserHost(federate.user, federate.host)
+            + ":"
+            + remoteBase.resolve(remoteRelSrcGenPath),
+        "popd > /dev/null",
+        "echo \"Compiling on host "
+            + getUserHost(federate.user, federate.host)
+            + " using: "
+            + compileCommand
+            + "\"",
+        "ssh " + getUserHost(federate.user, federate.host) + " 'cd " + remoteBase + "; \\",
+        "    echo \"In "
+            + remoteBase
+            + " compiling with: "
+            + compileCommand
+            + "\" >> "
+            + logFileName
+            + " 2>&1; \\",
+        "    # Capture the output in the log file and stdout. \\",
+        "    " + compileCommand + " 2>&1 | tee -a " + logFileName + ";' ");
+  }
+
+  private String getUserHost(Object user, Object host) {
+    if (user == null) {
+      return host.toString();
+    }
+    return user + "@" + host;
+  }
+
+  private String getFedRemoteLaunchCode(
+      FederateInstance federate,
+      Path path,
+      String logFileName,
+      String executeCommand,
+      int federateIndex) {
+    return String.join(
+        "\n",
+        "echo \"#### Launching the federate "
+            + federate.name
+            + " on host "
+            + getUserHost(federate.user, federate.host)
+            + "\"",
+        "# FIXME: Killing this ssh does not kill the remote process.",
+        "# A double -t -t option to ssh forces creation of a virtual terminal, which",
+        "# fixes the problem, but then the ssh command does not execute. The remote",
+        "# federate does not start!",
+        "ssh " + getUserHost(federate.user, federate.host) + " '\\",
+        "    cd " + path + "; \\",
+        "    echo \"-------------- Federation ID: \"'$FEDERATION_ID' >> " + logFileName + "; \\",
+        "    date >> " + logFileName + "; \\",
+        "    echo \"In "
+            + path
+            + ", executing: "
+            + executeCommand
+            + "\" 2>&1 | tee -a "
+            + logFileName
+            + "; \\",
+        "    " + executeCommand + " 2>&1 | tee -a " + logFileName + "' &",
+        "pids[" + federateIndex + "]=$!");
+  }
+
+  private String getFedLocalLaunchCode(
+      FederateInstance federate, String executeCommand, int federateIndex) {
+    return String.format(
+        String.join("\n", "echo \"#### Launching the federate %s.\"", "%s &", "pids[%s]=$!"),
         federate.name,
         executeCommand,
         federateIndex);
-    }
-
-    /**
-     * Create a build configuration of the appropriate target.
-     *
-     * @param federate The federate to which the build configuration applies.
-     * @param fileConfig The file configuration of the federation to which the federate belongs.
-     * @param errorReporter An error reporter to report problems.
-     * @return
-     */
-    private BuildConfig getBuildConfig(
-        FederateInstance federate,
-        FedFileConfig fileConfig,
-        ErrorReporter errorReporter) {
-        return switch(federate.targetConfig.target) {
-            case C, CCPP -> new CBuildConfig(federate, fileConfig, errorReporter);
-            case Python -> new PyBuildConfig(federate, fileConfig, errorReporter);
-            case TS -> new TsBuildConfig(federate, fileConfig, errorReporter);
-            case CPP, Rust -> throw new UnsupportedOperationException();
-        };
-    }
+  }
+
+  /**
+   * Create a build configuration of the appropriate target.
+   *
+   * @param federate The federate to which the build configuration applies.
+   * @param fileConfig The file configuration of the federation to which the federate belongs.
+   * @param errorReporter An error reporter to report problems.
+   * @return
+   */
+  private BuildConfig getBuildConfig(
+      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+    return switch (federate.targetConfig.target) {
+      case C, CCPP -> new CBuildConfig(federate, fileConfig, errorReporter);
+      case Python -> new PyBuildConfig(federate, fileConfig, errorReporter);
+      case TS -> new TsBuildConfig(federate, fileConfig, errorReporter);
+      case CPP, Rust -> throw new UnsupportedOperationException();
+    };
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/launcher/PyBuildConfig.java b/org.lflang/src/org/lflang/federated/launcher/PyBuildConfig.java
index 85d6dc4a0f..1a8a996349 100644
--- a/org.lflang/src/org/lflang/federated/launcher/PyBuildConfig.java
+++ b/org.lflang/src/org/lflang/federated/launcher/PyBuildConfig.java
@@ -6,17 +6,32 @@
 
 public class PyBuildConfig extends BuildConfig {
 
-    public PyBuildConfig(FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-        super(federate, fileConfig, errorReporter);
-    }
+  public PyBuildConfig(
+      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+    super(federate, fileConfig, errorReporter);
+  }
 
-    @Override
-    public String localExecuteCommand() {
-        return "python3 " + fileConfig.getSrcGenPath() + "/" + federate.name + "/" + federate.name+".py -i $FEDERATION_ID";
-    }
+  @Override
+  public String localExecuteCommand() {
+    return "python3 "
+        + fileConfig.getSrcGenPath()
+        + "/"
+        + federate.name
+        + "/"
+        + federate.name
+        + ".py -i $FEDERATION_ID";
+  }
 
-    @Override
-    public String remoteExecuteCommand() {
-        return "python3 src-gen/"+fileConfig.name+"/"+federate.name+"/"+fileConfig.name+"_"+federate.name+" -i '$FEDERATION_ID'";
-    }
+  @Override
+  public String remoteExecuteCommand() {
+    return "python3 src-gen/"
+        + fileConfig.name
+        + "/"
+        + federate.name
+        + "/"
+        + fileConfig.name
+        + "_"
+        + federate.name
+        + " -i '$FEDERATION_ID'";
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/launcher/RtiConfig.java b/org.lflang/src/org/lflang/federated/launcher/RtiConfig.java
index 81c608d5b3..60e07c9f53 100644
--- a/org.lflang/src/org/lflang/federated/launcher/RtiConfig.java
+++ b/org.lflang/src/org/lflang/federated/launcher/RtiConfig.java
@@ -4,89 +4,66 @@
 
 /**
  * Class for storing configuration settings pertaining to the RTI.
+ *
  * @author Marten Lohstroh
  */
 public class RtiConfig {
 
-    private Path directory;
+  private Path directory;
 
-    /**
-     * The host on which the RTI process is to be spawned.
-     */
-    private String host;
+  /** The host on which the RTI process is to be spawned. */
+  private String host;
 
-    /**
-     * The port on which to connect to the RTI process.
-     */
-    private int port;
+  /** The port on which to connect to the RTI process. */
+  private int port;
 
-    /**
-     * The username used to gain access to the host where the RTI is to be spawned.
-     */
-    private String user;
+  /** The username used to gain access to the host where the RTI is to be spawned. */
+  private String user;
 
-    /**
-     * Construct a new RTI configuration with all options set to their defaults.
-     */
-    public RtiConfig() {
-        this.directory = Path.of("LinguaFrancaRemote");
-        this.host = "localhost";
-        this.port = 0;
-    }
+  /** Construct a new RTI configuration with all options set to their defaults. */
+  public RtiConfig() {
+    this.directory = Path.of("LinguaFrancaRemote");
+    this.host = "localhost";
+    this.port = 0;
+  }
 
-    /**
-     * Return the directory to create on the remote host.
-     */
-    public Path getDirectory() {
-        return directory;
-    }
+  /** Return the directory to create on the remote host. */
+  public Path getDirectory() {
+    return directory;
+  }
 
-    /**
-     * Return the host on which the RTI process is to be spawned.
-     */
-    public String getHost() {
-        return host;
-    }
+  /** Return the host on which the RTI process is to be spawned. */
+  public String getHost() {
+    return host;
+  }
 
-    /**
-     * Return the port on which to connect to the RTI process.
-     */
-    public int getPort() {
-        return port;
-    }
+  /** Return the port on which to connect to the RTI process. */
+  public int getPort() {
+    return port;
+  }
 
-    /**
-     * Return the username used to gain access to the host where the RTI is to be spawned.
-     */
-    public String getUser() {
-        return user;
-    }
+  /** Return the username used to gain access to the host where the RTI is to be spawned. */
+  public String getUser() {
+    return user;
+  }
 
-    /**
-     * Set the directory to create on the remote host.
-     */
-    public void setDirectory(Path directory) {
-        this.directory = directory;
-    }
+  /** Set the directory to create on the remote host. */
+  public void setDirectory(Path directory) {
+    this.directory = directory;
+  }
 
-    /**
-     * Set the host on which the RTI process is to be spawned.
-     */
-    public void setHost(String host) {
-        this.host = host;
-    }
+  /** Set the host on which the RTI process is to be spawned. */
+  public void setHost(String host) {
+    this.host = host;
+  }
 
-    /**
-     * Set the port on which to connect to the RTI process.
-     */
-    public void setPort(int port) {
-        this.port = port;
-    }
+  /** Set the port on which to connect to the RTI process. */
+  public void setPort(int port) {
+    this.port = port;
+  }
 
-    /**
-     * Set the username used to gain access to the host where the RTI is to be spawned.
-     */
-    public void setUser(String user) {
-        this.user = user;
-    }
+  /** Set the username used to gain access to the host where the RTI is to be spawned. */
+  public void setUser(String user) {
+    this.user = user;
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/launcher/TsBuildConfig.java b/org.lflang/src/org/lflang/federated/launcher/TsBuildConfig.java
index 87b7ffaeb1..97f40c767a 100644
--- a/org.lflang/src/org/lflang/federated/launcher/TsBuildConfig.java
+++ b/org.lflang/src/org/lflang/federated/launcher/TsBuildConfig.java
@@ -1,59 +1,59 @@
 /*************
  * Copyright (c) 2019-2021, The University of California at Berkeley.
-
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
-
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
-
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
-
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
 
 package org.lflang.federated.launcher;
 
 import org.lflang.ErrorReporter;
-import org.lflang.TargetConfig;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
 
 /**
- * Utility class that can be used to create a launcher for federated LF programs
- * that are written in TypeScript.
- * 
+ * Utility class that can be used to create a launcher for federated LF programs that are written in
+ * TypeScript.
+ *
  * @author Soroush Bateni
  * @author Hokeun Kim
  * @author Marten Lohstroh
  */
 public class TsBuildConfig extends BuildConfig {
 
-
-    public TsBuildConfig(FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-        super(federate, fileConfig, errorReporter);
-    }
-
-    @Override
-    public String compileCommand() {
-        return null;
-    }
-
-    @Override
-    public String localExecuteCommand() {
-        String jsFilename = federate.name + ".js";
-        return "node "+fileConfig.getSrcGenPath().resolve(federate.name).resolve("dist").resolve(jsFilename)+" -i $FEDERATION_ID";
-    }
-
+  public TsBuildConfig(
+      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+    super(federate, fileConfig, errorReporter);
+  }
+
+  @Override
+  public String compileCommand() {
+    return null;
+  }
+
+  @Override
+  public String localExecuteCommand() {
+    String jsFilename = federate.name + ".js";
+    return "node "
+        + fileConfig.getSrcGenPath().resolve(federate.name).resolve("dist").resolve(jsFilename)
+        + " -i $FEDERATION_ID";
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/serialization/FedNativePythonSerialization.java b/org.lflang/src/org/lflang/federated/serialization/FedNativePythonSerialization.java
index e20588d62d..3947b1bd92 100644
--- a/org.lflang/src/org/lflang/federated/serialization/FedNativePythonSerialization.java
+++ b/org.lflang/src/org/lflang/federated/serialization/FedNativePythonSerialization.java
@@ -1,17 +1,17 @@
 /*************
  * Copyright (c) 2021, The University of California at Berkeley.
  * Copyright (c) 2021, The University of Texas at Dallas.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  * this list of conditions and the following disclaimer.
- * 
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  * this list of conditions and the following disclaimer in the documentation
  * and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -32,91 +32,105 @@
 
 /**
  * Enables support for Python pickle serialization.
- * 
- * @author Soroush Bateni
  *
+ * @author Soroush Bateni
  */
 public class FedNativePythonSerialization implements FedSerialization {
 
-    @Override
-    public boolean isCompatible(GeneratorBase generator) {
-        if (generator.getTarget() != Target.Python ) {
-            throw new UnsupportedOperationException("This class only support Python serialization.");
-        }
-        return true;
+  @Override
+  public boolean isCompatible(GeneratorBase generator) {
+    if (generator.getTarget() != Target.Python) {
+      throw new UnsupportedOperationException("This class only support Python serialization.");
     }
+    return true;
+  }
 
-    @Override
-    public String serializedBufferLength() {
-        return serializedVarName+".len";
-    }
+  @Override
+  public String serializedBufferLength() {
+    return serializedVarName + ".len";
+  }
 
-    @Override
-    public String seializedBufferVar() {
-        return serializedVarName+".buf";
-    }
+  @Override
+  public String seializedBufferVar() {
+    return serializedVarName + ".buf";
+  }
 
-    @Override
-    public StringBuilder generateNetworkSerializerCode(String varName,
-            String originalType) {
-        StringBuilder serializerCode = new StringBuilder();
-
-        // Check that global_pickler is not null
-        serializerCode.append("if (global_pickler == NULL) lf_print_error_and_exit(\"The pickle module is not loaded.\");\n");
-        // Define the serialized PyObject
-        serializerCode.append("PyObject* serialized_pyobject = PyObject_CallMethod(global_pickler, \"dumps\", \"O\", "+varName+");\n");
-
-        // Error check
-        serializerCode.append("if (serialized_pyobject == NULL) {\n");
-        serializerCode.append("    if (PyErr_Occurred()) PyErr_Print();\n");
-        serializerCode.append("    lf_print_error_and_exit(\"Could not serialize serialized_pyobject.\");\n");
-        serializerCode.append("}\n");
-        
-        serializerCode.append("Py_buffer "+serializedVarName+";\n");
-        serializerCode.append("int returnValue = PyBytes_AsStringAndSize(serialized_pyobject, &"+serializedVarName+".buf, &"+serializedVarName+".len);\n");
-        // Error check
-        serializerCode.append("if (returnValue == -1) {\n");
-        serializerCode.append("    if (PyErr_Occurred()) PyErr_Print();\n");
-        serializerCode.append("    lf_print_error_and_exit(\"Could not serialize "+serializedVarName+".\");\n");
-        serializerCode.append("}\n");
-        
-        
-            
-        return serializerCode;
-    }
+  @Override
+  public StringBuilder generateNetworkSerializerCode(String varName, String originalType) {
+    StringBuilder serializerCode = new StringBuilder();
 
-    @Override
-    public StringBuilder generateNetworkDeserializerCode(String varName,
-            String targetType) {
-        StringBuilder deserializerCode = new StringBuilder();
-        
-        // Convert the network message to a Python ByteArray
-        deserializerCode.append("PyObject* message_byte_array = "+
-                "PyBytes_FromStringAndSize((char*)"+varName+"->token->value, "+varName+"->token->length);\n");
-        // Deserialize using Pickle
-        deserializerCode.append("Py_XINCREF(message_byte_array);\n");
-        deserializerCode.append("PyObject* "+deserializedVarName+
-                " = PyObject_CallMethod(global_pickler, \"loads\", \"O\", message_byte_array);\n");
-        // Error check
-        deserializerCode.append("if ("+deserializedVarName+" == NULL) {\n");
-        deserializerCode.append("    if (PyErr_Occurred()) PyErr_Print();\n");
-        deserializerCode.append("    lf_print_error_and_exit(\"Could not deserialize "+deserializedVarName+".\");\n");
-        deserializerCode.append("}\n");
-        
-        // Decrment the reference count
-        deserializerCode.append("Py_XDECREF(message_byte_array);\n");
-        
-        return deserializerCode;
-    }
+    // Check that global_pickler is not null
+    serializerCode.append(
+        "if (global_pickler == NULL) lf_print_error_and_exit(\"The pickle module is not"
+            + " loaded.\");\n");
+    // Define the serialized PyObject
+    serializerCode.append(
+        "PyObject* serialized_pyobject = PyObject_CallMethod(global_pickler, \"dumps\", \"O\", "
+            + varName
+            + ");\n");
 
-    @Override
-    public StringBuilder generatePreambleForSupport() {
-        return new StringBuilder("");
-    }
+    // Error check
+    serializerCode.append("if (serialized_pyobject == NULL) {\n");
+    serializerCode.append("    if (PyErr_Occurred()) PyErr_Print();\n");
+    serializerCode.append(
+        "    lf_print_error_and_exit(\"Could not serialize serialized_pyobject.\");\n");
+    serializerCode.append("}\n");
 
-    @Override
-    public StringBuilder generateCompilerExtensionForSupport() {
-        return new StringBuilder("");
-    }
+    serializerCode.append("Py_buffer " + serializedVarName + ";\n");
+    serializerCode.append(
+        "int returnValue = PyBytes_AsStringAndSize(serialized_pyobject, &"
+            + serializedVarName
+            + ".buf, &"
+            + serializedVarName
+            + ".len);\n");
+    // Error check
+    serializerCode.append("if (returnValue == -1) {\n");
+    serializerCode.append("    if (PyErr_Occurred()) PyErr_Print();\n");
+    serializerCode.append(
+        "    lf_print_error_and_exit(\"Could not serialize " + serializedVarName + ".\");\n");
+    serializerCode.append("}\n");
+
+    return serializerCode;
+  }
+
+  @Override
+  public StringBuilder generateNetworkDeserializerCode(String varName, String targetType) {
+    StringBuilder deserializerCode = new StringBuilder();
+
+    // Convert the network message to a Python ByteArray
+    deserializerCode.append(
+        "PyObject* message_byte_array = "
+            + "PyBytes_FromStringAndSize((char*)"
+            + varName
+            + "->token->value, "
+            + varName
+            + "->token->length);\n");
+    // Deserialize using Pickle
+    deserializerCode.append("Py_XINCREF(message_byte_array);\n");
+    deserializerCode.append(
+        "PyObject* "
+            + deserializedVarName
+            + " = PyObject_CallMethod(global_pickler, \"loads\", \"O\", message_byte_array);\n");
+    // Error check
+    deserializerCode.append("if (" + deserializedVarName + " == NULL) {\n");
+    deserializerCode.append("    if (PyErr_Occurred()) PyErr_Print();\n");
+    deserializerCode.append(
+        "    lf_print_error_and_exit(\"Could not deserialize " + deserializedVarName + ".\");\n");
+    deserializerCode.append("}\n");
+
+    // Decrment the reference count
+    deserializerCode.append("Py_XDECREF(message_byte_array);\n");
+
+    return deserializerCode;
+  }
+
+  @Override
+  public StringBuilder generatePreambleForSupport() {
+    return new StringBuilder("");
+  }
 
+  @Override
+  public StringBuilder generateCompilerExtensionForSupport() {
+    return new StringBuilder("");
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/serialization/FedROS2CPPSerialization.java b/org.lflang/src/org/lflang/federated/serialization/FedROS2CPPSerialization.java
index d116489dca..1384d11517 100644
--- a/org.lflang/src/org/lflang/federated/serialization/FedROS2CPPSerialization.java
+++ b/org.lflang/src/org/lflang/federated/serialization/FedROS2CPPSerialization.java
@@ -1,17 +1,17 @@
 /*************
  * Copyright (c) 2021, The University of California at Berkeley.
  * Copyright (c) 2021, The University of Texas at Dallas.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  * this list of conditions and the following disclaimer.
- * 
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  * this list of conditions and the following disclaimer in the documentation
  * and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -32,179 +32,191 @@
 
 /**
  * Enables support for ROS 2 serialization in C/C++ code.
- * 
- * @author Soroush Bateni
  *
+ * @author Soroush Bateni
  */
 public class FedROS2CPPSerialization implements FedSerialization {
 
-    /**
-     * Check whether the current generator is compatible with the given
-     * serialization technique or not.
-     * 
-     * @param generator The current generator.
-     * @return true if compatible, false if not.
-     */
-    @Override
-    public boolean isCompatible(GeneratorBase generator) {
-        if (generator.getTarget() != Target.C) {
-            generator.errorReporter.reportError("ROS serialization is currently only supported for the C target.");
-            return false;
-        } else if (!generator.getTargetConfig().compiler.equalsIgnoreCase("g++")) {
-            generator.errorReporter.reportError(
-                    "Please use the 'compiler: \"g++\"' target property \n"+
-                    "for ROS serialization"
-            );
-            return false;
-        }
-        return true;
-    }
-    
-    /** 
-     * @return Expression in target language that corresponds to the length
-     *  of the serialized buffer.
-     */
-    @Override
-    public String serializedBufferLength() {
-        return serializedVarName+".size()";
+  /**
+   * Check whether the current generator is compatible with the given serialization technique or
+   * not.
+   *
+   * @param generator The current generator.
+   * @return true if compatible, false if not.
+   */
+  @Override
+  public boolean isCompatible(GeneratorBase generator) {
+    if (generator.getTarget() != Target.C) {
+      generator.errorReporter.reportError(
+          "ROS serialization is currently only supported for the C target.");
+      return false;
+    } else if (!generator.getTargetConfig().compiler.equalsIgnoreCase("g++")) {
+      generator.errorReporter.reportError(
+          "Please use the 'compiler: \"g++\"' target property \n" + "for ROS serialization");
+      return false;
     }
+    return true;
+  }
 
-    /**
-     * @return Expression in target language that is the buffer variable 
-     *  itself.
-     */
-    @Override
-    public String seializedBufferVar() {
-        return serializedVarName+".get_rcl_serialized_message().buffer";
-    }
-    
-    /**
-     * Generate code in C++ that serializes 'varName'. This code
-     * will convert the data in 'varName' from its 'originalType' into an 
-     * uint8_t. The serialized data will be put in a variable called 
-     * 'serialized_message', defined by @see serializedVarName.
-     * 
-     * @param varName The variable to be serialized.
-     * @param originalType The original type of the variable.
-     * @return Target code that serializes the 'varName' from 'type'
-     *  to an unsigned byte array.
-     */
-    @Override
-    public StringBuilder generateNetworkSerializerCode(String varName, String originalType) {
-        StringBuilder serializerCode = new StringBuilder();
-        
-        serializerCode.append("rclcpp::SerializedMessage "+serializedVarName+"(0u);\n");
-        // Use the port type verbatim here, which can result
-        // in compile error if it is not a valid ROS type
-        serializerCode.append("using MessageT = "+originalType+";\n");
-        serializerCode.append("static rclcpp::Serialization<MessageT> _lf_serializer;\n");
-        serializerCode.append("_lf_serializer.serialize_message(&"+varName+"->value , &"+serializedVarName+");\n");
-        
-        return serializerCode;
-    }
-    
-    /**
-     * Variant of @see generateNetworkSerializerCode(String varName, String originalType)
-     * that also supports shared pointer (i.e., std::shared_ptr<>) definitions of ROS port
-     * types.
-     * @param isSharedPtrType Indicates whether the port type is a shared pointer or not.
-     */
-    public StringBuilder generateNetworkSerializerCode(String varName, String originalType, boolean isSharedPtrType) {
-        StringBuilder serializerCode = new StringBuilder();
-        
-        serializerCode.append("rclcpp::SerializedMessage "+serializedVarName+"(0u);\n");
-        // Use the port type verbatim here, which can result
-        // in compile error if it is not a valid ROS type
-        serializerCode.append("using MessageT = "+originalType+";\n");
-        serializerCode.append("static rclcpp::Serialization<MessageT> _lf_serializer;\n");
-        if (isSharedPtrType) {
-            serializerCode.append("_lf_serializer.serialize_message("+varName+"->value.get() , &"+serializedVarName+");\n");
-        } else {
-            serializerCode.append("_lf_serializer.serialize_message(&"+varName+"->value , &"+serializedVarName+");\n");
-        }
-            
-        return serializerCode;
-    }
+  /**
+   * @return Expression in target language that corresponds to the length of the serialized buffer.
+   */
+  @Override
+  public String serializedBufferLength() {
+    return serializedVarName + ".size()";
+  }
 
+  /**
+   * @return Expression in target language that is the buffer variable itself.
+   */
+  @Override
+  public String seializedBufferVar() {
+    return serializedVarName + ".get_rcl_serialized_message().buffer";
+  }
 
-    
-    /**
-     * Generate code in C++ that deserializes 'varName'. This code will
-     * convert the data in 'varName' from a uint8_t into the 'targetType'.
-     * The deserialized data will be put in a variable called deserialized_message
-     * defined by @see deserializedVarName.
-     *  
-     * @param varName The variable to deserialize.
-     * @param targetType The type to deserialize into.
-     * @return Target code that deserializes 'varName' from an unsigned byte array
-     *  to 'type'.
-     */
-    @Override
-    public StringBuilder generateNetworkDeserializerCode(String varName, String targetType) {
-        StringBuilder deserializerCode = new StringBuilder();
-        
-        deserializerCode.append(
-                "auto message = std::make_unique<rcl_serialized_message_t>( rcl_serialized_message_t{\n"
-                + "    .buffer = (uint8_t*)"+varName+".tmplt.token->value,\n"
-                + "    .buffer_length = "+varName+".tmplt.token->length,\n"
-                + "    .buffer_capacity = "+varName+".tmplt.token->length,\n"
-                + "    .allocator = rcl_get_default_allocator()\n"
-                + "});\n"
-        );
-        deserializerCode.append("auto msg = std::make_unique<rclcpp::SerializedMessage>(std::move(*message.get()));\n");
-        deserializerCode.append(varName+".tmplt.token->value = NULL; // Manually move the data\n");
-        // Use the port type verbatim here, which can result
-        // in compile error if it is not a valid ROS type
-        deserializerCode.append("using MessageT = "+targetType+";\n");
-        deserializerCode.append(
-                "MessageT "+deserializedVarName+" = MessageT();\n"
-              + "auto _lf_serializer = rclcpp::Serialization<MessageT>();\n"
-              + "_lf_serializer.deserialize_message(msg.get(), &"+deserializedVarName+");\n"
-        );
-        
-        return deserializerCode;
-    }
+  /**
+   * Generate code in C++ that serializes 'varName'. This code will convert the data in 'varName'
+   * from its 'originalType' into an uint8_t. The serialized data will be put in a variable called
+   * 'serialized_message', defined by @see serializedVarName.
+   *
+   * @param varName The variable to be serialized.
+   * @param originalType The original type of the variable.
+   * @return Target code that serializes the 'varName' from 'type' to an unsigned byte array.
+   */
+  @Override
+  public StringBuilder generateNetworkSerializerCode(String varName, String originalType) {
+    StringBuilder serializerCode = new StringBuilder();
 
-    /**
-     * @return Code in C that includes all the necessary preamble to enable
-     *  support for ROS 2 serialization.
-     */
-    @Override
-    public StringBuilder generatePreambleForSupport() {
-        StringBuilder preamble = new StringBuilder();
-        
-        preamble.append(
-            "#include \"rcutils/allocator.h\"\n"
-          + "#include \"rclcpp/rclcpp.hpp\"\n"
-          + "#include \"rclcpp/serialization.hpp\"\n"
-          + "#include \"rclcpp/serialized_message.hpp\"\n"
-        );
-        
-        return preamble;        
-    }
-    
-    /** 
-     * @return Code that should be appended to the CMakeLists.txt to enable 
-     *  support for ROS 2 serialization.
-     */
-    @Override
-    public StringBuilder generateCompilerExtensionForSupport() {
-        StringBuilder cMakeExtension = new StringBuilder();
-        
-        cMakeExtension.append(
-            "enable_language(CXX)\n"
-          + "set(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -Wno-write-strings -O2\")\n"
-          + "\n"
-          + "find_package(ament_cmake REQUIRED)\n"
-          + "find_package(rclcpp REQUIRED)\n"
-          + "find_package(rclcpp_components REQUIRED)\n"
-          + "find_package(rcutils)\n"
-          + "find_package(rmw REQUIRED)\n"
-          + "\n"
-          + "ament_target_dependencies( ${LF_MAIN_TARGET} rclcpp rmw)"
-        );
-        
-        return cMakeExtension;
+    serializerCode.append("rclcpp::SerializedMessage " + serializedVarName + "(0u);\n");
+    // Use the port type verbatim here, which can result
+    // in compile error if it is not a valid ROS type
+    serializerCode.append("using MessageT = " + originalType + ";\n");
+    serializerCode.append("static rclcpp::Serialization<MessageT> _lf_serializer;\n");
+    serializerCode.append(
+        "_lf_serializer.serialize_message(&"
+            + varName
+            + "->value , &"
+            + serializedVarName
+            + ");\n");
+
+    return serializerCode;
+  }
+
+  /**
+   * Variant of @see generateNetworkSerializerCode(String varName, String originalType) that also
+   * supports shared pointer (i.e., std::shared_ptr<>) definitions of ROS port types.
+   *
+   * @param isSharedPtrType Indicates whether the port type is a shared pointer or not.
+   */
+  public StringBuilder generateNetworkSerializerCode(
+      String varName, String originalType, boolean isSharedPtrType) {
+    StringBuilder serializerCode = new StringBuilder();
+
+    serializerCode.append("rclcpp::SerializedMessage " + serializedVarName + "(0u);\n");
+    // Use the port type verbatim here, which can result
+    // in compile error if it is not a valid ROS type
+    serializerCode.append("using MessageT = " + originalType + ";\n");
+    serializerCode.append("static rclcpp::Serialization<MessageT> _lf_serializer;\n");
+    if (isSharedPtrType) {
+      serializerCode.append(
+          "_lf_serializer.serialize_message("
+              + varName
+              + "->value.get() , &"
+              + serializedVarName
+              + ");\n");
+    } else {
+      serializerCode.append(
+          "_lf_serializer.serialize_message(&"
+              + varName
+              + "->value , &"
+              + serializedVarName
+              + ");\n");
     }
 
+    return serializerCode;
+  }
+
+  /**
+   * Generate code in C++ that deserializes 'varName'. This code will convert the data in 'varName'
+   * from a uint8_t into the 'targetType'. The deserialized data will be put in a variable called
+   * deserialized_message defined by @see deserializedVarName.
+   *
+   * @param varName The variable to deserialize.
+   * @param targetType The type to deserialize into.
+   * @return Target code that deserializes 'varName' from an unsigned byte array to 'type'.
+   */
+  @Override
+  public StringBuilder generateNetworkDeserializerCode(String varName, String targetType) {
+    StringBuilder deserializerCode = new StringBuilder();
+
+    deserializerCode.append(
+        "auto message = std::make_unique<rcl_serialized_message_t>( rcl_serialized_message_t{\n"
+            + "    .buffer = (uint8_t*)"
+            + varName
+            + ".tmplt.token->value,\n"
+            + "    .buffer_length = "
+            + varName
+            + ".tmplt.token->length,\n"
+            + "    .buffer_capacity = "
+            + varName
+            + ".tmplt.token->length,\n"
+            + "    .allocator = rcl_get_default_allocator()\n"
+            + "});\n");
+    deserializerCode.append(
+        "auto msg = std::make_unique<rclcpp::SerializedMessage>(std::move(*message.get()));\n");
+    deserializerCode.append(varName + ".tmplt.token->value = NULL; // Manually move the data\n");
+    // Use the port type verbatim here, which can result
+    // in compile error if it is not a valid ROS type
+    deserializerCode.append("using MessageT = " + targetType + ";\n");
+    deserializerCode.append(
+        "MessageT "
+            + deserializedVarName
+            + " = MessageT();\n"
+            + "auto _lf_serializer = rclcpp::Serialization<MessageT>();\n"
+            + "_lf_serializer.deserialize_message(msg.get(), &"
+            + deserializedVarName
+            + ");\n");
+
+    return deserializerCode;
+  }
+
+  /**
+   * @return Code in C that includes all the necessary preamble to enable support for ROS 2
+   *     serialization.
+   */
+  @Override
+  public StringBuilder generatePreambleForSupport() {
+    StringBuilder preamble = new StringBuilder();
+
+    preamble.append(
+        "#include \"rcutils/allocator.h\"\n"
+            + "#include \"rclcpp/rclcpp.hpp\"\n"
+            + "#include \"rclcpp/serialization.hpp\"\n"
+            + "#include \"rclcpp/serialized_message.hpp\"\n");
+
+    return preamble;
+  }
+
+  /**
+   * @return Code that should be appended to the CMakeLists.txt to enable support for ROS 2
+   *     serialization.
+   */
+  @Override
+  public StringBuilder generateCompilerExtensionForSupport() {
+    StringBuilder cMakeExtension = new StringBuilder();
+
+    cMakeExtension.append(
+        "enable_language(CXX)\n"
+            + "set(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -Wno-write-strings -O2\")\n"
+            + "\n"
+            + "find_package(ament_cmake REQUIRED)\n"
+            + "find_package(rclcpp REQUIRED)\n"
+            + "find_package(rclcpp_components REQUIRED)\n"
+            + "find_package(rcutils)\n"
+            + "find_package(rmw REQUIRED)\n"
+            + "\n"
+            + "ament_target_dependencies( ${LF_MAIN_TARGET} rclcpp rmw)");
+
+    return cMakeExtension;
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/serialization/FedSerialization.java b/org.lflang/src/org/lflang/federated/serialization/FedSerialization.java
index 9b7ba0b2eb..fab7201c21 100644
--- a/org.lflang/src/org/lflang/federated/serialization/FedSerialization.java
+++ b/org.lflang/src/org/lflang/federated/serialization/FedSerialization.java
@@ -3,80 +3,69 @@
 import org.lflang.generator.GeneratorBase;
 
 /**
- * Interface to enable support for automatic data serialization 
- * in target code.
- * 
- * @author Soroush Bateni
+ * Interface to enable support for automatic data serialization in target code.
  *
+ * @author Soroush Bateni
  */
 public interface FedSerialization {
-    
-    /**
-     * Variable name in the target language for the serialized data.
-     */
-    final static String serializedVarName = "serialized_message";
-    
-    /**
-     * Variable name in the target language for the deserialized data.
-     */
-    final static String deserializedVarName = "deserialized_message";
-    
-    /**
-     * Check whether the current generator is compatible with the given
-     * serialization technique or not.
-     * 
-     * @param generator The current generator.
-     * @return true if compatible, false if not.
-     */
-    public boolean isCompatible(GeneratorBase generator);
 
-    /** 
-     * @return Expression in target language that corresponds to the length
-     *  of the serialized buffer.
-     */
-    public String serializedBufferLength();
-    
-    /**
-     * @return Expression in target language that is the buffer variable 
-     *  itself.
-     */
-    public String seializedBufferVar();
-    
-    /**
-     * Generate code in target language that serializes 'varName'. This code
-     * will convert the data in 'varName' from its 'originalType' into an 
-     * unsigned byte array. The serialized data will be put in a variable 
-     * with the name defined by @see serializedVarName.
-     * 
-     * @param varName The variable to be serialized.
-     * @param originalType The original type of the variable.
-     * @return Target code that serializes the 'varName' from 'type'
-     *  to an unsigned byte array.
-     */
-    public StringBuilder generateNetworkSerializerCode(String varName, String originalType);
-    
-    /**
-     * Generate code in target language that deserializes 'varName'. This code will
-     * convert the data in 'varName' from an unsigned byte array into the 'targetType'.
-     * The deserialized data will be put in a variable with the name defined by 
-     * @see deserializedVarName.
-     *  
-     * @param varName The variable to deserialize.
-     * @param targetType The type to deserialize into.
-     * @return Target code that deserializes 'varName' from an unsigned byte array
-     *  to 'type'.
-     */
-    public StringBuilder generateNetworkDeserializerCode(String varName, String targetType);
-    
-    /**
-     * @return Code in target language that includes all the necessary preamble to enable
-     *  support for the current serializer.
-     */
-    public StringBuilder generatePreambleForSupport();
-    
-    /** 
-     * @return Code that should be appended to the compiler instructions (e.g., flags to gcc or
-     *  additional lines to a CMakeLists.txt) to enable support for the current serializer.
-     */
-    public StringBuilder generateCompilerExtensionForSupport();
+  /** Variable name in the target language for the serialized data. */
+  static final String serializedVarName = "serialized_message";
+
+  /** Variable name in the target language for the deserialized data. */
+  static final String deserializedVarName = "deserialized_message";
+
+  /**
+   * Check whether the current generator is compatible with the given serialization technique or
+   * not.
+   *
+   * @param generator The current generator.
+   * @return true if compatible, false if not.
+   */
+  public boolean isCompatible(GeneratorBase generator);
+
+  /**
+   * @return Expression in target language that corresponds to the length of the serialized buffer.
+   */
+  public String serializedBufferLength();
+
+  /**
+   * @return Expression in target language that is the buffer variable itself.
+   */
+  public String seializedBufferVar();
+
+  /**
+   * Generate code in target language that serializes 'varName'. This code will convert the data in
+   * 'varName' from its 'originalType' into an unsigned byte array. The serialized data will be put
+   * in a variable with the name defined by @see serializedVarName.
+   *
+   * @param varName The variable to be serialized.
+   * @param originalType The original type of the variable.
+   * @return Target code that serializes the 'varName' from 'type' to an unsigned byte array.
+   */
+  public StringBuilder generateNetworkSerializerCode(String varName, String originalType);
+
+  /**
+   * Generate code in target language that deserializes 'varName'. This code will convert the data
+   * in 'varName' from an unsigned byte array into the 'targetType'. The deserialized data will be
+   * put in a variable with the name defined by
+   *
+   * @see deserializedVarName.
+   * @param varName The variable to deserialize.
+   * @param targetType The type to deserialize into.
+   * @return Target code that deserializes 'varName' from an unsigned byte array to 'type'.
+   */
+  public StringBuilder generateNetworkDeserializerCode(String varName, String targetType);
+
+  /**
+   * @return Code in target language that includes all the necessary preamble to enable support for
+   *     the current serializer.
+   */
+  public StringBuilder generatePreambleForSupport();
+
+  /**
+   * @return Code that should be appended to the compiler instructions (e.g., flags to gcc or
+   *     additional lines to a CMakeLists.txt) to enable support for the current serializer.
+   */
+  public StringBuilder generateCompilerExtensionForSupport();
 }
diff --git a/org.lflang/src/org/lflang/federated/serialization/SupportedSerializers.java b/org.lflang/src/org/lflang/federated/serialization/SupportedSerializers.java
index 332ab6152c..4767f3f4d7 100644
--- a/org.lflang/src/org/lflang/federated/serialization/SupportedSerializers.java
+++ b/org.lflang/src/org/lflang/federated/serialization/SupportedSerializers.java
@@ -2,23 +2,25 @@
 
 /**
  * The supported serializers.
+ *
  * @author Soroush Bateni
  */
 public enum SupportedSerializers {
-    NATIVE("native"), // Dangerous: just copies the memory layout of the sender
-    ROS2("ros2"),
-    PROTO("proto");
+  NATIVE("native"), // Dangerous: just copies the memory layout of the sender
+  ROS2("ros2"),
+  PROTO("proto");
 
-    private String serializer;
-    SupportedSerializers(String serializer) {
-        this.serializer = serializer;
-    }
-    
-    public String getSerializer() {
-        return serializer;
-    }
-    
-    public void setSerializer(String serializer) {
-        this.serializer = serializer;
-    }
+  private String serializer;
+
+  SupportedSerializers(String serializer) {
+    this.serializer = serializer;
+  }
+
+  public String getSerializer() {
+    return serializer;
+  }
+
+  public void setSerializer(String serializer) {
+    this.serializer = serializer;
+  }
 }
diff --git a/org.lflang/src/org/lflang/federated/validation/FedValidator.java b/org.lflang/src/org/lflang/federated/validation/FedValidator.java
index 49add78557..9aeb535d2f 100644
--- a/org.lflang/src/org/lflang/federated/validation/FedValidator.java
+++ b/org.lflang/src/org/lflang/federated/validation/FedValidator.java
@@ -3,9 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
+import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Input;
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.Output;
@@ -13,57 +12,55 @@
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
 
-/**
- * Helper class that is used to validate a federated reactor.
- */
+/** Helper class that is used to validate a federated reactor. */
 public class FedValidator {
 
-    public static void validateFederatedReactor(Reactor reactor, ErrorReporter errorReporter) {
-        if (!reactor.isFederated()) return;
+  public static void validateFederatedReactor(Reactor reactor, ErrorReporter errorReporter) {
+    if (!reactor.isFederated()) return;
 
-        // Construct the set of excluded reactions for this federate.
-        // If a reaction is a network reaction that belongs to this federate, we
-        // don't need to perform this analysis.
-        Iterable<Reaction> reactions = ASTUtils.allReactions(reactor);
-        for (Reaction react : reactions) {
-            // Create a collection of all the VarRefs (i.e., triggers, sources, and effects) in the react
-            // signature that are ports that reference federates.
-            // We then later check that all these VarRefs reference this federate. If not, we will add this
-            // react to the list of reactions that have to be excluded (note that mixing VarRefs from
-            // different federates is not allowed).
-            List<VarRef> allVarRefsReferencingFederates = new ArrayList<>();
-            // Add all the triggers that are outputs
-            Stream<VarRef> triggersAsVarRef = react.getTriggers().stream().filter(it -> it instanceof VarRef).map(it -> (VarRef) it);
-            allVarRefsReferencingFederates.addAll(
-                triggersAsVarRef.filter(it -> it.getVariable() instanceof Output).toList()
-            );
-            // Add all the sources that are outputs
-            allVarRefsReferencingFederates.addAll(
-                react.getSources().stream().filter(it -> it.getVariable() instanceof Output).toList()
-            );
-            // Add all the effects that are inputs
-            allVarRefsReferencingFederates.addAll(
-                react.getEffects().stream().filter(it -> it.getVariable() instanceof Input).toList()
-            );
-            containsAllVarRefs(allVarRefsReferencingFederates, errorReporter);
-        }
+    // Construct the set of excluded reactions for this federate.
+    // If a reaction is a network reaction that belongs to this federate, we
+    // don't need to perform this analysis.
+    Iterable<Reaction> reactions = ASTUtils.allReactions(reactor);
+    for (Reaction react : reactions) {
+      // Create a collection of all the VarRefs (i.e., triggers, sources, and effects) in the react
+      // signature that are ports that reference federates.
+      // We then later check that all these VarRefs reference this federate. If not, we will add
+      // this
+      // react to the list of reactions that have to be excluded (note that mixing VarRefs from
+      // different federates is not allowed).
+      List<VarRef> allVarRefsReferencingFederates = new ArrayList<>();
+      // Add all the triggers that are outputs
+      Stream<VarRef> triggersAsVarRef =
+          react.getTriggers().stream().filter(it -> it instanceof VarRef).map(it -> (VarRef) it);
+      allVarRefsReferencingFederates.addAll(
+          triggersAsVarRef.filter(it -> it.getVariable() instanceof Output).toList());
+      // Add all the sources that are outputs
+      allVarRefsReferencingFederates.addAll(
+          react.getSources().stream().filter(it -> it.getVariable() instanceof Output).toList());
+      // Add all the effects that are inputs
+      allVarRefsReferencingFederates.addAll(
+          react.getEffects().stream().filter(it -> it.getVariable() instanceof Input).toList());
+      containsAllVarRefs(allVarRefsReferencingFederates, errorReporter);
     }
+  }
 
-    /**
-     * Check if this federate contains all the {@code varRefs}. If not, report an error using {@code errorReporter}.
-     */
-    private static void containsAllVarRefs(List<VarRef> varRefs, ErrorReporter errorReporter) {
-        var referencesFederate = false;
-        Instantiation instantiation = null;
-        for (VarRef varRef : varRefs) {
-            if (instantiation == null) {
-                instantiation = varRef.getContainer();
-                referencesFederate = true;
-            } else if (!varRef.getContainer().equals(instantiation)) {
-                    errorReporter.reportError(varRef, "Mixed triggers and effects from" +
-                        " different federates. This is not permitted");
-            }
-        }
-
+  /**
+   * Check if this federate contains all the {@code varRefs}. If not, report an error using {@code
+   * errorReporter}.
+   */
+  private static void containsAllVarRefs(List<VarRef> varRefs, ErrorReporter errorReporter) {
+    var referencesFederate = false;
+    Instantiation instantiation = null;
+    for (VarRef varRef : varRefs) {
+      if (instantiation == null) {
+        instantiation = varRef.getContainer();
+        referencesFederate = true;
+      } else if (!varRef.getContainer().equals(instantiation)) {
+        errorReporter.reportError(
+            varRef,
+            "Mixed triggers and effects from" + " different federates. This is not permitted");
+      }
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/formatting2/LFFormatter.java b/org.lflang/src/org/lflang/formatting2/LFFormatter.java
index 2a5e60cdc8..7df4053eef 100644
--- a/org.lflang/src/org/lflang/formatting2/LFFormatter.java
+++ b/org.lflang/src/org/lflang/formatting2/LFFormatter.java
@@ -4,8 +4,8 @@
 
 package org.lflang.formatting2;
 
+import com.google.inject.Inject;
 import java.util.List;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.formatting2.FormatterRequest;
 import org.eclipse.xtext.formatting2.IFormatter2;
@@ -15,38 +15,32 @@
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
-
 import org.lflang.ast.FormattingUtils;
 
-import com.google.inject.Inject;
-
 public class LFFormatter implements IFormatter2 {
 
-    @Inject
-    private IResourceValidator validator;
+  @Inject private IResourceValidator validator;
 
-    @Override
-    public List<ITextReplacement> format(FormatterRequest request) {
-        // TODO: Use a CancelIndicator that actually cancels?
-        if (!request.getTextRegionAccess().getResource().getErrors().isEmpty()
-            || !validator.validate(
+  @Override
+  public List<ITextReplacement> format(FormatterRequest request) {
+    // TODO: Use a CancelIndicator that actually cancels?
+    if (!request.getTextRegionAccess().getResource().getErrors().isEmpty()
+        || !validator
+            .validate(
                 request.getTextRegionAccess().getResource(),
                 CheckMode.ALL,
-                CancelIndicator.NullImpl
-            ).isEmpty()
-        ) {
-            return List.of();
-        }
-        ITextSegment documentRegion = request.getTextRegionAccess().regionForDocument();
-        List<EObject> documentContents = request.getTextRegionAccess().getResource().getContents();
-        if (documentContents.isEmpty()) return List.of();
-        return List.of(
-            new TextReplacement(
-                request.getTextRegionAccess(),
-                documentRegion.getOffset(),
-                documentRegion.getLength(),
-                FormattingUtils.render(documentContents.get(0))
-            )
-        );
+                CancelIndicator.NullImpl)
+            .isEmpty()) {
+      return List.of();
     }
+    ITextSegment documentRegion = request.getTextRegionAccess().regionForDocument();
+    List<EObject> documentContents = request.getTextRegionAccess().getResource().getContents();
+    if (documentContents.isEmpty()) return List.of();
+    return List.of(
+        new TextReplacement(
+            request.getTextRegionAccess(),
+            documentRegion.getOffset(),
+            documentRegion.getLength(),
+            FormattingUtils.render(documentContents.get(0))));
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/ActionInstance.java b/org.lflang/src/org/lflang/generator/ActionInstance.java
index bdc8793383..b749a26426 100644
--- a/org.lflang/src/org/lflang/generator/ActionInstance.java
+++ b/org.lflang/src/org/lflang/generator/ActionInstance.java
@@ -1,28 +1,28 @@
 /* Instance of an action. */
 
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
@@ -32,69 +32,69 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 
 /**
  * Instance of an action.
+ *
  * @author Edward A. Lee
  * @author Marten Lohstroh
  */
 public class ActionInstance extends TriggerInstance<Action> {
 
-    /** The constant default for a minimum delay. */
-    public static final TimeValue DEFAULT_MIN_DELAY = TimeValue.ZERO;
+  /** The constant default for a minimum delay. */
+  public static final TimeValue DEFAULT_MIN_DELAY = TimeValue.ZERO;
 
-    /** The minimum delay for this action. */
-    private TimeValue minDelay = DEFAULT_MIN_DELAY;
+  /** The minimum delay for this action. */
+  private TimeValue minDelay = DEFAULT_MIN_DELAY;
 
-    /** The minimum spacing between action events. */
-    private TimeValue minSpacing = null;
+  /** The minimum spacing between action events. */
+  private TimeValue minSpacing = null;
 
-    /** The replacement policy for when minimum spacing is violated. */
-    private String policy = null;
+  /** The replacement policy for when minimum spacing is violated. */
+  private String policy = null;
 
-    /** Indicator of whether the action is physical. */
-    private boolean physical;
+  /** Indicator of whether the action is physical. */
+  private boolean physical;
 
-    /**
-     * Create a new action instance.
-     * If the definition is null, then this is a shutdown action.
-     * @param definition The AST definition, or null for startup.
-     * @param parent The parent reactor.
-     */
-    public ActionInstance(Action definition, ReactorInstance parent) {
-        super(definition, parent);
-        if (parent == null) {
-            throw new InvalidSourceException("Cannot create an ActionInstance with no parent.");
-        }
-        if (definition != null) {
-            if (definition.getMinDelay() != null) {
-                this.minDelay = parent.getTimeValue(definition.getMinDelay());
-            }
-            if (definition.getMinSpacing() != null) {
-                this.minSpacing = parent.getTimeValue(definition.getMinSpacing());
-            }
-            if (definition.getOrigin() == ActionOrigin.PHYSICAL) {
-                physical = true;
-            }
-            policy = definition.getPolicy();
-        }
+  /**
+   * Create a new action instance. If the definition is null, then this is a shutdown action.
+   *
+   * @param definition The AST definition, or null for startup.
+   * @param parent The parent reactor.
+   */
+  public ActionInstance(Action definition, ReactorInstance parent) {
+    super(definition, parent);
+    if (parent == null) {
+      throw new InvalidSourceException("Cannot create an ActionInstance with no parent.");
     }
-
-    /** Return the minimum delay for this action. */
-    public TimeValue getMinDelay() {
-        return minDelay;
+    if (definition != null) {
+      if (definition.getMinDelay() != null) {
+        this.minDelay = parent.getTimeValue(definition.getMinDelay());
+      }
+      if (definition.getMinSpacing() != null) {
+        this.minSpacing = parent.getTimeValue(definition.getMinSpacing());
+      }
+      if (definition.getOrigin() == ActionOrigin.PHYSICAL) {
+        physical = true;
+      }
+      policy = definition.getPolicy();
     }
-    
-    /** Return the minimum spacing between action events. */
-    public TimeValue getMinSpacing() {
-        return minSpacing;
-    }
-    
-    /** Return the replacement policy for when minimum spacing is violated. */
-    public String getPolicy() {
-        return policy;
-    }
-    
-    /** Return the indicator of whether the action is physical. */
-    public boolean isPhysical() {
-        return physical;
-    }
-
+  }
+
+  /** Return the minimum delay for this action. */
+  public TimeValue getMinDelay() {
+    return minDelay;
+  }
+
+  /** Return the minimum spacing between action events. */
+  public TimeValue getMinSpacing() {
+    return minSpacing;
+  }
+
+  /** Return the replacement policy for when minimum spacing is violated. */
+  public String getPolicy() {
+    return policy;
+  }
+
+  /** Return the indicator of whether the action is physical. */
+  public boolean isPhysical() {
+    return physical;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/CodeBuilder.java b/org.lflang/src/org/lflang/generator/CodeBuilder.java
index 2b77239680..e4e92294fb 100644
--- a/org.lflang/src/org/lflang/generator/CodeBuilder.java
+++ b/org.lflang/src/org/lflang/generator/CodeBuilder.java
@@ -1,533 +1,555 @@
 package org.lflang.generator;
 
-import java.nio.file.Path;
-import java.io.IOException;
+import static org.lflang.generator.c.CMixedRadixGenerator.*;
+import static org.lflang.util.StringUtil.joinObjects;
 
+import java.io.IOException;
+import java.nio.file.Path;
 import org.eclipse.emf.common.CommonPlugin;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
-import org.lflang.federated.generator.FederateInstance;
 import org.lflang.generator.c.CUtil;
 import org.lflang.lf.Code;
 import org.lflang.util.FileUtil;
-import static org.lflang.generator.c.CMixedRadixGenerator.*;
-import static org.lflang.util.StringUtil.joinObjects;
 
 /**
- * Helper class for printing code with indentation.
- * This class is backed by a StringBuilder and is used to accumulate
- * code to be printed to a file. Its main function is to handle indentation.
+ * Helper class for printing code with indentation. This class is backed by a StringBuilder and is
+ * used to accumulate code to be printed to a file. Its main function is to handle indentation.
  *
  * @author Edward A. Lee
  * @author Peter Donovan
  */
 public class CodeBuilder {
 
-    /**
-     * Construct a new empty code emitter.
-     */
-    public CodeBuilder() {}
-
-    /**
-     * Construct a new code emitter with the text and indentation
-     * of the specified code emitter.
-     * @param model The model code emitter.
-     */
-    public CodeBuilder(CodeBuilder model) {
-        indentation = model.indentation;
-        code.append(model);
-    }
-
-    /////////////////////////////////////////////
-    ///// Public methods.
-
-    /**
-     * Get the code produced so far.
-     * @return The code produced so far as a String.
-     */
-    public String getCode() {
-        return code.toString();
-    }
-
-    /**
-     * Increase the indentation of the output code produced.
-     */
-    public void indent() {
-        indentation += "    ";
-    }
-
-    /**
-     * Insert the specified text at the specified position.
-     * @param position The position.
-     * @param text The text.
-     */
-    public void insert(int position, String text) {
-        code.insert(position, text);
-    }
-
-    /**
-     * Return the length of the code in characters.
-     */
-    public int length() {
-        return code.length();
-    }
-
-    /**
-     * Add a new line.
-     */
-    public void newLine() {
-        this.pr("");
-    }
-
-    /**
-     * Append the specified text plus a final newline.
-     * @param format A format string to be used by {@code String.format} or
-     *  the text to append if no further arguments are given.
-     * @param args Additional arguments to pass to the formatter.
-     */
-    public void pr(String format, Object... args) {
-        pr(
-            (args != null && args.length > 0) ? String.format(format, args) : format
-        );
-    }
-
-    /**
-     * Append the given text to the code buffer at the current indentation level.
-     */
-    public void pr(CharSequence text) {
-        for (String line : (Iterable<? extends String>) () -> text.toString().lines().iterator()) {
-            code.append(indentation).append(line).append("\n");
-        }
+  /** Construct a new empty code emitter. */
+  public CodeBuilder() {}
+
+  /**
+   * Construct a new code emitter with the text and indentation of the specified code emitter.
+   *
+   * @param model The model code emitter.
+   */
+  public CodeBuilder(CodeBuilder model) {
+    indentation = model.indentation;
+    code.append(model);
+  }
+
+  /////////////////////////////////////////////
+  ///// Public methods.
+
+  /**
+   * Get the code produced so far.
+   *
+   * @return The code produced so far as a String.
+   */
+  public String getCode() {
+    return code.toString();
+  }
+
+  /** Increase the indentation of the output code produced. */
+  public void indent() {
+    indentation += "    ";
+  }
+
+  /**
+   * Insert the specified text at the specified position.
+   *
+   * @param position The position.
+   * @param text The text.
+   */
+  public void insert(int position, String text) {
+    code.insert(position, text);
+  }
+
+  /** Return the length of the code in characters. */
+  public int length() {
+    return code.length();
+  }
+
+  /** Add a new line. */
+  public void newLine() {
+    this.pr("");
+  }
+
+  /**
+   * Append the specified text plus a final newline.
+   *
+   * @param format A format string to be used by {@code String.format} or the text to append if no
+   *     further arguments are given.
+   * @param args Additional arguments to pass to the formatter.
+   */
+  public void pr(String format, Object... args) {
+    pr((args != null && args.length > 0) ? String.format(format, args) : format);
+  }
+
+  /** Append the given text to the code buffer at the current indentation level. */
+  public void pr(CharSequence text) {
+    for (String line : (Iterable<? extends String>) () -> text.toString().lines().iterator()) {
+      code.append(indentation).append(line).append("\n");
     }
-
-    /**
-     * Version of pr() that prints a source line number using a #line
-     * prior to each line of the output. Use this when multiple lines of
-     * output code are all due to the same source line in the .lf file.
-     * @param eObject The AST node that this source line is based on.
-     * @param text The text to append.
-     */
-    public void pr(EObject eObject, Object text) {
-        var split = text.toString().split("\n");
-        for (String line : split) {
-            prSourceLineNumber(eObject);
-            pr(line);
-        }
+  }
+
+  /**
+   * Version of pr() that prints a source line number using a #line prior to each line of the
+   * output. Use this when multiple lines of output code are all due to the same source line in the
+   * .lf file.
+   *
+   * @param eObject The AST node that this source line is based on.
+   * @param text The text to append.
+   */
+  public void pr(EObject eObject, Object text) {
+    var split = text.toString().split("\n");
+    for (String line : split) {
+      prSourceLineNumber(eObject);
+      pr(line);
     }
-
-    /** Print the #line compiler directive with the line number of
-     *  the specified object.
-     *  @param eObject The node.
-     */
-    public void prSourceLineNumber(EObject eObject) {
-        var node = NodeModelUtils.getNode(eObject);
-        if (node != null) {
-            // For code blocks (delimited by {= ... =}, unfortunately,
-            // we have to adjust the offset by the number of newlines before {=.
-            // Unfortunately, this is complicated because the code has been
-            // tokenized.
-            var offset = 0;
-            if (eObject instanceof Code) {
-                offset += 1;
-            }
-            // Extract the filename from eResource, an astonishingly difficult thing to do.
-            String filePath = CommonPlugin.resolve(eObject.eResource().getURI()).path();
-            pr("#line " + (node.getStartLine() + offset) + " \"" + filePath + "\"");
-        }
+  }
+
+  /**
+   * Print the #line compiler directive with the line number of the specified object.
+   *
+   * @param eObject The node.
+   */
+  public void prSourceLineNumber(EObject eObject) {
+    var node = NodeModelUtils.getNode(eObject);
+    if (node != null) {
+      // For code blocks (delimited by {= ... =}, unfortunately,
+      // we have to adjust the offset by the number of newlines before {=.
+      // Unfortunately, this is complicated because the code has been
+      // tokenized.
+      var offset = 0;
+      if (eObject instanceof Code) {
+        offset += 1;
+      }
+      // Extract the filename from eResource, an astonishingly difficult thing to do.
+      String filePath = CommonPlugin.resolve(eObject.eResource().getURI()).path();
+      pr("#line " + (node.getStartLine() + offset) + " \"" + filePath + "\"");
     }
-
-    /**
-     * Append a single-line, C-style comment to the code.
-     * @param comment The comment.
-     */
-    public void prComment(String comment) {
-        pr("// " + comment);
+  }
+
+  /**
+   * Append a single-line, C-style comment to the code.
+   *
+   * @param comment The comment.
+   */
+  public void prComment(String comment) {
+    pr("// " + comment);
+  }
+
+  /**
+   * Remove all lines that start with the specified prefix and return a new CodeBuilder with the
+   * result.
+   *
+   * @param prefix The prefix.
+   */
+  public CodeBuilder removeLines(String prefix) {
+    String separator = "\n";
+    String[] lines = toString().split(separator);
+
+    CodeBuilder builder = new CodeBuilder();
+
+    for (String line : lines) {
+      String trimmedLine = line.trim();
+      if (!trimmedLine.startsWith(prefix)) {
+        builder.pr(line);
+      }
     }
-
-    /**
-     * Remove all lines that start with the specified prefix
-     * and return a new CodeBuilder with the result.
-     * @param prefix The prefix.
-     */
-    public CodeBuilder removeLines(String prefix) {
-        String separator = "\n";
-        String[] lines = toString().split(separator);
-
-        CodeBuilder builder = new CodeBuilder();
-
-        for(String line : lines) {
-            String trimmedLine = line.trim();
-            if(!trimmedLine.startsWith(prefix)) {
-                builder.pr(line);
-            }
-        }
-        return builder;
+    return builder;
+  }
+
+  /**
+   * Start a scoped block, which is a section of code surrounded by curley braces and indented. This
+   * must be followed by an {@link #endScopedBlock()}.
+   */
+  public void startScopedBlock() {
+    pr("{");
+    indent();
+  }
+
+  /**
+   * Start a scoped block for the specified reactor. If the reactor is a bank, then this starts a
+   * for loop that iterates over the bank members using a standard index variable whose name is that
+   * returned by {@link CUtil#bankIndex(ReactorInstance)}. If the reactor is null or is not a bank,
+   * then this simply starts a scoped block by printing an opening curly brace. This also adds a
+   * declaration of a pointer to the self struct of the reactor or bank member.
+   *
+   * <p>This block is intended to be nested, where each block is put within a similar block for the
+   * reactor's parent. This ensures that all (possibly nested) bank index variables are defined
+   * within the block.
+   *
+   * <p>This must be followed by an {@link #endScopedBlock()}.
+   *
+   * @param reactor The reactor instance.
+   */
+  public void startScopedBlock(ReactorInstance reactor) {
+    if (reactor != null && reactor.isBank()) {
+      var index = CUtil.bankIndexName(reactor);
+      pr("// Reactor is a bank. Iterate over bank members.");
+      pr("for (int " + index + " = 0; " + index + " < " + reactor.width + "; " + index + "++) {");
+      indent();
+    } else {
+      startScopedBlock();
     }
-
-    /**
-     * Start a scoped block, which is a section of code
-     * surrounded by curley braces and indented.
-     * This must be followed by an {@link #endScopedBlock()}.
-     */
-    public void startScopedBlock() {
-        pr("{");
-        indent();
+  }
+
+  /**
+   * If the specified port is a multiport, then start a specified iteration over the channels of the
+   * multiport using as the channel index the variable name returned by {@link
+   * CUtil#channelIndex(PortInstance)}. If the port is not a multiport, do nothing. This is required
+   * to be followed by {@link #endChannelIteration(PortInstance)}.
+   *
+   * @param port The port.
+   */
+  public void startChannelIteration(PortInstance port) {
+    if (port.isMultiport) {
+      var channel = CUtil.channelIndexName(port);
+      pr("// Port " + port.getFullName() + " is a multiport. Iterate over its channels.");
+      pr(
+          "for (int "
+              + channel
+              + " = 0; "
+              + channel
+              + " < "
+              + port.width
+              + "; "
+              + channel
+              + "++) {");
+      indent();
     }
-
-    /**
-     * Start a scoped block for the specified reactor.
-     * If the reactor is a bank, then this starts a for loop
-     * that iterates over the bank members using a standard index
-     * variable whose name is that returned by {@link CUtil#bankIndex(ReactorInstance)}.
-     * If the reactor is null or is not a bank, then this simply
-     * starts a scoped block by printing an opening curly brace.
-     * This also adds a declaration of a pointer to the self
-     * struct of the reactor or bank member.
-     *
-     * This block is intended to be nested, where each block is
-     * put within a similar block for the reactor's parent.
-     * This ensures that all (possibly nested) bank index variables
-     * are defined within the block.
-     *
-     * This must be followed by an {@link #endScopedBlock()}.
-     *
-     * @param reactor The reactor instance.
-     */
-    public void startScopedBlock(
-        ReactorInstance reactor
-    ) {
-        if (reactor != null && reactor.isBank()) {
-            var index = CUtil.bankIndexName(reactor);
-            pr("// Reactor is a bank. Iterate over bank members.");
-            pr("for (int "+index+" = 0; "+index+" < "+reactor.width+"; "+index+"++) {");
-            indent();
-        } else {
-            startScopedBlock();
-        }
+  }
+
+  /**
+   * Start a scoped block to iterate over bank members and channels for the specified port with a
+   * variable with the name given by count counting the iterations. If this port is a multiport,
+   * then the channel index variable name is that returned by {@link
+   * CUtil#channelIndex(PortInstance)}.
+   *
+   * <p>This block is intended to be nested, where each block is put within a similar block for the
+   * reactor's parent.
+   *
+   * <p>This is required to be followed by a call to {@link
+   * #endScopedBankChannelIteration(PortInstance, String)}.
+   *
+   * @param port The port.
+   * @param count The variable name to use for the counter, or null to not provide a counter.
+   */
+  public void startScopedBankChannelIteration(PortInstance port, String count) {
+    if (count != null) {
+      startScopedBlock();
+      pr("int " + count + " = 0;");
     }
-
-    /**
-     * If the specified port is a multiport, then start a specified iteration
-     * over the channels of the multiport using as the channel index the
-     * variable name returned by {@link CUtil#channelIndex(PortInstance)}.
-     * If the port is not a multiport, do nothing.
-     * This is required to be followed by {@link #endChannelIteration(PortInstance)}.
-     * @param port The port.
-     */
-    public void startChannelIteration(PortInstance port) {
-        if (port.isMultiport) {
-            var channel = CUtil.channelIndexName(port);
-            pr("// Port "+port.getFullName()+" is a multiport. Iterate over its channels.");
-            pr("for (int "+channel+" = 0; "+channel+" < "+port.width+"; "+channel+"++) {");
-            indent();
-        }
+    startScopedBlock(port.parent);
+    startChannelIteration(port);
+  }
+
+  /**
+   * Start a scoped block that iterates over the specified range of port channels.
+   *
+   * <p>This must be followed by a call to {@link #endScopedRangeBlock(RuntimeRange)}.
+   *
+   * <p>This block should NOT be nested, where each block is put within a similar block for the
+   * reactor's parent. Within the created block, every use of {@link
+   * CUtil#reactorRef(ReactorInstance, String)} must provide the second argument, a runtime index
+   * variable name, that must match the runtimeIndex parameter given here.
+   *
+   * @param range The range of port channels.
+   * @param runtimeIndex A variable name to use to index the runtime instance of either port's
+   *     parent or the port's parent's parent (if nested is true), or null to use the default,
+   *     "runtime_index".
+   * @param bankIndex A variable name to use to index the bank of the port's parent or null to use
+   *     the default, the string returned by {@link CUtil#bankIndexName(ReactorInstance)}.
+   * @param channelIndex A variable name to use to index the channel or null to use the default, the
+   *     string returned by {@link CUtil#channelIndexName(PortInstance)}.
+   * @param nested If true, then the runtimeIndex variable will be set to the bank index of the
+   *     port's parent's parent rather than the port's parent.
+   */
+  public void startScopedRangeBlock(
+      RuntimeRange<PortInstance> range,
+      String runtimeIndex,
+      String bankIndex,
+      String channelIndex,
+      boolean nested) {
+
+    pr("// Iterate over range " + range.toString() + ".");
+    var ri = (runtimeIndex == null) ? "runtime_index" : runtimeIndex;
+    var ci = (channelIndex == null) ? CUtil.channelIndexName(range.instance) : channelIndex;
+    var bi = (bankIndex == null) ? CUtil.bankIndexName(range.instance.parent) : bankIndex;
+    var rangeMR = range.startMR();
+    var sizeMR = rangeMR.getDigits().size();
+    var nestedLevel = (nested) ? 2 : 1;
+
+    startScopedBlock();
+    if (range.width > 1) {
+      pr(
+          String.join(
+              "\n",
+              "int range_start[] =  { " + joinObjects(rangeMR.getDigits(), ", ") + " };",
+              "int range_radixes[] = { " + joinObjects(rangeMR.getRadixes(), ", ") + " };",
+              "int permutation[] = { " + joinObjects(range.permutation(), ", ") + " };",
+              "mixed_radix_int_t range_mr = {",
+              "    " + sizeMR + ",",
+              "    range_start,",
+              "    range_radixes,",
+              "    permutation",
+              "};",
+              "for (int range_count = "
+                  + range.start
+                  + "; range_count < "
+                  + range.start
+                  + " + "
+                  + range.width
+                  + "; range_count++) {"));
+      indent();
+      pr(
+          String.join(
+              "\n",
+              "int "
+                  + ri
+                  + " = mixed_radix_parent(&range_mr, "
+                  + nestedLevel
+                  + "); // Runtime index.",
+              "SUPPRESS_UNUSED_WARNING(" + ri + ");",
+              "int " + ci + " = range_mr.digits[0]; // Channel index.",
+              "SUPPRESS_UNUSED_WARNING(" + ci + ");",
+              "int " + bi + " = " + (sizeMR <= 1 ? "0" : "range_mr.digits[1]") + "; // Bank index.",
+              "SUPPRESS_UNUSED_WARNING(" + bi + ");"));
+
+    } else {
+      var ciValue = rangeMR.getDigits().get(0);
+      var riValue = rangeMR.get(nestedLevel);
+      var biValue = (sizeMR > 1) ? rangeMR.getDigits().get(1) : 0;
+      pr(
+          String.join(
+              "\n",
+              "int "
+                  + ri
+                  + " = "
+                  + riValue
+                  + "; SUPPRESS_UNUSED_WARNING("
+                  + ri
+                  + "); // Runtime index.",
+              "int "
+                  + ci
+                  + " = "
+                  + ciValue
+                  + "; SUPPRESS_UNUSED_WARNING("
+                  + ci
+                  + "); // Channel index.",
+              "int "
+                  + bi
+                  + " = "
+                  + biValue
+                  + "; SUPPRESS_UNUSED_WARNING("
+                  + bi
+                  + "); // Bank index.",
+              "int range_count = 0; SUPPRESS_UNUSED_WARNING(range_count);"));
     }
-
-    /**
-     * Start a scoped block to iterate over bank members and
-     * channels for the specified port with a variable with
-     * the name given by count counting the iterations.
-     * If this port is a multiport, then the channel index
-     * variable name is that returned by {@link CUtil#channelIndex(PortInstance)}.
-     *
-     * This block is intended to be nested, where each block is
-     * put within a similar block for the reactor's parent.
-     *
-     * This is required to be followed by a call to
-     * {@link #endScopedBankChannelIteration(PortInstance, String)}.
-     * @param port The port.
-     * @param count The variable name to use for the counter, or
-     *  null to not provide a counter.
-     */
-    public void startScopedBankChannelIteration(PortInstance port,
-                                                String count) {
-        if (count != null) {
-            startScopedBlock();
-            pr("int "+count+" = 0;");
-        }
-        startScopedBlock(port.parent);
-        startChannelIteration(port);
+  }
+
+  /**
+   * Start a scoped block that iterates over the specified pair of ranges. The destination range can
+   * be wider than the source range, in which case the source range is reused until the destination
+   * range is filled. The following integer variables will be defined within the scoped block:
+   *
+   * <ul>
+   *   <li>src_channel: The channel index for the source.
+   *   <li>src_bank: The bank index of the source port&#39;s parent.
+   *   <li>src_runtime: The runtime index of the source port&#39;s parent or the parent&#39;s parent
+   *       (if the source is an input).
+   * </ul>
+   *
+   * <ul>
+   *   <li>dst_channel: The channel index for the destination.
+   *   <li>dst_bank: The bank index of the destination port&#39;s parent.
+   *   <li>dst_runtime: The runtime index of the destination port&#39;s parent or the parent&#39;s
+   *       parent (if destination is an output).
+   * </ul>
+   *
+   * <p>For convenience, the above variable names are defined in the private class variables sc, sb,
+   * sr, and dc, db, dr.
+   *
+   * <p>This block should NOT be nested, where each block is put within a similar block for the
+   * reactor's parent. Within the created block, every use of {@link
+   * CUtil#reactorRef(ReactorInstance, String)} and related functions must provide the above
+   * variable names.
+   *
+   * <p>This must be followed by a call to {@link #endScopedRangeBlock(SendRange, RuntimeRange)}.x
+   *
+   * @param srcRange The send range.
+   * @param dstRange The destination range.
+   */
+  public void startScopedRangeBlock(SendRange srcRange, RuntimeRange<PortInstance> dstRange) {
+    var srcRangeMR = srcRange.startMR();
+    var srcSizeMR = srcRangeMR.getRadixes().size();
+    var srcNestedLevel = (srcRange.instance.isInput()) ? 2 : 1;
+    var dstNested = dstRange.instance.isOutput();
+
+    pr("// Iterate over ranges " + srcRange + " and " + dstRange + ".");
+    startScopedBlock();
+    if (srcRange.width > 1) {
+      pr(
+          String.join(
+              "\n",
+              "int src_start[] =  { " + joinObjects(srcRangeMR.getDigits(), ", ") + " };",
+              "int src_value[] =  { "
+                  + joinObjects(srcRangeMR.getDigits(), ", ")
+                  + " }; // Will be incremented.",
+              "int src_radixes[] = { " + joinObjects(srcRangeMR.getRadixes(), ", ") + " };",
+              "int src_permutation[] = { " + joinObjects(srcRange.permutation(), ", ") + " };",
+              "mixed_radix_int_t src_range_mr = {",
+              "    " + srcSizeMR + ",",
+              "    src_value,",
+              "    src_radixes,",
+              "    src_permutation",
+              "};"));
+    } else {
+      var ciValue = srcRangeMR.getDigits().get(0);
+      var biValue = (srcSizeMR > 1) ? srcRangeMR.getDigits().get(1) : 0;
+      var riValue = srcRangeMR.get(srcNestedLevel);
+      pr(
+          String.join(
+              "\n",
+              "int " + sr + " = " + riValue + "; // Runtime index.",
+              "SUPPRESS_UNUSED_WARNING(" + sr + ");",
+              "int " + sc + " = " + ciValue + "; // Channel index.",
+              "SUPPRESS_UNUSED_WARNING(" + sc + ");",
+              "int " + sb + " = " + biValue + "; // Bank index.",
+              "SUPPRESS_UNUSED_WARNING(" + sb + ");"));
     }
 
-    /**
-     * Start a scoped block that iterates over the specified range of port channels.
-     *
-     * This must be followed by a call to
-     * {@link #endScopedRangeBlock(RuntimeRange)}.
-     *
-     * This block should NOT be nested, where each block is
-     * put within a similar block for the reactor's parent.
-     * Within the created block, every use of
-     * {@link CUtil#reactorRef(ReactorInstance, String)}
-     * must provide the second argument, a runtime index variable name,
-     * that must match the runtimeIndex parameter given here.
-     *
-     * @param range The range of port channels.
-     * @param runtimeIndex A variable name to use to index the runtime instance of
-     *  either port's parent or the port's parent's parent (if nested is true), or
-     *  null to use the default, "runtime_index".
-     * @param bankIndex A variable name to use to index the bank of the port's parent or null to use the
-     *  default, the string returned by {@link CUtil#bankIndexName(ReactorInstance)}.
-     * @param channelIndex A variable name to use to index the channel or null to
-     *  use the default, the string returned by {@link CUtil#channelIndexName(PortInstance)}.
-     * @param nested If true, then the runtimeIndex variable will be set
-     *  to the bank index of the port's parent's parent rather than the
-     *  port's parent.
-     */
-    public void startScopedRangeBlock(
-        RuntimeRange<PortInstance> range,
-        String runtimeIndex,
-        String bankIndex,
-        String channelIndex,
-        boolean nested
-    ) {
-
-        pr("// Iterate over range "+range.toString()+".");
-        var ri = (runtimeIndex == null)? "runtime_index" : runtimeIndex;
-        var ci = (channelIndex == null)? CUtil.channelIndexName(range.instance) : channelIndex;
-        var bi = (bankIndex == null)? CUtil.bankIndexName(range.instance.parent) : bankIndex;
-        var rangeMR = range.startMR();
-        var sizeMR = rangeMR.getDigits().size();
-        var nestedLevel = (nested) ? 2 : 1;
-
-        startScopedBlock();
-        if (range.width > 1) {
-            pr(String.join("\n",
-                "int range_start[] =  { "+joinObjects(rangeMR.getDigits(), ", ")+" };",
-                "int range_radixes[] = { "+joinObjects(rangeMR.getRadixes(), ", ")+" };",
-                "int permutation[] = { "+joinObjects(range.permutation(), ", ")+" };",
-                "mixed_radix_int_t range_mr = {",
-                "    "+sizeMR+",",
-                "    range_start,",
-                "    range_radixes,",
-                "    permutation",
-                "};",
-                "for (int range_count = "+range.start+"; range_count < "+range.start+" + "+range.width+"; range_count++) {"
-            ));
-            indent();
-            pr(String.join("\n",
-                "int "+ri+" = mixed_radix_parent(&range_mr, "+nestedLevel+"); // Runtime index.",
-                "SUPPRESS_UNUSED_WARNING("+ri+");",
-                "int "+ci+" = range_mr.digits[0]; // Channel index.",
-                "SUPPRESS_UNUSED_WARNING("+ci+");",
-                "int "+bi+" = "+(sizeMR <= 1 ? "0" : "range_mr.digits[1]")+"; // Bank index.",
-                "SUPPRESS_UNUSED_WARNING("+bi+");"
-            ));
-
-        } else {
-            var ciValue = rangeMR.getDigits().get(0);
-            var riValue = rangeMR.get(nestedLevel);
-            var biValue = (sizeMR > 1)? rangeMR.getDigits().get(1) : 0;
-            pr(String.join("\n",
-                "int "+ri+" = "+riValue+"; SUPPRESS_UNUSED_WARNING("+ri+"); // Runtime index.",
-                "int "+ci+" = "+ciValue+"; SUPPRESS_UNUSED_WARNING("+ci+"); // Channel index.",
-                "int "+bi+" = "+biValue+"; SUPPRESS_UNUSED_WARNING("+bi+"); // Bank index.",
-                "int range_count = 0; SUPPRESS_UNUSED_WARNING(range_count);"
-            ));
-        }
+    startScopedRangeBlock(dstRange, dr, db, dc, dstNested);
+
+    if (srcRange.width > 1) {
+      pr(
+          String.join(
+              "\n",
+              "int "
+                  + sr
+                  + " = mixed_radix_parent(&src_range_mr, "
+                  + srcNestedLevel
+                  + "); // Runtime index.",
+              "SUPPRESS_UNUSED_WARNING(" + sr + ");",
+              "int " + sc + " = src_range_mr.digits[0]; // Channel index.",
+              "SUPPRESS_UNUSED_WARNING(" + sc + ");",
+              "int "
+                  + sb
+                  + " = "
+                  + (srcSizeMR <= 1 ? "0" : "src_range_mr.digits[1]")
+                  + "; // Bank index.",
+              "SUPPRESS_UNUSED_WARNING(" + sb + ");"));
     }
-
-    /**
-     * Start a scoped block that iterates over the specified pair of ranges.
-     * The destination range can be wider than the source range, in which case the
-     * source range is reused until the destination range is filled.
-     * The following integer variables will be defined within the scoped block:
-     *
-     * <ul>
-     * <li>src_channel: The channel index for the source.</li>
-     * <li>src_bank: The bank index of the source port&#39;s parent.</li>
-     * <li>src_runtime: The runtime index of the source port&#39;s parent or
-     * the parent&#39;s parent (if the source is an input).</li>
-     * </ul>
-     * <ul>
-     * <li>dst_channel: The channel index for the destination.</li>
-     * <li>dst_bank: The bank index of the destination port&#39;s parent.</li>
-     * <li>dst_runtime: The runtime index of the destination port&#39;s parent or
-     * the parent&#39;s parent (if destination is an output).</li>
-     * </ul>
-     *
-     * <p>For convenience, the above variable names are defined in the private
-     * class variables sc, sb, sr, and dc, db, dr.</p>
-     *
-     * <p>This block should NOT be nested, where each block is
-     * put within a similar block for the reactor's parent.
-     * Within the created block, every use of
-     * {@link CUtil#reactorRef(ReactorInstance, String)}
-     * and related functions must provide the above variable names.</p>
-     *
-     * <p>This must be followed by a call to
-     * {@link #endScopedRangeBlock(SendRange, RuntimeRange)}.</p>x
-     *
-     * @param srcRange The send range.
-     * @param dstRange The destination range.
-     */
-    public void startScopedRangeBlock(
-        SendRange srcRange,
-        RuntimeRange<PortInstance> dstRange
-    ) {
-        var srcRangeMR = srcRange.startMR();
-        var srcSizeMR = srcRangeMR.getRadixes().size();
-        var srcNestedLevel = (srcRange.instance.isInput()) ? 2 : 1;
-        var dstNested = dstRange.instance.isOutput();
-
-        pr("// Iterate over ranges "+srcRange+" and "+dstRange+".");
-        startScopedBlock();
-        if (srcRange.width > 1) {
-            pr(String.join("\n",
-                "int src_start[] =  { "+joinObjects(srcRangeMR.getDigits(), ", ")+" };",
-                "int src_value[] =  { "+joinObjects(srcRangeMR.getDigits(), ", ")+" }; // Will be incremented.",
-                "int src_radixes[] = { "+joinObjects(srcRangeMR.getRadixes(), ", ")+" };",
-                "int src_permutation[] = { "+joinObjects(srcRange.permutation(), ", ")+" };",
-                "mixed_radix_int_t src_range_mr = {",
-                "    "+srcSizeMR+",",
-                "    src_value,",
-                "    src_radixes,",
-                "    src_permutation",
-                "};"
-            ));
-        } else {
-            var ciValue = srcRangeMR.getDigits().get(0);
-            var biValue = (srcSizeMR > 1)? srcRangeMR.getDigits().get(1) : 0;
-            var riValue = srcRangeMR.get(srcNestedLevel);
-            pr(String.join("\n",
-                "int "+sr+" = "+riValue+"; // Runtime index.",
-                "SUPPRESS_UNUSED_WARNING("+sr+");",
-                "int "+sc+" = "+ciValue+"; // Channel index.",
-                "SUPPRESS_UNUSED_WARNING("+sc+");",
-                "int "+sb+" = "+biValue+"; // Bank index.",
-                "SUPPRESS_UNUSED_WARNING("+sb+");"
-            ));
-        }
-
-        startScopedRangeBlock(dstRange, dr, db, dc, dstNested);
-
-        if (srcRange.width > 1) {
-            pr(String.join("\n",
-                "int "+sr+" = mixed_radix_parent(&src_range_mr, "+srcNestedLevel+"); // Runtime index.",
-                "SUPPRESS_UNUSED_WARNING("+sr+");",
-                "int "+sc+" = src_range_mr.digits[0]; // Channel index.",
-                "SUPPRESS_UNUSED_WARNING("+sc+");",
-                "int "+sb+" = "+(srcSizeMR <= 1 ? "0" : "src_range_mr.digits[1]")+"; // Bank index.",
-                "SUPPRESS_UNUSED_WARNING("+sb+");"
-            ));
-        }
+  }
+
+  public void endScopedBlock() {
+    unindent();
+    pr("}");
+  }
+
+  /**
+   * If the specified port is a multiport, then start a specified iteration over the channels of the
+   * multiport using as the channel index the variable name returned by {@link
+   * CUtil#channelIndex(PortInstance)}. If the port is not a multiport, do nothing.
+   *
+   * @param port The port.
+   */
+  public void endChannelIteration(PortInstance port) {
+    if (port.isMultiport) {
+      unindent();
+      pr("}");
     }
-
-    public void endScopedBlock() {
-        unindent();
-        pr("}");
+  }
+
+  /**
+   * End a scoped block to iterate over bank members and channels for the specified port with a
+   * variable with the name given by count counting the iterations.
+   *
+   * @param port The port.
+   * @param count The variable name to use for the counter, or null to not provide a counter.
+   */
+  public void endScopedBankChannelIteration(PortInstance port, String count) {
+    if (count != null) {
+      pr(count + "++;");
     }
-
-    /**
-     * If the specified port is a multiport, then start a specified iteration
-     * over the channels of the multiport using as the channel index the
-     * variable name returned by {@link CUtil#channelIndex(PortInstance)}.
-     * If the port is not a multiport, do nothing.
-     * @param port The port.
-     */
-    public void endChannelIteration(PortInstance port) {
-        if (port.isMultiport) {
-            unindent();
-            pr("}");
-        }
+    endChannelIteration(port);
+    endScopedBlock();
+    if (count != null) {
+      endScopedBlock();
     }
-
-    /**
-     * End a scoped block to iterate over bank members and
-     * channels for the specified port with a variable with
-     * the name given by count counting the iterations.
-     * @param port The port.
-     * @param count The variable name to use for the counter, or
-     *  null to not provide a counter.
-     */
-    public void endScopedBankChannelIteration(
-        PortInstance port, String count
-    ) {
-        if (count != null) {
-            pr(count + "++;");
-        }
-        endChannelIteration(port);
-        endScopedBlock();
-        if (count != null) {
-            endScopedBlock();
-        }
+  }
+
+  /**
+   * End a scoped block for the specified range.
+   *
+   * @param range The send range.
+   */
+  public void endScopedRangeBlock(RuntimeRange<PortInstance> range) {
+    if (range.width > 1) {
+      pr("mixed_radix_incr(&range_mr);");
+      endScopedBlock(); // Terminate for loop.
     }
-
-    /**
-     * End a scoped block for the specified range.
-     * @param range The send range.
-     */
-    public void endScopedRangeBlock(
-        RuntimeRange<PortInstance> range
-    ) {
-        if (range.width > 1) {
-            pr("mixed_radix_incr(&range_mr);");
-            endScopedBlock(); // Terminate for loop.
-        }
-        endScopedBlock();
-    }
-
-    /**
-     * End a scoped block that iterates over the specified pair of ranges.
-     *
-     * @param srcRange The send range.
-     * @param dstRange The destination range.
-     */
-    public void endScopedRangeBlock(
-        SendRange srcRange,
-        RuntimeRange<PortInstance> dstRange
-    ) {
-        if (srcRange.width > 1) {
-            pr(String.join("\n",
-                "mixed_radix_incr(&src_range_mr);",
-                "if (mixed_radix_to_int(&src_range_mr) >= "+srcRange.start+" + "+srcRange.width+") {",
-                "    // Start over with the source.",
-                "    for (int i = 0; i < src_range_mr.size; i++) {",
-                "        src_range_mr.digits[i] = src_start[i];",
-                "    }",
-                "}"
-            ));
-        }
-        if (dstRange.width > 1) {
-            pr("mixed_radix_incr(&range_mr);");
-            endScopedBlock(); // Terminate for loop.
-        }
-        // Terminate unconditional scope block in startScopedRangeBlock calls.
-        endScopedBlock();
-        endScopedBlock();
+    endScopedBlock();
+  }
+
+  /**
+   * End a scoped block that iterates over the specified pair of ranges.
+   *
+   * @param srcRange The send range.
+   * @param dstRange The destination range.
+   */
+  public void endScopedRangeBlock(SendRange srcRange, RuntimeRange<PortInstance> dstRange) {
+    if (srcRange.width > 1) {
+      pr(
+          String.join(
+              "\n",
+              "mixed_radix_incr(&src_range_mr);",
+              "if (mixed_radix_to_int(&src_range_mr) >= "
+                  + srcRange.start
+                  + " + "
+                  + srcRange.width
+                  + ") {",
+              "    // Start over with the source.",
+              "    for (int i = 0; i < src_range_mr.size; i++) {",
+              "        src_range_mr.digits[i] = src_start[i];",
+              "    }",
+              "}"));
     }
-
-    /**
-     * Return the code as a string.
-     */
-    @Override
-    public String toString() {
-        return code.toString();
-    }
-
-    /**
-     * Reduce the indentation by one level for generated code/
-     */
-    public void unindent() {
-        indentation = indentation.substring(0, Math.max(0, indentation.length() - 4));
+    if (dstRange.width > 1) {
+      pr("mixed_radix_incr(&range_mr);");
+      endScopedBlock(); // Terminate for loop.
     }
-
-    /**
-     * Write the text to a file.
-     * @param path The file to write the code to.
-     */
-    public CodeMap writeToFile(String path) throws IOException {
-        CodeMap ret = CodeMap.fromGeneratedCode(code.toString());
-        FileUtil.writeToFile(ret.getGeneratedCode(), Path.of(path), true);
-        return ret;
-    }
-
-    ////////////////////////////////////////////
-    //// Private fields.
-
-    /** Place to store the code. */
-    private final StringBuilder code = new StringBuilder();
-
-    /** Current indentation. */
-    private String indentation = "";
+    // Terminate unconditional scope block in startScopedRangeBlock calls.
+    endScopedBlock();
+    endScopedBlock();
+  }
+
+  /** Return the code as a string. */
+  @Override
+  public String toString() {
+    return code.toString();
+  }
+
+  /** Reduce the indentation by one level for generated code/ */
+  public void unindent() {
+    indentation = indentation.substring(0, Math.max(0, indentation.length() - 4));
+  }
+
+  /**
+   * Write the text to a file.
+   *
+   * @param path The file to write the code to.
+   */
+  public CodeMap writeToFile(String path) throws IOException {
+    CodeMap ret = CodeMap.fromGeneratedCode(code.toString());
+    FileUtil.writeToFile(ret.getGeneratedCode(), Path.of(path), true);
+    return ret;
+  }
+
+  ////////////////////////////////////////////
+  //// Private fields.
+
+  /** Place to store the code. */
+  private final StringBuilder code = new StringBuilder();
+
+  /** Current indentation. */
+  private String indentation = "";
 }
diff --git a/org.lflang/src/org/lflang/generator/CodeMap.java b/org.lflang/src/org/lflang/generator/CodeMap.java
index d00fe9bc9a..9d196c7daa 100644
--- a/org.lflang/src/org/lflang/generator/CodeMap.java
+++ b/org.lflang/src/org/lflang/generator/CodeMap.java
@@ -1,348 +1,320 @@
 package org.lflang.generator;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.NavigableMap;
 import java.util.Set;
 import java.util.TreeMap;
-import java.util.HashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.nodemodel.INode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.util.LineAndColumn;
-
 import org.lflang.lf.ParameterReference;
-import org.lflang.lf.impl.ParameterReferenceImpl;
 
 /**
- * Encapsulates data about the correspondence between
- * ranges of generated code and ranges of a Lingua Franca
- * file.
+ * Encapsulates data about the correspondence between ranges of generated code and ranges of a
+ * Lingua Franca file.
  */
 public class CodeMap {
 
-    public static class Correspondence {
-        // This pattern has the markers "/* */", which some languages use as line comments. This does not
-        //  represent any serious effort to embed the string representation of this object in generated code
-        //  without introducing a syntax error. Instead, it is done simply because it is easy.
-        private static final Pattern PATTERN = Pattern.compile(String.format(
-            "/\\*Correspondence: (?<lfRange>%s) \\-> (?<generatedRange>%s) \\(verbatim=(?<verbatim>true|false); src=(?<path>%s)\\)\\*/",
-            Position.removeNamedCapturingGroups(Range.PATTERN),
-            Position.removeNamedCapturingGroups(Range.PATTERN),
-            ".*?"
-        ));
-
-        private final Path path;
-        private final Range lfRange;
-        private final Range generatedRange;
-        private final boolean verbatim;
-
-        /**
-         * Instantiates a Correspondence between
-         * {@code lfRange} at {@code path} and
-         * {@code generatedRange} in the generated file
-         * associated with this Correspondence.
-         * @param path a path to an LF source file
-         * @param lfRange a range in the given LF file
-         * @param generatedRange the range of generated code
-         *                       associated with
-         *                       {@code lfRange}
-         */
-        private Correspondence(Path path, Range lfRange, Range generatedRange, boolean verbatim) {
-            this.path = path;
-            this.lfRange = lfRange;
-            this.generatedRange = generatedRange;
-            this.verbatim = verbatim;
-        }
-
-        /**
-         * Returns a path to the LF source file described by
-         * this Correspondence.
-         * @return a path to the LF source file described by
-         * this Correspondence
-         */
-        public Path getPath() {
-            return path;
-        }
-
-        /**
-         * Returns a range in an LF source file.
-         * @return a range in an LF source file
-         */
-        public Range getLfRange() {
-            return lfRange;
-        }
+  public static class Correspondence {
+    // This pattern has the markers "/* */", which some languages use as line comments. This does
+    // not
+    //  represent any serious effort to embed the string representation of this object in generated
+    // code
+    //  without introducing a syntax error. Instead, it is done simply because it is easy.
+    private static final Pattern PATTERN =
+        Pattern.compile(
+            String.format(
+                "/\\*Correspondence: (?<lfRange>%s) \\-> (?<generatedRange>%s)"
+                    + " \\(verbatim=(?<verbatim>true|false); src=(?<path>%s)\\)\\*/",
+                Position.removeNamedCapturingGroups(Range.PATTERN),
+                Position.removeNamedCapturingGroups(Range.PATTERN),
+                ".*?"));
 
-        /**
-         * Returns a range in a generated file that
-         * corresponds to a range in an LF file.
-         * @return a range in a generated file that
-         * corresponds to a range in an LF file
-         */
-        public Range getGeneratedRange() {
-            return generatedRange;
-        }
+    private final Path path;
+    private final Range lfRange;
+    private final Range generatedRange;
+    private final boolean verbatim;
 
-        @Override
-        public String toString() {
-            return String.format(
-                "/*Correspondence: %s -> %s (verbatim=%b; src=%s)*/",
-                lfRange.toString(), generatedRange.toString(), verbatim, path.toString()
-            );
-        }
-
-        /**
-         * Returns the Correspondence represented by
-         * {@code s}.
-         * @param s a String that represents a
-         *          Correspondence, formatted like the
-         *          output of Correspondence::toString
-         * @param relativeTo the offset relative to which
-         *                   the offsets given are given
-         * @return the Correspondence represented by
-         * {@code s}
-         */
-        public static Correspondence fromString(String s, Position relativeTo) {
-            Matcher matcher = PATTERN.matcher(s);
-            if (matcher.matches()) {
-                Range lfRange = Range.fromString(matcher.group("lfRange"));
-                Range generatedRange = Range.fromString(matcher.group("generatedRange"), relativeTo);
-                return new Correspondence(
-                    Path.of(matcher.group("path")),
-                    lfRange,
-                    generatedRange,
-                    Boolean.parseBoolean(matcher.group("verbatim"))
-                );
-            }
-            throw new IllegalArgumentException(String.format("Could not parse %s as a Correspondence.", s));
-        }
-
-        /**
-         * Returns {@code representation}, tagged with
-         * a Correspondence to the source code associated
-         * with {@code astNode}.
-         * @param astNode an arbitrary AST node
-         * @param representation the code generated from
-         *                       that AST node
-         * @param verbatim whether {@code representation}
-         *                 is copied verbatim from the
-         *                 part of the source code
-         *                 associated with {@code astNode}
-         * @return {@code representation}, tagged with
-         * a Correspondence to the source code associated
-         * with {@code astNode}
-         */
-        public static String tag(EObject astNode, String representation, boolean verbatim) {
-            final INode node = NodeModelUtils.getNode(astNode);
-            // If the EObject originates from an AST transformation, then it does not correspond directly
-            // to any LF code, and it need not be tagged at all.
-            if (node == null) return representation;
-            final LineAndColumn oneBasedLfLineAndColumn = NodeModelUtils.getLineAndColumn(node, node.getTotalOffset());
-            Position lfStart = Position.fromOneBased(
-                oneBasedLfLineAndColumn.getLine(), oneBasedLfLineAndColumn.getColumn()
-            );
-            final URI uri = bestEffortGetEResource(astNode).getURI();
-            if (uri == null) {
-                // no EResource, no correspondence can be found
-                return representation;
-            }
-            final Path lfPath = Path.of(uri.isFile() ? uri.toFileString() : uri.path());
-            if (verbatim) lfStart = lfStart.plus(node.getText().substring(0, indexOf(node.getText(), representation)));
-            return new Correspondence(
-                lfPath,
-                new Range(lfStart, lfStart.plus(verbatim ? representation : node.getText())),
-                new Range(Position.ORIGIN, Position.displacementOf(representation)),
-                verbatim
-            ) + representation;
-        }
-
-        /**
-         * Return the {@code eResource} associated with the given AST node.
-         * This is a dangerous operation which can cause an unrecoverable error.
-         */
-        private static Resource bestEffortGetEResource(EObject astNode) {
-            if (astNode instanceof ParameterReference pri) {
-                return pri.getParameter().eResource();
-            }
-            return astNode.eResource();
-        }
-
-        /**
-         * Make a best-effort attempt to find the index of
-         * a near substring whose first line is expected to
-         * be an exact substring of {@code s}. Return 0
-         * upon failure.
-         * @param s an arbitrary string
-         * @param imperfectSubstring an approximate
-         *                           substring of {@code s}
-         * @return the index of {@code imperfectSubstring}
-         * within {@code s}
-         */
-        private static int indexOf(String s, String imperfectSubstring) {
-            String firstLine = imperfectSubstring.lines().findFirst().orElse("");
-            return Math.max(0, s.indexOf(firstLine));
-        }
+    /**
+     * Instantiates a Correspondence between {@code lfRange} at {@code path} and {@code
+     * generatedRange} in the generated file associated with this Correspondence.
+     *
+     * @param path a path to an LF source file
+     * @param lfRange a range in the given LF file
+     * @param generatedRange the range of generated code associated with {@code lfRange}
+     */
+    private Correspondence(Path path, Range lfRange, Range generatedRange, boolean verbatim) {
+      this.path = path;
+      this.lfRange = lfRange;
+      this.generatedRange = generatedRange;
+      this.verbatim = verbatim;
     }
 
     /**
-     * The content of the generated file represented by
-     * this.
+     * Returns a path to the LF source file described by this Correspondence.
+     *
+     * @return a path to the LF source file described by this Correspondence
      */
-    private final String generatedCode;
+    public Path getPath() {
+      return path;
+    }
+
     /**
-     * A mapping from Lingua Franca source paths to mappings
-     * from ranges in the generated file represented by this
-     * to ranges in Lingua Franca files.
+     * Returns a range in an LF source file.
+     *
+     * @return a range in an LF source file
      */
-    private final Map<Path, NavigableMap<Range, Range>> map;
+    public Range getLfRange() {
+      return lfRange;
+    }
+
     /**
-     * A mapping from Lingua Franca source paths to mappings
-     * from ranges in the generated file represented by this
-     * to whether those ranges are copied verbatim from the
-     * source.
+     * Returns a range in a generated file that corresponds to a range in an LF file.
+     *
+     * @return a range in a generated file that corresponds to a range in an LF file
      */
-    private final Map<Path, Map<Range, Boolean>> isVerbatimByLfSourceByRange;
+    public Range getGeneratedRange() {
+      return generatedRange;
+    }
 
-    /* ------------------------- PUBLIC METHODS -------------------------- */
+    @Override
+    public String toString() {
+      return String.format(
+          "/*Correspondence: %s -> %s (verbatim=%b; src=%s)*/",
+          lfRange.toString(), generatedRange.toString(), verbatim, path.toString());
+    }
 
     /**
-     * Instantiates a {@code CodeMap} from
-     * {@code internalGeneratedCode}.
-     * {@code internalGeneratedCode} may be invalid
-     * code that is different from the final generated code
-     * because it should contain deserializable
-     * representations of {@code Correspondences}.
-     * @param internalGeneratedCode code from a code
-     *                              generator that contains
-     *                              serialized
-     *                              Correspondences
-     * @return a CodeMap documenting the provided code
+     * Returns the Correspondence represented by {@code s}.
+     *
+     * @param s a String that represents a Correspondence, formatted like the output of
+     *     Correspondence::toString
+     * @param relativeTo the offset relative to which the offsets given are given
+     * @return the Correspondence represented by {@code s}
      */
-    public static CodeMap fromGeneratedCode(String internalGeneratedCode) {
-        Map<Path, NavigableMap<Range, Range>> map = new HashMap<>();
-        Map<Path, Map<Range, Boolean>> isVerbatimByLfSourceByRange = new HashMap<>();
-        StringBuilder generatedCode = new StringBuilder();
-        Iterator<String> it = internalGeneratedCode.lines().iterator();
-        int zeroBasedLine = 0;
-        while (it.hasNext()) {
-            generatedCode.append(processGeneratedLine(it.next(), zeroBasedLine++, map, isVerbatimByLfSourceByRange)).append('\n');
-        }
-        return new CodeMap(generatedCode.toString(), map, isVerbatimByLfSourceByRange);
+    public static Correspondence fromString(String s, Position relativeTo) {
+      Matcher matcher = PATTERN.matcher(s);
+      if (matcher.matches()) {
+        Range lfRange = Range.fromString(matcher.group("lfRange"));
+        Range generatedRange = Range.fromString(matcher.group("generatedRange"), relativeTo);
+        return new Correspondence(
+            Path.of(matcher.group("path")),
+            lfRange,
+            generatedRange,
+            Boolean.parseBoolean(matcher.group("verbatim")));
+      }
+      throw new IllegalArgumentException(
+          String.format("Could not parse %s as a Correspondence.", s));
     }
 
     /**
-     * Returns the generated code (without Correspondences).
-     * @return the generated code (without Correspondences)
+     * Returns {@code representation}, tagged with a Correspondence to the source code associated
+     * with {@code astNode}.
+     *
+     * @param astNode an arbitrary AST node
+     * @param representation the code generated from that AST node
+     * @param verbatim whether {@code representation} is copied verbatim from the part of the source
+     *     code associated with {@code astNode}
+     * @return {@code representation}, tagged with a Correspondence to the source code associated
+     *     with {@code astNode}
      */
-    public String getGeneratedCode() {
-        return generatedCode;
+    public static String tag(EObject astNode, String representation, boolean verbatim) {
+      final INode node = NodeModelUtils.getNode(astNode);
+      // If the EObject originates from an AST transformation, then it does not correspond directly
+      // to any LF code, and it need not be tagged at all.
+      if (node == null) return representation;
+      final LineAndColumn oneBasedLfLineAndColumn =
+          NodeModelUtils.getLineAndColumn(node, node.getTotalOffset());
+      Position lfStart =
+          Position.fromOneBased(
+              oneBasedLfLineAndColumn.getLine(), oneBasedLfLineAndColumn.getColumn());
+      final URI uri = bestEffortGetEResource(astNode).getURI();
+      if (uri == null) {
+        // no EResource, no correspondence can be found
+        return representation;
+      }
+      final Path lfPath = Path.of(uri.isFile() ? uri.toFileString() : uri.path());
+      if (verbatim)
+        lfStart =
+            lfStart.plus(node.getText().substring(0, indexOf(node.getText(), representation)));
+      return new Correspondence(
+              lfPath,
+              new Range(lfStart, lfStart.plus(verbatim ? representation : node.getText())),
+              new Range(Position.ORIGIN, Position.displacementOf(representation)),
+              verbatim)
+          + representation;
     }
 
     /**
-     * Returns the set of all paths to Lingua Franca files
-     * that are known to contain code that corresponds to
-     * code in the generated file represented by this.
+     * Return the {@code eResource} associated with the given AST node. This is a dangerous
+     * operation which can cause an unrecoverable error.
      */
-    public Set<Path> lfSourcePaths() {
-        return map.keySet();
+    private static Resource bestEffortGetEResource(EObject astNode) {
+      if (astNode instanceof ParameterReference pri) {
+        return pri.getParameter().eResource();
+      }
+      return astNode.eResource();
     }
 
     /**
-     * Returns the position in {@code lfFile}
-     * corresponding to {@code generatedFilePosition}
-     * if such a position is known, or the zero Position
-     * otherwise.
-     * @param lfFile the path to an arbitrary Lingua Franca
-     *               source file
-     * @param generatedFilePosition a position in a
-     *                              generated file
-     * @return the position in {@code lfFile}
-     * corresponding to {@code generatedFilePosition}
+     * Make a best-effort attempt to find the index of a near substring whose first line is expected
+     * to be an exact substring of {@code s}. Return 0 upon failure.
+     *
+     * @param s an arbitrary string
+     * @param imperfectSubstring an approximate substring of {@code s}
+     * @return the index of {@code imperfectSubstring} within {@code s}
      */
-    public Position adjusted(Path lfFile, Position generatedFilePosition) {
-        NavigableMap<Range, Range> mapOfInterest = map.get(lfFile);
-        Map<Range, Boolean> isVerbatimByRange = isVerbatimByLfSourceByRange.get(lfFile);
-        Map.Entry<Range, Range> nearestEntry = mapOfInterest.floorEntry(Range.degenerateRange(generatedFilePosition));
-        if (nearestEntry == null) return Position.ORIGIN;
-        if (!isVerbatimByRange.get(nearestEntry.getKey())) {
-            return nearestEntry.getValue().getStartInclusive();
-        }
-        if (nearestEntry.getKey().contains(generatedFilePosition)) {
-            return nearestEntry.getValue().getStartInclusive().plus(
-                generatedFilePosition.minus(nearestEntry.getKey().getStartInclusive())
-            );
-        }
-        return Position.ORIGIN;
+    private static int indexOf(String s, String imperfectSubstring) {
+      String firstLine = imperfectSubstring.lines().findFirst().orElse("");
+      return Math.max(0, s.indexOf(firstLine));
     }
+  }
 
-    /**
-     * Returns the range in {@code lfFile}
-     * corresponding to {@code generatedFileRange}
-     * if such a range is known, or a degenerate Range
-     * otherwise.
-     * @param lfFile the path to an arbitrary Lingua Franca
-     *               source file
-     * @param generatedFileRange a position in a
-     *                              generated file
-     * @return the range in {@code lfFile}
-     * corresponding to {@code generatedFileRange}
-     */
-    public Range adjusted(Path lfFile, Range generatedFileRange) {
-        final Position start = adjusted(lfFile, generatedFileRange.getStartInclusive());
-        final Position end = adjusted(lfFile, generatedFileRange.getEndExclusive());
-        return start.compareTo(end) <= 0 ? new Range(start, end) : new Range(start, start);
+  /** The content of the generated file represented by this. */
+  private final String generatedCode;
+  /**
+   * A mapping from Lingua Franca source paths to mappings from ranges in the generated file
+   * represented by this to ranges in Lingua Franca files.
+   */
+  private final Map<Path, NavigableMap<Range, Range>> map;
+  /**
+   * A mapping from Lingua Franca source paths to mappings from ranges in the generated file
+   * represented by this to whether those ranges are copied verbatim from the source.
+   */
+  private final Map<Path, Map<Range, Boolean>> isVerbatimByLfSourceByRange;
+
+  /* ------------------------- PUBLIC METHODS -------------------------- */
+
+  /**
+   * Instantiates a {@code CodeMap} from {@code internalGeneratedCode}. {@code
+   * internalGeneratedCode} may be invalid code that is different from the final generated code
+   * because it should contain deserializable representations of {@code Correspondences}.
+   *
+   * @param internalGeneratedCode code from a code generator that contains serialized
+   *     Correspondences
+   * @return a CodeMap documenting the provided code
+   */
+  public static CodeMap fromGeneratedCode(String internalGeneratedCode) {
+    Map<Path, NavigableMap<Range, Range>> map = new HashMap<>();
+    Map<Path, Map<Range, Boolean>> isVerbatimByLfSourceByRange = new HashMap<>();
+    StringBuilder generatedCode = new StringBuilder();
+    Iterator<String> it = internalGeneratedCode.lines().iterator();
+    int zeroBasedLine = 0;
+    while (it.hasNext()) {
+      generatedCode
+          .append(
+              processGeneratedLine(it.next(), zeroBasedLine++, map, isVerbatimByLfSourceByRange))
+          .append('\n');
     }
+    return new CodeMap(generatedCode.toString(), map, isVerbatimByLfSourceByRange);
+  }
 
-    /* ------------------------- PRIVATE METHODS ------------------------- */
+  /**
+   * Returns the generated code (without Correspondences).
+   *
+   * @return the generated code (without Correspondences)
+   */
+  public String getGeneratedCode() {
+    return generatedCode;
+  }
 
-    private CodeMap(
-        String generatedCode, Map<Path,
-        NavigableMap<Range, Range>> map,
-        Map<Path, Map<Range, Boolean>> isVerbatimByLfSourceByRange
-    ) {
-        this.generatedCode = generatedCode;
-        this.map = map;
-        this.isVerbatimByLfSourceByRange = isVerbatimByLfSourceByRange;
+  /**
+   * Returns the set of all paths to Lingua Franca files that are known to contain code that
+   * corresponds to code in the generated file represented by this.
+   */
+  public Set<Path> lfSourcePaths() {
+    return map.keySet();
+  }
+
+  /**
+   * Returns the position in {@code lfFile} corresponding to {@code generatedFilePosition} if such a
+   * position is known, or the zero Position otherwise.
+   *
+   * @param lfFile the path to an arbitrary Lingua Franca source file
+   * @param generatedFilePosition a position in a generated file
+   * @return the position in {@code lfFile} corresponding to {@code generatedFilePosition}
+   */
+  public Position adjusted(Path lfFile, Position generatedFilePosition) {
+    NavigableMap<Range, Range> mapOfInterest = map.get(lfFile);
+    Map<Range, Boolean> isVerbatimByRange = isVerbatimByLfSourceByRange.get(lfFile);
+    Map.Entry<Range, Range> nearestEntry =
+        mapOfInterest.floorEntry(Range.degenerateRange(generatedFilePosition));
+    if (nearestEntry == null) return Position.ORIGIN;
+    if (!isVerbatimByRange.get(nearestEntry.getKey())) {
+      return nearestEntry.getValue().getStartInclusive();
+    }
+    if (nearestEntry.getKey().contains(generatedFilePosition)) {
+      return nearestEntry
+          .getValue()
+          .getStartInclusive()
+          .plus(generatedFilePosition.minus(nearestEntry.getKey().getStartInclusive()));
     }
+    return Position.ORIGIN;
+  }
 
-    /**
-     * Removes serialized Correspondences from {@code line}
-     * and updates {@code map} according to those
-     * Correspondences.
-     * @param line a line of generated code
-     * @param zeroBasedLineIndex the index of the given line
-     * @param map a map that stores Correspondences
-     * @return the line of generated code with all
-     * Correspondences removed
-     */
-    private static String processGeneratedLine(
-        String line,
-        int zeroBasedLineIndex,
-        Map<Path, NavigableMap<Range, Range>> map,
-        Map<Path, Map<Range, Boolean>> isVerbatimByLfSourceByRange
-    ) {
-        Matcher matcher = Correspondence.PATTERN.matcher(line);
-        StringBuilder cleanedLine = new StringBuilder();
-        int lastEnd = 0;
-        while (matcher.find()) {
-            cleanedLine.append(line, lastEnd, matcher.start());
-            Correspondence c = Correspondence.fromString(
-                matcher.group(),
-                Position.fromZeroBased(zeroBasedLineIndex, cleanedLine.length())
-            );
-            if (!map.containsKey(c.path)) map.put(c.path, new TreeMap<>());
-            map.get(c.path).put(c.generatedRange, c.lfRange);
-            if (!isVerbatimByLfSourceByRange.containsKey(c.path)) isVerbatimByLfSourceByRange.put(c.path, new HashMap<>());
-            isVerbatimByLfSourceByRange.get(c.path).put(c.generatedRange, c.verbatim);
-            lastEnd = matcher.end();
-        }
-        cleanedLine.append(line.substring(lastEnd));
-        return cleanedLine.toString();
+  /**
+   * Returns the range in {@code lfFile} corresponding to {@code generatedFileRange} if such a range
+   * is known, or a degenerate Range otherwise.
+   *
+   * @param lfFile the path to an arbitrary Lingua Franca source file
+   * @param generatedFileRange a position in a generated file
+   * @return the range in {@code lfFile} corresponding to {@code generatedFileRange}
+   */
+  public Range adjusted(Path lfFile, Range generatedFileRange) {
+    final Position start = adjusted(lfFile, generatedFileRange.getStartInclusive());
+    final Position end = adjusted(lfFile, generatedFileRange.getEndExclusive());
+    return start.compareTo(end) <= 0 ? new Range(start, end) : new Range(start, start);
+  }
+
+  /* ------------------------- PRIVATE METHODS ------------------------- */
+
+  private CodeMap(
+      String generatedCode,
+      Map<Path, NavigableMap<Range, Range>> map,
+      Map<Path, Map<Range, Boolean>> isVerbatimByLfSourceByRange) {
+    this.generatedCode = generatedCode;
+    this.map = map;
+    this.isVerbatimByLfSourceByRange = isVerbatimByLfSourceByRange;
+  }
+
+  /**
+   * Removes serialized Correspondences from {@code line} and updates {@code map} according to those
+   * Correspondences.
+   *
+   * @param line a line of generated code
+   * @param zeroBasedLineIndex the index of the given line
+   * @param map a map that stores Correspondences
+   * @return the line of generated code with all Correspondences removed
+   */
+  private static String processGeneratedLine(
+      String line,
+      int zeroBasedLineIndex,
+      Map<Path, NavigableMap<Range, Range>> map,
+      Map<Path, Map<Range, Boolean>> isVerbatimByLfSourceByRange) {
+    Matcher matcher = Correspondence.PATTERN.matcher(line);
+    StringBuilder cleanedLine = new StringBuilder();
+    int lastEnd = 0;
+    while (matcher.find()) {
+      cleanedLine.append(line, lastEnd, matcher.start());
+      Correspondence c =
+          Correspondence.fromString(
+              matcher.group(), Position.fromZeroBased(zeroBasedLineIndex, cleanedLine.length()));
+      if (!map.containsKey(c.path)) map.put(c.path, new TreeMap<>());
+      map.get(c.path).put(c.generatedRange, c.lfRange);
+      if (!isVerbatimByLfSourceByRange.containsKey(c.path))
+        isVerbatimByLfSourceByRange.put(c.path, new HashMap<>());
+      isVerbatimByLfSourceByRange.get(c.path).put(c.generatedRange, c.verbatim);
+      lastEnd = matcher.end();
     }
+    cleanedLine.append(line.substring(lastEnd));
+    return cleanedLine.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/DeadlineInstance.java b/org.lflang/src/org/lflang/generator/DeadlineInstance.java
index 208c116791..e73f6b8f9b 100644
--- a/org.lflang/src/org/lflang/generator/DeadlineInstance.java
+++ b/org.lflang/src/org/lflang/generator/DeadlineInstance.java
@@ -1,29 +1,29 @@
 /** A data structure for a deadline instance. */
 
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
@@ -31,41 +31,37 @@
 import org.lflang.lf.Deadline;
 
 /**
- * Instance of a deadline. Upon creation the actual delay is converted into
- * a proper time value. If a parameter is referenced, it is looked up in the
- * given (grand)parent reactor instance.
- * 
+ * Instance of a deadline. Upon creation the actual delay is converted into a proper time value. If
+ * a parameter is referenced, it is looked up in the given (grand)parent reactor instance.
+ *
  * @author Marten Lohstroh
  * @author Edward A. Lee
  */
 public class DeadlineInstance {
-		
-	/**
-	 * Create a new deadline instance associated with the given reaction
-	 * instance.
-	 */
-	public DeadlineInstance(Deadline definition, ReactionInstance reaction) {
-        if (definition.getDelay() != null) {
-            this.maxDelay = reaction.parent.getTimeValue(definition.getDelay());
-        } else {
-            this.maxDelay = TimeValue.ZERO;
-        }
+
+  /** Create a new deadline instance associated with the given reaction instance. */
+  public DeadlineInstance(Deadline definition, ReactionInstance reaction) {
+    if (definition.getDelay() != null) {
+      this.maxDelay = reaction.parent.getTimeValue(definition.getDelay());
+    } else {
+      this.maxDelay = TimeValue.ZERO;
     }
+  }
 
-    //////////////////////////////////////////////////////
-    //// Public fields.
+  //////////////////////////////////////////////////////
+  //// Public fields.
 
-    /**
-     * The delay D associated with this deadline. If physical time T < logical
-     * time t + D, the deadline is met, otherwise, it is violated.
-     */
-    public final TimeValue maxDelay;
+  /**
+   * The delay D associated with this deadline. If physical time T < logical time t + D, the
+   * deadline is met, otherwise, it is violated.
+   */
+  public final TimeValue maxDelay;
 
-    //////////////////////////////////////////////////////
-    //// Public methods.
-	
-    @Override
-    public String toString() {
-        return "DeadlineInstance " + maxDelay.toString();
-    }
+  //////////////////////////////////////////////////////
+  //// Public methods.
+
+  @Override
+  public String toString() {
+    return "DeadlineInstance " + maxDelay.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/DelayBodyGenerator.java b/org.lflang/src/org/lflang/generator/DelayBodyGenerator.java
index 39742a3488..240eba7bc1 100644
--- a/org.lflang/src/org/lflang/generator/DelayBodyGenerator.java
+++ b/org.lflang/src/org/lflang/generator/DelayBodyGenerator.java
@@ -6,54 +6,47 @@
 
 public interface DelayBodyGenerator {
 
-    /**
-     * Constant that specifies how to name generated delay reactors.
-     */
-    String GEN_DELAY_CLASS_NAME = "_lf_GenDelay";
-
-    /**
-     * Generate code for the body of a reaction that takes an input and
-     * schedules an action with the value of that input.
-     *
-     * @param action the action to schedule
-     * @param port the port to read from
-     */
-    String generateDelayBody(Action action, VarRef port);
-
-    /**
-     * Generate code for the body of a reaction that is triggered by the
-     * given action and writes its value to the given port.
-     *
-     * @param action the action that triggers the reaction
-     * @param port the port to write to
-     */
-    String generateForwardBody(Action action, VarRef port);
-
-    /**
-     * Generate code for the generic type to be used in the class definition
-     * of a generated delay reactor.
-     */
-    String generateDelayGeneric();
-
-    /**
-     * Indicates whether delay banks generated from after delays should have a variable length
-     * width.
-     * <p>
-     * If this is true, any delay reactors that are inserted for after delays on multiport
-     * connections
-     * will have an unspecified variable length width. The code generator is then responsible for
-     * inferring the
-     * correct width of the delay bank, which is only possible if the precise connection width is
-     * known at compile time.
-     * <p>
-     * If this is false, the width specification of the generated bank will list all the ports
-     * listed on the right
-     * side of the connection. This gives the code generator the information needed to infer the
-     * correct width at
-     * runtime.
-     */
-    boolean generateAfterDelaysWithVariableWidth();
-
-    /** Used to optionally apply additional transformations to the generated reactions */
-    default void finalizeReactions(Reaction delayReaction, Reaction forwardReaction) { }
+  /** Constant that specifies how to name generated delay reactors. */
+  String GEN_DELAY_CLASS_NAME = "_lf_GenDelay";
+
+  /**
+   * Generate code for the body of a reaction that takes an input and schedules an action with the
+   * value of that input.
+   *
+   * @param action the action to schedule
+   * @param port the port to read from
+   */
+  String generateDelayBody(Action action, VarRef port);
+
+  /**
+   * Generate code for the body of a reaction that is triggered by the given action and writes its
+   * value to the given port.
+   *
+   * @param action the action that triggers the reaction
+   * @param port the port to write to
+   */
+  String generateForwardBody(Action action, VarRef port);
+
+  /**
+   * Generate code for the generic type to be used in the class definition of a generated delay
+   * reactor.
+   */
+  String generateDelayGeneric();
+
+  /**
+   * Indicates whether delay banks generated from after delays should have a variable length width.
+   *
+   * <p>If this is true, any delay reactors that are inserted for after delays on multiport
+   * connections will have an unspecified variable length width. The code generator is then
+   * responsible for inferring the correct width of the delay bank, which is only possible if the
+   * precise connection width is known at compile time.
+   *
+   * <p>If this is false, the width specification of the generated bank will list all the ports
+   * listed on the right side of the connection. This gives the code generator the information
+   * needed to infer the correct width at runtime.
+   */
+  boolean generateAfterDelaysWithVariableWidth();
+
+  /** Used to optionally apply additional transformations to the generated reactions */
+  default void finalizeReactions(Reaction delayReaction, Reaction forwardReaction) {}
 }
diff --git a/org.lflang/src/org/lflang/generator/DiagnosticReporting.java b/org.lflang/src/org/lflang/generator/DiagnosticReporting.java
index 82d3535444..871f417a0d 100644
--- a/org.lflang/src/org/lflang/generator/DiagnosticReporting.java
+++ b/org.lflang/src/org/lflang/generator/DiagnosticReporting.java
@@ -2,59 +2,62 @@
 
 import java.nio.file.Path;
 import java.util.Map;
-
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.ErrorReporter;
 
 /**
- * {@code DiagnosticReporting} provides utilities for
- * reporting validation output.
+ * {@code DiagnosticReporting} provides utilities for reporting validation output.
  *
  * @author Peter Donovan
  */
 public class DiagnosticReporting {
 
-    private DiagnosticReporting() {
-        // utility class
-    }
-
-    /**
-     * A means of parsing the output of a validator.
-     */
-    @FunctionalInterface public interface Strategy {
-        /**
-         * Parse the validation output and report any errors
-         * that it contains.
-         * @param validationOutput any validation output
-         * @param errorReporter any error reporter
-         * @param map the map from generated files to CodeMaps
-         */
-        void report(String validationOutput, ErrorReporter errorReporter, Map<Path, CodeMap> map);
-    }
-
-    /**
-     * Format the given data as a human-readable message.
-     * @param message An error message.
-     * @param path The path of the source of the message.
-     * @param position The position where the message originates.
-     * @return The given data as a human-readable message.
-     */
-    public static String messageOf(String message, Path path, Position position) {
-        return String.format("%s [%s:%s:%s]", message, path.getFileName().toString(), position.getOneBasedLine(), position.getOneBasedColumn());
-    }
+  private DiagnosticReporting() {
+    // utility class
+  }
 
+  /** A means of parsing the output of a validator. */
+  @FunctionalInterface
+  public interface Strategy {
     /**
-     * Convert {@code severity} into a {@code DiagnosticSeverity} using a heuristic that should be
-     * compatible with many tools.
-     * @param severity The string representation of a diagnostic severity.
-     * @return The {@code DiagnosticSeverity} representation of {@code severity}.
+     * Parse the validation output and report any errors that it contains.
+     *
+     * @param validationOutput any validation output
+     * @param errorReporter any error reporter
+     * @param map the map from generated files to CodeMaps
      */
-    public static DiagnosticSeverity severityOf(String severity) {
-        severity = severity.toLowerCase();
-        if (severity.contains("error")) return DiagnosticSeverity.Error;
-        else if (severity.contains("warning")) return DiagnosticSeverity.Warning;
-        else if (severity.contains("hint") || severity.contains("help")) return DiagnosticSeverity.Hint;
-        else return DiagnosticSeverity.Information;
-    }
+    void report(String validationOutput, ErrorReporter errorReporter, Map<Path, CodeMap> map);
+  }
+
+  /**
+   * Format the given data as a human-readable message.
+   *
+   * @param message An error message.
+   * @param path The path of the source of the message.
+   * @param position The position where the message originates.
+   * @return The given data as a human-readable message.
+   */
+  public static String messageOf(String message, Path path, Position position) {
+    return String.format(
+        "%s [%s:%s:%s]",
+        message,
+        path.getFileName().toString(),
+        position.getOneBasedLine(),
+        position.getOneBasedColumn());
+  }
+
+  /**
+   * Convert {@code severity} into a {@code DiagnosticSeverity} using a heuristic that should be
+   * compatible with many tools.
+   *
+   * @param severity The string representation of a diagnostic severity.
+   * @return The {@code DiagnosticSeverity} representation of {@code severity}.
+   */
+  public static DiagnosticSeverity severityOf(String severity) {
+    severity = severity.toLowerCase();
+    if (severity.contains("error")) return DiagnosticSeverity.Error;
+    else if (severity.contains("warning")) return DiagnosticSeverity.Warning;
+    else if (severity.contains("hint") || severity.contains("help")) return DiagnosticSeverity.Hint;
+    else return DiagnosticSeverity.Information;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/DockerComposeGenerator.java b/org.lflang/src/org/lflang/generator/DockerComposeGenerator.java
index 040d925614..a3e5028317 100644
--- a/org.lflang/src/org/lflang/generator/DockerComposeGenerator.java
+++ b/org.lflang/src/org/lflang/generator/DockerComposeGenerator.java
@@ -4,7 +4,6 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.lflang.util.FileUtil;
 
 /**
@@ -15,109 +14,104 @@
  */
 public class DockerComposeGenerator {
 
-    /**
-     * Path to the docker-compose.yml file.
-     */
-    protected final Path path;
+  /** Path to the docker-compose.yml file. */
+  protected final Path path;
 
-    public DockerComposeGenerator(LFGeneratorContext context) {
-        this.path = context.getFileConfig().getSrcGenPath().resolve("docker-compose.yml");
-    }
+  public DockerComposeGenerator(LFGeneratorContext context) {
+    this.path = context.getFileConfig().getSrcGenPath().resolve("docker-compose.yml");
+  }
 
-    /**
-     * Return a string that represents the network portion of the docker-compose configuration.
-     * @param networkName Name of the default network
-     */
-    protected String generateDockerNetwork(String networkName) {
-        return """
+  /**
+   * Return a string that represents the network portion of the docker-compose configuration.
+   *
+   * @param networkName Name of the default network
+   */
+  protected String generateDockerNetwork(String networkName) {
+    return """
             networks:
                 default:
                     name: "%s"
-            """.formatted(networkName);
-    }
+            """
+        .formatted(networkName);
+  }
 
-    /**
-     * Return a string that represents the services portion of the docker-compose configuration.
-     * @param services A list of docker data representing the services to render
-     */
-    protected String generateDockerServices(List<DockerData> services) {
-        return """
-            version: "3.9" 
+  /**
+   * Return a string that represents the services portion of the docker-compose configuration.
+   *
+   * @param services A list of docker data representing the services to render
+   */
+  protected String generateDockerServices(List<DockerData> services) {
+    return """
+            version: "3.9"
             services:
             %s
-            """.formatted(services.stream().map(
-                data -> getServiceDescription(data)
-            ).collect(Collectors.joining("\n")));
-    }
+            """
+        .formatted(
+            services.stream()
+                .map(data -> getServiceDescription(data))
+                .collect(Collectors.joining("\n")));
+  }
 
-    /**
-     * Return the command to build and run using the docker-compose configuration.
-     */
-    public String getUsageInstructions() {
-        return """
+  /** Return the command to build and run using the docker-compose configuration. */
+  public String getUsageInstructions() {
+    return """
             #####################################
             To build and run:
                 pushd %s && docker compose up --build
             To return to the current working directory afterwards:
                 popd
             #####################################
-            """.formatted(path.getParent());
-    }
+            """
+        .formatted(path.getParent());
+  }
 
-    /**
-     * Turn given docker data into a string.
-     */
-    protected String getServiceDescription(DockerData data) {
-        return """
+  /** Turn given docker data into a string. */
+  protected String getServiceDescription(DockerData data) {
+    return """
                 %s:
                     build:
                         context: "%s"
                     container_name: "%s"
-            """.formatted(getServiceName(data), getBuildContext(data), getContainerName(data));
-    }
+            """
+        .formatted(getServiceName(data), getBuildContext(data), getContainerName(data));
+  }
 
-    /**
-     * Return the name of the service represented by the given data.
-     */
-    protected String getServiceName(DockerData data) {
-        return "main";
-    }
+  /** Return the name of the service represented by the given data. */
+  protected String getServiceName(DockerData data) {
+    return "main";
+  }
 
-    /**
-     * Return the name of the service represented by the given data.
-     */
-    protected String getBuildContext(DockerData data) {
-        return ".";
-    }
+  /** Return the name of the service represented by the given data. */
+  protected String getBuildContext(DockerData data) {
+    return ".";
+  }
 
-    /**
-     * Return the name of the container for the given data.
-     */
-    protected String getContainerName(DockerData data) {
-        return data.serviceName;
-    }
+  /** Return the name of the container for the given data. */
+  protected String getContainerName(DockerData data) {
+    return data.serviceName;
+  }
 
-    /**
-     * Write the docker-compose.yml file with a default network called "lf".
-     * @param services A list of all the services.
-     */
-    public void writeDockerComposeFile(List<DockerData> services) throws IOException {
-        writeDockerComposeFile(services, "lf");
-    }
+  /**
+   * Write the docker-compose.yml file with a default network called "lf".
+   *
+   * @param services A list of all the services.
+   */
+  public void writeDockerComposeFile(List<DockerData> services) throws IOException {
+    writeDockerComposeFile(services, "lf");
+  }
 
-    /**
-     * Write the docker-compose.yml file.
-     * @param services A list of all the services to include.
-     * @param networkName The name of the network to which docker will connect the services.
-     */
-    public void writeDockerComposeFile(
-        List<DockerData> services,
-        String networkName
-    ) throws IOException {
-        var contents = String.join("\n",
-            this.generateDockerServices(services),
-            this.generateDockerNetwork(networkName));
-        FileUtil.writeToFile(contents, path);
-        System.out.println(getUsageInstructions());
-    }
+  /**
+   * Write the docker-compose.yml file.
+   *
+   * @param services A list of all the services to include.
+   * @param networkName The name of the network to which docker will connect the services.
+   */
+  public void writeDockerComposeFile(List<DockerData> services, String networkName)
+      throws IOException {
+    var contents =
+        String.join(
+            "\n", this.generateDockerServices(services), this.generateDockerNetwork(networkName));
+    FileUtil.writeToFile(contents, path);
+    System.out.println(getUsageInstructions());
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/DockerData.java b/org.lflang/src/org/lflang/generator/DockerData.java
index a2b1927125..af29e9e1d5 100644
--- a/org.lflang/src/org/lflang/generator/DockerData.java
+++ b/org.lflang/src/org/lflang/generator/DockerData.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
-
 import org.lflang.util.FileUtil;
 
 /**
@@ -11,43 +10,31 @@
  * @author Marten Lohstroh
  */
 public class DockerData {
-    /**
-     * The absolute path to the docker file.
-     */
-    private final Path dockerFilePath;
+  /** The absolute path to the docker file. */
+  private final Path dockerFilePath;
 
-    /**
-     * The content of the docker file to be generated.
-     */
-    private final String dockerFileContent;
+  /** The content of the docker file to be generated. */
+  private final String dockerFileContent;
 
-    /**
-     * The name of the service.
-     */
-    public final String serviceName;
+  /** The name of the service. */
+  public final String serviceName;
 
-    public DockerData(
-        String serviceName,
-        Path dockerFilePath,
-        String dockerFileContent
-    ) {
+  public DockerData(String serviceName, Path dockerFilePath, String dockerFileContent) {
 
-        if (!dockerFilePath.toFile().isAbsolute()) {
-            throw new RuntimeException("Cannot use relative docker file path in DockerData instance");
-        }
-        this.serviceName = serviceName;
-        this.dockerFilePath = dockerFilePath;
-        this.dockerFileContent = dockerFileContent;
+    if (!dockerFilePath.toFile().isAbsolute()) {
+      throw new RuntimeException("Cannot use relative docker file path in DockerData instance");
     }
-
-    /**
-     * Write a docker file based on this data.
-     */
-    public void writeDockerFile() throws IOException {
-        if (dockerFilePath.toFile().exists()) {
-            dockerFilePath.toFile().delete();
-        }
-        FileUtil.writeToFile(dockerFileContent, dockerFilePath);
-        System.out.println("Dockerfile written to " + dockerFilePath);
+    this.serviceName = serviceName;
+    this.dockerFilePath = dockerFilePath;
+    this.dockerFileContent = dockerFileContent;
+  }
+
+  /** Write a docker file based on this data. */
+  public void writeDockerFile() throws IOException {
+    if (dockerFilePath.toFile().exists()) {
+      dockerFilePath.toFile().delete();
     }
+    FileUtil.writeToFile(dockerFileContent, dockerFilePath);
+    System.out.println("Dockerfile written to " + dockerFilePath);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/DockerGenerator.java b/org.lflang/src/org/lflang/generator/DockerGenerator.java
index 851ee6c0be..cf6044f14f 100644
--- a/org.lflang/src/org/lflang/generator/DockerGenerator.java
+++ b/org.lflang/src/org/lflang/generator/DockerGenerator.java
@@ -4,7 +4,6 @@
 import org.lflang.generator.python.PythonDockerGenerator;
 import org.lflang.generator.ts.TSDockerGenerator;
 
-
 /**
  * A class for generating docker files.
  *
@@ -13,46 +12,43 @@
  */
 public abstract class DockerGenerator {
 
-    /**
-     * Configuration for interactions with the filesystem.
-     */
-     protected final LFGeneratorContext context;
-
-    /**
-     * The constructor for the base docker file generation class.
-     * @param context The context of the code generator.
-     */
-    public DockerGenerator(LFGeneratorContext context) {
-        this.context = context;
-
-    }
-
-    /**
-     * Generate the contents of a Dockerfile.
-     */
-     protected abstract String generateDockerFileContent();
-
-    /**
-     * Produce a DockerData object.
-     * If the returned object is to be used in a federated context,
-     * pass in the file configuration of the federated generator, null otherwise.
-     * @return docker data created based on the context in this instance
-     */
-    public DockerData generateDockerData() {
-        var name = context.getFileConfig().name;
-        var dockerFilePath = context.getFileConfig().getSrcGenPath().resolve("Dockerfile");
-        var dockerFileContent = generateDockerFileContent();
-
-        return new DockerData(name.replace("_", ""), dockerFilePath, dockerFileContent);
-    }
-
-    public static DockerGenerator dockerGeneratorFactory(LFGeneratorContext context) {
-        var target = context.getTargetConfig().target;
-        return switch (target) {
-            case C, CCPP -> new CDockerGenerator(context);
-            case TS -> new TSDockerGenerator(context);
-            case Python -> new PythonDockerGenerator(context);
-            case CPP, Rust -> throw new IllegalArgumentException("No Docker support for " + target + " yet.");
-        };
-    }
+  /** Configuration for interactions with the filesystem. */
+  protected final LFGeneratorContext context;
+
+  /**
+   * The constructor for the base docker file generation class.
+   *
+   * @param context The context of the code generator.
+   */
+  public DockerGenerator(LFGeneratorContext context) {
+    this.context = context;
+  }
+
+  /** Generate the contents of a Dockerfile. */
+  protected abstract String generateDockerFileContent();
+
+  /**
+   * Produce a DockerData object. If the returned object is to be used in a federated context, pass
+   * in the file configuration of the federated generator, null otherwise.
+   *
+   * @return docker data created based on the context in this instance
+   */
+  public DockerData generateDockerData() {
+    var name = context.getFileConfig().name;
+    var dockerFilePath = context.getFileConfig().getSrcGenPath().resolve("Dockerfile");
+    var dockerFileContent = generateDockerFileContent();
+
+    return new DockerData(name.replace("_", ""), dockerFilePath, dockerFileContent);
+  }
+
+  public static DockerGenerator dockerGeneratorFactory(LFGeneratorContext context) {
+    var target = context.getTargetConfig().target;
+    return switch (target) {
+      case C, CCPP -> new CDockerGenerator(context);
+      case TS -> new TSDockerGenerator(context);
+      case Python -> new PythonDockerGenerator(context);
+      case CPP, Rust -> throw new IllegalArgumentException(
+          "No Docker support for " + target + " yet.");
+    };
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/FedDockerComposeGenerator.java b/org.lflang/src/org/lflang/generator/FedDockerComposeGenerator.java
index d666abba2d..18896f03a0 100644
--- a/org.lflang/src/org/lflang/generator/FedDockerComposeGenerator.java
+++ b/org.lflang/src/org/lflang/generator/FedDockerComposeGenerator.java
@@ -1,6 +1,5 @@
 package org.lflang.generator;
 
-
 import java.util.List;
 
 /**
@@ -10,57 +9,55 @@
  */
 public class FedDockerComposeGenerator extends DockerComposeGenerator {
 
-    /**
-     * The host on which to run the rti.
-     */
-    private String rtiHost;
+  /** The host on which to run the rti. */
+  private String rtiHost;
 
-    /**
-     * The name of this federation.
-     */
-    private String containerName;
+  /** The name of this federation. */
+  private String containerName;
 
-    public FedDockerComposeGenerator(LFGeneratorContext context, String rtiHost) {
-        super(context);
-        this.rtiHost = rtiHost;
-        this.containerName = context.getFileConfig().name;
-    }
+  public FedDockerComposeGenerator(LFGeneratorContext context, String rtiHost) {
+    super(context);
+    this.rtiHost = rtiHost;
+    this.containerName = context.getFileConfig().name;
+  }
 
-    @Override
-    protected String generateDockerServices(List<DockerData> services) {
-        return """
+  @Override
+  protected String generateDockerServices(List<DockerData> services) {
+    return """
             %s\
                 rti:
                     image: "lflang/rti:rti"
                     hostname: "%s"
                     command: "-i 1 -n %s"
                     container_name: "%s-rti"
-            """.formatted(super.generateDockerServices(services),
-                this.rtiHost, services.size(), containerName);
-    }
-
-    @Override
-    protected String getServiceDescription(DockerData data) {
-        return """
+            """
+        .formatted(
+            super.generateDockerServices(services), this.rtiHost, services.size(), containerName);
+  }
+
+  @Override
+  protected String getServiceDescription(DockerData data) {
+    return """
             %s\
                     command: "-i 1"
                     depends_on:
                         - rti
-            """.formatted(super.getServiceDescription(data));
-    }
-
-    @Override
-    protected String getServiceName(DockerData data) {
-        return data.serviceName;
-    }
-
-    @Override
-    protected String getBuildContext(DockerData data) {
-        return data.serviceName;
-    }
-
-    @Override
-    protected String getContainerName(DockerData data) {
-        return this.containerName + "-" + data.serviceName;
-    }
+            """
+        .formatted(super.getServiceDescription(data));
+  }
+
+  @Override
+  protected String getServiceName(DockerData data) {
+    return data.serviceName;
+  }
+
+  @Override
+  protected String getBuildContext(DockerData data) {
+    return data.serviceName;
+  }
+
+  @Override
+  protected String getContainerName(DockerData data) {
+    return this.containerName + "-" + data.serviceName;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/GenerationException.java b/org.lflang/src/org/lflang/generator/GenerationException.java
index 1920e9aca8..1bc7985ee7 100644
--- a/org.lflang/src/org/lflang/generator/GenerationException.java
+++ b/org.lflang/src/org/lflang/generator/GenerationException.java
@@ -27,40 +27,36 @@
 import org.eclipse.emf.ecore.EObject;
 // import org.jetbrains.annotations.Nullable;
 
-/**
- * An exception that occurred during code generation. May also
- * wrap another exception.
- */
-public class GenerationException extends RuntimeException { // note that this is an unchecked exception.
-
-    /* @Nullable */
-    private final EObject location;
-
-    public GenerationException(String message) {
-        this(null, message, null);
-    }
-
-    public GenerationException(/* @Nullable */ EObject location, String message) {
-        this(location, message, null);
-    }
-
-    public GenerationException(String message, Throwable cause) {
-        this(null, message, cause);
-
-    }
-
-    public GenerationException(/* @Nullable */ EObject location, String message, Throwable cause) {
-        super(message, cause);
-        this.location = location;
-    }
-
-    public GenerationException(Throwable cause) {
-        this(null, null, cause);
-    }
-
-    /* @Nullable */
-    public EObject getLocation() {
-        return location;
-    }
+/** An exception that occurred during code generation. May also wrap another exception. */
+public class GenerationException
+    extends RuntimeException { // note that this is an unchecked exception.
+
+  /* @Nullable */
+  private final EObject location;
+
+  public GenerationException(String message) {
+    this(null, message, null);
+  }
+
+  public GenerationException(/* @Nullable */ EObject location, String message) {
+    this(location, message, null);
+  }
+
+  public GenerationException(String message, Throwable cause) {
+    this(null, message, cause);
+  }
+
+  public GenerationException(/* @Nullable */ EObject location, String message, Throwable cause) {
+    super(message, cause);
+    this.location = location;
+  }
+
+  public GenerationException(Throwable cause) {
+    this(null, null, cause);
+  }
+
+  /* @Nullable */
+  public EObject getLocation() {
+    return location;
+  }
 }
-
diff --git a/org.lflang/src/org/lflang/generator/GeneratorBase.java b/org.lflang/src/org/lflang/generator/GeneratorBase.java
index 5ae5045533..942956c2d5 100644
--- a/org.lflang/src/org/lflang/generator/GeneratorBase.java
+++ b/org.lflang/src/org/lflang/generator/GeneratorBase.java
@@ -24,47 +24,42 @@
  ***************/
 package org.lflang.generator;
 
+import com.google.common.base.Objects;
+import com.google.common.collect.Iterables;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.LinkedHashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.MainConflictChecker;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
+import org.lflang.ast.ASTUtils;
 import org.lflang.ast.AstTransformation;
 import org.lflang.graph.InstantiationGraph;
 import org.lflang.lf.Connection;
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.Mode;
-
 import org.lflang.lf.Reaction;
 import org.lflang.lf.Reactor;
 import org.lflang.util.FileUtil;
 import org.lflang.validation.AbstractLFValidator;
 
-import com.google.common.base.Objects;
-import com.google.common.collect.Iterables;
-
 /**
- * Generator base class for specifying core functionality
- * that all code generators should have.
+ * Generator base class for specifying core functionality that all code generators should have.
  *
  * @author Edward A. Lee
  * @author Marten Lohstroh
@@ -74,566 +69,570 @@
  */
 public abstract class GeneratorBase extends AbstractLFValidator {
 
-    ////////////////////////////////////////////
-    //// Public fields.
-
-    /**
-     * The main (top-level) reactor instance.
-     */
-    public ReactorInstance main;
-
-    /** An error reporter for reporting any errors or warnings during the code generation */
-    public ErrorReporter errorReporter;
-
-    ////////////////////////////////////////////
-    //// Protected fields.
-
-    /**
-     * The current target configuration.
-     */
-    protected final TargetConfig targetConfig;
-
-    public TargetConfig getTargetConfig() { return this.targetConfig;}
-
-    public final LFGeneratorContext context;
-
-    /**
-     * A factory for compiler commands.
-     */
-    protected GeneratorCommandFactory commandFactory;
-
-    public GeneratorCommandFactory getCommandFactory() { return commandFactory; }
-
-    /**
-     * Definition of the main (top-level) reactor.
-     * This is an automatically generated AST node for the top-level
-     * reactor.
-     */
-    protected Instantiation mainDef;
-    public Instantiation getMainDef() { return mainDef; }
-
-    /**
-     * A list of Reactor definitions in the main resource, including non-main
-     * reactors defined in imported resources. These are ordered in the list in
-     * such a way that each reactor is preceded by any reactor that it instantiates
-     * using a command like {@code foo = new Foo();}
-     */
-    protected List<Reactor> reactors = new ArrayList<>();
-
-    /**
-     * The set of resources referenced reactor classes reside in.
-     */
-    protected Set<LFResource> resources = new LinkedHashSet<>(); // FIXME: Why do we need this?
-
-    /**
-     * Graph that tracks dependencies between instantiations.
-     * This is a graph where each node is a Reactor (not a ReactorInstance)
-     * and an arc from Reactor A to Reactor B means that B contains an instance of A, constructed with a statement
-     * like {@code a = new A();}  After creating the graph,
-     * sort the reactors in topological order and assign them to the reactors class variable.
-     * Hence, after this method returns, {@code this.reactors} will be a list of Reactors such that any
-     * reactor is preceded in the list by reactors that it instantiates.
-     */
-    protected InstantiationGraph instantiationGraph;
-
-    /**
-     * Map from reactions to bank indices
-     */
-    protected Map<Reaction,Integer> reactionBankIndices = null;
-
-    /**
-     * Indicates whether the current Lingua Franca program
-     * contains model reactors.
-     */
-    public boolean hasModalReactors = false;
-
-    /**
-     * Indicates whether the program has any deadlines and thus
-     * needs to propagate deadlines through the reaction instance graph
-     */
-    public boolean hasDeadlines = false;
-
-    /** Indicates whether the program has any watchdogs. This is used to check for support. */
-    public boolean hasWatchdogs = false;
-
-    // //////////////////////////////////////////
-    // // Private fields.
-
-    /**
-     * A list ot AST transformations to apply before code generation
-     */
-    private final List<AstTransformation> astTransformations = new ArrayList<>();
-
-    /**
-     * Create a new GeneratorBase object.
-     */
-    public GeneratorBase(LFGeneratorContext context) {
-        this.context = context;
-        this.targetConfig = context.getTargetConfig();
-        this.errorReporter = context.getErrorReporter();
-        this.commandFactory = new GeneratorCommandFactory(errorReporter, context.getFileConfig());
+  ////////////////////////////////////////////
+  //// Public fields.
+
+  /** The main (top-level) reactor instance. */
+  public ReactorInstance main;
+
+  /** An error reporter for reporting any errors or warnings during the code generation */
+  public ErrorReporter errorReporter;
+
+  ////////////////////////////////////////////
+  //// Protected fields.
+
+  /** The current target configuration. */
+  protected final TargetConfig targetConfig;
+
+  public TargetConfig getTargetConfig() {
+    return this.targetConfig;
+  }
+
+  public final LFGeneratorContext context;
+
+  /** A factory for compiler commands. */
+  protected GeneratorCommandFactory commandFactory;
+
+  public GeneratorCommandFactory getCommandFactory() {
+    return commandFactory;
+  }
+
+  /**
+   * Definition of the main (top-level) reactor. This is an automatically generated AST node for the
+   * top-level reactor.
+   */
+  protected Instantiation mainDef;
+
+  public Instantiation getMainDef() {
+    return mainDef;
+  }
+
+  /**
+   * A list of Reactor definitions in the main resource, including non-main reactors defined in
+   * imported resources. These are ordered in the list in such a way that each reactor is preceded
+   * by any reactor that it instantiates using a command like {@code foo = new Foo();}
+   */
+  protected List<Reactor> reactors = new ArrayList<>();
+
+  /** The set of resources referenced reactor classes reside in. */
+  protected Set<LFResource> resources = new LinkedHashSet<>(); // FIXME: Why do we need this?
+
+  /**
+   * Graph that tracks dependencies between instantiations. This is a graph where each node is a
+   * Reactor (not a ReactorInstance) and an arc from Reactor A to Reactor B means that B contains an
+   * instance of A, constructed with a statement like {@code a = new A();} After creating the graph,
+   * sort the reactors in topological order and assign them to the reactors class variable. Hence,
+   * after this method returns, {@code this.reactors} will be a list of Reactors such that any
+   * reactor is preceded in the list by reactors that it instantiates.
+   */
+  protected InstantiationGraph instantiationGraph;
+
+  /** Map from reactions to bank indices */
+  protected Map<Reaction, Integer> reactionBankIndices = null;
+
+  /** Indicates whether the current Lingua Franca program contains model reactors. */
+  public boolean hasModalReactors = false;
+
+  /**
+   * Indicates whether the program has any deadlines and thus needs to propagate deadlines through
+   * the reaction instance graph
+   */
+  public boolean hasDeadlines = false;
+
+  /** Indicates whether the program has any watchdogs. This is used to check for support. */
+  public boolean hasWatchdogs = false;
+
+  // //////////////////////////////////////////
+  // // Private fields.
+
+  /** A list ot AST transformations to apply before code generation */
+  private final List<AstTransformation> astTransformations = new ArrayList<>();
+
+  /** Create a new GeneratorBase object. */
+  public GeneratorBase(LFGeneratorContext context) {
+    this.context = context;
+    this.targetConfig = context.getTargetConfig();
+    this.errorReporter = context.getErrorReporter();
+    this.commandFactory = new GeneratorCommandFactory(errorReporter, context.getFileConfig());
+  }
+
+  /**
+   * Register an AST transformation to be applied to the AST.
+   *
+   * <p>The transformations will be applied in the order that they are registered in.
+   */
+  protected void registerTransformation(AstTransformation transformation) {
+    astTransformations.add(transformation);
+  }
+
+  // //////////////////////////////////////////
+  // // Code generation functions to override for a concrete code generator.
+
+  /**
+   * If there is a main or federated reactor, then create a synthetic Instantiation for that
+   * top-level reactor and set the field mainDef to refer to it.
+   */
+  private void createMainInstantiation() {
+    // Find the main reactor and create an AST node for its instantiation.
+    Iterable<EObject> nodes =
+        IteratorExtensions.toIterable(context.getFileConfig().resource.getAllContents());
+    for (Reactor reactor : Iterables.filter(nodes, Reactor.class)) {
+      if (reactor.isMain()) {
+        // Creating a definition for the main reactor because there isn't one.
+        this.mainDef = LfFactory.eINSTANCE.createInstantiation();
+        this.mainDef.setName(reactor.getName());
+        this.mainDef.setReactorClass(reactor);
+      }
     }
-
-    /**
-     * Register an AST transformation to be applied to the AST.
-     *
-     * The transformations will be applied in the order that they are registered in.
-     */
-    protected void registerTransformation(AstTransformation transformation) {
-        astTransformations.add(transformation);
+  }
+
+  /**
+   * Generate code from the Lingua Franca model contained by the specified resource.
+   *
+   * <p>This is the main entry point for code generation. This base class finds all reactor class
+   * definitions, including any reactors defined in imported .lf files (except any main reactors in
+   * those imported files), and adds them to the {@link GeneratorBase#reactors reactors} list. If
+   * errors occur during generation, then a subsequent call to errorsOccurred() will return true.
+   *
+   * @param resource The resource containing the source code.
+   * @param context Context relating to invocation of the code generator. In standalone mode, this
+   *     object is also used to relay CLI arguments.
+   */
+  public void doGenerate(Resource resource, LFGeneratorContext context) {
+
+    // FIXME: the signature can be reduced to only take context.
+    // The constructor also need not take a file config because this is tied to the context as well.
+    cleanIfNeeded(context);
+
+    printInfo(context.getMode());
+
+    // Clear any IDE markers that may have been created by a previous build.
+    // Markers mark problems in the Eclipse IDE when running in integrated mode.
+    errorReporter.clearHistory();
+
+    ASTUtils.setMainName(context.getFileConfig().resource, context.getFileConfig().name);
+
+    createMainInstantiation();
+
+    // Check if there are any conflicting main reactors elsewhere in the package.
+    if (Objects.equal(context.getMode(), LFGeneratorContext.Mode.STANDALONE) && mainDef != null) {
+      for (String conflict : new MainConflictChecker(context.getFileConfig()).conflicts) {
+        errorReporter.reportError(
+            this.mainDef.getReactorClass(), "Conflicting main reactor in " + conflict);
+      }
     }
 
-    // //////////////////////////////////////////
-    // // Code generation functions to override for a concrete code generator.
-
-    /**
-     * If there is a main or federated reactor, then create a synthetic Instantiation
-     * for that top-level reactor and set the field mainDef to refer to it.
-     */
-    private void createMainInstantiation() {
-        // Find the main reactor and create an AST node for its instantiation.
-        Iterable<EObject> nodes = IteratorExtensions.toIterable(context.getFileConfig().resource.getAllContents());
-        for (Reactor reactor : Iterables.filter(nodes, Reactor.class)) {
-            if (reactor.isMain()) {
-                // Creating a definition for the main reactor because there isn't one.
-                this.mainDef = LfFactory.eINSTANCE.createInstantiation();
-                this.mainDef.setName(reactor.getName());
-                this.mainDef.setReactorClass(reactor);
-            }
-        }
+    // Configure the command factory
+    commandFactory.setVerbose();
+    if (Objects.equal(context.getMode(), LFGeneratorContext.Mode.STANDALONE)
+        && context.getArgs().containsKey("quiet")) {
+      commandFactory.setQuiet();
     }
 
-    /**
-     * Generate code from the Lingua Franca model contained by the specified resource.
-     *
-     * This is the main entry point for code generation. This base class finds all
-     * reactor class definitions, including any reactors defined in imported .lf files
-     * (except any main reactors in those imported files), and adds them to the
-     * {@link GeneratorBase#reactors reactors} list. If errors occur during
-     * generation, then a subsequent call to errorsOccurred() will return true.
-     * @param resource The resource containing the source code.
-     * @param context Context relating to invocation of the code generator.
-     * In standalone mode, this object is also used to relay CLI arguments.
-     */
-    public void doGenerate(Resource resource, LFGeneratorContext context) {
-
-        // FIXME: the signature can be reduced to only take context.
-        // The constructor also need not take a file config because this is tied to the context as well.
-        cleanIfNeeded(context);
-
-        printInfo(context.getMode());
-
-        // Clear any IDE markers that may have been created by a previous build.
-        // Markers mark problems in the Eclipse IDE when running in integrated mode.
-        errorReporter.clearHistory();
-
-        ASTUtils.setMainName(context.getFileConfig().resource, context.getFileConfig().name);
-
-        createMainInstantiation();
-
-        // Check if there are any conflicting main reactors elsewhere in the package.
-        if (Objects.equal(context.getMode(), LFGeneratorContext.Mode.STANDALONE) && mainDef != null) {
-            for (String conflict : new MainConflictChecker(context.getFileConfig()).conflicts) {
-                errorReporter.reportError(this.mainDef.getReactorClass(), "Conflicting main reactor in " + conflict);
-            }
-        }
-
-        // Configure the command factory
-        commandFactory.setVerbose();
-        if (Objects.equal(context.getMode(), LFGeneratorContext.Mode.STANDALONE) && context.getArgs().containsKey("quiet")) {
-            commandFactory.setQuiet();
-        }
-
-        // Process target files. Copy each of them into the src-gen dir.
-        // FIXME: Should we do this here? This doesn't make sense for federates the way it is
-        // done here.
-        copyUserFiles(this.targetConfig, context.getFileConfig());
-
-        // Collect reactors and create an instantiation graph.
-        // These are needed to figure out which resources we need
-        // to validate, which happens in setResources().
-        setReactorsAndInstantiationGraph(context.getMode());
-
-        List<Resource> allResources = GeneratorUtils.getResources(reactors);
-        resources.addAll(allResources.stream()  // FIXME: This filter reproduces the behavior of the method it replaces. But why must it be so complicated? Why are we worried about weird corner cases like this?
-            .filter(it -> !Objects.equal(it, context.getFileConfig().resource) || mainDef != null && it == mainDef.getReactorClass().eResource())
-            .map(it -> GeneratorUtils.getLFResource(it, context.getFileConfig().getSrcGenBasePath(), context, errorReporter))
-            .toList()
-        );
-        GeneratorUtils.accommodatePhysicalActionsIfPresent(
-            allResources,
-            getTarget().setsKeepAliveOptionAutomatically(),
-            targetConfig,
-            errorReporter
-        );
-        // FIXME: Should the GeneratorBase pull in {@code files} from imported
-        // resources?
-
-        for (AstTransformation transformation : astTransformations) {
-            transformation.applyTransformation(reactors);
-        }
-
-        // Transform connections that reside in mutually exclusive modes and are otherwise conflicting
-        // This should be done before creating the instantiation graph
-        transformConflictingConnectionsInModalReactors();
-
-        // Invoke these functions a second time because transformations
-        // may have introduced new reactors!
-        setReactorsAndInstantiationGraph(context.getMode());
-
-        // Check for existence and support of modes
-        hasModalReactors = IterableExtensions.exists(reactors, it -> !it.getModes().isEmpty());
-        checkModalReactorSupport(false);
-
-        // Check for the existence and support of watchdogs
-        hasWatchdogs = IterableExtensions.exists(reactors, it -> !it.getWatchdogs().isEmpty());
-        checkWatchdogSupport(targetConfig.threading && getTarget() == Target.C);
-        additionalPostProcessingForModes();
+    // Process target files. Copy each of them into the src-gen dir.
+    // FIXME: Should we do this here? This doesn't make sense for federates the way it is
+    // done here.
+    copyUserFiles(this.targetConfig, context.getFileConfig());
+
+    // Collect reactors and create an instantiation graph.
+    // These are needed to figure out which resources we need
+    // to validate, which happens in setResources().
+    setReactorsAndInstantiationGraph(context.getMode());
+
+    List<Resource> allResources = GeneratorUtils.getResources(reactors);
+    resources.addAll(
+        allResources
+            .stream() // FIXME: This filter reproduces the behavior of the method it replaces. But
+            // why must it be so complicated? Why are we worried about weird corner cases
+            // like this?
+            .filter(
+                it ->
+                    !Objects.equal(it, context.getFileConfig().resource)
+                        || mainDef != null && it == mainDef.getReactorClass().eResource())
+            .map(
+                it ->
+                    GeneratorUtils.getLFResource(
+                        it, context.getFileConfig().getSrcGenBasePath(), context, errorReporter))
+            .toList());
+    GeneratorUtils.accommodatePhysicalActionsIfPresent(
+        allResources, getTarget().setsKeepAliveOptionAutomatically(), targetConfig, errorReporter);
+    // FIXME: Should the GeneratorBase pull in {@code files} from imported
+    // resources?
+
+    for (AstTransformation transformation : astTransformations) {
+      transformation.applyTransformation(reactors);
     }
 
-    /**
-     * Check if a clean was requested from the standalone compiler and perform
-     * the clean step.
-     */
-    protected void cleanIfNeeded(LFGeneratorContext context) {
-        if (context.getArgs().containsKey("clean")) {
-            try {
-                context.getFileConfig().doClean();
-            } catch (IOException e) {
-                System.err.println("WARNING: IO Error during clean");
-            }
-        }
+    // Transform connections that reside in mutually exclusive modes and are otherwise conflicting
+    // This should be done before creating the instantiation graph
+    transformConflictingConnectionsInModalReactors();
+
+    // Invoke these functions a second time because transformations
+    // may have introduced new reactors!
+    setReactorsAndInstantiationGraph(context.getMode());
+
+    // Check for existence and support of modes
+    hasModalReactors = IterableExtensions.exists(reactors, it -> !it.getModes().isEmpty());
+    checkModalReactorSupport(false);
+
+    // Check for the existence and support of watchdogs
+    hasWatchdogs = IterableExtensions.exists(reactors, it -> !it.getWatchdogs().isEmpty());
+    checkWatchdogSupport(targetConfig.threading && getTarget() == Target.C);
+    additionalPostProcessingForModes();
+  }
+
+  /** Check if a clean was requested from the standalone compiler and perform the clean step. */
+  protected void cleanIfNeeded(LFGeneratorContext context) {
+    if (context.getArgs().containsKey("clean")) {
+      try {
+        context.getFileConfig().doClean();
+      } catch (IOException e) {
+        System.err.println("WARNING: IO Error during clean");
+      }
     }
-
-    /**
-     * Create a new instantiation graph. This is a graph where each node is a Reactor (not a ReactorInstance)
-     * and an arc from Reactor A to Reactor B means that B contains an instance of A, constructed with a statement
-     * like {@code a = new A();}  After creating the graph,
-     * sort the reactors in topological order and assign them to the reactors class variable.
-     * Hence, after this method returns, {@code this.reactors} will be a list of Reactors such that any
-     * reactor is preceded in the list by reactors that it instantiates.
-     */
-    protected void setReactorsAndInstantiationGraph(LFGeneratorContext.Mode mode) {
-        // Build the instantiation graph .
-        instantiationGraph = new InstantiationGraph(context.getFileConfig().resource, false);
-
-        // Topologically sort the reactors such that all of a reactor's instantiation dependencies occur earlier in
-        // the sorted list of reactors. This helps the code generator output code in the correct order.
-        // For example if {@code reactor Foo {bar = new Bar()}} then the definition of {@code Bar} has to be generated before
-        // the definition of {@code Foo}.
-        reactors = instantiationGraph.nodesInTopologicalOrder();
-
-        // If there is no main reactor or if all reactors in the file need to be validated, then make sure the reactors
-        // list includes even reactors that are not instantiated anywhere.
-        if (mainDef == null || Objects.equal(mode, LFGeneratorContext.Mode.LSP_MEDIUM)) {
-            Iterable<EObject> nodes = IteratorExtensions.toIterable(context.getFileConfig().resource.getAllContents());
-            for (Reactor r : IterableExtensions.filter(nodes, Reactor.class)) {
-                if (!reactors.contains(r)) {
-                    reactors.add(r);
-                }
-            }
+  }
+
+  /**
+   * Create a new instantiation graph. This is a graph where each node is a Reactor (not a
+   * ReactorInstance) and an arc from Reactor A to Reactor B means that B contains an instance of A,
+   * constructed with a statement like {@code a = new A();} After creating the graph, sort the
+   * reactors in topological order and assign them to the reactors class variable. Hence, after this
+   * method returns, {@code this.reactors} will be a list of Reactors such that any reactor is
+   * preceded in the list by reactors that it instantiates.
+   */
+  protected void setReactorsAndInstantiationGraph(LFGeneratorContext.Mode mode) {
+    // Build the instantiation graph .
+    instantiationGraph = new InstantiationGraph(context.getFileConfig().resource, false);
+
+    // Topologically sort the reactors such that all of a reactor's instantiation dependencies occur
+    // earlier in
+    // the sorted list of reactors. This helps the code generator output code in the correct order.
+    // For example if {@code reactor Foo {bar = new Bar()}} then the definition of {@code Bar} has
+    // to be generated before
+    // the definition of {@code Foo}.
+    reactors = instantiationGraph.nodesInTopologicalOrder();
+
+    // If there is no main reactor or if all reactors in the file need to be validated, then make
+    // sure the reactors
+    // list includes even reactors that are not instantiated anywhere.
+    if (mainDef == null || Objects.equal(mode, LFGeneratorContext.Mode.LSP_MEDIUM)) {
+      Iterable<EObject> nodes =
+          IteratorExtensions.toIterable(context.getFileConfig().resource.getAllContents());
+      for (Reactor r : IterableExtensions.filter(nodes, Reactor.class)) {
+        if (!reactors.contains(r)) {
+          reactors.add(r);
         }
+      }
     }
-
-    /**
-     * Copy user specific files to the src-gen folder.
-     *
-     * This should be overridden by the target generators.
-     *
-     * @param targetConfig The targetConfig to read the {@code files} from.
-     * @param fileConfig The fileConfig used to make the copy and resolve paths.
-     */
-    protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
-        var dst = this.context.getFileConfig().getSrcGenPath();
-        FileUtil.copyFilesOrDirectories(targetConfig.files, dst, fileConfig, errorReporter, false);
-    }
-
-    /**
-     * Return true if errors occurred in the last call to doGenerate().
-     * This will return true if any of the reportError methods was called.
-     * @return True if errors occurred.
-     */
-    public boolean errorsOccurred() {
-        return errorReporter.getErrorsOccurred();
+  }
+
+  /**
+   * Copy user specific files to the src-gen folder.
+   *
+   * <p>This should be overridden by the target generators.
+   *
+   * @param targetConfig The targetConfig to read the {@code files} from.
+   * @param fileConfig The fileConfig used to make the copy and resolve paths.
+   */
+  protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
+    var dst = this.context.getFileConfig().getSrcGenPath();
+    FileUtil.copyFilesOrDirectories(targetConfig.files, dst, fileConfig, errorReporter, false);
+  }
+
+  /**
+   * Return true if errors occurred in the last call to doGenerate(). This will return true if any
+   * of the reportError methods was called.
+   *
+   * @return True if errors occurred.
+   */
+  public boolean errorsOccurred() {
+    return errorReporter.getErrorsOccurred();
+  }
+
+  /*
+   * Return the TargetTypes instance associated with this.
+   */
+  public abstract TargetTypes getTargetTypes();
+
+  /**
+   * Mark the specified reaction to belong to only the specified bank index. This is needed because
+   * reactions cannot declare a specific bank index as an effect or trigger. Reactions that send
+   * messages between federates, including absent messages, need to be specific to a bank member.
+   *
+   * @param reaction The reaction.
+   * @param bankIndex The bank index, or -1 if there is no bank.
+   */
+  public void setReactionBankIndex(Reaction reaction, int bankIndex) {
+    if (bankIndex < 0) {
+      return;
     }
-
-    /*
-     * Return the TargetTypes instance associated with this.
-     */
-    public abstract TargetTypes getTargetTypes();
-
-    /**
-     * Mark the specified reaction to belong to only the specified
-     * bank index. This is needed because reactions cannot declare
-     * a specific bank index as an effect or trigger. Reactions that
-     * send messages between federates, including absent messages,
-     * need to be specific to a bank member.
-     * @param reaction The reaction.
-     * @param bankIndex The bank index, or -1 if there is no bank.
-     */
-    public void setReactionBankIndex(Reaction reaction, int bankIndex) {
-        if (bankIndex < 0) {
-            return;
-        }
-        if (reactionBankIndices == null) {
-            reactionBankIndices = new LinkedHashMap<>();
-        }
-        reactionBankIndices.put(reaction, bankIndex);
+    if (reactionBankIndices == null) {
+      reactionBankIndices = new LinkedHashMap<>();
     }
-
-    /**
-     * Return the reaction bank index.
-     * @see #setReactionBankIndex(Reaction reaction, int bankIndex)
-     * @param reaction The reaction.
-     * @return The reaction bank index, if one has been set, and -1 otherwise.
-     */
-    public int getReactionBankIndex(Reaction reaction) {
-        if (reactionBankIndices == null) return -1;
-        if (reactionBankIndices.get(reaction) == null) return -1;
-        return reactionBankIndices.get(reaction);
+    reactionBankIndices.put(reaction, bankIndex);
+  }
+
+  /**
+   * Return the reaction bank index.
+   *
+   * @see #setReactionBankIndex(Reaction reaction, int bankIndex)
+   * @param reaction The reaction.
+   * @return The reaction bank index, if one has been set, and -1 otherwise.
+   */
+  public int getReactionBankIndex(Reaction reaction) {
+    if (reactionBankIndices == null) return -1;
+    if (reactionBankIndices.get(reaction) == null) return -1;
+    return reactionBankIndices.get(reaction);
+  }
+
+  // //////////////////////////////////////////
+  // // Protected methods.
+
+  /**
+   * Checks whether modal reactors are present and require appropriate code generation. This will
+   * set the hasModalReactors variable.
+   *
+   * @param isSupported indicates if modes are supported by this code generation.
+   */
+  protected void checkModalReactorSupport(boolean isSupported) {
+    if (hasModalReactors && !isSupported) {
+      errorReporter.reportError(
+          "The currently selected code generation or "
+              + "target configuration does not support modal reactors!");
     }
-
-    // //////////////////////////////////////////
-    // // Protected methods.
-
-    /**
-     * Checks whether modal reactors are present and require appropriate code generation.
-     * This will set the hasModalReactors variable.
-     * @param isSupported indicates if modes are supported by this code generation.
-     */
-    protected void checkModalReactorSupport(boolean isSupported) {
-        if (hasModalReactors && !isSupported) {
-            errorReporter.reportError("The currently selected code generation or " +
-                    "target configuration does not support modal reactors!");
-        }
+  }
+
+  /**
+   * Check whether watchdogs are present and are supported.
+   *
+   * @param isSupported indicates whether or not this is a supported target and whether or not it is
+   *     a threaded runtime.
+   */
+  protected void checkWatchdogSupport(boolean isSupported) {
+    if (hasWatchdogs && !isSupported) {
+      errorReporter.reportError(
+          "Watchdogs are currently only supported for threaded programs in the C target.");
     }
-
-    /**
-     * Check whether watchdogs are present and are supported.
-     *
-     * @param isSupported indicates whether or not this is a supported target and whether or not it
-     * is
-     * a threaded runtime.
-     */
-    protected void checkWatchdogSupport(boolean isSupported) {
-        if (hasWatchdogs && !isSupported) {
+  }
+
+  /**
+   * Finds and transforms connections into forwarding reactions iff the connections have the same
+   * destination as other connections or reaction in mutually exclusive modes.
+   */
+  private void transformConflictingConnectionsInModalReactors() {
+    for (LFResource r : resources) {
+      var transform = ASTUtils.findConflictingConnectionsInModalReactors(r.eResource);
+      if (!transform.isEmpty()) {
+        var factory = LfFactory.eINSTANCE;
+        for (Connection connection : transform) {
+          // Currently only simple transformations are supported
+          if (connection.isPhysical()
+              || connection.getDelay() != null
+              || connection.isIterated()
+              || connection.getLeftPorts().size() > 1
+              || connection.getRightPorts().size() > 1) {
             errorReporter.reportError(
-                "Watchdogs are currently only supported for threaded programs in the C target.");
-        }
-    }
-
-    /**
-     * Finds and transforms connections into forwarding reactions iff the connections have the same
-     * destination as other connections or reaction in mutually exclusive modes.
-     */
-    private void transformConflictingConnectionsInModalReactors() {
-        for (LFResource r : resources) {
-            var transform = ASTUtils.findConflictingConnectionsInModalReactors(r.eResource);
-            if (!transform.isEmpty()) {
-                var factory = LfFactory.eINSTANCE;
-                for (Connection connection : transform) {
-                    // Currently only simple transformations are supported
-                    if (connection.isPhysical() || connection.getDelay() != null || connection.isIterated() ||
-                        connection.getLeftPorts().size() > 1 || connection.getRightPorts().size() > 1
-                    ) {
-                        errorReporter.reportError(connection, "Cannot transform connection in modal reactor. Connection uses currently not supported features.");
-                    } else {
-                        var reaction = factory.createReaction();
-                        ((Mode)connection.eContainer()).getReactions().add(reaction);
-
-                        var sourceRef = connection.getLeftPorts().get(0);
-                        var destRef = connection.getRightPorts().get(0);
-                        reaction.getTriggers().add(sourceRef);
-                        reaction.getEffects().add(destRef);
-
-                        var code = factory.createCode();
-                        var source = (sourceRef.getContainer() != null ?
-                                sourceRef.getContainer().getName() + "." : "") + sourceRef.getVariable().getName();
-                        var dest = (destRef.getContainer() != null ?
-                                destRef.getContainer().getName() + "." : "") + destRef.getVariable().getName();
-                        code.setBody(getConflictingConnectionsInModalReactorsBody(source, dest));
-                        reaction.setCode(code);
-
-                        EcoreUtil.remove(connection);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Return target code for forwarding reactions iff the connections have the
-     * same destination as other connections or reaction in mutually exclusive modes.
-     *
-     * This method needs to be overridden in target specific code generators that
-     * support modal reactors.
-     */
-    protected String getConflictingConnectionsInModalReactorsBody(String source, String dest) {
-        errorReporter.reportError("The currently selected code generation " +
-                                  "is missing an implementation for conflicting " +
-                                  "transforming connections in modal reactors.");
-        return "MODAL MODELS NOT SUPPORTED";
-    }
-
-    /**
-     * Hook for additional post-processing of the model.
-     */
-    protected void additionalPostProcessingForModes() {
-        // Do nothing
-    }
-
-    /**
-     * Parsed error message from a compiler is returned here.
-     */
-    public static class ErrorFileAndLine {
-        public String filepath = null;
-        public String line = "1";
-        public String character = "0";
-        public String message = "";
-        public boolean isError = true; // false for a warning.
-
-        @Override
-        public String toString() {
-          return (isError ? "Error" : "Non-error") + " at " + line + ":" + character + " of file " + filepath + ": " + message;
+                connection,
+                "Cannot transform connection in modal reactor. Connection uses currently not"
+                    + " supported features.");
+          } else {
+            var reaction = factory.createReaction();
+            ((Mode) connection.eContainer()).getReactions().add(reaction);
+
+            var sourceRef = connection.getLeftPorts().get(0);
+            var destRef = connection.getRightPorts().get(0);
+            reaction.getTriggers().add(sourceRef);
+            reaction.getEffects().add(destRef);
+
+            var code = factory.createCode();
+            var source =
+                (sourceRef.getContainer() != null ? sourceRef.getContainer().getName() + "." : "")
+                    + sourceRef.getVariable().getName();
+            var dest =
+                (destRef.getContainer() != null ? destRef.getContainer().getName() + "." : "")
+                    + destRef.getVariable().getName();
+            code.setBody(getConflictingConnectionsInModalReactorsBody(source, dest));
+            reaction.setCode(code);
+
+            EcoreUtil.remove(connection);
+          }
         }
+      }
     }
-
-    /**
-     * Given a line of text from the output of a compiler, return
-     * an instance of ErrorFileAndLine if the line is recognized as
-     * the first line of an error message. Otherwise, return null.
-     * This base class simply returns null.
-     * @param line A line of output from a compiler or other external
-     * tool that might generate errors.
-     * @return If the line is recognized as the start of an error message,
-     * then return a class containing the path to the file on which the
-     * error occurred (or null if there is none), the line number (or the
-     * string "1" if there is none), the character position (or the string
-     * "0" if there is none), and the message (or an empty string if there
-     * is none).
-     */
-    protected ErrorFileAndLine parseCommandOutput(String line) {
-        return null;
+  }
+
+  /**
+   * Return target code for forwarding reactions iff the connections have the same destination as
+   * other connections or reaction in mutually exclusive modes.
+   *
+   * <p>This method needs to be overridden in target specific code generators that support modal
+   * reactors.
+   */
+  protected String getConflictingConnectionsInModalReactorsBody(String source, String dest) {
+    errorReporter.reportError(
+        "The currently selected code generation "
+            + "is missing an implementation for conflicting "
+            + "transforming connections in modal reactors.");
+    return "MODAL MODELS NOT SUPPORTED";
+  }
+
+  /** Hook for additional post-processing of the model. */
+  protected void additionalPostProcessingForModes() {
+    // Do nothing
+  }
+
+  /** Parsed error message from a compiler is returned here. */
+  public static class ErrorFileAndLine {
+    public String filepath = null;
+    public String line = "1";
+    public String character = "0";
+    public String message = "";
+    public boolean isError = true; // false for a warning.
+
+    @Override
+    public String toString() {
+      return (isError ? "Error" : "Non-error")
+          + " at "
+          + line
+          + ":"
+          + character
+          + " of file "
+          + filepath
+          + ": "
+          + message;
     }
-
-    /**
-     * Parse the specified string for command errors that can be reported
-     * using marks in the Eclipse IDE. In this class, we attempt to parse
-     * the messages to look for file and line information, thereby generating
-     * marks on the appropriate lines. This should not be called in standalone
-     * mode.
-     *
-     * @param stderr The output on standard error of executing a command.
-     */
-    public void reportCommandErrors(String stderr) {
-        // NOTE: If the VS Code branch passes code review, then this function,
-        //  parseCommandOutput, and ErrorFileAndLine will be deleted soon after.
-        // First, split the message into lines.
-        String[] lines = stderr.split("\\r?\\n");
-        StringBuilder message = new StringBuilder();
-        Integer lineNumber = null;
-        Path path = context.getFileConfig().srcFile;
-        // In case errors occur within an imported file, record the original path.
-        Path originalPath = path;
-
-        int severity = IMarker.SEVERITY_ERROR;
-        for (String line : lines) {
-            ErrorFileAndLine parsed = parseCommandOutput(line);
-            if (parsed != null) {
-                // Found a new line number designator.
-                // If there is a previously accumulated message, report it.
-                if (message.length() > 0) {
-                    if (severity == IMarker.SEVERITY_ERROR)
-                        errorReporter.reportError(path, lineNumber, message.toString());
-                    else
-                        errorReporter.reportWarning(path, lineNumber, message.toString());
-
-                    if (!Objects.equal(originalPath.toFile(), path.toFile())) {
-                        // Report an error also in the top-level resource.
-                        // FIXME: It should be possible to descend through the import
-                        // statements to find which one matches and mark all the
-                        // import statements down the chain. But what a pain!
-                        if (severity == IMarker.SEVERITY_ERROR) {
-                            errorReporter.reportError(originalPath, 1, "Error in imported file: " + path);
-                        } else {
-                            errorReporter.reportWarning(originalPath, 1, "Warning in imported file: " + path);
-                        }
-                     }
-                }
-                if (parsed.isError) {
-                    severity = IMarker.SEVERITY_ERROR;
-                } else {
-                    severity = IMarker.SEVERITY_WARNING;
-                }
-
-                // Start accumulating a new message.
-                message = new StringBuilder();
-                // Append the message on the line number designator line.
-                message.append(parsed.message);
-
-                // Set the new line number.
-                try {
-                    lineNumber = Integer.decode(parsed.line);
-                } catch (Exception ex) {
-                    // Set the line number unknown.
-                    lineNumber = null;
-                }
-                // FIXME: Ignoring the position within the line.
-                // Determine the path within which the error occurred.
-                path = Paths.get(parsed.filepath);
-            } else {
-                // No line designator.
-                if (message.length() > 0) {
-                    message.append("\n");
-                } else {
-                    if (!line.toLowerCase().contains("error:")) {
-                        severity = IMarker.SEVERITY_WARNING;
-                    }
-                }
-                message.append(line);
-            }
-        }
+  }
+
+  /**
+   * Given a line of text from the output of a compiler, return an instance of ErrorFileAndLine if
+   * the line is recognized as the first line of an error message. Otherwise, return null. This base
+   * class simply returns null.
+   *
+   * @param line A line of output from a compiler or other external tool that might generate errors.
+   * @return If the line is recognized as the start of an error message, then return a class
+   *     containing the path to the file on which the error occurred (or null if there is none), the
+   *     line number (or the string "1" if there is none), the character position (or the string "0"
+   *     if there is none), and the message (or an empty string if there is none).
+   */
+  protected ErrorFileAndLine parseCommandOutput(String line) {
+    return null;
+  }
+
+  /**
+   * Parse the specified string for command errors that can be reported using marks in the Eclipse
+   * IDE. In this class, we attempt to parse the messages to look for file and line information,
+   * thereby generating marks on the appropriate lines. This should not be called in standalone
+   * mode.
+   *
+   * @param stderr The output on standard error of executing a command.
+   */
+  public void reportCommandErrors(String stderr) {
+    // NOTE: If the VS Code branch passes code review, then this function,
+    //  parseCommandOutput, and ErrorFileAndLine will be deleted soon after.
+    // First, split the message into lines.
+    String[] lines = stderr.split("\\r?\\n");
+    StringBuilder message = new StringBuilder();
+    Integer lineNumber = null;
+    Path path = context.getFileConfig().srcFile;
+    // In case errors occur within an imported file, record the original path.
+    Path originalPath = path;
+
+    int severity = IMarker.SEVERITY_ERROR;
+    for (String line : lines) {
+      ErrorFileAndLine parsed = parseCommandOutput(line);
+      if (parsed != null) {
+        // Found a new line number designator.
+        // If there is a previously accumulated message, report it.
         if (message.length() > 0) {
+          if (severity == IMarker.SEVERITY_ERROR)
+            errorReporter.reportError(path, lineNumber, message.toString());
+          else errorReporter.reportWarning(path, lineNumber, message.toString());
+
+          if (!Objects.equal(originalPath.toFile(), path.toFile())) {
+            // Report an error also in the top-level resource.
+            // FIXME: It should be possible to descend through the import
+            // statements to find which one matches and mark all the
+            // import statements down the chain. But what a pain!
             if (severity == IMarker.SEVERITY_ERROR) {
-                errorReporter.reportError(path, lineNumber, message.toString());
+              errorReporter.reportError(originalPath, 1, "Error in imported file: " + path);
             } else {
-                errorReporter.reportWarning(path, lineNumber, message.toString());
+              errorReporter.reportWarning(originalPath, 1, "Warning in imported file: " + path);
             }
+          }
+        }
+        if (parsed.isError) {
+          severity = IMarker.SEVERITY_ERROR;
+        } else {
+          severity = IMarker.SEVERITY_WARNING;
+        }
 
-            if (originalPath.toFile() != path.toFile()) {
-                // Report an error also in the top-level resource.
-                // FIXME: It should be possible to descend through the import
-                // statements to find which one matches and mark all the
-                // import statements down the chain. But what a pain!
-                if (severity == IMarker.SEVERITY_ERROR) {
-                    errorReporter.reportError(originalPath, 1, "Error in imported file: " + path);
-                } else {
-                    errorReporter.reportWarning(originalPath, 1, "Warning in imported file: " + path);
-                }
-            }
+        // Start accumulating a new message.
+        message = new StringBuilder();
+        // Append the message on the line number designator line.
+        message.append(parsed.message);
+
+        // Set the new line number.
+        try {
+          lineNumber = Integer.decode(parsed.line);
+        } catch (Exception ex) {
+          // Set the line number unknown.
+          lineNumber = null;
+        }
+        // FIXME: Ignoring the position within the line.
+        // Determine the path within which the error occurred.
+        path = Paths.get(parsed.filepath);
+      } else {
+        // No line designator.
+        if (message.length() > 0) {
+          message.append("\n");
+        } else {
+          if (!line.toLowerCase().contains("error:")) {
+            severity = IMarker.SEVERITY_WARNING;
+          }
         }
+        message.append(line);
+      }
     }
-
-    // //////////////////////////////////////////////////
-    // // Private functions
-
-    /**
-     * Print to stdout information about what source file is being generated,
-     * what mode the generator is in, and where the generated sources are to be put.
-     */
-    public void printInfo(LFGeneratorContext.Mode mode) {
-        System.out.println("Generating code for: " + context.getFileConfig().resource.getURI().toString());
-        System.out.println("******** mode: " + mode);
-        System.out.println("******** generated sources: " + context.getFileConfig().getSrcGenPath());
+    if (message.length() > 0) {
+      if (severity == IMarker.SEVERITY_ERROR) {
+        errorReporter.reportError(path, lineNumber, message.toString());
+      } else {
+        errorReporter.reportWarning(path, lineNumber, message.toString());
+      }
+
+      if (originalPath.toFile() != path.toFile()) {
+        // Report an error also in the top-level resource.
+        // FIXME: It should be possible to descend through the import
+        // statements to find which one matches and mark all the
+        // import statements down the chain. But what a pain!
+        if (severity == IMarker.SEVERITY_ERROR) {
+          errorReporter.reportError(originalPath, 1, "Error in imported file: " + path);
+        } else {
+          errorReporter.reportWarning(originalPath, 1, "Warning in imported file: " + path);
+        }
+      }
     }
-
-    /**
-     * Get the buffer type used for network messages
-     */
-    public String getNetworkBufferType() { return ""; }
-
-    /**
-     * Return the Targets enum for the current target
-     */
-    public abstract Target getTarget();
+  }
+
+  // //////////////////////////////////////////////////
+  // // Private functions
+
+  /**
+   * Print to stdout information about what source file is being generated, what mode the generator
+   * is in, and where the generated sources are to be put.
+   */
+  public void printInfo(LFGeneratorContext.Mode mode) {
+    System.out.println(
+        "Generating code for: " + context.getFileConfig().resource.getURI().toString());
+    System.out.println("******** mode: " + mode);
+    System.out.println("******** generated sources: " + context.getFileConfig().getSrcGenPath());
+  }
+
+  /** Get the buffer type used for network messages */
+  public String getNetworkBufferType() {
+    return "";
+  }
+
+  /** Return the Targets enum for the current target */
+  public abstract Target getTarget();
 }
diff --git a/org.lflang/src/org/lflang/generator/GeneratorCommandFactory.java b/org.lflang/src/org/lflang/generator/GeneratorCommandFactory.java
index 081f07320b..b1dc44e094 100644
--- a/org.lflang/src/org/lflang/generator/GeneratorCommandFactory.java
+++ b/org.lflang/src/org/lflang/generator/GeneratorCommandFactory.java
@@ -1,26 +1,26 @@
 /*************
- Copyright (c) 2019-2021 TU Dresden
- Copyright (c) 2019-2021 UC Berkeley
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) 2019-2021 TU Dresden
+ * Copyright (c) 2019-2021 UC Berkeley
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
 
 package org.lflang.generator;
@@ -29,120 +29,128 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Objects;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.util.LFCommand;
 
 /**
  * A factory class responsible for creating commands for use by the LF code generators.
- * <p>
- * In addition to the basic functionality of LFCommand, this class additionally ensures that error messages (or
- * optionally warnings) are shown when a command is not found and that certain environment variables are set (see
- * {@link #createCommand(String, List, Path, boolean) createCommand}).
+ *
+ * <p>In addition to the basic functionality of LFCommand, this class additionally ensures that
+ * error messages (or optionally warnings) are shown when a command is not found and that certain
+ * environment variables are set (see {@link #createCommand(String, List, Path, boolean)
+ * createCommand}).
  */
 public class GeneratorCommandFactory {
 
-    protected final ErrorReporter errorReporter;
-    protected final FileConfig fileConfig;
-    protected boolean quiet = false;
-
-    public GeneratorCommandFactory(ErrorReporter errorReporter, FileConfig fileConfig) {
-        this.errorReporter = Objects.requireNonNull(errorReporter);
-        this.fileConfig = Objects.requireNonNull(fileConfig);
-    }
-
-    /// enable quiet mode (command output is not printed)
-    public void setQuiet() { quiet = true; }
-
-    /// enable verbose mode (command output is printed)
-    public void setVerbose() { quiet = false; }
-
-    /**
-     * Create a LFCommand instance from a given command and an argument list.
-     * <p>
-     * The command will be executed in the CWD and if the command cannot be found an error message is shown.
-     *
-     * @param cmd  the command to look up
-     * @param args a list of arguments
-     * @return an LFCommand object or null if the command could not be found
-     * @see #createCommand(String, List, Path, boolean)
-     */
-    public LFCommand createCommand(String cmd, List<String> args) {
-        return createCommand(cmd, args, null, true);
+  protected final ErrorReporter errorReporter;
+  protected final FileConfig fileConfig;
+  protected boolean quiet = false;
+
+  public GeneratorCommandFactory(ErrorReporter errorReporter, FileConfig fileConfig) {
+    this.errorReporter = Objects.requireNonNull(errorReporter);
+    this.fileConfig = Objects.requireNonNull(fileConfig);
+  }
+
+  /// enable quiet mode (command output is not printed)
+  public void setQuiet() {
+    quiet = true;
+  }
+
+  /// enable verbose mode (command output is printed)
+  public void setVerbose() {
+    quiet = false;
+  }
+
+  /**
+   * Create a LFCommand instance from a given command and an argument list.
+   *
+   * <p>The command will be executed in the CWD and if the command cannot be found an error message
+   * is shown.
+   *
+   * @param cmd the command to look up
+   * @param args a list of arguments
+   * @return an LFCommand object or null if the command could not be found
+   * @see #createCommand(String, List, Path, boolean)
+   */
+  public LFCommand createCommand(String cmd, List<String> args) {
+    return createCommand(cmd, args, null, true);
+  }
+
+  /**
+   * Create a LFCommand instance from a given command, an argument list and a directory.
+   *
+   * @param cmd the command to look up
+   * @param args a list of arguments
+   * @param failOnError If true, an error is shown if the command cannot be found. Otherwise, only a
+   *     warning is displayed.
+   * @return an LFCommand object or null if the command could not be found
+   * @see #createCommand(String, List, Path, boolean)
+   */
+  public LFCommand createCommand(String cmd, List<String> args, boolean failOnError) {
+    return createCommand(cmd, args, null, failOnError);
+  }
+
+  /**
+   * Create a LFCommand instance from a given command, an argument list and a directory.
+   *
+   * <p>The command will be executed in the CWD and if the command cannot be found an error message
+   * is shown.
+   *
+   * @param cmd the command to look up
+   * @param args a list of arguments
+   * @param dir the directory to execute the command in. If null, this will default to the CWD
+   * @return an LFCommand object or null if the command could not be found
+   * @see #createCommand(String, List, Path, boolean)
+   */
+  public LFCommand createCommand(String cmd, List<String> args, Path dir) {
+    return createCommand(cmd, args, dir, true);
+  }
+
+  /**
+   * Create a LFCommand instance from a given command, an argument list and a directory.
+   *
+   * <p>This will check first if the command can actually be found and executed. If the command is
+   * not found, null is returned. In addition, an error message will be shown if failOnError is
+   * true. Otherwise, a warning will be displayed.
+   *
+   * @param cmd the command to look up
+   * @param args a list of arguments
+   * @param dir the directory to execute the command in. If null, this will default to the CWD
+   * @param failOnError If true, an error is shown if the command cannot be found. Otherwise, only a
+   *     warning is displayed.
+   * @return an LFCommand object or null if the command could not be found
+   * @see LFCommand#get(String, List, boolean, Path)
+   */
+  public LFCommand createCommand(String cmd, List<String> args, Path dir, boolean failOnError) {
+    assert cmd != null && args != null;
+    if (dir == null) {
+      dir = Paths.get("");
     }
-
-
-    /**
-     * Create a LFCommand instance from a given command, an argument list and a directory.
-     *
-     * @param cmd         the command to look up
-     * @param args        a list of arguments
-     * @param failOnError If true, an error is shown if the command cannot be found. Otherwise, only a warning is
-     *                    displayed.
-     * @return an LFCommand object or null if the command could not be found
-     * @see #createCommand(String, List, Path, boolean)
-     */
-    public LFCommand createCommand(String cmd, List<String> args, boolean failOnError) {
-        return createCommand(cmd, args, null, failOnError);
+    LFCommand command = LFCommand.get(cmd, args, quiet, dir);
+    if (command != null) {
+      command.setEnvironmentVariable("LF_CURRENT_WORKING_DIRECTORY", dir.toString());
+      command.setEnvironmentVariable("LF_SOURCE_DIRECTORY", fileConfig.srcPath.toString());
+      command.setEnvironmentVariable("LF_PACKAGE_DIRECTORY", fileConfig.srcPkgPath.toString());
+      command.setEnvironmentVariable(
+          "LF_SOURCE_GEN_DIRECTORY", fileConfig.getSrcGenPath().toString());
+      command.setEnvironmentVariable("LF_BIN_DIRECTORY", fileConfig.binPath.toString());
+    } else {
+      final String message =
+          "The command "
+              + cmd
+              + " could not be found in the current working directory or in your PATH. "
+              + "Make sure that your PATH variable includes the directory where "
+              + cmd
+              + " is installed. "
+              + "You can set PATH in ~/.bash_profile on Linux or Mac.";
+      if (failOnError) {
+        errorReporter.reportError(message);
+      } else {
+        errorReporter.reportWarning(message);
+      }
     }
 
-
-    /**
-     * Create a LFCommand instance from a given command, an argument list and a directory.
-     * <p>
-     * The command will be executed in the CWD and if the command cannot be found an error message is shown.
-     *
-     * @param cmd  the command to look up
-     * @param args a list of arguments
-     * @param dir  the directory to execute the command in. If null, this will default to the CWD
-     * @return an LFCommand object or null if the command could not be found
-     * @see #createCommand(String, List, Path, boolean)
-     */
-    public LFCommand createCommand(String cmd, List<String> args, Path dir) {
-        return createCommand(cmd, args, dir, true);
-    }
-
-
-    /**
-     * Create a LFCommand instance from a given command, an argument list and a directory.
-     * <p>
-     * This will check first if the command can actually be found and executed. If the command is not found, null is
-     * returned. In addition, an error message will be shown if failOnError is true. Otherwise, a warning will be
-     * displayed.
-     *
-     * @param cmd         the command to look up
-     * @param args        a list of arguments
-     * @param dir         the directory to execute the command in. If null, this will default to the CWD
-     * @param failOnError If true, an error is shown if the command cannot be found. Otherwise, only a warning is
-     *                    displayed.
-     * @return an LFCommand object or null if the command could not be found
-     * @see LFCommand#get(String, List, boolean, Path)
-     */
-    public LFCommand createCommand(String cmd, List<String> args, Path dir, boolean failOnError) {
-        assert cmd != null && args != null;
-        if (dir == null) {
-            dir = Paths.get("");
-        }
-        LFCommand command = LFCommand.get(cmd, args, quiet, dir);
-        if (command != null) {
-            command.setEnvironmentVariable("LF_CURRENT_WORKING_DIRECTORY", dir.toString());
-            command.setEnvironmentVariable("LF_SOURCE_DIRECTORY", fileConfig.srcPath.toString());
-            command.setEnvironmentVariable("LF_PACKAGE_DIRECTORY", fileConfig.srcPkgPath.toString());
-            command.setEnvironmentVariable("LF_SOURCE_GEN_DIRECTORY", fileConfig.getSrcGenPath().toString());
-            command.setEnvironmentVariable("LF_BIN_DIRECTORY", fileConfig.binPath.toString());
-        } else {
-            final String message =
-                "The command " + cmd + " could not be found in the current working directory or in your PATH. " +
-                    "Make sure that your PATH variable includes the directory where " + cmd + " is installed. " +
-                    "You can set PATH in ~/.bash_profile on Linux or Mac.";
-            if (failOnError) {
-                errorReporter.reportError(message);
-            } else {
-                errorReporter.reportWarning(message);
-            }
-        }
-
-        return command;
-    }
+    return command;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/GeneratorResult.java b/org.lflang/src/org/lflang/generator/GeneratorResult.java
index 2b42e17f34..b882510d50 100644
--- a/org.lflang/src/org/lflang/generator/GeneratorResult.java
+++ b/org.lflang/src/org/lflang/generator/GeneratorResult.java
@@ -1,19 +1,9 @@
 package org.lflang.generator;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.function.BiFunction;
-import java.util.function.Function;
-
-import org.eclipse.xtext.generator.GeneratorContext;
-
-import org.lflang.FileConfig;
-import org.lflang.Target;
-import org.lflang.TargetConfig;
-import org.lflang.util.LFCommand;
 
 /**
  * A {@code GeneratorResult} is the outcome of a code generation task.
@@ -21,101 +11,99 @@
  * @author Peter Donovan
  */
 public class GeneratorResult {
-    public static GeneratorResult NOTHING = incompleteGeneratorResult(Status.NOTHING);
-    public static GeneratorResult CANCELLED = incompleteGeneratorResult(Status.CANCELLED);
-    public static GeneratorResult FAILED = incompleteGeneratorResult(Status.FAILED);
-    public static BiFunction<LFGeneratorContext, Map<Path, CodeMap>, GeneratorResult> GENERATED_NO_EXECUTABLE
-        = (context, codeMaps) -> new GeneratorResult(Status.GENERATED, context, codeMaps);
-
-    /**
-     * A {@code Status} is a level of completion of a code generation task.
-     */
-    public enum Status {
-        NOTHING(result -> ""),  // Code generation was not performed.
-        CANCELLED(result -> "Code generation was cancelled."),
-        FAILED(result -> ""),  // This may be due to a failed validation check, in which case the error should have been
-        // sent to the error reporter and handled there. This makes a message unnecessary.
-        GENERATED(GetUserMessage.COMPLETED),
-        COMPILED(GetUserMessage.COMPLETED);
-
-        /**
-         * A {@code GetUserMessage} is a function that translates a
-         * {@code GeneratorResult} into a human-readable report for the end user.
-         */
-        public interface GetUserMessage {
-            GetUserMessage COMPLETED = result -> {
-                return String.format(
-                    "Code generation complete. The executable is at \"%s\".",
-                    result.getContext().getFileConfig().getExecutable()
-                );
-            };
-            String apply(GeneratorResult result);
-        }
-
-        /** The {@code GetUserMessage} associated with this {@code Status}. */
-        private final GetUserMessage gum;
-
-        /** Initializes a {@code Status} whose {@code GetUserMessage} is {@code gum}. */
-        Status(GetUserMessage gum) {
-            this.gum = gum;
-        }
-    }
-
-    private final Status status;
-
-    private final LFGeneratorContext context;
-
-    private final Map<Path, CodeMap> codeMaps;
+  public static GeneratorResult NOTHING = incompleteGeneratorResult(Status.NOTHING);
+  public static GeneratorResult CANCELLED = incompleteGeneratorResult(Status.CANCELLED);
+  public static GeneratorResult FAILED = incompleteGeneratorResult(Status.FAILED);
+  public static BiFunction<LFGeneratorContext, Map<Path, CodeMap>, GeneratorResult>
+      GENERATED_NO_EXECUTABLE =
+          (context, codeMaps) -> new GeneratorResult(Status.GENERATED, context, codeMaps);
+
+  /** A {@code Status} is a level of completion of a code generation task. */
+  public enum Status {
+    NOTHING(result -> ""), // Code generation was not performed.
+    CANCELLED(result -> "Code generation was cancelled."),
+    FAILED(
+        result ->
+            ""), // This may be due to a failed validation check, in which case the error should
+    // have been
+    // sent to the error reporter and handled there. This makes a message unnecessary.
+    GENERATED(GetUserMessage.COMPLETED),
+    COMPILED(GetUserMessage.COMPLETED);
 
     /**
-     * Initialize a GeneratorResult.
-     * @param status The level of completion of a code generation task.
-     * @param context The context within which the result was produced.
-     * @param codeMaps A mapping from generated files to their CodeMaps.
+     * A {@code GetUserMessage} is a function that translates a {@code GeneratorResult} into a
+     * human-readable report for the end user.
      */
-    public GeneratorResult(Status status, LFGeneratorContext context, Map<Path, CodeMap> codeMaps) {
-        this.status = status != null ? status : Status.NOTHING;
-        this.context = context;
-        this.codeMaps = codeMaps != null ? codeMaps : Collections.emptyMap();
+    public interface GetUserMessage {
+      GetUserMessage COMPLETED =
+          result -> {
+            return String.format(
+                "Code generation complete. The executable is at \"%s\".",
+                result.getContext().getFileConfig().getExecutable());
+          };
+
+      String apply(GeneratorResult result);
     }
 
-    /**
-     * Return the result of an incomplete generation task that terminated
-     * with status {@code status}.
-     * @return the result of an incomplete generation task that terminated
-     * with status {@code status}
-     */
-    private static GeneratorResult incompleteGeneratorResult(Status status) {
-        return new GeneratorResult(status, null, Collections.emptyMap());
-    }
+    /** The {@code GetUserMessage} associated with this {@code Status}. */
+    private final GetUserMessage gum;
 
-    /** Return the status of {@code this}. */
-    public Status getStatus() {
-        return status;
+    /** Initializes a {@code Status} whose {@code GetUserMessage} is {@code gum}. */
+    Status(GetUserMessage gum) {
+      this.gum = gum;
     }
-
-    /**
-     * Return a message that can be relayed to the end user about this
-     * {@code GeneratorResult}.
-     */
-    public String getUserMessage() {
-        return status.gum.apply(this);
-    }
-
-    /**
-     * Return a map from generated sources to their code maps. The
-     * completeness of this resulting map is given on a best-effort
-     * basis, but those mappings that it does contain are guaranteed
-     * to be correct.
-     * @return An unmodifiable map from generated sources to their
-     * code maps.
-     */
-    public Map<Path, CodeMap> getCodeMaps() {
-        return Collections.unmodifiableMap(codeMaps);
-    }
-
-    public LFGeneratorContext getContext() {
-        return context;
-    }
-
+  }
+
+  private final Status status;
+
+  private final LFGeneratorContext context;
+
+  private final Map<Path, CodeMap> codeMaps;
+
+  /**
+   * Initialize a GeneratorResult.
+   *
+   * @param status The level of completion of a code generation task.
+   * @param context The context within which the result was produced.
+   * @param codeMaps A mapping from generated files to their CodeMaps.
+   */
+  public GeneratorResult(Status status, LFGeneratorContext context, Map<Path, CodeMap> codeMaps) {
+    this.status = status != null ? status : Status.NOTHING;
+    this.context = context;
+    this.codeMaps = codeMaps != null ? codeMaps : Collections.emptyMap();
+  }
+
+  /**
+   * Return the result of an incomplete generation task that terminated with status {@code status}.
+   *
+   * @return the result of an incomplete generation task that terminated with status {@code status}
+   */
+  private static GeneratorResult incompleteGeneratorResult(Status status) {
+    return new GeneratorResult(status, null, Collections.emptyMap());
+  }
+
+  /** Return the status of {@code this}. */
+  public Status getStatus() {
+    return status;
+  }
+
+  /** Return a message that can be relayed to the end user about this {@code GeneratorResult}. */
+  public String getUserMessage() {
+    return status.gum.apply(this);
+  }
+
+  /**
+   * Return a map from generated sources to their code maps. The completeness of this resulting map
+   * is given on a best-effort basis, but those mappings that it does contain are guaranteed to be
+   * correct.
+   *
+   * @return An unmodifiable map from generated sources to their code maps.
+   */
+  public Map<Path, CodeMap> getCodeMaps() {
+    return Collections.unmodifiableMap(codeMaps);
+  }
+
+  public LFGeneratorContext getContext() {
+    return context;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/GeneratorUtils.java b/org.lflang/src/org/lflang/generator/GeneratorUtils.java
index b4563a6165..04ae33ba0c 100644
--- a/org.lflang/src/org/lflang/generator/GeneratorUtils.java
+++ b/org.lflang/src/org/lflang/generator/GeneratorUtils.java
@@ -4,19 +4,17 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.LFGeneratorContext.Mode;
 import org.lflang.lf.Action;
 import org.lflang.lf.ActionOrigin;
@@ -27,177 +25,162 @@
 import org.lflang.lf.TargetDecl;
 
 /**
- * A helper class with functions that may be useful for code
- * generators.
- * This is created to ease our transition from Xtend and
- * possibly Eclipse. All functions in this class should
- * instead be in GeneratorUtils.kt, but Eclipse cannot
- * handle Kotlin files.
+ * A helper class with functions that may be useful for code generators. This is created to ease our
+ * transition from Xtend and possibly Eclipse. All functions in this class should instead be in
+ * GeneratorUtils.kt, but Eclipse cannot handle Kotlin files.
  */
 public class GeneratorUtils {
 
-    private GeneratorUtils() {
-        // utility class
-    }
+  private GeneratorUtils() {
+    // utility class
+  }
 
-    /**
-     * Return the target declaration found in the given resource.
-     */
-    public static TargetDecl findTargetDecl(Resource resource) {
-        return findAll(resource, TargetDecl.class).iterator().next();
-    }
+  /** Return the target declaration found in the given resource. */
+  public static TargetDecl findTargetDecl(Resource resource) {
+    return findAll(resource, TargetDecl.class).iterator().next();
+  }
 
-    /**
-     * Look for physical actions in 'resource'.
-     * If appropriate, set keepalive to true in
-     * {@code targetConfig}.
-     * This is a helper function for setTargetConfig. It
-     * should not be used elsewhere.
-     */
-    public static void accommodatePhysicalActionsIfPresent(
-        List<Resource> resources,
-        boolean setsKeepAliveOptionAutomatically,
-        TargetConfig targetConfig,
-        ErrorReporter errorReporter
-    ) {
-        if (!setsKeepAliveOptionAutomatically) {
-            return;
-        }
-        for (Resource resource : resources) {
-            for (Action action : findAll(resource, Action.class)) {
-                if (action.getOrigin() == ActionOrigin.PHYSICAL &&
-                    // Check if the user has explicitly set keepalive to false
-                    !targetConfig.setByUser.contains(TargetProperty.KEEPALIVE) &&
-                    !targetConfig.keepalive
-                ) {
-                    // If not, set it to true
-                    targetConfig.keepalive = true;
-                    errorReporter.reportWarning(
-                        action,
-                        String.format(
-                            "Setting %s to true because of the physical action %s.",
-                            TargetProperty.KEEPALIVE.getDisplayName(),
-                            action.getName()
-                        )
-                    );
-                    return;
-                }
-            }
+  /**
+   * Look for physical actions in 'resource'. If appropriate, set keepalive to true in {@code
+   * targetConfig}. This is a helper function for setTargetConfig. It should not be used elsewhere.
+   */
+  public static void accommodatePhysicalActionsIfPresent(
+      List<Resource> resources,
+      boolean setsKeepAliveOptionAutomatically,
+      TargetConfig targetConfig,
+      ErrorReporter errorReporter) {
+    if (!setsKeepAliveOptionAutomatically) {
+      return;
+    }
+    for (Resource resource : resources) {
+      for (Action action : findAll(resource, Action.class)) {
+        if (action.getOrigin() == ActionOrigin.PHYSICAL
+            &&
+            // Check if the user has explicitly set keepalive to false
+            !targetConfig.setByUser.contains(TargetProperty.KEEPALIVE)
+            && !targetConfig.keepalive) {
+          // If not, set it to true
+          targetConfig.keepalive = true;
+          errorReporter.reportWarning(
+              action,
+              String.format(
+                  "Setting %s to true because of the physical action %s.",
+                  TargetProperty.KEEPALIVE.getDisplayName(), action.getName()));
+          return;
         }
+      }
     }
+  }
 
-    /**
-     * Return all instances of {@code eObjectType} in
-     * {@code resource}.
-     * @param resource A resource to be searched.
-     * @param nodeType The type of the desired parse tree
-     *                    nodes.
-     * @param <T> The type of the desired parse tree nodes.
-     * @return all instances of {@code eObjectType} in
-     * {@code resource}
-     */
-    public static <T> Iterable<T> findAll(Resource resource, Class<T> nodeType) {
-        return () -> IteratorExtensions.filter(resource.getAllContents(), nodeType);
-    }
+  /**
+   * Return all instances of {@code eObjectType} in {@code resource}.
+   *
+   * @param resource A resource to be searched.
+   * @param nodeType The type of the desired parse tree nodes.
+   * @param <T> The type of the desired parse tree nodes.
+   * @return all instances of {@code eObjectType} in {@code resource}
+   */
+  public static <T> Iterable<T> findAll(Resource resource, Class<T> nodeType) {
+    return () -> IteratorExtensions.filter(resource.getAllContents(), nodeType);
+  }
 
-    /**
-     * Return the resources that provide the given
-     * reactors.
-     * @param reactors The reactors for which to find
-     *                 containing resources.
-     * @return the resources that provide the given
-     * reactors.
-     */
-    public static List<Resource> getResources(Iterable<Reactor> reactors) {
-        HashSet<Resource> visited = new HashSet<>();
-        List<Resource> resources = new ArrayList<>();
-        for (Reactor r : reactors) {
-            Resource resource = r.eResource();
-            if (!visited.contains(resource)) {
-                visited.add(resource);
-                resources.add(resource);
-            }
-        }
-        return resources;
+  /**
+   * Return the resources that provide the given reactors.
+   *
+   * @param reactors The reactors for which to find containing resources.
+   * @return the resources that provide the given reactors.
+   */
+  public static List<Resource> getResources(Iterable<Reactor> reactors) {
+    HashSet<Resource> visited = new HashSet<>();
+    List<Resource> resources = new ArrayList<>();
+    for (Reactor r : reactors) {
+      Resource resource = r.eResource();
+      if (!visited.contains(resource)) {
+        visited.add(resource);
+        resources.add(resource);
+      }
     }
+    return resources;
+  }
 
-    /**
-     * Return the {@code LFResource} representation of the
-     * given resource.
-     * @param resource The {@code Resource} to be
-     *                 represented as an {@code LFResource}
-     * @param srcGenBasePath The root directory for any
-     * generated sources associated with the resource.
-     * @param context The generator invocation context.
-     * @param errorReporter An error message acceptor.
-     * @return the {@code LFResource} representation of the
-     * given resource.
-     */
-    public static LFResource getLFResource(
-        Resource resource,
-        Path srcGenBasePath,
-        LFGeneratorContext context,
-        ErrorReporter errorReporter
-    ) {
-        var target = ASTUtils.targetDecl(resource);
-        KeyValuePairs config = target.getConfig();
-        var targetConfig = new TargetConfig(target);
-        if (config != null) {
-            List<KeyValuePair> pairs = config.getPairs();
-            TargetProperty.set(targetConfig, pairs != null ? pairs : List.of(), errorReporter);
-        }
-        FileConfig fc = LFGenerator.createFileConfig(resource, srcGenBasePath, context.getFileConfig().useHierarchicalBin);
-        return new LFResource(resource, fc, targetConfig);
+  /**
+   * Return the {@code LFResource} representation of the given resource.
+   *
+   * @param resource The {@code Resource} to be represented as an {@code LFResource}
+   * @param srcGenBasePath The root directory for any generated sources associated with the
+   *     resource.
+   * @param context The generator invocation context.
+   * @param errorReporter An error message acceptor.
+   * @return the {@code LFResource} representation of the given resource.
+   */
+  public static LFResource getLFResource(
+      Resource resource,
+      Path srcGenBasePath,
+      LFGeneratorContext context,
+      ErrorReporter errorReporter) {
+    var target = ASTUtils.targetDecl(resource);
+    KeyValuePairs config = target.getConfig();
+    var targetConfig = new TargetConfig(target);
+    if (config != null) {
+      List<KeyValuePair> pairs = config.getPairs();
+      TargetProperty.set(targetConfig, pairs != null ? pairs : List.of(), errorReporter);
     }
+    FileConfig fc =
+        LFGenerator.createFileConfig(
+            resource, srcGenBasePath, context.getFileConfig().useHierarchicalBin);
+    return new LFResource(resource, fc, targetConfig);
+  }
 
-    /**
-     * If the mode is Mode.EPOCH (the code generator is running in an
-     * Eclipse IDE), then refresh the project. This will ensure that
-     * any generated files become visible in the project.
-     * @param resource The resource.
-     * @param compilerMode An indicator of whether Epoch is running.
-     */
-    public static void refreshProject(Resource resource, Mode compilerMode) {
-        if (compilerMode == LFGeneratorContext.Mode.EPOCH) {
-            URI uri = resource.getURI();
-            if (uri.isPlatformResource()) { // This condition should normally be met when running Epoch
-                IResource member = ResourcesPlugin.getWorkspace().getRoot().findMember(uri.toPlatformString(true));
-                try {
-                    member.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
-                } catch (CoreException e) {
-                    System.err.println("Unable to refresh workspace: " + e);
-                }
-            }
+  /**
+   * If the mode is Mode.EPOCH (the code generator is running in an Eclipse IDE), then refresh the
+   * project. This will ensure that any generated files become visible in the project.
+   *
+   * @param resource The resource.
+   * @param compilerMode An indicator of whether Epoch is running.
+   */
+  public static void refreshProject(Resource resource, Mode compilerMode) {
+    if (compilerMode == LFGeneratorContext.Mode.EPOCH) {
+      URI uri = resource.getURI();
+      if (uri.isPlatformResource()) { // This condition should normally be met when running Epoch
+        IResource member =
+            ResourcesPlugin.getWorkspace().getRoot().findMember(uri.toPlatformString(true));
+        try {
+          member.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
+        } catch (CoreException e) {
+          System.err.println("Unable to refresh workspace: " + e);
         }
+      }
     }
+  }
 
-    /** Return whether the operating system is Windows. */
-    public static boolean isHostWindows() {
-        return System.getProperty("os.name").toLowerCase().contains("win");
-    }
+  /** Return whether the operating system is Windows. */
+  public static boolean isHostWindows() {
+    return System.getProperty("os.name").toLowerCase().contains("win");
+  }
 
-    /**
-     * Check whether code can be generated; report any problems
-     * and inform the context accordingly.
-     * @return Whether it is possible to generate code.
-     */
-    public static boolean canGenerate(
-        Boolean errorsOccurred,
-        Instantiation mainDef,
-        ErrorReporter errorReporter,
-        LFGeneratorContext context
-    ) {
-        // stop if there are any errors found in the program by doGenerate() in GeneratorBase
-        if (errorsOccurred) {
-            context.finish(GeneratorResult.FAILED);
-            return false;
-        }
-        // abort if there is no main reactor
-        if (mainDef == null) {
-            errorReporter.reportInfo("INFO: The given Lingua Franca program does not define a main reactor. Therefore, no code was generated.");
-            context.finish(GeneratorResult.NOTHING);
-            return false;
-        }
-        return true;
+  /**
+   * Check whether code can be generated; report any problems and inform the context accordingly.
+   *
+   * @return Whether it is possible to generate code.
+   */
+  public static boolean canGenerate(
+      Boolean errorsOccurred,
+      Instantiation mainDef,
+      ErrorReporter errorReporter,
+      LFGeneratorContext context) {
+    // stop if there are any errors found in the program by doGenerate() in GeneratorBase
+    if (errorsOccurred) {
+      context.finish(GeneratorResult.FAILED);
+      return false;
+    }
+    // abort if there is no main reactor
+    if (mainDef == null) {
+      errorReporter.reportInfo(
+          "INFO: The given Lingua Franca program does not define a main reactor. Therefore, no code"
+              + " was generated.");
+      context.finish(GeneratorResult.NOTHING);
+      return false;
     }
+    return true;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/HumanReadableReportingStrategy.java b/org.lflang/src/org/lflang/generator/HumanReadableReportingStrategy.java
index f6ecd0a991..8c1dd1e547 100644
--- a/org.lflang/src/org/lflang/generator/HumanReadableReportingStrategy.java
+++ b/org.lflang/src/org/lflang/generator/HumanReadableReportingStrategy.java
@@ -6,171 +6,163 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure0;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure2;
-
 import org.lflang.ErrorReporter;
 
 /**
- * An error reporting strategy that parses human-readable
- * output.
+ * An error reporting strategy that parses human-readable output.
  *
  * @author Peter Donovan
  */
 public class HumanReadableReportingStrategy implements DiagnosticReporting.Strategy {
 
-    /** A pattern that matches lines that should be reported via this strategy. */
-    private final Pattern diagnosticMessagePattern;
-    /** A pattern that matches labels that show the exact range to which the diagnostic pertains. */
-    private final Pattern labelPattern;
-    /** The path against which any paths should be resolved. */
-    private final Path relativeTo;
-    /** The next line to be processed, or {@code null}. */
-    private String bufferedLine;
+  /** A pattern that matches lines that should be reported via this strategy. */
+  private final Pattern diagnosticMessagePattern;
+  /** A pattern that matches labels that show the exact range to which the diagnostic pertains. */
+  private final Pattern labelPattern;
+  /** The path against which any paths should be resolved. */
+  private final Path relativeTo;
+  /** The next line to be processed, or {@code null}. */
+  private String bufferedLine;
 
-    /**
-     * Instantiate a reporting strategy for lines of
-     * validator output that match {@code diagnosticMessagePattern}.
-     * @param diagnosticMessagePattern A pattern that matches lines that should be
-     *          reported via this strategy. This pattern
-     *          must contain named capturing groups called
-     *          "path", "line", "column", "message", and
-     *          "severity".
-     * @param labelPattern A pattern that matches lines that act as labels, showing
-     *                     the location of the relevant piece of text. This pattern
-     *                     must contain two groups, the first of which must match
-     *                     characters that precede the location given by the "line"
-     *                     and "column" groups.
-     */
-    public HumanReadableReportingStrategy(Pattern diagnosticMessagePattern, Pattern labelPattern) {
-        this(diagnosticMessagePattern, labelPattern, null);
-    }
+  /**
+   * Instantiate a reporting strategy for lines of validator output that match {@code
+   * diagnosticMessagePattern}.
+   *
+   * @param diagnosticMessagePattern A pattern that matches lines that should be reported via this
+   *     strategy. This pattern must contain named capturing groups called "path", "line", "column",
+   *     "message", and "severity".
+   * @param labelPattern A pattern that matches lines that act as labels, showing the location of
+   *     the relevant piece of text. This pattern must contain two groups, the first of which must
+   *     match characters that precede the location given by the "line" and "column" groups.
+   */
+  public HumanReadableReportingStrategy(Pattern diagnosticMessagePattern, Pattern labelPattern) {
+    this(diagnosticMessagePattern, labelPattern, null);
+  }
 
-    /**
-     * Instantiate a reporting strategy for lines of
-     * validator output that match {@code diagnosticMessagePattern}.
-     * @param diagnosticMessagePattern a pattern that matches lines that should be
-     *          reported via this strategy. This pattern
-     *          must contain named capturing groups called
-     *          "path", "line", "column", "message", and
-     *          "severity".
-     * @param labelPattern A pattern that matches lines that act as labels, showing
-     *                     the location of the relevant piece of text. This pattern
-     *                     must contain two groups, the first of which must match
-     *                     characters that precede the location given by the "line"
-     *                     and "column" groups.
-     * @param relativeTo The path against which any paths should be resolved.
-     */
-    public HumanReadableReportingStrategy(Pattern diagnosticMessagePattern, Pattern labelPattern, Path relativeTo) {
-        for (String groupName : new String[]{"path", "line", "column", "message", "severity"}) {
-            assert diagnosticMessagePattern.pattern().contains(groupName) : String.format(
-                "Error line patterns must have a named capturing group called %s", groupName
-            );
-        }
-        this.diagnosticMessagePattern = diagnosticMessagePattern;
-        this.labelPattern = labelPattern;
-        this.relativeTo = relativeTo;
-        this.bufferedLine = null;
+  /**
+   * Instantiate a reporting strategy for lines of validator output that match {@code
+   * diagnosticMessagePattern}.
+   *
+   * @param diagnosticMessagePattern a pattern that matches lines that should be reported via this
+   *     strategy. This pattern must contain named capturing groups called "path", "line", "column",
+   *     "message", and "severity".
+   * @param labelPattern A pattern that matches lines that act as labels, showing the location of
+   *     the relevant piece of text. This pattern must contain two groups, the first of which must
+   *     match characters that precede the location given by the "line" and "column" groups.
+   * @param relativeTo The path against which any paths should be resolved.
+   */
+  public HumanReadableReportingStrategy(
+      Pattern diagnosticMessagePattern, Pattern labelPattern, Path relativeTo) {
+    for (String groupName : new String[] {"path", "line", "column", "message", "severity"}) {
+      assert diagnosticMessagePattern.pattern().contains(groupName)
+          : String.format(
+              "Error line patterns must have a named capturing group called %s", groupName);
     }
+    this.diagnosticMessagePattern = diagnosticMessagePattern;
+    this.labelPattern = labelPattern;
+    this.relativeTo = relativeTo;
+    this.bufferedLine = null;
+  }
 
-    @Override
-    public void report(String validationOutput, ErrorReporter errorReporter, Map<Path, CodeMap> map) {
-        Iterator<String> it = validationOutput.lines().iterator();
-        while (it.hasNext() || bufferedLine != null) {
-            if (bufferedLine != null) {
-                reportErrorLine(bufferedLine, it, errorReporter, map);
-                bufferedLine = null;
-            } else {
-                reportErrorLine(it.next(), it, errorReporter, map);
-            }
-        }
+  @Override
+  public void report(String validationOutput, ErrorReporter errorReporter, Map<Path, CodeMap> map) {
+    Iterator<String> it = validationOutput.lines().iterator();
+    while (it.hasNext() || bufferedLine != null) {
+      if (bufferedLine != null) {
+        reportErrorLine(bufferedLine, it, errorReporter, map);
+        bufferedLine = null;
+      } else {
+        reportErrorLine(it.next(), it, errorReporter, map);
+      }
     }
+  }
 
-    /**
-     * Report the validation message contained in the given line of text.
-     * @param line The current line.
-     * @param it An iterator over the lines that follow the current line.
-     * @param errorReporter An arbitrary ErrorReporter.
-     * @param maps A mapping from generated file paths to
-     *             CodeMaps.
-     */
-    private void reportErrorLine(String line, Iterator<String> it, ErrorReporter errorReporter, Map<Path, CodeMap> maps) {
-        Matcher matcher = diagnosticMessagePattern.matcher(stripEscaped(line));
-        if (matcher.matches()) {
-            final Path path = Paths.get(matcher.group("path"));
-            final Position generatedFilePosition = Position.fromOneBased(
-                Integer.parseInt(matcher.group("line")),
-                Integer.parseInt(matcher.group("column") != null ? matcher.group("column") : "0") // FIXME: Unreliable heuristic
-            );
-            final String message = DiagnosticReporting.messageOf(
-                matcher.group("message"), path, generatedFilePosition
-            );
-            final CodeMap map = maps.get(relativeTo != null ? relativeTo.resolve(path) : path);
-            final DiagnosticSeverity severity = DiagnosticReporting.severityOf(matcher.group("severity"));
-            if (map == null) {
-                errorReporter.report(null, severity, message);
-                return;
-            }
-            for (Path srcFile : map.lfSourcePaths()) {
-                Position lfFilePosition = map.adjusted(srcFile, generatedFilePosition);
-                if (matcher.group("column") != null) {
-                    reportAppropriateRange(
-                        (p0, p1) -> errorReporter.report(srcFile, severity, message, p0, p1), lfFilePosition, it
-                    );
-                } else {
-                    errorReporter.report(srcFile, severity, message, lfFilePosition.getOneBasedLine());
-                }
-            }
+  /**
+   * Report the validation message contained in the given line of text.
+   *
+   * @param line The current line.
+   * @param it An iterator over the lines that follow the current line.
+   * @param errorReporter An arbitrary ErrorReporter.
+   * @param maps A mapping from generated file paths to CodeMaps.
+   */
+  private void reportErrorLine(
+      String line, Iterator<String> it, ErrorReporter errorReporter, Map<Path, CodeMap> maps) {
+    Matcher matcher = diagnosticMessagePattern.matcher(stripEscaped(line));
+    if (matcher.matches()) {
+      final Path path = Paths.get(matcher.group("path"));
+      final Position generatedFilePosition =
+          Position.fromOneBased(
+              Integer.parseInt(matcher.group("line")),
+              Integer.parseInt(
+                  matcher.group("column") != null
+                      ? matcher.group("column")
+                      : "0") // FIXME: Unreliable heuristic
+              );
+      final String message =
+          DiagnosticReporting.messageOf(matcher.group("message"), path, generatedFilePosition);
+      final CodeMap map = maps.get(relativeTo != null ? relativeTo.resolve(path) : path);
+      final DiagnosticSeverity severity = DiagnosticReporting.severityOf(matcher.group("severity"));
+      if (map == null) {
+        errorReporter.report(null, severity, message);
+        return;
+      }
+      for (Path srcFile : map.lfSourcePaths()) {
+        Position lfFilePosition = map.adjusted(srcFile, generatedFilePosition);
+        if (matcher.group("column") != null) {
+          reportAppropriateRange(
+              (p0, p1) -> errorReporter.report(srcFile, severity, message, p0, p1),
+              lfFilePosition,
+              it);
+        } else {
+          errorReporter.report(srcFile, severity, message, lfFilePosition.getOneBasedLine());
         }
+      }
     }
+  }
 
-    /**
-     * Report the appropriate range to {@code report}.
-     * @param report A reporting method whose first and
-     *               second parameters are the (included)
-     *               start and (excluded) end of the
-     *               relevant range.
-     * @param lfFilePosition The point about which the
-     *                       relevant range is anchored.
-     * @param it An iterator over the lines immediately
-     *           following a diagnostic message.
-     */
-    private void reportAppropriateRange(
-        Procedure2<Position, Position> report, Position lfFilePosition, Iterator<String> it
-    ) {
-        Procedure0 failGracefully = () -> report.apply(lfFilePosition, lfFilePosition.plus(" "));
-        if (!it.hasNext()) {
-            failGracefully.apply();
-            return;
-        }
-        String line = it.next();
-        Matcher labelMatcher = labelPattern.matcher(line);
-        if (labelMatcher.find()) {
-            report.apply(
-                Position.fromZeroBased(
-                    lfFilePosition.getZeroBasedLine(),
-                    lfFilePosition.getZeroBasedColumn() - labelMatcher.group(1).length()
-                ),
-                lfFilePosition.plus(labelMatcher.group(2))
-            );
-            return;
-        }
-        if (diagnosticMessagePattern.matcher(line).find()) {
-            failGracefully.apply();
-            bufferedLine = line;
-            return;
-        }
-        reportAppropriateRange(report, lfFilePosition, it);
+  /**
+   * Report the appropriate range to {@code report}.
+   *
+   * @param report A reporting method whose first and second parameters are the (included) start and
+   *     (excluded) end of the relevant range.
+   * @param lfFilePosition The point about which the relevant range is anchored.
+   * @param it An iterator over the lines immediately following a diagnostic message.
+   */
+  private void reportAppropriateRange(
+      Procedure2<Position, Position> report, Position lfFilePosition, Iterator<String> it) {
+    Procedure0 failGracefully = () -> report.apply(lfFilePosition, lfFilePosition.plus(" "));
+    if (!it.hasNext()) {
+      failGracefully.apply();
+      return;
     }
-
-    /**
-     * Strip the ANSI escape sequences from {@code s}.
-     * @param s Any string.
-     * @return {@code s}, with any escape sequences removed.
-     */
-    private static String stripEscaped(String s) {
-        return s.replaceAll("\u001B\\[[;\\d]*[ -/]*[@-~]", "");
+    String line = it.next();
+    Matcher labelMatcher = labelPattern.matcher(line);
+    if (labelMatcher.find()) {
+      report.apply(
+          Position.fromZeroBased(
+              lfFilePosition.getZeroBasedLine(),
+              lfFilePosition.getZeroBasedColumn() - labelMatcher.group(1).length()),
+          lfFilePosition.plus(labelMatcher.group(2)));
+      return;
     }
+    if (diagnosticMessagePattern.matcher(line).find()) {
+      failGracefully.apply();
+      bufferedLine = line;
+      return;
+    }
+    reportAppropriateRange(report, lfFilePosition, it);
+  }
+
+  /**
+   * Strip the ANSI escape sequences from {@code s}.
+   *
+   * @param s Any string.
+   * @return {@code s}, with any escape sequences removed.
+   */
+  private static String stripEscaped(String s) {
+    return s.replaceAll("\u001B\\[[;\\d]*[ -/]*[@-~]", "");
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/IntegratedBuilder.java b/org.lflang/src/org/lflang/generator/IntegratedBuilder.java
index d6a2d3d681..f87c81728d 100644
--- a/org.lflang/src/org/lflang/generator/IntegratedBuilder.java
+++ b/org.lflang/src/org/lflang/generator/IntegratedBuilder.java
@@ -1,9 +1,10 @@
 package org.lflang.generator;
 
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Properties;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -15,142 +16,133 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.eclipse.xtext.validation.Issue;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.generator.LFGeneratorContext.Mode;
 
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-
 /**
- * Manages Lingua Franca build processes that are requested
- * from the language server.
+ * Manages Lingua Franca build processes that are requested from the language server.
  *
  * @author Peter Donovan
  */
 public class IntegratedBuilder {
-    public static final int START_PERCENT_PROGRESS = 0;
-    public static final int VALIDATED_PERCENT_PROGRESS = 33;
-    public static final int GENERATED_PERCENT_PROGRESS = 67;
-    public static final int COMPILED_PERCENT_PROGRESS = 100;
-
-    /**
-     * A {@code ProgressReporter} reports the progress of a build.
-     */
-    public interface ReportProgress {
-        void apply(String message, Integer percentage);
-    }
-
-    // Note: This class is not currently used in response to
-    //  document edits, even though the validator and code
-    //  generator are invoked by Xtext in response to
-    //  document edits.
-    /**
-     * A {@code ReportMethod} is a way of reporting issues.
-     */
-    private interface ReportMethod {
-        void apply(Path file, Integer line, String message);
-    }
-
-    /* ---------------------- INJECTED DEPENDENCIES ---------------------- */
-
-    @Inject
-    private IResourceValidator validator;
-    @Inject
-    private GeneratorDelegate generator;
-    @Inject
-    private JavaIoFileSystemAccess fileAccess;
-    @Inject
-    private Provider<ResourceSet> resourceSetProvider;
-
-    /* ------------------------- PUBLIC METHODS -------------------------- */
-
-    /**
-     * Generates code from the Lingua Franca file {@code f}.
-     * @param uri The URI of a Lingua Franca file.
-     * @param mustComplete Whether the build must be taken to completion.
-     * @return The result of the build.
-     */
-    public GeneratorResult run(
-        URI uri,
-        boolean mustComplete,
-        ReportProgress reportProgress,
-        CancelIndicator cancelIndicator
-    ) {
-        fileAccess.setOutputPath(
-            FileConfig.findPackageRoot(Path.of(uri.path()), s -> {}).resolve(FileConfig.DEFAULT_SRC_GEN_DIR).toString()
-        );
-        List<EObject> parseRoots = getResource(uri).getContents();
-        if (parseRoots.isEmpty()) return GeneratorResult.NOTHING;
-        ErrorReporter errorReporter = new LanguageServerErrorReporter(parseRoots.get(0));
-        reportProgress.apply("Validating...", START_PERCENT_PROGRESS);
-        validate(uri, errorReporter);
-        reportProgress.apply("Code validation complete.", VALIDATED_PERCENT_PROGRESS);
-        if (cancelIndicator.isCanceled()) return GeneratorResult.CANCELLED;
-        if (errorReporter.getErrorsOccurred()) return GeneratorResult.FAILED;
-        reportProgress.apply("Generating code...", VALIDATED_PERCENT_PROGRESS);
-        return doGenerate(uri, mustComplete, reportProgress, cancelIndicator);
-    }
-
-    /* ------------------------- PRIVATE METHODS ------------------------- */
-
-    /**
-     * Validates the Lingua Franca file {@code f}.
-     * @param uri The URI of a Lingua Franca file.
-     * @param errorReporter The error reporter.
-     */
-    private void validate(URI uri, ErrorReporter errorReporter) {
-        for (Issue issue : validator.validate(getResource(uri), CheckMode.ALL, CancelIndicator.NullImpl)) {
-            getReportMethod(errorReporter, issue.getSeverity()).apply(
-                Path.of(uri.path()), issue.getLineNumber(), issue.getMessage()
-            );
-        }
+  public static final int START_PERCENT_PROGRESS = 0;
+  public static final int VALIDATED_PERCENT_PROGRESS = 33;
+  public static final int GENERATED_PERCENT_PROGRESS = 67;
+  public static final int COMPILED_PERCENT_PROGRESS = 100;
+
+  /** A {@code ProgressReporter} reports the progress of a build. */
+  public interface ReportProgress {
+    void apply(String message, Integer percentage);
+  }
+
+  // Note: This class is not currently used in response to
+  //  document edits, even though the validator and code
+  //  generator are invoked by Xtext in response to
+  //  document edits.
+  /** A {@code ReportMethod} is a way of reporting issues. */
+  private interface ReportMethod {
+    void apply(Path file, Integer line, String message);
+  }
+
+  /* ---------------------- INJECTED DEPENDENCIES ---------------------- */
+
+  @Inject private IResourceValidator validator;
+  @Inject private GeneratorDelegate generator;
+  @Inject private JavaIoFileSystemAccess fileAccess;
+  @Inject private Provider<ResourceSet> resourceSetProvider;
+
+  /* ------------------------- PUBLIC METHODS -------------------------- */
+
+  /**
+   * Generates code from the Lingua Franca file {@code f}.
+   *
+   * @param uri The URI of a Lingua Franca file.
+   * @param mustComplete Whether the build must be taken to completion.
+   * @return The result of the build.
+   */
+  public GeneratorResult run(
+      URI uri,
+      boolean mustComplete,
+      ReportProgress reportProgress,
+      CancelIndicator cancelIndicator) {
+    fileAccess.setOutputPath(
+        FileConfig.findPackageRoot(Path.of(uri.path()), s -> {})
+            .resolve(FileConfig.DEFAULT_SRC_GEN_DIR)
+            .toString());
+    List<EObject> parseRoots = getResource(uri).getContents();
+    if (parseRoots.isEmpty()) return GeneratorResult.NOTHING;
+    ErrorReporter errorReporter = new LanguageServerErrorReporter(parseRoots.get(0));
+    reportProgress.apply("Validating...", START_PERCENT_PROGRESS);
+    validate(uri, errorReporter);
+    reportProgress.apply("Code validation complete.", VALIDATED_PERCENT_PROGRESS);
+    if (cancelIndicator.isCanceled()) return GeneratorResult.CANCELLED;
+    if (errorReporter.getErrorsOccurred()) return GeneratorResult.FAILED;
+    reportProgress.apply("Generating code...", VALIDATED_PERCENT_PROGRESS);
+    return doGenerate(uri, mustComplete, reportProgress, cancelIndicator);
+  }
+
+  /* ------------------------- PRIVATE METHODS ------------------------- */
+
+  /**
+   * Validates the Lingua Franca file {@code f}.
+   *
+   * @param uri The URI of a Lingua Franca file.
+   * @param errorReporter The error reporter.
+   */
+  private void validate(URI uri, ErrorReporter errorReporter) {
+    for (Issue issue :
+        validator.validate(getResource(uri), CheckMode.ALL, CancelIndicator.NullImpl)) {
+      getReportMethod(errorReporter, issue.getSeverity())
+          .apply(Path.of(uri.path()), issue.getLineNumber(), issue.getMessage());
     }
-
-    /**
-     * Generates code from the contents of {@code f}.
-     * @param uri The URI of a Lingua Franca file.
-     * @param mustComplete Whether the build must be taken to completion.
-     * @param cancelIndicator An indicator that returns true when the build is
-     *                        cancelled.
-     * @return The result of the build.
-     */
-    private GeneratorResult doGenerate(
-        URI uri,
-        boolean mustComplete,
-        ReportProgress reportProgress,
-        CancelIndicator cancelIndicator
-    ) {
-        var resource = getResource(uri);
-        LFGeneratorContext context = new MainContext(
+  }
+
+  /**
+   * Generates code from the contents of {@code f}.
+   *
+   * @param uri The URI of a Lingua Franca file.
+   * @param mustComplete Whether the build must be taken to completion.
+   * @param cancelIndicator An indicator that returns true when the build is cancelled.
+   * @return The result of the build.
+   */
+  private GeneratorResult doGenerate(
+      URI uri,
+      boolean mustComplete,
+      ReportProgress reportProgress,
+      CancelIndicator cancelIndicator) {
+    var resource = getResource(uri);
+    LFGeneratorContext context =
+        new MainContext(
             mustComplete ? Mode.LSP_SLOW : LFGeneratorContext.Mode.LSP_MEDIUM,
-            cancelIndicator, reportProgress, new Properties(),
-            resource, fileAccess,
-            fileConfig -> new LanguageServerErrorReporter(resource.getContents().get(0))
-        );
-        generator.generate(getResource(uri), fileAccess, context);
-        return context.getResult();
-    }
-
-    /**
-     * Returns the resource corresponding to {@code uri}.
-     * @param uri The URI of a Lingua Franca file.
-     * @return The resource corresponding to {@code uri}.
-     */
-    private Resource getResource(URI uri) {
-        return resourceSetProvider.get().getResource(uri, true);
-    }
-
-    /**
-     * Returns the appropriate reporting method for the
-     * given {@code Severity}.
-     * @param severity An arbitrary {@code Severity}.
-     * @return The appropriate reporting method for
-     * {@code severity}.
-     */
-    private ReportMethod getReportMethod(ErrorReporter errorReporter, Severity severity) {
-        if (severity == Severity.ERROR) return errorReporter::reportError;
-        return errorReporter::reportWarning;
-    }
+            cancelIndicator,
+            reportProgress,
+            new Properties(),
+            resource,
+            fileAccess,
+            fileConfig -> new LanguageServerErrorReporter(resource.getContents().get(0)));
+    generator.generate(getResource(uri), fileAccess, context);
+    return context.getResult();
+  }
+
+  /**
+   * Returns the resource corresponding to {@code uri}.
+   *
+   * @param uri The URI of a Lingua Franca file.
+   * @return The resource corresponding to {@code uri}.
+   */
+  private Resource getResource(URI uri) {
+    return resourceSetProvider.get().getResource(uri, true);
+  }
+
+  /**
+   * Returns the appropriate reporting method for the given {@code Severity}.
+   *
+   * @param severity An arbitrary {@code Severity}.
+   * @return The appropriate reporting method for {@code severity}.
+   */
+  private ReportMethod getReportMethod(ErrorReporter errorReporter, Severity severity) {
+    if (severity == Severity.ERROR) return errorReporter::reportError;
+    return errorReporter::reportWarning;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/InvalidLfSourceException.java b/org.lflang/src/org/lflang/generator/InvalidLfSourceException.java
index 515bdbb8a0..61cf9632f2 100644
--- a/org.lflang/src/org/lflang/generator/InvalidLfSourceException.java
+++ b/org.lflang/src/org/lflang/generator/InvalidLfSourceException.java
@@ -27,32 +27,31 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * An exception that indicates invalid source, which should
- * be reported to the user. This is an error, it should not
- * be used for warnings.
+ * An exception that indicates invalid source, which should be reported to the user. This is an
+ * error, it should not be used for warnings.
  *
  * @author Clément Fournier
  */
 public class InvalidLfSourceException extends RuntimeException {
 
-    private final EObject node;
-    private final String problem;
+  private final EObject node;
+  private final String problem;
 
-    public InvalidLfSourceException(EObject node, String problem) {
-        super(problem);
-        this.node = node;
-        this.problem = problem;
-    }
+  public InvalidLfSourceException(EObject node, String problem) {
+    super(problem);
+    this.node = node;
+    this.problem = problem;
+  }
 
-    public InvalidLfSourceException(String problem, EObject node) {
-        this(node, problem);
-    }
+  public InvalidLfSourceException(String problem, EObject node) {
+    this(node, problem);
+  }
 
-    public EObject getNode() {
-        return node;
-    }
+  public EObject getNode() {
+    return node;
+  }
 
-    public String getProblem() {
-        return problem;
-    }
+  public String getProblem() {
+    return problem;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/InvalidSourceException.java b/org.lflang/src/org/lflang/generator/InvalidSourceException.java
index 11bedabce2..88b65d0c24 100644
--- a/org.lflang/src/org/lflang/generator/InvalidSourceException.java
+++ b/org.lflang/src/org/lflang/generator/InvalidSourceException.java
@@ -25,19 +25,17 @@
 package org.lflang.generator;
 
 /**
- *
- * This exception is thrown when a program fails a validity check
- * performed by a code generator (and not the validator). This should
- * be thrown only when local control flow cannot recover, otherwise
- * using {@link GeneratorBase#errorReporter} should be preferred,
- * in order to collect more errors before failing.
+ * This exception is thrown when a program fails a validity check performed by a code generator (and
+ * not the validator). This should be thrown only when local control flow cannot recover, otherwise
+ * using {@link GeneratorBase#errorReporter} should be preferred, in order to collect more errors
+ * before failing.
  *
  * @author Clément Fournier
  */
 public class InvalidSourceException extends RuntimeException {
 
-    /** Create a new instance of the exception with the given message. */
-    public InvalidSourceException(String message) {
-        super(message);
-    }
+  /** Create a new instance of the exception with the given message. */
+  public InvalidSourceException(String message) {
+    super(message);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/LFGenerator.java b/org.lflang/src/org/lflang/generator/LFGenerator.java
index c8d985e80c..f2881c9fb8 100644
--- a/org.lflang/src/org/lflang/generator/LFGenerator.java
+++ b/org.lflang/src/org/lflang/generator/LFGenerator.java
@@ -1,19 +1,18 @@
 package org.lflang.generator;
 
+import com.google.inject.Inject;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.AbstractGenerator;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 import org.eclipse.xtext.generator.IGeneratorContext;
 import org.eclipse.xtext.util.RuntimeIOException;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.Target;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedASTUtils;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FedGenerator;
@@ -23,170 +22,179 @@
 import org.lflang.generator.python.PythonGenerator;
 import org.lflang.scoping.LFGlobalScopeProvider;
 
-import com.google.inject.Inject;
-
 /**
  * Generates code from your model files on save.
  *
- * See
- * https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#code-generation
+ * <p>See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#code-generation
  */
 public class LFGenerator extends AbstractGenerator {
 
-    @Inject
-    private LFGlobalScopeProvider scopeProvider;
-
-    // Indicator of whether generator errors occurred.
-    protected boolean generatorErrorsOccurred = false;
-
-    /**
-     * Create a target-specific FileConfig object in Kotlin
-     * <p>
-     * Since the CppFileConfig and TSFileConfig class are implemented in Kotlin, the classes are
-     * not visible from all contexts. If the RCA is run from within Eclipse via
-     * "Run as Eclipse Application", the Kotlin classes are unfortunately not
-     * available at runtime due to bugs in the Eclipse Kotlin plugin. (See
-     * https://stackoverflow.com/questions/68095816/is-ist-possible-to-build-mixed-kotlin-and-java-applications-with-a-recent-eclips)
-     * <p>
-     * If the FileConfig class is found, this method returns an instance.
-     * Otherwise, it returns an Instance of FileConfig.
-     *
-     * @return A FileConfig object in Kotlin if the class can be found.
-     * @throws IOException If the file config could not be created properly
-     */
-    public static FileConfig createFileConfig(Resource resource, Path srcGenBasePath,
-                                        boolean useHierarchicalBin) {
-
-        final Target target = Target.fromDecl(ASTUtils.targetDecl(resource));
-        assert target != null;
-
-        // Since our Eclipse Plugin uses code injection via guice, we need to
-        // play a few tricks here so that FileConfig does not appear as an
-        // import. Instead, we look the class up at runtime and instantiate it if
-        // found.
-        try {
-            if (FedASTUtils.findFederatedReactor(resource) != null) {
-                return new FedFileConfig(resource, srcGenBasePath, useHierarchicalBin);
-            }
-            switch (target) {
-            case CCPP:
-            case C: return new CFileConfig(resource, srcGenBasePath, useHierarchicalBin);
-            case Python: return new PyFileConfig(resource, srcGenBasePath, useHierarchicalBin);
-            case CPP:
-            case Rust:
-            case TS:
-                String className = "org.lflang.generator." + target.packageName + "." + target.classNamePrefix + "FileConfig";
-                try {
-                    return (FileConfig) Class.forName(className)
-                                             .getDeclaredConstructor(Resource.class, Path.class, boolean.class)
-                                             .newInstance(resource, srcGenBasePath, useHierarchicalBin);
-                } catch (ReflectiveOperationException e) {
-                    throw new RuntimeException(
-                        "Exception instantiating " + className, e.getCause());
-                }
-            default:
-                throw new RuntimeException("Could not find FileConfig implementation for target " + target);
-            }
-        } catch (IOException e) {
-            throw new RuntimeException("Unable to create FileConfig object for target " + target + ": " + e.getStackTrace());
-        }
+  @Inject private LFGlobalScopeProvider scopeProvider;
+
+  // Indicator of whether generator errors occurred.
+  protected boolean generatorErrorsOccurred = false;
+
+  /**
+   * Create a target-specific FileConfig object in Kotlin
+   *
+   * <p>Since the CppFileConfig and TSFileConfig class are implemented in Kotlin, the classes are
+   * not visible from all contexts. If the RCA is run from within Eclipse via "Run as Eclipse
+   * Application", the Kotlin classes are unfortunately not available at runtime due to bugs in the
+   * Eclipse Kotlin plugin. (See
+   * https://stackoverflow.com/questions/68095816/is-ist-possible-to-build-mixed-kotlin-and-java-applications-with-a-recent-eclips)
+   *
+   * <p>If the FileConfig class is found, this method returns an instance. Otherwise, it returns an
+   * Instance of FileConfig.
+   *
+   * @return A FileConfig object in Kotlin if the class can be found.
+   * @throws IOException If the file config could not be created properly
+   */
+  public static FileConfig createFileConfig(
+      Resource resource, Path srcGenBasePath, boolean useHierarchicalBin) {
+
+    final Target target = Target.fromDecl(ASTUtils.targetDecl(resource));
+    assert target != null;
+
+    // Since our Eclipse Plugin uses code injection via guice, we need to
+    // play a few tricks here so that FileConfig does not appear as an
+    // import. Instead, we look the class up at runtime and instantiate it if
+    // found.
+    try {
+      if (FedASTUtils.findFederatedReactor(resource) != null) {
+        return new FedFileConfig(resource, srcGenBasePath, useHierarchicalBin);
+      }
+      switch (target) {
+        case CCPP:
+        case C:
+          return new CFileConfig(resource, srcGenBasePath, useHierarchicalBin);
+        case Python:
+          return new PyFileConfig(resource, srcGenBasePath, useHierarchicalBin);
+        case CPP:
+        case Rust:
+        case TS:
+          String className =
+              "org.lflang.generator."
+                  + target.packageName
+                  + "."
+                  + target.classNamePrefix
+                  + "FileConfig";
+          try {
+            return (FileConfig)
+                Class.forName(className)
+                    .getDeclaredConstructor(Resource.class, Path.class, boolean.class)
+                    .newInstance(resource, srcGenBasePath, useHierarchicalBin);
+          } catch (ReflectiveOperationException e) {
+            throw new RuntimeException("Exception instantiating " + className, e.getCause());
+          }
+        default:
+          throw new RuntimeException(
+              "Could not find FileConfig implementation for target " + target);
+      }
+    } catch (IOException e) {
+      throw new RuntimeException(
+          "Unable to create FileConfig object for target " + target + ": " + e.getStackTrace());
     }
-
-    /**
-     *  Create a generator object for the given target.
-     *  Returns null if the generator could not be created.
-     */
-    private GeneratorBase createGenerator(LFGeneratorContext context) {
-        final Target target = Target.fromDecl(ASTUtils.targetDecl(context.getFileConfig().resource));
-        assert target != null;
-        return switch (target) {
-            case C -> new CGenerator(context, false);
-            case CCPP -> new CGenerator(context, true);
-            case Python -> new PythonGenerator(context);
-            case CPP, TS, Rust ->
-                createKotlinBaseGenerator(target, context);
-            // If no case matched, then throw a runtime exception.
-            default -> throw new RuntimeException("Unexpected target!");
-        };
+  }
+
+  /**
+   * Create a generator object for the given target. Returns null if the generator could not be
+   * created.
+   */
+  private GeneratorBase createGenerator(LFGeneratorContext context) {
+    final Target target = Target.fromDecl(ASTUtils.targetDecl(context.getFileConfig().resource));
+    assert target != null;
+    return switch (target) {
+      case C -> new CGenerator(context, false);
+      case CCPP -> new CGenerator(context, true);
+      case Python -> new PythonGenerator(context);
+      case CPP, TS, Rust -> createKotlinBaseGenerator(target, context);
+        // If no case matched, then throw a runtime exception.
+      default -> throw new RuntimeException("Unexpected target!");
+    };
+  }
+
+  /**
+   * Create a code generator in Kotlin.
+   *
+   * <p>Since the CppGenerator and TSGenerator class are implemented in Kotlin, the classes are not
+   * visible from all contexts. If the RCA is run from within Eclipse via "Run as Eclipse
+   * Application", the Kotlin classes are unfortunately not available at runtime due to bugs in the
+   * Eclipse Kotlin plugin. (See
+   * https://stackoverflow.com/questions/68095816/is-ist-possible-to-build-mixed-kotlin-and-java-applications-with-a-recent-eclips)
+   * In this case, the method returns null
+   *
+   * @return A Kotlin Generator object if the class can be found
+   */
+  private GeneratorBase createKotlinBaseGenerator(Target target, LFGeneratorContext context) {
+    // Since our Eclipse Plugin uses code injection via guice, we need to
+    // play a few tricks here so that Kotlin FileConfig and
+    // Kotlin Generator do not appear as an import. Instead, we look the
+    // class up at runtime and instantiate it if found.
+    String classPrefix =
+        "org.lflang.generator." + target.packageName + "." + target.classNamePrefix;
+    try {
+      Class<?> generatorClass = Class.forName(classPrefix + "Generator");
+      Constructor<?> ctor =
+          generatorClass.getDeclaredConstructor(
+              LFGeneratorContext.class, LFGlobalScopeProvider.class);
+
+      return (GeneratorBase) ctor.newInstance(context, scopeProvider);
+    } catch (ReflectiveOperationException e) {
+      generatorErrorsOccurred = true;
+      context
+          .getErrorReporter()
+          .reportError(
+              "The code generator for the "
+                  + target
+                  + " target could not be found. "
+                  + "This is likely because you built Epoch using "
+                  + "Eclipse. The "
+                  + target
+                  + " code generator is written in Kotlin and, unfortunately, the plugin that"
+                  + " Eclipse uses for compiling Kotlin code is broken. Please consider building"
+                  + " Epoch using Maven.\n"
+                  + "For step-by-step instructions, see: "
+                  + "https://github.com/icyphy/lingua-franca/wiki/Running-Lingua-Franca-IDE-%28Epoch%29-with-Kotlin-based-Code-Generators-Enabled-%28without-Eclipse-Environment%29");
+      return null;
+    }
+  }
+
+  @Override
+  public void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorContext context) {
+    final LFGeneratorContext lfContext;
+    if (context instanceof LFGeneratorContext) {
+      lfContext = (LFGeneratorContext) context;
+    } else {
+      lfContext = LFGeneratorContext.lfGeneratorContextOf(resource, fsa, context);
     }
 
+    // The fastest way to generate code is to not generate any code.
+    if (lfContext.getMode() == LFGeneratorContext.Mode.LSP_FAST) return;
 
-    /**
-     * Create a code generator in Kotlin.
-     * <p>
-     * Since the CppGenerator and TSGenerator class are implemented in Kotlin, the classes are
-     * not visible from all contexts. If the RCA is run from within Eclipse via
-     * "Run as Eclipse Application", the Kotlin classes are unfortunately not
-     * available at runtime due to bugs in the Eclipse Kotlin plugin. (See
-     * https://stackoverflow.com/questions/68095816/is-ist-possible-to-build-mixed-kotlin-and-java-applications-with-a-recent-eclips)
-     * In this case, the method returns null
-     *
-     * @return A Kotlin Generator object if the class can be found
-     */
-    private GeneratorBase createKotlinBaseGenerator(Target target, LFGeneratorContext context) {
-        // Since our Eclipse Plugin uses code injection via guice, we need to
-        // play a few tricks here so that Kotlin FileConfig and
-        // Kotlin Generator do not appear as an import. Instead, we look the
-        // class up at runtime and instantiate it if found.
-        String classPrefix = "org.lflang.generator." + target.packageName + "." + target.classNamePrefix;
-        try {
-            Class<?> generatorClass = Class.forName(classPrefix + "Generator");
-            Constructor<?> ctor = generatorClass
-                .getDeclaredConstructor(LFGeneratorContext.class, LFGlobalScopeProvider.class);
-
-            return (GeneratorBase) ctor.newInstance(context, scopeProvider);
-        } catch (ReflectiveOperationException e) {
-            generatorErrorsOccurred = true;
-            context.getErrorReporter().reportError(
-                "The code generator for the " + target + " target could not be found. "
-                    + "This is likely because you built Epoch using "
-                    + "Eclipse. The " + target + " code generator is written in Kotlin "
-                    + "and, unfortunately, the plugin that Eclipse uses "
-                    + "for compiling Kotlin code is broken. "
-                    + "Please consider building Epoch using Maven.\n"
-                    + "For step-by-step instructions, see: "
-                    + "https://github.com/icyphy/lingua-franca/wiki/Running-Lingua-Franca-IDE-%28Epoch%29-with-Kotlin-based-Code-Generators-Enabled-%28without-Eclipse-Environment%29");
-            return null;
-        }
-    }
+    if (FedASTUtils.findFederatedReactor(resource) != null) {
+      try {
+        generatorErrorsOccurred = (new FedGenerator(lfContext)).doGenerate(resource, lfContext);
+      } catch (IOException e) {
+        throw new RuntimeIOException("Error during federated code generation", e);
+      }
 
-    @Override
-    public void doGenerate(Resource resource, IFileSystemAccess2 fsa,
-            IGeneratorContext context) {
-        final LFGeneratorContext lfContext;
-        if (context instanceof LFGeneratorContext) {
-            lfContext = (LFGeneratorContext)context;
-        } else {
-            lfContext = LFGeneratorContext.lfGeneratorContextOf(resource, fsa, context);
-        }
-
-        // The fastest way to generate code is to not generate any code.
-        if (lfContext.getMode() == LFGeneratorContext.Mode.LSP_FAST) return;
-
-        if (FedASTUtils.findFederatedReactor(resource) != null) {
-            try {
-                generatorErrorsOccurred = (new FedGenerator(lfContext)).doGenerate(resource, lfContext);
-            } catch (IOException e) {
-                throw new RuntimeIOException("Error during federated code generation", e);
-            }
-
-        } else {
-
-            final GeneratorBase generator = createGenerator(lfContext);
-
-            if (generator != null) {
-                generator.doGenerate(resource, lfContext);
-                generatorErrorsOccurred = generator.errorsOccurred();
-            }
-        }
-        final ErrorReporter errorReporter = lfContext.getErrorReporter();
-        if (errorReporter instanceof LanguageServerErrorReporter) {
-            ((LanguageServerErrorReporter) errorReporter).publishDiagnostics();
-        }
-    }
+    } else {
 
-    /** Return true if errors occurred in the last call to doGenerate(). */
-    public boolean errorsOccurred() {
-        return generatorErrorsOccurred;
+      final GeneratorBase generator = createGenerator(lfContext);
+
+      if (generator != null) {
+        generator.doGenerate(resource, lfContext);
+        generatorErrorsOccurred = generator.errorsOccurred();
+      }
+    }
+    final ErrorReporter errorReporter = lfContext.getErrorReporter();
+    if (errorReporter instanceof LanguageServerErrorReporter) {
+      ((LanguageServerErrorReporter) errorReporter).publishDiagnostics();
     }
+  }
+
+  /** Return true if errors occurred in the last call to doGenerate(). */
+  public boolean errorsOccurred() {
+    return generatorErrorsOccurred;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/LFGeneratorContext.java b/org.lflang/src/org/lflang/generator/LFGeneratorContext.java
index 84032ecdc6..727ce229b9 100644
--- a/org.lflang/src/org/lflang/generator/LFGeneratorContext.java
+++ b/org.lflang/src/org/lflang/generator/LFGeneratorContext.java
@@ -3,160 +3,146 @@
 import java.nio.file.Path;
 import java.util.Map;
 import java.util.Properties;
-
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 import org.eclipse.xtext.generator.IGeneratorContext;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 
 /**
- * An {@code LFGeneratorContext} is the context of a Lingua Franca build process.
- * It is the point of communication between a build process and the environment
- * in which it is executed.
+ * An {@code LFGeneratorContext} is the context of a Lingua Franca build process. It is the point of
+ * communication between a build process and the environment in which it is executed.
  *
  * @author Peter Donovan
  */
 public interface LFGeneratorContext extends IGeneratorContext {
 
-    /**
-     * Enumeration of keys used to parameterize the build process.
-     */
-    enum BuildParm {
-        BUILD_TYPE("The build type to use"),
-        CLEAN("Clean before building."),
-        EXTERNAL_RUNTIME_PATH("Specify an external runtime library to be used by the compiled binary."),
-        FEDERATED("Treat main reactor as federated."),
-        HELP("Display this information."),
-        LOGGING("The logging level to use by the generated binary"),
-        LINT("Enable or disable linting of generated code."),
-        NO_COMPILE("Do not invoke target compiler."),
-        OUTPUT_PATH("Specify the root output directory."),
-        PRINT_STATISTICS("Instruct the runtime to collect and print statistics."),
-        QUIET("Suppress output of the target compiler and other commands"),
-        RTI("Specify the location of the RTI."),
-        RUNTIME_VERSION("Specify the version of the runtime library used for compiling LF programs."),
-        SCHEDULER("Specify the runtime scheduler (if supported)."),
-        TARGET_COMPILER("Target compiler to invoke."),
-        THREADING("Specify whether the runtime should use multi-threading (true/false)."),
-        VERSION("Print version information."),
-        WORKERS("Specify the default number of worker threads.");
-
-        public final String description;
-
-        BuildParm(String description) {
-            this.description = description;
-        }
-
-        /**
-         * Return the string to use as the key to store a value relating to this parameter.
-         */
-        public String getKey() {
-            return this.name().toLowerCase().replace('_', '-');
-        }
-
-        /**
-         * Return the value corresponding to this parameter or {@code null} if there is none.
-         * @param context The context passed to the code generator.
-         */
-        public String getValue(LFGeneratorContext context) {
-            return context.getArgs().getProperty(this.getKey());
-        }
+  /** Enumeration of keys used to parameterize the build process. */
+  enum BuildParm {
+    BUILD_TYPE("The build type to use"),
+    CLEAN("Clean before building."),
+    EXTERNAL_RUNTIME_PATH("Specify an external runtime library to be used by the compiled binary."),
+    FEDERATED("Treat main reactor as federated."),
+    HELP("Display this information."),
+    LOGGING("The logging level to use by the generated binary"),
+    LINT("Enable or disable linting of generated code."),
+    NO_COMPILE("Do not invoke target compiler."),
+    OUTPUT_PATH("Specify the root output directory."),
+    PRINT_STATISTICS("Instruct the runtime to collect and print statistics."),
+    QUIET("Suppress output of the target compiler and other commands"),
+    RTI("Specify the location of the RTI."),
+    RUNTIME_VERSION("Specify the version of the runtime library used for compiling LF programs."),
+    SCHEDULER("Specify the runtime scheduler (if supported)."),
+    TARGET_COMPILER("Target compiler to invoke."),
+    THREADING("Specify whether the runtime should use multi-threading (true/false)."),
+    VERSION("Print version information."),
+    WORKERS("Specify the default number of worker threads.");
+
+    public final String description;
+
+    BuildParm(String description) {
+      this.description = description;
     }
 
-
-    enum Mode {
-        STANDALONE,
-        EPOCH,
-        LSP_FAST,
-        LSP_MEDIUM,
-        LSP_SLOW,
-        UNDEFINED
+    /** Return the string to use as the key to store a value relating to this parameter. */
+    public String getKey() {
+      return this.name().toLowerCase().replace('_', '-');
     }
 
     /**
-     * Return the mode of operation, which indicates how the compiler has been invoked 
-     * (e.g., from within Epoch, from the command line, or via a Language Server).
-     */
-    Mode getMode();
-
-    /**
-     * Return any arguments that will override target properties.
-     */
-    Properties getArgs();
-
-    /**
-     * Get the error reporter for this context; construct one if it hasn't been
-     * constructed yet.
-     */
-    ErrorReporter getErrorReporter();
-
-    /**
-     * Mark the code generation process performed in this
-     * context as finished with the result {@code result}.
-     * @param result The result of the code generation
-     *               process that was performed in this
-     *               context.
+     * Return the value corresponding to this parameter or {@code null} if there is none.
+     *
+     * @param context The context passed to the code generator.
      */
-    void finish(GeneratorResult result);
-
-    /**
-     * Return the result of the code generation process that was performed in
-     * this context.
-     * @return the result of the code generation process that was performed in
-     * this context
-     */
-    GeneratorResult getResult();
-
-    FileConfig getFileConfig();
-
-    TargetConfig getTargetConfig();
-
-    /**
-     * Report the progress of a build.
-     * @param message A message for the LF programmer to read.
-     * @param percentage The approximate percent completion of the build.
-     */
-    void reportProgress(String message, int percentage);
-
-    /**
-     * Conclude this build and record the result if necessary.
-     * @param status The status of the result.
-     * @param codeMaps The generated files and their corresponding code maps.
-     */
-    default void finish(
-        GeneratorResult.Status status,
-        Map<Path, CodeMap> codeMaps
-    ) {
-        finish(new GeneratorResult(status, this, codeMaps));
-    }
-
-    /**
-     * Conclude this build and record that it was unsuccessful.
-     */
-    default void unsuccessfulFinish() {
-        finish(
-            getCancelIndicator() != null && getCancelIndicator().isCanceled() ?
-            GeneratorResult.CANCELLED : GeneratorResult.FAILED
-        );
-    }
-
-    /**
-     * Return the {@code LFGeneratorContext} that best describes the given {@code context} when
-     * building {@code Resource}.
-     * @param resource
-     * @param fsa
-     * @param context The context of a Lingua Franca build process.
-     * @return The {@code LFGeneratorContext} that best describes the given {@code context} when
-     * building {@code Resource}.
-     */
-    static LFGeneratorContext lfGeneratorContextOf(Resource resource, IFileSystemAccess2 fsa, IGeneratorContext context) {
-        if (context instanceof LFGeneratorContext) return (LFGeneratorContext) context;
-
-        if (resource.getURI().isPlatform()) return new MainContext(Mode.EPOCH, resource, fsa, context.getCancelIndicator());
-
-        return new MainContext(Mode.LSP_FAST, resource, fsa, context.getCancelIndicator());
+    public String getValue(LFGeneratorContext context) {
+      return context.getArgs().getProperty(this.getKey());
     }
+  }
+
+  enum Mode {
+    STANDALONE,
+    EPOCH,
+    LSP_FAST,
+    LSP_MEDIUM,
+    LSP_SLOW,
+    UNDEFINED
+  }
+
+  /**
+   * Return the mode of operation, which indicates how the compiler has been invoked (e.g., from
+   * within Epoch, from the command line, or via a Language Server).
+   */
+  Mode getMode();
+
+  /** Return any arguments that will override target properties. */
+  Properties getArgs();
+
+  /** Get the error reporter for this context; construct one if it hasn't been constructed yet. */
+  ErrorReporter getErrorReporter();
+
+  /**
+   * Mark the code generation process performed in this context as finished with the result {@code
+   * result}.
+   *
+   * @param result The result of the code generation process that was performed in this context.
+   */
+  void finish(GeneratorResult result);
+
+  /**
+   * Return the result of the code generation process that was performed in this context.
+   *
+   * @return the result of the code generation process that was performed in this context
+   */
+  GeneratorResult getResult();
+
+  FileConfig getFileConfig();
+
+  TargetConfig getTargetConfig();
+
+  /**
+   * Report the progress of a build.
+   *
+   * @param message A message for the LF programmer to read.
+   * @param percentage The approximate percent completion of the build.
+   */
+  void reportProgress(String message, int percentage);
+
+  /**
+   * Conclude this build and record the result if necessary.
+   *
+   * @param status The status of the result.
+   * @param codeMaps The generated files and their corresponding code maps.
+   */
+  default void finish(GeneratorResult.Status status, Map<Path, CodeMap> codeMaps) {
+    finish(new GeneratorResult(status, this, codeMaps));
+  }
+
+  /** Conclude this build and record that it was unsuccessful. */
+  default void unsuccessfulFinish() {
+    finish(
+        getCancelIndicator() != null && getCancelIndicator().isCanceled()
+            ? GeneratorResult.CANCELLED
+            : GeneratorResult.FAILED);
+  }
+
+  /**
+   * Return the {@code LFGeneratorContext} that best describes the given {@code context} when
+   * building {@code Resource}.
+   *
+   * @param resource
+   * @param fsa
+   * @param context The context of a Lingua Franca build process.
+   * @return The {@code LFGeneratorContext} that best describes the given {@code context} when
+   *     building {@code Resource}.
+   */
+  static LFGeneratorContext lfGeneratorContextOf(
+      Resource resource, IFileSystemAccess2 fsa, IGeneratorContext context) {
+    if (context instanceof LFGeneratorContext) return (LFGeneratorContext) context;
+
+    if (resource.getURI().isPlatform())
+      return new MainContext(Mode.EPOCH, resource, fsa, context.getCancelIndicator());
+
+    return new MainContext(Mode.LSP_FAST, resource, fsa, context.getCancelIndicator());
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/LFResource.java b/org.lflang/src/org/lflang/generator/LFResource.java
index bc59c418ee..42367dd24f 100644
--- a/org.lflang/src/org/lflang/generator/LFResource.java
+++ b/org.lflang/src/org/lflang/generator/LFResource.java
@@ -5,36 +5,43 @@
 import org.lflang.TargetConfig;
 
 /**
- * A class that keeps metadata for discovered resources
- * during code generation and the supporting structures
- * associated with that resource.
- * 
+ * A class that keeps metadata for discovered resources during code generation and the supporting
+ * structures associated with that resource.
+ *
  * @author Soroush Bateni
  */
 public class LFResource {
-    LFResource(Resource resource, FileConfig fileConfig, TargetConfig targetConfig) {
-        this.eResource = resource; // FIXME: this is redundant because fileConfig already has the resource.
-        this.fileConfig = fileConfig;
-        this.targetConfig = targetConfig;
-    }
-    
-    /**
-     * Resource associated with a file either from the main .lf
-     * file or one of the imported ones.
-     */
-    Resource eResource;
-    public Resource getEResource() { return this.eResource; };
-    
-    /**
-     * The file config associated with 'resource' that can be
-     * used to discover files relative to that resource.
-     */
-    FileConfig fileConfig;
-    public FileConfig getFileConfig() { return this.fileConfig; };
-    
-    /**
-     * The target config read from the resource.
-     */
-    TargetConfig targetConfig;
-    public TargetConfig getTargetConfig() { return this.targetConfig; };
+  LFResource(Resource resource, FileConfig fileConfig, TargetConfig targetConfig) {
+    this.eResource =
+        resource; // FIXME: this is redundant because fileConfig already has the resource.
+    this.fileConfig = fileConfig;
+    this.targetConfig = targetConfig;
+  }
+
+  /** Resource associated with a file either from the main .lf file or one of the imported ones. */
+  Resource eResource;
+
+  public Resource getEResource() {
+    return this.eResource;
+  }
+  ;
+
+  /**
+   * The file config associated with 'resource' that can be used to discover files relative to that
+   * resource.
+   */
+  FileConfig fileConfig;
+
+  public FileConfig getFileConfig() {
+    return this.fileConfig;
+  }
+  ;
+
+  /** The target config read from the resource. */
+  TargetConfig targetConfig;
+
+  public TargetConfig getTargetConfig() {
+    return this.targetConfig;
+  }
+  ;
 }
diff --git a/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java b/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java
index 5ce5da28dc..31304f43c9 100644
--- a/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java
+++ b/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java
@@ -6,16 +6,14 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.lsp4j.PublishDiagnosticsParams;
 import org.eclipse.lsp4j.Range;
-import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.lsp4j.services.LanguageClient;
-
+import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.lflang.ErrorReporter;
 
 /**
@@ -25,179 +23,174 @@
  */
 public class LanguageServerErrorReporter implements ErrorReporter {
 
-    /**
-     * The language client to which errors should be
-     * reported, if such a client is available.
-     * FIXME: This is a de facto global, and it is a hack.
-     */
-    private static LanguageClient client;
-
-    /** The document for which this is a diagnostic acceptor. */
-    private final EObject parseRoot;
-    /** The list of all diagnostics since the last reset. */
-    private final Map<Path, List<Diagnostic>> diagnostics;
-
-    /* ------------------------  CONSTRUCTORS  -------------------------- */
-
-    /**
-     * Initialize a {@code DiagnosticAcceptor} for the
-     * document whose parse tree root node is
-     * {@code parseRoot}.
-     * @param parseRoot the root of the AST of the document
-     *                  for which this is an error reporter
-     */
-    public LanguageServerErrorReporter(EObject parseRoot) {
-        this.parseRoot = parseRoot;
-        this.diagnostics = new HashMap<>();
-    }
-
-    /* -----------------------  PUBLIC METHODS  ------------------------- */
-
-    @Override
-    public String reportError(String message) {
-        return report(getMainFile(), DiagnosticSeverity.Error, message);
-    }
-
-    @Override
-    public String reportWarning(String message) {
-        return report(getMainFile(), DiagnosticSeverity.Warning, message);
-    }
-
-    @Override
-    public String reportInfo(String message) {
-        return report(getMainFile(), DiagnosticSeverity.Information, message);
-    }
-
-    @Override
-    public String reportError(EObject object, String message) {
-        return reportError(message);
-    }
-
-    @Override
-    public String reportWarning(EObject object, String message) {
-        return reportWarning(message);
-    }
-
-    @Override
-    public String reportInfo(EObject object, String message) {
-        return reportInfo(message);
-    }
-
-    @Override
-    public String reportError(Path file, Integer line, String message) {
-        return report(file, DiagnosticSeverity.Error, message, line != null ? line : 1);
-    }
-
-    @Override
-    public String reportWarning(Path file, Integer line, String message) {
-        return report(file, DiagnosticSeverity.Warning, message, line != null ? line : 1);
-    }
-
-    @Override
-    public String reportInfo(Path file, Integer line, String message) {
-        return report(file, DiagnosticSeverity.Information, message, line != null ? line : 1);
-    }
-
-    @Override
-    public boolean getErrorsOccurred() {
-        return diagnostics.values().stream().anyMatch(
-            it -> it.stream().anyMatch(diagnostic -> diagnostic.getSeverity() == DiagnosticSeverity.Error)
-        );
-    }
-
-    @Override
-    public String report(Path file, DiagnosticSeverity severity, String message) {
-        return report(file, severity, message, 1);
-    }
-
-    @Override
-    public String report(Path file, DiagnosticSeverity severity, String message, int line) {
-        Optional<String> text = getLine(line - 1);
-        return report(
-            file,
-            severity,
-            message,
-            Position.fromOneBased(line, 1),
-            Position.fromOneBased(line, 1 + (text.isEmpty() ? 0 : text.get().length()))
-        );
-    }
-
-    @Override
-    public String report(Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
-        if (file == null) file = getMainFile();
-        diagnostics.putIfAbsent(file, new ArrayList<>());
-        diagnostics.get(file).add(new Diagnostic(
-            toRange(startPos, endPos), message, severity, "LF Language Server"
-        ));
-        return "" + severity + ": " + message;
-    }
-
-    /**
-     * Save a reference to the language client.
-     * @param client the language client
-     */
-    public static void setClient(LanguageClient client) {
-        LanguageServerErrorReporter.client = client;
-    }
-
-    /**
-     * Publish diagnostics by forwarding them to the
-     * language client.
-     */
-    public void publishDiagnostics() {
-        if (client == null) {
-            System.err.println(
-                "WARNING: Cannot publish diagnostics because the language client has not yet been found."
-            );
-            return;
-        }
-        for (Path file : diagnostics.keySet()) {
-            PublishDiagnosticsParams publishDiagnosticsParams = new PublishDiagnosticsParams();
-            publishDiagnosticsParams.setUri(URI.createFileURI(file.toString()).toString());
-            publishDiagnosticsParams.setDiagnostics(diagnostics.get(file));
-            client.publishDiagnostics(publishDiagnosticsParams);
-        }
-    }
-
-    /* -----------------------  PRIVATE METHODS  ------------------------ */
-
-    /** Return the file on which the current validation process was triggered. */
-    private Path getMainFile() {
-        return Path.of(parseRoot.eResource().getURI().toFileString());
-    }
-
-    /**
-     * Return the text of the document for which this is an
-     * error reporter.
-     * @return the text of the document for which this is an
-     * error reporter
-     */
-    private String getText() {
-        return NodeModelUtils.getNode(parseRoot).getText();
-    }
-
-    /**
-     * Return the line at index {@code line} in the
-     * document for which this is an error reporter.
-     * @param line the zero-based line index
-     * @return the line located at the given index
-     */
-    private Optional<String> getLine(int line) {
-        return getText().lines().skip(line).findFirst();
-    }
-
-    /**
-     * Return the Range that starts at {@code p0} and ends
-     * at {@code p1}.
-     * @param p0 an arbitrary Position
-     * @param p1 a Position that is greater than {@code p0}
-     * @return the Range that starts at {@code p0} and ends
-     * at {@code p1}
-     */
-    private Range toRange(Position p0, Position p1) {
-        return new Range(
-            new org.eclipse.lsp4j.Position(p0.getZeroBasedLine(), p0.getZeroBasedColumn()),
-            new org.eclipse.lsp4j.Position(p1.getZeroBasedLine(), p1.getZeroBasedColumn())
-        );
-    }
+  /**
+   * The language client to which errors should be reported, if such a client is available. FIXME:
+   * This is a de facto global, and it is a hack.
+   */
+  private static LanguageClient client;
+
+  /** The document for which this is a diagnostic acceptor. */
+  private final EObject parseRoot;
+  /** The list of all diagnostics since the last reset. */
+  private final Map<Path, List<Diagnostic>> diagnostics;
+
+  /* ------------------------  CONSTRUCTORS  -------------------------- */
+
+  /**
+   * Initialize a {@code DiagnosticAcceptor} for the document whose parse tree root node is {@code
+   * parseRoot}.
+   *
+   * @param parseRoot the root of the AST of the document for which this is an error reporter
+   */
+  public LanguageServerErrorReporter(EObject parseRoot) {
+    this.parseRoot = parseRoot;
+    this.diagnostics = new HashMap<>();
+  }
+
+  /* -----------------------  PUBLIC METHODS  ------------------------- */
+
+  @Override
+  public String reportError(String message) {
+    return report(getMainFile(), DiagnosticSeverity.Error, message);
+  }
+
+  @Override
+  public String reportWarning(String message) {
+    return report(getMainFile(), DiagnosticSeverity.Warning, message);
+  }
+
+  @Override
+  public String reportInfo(String message) {
+    return report(getMainFile(), DiagnosticSeverity.Information, message);
+  }
+
+  @Override
+  public String reportError(EObject object, String message) {
+    return reportError(message);
+  }
+
+  @Override
+  public String reportWarning(EObject object, String message) {
+    return reportWarning(message);
+  }
+
+  @Override
+  public String reportInfo(EObject object, String message) {
+    return reportInfo(message);
+  }
+
+  @Override
+  public String reportError(Path file, Integer line, String message) {
+    return report(file, DiagnosticSeverity.Error, message, line != null ? line : 1);
+  }
+
+  @Override
+  public String reportWarning(Path file, Integer line, String message) {
+    return report(file, DiagnosticSeverity.Warning, message, line != null ? line : 1);
+  }
+
+  @Override
+  public String reportInfo(Path file, Integer line, String message) {
+    return report(file, DiagnosticSeverity.Information, message, line != null ? line : 1);
+  }
+
+  @Override
+  public boolean getErrorsOccurred() {
+    return diagnostics.values().stream()
+        .anyMatch(
+            it ->
+                it.stream()
+                    .anyMatch(diagnostic -> diagnostic.getSeverity() == DiagnosticSeverity.Error));
+  }
+
+  @Override
+  public String report(Path file, DiagnosticSeverity severity, String message) {
+    return report(file, severity, message, 1);
+  }
+
+  @Override
+  public String report(Path file, DiagnosticSeverity severity, String message, int line) {
+    Optional<String> text = getLine(line - 1);
+    return report(
+        file,
+        severity,
+        message,
+        Position.fromOneBased(line, 1),
+        Position.fromOneBased(line, 1 + (text.isEmpty() ? 0 : text.get().length())));
+  }
+
+  @Override
+  public String report(
+      Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
+    if (file == null) file = getMainFile();
+    diagnostics.putIfAbsent(file, new ArrayList<>());
+    diagnostics
+        .get(file)
+        .add(new Diagnostic(toRange(startPos, endPos), message, severity, "LF Language Server"));
+    return "" + severity + ": " + message;
+  }
+
+  /**
+   * Save a reference to the language client.
+   *
+   * @param client the language client
+   */
+  public static void setClient(LanguageClient client) {
+    LanguageServerErrorReporter.client = client;
+  }
+
+  /** Publish diagnostics by forwarding them to the language client. */
+  public void publishDiagnostics() {
+    if (client == null) {
+      System.err.println(
+          "WARNING: Cannot publish diagnostics because the language client has not yet been"
+              + " found.");
+      return;
+    }
+    for (Path file : diagnostics.keySet()) {
+      PublishDiagnosticsParams publishDiagnosticsParams = new PublishDiagnosticsParams();
+      publishDiagnosticsParams.setUri(URI.createFileURI(file.toString()).toString());
+      publishDiagnosticsParams.setDiagnostics(diagnostics.get(file));
+      client.publishDiagnostics(publishDiagnosticsParams);
+    }
+  }
+
+  /* -----------------------  PRIVATE METHODS  ------------------------ */
+
+  /** Return the file on which the current validation process was triggered. */
+  private Path getMainFile() {
+    return Path.of(parseRoot.eResource().getURI().toFileString());
+  }
+
+  /**
+   * Return the text of the document for which this is an error reporter.
+   *
+   * @return the text of the document for which this is an error reporter
+   */
+  private String getText() {
+    return NodeModelUtils.getNode(parseRoot).getText();
+  }
+
+  /**
+   * Return the line at index {@code line} in the document for which this is an error reporter.
+   *
+   * @param line the zero-based line index
+   * @return the line located at the given index
+   */
+  private Optional<String> getLine(int line) {
+    return getText().lines().skip(line).findFirst();
+  }
+
+  /**
+   * Return the Range that starts at {@code p0} and ends at {@code p1}.
+   *
+   * @param p0 an arbitrary Position
+   * @param p1 a Position that is greater than {@code p0}
+   * @return the Range that starts at {@code p0} and ends at {@code p1}
+   */
+  private Range toRange(Position p0, Position p1) {
+    return new Range(
+        new org.eclipse.lsp4j.Position(p0.getZeroBasedLine(), p0.getZeroBasedColumn()),
+        new org.eclipse.lsp4j.Position(p1.getZeroBasedLine(), p1.getZeroBasedColumn()));
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/LfExpressionVisitor.java b/org.lflang/src/org/lflang/generator/LfExpressionVisitor.java
index 2bb72789ff..15f0e8ddad 100644
--- a/org.lflang/src/org/lflang/generator/LfExpressionVisitor.java
+++ b/org.lflang/src/org/lflang/generator/LfExpressionVisitor.java
@@ -40,121 +40,120 @@
  */
 public interface LfExpressionVisitor<P, R> {
 
-
-    R visitLiteral(Literal expr, P param);
-
-    R visitBracedListExpr(BracedListExpression expr, P param);
-
-    R visitTimeLiteral(Time expr, P param);
-
-    R visitCodeExpr(CodeExpr expr, P param);
-
-    R visitParameterRef(ParameterReference expr, P param);
-
-    /**
-     * Dispatch the visitor on the given expression type.
-     *
-     * @param e An expression that will be visited
-     * @param arg Argument for the visitor
-     * @param visitor Visitor
-     * @param <P> Type of parameter expected by the visitor
-     * @param <R> Return type of the visitor
-     * @return The return value of the visitor
-     */
-    static <P, R> R dispatch(Expression e, P arg, LfExpressionVisitor<? super P, ? extends R> visitor) {
-        if (e instanceof Literal) {
-            return visitor.visitLiteral((Literal) e, arg);
-        } else if (e instanceof BracedListExpression) {
-            return visitor.visitBracedListExpr((BracedListExpression) e, arg);
-        } else if (e instanceof Time) {
-            return visitor.visitTimeLiteral((Time) e, arg);
-        } else if (e instanceof CodeExpr) {
-            return visitor.visitCodeExpr((CodeExpr) e, arg);
-        } else if (e instanceof ParameterReference) {
-            return visitor.visitParameterRef((ParameterReference) e, arg);
-        }
-
-        throw new IllegalArgumentException("Expression of type " + e.getClass() + " not handled");
+  R visitLiteral(Literal expr, P param);
+
+  R visitBracedListExpr(BracedListExpression expr, P param);
+
+  R visitTimeLiteral(Time expr, P param);
+
+  R visitCodeExpr(CodeExpr expr, P param);
+
+  R visitParameterRef(ParameterReference expr, P param);
+
+  /**
+   * Dispatch the visitor on the given expression type.
+   *
+   * @param e An expression that will be visited
+   * @param arg Argument for the visitor
+   * @param visitor Visitor
+   * @param <P> Type of parameter expected by the visitor
+   * @param <R> Return type of the visitor
+   * @return The return value of the visitor
+   */
+  static <P, R> R dispatch(
+      Expression e, P arg, LfExpressionVisitor<? super P, ? extends R> visitor) {
+    if (e instanceof Literal) {
+      return visitor.visitLiteral((Literal) e, arg);
+    } else if (e instanceof BracedListExpression) {
+      return visitor.visitBracedListExpr((BracedListExpression) e, arg);
+    } else if (e instanceof Time) {
+      return visitor.visitTimeLiteral((Time) e, arg);
+    } else if (e instanceof CodeExpr) {
+      return visitor.visitCodeExpr((CodeExpr) e, arg);
+    } else if (e instanceof ParameterReference) {
+      return visitor.visitParameterRef((ParameterReference) e, arg);
     }
 
-    /** Base visitor class where methods are defaulted to a common one. */
-    abstract class DefaultLfVisitor<P, R> implements LfExpressionVisitor<P, R> {
+    throw new IllegalArgumentException("Expression of type " + e.getClass() + " not handled");
+  }
+
+  /** Base visitor class where methods are defaulted to a common one. */
+  abstract class DefaultLfVisitor<P, R> implements LfExpressionVisitor<P, R> {
+
+    abstract R visitExpression(Expression expr, P param);
 
-        abstract R visitExpression(Expression expr, P param);
+    @Override
+    public R visitLiteral(Literal expr, P param) {
+      return visitExpression(expr, param);
+    }
+
+    @Override
+    public R visitBracedListExpr(BracedListExpression expr, P param) {
+      return visitExpression(expr, param);
+    }
 
-        @Override
-        public R visitLiteral(Literal expr, P param) {
-            return visitExpression(expr, param);
-        }
+    @Override
+    public R visitTimeLiteral(Time expr, P param) {
+      return visitExpression(expr, param);
+    }
 
-        @Override
-        public R visitBracedListExpr(BracedListExpression expr, P param) {
-            return visitExpression(expr, param);
-        }
+    @Override
+    public R visitCodeExpr(CodeExpr expr, P param) {
+      return visitExpression(expr, param);
+    }
 
-        @Override
-        public R visitTimeLiteral(Time expr, P param) {
-            return visitExpression(expr, param);
-        }
+    @Override
+    public R visitParameterRef(ParameterReference expr, P param) {
+      return visitExpression(expr, param);
+    }
+  }
+
+  /**
+   * A visitor that deep copies the expression. Can be extended to replace certain expressions
+   * during the copy.
+   *
+   * @param <P> Parameter type
+   */
+  class LfExpressionDeepCopyVisitor<P> implements LfExpressionVisitor<P, Expression> {
+
+    @Override
+    public Expression visitLiteral(Literal expr, P param) {
+      Literal clone = LfFactory.eINSTANCE.createLiteral();
+      clone.setLiteral(expr.getLiteral());
+      return clone;
+    }
 
-        @Override
-        public R visitCodeExpr(CodeExpr expr, P param) {
-            return visitExpression(expr, param);
-        }
+    @Override
+    public Expression visitBracedListExpr(BracedListExpression expr, P param) {
+      BracedListExpression clone = LfFactory.eINSTANCE.createBracedListExpression();
+      for (Expression item : expr.getItems()) {
+        clone.getItems().add(dispatch(item, param, this));
+      }
+      return clone;
+    }
 
-        @Override
-        public R visitParameterRef(ParameterReference expr, P param) {
-            return visitExpression(expr, param);
-        }
+    @Override
+    public Expression visitTimeLiteral(Time expr, P param) {
+      Time clone = LfFactory.eINSTANCE.createTime();
+      clone.setUnit(expr.getUnit());
+      clone.setInterval(expr.getInterval());
+      return clone;
     }
 
-    /**
-     * A visitor that deep copies the expression. Can be extended
-     * to replace certain expressions during the copy.
-     *
-     * @param <P> Parameter type
-     */
-    class LfExpressionDeepCopyVisitor<P> implements LfExpressionVisitor<P, Expression> {
-
-        @Override
-        public Expression visitLiteral(Literal expr, P param) {
-            Literal clone = LfFactory.eINSTANCE.createLiteral();
-            clone.setLiteral(expr.getLiteral());
-            return clone;
-        }
-
-        @Override
-        public Expression visitBracedListExpr(BracedListExpression expr, P param) {
-            BracedListExpression clone = LfFactory.eINSTANCE.createBracedListExpression();
-            for (Expression item : expr.getItems()) {
-                clone.getItems().add(dispatch(item, param, this));
-            }
-            return clone;
-        }
-
-        @Override
-        public Expression visitTimeLiteral(Time expr, P param) {
-            Time clone = LfFactory.eINSTANCE.createTime();
-            clone.setUnit(expr.getUnit());
-            clone.setInterval(expr.getInterval());
-            return clone;
-        }
-
-        @Override
-        public Expression visitParameterRef(ParameterReference expr, P param) {
-            ParameterReference clone = LfFactory.eINSTANCE.createParameterReference();
-            clone.setParameter(expr.getParameter());
-            return clone;
-        }
-
-        @Override
-        public Expression visitCodeExpr(CodeExpr expr, P param) {
-            CodeExpr codeExpr = LfFactory.eINSTANCE.createCodeExpr();
-            Code code = LfFactory.eINSTANCE.createCode();
-            code.setBody(expr.getCode().getBody());
-            codeExpr.setCode(code);
-            return codeExpr;
-        }
+    @Override
+    public Expression visitParameterRef(ParameterReference expr, P param) {
+      ParameterReference clone = LfFactory.eINSTANCE.createParameterReference();
+      clone.setParameter(expr.getParameter());
+      return clone;
     }
 
+    @Override
+    public Expression visitCodeExpr(CodeExpr expr, P param) {
+      CodeExpr codeExpr = LfFactory.eINSTANCE.createCodeExpr();
+      Code code = LfFactory.eINSTANCE.createCode();
+      code.setBody(expr.getCode().getBody());
+      codeExpr.setCode(code);
+      return codeExpr;
+    }
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/MainContext.java b/org.lflang/src/org/lflang/generator/MainContext.java
index 5ee53e5f83..4a60c4d6a8 100644
--- a/org.lflang/src/org/lflang/generator/MainContext.java
+++ b/org.lflang/src/org/lflang/generator/MainContext.java
@@ -4,12 +4,10 @@
 import java.util.Objects;
 import java.util.Properties;
 import java.util.function.Function;
-
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.util.RuntimeIOException;
-
 import org.lflang.DefaultErrorReporter;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
@@ -17,154 +15,156 @@
 import org.lflang.generator.IntegratedBuilder.ReportProgress;
 
 /**
- * A {@code MainContext} is an {@code LFGeneratorContext} that is
- * not nested in any other generator context. There is one
- * {@code MainContext} for every build process.
+ * A {@code MainContext} is an {@code LFGeneratorContext} that is not nested in any other generator
+ * context. There is one {@code MainContext} for every build process.
  *
  * @author Peter Donovan
  */
 public class MainContext implements LFGeneratorContext {
-    
-    /**
-     * This constructor will be set by the LF plugin, if the generator is running in Epoch.
-     */
-    public static Function<FileConfig, ErrorReporter> EPOCH_ERROR_REPORTER_CONSTRUCTOR = null;
-    
-    /**
-     * The indicator that shows whether this build
-     * process is canceled.
-     */
-    private final CancelIndicator cancelIndicator;
-    /** The {@code ReportProgress} function of {@code this}. */
-    private final ReportProgress reportProgress;
-
-    private final FileConfig fileConfig;
-
-    /** Whether the requested build is required to be complete. */
-    private final Mode mode;
-
-    private TargetConfig targetConfig;
-
-    /** The result of the code generation process. */
-    private GeneratorResult result = null;
-    private final Properties args;
-    private final ErrorReporter errorReporter;
-
-    /**
-     * Initialize the context of a build process whose cancellation is
-     * indicated by {@code cancelIndicator}
-     * @param mode The mode of this build process.
-     * @param cancelIndicator The cancel indicator of the code generation
-     *                        process to which this corresponds.
-     */
-    public MainContext(Mode mode, Resource resource, IFileSystemAccess2 fsa, CancelIndicator cancelIndicator) {
-        this(
-            mode, cancelIndicator, (message, completion) -> {}, new Properties(), resource, fsa,
-            (mode == Mode.EPOCH && EPOCH_ERROR_REPORTER_CONSTRUCTOR != null) ?
-                    EPOCH_ERROR_REPORTER_CONSTRUCTOR :
-                    fileConfig -> new DefaultErrorReporter()
-        );
-    }
-
-    /**
-     * Initialize the context of a build process whose cancellation is
-     * indicated by {@code cancelIndicator}
-     * @param mode The mode of this build process.
-     * @param cancelIndicator The cancel indicator of the code generation
-     *                        process to which this corresponds.
-     * @param reportProgress The {@code ReportProgress} function of
-     *                       {@code this}.
-     * @param args Any arguments that may be used to affect the product of the
-     *             build.
-     * @param resource ...
-     * @param fsa ...
-     * @param constructErrorReporter A function that constructs the appropriate
-     *                               error reporter for the given FileConfig.
-     */
-    public MainContext(
-        Mode mode,
-        CancelIndicator cancelIndicator,
-        ReportProgress reportProgress,
-        Properties args,
-        Resource resource,
-        IFileSystemAccess2 fsa,
-        Function<FileConfig, ErrorReporter> constructErrorReporter
-    ) {
-        this.mode = mode;
-        this.cancelIndicator = cancelIndicator == null ? () -> false : cancelIndicator;
-        this.reportProgress = reportProgress;
-        this.args = args;
-
-        try {
-            var useHierarchicalBin = args.containsKey("hierarchical-bin") && Boolean.parseBoolean(args.getProperty("hierarchical-bin"));
-            fileConfig = Objects.requireNonNull(LFGenerator.createFileConfig(resource, FileConfig.getSrcGenRoot(fsa), useHierarchicalBin));
-        } catch (IOException e) {
-            throw new RuntimeIOException("Error during FileConfig instantiation", e);
-        }
-
-        this.errorReporter = constructErrorReporter.apply(this.fileConfig);
-
-        loadTargetConfig();
-    }
-
-    @Override
-    public CancelIndicator getCancelIndicator() {
-        return cancelIndicator;
-    }
-
-    @Override
-    public Mode getMode() {
-        return mode;
-    }
-
-    @Override
-    public Properties getArgs() {
-        return args;
-    }
-
 
-    @Override
-    public ErrorReporter getErrorReporter() {
-        return errorReporter;
+  /** This constructor will be set by the LF plugin, if the generator is running in Epoch. */
+  public static Function<FileConfig, ErrorReporter> EPOCH_ERROR_REPORTER_CONSTRUCTOR = null;
+
+  /** The indicator that shows whether this build process is canceled. */
+  private final CancelIndicator cancelIndicator;
+  /** The {@code ReportProgress} function of {@code this}. */
+  private final ReportProgress reportProgress;
+
+  private final FileConfig fileConfig;
+
+  /** Whether the requested build is required to be complete. */
+  private final Mode mode;
+
+  private TargetConfig targetConfig;
+
+  /** The result of the code generation process. */
+  private GeneratorResult result = null;
+
+  private final Properties args;
+  private final ErrorReporter errorReporter;
+
+  /**
+   * Initialize the context of a build process whose cancellation is indicated by {@code
+   * cancelIndicator}
+   *
+   * @param mode The mode of this build process.
+   * @param cancelIndicator The cancel indicator of the code generation process to which this
+   *     corresponds.
+   */
+  public MainContext(
+      Mode mode, Resource resource, IFileSystemAccess2 fsa, CancelIndicator cancelIndicator) {
+    this(
+        mode,
+        cancelIndicator,
+        (message, completion) -> {},
+        new Properties(),
+        resource,
+        fsa,
+        (mode == Mode.EPOCH && EPOCH_ERROR_REPORTER_CONSTRUCTOR != null)
+            ? EPOCH_ERROR_REPORTER_CONSTRUCTOR
+            : fileConfig -> new DefaultErrorReporter());
+  }
+
+  /**
+   * Initialize the context of a build process whose cancellation is indicated by {@code
+   * cancelIndicator}
+   *
+   * @param mode The mode of this build process.
+   * @param cancelIndicator The cancel indicator of the code generation process to which this
+   *     corresponds.
+   * @param reportProgress The {@code ReportProgress} function of {@code this}.
+   * @param args Any arguments that may be used to affect the product of the build.
+   * @param resource ...
+   * @param fsa ...
+   * @param constructErrorReporter A function that constructs the appropriate error reporter for the
+   *     given FileConfig.
+   */
+  public MainContext(
+      Mode mode,
+      CancelIndicator cancelIndicator,
+      ReportProgress reportProgress,
+      Properties args,
+      Resource resource,
+      IFileSystemAccess2 fsa,
+      Function<FileConfig, ErrorReporter> constructErrorReporter) {
+    this.mode = mode;
+    this.cancelIndicator = cancelIndicator == null ? () -> false : cancelIndicator;
+    this.reportProgress = reportProgress;
+    this.args = args;
+
+    try {
+      var useHierarchicalBin =
+          args.containsKey("hierarchical-bin")
+              && Boolean.parseBoolean(args.getProperty("hierarchical-bin"));
+      fileConfig =
+          Objects.requireNonNull(
+              LFGenerator.createFileConfig(
+                  resource, FileConfig.getSrcGenRoot(fsa), useHierarchicalBin));
+    } catch (IOException e) {
+      throw new RuntimeIOException("Error during FileConfig instantiation", e);
     }
 
-    @Override
-    public void finish(GeneratorResult result) {
-        if (this.result != null) throw new IllegalStateException("A code generation process can only have one result.");
-        this.result = result;
-        reportProgress(result.getUserMessage(), 100);
-    }
-
-    @Override
-    public GeneratorResult getResult() {
-        return result != null ? result : GeneratorResult.NOTHING;
-    }
-
-    @Override
-    public FileConfig getFileConfig() {
-        return this.fileConfig;
-    }
-
-    @Override
-    public TargetConfig getTargetConfig() {
-        return this.targetConfig;
-    }
-
-    @Override
-    public void reportProgress(String message, int percentage) {
-        reportProgress.apply(message, percentage);
-    }
-
-    /**
-     * Load the target configuration based on the contents of the resource.
-     * This is done automatically upon instantiation of the context, but
-     * in case the resource changes (e.g., due to an AST transformation),
-     * this method can be called to reload to ensure that the changes are
-     * reflected in the target configuration.
-     */
-    public void loadTargetConfig() {
-        this.targetConfig = new TargetConfig(
-            args, GeneratorUtils.findTargetDecl(fileConfig.resource), errorReporter
-        );
-    }
+    this.errorReporter = constructErrorReporter.apply(this.fileConfig);
+
+    loadTargetConfig();
+  }
+
+  @Override
+  public CancelIndicator getCancelIndicator() {
+    return cancelIndicator;
+  }
+
+  @Override
+  public Mode getMode() {
+    return mode;
+  }
+
+  @Override
+  public Properties getArgs() {
+    return args;
+  }
+
+  @Override
+  public ErrorReporter getErrorReporter() {
+    return errorReporter;
+  }
+
+  @Override
+  public void finish(GeneratorResult result) {
+    if (this.result != null)
+      throw new IllegalStateException("A code generation process can only have one result.");
+    this.result = result;
+    reportProgress(result.getUserMessage(), 100);
+  }
+
+  @Override
+  public GeneratorResult getResult() {
+    return result != null ? result : GeneratorResult.NOTHING;
+  }
+
+  @Override
+  public FileConfig getFileConfig() {
+    return this.fileConfig;
+  }
+
+  @Override
+  public TargetConfig getTargetConfig() {
+    return this.targetConfig;
+  }
+
+  @Override
+  public void reportProgress(String message, int percentage) {
+    reportProgress.apply(message, percentage);
+  }
+
+  /**
+   * Load the target configuration based on the contents of the resource. This is done automatically
+   * upon instantiation of the context, but in case the resource changes (e.g., due to an AST
+   * transformation), this method can be called to reload to ensure that the changes are reflected
+   * in the target configuration.
+   */
+  public void loadTargetConfig() {
+    this.targetConfig =
+        new TargetConfig(args, GeneratorUtils.findTargetDecl(fileConfig.resource), errorReporter);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/MixedRadixInt.java b/org.lflang/src/org/lflang/generator/MixedRadixInt.java
index 700012385c..c75ebd5864 100644
--- a/org.lflang/src/org/lflang/generator/MixedRadixInt.java
+++ b/org.lflang/src/org/lflang/generator/MixedRadixInt.java
@@ -34,241 +34,223 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.Set;
 
 /**
- * Representation of a permuted mixed radix (PMR) integer.
- * A mixed radix number is a number representation where each digit can have
- * a distinct radix. The radixes are given by a list of numbers, r0, r1, ... , rn,
- * where r0 is the radix of the lowest-order digit and rn is the radix of the
- * highest order digit that has a specified radix.
+ * Representation of a permuted mixed radix (PMR) integer. A mixed radix number is a number
+ * representation where each digit can have a distinct radix. The radixes are given by a list of
+ * numbers, r0, r1, ... , rn, where r0 is the radix of the lowest-order digit and rn is the radix of
+ * the highest order digit that has a specified radix.
+ *
+ * <p>A PMR is a mixed radix number that, when incremented, increments the digits in the order given
+ * by the permutation matrix. For an ordinary mixed radix number, the permutation matrix is [0, 1,
+ * ..., n-1]. The permutation matrix may be any permutation of these digits, [d0, d1, ..., dn-1], in
+ * which case, when incremented, the d0 digit will be incremented first. If it overflows, it will be
+ * set to 0 and the d1 digit will be incremented. If it overflows, the next digit is incremented. If
+ * the last digit overflows, then the number wraps around so that all digits become zero.
+ *
+ * <p>This implementation realizes a finite set of numbers, where incrementing past the end of the
+ * range wraps around to the beginning. As a consequence, the increment() function from any starting
+ * point is guaranteed to eventually cover all possible values.
+ *
+ * <p>The {@link #toString()} method gives a string representation of the number where each digit is
+ * represented by the string "d%r", where d is the digit and r is the radix. For example, the number
+ * "1%2, 2%3, 1%4" has value 11, 1 + (2*2) + (1*2*3).
  *
- * A PMR is a mixed radix number that, when incremented,
- * increments the digits in the order given by the permutation matrix.
- * For an ordinary mixed radix number, the permutation matrix is
- * [0, 1, ..., n-1]. The permutation matrix may be any permutation of
- * these digits, [d0, d1, ..., dn-1], in which case, when incremented,
- * the d0 digit will be incremented first. If it overflows, it will be
- * set to 0 and the d1 digit will be incremented. If it overflows, the
- * next digit is incremented.  If the last digit overflows, then the
- * number wraps around so that all digits become zero.
- * 
- * This implementation realizes a finite set of numbers, where incrementing
- * past the end of the range wraps around to the beginning. As a consequence,
- * the increment() function from any starting point is guaranteed to eventually
- * cover all possible values.
- * 
- * The {@link #toString()} method gives a string representation of the number
- * where each digit is represented by the string "d%r", where d is the digit
- * and r is the radix. For example, the number "1%2, 2%3, 1%4" has value 11,
- * 1 + (2*2) + (1*2*3).
- * 
  * @author Edward A. Lee
  */
 public class MixedRadixInt {
-    
-    /**
-     * Create a mixed radix number with the specified digits and radixes,
-     * which are given low-order digits first.
-     * If there is one more digit than radixes, throw an exception.
-     * @param digits The digits, or null to get a zero-valued number.
-     * @param radixes The radixes.
-     * @param permutation The permutation matrix, or null for the default permutation.
-     */
-    public MixedRadixInt(
-            List<Integer> digits, List<Integer> radixes, List<Integer> permutation
-    ) {
-        if (radixes == null 
-                || (digits != null && digits.size() > radixes.size())
-                || (permutation != null && permutation.size() != radixes.size())
-                || radixes.contains(0)) {
-            throw new IllegalArgumentException("Invalid constructor arguments.");
-        }
-        this.radixes = radixes;
-        if (digits != null) {
-            this.digits = digits;
-        } else {
-            this.digits = new ArrayList<Integer>(1);
-            this.digits.add(0);
-        }
-        if (permutation != null) {
-            // Check the permutation matrix.
-            Set<Integer> indices = new HashSet<Integer>();
-            for (int p : permutation) {
-                if (p < 0 || p >= radixes.size() || indices.contains(p)) {
-                    throw new IllegalArgumentException(
-                            "Permutation list is required to be a permutation of [0, 1, ... , n-1].");
-                }
-                indices.add(p);
-            }
-            this.permutation = permutation;
-        }
-    }
-    
-    /**
-     * A zero-valued mixed radix number with just one digit will radix 1.
-     */
-    public final static MixedRadixInt ZERO = new MixedRadixInt(null, List.of(1), null);
-
-    //////////////////////////////////////////////////////////
-    //// Public methods
 
-    /**
-     * Get the value as an integer.
-     */
-    public int get() {
-        return get(0);
+  /**
+   * Create a mixed radix number with the specified digits and radixes, which are given low-order
+   * digits first. If there is one more digit than radixes, throw an exception.
+   *
+   * @param digits The digits, or null to get a zero-valued number.
+   * @param radixes The radixes.
+   * @param permutation The permutation matrix, or null for the default permutation.
+   */
+  public MixedRadixInt(List<Integer> digits, List<Integer> radixes, List<Integer> permutation) {
+    if (radixes == null
+        || (digits != null && digits.size() > radixes.size())
+        || (permutation != null && permutation.size() != radixes.size())
+        || radixes.contains(0)) {
+      throw new IllegalArgumentException("Invalid constructor arguments.");
     }
-    
-    /**
-     * Get the value as an integer after dropping the first n digits.
-     * @param n The number of digits to drop.
-     */
-    public int get(int n) {
-        int result = 0;
-        int scale = 1;
-        if (n < 0) n = 0;
-        for (int i = n; i < radixes.size(); i++) {
-            if (i >= digits.size()) return result;
-            result += digits.get(i) * scale;
-            scale *= radixes.get(i);
-        }
-        return result;
+    this.radixes = radixes;
+    if (digits != null) {
+      this.digits = digits;
+    } else {
+      this.digits = new ArrayList<Integer>(1);
+      this.digits.add(0);
     }
-
-    /**
-     * Return the digits. This is assured of returning as many
-     * digits as there are radixes.
-     */
-    public List<Integer> getDigits() {
-        while (digits.size() < radixes.size()) {
-            digits.add(0);
+    if (permutation != null) {
+      // Check the permutation matrix.
+      Set<Integer> indices = new HashSet<Integer>();
+      for (int p : permutation) {
+        if (p < 0 || p >= radixes.size() || indices.contains(p)) {
+          throw new IllegalArgumentException(
+              "Permutation list is required to be a permutation of [0, 1, ... , n-1].");
         }
-        return digits;
+        indices.add(p);
+      }
+      this.permutation = permutation;
     }
-    
-    /**
-     * Return the permutation list.
-     */
-    public List<Integer> getPermutation() {
-        if (permutation == null) {
-            // Construct a default permutation.
-            permutation = new ArrayList<Integer>(radixes.size());
-            for (int i = 0; i < radixes.size(); i++) {
-                permutation.add(i);
-            }
-        }
-        return permutation;
+  }
+
+  /** A zero-valued mixed radix number with just one digit will radix 1. */
+  public static final MixedRadixInt ZERO = new MixedRadixInt(null, List.of(1), null);
+
+  //////////////////////////////////////////////////////////
+  //// Public methods
+
+  /** Get the value as an integer. */
+  public int get() {
+    return get(0);
+  }
+
+  /**
+   * Get the value as an integer after dropping the first n digits.
+   *
+   * @param n The number of digits to drop.
+   */
+  public int get(int n) {
+    int result = 0;
+    int scale = 1;
+    if (n < 0) n = 0;
+    for (int i = n; i < radixes.size(); i++) {
+      if (i >= digits.size()) return result;
+      result += digits.get(i) * scale;
+      scale *= radixes.get(i);
     }
-        
-    /**
-     * Return the radixes.
-     */
-    public List<Integer> getRadixes() {
-        return radixes;
+    return result;
+  }
+
+  /** Return the digits. This is assured of returning as many digits as there are radixes. */
+  public List<Integer> getDigits() {
+    while (digits.size() < radixes.size()) {
+      digits.add(0);
     }
-    
-    /**
-     * Increment the number by one, using the permutation vector to
-     * determine the order in which the digits are incremented.
-     * If an overflow occurs, then a radix-infinity digit will be added
-     * to the digits array if there isn't one there already.
-     */
-    public void increment() {
-        int i = 0;
-        while (i < radixes.size()) {
-            int digit_to_increment = getPermutation().get(i);
-            while (digit_to_increment >= digits.size()) {
-                digits.add(0);
-            }
-            digits.set(digit_to_increment, digits.get(digit_to_increment) + 1);
-            if (digits.get(digit_to_increment) >= radixes.get(digit_to_increment)) {
-                digits.set(digit_to_increment, 0);
-                i++;
-            } else {
-                return; // All done.
-            }
-        }
+    return digits;
+  }
+
+  /** Return the permutation list. */
+  public List<Integer> getPermutation() {
+    if (permutation == null) {
+      // Construct a default permutation.
+      permutation = new ArrayList<Integer>(radixes.size());
+      for (int i = 0; i < radixes.size(); i++) {
+        permutation.add(i);
+      }
     }
-    
-    /**
-     * Return the magnitude of this PMR, which is defined to be the number
-     * of times that increment() would need to invoked starting with zero
-     * before the value returned by {@link #get()} would be reached.
-     */
-    public int magnitude() {
-        int factor = 1;
-        int result = 0;
-        List<Integer> p = getPermutation();
-        for (int i = 0; i < radixes.size(); i++) {
-            if (digits.size() <= i) return result;
-            result += factor * digits.get(p.get(i));
-            factor *= radixes.get(p.get(i));
-        }
-        return result;
+    return permutation;
+  }
+
+  /** Return the radixes. */
+  public List<Integer> getRadixes() {
+    return radixes;
+  }
+
+  /**
+   * Increment the number by one, using the permutation vector to determine the order in which the
+   * digits are incremented. If an overflow occurs, then a radix-infinity digit will be added to the
+   * digits array if there isn't one there already.
+   */
+  public void increment() {
+    int i = 0;
+    while (i < radixes.size()) {
+      int digit_to_increment = getPermutation().get(i);
+      while (digit_to_increment >= digits.size()) {
+        digits.add(0);
+      }
+      digits.set(digit_to_increment, digits.get(digit_to_increment) + 1);
+      if (digits.get(digit_to_increment) >= radixes.get(digit_to_increment)) {
+        digits.set(digit_to_increment, 0);
+        i++;
+      } else {
+        return; // All done.
+      }
     }
-        
-    /**
-     * Return the number of digits in this mixed radix number.
-     * This is the size of the radixes list.
-     */
-    public int numDigits() {
-        return radixes.size();
+  }
+
+  /**
+   * Return the magnitude of this PMR, which is defined to be the number of times that increment()
+   * would need to invoked starting with zero before the value returned by {@link #get()} would be
+   * reached.
+   */
+  public int magnitude() {
+    int factor = 1;
+    int result = 0;
+    List<Integer> p = getPermutation();
+    for (int i = 0; i < radixes.size(); i++) {
+      if (digits.size() <= i) return result;
+      result += factor * digits.get(p.get(i));
+      factor *= radixes.get(p.get(i));
     }
-    
-    /**
-     * Set the value of this number to equal that of the specified integer.
-     * @param v The ordinary integer value of this number.
-     */
-    public void set(int v) {
-        int temp = v;
-        int count = 0;
-        for (int radix : radixes) {
-            if (count >= digits.size()) {
-                digits.add(temp % radix);
-            } else {
-                digits.set(count, temp % radix);
-            }
-            count++;
-            temp = temp / radix;
-        }
+    return result;
+  }
+
+  /**
+   * Return the number of digits in this mixed radix number. This is the size of the radixes list.
+   */
+  public int numDigits() {
+    return radixes.size();
+  }
+
+  /**
+   * Set the value of this number to equal that of the specified integer.
+   *
+   * @param v The ordinary integer value of this number.
+   */
+  public void set(int v) {
+    int temp = v;
+    int count = 0;
+    for (int radix : radixes) {
+      if (count >= digits.size()) {
+        digits.add(temp % radix);
+      } else {
+        digits.set(count, temp % radix);
+      }
+      count++;
+      temp = temp / radix;
     }
-    
-    /**
-     * Set the magnitude of this number to equal that of the specified integer,
-     * which is the number of times that increment must be invoked from zero
-     * for the value returned by {@link #get()} to equal v.
-     * @param v The new magnitude of this number.
-     */
-    public void setMagnitude(int v) {
-        int temp = v;
-        for (int i = 0; i < radixes.size(); i++) {
-            int p = getPermutation().get(i);
-            while (digits.size() < p + 1) digits.add(0);
-            digits.set(p, temp % radixes.get(p));
-            temp = temp / radixes.get(p);
-        }
+  }
+
+  /**
+   * Set the magnitude of this number to equal that of the specified integer, which is the number of
+   * times that increment must be invoked from zero for the value returned by {@link #get()} to
+   * equal v.
+   *
+   * @param v The new magnitude of this number.
+   */
+  public void setMagnitude(int v) {
+    int temp = v;
+    for (int i = 0; i < radixes.size(); i++) {
+      int p = getPermutation().get(i);
+      while (digits.size() < p + 1) digits.add(0);
+      digits.set(p, temp % radixes.get(p));
+      temp = temp / radixes.get(p);
     }
-    
-    /**
-     * Give a string representation of the number, where each digit is
-     * represented as n%r, where r is the radix.
-     */
-    @Override
-    public String toString() {
-        List<String> pieces = new LinkedList<String>();
-        Iterator<Integer> radixIterator = radixes.iterator();
-        for (int digit : digits) {
-            if (! radixIterator.hasNext()) {
-                pieces.add(digit + "%infinity");
-            } else {
-                pieces.add(digit + "%" + radixIterator.next());
-            }
-        }
-        return String.join(", ", pieces);
+  }
+
+  /**
+   * Give a string representation of the number, where each digit is represented as n%r, where r is
+   * the radix.
+   */
+  @Override
+  public String toString() {
+    List<String> pieces = new LinkedList<String>();
+    Iterator<Integer> radixIterator = radixes.iterator();
+    for (int digit : digits) {
+      if (!radixIterator.hasNext()) {
+        pieces.add(digit + "%infinity");
+      } else {
+        pieces.add(digit + "%" + radixIterator.next());
+      }
     }
+    return String.join(", ", pieces);
+  }
 
-    //////////////////////////////////////////////////////////
-    //// Private variables
+  //////////////////////////////////////////////////////////
+  //// Private variables
 
-    private List<Integer> radixes;
-    private List<Integer> digits;
-    private List<Integer> permutation;
+  private List<Integer> radixes;
+  private List<Integer> digits;
+  private List<Integer> permutation;
 }
diff --git a/org.lflang/src/org/lflang/generator/ModeInstance.java b/org.lflang/src/org/lflang/generator/ModeInstance.java
index 1f30f25802..932683f0ed 100644
--- a/org.lflang/src/org/lflang/generator/ModeInstance.java
+++ b/org.lflang/src/org/lflang/generator/ModeInstance.java
@@ -1,215 +1,206 @@
 /*************
-Copyright (c) 2021, Kiel University.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2021, Kiel University.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
 import java.util.LinkedList;
 import java.util.List;
-
 import org.lflang.lf.Mode;
 import org.lflang.lf.ModeTransition;
 import org.lflang.lf.VarRef;
 
 /**
  * Representation of a runtime instance of a mode.
- *  
+ *
  * @author Alexander Schulz-Rosengarten
  */
 public class ModeInstance extends NamedInstance<Mode> {
 
-    /**
-     * Create a new reaction instance from the specified definition
-     * within the specified parent. This constructor should be called
-     * only by the ReactorInstance class after all other contents
-     * (reactions, etc.) are registered because this constructor call
-     * will look them up.
-     * @param definition A mode definition.
-     * @param parent The parent reactor instance, which cannot be null.
-     */
-    protected ModeInstance(Mode definition, ReactorInstance parent) {
-        super(definition, parent);
-        
-        collectMembers();
+  /**
+   * Create a new reaction instance from the specified definition within the specified parent. This
+   * constructor should be called only by the ReactorInstance class after all other contents
+   * (reactions, etc.) are registered because this constructor call will look them up.
+   *
+   * @param definition A mode definition.
+   * @param parent The parent reactor instance, which cannot be null.
+   */
+  protected ModeInstance(Mode definition, ReactorInstance parent) {
+    super(definition, parent);
+
+    collectMembers();
+  }
+
+  ////////////////////////////////////////////////////
+  // Member fields.
+
+  /** The action instances belonging to this mode instance. */
+  public List<ActionInstance> actions = new LinkedList<ActionInstance>();
+
+  /** The reactor instances belonging to this mode instance, in order of declaration. */
+  public List<ReactorInstance> instantiations = new LinkedList<ReactorInstance>();
+
+  /** List of reaction instances for this reactor instance. */
+  public List<ReactionInstance> reactions = new LinkedList<ReactionInstance>();
+
+  /** The timer instances belonging to this reactor instance. */
+  public List<TimerInstance> timers = new LinkedList<TimerInstance>();
+
+  /** The outgoing transitions of this mode. */
+  public List<Transition> transitions = new LinkedList<Transition>();
+
+  ////////////////////////////////////////////////////
+  // Public methods.
+
+  /**
+   * Return the name of this mode.
+   *
+   * @return The name of this mode.
+   */
+  @Override
+  public String getName() {
+    return this.definition.getName();
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public ReactorInstance root() {
+    return parent.root();
+  }
+
+  /** Return a descriptive string. */
+  @Override
+  public String toString() {
+    return getName() + " of " + parent.getFullName();
+  }
+
+  /** Returns true iff this mode is the initial mode of this reactor instance. */
+  public boolean isInitial() {
+    return definition.isInitial();
+  }
+
+  /**
+   * Sets up all transitions that leave this mode. Requires that all mode instances and other
+   * contents (reactions, etc.) of the parent reactor are created.
+   */
+  public void setupTranstions() {
+    transitions.clear();
+    for (var reaction : reactions) {
+      for (var effect : reaction.definition.getEffects()) {
+        if (effect instanceof VarRef) {
+          var target = effect.getVariable();
+          if (target instanceof Mode) {
+            transitions.add(
+                new Transition(this, parent.lookupModeInstance((Mode) target), reaction, effect));
+          }
+        }
+      }
     }
-    
-    ////////////////////////////////////////////////////
-    // Member fields.
-    
-    /** The action instances belonging to this mode instance. */
-    public List<ActionInstance> actions = new LinkedList<ActionInstance>();
-    
-    /** The reactor instances belonging to this mode instance, in order of declaration. */
-    public List<ReactorInstance> instantiations = new LinkedList<ReactorInstance>();
-
-    /** List of reaction instances for this reactor instance. */
-    public List<ReactionInstance> reactions = new LinkedList<ReactionInstance>();
-
-    /** The timer instances belonging to this reactor instance. */
-    public List<TimerInstance> timers = new LinkedList<TimerInstance>();
-    
-    /** The outgoing transitions of this mode. */
-    public List<Transition> transitions = new LinkedList<Transition>();
-
-    ////////////////////////////////////////////////////
-    // Public methods.
-    
-    /**
-     * Return the name of this mode.
-     * @return The name of this mode.
-     */
-    @Override
-    public String getName() {
-        return this.definition.getName();
+  }
+
+  /** Returns true iff this mode contains the given instance. */
+  public boolean contains(NamedInstance<?> instance) {
+    if (instance instanceof TimerInstance) {
+      return timers.contains(instance);
+    } else if (instance instanceof ActionInstance) {
+      return actions.contains(instance);
+    } else if (instance instanceof ReactorInstance) {
+      return instantiations.contains(instance);
+    } else if (instance instanceof ReactionInstance) {
+      return reactions.contains(instance);
+    } else {
+      return false;
     }
-    
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public ReactorInstance root() {
-        return parent.root();
+  }
+
+  ////////////////////////////////////////////////////
+  // Private methods.
+
+  private void collectMembers() {
+    // Collect timers
+    for (var decl : definition.getTimers()) {
+      var instance = parent.lookupTimerInstance(decl);
+      if (instance != null) {
+        this.timers.add(instance);
+      }
     }
 
-    /**
-     * Return a descriptive string.
-     */
-    @Override
-    public String toString() {
-        return getName() + " of " + parent.getFullName();
+    // Collect actions
+    for (var decl : definition.getActions()) {
+      var instance = parent.lookupActionInstance(decl);
+      if (instance != null) {
+        this.actions.add(instance);
+      }
     }
-    
-    /**
-     * Returns true iff this mode is the initial mode of this reactor instance.
-     */
-    public boolean isInitial() {
-        return definition.isInitial();
+
+    // Collect reactor instantiation
+    for (var decl : definition.getInstantiations()) {
+      var instance = parent.lookupReactorInstance(decl);
+      if (instance != null) {
+        this.instantiations.add(instance);
+      }
     }
-    
-    /**
-     * Sets up all transitions that leave this mode.
-     * Requires that all mode instances and other contents
-     * (reactions, etc.) of the parent reactor are created.
-     */
-    public void setupTranstions() {
-        transitions.clear();
-        for (var reaction : reactions) {
-            for (var effect : reaction.definition.getEffects()) {
-                if (effect instanceof VarRef) {
-                    var target = effect.getVariable();
-                    if (target instanceof Mode) {
-                        transitions.add(new Transition(this, parent.lookupModeInstance((Mode) target), reaction, effect));
-                    }
-                }
-            }
-        }
+
+    // Collect reactions
+    for (var decl : definition.getReactions()) {
+      var instance = parent.lookupReactionInstance(decl);
+      if (instance != null) {
+        this.reactions.add(instance);
+      }
     }
-    
-    /**
-     * Returns true iff this mode contains the given instance.
-     */
-    public boolean contains(NamedInstance<?> instance) {
-        if (instance instanceof TimerInstance) {
-            return timers.contains(instance);
-        } else if (instance instanceof ActionInstance) {
-            return actions.contains(instance);
-        } else if (instance instanceof ReactorInstance) {
-            return instantiations.contains(instance);
-        } else if (instance instanceof ReactionInstance) {
-            return reactions.contains(instance);
-        } else {
-            return false;
-        }
+  }
+
+  ////////////////////////////////////////////////////
+  // Data class.
+
+  public static class Transition extends NamedInstance<VarRef> {
+    public final ModeInstance source;
+    public final ModeInstance target;
+    public final ReactionInstance reaction;
+    public final ModeTransition type;
+
+    Transition(
+        ModeInstance source, ModeInstance target, ReactionInstance reaction, VarRef definition) {
+      super(definition, source.parent);
+      this.source = source;
+      this.target = target;
+      this.reaction = reaction;
+      this.type =
+          definition.getTransition() == null ? ModeTransition.RESET : definition.getTransition();
     }
 
-    ////////////////////////////////////////////////////
-    // Private methods.
-    
-    private void collectMembers() {
-        // Collect timers
-        for (var decl : definition.getTimers()) {
-            var instance = parent.lookupTimerInstance(decl);
-            if (instance != null) {
-                this.timers.add(instance);
-            }
-        }
-        
-        // Collect actions
-        for (var decl : definition.getActions()) {
-            var instance = parent.lookupActionInstance(decl);
-            if (instance != null) {
-                this.actions.add(instance);
-            }
-        }
-        
-        // Collect reactor instantiation
-        for (var decl : definition.getInstantiations()) {
-            var instance = parent.lookupReactorInstance(decl);
-            if (instance != null) {
-                this.instantiations.add(instance);
-            }
-        }
-        
-        // Collect reactions
-        for (var decl : definition.getReactions()) {
-            var instance = parent.lookupReactionInstance(decl);
-            if (instance != null) {
-                this.reactions.add(instance);
-            }
-        }
+    @Override
+    public String getName() {
+      return this.source.getName() + " -> " + this.target + " by " + this.reaction.getName();
     }
-    
-    ////////////////////////////////////////////////////
-    // Data class.
-    
-    public static class Transition extends NamedInstance<VarRef> {
-        public final ModeInstance source;
-        public final ModeInstance target;
-        public final ReactionInstance reaction;
-        public final ModeTransition type;
-        
-        Transition(ModeInstance source, ModeInstance target, ReactionInstance reaction, VarRef definition) {
-            super(definition, source.parent);
-            this.source = source;
-            this.target = target;
-            this.reaction = reaction;
-            this.type = definition.getTransition() == null ? ModeTransition.RESET : definition.getTransition();
-        }
-        
-        @Override
-        public String getName() {
-            return this.source.getName() + " -> " + this.target + " by " + this.reaction.getName();
-        }
-        
-        @Override
-        public ReactorInstance root() {
-            return this.parent.root();
-        }
-        
-        public ModeTransition getType() {
-            return type;
-        }
-        
+
+    @Override
+    public ReactorInstance root() {
+      return this.parent.root();
+    }
+
+    public ModeTransition getType() {
+      return type;
     }
-    
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/NamedInstance.java b/org.lflang/src/org/lflang/generator/NamedInstance.java
index 1d8c37321f..3455bcdf40 100644
--- a/org.lflang/src/org/lflang/generator/NamedInstance.java
+++ b/org.lflang/src/org/lflang/generator/NamedInstance.java
@@ -1,337 +1,319 @@
 /* Base class for instances with names in Lingua Franca. */
 
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-
 import org.eclipse.emf.ecore.EObject;
 
-/** 
- * Base class for compile-time instances with names in Lingua Franca.
- * An instance of concrete subclasses of this class represents one or
- * more runtime instances of a reactor, port, reaction, etc. There
- * will be more than one runtime instance if the object or any of its
- * parents is a bank of reactors.
- *  
+/**
+ * Base class for compile-time instances with names in Lingua Franca. An instance of concrete
+ * subclasses of this class represents one or more runtime instances of a reactor, port, reaction,
+ * etc. There will be more than one runtime instance if the object or any of its parents is a bank
+ * of reactors.
+ *
  * @author Marten Lohstroh
  * @author Edward A. Lee
  */
 public abstract class NamedInstance<T extends EObject> {
-        
-    /**
-     * Construct a new instance with the specified definition
-     * and parent. E.g., for a reactor instance, the definition
-     * is Instantiation, and for a port instance, it is Port. These are
-     * nodes in the AST. This is protected because only subclasses
-     * should be constructed.
-     * @param definition The definition in the AST for this instance.
-     * @param parent The reactor instance that creates this instance.
-     */
-    protected NamedInstance(T definition, ReactorInstance parent) {
-        this.definition = definition;
-        this.parent = parent;
-
-        // Calculate the depth.
-        this.depth = 0;
-        ReactorInstance p = parent;
-        while (p != null) {
-            p = p.parent;
-            this.depth++;
-        }
-    }
-    
-    //////////////////////////////////////////////////////
-    //// Public fields.
-        
-    /** A limit on the number of characters returned by uniqueID. */
-    public static int identifierLengthLimit = 40;
-    
-    //////////////////////////////////////////////////////
-    //// Public methods.
-
-    /**
-     * Return the definition, which is the AST node for this object.
-     */
-    public T getDefinition() {
-        return definition;
-    }
-    
-    /**
-     * Get the depth of the reactor instance. This is 0 for the main reactor,
-     * 1 for reactors immediately contained therein, etc.
-     */
-    public int getDepth() {
-        return depth;
-    }
-    
-    /** 
-     * Return the full name of this instance, which has the form
-     * "a.b.c", where "c" is the name of this instance, "b" is the name
-     * of its container, and "a" is the name of its container, stopping
-     * at the container in main. If any reactor in the hierarchy is
-     * in a bank of reactors then, it will appear as a[index].
-     * Similarly, if c is a port in a multiport, it will appear as
-     * c[index].
-     * @return The full name of this instance.
-     */
-    public String getFullName() {
-        return getFullNameWithJoiner(".");
-    }
-    
-    /**
-     * Return the name of this instance as given in its definition.
-     * Note that this is unique only relative to other instances with
-     * the same parent.
-     * @return The name of this instance within its parent.
-     */
-    public abstract String getName();
-    
-    /**
-     * Return the parent or null if this is a top-level reactor.
-     */
-    public ReactorInstance getParent() {
-        return parent;
-    }
-    
-    /**
-     * Return the parent at the given depth or null if there is
-     * no parent at the given depth.
-     * @param d The depth.
-     */
-    public ReactorInstance getParent(int d) {
-        if (d >= depth || d < 0) return null;
-        ReactorInstance p = parent;
-        while (p != null) {
-            if (p.depth == d) return p;
-            p = p.parent;
-        }
-        return null;
+
+  /**
+   * Construct a new instance with the specified definition and parent. E.g., for a reactor
+   * instance, the definition is Instantiation, and for a port instance, it is Port. These are nodes
+   * in the AST. This is protected because only subclasses should be constructed.
+   *
+   * @param definition The definition in the AST for this instance.
+   * @param parent The reactor instance that creates this instance.
+   */
+  protected NamedInstance(T definition, ReactorInstance parent) {
+    this.definition = definition;
+    this.parent = parent;
+
+    // Calculate the depth.
+    this.depth = 0;
+    ReactorInstance p = parent;
+    while (p != null) {
+      p = p.parent;
+      this.depth++;
     }
+  }
+
+  //////////////////////////////////////////////////////
+  //// Public fields.
+
+  /** A limit on the number of characters returned by uniqueID. */
+  public static int identifierLengthLimit = 40;
+
+  //////////////////////////////////////////////////////
+  //// Public methods.
+
+  /** Return the definition, which is the AST node for this object. */
+  public T getDefinition() {
+    return definition;
+  }
 
-    /**
-     * Return the width of this instance, which in this base class is 1.
-     * Subclasses PortInstance and ReactorInstance change this to the
-     * multiport and bank widths respectively.
-     */
-    public int getWidth() {
-        return width;
+  /**
+   * Get the depth of the reactor instance. This is 0 for the main reactor, 1 for reactors
+   * immediately contained therein, etc.
+   */
+  public int getDepth() {
+    return depth;
+  }
+
+  /**
+   * Return the full name of this instance, which has the form "a.b.c", where "c" is the name of
+   * this instance, "b" is the name of its container, and "a" is the name of its container, stopping
+   * at the container in main. If any reactor in the hierarchy is in a bank of reactors then, it
+   * will appear as a[index]. Similarly, if c is a port in a multiport, it will appear as c[index].
+   *
+   * @return The full name of this instance.
+   */
+  public String getFullName() {
+    return getFullNameWithJoiner(".");
+  }
+
+  /**
+   * Return the name of this instance as given in its definition. Note that this is unique only
+   * relative to other instances with the same parent.
+   *
+   * @return The name of this instance within its parent.
+   */
+  public abstract String getName();
+
+  /** Return the parent or null if this is a top-level reactor. */
+  public ReactorInstance getParent() {
+    return parent;
+  }
+
+  /**
+   * Return the parent at the given depth or null if there is no parent at the given depth.
+   *
+   * @param d The depth.
+   */
+  public ReactorInstance getParent(int d) {
+    if (d >= depth || d < 0) return null;
+    ReactorInstance p = parent;
+    while (p != null) {
+      if (p.depth == d) return p;
+      p = p.parent;
     }
-    
-    /**
-     * Return true if this instance has the specified parent
-     * (possibly indirectly, anywhere up the hierarchy).
-     */
-    public boolean hasParent(ReactorInstance container) {
-        
-        ReactorInstance p = parent;
-        
-        while (p != null) {
-            if (p == container) return true;
-            p = p.parent;
-        }
-        return false;
+    return null;
+  }
+
+  /**
+   * Return the width of this instance, which in this base class is 1. Subclasses PortInstance and
+   * ReactorInstance change this to the multiport and bank widths respectively.
+   */
+  public int getWidth() {
+    return width;
+  }
+
+  /**
+   * Return true if this instance has the specified parent (possibly indirectly, anywhere up the
+   * hierarchy).
+   */
+  public boolean hasParent(ReactorInstance container) {
+
+    ReactorInstance p = parent;
+
+    while (p != null) {
+      if (p == container) return true;
+      p = p.parent;
     }
-    
-    /**
-     * Return a list of all the parents starting with the root().
-     */
-    public List<ReactorInstance> parents() {
-        List<ReactorInstance> result = new ArrayList<ReactorInstance>(depth + 1);
-        if (this instanceof ReactorInstance && parent == null) {
-            // This is the top level, so it must be a reactor.
-            result.add((ReactorInstance) this);
-        }
-        ReactorInstance container = parent;
-        while (container != null) {
-            result.add(container);
-            container = container.parent;
-        }
-        return result;
+    return false;
+  }
+
+  /** Return a list of all the parents starting with the root(). */
+  public List<ReactorInstance> parents() {
+    List<ReactorInstance> result = new ArrayList<ReactorInstance>(depth + 1);
+    if (this instanceof ReactorInstance && parent == null) {
+      // This is the top level, so it must be a reactor.
+      result.add((ReactorInstance) this);
     }
-    
-    /**
-     * Return the root reactor, which is the top-level parent.
-     * @return The top-level parent.
-     */
-    public ReactorInstance root() {
-        if (parent != null) {
-            return parent.root();
-        } else {
-            return (ReactorInstance)this;
-        }
+    ReactorInstance container = parent;
+    while (container != null) {
+      result.add(container);
+      container = container.parent;
     }
-            
-    /**
-     * Set the width. This method is here for testing only and should
-     * not be used for any other purpose.
-     * @param width The new width.
-     */
-    public void setWidth(int width) {
-        this.width = width;
+    return result;
+  }
+
+  /**
+   * Return the root reactor, which is the top-level parent.
+   *
+   * @return The top-level parent.
+   */
+  public ReactorInstance root() {
+    if (parent != null) {
+      return parent.root();
+    } else {
+      return (ReactorInstance) this;
     }
+  }
 
-    /**
-     * Return an identifier for this instance, which has the form "a_b_c"
-     * or "a_b_c_n", where "c" is the name of this instance, "b" is the name
-     * of its container, and "a" is the name of its container, stopping
-     * at the container in main. All names are converted to lower case.
-     * The suffix _n is usually omitted, but it is possible to get name
-     * collisions using the above scheme, in which case _n will be an
-     * increasing integer until there is no collision.
-     * If the length of the root of the name as calculated above (the root
-     * is without the _n suffix) is longer than
-     * the static variable identifierLengthLimit, then the name will be
-     * truncated. The returned name will be the tail of the name calculated
-     * above with the prefix '_'.
-     * @return An identifier for this instance that is guaranteed to be
-     *  unique within the top-level parent.
-     */
-    public String uniqueID() {
-        if (_uniqueID == null) {
-            // Construct the unique ID only if it has not been
-            // previously constructed.
-            String prefix = getFullNameWithJoiner("_").toLowerCase();
-            
-            // Replace all non-alphanumeric (Latin) characters with underscore.
-            prefix = prefix.replaceAll("[^A-Za-z0-9]", "_");
-            
-            // Truncate, if necessary.
-            if (prefix.length() > identifierLengthLimit) {
-                prefix = '_' 
-                    + prefix.substring(prefix.length() - identifierLengthLimit + 1);
-            }
-            
-            // Ensure uniqueness.
-            ReactorInstance toplevel = root();
-            if (toplevel.uniqueIDCount == null) {
-                toplevel.uniqueIDCount = new HashMap<String,Integer>();
-            }
-            var count = toplevel.uniqueIDCount.get(prefix);
-            if (count == null) {
-                toplevel.uniqueIDCount.put(prefix, 1);
-                _uniqueID = prefix;
-            } else {
-                toplevel.uniqueIDCount.put(prefix, count + 1);
-                // NOTE: The length of this name could exceed
-                // identifierLengthLimit. Is this OK?
-                _uniqueID = prefix + '_' + (count + 1);
-            }
-        }
-        return _uniqueID;
+  /**
+   * Set the width. This method is here for testing only and should not be used for any other
+   * purpose.
+   *
+   * @param width The new width.
+   */
+  public void setWidth(int width) {
+    this.width = width;
+  }
+
+  /**
+   * Return an identifier for this instance, which has the form "a_b_c" or "a_b_c_n", where "c" is
+   * the name of this instance, "b" is the name of its container, and "a" is the name of its
+   * container, stopping at the container in main. All names are converted to lower case. The suffix
+   * _n is usually omitted, but it is possible to get name collisions using the above scheme, in
+   * which case _n will be an increasing integer until there is no collision. If the length of the
+   * root of the name as calculated above (the root is without the _n suffix) is longer than the
+   * static variable identifierLengthLimit, then the name will be truncated. The returned name will
+   * be the tail of the name calculated above with the prefix '_'.
+   *
+   * @return An identifier for this instance that is guaranteed to be unique within the top-level
+   *     parent.
+   */
+  public String uniqueID() {
+    if (_uniqueID == null) {
+      // Construct the unique ID only if it has not been
+      // previously constructed.
+      String prefix = getFullNameWithJoiner("_").toLowerCase();
+
+      // Replace all non-alphanumeric (Latin) characters with underscore.
+      prefix = prefix.replaceAll("[^A-Za-z0-9]", "_");
+
+      // Truncate, if necessary.
+      if (prefix.length() > identifierLengthLimit) {
+        prefix = '_' + prefix.substring(prefix.length() - identifierLengthLimit + 1);
+      }
+
+      // Ensure uniqueness.
+      ReactorInstance toplevel = root();
+      if (toplevel.uniqueIDCount == null) {
+        toplevel.uniqueIDCount = new HashMap<String, Integer>();
+      }
+      var count = toplevel.uniqueIDCount.get(prefix);
+      if (count == null) {
+        toplevel.uniqueIDCount.put(prefix, 1);
+        _uniqueID = prefix;
+      } else {
+        toplevel.uniqueIDCount.put(prefix, count + 1);
+        // NOTE: The length of this name could exceed
+        // identifierLengthLimit. Is this OK?
+        _uniqueID = prefix + '_' + (count + 1);
+      }
     }
-    
-    /**
-     * Returns the directly/indirectly enclosing mode.
-     * @param direct flag whether to check only for direct enclosing mode
-     *   or also consider modes of parent reactor instances.
-     * @return The mode, if any, null otherwise.
-     */
-    public ModeInstance getMode(boolean direct) {
-        ModeInstance mode = null;
-        if (parent != null) {
-            if (!parent.modes.isEmpty()) {
-                mode = parent.modes.stream().filter(it -> it.contains(this)).findFirst().orElse(null);
-            }
-            if (mode == null && !direct) {
-                mode = parent.getMode(false);
-            }
-        }
-        return mode;
+    return _uniqueID;
+  }
+
+  /**
+   * Returns the directly/indirectly enclosing mode.
+   *
+   * @param direct flag whether to check only for direct enclosing mode or also consider modes of
+   *     parent reactor instances.
+   * @return The mode, if any, null otherwise.
+   */
+  public ModeInstance getMode(boolean direct) {
+    ModeInstance mode = null;
+    if (parent != null) {
+      if (!parent.modes.isEmpty()) {
+        mode = parent.modes.stream().filter(it -> it.contains(this)).findFirst().orElse(null);
+      }
+      if (mode == null && !direct) {
+        mode = parent.getMode(false);
+      }
     }
+    return mode;
+  }
 
-    //////////////////////////////////////////////////////
-    //// Protected fields.
-
-    /** The Instantiation AST object from which this was created. */
-    T definition;
-
-    /** The reactor instance that creates this instance. */
-    ReactorInstance parent;
-
-    /**
-     * Map from a name of the form a_b_c to the number of
-     * unique IDs with that prefix that have been already
-     * assigned. If none have been assigned, then there is
-     * no entry in this map. This map should be non-null only
-     * for the main reactor (the top level).
-     */
-    HashMap<String,Integer> uniqueIDCount;
-
-    /** 
-     * The width of this instance. This is 1 for everything
-     * except a PortInstance representing a multiport and a
-     * ReactorInstance representing a bank.
-     */
-    int width = 1;
-
-    //////////////////////////////////////////////////////
-    //// Protected methods.
-
-    /**
-     * Return a string of the form
-     * "a.b.c", where "." is replaced by the specified joiner,
-     * "c" is the name of this instance, "b" is the name
-     * of its container, and "a" is the name of its container, stopping
-     * at the container in main.
-     * @return A string representing this instance.
-     */
-    protected String getFullNameWithJoiner(String joiner) {
-        // This is not cached because _uniqueID is cached.
-        if (parent == null) {
-            return this.getName();
-        } else if (getMode(true) != null) {
-            return parent.getFullNameWithJoiner(joiner) + joiner + getMode(true).getName() + joiner + this.getName();
-        } else {
-            return parent.getFullNameWithJoiner(joiner) + joiner + this.getName();
-        }
+  //////////////////////////////////////////////////////
+  //// Protected fields.
+
+  /** The Instantiation AST object from which this was created. */
+  T definition;
+
+  /** The reactor instance that creates this instance. */
+  ReactorInstance parent;
+
+  /**
+   * Map from a name of the form a_b_c to the number of unique IDs with that prefix that have been
+   * already assigned. If none have been assigned, then there is no entry in this map. This map
+   * should be non-null only for the main reactor (the top level).
+   */
+  HashMap<String, Integer> uniqueIDCount;
+
+  /**
+   * The width of this instance. This is 1 for everything except a PortInstance representing a
+   * multiport and a ReactorInstance representing a bank.
+   */
+  int width = 1;
+
+  //////////////////////////////////////////////////////
+  //// Protected methods.
+
+  /**
+   * Return a string of the form "a.b.c", where "." is replaced by the specified joiner, "c" is the
+   * name of this instance, "b" is the name of its container, and "a" is the name of its container,
+   * stopping at the container in main.
+   *
+   * @return A string representing this instance.
+   */
+  protected String getFullNameWithJoiner(String joiner) {
+    // This is not cached because _uniqueID is cached.
+    if (parent == null) {
+      return this.getName();
+    } else if (getMode(true) != null) {
+      return parent.getFullNameWithJoiner(joiner)
+          + joiner
+          + getMode(true).getName()
+          + joiner
+          + this.getName();
+    } else {
+      return parent.getFullNameWithJoiner(joiner) + joiner + this.getName();
     }
+  }
+
+  //////////////////////////////////////////////////////
+  //// Protected fields.
+
+  /**
+   * The depth in the hierarchy of this instance. This is 0 for main or federated, 1 for the
+   * reactors immediately contained, etc.
+   */
+  protected int depth = 0;
+
+  //////////////////////////////////////////////////////
+  //// Private fields.
+
+  /** The full name of this instance. */
+  private String _fullName = null;
 
-    //////////////////////////////////////////////////////
-    //// Protected fields.
-
-    /**
-     * The depth in the hierarchy of this instance.
-     * This is 0 for main or federated, 1 for the reactors immediately contained, etc.
-     */
-    protected int depth = 0;
-
-    //////////////////////////////////////////////////////
-    //// Private fields.
-    
-    /**
-     * The full name of this instance.
-     */
-    private String _fullName = null;
-    
-    /**
-     * Unique ID for this instance. This is null until
-     * uniqueID() is called.
-     */
-    private String _uniqueID = null;
-}
\ No newline at end of file
+  /** Unique ID for this instance. This is null until uniqueID() is called. */
+  private String _uniqueID = null;
+}
diff --git a/org.lflang/src/org/lflang/generator/ParameterInstance.java b/org.lflang/src/org/lflang/generator/ParameterInstance.java
index 851fcb627e..92a1b03ed4 100644
--- a/org.lflang/src/org/lflang/generator/ParameterInstance.java
+++ b/org.lflang/src/org/lflang/generator/ParameterInstance.java
@@ -1,121 +1,118 @@
 /** A data structure for a parameter instance. */
 
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
 import java.util.List;
 import java.util.Optional;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.InferredType;
+import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Assignment;
 import org.lflang.lf.Initializer;
 import org.lflang.lf.Parameter;
 
 /**
- * Representation of a compile-time instance of a parameter.
- * Upon creation, it is checked whether this parameter is overridden by an
- * assignment in the instantiation that this parameter instance is a result of.
- * If it is overridden, the parameter gets initialized using the value looked up
- * in the instantiation hierarchy.
+ * Representation of a compile-time instance of a parameter. Upon creation, it is checked whether
+ * this parameter is overridden by an assignment in the instantiation that this parameter instance
+ * is a result of. If it is overridden, the parameter gets initialized using the value looked up in
+ * the instantiation hierarchy.
+ *
  * @author Marten Lohstroh
  * @author Edward A. Lee
  */
 public class ParameterInstance extends NamedInstance<Parameter> {
 
-    /**
-     * Create a runtime instance from the specified definition
-     * and with the specified parent that instantiated it.
-     * @param definition The declaration in the AST.
-     * @param parent The reactor instance this parameter is a part of.
-     */
-    public ParameterInstance(Parameter definition, ReactorInstance parent) {
-        super(definition, parent);
-        if (parent == null) {
-            throw new InvalidSourceException("Cannot create a ParameterInstance with no parent.");
-        }
-
-        this.type = ASTUtils.getInferredType(definition);
-    }
-
-    /////////////////////////////////////////////
-    //// Public Fields
-
-    public InferredType type;
-
-    /////////////////////////////////////////////
-    //// Public Methods
-
-    /**
-     * Get the initial value of this parameter.
-     */
-    private Initializer getInitialValue() {
-        return definition.getInit();
-    }
-
-    /**
-     * Return the (possibly overridden) value of this parameter
-     * in the containing instance. Parameter references are resolved
-     * to actual expressions.
-     */
-    public Initializer getActualValue() {
-        Assignment override = getOverride();
-        Initializer init;
-        if (override != null) {
-            init = override.getRhs();
-        } else {
-            init = getInitialValue();
-        }
-        return init;
-    }
-
-    /**
-     * Return the name of this parameter.
-     * @return The name of this parameter.
-     */
-    public String getName() {
-        return this.definition.getName();
-    }
-
-    /**
-     * Return the assignment that overrides this parameter in
-     * the parent's instantiation or null if there is no override.
-     */
-    public Assignment getOverride() {
-        List<Assignment> assignments = parent.definition.getParameters();
-        Optional<Assignment> assignment = assignments.stream().filter(
-            it -> it.getLhs() == definition
-        ).findFirst();
-        return assignment.orElse(null);
+  /**
+   * Create a runtime instance from the specified definition and with the specified parent that
+   * instantiated it.
+   *
+   * @param definition The declaration in the AST.
+   * @param parent The reactor instance this parameter is a part of.
+   */
+  public ParameterInstance(Parameter definition, ReactorInstance parent) {
+    super(definition, parent);
+    if (parent == null) {
+      throw new InvalidSourceException("Cannot create a ParameterInstance with no parent.");
     }
 
-    /** Return a descriptive string. */
-    @Override
-    public String toString() {
-        return "ParameterInstance " + getFullName();
+    this.type = ASTUtils.getInferredType(definition);
+  }
+
+  /////////////////////////////////////////////
+  //// Public Fields
+
+  public InferredType type;
+
+  /////////////////////////////////////////////
+  //// Public Methods
+
+  /** Get the initial value of this parameter. */
+  private Initializer getInitialValue() {
+    return definition.getInit();
+  }
+
+  /**
+   * Return the (possibly overridden) value of this parameter in the containing instance. Parameter
+   * references are resolved to actual expressions.
+   */
+  public Initializer getActualValue() {
+    Assignment override = getOverride();
+    Initializer init;
+    if (override != null) {
+      init = override.getRhs();
+    } else {
+      init = getInitialValue();
     }
+    return init;
+  }
+
+  /**
+   * Return the name of this parameter.
+   *
+   * @return The name of this parameter.
+   */
+  public String getName() {
+    return this.definition.getName();
+  }
+
+  /**
+   * Return the assignment that overrides this parameter in the parent's instantiation or null if
+   * there is no override.
+   */
+  public Assignment getOverride() {
+    List<Assignment> assignments = parent.definition.getParameters();
+    Optional<Assignment> assignment =
+        assignments.stream().filter(it -> it.getLhs() == definition).findFirst();
+    return assignment.orElse(null);
+  }
+
+  /** Return a descriptive string. */
+  @Override
+  public String toString() {
+    return "ParameterInstance " + getFullName();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/PortInstance.java b/org.lflang/src/org/lflang/generator/PortInstance.java
index 57dbdcf73d..60a904ef5b 100644
--- a/org.lflang/src/org/lflang/generator/PortInstance.java
+++ b/org.lflang/src/org/lflang/generator/PortInstance.java
@@ -1,35 +1,34 @@
 /** A data structure for a port instance. */
 
 /*************
-Copyright (c) 2019-2022, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019-2022, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.generator;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.PriorityQueue;
-
 import org.lflang.ErrorReporter;
 import org.lflang.lf.Input;
 import org.lflang.lf.Output;
@@ -38,422 +37,404 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.lf.WidthSpec;
 import org.lflang.lf.WidthTerm;
 
-/** 
- * Representation of a compile-time instance of a port.
- * Like {@link ReactorInstance}, if one or more parents of this port
- * is a bank of reactors, then there will be more than one runtime instance
+/**
+ * Representation of a compile-time instance of a port. Like {@link ReactorInstance}, if one or more
+ * parents of this port is a bank of reactors, then there will be more than one runtime instance
  * corresponding to this compile-time instance.
- * 
- * This may be a single port or a multiport. If it is a multiport, then
- * one instance of this PortInstance class represents all channels.
- * If in addition any parent is a bank, then it represents all channels of all
- * bank members. The {@link #eventualDestinations()} and {@link #eventualSources()}
- * functions report the connectivity of all such channels as lists of
- * {@link SendRange} and {@link RuntimeRange} objects.
- *  
+ *
+ * <p>This may be a single port or a multiport. If it is a multiport, then one instance of this
+ * PortInstance class represents all channels. If in addition any parent is a bank, then it
+ * represents all channels of all bank members. The {@link #eventualDestinations()} and {@link
+ * #eventualSources()} functions report the connectivity of all such channels as lists of {@link
+ * SendRange} and {@link RuntimeRange} objects.
+ *
  * @author Marten Lohstroh
  * @author Edward A. Lee
  */
 public class PortInstance extends TriggerInstance<Port> {
 
-    /**
-     * Create a runtime instance from the specified definition
-     * and with the specified parent that instantiated it.
-     * @param definition The declaration in the AST.
-     * @param parent The parent.
-     */
-    public PortInstance(Port definition, ReactorInstance parent) {
-        this(definition, parent, null);
-    }
+  /**
+   * Create a runtime instance from the specified definition and with the specified parent that
+   * instantiated it.
+   *
+   * @param definition The declaration in the AST.
+   * @param parent The parent.
+   */
+  public PortInstance(Port definition, ReactorInstance parent) {
+    this(definition, parent, null);
+  }
 
-    /**
-     * Create a port instance from the specified definition
-     * and with the specified parent that instantiated it.
-     * @param definition The declaration in the AST.
-     * @param parent The parent.
-     * @param errorReporter An error reporter, or null to throw exceptions.
-     */
-    public PortInstance(Port definition, ReactorInstance parent, ErrorReporter errorReporter) {
-        super(definition, parent);
-        
-        if (parent == null) {
-            throw new NullPointerException("Cannot create a PortInstance with no parent.");
-        }
-        
-        setInitialWidth(errorReporter);
-    }
+  /**
+   * Create a port instance from the specified definition and with the specified parent that
+   * instantiated it.
+   *
+   * @param definition The declaration in the AST.
+   * @param parent The parent.
+   * @param errorReporter An error reporter, or null to throw exceptions.
+   */
+  public PortInstance(Port definition, ReactorInstance parent, ErrorReporter errorReporter) {
+    super(definition, parent);
 
-    //////////////////////////////////////////////////////
-    //// Public methods
-
-    /**
-     * Clear cached information about the connectivity of this port.
-     * In particular, {@link #eventualDestinations()} and {@link #eventualSources()}
-     * cache the lists they return. To force those methods to recompute
-     * their lists, call this method. This method also clears the caches
-     * of any ports that are listed as eventual destinations and sources.
-     */
-    public void clearCaches() {
-        if (clearingCaches) return; // Prevent stack overflow.
-        clearingCaches = true;
-        try {
-            if (eventualSourceRanges != null) {
-                for (RuntimeRange<PortInstance> sourceRange : eventualSourceRanges) {
-                    sourceRange.instance.clearCaches();
-                }
-            }
-            if (eventualDestinationRanges != null) {
-                for (SendRange sendRange : eventualDestinationRanges) {
-                    for (RuntimeRange<PortInstance> destinationRange : sendRange.destinations) {
-                        destinationRange.instance.clearCaches();
-                    }
-                }
-            }
-            eventualDestinationRanges = null;
-            eventualSourceRanges = null;
-        } finally {
-            clearingCaches = false;
-        }
+    if (parent == null) {
+      throw new NullPointerException("Cannot create a PortInstance with no parent.");
     }
 
-    /**
-     * Return a list of ranges of this port, where each range sends
-     * to a list of destination ports that receive data from the range of
-     * this port. Each destination port is annotated with the channel
-     * range on which it receives data.
-     * The ports listed are only ports that are sources for reactions,
-     * not relay ports that the data may go through on the way.
-     * Also, if there is an "after" delay anywhere along the path,
-     * then the destination is not in the resulting list.
-     * 
-     * If this port itself has dependent reactions,
-     * then this port will be included as a destination in all items
-     * on the returned list.
-     * 
-     * Each item in the returned list has the following fields:
-     * <ul>
-     *   <li>{@code startRange}: The starting channel index of this port.</li>
-     *   <li>{@code rangeWidth}: The number of channels sent to the destinations.</li>
-     *   <li>{@code destinations}: A list of port ranges for destination ports, each
-     *   of which has the same width as {@code rangeWidth}.</li>
-     * </ul>
-     *
-     * Each item also has a method, {@link SendRange#getNumberOfDestinationReactors()},
-     * that returns the total number of unique destination reactors for
-     * its range. This is not necessarily the same as the number
-     * of ports in its destinations field because some of the ports may 
-     * share the same container reactor.
-     */
-    public List<SendRange> eventualDestinations() {
-        if (eventualDestinationRanges != null) {
-            return eventualDestinationRanges;
+    setInitialWidth(errorReporter);
+  }
+
+  //////////////////////////////////////////////////////
+  //// Public methods
+
+  /**
+   * Clear cached information about the connectivity of this port. In particular, {@link
+   * #eventualDestinations()} and {@link #eventualSources()} cache the lists they return. To force
+   * those methods to recompute their lists, call this method. This method also clears the caches of
+   * any ports that are listed as eventual destinations and sources.
+   */
+  public void clearCaches() {
+    if (clearingCaches) return; // Prevent stack overflow.
+    clearingCaches = true;
+    try {
+      if (eventualSourceRanges != null) {
+        for (RuntimeRange<PortInstance> sourceRange : eventualSourceRanges) {
+          sourceRange.instance.clearCaches();
         }
-        
-        // Construct the full range for this port.
-        RuntimeRange<PortInstance> range = new RuntimeRange.Port(this);
-        eventualDestinationRanges = eventualDestinations(range);
-        return eventualDestinationRanges;
-    }
-    
-    /**
-     * Return a list of ranges of ports that send data to this port.
-     * If this port is directly written to by one more more reactions,
-     * then it is its own eventual source and only this port
-     * will be represented in the result.
-     * 
-     * If this is not a multiport and is not within a bank, then the list will have
-     * only one item and the range will have a total width of one. Otherwise, it will
-     * have enough items so that the range widths add up to the width of this
-     * multiport multiplied by the total number of instances within containing banks.
-     * 
-     * The ports listed are only ports that are written to by reactions,
-     * not relay ports that the data may go through on the way.
-     */
-    public List<RuntimeRange<PortInstance>> eventualSources() {
-        return eventualSources(new RuntimeRange.Port(this));
+      }
+      if (eventualDestinationRanges != null) {
+        for (SendRange sendRange : eventualDestinationRanges) {
+          for (RuntimeRange<PortInstance> destinationRange : sendRange.destinations) {
+            destinationRange.instance.clearCaches();
+          }
+        }
+      }
+      eventualDestinationRanges = null;
+      eventualSourceRanges = null;
+    } finally {
+      clearingCaches = false;
     }
+  }
 
-    /** 
-     * Return the list of ranges of this port together with the
-     * downstream ports that are connected to this port.
-     * The total with of the ranges in the returned list is a
-     * multiple N >= 0 of the total width of this port.
-     */
-    public List<SendRange> getDependentPorts() {
-        return dependentPorts;
+  /**
+   * Return a list of ranges of this port, where each range sends to a list of destination ports
+   * that receive data from the range of this port. Each destination port is annotated with the
+   * channel range on which it receives data. The ports listed are only ports that are sources for
+   * reactions, not relay ports that the data may go through on the way. Also, if there is an
+   * "after" delay anywhere along the path, then the destination is not in the resulting list.
+   *
+   * <p>If this port itself has dependent reactions, then this port will be included as a
+   * destination in all items on the returned list.
+   *
+   * <p>Each item in the returned list has the following fields:
+   *
+   * <ul>
+   *   <li>{@code startRange}: The starting channel index of this port.
+   *   <li>{@code rangeWidth}: The number of channels sent to the destinations.
+   *   <li>{@code destinations}: A list of port ranges for destination ports, each of which has the
+   *       same width as {@code rangeWidth}.
+   * </ul>
+   *
+   * Each item also has a method, {@link SendRange#getNumberOfDestinationReactors()}, that returns
+   * the total number of unique destination reactors for its range. This is not necessarily the same
+   * as the number of ports in its destinations field because some of the ports may share the same
+   * container reactor.
+   */
+  public List<SendRange> eventualDestinations() {
+    if (eventualDestinationRanges != null) {
+      return eventualDestinationRanges;
     }
 
-    /** 
-     * Return the list of upstream ports that are connected to this port,
-     * or an empty set if there are none.
-     * For an ordinary port, this list will have length 0 or 1.
-     * For a multiport, it can have a larger size.
-     */
-    public List<RuntimeRange<PortInstance>> getDependsOnPorts() {
-        return dependsOnPorts;
-    }
-    
-    /** 
-     * Return true if the port is an input.
-     */
-    public boolean isInput() {
-        return (definition instanceof Input);
-    }
-    
-    /**
-     * Return true if this is a multiport.
-     */
-    public boolean isMultiport() {
-        return isMultiport;
-    }
+    // Construct the full range for this port.
+    RuntimeRange<PortInstance> range = new RuntimeRange.Port(this);
+    eventualDestinationRanges = eventualDestinations(range);
+    return eventualDestinationRanges;
+  }
+
+  /**
+   * Return a list of ranges of ports that send data to this port. If this port is directly written
+   * to by one more more reactions, then it is its own eventual source and only this port will be
+   * represented in the result.
+   *
+   * <p>If this is not a multiport and is not within a bank, then the list will have only one item
+   * and the range will have a total width of one. Otherwise, it will have enough items so that the
+   * range widths add up to the width of this multiport multiplied by the total number of instances
+   * within containing banks.
+   *
+   * <p>The ports listed are only ports that are written to by reactions, not relay ports that the
+   * data may go through on the way.
+   */
+  public List<RuntimeRange<PortInstance>> eventualSources() {
+    return eventualSources(new RuntimeRange.Port(this));
+  }
+
+  /**
+   * Return the list of ranges of this port together with the downstream ports that are connected to
+   * this port. The total with of the ranges in the returned list is a multiple N >= 0 of the total
+   * width of this port.
+   */
+  public List<SendRange> getDependentPorts() {
+    return dependentPorts;
+  }
+
+  /**
+   * Return the list of upstream ports that are connected to this port, or an empty set if there are
+   * none. For an ordinary port, this list will have length 0 or 1. For a multiport, it can have a
+   * larger size.
+   */
+  public List<RuntimeRange<PortInstance>> getDependsOnPorts() {
+    return dependsOnPorts;
+  }
+
+  /** Return true if the port is an input. */
+  public boolean isInput() {
+    return (definition instanceof Input);
+  }
+
+  /** Return true if this is a multiport. */
+  public boolean isMultiport() {
+    return isMultiport;
+  }
+
+  /** Return true if the port is an output. */
+  public boolean isOutput() {
+    return (definition instanceof Output);
+  }
+
+  @Override
+  public String toString() {
+    return "PortInstance " + getFullName();
+  }
+
+  //////////////////////////////////////////////////////
+  //// Protected fields.
+
+  /**
+   * Ranges of this port together with downstream ports that are connected directly to this port.
+   * When there are multiple destinations, the destinations are listed in the order they appear in
+   * connections in the parent reactor instance of this port (inside connections), followed by the
+   * order in which they appear in the parent's parent (outside connections). The total of the
+   * widths of these SendRanges is an integer multiple N >= 0 of the width of this port (this is
+   * checked by the validator). Each channel of this port will be broadcast to N recipients (or, if
+   * there are no connections to zero recipients).
+   */
+  List<SendRange> dependentPorts = new ArrayList<SendRange>();
+
+  /**
+   * Upstream ports that are connected directly to this port, if there are any. For an ordinary
+   * port, this set will have size 0 or 1. For a multiport, it can have a larger size. This
+   * initially has capacity 1 because that is by far the most common case.
+   */
+  List<RuntimeRange<PortInstance>> dependsOnPorts = new ArrayList<RuntimeRange<PortInstance>>(1);
+
+  /** Indicator of whether this is a multiport. */
+  boolean isMultiport = false;
 
-    /** 
-     * Return true if the port is an output.
-     */
-    public boolean isOutput() {
-        return (definition instanceof Output);
+  //////////////////////////////////////////////////////
+  //// Private methods.
+
+  /**
+   * Given a RuntimeRange, return a list of SendRange that describes the eventual destinations of
+   * the given range. The sum of the total widths of the send ranges on the returned list will be an
+   * integer multiple N of the total width of the specified range. Each returned SendRange has a
+   * list of destination RuntimeRanges, each of which represents a port that has dependent
+   * reactions. Intermediate ports with no dependent reactions are not listed.
+   *
+   * @param srcRange The source range.
+   */
+  private static List<SendRange> eventualDestinations(RuntimeRange<PortInstance> srcRange) {
+
+    // Getting the destinations is more complex than getting the sources
+    // because of multicast, where there is more than one connection statement
+    // for a source of data. The strategy we follow here is to first get all
+    // the ports that this port eventually sends to. Then, if needed, split
+    // the resulting ranges so that the resulting list covers exactly
+    // srcRange, possibly in pieces.  We make two passes. First, we build
+    // a queue of ranges that may overlap, then we split those ranges
+    // and consolidate their destinations.
+
+    List<SendRange> result = new ArrayList<SendRange>();
+    PriorityQueue<SendRange> queue = new PriorityQueue<SendRange>();
+    PortInstance srcPort = srcRange.instance;
+
+    // Start with, if this port has dependent reactions, then add it to
+    // every range of the result.
+    if (!srcRange.instance.dependentReactions.isEmpty()) {
+      // This will be the final result if there are no connections.
+      SendRange candidate =
+          new SendRange(
+              srcRange.instance,
+              srcRange.start,
+              srcRange.width,
+              null, // No interleaving for this range.
+              null // No connection for this range.
+              );
+      candidate.destinations.add(srcRange);
+      queue.add(candidate);
     }
-    
-    @Override
-    public String toString() {
-        return "PortInstance " + getFullName();
-    }    
-
-    //////////////////////////////////////////////////////
-    //// Protected fields.
-
-    /** 
-     * Ranges of this port together with downstream ports that
-     * are connected directly to this port. When there are multiple destinations,
-     * the destinations are listed in the order they appear in connections
-     * in the parent reactor instance of this port (inside connections),
-     * followed by the order in which they appear in the parent's parent (outside
-     * connections). The total of the widths of these SendRanges is an integer
-     * multiple N >= 0 of the width of this port (this is checked
-     * by the validator). Each channel of this port will be broadcast
-     * to N recipients (or, if there are no connections to zero recipients).
-     */
-    List<SendRange> dependentPorts = new ArrayList<SendRange>();
-
-    /** 
-     * Upstream ports that are connected directly to this port, if there are any.
-     * For an ordinary port, this set will have size 0 or 1.
-     * For a multiport, it can have a larger size.
-     * This initially has capacity 1 because that is by far the most common case.
-     */
-    List<RuntimeRange<PortInstance>> dependsOnPorts = new ArrayList<RuntimeRange<PortInstance>>(1);
-    
-    /** Indicator of whether this is a multiport. */
-    boolean isMultiport = false;
-    
-    //////////////////////////////////////////////////////
-    //// Private methods.
-    
-    /**
-     * Given a RuntimeRange, return a list of SendRange that describes
-     * the eventual destinations of the given range.
-     * The sum of the total widths of the send ranges on the returned list
-     * will be an integer multiple N of the total width of the specified range.
-     * Each returned SendRange has a list
-     * of destination RuntimeRanges, each of which represents a port that
-     * has dependent reactions. Intermediate ports with no dependent
-     * reactions are not listed.
-     * @param srcRange The source range.
-     */
-    private static List<SendRange> eventualDestinations(RuntimeRange<PortInstance> srcRange) {
-
-        // Getting the destinations is more complex than getting the sources
-        // because of multicast, where there is more than one connection statement
-        // for a source of data. The strategy we follow here is to first get all
-        // the ports that this port eventually sends to. Then, if needed, split
-        // the resulting ranges so that the resulting list covers exactly
-        // srcRange, possibly in pieces.  We make two passes. First, we build
-        // a queue of ranges that may overlap, then we split those ranges
-        // and consolidate their destinations.
-
-        List<SendRange> result = new ArrayList<SendRange>();
-        PriorityQueue<SendRange> queue = new PriorityQueue<SendRange>();
-        PortInstance srcPort = srcRange.instance;
-        
-        // Start with, if this port has dependent reactions, then add it to 
-        // every range of the result.
-        if (!srcRange.instance.dependentReactions.isEmpty()) {
-            // This will be the final result if there are no connections.
-            SendRange candidate = new SendRange(
-                    srcRange.instance,
-                    srcRange.start, 
-                    srcRange.width,
-                    null, // No interleaving for this range.
-                    null  // No connection for this range.
-            );
-            candidate.destinations.add(srcRange);
-            queue.add(candidate);
-        }
 
-        // Need to find send ranges that overlap with this srcRange.
-        Iterator<SendRange> sendRanges = srcPort.dependentPorts.iterator();
-        while (sendRanges.hasNext()) {
-            
-            SendRange wSendRange = sendRanges.next();
-            
-            if (wSendRange.connection != null && wSendRange.connection.getDelay() != null) {
-                continue;
-            }
-            
-            wSendRange = wSendRange.overlap(srcRange);
-            if (wSendRange == null) {
-                // This send range does not overlap with the desired range. Try the next one.
-                continue;
-            }
-            for (RuntimeRange<PortInstance> dstRange : wSendRange.destinations) {
-                // Recursively get the send ranges of that destination port.
-                List<SendRange> dstSendRanges = eventualDestinations(dstRange);
-                int sendRangeStart = 0;
-                for (SendRange dstSend : dstSendRanges) {
-                    queue.add(dstSend.newSendRange(wSendRange, sendRangeStart));
-                    sendRangeStart += dstSend.width;
-                }
-            }
+    // Need to find send ranges that overlap with this srcRange.
+    Iterator<SendRange> sendRanges = srcPort.dependentPorts.iterator();
+    while (sendRanges.hasNext()) {
+
+      SendRange wSendRange = sendRanges.next();
+
+      if (wSendRange.connection != null && wSendRange.connection.getDelay() != null) {
+        continue;
+      }
+
+      wSendRange = wSendRange.overlap(srcRange);
+      if (wSendRange == null) {
+        // This send range does not overlap with the desired range. Try the next one.
+        continue;
+      }
+      for (RuntimeRange<PortInstance> dstRange : wSendRange.destinations) {
+        // Recursively get the send ranges of that destination port.
+        List<SendRange> dstSendRanges = eventualDestinations(dstRange);
+        int sendRangeStart = 0;
+        for (SendRange dstSend : dstSendRanges) {
+          queue.add(dstSend.newSendRange(wSendRange, sendRangeStart));
+          sendRangeStart += dstSend.width;
         }
+      }
+    }
 
-        // Now check for overlapping ranges, constructing a new result.
-        SendRange candidate = queue.poll();
-        SendRange next = queue.poll();
-        while (candidate != null) {
-            if (next == null) {
-                // No more candidates.  We are done.
-                result.add(candidate);
-                break;
-            }
-            if (candidate.start == next.start) {
-                // Ranges have the same starting point. Need to merge them.
-                if (candidate.width <= next.width) {
-                    // Can use all of the channels of candidate.
-                    // Import the destinations of next and split it.
-                    for (RuntimeRange<PortInstance> destination : next.destinations) {
-                        candidate.destinations.add(destination.head(candidate.width));
-                    }
-                    if (candidate.width < next.width) {
-                        // The next range has more channels connected to this sender.
-                        // Put it back on the queue an poll for a new next.
-                        queue.add(next.tail(candidate.width));
-                        next = queue.poll();
-                    } else {
-                        // We are done with next and can discard it.
-                        next = queue.poll();
-                    }
-                } else {
-                    // candidate is wider than next. Switch them and continue.
-                    SendRange temp = candidate;
-                    candidate = next;
-                    next = temp;
-                }
-            } else {
-                // Because the result list is sorted, next starts at
-                // a higher channel than candidate.
-                if (candidate.start + candidate.width <= next.start) {
-                    // Can use candidate as is and make next the new candidate.
-                    result.add(candidate);
-                    candidate = next;
-                    next = queue.poll();
-                } else {
-                    // Ranges overlap. Can use a truncated candidate and make its
-                    // truncated version the new candidate.
-                    result.add(candidate.head(next.start));
-                    candidate = (SendRange)candidate.tail(next.start);
-                }
-            }
+    // Now check for overlapping ranges, constructing a new result.
+    SendRange candidate = queue.poll();
+    SendRange next = queue.poll();
+    while (candidate != null) {
+      if (next == null) {
+        // No more candidates.  We are done.
+        result.add(candidate);
+        break;
+      }
+      if (candidate.start == next.start) {
+        // Ranges have the same starting point. Need to merge them.
+        if (candidate.width <= next.width) {
+          // Can use all of the channels of candidate.
+          // Import the destinations of next and split it.
+          for (RuntimeRange<PortInstance> destination : next.destinations) {
+            candidate.destinations.add(destination.head(candidate.width));
+          }
+          if (candidate.width < next.width) {
+            // The next range has more channels connected to this sender.
+            // Put it back on the queue an poll for a new next.
+            queue.add(next.tail(candidate.width));
+            next = queue.poll();
+          } else {
+            // We are done with next and can discard it.
+            next = queue.poll();
+          }
+        } else {
+          // candidate is wider than next. Switch them and continue.
+          SendRange temp = candidate;
+          candidate = next;
+          next = temp;
+        }
+      } else {
+        // Because the result list is sorted, next starts at
+        // a higher channel than candidate.
+        if (candidate.start + candidate.width <= next.start) {
+          // Can use candidate as is and make next the new candidate.
+          result.add(candidate);
+          candidate = next;
+          next = queue.poll();
+        } else {
+          // Ranges overlap. Can use a truncated candidate and make its
+          // truncated version the new candidate.
+          result.add(candidate.head(next.start));
+          candidate = (SendRange) candidate.tail(next.start);
         }
-        
-        return result;
+      }
     }
 
-    /**
-     * Return a list of ranges of ports that send data to this port within the
-     * specified range. If this port is directly written to by one more more reactions,
-     * then it is its own eventual source and only this port
-     * will be represented in the result.
-     * 
-     * If this is not a multiport and is not within a bank, then the list will have
-     * only one item and the range will have a total width of one. Otherwise, it will
-     * have enough items so that the range widths add up to the width of this
-     * multiport multiplied by the total number of instances within containing banks.
-     * 
-     * The ports listed are only ports that are written to by reactions,
-     * not relay ports that the data may go through on the way.
-     */
-    private List<RuntimeRange<PortInstance>> eventualSources(RuntimeRange<PortInstance> range) {
-        if (eventualSourceRanges == null) {
-            // Cached result has not been created.
-            eventualSourceRanges = new ArrayList<RuntimeRange<PortInstance>>();
-            
-            if (!dependsOnReactions.isEmpty()) {
-                eventualSourceRanges.add(new RuntimeRange.Port(this));
-            } else {
-                var channelsCovered = 0;
-                for (RuntimeRange<PortInstance> sourceRange : dependsOnPorts) {
-                    // Check whether the sourceRange overlaps with the range.
-                    if (channelsCovered + sourceRange.width >= range.start
-                            && channelsCovered < range.start + range.width) {
-                        eventualSourceRanges.addAll(sourceRange.instance.eventualSources(sourceRange));
-                    }
-                    channelsCovered += sourceRange.width;
-                }
-            }
+    return result;
+  }
+
+  /**
+   * Return a list of ranges of ports that send data to this port within the specified range. If
+   * this port is directly written to by one more more reactions, then it is its own eventual source
+   * and only this port will be represented in the result.
+   *
+   * <p>If this is not a multiport and is not within a bank, then the list will have only one item
+   * and the range will have a total width of one. Otherwise, it will have enough items so that the
+   * range widths add up to the width of this multiport multiplied by the total number of instances
+   * within containing banks.
+   *
+   * <p>The ports listed are only ports that are written to by reactions, not relay ports that the
+   * data may go through on the way.
+   */
+  private List<RuntimeRange<PortInstance>> eventualSources(RuntimeRange<PortInstance> range) {
+    if (eventualSourceRanges == null) {
+      // Cached result has not been created.
+      eventualSourceRanges = new ArrayList<RuntimeRange<PortInstance>>();
+
+      if (!dependsOnReactions.isEmpty()) {
+        eventualSourceRanges.add(new RuntimeRange.Port(this));
+      } else {
+        var channelsCovered = 0;
+        for (RuntimeRange<PortInstance> sourceRange : dependsOnPorts) {
+          // Check whether the sourceRange overlaps with the range.
+          if (channelsCovered + sourceRange.width >= range.start
+              && channelsCovered < range.start + range.width) {
+            eventualSourceRanges.addAll(sourceRange.instance.eventualSources(sourceRange));
+          }
+          channelsCovered += sourceRange.width;
         }
-        return eventualSourceRanges;
+      }
     }
+    return eventualSourceRanges;
+  }
+
+  /**
+   * Set the initial multiport width, if this is a multiport, from the widthSpec in the definition.
+   * This will be set to -1 if the width cannot be determined.
+   *
+   * @param errorReporter For reporting errors.
+   */
+  private void setInitialWidth(ErrorReporter errorReporter) {
+    // If this is a multiport, determine the width.
+    WidthSpec widthSpec = definition.getWidthSpec();
+
+    if (widthSpec != null) {
+      if (widthSpec.isOfVariableLength()) {
+        errorReporter.reportError(
+            definition, "Variable-width multiports not supported (yet): " + definition.getName());
+      } else {
+        isMultiport = true;
 
-    /**
-     * Set the initial multiport width, if this is a multiport, from the widthSpec
-     * in the definition. This will be set to -1 if the width cannot be determined.
-     * @param errorReporter For reporting errors.
-     */
-    private void setInitialWidth(ErrorReporter errorReporter) {
-        // If this is a multiport, determine the width.
-        WidthSpec widthSpec = definition.getWidthSpec();
-
-        if (widthSpec != null) {
-            if (widthSpec.isOfVariableLength()) {
-                errorReporter.reportError(definition,
-                        "Variable-width multiports not supported (yet): " + definition.getName());
+        // Determine the initial width, if possible.
+        // The width may be given by a parameter or even sum of parameters.
+        width = 0;
+        for (WidthTerm term : widthSpec.getTerms()) {
+          Parameter parameter = term.getParameter();
+          if (parameter != null) {
+            Integer parameterValue = parent.initialIntParameterValue(parameter);
+            // Only a Literal is supported.
+            if (parameterValue != null) {
+              width += parameterValue;
             } else {
-                isMultiport = true;
-                
-                // Determine the initial width, if possible.
-                // The width may be given by a parameter or even sum of parameters.
-                width = 0;
-                for (WidthTerm term : widthSpec.getTerms()) {
-                    Parameter parameter = term.getParameter();
-                    if (parameter != null) {
-                        Integer parameterValue = parent.initialIntParameterValue(parameter);
-                        // Only a Literal is supported.
-                        if (parameterValue != null) {
-                            width += parameterValue;
-                        } else {
-                            width = -1;
-                            return;
-                        }
-                    } else if (term.getWidth() != 0){
-                        width += term.getWidth();
-                    } else {
-                        width = -1;
-                        return;
-                    }
-                }
+              width = -1;
+              return;
             }
+          } else if (term.getWidth() != 0) {
+            width += term.getWidth();
+          } else {
+            width = -1;
+            return;
+          }
         }
+      }
     }
+  }
+
+  //////////////////////////////////////////////////////
+  //// Private fields.
+
+  /** Cached list of destination ports with channel ranges. */
+  private List<SendRange> eventualDestinationRanges;
+
+  /** Cached list of source ports with channel ranges. */
+  private List<RuntimeRange<PortInstance>> eventualSourceRanges;
 
-    //////////////////////////////////////////////////////
-    //// Private fields.
-    
-    /** Cached list of destination ports with channel ranges. */
-    private List<SendRange> eventualDestinationRanges;
-
-    /** Cached list of source ports with channel ranges. */
-    private List<RuntimeRange<PortInstance>> eventualSourceRanges;
-    
-    /** Indicator that we are clearing the caches. */
-    private boolean clearingCaches = false;
+  /** Indicator that we are clearing the caches. */
+  private boolean clearingCaches = false;
 }
diff --git a/org.lflang/src/org/lflang/generator/Position.java b/org.lflang/src/org/lflang/generator/Position.java
index 872b09a24e..80e3976365 100644
--- a/org.lflang/src/org/lflang/generator/Position.java
+++ b/org.lflang/src/org/lflang/generator/Position.java
@@ -4,234 +4,219 @@
 import java.util.regex.Pattern;
 
 /**
- * A position in a document, including line and
- * column. This position may be relative to some
+ * A position in a document, including line and column. This position may be relative to some
  * position other than the origin.
  *
  * @author Peter Donovan
  */
 public class Position implements Comparable<Position> {
-    public static final Pattern PATTERN = Pattern.compile("\\((?<line>[0-9]+), (?<column>[0-9]+)\\)");
-
-    public static final Position ORIGIN = Position.fromZeroBased(0, 0);
-
-    private static final Pattern LINE_SEPARATOR = Pattern.compile("(\n)|(\r)|(\r\n)");
-
-    private final int line;
-    private final int column;
-
-    /* ------------------------  CONSTRUCTORS  -------------------------- */
-
-    /**
-     * Return the Position that describes the given
-     * zero-based line and column numbers.
-     * @param line the zero-based line number
-     * @param column the zero-based column number
-     * @return a Position describing the position described
-     * by {@code line} and {@code column}.
-     */
-    public static Position fromZeroBased(int line, int column) {
-        return new Position(line, column);
-    }
-
-    /**
-     * Return the Position that describes the given
-     * one-based line and column numbers.
-     * @param line the one-based line number
-     * @param column the one-based column number
-     * @return a Position describing the position described
-     * by {@code line} and {@code column}.
-     */
-    public static Position fromOneBased(int line, int column) {
-        return new Position(line - 1, column - 1);
-    }
-
-    /**
-     * Return the Position that equals the displacement
-     * caused by {@code text}, assuming that {@code text}
-     * starts in column 0.
-     * @param text an arbitrary string
-     * @return the Position that equals the displacement
-     * caused by {@code text}
-     */
-    public static Position displacementOf(String text) {
-        String[] lines = text.lines().toArray(String[]::new);
-        if (lines.length == 0) return ORIGIN;
-        return Position.fromZeroBased(lines.length - 1, lines[lines.length - 1].length());
-    }
-
-    /**
-     * Return the Position that describes the same location
-     * in {@code content} as {@code offset}.
-     * @param offset a location, expressed as an offset from
-     *               the beginning of {@code content}
-     * @param content the content of a document
-     * @return the Position that describes the same location
-     * in {@code content} as {@code offset}
-     */
-    public static Position fromOffset(int offset, String content) {
-        int lineNumber = 0;
-        Matcher matcher = LINE_SEPARATOR.matcher(content);
-        int start = 0;
-        while (matcher.find(start)) {
-            if (matcher.start() > offset) return Position.fromZeroBased(lineNumber, offset - start);
-            start = matcher.end();
-            lineNumber++;
-        }
-        return Position.fromZeroBased(lineNumber, offset);
-    }
-
-    /**
-     * Create a new Position with the given line and column
-     * numbers.
-     * @param line the zero-based line number
-     * @param column the zero-based column number
-     */
-    private Position(int line, int column) {
-        // Assertions about whether line and column are
-        // non-negative are deliberately omitted. Positions
-        // can be relative.
-        this.line = line;
-        this.column = column;
-    }
-
-    /* -----------------------  PUBLIC METHODS  ------------------------- */
-
-    /**
-     * Return the one-based line number described by this
-     * {@code Position}.
-     * @return the one-based line number described by this
-     * {@code Position}
-     */
-    public int getOneBasedLine() {
-        return line + 1;
-    }
-
-    /**
-     * Return the one-based column number described by this
-     * {@code Position}.
-     * @return the one-based column number described by this
-     * {@code Position}
-     */
-    public int getOneBasedColumn() {
-        return column + 1;
-    }
-
-    /**
-     * Return the zero-based line number described by this
-     * {@code Position}.
-     * @return the zero-based line number described by this
-     * {@code Position}
-     */
-    public int getZeroBasedLine() {
-        return line;
-    }
-
-    /**
-     * Return the zero-based column number described by this
-     * {@code Position}.
-     * @return the zero-based column number described by this
-     * {@code Position}
-     */
-    public int getZeroBasedColumn() {
-        return column;
-    }
-
-    /**
-     * Return the Position that equals the displacement of
-     * ((text whose displacement equals {@code this})
-     * concatenated with {@code text}). Note that this is
-     * not necessarily equal to
-     * ({@code this} + displacementOf(text)).
-     * @param text an arbitrary string
-     * @return the Position that equals the displacement
-     * caused by {@code text}
-     */
-    public Position plus(String text) {
-        text += "\n";  // Turn line separators into line terminators.
-        String[] lines = text.lines().toArray(String[]::new);
-        if (lines.length == 0) return this; // OK not to copy because Positions are immutable
-        int lastLineLength = lines[lines.length - 1].length();
-        return new Position(line + lines.length - 1, lines.length > 1 ? lastLineLength : column + lastLineLength);
-    }
-
-    /**
-     * Return the sum of this and another {@code Position}.
-     * The result has meaning because Positions are
-     * relative.
-     * @param other another {@code Position}
-     * @return the sum of this and {@code other}
-     */
-    public Position plus(Position other) {
-        return new Position(line + other.line, column + other.column);
-    }
-
-    /**
-     * Return the difference of this and another {@code
-     * Position}. The result has meaning because
-     * Positions are relative.
-     * @param other another {@code Position}
-     * @return the difference of this and {@code other}
-     */
-    public Position minus(Position other) {
-        return new Position(line - other.line, column - other.column);
-    }
-
-    /**
-     * Compare two positions according to their order of
-     * appearance in a document (first according to line,
-     * then according to column).
-     */
-    @Override
-    public int compareTo(Position o) {
-        if (line != o.line) {
-            return line - o.line;
-        }
-        return column - o.column;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof Position && ((Position) obj).compareTo(this) == 0;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("(%d, %d)", getZeroBasedLine(), getZeroBasedColumn());
-    }
-
-    /**
-     * Return the Position represented by {@code s}.
-     * @param s a String that represents a Position,
-     *          formatted like the output of
-     *          {@code Position::toString}.
-     * @return the Position represented by {@code s}
-     */
-    public static Position fromString(String s) {
-        Matcher matcher = PATTERN.matcher(s);
-        if (matcher.matches()) {
-            return Position.fromZeroBased(
-                Integer.parseInt(matcher.group("line")),
-                Integer.parseInt(matcher.group("column"))
-            );
-        }
-        throw new IllegalArgumentException(String.format("Could not parse %s as a Position.", s));
-    }
-
-    @Override
-    public int hashCode() {
-        return line * 31 + column;
-    }
-
-    /**
-     * Remove the names from the named capturing groups
-     * that appear in {@code regex}.
-     * @param regex an arbitrary regular expression
-     * @return a string representation of {@code regex}
-     * with the names removed from the named capturing
-     * groups
-     */
-    public static String removeNamedCapturingGroups(Pattern regex) {  // FIXME: Does this belong here?
-        return regex.toString().replaceAll("\\(\\?<\\w+>", "(");
-    }
+  public static final Pattern PATTERN = Pattern.compile("\\((?<line>[0-9]+), (?<column>[0-9]+)\\)");
+
+  public static final Position ORIGIN = Position.fromZeroBased(0, 0);
+
+  private static final Pattern LINE_SEPARATOR = Pattern.compile("(\n)|(\r)|(\r\n)");
+
+  private final int line;
+  private final int column;
+
+  /* ------------------------  CONSTRUCTORS  -------------------------- */
+
+  /**
+   * Return the Position that describes the given zero-based line and column numbers.
+   *
+   * @param line the zero-based line number
+   * @param column the zero-based column number
+   * @return a Position describing the position described by {@code line} and {@code column}.
+   */
+  public static Position fromZeroBased(int line, int column) {
+    return new Position(line, column);
+  }
+
+  /**
+   * Return the Position that describes the given one-based line and column numbers.
+   *
+   * @param line the one-based line number
+   * @param column the one-based column number
+   * @return a Position describing the position described by {@code line} and {@code column}.
+   */
+  public static Position fromOneBased(int line, int column) {
+    return new Position(line - 1, column - 1);
+  }
+
+  /**
+   * Return the Position that equals the displacement caused by {@code text}, assuming that {@code
+   * text} starts in column 0.
+   *
+   * @param text an arbitrary string
+   * @return the Position that equals the displacement caused by {@code text}
+   */
+  public static Position displacementOf(String text) {
+    String[] lines = text.lines().toArray(String[]::new);
+    if (lines.length == 0) return ORIGIN;
+    return Position.fromZeroBased(lines.length - 1, lines[lines.length - 1].length());
+  }
+
+  /**
+   * Return the Position that describes the same location in {@code content} as {@code offset}.
+   *
+   * @param offset a location, expressed as an offset from the beginning of {@code content}
+   * @param content the content of a document
+   * @return the Position that describes the same location in {@code content} as {@code offset}
+   */
+  public static Position fromOffset(int offset, String content) {
+    int lineNumber = 0;
+    Matcher matcher = LINE_SEPARATOR.matcher(content);
+    int start = 0;
+    while (matcher.find(start)) {
+      if (matcher.start() > offset) return Position.fromZeroBased(lineNumber, offset - start);
+      start = matcher.end();
+      lineNumber++;
+    }
+    return Position.fromZeroBased(lineNumber, offset);
+  }
+
+  /**
+   * Create a new Position with the given line and column numbers.
+   *
+   * @param line the zero-based line number
+   * @param column the zero-based column number
+   */
+  private Position(int line, int column) {
+    // Assertions about whether line and column are
+    // non-negative are deliberately omitted. Positions
+    // can be relative.
+    this.line = line;
+    this.column = column;
+  }
+
+  /* -----------------------  PUBLIC METHODS  ------------------------- */
+
+  /**
+   * Return the one-based line number described by this {@code Position}.
+   *
+   * @return the one-based line number described by this {@code Position}
+   */
+  public int getOneBasedLine() {
+    return line + 1;
+  }
+
+  /**
+   * Return the one-based column number described by this {@code Position}.
+   *
+   * @return the one-based column number described by this {@code Position}
+   */
+  public int getOneBasedColumn() {
+    return column + 1;
+  }
+
+  /**
+   * Return the zero-based line number described by this {@code Position}.
+   *
+   * @return the zero-based line number described by this {@code Position}
+   */
+  public int getZeroBasedLine() {
+    return line;
+  }
+
+  /**
+   * Return the zero-based column number described by this {@code Position}.
+   *
+   * @return the zero-based column number described by this {@code Position}
+   */
+  public int getZeroBasedColumn() {
+    return column;
+  }
+
+  /**
+   * Return the Position that equals the displacement of ((text whose displacement equals {@code
+   * this}) concatenated with {@code text}). Note that this is not necessarily equal to ({@code
+   * this} + displacementOf(text)).
+   *
+   * @param text an arbitrary string
+   * @return the Position that equals the displacement caused by {@code text}
+   */
+  public Position plus(String text) {
+    text += "\n"; // Turn line separators into line terminators.
+    String[] lines = text.lines().toArray(String[]::new);
+    if (lines.length == 0) return this; // OK not to copy because Positions are immutable
+    int lastLineLength = lines[lines.length - 1].length();
+    return new Position(
+        line + lines.length - 1, lines.length > 1 ? lastLineLength : column + lastLineLength);
+  }
+
+  /**
+   * Return the sum of this and another {@code Position}. The result has meaning because Positions
+   * are relative.
+   *
+   * @param other another {@code Position}
+   * @return the sum of this and {@code other}
+   */
+  public Position plus(Position other) {
+    return new Position(line + other.line, column + other.column);
+  }
+
+  /**
+   * Return the difference of this and another {@code Position}. The result has meaning because
+   * Positions are relative.
+   *
+   * @param other another {@code Position}
+   * @return the difference of this and {@code other}
+   */
+  public Position minus(Position other) {
+    return new Position(line - other.line, column - other.column);
+  }
+
+  /**
+   * Compare two positions according to their order of appearance in a document (first according to
+   * line, then according to column).
+   */
+  @Override
+  public int compareTo(Position o) {
+    if (line != o.line) {
+      return line - o.line;
+    }
+    return column - o.column;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof Position && ((Position) obj).compareTo(this) == 0;
+  }
+
+  @Override
+  public String toString() {
+    return String.format("(%d, %d)", getZeroBasedLine(), getZeroBasedColumn());
+  }
+
+  /**
+   * Return the Position represented by {@code s}.
+   *
+   * @param s a String that represents a Position, formatted like the output of {@code
+   *     Position::toString}.
+   * @return the Position represented by {@code s}
+   */
+  public static Position fromString(String s) {
+    Matcher matcher = PATTERN.matcher(s);
+    if (matcher.matches()) {
+      return Position.fromZeroBased(
+          Integer.parseInt(matcher.group("line")), Integer.parseInt(matcher.group("column")));
+    }
+    throw new IllegalArgumentException(String.format("Could not parse %s as a Position.", s));
+  }
+
+  @Override
+  public int hashCode() {
+    return line * 31 + column;
+  }
+
+  /**
+   * Remove the names from the named capturing groups that appear in {@code regex}.
+   *
+   * @param regex an arbitrary regular expression
+   * @return a string representation of {@code regex} with the names removed from the named
+   *     capturing groups
+   */
+  public static String removeNamedCapturingGroups(Pattern regex) { // FIXME: Does this belong here?
+    return regex.toString().replaceAll("\\(\\?<\\w+>", "(");
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/Range.java b/org.lflang/src/org/lflang/generator/Range.java
index ffca1104d9..9300127d36 100644
--- a/org.lflang/src/org/lflang/generator/Range.java
+++ b/org.lflang/src/org/lflang/generator/Range.java
@@ -4,136 +4,129 @@
 import java.util.regex.Pattern;
 
 /**
- * Represents a range in a document. Ranges have a
- * natural ordering that respects their start
+ * Represents a range in a document. Ranges have a natural ordering that respects their start
  * position(s) only.
  */
 public class Range implements Comparable<Range> {
-    public static final Pattern PATTERN = Pattern.compile(String.format(
-        "Range: \\[(?<start>%s), (?<end>%s)\\)",
-        Position.removeNamedCapturingGroups(Position.PATTERN),
-        Position.removeNamedCapturingGroups(Position.PATTERN)
-    ));
+  public static final Pattern PATTERN =
+      Pattern.compile(
+          String.format(
+              "Range: \\[(?<start>%s), (?<end>%s)\\)",
+              Position.removeNamedCapturingGroups(Position.PATTERN),
+              Position.removeNamedCapturingGroups(Position.PATTERN)));
 
-    /** The start of the Range (INCLUSIVE). */
-    private final Position start;
-    /** The end of the Range (EXCLUSIVE). */
-    private final Position end;
+  /** The start of the Range (INCLUSIVE). */
+  private final Position start;
+  /** The end of the Range (EXCLUSIVE). */
+  private final Position end;
 
-    /* ------------------------- PUBLIC METHODS -------------------------- */
+  /* ------------------------- PUBLIC METHODS -------------------------- */
 
-    /**
-     * Initializes a Range that starts at
-     * {@code startInclusive} and ends at, but does not
-     * include, {@code endExclusive}.
-     * @param startInclusive the start of the range
-     *                       (inclusive)
-     * @param endExclusive the end of the range (exclusive)
-     */
-    public Range(Position startInclusive, Position endExclusive) {
-        assert startInclusive.compareTo(endExclusive) <= 0: "endExclusive cannot precede startInclusive";
-        start = startInclusive;
-        end = endExclusive;
-    }
+  /**
+   * Initializes a Range that starts at {@code startInclusive} and ends at, but does not include,
+   * {@code endExclusive}.
+   *
+   * @param startInclusive the start of the range (inclusive)
+   * @param endExclusive the end of the range (exclusive)
+   */
+  public Range(Position startInclusive, Position endExclusive) {
+    assert startInclusive.compareTo(endExclusive) <= 0
+        : "endExclusive cannot precede startInclusive";
+    start = startInclusive;
+    end = endExclusive;
+  }
 
-    /**
-     * Returns the first Position that is included in this
-     * Range.
-     * @return the first Position that is included in this
-     * Range
-     */
-    public Position getStartInclusive() {
-        return start;
-    }
+  /**
+   * Returns the first Position that is included in this Range.
+   *
+   * @return the first Position that is included in this Range
+   */
+  public Position getStartInclusive() {
+    return start;
+  }
 
-    /**
-     * Returns the Position that immediately follows the
-     * last Position in this Range.
-     * @return the Position that immediately follows the
-     * last Position in this Range
-     */
-    public Position getEndExclusive() {
-        return end;
-    }
+  /**
+   * Returns the Position that immediately follows the last Position in this Range.
+   *
+   * @return the Position that immediately follows the last Position in this Range
+   */
+  public Position getEndExclusive() {
+    return end;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof Range r)) return false;
-        return start.equals(r.start);
-    }
+  @Override
+  public boolean equals(Object o) {
+    if (!(o instanceof Range r)) return false;
+    return start.equals(r.start);
+  }
 
-    @Override
-    public int hashCode() {
-        return start.hashCode();
-    }
+  @Override
+  public int hashCode() {
+    return start.hashCode();
+  }
 
-    /**
-     * Compares this to {@code o}.
-     * @param o another Range
-     * @return an integer indicating how this compares to
-     * {@code o}
-     */
-    @Override
-    public int compareTo(Range o) {
-        return this.start.compareTo(o.start);
-    }
+  /**
+   * Compares this to {@code o}.
+   *
+   * @param o another Range
+   * @return an integer indicating how this compares to {@code o}
+   */
+  @Override
+  public int compareTo(Range o) {
+    return this.start.compareTo(o.start);
+  }
 
-    /**
-     * Returns whether this contains {@code p}.
-     * @param p an arbitrary Position
-     * @return whether this contains {@code p}
-     */
-    public boolean contains(Position p) {
-        return start.compareTo(p) <= 0 && p.compareTo(end) < 0;
-    }
+  /**
+   * Returns whether this contains {@code p}.
+   *
+   * @param p an arbitrary Position
+   * @return whether this contains {@code p}
+   */
+  public boolean contains(Position p) {
+    return start.compareTo(p) <= 0 && p.compareTo(end) < 0;
+  }
 
-    @Override
-    public String toString() {
-        return String.format("Range: [%s, %s)", start, end);
-    }
+  @Override
+  public String toString() {
+    return String.format("Range: [%s, %s)", start, end);
+  }
 
-    /**
-     * Converts {@code s} to a Range.
-     * @param s a String that represents a Range, formatted
-     *          like the output of {@code Range::toString}
-     * @return the Range r such that {@code r.toString()}
-     * equals {@code s}
-     */
-    public static Range fromString(String s) {
-        return fromString(s, Position.fromZeroBased(0, 0));
-    }
+  /**
+   * Converts {@code s} to a Range.
+   *
+   * @param s a String that represents a Range, formatted like the output of {@code Range::toString}
+   * @return the Range r such that {@code r.toString()} equals {@code s}
+   */
+  public static Range fromString(String s) {
+    return fromString(s, Position.fromZeroBased(0, 0));
+  }
 
-    /**
-     * Converts {@code s} to a Range, with the
-     * assumption that the positions expressed in {@code s}
-     * are given relative to {@code relativeTo}.
-     * @param s a String that represents a Range, formatted
-     *          like the output of {@code Range::toString}
-     * @param relativeTo the position relative to which the
-     *                   positions in {@code s} are
-     *                   represented
-     * @return the Range represented by {@code s},
-     * expressed relative to the Position relative to which
-     * the Position {@code relativeTo} is expressed
-     */
-    public static Range fromString(String s, Position relativeTo) {
-        Matcher matcher = PATTERN.matcher(s);
-        if (matcher.matches()) {
-            Position start = Position.fromString(matcher.group("start"));
-            Position end = Position.fromString(matcher.group("end"));
-            return new Range(start.plus(relativeTo), end.plus(relativeTo));
-        }
-        throw new IllegalArgumentException(String.format("Could not parse %s as a Range.", s));
+  /**
+   * Converts {@code s} to a Range, with the assumption that the positions expressed in {@code s}
+   * are given relative to {@code relativeTo}.
+   *
+   * @param s a String that represents a Range, formatted like the output of {@code Range::toString}
+   * @param relativeTo the position relative to which the positions in {@code s} are represented
+   * @return the Range represented by {@code s}, expressed relative to the Position relative to
+   *     which the Position {@code relativeTo} is expressed
+   */
+  public static Range fromString(String s, Position relativeTo) {
+    Matcher matcher = PATTERN.matcher(s);
+    if (matcher.matches()) {
+      Position start = Position.fromString(matcher.group("start"));
+      Position end = Position.fromString(matcher.group("end"));
+      return new Range(start.plus(relativeTo), end.plus(relativeTo));
     }
+    throw new IllegalArgumentException(String.format("Could not parse %s as a Range.", s));
+  }
 
-    /**
-     * Returns the degenerate range that simply
-     * describes the exact location specified by {@code p}.
-     * @param p an arbitrary Position
-     * @return a Range that starts and ends immediately
-     * before {@code p}
-     */
-    public static Range degenerateRange(Position p) {
-        return new Range(p, p);
-    }
+  /**
+   * Returns the degenerate range that simply describes the exact location specified by {@code p}.
+   *
+   * @param p an arbitrary Position
+   * @return a Range that starts and ends immediately before {@code p}
+   */
+  public static Range degenerateRange(Position p) {
+    return new Range(p, p);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/ReactionInstance.java b/org.lflang/src/org/lflang/generator/ReactionInstance.java
index e6dcc6d629..5e8069728f 100644
--- a/org.lflang/src/org/lflang/generator/ReactionInstance.java
+++ b/org.lflang/src/org/lflang/generator/ReactionInstance.java
@@ -1,28 +1,28 @@
 /** Representation of a runtime instance of a reaction. */
 
 /*************
-Copyright (c) 2019-2022, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019-2022, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
@@ -31,9 +31,8 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Action;
 import org.lflang.lf.BuiltinTriggerRef;
 import org.lflang.lf.Port;
@@ -44,527 +43,499 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.lf.Variable;
 
 /**
- * Representation of a compile-time instance of a reaction.
- * Like {@link ReactorInstance}, if one or more parents of this reaction
- * is a bank of reactors, then there will be more than one runtime instance
- * corresponding to this compile-time instance.  The {@link #getRuntimeInstances()}
- * method returns a list of these runtime instances, each an instance of the
- * inner class {@link ReactionInstance.Runtime}.  Each runtime instance has a "level", which is
- * its depth an acyclic precedence graph representing the dependencies between
- * reactions at a tag.
+ * Representation of a compile-time instance of a reaction. Like {@link ReactorInstance}, if one or
+ * more parents of this reaction is a bank of reactors, then there will be more than one runtime
+ * instance corresponding to this compile-time instance. The {@link #getRuntimeInstances()} method
+ * returns a list of these runtime instances, each an instance of the inner class {@link
+ * ReactionInstance.Runtime}. Each runtime instance has a "level", which is its depth an acyclic
+ * precedence graph representing the dependencies between reactions at a tag.
  *
  * @author Edward A. Lee
  * @author Marten Lohstroh
  */
 public class ReactionInstance extends NamedInstance<Reaction> {
 
-    /**
-     * Create a new reaction instance from the specified definition
-     * within the specified parent. This constructor should be called
-     * only by the ReactorInstance class, but it is public to enable unit tests.
-     * @param definition A reaction definition.
-     * @param parent The parent reactor instance, which cannot be null.
-     * @param index The index of the reaction within the reactor (0 for the
-     * first reaction, 1 for the second, etc.).
-     */
-    public ReactionInstance(
-            Reaction definition, 
-            ReactorInstance parent, 
-            int index
-    ) {
-        super(definition, parent);
-        this.index = index;
-        
-        String body = ASTUtils.toText(definition.getCode());
-        
-        // Identify the dependencies for this reaction.
-        // First handle the triggers.
-        for (TriggerRef trigger : definition.getTriggers()) {
-            if (trigger instanceof VarRef) {
-                Variable variable = ((VarRef)trigger).getVariable();
-                if (variable instanceof Port) {
-                    PortInstance portInstance = parent.lookupPortInstance((Port)variable);
-                    // If the trigger is the port of a contained bank, then the
-                    // portInstance will be null and we have to instead search for
-                    // each port instance in the bank.
-                    if (portInstance != null) {
-                        this.sources.add(portInstance);
-                        portInstance.dependentReactions.add(this);
-                        this.triggers.add(portInstance);
-                    } else if (((VarRef)trigger).getContainer() != null) {
-                        // Port belongs to a contained reactor or bank.
-                        ReactorInstance containedReactor
-                                = parent.lookupReactorInstance(((VarRef)trigger).getContainer());
-                        if (containedReactor != null) {
-                            portInstance = containedReactor.lookupPortInstance((Port)variable);
-                            if (portInstance != null) {
-                                this.sources.add(portInstance);
-                                portInstance.dependentReactions.add(this);
-                                this.triggers.add(portInstance);
-                            }
-                        }
-                    }
-                } else if (variable instanceof Action) {
-                    var actionInstance = parent.lookupActionInstance(
-                        (Action)((VarRef)trigger).getVariable());
-                    this.triggers.add(actionInstance);
-                    actionInstance.dependentReactions.add(this);
-                    this.sources.add(actionInstance);
-                } else if (variable instanceof Timer) {
-                    var timerInstance = parent.lookupTimerInstance(
-                            (Timer)((VarRef)trigger).getVariable());
-                    this.triggers.add(timerInstance);
-                    timerInstance.dependentReactions.add(this);
-                    this.sources.add(timerInstance);
-                }
-            } else if (trigger instanceof BuiltinTriggerRef) {
-                this.triggers.add(parent.getOrCreateBuiltinTrigger((BuiltinTriggerRef) trigger));
+  /**
+   * Create a new reaction instance from the specified definition within the specified parent. This
+   * constructor should be called only by the ReactorInstance class, but it is public to enable unit
+   * tests.
+   *
+   * @param definition A reaction definition.
+   * @param parent The parent reactor instance, which cannot be null.
+   * @param index The index of the reaction within the reactor (0 for the first reaction, 1 for the
+   *     second, etc.).
+   */
+  public ReactionInstance(Reaction definition, ReactorInstance parent, int index) {
+    super(definition, parent);
+    this.index = index;
+
+    String body = ASTUtils.toText(definition.getCode());
+
+    // Identify the dependencies for this reaction.
+    // First handle the triggers.
+    for (TriggerRef trigger : definition.getTriggers()) {
+      if (trigger instanceof VarRef) {
+        Variable variable = ((VarRef) trigger).getVariable();
+        if (variable instanceof Port) {
+          PortInstance portInstance = parent.lookupPortInstance((Port) variable);
+          // If the trigger is the port of a contained bank, then the
+          // portInstance will be null and we have to instead search for
+          // each port instance in the bank.
+          if (portInstance != null) {
+            this.sources.add(portInstance);
+            portInstance.dependentReactions.add(this);
+            this.triggers.add(portInstance);
+          } else if (((VarRef) trigger).getContainer() != null) {
+            // Port belongs to a contained reactor or bank.
+            ReactorInstance containedReactor =
+                parent.lookupReactorInstance(((VarRef) trigger).getContainer());
+            if (containedReactor != null) {
+              portInstance = containedReactor.lookupPortInstance((Port) variable);
+              if (portInstance != null) {
+                this.sources.add(portInstance);
+                portInstance.dependentReactions.add(this);
+                this.triggers.add(portInstance);
+              }
             }
+          }
+        } else if (variable instanceof Action) {
+          var actionInstance =
+              parent.lookupActionInstance((Action) ((VarRef) trigger).getVariable());
+          this.triggers.add(actionInstance);
+          actionInstance.dependentReactions.add(this);
+          this.sources.add(actionInstance);
+        } else if (variable instanceof Timer) {
+          var timerInstance = parent.lookupTimerInstance((Timer) ((VarRef) trigger).getVariable());
+          this.triggers.add(timerInstance);
+          timerInstance.dependentReactions.add(this);
+          this.sources.add(timerInstance);
         }
-        // Next handle the ports that this reaction reads.
-        for (VarRef source : definition.getSources()) {
-            Variable variable = source.getVariable();
-            if (variable instanceof Port) {
-                var portInstance = parent.lookupPortInstance((Port)variable);
-
-                // If the trigger is the port of a contained bank, then the
-                // portInstance will be null and we have to instead search for
-                // each port instance in the bank.
-                if (portInstance != null) {
-                    this.sources.add(portInstance);
-                    this.reads.add(portInstance);
-                    portInstance.dependentReactions.add(this);
-                } else if (source.getContainer() != null) {
-                    ReactorInstance containedReactor
-                            = parent.lookupReactorInstance(source.getContainer());
-                    if (containedReactor != null) {
-                        portInstance = containedReactor.lookupPortInstance((Port)variable);
-                        if (portInstance != null) {
-                            this.sources.add(portInstance);
-                            portInstance.dependentReactions.add(this);
-                            this.triggers.add(portInstance);
-                        }
-                    }
-                }
+      } else if (trigger instanceof BuiltinTriggerRef) {
+        this.triggers.add(parent.getOrCreateBuiltinTrigger((BuiltinTriggerRef) trigger));
+      }
+    }
+    // Next handle the ports that this reaction reads.
+    for (VarRef source : definition.getSources()) {
+      Variable variable = source.getVariable();
+      if (variable instanceof Port) {
+        var portInstance = parent.lookupPortInstance((Port) variable);
+
+        // If the trigger is the port of a contained bank, then the
+        // portInstance will be null and we have to instead search for
+        // each port instance in the bank.
+        if (portInstance != null) {
+          this.sources.add(portInstance);
+          this.reads.add(portInstance);
+          portInstance.dependentReactions.add(this);
+        } else if (source.getContainer() != null) {
+          ReactorInstance containedReactor = parent.lookupReactorInstance(source.getContainer());
+          if (containedReactor != null) {
+            portInstance = containedReactor.lookupPortInstance((Port) variable);
+            if (portInstance != null) {
+              this.sources.add(portInstance);
+              portInstance.dependentReactions.add(this);
+              this.triggers.add(portInstance);
             }
+          }
         }
+      }
+    }
 
-        // Finally, handle the effects.
-        for (VarRef effect : definition.getEffects()) {
-            Variable variable = effect.getVariable();
-            if (variable instanceof Port) {
-                var portInstance = parent.lookupPortInstance(effect);
-                if (portInstance != null) {
-                    this.effects.add(portInstance);
-                    portInstance.dependsOnReactions.add(this);
-                } else {
-                    throw new InvalidSourceException(
-                            "Unexpected effect. Cannot find port " + variable.getName());
-                }
-            } else if (variable instanceof Action) {
-                // Effect is an Action.
-                var actionInstance = parent.lookupActionInstance(
-                    (Action)variable);
-                this.effects.add(actionInstance);
-                actionInstance.dependsOnReactions.add(this);
-            } else {
-                // Effect is either a mode or an unresolved reference.
-                // Do nothing, transitions will be set up by the ModeInstance.
-            }
-        }
-        // Create a deadline instance if one has been defined.
-        if (this.definition.getDeadline() != null) {
-            this.declaredDeadline = new DeadlineInstance(
-                this.definition.getDeadline(), this);
+    // Finally, handle the effects.
+    for (VarRef effect : definition.getEffects()) {
+      Variable variable = effect.getVariable();
+      if (variable instanceof Port) {
+        var portInstance = parent.lookupPortInstance(effect);
+        if (portInstance != null) {
+          this.effects.add(portInstance);
+          portInstance.dependsOnReactions.add(this);
+        } else {
+          throw new InvalidSourceException(
+              "Unexpected effect. Cannot find port " + variable.getName());
         }
+      } else if (variable instanceof Action) {
+        // Effect is an Action.
+        var actionInstance = parent.lookupActionInstance((Action) variable);
+        this.effects.add(actionInstance);
+        actionInstance.dependsOnReactions.add(this);
+      } else {
+        // Effect is either a mode or an unresolved reference.
+        // Do nothing, transitions will be set up by the ModeInstance.
+      }
     }
-
-    //////////////////////////////////////////////////////
-    //// Public fields.
-
-    /**
-     * Indicates the chain this reaction is a part of. It is constructed
-     * through a bit-wise or among all upstream chains. Each fork in the
-     * dependency graph setting a new, unused bit to true in order to
-     * disambiguate it from parallel chains. Note that zero results in
-     * no overlap with any other reaction, which means the reaction can
-     * execute in parallel with any other reaction. The default is 1L.
-     * If left at the default, parallel execution will be based purely
-     * on levels.
-     */
-    public long chainID = 1L;
-
-    /**
-     * The ports or actions that this reaction may write to.
-     */
-    public Set<TriggerInstance<? extends Variable>> effects = new LinkedHashSet<>();
-
-    /**
-     * The ports, actions, or timers that this reaction is triggered by or uses.
-     */
-    public Set<TriggerInstance<? extends Variable>> sources = new LinkedHashSet<>();
-    // FIXME: Above sources is misnamed because in the grammar,
-    // "sources" are only the inputs a reaction reads without being
-    // triggered by them. The name "reads" used here would be a better
-    // choice in the grammar.
-
-    /**
-     * Deadline for this reaction instance, if declared.
-     */
-    public DeadlineInstance declaredDeadline;
-
-    /**
-     * Index of order of occurrence within the reactor definition.
-     * The first reaction has index 0, the second index 1, etc.
-     */
-    public int index;
-
-    /**
-     * The ports that this reaction reads but that do not trigger it.
-     */
-    public Set<TriggerInstance<? extends Variable>> reads = new LinkedHashSet<>();
-
-    /**
-     * The trigger instances (input ports, timers, and actions
-     * that trigger reactions) that trigger this reaction.
-     */
-    public Set<TriggerInstance<? extends Variable>> triggers = new LinkedHashSet<>();
-
-    //////////////////////////////////////////////////////
-    //// Public methods.
-
-    /**
-     * Clear caches used in reporting dependentReactions() and dependsOnReactions().
-     * This method should be called if any changes are made to triggers, sources,
-     * or effects.
-     * @param includingRuntimes If false, leave the runtime instances intact.
-     *  This is useful for federated execution where levels are computed using
-     *  the top-level connections, but then those connections are discarded.
-     */
-    public void clearCaches(boolean includingRuntimes) {
-        dependentReactionsCache = null;
-        dependsOnReactionsCache = null;
-        if (includingRuntimes) runtimeInstances = null;
+    // Create a deadline instance if one has been defined.
+    if (this.definition.getDeadline() != null) {
+      this.declaredDeadline = new DeadlineInstance(this.definition.getDeadline(), this);
     }
-
-    /**
-     * Return the set of immediate downstream reactions, which are reactions
-     * that receive data produced by this reaction plus
-     * at most one reaction in the same reactor whose definition
-     * lexically follows this one.
-     */
-    public Set<ReactionInstance> dependentReactions() {
-        // Cache the result.
-        if (dependentReactionsCache != null) return dependentReactionsCache;
-        dependentReactionsCache = new LinkedHashSet<>();
-
-        // First, add the next lexical reaction, if appropriate.
-        if (parent.reactions.size() > index + 1) {
-            // Find the next reaction in the parent's reaction list.
-            dependentReactionsCache.add(parent.reactions.get(index + 1));
-        }
-
-        // Next, add reactions that get data from this one via a port.
-        for (TriggerInstance<? extends Variable> effect : effects) {
-            if (effect instanceof PortInstance) {
-                for (SendRange senderRange
-                        : ((PortInstance)effect).eventualDestinations()) {
-                    for (RuntimeRange<PortInstance> destinationRange
-                            : senderRange.destinations) {
-                        dependentReactionsCache.addAll(
-                                destinationRange.instance.dependentReactions);
-                    }
-                }
-            }
-        }
-        return dependentReactionsCache;
+  }
+
+  //////////////////////////////////////////////////////
+  //// Public fields.
+
+  /**
+   * Indicates the chain this reaction is a part of. It is constructed through a bit-wise or among
+   * all upstream chains. Each fork in the dependency graph setting a new, unused bit to true in
+   * order to disambiguate it from parallel chains. Note that zero results in no overlap with any
+   * other reaction, which means the reaction can execute in parallel with any other reaction. The
+   * default is 1L. If left at the default, parallel execution will be based purely on levels.
+   */
+  public long chainID = 1L;
+
+  /** The ports or actions that this reaction may write to. */
+  public Set<TriggerInstance<? extends Variable>> effects = new LinkedHashSet<>();
+
+  /** The ports, actions, or timers that this reaction is triggered by or uses. */
+  public Set<TriggerInstance<? extends Variable>> sources = new LinkedHashSet<>();
+  // FIXME: Above sources is misnamed because in the grammar,
+  // "sources" are only the inputs a reaction reads without being
+  // triggered by them. The name "reads" used here would be a better
+  // choice in the grammar.
+
+  /** Deadline for this reaction instance, if declared. */
+  public DeadlineInstance declaredDeadline;
+
+  /**
+   * Index of order of occurrence within the reactor definition. The first reaction has index 0, the
+   * second index 1, etc.
+   */
+  public int index;
+
+  /** The ports that this reaction reads but that do not trigger it. */
+  public Set<TriggerInstance<? extends Variable>> reads = new LinkedHashSet<>();
+
+  /**
+   * The trigger instances (input ports, timers, and actions that trigger reactions) that trigger
+   * this reaction.
+   */
+  public Set<TriggerInstance<? extends Variable>> triggers = new LinkedHashSet<>();
+
+  //////////////////////////////////////////////////////
+  //// Public methods.
+
+  /**
+   * Clear caches used in reporting dependentReactions() and dependsOnReactions(). This method
+   * should be called if any changes are made to triggers, sources, or effects.
+   *
+   * @param includingRuntimes If false, leave the runtime instances intact. This is useful for
+   *     federated execution where levels are computed using the top-level connections, but then
+   *     those connections are discarded.
+   */
+  public void clearCaches(boolean includingRuntimes) {
+    dependentReactionsCache = null;
+    dependsOnReactionsCache = null;
+    if (includingRuntimes) runtimeInstances = null;
+  }
+
+  /**
+   * Return the set of immediate downstream reactions, which are reactions that receive data
+   * produced by this reaction plus at most one reaction in the same reactor whose definition
+   * lexically follows this one.
+   */
+  public Set<ReactionInstance> dependentReactions() {
+    // Cache the result.
+    if (dependentReactionsCache != null) return dependentReactionsCache;
+    dependentReactionsCache = new LinkedHashSet<>();
+
+    // First, add the next lexical reaction, if appropriate.
+    if (parent.reactions.size() > index + 1) {
+      // Find the next reaction in the parent's reaction list.
+      dependentReactionsCache.add(parent.reactions.get(index + 1));
     }
 
-    /**
-     * Return the set of immediate upstream reactions, which are reactions
-     * that send data to this one plus at most one reaction in the same
-     * reactor whose definition immediately precedes the definition of this one
-     */
-    public Set<ReactionInstance> dependsOnReactions() {
-        // Cache the result.
-        if (dependsOnReactionsCache != null) return dependsOnReactionsCache;
-        dependsOnReactionsCache = new LinkedHashSet<>();
-
-        // First, add the previous lexical reaction, if appropriate.
-        if (index > 0) {
-            // Find the previous ordered reaction in the parent's reaction list.
-            int earlierIndex = index - 1;
-            ReactionInstance earlierOrderedReaction = parent.reactions.get(earlierIndex);
-            while (--earlierIndex >= 0) {
-                earlierOrderedReaction = parent.reactions.get(earlierIndex);
-            }
-            if (earlierIndex >= 0) {
-                dependsOnReactionsCache.add(parent.reactions.get(index - 1));
-            }
+    // Next, add reactions that get data from this one via a port.
+    for (TriggerInstance<? extends Variable> effect : effects) {
+      if (effect instanceof PortInstance) {
+        for (SendRange senderRange : ((PortInstance) effect).eventualDestinations()) {
+          for (RuntimeRange<PortInstance> destinationRange : senderRange.destinations) {
+            dependentReactionsCache.addAll(destinationRange.instance.dependentReactions);
+          }
         }
-
-        // Next, add reactions that send data to this one.
-        for (TriggerInstance<? extends Variable> source : sources) {
-            if (source instanceof PortInstance) {
-                // First, add reactions that send data through an intermediate port.
-                for (RuntimeRange<PortInstance> senderRange
-                        : ((PortInstance)source).eventualSources()) {
-                    dependsOnReactionsCache.addAll(senderRange.instance.dependsOnReactions);
-                }
-                // Then, add reactions that send directly to this port.
-                dependsOnReactionsCache.addAll(source.dependsOnReactions);
-            }
-        }
-        return dependsOnReactionsCache;
+      }
     }
-
-    /**
-     * Return a set of levels that runtime instances of this reaction have.
-     * A ReactionInstance may have more than one level if it lies within
-     * a bank and its dependencies on other reactions pass through multiports.
-     */
-    public Set<Integer> getLevels() {
-        Set<Integer> result = new LinkedHashSet<>();
-        // Force calculation of levels if it has not been done.
-        // FIXME: Comment out this as I think it is redundant.
-        //  If it is NOT redundant then deadline propagation is not correct
-        // parent.assignLevels();
-        for (Runtime runtime : runtimeInstances) {
-            result.add(runtime.level);
-        }
-        return result;
+    return dependentReactionsCache;
+  }
+
+  /**
+   * Return the set of immediate upstream reactions, which are reactions that send data to this one
+   * plus at most one reaction in the same reactor whose definition immediately precedes the
+   * definition of this one
+   */
+  public Set<ReactionInstance> dependsOnReactions() {
+    // Cache the result.
+    if (dependsOnReactionsCache != null) return dependsOnReactionsCache;
+    dependsOnReactionsCache = new LinkedHashSet<>();
+
+    // First, add the previous lexical reaction, if appropriate.
+    if (index > 0) {
+      // Find the previous ordered reaction in the parent's reaction list.
+      int earlierIndex = index - 1;
+      ReactionInstance earlierOrderedReaction = parent.reactions.get(earlierIndex);
+      while (--earlierIndex >= 0) {
+        earlierOrderedReaction = parent.reactions.get(earlierIndex);
+      }
+      if (earlierIndex >= 0) {
+        dependsOnReactionsCache.add(parent.reactions.get(index - 1));
+      }
     }
 
-    /**
-     * Return a set of deadlines that runtime instances of this reaction have.
-     * A ReactionInstance may have more than one deadline if it lies within.
-     */
-    public Set<TimeValue> getInferredDeadlines() {
-        Set<TimeValue> result = new LinkedHashSet<>();
-        for (Runtime runtime : runtimeInstances) {
-            result.add(runtime.deadline);
+    // Next, add reactions that send data to this one.
+    for (TriggerInstance<? extends Variable> source : sources) {
+      if (source instanceof PortInstance) {
+        // First, add reactions that send data through an intermediate port.
+        for (RuntimeRange<PortInstance> senderRange : ((PortInstance) source).eventualSources()) {
+          dependsOnReactionsCache.addAll(senderRange.instance.dependsOnReactions);
         }
-        return result;
+        // Then, add reactions that send directly to this port.
+        dependsOnReactionsCache.addAll(source.dependsOnReactions);
+      }
     }
-
-
-    /**
-     * Return a list of levels that runtime instances of this reaction have.
-     * The size of this list is the total number of runtime instances.
-     * A ReactionInstance may have more than one level if it lies within
-     * a bank and its dependencies on other reactions pass through multiports.
-     */
-    public List<Integer> getLevelsList() {
-        List<Integer> result = new LinkedList<>();
-        // Force calculation of levels if it has not been done.
-        // FIXME: Comment out this as I think it is redundant.
-        //  If it is NOT redundant then deadline propagation is not correct
-        // parent.assignLevels();
-        for (Runtime runtime : runtimeInstances) {
-            result.add(runtime.level);
-        }
-        return result;
+    return dependsOnReactionsCache;
+  }
+
+  /**
+   * Return a set of levels that runtime instances of this reaction have. A ReactionInstance may
+   * have more than one level if it lies within a bank and its dependencies on other reactions pass
+   * through multiports.
+   */
+  public Set<Integer> getLevels() {
+    Set<Integer> result = new LinkedHashSet<>();
+    // Force calculation of levels if it has not been done.
+    // FIXME: Comment out this as I think it is redundant.
+    //  If it is NOT redundant then deadline propagation is not correct
+    // parent.assignLevels();
+    for (Runtime runtime : runtimeInstances) {
+      result.add(runtime.level);
     }
-
-    /**
-     * Return a list of the deadlines that runtime instances of this reaction have.
-     * The size of this list is the total number of runtime instances.
-     * A ReactionInstance may have more than one deadline if it lies within
-     */
-    public List<TimeValue> getInferredDeadlinesList() {
-        List<TimeValue> result = new LinkedList<>();
-        for (Runtime runtime : runtimeInstances) {
-            result.add(runtime.deadline);
-        }
-        return result;
+    return result;
+  }
+
+  /**
+   * Return a set of deadlines that runtime instances of this reaction have. A ReactionInstance may
+   * have more than one deadline if it lies within.
+   */
+  public Set<TimeValue> getInferredDeadlines() {
+    Set<TimeValue> result = new LinkedHashSet<>();
+    for (Runtime runtime : runtimeInstances) {
+      result.add(runtime.deadline);
     }
-
-
-    /**
-     * Return the name of this reaction, which is 'reaction_n',
-     * where n is replaced by the reaction index.
-     * @return The name of this reaction.
-     */
-    @Override
-    public String getName() {
-        return "reaction_" + this.index;
+    return result;
+  }
+
+  /**
+   * Return a list of levels that runtime instances of this reaction have. The size of this list is
+   * the total number of runtime instances. A ReactionInstance may have more than one level if it
+   * lies within a bank and its dependencies on other reactions pass through multiports.
+   */
+  public List<Integer> getLevelsList() {
+    List<Integer> result = new LinkedList<>();
+    // Force calculation of levels if it has not been done.
+    // FIXME: Comment out this as I think it is redundant.
+    //  If it is NOT redundant then deadline propagation is not correct
+    // parent.assignLevels();
+    for (Runtime runtime : runtimeInstances) {
+      result.add(runtime.level);
     }
-
-    /**
-     * Return an array of runtime instances of this reaction in a
-     * <i>natural order</i>, defined as follows.  The position within the
-     * returned list of the runtime instance is given by a mixed-radix
-     * number where the low-order digit is the bank index within the
-     * container reactor (or {@code 0} if it is not a bank), the second low order
-     * digit is the bank index of the container's container (or {@code 0} if
-     * it is not a bank), etc., until the container that is directly
-     * contained by the top level (the top-level reactor need not be
-     * included because its index is always {@code 0}).
-     * 
-     * The size of the returned array is the product of the widths of all of the
-     * container {@link ReactorInstance} objects. If none of these is a bank,
-     * then the size will be {@code 1}.
-     *     
-     * This method creates this array the first time it is called, but then
-     * holds on to it.  The array is used by {@link ReactionInstanceGraph}
-     * to determine and record levels and deadline for runtime instances
-     * of reactors.
-     */
-    public List<Runtime> getRuntimeInstances() {
-        if (runtimeInstances != null) return runtimeInstances;
-        int size = parent.getTotalWidth();
-        // If the width cannot be determined, assume there is only one instance.
-        if (size < 0) size = 1;
-        runtimeInstances = new ArrayList<>(size);
-        for (int i = 0; i < size; i++) {
-            Runtime r = new Runtime();
-            r.id = i;
-            if (declaredDeadline != null) {
-                r.deadline = declaredDeadline.maxDelay;
-            }
-            runtimeInstances.add(r);
-        }
-        return runtimeInstances;
+    return result;
+  }
+
+  /**
+   * Return a list of the deadlines that runtime instances of this reaction have. The size of this
+   * list is the total number of runtime instances. A ReactionInstance may have more than one
+   * deadline if it lies within
+   */
+  public List<TimeValue> getInferredDeadlinesList() {
+    List<TimeValue> result = new LinkedList<>();
+    for (Runtime runtime : runtimeInstances) {
+      result.add(runtime.deadline);
     }
-
-    /**
-     * Purge 'portInstance' from this reaction, removing it from the list
-     * of triggers, sources, effects, and reads.  Note that this leaves
-     * the runtime instances intact, including their level information.
-     */
-    public void removePortInstance(PortInstance portInstance) {
-        this.triggers.remove(portInstance);
-        this.sources.remove(portInstance);
-        this.effects.remove(portInstance);
-        this.reads.remove(portInstance);
-        clearCaches(false);
-        portInstance.clearCaches();
+    return result;
+  }
+
+  /**
+   * Return the name of this reaction, which is 'reaction_n', where n is replaced by the reaction
+   * index.
+   *
+   * @return The name of this reaction.
+   */
+  @Override
+  public String getName() {
+    return "reaction_" + this.index;
+  }
+
+  /**
+   * Return an array of runtime instances of this reaction in a <i>natural order</i>, defined as
+   * follows. The position within the returned list of the runtime instance is given by a
+   * mixed-radix number where the low-order digit is the bank index within the container reactor (or
+   * {@code 0} if it is not a bank), the second low order digit is the bank index of the container's
+   * container (or {@code 0} if it is not a bank), etc., until the container that is directly
+   * contained by the top level (the top-level reactor need not be included because its index is
+   * always {@code 0}).
+   *
+   * <p>The size of the returned array is the product of the widths of all of the container {@link
+   * ReactorInstance} objects. If none of these is a bank, then the size will be {@code 1}.
+   *
+   * <p>This method creates this array the first time it is called, but then holds on to it. The
+   * array is used by {@link ReactionInstanceGraph} to determine and record levels and deadline for
+   * runtime instances of reactors.
+   */
+  public List<Runtime> getRuntimeInstances() {
+    if (runtimeInstances != null) return runtimeInstances;
+    int size = parent.getTotalWidth();
+    // If the width cannot be determined, assume there is only one instance.
+    if (size < 0) size = 1;
+    runtimeInstances = new ArrayList<>(size);
+    for (int i = 0; i < size; i++) {
+      Runtime r = new Runtime();
+      r.id = i;
+      if (declaredDeadline != null) {
+        r.deadline = declaredDeadline.maxDelay;
+      }
+      runtimeInstances.add(r);
     }
-
-    /**
-     * Return a descriptive string.
-     */
-    @Override
-    public String toString() {
-        return getName() + " of " + parent.getFullName();
+    return runtimeInstances;
+  }
+
+  /**
+   * Purge 'portInstance' from this reaction, removing it from the list of triggers, sources,
+   * effects, and reads. Note that this leaves the runtime instances intact, including their level
+   * information.
+   */
+  public void removePortInstance(PortInstance portInstance) {
+    this.triggers.remove(portInstance);
+    this.sources.remove(portInstance);
+    this.effects.remove(portInstance);
+    this.reads.remove(portInstance);
+    clearCaches(false);
+    portInstance.clearCaches();
+  }
+
+  /** Return a descriptive string. */
+  @Override
+  public String toString() {
+    return getName() + " of " + parent.getFullName();
+  }
+
+  /**
+   * Determine logical execution time for each reaction during compile time based on immediate
+   * downstream logical delays (after delays and actions) and label each reaction with the minimum
+   * of all such delays.
+   */
+  public TimeValue assignLogicalExecutionTime() {
+    if (this.let != null) {
+      return this.let;
     }
 
-    /**
-     * Determine logical execution time for each reaction during compile
-     * time based on immediate downstream logical delays (after delays and actions)
-     * and label each reaction with the minimum of all such delays.
-     */
-    public TimeValue assignLogicalExecutionTime() {
-        if (this.let != null) {
-            return this.let;
-        }
-
-        if (this.parent.isGeneratedDelay()) {
-            return this.let = TimeValue.ZERO;
-        }
+    if (this.parent.isGeneratedDelay()) {
+      return this.let = TimeValue.ZERO;
+    }
 
-        TimeValue let = null;
-
-        // Iterate over effect and find minimum delay.
-        for (TriggerInstance<? extends Variable> effect : effects) {
-            if (effect instanceof PortInstance) {
-                var afters = this.parent.getParent().children.stream().filter(c -> {
-                    if (c.isGeneratedDelay()) {
-                        return c.inputs.get(0).getDependsOnPorts().get(0).instance
-                                       .equals((PortInstance) effect);
-                    }
-                    return false;
-                }).map(c -> c.actions.get(0).getMinDelay())
-                  .min(TimeValue::compare);
-
-                if (afters.isPresent()) {
-                    if (let == null) {
-                        let = afters.get();
-                    } else {
-                        let = TimeValue.min(afters.get(), let);
-                    }
-                }
-            } else if (effect instanceof ActionInstance) {
-                var action = ((ActionInstance) effect).getMinDelay();
-                if (let == null) {
-                    let = action;
-                } else {
-                    let = TimeValue.min(action, let);
-                }
-            }
+    TimeValue let = null;
+
+    // Iterate over effect and find minimum delay.
+    for (TriggerInstance<? extends Variable> effect : effects) {
+      if (effect instanceof PortInstance) {
+        var afters =
+            this.parent.getParent().children.stream()
+                .filter(
+                    c -> {
+                      if (c.isGeneratedDelay()) {
+                        return c.inputs
+                            .get(0)
+                            .getDependsOnPorts()
+                            .get(0)
+                            .instance
+                            .equals((PortInstance) effect);
+                      }
+                      return false;
+                    })
+                .map(c -> c.actions.get(0).getMinDelay())
+                .min(TimeValue::compare);
+
+        if (afters.isPresent()) {
+          if (let == null) {
+            let = afters.get();
+          } else {
+            let = TimeValue.min(afters.get(), let);
+          }
         }
-
+      } else if (effect instanceof ActionInstance) {
+        var action = ((ActionInstance) effect).getMinDelay();
         if (let == null) {
-            let = TimeValue.ZERO;
+          let = action;
+        } else {
+          let = TimeValue.min(action, let);
         }
-        return this.let = let;
+      }
     }
 
-    //////////////////////////////////////////////////////
-    //// Private variables.
-
-    /** Cache of the set of downstream reactions. */
-    private Set<ReactionInstance> dependentReactionsCache;
-
-    /** Cache of the set of upstream reactions. */
-    private Set<ReactionInstance> dependsOnReactionsCache;
-
-    /**
-     * Array of runtime instances of this reaction.
-     * This has length 1 unless the reaction is contained
-     * by one or more banks.  Suppose that this reaction
-     * has depth 3, with full name r0.r1.r2.r. The top-level
-     * reactor is r0, which contains r1, which contains r2,
-     * which contains this reaction r.  Suppose the widths
-     * of the containing reactors are w0, w1, and w2, and
-     * we are interested in the instance at bank indexes
-     * b0, b1, and b2.  That instance is in this array at
-     * location given by the <strong>natural ordering</strong>, which
-     * is the mixed radix number b2%w2; b1%w1.
-     */
-    private List<Runtime> runtimeInstances;
-
-    private TimeValue let = null;
-
-    ///////////////////////////////////////////////////////////
-    //// Inner classes
-
-    /** Inner class representing a runtime instance of a reaction. */
-    public class Runtime {
-        public TimeValue deadline;
-        // If this reaction instance depends on exactly one upstream
-        // reaction (via a port), then the "dominating" field will
-        // point to that upstream reaction.
-        public Runtime dominating;
-        /** ID ranging from 0 to parent.getTotalWidth() - 1. */
-        public int id;
-        public int level;
-
-        public ReactionInstance getReaction() {
-            return ReactionInstance.this;
-        }
-        @Override
-        public String toString() {
-            String result = ReactionInstance.this + "(level: " + level;
-            if (deadline != null && deadline != TimeValue.MAX_VALUE) {
-               result += ", deadline: " + deadline;
-            }
-            if (dominating != null) {
-                result += ", dominating: " + dominating.getReaction();
-            }
-            result += ")";
-            return result;
-        }
+    if (let == null) {
+      let = TimeValue.ZERO;
+    }
+    return this.let = let;
+  }
+
+  //////////////////////////////////////////////////////
+  //// Private variables.
+
+  /** Cache of the set of downstream reactions. */
+  private Set<ReactionInstance> dependentReactionsCache;
+
+  /** Cache of the set of upstream reactions. */
+  private Set<ReactionInstance> dependsOnReactionsCache;
+
+  /**
+   * Array of runtime instances of this reaction. This has length 1 unless the reaction is contained
+   * by one or more banks. Suppose that this reaction has depth 3, with full name r0.r1.r2.r. The
+   * top-level reactor is r0, which contains r1, which contains r2, which contains this reaction r.
+   * Suppose the widths of the containing reactors are w0, w1, and w2, and we are interested in the
+   * instance at bank indexes b0, b1, and b2. That instance is in this array at location given by
+   * the <strong>natural ordering</strong>, which is the mixed radix number b2%w2; b1%w1.
+   */
+  private List<Runtime> runtimeInstances;
+
+  private TimeValue let = null;
+
+  ///////////////////////////////////////////////////////////
+  //// Inner classes
+
+  /** Inner class representing a runtime instance of a reaction. */
+  public class Runtime {
+    public TimeValue deadline;
+    // If this reaction instance depends on exactly one upstream
+    // reaction (via a port), then the "dominating" field will
+    // point to that upstream reaction.
+    public Runtime dominating;
+    /** ID ranging from 0 to parent.getTotalWidth() - 1. */
+    public int id;
+
+    public int level;
+
+    public ReactionInstance getReaction() {
+      return ReactionInstance.this;
+    }
 
-        public Runtime() {
-            this.dominating = null;
-            this.id = 0;
-            this.level = 0;
-            if (ReactionInstance.this.declaredDeadline != null) {
-                this.deadline = ReactionInstance.this.declaredDeadline.maxDelay;
-            } else {
-                this.deadline = TimeValue.MAX_VALUE;
-            }
-        }
+    @Override
+    public String toString() {
+      String result = ReactionInstance.this + "(level: " + level;
+      if (deadline != null && deadline != TimeValue.MAX_VALUE) {
+        result += ", deadline: " + deadline;
+      }
+      if (dominating != null) {
+        result += ", dominating: " + dominating.getReaction();
+      }
+      result += ")";
+      return result;
+    }
+
+    public Runtime() {
+      this.dominating = null;
+      this.id = 0;
+      this.level = 0;
+      if (ReactionInstance.this.declaredDeadline != null) {
+        this.deadline = ReactionInstance.this.declaredDeadline.maxDelay;
+      } else {
+        this.deadline = TimeValue.MAX_VALUE;
+      }
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java b/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
index ccc061b19f..45386733ba 100644
--- a/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
+++ b/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
@@ -1,28 +1,28 @@
 /** A graph that represents causality cycles formed by reaction instances. */
 
 /*************
-Copyright (c) 2021, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2021, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
@@ -33,8 +33,6 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-
-import org.eclipse.xtend.lib.macro.services.UpstreamTypeLookup;
 import org.lflang.AttributeUtils;
 import org.lflang.generator.ReactionInstance.Runtime;
 import org.lflang.generator.c.CUtil;
@@ -44,384 +42,375 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.validation.AttributeSpec;
 
 /**
- * This class analyzes the dependencies between reaction runtime instances.
- * For each ReactionInstance, there may be more than one runtime instance because
- * the ReactionInstance may be nested within one or more banks.
- * In the worst case, of these runtime instances may have distinct dependencies,
- * and hence distinct levels in the graph. Moreover, some of these instances
- * may be involved in cycles while others are not.
+ * This class analyzes the dependencies between reaction runtime instances. For each
+ * ReactionInstance, there may be more than one runtime instance because the ReactionInstance may be
+ * nested within one or more banks. In the worst case, of these runtime instances may have distinct
+ * dependencies, and hence distinct levels in the graph. Moreover, some of these instances may be
+ * involved in cycles while others are not.
  *
- * Upon construction of this class, the runtime instances are created if necessary,
- * stored each ReactionInstance, and assigned levels (maximum number of
- * upstream reaction instances), deadlines, and single dominating reactions.
+ * <p>Upon construction of this class, the runtime instances are created if necessary, stored each
+ * ReactionInstance, and assigned levels (maximum number of upstream reaction instances), deadlines,
+ * and single dominating reactions.
  *
- * After creation, the resulting graph will be empty unless there are causality
- * cycles, in which case, the resulting graph is a graph of runtime reaction
- * instances that form cycles.
+ * <p>After creation, the resulting graph will be empty unless there are causality cycles, in which
+ * case, the resulting graph is a graph of runtime reaction instances that form cycles.
  *
  * @author Marten Lohstroh
  * @author Edward A. Lee
  */
 public class ReactionInstanceGraph extends PrecedenceGraph<ReactionInstance.Runtime> {
 
-    /**
-     * Create a new graph by traversing the maps in the named instances
-     * embedded in the hierarchy of the program.
-     */
-    public ReactionInstanceGraph(ReactorInstance main) {
-        this.main = main;
-        rebuild();
+  /**
+   * Create a new graph by traversing the maps in the named instances embedded in the hierarchy of
+   * the program.
+   */
+  public ReactionInstanceGraph(ReactorInstance main) {
+    this.main = main;
+    rebuild();
+  }
+
+  ///////////////////////////////////////////////////////////
+  //// Public fields
+
+  /** The main reactor instance that this graph is associated with. */
+  public final ReactorInstance main;
+
+  ///////////////////////////////////////////////////////////
+  //// Public methods
+
+  /**
+   * Rebuild this graph by clearing and repeating the traversal that adds all the nodes and edges.
+   */
+  public void rebuild() {
+    this.clear();
+    addNodesAndEdges(main);
+
+    // FIXME: Use {@link TargetProperty#EXPORT_DEPENDENCY_GRAPH}.
+    // System.out.println(toDOT());
+    addDependentNetworkEdges(main);
+
+    // Assign a level to each reaction.
+    // If there are cycles present in the graph, it will be detected here.
+    assignLevels();
+    if (nodeCount() != 0) {
+      // The graph has cycles.
+      // main.reporter.reportError("Reactions form a cycle! " + toString());
+      // Do not throw an exception so that cycle visualization can proceed.
+      // throw new InvalidSourceException("Reactions form a cycle!");
     }
-
-    ///////////////////////////////////////////////////////////
-    //// Public fields
-
-    /**
-     * The main reactor instance that this graph is associated with.
-     */
-    public final ReactorInstance main;
-
-    ///////////////////////////////////////////////////////////
-    //// Public methods
-
-    /**
-     * Rebuild this graph by clearing and repeating the traversal that
-     * adds all the nodes and edges.
-     */
-    public void rebuild() {
-        this.clear();
-        addNodesAndEdges(main);
-
-
-        // FIXME: Use {@link TargetProperty#EXPORT_DEPENDENCY_GRAPH}.
-        // System.out.println(toDOT());
-        addDependentNetworkEdges(main);
-
-        // Assign a level to each reaction.
-        // If there are cycles present in the graph, it will be detected here.
-        assignLevels();
-        if (nodeCount() != 0) {
-            // The graph has cycles.
-            // main.reporter.reportError("Reactions form a cycle! " + toString());
-            // Do not throw an exception so that cycle visualization can proceed.
-            // throw new InvalidSourceException("Reactions form a cycle!");
-        }
+  }
+  /**
+   * Adds manually a set of dependent network edges as needed to nudge the level assignment
+   * algorithm into creating a correct level assignment.
+   *
+   * @param main
+   */
+  private void addDependentNetworkEdges(ReactorInstance main) {
+
+    Attribute attribute =
+        AttributeUtils.findAttributeByName(main.definition.getReactorClass(), "_fed_config");
+    String actionsStr =
+        AttributeUtils.getAttributeParameter(attribute, AttributeSpec.DEPENDENCY_PAIRS);
+    if (actionsStr == null)
+      return; // No dependent network edges, the levels algorithm has enough information
+    List<String> dependencies = List.of(actionsStr.split(";", -1));
+    // Recursively add nodes and edges from contained reactors.
+    Map<String, ReactorInstance> m = new HashMap<>();
+    for (ReactorInstance child : main.children) {
+      m.put(child.getName(), child);
     }
-    /**
-     * Adds manually a set of dependent network edges as needed to nudge the level assignment
-     * algorithm into creating a correct level assignment.
-     * @param main
-     */
-    private void addDependentNetworkEdges(ReactorInstance main) {
-
-        Attribute attribute = AttributeUtils.findAttributeByName(main.definition.getReactorClass(), "_fed_config");
-        String actionsStr = AttributeUtils.getAttributeParameter(attribute, AttributeSpec.DEPENDENCY_PAIRS);
-        if (actionsStr == null) return; //No dependent network edges, the levels algorithm has enough information
-        List<String> dependencies = List.of(actionsStr.split(";", -1));
-        // Recursively add nodes and edges from contained reactors.
-        Map<String, ReactorInstance> m = new HashMap<>();
-        for (ReactorInstance child : main.children) {
-            m.put(child.getName(), child);
-        }
-        for(String dependency: dependencies){
-            List<String> dep = List.of(dependency.split(",", 2));
-            ReactorInstance downStream = m.getOrDefault(dep.get(0), null);
-            ReactorInstance upStream = m.getOrDefault(dep.get(1), null);
-            if(downStream == null || upStream == null) {
-                System.out.println("Downstream or Upstream reaction pair is undefined. Continuing.");
-                continue;
-            }
-            ReactionInstance down = downStream.reactions.get(0);
-            Runtime downRuntime = down.getRuntimeInstances().get(0);
-            for(ReactionInstance up: upStream.reactions){
-                Runtime upRuntime = up.getRuntimeInstances().get(0);
-                addEdge(downRuntime, upRuntime);
-            }
-        }
-        
-    }
-    /**
-     * This function rebuilds the graph and propagates and assigns deadlines
-     * to all reactions.
-     */
-    public void rebuildAndAssignDeadlines() {
-        this.clear();
-        addNodesAndEdges(main);
-        addDependentNetworkEdges(main);
-        assignInferredDeadlines();
-        this.clear();
+    for (String dependency : dependencies) {
+      List<String> dep = List.of(dependency.split(",", 2));
+      ReactorInstance downStream = m.getOrDefault(dep.get(0), null);
+      ReactorInstance upStream = m.getOrDefault(dep.get(1), null);
+      if (downStream == null || upStream == null) {
+        System.out.println("Downstream or Upstream reaction pair is undefined. Continuing.");
+        continue;
+      }
+      ReactionInstance down = downStream.reactions.get(0);
+      Runtime downRuntime = down.getRuntimeInstances().get(0);
+      for (ReactionInstance up : upStream.reactions) {
+        Runtime upRuntime = up.getRuntimeInstances().get(0);
+        addEdge(downRuntime, upRuntime);
+      }
     }
-
-    /*
-     * Get an array of non-negative integers representing the number of reactions
-     * per each level, where levels are indices of the array.
-     */
-    public Integer[] getNumReactionsPerLevel() {
-        return numReactionsPerLevel.toArray(new Integer[0]);
+  }
+  /** This function rebuilds the graph and propagates and assigns deadlines to all reactions. */
+  public void rebuildAndAssignDeadlines() {
+    this.clear();
+    addNodesAndEdges(main);
+    addDependentNetworkEdges(main);
+    assignInferredDeadlines();
+    this.clear();
+  }
+
+  /*
+   * Get an array of non-negative integers representing the number of reactions
+   * per each level, where levels are indices of the array.
+   */
+  public Integer[] getNumReactionsPerLevel() {
+    return numReactionsPerLevel.toArray(new Integer[0]);
+  }
+
+  /** Return the max breadth of the reaction dependency graph */
+  public int getBreadth() {
+    var maxBreadth = 0;
+    for (Integer breadth : numReactionsPerLevel) {
+      if (breadth > maxBreadth) {
+        maxBreadth = breadth;
+      }
     }
+    return maxBreadth;
+  }
+
+  ///////////////////////////////////////////////////////////
+  //// Protected methods
+
+  /**
+   * Add to the graph edges between the given reaction and all the reactions that depend on the
+   * specified port.
+   *
+   * @param port The port that the given reaction has as an effect.
+   * @param reaction The reaction to relate downstream reactions to.
+   */
+  protected void addDownstreamReactions(PortInstance port, ReactionInstance reaction) {
+    // Use mixed-radix numbers to increment over the ranges.
+    List<Runtime> srcRuntimes = reaction.getRuntimeInstances();
+    List<SendRange> eventualDestinations = port.eventualDestinations();
+
+    int srcDepth = (port.isInput()) ? 2 : 1;
+
+    for (SendRange sendRange : eventualDestinations) {
+      for (RuntimeRange<PortInstance> dstRange : sendRange.destinations) {
+
+        int dstDepth = (dstRange.instance.isOutput()) ? 2 : 1;
+        MixedRadixInt dstRangePosition = dstRange.startMR();
+        int dstRangeCount = 0;
+
+        MixedRadixInt sendRangePosition = sendRange.startMR();
+        int sendRangeCount = 0;
+
+        while (dstRangeCount++ < dstRange.width) {
+          int srcIndex = sendRangePosition.get(srcDepth);
+          int dstIndex = dstRangePosition.get(dstDepth);
+          for (ReactionInstance dstReaction : dstRange.instance.dependentReactions) {
+            List<Runtime> dstRuntimes = dstReaction.getRuntimeInstances();
+            Runtime srcRuntime = srcRuntimes.get(srcIndex);
+            Runtime dstRuntime = dstRuntimes.get(dstIndex);
+            // Only add this dependency if the reactions are not in modes at all or in the same mode
+            // or in modes of separate reactors
+            // This allows modes to break cycles since modes are always mutually exclusive.
+            if (srcRuntime.getReaction().getMode(true) == null
+                || dstRuntime.getReaction().getMode(true) == null
+                || srcRuntime.getReaction().getMode(true) == dstRuntime.getReaction().getMode(true)
+                || srcRuntime.getReaction().getParent() != dstRuntime.getReaction().getParent()) {
+              addEdge(dstRuntime, srcRuntime);
+            }
 
-    /**
-     * Return the max breadth of the reaction dependency graph
-     */
-    public int getBreadth() {
-        var maxBreadth = 0;
-        for (Integer breadth: numReactionsPerLevel ) {
-            if (breadth > maxBreadth) {
-                maxBreadth = breadth;
+            // Propagate the deadlines, if any.
+            if (srcRuntime.deadline.compareTo(dstRuntime.deadline) > 0) {
+              srcRuntime.deadline = dstRuntime.deadline;
             }
-        }
-        return maxBreadth;
-    }
 
-    ///////////////////////////////////////////////////////////
-    //// Protected methods
-
-    /**
-     * Add to the graph edges between the given reaction and all the reactions
-     * that depend on the specified port.
-     * @param port The port that the given reaction has as an effect.
-     * @param reaction The reaction to relate downstream reactions to.
-     */
-    protected void addDownstreamReactions(PortInstance port, ReactionInstance reaction) {
-        // Use mixed-radix numbers to increment over the ranges.
-        List<Runtime> srcRuntimes = reaction.getRuntimeInstances();
-        List<SendRange> eventualDestinations = port.eventualDestinations();
-
-        int srcDepth = (port.isInput())? 2 : 1;
-
-        for (SendRange sendRange : eventualDestinations) {
-            for (RuntimeRange<PortInstance> dstRange : sendRange.destinations) {
-
-                int dstDepth = (dstRange.instance.isOutput())? 2 : 1;
-                MixedRadixInt dstRangePosition = dstRange.startMR();
-                int dstRangeCount = 0;
-
-                MixedRadixInt sendRangePosition = sendRange.startMR();
-                int sendRangeCount = 0;
-
-                while (dstRangeCount++ < dstRange.width) {
-                    int srcIndex = sendRangePosition.get(srcDepth);
-                    int dstIndex = dstRangePosition.get(dstDepth);
-                    for (ReactionInstance dstReaction : dstRange.instance.dependentReactions) {
-                        List<Runtime> dstRuntimes = dstReaction.getRuntimeInstances();
-                        Runtime srcRuntime = srcRuntimes.get(srcIndex);
-                        Runtime dstRuntime = dstRuntimes.get(dstIndex);
-                        // Only add this dependency if the reactions are not in modes at all or in the same mode or in modes of separate reactors
-                        // This allows modes to break cycles since modes are always mutually exclusive.
-                        if (srcRuntime.getReaction().getMode(true) == null ||
-                                dstRuntime.getReaction().getMode(true) == null ||
-                                srcRuntime.getReaction().getMode(true) == dstRuntime.getReaction().getMode(true) ||
-                                srcRuntime.getReaction().getParent() != dstRuntime.getReaction().getParent()) {
-                            addEdge(dstRuntime, srcRuntime);
-                        }
-
-                        // Propagate the deadlines, if any.
-                        if (srcRuntime.deadline.compareTo(dstRuntime.deadline) > 0) {
-                            srcRuntime.deadline = dstRuntime.deadline;
-                        }
-
-                        // If this seems to be a single dominating reaction, set it.
-                        // If another upstream reaction shows up, then this will be
-                        // reset to null.
-                        if (this.getUpstreamAdjacentNodes(dstRuntime).size() == 1
-                                && (dstRuntime.getReaction().index == 0)) {
-                            dstRuntime.dominating = srcRuntime;
-                        } else {
-                            dstRuntime.dominating = null;
-                        }
-                    }
-                    dstRangePosition.increment();
-                    sendRangePosition.increment();
-                    sendRangeCount++;
-                    if (sendRangeCount >= sendRange.width) {
-                        // Reset to multicast.
-                        sendRangeCount = 0;
-                        sendRangePosition = sendRange.startMR();
-                    }
-                }
+            // If this seems to be a single dominating reaction, set it.
+            // If another upstream reaction shows up, then this will be
+            // reset to null.
+            if (this.getUpstreamAdjacentNodes(dstRuntime).size() == 1
+                && (dstRuntime.getReaction().index == 0)) {
+              dstRuntime.dominating = srcRuntime;
+            } else {
+              dstRuntime.dominating = null;
             }
+          }
+          dstRangePosition.increment();
+          sendRangePosition.increment();
+          sendRangeCount++;
+          if (sendRangeCount >= sendRange.width) {
+            // Reset to multicast.
+            sendRangeCount = 0;
+            sendRangePosition = sendRange.startMR();
+          }
         }
+      }
     }
-
-    /**
-     * Build the graph by adding nodes and edges based on the given reactor
-     * instance.
-     * @param reactor The reactor on the basis of which to add nodes and edges.
-     */
-    protected void addNodesAndEdges(ReactorInstance reactor) {
-        ReactionInstance previousReaction = null;
-        for (ReactionInstance reaction : reactor.reactions) {
-            List<Runtime> runtimes = reaction.getRuntimeInstances();
-
-            // Add reactions of this reactor.
-            for (Runtime runtime : runtimes) {
-                this.addNode(runtime);
-            }
-            
-            // If there is an earlier reaction in this same reactor, then
-            // create a link in the reaction graph for all runtime instances.
-            if (previousReaction != null) {
-                List<Runtime> previousRuntimes = previousReaction.getRuntimeInstances();
-                int count = 0;
-                for (Runtime runtime : runtimes) {
-                    // Only add the reaction order edge if previous reaction is outside of a mode or both are in the same mode
-                    // This allows modes to break cycles since modes are always mutually exclusive.
-                    if (runtime.getReaction().getMode(true) == null || runtime.getReaction().getMode(true) == reaction.getMode(true)) {
-                        this.addEdge(runtime, previousRuntimes.get(count));
-                        count++;
-                    }
-                }
-            }
-            previousReaction = reaction;
-            
-
-            // Add downstream reactions. Note that this is sufficient.
-            // We don't need to also add upstream reactions because this reaction
-            // will be downstream of those upstream reactions.
-            for (TriggerInstance<? extends Variable> effect : reaction.effects) {
-                if (effect instanceof PortInstance) {
-                    addDownstreamReactions((PortInstance)effect, reaction);
-                }
-            }
+  }
+
+  /**
+   * Build the graph by adding nodes and edges based on the given reactor instance.
+   *
+   * @param reactor The reactor on the basis of which to add nodes and edges.
+   */
+  protected void addNodesAndEdges(ReactorInstance reactor) {
+    ReactionInstance previousReaction = null;
+    for (ReactionInstance reaction : reactor.reactions) {
+      List<Runtime> runtimes = reaction.getRuntimeInstances();
+
+      // Add reactions of this reactor.
+      for (Runtime runtime : runtimes) {
+        this.addNode(runtime);
+      }
+
+      // If there is an earlier reaction in this same reactor, then
+      // create a link in the reaction graph for all runtime instances.
+      if (previousReaction != null) {
+        List<Runtime> previousRuntimes = previousReaction.getRuntimeInstances();
+        int count = 0;
+        for (Runtime runtime : runtimes) {
+          // Only add the reaction order edge if previous reaction is outside of a mode or both are
+          // in the same mode
+          // This allows modes to break cycles since modes are always mutually exclusive.
+          if (runtime.getReaction().getMode(true) == null
+              || runtime.getReaction().getMode(true) == reaction.getMode(true)) {
+            this.addEdge(runtime, previousRuntimes.get(count));
+            count++;
+          }
         }
-        // Recursively add nodes and edges from contained reactors.
-        for (ReactorInstance child : reactor.children) {
-            addNodesAndEdges(child);
+      }
+      previousReaction = reaction;
+
+      // Add downstream reactions. Note that this is sufficient.
+      // We don't need to also add upstream reactions because this reaction
+      // will be downstream of those upstream reactions.
+      for (TriggerInstance<? extends Variable> effect : reaction.effects) {
+        if (effect instanceof PortInstance) {
+          addDownstreamReactions((PortInstance) effect, reaction);
         }
+      }
+    }
+    // Recursively add nodes and edges from contained reactors.
+    for (ReactorInstance child : reactor.children) {
+      addNodesAndEdges(child);
+    }
+  }
+
+  ///////////////////////////////////////////////////////////
+  //// Private fields
+
+  /**
+   * Number of reactions per level, represented as a list of integers where the indices are the
+   * levels.
+   */
+  private List<Integer> numReactionsPerLevel = new ArrayList<>(List.of(0));
+
+  ///////////////////////////////////////////////////////////
+  //// Private methods
+
+  /**
+   * Analyze the dependencies between reactions and assign each reaction instance a level. This
+   * method removes nodes from this graph as it assigns levels. Any remaining nodes are part of
+   * causality cycles.
+   *
+   * <p>This procedure is based on Kahn's algorithm for topological sorting. Rather than
+   * establishing a total order, we establish a partial order. In this order, the level of each
+   * reaction is the least upper bound of the levels of the reactions it depends on.
+   */
+  private void assignLevels() {
+    List<ReactionInstance.Runtime> start = new ArrayList<>(rootNodes());
+
+    // All root nodes start with level 0.
+    for (Runtime origin : start) {
+      origin.level = 0;
     }
 
-    ///////////////////////////////////////////////////////////
-    //// Private fields
-
-    /**
-     * Number of reactions per level, represented as a list of
-     * integers where the indices are the levels.
-     */
-    private List<Integer> numReactionsPerLevel = new ArrayList<>(List.of(0));
-
-    ///////////////////////////////////////////////////////////
-    //// Private methods
-
-    /**
-     * Analyze the dependencies between reactions and assign each reaction
-     * instance a level. This method removes nodes from this graph as it
-     * assigns levels. Any remaining nodes are part of causality cycles.
-     *
-     * This procedure is based on Kahn's algorithm for topological sorting.
-     * Rather than establishing a total order, we establish a partial order.
-     * In this order, the level of each reaction is the least upper bound of
-     * the levels of the reactions it depends on.
-     */
-    private void assignLevels() {
-        List<ReactionInstance.Runtime> start = new ArrayList<>(rootNodes());
-
-        // All root nodes start with level 0.
-        for (Runtime origin : start) {
-            origin.level = 0;
+    // No need to do any of this if there are no root nodes;
+    // the graph must be cyclic.
+    while (!start.isEmpty()) {
+      Runtime origin = start.remove(0);
+      Set<Runtime> toRemove = new LinkedHashSet<>();
+      Set<Runtime> downstreamAdjacentNodes = getDownstreamAdjacentNodes(origin);
+
+      // Visit effect nodes.
+      for (Runtime effect : downstreamAdjacentNodes) {
+        // Stage edge between origin and effect for removal.
+        toRemove.add(effect);
+
+        // Update level of downstream node.
+        effect.level = origin.level + 1;
+      }
+      // Remove visited edges.
+      for (Runtime effect : toRemove) {
+        removeEdge(effect, origin);
+        // If the effect node has no more incoming edges,
+        // then move it in the start set.
+        if (getUpstreamAdjacentNodes(effect).isEmpty()) {
+          start.add(effect);
         }
+      }
 
-        // No need to do any of this if there are no root nodes;
-        // the graph must be cyclic.
-        while (!start.isEmpty()) {
-            Runtime origin = start.remove(0);
-            Set<Runtime> toRemove = new LinkedHashSet<>();
-            Set<Runtime> downstreamAdjacentNodes = getDownstreamAdjacentNodes(origin);
-
-            // Visit effect nodes.
-            for (Runtime effect : downstreamAdjacentNodes) {
-                // Stage edge between origin and effect for removal.
-                toRemove.add(effect);
+      // Remove visited origin.
+      removeNode(origin);
 
-                // Update level of downstream node.
-                effect.level = origin.level + 1;
-            }
-            // Remove visited edges.
-            for (Runtime effect : toRemove) {
-                removeEdge(effect, origin);
-                // If the effect node has no more incoming edges,
-                // then move it in the start set.
-                if (getUpstreamAdjacentNodes(effect).isEmpty()) {
-                    start.add(effect);
-                }
-            }
-
-            // Remove visited origin.
-            removeNode(origin);
-
-            // Update numReactionsPerLevel info
-            adjustNumReactionsPerLevel(origin.level, 1);
-        }
+      // Update numReactionsPerLevel info
+      adjustNumReactionsPerLevel(origin.level, 1);
     }
-
-    /**
-     * This function assigns inferred deadlines to all the reactions in the graph.
-     * It is modeled after {@code assignLevels} but it starts at the leaf nodes and uses
-     * Kahns algorithm to build a reverse topologically sorted graph
-     *
-     */
-    private void assignInferredDeadlines() {
-        List<ReactionInstance.Runtime> start = new ArrayList<>(leafNodes());
-
-        // All leaf nodes have deadline initialized to their declared deadline or MAX_VALUE
-        while (!start.isEmpty()) {
-            Runtime origin = start.remove(0);
-            Set<Runtime> toRemove = new LinkedHashSet<>();
-            Set<Runtime> upstreamAdjacentNodes = getUpstreamAdjacentNodes(origin);
-
-            // Visit effect nodes.
-            for (Runtime upstream : upstreamAdjacentNodes) {
-                // Stage edge between origin and upstream for removal.
-                toRemove.add(upstream);
-
-                // Update deadline of upstream node if origins deadline is earlier.
-                if (origin.deadline.isEarlierThan(upstream.deadline)) {
-                    upstream.deadline = origin.deadline;
-                }
-            }
-            // Remove visited edges.
-            for (Runtime upstream : toRemove) {
-                removeEdge(origin, upstream);
-                // If the upstream node has no more outgoing edges,
-                // then move it in the start set.
-                if (getDownstreamAdjacentNodes(upstream).size() == 0) {
-                    start.add(upstream);
-                }
-            }
-
-            // Remove visited origin.
-            removeNode(origin);
+  }
+
+  /**
+   * This function assigns inferred deadlines to all the reactions in the graph. It is modeled after
+   * {@code assignLevels} but it starts at the leaf nodes and uses Kahns algorithm to build a
+   * reverse topologically sorted graph
+   */
+  private void assignInferredDeadlines() {
+    List<ReactionInstance.Runtime> start = new ArrayList<>(leafNodes());
+
+    // All leaf nodes have deadline initialized to their declared deadline or MAX_VALUE
+    while (!start.isEmpty()) {
+      Runtime origin = start.remove(0);
+      Set<Runtime> toRemove = new LinkedHashSet<>();
+      Set<Runtime> upstreamAdjacentNodes = getUpstreamAdjacentNodes(origin);
+
+      // Visit effect nodes.
+      for (Runtime upstream : upstreamAdjacentNodes) {
+        // Stage edge between origin and upstream for removal.
+        toRemove.add(upstream);
+
+        // Update deadline of upstream node if origins deadline is earlier.
+        if (origin.deadline.isEarlierThan(upstream.deadline)) {
+          upstream.deadline = origin.deadline;
         }
-    }
-
-    /**
-     * Adjust {@link #numReactionsPerLevel} at index <code>level<code> by
-     * adding to the previously recorded number <code>valueToAdd<code>.
-     * If there is no previously recorded number for this level, then
-     * create one with index <code>level</code> and value <code>valueToAdd</code>.
-     * @param level The level.
-     * @param valueToAdd The value to add to the number of levels.
-     */
-    private void adjustNumReactionsPerLevel(int level, int valueToAdd) {
-        if (numReactionsPerLevel.size() > level) {
-            numReactionsPerLevel.set(level, numReactionsPerLevel.get(level) + valueToAdd);
-        } else {
-            while (numReactionsPerLevel.size() < level) {
-                numReactionsPerLevel.add(0);
-            }
-            numReactionsPerLevel.add(valueToAdd);
+      }
+      // Remove visited edges.
+      for (Runtime upstream : toRemove) {
+        removeEdge(origin, upstream);
+        // If the upstream node has no more outgoing edges,
+        // then move it in the start set.
+        if (getDownstreamAdjacentNodes(upstream).size() == 0) {
+          start.add(upstream);
         }
+      }
+
+      // Remove visited origin.
+      removeNode(origin);
     }
+  }
+
+  /**
+   * Adjust {@link #numReactionsPerLevel} at index <code>level<code> by
+   * adding to the previously recorded number <code>valueToAdd<code>.
+   * If there is no previously recorded number for this level, then
+   * create one with index <code>level</code> and value <code>valueToAdd</code>.
+   * @param level The level.
+   * @param valueToAdd The value to add to the number of levels.
+   */
+  private void adjustNumReactionsPerLevel(int level, int valueToAdd) {
+    if (numReactionsPerLevel.size() > level) {
+      numReactionsPerLevel.set(level, numReactionsPerLevel.get(level) + valueToAdd);
+    } else {
+      while (numReactionsPerLevel.size() < level) {
+        numReactionsPerLevel.add(0);
+      }
+      numReactionsPerLevel.add(valueToAdd);
+    }
+  }
 
-    /**
-     * Return the DOT (GraphViz) representation of the graph.
-     */
-    @Override
-    public String toDOT() {
-        var dotRepresentation = new CodeBuilder();
-        var edges = new StringBuilder();
+  /** Return the DOT (GraphViz) representation of the graph. */
+  @Override
+  public String toDOT() {
+    var dotRepresentation = new CodeBuilder();
+    var edges = new StringBuilder();
 
-        // Start the digraph with a left-write rank
-        dotRepresentation.pr(
+    // Start the digraph with a left-write rank
+    dotRepresentation.pr(
         """
         digraph {
             rankdir=LF;
@@ -430,49 +419,52 @@ public String toDOT() {
             edge [fontname=Times];
         """);
 
-        var nodes = nodes();
-        // Group nodes by levels
-        var groupedNodes =
-            nodes.stream()
-                 .collect(
-                     Collectors.groupingBy(it -> it.level)
-                 );
-
-        dotRepresentation.indent();
-        // For each level
-        for (var level : groupedNodes.keySet()) {
-            // Create a subgraph
-            dotRepresentation.pr("subgraph cluster_level_" + level + " {");
-            dotRepresentation.pr("    graph [compound=True, label = \"level " + level + "\"];");
-
-            // Get the nodes at the current level
-            var currentLevelNodes = groupedNodes.get(level);
-            for (var node: currentLevelNodes) {
-                // Draw the node
-                var label = CUtil.getName(node.getReaction().getParent().tpr) + "." + node.getReaction().getName();
-                // Need a positive number to name the nodes in GraphViz
-                var labelHashCode = label.hashCode() & 0xfffffff;
-                dotRepresentation.pr("    node_" + labelHashCode  + " [label=\""+ label +"\"];");
-
-                // Draw the edges
-                var downstreamNodes = getDownstreamAdjacentNodes(node);
-                for (var downstreamNode: downstreamNodes) {
-                    var downstreamLabel =  CUtil.getName(downstreamNode.getReaction().getParent().tpr) + "." + downstreamNode.getReaction().getName();
-                    edges.append("    node_" + labelHashCode + " -> node_" +
-                                     (downstreamLabel.hashCode() & 0xfffffff) + ";\n"
-                    );
-                }
-            }
-            // Close the subgraph
-            dotRepresentation.pr("}");
+    var nodes = nodes();
+    // Group nodes by levels
+    var groupedNodes = nodes.stream().collect(Collectors.groupingBy(it -> it.level));
+
+    dotRepresentation.indent();
+    // For each level
+    for (var level : groupedNodes.keySet()) {
+      // Create a subgraph
+      dotRepresentation.pr("subgraph cluster_level_" + level + " {");
+      dotRepresentation.pr("    graph [compound=True, label = \"level " + level + "\"];");
+
+      // Get the nodes at the current level
+      var currentLevelNodes = groupedNodes.get(level);
+      for (var node : currentLevelNodes) {
+        // Draw the node
+        var label =
+            CUtil.getName(node.getReaction().getParent().tpr) + "." + node.getReaction().getName();
+        // Need a positive number to name the nodes in GraphViz
+        var labelHashCode = label.hashCode() & 0xfffffff;
+        dotRepresentation.pr("    node_" + labelHashCode + " [label=\"" + label + "\"];");
+
+        // Draw the edges
+        var downstreamNodes = getDownstreamAdjacentNodes(node);
+        for (var downstreamNode : downstreamNodes) {
+          var downstreamLabel =
+              CUtil.getName(downstreamNode.getReaction().getParent().tpr)
+                  + "."
+                  + downstreamNode.getReaction().getName();
+          edges.append(
+              "    node_"
+                  + labelHashCode
+                  + " -> node_"
+                  + (downstreamLabel.hashCode() & 0xfffffff)
+                  + ";\n");
         }
-        dotRepresentation.unindent();
-        // Add the edges to the definition of the graph at the bottom
-        dotRepresentation.pr(edges);
-        // Close the digraph
-        dotRepresentation.pr("}");
-
-        // Return the DOT representation
-        return dotRepresentation.toString();
+      }
+      // Close the subgraph
+      dotRepresentation.pr("}");
     }
+    dotRepresentation.unindent();
+    // Add the edges to the definition of the graph at the bottom
+    dotRepresentation.pr(edges);
+    // Close the digraph
+    dotRepresentation.pr("}");
+
+    // Return the DOT representation
+    return dotRepresentation.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/ReactorInstance.java b/org.lflang/src/org/lflang/generator/ReactorInstance.java
index 1a62f45a5c..0b54779a36 100644
--- a/org.lflang/src/org/lflang/generator/ReactorInstance.java
+++ b/org.lflang/src/org/lflang/generator/ReactorInstance.java
@@ -1,28 +1,28 @@
 /** A data structure for a reactor instance. */
 
 /*************
-Copyright (c) 2019-2022, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019-2022, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
@@ -37,11 +37,9 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-
-import org.lflang.ast.ASTUtils;
-import org.lflang.AttributeUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.TriggerInstance.BuiltinTriggerVariable;
 import org.lflang.generator.c.TypeParameterizedReactor;
 import org.lflang.lf.Action;
@@ -68,1108 +66,1079 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.lf.WidthSpec;
 
 /**
- * Representation of a compile-time instance of a reactor.
- * If the reactor is instantiated as a bank of reactors, or if any
- * of its parents is instantiated as a bank of reactors, then one instance
- * of this ReactorInstance class represents all the runtime instances within
- * these banks.  The {@link #getTotalWidth()} method returns the number of such
- * runtime instances, which is the product of the bank width of this reactor
- * instance and the bank widths of all of its parents.
- * There is exactly one instance of this ReactorInstance class for each
- * graphical rendition of a reactor in the diagram view.
+ * Representation of a compile-time instance of a reactor. If the reactor is instantiated as a bank
+ * of reactors, or if any of its parents is instantiated as a bank of reactors, then one instance of
+ * this ReactorInstance class represents all the runtime instances within these banks. The {@link
+ * #getTotalWidth()} method returns the number of such runtime instances, which is the product of
+ * the bank width of this reactor instance and the bank widths of all of its parents. There is
+ * exactly one instance of this ReactorInstance class for each graphical rendition of a reactor in
+ * the diagram view.
  *
- * For the main reactor, which has no parent, once constructed,
- * this object represents the entire Lingua Franca program.
- * If the program has causality loops (a programming error), then
- * {@link #hasCycles()} will return true and {@link #getCycles()} will
- * return the ports and reaction instances involved in the cycles.
+ * <p>For the main reactor, which has no parent, once constructed, this object represents the entire
+ * Lingua Franca program. If the program has causality loops (a programming error), then {@link
+ * #hasCycles()} will return true and {@link #getCycles()} will return the ports and reaction
+ * instances involved in the cycles.
  *
  * @author Marten Lohstroh
  * @author Edward A. Lee
  */
 public class ReactorInstance extends NamedInstance<Instantiation> {
 
-    /**
-     * Create a new instantiation hierarchy that starts with the given top-level reactor.
-     * @param reactor The top-level reactor.
-     * @param reporter The error reporter.
-     */
-    public ReactorInstance(Reactor reactor, ErrorReporter reporter) {
-        this(ASTUtils.createInstantiation(reactor), null, reporter, -1);
+  /**
+   * Create a new instantiation hierarchy that starts with the given top-level reactor.
+   *
+   * @param reactor The top-level reactor.
+   * @param reporter The error reporter.
+   */
+  public ReactorInstance(Reactor reactor, ErrorReporter reporter) {
+    this(ASTUtils.createInstantiation(reactor), null, reporter, -1);
+  }
+
+  /**
+   * Create a new instantiation hierarchy that starts with the given top-level reactor but only
+   * creates contained reactors up to the specified depth.
+   *
+   * @param reactor The top-level reactor.
+   * @param reporter The error reporter.
+   * @param desiredDepth The depth to which to go, or -1 to construct the full hierarchy.
+   */
+  public ReactorInstance(Reactor reactor, ErrorReporter reporter, int desiredDepth) {
+    this(ASTUtils.createInstantiation(reactor), null, reporter, desiredDepth);
+  }
+
+  /**
+   * Create a new instantiation with the specified parent. This constructor is here to allow for
+   * unit tests. It should not be used for any other purpose.
+   *
+   * @param reactor The top-level reactor.
+   * @param parent The parent reactor instance.
+   * @param reporter The error reporter.
+   */
+  public ReactorInstance(Reactor reactor, ReactorInstance parent, ErrorReporter reporter) {
+    this(ASTUtils.createInstantiation(reactor), parent, reporter, -1);
+  }
+
+  //////////////////////////////////////////////////////
+  //// Public fields.
+
+  /** The action instances belonging to this reactor instance. */
+  public List<ActionInstance> actions = new ArrayList<>();
+
+  /**
+   * The contained reactor instances, in order of declaration. For banks of reactors, this includes
+   * both the bank definition Reactor (which has bankIndex == -2) followed by each of the bank
+   * members (which have bankIndex >= 0).
+   */
+  public final List<ReactorInstance> children = new ArrayList<>();
+
+  /** The input port instances belonging to this reactor instance. */
+  public final List<PortInstance> inputs = new ArrayList<>();
+
+  /** The output port instances belonging to this reactor instance. */
+  public final List<PortInstance> outputs = new ArrayList<>();
+
+  /** The parameters of this instance. */
+  public final List<ParameterInstance> parameters = new ArrayList<>();
+
+  /** List of reaction instances for this reactor instance. */
+  public final List<ReactionInstance> reactions = new ArrayList<>();
+
+  /** List of watchdog instances for this reactor instance. */
+  public final List<WatchdogInstance> watchdogs = new ArrayList<>();
+
+  /** The timer instances belonging to this reactor instance. */
+  public final List<TimerInstance> timers = new ArrayList<>();
+
+  /** The mode instances belonging to this reactor instance. */
+  public final List<ModeInstance> modes = new ArrayList<>();
+
+  /** The reactor declaration in the AST. This is either an import or Reactor declaration. */
+  public final ReactorDecl reactorDeclaration;
+
+  /** The reactor after imports are resolve. */
+  public final Reactor reactorDefinition;
+
+  /** Indicator that this reactor has itself as a parent, an error condition. */
+  public final boolean recursive;
+
+  public TypeParameterizedReactor tpr;
+
+  //////////////////////////////////////////////////////
+  //// Public methods.
+
+  /**
+   * Assign levels to all reactions within the same root as this reactor. The level of a reaction r
+   * is equal to the length of the longest chain of reactions that must have the opportunity to
+   * execute before r at each logical tag. This fails and returns false if a causality cycle exists.
+   *
+   * <p>This method uses a variant of Kahn's algorithm, which is linear in V + E, where V is the
+   * number of vertices (reactions) and E is the number of edges (dependencies between reactions).
+   *
+   * @return An empty graph if successful and otherwise a graph with runtime reaction instances that
+   *     form cycles.
+   */
+  public ReactionInstanceGraph assignLevels() {
+    if (depth != 0) return root().assignLevels();
+    if (cachedReactionLoopGraph == null) {
+      cachedReactionLoopGraph = new ReactionInstanceGraph(this);
     }
-
-    /**
-     * Create a new instantiation hierarchy that starts with the given top-level reactor
-     * but only creates contained reactors up to the specified depth.
-     * @param reactor The top-level reactor.
-     * @param reporter The error reporter.
-     * @param desiredDepth The depth to which to go, or -1 to construct the full hierarchy.
-     */
-    public ReactorInstance(Reactor reactor, ErrorReporter reporter, int desiredDepth) {
-        this(ASTUtils.createInstantiation(reactor), null, reporter, desiredDepth);
+    return cachedReactionLoopGraph;
+  }
+
+  /**
+   * This function assigns/propagates deadlines through the Reaction Instance Graph. It performs
+   * Kahn's algorithm in reverse, starting from the leaf nodes and propagates deadlines upstream. To
+   * reduce cost, it should only be invoked when there are user-specified deadlines in the program.
+   *
+   * @return
+   */
+  public ReactionInstanceGraph assignDeadlines() {
+    if (depth != 0) return root().assignDeadlines();
+    if (cachedReactionLoopGraph == null) {
+      cachedReactionLoopGraph = new ReactionInstanceGraph(this);
     }
-
-    /**
-     * Create a new instantiation with the specified parent.
-     * This constructor is here to allow for unit tests.
-     * It should not be used for any other purpose.
-     * @param reactor The top-level reactor.
-     * @param parent The parent reactor instance.
-     * @param reporter The error reporter.
-     */
-    public ReactorInstance(Reactor reactor, ReactorInstance parent, ErrorReporter reporter) {
-        this(ASTUtils.createInstantiation(reactor), parent, reporter, -1);
+    cachedReactionLoopGraph.rebuildAndAssignDeadlines();
+    return cachedReactionLoopGraph;
+  }
+
+  /**
+   * Return the instance of a child rector created by the specified definition or null if there is
+   * none.
+   *
+   * @param definition The definition of the child reactor ("new" statement).
+   */
+  public ReactorInstance getChildReactorInstance(Instantiation definition) {
+    for (ReactorInstance child : this.children) {
+      if (child.definition == definition) {
+        return child;
+      }
     }
-
-    //////////////////////////////////////////////////////
-    //// Public fields.
-
-    /** The action instances belonging to this reactor instance. */
-    public List<ActionInstance> actions = new ArrayList<>();
-
-    /**
-     * The contained reactor instances, in order of declaration.
-     * For banks of reactors, this includes both the bank definition
-     * Reactor (which has bankIndex == -2) followed by each of the
-     * bank members (which have bankIndex >= 0).
-     */
-    public final List<ReactorInstance> children = new ArrayList<>();
-
-    /** The input port instances belonging to this reactor instance. */
-    public final List<PortInstance> inputs = new ArrayList<>();
-
-    /** The output port instances belonging to this reactor instance. */
-    public final List<PortInstance> outputs = new ArrayList<>();
-
-    /** The parameters of this instance. */
-    public final List<ParameterInstance> parameters = new ArrayList<>();
-
-    /** List of reaction instances for this reactor instance. */
-    public final List<ReactionInstance> reactions = new ArrayList<>();
-
-    /** List of watchdog instances for this reactor instance. */
-    public final List<WatchdogInstance> watchdogs = new ArrayList<>();
-
-    /** The timer instances belonging to this reactor instance. */
-    public final List<TimerInstance> timers = new ArrayList<>();
-
-    /** The mode instances belonging to this reactor instance. */
-    public final List<ModeInstance> modes = new ArrayList<>();
-
-    /** The reactor declaration in the AST. This is either an import or Reactor declaration. */
-    public final ReactorDecl reactorDeclaration;
-
-    /** The reactor after imports are resolve. */
-    public final Reactor reactorDefinition;
-
-    /** Indicator that this reactor has itself as a parent, an error condition. */
-    public final boolean recursive;
-
-    public TypeParameterizedReactor tpr;
-
-    //////////////////////////////////////////////////////
-    //// Public methods.
-
-    /**
-     * Assign levels to all reactions within the same root as this
-     * reactor. The level of a reaction r is equal to the length of the
-     * longest chain of reactions that must have the opportunity to
-     * execute before r at each logical tag. This fails and returns
-     * false if a causality cycle exists.
-     *
-     * This method uses a variant of Kahn's algorithm, which is linear
-     * in V + E, where V is the number of vertices (reactions) and E
-     * is the number of edges (dependencies between reactions).
-     *
-     * @return An empty graph if successful and otherwise a graph
-     *  with runtime reaction instances that form cycles.
-     */
-    public ReactionInstanceGraph assignLevels() {
-        if (depth != 0) return root().assignLevels();
-        if (cachedReactionLoopGraph == null) {
-            cachedReactionLoopGraph = new ReactionInstanceGraph(this);
-        }
-        return cachedReactionLoopGraph;
-    }
-
-    /**
-     * This function assigns/propagates deadlines through the Reaction Instance Graph.
-     * It performs Kahn's algorithm in reverse, starting from the leaf nodes and
-     * propagates deadlines upstream. To reduce cost, it should only be invoked when
-     * there are user-specified deadlines in the program.
-     * @return
-     */
-    public ReactionInstanceGraph assignDeadlines() {
-        if (depth != 0) return root().assignDeadlines();
-        if (cachedReactionLoopGraph == null) {
-            cachedReactionLoopGraph = new ReactionInstanceGraph(this);
-        }
-        cachedReactionLoopGraph.rebuildAndAssignDeadlines();
-        return cachedReactionLoopGraph;
+    return null;
+  }
+
+  /**
+   * Clear any cached data in this reactor and its children. This is useful if a mutation has been
+   * realized.
+   */
+  public void clearCaches() {
+    clearCaches(true);
+  }
+
+  /**
+   * Clear any cached data in this reactor and its children. This is useful if a mutation has been
+   * realized.
+   *
+   * @param includingRuntimes If false, leave the runtime instances of reactions intact. This is
+   *     useful for federated execution where levels are computed using the top-level connections,
+   *     but then those connections are discarded.
+   */
+  public void clearCaches(boolean includingRuntimes) {
+    if (includingRuntimes) cachedReactionLoopGraph = null;
+    for (ReactorInstance child : children) {
+      child.clearCaches(includingRuntimes);
     }
-
-    /**
-     * Return the instance of a child rector created by the specified
-     * definition or null if there is none.
-     * @param definition The definition of the child reactor ("new" statement).
-     */
-    public ReactorInstance getChildReactorInstance(Instantiation definition) {
-        for (ReactorInstance child : this.children) {
-            if (child.definition == definition) {
-                return child;
-            }
-        }
-        return null;
+    for (PortInstance port : inputs) {
+      port.clearCaches();
     }
-
-    /**
-     * Clear any cached data in this reactor and its children.
-     * This is useful if a mutation has been realized.
-     */
-    public void clearCaches() {
-        clearCaches(true);
+    for (PortInstance port : outputs) {
+      port.clearCaches();
     }
-
-    /**
-     * Clear any cached data in this reactor and its children.
-     * This is useful if a mutation has been realized.
-     * @param includingRuntimes If false, leave the runtime instances of reactions intact.
-     *  This is useful for federated execution where levels are computed using
-     *  the top-level connections, but then those connections are discarded.
-     */
-    public void clearCaches(boolean includingRuntimes) {
-        if (includingRuntimes) cachedReactionLoopGraph = null;
-        for (ReactorInstance child : children) {
-            child.clearCaches(includingRuntimes);
-        }
-        for (PortInstance port : inputs) {
-            port.clearCaches();
-        }
-        for (PortInstance port : outputs) {
-            port.clearCaches();
-        }
-        for (ReactionInstance reaction : reactions) {
-            reaction.clearCaches(includingRuntimes);
-        }
-        cachedCycles = null;
+    for (ReactionInstance reaction : reactions) {
+      reaction.clearCaches(includingRuntimes);
     }
-
-    /**
-     * Return the set of ReactionInstance and PortInstance that form causality
-     * loops in the topmost parent reactor in the instantiation hierarchy. This will return an
-     * empty set if there are no causality loops.
-     */
-    public Set<NamedInstance<?>> getCycles() {
-        if (depth != 0) return root().getCycles();
-        if (cachedCycles != null) return cachedCycles;
-        cachedCycles = new LinkedHashSet<>();
-
-        ReactionInstanceGraph reactionRuntimes = assignLevels();
-        if (reactionRuntimes.nodes().size() > 0) {
-            Set<ReactionInstance> reactions = new LinkedHashSet<>();
-            Set<PortInstance> ports = new LinkedHashSet<>();
-            // There are cycles. But the nodes set includes not
-            // just the cycles, but also nodes that are downstream of the
-            // cycles.  Use Tarjan's algorithm to get just the cycles.
-            var cycleNodes = reactionRuntimes.getCycles();
-            for (var cycle : cycleNodes) {
-                for (ReactionInstance.Runtime runtime : cycle) {
-                    reactions.add(runtime.getReaction());
-                }
-            }
-            // Need to figure out which ports are involved in the cycles.
-            // It may not be all ports that depend on this reaction.
-            for (ReactionInstance r : reactions) {
-                for (TriggerInstance<? extends Variable> p : r.effects) {
-                    if (p instanceof PortInstance) {
-                        findPaths((PortInstance)p, reactions, ports);
-                    }
-                }
-            }
-            cachedCycles.addAll(reactions);
-            cachedCycles.addAll(ports);
+    cachedCycles = null;
+  }
+
+  /**
+   * Return the set of ReactionInstance and PortInstance that form causality loops in the topmost
+   * parent reactor in the instantiation hierarchy. This will return an empty set if there are no
+   * causality loops.
+   */
+  public Set<NamedInstance<?>> getCycles() {
+    if (depth != 0) return root().getCycles();
+    if (cachedCycles != null) return cachedCycles;
+    cachedCycles = new LinkedHashSet<>();
+
+    ReactionInstanceGraph reactionRuntimes = assignLevels();
+    if (reactionRuntimes.nodes().size() > 0) {
+      Set<ReactionInstance> reactions = new LinkedHashSet<>();
+      Set<PortInstance> ports = new LinkedHashSet<>();
+      // There are cycles. But the nodes set includes not
+      // just the cycles, but also nodes that are downstream of the
+      // cycles.  Use Tarjan's algorithm to get just the cycles.
+      var cycleNodes = reactionRuntimes.getCycles();
+      for (var cycle : cycleNodes) {
+        for (ReactionInstance.Runtime runtime : cycle) {
+          reactions.add(runtime.getReaction());
         }
-
-        return cachedCycles;
-    }
-
-    /**
-     * Return the specified input by name or null if there is no such input.
-     * @param name The input name.
-     */
-    public PortInstance getInput(String name) {
-        for (PortInstance port: inputs) {
-            if (port.getName().equals(name)) {
-                return port;
-            }
+      }
+      // Need to figure out which ports are involved in the cycles.
+      // It may not be all ports that depend on this reaction.
+      for (ReactionInstance r : reactions) {
+        for (TriggerInstance<? extends Variable> p : r.effects) {
+          if (p instanceof PortInstance) {
+            findPaths((PortInstance) p, reactions, ports);
+          }
         }
-        return null;
-    }
-
-    /**
-     * Override the base class to append [i_d], where d is the depth,
-     * if this reactor is in a bank of reactors.
-     * @return The name of this instance.
-     */
-    @Override
-    public String getName() {
-        return this.definition.getName();
+      }
+      cachedCycles.addAll(reactions);
+      cachedCycles.addAll(ports);
     }
 
-    /**
-     * @see NamedInstance#uniqueID()
-     *
-     * Append {@code _main} to the name of the main reactor to allow instantiations
-     * within that reactor to have the same name.
-     */
-    @Override
-    public String uniqueID() {
-       if (this.isMainOrFederated()) {
-           if (reactorDefinition.isFederated() && !super.uniqueID().startsWith("federate__")) return "federate__" + super.uniqueID() + "_main";
-           return super.uniqueID() + "_main";
-       }
-       return super.uniqueID();
+    return cachedCycles;
+  }
+
+  /**
+   * Return the specified input by name or null if there is no such input.
+   *
+   * @param name The input name.
+   */
+  public PortInstance getInput(String name) {
+    for (PortInstance port : inputs) {
+      if (port.getName().equals(name)) {
+        return port;
+      }
     }
-
-    /**
-     * Return the specified output by name or null if there is no such output.
-     * @param name The output name.
-     */
-    public PortInstance getOutput(String name) {
-        for (PortInstance port: outputs) {
-            if (port.getName().equals(name)) {
-                return port;
-            }
-        }
-        return null;
+    return null;
+  }
+
+  /**
+   * Override the base class to append [i_d], where d is the depth, if this reactor is in a bank of
+   * reactors.
+   *
+   * @return The name of this instance.
+   */
+  @Override
+  public String getName() {
+    return this.definition.getName();
+  }
+
+  /**
+   * @see NamedInstance#uniqueID()
+   *     <p>Append {@code _main} to the name of the main reactor to allow instantiations within that
+   *     reactor to have the same name.
+   */
+  @Override
+  public String uniqueID() {
+    if (this.isMainOrFederated()) {
+      if (reactorDefinition.isFederated() && !super.uniqueID().startsWith("federate__"))
+        return "federate__" + super.uniqueID() + "_main";
+      return super.uniqueID() + "_main";
     }
-
-    /**
-     * Return a parameter matching the specified name if the reactor has one
-     * and otherwise return null.
-     * @param name The parameter name.
-     */
-    public ParameterInstance getParameter(String name) {
-        for (ParameterInstance parameter: parameters) {
-            if (parameter.getName().equals(name)) {
-                return parameter;
-            }
-        }
-        return null;
+    return super.uniqueID();
+  }
+
+  /**
+   * Return the specified output by name or null if there is no such output.
+   *
+   * @param name The output name.
+   */
+  public PortInstance getOutput(String name) {
+    for (PortInstance port : outputs) {
+      if (port.getName().equals(name)) {
+        return port;
+      }
     }
-
-    /**
-     * Return the startup trigger or null if not used in any reaction.
-     */
-    public TriggerInstance<BuiltinTriggerVariable> getStartupTrigger() {
-        return builtinTriggers.get(BuiltinTrigger.STARTUP);
+    return null;
+  }
+
+  /**
+   * Return a parameter matching the specified name if the reactor has one and otherwise return
+   * null.
+   *
+   * @param name The parameter name.
+   */
+  public ParameterInstance getParameter(String name) {
+    for (ParameterInstance parameter : parameters) {
+      if (parameter.getName().equals(name)) {
+        return parameter;
+      }
     }
-
-    /**
-     * Return the shutdown trigger or null if not used in any reaction.
-     */
-    public TriggerInstance<BuiltinTriggerVariable> getShutdownTrigger() {
-        return builtinTriggers.get(BuiltinTrigger.SHUTDOWN);
+    return null;
+  }
+
+  /** Return the startup trigger or null if not used in any reaction. */
+  public TriggerInstance<BuiltinTriggerVariable> getStartupTrigger() {
+    return builtinTriggers.get(BuiltinTrigger.STARTUP);
+  }
+
+  /** Return the shutdown trigger or null if not used in any reaction. */
+  public TriggerInstance<BuiltinTriggerVariable> getShutdownTrigger() {
+    return builtinTriggers.get(BuiltinTrigger.SHUTDOWN);
+  }
+
+  /**
+   * If this reactor is a bank or any of its parents is a bank, return the total number of runtime
+   * instances, which is the product of the widths of all the parents. Return -1 if the width cannot
+   * be determined.
+   */
+  public int getTotalWidth() {
+    return getTotalWidth(0);
+  }
+
+  /**
+   * If this reactor is a bank or any of its parents is a bank, return the total number of runtime
+   * instances, which is the product of the widths of all the parents. Return -1 if the width cannot
+   * be determined.
+   *
+   * @param atDepth The depth at which to determine the width. Use 0 to get the total number of
+   *     instances. Use 1 to get the number of instances within a single top-level bank member (this
+   *     is useful for federates).
+   */
+  public int getTotalWidth(int atDepth) {
+    if (width <= 0) return -1;
+    if (depth <= atDepth) return 1;
+    int result = width;
+    ReactorInstance p = parent;
+    while (p != null && p.depth > atDepth) {
+      if (p.width <= 0) return -1;
+      result *= p.width;
+      p = p.parent;
     }
-
-    /**
-     * If this reactor is a bank or any of its parents is a bank,
-     * return the total number of runtime instances, which is the product
-     * of the widths of all the parents.
-     * Return -1 if the width cannot be determined.
-     */
-    public int getTotalWidth() {
-        return getTotalWidth(0);
+    return result;
+  }
+
+  /**
+   * Return the trigger instances (input ports, timers, and actions that trigger reactions)
+   * belonging to this reactor instance.
+   */
+  public Set<TriggerInstance<? extends Variable>> getTriggers() {
+    // FIXME: Cache this.
+    var triggers = new LinkedHashSet<TriggerInstance<? extends Variable>>();
+    for (ReactionInstance reaction : this.reactions) {
+      triggers.addAll(reaction.triggers);
     }
-
-    /**
-     * If this reactor is a bank or any of its parents is a bank,
-     * return the total number of runtime instances, which is the product
-     * of the widths of all the parents.
-     * Return -1 if the width cannot be determined.
-     * @param atDepth The depth at which to determine the width.
-     *  Use 0 to get the total number of instances.
-     *  Use 1 to get the number of instances within a single top-level
-     *  bank member (this is useful for federates).
-     */
-    public int getTotalWidth(int atDepth) {
-        if (width <= 0) return -1;
-        if (depth <= atDepth) return 1;
-        int result = width;
-        ReactorInstance p = parent;
-        while (p != null && p.depth > atDepth) {
-            if (p.width <= 0) return -1;
-            result *= p.width;
-            p = p.parent;
-        }
-        return result;
+    return triggers;
+  }
+
+  /**
+   * Return the trigger instances (input ports, timers, and actions that trigger reactions) together
+   * the ports that the reaction reads but that don't trigger it.
+   *
+   * @return The trigger instances belonging to this reactor instance.
+   */
+  public Set<TriggerInstance<? extends Variable>> getTriggersAndReads() {
+    // FIXME: Cache this.
+    var triggers = new LinkedHashSet<TriggerInstance<? extends Variable>>();
+    for (ReactionInstance reaction : this.reactions) {
+      triggers.addAll(reaction.triggers);
+      triggers.addAll(reaction.reads);
     }
+    return triggers;
+  }
+
+  /** Return true if the top-level parent of this reactor has causality cycles. */
+  public boolean hasCycles() {
+    return assignLevels().nodeCount() != 0;
+  }
+
+  /**
+   * Given a parameter definition for this reactor, return the initial integer value of the
+   * parameter. If the parameter is overridden when instantiating this reactor or any of its
+   * containing reactors, use that value. Otherwise, use the default value in the reactor
+   * definition. If the parameter cannot be found or its value is not an integer, return null.
+   *
+   * @param parameter The parameter definition (a syntactic object in the AST).
+   * @return An integer value or null.
+   */
+  public Integer initialIntParameterValue(Parameter parameter) {
+    return ASTUtils.initialValueInt(parameter, instantiations());
+  }
+
+  public Expression resolveParameters(Expression e) {
+    return LfExpressionVisitor.dispatch(e, this, ParameterInliner.INSTANCE);
+  }
+
+  private static final class ParameterInliner
+      extends LfExpressionVisitor.LfExpressionDeepCopyVisitor<ReactorInstance> {
+    static final ParameterInliner INSTANCE = new ParameterInliner();
 
-    /**
-     * Return the trigger instances (input ports, timers, and actions
-     * that trigger reactions) belonging to this reactor instance.
-     */
-    public Set<TriggerInstance<? extends Variable>> getTriggers() {
-        // FIXME: Cache this.
-        var triggers = new LinkedHashSet<TriggerInstance<? extends Variable>>();
-        for (ReactionInstance reaction : this.reactions) {
-            triggers.addAll(reaction.triggers);
+    @Override
+    public Expression visitParameterRef(ParameterReference expr, ReactorInstance instance) {
+      if (!ASTUtils.belongsTo(expr.getParameter(), instance.definition)) {
+        throw new IllegalArgumentException(
+            "Parameter "
+                + expr.getParameter().getName()
+                + " is not a parameter of reactor instance "
+                + instance.getName()
+                + ".");
+      }
+
+      Optional<Assignment> assignment =
+          instance.definition.getParameters().stream()
+              .filter(it -> it.getLhs().equals(expr.getParameter()))
+              .findAny(); // There is at most one
+
+      if (assignment.isPresent()) {
+        // replace the parameter with its value.
+        Expression value = ASTUtils.asSingleExpr(assignment.get().getRhs());
+        // recursively resolve parameters
+        return instance.getParent().resolveParameters(value);
+      } else {
+        // In that case use the default value. Default values
+        // cannot use parameter values, so they don't need to
+        // be recursively resolved.
+        Initializer init = expr.getParameter().getInit();
+        Expression defaultValue = ASTUtils.asSingleExpr(init);
+        if (defaultValue == null) {
+          // this is a problem
+          return super.visitParameterRef(expr, instance);
         }
-        return triggers;
+        return defaultValue;
+      }
     }
-
-    /**
-     * Return the trigger instances (input ports, timers, and actions
-     * that trigger reactions) together the ports that the reaction reads
-     * but that don't trigger it.
-     *
-     * @return The trigger instances belonging to this reactor instance.
-     */
-    public Set<TriggerInstance<? extends Variable>> getTriggersAndReads() {
-        // FIXME: Cache this.
-        var triggers = new LinkedHashSet<TriggerInstance<? extends Variable>>();
-        for (ReactionInstance reaction : this.reactions) {
-            triggers.addAll(reaction.triggers);
-            triggers.addAll(reaction.reads);
+  }
+
+  /**
+   * Return a list of Instantiation objects for evaluating parameter values. The first object in the
+   * list is the AST Instantiation that created this reactor instance, the second is the AST
+   * instantiation that created the containing reactor instance, and so on until there are no more
+   * containing reactor instances. This will return an empty list if this reactor instance is at the
+   * top level (is main).
+   */
+  public List<Instantiation> instantiations() {
+    if (_instantiations == null) {
+      _instantiations = new ArrayList<>();
+      if (definition != null) {
+        _instantiations.add(definition);
+        if (parent != null) {
+          _instantiations.addAll(parent.instantiations());
         }
-        return triggers;
+      }
     }
-
-    /**
-     * Return true if the top-level parent of this reactor has causality cycles.
-     */
-    public boolean hasCycles() {
-        return assignLevels().nodeCount() != 0;
+    return _instantiations;
+  }
+
+  /**
+   * Returns true if this is a bank of reactors.
+   *
+   * @return true if a reactor is a bank, false otherwise
+   */
+  public boolean isBank() {
+    return definition.getWidthSpec() != null;
+  }
+
+  /**
+   * Returns whether this is a main or federated reactor.
+   *
+   * @return true if reactor definition is marked as main or federated, false otherwise.
+   */
+  public boolean isMainOrFederated() {
+    return reactorDefinition != null
+        && (reactorDefinition.isMain() || reactorDefinition.isFederated());
+  }
+
+  /**
+   * Return true if the specified reactor instance is either equal to this reactor instance or a
+   * parent of it.
+   *
+   * @param r The reactor instance.
+   */
+  public boolean isParent(ReactorInstance r) {
+    ReactorInstance p = this;
+    while (p != null) {
+      if (p == r) return true;
+      p = p.getParent();
     }
-
-    /**
-     * Given a parameter definition for this reactor, return the initial integer
-     * value of the parameter. If the parameter is overridden when instantiating
-     * this reactor or any of its containing reactors, use that value.
-     * Otherwise, use the default value in the reactor definition.
-     * If the parameter cannot be found or its value is not an integer, return null.
-     *
-     * @param parameter The parameter definition (a syntactic object in the AST).
-     *
-     * @return An integer value or null.
-     */
-    public Integer initialIntParameterValue(Parameter parameter) {
-        return ASTUtils.initialValueInt(parameter, instantiations());
+    return false;
+  }
+
+  ///////////////////////////////////////////////////
+  //// Methods for finding instances in this reactor given an AST node.
+
+  /**
+   * Return the action instance within this reactor instance corresponding to the specified action
+   * reference.
+   *
+   * @param action The action as an AST node.
+   * @return The corresponding action instance or null if the action does not belong to this
+   *     reactor.
+   */
+  public ActionInstance lookupActionInstance(Action action) {
+    for (ActionInstance actionInstance : actions) {
+      if (actionInstance.definition == action) {
+        return actionInstance;
+      }
     }
-
-    public Expression resolveParameters(Expression e) {
-        return LfExpressionVisitor.dispatch(e, this, ParameterInliner.INSTANCE);
+    return null;
+  }
+
+  /**
+   * Given a parameter definition, return the parameter instance corresponding to that definition,
+   * or null if there is no such instance.
+   *
+   * @param parameter The parameter definition (a syntactic object in the AST).
+   * @return A parameter instance, or null if there is none.
+   */
+  public ParameterInstance lookupParameterInstance(Parameter parameter) {
+    for (ParameterInstance param : parameters) {
+      if (param.definition == parameter) {
+        return param;
+      }
     }
-
-
-    private static final class ParameterInliner extends LfExpressionVisitor.LfExpressionDeepCopyVisitor<ReactorInstance> {
-        static final ParameterInliner INSTANCE = new ParameterInliner();
-
-        @Override
-        public Expression visitParameterRef(ParameterReference expr, ReactorInstance instance) {
-            if (!ASTUtils.belongsTo(expr.getParameter(), instance.definition)) {
-                throw new IllegalArgumentException("Parameter "
-                    + expr.getParameter().getName()
-                    + " is not a parameter of reactor instance "
-                    + instance.getName()
-                    + "."
-                );
-            }
-
-            Optional<Assignment> assignment =
-                instance.definition.getParameters().stream()
-                    .filter(it -> it.getLhs().equals(expr.getParameter()))
-                    .findAny(); // There is at most one
-
-            if (assignment.isPresent()) {
-                // replace the parameter with its value.
-                Expression value = ASTUtils.asSingleExpr(assignment.get().getRhs());
-                // recursively resolve parameters
-                return instance.getParent().resolveParameters(value);
-            } else {
-                // In that case use the default value. Default values
-                // cannot use parameter values, so they don't need to
-                // be recursively resolved.
-                Initializer init = expr.getParameter().getInit();
-                Expression defaultValue = ASTUtils.asSingleExpr(init);
-                if (defaultValue == null) {
-                    // this is a problem
-                    return super.visitParameterRef(expr, instance);
-                }
-                return defaultValue;
-            }
-        }
+    return null;
+  }
+
+  /**
+   * Given a port definition, return the port instance corresponding to that definition, or null if
+   * there is no such instance.
+   *
+   * @param port The port definition (a syntactic object in the AST).
+   * @return A port instance, or null if there is none.
+   */
+  public PortInstance lookupPortInstance(Port port) {
+    // Search one of the inputs and outputs sets.
+    List<PortInstance> ports = null;
+    if (port instanceof Input) {
+      ports = this.inputs;
+    } else if (port instanceof Output) {
+      ports = this.outputs;
     }
-
-    /**
-     * Return a list of Instantiation objects for evaluating parameter
-     * values.  The first object in the list is the AST Instantiation
-     * that created this reactor instance, the second is the AST instantiation
-     * that created the containing reactor instance, and so on until there
-     * are no more containing reactor instances. This will return an empty
-     * list if this reactor instance is at the top level (is main).
-     */
-    public List<Instantiation> instantiations() {
-        if (_instantiations == null) {
-            _instantiations = new ArrayList<>();
-            if (definition != null) {
-                _instantiations.add(definition);
-                if (parent != null) {
-                    _instantiations.addAll(parent.instantiations());
-                }
-            }
-        }
-        return _instantiations;
+    for (PortInstance portInstance : ports) {
+      if (portInstance.definition == port) {
+        return portInstance;
+      }
     }
-
-    /**
-     * Returns true if this is a bank of reactors.
-     * @return true if a reactor is a bank, false otherwise
-     */
-    public boolean isBank() {
-        return definition.getWidthSpec() != null;
+    return null;
+  }
+
+  /**
+   * Given a reference to a port belonging to this reactor instance, return the port instance.
+   * Return null if there is no such instance.
+   *
+   * @param reference The port reference.
+   * @return A port instance, or null if there is none.
+   */
+  public PortInstance lookupPortInstance(VarRef reference) {
+    if (!(reference.getVariable() instanceof Port)) {
+      // Trying to resolve something that is not a port
+      return null;
     }
-
-    /**
-     * Returns whether this is a main or federated reactor.
-     * @return true if reactor definition is marked as main or federated, false otherwise.
-     */
-    public boolean isMainOrFederated() {
-        return reactorDefinition != null
-                && (reactorDefinition.isMain() || reactorDefinition.isFederated());
+    if (reference.getContainer() == null) {
+      // Handle local reference
+      return lookupPortInstance((Port) reference.getVariable());
+    } else {
+      // Handle hierarchical reference
+      var containerInstance = getChildReactorInstance(reference.getContainer());
+      if (containerInstance == null) return null;
+      return containerInstance.lookupPortInstance((Port) reference.getVariable());
     }
-
-    /**
-     * Return true if the specified reactor instance is either equal to this
-     * reactor instance or a parent of it.
-     * @param r The reactor instance.
-     */
-    public boolean isParent(ReactorInstance r) {
-        ReactorInstance p = this;
-        while (p != null) {
-            if (p == r) return true;
-            p = p.getParent();
-        }
-        return false;
+  }
+
+  /**
+   * Return the reaction instance within this reactor instance corresponding to the specified
+   * reaction.
+   *
+   * @param reaction The reaction as an AST node.
+   * @return The corresponding reaction instance or null if the reaction does not belong to this
+   *     reactor.
+   */
+  public ReactionInstance lookupReactionInstance(Reaction reaction) {
+    for (ReactionInstance reactionInstance : reactions) {
+      if (reactionInstance.definition == reaction) {
+        return reactionInstance;
+      }
     }
-
-    ///////////////////////////////////////////////////
-    //// Methods for finding instances in this reactor given an AST node.
-
-    /**
-     * Return the action instance within this reactor
-     * instance corresponding to the specified action reference.
-     * @param action The action as an AST node.
-     * @return The corresponding action instance or null if the
-     *  action does not belong to this reactor.
-     */
-    public ActionInstance lookupActionInstance(Action action) {
-        for (ActionInstance actionInstance : actions) {
-            if (actionInstance.definition == action) {
-                return actionInstance;
-            }
-        }
-        return null;
+    return null;
+  }
+
+  /**
+   * Return the reactor instance within this reactor that has the specified instantiation. Note that
+   * this may be a bank of reactors. Return null if there is no such reactor instance.
+   */
+  public ReactorInstance lookupReactorInstance(Instantiation instantiation) {
+    for (ReactorInstance reactorInstance : children) {
+      if (reactorInstance.definition == instantiation) {
+        return reactorInstance;
+      }
     }
-
-    /**
-     * Given a parameter definition, return the parameter instance
-     * corresponding to that definition, or null if there is
-     * no such instance.
-     * @param parameter The parameter definition (a syntactic object in the AST).
-     * @return A parameter instance, or null if there is none.
-     */
-    public ParameterInstance lookupParameterInstance(Parameter parameter) {
-        for (ParameterInstance param : parameters) {
-            if (param.definition == parameter) {
-                return param;
-            }
-        }
-        return null;
+    return null;
+  }
+
+  /**
+   * Return the timer instance within this reactor instance corresponding to the specified timer
+   * reference.
+   *
+   * @param timer The timer as an AST node.
+   * @return The corresponding timer instance or null if the timer does not belong to this reactor.
+   */
+  public TimerInstance lookupTimerInstance(Timer timer) {
+    for (TimerInstance timerInstance : timers) {
+      if (timerInstance.definition == timer) {
+        return timerInstance;
+      }
     }
-
-    /**
-     * Given a port definition, return the port instance
-     * corresponding to that definition, or null if there is
-     * no such instance.
-     * @param port The port definition (a syntactic object in the AST).
-     * @return A port instance, or null if there is none.
-     */
-    public PortInstance lookupPortInstance(Port port) {
-        // Search one of the inputs and outputs sets.
-        List<PortInstance> ports = null;
-        if (port instanceof Input) {
-            ports = this.inputs;
-        } else if (port instanceof Output) {
-            ports = this.outputs;
-        }
-        for (PortInstance portInstance : ports) {
-            if (portInstance.definition == port) {
-                return portInstance;
-            }
-        }
-        return null;
+    return null;
+  }
+
+  /**
+   * Returns the mode instance within this reactor instance corresponding to the specified mode
+   * reference.
+   *
+   * @param mode The mode as an AST node.
+   * @return The corresponding mode instance or null if the mode does not belong to this reactor.
+   */
+  public ModeInstance lookupModeInstance(Mode mode) {
+    for (ModeInstance modeInstance : modes) {
+      if (modeInstance.definition == mode) {
+        return modeInstance;
+      }
     }
-
-    /**
-     * Given a reference to a port belonging to this reactor
-     * instance, return the port instance.
-     * Return null if there is no such instance.
-     * @param reference The port reference.
-     * @return A port instance, or null if there is none.
-     */
-    public PortInstance lookupPortInstance(VarRef reference) {
-        if (!(reference.getVariable() instanceof Port)) {
-            // Trying to resolve something that is not a port
-            return null;
-        }
-        if (reference.getContainer() == null) {
-            // Handle local reference
-            return lookupPortInstance((Port) reference.getVariable());
-        } else {
-            // Handle hierarchical reference
-            var containerInstance = getChildReactorInstance(reference.getContainer());
-            if (containerInstance == null) return null;
-            return containerInstance.lookupPortInstance((Port) reference.getVariable());
-        }
+    return null;
+  }
+
+  /** Return a descriptive string. */
+  @Override
+  public String toString() {
+    return "ReactorInstance " + getFullName();
+  }
+
+  /**
+   * Assuming that the given expression denotes a valid time, return a time value.
+   *
+   * <p>If the value is given as a parameter reference, this will look up the precise time value
+   * assigned to this reactor instance.
+   */
+  public TimeValue getTimeValue(Expression expr) {
+    Expression resolved = resolveParameters(expr);
+    return getLiteralTimeValue(resolved);
+  }
+
+  //////////////////////////////////////////////////////
+  //// Protected fields.
+
+  /** The generator that created this reactor instance. */
+  protected ErrorReporter reporter; // FIXME: This accumulates a lot of redundant references
+
+  /** The map of used built-in triggers. */
+  protected Map<BuiltinTrigger, TriggerInstance<BuiltinTriggerVariable>> builtinTriggers =
+      new HashMap<>();
+
+  /** The nested list of instantiations that created this reactor instance. */
+  protected List<Instantiation> _instantiations;
+
+  //////////////////////////////////////////////////////
+  //// Protected methods.
+
+  /**
+   * Create all the reaction instances of this reactor instance and record the dependencies and
+   * antidependencies between ports, actions, and timers and reactions. This also records the
+   * dependencies between reactions that follows from the order in which they are defined.
+   */
+  protected void createReactionInstances() {
+    List<Reaction> reactions = ASTUtils.allReactions(reactorDefinition);
+    if (reactions != null) {
+      int count = 0;
+
+      // Check for startup and shutdown triggers.
+      for (Reaction reaction : reactions) {
+        // Create the reaction instance.
+        var reactionInstance = new ReactionInstance(reaction, this, count++);
+        // Add the reaction instance to the map of reactions for this
+        // reactor.
+        this.reactions.add(reactionInstance);
+      }
     }
-
-    /**
-     * Return the reaction instance within this reactor
-     * instance corresponding to the specified reaction.
-     * @param reaction The reaction as an AST node.
-     * @return The corresponding reaction instance or null if the
-     *  reaction does not belong to this reactor.
-     */
-    public ReactionInstance lookupReactionInstance(Reaction reaction) {
-        for (ReactionInstance reactionInstance : reactions) {
-            if (reactionInstance.definition == reaction) {
-                return reactionInstance;
-            }
-        }
-        return null;
+  }
+
+  /** Returns the built-in trigger or create a new one if none exists. */
+  protected TriggerInstance<BuiltinTriggerVariable> getOrCreateBuiltinTrigger(
+      BuiltinTriggerRef trigger) {
+    return builtinTriggers.computeIfAbsent(
+        trigger.getType(), ref -> TriggerInstance.builtinTrigger(trigger, this));
+  }
+
+  /** Create all the watchdog instances of this reactor instance. */
+  protected void createWatchdogInstances() {
+    List<Watchdog> watchdogs = ASTUtils.allWatchdogs(reactorDefinition);
+    if (watchdogs != null) {
+      for (Watchdog watchdog : watchdogs) {
+        // Create the watchdog instance.
+        var watchdogInstance = new WatchdogInstance(watchdog, this);
+
+        // Add the watchdog instance to the list of watchdogs for this
+        // reactor.
+        this.watchdogs.add(watchdogInstance);
+      }
     }
-
-    /**
-     * Return the reactor instance within this reactor
-     * that has the specified instantiation. Note that this
-     * may be a bank of reactors. Return null if there
-     * is no such reactor instance.
-     */
-    public ReactorInstance lookupReactorInstance(Instantiation instantiation) {
-        for (ReactorInstance reactorInstance : children) {
-            if (reactorInstance.definition == instantiation) {
-                return reactorInstance;
-            }
+  }
+
+  ////////////////////////////////////////
+  //// Private constructors
+
+  /**
+   * Create a runtime instance from the specified definition and with the specified parent that
+   * instantiated it.
+   *
+   * @param definition The instantiation statement in the AST.
+   * @param parent The parent, or null for the main rector.
+   * @param reporter An error reporter.
+   * @param desiredDepth The depth to which to expand the hierarchy.
+   */
+  public ReactorInstance(
+      Instantiation definition, ReactorInstance parent, ErrorReporter reporter, int desiredDepth) {
+    super(definition, parent);
+    this.reporter = reporter;
+    this.reactorDeclaration = definition.getReactorClass();
+    this.reactorDefinition = ASTUtils.toDefinition(reactorDeclaration);
+    this.tpr = new TypeParameterizedReactor(definition);
+
+    // check for recursive instantiation
+    var currentParent = parent;
+    var foundSelfAsParent = false;
+    do {
+      if (currentParent != null) {
+        if (currentParent.reactorDefinition == this.reactorDefinition) {
+          foundSelfAsParent = true;
+          currentParent = null; // break
+        } else {
+          currentParent = currentParent.parent;
         }
-        return null;
-    }
+      }
+    } while (currentParent != null);
 
-    /**
-     * Return the timer instance within this reactor
-     * instance corresponding to the specified timer reference.
-     * @param timer The timer as an AST node.
-     * @return The corresponding timer instance or null if the
-     *  timer does not belong to this reactor.
-     */
-    public TimerInstance lookupTimerInstance(Timer timer) {
-        for (TimerInstance timerInstance : timers) {
-            if (timerInstance.definition == timer) {
-                return timerInstance;
-            }
-        }
-        return null;
+    this.recursive = foundSelfAsParent;
+    if (recursive) {
+      reporter.reportError(definition, "Recursive reactor instantiation.");
     }
 
-    /** Returns the mode instance within this reactor
-     *  instance corresponding to the specified mode reference.
-     *  @param mode The mode as an AST node.
-     *  @return The corresponding mode instance or null if the
-     *   mode does not belong to this reactor.
-     */
-    public ModeInstance lookupModeInstance(Mode mode) {
-        for (ModeInstance modeInstance : modes) {
-            if (modeInstance.definition == mode) {
-                return modeInstance;
-            }
-        }
-        return null;
+    // If the reactor definition is null, give up here. Otherwise, diagram generation
+    // will fail an NPE.
+    if (reactorDefinition == null) {
+      reporter.reportError(definition, "Reactor instantiation has no matching reactor definition.");
+      return;
     }
 
-    /**
-     * Return a descriptive string.
-     */
-    @Override
-    public String toString() {
-        return "ReactorInstance " + getFullName();
-    }
+    setInitialWidth();
 
-    /**
-     * Assuming that the given expression denotes a valid time, return a time value.
-     *
-     * If the value is given as a parameter reference, this will look up the
-     * precise time value assigned to this reactor instance.
-     */
-    public TimeValue getTimeValue(Expression expr) {
-        Expression resolved = resolveParameters(expr);
-        return getLiteralTimeValue(resolved);
+    // Apply overrides and instantiate parameters for this reactor instance.
+    for (Parameter parameter : ASTUtils.allParameters(reactorDefinition)) {
+      this.parameters.add(new ParameterInstance(parameter, this));
     }
 
-    //////////////////////////////////////////////////////
-    //// Protected fields.
-
-    /** The generator that created this reactor instance. */
-    protected ErrorReporter reporter; // FIXME: This accumulates a lot of redundant references
-
-    /** The map of used built-in triggers. */
-    protected Map<BuiltinTrigger, TriggerInstance<BuiltinTriggerVariable>> builtinTriggers = new HashMap<>();
-
-    /** The nested list of instantiations that created this reactor instance. */
-    protected List<Instantiation> _instantiations;
-
-    //////////////////////////////////////////////////////
-    //// Protected methods.
-
-    /**
-     * Create all the reaction instances of this reactor instance
-     * and record the dependencies and antidependencies
-     * between ports, actions, and timers and reactions.
-     * This also records the dependencies between reactions
-     * that follows from the order in which they are defined.
-     */
-    protected void createReactionInstances() {
-        List<Reaction> reactions = ASTUtils.allReactions(reactorDefinition);
-        if (reactions != null) {
-            int count = 0;
-
-            // Check for startup and shutdown triggers.
-            for (Reaction reaction : reactions) {
-                // Create the reaction instance.
-                var reactionInstance = new ReactionInstance(reaction, this, count++);
-                // Add the reaction instance to the map of reactions for this
-                // reactor.
-                this.reactions.add(reactionInstance);
-            }
-        }
+    // Instantiate inputs for this reactor instance
+    for (Input inputDecl : ASTUtils.allInputs(reactorDefinition)) {
+      this.inputs.add(new PortInstance(inputDecl, this, reporter));
     }
 
-    /**
-     * Returns the built-in trigger or create a new one if none exists.
-     */
-    protected TriggerInstance<BuiltinTriggerVariable> getOrCreateBuiltinTrigger(BuiltinTriggerRef trigger) {
-        return builtinTriggers.computeIfAbsent(trigger.getType(), ref -> TriggerInstance.builtinTrigger(trigger, this));
+    // Instantiate outputs for this reactor instance
+    for (Output outputDecl : ASTUtils.allOutputs(reactorDefinition)) {
+      this.outputs.add(new PortInstance(outputDecl, this, reporter));
     }
 
-    /** Create all the watchdog instances of this reactor instance. */
-    protected void createWatchdogInstances() {
-        List<Watchdog> watchdogs = ASTUtils.allWatchdogs(reactorDefinition);
-        if (watchdogs != null) {
-            for (Watchdog watchdog : watchdogs) {
-                // Create the watchdog instance.
-                var watchdogInstance = new WatchdogInstance(watchdog, this);
-
-                // Add the watchdog instance to the list of watchdogs for this
-                // reactor.
-                this.watchdogs.add(watchdogInstance);
-            }
-        }
+    // Do not process content (except interface above) if recursive
+    if (!recursive && (desiredDepth < 0 || this.depth < desiredDepth)) {
+      // Instantiate children for this reactor instance.
+      // While doing this, assign an index offset to each.
+      for (Instantiation child : ASTUtils.allInstantiations(reactorDefinition)) {
+        var childInstance = new ReactorInstance(child, this, reporter, desiredDepth);
+        this.children.add(childInstance);
+      }
+
+      // Instantiate timers for this reactor instance
+      for (Timer timerDecl : ASTUtils.allTimers(reactorDefinition)) {
+        this.timers.add(new TimerInstance(timerDecl, this));
+      }
+
+      // Instantiate actions for this reactor instance
+      for (Action actionDecl : ASTUtils.allActions(reactorDefinition)) {
+        this.actions.add(new ActionInstance(actionDecl, this));
+      }
+
+      establishPortConnections();
+
+      // Create the reaction instances in this reactor instance.
+      // This also establishes all the implied dependencies.
+      // Note that this can only happen _after_ the children,
+      // port, action, and timer instances have been created.
+      createReactionInstances();
+
+      // Instantiate modes for this reactor instance
+      // This must come after the child elements (reactions, etc) of this reactor
+      // are created in order to allow their association with modes
+      for (Mode modeDecl : ASTUtils.allModes(reactorDefinition)) {
+        this.modes.add(new ModeInstance(modeDecl, this));
+      }
+      for (ModeInstance mode : this.modes) {
+        mode.setupTranstions();
+      }
     }
-
-    ////////////////////////////////////////
-    //// Private constructors
-
-    /**
-     * Create a runtime instance from the specified definition
-     * and with the specified parent that instantiated it.
-     * @param definition The instantiation statement in the AST.
-     * @param parent The parent, or null for the main rector.
-     * @param reporter An error reporter.
-     * @param desiredDepth The depth to which to expand the hierarchy.
-     */
-    public ReactorInstance(
-        Instantiation definition,
-        ReactorInstance parent,
-        ErrorReporter reporter,
-        int desiredDepth) {
-        super(definition, parent);
-        this.reporter = reporter;
-        this.reactorDeclaration = definition.getReactorClass();
-        this.reactorDefinition = ASTUtils.toDefinition(reactorDeclaration);
-        this.tpr = new TypeParameterizedReactor(definition);
-
-        // check for recursive instantiation
-        var currentParent = parent;
-        var foundSelfAsParent = false;
-        do {
-            if (currentParent != null) {
-                if (currentParent.reactorDefinition == this.reactorDefinition) {
-                    foundSelfAsParent = true;
-                    currentParent = null; // break
-                } else {
-                    currentParent = currentParent.parent;
-                }
-            }
-        } while(currentParent != null);
-
-        this.recursive = foundSelfAsParent;
-        if (recursive) {
-            reporter.reportError(definition, "Recursive reactor instantiation.");
-        }
-
-        // If the reactor definition is null, give up here. Otherwise, diagram generation
-        // will fail an NPE.
-        if (reactorDefinition == null) {
-            reporter.reportError(definition, "Reactor instantiation has no matching reactor definition.");
-            return;
-        }
-
-        setInitialWidth();
-
-        // Apply overrides and instantiate parameters for this reactor instance.
-        for (Parameter parameter : ASTUtils.allParameters(reactorDefinition)) {
-            this.parameters.add(new ParameterInstance(parameter, this));
+  }
+
+  public TypeParameterizedReactor getTypeParameterizedReactor() {
+    return this.tpr;
+  }
+
+  //////////////////////////////////////////////////////
+  //// Private methods.
+
+  /**
+   * Connect the given left port range to the given right port range.
+   *
+   * <p>NOTE: This method is public to enable its use in unit tests. Otherwise, it should be
+   * private. This is why it is defined here, in the section labeled "Private methods."
+   *
+   * @param src The source range.
+   * @param dst The destination range.
+   * @param connection The connection establishing this relationship.
+   */
+  public static void connectPortInstances(
+      RuntimeRange<PortInstance> src, RuntimeRange<PortInstance> dst, Connection connection) {
+    SendRange range = new SendRange(src, dst, src._interleaved, connection);
+    src.instance.dependentPorts.add(range);
+    dst.instance.dependsOnPorts.add(src);
+  }
+
+  /**
+   * Populate connectivity information in the port instances. Note that this can only happen _after_
+   * the children and port instances have been created. Unfortunately, we have to do some
+   * complicated things here to support multiport-to-multiport, multiport-to-bank, and
+   * bank-to-multiport communication. The principle being followed is: in each connection statement,
+   * for each port instance on the left, connect to the next available port on the right.
+   */
+  private void establishPortConnections() {
+    for (Connection connection : ASTUtils.allConnections(reactorDefinition)) {
+      List<RuntimeRange<PortInstance>> leftPorts =
+          listPortInstances(connection.getLeftPorts(), connection);
+      Iterator<RuntimeRange<PortInstance>> srcRanges = leftPorts.iterator();
+      List<RuntimeRange<PortInstance>> rightPorts =
+          listPortInstances(connection.getRightPorts(), connection);
+      Iterator<RuntimeRange<PortInstance>> dstRanges = rightPorts.iterator();
+
+      // Check for empty lists.
+      if (!srcRanges.hasNext()) {
+        if (dstRanges.hasNext()) {
+          reporter.reportWarning(connection, "No sources to provide inputs.");
         }
-
-        // Instantiate inputs for this reactor instance
-        for (Input inputDecl : ASTUtils.allInputs(reactorDefinition)) {
-            this.inputs.add(new PortInstance(inputDecl, this, reporter));
-        }
-
-        // Instantiate outputs for this reactor instance
-        for (Output outputDecl : ASTUtils.allOutputs(reactorDefinition)) {
-            this.outputs.add(new PortInstance(outputDecl, this, reporter));
-        }
-
-        // Do not process content (except interface above) if recursive
-        if (!recursive && (desiredDepth < 0 || this.depth < desiredDepth)) {
-            // Instantiate children for this reactor instance.
-            // While doing this, assign an index offset to each.
-            for (Instantiation child : ASTUtils.allInstantiations(reactorDefinition)) {
-                var childInstance = new ReactorInstance(
-                    child,
-                    this,
-                    reporter,
-                    desiredDepth
-                );
-                this.children.add(childInstance);
-            }
-
-            // Instantiate timers for this reactor instance
-            for (Timer timerDecl : ASTUtils.allTimers(reactorDefinition)) {
-                this.timers.add(new TimerInstance(timerDecl, this));
+        return;
+      } else if (!dstRanges.hasNext()) {
+        reporter.reportWarning(connection, "No destination. Outputs will be lost.");
+        return;
+      }
+
+      RuntimeRange<PortInstance> src = srcRanges.next();
+      RuntimeRange<PortInstance> dst = dstRanges.next();
+
+      while (true) {
+        if (dst.width == src.width) {
+          connectPortInstances(src, dst, connection);
+          if (!dstRanges.hasNext()) {
+            if (srcRanges.hasNext()) {
+              // Should not happen (checked by the validator).
+              reporter.reportWarning(
+                  connection, "Source is wider than the destination. Outputs will be lost.");
             }
-
-            // Instantiate actions for this reactor instance
-            for (Action actionDecl : ASTUtils.allActions(reactorDefinition)) {
-                this.actions.add(new ActionInstance(actionDecl, this));
-            }
-
-            establishPortConnections();
-
-            // Create the reaction instances in this reactor instance.
-            // This also establishes all the implied dependencies.
-            // Note that this can only happen _after_ the children,
-            // port, action, and timer instances have been created.
-            createReactionInstances();
-
-            // Instantiate modes for this reactor instance
-            // This must come after the child elements (reactions, etc) of this reactor
-            // are created in order to allow their association with modes
-            for (Mode modeDecl : ASTUtils.allModes(reactorDefinition)) {
-                this.modes.add(new ModeInstance(modeDecl, this));
+            break;
+          }
+          if (!srcRanges.hasNext()) {
+            if (connection.isIterated()) {
+              srcRanges = leftPorts.iterator();
+            } else {
+              if (dstRanges.hasNext()) {
+                // Should not happen (checked by the validator).
+                reporter.reportWarning(
+                    connection, "Destination is wider than the source. Inputs will be missing.");
+              }
+              break;
             }
-            for (ModeInstance mode : this.modes) {
-                mode.setupTranstions();
+          }
+          dst = dstRanges.next();
+          src = srcRanges.next();
+        } else if (dst.width < src.width) {
+          // Split the left (src) range in two.
+          connectPortInstances(src.head(dst.width), dst, connection);
+          src = src.tail(dst.width);
+          if (!dstRanges.hasNext()) {
+            // Should not happen (checked by the validator).
+            reporter.reportWarning(
+                connection, "Source is wider than the destination. Outputs will be lost.");
+            break;
+          }
+          dst = dstRanges.next();
+        } else if (src.width < dst.width) {
+          // Split the right (dst) range in two.
+          connectPortInstances(src, dst.head(src.width), connection);
+          dst = dst.tail(src.width);
+          if (!srcRanges.hasNext()) {
+            if (connection.isIterated()) {
+              srcRanges = leftPorts.iterator();
+            } else {
+              reporter.reportWarning(
+                  connection, "Destination is wider than the source. Inputs will be missing.");
+              break;
             }
+          }
+          src = srcRanges.next();
         }
+      }
     }
-
-    public TypeParameterizedReactor getTypeParameterizedReactor() {
-        return this.tpr;
-    }
-
-    //////////////////////////////////////////////////////
-    //// Private methods.
-
-    /**
-     * Connect the given left port range to the given right port range.
-     *
-     * NOTE: This method is public to enable its use in unit tests.
-     * Otherwise, it should be private. This is why it is defined here,
-     * in the section labeled "Private methods."
-     *
-     * @param src The source range.
-     * @param dst The destination range.
-     * @param connection The connection establishing this relationship.
-     */
-    public static void connectPortInstances(
-            RuntimeRange<PortInstance> src,
-            RuntimeRange<PortInstance> dst,
-            Connection connection
-    ) {
-        SendRange range = new SendRange(src, dst, src._interleaved, connection);
-        src.instance.dependentPorts.add(range);
-        dst.instance.dependsOnPorts.add(src);
+  }
+
+  /**
+   * If path exists from the specified port to any reaction in the specified set of reactions, then
+   * add the specified port and all ports along the path to the specified set of ports.
+   *
+   * @return True if the specified port was added.
+   */
+  private boolean findPaths(
+      PortInstance port, Set<ReactionInstance> reactions, Set<PortInstance> ports) {
+    if (ports.contains(port)) return false;
+    boolean result = false;
+    for (ReactionInstance d : port.getDependentReactions()) {
+      if (reactions.contains(d)) ports.add(port);
+      result = true;
     }
-
-    /**
-     * Populate connectivity information in the port instances.
-     * Note that this can only happen _after_ the children and port instances have been created.
-     * Unfortunately, we have to do some complicated things here
-     * to support multiport-to-multiport, multiport-to-bank,
-     * and bank-to-multiport communication.  The principle being followed is:
-     * in each connection statement, for each port instance on the left,
-     * connect to the next available port on the right.
-     */
-    private void establishPortConnections() {
-        for (Connection connection : ASTUtils.allConnections(reactorDefinition)) {
-            List<RuntimeRange<PortInstance>> leftPorts = listPortInstances(connection.getLeftPorts(), connection);
-            Iterator<RuntimeRange<PortInstance>> srcRanges = leftPorts.iterator();
-            List<RuntimeRange<PortInstance>> rightPorts = listPortInstances(connection.getRightPorts(), connection);
-            Iterator<RuntimeRange<PortInstance>> dstRanges = rightPorts.iterator();
-
-            // Check for empty lists.
-            if (!srcRanges.hasNext()) {
-                if (dstRanges.hasNext()) {
-                    reporter.reportWarning(connection, "No sources to provide inputs.");
-                }
-                return;
-            } else if (!dstRanges.hasNext()) {
-                reporter.reportWarning(connection, "No destination. Outputs will be lost.");
-                return;
-            }
-
-            RuntimeRange<PortInstance> src = srcRanges.next();
-            RuntimeRange<PortInstance> dst = dstRanges.next();
-
-            while(true) {
-                if (dst.width == src.width) {
-                    connectPortInstances(src, dst, connection);
-                    if (!dstRanges.hasNext()) {
-                        if (srcRanges.hasNext()) {
-                            // Should not happen (checked by the validator).
-                            reporter.reportWarning(connection,
-                                    "Source is wider than the destination. Outputs will be lost.");
-                        }
-                        break;
-                    }
-                    if (!srcRanges.hasNext()) {
-                        if (connection.isIterated()) {
-                            srcRanges = leftPorts.iterator();
-                        } else {
-                            if (dstRanges.hasNext()) {
-                                // Should not happen (checked by the validator).
-                                reporter.reportWarning(connection,
-                                        "Destination is wider than the source. Inputs will be missing.");
-                            }
-                            break;
-                        }
-                    }
-                    dst = dstRanges.next();
-                    src = srcRanges.next();
-                } else if (dst.width < src.width) {
-                    // Split the left (src) range in two.
-                    connectPortInstances(src.head(dst.width), dst, connection);
-                    src = src.tail(dst.width);
-                    if (!dstRanges.hasNext()) {
-                        // Should not happen (checked by the validator).
-                        reporter.reportWarning(connection,
-                                "Source is wider than the destination. Outputs will be lost.");
-                        break;
-                    }
-                    dst = dstRanges.next();
-                } else if (src.width < dst.width) {
-                    // Split the right (dst) range in two.
-                    connectPortInstances(src, dst.head(src.width), connection);
-                    dst = dst.tail(src.width);
-                    if (!srcRanges.hasNext()) {
-                        if (connection.isIterated()) {
-                            srcRanges = leftPorts.iterator();
-                        } else {
-                            reporter.reportWarning(connection,
-                                    "Destination is wider than the source. Inputs will be missing.");
-                            break;
-                        }
-                    }
-                    src = srcRanges.next();
-                }
-            }
+    // Perform a depth-first search.
+    for (SendRange r : port.dependentPorts) {
+      for (RuntimeRange<PortInstance> p : r.destinations) {
+        boolean added = findPaths(p.instance, reactions, ports);
+        if (added) {
+          result = true;
+          ports.add(port);
         }
+      }
     }
-
-    /**
-     * If path exists from the specified port to any reaction in the specified
-     * set of reactions, then add the specified port and all ports along the path
-     * to the specified set of ports.
-     * @return True if the specified port was added.
-     */
-    private boolean findPaths(
-            PortInstance port,
-            Set<ReactionInstance> reactions,
-            Set<PortInstance> ports
-    ) {
-        if (ports.contains(port)) return false;
-        boolean result = false;
-        for (ReactionInstance d : port.getDependentReactions()) {
-            if (reactions.contains(d)) ports.add(port);
-            result = true;
-        }
-        // Perform a depth-first search.
-        for (SendRange r : port.dependentPorts) {
-            for (RuntimeRange<PortInstance> p : r.destinations) {
-                boolean added = findPaths(p.instance, reactions, ports);
-                if (added) {
-                    result = true;
-                    ports.add(port);
-                }
-            }
-        }
+    return result;
+  }
+
+  /**
+   * Given a list of port references, as found on either side of a connection, return a list of the
+   * port instance ranges referenced. These may be multiports, and may be ports of a contained bank
+   * (a port representing ports of the bank members) so the returned list includes ranges of banks
+   * and channels.
+   *
+   * <p>If a given port reference has the form {@code interleaved(b.m)}, where {@code b} is a bank
+   * and {@code m} is a multiport, then the corresponding range in the returned list is marked
+   * interleaved.
+   *
+   * <p>For example, if {@code b} and {@code m} have width 2, without the interleaved keyword, the
+   * returned range represents the sequence {@code [b0.m0, b0.m1, b1.m0, b1.m1]}. With the
+   * interleaved marking, the returned range represents the sequence {@code [b0.m0, b1.m0, b0.m1,
+   * b1.m1]}. Both ranges will have width 4.
+   *
+   * @param references The variable references on one side of the connection.
+   * @param connection The connection.
+   */
+  private List<RuntimeRange<PortInstance>> listPortInstances(
+      List<VarRef> references, Connection connection) {
+    List<RuntimeRange<PortInstance>> result = new ArrayList<>();
+    List<RuntimeRange<PortInstance>> tails = new LinkedList<>();
+    int count = 0;
+    for (VarRef portRef : references) {
+      // Simple error checking first.
+      if (!(portRef.getVariable() instanceof Port)) {
+        reporter.reportError(portRef, "Not a port.");
         return result;
-    }
-
-    /**
-     * Given a list of port references, as found on either side of a connection,
-     * return a list of the port instance ranges referenced. These may be multiports,
-     * and may be ports of a contained bank (a port representing ports of the bank
-     * members) so the returned list includes ranges of banks and channels.
-     *
-     * If a given port reference has the form {@code interleaved(b.m)}, where {@code b} is
-     * a bank and {@code m} is a multiport, then the corresponding range in the returned
-     * list is marked interleaved.
-     *
-     * For example, if {@code b} and {@code m} have width 2, without the interleaved keyword,
-     * the returned range represents the sequence {@code [b0.m0, b0.m1, b1.m0, b1.m1]}.
-     * With the interleaved marking, the returned range represents the sequence
-     * {@code [b0.m0, b1.m0, b0.m1, b1.m1]}. Both ranges will have width 4.
-     *
-     * @param references The variable references on one side of the connection.
-     * @param connection The connection.
-     */
-    private List<RuntimeRange<PortInstance>> listPortInstances(
-            List<VarRef> references, Connection connection
-    ) {
-        List<RuntimeRange<PortInstance>> result = new ArrayList<>();
-        List<RuntimeRange<PortInstance>> tails = new LinkedList<>();
-        int count = 0;
-        for (VarRef portRef : references) {
-            // Simple error checking first.
-            if (!(portRef.getVariable() instanceof Port)) {
-                reporter.reportError(portRef, "Not a port.");
-                return result;
-            }
-            // First, figure out which reactor we are dealing with.
-            // The reactor we want is the container of the port.
-            // If the port reference has no container, then the reactor is this one.
-            var reactor = this;
-            if (portRef.getContainer() != null) {
-                reactor = getChildReactorInstance(portRef.getContainer());
-            }
-            // The reactor can be null only if there is an error in the code.
-            // Skip this portRef so that diagram synthesis can complete.
-            if (reactor != null) {
-                PortInstance portInstance = reactor.lookupPortInstance(
-                        (Port) portRef.getVariable());
-
-                Set<ReactorInstance> interleaved = new LinkedHashSet<>();
-                if (portRef.isInterleaved()) {
-                    // NOTE: Here, we are assuming that the interleaved()
-                    // keyword is only allowed on the multiports contained by
-                    // contained reactors.
-                    interleaved.add(portInstance.parent);
-                }
-                RuntimeRange<PortInstance> range = new RuntimeRange.Port(
-                        portInstance, interleaved);
-                // If this portRef is not the last one in the references list
-                // then we have to check whether the range can be incremented at
-                // the lowest two levels (port and container).  If not,
-                // split the range and add the tail to list to iterate over again.
-                // The reason for this is that the connection has only local visibility,
-                // but the range width may be reflective of bank structure higher
-                // in the hierarchy.
-                if (count < references.size() - 1) {
-                    int portWidth = portInstance.width;
-                    int portParentWidth = portInstance.parent.width;
-                    // If the port is being connected on the inside and there is
-                    // more than one port in the list, then we can only connect one
-                    // bank member at a time.
-                    if (reactor == this && references.size() > 1) {
-                        portParentWidth = 1;
-                    }
-                    int widthBound = portWidth * portParentWidth;
-
-                    // If either of these widths cannot be determined, assume infinite.
-                    if (portWidth < 0) widthBound = Integer.MAX_VALUE;
-                    if (portParentWidth < 0) widthBound = Integer.MAX_VALUE;
-
-                    if (widthBound < range.width) {
-                        // Need to split the range.
-                        tails.add(range.tail(widthBound));
-                        range = range.head(widthBound);
-                    }
-                }
-                result.add(range);
-            }
+      }
+      // First, figure out which reactor we are dealing with.
+      // The reactor we want is the container of the port.
+      // If the port reference has no container, then the reactor is this one.
+      var reactor = this;
+      if (portRef.getContainer() != null) {
+        reactor = getChildReactorInstance(portRef.getContainer());
+      }
+      // The reactor can be null only if there is an error in the code.
+      // Skip this portRef so that diagram synthesis can complete.
+      if (reactor != null) {
+        PortInstance portInstance = reactor.lookupPortInstance((Port) portRef.getVariable());
+
+        Set<ReactorInstance> interleaved = new LinkedHashSet<>();
+        if (portRef.isInterleaved()) {
+          // NOTE: Here, we are assuming that the interleaved()
+          // keyword is only allowed on the multiports contained by
+          // contained reactors.
+          interleaved.add(portInstance.parent);
         }
-        // Iterate over the tails.
-        while(tails.size() > 0) {
-            List<RuntimeRange<PortInstance>> moreTails = new LinkedList<>();
-            count = 0;
-            for (RuntimeRange<PortInstance> tail : tails) {
-                if (count < tails.size() - 1) {
-                    int widthBound = tail.instance.width;
-                    if (tail._interleaved.contains(tail.instance.parent)) {
-                        widthBound = tail.instance.parent.width;
-                    }
-                    // If the width cannot be determined, assume infinite.
-                    if (widthBound < 0) widthBound = Integer.MAX_VALUE;
-
-                    if (widthBound < tail.width) {
-                        // Need to split the range again
-                        moreTails.add(tail.tail(widthBound));
-                        tail = tail.head(widthBound);
-                    }
-                }
-                result.add(tail);
-            }
-            tails = moreTails;
+        RuntimeRange<PortInstance> range = new RuntimeRange.Port(portInstance, interleaved);
+        // If this portRef is not the last one in the references list
+        // then we have to check whether the range can be incremented at
+        // the lowest two levels (port and container).  If not,
+        // split the range and add the tail to list to iterate over again.
+        // The reason for this is that the connection has only local visibility,
+        // but the range width may be reflective of bank structure higher
+        // in the hierarchy.
+        if (count < references.size() - 1) {
+          int portWidth = portInstance.width;
+          int portParentWidth = portInstance.parent.width;
+          // If the port is being connected on the inside and there is
+          // more than one port in the list, then we can only connect one
+          // bank member at a time.
+          if (reactor == this && references.size() > 1) {
+            portParentWidth = 1;
+          }
+          int widthBound = portWidth * portParentWidth;
+
+          // If either of these widths cannot be determined, assume infinite.
+          if (portWidth < 0) widthBound = Integer.MAX_VALUE;
+          if (portParentWidth < 0) widthBound = Integer.MAX_VALUE;
+
+          if (widthBound < range.width) {
+            // Need to split the range.
+            tails.add(range.tail(widthBound));
+            range = range.head(widthBound);
+          }
         }
-        return result;
+        result.add(range);
+      }
     }
-
-    /**
-     * If this is a bank of reactors, set the width.
-     * It will be set to -1 if it cannot be determined.
-     */
-    private void setInitialWidth() {
-        WidthSpec widthSpec = definition.getWidthSpec();
-        if (widthSpec != null) {
-            // We need the instantiations list of the containing reactor,
-            // not this one.
-            width = ASTUtils.width(widthSpec, parent.instantiations());
+    // Iterate over the tails.
+    while (tails.size() > 0) {
+      List<RuntimeRange<PortInstance>> moreTails = new LinkedList<>();
+      count = 0;
+      for (RuntimeRange<PortInstance> tail : tails) {
+        if (count < tails.size() - 1) {
+          int widthBound = tail.instance.width;
+          if (tail._interleaved.contains(tail.instance.parent)) {
+            widthBound = tail.instance.parent.width;
+          }
+          // If the width cannot be determined, assume infinite.
+          if (widthBound < 0) widthBound = Integer.MAX_VALUE;
+
+          if (widthBound < tail.width) {
+            // Need to split the range again
+            moreTails.add(tail.tail(widthBound));
+            tail = tail.head(widthBound);
+          }
         }
+        result.add(tail);
+      }
+      tails = moreTails;
     }
-
-    //////////////////////////////////////////////////////
-    //// Private fields.
-
-    /**
-     * Cached set of reactions and ports that form a causality loop.
-     */
-    private Set<NamedInstance<?>> cachedCycles;
-
-    /**
-     * Cached reaction graph containing reactions that form a causality loop.
-     */
-    private ReactionInstanceGraph cachedReactionLoopGraph = null;
-
-    /**
-     * Return true if this is a generated delay reactor that originates from
-     * an "after" delay on a connection.
-     *
-     * @return True if this is a generated delay, false otherwise.
-     */
-    public boolean isGeneratedDelay() {
-        // FIXME: hacky string matching again...
-        return this.definition.getReactorClass().getName().contains(DelayBodyGenerator.GEN_DELAY_CLASS_NAME);
+    return result;
+  }
+
+  /**
+   * If this is a bank of reactors, set the width. It will be set to -1 if it cannot be determined.
+   */
+  private void setInitialWidth() {
+    WidthSpec widthSpec = definition.getWidthSpec();
+    if (widthSpec != null) {
+      // We need the instantiations list of the containing reactor,
+      // not this one.
+      width = ASTUtils.width(widthSpec, parent.instantiations());
     }
+  }
+
+  //////////////////////////////////////////////////////
+  //// Private fields.
+
+  /** Cached set of reactions and ports that form a causality loop. */
+  private Set<NamedInstance<?>> cachedCycles;
+
+  /** Cached reaction graph containing reactions that form a causality loop. */
+  private ReactionInstanceGraph cachedReactionLoopGraph = null;
+
+  /**
+   * Return true if this is a generated delay reactor that originates from an "after" delay on a
+   * connection.
+   *
+   * @return True if this is a generated delay, false otherwise.
+   */
+  public boolean isGeneratedDelay() {
+    // FIXME: hacky string matching again...
+    return this.definition
+        .getReactorClass()
+        .getName()
+        .contains(DelayBodyGenerator.GEN_DELAY_CLASS_NAME);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/RuntimeRange.java b/org.lflang/src/org/lflang/generator/RuntimeRange.java
index 36f132b27e..d684a41bd9 100644
--- a/org.lflang/src/org/lflang/generator/RuntimeRange.java
+++ b/org.lflang/src/org/lflang/generator/RuntimeRange.java
@@ -32,478 +32,419 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.Set;
 
 /**
- * Class representing a range of runtime instance objects
- * (port channels, reactors, reactions, etc.). This class and its derived classes
- * have the most detailed information about the structure of a Lingua Franca
- * program.  There are three levels of detail:
+ * Class representing a range of runtime instance objects (port channels, reactors, reactions,
+ * etc.). This class and its derived classes have the most detailed information about the structure
+ * of a Lingua Franca program. There are three levels of detail:
+ *
  * <ul>
- *   <li>The abstract syntax tree (AST).</li>
- *   <li>The compile-time instance graph (CIG).</li>
- *   <li>The runtime instance graph (RIG).</li>
+ *   <li>The abstract syntax tree (AST).
+ *   <li>The compile-time instance graph (CIG).
+ *   <li>The runtime instance graph (RIG).
  * </ul>
- * 
- * In the AST, each reactor class is represented once.
- * In the CIG, each reactor class is represented as many times as it is
- * instantiated, except that a bank has only one representation (as
- * in the graphical rendition). Equivalently, each CIG node has a unique
- * full name, even though it may represent many runtime instances.
- * The CIG is represented by
- * {@link NamedInstance} and its derived classes.
- * In the RIG, each bank is expanded so each bank member and
- * each port channel is represented.
- * 
- * In general, determining dependencies between reactions requires analysis
- * at the level of the RIG.  But a brute-force representation of the RIG
- * can get very large, and for most programs it has a great deal of
- * redundancy. In a fully detailed representation of the RIG, for example,
- * a bank of width N that contains a bank of width M within which there
- * is a reactor R with port P will have N*M runtime instances of the port.
- * If the port is a multiport with width L, then there are N*M*L
- * edges connected to instances of that port, each of which may go
- * to a distinct set of other remote runtime port instances.
- * 
- * This class and its subclasses give a more compact representation of the
- * RIG in most common cases where collections of runtime instances all have
- * the same dependencies or dependencies form a range that can be represented
- * compactly.
- * 
- * A RuntimeRange represents an adjacent set of RIG objects (port channels, reactions
- * reactors). For example, it can represent port channels 2 through 5 in a multiport
- * of width 10.  The width in this case is 4. If such a port is
- * contained by one or more banks of reactors, then channels 2 through 5
- * of one bank member form a contiguous range. If you want channels 2 through 5
- * of all bank members, then this needs to be represented with multiple ranges.
- * 
- * The maxWidth is the width of the instance multiplied by the widths of
- * each of its containers. For example, if a port of width 4 is contained by
- * a bank of width 2 that is then contained by a bank of width 3, then
- * the maxWidth will be 2*3*4 = 24.
- * 
- * The function iterationOrder returns a list that includes the instance
- * of this range and all its containers, except the top-level reactor (main
- * or federated).  The order of this list is the order in which an
- * iteration over the RIG objects represented by this range should be
- * iterated. If the instance is a PortInstance, then this order will
- * depend on whether connections at any level of the hierarchy are
- * interleaved.
- * 
- * The simplest Ranges are those where the corresponding CIG node represents
- * only one runtime instance (its instance is not (deeply) within a bank 
- * and is not a multiport). In this case, the RuntimeRange and all the objects
- * returned by iterationOrder will have width 1.
- * 
- * In a more complex instance, consider a bank A of width 2 that contains a
- * bank B of width 2 that contains a port instance P with width 2. .
- * There are a total of 8 instances of P, which we can name:
- * 
- *      A0.B0.P0
- *      A0.B0.P1
- *      A0.B1.P0
- *      A0.B1.P1
- *      A1.B0.P0
- *      A1.B0.P1
- *      A1.B1.P0
- *      A1.B1.P1
- * 
- * If there is no interleaving, iterationOrder() returns [P, B, A],
- * indicating that they should be iterated by incrementing the index of P
- * first, then the index of B, then the index of A, as done above.
- * 
- * If the connection within B to port P is interleaved, then the order
- * of iteration order will be [B, P, A], resulting in the list:
- * 
- *      A0.B0.P0
- *      A0.B1.P0
- *      A0.B0.P1
- *      A0.B1.P1
- *      A1.B0.P0
- *      A1.B1.P0
- *      A1.B0.P1
- *      A1.B1.P1
- *      
- *  If the connection within A to B is also interleaved, then the order
- *  will be [A, B, P], resulting in the list:
- *  
- *      A0.B0.P0
- *      A1.B0.P0
- *      A0.B1.P0
- *      A1.B1.P0
- *      A0.B0.P1
- *      A1.B0.P1
- *      A0.B1.P1
- *      A1.B1.P1
- * 
- * Finally, if the connection within A to B is interleaved, but not the
- * connection within B to P, then the order will be [A, P, B], resulting in
- * the list:
- * 
- *      A0.B0.P0
- *      A1.B0.P0
- *      A0.B0.P1
- *      A1.B0.P1
- *      A0.B1.P0
- *      A1.B1.P0
- *      A0.B1.P1
- *      A1.B1.P1
- * 
- * A RuntimeRange is a contiguous subset of one of the above lists, given by
- * a start offset and a width that is less than or equal to maxWidth.
- * 
- * Each element of the above lists can be represented as a permuted mixed-radix (PMR) number,
- * where the low-order digit has radix equal to the width of P, the second digit
- * has radix equal to the width of B, and the final digit has radix equal to the
- * width of A. Each PMR has a permutation vector that defines how to increment
- * PMR number. This permutation vector is derived from the iteration order as
- * follows.  When there is no interleaving, the iteration order is [P, B, A],
- * and the permutation vector is [0, 1, 2].  When there is interleaving, the permutation
- * vector simply specifies the iteration order. For example, if the iteration order
- * is [A, P, B], then the permutation vector is [2, 0, 1], indicating that digit 2
- * of the PMR (corresponding to A) should be incremented first, then digit 0 (for P),
- * then digit 1 (for B).
- * 
- * For a RuntimeRange with width greater than 1,
- * the head() and tail() functions split the range.
- * 
- * This class and subclasses are designed to be immutable.
- * Modifications always return a new RuntimeRange.
+ *
+ * In the AST, each reactor class is represented once. In the CIG, each reactor class is represented
+ * as many times as it is instantiated, except that a bank has only one representation (as in the
+ * graphical rendition). Equivalently, each CIG node has a unique full name, even though it may
+ * represent many runtime instances. The CIG is represented by {@link NamedInstance} and its derived
+ * classes. In the RIG, each bank is expanded so each bank member and each port channel is
+ * represented.
+ *
+ * <p>In general, determining dependencies between reactions requires analysis at the level of the
+ * RIG. But a brute-force representation of the RIG can get very large, and for most programs it has
+ * a great deal of redundancy. In a fully detailed representation of the RIG, for example, a bank of
+ * width N that contains a bank of width M within which there is a reactor R with port P will have
+ * N*M runtime instances of the port. If the port is a multiport with width L, then there are N*M*L
+ * edges connected to instances of that port, each of which may go to a distinct set of other remote
+ * runtime port instances.
+ *
+ * <p>This class and its subclasses give a more compact representation of the RIG in most common
+ * cases where collections of runtime instances all have the same dependencies or dependencies form
+ * a range that can be represented compactly.
+ *
+ * <p>A RuntimeRange represents an adjacent set of RIG objects (port channels, reactions reactors).
+ * For example, it can represent port channels 2 through 5 in a multiport of width 10. The width in
+ * this case is 4. If such a port is contained by one or more banks of reactors, then channels 2
+ * through 5 of one bank member form a contiguous range. If you want channels 2 through 5 of all
+ * bank members, then this needs to be represented with multiple ranges.
+ *
+ * <p>The maxWidth is the width of the instance multiplied by the widths of each of its containers.
+ * For example, if a port of width 4 is contained by a bank of width 2 that is then contained by a
+ * bank of width 3, then the maxWidth will be 2*3*4 = 24.
+ *
+ * <p>The function iterationOrder returns a list that includes the instance of this range and all
+ * its containers, except the top-level reactor (main or federated). The order of this list is the
+ * order in which an iteration over the RIG objects represented by this range should be iterated. If
+ * the instance is a PortInstance, then this order will depend on whether connections at any level
+ * of the hierarchy are interleaved.
+ *
+ * <p>The simplest Ranges are those where the corresponding CIG node represents only one runtime
+ * instance (its instance is not (deeply) within a bank and is not a multiport). In this case, the
+ * RuntimeRange and all the objects returned by iterationOrder will have width 1.
+ *
+ * <p>In a more complex instance, consider a bank A of width 2 that contains a bank B of width 2
+ * that contains a port instance P with width 2. . There are a total of 8 instances of P, which we
+ * can name:
+ *
+ * <p>A0.B0.P0 A0.B0.P1 A0.B1.P0 A0.B1.P1 A1.B0.P0 A1.B0.P1 A1.B1.P0 A1.B1.P1
+ *
+ * <p>If there is no interleaving, iterationOrder() returns [P, B, A], indicating that they should
+ * be iterated by incrementing the index of P first, then the index of B, then the index of A, as
+ * done above.
+ *
+ * <p>If the connection within B to port P is interleaved, then the order of iteration order will be
+ * [B, P, A], resulting in the list:
+ *
+ * <p>A0.B0.P0 A0.B1.P0 A0.B0.P1 A0.B1.P1 A1.B0.P0 A1.B1.P0 A1.B0.P1 A1.B1.P1
+ *
+ * <p>If the connection within A to B is also interleaved, then the order will be [A, B, P],
+ * resulting in the list:
+ *
+ * <p>A0.B0.P0 A1.B0.P0 A0.B1.P0 A1.B1.P0 A0.B0.P1 A1.B0.P1 A0.B1.P1 A1.B1.P1
+ *
+ * <p>Finally, if the connection within A to B is interleaved, but not the connection within B to P,
+ * then the order will be [A, P, B], resulting in the list:
+ *
+ * <p>A0.B0.P0 A1.B0.P0 A0.B0.P1 A1.B0.P1 A0.B1.P0 A1.B1.P0 A0.B1.P1 A1.B1.P1
+ *
+ * <p>A RuntimeRange is a contiguous subset of one of the above lists, given by a start offset and a
+ * width that is less than or equal to maxWidth.
+ *
+ * <p>Each element of the above lists can be represented as a permuted mixed-radix (PMR) number,
+ * where the low-order digit has radix equal to the width of P, the second digit has radix equal to
+ * the width of B, and the final digit has radix equal to the width of A. Each PMR has a permutation
+ * vector that defines how to increment PMR number. This permutation vector is derived from the
+ * iteration order as follows. When there is no interleaving, the iteration order is [P, B, A], and
+ * the permutation vector is [0, 1, 2]. When there is interleaving, the permutation vector simply
+ * specifies the iteration order. For example, if the iteration order is [A, P, B], then the
+ * permutation vector is [2, 0, 1], indicating that digit 2 of the PMR (corresponding to A) should
+ * be incremented first, then digit 0 (for P), then digit 1 (for B).
+ *
+ * <p>For a RuntimeRange with width greater than 1, the head() and tail() functions split the range.
+ *
+ * <p>This class and subclasses are designed to be immutable. Modifications always return a new
+ * RuntimeRange.
  *
  * @author Edward A. Lee
  */
 public class RuntimeRange<T extends NamedInstance<?>> implements Comparable<RuntimeRange<?>> {
-    
-    /**
-     * Create a new range representing the full width of the specified instance
-     * with no interleaving. The instances will be a list with the specified instance
-     * first, its parent next, and on up the hierarchy until the depth 1 parent (the
-     * top-level reactor is not included because it can never be a bank).
-     * @param instance The instance.
-     * @param interleaved A list of parents that are interleaved or null if none.
-     */
-    public RuntimeRange(
-            T instance,
-            Set<ReactorInstance> interleaved
-    ) {
-        this(instance, 0, 0, interleaved);
-    }
 
-    /**
-     * Create a new range representing a range of the specified instance
-     * with no interleaving. The instances will be a list with the specified instance
-     * first, its parent next, and on up the hierarchy until the depth 1 parent (the
-     * top-level reactor is not included because it can never be a bank).
-     * @param instance The instance over which this is a range (port, reaction, etc.)
-     * @param start The starting index for the range.
-     * @param width The width of the range or 0 to specify the maximum possible width.
-     * @param interleaved A list of parents that are interleaved or null if none.
-     */
-    public RuntimeRange(
-            T instance,
-            int start,
-            int width,
-            Set<ReactorInstance> interleaved
-    ) {
-        this.instance = instance;
-        this.start = start;
-        if (interleaved != null) {
-            this._interleaved.addAll(interleaved);
-        }
-        
-        int maxWidth = instance.width; // Initial value.
-        NamedInstance<?> parent = instance.parent;
-        while (parent.depth > 0) {
-            maxWidth *= parent.width;
-            parent = parent.parent;
-        }
-        this.maxWidth = maxWidth;
-
-        if (width > 0 && width + start < maxWidth) {
-            this.width = width;
-        } else {
-            this.width = maxWidth - start;
-        }
-    }
-    
-    //////////////////////////////////////////////////////////
-    //// Public variables
-    
-    /** The instance that this is a range of. */
-    public final T instance;
-    
-    /** The start offset of this range. */
-    public final int start;
-    
-    /** The maximum width of any range with this instance. */
-    public final int maxWidth;
-    
-    /** The width of this range. */
-    public final int width;
-    
-    //////////////////////////////////////////////////////////
-    //// Public methods
-
-    /**
-     * Compare ranges by first comparing their start offset, and then,
-     * if these are equal, comparing their widths. This comparison is
-     * meaningful only for ranges that have the same instances.
-     * Note that this can return 0 even if equals() does not return true.
-     */
-    @Override
-    public int compareTo(RuntimeRange<?> o) {
-        if (start < o.start) {
-            return -1;
-        } else if (start == o.start) {
-            return Integer.compare(width, o.width);
-        } else {
-            return 1;
-        }
+  /**
+   * Create a new range representing the full width of the specified instance with no interleaving.
+   * The instances will be a list with the specified instance first, its parent next, and on up the
+   * hierarchy until the depth 1 parent (the top-level reactor is not included because it can never
+   * be a bank).
+   *
+   * @param instance The instance.
+   * @param interleaved A list of parents that are interleaved or null if none.
+   */
+  public RuntimeRange(T instance, Set<ReactorInstance> interleaved) {
+    this(instance, 0, 0, interleaved);
+  }
+
+  /**
+   * Create a new range representing a range of the specified instance with no interleaving. The
+   * instances will be a list with the specified instance first, its parent next, and on up the
+   * hierarchy until the depth 1 parent (the top-level reactor is not included because it can never
+   * be a bank).
+   *
+   * @param instance The instance over which this is a range (port, reaction, etc.)
+   * @param start The starting index for the range.
+   * @param width The width of the range or 0 to specify the maximum possible width.
+   * @param interleaved A list of parents that are interleaved or null if none.
+   */
+  public RuntimeRange(T instance, int start, int width, Set<ReactorInstance> interleaved) {
+    this.instance = instance;
+    this.start = start;
+    if (interleaved != null) {
+      this._interleaved.addAll(interleaved);
     }
-    
-    /**
-     * Return a new RuntimeRange that is identical to this range but
-     * with width reduced to the specified width.
-     * If the new width is greater than or equal to the width
-     * of this range, then return this range.
-     * If the newWidth is 0 or negative, return null.
-     * @param newWidth The new width.
-     */
-    public RuntimeRange<T> head(int newWidth) {
-        if (newWidth >= width) return this;
-        if (newWidth <= 0) return null;
-        return new RuntimeRange<>(instance, start, newWidth, _interleaved);
+
+    int maxWidth = instance.width; // Initial value.
+    NamedInstance<?> parent = instance.parent;
+    while (parent.depth > 0) {
+      maxWidth *= parent.width;
+      parent = parent.parent;
     }
-    
-    /**
-     * Return the list of <strong>natural identifiers</strong> for the runtime instances
-     * in this range.  Each returned identifier is an integer representation
-     * of the mixed-radix number [d0, ... , dn] with radices [w0, ... , wn],
-     * where d0 is the bank or channel index of this RuntimeRange's instance, which
-     * has width w0, and dn is the bank index of its topmost parent below the 
-     * top-level (main) reactor, which has width wn. The depth of this RuntimeRange's 
-     * instance, therefore, is n - 1.  The order of the returned list is the order
-     * in which the runtime instances should be iterated.
-     */
-    public List<Integer> instances() {
-        List<Integer> result = new ArrayList<>(width);
-        MixedRadixInt mr = startMR();
-        int count = 0;
-        while (count++ < width) {
-            result.add(mr.get());
-            mr.increment();
-        }
-        return result;
+    this.maxWidth = maxWidth;
+
+    if (width > 0 && width + start < maxWidth) {
+      this.width = width;
+    } else {
+      this.width = maxWidth - start;
     }
-    
-    /**
-     * Return a list containing the instance for this range and all of its
-     * parents, not including the top level reactor, in the order in which
-     * their banks and multiport channels should be iterated.
-     * For each depth at which the connection is interleaved, that parent
-     * will appear before this instance in depth order (shallower to deeper).
-     * For each depth at which the connection is not interleaved, that parent
-     * will appear after this instance in reverse depth order (deeper to
-     * shallower).
-     */
-    public List<NamedInstance<?>> iterationOrder() {
-        ArrayList<NamedInstance<?>> result = new ArrayList<>();
-        result.add(instance);
-        ReactorInstance parent = instance.parent;
-        while (parent.depth > 0) {
-            if (_interleaved.contains(parent)) {
-                // Put the parent at the head of the list.
-                result.add(0, parent);
-            } else {
-                result.add(parent);
-            }
-            parent = parent.parent;
-        }
-        return result;
+  }
+
+  //////////////////////////////////////////////////////////
+  //// Public variables
+
+  /** The instance that this is a range of. */
+  public final T instance;
+
+  /** The start offset of this range. */
+  public final int start;
+
+  /** The maximum width of any range with this instance. */
+  public final int maxWidth;
+
+  /** The width of this range. */
+  public final int width;
+
+  //////////////////////////////////////////////////////////
+  //// Public methods
+
+  /**
+   * Compare ranges by first comparing their start offset, and then, if these are equal, comparing
+   * their widths. This comparison is meaningful only for ranges that have the same instances. Note
+   * that this can return 0 even if equals() does not return true.
+   */
+  @Override
+  public int compareTo(RuntimeRange<?> o) {
+    if (start < o.start) {
+      return -1;
+    } else if (start == o.start) {
+      return Integer.compare(width, o.width);
+    } else {
+      return 1;
     }
-    
-    /**
-     * Return a range that is the subset of this range that overlaps with the
-     * specified range or null if there is no overlap.
-     */
-    public RuntimeRange<?> overlap(RuntimeRange<?> range) {
-        if (!overlaps(range)) return null;
-        int newStart = Math.max(start, range.start);
-        int newEnd = Math.min(start + width, range.start + range.width);
-        return tail(newStart - start).head(newEnd - newStart);
+  }
+
+  /**
+   * Return a new RuntimeRange that is identical to this range but with width reduced to the
+   * specified width. If the new width is greater than or equal to the width of this range, then
+   * return this range. If the newWidth is 0 or negative, return null.
+   *
+   * @param newWidth The new width.
+   */
+  public RuntimeRange<T> head(int newWidth) {
+    if (newWidth >= width) return this;
+    if (newWidth <= 0) return null;
+    return new RuntimeRange<>(instance, start, newWidth, _interleaved);
+  }
+
+  /**
+   * Return the list of <strong>natural identifiers</strong> for the runtime instances in this
+   * range. Each returned identifier is an integer representation of the mixed-radix number [d0, ...
+   * , dn] with radices [w0, ... , wn], where d0 is the bank or channel index of this RuntimeRange's
+   * instance, which has width w0, and dn is the bank index of its topmost parent below the
+   * top-level (main) reactor, which has width wn. The depth of this RuntimeRange's instance,
+   * therefore, is n - 1. The order of the returned list is the order in which the runtime instances
+   * should be iterated.
+   */
+  public List<Integer> instances() {
+    List<Integer> result = new ArrayList<>(width);
+    MixedRadixInt mr = startMR();
+    int count = 0;
+    while (count++ < width) {
+      result.add(mr.get());
+      mr.increment();
     }
-    
-    /**
-     * Return true if the specified range has the same instance as this range
-     * and the ranges overlap.
-     */
-    public boolean overlaps(RuntimeRange<?> range) {
-        if (!instance.equals(range.instance)) return false;
-        return start < range.start + range.width && start + width > range.start;
+    return result;
+  }
+
+  /**
+   * Return a list containing the instance for this range and all of its parents, not including the
+   * top level reactor, in the order in which their banks and multiport channels should be iterated.
+   * For each depth at which the connection is interleaved, that parent will appear before this
+   * instance in depth order (shallower to deeper). For each depth at which the connection is not
+   * interleaved, that parent will appear after this instance in reverse depth order (deeper to
+   * shallower).
+   */
+  public List<NamedInstance<?>> iterationOrder() {
+    ArrayList<NamedInstance<?>> result = new ArrayList<>();
+    result.add(instance);
+    ReactorInstance parent = instance.parent;
+    while (parent.depth > 0) {
+      if (_interleaved.contains(parent)) {
+        // Put the parent at the head of the list.
+        result.add(0, parent);
+      } else {
+        result.add(parent);
+      }
+      parent = parent.parent;
     }
-    
-    /**
-     * Return a set of identifiers for runtime instances of a parent of this
-     * {@link RuntimeRange}'s instance {@code n} levels above this {@link RuntimeRange}'s instance. If {@code n == 1}, for
-     * example, then this return the identifiers for the parent ReactorInstance.
-     * 
-     * This returns a list of <i>natural identifiers</i>,
-     * as defined below, for the instances within the range.
-     * 
-     * The resulting list can be used to count the number of distinct
-     * runtime instances of this RuntimeRange's instance (using {@code n == 0}) or any of its parents that
-     * lie within the range and to provide an index into an array of runtime
-     * instances.
-     * 
-     * Each <i>natural identifier</i> is the integer value of a mixed-radix number
-     * defined as follows:
-     * <ul>
-     *   <li>The low-order digit is the index of the runtime instance of {@code i} within its container.
-     *   If the {@link NamedInstance} is a {@code PortInstance}, this will be the multiport channel or {@code 0} if it is not a
-     *   multiport. If the NamedInstance is a ReactorInstance, then it will be the bank
-     *   index or {@code 0} if the reactor is not a bank.  The radix for this digit will be
-     *   the multiport width or bank width or 1 if the NamedInstance is neither a
-     *   multiport nor a bank.</li>
-     * <li>The next digit will be the bank index of the container of the specified
-     * {@link NamedInstance} or {@code 0} if it is not a bank.</li>
-     * <li>The remaining digits will be bank indices of containers up to but not
-     * including the top-level reactor (there is no point in including the top-level
-     * reactor because it is never a bank).</li>
-     * <li>Each index that is returned can be used as an index into an array of
-     * runtime instances that is assumed to be in a <i>natural order</i>.</li>
-     * </ul>
-     *
-     * @param n The number of levels up of the parent. This is required to be
-     *  less than the depth of this RuntimeRange's instance or an exception will be thrown.
-     */
-    public Set<Integer> parentInstances(int n) {
-        Set<Integer> result = new LinkedHashSet<>(width);
-        MixedRadixInt mr = startMR();
-        int count = 0;
-        while (count++ < width) {
-            result.add(mr.get(n));
-            mr.increment();
-        }
-        return result;
+    return result;
+  }
+
+  /**
+   * Return a range that is the subset of this range that overlaps with the specified range or null
+   * if there is no overlap.
+   */
+  public RuntimeRange<?> overlap(RuntimeRange<?> range) {
+    if (!overlaps(range)) return null;
+    int newStart = Math.max(start, range.start);
+    int newEnd = Math.min(start + width, range.start + range.width);
+    return tail(newStart - start).head(newEnd - newStart);
+  }
+
+  /**
+   * Return true if the specified range has the same instance as this range and the ranges overlap.
+   */
+  public boolean overlaps(RuntimeRange<?> range) {
+    if (!instance.equals(range.instance)) return false;
+    return start < range.start + range.width && start + width > range.start;
+  }
+
+  /**
+   * Return a set of identifiers for runtime instances of a parent of this {@link RuntimeRange}'s
+   * instance {@code n} levels above this {@link RuntimeRange}'s instance. If {@code n == 1}, for
+   * example, then this return the identifiers for the parent ReactorInstance.
+   *
+   * <p>This returns a list of <i>natural identifiers</i>, as defined below, for the instances
+   * within the range.
+   *
+   * <p>The resulting list can be used to count the number of distinct runtime instances of this
+   * RuntimeRange's instance (using {@code n == 0}) or any of its parents that lie within the range
+   * and to provide an index into an array of runtime instances.
+   *
+   * <p>Each <i>natural identifier</i> is the integer value of a mixed-radix number defined as
+   * follows:
+   *
+   * <ul>
+   *   <li>The low-order digit is the index of the runtime instance of {@code i} within its
+   *       container. If the {@link NamedInstance} is a {@code PortInstance}, this will be the
+   *       multiport channel or {@code 0} if it is not a multiport. If the NamedInstance is a
+   *       ReactorInstance, then it will be the bank index or {@code 0} if the reactor is not a
+   *       bank. The radix for this digit will be the multiport width or bank width or 1 if the
+   *       NamedInstance is neither a multiport nor a bank.
+   *   <li>The next digit will be the bank index of the container of the specified {@link
+   *       NamedInstance} or {@code 0} if it is not a bank.
+   *   <li>The remaining digits will be bank indices of containers up to but not including the
+   *       top-level reactor (there is no point in including the top-level reactor because it is
+   *       never a bank).
+   *   <li>Each index that is returned can be used as an index into an array of runtime instances
+   *       that is assumed to be in a <i>natural order</i>.
+   * </ul>
+   *
+   * @param n The number of levels up of the parent. This is required to be less than the depth of
+   *     this RuntimeRange's instance or an exception will be thrown.
+   */
+  public Set<Integer> parentInstances(int n) {
+    Set<Integer> result = new LinkedHashSet<>(width);
+    MixedRadixInt mr = startMR();
+    int count = 0;
+    while (count++ < width) {
+      result.add(mr.get(n));
+      mr.increment();
     }
+    return result;
+  }
 
-    /**
-     * Return the nearest containing ReactorInstance for this instance.
-     * If this instance is a ReactorInstance, then return it.
-     * Otherwise, return its parent.
-     */
-    public ReactorInstance parentReactor() {
-        if (instance instanceof ReactorInstance) {
-            return (ReactorInstance)instance;
-        } else {
-            return instance.getParent();
-        }
+  /**
+   * Return the nearest containing ReactorInstance for this instance. If this instance is a
+   * ReactorInstance, then return it. Otherwise, return its parent.
+   */
+  public ReactorInstance parentReactor() {
+    if (instance instanceof ReactorInstance) {
+      return (ReactorInstance) instance;
+    } else {
+      return instance.getParent();
     }
-    
-    /**
-     * Return the permutation vector that indicates the order in which the digits
-     * of the permuted mixed-radix representations of indices in this range should
-     * be incremented.
-     */
-    public List<Integer> permutation() {
-        List<Integer> result = new ArrayList<>(instance.depth);
-        // Populate the result with default zeros.
-        for (int i = 0; i < instance.depth; i++) {
-            result.add(0);
-        }
-        int count = 0;
-        for (NamedInstance<?> i : iterationOrder()) {
-            result.set(count++, instance.depth - i.depth);
-        }
-        return result;
+  }
+
+  /**
+   * Return the permutation vector that indicates the order in which the digits of the permuted
+   * mixed-radix representations of indices in this range should be incremented.
+   */
+  public List<Integer> permutation() {
+    List<Integer> result = new ArrayList<>(instance.depth);
+    // Populate the result with default zeros.
+    for (int i = 0; i < instance.depth; i++) {
+      result.add(0);
     }
-    
-    /**
-     * Return the radixes vector containing the width of this instance followed
-     * by the widths of its containers, not including the top level, which always
-     * has radix 1 and value 0.
-     */
-    public List<Integer> radixes() {
-        List<Integer> result = new ArrayList<>(instance.depth);
-        int width = instance.width;
-        // If the width cannot be determined, assume 1.
-        if (width < 0) width = 1;
-        result.add(width);
-        ReactorInstance p = instance.getParent();
-        while (p != null && p.getDepth() > 0) {
-            width = p.getWidth();
-            // If the width cannot be determined, assume 1.
-            if (width < 0) width = 1;
-            result.add(width);
-            p = p.getParent();
-        }
-        return result;
+    int count = 0;
+    for (NamedInstance<?> i : iterationOrder()) {
+      result.set(count++, instance.depth - i.depth);
     }
+    return result;
+  }
 
-    /**
-     * Return the start as a new permuted mixed-radix number.
-     * For any instance that is neither a multiport nor a bank, the
-     * corresponding digit will be 0.
-     */
-    public MixedRadixInt startMR() {
-        MixedRadixInt result = new MixedRadixInt(null, radixes(), permutation());
-        result.setMagnitude(start);
-        return result;
+  /**
+   * Return the radixes vector containing the width of this instance followed by the widths of its
+   * containers, not including the top level, which always has radix 1 and value 0.
+   */
+  public List<Integer> radixes() {
+    List<Integer> result = new ArrayList<>(instance.depth);
+    int width = instance.width;
+    // If the width cannot be determined, assume 1.
+    if (width < 0) width = 1;
+    result.add(width);
+    ReactorInstance p = instance.getParent();
+    while (p != null && p.getDepth() > 0) {
+      width = p.getWidth();
+      // If the width cannot be determined, assume 1.
+      if (width < 0) width = 1;
+      result.add(width);
+      p = p.getParent();
     }
+    return result;
+  }
 
-    /**
-     * Return a new range that represents the leftover elements
-     * starting at the specified offset relative to start.
-     * If start + offset is greater than or equal to the width, then this returns null.
-     * If this offset is 0 then this returns this range unmodified.
-     * @param offset The number of elements to consume. 
-     */
-    public RuntimeRange<T> tail(int offset) {
-        if (offset == 0) return this;
-        if (offset >= width) return null;
-        return new RuntimeRange<>(instance, start + offset, width - offset, _interleaved);
+  /**
+   * Return the start as a new permuted mixed-radix number. For any instance that is neither a
+   * multiport nor a bank, the corresponding digit will be 0.
+   */
+  public MixedRadixInt startMR() {
+    MixedRadixInt result = new MixedRadixInt(null, radixes(), permutation());
+    result.setMagnitude(start);
+    return result;
+  }
+
+  /**
+   * Return a new range that represents the leftover elements starting at the specified offset
+   * relative to start. If start + offset is greater than or equal to the width, then this returns
+   * null. If this offset is 0 then this returns this range unmodified.
+   *
+   * @param offset The number of elements to consume.
+   */
+  public RuntimeRange<T> tail(int offset) {
+    if (offset == 0) return this;
+    if (offset >= width) return null;
+    return new RuntimeRange<>(instance, start + offset, width - offset, _interleaved);
+  }
+
+  /**
+   * Toggle the interleaved status of the specified reactor, which is assumed to be a parent of the
+   * instance of this range. If it was previously interleaved, make it not interleaved and vice
+   * versa. This returns a new RuntimeRange.
+   *
+   * @param reactor The parent reactor at which to toggle interleaving.
+   */
+  public RuntimeRange<T> toggleInterleaved(ReactorInstance reactor) {
+    Set<ReactorInstance> newInterleaved = new HashSet<>(_interleaved);
+    if (_interleaved.contains(reactor)) {
+      newInterleaved.remove(reactor);
+    } else {
+      newInterleaved.add(reactor);
     }
-    
-    /**
-     * Toggle the interleaved status of the specified reactor, which is assumed
-     * to be a parent of the instance of this range.
-     * If it was previously interleaved, make it not interleaved
-     * and vice versa.  This returns a new RuntimeRange.
-     * @param reactor The parent reactor at which to toggle interleaving.
-     */
-    public RuntimeRange<T> toggleInterleaved(ReactorInstance reactor) {
-        Set<ReactorInstance> newInterleaved = new HashSet<>(_interleaved);
-        if (_interleaved.contains(reactor)) {
-            newInterleaved.remove(reactor);
-        } else {
-            newInterleaved.add(reactor);
-        }
-        return new RuntimeRange<>(instance, start, width, newInterleaved);
+    return new RuntimeRange<>(instance, start, width, newInterleaved);
+  }
+
+  @Override
+  public String toString() {
+    return instance.getFullName() + "(" + start + "," + width + ")";
+  }
+
+  //////////////////////////////////////////////////////////
+  //// Protected variables
+
+  /** Record of which levels are interleaved. */
+  Set<ReactorInstance> _interleaved = new HashSet<>();
+
+  //////////////////////////////////////////////////////////
+  //// Public inner classes
+
+  /** Special case of RuntimeRange for PortInstance. */
+  public static class Port extends RuntimeRange<PortInstance> {
+    public Port(PortInstance instance) {
+      super(instance, null);
     }
-        
-    @Override
-    public String toString() {
-        return instance.getFullName() + "(" + start + "," + width + ")";
+
+    public Port(PortInstance instance, Set<ReactorInstance> interleaved) {
+      super(instance, interleaved);
     }
-    
-    //////////////////////////////////////////////////////////
-    //// Protected variables
-    
-    /** Record of which levels are interleaved. */
-    Set<ReactorInstance> _interleaved = new HashSet<>();
-    
-    //////////////////////////////////////////////////////////
-    //// Public inner classes
-    
-    /**
-     * Special case of RuntimeRange for PortInstance.
-     */
-    public static class Port extends RuntimeRange<PortInstance> {
-        public Port(PortInstance instance) {
-            super(instance, null);
-        }
-        public Port(PortInstance instance, Set<ReactorInstance> interleaved) {
-            super(instance, interleaved);
-        }
-        public Port(PortInstance instance, int start, int width, Set<ReactorInstance> interleaved) {
-            super(instance, start, width, interleaved);
-        }
+
+    public Port(PortInstance instance, int start, int width, Set<ReactorInstance> interleaved) {
+      super(instance, start, width, interleaved);
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/SendRange.java b/org.lflang/src/org/lflang/generator/SendRange.java
index c6f6221b5f..5e7f406f1e 100644
--- a/org.lflang/src/org/lflang/generator/SendRange.java
+++ b/org.lflang/src/org/lflang/generator/SendRange.java
@@ -32,286 +32,277 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.lflang.lf.Connection;
 
 /**
- * Class representing a range of a port that sources data
- * together with a list of destination ranges of other ports that should all
- * receive the same data sent in this range.
- * All ranges in the destinations list have widths that are an integer
- * multiple N of this range but not necessarily the same start offsets.
- * 
- * This class and subclasses are designed to be immutable.
- * Modifications always return a new RuntimeRange.
+ * Class representing a range of a port that sources data together with a list of destination ranges
+ * of other ports that should all receive the same data sent in this range. All ranges in the
+ * destinations list have widths that are an integer multiple N of this range but not necessarily
+ * the same start offsets.
+ *
+ * <p>This class and subclasses are designed to be immutable. Modifications always return a new
+ * RuntimeRange.
  *
  * @author Edward A. Lee
-*/
+ */
 public class SendRange extends RuntimeRange.Port {
-    
-    /**
-     * Create a new send range.
-     * @param instance The instance over which this is a range of.
-     * @param start The starting index.
-     * @param width The width.
-     * @param interleaved A list of parents that are interleaved or null if none.
-     * @param connection The connection that establishes this send or null if not unique or none.
-     */
-    public SendRange(
-            PortInstance instance,
-            int start,
-            int width,
-            Set<ReactorInstance> interleaved,
-            Connection connection
-    ) {
-        super(instance, start, width, interleaved);
-        this.connection = connection;
-    }
 
-    /**
-     * Create a new send range representing sending from the specified
-     * src to the specified dst.  This preserves the interleaved status
-     * of both the src and dst.
-     * @param src The source range.
-     * @param dst The destination range.
-     * @param interleaved A list of parents that are interleaved or null if none.
-     * @param connection The connection that establishes this send or null if not unique or none.
-     */
-    public SendRange(
-            RuntimeRange<PortInstance> src,
-            RuntimeRange<PortInstance> dst,
-            Set<ReactorInstance> interleaved,
-            Connection connection
-    ) {
-        super(src.instance, src.start, src.width, interleaved);
-        destinations.add(dst);
-        _interleaved.addAll(src._interleaved);
-        this.connection = connection;
-    }
+  /**
+   * Create a new send range.
+   *
+   * @param instance The instance over which this is a range of.
+   * @param start The starting index.
+   * @param width The width.
+   * @param interleaved A list of parents that are interleaved or null if none.
+   * @param connection The connection that establishes this send or null if not unique or none.
+   */
+  public SendRange(
+      PortInstance instance,
+      int start,
+      int width,
+      Set<ReactorInstance> interleaved,
+      Connection connection) {
+    super(instance, start, width, interleaved);
+    this.connection = connection;
+  }
 
-    //////////////////////////////////////////////////////////
-    //// Public variables
+  /**
+   * Create a new send range representing sending from the specified src to the specified dst. This
+   * preserves the interleaved status of both the src and dst.
+   *
+   * @param src The source range.
+   * @param dst The destination range.
+   * @param interleaved A list of parents that are interleaved or null if none.
+   * @param connection The connection that establishes this send or null if not unique or none.
+   */
+  public SendRange(
+      RuntimeRange<PortInstance> src,
+      RuntimeRange<PortInstance> dst,
+      Set<ReactorInstance> interleaved,
+      Connection connection) {
+    super(src.instance, src.start, src.width, interleaved);
+    destinations.add(dst);
+    _interleaved.addAll(src._interleaved);
+    this.connection = connection;
+  }
 
-    /** The connection that establishes this relationship or null if not unique or none. */
-    public final Connection connection;
-    
-    /** The list of destination ranges to which this broadcasts. */
-    public final List<RuntimeRange<PortInstance>> destinations = new ArrayList<>();
+  //////////////////////////////////////////////////////////
+  //// Public variables
 
-    //////////////////////////////////////////////////////////
-    //// Public methods
+  /** The connection that establishes this relationship or null if not unique or none. */
+  public final Connection connection;
 
-    /**
-     * Add a destination to the list of destinations of this range.
-     * If the width of the destination is not a multiple of the width
-     * of this range, throw an exception.
-     * @throws IllegalArgumentException If the width doesn't match.
-     */
-    public void addDestination(RuntimeRange<PortInstance> dst) {
-        if (dst.width % width != 0) {
-            throw new IllegalArgumentException(
-                    "Destination range width is not a multiple of sender's width");
-        }
-        destinations.add(dst);
-        // Void any precomputed number of destinations.
-        _numberOfDestinationReactors = -1;
+  /** The list of destination ranges to which this broadcasts. */
+  public final List<RuntimeRange<PortInstance>> destinations = new ArrayList<>();
+
+  //////////////////////////////////////////////////////////
+  //// Public methods
+
+  /**
+   * Add a destination to the list of destinations of this range. If the width of the destination is
+   * not a multiple of the width of this range, throw an exception.
+   *
+   * @throws IllegalArgumentException If the width doesn't match.
+   */
+  public void addDestination(RuntimeRange<PortInstance> dst) {
+    if (dst.width % width != 0) {
+      throw new IllegalArgumentException(
+          "Destination range width is not a multiple of sender's width");
     }
-    
-    /**
-     * Override the base class to add additional comparisons so that
-     * ordering is never ambiguous. This means that sorting will be deterministic.
-     * Note that this can return 0 even if equals() does not return true.
-     */
-    @Override
-    public int compareTo(RuntimeRange<?> o) {
-        int result = super.compareTo(o);
-        if (result == 0) {
-            // Longer destination lists come first.
-            if (destinations.size() > ((SendRange)o).destinations.size()) {
-                return -1;
-            } else if (destinations.size() == ((SendRange)o).destinations.size()) {
-                return instance.getFullName().compareTo(o.instance.getFullName());
-            } else {
-                return 1;
-            }
-        }
-        return result;
+    destinations.add(dst);
+    // Void any precomputed number of destinations.
+    _numberOfDestinationReactors = -1;
+  }
+
+  /**
+   * Override the base class to add additional comparisons so that ordering is never ambiguous. This
+   * means that sorting will be deterministic. Note that this can return 0 even if equals() does not
+   * return true.
+   */
+  @Override
+  public int compareTo(RuntimeRange<?> o) {
+    int result = super.compareTo(o);
+    if (result == 0) {
+      // Longer destination lists come first.
+      if (destinations.size() > ((SendRange) o).destinations.size()) {
+        return -1;
+      } else if (destinations.size() == ((SendRange) o).destinations.size()) {
+        return instance.getFullName().compareTo(o.instance.getFullName());
+      } else {
+        return 1;
+      }
     }
+    return result;
+  }
 
-    /**
-     * Return the total number of destination reactors for this range.
-     * Specifically, this is the number of distinct runtime reactor instances
-     * that react to messages from this send range.
-     */
-    public int getNumberOfDestinationReactors() {
-        if (_numberOfDestinationReactors < 0) {
-            // Has not been calculated before. Calculate now.
-            _numberOfDestinationReactors = 0;
-            Map<ReactorInstance, Set<Integer>> result = new HashMap<>();
-            for (RuntimeRange<PortInstance> destination : this.destinations) {
-                // The following set contains unique identifiers the parent reactors
-                // of destination ports.
-                Set<Integer> parentIDs = destination.parentInstances(1);
-                Set<Integer> previousParentIDs = result.get(destination.instance.parent);
-                if (previousParentIDs == null) {
-                    result.put(destination.instance.parent, parentIDs);
-                } else {
-                    previousParentIDs.addAll(parentIDs);
-                }
-            }
-            for (ReactorInstance parent : result.keySet()) {
-                _numberOfDestinationReactors += result.get(parent).size();
-            }
+  /**
+   * Return the total number of destination reactors for this range. Specifically, this is the
+   * number of distinct runtime reactor instances that react to messages from this send range.
+   */
+  public int getNumberOfDestinationReactors() {
+    if (_numberOfDestinationReactors < 0) {
+      // Has not been calculated before. Calculate now.
+      _numberOfDestinationReactors = 0;
+      Map<ReactorInstance, Set<Integer>> result = new HashMap<>();
+      for (RuntimeRange<PortInstance> destination : this.destinations) {
+        // The following set contains unique identifiers the parent reactors
+        // of destination ports.
+        Set<Integer> parentIDs = destination.parentInstances(1);
+        Set<Integer> previousParentIDs = result.get(destination.instance.parent);
+        if (previousParentIDs == null) {
+          result.put(destination.instance.parent, parentIDs);
+        } else {
+          previousParentIDs.addAll(parentIDs);
         }
-        return _numberOfDestinationReactors;
+      }
+      for (ReactorInstance parent : result.keySet()) {
+        _numberOfDestinationReactors += result.get(parent).size();
+      }
     }
+    return _numberOfDestinationReactors;
+  }
 
-    /**
-     * Return a new SendRange that is identical to this range but
-     * with width reduced to the specified width.
-     * If the new width is greater than or equal to the width
-     * of this range, then return this range.
-     * If the newWidth is 0 or negative, return null.
-     * This overrides the base class to also apply head()
-     * to the destination list.
-     * @param newWidth The new width.
-     */
-    @Override
-    public SendRange head(int newWidth) {
-        // NOTE: Cannot use the superclass because it returns a RuntimeRange, not a SendRange.
-        // Also, cannot return this without applying head() to the destinations.
-        if (newWidth <= 0) return null;
+  /**
+   * Return a new SendRange that is identical to this range but with width reduced to the specified
+   * width. If the new width is greater than or equal to the width of this range, then return this
+   * range. If the newWidth is 0 or negative, return null. This overrides the base class to also
+   * apply head() to the destination list.
+   *
+   * @param newWidth The new width.
+   */
+  @Override
+  public SendRange head(int newWidth) {
+    // NOTE: Cannot use the superclass because it returns a RuntimeRange, not a SendRange.
+    // Also, cannot return this without applying head() to the destinations.
+    if (newWidth <= 0) return null;
 
-        SendRange result = new SendRange(instance, start, newWidth, _interleaved, connection);
-        
-        for (RuntimeRange<PortInstance> destination : destinations) {
-            result.destinations.add(destination.head(newWidth));
-        }
-        return result;
+    SendRange result = new SendRange(instance, start, newWidth, _interleaved, connection);
+
+    for (RuntimeRange<PortInstance> destination : destinations) {
+      result.destinations.add(destination.head(newWidth));
     }
+    return result;
+  }
 
-    /**
-     * Return a range that is the subset of this range that overlaps with the
-     * specified range or null if there is no overlap.
-     */
-    @Override
-    public SendRange overlap(RuntimeRange<?> range) {
-        if (!overlaps(range)) return null;
-        if (range.start == start && range.width == width) return this;
-        int newStart = Math.max(start, range.start);
-        int newEnd = Math.min(start + width, range.start + range.width);
-        int newWidth = newEnd - newStart;
-        SendRange result = new SendRange(instance, newStart, newWidth, _interleaved, connection);
-        result._interleaved.addAll(_interleaved);
-        for (RuntimeRange<PortInstance> destination : destinations) {
-            // The destination width is a multiple of this range's width.
-            // If the multiple is greater than 1, then the destination needs to
-            // split into multiple destinations.
-            while (destination != null) {
-                int dstStart = destination.start + (newStart - start);
-                RuntimeRange.Port dst = new RuntimeRange.Port(
-                        destination.instance,
-                        dstStart,
-                        newWidth,
-                        destination._interleaved
-                );
-                result.addDestination(dst);
-                destination = destination.tail(width);
-            }
-        }
-        return result;
+  /**
+   * Return a range that is the subset of this range that overlaps with the specified range or null
+   * if there is no overlap.
+   */
+  @Override
+  public SendRange overlap(RuntimeRange<?> range) {
+    if (!overlaps(range)) return null;
+    if (range.start == start && range.width == width) return this;
+    int newStart = Math.max(start, range.start);
+    int newEnd = Math.min(start + width, range.start + range.width);
+    int newWidth = newEnd - newStart;
+    SendRange result = new SendRange(instance, newStart, newWidth, _interleaved, connection);
+    result._interleaved.addAll(_interleaved);
+    for (RuntimeRange<PortInstance> destination : destinations) {
+      // The destination width is a multiple of this range's width.
+      // If the multiple is greater than 1, then the destination needs to
+      // split into multiple destinations.
+      while (destination != null) {
+        int dstStart = destination.start + (newStart - start);
+        RuntimeRange.Port dst =
+            new RuntimeRange.Port(
+                destination.instance, dstStart, newWidth, destination._interleaved);
+        result.addDestination(dst);
+        destination = destination.tail(width);
+      }
     }
+    return result;
+  }
 
-    /**
-     * Return a new SendRange that represents the leftover elements
-     * starting at the specified offset. If the offset is greater
-     * than or equal to the width, then this returns null.
-     * If this offset is 0 then this returns this range unmodified.
-     * This overrides the base class to also apply tail()
-     * to the destination list.
-     * @param offset The number of elements to consume. 
-     */
-    @Override
-    public SendRange tail(int offset) {
-        // NOTE: Cannot use the superclass because it returns a RuntimeRange, not a SendRange.
-        // Also, cannot return this without applying tail() to the destinations.
-        if (offset >= width) return null;
-        SendRange result = new SendRange(
-                instance, start + offset, width - offset, _interleaved, connection);
+  /**
+   * Return a new SendRange that represents the leftover elements starting at the specified offset.
+   * If the offset is greater than or equal to the width, then this returns null. If this offset is
+   * 0 then this returns this range unmodified. This overrides the base class to also apply tail()
+   * to the destination list.
+   *
+   * @param offset The number of elements to consume.
+   */
+  @Override
+  public SendRange tail(int offset) {
+    // NOTE: Cannot use the superclass because it returns a RuntimeRange, not a SendRange.
+    // Also, cannot return this without applying tail() to the destinations.
+    if (offset >= width) return null;
+    SendRange result =
+        new SendRange(instance, start + offset, width - offset, _interleaved, connection);
 
-        for (RuntimeRange<PortInstance> destination : destinations) {
-            result.destinations.add(destination.tail(offset));
-        }
-        return result;
+    for (RuntimeRange<PortInstance> destination : destinations) {
+      result.destinations.add(destination.tail(offset));
     }
+    return result;
+  }
 
-    @Override
-    public String toString() {
-        StringBuilder result = new StringBuilder();
-        result.append(super.toString());
-        result.append("->[");
-        List<String> dsts = new LinkedList<>();
-        for (RuntimeRange<PortInstance> dst : destinations) {
-            dsts.add(dst.toString());
-        }
-        result.append(String.join(", ", dsts));
-        result.append("]");
-        return result.toString();
+  @Override
+  public String toString() {
+    StringBuilder result = new StringBuilder();
+    result.append(super.toString());
+    result.append("->[");
+    List<String> dsts = new LinkedList<>();
+    for (RuntimeRange<PortInstance> dst : destinations) {
+      dsts.add(dst.toString());
     }
+    result.append(String.join(", ", dsts));
+    result.append("]");
+    return result.toString();
+  }
+
+  //////////////////////////////////////////////////////////
+  //// Protected methods
 
-    //////////////////////////////////////////////////////////
-    //// Protected methods
+  /**
+   * Assuming that this SendRange is completely contained by one of the destinations of the
+   * specified srcRange, return a new SendRange where the send range is the subrange of the
+   * specified srcRange that overlaps with this SendRange and the destinations include all the
+   * destinations of this SendRange. If the assumption is not satisfied, throw an
+   * IllegalArgumentException.
+   *
+   * <p>If any parent of this range is marked interleaved and is also a parent of the specified
+   * srcRange, then that parent will be marked interleaved in the result.
+   *
+   * @param srcRange A new source range.
+   * @param srcRangeOffset An offset into the source range.
+   */
+  protected SendRange newSendRange(SendRange srcRange, int srcRangeOffset) {
+    // Every destination of srcRange receives all channels of srcRange (multicast).
+    // Find which multicast destination overlaps with this srcRange.
+    for (RuntimeRange<PortInstance> srcDestination : srcRange.destinations) {
+      RuntimeRange<?> overlap = srcDestination.overlap(this);
+      if (overlap == null) continue; // Not this one.
 
-    /**
-     * Assuming that this SendRange is completely contained by one
-     * of the destinations of the specified srcRange, return a new SendRange
-     * where the send range is the subrange of the specified srcRange that
-     * overlaps with this SendRange and the destinations include all the
-     * destinations of this SendRange. If the assumption is not satisfied,
-     * throw an IllegalArgumentException.
-     * 
-     * If any parent of this range is marked interleaved and is also a parent of the
-     * specified srcRange, then that parent will be marked interleaved
-     * in the result.
-     * 
-     * @param srcRange A new source range.
-     * @param srcRangeOffset An offset into the source range.
-     */
-    protected SendRange newSendRange(SendRange srcRange, int srcRangeOffset) {
-        // Every destination of srcRange receives all channels of srcRange (multicast).
-        // Find which multicast destination overlaps with this srcRange.
-        for (RuntimeRange<PortInstance> srcDestination : srcRange.destinations) {
-            RuntimeRange<?> overlap = srcDestination.overlap(this);
-            if (overlap == null) continue; // Not this one.
-            
-            if (overlap.width == width) {
-                // Found an overlap that is completely contained.
-                // If this width is greater than the srcRange width,
-                // then assume srcRange is multicasting via this.
-                int newWidth = Math.min(width,  srcRange.width);
-                // The interleaving of the result is the union of the two interleavings.
-                Set<ReactorInstance> interleaving = new LinkedHashSet<>();
-                interleaving.addAll(_interleaved);
-                interleaving.addAll(srcRange._interleaved);
-                SendRange result = new SendRange(
-                        srcRange.instance,
-                        srcRange.start + srcRangeOffset,
-                        newWidth,
-                        interleaving,
-                        connection);
-                for (RuntimeRange<PortInstance> dst : destinations) {
-                    result.addDestination(dst);
-                }
-                return result;
-            }
+      if (overlap.width == width) {
+        // Found an overlap that is completely contained.
+        // If this width is greater than the srcRange width,
+        // then assume srcRange is multicasting via this.
+        int newWidth = Math.min(width, srcRange.width);
+        // The interleaving of the result is the union of the two interleavings.
+        Set<ReactorInstance> interleaving = new LinkedHashSet<>();
+        interleaving.addAll(_interleaved);
+        interleaving.addAll(srcRange._interleaved);
+        SendRange result =
+            new SendRange(
+                srcRange.instance,
+                srcRange.start + srcRangeOffset,
+                newWidth,
+                interleaving,
+                connection);
+        for (RuntimeRange<PortInstance> dst : destinations) {
+          result.addDestination(dst);
         }
-        throw new IllegalArgumentException(
-                "Expected this SendRange " + this
-                + " to be completely contained by a destination of " + srcRange);
+        return result;
+      }
     }
+    throw new IllegalArgumentException(
+        "Expected this SendRange "
+            + this
+            + " to be completely contained by a destination of "
+            + srcRange);
+  }
 
-    //////////////////////////////////////////////////////////
-    //// Private variables
+  //////////////////////////////////////////////////////////
+  //// Private variables
 
-    private int _numberOfDestinationReactors = -1; // Never access this directly.
+  private int _numberOfDestinationReactors = -1; // Never access this directly.
 }
diff --git a/org.lflang/src/org/lflang/generator/SubContext.java b/org.lflang/src/org/lflang/generator/SubContext.java
index 5e7a981ab8..cf90cb1fda 100644
--- a/org.lflang/src/org/lflang/generator/SubContext.java
+++ b/org.lflang/src/org/lflang/generator/SubContext.java
@@ -1,90 +1,88 @@
 package org.lflang.generator;
 
-import java.io.File;
 import java.util.Properties;
-
 import org.eclipse.xtext.util.CancelIndicator;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 
 /**
- * A {@code SubContext} is the context of a process within a build process. For example,
- * compilation of generated code may optionally be given a {@code SubContext} because
- * compilation is part of a complete build.
+ * A {@code SubContext} is the context of a process within a build process. For example, compilation
+ * of generated code may optionally be given a {@code SubContext} because compilation is part of a
+ * complete build.
  *
  * @author Peter Donovan
  */
 public class SubContext implements LFGeneratorContext {
 
-    private final LFGeneratorContext containingContext;
-    private final int startPercentProgress;
-    private final int endPercentProgress;
-    private GeneratorResult result = null;
-
-    protected ErrorReporter errorReporter;
-
-    /**
-     * Initializes the context within {@code containingContext} of the process that extends from
-     * {@code startPercentProgress} to {@code endPercentProgress}.
-     * @param containingContext The context of the containing build process.
-     * @param startPercentProgress The percent progress of the containing build process when this
-     *                             nested process starts.
-     * @param endPercentProgress The percent progress of the containing build process when this
-     *                           nested process ends.
-     */
-    public SubContext(LFGeneratorContext containingContext, int startPercentProgress, int endPercentProgress) {
-        this.containingContext = containingContext;
-        this.startPercentProgress = startPercentProgress;
-        this.endPercentProgress = endPercentProgress;
-    }
-
-    @Override
-    public CancelIndicator getCancelIndicator() {
-        return containingContext.getCancelIndicator();
-    }
-
-    @Override
-    public Mode getMode() {
-        return containingContext.getMode();
-    }
-
-    @Override
-    public Properties getArgs() {
-        return containingContext.getArgs();
-    }
-
-    @Override
-    public ErrorReporter getErrorReporter() {
-        return containingContext.getErrorReporter();
-    }
-
-    @Override
-    public void finish(GeneratorResult result) {
-        this.result = result;
-    }
-
-    @Override
-    public GeneratorResult getResult() {
-        return result;
-    }
-
-    @Override
-    public FileConfig getFileConfig() {
-        return containingContext.getFileConfig();
-    }
-
-    @Override
-    public TargetConfig getTargetConfig() {
-        return containingContext.getTargetConfig();
-    }
-
-    @Override
-    public void reportProgress(String message, int percentage) {
-        containingContext.reportProgress(
-            message,
-            startPercentProgress * (100 - percentage) / 100 + endPercentProgress * percentage / 100
-        );
-    }
+  private final LFGeneratorContext containingContext;
+  private final int startPercentProgress;
+  private final int endPercentProgress;
+  private GeneratorResult result = null;
+
+  protected ErrorReporter errorReporter;
+
+  /**
+   * Initializes the context within {@code containingContext} of the process that extends from
+   * {@code startPercentProgress} to {@code endPercentProgress}.
+   *
+   * @param containingContext The context of the containing build process.
+   * @param startPercentProgress The percent progress of the containing build process when this
+   *     nested process starts.
+   * @param endPercentProgress The percent progress of the containing build process when this nested
+   *     process ends.
+   */
+  public SubContext(
+      LFGeneratorContext containingContext, int startPercentProgress, int endPercentProgress) {
+    this.containingContext = containingContext;
+    this.startPercentProgress = startPercentProgress;
+    this.endPercentProgress = endPercentProgress;
+  }
+
+  @Override
+  public CancelIndicator getCancelIndicator() {
+    return containingContext.getCancelIndicator();
+  }
+
+  @Override
+  public Mode getMode() {
+    return containingContext.getMode();
+  }
+
+  @Override
+  public Properties getArgs() {
+    return containingContext.getArgs();
+  }
+
+  @Override
+  public ErrorReporter getErrorReporter() {
+    return containingContext.getErrorReporter();
+  }
+
+  @Override
+  public void finish(GeneratorResult result) {
+    this.result = result;
+  }
+
+  @Override
+  public GeneratorResult getResult() {
+    return result;
+  }
+
+  @Override
+  public FileConfig getFileConfig() {
+    return containingContext.getFileConfig();
+  }
+
+  @Override
+  public TargetConfig getTargetConfig() {
+    return containingContext.getTargetConfig();
+  }
+
+  @Override
+  public void reportProgress(String message, int percentage) {
+    containingContext.reportProgress(
+        message,
+        startPercentProgress * (100 - percentage) / 100 + endPercentProgress * percentage / 100);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/TargetTypes.java b/org.lflang/src/org/lflang/generator/TargetTypes.java
index 585d65c96a..eda5cffd11 100644
--- a/org.lflang/src/org/lflang/generator/TargetTypes.java
+++ b/org.lflang/src/org/lflang/generator/TargetTypes.java
@@ -3,10 +3,9 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.InferredType;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Action;
 import org.lflang.lf.BracedListExpression;
 import org.lflang.lf.CodeExpr;
@@ -21,257 +20,217 @@
 import org.lflang.lf.Type;
 
 /**
- * Information about the types of a target language. Contains
- * utilities to convert LF expressions and types to the target
- * language. Each code generator is expected to use at least one
+ * Information about the types of a target language. Contains utilities to convert LF expressions
+ * and types to the target language. Each code generator is expected to use at least one
  * language-specific instance of this interface.
- * <p>
- * TODO currently, {@link GeneratorBase} implements this interface,
- *  it should instead contain an instance.
+ *
+ * <p>TODO currently, {@link GeneratorBase} implements this interface, it should instead contain an
+ * instance.
  *
  * @author Clément Fournier - TU Dresden, INSA Rennes
  */
 public interface TargetTypes {
 
-
-    /**
-     * Return true if the target supports generics (i.e., parametric
-     * polymorphism), false otherwise.
-     */
-    boolean supportsGenerics();
-
-
-    /**
-     * Return the type of time durations.
-     */
-    String getTargetTimeType();
-
-
-    /**
-     * Return the type of tags.
-     */
-    String getTargetTagType();
-
-
-    /**
-     * Return the type of fixed sized lists (or arrays).
-     */
-    String getTargetFixedSizeListType(String baseType, int size);
-
-
-    /**
-     * Return the type of variable sized lists (eg {@code std::vector<baseType>}).
-     */
-    String getTargetVariableSizeListType(String baseType);
-
-
-    default String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
-        return escapeIdentifier(expr.getParameter().getName());
-    }
-
-    /** Translate the braced list expression into target language syntax. */
-    default String getTargetBracedListExpr(BracedListExpression expr, InferredType typeOrNull) {
-        InferredType t = typeOrNull == null ? InferredType.undefined() : typeOrNull;
-        return expr.getItems().stream().map(e -> getTargetExpr(e, t))
-            .collect(Collectors.joining(",", "{", "}"));
-    }
-
-    /**
-     * Return an "undefined" type which is used as a default
-     * when a type cannot be inferred.
-     */
-    String getTargetUndefinedType();
-
-    /**
-     * Returns a version of the given LF identifier that is
-     * escaped properly for insertion into a piece of target
-     * code.
-     */
-    default String escapeIdentifier(String ident) {
-        return ident;
-    }
-
-    /**
-     * Returns an expression in the target language that corresponds
-     * to the given time value ({@link #getTargetTimeType()}).
-     */
-    default String getTargetTimeExpr(TimeValue timeValue) {
-        // todo make non-default when we reuse this for all generators,
-        //  all targets should support this.
-        Objects.requireNonNull(timeValue);
-        throw new UnsupportedGeneratorFeatureException("Time expressions");
-    }
-
-    /**
-     * Returns an expression in the target language that corresponds
-     * to a variable-size list expression.
-     *
-     * @throws UnsupportedGeneratorFeatureException If the target does not support this
-     */
-    default String getVariableSizeListInitExpression(List<String> contents, boolean withBraces) {
-        throw new UnsupportedGeneratorFeatureException("Variable size lists");
-    }
-
-    /**
-     * Returns an expression in the target language that corresponds
-     * to a fixed-size list expression.
-     *
-     * @throws UnsupportedGeneratorFeatureException If the target does not support this
-     */
-    default String getFixedSizeListInitExpression(List<String> contents, int listSize, boolean withBraces) {
-        throw new UnsupportedGeneratorFeatureException("Fixed size lists");
-    }
-
-
-    /**
-     * Returns the expression that is used to replace a
-     * missing expression in the source language. The expression
-     * may for instance be a type-agnostic default value
-     * (e.g. Rust's {@code Default::default()}), or produce
-     * a compiler error (e.g. Rust's {@code compiler_error!("missing initializer")}).
-     *
-     * @throws UnsupportedGeneratorFeatureException If the target does not support this
-     */
-    default String getMissingExpr(InferredType type) {
-        throw new UnsupportedGeneratorFeatureException("Missing initializers");
-    }
-
-
-    /**
-     * Returns a target type inferred from the type node, or the
-     * initializer list. If both are absent, then the undefined
-     * type is returned.
-     */
-    default String getTargetType(Type type, Initializer init) {
-        return getTargetType(ASTUtils.getInferredType(type, init));
-    }
-
-    /**
-     * Returns the target type of the type node. This just provides
-     * a default parameter for {@link #getTargetType(Type, Initializer)}.
-     * If the parameter is null, then the undefined type is returned.
-     */
-    default String getTargetType(Type type) {
-        return getTargetType(type, null);
-    }
-
-    /**
-     * Return a string representing the specified type in the
-     * target language.
-     */
-    default String getTargetType(InferredType type) {
-        if (type.isUndefined()) {
-            return getTargetUndefinedType();
-        } else if (type.isTime) {
-            if (type.isFixedSizeList) {
-                return getTargetFixedSizeListType(getTargetTimeType(), type.listSize);
-            } else if (type.isVariableSizeList) {
-                return getTargetVariableSizeListType(getTargetTimeType());
-            } else {
-                return getTargetTimeType();
-            }
-        } else if (type.isFixedSizeList) {
-            return getTargetFixedSizeListType(type.baseType(), type.listSize);
-        } else if (type.isVariableSizeList) {
-            return getTargetVariableSizeListType(type.baseType());
-        } else if (!type.astType.getTypeArgs().isEmpty()) {
-            List<String> args = type.astType.getTypeArgs().stream().map(this::getTargetType).toList();
-            return getGenericType(type.baseType(), args);
-        }
-        return type.toOriginalText();
-    }
-
-    /** Build a generic type. The type args list must not be empty. */
-    default String getGenericType(String base, List<String> args) {
-        assert !args.isEmpty() : "Empty type arguments for " + base;
-        return base + "<" + String.join(", ", args) + ">";
-    }
-
-    /**
-     * Return a string representing the type of the given
-     * parameter.
-     */
-    default String getTargetType(Parameter p) {
-        return getTargetType(ASTUtils.getInferredType(p));
-    }
-
-    /**
-     * Return a string representing the type of the given
-     * state variable.
-     */
-    default String getTargetType(StateVar s) {
-        return getTargetType(ASTUtils.getInferredType(s));
-    }
-
-    /**
-     * Return a string representing the type of the given
-     * action.
-     */
-    default String getTargetType(Action a) {
-        return getTargetType(ASTUtils.getInferredType(a));
-    }
-
-    /**
-     * Return a string representing the type of the given
-     * port.
-     */
-    default String getTargetType(Port p) {
-        return getTargetType(ASTUtils.getInferredType(p));
-    }
-
-    /**
-     * Returns the representation of the given initializer
-     * expression in target code. The given type, if non-null,
-     * may inform the code generation.
-     *
-     * @param init           Initializer node (nullable)
-     * @param type           Declared type of the expression (nullable)
-     */
-    default String getTargetInitializer(Initializer init, Type type) {
-        var inferredType = ASTUtils.getInferredType(type, init);
-        if (init == null) {
-            return getMissingExpr(inferredType);
-        }
-        var single = ASTUtils.asSingleExpr(init);
-        if (single != null) {
-            return getTargetExpr(single, inferredType);
-        }
-        var targetValues = init.getExprs().stream().map(it -> getTargetExpr(it, inferredType)).collect(Collectors.toList());
-        if (inferredType.isFixedSizeList) {
-            return getFixedSizeListInitExpression(targetValues, inferredType.listSize, init.isBraces());
-        } else  {
-            return getVariableSizeListInitExpression(targetValues, init.isBraces());
-        }
-    }
-
-
-    /**
-     * Returns the representation of the given expression in target code.
-     * The given type, if non-null, may inform the code generation.
-     */
-    default String getTargetExpr(Expression expr, InferredType type) {
-        if (ASTUtils.isZero(expr) && type != null && type.isTime) {
-            return getTargetTimeExpr(TimeValue.ZERO);
-        } else if (expr instanceof ParameterReference) {
-            return getTargetParamRef((ParameterReference) expr, type);
-        } else if (expr instanceof Time) {
-            return getTargetTimeExpr((Time) expr);
-        } else if (expr instanceof Literal) {
-            return ASTUtils.addZeroToLeadingDot(((Literal) expr).getLiteral()); // here we don't escape
-        } else if (expr instanceof CodeExpr) {
-            return ASTUtils.toText(((CodeExpr) expr).getCode());
-        } else if (expr instanceof BracedListExpression) {
-            return getTargetBracedListExpr((BracedListExpression) expr, type);
-        } else {
-            throw new IllegalStateException("Invalid value " + expr);
-        }
-    }
-
-    /**
-     * Returns the representation of the given time value in
-     * target code.
-     */
-    default String getTargetTimeExpr(Time t) {
-        return getTargetTimeExpr(ASTUtils.toTimeValue(t));
-    }
+  /**
+   * Return true if the target supports generics (i.e., parametric polymorphism), false otherwise.
+   */
+  boolean supportsGenerics();
+
+  /** Return the type of time durations. */
+  String getTargetTimeType();
+
+  /** Return the type of tags. */
+  String getTargetTagType();
+
+  /** Return the type of fixed sized lists (or arrays). */
+  String getTargetFixedSizeListType(String baseType, int size);
+
+  /** Return the type of variable sized lists (eg {@code std::vector<baseType>}). */
+  String getTargetVariableSizeListType(String baseType);
+
+  default String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
+    return escapeIdentifier(expr.getParameter().getName());
+  }
+
+  /** Translate the braced list expression into target language syntax. */
+  default String getTargetBracedListExpr(BracedListExpression expr, InferredType typeOrNull) {
+    InferredType t = typeOrNull == null ? InferredType.undefined() : typeOrNull;
+    return expr.getItems().stream()
+        .map(e -> getTargetExpr(e, t))
+        .collect(Collectors.joining(",", "{", "}"));
+  }
+
+  /** Return an "undefined" type which is used as a default when a type cannot be inferred. */
+  String getTargetUndefinedType();
+
+  /**
+   * Returns a version of the given LF identifier that is escaped properly for insertion into a
+   * piece of target code.
+   */
+  default String escapeIdentifier(String ident) {
+    return ident;
+  }
+
+  /**
+   * Returns an expression in the target language that corresponds to the given time value ({@link
+   * #getTargetTimeType()}).
+   */
+  default String getTargetTimeExpr(TimeValue timeValue) {
+    // todo make non-default when we reuse this for all generators,
+    //  all targets should support this.
+    Objects.requireNonNull(timeValue);
+    throw new UnsupportedGeneratorFeatureException("Time expressions");
+  }
+
+  /**
+   * Returns an expression in the target language that corresponds to a variable-size list
+   * expression.
+   *
+   * @throws UnsupportedGeneratorFeatureException If the target does not support this
+   */
+  default String getVariableSizeListInitExpression(List<String> contents, boolean withBraces) {
+    throw new UnsupportedGeneratorFeatureException("Variable size lists");
+  }
+
+  /**
+   * Returns an expression in the target language that corresponds to a fixed-size list expression.
+   *
+   * @throws UnsupportedGeneratorFeatureException If the target does not support this
+   */
+  default String getFixedSizeListInitExpression(
+      List<String> contents, int listSize, boolean withBraces) {
+    throw new UnsupportedGeneratorFeatureException("Fixed size lists");
+  }
+
+  /**
+   * Returns the expression that is used to replace a missing expression in the source language. The
+   * expression may for instance be a type-agnostic default value (e.g. Rust's {@code
+   * Default::default()}), or produce a compiler error (e.g. Rust's {@code compiler_error!("missing
+   * initializer")}).
+   *
+   * @throws UnsupportedGeneratorFeatureException If the target does not support this
+   */
+  default String getMissingExpr(InferredType type) {
+    throw new UnsupportedGeneratorFeatureException("Missing initializers");
+  }
+
+  /**
+   * Returns a target type inferred from the type node, or the initializer list. If both are absent,
+   * then the undefined type is returned.
+   */
+  default String getTargetType(Type type, Initializer init) {
+    return getTargetType(ASTUtils.getInferredType(type, init));
+  }
+
+  /**
+   * Returns the target type of the type node. This just provides a default parameter for {@link
+   * #getTargetType(Type, Initializer)}. If the parameter is null, then the undefined type is
+   * returned.
+   */
+  default String getTargetType(Type type) {
+    return getTargetType(type, null);
+  }
+
+  /** Return a string representing the specified type in the target language. */
+  default String getTargetType(InferredType type) {
+    if (type.isUndefined()) {
+      return getTargetUndefinedType();
+    } else if (type.isTime) {
+      if (type.isFixedSizeList) {
+        return getTargetFixedSizeListType(getTargetTimeType(), type.listSize);
+      } else if (type.isVariableSizeList) {
+        return getTargetVariableSizeListType(getTargetTimeType());
+      } else {
+        return getTargetTimeType();
+      }
+    } else if (type.isFixedSizeList) {
+      return getTargetFixedSizeListType(type.baseType(), type.listSize);
+    } else if (type.isVariableSizeList) {
+      return getTargetVariableSizeListType(type.baseType());
+    } else if (!type.astType.getTypeArgs().isEmpty()) {
+      List<String> args = type.astType.getTypeArgs().stream().map(this::getTargetType).toList();
+      return getGenericType(type.baseType(), args);
+    }
+    return type.toOriginalText();
+  }
+
+  /** Build a generic type. The type args list must not be empty. */
+  default String getGenericType(String base, List<String> args) {
+    assert !args.isEmpty() : "Empty type arguments for " + base;
+    return base + "<" + String.join(", ", args) + ">";
+  }
+
+  /** Return a string representing the type of the given parameter. */
+  default String getTargetType(Parameter p) {
+    return getTargetType(ASTUtils.getInferredType(p));
+  }
+
+  /** Return a string representing the type of the given state variable. */
+  default String getTargetType(StateVar s) {
+    return getTargetType(ASTUtils.getInferredType(s));
+  }
+
+  /** Return a string representing the type of the given action. */
+  default String getTargetType(Action a) {
+    return getTargetType(ASTUtils.getInferredType(a));
+  }
+
+  /** Return a string representing the type of the given port. */
+  default String getTargetType(Port p) {
+    return getTargetType(ASTUtils.getInferredType(p));
+  }
+
+  /**
+   * Returns the representation of the given initializer expression in target code. The given type,
+   * if non-null, may inform the code generation.
+   *
+   * @param init Initializer node (nullable)
+   * @param type Declared type of the expression (nullable)
+   */
+  default String getTargetInitializer(Initializer init, Type type) {
+    var inferredType = ASTUtils.getInferredType(type, init);
+    if (init == null) {
+      return getMissingExpr(inferredType);
+    }
+    var single = ASTUtils.asSingleExpr(init);
+    if (single != null) {
+      return getTargetExpr(single, inferredType);
+    }
+    var targetValues =
+        init.getExprs().stream()
+            .map(it -> getTargetExpr(it, inferredType))
+            .collect(Collectors.toList());
+    if (inferredType.isFixedSizeList) {
+      return getFixedSizeListInitExpression(targetValues, inferredType.listSize, init.isBraces());
+    } else {
+      return getVariableSizeListInitExpression(targetValues, init.isBraces());
+    }
+  }
+
+  /**
+   * Returns the representation of the given expression in target code. The given type, if non-null,
+   * may inform the code generation.
+   */
+  default String getTargetExpr(Expression expr, InferredType type) {
+    if (ASTUtils.isZero(expr) && type != null && type.isTime) {
+      return getTargetTimeExpr(TimeValue.ZERO);
+    } else if (expr instanceof ParameterReference) {
+      return getTargetParamRef((ParameterReference) expr, type);
+    } else if (expr instanceof Time) {
+      return getTargetTimeExpr((Time) expr);
+    } else if (expr instanceof Literal) {
+      return ASTUtils.addZeroToLeadingDot(((Literal) expr).getLiteral()); // here we don't escape
+    } else if (expr instanceof CodeExpr) {
+      return ASTUtils.toText(((CodeExpr) expr).getCode());
+    } else if (expr instanceof BracedListExpression) {
+      return getTargetBracedListExpr((BracedListExpression) expr, type);
+    } else {
+      throw new IllegalStateException("Invalid value " + expr);
+    }
+  }
+
+  /** Returns the representation of the given time value in target code. */
+  default String getTargetTimeExpr(Time t) {
+    return getTargetTimeExpr(ASTUtils.toTimeValue(t));
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/TimerInstance.java b/org.lflang/src/org/lflang/generator/TimerInstance.java
index 492398998c..b25552bb6c 100644
--- a/org.lflang/src/org/lflang/generator/TimerInstance.java
+++ b/org.lflang/src/org/lflang/generator/TimerInstance.java
@@ -1,28 +1,28 @@
 /** Instance of a timer. */
 
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
@@ -31,63 +31,58 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 
 /**
  * Instance of a timer.
- * 
+ *
  * @author Marten Lohstroh
  * @author Edward A. Lee
  */
 public class TimerInstance extends TriggerInstance<Timer> {
 
-    /** The global default for offset. */
-    public static final TimeValue DEFAULT_OFFSET = TimeValue.ZERO;
+  /** The global default for offset. */
+  public static final TimeValue DEFAULT_OFFSET = TimeValue.ZERO;
 
-    /** The global default for period. */
-    public static final TimeValue DEFAULT_PERIOD = TimeValue.ZERO;
+  /** The global default for period. */
+  public static final TimeValue DEFAULT_PERIOD = TimeValue.ZERO;
 
-    private TimeValue offset = DEFAULT_OFFSET;
+  private TimeValue offset = DEFAULT_OFFSET;
 
-    private TimeValue period = DEFAULT_PERIOD;
+  private TimeValue period = DEFAULT_PERIOD;
 
-    /**
-	 * Create a new timer instance.
-	 * If the definition is null, then this is a startup timer.
-	 * @param definition The AST definition, or null for startup.
-	 * @param parent The parent reactor.
-	 */
-    public TimerInstance(Timer definition, ReactorInstance parent) {
-		super(definition, parent);
-        if (parent == null) {
-            throw new InvalidSourceException("Cannot create an TimerInstance with no parent.");
+  /**
+   * Create a new timer instance. If the definition is null, then this is a startup timer.
+   *
+   * @param definition The AST definition, or null for startup.
+   * @param parent The parent reactor.
+   */
+  public TimerInstance(Timer definition, ReactorInstance parent) {
+    super(definition, parent);
+    if (parent == null) {
+      throw new InvalidSourceException("Cannot create an TimerInstance with no parent.");
+    }
+    if (definition != null) {
+      if (definition.getOffset() != null) {
+        try {
+          this.offset = parent.getTimeValue(definition.getOffset());
+        } catch (IllegalArgumentException ex) {
+          parent.reporter.reportError(definition.getOffset(), "Invalid time.");
         }
-        if (definition != null) {
-            if (definition.getOffset() != null) {
-                try {
-                    this.offset = parent.getTimeValue(definition.getOffset());
-                } catch (IllegalArgumentException ex) {
-                    parent.reporter.reportError(definition.getOffset(), "Invalid time.");
-                }
-            }
-            if (definition.getPeriod() != null) {
-                try {
-                    this.period = parent.getTimeValue(definition.getPeriod());
-                } catch (IllegalArgumentException ex) {
-                    parent.reporter.reportError(definition.getPeriod(), "Invalid time.");
-                }
-            }
+      }
+      if (definition.getPeriod() != null) {
+        try {
+          this.period = parent.getTimeValue(definition.getPeriod());
+        } catch (IllegalArgumentException ex) {
+          parent.reporter.reportError(definition.getPeriod(), "Invalid time.");
         }
+      }
     }
+  }
 
-    /**
-     * Get the value of the offset parameter.
-     */
-    public TimeValue getOffset() {
-        return offset;
-    }
-
-    /**
-     * Get the value of the offset parameter.
-     */
-    public TimeValue getPeriod() {
-        return period;
-    }
+  /** Get the value of the offset parameter. */
+  public TimeValue getOffset() {
+    return offset;
+  }
 
+  /** Get the value of the offset parameter. */
+  public TimeValue getPeriod() {
+    return period;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/TriggerInstance.java b/org.lflang/src/org/lflang/generator/TriggerInstance.java
index 47212ff0e8..b4ddc35a15 100644
--- a/org.lflang/src/org/lflang/generator/TriggerInstance.java
+++ b/org.lflang/src/org/lflang/generator/TriggerInstance.java
@@ -1,181 +1,170 @@
 /** Instance of a trigger (port, action, or timer). */
 
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
-
 import org.lflang.lf.BuiltinTrigger;
 import org.lflang.lf.BuiltinTriggerRef;
 import org.lflang.lf.TriggerRef;
 import org.lflang.lf.Variable;
 import org.lflang.lf.impl.VariableImpl;
 
-/** Instance of a trigger (port, action, or timer).
+/**
+ * Instance of a trigger (port, action, or timer).
  *
- *  @author Marten Lohstroh
- *  @author Edward A. Lee
- *  @author Alexander Schulz-Rosengarten
+ * @author Marten Lohstroh
+ * @author Edward A. Lee
+ * @author Alexander Schulz-Rosengarten
  */
 public class TriggerInstance<T extends Variable> extends NamedInstance<T> {
 
-    /** Construct a new instance with the specified definition
-     *  and parent. E.g., for a action instance, the definition
-     *  is Action, and for a port instance, it is Port. These are
-     *  nodes in the AST. This is protected because only subclasses
-     *  should be constructed.
-     *  @param definition The definition in the AST for this instance.
-     *  @param parent The reactor instance that creates this instance.
-     */
-    protected TriggerInstance(T definition, ReactorInstance parent) {
-        super(definition, parent);
-    }
-
-    /**
-     * Construct a new instance for a special builtin trigger.
-     *
-     * @param trigger The actual trigger definition.
-     * @param parent The reactor instance that creates this instance.
-     */
-    static TriggerInstance<BuiltinTriggerVariable> builtinTrigger(BuiltinTriggerRef trigger, ReactorInstance parent) {
-        return new TriggerInstance<>(new BuiltinTriggerVariable(trigger), parent);
-    }
-
-    /////////////////////////////////////////////
-    //// Public Methods
-
-    /**
-     * Return the reaction instances that are triggered or read by this trigger.
-     * If this port is an output, then the reaction instances
-     * belong to the parent of the port's parent. If the port
-     * is an input, then the reaction instances belong to the
-     * port's parent.
-     */
-    public Set<ReactionInstance> getDependentReactions() {
-        return dependentReactions;
+  /**
+   * Construct a new instance with the specified definition and parent. E.g., for a action instance,
+   * the definition is Action, and for a port instance, it is Port. These are nodes in the AST. This
+   * is protected because only subclasses should be constructed.
+   *
+   * @param definition The definition in the AST for this instance.
+   * @param parent The reactor instance that creates this instance.
+   */
+  protected TriggerInstance(T definition, ReactorInstance parent) {
+    super(definition, parent);
+  }
+
+  /**
+   * Construct a new instance for a special builtin trigger.
+   *
+   * @param trigger The actual trigger definition.
+   * @param parent The reactor instance that creates this instance.
+   */
+  static TriggerInstance<BuiltinTriggerVariable> builtinTrigger(
+      BuiltinTriggerRef trigger, ReactorInstance parent) {
+    return new TriggerInstance<>(new BuiltinTriggerVariable(trigger), parent);
+  }
+
+  /////////////////////////////////////////////
+  //// Public Methods
+
+  /**
+   * Return the reaction instances that are triggered or read by this trigger. If this port is an
+   * output, then the reaction instances belong to the parent of the port's parent. If the port is
+   * an input, then the reaction instances belong to the port's parent.
+   */
+  public Set<ReactionInstance> getDependentReactions() {
+    return dependentReactions;
+  }
+
+  /**
+   * Return the reaction instances that may send data via this port. If this port is an input, then
+   * the reaction instance belongs to parent of the port's parent. If it is an output, the reaction
+   * instance belongs to the port's parent.
+   */
+  public Set<ReactionInstance> getDependsOnReactions() {
+    return dependsOnReactions;
+  }
+
+  /**
+   * Return the name of this trigger.
+   *
+   * @return The name of this trigger.
+   */
+  @Override
+  public String getName() {
+    return definition.getName();
+  }
+
+  /** Return true if this trigger is "shutdown". */
+  public boolean isShutdown() {
+    return isBuiltInType(BuiltinTrigger.SHUTDOWN);
+  }
+
+  /** Return true if this trigger is "startup"./ */
+  public boolean isStartup() {
+    return isBuiltInType(BuiltinTrigger.STARTUP);
+  }
+
+  /** Return true if this trigger is "startup"./ */
+  public boolean isReset() {
+    return isBuiltInType(BuiltinTrigger.RESET);
+  }
+
+  /////////////////////////////////////////////
+  //// Private Methods
+
+  private boolean isBuiltInType(BuiltinTrigger type) {
+    return this.definition instanceof BuiltinTriggerVariable
+        && ((BuiltinTriggerRef) ((BuiltinTriggerVariable) this.definition).definition)
+            .getType()
+            .equals(type);
+  }
+
+  /////////////////////////////////////////////
+  //// Protected Fields
+
+  /**
+   * Reaction instances that are triggered or read by this trigger. If this port is an output, then
+   * the reaction instances belong to the parent of the port's parent. If the port is an input, then
+   * the reaction instances belong to the port's parent.
+   */
+  Set<ReactionInstance> dependentReactions = new LinkedHashSet<>();
+
+  /**
+   * Reaction instances that may send data via this port. If this port is an input, then the
+   * reaction instance belongs to parent of the port's parent. If it is an output, the reaction
+   * instance belongs to the port's parent.
+   */
+  Set<ReactionInstance> dependsOnReactions = new LinkedHashSet<>();
+
+  /////////////////////////////////////////////
+  //// Special class for builtin triggers
+
+  /** This class allows to have BuiltinTriggers represented by a Variable type. */
+  public static class BuiltinTriggerVariable extends VariableImpl {
+
+    /** The builtin trigger type represented by this variable. */
+    public final BuiltinTrigger type;
+
+    /** The actual TriggerRef definition in the AST. */
+    public final TriggerRef definition;
+
+    public BuiltinTriggerVariable(BuiltinTriggerRef trigger) {
+      this.type = trigger.getType();
+      this.definition = trigger;
     }
 
-    /**
-     * Return the reaction instances that may send data via this port.
-     * If this port is an input, then the reaction instance
-     * belongs to parent of the port's parent. If it is an output,
-     * the reaction instance belongs to the port's parent.
-     */
-    public Set<ReactionInstance> getDependsOnReactions() {
-        return dependsOnReactions;
-    }
-
-    /**
-     * Return the name of this trigger.
-     * @return The name of this trigger.
-     */
     @Override
     public String getName() {
-        return definition.getName();
-    }
-
-    /**
-     * Return true if this trigger is "shutdown".
-     */
-    public boolean isShutdown() {
-        return isBuiltInType(BuiltinTrigger.SHUTDOWN);
-    }
-
-    /**
-     * Return true if this trigger is "startup"./
-     */
-    public boolean isStartup() {
-        return isBuiltInType(BuiltinTrigger.STARTUP);
+      return this.type.name().toLowerCase();
     }
 
-    /**
-     * Return true if this trigger is "startup"./
-     */
-    public boolean isReset() {
-        return isBuiltInType(BuiltinTrigger.RESET);
-    }
-
-    /////////////////////////////////////////////
-    //// Private Methods
-
-    private boolean isBuiltInType(BuiltinTrigger type) {
-        return this.definition instanceof BuiltinTriggerVariable
-            && ((BuiltinTriggerRef) ((BuiltinTriggerVariable) this.definition).definition).getType().equals(type);
-    }
-
-    /////////////////////////////////////////////
-    //// Protected Fields
-
-
-    /**
-     * Reaction instances that are triggered or read by this trigger.
-     * If this port is an output, then the reaction instances
-     * belong to the parent of the port's parent. If the port
-     * is an input, then the reaction instances belong to the
-     * port's parent.
-     */
-    Set<ReactionInstance> dependentReactions = new LinkedHashSet<>();
-
-    /**
-     * Reaction instances that may send data via this port.
-     * If this port is an input, then the reaction instance
-     * belongs to parent of the port's parent. If it is an output,
-     * the reaction instance belongs to the port's parent.
-     */
-    Set<ReactionInstance> dependsOnReactions = new LinkedHashSet<>();
-
-    /////////////////////////////////////////////
-    //// Special class for builtin triggers
-
-    /**
-     * This class allows to have BuiltinTriggers represented by a Variable type.
-     */
-    static public class BuiltinTriggerVariable extends VariableImpl {
-
-        /** The builtin trigger type represented by this variable. */
-        public final BuiltinTrigger type;
-
-        /** The actual TriggerRef definition in the AST. */
-        public final TriggerRef definition;
-
-        public BuiltinTriggerVariable(BuiltinTriggerRef trigger) {
-            this.type = trigger.getType();
-            this.definition = trigger;
-        }
-
-        @Override
-        public String getName() {
-            return this.type.name().toLowerCase();
-        }
-
-        @Override
-        public void setName(String newName) {
-            throw new UnsupportedOperationException(
-                    this.getClass().getName() + " has an immutable name.");
-        }
+    @Override
+    public void setName(String newName) {
+      throw new UnsupportedOperationException(
+          this.getClass().getName() + " has an immutable name.");
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/UnsupportedGeneratorFeatureException.java b/org.lflang/src/org/lflang/generator/UnsupportedGeneratorFeatureException.java
index 59fe20386c..c1519a161a 100644
--- a/org.lflang/src/org/lflang/generator/UnsupportedGeneratorFeatureException.java
+++ b/org.lflang/src/org/lflang/generator/UnsupportedGeneratorFeatureException.java
@@ -26,17 +26,14 @@
 
 import org.eclipse.emf.ecore.EObject;
 
-/**
- * Signals that the code generator does not support a particular
- * feature of the source language.
- */
+/** Signals that the code generator does not support a particular feature of the source language. */
 public class UnsupportedGeneratorFeatureException extends GenerationException {
 
-    public UnsupportedGeneratorFeatureException(String feature) {
-        super("Unsupported generator feature: " + feature);
-    }
+  public UnsupportedGeneratorFeatureException(String feature) {
+    super("Unsupported generator feature: " + feature);
+  }
 
-    public UnsupportedGeneratorFeatureException(EObject location, String feature) {
-        super(location, "Unsupported generator feature: " + feature);
-    }
+  public UnsupportedGeneratorFeatureException(EObject location, String feature) {
+    super(location, "Unsupported generator feature: " + feature);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/ValidationStrategy.java b/org.lflang/src/org/lflang/generator/ValidationStrategy.java
index 7adff29527..674634ef7f 100644
--- a/org.lflang/src/org/lflang/generator/ValidationStrategy.java
+++ b/org.lflang/src/org/lflang/generator/ValidationStrategy.java
@@ -1,7 +1,6 @@
 package org.lflang.generator;
 
 import java.nio.file.Path;
-
 import org.lflang.util.LFCommand;
 
 /**
@@ -11,36 +10,38 @@
  */
 public interface ValidationStrategy {
 
-    /**
-     * Return the command that produces validation output in association
-     * with {@code generatedFile}, or {@code null} if this strategy has no
-     * command that will successfully produce validation output.
-     */
-    LFCommand getCommand(Path generatedFile);
-
-    /**
-     * Return a strategy for parsing the stderr of the validation command.
-     * @return A strategy for parsing the stderr of the validation command.
-     */
-    DiagnosticReporting.Strategy getErrorReportingStrategy();
-
-    /**
-     * Return a strategy for parsing the stdout of the validation command.
-     * @return A strategy for parsing the stdout of the validation command.
-     */
-    DiagnosticReporting.Strategy getOutputReportingStrategy();
-
-    /**
-     * Return whether this strategy validates all generated files, as
-     * opposed to just the given one.
-     * @return whether this strategy validates all generated files
-     */
-    boolean isFullBatch();
-
-    /**
-     * Return the priority of this. Strategies with higher
-     * priorities are more likely to be used.
-     * @return The priority of this.
-     */
-    int getPriority();
+  /**
+   * Return the command that produces validation output in association with {@code generatedFile},
+   * or {@code null} if this strategy has no command that will successfully produce validation
+   * output.
+   */
+  LFCommand getCommand(Path generatedFile);
+
+  /**
+   * Return a strategy for parsing the stderr of the validation command.
+   *
+   * @return A strategy for parsing the stderr of the validation command.
+   */
+  DiagnosticReporting.Strategy getErrorReportingStrategy();
+
+  /**
+   * Return a strategy for parsing the stdout of the validation command.
+   *
+   * @return A strategy for parsing the stdout of the validation command.
+   */
+  DiagnosticReporting.Strategy getOutputReportingStrategy();
+
+  /**
+   * Return whether this strategy validates all generated files, as opposed to just the given one.
+   *
+   * @return whether this strategy validates all generated files
+   */
+  boolean isFullBatch();
+
+  /**
+   * Return the priority of this. Strategies with higher priorities are more likely to be used.
+   *
+   * @return The priority of this.
+   */
+  int getPriority();
 }
diff --git a/org.lflang/src/org/lflang/generator/Validator.java b/org.lflang/src/org/lflang/generator/Validator.java
index 7a9b85c453..f9ae61f854 100644
--- a/org.lflang/src/org/lflang/generator/Validator.java
+++ b/org.lflang/src/org/lflang/generator/Validator.java
@@ -1,9 +1,6 @@
 package org.lflang.generator;
 
-import org.eclipse.xtext.util.CancelIndicator;
-
-import org.lflang.ErrorReporter;
-import org.lflang.util.LFCommand;
+import com.google.common.collect.ImmutableMap;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -17,8 +14,9 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
-
-import com.google.common.collect.ImmutableMap;
+import org.eclipse.xtext.util.CancelIndicator;
+import org.lflang.ErrorReporter;
+import org.lflang.util.LFCommand;
 
 /**
  * Validate generated code.
@@ -27,159 +25,180 @@
  */
 public abstract class Validator {
 
-    /**
-     * Files older than {@code FILE_AGE_THRESHOLD_MILLIS} may be skipped in validation on the
-     * grounds that they probably have not been updated since the last validator pass.
-     */
-    // This will cause silent validation failures if it takes too long to write all generated code to the file system.
-    private static final long FILE_AGE_THRESHOLD_MILLIS = 10000;
-
-    protected static class Pair<S, T> {
-        public final S first;
-        public final T second;
-        public Pair(S first, T second) {
-            this.first = first;
-            this.second = second;
-        }
-    }
-
-    protected final ErrorReporter errorReporter;
-    protected final ImmutableMap<Path, CodeMap> codeMaps;
-
-    /**
-     * Initialize a {@code Validator} that reports errors to {@code errorReporter} and adjusts
-     * document positions using {@code codeMaps}.
-     */
-    protected Validator(ErrorReporter errorReporter, Map<Path, CodeMap> codeMaps) {
-        this.errorReporter = errorReporter;
-        this.codeMaps = ImmutableMap.copyOf(codeMaps);
+  /**
+   * Files older than {@code FILE_AGE_THRESHOLD_MILLIS} may be skipped in validation on the grounds
+   * that they probably have not been updated since the last validator pass.
+   */
+  // This will cause silent validation failures if it takes too long to write all generated code to
+  // the file system.
+  private static final long FILE_AGE_THRESHOLD_MILLIS = 10000;
+
+  protected static class Pair<S, T> {
+    public final S first;
+    public final T second;
+
+    public Pair(S first, T second) {
+      this.first = first;
+      this.second = second;
     }
-
-    /**
-     * Validate this Validator's group of generated files.
-     * @param context The context of the current build.
-     */
-    public final void doValidate(LFGeneratorContext context) throws ExecutionException, InterruptedException {
-        if (!validationEnabled(context)) return;
-        final List<Callable<Pair<ValidationStrategy, LFCommand>>> tasks = getValidationStrategies().stream().map(
-            it -> (Callable<Pair<ValidationStrategy, LFCommand>>) () -> {
-                it.second.run(context.getCancelIndicator());
-                return it;
-            }
-        ).collect(Collectors.toList());
-        for (Future<Pair<ValidationStrategy, LFCommand>> f : getFutures(tasks)) {
-            f.get().first.getErrorReportingStrategy().report(f.get().second.getErrors().toString(), errorReporter, codeMaps);
-            f.get().first.getOutputReportingStrategy().report(f.get().second.getOutput().toString(), errorReporter, codeMaps);
-        }
-    }
-
-    /**
-     * Return whether generated code validation is enabled for this build.
-     * @param context The context of the current build.
-     */
-    private boolean validationEnabled(LFGeneratorContext context) {
-        return context.getArgs().containsKey("lint") || validationEnabledByDefault(context);
+  }
+
+  protected final ErrorReporter errorReporter;
+  protected final ImmutableMap<Path, CodeMap> codeMaps;
+
+  /**
+   * Initialize a {@code Validator} that reports errors to {@code errorReporter} and adjusts
+   * document positions using {@code codeMaps}.
+   */
+  protected Validator(ErrorReporter errorReporter, Map<Path, CodeMap> codeMaps) {
+    this.errorReporter = errorReporter;
+    this.codeMaps = ImmutableMap.copyOf(codeMaps);
+  }
+
+  /**
+   * Validate this Validator's group of generated files.
+   *
+   * @param context The context of the current build.
+   */
+  public final void doValidate(LFGeneratorContext context)
+      throws ExecutionException, InterruptedException {
+    if (!validationEnabled(context)) return;
+    final List<Callable<Pair<ValidationStrategy, LFCommand>>> tasks =
+        getValidationStrategies().stream()
+            .map(
+                it ->
+                    (Callable<Pair<ValidationStrategy, LFCommand>>)
+                        () -> {
+                          it.second.run(context.getCancelIndicator());
+                          return it;
+                        })
+            .collect(Collectors.toList());
+    for (Future<Pair<ValidationStrategy, LFCommand>> f : getFutures(tasks)) {
+      f.get()
+          .first
+          .getErrorReportingStrategy()
+          .report(f.get().second.getErrors().toString(), errorReporter, codeMaps);
+      f.get()
+          .first
+          .getOutputReportingStrategy()
+          .report(f.get().second.getOutput().toString(), errorReporter, codeMaps);
     }
-
-    /**
-     * Return whether validation of generated code is enabled by default.
-     * @param context The context of the current build.
-     * @return Whether validation of generated code is enabled by default.
-     */
-    protected boolean validationEnabledByDefault(LFGeneratorContext context) {
-        return context.getMode() != LFGeneratorContext.Mode.STANDALONE;
-    }
-
-    /**
-     * Invoke all the given tasks.
-     * @param tasks Any set of tasks.
-     * @param <T> The return type of the tasks.
-     * @return Futures corresponding to each task, or an empty list upon failure.
-     * @throws InterruptedException If interrupted while waiting.
-     */
-    private static <T> List<Future<T>> getFutures(List<Callable<T>> tasks) throws InterruptedException {
-        List<Future<T>> futures = List.of();
-        switch (tasks.size()) {
-        case 0:
-            break;
-        case 1:
-            try {
-                futures = List.of(CompletableFuture.completedFuture(tasks.get(0).call()));
-            } catch (Exception e) {
-                System.err.println(e.getMessage());  // This should never happen
-            }
-            break;
-        default:
-            ExecutorService service = Executors.newFixedThreadPool(
-                Math.min(Runtime.getRuntime().availableProcessors(), tasks.size())
-            );
-            futures = service.invokeAll(tasks);
-            service.shutdown();
+  }
+
+  /**
+   * Return whether generated code validation is enabled for this build.
+   *
+   * @param context The context of the current build.
+   */
+  private boolean validationEnabled(LFGeneratorContext context) {
+    return context.getArgs().containsKey("lint") || validationEnabledByDefault(context);
+  }
+
+  /**
+   * Return whether validation of generated code is enabled by default.
+   *
+   * @param context The context of the current build.
+   * @return Whether validation of generated code is enabled by default.
+   */
+  protected boolean validationEnabledByDefault(LFGeneratorContext context) {
+    return context.getMode() != LFGeneratorContext.Mode.STANDALONE;
+  }
+
+  /**
+   * Invoke all the given tasks.
+   *
+   * @param tasks Any set of tasks.
+   * @param <T> The return type of the tasks.
+   * @return Futures corresponding to each task, or an empty list upon failure.
+   * @throws InterruptedException If interrupted while waiting.
+   */
+  private static <T> List<Future<T>> getFutures(List<Callable<T>> tasks)
+      throws InterruptedException {
+    List<Future<T>> futures = List.of();
+    switch (tasks.size()) {
+      case 0:
+        break;
+      case 1:
+        try {
+          futures = List.of(CompletableFuture.completedFuture(tasks.get(0).call()));
+        } catch (Exception e) {
+          System.err.println(e.getMessage()); // This should never happen
         }
-        return futures;
+        break;
+      default:
+        ExecutorService service =
+            Executors.newFixedThreadPool(
+                Math.min(Runtime.getRuntime().availableProcessors(), tasks.size()));
+        futures = service.invokeAll(tasks);
+        service.shutdown();
     }
-
-    /**
-     * Run the given command, report any messages produced using the reporting strategies
-     * given by {@code getBuildReportingStrategies}, and return its return code.
-     */
-    public final int run(LFCommand command, CancelIndicator cancelIndicator) {
-        final int returnCode = command.run(cancelIndicator);
-        getBuildReportingStrategies().first.report(command.getErrors().toString(), errorReporter, codeMaps);
-        getBuildReportingStrategies().second.report(command.getOutput().toString(), errorReporter, codeMaps);
-        return returnCode;
+    return futures;
+  }
+
+  /**
+   * Run the given command, report any messages produced using the reporting strategies given by
+   * {@code getBuildReportingStrategies}, and return its return code.
+   */
+  public final int run(LFCommand command, CancelIndicator cancelIndicator) {
+    final int returnCode = command.run(cancelIndicator);
+    getBuildReportingStrategies()
+        .first
+        .report(command.getErrors().toString(), errorReporter, codeMaps);
+    getBuildReportingStrategies()
+        .second
+        .report(command.getOutput().toString(), errorReporter, codeMaps);
+    return returnCode;
+  }
+
+  /**
+   * Return the validation strategies and validation commands corresponding to each generated file.
+   *
+   * @return the validation strategies and validation commands corresponding to each generated file
+   */
+  private List<Pair<ValidationStrategy, LFCommand>> getValidationStrategies() {
+    final List<Pair<ValidationStrategy, LFCommand>> commands = new ArrayList<>();
+    long mostRecentDateModified =
+        codeMaps.keySet().stream().map(it -> it.toFile().lastModified()).reduce(0L, Math::max);
+    for (Path generatedFile : codeMaps.keySet()) {
+      if (generatedFile.toFile().lastModified()
+          > mostRecentDateModified - FILE_AGE_THRESHOLD_MILLIS) {
+        final Pair<ValidationStrategy, LFCommand> p = getValidationStrategy(generatedFile);
+        if (p.first == null || p.second == null) continue;
+        commands.add(p);
+        if (p.first.isFullBatch()) break;
+      }
     }
-
-    /**
-     * Return the validation strategies and validation
-     * commands corresponding to each generated file.
-     * @return the validation strategies and validation
-     * commands corresponding to each generated file
-     */
-    private List<Pair<ValidationStrategy, LFCommand>> getValidationStrategies() {
-        final List<Pair<ValidationStrategy, LFCommand>> commands = new ArrayList<>();
-        long mostRecentDateModified = codeMaps.keySet().stream()
-            .map(it -> it.toFile().lastModified()).reduce(0L, Math::max);
-        for (Path generatedFile : codeMaps.keySet()) {
-            if (generatedFile.toFile().lastModified() > mostRecentDateModified - FILE_AGE_THRESHOLD_MILLIS) {
-                final Pair<ValidationStrategy, LFCommand> p = getValidationStrategy(generatedFile);
-                if (p.first == null || p.second == null) continue;
-                commands.add(p);
-                if (p.first.isFullBatch()) break;
-            }
-        }
-        return commands;
+    return commands;
+  }
+
+  /**
+   * Return the validation strategy and command corresponding to the given file if such a strategy
+   * and command are available.
+   *
+   * @return the validation strategy and command corresponding to the given file if such a strategy
+   *     and command are available
+   */
+  private Pair<ValidationStrategy, LFCommand> getValidationStrategy(Path generatedFile) {
+    List<ValidationStrategy> sorted =
+        getPossibleStrategies().stream()
+            .sorted(Comparator.comparingInt(vs -> -vs.getPriority()))
+            .toList();
+    for (ValidationStrategy strategy : sorted) {
+      LFCommand validateCommand = strategy.getCommand(generatedFile);
+      if (validateCommand != null) {
+        return new Pair<>(strategy, validateCommand);
+      }
     }
-
-    /**
-     * Return the validation strategy and command
-     * corresponding to the given file if such a strategy
-     * and command are available.
-     * @return the validation strategy and command
-     * corresponding to the given file if such a strategy
-     * and command are available
-     */
-    private Pair<ValidationStrategy, LFCommand> getValidationStrategy(Path generatedFile) {
-        List<ValidationStrategy> sorted = getPossibleStrategies().stream()
-            .sorted(Comparator.comparingInt(vs -> -vs.getPriority())).toList();
-        for (ValidationStrategy strategy : sorted) {
-            LFCommand validateCommand = strategy.getCommand(generatedFile);
-            if (validateCommand != null) {
-                return new Pair<>(strategy, validateCommand);
-            }
-        }
-        return new Pair<>(null, null);
-    }
-
-    /**
-     * List all validation strategies that exist for the implementor
-     * without filtering by platform or availability.
-     */
-    protected abstract Collection<ValidationStrategy> getPossibleStrategies();
-
-    /**
-     * Return the appropriate output and error reporting
-     * strategies for the main build process.
-     */
-    protected abstract Pair<DiagnosticReporting.Strategy, DiagnosticReporting.Strategy> getBuildReportingStrategies();
+    return new Pair<>(null, null);
+  }
+
+  /**
+   * List all validation strategies that exist for the implementor without filtering by platform or
+   * availability.
+   */
+  protected abstract Collection<ValidationStrategy> getPossibleStrategies();
+
+  /** Return the appropriate output and error reporting strategies for the main build process. */
+  protected abstract Pair<DiagnosticReporting.Strategy, DiagnosticReporting.Strategy>
+      getBuildReportingStrategies();
 }
diff --git a/org.lflang/src/org/lflang/generator/WatchdogInstance.java b/org.lflang/src/org/lflang/generator/WatchdogInstance.java
index 90823102d6..ac51f389cb 100644
--- a/org.lflang/src/org/lflang/generator/WatchdogInstance.java
+++ b/org.lflang/src/org/lflang/generator/WatchdogInstance.java
@@ -2,8 +2,8 @@
  * @file
  * @author Benjamin Asch
  * @author Edward A. Lee
- * @copyright (c) 2023, The University of California at Berkeley
- * License in <a href="https://github.com/lf-lang/lingua-franca/blob/master/LICENSE">BSD 2-clause</a>
+ * @copyright (c) 2023, The University of California at Berkeley License in <a
+ *     href="https://github.com/lf-lang/lingua-franca/blob/master/LICENSE">BSD 2-clause</a>
  * @brief Instance of a watchdog
  */
 package org.lflang.generator;
diff --git a/org.lflang/src/org/lflang/generator/c/CActionGenerator.java b/org.lflang/src/org/lflang/generator/c/CActionGenerator.java
index 5f81de89aa..1a99c1b3e2 100644
--- a/org.lflang/src/org/lflang/generator/c/CActionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CActionGenerator.java
@@ -1,15 +1,16 @@
 package org.lflang.generator.c;
 
-import java.util.List;
+import static org.lflang.generator.c.CGenerator.variableStructType;
+
 import java.util.ArrayList;
-import org.lflang.ast.ASTUtils;
+import java.util.List;
 import org.lflang.Target;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Action;
 
-import static org.lflang.generator.c.CGenerator.variableStructType;
 /**
  * Generates code for actions (logical or physical) for the C and CCpp target.
  *
@@ -23,153 +24,156 @@
  * @author Hou Seng Wong
  */
 public class CActionGenerator {
-    /**
-     * For each action of the specified reactor instance, generate initialization code
-     * for the offset and period fields.
-     * @param instance The reactor.
-     */
-    public static String generateInitializers(
-        ReactorInstance instance
-    ) {
-        List<String> code = new ArrayList<>();
-        for (ActionInstance action : instance.actions) {
-            if (!action.isShutdown()) {
-                var triggerStructName = CUtil.reactorRef(action.getParent()) + "->_lf__" + action.getName();
-                var minDelay = action.getMinDelay();
-                var minSpacing = action.getMinSpacing();
-                var offsetInitializer = triggerStructName+".offset = " + CTypes.getInstance().getTargetTimeExpr(minDelay)
-                    + ";";
-                var periodInitializer = triggerStructName+".period = " + (minSpacing != null ?
-                    CTypes.getInstance().getTargetTimeExpr(minSpacing) :
-                                                                         CGenerator.UNDEFINED_MIN_SPACING) + ";";
-                code.addAll(List.of(
-                    "// Initializing action "+action.getFullName(),
-                    offsetInitializer,
-                    periodInitializer
-                ));
+  /**
+   * For each action of the specified reactor instance, generate initialization code for the offset
+   * and period fields.
+   *
+   * @param instance The reactor.
+   */
+  public static String generateInitializers(ReactorInstance instance) {
+    List<String> code = new ArrayList<>();
+    for (ActionInstance action : instance.actions) {
+      if (!action.isShutdown()) {
+        var triggerStructName = CUtil.reactorRef(action.getParent()) + "->_lf__" + action.getName();
+        var minDelay = action.getMinDelay();
+        var minSpacing = action.getMinSpacing();
+        var offsetInitializer =
+            triggerStructName
+                + ".offset = "
+                + CTypes.getInstance().getTargetTimeExpr(minDelay)
+                + ";";
+        var periodInitializer =
+            triggerStructName
+                + ".period = "
+                + (minSpacing != null
+                    ? CTypes.getInstance().getTargetTimeExpr(minSpacing)
+                    : CGenerator.UNDEFINED_MIN_SPACING)
+                + ";";
+        code.addAll(
+            List.of(
+                "// Initializing action " + action.getFullName(),
+                offsetInitializer,
+                periodInitializer));
 
-                var mode = action.getMode(false);
-                if (mode != null) {
-                    var modeParent = mode.getParent();
-                    var modeRef = "&"+CUtil.reactorRef(modeParent)+"->_lf__modes["+modeParent.modes.indexOf(mode)+"];";
-                    code.add(triggerStructName+".mode = "+modeRef+";");
-                } else {
-                    code.add(triggerStructName+".mode = NULL;");
-                }
-            }
+        var mode = action.getMode(false);
+        if (mode != null) {
+          var modeParent = mode.getParent();
+          var modeRef =
+              "&"
+                  + CUtil.reactorRef(modeParent)
+                  + "->_lf__modes["
+                  + modeParent.modes.indexOf(mode)
+                  + "];";
+          code.add(triggerStructName + ".mode = " + modeRef + ";");
+        } else {
+          code.add(triggerStructName + ".mode = NULL;");
         }
-        return String.join("\n", code);
+      }
     }
+    return String.join("\n", code);
+  }
 
-    /**
-     * Create a template token initialized to the payload size.
-     * This token is marked to not be freed so that the trigger_t struct
-     * always has a template token.
-     * At the start of each time step, we need to initialize the is_present field
-     * of each action's trigger object to false and free a previously
-     * allocated token if appropriate. This code sets up the table that does that.
-     *
-     * @param selfStruct The variable name of the self struct
-     * @param actionName The action name
-     * @param payloadSize The code that returns the size of the action's payload in C.
-     */
-    public static String generateTokenInitializer(
-        String selfStruct,
-        String actionName,
-        String payloadSize
-    ) {
-        return String.join("\n",
-                "_lf_initialize_template((token_template_t*)",
-                "        &("+selfStruct+"->_lf__"+actionName+"),",
-                         payloadSize+");",
-            selfStruct+"->_lf__"+actionName+".status = absent;"
-        );
-    }
+  /**
+   * Create a template token initialized to the payload size. This token is marked to not be freed
+   * so that the trigger_t struct always has a template token. At the start of each time step, we
+   * need to initialize the is_present field of each action's trigger object to false and free a
+   * previously allocated token if appropriate. This code sets up the table that does that.
+   *
+   * @param selfStruct The variable name of the self struct
+   * @param actionName The action name
+   * @param payloadSize The code that returns the size of the action's payload in C.
+   */
+  public static String generateTokenInitializer(
+      String selfStruct, String actionName, String payloadSize) {
+    return String.join(
+        "\n",
+        "_lf_initialize_template((token_template_t*)",
+        "        &(" + selfStruct + "->_lf__" + actionName + "),",
+        payloadSize + ");",
+        selfStruct + "->_lf__" + actionName + ".status = absent;");
+  }
 
-    /**
-     * Generate the declarations of actions in the self struct
-     *
-     * @param body The content of the self struct
-     * @param constructorCode The constructor code of the reactor
-     */
-    public static void generateDeclarations(
-        TypeParameterizedReactor tpr,
-        CodeBuilder body,
-        CodeBuilder constructorCode
-    ) {
-        for (Action action : ASTUtils.allActions(tpr.reactor())) {
-            var actionName = action.getName();
-            body.pr(action, CGenerator.variableStructType(action, tpr, false)+" _lf_"+actionName+";");
-            // Initialize the trigger pointer in the action.
-            constructorCode.pr(action, "self->_lf_"+actionName+".trigger = &self->_lf__"+actionName+";");
-        }
+  /**
+   * Generate the declarations of actions in the self struct
+   *
+   * @param body The content of the self struct
+   * @param constructorCode The constructor code of the reactor
+   */
+  public static void generateDeclarations(
+      TypeParameterizedReactor tpr, CodeBuilder body, CodeBuilder constructorCode) {
+    for (Action action : ASTUtils.allActions(tpr.reactor())) {
+      var actionName = action.getName();
+      body.pr(
+          action, CGenerator.variableStructType(action, tpr, false) + " _lf_" + actionName + ";");
+      // Initialize the trigger pointer in the action.
+      constructorCode.pr(
+          action, "self->_lf_" + actionName + ".trigger = &self->_lf__" + actionName + ";");
     }
+  }
 
-    /**
-     * Generate the struct type definitions for the action of the
-     * reactor
-     *
-     * @param action The action to generate the struct for
-     * @param target The target of the code generation (C, CCpp or Python)
-     * @param types The helper object for types related stuff
-     * @param federatedExtension The code needed to support federated execution
-     * @return The auxiliary struct for the port as a string
-     */
-    public static String generateAuxiliaryStruct(
-        TypeParameterizedReactor tpr,
-        Action action,
-        Target target,
-        CTypes types,
-        CodeBuilder federatedExtension,
-        boolean userFacing
-    ) {
-        var code = new CodeBuilder();
-        code.pr("typedef struct {");
-        code.indent();
-        // NOTE: The following fields are required to be the first ones so that
-        // pointer to this struct can be cast to a (lf_action_base_t*) or to
-        // (token_template_t*) to access these fields for any port.
-        // IMPORTANT: These must match exactly the fields defined in port.h!!
-        code.pr(String.join("\n",
-                "token_type_t type;",  // From token_template_t
-                "lf_token_t* token;",  // From token_template_t
-                "size_t length;",      // From token_template_t
-                "bool is_present;",    // From lf_action_base_t
-                "bool has_value;",     // From lf_action_base_t
-                "trigger_t* trigger;"  // From lf_action_base_t
-        ));
-        code.pr(valueDeclaration(tpr, action, target, types));
-        code.pr(federatedExtension.toString());
-        code.unindent();
-        code.pr("} " + variableStructType(action, tpr, userFacing) + ";");
-        return code.toString();
-    }
+  /**
+   * Generate the struct type definitions for the action of the reactor
+   *
+   * @param action The action to generate the struct for
+   * @param target The target of the code generation (C, CCpp or Python)
+   * @param types The helper object for types related stuff
+   * @param federatedExtension The code needed to support federated execution
+   * @return The auxiliary struct for the port as a string
+   */
+  public static String generateAuxiliaryStruct(
+      TypeParameterizedReactor tpr,
+      Action action,
+      Target target,
+      CTypes types,
+      CodeBuilder federatedExtension,
+      boolean userFacing) {
+    var code = new CodeBuilder();
+    code.pr("typedef struct {");
+    code.indent();
+    // NOTE: The following fields are required to be the first ones so that
+    // pointer to this struct can be cast to a (lf_action_base_t*) or to
+    // (token_template_t*) to access these fields for any port.
+    // IMPORTANT: These must match exactly the fields defined in port.h!!
+    code.pr(
+        String.join(
+            "\n",
+            "token_type_t type;", // From token_template_t
+            "lf_token_t* token;", // From token_template_t
+            "size_t length;", // From token_template_t
+            "bool is_present;", // From lf_action_base_t
+            "bool has_value;", // From lf_action_base_t
+            "trigger_t* trigger;" // From lf_action_base_t
+            ));
+    code.pr(valueDeclaration(tpr, action, target, types));
+    code.pr(federatedExtension.toString());
+    code.unindent();
+    code.pr("} " + variableStructType(action, tpr, userFacing) + ";");
+    return code.toString();
+  }
 
-    /**
-     * For the specified action, return a declaration for action struct to
-     * contain the value of the action. An action of
-     * type int[10], for example, will result in this:
-     * <pre><code>
-     *     int* value;
-     * </code></pre>
-     * This will return an empty string for an action with no type.
-     * @param tpr {@link TypeParameterizedReactor}
-     * @param action The action.
-     * @return A string providing the value field of the action struct.
-     */
-    private static String valueDeclaration(
-        TypeParameterizedReactor tpr,
-        Action action,
-        Target target,
-        CTypes types
-    ) {
-        if (target == Target.Python) {
-            return "PyObject* value;";
-        }
-        // Do not convert to lf_token_t* using lfTypeToTokenType because there
-        // will be a separate field pointing to the token.
-        return action.getType() == null && target.requiresTypes ?
-               "" :
-               types.getTargetType(tpr.resolveType(action.getType())) + " value;";
+  /**
+   * For the specified action, return a declaration for action struct to contain the value of the
+   * action. An action of type int[10], for example, will result in this:
+   *
+   * <pre><code>
+   *     int* value;
+   * </code></pre>
+   *
+   * This will return an empty string for an action with no type.
+   *
+   * @param tpr {@link TypeParameterizedReactor}
+   * @param action The action.
+   * @return A string providing the value field of the action struct.
+   */
+  private static String valueDeclaration(
+      TypeParameterizedReactor tpr, Action action, Target target, CTypes types) {
+    if (target == Target.Python) {
+      return "PyObject* value;";
     }
+    // Do not convert to lf_token_t* using lfTypeToTokenType because there
+    // will be a separate field pointing to the token.
+    return action.getType() == null && target.requiresTypes
+        ? ""
+        : types.getTargetType(tpr.resolveType(action.getType())) + " value;";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java
index fdbe4d396b..860c85a75d 100644
--- a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java
@@ -1,16 +1,16 @@
 /*************
  * Copyright (c) 2019-2021, The University of California at Berkeley.
-
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
-
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
-
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
-
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -31,7 +31,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
@@ -42,358 +41,364 @@
 /**
  * A helper class that generates a CMakefile that can be used to compile the generated C code.
  *
- * Adapted from @see org.lflang.generator.CppCmakeGenerator.kt
+ * <p>Adapted from @see org.lflang.generator.CppCmakeGenerator.kt
  *
  * @author Soroush Bateni
  * @author Peter Donovan
  */
 public class CCmakeGenerator {
-    private static final String DEFAULT_INSTALL_CODE = """
+  private static final String DEFAULT_INSTALL_CODE =
+      """
         install(
             TARGETS ${LF_MAIN_TARGET}
             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
         )
     """;
 
-    public static final String MIN_CMAKE_VERSION = "3.19";
-
-    private final FileConfig fileConfig;
-    private final List<String> additionalSources;
-    private final SetUpMainTarget setUpMainTarget;
-    private final String installCode;
-
-    public CCmakeGenerator(
-        FileConfig fileConfig,
-        List<String> additionalSources
-    ) {
-        this.fileConfig = fileConfig;
-        this.additionalSources = additionalSources;
-        this.setUpMainTarget = CCmakeGenerator::setUpMainTarget;
-        this.installCode = DEFAULT_INSTALL_CODE;
+  public static final String MIN_CMAKE_VERSION = "3.19";
+
+  private final FileConfig fileConfig;
+  private final List<String> additionalSources;
+  private final SetUpMainTarget setUpMainTarget;
+  private final String installCode;
+
+  public CCmakeGenerator(FileConfig fileConfig, List<String> additionalSources) {
+    this.fileConfig = fileConfig;
+    this.additionalSources = additionalSources;
+    this.setUpMainTarget = CCmakeGenerator::setUpMainTarget;
+    this.installCode = DEFAULT_INSTALL_CODE;
+  }
+
+  public CCmakeGenerator(
+      FileConfig fileConfig,
+      List<String> additionalSources,
+      SetUpMainTarget setUpMainTarget,
+      String installCode) {
+    this.fileConfig = fileConfig;
+    this.additionalSources = additionalSources;
+    this.setUpMainTarget = setUpMainTarget;
+    this.installCode = installCode;
+  }
+
+  /**
+   * Generate the contents of a CMakeLists.txt that builds the provided LF C 'sources'. Any error
+   * will be reported in the 'errorReporter'.
+   *
+   * @param sources A list of .c files to build.
+   * @param executableName The name of the output executable.
+   * @param errorReporter Used to report errors.
+   * @param CppMode Indicate if the compilation should happen in C++ mode
+   * @param hasMain Indicate if the .lf file has a main reactor or not. If not, a library target
+   *     will be created instead of an executable.
+   * @param cMakeExtras CMake-specific code that should be appended to the CMakeLists.txt.
+   * @param targetConfig The TargetConfig instance to use.
+   * @return The content of the CMakeLists.txt.
+   */
+  CodeBuilder generateCMakeCode(
+      List<String> sources,
+      String executableName,
+      ErrorReporter errorReporter,
+      boolean CppMode,
+      boolean hasMain,
+      String cMakeExtras,
+      TargetConfig targetConfig) {
+    CodeBuilder cMakeCode = new CodeBuilder();
+
+    List<String> additionalSources = new ArrayList<>();
+    for (String file : targetConfig.compileAdditionalSources) {
+      var relativePath =
+          fileConfig
+              .getSrcGenPath()
+              .relativize(fileConfig.getSrcGenPath().resolve(Paths.get(file)));
+      additionalSources.add(FileUtil.toUnixString(relativePath));
     }
-
-    public CCmakeGenerator(
-        FileConfig fileConfig,
-        List<String> additionalSources,
-        SetUpMainTarget setUpMainTarget,
-        String installCode
-    ) {
-        this.fileConfig = fileConfig;
-        this.additionalSources = additionalSources;
-        this.setUpMainTarget = setUpMainTarget;
-        this.installCode = installCode;
+    additionalSources.addAll(this.additionalSources);
+    cMakeCode.newLine();
+
+    cMakeCode.pr("cmake_minimum_required(VERSION " + MIN_CMAKE_VERSION + ")");
+
+    if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
+      cMakeCode.pr("# Set default configuration file. To add custom configurations,");
+      cMakeCode.pr("# pass -- -DOVERLAY_CONFIG=my_config.prj to either cmake or west");
+      cMakeCode.pr("set(CONF_FILE prj_lf.conf)");
+      if (targetConfig.platformOptions.board != null) {
+        cMakeCode.pr("# Selecting board specified in target property");
+        cMakeCode.pr("set(BOARD " + targetConfig.platformOptions.board + ")");
+      } else {
+        cMakeCode.pr("# Selecting default board");
+        cMakeCode.pr("set(BOARD qemu_cortex_m3)");
+      }
+      cMakeCode.pr("# We require Zephyr version 3.2.0");
+      cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} 3.2.0)");
+      cMakeCode.newLine();
     }
 
-    /**
-     * Generate the contents of a CMakeLists.txt that builds the provided LF C 'sources'. Any error will be
-     * reported in the 'errorReporter'.
-     *
-     * @param sources A list of .c files to build.
-     * @param executableName The name of the output executable.
-     * @param errorReporter Used to report errors.
-     * @param CppMode Indicate if the compilation should happen in C++ mode
-     * @param hasMain Indicate if the .lf file has a main reactor or not. If not,
-     *  a library target will be created instead of an executable.
-     * @param cMakeExtras CMake-specific code that should be appended to the CMakeLists.txt.
-     * @param targetConfig The TargetConfig instance to use.
-     * @return The content of the CMakeLists.txt.
-     */
-    CodeBuilder generateCMakeCode(
-        List<String> sources,
-        String executableName,
-        ErrorReporter errorReporter,
-        boolean CppMode,
-        boolean hasMain,
-        String cMakeExtras,
-        TargetConfig targetConfig
-    ) {
-        CodeBuilder cMakeCode = new CodeBuilder();
-
-        List<String> additionalSources = new ArrayList<>();
-        for (String file: targetConfig.compileAdditionalSources) {
-            var relativePath = fileConfig.getSrcGenPath().relativize(
-                fileConfig.getSrcGenPath().resolve(Paths.get(file)));
-            additionalSources.add(FileUtil.toUnixString(relativePath));
-        }
-        additionalSources.addAll(this.additionalSources);
-        cMakeCode.newLine();
-
-        cMakeCode.pr("cmake_minimum_required(VERSION " + MIN_CMAKE_VERSION + ")");
-
-        if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
-            cMakeCode.pr("# Set default configuration file. To add custom configurations,");
-            cMakeCode.pr("# pass -- -DOVERLAY_CONFIG=my_config.prj to either cmake or west");
-            cMakeCode.pr("set(CONF_FILE prj_lf.conf)");
-            if (targetConfig.platformOptions.board != null) {
-                cMakeCode.pr("# Selecting board specified in target property");
-                cMakeCode.pr("set(BOARD "+targetConfig.platformOptions.board+")");
-            } else {
-                cMakeCode.pr("# Selecting default board");
-                cMakeCode.pr("set(BOARD qemu_cortex_m3)");
-            }
-            cMakeCode.pr("# We require Zephyr version 3.2.0");
-            cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} 3.2.0)");
-            cMakeCode.newLine();
-        }
-
-        cMakeCode.pr("project("+executableName+" LANGUAGES C)");
-        cMakeCode.newLine();
-
-        // The Test build type is the Debug type plus coverage generation
-        cMakeCode.pr("if(CMAKE_BUILD_TYPE STREQUAL \"Test\")");
-        cMakeCode.pr("  set(CMAKE_BUILD_TYPE \"Debug\")");
-        cMakeCode.pr("  if(CMAKE_C_COMPILER_ID STREQUAL \"GNU\")");
-        cMakeCode.pr("    find_program(LCOV_BIN lcov)");
-        cMakeCode.pr("    if(LCOV_BIN MATCHES \"lcov$\")");
-        cMakeCode.pr("      set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} --coverage -fprofile-arcs -ftest-coverage\")");
-        cMakeCode.pr("    else()");
-        cMakeCode.pr("      message(\"Not producing code coverage information since lcov was not found\")");
-        cMakeCode.pr("    endif()");
-        cMakeCode.pr("  else()");
-        cMakeCode.pr("    message(\"Not producing code coverage information since the selected compiler is no gcc\")");
-        cMakeCode.pr("  endif()");
-        cMakeCode.pr("endif()");
-
-        cMakeCode.pr("# Require C11");
-        cMakeCode.pr("set(CMAKE_C_STANDARD 11)");
-        cMakeCode.pr("set(CMAKE_C_STANDARD_REQUIRED ON)");
-        cMakeCode.newLine();
-
-        cMakeCode.pr("# Require C++17");
-        cMakeCode.pr("set(CMAKE_CXX_STANDARD 17)");
-        cMakeCode.pr("set(CMAKE_CXX_STANDARD_REQUIRED ON)");
-        cMakeCode.newLine();
-        if (!targetConfig.cmakeIncludes.isEmpty()) {
-            // The user might be using the non-keyword form of
-            // target_link_libraries. Ideally we would detect whether they are
-            // doing that, but it is easier to just always have a deprecation
-            // warning.
-            cMakeCode.pr("""
+    cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
+    cMakeCode.newLine();
+
+    // The Test build type is the Debug type plus coverage generation
+    cMakeCode.pr("if(CMAKE_BUILD_TYPE STREQUAL \"Test\")");
+    cMakeCode.pr("  set(CMAKE_BUILD_TYPE \"Debug\")");
+    cMakeCode.pr("  if(CMAKE_C_COMPILER_ID STREQUAL \"GNU\")");
+    cMakeCode.pr("    find_program(LCOV_BIN lcov)");
+    cMakeCode.pr("    if(LCOV_BIN MATCHES \"lcov$\")");
+    cMakeCode.pr(
+        "      set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} --coverage -fprofile-arcs -ftest-coverage\")");
+    cMakeCode.pr("    else()");
+    cMakeCode.pr(
+        "      message(\"Not producing code coverage information since lcov was not found\")");
+    cMakeCode.pr("    endif()");
+    cMakeCode.pr("  else()");
+    cMakeCode.pr(
+        "    message(\"Not producing code coverage information since the selected compiler is no"
+            + " gcc\")");
+    cMakeCode.pr("  endif()");
+    cMakeCode.pr("endif()");
+
+    cMakeCode.pr("# Require C11");
+    cMakeCode.pr("set(CMAKE_C_STANDARD 11)");
+    cMakeCode.pr("set(CMAKE_C_STANDARD_REQUIRED ON)");
+    cMakeCode.newLine();
+
+    cMakeCode.pr("# Require C++17");
+    cMakeCode.pr("set(CMAKE_CXX_STANDARD 17)");
+    cMakeCode.pr("set(CMAKE_CXX_STANDARD_REQUIRED ON)");
+    cMakeCode.newLine();
+    if (!targetConfig.cmakeIncludes.isEmpty()) {
+      // The user might be using the non-keyword form of
+      // target_link_libraries. Ideally we would detect whether they are
+      // doing that, but it is easier to just always have a deprecation
+      // warning.
+      cMakeCode.pr(
+          """
                 cmake_policy(SET CMP0023 OLD)  # This causes deprecation warnings
 
-                """
-            );
-        }
-
-        // Set the build type
-        cMakeCode.pr("set(DEFAULT_BUILD_TYPE " + targetConfig.cmakeBuildType + ")\n");
-        cMakeCode.pr("if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)\n");
-        cMakeCode.pr("    set(CMAKE_BUILD_TYPE ${DEFAULT_BUILD_TYPE} CACHE STRING \"Choose the type of build.\" FORCE)\n");
-        cMakeCode.pr("endif()\n");
-        cMakeCode.newLine();
-
-        cMakeCode.pr("# do not print install messages\n");
-        cMakeCode.pr("set(CMAKE_INSTALL_MESSAGE NEVER)\n");
-        cMakeCode.newLine();
-
-        if (CppMode) {
-            // Suppress warnings about const char*.
-            cMakeCode.pr("set(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -Wno-write-strings\")");
-            cMakeCode.newLine();
-        }
-
-        if (targetConfig.platformOptions.platform != Platform.AUTO) {
-            cMakeCode.pr("set(CMAKE_SYSTEM_NAME "+targetConfig.platformOptions.platform.getcMakeName()+")");
-        }
-        cMakeCode.newLine();
-
-        if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
-            cMakeCode.pr(setUpMainTargetZephyr(
-                hasMain,
-                executableName,
-                Stream.concat(additionalSources.stream(), sources.stream())
-            ));
-        } else {
-            cMakeCode.pr(setUpMainTarget.getCmakeCode(
-                hasMain,
-                executableName,
-                Stream.concat(additionalSources.stream(), sources.stream())
-            ));
-        }
-
-        cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE core)");
-
-        cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC .)");
-        cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/)");
-        cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/api)");
-        cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core)");
-        cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/platform)");
-        cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/modal_models)");
-        cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/utils)");
-        
-
-        if(targetConfig.auth) {
-            // If security is requested, add the auth option.
-            var osName = System.getProperty("os.name").toLowerCase();
-            // if platform target was set, use given platform instead
-            if (targetConfig.platformOptions.platform != Platform.AUTO) {
-                osName = targetConfig.platformOptions.platform.toString();
-            }
-            if (osName.contains("mac")) {
-                cMakeCode.pr("set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)");
-            }
-            cMakeCode.pr("# Find OpenSSL and link to it");
-            cMakeCode.pr("find_package(OpenSSL REQUIRED)");
-            cMakeCode.pr("target_link_libraries( ${LF_MAIN_TARGET} PRIVATE OpenSSL::SSL)");
-            cMakeCode.newLine();
-        }
-
-        if (targetConfig.threading || targetConfig.tracing != null) {
-            // If threaded computation is requested, add the threads option.
-            cMakeCode.pr("# Find threads and link to it");
-            cMakeCode.pr("find_package(Threads REQUIRED)");
-            cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE Threads::Threads)");
-            cMakeCode.newLine();
-
-            // If the LF program itself is threaded or if tracing is enabled, we need to define
-            // NUMBER_OF_WORKERS so that platform-specific C files will contain the appropriate functions
-            cMakeCode.pr("# Set the number of workers to enable threading/tracing");
-            cMakeCode.pr("target_compile_definitions(${LF_MAIN_TARGET} PUBLIC NUMBER_OF_WORKERS="+targetConfig.workers+")");
-            cMakeCode.newLine();
-        }
-
-        // Add additional flags so runtime can distinguish between multi-threaded and single-threaded mode
-        if (targetConfig.threading) {
-            cMakeCode.pr("# Set flag to indicate a multi-threaded runtime");
-            cMakeCode.pr("target_compile_definitions( ${LF_MAIN_TARGET} PUBLIC LF_THREADED=1)");
-        } else {
-            cMakeCode.pr("# Set flag to indicate a single-threaded runtime");
-            cMakeCode.pr("target_compile_definitions( ${LF_MAIN_TARGET} PUBLIC LF_UNTHREADED=1)");
-        }
-        cMakeCode.newLine();
-
-
-        if (CppMode) cMakeCode.pr("enable_language(CXX)");
-
-        if (targetConfig.compiler != null && !targetConfig.compiler.isBlank()) {
-            if (CppMode) {
-                // Set the CXX compiler to what the user has requested.
-                cMakeCode.pr("set(CMAKE_CXX_COMPILER "+targetConfig.compiler+")");
-            } else {
-                cMakeCode.pr("set(CMAKE_C_COMPILER "+targetConfig.compiler+")");
-            }
-            cMakeCode.newLine();
-        }
-
-        // Set the compiler flags
-        // We can detect a few common libraries and use the proper target_link_libraries to find them
-        for (String compilerFlag : targetConfig.compilerFlags) {
-            switch(compilerFlag.trim()) {
-                case "-lm":
-                    cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE m)");
-                    break;
-                case "-lprotobuf-c":
-                    cMakeCode.pr("include(FindPackageHandleStandardArgs)");
-                    cMakeCode.pr("FIND_PATH( PROTOBUF_INCLUDE_DIR protobuf-c/protobuf-c.h)");
-                    cMakeCode.pr("""
+                """);
+    }
+
+    // Set the build type
+    cMakeCode.pr("set(DEFAULT_BUILD_TYPE " + targetConfig.cmakeBuildType + ")\n");
+    cMakeCode.pr("if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)\n");
+    cMakeCode.pr(
+        "    set(CMAKE_BUILD_TYPE ${DEFAULT_BUILD_TYPE} CACHE STRING \"Choose the type of build.\""
+            + " FORCE)\n");
+    cMakeCode.pr("endif()\n");
+    cMakeCode.newLine();
+
+    cMakeCode.pr("# do not print install messages\n");
+    cMakeCode.pr("set(CMAKE_INSTALL_MESSAGE NEVER)\n");
+    cMakeCode.newLine();
+
+    if (CppMode) {
+      // Suppress warnings about const char*.
+      cMakeCode.pr("set(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -Wno-write-strings\")");
+      cMakeCode.newLine();
+    }
+
+    if (targetConfig.platformOptions.platform != Platform.AUTO) {
+      cMakeCode.pr(
+          "set(CMAKE_SYSTEM_NAME " + targetConfig.platformOptions.platform.getcMakeName() + ")");
+    }
+    cMakeCode.newLine();
+
+    if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
+      cMakeCode.pr(
+          setUpMainTargetZephyr(
+              hasMain,
+              executableName,
+              Stream.concat(additionalSources.stream(), sources.stream())));
+    } else {
+      cMakeCode.pr(
+          setUpMainTarget.getCmakeCode(
+              hasMain,
+              executableName,
+              Stream.concat(additionalSources.stream(), sources.stream())));
+    }
+
+    cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE core)");
+
+    cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC .)");
+    cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/)");
+    cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/api)");
+    cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core)");
+    cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/platform)");
+    cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/modal_models)");
+    cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/utils)");
+
+    if (targetConfig.auth) {
+      // If security is requested, add the auth option.
+      var osName = System.getProperty("os.name").toLowerCase();
+      // if platform target was set, use given platform instead
+      if (targetConfig.platformOptions.platform != Platform.AUTO) {
+        osName = targetConfig.platformOptions.platform.toString();
+      }
+      if (osName.contains("mac")) {
+        cMakeCode.pr("set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)");
+      }
+      cMakeCode.pr("# Find OpenSSL and link to it");
+      cMakeCode.pr("find_package(OpenSSL REQUIRED)");
+      cMakeCode.pr("target_link_libraries( ${LF_MAIN_TARGET} PRIVATE OpenSSL::SSL)");
+      cMakeCode.newLine();
+    }
+
+    if (targetConfig.threading || targetConfig.tracing != null) {
+      // If threaded computation is requested, add the threads option.
+      cMakeCode.pr("# Find threads and link to it");
+      cMakeCode.pr("find_package(Threads REQUIRED)");
+      cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE Threads::Threads)");
+      cMakeCode.newLine();
+
+      // If the LF program itself is threaded or if tracing is enabled, we need to define
+      // NUMBER_OF_WORKERS so that platform-specific C files will contain the appropriate functions
+      cMakeCode.pr("# Set the number of workers to enable threading/tracing");
+      cMakeCode.pr(
+          "target_compile_definitions(${LF_MAIN_TARGET} PUBLIC NUMBER_OF_WORKERS="
+              + targetConfig.workers
+              + ")");
+      cMakeCode.newLine();
+    }
+
+    // Add additional flags so runtime can distinguish between multi-threaded and single-threaded
+    // mode
+    if (targetConfig.threading) {
+      cMakeCode.pr("# Set flag to indicate a multi-threaded runtime");
+      cMakeCode.pr("target_compile_definitions( ${LF_MAIN_TARGET} PUBLIC LF_THREADED=1)");
+    } else {
+      cMakeCode.pr("# Set flag to indicate a single-threaded runtime");
+      cMakeCode.pr("target_compile_definitions( ${LF_MAIN_TARGET} PUBLIC LF_UNTHREADED=1)");
+    }
+    cMakeCode.newLine();
+
+    if (CppMode) cMakeCode.pr("enable_language(CXX)");
+
+    if (targetConfig.compiler != null && !targetConfig.compiler.isBlank()) {
+      if (CppMode) {
+        // Set the CXX compiler to what the user has requested.
+        cMakeCode.pr("set(CMAKE_CXX_COMPILER " + targetConfig.compiler + ")");
+      } else {
+        cMakeCode.pr("set(CMAKE_C_COMPILER " + targetConfig.compiler + ")");
+      }
+      cMakeCode.newLine();
+    }
+
+    // Set the compiler flags
+    // We can detect a few common libraries and use the proper target_link_libraries to find them
+    for (String compilerFlag : targetConfig.compilerFlags) {
+      switch (compilerFlag.trim()) {
+        case "-lm":
+          cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE m)");
+          break;
+        case "-lprotobuf-c":
+          cMakeCode.pr("include(FindPackageHandleStandardArgs)");
+          cMakeCode.pr("FIND_PATH( PROTOBUF_INCLUDE_DIR protobuf-c/protobuf-c.h)");
+          cMakeCode.pr(
+              """
                          find_library(PROTOBUF_LIBRARY\s
                          NAMES libprotobuf-c.a libprotobuf-c.so libprotobuf-c.dylib protobuf-c.lib protobuf-c.dll
                          )""");
-                    cMakeCode.pr("find_package_handle_standard_args(libprotobuf-c DEFAULT_MSG PROTOBUF_INCLUDE_DIR PROTOBUF_LIBRARY)");
-                    cMakeCode.pr("target_include_directories( ${LF_MAIN_TARGET} PUBLIC ${PROTOBUF_INCLUDE_DIR} )");
-                    cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE ${PROTOBUF_LIBRARY})");
-                    break;
-                case "-O2":
-                    if (Objects.equals(targetConfig.compiler, "gcc") || CppMode) {
-                        // Workaround for the pre-added -O2 option in the CGenerator.
-                        // This flag is specific to gcc/g++ and the clang compiler
-                        cMakeCode.pr("add_compile_options(-O2)");
-                        cMakeCode.pr("add_link_options(-O2)");
-                        break;
-                    }
-                default:
-                    errorReporter.reportWarning("Using the flags target property with cmake is dangerous.\n"+
-                                                " Use cmake-include instead.");
-                    cMakeCode.pr("add_compile_options( "+compilerFlag+" )");
-                    cMakeCode.pr("add_link_options( "+compilerFlag+")");
-            }
-        }
-        cMakeCode.newLine();
-
-        // Add the install option
-        cMakeCode.pr(installCode);
-        cMakeCode.newLine();
-
-        // Add the include file
-        for (String includeFile : targetConfig.cmakeIncludes) {
-            cMakeCode.pr("include(\""+ Path.of(includeFile).getFileName()+"\")");
-        }
-        cMakeCode.newLine();
-
-        cMakeCode.pr(cMakeExtras);
-        cMakeCode.newLine();
-
-        return cMakeCode;
+          cMakeCode.pr(
+              "find_package_handle_standard_args(libprotobuf-c DEFAULT_MSG PROTOBUF_INCLUDE_DIR"
+                  + " PROTOBUF_LIBRARY)");
+          cMakeCode.pr(
+              "target_include_directories( ${LF_MAIN_TARGET} PUBLIC ${PROTOBUF_INCLUDE_DIR} )");
+          cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE ${PROTOBUF_LIBRARY})");
+          break;
+        case "-O2":
+          if (Objects.equals(targetConfig.compiler, "gcc") || CppMode) {
+            // Workaround for the pre-added -O2 option in the CGenerator.
+            // This flag is specific to gcc/g++ and the clang compiler
+            cMakeCode.pr("add_compile_options(-O2)");
+            cMakeCode.pr("add_link_options(-O2)");
+            break;
+          }
+        default:
+          errorReporter.reportWarning(
+              "Using the flags target property with cmake is dangerous.\n"
+                  + " Use cmake-include instead.");
+          cMakeCode.pr("add_compile_options( " + compilerFlag + " )");
+          cMakeCode.pr("add_link_options( " + compilerFlag + ")");
+      }
     }
+    cMakeCode.newLine();
 
-    /** Provide a strategy for configuring the main target of the CMake build. */
-    public interface SetUpMainTarget {
-        // Implementation note: This indirection is necessary because the Python
-        // target produces a shared object file, not an executable.
-        String getCmakeCode(boolean hasMain, String executableName, Stream<String> cSources);
-    }
+    // Add the install option
+    cMakeCode.pr(installCode);
+    cMakeCode.newLine();
 
-    /** Generate the C-target-specific code for configuring the executable produced by the build. */
-    private static String setUpMainTarget(
-        boolean hasMain,
-        String executableName,
-        Stream<String> cSources
-    ) {
-        var code = new CodeBuilder();
-        code.pr("add_subdirectory(core)");
-        code.newLine();
-        code.pr("set(LF_MAIN_TARGET "+executableName+")");
-        code.newLine();
-
-        if (hasMain) {
-            code.pr("# Declare a new executable target and list all its sources");
-            code.pr("add_executable(");
-        } else {
-            code.pr("# Declare a new library target and list all its sources");
-            code.pr("add_library(");
-        }
-        code.indent();
-        code.pr("${LF_MAIN_TARGET}");
-        cSources.forEach(code::pr);
-        code.unindent();
-        code.pr(")");
-        code.newLine();
-        return code.toString();
+    // Add the include file
+    for (String includeFile : targetConfig.cmakeIncludes) {
+      cMakeCode.pr("include(\"" + Path.of(includeFile).getFileName() + "\")");
     }
+    cMakeCode.newLine();
+
+    cMakeCode.pr(cMakeExtras);
+    cMakeCode.newLine();
+
+    return cMakeCode;
+  }
+
+  /** Provide a strategy for configuring the main target of the CMake build. */
+  public interface SetUpMainTarget {
+    // Implementation note: This indirection is necessary because the Python
+    // target produces a shared object file, not an executable.
+    String getCmakeCode(boolean hasMain, String executableName, Stream<String> cSources);
+  }
+
+  /** Generate the C-target-specific code for configuring the executable produced by the build. */
+  private static String setUpMainTarget(
+      boolean hasMain, String executableName, Stream<String> cSources) {
+    var code = new CodeBuilder();
+    code.pr("add_subdirectory(core)");
+    code.newLine();
+    code.pr("set(LF_MAIN_TARGET " + executableName + ")");
+    code.newLine();
+
+    if (hasMain) {
+      code.pr("# Declare a new executable target and list all its sources");
+      code.pr("add_executable(");
+    } else {
+      code.pr("# Declare a new library target and list all its sources");
+      code.pr("add_library(");
+    }
+    code.indent();
+    code.pr("${LF_MAIN_TARGET}");
+    cSources.forEach(code::pr);
+    code.unindent();
+    code.pr(")");
+    code.newLine();
+    return code.toString();
+  }
+
+  private static String setUpMainTargetZephyr(
+      boolean hasMain, String executableName, Stream<String> cSources) {
+    var code = new CodeBuilder();
+    code.pr("add_subdirectory(core)");
+    code.pr("target_link_libraries(core PUBLIC zephyr_interface)");
+    // FIXME: Linking the reactor-c corelib with the zephyr kernel lib
+    //  resolves linker issues but I am not yet sure if it is safe
+    code.pr("target_link_libraries(core PRIVATE kernel)");
+    code.newLine();
+
+    if (hasMain) {
+      code.pr("# Declare a new executable target and list all its sources");
+      code.pr("set(LF_MAIN_TARGET app)");
+      code.pr("target_sources(");
+    } else {
+      code.pr("# Declare a new library target and list all its sources");
+      code.pr("set(LF_MAIN_TARGET" + executableName + ")");
+      code.pr("add_library(");
+    }
+    code.indent();
+    code.pr("${LF_MAIN_TARGET}");
 
-    private static String setUpMainTargetZephyr(
-        boolean hasMain,
-        String executableName,
-        Stream<String> cSources
-    ) {
-        var code = new CodeBuilder();
-        code.pr("add_subdirectory(core)");
-        code.pr("target_link_libraries(core PUBLIC zephyr_interface)");
-        // FIXME: Linking the reactor-c corelib with the zephyr kernel lib
-        //  resolves linker issues but I am not yet sure if it is safe
-        code.pr("target_link_libraries(core PRIVATE kernel)");
-        code.newLine();
-
-        if (hasMain) {
-            code.pr("# Declare a new executable target and list all its sources");
-            code.pr("set(LF_MAIN_TARGET app)");
-            code.pr("target_sources(");
-        } else {
-            code.pr("# Declare a new library target and list all its sources");
-            code.pr("set(LF_MAIN_TARGET"+executableName+")");
-            code.pr("add_library(");
-        }
-        code.indent();
-        code.pr("${LF_MAIN_TARGET}");
-
-        if (hasMain) {
-            code.pr("PRIVATE");
-        }
-
-        cSources.forEach(code::pr);
-        code.unindent();
-        code.pr(")");
-        code.newLine();
-        return code.toString();
+    if (hasMain) {
+      code.pr("PRIVATE");
     }
+
+    cSources.forEach(code::pr);
+    code.unindent();
+    code.pr(")");
+    code.newLine();
+    return code.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CCompiler.java b/org.lflang/src/org/lflang/generator/c/CCompiler.java
index 9fcb72b4a6..f919977ba5 100644
--- a/org.lflang/src/org/lflang/generator/c/CCompiler.java
+++ b/org.lflang/src/org/lflang/generator/c/CCompiler.java
@@ -1,16 +1,16 @@
 /*************
  * Copyright (c) 2019-2021, The University of California at Berkeley.
-
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
-
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
-
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
-
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -33,7 +33,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
@@ -47,8 +46,8 @@
 import org.lflang.util.LFCommand;
 
 /**
- * Responsible for creating and executing the necessary CMake command to compile
- * code that is generated by the CGenerator. This class uses CMake to compile.
+ * Responsible for creating and executing the necessary CMake command to compile code that is
+ * generated by the CGenerator. This class uses CMake to compile.
  *
  * @author Soroush Bateni
  * @author Edward A. Lee
@@ -59,392 +58,386 @@
  */
 public class CCompiler {
 
-    FileConfig fileConfig;
-    TargetConfig targetConfig;
-    ErrorReporter errorReporter;
-
-    /**
-     * Indicate whether the compiler is in C++ mode.
-     * In C++ mode, the compiler produces .cpp files instead
-     * of .c files and uses a C++ compiler to compiler the code.
-     */
-    private final boolean cppMode;
-
-    /**
-     * A factory for compiler commands.
-     */
-    GeneratorCommandFactory commandFactory;
-
-    /**
-     * Create an instance of CCompiler.
-     *
-     * @param targetConfig The current target configuration.
-     * @param fileConfig The current file configuration.
-     * @param errorReporter Used to report errors.
-     * @param cppMode Whether the generated code should be compiled as if it
-     * were C++.
-     */
-    public CCompiler(
-        TargetConfig targetConfig,
-        FileConfig fileConfig,
-        ErrorReporter errorReporter,
-        boolean cppMode
-    ) {
-        this.fileConfig = fileConfig;
-        this.targetConfig = targetConfig;
-        this.errorReporter = errorReporter;
-        this.commandFactory = new GeneratorCommandFactory(errorReporter, fileConfig);
-        this.cppMode = cppMode;
+  FileConfig fileConfig;
+  TargetConfig targetConfig;
+  ErrorReporter errorReporter;
+
+  /**
+   * Indicate whether the compiler is in C++ mode. In C++ mode, the compiler produces .cpp files
+   * instead of .c files and uses a C++ compiler to compiler the code.
+   */
+  private final boolean cppMode;
+
+  /** A factory for compiler commands. */
+  GeneratorCommandFactory commandFactory;
+
+  /**
+   * Create an instance of CCompiler.
+   *
+   * @param targetConfig The current target configuration.
+   * @param fileConfig The current file configuration.
+   * @param errorReporter Used to report errors.
+   * @param cppMode Whether the generated code should be compiled as if it were C++.
+   */
+  public CCompiler(
+      TargetConfig targetConfig,
+      FileConfig fileConfig,
+      ErrorReporter errorReporter,
+      boolean cppMode) {
+    this.fileConfig = fileConfig;
+    this.targetConfig = targetConfig;
+    this.errorReporter = errorReporter;
+    this.commandFactory = new GeneratorCommandFactory(errorReporter, fileConfig);
+    this.cppMode = cppMode;
+  }
+
+  /**
+   * Run the C compiler by invoking cmake and make.
+   *
+   * @param generator An instance of GeneratorBase, only used to report error line numbers in the
+   *     Eclipse IDE.
+   * @return true if compilation succeeds, false otherwise.
+   */
+  public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
+      throws IOException {
+    // Set the build directory to be "build"
+    Path buildPath = fileConfig.getSrcGenPath().resolve("build");
+    // Remove the previous build directory if it exists to
+    // avoid any error residue that can occur in CMake from
+    // a previous build.
+    // FIXME: This is slow and only needed if an error
+    //  has previously occurred. Deleting the build directory
+    //  if no prior errors have occurred can prolong the compilation
+    //  substantially. See #1416 for discussion.
+    FileUtil.deleteDirectory(buildPath);
+    // Make sure the build directory exists
+    Files.createDirectories(buildPath);
+
+    LFCommand compile = compileCmakeCommand();
+    if (compile == null) {
+      return false;
     }
 
-    /**
-     * Run the C compiler by invoking cmake and make.
-     * @param generator An instance of GeneratorBase, only used to report error line numbers
-     *  in the Eclipse IDE.
-     *
-     * @return true if compilation succeeds, false otherwise.
-     */
-    public boolean runCCompiler(
-        GeneratorBase generator,
-        LFGeneratorContext context
-    ) throws IOException {
-        // Set the build directory to be "build"
-        Path buildPath = fileConfig.getSrcGenPath().resolve("build");
-        // Remove the previous build directory if it exists to
-        // avoid any error residue that can occur in CMake from
-        // a previous build.
-        // FIXME: This is slow and only needed if an error
-        //  has previously occurred. Deleting the build directory
-        //  if no prior errors have occurred can prolong the compilation
-        //  substantially. See #1416 for discussion.
-        FileUtil.deleteDirectory(buildPath);
-        // Make sure the build directory exists
-        Files.createDirectories(buildPath);
-
-        LFCommand compile = compileCmakeCommand();
-        if (compile == null) {
-            return false;
-        }
-
-        // Use the user-specified compiler if any
-        if (targetConfig.compiler != null) {
-            if (cppMode) {
-                // Set the CXX environment variable to change the C++ compiler.
-                compile.replaceEnvironmentVariable("CXX", targetConfig.compiler);
-            } else {
-                // Set the CC environment variable to change the C compiler.
-                compile.replaceEnvironmentVariable("CC", targetConfig.compiler);
-            }
-        }
-
-        int cMakeReturnCode = compile.run(context.getCancelIndicator());
-
-        if (cMakeReturnCode != 0 &&
-                context.getMode() == LFGeneratorContext.Mode.STANDALONE &&
-                !outputContainsKnownCMakeErrors(compile.getErrors().toString())) {
-            errorReporter.reportError(targetConfig.compiler + " failed with error code " + cMakeReturnCode);
-        }
-
-        // For warnings (vs. errors), the return code is 0.
-        // But we still want to mark the IDE.
-        if (compile.getErrors().toString().length() > 0 &&
-                context.getMode() != LFGeneratorContext.Mode.STANDALONE &&
-                !outputContainsKnownCMakeErrors(compile.getErrors().toString())) {
-            generator.reportCommandErrors(compile.getErrors().toString());
-        }
-
-        int makeReturnCode = 0;
-
-        if (cMakeReturnCode == 0) {
-            LFCommand build = buildCmakeCommand();
-
-            makeReturnCode = build.run(context.getCancelIndicator());
-
-            if (makeReturnCode != 0 &&
-                    context.getMode() == LFGeneratorContext.Mode.STANDALONE &&
-                    !outputContainsKnownCMakeErrors(build.getErrors().toString())) {
-                errorReporter.reportError(targetConfig.compiler + " failed with error code " + makeReturnCode);
-            }
-
-            // For warnings (vs. errors), the return code is 0.
-            // But we still want to mark the IDE.
-            if (build.getErrors().toString().length() > 0 &&
-                    context.getMode() != LFGeneratorContext.Mode.STANDALONE &&
-                    !outputContainsKnownCMakeErrors(build.getErrors().toString())) {
-                generator.reportCommandErrors(build.getErrors().toString());
-            }
-
-
-            if (makeReturnCode == 0 && build.getErrors().toString().length() == 0) {
-                System.out.println("SUCCESS: Compiling generated code for " + fileConfig.name + " finished with no errors.");
-            }
-
-            if (targetConfig.platformOptions.platform == Platform.ZEPHYR && targetConfig.platformOptions.flash) {
-                System.out.println("Invoking flash command for Zephyr");
-                LFCommand flash = buildWestFlashCommand();
-                int flashRet = flash.run();
-                if (flashRet != 0) {
-                    errorReporter.reportError("West flash command failed with error code " + flashRet);
-                } else {
-                    System.out.println("SUCCESS: Flashed application with west");
-                }
-            }
-
-        }
-        return cMakeReturnCode == 0 && makeReturnCode == 0;
+    // Use the user-specified compiler if any
+    if (targetConfig.compiler != null) {
+      if (cppMode) {
+        // Set the CXX environment variable to change the C++ compiler.
+        compile.replaceEnvironmentVariable("CXX", targetConfig.compiler);
+      } else {
+        // Set the CC environment variable to change the C compiler.
+        compile.replaceEnvironmentVariable("CC", targetConfig.compiler);
+      }
     }
 
+    int cMakeReturnCode = compile.run(context.getCancelIndicator());
 
-    /**
-     * Return a command to compile the specified C file using CMake.
-     * This produces a C-specific compile command.
-     */
-    public LFCommand compileCmakeCommand() {
-        // Set the build directory to be "build"
-        Path buildPath = fileConfig.getSrcGenPath().resolve("build");
-
-        LFCommand command = commandFactory.createCommand(
-                "cmake", cmakeOptions(targetConfig, fileConfig),
-                buildPath);
-        if (command == null) {
-            errorReporter.reportError(
-                "The C/CCpp target requires CMAKE >= " + CCmakeGenerator.MIN_CMAKE_VERSION
-                    + " to compile the generated code. " +
-                    "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
-        }
-        return command;
+    if (cMakeReturnCode != 0
+        && context.getMode() == LFGeneratorContext.Mode.STANDALONE
+        && !outputContainsKnownCMakeErrors(compile.getErrors().toString())) {
+      errorReporter.reportError(
+          targetConfig.compiler + " failed with error code " + cMakeReturnCode);
     }
 
-    static Stream<String> cmakeCompileDefinitions(TargetConfig targetConfig) {
-        return targetConfig.compileDefinitions.entrySet().stream()
-            .map(entry -> "-D" + entry.getKey() + "=" + entry.getValue());
+    // For warnings (vs. errors), the return code is 0.
+    // But we still want to mark the IDE.
+    if (compile.getErrors().toString().length() > 0
+        && context.getMode() != LFGeneratorContext.Mode.STANDALONE
+        && !outputContainsKnownCMakeErrors(compile.getErrors().toString())) {
+      generator.reportCommandErrors(compile.getErrors().toString());
     }
 
-    private static List<String> cmakeOptions(TargetConfig targetConfig, FileConfig fileConfig) {
-        List<String> arguments = new ArrayList<>();
-        cmakeCompileDefinitions(targetConfig).forEachOrdered(arguments::add);
-        String separator = File.separator;
-        String maybeQuote = ""; // Windows seems to require extra level of quoting.
-        String srcPath = fileConfig.srcPath.toString(); // Windows requires escaping the backslashes.
-        String rootPath = fileConfig.srcPkgPath.toString();
-        if (separator.equals("\\")) {
-            separator = "\\\\\\\\";
-            maybeQuote = "\\\"";
-            srcPath = srcPath.replaceAll("\\\\", "\\\\\\\\");
-            rootPath = rootPath.replaceAll("\\\\", "\\\\\\\\");
+    int makeReturnCode = 0;
+
+    if (cMakeReturnCode == 0) {
+      LFCommand build = buildCmakeCommand();
+
+      makeReturnCode = build.run(context.getCancelIndicator());
+
+      if (makeReturnCode != 0
+          && context.getMode() == LFGeneratorContext.Mode.STANDALONE
+          && !outputContainsKnownCMakeErrors(build.getErrors().toString())) {
+        errorReporter.reportError(
+            targetConfig.compiler + " failed with error code " + makeReturnCode);
+      }
+
+      // For warnings (vs. errors), the return code is 0.
+      // But we still want to mark the IDE.
+      if (build.getErrors().toString().length() > 0
+          && context.getMode() != LFGeneratorContext.Mode.STANDALONE
+          && !outputContainsKnownCMakeErrors(build.getErrors().toString())) {
+        generator.reportCommandErrors(build.getErrors().toString());
+      }
+
+      if (makeReturnCode == 0 && build.getErrors().toString().length() == 0) {
+        System.out.println(
+            "SUCCESS: Compiling generated code for "
+                + fileConfig.name
+                + " finished with no errors.");
+      }
+
+      if (targetConfig.platformOptions.platform == Platform.ZEPHYR
+          && targetConfig.platformOptions.flash) {
+        System.out.println("Invoking flash command for Zephyr");
+        LFCommand flash = buildWestFlashCommand();
+        int flashRet = flash.run();
+        if (flashRet != 0) {
+          errorReporter.reportError("West flash command failed with error code " + flashRet);
+        } else {
+          System.out.println("SUCCESS: Flashed application with west");
         }
-        arguments.addAll(List.of(
-            "-DCMAKE_BUILD_TYPE=" + ((targetConfig.cmakeBuildType!=null) ? targetConfig.cmakeBuildType.toString() : "Release"),
+      }
+    }
+    return cMakeReturnCode == 0 && makeReturnCode == 0;
+  }
+
+  /**
+   * Return a command to compile the specified C file using CMake. This produces a C-specific
+   * compile command.
+   */
+  public LFCommand compileCmakeCommand() {
+    // Set the build directory to be "build"
+    Path buildPath = fileConfig.getSrcGenPath().resolve("build");
+
+    LFCommand command =
+        commandFactory.createCommand("cmake", cmakeOptions(targetConfig, fileConfig), buildPath);
+    if (command == null) {
+      errorReporter.reportError(
+          "The C/CCpp target requires CMAKE >= "
+              + CCmakeGenerator.MIN_CMAKE_VERSION
+              + " to compile the generated code. "
+              + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
+    }
+    return command;
+  }
+
+  static Stream<String> cmakeCompileDefinitions(TargetConfig targetConfig) {
+    return targetConfig.compileDefinitions.entrySet().stream()
+        .map(entry -> "-D" + entry.getKey() + "=" + entry.getValue());
+  }
+
+  private static List<String> cmakeOptions(TargetConfig targetConfig, FileConfig fileConfig) {
+    List<String> arguments = new ArrayList<>();
+    cmakeCompileDefinitions(targetConfig).forEachOrdered(arguments::add);
+    String separator = File.separator;
+    String maybeQuote = ""; // Windows seems to require extra level of quoting.
+    String srcPath = fileConfig.srcPath.toString(); // Windows requires escaping the backslashes.
+    String rootPath = fileConfig.srcPkgPath.toString();
+    if (separator.equals("\\")) {
+      separator = "\\\\\\\\";
+      maybeQuote = "\\\"";
+      srcPath = srcPath.replaceAll("\\\\", "\\\\\\\\");
+      rootPath = rootPath.replaceAll("\\\\", "\\\\\\\\");
+    }
+    arguments.addAll(
+        List.of(
+            "-DCMAKE_BUILD_TYPE="
+                + ((targetConfig.cmakeBuildType != null)
+                    ? targetConfig.cmakeBuildType.toString()
+                    : "Release"),
             "-DCMAKE_INSTALL_PREFIX=" + FileUtil.toUnixString(fileConfig.getOutPath()),
-            "-DCMAKE_INSTALL_BINDIR=" + FileUtil.toUnixString(
-                fileConfig.getOutPath().relativize(
-                    fileConfig.binPath
-                )
-            ),
-            "-DLF_FILE_SEPARATOR=\"" + maybeQuote + separator + maybeQuote + "\""
-        ));
-        // Add #define for source file directory.
-        // Do not do this for federated programs because for those, the definition is put
-        // into the cmake file (and fileConfig.srcPath is the wrong directory anyway).
-        if (!fileConfig.srcPath.toString().contains("fed-gen")) {
-            // Do not convert to Unix path
-            arguments.add("-DLF_SOURCE_DIRECTORY=\"" + maybeQuote + srcPath + maybeQuote + "\"");
-            arguments.add("-DLF_PACKAGE_DIRECTORY=\"" + maybeQuote + rootPath + maybeQuote + "\"");
-        }
-        arguments.add(FileUtil.toUnixString(fileConfig.getSrcGenPath()));
-
-        if (GeneratorUtils.isHostWindows()) {
-            arguments.add("-DCMAKE_SYSTEM_VERSION=\"10.0\"");
-        }
-        return arguments;
+            "-DCMAKE_INSTALL_BINDIR="
+                + FileUtil.toUnixString(fileConfig.getOutPath().relativize(fileConfig.binPath)),
+            "-DLF_FILE_SEPARATOR=\"" + maybeQuote + separator + maybeQuote + "\""));
+    // Add #define for source file directory.
+    // Do not do this for federated programs because for those, the definition is put
+    // into the cmake file (and fileConfig.srcPath is the wrong directory anyway).
+    if (!fileConfig.srcPath.toString().contains("fed-gen")) {
+      // Do not convert to Unix path
+      arguments.add("-DLF_SOURCE_DIRECTORY=\"" + maybeQuote + srcPath + maybeQuote + "\"");
+      arguments.add("-DLF_PACKAGE_DIRECTORY=\"" + maybeQuote + rootPath + maybeQuote + "\"");
     }
+    arguments.add(FileUtil.toUnixString(fileConfig.getSrcGenPath()));
 
-    /**
-     * Return the cmake config name correspnding to a given build type.
-     */
-    private String buildTypeToCmakeConfig(TargetProperty.BuildType type) {
-        if (type == null) {
-            return "Release";
-        }
-        switch (type) {
-        case TEST:
-            return "Debug";
-        default:
-            return type.toString();
-        }
+    if (GeneratorUtils.isHostWindows()) {
+      arguments.add("-DCMAKE_SYSTEM_VERSION=\"10.0\"");
     }
+    return arguments;
+  }
 
-    /**
-     * Return a command to build the specified C file using CMake.
-     * This produces a C-specific build command.
-     *
-     * <p>Note: It appears that configuration and build cannot happen in one command.
-     * Therefore, this is separated into a compile command and a build command.</p>
-     */
-    public LFCommand buildCmakeCommand() {
-        // Set the build directory to be "build"
-        Path buildPath = fileConfig.getSrcGenPath().resolve("build");
-        String cores = String.valueOf(Runtime.getRuntime().availableProcessors());
-        LFCommand command =  commandFactory.createCommand(
-                "cmake", List.of(
-                        "--build", ".", "--target", "install", "--parallel", cores, "--config",
-                        buildTypeToCmakeConfig(targetConfig.cmakeBuildType)
-                    ),
-                buildPath);
-        if (command == null) {
-            errorReporter.reportError(
-                "The C/CCpp target requires CMAKE >= 3.5 to compile the generated code. "
-                + "Auto-compiling can be disabled using the \"no-compile: true\" target property."
-            );
-        }
-        return command;
+  /** Return the cmake config name correspnding to a given build type. */
+  private String buildTypeToCmakeConfig(TargetProperty.BuildType type) {
+    if (type == null) {
+      return "Release";
     }
-
-    /**
-     * Return a flash/emulate command using west.
-     * If board is null (defaults to qemu_cortex_m3) or qemu_*
-     * Return a flash command which runs the target as an emulation
-     * If ordinary target, return {@code west flash}
-     */
-    public LFCommand buildWestFlashCommand() {
-        // Set the build directory to be "build"
-        Path buildPath = fileConfig.getSrcGenPath().resolve("build");
-        String board = targetConfig.platformOptions.board;
-        LFCommand cmd;
-        if (board == null || board.startsWith("qemu")) {
-            cmd = commandFactory.createCommand(
-                "west", List.of("build", "-t", "run"), buildPath);
-        } else {
-            cmd = commandFactory.createCommand(
-                "west", List.of("flash"), buildPath);
-        }
-        if (cmd == null) {
-            errorReporter.reportError(
-                "Could not create west flash command."
-            );
-        }
-
-        return cmd;
+    switch (type) {
+      case TEST:
+        return "Debug";
+      default:
+        return type.toString();
     }
-
-    /**
-     * Check if the output produced by CMake has any known and common errors.
-     * If a known error is detected, a specialized, more informative message
-     * is shown.
-     *
-     * Errors currently detected:
-     * <ul>
-     * <li>C++ compiler used to compile C files: This error shows up as
-     * &#39;#error &quot;The CMAKE_C_COMPILER is set to a C++ compiler&quot;&#39; in
-     * the &#39;CMakeOutput&#39; string.</li>
-     * </ul>
-     *
-     * @param CMakeOutput The captured output from CMake.
-     * @return true if the provided 'CMakeOutput' contains a known error.
-     *  false otherwise.
-     */
-    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-    private boolean outputContainsKnownCMakeErrors(String CMakeOutput) {
-        // Check if the error thrown is due to the wrong compiler
-        if (CMakeOutput.contains("The CMAKE_C_COMPILER is set to a C++ compiler")) {
-            // If so, print an appropriate error message
-            if (targetConfig.compiler != null) {
-                errorReporter.reportError(
-                        "A C++ compiler was requested in the compiler target property."
-                                + " Use the CCpp or the Cpp target instead.");
-            } else {
-                errorReporter.reportError("\"A C++ compiler was detected."
-                       + " The C target works best with a C compiler."
-                       + " Use the CCpp or the Cpp target instead.\"");
-            }
-            return true;
-        }
-        return false;
+  }
+
+  /**
+   * Return a command to build the specified C file using CMake. This produces a C-specific build
+   * command.
+   *
+   * <p>Note: It appears that configuration and build cannot happen in one command. Therefore, this
+   * is separated into a compile command and a build command.
+   */
+  public LFCommand buildCmakeCommand() {
+    // Set the build directory to be "build"
+    Path buildPath = fileConfig.getSrcGenPath().resolve("build");
+    String cores = String.valueOf(Runtime.getRuntime().availableProcessors());
+    LFCommand command =
+        commandFactory.createCommand(
+            "cmake",
+            List.of(
+                "--build",
+                ".",
+                "--target",
+                "install",
+                "--parallel",
+                cores,
+                "--config",
+                buildTypeToCmakeConfig(targetConfig.cmakeBuildType)),
+            buildPath);
+    if (command == null) {
+      errorReporter.reportError(
+          "The C/CCpp target requires CMAKE >= 3.5 to compile the generated code. "
+              + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
+    }
+    return command;
+  }
+
+  /**
+   * Return a flash/emulate command using west. If board is null (defaults to qemu_cortex_m3) or
+   * qemu_* Return a flash command which runs the target as an emulation If ordinary target, return
+   * {@code west flash}
+   */
+  public LFCommand buildWestFlashCommand() {
+    // Set the build directory to be "build"
+    Path buildPath = fileConfig.getSrcGenPath().resolve("build");
+    String board = targetConfig.platformOptions.board;
+    LFCommand cmd;
+    if (board == null || board.startsWith("qemu")) {
+      cmd = commandFactory.createCommand("west", List.of("build", "-t", "run"), buildPath);
+    } else {
+      cmd = commandFactory.createCommand("west", List.of("flash"), buildPath);
+    }
+    if (cmd == null) {
+      errorReporter.reportError("Could not create west flash command.");
     }
 
-    /**
-     * Return a command to compile the specified C file using a native compiler
-     * (generally gcc unless overridden by the user).
-     * This produces a C specific compile command.
-     *
-     * @param fileToCompile The C filename without the .c extension.
-     * @param noBinary If true, the compiler will create a .o output instead of a binary.
-     *  If false, the compile command will produce a binary.
-     */
-    public LFCommand compileCCommand(
-        String fileToCompile,
-        boolean noBinary
-    ) {
-        String cFilename = getTargetFileName(fileToCompile, cppMode, targetConfig);
-
-        Path relativeSrcPath = fileConfig.getOutPath().relativize(
-            fileConfig.getSrcGenPath().resolve(Paths.get(cFilename)));
-        Path relativeBinPath = fileConfig.getOutPath().relativize(
-            fileConfig.binPath.resolve(Paths.get(fileToCompile)));
-
-        // NOTE: we assume that any C compiler takes Unix paths as arguments.
-        String relSrcPathString = FileUtil.toUnixString(relativeSrcPath);
-        String relBinPathString = FileUtil.toUnixString(relativeBinPath);
-
-        // If there is no main reactor, then generate a .o file not an executable.
-        if (noBinary) {
-            relBinPathString += ".o";
-        }
-
-        ArrayList<String> compileArgs = new ArrayList<>();
-        compileArgs.add(relSrcPathString);
-        for (String file: targetConfig.compileAdditionalSources) {
-            var relativePath = fileConfig.getOutPath().relativize(
-                fileConfig.getSrcGenPath().resolve(Paths.get(file)));
-            compileArgs.add(FileUtil.toUnixString(relativePath));
-        }
-        compileArgs.addAll(targetConfig.compileLibraries);
+    return cmd;
+  }
+
+  /**
+   * Check if the output produced by CMake has any known and common errors. If a known error is
+   * detected, a specialized, more informative message is shown.
+   *
+   * <p>Errors currently detected:
+   *
+   * <ul>
+   *   <li>C++ compiler used to compile C files: This error shows up as &#39;#error &quot;The
+   *       CMAKE_C_COMPILER is set to a C++ compiler&quot;&#39; in the &#39;CMakeOutput&#39; string.
+   * </ul>
+   *
+   * @param CMakeOutput The captured output from CMake.
+   * @return true if the provided 'CMakeOutput' contains a known error. false otherwise.
+   */
+  @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+  private boolean outputContainsKnownCMakeErrors(String CMakeOutput) {
+    // Check if the error thrown is due to the wrong compiler
+    if (CMakeOutput.contains("The CMAKE_C_COMPILER is set to a C++ compiler")) {
+      // If so, print an appropriate error message
+      if (targetConfig.compiler != null) {
+        errorReporter.reportError(
+            "A C++ compiler was requested in the compiler target property."
+                + " Use the CCpp or the Cpp target instead.");
+      } else {
+        errorReporter.reportError(
+            "\"A C++ compiler was detected."
+                + " The C target works best with a C compiler."
+                + " Use the CCpp or the Cpp target instead.\"");
+      }
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * Return a command to compile the specified C file using a native compiler (generally gcc unless
+   * overridden by the user). This produces a C specific compile command.
+   *
+   * @param fileToCompile The C filename without the .c extension.
+   * @param noBinary If true, the compiler will create a .o output instead of a binary. If false,
+   *     the compile command will produce a binary.
+   */
+  public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
+    String cFilename = getTargetFileName(fileToCompile, cppMode, targetConfig);
+
+    Path relativeSrcPath =
+        fileConfig
+            .getOutPath()
+            .relativize(fileConfig.getSrcGenPath().resolve(Paths.get(cFilename)));
+    Path relativeBinPath =
+        fileConfig.getOutPath().relativize(fileConfig.binPath.resolve(Paths.get(fileToCompile)));
+
+    // NOTE: we assume that any C compiler takes Unix paths as arguments.
+    String relSrcPathString = FileUtil.toUnixString(relativeSrcPath);
+    String relBinPathString = FileUtil.toUnixString(relativeBinPath);
+
+    // If there is no main reactor, then generate a .o file not an executable.
+    if (noBinary) {
+      relBinPathString += ".o";
+    }
 
-        // Add compile definitions
-        targetConfig.compileDefinitions.forEach((key,value) -> compileArgs.add("-D"+key+"="+value));
+    ArrayList<String> compileArgs = new ArrayList<>();
+    compileArgs.add(relSrcPathString);
+    for (String file : targetConfig.compileAdditionalSources) {
+      var relativePath =
+          fileConfig.getOutPath().relativize(fileConfig.getSrcGenPath().resolve(Paths.get(file)));
+      compileArgs.add(FileUtil.toUnixString(relativePath));
+    }
+    compileArgs.addAll(targetConfig.compileLibraries);
 
-        // Finally, add the compiler flags in target parameters (if any)
-        compileArgs.addAll(targetConfig.compilerFlags);
+    // Add compile definitions
+    targetConfig.compileDefinitions.forEach(
+        (key, value) -> compileArgs.add("-D" + key + "=" + value));
 
-        // Only set the output file name if it hasn't already been set
-        // using a target property or Args line flag.
-        if (!compileArgs.contains("-o")) {
-            compileArgs.add("-o");
-            compileArgs.add(relBinPathString);
-        }
+    // Finally, add the compiler flags in target parameters (if any)
+    compileArgs.addAll(targetConfig.compilerFlags);
 
-        // If there is no main reactor, then use the -c flag to prevent linking from occurring.
-        // FIXME: we could add a {@code -c} flag to {@code lfc} to make this explicit in stand-alone mode.
-        //  Then again, I think this only makes sense when we can do linking.
-        if (noBinary) {
-            compileArgs.add("-c"); // FIXME: revisit
-        }
+    // Only set the output file name if it hasn't already been set
+    // using a target property or Args line flag.
+    if (!compileArgs.contains("-o")) {
+      compileArgs.add("-o");
+      compileArgs.add(relBinPathString);
+    }
 
-        LFCommand command = commandFactory.createCommand(targetConfig.compiler, compileArgs, fileConfig.getOutPath());
-        if (command == null) {
-            errorReporter.reportError(
-                "The C/CCpp target requires GCC >= 7 to compile the generated code. " +
-                    "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
-        }
-        return command;
+    // If there is no main reactor, then use the -c flag to prevent linking from occurring.
+    // FIXME: we could add a {@code -c} flag to {@code lfc} to make this explicit in stand-alone
+    // mode.
+    //  Then again, I think this only makes sense when we can do linking.
+    if (noBinary) {
+      compileArgs.add("-c"); // FIXME: revisit
     }
 
-    /**
-     * Produces the filename including the target-specific extension
-     *
-     * @param fileName The base name of the file without any extensions
-     * @param cppMode  Indicate whether the compiler is in C++ mode
-     * In C++ mode, the compiler produces .cpp files instead
-     * of .c files and uses a C++ compiler to compiler the code.
-     */
-    static String getTargetFileName(String fileName, boolean cppMode, TargetConfig targetConfig) {
-        if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
-            return fileName + ".ino";
-        }
-        if (cppMode) {
-            // If the C++ mode is enabled, use a .cpp extension
-            return fileName + ".cpp";
-        }
-        return fileName + ".c";
+    LFCommand command =
+        commandFactory.createCommand(targetConfig.compiler, compileArgs, fileConfig.getOutPath());
+    if (command == null) {
+      errorReporter.reportError(
+          "The C/CCpp target requires GCC >= 7 to compile the generated code. "
+              + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
+    }
+    return command;
+  }
+
+  /**
+   * Produces the filename including the target-specific extension
+   *
+   * @param fileName The base name of the file without any extensions
+   * @param cppMode Indicate whether the compiler is in C++ mode In C++ mode, the compiler produces
+   *     .cpp files instead of .c files and uses a C++ compiler to compiler the code.
+   */
+  static String getTargetFileName(String fileName, boolean cppMode, TargetConfig targetConfig) {
+    if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
+      return fileName + ".ino";
+    }
+    if (cppMode) {
+      // If the C++ mode is enabled, use a .cpp extension
+      return fileName + ".cpp";
     }
+    return fileName + ".c";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CConstructorGenerator.java b/org.lflang/src/org/lflang/generator/c/CConstructorGenerator.java
index 41731106c3..529e37a975 100644
--- a/org.lflang/src/org/lflang/generator/c/CConstructorGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CConstructorGenerator.java
@@ -1,36 +1,30 @@
 package org.lflang.generator.c;
 
 import org.lflang.generator.CodeBuilder;
-import org.lflang.lf.Reactor;
 
-/**
- * Generates C constructor code for a reactor.
- *
- */
+/** Generates C constructor code for a reactor. */
 public class CConstructorGenerator {
-    /**
-     * Generate a constructor for the specified reactor in the specified federate.
-     * @param reactor The parsed reactor data structure.
-     * @param constructorCode Lines of code previously generated that need to
-     *  go into the constructor.
-     */
-    public static String generateConstructor(
-        TypeParameterizedReactor tpr,
-        String constructorCode
-    ) {
-        var structType = CUtil.selfType(tpr);
-        var code = new CodeBuilder();
-        code.pr(structType+"* new_"+CUtil.getName(tpr)+"() {");
-        code.indent();
-        code.pr(structType+"* self = ("+structType+"*)_lf_new_reactor(sizeof("+structType+"));");
-        code.pr(constructorCode);
-        code.pr("return self;");
-        code.unindent();
-        code.pr("}");
-        return code.toString();
-    }
+  /**
+   * Generate a constructor for the specified reactor in the specified federate.
+   *
+   * @param reactor The parsed reactor data structure.
+   * @param constructorCode Lines of code previously generated that need to go into the constructor.
+   */
+  public static String generateConstructor(TypeParameterizedReactor tpr, String constructorCode) {
+    var structType = CUtil.selfType(tpr);
+    var code = new CodeBuilder();
+    code.pr(structType + "* new_" + CUtil.getName(tpr) + "() {");
+    code.indent();
+    code.pr(
+        structType + "* self = (" + structType + "*)_lf_new_reactor(sizeof(" + structType + "));");
+    code.pr(constructorCode);
+    code.pr("return self;");
+    code.unindent();
+    code.pr("}");
+    return code.toString();
+  }
 
-    public static String generateConstructorPrototype(TypeParameterizedReactor tpr) {
-        return CUtil.selfType(tpr)+"* new_"+CUtil.getName(tpr)+"();";
-    }
+  public static String generateConstructorPrototype(TypeParameterizedReactor tpr) {
+    return CUtil.selfType(tpr) + "* new_" + CUtil.getName(tpr) + "();";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CCoreFilesUtils.java b/org.lflang/src/org/lflang/generator/c/CCoreFilesUtils.java
index 46503d87cc..2d83a105da 100644
--- a/org.lflang/src/org/lflang/generator/c/CCoreFilesUtils.java
+++ b/org.lflang/src/org/lflang/generator/c/CCoreFilesUtils.java
@@ -1,32 +1,28 @@
 package org.lflang.generator.c;
+
 import java.util.List;
 
 /**
- * Generates the list of files to be included in the
- * core library for each reactor given conditions listed
- * as arguments of each function.
+ * Generates the list of files to be included in the core library for each reactor given conditions
+ * listed as arguments of each function.
  *
  * @author Hou Seng Wong
  */
 public class CCoreFilesUtils {
 
-    public static List<String> getCTargetSrc() {
-        return List.of(
-            "lib/schedule.c"
-        );
-    }
+  public static List<String> getCTargetSrc() {
+    return List.of("lib/schedule.c");
+  }
 
-    public static List<String> getCTargetHeader() {
-        return List.of(
-            "include/api/api.h"
-        );
-    }
+  public static List<String> getCTargetHeader() {
+    return List.of("include/api/api.h");
+  }
 
-    public static String getCTargetSetHeader() {
-        return "include/api/set.h";
-    }
+  public static String getCTargetSetHeader() {
+    return "include/api/set.h";
+  }
 
-    public static String getCTargetSetUndefHeader() {
-        return "include/api/set_undef.h";
-    }
+  public static String getCTargetSetUndefHeader() {
+    return "include/api/set_undef.h";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CDelayBodyGenerator.java b/org.lflang/src/org/lflang/generator/c/CDelayBodyGenerator.java
index f5aa244e60..ec75412b42 100644
--- a/org.lflang/src/org/lflang/generator/c/CDelayBodyGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CDelayBodyGenerator.java
@@ -9,54 +9,51 @@
 
 public class CDelayBodyGenerator implements DelayBodyGenerator {
 
-    protected CTypes types;
-
-    public CDelayBodyGenerator(CTypes types) {
-        this.types = types;
-    }
-
-    /**
-     * Generate code for the body of a reaction that takes an input and
-     * schedules an action with the value of that input.
-     * @param action The action to schedule
-     * @param port The port to read from
-     */
-    @Override
-    public String generateDelayBody(Action action, VarRef port) {
-        var ref = ASTUtils.generateVarRef(port);
-        return CReactionGenerator.generateDelayBody(
-            ref,
-            action.getName(),
-            CUtil.isTokenType(getInferredType(action), types)
-        );
-    }
-
-    /**
-     * Generate code for the body of a reaction that is triggered by the
-     * given action and writes its value to the given port. This realizes
-     * the receiving end of a logical delay specified with the 'after'
-     * keyword.
-     * @param action The action that triggers the reaction
-     * @param port The port to write to.
-     */
-    @Override
-    public String generateForwardBody(Action action, VarRef port) {
-        var outputName = ASTUtils.generateVarRef(port);
-        return CReactionGenerator.generateForwardBody(
-            outputName,
-            types.getTargetType(action),
-            action.getName(),
-            CUtil.isTokenType(getInferredType(action), types)
-        );
-    }
-
-    @Override
-    public String generateDelayGeneric() {
-        throw new UnsupportedOperationException("TODO: auto-generated method stub");
-    }
-
-    @Override
-    public boolean generateAfterDelaysWithVariableWidth() {
-        return true;
-    }
+  protected CTypes types;
+
+  public CDelayBodyGenerator(CTypes types) {
+    this.types = types;
+  }
+
+  /**
+   * Generate code for the body of a reaction that takes an input and schedules an action with the
+   * value of that input.
+   *
+   * @param action The action to schedule
+   * @param port The port to read from
+   */
+  @Override
+  public String generateDelayBody(Action action, VarRef port) {
+    var ref = ASTUtils.generateVarRef(port);
+    return CReactionGenerator.generateDelayBody(
+        ref, action.getName(), CUtil.isTokenType(getInferredType(action), types));
+  }
+
+  /**
+   * Generate code for the body of a reaction that is triggered by the given action and writes its
+   * value to the given port. This realizes the receiving end of a logical delay specified with the
+   * 'after' keyword.
+   *
+   * @param action The action that triggers the reaction
+   * @param port The port to write to.
+   */
+  @Override
+  public String generateForwardBody(Action action, VarRef port) {
+    var outputName = ASTUtils.generateVarRef(port);
+    return CReactionGenerator.generateForwardBody(
+        outputName,
+        types.getTargetType(action),
+        action.getName(),
+        CUtil.isTokenType(getInferredType(action), types));
+  }
+
+  @Override
+  public String generateDelayGeneric() {
+    throw new UnsupportedOperationException("TODO: auto-generated method stub");
+  }
+
+  @Override
+  public boolean generateAfterDelaysWithVariableWidth() {
+    return true;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CDockerGenerator.java b/org.lflang/src/org/lflang/generator/c/CDockerGenerator.java
index ae9058dcbb..f52e23a949 100644
--- a/org.lflang/src/org/lflang/generator/c/CDockerGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CDockerGenerator.java
@@ -1,9 +1,7 @@
 package org.lflang.generator.c;
 
 import java.util.stream.Collectors;
-
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
-
 import org.lflang.Target;
 import org.lflang.generator.DockerGenerator;
 import org.lflang.generator.LFGeneratorContext;
@@ -15,62 +13,66 @@
  * @author Hou Seng Wong
  */
 public class CDockerGenerator extends DockerGenerator {
-    private static final String DEFAULT_BASE_IMAGE = "alpine:latest";
+  private static final String DEFAULT_BASE_IMAGE = "alpine:latest";
 
-    /**
-     * The constructor for the base docker file generation class.
-     *
-     * @param context The context of the code generator.
-     */
-    public CDockerGenerator(LFGeneratorContext context) {
-        super(context);
-    }
+  /**
+   * The constructor for the base docker file generation class.
+   *
+   * @param context The context of the code generator.
+   */
+  public CDockerGenerator(LFGeneratorContext context) {
+    super(context);
+  }
 
-
-    /**
-     * Generate the contents of the docker file.
-     */
-    @Override
-    protected String generateDockerFileContent() {
-        var lfModuleName = context.getFileConfig().name;
-        var config = context.getTargetConfig();
-        var compileCommand = IterableExtensions.isNullOrEmpty(config.buildCommands) ?
-                                 generateDefaultCompileCommand() :
-                                 StringUtil.joinObjects(config.buildCommands, " ");
-        var compiler = config.target == Target.CCPP ? "g++" : "gcc";
-        var baseImage = DEFAULT_BASE_IMAGE;
-        if (config.dockerOptions != null && config.dockerOptions.from != null) {
-            baseImage = config.dockerOptions.from;
-        }
-        return String.join("\n",
-            "# For instructions, see: https://www.lf-lang.org/docs/handbook/containerized-execution",
-            "FROM "+baseImage+" AS builder",
-            "WORKDIR /lingua-franca/"+lfModuleName,
-            "RUN set -ex && apk add --no-cache "+compiler+" musl-dev cmake make",
-            "COPY . src-gen",
-            compileCommand,
-            "",
-            "FROM "+baseImage,
-            "WORKDIR /lingua-franca",
-            "RUN mkdir bin",
-            "COPY --from=builder /lingua-franca/"+lfModuleName+"/bin/"+lfModuleName+" ./bin/"+lfModuleName,
-            "",
-            "# Use ENTRYPOINT not CMD so that command-line arguments go through",
-            "ENTRYPOINT [\"./bin/"+lfModuleName+"\"]",
-            ""
-        );
+  /** Generate the contents of the docker file. */
+  @Override
+  protected String generateDockerFileContent() {
+    var lfModuleName = context.getFileConfig().name;
+    var config = context.getTargetConfig();
+    var compileCommand =
+        IterableExtensions.isNullOrEmpty(config.buildCommands)
+            ? generateDefaultCompileCommand()
+            : StringUtil.joinObjects(config.buildCommands, " ");
+    var compiler = config.target == Target.CCPP ? "g++" : "gcc";
+    var baseImage = DEFAULT_BASE_IMAGE;
+    if (config.dockerOptions != null && config.dockerOptions.from != null) {
+      baseImage = config.dockerOptions.from;
     }
+    return String.join(
+        "\n",
+        "# For instructions, see: https://www.lf-lang.org/docs/handbook/containerized-execution",
+        "FROM " + baseImage + " AS builder",
+        "WORKDIR /lingua-franca/" + lfModuleName,
+        "RUN set -ex && apk add --no-cache " + compiler + " musl-dev cmake make",
+        "COPY . src-gen",
+        compileCommand,
+        "",
+        "FROM " + baseImage,
+        "WORKDIR /lingua-franca",
+        "RUN mkdir bin",
+        "COPY --from=builder /lingua-franca/"
+            + lfModuleName
+            + "/bin/"
+            + lfModuleName
+            + " ./bin/"
+            + lfModuleName,
+        "",
+        "# Use ENTRYPOINT not CMD so that command-line arguments go through",
+        "ENTRYPOINT [\"./bin/" + lfModuleName + "\"]",
+        "");
+  }
 
-    /** Return the default compile command for the C docker container. */
-    protected String generateDefaultCompileCommand() {
-        return String.join("\n",
-            "RUN set -ex && \\",
-            "mkdir bin && \\",
-            "cmake " + CCompiler.cmakeCompileDefinitions(context.getTargetConfig())
+  /** Return the default compile command for the C docker container. */
+  protected String generateDefaultCompileCommand() {
+    return String.join(
+        "\n",
+        "RUN set -ex && \\",
+        "mkdir bin && \\",
+        "cmake "
+            + CCompiler.cmakeCompileDefinitions(context.getTargetConfig())
                 .collect(Collectors.joining(" "))
-                + " -S src-gen -B bin && \\",
-            "cd bin && \\",
-            "make all"
-        );
-    }
+            + " -S src-gen -B bin && \\",
+        "cd bin && \\",
+        "make all");
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CFileConfig.java b/org.lflang/src/org/lflang/generator/c/CFileConfig.java
index 362b8645b5..db9447a833 100644
--- a/org.lflang/src/org/lflang/generator/c/CFileConfig.java
+++ b/org.lflang/src/org/lflang/generator/c/CFileConfig.java
@@ -2,24 +2,29 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.lflang.FileConfig;
 
 public class CFileConfig extends FileConfig {
-    private final Path includePath;
-    public CFileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchicalBin) throws IOException {
-        super(resource, srcGenBasePath, useHierarchicalBin);
-        var includeDir = getOutPath().resolve("include");
-        includePath = !useHierarchicalBin ? includeDir : includeDir.resolve(getOutPath().relativize(srcPath)).resolve(srcFile.getFileName().toString().split("\\.")[0]);
-    }
+  private final Path includePath;
+
+  public CFileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchicalBin)
+      throws IOException {
+    super(resource, srcGenBasePath, useHierarchicalBin);
+    var includeDir = getOutPath().resolve("include");
+    includePath =
+        !useHierarchicalBin
+            ? includeDir
+            : includeDir
+                .resolve(getOutPath().relativize(srcPath))
+                .resolve(srcFile.getFileName().toString().split("\\.")[0]);
+  }
 
-    public Path getIncludePath() {
-        return includePath;
-    }
+  public Path getIncludePath() {
+    return includePath;
+  }
 
-    public String getRuntimeIncludePath() {
-        return "/lib/c/reactor-c/include";
-    }
+  public String getRuntimeIncludePath() {
+    return "/lib/c/reactor-c/include";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
index fce667067c..e8606eee9a 100644
--- a/org.lflang/src/org/lflang/generator/c/CGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -1,26 +1,26 @@
 /*************
-Copyright (c) 2019-2021, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019-2021, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator.c;
 
@@ -34,6 +34,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import static org.lflang.ast.ASTUtils.toText;
 import static org.lflang.util.StringUtil.addDoubleQuotes;
 
+import com.google.common.collect.Iterables;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -46,34 +47,27 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
-
-import org.lflang.ast.ASTUtils;
-import org.lflang.generator.CodeMap;
-import org.lflang.generator.DockerComposeGenerator;
 import org.lflang.FileConfig;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.Platform;
-
-import org.lflang.federated.extensions.CExtensionUtils;
-
+import org.lflang.ast.ASTUtils;
 import org.lflang.ast.DelayedConnectionTransformation;
-
+import org.lflang.federated.extensions.CExtensionUtils;
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.CodeBuilder;
+import org.lflang.generator.CodeMap;
+import org.lflang.generator.DelayBodyGenerator;
+import org.lflang.generator.DockerComposeGenerator;
 import org.lflang.generator.DockerGenerator;
 import org.lflang.generator.GeneratorBase;
 import org.lflang.generator.GeneratorResult;
 import org.lflang.generator.GeneratorUtils;
-
-import org.lflang.generator.DelayBodyGenerator;
-
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.LFResource;
 import org.lflang.generator.ParameterInstance;
@@ -99,165 +93,156 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.util.ArduinoUtil;
 import org.lflang.util.FileUtil;
 
-import com.google.common.collect.Iterables;
-
 /**
- * Generator for C target. This class generates C code defining each reactor
- * class given in the input .lf file and imported .lf files. The generated code
- * has the following components:
+ * Generator for C target. This class generates C code defining each reactor class given in the
+ * input .lf file and imported .lf files. The generated code has the following components:
+ *
  * <ul>
- * <li>A typedef for inputs, outputs, and actions of each reactor class. These
- * define the types of the variables that reactions use to access inputs and
- * action values and to set output values.</li>
- * <li>A typedef for a &quot;self&quot; struct for each reactor class. One instance of this
- * struct will be created for each reactor instance. See below for details.</li>
- * <li>A function definition for each reaction in each reactor class. These
- * functions take an instance of the self struct as an argument.</li>
- * <li>A constructor function for each reactor class. This is used to create
- * a new instance of the reactor.
- * After these, the main generated function is <code>_lf_initialize_trigger_objects()</code>.
- * This function creates the instances of reactors (using their constructors)
- * and makes connections between them.
- * A few other smaller functions are also generated.<h2 id="self-struct">Self Struct</h2>
- * The &quot;self&quot; struct has fields for each of the following:</li>
- * <li>parameter: the field name and type match the parameter.</li>
- * <li>state: the field name and type match the state.</li>
- * <li>action: the field name prepends the action name with &quot;<em>lf</em>&quot;.
- * A second field for the action is also created to house the trigger_t object.
- * That second field prepends the action name with &quot;_lf__&quot;.</li>
- * <li>output: the field name prepends the output name with &quot;<em>lf</em>&quot;.</li>
- * <li>input:  the field name prepends the output name with &quot;<em>lf</em>&quot;.
- * A second field for the input is also created to house the trigger_t object.
- * That second field prepends the input name with &quot;_lf__&quot;.
- * If, in addition, the reactor contains other reactors and reacts to their outputs,
- * then there will be a struct within the self struct for each such contained reactor.
- * The name of that self struct will be the name of the contained reactor prepended with &quot;<em>lf</em>&quot;.
- * That inside struct will contain pointers the outputs of the contained reactors
- * that are read together with pointers to booleans indicating whether those outputs are present.
- * If, in addition, the reactor has a reaction to shutdown, then there will be a pointer to
- * trigger_t object (see reactor.h) for the shutdown event and an action struct named
- * _lf_shutdown on the self struct.<h2 id="reaction-functions">Reaction Functions</h2>
- * For each reaction in a reactor class, this generator will produce a C function
- * that expects a pointer to an instance of the &quot;self&quot; struct as an argument.
- * This function will contain verbatim the C code specified in the reaction, but
- * before that C code, the generator inserts a few lines of code that extract from the
- * self struct the variables that that code has declared it will use. For example, if
- * the reaction declares that it is triggered by or uses an input named &quot;x&quot; of type
- * int, the function will contain a line like this:<pre><code>  r_x_t* x = <span class="hljs-keyword">self</span>-&gt;_lf_x;
- * </code></pre>where <code>r</code> is the full name of the reactor class and the struct type <code>r_x_t</code>
- * has fields <code>is_present</code> and <code>value</code>, where the type of <code>value</code> matches the port type.
- * If the programmer fails to declare that it uses x, then the absence of the
- * above code will trigger a compile error when the verbatim code attempts to read <code>x</code>.<h2 id="constructor">Constructor</h2>
- * For each reactor class, this generator will create a constructor function named
- * <code>new_r</code>, where <code>r</code> is the reactor class name. This function will malloc and return
- * a pointer to an instance of the &quot;self&quot; struct.  This struct initially represents
- * an unconnected reactor. To establish connections between reactors, additional
- * information needs to be inserted (see below). The self struct is made visible
- * to the body of a reaction as a variable named &quot;self&quot;.  The self struct contains the
- * following:</li>
- * <li>Parameters: For each parameter <code>p</code> of the reactor, there will be a field <code>p</code>
- * with the type and value of the parameter. So C code in the body of a reaction
- * can access parameter values as <code>self-&gt;p</code>.</li>
- * <li>State variables: For each state variable <code>s</code> of the reactor, there will be a field <code>s</code>
- * with the type and value of the state variable. So C code in the body of a reaction
- * can access state variables as <code>self-&gt;s</code>.
- * The self struct also contains various fields that the user is not intended to
- * use. The names of these fields begin with at least two underscores. They are:</li>
- * <li>Outputs: For each output named <code>out</code>, there will be a field <code>_lf_out</code> that is
- * a struct containing a value field whose type matches that of the output.
- * The output value is stored here. That struct also has a field <code>is_present</code>
- * that is a boolean indicating whether the output has been set.
- * This field is reset to false at the start of every time
- * step. There is also a field <code>num_destinations</code> whose value matches the
- * number of downstream reactors that use this variable. This field must be
- * set when connections are made or changed. It is used to determine for
- * a mutable input destination whether a copy needs to be made.</li>
- * <li>Inputs: For each input named <code>in</code> of type T, there is a field named <code>_lf_in</code>
- * that is a pointer struct with a value field of type T. The struct pointed
- * to also has an <code>is_present</code> field of type bool that indicates whether the
- * input is present.</li>
- * <li>Outputs of contained reactors: If a reactor reacts to outputs of a
- * contained reactor <code>r</code>, then the self struct will contain a nested struct
- * named <code>_lf_r</code> that has fields pointing to those outputs. For example,
- * if <code>r</code> has an output <code>out</code> of type T, then there will be field in <code>_lf_r</code>
- * named <code>out</code> that points to a struct containing a value field
- * of type T and a field named <code>is_present</code> of type bool.</li>
- * <li>Inputs of contained reactors: If a reactor sends to inputs of a
- * contained reactor <code>r</code>, then the self struct will contain a nested struct
- * named <code>_lf_r</code> that has fields for storing the values provided to those
- * inputs. For example, if R has an input <code>in</code> of type T, then there will
- * be field in _lf_R named <code>in</code> that is a struct with a value field
- * of type T and a field named <code>is_present</code> of type bool.</li>
- * <li>Actions: If the reactor has an action a (logical or physical), then there
- * will be a field in the self struct named <code>_lf_a</code> and another named <code>_lf__a</code>.
- * The type of the first is specific to the action and contains a <code>value</code>
- * field with the type and value of the action (if it has a value). That
- * struct also has a <code>has_value</code> field, an <code>is_present</code> field, and a
- * <code>token</code> field (which is NULL if the action carries no value).
- * The <code>_lf__a</code> field is of type trigger_t.
- * That struct contains various things, including an array of reactions
- * sensitive to this trigger and a lf_token_t struct containing the value of
- * the action, if it has a value.  See reactor.h in the C library for
- * details.</li>
- * <li>Reactions: Each reaction will have several fields in the self struct.
- * Each of these has a name that begins with <code>_lf__reaction_i</code>, where i is
- * the number of the reaction, starting with 0. The fields are:<ul>
- * <li>_lf__reaction_i: The struct that is put onto the reaction queue to
- * execute the reaction (see reactor.h in the C library).</li>
- * <li>Timers: For each timer t, there is are two fields in the self struct:<ul>
- * <li>_lf__t: The trigger_t struct for this timer (see reactor.h).</li>
- * <li>_lf__t_reactions: An array of reactions (pointers to the
- * reaction_t structs on this self struct) sensitive to this timer.</li>
- * </ul>
- * </li>
- * </ul>
- * </li>
- * <li>Triggers: For each Timer, Action, Input, and Output of a contained
- * reactor that triggers reactions, there will be a trigger_t struct
- * on the self struct with name <code>_lf__t</code>, where t is the name of the trigger.<h2 id="connections-between-reactors">Connections Between Reactors</h2>
- * Establishing connections between reactors involves two steps.
- * First, each destination (e.g. an input port) must have pointers to
- * the source (the output port). As explained above, for an input named
- * <code>in</code>, the field <code>_lf_in-&gt;value</code> is a pointer to the output data being read.
- * In addition, <code>_lf_in-&gt;is_present</code> is a pointer to the corresponding
- * <code>out-&gt;is_present</code> field of the output reactor&#39;s self struct.
- * In addition, the <code>reaction_i</code> struct on the self struct has a <code>triggers</code>
- * field that records all the trigger_t structs for ports and actions
- * that are triggered by the i-th reaction. The triggers field is
- * an array of arrays of pointers to trigger_t structs.
- * The length of the outer array is the number of output channels
- * (single ports plus multiport widths) that the reaction effects
- * plus the number of input port channels of contained
- * reactors that it effects. Each inner array has a length equal to the
- * number of final destinations of that output channel or input channel.
- * The reaction_i struct has an array triggered_sizes that indicates
- * the sizes of these inner arrays. The num_outputs field of the
- * reaction_i struct gives the length of the triggered_sizes and
- * (outer) triggers arrays. The num_outputs field is equal to the
- * total number of single ports and multiport channels that the reaction
- * writes to.<h2 id="runtime-tables">Runtime Tables</h2>
- * This generator creates an populates the following tables used at run time.
- * These tables may have to be resized and adjusted when mutations occur.</li>
- * <li>_lf_is_present_fields: An array of pointers to booleans indicating whether an
- * event is present. The _lf_start_time_step() function in reactor_common.c uses
- * this to mark every event absent at the start of a time step. The size of this
- * table is contained in the variable _lf_is_present_fields_size.<ul>
- * <li>This table is accompanied by another list, _lf_is_present_fields_abbreviated,
- * which only contains the is_present fields that have been set to true in the
- * current tag. This list can allow a performance improvement if most ports are
- * seldom present because only fields that have been set to true need to be
- * reset to false.</li>
- * </ul>
- * </li>
- * <li>_lf_shutdown_triggers: An array of pointers to trigger_t structs for shutdown
- * reactions. The length of this table is in the _lf_shutdown_triggers_size
- * variable.</li>
- * <li>_lf_timer_triggers: An array of pointers to trigger_t structs for timers that
- * need to be started when the program runs. The length of this table is in the
- * _lf_timer_triggers_size variable.</li>
- * <li>_lf_action_table: For a federated execution, each federate will have this table
- * that maps port IDs to the corresponding action struct, which can be cast to
- * action_base_t.</li>
+ *   <li>A typedef for inputs, outputs, and actions of each reactor class. These define the types of
+ *       the variables that reactions use to access inputs and action values and to set output
+ *       values.
+ *   <li>A typedef for a &quot;self&quot; struct for each reactor class. One instance of this struct
+ *       will be created for each reactor instance. See below for details.
+ *   <li>A function definition for each reaction in each reactor class. These functions take an
+ *       instance of the self struct as an argument.
+ *   <li>A constructor function for each reactor class. This is used to create a new instance of the
+ *       reactor. After these, the main generated function is <code>_lf_initialize_trigger_objects()
+ *       </code>. This function creates the instances of reactors (using their constructors) and
+ *       makes connections between them. A few other smaller functions are also generated.
+ *       <h2 id="self-struct">Self Struct</h2>
+ *       The &quot;self&quot; struct has fields for each of the following:
+ *   <li>parameter: the field name and type match the parameter.
+ *   <li>state: the field name and type match the state.
+ *   <li>action: the field name prepends the action name with &quot;<em>lf</em>&quot;. A second
+ *       field for the action is also created to house the trigger_t object. That second field
+ *       prepends the action name with &quot;_lf__&quot;.
+ *   <li>output: the field name prepends the output name with &quot;<em>lf</em>&quot;.
+ *   <li>input: the field name prepends the output name with &quot;<em>lf</em>&quot;. A second field
+ *       for the input is also created to house the trigger_t object. That second field prepends the
+ *       input name with &quot;_lf__&quot;. If, in addition, the reactor contains other reactors and
+ *       reacts to their outputs, then there will be a struct within the self struct for each such
+ *       contained reactor. The name of that self struct will be the name of the contained reactor
+ *       prepended with &quot;<em>lf</em>&quot;. That inside struct will contain pointers the
+ *       outputs of the contained reactors that are read together with pointers to booleans
+ *       indicating whether those outputs are present. If, in addition, the reactor has a reaction
+ *       to shutdown, then there will be a pointer to trigger_t object (see reactor.h) for the
+ *       shutdown event and an action struct named _lf_shutdown on the self struct.
+ *       <h2 id="reaction-functions">Reaction Functions</h2>
+ *       For each reaction in a reactor class, this generator will produce a C function that expects
+ *       a pointer to an instance of the &quot;self&quot; struct as an argument. This function will
+ *       contain verbatim the C code specified in the reaction, but before that C code, the
+ *       generator inserts a few lines of code that extract from the self struct the variables that
+ *       that code has declared it will use. For example, if the reaction declares that it is
+ *       triggered by or uses an input named &quot;x&quot; of type int, the function will contain a
+ *       line like this:
+ *       <pre><code>  r_x_t* x = <span class="hljs-keyword">self</span>-&gt;_lf_x;
+ * </code></pre>
+ *       where <code>r</code> is the full name of the reactor class and the struct type <code>r_x_t
+ *       </code> has fields <code>is_present</code> and <code>value</code>, where the type of <code>
+ *       value</code> matches the port type. If the programmer fails to declare that it uses x, then
+ *       the absence of the above code will trigger a compile error when the verbatim code attempts
+ *       to read <code>x</code>.
+ *       <h2 id="constructor">Constructor</h2>
+ *       For each reactor class, this generator will create a constructor function named <code>new_r
+ *       </code>, where <code>r</code> is the reactor class name. This function will malloc and
+ *       return a pointer to an instance of the &quot;self&quot; struct. This struct initially
+ *       represents an unconnected reactor. To establish connections between reactors, additional
+ *       information needs to be inserted (see below). The self struct is made visible to the body
+ *       of a reaction as a variable named &quot;self&quot;. The self struct contains the following:
+ *   <li>Parameters: For each parameter <code>p</code> of the reactor, there will be a field <code>p
+ *       </code> with the type and value of the parameter. So C code in the body of a reaction can
+ *       access parameter values as <code>self-&gt;p</code>.
+ *   <li>State variables: For each state variable <code>s</code> of the reactor, there will be a
+ *       field <code>s</code> with the type and value of the state variable. So C code in the body
+ *       of a reaction can access state variables as <code>self-&gt;s</code>. The self struct also
+ *       contains various fields that the user is not intended to use. The names of these fields
+ *       begin with at least two underscores. They are:
+ *   <li>Outputs: For each output named <code>out</code>, there will be a field <code>_lf_out</code>
+ *       that is a struct containing a value field whose type matches that of the output. The output
+ *       value is stored here. That struct also has a field <code>is_present</code> that is a
+ *       boolean indicating whether the output has been set. This field is reset to false at the
+ *       start of every time step. There is also a field <code>num_destinations</code> whose value
+ *       matches the number of downstream reactors that use this variable. This field must be set
+ *       when connections are made or changed. It is used to determine for a mutable input
+ *       destination whether a copy needs to be made.
+ *   <li>Inputs: For each input named <code>in</code> of type T, there is a field named <code>_lf_in
+ *       </code> that is a pointer struct with a value field of type T. The struct pointed to also
+ *       has an <code>is_present</code> field of type bool that indicates whether the input is
+ *       present.
+ *   <li>Outputs of contained reactors: If a reactor reacts to outputs of a contained reactor <code>
+ *       r</code>, then the self struct will contain a nested struct named <code>_lf_r</code> that
+ *       has fields pointing to those outputs. For example, if <code>r</code> has an output <code>
+ *       out</code> of type T, then there will be field in <code>_lf_r</code> named <code>out</code>
+ *       that points to a struct containing a value field of type T and a field named <code>
+ *       is_present</code> of type bool.
+ *   <li>Inputs of contained reactors: If a reactor sends to inputs of a contained reactor <code>r
+ *       </code>, then the self struct will contain a nested struct named <code>_lf_r</code> that
+ *       has fields for storing the values provided to those inputs. For example, if R has an input
+ *       <code>in</code> of type T, then there will be field in _lf_R named <code>in</code> that is
+ *       a struct with a value field of type T and a field named <code>is_present</code> of type
+ *       bool.
+ *   <li>Actions: If the reactor has an action a (logical or physical), then there will be a field
+ *       in the self struct named <code>_lf_a</code> and another named <code>_lf__a</code>. The type
+ *       of the first is specific to the action and contains a <code>value</code> field with the
+ *       type and value of the action (if it has a value). That struct also has a <code>has_value
+ *       </code> field, an <code>is_present</code> field, and a <code>token</code> field (which is
+ *       NULL if the action carries no value). The <code>_lf__a</code> field is of type trigger_t.
+ *       That struct contains various things, including an array of reactions sensitive to this
+ *       trigger and a lf_token_t struct containing the value of the action, if it has a value. See
+ *       reactor.h in the C library for details.
+ *   <li>Reactions: Each reaction will have several fields in the self struct. Each of these has a
+ *       name that begins with <code>_lf__reaction_i</code>, where i is the number of the reaction,
+ *       starting with 0. The fields are:
+ *       <ul>
+ *         <li>_lf__reaction_i: The struct that is put onto the reaction queue to execute the
+ *             reaction (see reactor.h in the C library).
+ *         <li>Timers: For each timer t, there is are two fields in the self struct:
+ *             <ul>
+ *               <li>_lf__t: The trigger_t struct for this timer (see reactor.h).
+ *               <li>_lf__t_reactions: An array of reactions (pointers to the reaction_t structs on
+ *                   this self struct) sensitive to this timer.
+ *             </ul>
+ *       </ul>
+ *   <li>Triggers: For each Timer, Action, Input, and Output of a contained reactor that triggers
+ *       reactions, there will be a trigger_t struct on the self struct with name <code>_lf__t
+ *       </code>, where t is the name of the trigger.
+ *       <h2 id="connections-between-reactors">Connections Between Reactors</h2>
+ *       Establishing connections between reactors involves two steps. First, each destination (e.g.
+ *       an input port) must have pointers to the source (the output port). As explained above, for
+ *       an input named <code>in</code>, the field <code>_lf_in-&gt;value</code> is a pointer to the
+ *       output data being read. In addition, <code>_lf_in-&gt;is_present</code> is a pointer to the
+ *       corresponding <code>out-&gt;is_present</code> field of the output reactor&#39;s self
+ *       struct. In addition, the <code>reaction_i</code> struct on the self struct has a <code>
+ *       triggers</code> field that records all the trigger_t structs for ports and actions that are
+ *       triggered by the i-th reaction. The triggers field is an array of arrays of pointers to
+ *       trigger_t structs. The length of the outer array is the number of output channels (single
+ *       ports plus multiport widths) that the reaction effects plus the number of input port
+ *       channels of contained reactors that it effects. Each inner array has a length equal to the
+ *       number of final destinations of that output channel or input channel. The reaction_i struct
+ *       has an array triggered_sizes that indicates the sizes of these inner arrays. The
+ *       num_outputs field of the reaction_i struct gives the length of the triggered_sizes and
+ *       (outer) triggers arrays. The num_outputs field is equal to the total number of single ports
+ *       and multiport channels that the reaction writes to.
+ *       <h2 id="runtime-tables">Runtime Tables</h2>
+ *       This generator creates an populates the following tables used at run time. These tables may
+ *       have to be resized and adjusted when mutations occur.
+ *   <li>_lf_is_present_fields: An array of pointers to booleans indicating whether an event is
+ *       present. The _lf_start_time_step() function in reactor_common.c uses this to mark every
+ *       event absent at the start of a time step. The size of this table is contained in the
+ *       variable _lf_is_present_fields_size.
+ *       <ul>
+ *         <li>This table is accompanied by another list, _lf_is_present_fields_abbreviated, which
+ *             only contains the is_present fields that have been set to true in the current tag.
+ *             This list can allow a performance improvement if most ports are seldom present
+ *             because only fields that have been set to true need to be reset to false.
+ *       </ul>
+ *   <li>_lf_shutdown_triggers: An array of pointers to trigger_t structs for shutdown reactions.
+ *       The length of this table is in the _lf_shutdown_triggers_size variable.
+ *   <li>_lf_timer_triggers: An array of pointers to trigger_t structs for timers that need to be
+ *       started when the program runs. The length of this table is in the _lf_timer_triggers_size
+ *       variable.
+ *   <li>_lf_action_table: For a federated execution, each federate will have this table that maps
+ *       port IDs to the corresponding action struct, which can be cast to action_base_t.
  * </ul>
  *
  * @author Edward A. Lee
@@ -273,1153 +258,1164 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 @SuppressWarnings("StaticPseudoFunctionalStyleMethod")
 public class CGenerator extends GeneratorBase {
 
-    // Regular expression pattern for compiler error messages with resource
-    // and line number information. The first match will a resource URI in the
-    // form of "file:/path/file.lf". The second match will be a line number.
-    // The third match is a character position within the line.
-    // The fourth match will be the error message.
-    static final Pattern compileErrorPattern = Pattern.compile(
-        "^(?<path>.*):(?<line>\\d+):(?<column>\\d+):(?<message>.*)$"
-    );
-
-    public static int UNDEFINED_MIN_SPACING = -1;
-
-    ////////////////////////////////////////////
-    //// Protected fields
-
-    /** The main place to put generated code. */
-    protected CodeBuilder code = new CodeBuilder();
-
-    /** Place to collect code to initialize the trigger objects for all reactor instances. */
-    protected CodeBuilder initializeTriggerObjects = new CodeBuilder();
-
-    protected final CFileConfig fileConfig;
-
-    /**
-     * Count of the number of is_present fields of the self struct that
-     * need to be reinitialized in _lf_start_time_step().
-     */
-    protected int startTimeStepIsPresentCount = 0;
-
-    ////////////////////////////////////////////
-    //// Private fields
-    /**
-     * Extra lines that need to go into the generated CMakeLists.txt.
-     */
-    private final String cMakeExtras = "";
-
-    /** Place to collect code to execute at the start of a time step. */
-    private final CodeBuilder startTimeStep = new CodeBuilder();
-
-    /** Count of the number of token pointers that need to have their
-     *  reference count decremented in _lf_start_time_step().
-     */
-    private int timerCount = 0;
-    private int startupReactionCount = 0;
-    private int shutdownReactionCount = 0;
-    private int resetReactionCount = 0;
-    private int modalReactorCount = 0;
-    private int modalStateResetCount = 0;
-    private int watchdogCount = 0;
-
-    // Indicate whether the generator is in Cpp mode or not
-    private final boolean CCppMode;
-
-    private final CTypes types;
-
-    private final CCmakeGenerator cmakeGenerator;
-
-    protected CGenerator(
-        LFGeneratorContext context,
-        boolean CCppMode,
-        CTypes types,
-        CCmakeGenerator cmakeGenerator,
-        DelayBodyGenerator delayBodyGenerator
-    ) {
-        super(context);
-        this.fileConfig = (CFileConfig) context.getFileConfig();
-        this.CCppMode = CCppMode;
-        this.types = types;
-        this.cmakeGenerator = cmakeGenerator;
-
-        // Register the delayed connection transformation to be applied by GeneratorBase.
-        // transform both after delays and physical connections
-        registerTransformation(new DelayedConnectionTransformation(delayBodyGenerator, types, fileConfig.resource, true, true));
+  // Regular expression pattern for compiler error messages with resource
+  // and line number information. The first match will a resource URI in the
+  // form of "file:/path/file.lf". The second match will be a line number.
+  // The third match is a character position within the line.
+  // The fourth match will be the error message.
+  static final Pattern compileErrorPattern =
+      Pattern.compile("^(?<path>.*):(?<line>\\d+):(?<column>\\d+):(?<message>.*)$");
+
+  public static int UNDEFINED_MIN_SPACING = -1;
+
+  ////////////////////////////////////////////
+  //// Protected fields
+
+  /** The main place to put generated code. */
+  protected CodeBuilder code = new CodeBuilder();
+
+  /** Place to collect code to initialize the trigger objects for all reactor instances. */
+  protected CodeBuilder initializeTriggerObjects = new CodeBuilder();
+
+  protected final CFileConfig fileConfig;
+
+  /**
+   * Count of the number of is_present fields of the self struct that need to be reinitialized in
+   * _lf_start_time_step().
+   */
+  protected int startTimeStepIsPresentCount = 0;
+
+  ////////////////////////////////////////////
+  //// Private fields
+  /** Extra lines that need to go into the generated CMakeLists.txt. */
+  private final String cMakeExtras = "";
+
+  /** Place to collect code to execute at the start of a time step. */
+  private final CodeBuilder startTimeStep = new CodeBuilder();
+
+  /**
+   * Count of the number of token pointers that need to have their reference count decremented in
+   * _lf_start_time_step().
+   */
+  private int timerCount = 0;
+
+  private int startupReactionCount = 0;
+  private int shutdownReactionCount = 0;
+  private int resetReactionCount = 0;
+  private int modalReactorCount = 0;
+  private int modalStateResetCount = 0;
+  private int watchdogCount = 0;
+
+  // Indicate whether the generator is in Cpp mode or not
+  private final boolean CCppMode;
+
+  private final CTypes types;
+
+  private final CCmakeGenerator cmakeGenerator;
+
+  protected CGenerator(
+      LFGeneratorContext context,
+      boolean CCppMode,
+      CTypes types,
+      CCmakeGenerator cmakeGenerator,
+      DelayBodyGenerator delayBodyGenerator) {
+    super(context);
+    this.fileConfig = (CFileConfig) context.getFileConfig();
+    this.CCppMode = CCppMode;
+    this.types = types;
+    this.cmakeGenerator = cmakeGenerator;
+
+    // Register the delayed connection transformation to be applied by GeneratorBase.
+    // transform both after delays and physical connections
+    registerTransformation(
+        new DelayedConnectionTransformation(
+            delayBodyGenerator, types, fileConfig.resource, true, true));
+  }
+
+  public CGenerator(LFGeneratorContext context, boolean ccppMode) {
+    this(
+        context,
+        ccppMode,
+        new CTypes(),
+        new CCmakeGenerator(context.getFileConfig(), List.of()),
+        new CDelayBodyGenerator(new CTypes()));
+  }
+
+  /**
+   * Look for physical actions in all resources. If found, set threads to be at least one to allow
+   * asynchronous schedule calls.
+   */
+  public void accommodatePhysicalActionsIfPresent() {
+    // If there are any physical actions, ensure the threaded engine is used and that
+    // keepalive is set to true, unless the user has explicitly set it to false.
+    for (Resource resource : GeneratorUtils.getResources(reactors)) {
+      for (Action action : ASTUtils.allElementsOfClass(resource, Action.class)) {
+        if (ActionOrigin.PHYSICAL.equals(action.getOrigin())) {
+          // If the unthreaded runtime is not requested by the user, use the threaded runtime
+          // instead
+          // because it is the only one currently capable of handling asynchronous events.
+          if (!targetConfig.threading
+              && !targetConfig.setByUser.contains(TargetProperty.THREADING)) {
+            targetConfig.threading = true;
+            errorReporter.reportWarning(
+                action,
+                "Using the threaded C runtime to allow for asynchronous handling of physical action"
+                    + " "
+                    + action.getName());
+            return;
+          }
+        }
+      }
     }
-
-    public CGenerator(LFGeneratorContext context, boolean ccppMode) {
-        this(
-            context,
-            ccppMode,
-            new CTypes(),
-            new CCmakeGenerator(context.getFileConfig(), List.of()),
-            new CDelayBodyGenerator(new CTypes())
-        );
+  }
+
+  /**
+   * Return true if the host operating system is compatible and otherwise report an error and return
+   * false.
+   */
+  protected boolean isOSCompatible() {
+    if (GeneratorUtils.isHostWindows()) {
+      if (CCppMode) {
+        errorReporter.reportError(
+            "LF programs with a CCpp target are currently not supported on Windows. "
+                + "Exiting code generation.");
+        return false;
+      }
     }
+    return true;
+  }
+
+  /**
+   * Generate C code from the Lingua Franca model contained by the specified resource. This is the
+   * main entry point for code generation.
+   *
+   * @param resource The resource containing the source code.
+   * @param context The context in which the generator is invoked, including whether it is cancelled
+   *     and whether it is a standalone context
+   */
+  @Override
+  public void doGenerate(Resource resource, LFGeneratorContext context) {
+    super.doGenerate(resource, context);
+    if (!GeneratorUtils.canGenerate(errorsOccurred(), mainDef, errorReporter, context)) return;
+    if (!isOSCompatible()) return; // Incompatible OS and configuration
 
-    /**
-     * Look for physical actions in all resources.
-     * If found, set threads to be at least one to allow asynchronous schedule calls.
-     */
-    public void accommodatePhysicalActionsIfPresent() {
-        // If there are any physical actions, ensure the threaded engine is used and that
-        // keepalive is set to true, unless the user has explicitly set it to false.
-        for (Resource resource : GeneratorUtils.getResources(reactors)) {
-            for (Action action : ASTUtils.allElementsOfClass(resource, Action.class)) {
-                if (ActionOrigin.PHYSICAL.equals(action.getOrigin())) {
-                    // If the unthreaded runtime is not requested by the user, use the threaded runtime instead
-                    // because it is the only one currently capable of handling asynchronous events.
-                    if (!targetConfig.threading && !targetConfig.setByUser.contains(TargetProperty.THREADING)) {
-                        targetConfig.threading = true;
-                        errorReporter.reportWarning(
-                            action,
-                            "Using the threaded C runtime to allow for asynchronous handling of physical action " +
-                            action.getName()
-                        );
-                        return;
-                    }
-                }
-            }
-        }
+    // Perform set up that does not generate code
+    setUpGeneralParameters();
+
+    FileUtil.createDirectoryIfDoesNotExist(fileConfig.getSrcGenPath().toFile());
+    FileUtil.createDirectoryIfDoesNotExist(fileConfig.binPath.toFile());
+    FileUtil.createDirectoryIfDoesNotExist(fileConfig.getIncludePath().toFile());
+    handleProtoFiles();
+
+    // Derive target filename from the .lf filename.
+    var lfModuleName = fileConfig.name;
+    var cFilename = CCompiler.getTargetFileName(lfModuleName, this.CCppMode, targetConfig);
+    var targetFile = fileConfig.getSrcGenPath() + File.separator + cFilename;
+    try {
+      generateCodeFor(lfModuleName);
+      copyTargetFiles();
+      generateHeaders();
+      code.writeToFile(targetFile);
+    } catch (IOException e) {
+      //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
+      Exceptions.sneakyThrow(e);
     }
 
-    /**
-     * Return true if the host operating system is compatible and
-     * otherwise report an error and return false.
-     */
-    protected boolean isOSCompatible() {
-        if (GeneratorUtils.isHostWindows()) {
-            if (CCppMode) {
-                errorReporter.reportError(
-                    "LF programs with a CCpp target are currently not supported on Windows. " +
-                    "Exiting code generation."
-                );
-                return false;
-            }
-        }
-        return true;
+    // Create docker file.
+    if (targetConfig.dockerOptions != null && mainDef != null) {
+      try {
+        var dockerData = getDockerGenerator(context).generateDockerData();
+        dockerData.writeDockerFile();
+        (new DockerComposeGenerator(context)).writeDockerComposeFile(List.of(dockerData));
+      } catch (IOException e) {
+        throw new RuntimeException("Error while writing Docker files", e);
+      }
     }
 
-    /**
-     * Generate C code from the Lingua Franca model contained by the
-     * specified resource. This is the main entry point for code
-     * generation.
-     * @param resource The resource containing the source code.
-     * @param context The context in which the generator is
-     *     invoked, including whether it is cancelled and
-     *     whether it is a standalone context
-     */
-    @Override
-    public void doGenerate(Resource resource, LFGeneratorContext context) {
-        super.doGenerate(resource, context);
-        if (!GeneratorUtils.canGenerate(errorsOccurred(), mainDef, errorReporter, context)) return;
-        if (!isOSCompatible()) return; // Incompatible OS and configuration
-
-        // Perform set up that does not generate code
-        setUpGeneralParameters();
-
-        FileUtil.createDirectoryIfDoesNotExist(fileConfig.getSrcGenPath().toFile());
-        FileUtil.createDirectoryIfDoesNotExist(fileConfig.binPath.toFile());
-        FileUtil.createDirectoryIfDoesNotExist(fileConfig.getIncludePath().toFile());
-        handleProtoFiles();
-
-        // Derive target filename from the .lf filename.
-        var lfModuleName = fileConfig.name;
-        var cFilename = CCompiler.getTargetFileName(lfModuleName, this.CCppMode, targetConfig);
-        var targetFile = fileConfig.getSrcGenPath() + File.separator + cFilename;
-        try {
-            generateCodeFor(lfModuleName);
-            copyTargetFiles();
-            generateHeaders();
-            code.writeToFile(targetFile);
-        } catch (IOException e) {
-            //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
-            Exceptions.sneakyThrow(e);
-        }
-
-        // Create docker file.
-        if (targetConfig.dockerOptions != null && mainDef != null) {
-            try {
-                var dockerData = getDockerGenerator(context).generateDockerData();
-                dockerData.writeDockerFile();
-                (new DockerComposeGenerator(context)).writeDockerComposeFile(List.of(dockerData));
-            } catch (IOException e) {
-                throw new RuntimeException("Error while writing Docker files", e);
-            }
-        }
-
-        // If cmake is requested, generate the CMakeLists.txt
-        if (targetConfig.platformOptions.platform != Platform.ARDUINO) {
-            var cmakeFile = fileConfig.getSrcGenPath() + File.separator + "CMakeLists.txt";
-            var sources = allTypeParameterizedReactors()
-                .map(CUtil::getName)
-                .map(it -> it + (CCppMode ? ".cpp" : ".c"))
-                .collect(Collectors.toCollection(ArrayList::new));
-            sources.add(cFilename);
-            var cmakeCode = cmakeGenerator.generateCMakeCode(
-                sources,
-                lfModuleName,
-                errorReporter,
-                CCppMode,
-                mainDef != null,
-                cMakeExtras,
-                targetConfig
-            );
-            try {
-                cmakeCode.writeToFile(cmakeFile);
-            } catch (IOException e) {
-                //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
-                Exceptions.sneakyThrow(e);
-            }
-        } else {
-            try {
-                Path include = fileConfig.getSrcGenPath().resolve("include/");
-                Path src = fileConfig.getSrcGenPath().resolve("src/");
-                FileUtil.arduinoDeleteHelper(src, targetConfig.threading);
-                FileUtil.relativeIncludeHelper(src, include);
-                FileUtil.relativeIncludeHelper(include, include);
-            } catch (IOException e) {
-                //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
-                Exceptions.sneakyThrow(e);
-            }
-            if (!targetConfig.noCompile) {
-                ArduinoUtil arduinoUtil = new ArduinoUtil(context, commandFactory, errorReporter);
-                arduinoUtil.buildArduino(fileConfig, targetConfig);
-                context.finish(
-                    GeneratorResult.Status.COMPILED, null
-                );
-            } else {
-                System.out.println("********");
-                System.out.println("To compile your program, run the following command to see information about the board you plugged in:\n\n\tarduino-cli board list\n\nGrab the FQBN and PORT from the command and run the following command in the generated sources directory:\n\n\tarduino-cli compile -b <FQBN> --build-property compiler.c.extra_flags='-DLF_UNTHREADED -DPLATFORM_ARDUINO -DINITIAL_EVENT_QUEUE_SIZE=10 -DINITIAL_REACT_QUEUE_SIZE=10' --build-property compiler.cpp.extra_flags='-DLF_UNTHREADED -DPLATFORM_ARDUINO -DINITIAL_EVENT_QUEUE_SIZE=10 -DINITIAL_REACT_QUEUE_SIZE=10' .\n\nTo flash/upload your generated sketch to the board, run the following command in the generated sources directory:\n\n\tarduino-cli upload -b <FQBN> -p <PORT>\n");
-                // System.out.println("For a list of all boards installed on your computer, you can use the following command:\n\n\tarduino-cli board listall\n");
-                context.finish(
-                    GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, null)
-                );
-            }
-            GeneratorUtils.refreshProject(resource, context.getMode());
-            return;
-        }
-
-        // Dump the additional compile definitions to a file to keep the generated project
-        // self-contained. In this way, third-party build tools like PlatformIO, west, arduino-cli can
-        // take over and do the rest of compilation.
-        try {
-            String compileDefs = targetConfig.compileDefinitions.keySet().stream()
-                                                                .map(key -> key + "=" + targetConfig.compileDefinitions.get(key))
-                                                                .collect(Collectors.joining("\n")) + "\n";
-            FileUtil.writeToFile(
-                compileDefs,
-                Path.of(fileConfig.getSrcGenPath() + File.separator + "CompileDefinitions.txt")
-            );
-        } catch (IOException e) {
-            Exceptions.sneakyThrow(e);
-        }
+    // If cmake is requested, generate the CMakeLists.txt
+    if (targetConfig.platformOptions.platform != Platform.ARDUINO) {
+      var cmakeFile = fileConfig.getSrcGenPath() + File.separator + "CMakeLists.txt";
+      var sources =
+          allTypeParameterizedReactors()
+              .map(CUtil::getName)
+              .map(it -> it + (CCppMode ? ".cpp" : ".c"))
+              .collect(Collectors.toCollection(ArrayList::new));
+      sources.add(cFilename);
+      var cmakeCode =
+          cmakeGenerator.generateCMakeCode(
+              sources,
+              lfModuleName,
+              errorReporter,
+              CCppMode,
+              mainDef != null,
+              cMakeExtras,
+              targetConfig);
+      try {
+        cmakeCode.writeToFile(cmakeFile);
+      } catch (IOException e) {
+        //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
+        Exceptions.sneakyThrow(e);
+      }
+    } else {
+      try {
+        Path include = fileConfig.getSrcGenPath().resolve("include/");
+        Path src = fileConfig.getSrcGenPath().resolve("src/");
+        FileUtil.arduinoDeleteHelper(src, targetConfig.threading);
+        FileUtil.relativeIncludeHelper(src, include);
+        FileUtil.relativeIncludeHelper(include, include);
+      } catch (IOException e) {
+        //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
+        Exceptions.sneakyThrow(e);
+      }
+      if (!targetConfig.noCompile) {
+        ArduinoUtil arduinoUtil = new ArduinoUtil(context, commandFactory, errorReporter);
+        arduinoUtil.buildArduino(fileConfig, targetConfig);
+        context.finish(GeneratorResult.Status.COMPILED, null);
+      } else {
+        System.out.println("********");
+        System.out.println(
+            "To compile your program, run the following command to see information about the board"
+                + " you plugged in:\n\n"
+                + "\tarduino-cli board list\n\n"
+                + "Grab the FQBN and PORT from the command and run the following command in the"
+                + " generated sources directory:\n\n"
+                + "\tarduino-cli compile -b <FQBN> --build-property"
+                + " compiler.c.extra_flags='-DLF_UNTHREADED -DPLATFORM_ARDUINO"
+                + " -DINITIAL_EVENT_QUEUE_SIZE=10 -DINITIAL_REACT_QUEUE_SIZE=10' --build-property"
+                + " compiler.cpp.extra_flags='-DLF_UNTHREADED -DPLATFORM_ARDUINO"
+                + " -DINITIAL_EVENT_QUEUE_SIZE=10 -DINITIAL_REACT_QUEUE_SIZE=10' .\n\n"
+                + "To flash/upload your generated sketch to the board, run the following command in"
+                + " the generated sources directory:\n\n"
+                + "\tarduino-cli upload -b <FQBN> -p <PORT>\n");
+        // System.out.println("For a list of all boards installed on your computer, you can use the
+        // following command:\n\n\tarduino-cli board listall\n");
+        context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, null));
+      }
+      GeneratorUtils.refreshProject(resource, context.getMode());
+      return;
+    }
 
-        // Create a .vscode/settings.json file in the target directory so that VSCode can
-        // immediately compile the generated code.
-        try {
-            String compileDefs = targetConfig.compileDefinitions.keySet().stream()
-                .map(key -> "\"-D" + key + "=" + targetConfig.compileDefinitions.get(key) + "\"")
-                .collect(Collectors.joining(",\n"));
-            String settings = "{\n"
-                + "\"cmake.configureArgs\": [\n"
-                + compileDefs
-                + "\n]\n}\n";
-            Path vscodePath = Path.of(fileConfig.getSrcGenPath() + File.separator + ".vscode");
-            if (!Files.exists(vscodePath))
-            Files.createDirectory(vscodePath);
-            FileUtil.writeToFile(
-                settings,
-                Path.of(fileConfig.getSrcGenPath()
-                    + File.separator + ".vscode"
-                    + File.separator + "settings.json")
-            );
-        } catch (IOException e) {
-            Exceptions.sneakyThrow(e);
-        }
+    // Dump the additional compile definitions to a file to keep the generated project
+    // self-contained. In this way, third-party build tools like PlatformIO, west, arduino-cli can
+    // take over and do the rest of compilation.
+    try {
+      String compileDefs =
+          targetConfig.compileDefinitions.keySet().stream()
+                  .map(key -> key + "=" + targetConfig.compileDefinitions.get(key))
+                  .collect(Collectors.joining("\n"))
+              + "\n";
+      FileUtil.writeToFile(
+          compileDefs,
+          Path.of(fileConfig.getSrcGenPath() + File.separator + "CompileDefinitions.txt"));
+    } catch (IOException e) {
+      Exceptions.sneakyThrow(e);
+    }
 
-        // If this code generator is directly compiling the code, compile it now so that we
-        // clean it up after, removing the #line directives after errors have been reported.
-        if (
-            !targetConfig.noCompile && targetConfig.dockerOptions == null
-                && IterableExtensions.isNullOrEmpty(targetConfig.buildCommands)
-                // This code is unreachable in LSP_FAST mode, so that check is omitted.
-                && context.getMode() != LFGeneratorContext.Mode.LSP_MEDIUM
-        ) {
-            // FIXME: Currently, a lack of main is treated as a request to not produce
-            // a binary and produce a .o file instead. There should be a way to control
-            // this.
-            // Create an anonymous Runnable class and add it to the compileThreadPool
-            // so that compilation can happen in parallel.
-            var cleanCode = code.removeLines("#line");
-
-            var execName = lfModuleName;
-            var threadFileConfig = fileConfig;
-            var generator = this; // FIXME: currently only passed to report errors with line numbers in the Eclipse IDE
-            var CppMode = CCppMode;
-            // generatingContext.reportProgress(
-            //     String.format("Generated code for %d/%d executables. Compiling...", federateCount, federates.size()),
-            //     100 * federateCount / federates.size()
-            // ); // FIXME: Move to FedGenerator
-            // Create the compiler to be used later
-
-            var cCompiler = new CCompiler(targetConfig, threadFileConfig, errorReporter, CppMode);
-            try {
-                if (!cCompiler.runCCompiler(generator, context)) {
-                    // If compilation failed, remove any bin files that may have been created.
-                    CUtil.deleteBinFiles(threadFileConfig);
-                    // If finish has already been called, it is illegal and makes no sense. However,
-                    //  if finish has already been called, then this must be a federated execution.
-                    context.unsuccessfulFinish();
-                } else {
-                    context.finish(
-                        GeneratorResult.Status.COMPILED, null
-                    );
-                }
-                cleanCode.writeToFile(targetFile);
-            } catch (IOException e) {
-                Exceptions.sneakyThrow(e);
-            }
-        }
+    // Create a .vscode/settings.json file in the target directory so that VSCode can
+    // immediately compile the generated code.
+    try {
+      String compileDefs =
+          targetConfig.compileDefinitions.keySet().stream()
+              .map(key -> "\"-D" + key + "=" + targetConfig.compileDefinitions.get(key) + "\"")
+              .collect(Collectors.joining(",\n"));
+      String settings = "{\n" + "\"cmake.configureArgs\": [\n" + compileDefs + "\n]\n}\n";
+      Path vscodePath = Path.of(fileConfig.getSrcGenPath() + File.separator + ".vscode");
+      if (!Files.exists(vscodePath)) Files.createDirectory(vscodePath);
+      FileUtil.writeToFile(
+          settings,
+          Path.of(
+              fileConfig.getSrcGenPath()
+                  + File.separator
+                  + ".vscode"
+                  + File.separator
+                  + "settings.json"));
+    } catch (IOException e) {
+      Exceptions.sneakyThrow(e);
+    }
 
-        // If a build directive has been given, invoke it now.
-        // Note that the code does not get cleaned in this case.
-        if (!targetConfig.noCompile) {
-            if (!IterableExtensions.isNullOrEmpty(targetConfig.buildCommands)) {
-                CUtil.runBuildCommand(
-                    fileConfig,
-                    targetConfig,
-                    commandFactory,
-                    errorReporter,
-                    this::reportCommandErrors,
-                    context.getMode()
-                );
-                context.finish(
-                    GeneratorResult.Status.COMPILED, null
-                );
-            }
-            if (!errorsOccurred()){
-                System.out.println("Compiled binary is in " + fileConfig.binPath);
-            }
+    // If this code generator is directly compiling the code, compile it now so that we
+    // clean it up after, removing the #line directives after errors have been reported.
+    if (!targetConfig.noCompile
+        && targetConfig.dockerOptions == null
+        && IterableExtensions.isNullOrEmpty(targetConfig.buildCommands)
+        // This code is unreachable in LSP_FAST mode, so that check is omitted.
+        && context.getMode() != LFGeneratorContext.Mode.LSP_MEDIUM) {
+      // FIXME: Currently, a lack of main is treated as a request to not produce
+      // a binary and produce a .o file instead. There should be a way to control
+      // this.
+      // Create an anonymous Runnable class and add it to the compileThreadPool
+      // so that compilation can happen in parallel.
+      var cleanCode = code.removeLines("#line");
+
+      var execName = lfModuleName;
+      var threadFileConfig = fileConfig;
+      var generator =
+          this; // FIXME: currently only passed to report errors with line numbers in the Eclipse
+      // IDE
+      var CppMode = CCppMode;
+      // generatingContext.reportProgress(
+      //     String.format("Generated code for %d/%d executables. Compiling...", federateCount,
+      // federates.size()),
+      //     100 * federateCount / federates.size()
+      // ); // FIXME: Move to FedGenerator
+      // Create the compiler to be used later
+
+      var cCompiler = new CCompiler(targetConfig, threadFileConfig, errorReporter, CppMode);
+      try {
+        if (!cCompiler.runCCompiler(generator, context)) {
+          // If compilation failed, remove any bin files that may have been created.
+          CUtil.deleteBinFiles(threadFileConfig);
+          // If finish has already been called, it is illegal and makes no sense. However,
+          //  if finish has already been called, then this must be a federated execution.
+          context.unsuccessfulFinish();
         } else {
-            context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, null));
+          context.finish(GeneratorResult.Status.COMPILED, null);
         }
+        cleanCode.writeToFile(targetFile);
+      } catch (IOException e) {
+        Exceptions.sneakyThrow(e);
+      }
+    }
 
-        // In case we are in Eclipse, make sure the generated code is visible.
-        GeneratorUtils.refreshProject(resource, context.getMode());
+    // If a build directive has been given, invoke it now.
+    // Note that the code does not get cleaned in this case.
+    if (!targetConfig.noCompile) {
+      if (!IterableExtensions.isNullOrEmpty(targetConfig.buildCommands)) {
+        CUtil.runBuildCommand(
+            fileConfig,
+            targetConfig,
+            commandFactory,
+            errorReporter,
+            this::reportCommandErrors,
+            context.getMode());
+        context.finish(GeneratorResult.Status.COMPILED, null);
+      }
+      if (!errorsOccurred()) {
+        System.out.println("Compiled binary is in " + fileConfig.binPath);
+      }
+    } else {
+      context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, null));
     }
 
-    private void generateCodeFor(
-        String lfModuleName
-    ) throws IOException {
-        startTimeStepIsPresentCount = 0;
-        code.pr(generateDirectives());
-        code.pr(new CMainFunctionGenerator(targetConfig).generateCode());
-        // Generate code for each reactor.
-        generateReactorDefinitions();
-
-        // Generate main instance, if there is one.
-        // Note that any main reactors in imported files are ignored.
-        // Skip generation if there are cycles.
-        if (main != null) {
-            initializeTriggerObjects.pr(String.join("\n",
-                "int _lf_startup_reactions_count = 0;",
-                "SUPPRESS_UNUSED_WARNING(_lf_startup_reactions_count);",
-                "int _lf_shutdown_reactions_count = 0;",
-                "SUPPRESS_UNUSED_WARNING(_lf_shutdown_reactions_count);",
-                "int _lf_reset_reactions_count = 0;",
-                "SUPPRESS_UNUSED_WARNING(_lf_reset_reactions_count);",
-                "int _lf_timer_triggers_count = 0;",
-                "SUPPRESS_UNUSED_WARNING(_lf_timer_triggers_count);",
-                "int bank_index;",
-                "SUPPRESS_UNUSED_WARNING(bank_index);",
-                "int watchdog_number = 0;",
-                "SUPPRESS_UNUSED_WARNING(watchdog_number);"));
-            // Add counters for modal initialization
-            initializeTriggerObjects.pr(CModesGenerator.generateModalInitalizationCounters(hasModalReactors));
-
-            // Create an array of arrays to store all self structs.
-            // This is needed because connections cannot be established until
-            // all reactor instances have self structs because ports that
-            // receive data reference the self structs of the originating
-            // reactors, which are arbitarily far away in the program graph.
-            generateSelfStructs(main);
-            generateReactorInstance(main);
-
-            if (targetConfig.fedSetupPreamble != null) {
-                if (targetLanguageIsCpp()) code.pr("extern \"C\" {");
-                code.pr("#include \"" + targetConfig.fedSetupPreamble + "\"");
-                if (targetLanguageIsCpp()) code.pr("}");
-            }
+    // In case we are in Eclipse, make sure the generated code is visible.
+    GeneratorUtils.refreshProject(resource, context.getMode());
+  }
+
+  private void generateCodeFor(String lfModuleName) throws IOException {
+    startTimeStepIsPresentCount = 0;
+    code.pr(generateDirectives());
+    code.pr(new CMainFunctionGenerator(targetConfig).generateCode());
+    // Generate code for each reactor.
+    generateReactorDefinitions();
+
+    // Generate main instance, if there is one.
+    // Note that any main reactors in imported files are ignored.
+    // Skip generation if there are cycles.
+    if (main != null) {
+      initializeTriggerObjects.pr(
+          String.join(
+              "\n",
+              "int _lf_startup_reactions_count = 0;",
+              "SUPPRESS_UNUSED_WARNING(_lf_startup_reactions_count);",
+              "int _lf_shutdown_reactions_count = 0;",
+              "SUPPRESS_UNUSED_WARNING(_lf_shutdown_reactions_count);",
+              "int _lf_reset_reactions_count = 0;",
+              "SUPPRESS_UNUSED_WARNING(_lf_reset_reactions_count);",
+              "int _lf_timer_triggers_count = 0;",
+              "SUPPRESS_UNUSED_WARNING(_lf_timer_triggers_count);",
+              "int bank_index;",
+              "SUPPRESS_UNUSED_WARNING(bank_index);",
+              "int watchdog_number = 0;",
+              "SUPPRESS_UNUSED_WARNING(watchdog_number);"));
+      // Add counters for modal initialization
+      initializeTriggerObjects.pr(
+          CModesGenerator.generateModalInitalizationCounters(hasModalReactors));
+
+      // Create an array of arrays to store all self structs.
+      // This is needed because connections cannot be established until
+      // all reactor instances have self structs because ports that
+      // receive data reference the self structs of the originating
+      // reactors, which are arbitarily far away in the program graph.
+      generateSelfStructs(main);
+      generateReactorInstance(main);
+
+      if (targetConfig.fedSetupPreamble != null) {
+        if (targetLanguageIsCpp()) code.pr("extern \"C\" {");
+        code.pr("#include \"" + targetConfig.fedSetupPreamble + "\"");
+        if (targetLanguageIsCpp()) code.pr("}");
+      }
 
-            // If there are timers, create a table of timers to be initialized.
-            code.pr(CTimerGenerator.generateDeclarations(timerCount));
-
-            // If there are startup reactions, create a table of triggers.
-            code.pr(CReactionGenerator.generateBuiltinTriggersTable(startupReactionCount, "startup"));
-
-            // If there are shutdown reactions, create a table of triggers.
-            code.pr(CReactionGenerator.generateBuiltinTriggersTable(shutdownReactionCount, "shutdown"));
-
-            // If there are reset reactions, create a table of triggers.
-            code.pr(CReactionGenerator.generateBuiltinTriggersTable(resetReactionCount, "reset"));
-
-            // If there are watchdogs, create a table of triggers.
-            code.pr(CWatchdogGenerator.generateWatchdogTable(watchdogCount));
-
-            // If there are modes, create a table of mode state to be checked for transitions.
-            code.pr(CModesGenerator.generateModeStatesTable(
-                hasModalReactors,
-                modalReactorCount,
-                modalStateResetCount
-            ));
-
-            // Generate function to initialize the trigger objects for all reactors.
-            code.pr(CTriggerObjectsGenerator.generateInitializeTriggerObjects(
-                main,
-                targetConfig,
-                initializeTriggerObjects,
-                startTimeStep,
-                types,
-                lfModuleName,
-                startTimeStepIsPresentCount
-            ));
-
-            // Generate function to trigger startup reactions for all reactors.
-            code.pr(CReactionGenerator.generateLfTriggerStartupReactions(startupReactionCount, hasModalReactors));
-
-            // Generate function to schedule timers for all reactors.
-            code.pr(CTimerGenerator.generateLfInitializeTimer(timerCount));
-
-            // Generate a function that will either do nothing
-            // (if there is only one federate or the coordination
-            // is set to decentralized) or, if there are
-            // downstream federates, will notify the RTI
-            // that the specified logical time is complete.
-            if (CCppMode || targetConfig.platformOptions.platform == Platform.ARDUINO) code.pr("extern \"C\"");
-            code.pr(String.join("\n",
-                "void logical_tag_complete(tag_t tag_to_send) {",
-                CExtensionUtils.surroundWithIfFederatedCentralized(
-                "        _lf_logical_tag_complete(tag_to_send);"
-                ),
-                "}"
-            ));
-
-            // Generate function to schedule shutdown reactions if any
-            // reactors have reactions to shutdown.
-            code.pr(CReactionGenerator.generateLfTriggerShutdownReactions(shutdownReactionCount, hasModalReactors));
-
-            // Generate an empty termination function for non-federated
-            // execution. For federated execution, an implementation is
-            // provided in federate.c.  That implementation will resign
-            // from the federation and close any open sockets.
-            code.pr("""
+      // If there are timers, create a table of timers to be initialized.
+      code.pr(CTimerGenerator.generateDeclarations(timerCount));
+
+      // If there are startup reactions, create a table of triggers.
+      code.pr(CReactionGenerator.generateBuiltinTriggersTable(startupReactionCount, "startup"));
+
+      // If there are shutdown reactions, create a table of triggers.
+      code.pr(CReactionGenerator.generateBuiltinTriggersTable(shutdownReactionCount, "shutdown"));
+
+      // If there are reset reactions, create a table of triggers.
+      code.pr(CReactionGenerator.generateBuiltinTriggersTable(resetReactionCount, "reset"));
+
+      // If there are watchdogs, create a table of triggers.
+      code.pr(CWatchdogGenerator.generateWatchdogTable(watchdogCount));
+
+      // If there are modes, create a table of mode state to be checked for transitions.
+      code.pr(
+          CModesGenerator.generateModeStatesTable(
+              hasModalReactors, modalReactorCount, modalStateResetCount));
+
+      // Generate function to initialize the trigger objects for all reactors.
+      code.pr(
+          CTriggerObjectsGenerator.generateInitializeTriggerObjects(
+              main,
+              targetConfig,
+              initializeTriggerObjects,
+              startTimeStep,
+              types,
+              lfModuleName,
+              startTimeStepIsPresentCount));
+
+      // Generate function to trigger startup reactions for all reactors.
+      code.pr(
+          CReactionGenerator.generateLfTriggerStartupReactions(
+              startupReactionCount, hasModalReactors));
+
+      // Generate function to schedule timers for all reactors.
+      code.pr(CTimerGenerator.generateLfInitializeTimer(timerCount));
+
+      // Generate a function that will either do nothing
+      // (if there is only one federate or the coordination
+      // is set to decentralized) or, if there are
+      // downstream federates, will notify the RTI
+      // that the specified logical time is complete.
+      if (CCppMode || targetConfig.platformOptions.platform == Platform.ARDUINO)
+        code.pr("extern \"C\"");
+      code.pr(
+          String.join(
+              "\n",
+              "void logical_tag_complete(tag_t tag_to_send) {",
+              CExtensionUtils.surroundWithIfFederatedCentralized(
+                  "        _lf_logical_tag_complete(tag_to_send);"),
+              "}"));
+
+      // Generate function to schedule shutdown reactions if any
+      // reactors have reactions to shutdown.
+      code.pr(
+          CReactionGenerator.generateLfTriggerShutdownReactions(
+              shutdownReactionCount, hasModalReactors));
+
+      // Generate an empty termination function for non-federated
+      // execution. For federated execution, an implementation is
+      // provided in federate.c.  That implementation will resign
+      // from the federation and close any open sockets.
+      code.pr(
+          """
                 #ifndef FEDERATED
                 void terminate_execution() {}
-                #endif"""
-            );
-
-
-            // Generate functions for modes
-            code.pr(CModesGenerator.generateLfInitializeModes(
-                hasModalReactors
-            ));
-            code.pr(CModesGenerator.generateLfHandleModeChanges(
-                hasModalReactors,
-                modalStateResetCount
-            ));
-            code.pr(CReactionGenerator.generateLfModeTriggeredReactions(
-                startupReactionCount,
-                resetReactionCount,
-                hasModalReactors
-            ));
-        }
-    }
-
-    @Override
-    public void checkModalReactorSupport(boolean __) {
-        // Modal reactors are currently only supported for non federated applications
-        super.checkModalReactorSupport(true);
+                #endif""");
+
+      // Generate functions for modes
+      code.pr(CModesGenerator.generateLfInitializeModes(hasModalReactors));
+      code.pr(CModesGenerator.generateLfHandleModeChanges(hasModalReactors, modalStateResetCount));
+      code.pr(
+          CReactionGenerator.generateLfModeTriggeredReactions(
+              startupReactionCount, resetReactionCount, hasModalReactors));
     }
-
-    @Override
-    protected String getConflictingConnectionsInModalReactorsBody(String source, String dest) {
-        return String.join("\n",
-            "// Generated forwarding reaction for connections with the same destination",
-            "// but located in mutually exclusive modes.",
-            "lf_set("+dest+", "+source+"->value);"
-        );
-    }
-
-    /** Set the scheduler type in the target config as needed. */
-    private void pickScheduler() {
-        // Don't use a scheduler that does not prioritize reactions based on deadlines
-        // if the program contains a deadline (handler). Use the GEDF_NP scheduler instead.
-        if (!targetConfig.schedulerType.prioritizesDeadline()) {
-            // Check if a deadline is assigned to any reaction
-            if (hasDeadlines(reactors)) {
-                if (!targetConfig.setByUser.contains(TargetProperty.SCHEDULER)) {
-                    targetConfig.schedulerType = TargetProperty.SchedulerOption.GEDF_NP;
-                }
-            }
+  }
+
+  @Override
+  public void checkModalReactorSupport(boolean __) {
+    // Modal reactors are currently only supported for non federated applications
+    super.checkModalReactorSupport(true);
+  }
+
+  @Override
+  protected String getConflictingConnectionsInModalReactorsBody(String source, String dest) {
+    return String.join(
+        "\n",
+        "// Generated forwarding reaction for connections with the same destination",
+        "// but located in mutually exclusive modes.",
+        "lf_set(" + dest + ", " + source + "->value);");
+  }
+
+  /** Set the scheduler type in the target config as needed. */
+  private void pickScheduler() {
+    // Don't use a scheduler that does not prioritize reactions based on deadlines
+    // if the program contains a deadline (handler). Use the GEDF_NP scheduler instead.
+    if (!targetConfig.schedulerType.prioritizesDeadline()) {
+      // Check if a deadline is assigned to any reaction
+      if (hasDeadlines(reactors)) {
+        if (!targetConfig.setByUser.contains(TargetProperty.SCHEDULER)) {
+          targetConfig.schedulerType = TargetProperty.SchedulerOption.GEDF_NP;
         }
+      }
     }
+  }
 
-    private boolean hasDeadlines(List<Reactor> reactors) {
-        for (Reactor reactor : reactors) {
-            for (Reaction reaction : allReactions(reactor)) {
-                if (reaction.getDeadline() != null) {
-                    return true;
-                }
-            }
+  private boolean hasDeadlines(List<Reactor> reactors) {
+    for (Reactor reactor : reactors) {
+      for (Reaction reaction : allReactions(reactor)) {
+        if (reaction.getDeadline() != null) {
+          return true;
         }
-        return false;
+      }
     }
-
-    /**
-     * Look at the 'reactor' eResource.
-     * If it is an imported .lf file, incorporate it into the current
-     * program in the following manner:
-     * <ul>
-     * <li>Merge its target property with {@code targetConfig}</li>
-     * <li>If there are any preambles, add them to the preambles of the reactor.</li>
-     * </ul>
-     *
-     */
-    private void inspectReactorEResource(ReactorDecl reactor) {
-        // If the reactor is imported, look at the
-        // target definition of the .lf file in which the reactor is imported from and
-        // append any cmake-include.
-        // Check if the reactor definition is imported
-        if (reactor.eResource() != mainDef.getReactorClass().eResource()) {
-            // Find the LFResource corresponding to this eResource
-            LFResource lfResource = null;
-            for (var resource : resources) {
-                if (resource.getEResource() == reactor.eResource()) {
-                    lfResource = resource;
-                    break;
-                }
-            }
-            if (lfResource != null) {
-                // Copy the user files and cmake-includes to the src-gen path of the main .lf file
-                copyUserFiles(lfResource.getTargetConfig(), lfResource.getFileConfig());
-                // Merge the CMake includes from the imported file into the target config
-                lfResource.getTargetConfig().cmakeIncludes.forEach(incl -> {
-                    if (!this.targetConfig.cmakeIncludes.contains(incl)) {
-                        this.targetConfig.cmakeIncludes.add(incl);
-                    }
-                });
-            }
+    return false;
+  }
+
+  /**
+   * Look at the 'reactor' eResource. If it is an imported .lf file, incorporate it into the current
+   * program in the following manner:
+   *
+   * <ul>
+   *   <li>Merge its target property with {@code targetConfig}
+   *   <li>If there are any preambles, add them to the preambles of the reactor.
+   * </ul>
+   */
+  private void inspectReactorEResource(ReactorDecl reactor) {
+    // If the reactor is imported, look at the
+    // target definition of the .lf file in which the reactor is imported from and
+    // append any cmake-include.
+    // Check if the reactor definition is imported
+    if (reactor.eResource() != mainDef.getReactorClass().eResource()) {
+      // Find the LFResource corresponding to this eResource
+      LFResource lfResource = null;
+      for (var resource : resources) {
+        if (resource.getEResource() == reactor.eResource()) {
+          lfResource = resource;
+          break;
         }
+      }
+      if (lfResource != null) {
+        // Copy the user files and cmake-includes to the src-gen path of the main .lf file
+        copyUserFiles(lfResource.getTargetConfig(), lfResource.getFileConfig());
+        // Merge the CMake includes from the imported file into the target config
+        lfResource
+            .getTargetConfig()
+            .cmakeIncludes
+            .forEach(
+                incl -> {
+                  if (!this.targetConfig.cmakeIncludes.contains(incl)) {
+                    this.targetConfig.cmakeIncludes.add(incl);
+                  }
+                });
+      }
     }
-
-    /**
-     * Copy all files or directories listed in the target property {@code files}, {@code cmake-include},
-     * and {@code _fed_setup} into the src-gen folder of the main .lf file
-     *
-     * @param targetConfig The targetConfig to read the target properties from.
-     * @param fileConfig The fileConfig used to make the copy and resolve paths.
-     */
-    @Override
-    protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
-        super.copyUserFiles(targetConfig, fileConfig);
-        // Must use class variable to determine destination!
-        var destination = this.fileConfig.getSrcGenPath();
-
-        FileUtil.copyFilesOrDirectories(targetConfig.cmakeIncludes, destination, fileConfig, errorReporter, true);
-
-        // FIXME: Unclear what the following does, but it does not appear to belong here.
-        if (!StringExtensions.isNullOrEmpty(targetConfig.fedSetupPreamble)) {
-            try {
-                FileUtil.copyFile(fileConfig.srcFile.getParent().resolve(targetConfig.fedSetupPreamble),
-                                  destination.resolve(targetConfig.fedSetupPreamble));
-            } catch (IOException e) {
-                errorReporter.reportError("Failed to find _fed_setup file " + targetConfig.fedSetupPreamble);
-            }
-        }
+  }
+
+  /**
+   * Copy all files or directories listed in the target property {@code files}, {@code
+   * cmake-include}, and {@code _fed_setup} into the src-gen folder of the main .lf file
+   *
+   * @param targetConfig The targetConfig to read the target properties from.
+   * @param fileConfig The fileConfig used to make the copy and resolve paths.
+   */
+  @Override
+  protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
+    super.copyUserFiles(targetConfig, fileConfig);
+    // Must use class variable to determine destination!
+    var destination = this.fileConfig.getSrcGenPath();
+
+    FileUtil.copyFilesOrDirectories(
+        targetConfig.cmakeIncludes, destination, fileConfig, errorReporter, true);
+
+    // FIXME: Unclear what the following does, but it does not appear to belong here.
+    if (!StringExtensions.isNullOrEmpty(targetConfig.fedSetupPreamble)) {
+      try {
+        FileUtil.copyFile(
+            fileConfig.srcFile.getParent().resolve(targetConfig.fedSetupPreamble),
+            destination.resolve(targetConfig.fedSetupPreamble));
+      } catch (IOException e) {
+        errorReporter.reportError(
+            "Failed to find _fed_setup file " + targetConfig.fedSetupPreamble);
+      }
     }
-
-    /**
-     * Generate code for defining all instantiated reactors.
-     *
-     * Imported reactors' original .lf file is
-     * incorporated in the following manner:
-     * <ul>
-     * <li>If there are any cmake-include files, add them to the current list
-     * of cmake-include files.</li>
-     * <li>If there are any preambles, add them to the preambles of the reactor.</li>
-     * </ul>
-     */
-    private void generateReactorDefinitions() throws IOException {
-        var generatedReactors = new LinkedHashSet<TypeParameterizedReactor>();
-        if (this.main != null) {
-            resolveTemplatedTypes(this.main, this.main.tpr);
-            generateReactorChildren(this.main, generatedReactors);
-            generateReactorClass(this.main.getTypeParameterizedReactor());
-        }
-        // do not generate code for reactors that are not instantiated
+  }
+
+  /**
+   * Generate code for defining all instantiated reactors.
+   *
+   * <p>Imported reactors' original .lf file is incorporated in the following manner:
+   *
+   * <ul>
+   *   <li>If there are any cmake-include files, add them to the current list of cmake-include
+   *       files.
+   *   <li>If there are any preambles, add them to the preambles of the reactor.
+   * </ul>
+   */
+  private void generateReactorDefinitions() throws IOException {
+    var generatedReactors = new LinkedHashSet<TypeParameterizedReactor>();
+    if (this.main != null) {
+      resolveTemplatedTypes(this.main, this.main.tpr);
+      generateReactorChildren(this.main, generatedReactors);
+      generateReactorClass(this.main.getTypeParameterizedReactor());
     }
-
-    /**
-     * Recursively Resolve all Templated Types of child Reactors to their respective
-     * concrete types
-     *
-     * @param reactorInstance The Reactor Class
-     * @param parentTpr {@link TypeParameterizedReactor} of Parent
-     */
-    private void resolveTemplatedTypes(ReactorInstance reactorInstance, TypeParameterizedReactor parentTpr) {
-        for (var child : reactorInstance.children) {
-            if (parentTpr.typeArgs() != null) {
-                Map<String, Type> copy = new HashMap<>();
-                child.tpr.typeArgs().forEach((literal, typename) -> {
-                    var type = typename.getId();
-                    if (parentTpr.typeArgs().containsKey(type)) {
-                        var basicType = parentTpr.typeArgs().get(type);
-                        copy.put(literal, basicType);
-                    } else {
-                        // Typename is not inherited from Parent Reactor. Keep As Is!
-                        copy.put(literal, typename);
-                    }
+    // do not generate code for reactors that are not instantiated
+  }
+
+  /**
+   * Recursively Resolve all Templated Types of child Reactors to their respective concrete types
+   *
+   * @param reactorInstance The Reactor Class
+   * @param parentTpr {@link TypeParameterizedReactor} of Parent
+   */
+  private void resolveTemplatedTypes(
+      ReactorInstance reactorInstance, TypeParameterizedReactor parentTpr) {
+    for (var child : reactorInstance.children) {
+      if (parentTpr.typeArgs() != null) {
+        Map<String, Type> copy = new HashMap<>();
+        child
+            .tpr
+            .typeArgs()
+            .forEach(
+                (literal, typename) -> {
+                  var type = typename.getId();
+                  if (parentTpr.typeArgs().containsKey(type)) {
+                    var basicType = parentTpr.typeArgs().get(type);
+                    copy.put(literal, basicType);
+                  } else {
+                    // Typename is not inherited from Parent Reactor. Keep As Is!
+                    copy.put(literal, typename);
+                  }
                 });
-                if (!copy.isEmpty()) { // If we found some templated-types update the tpr with new map
-                    child.tpr = new TypeParameterizedReactor(child.tpr.reactor(), copy);
-                }
-                resolveTemplatedTypes(child, child.tpr);
-            }
-        }
-    }
-
-    private record TypeParameterizedReactorWithDecl(TypeParameterizedReactor tpr, ReactorDecl decl) {}
-
-    /** Generate user-visible header files for all reactors instantiated. */
-    private void generateHeaders() throws IOException {
-        FileUtil.deleteDirectory(fileConfig.getIncludePath());
-        FileUtil.copyFromClassPath(
-            fileConfig.getRuntimeIncludePath(),
-            fileConfig.getIncludePath(),
-            false,
-            true
-        );
-        for (TypeParameterizedReactor tpr :
-            (Iterable<TypeParameterizedReactor>) () -> allTypeParameterizedReactors().iterator()
-        ) {
-            CReactorHeaderFileGenerator.doGenerate(
-                types, tpr, fileConfig,
-                (builder, rr, userFacing) -> {
-                    generateAuxiliaryStructs(builder, rr, userFacing);
-                    if (userFacing) {
-                        rr.reactor().getInstantiations().stream()
-                            .map(it -> new TypeParameterizedReactorWithDecl(new TypeParameterizedReactor(it), it.getReactorClass())).collect(Collectors.toSet()).forEach(it -> {
-                                ASTUtils.allPorts(it.tpr.reactor())
-                                    .forEach(p -> builder.pr(CPortGenerator.generateAuxiliaryStruct(
-                                        it.tpr, p, getTarget(), errorReporter, types, new CodeBuilder(), true, it.decl()
-                                    )));
-                            });
-                    }
-                },
-                this::generateTopLevelPreambles);
+        if (!copy.isEmpty()) { // If we found some templated-types update the tpr with new map
+          child.tpr = new TypeParameterizedReactor(child.tpr.reactor(), copy);
         }
-        FileUtil.copyDirectoryContents(fileConfig.getIncludePath(), fileConfig.getSrcGenPath().resolve("include"), false);
+        resolveTemplatedTypes(child, child.tpr);
+      }
     }
-
-    /**
-     * Generate code for the children of 'reactor' that belong to 'federate'.
-     * Duplicates are avoided.
-     *
-     * Imported reactors' original .lf file is
-     * incorporated in the following manner:
-     * <ul>
-     * <li>If there are any cmake-include files, add them to the current list
-     * of cmake-include files.</li>
-     * <li>If there are any preambles, add them to the preambles of the reactor.</li>
-     * </ul>
-     *
-     * @param reactor Used to extract children from
-     */
-    private void generateReactorChildren(
-        ReactorInstance reactor,
-        LinkedHashSet<TypeParameterizedReactor> generatedReactors
-    ) throws IOException {
-        for (ReactorInstance r : reactor.children) {
-            var newTpr = r.tpr;
-            if (r.reactorDeclaration != null &&
-                  !generatedReactors.contains(newTpr)) {
-                generatedReactors.add(newTpr);
-                generateReactorChildren(r, generatedReactors);
-                inspectReactorEResource(r.reactorDeclaration);
-                generateReactorClass(newTpr);
+  }
+
+  private record TypeParameterizedReactorWithDecl(TypeParameterizedReactor tpr, ReactorDecl decl) {}
+
+  /** Generate user-visible header files for all reactors instantiated. */
+  private void generateHeaders() throws IOException {
+    FileUtil.deleteDirectory(fileConfig.getIncludePath());
+    FileUtil.copyFromClassPath(
+        fileConfig.getRuntimeIncludePath(), fileConfig.getIncludePath(), false, true);
+    for (TypeParameterizedReactor tpr :
+        (Iterable<TypeParameterizedReactor>) () -> allTypeParameterizedReactors().iterator()) {
+      CReactorHeaderFileGenerator.doGenerate(
+          types,
+          tpr,
+          fileConfig,
+          (builder, rr, userFacing) -> {
+            generateAuxiliaryStructs(builder, rr, userFacing);
+            if (userFacing) {
+              rr.reactor().getInstantiations().stream()
+                  .map(
+                      it ->
+                          new TypeParameterizedReactorWithDecl(
+                              new TypeParameterizedReactor(it), it.getReactorClass()))
+                  .collect(Collectors.toSet())
+                  .forEach(
+                      it -> {
+                        ASTUtils.allPorts(it.tpr.reactor())
+                            .forEach(
+                                p ->
+                                    builder.pr(
+                                        CPortGenerator.generateAuxiliaryStruct(
+                                            it.tpr,
+                                            p,
+                                            getTarget(),
+                                            errorReporter,
+                                            types,
+                                            new CodeBuilder(),
+                                            true,
+                                            it.decl())));
+                      });
             }
-        }
-    }
-
-    /**
-     * Choose which platform files to compile with according to the OS.
-     * If there is no main reactor, then compilation will produce a .o file requiring further linking.
-     * Also, if useCmake is set to true, we don't need to add platform files. The CMakeLists.txt file
-     * will detect and use the appropriate platform file based on the platform that cmake is invoked on.
-     */
-    private void pickCompilePlatform() {
-        var osName = System.getProperty("os.name").toLowerCase();
-        // if platform target was set, use given platform instead
-        if (targetConfig.platformOptions.platform != Platform.AUTO) {
-            osName = targetConfig.platformOptions.platform.toString();
-        } else if (Stream.of("mac", "darwin", "win", "nux").noneMatch(osName::contains)) {
-            errorReporter.reportError("Platform " + osName + " is not supported");
-        }
+          },
+          this::generateTopLevelPreambles);
     }
-
-    /**
-     * Copy target-specific header file to the src-gen directory.
-     */
-    protected void copyTargetFiles() throws IOException {
-        // Copy the core lib
-        String coreLib = LFGeneratorContext.BuildParm.EXTERNAL_RUNTIME_PATH.getValue(context);
-        Path dest = fileConfig.getSrcGenPath();
-      if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
-        dest = dest.resolve("src");
+    FileUtil.copyDirectoryContents(
+        fileConfig.getIncludePath(), fileConfig.getSrcGenPath().resolve("include"), false);
+  }
+
+  /**
+   * Generate code for the children of 'reactor' that belong to 'federate'. Duplicates are avoided.
+   *
+   * <p>Imported reactors' original .lf file is incorporated in the following manner:
+   *
+   * <ul>
+   *   <li>If there are any cmake-include files, add them to the current list of cmake-include
+   *       files.
+   *   <li>If there are any preambles, add them to the preambles of the reactor.
+   * </ul>
+   *
+   * @param reactor Used to extract children from
+   */
+  private void generateReactorChildren(
+      ReactorInstance reactor, LinkedHashSet<TypeParameterizedReactor> generatedReactors)
+      throws IOException {
+    for (ReactorInstance r : reactor.children) {
+      var newTpr = r.tpr;
+      if (r.reactorDeclaration != null && !generatedReactors.contains(newTpr)) {
+        generatedReactors.add(newTpr);
+        generateReactorChildren(r, generatedReactors);
+        inspectReactorEResource(r.reactorDeclaration);
+        generateReactorClass(newTpr);
       }
-        if (coreLib != null) {
-            FileUtil.copyDirectoryContents(Path.of(coreLib), dest, true);
-        } else {
-            FileUtil.copyFromClassPath(
-                "/lib/c/reactor-c/core",
-                dest,
-                true,
-                false
-            );
-            FileUtil.copyFromClassPath(
-                "/lib/c/reactor-c/lib",
-                dest,
-                true,
-                false
-            );
-        }
-
-        // For the Zephyr target, copy default config and board files.
-        if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
-            FileUtil.copyFromClassPath(
-                "/lib/platform/zephyr/boards",
-                fileConfig.getSrcGenPath(),
-                false,
-                false
-            );
-            FileUtil.copyFileFromClassPath(
-                "/lib/platform/zephyr/prj_lf.conf",
-                fileConfig.getSrcGenPath(),
-                true
-            );
-
-            FileUtil.copyFileFromClassPath(
-                "/lib/platform/zephyr/Kconfig",
-                fileConfig.getSrcGenPath(),
-                true
-            );
-        }
     }
-
-    ////////////////////////////////////////////
-    //// Code generators.
-
-    /**
-     * Generate a reactor class definition for the specified federate.
-     * A class definition has four parts:
-     *
-     * <ul>
-     * <li>Preamble code, if any, specified in the Lingua Franca file.</li>
-     * <li>A &quot;self&quot; struct type definition (see the class documentation above).</li>
-     * <li>A function for each reaction.</li>
-     * <li>A constructor for creating an instance.
-     * for deleting an instance.</li>
-     * </ul>
-     *
-     * <p>If the reactor is the main reactor, then
-     * the generated code may be customized. Specifically,
-     * if the main reactor has reactions, these reactions
-     * will not be generated if they are triggered by or send
-     * data to contained reactors that are not in the federate.</p>
-     */
-    private void generateReactorClass(TypeParameterizedReactor tpr) throws IOException {
-        // FIXME: Currently we're not reusing definitions for declarations that point to the same definition.
-        CodeBuilder header = new CodeBuilder();
-        CodeBuilder src = new CodeBuilder();
-        final String headerName = CUtil.getName(tpr) + ".h";
-        var guardMacro = headerName.toUpperCase().replace(".", "_");
-        header.pr("#ifndef " + guardMacro);
-        header.pr("#define " + guardMacro);
-        generateReactorClassHeaders(tpr, headerName, header, src);
-        header.pr(generateTopLevelPreambles(tpr.reactor()));
-        generateUserPreamblesForReactor(tpr.reactor(), src);
-        generateReactorClassBody(tpr, header, src);
-        header.pr("#endif // " + guardMacro);
-        FileUtil.writeToFile(CodeMap.fromGeneratedCode(header.toString()).getGeneratedCode(), fileConfig.getSrcGenPath().resolve(headerName), true);
-        var extension = targetConfig.platformOptions.platform == Platform.ARDUINO ? ".ino" :
-            CCppMode ? ".cpp" : ".c";
-        FileUtil.writeToFile(CodeMap.fromGeneratedCode(src.toString()).getGeneratedCode(), fileConfig.getSrcGenPath().resolve(CUtil.getName(tpr) + extension), true);
+  }
+
+  /**
+   * Choose which platform files to compile with according to the OS. If there is no main reactor,
+   * then compilation will produce a .o file requiring further linking. Also, if useCmake is set to
+   * true, we don't need to add platform files. The CMakeLists.txt file will detect and use the
+   * appropriate platform file based on the platform that cmake is invoked on.
+   */
+  private void pickCompilePlatform() {
+    var osName = System.getProperty("os.name").toLowerCase();
+    // if platform target was set, use given platform instead
+    if (targetConfig.platformOptions.platform != Platform.AUTO) {
+      osName = targetConfig.platformOptions.platform.toString();
+    } else if (Stream.of("mac", "darwin", "win", "nux").noneMatch(osName::contains)) {
+      errorReporter.reportError("Platform " + osName + " is not supported");
     }
-
-    protected void generateReactorClassHeaders(TypeParameterizedReactor tpr, String headerName, CodeBuilder header, CodeBuilder src) {
-        if (CCppMode) {
-            src.pr("extern \"C\" {");
-            header.pr("extern \"C\" {");
-        }
-        header.pr("#include \"include/core/reactor.h\"");
-        src.pr("#include \"include/api/api.h\"");
-        src.pr("#include \"include/api/set.h\"");
-        generateIncludes(tpr);
-        if (CCppMode) {
-            src.pr("}");
-            header.pr("}");
-        }
-        src.pr("#include \"include/" + CReactorHeaderFileGenerator.outputPath(tpr) + "\"");
-        src.pr("#include \"" + headerName + "\"");
-        tpr.doDefines(src);
-        ASTUtils.allIncludes(tpr.reactor()).stream().map(name -> "#include \""
-            + name + ".h\"").forEach(header::pr);
+  }
+
+  /** Copy target-specific header file to the src-gen directory. */
+  protected void copyTargetFiles() throws IOException {
+    // Copy the core lib
+    String coreLib = LFGeneratorContext.BuildParm.EXTERNAL_RUNTIME_PATH.getValue(context);
+    Path dest = fileConfig.getSrcGenPath();
+    if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
+      dest = dest.resolve("src");
     }
-
-    private void generateReactorClassBody(TypeParameterizedReactor tpr, CodeBuilder header, CodeBuilder src) {
-        // Some of the following methods create lines of code that need to
-        // go into the constructor.  Collect those lines of code here:
-        var constructorCode = new CodeBuilder();
-        generateAuxiliaryStructs(header, tpr, false);
-        // The following must go before the self struct so the #include watchdog.h ends up in the header.
-        CWatchdogGenerator.generateWatchdogs(src, header, tpr, errorReporter);
-        generateSelfStruct(header, tpr, constructorCode);
-        generateMethods(src, tpr);
-        generateReactions(src, tpr);
-        generateConstructor(src, header, tpr, constructorCode);
+    if (coreLib != null) {
+      FileUtil.copyDirectoryContents(Path.of(coreLib), dest, true);
+    } else {
+      FileUtil.copyFromClassPath("/lib/c/reactor-c/core", dest, true, false);
+      FileUtil.copyFromClassPath("/lib/c/reactor-c/lib", dest, true, false);
     }
 
-    /**
-     * Generate methods for {@code reactor}.
-     */
-    protected void generateMethods(CodeBuilder src, TypeParameterizedReactor tpr) {
-        CMethodGenerator.generateMethods(tpr, src, types);
-    }
+    // For the Zephyr target, copy default config and board files.
+    if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
+      FileUtil.copyFromClassPath(
+          "/lib/platform/zephyr/boards", fileConfig.getSrcGenPath(), false, false);
+      FileUtil.copyFileFromClassPath(
+          "/lib/platform/zephyr/prj_lf.conf", fileConfig.getSrcGenPath(), true);
 
-    /**
-     * Generates preambles defined by user for a given reactor
-     * @param reactor The given reactor
-     */
-    protected void generateUserPreamblesForReactor(Reactor reactor, CodeBuilder src) {
-        for (Preamble p : ASTUtils.allPreambles(reactor)) {
-            src.pr("// *********** From the preamble, verbatim:");
-            src.prSourceLineNumber(p.getCode());
-            src.pr(toText(p.getCode()));
-            src.pr("\n// *********** End of preamble.");
-        }
+      FileUtil.copyFileFromClassPath(
+          "/lib/platform/zephyr/Kconfig", fileConfig.getSrcGenPath(), true);
     }
-
-    /**
-     * Generate a constructor for the specified reactor in the specified federate.
-     * @param tpr The parsed reactor data structure.
-     * @param constructorCode Lines of code previously generated that need to
-     *  go into the constructor.
-     */
-    protected void generateConstructor(
-        CodeBuilder src, CodeBuilder header, TypeParameterizedReactor tpr, CodeBuilder constructorCode
-    ) {
-        header.pr(CConstructorGenerator.generateConstructorPrototype(tpr));
-        src.pr(CConstructorGenerator.generateConstructor(
-            tpr,
-            constructorCode.toString()
-        ));
+  }
+
+  ////////////////////////////////////////////
+  //// Code generators.
+
+  /**
+   * Generate a reactor class definition for the specified federate. A class definition has four
+   * parts:
+   *
+   * <ul>
+   *   <li>Preamble code, if any, specified in the Lingua Franca file.
+   *   <li>A &quot;self&quot; struct type definition (see the class documentation above).
+   *   <li>A function for each reaction.
+   *   <li>A constructor for creating an instance. for deleting an instance.
+   * </ul>
+   *
+   * <p>If the reactor is the main reactor, then the generated code may be customized. Specifically,
+   * if the main reactor has reactions, these reactions will not be generated if they are triggered
+   * by or send data to contained reactors that are not in the federate.
+   */
+  private void generateReactorClass(TypeParameterizedReactor tpr) throws IOException {
+    // FIXME: Currently we're not reusing definitions for declarations that point to the same
+    // definition.
+    CodeBuilder header = new CodeBuilder();
+    CodeBuilder src = new CodeBuilder();
+    final String headerName = CUtil.getName(tpr) + ".h";
+    var guardMacro = headerName.toUpperCase().replace(".", "_");
+    header.pr("#ifndef " + guardMacro);
+    header.pr("#define " + guardMacro);
+    generateReactorClassHeaders(tpr, headerName, header, src);
+    header.pr(generateTopLevelPreambles(tpr.reactor()));
+    generateUserPreamblesForReactor(tpr.reactor(), src);
+    generateReactorClassBody(tpr, header, src);
+    header.pr("#endif // " + guardMacro);
+    FileUtil.writeToFile(
+        CodeMap.fromGeneratedCode(header.toString()).getGeneratedCode(),
+        fileConfig.getSrcGenPath().resolve(headerName),
+        true);
+    var extension =
+        targetConfig.platformOptions.platform == Platform.ARDUINO
+            ? ".ino"
+            : CCppMode ? ".cpp" : ".c";
+    FileUtil.writeToFile(
+        CodeMap.fromGeneratedCode(src.toString()).getGeneratedCode(),
+        fileConfig.getSrcGenPath().resolve(CUtil.getName(tpr) + extension),
+        true);
+  }
+
+  protected void generateReactorClassHeaders(
+      TypeParameterizedReactor tpr, String headerName, CodeBuilder header, CodeBuilder src) {
+    if (CCppMode) {
+      src.pr("extern \"C\" {");
+      header.pr("extern \"C\" {");
     }
-
-    protected void generateIncludes(TypeParameterizedReactor tpr) {
-        code.pr("#include \"" + CUtil.getName(tpr) + ".h\"");
+    header.pr("#include \"include/core/reactor.h\"");
+    src.pr("#include \"include/api/api.h\"");
+    src.pr("#include \"include/api/set.h\"");
+    generateIncludes(tpr);
+    if (CCppMode) {
+      src.pr("}");
+      header.pr("}");
     }
-
-    /**
-     * Generate the struct type definitions for inputs, outputs, and
-     * actions of the specified reactor.
-     */
-    protected void generateAuxiliaryStructs(CodeBuilder builder, TypeParameterizedReactor tpr, boolean userFacing) {
-        // In the case where there are incoming
-        // p2p logical connections in decentralized
-        // federated execution, there will be an
-        // intended_tag field added to accommodate
-        // the case where a reaction triggered by a
-        // port or action is late due to network
-        // latency, etc..
-        var federatedExtension = new CodeBuilder();
-        federatedExtension.pr(String.format("""
+    src.pr("#include \"include/" + CReactorHeaderFileGenerator.outputPath(tpr) + "\"");
+    src.pr("#include \"" + headerName + "\"");
+    tpr.doDefines(src);
+    ASTUtils.allIncludes(tpr.reactor()).stream()
+        .map(name -> "#include \"" + name + ".h\"")
+        .forEach(header::pr);
+  }
+
+  private void generateReactorClassBody(
+      TypeParameterizedReactor tpr, CodeBuilder header, CodeBuilder src) {
+    // Some of the following methods create lines of code that need to
+    // go into the constructor.  Collect those lines of code here:
+    var constructorCode = new CodeBuilder();
+    generateAuxiliaryStructs(header, tpr, false);
+    // The following must go before the self struct so the #include watchdog.h ends up in the
+    // header.
+    CWatchdogGenerator.generateWatchdogs(src, header, tpr, errorReporter);
+    generateSelfStruct(header, tpr, constructorCode);
+    generateMethods(src, tpr);
+    generateReactions(src, tpr);
+    generateConstructor(src, header, tpr, constructorCode);
+  }
+
+  /** Generate methods for {@code reactor}. */
+  protected void generateMethods(CodeBuilder src, TypeParameterizedReactor tpr) {
+    CMethodGenerator.generateMethods(tpr, src, types);
+  }
+
+  /**
+   * Generates preambles defined by user for a given reactor
+   *
+   * @param reactor The given reactor
+   */
+  protected void generateUserPreamblesForReactor(Reactor reactor, CodeBuilder src) {
+    for (Preamble p : ASTUtils.allPreambles(reactor)) {
+      src.pr("// *********** From the preamble, verbatim:");
+      src.prSourceLineNumber(p.getCode());
+      src.pr(toText(p.getCode()));
+      src.pr("\n// *********** End of preamble.");
+    }
+  }
+
+  /**
+   * Generate a constructor for the specified reactor in the specified federate.
+   *
+   * @param tpr The parsed reactor data structure.
+   * @param constructorCode Lines of code previously generated that need to go into the constructor.
+   */
+  protected void generateConstructor(
+      CodeBuilder src,
+      CodeBuilder header,
+      TypeParameterizedReactor tpr,
+      CodeBuilder constructorCode) {
+    header.pr(CConstructorGenerator.generateConstructorPrototype(tpr));
+    src.pr(CConstructorGenerator.generateConstructor(tpr, constructorCode.toString()));
+  }
+
+  protected void generateIncludes(TypeParameterizedReactor tpr) {
+    code.pr("#include \"" + CUtil.getName(tpr) + ".h\"");
+  }
+
+  /**
+   * Generate the struct type definitions for inputs, outputs, and actions of the specified reactor.
+   */
+  protected void generateAuxiliaryStructs(
+      CodeBuilder builder, TypeParameterizedReactor tpr, boolean userFacing) {
+    // In the case where there are incoming
+    // p2p logical connections in decentralized
+    // federated execution, there will be an
+    // intended_tag field added to accommodate
+    // the case where a reaction triggered by a
+    // port or action is late due to network
+    // latency, etc..
+    var federatedExtension = new CodeBuilder();
+    federatedExtension.pr(
+        String.format(
+            """
             #ifdef FEDERATED
             #ifdef FEDERATED_DECENTRALIZED
             %s intended_tag;
             #endif
             %s physical_time_of_arrival;
             #endif
-            """, types.getTargetTagType(), types.getTargetTimeType())
-        );
-        for (Port p : allPorts(tpr.reactor())) {
-            builder.pr(CPortGenerator.generateAuxiliaryStruct(
-                tpr,
-                p,
-                getTarget(),
-                errorReporter,
-                types,
-                federatedExtension,
-                userFacing,
-                null
-            ));
-        }
-        // The very first item on this struct needs to be
-        // a trigger_t* because the struct will be cast to (trigger_t*)
-        // by the lf_schedule() functions to get to the trigger.
-        for (Action action : allActions(tpr.reactor())) {
-            builder.pr(CActionGenerator.generateAuxiliaryStruct(
-                tpr,
-                action,
-                getTarget(),
-                types,
-                federatedExtension,
-                userFacing
-            ));
-        }
+            """,
+            types.getTargetTagType(), types.getTargetTimeType()));
+    for (Port p : allPorts(tpr.reactor())) {
+      builder.pr(
+          CPortGenerator.generateAuxiliaryStruct(
+              tpr, p, getTarget(), errorReporter, types, federatedExtension, userFacing, null));
     }
-
-    /**
-     * Generate the self struct type definition for the specified reactor
-     * in the specified federate.
-     * @param constructorCode Place to put lines of code that need to
-     *  go into the constructor.
-     */
-    private void generateSelfStruct(CodeBuilder builder, TypeParameterizedReactor tpr, CodeBuilder constructorCode) {
-        var reactor = toDefinition(tpr.reactor());
-        var selfType = CUtil.selfType(tpr);
-
-        // Construct the typedef for the "self" struct.
-        // Create a type name for the self struct.
-        var body = new CodeBuilder();
-
-        // Extensions can add functionality to the CGenerator
-        generateSelfStructExtension(body, reactor, constructorCode);
-
-        // Next handle parameters.
-        body.pr(CParameterGenerator.generateDeclarations(tpr, types));
-
-        // Next handle states.
-        body.pr(CStateGenerator.generateDeclarations(tpr, types));
-
-        // Next handle actions.
-        CActionGenerator.generateDeclarations(tpr, body, constructorCode);
-
-        // Next handle inputs and outputs.
-        CPortGenerator.generateDeclarations(tpr, reactor, body, constructorCode);
-
-        // If there are contained reactors that either receive inputs
-        // from reactions of this reactor or produce outputs that trigger
-        // reactions of this reactor, then we need to create a struct
-        // inside the self struct for each contained reactor. That
-        // struct has a place to hold the data produced by this reactor's
-        // reactions and a place to put pointers to data produced by
-        // the contained reactors.
-        generateInteractingContainedReactors(tpr, body, constructorCode);
-
-        // Next, generate the fields needed for each reaction.
-        CReactionGenerator.generateReactionAndTriggerStructs(
-            body,
-            tpr,
-            constructorCode,
-            types
-        );
-
-        // Generate the fields needed for each watchdog.
-        CWatchdogGenerator.generateWatchdogStruct(body, tpr, constructorCode);
-
-        // Next, generate fields for modes
-        CModesGenerator.generateDeclarations(reactor, body, constructorCode);
-
-        // The first field has to always be a pointer to the list of
-        // of allocated memory that must be freed when the reactor is freed.
-        // This means that the struct can be safely cast to self_base_t.
-        builder.pr("typedef struct {");
-        builder.indent();
-        builder.pr("struct self_base_t base;");
-        builder.pr(body.toString());
-        builder.unindent();
-        builder.pr("} " + selfType + ";");
+    // The very first item on this struct needs to be
+    // a trigger_t* because the struct will be cast to (trigger_t*)
+    // by the lf_schedule() functions to get to the trigger.
+    for (Action action : allActions(tpr.reactor())) {
+      builder.pr(
+          CActionGenerator.generateAuxiliaryStruct(
+              tpr, action, getTarget(), types, federatedExtension, userFacing));
     }
-
-    /**
-     * Generate structs and associated code for contained reactors that
-     * send or receive data to or from the container's reactions.
-     *
-     * If there are contained reactors that either receive inputs
-     * from reactions of this reactor or produce outputs that trigger
-     * reactions of this reactor, then we need to create a struct
-     * inside the self struct of the container for each contained reactor.
-     * That struct has a place to hold the data produced by the container reactor's
-     * reactions and a place to put pointers to data produced by
-     * the contained reactors.
-     *
-     * @param tpr {@link TypeParameterizedReactor}
-     * @param body The place to put the struct definition for the contained reactors.
-     * @param constructorCode The place to put matching code that goes in the container's constructor.
-     */
-    private void generateInteractingContainedReactors(
-        TypeParameterizedReactor tpr,
-        CodeBuilder body,
-        CodeBuilder constructorCode
-    ) {
-        // The contents of the struct will be collected first so that
-        // we avoid duplicate entries and then the struct will be constructed.
-        var contained = new InteractingContainedReactors(tpr.reactor());
-        // Next generate the relevant code.
-        for (Instantiation containedReactor : contained.containedReactors()) {
-            var containedTpr = new TypeParameterizedReactor(containedReactor);
-            // First define an _width variable in case it is a bank.
-            var array = "";
-            var width = -2;
-            // If the instantiation is a bank, find the maximum bank width
-            // to define an array.
-            if (containedReactor.getWidthSpec() != null) {
-                width = CReactionGenerator.maxContainedReactorBankWidth(containedReactor, null, 0, mainDef);
-                array = "[" + width + "]";
-            }
-            // NOTE: The following needs to be done for each instance
-            // so that the width can be parameter, not in the constructor.
-            // Here, we conservatively use a width that is the largest of all instances.
-            constructorCode.pr(String.join("\n",
-                "// Set the _width variable for all cases. This will be -2",
-                "// if the reactor is not a bank of reactors.",
-                "self->_lf_"+containedReactor.getName()+"_width = "+width+";"
-            ));
-
-            // Generate one struct for each contained reactor that interacts.
-            body.pr("struct {");
-            body.indent();
-            for (Port port : contained.portsOfInstance(containedReactor)) {
-                if (port instanceof Input) {
-                    // If the variable is a multiport, then the place to store the data has
-                    // to be malloc'd at initialization.
-                    if (!ASTUtils.isMultiport(port)) {
-                        // Not a multiport.
-                        body.pr(port, variableStructType(port, containedTpr, false)+" "+port.getName()+";");
-                    } else {
-                        // Is a multiport.
-                        // Memory will be malloc'd in initialization.
-                        body.pr(port, String.join("\n",
-                            variableStructType(port, containedTpr, false)+"** "+port.getName()+";",
-                            "int "+port.getName()+"_width;"
-                        ));
-                    }
-                } else {
-                    // Must be an output port.
-                    // Outputs of contained reactors are pointers to the source of data on the
-                    // self struct of the container.
-                    if (!ASTUtils.isMultiport(port)) {
-                        // Not a multiport.
-                        body.pr(port, variableStructType(port, containedTpr, false)+"* "+port.getName()+";");
-                    } else {
-                        // Is a multiport.
-                        // Here, we will use an array of pointers.
-                        // Memory will be malloc'd in initialization.
-                        body.pr(port, String.join("\n",
-                            variableStructType(port, containedTpr, false)+"** "+port.getName()+";",
-                            "int "+port.getName()+"_width;"
-                        ));
-                    }
-                    body.pr(port, "trigger_t "+port.getName()+"_trigger;");
-                    var reactorIndex = "";
-                    if (containedReactor.getWidthSpec() != null) {
-                        reactorIndex = "[reactor_index]";
-                        constructorCode.pr("for (int reactor_index = 0; reactor_index < self->_lf_"+containedReactor.getName()+"_width; reactor_index++) {");
-                        constructorCode.indent();
-                    }
-                    var portOnSelf = "self->_lf_"+containedReactor.getName()+reactorIndex+"."+port.getName();
-
-                    constructorCode.pr(
-                        port,
-                        CExtensionUtils.surroundWithIfFederatedDecentralized(
-                            portOnSelf+"_trigger.intended_tag = (tag_t) { .time = NEVER, .microstep = 0u};"
-                        )
-                    );
-
-                    var triggered = contained.reactionsTriggered(containedReactor, port);
-                    //noinspection StatementWithEmptyBody
-                    if (triggered.size() > 0) {
-                        body.pr(port, "reaction_t* "+port.getName()+"_reactions["+triggered.size()+"];");
-                        var triggeredCount = 0;
-                        for (Integer index : triggered) {
-                            constructorCode.pr(port, portOnSelf+"_reactions["+triggeredCount+++"] = &self->_lf__reaction_"+index+";");
-                        }
-                        constructorCode.pr(port, portOnSelf+"_trigger.reactions = "+portOnSelf+"_reactions;");
-                    } else {
-                        // Since the self struct is created using calloc, there is no need to set
-                        // self->_lf_"+containedReactor.getName()+"."+port.getName()+"_trigger.reactions = NULL
-                    }
-                    // Since the self struct is created using calloc, there is no need to set falsy fields.
-                    constructorCode.pr(port, String.join("\n",
-                        portOnSelf+"_trigger.last = NULL;",
-                        portOnSelf+"_trigger.number_of_reactions = "+triggered.size()+";"
-                    ));
-
-
-                    // Set the physical_time_of_arrival
-                    constructorCode.pr(
-                        port,
-                        CExtensionUtils.surroundWithIfFederated(
-                            portOnSelf+"_trigger.physical_time_of_arrival = NEVER;"
-                        )
-                    );
-
-                    if (containedReactor.getWidthSpec() != null) {
-                        constructorCode.unindent();
-                        constructorCode.pr("}");
-                    }
-                }
+  }
+
+  /**
+   * Generate the self struct type definition for the specified reactor in the specified federate.
+   *
+   * @param constructorCode Place to put lines of code that need to go into the constructor.
+   */
+  private void generateSelfStruct(
+      CodeBuilder builder, TypeParameterizedReactor tpr, CodeBuilder constructorCode) {
+    var reactor = toDefinition(tpr.reactor());
+    var selfType = CUtil.selfType(tpr);
+
+    // Construct the typedef for the "self" struct.
+    // Create a type name for the self struct.
+    var body = new CodeBuilder();
+
+    // Extensions can add functionality to the CGenerator
+    generateSelfStructExtension(body, reactor, constructorCode);
+
+    // Next handle parameters.
+    body.pr(CParameterGenerator.generateDeclarations(tpr, types));
+
+    // Next handle states.
+    body.pr(CStateGenerator.generateDeclarations(tpr, types));
+
+    // Next handle actions.
+    CActionGenerator.generateDeclarations(tpr, body, constructorCode);
+
+    // Next handle inputs and outputs.
+    CPortGenerator.generateDeclarations(tpr, reactor, body, constructorCode);
+
+    // If there are contained reactors that either receive inputs
+    // from reactions of this reactor or produce outputs that trigger
+    // reactions of this reactor, then we need to create a struct
+    // inside the self struct for each contained reactor. That
+    // struct has a place to hold the data produced by this reactor's
+    // reactions and a place to put pointers to data produced by
+    // the contained reactors.
+    generateInteractingContainedReactors(tpr, body, constructorCode);
+
+    // Next, generate the fields needed for each reaction.
+    CReactionGenerator.generateReactionAndTriggerStructs(body, tpr, constructorCode, types);
+
+    // Generate the fields needed for each watchdog.
+    CWatchdogGenerator.generateWatchdogStruct(body, tpr, constructorCode);
+
+    // Next, generate fields for modes
+    CModesGenerator.generateDeclarations(reactor, body, constructorCode);
+
+    // The first field has to always be a pointer to the list of
+    // of allocated memory that must be freed when the reactor is freed.
+    // This means that the struct can be safely cast to self_base_t.
+    builder.pr("typedef struct {");
+    builder.indent();
+    builder.pr("struct self_base_t base;");
+    builder.pr(body.toString());
+    builder.unindent();
+    builder.pr("} " + selfType + ";");
+  }
+
+  /**
+   * Generate structs and associated code for contained reactors that send or receive data to or
+   * from the container's reactions.
+   *
+   * <p>If there are contained reactors that either receive inputs from reactions of this reactor or
+   * produce outputs that trigger reactions of this reactor, then we need to create a struct inside
+   * the self struct of the container for each contained reactor. That struct has a place to hold
+   * the data produced by the container reactor's reactions and a place to put pointers to data
+   * produced by the contained reactors.
+   *
+   * @param tpr {@link TypeParameterizedReactor}
+   * @param body The place to put the struct definition for the contained reactors.
+   * @param constructorCode The place to put matching code that goes in the container's constructor.
+   */
+  private void generateInteractingContainedReactors(
+      TypeParameterizedReactor tpr, CodeBuilder body, CodeBuilder constructorCode) {
+    // The contents of the struct will be collected first so that
+    // we avoid duplicate entries and then the struct will be constructed.
+    var contained = new InteractingContainedReactors(tpr.reactor());
+    // Next generate the relevant code.
+    for (Instantiation containedReactor : contained.containedReactors()) {
+      var containedTpr = new TypeParameterizedReactor(containedReactor);
+      // First define an _width variable in case it is a bank.
+      var array = "";
+      var width = -2;
+      // If the instantiation is a bank, find the maximum bank width
+      // to define an array.
+      if (containedReactor.getWidthSpec() != null) {
+        width = CReactionGenerator.maxContainedReactorBankWidth(containedReactor, null, 0, mainDef);
+        array = "[" + width + "]";
+      }
+      // NOTE: The following needs to be done for each instance
+      // so that the width can be parameter, not in the constructor.
+      // Here, we conservatively use a width that is the largest of all instances.
+      constructorCode.pr(
+          String.join(
+              "\n",
+              "// Set the _width variable for all cases. This will be -2",
+              "// if the reactor is not a bank of reactors.",
+              "self->_lf_" + containedReactor.getName() + "_width = " + width + ";"));
+
+      // Generate one struct for each contained reactor that interacts.
+      body.pr("struct {");
+      body.indent();
+      for (Port port : contained.portsOfInstance(containedReactor)) {
+        if (port instanceof Input) {
+          // If the variable is a multiport, then the place to store the data has
+          // to be malloc'd at initialization.
+          if (!ASTUtils.isMultiport(port)) {
+            // Not a multiport.
+            body.pr(
+                port, variableStructType(port, containedTpr, false) + " " + port.getName() + ";");
+          } else {
+            // Is a multiport.
+            // Memory will be malloc'd in initialization.
+            body.pr(
+                port,
+                String.join(
+                    "\n",
+                    variableStructType(port, containedTpr, false) + "** " + port.getName() + ";",
+                    "int " + port.getName() + "_width;"));
+          }
+        } else {
+          // Must be an output port.
+          // Outputs of contained reactors are pointers to the source of data on the
+          // self struct of the container.
+          if (!ASTUtils.isMultiport(port)) {
+            // Not a multiport.
+            body.pr(
+                port, variableStructType(port, containedTpr, false) + "* " + port.getName() + ";");
+          } else {
+            // Is a multiport.
+            // Here, we will use an array of pointers.
+            // Memory will be malloc'd in initialization.
+            body.pr(
+                port,
+                String.join(
+                    "\n",
+                    variableStructType(port, containedTpr, false) + "** " + port.getName() + ";",
+                    "int " + port.getName() + "_width;"));
+          }
+          body.pr(port, "trigger_t " + port.getName() + "_trigger;");
+          var reactorIndex = "";
+          if (containedReactor.getWidthSpec() != null) {
+            reactorIndex = "[reactor_index]";
+            constructorCode.pr(
+                "for (int reactor_index = 0; reactor_index < self->_lf_"
+                    + containedReactor.getName()
+                    + "_width; reactor_index++) {");
+            constructorCode.indent();
+          }
+          var portOnSelf =
+              "self->_lf_" + containedReactor.getName() + reactorIndex + "." + port.getName();
+
+          constructorCode.pr(
+              port,
+              CExtensionUtils.surroundWithIfFederatedDecentralized(
+                  portOnSelf
+                      + "_trigger.intended_tag = (tag_t) { .time = NEVER, .microstep = 0u};"));
+
+          var triggered = contained.reactionsTriggered(containedReactor, port);
+          //noinspection StatementWithEmptyBody
+          if (triggered.size() > 0) {
+            body.pr(
+                port, "reaction_t* " + port.getName() + "_reactions[" + triggered.size() + "];");
+            var triggeredCount = 0;
+            for (Integer index : triggered) {
+              constructorCode.pr(
+                  port,
+                  portOnSelf
+                      + "_reactions["
+                      + triggeredCount++
+                      + "] = &self->_lf__reaction_"
+                      + index
+                      + ";");
             }
-            body.unindent();
-            body.pr(String.join("\n",
-                "} _lf_"+containedReactor.getName()+array+";",
-                "int _lf_"+containedReactor.getName()+"_width;"
-            ));
+            constructorCode.pr(
+                port, portOnSelf + "_trigger.reactions = " + portOnSelf + "_reactions;");
+          } else {
+            // Since the self struct is created using calloc, there is no need to set
+            // self->_lf_"+containedReactor.getName()+"."+port.getName()+"_trigger.reactions = NULL
+          }
+          // Since the self struct is created using calloc, there is no need to set falsy fields.
+          constructorCode.pr(
+              port,
+              String.join(
+                  "\n",
+                  portOnSelf + "_trigger.last = NULL;",
+                  portOnSelf + "_trigger.number_of_reactions = " + triggered.size() + ";"));
+
+          // Set the physical_time_of_arrival
+          constructorCode.pr(
+              port,
+              CExtensionUtils.surroundWithIfFederated(
+                  portOnSelf + "_trigger.physical_time_of_arrival = NEVER;"));
+
+          if (containedReactor.getWidthSpec() != null) {
+            constructorCode.unindent();
+            constructorCode.pr("}");
+          }
         }
+      }
+      body.unindent();
+      body.pr(
+          String.join(
+              "\n",
+              "} _lf_" + containedReactor.getName() + array + ";",
+              "int _lf_" + containedReactor.getName() + "_width;"));
     }
-
-    /**
-     * This function is provided to allow extensions of the CGenerator to append the structure of the self struct
-     * @param body The body of the self struct
-     * @param reactor The reactor declaration for the self struct
-     * @param constructorCode Code that is executed when the reactor is instantiated
-     */
-    protected void generateSelfStructExtension(
-        CodeBuilder body,
-        Reactor reactor,
-        CodeBuilder constructorCode
-    ) {
-        // Do nothing
-    }
-
-    /** Generate reaction functions definition for a reactor.
-     *  These functions have a single argument that is a void* pointing to
-     *  a struct that contains parameters, state variables, inputs (triggering or not),
-     *  actions (triggering or produced), and outputs.
-     *  @param tpr The reactor.
-     */
-    public void generateReactions(CodeBuilder src, TypeParameterizedReactor tpr) {
-        var reactionIndex = 0;
-        var reactor = ASTUtils.toDefinition(tpr.reactor());
-        for (Reaction reaction : allReactions(reactor)) {
-            generateReaction(src, reaction, tpr, reactionIndex);
-            // Increment reaction index even if the reaction is not in the federate
-            // so that across federates, the reaction indices are consistent.
-            reactionIndex++;
-        }
+  }
+
+  /**
+   * This function is provided to allow extensions of the CGenerator to append the structure of the
+   * self struct
+   *
+   * @param body The body of the self struct
+   * @param reactor The reactor declaration for the self struct
+   * @param constructorCode Code that is executed when the reactor is instantiated
+   */
+  protected void generateSelfStructExtension(
+      CodeBuilder body, Reactor reactor, CodeBuilder constructorCode) {
+    // Do nothing
+  }
+
+  /**
+   * Generate reaction functions definition for a reactor. These functions have a single argument
+   * that is a void* pointing to a struct that contains parameters, state variables, inputs
+   * (triggering or not), actions (triggering or produced), and outputs.
+   *
+   * @param tpr The reactor.
+   */
+  public void generateReactions(CodeBuilder src, TypeParameterizedReactor tpr) {
+    var reactionIndex = 0;
+    var reactor = ASTUtils.toDefinition(tpr.reactor());
+    for (Reaction reaction : allReactions(reactor)) {
+      generateReaction(src, reaction, tpr, reactionIndex);
+      // Increment reaction index even if the reaction is not in the federate
+      // so that across federates, the reaction indices are consistent.
+      reactionIndex++;
     }
-
-    /** Generate a reaction function definition for a reactor.
-     *  This function will have a single argument that is a void* pointing to
-     *  a struct that contains parameters, state variables, inputs (triggering or not),
-     *  actions (triggering or produced), and outputs.
-     *  @param reaction The reaction.
-     *  @param tpr The reactor.
-     *  @param reactionIndex The position of the reaction within the reactor.
-     */
-    protected void generateReaction(CodeBuilder src, Reaction reaction, TypeParameterizedReactor tpr, int reactionIndex) {
-        src.pr(CReactionGenerator.generateReaction(
+  }
+
+  /**
+   * Generate a reaction function definition for a reactor. This function will have a single
+   * argument that is a void* pointing to a struct that contains parameters, state variables, inputs
+   * (triggering or not), actions (triggering or produced), and outputs.
+   *
+   * @param reaction The reaction.
+   * @param tpr The reactor.
+   * @param reactionIndex The position of the reaction within the reactor.
+   */
+  protected void generateReaction(
+      CodeBuilder src, Reaction reaction, TypeParameterizedReactor tpr, int reactionIndex) {
+    src.pr(
+        CReactionGenerator.generateReaction(
             reaction,
             tpr,
             reactionIndex,
@@ -1427,702 +1423,737 @@ protected void generateReaction(CodeBuilder src, Reaction reaction, TypeParamete
             errorReporter,
             types,
             targetConfig,
-            getTarget().requiresTypes
-        ));
-    }
-
-    /**
-     * Record startup, shutdown, and reset reactions.
-     * @param instance A reactor instance.
-     */
-    private void recordBuiltinTriggers(ReactorInstance instance) {
-        // For each reaction instance, allocate the arrays that will be used to
-        // trigger downstream reactions.
-        for (ReactionInstance reaction : instance.reactions) {
-            var reactor = reaction.getParent();
-            var temp = new CodeBuilder();
-            var foundOne = false;
-
-            var reactionRef = CUtil.reactionRef(reaction);
-
-            // Next handle triggers of the reaction that come from a multiport output
-            // of a contained reactor.  Also, handle startup and shutdown triggers.
-            for (TriggerInstance<?> trigger : reaction.triggers) {
-                if (trigger.isStartup()) {
-                    temp.pr("_lf_startup_reactions[_lf_startup_reactions_count++] = &"+reactionRef+";");
-                    startupReactionCount += reactor.getTotalWidth();
-                    foundOne = true;
-                } else if (trigger.isShutdown()) {
-                    temp.pr("_lf_shutdown_reactions[_lf_shutdown_reactions_count++] = &"+reactionRef+";");
-                    foundOne = true;
-                    shutdownReactionCount += reactor.getTotalWidth();
-
-                    if (targetConfig.tracing != null) {
-                        var description = CUtil.getShortenedName(reactor);
-                        var reactorRef = CUtil.reactorRef(reactor);
-                        temp.pr(String.join("\n",
-                            "_lf_register_trace_event("+reactorRef+", &("+reactorRef+"->_lf__shutdown),",
-                            "trace_trigger, "+addDoubleQuotes(description+".shutdown")+");"
-                        ));
-                    }
-                } else if (trigger.isReset()) {
-                    temp.pr("_lf_reset_reactions[_lf_reset_reactions_count++] = &"+reactionRef+";");
-                    resetReactionCount += reactor.getTotalWidth();
-                    foundOne = true;
-                }
-            }
-            if (foundOne) initializeTriggerObjects.pr(temp.toString());
+            getTarget().requiresTypes));
+  }
+
+  /**
+   * Record startup, shutdown, and reset reactions.
+   *
+   * @param instance A reactor instance.
+   */
+  private void recordBuiltinTriggers(ReactorInstance instance) {
+    // For each reaction instance, allocate the arrays that will be used to
+    // trigger downstream reactions.
+    for (ReactionInstance reaction : instance.reactions) {
+      var reactor = reaction.getParent();
+      var temp = new CodeBuilder();
+      var foundOne = false;
+
+      var reactionRef = CUtil.reactionRef(reaction);
+
+      // Next handle triggers of the reaction that come from a multiport output
+      // of a contained reactor.  Also, handle startup and shutdown triggers.
+      for (TriggerInstance<?> trigger : reaction.triggers) {
+        if (trigger.isStartup()) {
+          temp.pr("_lf_startup_reactions[_lf_startup_reactions_count++] = &" + reactionRef + ";");
+          startupReactionCount += reactor.getTotalWidth();
+          foundOne = true;
+        } else if (trigger.isShutdown()) {
+          temp.pr("_lf_shutdown_reactions[_lf_shutdown_reactions_count++] = &" + reactionRef + ";");
+          foundOne = true;
+          shutdownReactionCount += reactor.getTotalWidth();
+
+          if (targetConfig.tracing != null) {
+            var description = CUtil.getShortenedName(reactor);
+            var reactorRef = CUtil.reactorRef(reactor);
+            temp.pr(
+                String.join(
+                    "\n",
+                    "_lf_register_trace_event("
+                        + reactorRef
+                        + ", &("
+                        + reactorRef
+                        + "->_lf__shutdown),",
+                    "trace_trigger, " + addDoubleQuotes(description + ".shutdown") + ");"));
+          }
+        } else if (trigger.isReset()) {
+          temp.pr("_lf_reset_reactions[_lf_reset_reactions_count++] = &" + reactionRef + ";");
+          resetReactionCount += reactor.getTotalWidth();
+          foundOne = true;
         }
+      }
+      if (foundOne) initializeTriggerObjects.pr(temp.toString());
     }
-
-    /**
-     * Generate code to set up the tables used in _lf_start_time_step to decrement reference
-     * counts and mark outputs absent between time steps. This function puts the code
-     * into startTimeStep.
-     */
-    private void generateStartTimeStep(ReactorInstance instance) {
-        // Avoid generating dead code if nothing is relevant.
-        var foundOne = false;
-        var temp = new CodeBuilder();
-        var containerSelfStructName = CUtil.reactorRef(instance);
-
-        // Handle inputs that get sent data from a reaction rather than from
-        // another contained reactor and reactions that are triggered by an
-        // output of a contained reactor.
-        // Note that there may be more than one reaction reacting to the same
-        // port so we have to avoid listing the port more than once.
-        var portsSeen = new LinkedHashSet<PortInstance>();
-        for (ReactionInstance reaction : instance.reactions) {
-            for (PortInstance port : Iterables.filter(reaction.effects, PortInstance.class)) {
-                if (port.getDefinition() instanceof Input && !portsSeen.contains(port)) {
-                    portsSeen.add(port);
-                    // This reaction is sending to an input. Must be
-                    // the input of a contained reactor in the federate.
-                    // NOTE: If instance == main and the federate is within a bank,
-                    // this assumes that the reaction writes only to the bank member in the federate.
-                    foundOne = true;
-
-                    temp.pr("// Add port "+port.getFullName()+" to array of is_present fields.");
-
-                    if (!instance.equals(port.getParent())) {
-                        // The port belongs to contained reactor, so we also have
-                        // iterate over the instance bank members.
-                        temp.startScopedBlock();
-                        temp.pr("int count = 0; SUPPRESS_UNUSED_WARNING(count);");
-                        temp.startScopedBlock(instance);
-                        temp.startScopedBankChannelIteration(port, null);
-                    } else {
-                        temp.startScopedBankChannelIteration(port, "count");
-                    }
-                    var portRef = CUtil.portRefNested(port);
-                    var con = (port.isMultiport()) ? "->" : ".";
-
-                    temp.pr("_lf_is_present_fields["+startTimeStepIsPresentCount+" + count] = &"+portRef+con+"is_present;");
-                    // Intended_tag is only applicable to ports in federated execution.
-                    temp.pr(
-                        CExtensionUtils.surroundWithIfFederatedDecentralized(
-                        "_lf_intended_tag_fields["+startTimeStepIsPresentCount+" + count] = &"+portRef+con+"intended_tag;"
-                        )
-                    );
-
-                    startTimeStepIsPresentCount += port.getWidth() * port.getParent().getTotalWidth();
-
-                    if (!instance.equals(port.getParent())) {
-                        temp.pr("count++;");
-                        temp.endScopedBlock();
-                        temp.endScopedBlock();
-                        temp.endScopedBankChannelIteration(port, null);
-                    } else {
-                        temp.endScopedBankChannelIteration(port, "count");
-                    }
-                }
-            }
+  }
+
+  /**
+   * Generate code to set up the tables used in _lf_start_time_step to decrement reference counts
+   * and mark outputs absent between time steps. This function puts the code into startTimeStep.
+   */
+  private void generateStartTimeStep(ReactorInstance instance) {
+    // Avoid generating dead code if nothing is relevant.
+    var foundOne = false;
+    var temp = new CodeBuilder();
+    var containerSelfStructName = CUtil.reactorRef(instance);
+
+    // Handle inputs that get sent data from a reaction rather than from
+    // another contained reactor and reactions that are triggered by an
+    // output of a contained reactor.
+    // Note that there may be more than one reaction reacting to the same
+    // port so we have to avoid listing the port more than once.
+    var portsSeen = new LinkedHashSet<PortInstance>();
+    for (ReactionInstance reaction : instance.reactions) {
+      for (PortInstance port : Iterables.filter(reaction.effects, PortInstance.class)) {
+        if (port.getDefinition() instanceof Input && !portsSeen.contains(port)) {
+          portsSeen.add(port);
+          // This reaction is sending to an input. Must be
+          // the input of a contained reactor in the federate.
+          // NOTE: If instance == main and the federate is within a bank,
+          // this assumes that the reaction writes only to the bank member in the federate.
+          foundOne = true;
+
+          temp.pr("// Add port " + port.getFullName() + " to array of is_present fields.");
+
+          if (!instance.equals(port.getParent())) {
+            // The port belongs to contained reactor, so we also have
+            // iterate over the instance bank members.
+            temp.startScopedBlock();
+            temp.pr("int count = 0; SUPPRESS_UNUSED_WARNING(count);");
+            temp.startScopedBlock(instance);
+            temp.startScopedBankChannelIteration(port, null);
+          } else {
+            temp.startScopedBankChannelIteration(port, "count");
+          }
+          var portRef = CUtil.portRefNested(port);
+          var con = (port.isMultiport()) ? "->" : ".";
+
+          temp.pr(
+              "_lf_is_present_fields["
+                  + startTimeStepIsPresentCount
+                  + " + count] = &"
+                  + portRef
+                  + con
+                  + "is_present;");
+          // Intended_tag is only applicable to ports in federated execution.
+          temp.pr(
+              CExtensionUtils.surroundWithIfFederatedDecentralized(
+                  "_lf_intended_tag_fields["
+                      + startTimeStepIsPresentCount
+                      + " + count] = &"
+                      + portRef
+                      + con
+                      + "intended_tag;"));
+
+          startTimeStepIsPresentCount += port.getWidth() * port.getParent().getTotalWidth();
+
+          if (!instance.equals(port.getParent())) {
+            temp.pr("count++;");
+            temp.endScopedBlock();
+            temp.endScopedBlock();
+            temp.endScopedBankChannelIteration(port, null);
+          } else {
+            temp.endScopedBankChannelIteration(port, "count");
+          }
         }
-        if (foundOne) startTimeStep.pr(temp.toString());
-        temp = new CodeBuilder();
-        foundOne = false;
+      }
+    }
+    if (foundOne) startTimeStep.pr(temp.toString());
+    temp = new CodeBuilder();
+    foundOne = false;
+
+    for (ActionInstance action : instance.actions) {
+      foundOne = true;
+      temp.startScopedBlock(instance);
+
+      temp.pr(
+          String.join(
+              "\n",
+              "// Add action " + action.getFullName() + " to array of is_present fields.",
+              "_lf_is_present_fields[" + startTimeStepIsPresentCount + "] ",
+              "        = &"
+                  + containerSelfStructName
+                  + "->_lf_"
+                  + action.getName()
+                  + ".is_present;"));
+
+      // Intended_tag is only applicable to actions in federated execution with decentralized
+      // coordination.
+      temp.pr(
+          CExtensionUtils.surroundWithIfFederatedDecentralized(
+              String.join(
+                  "\n",
+                  "// Add action " + action.getFullName() + " to array of intended_tag fields.",
+                  "_lf_intended_tag_fields[" + startTimeStepIsPresentCount + "] ",
+                  "        = &"
+                      + containerSelfStructName
+                      + "->_lf_"
+                      + action.getName()
+                      + ".intended_tag;")));
+
+      startTimeStepIsPresentCount += action.getParent().getTotalWidth();
+      temp.endScopedBlock();
+    }
+    if (foundOne) startTimeStep.pr(temp.toString());
+    temp = new CodeBuilder();
+    foundOne = false;
 
-        for (ActionInstance action : instance.actions) {
-            foundOne = true;
-            temp.startScopedBlock(instance);
+    // Next, set up the table to mark each output of each contained reactor absent.
+    for (ReactorInstance child : instance.children) {
+      if (child.outputs.size() > 0) {
 
-            temp.pr(String.join("\n",
-                "// Add action "+action.getFullName()+" to array of is_present fields.",
-                "_lf_is_present_fields["+startTimeStepIsPresentCount+"] ",
-                "        = &"+containerSelfStructName+"->_lf_"+action.getName()+".is_present;"
-            ));
+        temp.startScopedBlock();
+        temp.pr("int count = 0; SUPPRESS_UNUSED_WARNING(count);");
+        temp.startScopedBlock(child);
 
-            // Intended_tag is only applicable to actions in federated execution with decentralized coordination.
+        var channelCount = 0;
+        for (PortInstance output : child.outputs) {
+          if (!output.getDependsOnReactions().isEmpty()) {
+            foundOne = true;
+            temp.pr("// Add port " + output.getFullName() + " to array of is_present fields.");
+            temp.startChannelIteration(output);
+            temp.pr(
+                "_lf_is_present_fields["
+                    + startTimeStepIsPresentCount
+                    + " + count] = &"
+                    + CUtil.portRef(output)
+                    + ".is_present;");
+
+            // Intended_tag is only applicable to ports in federated execution with decentralized
+            // coordination.
             temp.pr(
                 CExtensionUtils.surroundWithIfFederatedDecentralized(
-                    String.join("\n",
-                                "// Add action " + action.getFullName()
-                                    + " to array of intended_tag fields.",
-                                "_lf_intended_tag_fields["
-                                    + startTimeStepIsPresentCount + "] ",
-                                "        = &" + containerSelfStructName
-                                    + "->_lf_" + action.getName()
-                                    + ".intended_tag;"
-                    )));
-
-            startTimeStepIsPresentCount += action.getParent().getTotalWidth();
-            temp.endScopedBlock();
+                    String.join(
+                        "\n",
+                        "// Add port " + output.getFullName() + " to array of intended_tag fields.",
+                        "_lf_intended_tag_fields["
+                            + startTimeStepIsPresentCount
+                            + " + count] = &"
+                            + CUtil.portRef(output)
+                            + ".intended_tag;")));
+
+            temp.pr("count++;");
+            channelCount += output.getWidth();
+            temp.endChannelIteration(output);
+          }
         }
-        if (foundOne) startTimeStep.pr(temp.toString());
-        temp = new CodeBuilder();
-        foundOne = false;
-
-        // Next, set up the table to mark each output of each contained reactor absent.
-        for (ReactorInstance child : instance.children) {
-            if (child.outputs.size() > 0) {
-
-                temp.startScopedBlock();
-                temp.pr("int count = 0; SUPPRESS_UNUSED_WARNING(count);");
-                temp.startScopedBlock(child);
-
-                var channelCount = 0;
-                for (PortInstance output : child.outputs) {
-                    if (!output.getDependsOnReactions().isEmpty()){
-                        foundOne = true;
-                        temp.pr("// Add port "+output.getFullName()+" to array of is_present fields.");
-                        temp.startChannelIteration(output);
-                        temp.pr("_lf_is_present_fields["+startTimeStepIsPresentCount+" + count] = &"+CUtil.portRef(output)+".is_present;");
-
-                        // Intended_tag is only applicable to ports in federated execution with decentralized coordination.
-                        temp.pr(
-                            CExtensionUtils.surroundWithIfFederatedDecentralized(
-                                String.join("\n",
-                                            "// Add port "+output.getFullName()+" to array of intended_tag fields.",
-                                                "_lf_intended_tag_fields["+startTimeStepIsPresentCount+" + count] = &"+CUtil.portRef(output)+".intended_tag;"
-                                )));
-
-                        temp.pr("count++;");
-                        channelCount += output.getWidth();
-                        temp.endChannelIteration(output);
-                    }
-                }
-                startTimeStepIsPresentCount += channelCount * child.getTotalWidth();
-                temp.endScopedBlock();
-                temp.endScopedBlock();
-            }
-        }
-        if (foundOne) startTimeStep.pr(temp.toString());
+        startTimeStepIsPresentCount += channelCount * child.getTotalWidth();
+        temp.endScopedBlock();
+        temp.endScopedBlock();
+      }
     }
-
-    /**
-     * For each timer in the given reactor, generate initialization code for the offset
-     * and period fields.
-     *
-     * This method will also populate the global _lf_timer_triggers array, which is
-     * used to start all timers at the start of execution.
-     *
-     * @param instance A reactor instance.
-     */
-    private void generateTimerInitializations(ReactorInstance instance) {
-        for (TimerInstance timer : instance.timers) {
-            if (!timer.isStartup()) {
-                initializeTriggerObjects.pr(CTimerGenerator.generateInitializer(timer));
-                timerCount += timer.getParent().getTotalWidth();
-            }
-        }
+    if (foundOne) startTimeStep.pr(temp.toString());
+  }
+
+  /**
+   * For each timer in the given reactor, generate initialization code for the offset and period
+   * fields.
+   *
+   * <p>This method will also populate the global _lf_timer_triggers array, which is used to start
+   * all timers at the start of execution.
+   *
+   * @param instance A reactor instance.
+   */
+  private void generateTimerInitializations(ReactorInstance instance) {
+    for (TimerInstance timer : instance.timers) {
+      if (!timer.isStartup()) {
+        initializeTriggerObjects.pr(CTimerGenerator.generateInitializer(timer));
+        timerCount += timer.getParent().getTotalWidth();
+      }
     }
-
-    /**
-     * Process a given .proto file.
-     *
-     * Run, if possible, the proto-c protocol buffer code generator to produce
-     * the required .h and .c files.
-     * @param filename Name of the file to process.
-     */
-     public void processProtoFile(String filename) {
-        var protoc = commandFactory.createCommand(
+  }
+
+  /**
+   * Process a given .proto file.
+   *
+   * <p>Run, if possible, the proto-c protocol buffer code generator to produce the required .h and
+   * .c files.
+   *
+   * @param filename Name of the file to process.
+   */
+  public void processProtoFile(String filename) {
+    var protoc =
+        commandFactory.createCommand(
             "protoc-c",
-            List.of("--c_out="+this.fileConfig.getSrcGenPath(), filename),
+            List.of("--c_out=" + this.fileConfig.getSrcGenPath(), filename),
             fileConfig.srcPath);
-        if (protoc == null) {
-            errorReporter.reportError("Processing .proto files requires protoc-c >= 1.3.3.");
-            return;
-        }
-        var returnCode = protoc.run();
-        if (returnCode == 0) {
-            var nameSansProto = filename.substring(0, filename.length() - 6);
-            targetConfig.compileAdditionalSources.add(
-                fileConfig.getSrcGenPath().resolve(nameSansProto + ".pb-c.c").toString()
-            );
-
-            targetConfig.compileLibraries.add("-l");
-            targetConfig.compileLibraries.add("protobuf-c");
-            targetConfig.compilerFlags.add("-lprotobuf-c");
-        } else {
-            errorReporter.reportError("protoc-c returns error code " + returnCode);
-        }
+    if (protoc == null) {
+      errorReporter.reportError("Processing .proto files requires protoc-c >= 1.3.3.");
+      return;
     }
-
-    /**
-     * Construct a unique type for the struct of the specified
-     * typed variable (port or action) of the specified reactor class.
-     * This is required to be the same as the type name returned by
-     * {@link #variableStructType(TriggerInstance)}.
-     */
-    public static String variableStructType(Variable variable, TypeParameterizedReactor tpr, boolean userFacing) {
-        return (userFacing ? tpr.getName().toLowerCase() : CUtil.getName(tpr)) +"_"+variable.getName()+"_t";
+    var returnCode = protoc.run();
+    if (returnCode == 0) {
+      var nameSansProto = filename.substring(0, filename.length() - 6);
+      targetConfig.compileAdditionalSources.add(
+          fileConfig.getSrcGenPath().resolve(nameSansProto + ".pb-c.c").toString());
+
+      targetConfig.compileLibraries.add("-l");
+      targetConfig.compileLibraries.add("protobuf-c");
+      targetConfig.compilerFlags.add("-lprotobuf-c");
+    } else {
+      errorReporter.reportError("protoc-c returns error code " + returnCode);
     }
-
-    /**
-     * Construct a unique type for the struct of the specified
-     * instance (port or action).
-     * This is required to be the same as the type name returned by
-     * {@link #variableStructType(Variable, TypeParameterizedReactor, boolean)}.
-     * @param portOrAction The port or action instance.
-     * @return The name of the self struct.
-     */
-    public static String variableStructType(TriggerInstance<?> portOrAction) {
-        return CUtil.getName(portOrAction.getParent().tpr)+"_"+portOrAction.getName()+"_t";
+  }
+
+  /**
+   * Construct a unique type for the struct of the specified typed variable (port or action) of the
+   * specified reactor class. This is required to be the same as the type name returned by {@link
+   * #variableStructType(TriggerInstance)}.
+   */
+  public static String variableStructType(
+      Variable variable, TypeParameterizedReactor tpr, boolean userFacing) {
+    return (userFacing ? tpr.getName().toLowerCase() : CUtil.getName(tpr))
+        + "_"
+        + variable.getName()
+        + "_t";
+  }
+
+  /**
+   * Construct a unique type for the struct of the specified instance (port or action). This is
+   * required to be the same as the type name returned by {@link #variableStructType(Variable,
+   * TypeParameterizedReactor, boolean)}.
+   *
+   * @param portOrAction The port or action instance.
+   * @return The name of the self struct.
+   */
+  public static String variableStructType(TriggerInstance<?> portOrAction) {
+    return CUtil.getName(portOrAction.getParent().tpr) + "_" + portOrAction.getName() + "_t";
+  }
+
+  /**
+   * If tracing is turned on, then generate code that records the full name of the specified reactor
+   * instance in the trace table. If tracing is not turned on, do nothing.
+   *
+   * @param instance The reactor instance.
+   */
+  private void generateTraceTableEntries(ReactorInstance instance) {
+    if (targetConfig.tracing != null) {
+      initializeTriggerObjects.pr(CTracingGenerator.generateTraceTableEntries(instance));
     }
-
-    /**
-     * If tracing is turned on, then generate code that records
-     * the full name of the specified reactor instance in the
-     * trace table. If tracing is not turned on, do nothing.
-     * @param instance The reactor instance.
-     */
-    private void generateTraceTableEntries(ReactorInstance instance) {
-        if (targetConfig.tracing != null) {
-            initializeTriggerObjects.pr(
-                CTracingGenerator.generateTraceTableEntries(instance)
-            );
-        }
+  }
+
+  /**
+   * Generate code to instantiate the specified reactor instance and initialize it.
+   *
+   * @param instance A reactor instance.
+   */
+  public void generateReactorInstance(ReactorInstance instance) {
+    var reactorClass = ASTUtils.toDefinition(instance.getDefinition().getReactorClass());
+    var fullName = instance.getFullName();
+    initializeTriggerObjects.pr(
+        "// ***** Start initializing " + fullName + " of class " + reactorClass.getName());
+    // Generate the instance self struct containing parameters, state variables,
+    // and outputs (the "self" struct).
+    initializeTriggerObjects.pr(
+        CUtil.reactorRefName(instance)
+            + "["
+            + CUtil.runtimeIndex(instance)
+            + "] = new_"
+            + CUtil.getName(instance.tpr)
+            + "();");
+    // Generate code to initialize the "self" struct in the
+    // _lf_initialize_trigger_objects function.
+    generateTraceTableEntries(instance);
+    generateReactorInstanceExtension(instance);
+    generateParameterInitialization(instance);
+    initializeOutputMultiports(instance);
+    initializeInputMultiports(instance);
+    recordBuiltinTriggers(instance);
+    watchdogCount +=
+        CWatchdogGenerator.generateInitializeWatchdogs(initializeTriggerObjects, instance);
+
+    // Next, initialize the "self" struct with state variables.
+    // These values may be expressions that refer to the parameter values defined above.
+    generateStateVariableInitializations(instance);
+
+    // Generate trigger objects for the instance.
+    generateTimerInitializations(instance);
+    generateActionInitializations(instance);
+    generateInitializeActionToken(instance);
+    generateSetDeadline(instance);
+    generateModeStructure(instance);
+
+    // Recursively generate code for the children.
+    for (ReactorInstance child : instance.children) {
+      // If this reactor is a placeholder for a bank of reactors, then generate
+      // an array of instances of reactors and create an enclosing for loop.
+      // Need to do this for each of the builders into which the code writes.
+      startTimeStep.startScopedBlock(child);
+      initializeTriggerObjects.startScopedBlock(child);
+      generateReactorInstance(child);
+      initializeTriggerObjects.endScopedBlock();
+      startTimeStep.endScopedBlock();
     }
 
-    /**
-     * Generate code to instantiate the specified reactor instance and
-     * initialize it.
-     * @param instance A reactor instance.
-     */
-    public void generateReactorInstance(ReactorInstance instance) {
-        var reactorClass = ASTUtils.toDefinition(instance.getDefinition().getReactorClass());
-        var fullName = instance.getFullName();
-        initializeTriggerObjects.pr(
-                "// ***** Start initializing " + fullName + " of class " + reactorClass.getName());
-        // Generate the instance self struct containing parameters, state variables,
-        // and outputs (the "self" struct).
-        initializeTriggerObjects.pr(CUtil.reactorRefName(instance)+"["+CUtil.runtimeIndex(instance)+"] = new_"+CUtil.getName(instance.tpr)+"();");
-        // Generate code to initialize the "self" struct in the
-        // _lf_initialize_trigger_objects function.
-        generateTraceTableEntries(instance);
-        generateReactorInstanceExtension(instance);
-        generateParameterInitialization(instance);
-        initializeOutputMultiports(instance);
-        initializeInputMultiports(instance);
-        recordBuiltinTriggers(instance);
-        watchdogCount += CWatchdogGenerator.generateInitializeWatchdogs(initializeTriggerObjects, instance);
-
-        // Next, initialize the "self" struct with state variables.
-        // These values may be expressions that refer to the parameter values defined above.
-        generateStateVariableInitializations(instance);
-
-        // Generate trigger objects for the instance.
-        generateTimerInitializations(instance);
-        generateActionInitializations(instance);
-        generateInitializeActionToken(instance);
-        generateSetDeadline(instance);
-        generateModeStructure(instance);
-
-        // Recursively generate code for the children.
-        for (ReactorInstance child : instance.children) {
-            // If this reactor is a placeholder for a bank of reactors, then generate
-            // an array of instances of reactors and create an enclosing for loop.
-            // Need to do this for each of the builders into which the code writes.
-            startTimeStep.startScopedBlock(child);
-            initializeTriggerObjects.startScopedBlock(child);
-            generateReactorInstance(child);
-            initializeTriggerObjects.endScopedBlock();
-            startTimeStep.endScopedBlock();
+    // For this instance, define what must be done at the start of
+    // each time step. This sets up the tables that are used by the
+    // _lf_start_time_step() function in reactor_common.c.
+    // Note that this function is also run once at the end
+    // so that it can deallocate any memory.
+    generateStartTimeStep(instance);
+    initializeTriggerObjects.pr("//***** End initializing " + fullName);
+  }
+
+  /**
+   * For each action of the specified reactor instance, generate initialization code for the offset
+   * and period fields.
+   *
+   * @param instance The reactor.
+   */
+  private void generateActionInitializations(ReactorInstance instance) {
+    initializeTriggerObjects.pr(CActionGenerator.generateInitializers(instance));
+  }
+
+  /**
+   * Initialize actions by creating a lf_token_t in the self struct. This has the information
+   * required to allocate memory for the action payload. Skip any action that is not actually used
+   * as a trigger.
+   *
+   * @param reactor The reactor containing the actions.
+   */
+  private void generateInitializeActionToken(ReactorInstance reactor) {
+    for (ActionInstance action : reactor.actions) {
+      // Skip this step if the action is not in use.
+      if (action.getParent().getTriggers().contains(action)) {
+        var type = reactor.tpr.resolveType(getInferredType(action.getDefinition()));
+        var payloadSize = "0";
+        if (!type.isUndefined()) {
+          var typeStr = types.getTargetType(type);
+          if (CUtil.isTokenType(type, types)) {
+            typeStr = CUtil.rootType(typeStr);
+          }
+          if (typeStr != null && !typeStr.equals("") && !typeStr.equals("void")) {
+            payloadSize = "sizeof(" + typeStr + ")";
+          }
         }
 
-        // For this instance, define what must be done at the start of
-        // each time step. This sets up the tables that are used by the
-        // _lf_start_time_step() function in reactor_common.c.
-        // Note that this function is also run once at the end
-        // so that it can deallocate any memory.
-        generateStartTimeStep(instance);
-        initializeTriggerObjects.pr("//***** End initializing " + fullName);
-    }
-
-    /**
-     * For each action of the specified reactor instance, generate initialization code
-     * for the offset and period fields.
-     * @param instance The reactor.
-     */
-    private void generateActionInitializations(ReactorInstance instance) {
-        initializeTriggerObjects.pr(CActionGenerator.generateInitializers(instance));
+        var selfStruct = CUtil.reactorRef(action.getParent());
+        initializeTriggerObjects.pr(
+            CActionGenerator.generateTokenInitializer(selfStruct, action.getName(), payloadSize));
+      }
     }
-
-    /**
-     * Initialize actions by creating a lf_token_t in the self struct.
-     * This has the information required to allocate memory for the action payload.
-     * Skip any action that is not actually used as a trigger.
-     * @param reactor The reactor containing the actions.
-     */
-    private void generateInitializeActionToken(ReactorInstance reactor) {
-        for (ActionInstance action : reactor.actions) {
-            // Skip this step if the action is not in use.
-            if (action.getParent().getTriggers().contains(action)
-            ) {
-                var type = reactor.tpr.resolveType(getInferredType(action.getDefinition()));
-                var payloadSize = "0";
-                if (!type.isUndefined()) {
-                    var typeStr = types.getTargetType(type);
-                    if (CUtil.isTokenType(type, types)) {
-                        typeStr = CUtil.rootType(typeStr);
-                    }
-                    if (typeStr != null && !typeStr.equals("") && !typeStr.equals("void")) {
-                        payloadSize = "sizeof("+typeStr+")";
-                    }
-                }
-
-                var selfStruct = CUtil.reactorRef(action.getParent());
-                initializeTriggerObjects.pr(
-                    CActionGenerator.generateTokenInitializer(
-                        selfStruct, action.getName(), payloadSize
-                    )
-                );
-            }
+  }
+
+  /**
+   * Generate code that is executed while the reactor instance is being initialized. This is
+   * provided as an extension point for subclasses. Normally, the reactions argument is the full
+   * list of reactions, but for the top-level of a federate, will be a subset of reactions that is
+   * relevant to the federate.
+   *
+   * @param instance The reactor instance.
+   */
+  protected void generateReactorInstanceExtension(ReactorInstance instance) {
+    // Do nothing
+  }
+
+  /**
+   * Generate code that initializes the state variables for a given instance. Unlike parameters,
+   * state variables are uniformly initialized for all instances of the same reactor.
+   *
+   * @param instance The reactor class instance
+   */
+  protected void generateStateVariableInitializations(ReactorInstance instance) {
+    var reactorClass = instance.getDefinition().getReactorClass();
+    var selfRef = CUtil.reactorRef(instance);
+    for (StateVar stateVar : allStateVars(toDefinition(reactorClass))) {
+      if (isInitialized(stateVar)) {
+        var mode =
+            stateVar.eContainer() instanceof Mode
+                ? instance.lookupModeInstance((Mode) stateVar.eContainer())
+                : instance.getMode(false);
+        initializeTriggerObjects.pr(
+            CStateGenerator.generateInitializer(instance, selfRef, stateVar, mode, types));
+        if (mode != null && stateVar.isReset()) {
+          modalStateResetCount += instance.getTotalWidth();
         }
+      }
     }
-
-    /**
-     * Generate code that is executed while the reactor instance is being initialized.
-     * This is provided as an extension point for subclasses.
-     * Normally, the reactions argument is the full list of reactions,
-     * but for the top-level of a federate, will be a subset of reactions that
-     * is relevant to the federate.
-     * @param instance The reactor instance.
-     */
-    protected void generateReactorInstanceExtension(ReactorInstance instance) {
-        // Do nothing
+  }
+
+  /**
+   * Generate code to set the deadline field of the reactions in the specified reactor instance.
+   *
+   * @param instance The reactor instance.
+   */
+  private void generateSetDeadline(ReactorInstance instance) {
+    for (ReactionInstance reaction : instance.reactions) {
+      var selfRef = CUtil.reactorRef(reaction.getParent()) + "->_lf__reaction_" + reaction.index;
+      if (reaction.declaredDeadline != null) {
+        var deadline = reaction.declaredDeadline.maxDelay;
+        initializeTriggerObjects.pr(
+            selfRef + ".deadline = " + types.getTargetTimeExpr(deadline) + ";");
+      } else { // No deadline.
+        initializeTriggerObjects.pr(selfRef + ".deadline = NEVER;");
+      }
     }
-
-    /**
-     * Generate code that initializes the state variables for a given instance.
-     * Unlike parameters, state variables are uniformly initialized for all instances
-     * of the same reactor.
-     * @param instance The reactor class instance
-     */
-    protected void generateStateVariableInitializations(ReactorInstance instance) {
-        var reactorClass = instance.getDefinition().getReactorClass();
-        var selfRef = CUtil.reactorRef(instance);
-        for (StateVar stateVar : allStateVars(toDefinition(reactorClass))) {
-            if (isInitialized(stateVar)) {
-                var mode = stateVar.eContainer() instanceof Mode ?
-                    instance.lookupModeInstance((Mode) stateVar.eContainer()) :
-                    instance.getMode(false);
-                initializeTriggerObjects.pr(CStateGenerator.generateInitializer(
-                    instance,
-                    selfRef,
-                    stateVar,
-                    mode,
-                    types
-                ));
-                if (mode != null && stateVar.isReset()) {
-                    modalStateResetCount += instance.getTotalWidth();
-                }
-            }
-        }
+  }
+
+  /**
+   * Generate code to initialize modes.
+   *
+   * @param instance The reactor instance.
+   */
+  private void generateModeStructure(ReactorInstance instance) {
+    CModesGenerator.generateModeStructure(instance, initializeTriggerObjects);
+    if (!instance.modes.isEmpty()) {
+      modalReactorCount += instance.getTotalWidth();
     }
-
-    /**
-     * Generate code to set the deadline field of the reactions in the
-     * specified reactor instance.
-     * @param instance The reactor instance.
-     */
-    private void generateSetDeadline(ReactorInstance instance) {
-        for (ReactionInstance reaction : instance.reactions) {
-            var selfRef = CUtil.reactorRef(reaction.getParent())+"->_lf__reaction_"+reaction.index;
-            if (reaction.declaredDeadline != null) {
-                var deadline = reaction.declaredDeadline.maxDelay;
-                initializeTriggerObjects.pr(selfRef+".deadline = "+types.getTargetTimeExpr(deadline)+";");
-            } else { // No deadline.
-                initializeTriggerObjects.pr(selfRef+".deadline = NEVER;");
-            }
-        }
+  }
+
+  /**
+   * Generate runtime initialization code for parameters of a given reactor instance
+   *
+   * @param instance The reactor instance.
+   */
+  protected void generateParameterInitialization(ReactorInstance instance) {
+    var selfRef = CUtil.reactorRef(instance);
+    // Set the local bank_index variable so that initializers can use it.
+    initializeTriggerObjects.pr(
+        "bank_index = "
+            + CUtil.bankIndex(instance)
+            + ";"
+            + " SUPPRESS_UNUSED_WARNING(bank_index);");
+    for (ParameterInstance parameter : instance.parameters) {
+      // NOTE: we now use the resolved literal value. For better efficiency, we could
+      // store constants in a global array and refer to its elements to avoid duplicate
+      // memory allocations.
+      // NOTE: If the parameter is initialized with a static initializer for an array
+      // or struct (the initialization expression is surrounded by { ... }), then we
+      // have to declare a static variable to ensure that the memory is put in data space
+      // and not on the stack.
+      // FIXME: Is there a better way to determine this than the string comparison?
+      var initializer = CParameterGenerator.getInitializer(parameter);
+      if (initializer.startsWith("{")) {
+        var temporaryVariableName = parameter.uniqueID();
+        initializeTriggerObjects.pr(
+            String.join(
+                "\n",
+                "static "
+                    + types.getVariableDeclaration(
+                        instance.tpr, parameter.type, temporaryVariableName, true)
+                    + " = "
+                    + initializer
+                    + ";",
+                selfRef + "->" + parameter.getName() + " = " + temporaryVariableName + ";"));
+      } else {
+        initializeTriggerObjects.pr(
+            selfRef + "->" + parameter.getName() + " = " + initializer + ";");
+      }
     }
-
-    /**
-     * Generate code to initialize modes.
-     * @param instance The reactor instance.
-     */
-    private void generateModeStructure(ReactorInstance instance) {
-        CModesGenerator.generateModeStructure(instance, initializeTriggerObjects);
-        if (!instance.modes.isEmpty()) {
-            modalReactorCount += instance.getTotalWidth();
-        }
+  }
+
+  /**
+   * Generate code that mallocs memory for any output multiports.
+   *
+   * @param reactor The reactor instance.
+   */
+  private void initializeOutputMultiports(ReactorInstance reactor) {
+    var reactorSelfStruct = CUtil.reactorRef(reactor);
+    for (PortInstance output : reactor.outputs) {
+      initializeTriggerObjects.pr(
+          CPortGenerator.initializeOutputMultiport(output, reactorSelfStruct));
     }
-
-    /**
-     * Generate runtime initialization code for parameters of a given reactor instance
-     * @param instance The reactor instance.
-     */
-    protected void generateParameterInitialization(ReactorInstance instance) {
-        var selfRef = CUtil.reactorRef(instance);
-        // Set the local bank_index variable so that initializers can use it.
-        initializeTriggerObjects.pr("bank_index = "+CUtil.bankIndex(instance)+";"
-                + " SUPPRESS_UNUSED_WARNING(bank_index);");
-        for (ParameterInstance parameter : instance.parameters) {
-            // NOTE: we now use the resolved literal value. For better efficiency, we could
-            // store constants in a global array and refer to its elements to avoid duplicate
-            // memory allocations.
-            // NOTE: If the parameter is initialized with a static initializer for an array
-            // or struct (the initialization expression is surrounded by { ... }), then we
-            // have to declare a static variable to ensure that the memory is put in data space
-            // and not on the stack.
-            // FIXME: Is there a better way to determine this than the string comparison?
-            var initializer = CParameterGenerator.getInitializer(parameter);
-            if (initializer.startsWith("{")) {
-                var temporaryVariableName = parameter.uniqueID();
-                initializeTriggerObjects.pr(String.join("\n",
-                    "static "+types.getVariableDeclaration(instance.tpr, parameter.type, temporaryVariableName, true)+" = "+initializer+";",
-                    selfRef+"->"+parameter.getName()+" = "+temporaryVariableName+";"
-                ));
-            } else {
-                initializeTriggerObjects.pr(selfRef+"->"+parameter.getName()+" = "+initializer+";");
-            }
-        }
+  }
+
+  /**
+   * Allocate memory for inputs.
+   *
+   * @param reactor The reactor.
+   */
+  private void initializeInputMultiports(ReactorInstance reactor) {
+    var reactorSelfStruct = CUtil.reactorRef(reactor);
+    for (PortInstance input : reactor.inputs) {
+      initializeTriggerObjects.pr(
+          CPortGenerator.initializeInputMultiport(input, reactorSelfStruct));
     }
-
-    /**
-     * Generate code that mallocs memory for any output multiports.
-     * @param reactor The reactor instance.
-     */
-    private void initializeOutputMultiports(ReactorInstance reactor) {
-        var reactorSelfStruct = CUtil.reactorRef(reactor);
-        for (PortInstance output : reactor.outputs) {
-            initializeTriggerObjects.pr(CPortGenerator.initializeOutputMultiport(
-                output,
-                reactorSelfStruct
-            ));
-        }
+  }
+
+  @Override
+  public TargetTypes getTargetTypes() {
+    return types;
+  }
+
+  /**
+   * Get the Docker generator.
+   *
+   * @param context
+   * @return
+   */
+  protected DockerGenerator getDockerGenerator(LFGeneratorContext context) {
+    return new CDockerGenerator(context);
+  }
+
+  // //////////////////////////////////////////
+  // // Protected methods.
+
+  // Perform set up that does not generate code
+  protected void setUpGeneralParameters() {
+    accommodatePhysicalActionsIfPresent();
+    targetConfig.compileDefinitions.put(
+        "LOG_LEVEL", String.valueOf(targetConfig.logLevel.ordinal()));
+    targetConfig.compileAdditionalSources.addAll(CCoreFilesUtils.getCTargetSrc());
+    // Create the main reactor instance if there is a main reactor.
+    createMainReactorInstance();
+    if (hasModalReactors) {
+      // So that each separate compile knows about modal reactors, do this:
+      targetConfig.compileDefinitions.put("MODAL_REACTORS", "TRUE");
     }
-
-    /**
-     * Allocate memory for inputs.
-     * @param reactor The reactor.
-     */
-    private void initializeInputMultiports(ReactorInstance reactor) {
-        var reactorSelfStruct = CUtil.reactorRef(reactor);
-        for (PortInstance input : reactor.inputs) {
-            initializeTriggerObjects.pr(CPortGenerator.initializeInputMultiport(
-                input,
-                reactorSelfStruct
-            ));
-        }
+    if (targetConfig.threading
+        && targetConfig.platformOptions.platform == Platform.ARDUINO
+        && (targetConfig.platformOptions.board == null
+            || !targetConfig.platformOptions.board.contains("mbed"))) {
+      // non-MBED boards should not use threading
+      System.out.println(
+          "Threading is incompatible on your current Arduino flavor. Setting threading to false.");
+      targetConfig.threading = false;
     }
 
-    @Override
-    public TargetTypes getTargetTypes() {
-        return types;
+    if (targetConfig.platformOptions.platform == Platform.ARDUINO
+        && !targetConfig.noCompile
+        && targetConfig.platformOptions.board == null) {
+      System.out.println(
+          "To enable compilation for the Arduino platform, you must specify the fully-qualified"
+              + " board name (FQBN) in the target property. For example, platform: {name: arduino,"
+              + " board: arduino:avr:leonardo}. Entering \"no-compile\" mode and generating target"
+              + " code only.");
+      targetConfig.noCompile = true;
     }
-
-    /**
-     * Get the Docker generator.
-     * @param context
-     * @return
-     */
-    protected DockerGenerator getDockerGenerator(LFGeneratorContext context) {
-        return new CDockerGenerator(context);
+    if (targetConfig.threading) { // FIXME: This logic is duplicated in CMake
+      pickScheduler();
+      // FIXME: this and pickScheduler should be combined.
+      targetConfig.compileDefinitions.put("SCHEDULER", targetConfig.schedulerType.name());
+      targetConfig.compileDefinitions.put(
+          "NUMBER_OF_WORKERS", String.valueOf(targetConfig.workers));
     }
+    pickCompilePlatform();
+  }
 
-    // //////////////////////////////////////////
-    // // Protected methods.
-
-    // Perform set up that does not generate code
-    protected void setUpGeneralParameters() {
-        accommodatePhysicalActionsIfPresent();
-        targetConfig.compileDefinitions.put("LOG_LEVEL", String.valueOf(targetConfig.logLevel.ordinal()));
-        targetConfig.compileAdditionalSources.addAll(CCoreFilesUtils.getCTargetSrc());
-        // Create the main reactor instance if there is a main reactor.
-        createMainReactorInstance();
-        if (hasModalReactors) {
-            // So that each separate compile knows about modal reactors, do this:
-            targetConfig.compileDefinitions.put("MODAL_REACTORS", "TRUE");
-        }
-        if (targetConfig.threading && targetConfig.platformOptions.platform == Platform.ARDUINO
-            && (targetConfig.platformOptions.board == null || !targetConfig.platformOptions.board.contains("mbed"))) {
-            //non-MBED boards should not use threading
-            System.out.println("Threading is incompatible on your current Arduino flavor. Setting threading to false.");
-            targetConfig.threading = false;
-        }
-
-        if (targetConfig.platformOptions.platform == Platform.ARDUINO && !targetConfig.noCompile
-            && targetConfig.platformOptions.board == null) {
-            System.out.println("To enable compilation for the Arduino platform, you must specify the fully-qualified board name (FQBN) in the target property. For example, platform: {name: arduino, board: arduino:avr:leonardo}. Entering \"no-compile\" mode and generating target code only.");
-            targetConfig.noCompile = true;
-        }
-        if (targetConfig.threading) {  // FIXME: This logic is duplicated in CMake
-            pickScheduler();
-            // FIXME: this and pickScheduler should be combined.
-            targetConfig.compileDefinitions.put(
-                "SCHEDULER",
-                targetConfig.schedulerType.name()
-            );
-            targetConfig.compileDefinitions.put(
-                "NUMBER_OF_WORKERS",
-                String.valueOf(targetConfig.workers)
-            );
-        }
-        pickCompilePlatform();
+  protected void handleProtoFiles() {
+    // Handle .proto files.
+    for (String file : targetConfig.protoFiles) {
+      this.processProtoFile(file);
     }
-
-    protected void handleProtoFiles() {
-        // Handle .proto files.
-        for (String file : targetConfig.protoFiles) {
-            this.processProtoFile(file);
-        }
+  }
+
+  /**
+   * Generate code that needs to appear at the top of the generated C file, such as #define and
+   * #include statements.
+   */
+  public String generateDirectives() {
+    CodeBuilder code = new CodeBuilder();
+    code.prComment("Code generated by the Lingua Franca compiler from:");
+    code.prComment("file:/" + FileUtil.toUnixString(fileConfig.srcFile));
+    code.pr(
+        CPreambleGenerator.generateDefineDirectives(
+            targetConfig, fileConfig.getSrcGenPath(), hasModalReactors));
+    code.pr(CPreambleGenerator.generateIncludeStatements(targetConfig, CCppMode));
+    return code.toString();
+  }
+
+  /** Generate top-level preamble code. */
+  protected String generateTopLevelPreambles(Reactor reactor) {
+    CodeBuilder builder = new CodeBuilder();
+    var guard = "TOP_LEVEL_PREAMBLE_" + reactor.eContainer().hashCode() + "_H";
+    builder.pr("#ifndef " + guard);
+    builder.pr("#define " + guard);
+    // Reactors that are instantiated by the specified reactor need to have
+    // their file-level preambles included.  This needs to also include file-level
+    // preambles of base classes of those reactors.
+    Stream.concat(Stream.of(reactor), ASTUtils.allNestedClasses(reactor))
+        .flatMap(it -> ASTUtils.allFileLevelPreambles(it).stream())
+        .collect(Collectors.toSet())
+        .forEach(it -> builder.pr(toText(it.getCode())));
+    for (String file : targetConfig.protoFiles) {
+      var dotIndex = file.lastIndexOf(".");
+      var rootFilename = file;
+      if (dotIndex > 0) {
+        rootFilename = file.substring(0, dotIndex);
+      }
+      code.pr("#include " + addDoubleQuotes(rootFilename + ".pb-c.h"));
+      builder.pr("#include " + addDoubleQuotes(rootFilename + ".pb-c.h"));
     }
-
-    /**
-     * Generate code that needs to appear at the top of the generated
-     * C file, such as #define and #include statements.
-     */
-    public String generateDirectives() {
-        CodeBuilder code = new CodeBuilder();
-        code.prComment("Code generated by the Lingua Franca compiler from:");
-        code.prComment("file:/" + FileUtil.toUnixString(fileConfig.srcFile));
-        code.pr(CPreambleGenerator.generateDefineDirectives(
-            targetConfig,
-            fileConfig.getSrcGenPath(),
-            hasModalReactors
-        ));
-        code.pr(CPreambleGenerator.generateIncludeStatements(
-            targetConfig,
-            CCppMode
-        ));
-        return code.toString();
+    builder.pr("#endif");
+    return builder.toString();
+  }
+
+  protected boolean targetLanguageIsCpp() {
+    return CCppMode;
+  }
+
+  /**
+   * Given a line of text from the output of a compiler, return an instance of ErrorFileAndLine if
+   * the line is recognized as the first line of an error message. Otherwise, return null.
+   *
+   * @param line A line of output from a compiler or other external tool that might generate errors.
+   * @return If the line is recognized as the start of an error message, then return a class
+   *     containing the path to the file on which the error occurred (or null if there is none), the
+   *     line number (or the string "1" if there is none), the character position (or the string "0"
+   *     if there is none), and the message (or an empty string if there is none).
+   */
+  @Override
+  public GeneratorBase.ErrorFileAndLine parseCommandOutput(String line) {
+    var matcher = compileErrorPattern.matcher(line);
+    if (matcher.find()) {
+      var result = new ErrorFileAndLine();
+      result.filepath = matcher.group("path");
+      result.line = matcher.group("line");
+      result.character = matcher.group("column");
+      result.message = matcher.group("message");
+
+      if (!result.message.toLowerCase().contains("error:")) {
+        result.isError = false;
+      }
+      return result;
     }
-
-    /**
-     * Generate top-level preamble code.
-     */
-    protected String generateTopLevelPreambles(Reactor reactor) {
-        CodeBuilder builder = new CodeBuilder();
-        var guard = "TOP_LEVEL_PREAMBLE_" + reactor.eContainer().hashCode() + "_H";
-        builder.pr("#ifndef " + guard);
-        builder.pr("#define " + guard);
-        // Reactors that are instantiated by the specified reactor need to have
-        // their file-level preambles included.  This needs to also include file-level
-        // preambles of base classes of those reactors.
-        Stream.concat(Stream.of(reactor), ASTUtils.allNestedClasses(reactor))
-            .flatMap(it -> ASTUtils.allFileLevelPreambles(it).stream())
-            .collect(Collectors.toSet())
-            .forEach(it -> builder.pr(toText(it.getCode())));
-        for (String file : targetConfig.protoFiles) {
-            var dotIndex = file.lastIndexOf(".");
-            var rootFilename = file;
-            if (dotIndex > 0) {
-                rootFilename = file.substring(0, dotIndex);
-            }
-            code.pr("#include " + addDoubleQuotes(rootFilename + ".pb-c.h"));
-            builder.pr("#include " + addDoubleQuotes(rootFilename + ".pb-c.h"));
+    return null;
+  }
+
+  ////////////////////////////////////////////
+  //// Private methods.
+
+  /** Returns the Target enum for this generator */
+  @Override
+  public Target getTarget() {
+    return Target.C;
+  }
+
+  ////////////////////////////////////////////////////////////
+  //// Private methods
+
+  /**
+   * If a main or federated reactor has been declared, create a ReactorInstance for this top level.
+   * This will also assign levels to reactions, then, if the program is federated, perform an AST
+   * transformation to disconnect connections between federates.
+   */
+  private void createMainReactorInstance() {
+    if (this.mainDef != null) {
+      if (this.main == null) {
+        // Recursively build instances.
+        this.main = new ReactorInstance(toDefinition(mainDef.getReactorClass()), errorReporter);
+        var reactionInstanceGraph = this.main.assignLevels();
+        if (reactionInstanceGraph.nodeCount() > 0) {
+          errorReporter.reportError("Main reactor has causality cycles. Skipping code generation.");
+          return;
         }
-        builder.pr("#endif");
-        return builder.toString();
-    }
-
-    protected boolean targetLanguageIsCpp() {
-        return CCppMode;
-    }
-
-    /** Given a line of text from the output of a compiler, return
-     *  an instance of ErrorFileAndLine if the line is recognized as
-     *  the first line of an error message. Otherwise, return null.
-     *  @param line A line of output from a compiler or other external
-     *   tool that might generate errors.
-     *  @return If the line is recognized as the start of an error message,
-     *   then return a class containing the path to the file on which the
-     *   error occurred (or null if there is none), the line number (or the
-     *   string "1" if there is none), the character position (or the string
-     *   "0" if there is none), and the message (or an empty string if there
-     *   is none).
-     */
-    @Override
-    public GeneratorBase.ErrorFileAndLine parseCommandOutput(String line) {
-        var matcher = compileErrorPattern.matcher(line);
-        if (matcher.find()) {
-            var result = new ErrorFileAndLine();
-            result.filepath = matcher.group("path");
-            result.line = matcher.group("line");
-            result.character = matcher.group("column");
-            result.message = matcher.group("message");
-
-            if (!result.message.toLowerCase().contains("error:")) {
-                result.isError = false;
-            }
-            return result;
+        if (hasDeadlines) {
+          this.main.assignDeadlines();
         }
-        return null;
-    }
-
-    ////////////////////////////////////////////
-    //// Private methods.
-
-    /** Returns the Target enum for this generator */
-    @Override
-    public Target getTarget() {
-        return Target.C;
-    }
-
-    ////////////////////////////////////////////////////////////
-    //// Private methods
-
-    /**
-     * If a main or federated reactor has been declared, create a ReactorInstance
-     * for this top level. This will also assign levels to reactions, then,
-     * if the program is federated, perform an AST transformation to disconnect
-     * connections between federates.
-     */
-    private void createMainReactorInstance() {
-        if (this.mainDef != null) {
-            if (this.main == null) {
-                // Recursively build instances.
-                this.main = new ReactorInstance(toDefinition(mainDef.getReactorClass()), errorReporter);
-                var reactionInstanceGraph = this.main.assignLevels();
-                if (reactionInstanceGraph.nodeCount() > 0) {
-                    errorReporter.reportError("Main reactor has causality cycles. Skipping code generation.");
-                    return;
-                }
-                if (hasDeadlines) {
-                    this.main.assignDeadlines();
-                }
-                // Inform the run-time of the breadth/parallelism of the reaction graph
-                var breadth = reactionInstanceGraph.getBreadth();
-                if (breadth == 0) {
-                    errorReporter.reportWarning("The program has no reactions");
-                } else {
-                    targetConfig.compileDefinitions.put(
-                      "LF_REACTION_GRAPH_BREADTH",
-                      String.valueOf(reactionInstanceGraph.getBreadth())
-                    );
-                }
-            }
+        // Inform the run-time of the breadth/parallelism of the reaction graph
+        var breadth = reactionInstanceGraph.getBreadth();
+        if (breadth == 0) {
+          errorReporter.reportWarning("The program has no reactions");
+        } else {
+          targetConfig.compileDefinitions.put(
+              "LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth()));
         }
+      }
     }
-
-    /**
-     * Generate an array of self structs for the reactor
-     * and one for each of its children.
-     * @param r The reactor instance.
-     */
-    private void generateSelfStructs(ReactorInstance r) {
-        initializeTriggerObjects.pr(CUtil.selfType(r)+"* "+CUtil.reactorRefName(r)+"["+r.getTotalWidth()+"];");
-        initializeTriggerObjects.pr("SUPPRESS_UNUSED_WARNING("+CUtil.reactorRefName(r)+");");
-        for (ReactorInstance child : r.children) {
-            generateSelfStructs(child);
-        }
+  }
+
+  /**
+   * Generate an array of self structs for the reactor and one for each of its children.
+   *
+   * @param r The reactor instance.
+   */
+  private void generateSelfStructs(ReactorInstance r) {
+    initializeTriggerObjects.pr(
+        CUtil.selfType(r) + "* " + CUtil.reactorRefName(r) + "[" + r.getTotalWidth() + "];");
+    initializeTriggerObjects.pr("SUPPRESS_UNUSED_WARNING(" + CUtil.reactorRefName(r) + ");");
+    for (ReactorInstance child : r.children) {
+      generateSelfStructs(child);
     }
+  }
 
-    private Stream<TypeParameterizedReactor> allTypeParameterizedReactors() {
-        return ASTUtils.recursiveChildren(main).stream()
-            .map(it -> it.tpr)
-            .distinct();
-    }
+  private Stream<TypeParameterizedReactor> allTypeParameterizedReactors() {
+    return ASTUtils.recursiveChildren(main).stream().map(it -> it.tpr).distinct();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CMainFunctionGenerator.java b/org.lflang/src/org/lflang/generator/c/CMainFunctionGenerator.java
index 533611368a..044874029f 100644
--- a/org.lflang/src/org/lflang/generator/c/CMainFunctionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CMainFunctionGenerator.java
@@ -3,120 +3,113 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.lflang.TargetConfig;
+import org.lflang.TargetProperty.Platform;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.util.StringUtil;
-import org.lflang.TargetProperty.Platform;
 
 public class CMainFunctionGenerator {
-    private TargetConfig targetConfig;
-    /** The command to run the generated code if specified in the target directive. */
-    private List<String> runCommand;
+  private TargetConfig targetConfig;
+  /** The command to run the generated code if specified in the target directive. */
+  private List<String> runCommand;
 
-    public CMainFunctionGenerator(TargetConfig targetConfig) {
-        this.targetConfig = targetConfig;
-        runCommand = new ArrayList<>();
-        parseTargetParameters();
-    }
+  public CMainFunctionGenerator(TargetConfig targetConfig) {
+    this.targetConfig = targetConfig;
+    runCommand = new ArrayList<>();
+    parseTargetParameters();
+  }
 
-    /**
-     * Generate the code that is the entry point
-     * of the program.
-     *
-     * Ideally, this code would belong to its own {@code main.c}
-     * file, but it currently lives in the same file
-     * as all the code generated for reactors.
-     */
-    public String generateCode() {
-        CodeBuilder code = new CodeBuilder();
-        code.pr(generateMainFunction());
-        code.pr(generateSetDefaultCliOption());
-        return code.toString();
-    }
+  /**
+   * Generate the code that is the entry point of the program.
+   *
+   * <p>Ideally, this code would belong to its own {@code main.c} file, but it currently lives in
+   * the same file as all the code generated for reactors.
+   */
+  public String generateCode() {
+    CodeBuilder code = new CodeBuilder();
+    code.pr(generateMainFunction());
+    code.pr(generateSetDefaultCliOption());
+    return code.toString();
+  }
 
-    /**
-     * Generate the {@code main} function.
-     */
-    private String generateMainFunction() {
-        if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
-            /**
-                By default, we must have a serial begin line prior to calling lf_reactor_c_main due to internal debugging messages requiring a print buffer.
-                For the future, we can check whether internal LF logging is enabled or not before removing this line.
-                - Logging
-            */
-            return String.join("\n",
-            "\nvoid _lf_arduino_print_message_function(const char* format, va_list args) {",
-                "\tchar buf[128];",
-                "\tvsnprintf(buf, 128, format, args);",
-                "\tSerial.print(buf);",
-            "}\n",
-            "// Arduino setup() and loop() functions",
-            "void setup() {",
-                "\tSerial.begin(" + targetConfig.platformOptions.baudRate + ");",
-                "\tlf_register_print_function(&_lf_arduino_print_message_function, LOG_LEVEL);",
-                "\tlf_reactor_c_main(0, NULL);",
-            "}\n",
-            "void loop() {}"
-            );
-        } else if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
-            // The Zephyr "runtime" does not terminate when main returns.
-            //  Rather, {@code exit} should be called explicitly.
-            return String.join("\n",
-                "void main(void) {",
-                "   int res = lf_reactor_c_main(0, NULL);",
-                "   exit(res);",
-                "}"
-                );
-        } else {
-            return String.join("\n",
-                "int main(int argc, const char* argv[]) {",
-                "    return lf_reactor_c_main(argc, argv);",
-                "}"
-            );
-        }
+  /** Generate the {@code main} function. */
+  private String generateMainFunction() {
+    if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
+      /**
+       * By default, we must have a serial begin line prior to calling lf_reactor_c_main due to
+       * internal debugging messages requiring a print buffer. For the future, we can check whether
+       * internal LF logging is enabled or not before removing this line. - Logging
+       */
+      return String.join(
+          "\n",
+          "\nvoid _lf_arduino_print_message_function(const char* format, va_list args) {",
+          "\tchar buf[128];",
+          "\tvsnprintf(buf, 128, format, args);",
+          "\tSerial.print(buf);",
+          "}\n",
+          "// Arduino setup() and loop() functions",
+          "void setup() {",
+          "\tSerial.begin(" + targetConfig.platformOptions.baudRate + ");",
+          "\tlf_register_print_function(&_lf_arduino_print_message_function, LOG_LEVEL);",
+          "\tlf_reactor_c_main(0, NULL);",
+          "}\n",
+          "void loop() {}");
+    } else if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
+      // The Zephyr "runtime" does not terminate when main returns.
+      //  Rather, {@code exit} should be called explicitly.
+      return String.join(
+          "\n",
+          "void main(void) {",
+          "   int res = lf_reactor_c_main(0, NULL);",
+          "   exit(res);",
+          "}");
+    } else {
+      return String.join(
+          "\n",
+          "int main(int argc, const char* argv[]) {",
+          "    return lf_reactor_c_main(argc, argv);",
+          "}");
     }
+  }
 
-    /**
-     * Generate code that is used to override the
-     * command line options to the {@code main} function
-     */
-    private String generateSetDefaultCliOption() {
-        // Generate function to set default command-line options.
-        // A literal array needs to be given outside any function definition,
-        // so start with that.
-        return runCommand.size() > 0 ?
-            String.join("\n",
-                "const char* _lf_default_argv[] = { " +
-                        StringUtil.addDoubleQuotes(
-                            StringUtil.joinObjects(runCommand,
-                                StringUtil.addDoubleQuotes(", ")))+" };",
-                "void _lf_set_default_command_line_options() {",
-                "        default_argc = "+runCommand.size()+";",
-                "        default_argv = _lf_default_argv;",
-                "}")
-                : "void _lf_set_default_command_line_options() {}";
-    }
+  /**
+   * Generate code that is used to override the command line options to the {@code main} function
+   */
+  private String generateSetDefaultCliOption() {
+    // Generate function to set default command-line options.
+    // A literal array needs to be given outside any function definition,
+    // so start with that.
+    return runCommand.size() > 0
+        ? String.join(
+            "\n",
+            "const char* _lf_default_argv[] = { "
+                + StringUtil.addDoubleQuotes(
+                    StringUtil.joinObjects(runCommand, StringUtil.addDoubleQuotes(", ")))
+                + " };",
+            "void _lf_set_default_command_line_options() {",
+            "        default_argc = " + runCommand.size() + ";",
+            "        default_argv = _lf_default_argv;",
+            "}")
+        : "void _lf_set_default_command_line_options() {}";
+  }
 
-    /**
-     * Parse the target parameters and set flags to the runCommand
-     * accordingly.
-     */
-    private void parseTargetParameters() {
-        if (targetConfig.fastMode) {
-            runCommand.add("-f");
-            runCommand.add("true");
-        }
-        if (targetConfig.keepalive) {
-            runCommand.add("-k");
-            runCommand.add("true");
-        }
-        if (targetConfig.timeout != null) {
-            runCommand.add("-o");
-            runCommand.add(targetConfig.timeout.getMagnitude() + "");
-            runCommand.add(targetConfig.timeout.unit.getCanonicalName());
-        }
-        // The runCommand has a first entry that is ignored but needed.
-        if (runCommand.size() > 0) {
-            runCommand.add(0, "dummy");
-        }
+  /** Parse the target parameters and set flags to the runCommand accordingly. */
+  private void parseTargetParameters() {
+    if (targetConfig.fastMode) {
+      runCommand.add("-f");
+      runCommand.add("true");
+    }
+    if (targetConfig.keepalive) {
+      runCommand.add("-k");
+      runCommand.add("true");
+    }
+    if (targetConfig.timeout != null) {
+      runCommand.add("-o");
+      runCommand.add(targetConfig.timeout.getMagnitude() + "");
+      runCommand.add(targetConfig.timeout.unit.getCanonicalName());
+    }
+    // The runCommand has a first entry that is ignored but needed.
+    if (runCommand.size() > 0) {
+      runCommand.add(0, "dummy");
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CMethodGenerator.java b/org.lflang/src/org/lflang/generator/c/CMethodGenerator.java
index 5da00ac70e..1950e8df82 100644
--- a/org.lflang/src/org/lflang/generator/c/CMethodGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CMethodGenerator.java
@@ -2,8 +2,8 @@
 
 import static org.lflang.ast.ASTUtils.allMethods;
 
-import org.lflang.ast.ASTUtils;
 import org.lflang.InferredType;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.lf.Method;
 import org.lflang.lf.Reactor;
@@ -15,165 +15,151 @@
  */
 public class CMethodGenerator {
 
-    /**
-     * Generate macro definitions for methods.
-     * @param tpr The reactor.
-     * @param body The place to put the macro definitions.
-     */
-    public static void generateMacrosForMethods(
-        TypeParameterizedReactor tpr,
-        CodeBuilder body
-    ) {
-        for (Method method : allMethods(tpr.reactor())) {
-            var functionName = methodFunctionName(tpr, method);
-            // If the method has no arguments. Do not pass it any variadic arguments.
-            if (method.getArguments().size() > 0) {
-                body.pr("#define "+method.getName()+"(...) "+functionName+"(self, ##__VA_ARGS__)");
-            } else {
-                body.pr("#define "+method.getName()+"() "+functionName+"(self)");
-            }
-        }
+  /**
+   * Generate macro definitions for methods.
+   *
+   * @param tpr The reactor.
+   * @param body The place to put the macro definitions.
+   */
+  public static void generateMacrosForMethods(TypeParameterizedReactor tpr, CodeBuilder body) {
+    for (Method method : allMethods(tpr.reactor())) {
+      var functionName = methodFunctionName(tpr, method);
+      // If the method has no arguments. Do not pass it any variadic arguments.
+      if (method.getArguments().size() > 0) {
+        body.pr("#define " + method.getName() + "(...) " + functionName + "(self, ##__VA_ARGS__)");
+      } else {
+        body.pr("#define " + method.getName() + "() " + functionName + "(self)");
+      }
     }
+  }
 
-    /**
-     * Generate macro undefinitions for methods.
-     * @param reactor The reactor.
-     * @param body The place to put the macro definitions.
-     */
-    public static void generateMacroUndefsForMethods(
-        Reactor reactor,
-        CodeBuilder body
-    ) {
-        for (Method method : allMethods(reactor)) {
-            body.pr("#undef "+method.getName());
-        }
+  /**
+   * Generate macro undefinitions for methods.
+   *
+   * @param reactor The reactor.
+   * @param body The place to put the macro definitions.
+   */
+  public static void generateMacroUndefsForMethods(Reactor reactor, CodeBuilder body) {
+    for (Method method : allMethods(reactor)) {
+      body.pr("#undef " + method.getName());
     }
+  }
 
-    /**
-     * Generate a method function definition for a reactor.
-     * This function will have a first argument that is a void* pointing to
-     * the self struct, followed by any arguments given in its definition.
-     * @param method The method.
-     * @param tpr The concrete reactor class.
-     * @param types The C-specific type conversion functions.
-     */
-    public static String generateMethod(
-        Method method,
-        TypeParameterizedReactor tpr,
-        CTypes types
-    ) {
-        var code = new CodeBuilder();
-        var body = ASTUtils.toText(method.getCode());
-
-        code.prSourceLineNumber(method);
-        code.prComment("Implementation of method "+method.getName()+"()");
-        code.pr(generateMethodSignature(method, tpr, types) + " {");
-        code.indent();
+  /**
+   * Generate a method function definition for a reactor. This function will have a first argument
+   * that is a void* pointing to the self struct, followed by any arguments given in its definition.
+   *
+   * @param method The method.
+   * @param tpr The concrete reactor class.
+   * @param types The C-specific type conversion functions.
+   */
+  public static String generateMethod(Method method, TypeParameterizedReactor tpr, CTypes types) {
+    var code = new CodeBuilder();
+    var body = ASTUtils.toText(method.getCode());
 
-        // Define the "self" struct.
-        String structType = CUtil.selfType(tpr);
-        // A null structType means there are no inputs, state,
-        // or anything else. No need to declare it.
-        if (structType != null) {
-             code.pr(String.join("\n",
-                 structType+"* self = ("+structType+"*)instance_args;"
-                         + " SUPPRESS_UNUSED_WARNING(self);"
-             ));
-        }
+    code.prSourceLineNumber(method);
+    code.prComment("Implementation of method " + method.getName() + "()");
+    code.pr(generateMethodSignature(method, tpr, types) + " {");
+    code.indent();
 
-        code.prSourceLineNumber(method.getCode());
-        code.pr(body);
-        code.unindent();
-        code.pr("}");
-        return code.toString();
+    // Define the "self" struct.
+    String structType = CUtil.selfType(tpr);
+    // A null structType means there are no inputs, state,
+    // or anything else. No need to declare it.
+    if (structType != null) {
+      code.pr(
+          String.join(
+              "\n",
+              structType
+                  + "* self = ("
+                  + structType
+                  + "*)instance_args;"
+                  + " SUPPRESS_UNUSED_WARNING(self);"));
     }
 
-    /**
-     * Generate method functions definition for a reactor.
-     * These functions have a first argument that is a void* pointing to
-     * the self struct.
-     * @param tpr The reactor.
-     * @param code The place to put the code.
-     * @param types The C-specific type conversion functions.
-     */
-    public static void generateMethods(
-            TypeParameterizedReactor tpr,
-            CodeBuilder code,
-            CTypes types
-    ) {
-        var reactor = tpr.reactor();
-        code.prComment("***** Start of method declarations.");
-        signatures(tpr, code, types);
-        generateMacrosForMethods(tpr, code);
-        for (Method method : allMethods(reactor)) {
-            code.pr(CMethodGenerator.generateMethod(method, tpr, types));
-        }
-        generateMacroUndefsForMethods(reactor, code);
-        code.prComment("***** End of method declarations.");
-    }
+    code.prSourceLineNumber(method.getCode());
+    code.pr(body);
+    code.unindent();
+    code.pr("}");
+    return code.toString();
+  }
 
-    /**
-     * Generate function signatures for methods.
-     * This can be used to declare all the methods with signatures only
-     * before giving the full definition so that methods may call each other
-     * (and themselves) regardless of the order of definition.
-     * @param tpr The reactor declaration.
-     * @param types The C-specific type conversion functions.
-     */
-    public static void signatures(
-        TypeParameterizedReactor tpr,
-        CodeBuilder body,
-        CTypes types
-    ) {
-        Reactor reactor = tpr.reactor();
-        for (Method method : allMethods(reactor)) {
-            body.pr(generateMethodSignature(method, tpr, types) + ";");
-        }
+  /**
+   * Generate method functions definition for a reactor. These functions have a first argument that
+   * is a void* pointing to the self struct.
+   *
+   * @param tpr The reactor.
+   * @param code The place to put the code.
+   * @param types The C-specific type conversion functions.
+   */
+  public static void generateMethods(TypeParameterizedReactor tpr, CodeBuilder code, CTypes types) {
+    var reactor = tpr.reactor();
+    code.prComment("***** Start of method declarations.");
+    signatures(tpr, code, types);
+    generateMacrosForMethods(tpr, code);
+    for (Method method : allMethods(reactor)) {
+      code.pr(CMethodGenerator.generateMethod(method, tpr, types));
     }
+    generateMacroUndefsForMethods(reactor, code);
+    code.prComment("***** End of method declarations.");
+  }
 
-    /**
-     * Return the function name for specified method of the specified reactor.
-     * @param tpr The reactor
-     * @param method The method.
-     * @return The function name for the method.
-     */
-    private static String methodFunctionName(TypeParameterizedReactor tpr, Method method) {
-        return CUtil.getName(tpr) + "_method_" + method.getName();
+  /**
+   * Generate function signatures for methods. This can be used to declare all the methods with
+   * signatures only before giving the full definition so that methods may call each other (and
+   * themselves) regardless of the order of definition.
+   *
+   * @param tpr The reactor declaration.
+   * @param types The C-specific type conversion functions.
+   */
+  public static void signatures(TypeParameterizedReactor tpr, CodeBuilder body, CTypes types) {
+    Reactor reactor = tpr.reactor();
+    for (Method method : allMethods(reactor)) {
+      body.pr(generateMethodSignature(method, tpr, types) + ";");
     }
+  }
+
+  /**
+   * Return the function name for specified method of the specified reactor.
+   *
+   * @param tpr The reactor
+   * @param method The method.
+   * @return The function name for the method.
+   */
+  private static String methodFunctionName(TypeParameterizedReactor tpr, Method method) {
+    return CUtil.getName(tpr) + "_method_" + method.getName();
+  }
 
-    /**
-     * Generate a method function signature for a reactor.
-     * This function will have a first argument that is a void* pointing to
-     * the self struct, followed by any arguments given in its definition.
-     * @param method The method.
-     * @param tpr The reactor declaration.
-     * @param types The C-specific type conversion functions.
-     */
-    public static String generateMethodSignature(
-        Method method,
-        TypeParameterizedReactor tpr,
-        CTypes types
-    ) {
-        var functionName = methodFunctionName(tpr, method);
+  /**
+   * Generate a method function signature for a reactor. This function will have a first argument
+   * that is a void* pointing to the self struct, followed by any arguments given in its definition.
+   *
+   * @param method The method.
+   * @param tpr The reactor declaration.
+   * @param types The C-specific type conversion functions.
+   */
+  public static String generateMethodSignature(
+      Method method, TypeParameterizedReactor tpr, CTypes types) {
+    var functionName = methodFunctionName(tpr, method);
 
-        StringBuilder result = new StringBuilder();
-        if (method.getReturn() != null) {
-            result.append(types.getTargetType(InferredType.fromAST(method.getReturn())));
-            result.append(" ");
-        } else {
-            result.append("void ");
-        }
-        result.append(functionName);
-        result.append("(void* instance_args");
-        if (method.getArguments() != null) {
-            for (var arg : method.getArguments()) {
-                result.append(", ");
-                result.append(types.getTargetType(InferredType.fromAST(arg.getType())));
-                result.append(" ");
-                result.append(arg.getName());
-            }
-        }
-        result.append(")");
-        return result.toString();
+    StringBuilder result = new StringBuilder();
+    if (method.getReturn() != null) {
+      result.append(types.getTargetType(InferredType.fromAST(method.getReturn())));
+      result.append(" ");
+    } else {
+      result.append("void ");
+    }
+    result.append(functionName);
+    result.append("(void* instance_args");
+    if (method.getArguments() != null) {
+      for (var arg : method.getArguments()) {
+        result.append(", ");
+        result.append(types.getTargetType(InferredType.fromAST(arg.getType())));
+        result.append(" ");
+        result.append(arg.getName());
+      }
     }
+    result.append(")");
+    return result.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CMixedRadixGenerator.java b/org.lflang/src/org/lflang/generator/c/CMixedRadixGenerator.java
index 40717f3c4d..f2bf71ef66 100644
--- a/org.lflang/src/org/lflang/generator/c/CMixedRadixGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CMixedRadixGenerator.java
@@ -1,16 +1,16 @@
 package org.lflang.generator.c;
 
 public class CMixedRadixGenerator {
-    /** Standardized name for channel index variable for a source. */
-    public static String sc = "src_channel";
-    /** Standardized name for bank index variable for a source. */
-    public static String sb = "src_bank";
-    /** Standardized name for runtime index variable for a source. */
-    public static String sr = "src_runtime";
-    /** Standardized name for channel index variable for a destination. */
-    public static String dc = "dst_channel";
-    /** Standardized name for bank index variable for a destination. */
-    public static String db = "dst_bank";
-    /** Standardized name for runtime index variable for a destination. */
-    public static String dr = "dst_runtime";
+  /** Standardized name for channel index variable for a source. */
+  public static String sc = "src_channel";
+  /** Standardized name for bank index variable for a source. */
+  public static String sb = "src_bank";
+  /** Standardized name for runtime index variable for a source. */
+  public static String sr = "src_runtime";
+  /** Standardized name for channel index variable for a destination. */
+  public static String dc = "dst_channel";
+  /** Standardized name for bank index variable for a destination. */
+  public static String db = "dst_bank";
+  /** Standardized name for runtime index variable for a destination. */
+  public static String dr = "dst_runtime";
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CModesGenerator.java b/org.lflang/src/org/lflang/generator/c/CModesGenerator.java
index 2a6217de64..7d72890639 100644
--- a/org.lflang/src/org/lflang/generator/c/CModesGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CModesGenerator.java
@@ -1,7 +1,6 @@
 package org.lflang.generator.c;
 
 import java.util.List;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ReactionInstance;
@@ -17,203 +16,228 @@
  * @author Hou Seng Wong
  */
 public class CModesGenerator {
-    /**
-     * Generate fields in the self struct for mode instances
-     *
-     * @param reactor
-     * @param body
-     * @param constructorCode
-     */
-    public static void generateDeclarations(
-        Reactor reactor,
-        CodeBuilder body,
-        CodeBuilder constructorCode
-    ) {
-        List<Mode> allModes = ASTUtils.allModes(reactor);
-        if (!allModes.isEmpty()) {
-            // Reactor's mode instances and its state.
-            body.pr(String.join("\n",
-                "reactor_mode_t _lf__modes["+reactor.getModes().size()+"];"
-            ));
+  /**
+   * Generate fields in the self struct for mode instances
+   *
+   * @param reactor
+   * @param body
+   * @param constructorCode
+   */
+  public static void generateDeclarations(
+      Reactor reactor, CodeBuilder body, CodeBuilder constructorCode) {
+    List<Mode> allModes = ASTUtils.allModes(reactor);
+    if (!allModes.isEmpty()) {
+      // Reactor's mode instances and its state.
+      body.pr(String.join("\n", "reactor_mode_t _lf__modes[" + reactor.getModes().size() + "];"));
 
-            // Initialize the mode instances
-            constructorCode.pr("// Initialize modes");
-            constructorCode.pr("self_base_t* _lf_self_base = (self_base_t*)self;");
-            int initialMode = -1;
+      // Initialize the mode instances
+      constructorCode.pr("// Initialize modes");
+      constructorCode.pr("self_base_t* _lf_self_base = (self_base_t*)self;");
+      int initialMode = -1;
 
-            for (int i = 0; i < allModes.size(); i++){
-                var mode = allModes.get(i);
-                constructorCode.pr(mode, String.join("\n",
-                    "self->_lf__modes["+i+"].state = &_lf_self_base->_lf__mode_state;",
-                    "self->_lf__modes["+i+"].name = \""+mode.getName()+"\";",
-                    "self->_lf__modes["+i+"].deactivation_time = 0;",
-                    "self->_lf__modes["+i+"].flags = 0;"
-                ));
-                if (initialMode < 0 && mode.isInitial()) {
-                    initialMode = i;
-                }
-            }
+      for (int i = 0; i < allModes.size(); i++) {
+        var mode = allModes.get(i);
+        constructorCode.pr(
+            mode,
+            String.join(
+                "\n",
+                "self->_lf__modes[" + i + "].state = &_lf_self_base->_lf__mode_state;",
+                "self->_lf__modes[" + i + "].name = \"" + mode.getName() + "\";",
+                "self->_lf__modes[" + i + "].deactivation_time = 0;",
+                "self->_lf__modes[" + i + "].flags = 0;"));
+        if (initialMode < 0 && mode.isInitial()) {
+          initialMode = i;
+        }
+      }
 
-            assert initialMode >= 0 : "initial mode must be non-negative!!";
+      assert initialMode >= 0 : "initial mode must be non-negative!!";
 
-            // Initialize mode state with initial mode active upon start
-            constructorCode.pr(String.join("\n",
-                "// Initialize mode state",
-                "_lf_self_base->_lf__mode_state.parent_mode = NULL;",
-                "_lf_self_base->_lf__mode_state.initial_mode = &self->_lf__modes["+initialMode+"];",
-                "_lf_self_base->_lf__mode_state.current_mode = _lf_self_base->_lf__mode_state.initial_mode;",
-                "_lf_self_base->_lf__mode_state.next_mode = NULL;",
-                "_lf_self_base->_lf__mode_state.mode_change = no_transition;"
-            ));
-        }
+      // Initialize mode state with initial mode active upon start
+      constructorCode.pr(
+          String.join(
+              "\n",
+              "// Initialize mode state",
+              "_lf_self_base->_lf__mode_state.parent_mode = NULL;",
+              "_lf_self_base->_lf__mode_state.initial_mode = &self->_lf__modes["
+                  + initialMode
+                  + "];",
+              "_lf_self_base->_lf__mode_state.current_mode ="
+                  + " _lf_self_base->_lf__mode_state.initial_mode;",
+              "_lf_self_base->_lf__mode_state.next_mode = NULL;",
+              "_lf_self_base->_lf__mode_state.mode_change = no_transition;"));
     }
+  }
 
-    /**
-     * Generate the declaration of modal models state table.
-     *
-     * @param hasModalReactors True if there is modal model reactors, false otherwise
-     * @param modalReactorCount The number of modal model reactors
-     * @param modalStateResetCount The number of modal model state resets
-     */
-    public static String generateModeStatesTable(
-        boolean hasModalReactors,
-        int modalReactorCount,
-        int modalStateResetCount
-    ) {
-        if (hasModalReactors) {
-            return String.join("\n",
-                "// Array of pointers to mode states to be handled in _lf_handle_mode_changes().",
-                "reactor_mode_state_t* _lf_modal_reactor_states["+modalReactorCount+"];",
-                "int _lf_modal_reactor_states_size = "+modalReactorCount+";",
-                (modalStateResetCount > 0 ?
-                    String.join("\n",
-                        "// Array of reset data for state variables nested in modes. Used in _lf_handle_mode_changes().",
-                        "mode_state_variable_reset_data_t _lf_modal_state_reset["+modalStateResetCount+"];",
-                        "int _lf_modal_state_reset_size = "+modalStateResetCount+";")
-                    : ""
-                ));
-        }
-        return "";
+  /**
+   * Generate the declaration of modal models state table.
+   *
+   * @param hasModalReactors True if there is modal model reactors, false otherwise
+   * @param modalReactorCount The number of modal model reactors
+   * @param modalStateResetCount The number of modal model state resets
+   */
+  public static String generateModeStatesTable(
+      boolean hasModalReactors, int modalReactorCount, int modalStateResetCount) {
+    if (hasModalReactors) {
+      return String.join(
+          "\n",
+          "// Array of pointers to mode states to be handled in _lf_handle_mode_changes().",
+          "reactor_mode_state_t* _lf_modal_reactor_states[" + modalReactorCount + "];",
+          "int _lf_modal_reactor_states_size = " + modalReactorCount + ";",
+          (modalStateResetCount > 0
+              ? String.join(
+                  "\n",
+                  "// Array of reset data for state variables nested in modes. Used in"
+                      + " _lf_handle_mode_changes().",
+                  "mode_state_variable_reset_data_t _lf_modal_state_reset["
+                      + modalStateResetCount
+                      + "];",
+                  "int _lf_modal_state_reset_size = " + modalStateResetCount + ";")
+              : ""));
     }
+    return "";
+  }
 
-    /**
-     * Generate counter variable declarations used for registering modal reactors.
-     *
-     * @param hasModalReactors True if there is modal model reactors, false otherwise
-     */
-    public static String generateModalInitalizationCounters(boolean hasModalReactors) {
-        if (hasModalReactors) {
-            return String.join("\n",
-                "int _lf_modal_reactor_states_count = 0;",
-                "int _lf_modal_state_reset_count = 0;"
-            );
-        }
-        return "";
+  /**
+   * Generate counter variable declarations used for registering modal reactors.
+   *
+   * @param hasModalReactors True if there is modal model reactors, false otherwise
+   */
+  public static String generateModalInitalizationCounters(boolean hasModalReactors) {
+    if (hasModalReactors) {
+      return String.join(
+          "\n", "int _lf_modal_reactor_states_count = 0;", "int _lf_modal_state_reset_count = 0;");
     }
+    return "";
+  }
 
-    /**
-     * Generate code for modal reactor registration and hierarchy.
-     *
-     * @param instance The reactor instance.
-     * @param code The code builder.
-     */
-    public static void generateModeStructure(ReactorInstance instance, CodeBuilder code) {
-        var parentMode = instance.getMode(false);
-        var nameOfSelfStruct = CUtil.reactorRef(instance);
-        // If this instance is enclosed in another mode
-        if (parentMode != null) {
-            var parentModeRef = "&"+CUtil.reactorRef(parentMode.getParent())+"->_lf__modes["+parentMode.getParent().modes.indexOf(parentMode)+"]";
-            code.pr("// Setup relation to enclosing mode");
+  /**
+   * Generate code for modal reactor registration and hierarchy.
+   *
+   * @param instance The reactor instance.
+   * @param code The code builder.
+   */
+  public static void generateModeStructure(ReactorInstance instance, CodeBuilder code) {
+    var parentMode = instance.getMode(false);
+    var nameOfSelfStruct = CUtil.reactorRef(instance);
+    // If this instance is enclosed in another mode
+    if (parentMode != null) {
+      var parentModeRef =
+          "&"
+              + CUtil.reactorRef(parentMode.getParent())
+              + "->_lf__modes["
+              + parentMode.getParent().modes.indexOf(parentMode)
+              + "]";
+      code.pr("// Setup relation to enclosing mode");
 
-            // If this reactor does not have its own modes, all reactions must be linked to enclosing mode
-            if (instance.modes.isEmpty()) {
-                int i = 0;
-                for (ReactionInstance reaction : instance.reactions) {
-                    code.pr(CUtil.reactorRef(reaction.getParent())+"->_lf__reaction_"+i+".mode = "+parentModeRef+";");
-                    i++;
-                }
-            } else { // Otherwise, only reactions outside modes must be linked and the mode state itself gets a parent relation
-                code.pr("((self_base_t*)"+nameOfSelfStruct+")->_lf__mode_state.parent_mode = "+parentModeRef+";");
-                for (var reaction : (Iterable<ReactionInstance>) instance.reactions.stream().filter(it -> it.getMode(true) == null)::iterator) {
-                    code.pr(CUtil.reactorRef(reaction.getParent())+"->_lf__reaction_"+instance.reactions.indexOf(reaction)+".mode = "+parentModeRef+";");
-                }
-            }
+      // If this reactor does not have its own modes, all reactions must be linked to enclosing mode
+      if (instance.modes.isEmpty()) {
+        int i = 0;
+        for (ReactionInstance reaction : instance.reactions) {
+          code.pr(
+              CUtil.reactorRef(reaction.getParent())
+                  + "->_lf__reaction_"
+                  + i
+                  + ".mode = "
+                  + parentModeRef
+                  + ";");
+          i++;
         }
-        // If this reactor has modes, register for mode change handling
-        if (!instance.modes.isEmpty()) {
-            code.pr("// Register for transition handling");
-            code.pr("_lf_modal_reactor_states[_lf_modal_reactor_states_count++] = &((self_base_t*)"+nameOfSelfStruct+")->_lf__mode_state;");
+      } else { // Otherwise, only reactions outside modes must be linked and the mode state itself
+        // gets a parent relation
+        code.pr(
+            "((self_base_t*)"
+                + nameOfSelfStruct
+                + ")->_lf__mode_state.parent_mode = "
+                + parentModeRef
+                + ";");
+        for (var reaction :
+            (Iterable<ReactionInstance>)
+                instance.reactions.stream().filter(it -> it.getMode(true) == null)::iterator) {
+          code.pr(
+              CUtil.reactorRef(reaction.getParent())
+                  + "->_lf__reaction_"
+                  + instance.reactions.indexOf(reaction)
+                  + ".mode = "
+                  + parentModeRef
+                  + ";");
         }
+      }
     }
+    // If this reactor has modes, register for mode change handling
+    if (!instance.modes.isEmpty()) {
+      code.pr("// Register for transition handling");
+      code.pr(
+          "_lf_modal_reactor_states[_lf_modal_reactor_states_count++] = &((self_base_t*)"
+              + nameOfSelfStruct
+              + ")->_lf__mode_state;");
+    }
+  }
 
-    /**
-     * Generate code registering a state variable for automatic reset.
-     *
-     * @param modeRef The code to refer to the mode
-     * @param selfRef The code to refer to the self struct
-     * @param varName The variable name in the self struct
-     * @param source The variable that stores the initial value
-     * @param type The size of the initial value
-     */
-    public static String generateStateResetStructure(
-            String modeRef,
-            String selfRef,
-            String varName,
-            String source,
-            String type
-        ) {
-            return String.join("\n",
-                "// Register for automatic reset",
-                "_lf_modal_state_reset[_lf_modal_state_reset_count].mode = "+modeRef+";",
-                "_lf_modal_state_reset[_lf_modal_state_reset_count].target = &("+selfRef+"->"+varName+");",
-                "_lf_modal_state_reset[_lf_modal_state_reset_count].source = &"+source+";",
-                "_lf_modal_state_reset[_lf_modal_state_reset_count].size = sizeof("+type+");",
-                "_lf_modal_state_reset_count++;"
-            );
-        }
+  /**
+   * Generate code registering a state variable for automatic reset.
+   *
+   * @param modeRef The code to refer to the mode
+   * @param selfRef The code to refer to the self struct
+   * @param varName The variable name in the self struct
+   * @param source The variable that stores the initial value
+   * @param type The size of the initial value
+   */
+  public static String generateStateResetStructure(
+      String modeRef, String selfRef, String varName, String source, String type) {
+    return String.join(
+        "\n",
+        "// Register for automatic reset",
+        "_lf_modal_state_reset[_lf_modal_state_reset_count].mode = " + modeRef + ";",
+        "_lf_modal_state_reset[_lf_modal_state_reset_count].target = &("
+            + selfRef
+            + "->"
+            + varName
+            + ");",
+        "_lf_modal_state_reset[_lf_modal_state_reset_count].source = &" + source + ";",
+        "_lf_modal_state_reset[_lf_modal_state_reset_count].size = sizeof(" + type + ");",
+        "_lf_modal_state_reset_count++;");
+  }
 
-    /**
-     * Generate code to call {@code _lf_process_mode_changes}.
-     *
-     * @param hasModalReactors True if there is modal model reactors, false otherwise
-     * @param modalStateResetCount The number of modal model state resets
-     */
-    public static String generateLfHandleModeChanges(
-        boolean hasModalReactors,
-        int modalStateResetCount
-    ) {
-        if (!hasModalReactors) {
-            return "";
-        }
-        return String.join("\n",
-            "void _lf_handle_mode_changes() {",
-            "    _lf_process_mode_changes(",
-            "        _lf_modal_reactor_states, ",
-            "        _lf_modal_reactor_states_size, ",
-            "        " + (modalStateResetCount > 0 ? "_lf_modal_state_reset" : "NULL") + ", ",
-            "        " + (modalStateResetCount > 0 ? "_lf_modal_state_reset_size" : "0") + ", ",
-            "        _lf_timer_triggers, ",
-            "        _lf_timer_triggers_size",
-            "    );",
-            "}"
-        );
+  /**
+   * Generate code to call {@code _lf_process_mode_changes}.
+   *
+   * @param hasModalReactors True if there is modal model reactors, false otherwise
+   * @param modalStateResetCount The number of modal model state resets
+   */
+  public static String generateLfHandleModeChanges(
+      boolean hasModalReactors, int modalStateResetCount) {
+    if (!hasModalReactors) {
+      return "";
     }
+    return String.join(
+        "\n",
+        "void _lf_handle_mode_changes() {",
+        "    _lf_process_mode_changes(",
+        "        _lf_modal_reactor_states, ",
+        "        _lf_modal_reactor_states_size, ",
+        "        " + (modalStateResetCount > 0 ? "_lf_modal_state_reset" : "NULL") + ", ",
+        "        " + (modalStateResetCount > 0 ? "_lf_modal_state_reset_size" : "0") + ", ",
+        "        _lf_timer_triggers, ",
+        "        _lf_timer_triggers_size",
+        "    );",
+        "}");
+  }
 
-    /**
-     * Generate code to call {@code _lf_initialize_modes}.
-     *
-     * @param hasModalReactors True if there is modal model reactors, false otherwise
-     */
-    public static String generateLfInitializeModes(boolean hasModalReactors) {
-        if (!hasModalReactors) {
-            return "";
-        }
-        return String.join("\n",
-            "void _lf_initialize_modes() {",
-            "    _lf_initialize_mode_states(",
-            "        _lf_modal_reactor_states, ",
-            "        _lf_modal_reactor_states_size);",
-            "}"
-        );
+  /**
+   * Generate code to call {@code _lf_initialize_modes}.
+   *
+   * @param hasModalReactors True if there is modal model reactors, false otherwise
+   */
+  public static String generateLfInitializeModes(boolean hasModalReactors) {
+    if (!hasModalReactors) {
+      return "";
     }
+    return String.join(
+        "\n",
+        "void _lf_initialize_modes() {",
+        "    _lf_initialize_mode_states(",
+        "        _lf_modal_reactor_states, ",
+        "        _lf_modal_reactor_states_size);",
+        "}");
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CParameterGenerator.java b/org.lflang/src/org/lflang/generator/c/CParameterGenerator.java
index 786b4701de..caaa375056 100644
--- a/org.lflang/src/org/lflang/generator/c/CParameterGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CParameterGenerator.java
@@ -1,8 +1,8 @@
 package org.lflang.generator.c;
 
-import org.lflang.generator.ParameterInstance;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
+import org.lflang.generator.ParameterInstance;
 import org.lflang.lf.Initializer;
 import org.lflang.lf.Parameter;
 
@@ -14,34 +14,39 @@
  * @author Hou Seng Wong
  */
 public class CParameterGenerator {
-    /**
-     * Return a C expression that can be used to initialize the specified
-     * parameter instance. If the parameter initializer refers to other
-     * parameters, then those parameter references are replaced with
-     * accesses to the self struct of the parents of those parameters.
-     */
-    public static String getInitializer(ParameterInstance p) {
-        // Handle the bank_index parameter.
-        if (p.getName().equals("bank_index")) {
-            return CUtil.bankIndex(p.getParent());
-        }
-
-        CTypes ctypes = CTypes.generateParametersIn(p.getParent().getParent());
-        Initializer values = p.getActualValue();
-        return ctypes.getTargetInitializer(values, p.getDefinition().getType());
+  /**
+   * Return a C expression that can be used to initialize the specified parameter instance. If the
+   * parameter initializer refers to other parameters, then those parameter references are replaced
+   * with accesses to the self struct of the parents of those parameters.
+   */
+  public static String getInitializer(ParameterInstance p) {
+    // Handle the bank_index parameter.
+    if (p.getName().equals("bank_index")) {
+      return CUtil.bankIndex(p.getParent());
     }
 
-    /**
-     * Generate code for parameters variables of a reactor in the form "parameter.type parameter.name;"
-     * @param reactor {@link TypeParameterizedReactor}
-     * @param types A helper class for types
-     */
-    public static String generateDeclarations(TypeParameterizedReactor reactor, CTypes types) {
-        CodeBuilder code = new CodeBuilder();
-        for (Parameter parameter : ASTUtils.allParameters(reactor.reactor())) {
-            code.prSourceLineNumber(parameter);
-            code.pr(types.getTargetType(reactor.resolveType(ASTUtils.getInferredType(parameter))) + " " + parameter.getName() + ";");
-        }
-        return code.toString();
+    CTypes ctypes = CTypes.generateParametersIn(p.getParent().getParent());
+    Initializer values = p.getActualValue();
+    return ctypes.getTargetInitializer(values, p.getDefinition().getType());
+  }
+
+  /**
+   * Generate code for parameters variables of a reactor in the form "parameter.type
+   * parameter.name;"
+   *
+   * @param reactor {@link TypeParameterizedReactor}
+   * @param types A helper class for types
+   */
+  public static String generateDeclarations(TypeParameterizedReactor reactor, CTypes types) {
+    CodeBuilder code = new CodeBuilder();
+    for (Parameter parameter : ASTUtils.allParameters(reactor.reactor())) {
+      code.prSourceLineNumber(parameter);
+      code.pr(
+          types.getTargetType(reactor.resolveType(ASTUtils.getInferredType(parameter)))
+              + " "
+              + parameter.getName()
+              + ";");
     }
+    return code.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CPortGenerator.java b/org.lflang/src/org/lflang/generator/c/CPortGenerator.java
index f82bad661c..02697f4a85 100644
--- a/org.lflang/src/org/lflang/generator/c/CPortGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CPortGenerator.java
@@ -1,9 +1,11 @@
 package org.lflang.generator.c;
 
-import org.lflang.ast.ASTUtils;
+import static org.lflang.generator.c.CGenerator.variableStructType;
+
 import org.lflang.AttributeUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.Target;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.PortInstance;
 import org.lflang.lf.Input;
@@ -11,9 +13,6 @@
 import org.lflang.lf.Port;
 import org.lflang.lf.ReactorDecl;
 
-import static org.lflang.generator.c.CGenerator.variableStructType;
-
-
 /**
  * Generates C code to declare and initialize ports.
  *
@@ -22,256 +21,267 @@
  * @author Hou Seng Wong
  */
 public class CPortGenerator {
-    /**
-     * Generate fields in the self struct for input and output ports
-     */
-    public static void generateDeclarations(
-        TypeParameterizedReactor tpr,
-        ReactorDecl decl,
-        CodeBuilder body,
-        CodeBuilder constructorCode
-    ) {
-        generateInputDeclarations(tpr, body, constructorCode);
-        generateOutputDeclarations(tpr, body, constructorCode);
-    }
+  /** Generate fields in the self struct for input and output ports */
+  public static void generateDeclarations(
+      TypeParameterizedReactor tpr,
+      ReactorDecl decl,
+      CodeBuilder body,
+      CodeBuilder constructorCode) {
+    generateInputDeclarations(tpr, body, constructorCode);
+    generateOutputDeclarations(tpr, body, constructorCode);
+  }
 
-    /**
-     * Generate the struct type definitions for the port of the
-     * reactor
-     *
-     * @param port The port to generate the struct
-     * @param target The target of the code generation (C, CCpp or Python)
-     * @param errorReporter The error reporter
-     * @param types The helper object for types related stuff
-     * @param federatedExtension The code needed to support federated execution
-     * @param userFacing Whether this struct is to be presented in a user-facing header
-     * @param decl The reactorDecl if this struct is for the header of this reactor's container;
-     * null otherwise
-     * @return The auxiliary struct for the port as a string
-     */
-    public static String generateAuxiliaryStruct(
-        TypeParameterizedReactor tpr,
-        Port port,
-        Target target,
-        ErrorReporter errorReporter,
-        CTypes types,
-        CodeBuilder federatedExtension,
-        boolean userFacing,
-        ReactorDecl decl
-    ) {
-        assert decl == null || userFacing;
-        var code = new CodeBuilder();
-        code.pr("typedef struct {");
-        code.indent();
-        // NOTE: The following fields are required to be the first ones so that
-        // pointer to this struct can be cast to a (lf_port_base_t*) or to
-        // (token_template_t*) to access these fields for any port.
-        // IMPORTANT: These must match exactly the fields defined in port.h!!
-        code.pr(String.join("\n",
-                "token_type_t type;",  // From token_template_t
-                "lf_token_t* token;",  // From token_template_t
-                "size_t length;",      // From token_template_t
-                "bool is_present;",    // From lf_port_base_t
-                "lf_sparse_io_record_t* sparse_record;",  // From lf_port_base_t
-                "int destination_channel;",  // From lf_port_base_t
-                "int num_destinations;"      // From lf_port_base_t
-        ));
-        code.pr(valueDeclaration(tpr, port, target, errorReporter, types));
-        code.pr(federatedExtension.toString());
-        code.unindent();
-        var name = decl != null ? localPortName(decl, port.getName())
+  /**
+   * Generate the struct type definitions for the port of the reactor
+   *
+   * @param port The port to generate the struct
+   * @param target The target of the code generation (C, CCpp or Python)
+   * @param errorReporter The error reporter
+   * @param types The helper object for types related stuff
+   * @param federatedExtension The code needed to support federated execution
+   * @param userFacing Whether this struct is to be presented in a user-facing header
+   * @param decl The reactorDecl if this struct is for the header of this reactor's container; null
+   *     otherwise
+   * @return The auxiliary struct for the port as a string
+   */
+  public static String generateAuxiliaryStruct(
+      TypeParameterizedReactor tpr,
+      Port port,
+      Target target,
+      ErrorReporter errorReporter,
+      CTypes types,
+      CodeBuilder federatedExtension,
+      boolean userFacing,
+      ReactorDecl decl) {
+    assert decl == null || userFacing;
+    var code = new CodeBuilder();
+    code.pr("typedef struct {");
+    code.indent();
+    // NOTE: The following fields are required to be the first ones so that
+    // pointer to this struct can be cast to a (lf_port_base_t*) or to
+    // (token_template_t*) to access these fields for any port.
+    // IMPORTANT: These must match exactly the fields defined in port.h!!
+    code.pr(
+        String.join(
+            "\n",
+            "token_type_t type;", // From token_template_t
+            "lf_token_t* token;", // From token_template_t
+            "size_t length;", // From token_template_t
+            "bool is_present;", // From lf_port_base_t
+            "lf_sparse_io_record_t* sparse_record;", // From lf_port_base_t
+            "int destination_channel;", // From lf_port_base_t
+            "int num_destinations;" // From lf_port_base_t
+            ));
+    code.pr(valueDeclaration(tpr, port, target, errorReporter, types));
+    code.pr(federatedExtension.toString());
+    code.unindent();
+    var name =
+        decl != null
+            ? localPortName(decl, port.getName())
             : variableStructType(port, tpr, userFacing);
-        code.pr("} " + name + ";");
-        return code.toString();
-    }
+    code.pr("} " + name + ";");
+    return code.toString();
+  }
 
-    public static String localPortName(ReactorDecl decl, String portName) {
-        return decl.getName().toLowerCase() + "_" + portName + "_t";
-    }
+  public static String localPortName(ReactorDecl decl, String portName) {
+    return decl.getName().toLowerCase() + "_" + portName + "_t";
+  }
 
-    /**
-     * Allocate memory for the input port.
-     * @param input The input port
-     * @param reactorSelfStruct The name of the self struct
-     */
-    public static String initializeInputMultiport(
-        PortInstance input,
-        String reactorSelfStruct
-    ) {
-        var portRefName = CUtil.portRefName(input);
-        // If the port is a multiport, create an array.
-        if (input.isMultiport()) {
-            String result = String.join("\n",
-                portRefName+"_width = "+input.getWidth()+";",
-                "// Allocate memory for multiport inputs.",
-                portRefName+" = ("+variableStructType(input)+"**)_lf_allocate(",
-                "        "+input.getWidth()+", sizeof("+variableStructType(input)+"*),",
-                "        &"+reactorSelfStruct+"->base.allocations); ",
-                "// Set inputs by default to an always absent default input.",
-                "for (int i = 0; i < "+input.getWidth()+"; i++) {",
-                "    "+portRefName+"[i] = &"+reactorSelfStruct+"->_lf_default__"+input.getName()+";",
-                "}"
-            );
-            if (AttributeUtils.isSparse(input.getDefinition())) {
-                return String.join("\n", result,
-                    "if ("+input.getWidth()+" >= LF_SPARSE_WIDTH_THRESHOLD) {",
-                    "    "+portRefName+"__sparse = (lf_sparse_io_record_t*)_lf_allocate(1,",
-                    "            sizeof(lf_sparse_io_record_t) + sizeof(size_t) * "+input.getWidth()+"/LF_SPARSE_CAPACITY_DIVIDER,",
-                    "            &"+reactorSelfStruct+"->base.allocations);",
-                    "    "+portRefName+"__sparse->capacity = "+input.getWidth()+"/LF_SPARSE_CAPACITY_DIVIDER;",
-                    "    if (_lf_sparse_io_record_sizes.start == NULL) {",
-                    "        _lf_sparse_io_record_sizes = vector_new(1);",
-                    "    }",
-                    "    vector_push(&_lf_sparse_io_record_sizes, (void*)&"+portRefName+"__sparse->size);",
-                    "}"
-                );
-            }
-            return result;
-        } else {
-            return String.join("\n",
-                "// width of -2 indicates that it is not a multiport.",
-                portRefName+"_width = -2;"
-            );
-        }
+  /**
+   * Allocate memory for the input port.
+   *
+   * @param input The input port
+   * @param reactorSelfStruct The name of the self struct
+   */
+  public static String initializeInputMultiport(PortInstance input, String reactorSelfStruct) {
+    var portRefName = CUtil.portRefName(input);
+    // If the port is a multiport, create an array.
+    if (input.isMultiport()) {
+      String result =
+          String.join(
+              "\n",
+              portRefName + "_width = " + input.getWidth() + ";",
+              "// Allocate memory for multiport inputs.",
+              portRefName + " = (" + variableStructType(input) + "**)_lf_allocate(",
+              "        " + input.getWidth() + ", sizeof(" + variableStructType(input) + "*),",
+              "        &" + reactorSelfStruct + "->base.allocations); ",
+              "// Set inputs by default to an always absent default input.",
+              "for (int i = 0; i < " + input.getWidth() + "; i++) {",
+              "    "
+                  + portRefName
+                  + "[i] = &"
+                  + reactorSelfStruct
+                  + "->_lf_default__"
+                  + input.getName()
+                  + ";",
+              "}");
+      if (AttributeUtils.isSparse(input.getDefinition())) {
+        return String.join(
+            "\n",
+            result,
+            "if (" + input.getWidth() + " >= LF_SPARSE_WIDTH_THRESHOLD) {",
+            "    " + portRefName + "__sparse = (lf_sparse_io_record_t*)_lf_allocate(1,",
+            "            sizeof(lf_sparse_io_record_t) + sizeof(size_t) * "
+                + input.getWidth()
+                + "/LF_SPARSE_CAPACITY_DIVIDER,",
+            "            &" + reactorSelfStruct + "->base.allocations);",
+            "    "
+                + portRefName
+                + "__sparse->capacity = "
+                + input.getWidth()
+                + "/LF_SPARSE_CAPACITY_DIVIDER;",
+            "    if (_lf_sparse_io_record_sizes.start == NULL) {",
+            "        _lf_sparse_io_record_sizes = vector_new(1);",
+            "    }",
+            "    vector_push(&_lf_sparse_io_record_sizes, (void*)&"
+                + portRefName
+                + "__sparse->size);",
+            "}");
+      }
+      return result;
+    } else {
+      return String.join(
+          "\n",
+          "// width of -2 indicates that it is not a multiport.",
+          portRefName + "_width = -2;");
     }
+  }
 
-    /**
-     * Allocate memory for the output port.
-     * @param output The output port
-     * @param reactorSelfStruct The name of the self struct
-     */
-    public static String initializeOutputMultiport(
-        PortInstance output,
-        String reactorSelfStruct
-    ) {
-        var portRefName = CUtil.portRefName(output);
-        var portStructType = variableStructType(output);
-        return output.isMultiport() ?
-                String.join("\n",
-                    portRefName+"_width = "+output.getWidth()+";",
-                    "// Allocate memory for multiport output.",
-                    portRefName+" = ("+portStructType+"*)_lf_allocate(",
-                    "        "+output.getWidth()+", sizeof("+portStructType+"),",
-                    "        &"+reactorSelfStruct+"->base.allocations); ",
-                    portRefName+"_pointers = ("+portStructType+"**)_lf_allocate(",
-                    "        "+output.getWidth()+", sizeof("+portStructType+"*),",
-                    "        &"+reactorSelfStruct+"->base.allocations); ",
-                    "// Assign each output port pointer to be used in",
-                    "// reactions to facilitate user access to output ports",
-                    "for(int i=0; i < "+output.getWidth()+"; i++) {",
-                    "        "+portRefName+"_pointers[i] = &("+portRefName+"[i]);",
-                    "}"
-                ) :
-                String.join("\n",
-                    "// width of -2 indicates that it is not a multiport.",
-                    portRefName+"_width = -2;"
-                );
-    }
+  /**
+   * Allocate memory for the output port.
+   *
+   * @param output The output port
+   * @param reactorSelfStruct The name of the self struct
+   */
+  public static String initializeOutputMultiport(PortInstance output, String reactorSelfStruct) {
+    var portRefName = CUtil.portRefName(output);
+    var portStructType = variableStructType(output);
+    return output.isMultiport()
+        ? String.join(
+            "\n",
+            portRefName + "_width = " + output.getWidth() + ";",
+            "// Allocate memory for multiport output.",
+            portRefName + " = (" + portStructType + "*)_lf_allocate(",
+            "        " + output.getWidth() + ", sizeof(" + portStructType + "),",
+            "        &" + reactorSelfStruct + "->base.allocations); ",
+            portRefName + "_pointers = (" + portStructType + "**)_lf_allocate(",
+            "        " + output.getWidth() + ", sizeof(" + portStructType + "*),",
+            "        &" + reactorSelfStruct + "->base.allocations); ",
+            "// Assign each output port pointer to be used in",
+            "// reactions to facilitate user access to output ports",
+            "for(int i=0; i < " + output.getWidth() + "; i++) {",
+            "        " + portRefName + "_pointers[i] = &(" + portRefName + "[i]);",
+            "}")
+        : String.join(
+            "\n",
+            "// width of -2 indicates that it is not a multiport.",
+            portRefName + "_width = -2;");
+  }
 
-    /**
-     * For the specified port, return a declaration for port struct to
-     * contain the value of the port. A multiport output with width 4 and
-     * type int[10], for example, will result in this:
-     * <pre><code>
-     *     int value[10];
-     * </code></pre>
-     * There will be an array of size 4 of structs, each containing this value
-     * array.
-     * @param port The port.
-     * @return A string providing the value field of the port struct.
-     */
-    private static String valueDeclaration(
-        TypeParameterizedReactor tpr,
-        Port port,
-        Target target,
-        ErrorReporter errorReporter,
-        CTypes types
-    ) {
-        if (port.getType() == null && target.requiresTypes) {
-            // This should have been caught by the validator.
-            errorReporter.reportError(port, "Port is required to have a type: " + port.getName());
-            return "";
-        }
-        // Do not convert to lf_token_t* using lfTypeToTokenType because there
-        // will be a separate field pointing to the token.
-        return types.getVariableDeclaration(tpr, ASTUtils.getInferredType(port), "value", false) + ";";
+  /**
+   * For the specified port, return a declaration for port struct to contain the value of the port.
+   * A multiport output with width 4 and type int[10], for example, will result in this:
+   *
+   * <pre><code>
+   *     int value[10];
+   * </code></pre>
+   *
+   * There will be an array of size 4 of structs, each containing this value array.
+   *
+   * @param port The port.
+   * @return A string providing the value field of the port struct.
+   */
+  private static String valueDeclaration(
+      TypeParameterizedReactor tpr,
+      Port port,
+      Target target,
+      ErrorReporter errorReporter,
+      CTypes types) {
+    if (port.getType() == null && target.requiresTypes) {
+      // This should have been caught by the validator.
+      errorReporter.reportError(port, "Port is required to have a type: " + port.getName());
+      return "";
     }
+    // Do not convert to lf_token_t* using lfTypeToTokenType because there
+    // will be a separate field pointing to the token.
+    return types.getVariableDeclaration(tpr, ASTUtils.getInferredType(port), "value", false) + ";";
+  }
 
-    /**
-     * Generate fields in the self struct for input ports
-     *
-     * If the port is a multiport, the input field is an array of
-     * pointers that will be allocated separately for each instance
-     * because the sizes may be different. Otherwise, it is a simple
-     * pointer.
-     *
-     */
-    private static void generateInputDeclarations(
-        TypeParameterizedReactor tpr,
-        CodeBuilder body,
-        CodeBuilder constructorCode
-    ) {
-        for (Input input : ASTUtils.allInputs(tpr.reactor())) {
-            var inputName = input.getName();
-            if (ASTUtils.isMultiport(input)) {
-                body.pr(input, String.join("\n",
-                    "// Multiport input array will be malloc'd later.",
-                    variableStructType(input, tpr, false)+"** _lf_"+inputName+";",
-                    "int _lf_"+inputName+"_width;",
-                    "// Default input (in case it does not get connected)",
-                    variableStructType(input, tpr, false)+" _lf_default__"+inputName+";",
-                    "// Struct to support efficiently reading sparse inputs.",
-                    "lf_sparse_io_record_t* _lf_"+inputName+"__sparse;"
-                ));
-            } else {
-                // input is not a multiport.
-                body.pr(input, String.join("\n",
-                    variableStructType(input, tpr, false)+"* _lf_"+inputName+";",
-                    "// width of -2 indicates that it is not a multiport.",
-                    "int _lf_"+inputName+"_width;",
-                    "// Default input (in case it does not get connected)",
-                    variableStructType(input, tpr, false)+" _lf_default__"+inputName+";"
-                ));
+  /**
+   * Generate fields in the self struct for input ports
+   *
+   * <p>If the port is a multiport, the input field is an array of pointers that will be allocated
+   * separately for each instance because the sizes may be different. Otherwise, it is a simple
+   * pointer.
+   */
+  private static void generateInputDeclarations(
+      TypeParameterizedReactor tpr, CodeBuilder body, CodeBuilder constructorCode) {
+    for (Input input : ASTUtils.allInputs(tpr.reactor())) {
+      var inputName = input.getName();
+      if (ASTUtils.isMultiport(input)) {
+        body.pr(
+            input,
+            String.join(
+                "\n",
+                "// Multiport input array will be malloc'd later.",
+                variableStructType(input, tpr, false) + "** _lf_" + inputName + ";",
+                "int _lf_" + inputName + "_width;",
+                "// Default input (in case it does not get connected)",
+                variableStructType(input, tpr, false) + " _lf_default__" + inputName + ";",
+                "// Struct to support efficiently reading sparse inputs.",
+                "lf_sparse_io_record_t* _lf_" + inputName + "__sparse;"));
+      } else {
+        // input is not a multiport.
+        body.pr(
+            input,
+            String.join(
+                "\n",
+                variableStructType(input, tpr, false) + "* _lf_" + inputName + ";",
+                "// width of -2 indicates that it is not a multiport.",
+                "int _lf_" + inputName + "_width;",
+                "// Default input (in case it does not get connected)",
+                variableStructType(input, tpr, false) + " _lf_default__" + inputName + ";"));
 
-                constructorCode.pr(input, String.join("\n",
-                    "// Set input by default to an always absent default input.",
-                    "self->_lf_"+inputName+" = &self->_lf_default__"+inputName+";"
-                ));
-            }
-        }
+        constructorCode.pr(
+            input,
+            String.join(
+                "\n",
+                "// Set input by default to an always absent default input.",
+                "self->_lf_" + inputName + " = &self->_lf_default__" + inputName + ";"));
+      }
     }
+  }
 
-    /**
-     * Generate fields in the self struct for output ports
-     */
-    private static void generateOutputDeclarations(
-        TypeParameterizedReactor tpr,
-        CodeBuilder body,
-        CodeBuilder constructorCode
-    ) {
-        for (Output output : ASTUtils.allOutputs(tpr.reactor())) {
-            // If the port is a multiport, create an array to be allocated
-            // at instantiation.
-            var outputName = output.getName();
-            if (ASTUtils.isMultiport(output)) {
-                body.pr(output, String.join("\n",
-                    "// Array of output ports.",
-                    variableStructType(output, tpr, false)+"* _lf_"+outputName+";",
-                    "int _lf_"+outputName+"_width;",
-                    "// An array of pointers to the individual ports. Useful",
-                    "// for the lf_set macros to work out-of-the-box for",
-                    "// multiports in the body of reactions because their ",
-                    "// value can be accessed via a -> operator (e.g.,foo[i]->value).",
-                    "// So we have to handle multiports specially here a construct that",
-                    "// array of pointers.",
-                    variableStructType(output, tpr, false)+"** _lf_"+outputName+"_pointers;"
-                ));
-            } else {
-                body.pr(output, String.join("\n",
-                    variableStructType(output, tpr, false)+" _lf_"+outputName+";",
-                    "int _lf_"+outputName+"_width;"
-                ));
-            }
-        }
+  /** Generate fields in the self struct for output ports */
+  private static void generateOutputDeclarations(
+      TypeParameterizedReactor tpr, CodeBuilder body, CodeBuilder constructorCode) {
+    for (Output output : ASTUtils.allOutputs(tpr.reactor())) {
+      // If the port is a multiport, create an array to be allocated
+      // at instantiation.
+      var outputName = output.getName();
+      if (ASTUtils.isMultiport(output)) {
+        body.pr(
+            output,
+            String.join(
+                "\n",
+                "// Array of output ports.",
+                variableStructType(output, tpr, false) + "* _lf_" + outputName + ";",
+                "int _lf_" + outputName + "_width;",
+                "// An array of pointers to the individual ports. Useful",
+                "// for the lf_set macros to work out-of-the-box for",
+                "// multiports in the body of reactions because their ",
+                "// value can be accessed via a -> operator (e.g.,foo[i]->value).",
+                "// So we have to handle multiports specially here a construct that",
+                "// array of pointers.",
+                variableStructType(output, tpr, false) + "** _lf_" + outputName + "_pointers;"));
+      } else {
+        body.pr(
+            output,
+            String.join(
+                "\n",
+                variableStructType(output, tpr, false) + " _lf_" + outputName + ";",
+                "int _lf_" + outputName + "_width;"));
+      }
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CPreambleGenerator.java b/org.lflang/src/org/lflang/generator/c/CPreambleGenerator.java
index 8ca0404d75..45b81caab6 100644
--- a/org.lflang/src/org/lflang/generator/c/CPreambleGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CPreambleGenerator.java
@@ -1,18 +1,16 @@
 package org.lflang.generator.c;
 
-import java.nio.file.Path;
+import static org.lflang.util.StringUtil.addDoubleQuotes;
 
+import java.nio.file.Path;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty.Platform;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.util.StringUtil;
 
-import static org.lflang.util.StringUtil.addDoubleQuotes;
-
 /**
- * Generates code for preambles for the C and CCpp target.
- * This includes #include and #define directives at the top
- * of each generated ".c" file.
+ * Generates code for preambles for the C and CCpp target. This includes #include and #define
+ * directives at the top of each generated ".c" file.
  *
  * @author Edward A. Lee
  * @author Marten Lohstroh
@@ -26,76 +24,69 @@
  * @author Anirudh Rengarajan
  */
 public class CPreambleGenerator {
-    /** Add necessary source files specific to the target language.  */
-    public static String generateIncludeStatements(
-        TargetConfig targetConfig,
-        boolean cppMode
-    ) {
-        var tracing = targetConfig.tracing;
-        CodeBuilder code = new CodeBuilder();
-        if (cppMode || targetConfig.platformOptions.platform == Platform.ARDUINO) {
-            code.pr("extern \"C\" {");
-        }
-        code.pr("#include <limits.h>");
-        code.pr("#include \"include/core/platform.h\"");
-        CCoreFilesUtils.getCTargetHeader().forEach(
-            it -> code.pr("#include " + StringUtil.addDoubleQuotes(it))
-        );
-        code.pr("#include \"include/core/reactor.h\"");
-        code.pr("#include \"include/core/reactor_common.h\"");
-        if (targetConfig.threading) {
-            code.pr("#include \"include/core/threaded/scheduler.h\"");
-        }
+  /** Add necessary source files specific to the target language. */
+  public static String generateIncludeStatements(TargetConfig targetConfig, boolean cppMode) {
+    var tracing = targetConfig.tracing;
+    CodeBuilder code = new CodeBuilder();
+    if (cppMode || targetConfig.platformOptions.platform == Platform.ARDUINO) {
+      code.pr("extern \"C\" {");
+    }
+    code.pr("#include <limits.h>");
+    code.pr("#include \"include/core/platform.h\"");
+    CCoreFilesUtils.getCTargetHeader()
+        .forEach(it -> code.pr("#include " + StringUtil.addDoubleQuotes(it)));
+    code.pr("#include \"include/core/reactor.h\"");
+    code.pr("#include \"include/core/reactor_common.h\"");
+    if (targetConfig.threading) {
+      code.pr("#include \"include/core/threaded/scheduler.h\"");
+    }
 
-        if (tracing != null) {
-            code.pr("#include \"include/core/trace.h\"");
-        }
-        code.pr("#include \"include/core/mixed_radix.h\"");
-        code.pr("#include \"include/core/port.h\"");
-        code.pr("int lf_reactor_c_main(int argc, const char* argv[]);");
-        if(targetConfig.fedSetupPreamble != null) {
-            code.pr("#include \"include/core/federated/federate.h\"");
-            code.pr("#include \"include/core/federated/net_common.h\"");
-        }
-        if (cppMode || targetConfig.platformOptions.platform == Platform.ARDUINO) {
-            code.pr("}");
-        }
-        return code.toString();
+    if (tracing != null) {
+      code.pr("#include \"include/core/trace.h\"");
+    }
+    code.pr("#include \"include/core/mixed_radix.h\"");
+    code.pr("#include \"include/core/port.h\"");
+    code.pr("int lf_reactor_c_main(int argc, const char* argv[]);");
+    if (targetConfig.fedSetupPreamble != null) {
+      code.pr("#include \"include/core/federated/federate.h\"");
+      code.pr("#include \"include/core/federated/net_common.h\"");
+    }
+    if (cppMode || targetConfig.platformOptions.platform == Platform.ARDUINO) {
+      code.pr("}");
     }
+    return code.toString();
+  }
 
-    public static String generateDefineDirectives(
-        TargetConfig targetConfig,
-        Path srcGenPath,
-        boolean hasModalReactors
-    ) {
-        int logLevel = targetConfig.logLevel.ordinal();
-        var coordinationType = targetConfig.coordination;
-        var tracing = targetConfig.tracing;
-        CodeBuilder code = new CodeBuilder();
-        // TODO: Get rid of all of these
-        code.pr("#define LOG_LEVEL " + logLevel);
-        code.pr("#define TARGET_FILES_DIRECTORY " + addDoubleQuotes(srcGenPath.toString()));
+  public static String generateDefineDirectives(
+      TargetConfig targetConfig, Path srcGenPath, boolean hasModalReactors) {
+    int logLevel = targetConfig.logLevel.ordinal();
+    var coordinationType = targetConfig.coordination;
+    var tracing = targetConfig.tracing;
+    CodeBuilder code = new CodeBuilder();
+    // TODO: Get rid of all of these
+    code.pr("#define LOG_LEVEL " + logLevel);
+    code.pr("#define TARGET_FILES_DIRECTORY " + addDoubleQuotes(srcGenPath.toString()));
 
-        if (tracing != null) {
-            targetConfig.compileDefinitions.put("LF_TRACE", tracing.traceFileName);
-        }
-        // if (clockSyncIsOn) {
-        //     code.pr(generateClockSyncDefineDirective(
-        //         targetConfig.clockSync,
-        //         targetConfig.clockSyncOptions
-        //     ));
-        // }
-        if (targetConfig.threading) {
-            targetConfig.compileDefinitions.put("LF_THREADED", "1");
-        } else {
-            targetConfig.compileDefinitions.put("LF_UNTHREADED", "1");
-        }
-        if (targetConfig.threading) {
-            targetConfig.compileDefinitions.put("LF_THREADED", "1");
-        } else {
-            targetConfig.compileDefinitions.put("LF_UNTHREADED", "1");
-        }
-        code.newLine();
-        return code.toString();
+    if (tracing != null) {
+      targetConfig.compileDefinitions.put("LF_TRACE", tracing.traceFileName);
+    }
+    // if (clockSyncIsOn) {
+    //     code.pr(generateClockSyncDefineDirective(
+    //         targetConfig.clockSync,
+    //         targetConfig.clockSyncOptions
+    //     ));
+    // }
+    if (targetConfig.threading) {
+      targetConfig.compileDefinitions.put("LF_THREADED", "1");
+    } else {
+      targetConfig.compileDefinitions.put("LF_UNTHREADED", "1");
+    }
+    if (targetConfig.threading) {
+      targetConfig.compileDefinitions.put("LF_THREADED", "1");
+    } else {
+      targetConfig.compileDefinitions.put("LF_UNTHREADED", "1");
     }
+    code.newLine();
+    return code.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
index 26e6c8ab6f..6fcef92dd6 100644
--- a/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CReactionGenerator.java
@@ -9,11 +9,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.extensions.CExtensionUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.lf.Action;
@@ -37,1154 +36,1335 @@
 import org.lflang.util.StringUtil;
 
 public class CReactionGenerator {
-    protected static String DISABLE_REACTION_INITIALIZATION_MARKER
-        = "// **** Do not include initialization code in this reaction.";  // FIXME: Such markers should not exist (#1687)
+  protected static String DISABLE_REACTION_INITIALIZATION_MARKER =
+      "// **** Do not include initialization code in this reaction."; // FIXME: Such markers should
+  // not exist (#1687)
 
-    /**
-     * Generate necessary initialization code inside the body of the reaction that belongs to reactor decl.
-     * @param body The body of the reaction. Used to check for the DISABLE_REACTION_INITIALIZATION_MARKER.
-     * @param reaction The initialization code will be generated for this specific reaction
-     * @param tpr The reactor that has the reaction
-     * @param reactionIndex The index of the reaction relative to other reactions in the reactor, starting from 0
-     */
-    public static String generateInitializationForReaction(String body,
-                                                           Reaction reaction,
-                                                           TypeParameterizedReactor tpr,
-                                                           int reactionIndex,
-                                                           CTypes types,
-                                                           ErrorReporter errorReporter,
-                                                           Instantiation mainDef,
-                                                           boolean requiresTypes) {
-        // Construct the reactionInitialization code to go into
-        // the body of the function before the verbatim code.
-        CodeBuilder reactionInitialization = new CodeBuilder();
+  /**
+   * Generate necessary initialization code inside the body of the reaction that belongs to reactor
+   * decl.
+   *
+   * @param body The body of the reaction. Used to check for the
+   *     DISABLE_REACTION_INITIALIZATION_MARKER.
+   * @param reaction The initialization code will be generated for this specific reaction
+   * @param tpr The reactor that has the reaction
+   * @param reactionIndex The index of the reaction relative to other reactions in the reactor,
+   *     starting from 0
+   */
+  public static String generateInitializationForReaction(
+      String body,
+      Reaction reaction,
+      TypeParameterizedReactor tpr,
+      int reactionIndex,
+      CTypes types,
+      ErrorReporter errorReporter,
+      Instantiation mainDef,
+      boolean requiresTypes) {
+    // Construct the reactionInitialization code to go into
+    // the body of the function before the verbatim code.
+    CodeBuilder reactionInitialization = new CodeBuilder();
 
-        CodeBuilder code = new CodeBuilder();
+    CodeBuilder code = new CodeBuilder();
 
-        // Define the "self" struct.
-        String structType = CUtil.selfType(tpr);
-        // A null structType means there are no inputs, state,
-        // or anything else. No need to declare it.
-        if (structType != null) {
-             code.pr(String.join("\n",
-                 structType+"* self = ("+structType+"*)instance_args; SUPPRESS_UNUSED_WARNING(self);"
-             ));
-        }
-
-        // Do not generate the initialization code if the body is marked
-        // to not generate it.
-        if (body.startsWith(DISABLE_REACTION_INITIALIZATION_MARKER)) {
-            return code.toString();
-        }
+    // Define the "self" struct.
+    String structType = CUtil.selfType(tpr);
+    // A null structType means there are no inputs, state,
+    // or anything else. No need to declare it.
+    if (structType != null) {
+      code.pr(
+          String.join(
+              "\n",
+              structType
+                  + "* self = ("
+                  + structType
+                  + "*)instance_args; SUPPRESS_UNUSED_WARNING(self);"));
+    }
 
-        // A reaction may send to or receive from multiple ports of
-        // a contained reactor. The variables for these ports need to
-        // all be declared as fields of the same struct. Hence, we first
-        // collect the fields to be defined in the structs and then
-        // generate the structs.
-        Map<Instantiation, CodeBuilder> fieldsForStructsForContainedReactors = new LinkedHashMap<>();
+    // Do not generate the initialization code if the body is marked
+    // to not generate it.
+    if (body.startsWith(DISABLE_REACTION_INITIALIZATION_MARKER)) {
+      return code.toString();
+    }
 
-        // Actions may appear twice, first as a trigger, then with the outputs.
-        // But we need to declare it only once. Collect in this data structure
-        // the actions that are declared as triggered so that if they appear
-        // again with the outputs, they are not defined a second time.
-        // That second redefinition would trigger a compile error.
-        Set<Action> actionsAsTriggers = new LinkedHashSet<>();
+    // A reaction may send to or receive from multiple ports of
+    // a contained reactor. The variables for these ports need to
+    // all be declared as fields of the same struct. Hence, we first
+    // collect the fields to be defined in the structs and then
+    // generate the structs.
+    Map<Instantiation, CodeBuilder> fieldsForStructsForContainedReactors = new LinkedHashMap<>();
 
-        // Next, add the triggers (input and actions; timers are not needed).
-        // This defines a local variable in the reaction function whose
-        // name matches that of the trigger. The value of the local variable
-        // is a struct with a value and is_present field, the latter a boolean
-        // that indicates whether the input/action is present.
-        // If the trigger is an output, then it is an output of a
-        // contained reactor. In this case, a struct with the name
-        // of the contained reactor is created with one field that is
-        // a pointer to a struct with a value and is_present field.
-        // E.g., if the contained reactor is named 'c' and its output
-        // port is named 'out', then c.out->value c.out->is_present are
-        // defined so that they can be used in the verbatim code.
-        for (TriggerRef trigger : ASTUtils.convertToEmptyListIfNull(reaction.getTriggers())) {
-            if (trigger instanceof VarRef triggerAsVarRef) {
-                if (triggerAsVarRef.getVariable() instanceof Port) {
-                    generatePortVariablesInReaction(
-                        reactionInitialization,
-                        fieldsForStructsForContainedReactors,
-                        triggerAsVarRef,
-                        tpr,
-                        types);
-                } else if (triggerAsVarRef.getVariable() instanceof Action) {
-                    reactionInitialization.pr(generateActionVariablesInReaction(
-                        (Action) triggerAsVarRef.getVariable(),
-                        tpr,
-                        types
-                    ));
-                    actionsAsTriggers.add((Action) triggerAsVarRef.getVariable());
-                }
-            }
-        }
-        if (reaction.getTriggers() == null || reaction.getTriggers().size() == 0) {
-            // No triggers are given, which means react to any input.
-            // Declare an argument for every input.
-            // NOTE: this does not include contained outputs.
-            for (Input input : tpr.reactor().getInputs()) {
-                reactionInitialization.pr(generateInputVariablesInReaction(input, tpr, types));
-            }
-        }
-        // Define argument for non-triggering inputs.
-        for (VarRef src : ASTUtils.convertToEmptyListIfNull(reaction.getSources())) {
-            if (src.getVariable() instanceof Port) {
-                generatePortVariablesInReaction(reactionInitialization, fieldsForStructsForContainedReactors, src, tpr, types);
-            } else if (src.getVariable() instanceof Action) {
-                // It's a bit odd to read but not be triggered by an action, but
-                // OK, I guess we allow it.
-                reactionInitialization.pr(generateActionVariablesInReaction(
-                    (Action) src.getVariable(),
-                    tpr,
-                    types
-                ));
-                actionsAsTriggers.add((Action) src.getVariable());
-            }
-        }
+    // Actions may appear twice, first as a trigger, then with the outputs.
+    // But we need to declare it only once. Collect in this data structure
+    // the actions that are declared as triggered so that if they appear
+    // again with the outputs, they are not defined a second time.
+    // That second redefinition would trigger a compile error.
+    Set<Action> actionsAsTriggers = new LinkedHashSet<>();
 
-        // Define variables for each declared output or action.
-        // In the case of outputs, the variable is a pointer to where the
-        // output is stored. This gives the reaction code access to any previous
-        // value that may have been written to that output in an earlier reaction.
-        if (reaction.getEffects() != null) {
-            for (VarRef effect : reaction.getEffects()) {
-                Variable variable = effect.getVariable();
-                if (variable instanceof Action) {
-                    // It is an action, not an output.
-                    // If it has already appeared as trigger, do not redefine it.
-                    if (!actionsAsTriggers.contains(effect.getVariable())) {
-                        reactionInitialization.pr(CGenerator.variableStructType(variable, tpr, false)+"* "+variable.getName()+" = &self->_lf_"+variable.getName()+";");
-                    }
-                } else if (effect.getVariable() instanceof Mode) {
-                    // Mode change effect
-                    int idx = ASTUtils.allModes(tpr.reactor()).indexOf((Mode)effect.getVariable());
-                    String name = effect.getVariable().getName();
-                    if (idx >= 0) {
-                        reactionInitialization.pr(
-                            "reactor_mode_t* " + name + " = &self->_lf__modes[" + idx + "];\n"
-                            + "lf_mode_change_type_t _lf_" + name + "_change_type = "
-                            + (effect.getTransition() == ModeTransition.HISTORY ?
-                                    "history_transition" : "reset_transition")
-                            + ";"
-                        );
-                    } else {
-                        errorReporter.reportError(
-                            reaction,
-                            "In generateReaction(): " + name + " not a valid mode of this reactor."
-                        );
-                    }
-                } else {
-                    if (variable instanceof Output) {
-                        reactionInitialization.pr(generateOutputVariablesInReaction(
-                            effect,
-                            tpr,
-                            errorReporter,
-                            requiresTypes
-                        ));
-                    } else if (variable instanceof Input) {
-                        // It is the input of a contained reactor.
-                        generateVariablesForSendingToContainedReactors(
-                            reactionInitialization,
-                            fieldsForStructsForContainedReactors,
-                            effect.getContainer(),
-                            (Input) variable);
-                    } else if (variable instanceof Watchdog) {
-                        reactionInitialization.pr(generateWatchdogVariablesInReaction(effect));
-                    } else {
-                        errorReporter.reportError(
-                            reaction,
-                            "In generateReaction(): effect is not an input, output, or watchdog."
-                        );
-                    }
-                }
-            }
-        }
-        // Before the reaction initialization,
-        // generate the structs used for communication to and from contained reactors.
-        for (Instantiation containedReactor : fieldsForStructsForContainedReactors.keySet()) {
-            String array = "";
-            if (containedReactor.getWidthSpec() != null) {
-                String containedReactorWidthVar = generateWidthVariable(containedReactor.getName());
-                code.pr("int "+containedReactorWidthVar+" = self->_lf_"+containedReactorWidthVar+";");
-                // Windows does not support variables in arrays declared on the stack,
-                // so we use the maximum size over all bank members.
-                array = "["+maxContainedReactorBankWidth(containedReactor, null, 0, mainDef)+"]";
-            }
-            code.pr(String.join("\n",
-                "struct "+containedReactor.getName()+" {",
-                "    "+fieldsForStructsForContainedReactors.get(containedReactor),
-                "} "+containedReactor.getName()+array+";"
-            ));
+    // Next, add the triggers (input and actions; timers are not needed).
+    // This defines a local variable in the reaction function whose
+    // name matches that of the trigger. The value of the local variable
+    // is a struct with a value and is_present field, the latter a boolean
+    // that indicates whether the input/action is present.
+    // If the trigger is an output, then it is an output of a
+    // contained reactor. In this case, a struct with the name
+    // of the contained reactor is created with one field that is
+    // a pointer to a struct with a value and is_present field.
+    // E.g., if the contained reactor is named 'c' and its output
+    // port is named 'out', then c.out->value c.out->is_present are
+    // defined so that they can be used in the verbatim code.
+    for (TriggerRef trigger : ASTUtils.convertToEmptyListIfNull(reaction.getTriggers())) {
+      if (trigger instanceof VarRef triggerAsVarRef) {
+        if (triggerAsVarRef.getVariable() instanceof Port) {
+          generatePortVariablesInReaction(
+              reactionInitialization,
+              fieldsForStructsForContainedReactors,
+              triggerAsVarRef,
+              tpr,
+              types);
+        } else if (triggerAsVarRef.getVariable() instanceof Action) {
+          reactionInitialization.pr(
+              generateActionVariablesInReaction(
+                  (Action) triggerAsVarRef.getVariable(), tpr, types));
+          actionsAsTriggers.add((Action) triggerAsVarRef.getVariable());
         }
-        // Next generate all the collected setup code.
-        code.pr(reactionInitialization.toString());
-        return code.toString();
+      }
+    }
+    if (reaction.getTriggers() == null || reaction.getTriggers().size() == 0) {
+      // No triggers are given, which means react to any input.
+      // Declare an argument for every input.
+      // NOTE: this does not include contained outputs.
+      for (Input input : tpr.reactor().getInputs()) {
+        reactionInitialization.pr(generateInputVariablesInReaction(input, tpr, types));
+      }
+    }
+    // Define argument for non-triggering inputs.
+    for (VarRef src : ASTUtils.convertToEmptyListIfNull(reaction.getSources())) {
+      if (src.getVariable() instanceof Port) {
+        generatePortVariablesInReaction(
+            reactionInitialization, fieldsForStructsForContainedReactors, src, tpr, types);
+      } else if (src.getVariable() instanceof Action) {
+        // It's a bit odd to read but not be triggered by an action, but
+        // OK, I guess we allow it.
+        reactionInitialization.pr(
+            generateActionVariablesInReaction((Action) src.getVariable(), tpr, types));
+        actionsAsTriggers.add((Action) src.getVariable());
+      }
     }
 
-    /**
-     * Return the maximum bank width for the given instantiation within all
-     * instantiations of its parent reactor.
-     * On the first call to this method, the breadcrumbs should be null and the max
-     * argument should be zero. On recursive calls, breadcrumbs is a list of nested
-     * instantiations, the max is the maximum width found so far.  The search for
-     * instances of the parent reactor will begin with the last instantiation
-     * in the specified list.
-     *
-     * This rather complicated method is used when a reaction sends or receives data
-     * to or from a bank of contained reactors. There will be an array of structs on
-     * the self struct of the parent, and the size of the array is conservatively set
-     * to the maximum of all the identified bank widths.  This is a bit wasteful of
-     * memory, but it avoids having to malloc the array for each instance, and in
-     * typical usage, there will be few instances or instances that are all the same
-     * width.
-     *
-     * @param containedReactor The contained reactor instantiation.
-     * @param breadcrumbs null on first call (non-recursive).
-     * @param max 0 on first call.
-     */
-    public static int maxContainedReactorBankWidth(
-        Instantiation containedReactor,
-        LinkedList<Instantiation> breadcrumbs,
-        int max,
-        Instantiation mainDef
-    ) {
-        // If the instantiation is not a bank, return 1.
-        if (containedReactor.getWidthSpec() == null) {
-            return 1;
-        }
-        // If there is no main, then we just use the default width.
-        if (mainDef == null) {
-            return ASTUtils.width(containedReactor.getWidthSpec(), null);
-        }
-        LinkedList<Instantiation> nestedBreadcrumbs = breadcrumbs;
-        if (nestedBreadcrumbs == null) {
-            nestedBreadcrumbs = new LinkedList<>();
-            nestedBreadcrumbs.add(mainDef);
-        }
-        int result = max;
-        Reactor parent = (Reactor) containedReactor.eContainer();
-        if (parent == ASTUtils.toDefinition(mainDef.getReactorClass())) {
-            // The parent is main, so there can't be any other instantiations of it.
-            return ASTUtils.width(containedReactor.getWidthSpec(), null);
-        }
-        // Search for instances of the parent within the tail of the breadcrumbs list.
-        Reactor container = ASTUtils.toDefinition(nestedBreadcrumbs.get(0).getReactorClass());
-        for (Instantiation instantiation : container.getInstantiations()) {
-            // Put this new instantiation at the head of the list.
-            nestedBreadcrumbs.add(0, instantiation);
-            if (ASTUtils.toDefinition(instantiation.getReactorClass()) == parent) {
-                // Found a matching instantiation of the parent.
-                // Evaluate the original width specification in this context.
-                int candidate = ASTUtils.width(containedReactor.getWidthSpec(), nestedBreadcrumbs);
-                if (candidate > result) {
-                    result = candidate;
-                }
-            } else {
-                // Found some other instantiation, not the parent.
-                // Search within it for instantiations of the parent.
-                // Note that we assume here that the parent cannot contain
-                // instances of itself.
-                int candidate = maxContainedReactorBankWidth(containedReactor, nestedBreadcrumbs, result, mainDef);
-                if (candidate > result) {
-                    result = candidate;
-                }
-            }
-            nestedBreadcrumbs.remove();
+    // Define variables for each declared output or action.
+    // In the case of outputs, the variable is a pointer to where the
+    // output is stored. This gives the reaction code access to any previous
+    // value that may have been written to that output in an earlier reaction.
+    if (reaction.getEffects() != null) {
+      for (VarRef effect : reaction.getEffects()) {
+        Variable variable = effect.getVariable();
+        if (variable instanceof Action) {
+          // It is an action, not an output.
+          // If it has already appeared as trigger, do not redefine it.
+          if (!actionsAsTriggers.contains(effect.getVariable())) {
+            reactionInitialization.pr(
+                CGenerator.variableStructType(variable, tpr, false)
+                    + "* "
+                    + variable.getName()
+                    + " = &self->_lf_"
+                    + variable.getName()
+                    + ";");
+          }
+        } else if (effect.getVariable() instanceof Mode) {
+          // Mode change effect
+          int idx = ASTUtils.allModes(tpr.reactor()).indexOf((Mode) effect.getVariable());
+          String name = effect.getVariable().getName();
+          if (idx >= 0) {
+            reactionInitialization.pr(
+                "reactor_mode_t* "
+                    + name
+                    + " = &self->_lf__modes["
+                    + idx
+                    + "];\n"
+                    + "lf_mode_change_type_t _lf_"
+                    + name
+                    + "_change_type = "
+                    + (effect.getTransition() == ModeTransition.HISTORY
+                        ? "history_transition"
+                        : "reset_transition")
+                    + ";");
+          } else {
+            errorReporter.reportError(
+                reaction, "In generateReaction(): " + name + " not a valid mode of this reactor.");
+          }
+        } else {
+          if (variable instanceof Output) {
+            reactionInitialization.pr(
+                generateOutputVariablesInReaction(effect, tpr, errorReporter, requiresTypes));
+          } else if (variable instanceof Input) {
+            // It is the input of a contained reactor.
+            generateVariablesForSendingToContainedReactors(
+                reactionInitialization,
+                fieldsForStructsForContainedReactors,
+                effect.getContainer(),
+                (Input) variable);
+          } else if (variable instanceof Watchdog) {
+            reactionInitialization.pr(generateWatchdogVariablesInReaction(effect));
+          } else {
+            errorReporter.reportError(
+                reaction, "In generateReaction(): effect is not an input, output, or watchdog.");
+          }
         }
-        return result;
+      }
     }
-
-    /**
-     * Generate code for the body of a reaction that takes an input and
-     * schedules an action with the value of that input.
-     * @param actionName The action to schedule
-     */
-    public static String generateDelayBody(String ref, String actionName, boolean isTokenType) {
-        // Note that the action.type set by the base class is actually
-        // the port type.
-        return isTokenType ?
-                String.join("\n",
-                    "if ("+ref+"->is_present) {",
-                    "    // Put the whole token on the event queue, not just the payload.",
-                    "    // This way, the length and element_size are transported.",
-                    "    lf_schedule_token("+actionName+", 0, "+ref+"->token);",
-                    "}"
-                ) :
-                "lf_schedule_copy("+actionName+", 0, &"+ref+"->value, 1);  // Length is 1.";
+    // Before the reaction initialization,
+    // generate the structs used for communication to and from contained reactors.
+    for (Instantiation containedReactor : fieldsForStructsForContainedReactors.keySet()) {
+      String array = "";
+      if (containedReactor.getWidthSpec() != null) {
+        String containedReactorWidthVar = generateWidthVariable(containedReactor.getName());
+        code.pr(
+            "int " + containedReactorWidthVar + " = self->_lf_" + containedReactorWidthVar + ";");
+        // Windows does not support variables in arrays declared on the stack,
+        // so we use the maximum size over all bank members.
+        array = "[" + maxContainedReactorBankWidth(containedReactor, null, 0, mainDef) + "]";
+      }
+      code.pr(
+          String.join(
+              "\n",
+              "struct " + containedReactor.getName() + " {",
+              "    " + fieldsForStructsForContainedReactors.get(containedReactor),
+              "} " + containedReactor.getName() + array + ";"));
     }
+    // Next generate all the collected setup code.
+    code.pr(reactionInitialization.toString());
+    return code.toString();
+  }
 
-    public static String generateForwardBody(String outputName, String targetType, String actionName, boolean isTokenType) {
-        return isTokenType ?
-                String.join("\n",
-                    DISABLE_REACTION_INITIALIZATION_MARKER,
-                    "self->_lf_"+outputName+".value = ("+targetType+")self->_lf__"+actionName+".tmplt.token->value;",
-                    "_lf_replace_template_token((token_template_t*)&self->_lf_"+outputName+", (lf_token_t*)self->_lf__"+actionName+".tmplt.token);",
-                    "self->_lf_"+outputName+".is_present = true;"
-                ) :
-                "lf_set("+outputName+", "+actionName+"->value);";
+  /**
+   * Return the maximum bank width for the given instantiation within all instantiations of its
+   * parent reactor. On the first call to this method, the breadcrumbs should be null and the max
+   * argument should be zero. On recursive calls, breadcrumbs is a list of nested instantiations,
+   * the max is the maximum width found so far. The search for instances of the parent reactor will
+   * begin with the last instantiation in the specified list.
+   *
+   * <p>This rather complicated method is used when a reaction sends or receives data to or from a
+   * bank of contained reactors. There will be an array of structs on the self struct of the parent,
+   * and the size of the array is conservatively set to the maximum of all the identified bank
+   * widths. This is a bit wasteful of memory, but it avoids having to malloc the array for each
+   * instance, and in typical usage, there will be few instances or instances that are all the same
+   * width.
+   *
+   * @param containedReactor The contained reactor instantiation.
+   * @param breadcrumbs null on first call (non-recursive).
+   * @param max 0 on first call.
+   */
+  public static int maxContainedReactorBankWidth(
+      Instantiation containedReactor,
+      LinkedList<Instantiation> breadcrumbs,
+      int max,
+      Instantiation mainDef) {
+    // If the instantiation is not a bank, return 1.
+    if (containedReactor.getWidthSpec() == null) {
+      return 1;
     }
-
-    /**
-     * Generate into the specified string builder the code to
-     * initialize local variables for sending data to an input
-     * of a contained reactor. This will also, if necessary,
-     * generate entries for local struct definitions into the
-     * struct argument. These entries point to where the data
-     * is stored.
-     *
-     * @param builder The string builder.
-     * @param structs A map from reactor instantiations to a place to write
-     *  struct fields.
-     * @param definition AST node defining the reactor within which this occurs
-     * @param input Input of the contained reactor.
-     */
-    private static void generateVariablesForSendingToContainedReactors(
-        CodeBuilder builder,
-        Map<Instantiation,CodeBuilder> structs,
-        Instantiation definition,
-        Input input
-    ) {
-        CodeBuilder structBuilder = structs.get(definition);
-        if (structBuilder == null) {
-            structBuilder = new CodeBuilder();
-            structs.put(definition, structBuilder);
+    // If there is no main, then we just use the default width.
+    if (mainDef == null) {
+      return ASTUtils.width(containedReactor.getWidthSpec(), null);
+    }
+    LinkedList<Instantiation> nestedBreadcrumbs = breadcrumbs;
+    if (nestedBreadcrumbs == null) {
+      nestedBreadcrumbs = new LinkedList<>();
+      nestedBreadcrumbs.add(mainDef);
+    }
+    int result = max;
+    Reactor parent = (Reactor) containedReactor.eContainer();
+    if (parent == ASTUtils.toDefinition(mainDef.getReactorClass())) {
+      // The parent is main, so there can't be any other instantiations of it.
+      return ASTUtils.width(containedReactor.getWidthSpec(), null);
+    }
+    // Search for instances of the parent within the tail of the breadcrumbs list.
+    Reactor container = ASTUtils.toDefinition(nestedBreadcrumbs.get(0).getReactorClass());
+    for (Instantiation instantiation : container.getInstantiations()) {
+      // Put this new instantiation at the head of the list.
+      nestedBreadcrumbs.add(0, instantiation);
+      if (ASTUtils.toDefinition(instantiation.getReactorClass()) == parent) {
+        // Found a matching instantiation of the parent.
+        // Evaluate the original width specification in this context.
+        int candidate = ASTUtils.width(containedReactor.getWidthSpec(), nestedBreadcrumbs);
+        if (candidate > result) {
+          result = candidate;
         }
-        String inputStructType = CGenerator.variableStructType(input, new TypeParameterizedReactor(definition), false);
-        String defName = definition.getName();
-        String defWidth = generateWidthVariable(defName);
-        String inputName = input.getName();
-        String inputWidth = generateWidthVariable(inputName);
-        if (!ASTUtils.isMultiport(input)) {
-            // Contained reactor's input is not a multiport.
-            structBuilder.pr(inputStructType+"* "+inputName+";");
-            if (definition.getWidthSpec() != null) {
-                // Contained reactor is a bank.
-                builder.pr(String.join("\n",
-                    "for (int bankIndex = 0; bankIndex < self->_lf_"+defWidth+"; bankIndex++) {",
-                    "    "+defName+"[bankIndex]."+inputName+" = &(self->_lf_"+defName+"[bankIndex]."+inputName+");",
-                    "}"
-                ));
-            } else {
-                // Contained reactor is not a bank.
-                builder.pr(defName+"."+inputName+" = &(self->_lf_"+defName+"."+inputName+");");
-            }
-        } else {
-            // Contained reactor's input is a multiport.
-            structBuilder.pr(String.join("\n",
-                inputStructType+"** "+inputName+";",
-                "int "+inputWidth+";"
-            ));
-            // If the contained reactor is a bank, then we have to set the
-            // pointer for each element of the bank.
-            if (definition.getWidthSpec() != null) {
-                builder.pr(String.join("\n",
-                    "for (int _i = 0; _i < self->_lf_"+defWidth+"; _i++) {",
-                    "    "+defName+"[_i]."+inputName+" = self->_lf_"+defName+"[_i]."+inputName+";",
-                    "    "+defName+"[_i]."+inputWidth+" = self->_lf_"+defName+"[_i]."+inputWidth+";",
-                    "}"
-                ));
-            } else {
-                builder.pr(String.join("\n",
-                    defName+"."+inputName+" = self->_lf_"+defName+"."+inputName+";",
-                    defName+"."+inputWidth+" = self->_lf_"+defName+"."+inputWidth+";"
-                ));
-            }
+      } else {
+        // Found some other instantiation, not the parent.
+        // Search within it for instantiations of the parent.
+        // Note that we assume here that the parent cannot contain
+        // instances of itself.
+        int candidate =
+            maxContainedReactorBankWidth(containedReactor, nestedBreadcrumbs, result, mainDef);
+        if (candidate > result) {
+          result = candidate;
         }
+      }
+      nestedBreadcrumbs.remove();
     }
+    return result;
+  }
 
-    /**
-     * Generate into the specified string builder the code to
-     * initialize local variables for ports in a reaction function
-     * from the "self" struct. The port may be an input of the
-     * reactor or an output of a contained reactor. The second
-     * argument provides, for each contained reactor, a place to
-     * write the declaration of the output of that reactor that
-     * is triggering reactions.
-     * @param builder The place into which to write the code.
-     * @param structs A map from reactor instantiations to a place to write
-     *  struct fields.
-     */
-    private static void generatePortVariablesInReaction(
-        CodeBuilder builder,
-        Map<Instantiation,CodeBuilder> structs,
-        VarRef port,
-        TypeParameterizedReactor tpr,
-        CTypes types
-    ) {
-        if (port.getVariable() instanceof Input) {
-            builder.pr(generateInputVariablesInReaction((Input) port.getVariable(), tpr, types));
-        } else {
-            // port is an output of a contained reactor.
-            Output output = (Output) port.getVariable();
-            String portStructType = CGenerator.variableStructType(output, new TypeParameterizedReactor(port.getContainer()), false);
+  /**
+   * Generate code for the body of a reaction that takes an input and schedules an action with the
+   * value of that input.
+   *
+   * @param actionName The action to schedule
+   */
+  public static String generateDelayBody(String ref, String actionName, boolean isTokenType) {
+    // Note that the action.type set by the base class is actually
+    // the port type.
+    return isTokenType
+        ? String.join(
+            "\n",
+            "if (" + ref + "->is_present) {",
+            "    // Put the whole token on the event queue, not just the payload.",
+            "    // This way, the length and element_size are transported.",
+            "    lf_schedule_token(" + actionName + ", 0, " + ref + "->token);",
+            "}")
+        : "lf_schedule_copy(" + actionName + ", 0, &" + ref + "->value, 1);  // Length is 1.";
+  }
 
-            CodeBuilder structBuilder = structs.get(port.getContainer());
-            if (structBuilder == null) {
-                structBuilder = new CodeBuilder();
-                structs.put(port.getContainer(), structBuilder);
-            }
-            String subName = port.getContainer().getName();
-            String reactorWidth = generateWidthVariable(subName);
-            String outputName = output.getName();
-            String outputWidth = generateWidthVariable(outputName);
-            // First define the struct containing the output value and indicator
-            // of its presence.
-            if (!ASTUtils.isMultiport(output)) {
-                // Output is not a multiport.
-                structBuilder.pr(portStructType+"* "+outputName+";");
-            } else {
-                // Output is a multiport.
-                structBuilder.pr(String.join("\n",
-                    portStructType+"** "+outputName+";",
-                    "int "+outputWidth+";"
-                ));
-            }
+  public static String generateForwardBody(
+      String outputName, String targetType, String actionName, boolean isTokenType) {
+    return isTokenType
+        ? String.join(
+            "\n",
+            DISABLE_REACTION_INITIALIZATION_MARKER,
+            "self->_lf_"
+                + outputName
+                + ".value = ("
+                + targetType
+                + ")self->_lf__"
+                + actionName
+                + ".tmplt.token->value;",
+            "_lf_replace_template_token((token_template_t*)&self->_lf_"
+                + outputName
+                + ", (lf_token_t*)self->_lf__"
+                + actionName
+                + ".tmplt.token);",
+            "self->_lf_" + outputName + ".is_present = true;")
+        : "lf_set(" + outputName + ", " + actionName + "->value);";
+  }
 
-            // Next, initialize the struct with the current values.
-            if (port.getContainer().getWidthSpec() != null) {
-                // Output is in a bank.
-                builder.pr(String.join("\n",
-                    "for (int i = 0; i < "+reactorWidth+"; i++) {",
-                    "    "+subName+"[i]."+outputName+" = self->_lf_"+subName+"[i]."+outputName+";",
-                    "}"
-                ));
-                if (ASTUtils.isMultiport(output)) {
-                    builder.pr(String.join("\n",
-                        "for (int i = 0; i < "+reactorWidth+"; i++) {",
-                        "    "+subName+"[i]."+outputWidth+" = self->_lf_"+subName+"[i]."+outputWidth+";",
-                        "}"
-                    ));
-                }
-            } else {
-                 // Output is not in a bank.
-                builder.pr(subName+"."+outputName+" = self->_lf_"+subName+"."+outputName+";");
-                if (ASTUtils.isMultiport(output)) {
-                    builder.pr(subName+"."+outputWidth+" = self->_lf_"+subName+"."+outputWidth+";");
-                }
-            }
-        }
+  /**
+   * Generate into the specified string builder the code to initialize local variables for sending
+   * data to an input of a contained reactor. This will also, if necessary, generate entries for
+   * local struct definitions into the struct argument. These entries point to where the data is
+   * stored.
+   *
+   * @param builder The string builder.
+   * @param structs A map from reactor instantiations to a place to write struct fields.
+   * @param definition AST node defining the reactor within which this occurs
+   * @param input Input of the contained reactor.
+   */
+  private static void generateVariablesForSendingToContainedReactors(
+      CodeBuilder builder,
+      Map<Instantiation, CodeBuilder> structs,
+      Instantiation definition,
+      Input input) {
+    CodeBuilder structBuilder = structs.get(definition);
+    if (structBuilder == null) {
+      structBuilder = new CodeBuilder();
+      structs.put(definition, structBuilder);
     }
+    String inputStructType =
+        CGenerator.variableStructType(input, new TypeParameterizedReactor(definition), false);
+    String defName = definition.getName();
+    String defWidth = generateWidthVariable(defName);
+    String inputName = input.getName();
+    String inputWidth = generateWidthVariable(inputName);
+    if (!ASTUtils.isMultiport(input)) {
+      // Contained reactor's input is not a multiport.
+      structBuilder.pr(inputStructType + "* " + inputName + ";");
+      if (definition.getWidthSpec() != null) {
+        // Contained reactor is a bank.
+        builder.pr(
+            String.join(
+                "\n",
+                "for (int bankIndex = 0; bankIndex < self->_lf_" + defWidth + "; bankIndex++) {",
+                "    "
+                    + defName
+                    + "[bankIndex]."
+                    + inputName
+                    + " = &(self->_lf_"
+                    + defName
+                    + "[bankIndex]."
+                    + inputName
+                    + ");",
+                "}"));
+      } else {
+        // Contained reactor is not a bank.
+        builder.pr(
+            defName + "." + inputName + " = &(self->_lf_" + defName + "." + inputName + ");");
+      }
+    } else {
+      // Contained reactor's input is a multiport.
+      structBuilder.pr(
+          String.join("\n", inputStructType + "** " + inputName + ";", "int " + inputWidth + ";"));
+      // If the contained reactor is a bank, then we have to set the
+      // pointer for each element of the bank.
+      if (definition.getWidthSpec() != null) {
+        builder.pr(
+            String.join(
+                "\n",
+                "for (int _i = 0; _i < self->_lf_" + defWidth + "; _i++) {",
+                "    "
+                    + defName
+                    + "[_i]."
+                    + inputName
+                    + " = self->_lf_"
+                    + defName
+                    + "[_i]."
+                    + inputName
+                    + ";",
+                "    "
+                    + defName
+                    + "[_i]."
+                    + inputWidth
+                    + " = self->_lf_"
+                    + defName
+                    + "[_i]."
+                    + inputWidth
+                    + ";",
+                "}"));
+      } else {
+        builder.pr(
+            String.join(
+                "\n",
+                defName + "." + inputName + " = self->_lf_" + defName + "." + inputName + ";",
+                defName + "." + inputWidth + " = self->_lf_" + defName + "." + inputWidth + ";"));
+      }
+    }
+  }
+
+  /**
+   * Generate into the specified string builder the code to initialize local variables for ports in
+   * a reaction function from the "self" struct. The port may be an input of the reactor or an
+   * output of a contained reactor. The second argument provides, for each contained reactor, a
+   * place to write the declaration of the output of that reactor that is triggering reactions.
+   *
+   * @param builder The place into which to write the code.
+   * @param structs A map from reactor instantiations to a place to write struct fields.
+   */
+  private static void generatePortVariablesInReaction(
+      CodeBuilder builder,
+      Map<Instantiation, CodeBuilder> structs,
+      VarRef port,
+      TypeParameterizedReactor tpr,
+      CTypes types) {
+    if (port.getVariable() instanceof Input) {
+      builder.pr(generateInputVariablesInReaction((Input) port.getVariable(), tpr, types));
+    } else {
+      // port is an output of a contained reactor.
+      Output output = (Output) port.getVariable();
+      String portStructType =
+          CGenerator.variableStructType(
+              output, new TypeParameterizedReactor(port.getContainer()), false);
 
-    /** Generate action variables for a reaction.
-     *  @param action The action.
-     */
-    private static String generateActionVariablesInReaction(
-        Action action,
-        TypeParameterizedReactor tpr,
-        CTypes types
-    ) {
-        String structType = CGenerator.variableStructType(action, tpr, false);
-        // If the action has a type, create variables for accessing the value.
-        InferredType type = ASTUtils.getInferredType(action);
-        // Pointer to the lf_token_t sent as the payload in the trigger.
-        String tokenPointer = "(self->_lf__"+action.getName()+".tmplt.token)";
-        CodeBuilder builder = new CodeBuilder();
+      CodeBuilder structBuilder = structs.get(port.getContainer());
+      if (structBuilder == null) {
+        structBuilder = new CodeBuilder();
+        structs.put(port.getContainer(), structBuilder);
+      }
+      String subName = port.getContainer().getName();
+      String reactorWidth = generateWidthVariable(subName);
+      String outputName = output.getName();
+      String outputWidth = generateWidthVariable(outputName);
+      // First define the struct containing the output value and indicator
+      // of its presence.
+      if (!ASTUtils.isMultiport(output)) {
+        // Output is not a multiport.
+        structBuilder.pr(portStructType + "* " + outputName + ";");
+      } else {
+        // Output is a multiport.
+        structBuilder.pr(
+            String.join(
+                "\n", portStructType + "** " + outputName + ";", "int " + outputWidth + ";"));
+      }
 
+      // Next, initialize the struct with the current values.
+      if (port.getContainer().getWidthSpec() != null) {
+        // Output is in a bank.
         builder.pr(
-            String.join("\n",
-            "// Expose the action struct as a local variable whose name matches the action name.",
-            structType+"* "+action.getName()+" = &self->_lf_"+action.getName()+";",
-            "// Set the fields of the action struct to match the current trigger.",
-            action.getName()+"->is_present = (bool)self->_lf__"+action.getName()+".status;",
-            action.getName()+"->has_value = ("+tokenPointer+" != NULL && "+tokenPointer+"->value != NULL);",
-            "_lf_replace_template_token((token_template_t*)"+action.getName()+", "+tokenPointer+");")
-        );
-        // Set the value field only if there is a type.
-        if (!type.isUndefined()) {
-            // The value field will either be a copy (for primitive types)
-            // or a pointer (for types ending in *).
-            builder.pr("if ("+action.getName()+"->has_value) {");
-            builder.indent();
-            if (CUtil.isTokenType(type, types)) {
-                builder.pr(action.getName()+"->value = ("+types.getTargetType(type)+")"+tokenPointer+"->value;");
-            } else {
-                builder.pr(action.getName()+"->value = *("+types.getTargetType(type)+"*)"+tokenPointer+"->value;");
-            }
-            builder.unindent();
-            builder.pr("}");
+            String.join(
+                "\n",
+                "for (int i = 0; i < " + reactorWidth + "; i++) {",
+                "    "
+                    + subName
+                    + "[i]."
+                    + outputName
+                    + " = self->_lf_"
+                    + subName
+                    + "[i]."
+                    + outputName
+                    + ";",
+                "}"));
+        if (ASTUtils.isMultiport(output)) {
+          builder.pr(
+              String.join(
+                  "\n",
+                  "for (int i = 0; i < " + reactorWidth + "; i++) {",
+                  "    "
+                      + subName
+                      + "[i]."
+                      + outputWidth
+                      + " = self->_lf_"
+                      + subName
+                      + "[i]."
+                      + outputWidth
+                      + ";",
+                  "}"));
         }
-        return builder.toString();
+      } else {
+        // Output is not in a bank.
+        builder.pr(subName + "." + outputName + " = self->_lf_" + subName + "." + outputName + ";");
+        if (ASTUtils.isMultiport(output)) {
+          builder.pr(
+              subName + "." + outputWidth + " = self->_lf_" + subName + "." + outputWidth + ";");
+        }
+      }
     }
+  }
 
-    /** Generate into the specified string builder the code to
-     *  initialize local variables for the specified input port
-     *  in a reaction function from the "self" struct.
-     *  @param input The input statement from the AST.
-     *  @param tpr The reactor.
-     */
-    private static String generateInputVariablesInReaction(
-        Input input,
-        TypeParameterizedReactor tpr,
-        CTypes types
-    ) {
-        String structType = CGenerator.variableStructType(input, tpr, false);
-        InferredType inputType = ASTUtils.getInferredType(input);
-        CodeBuilder builder = new CodeBuilder();
-        String inputName = input.getName();
-        String inputWidth = generateWidthVariable(inputName);
+  /**
+   * Generate action variables for a reaction.
+   *
+   * @param action The action.
+   */
+  private static String generateActionVariablesInReaction(
+      Action action, TypeParameterizedReactor tpr, CTypes types) {
+    String structType = CGenerator.variableStructType(action, tpr, false);
+    // If the action has a type, create variables for accessing the value.
+    InferredType type = ASTUtils.getInferredType(action);
+    // Pointer to the lf_token_t sent as the payload in the trigger.
+    String tokenPointer = "(self->_lf__" + action.getName() + ".tmplt.token)";
+    CodeBuilder builder = new CodeBuilder();
 
-        // Create the local variable whose name matches the input name.
-        // If the input has not been declared mutable, then this is a pointer
-        // to the upstream output. Otherwise, it is a copy of the upstream output,
-        // which nevertheless points to the same token and value (hence, as done
-        // below, we have to use lf_writable_copy()). There are 8 cases,
-        // depending on whether the input is mutable, whether it is a multiport,
-        // and whether it is a token type.
-        // Easy case first.
-        if (!input.isMutable() && !CUtil.isTokenType(inputType, types) && !ASTUtils.isMultiport(input)) {
-            // Non-mutable, non-multiport, primitive type.
-            builder.pr(structType+"* "+inputName+" = self->_lf_"+inputName+";");
-        } else if (input.isMutable()&& !CUtil.isTokenType(inputType, types) && !ASTUtils.isMultiport(input)) {
-            // Mutable, non-multiport, primitive type.
-            builder.pr(String.join("\n",
-                "// Mutable input, so copy the input into a temporary variable.",
-                "// The input value on the struct is a copy.",
-                structType+" _lf_tmp_"+inputName+" = *(self->_lf_"+inputName+");",
-                structType+"* "+inputName+" = &_lf_tmp_"+inputName+";"
-            ));
-        } else if (!input.isMutable()&& CUtil.isTokenType(inputType, types) && !ASTUtils.isMultiport(input)) {
-            // Non-mutable, non-multiport, token type.
-            builder.pr(String.join("\n",
-                structType+"* "+inputName+" = self->_lf_"+inputName+";",
-                "if ("+inputName+"->is_present) {",
-                "    "+inputName+"->length = "+inputName+"->token->length;",
-                "    "+inputName+"->value = ("+types.getTargetType(inputType)+")"+inputName+"->token->value;",
-                "} else {",
-                "    "+inputName+"->length = 0;",
-                "}"
-            ));
-        } else if (input.isMutable()&& CUtil.isTokenType(inputType, types) && !ASTUtils.isMultiport(input)) {
-            // Mutable, non-multiport, token type.
-            builder.pr(String.join("\n",
-                "// Mutable input, so copy the input struct into a temporary variable.",
-                structType+" _lf_tmp_"+inputName+" = *(self->_lf_"+inputName+");",
-                structType+"* "+inputName+" = &_lf_tmp_"+inputName+";",
-                inputName+"->value = NULL;", // Prevent payload from being freed.
-                "if ("+inputName+"->is_present) {",
-                "    "+inputName+"->length = "+inputName+"->token->length;",
-                "    "+inputName+"->token = lf_writable_copy((lf_port_base_t*)self->_lf_"+inputName+");",
-                "    "+inputName+"->value = ("+types.getTargetType(inputType)+")"+inputName+"->token->value;",
-                "} else {",
-                "    "+inputName+"->length = 0;",
-                "}"
-            ));
-        } else if (!input.isMutable()&& ASTUtils.isMultiport(input)) {
-            // Non-mutable, multiport, primitive or token type.
-            builder.pr(structType+"** "+inputName+" = self->_lf_"+inputName+";");
-        } else if (CUtil.isTokenType(inputType, types)) {
-            // Mutable, multiport, token type
-            builder.pr(String.join("\n",
-                "// Mutable multiport input, so copy the input structs",
-                "// into an array of temporary variables on the stack.",
-                structType+" _lf_tmp_"+inputName+"["+CUtil.multiportWidthExpression(input)+"];",
-                structType+"* "+inputName+"["+CUtil.multiportWidthExpression(input)+"];",
-                "for (int i = 0; i < "+CUtil.multiportWidthExpression(input)+"; i++) {",
-                "    "+inputName+"[i] = &_lf_tmp_"+inputName+"[i];",
-                "    _lf_tmp_"+inputName+"[i] = *(self->_lf_"+inputName+"[i]);",
-                "    // If necessary, copy the tokens.",
-                "    if ("+inputName+"[i]->is_present) {",
-                "        "+inputName+"[i]->length = "+inputName+"[i]->token->length;",
-                "        token_template_t* _lf_input = (token_template_t*)self->_lf_"+inputName+"[i];",
-                "        "+inputName+"[i]->token = lf_writable_copy((lf_port_base_t*)_lf_input);",
-                "        "+inputName+"[i]->value = ("+types.getTargetType(inputType)+")"+inputName+"[i]->token->value;",
-                "    } else {",
-                "        "+inputName+"[i]->length = 0;",
-                "    }",
-                "}"
-            ));
-        } else {
-            // Mutable, multiport, primitive type
-            builder.pr(String.join("\n",
-                "// Mutable multiport input, so copy the input structs",
-                "// into an array of temporary variables on the stack.",
-                structType+" _lf_tmp_"+inputName+"["+CUtil.multiportWidthExpression(input)+"];",
-                structType+"* "+inputName+"["+CUtil.multiportWidthExpression(input)+"];",
-                "for (int i = 0; i < "+CUtil.multiportWidthExpression(input)+"; i++) {",
-                "    "+inputName+"[i]  = &_lf_tmp_"+inputName+"[i];",
-                "    // Copy the struct, which includes the value.",
-                "    _lf_tmp_"+inputName+"[i] = *(self->_lf_"+inputName+"[i]);",
-                "}"
-            ));
-        }
-        // Set the _width variable for all cases. This will be -1
-        // for a variable-width multiport, which is not currently supported.
-        // It will be -2 if it is not multiport.
-        builder.pr("int "+inputWidth+" = self->_lf_"+inputWidth+"; SUPPRESS_UNUSED_WARNING("+inputWidth+");");
-        return builder.toString();
+    builder.pr(
+        String.join(
+            "\n",
+            "// Expose the action struct as a local variable whose name matches the action name.",
+            structType + "* " + action.getName() + " = &self->_lf_" + action.getName() + ";",
+            "// Set the fields of the action struct to match the current trigger.",
+            action.getName() + "->is_present = (bool)self->_lf__" + action.getName() + ".status;",
+            action.getName()
+                + "->has_value = ("
+                + tokenPointer
+                + " != NULL && "
+                + tokenPointer
+                + "->value != NULL);",
+            "_lf_replace_template_token((token_template_t*)"
+                + action.getName()
+                + ", "
+                + tokenPointer
+                + ");"));
+    // Set the value field only if there is a type.
+    if (!type.isUndefined()) {
+      // The value field will either be a copy (for primitive types)
+      // or a pointer (for types ending in *).
+      builder.pr("if (" + action.getName() + "->has_value) {");
+      builder.indent();
+      if (CUtil.isTokenType(type, types)) {
+        builder.pr(
+            action.getName()
+                + "->value = ("
+                + types.getTargetType(type)
+                + ")"
+                + tokenPointer
+                + "->value;");
+      } else {
+        builder.pr(
+            action.getName()
+                + "->value = *("
+                + types.getTargetType(type)
+                + "*)"
+                + tokenPointer
+                + "->value;");
+      }
+      builder.unindent();
+      builder.pr("}");
     }
+    return builder.toString();
+  }
 
-    /**
-     * Generate into the specified string builder the code to
-     * initialize local variables for outputs in a reaction function
-     * from the "self" struct.
-     * @param effect The effect declared by the reaction. This must refer to an output.
-     * @param tpr The reactor containing the reaction.
-     */
-    public static String generateOutputVariablesInReaction(
-        VarRef effect,
-        TypeParameterizedReactor tpr,
-        ErrorReporter errorReporter,
-        boolean requiresTypes
-    ) {
-        Output output = (Output) effect.getVariable();
-        String outputName = output.getName();
-        String outputWidth = generateWidthVariable(outputName);
-        if (output.getType() == null && requiresTypes) {
-            errorReporter.reportError(output, "Output is required to have a type: " + outputName);
-            return "";
-        } else {
-            // The container of the output may be a contained reactor or
-            // the reactor containing the reaction.
-            String outputStructType = (effect.getContainer() == null) ?
-                CGenerator.variableStructType(output, tpr, false)
-                :
-                    CGenerator.variableStructType(output, new TypeParameterizedReactor(effect.getContainer()), false);
-            if (!ASTUtils.isMultiport(output)) {
-                // Output port is not a multiport.
-                return outputStructType+"* "+outputName+" = &self->_lf_"+outputName+";";
-            } else {
-                // Output port is a multiport.
-                // Set the _width variable.
-                return String.join("\n",
-                    "int "+outputWidth+" = self->_lf_"+outputWidth+"; SUPPRESS_UNUSED_WARNING("+outputWidth+");",
-                    outputStructType+"** "+outputName+" = self->_lf_"+outputName+"_pointers;"
-                );
+  /**
+   * Generate into the specified string builder the code to initialize local variables for the
+   * specified input port in a reaction function from the "self" struct.
+   *
+   * @param input The input statement from the AST.
+   * @param tpr The reactor.
+   */
+  private static String generateInputVariablesInReaction(
+      Input input, TypeParameterizedReactor tpr, CTypes types) {
+    String structType = CGenerator.variableStructType(input, tpr, false);
+    InferredType inputType = ASTUtils.getInferredType(input);
+    CodeBuilder builder = new CodeBuilder();
+    String inputName = input.getName();
+    String inputWidth = generateWidthVariable(inputName);
 
-            }
-        }
+    // Create the local variable whose name matches the input name.
+    // If the input has not been declared mutable, then this is a pointer
+    // to the upstream output. Otherwise, it is a copy of the upstream output,
+    // which nevertheless points to the same token and value (hence, as done
+    // below, we have to use lf_writable_copy()). There are 8 cases,
+    // depending on whether the input is mutable, whether it is a multiport,
+    // and whether it is a token type.
+    // Easy case first.
+    if (!input.isMutable()
+        && !CUtil.isTokenType(inputType, types)
+        && !ASTUtils.isMultiport(input)) {
+      // Non-mutable, non-multiport, primitive type.
+      builder.pr(structType + "* " + inputName + " = self->_lf_" + inputName + ";");
+    } else if (input.isMutable()
+        && !CUtil.isTokenType(inputType, types)
+        && !ASTUtils.isMultiport(input)) {
+      // Mutable, non-multiport, primitive type.
+      builder.pr(
+          String.join(
+              "\n",
+              "// Mutable input, so copy the input into a temporary variable.",
+              "// The input value on the struct is a copy.",
+              structType + " _lf_tmp_" + inputName + " = *(self->_lf_" + inputName + ");",
+              structType + "* " + inputName + " = &_lf_tmp_" + inputName + ";"));
+    } else if (!input.isMutable()
+        && CUtil.isTokenType(inputType, types)
+        && !ASTUtils.isMultiport(input)) {
+      // Non-mutable, non-multiport, token type.
+      builder.pr(
+          String.join(
+              "\n",
+              structType + "* " + inputName + " = self->_lf_" + inputName + ";",
+              "if (" + inputName + "->is_present) {",
+              "    " + inputName + "->length = " + inputName + "->token->length;",
+              "    "
+                  + inputName
+                  + "->value = ("
+                  + types.getTargetType(inputType)
+                  + ")"
+                  + inputName
+                  + "->token->value;",
+              "} else {",
+              "    " + inputName + "->length = 0;",
+              "}"));
+    } else if (input.isMutable()
+        && CUtil.isTokenType(inputType, types)
+        && !ASTUtils.isMultiport(input)) {
+      // Mutable, non-multiport, token type.
+      builder.pr(
+          String.join(
+              "\n",
+              "// Mutable input, so copy the input struct into a temporary variable.",
+              structType + " _lf_tmp_" + inputName + " = *(self->_lf_" + inputName + ");",
+              structType + "* " + inputName + " = &_lf_tmp_" + inputName + ";",
+              inputName + "->value = NULL;", // Prevent payload from being freed.
+              "if (" + inputName + "->is_present) {",
+              "    " + inputName + "->length = " + inputName + "->token->length;",
+              "    "
+                  + inputName
+                  + "->token = lf_writable_copy((lf_port_base_t*)self->_lf_"
+                  + inputName
+                  + ");",
+              "    "
+                  + inputName
+                  + "->value = ("
+                  + types.getTargetType(inputType)
+                  + ")"
+                  + inputName
+                  + "->token->value;",
+              "} else {",
+              "    " + inputName + "->length = 0;",
+              "}"));
+    } else if (!input.isMutable() && ASTUtils.isMultiport(input)) {
+      // Non-mutable, multiport, primitive or token type.
+      builder.pr(structType + "** " + inputName + " = self->_lf_" + inputName + ";");
+    } else if (CUtil.isTokenType(inputType, types)) {
+      // Mutable, multiport, token type
+      builder.pr(
+          String.join(
+              "\n",
+              "// Mutable multiport input, so copy the input structs",
+              "// into an array of temporary variables on the stack.",
+              structType
+                  + " _lf_tmp_"
+                  + inputName
+                  + "["
+                  + CUtil.multiportWidthExpression(input)
+                  + "];",
+              structType + "* " + inputName + "[" + CUtil.multiportWidthExpression(input) + "];",
+              "for (int i = 0; i < " + CUtil.multiportWidthExpression(input) + "; i++) {",
+              "    " + inputName + "[i] = &_lf_tmp_" + inputName + "[i];",
+              "    _lf_tmp_" + inputName + "[i] = *(self->_lf_" + inputName + "[i]);",
+              "    // If necessary, copy the tokens.",
+              "    if (" + inputName + "[i]->is_present) {",
+              "        " + inputName + "[i]->length = " + inputName + "[i]->token->length;",
+              "        token_template_t* _lf_input = (token_template_t*)self->_lf_"
+                  + inputName
+                  + "[i];",
+              "        " + inputName + "[i]->token = lf_writable_copy((lf_port_base_t*)_lf_input);",
+              "        "
+                  + inputName
+                  + "[i]->value = ("
+                  + types.getTargetType(inputType)
+                  + ")"
+                  + inputName
+                  + "[i]->token->value;",
+              "    } else {",
+              "        " + inputName + "[i]->length = 0;",
+              "    }",
+              "}"));
+    } else {
+      // Mutable, multiport, primitive type
+      builder.pr(
+          String.join(
+              "\n",
+              "// Mutable multiport input, so copy the input structs",
+              "// into an array of temporary variables on the stack.",
+              structType
+                  + " _lf_tmp_"
+                  + inputName
+                  + "["
+                  + CUtil.multiportWidthExpression(input)
+                  + "];",
+              structType + "* " + inputName + "[" + CUtil.multiportWidthExpression(input) + "];",
+              "for (int i = 0; i < " + CUtil.multiportWidthExpression(input) + "; i++) {",
+              "    " + inputName + "[i]  = &_lf_tmp_" + inputName + "[i];",
+              "    // Copy the struct, which includes the value.",
+              "    _lf_tmp_" + inputName + "[i] = *(self->_lf_" + inputName + "[i]);",
+              "}"));
     }
+    // Set the _width variable for all cases. This will be -1
+    // for a variable-width multiport, which is not currently supported.
+    // It will be -2 if it is not multiport.
+    builder.pr(
+        "int "
+            + inputWidth
+            + " = self->_lf_"
+            + inputWidth
+            + "; SUPPRESS_UNUSED_WARNING("
+            + inputWidth
+            + ");");
+    return builder.toString();
+  }
 
-    /**
-     * Generate into the specified string builder the code to initialize local variables for watchdogs
-     * in a reaction function from the "self" struct.
-     *
-     * @param effect The effect declared by the reaction. This must refer to a watchdog.
-     */
-    public static String generateWatchdogVariablesInReaction(VarRef effect) {
-        Watchdog watchdog = (Watchdog) effect.getVariable();
-        String watchdogName = watchdog.getName();
+  /**
+   * Generate into the specified string builder the code to initialize local variables for outputs
+   * in a reaction function from the "self" struct.
+   *
+   * @param effect The effect declared by the reaction. This must refer to an output.
+   * @param tpr The reactor containing the reaction.
+   */
+  public static String generateOutputVariablesInReaction(
+      VarRef effect,
+      TypeParameterizedReactor tpr,
+      ErrorReporter errorReporter,
+      boolean requiresTypes) {
+    Output output = (Output) effect.getVariable();
+    String outputName = output.getName();
+    String outputWidth = generateWidthVariable(outputName);
+    if (output.getType() == null && requiresTypes) {
+      errorReporter.reportError(output, "Output is required to have a type: " + outputName);
+      return "";
+    } else {
+      // The container of the output may be a contained reactor or
+      // the reactor containing the reaction.
+      String outputStructType =
+          (effect.getContainer() == null)
+              ? CGenerator.variableStructType(output, tpr, false)
+              : CGenerator.variableStructType(
+                  output, new TypeParameterizedReactor(effect.getContainer()), false);
+      if (!ASTUtils.isMultiport(output)) {
+        // Output port is not a multiport.
+        return outputStructType + "* " + outputName + " = &self->_lf_" + outputName + ";";
+      } else {
+        // Output port is a multiport.
+        // Set the _width variable.
         return String.join(
             "\n",
-             List.of("watchdog_t* " + watchdogName + " = &(self->_lf_watchdog_" + watchdogName + ");")
-        );
+            "int "
+                + outputWidth
+                + " = self->_lf_"
+                + outputWidth
+                + "; SUPPRESS_UNUSED_WARNING("
+                + outputWidth
+                + ");",
+            outputStructType + "** " + outputName + " = self->_lf_" + outputName + "_pointers;");
+      }
     }
+  }
 
-    /**
-     * Generate the fields of the self struct and statements for the constructor
-     * to create and initialize a reaction_t struct for each reaction in the
-     * specified reactor and a trigger_t struct for each trigger (input, action,
-     * timer, or output of a contained reactor).
-     * @param body The place to put the code for the self struct.
-     * @param tpr {@link TypeParameterizedReactor}
-     * @param constructorCode The place to put the constructor code.
-     */
-    public static void generateReactionAndTriggerStructs(
-        CodeBuilder body,
-        TypeParameterizedReactor tpr,
-        CodeBuilder constructorCode,
-        CTypes types
-    ) {
-        var reactionCount = 0;
-        // Iterate over reactions and create initialize the reaction_t struct
-        // on the self struct. Also, collect a map from triggers to the reactions
-        // that are triggered by that trigger. Also, collect a set of sources
-        // that are read by reactions but do not trigger reactions.
-        // Finally, collect a set of triggers and sources that are outputs
-        // of contained reactors.
-        var triggerMap = new LinkedHashMap<Variable,LinkedList<Integer>>();
-        var sourceSet = new LinkedHashSet<Variable>();
-        var outputsOfContainedReactors = new LinkedHashMap<Variable,Instantiation>();
-        var startupReactions = new LinkedHashSet<Integer>();
-        var shutdownReactions = new LinkedHashSet<Integer>();
-        var resetReactions = new LinkedHashSet<Integer>();
-        for (Reaction reaction : ASTUtils.allReactions(tpr.reactor())) {
-            // Create the reaction_t struct.
-            body.pr(reaction, "reaction_t _lf__reaction_"+reactionCount+";");
+  /**
+   * Generate into the specified string builder the code to initialize local variables for watchdogs
+   * in a reaction function from the "self" struct.
+   *
+   * @param effect The effect declared by the reaction. This must refer to a watchdog.
+   */
+  public static String generateWatchdogVariablesInReaction(VarRef effect) {
+    Watchdog watchdog = (Watchdog) effect.getVariable();
+    String watchdogName = watchdog.getName();
+    return String.join(
+        "\n",
+        List.of("watchdog_t* " + watchdogName + " = &(self->_lf_watchdog_" + watchdogName + ");"));
+  }
 
-            // Create the map of triggers to reactions.
-            for (TriggerRef trigger : reaction.getTriggers()) {
-                // trigger may not be a VarRef (it could be "startup" or "shutdown").
-                if (trigger instanceof VarRef triggerAsVarRef) {
-                    var reactionList = triggerMap.get(triggerAsVarRef.getVariable());
-                    if (reactionList == null) {
-                        reactionList = new LinkedList<>();
-                        triggerMap.put(triggerAsVarRef.getVariable(), reactionList);
-                    }
-                    reactionList.add(reactionCount);
-                    if (triggerAsVarRef.getContainer() != null) {
-                        outputsOfContainedReactors.put(triggerAsVarRef.getVariable(), triggerAsVarRef.getContainer());
-                    }
-                } else if (trigger instanceof BuiltinTriggerRef) {
-                    switch(((BuiltinTriggerRef) trigger).getType()) {
-                        case STARTUP:
-                            startupReactions.add(reactionCount);
-                            break;
-                        case SHUTDOWN:
-                            shutdownReactions.add(reactionCount);
-                            break;
-                        case RESET:
-                            resetReactions.add(reactionCount);
-                            break;
-                    }
-                }
-            }
-            // Create the set of sources read but not triggering.
-            for (VarRef source : reaction.getSources()) {
-                sourceSet.add(source.getVariable());
-                if (source.getContainer() != null) {
-                    outputsOfContainedReactors.put(source.getVariable(), source.getContainer());
-                }
-            }
+  /**
+   * Generate the fields of the self struct and statements for the constructor to create and
+   * initialize a reaction_t struct for each reaction in the specified reactor and a trigger_t
+   * struct for each trigger (input, action, timer, or output of a contained reactor).
+   *
+   * @param body The place to put the code for the self struct.
+   * @param tpr {@link TypeParameterizedReactor}
+   * @param constructorCode The place to put the constructor code.
+   */
+  public static void generateReactionAndTriggerStructs(
+      CodeBuilder body, TypeParameterizedReactor tpr, CodeBuilder constructorCode, CTypes types) {
+    var reactionCount = 0;
+    // Iterate over reactions and create initialize the reaction_t struct
+    // on the self struct. Also, collect a map from triggers to the reactions
+    // that are triggered by that trigger. Also, collect a set of sources
+    // that are read by reactions but do not trigger reactions.
+    // Finally, collect a set of triggers and sources that are outputs
+    // of contained reactors.
+    var triggerMap = new LinkedHashMap<Variable, LinkedList<Integer>>();
+    var sourceSet = new LinkedHashSet<Variable>();
+    var outputsOfContainedReactors = new LinkedHashMap<Variable, Instantiation>();
+    var startupReactions = new LinkedHashSet<Integer>();
+    var shutdownReactions = new LinkedHashSet<Integer>();
+    var resetReactions = new LinkedHashSet<Integer>();
+    for (Reaction reaction : ASTUtils.allReactions(tpr.reactor())) {
+      // Create the reaction_t struct.
+      body.pr(reaction, "reaction_t _lf__reaction_" + reactionCount + ";");
 
-            var deadlineFunctionPointer = "NULL";
-            if (reaction.getDeadline() != null) {
-                // The following has to match the name chosen in generateReactions
-                var deadlineFunctionName = generateDeadlineFunctionName(tpr, reactionCount);
-                deadlineFunctionPointer = "&" + deadlineFunctionName;
-            }
+      // Create the map of triggers to reactions.
+      for (TriggerRef trigger : reaction.getTriggers()) {
+        // trigger may not be a VarRef (it could be "startup" or "shutdown").
+        if (trigger instanceof VarRef triggerAsVarRef) {
+          var reactionList = triggerMap.get(triggerAsVarRef.getVariable());
+          if (reactionList == null) {
+            reactionList = new LinkedList<>();
+            triggerMap.put(triggerAsVarRef.getVariable(), reactionList);
+          }
+          reactionList.add(reactionCount);
+          if (triggerAsVarRef.getContainer() != null) {
+            outputsOfContainedReactors.put(
+                triggerAsVarRef.getVariable(), triggerAsVarRef.getContainer());
+          }
+        } else if (trigger instanceof BuiltinTriggerRef) {
+          switch (((BuiltinTriggerRef) trigger).getType()) {
+            case STARTUP:
+              startupReactions.add(reactionCount);
+              break;
+            case SHUTDOWN:
+              shutdownReactions.add(reactionCount);
+              break;
+            case RESET:
+              resetReactions.add(reactionCount);
+              break;
+          }
+        }
+      }
+      // Create the set of sources read but not triggering.
+      for (VarRef source : reaction.getSources()) {
+        sourceSet.add(source.getVariable());
+        if (source.getContainer() != null) {
+          outputsOfContainedReactors.put(source.getVariable(), source.getContainer());
+        }
+      }
 
-            // Assign the STP handler
-            var STPFunctionPointer = "NULL";
-            if (reaction.getStp() != null) {
-                // The following has to match the name chosen in generateReactions
-                var STPFunctionName = generateStpFunctionName(tpr, reactionCount);
-                STPFunctionPointer = "&" + STPFunctionName;
-            }
+      var deadlineFunctionPointer = "NULL";
+      if (reaction.getDeadline() != null) {
+        // The following has to match the name chosen in generateReactions
+        var deadlineFunctionName = generateDeadlineFunctionName(tpr, reactionCount);
+        deadlineFunctionPointer = "&" + deadlineFunctionName;
+      }
 
-            // Set the defaults of the reaction_t struct in the constructor.
-            // Since the self struct is allocated using calloc, there is no need to set:
-            // self->_lf__reaction_"+reactionCount+".index = 0;
-            // self->_lf__reaction_"+reactionCount+".chain_id = 0;
-            // self->_lf__reaction_"+reactionCount+".pos = 0;
-            // self->_lf__reaction_"+reactionCount+".status = inactive;
-            // self->_lf__reaction_"+reactionCount+".deadline = 0LL;
-            // self->_lf__reaction_"+reactionCount+".is_STP_violated = false;
-            constructorCode.pr(reaction, String.join("\n",
-                "self->_lf__reaction_"+reactionCount+".number = "+reactionCount+";",
-                "self->_lf__reaction_"+reactionCount+".function = "+CReactionGenerator.generateReactionFunctionName(tpr, reactionCount)+";",
-                "self->_lf__reaction_"+reactionCount+".self = self;",
-                "self->_lf__reaction_"+reactionCount+".deadline_violation_handler = "+deadlineFunctionPointer+";",
-                "self->_lf__reaction_"+reactionCount+".STP_handler = "+STPFunctionPointer+";",
-                "self->_lf__reaction_"+reactionCount+".name = "+addDoubleQuotes("?")+";",
-                reaction.eContainer() instanceof Mode ?
-                "self->_lf__reaction_"+reactionCount+".mode = &self->_lf__modes["+tpr.reactor().getModes().indexOf((Mode) reaction.eContainer())+"];" :
-                "self->_lf__reaction_"+reactionCount+".mode = NULL;"
-            ));
-            // Increment the reactionCount even if the reaction is not in the federate
-            // so that reaction indices are consistent across federates.
-            reactionCount++;
-        }
+      // Assign the STP handler
+      var STPFunctionPointer = "NULL";
+      if (reaction.getStp() != null) {
+        // The following has to match the name chosen in generateReactions
+        var STPFunctionName = generateStpFunctionName(tpr, reactionCount);
+        STPFunctionPointer = "&" + STPFunctionName;
+      }
 
-        // Next, create and initialize the trigger_t objects.
-        // Start with the timers.
-        for (Timer timer : ASTUtils.allTimers(tpr.reactor())) {
-            createTriggerT(body, timer, triggerMap, constructorCode, types);
-            // Since the self struct is allocated using calloc, there is no need to set falsy fields.
-            constructorCode.pr("self->_lf__"+timer.getName()+".is_timer = true;");
-            constructorCode.pr(CExtensionUtils.surroundWithIfFederatedDecentralized(
-                "self->_lf__"+timer.getName()+".intended_tag = (tag_t) { .time = NEVER, .microstep = 0u};"));
-        }
+      // Set the defaults of the reaction_t struct in the constructor.
+      // Since the self struct is allocated using calloc, there is no need to set:
+      // self->_lf__reaction_"+reactionCount+".index = 0;
+      // self->_lf__reaction_"+reactionCount+".chain_id = 0;
+      // self->_lf__reaction_"+reactionCount+".pos = 0;
+      // self->_lf__reaction_"+reactionCount+".status = inactive;
+      // self->_lf__reaction_"+reactionCount+".deadline = 0LL;
+      // self->_lf__reaction_"+reactionCount+".is_STP_violated = false;
+      constructorCode.pr(
+          reaction,
+          String.join(
+              "\n",
+              "self->_lf__reaction_" + reactionCount + ".number = " + reactionCount + ";",
+              "self->_lf__reaction_"
+                  + reactionCount
+                  + ".function = "
+                  + CReactionGenerator.generateReactionFunctionName(tpr, reactionCount)
+                  + ";",
+              "self->_lf__reaction_" + reactionCount + ".self = self;",
+              "self->_lf__reaction_"
+                  + reactionCount
+                  + ".deadline_violation_handler = "
+                  + deadlineFunctionPointer
+                  + ";",
+              "self->_lf__reaction_" + reactionCount + ".STP_handler = " + STPFunctionPointer + ";",
+              "self->_lf__reaction_" + reactionCount + ".name = " + addDoubleQuotes("?") + ";",
+              reaction.eContainer() instanceof Mode
+                  ? "self->_lf__reaction_"
+                      + reactionCount
+                      + ".mode = &self->_lf__modes["
+                      + tpr.reactor().getModes().indexOf((Mode) reaction.eContainer())
+                      + "];"
+                  : "self->_lf__reaction_" + reactionCount + ".mode = NULL;"));
+      // Increment the reactionCount even if the reaction is not in the federate
+      // so that reaction indices are consistent across federates.
+      reactionCount++;
+    }
 
-        // Handle builtin triggers.
-        if (startupReactions.size() > 0) {
-            generateBuiltinTriggeredReactionsArray(startupReactions, "startup", body, constructorCode);
-        }
-        // Handle shutdown triggers.
-        if (shutdownReactions.size() > 0) {
-            generateBuiltinTriggeredReactionsArray(shutdownReactions, "shutdown", body, constructorCode);
-        }
-        if (resetReactions.size() > 0) {
-            generateBuiltinTriggeredReactionsArray(resetReactions, "reset", body, constructorCode);
-        }
+    // Next, create and initialize the trigger_t objects.
+    // Start with the timers.
+    for (Timer timer : ASTUtils.allTimers(tpr.reactor())) {
+      createTriggerT(body, timer, triggerMap, constructorCode, types);
+      // Since the self struct is allocated using calloc, there is no need to set falsy fields.
+      constructorCode.pr("self->_lf__" + timer.getName() + ".is_timer = true;");
+      constructorCode.pr(
+          CExtensionUtils.surroundWithIfFederatedDecentralized(
+              "self->_lf__"
+                  + timer.getName()
+                  + ".intended_tag = (tag_t) { .time = NEVER, .microstep = 0u};"));
+    }
 
-        // Next handle actions.
-        for (Action action : ASTUtils.allActions(tpr.reactor())) {
-            createTriggerT(body, action, triggerMap, constructorCode, types);
-            var isPhysical = "true";
-            if (action.getOrigin().equals(ActionOrigin.LOGICAL)) {
-                isPhysical = "false";
-            }
-            var elementSize = "0";
-            // If the action type is 'void', we need to avoid generating the code
-            // 'sizeof(void)', which some compilers reject.
-            var rootType = action.getType() != null ? CUtil.rootType(types.getTargetType(action))
-                : null;
-            if (rootType != null && !rootType.equals("void")) {
-                elementSize = "sizeof(" + rootType + ")";
-            }
+    // Handle builtin triggers.
+    if (startupReactions.size() > 0) {
+      generateBuiltinTriggeredReactionsArray(startupReactions, "startup", body, constructorCode);
+    }
+    // Handle shutdown triggers.
+    if (shutdownReactions.size() > 0) {
+      generateBuiltinTriggeredReactionsArray(shutdownReactions, "shutdown", body, constructorCode);
+    }
+    if (resetReactions.size() > 0) {
+      generateBuiltinTriggeredReactionsArray(resetReactions, "reset", body, constructorCode);
+    }
 
-            // Since the self struct is allocated using calloc, there is no need to set:
-            // self->_lf__"+action.getName()+".is_timer = false;
-            constructorCode.pr(String.join("\n",
-                "self->_lf__" + action.getName() + ".is_physical = " + isPhysical + ";",
-                !(action.getPolicy() == null || action.getPolicy().isEmpty()) ?
-                    "self->_lf__" + action.getName() + ".policy = " + action.getPolicy() + ";" :
-                    "",
-                // Need to set the element_size in the trigger_t and the action struct.
-                "self->_lf__" + action.getName() + ".tmplt.type.element_size = " + elementSize
-                    + ";",
-                "self->_lf_" + action.getName() + ".type.element_size = " + elementSize + ";"
-            ));
-        }
+    // Next handle actions.
+    for (Action action : ASTUtils.allActions(tpr.reactor())) {
+      createTriggerT(body, action, triggerMap, constructorCode, types);
+      var isPhysical = "true";
+      if (action.getOrigin().equals(ActionOrigin.LOGICAL)) {
+        isPhysical = "false";
+      }
+      var elementSize = "0";
+      // If the action type is 'void', we need to avoid generating the code
+      // 'sizeof(void)', which some compilers reject.
+      var rootType = action.getType() != null ? CUtil.rootType(types.getTargetType(action)) : null;
+      if (rootType != null && !rootType.equals("void")) {
+        elementSize = "sizeof(" + rootType + ")";
+      }
 
-        // Next handle inputs.
-        for (Input input : ASTUtils.allInputs(tpr.reactor())) {
-            createTriggerT(body, input, triggerMap, constructorCode, types);
-        }
+      // Since the self struct is allocated using calloc, there is no need to set:
+      // self->_lf__"+action.getName()+".is_timer = false;
+      constructorCode.pr(
+          String.join(
+              "\n",
+              "self->_lf__" + action.getName() + ".is_physical = " + isPhysical + ";",
+              !(action.getPolicy() == null || action.getPolicy().isEmpty())
+                  ? "self->_lf__" + action.getName() + ".policy = " + action.getPolicy() + ";"
+                  : "",
+              // Need to set the element_size in the trigger_t and the action struct.
+              "self->_lf__" + action.getName() + ".tmplt.type.element_size = " + elementSize + ";",
+              "self->_lf_" + action.getName() + ".type.element_size = " + elementSize + ";"));
+    }
 
-        // Next handle watchdogs.
-        for (Watchdog watchdog : ASTUtils.allWatchdogs(tpr.reactor())) {
-            createTriggerT(body, watchdog, triggerMap, constructorCode, types);
-        }
+    // Next handle inputs.
+    for (Input input : ASTUtils.allInputs(tpr.reactor())) {
+      createTriggerT(body, input, triggerMap, constructorCode, types);
     }
 
-    /**
-     * Define the trigger_t object on the self struct, an array of
-     * reaction_t pointers pointing to reactions triggered by this variable,
-     * and initialize the pointers in the array in the constructor.
-     * @param body The place to write the self struct entries.
-     * @param variable The trigger variable (Timer, Action, Watchdog, or Input).
-     * @param triggerMap A map from Variables to a list of the reaction indices triggered by the
-     * variable.
-     * @param constructorCode The place to write the constructor code.
-     */
-    private static void createTriggerT(
-        CodeBuilder body,
-        Variable variable,
-        LinkedHashMap<Variable, LinkedList<Integer>> triggerMap,
-        CodeBuilder constructorCode,
-        CTypes types
-    ) {
-        var varName = variable.getName();
-        // variable is a port, a timer, or an action.
-        body.pr(variable, "trigger_t _lf__"+varName+";");
-        constructorCode.pr(variable, "self->_lf__"+varName+".last = NULL;");
-        constructorCode.pr(variable, CExtensionUtils.surroundWithIfFederatedDecentralized(
-            "self->_lf__"+varName+".intended_tag = (tag_t) { .time = NEVER, .microstep = 0u};"));
+    // Next handle watchdogs.
+    for (Watchdog watchdog : ASTUtils.allWatchdogs(tpr.reactor())) {
+      createTriggerT(body, watchdog, triggerMap, constructorCode, types);
+    }
+  }
 
-        // Generate the reactions triggered table.
-        var reactionsTriggered = triggerMap.get(variable);
-        if (reactionsTriggered != null) {
-            body.pr(variable, "reaction_t* _lf__"+varName+"_reactions["+reactionsTriggered.size()+"];");
-            var count = 0;
-            for (Integer reactionTriggered : reactionsTriggered) {
-                constructorCode.prSourceLineNumber(variable);
-                constructorCode.pr(variable, "self->_lf__"+varName+"_reactions["+count+"] = &self->_lf__reaction_"+reactionTriggered+";");
-                count++;
-            }
-            // Set up the trigger_t struct's pointer to the reactions.
-            constructorCode.pr(variable, String.join("\n",
-                "self->_lf__"+varName+".reactions = &self->_lf__"+varName+"_reactions[0];",
-                "self->_lf__"+varName+".number_of_reactions = "+count+";"
-            ));
+  /**
+   * Define the trigger_t object on the self struct, an array of reaction_t pointers pointing to
+   * reactions triggered by this variable, and initialize the pointers in the array in the
+   * constructor.
+   *
+   * @param body The place to write the self struct entries.
+   * @param variable The trigger variable (Timer, Action, Watchdog, or Input).
+   * @param triggerMap A map from Variables to a list of the reaction indices triggered by the
+   *     variable.
+   * @param constructorCode The place to write the constructor code.
+   */
+  private static void createTriggerT(
+      CodeBuilder body,
+      Variable variable,
+      LinkedHashMap<Variable, LinkedList<Integer>> triggerMap,
+      CodeBuilder constructorCode,
+      CTypes types) {
+    var varName = variable.getName();
+    // variable is a port, a timer, or an action.
+    body.pr(variable, "trigger_t _lf__" + varName + ";");
+    constructorCode.pr(variable, "self->_lf__" + varName + ".last = NULL;");
+    constructorCode.pr(
+        variable,
+        CExtensionUtils.surroundWithIfFederatedDecentralized(
+            "self->_lf__"
+                + varName
+                + ".intended_tag = (tag_t) { .time = NEVER, .microstep = 0u};"));
 
-            // If federated, set the physical_time_of_arrival
-            constructorCode.pr(variable, CExtensionUtils.surroundWithIfFederated(
-                "self->_lf__"+varName+".physical_time_of_arrival = NEVER;"));
-        }
-        if (variable instanceof Input) {
-            var rootType = CUtil.rootType(types.getTargetType((Input) variable));
-            // Since the self struct is allocated using calloc, there is no need to set falsy fields.
-            // If the input type is 'void', we need to avoid generating the code
-            // 'sizeof(void)', which some compilers reject.
-            var size = (rootType.equals("void")) ? "0" : "sizeof("+rootType+")";
+    // Generate the reactions triggered table.
+    var reactionsTriggered = triggerMap.get(variable);
+    if (reactionsTriggered != null) {
+      body.pr(
+          variable,
+          "reaction_t* _lf__" + varName + "_reactions[" + reactionsTriggered.size() + "];");
+      var count = 0;
+      for (Integer reactionTriggered : reactionsTriggered) {
+        constructorCode.prSourceLineNumber(variable);
+        constructorCode.pr(
+            variable,
+            "self->_lf__"
+                + varName
+                + "_reactions["
+                + count
+                + "] = &self->_lf__reaction_"
+                + reactionTriggered
+                + ";");
+        count++;
+      }
+      // Set up the trigger_t struct's pointer to the reactions.
+      constructorCode.pr(
+          variable,
+          String.join(
+              "\n",
+              "self->_lf__" + varName + ".reactions = &self->_lf__" + varName + "_reactions[0];",
+              "self->_lf__" + varName + ".number_of_reactions = " + count + ";"));
 
-            constructorCode.pr("self->_lf__"+varName+".tmplt.type.element_size = "+size+";");
-            body.pr(
-                CExtensionUtils.surroundWithIfFederated(
-                    CExtensionUtils.createPortStatusFieldForInput((Input) variable)
-                )
-            );
-        }
+      // If federated, set the physical_time_of_arrival
+      constructorCode.pr(
+          variable,
+          CExtensionUtils.surroundWithIfFederated(
+              "self->_lf__" + varName + ".physical_time_of_arrival = NEVER;"));
     }
+    if (variable instanceof Input) {
+      var rootType = CUtil.rootType(types.getTargetType((Input) variable));
+      // Since the self struct is allocated using calloc, there is no need to set falsy fields.
+      // If the input type is 'void', we need to avoid generating the code
+      // 'sizeof(void)', which some compilers reject.
+      var size = (rootType.equals("void")) ? "0" : "sizeof(" + rootType + ")";
 
-    public static void generateBuiltinTriggeredReactionsArray(
-            Set<Integer> reactions,
-            String name,
-            CodeBuilder body,
-            CodeBuilder constructorCode
-    ) {
-        body.pr(String.join("\n",
-            "trigger_t _lf__"+name+";",
-            "reaction_t* _lf__"+name+"_reactions["+reactions.size()+"];"
-        ));
-        constructorCode.pr(CExtensionUtils.surroundWithIfFederatedDecentralized(
-            "self->_lf__"+name+".intended_tag = (tag_t) { .time = NEVER, .microstep = 0u};"));
-        var i = 0;
-        for (Integer reactionIndex : reactions) {
-            constructorCode.pr("self->_lf__"+name+"_reactions["+i+++"] = &self->_lf__reaction_"+reactionIndex+";");
-        }
-        constructorCode.pr(String.join("\n",
-            "self->_lf__"+name+".last = NULL;",
-            "self->_lf__"+name+".reactions = &self->_lf__"+name+"_reactions[0];",
-            "self->_lf__"+name+".number_of_reactions = "+reactions.size()+";",
-            "self->_lf__"+name+".is_timer = false;"
-        ));
+      constructorCode.pr("self->_lf__" + varName + ".tmplt.type.element_size = " + size + ";");
+      body.pr(
+          CExtensionUtils.surroundWithIfFederated(
+              CExtensionUtils.createPortStatusFieldForInput((Input) variable)));
     }
+  }
 
-    public static String generateBuiltinTriggersTable(int reactionCount, String name) {
-        return String.join("\n", List.of(
-            "// Array of pointers to "+name+" triggers.",
-            (reactionCount > 0 ?
-            "reaction_t* _lf_"+name+"_reactions["+reactionCount+"]" :
-            "reaction_t** _lf_"+name+"_reactions = NULL") + ";",
-            "int _lf_"+name+"_reactions_size = "+reactionCount+";"
-        ));
+  public static void generateBuiltinTriggeredReactionsArray(
+      Set<Integer> reactions, String name, CodeBuilder body, CodeBuilder constructorCode) {
+    body.pr(
+        String.join(
+            "\n",
+            "trigger_t _lf__" + name + ";",
+            "reaction_t* _lf__" + name + "_reactions[" + reactions.size() + "];"));
+    constructorCode.pr(
+        CExtensionUtils.surroundWithIfFederatedDecentralized(
+            "self->_lf__" + name + ".intended_tag = (tag_t) { .time = NEVER, .microstep = 0u};"));
+    var i = 0;
+    for (Integer reactionIndex : reactions) {
+      constructorCode.pr(
+          "self->_lf__"
+              + name
+              + "_reactions["
+              + i++
+              + "] = &self->_lf__reaction_"
+              + reactionIndex
+              + ";");
     }
+    constructorCode.pr(
+        String.join(
+            "\n",
+            "self->_lf__" + name + ".last = NULL;",
+            "self->_lf__" + name + ".reactions = &self->_lf__" + name + "_reactions[0];",
+            "self->_lf__" + name + ".number_of_reactions = " + reactions.size() + ";",
+            "self->_lf__" + name + ".is_timer = false;"));
+  }
 
-    /**
-     * Generate the _lf_trigger_startup_reactions function.
-     */
-    public static String generateLfTriggerStartupReactions(int startupReactionCount, boolean hasModalReactors) {
-        var s = new StringBuilder();
-        s.append("void _lf_trigger_startup_reactions() {");
-        if (startupReactionCount > 0) {
-            s.append("\n");
-            if (hasModalReactors) {
-                s.append(String.join("\n",
-                    "    for (int i = 0; i < _lf_startup_reactions_size; i++) {",
-                    "        if (_lf_startup_reactions[i] != NULL) {",
-                    "            if (_lf_startup_reactions[i]->mode != NULL) {",
-                    "                // Skip reactions in modes",
-                    "                continue;",
-                    "            }",
-                    "            _lf_trigger_reaction(_lf_startup_reactions[i], -1);",
-                    "        }",
-                    "    }",
-                    "    _lf_handle_mode_startup_reset_reactions(",
-                    "        _lf_startup_reactions, _lf_startup_reactions_size,",
-                    "        NULL, 0,",
-                    "        _lf_modal_reactor_states, _lf_modal_reactor_states_size);"
-                ));
-            } else {
-                s.append(String.join("\n",
-                    "    for (int i = 0; i < _lf_startup_reactions_size; i++) {",
-                    "        if (_lf_startup_reactions[i] != NULL) {",
-                    "            _lf_trigger_reaction(_lf_startup_reactions[i], -1);",
-                    "        }",
-                    "    }"
-                ));
-            }
-            s.append("\n");
-        }
-        s.append("}\n");
-        return s.toString();
+  public static String generateBuiltinTriggersTable(int reactionCount, String name) {
+    return String.join(
+        "\n",
+        List.of(
+            "// Array of pointers to " + name + " triggers.",
+            (reactionCount > 0
+                    ? "reaction_t* _lf_" + name + "_reactions[" + reactionCount + "]"
+                    : "reaction_t** _lf_" + name + "_reactions = NULL")
+                + ";",
+            "int _lf_" + name + "_reactions_size = " + reactionCount + ";"));
+  }
+
+  /** Generate the _lf_trigger_startup_reactions function. */
+  public static String generateLfTriggerStartupReactions(
+      int startupReactionCount, boolean hasModalReactors) {
+    var s = new StringBuilder();
+    s.append("void _lf_trigger_startup_reactions() {");
+    if (startupReactionCount > 0) {
+      s.append("\n");
+      if (hasModalReactors) {
+        s.append(
+            String.join(
+                "\n",
+                "    for (int i = 0; i < _lf_startup_reactions_size; i++) {",
+                "        if (_lf_startup_reactions[i] != NULL) {",
+                "            if (_lf_startup_reactions[i]->mode != NULL) {",
+                "                // Skip reactions in modes",
+                "                continue;",
+                "            }",
+                "            _lf_trigger_reaction(_lf_startup_reactions[i], -1);",
+                "        }",
+                "    }",
+                "    _lf_handle_mode_startup_reset_reactions(",
+                "        _lf_startup_reactions, _lf_startup_reactions_size,",
+                "        NULL, 0,",
+                "        _lf_modal_reactor_states, _lf_modal_reactor_states_size);"));
+      } else {
+        s.append(
+            String.join(
+                "\n",
+                "    for (int i = 0; i < _lf_startup_reactions_size; i++) {",
+                "        if (_lf_startup_reactions[i] != NULL) {",
+                "            _lf_trigger_reaction(_lf_startup_reactions[i], -1);",
+                "        }",
+                "    }"));
+      }
+      s.append("\n");
     }
+    s.append("}\n");
+    return s.toString();
+  }
 
-    /**
-     * Generate the _lf_trigger_shutdown_reactions function.
-     */
-    public static String generateLfTriggerShutdownReactions(int shutdownReactionCount, boolean hasModalReactors) {
-        var s = new StringBuilder();
-        s.append("bool _lf_trigger_shutdown_reactions() {\n");
-        if (shutdownReactionCount > 0) {
-            if (hasModalReactors) {
-                s.append(String.join("\n",
-                    "    for (int i = 0; i < _lf_shutdown_reactions_size; i++) {",
-                    "        if (_lf_shutdown_reactions[i] != NULL) {",
-                    "            if (_lf_shutdown_reactions[i]->mode != NULL) {",
-                    "                // Skip reactions in modes",
-                    "                continue;",
-                    "            }",
-                    "            _lf_trigger_reaction(_lf_shutdown_reactions[i], -1);",
-                    "        }",
-                    "    }",
-                    "    _lf_handle_mode_shutdown_reactions(_lf_shutdown_reactions, _lf_shutdown_reactions_size);",
-                    "    return true;"
-                ));
-            } else {
-                s.append(String.join("\n",
-                    "    for (int i = 0; i < _lf_shutdown_reactions_size; i++) {",
-                    "        if (_lf_shutdown_reactions[i] != NULL) {",
-                    "            _lf_trigger_reaction(_lf_shutdown_reactions[i], -1);",
-                    "        }",
-                    "    }",
-                    "    return true;"
-                ));
-            }
-            s.append("\n");
-        } else {
-            s.append("    return false;\n");
-        }
-        s.append("}\n");
-        return s.toString();
+  /** Generate the _lf_trigger_shutdown_reactions function. */
+  public static String generateLfTriggerShutdownReactions(
+      int shutdownReactionCount, boolean hasModalReactors) {
+    var s = new StringBuilder();
+    s.append("bool _lf_trigger_shutdown_reactions() {\n");
+    if (shutdownReactionCount > 0) {
+      if (hasModalReactors) {
+        s.append(
+            String.join(
+                "\n",
+                "    for (int i = 0; i < _lf_shutdown_reactions_size; i++) {",
+                "        if (_lf_shutdown_reactions[i] != NULL) {",
+                "            if (_lf_shutdown_reactions[i]->mode != NULL) {",
+                "                // Skip reactions in modes",
+                "                continue;",
+                "            }",
+                "            _lf_trigger_reaction(_lf_shutdown_reactions[i], -1);",
+                "        }",
+                "    }",
+                "    _lf_handle_mode_shutdown_reactions(_lf_shutdown_reactions,"
+                    + " _lf_shutdown_reactions_size);",
+                "    return true;"));
+      } else {
+        s.append(
+            String.join(
+                "\n",
+                "    for (int i = 0; i < _lf_shutdown_reactions_size; i++) {",
+                "        if (_lf_shutdown_reactions[i] != NULL) {",
+                "            _lf_trigger_reaction(_lf_shutdown_reactions[i], -1);",
+                "        }",
+                "    }",
+                "    return true;"));
+      }
+      s.append("\n");
+    } else {
+      s.append("    return false;\n");
     }
+    s.append("}\n");
+    return s.toString();
+  }
 
-    /**
-     * Generate the _lf_handle_mode_triggered_reactions function.
-     */
-    public static String generateLfModeTriggeredReactions(
-            int startupReactionCount,
-            int resetReactionCount,
-            boolean hasModalReactors
-    ) {
-        if (!hasModalReactors) {
-            return "";
-        }
-        var s = new StringBuilder();
-        s.append("void _lf_handle_mode_triggered_reactions() {\n");
-        s.append("    _lf_handle_mode_startup_reset_reactions(\n");
-        if (startupReactionCount > 0) {
-            s.append("        _lf_startup_reactions, _lf_startup_reactions_size,\n");
-        } else {
-            s.append("        NULL, 0,\n");
-        }
-        if (resetReactionCount > 0) {
-            s.append("        _lf_reset_reactions, _lf_reset_reactions_size,\n");
-        } else {
-            s.append("        NULL, 0,\n");
-        }
-        s.append("        _lf_modal_reactor_states, _lf_modal_reactor_states_size);\n");
-        s.append("}\n");
-        return s.toString();
+  /** Generate the _lf_handle_mode_triggered_reactions function. */
+  public static String generateLfModeTriggeredReactions(
+      int startupReactionCount, int resetReactionCount, boolean hasModalReactors) {
+    if (!hasModalReactors) {
+      return "";
+    }
+    var s = new StringBuilder();
+    s.append("void _lf_handle_mode_triggered_reactions() {\n");
+    s.append("    _lf_handle_mode_startup_reset_reactions(\n");
+    if (startupReactionCount > 0) {
+      s.append("        _lf_startup_reactions, _lf_startup_reactions_size,\n");
+    } else {
+      s.append("        NULL, 0,\n");
     }
+    if (resetReactionCount > 0) {
+      s.append("        _lf_reset_reactions, _lf_reset_reactions_size,\n");
+    } else {
+      s.append("        NULL, 0,\n");
+    }
+    s.append("        _lf_modal_reactor_states, _lf_modal_reactor_states_size);\n");
+    s.append("}\n");
+    return s.toString();
+  }
 
-    /** Generate a reaction function definition for a reactor.
-     *  This function will have a single argument that is a void* pointing to
-     *  a struct that contains parameters, state variables, inputs (triggering or not),
-     *  actions (triggering or produced), and outputs.
-     *  @param reaction The reaction.
-     *  @param tpr The reactor.
-     *  @param reactionIndex The position of the reaction within the reactor.
-     */
-    public static String generateReaction(
-        Reaction reaction,
-        TypeParameterizedReactor tpr,
-        int reactionIndex,
-        Instantiation mainDef,
-        ErrorReporter errorReporter,
-        CTypes types,
-        TargetConfig targetConfig,
-        boolean requiresType
-    ) {
-        var code = new CodeBuilder();
-        var body = ASTUtils.toText(getCode(types, reaction, tpr));
-        String init = generateInitializationForReaction(
-                        body, reaction, tpr, reactionIndex,
-                        types, errorReporter, mainDef,
-                        requiresType);
+  /**
+   * Generate a reaction function definition for a reactor. This function will have a single
+   * argument that is a void* pointing to a struct that contains parameters, state variables, inputs
+   * (triggering or not), actions (triggering or produced), and outputs.
+   *
+   * @param reaction The reaction.
+   * @param tpr The reactor.
+   * @param reactionIndex The position of the reaction within the reactor.
+   */
+  public static String generateReaction(
+      Reaction reaction,
+      TypeParameterizedReactor tpr,
+      int reactionIndex,
+      Instantiation mainDef,
+      ErrorReporter errorReporter,
+      CTypes types,
+      TargetConfig targetConfig,
+      boolean requiresType) {
+    var code = new CodeBuilder();
+    var body = ASTUtils.toText(getCode(types, reaction, tpr));
+    String init =
+        generateInitializationForReaction(
+            body, reaction, tpr, reactionIndex, types, errorReporter, mainDef, requiresType);
 
-        code.pr(
-            "#include " + StringUtil.addDoubleQuotes(
-                CCoreFilesUtils.getCTargetSetHeader()));
+    code.pr("#include " + StringUtil.addDoubleQuotes(CCoreFilesUtils.getCTargetSetHeader()));
 
-        CMethodGenerator.generateMacrosForMethods(tpr, code);
-        code.pr(generateFunction(
+    CMethodGenerator.generateMacrosForMethods(tpr, code);
+    code.pr(
+        generateFunction(
             generateReactionFunctionHeader(tpr, reactionIndex),
-            init, getCode(types, reaction, tpr)
-        ));
-        // Now generate code for the late function, if there is one
-        // Note that this function can only be defined on reactions
-        // in federates that have inputs from a logical connection.
-        if (reaction.getStp() != null) {
-            code.pr(generateFunction(
-                generateStpFunctionHeader(tpr, reactionIndex),
-                init, reaction.getStp().getCode()));
-        }
-
-        // Now generate code for the deadline violation function, if there is one.
-        if (reaction.getDeadline() != null) {
-            code.pr(generateFunction(
-                generateDeadlineFunctionHeader(tpr, reactionIndex),
-                init, reaction.getDeadline().getCode()));
-        }
-        CMethodGenerator.generateMacroUndefsForMethods(tpr.reactor(), code);
-        code.pr(
-            "#include " + StringUtil.addDoubleQuotes(
-                CCoreFilesUtils.getCTargetSetUndefHeader()));
-        return code.toString();
+            init,
+            getCode(types, reaction, tpr)));
+    // Now generate code for the late function, if there is one
+    // Note that this function can only be defined on reactions
+    // in federates that have inputs from a logical connection.
+    if (reaction.getStp() != null) {
+      code.pr(
+          generateFunction(
+              generateStpFunctionHeader(tpr, reactionIndex), init, reaction.getStp().getCode()));
     }
 
-    private static Code getCode(CTypes types, Reaction r, TypeParameterizedReactor tpr) {
-        if (r.getCode() != null) return r.getCode();
-        Code ret = LfFactory.eINSTANCE.createCode();
-        ret.setBody(
-            CReactorHeaderFileGenerator.nonInlineInitialization(r, tpr) + "\n"
-                + r.getName() + "( " + CReactorHeaderFileGenerator.reactionArguments(r, tpr) + " );");
-        return ret;
+    // Now generate code for the deadline violation function, if there is one.
+    if (reaction.getDeadline() != null) {
+      code.pr(
+          generateFunction(
+              generateDeadlineFunctionHeader(tpr, reactionIndex),
+              init,
+              reaction.getDeadline().getCode()));
     }
+    CMethodGenerator.generateMacroUndefsForMethods(tpr.reactor(), code);
+    code.pr("#include " + StringUtil.addDoubleQuotes(CCoreFilesUtils.getCTargetSetUndefHeader()));
+    return code.toString();
+  }
 
-    public static String generateFunction(String header, String init, Code code) {
-        var function = new CodeBuilder();
-        function.pr(header + " {");
-        function.indent();
-        function.pr(init);
-        function.prSourceLineNumber(code);
-        function.pr(ASTUtils.toText(code));
-        function.unindent();
-        function.pr("}");
-        return function.toString();
-    }
+  private static Code getCode(CTypes types, Reaction r, TypeParameterizedReactor tpr) {
+    if (r.getCode() != null) return r.getCode();
+    Code ret = LfFactory.eINSTANCE.createCode();
+    ret.setBody(
+        CReactorHeaderFileGenerator.nonInlineInitialization(r, tpr)
+            + "\n"
+            + r.getName()
+            + "( "
+            + CReactorHeaderFileGenerator.reactionArguments(r, tpr)
+            + " );");
+    return ret;
+  }
 
-    /**
-     * Returns the name of the deadline function for reaction.
-     * @param tpr The reactor with the deadline
-     * @param reactionIndex The number assigned to this reaction deadline
-     */
-    public static String generateDeadlineFunctionName(TypeParameterizedReactor tpr, int reactionIndex) {
-        return CUtil.getName(tpr).toLowerCase() + "_deadline_function" + reactionIndex;
-    }
+  public static String generateFunction(String header, String init, Code code) {
+    var function = new CodeBuilder();
+    function.pr(header + " {");
+    function.indent();
+    function.pr(init);
+    function.prSourceLineNumber(code);
+    function.pr(ASTUtils.toText(code));
+    function.unindent();
+    function.pr("}");
+    return function.toString();
+  }
 
-    /**
-     * Return the function name for specified reaction of the
-     * specified reactor.
-     * @param tpr The reactor
-     * @param reactionIndex The reaction index.
-     * @return The function name for the reaction.
-     */
-    public static String generateReactionFunctionName(TypeParameterizedReactor tpr, int reactionIndex) {
-        return CUtil.getName(tpr).toLowerCase() + "reaction_function_" + reactionIndex;
-    }
+  /**
+   * Returns the name of the deadline function for reaction.
+   *
+   * @param tpr The reactor with the deadline
+   * @param reactionIndex The number assigned to this reaction deadline
+   */
+  public static String generateDeadlineFunctionName(
+      TypeParameterizedReactor tpr, int reactionIndex) {
+    return CUtil.getName(tpr).toLowerCase() + "_deadline_function" + reactionIndex;
+  }
 
-    /**
-     * Returns the name of the stp function for reaction.
-     * @param tpr The reactor with the stp
-     * @param reactionIndex The number assigned to this reaction deadline
-     */
-    public static String generateStpFunctionName(TypeParameterizedReactor tpr, int reactionIndex) {
-        return CUtil.getName(tpr).toLowerCase() + "_STP_function" + reactionIndex;
-    }
+  /**
+   * Return the function name for specified reaction of the specified reactor.
+   *
+   * @param tpr The reactor
+   * @param reactionIndex The reaction index.
+   * @return The function name for the reaction.
+   */
+  public static String generateReactionFunctionName(
+      TypeParameterizedReactor tpr, int reactionIndex) {
+    return CUtil.getName(tpr).toLowerCase() + "reaction_function_" + reactionIndex;
+  }
 
-    /** Return the top level C function header for the deadline function numbered "reactionIndex" in "r"
-     *  @param tpr The reactor declaration
-     *  @param reactionIndex The reaction index.
-     *  @return The function name for the deadline function.
-     */
-    public static String generateDeadlineFunctionHeader(TypeParameterizedReactor tpr,
-                                                        int reactionIndex) {
-        String functionName = generateDeadlineFunctionName(tpr, reactionIndex);
-        return generateFunctionHeader(functionName);
-    }
+  /**
+   * Returns the name of the stp function for reaction.
+   *
+   * @param tpr The reactor with the stp
+   * @param reactionIndex The number assigned to this reaction deadline
+   */
+  public static String generateStpFunctionName(TypeParameterizedReactor tpr, int reactionIndex) {
+    return CUtil.getName(tpr).toLowerCase() + "_STP_function" + reactionIndex;
+  }
 
-    /** Return the top level C function header for the reaction numbered "reactionIndex" in "r"
-     *  @param tpr The reactor declaration
-     *  @param reactionIndex The reaction index.
-     *  @return The function name for the reaction.
-     */
-    public static String generateReactionFunctionHeader(TypeParameterizedReactor tpr,
-                                                        int reactionIndex) {
-        String functionName = generateReactionFunctionName(tpr, reactionIndex);
-        return generateFunctionHeader(functionName);
-    }
+  /**
+   * Return the top level C function header for the deadline function numbered "reactionIndex" in
+   * "r"
+   *
+   * @param tpr The reactor declaration
+   * @param reactionIndex The reaction index.
+   * @return The function name for the deadline function.
+   */
+  public static String generateDeadlineFunctionHeader(
+      TypeParameterizedReactor tpr, int reactionIndex) {
+    String functionName = generateDeadlineFunctionName(tpr, reactionIndex);
+    return generateFunctionHeader(functionName);
+  }
 
-    public static String generateStpFunctionHeader(TypeParameterizedReactor tpr,
-                                                   int reactionIndex) {
-        String functionName = generateStpFunctionName(tpr, reactionIndex);
-        return generateFunctionHeader(functionName);
-    }
+  /**
+   * Return the top level C function header for the reaction numbered "reactionIndex" in "r"
+   *
+   * @param tpr The reactor declaration
+   * @param reactionIndex The reaction index.
+   * @return The function name for the reaction.
+   */
+  public static String generateReactionFunctionHeader(
+      TypeParameterizedReactor tpr, int reactionIndex) {
+    String functionName = generateReactionFunctionName(tpr, reactionIndex);
+    return generateFunctionHeader(functionName);
+  }
 
-    /**
-     * Return the start of a function declaration for a function that takes
-     * a {@code void*} argument and returns void.
-     *
-     * @param functionName
-     * @return
-     */
-    public static String generateFunctionHeader(String functionName) {
-        return "void " + functionName + "(void* instance_args)";
-    }
+  public static String generateStpFunctionHeader(TypeParameterizedReactor tpr, int reactionIndex) {
+    String functionName = generateStpFunctionName(tpr, reactionIndex);
+    return generateFunctionHeader(functionName);
+  }
+
+  /**
+   * Return the start of a function declaration for a function that takes a {@code void*} argument
+   * and returns void.
+   *
+   * @param functionName
+   * @return
+   */
+  public static String generateFunctionHeader(String functionName) {
+    return "void " + functionName + "(void* instance_args)";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CReactorHeaderFileGenerator.java b/org.lflang/src/org/lflang/generator/c/CReactorHeaderFileGenerator.java
index 993168cad9..4f6a29b405 100644
--- a/org.lflang/src/org/lflang/generator/c/CReactorHeaderFileGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CReactorHeaderFileGenerator.java
@@ -6,7 +6,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.lf.Instantiation;
@@ -23,44 +22,61 @@
 /** Generate user-visible header files. */
 public class CReactorHeaderFileGenerator {
 
-    /** Functional interface for generating auxiliary structs such as port structs. */
-    public interface GenerateAuxiliaryStructs {
-        void generate(CodeBuilder b, TypeParameterizedReactor r, boolean userFacing);
-    }
-
-    /** Return the path to the user-visible header file that would be generated for {@code r}. */
-    public static Path outputPath(TypeParameterizedReactor tpr) {
-        return Path.of(Path.of(tpr.reactor().eResource().getURI().toFileString())
-                .getFileName().toString().replaceFirst("[.][^.]+$", ""))
-            .resolve(tpr.getName() + ".h");
-    }
-
-    public static void doGenerate(CTypes types, TypeParameterizedReactor tpr, CFileConfig fileConfig, GenerateAuxiliaryStructs generator, Function<Reactor, String> topLevelPreamble) throws IOException {
-        String contents = generateHeaderFile(types, tpr, generator, topLevelPreamble.apply(tpr.reactor()));
-        FileUtil.writeToFile(contents, fileConfig.getIncludePath().resolve(outputPath(tpr)));
-    }
-    private static String generateHeaderFile(CTypes types, TypeParameterizedReactor tpr, GenerateAuxiliaryStructs generator, String topLevelPreamble) {
-        CodeBuilder builder = new CodeBuilder();
-        appendIncludeGuard(builder, tpr);
-        builder.pr(topLevelPreamble);
-        appendPoundIncludes(builder);
-        tpr.doDefines(builder);
-        appendSelfStruct(builder, types, tpr);
-        generator.generate(builder, tpr, true);
-        for (Reaction reaction : tpr.reactor().getReactions()) {
-            appendSignature(builder, types, reaction, tpr);
-        }
-        builder.pr("#endif");
-        return builder.getCode();
-    }
-
-    private static void appendIncludeGuard(CodeBuilder builder, TypeParameterizedReactor r) {
-        String macro = CUtil.getName(r) + "_H";
-        builder.pr("#ifndef " + macro);
-        builder.pr("#define " + macro);
-    }
-    private static void appendPoundIncludes(CodeBuilder builder) {
-        builder.pr("""
+  /** Functional interface for generating auxiliary structs such as port structs. */
+  public interface GenerateAuxiliaryStructs {
+    void generate(CodeBuilder b, TypeParameterizedReactor r, boolean userFacing);
+  }
+
+  /** Return the path to the user-visible header file that would be generated for {@code r}. */
+  public static Path outputPath(TypeParameterizedReactor tpr) {
+    return Path.of(
+            Path.of(tpr.reactor().eResource().getURI().toFileString())
+                .getFileName()
+                .toString()
+                .replaceFirst("[.][^.]+$", ""))
+        .resolve(tpr.getName() + ".h");
+  }
+
+  public static void doGenerate(
+      CTypes types,
+      TypeParameterizedReactor tpr,
+      CFileConfig fileConfig,
+      GenerateAuxiliaryStructs generator,
+      Function<Reactor, String> topLevelPreamble)
+      throws IOException {
+    String contents =
+        generateHeaderFile(types, tpr, generator, topLevelPreamble.apply(tpr.reactor()));
+    FileUtil.writeToFile(contents, fileConfig.getIncludePath().resolve(outputPath(tpr)));
+  }
+
+  private static String generateHeaderFile(
+      CTypes types,
+      TypeParameterizedReactor tpr,
+      GenerateAuxiliaryStructs generator,
+      String topLevelPreamble) {
+    CodeBuilder builder = new CodeBuilder();
+    appendIncludeGuard(builder, tpr);
+    builder.pr(topLevelPreamble);
+    appendPoundIncludes(builder);
+    tpr.doDefines(builder);
+    appendSelfStruct(builder, types, tpr);
+    generator.generate(builder, tpr, true);
+    for (Reaction reaction : tpr.reactor().getReactions()) {
+      appendSignature(builder, types, reaction, tpr);
+    }
+    builder.pr("#endif");
+    return builder.getCode();
+  }
+
+  private static void appendIncludeGuard(CodeBuilder builder, TypeParameterizedReactor r) {
+    String macro = CUtil.getName(r) + "_H";
+    builder.pr("#ifndef " + macro);
+    builder.pr("#define " + macro);
+  }
+
+  private static void appendPoundIncludes(CodeBuilder builder) {
+    builder.pr(
+        """
             #ifdef __cplusplus
             extern "C" {
             #endif
@@ -71,135 +87,167 @@ private static void appendPoundIncludes(CodeBuilder builder) {
             }
             #endif
             """);
-    }
-
-    private static String userFacingSelfType(TypeParameterizedReactor tpr) {
-        return tpr.getName().toLowerCase() + "_self_t";
-    }
-
-    private static void appendSelfStruct(CodeBuilder builder, CTypes types, TypeParameterizedReactor tpr) {
-        builder.pr("typedef struct " + userFacingSelfType(tpr) + "{");
-        for (Parameter p : tpr.reactor().getParameters()) {
-            builder.pr(types.getTargetType(p) + " " + p.getName() + ";");
-        }
-        for (StateVar s : tpr.reactor().getStateVars()) {
-            builder.pr(types.getTargetType(s) + " " + s.getName() + ";");
-        }
-        builder.pr("int end[0]; // placeholder; MSVC does not compile empty structs");
-        builder.pr("} " + userFacingSelfType(tpr) + ";");
-    }
-
-    private static void appendSignature(CodeBuilder builder, CTypes types, Reaction r, TypeParameterizedReactor tpr) {
-        if (r.getName() != null) builder.pr("void " + r.getName() + "(" + reactionParameters(r, tpr) + ");");
-    }
-
-    private static String reactionParameters(Reaction r, TypeParameterizedReactor tpr) {
-        return Stream.concat(Stream.of(userFacingSelfType(tpr) + "* self"), portVariableStream(r, tpr)
-            .map(tv -> tv.getType(true) + tv.getName()))
-            .collect(Collectors.joining(", "));
-    }
-
-    private static String getApiSelfStruct(TypeParameterizedReactor tpr) {
-        return "(" + userFacingSelfType(tpr) + "*) (((char*) self) + sizeof(self_base_t))";
-    }
-
-    /** Generate initialization code that is needed if {@code r} is not inlined. */
-    public static String nonInlineInitialization(Reaction r, TypeParameterizedReactor reactor) {
-        var mainDef = LfFactory.eINSTANCE.createInstantiation();
-        mainDef.setName(reactor.getName());
-        mainDef.setReactorClass(ASTUtils.findMainReactor(reactor.reactor().eResource()));
-        return portVariableStream(r, reactor)
-            .map(it -> it.container == null ? "" : it.getWidth() == null ?
-                String.format("%s %s = (%s) %s;", it.getType(false), it.getAlias(), it.getType(false), it.getRvalue())
-                : String.format("""
+  }
+
+  private static String userFacingSelfType(TypeParameterizedReactor tpr) {
+    return tpr.getName().toLowerCase() + "_self_t";
+  }
+
+  private static void appendSelfStruct(
+      CodeBuilder builder, CTypes types, TypeParameterizedReactor tpr) {
+    builder.pr("typedef struct " + userFacingSelfType(tpr) + "{");
+    for (Parameter p : tpr.reactor().getParameters()) {
+      builder.pr(types.getTargetType(p) + " " + p.getName() + ";");
+    }
+    for (StateVar s : tpr.reactor().getStateVars()) {
+      builder.pr(types.getTargetType(s) + " " + s.getName() + ";");
+    }
+    builder.pr("int end[0]; // placeholder; MSVC does not compile empty structs");
+    builder.pr("} " + userFacingSelfType(tpr) + ";");
+  }
+
+  private static void appendSignature(
+      CodeBuilder builder, CTypes types, Reaction r, TypeParameterizedReactor tpr) {
+    if (r.getName() != null)
+      builder.pr("void " + r.getName() + "(" + reactionParameters(r, tpr) + ");");
+  }
+
+  private static String reactionParameters(Reaction r, TypeParameterizedReactor tpr) {
+    return Stream.concat(
+            Stream.of(userFacingSelfType(tpr) + "* self"),
+            portVariableStream(r, tpr).map(tv -> tv.getType(true) + tv.getName()))
+        .collect(Collectors.joining(", "));
+  }
+
+  private static String getApiSelfStruct(TypeParameterizedReactor tpr) {
+    return "(" + userFacingSelfType(tpr) + "*) (((char*) self) + sizeof(self_base_t))";
+  }
+
+  /** Generate initialization code that is needed if {@code r} is not inlined. */
+  public static String nonInlineInitialization(Reaction r, TypeParameterizedReactor reactor) {
+    var mainDef = LfFactory.eINSTANCE.createInstantiation();
+    mainDef.setName(reactor.getName());
+    mainDef.setReactorClass(ASTUtils.findMainReactor(reactor.reactor().eResource()));
+    return portVariableStream(r, reactor)
+        .map(
+            it ->
+                it.container == null
+                    ? ""
+                    : it.getWidth() == null
+                        ? String.format(
+                            "%s %s = (%s) %s;",
+                            it.getType(false), it.getAlias(), it.getType(false), it.getRvalue())
+                        : String.format(
+                            """
                     %s %s[%s];
                     for (int i = 0; i < %s; i++) {
                         %s[i] = (%s) self->_lf_%s[i].%s;
                     }
                     """,
-                    it.getType(true).replaceFirst("\\*", ""),
-                    it.getAlias(),
-                    CReactionGenerator.maxContainedReactorBankWidth(
-                        reactor.reactor().getInstantiations().stream()
-                            .filter(instantiation -> new TypeParameterizedReactor(instantiation).equals(it.r))
-                            .findAny().orElseThrow(),
-                        null, 0, mainDef),
-                    "self->_lf_"+it.container.getName()+"_width",
-                    it.getAlias(),
-                    it.getType(true).replaceFirst("\\*", ""),
-                    it.container.getName(),
-                    it.getName()))
-            .collect(Collectors.joining("\n"));
-    }
-
-    /** Return a string representation of the arguments passed to the function for {@code r}. */
-    public static String reactionArguments(Reaction r, TypeParameterizedReactor reactor) {
-        return Stream.concat(Stream.of(getApiSelfStruct(reactor)), portVariableStream(r, reactor)
+                            it.getType(true).replaceFirst("\\*", ""),
+                            it.getAlias(),
+                            CReactionGenerator.maxContainedReactorBankWidth(
+                                reactor.reactor().getInstantiations().stream()
+                                    .filter(
+                                        instantiation ->
+                                            new TypeParameterizedReactor(instantiation)
+                                                .equals(it.r))
+                                    .findAny()
+                                    .orElseThrow(),
+                                null,
+                                0,
+                                mainDef),
+                            "self->_lf_" + it.container.getName() + "_width",
+                            it.getAlias(),
+                            it.getType(true).replaceFirst("\\*", ""),
+                            it.container.getName(),
+                            it.getName()))
+        .collect(Collectors.joining("\n"));
+  }
+
+  /** Return a string representation of the arguments passed to the function for {@code r}. */
+  public static String reactionArguments(Reaction r, TypeParameterizedReactor reactor) {
+    return Stream.concat(
+            Stream.of(getApiSelfStruct(reactor)),
+            portVariableStream(r, reactor)
                 .map(it -> String.format("((%s) %s)", it.getType(true), it.getAlias())))
-            .collect(Collectors.joining(", "));
-    }
-
-    /** Return a stream of all ports referenced by the signature of {@code r}. */
-    private static Stream<PortVariable> portVariableStream(Reaction r, TypeParameterizedReactor reactorOfReaction) {
-        return varRefStream(r)
-            .map(it -> it.getVariable() instanceof TypedVariable tv ?
-                new PortVariable(
-                    tv,
-                    it.getContainer() != null ? new TypeParameterizedReactor(it.getContainer()) : reactorOfReaction,
-                    it.getContainer())
-                : null)
-            .filter(Objects::nonNull);
-    }
-
-    /**
-     * A variable that refers to a port.
-     * @param tv The variable of the variable reference.
-     * @param r The reactor in which the port is being used.
-     * @param container The {@code Instantiation} referenced in the obtaining of {@code tv}, if
-     * applicable; {@code null} otherwise.
-     */
-    private record PortVariable(TypedVariable tv, TypeParameterizedReactor r, Instantiation container) {
-        String getType(boolean userFacing) {
-            var typeName = container == null ?
-                CGenerator.variableStructType(tv, r, userFacing)
-                : CPortGenerator.localPortName(container.getReactorClass(), getName());
-            var isMultiport = ASTUtils.isMultiport(ASTUtils.allPorts(r.reactor()).stream()
-                    .filter(it -> it.getName().equals(tv.getName()))
-                    .findAny().orElseThrow());
-            return typeName + "*" + (getWidth() != null ? "*" : "") + (isMultiport ? "*" : "");
-        }
-        /** The name of the variable as it appears in the LF source. */
-        String getName() {
-            return tv.getName();
-        }
-        /** The alias of the variable that should be used in code generation. */
-        String getAlias() {
-            return getName();  // TODO: avoid naming conflicts
-        }
-        /** The width of the container, if applicable. */
-        String getWidth() {
-            return container == null || container.getWidthSpec() == null ? null : "self->_lf_"+r.getName()+"_width";
-        }
-        /** The representation of this port as used by the LF programmer. */
-        String getRvalue() {
-            return container == null ? getName() : container.getName() + "." + getName();
-        }
-    }
-
-    private static Stream<VarRef> inputVarRefStream(Reaction reaction) {
-        return varRefStream(Stream.concat(reaction.getTriggers().stream(), reaction.getSources().stream()));
-    }
-
-    private static Stream<VarRef> varRefStream(Stream<TriggerRef> toFilter) {
-        return toFilter.map(it -> it instanceof VarRef v ? v : null)
-            .filter(Objects::nonNull);
-    }
-
-    private static Stream<VarRef> outputVarRefStream(Reaction reaction) {
-        return reaction.getEffects().stream();
-    }
-
-    private static Stream<VarRef> varRefStream(Reaction reaction) {
-        return Stream.concat(inputVarRefStream(reaction), outputVarRefStream(reaction));
-    }
+        .collect(Collectors.joining(", "));
+  }
+
+  /** Return a stream of all ports referenced by the signature of {@code r}. */
+  private static Stream<PortVariable> portVariableStream(
+      Reaction r, TypeParameterizedReactor reactorOfReaction) {
+    return varRefStream(r)
+        .map(
+            it ->
+                it.getVariable() instanceof TypedVariable tv
+                    ? new PortVariable(
+                        tv,
+                        it.getContainer() != null
+                            ? new TypeParameterizedReactor(it.getContainer())
+                            : reactorOfReaction,
+                        it.getContainer())
+                    : null)
+        .filter(Objects::nonNull);
+  }
+
+  /**
+   * A variable that refers to a port.
+   *
+   * @param tv The variable of the variable reference.
+   * @param r The reactor in which the port is being used.
+   * @param container The {@code Instantiation} referenced in the obtaining of {@code tv}, if
+   *     applicable; {@code null} otherwise.
+   */
+  private record PortVariable(
+      TypedVariable tv, TypeParameterizedReactor r, Instantiation container) {
+    String getType(boolean userFacing) {
+      var typeName =
+          container == null
+              ? CGenerator.variableStructType(tv, r, userFacing)
+              : CPortGenerator.localPortName(container.getReactorClass(), getName());
+      var isMultiport =
+          ASTUtils.isMultiport(
+              ASTUtils.allPorts(r.reactor()).stream()
+                  .filter(it -> it.getName().equals(tv.getName()))
+                  .findAny()
+                  .orElseThrow());
+      return typeName + "*" + (getWidth() != null ? "*" : "") + (isMultiport ? "*" : "");
+    }
+    /** The name of the variable as it appears in the LF source. */
+    String getName() {
+      return tv.getName();
+    }
+    /** The alias of the variable that should be used in code generation. */
+    String getAlias() {
+      return getName(); // TODO: avoid naming conflicts
+    }
+    /** The width of the container, if applicable. */
+    String getWidth() {
+      return container == null || container.getWidthSpec() == null
+          ? null
+          : "self->_lf_" + r.getName() + "_width";
+    }
+    /** The representation of this port as used by the LF programmer. */
+    String getRvalue() {
+      return container == null ? getName() : container.getName() + "." + getName();
+    }
+  }
+
+  private static Stream<VarRef> inputVarRefStream(Reaction reaction) {
+    return varRefStream(
+        Stream.concat(reaction.getTriggers().stream(), reaction.getSources().stream()));
+  }
+
+  private static Stream<VarRef> varRefStream(Stream<TriggerRef> toFilter) {
+    return toFilter.map(it -> it instanceof VarRef v ? v : null).filter(Objects::nonNull);
+  }
+
+  private static Stream<VarRef> outputVarRefStream(Reaction reaction) {
+    return reaction.getEffects().stream();
+  }
+
+  private static Stream<VarRef> varRefStream(Reaction reaction) {
+    return Stream.concat(inputVarRefStream(reaction), outputVarRefStream(reaction));
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CStateGenerator.java b/org.lflang/src/org/lflang/generator/c/CStateGenerator.java
index f43d975632..69e41d1008 100644
--- a/org.lflang/src/org/lflang/generator/c/CStateGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CStateGenerator.java
@@ -7,121 +7,116 @@
 import org.lflang.lf.StateVar;
 
 public class CStateGenerator {
-    /**
-     * Generate code for state variables of a reactor in the form "stateVar.type stateVar.name;"
-     * @param reactor {@link TypeParameterizedReactor}
-     * @param types A helper object for types
-     */
-    public static String generateDeclarations(TypeParameterizedReactor reactor, CTypes types) {
-        CodeBuilder code = new CodeBuilder();
-        for (StateVar stateVar : ASTUtils.allStateVars(reactor.reactor())) {
-            code.prSourceLineNumber(stateVar);
-            code.pr(types.getTargetType(reactor.resolveType(ASTUtils.getInferredType(stateVar))) + " " + stateVar.getName() + ";");
-        }
-        return code.toString();
+  /**
+   * Generate code for state variables of a reactor in the form "stateVar.type stateVar.name;"
+   *
+   * @param reactor {@link TypeParameterizedReactor}
+   * @param types A helper object for types
+   */
+  public static String generateDeclarations(TypeParameterizedReactor reactor, CTypes types) {
+    CodeBuilder code = new CodeBuilder();
+    for (StateVar stateVar : ASTUtils.allStateVars(reactor.reactor())) {
+      code.prSourceLineNumber(stateVar);
+      code.pr(
+          types.getTargetType(reactor.resolveType(ASTUtils.getInferredType(stateVar)))
+              + " "
+              + stateVar.getName()
+              + ";");
     }
+    return code.toString();
+  }
 
-    /**
-     * If the state is initialized with a parameter, then do not use
-     * a temporary variable. Otherwise, do, because
-     * static initializers for arrays and structs have to be handled
-     * this way, and there is no way to tell whether the type of the array
-     * is a struct.
-     *
-     * @param instance {@link ReactorInstance}
-     * @param stateVar {@link StateVar}
-     * @param mode {@link ModeInstance}
-     * @return String
-     */
-    public static String generateInitializer(
-        ReactorInstance instance,
-        String selfRef,
-        StateVar stateVar,
-        ModeInstance mode,
-        CTypes types
-    ) {
-        var initExpr = getInitializerExpr(stateVar, instance);
-        String baseInitializer = generateBaseInitializer(instance.tpr, selfRef, stateVar, initExpr, types);
-        String modalReset = generateModalReset(instance, selfRef, stateVar, initExpr, mode, types);
-        return String.join("\n",
-            baseInitializer,
-            modalReset
-        );
-    }
+  /**
+   * If the state is initialized with a parameter, then do not use a temporary variable. Otherwise,
+   * do, because static initializers for arrays and structs have to be handled this way, and there
+   * is no way to tell whether the type of the array is a struct.
+   *
+   * @param instance {@link ReactorInstance}
+   * @param stateVar {@link StateVar}
+   * @param mode {@link ModeInstance}
+   * @return String
+   */
+  public static String generateInitializer(
+      ReactorInstance instance,
+      String selfRef,
+      StateVar stateVar,
+      ModeInstance mode,
+      CTypes types) {
+    var initExpr = getInitializerExpr(stateVar, instance);
+    String baseInitializer =
+        generateBaseInitializer(instance.tpr, selfRef, stateVar, initExpr, types);
+    String modalReset = generateModalReset(instance, selfRef, stateVar, initExpr, mode, types);
+    return String.join("\n", baseInitializer, modalReset);
+  }
 
-    private static String generateBaseInitializer(
-        TypeParameterizedReactor tpr,
-        String selfRef,
-        StateVar stateVar,
-        String initExpr,
-        CTypes types
-    ) {
-        if (ASTUtils.isOfTimeType(stateVar) ||
-            ASTUtils.isParameterized(stateVar) &&
-            !stateVar.getInit().getExprs().isEmpty()
-        ) {
-            return selfRef + "->" + stateVar.getName() + " = " + initExpr + ";";
-        } else {
-            var declaration = types.getVariableDeclaration(tpr,
-                ASTUtils.getInferredType(stateVar),
-                "_initial", true);
-            return String.join("\n",
-                "{ // For scoping",
-                "    static "+declaration+" = "+initExpr+";",
-                "    "+selfRef+"->"+stateVar.getName()+" = _initial;",
-                "} // End scoping."
-            );
-        }
+  private static String generateBaseInitializer(
+      TypeParameterizedReactor tpr,
+      String selfRef,
+      StateVar stateVar,
+      String initExpr,
+      CTypes types) {
+    if (ASTUtils.isOfTimeType(stateVar)
+        || ASTUtils.isParameterized(stateVar) && !stateVar.getInit().getExprs().isEmpty()) {
+      return selfRef + "->" + stateVar.getName() + " = " + initExpr + ";";
+    } else {
+      var declaration =
+          types.getVariableDeclaration(tpr, ASTUtils.getInferredType(stateVar), "_initial", true);
+      return String.join(
+          "\n",
+          "{ // For scoping",
+          "    static " + declaration + " = " + initExpr + ";",
+          "    " + selfRef + "->" + stateVar.getName() + " = _initial;",
+          "} // End scoping.");
     }
+  }
 
-    private static String generateModalReset(
-        ReactorInstance instance,
-        String selfRef,
-        StateVar stateVar,
-        String initExpr,
-        ModeInstance mode,
-        CTypes types
-    ) {
-        if (mode == null || !stateVar.isReset()) {
-            return "";
-        }
-        var modeRef = "&"+CUtil.reactorRef(mode.getParent())+"->_lf__modes["+mode.getParent().modes.indexOf(mode)+"]";
-        var type = types.getTargetType(instance.tpr.resolveType(ASTUtils.getInferredType(stateVar)));
-
-        if (ASTUtils.isOfTimeType(stateVar) ||
-            ASTUtils.isParameterized(stateVar) &&
-            !stateVar.getInit().getExprs().isEmpty()) {
-            return CModesGenerator.generateStateResetStructure(
-                modeRef, selfRef,
-                stateVar.getName(),
-                initExpr, type);
-        } else {
-            CodeBuilder code = new CodeBuilder();
-            var source = "_initial";
-            var declaration = types.getVariableDeclaration(instance.tpr,
-                ASTUtils.getInferredType(stateVar),
-                source, true);
-            code.pr("{ // For scoping");
-            code.indent();
-            code.pr("static "+declaration+" = "+initExpr+";");
-            code.pr(CModesGenerator.generateStateResetStructure(
-                modeRef, selfRef,
-                stateVar.getName(),
-                source, type));
-            code.unindent();
-            code.pr("} // End scoping.");
-            return code.toString();
-        }
+  private static String generateModalReset(
+      ReactorInstance instance,
+      String selfRef,
+      StateVar stateVar,
+      String initExpr,
+      ModeInstance mode,
+      CTypes types) {
+    if (mode == null || !stateVar.isReset()) {
+      return "";
     }
+    var modeRef =
+        "&"
+            + CUtil.reactorRef(mode.getParent())
+            + "->_lf__modes["
+            + mode.getParent().modes.indexOf(mode)
+            + "]";
+    var type = types.getTargetType(instance.tpr.resolveType(ASTUtils.getInferredType(stateVar)));
 
-    /**
-     * Return a C expression that can be used to initialize the specified
-     * state variable within the specified parent. If the state variable
-     * initializer refers to parameters of the parent, then those parameter
-     * references are replaced with accesses to the self struct of the parent.
-     */
-    private static String getInitializerExpr(StateVar state, ReactorInstance parent) {
-        var ctypes = CTypes.generateParametersIn(parent);
-        return ctypes.getTargetInitializer(state.getInit(), state.getType());
+    if (ASTUtils.isOfTimeType(stateVar)
+        || ASTUtils.isParameterized(stateVar) && !stateVar.getInit().getExprs().isEmpty()) {
+      return CModesGenerator.generateStateResetStructure(
+          modeRef, selfRef, stateVar.getName(), initExpr, type);
+    } else {
+      CodeBuilder code = new CodeBuilder();
+      var source = "_initial";
+      var declaration =
+          types.getVariableDeclaration(
+              instance.tpr, ASTUtils.getInferredType(stateVar), source, true);
+      code.pr("{ // For scoping");
+      code.indent();
+      code.pr("static " + declaration + " = " + initExpr + ";");
+      code.pr(
+          CModesGenerator.generateStateResetStructure(
+              modeRef, selfRef, stateVar.getName(), source, type));
+      code.unindent();
+      code.pr("} // End scoping.");
+      return code.toString();
     }
+  }
+
+  /**
+   * Return a C expression that can be used to initialize the specified state variable within the
+   * specified parent. If the state variable initializer refers to parameters of the parent, then
+   * those parameter references are replaced with accesses to the self struct of the parent.
+   */
+  private static String getInitializerExpr(StateVar state, ReactorInstance parent) {
+    var ctypes = CTypes.generateParametersIn(parent);
+    return ctypes.getTargetInitializer(state.getInit(), state.getType());
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java b/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
index 57e7556dfe..f0c55389f6 100644
--- a/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTimerGenerator.java
@@ -1,7 +1,6 @@
 package org.lflang.generator.c;
 
 import java.util.List;
-
 import org.lflang.generator.TimerInstance;
 
 /**
@@ -11,61 +10,71 @@
  * @author {Soroush Bateni
  */
 public class CTimerGenerator {
-    /**
-     * Generate code to initialize the given timer.
-     *
-     * @param timer The timer to initialize for.
-     */
-    public static String generateInitializer(TimerInstance timer) {
-        var triggerStructName = CUtil.reactorRef(timer.getParent()) + "->_lf__"  + timer.getName();
-        var offset = CTypes.getInstance().getTargetTimeExpr(timer.getOffset());
-        var period = CTypes.getInstance().getTargetTimeExpr(timer.getPeriod());
-        var mode = timer.getMode(false);
-        var modeRef = mode != null ?
-            "&"+CUtil.reactorRef(mode.getParent())+"->_lf__modes["+mode.getParent().modes.indexOf(mode)+"];" :
-            "NULL";
+  /**
+   * Generate code to initialize the given timer.
+   *
+   * @param timer The timer to initialize for.
+   */
+  public static String generateInitializer(TimerInstance timer) {
+    var triggerStructName = CUtil.reactorRef(timer.getParent()) + "->_lf__" + timer.getName();
+    var offset = CTypes.getInstance().getTargetTimeExpr(timer.getOffset());
+    var period = CTypes.getInstance().getTargetTimeExpr(timer.getPeriod());
+    var mode = timer.getMode(false);
+    var modeRef =
+        mode != null
+            ? "&"
+                + CUtil.reactorRef(mode.getParent())
+                + "->_lf__modes["
+                + mode.getParent().modes.indexOf(mode)
+                + "];"
+            : "NULL";
 
-        return String.join("\n", List.of(
-            "// Initializing timer "+timer.getFullName()+".",
-            triggerStructName+".offset = "+offset+";",
-            triggerStructName+".period = "+period+";",
-            "_lf_timer_triggers[_lf_timer_triggers_count++] = &"+triggerStructName+";",
-            triggerStructName+".mode = "+modeRef+";"
-        ));
-    }
+    return String.join(
+        "\n",
+        List.of(
+            "// Initializing timer " + timer.getFullName() + ".",
+            triggerStructName + ".offset = " + offset + ";",
+            triggerStructName + ".period = " + period + ";",
+            "_lf_timer_triggers[_lf_timer_triggers_count++] = &" + triggerStructName + ";",
+            triggerStructName + ".mode = " + modeRef + ";"));
+  }
 
-    /**
-     * Generate code to declare the timer table.
-     *
-     * @param timerCount The total number of timers in the program
-     */
-    public static String generateDeclarations(int timerCount) {
-        return String.join("\n", List.of(
-                    "// Array of pointers to timer triggers to be scheduled in _lf_initialize_timers().",
-                    (timerCount > 0 ?
-                    "trigger_t* _lf_timer_triggers["+timerCount+"]" :
-                    "trigger_t** _lf_timer_triggers = NULL") + ";",
-                    "int _lf_timer_triggers_size = "+timerCount+";"
-                ));
-    }
+  /**
+   * Generate code to declare the timer table.
+   *
+   * @param timerCount The total number of timers in the program
+   */
+  public static String generateDeclarations(int timerCount) {
+    return String.join(
+        "\n",
+        List.of(
+            "// Array of pointers to timer triggers to be scheduled in _lf_initialize_timers().",
+            (timerCount > 0
+                    ? "trigger_t* _lf_timer_triggers[" + timerCount + "]"
+                    : "trigger_t** _lf_timer_triggers = NULL")
+                + ";",
+            "int _lf_timer_triggers_size = " + timerCount + ";"));
+  }
 
-    /**
-     * Generate code to call {@code _lf_initialize_timer} on each timer.
-     *
-     * @param timerCount The total number of timers in the program
-     */
-    public static String generateLfInitializeTimer(int timerCount) {
-        return String.join("\n",
-            "void _lf_initialize_timers() {",
-            timerCount > 0 ?
-            """
+  /**
+   * Generate code to call {@code _lf_initialize_timer} on each timer.
+   *
+   * @param timerCount The total number of timers in the program
+   */
+  public static String generateLfInitializeTimer(int timerCount) {
+    return String.join(
+        "\n",
+        "void _lf_initialize_timers() {",
+        timerCount > 0
+            ? """
                 for (int i = 0; i < _lf_timer_triggers_size; i++) {
                     if (_lf_timer_triggers[i] != NULL) {
                         _lf_initialize_timer(_lf_timer_triggers[i]);
                     }
-                }""".indent(4).stripTrailing() :
-            "",
-            "}"
-        );
-    }
+                }"""
+                .indent(4)
+                .stripTrailing()
+            : "",
+        "}");
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CTracingGenerator.java b/org.lflang/src/org/lflang/generator/c/CTracingGenerator.java
index f999d14b3e..8439d562b0 100644
--- a/org.lflang/src/org/lflang/generator/c/CTracingGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTracingGenerator.java
@@ -1,13 +1,12 @@
 package org.lflang.generator.c;
 
+import static org.lflang.util.StringUtil.addDoubleQuotes;
+
 import java.util.ArrayList;
 import java.util.List;
-
-import org.lflang.federated.generator.FederateInstance;
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.generator.TimerInstance;
-import static org.lflang.util.StringUtil.addDoubleQuotes;
 
 /**
  * Generates C code to support tracing.
@@ -17,47 +16,54 @@
  * @author Hou Seng Wong
  */
 public class CTracingGenerator {
-    /**
-     * If tracing is turned on, then generate code that records
-     * the full name of the specified reactor instance in the
-     * trace table. If tracing is not turned on, do nothing.
-     *
-     * If tracing is turned on, record the address of this reaction
-     * in the _lf_trace_object_descriptions table that is used to generate
-     * the header information in the trace file.
-     *
-     * @param instance The reactor instance.
-     */
-    public static String generateTraceTableEntries(
-        ReactorInstance instance
-    ) {
-        List<String> code = new ArrayList<>();
-        var description = CUtil.getShortenedName(instance);
-        var selfStruct = CUtil.reactorRef(instance);
-        code.add(registerTraceEvent(
-            selfStruct, "NULL",
-            "trace_reactor", description)
-        );
-        for (ActionInstance action : instance.actions) {
-            code.add(registerTraceEvent(
-                selfStruct, getTrigger(selfStruct, action.getName()),
-                "trace_trigger", description + "." + action.getName())
-            );
-        }
-        for (TimerInstance timer : instance.timers) {
-            code.add(registerTraceEvent(
-                selfStruct, getTrigger(selfStruct, timer.getName()),
-                "trace_trigger", description + "." + timer.getName())
-            );
-        }
-        return String.join("\n", code);
+  /**
+   * If tracing is turned on, then generate code that records the full name of the specified reactor
+   * instance in the trace table. If tracing is not turned on, do nothing.
+   *
+   * <p>If tracing is turned on, record the address of this reaction in the
+   * _lf_trace_object_descriptions table that is used to generate the header information in the
+   * trace file.
+   *
+   * @param instance The reactor instance.
+   */
+  public static String generateTraceTableEntries(ReactorInstance instance) {
+    List<String> code = new ArrayList<>();
+    var description = CUtil.getShortenedName(instance);
+    var selfStruct = CUtil.reactorRef(instance);
+    code.add(registerTraceEvent(selfStruct, "NULL", "trace_reactor", description));
+    for (ActionInstance action : instance.actions) {
+      code.add(
+          registerTraceEvent(
+              selfStruct,
+              getTrigger(selfStruct, action.getName()),
+              "trace_trigger",
+              description + "." + action.getName()));
     }
-
-    private static String registerTraceEvent(String obj, String trigger, String type, String description) {
-        return "_lf_register_trace_event("+obj+", "+trigger+", "+type+", "+addDoubleQuotes(description)+");";
+    for (TimerInstance timer : instance.timers) {
+      code.add(
+          registerTraceEvent(
+              selfStruct,
+              getTrigger(selfStruct, timer.getName()),
+              "trace_trigger",
+              description + "." + timer.getName()));
     }
+    return String.join("\n", code);
+  }
 
-    private static String getTrigger(String obj, String triggerName) {
-        return "&("+obj+"->_lf__"+triggerName+")";
-    }
+  private static String registerTraceEvent(
+      String obj, String trigger, String type, String description) {
+    return "_lf_register_trace_event("
+        + obj
+        + ", "
+        + trigger
+        + ", "
+        + type
+        + ", "
+        + addDoubleQuotes(description)
+        + ");";
+  }
+
+  private static String getTrigger(String obj, String triggerName) {
+    return "&(" + obj + "->_lf__" + triggerName + ")";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 99df04e9d3..5f4d8d60ef 100644
--- a/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -1,4 +1,5 @@
 package org.lflang.generator.c;
+
 import static org.lflang.generator.c.CMixedRadixGenerator.db;
 import static org.lflang.generator.c.CMixedRadixGenerator.dc;
 import static org.lflang.generator.c.CMixedRadixGenerator.dr;
@@ -8,15 +9,14 @@
 import static org.lflang.util.StringUtil.addDoubleQuotes;
 import static org.lflang.util.StringUtil.joinObjects;
 
+import com.google.common.collect.Iterables;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.stream.Collectors;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.AttributeUtils;
 import org.lflang.TargetConfig;
-
 import org.lflang.TargetProperty.LogLevel;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.extensions.CExtensionUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.PortInstance;
@@ -25,8 +25,6 @@
 import org.lflang.generator.RuntimeRange;
 import org.lflang.generator.SendRange;
 
-import com.google.common.collect.Iterables;
-
 /**
  * Generate code for the "_lf_initialize_trigger_objects" function
  *
@@ -35,1027 +33,1088 @@
  * @author Hou Seng Wong
  */
 public class CTriggerObjectsGenerator {
-    /**
-     * Generate the _lf_initialize_trigger_objects function for 'federate'.
-     */
-    public static String generateInitializeTriggerObjects(
-        ReactorInstance main,
-        TargetConfig targetConfig,
-        CodeBuilder initializeTriggerObjects,
-        CodeBuilder startTimeStep,
-        CTypes types,
-        String lfModuleName,
-        int startTimeStepIsPresentCount
-    ) {
-        var code = new CodeBuilder();
-        code.pr("void _lf_initialize_trigger_objects() {");
-        code.indent();
-        // Initialize the LF clock.
-        code.pr(String.join("\n",
-            "// Initialize the _lf_clock",
-            "lf_initialize_clock();"
-        ));
-
-        // Initialize tracing if it is enabled
-        if (targetConfig.tracing != null) {
-            var traceFileName = lfModuleName;
-            if (targetConfig.tracing.traceFileName != null) {
-                traceFileName = targetConfig.tracing.traceFileName;
-            }
-            code.pr(String.join("\n",
-                "// Initialize tracing",
-                "start_trace("+ addDoubleQuotes(traceFileName + ".lft") + ");"
-            )); // .lft is for Lingua Franca trace
-        }
+  /** Generate the _lf_initialize_trigger_objects function for 'federate'. */
+  public static String generateInitializeTriggerObjects(
+      ReactorInstance main,
+      TargetConfig targetConfig,
+      CodeBuilder initializeTriggerObjects,
+      CodeBuilder startTimeStep,
+      CTypes types,
+      String lfModuleName,
+      int startTimeStepIsPresentCount) {
+    var code = new CodeBuilder();
+    code.pr("void _lf_initialize_trigger_objects() {");
+    code.indent();
+    // Initialize the LF clock.
+    code.pr(String.join("\n", "// Initialize the _lf_clock", "lf_initialize_clock();"));
+
+    // Initialize tracing if it is enabled
+    if (targetConfig.tracing != null) {
+      var traceFileName = lfModuleName;
+      if (targetConfig.tracing.traceFileName != null) {
+        traceFileName = targetConfig.tracing.traceFileName;
+      }
+      code.pr(
+          String.join(
+              "\n",
+              "// Initialize tracing",
+              "start_trace("
+                  + addDoubleQuotes(traceFileName + ".lft")
+                  + ");")); // .lft is for Lingua Franca trace
+    }
 
-        // Create the table to initialize is_present fields to false between time steps.
-        if (startTimeStepIsPresentCount > 0) {
-            // Allocate the initial (before mutations) array of pointers to _is_present fields.
-            code.pr(String.join("\n",
-                "// Create the array that will contain pointers to is_present fields to reset on each step.",
-                "_lf_is_present_fields_size = "+startTimeStepIsPresentCount+";",
-                "_lf_is_present_fields = (bool**)calloc("+startTimeStepIsPresentCount+", sizeof(bool*));",
-                "if (_lf_is_present_fields == NULL) lf_print_error_and_exit(" + addDoubleQuotes("Out of memory!") + ");",
-                "_lf_is_present_fields_abbreviated = (bool**)calloc("+startTimeStepIsPresentCount+", sizeof(bool*));",
-                "if (_lf_is_present_fields_abbreviated == NULL) lf_print_error_and_exit(" + addDoubleQuotes("Out of memory!") + ");",
-                "_lf_is_present_fields_abbreviated_size = 0;"
-            ));
-        }
+    // Create the table to initialize is_present fields to false between time steps.
+    if (startTimeStepIsPresentCount > 0) {
+      // Allocate the initial (before mutations) array of pointers to _is_present fields.
+      code.pr(
+          String.join(
+              "\n",
+              "// Create the array that will contain pointers to is_present fields to reset on each"
+                  + " step.",
+              "_lf_is_present_fields_size = " + startTimeStepIsPresentCount + ";",
+              "_lf_is_present_fields = (bool**)calloc("
+                  + startTimeStepIsPresentCount
+                  + ", sizeof(bool*));",
+              "if (_lf_is_present_fields == NULL) lf_print_error_and_exit("
+                  + addDoubleQuotes("Out of memory!")
+                  + ");",
+              "_lf_is_present_fields_abbreviated = (bool**)calloc("
+                  + startTimeStepIsPresentCount
+                  + ", sizeof(bool*));",
+              "if (_lf_is_present_fields_abbreviated == NULL) lf_print_error_and_exit("
+                  + addDoubleQuotes("Out of memory!")
+                  + ");",
+              "_lf_is_present_fields_abbreviated_size = 0;"));
+    }
 
-        // Create the table to initialize intended tag fields to 0 between time
-        // steps.
-        if (startTimeStepIsPresentCount > 0) {
-            // Allocate the initial (before mutations) array of pointers to
-            // intended_tag fields.
-            // There is a 1-1 map between structs containing is_present and
-            // intended_tag fields,
-            // thus, we reuse startTimeStepIsPresentCount as the counter.
-            code.pr(String.join("\n",
-                                CExtensionUtils.surroundWithIfFederatedDecentralized("""
+    // Create the table to initialize intended tag fields to 0 between time
+    // steps.
+    if (startTimeStepIsPresentCount > 0) {
+      // Allocate the initial (before mutations) array of pointers to
+      // intended_tag fields.
+      // There is a 1-1 map between structs containing is_present and
+      // intended_tag fields,
+      // thus, we reuse startTimeStepIsPresentCount as the counter.
+      code.pr(
+          String.join(
+              "\n",
+              CExtensionUtils.surroundWithIfFederatedDecentralized(
+                  """
                                 // Create the array that will contain pointers to intended_tag fields to reset on each step.
                                 _lf_intended_tag_fields_size = %s;
                                 _lf_intended_tag_fields = (tag_t**)malloc(_lf_intended_tag_fields_size * sizeof(tag_t*));
-                                """.formatted(startTimeStepIsPresentCount)
-                                )
-            ));
-        }
-
+                                """
+                      .formatted(startTimeStepIsPresentCount))));
+    }
 
-        code.pr(initializeTriggerObjects.toString());
-
-        code.pr(deferredInitialize(
-            main,
-            main.reactions,
-            targetConfig,
-            types
-        ));
-        code.pr(deferredInitializeNonNested(
-            main,
-            main,
-            main.reactions,
-            types
-        ));
-        // Next, for every input port, populate its "self" struct
-        // fields with pointers to the output port that sends it data.
-        code.pr(deferredConnectInputsToOutputs(
-            main
-        ));
-        // Put the code here to set up the tables that drive resetting is_present and
-        // decrementing reference counts between time steps. This code has to appear
-        // in _lf_initialize_trigger_objects() after the code that makes connections
-        // between inputs and outputs.
-        code.pr(startTimeStep.toString());
-        code.pr(setReactionPriorities(
-            main
-        ));
-        code.pr(generateSchedulerInitializer(
-            main,
-            targetConfig
-        ));
-
-        code.pr("""
+    code.pr(initializeTriggerObjects.toString());
+
+    code.pr(deferredInitialize(main, main.reactions, targetConfig, types));
+    code.pr(deferredInitializeNonNested(main, main, main.reactions, types));
+    // Next, for every input port, populate its "self" struct
+    // fields with pointers to the output port that sends it data.
+    code.pr(deferredConnectInputsToOutputs(main));
+    // Put the code here to set up the tables that drive resetting is_present and
+    // decrementing reference counts between time steps. This code has to appear
+    // in _lf_initialize_trigger_objects() after the code that makes connections
+    // between inputs and outputs.
+    code.pr(startTimeStep.toString());
+    code.pr(setReactionPriorities(main));
+    code.pr(generateSchedulerInitializer(main, targetConfig));
+
+    code.pr(
+        """
         #ifdef EXECUTABLE_PREAMBLE
         _lf_executable_preamble();
         #endif
         """);
 
-        // Initialize triggers for federated execution.
-        code.pr(CExtensionUtils.surroundWithIfFederated("initialize_triggers_for_federate();"));
+    // Initialize triggers for federated execution.
+    code.pr(CExtensionUtils.surroundWithIfFederated("initialize_triggers_for_federate();"));
 
-        code.unindent();
-        code.pr("}\n");
-        return code.toString();
-    }
+    code.unindent();
+    code.pr("}\n");
+    return code.toString();
+  }
 
-    /**
-    * Generate code to initialize the scheduler for the threaded C runtime.
-    */
-    public static String generateSchedulerInitializer(
-        ReactorInstance main,
-        TargetConfig targetConfig
-    ) {
-        if (!targetConfig.threading) {
-            return "";
-        }
-        var code = new CodeBuilder();
-        var numReactionsPerLevel = main.assignLevels().getNumReactionsPerLevel();
-        var numReactionsPerLevelJoined = Arrays.stream(numReactionsPerLevel)
-                .map(String::valueOf)
-                .collect(Collectors.joining(", "));
-        code.pr(String.join("\n",
+  /** Generate code to initialize the scheduler for the threaded C runtime. */
+  public static String generateSchedulerInitializer(
+      ReactorInstance main, TargetConfig targetConfig) {
+    if (!targetConfig.threading) {
+      return "";
+    }
+    var code = new CodeBuilder();
+    var numReactionsPerLevel = main.assignLevels().getNumReactionsPerLevel();
+    var numReactionsPerLevelJoined =
+        Arrays.stream(numReactionsPerLevel).map(String::valueOf).collect(Collectors.joining(", "));
+    code.pr(
+        String.join(
+            "\n",
             "// Initialize the scheduler",
-            "size_t num_reactions_per_level["+numReactionsPerLevel.length+"] = ",
+            "size_t num_reactions_per_level[" + numReactionsPerLevel.length + "] = ",
             "    {" + numReactionsPerLevelJoined + "};",
             "sched_params_t sched_params = (sched_params_t) {",
             "                        .num_reactions_per_level = &num_reactions_per_level[0],",
-            "                        .num_reactions_per_level_size = (size_t) "+numReactionsPerLevel.length+"};",
+            "                        .num_reactions_per_level_size = (size_t) "
+                + numReactionsPerLevel.length
+                + "};",
             "lf_sched_init(",
             "    (size_t)_lf_number_of_workers,",
             "    &sched_params",
-            ");"
-        ));
-        return code.toString();
+            ");"));
+    return code.toString();
+  }
+
+  /**
+   * Set the reaction priorities based on dependency analysis.
+   *
+   * @param reactor The reactor on which to do this.
+   */
+  private static String setReactionPriorities(ReactorInstance reactor) {
+    var code = new CodeBuilder();
+    setReactionPriorities(reactor, code);
+    return code.toString();
+  }
+
+  /**
+   * Set the reaction priorities based on dependency analysis.
+   *
+   * @param reactor The reactor on which to do this.
+   * @param builder Where to write the code.
+   */
+  private static boolean setReactionPriorities(ReactorInstance reactor, CodeBuilder builder) {
+    var foundOne = false;
+    // Force calculation of levels if it has not been done.
+    // FIXME: Comment out this as I think it is redundant.
+    //  If it is NOT redundant then deadline propagation is not correct
+    // reactor.assignLevels();
+
+    // We handle four different scenarios
+    //  1) A reactionInstance has 1 level and 1 deadline
+    //  2) A reactionInstance has 1 level but multiple deadlines
+    //  3) A reaction instance has multiple levels but all have the same deadline
+    //  4) Multiple deadlines and levels
+
+    var prolog = new CodeBuilder();
+    var epilog = new CodeBuilder();
+
+    for (ReactionInstance r : reactor.reactions) {
+      var levelSet = r.getLevels();
+      var deadlineSet = r.getInferredDeadlines();
+
+      if (levelSet.size() > 1 || deadlineSet.size() > 1) {
+        // Scenario 2-4
+        if (prolog.length() == 0) {
+          prolog.startScopedBlock();
+          epilog.endScopedBlock();
+        }
+      }
+      if (deadlineSet.size() > 1) {
+        // Scenario (2) or (4)
+        var deadlines =
+            r.getInferredDeadlinesList().stream()
+                .map(elt -> ("0x" + Long.toString(elt.toNanoSeconds(), 16) + "LL"))
+                .collect(Collectors.toList());
+
+        prolog.pr(
+            "interval_t "
+                + r.uniqueID()
+                + "_inferred_deadlines[] = { "
+                + joinObjects(deadlines, ", ")
+                + " };");
+      }
+
+      if (levelSet.size() > 1) {
+        // Scenario (3) or (4)
+        // Cannot use the above set of levels because it is a set, not a list.
+        prolog.pr(
+            "int "
+                + r.uniqueID()
+                + "_levels[] = { "
+                + joinObjects(r.getLevelsList(), ", ")
+                + " };");
+      }
     }
 
-    /**
-     * Set the reaction priorities based on dependency analysis.
-     *
-     * @param reactor The reactor on which to do this.
-     */
-    private static String setReactionPriorities(
-        ReactorInstance reactor
-    ) {
-        var code = new CodeBuilder();
-        setReactionPriorities(reactor, code);
-        return code.toString();
+    var temp = new CodeBuilder();
+    temp.pr("// Set reaction priorities for " + reactor);
+    temp.startScopedBlock(reactor);
+    for (ReactionInstance r : reactor.reactions) {
+      // if (currentFederate.contains(r.getDefinition())) {
+      foundOne = true;
+      var levelSet = r.getLevels();
+      var deadlineSet = r.getInferredDeadlines();
+
+      // Get the head of the associated lists. To avoid duplication in
+      //  several of the following cases
+      var level = r.getLevelsList().get(0);
+      var inferredDeadline = r.getInferredDeadlinesList().get(0);
+      var runtimeIdx = CUtil.runtimeIndex(r.getParent());
+
+      if (levelSet.size() == 1 && deadlineSet.size() == 1) {
+        // Scenario (1)
+
+        var indexValue = inferredDeadline.toNanoSeconds() << 16 | level;
+
+        var reactionIndex = "0x" + Long.toUnsignedString(indexValue, 16) + "LL";
+
+        temp.pr(
+            String.join(
+                "\n",
+                CUtil.reactionRef(r) + ".chain_id = " + r.chainID + ";",
+                "// index is the OR of level " + level + " and ",
+                "// deadline " + inferredDeadline.toNanoSeconds() + " shifted left 16 bits.",
+                CUtil.reactionRef(r) + ".index = " + reactionIndex + ";"));
+      } else if (levelSet.size() == 1 && deadlineSet.size() > 1) {
+        // Scenario 2
+        temp.pr(
+            String.join(
+                "\n",
+                CUtil.reactionRef(r) + ".chain_id = " + r.chainID + ";",
+                "// index is the OR of levels[" + runtimeIdx + "] and ",
+                "// deadlines[" + runtimeIdx + "] shifted left 16 bits.",
+                CUtil.reactionRef(r)
+                    + ".index = ("
+                    + r.uniqueID()
+                    + "_inferred_deadlines["
+                    + runtimeIdx
+                    + "] << 16) | "
+                    + level
+                    + ";"));
+
+      } else if (levelSet.size() > 1 && deadlineSet.size() == 1) {
+        // Scenarion (3)
+        temp.pr(
+            String.join(
+                "\n",
+                CUtil.reactionRef(r) + ".chain_id = " + r.chainID + ";",
+                "// index is the OR of levels[" + runtimeIdx + "] and ",
+                "// deadlines[" + runtimeIdx + "] shifted left 16 bits.",
+                CUtil.reactionRef(r)
+                    + ".index = ("
+                    + inferredDeadline.toNanoSeconds()
+                    + " << 16) | "
+                    + r.uniqueID()
+                    + "_levels["
+                    + runtimeIdx
+                    + "];"));
+
+      } else if (levelSet.size() > 1 && deadlineSet.size() > 1) {
+        // Scenario (4)
+        temp.pr(
+            String.join(
+                "\n",
+                CUtil.reactionRef(r) + ".chain_id = " + r.chainID + ";",
+                "// index is the OR of levels[" + runtimeIdx + "] and ",
+                "// deadlines[" + runtimeIdx + "] shifted left 16 bits.",
+                CUtil.reactionRef(r)
+                    + ".index = ("
+                    + r.uniqueID()
+                    + "_inferred_deadlines["
+                    + runtimeIdx
+                    + "] << 16) | "
+                    + r.uniqueID()
+                    + "_levels["
+                    + runtimeIdx
+                    + "];"));
+      }
     }
-
-    /**
-     * Set the reaction priorities based on dependency analysis.
-     *
-     * @param reactor The reactor on which to do this.
-     * @param builder Where to write the code.
-     */
-    private static boolean setReactionPriorities(
-        ReactorInstance reactor,
-        CodeBuilder builder
-    ) {
-        var foundOne = false;
-        // Force calculation of levels if it has not been done.
-        // FIXME: Comment out this as I think it is redundant.
-        //  If it is NOT redundant then deadline propagation is not correct
-        // reactor.assignLevels();
-
-        // We handle four different scenarios
-        //  1) A reactionInstance has 1 level and 1 deadline
-        //  2) A reactionInstance has 1 level but multiple deadlines
-        //  3) A reaction instance has multiple levels but all have the same deadline
-        //  4) Multiple deadlines and levels
-
-        var prolog = new CodeBuilder();
-        var epilog = new CodeBuilder();
-
-        for (ReactionInstance r : reactor.reactions) {
-            var levelSet = r.getLevels();
-            var deadlineSet = r.getInferredDeadlines();
-
-            if (levelSet.size() > 1 || deadlineSet.size() > 1) {
-                // Scenario 2-4
-                if (prolog.length() == 0) {
-                    prolog.startScopedBlock();
-                    epilog.endScopedBlock();
-                }
-            }
-            if (deadlineSet.size() > 1) {
-                // Scenario (2) or (4)
-                var deadlines = r.getInferredDeadlinesList().stream()
-                                 .map(elt -> ("0x" + Long.toString(elt.toNanoSeconds(), 16) + "LL"))
-                                 .collect(Collectors.toList());
-
-                prolog.pr("interval_t "+r.uniqueID()+"_inferred_deadlines[] = { "+joinObjects(deadlines, ", ")+" };");
-            }
-
-            if (levelSet.size() > 1) {
-                // Scenario (3) or (4)
-                // Cannot use the above set of levels because it is a set, not a list.
-                prolog.pr("int "+r.uniqueID()+"_levels[] = { "+joinObjects(r.getLevelsList(), ", ")+" };");
-            }
-        }
-
-
-        var temp = new CodeBuilder();
-        temp.pr("// Set reaction priorities for " + reactor);
-        temp.startScopedBlock(reactor);
-        for (ReactionInstance r : reactor.reactions) {
-            //if (currentFederate.contains(r.getDefinition())) {
-            foundOne = true;
-            var levelSet = r.getLevels();
-            var deadlineSet = r.getInferredDeadlines();
-
-            // Get the head of the associated lists. To avoid duplication in
-            //  several of the following cases
-            var level = r.getLevelsList().get(0);
-            var inferredDeadline = r.getInferredDeadlinesList().get(0);
-            var runtimeIdx =CUtil.runtimeIndex(r.getParent());
-
-            if (levelSet.size() == 1 && deadlineSet.size() == 1) {
-                // Scenario (1)
-
-                var indexValue = inferredDeadline.toNanoSeconds() << 16 | level;
-
-                var reactionIndex = "0x" + Long.toUnsignedString(indexValue, 16) + "LL";
-
-                temp.pr(String.join("\n",
-                    CUtil.reactionRef(r)+".chain_id = "+r.chainID+";",
-                    "// index is the OR of level "+level+" and ",
-                    "// deadline "+ inferredDeadline.toNanoSeconds()+" shifted left 16 bits.",
-                    CUtil.reactionRef(r)+".index = "+reactionIndex+";"
-                ));
-            } else if (levelSet.size() == 1 && deadlineSet.size() > 1) {
-                // Scenario 2
-                temp.pr(String.join("\n",
-                    CUtil.reactionRef(r)+".chain_id = "+r.chainID+";",
-                    "// index is the OR of levels["+runtimeIdx+"] and ",
-                    "// deadlines["+runtimeIdx+"] shifted left 16 bits.",
-                    CUtil.reactionRef(r)+".index = ("+r.uniqueID()+"_inferred_deadlines["+runtimeIdx+"] << 16) | " +
-                        level+";"
-                ));
-
-            } else if (levelSet.size() > 1 && deadlineSet.size() == 1) {
-                // Scenarion (3)
-                temp.pr(String.join("\n",
-                    CUtil.reactionRef(r)+".chain_id = "+r.chainID+";",
-                    "// index is the OR of levels["+runtimeIdx+"] and ",
-                    "// deadlines["+runtimeIdx+"] shifted left 16 bits.",
-                    CUtil.reactionRef(r)+".index = ("+inferredDeadline.toNanoSeconds()+" << 16) | " +
-                        r.uniqueID()+"_levels["+runtimeIdx+"];"
-                ));
-
-            } else if (levelSet.size() > 1 && deadlineSet.size() > 1) {
-                // Scenario (4)
-                temp.pr(String.join("\n",
-                    CUtil.reactionRef(r)+".chain_id = "+r.chainID+";",
-                    "// index is the OR of levels["+runtimeIdx+"] and ",
-                    "// deadlines["+runtimeIdx+"] shifted left 16 bits.",
-                    CUtil.reactionRef(r)+".index = ("+r.uniqueID()+"_inferred_deadlines["+runtimeIdx+"] << 16) | " +
-                        r.uniqueID()+"_levels["+runtimeIdx+"];"
-                ));
-            }
-
-        }
-        for (ReactorInstance child : reactor.children) {
-            foundOne = setReactionPriorities(child, temp) || foundOne;
-        }
-        temp.endScopedBlock();
-
-        if (foundOne) {
-            builder.pr(prolog.toString());
-            builder.pr(temp.toString());
-            builder.pr(epilog.toString());
-        }
-        return foundOne;
+    for (ReactorInstance child : reactor.children) {
+      foundOne = setReactionPriorities(child, temp) || foundOne;
     }
+    temp.endScopedBlock();
 
-    /**
-     * Generate assignments of pointers in the "self" struct of a destination
-     * port's reactor to the appropriate entries in the "self" struct of the
-     * source reactor. This has to be done after all reactors have been created
-     * because inputs point to outputs that are arbitrarily far away.
-     * @param instance The reactor instance.
-     */
-    private static String deferredConnectInputsToOutputs(
-        ReactorInstance instance
-    ) {
-        var code = new CodeBuilder();
-        code.pr("// Connect inputs and outputs for reactor "+instance.getFullName()+".");
-        // Iterate over all ports of this reactor that depend on reactions.
-        for (PortInstance input : instance.inputs) {
-            if (!input.getDependsOnReactions().isEmpty()) {
-                // Input is written to by reactions in the parent of the port's parent.
-                code.pr(connectPortToEventualDestinations(input));
-            }
-        }
-        for (PortInstance output : instance.outputs) {
-            if (!output.getDependsOnReactions().isEmpty()) {
-                // Output is written to by reactions in the port's parent.
-                code.pr(connectPortToEventualDestinations(output));
-            }
-        }
-        for (ReactorInstance child: instance.children) {
-            code.pr(deferredConnectInputsToOutputs(child));
-        }
-        return code.toString();
+    if (foundOne) {
+      builder.pr(prolog.toString());
+      builder.pr(temp.toString());
+      builder.pr(epilog.toString());
     }
-
-    /**
-     * Generate assignments of pointers in the "self" struct of a destination
-     * port's reactor to the appropriate entries in the "self" struct of the
-     * source reactor. If this port is an input, then it is being written
-     * to by a reaction belonging to the parent of the port's parent.
-     * If it is an output, then it is being written to by a reaction belonging
-     * to the port's parent.
-     * @param src A port that is written to by reactions.
-     */
-    private static String connectPortToEventualDestinations(
-        PortInstance src
-    ) {
-        var code = new CodeBuilder();
-        for (SendRange srcRange: src.eventualDestinations()) {
-            for (RuntimeRange<PortInstance> dstRange : srcRange.destinations) {
-                var dst = dstRange.instance;
-                var destStructType = CGenerator.variableStructType(dst);
-
-                // NOTE: For federated execution, dst.getParent() should always be contained
-                // by the currentFederate because an AST transformation removes connections
-                // between ports of distinct federates. So the following check is not
-                // really necessary.
-                var mod = (dst.isMultiport() || (src.isInput() && src.isMultiport()))? "" : "&";
-                code.pr("// Connect "+srcRange+" to port "+dstRange);
-                code.startScopedRangeBlock(srcRange, dstRange);
-                if (src.isInput()) {
-                    // Source port is written to by reaction in port's parent's parent
-                    // and ultimate destination is further downstream.
-                    code.pr(CUtil.portRef(dst, dr, db, dc)+" = ("+destStructType+"*)"+mod+CUtil.portRefNested(src, sr, sb, sc)+";");
-                } else if (dst.isOutput()) {
-                    // An output port of a contained reactor is triggering a reaction.
-                    code.pr(CUtil.portRefNested(dst, dr, db, dc)+" = ("+destStructType+"*)&"+CUtil.portRef(src, sr, sb, sc)+";");
-                } else {
-                    // An output port is triggering an input port.
-                    code.pr(CUtil.portRef(dst, dr, db, dc)+" = ("+destStructType+"*)&"+CUtil.portRef(src, sr, sb, sc)+";");
-                    if (AttributeUtils.isSparse(dst.getDefinition())) {
-                        code.pr(CUtil.portRef(dst, dr, db, dc)+"->sparse_record = "+CUtil.portRefName(dst, dr, db, dc)+"__sparse;");
-                        code.pr(CUtil.portRef(dst, dr, db, dc)+"->destination_channel = "+dc+";");
-                    }
-                }
-                code.endScopedRangeBlock(srcRange, dstRange);
-            }
-        }
-        return code.toString();
+    return foundOne;
+  }
+
+  /**
+   * Generate assignments of pointers in the "self" struct of a destination port's reactor to the
+   * appropriate entries in the "self" struct of the source reactor. This has to be done after all
+   * reactors have been created because inputs point to outputs that are arbitrarily far away.
+   *
+   * @param instance The reactor instance.
+   */
+  private static String deferredConnectInputsToOutputs(ReactorInstance instance) {
+    var code = new CodeBuilder();
+    code.pr("// Connect inputs and outputs for reactor " + instance.getFullName() + ".");
+    // Iterate over all ports of this reactor that depend on reactions.
+    for (PortInstance input : instance.inputs) {
+      if (!input.getDependsOnReactions().isEmpty()) {
+        // Input is written to by reactions in the parent of the port's parent.
+        code.pr(connectPortToEventualDestinations(input));
+      }
     }
-
-    /**
-     * For each reaction of the specified reactor,
-     * set the last_enabling_reaction field of the reaction struct to point
-     * to the single dominating upstream reaction if there is one, or to be
-     * NULL if there is none.
-     *
-     * @param r The reactor.
-     */
-    private static String deferredOptimizeForSingleDominatingReaction(
-        ReactorInstance r
-    ) {
-        var code = new CodeBuilder();
-        for (ReactionInstance reaction : r.reactions) {
-                // The following code attempts to gather into a loop assignments of successive
-                // bank members relations between reactions to avoid large chunks of inline code
-                // when a large bank sends to a large bank or when a large bank receives from
-                // one reaction that is either multicasting or sending through a multiport.
-                var start = 0;
-                var end = 0;
-                var domStart = 0;
-                var same = false; // Set to true when finding a string of identical dominating reactions.
-                ReactionInstance.Runtime previousRuntime = null;
-                var first = true;  //First time through the loop.
-                for (ReactionInstance.Runtime runtime : reaction.getRuntimeInstances()) {
-                    if (!first) { // Not the first time through the loop.
-                        if (same) { // Previously seen at least two identical dominating.
-                            if (runtime.dominating != previousRuntime.dominating) {
-                                // End of streak of same dominating reaction runtime instance.
-                                code.pr(printOptimizeForSingleDominatingReaction(
-                                    previousRuntime, start, end, domStart, same
-                                ));
-                                same = false;
-                                start = runtime.id;
-                                domStart = (runtime.dominating != null) ? runtime.dominating.id : 0;
-                            }
-                        } else if (runtime.dominating == previousRuntime.dominating) {
-                            // Start of a streak of identical dominating reaction runtime instances.
-                            same = true;
-                        } else if (runtime.dominating != null && previousRuntime.dominating != null
-                            && runtime.dominating.getReaction() == previousRuntime.dominating.getReaction()
-                        ) {
-                            // Same dominating reaction even if not the same dominating runtime.
-                            if (runtime.dominating.id != previousRuntime.dominating.id + 1) {
-                                // End of a streak of contiguous runtimes.
-                                printOptimizeForSingleDominatingReaction(
-                                    previousRuntime, start, end, domStart, same
-                                );
-                                same = false;
-                                start = runtime.id;
-                                domStart = runtime.dominating.id;
-                            }
-                        } else {
-                            // Different dominating reaction.
-                            printOptimizeForSingleDominatingReaction(
-                                previousRuntime, start, end, domStart, same
-                            );
-                            same = false;
-                            start = runtime.id;
-                            domStart = (runtime.dominating != null) ? runtime.dominating.id : 0;
-                        }
-                    }
-                    first = false;
-                    previousRuntime = runtime;
-                    end++;
-                }
-                if (end > start) {
-                    printOptimizeForSingleDominatingReaction(
-                        previousRuntime, start, end, domStart, same
-                    );
-                }
-        }
-        return code.toString();
+    for (PortInstance output : instance.outputs) {
+      if (!output.getDependsOnReactions().isEmpty()) {
+        // Output is written to by reactions in the port's parent.
+        code.pr(connectPortToEventualDestinations(output));
+      }
     }
-
-    /**
-     * Print statement that sets the last_enabling_reaction field of a reaction.
-     */
-    private static String printOptimizeForSingleDominatingReaction(
-        ReactionInstance.Runtime runtime,
-        int start,
-        int end,
-        int domStart,
-        boolean same
-    ) {
-        var code = new CodeBuilder();
-        var dominatingRef = "NULL";
-
-        if (end > start + 1) {
-            code.startScopedBlock();
-            var reactionRef = CUtil.reactionRef(runtime.getReaction(), "i");
-            if (runtime.dominating != null) {
-                if (same) {
-                    dominatingRef =  "&(" + CUtil.reactionRef(runtime.dominating.getReaction(), "" + domStart) + ")";
-                } else {
-                    dominatingRef =  "&(" + CUtil.reactionRef(runtime.dominating.getReaction(), "j++") + ")";
-                }
-            }
-            code.pr(String.join("\n",
-                "// "+runtime.getReaction().getFullName()+" dominating upstream reaction.",
-                "int j = "+domStart+";",
-                "for (int i = "+start+"; i < "+end+"; i++) {",
-                "    "+reactionRef+".last_enabling_reaction = "+dominatingRef+";",
-                "}"
-            ));
-           code.endScopedBlock();
-        } else if (end == start + 1) {
-            var reactionRef = CUtil.reactionRef(runtime.getReaction(), "" + start);
-            if (runtime.dominating != null) {
-                dominatingRef =  "&(" + CUtil.reactionRef(runtime.dominating.getReaction(), "" + domStart) + ")";
-            }
-            code.pr(String.join("\n",
-                "// "+runtime.getReaction().getFullName()+" dominating upstream reaction.",
-                reactionRef+".last_enabling_reaction = "+dominatingRef+";"
-            ));
-        }
-        return code.toString();
+    for (ReactorInstance child : instance.children) {
+      code.pr(deferredConnectInputsToOutputs(child));
     }
-
-    /**
-     * For the specified reaction, for ports that it writes to,
-     * fill the trigger table for triggering downstream reactions.
-     *
-     * @param reactions The reactions.
-     */
-    private static String deferredFillTriggerTable(
-        Iterable<ReactionInstance> reactions
-    ) {
-        var code = new CodeBuilder();
-        for (ReactionInstance reaction : reactions) {
-            var name = reaction.getParent().getFullName();
-
-            var reactorSelfStruct = CUtil.reactorRef(reaction.getParent(), sr);
-
-            var foundPort = false;
-
-            for (PortInstance port : Iterables.filter(reaction.effects, PortInstance.class)) {
-                if (!foundPort) {
-                    // Need a separate index for the triggers array for each bank member.
-                    code.startScopedBlock();
-                    code.pr("int triggers_index["+reaction.getParent().getTotalWidth()+"] = { 0 }; // Number of bank members with the reaction.");
-                    foundPort = true;
-                }
-                // If the port is a multiport, then its channels may have different sets
-                // of destinations. For ordinary ports, there will be only one range and
-                // its width will be 1.
-                // We generate the code to fill the triggers array first in a temporary code buffer,
-                // so that we can simultaneously calculate the size of the total array.
-                for (SendRange srcRange : port.eventualDestinations()) {
-                    var srcNested = port.isInput();
-                    code.startScopedRangeBlock(srcRange, sr, sb, sc, srcNested);
-
-                    var triggerArray = CUtil.reactionRef(reaction, sr)+".triggers[triggers_index["+sr+"]++]";
-                    // Skip ports whose parent is not in the federation.
-                    // This can happen with reactions in the top-level that have
-                    // as an effect a port in a bank.
-                    code.pr(String.join("\n",
-                        "// Reaction "+reaction.index+" of "+name+" triggers "+srcRange.destinations.size()+" downstream reactions",
-                        "// through port "+port.getFullName()+".",
-                        CUtil.reactionRef(reaction, sr)+".triggered_sizes[triggers_index["+sr+"]] = "+srcRange.destinations.size()+";",
-                        "// For reaction "+reaction.index+" of "+name+", allocate an",
-                        "// array of trigger pointers for downstream reactions through port "+port.getFullName(),
-                        "trigger_t** trigger_array = (trigger_t**)_lf_allocate(",
-                        "        "+srcRange.destinations.size()+", sizeof(trigger_t*),",
-                        "        &"+reactorSelfStruct+"->base.allocations); ",
-                        triggerArray+" = trigger_array;"
-                    ));
-                    code.endScopedRangeBlock(srcRange);
-                }
-            }
-            var cumulativePortWidth = 0;
-            for (PortInstance port : Iterables.filter(reaction.effects, PortInstance.class)) {
-                // If this port does not have any destinations, do not generate code for it.
-                if (port.eventualDestinations().isEmpty()) continue;
-
-                code.pr("for (int i = 0; i < "+reaction.getParent().getTotalWidth()+"; i++) triggers_index[i] = "+cumulativePortWidth+";");
-                for (SendRange srcRange : port.eventualDestinations()) {
-                    var srcNested = srcRange.instance.isInput();
-                    var multicastCount = 0;
-                    for (RuntimeRange<PortInstance> dstRange : srcRange.destinations) {
-                        var dst = dstRange.instance;
-
-                        code.startScopedRangeBlock(srcRange, dstRange);
-
-                        // If the source is nested, need to take into account the parent's bank index
-                        // when indexing into the triggers array.
-                        var triggerArray = "";
-                        if (srcNested && port.getParent().getWidth() > 1) {
-                            triggerArray = CUtil.reactionRef(reaction, sr)+".triggers[triggers_index["+sr+"] + "+sc+" + src_range_mr.digits[1] * src_range_mr.radixes[0]]";
-                        } else {
-                            triggerArray = CUtil.reactionRef(reaction, sr)+".triggers[triggers_index["+sr+"] + "+sc+"]";
-                        }
-
-                        if (dst.isOutput()) {
-                            // Include this destination port only if it has at least one
-                            // reaction in the federation.
-                            var belongs = false;
-                            for (ReactionInstance destinationReaction : dst.getDependentReactions()) {
-                                belongs = true;
-                            }
-                            if (belongs) {
-                                code.pr(String.join("\n",
-                                    "// Port "+port.getFullName()+" has reactions in its parent's parent.",
-                                    "// Point to the trigger struct for those reactions.",
-                                    triggerArray+"["+multicastCount+"] = &"+CUtil.triggerRefNested(dst, dr, db)+";"
-                                ));
-                            } else {
-                                // Put in a NULL pointer.
-                                code.pr(String.join("\n",
-                                    "// Port "+port.getFullName()+" has reactions in its parent's parent.",
-                                    "// But those are not in the federation.",
-                                    triggerArray+"["+multicastCount+"] = NULL;"
-                                ));
-                            }
-                        } else {
-                            // Destination is an input port.
-                            code.pr(String.join("\n",
-                                "// Point to destination port "+dst.getFullName()+"'s trigger struct.",
-                                triggerArray+"["+multicastCount+"] = &"+CUtil.triggerRef(dst, dr)+";"
-                            ));
-                        }
-                        code.endScopedRangeBlock(srcRange, dstRange);
-                        multicastCount++;
-                    }
-                }
-                // If the port is an input of a contained reactor, then we have to take
-                // into account the bank width of the contained reactor.
-                if (port.getParent() != reaction.getParent()) {
-                    cumulativePortWidth += port.getWidth() * port.getParent().getWidth();
-                } else {
-                    cumulativePortWidth += port.getWidth();
-                }
-            }
-            if (foundPort) code.endScopedBlock();
+    return code.toString();
+  }
+
+  /**
+   * Generate assignments of pointers in the "self" struct of a destination port's reactor to the
+   * appropriate entries in the "self" struct of the source reactor. If this port is an input, then
+   * it is being written to by a reaction belonging to the parent of the port's parent. If it is an
+   * output, then it is being written to by a reaction belonging to the port's parent.
+   *
+   * @param src A port that is written to by reactions.
+   */
+  private static String connectPortToEventualDestinations(PortInstance src) {
+    var code = new CodeBuilder();
+    for (SendRange srcRange : src.eventualDestinations()) {
+      for (RuntimeRange<PortInstance> dstRange : srcRange.destinations) {
+        var dst = dstRange.instance;
+        var destStructType = CGenerator.variableStructType(dst);
+
+        // NOTE: For federated execution, dst.getParent() should always be contained
+        // by the currentFederate because an AST transformation removes connections
+        // between ports of distinct federates. So the following check is not
+        // really necessary.
+        var mod = (dst.isMultiport() || (src.isInput() && src.isMultiport())) ? "" : "&";
+        code.pr("// Connect " + srcRange + " to port " + dstRange);
+        code.startScopedRangeBlock(srcRange, dstRange);
+        if (src.isInput()) {
+          // Source port is written to by reaction in port's parent's parent
+          // and ultimate destination is further downstream.
+          code.pr(
+              CUtil.portRef(dst, dr, db, dc)
+                  + " = ("
+                  + destStructType
+                  + "*)"
+                  + mod
+                  + CUtil.portRefNested(src, sr, sb, sc)
+                  + ";");
+        } else if (dst.isOutput()) {
+          // An output port of a contained reactor is triggering a reaction.
+          code.pr(
+              CUtil.portRefNested(dst, dr, db, dc)
+                  + " = ("
+                  + destStructType
+                  + "*)&"
+                  + CUtil.portRef(src, sr, sb, sc)
+                  + ";");
+        } else {
+          // An output port is triggering an input port.
+          code.pr(
+              CUtil.portRef(dst, dr, db, dc)
+                  + " = ("
+                  + destStructType
+                  + "*)&"
+                  + CUtil.portRef(src, sr, sb, sc)
+                  + ";");
+          if (AttributeUtils.isSparse(dst.getDefinition())) {
+            code.pr(
+                CUtil.portRef(dst, dr, db, dc)
+                    + "->sparse_record = "
+                    + CUtil.portRefName(dst, dr, db, dc)
+                    + "__sparse;");
+            code.pr(CUtil.portRef(dst, dr, db, dc) + "->destination_channel = " + dc + ";");
+          }
         }
-        return code.toString();
+        code.endScopedRangeBlock(srcRange, dstRange);
+      }
     }
-
-    /**
-     * For each input port of a contained reactor that receives data
-     * from one or more of the specified reactions, set the num_destinations
-     * field of the corresponding port structs on the self struct of
-     * the reaction's parent reactor equal to the total number of
-     * destination reactors.
-     * If the port has a token type, this also initializes it with a token.
-     * @param reactions The reactions.
-     * @param types The C types.
-     */
-    private static String deferredInputNumDestinations(
-        Iterable<ReactionInstance> reactions,
-        CTypes types
-    ) {
-        // We need the number of destination _reactors_, not the
-        // number of destination ports nor the number of destination reactions.
-        // One of the destination reactors may be the container of this
-        // instance because it may have a reaction to an output of this instance.
-        // Since a port may be written to by multiple reactions,
-        // ensure that this is done only once.
-        var portsHandled = new HashSet<PortInstance>();
-        var code = new CodeBuilder();
-        for (ReactionInstance reaction : reactions) {
-            for (PortInstance port : Iterables.filter(reaction.effects, PortInstance.class)) {
-                if (port.isInput() && !portsHandled.contains(port)) {
-                    // Port is an input of a contained reactor that gets data from a reaction of this reactor.
-                    portsHandled.add(port);
-                    code.pr("// Set number of destination reactors for port "+port.getParent().getName()+"."+port.getName()+".");
-                    // The input port may itself have multiple destinations.
-                    for (SendRange sendingRange : port.eventualDestinations()) {
-                        code.startScopedRangeBlock(sendingRange, sr, sb, sc, sendingRange.instance.isInput());
-                        // Syntax is slightly different for a multiport output vs. single port.
-                        var connector = (port.isMultiport())? "->" : ".";
-                        code.pr(CUtil.portRefNested(port, sr, sb, sc)+connector+"num_destinations = "+sendingRange.getNumberOfDestinationReactors()+";");
-
-                        // Initialize token types.
-                        var type = ASTUtils.getInferredType(port.getDefinition());
-                        if (CUtil.isTokenType(type, types)) {
-                            // Create the template token that goes in the port struct.
-                            var rootType = CUtil.rootType(types.getTargetType(type));
-                            // If the rootType is 'void', we need to avoid generating the code
-                            // 'sizeof(void)', which some compilers reject.
-                            var size = (rootType.equals("void")) ? "0" : "sizeof("+rootType+")";
-                            // If the port is a multiport, then the portRefNested is itself a pointer
-                            // so we want its value, not its address.
-                            var indirection = (port.isMultiport())? "" : "&";
-                            code.startChannelIteration(port);
-                            code.pr(String.join("\n",
-                                    "_lf_initialize_template((token_template_t*)",
-                                    "        "+indirection+"("+CUtil.portRefNested(port, sr, sb, sc)+"),",
-                                             size+");"
-                            ));
-                            code.endChannelIteration(port);
-                        }
-
-                        code.endScopedRangeBlock(sendingRange);
-                    }
-                }
+    return code.toString();
+  }
+
+  /**
+   * For each reaction of the specified reactor, set the last_enabling_reaction field of the
+   * reaction struct to point to the single dominating upstream reaction if there is one, or to be
+   * NULL if there is none.
+   *
+   * @param r The reactor.
+   */
+  private static String deferredOptimizeForSingleDominatingReaction(ReactorInstance r) {
+    var code = new CodeBuilder();
+    for (ReactionInstance reaction : r.reactions) {
+      // The following code attempts to gather into a loop assignments of successive
+      // bank members relations between reactions to avoid large chunks of inline code
+      // when a large bank sends to a large bank or when a large bank receives from
+      // one reaction that is either multicasting or sending through a multiport.
+      var start = 0;
+      var end = 0;
+      var domStart = 0;
+      var same = false; // Set to true when finding a string of identical dominating reactions.
+      ReactionInstance.Runtime previousRuntime = null;
+      var first = true; // First time through the loop.
+      for (ReactionInstance.Runtime runtime : reaction.getRuntimeInstances()) {
+        if (!first) { // Not the first time through the loop.
+          if (same) { // Previously seen at least two identical dominating.
+            if (runtime.dominating != previousRuntime.dominating) {
+              // End of streak of same dominating reaction runtime instance.
+              code.pr(
+                  printOptimizeForSingleDominatingReaction(
+                      previousRuntime, start, end, domStart, same));
+              same = false;
+              start = runtime.id;
+              domStart = (runtime.dominating != null) ? runtime.dominating.id : 0;
             }
-        }
-        return code.toString();
-    }
-
-    /**
-     * For each output port of the specified reactor,
-     * set the num_destinations field of port structs on its self struct
-     * equal to the total number of destination reactors. This is used
-     * to initialize reference counts in dynamically allocated tokens
-     * sent to other reactors.
-     * @param reactor The reactor instance.
-     */
-    private static String deferredOutputNumDestinations(
-        ReactorInstance reactor
-    ) {
-        // Reference counts are decremented by each destination reactor
-        // at the conclusion of a time step. Hence, the initial reference
-        // count should equal the number of destination _reactors_, not the
-        // number of destination ports nor the number of destination reactions.
-        // One of the destination reactors may be the container of this
-        // instance because it may have a reaction to an output of this instance.
-        var code = new CodeBuilder();
-        for (PortInstance output : reactor.outputs) {
-            for (SendRange sendingRange : output.eventualDestinations()) {
-                code.pr("// For reference counting, set num_destinations for port " + output.getFullName() + ".");
-                code.startScopedRangeBlock(sendingRange, sr, sb, sc, sendingRange.instance.isInput());
-                code.pr(CUtil.portRef(output, sr, sb, sc)+".num_destinations = "+sendingRange.getNumberOfDestinationReactors()+";");
-                code.endScopedRangeBlock(sendingRange);
+          } else if (runtime.dominating == previousRuntime.dominating) {
+            // Start of a streak of identical dominating reaction runtime instances.
+            same = true;
+          } else if (runtime.dominating != null
+              && previousRuntime.dominating != null
+              && runtime.dominating.getReaction() == previousRuntime.dominating.getReaction()) {
+            // Same dominating reaction even if not the same dominating runtime.
+            if (runtime.dominating.id != previousRuntime.dominating.id + 1) {
+              // End of a streak of contiguous runtimes.
+              printOptimizeForSingleDominatingReaction(previousRuntime, start, end, domStart, same);
+              same = false;
+              start = runtime.id;
+              domStart = runtime.dominating.id;
             }
+          } else {
+            // Different dominating reaction.
+            printOptimizeForSingleDominatingReaction(previousRuntime, start, end, domStart, same);
+            same = false;
+            start = runtime.id;
+            domStart = (runtime.dominating != null) ? runtime.dominating.id : 0;
+          }
         }
-        return code.toString();
+        first = false;
+        previousRuntime = runtime;
+        end++;
+      }
+      if (end > start) {
+        printOptimizeForSingleDominatingReaction(previousRuntime, start, end, domStart, same);
+      }
     }
-
-    /**
-     * Perform initialization functions that must be performed after
-     * all reactor runtime instances have been created.
-     * This function does not create nested loops over nested banks,
-     * so each function it calls must handle its own iteration
-     * over all runtime instance.
-     * @param reactor The container.
-     * @param main The top-level reactor.
-     * @param reactions The list of reactions to consider.
-     * @param types The C types.
-     */
-    private static String deferredInitializeNonNested(
-        ReactorInstance reactor,
-        ReactorInstance main,
-        Iterable<ReactionInstance> reactions,
-        CTypes types
-    ) {
-        var code = new CodeBuilder();
-        code.pr("// **** Start non-nested deferred initialize for "+reactor.getFullName());
-        // Initialize the num_destinations fields of port structs on the self struct.
-        // This needs to be outside the above scoped block because it performs
-        // its own iteration over ranges.
-        code.pr(deferredInputNumDestinations(
-            reactions,
-            types
-        ));
-
-        // Second batch of initializes cannot be within a for loop
-        // iterating over bank members because they iterate over send
-        // ranges which may span bank members.
-        if (reactor != main) {
-            code.pr(deferredOutputNumDestinations(
-                reactor
-            ));
-        }
-        code.pr(deferredFillTriggerTable(
-            reactions
-        ));
-        code.pr(deferredOptimizeForSingleDominatingReaction(
-            reactor
-        ));
-        for (ReactorInstance child: reactor.children) {
-            code.pr(deferredInitializeNonNested(
-                child,
-                main,
-                child.reactions,
-                types
-            ));
+    return code.toString();
+  }
+
+  /** Print statement that sets the last_enabling_reaction field of a reaction. */
+  private static String printOptimizeForSingleDominatingReaction(
+      ReactionInstance.Runtime runtime, int start, int end, int domStart, boolean same) {
+    var code = new CodeBuilder();
+    var dominatingRef = "NULL";
+
+    if (end > start + 1) {
+      code.startScopedBlock();
+      var reactionRef = CUtil.reactionRef(runtime.getReaction(), "i");
+      if (runtime.dominating != null) {
+        if (same) {
+          dominatingRef =
+              "&(" + CUtil.reactionRef(runtime.dominating.getReaction(), "" + domStart) + ")";
+        } else {
+          dominatingRef = "&(" + CUtil.reactionRef(runtime.dominating.getReaction(), "j++") + ")";
         }
-        code.pr("// **** End of non-nested deferred initialize for "+reactor.getFullName());
-        return code.toString();
+      }
+      code.pr(
+          String.join(
+              "\n",
+              "// " + runtime.getReaction().getFullName() + " dominating upstream reaction.",
+              "int j = " + domStart + ";",
+              "for (int i = " + start + "; i < " + end + "; i++) {",
+              "    " + reactionRef + ".last_enabling_reaction = " + dominatingRef + ";",
+              "}"));
+      code.endScopedBlock();
+    } else if (end == start + 1) {
+      var reactionRef = CUtil.reactionRef(runtime.getReaction(), "" + start);
+      if (runtime.dominating != null) {
+        dominatingRef =
+            "&(" + CUtil.reactionRef(runtime.dominating.getReaction(), "" + domStart) + ")";
+      }
+      code.pr(
+          String.join(
+              "\n",
+              "// " + runtime.getReaction().getFullName() + " dominating upstream reaction.",
+              reactionRef + ".last_enabling_reaction = " + dominatingRef + ";"));
     }
-
-    /**
-     * For each output of the specified reactor that has a token type
-     * (type* or type[]), create a template token and put it on the self struct.
-     * @param reactor The reactor.
-     */
-    private static String deferredCreateTemplateTokens(
-        ReactorInstance reactor,
-        CTypes types
-    ) {
-        var code = new CodeBuilder();
-        // Look for outputs with token types.
-        for (PortInstance output : reactor.outputs) {
-            var type = ASTUtils.getInferredType(output.getDefinition());
-            if (CUtil.isTokenType(type, types)) {
-                // Create the template token that goes in the trigger struct.
-                // Its reference count is zero, enabling it to be used immediately.
-                var rootType = CUtil.rootType(types.getTargetType(type));
-                // If the rootType is 'void', we need to avoid generating the code
-                // 'sizeof(void)', which some compilers reject.
-                var size = (rootType.equals("void")) ? "0" : "sizeof("+rootType+")";
-                code.startChannelIteration(output);
-                code.pr(String.join("\n",
-                        "_lf_initialize_template((token_template_t*)",
-                        "        &("+CUtil.portRef(output)+"),",
-                                 size+");"
-                ));
-                code.endChannelIteration(output);
-            }
+    return code.toString();
+  }
+
+  /**
+   * For the specified reaction, for ports that it writes to, fill the trigger table for triggering
+   * downstream reactions.
+   *
+   * @param reactions The reactions.
+   */
+  private static String deferredFillTriggerTable(Iterable<ReactionInstance> reactions) {
+    var code = new CodeBuilder();
+    for (ReactionInstance reaction : reactions) {
+      var name = reaction.getParent().getFullName();
+
+      var reactorSelfStruct = CUtil.reactorRef(reaction.getParent(), sr);
+
+      var foundPort = false;
+
+      for (PortInstance port : Iterables.filter(reaction.effects, PortInstance.class)) {
+        if (!foundPort) {
+          // Need a separate index for the triggers array for each bank member.
+          code.startScopedBlock();
+          code.pr(
+              "int triggers_index["
+                  + reaction.getParent().getTotalWidth()
+                  + "] = { 0 }; // Number of bank members with the reaction.");
+          foundPort = true;
         }
-        return code.toString();
-    }
-
-    /**
-     * For the specified reaction, for ports that it writes to,
-     * set up the arrays that store the results (if necessary) and
-     * that are used to trigger downstream reactions if an effect is actually
-     * produced.  The port may be an output of the reaction's parent
-     * or an input to a reactor contained by the parent.
-     *
-     * @param reaction The reaction instance.
-     */
-    private static String deferredReactionOutputs(
-        ReactionInstance reaction,
-        TargetConfig targetConfig
-    ) {
-        var code = new CodeBuilder();
-        // val selfRef = CUtil.reactorRef(reaction.getParent());
-        var name = reaction.getParent().getFullName();
-        // Insert a string name to facilitate debugging.
-        if (targetConfig.logLevel.compareTo(LogLevel.LOG) >= 0) {
-            code.pr(CUtil.reactionRef(reaction)+".name = "+addDoubleQuotes(name+" reaction "+reaction.index)+";");
+        // If the port is a multiport, then its channels may have different sets
+        // of destinations. For ordinary ports, there will be only one range and
+        // its width will be 1.
+        // We generate the code to fill the triggers array first in a temporary code buffer,
+        // so that we can simultaneously calculate the size of the total array.
+        for (SendRange srcRange : port.eventualDestinations()) {
+          var srcNested = port.isInput();
+          code.startScopedRangeBlock(srcRange, sr, sb, sc, srcNested);
+
+          var triggerArray =
+              CUtil.reactionRef(reaction, sr) + ".triggers[triggers_index[" + sr + "]++]";
+          // Skip ports whose parent is not in the federation.
+          // This can happen with reactions in the top-level that have
+          // as an effect a port in a bank.
+          code.pr(
+              String.join(
+                  "\n",
+                  "// Reaction "
+                      + reaction.index
+                      + " of "
+                      + name
+                      + " triggers "
+                      + srcRange.destinations.size()
+                      + " downstream reactions",
+                  "// through port " + port.getFullName() + ".",
+                  CUtil.reactionRef(reaction, sr)
+                      + ".triggered_sizes[triggers_index["
+                      + sr
+                      + "]] = "
+                      + srcRange.destinations.size()
+                      + ";",
+                  "// For reaction " + reaction.index + " of " + name + ", allocate an",
+                  "// array of trigger pointers for downstream reactions through port "
+                      + port.getFullName(),
+                  "trigger_t** trigger_array = (trigger_t**)_lf_allocate(",
+                  "        " + srcRange.destinations.size() + ", sizeof(trigger_t*),",
+                  "        &" + reactorSelfStruct + "->base.allocations); ",
+                  triggerArray + " = trigger_array;"));
+          code.endScopedRangeBlock(srcRange);
         }
-
-        var reactorSelfStruct = CUtil.reactorRef(reaction.getParent());
-
-        // Count the output ports and inputs of contained reactors that
-        // may be set by this reaction. This ignores actions in the effects.
-        // Collect initialization statements for the output_produced array for the reaction
-        // to point to the is_present field of the appropriate output.
-        // These statements must be inserted after the array is malloc'd,
-        // but we construct them while we are counting outputs.
-        var outputCount = 0;
-        var init = new CodeBuilder();
-
-        init.startScopedBlock();
-        init.pr("int count = 0; SUPPRESS_UNUSED_WARNING(count);");
-        for (PortInstance effect : Iterables.filter(reaction.effects, PortInstance.class)) {
-            // Create the entry in the output_produced array for this port.
-            // If the port is a multiport, then we need to create an entry for each
-            // individual channel.
-
-            // If the port is an input of a contained reactor, then, if that
-            // contained reactor is a bank, we will have to iterate over bank
-            // members.
-            var bankWidth = 1;
-            var portRef = "";
-            if (effect.isInput()) {
-                init.pr("// Reaction writes to an input of a contained reactor.");
-                bankWidth = effect.getParent().getWidth();
-                init.startScopedBlock(effect.getParent());
-                portRef = CUtil.portRefNestedName(effect);
+      }
+      var cumulativePortWidth = 0;
+      for (PortInstance port : Iterables.filter(reaction.effects, PortInstance.class)) {
+        // If this port does not have any destinations, do not generate code for it.
+        if (port.eventualDestinations().isEmpty()) continue;
+
+        code.pr(
+            "for (int i = 0; i < "
+                + reaction.getParent().getTotalWidth()
+                + "; i++) triggers_index[i] = "
+                + cumulativePortWidth
+                + ";");
+        for (SendRange srcRange : port.eventualDestinations()) {
+          var srcNested = srcRange.instance.isInput();
+          var multicastCount = 0;
+          for (RuntimeRange<PortInstance> dstRange : srcRange.destinations) {
+            var dst = dstRange.instance;
+
+            code.startScopedRangeBlock(srcRange, dstRange);
+
+            // If the source is nested, need to take into account the parent's bank index
+            // when indexing into the triggers array.
+            var triggerArray = "";
+            if (srcNested && port.getParent().getWidth() > 1) {
+              triggerArray =
+                  CUtil.reactionRef(reaction, sr)
+                      + ".triggers[triggers_index["
+                      + sr
+                      + "] + "
+                      + sc
+                      + " + src_range_mr.digits[1] * src_range_mr.radixes[0]]";
             } else {
-                init.startScopedBlock();
-                portRef = CUtil.portRefName(effect);
+              triggerArray =
+                  CUtil.reactionRef(reaction, sr)
+                      + ".triggers[triggers_index["
+                      + sr
+                      + "] + "
+                      + sc
+                      + "]";
             }
 
-            if (effect.isMultiport()) {
-                // Form is slightly different for inputs vs. outputs.
-                var connector = ".";
-                if (effect.isInput()) connector = "->";
-
-                // Point the output_produced field to where the is_present field of the port is.
-                init.pr(String.join("\n",
-                    "for (int i = 0; i < "+effect.getWidth()+"; i++) {",
-                    "    "+CUtil.reactionRef(reaction)+".output_produced[i + count]",
-                    "            = &"+portRef+"[i]"+connector+"is_present;",
-                    "}",
-                    "count += "+effect.getWidth()+";"
-                ));
-                outputCount += effect.getWidth() * bankWidth;
+            if (dst.isOutput()) {
+              // Include this destination port only if it has at least one
+              // reaction in the federation.
+              var belongs = false;
+              for (ReactionInstance destinationReaction : dst.getDependentReactions()) {
+                belongs = true;
+              }
+              if (belongs) {
+                code.pr(
+                    String.join(
+                        "\n",
+                        "// Port " + port.getFullName() + " has reactions in its parent's parent.",
+                        "// Point to the trigger struct for those reactions.",
+                        triggerArray
+                            + "["
+                            + multicastCount
+                            + "] = &"
+                            + CUtil.triggerRefNested(dst, dr, db)
+                            + ";"));
+              } else {
+                // Put in a NULL pointer.
+                code.pr(
+                    String.join(
+                        "\n",
+                        "// Port " + port.getFullName() + " has reactions in its parent's parent.",
+                        "// But those are not in the federation.",
+                        triggerArray + "[" + multicastCount + "] = NULL;"));
+              }
             } else {
-                // The effect is not a multiport.
-                init.pr(CUtil.reactionRef(reaction)+".output_produced[count++] = &"+portRef+".is_present;");
-                outputCount += bankWidth;
+              // Destination is an input port.
+              code.pr(
+                  String.join(
+                      "\n",
+                      "// Point to destination port " + dst.getFullName() + "'s trigger struct.",
+                      triggerArray
+                          + "["
+                          + multicastCount
+                          + "] = &"
+                          + CUtil.triggerRef(dst, dr)
+                          + ";"));
             }
-            init.endScopedBlock();
+            code.endScopedRangeBlock(srcRange, dstRange);
+            multicastCount++;
+          }
         }
-        init.endScopedBlock();
-        code.pr(String.join("\n",
-            "// Total number of outputs (single ports and multiport channels)",
-            "// produced by "+reaction+".",
-            CUtil.reactionRef(reaction)+".num_outputs = "+outputCount+";"
-        ));
-        if (outputCount > 0) {
-            code.pr(String.join("\n",
-                "// Allocate memory for triggers[] and triggered_sizes[] on the reaction_t",
-                "// struct for this reaction.",
-                CUtil.reactionRef(reaction)+".triggers = (trigger_t***)_lf_allocate(",
-                "        "+outputCount+", sizeof(trigger_t**),",
-                "        &"+reactorSelfStruct+"->base.allocations);",
-                CUtil.reactionRef(reaction)+".triggered_sizes = (int*)_lf_allocate(",
-                "        "+outputCount+", sizeof(int),",
-                "        &"+reactorSelfStruct+"->base.allocations);",
-                CUtil.reactionRef(reaction)+".output_produced = (bool**)_lf_allocate(",
-                "        "+outputCount+", sizeof(bool*),",
-                "        &"+reactorSelfStruct+"->base.allocations);"
-            ));
+        // If the port is an input of a contained reactor, then we have to take
+        // into account the bank width of the contained reactor.
+        if (port.getParent() != reaction.getParent()) {
+          cumulativePortWidth += port.getWidth() * port.getParent().getWidth();
+        } else {
+          cumulativePortWidth += port.getWidth();
         }
-
-        code.pr(String.join("\n",
-            init.toString(),
-            "// ** End initialization for reaction "+reaction.index+" of "+name
-        ));
-        return code.toString();
+      }
+      if (foundPort) code.endScopedBlock();
     }
-
-    /**
-     * Generate code to allocate the memory needed by reactions for triggering
-     * downstream reactions.
-     * @param reactions A list of reactions.
-     */
-    private static String deferredReactionMemory(
-        Iterable<ReactionInstance> reactions,
-        TargetConfig targetConfig
-    ) {
-        var code = new CodeBuilder();
-        // For each reaction instance, allocate the arrays that will be used to
-        // trigger downstream reactions.
-        for (ReactionInstance reaction : reactions) {
-            code.pr(deferredReactionOutputs(
-                reaction,
-                targetConfig
-            ));
-            var reactorSelfStruct = CUtil.reactorRef(reaction.getParent());
-
-            // Next handle triggers of the reaction that come from a multiport output
-            // of a contained reactor.  Also, handle startup and shutdown triggers.
-            for (PortInstance trigger : Iterables.filter(reaction.triggers, PortInstance.class)) {
-                // If the port is a multiport, then we need to create an entry for each
-                // individual port.
-                if (trigger.isMultiport() && trigger.getParent() != null && trigger.isOutput()) {
-                    // Trigger is an output of a contained reactor or bank.
-                    code.pr(String.join("\n",
-                        "// Allocate memory to store pointers to the multiport output "+trigger.getName()+" ",
-                        "// of a contained reactor "+trigger.getParent().getFullName()
-                    ));
-                    code.startScopedBlock(trigger.getParent());
-
-                    var width = trigger.getWidth();
-                    var portStructType = CGenerator.variableStructType(trigger);
-
-                    code.pr(String.join("\n",
-                        CUtil.reactorRefNested(trigger.getParent())+"."+trigger.getName()+"_width = "+width+";",
-                        CUtil.reactorRefNested(trigger.getParent())+"."+trigger.getName(),
-                        "        = ("+portStructType+"**)_lf_allocate(",
-                        "                "+width+", sizeof("+portStructType+"*),",
-                        "                &"+reactorSelfStruct+"->base.allocations); "
-                    ));
-
-                    code.endScopedBlock();
-                }
+    return code.toString();
+  }
+
+  /**
+   * For each input port of a contained reactor that receives data from one or more of the specified
+   * reactions, set the num_destinations field of the corresponding port structs on the self struct
+   * of the reaction's parent reactor equal to the total number of destination reactors. If the port
+   * has a token type, this also initializes it with a token.
+   *
+   * @param reactions The reactions.
+   * @param types The C types.
+   */
+  private static String deferredInputNumDestinations(
+      Iterable<ReactionInstance> reactions, CTypes types) {
+    // We need the number of destination _reactors_, not the
+    // number of destination ports nor the number of destination reactions.
+    // One of the destination reactors may be the container of this
+    // instance because it may have a reaction to an output of this instance.
+    // Since a port may be written to by multiple reactions,
+    // ensure that this is done only once.
+    var portsHandled = new HashSet<PortInstance>();
+    var code = new CodeBuilder();
+    for (ReactionInstance reaction : reactions) {
+      for (PortInstance port : Iterables.filter(reaction.effects, PortInstance.class)) {
+        if (port.isInput() && !portsHandled.contains(port)) {
+          // Port is an input of a contained reactor that gets data from a reaction of this reactor.
+          portsHandled.add(port);
+          code.pr(
+              "// Set number of destination reactors for port "
+                  + port.getParent().getName()
+                  + "."
+                  + port.getName()
+                  + ".");
+          // The input port may itself have multiple destinations.
+          for (SendRange sendingRange : port.eventualDestinations()) {
+            code.startScopedRangeBlock(sendingRange, sr, sb, sc, sendingRange.instance.isInput());
+            // Syntax is slightly different for a multiport output vs. single port.
+            var connector = (port.isMultiport()) ? "->" : ".";
+            code.pr(
+                CUtil.portRefNested(port, sr, sb, sc)
+                    + connector
+                    + "num_destinations = "
+                    + sendingRange.getNumberOfDestinationReactors()
+                    + ";");
+
+            // Initialize token types.
+            var type = ASTUtils.getInferredType(port.getDefinition());
+            if (CUtil.isTokenType(type, types)) {
+              // Create the template token that goes in the port struct.
+              var rootType = CUtil.rootType(types.getTargetType(type));
+              // If the rootType is 'void', we need to avoid generating the code
+              // 'sizeof(void)', which some compilers reject.
+              var size = (rootType.equals("void")) ? "0" : "sizeof(" + rootType + ")";
+              // If the port is a multiport, then the portRefNested is itself a pointer
+              // so we want its value, not its address.
+              var indirection = (port.isMultiport()) ? "" : "&";
+              code.startChannelIteration(port);
+              code.pr(
+                  String.join(
+                      "\n",
+                      "_lf_initialize_template((token_template_t*)",
+                      "        " + indirection + "(" + CUtil.portRefNested(port, sr, sb, sc) + "),",
+                      size + ");"));
+              code.endChannelIteration(port);
             }
+
+            code.endScopedRangeBlock(sendingRange);
+          }
         }
-        return code.toString();
+      }
+    }
+    return code.toString();
+  }
+
+  /**
+   * For each output port of the specified reactor, set the num_destinations field of port structs
+   * on its self struct equal to the total number of destination reactors. This is used to
+   * initialize reference counts in dynamically allocated tokens sent to other reactors.
+   *
+   * @param reactor The reactor instance.
+   */
+  private static String deferredOutputNumDestinations(ReactorInstance reactor) {
+    // Reference counts are decremented by each destination reactor
+    // at the conclusion of a time step. Hence, the initial reference
+    // count should equal the number of destination _reactors_, not the
+    // number of destination ports nor the number of destination reactions.
+    // One of the destination reactors may be the container of this
+    // instance because it may have a reaction to an output of this instance.
+    var code = new CodeBuilder();
+    for (PortInstance output : reactor.outputs) {
+      for (SendRange sendingRange : output.eventualDestinations()) {
+        code.pr(
+            "// For reference counting, set num_destinations for port "
+                + output.getFullName()
+                + ".");
+        code.startScopedRangeBlock(sendingRange, sr, sb, sc, sendingRange.instance.isInput());
+        code.pr(
+            CUtil.portRef(output, sr, sb, sc)
+                + ".num_destinations = "
+                + sendingRange.getNumberOfDestinationReactors()
+                + ";");
+        code.endScopedRangeBlock(sendingRange);
+      }
+    }
+    return code.toString();
+  }
+
+  /**
+   * Perform initialization functions that must be performed after all reactor runtime instances
+   * have been created. This function does not create nested loops over nested banks, so each
+   * function it calls must handle its own iteration over all runtime instance.
+   *
+   * @param reactor The container.
+   * @param main The top-level reactor.
+   * @param reactions The list of reactions to consider.
+   * @param types The C types.
+   */
+  private static String deferredInitializeNonNested(
+      ReactorInstance reactor,
+      ReactorInstance main,
+      Iterable<ReactionInstance> reactions,
+      CTypes types) {
+    var code = new CodeBuilder();
+    code.pr("// **** Start non-nested deferred initialize for " + reactor.getFullName());
+    // Initialize the num_destinations fields of port structs on the self struct.
+    // This needs to be outside the above scoped block because it performs
+    // its own iteration over ranges.
+    code.pr(deferredInputNumDestinations(reactions, types));
+
+    // Second batch of initializes cannot be within a for loop
+    // iterating over bank members because they iterate over send
+    // ranges which may span bank members.
+    if (reactor != main) {
+      code.pr(deferredOutputNumDestinations(reactor));
+    }
+    code.pr(deferredFillTriggerTable(reactions));
+    code.pr(deferredOptimizeForSingleDominatingReaction(reactor));
+    for (ReactorInstance child : reactor.children) {
+      code.pr(deferredInitializeNonNested(child, main, child.reactions, types));
+    }
+    code.pr("// **** End of non-nested deferred initialize for " + reactor.getFullName());
+    return code.toString();
+  }
+
+  /**
+   * For each output of the specified reactor that has a token type (type* or type[]), create a
+   * template token and put it on the self struct.
+   *
+   * @param reactor The reactor.
+   */
+  private static String deferredCreateTemplateTokens(ReactorInstance reactor, CTypes types) {
+    var code = new CodeBuilder();
+    // Look for outputs with token types.
+    for (PortInstance output : reactor.outputs) {
+      var type = ASTUtils.getInferredType(output.getDefinition());
+      if (CUtil.isTokenType(type, types)) {
+        // Create the template token that goes in the trigger struct.
+        // Its reference count is zero, enabling it to be used immediately.
+        var rootType = CUtil.rootType(types.getTargetType(type));
+        // If the rootType is 'void', we need to avoid generating the code
+        // 'sizeof(void)', which some compilers reject.
+        var size = (rootType.equals("void")) ? "0" : "sizeof(" + rootType + ")";
+        code.startChannelIteration(output);
+        code.pr(
+            String.join(
+                "\n",
+                "_lf_initialize_template((token_template_t*)",
+                "        &(" + CUtil.portRef(output) + "),",
+                size + ");"));
+        code.endChannelIteration(output);
+      }
+    }
+    return code.toString();
+  }
+
+  /**
+   * For the specified reaction, for ports that it writes to, set up the arrays that store the
+   * results (if necessary) and that are used to trigger downstream reactions if an effect is
+   * actually produced. The port may be an output of the reaction's parent or an input to a reactor
+   * contained by the parent.
+   *
+   * @param reaction The reaction instance.
+   */
+  private static String deferredReactionOutputs(
+      ReactionInstance reaction, TargetConfig targetConfig) {
+    var code = new CodeBuilder();
+    // val selfRef = CUtil.reactorRef(reaction.getParent());
+    var name = reaction.getParent().getFullName();
+    // Insert a string name to facilitate debugging.
+    if (targetConfig.logLevel.compareTo(LogLevel.LOG) >= 0) {
+      code.pr(
+          CUtil.reactionRef(reaction)
+              + ".name = "
+              + addDoubleQuotes(name + " reaction " + reaction.index)
+              + ";");
     }
 
-    /**
-     * If any reaction of the specified reactor provides input
-     * to a contained reactor, then generate code to allocate
-     * memory to store the data produced by those reactions.
-     * The allocated memory is pointed to by a field called
-     * {@code _lf_containername.portname} on the self struct of the reactor.
-     * @param reactor The reactor.
-     */
-    private static String deferredAllocationForEffectsOnInputs(
-        ReactorInstance reactor
-    ) {
-        var code = new CodeBuilder();
-        // Keep track of ports already handled. There may be more than one reaction
-        // in the container writing to the port, but we want only one memory allocation.
-        var portsHandled = new HashSet<PortInstance>();
-        var reactorSelfStruct = CUtil.reactorRef(reactor);
-        // Find parent reactions that mention multiport inputs of this reactor.
-        for (ReactionInstance reaction : reactor.reactions) {
-            for (PortInstance effect : Iterables.filter(reaction.effects, PortInstance.class)) {
-                if (effect.getParent().getDepth() > reactor.getDepth() // port of a contained reactor.
-                    && effect.isMultiport()
-                    && !portsHandled.contains(effect)
-                ) {
-                    code.pr("// A reaction writes to a multiport of a child. Allocate memory.");
-                    portsHandled.add(effect);
-                    code.startScopedBlock(effect.getParent());
-                    var portStructType = CGenerator.variableStructType(effect);
-                    var effectRef = CUtil.portRefNestedName(effect);
-                    code.pr(String.join("\n",
-                        effectRef+"_width = "+effect.getWidth()+";",
-                        "// Allocate memory to store output of reaction feeding ",
-                        "// a multiport input of a contained reactor.",
-                        effectRef+" = ("+portStructType+"**)_lf_allocate(",
-                        "        "+effect.getWidth()+", sizeof("+portStructType+"*),",
-                        "        &"+reactorSelfStruct+"->base.allocations); ",
-                        "for (int i = 0; i < "+effect.getWidth()+"; i++) {",
-                        "    "+effectRef+"[i] = ("+portStructType+"*)_lf_allocate(",
-                        "            1, sizeof("+portStructType+"),",
-                        "            &"+reactorSelfStruct+"->base.allocations); ",
-                        "}"
-                    ));
-                    code.endScopedBlock();
-                }
-            }
-        }
-        return code.toString();
+    var reactorSelfStruct = CUtil.reactorRef(reaction.getParent());
+
+    // Count the output ports and inputs of contained reactors that
+    // may be set by this reaction. This ignores actions in the effects.
+    // Collect initialization statements for the output_produced array for the reaction
+    // to point to the is_present field of the appropriate output.
+    // These statements must be inserted after the array is malloc'd,
+    // but we construct them while we are counting outputs.
+    var outputCount = 0;
+    var init = new CodeBuilder();
+
+    init.startScopedBlock();
+    init.pr("int count = 0; SUPPRESS_UNUSED_WARNING(count);");
+    for (PortInstance effect : Iterables.filter(reaction.effects, PortInstance.class)) {
+      // Create the entry in the output_produced array for this port.
+      // If the port is a multiport, then we need to create an entry for each
+      // individual channel.
+
+      // If the port is an input of a contained reactor, then, if that
+      // contained reactor is a bank, we will have to iterate over bank
+      // members.
+      var bankWidth = 1;
+      var portRef = "";
+      if (effect.isInput()) {
+        init.pr("// Reaction writes to an input of a contained reactor.");
+        bankWidth = effect.getParent().getWidth();
+        init.startScopedBlock(effect.getParent());
+        portRef = CUtil.portRefNestedName(effect);
+      } else {
+        init.startScopedBlock();
+        portRef = CUtil.portRefName(effect);
+      }
+
+      if (effect.isMultiport()) {
+        // Form is slightly different for inputs vs. outputs.
+        var connector = ".";
+        if (effect.isInput()) connector = "->";
+
+        // Point the output_produced field to where the is_present field of the port is.
+        init.pr(
+            String.join(
+                "\n",
+                "for (int i = 0; i < " + effect.getWidth() + "; i++) {",
+                "    " + CUtil.reactionRef(reaction) + ".output_produced[i + count]",
+                "            = &" + portRef + "[i]" + connector + "is_present;",
+                "}",
+                "count += " + effect.getWidth() + ";"));
+        outputCount += effect.getWidth() * bankWidth;
+      } else {
+        // The effect is not a multiport.
+        init.pr(
+            CUtil.reactionRef(reaction)
+                + ".output_produced[count++] = &"
+                + portRef
+                + ".is_present;");
+        outputCount += bankWidth;
+      }
+      init.endScopedBlock();
+    }
+    init.endScopedBlock();
+    code.pr(
+        String.join(
+            "\n",
+            "// Total number of outputs (single ports and multiport channels)",
+            "// produced by " + reaction + ".",
+            CUtil.reactionRef(reaction) + ".num_outputs = " + outputCount + ";"));
+    if (outputCount > 0) {
+      code.pr(
+          String.join(
+              "\n",
+              "// Allocate memory for triggers[] and triggered_sizes[] on the reaction_t",
+              "// struct for this reaction.",
+              CUtil.reactionRef(reaction) + ".triggers = (trigger_t***)_lf_allocate(",
+              "        " + outputCount + ", sizeof(trigger_t**),",
+              "        &" + reactorSelfStruct + "->base.allocations);",
+              CUtil.reactionRef(reaction) + ".triggered_sizes = (int*)_lf_allocate(",
+              "        " + outputCount + ", sizeof(int),",
+              "        &" + reactorSelfStruct + "->base.allocations);",
+              CUtil.reactionRef(reaction) + ".output_produced = (bool**)_lf_allocate(",
+              "        " + outputCount + ", sizeof(bool*),",
+              "        &" + reactorSelfStruct + "->base.allocations);"));
     }
 
-    /**
-     * Perform initialization functions that must be performed after
-     * all reactor runtime instances have been created.
-     * This function creates nested loops over nested banks.
-     * @param reactor The container.
-     */
-    private static String deferredInitialize(
-        ReactorInstance reactor,
-        Iterable<ReactionInstance> reactions,
-        TargetConfig targetConfig,
-        CTypes types
-    ) {
-        var code = new CodeBuilder();
-        code.pr("// **** Start deferred initialize for "+reactor.getFullName());
-        // First batch of initializations is within a for loop iterating
-        // over bank members for the reactor's parent.
-        code.startScopedBlock(reactor);
-
-        // If the child has a multiport that is an effect of some reaction in its container,
-        // then we have to generate code to allocate memory for arrays pointing to
-        // its data. If the child is a bank, then memory is allocated for the entire
-        // bank width because a reaction cannot specify which bank members it writes
-        // to so we have to assume it can write to any.
-        code.pr(deferredAllocationForEffectsOnInputs(
-            reactor
-        ));
-        code.pr(deferredReactionMemory(
-            reactions,
-            targetConfig
-        ));
-
-        // For outputs that are not primitive types (of form type* or type[]),
-        // create a default token on the self struct.
-        code.pr(deferredCreateTemplateTokens(
-            reactor,
-            types
-        ));
-        for (ReactorInstance child: reactor.children) {
-            code.pr(deferredInitialize(
-                child,
-                child.reactions,
-                targetConfig,
-                types)
-            );
+    code.pr(
+        String.join(
+            "\n",
+            init.toString(),
+            "// ** End initialization for reaction " + reaction.index + " of " + name));
+    return code.toString();
+  }
+
+  /**
+   * Generate code to allocate the memory needed by reactions for triggering downstream reactions.
+   *
+   * @param reactions A list of reactions.
+   */
+  private static String deferredReactionMemory(
+      Iterable<ReactionInstance> reactions, TargetConfig targetConfig) {
+    var code = new CodeBuilder();
+    // For each reaction instance, allocate the arrays that will be used to
+    // trigger downstream reactions.
+    for (ReactionInstance reaction : reactions) {
+      code.pr(deferredReactionOutputs(reaction, targetConfig));
+      var reactorSelfStruct = CUtil.reactorRef(reaction.getParent());
+
+      // Next handle triggers of the reaction that come from a multiport output
+      // of a contained reactor.  Also, handle startup and shutdown triggers.
+      for (PortInstance trigger : Iterables.filter(reaction.triggers, PortInstance.class)) {
+        // If the port is a multiport, then we need to create an entry for each
+        // individual port.
+        if (trigger.isMultiport() && trigger.getParent() != null && trigger.isOutput()) {
+          // Trigger is an output of a contained reactor or bank.
+          code.pr(
+              String.join(
+                  "\n",
+                  "// Allocate memory to store pointers to the multiport output "
+                      + trigger.getName()
+                      + " ",
+                  "// of a contained reactor " + trigger.getParent().getFullName()));
+          code.startScopedBlock(trigger.getParent());
+
+          var width = trigger.getWidth();
+          var portStructType = CGenerator.variableStructType(trigger);
+
+          code.pr(
+              String.join(
+                  "\n",
+                  CUtil.reactorRefNested(trigger.getParent())
+                      + "."
+                      + trigger.getName()
+                      + "_width = "
+                      + width
+                      + ";",
+                  CUtil.reactorRefNested(trigger.getParent()) + "." + trigger.getName(),
+                  "        = (" + portStructType + "**)_lf_allocate(",
+                  "                " + width + ", sizeof(" + portStructType + "*),",
+                  "                &" + reactorSelfStruct + "->base.allocations); "));
+
+          code.endScopedBlock();
         }
-        code.endScopedBlock();
-        code.pr("// **** End of deferred initialize for "+reactor.getFullName());
-        return code.toString();
+      }
+    }
+    return code.toString();
+  }
+
+  /**
+   * If any reaction of the specified reactor provides input to a contained reactor, then generate
+   * code to allocate memory to store the data produced by those reactions. The allocated memory is
+   * pointed to by a field called {@code _lf_containername.portname} on the self struct of the
+   * reactor.
+   *
+   * @param reactor The reactor.
+   */
+  private static String deferredAllocationForEffectsOnInputs(ReactorInstance reactor) {
+    var code = new CodeBuilder();
+    // Keep track of ports already handled. There may be more than one reaction
+    // in the container writing to the port, but we want only one memory allocation.
+    var portsHandled = new HashSet<PortInstance>();
+    var reactorSelfStruct = CUtil.reactorRef(reactor);
+    // Find parent reactions that mention multiport inputs of this reactor.
+    for (ReactionInstance reaction : reactor.reactions) {
+      for (PortInstance effect : Iterables.filter(reaction.effects, PortInstance.class)) {
+        if (effect.getParent().getDepth() > reactor.getDepth() // port of a contained reactor.
+            && effect.isMultiport()
+            && !portsHandled.contains(effect)) {
+          code.pr("// A reaction writes to a multiport of a child. Allocate memory.");
+          portsHandled.add(effect);
+          code.startScopedBlock(effect.getParent());
+          var portStructType = CGenerator.variableStructType(effect);
+          var effectRef = CUtil.portRefNestedName(effect);
+          code.pr(
+              String.join(
+                  "\n",
+                  effectRef + "_width = " + effect.getWidth() + ";",
+                  "// Allocate memory to store output of reaction feeding ",
+                  "// a multiport input of a contained reactor.",
+                  effectRef + " = (" + portStructType + "**)_lf_allocate(",
+                  "        " + effect.getWidth() + ", sizeof(" + portStructType + "*),",
+                  "        &" + reactorSelfStruct + "->base.allocations); ",
+                  "for (int i = 0; i < " + effect.getWidth() + "; i++) {",
+                  "    " + effectRef + "[i] = (" + portStructType + "*)_lf_allocate(",
+                  "            1, sizeof(" + portStructType + "),",
+                  "            &" + reactorSelfStruct + "->base.allocations); ",
+                  "}"));
+          code.endScopedBlock();
+        }
+      }
+    }
+    return code.toString();
+  }
+
+  /**
+   * Perform initialization functions that must be performed after all reactor runtime instances
+   * have been created. This function creates nested loops over nested banks.
+   *
+   * @param reactor The container.
+   */
+  private static String deferredInitialize(
+      ReactorInstance reactor,
+      Iterable<ReactionInstance> reactions,
+      TargetConfig targetConfig,
+      CTypes types) {
+    var code = new CodeBuilder();
+    code.pr("// **** Start deferred initialize for " + reactor.getFullName());
+    // First batch of initializations is within a for loop iterating
+    // over bank members for the reactor's parent.
+    code.startScopedBlock(reactor);
+
+    // If the child has a multiport that is an effect of some reaction in its container,
+    // then we have to generate code to allocate memory for arrays pointing to
+    // its data. If the child is a bank, then memory is allocated for the entire
+    // bank width because a reaction cannot specify which bank members it writes
+    // to so we have to assume it can write to any.
+    code.pr(deferredAllocationForEffectsOnInputs(reactor));
+    code.pr(deferredReactionMemory(reactions, targetConfig));
+
+    // For outputs that are not primitive types (of form type* or type[]),
+    // create a default token on the self struct.
+    code.pr(deferredCreateTemplateTokens(reactor, types));
+    for (ReactorInstance child : reactor.children) {
+      code.pr(deferredInitialize(child, child.reactions, targetConfig, types));
     }
+    code.endScopedBlock();
+    code.pr("// **** End of deferred initialize for " + reactor.getFullName());
+    return code.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CTypes.java b/org.lflang/src/org/lflang/generator/c/CTypes.java
index 45edd59bd5..97ea482d83 100644
--- a/org.lflang/src/org/lflang/generator/c/CTypes.java
+++ b/org.lflang/src/org/lflang/generator/c/CTypes.java
@@ -4,162 +4,150 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-
 import org.lflang.InferredType;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.generator.TargetTypes;
-import org.lflang.lf.Initializer;
 import org.lflang.lf.ParameterReference;
-import org.lflang.lf.Type;
 
 public class CTypes implements TargetTypes {
 
-    // Regular expression pattern for array types.
-    // For example, for "foo[10]", the first match will be "foo" and the second "[10]".
-    // For "foo[]", the first match will be "foo" and the second "".
-    static final Pattern arrayPattern = Pattern.compile("^\\s*(?:/\\*.*?\\*/)?\\s*(\\w+)\\s*\\[([0-9]*)]\\s*$");
-    private static final CTypes INSTANCE = new CTypes();
-
-    public CTypes() {
-    }
-
-    @Override
-    public boolean supportsGenerics() {
-        return false;
-    }
-
-    @Override
-    public String getTargetTimeType() {
-        return "interval_t";
-    }
-
-    @Override
-    public String getTargetTagType() {
-        return "tag_t";
-    }
-
-    @Override
-    public String getTargetFixedSizeListType(String baseType, int size) {
-        return String.format("%s[%d]", baseType, size);
-    }
-
-    @Override
-    public String getTargetVariableSizeListType(String baseType) {
-        return String.format("%s[]", baseType);
-    }
-
-    @Override
-    public String getTargetUndefinedType() {
-        return "/*undefined*/";
-    }
-
-    /**
-     * Given a type, return a C representation of the type. Note that
-     * C types are very idiosyncratic. For example, {@code int[]} is not always accepted
-     * as a type, and {@code int*} must be used instead, except when initializing
-     * a variable using a static initializer, as in {@code int[] foo = {1, 2, 3};}.
-     * When initializing a variable using a static initializer, use
-     * {@link #getVariableDeclaration(TypeParameterizedReactor, InferredType, String, boolean)} instead.
-     * @param type The type.
-     */
-    @Override
-    public String getTargetType(InferredType type) {
-        var result = TargetTypes.super.getTargetType(type);
-        Matcher matcher = arrayPattern.matcher(result);
-        if (matcher.find()) {
-            return matcher.group(1) + '*';
-        }
-        return result;
-    }
-
-    @Override
-    public String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
-        throw new UnsupportedOperationException("No context defined");
-    }
-
-    @Override
-    public String getTargetTimeExpr(TimeValue time) {
-        if (time != null) {
-            if (time.unit != null) {
-                return cMacroName(time.unit) + "(" + time.getMagnitude() + ")";
-            } else {
-                return Long.valueOf(time.getMagnitude()).toString();
-            }
-        }
-        return "0"; // FIXME: do this or throw exception?
-    }
-
-    @Override
-    public String getFixedSizeListInitExpression(List<String> contents, int listSize, boolean withBraces) {
-        return contents.stream().collect(Collectors.joining(", ", "{ ", " }"));
-    }
-
-    @Override
-    public String getVariableSizeListInitExpression(List<String> contents, boolean withBraces) {
-        return contents.stream().collect(Collectors.joining(", ", "{ ", " }"));
-    }
-
-    /**
-     * Return a variable declaration of the form "{@code type name}".
-     * The type is as returned by {@link #getTargetType(InferredType)}, except with
-     * the array syntax {@code [size]} preferred over the pointer syntax
-     * {@code *} (if applicable). This also includes the variable name
-     * because C requires the array type specification to be placed after
-     * the variable name rather than with the type.
-     * The result is of the form {@code type variable_name[size]} or
-     * {@code type variable_name} depending on whether the given type
-     * is an array type, unless the array type has no size (it is given
-     * as {@code []}. In that case, the returned form depends on the
-     * third argument, initializer. If true, the then the returned
-     * declaration will have the form {@code type variable_name[]},
-     * and otherwise it will have the form {@code type* variable_name}.
-     * @param type The type.
-     * @param variableName The name of the variable.
-     * @param initializer True to return a form usable in a static initializer.
-     */
-    public String getVariableDeclaration(
-            TypeParameterizedReactor tpr,
-            InferredType type,
-            String variableName,
-            boolean initializer
-    ) {
-        String t = TargetTypes.super.getTargetType(tpr.resolveType(type));
-        Matcher matcher = arrayPattern.matcher(t);
-        String declaration = String.format("%s %s", t, variableName);
-        if (matcher.find()) {
-            // For array types, we have to move the []
-            // because C is very picky about where this goes. It has to go
-            // after the variable name. Also, in an initializer, it has to have
-            // form [], and in a struct definition, it has to use *.
-            if (matcher.group(2).equals("") && !initializer) {
-                declaration = String.format("%s* %s",
-                        matcher.group(1), variableName);
-            } else {
-                declaration = String.format("%s %s[%s]",
-                        matcher.group(1), variableName, matcher.group(2));
-            }
-        }
-        return declaration;
-    }
-
-    // note that this is moved out by #544
-    public static String cMacroName(TimeUnit unit) {
-        return unit.getCanonicalName().toUpperCase();
-    }
-
-    public static CTypes getInstance() {
-        return INSTANCE;
-    }
-
-
-    public static CTypes generateParametersIn(ReactorInstance instance) {
-        return new CTypes() {
-            @Override
-            public String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
-                return CUtil.reactorRef(instance) + "->" + expr.getParameter().getName();
-            }
-        };
-    }
+  // Regular expression pattern for array types.
+  // For example, for "foo[10]", the first match will be "foo" and the second "[10]".
+  // For "foo[]", the first match will be "foo" and the second "".
+  static final Pattern arrayPattern =
+      Pattern.compile("^\\s*(?:/\\*.*?\\*/)?\\s*(\\w+)\\s*\\[([0-9]*)]\\s*$");
+  private static final CTypes INSTANCE = new CTypes();
+
+  public CTypes() {}
+
+  @Override
+  public boolean supportsGenerics() {
+    return false;
+  }
+
+  @Override
+  public String getTargetTimeType() {
+    return "interval_t";
+  }
+
+  @Override
+  public String getTargetTagType() {
+    return "tag_t";
+  }
+
+  @Override
+  public String getTargetFixedSizeListType(String baseType, int size) {
+    return String.format("%s[%d]", baseType, size);
+  }
+
+  @Override
+  public String getTargetVariableSizeListType(String baseType) {
+    return String.format("%s[]", baseType);
+  }
+
+  @Override
+  public String getTargetUndefinedType() {
+    return "/*undefined*/";
+  }
+
+  /**
+   * Given a type, return a C representation of the type. Note that C types are very idiosyncratic.
+   * For example, {@code int[]} is not always accepted as a type, and {@code int*} must be used
+   * instead, except when initializing a variable using a static initializer, as in {@code int[] foo
+   * = {1, 2, 3};}. When initializing a variable using a static initializer, use {@link
+   * #getVariableDeclaration(TypeParameterizedReactor, InferredType, String, boolean)} instead.
+   *
+   * @param type The type.
+   */
+  @Override
+  public String getTargetType(InferredType type) {
+    var result = TargetTypes.super.getTargetType(type);
+    Matcher matcher = arrayPattern.matcher(result);
+    if (matcher.find()) {
+      return matcher.group(1) + '*';
+    }
+    return result;
+  }
+
+  @Override
+  public String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
+    throw new UnsupportedOperationException("No context defined");
+  }
+
+  @Override
+  public String getTargetTimeExpr(TimeValue time) {
+    if (time != null) {
+      if (time.unit != null) {
+        return cMacroName(time.unit) + "(" + time.getMagnitude() + ")";
+      } else {
+        return Long.valueOf(time.getMagnitude()).toString();
+      }
+    }
+    return "0"; // FIXME: do this or throw exception?
+  }
+
+  @Override
+  public String getFixedSizeListInitExpression(
+      List<String> contents, int listSize, boolean withBraces) {
+    return contents.stream().collect(Collectors.joining(", ", "{ ", " }"));
+  }
+
+  @Override
+  public String getVariableSizeListInitExpression(List<String> contents, boolean withBraces) {
+    return contents.stream().collect(Collectors.joining(", ", "{ ", " }"));
+  }
+
+  /**
+   * Return a variable declaration of the form "{@code type name}". The type is as returned by
+   * {@link #getTargetType(InferredType)}, except with the array syntax {@code [size]} preferred
+   * over the pointer syntax {@code *} (if applicable). This also includes the variable name because
+   * C requires the array type specification to be placed after the variable name rather than with
+   * the type. The result is of the form {@code type variable_name[size]} or {@code type
+   * variable_name} depending on whether the given type is an array type, unless the array type has
+   * no size (it is given as {@code []}. In that case, the returned form depends on the third
+   * argument, initializer. If true, the then the returned declaration will have the form {@code
+   * type variable_name[]}, and otherwise it will have the form {@code type* variable_name}.
+   *
+   * @param type The type.
+   * @param variableName The name of the variable.
+   * @param initializer True to return a form usable in a static initializer.
+   */
+  public String getVariableDeclaration(
+      TypeParameterizedReactor tpr, InferredType type, String variableName, boolean initializer) {
+    String t = TargetTypes.super.getTargetType(tpr.resolveType(type));
+    Matcher matcher = arrayPattern.matcher(t);
+    String declaration = String.format("%s %s", t, variableName);
+    if (matcher.find()) {
+      // For array types, we have to move the []
+      // because C is very picky about where this goes. It has to go
+      // after the variable name. Also, in an initializer, it has to have
+      // form [], and in a struct definition, it has to use *.
+      if (matcher.group(2).equals("") && !initializer) {
+        declaration = String.format("%s* %s", matcher.group(1), variableName);
+      } else {
+        declaration = String.format("%s %s[%s]", matcher.group(1), variableName, matcher.group(2));
+      }
+    }
+    return declaration;
+  }
+
+  // note that this is moved out by #544
+  public static String cMacroName(TimeUnit unit) {
+    return unit.getCanonicalName().toUpperCase();
+  }
+
+  public static CTypes getInstance() {
+    return INSTANCE;
+  }
+
+  public static CTypes generateParametersIn(ReactorInstance instance) {
+    return new CTypes() {
+      @Override
+      public String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
+        return CUtil.reactorRef(instance) + "->" + expr.getParameter().getName();
+      }
+    };
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CUtil.java b/org.lflang/src/org/lflang/generator/c/CUtil.java
index dbb365e189..3a7f151a2c 100644
--- a/org.lflang/src/org/lflang/generator/c/CUtil.java
+++ b/org.lflang/src/org/lflang/generator/c/CUtil.java
@@ -1,28 +1,28 @@
 /* Utilities for C code generation. */
 
 /*************
-Copyright (c) 2019-2021, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019-2021, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator.c;
 
@@ -32,12 +32,10 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig;
-
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.GeneratorCommandFactory;
 import org.lflang.generator.LFGeneratorContext;
@@ -55,751 +53,741 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.util.LFCommand;
 
 /**
- * A collection of utilities for C code generation.
- * This class codifies the coding conventions for the C target code generator.
- * I.e., it defines how variables are named and referenced.
+ * A collection of utilities for C code generation. This class codifies the coding conventions for
+ * the C target code generator. I.e., it defines how variables are named and referenced.
+ *
  * @author Edward A. Lee
  */
 public class CUtil {
 
-    /**
-     * Suffix that when appended to the name of a federated reactor yields
-     * the name of its corresponding RTI executable.
-     */
-    public static final String RTI_BIN_SUFFIX = "_RTI";
-
-    /**
-     * Suffix that when appended to the name of a federated reactor yields
-     * the name of its corresponding distribution script.
-     */
-    public static final String RTI_DISTRIBUTION_SCRIPT_SUFFIX = "_distribute.sh";
-
-    //////////////////////////////////////////////////////
-    //// Public methods.
-
-    /**
-     * Return a reference to the action struct of the specified
-     * action instance. This action_base_t struct is on the self struct.
-     * @param instance The action instance.
-     * @param runtimeIndex An optional index variable name to use to address runtime instances.
-     */
-    public static String actionRef(ActionInstance instance, String runtimeIndex) {
-        return reactorRef(instance.getParent(), runtimeIndex)
-                + "->_lf_"
-                + instance.getName();
-    }
-
-    /**
-     * Return a default name of a variable to refer to the bank index of a reactor
-     * in a bank. This is has the form uniqueID_i where uniqueID
-     * is an identifier for the instance that is guaranteed to be different
-     * from the ID of any other instance in the program.
-     * If the instance is not a bank, return "0".
-     * @param instance A reactor instance.
-     */
-    public static String bankIndex(ReactorInstance instance) {
-        if (!instance.isBank()) return "0";
-        return bankIndexName(instance);
-    }
-
-    /**
-     * Return a default name of a variable to refer to the bank index of a reactor
-     * in a bank. This is has the form uniqueID_i where uniqueID
-     * is an identifier for the instance that is guaranteed to be different
-     * from the ID of any other instance in the program.
-     * @param instance A reactor instance.
-     */
-    public static String bankIndexName(ReactorInstance instance) {
-        return instance.uniqueID() + "_i";
-    }
-
-    /**
-     * Return a default name of a variable to refer to the channel index of a port
-     * in a bank. This has the form uniqueID_c where uniqueID
-     * is an identifier for the instance that is guaranteed to be different
-     * from the ID of any other instance in the program.
-     * If the port is not a multiport, then return the string "0".
-     */
-    public static String channelIndex(PortInstance port) {
-        if (!port.isMultiport()) return "0";
-        return channelIndexName(port);
-    }
-
-    /**
-     * Return a default name of a variable to refer to the channel index of a port
-     * in a bank. This is has the form uniqueID_c where uniqueID
-     * is an identifier for the instance that is guaranteed to be different
-     * from the ID of any other instance in the program.
-     */
-    public static String channelIndexName(PortInstance port) {
-        return port.uniqueID() + "_c";
-    }
-
-    /**
-     * Return the name of the reactor. A {@code _main} is appended to the name if the
-     * reactor is main (to allow for instantiations that have the same name as
-     * the main reactor or the .lf file).
-     */
-    public static String getName(TypeParameterizedReactor reactor) {
-        String name = reactor.reactor().getName().toLowerCase() + reactor.hashCode();
-        if (reactor.reactor().isMain()) {
-            return name + "_main";
-        }
-        return name;
-    }
-
-    /**
-     * Return a reference to the specified port.
-     *
-     * The returned string will have one of the following forms:
-     * <ul>
-     * <li>{@code selfStructs[k]->_lf_portName}</li>
-     * <li>{@code selfStructs[k]->_lf_portName}</li>
-     * <li>{@code selfStructs[k]->_lf_portName[i]}</li>
-     * <li>{@code selfStructs[k]->_lf_parent.portName}</li>
-     * <li>{@code selfStructs[k]->_lf_parent.portName[i]}</li>
-     * <li>{@code selfStructs[k]->_lf_parent[j].portName}</li>
-     * <li>{@code selfStructs[k]->_lf_parent[j].portName[i]}</li>
-     * </ul>
-     *
-     * where {@code k} is the runtime index of either the port's parent
-     * or the port's parent's parent, the latter when isNested is {@code true}.
-     * The index {@code j} is present if the parent is a bank, and
-     * the index {@code i} is present if the port is a multiport.
-     *
-     * The first two forms are used if isNested is false,
-     * and the remaining four are used if isNested is true.
-     * Set {@code isNested} to {@code true} when referencing a port belonging
-     * to a contained reactor.
-     *
-     * @param port The port.
-     * @param isNested True to return a reference relative to the parent's parent.
-     * @param includeChannelIndex True to include the channel index at the end.
-     * @param runtimeIndex A variable name to use to index the runtime instance or
-     *  null to use the default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
-     * @param bankIndex A variable name to use to index the bank or null to use the
-     *  default, the string returned by {@link CUtil#bankIndex(ReactorInstance)}.
-     * @param channelIndex A variable name to use to index the channel or null to
-     *  use the default, the string returned by {@link CUtil#channelIndex(PortInstance)}.
-     */
-    public static String portRef(
-            PortInstance port,
-            boolean isNested,
-            boolean includeChannelIndex,
-            String runtimeIndex,
-            String bankIndex,
-            String channelIndex
-    ) {
-        String channel = "";
-        if (channelIndex == null) channelIndex = channelIndex(port);
-        if (port.isMultiport() && includeChannelIndex) {
-            channel = "[" + channelIndex + "]";
-        }
-        if (isNested) {
-            return reactorRefNested(port.getParent(), runtimeIndex, bankIndex) + "." + port.getName() + channel;
-        } else {
-            String sourceStruct = CUtil.reactorRef(port.getParent(), runtimeIndex);
-            return sourceStruct + "->_lf_" + port.getName() + channel;
-        }
-    }
-
-    /**
-     * Return a reference to the port on the self struct of the
-     * port's parent.  This is used when an input port triggers a reaction
-     * in the port's parent or when an output port is written to by
-     * a reaction in the port's parent.
-     * This is equivalent to calling {@code portRef(port, false, true, null, null)}.
-     * @param port An instance of the port to be referenced.
-     */
-    public static String portRef(PortInstance port) {
-        return portRef(port, false, true, null, null, null);
-    }
-
-    /**
-     * Return a reference to the port on the self struct of the
-     * port's parent using the specified index variables.
-     * This is used when an input port triggers a reaction
-     * in the port's parent or when an output port is written to by
-     * a reaction in the port's parent.
-     * This is equivalent to calling {@code portRef(port, false, true, bankIndex, channelIndex)}.
-     * @param port An instance of the port to be referenced.
-     * @param runtimeIndex A variable name to use to index the runtime instance or
-     *  null to use the default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
-     * @param bankIndex A variable name to use to index the bank or null to use the
-     *  default, the string returned by {@link CUtil#bankIndex(ReactorInstance)}.
-     * @param channelIndex A variable name to use to index the channel or null to
-     *  use the default, the string returned by {@link CUtil#channelIndex(PortInstance)}.
-     */
-    public static String portRef(
-            PortInstance port, String runtimeIndex, String bankIndex, String channelIndex
-    ) {
-        return portRef(port, false, true, runtimeIndex, bankIndex, channelIndex);
-    }
-
-    /**
-     * Return a reference to a port without any channel indexing.
-     * This is useful for deriving a reference to the _width variable.
-     * @param port An instance of the port to be referenced.
-     */
-    public static String portRefName(PortInstance port) {
-        return portRef(port, false, false, null, null, null);
-    }
-
-    /**
-     * Return the portRef without the channel indexing.
-     * This is useful for deriving a reference to the _width variable.
-     *
-     * @param port An instance of the port to be referenced.
-     * @param runtimeIndex A variable name to use to index the runtime instance or
-     *  null to use the default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
-     * @param bankIndex A variable name to use to index the bank or null to use the
-     *  default, the string returned by {@link CUtil#bankIndex(ReactorInstance)}.
-     * @param channelIndex A variable name to use to index the channel or null to
-     *  use the default, the string returned by {@link CUtil#channelIndex(PortInstance)}.
-     */
-    public static String portRefName(
-            PortInstance port, String runtimeIndex, String bankIndex, String channelIndex
-    ) {
-        return portRef(port, false, false, runtimeIndex, bankIndex, channelIndex);
-    }
-
-    /**
-     * Return a port reference to a port on the self struct of the
-     * parent of the port's parent.  This is used when an input port
-     * is written to by a reaction in the parent of the port's parent,
-     * or when an output port triggers a reaction in the parent of the
-     * port's parent. This is equivalent to calling
-     * {@code portRef(port, true, true, null, null, null)}.
-     *
-     * @param port The port.
-     */
-    public static String portRefNested(PortInstance port) {
-        return portRef(port, true, true, null, null, null);
-    }
-
-    /**
-     * Return a reference to the port on the self struct of the
-     * parent of the port's parent.  This is used when an input port
-     * is written to by a reaction in the parent of the port's parent,
-     * or when an output port triggers a reaction in the parent of the
-     * port's parent. This is equivalent to calling
-     * {@code portRef(port, true, true, runtimeIndex, bankIndex, channelIndex)}.
-     *
-     * @param port The port.
-     * @param runtimeIndex A variable name to use to index the runtime instance or
-     *  null to use the default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
-     * @param bankIndex A variable name to use to index the bank or null to use the
-     *  default, the string returned by {@link CUtil#bankIndex(ReactorInstance)}.
-     * @param channelIndex A variable name to use to index the channel or null to
-     *  use the default, the string returned by {@link CUtil#channelIndex(PortInstance)}.
-     */
-    public static String portRefNested(
-            PortInstance port, String runtimeIndex, String bankIndex, String channelIndex
-    ) {
-        return portRef(port, true, true, runtimeIndex, bankIndex, channelIndex);
-    }
-
-    /**
-     * Return a reference to the port on the self struct of the
-     * parent of the port's parent, but without the channel indexing,
-     * even if it is a multiport.  This is used when an input port
-     * is written to by a reaction in the parent of the port's parent,
-     * or when an output port triggers a reaction in the parent of the
-     * port's parent.
-     * This is equivalent to calling {@code portRef(port, true, false, null, null, null)}.
-     *
-     * @param port The port.
-     */
-    public static String portRefNestedName(PortInstance port) {
-        return portRef(port, true, false, null, null, null);
-    }
-
-    /**
-     * Return a reference to the port on the self struct of the
-     * parent of the port's parent, but without the channel indexing,
-     * even if it is a multiport.  This is used when an input port
-     * is written to by a reaction in the parent of the port's parent,
-     * or when an output port triggers a reaction in the parent of the
-     * port's parent. This is equivalent to calling
-     * {@code portRefNested(port, true, false, runtimeIndex, bankIndex, channelIndex)}.
-     *
-     * @param port The port.
-     * @param runtimeIndex A variable name to use to index the runtime instance or
-     *  null to use the default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
-     * @param bankIndex A variable name to use to index the bank or null to use the
-     *  default, the string returned by {@link CUtil#bankIndex(ReactorInstance)}.
-     * @param channelIndex A variable name to use to index the channel or null to
-     *  use the default, the string returned by {@link CUtil#channelIndex(PortInstance)}.
-     */
-    public static String portRefNestedName(
-            PortInstance port, String runtimeIndex, String bankIndex, String channelIndex
-    ) {
-        return portRef(port, true, false, runtimeIndex, bankIndex, channelIndex);
-    }
-
-    /**
-     * Return code for referencing a port within a reaction body possibly indexed by
-     * a bank index and/or a multiport index. If the provided reference is
-     * not a port, then this returns the string "ERROR: not a port."
-     * @param reference The reference to the port.
-     * @param bankIndex A bank index or null or negative if not in a bank.
-     * @param multiportIndex A multiport index or null or negative if not in a multiport.
-     */
-    public static String portRefInReaction(VarRef reference, Integer bankIndex, Integer multiportIndex) {
-        if (!(reference.getVariable() instanceof Port)) {
-            return "ERROR: not a port."; // FIXME: This is not the fail-fast approach, and it seems arbitrary.
-        }
-        var prefix = "";
-        if (reference.getContainer() != null) {
-            var bank = "";
-            if (reference.getContainer().getWidthSpec() != null && bankIndex != null && bankIndex >= 0) {
-                bank = "[" + bankIndex + "]";
-            }
-            prefix = reference.getContainer().getName() + bank + ".";
-        }
-        var multiport = "";
-        if (((Port) reference.getVariable()).getWidthSpec() != null && multiportIndex != null && multiportIndex >= 0) {
-            multiport = "[" + multiportIndex + "]";
+  /**
+   * Suffix that when appended to the name of a federated reactor yields the name of its
+   * corresponding RTI executable.
+   */
+  public static final String RTI_BIN_SUFFIX = "_RTI";
+
+  /**
+   * Suffix that when appended to the name of a federated reactor yields the name of its
+   * corresponding distribution script.
+   */
+  public static final String RTI_DISTRIBUTION_SCRIPT_SUFFIX = "_distribute.sh";
+
+  //////////////////////////////////////////////////////
+  //// Public methods.
+
+  /**
+   * Return a reference to the action struct of the specified action instance. This action_base_t
+   * struct is on the self struct.
+   *
+   * @param instance The action instance.
+   * @param runtimeIndex An optional index variable name to use to address runtime instances.
+   */
+  public static String actionRef(ActionInstance instance, String runtimeIndex) {
+    return reactorRef(instance.getParent(), runtimeIndex) + "->_lf_" + instance.getName();
+  }
+
+  /**
+   * Return a default name of a variable to refer to the bank index of a reactor in a bank. This is
+   * has the form uniqueID_i where uniqueID is an identifier for the instance that is guaranteed to
+   * be different from the ID of any other instance in the program. If the instance is not a bank,
+   * return "0".
+   *
+   * @param instance A reactor instance.
+   */
+  public static String bankIndex(ReactorInstance instance) {
+    if (!instance.isBank()) return "0";
+    return bankIndexName(instance);
+  }
+
+  /**
+   * Return a default name of a variable to refer to the bank index of a reactor in a bank. This is
+   * has the form uniqueID_i where uniqueID is an identifier for the instance that is guaranteed to
+   * be different from the ID of any other instance in the program.
+   *
+   * @param instance A reactor instance.
+   */
+  public static String bankIndexName(ReactorInstance instance) {
+    return instance.uniqueID() + "_i";
+  }
+
+  /**
+   * Return a default name of a variable to refer to the channel index of a port in a bank. This has
+   * the form uniqueID_c where uniqueID is an identifier for the instance that is guaranteed to be
+   * different from the ID of any other instance in the program. If the port is not a multiport,
+   * then return the string "0".
+   */
+  public static String channelIndex(PortInstance port) {
+    if (!port.isMultiport()) return "0";
+    return channelIndexName(port);
+  }
+
+  /**
+   * Return a default name of a variable to refer to the channel index of a port in a bank. This is
+   * has the form uniqueID_c where uniqueID is an identifier for the instance that is guaranteed to
+   * be different from the ID of any other instance in the program.
+   */
+  public static String channelIndexName(PortInstance port) {
+    return port.uniqueID() + "_c";
+  }
+
+  /**
+   * Return the name of the reactor. A {@code _main} is appended to the name if the reactor is main
+   * (to allow for instantiations that have the same name as the main reactor or the .lf file).
+   */
+  public static String getName(TypeParameterizedReactor reactor) {
+    String name = reactor.reactor().getName().toLowerCase() + reactor.hashCode();
+    if (reactor.reactor().isMain()) {
+      return name + "_main";
+    }
+    return name;
+  }
+
+  /**
+   * Return a reference to the specified port.
+   *
+   * <p>The returned string will have one of the following forms:
+   *
+   * <ul>
+   *   <li>{@code selfStructs[k]->_lf_portName}
+   *   <li>{@code selfStructs[k]->_lf_portName}
+   *   <li>{@code selfStructs[k]->_lf_portName[i]}
+   *   <li>{@code selfStructs[k]->_lf_parent.portName}
+   *   <li>{@code selfStructs[k]->_lf_parent.portName[i]}
+   *   <li>{@code selfStructs[k]->_lf_parent[j].portName}
+   *   <li>{@code selfStructs[k]->_lf_parent[j].portName[i]}
+   * </ul>
+   *
+   * where {@code k} is the runtime index of either the port's parent or the port's parent's parent,
+   * the latter when isNested is {@code true}. The index {@code j} is present if the parent is a
+   * bank, and the index {@code i} is present if the port is a multiport.
+   *
+   * <p>The first two forms are used if isNested is false, and the remaining four are used if
+   * isNested is true. Set {@code isNested} to {@code true} when referencing a port belonging to a
+   * contained reactor.
+   *
+   * @param port The port.
+   * @param isNested True to return a reference relative to the parent's parent.
+   * @param includeChannelIndex True to include the channel index at the end.
+   * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
+   *     default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
+   * @param bankIndex A variable name to use to index the bank or null to use the default, the
+   *     string returned by {@link CUtil#bankIndex(ReactorInstance)}.
+   * @param channelIndex A variable name to use to index the channel or null to use the default, the
+   *     string returned by {@link CUtil#channelIndex(PortInstance)}.
+   */
+  public static String portRef(
+      PortInstance port,
+      boolean isNested,
+      boolean includeChannelIndex,
+      String runtimeIndex,
+      String bankIndex,
+      String channelIndex) {
+    String channel = "";
+    if (channelIndex == null) channelIndex = channelIndex(port);
+    if (port.isMultiport() && includeChannelIndex) {
+      channel = "[" + channelIndex + "]";
+    }
+    if (isNested) {
+      return reactorRefNested(port.getParent(), runtimeIndex, bankIndex)
+          + "."
+          + port.getName()
+          + channel;
+    } else {
+      String sourceStruct = CUtil.reactorRef(port.getParent(), runtimeIndex);
+      return sourceStruct + "->_lf_" + port.getName() + channel;
+    }
+  }
+
+  /**
+   * Return a reference to the port on the self struct of the port's parent. This is used when an
+   * input port triggers a reaction in the port's parent or when an output port is written to by a
+   * reaction in the port's parent. This is equivalent to calling {@code portRef(port, false, true,
+   * null, null)}.
+   *
+   * @param port An instance of the port to be referenced.
+   */
+  public static String portRef(PortInstance port) {
+    return portRef(port, false, true, null, null, null);
+  }
+
+  /**
+   * Return a reference to the port on the self struct of the port's parent using the specified
+   * index variables. This is used when an input port triggers a reaction in the port's parent or
+   * when an output port is written to by a reaction in the port's parent. This is equivalent to
+   * calling {@code portRef(port, false, true, bankIndex, channelIndex)}.
+   *
+   * @param port An instance of the port to be referenced.
+   * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
+   *     default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
+   * @param bankIndex A variable name to use to index the bank or null to use the default, the
+   *     string returned by {@link CUtil#bankIndex(ReactorInstance)}.
+   * @param channelIndex A variable name to use to index the channel or null to use the default, the
+   *     string returned by {@link CUtil#channelIndex(PortInstance)}.
+   */
+  public static String portRef(
+      PortInstance port, String runtimeIndex, String bankIndex, String channelIndex) {
+    return portRef(port, false, true, runtimeIndex, bankIndex, channelIndex);
+  }
+
+  /**
+   * Return a reference to a port without any channel indexing. This is useful for deriving a
+   * reference to the _width variable.
+   *
+   * @param port An instance of the port to be referenced.
+   */
+  public static String portRefName(PortInstance port) {
+    return portRef(port, false, false, null, null, null);
+  }
+
+  /**
+   * Return the portRef without the channel indexing. This is useful for deriving a reference to the
+   * _width variable.
+   *
+   * @param port An instance of the port to be referenced.
+   * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
+   *     default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
+   * @param bankIndex A variable name to use to index the bank or null to use the default, the
+   *     string returned by {@link CUtil#bankIndex(ReactorInstance)}.
+   * @param channelIndex A variable name to use to index the channel or null to use the default, the
+   *     string returned by {@link CUtil#channelIndex(PortInstance)}.
+   */
+  public static String portRefName(
+      PortInstance port, String runtimeIndex, String bankIndex, String channelIndex) {
+    return portRef(port, false, false, runtimeIndex, bankIndex, channelIndex);
+  }
+
+  /**
+   * Return a port reference to a port on the self struct of the parent of the port's parent. This
+   * is used when an input port is written to by a reaction in the parent of the port's parent, or
+   * when an output port triggers a reaction in the parent of the port's parent. This is equivalent
+   * to calling {@code portRef(port, true, true, null, null, null)}.
+   *
+   * @param port The port.
+   */
+  public static String portRefNested(PortInstance port) {
+    return portRef(port, true, true, null, null, null);
+  }
+
+  /**
+   * Return a reference to the port on the self struct of the parent of the port's parent. This is
+   * used when an input port is written to by a reaction in the parent of the port's parent, or when
+   * an output port triggers a reaction in the parent of the port's parent. This is equivalent to
+   * calling {@code portRef(port, true, true, runtimeIndex, bankIndex, channelIndex)}.
+   *
+   * @param port The port.
+   * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
+   *     default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
+   * @param bankIndex A variable name to use to index the bank or null to use the default, the
+   *     string returned by {@link CUtil#bankIndex(ReactorInstance)}.
+   * @param channelIndex A variable name to use to index the channel or null to use the default, the
+   *     string returned by {@link CUtil#channelIndex(PortInstance)}.
+   */
+  public static String portRefNested(
+      PortInstance port, String runtimeIndex, String bankIndex, String channelIndex) {
+    return portRef(port, true, true, runtimeIndex, bankIndex, channelIndex);
+  }
+
+  /**
+   * Return a reference to the port on the self struct of the parent of the port's parent, but
+   * without the channel indexing, even if it is a multiport. This is used when an input port is
+   * written to by a reaction in the parent of the port's parent, or when an output port triggers a
+   * reaction in the parent of the port's parent. This is equivalent to calling {@code portRef(port,
+   * true, false, null, null, null)}.
+   *
+   * @param port The port.
+   */
+  public static String portRefNestedName(PortInstance port) {
+    return portRef(port, true, false, null, null, null);
+  }
+
+  /**
+   * Return a reference to the port on the self struct of the parent of the port's parent, but
+   * without the channel indexing, even if it is a multiport. This is used when an input port is
+   * written to by a reaction in the parent of the port's parent, or when an output port triggers a
+   * reaction in the parent of the port's parent. This is equivalent to calling {@code
+   * portRefNested(port, true, false, runtimeIndex, bankIndex, channelIndex)}.
+   *
+   * @param port The port.
+   * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
+   *     default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
+   * @param bankIndex A variable name to use to index the bank or null to use the default, the
+   *     string returned by {@link CUtil#bankIndex(ReactorInstance)}.
+   * @param channelIndex A variable name to use to index the channel or null to use the default, the
+   *     string returned by {@link CUtil#channelIndex(PortInstance)}.
+   */
+  public static String portRefNestedName(
+      PortInstance port, String runtimeIndex, String bankIndex, String channelIndex) {
+    return portRef(port, true, false, runtimeIndex, bankIndex, channelIndex);
+  }
+
+  /**
+   * Return code for referencing a port within a reaction body possibly indexed by a bank index
+   * and/or a multiport index. If the provided reference is not a port, then this returns the string
+   * "ERROR: not a port."
+   *
+   * @param reference The reference to the port.
+   * @param bankIndex A bank index or null or negative if not in a bank.
+   * @param multiportIndex A multiport index or null or negative if not in a multiport.
+   */
+  public static String portRefInReaction(
+      VarRef reference, Integer bankIndex, Integer multiportIndex) {
+    if (!(reference.getVariable() instanceof Port)) {
+      return "ERROR: not a port."; // FIXME: This is not the fail-fast approach, and it seems
+      // arbitrary.
+    }
+    var prefix = "";
+    if (reference.getContainer() != null) {
+      var bank = "";
+      if (reference.getContainer().getWidthSpec() != null && bankIndex != null && bankIndex >= 0) {
+        bank = "[" + bankIndex + "]";
+      }
+      prefix = reference.getContainer().getName() + bank + ".";
+    }
+    var multiport = "";
+    if (((Port) reference.getVariable()).getWidthSpec() != null
+        && multiportIndex != null
+        && multiportIndex >= 0) {
+      multiport = "[" + multiportIndex + "]";
+    }
+    return prefix + reference.getVariable().getName() + multiport;
+  }
+
+  /**
+   * Return a reference to the reaction entry on the self struct of the parent of the specified
+   * reaction.
+   *
+   * @param reaction The reaction.
+   */
+  public static String reactionRef(ReactionInstance reaction) {
+    return reactionRef(reaction, null);
+  }
+
+  /**
+   * Return a reference to the reaction entry on the self struct of the parent of the specified
+   * reaction.
+   *
+   * @param reaction The reaction.
+   * @param runtimeIndex An index into the array of self structs for the parent.
+   */
+  public static String reactionRef(ReactionInstance reaction, String runtimeIndex) {
+    return reactorRef(reaction.getParent(), runtimeIndex) + "->_lf__reaction_" + reaction.index;
+  }
+
+  /**
+   * Return a reference to the "self" struct of the specified reactor instance. The returned string
+   * has the form self[j], where self is the name of the array of self structs for this reactor
+   * instance and j is the expression returned by {@link #runtimeIndex(ReactorInstance)} or 0 if
+   * there are no banks.
+   *
+   * @param instance The reactor instance.
+   */
+  public static String reactorRef(ReactorInstance instance) {
+    return reactorRef(instance, null);
+  }
+
+  /**
+   * Return the name of the array of "self" structs of the specified reactor instance. This is
+   * similar to {@link #reactorRef(ReactorInstance)} except that it does not index into the array.
+   *
+   * @param instance The reactor instance.
+   */
+  public static String reactorRefName(ReactorInstance instance) {
+    return instance.uniqueID() + "_self";
+  }
+
+  /**
+   * Return a reference to the "self" struct of the specified reactor instance. The returned string
+   * has the form self[runtimeIndex], where self is the name of the array of self structs for this
+   * reactor instance. If runtimeIndex is null, then it is replaced by the expression returned by
+   * {@link #runtimeIndex(ReactorInstance)} or 0 if there are no banks.
+   *
+   * @param instance The reactor instance.
+   * @param runtimeIndex An optional expression to use to address bank members. If this is null, the
+   *     expression used will be that returned by {@link #runtimeIndex(ReactorInstance)}.
+   */
+  public static String reactorRef(ReactorInstance instance, String runtimeIndex) {
+    if (runtimeIndex == null) runtimeIndex = runtimeIndex(instance);
+    return reactorRefName(instance) + "[" + runtimeIndex + "]";
+  }
+
+  /**
+   * For situations where a reaction reacts to or reads from an output of a contained reactor or
+   * sends to an input of a contained reactor, then the container's self struct will have a field
+   * (or an array of fields if the contained reactor is a bank) that is a struct with fields
+   * corresponding to those inputs and outputs. This method returns a reference to that struct or
+   * array of structs. Note that the returned reference is not to the self struct of the contained
+   * reactor. Use {@link #reactorRef(ReactorInstance)} for that.
+   *
+   * @param reactor The contained reactor.
+   */
+  public static String reactorRefNested(ReactorInstance reactor) {
+    return reactorRefNested(reactor, null, null);
+  }
+
+  /**
+   * For situations where a reaction reacts to or reads from an output of a contained reactor or
+   * sends to an input of a contained reactor, then the container's self struct will have a field
+   * (or an array of fields if the contained reactor is a bank) that is a struct with fields
+   * corresponding to those inputs and outputs. This method returns a reference to that struct or
+   * array of structs. Note that the returned reference is not to the self struct of the contained
+   * reactor. Use {@link CUtil#reactorRef(ReactorInstance)} for that.
+   *
+   * @param reactor The contained reactor.
+   * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
+   *     default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
+   * @param bankIndex A variable name to use to index the bank or null to use the default, the
+   *     string returned by {@link CUtil#bankIndex(ReactorInstance)}.
+   */
+  public static String reactorRefNested(
+      ReactorInstance reactor, String runtimeIndex, String bankIndex) {
+    String result = reactorRef(reactor.getParent(), runtimeIndex) + "->_lf_" + reactor.getName();
+    if (reactor.isBank()) {
+      // Need the bank index not the runtimeIndex.
+      if (bankIndex == null) bankIndex = bankIndex(reactor);
+      result += "[" + bankIndex + "]";
+    }
+    return result;
+  }
+
+  /**
+   * Return an expression that, when evaluated, gives the index of a runtime instance of the
+   * specified ReactorInstance. If the reactor is not within any banks, then this will return "0".
+   * Otherwise, it will return an expression that evaluates a mixed-radix number d0%w0, d1%w1, ... ,
+   * dn%wn, where n is the depth minus one of the reactor. The radixes, w0 to wn, are the widths of
+   * this reactor, its parent reactor, on up to the top-level reactor. Since the top-level reactor
+   * is never a bank, dn = 0 and wn = 1. The digits, di, are either 0 (of the parent is not a bank)
+   * or the variable name returned by {@link #bankIndexName(ReactorInstance)} if the parent is a
+   * bank. The returned expression, when evaluated, will yield the following value:
+   *
+   * <pre>
+   *     d0 + w0 * (d1 + w1 * ( ... (dn-1 + wn-1 * dn) ... )
+   * </pre>
+   *
+   * @param reactor The reactor.
+   */
+  public static String runtimeIndex(ReactorInstance reactor) {
+    StringBuilder result = new StringBuilder();
+    int width = 0;
+    int parens = 0;
+    while (reactor != null) {
+      if (reactor.isBank() && reactor.getWidth() > 1) {
+        if (width > 0) {
+          result.append(" + " + width + " * (");
+          parens++;
         }
-        return prefix + reference.getVariable().getName() + multiport;
-    }
-
-    /**
-     * Return a reference to the reaction entry on the self struct
-     * of the parent of the specified reaction.
-     * @param reaction The reaction.
-     */
-    public static String reactionRef(ReactionInstance reaction) {
-        return reactionRef(reaction, null);
-    }
-
-    /**
-     * Return a reference to the reaction entry on the self struct
-     * of the parent of the specified reaction.
-     * @param reaction The reaction.
-     * @param runtimeIndex An index into the array of self structs for the parent.
-     */
-    public static String reactionRef(ReactionInstance reaction, String runtimeIndex) {
-        return reactorRef(reaction.getParent(), runtimeIndex)
-                + "->_lf__reaction_" + reaction.index;
-    }
-
-    /**
-     * Return a reference to the "self" struct of the specified
-     * reactor instance. The returned string has the form
-     * self[j], where self is the name of the array of self structs
-     * for this reactor instance and j is the expression returned
-     * by {@link #runtimeIndex(ReactorInstance)} or 0 if there are no banks.
-     * @param instance The reactor instance.
-     */
-    public static String reactorRef(ReactorInstance instance) {
-        return reactorRef(instance, null);
-    }
-
-    /**
-     * Return the name of the array of "self" structs of the specified
-     * reactor instance.  This is similar to {@link #reactorRef(ReactorInstance)}
-     * except that it does not index into the array.
-     * @param instance The reactor instance.
-     */
-    public static String reactorRefName(ReactorInstance instance) {
-        return instance.uniqueID() + "_self";
-    }
-
-    /**
-     * Return a reference to the "self" struct of the specified
-     * reactor instance. The returned string has the form
-     * self[runtimeIndex], where self is the name of the array of self structs
-     * for this reactor instance. If runtimeIndex is null, then it is replaced by
-     * the expression returned
-     * by {@link #runtimeIndex(ReactorInstance)} or 0 if there are no banks.
-     * @param instance The reactor instance.
-     * @param runtimeIndex An optional expression to use to address bank members.
-     *  If this is null, the expression used will be that returned  by
-     *  {@link #runtimeIndex(ReactorInstance)}.
-     */
-    public static String reactorRef(ReactorInstance instance, String runtimeIndex) {
-        if (runtimeIndex == null) runtimeIndex = runtimeIndex(instance);
-        return reactorRefName(instance) + "[" + runtimeIndex + "]";
-    }
-
-    /**
-     * For situations where a reaction reacts to or reads from an output
-     * of a contained reactor or sends to an input of a contained reactor,
-     * then the container's self struct will have a field
-     * (or an array of fields if the contained reactor is a bank) that is
-     * a struct with fields corresponding to those inputs and outputs.
-     * This method returns a reference to that struct or array of structs.
-     * Note that the returned reference is not to the self struct of the
-     * contained reactor. Use {@link #reactorRef(ReactorInstance)} for that.
-     *
-     * @param reactor The contained reactor.
-     */
-    public static String reactorRefNested(ReactorInstance reactor) {
-        return reactorRefNested(reactor, null, null);
-    }
-
-    /**
-     * For situations where a reaction reacts to or reads from an output
-     * of a contained reactor or sends to an input of a contained reactor,
-     * then the container's self struct will have a field
-     * (or an array of fields if the contained reactor is a bank) that is
-     * a struct with fields corresponding to those inputs and outputs.
-     * This method returns a reference to that struct or array of structs.
-     * Note that the returned reference is not to the self struct of the
-     * contained reactor. Use {@link CUtil#reactorRef(ReactorInstance)} for that.
-     *
-     * @param reactor The contained reactor.
-     * @param runtimeIndex A variable name to use to index the runtime instance or
-     *  null to use the default, the string returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
-     * @param bankIndex A variable name to use to index the bank or null to use the
-     *  default, the string returned by {@link CUtil#bankIndex(ReactorInstance)}.
-     */
-    public static String reactorRefNested(ReactorInstance reactor, String runtimeIndex, String bankIndex) {
-        String result = reactorRef(reactor.getParent(), runtimeIndex) + "->_lf_" + reactor.getName();
-        if (reactor.isBank()) {
-            // Need the bank index not the runtimeIndex.
-            if (bankIndex == null) bankIndex = bankIndex(reactor);
-            result += "[" + bankIndex + "]";
-        }
-        return result;
-    }
-
-    /**
-     * Return an expression that, when evaluated, gives the index of
-     * a runtime instance of the specified ReactorInstance. If the reactor
-     * is not within any banks, then this will return "0". Otherwise, it
-     * will return an expression that evaluates a mixed-radix number
-     * d0%w0, d1%w1, ... , dn%wn, where n is the depth minus one of the
-     * reactor. The radixes, w0 to wn, are the widths of this reactor,
-     * its parent reactor, on up to the top-level reactor. Since the top-level
-     * reactor is never a bank, dn = 0 and wn = 1. The digits, di, are
-     * either 0 (of the parent is not a bank) or the variable name returned
-     * by {@link #bankIndexName(ReactorInstance)} if the parent is a bank.
-     * The returned expression, when evaluated, will yield the following value:
-     *
-     * <pre>
-     *     d0 + w0 * (d1 + w1 * ( ... (dn-1 + wn-1 * dn) ... )
-     * </pre>
-     *
-     * @param reactor The reactor.
-     */
-    public static String runtimeIndex(ReactorInstance reactor) {
-        StringBuilder result = new StringBuilder();
-        int width = 0;
-        int parens = 0;
-        while (reactor != null) {
-            if (reactor.isBank() && reactor.getWidth() > 1) {
-                if (width > 0) {
-                    result.append(" + " + width + " * (");
-                    parens++;
-                }
-                result.append(bankIndexName(reactor));
-                width = reactor.getWidth();
-            }
-            reactor = reactor.getParent();
-        }
-        while (parens-- > 0) {
-            result.append(")");
-        }
-        if (result.length() == 0) return "0";
-        return result.toString();
-    }
-
-    /**
-     * Return a unique type for the "self" struct of the specified
-     * reactor class from the reactor class.
-     * @param reactor The reactor class.
-     * @return The type of a self struct for the specified reactor class.
-     */
-    public static String selfType(TypeParameterizedReactor reactor) {
-        if (reactor.reactor().isMain()) {
-            return "_" + CUtil.getName(reactor) + "_main_self_t";
-        }
-        return "_" + CUtil.getName(reactor) + "_self_t";
-    }
-
-    /** Construct a unique type for the "self" struct of the class of the given reactor. */
-    public static String selfType(ReactorInstance instance) {
-        return selfType(instance.tpr);
-    }
-
-    /**
-     * Return a reference to the trigger_t struct of the specified
-     * trigger instance (input port or action). This trigger_t struct
-     * is on the self struct.
-     * @param instance The port or action instance.
-     */
-    public static String triggerRef(TriggerInstance<? extends Variable> instance) {
-        return triggerRef(instance, null);
-    }
-
-    /**
-     * Return a reference to the trigger_t struct of the specified
-     * trigger instance (input port or action). This trigger_t struct
-     * is on the self struct.
-     * @param instance The port or action instance.
-     * @param runtimeIndex An optional index variable name to use to address runtime instances.
-     */
-    public static String triggerRef(TriggerInstance<? extends Variable> instance, String runtimeIndex) {
-        return reactorRef(instance.getParent(), runtimeIndex)
-                + "->_lf__"
-                + instance.getName();
-    }
-
-    /**
-     * Return a reference to the trigger_t struct for the specified
-     * port of a contained reactor.
-     * @param port The output port of a contained reactor.
-     */
-    public static String triggerRefNested(PortInstance port) {
-        return triggerRefNested(port, null, null);
-    }
-
-    /**
-     * Return a reference to the trigger_t struct for the specified
-     * port of a contained reactor.
-     * @param port The output port of a contained reactor.
-     * @param runtimeIndex An optional index variable name to use to index
-     *  the runtime instance of the port's parent's parent, or null to get the
-     *  default returned by {@link CUtil#runtimeIndex(ReactorInstance)}.
-     * @param bankIndex An optional index variable name to use to index
-     *  the the bank of the port's parent, or null to get the default returned by
-     *  {@link CUtil#bankIndex(ReactorInstance)}.
-     */
-    public static String triggerRefNested(PortInstance port, String runtimeIndex, String bankIndex) {
-        return reactorRefNested(port.getParent(), runtimeIndex, bankIndex) + "." + port.getName() + "_trigger";
-    }
-
-
-    //////////////////////////////////////////////////////
-    //// FIXME: Not clear what the strategy is with the following inner interface.
-    // The {@code ReportCommandErrors} interface allows the
-    // method runBuildCommand to call a protected
-    // method from the CGenerator if that method is passed
-    // using a method reference. The method that is passed
-    // is then interpreted as a ReportCommandErrors instance.
-    // This is a convenient way to factor out part of the
-    // internals of the CGenerator while maintaining
-    // encapsulation, even though the internals of the CGenerator
-    // might seem to be tightly coupled. FIXME: Delete this comment
-
-    /**
-     * A {@code ReportCommandErrors} is a way to analyze command
-     * output and report any errors that it describes.
-     * FIXME: If the VSCode branch passes code review
-     *  without significant revision, this mechanism will probably be replaced.
-     */
-    public interface ReportCommandErrors {
-        void report(String errors);
-    }
-
-    /**
-     * Run the custom build command specified with the "build" parameter.
-     * This command is executed in the same directory as the source file.
-     * <p>
-     * The following environment variables will be available to the command:
-     * <ul>
-     * <li> {@code: LF_CURRENT_WORKING_DIRECTORY}: The directory in which the command is invoked.
-     * <li> {@code:LF_SOURCE_DIRECTORY}: The directory containing the .lf file being compiled.
-     * <li> {@code:LF_PACKAGE_DIRECTORY}: The directory that is the root of the package.
-     * <li> {@code:LF_SOURCE_GEN_DIRECTORY}: The directory in which generated files are placed.
-     * <li> {@code:LF_BIN_DIRECTORY}: The directory into which to put binaries.
-     * </ul>
-     */
-    public static void runBuildCommand(
-        FileConfig fileConfig,
-        TargetConfig targetConfig,
-        GeneratorCommandFactory commandFactory,
-        ErrorReporter errorReporter,
-        ReportCommandErrors reportCommandErrors,
-        LFGeneratorContext.Mode mode
-    ) {
-        List<LFCommand> commands = getCommands(targetConfig.buildCommands, commandFactory, fileConfig.srcPath);
-        // If the build command could not be found, abort.
-        // An error has already been reported in createCommand.
-        if (commands.stream().anyMatch(Objects::isNull)) return;
-
-        for (LFCommand cmd : commands) {
-            int returnCode = cmd.run();
-            if (returnCode != 0 && mode != LFGeneratorContext.Mode.EPOCH) {
-                errorReporter.reportError(String.format(
-                    // FIXME: Why is the content of stderr not provided to the user in this error message?
-                    "Build command \"%s\" failed with error code %d.",
-                    targetConfig.buildCommands, returnCode
-                ));
-                return;
-            }
-            // For warnings (vs. errors), the return code is 0.
-            // But we still want to mark the IDE.
-            if (!cmd.getErrors().toString().isEmpty() && mode == LFGeneratorContext.Mode.EPOCH) {
-                reportCommandErrors.report(cmd.getErrors().toString());
-                return; // FIXME: Why do we return here? Even if there are warnings, the build process should proceed.
-            }
-        }
-    }
-
-
-    /**
-     * Remove files in the bin directory that may have been created.
-     * Call this if a compilation occurs so that files from a previous
-     * version do not accidentally get executed.
-     * @param fileConfig
-     */
-    public static void deleteBinFiles(FileConfig fileConfig) {
-        String name = FileUtil.nameWithoutExtension(fileConfig.srcFile);
-        String[] files = fileConfig.binPath.toFile().list();
-        List<String> federateNames = new LinkedList<>(); // FIXME: put this in ASTUtils?
-        fileConfig.resource.getAllContents().forEachRemaining(node -> {
-            if (node instanceof Reactor r) {
+        result.append(bankIndexName(reactor));
+        width = reactor.getWidth();
+      }
+      reactor = reactor.getParent();
+    }
+    while (parens-- > 0) {
+      result.append(")");
+    }
+    if (result.length() == 0) return "0";
+    return result.toString();
+  }
+
+  /**
+   * Return a unique type for the "self" struct of the specified reactor class from the reactor
+   * class.
+   *
+   * @param reactor The reactor class.
+   * @return The type of a self struct for the specified reactor class.
+   */
+  public static String selfType(TypeParameterizedReactor reactor) {
+    if (reactor.reactor().isMain()) {
+      return "_" + CUtil.getName(reactor) + "_main_self_t";
+    }
+    return "_" + CUtil.getName(reactor) + "_self_t";
+  }
+
+  /** Construct a unique type for the "self" struct of the class of the given reactor. */
+  public static String selfType(ReactorInstance instance) {
+    return selfType(instance.tpr);
+  }
+
+  /**
+   * Return a reference to the trigger_t struct of the specified trigger instance (input port or
+   * action). This trigger_t struct is on the self struct.
+   *
+   * @param instance The port or action instance.
+   */
+  public static String triggerRef(TriggerInstance<? extends Variable> instance) {
+    return triggerRef(instance, null);
+  }
+
+  /**
+   * Return a reference to the trigger_t struct of the specified trigger instance (input port or
+   * action). This trigger_t struct is on the self struct.
+   *
+   * @param instance The port or action instance.
+   * @param runtimeIndex An optional index variable name to use to address runtime instances.
+   */
+  public static String triggerRef(
+      TriggerInstance<? extends Variable> instance, String runtimeIndex) {
+    return reactorRef(instance.getParent(), runtimeIndex) + "->_lf__" + instance.getName();
+  }
+
+  /**
+   * Return a reference to the trigger_t struct for the specified port of a contained reactor.
+   *
+   * @param port The output port of a contained reactor.
+   */
+  public static String triggerRefNested(PortInstance port) {
+    return triggerRefNested(port, null, null);
+  }
+
+  /**
+   * Return a reference to the trigger_t struct for the specified port of a contained reactor.
+   *
+   * @param port The output port of a contained reactor.
+   * @param runtimeIndex An optional index variable name to use to index the runtime instance of the
+   *     port's parent's parent, or null to get the default returned by {@link
+   *     CUtil#runtimeIndex(ReactorInstance)}.
+   * @param bankIndex An optional index variable name to use to index the the bank of the port's
+   *     parent, or null to get the default returned by {@link CUtil#bankIndex(ReactorInstance)}.
+   */
+  public static String triggerRefNested(PortInstance port, String runtimeIndex, String bankIndex) {
+    return reactorRefNested(port.getParent(), runtimeIndex, bankIndex)
+        + "."
+        + port.getName()
+        + "_trigger";
+  }
+
+  //////////////////////////////////////////////////////
+  //// FIXME: Not clear what the strategy is with the following inner interface.
+  // The {@code ReportCommandErrors} interface allows the
+  // method runBuildCommand to call a protected
+  // method from the CGenerator if that method is passed
+  // using a method reference. The method that is passed
+  // is then interpreted as a ReportCommandErrors instance.
+  // This is a convenient way to factor out part of the
+  // internals of the CGenerator while maintaining
+  // encapsulation, even though the internals of the CGenerator
+  // might seem to be tightly coupled. FIXME: Delete this comment
+
+  /**
+   * A {@code ReportCommandErrors} is a way to analyze command output and report any errors that it
+   * describes. FIXME: If the VSCode branch passes code review without significant revision, this
+   * mechanism will probably be replaced.
+   */
+  public interface ReportCommandErrors {
+    void report(String errors);
+  }
+
+  /**
+   * Run the custom build command specified with the "build" parameter. This command is executed in
+   * the same directory as the source file.
+   *
+   * <p>The following environment variables will be available to the command:
+   *
+   * <ul>
+   *   <li>{@code: LF_CURRENT_WORKING_DIRECTORY}: The directory in which the command is invoked.
+   *   <li>{@code:LF_SOURCE_DIRECTORY}: The directory containing the .lf file being compiled.
+   *   <li>{@code:LF_PACKAGE_DIRECTORY}: The directory that is the root of the package.
+   *   <li>{@code:LF_SOURCE_GEN_DIRECTORY}: The directory in which generated files are placed.
+   *   <li>{@code:LF_BIN_DIRECTORY}: The directory into which to put binaries.
+   * </ul>
+   */
+  public static void runBuildCommand(
+      FileConfig fileConfig,
+      TargetConfig targetConfig,
+      GeneratorCommandFactory commandFactory,
+      ErrorReporter errorReporter,
+      ReportCommandErrors reportCommandErrors,
+      LFGeneratorContext.Mode mode) {
+    List<LFCommand> commands =
+        getCommands(targetConfig.buildCommands, commandFactory, fileConfig.srcPath);
+    // If the build command could not be found, abort.
+    // An error has already been reported in createCommand.
+    if (commands.stream().anyMatch(Objects::isNull)) return;
+
+    for (LFCommand cmd : commands) {
+      int returnCode = cmd.run();
+      if (returnCode != 0 && mode != LFGeneratorContext.Mode.EPOCH) {
+        errorReporter.reportError(
+            String.format(
+                // FIXME: Why is the content of stderr not provided to the user in this error
+                // message?
+                "Build command \"%s\" failed with error code %d.",
+                targetConfig.buildCommands, returnCode));
+        return;
+      }
+      // For warnings (vs. errors), the return code is 0.
+      // But we still want to mark the IDE.
+      if (!cmd.getErrors().toString().isEmpty() && mode == LFGeneratorContext.Mode.EPOCH) {
+        reportCommandErrors.report(cmd.getErrors().toString());
+        return; // FIXME: Why do we return here? Even if there are warnings, the build process
+        // should proceed.
+      }
+    }
+  }
+
+  /**
+   * Remove files in the bin directory that may have been created. Call this if a compilation occurs
+   * so that files from a previous version do not accidentally get executed.
+   *
+   * @param fileConfig
+   */
+  public static void deleteBinFiles(FileConfig fileConfig) {
+    String name = FileUtil.nameWithoutExtension(fileConfig.srcFile);
+    String[] files = fileConfig.binPath.toFile().list();
+    List<String> federateNames = new LinkedList<>(); // FIXME: put this in ASTUtils?
+    fileConfig
+        .resource
+        .getAllContents()
+        .forEachRemaining(
+            node -> {
+              if (node instanceof Reactor r) {
                 if (r.isFederated()) {
-                    r.getInstantiations().forEach(inst -> federateNames
-                        .add(inst.getName()));
+                  r.getInstantiations().forEach(inst -> federateNames.add(inst.getName()));
                 }
-            }
-        });
-        for (String f : files) {
-            // Delete executable file or launcher script, if any.
-            // Delete distribution file, if any.
-            // Delete RTI file, if any.
-            if (f.equals(name) || f.equals(name + RTI_BIN_SUFFIX)
-                || f.equals(name + RTI_DISTRIBUTION_SCRIPT_SUFFIX)) {
-                //noinspection ResultOfMethodCallIgnored
-                fileConfig.binPath.resolve(f).toFile().delete();
-            }
-            // Delete federate executable files, if any.
-            for (String federateName : federateNames) {
-                if (f.equals(name + "_" + federateName)) {
-                    //noinspection ResultOfMethodCallIgnored
-                    fileConfig.binPath.resolve(f).toFile().delete();
-                }
-            }
+              }
+            });
+    for (String f : files) {
+      // Delete executable file or launcher script, if any.
+      // Delete distribution file, if any.
+      // Delete RTI file, if any.
+      if (f.equals(name)
+          || f.equals(name + RTI_BIN_SUFFIX)
+          || f.equals(name + RTI_DISTRIBUTION_SCRIPT_SUFFIX)) {
+        //noinspection ResultOfMethodCallIgnored
+        fileConfig.binPath.resolve(f).toFile().delete();
+      }
+      // Delete federate executable files, if any.
+      for (String federateName : federateNames) {
+        if (f.equals(name + "_" + federateName)) {
+          //noinspection ResultOfMethodCallIgnored
+          fileConfig.binPath.resolve(f).toFile().delete();
         }
-    }
-
-    //////////////////////////////////////////////////////
-    //// Private functions.
-
-    /**
-     * If the argument is a multiport, then return a string that
-     * gives the width as an expression, and otherwise, return null.
-     * The string will be empty if the width is variable (specified
-     * as '[]'). Otherwise, if is a single term or a sum of terms
-     * (separated by '+'), where each term is either an integer
-     * or a parameter reference in the target language.
-     */
-    public static String multiportWidthExpression(Variable variable) {
-        List<String> spec = multiportWidthTerms(variable);
-        return spec == null ? null : String.join(" + ", spec);
-    }
-
-    //////////////////////////////////////////////////////
-    //// Private methods.
-
-    /**
-     * Convert the given commands from strings to their LFCommand
-     * representation and return a list of LFCommand.
-     * @param commands A list of commands as strings.
-     * @param factory A command factory.
-     * @param dir The directory in which the commands should be executed.
-     * @return The LFCommand representations of the given commands,
-     *  where {@code null} is a placeholder for commands that cannot be
-     *  executed.
-     */
-    private static List<LFCommand> getCommands(List<String> commands, GeneratorCommandFactory factory, Path dir) {
-        return commands.stream()
-                       .map(cmd -> List.of(cmd.split("\\s+")))
-                       .filter(tokens -> tokens.size() > 0)
-                       .map(tokens -> factory.createCommand(tokens.get(0), tokens.subList(1, tokens.size()), dir))
-                       .collect(Collectors.toList());
-    }
-
-    /**
-     * Return target code for a parameter reference, which in
-     * this case is just the parameter name.
-     *
-     * @param param The parameter to generate code for.
-     * @return Parameter reference in target code.
-     */
-    private static String getTargetReference(Parameter param) {
-        return param.getName();
-    }
-
-    /**
-     * If the argument is a multiport, return a list of strings
-     * describing the width of the port, and otherwise, return null.
-     * If the list is empty, then the width is variable (specified
-     * as '[]'). Otherwise, it is a list of integers and/or parameter
-     * references.
-     * @param variable The port.
-     * @return The width specification for a multiport or null if it is
-     *  not a multiport.
-     */
-    private static List<String> multiportWidthTerms(Variable variable) {
-        List<String> result = null;
-        if (variable instanceof Port) {
-            if (((Port) variable).getWidthSpec() != null) {
-                result = new ArrayList<>();
-                if (!((Port) variable).getWidthSpec().isOfVariableLength()) {
-                    for (WidthTerm term : ((Port) variable).getWidthSpec().getTerms()) {
-                        if (term.getParameter() != null) {
-                            result.add(getTargetReference(term.getParameter()));
-                        } else {
-                            result.add(String.valueOf(term.getWidth()));
-                        }
-                    }
-                }
+      }
+    }
+  }
+
+  //////////////////////////////////////////////////////
+  //// Private functions.
+
+  /**
+   * If the argument is a multiport, then return a string that gives the width as an expression, and
+   * otherwise, return null. The string will be empty if the width is variable (specified as '[]').
+   * Otherwise, if is a single term or a sum of terms (separated by '+'), where each term is either
+   * an integer or a parameter reference in the target language.
+   */
+  public static String multiportWidthExpression(Variable variable) {
+    List<String> spec = multiportWidthTerms(variable);
+    return spec == null ? null : String.join(" + ", spec);
+  }
+
+  //////////////////////////////////////////////////////
+  //// Private methods.
+
+  /**
+   * Convert the given commands from strings to their LFCommand representation and return a list of
+   * LFCommand.
+   *
+   * @param commands A list of commands as strings.
+   * @param factory A command factory.
+   * @param dir The directory in which the commands should be executed.
+   * @return The LFCommand representations of the given commands, where {@code null} is a
+   *     placeholder for commands that cannot be executed.
+   */
+  private static List<LFCommand> getCommands(
+      List<String> commands, GeneratorCommandFactory factory, Path dir) {
+    return commands.stream()
+        .map(cmd -> List.of(cmd.split("\\s+")))
+        .filter(tokens -> tokens.size() > 0)
+        .map(tokens -> factory.createCommand(tokens.get(0), tokens.subList(1, tokens.size()), dir))
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Return target code for a parameter reference, which in this case is just the parameter name.
+   *
+   * @param param The parameter to generate code for.
+   * @return Parameter reference in target code.
+   */
+  private static String getTargetReference(Parameter param) {
+    return param.getName();
+  }
+
+  /**
+   * If the argument is a multiport, return a list of strings describing the width of the port, and
+   * otherwise, return null. If the list is empty, then the width is variable (specified as '[]').
+   * Otherwise, it is a list of integers and/or parameter references.
+   *
+   * @param variable The port.
+   * @return The width specification for a multiport or null if it is not a multiport.
+   */
+  private static List<String> multiportWidthTerms(Variable variable) {
+    List<String> result = null;
+    if (variable instanceof Port) {
+      if (((Port) variable).getWidthSpec() != null) {
+        result = new ArrayList<>();
+        if (!((Port) variable).getWidthSpec().isOfVariableLength()) {
+          for (WidthTerm term : ((Port) variable).getWidthSpec().getTerms()) {
+            if (term.getParameter() != null) {
+              result.add(getTargetReference(term.getParameter()));
+            } else {
+              result.add(String.valueOf(term.getWidth()));
             }
+          }
         }
-        return result;
-    }
-
-    /**
-     * Given a type for an input or output, return true if it should be
-     * carried by a lf_token_t struct rather than the type itself.
-     * It should be carried by such a struct if the type ends with *
-     * (it is a pointer) or [] (it is a array with unspecified length).
-     * @param type The type specification.
-     */
-    public static boolean isTokenType(InferredType type, CTypes types) {
-        if (type.isUndefined()) return false;
-        // This is a hacky way to do this. It is now considered to be a bug (#657)
-        return type.isVariableSizeList || type.astType != null && (!type.astType.getStars().isEmpty() ||
-            type.astType.getCode() != null && type.astType.getCode().getBody().stripTrailing().endsWith("*"));
-    }
-
-    public static String generateWidthVariable(String var) {
-        return var + "_width";
-    }
-
-    /** If the type specification of the form {@code type[]},
-     *  {@code type*}, or {@code type}, return the type.
-     *  @param type A string describing the type.
-     */
-    public static String rootType(String type) {
-        if (type.endsWith("]")) {
-            return type.substring(0, type.indexOf("[")).trim();
-        } else if (type.endsWith("*")) {
-            return type.substring(0, type.length() - 1).trim();
-        } else {
-            return type.trim();
-        }
-    }
-
-    /**
-     * Return the full name of the specified instance without
-     * the leading name of the top-level reactor, unless this
-     * is the top-level reactor, in which case return its name.
-     * @param instance The instance.
-     * @return A shortened instance name.
-     */
-    public static String getShortenedName(ReactorInstance instance) {
-        var description = instance.getFullName();
-        // If not at the top level, strip off the name of the top level.
-        var period = description.indexOf(".");
-        if (period > 0) {
-            description = description.substring(period + 1);
-        }
-        return description;
-    }
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Given a type for an input or output, return true if it should be carried by a lf_token_t struct
+   * rather than the type itself. It should be carried by such a struct if the type ends with * (it
+   * is a pointer) or [] (it is a array with unspecified length).
+   *
+   * @param type The type specification.
+   */
+  public static boolean isTokenType(InferredType type, CTypes types) {
+    if (type.isUndefined()) return false;
+    // This is a hacky way to do this. It is now considered to be a bug (#657)
+    return type.isVariableSizeList
+        || type.astType != null
+            && (!type.astType.getStars().isEmpty()
+                || type.astType.getCode() != null
+                    && type.astType.getCode().getBody().stripTrailing().endsWith("*"));
+  }
+
+  public static String generateWidthVariable(String var) {
+    return var + "_width";
+  }
+
+  /**
+   * If the type specification of the form {@code type[]}, {@code type*}, or {@code type}, return
+   * the type.
+   *
+   * @param type A string describing the type.
+   */
+  public static String rootType(String type) {
+    if (type.endsWith("]")) {
+      return type.substring(0, type.indexOf("[")).trim();
+    } else if (type.endsWith("*")) {
+      return type.substring(0, type.length() - 1).trim();
+    } else {
+      return type.trim();
+    }
+  }
+
+  /**
+   * Return the full name of the specified instance without the leading name of the top-level
+   * reactor, unless this is the top-level reactor, in which case return its name.
+   *
+   * @param instance The instance.
+   * @return A shortened instance name.
+   */
+  public static String getShortenedName(ReactorInstance instance) {
+    var description = instance.getFullName();
+    // If not at the top level, strip off the name of the top level.
+    var period = description.indexOf(".");
+    if (period > 0) {
+      description = description.substring(period + 1);
+    }
+    return description;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/CWatchdogGenerator.java b/org.lflang/src/org/lflang/generator/c/CWatchdogGenerator.java
index d403c1cddc..f864ca2661 100644
--- a/org.lflang/src/org/lflang/generator/c/CWatchdogGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CWatchdogGenerator.java
@@ -2,15 +2,15 @@
  * @file
  * @author Benjamin Asch
  * @author Edward A. Lee
- * @copyright (c) 2023, The University of California at Berkeley.
- * License: <a href="https://github.com/lf-lang/lingua-franca/blob/master/LICENSE">BSD 2-clause</a>
+ * @copyright (c) 2023, The University of California at Berkeley. License: <a
+ *     href="https://github.com/lf-lang/lingua-franca/blob/master/LICENSE">BSD 2-clause</a>
  * @brief Code generation methods for watchdogs in C.
  */
 package org.lflang.generator.c;
 
 import java.util.List;
-import org.lflang.ast.ASTUtils;
 import org.lflang.ErrorReporter;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Mode;
@@ -21,11 +21,9 @@
 import org.lflang.lf.Watchdog;
 
 /**
- * @brief Generate C code for watchdogs.
- * This class contains a collection of static methods supporting code generation in C
- * for watchdogs. These methods are protected because they are intended to be used
- * only within the same package.
- *
+ * @brief Generate C code for watchdogs. This class contains a collection of static methods
+ *     supporting code generation in C for watchdogs. These methods are protected because they are
+ *     intended to be used only within the same package.
  * @author Benjamin Asch
  * @author Edward A. Lee
  */
@@ -33,6 +31,7 @@ public class CWatchdogGenerator {
 
   /**
    * Return true if the given reactor has one or more watchdogs.
+   *
    * @param reactor The reactor.
    * @return True if the given reactor has watchdogs.
    */
@@ -46,9 +45,10 @@ public static boolean hasWatchdogs(Reactor reactor) {
   // Protected methods
 
   /**
-   * For the specified reactor instance, generate initialization code for each watchdog
-   * in the reactor. This code initializes the watchdog-related fields on the self struct
-   * of the reactor instance.
+   * For the specified reactor instance, generate initialization code for each watchdog in the
+   * reactor. This code initializes the watchdog-related fields on the self struct of the reactor
+   * instance.
+   *
    * @param code The place to put the code
    * @param instance The reactor instance
    * @return The count of watchdogs found in the reactor
@@ -58,19 +58,24 @@ protected static int generateInitializeWatchdogs(CodeBuilder code, ReactorInstan
     var temp = new CodeBuilder();
     var reactorRef = CUtil.reactorRef(instance);
     int watchdogCount = 0;
-    for (Watchdog watchdog
-        : ASTUtils.allWatchdogs(ASTUtils.toDefinition(instance.getDefinition().getReactorClass()))) {
+    for (Watchdog watchdog :
+        ASTUtils.allWatchdogs(ASTUtils.toDefinition(instance.getDefinition().getReactorClass()))) {
       var watchdogField = reactorRef + "->_lf_watchdog_" + watchdog.getName();
-      temp.pr(String.join("\n",
-          "_lf_watchdogs[watchdog_number++] = &" + watchdogField + ";",
-          watchdogField + ".min_expiration = "
-              + CTypes.getInstance().getTargetTimeExpr(instance.getTimeValue(watchdog.getTimeout()))
-              + ";",
-          watchdogField + ".thread_active = false;",
-          "if (" + watchdogField + ".base->reactor_mutex == NULL) {",
-          "   " + watchdogField + ".base->reactor_mutex = (lf_mutex_t*)calloc(1, sizeof(lf_mutex_t));",
-          "}"
-      ));
+      temp.pr(
+          String.join(
+              "\n",
+              "_lf_watchdogs[watchdog_number++] = &" + watchdogField + ";",
+              watchdogField
+                  + ".min_expiration = "
+                  + CTypes.getInstance()
+                      .getTargetTimeExpr(instance.getTimeValue(watchdog.getTimeout()))
+                  + ";",
+              watchdogField + ".thread_active = false;",
+              "if (" + watchdogField + ".base->reactor_mutex == NULL) {",
+              "   "
+                  + watchdogField
+                  + ".base->reactor_mutex = (lf_mutex_t*)calloc(1, sizeof(lf_mutex_t));",
+              "}"));
       watchdogCount += 1;
       foundOne = true;
     }
@@ -92,8 +97,10 @@ protected static int generateInitializeWatchdogs(CodeBuilder code, ReactorInstan
    * @param tpr The reactor declaration
    */
   protected static void generateWatchdogs(
-      CodeBuilder src, CodeBuilder header, TypeParameterizedReactor tpr, ErrorReporter errorReporter
-  ) {
+      CodeBuilder src,
+      CodeBuilder header,
+      TypeParameterizedReactor tpr,
+      ErrorReporter errorReporter) {
     if (hasWatchdogs(tpr.reactor())) {
       header.pr("#include \"core/threaded/watchdog.h\"");
       for (Watchdog watchdog : ASTUtils.allWatchdogs(tpr.reactor())) {
@@ -104,6 +111,7 @@ protected static void generateWatchdogs(
 
   /**
    * Generate watchdog definitions in the reactor's self struct.
+   *
    * @param body The place to put the definitions
    * @param tpr The concrete reactor class
    * @param constructorCode The place to put initialization code.
@@ -135,34 +143,31 @@ protected static void generateWatchdogStruct(
                   + watchdogName
                   + ".trigger = &(self->_lf__"
                   + watchdogName
-                  + ");"
-          )
-      );
+                  + ");"));
     }
   }
 
   /**
    * Generate a global table of watchdog structs.
+   *
    * @param count The number of watchdogs found.
    * @return The code that defines the table or a comment if count is 0.
    */
   protected static String generateWatchdogTable(int count) {
     if (count == 0) {
-      return String.join("\n",
+      return String.join(
+          "\n",
           "// No watchdogs found.",
           "typedef void watchdog_t;",
           "watchdog_t* _lf_watchdogs = NULL;",
-          "int _lf_watchdog_count = 0;"
-      );
+          "int _lf_watchdog_count = 0;");
     }
     return String.join(
         "\n",
         List.of(
             "// Array of pointers to watchdog structs.",
             "watchdog_t* _lf_watchdogs[" + count + "];",
-            "int _lf_watchdog_count = " + count + ";"
-        )
-    );
+            "int _lf_watchdog_count = " + count + ";"));
   }
 
   /////////////////////////////////////////////////////////////////
@@ -175,10 +180,7 @@ protected static String generateWatchdogTable(int count) {
    * @param tpr The concrete reactor class that has the watchdog
    */
   private static String generateInitializationForWatchdog(
-      Watchdog watchdog,
-      TypeParameterizedReactor tpr,
-      ErrorReporter errorReporter
-  ) {
+      Watchdog watchdog, TypeParameterizedReactor tpr, ErrorReporter errorReporter) {
 
     // Construct the reactionInitialization code to go into
     // the body of the function before the verbatim code.
@@ -219,14 +221,15 @@ private static String generateInitializationForWatchdog(
                     + name
                     + "_change_type = "
                     + (effect.getTransition() == ModeTransition.HISTORY
-                    ? "history_transition"
-                    : "reset_transition")
+                        ? "history_transition"
+                        : "reset_transition")
                     + ";");
           } else {
-               errorReporter.reportError(
-                   watchdog,
-                   "In generateInitializationForWatchdog(): " + name + " not a valid mode of this reactor."
-               );
+            errorReporter.reportError(
+                watchdog,
+                "In generateInitializationForWatchdog(): "
+                    + name
+                    + " not a valid mode of this reactor.");
           }
         }
       }
@@ -264,11 +267,9 @@ private static String generateFunction(String header, String init, Watchdog watc
     return function.toString();
   }
 
-
   /** Generate the watchdog handler function. */
   private static String generateWatchdogFunction(
-      Watchdog watchdog, TypeParameterizedReactor tpr, ErrorReporter errorReporter
-  ) {
+      Watchdog watchdog, TypeParameterizedReactor tpr, ErrorReporter errorReporter) {
     return generateFunction(
         generateWatchdogFunctionHeader(watchdog, tpr),
         generateInitializationForWatchdog(watchdog, tpr, errorReporter),
@@ -282,7 +283,8 @@ private static String generateWatchdogFunction(
    * @param tpr The concrete reactor class
    * @return The function name for the watchdog function.
    */
-  private static String generateWatchdogFunctionHeader(Watchdog watchdog, TypeParameterizedReactor tpr) {
+  private static String generateWatchdogFunctionHeader(
+      Watchdog watchdog, TypeParameterizedReactor tpr) {
     String functionName = watchdogFunctionName(watchdog, tpr);
     return CReactionGenerator.generateFunctionHeader(functionName);
   }
diff --git a/org.lflang/src/org/lflang/generator/c/InteractingContainedReactors.java b/org.lflang/src/org/lflang/generator/c/InteractingContainedReactors.java
index 20ed65687b..16f5ceb565 100644
--- a/org.lflang/src/org/lflang/generator/c/InteractingContainedReactors.java
+++ b/org.lflang/src/org/lflang/generator/c/InteractingContainedReactors.java
@@ -5,7 +5,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Input;
 import org.lflang.lf.Instantiation;
@@ -23,131 +22,125 @@
  * @author Soroush Bateni
  * @author Hou Seng Wong
  */
-
 public class InteractingContainedReactors {
-    /**
-     * Data structure that for each instantiation of a contained
-     * reactor. This provides a set of input and output ports that trigger
-     * reactions of the container, are read by a reaction of the
-     * container, or that receive data from a reaction of the container.
-     * For each port, this provides a list of reaction indices that
-     * are triggered by the port, or an empty list if there are no
-     * reactions triggered by the port.
-     */
-    // This horrible data structure is a collection, indexed by instantiation
-    // of a contained reactor, of lists, indexed by ports of the contained reactor
-    // that are referenced by reactions of the container, of reactions that are
-    // triggered by the port of the contained reactor. The list is empty if
-    // the port does not trigger reactions but is read by the reaction or
-    // is written to by the reaction.
-    LinkedHashMap<
-        Instantiation, LinkedHashMap<
-            Port, LinkedList<Integer>
-        >
-    > portsByContainedReactor = new LinkedHashMap<>();
+  /**
+   * Data structure that for each instantiation of a contained reactor. This provides a set of input
+   * and output ports that trigger reactions of the container, are read by a reaction of the
+   * container, or that receive data from a reaction of the container. For each port, this provides
+   * a list of reaction indices that are triggered by the port, or an empty list if there are no
+   * reactions triggered by the port.
+   */
+  // This horrible data structure is a collection, indexed by instantiation
+  // of a contained reactor, of lists, indexed by ports of the contained reactor
+  // that are referenced by reactions of the container, of reactions that are
+  // triggered by the port of the contained reactor. The list is empty if
+  // the port does not trigger reactions but is read by the reaction or
+  // is written to by the reaction.
+  LinkedHashMap<Instantiation, LinkedHashMap<Port, LinkedList<Integer>>> portsByContainedReactor =
+      new LinkedHashMap<>();
 
-    /**
-     * Scan the reactions of the specified reactor and record which ports are
-     * referenced by reactions and which reactions are triggered by such ports.
-     */
-    public InteractingContainedReactors(Reactor reactor) {
-        var reactionCount = 0;
-        for (Reaction reaction : ASTUtils.allReactions(reactor)) {
-            // First, handle reactions that produce data sent to inputs
-            // of contained reactors.
-            for (VarRef effect : ASTUtils.convertToEmptyListIfNull(reaction.getEffects())) {
-                // If an effect is an input, then it must be an input
-                // of a contained reactor.
-                if (effect.getVariable() instanceof Input) {
-                    // This reaction is not triggered by the port, so
-                    // we do not add it to the list returned by the following.
-                    addPort(effect.getContainer(), (Input) effect.getVariable());
-                }
-            }
-            // Second, handle reactions that are triggered by outputs
-            // of contained reactors.
-            for (TriggerRef trigger : ASTUtils.convertToEmptyListIfNull(reaction.getTriggers())) {
-                if (trigger instanceof VarRef triggerAsVarRef) {
-                    // If an trigger is an output, then it must be an output
-                    // of a contained reactor.
-                    if (triggerAsVarRef.getVariable() instanceof Output) {
-                        var list = addPort(triggerAsVarRef.getContainer(), (Output) triggerAsVarRef.getVariable());
-                        list.add(reactionCount);
-                    }
-                }
-            }
-            // Third, handle reading (but not triggered by)
-            // outputs of contained reactors.
-            for (VarRef source : ASTUtils.convertToEmptyListIfNull(reaction.getSources())) {
-                if (source.getVariable() instanceof Output) {
-                    // If an source is an output, then it must be an output
-                    // of a contained reactor.
-                    // This reaction is not triggered by the port, so
-                    // we do not add it to the list returned by the following.
-                    addPort(source.getContainer(), (Output) source.getVariable());
-                }
-            }
-        // Increment the reaction count even if not in the federate for consistency.
-        reactionCount++;
+  /**
+   * Scan the reactions of the specified reactor and record which ports are referenced by reactions
+   * and which reactions are triggered by such ports.
+   */
+  public InteractingContainedReactors(Reactor reactor) {
+    var reactionCount = 0;
+    for (Reaction reaction : ASTUtils.allReactions(reactor)) {
+      // First, handle reactions that produce data sent to inputs
+      // of contained reactors.
+      for (VarRef effect : ASTUtils.convertToEmptyListIfNull(reaction.getEffects())) {
+        // If an effect is an input, then it must be an input
+        // of a contained reactor.
+        if (effect.getVariable() instanceof Input) {
+          // This reaction is not triggered by the port, so
+          // we do not add it to the list returned by the following.
+          addPort(effect.getContainer(), (Input) effect.getVariable());
+        }
+      }
+      // Second, handle reactions that are triggered by outputs
+      // of contained reactors.
+      for (TriggerRef trigger : ASTUtils.convertToEmptyListIfNull(reaction.getTriggers())) {
+        if (trigger instanceof VarRef triggerAsVarRef) {
+          // If an trigger is an output, then it must be an output
+          // of a contained reactor.
+          if (triggerAsVarRef.getVariable() instanceof Output) {
+            var list =
+                addPort(triggerAsVarRef.getContainer(), (Output) triggerAsVarRef.getVariable());
+            list.add(reactionCount);
+          }
+        }
+      }
+      // Third, handle reading (but not triggered by)
+      // outputs of contained reactors.
+      for (VarRef source : ASTUtils.convertToEmptyListIfNull(reaction.getSources())) {
+        if (source.getVariable() instanceof Output) {
+          // If an source is an output, then it must be an output
+          // of a contained reactor.
+          // This reaction is not triggered by the port, so
+          // we do not add it to the list returned by the following.
+          addPort(source.getContainer(), (Output) source.getVariable());
         }
+      }
+      // Increment the reaction count even if not in the federate for consistency.
+      reactionCount++;
     }
+  }
 
-    /**
-     * Return or create the list to which reactions triggered by the specified port
-     * are to be added. This also records that the port is referenced by the
-     * container's reactions.
-     * @param containedReactor The contained reactor.
-     * @param port The port.
-     */
-    private List<Integer> addPort(Instantiation containedReactor, Port port) {
-        // Get or create the entry for the containedReactor.
-        var containedReactorEntry = portsByContainedReactor.computeIfAbsent(
-            containedReactor,
-            k -> new LinkedHashMap<>()
-        );
-        // Get or create the entry for the port.
-        return containedReactorEntry.computeIfAbsent(port, k -> new LinkedList<>());
-    }
+  /**
+   * Return or create the list to which reactions triggered by the specified port are to be added.
+   * This also records that the port is referenced by the container's reactions.
+   *
+   * @param containedReactor The contained reactor.
+   * @param port The port.
+   */
+  private List<Integer> addPort(Instantiation containedReactor, Port port) {
+    // Get or create the entry for the containedReactor.
+    var containedReactorEntry =
+        portsByContainedReactor.computeIfAbsent(containedReactor, k -> new LinkedHashMap<>());
+    // Get or create the entry for the port.
+    return containedReactorEntry.computeIfAbsent(port, k -> new LinkedList<>());
+  }
 
-    /**
-     * Return the set of contained reactors that have ports that are referenced
-     * by reactions of the container reactor.
-     */
-    public Set<Instantiation> containedReactors() {
-        return portsByContainedReactor.keySet();
-    }
+  /**
+   * Return the set of contained reactors that have ports that are referenced by reactions of the
+   * container reactor.
+   */
+  public Set<Instantiation> containedReactors() {
+    return portsByContainedReactor.keySet();
+  }
 
-    /**
-     * Return the set of ports of the specified contained reactor that are
-     * referenced by reactions of the container reactor. Return an empty
-     * set if there are none.
-     * @param containedReactor The contained reactor.
-     */
-    public Set<Port> portsOfInstance(Instantiation containedReactor) {
-        Set<Port> result = null;
-        var ports = portsByContainedReactor.get(containedReactor);
-        if (ports == null) {
-            result = new LinkedHashSet<>();
-        } else {
-            result = ports.keySet();
-        }
-        return result;
+  /**
+   * Return the set of ports of the specified contained reactor that are referenced by reactions of
+   * the container reactor. Return an empty set if there are none.
+   *
+   * @param containedReactor The contained reactor.
+   */
+  public Set<Port> portsOfInstance(Instantiation containedReactor) {
+    Set<Port> result = null;
+    var ports = portsByContainedReactor.get(containedReactor);
+    if (ports == null) {
+      result = new LinkedHashSet<>();
+    } else {
+      result = ports.keySet();
     }
+    return result;
+  }
 
-    /**
-     * Return the indices of the reactions triggered by the specified port
-     * of the specified contained reactor or an empty list if there are none.
-     * @param containedReactor The contained reactor.
-     * @param port The port.
-     */
-    public List<Integer> reactionsTriggered(Instantiation containedReactor, Port port) {
-        var ports = portsByContainedReactor.get(containedReactor);
-        if (ports != null) {
-            var list = ports.get(port);
-            if (list != null) {
-                return list;
-            }
-        }
-        return new LinkedList<>();
+  /**
+   * Return the indices of the reactions triggered by the specified port of the specified contained
+   * reactor or an empty list if there are none.
+   *
+   * @param containedReactor The contained reactor.
+   * @param port The port.
+   */
+  public List<Integer> reactionsTriggered(Instantiation containedReactor, Port port) {
+    var ports = portsByContainedReactor.get(containedReactor);
+    if (ports != null) {
+      var list = ports.get(port);
+      if (list != null) {
+        return list;
+      }
     }
+    return new LinkedList<>();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/c/TypeParameterizedReactor.java b/org.lflang/src/org/lflang/generator/c/TypeParameterizedReactor.java
index 5f832e692a..c5e062399b 100644
--- a/org.lflang/src/org/lflang/generator/c/TypeParameterizedReactor.java
+++ b/org.lflang/src/org/lflang/generator/c/TypeParameterizedReactor.java
@@ -1,12 +1,10 @@
 package org.lflang.generator.c;
 
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.InferredType;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.Reactor;
@@ -14,62 +12,79 @@
 
 /**
  * A reactor class combined with concrete type arguments bound to its type parameters.
+ *
  * @param reactor The syntactic reactor class definition
  * @param typeArgs The type arguments associated with this particular variant of the reactor class.
  */
 public record TypeParameterizedReactor(Reactor reactor, Map<String, Type> typeArgs) {
 
-    public TypeParameterizedReactor(Instantiation i) {
-        this(ASTUtils.toDefinition(i.getReactorClass()), addTypeArgs(i, ASTUtils.toDefinition(i.getReactorClass())));
-    }
+  public TypeParameterizedReactor(Instantiation i) {
+    this(
+        ASTUtils.toDefinition(i.getReactorClass()),
+        addTypeArgs(i, ASTUtils.toDefinition(i.getReactorClass())));
+  }
 
-    private static Map<String, Type> addTypeArgs(Instantiation instantiation, Reactor r) {
-        HashMap<String, Type> ret = new HashMap<>();
-        if (instantiation.getTypeArgs() != null) {
-            for (int i = 0; i < r.getTypeParms().size(); i++) {
-                ret.put(r.getTypeParms().get(i).getLiteral(), instantiation.getTypeArgs().get(i));
-            }
-        }
-        return ret;
+  private static Map<String, Type> addTypeArgs(Instantiation instantiation, Reactor r) {
+    HashMap<String, Type> ret = new HashMap<>();
+    if (instantiation.getTypeArgs() != null) {
+      for (int i = 0; i < r.getTypeParms().size(); i++) {
+        ret.put(r.getTypeParms().get(i).getLiteral(), instantiation.getTypeArgs().get(i));
+      }
     }
+    return ret;
+  }
 
-    /** Return the name of the reactor given its type arguments. */
-    public String getName() {
-        // FIXME: Types that are not just a single token need to be escaped or hashed
-        return reactor.getName() + typeArgs.values().stream().map(ASTUtils::toOriginalText).collect(Collectors.joining("_"));
-    }
+  /** Return the name of the reactor given its type arguments. */
+  public String getName() {
+    // FIXME: Types that are not just a single token need to be escaped or hashed
+    return reactor.getName()
+        + typeArgs.values().stream().map(ASTUtils::toOriginalText).collect(Collectors.joining("_"));
+  }
 
-    /** #define type names as concrete types. */
-    public void doDefines(CodeBuilder b) {
-        typeArgs.forEach((literal, concreteType) -> b.pr(
-            "#if defined " + literal + "\n" +
-                "#undef " + literal + "\n" +
-                "#endif // " + literal + "\n" +
-                "#define " + literal + " " + ASTUtils.toOriginalText(concreteType)));
-    }
+  /** #define type names as concrete types. */
+  public void doDefines(CodeBuilder b) {
+    typeArgs.forEach(
+        (literal, concreteType) ->
+            b.pr(
+                "#if defined "
+                    + literal
+                    + "\n"
+                    + "#undef "
+                    + literal
+                    + "\n"
+                    + "#endif // "
+                    + literal
+                    + "\n"
+                    + "#define "
+                    + literal
+                    + " "
+                    + ASTUtils.toOriginalText(concreteType)));
+  }
 
-    /** Resolve type arguments if the given type is defined in terms of generics. */
-    public Type resolveType(Type t) {
-        if (t.getId() != null && typeArgs.get(t.getId()) != null) return typeArgs.get(t.getId());
-        if (t.getCode() == null) return t;
-        var arg = typeArgs.get(t.getCode().getBody());
-        if (arg != null) return arg;
-        return t;
-    }
+  /** Resolve type arguments if the given type is defined in terms of generics. */
+  public Type resolveType(Type t) {
+    if (t.getId() != null && typeArgs.get(t.getId()) != null) return typeArgs.get(t.getId());
+    if (t.getCode() == null) return t;
+    var arg = typeArgs.get(t.getCode().getBody());
+    if (arg != null) return arg;
+    return t;
+  }
 
-    /** Resolve type arguments if the given type is defined in terms of generics. */
-    public InferredType resolveType(InferredType t) {
-        if (t.astType == null) return t;
-        return InferredType.fromAST(resolveType(t.astType));
-    }
+  /** Resolve type arguments if the given type is defined in terms of generics. */
+  public InferredType resolveType(InferredType t) {
+    if (t.astType == null) return t;
+    return InferredType.fromAST(resolveType(t.astType));
+  }
 
-    @Override
-    public int hashCode() {
-        return Math.abs(reactor.hashCode() * 31 + typeArgs.hashCode());
-    }
+  @Override
+  public int hashCode() {
+    return Math.abs(reactor.hashCode() * 31 + typeArgs.hashCode());
+  }
 
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof TypeParameterizedReactor other && reactor.equals(other.reactor) && typeArgs.equals(other.typeArgs);
-    }
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof TypeParameterizedReactor other
+        && reactor.equals(other.reactor)
+        && typeArgs.equals(other.typeArgs);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PyFileConfig.java b/org.lflang/src/org/lflang/generator/python/PyFileConfig.java
index bb6a9e9796..7c67b92493 100644
--- a/org.lflang/src/org/lflang/generator/python/PyFileConfig.java
+++ b/org.lflang/src/org/lflang/generator/python/PyFileConfig.java
@@ -3,33 +3,29 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
-import org.lflang.FileConfig;
 import org.lflang.generator.c.CFileConfig;
 import org.lflang.util.LFCommand;
 
 public class PyFileConfig extends CFileConfig {
-    public PyFileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchicalBin) throws IOException {
-        super(resource, srcGenBasePath, useHierarchicalBin);
-    }
+  public PyFileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchicalBin)
+      throws IOException {
+    super(resource, srcGenBasePath, useHierarchicalBin);
+  }
 
-    @Override
-    public LFCommand getCommand() {
-        return LFCommand.get("python3",
-                      List.of(srcPkgPath.relativize(getExecutable()).toString()),
-                      true,
-                      srcPkgPath);
-    }
+  @Override
+  public LFCommand getCommand() {
+    return LFCommand.get(
+        "python3", List.of(srcPkgPath.relativize(getExecutable()).toString()), true, srcPkgPath);
+  }
 
-    @Override
-    public Path getExecutable() {
-        return srcGenPath.resolve(name + getExecutableExtension());
-    }
+  @Override
+  public Path getExecutable() {
+    return srcGenPath.resolve(name + getExecutableExtension());
+  }
 
-    @Override
-    protected String getExecutableExtension() {
-        return ".py";
-    }
+  @Override
+  protected String getExecutableExtension() {
+    return ".py";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PyUtil.java b/org.lflang/src/org/lflang/generator/python/PyUtil.java
index 48cc8f9e10..35aeed6fbb 100644
--- a/org.lflang/src/org/lflang/generator/python/PyUtil.java
+++ b/org.lflang/src/org/lflang/generator/python/PyUtil.java
@@ -1,28 +1,28 @@
 /* Utilities for Python code generation. */
 
 /*************
-Copyright (c) 2019-2021, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019-2021, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.generator.python;
 
@@ -31,116 +31,126 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.lflang.generator.c.CUtil;
 import org.lflang.lf.Expression;
 
-
 /**
- * A collection of utilities for Python code generation.
- * This class inherits from CUtil but overrides a few methods to
- * codify the coding conventions for the Python target code generator.
+ * A collection of utilities for Python code generation. This class inherits from CUtil but
+ * overrides a few methods to codify the coding conventions for the Python target code generator.
  * I.e., it defines how some variables are named and referenced.
+ *
  * @author Edward A. Lee
  * @author Soroush Bateni
  */
 public class PyUtil extends CUtil {
 
-    /**
-     * Return the name of the list of Python class instances that contains the
-     * specified reactor instance. This is similar to
-     * {@link #reactorRef(ReactorInstance)} except that it does not index into
-     * the list.
-     *
-     * @param instance The reactor instance.
-     */
-    public static String reactorRefName(ReactorInstance instance) {
-        return instance.uniqueID() + "_lf";
-    }
-
-    /**
-     * Return a reference to the list of Python class instances that contains
-     * the specified reactor instance. The returned string has the form
-     * list_name[runtimeIndex], where list_name is the name of the list of
-     * Python class instances that contains this reactor instance. If
-     * runtimeIndex is null, then it is replaced by the expression returned by
-     * {@link runtimeIndex(ReactorInstance)} or 0 if there are no banks.
-     *
-     * @param instance     The reactor instance.
-     * @param runtimeIndex An optional expression to use to address bank
-     *                     members. If this is null, the expression used will be
-     *                     that returned by
-     *                     {@link #runtimeIndex(ReactorInstance)}.
-     */
-    public static String reactorRef(ReactorInstance instance, String runtimeIndex) {
-        if (runtimeIndex == null) runtimeIndex = runtimeIndex(instance);
-        return PyUtil.reactorRefName(instance) + "[" + runtimeIndex + "]";
-    }
-
-    /**
-     * Return a reference to the list of Python class instances that contains
-     * the specified reactor instance. The returned string has the form
-     * list_name[j], where list_name is the name of the list of of Python class
-     * instances that contains this reactor instance and j is the expression
-     * returned by {@link #runtimeIndex(ReactorInstance)} or 0 if there are no
-     * banks.
-     *
-     * @param instance The reactor instance.
-     */
-    public static String reactorRef(ReactorInstance instance) {
-        return PyUtil.reactorRef(instance, null);
-    }
-
-    /**
-     * Convert C types to formats used in Py_BuildValue and PyArg_PurseTuple.
-     * This is unused but will be useful to enable inter-compatibility between
-     * C and Python reactors.
-     * @param type C type
-     */
-    public static String pyBuildValueArgumentType(String type) {
-        switch (type) {
-            case "int":                return "i";
-            case "string":             return "s";
-            case "char":               return "b";
-            case "short int":          return "h";
-            case "long":               return "l";
-            case "unsigned char":      return "B";
-            case "unsigned short int": return "H";
-            case "unsigned int":       return "I";
-            case "unsigned long":      return "k";
-            case "long long":          return "L";
-            case "interval_t":         return "L";
-            case "unsigned long long": return "K";
-            case "double":             return "d";
-            case "float":              return "f";
-            case "Py_complex":         return "D";
-            case "Py_complex*":        return "D";
-            case "Py_Object":          return "O";
-            case "Py_Object*":         return "O";
-            default:                   return "O";
-        }
-    }
-
-    public static String generateGILAcquireCode() {
-        return String.join("\n",
-            "// Acquire the GIL (Global Interpreter Lock) to be able to call Python APIs.",
-            "PyGILState_STATE gstate;",
-            "gstate = PyGILState_Ensure();"
-        );
-    }
-
-    public static String generateGILReleaseCode() {
-        return String.join("\n",
-            "/* Release the thread. No Python API allowed beyond this point. */",
-            "PyGILState_Release(gstate);"
-        );
-    }
-
-    /**
-     * Override to convert some C types to their
-     * Python equivalent.
-     * Examples:
-     * true/false -> True/False
-     * @param expr A value
-     * @return A value string in the target language
-     */
-    protected static String getPythonTargetValue(Expression expr) {
-        return PythonTypes.getInstance().getTargetExpr(expr, InferredType.undefined());
+  /**
+   * Return the name of the list of Python class instances that contains the specified reactor
+   * instance. This is similar to {@link #reactorRef(ReactorInstance)} except that it does not index
+   * into the list.
+   *
+   * @param instance The reactor instance.
+   */
+  public static String reactorRefName(ReactorInstance instance) {
+    return instance.uniqueID() + "_lf";
+  }
+
+  /**
+   * Return a reference to the list of Python class instances that contains the specified reactor
+   * instance. The returned string has the form list_name[runtimeIndex], where list_name is the name
+   * of the list of Python class instances that contains this reactor instance. If runtimeIndex is
+   * null, then it is replaced by the expression returned by {@link runtimeIndex(ReactorInstance)}
+   * or 0 if there are no banks.
+   *
+   * @param instance The reactor instance.
+   * @param runtimeIndex An optional expression to use to address bank members. If this is null, the
+   *     expression used will be that returned by {@link #runtimeIndex(ReactorInstance)}.
+   */
+  public static String reactorRef(ReactorInstance instance, String runtimeIndex) {
+    if (runtimeIndex == null) runtimeIndex = runtimeIndex(instance);
+    return PyUtil.reactorRefName(instance) + "[" + runtimeIndex + "]";
+  }
+
+  /**
+   * Return a reference to the list of Python class instances that contains the specified reactor
+   * instance. The returned string has the form list_name[j], where list_name is the name of the
+   * list of of Python class instances that contains this reactor instance and j is the expression
+   * returned by {@link #runtimeIndex(ReactorInstance)} or 0 if there are no banks.
+   *
+   * @param instance The reactor instance.
+   */
+  public static String reactorRef(ReactorInstance instance) {
+    return PyUtil.reactorRef(instance, null);
+  }
+
+  /**
+   * Convert C types to formats used in Py_BuildValue and PyArg_PurseTuple. This is unused but will
+   * be useful to enable inter-compatibility between C and Python reactors.
+   *
+   * @param type C type
+   */
+  public static String pyBuildValueArgumentType(String type) {
+    switch (type) {
+      case "int":
+        return "i";
+      case "string":
+        return "s";
+      case "char":
+        return "b";
+      case "short int":
+        return "h";
+      case "long":
+        return "l";
+      case "unsigned char":
+        return "B";
+      case "unsigned short int":
+        return "H";
+      case "unsigned int":
+        return "I";
+      case "unsigned long":
+        return "k";
+      case "long long":
+        return "L";
+      case "interval_t":
+        return "L";
+      case "unsigned long long":
+        return "K";
+      case "double":
+        return "d";
+      case "float":
+        return "f";
+      case "Py_complex":
+        return "D";
+      case "Py_complex*":
+        return "D";
+      case "Py_Object":
+        return "O";
+      case "Py_Object*":
+        return "O";
+      default:
+        return "O";
     }
+  }
+
+  public static String generateGILAcquireCode() {
+    return String.join(
+        "\n",
+        "// Acquire the GIL (Global Interpreter Lock) to be able to call Python APIs.",
+        "PyGILState_STATE gstate;",
+        "gstate = PyGILState_Ensure();");
+  }
+
+  public static String generateGILReleaseCode() {
+    return String.join(
+        "\n",
+        "/* Release the thread. No Python API allowed beyond this point. */",
+        "PyGILState_Release(gstate);");
+  }
+
+  /**
+   * Override to convert some C types to their Python equivalent. Examples: true/false -> True/False
+   *
+   * @param expr A value
+   * @return A value string in the target language
+   */
+  protected static String getPythonTargetValue(Expression expr) {
+    return PythonTypes.getInstance().getTargetExpr(expr, InferredType.undefined());
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonActionGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonActionGenerator.java
index 13dbed0f0f..5270a4d69e 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonActionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonActionGenerator.java
@@ -1,14 +1,17 @@
 package org.lflang.generator.python;
 
+import org.lflang.generator.c.CGenerator;
 import org.lflang.generator.c.TypeParameterizedReactor;
 import org.lflang.lf.Action;
-import org.lflang.lf.Reactor;
-import org.lflang.generator.c.CGenerator;
 
 public class PythonActionGenerator {
-    public static String generateAliasTypeDef(TypeParameterizedReactor tpr, Action action,
-                                              String genericActionType) {
+  public static String generateAliasTypeDef(
+      TypeParameterizedReactor tpr, Action action, String genericActionType) {
 
-        return "typedef "+genericActionType+" "+CGenerator.variableStructType(action, tpr, false)+";";
-    }
+    return "typedef "
+        + genericActionType
+        + " "
+        + CGenerator.variableStructType(action, tpr, false)
+        + ";";
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonDelayBodyGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonDelayBodyGenerator.java
index b69cfc7da0..6171f3ca40 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonDelayBodyGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonDelayBodyGenerator.java
@@ -1,6 +1,5 @@
 package org.lflang.generator.python;
 
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.c.CDelayBodyGenerator;
 import org.lflang.generator.c.CUtil;
@@ -10,69 +9,74 @@
 
 public class PythonDelayBodyGenerator extends CDelayBodyGenerator {
 
-    public PythonDelayBodyGenerator(PythonTypes types) {
-        super(types);
-    }
+  public PythonDelayBodyGenerator(PythonTypes types) {
+    super(types);
+  }
 
-    /**
-     * Generate code for the body of a reaction that takes an input and
-     * schedules an action with the value of that input.
-     * @param action The action to schedule
-     * @param port The port to read from
-     */
-    @Override
-    public String generateDelayBody(Action action, VarRef port) {
-        boolean isTokenType = CUtil.isTokenType(ASTUtils.getInferredType(action), types);
-        String ref = ASTUtils.generateVarRef(port);
-        // Note that the action.type set by the base class is actually
-        // the port type.
-        if (isTokenType) {
-            return String.join("\n",
-                "if ("+ref+"->is_present) {",
-                "    // Put the whole token on the event queue, not just the payload.",
-                "    // This way, the length and element_size are transported.",
-                "    lf_schedule_token("+action.getName()+", 0, "+ref+"->token);",
-                "}"
-            );
-        } else {
-            return String.join("\n",
-                "// Create a token.",
-                "#if NUMBER_OF_WORKERS > 0",
-                "// Need to lock the mutex first.",
-                "lf_mutex_lock(&mutex);",
-                "#endif",
-                "lf_token_t* t = _lf_new_token((token_type_t*)"+action.getName()+", self->_lf_"+ref+"->value, 1);",
-                "#if NUMBER_OF_WORKERS > 0",
-                "lf_mutex_unlock(&mutex);",
-                "#endif",
-                "",
-                "// Pass the token along",
-                "lf_schedule_token("+action.getName()+", 0, t);"
-            );
-        }
+  /**
+   * Generate code for the body of a reaction that takes an input and schedules an action with the
+   * value of that input.
+   *
+   * @param action The action to schedule
+   * @param port The port to read from
+   */
+  @Override
+  public String generateDelayBody(Action action, VarRef port) {
+    boolean isTokenType = CUtil.isTokenType(ASTUtils.getInferredType(action), types);
+    String ref = ASTUtils.generateVarRef(port);
+    // Note that the action.type set by the base class is actually
+    // the port type.
+    if (isTokenType) {
+      return String.join(
+          "\n",
+          "if (" + ref + "->is_present) {",
+          "    // Put the whole token on the event queue, not just the payload.",
+          "    // This way, the length and element_size are transported.",
+          "    lf_schedule_token(" + action.getName() + ", 0, " + ref + "->token);",
+          "}");
+    } else {
+      return String.join(
+          "\n",
+          "// Create a token.",
+          "#if NUMBER_OF_WORKERS > 0",
+          "// Need to lock the mutex first.",
+          "lf_mutex_lock(&mutex);",
+          "#endif",
+          "lf_token_t* t = _lf_new_token((token_type_t*)"
+              + action.getName()
+              + ", self->_lf_"
+              + ref
+              + "->value, 1);",
+          "#if NUMBER_OF_WORKERS > 0",
+          "lf_mutex_unlock(&mutex);",
+          "#endif",
+          "",
+          "// Pass the token along",
+          "lf_schedule_token(" + action.getName() + ", 0, t);");
     }
+  }
 
-    /**
-     * Generate code for the body of a reaction that is triggered by the
-     * given action and writes its value to the given port. This realizes
-     * the receiving end of a logical delay specified with the 'after'
-     * keyword.
-     * @param action The action that triggers the reaction
-     * @param port The port to write to.
-     */
-    @Override
-    public String generateForwardBody(Action action, VarRef port) {
-        String outputName = ASTUtils.generateVarRef(port);
-        if (CUtil.isTokenType(ASTUtils.getInferredType(action), types)) {
-            return super.generateForwardBody(action, port);
-        } else {
-            return "lf_set("+outputName+", "+action.getName()+"->token->value);";
-        }
+  /**
+   * Generate code for the body of a reaction that is triggered by the given action and writes its
+   * value to the given port. This realizes the receiving end of a logical delay specified with the
+   * 'after' keyword.
+   *
+   * @param action The action that triggers the reaction
+   * @param port The port to write to.
+   */
+  @Override
+  public String generateForwardBody(Action action, VarRef port) {
+    String outputName = ASTUtils.generateVarRef(port);
+    if (CUtil.isTokenType(ASTUtils.getInferredType(action), types)) {
+      return super.generateForwardBody(action, port);
+    } else {
+      return "lf_set(" + outputName + ", " + action.getName() + "->token->value);";
     }
+  }
 
-    @Override
-    public void finalizeReactions(Reaction delayReaction, Reaction forwardReaction) {
-        ASTUtils.addReactionAttribute(delayReaction, "_c_body");
-        ASTUtils.addReactionAttribute(forwardReaction, "_c_body");
-    }
+  @Override
+  public void finalizeReactions(Reaction delayReaction, Reaction forwardReaction) {
+    ASTUtils.addReactionAttribute(delayReaction, "_c_body");
+    ASTUtils.addReactionAttribute(forwardReaction, "_c_body");
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonDockerGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonDockerGenerator.java
index ed69ac01fc..9d1bf0fcd4 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonDockerGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonDockerGenerator.java
@@ -1,7 +1,5 @@
-
 package org.lflang.generator.python;
 
-import org.lflang.TargetConfig;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.c.CDockerGenerator;
 
@@ -11,26 +9,25 @@
  * @author Hou Seng Wong
  */
 public class PythonDockerGenerator extends CDockerGenerator {
-    final String defaultBaseImage = "python:slim";
+  final String defaultBaseImage = "python:slim";
 
-    public PythonDockerGenerator(LFGeneratorContext context) {
-        super(context);
-    }
+  public PythonDockerGenerator(LFGeneratorContext context) {
+    super(context);
+  }
 
-    /**
-     * Generates the contents of the docker file.
-     */
-    @Override
-    protected String generateDockerFileContent() {
-        var baseImage = defaultBaseImage;
-        return String.join("\n",
-            "# For instructions, see: https://www.lf-lang.org/docs/handbook/containerized-execution?target=py",
-            "FROM "+baseImage,
-            "WORKDIR /lingua-franca/"+context.getFileConfig().name,
-            "RUN set -ex && apt-get update && apt-get install -y python3-pip && pip install cmake",
-            "COPY . src-gen",
-            super.generateDefaultCompileCommand(),
-            "ENTRYPOINT [\"python3\", \"src-gen/"+context.getFileConfig().name+".py\"]"
-        );
-    }
+  /** Generates the contents of the docker file. */
+  @Override
+  protected String generateDockerFileContent() {
+    var baseImage = defaultBaseImage;
+    return String.join(
+        "\n",
+        "# For instructions, see:"
+            + " https://www.lf-lang.org/docs/handbook/containerized-execution?target=py",
+        "FROM " + baseImage,
+        "WORKDIR /lingua-franca/" + context.getFileConfig().name,
+        "RUN set -ex && apt-get update && apt-get install -y python3-pip && pip install cmake",
+        "COPY . src-gen",
+        super.generateDefaultCompileCommand(),
+        "ENTRYPOINT [\"python3\", \"src-gen/" + context.getFileConfig().name + ".py\"]");
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
index 83053d6897..91fdfaffad 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
@@ -34,17 +34,14 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.Exceptions;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.AttributeUtils;
 import org.lflang.Target;
 import org.lflang.TargetProperty;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.CodeMap;
-
 import org.lflang.generator.GeneratorResult;
 import org.lflang.generator.IntegratedBuilder;
 import org.lflang.generator.LFGeneratorContext;
@@ -66,530 +63,516 @@
 import org.lflang.util.LFCommand;
 import org.lflang.util.StringUtil;
 
-
 /**
- * Generator for Python target. This class generates Python code defining each
- * reactor
- * class given in the input .lf file and imported .lf files.
+ * Generator for Python target. This class generates Python code defining each reactor class given
+ * in the input .lf file and imported .lf files.
  *
- * Each class will contain all the reaction functions defined by the user in
- * order, with the necessary ports/actions given as parameters.
- * Moreover, each class will contain all state variables in native Python
- * format.
+ * <p>Each class will contain all the reaction functions defined by the user in order, with the
+ * necessary ports/actions given as parameters. Moreover, each class will contain all state
+ * variables in native Python format.
  *
- * A backend is also generated using the CGenerator that interacts with the C
- * code library (see CGenerator.xtend).
- * The backend is responsible for passing arguments to the Python reactor
+ * <p>A backend is also generated using the CGenerator that interacts with the C code library (see
+ * CGenerator.xtend). The backend is responsible for passing arguments to the Python reactor
  * functions.
  *
  * @author Soroush Bateni
  */
 public class PythonGenerator extends CGenerator {
 
-    // Used to add statements that come before reactor classes and user code
-    private final CodeBuilder pythonPreamble = new CodeBuilder();
-
-    // Used to add module requirements to setup.py (delimited with ,)
-    private final List<String> pythonRequiredModules = new ArrayList<>();
-
-    private final PythonTypes types;
-
-    public PythonGenerator(LFGeneratorContext context) {
-        this(context,
-            new PythonTypes(),
-            new CCmakeGenerator(
-                context.getFileConfig(),
-                List.of("lib/python_action.c",
-                    "lib/python_port.c",
-                    "lib/python_tag.c",
-                    "lib/python_time.c",
-                    "lib/pythontarget.c"
-                ),
-                PythonGenerator::setUpMainTarget,
-                "install(TARGETS)" // No-op
-            )
-        );
-    }
-
-
-    private PythonGenerator(LFGeneratorContext context, PythonTypes types, CCmakeGenerator cmakeGenerator) {
-        super(context, false, types, cmakeGenerator, new PythonDelayBodyGenerator(types));
-        this.targetConfig.compiler = "gcc";
-        this.targetConfig.compilerFlags = new ArrayList<>();
-        this.targetConfig.linkerFlags = "";
-        this.types = types;
-    }
-
-    /**
-     * Generic struct for ports with primitive types and
-     * statically allocated arrays in Lingua Franca.
-     * This template is defined as
-     *   typedef struct {
-     *       bool is_present;
-     *       lf_sparse_io_record_t* sparse_record; // NULL if there is no sparse record.
-     *       int destination_channel;              // -1 if there is no destination.
-     *       PyObject* value;
-     *       int num_destinations;
-     *       lf_token_t* token;
-     *       int length;
-     *       void (*destructor) (void* value);
-     *       void* (*copy_constructor) (void* value);
-     *       FEDERATED_GENERIC_EXTENSION
-     *   } generic_port_instance_struct;
-     *
-     * See reactor-c/python/lib/pythontarget.h for details.
-     */
-    String genericPortType = "generic_port_instance_struct";
-
-    /**
-     * Generic struct for actions.
-     * This template is defined as
-     * typedef struct {
-     * trigger_t* trigger;
-     * PyObject* value;
-     * bool is_present;
-     * bool has_value;
-     * lf_token_t* token;
-     * FEDERATED_CAPSULE_EXTENSION
-     * } generic_action_instance_struct;
-     *
-     * See reactor-c/python/lib/pythontarget.h for details.
-     */
-    String genericActionType = "generic_action_instance_struct";
-
-    /** Returns the Target enum for this generator */
-    @Override
-    public Target getTarget() {
-        return Target.Python;
-    }
-
-    private final Set<String> protoNames = new HashSet<>();
-
-    // //////////////////////////////////////////
-    // // Public methods
-    @Override
-    public TargetTypes getTargetTypes() {
-        return types;
-    }
-
-    // //////////////////////////////////////////
-    // // Protected methods
-
-    /**
-     * Generate all Python classes if they have a reaction
-     *
-     */
-    public String generatePythonReactorClasses() {
-        CodeBuilder pythonClasses = new CodeBuilder();
-        CodeBuilder pythonClassesInstantiation = new CodeBuilder();
-
-        // Generate reactor classes in Python
-        pythonClasses.pr(PythonReactorGenerator.generatePythonClass(main, main, types));
-
-        // Create empty lists to hold reactor instances
-        pythonClassesInstantiation.pr(PythonReactorGenerator.generateListsToHoldClassInstances(main));
-
-        // Instantiate generated classes
-        pythonClassesInstantiation.pr(PythonReactorGenerator.generatePythonClassInstantiations(main, main));
-
-        return String.join("\n",
-                           pythonClasses.toString(),
-                           "",
-                           "# Instantiate classes",
-                           pythonClassesInstantiation.toString()
-        );
-    }
-
-    /**
-     * Generate the Python code constructed from reactor classes and
-     * user-written classes.
-     *
-     * @return the code body
-     */
-    public String generatePythonCode(String pyModuleName) {
-        return String.join("\n",
-            "import os",
-            "import sys",
-            "sys.path.append(os.path.dirname(__file__))",
-            "# List imported names, but do not use pylint's --extension-pkg-allow-list option",
-            "# so that these names will be assumed present without having to compile and install.",
-            "# pylint: disable=no-name-in-module, import-error",
-            "from "+pyModuleName+" import (",
-            "    Tag, action_capsule_t, port_capsule, request_stop, schedule_copy, start",
-            ")",
-            "# pylint: disable=c-extension-no-member",
-            "import "+pyModuleName+" as lf",
-            "try:",
-            "    from LinguaFrancaBase.constants import BILLION, FOREVER, NEVER, instant_t, interval_t",
-            "    from LinguaFrancaBase.functions import (",
-            "        DAY, DAYS, HOUR, HOURS, MINUTE, MINUTES, MSEC, MSECS, NSEC, NSECS, SEC, SECS, USEC,",
-            "        USECS, WEEK, WEEKS",
-            "    )",
-            "    from LinguaFrancaBase.classes import Make",
-            "except ModuleNotFoundError:",
-            "    print(\"No module named 'LinguaFrancaBase'. \"",
-            "          \"Install using \\\"pip3 install LinguaFrancaBase\\\".\")",
-            "    sys.exit(1)",
-            "import copy",
-            "",
-            pythonPreamble.toString(),
-            "",
-            generatePythonReactorClasses(),
-            "",
-            PythonMainFunctionGenerator.generateCode()
-        );
-    }
-
-    /**
-     * Generate the necessary Python files.
-     */
-    public Map<Path, CodeMap> generatePythonFiles(
-        String lfModuleName,
-        String pyModuleName,
-        String pyFileName
-    ) throws IOException {
-        Path filePath = fileConfig.getSrcGenPath().resolve(pyFileName);
-        File file = filePath.toFile();
-        Files.deleteIfExists(filePath);
-        // Create the necessary directories
-        if (!file.getParentFile().exists()) {
-            if (!file.getParentFile().mkdirs()) {
-                throw new IOException(
-                    "Failed to create directories required for the Python code generator."
-                );
-            }
-        }
-        Map<Path, CodeMap> codeMaps = new HashMap<>();
-        codeMaps.put(filePath, CodeMap.fromGeneratedCode(
-            generatePythonCode(pyModuleName)));
-        FileUtil.writeToFile(codeMaps.get(filePath).getGeneratedCode(), filePath);
-        return codeMaps;
-    }
-
-    /**
-     * Generate code that needs to appear at the top of the generated
-     * C file, such as #define and #include statements.
-     */
-    @Override
-    public String generateDirectives() {
-        CodeBuilder code = new CodeBuilder();
-        code.prComment("Code generated by the Lingua Franca compiler from:");
-        code.prComment("file:/" + FileUtil.toUnixString(fileConfig.srcFile));
-        code.pr(PythonPreambleGenerator.generateCDefineDirectives(
+  // Used to add statements that come before reactor classes and user code
+  private final CodeBuilder pythonPreamble = new CodeBuilder();
+
+  // Used to add module requirements to setup.py (delimited with ,)
+  private final List<String> pythonRequiredModules = new ArrayList<>();
+
+  private final PythonTypes types;
+
+  public PythonGenerator(LFGeneratorContext context) {
+    this(
+        context,
+        new PythonTypes(),
+        new CCmakeGenerator(
+            context.getFileConfig(),
+            List.of(
+                "lib/python_action.c",
+                "lib/python_port.c",
+                "lib/python_tag.c",
+                "lib/python_time.c",
+                "lib/pythontarget.c"),
+            PythonGenerator::setUpMainTarget,
+            "install(TARGETS)" // No-op
+            ));
+  }
+
+  private PythonGenerator(
+      LFGeneratorContext context, PythonTypes types, CCmakeGenerator cmakeGenerator) {
+    super(context, false, types, cmakeGenerator, new PythonDelayBodyGenerator(types));
+    this.targetConfig.compiler = "gcc";
+    this.targetConfig.compilerFlags = new ArrayList<>();
+    this.targetConfig.linkerFlags = "";
+    this.types = types;
+  }
+
+  /**
+   * Generic struct for ports with primitive types and statically allocated arrays in Lingua Franca.
+   * This template is defined as typedef struct { bool is_present; lf_sparse_io_record_t*
+   * sparse_record; // NULL if there is no sparse record. int destination_channel; // -1 if there is
+   * no destination. PyObject* value; int num_destinations; lf_token_t* token; int length; void
+   * (*destructor) (void* value); void* (*copy_constructor) (void* value);
+   * FEDERATED_GENERIC_EXTENSION } generic_port_instance_struct;
+   *
+   * <p>See reactor-c/python/lib/pythontarget.h for details.
+   */
+  String genericPortType = "generic_port_instance_struct";
+
+  /**
+   * Generic struct for actions. This template is defined as typedef struct { trigger_t* trigger;
+   * PyObject* value; bool is_present; bool has_value; lf_token_t* token;
+   * FEDERATED_CAPSULE_EXTENSION } generic_action_instance_struct;
+   *
+   * <p>See reactor-c/python/lib/pythontarget.h for details.
+   */
+  String genericActionType = "generic_action_instance_struct";
+
+  /** Returns the Target enum for this generator */
+  @Override
+  public Target getTarget() {
+    return Target.Python;
+  }
+
+  private final Set<String> protoNames = new HashSet<>();
+
+  // //////////////////////////////////////////
+  // // Public methods
+  @Override
+  public TargetTypes getTargetTypes() {
+    return types;
+  }
+
+  // //////////////////////////////////////////
+  // // Protected methods
+
+  /** Generate all Python classes if they have a reaction */
+  public String generatePythonReactorClasses() {
+    CodeBuilder pythonClasses = new CodeBuilder();
+    CodeBuilder pythonClassesInstantiation = new CodeBuilder();
+
+    // Generate reactor classes in Python
+    pythonClasses.pr(PythonReactorGenerator.generatePythonClass(main, main, types));
+
+    // Create empty lists to hold reactor instances
+    pythonClassesInstantiation.pr(PythonReactorGenerator.generateListsToHoldClassInstances(main));
+
+    // Instantiate generated classes
+    pythonClassesInstantiation.pr(
+        PythonReactorGenerator.generatePythonClassInstantiations(main, main));
+
+    return String.join(
+        "\n",
+        pythonClasses.toString(),
+        "",
+        "# Instantiate classes",
+        pythonClassesInstantiation.toString());
+  }
+
+  /**
+   * Generate the Python code constructed from reactor classes and user-written classes.
+   *
+   * @return the code body
+   */
+  public String generatePythonCode(String pyModuleName) {
+    return String.join(
+        "\n",
+        "import os",
+        "import sys",
+        "sys.path.append(os.path.dirname(__file__))",
+        "# List imported names, but do not use pylint's --extension-pkg-allow-list option",
+        "# so that these names will be assumed present without having to compile and install.",
+        "# pylint: disable=no-name-in-module, import-error",
+        "from " + pyModuleName + " import (",
+        "    Tag, action_capsule_t, port_capsule, request_stop, schedule_copy, start",
+        ")",
+        "# pylint: disable=c-extension-no-member",
+        "import " + pyModuleName + " as lf",
+        "try:",
+        "    from LinguaFrancaBase.constants import BILLION, FOREVER, NEVER, instant_t, interval_t",
+        "    from LinguaFrancaBase.functions import (",
+        "        DAY, DAYS, HOUR, HOURS, MINUTE, MINUTES, MSEC, MSECS, NSEC, NSECS, SEC, SECS,"
+            + " USEC,",
+        "        USECS, WEEK, WEEKS",
+        "    )",
+        "    from LinguaFrancaBase.classes import Make",
+        "except ModuleNotFoundError:",
+        "    print(\"No module named 'LinguaFrancaBase'. \"",
+        "          \"Install using \\\"pip3 install LinguaFrancaBase\\\".\")",
+        "    sys.exit(1)",
+        "import copy",
+        "",
+        pythonPreamble.toString(),
+        "",
+        generatePythonReactorClasses(),
+        "",
+        PythonMainFunctionGenerator.generateCode());
+  }
+
+  /** Generate the necessary Python files. */
+  public Map<Path, CodeMap> generatePythonFiles(
+      String lfModuleName, String pyModuleName, String pyFileName) throws IOException {
+    Path filePath = fileConfig.getSrcGenPath().resolve(pyFileName);
+    File file = filePath.toFile();
+    Files.deleteIfExists(filePath);
+    // Create the necessary directories
+    if (!file.getParentFile().exists()) {
+      if (!file.getParentFile().mkdirs()) {
+        throw new IOException(
+            "Failed to create directories required for the Python code generator.");
+      }
+    }
+    Map<Path, CodeMap> codeMaps = new HashMap<>();
+    codeMaps.put(filePath, CodeMap.fromGeneratedCode(generatePythonCode(pyModuleName)));
+    FileUtil.writeToFile(codeMaps.get(filePath).getGeneratedCode(), filePath);
+    return codeMaps;
+  }
+
+  /**
+   * Generate code that needs to appear at the top of the generated C file, such as #define and
+   * #include statements.
+   */
+  @Override
+  public String generateDirectives() {
+    CodeBuilder code = new CodeBuilder();
+    code.prComment("Code generated by the Lingua Franca compiler from:");
+    code.prComment("file:/" + FileUtil.toUnixString(fileConfig.srcFile));
+    code.pr(
+        PythonPreambleGenerator.generateCDefineDirectives(
             targetConfig, fileConfig.getSrcGenPath(), hasModalReactors));
-        return code.toString();
-    }
-
-    /**
-     * Override generate top-level preambles, but put the user preambles in the
-     * .py file rather than the C file. Also handles including the federated
-     * execution setup preamble specified in the target config.
-     */
-    @Override
-    protected String generateTopLevelPreambles(Reactor ignored) {
-        // user preambles
-        Set<Model> models = new LinkedHashSet<>();
-        for (Reactor r : ASTUtils.convertToEmptyListIfNull(reactors)) {
-            // The following assumes all reactors have a container.
-            // This means that generated reactors **have** to be
-            // added to a resource; not doing so will result in a NPE.
-            models.add((Model) ASTUtils.toDefinition(r).eContainer());
-        }
-        // Add the main reactor if it is defined
-        if (this.mainDef != null) {
-            models.add((Model) ASTUtils.toDefinition(this.mainDef.getReactorClass()).eContainer());
+    return code.toString();
+  }
+
+  /**
+   * Override generate top-level preambles, but put the user preambles in the .py file rather than
+   * the C file. Also handles including the federated execution setup preamble specified in the
+   * target config.
+   */
+  @Override
+  protected String generateTopLevelPreambles(Reactor ignored) {
+    // user preambles
+    Set<Model> models = new LinkedHashSet<>();
+    for (Reactor r : ASTUtils.convertToEmptyListIfNull(reactors)) {
+      // The following assumes all reactors have a container.
+      // This means that generated reactors **have** to be
+      // added to a resource; not doing so will result in a NPE.
+      models.add((Model) ASTUtils.toDefinition(r).eContainer());
+    }
+    // Add the main reactor if it is defined
+    if (this.mainDef != null) {
+      models.add((Model) ASTUtils.toDefinition(this.mainDef.getReactorClass()).eContainer());
+    }
+    for (Model m : models) {
+      pythonPreamble.pr(PythonPreambleGenerator.generatePythonPreambles(m.getPreambles()));
+    }
+    return PythonPreambleGenerator.generateCIncludeStatements(
+        targetConfig, targetLanguageIsCpp(), hasModalReactors);
+  }
+
+  @Override
+  protected void handleProtoFiles() {
+    for (String name : targetConfig.protoFiles) {
+      this.processProtoFile(name);
+      int dotIndex = name.lastIndexOf(".");
+      String rootFilename = dotIndex > 0 ? name.substring(0, dotIndex) : name;
+      pythonPreamble.pr("import " + rootFilename + "_pb2 as " + rootFilename);
+      protoNames.add(rootFilename);
+    }
+  }
+
+  /**
+   * Process a given .proto file.
+   *
+   * <p>Run, if possible, the proto-c protocol buffer code generator to produce the required .h and
+   * .c files.
+   *
+   * @param filename Name of the file to process.
+   */
+  @Override
+  public void processProtoFile(String filename) {
+    LFCommand protoc =
+        commandFactory.createCommand(
+            "protoc",
+            List.of("--python_out=" + fileConfig.getSrcGenPath(), filename),
+            fileConfig.srcPath);
+
+    if (protoc == null) {
+      errorReporter.reportError("Processing .proto files requires libprotoc >= 3.6.1");
+      return;
+    }
+    int returnCode = protoc.run();
+    if (returnCode == 0) {
+      pythonRequiredModules.add("google-api-python-client");
+    } else {
+      errorReporter.reportError("protoc returns error code " + returnCode);
+    }
+  }
+
+  /**
+   * Generate the aliases for inputs, outputs, and struct type definitions for actions of the
+   * specified reactor in the specified federate.
+   *
+   * @param tpr The concrete reactor class.
+   */
+  @Override
+  public void generateAuxiliaryStructs(
+      CodeBuilder builder, TypeParameterizedReactor tpr, boolean userFacing) {
+    for (Input input : ASTUtils.allInputs(tpr.reactor())) {
+      generateAuxiliaryStructsForPort(builder, tpr, input);
+    }
+    for (Output output : ASTUtils.allOutputs(tpr.reactor())) {
+      generateAuxiliaryStructsForPort(builder, tpr, output);
+    }
+    for (Action action : ASTUtils.allActions(tpr.reactor())) {
+      generateAuxiliaryStructsForAction(builder, tpr, action);
+    }
+  }
+
+  private void generateAuxiliaryStructsForPort(
+      CodeBuilder builder, TypeParameterizedReactor tpr, Port port) {
+    boolean isTokenType = CUtil.isTokenType(ASTUtils.getInferredType(port), types);
+    builder.pr(
+        port, PythonPortGenerator.generateAliasTypeDef(tpr, port, isTokenType, genericPortType));
+  }
+
+  private void generateAuxiliaryStructsForAction(
+      CodeBuilder builder, TypeParameterizedReactor tpr, Action action) {
+    builder.pr(action, PythonActionGenerator.generateAliasTypeDef(tpr, action, genericActionType));
+  }
+
+  /**
+   * Return true if the host operating system is compatible and otherwise report an error and return
+   * false.
+   */
+  @Override
+  public boolean isOSCompatible() {
+    return true;
+  }
+
+  /**
+   * Generate C code from the Lingua Franca model contained by the specified resource. This is the
+   * main entry point for code generation.
+   *
+   * @param resource The resource containing the source code.
+   * @param context Context relating to invocation of the code generator.
+   */
+  @Override
+  public void doGenerate(Resource resource, LFGeneratorContext context) {
+    // Set the threading to false by default, unless the user has
+    // specifically asked for it.
+    if (!targetConfig.setByUser.contains(TargetProperty.THREADING)) {
+      targetConfig.threading = false;
+    }
+    int cGeneratedPercentProgress = (IntegratedBuilder.VALIDATED_PERCENT_PROGRESS + 100) / 2;
+    code.pr(
+        PythonPreambleGenerator.generateCIncludeStatements(
+            targetConfig, targetLanguageIsCpp(), hasModalReactors));
+    super.doGenerate(
+        resource,
+        new SubContext(
+            context, IntegratedBuilder.VALIDATED_PERCENT_PROGRESS, cGeneratedPercentProgress));
+
+    if (errorsOccurred()) {
+      context.unsuccessfulFinish();
+      return;
+    }
+
+    Map<Path, CodeMap> codeMaps = new HashMap<>();
+    var lfModuleName = fileConfig.name;
+    // Don't generate code if there is no main reactor
+    if (this.main != null) {
+      try {
+        Map<Path, CodeMap> codeMapsForFederate =
+            generatePythonFiles(
+                lfModuleName,
+                generatePythonModuleName(lfModuleName),
+                generatePythonFileName(lfModuleName));
+        codeMaps.putAll(codeMapsForFederate);
+        copyTargetFiles();
+        new PythonValidator(fileConfig, errorReporter, codeMaps, protoNames).doValidate(context);
+        if (targetConfig.noCompile) {
+          System.out.println(PythonInfoGenerator.generateSetupInfo(fileConfig));
         }
-        for (Model m : models) {
-            pythonPreamble.pr(PythonPreambleGenerator.generatePythonPreambles(m.getPreambles()));
-        }
-        return PythonPreambleGenerator.generateCIncludeStatements(targetConfig, targetLanguageIsCpp(), hasModalReactors);
-    }
-
-    @Override
-    protected void handleProtoFiles() {
-        for (String name : targetConfig.protoFiles) {
-            this.processProtoFile(name);
-            int dotIndex = name.lastIndexOf(".");
-            String rootFilename = dotIndex > 0 ? name.substring(0, dotIndex) : name;
-            pythonPreamble.pr("import "+rootFilename+"_pb2 as "+rootFilename);
-            protoNames.add(rootFilename);
-        }
-    }
-
-    /**
-     * Process a given .proto file.
-     *
-     * Run, if possible, the proto-c protocol buffer code generator to produce
-     * the required .h and .c files.
-     *
-     * @param filename Name of the file to process.
-     */
-    @Override
-    public void processProtoFile(String filename) {
-        LFCommand protoc = commandFactory.createCommand(
-            "protoc", List.of("--python_out="
-                                  + fileConfig.getSrcGenPath(), filename), fileConfig.srcPath);
-
-        if (protoc == null) {
-            errorReporter.reportError("Processing .proto files requires libprotoc >= 3.6.1");
-            return;
-        }
-        int returnCode = protoc.run();
-        if (returnCode == 0) {
-            pythonRequiredModules.add("google-api-python-client");
-        } else {
-            errorReporter.reportError(
-                "protoc returns error code " + returnCode);
-        }
-    }
-
-    /**
-     * Generate the aliases for inputs, outputs, and struct type definitions for
-     * actions of the specified reactor in the specified federate.
-     * @param tpr The concrete reactor class.
-     */
-    @Override
-    public void generateAuxiliaryStructs(
-        CodeBuilder builder, TypeParameterizedReactor tpr, boolean userFacing
-    ) {
-        for (Input input : ASTUtils.allInputs(tpr.reactor())) {
-            generateAuxiliaryStructsForPort(builder, tpr, input);
-        }
-        for (Output output : ASTUtils.allOutputs(tpr.reactor())) {
-            generateAuxiliaryStructsForPort(builder, tpr, output);
-        }
-        for (Action action : ASTUtils.allActions(tpr.reactor())) {
-            generateAuxiliaryStructsForAction(builder, tpr, action);
-        }
-    }
-
-    private void generateAuxiliaryStructsForPort(CodeBuilder builder, TypeParameterizedReactor tpr,
-                                                 Port port) {
-        boolean isTokenType = CUtil.isTokenType(ASTUtils.getInferredType(port), types);
-        builder.pr(port,
-                PythonPortGenerator.generateAliasTypeDef(tpr, port, isTokenType,
-                                                         genericPortType));
-    }
-
-    private void generateAuxiliaryStructsForAction(CodeBuilder builder, TypeParameterizedReactor tpr,
-                                                   Action action) {
-        builder.pr(action, PythonActionGenerator.generateAliasTypeDef(tpr, action, genericActionType));
-    }
-
-    /**
-     * Return true if the host operating system is compatible and
-     * otherwise report an error and return false.
-     */
-    @Override
-    public boolean isOSCompatible() {
-        return true;
-    }
-
-    /**
-     * Generate C code from the Lingua Franca model contained by the
-     * specified resource. This is the main entry point for code
-     * generation.
-     *
-     * @param resource The resource containing the source code.
-     * @param context  Context relating to invocation of the code generator.
-     */
-    @Override
-    public void doGenerate(Resource resource, LFGeneratorContext context) {
-        // Set the threading to false by default, unless the user has
-        // specifically asked for it.
-        if (!targetConfig.setByUser.contains(TargetProperty.THREADING)) {
-            targetConfig.threading = false;
-        }
-        int cGeneratedPercentProgress = (IntegratedBuilder.VALIDATED_PERCENT_PROGRESS + 100) / 2;
-        code.pr(PythonPreambleGenerator.generateCIncludeStatements(targetConfig, targetLanguageIsCpp(), hasModalReactors));
-        super.doGenerate(resource, new SubContext(
-            context,
-            IntegratedBuilder.VALIDATED_PERCENT_PROGRESS,
-            cGeneratedPercentProgress
-        ));
-
-        if (errorsOccurred()) {
-            context.unsuccessfulFinish();
-            return;
-        }
-
-        Map<Path, CodeMap> codeMaps = new HashMap<>();
-        var lfModuleName = fileConfig.name;
-        // Don't generate code if there is no main reactor
-        if (this.main != null) {
-            try {
-                Map<Path, CodeMap> codeMapsForFederate = generatePythonFiles(lfModuleName, generatePythonModuleName(lfModuleName), generatePythonFileName(lfModuleName));
-                codeMaps.putAll(codeMapsForFederate);
-                copyTargetFiles();
-                new PythonValidator(fileConfig, errorReporter, codeMaps, protoNames).doValidate(context);
-                if (targetConfig.noCompile) {
-                    System.out.println(PythonInfoGenerator.generateSetupInfo(fileConfig));
-                }
-            } catch (Exception e) {
-                //noinspection ConstantConditions
-                throw Exceptions.sneakyThrow(e);
-            }
-
-            System.out.println(PythonInfoGenerator.generateRunInfo(fileConfig, lfModuleName));
-        }
-
-        if (errorReporter.getErrorsOccurred()) {
-            context.unsuccessfulFinish();
-        } else {
-            context.finish(GeneratorResult.Status.COMPILED, codeMaps);
-        }
-    }
-
-    @Override
-    protected PythonDockerGenerator getDockerGenerator(LFGeneratorContext context) {
-        return new PythonDockerGenerator(context);
-    }
-
-    /** Generate a reaction function definition for a reactor.
-     *  This function has a single argument that is a void* pointing to
-     *  a struct that contains parameters, state variables, inputs (triggering or not),
-     *  actions (triggering or produced), and outputs.
-     *  @param reaction The reaction.
-     *  @param tpr The reactor.
-     *  @param reactionIndex The position of the reaction within the reactor.
-     */
-    @Override
-    protected void generateReaction(CodeBuilder src, Reaction reaction, TypeParameterizedReactor tpr, int reactionIndex) {
-        Reactor reactor = ASTUtils.toDefinition(tpr.reactor());
-
-        // Reactions marked with a {@code @_c_body} attribute are generated in C
-        if (AttributeUtils.hasCBody(reaction)) {
-            super.generateReaction(src, reaction, tpr, reactionIndex);
-            return;
-        }
-        src.pr(PythonReactionGenerator.generateCReaction(reaction, tpr, reactor, reactionIndex, mainDef, errorReporter, types));
-    }
-
-    /**
-     * Generate code that initializes the state variables for a given instance.
-     * Unlike parameters, state variables are uniformly initialized for all
-     * instances
-     * of the same reactor. This task is left to Python code to allow for more
-     * liberal
-     * state variable assignments.
-     *
-     * @param instance The reactor class instance
-     * @return Initialization code fore state variables of instance
-     */
-    @Override
-    protected void generateStateVariableInitializations(ReactorInstance instance) {
-        // Do nothing
-    }
-
-    /**
-     * Generate runtime initialization code in C for parameters of a given
-     * reactor instance
-     *
-     * @param instance The reactor instance.
-     */
-    @Override
-    protected void generateParameterInitialization(ReactorInstance instance) {
-        // Do nothing
-        // Parameters are initialized in Python
-    }
-
-    /**
-     * Do nothing.
-     * Methods are generated in Python not C.
-     * @see PythonMethodGenerator
-     */
-    @Override
-    protected void generateMethods(CodeBuilder src, TypeParameterizedReactor reactor) {    }
-
-    /**
-     * Generate C preambles defined by user for a given reactor
-     * Since the Python generator expects preambles written in C,
-     * this function is overridden and does nothing.
-     *
-     * @param reactor The given reactor
-     */
-    @Override
-    protected void generateUserPreamblesForReactor(Reactor reactor, CodeBuilder src) {
-        // Do nothing
-    }
-
-    @Override
-    protected void generateReactorClassHeaders(TypeParameterizedReactor tpr, String headerName, CodeBuilder header, CodeBuilder src) {
-        header.pr(PythonPreambleGenerator.generateCIncludeStatements(targetConfig, targetLanguageIsCpp(), hasModalReactors));
-        super.generateReactorClassHeaders(tpr, headerName, header, src);
-    }
-
-    /**
-     * Generate code that is executed while the reactor instance is being
-     * initialized.
-     * This wraps the reaction functions in a Python function.
-     * @param instance The reactor instance.
-     */
-    @Override
-    protected void generateReactorInstanceExtension(
-        ReactorInstance instance
-    ) {
-        initializeTriggerObjects.pr(PythonReactionGenerator.generateCPythonReactionLinkers(instance, mainDef));
-    }
-
-    /**
-     * This function is provided to allow extensions of the CGenerator to append the structure of the self struct
-     * @param selfStructBody The body of the self struct
-     * @param reactor The reactor declaration for the self struct
-     * @param constructorCode Code that is executed when the reactor is instantiated
-     */
-    @Override
-    protected void generateSelfStructExtension(
-        CodeBuilder selfStructBody,
-        Reactor reactor,
-        CodeBuilder constructorCode
-    ) {
-        // Add the name field
-        selfStructBody.pr("char *_lf_name;");
-        int reactionIndex = 0;
-        for (Reaction reaction : ASTUtils.allReactions(reactor)) {
-            // Create a PyObject for each reaction
-            selfStructBody.pr("PyObject* "+ PythonReactionGenerator.generateCPythonReactionFunctionName(reactionIndex)+";");
-            if (reaction.getStp() != null) {
-                selfStructBody.pr("PyObject* "+ PythonReactionGenerator.generateCPythonSTPFunctionName(reactionIndex)+";");
-            }
-            if (reaction.getDeadline() != null) {
-                selfStructBody.pr("PyObject* "+ PythonReactionGenerator.generateCPythonDeadlineFunctionName(reactionIndex)+";");
-            }
-            reactionIndex++;
-        }
-    }
-
-    @Override
-    protected String getConflictingConnectionsInModalReactorsBody(String source, String dest) {
-        // NOTE: Strangely, a newline is needed at the beginning or indentation
-        // gets swallowed.
-        return String.join("\n",
-                           "\n# Generated forwarding reaction for connections with the same destination",
-                           "# but located in mutually exclusive modes.",
-                           dest + ".set(" + source + ".value)\n"
-        );
-    }
-
-    @Override
-    protected void setUpGeneralParameters() {
-        super.setUpGeneralParameters();
-        if (hasModalReactors) {
-            targetConfig.compileAdditionalSources.add("lib/modal_models/impl.c");
-        }
-    }
-
-    @Override
-    protected void additionalPostProcessingForModes() {
-        if (!hasModalReactors) {
-            return;
-        }
-        PythonModeGenerator.generateResetReactionsIfNeeded(reactors);
-    }
-
-    private static String setUpMainTarget(boolean hasMain, String executableName, Stream<String> cSources) {
-        return (
-            """
+      } catch (Exception e) {
+        //noinspection ConstantConditions
+        throw Exceptions.sneakyThrow(e);
+      }
+
+      System.out.println(PythonInfoGenerator.generateRunInfo(fileConfig, lfModuleName));
+    }
+
+    if (errorReporter.getErrorsOccurred()) {
+      context.unsuccessfulFinish();
+    } else {
+      context.finish(GeneratorResult.Status.COMPILED, codeMaps);
+    }
+  }
+
+  @Override
+  protected PythonDockerGenerator getDockerGenerator(LFGeneratorContext context) {
+    return new PythonDockerGenerator(context);
+  }
+
+  /**
+   * Generate a reaction function definition for a reactor. This function has a single argument that
+   * is a void* pointing to a struct that contains parameters, state variables, inputs (triggering
+   * or not), actions (triggering or produced), and outputs.
+   *
+   * @param reaction The reaction.
+   * @param tpr The reactor.
+   * @param reactionIndex The position of the reaction within the reactor.
+   */
+  @Override
+  protected void generateReaction(
+      CodeBuilder src, Reaction reaction, TypeParameterizedReactor tpr, int reactionIndex) {
+    Reactor reactor = ASTUtils.toDefinition(tpr.reactor());
+
+    // Reactions marked with a {@code @_c_body} attribute are generated in C
+    if (AttributeUtils.hasCBody(reaction)) {
+      super.generateReaction(src, reaction, tpr, reactionIndex);
+      return;
+    }
+    src.pr(
+        PythonReactionGenerator.generateCReaction(
+            reaction, tpr, reactor, reactionIndex, mainDef, errorReporter, types));
+  }
+
+  /**
+   * Generate code that initializes the state variables for a given instance. Unlike parameters,
+   * state variables are uniformly initialized for all instances of the same reactor. This task is
+   * left to Python code to allow for more liberal state variable assignments.
+   *
+   * @param instance The reactor class instance
+   * @return Initialization code fore state variables of instance
+   */
+  @Override
+  protected void generateStateVariableInitializations(ReactorInstance instance) {
+    // Do nothing
+  }
+
+  /**
+   * Generate runtime initialization code in C for parameters of a given reactor instance
+   *
+   * @param instance The reactor instance.
+   */
+  @Override
+  protected void generateParameterInitialization(ReactorInstance instance) {
+    // Do nothing
+    // Parameters are initialized in Python
+  }
+
+  /**
+   * Do nothing. Methods are generated in Python not C.
+   *
+   * @see PythonMethodGenerator
+   */
+  @Override
+  protected void generateMethods(CodeBuilder src, TypeParameterizedReactor reactor) {}
+
+  /**
+   * Generate C preambles defined by user for a given reactor Since the Python generator expects
+   * preambles written in C, this function is overridden and does nothing.
+   *
+   * @param reactor The given reactor
+   */
+  @Override
+  protected void generateUserPreamblesForReactor(Reactor reactor, CodeBuilder src) {
+    // Do nothing
+  }
+
+  @Override
+  protected void generateReactorClassHeaders(
+      TypeParameterizedReactor tpr, String headerName, CodeBuilder header, CodeBuilder src) {
+    header.pr(
+        PythonPreambleGenerator.generateCIncludeStatements(
+            targetConfig, targetLanguageIsCpp(), hasModalReactors));
+    super.generateReactorClassHeaders(tpr, headerName, header, src);
+  }
+
+  /**
+   * Generate code that is executed while the reactor instance is being initialized. This wraps the
+   * reaction functions in a Python function.
+   *
+   * @param instance The reactor instance.
+   */
+  @Override
+  protected void generateReactorInstanceExtension(ReactorInstance instance) {
+    initializeTriggerObjects.pr(
+        PythonReactionGenerator.generateCPythonReactionLinkers(instance, mainDef));
+  }
+
+  /**
+   * This function is provided to allow extensions of the CGenerator to append the structure of the
+   * self struct
+   *
+   * @param selfStructBody The body of the self struct
+   * @param reactor The reactor declaration for the self struct
+   * @param constructorCode Code that is executed when the reactor is instantiated
+   */
+  @Override
+  protected void generateSelfStructExtension(
+      CodeBuilder selfStructBody, Reactor reactor, CodeBuilder constructorCode) {
+    // Add the name field
+    selfStructBody.pr("char *_lf_name;");
+    int reactionIndex = 0;
+    for (Reaction reaction : ASTUtils.allReactions(reactor)) {
+      // Create a PyObject for each reaction
+      selfStructBody.pr(
+          "PyObject* "
+              + PythonReactionGenerator.generateCPythonReactionFunctionName(reactionIndex)
+              + ";");
+      if (reaction.getStp() != null) {
+        selfStructBody.pr(
+            "PyObject* "
+                + PythonReactionGenerator.generateCPythonSTPFunctionName(reactionIndex)
+                + ";");
+      }
+      if (reaction.getDeadline() != null) {
+        selfStructBody.pr(
+            "PyObject* "
+                + PythonReactionGenerator.generateCPythonDeadlineFunctionName(reactionIndex)
+                + ";");
+      }
+      reactionIndex++;
+    }
+  }
+
+  @Override
+  protected String getConflictingConnectionsInModalReactorsBody(String source, String dest) {
+    // NOTE: Strangely, a newline is needed at the beginning or indentation
+    // gets swallowed.
+    return String.join(
+        "\n",
+        "\n# Generated forwarding reaction for connections with the same destination",
+        "# but located in mutually exclusive modes.",
+        dest + ".set(" + source + ".value)\n");
+  }
+
+  @Override
+  protected void setUpGeneralParameters() {
+    super.setUpGeneralParameters();
+    if (hasModalReactors) {
+      targetConfig.compileAdditionalSources.add("lib/modal_models/impl.c");
+    }
+  }
+
+  @Override
+  protected void additionalPostProcessingForModes() {
+    if (!hasModalReactors) {
+      return;
+    }
+    PythonModeGenerator.generateResetReactionsIfNeeded(reactors);
+  }
+
+  private static String setUpMainTarget(
+      boolean hasMain, String executableName, Stream<String> cSources) {
+    return ("""
             set(CMAKE_POSITION_INDEPENDENT_CODE ON)
             add_compile_definitions(_LF_GARBAGE_COLLECTED)
             add_subdirectory(core)
@@ -614,74 +597,59 @@ private static String setUpMainTarget(boolean hasMain, String executableName, St
             include_directories(${Python_INCLUDE_DIRS})
             target_link_libraries(${LF_MAIN_TARGET} PRIVATE ${Python_LIBRARIES})
             target_compile_definitions(${LF_MAIN_TARGET} PUBLIC MODULE_NAME=<pyModuleName>)
-            """
-            ).replace("<pyModuleName>", generatePythonModuleName(executableName))
-            .replace("executableName", executableName);
-        // The use of fileConfig.name will break federated execution, but that's fine
-    }
-
-    /**
-     * Generate a ({@code key}, {@code val}) tuple pair for the {@code define_macros} field
-     * of the Extension class constructor from setuptools.
-     *
-     * @param key The key of the macro entry
-     * @param val The value of the macro entry
-     * @return A ({@code key}, {@code val}) tuple pair as String
-     */
-    private static String generateMacroEntry(String key, String val) {
-        return "(" + StringUtil.addDoubleQuotes(key) + ", " + StringUtil.addDoubleQuotes(val) + ")";
-    }
-
-    /**
-     * Generate the name of the python module.
-     *
-     * Ideally, this function would belong in a class like {@code PyFileConfig}
-     * that specifies all the paths to the generated code.
-     *
-     * @param lfModuleName The name of the LF module.
-     * @return The name of the python module.
-     */
-    private static String generatePythonModuleName(String lfModuleName) {
-        return "LinguaFranca" + lfModuleName;
-    }
-
-    /**
-     * Generate the python file name given an {@code lfModuleName}.
-     *
-     * Ideally, this function would belong in a class like {@code PyFileConfig}
-     * that specifies all the paths to the generated code.
-     *
-     * @param lfModuleName The name of the LF module
-     * @return The name of the generated python file.
-     */
-    private static String generatePythonFileName(String lfModuleName) {
-        return lfModuleName + ".py";
-    }
-
-    /**
-     * Copy Python specific target code to the src-gen directory
-     */
-    @Override
-    protected void copyTargetFiles() throws IOException {
-        super.copyTargetFiles();
-        FileUtil.copyFromClassPath(
-            "/lib/c/reactor-c/python/include",
-            fileConfig.getSrcGenPath(),
-            true,
-            false
-        );
-        FileUtil.copyFromClassPath(
-            "/lib/c/reactor-c/python/lib",
-            fileConfig.getSrcGenPath(),
-            true,
-            false
-        );
-        FileUtil.copyFromClassPath(
-            "/lib/py/lf-python-support/LinguaFrancaBase",
-            fileConfig.getSrcGenPath(),
-            true,
-            false
-        );
-    }
-
+            """)
+        .replace("<pyModuleName>", generatePythonModuleName(executableName))
+        .replace("executableName", executableName);
+    // The use of fileConfig.name will break federated execution, but that's fine
+  }
+
+  /**
+   * Generate a ({@code key}, {@code val}) tuple pair for the {@code define_macros} field of the
+   * Extension class constructor from setuptools.
+   *
+   * @param key The key of the macro entry
+   * @param val The value of the macro entry
+   * @return A ({@code key}, {@code val}) tuple pair as String
+   */
+  private static String generateMacroEntry(String key, String val) {
+    return "(" + StringUtil.addDoubleQuotes(key) + ", " + StringUtil.addDoubleQuotes(val) + ")";
+  }
+
+  /**
+   * Generate the name of the python module.
+   *
+   * <p>Ideally, this function would belong in a class like {@code PyFileConfig} that specifies all
+   * the paths to the generated code.
+   *
+   * @param lfModuleName The name of the LF module.
+   * @return The name of the python module.
+   */
+  private static String generatePythonModuleName(String lfModuleName) {
+    return "LinguaFranca" + lfModuleName;
+  }
+
+  /**
+   * Generate the python file name given an {@code lfModuleName}.
+   *
+   * <p>Ideally, this function would belong in a class like {@code PyFileConfig} that specifies all
+   * the paths to the generated code.
+   *
+   * @param lfModuleName The name of the LF module
+   * @return The name of the generated python file.
+   */
+  private static String generatePythonFileName(String lfModuleName) {
+    return lfModuleName + ".py";
+  }
+
+  /** Copy Python specific target code to the src-gen directory */
+  @Override
+  protected void copyTargetFiles() throws IOException {
+    super.copyTargetFiles();
+    FileUtil.copyFromClassPath(
+        "/lib/c/reactor-c/python/include", fileConfig.getSrcGenPath(), true, false);
+    FileUtil.copyFromClassPath(
+        "/lib/c/reactor-c/python/lib", fileConfig.getSrcGenPath(), true, false);
+    FileUtil.copyFromClassPath(
+        "/lib/py/lf-python-support/LinguaFrancaBase", fileConfig.getSrcGenPath(), true, false);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonInfoGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonInfoGenerator.java
index 23512f447a..01cadbcc5c 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonInfoGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonInfoGenerator.java
@@ -4,53 +4,49 @@
 import org.lflang.FileConfig;
 
 public class PythonInfoGenerator {
-    /**
-     * Print information about necessary steps to install the supporting
-     * Python C extension for the generated program.
-     *
-     * @note Only needed if no-compile is set to true
-     */
-    public static String generateSetupInfo(FileConfig fileConfig) {
-        return String.join("\n",
-            "",
-            "#####################################",
-            "To compile and install the generated code, do:",
-            "    ",
-            "    cd "+fileConfig.getSrcGenPath()+File.separator,
-            "    python3 -m pip install --force-reinstall .",
-            ""
-        );
-    }
+  /**
+   * Print information about necessary steps to install the supporting Python C extension for the
+   * generated program.
+   *
+   * @note Only needed if no-compile is set to true
+   */
+  public static String generateSetupInfo(FileConfig fileConfig) {
+    return String.join(
+        "\n",
+        "",
+        "#####################################",
+        "To compile and install the generated code, do:",
+        "    ",
+        "    cd " + fileConfig.getSrcGenPath() + File.separator,
+        "    python3 -m pip install --force-reinstall .",
+        "");
+  }
 
-    /**
-     * Print information on how to execute the generated program.
-     */
-    public static String generateRunInfo(FileConfig fileConfig, String lfModuleName) {
-        return String.join("\n",
-            "",
-            "#####################################",
-            "To run the generated program, use:",
-            "    ",
-            "    python3 "+fileConfig.getSrcGenPath()+File.separator+lfModuleName+".py",
-            "",
-            "#####################################",
-            ""
-        );
-    }
+  /** Print information on how to execute the generated program. */
+  public static String generateRunInfo(FileConfig fileConfig, String lfModuleName) {
+    return String.join(
+        "\n",
+        "",
+        "#####################################",
+        "To run the generated program, use:",
+        "    ",
+        "    python3 " + fileConfig.getSrcGenPath() + File.separator + lfModuleName + ".py",
+        "",
+        "#####################################",
+        "");
+  }
 
-    /**
-     * Print information on how to execute the generated federation.
-     */
-    public static String generateFedRunInfo(FileConfig fileConfig) {
-        return String.join("\n",
-            "",
-            "#####################################",
-            "To run the generated program, run:",
-            "    ",
-            "    bash "+fileConfig.binPath+"/"+fileConfig.name,
-            "",
-            "#####################################",
-            ""
-        );
-    }
+  /** Print information on how to execute the generated federation. */
+  public static String generateFedRunInfo(FileConfig fileConfig) {
+    return String.join(
+        "\n",
+        "",
+        "#####################################",
+        "To run the generated program, run:",
+        "    ",
+        "    bash " + fileConfig.binPath + "/" + fileConfig.name,
+        "",
+        "#####################################",
+        "");
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonMainFunctionGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonMainFunctionGenerator.java
index a655402408..5a43788138 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonMainFunctionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonMainFunctionGenerator.java
@@ -26,29 +26,26 @@
 package org.lflang.generator.python;
 
 /**
- * Responsible for creating the main function for
- * the generated Python target programs.
+ * Responsible for creating the main function for the generated Python target programs.
  *
  * @author Soroush Bateni
- *
  */
 public final class PythonMainFunctionGenerator {
 
-    /*
-     * Generate the main function code
-     */
-    public static String generateCode() {
-        StringBuilder code = new StringBuilder();
-        code.append(
-                  "# The main function\n"
-                + "def main(argv):\n"
-                + "    start(argv)\n"
-                + "\n"
-                + "# As is customary in Python programs, the main() function\n"
-                + "# should only be executed if the main module is active.\n"
-                + "if __name__==\"__main__\":\n"
-                + "    main(sys.argv)\n"
-       );
-       return code.toString();
-    }
+  /*
+   * Generate the main function code
+   */
+  public static String generateCode() {
+    StringBuilder code = new StringBuilder();
+    code.append(
+        "# The main function\n"
+            + "def main(argv):\n"
+            + "    start(argv)\n"
+            + "\n"
+            + "# As is customary in Python programs, the main() function\n"
+            + "# should only be executed if the main module is active.\n"
+            + "if __name__==\"__main__\":\n"
+            + "    main(sys.argv)\n");
+    return code.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonMethodGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonMethodGenerator.java
index a2d1e240d1..e2d2e85a6b 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonMethodGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonMethodGenerator.java
@@ -1,7 +1,6 @@
 package org.lflang.generator.python;
 
 import java.util.stream.Collectors;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Method;
 import org.lflang.lf.MethodArgument;
@@ -14,39 +13,30 @@
  */
 public class PythonMethodGenerator {
 
-    /**
-     * Generate a Python method definition for {@code method}.
-     */
-    public static String generateMethod(Method method) {
-        return String.join("\n",
-                           "# Implementation of method "+method.getName()+"().",
-                           "def "+method.getName()+"(self, "+generateMethodArgumentList(method)+"):",
-                           ASTUtils.toText(method.getCode()).indent(4)
-        );
-    }
+  /** Generate a Python method definition for {@code method}. */
+  public static String generateMethod(Method method) {
+    return String.join(
+        "\n",
+        "# Implementation of method " + method.getName() + "().",
+        "def " + method.getName() + "(self, " + generateMethodArgumentList(method) + "):",
+        ASTUtils.toText(method.getCode()).indent(4));
+  }
 
-    /**
-     * Generate methods for a reactor class.
-     *
-     * @param reactor The reactor.
-     */
-    public static String generateMethods(
-        Reactor reactor
-    ) {
-        return ASTUtils.allMethods(reactor)
-                       .stream()
-                       .map(m -> generateMethod(m))
-                       .collect(Collectors.joining());
-    }
+  /**
+   * Generate methods for a reactor class.
+   *
+   * @param reactor The reactor.
+   */
+  public static String generateMethods(Reactor reactor) {
+    return ASTUtils.allMethods(reactor).stream()
+        .map(m -> generateMethod(m))
+        .collect(Collectors.joining());
+  }
 
-    /**
-     * Generate a list of arguments for {@code method} delimited with ', '.
-     */
-    private static String generateMethodArgumentList(Method method) {
-        return String.join(", ",
-                           method.getArguments()
-                                 .stream()
-                                 .map(MethodArgument::getName)
-                                 .collect(Collectors.toList()));
-    }
+  /** Generate a list of arguments for {@code method} delimited with ', '. */
+  private static String generateMethodArgumentList(Method method) {
+    return String.join(
+        ", ",
+        method.getArguments().stream().map(MethodArgument::getName).collect(Collectors.toList()));
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonModeGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonModeGenerator.java
index 90af635727..9bcbe6607d 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonModeGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonModeGenerator.java
@@ -1,7 +1,6 @@
 package org.lflang.generator.python;
 
 import java.util.List;
-
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.lf.BuiltinTrigger;
@@ -15,86 +14,94 @@
  * Helper class to handle modes in Python programs.
  *
  * @author Soroush Bateni
- *
  */
 public class PythonModeGenerator {
-    /**
-     * Generate reset reactions in modes to reset state variables.
-     *
-     * @param reactors A list of reactors in the program, some of which could contain modes.
-     */
-    public static void generateResetReactionsIfNeeded(List<Reactor> reactors) {
-        for (Reactor reactor : reactors) {
-            generateStartupReactionsInReactor(reactor);
-        }
+  /**
+   * Generate reset reactions in modes to reset state variables.
+   *
+   * @param reactors A list of reactors in the program, some of which could contain modes.
+   */
+  public static void generateResetReactionsIfNeeded(List<Reactor> reactors) {
+    for (Reactor reactor : reactors) {
+      generateStartupReactionsInReactor(reactor);
     }
+  }
 
-    /**
-     * Generate reset reactions that reset state variables in
-     * <ul>
-     * <li>the reactor, and,</li>
-     * <li>the modes within the reactor.</li>
-     * </ul>
-     *
-     * @param reactor The reactor.
-     */
-    private static void generateStartupReactionsInReactor(Reactor reactor) {
-
-        // Create a reaction with a reset trigger
-        BuiltinTriggerRef resetTrigger = LfFactory.eINSTANCE.createBuiltinTriggerRef();
-        resetTrigger.setType(BuiltinTrigger.RESET);
-        Reaction baseReaction = LfFactory.eINSTANCE.createReaction();
-        baseReaction.getTriggers().add(resetTrigger);
+  /**
+   * Generate reset reactions that reset state variables in
+   *
+   * <ul>
+   *   <li>the reactor, and,
+   *   <li>the modes within the reactor.
+   * </ul>
+   *
+   * @param reactor The reactor.
+   */
+  private static void generateStartupReactionsInReactor(Reactor reactor) {
 
-        if (!reactor.getStateVars().isEmpty() && reactor.getStateVars().stream().anyMatch(s -> s.isReset())) {
-            // Create a reaction body that resets all state variables (that are not in a mode)
-            // to their initial value.
-            var reactionBody = LfFactory.eINSTANCE.createCode();
-            CodeBuilder code = new CodeBuilder();
-            code.pr("# Reset the following state variables to their initial value.");
-            for (var state: reactor.getStateVars()) {
-                if (state.isReset()) {
-                    code.pr("self."+state.getName()+" = "+ PythonStateGenerator.generatePythonInitializer(state));
-                }
-            }
-            reactionBody.setBody(code.toString());
-            baseReaction.setCode(reactionBody);
+    // Create a reaction with a reset trigger
+    BuiltinTriggerRef resetTrigger = LfFactory.eINSTANCE.createBuiltinTriggerRef();
+    resetTrigger.setType(BuiltinTrigger.RESET);
+    Reaction baseReaction = LfFactory.eINSTANCE.createReaction();
+    baseReaction.getTriggers().add(resetTrigger);
 
-            reactor.getReactions().add(0, baseReaction);
+    if (!reactor.getStateVars().isEmpty()
+        && reactor.getStateVars().stream().anyMatch(s -> s.isReset())) {
+      // Create a reaction body that resets all state variables (that are not in a mode)
+      // to their initial value.
+      var reactionBody = LfFactory.eINSTANCE.createCode();
+      CodeBuilder code = new CodeBuilder();
+      code.pr("# Reset the following state variables to their initial value.");
+      for (var state : reactor.getStateVars()) {
+        if (state.isReset()) {
+          code.pr(
+              "self."
+                  + state.getName()
+                  + " = "
+                  + PythonStateGenerator.generatePythonInitializer(state));
         }
+      }
+      reactionBody.setBody(code.toString());
+      baseReaction.setCode(reactionBody);
 
+      reactor.getReactions().add(0, baseReaction);
+    }
 
-        var reactorModes = reactor.getModes();
-        if (!reactorModes.isEmpty()) {
-            for (Mode mode : reactorModes) {
-                if (mode.getStateVars().isEmpty() || mode.getStateVars().stream().allMatch(s -> !s.isReset())) {
-                    continue;
-                }
-                Reaction reaction = EcoreUtil.copy(baseReaction);
-
-                // Create a reaction body that resets all state variables to their initial value.
-                var reactionBody = LfFactory.eINSTANCE.createCode();
-                CodeBuilder code = new CodeBuilder();
-                code.pr("# Reset the following state variables to their initial value.");
-                for (var state: mode.getStateVars()) {
-                    if (state.isReset()) {
-                        code.pr("self."+state.getName()+" = "+ PythonStateGenerator.generatePythonInitializer(state));
-                    }
-                }
-                reactionBody.setBody(code.toString());
-                reaction.setCode(reactionBody);
+    var reactorModes = reactor.getModes();
+    if (!reactorModes.isEmpty()) {
+      for (Mode mode : reactorModes) {
+        if (mode.getStateVars().isEmpty()
+            || mode.getStateVars().stream().allMatch(s -> !s.isReset())) {
+          continue;
+        }
+        Reaction reaction = EcoreUtil.copy(baseReaction);
 
-                try {
-                    mode.getReactions().add(0, reaction);
-                } catch (IndexOutOfBoundsException e) {
-                    // There are no scoping for state variables.
-                    // We add this reaction for now so that it
-                    // still resets state variables even if there
-                    // are no reactions in this mode.
-                    mode.getReactions().add(reaction);
-                }
+        // Create a reaction body that resets all state variables to their initial value.
+        var reactionBody = LfFactory.eINSTANCE.createCode();
+        CodeBuilder code = new CodeBuilder();
+        code.pr("# Reset the following state variables to their initial value.");
+        for (var state : mode.getStateVars()) {
+          if (state.isReset()) {
+            code.pr(
+                "self."
+                    + state.getName()
+                    + " = "
+                    + PythonStateGenerator.generatePythonInitializer(state));
+          }
+        }
+        reactionBody.setBody(code.toString());
+        reaction.setCode(reactionBody);
 
-            }
+        try {
+          mode.getReactions().add(0, reaction);
+        } catch (IndexOutOfBoundsException e) {
+          // There are no scoping for state variables.
+          // We add this reaction for now so that it
+          // still resets state variables even if there
+          // are no reactions in this mode.
+          mode.getReactions().add(reaction);
         }
+      }
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonParameterGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonParameterGenerator.java
index 838e7a27a3..0c13b111f7 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonParameterGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonParameterGenerator.java
@@ -2,107 +2,103 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.ParameterInstance;
-import org.lflang.lf.ReactorDecl;
 import org.lflang.lf.Parameter;
-
+import org.lflang.lf.ReactorDecl;
 
 public class PythonParameterGenerator {
-    /**
-     * Generate Python code that instantiates and initializes parameters for a reactor 'decl'.
-     *
-     * @param decl The reactor declaration
-     * @return The generated code as a StringBuilder
-     */
-    public static String generatePythonInstantiations(ReactorDecl decl, PythonTypes types) {
-        List<String> lines = new ArrayList<>();
-        lines.add("# Define parameters and their default values");
+  /**
+   * Generate Python code that instantiates and initializes parameters for a reactor 'decl'.
+   *
+   * @param decl The reactor declaration
+   * @return The generated code as a StringBuilder
+   */
+  public static String generatePythonInstantiations(ReactorDecl decl, PythonTypes types) {
+    List<String> lines = new ArrayList<>();
+    lines.add("# Define parameters and their default values");
 
-        for (Parameter param : getAllParameters(decl)) {
-            if (!types.getTargetType(param).equals("PyObject*")) {
-                // If type is given, use it
-                String type = types.getPythonType(ASTUtils.getInferredType(param));
-                lines.add("self._"+param.getName()+":"+type+" = "+generatePythonInitializer(param));
-            } else {
-                // If type is not given, just pass along the initialization
-                lines.add("self._"+param.getName()+" = "+generatePythonInitializer(param));
-            }
-        }
-        // Handle parameters that are set in instantiation
-        lines.addAll(List.of(
+    for (Parameter param : getAllParameters(decl)) {
+      if (!types.getTargetType(param).equals("PyObject*")) {
+        // If type is given, use it
+        String type = types.getPythonType(ASTUtils.getInferredType(param));
+        lines.add(
+            "self._" + param.getName() + ":" + type + " = " + generatePythonInitializer(param));
+      } else {
+        // If type is not given, just pass along the initialization
+        lines.add("self._" + param.getName() + " = " + generatePythonInitializer(param));
+      }
+    }
+    // Handle parameters that are set in instantiation
+    lines.addAll(
+        List.of(
             "# Handle parameters that are set in instantiation",
             "self.__dict__.update(kwargs)",
-            ""
-        ));
-        return String.join("\n", lines);
-    }
+            ""));
+    return String.join("\n", lines);
+  }
 
-    /**
-     * Generate Python code getters for parameters of reactor 'decl'.
-     *
-     * @param decl The reactor declaration
-     * @return The generated code as a StringBuilder
-     */
-    public static String generatePythonGetters(ReactorDecl decl) {
-        List<String> lines = new ArrayList<>();
-        for (Parameter param : getAllParameters(decl)) {
-            if (!param.getName().equals("bank_index")) {
-                lines.addAll(List.of(
-                    "",
-                    "@property",
-                    "def "+param.getName()+"(self):",
-                    "    return self._"+param.getName()+" # pylint: disable=no-member",
-                    ""
-                ));
-            }
-        }
-        // Create a special property for bank_index
-        lines.addAll(List.of(
+  /**
+   * Generate Python code getters for parameters of reactor 'decl'.
+   *
+   * @param decl The reactor declaration
+   * @return The generated code as a StringBuilder
+   */
+  public static String generatePythonGetters(ReactorDecl decl) {
+    List<String> lines = new ArrayList<>();
+    for (Parameter param : getAllParameters(decl)) {
+      if (!param.getName().equals("bank_index")) {
+        lines.addAll(
+            List.of(
+                "",
+                "@property",
+                "def " + param.getName() + "(self):",
+                "    return self._" + param.getName() + " # pylint: disable=no-member",
+                ""));
+      }
+    }
+    // Create a special property for bank_index
+    lines.addAll(
+        List.of(
             "",
             "@property",
             "def bank_index(self):",
             "    return self._bank_index # pylint: disable=no-member",
-            ""
-        ));
-        lines.add("\n");
-        return String.join("\n", lines);
-    }
-
-    /**
-     * Return a list of all parameters of reactor 'decl'.
-     *
-     * @param decl The reactor declaration
-     * @return The list of all parameters of 'decl'
-     */
-    private static List<Parameter> getAllParameters(ReactorDecl decl) {
-        return ASTUtils.allParameters(ASTUtils.toDefinition(decl));
-    }
+            ""));
+    lines.add("\n");
+    return String.join("\n", lines);
+  }
 
-    /**
-     * Create a Python list for parameter initialization in target code.
-     *
-     * @param p The parameter to create initializers for
-     * @return Initialization code
-     */
-    private static String generatePythonInitializer(Parameter p) {
-        return PythonTypes.getInstance().getTargetInitializer(p.getInit(), p.getType());
-    }
+  /**
+   * Return a list of all parameters of reactor 'decl'.
+   *
+   * @param decl The reactor declaration
+   * @return The list of all parameters of 'decl'
+   */
+  private static List<Parameter> getAllParameters(ReactorDecl decl) {
+    return ASTUtils.allParameters(ASTUtils.toDefinition(decl));
+  }
 
-    /**
-     * Return a Python expression that can be used to initialize the specified
-     * parameter instance. If the parameter initializer refers to other
-     * parameters, then those parameter references are replaced with
-     * accesses to the Python reactor instance class of the parents of
-     * those parameters.
-     *
-     * @param p The parameter instance to create initializer for
-     * @return Initialization code
-     */
-    public static String generatePythonInitializer(ParameterInstance p) {
-        PythonTypes pyTypes = PythonTypes.generateParametersIn(p.getParent().getParent());
-        return pyTypes.getTargetInitializer(p.getActualValue(), p.getDefinition().getType());
-    }
+  /**
+   * Create a Python list for parameter initialization in target code.
+   *
+   * @param p The parameter to create initializers for
+   * @return Initialization code
+   */
+  private static String generatePythonInitializer(Parameter p) {
+    return PythonTypes.getInstance().getTargetInitializer(p.getInit(), p.getType());
+  }
 
+  /**
+   * Return a Python expression that can be used to initialize the specified parameter instance. If
+   * the parameter initializer refers to other parameters, then those parameter references are
+   * replaced with accesses to the Python reactor instance class of the parents of those parameters.
+   *
+   * @param p The parameter instance to create initializer for
+   * @return Initialization code
+   */
+  public static String generatePythonInitializer(ParameterInstance p) {
+    PythonTypes pyTypes = PythonTypes.generateParametersIn(p.getParent().getParent());
+    return pyTypes.getTargetInitializer(p.getActualValue(), p.getDefinition().getType());
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonPortGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonPortGenerator.java
index 5109c322c3..d8ece7d206 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonPortGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonPortGenerator.java
@@ -1,237 +1,260 @@
 package org.lflang.generator.python;
 
+import static org.lflang.generator.c.CUtil.generateWidthVariable;
+
+import java.util.List;
+import org.lflang.ast.ASTUtils;
+import org.lflang.generator.CodeBuilder;
+import org.lflang.generator.c.CGenerator;
 import org.lflang.generator.c.TypeParameterizedReactor;
+import org.lflang.lf.Action;
 import org.lflang.lf.Input;
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.Output;
 import org.lflang.lf.Port;
-import org.lflang.lf.Action;
 import org.lflang.lf.ReactorDecl;
 import org.lflang.lf.VarRef;
-import java.util.List;
-import org.lflang.ast.ASTUtils;
-import org.lflang.generator.CodeBuilder;
-import org.lflang.generator.c.CGenerator;
-import static org.lflang.generator.c.CUtil.generateWidthVariable;
 
 public class PythonPortGenerator {
-    public static final String NONMULTIPORT_WIDTHSPEC = "-2";
+  public static final String NONMULTIPORT_WIDTHSPEC = "-2";
 
-    /**
-     * Generate code to convert C actions to Python action capsules. See
-     * pythontarget.h for details.
-     * @param pyObjects A string containing a list of comma-separated expressions that will create the
-     *  action capsules.
-     * @param action The action itself.
-     * @param decl The reactor decl that contains the action.
-     */
-    public static void generateActionVariableToSendToPythonReaction(List<String> pyObjects,
-        Action action, ReactorDecl decl) {
-        // Values passed to an action are always stored in the token->value.
-        // However, sometimes token might not be initialized. Therefore, this function has an internal check for NULL in case token is not initialized.
-        pyObjects.add(String.format("convert_C_action_to_py(%s)", action.getName()));
-    }
+  /**
+   * Generate code to convert C actions to Python action capsules. See pythontarget.h for details.
+   *
+   * @param pyObjects A string containing a list of comma-separated expressions that will create the
+   *     action capsules.
+   * @param action The action itself.
+   * @param decl The reactor decl that contains the action.
+   */
+  public static void generateActionVariableToSendToPythonReaction(
+      List<String> pyObjects, Action action, ReactorDecl decl) {
+    // Values passed to an action are always stored in the token->value.
+    // However, sometimes token might not be initialized. Therefore, this function has an internal
+    // check for NULL in case token is not initialized.
+    pyObjects.add(String.format("convert_C_action_to_py(%s)", action.getName()));
+  }
 
-    /**
-     * Generate code to convert C ports to Python ports capsules (@see pythontarget.h).
-     *
-     * The port may be an input of the reactor or an output of a contained reactor.
-     * @param pyObjects A string containing a list of comma-separated expressions that will create the
-     *  port capsules.
-     * @param port The port itself.
-     * @param decl The reactor decl that contains the port.
-     */
-    public static String generatePortVariablesToSendToPythonReaction(
-        List<String> pyObjects,
-        VarRef port,
-        ReactorDecl decl
-    ) {
-        if (port.getVariable() instanceof Input) {
-            generateInputVariablesToSendToPythonReaction(pyObjects, (Input) port.getVariable(), decl);
-            return "";
-        } else {
-            // port is an output of a contained reactor.
-            return generateVariablesForSendingToContainedReactors(pyObjects, port.getContainer(), (Port) port.getVariable());
-        }
+  /**
+   * Generate code to convert C ports to Python ports capsules (@see pythontarget.h).
+   *
+   * <p>The port may be an input of the reactor or an output of a contained reactor.
+   *
+   * @param pyObjects A string containing a list of comma-separated expressions that will create the
+   *     port capsules.
+   * @param port The port itself.
+   * @param decl The reactor decl that contains the port.
+   */
+  public static String generatePortVariablesToSendToPythonReaction(
+      List<String> pyObjects, VarRef port, ReactorDecl decl) {
+    if (port.getVariable() instanceof Input) {
+      generateInputVariablesToSendToPythonReaction(pyObjects, (Input) port.getVariable(), decl);
+      return "";
+    } else {
+      // port is an output of a contained reactor.
+      return generateVariablesForSendingToContainedReactors(
+          pyObjects, port.getContainer(), (Port) port.getVariable());
     }
+  }
 
-    /** Generate into the specified string builder the code to
-     *  send local variables for output ports to a Python reaction function
-     *  from the "self" struct.
-     *  @param output The output port.
-     */
-    public static void generateOutputVariablesToSendToPythonReaction(
-        List<String> pyObjects,
-        Output output
-    ) {
-        // Unfortunately, for the lf_set macros to work out-of-the-box for
-        // multiports, we need an array of <strong>pointers</strong> to the output structs,
-        // but what we have on the self struct is an array of output structs.
-        // So we have to handle multiports specially here a construct that
-        // array of pointers.
-        // FIXME: The C Generator also has this awkwardness. It makes the code generators
-        // unnecessarily difficult to maintain, and it may have performance consequences as well.
-        // Maybe we should change the lf_set macros.
-        if (!ASTUtils.isMultiport(output)) {
-            pyObjects.add(generateConvertCPortToPy(output.getName(), NONMULTIPORT_WIDTHSPEC));
-        } else {
-            pyObjects.add(generateConvertCPortToPy(output.getName()));
-        }
+  /**
+   * Generate into the specified string builder the code to send local variables for output ports to
+   * a Python reaction function from the "self" struct.
+   *
+   * @param output The output port.
+   */
+  public static void generateOutputVariablesToSendToPythonReaction(
+      List<String> pyObjects, Output output) {
+    // Unfortunately, for the lf_set macros to work out-of-the-box for
+    // multiports, we need an array of <strong>pointers</strong> to the output structs,
+    // but what we have on the self struct is an array of output structs.
+    // So we have to handle multiports specially here a construct that
+    // array of pointers.
+    // FIXME: The C Generator also has this awkwardness. It makes the code generators
+    // unnecessarily difficult to maintain, and it may have performance consequences as well.
+    // Maybe we should change the lf_set macros.
+    if (!ASTUtils.isMultiport(output)) {
+      pyObjects.add(generateConvertCPortToPy(output.getName(), NONMULTIPORT_WIDTHSPEC));
+    } else {
+      pyObjects.add(generateConvertCPortToPy(output.getName()));
     }
+  }
 
-    /** Generate into the specified string builder the code to
-     *  send local variables for input ports to a Python reaction function
-     *  from the "self" struct.
-     *  @param input The input port.
-     */
-    public static void generateInputVariablesToSendToPythonReaction(
-        List<String> pyObjects,
-        Input input,
-        ReactorDecl decl
-    ) {
-        // Create the local variable whose name matches the input.getName().
-        // If the input has not been declared mutable, then this is a pointer
-        // to the upstream output. Otherwise, it is a copy of the upstream output,
-        // which nevertheless points to the same token and value. There are 8 cases,
-        // depending on whether the input is mutable, whether it is a multiport,
-        // and whether it is a token type.
-        // Easy case first.
-        if (!input.isMutable() && !ASTUtils.isMultiport(input)) {
-            // Non-mutable, non-multiport, primitive type.
-            pyObjects.add(generateConvertCPortToPy(input.getName()));
-        } else if (input.isMutable() && !ASTUtils.isMultiport(input)) {
-            // Mutable, non-multiport, primitive type.
-            // TODO: handle mutable
-            pyObjects.add(generateConvertCPortToPy(input.getName()));
-        } else if (!input.isMutable() && ASTUtils.isMultiport(input)) {
-            // Non-mutable, multiport, primitive.
-            // TODO: support multiports
-            pyObjects.add(generateConvertCPortToPy(input.getName()));
-        } else {
-            // Mutable, multiport, primitive type
-            // TODO: support mutable multiports
-            pyObjects.add(generateConvertCPortToPy(input.getName()));
-        }
+  /**
+   * Generate into the specified string builder the code to send local variables for input ports to
+   * a Python reaction function from the "self" struct.
+   *
+   * @param input The input port.
+   */
+  public static void generateInputVariablesToSendToPythonReaction(
+      List<String> pyObjects, Input input, ReactorDecl decl) {
+    // Create the local variable whose name matches the input.getName().
+    // If the input has not been declared mutable, then this is a pointer
+    // to the upstream output. Otherwise, it is a copy of the upstream output,
+    // which nevertheless points to the same token and value. There are 8 cases,
+    // depending on whether the input is mutable, whether it is a multiport,
+    // and whether it is a token type.
+    // Easy case first.
+    if (!input.isMutable() && !ASTUtils.isMultiport(input)) {
+      // Non-mutable, non-multiport, primitive type.
+      pyObjects.add(generateConvertCPortToPy(input.getName()));
+    } else if (input.isMutable() && !ASTUtils.isMultiport(input)) {
+      // Mutable, non-multiport, primitive type.
+      // TODO: handle mutable
+      pyObjects.add(generateConvertCPortToPy(input.getName()));
+    } else if (!input.isMutable() && ASTUtils.isMultiport(input)) {
+      // Non-mutable, multiport, primitive.
+      // TODO: support multiports
+      pyObjects.add(generateConvertCPortToPy(input.getName()));
+    } else {
+      // Mutable, multiport, primitive type
+      // TODO: support mutable multiports
+      pyObjects.add(generateConvertCPortToPy(input.getName()));
     }
+  }
 
-    /** Generate into the specified string builder the code to
-     *  pass local variables for sending data to an input
-     *  of a contained reaction (e.g. for a deadline violation).
-     *  @param definition AST node defining the reactor within which this occurs
-     *  @param port Input of the contained reactor.
-     */
-    public static String generateVariablesForSendingToContainedReactors(
-        List<String> pyObjects,
-        Instantiation definition,
-        Port port
-    ) {
-        CodeBuilder code = new CodeBuilder();
-        if (definition.getWidthSpec() != null) {
-            String widthSpec = NONMULTIPORT_WIDTHSPEC;
-            if (ASTUtils.isMultiport(port)) {
-                widthSpec = "self->_lf_"+definition.getName()+"[i]."+generateWidthVariable(port.getName());
-            }
-            // Contained reactor is a bank.
-            // Create a Python list
-            code.pr(generatePythonListForContainedBank(definition.getName(), port, widthSpec));
-            pyObjects.add(definition.getName()+"_py_list");
-        }
-        else {
-            if (ASTUtils.isMultiport(port)) {
-                pyObjects.add(generateConvertCPortToPy(definition.getName()+"."+port.getName()));
-            } else {
-                pyObjects.add(generateConvertCPortToPy(definition.getName()+"."+port.getName(), NONMULTIPORT_WIDTHSPEC));
-            }
-        }
-        return code.toString();
+  /**
+   * Generate into the specified string builder the code to pass local variables for sending data to
+   * an input of a contained reaction (e.g. for a deadline violation).
+   *
+   * @param definition AST node defining the reactor within which this occurs
+   * @param port Input of the contained reactor.
+   */
+  public static String generateVariablesForSendingToContainedReactors(
+      List<String> pyObjects, Instantiation definition, Port port) {
+    CodeBuilder code = new CodeBuilder();
+    if (definition.getWidthSpec() != null) {
+      String widthSpec = NONMULTIPORT_WIDTHSPEC;
+      if (ASTUtils.isMultiport(port)) {
+        widthSpec =
+            "self->_lf_" + definition.getName() + "[i]." + generateWidthVariable(port.getName());
+      }
+      // Contained reactor is a bank.
+      // Create a Python list
+      code.pr(generatePythonListForContainedBank(definition.getName(), port, widthSpec));
+      pyObjects.add(definition.getName() + "_py_list");
+    } else {
+      if (ASTUtils.isMultiport(port)) {
+        pyObjects.add(generateConvertCPortToPy(definition.getName() + "." + port.getName()));
+      } else {
+        pyObjects.add(
+            generateConvertCPortToPy(
+                definition.getName() + "." + port.getName(), NONMULTIPORT_WIDTHSPEC));
+      }
     }
+    return code.toString();
+  }
 
+  /**
+   * Generate code that creates a Python list (i.e., []) for contained banks to be passed to Python reactions.
+   * The Python reaction will then subsequently be able to address each individual bank member of the contained
+   * bank using an index or an iterator. Each list member will contain the given <code>port<code>
+   * (which could be a multiport with a width determined by <code>widthSpec<code>).
+   *
+   * This is to accommodate reactions like <code>reaction() -> s.out<code> where s is a bank. In this example,
+   * the generated Python function will have the signature <code>reaction_function_0(self, s_out)<code>, where
+   * s_out is a list of out ports. This will later be turned into the proper <code>s.out<code> format using the
+   * Python code generated in {@link #generatePythonPortVariableInReaction}.
+   *
+   * @param reactorName The name of the bank of reactors (which is the name of the reactor class).
+   * @param port The port that should be put in the Python list.
+   * @param widthSpec A string that should be -2 for non-multiports and the width expression for multiports.
+   */
+  public static String generatePythonListForContainedBank(
+      String reactorName, Port port, String widthSpec) {
+    return String.join(
+        "\n",
+        "PyObject* "
+            + reactorName
+            + "_py_list = PyList_New("
+            + generateWidthVariable(reactorName)
+            + ");",
+        "if(" + reactorName + "_py_list == NULL) {",
+        "    lf_print_error(\"Could not create the list needed for " + reactorName + ".\");",
+        "    if (PyErr_Occurred()) {",
+        "        PyErr_PrintEx(0);",
+        "        PyErr_Clear(); // this will reset the error indicator so we can run Python code"
+            + " again",
+        "    }",
+        "    /* Release the thread. No Python API allowed beyond this point. */",
+        "    PyGILState_Release(gstate);",
+        "    Py_FinalizeEx();",
+        "    exit(1);",
+        "}",
+        "for (int i = 0; i < " + generateWidthVariable(reactorName) + "; i++) {",
+        "    if (PyList_SetItem(" + reactorName + "_py_list,",
+        "            i,",
+        "            " + generateConvertCPortToPy(reactorName + "[i]." + port.getName(), widthSpec),
+        "        ) != 0) {",
+        "        lf_print_error(\"Could not add elements to the list for " + reactorName + ".\");",
+        "        if (PyErr_Occurred()) {",
+        "            PyErr_PrintEx(0);",
+        "            PyErr_Clear(); // this will reset the error indicator so we can run Python"
+            + " code again",
+        "        }",
+        "        /* Release the thread. No Python API allowed beyond this point. */",
+        "        PyGILState_Release(gstate);",
+        "        Py_FinalizeEx();",
+        "        exit(1);",
+        "    }",
+        "}");
+  }
 
-    /**
-     * Generate code that creates a Python list (i.e., []) for contained banks to be passed to Python reactions.
-     * The Python reaction will then subsequently be able to address each individual bank member of the contained
-     * bank using an index or an iterator. Each list member will contain the given <code>port<code>
-     * (which could be a multiport with a width determined by <code>widthSpec<code>).
-     *
-     * This is to accommodate reactions like <code>reaction() -> s.out<code> where s is a bank. In this example,
-     * the generated Python function will have the signature <code>reaction_function_0(self, s_out)<code>, where
-     * s_out is a list of out ports. This will later be turned into the proper <code>s.out<code> format using the
-     * Python code generated in {@link #generatePythonPortVariableInReaction}.
-     *
-     * @param reactorName The name of the bank of reactors (which is the name of the reactor class).
-     * @param port The port that should be put in the Python list.
-     * @param widthSpec A string that should be -2 for non-multiports and the width expression for multiports.
-     */
-    public static String generatePythonListForContainedBank(String reactorName, Port port, String widthSpec) {
-        return String.join("\n",
-            "PyObject* "+reactorName+"_py_list = PyList_New("+generateWidthVariable(reactorName)+");",
-            "if("+reactorName+"_py_list == NULL) {",
-            "    lf_print_error(\"Could not create the list needed for "+reactorName+".\");",
-            "    if (PyErr_Occurred()) {",
-            "        PyErr_PrintEx(0);",
-            "        PyErr_Clear(); // this will reset the error indicator so we can run Python code again",
-            "    }",
-            "    /* Release the thread. No Python API allowed beyond this point. */",
-            "    PyGILState_Release(gstate);",
-            "    Py_FinalizeEx();",
-            "    exit(1);",
-            "}",
-            "for (int i = 0; i < "+generateWidthVariable(reactorName)+"; i++) {",
-            "    if (PyList_SetItem("+reactorName+"_py_list,",
-            "            i,",
-            "            "+generateConvertCPortToPy(reactorName + "[i]." + port.getName(), widthSpec),
-            "        ) != 0) {",
-            "        lf_print_error(\"Could not add elements to the list for "+reactorName+".\");",
-            "        if (PyErr_Occurred()) {",
-            "            PyErr_PrintEx(0);",
-            "            PyErr_Clear(); // this will reset the error indicator so we can run Python code again",
-            "        }",
-            "        /* Release the thread. No Python API allowed beyond this point. */",
-            "        PyGILState_Release(gstate);",
-            "        Py_FinalizeEx();",
-            "        exit(1);",
-            "    }",
-            "}"
-        );
-    }
+  public static String generateAliasTypeDef(
+      TypeParameterizedReactor tpr, Port port, boolean isTokenType, String genericPortType) {
+    return "typedef "
+        + genericPortType
+        + " "
+        + CGenerator.variableStructType(port, tpr, false)
+        + ";";
+  }
 
-    public static String generateAliasTypeDef(TypeParameterizedReactor tpr, Port port, boolean isTokenType, String genericPortType) {
-        return "typedef "+genericPortType+" "+CGenerator.variableStructType(port, tpr, false)+";";
-    }
-
-    private static String generateConvertCPortToPy(String port) {
-        return String.format("convert_C_port_to_py(%s, %s)", port, generateWidthVariable(port));
-    }
+  private static String generateConvertCPortToPy(String port) {
+    return String.format("convert_C_port_to_py(%s, %s)", port, generateWidthVariable(port));
+  }
 
-    private static String generateConvertCPortToPy(String port, String widthSpec) {
-        return String.format("convert_C_port_to_py(%s, %s)", port, widthSpec);
-    }
+  private static String generateConvertCPortToPy(String port, String widthSpec) {
+    return String.format("convert_C_port_to_py(%s, %s)", port, widthSpec);
+  }
 
-    /**
-     * Generate into the specified string builder (<code>inits<code>) the code to
-     * initialize local variable for <code>port<code> so that it can be used in the body of
-     * the Python reaction.
-     * @param port The port to generate code for.
-     */
-    public static String generatePythonPortVariableInReaction(VarRef port) {
-        String containerName = port.getContainer().getName();
-        String variableName = port.getVariable().getName();
-        String tryStatement = "try: "+containerName+"  # pylint: disable=used-before-assignment";
-        if (port.getContainer().getWidthSpec() != null) {
-            // It's a bank
-            return String.join("\n",
-                tryStatement,
-                "except NameError: "+containerName+" = [None] * len("+containerName+"_"+variableName+")",
-                "for i in range(len("+containerName+"_"+variableName+")):",
-                "    if "+containerName+"[i] is None: "+containerName+"[i] = Make()",
-                "    "+containerName+"[i]."+variableName+" = "+containerName+"_"+variableName+"[i]"
-            );
-        } else {
-            return String.join("\n",
-                tryStatement,
-                "except NameError: "+containerName+" = Make()",
-                containerName+"."+variableName+" = "+containerName+"_"+variableName
-            );
-        }
+  /**
+   * Generate into the specified string builder (<code>inits<code>) the code to
+   * initialize local variable for <code>port<code> so that it can be used in the body of
+   * the Python reaction.
+   * @param port The port to generate code for.
+   */
+  public static String generatePythonPortVariableInReaction(VarRef port) {
+    String containerName = port.getContainer().getName();
+    String variableName = port.getVariable().getName();
+    String tryStatement = "try: " + containerName + "  # pylint: disable=used-before-assignment";
+    if (port.getContainer().getWidthSpec() != null) {
+      // It's a bank
+      return String.join(
+          "\n",
+          tryStatement,
+          "except NameError: "
+              + containerName
+              + " = [None] * len("
+              + containerName
+              + "_"
+              + variableName
+              + ")",
+          "for i in range(len(" + containerName + "_" + variableName + ")):",
+          "    if " + containerName + "[i] is None: " + containerName + "[i] = Make()",
+          "    "
+              + containerName
+              + "[i]."
+              + variableName
+              + " = "
+              + containerName
+              + "_"
+              + variableName
+              + "[i]");
+    } else {
+      return String.join(
+          "\n",
+          tryStatement,
+          "except NameError: " + containerName + " = Make()",
+          containerName + "." + variableName + " = " + containerName + "_" + variableName);
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonPreambleGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonPreambleGenerator.java
index b69320f6af..bd1291425f 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonPreambleGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonPreambleGenerator.java
@@ -3,60 +3,53 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import org.lflang.ast.ASTUtils;
 import org.lflang.TargetConfig;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.c.CPreambleGenerator;
 import org.lflang.lf.Preamble;
 
-
 /**
- * Generates user-defined preambles and #define and #include directives
- * for the Python target.
+ * Generates user-defined preambles and #define and #include directives for the Python target.
  *
  * @author Edward A. Lee
  * @author Soroush Bateni
  * @author Hou Seng Wong
  */
 public class PythonPreambleGenerator {
-    /**
-     * Generates preambles defined by user for a given reactor.
-     * The preamble code is put inside the reactor class.
-     */
-    public static String generatePythonPreambles(List<Preamble> preambles) {
-        List<String> preamblesCode = new ArrayList<>();
-        preambles.forEach(p -> preamblesCode.add(ASTUtils.toText(p.getCode())));
-        return preamblesCode.size() > 0 ? String.join("\n",
+  /**
+   * Generates preambles defined by user for a given reactor. The preamble code is put inside the
+   * reactor class.
+   */
+  public static String generatePythonPreambles(List<Preamble> preambles) {
+    List<String> preamblesCode = new ArrayList<>();
+    preambles.forEach(p -> preamblesCode.add(ASTUtils.toText(p.getCode())));
+    return preamblesCode.size() > 0
+        ? String.join(
+            "\n",
             "# From the preamble, verbatim:",
             String.join("\n", preamblesCode),
-            "# End of preamble."
-        ) : "";
-    }
+            "# End of preamble.")
+        : "";
+  }
 
-    public static String generateCDefineDirectives(
-        TargetConfig targetConfig,
-        Path srcGenPath,
-        boolean hasModalReactors
-    ) {
-        // TODO: Delete all of this. It is not used.
-        CodeBuilder code = new CodeBuilder();
-        code.pr(CPreambleGenerator.generateDefineDirectives(
-            targetConfig, srcGenPath, hasModalReactors)
-        );
-        return code.toString();
-    }
+  public static String generateCDefineDirectives(
+      TargetConfig targetConfig, Path srcGenPath, boolean hasModalReactors) {
+    // TODO: Delete all of this. It is not used.
+    CodeBuilder code = new CodeBuilder();
+    code.pr(
+        CPreambleGenerator.generateDefineDirectives(targetConfig, srcGenPath, hasModalReactors));
+    return code.toString();
+  }
 
-    public static String generateCIncludeStatements(
-        TargetConfig targetConfig,
-        boolean CCppMode,
-        boolean hasModalReactors
-    ) {
-        CodeBuilder code = new CodeBuilder();
-        code.pr(CPreambleGenerator.generateIncludeStatements(targetConfig, CCppMode));
-        code.pr("#include \"pythontarget.h\"");
-        if (hasModalReactors) {
-            code.pr("#include \"include/modal_models/definitions.h\"");
-        }
-        return code.toString();
+  public static String generateCIncludeStatements(
+      TargetConfig targetConfig, boolean CCppMode, boolean hasModalReactors) {
+    CodeBuilder code = new CodeBuilder();
+    code.pr(CPreambleGenerator.generateIncludeStatements(targetConfig, CCppMode));
+    code.pr("#include \"pythontarget.h\"");
+    if (hasModalReactors) {
+      code.pr("#include \"include/modal_models/definitions.h\"");
     }
+    return code.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonReactionGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonReactionGenerator.java
index 3d307b6b52..87f594a71a 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonReactionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonReactionGenerator.java
@@ -4,560 +4,632 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.AttributeUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.Target;
-
+import org.lflang.ast.ASTUtils;
+import org.lflang.generator.CodeBuilder;
+import org.lflang.generator.ReactionInstance;
+import org.lflang.generator.ReactorInstance;
+import org.lflang.generator.c.CCoreFilesUtils;
 import org.lflang.generator.c.CReactionGenerator;
+import org.lflang.generator.c.CTypes;
+import org.lflang.generator.c.CUtil;
 import org.lflang.generator.c.TypeParameterizedReactor;
-import org.lflang.lf.ReactorDecl;
-import org.lflang.lf.Reaction;
-import org.lflang.lf.Reactor;
 import org.lflang.lf.Action;
 import org.lflang.lf.Code;
+import org.lflang.lf.Input;
+import org.lflang.lf.Instantiation;
+import org.lflang.lf.Mode;
+import org.lflang.lf.Output;
+import org.lflang.lf.Port;
+import org.lflang.lf.Reaction;
+import org.lflang.lf.Reactor;
+import org.lflang.lf.ReactorDecl;
 import org.lflang.lf.TriggerRef;
 import org.lflang.lf.VarRef;
 import org.lflang.util.StringUtil;
-import org.lflang.lf.Instantiation;
-import org.lflang.lf.Port;
-import org.lflang.lf.Input;
-import org.lflang.lf.Output;
-import org.lflang.generator.c.CCoreFilesUtils;
-import org.lflang.generator.c.CTypes;
-import org.lflang.generator.c.CUtil;
-import org.lflang.generator.CodeBuilder;
-import org.lflang.generator.ReactionInstance;
-import org.lflang.generator.ReactorInstance;
-import org.lflang.lf.Mode;
 
 public class PythonReactionGenerator {
-    /**
-     * Generate code to call reaction numbered "reactionIndex" in reactor "reactor".
-     * @param reactor The reactor containing the reaction
-     * @param reactionIndex The index of the reaction
-     * @param pyObjects CPython related objects
-     */
-    public static String generateCPythonReactionCaller(TypeParameterizedReactor reactor,
-                                                        int reactionIndex,
-                                                        List<String> pyObjects,
-                                                        String inits) {
-        String pythonFunctionName = generatePythonReactionFunctionName(reactionIndex);
-        String cpythonFunctionName = generateCPythonReactionFunctionName(reactionIndex);
-        return generateCPythonFunctionCaller(CUtil.getName(reactor), pythonFunctionName, cpythonFunctionName, pyObjects, inits);
-    }
-
-    /**
-     * Generate code to call deadline function numbered "reactionIndex" in reactor "r".
-     * @param r The reactor containing the reaction
-     * @param reactionIndex The index of the reaction
-     * @param pyObjects CPython related objects
-     */
-    public static String generateCPythonDeadlineCaller(TypeParameterizedReactor r,
-                                                       int reactionIndex,
-                                                       List<String> pyObjects) {
-        String pythonFunctionName = generatePythonDeadlineFunctionName(reactionIndex);
-        String cpythonFunctionName = generateCPythonDeadlineFunctionName(reactionIndex);
-        return generateCPythonFunctionCaller(CUtil.getName(r), pythonFunctionName, cpythonFunctionName, pyObjects, "");
-    }
-
-    /**
-     * Generate code to call deadline function numbered "reactionIndex" in reactor "r".
-     * @param r The reactor containing the reaction
-     * @param reactionIndex The index of the reaction
-     * @param pyObjects CPython related objects
-     */
-    public static String generateCPythonSTPCaller(TypeParameterizedReactor r,
-                                                       int reactionIndex,
-                                                       List<String> pyObjects) {
-        String pythonFunctionName = generatePythonSTPFunctionName(reactionIndex);
-        String cpythonFunctionName = generateCPythonSTPFunctionName(reactionIndex);
-        return generateCPythonFunctionCaller(CUtil.getName(r), pythonFunctionName, cpythonFunctionName, pyObjects, "");
+  /**
+   * Generate code to call reaction numbered "reactionIndex" in reactor "reactor".
+   *
+   * @param reactor The reactor containing the reaction
+   * @param reactionIndex The index of the reaction
+   * @param pyObjects CPython related objects
+   */
+  public static String generateCPythonReactionCaller(
+      TypeParameterizedReactor reactor, int reactionIndex, List<String> pyObjects, String inits) {
+    String pythonFunctionName = generatePythonReactionFunctionName(reactionIndex);
+    String cpythonFunctionName = generateCPythonReactionFunctionName(reactionIndex);
+    return generateCPythonFunctionCaller(
+        CUtil.getName(reactor), pythonFunctionName, cpythonFunctionName, pyObjects, inits);
+  }
+
+  /**
+   * Generate code to call deadline function numbered "reactionIndex" in reactor "r".
+   *
+   * @param r The reactor containing the reaction
+   * @param reactionIndex The index of the reaction
+   * @param pyObjects CPython related objects
+   */
+  public static String generateCPythonDeadlineCaller(
+      TypeParameterizedReactor r, int reactionIndex, List<String> pyObjects) {
+    String pythonFunctionName = generatePythonDeadlineFunctionName(reactionIndex);
+    String cpythonFunctionName = generateCPythonDeadlineFunctionName(reactionIndex);
+    return generateCPythonFunctionCaller(
+        CUtil.getName(r), pythonFunctionName, cpythonFunctionName, pyObjects, "");
+  }
+
+  /**
+   * Generate code to call deadline function numbered "reactionIndex" in reactor "r".
+   *
+   * @param r The reactor containing the reaction
+   * @param reactionIndex The index of the reaction
+   * @param pyObjects CPython related objects
+   */
+  public static String generateCPythonSTPCaller(
+      TypeParameterizedReactor r, int reactionIndex, List<String> pyObjects) {
+    String pythonFunctionName = generatePythonSTPFunctionName(reactionIndex);
+    String cpythonFunctionName = generateCPythonSTPFunctionName(reactionIndex);
+    return generateCPythonFunctionCaller(
+        CUtil.getName(r), pythonFunctionName, cpythonFunctionName, pyObjects, "");
+  }
+
+  /**
+   * Generate code to call a CPython function.
+   *
+   * @param reactorDeclName The name of the reactor for debugging purposes
+   * @param pythonFunctionName The name of the function in the .py file.
+   * @param cpythonFunctionName The name of the function in self struct of the .c file.
+   * @param pyObjects CPython related objects
+   */
+  private static String generateCPythonFunctionCaller(
+      String reactorDeclName,
+      String pythonFunctionName,
+      String cpythonFunctionName,
+      List<String> pyObjects,
+      String inits) {
+    String pyObjectsJoined = pyObjects.size() > 0 ? ", " + String.join(", ", pyObjects) : "";
+    CodeBuilder code = new CodeBuilder();
+    code.pr(PyUtil.generateGILAcquireCode());
+    code.pr(inits);
+    code.pr(
+        String.join(
+            "\n",
+            "LF_PRINT_DEBUG(\"Calling reaction function "
+                + reactorDeclName
+                + "."
+                + pythonFunctionName
+                + "\");",
+            "PyObject *rValue = PyObject_CallObject(",
+            "    self->" + cpythonFunctionName + ", ",
+            "    Py_BuildValue(\"(" + "O".repeat(pyObjects.size()) + ")\"" + pyObjectsJoined + ")",
+            ");",
+            "if (rValue == NULL) {",
+            "    lf_print_error(\"FATAL: Calling reaction "
+                + reactorDeclName
+                + "."
+                + pythonFunctionName
+                + " failed.\");",
+            "    if (PyErr_Occurred()) {",
+            "        PyErr_PrintEx(0);",
+            "        PyErr_Clear(); // this will reset the error indicator so we can run Python"
+                + " code again",
+            "    }",
+            "    " + PyUtil.generateGILReleaseCode(),
+            "    Py_FinalizeEx();",
+            "    exit(1);",
+            "}",
+            "",
+            "/* Release the thread. No Python API allowed beyond this point. */",
+            PyUtil.generateGILReleaseCode()));
+    return code.toString();
+  }
+
+  /**
+   * Generate the reaction in the .c file, which calls the Python reaction through the CPython interface.
+   *
+   * @param reaction The reaction to generate Python-specific initialization for.
+   * @param r The reactor to which <code>reaction<code> belongs to.
+   * @param reactionIndex The index number of the reaction in decl.
+   * @param mainDef The main reactor.
+   * @param errorReporter An error reporter.
+   * @param types A helper class for type-related stuff.
+   */
+  public static String generateCReaction(
+      Reaction reaction,
+      TypeParameterizedReactor tpr,
+      Reactor r,
+      int reactionIndex,
+      Instantiation mainDef,
+      ErrorReporter errorReporter,
+      CTypes types) {
+    // Contains the actual comma separated list of inputs to the reaction of type
+    // generic_port_instance_struct.
+    // Each input must be cast to (PyObject *) (aka their descriptors for Py_BuildValue are "O")
+    List<String> pyObjects = new ArrayList<>();
+    CodeBuilder code = new CodeBuilder();
+    String cPyInit = generateCPythonInitializers(reaction, r, pyObjects, errorReporter);
+    String cInit =
+        CReactionGenerator.generateInitializationForReaction(
+            "",
+            reaction,
+            tpr,
+            reactionIndex,
+            types,
+            errorReporter,
+            mainDef,
+            Target.Python.requiresTypes);
+    code.pr("#include " + StringUtil.addDoubleQuotes(CCoreFilesUtils.getCTargetSetHeader()));
+    code.pr(
+        generateFunction(
+            CReactionGenerator.generateReactionFunctionHeader(tpr, reactionIndex),
+            cInit,
+            reaction.getCode(),
+            generateCPythonReactionCaller(tpr, reactionIndex, pyObjects, cPyInit)));
+
+    // Generate code for the STP violation handler, if there is one.
+    if (reaction.getStp() != null) {
+      code.pr(
+          generateFunction(
+              CReactionGenerator.generateStpFunctionHeader(tpr, reactionIndex),
+              cInit,
+              reaction.getStp().getCode(),
+              generateCPythonSTPCaller(tpr, reactionIndex, pyObjects)));
     }
-
-    /**
-     * Generate code to call a CPython function.
-     * @param reactorDeclName The name of the reactor for debugging purposes
-     * @param pythonFunctionName The name of the function in the .py file.
-     * @param cpythonFunctionName The name of the function in self struct of the .c file.
-     * @param pyObjects CPython related objects
-     */
-    private static String generateCPythonFunctionCaller(String reactorDeclName,
-                                                        String pythonFunctionName,
-                                                        String cpythonFunctionName,
-                                                        List<String> pyObjects,
-                                                        String inits) {
-        String pyObjectsJoined = pyObjects.size() > 0 ? ", " + String.join(", ", pyObjects) : "";
-        CodeBuilder code = new CodeBuilder();
-        code.pr(PyUtil.generateGILAcquireCode());
-        code.pr(inits);
-        code.pr(String.join("\n",
-                "LF_PRINT_DEBUG(\"Calling reaction function "+reactorDeclName+"."+pythonFunctionName+"\");",
-                "PyObject *rValue = PyObject_CallObject(",
-                "    self->"+cpythonFunctionName+", ",
-                "    Py_BuildValue(\"("+"O".repeat(pyObjects.size())+")\""+pyObjectsJoined+")",
-                ");",
-                "if (rValue == NULL) {",
-                "    lf_print_error(\"FATAL: Calling reaction "+reactorDeclName+"."+pythonFunctionName+" failed.\");",
-                "    if (PyErr_Occurred()) {",
-                "        PyErr_PrintEx(0);",
-                "        PyErr_Clear(); // this will reset the error indicator so we can run Python code again",
-                "    }",
-                "    "+PyUtil.generateGILReleaseCode(),
-                "    Py_FinalizeEx();",
-                "    exit(1);",
-                "}",
-                "",
-                "/* Release the thread. No Python API allowed beyond this point. */",
-                PyUtil.generateGILReleaseCode()
-        ));
-        return code.toString();
+    // Generate code for the deadline violation function, if there is one.
+    if (reaction.getDeadline() != null) {
+      code.pr(
+          generateFunction(
+              CReactionGenerator.generateDeadlineFunctionHeader(tpr, reactionIndex),
+              cInit,
+              reaction.getDeadline().getCode(),
+              generateCPythonDeadlineCaller(tpr, reactionIndex, pyObjects)));
     }
-
-    /**
-     * Generate the reaction in the .c file, which calls the Python reaction through the CPython interface.
-     *
-     * @param reaction The reaction to generate Python-specific initialization for.
-     * @param r The reactor to which <code>reaction<code> belongs to.
-     * @param reactionIndex The index number of the reaction in decl.
-     * @param mainDef The main reactor.
-     * @param errorReporter An error reporter.
-     * @param types A helper class for type-related stuff.
-     */
-    public static String generateCReaction(
-        Reaction reaction,
-        TypeParameterizedReactor tpr,
-        Reactor r,
-        int reactionIndex,
-        Instantiation mainDef,
-        ErrorReporter errorReporter,
-        CTypes types
-    ) {
-        // Contains the actual comma separated list of inputs to the reaction of type generic_port_instance_struct.
-        // Each input must be cast to (PyObject *) (aka their descriptors for Py_BuildValue are "O")
-        List<String> pyObjects = new ArrayList<>();
-        CodeBuilder code = new CodeBuilder();
-        String cPyInit = generateCPythonInitializers(reaction, r, pyObjects, errorReporter);
-        String cInit = CReactionGenerator.generateInitializationForReaction(
-                                                "", reaction, tpr, reactionIndex,
-                                                types, errorReporter, mainDef,
-                                                Target.Python.requiresTypes);
+    code.pr("#include " + StringUtil.addDoubleQuotes(CCoreFilesUtils.getCTargetSetUndefHeader()));
+    return code.toString();
+  }
+
+  public static String generateFunction(String header, String init, Code code, String pyCaller) {
+    var function = new CodeBuilder();
+    function.pr(header + "{");
+    function.indent();
+    function.pr(init);
+    function.prSourceLineNumber(code);
+    function.pr(pyCaller);
+    function.unindent();
+    function.pr("}");
+    return function.toString();
+  }
+
+  /**
+   * Generate necessary Python-specific initialization code for <code>reaction<code> that belongs to reactor
+   * <code>decl<code>.
+   *
+   * @param reaction The reaction to generate Python-specific initialization for.
+   * @param decl The reactor to which <code>reaction<code> belongs to.
+   * @param pyObjects A list of expressions that can be used as additional arguments to <code>Py_BuildValue<code>
+   *  (@see <a href="https://docs.python.org/3/c-api/arg.html#c.Py_BuildValue">docs.python.org/3/c-api</a>).
+   *  We will use as a format string, "(O...O)" where the number of O's is equal to the length of the list.
+   */
+  private static String generateCPythonInitializers(
+      Reaction reaction, ReactorDecl decl, List<String> pyObjects, ErrorReporter errorReporter) {
+    Set<Action> actionsAsTriggers = new LinkedHashSet<>();
+    Reactor reactor = ASTUtils.toDefinition(decl);
+    CodeBuilder code = new CodeBuilder();
+    // Next, add the triggers (input and actions; timers are not needed).
+    // TODO: handle triggers
+    for (TriggerRef trigger : ASTUtils.convertToEmptyListIfNull(reaction.getTriggers())) {
+      if (trigger instanceof VarRef triggerAsVarRef) {
         code.pr(
-            "#include " + StringUtil.addDoubleQuotes(
-                CCoreFilesUtils.getCTargetSetHeader()));
-        code.pr(generateFunction(
-                    CReactionGenerator.generateReactionFunctionHeader(tpr, reactionIndex),
-                    cInit, reaction.getCode(),
-                    generateCPythonReactionCaller(tpr, reactionIndex, pyObjects, cPyInit)
-        ));
-
-        // Generate code for the STP violation handler, if there is one.
-        if (reaction.getStp() != null) {
-            code.pr(generateFunction(
-                    CReactionGenerator.generateStpFunctionHeader(tpr, reactionIndex),
-                    cInit, reaction.getStp().getCode(),
-                    generateCPythonSTPCaller(tpr, reactionIndex, pyObjects)
-                ));
-        }
-        // Generate code for the deadline violation function, if there is one.
-        if (reaction.getDeadline() != null) {
-            code.pr(generateFunction(
-                CReactionGenerator.generateDeadlineFunctionHeader(tpr, reactionIndex),
-                cInit, reaction.getDeadline().getCode(),
-                generateCPythonDeadlineCaller(tpr, reactionIndex, pyObjects)
-            ));
-        }
-        code.pr(
-            "#include " + StringUtil.addDoubleQuotes(
-                CCoreFilesUtils.getCTargetSetUndefHeader()));
-        return code.toString();
+            generateVariableToSendPythonReaction(
+                triggerAsVarRef, actionsAsTriggers, decl, pyObjects));
+      }
     }
-
-    public static String generateFunction(
-        String header, String init, Code code, String pyCaller
-    ) {
-        var function = new CodeBuilder();
-        function.pr(header + "{");
-        function.indent();
-        function.pr(init);
-        function.prSourceLineNumber(code);
-        function.pr(pyCaller);
-        function.unindent();
-        function.pr("}");
-        return function.toString();
+    if (reaction.getTriggers() == null || reaction.getTriggers().size() == 0) {
+      // No triggers are given, which means react to any input.
+      // Declare an argument for every input.
+      // NOTE: this does not include contained outputs.
+      for (Input input : reactor.getInputs()) {
+        PythonPortGenerator.generateInputVariablesToSendToPythonReaction(pyObjects, input, decl);
+      }
     }
 
-    /**
-     * Generate necessary Python-specific initialization code for <code>reaction<code> that belongs to reactor
-     * <code>decl<code>.
-     *
-     * @param reaction The reaction to generate Python-specific initialization for.
-     * @param decl The reactor to which <code>reaction<code> belongs to.
-     * @param pyObjects A list of expressions that can be used as additional arguments to <code>Py_BuildValue<code>
-     *  (@see <a href="https://docs.python.org/3/c-api/arg.html#c.Py_BuildValue">docs.python.org/3/c-api</a>).
-     *  We will use as a format string, "(O...O)" where the number of O's is equal to the length of the list.
-     */
-    private static String generateCPythonInitializers(Reaction reaction,
-                                                      ReactorDecl decl,
-                                                      List<String> pyObjects,
-                                                      ErrorReporter errorReporter) {
-        Set<Action> actionsAsTriggers = new LinkedHashSet<>();
-        Reactor reactor = ASTUtils.toDefinition(decl);
-        CodeBuilder code = new CodeBuilder();
-        // Next, add the triggers (input and actions; timers are not needed).
-        // TODO: handle triggers
-        for (TriggerRef trigger : ASTUtils.convertToEmptyListIfNull(reaction.getTriggers())) {
-            if (trigger instanceof VarRef triggerAsVarRef) {
-                code.pr(generateVariableToSendPythonReaction(triggerAsVarRef, actionsAsTriggers, decl, pyObjects));
-            }
-        }
-        if (reaction.getTriggers() == null || reaction.getTriggers().size() == 0) {
-            // No triggers are given, which means react to any input.
-            // Declare an argument for every input.
-            // NOTE: this does not include contained outputs.
-            for (Input input : reactor.getInputs()) {
-                PythonPortGenerator.generateInputVariablesToSendToPythonReaction(pyObjects, input, decl);
-            }
-        }
-
-        // Next add non-triggering inputs.
-        for (VarRef src : ASTUtils.convertToEmptyListIfNull(reaction.getSources())) {
-            code.pr(generateVariableToSendPythonReaction(src, actionsAsTriggers, decl, pyObjects));
-        }
-
-        // Next, handle effects
-        if (reaction.getEffects() != null) {
-            for (VarRef effect : reaction.getEffects()) {
-                if (effect.getVariable() instanceof Action) {
-                    // It is an action, not an output.
-                    // If it has already appeared as trigger, do not redefine it.
-                    if (!actionsAsTriggers.contains(effect.getVariable())) {
-                        PythonPortGenerator.generateActionVariableToSendToPythonReaction(pyObjects,
-                            (Action) effect.getVariable(), decl);
-                    }
-                } else if (effect.getVariable() instanceof Mode) {
-                    String name = effect.getVariable().getName();
-                    pyObjects.add("convert_C_mode_to_py("+name+",(self_base_t*)self, _lf_"+name+"_change_type)");
-                } else {
-                    if (effect.getVariable() instanceof Output) {
-                        PythonPortGenerator.generateOutputVariablesToSendToPythonReaction(pyObjects, (Output) effect.getVariable());
-                    } else if (effect.getVariable() instanceof Input) {
-                        // It is the input of a contained reactor.
-                        code.pr(PythonPortGenerator.generateVariablesForSendingToContainedReactors(pyObjects, effect.getContainer(), (Input) effect.getVariable()));
-                    } else {
-                        errorReporter.reportError(
-                            reaction,
-                            "In generateReaction(): " + effect.getVariable().getName() + " is neither an input nor an output."
-                        );
-                    }
-                }
-            }
-        }
-        return code.toString();
+    // Next add non-triggering inputs.
+    for (VarRef src : ASTUtils.convertToEmptyListIfNull(reaction.getSources())) {
+      code.pr(generateVariableToSendPythonReaction(src, actionsAsTriggers, decl, pyObjects));
     }
 
-    /**
-     * Generate parameters and their respective initialization code for a reaction function
-     * The initialization code is put at the beginning of the reaction before user code
-     * @param parameters The parameters used for function definition
-     * @param inits The initialization code for those paramters
-     * @param decl Reactor declaration
-     * @param reaction The reaction to be used to generate parameters for
-     */
-    public static void generatePythonReactionParametersAndInitializations(List<String> parameters, CodeBuilder inits,
-                                                                          ReactorDecl decl, Reaction reaction) {
-        Reactor reactor = ASTUtils.toDefinition(decl);
-        LinkedHashSet<String> generatedParams = new LinkedHashSet<>();
-
-        // Handle triggers
-        for (TriggerRef trigger : ASTUtils.convertToEmptyListIfNull(reaction.getTriggers())) {
-            if (!(trigger instanceof VarRef triggerAsVarRef)) {
-                continue;
-            }
-            if (triggerAsVarRef.getVariable() instanceof Port) {
-                if (triggerAsVarRef.getVariable() instanceof Input) {
-                    if (((Input) triggerAsVarRef.getVariable()).isMutable()) {
-                        generatedParams.add("mutable_"+triggerAsVarRef.getVariable().getName());
-
-                        // Create a deep copy
-                        if (ASTUtils.isMultiport((Input) triggerAsVarRef.getVariable())) {
-                            inits.
-                                pr(triggerAsVarRef.getVariable().getName()+" = [Make() for i in range(len(mutable_"+triggerAsVarRef.getVariable().getName()+"))]");
-                            inits.pr("for i in range(len(mutable_"+triggerAsVarRef.getVariable().getName()+")):");
-                            inits.pr("    "+triggerAsVarRef.getVariable().getName()+"[i].value = copy.deepcopy(mutable_"+triggerAsVarRef.getVariable().getName()+"[i].value)");
-                        } else {
-                            inits.pr(triggerAsVarRef.getVariable().getName()+" = Make()");
-                            inits.
-                                pr(triggerAsVarRef.getVariable().getName()+".value = copy.deepcopy(mutable_"+triggerAsVarRef.getVariable().getName()+".value)");
-                        }
-                    } else {
-                        generatedParams.add(triggerAsVarRef.getVariable().getName());
-                    }
-                } else {
-                    // Handle contained reactors' ports
-                    generatedParams.add(triggerAsVarRef.getContainer().getName()+"_"+triggerAsVarRef.getVariable().getName());
-                    inits.pr(PythonPortGenerator.generatePythonPortVariableInReaction(triggerAsVarRef));
-                }
-            } else if (triggerAsVarRef.getVariable() instanceof Action) {
-                generatedParams.add(triggerAsVarRef.getVariable().getName());
-            }
-        }
-
-        // Handle non-triggering inputs
-        if (reaction.getTriggers() == null || reaction.getTriggers().size() == 0) {
-            for (Input input : ASTUtils.convertToEmptyListIfNull(reactor.getInputs())) {
-                generatedParams.add(input.getName());
-                if (input.isMutable()) {
-                    // Create a deep copy
-                    inits.pr(input.getName()+" = copy.deepcopy("+input.getName()+")");
-                }
-            }
-        }
-        for (VarRef src : ASTUtils.convertToEmptyListIfNull(reaction.getSources())) {
-            if (src.getVariable() instanceof Output) {
-                // Output of a contained reactor
-                generatedParams.add(src.getContainer().getName()+"_"+src.getVariable().getName());
-                inits.pr(PythonPortGenerator.generatePythonPortVariableInReaction(src));
-            } else {
-                generatedParams.add(src.getVariable().getName());
-                if (src.getVariable() instanceof Input) {
-                    if (((Input) src.getVariable()).isMutable()) {
-                        // Create a deep copy
-                        inits.pr(src.getVariable().getName()+" = copy.deepcopy("+src.getVariable().getName()+")");
-                    }
-                }
-            }
+    // Next, handle effects
+    if (reaction.getEffects() != null) {
+      for (VarRef effect : reaction.getEffects()) {
+        if (effect.getVariable() instanceof Action) {
+          // It is an action, not an output.
+          // If it has already appeared as trigger, do not redefine it.
+          if (!actionsAsTriggers.contains(effect.getVariable())) {
+            PythonPortGenerator.generateActionVariableToSendToPythonReaction(
+                pyObjects, (Action) effect.getVariable(), decl);
+          }
+        } else if (effect.getVariable() instanceof Mode) {
+          String name = effect.getVariable().getName();
+          pyObjects.add(
+              "convert_C_mode_to_py("
+                  + name
+                  + ",(self_base_t*)self, _lf_"
+                  + name
+                  + "_change_type)");
+        } else {
+          if (effect.getVariable() instanceof Output) {
+            PythonPortGenerator.generateOutputVariablesToSendToPythonReaction(
+                pyObjects, (Output) effect.getVariable());
+          } else if (effect.getVariable() instanceof Input) {
+            // It is the input of a contained reactor.
+            code.pr(
+                PythonPortGenerator.generateVariablesForSendingToContainedReactors(
+                    pyObjects, effect.getContainer(), (Input) effect.getVariable()));
+          } else {
+            errorReporter.reportError(
+                reaction,
+                "In generateReaction(): "
+                    + effect.getVariable().getName()
+                    + " is neither an input nor an output.");
+          }
         }
-
-        // Handle effects
-        for (VarRef effect : ASTUtils.convertToEmptyListIfNull(reaction.getEffects())) {
-            if (effect.getVariable() instanceof Input) {
-                generatedParams.add(effect.getContainer().getName()+"_"+effect.getVariable().getName());
-                inits.pr(PythonPortGenerator.generatePythonPortVariableInReaction(effect));
+      }
+    }
+    return code.toString();
+  }
+
+  /**
+   * Generate parameters and their respective initialization code for a reaction function The
+   * initialization code is put at the beginning of the reaction before user code
+   *
+   * @param parameters The parameters used for function definition
+   * @param inits The initialization code for those paramters
+   * @param decl Reactor declaration
+   * @param reaction The reaction to be used to generate parameters for
+   */
+  public static void generatePythonReactionParametersAndInitializations(
+      List<String> parameters, CodeBuilder inits, ReactorDecl decl, Reaction reaction) {
+    Reactor reactor = ASTUtils.toDefinition(decl);
+    LinkedHashSet<String> generatedParams = new LinkedHashSet<>();
+
+    // Handle triggers
+    for (TriggerRef trigger : ASTUtils.convertToEmptyListIfNull(reaction.getTriggers())) {
+      if (!(trigger instanceof VarRef triggerAsVarRef)) {
+        continue;
+      }
+      if (triggerAsVarRef.getVariable() instanceof Port) {
+        if (triggerAsVarRef.getVariable() instanceof Input) {
+          if (((Input) triggerAsVarRef.getVariable()).isMutable()) {
+            generatedParams.add("mutable_" + triggerAsVarRef.getVariable().getName());
+
+            // Create a deep copy
+            if (ASTUtils.isMultiport((Input) triggerAsVarRef.getVariable())) {
+              inits.pr(
+                  triggerAsVarRef.getVariable().getName()
+                      + " = [Make() for i in range(len(mutable_"
+                      + triggerAsVarRef.getVariable().getName()
+                      + "))]");
+              inits.pr(
+                  "for i in range(len(mutable_" + triggerAsVarRef.getVariable().getName() + ")):");
+              inits.pr(
+                  "    "
+                      + triggerAsVarRef.getVariable().getName()
+                      + "[i].value = copy.deepcopy(mutable_"
+                      + triggerAsVarRef.getVariable().getName()
+                      + "[i].value)");
             } else {
-                generatedParams.add(effect.getVariable().getName());
-                if (effect.getVariable() instanceof Port) {
-                    if (ASTUtils.isMultiport((Port) effect.getVariable())) {
-                        // Handle multiports
-                    }
-                }
+              inits.pr(triggerAsVarRef.getVariable().getName() + " = Make()");
+              inits.pr(
+                  triggerAsVarRef.getVariable().getName()
+                      + ".value = copy.deepcopy(mutable_"
+                      + triggerAsVarRef.getVariable().getName()
+                      + ".value)");
             }
+          } else {
+            generatedParams.add(triggerAsVarRef.getVariable().getName());
+          }
+        } else {
+          // Handle contained reactors' ports
+          generatedParams.add(
+              triggerAsVarRef.getContainer().getName()
+                  + "_"
+                  + triggerAsVarRef.getVariable().getName());
+          inits.pr(PythonPortGenerator.generatePythonPortVariableInReaction(triggerAsVarRef));
         }
-
-        for (String s : generatedParams) {
-            parameters.add(s);
-        }
+      } else if (triggerAsVarRef.getVariable() instanceof Action) {
+        generatedParams.add(triggerAsVarRef.getVariable().getName());
+      }
     }
 
-    private static String generateVariableToSendPythonReaction(VarRef varRef,
-                                                             Set<Action> actionsAsTriggers,
-                                                             ReactorDecl decl,
-                                                             List<String> pyObjects) {
-        if (varRef.getVariable() instanceof Port) {
-            return PythonPortGenerator.generatePortVariablesToSendToPythonReaction(pyObjects, varRef, decl);
-        } else if (varRef.getVariable() instanceof Action) {
-            actionsAsTriggers.add((Action) varRef.getVariable());
-            PythonPortGenerator.generateActionVariableToSendToPythonReaction(pyObjects, (Action) varRef.getVariable(), decl);
+    // Handle non-triggering inputs
+    if (reaction.getTriggers() == null || reaction.getTriggers().size() == 0) {
+      for (Input input : ASTUtils.convertToEmptyListIfNull(reactor.getInputs())) {
+        generatedParams.add(input.getName());
+        if (input.isMutable()) {
+          // Create a deep copy
+          inits.pr(input.getName() + " = copy.deepcopy(" + input.getName() + ")");
         }
-        return "";
+      }
     }
-
-    /**
-     * Generate Python code to link cpython functions to python functions for each reaction.
-     * @param instance The reactor instance.
-     * @param mainDef The definition of the main reactor
-     */
-    public static String generateCPythonReactionLinkers(
-            ReactorInstance instance,
-            Instantiation mainDef
-    ) {
-        String nameOfSelfStruct = CUtil.reactorRef(instance);
-        Reactor reactor = ASTUtils.toDefinition(instance.getDefinition().getReactorClass());
-        CodeBuilder code = new CodeBuilder();
-
-        // Initialize the name field to the unique name of the instance
-        code.pr(nameOfSelfStruct+"->_lf_name = \""+instance.uniqueID()+"_lf\";");
-
-        for (ReactionInstance reaction : instance.reactions) {
-            // Reactions marked with a {@code @_c_body} attribute are generated in C
-            if (AttributeUtils.hasCBody(reaction.getDefinition())) continue;
-            // Create a PyObject for each reaction
-            code.pr(generateCPythonReactionLinker(instance, reaction, nameOfSelfStruct));
+    for (VarRef src : ASTUtils.convertToEmptyListIfNull(reaction.getSources())) {
+      if (src.getVariable() instanceof Output) {
+        // Output of a contained reactor
+        generatedParams.add(src.getContainer().getName() + "_" + src.getVariable().getName());
+        inits.pr(PythonPortGenerator.generatePythonPortVariableInReaction(src));
+      } else {
+        generatedParams.add(src.getVariable().getName());
+        if (src.getVariable() instanceof Input) {
+          if (((Input) src.getVariable()).isMutable()) {
+            // Create a deep copy
+            inits.pr(
+                src.getVariable().getName()
+                    + " = copy.deepcopy("
+                    + src.getVariable().getName()
+                    + ")");
+          }
         }
-        return code.toString();
+      }
     }
 
-    /**
-     * Generate Python code to link cpython functions to python functions for a reaction.
-     * @param instance The reactor instance.
-     * @param reaction The reaction of this instance to link.
-     * @param nameOfSelfStruct The name of the self struct in cpython.
-     */
-    public static String generateCPythonReactionLinker(
-            ReactorInstance instance,
-            ReactionInstance reaction,
-            String nameOfSelfStruct
-    ) {
-        CodeBuilder code = new CodeBuilder();
-        code.pr(generateCPythonFunctionLinker(
-            nameOfSelfStruct, generateCPythonReactionFunctionName(reaction.index),
-            instance, generatePythonReactionFunctionName(reaction.index))
-        );
-        if (reaction.getDefinition().getStp() != null) {
-            code.pr(generateCPythonFunctionLinker(
-                nameOfSelfStruct, generateCPythonSTPFunctionName(reaction.index),
-                instance, generatePythonSTPFunctionName(reaction.index))
-            );
-        }
-        if (reaction.getDefinition().getDeadline() != null) {
-            code.pr(generateCPythonFunctionLinker(
-                nameOfSelfStruct, generateCPythonDeadlineFunctionName(reaction.index),
-                instance, generatePythonDeadlineFunctionName(reaction.index))
-            );
+    // Handle effects
+    for (VarRef effect : ASTUtils.convertToEmptyListIfNull(reaction.getEffects())) {
+      if (effect.getVariable() instanceof Input) {
+        generatedParams.add(effect.getContainer().getName() + "_" + effect.getVariable().getName());
+        inits.pr(PythonPortGenerator.generatePythonPortVariableInReaction(effect));
+      } else {
+        generatedParams.add(effect.getVariable().getName());
+        if (effect.getVariable() instanceof Port) {
+          if (ASTUtils.isMultiport((Port) effect.getVariable())) {
+            // Handle multiports
+          }
         }
-        return code.toString();
+      }
     }
 
-    /**
-     * Generate code to link "pythonFunctionName" to "cpythonFunctionName" in "nameOfSelfStruct" of "instance".
-     * @param nameOfSelfStruct the self struct name of instance
-     * @param cpythonFunctionName the name of the cpython function
-     * @param instance the reactor instance
-     * @param pythonFunctionName the name of the python function
-     */
-    private static String generateCPythonFunctionLinker(String nameOfSelfStruct, String cpythonFunctionName, ReactorInstance instance, String pythonFunctionName) {
-        return String.join("\n",
-            nameOfSelfStruct+"->"+cpythonFunctionName+" = ",
-            "get_python_function(\"__main__\", ",
-            "    "+nameOfSelfStruct+"->_lf_name,",
-            "    "+CUtil.runtimeIndex(instance)+",",
-            "    \""+pythonFunctionName+"\");",
-            "if("+nameOfSelfStruct+"->"+cpythonFunctionName+" == NULL) {",
-            "    lf_print_error_and_exit(\"Could not load function "+pythonFunctionName+"\");",
-            "}"
-        );
+    for (String s : generatedParams) {
+      parameters.add(s);
     }
-
-    /**
-     * Generate the function that is executed whenever the deadline of the reaction
-     * with the given reaction index is missed
-     * @param reaction The reaction to generate deadline miss code for
-     * @param reactionIndex The agreed-upon index of the reaction in the reactor (should match the C generated code)
-     * @param reactionParameters The parameters to the deadline violation function, which are the same as the reaction function
-     */
-    public static String generatePythonFunction(String pythonFunctionName, String inits, String reactionBody, List<String> reactionParameters) {
-        String params = reactionParameters.size() > 0 ? ", " + String.join(", ", reactionParameters) : "";
-        CodeBuilder code = new CodeBuilder();
-        code.pr("def "+pythonFunctionName+"(self"+params+"):");
-        code.indent();
-        code.pr(inits);
-        code.pr(reactionBody);
-        code.pr("return 0");
-        return code.toString();
-    }
-
-
-    /**
-     * Generate the Python code for reactions in reactor
-     * @param reactor The reactor
-     * @param reactions The reactions of reactor
-     */
-    public static String generatePythonReactions(Reactor reactor, List<Reaction> reactions) {
-        CodeBuilder code = new CodeBuilder();
-        int reactionIndex = 0;
-        for (Reaction reaction : reactions) {
-            code.pr(generatePythonReaction(reactor, reaction, reactionIndex));
-            reactionIndex++;
-        }
-        return code.toString();
-    }
-
-    /**
-     * Generate the Python code for reaction in reactor
-     * @param reactor The reactor
-     * @param reaction The reaction of reactor
-     */
-    public static String generatePythonReaction(Reactor reactor, Reaction reaction, int reactionIndex) {
-        // Reactions marked with a {@code @_c_body} attribute are generated in C
-        if (AttributeUtils.hasCBody(reaction))  return "";
-
-        CodeBuilder code = new CodeBuilder();
-        List<String> reactionParameters = new ArrayList<>(); // Will contain parameters for the function (e.g., Foo(x,y,z,...)
-        CodeBuilder inits = new CodeBuilder(); // Will contain initialization code for some parameters
-        PythonReactionGenerator.generatePythonReactionParametersAndInitializations(reactionParameters, inits, reactor, reaction);
-        code.pr(generatePythonFunction(
-            generatePythonReactionFunctionName(reactionIndex),
-            inits.toString(),
-            ASTUtils.toText(reaction.getCode()),
-            reactionParameters
-        ));
-        // Generate code for the STP violation handler function, if there is one.
-        if (reaction.getStp() != null) {
-            code.pr(generatePythonFunction(
-                generatePythonSTPFunctionName(reactionIndex),
-                "",
-                ASTUtils.toText(reaction.getStp().getCode()),
-                reactionParameters
-            ));
-        }
-        // Generate code for the deadline violation function, if there is one.
-        if (reaction.getDeadline() != null) {
-            code.pr(generatePythonFunction(
-                generatePythonDeadlineFunctionName(reactionIndex),
-                "",
-                ASTUtils.toText(reaction.getDeadline().getCode()),
-                reactionParameters
-            ));
-        }
-        return code.toString();
+  }
+
+  private static String generateVariableToSendPythonReaction(
+      VarRef varRef, Set<Action> actionsAsTriggers, ReactorDecl decl, List<String> pyObjects) {
+    if (varRef.getVariable() instanceof Port) {
+      return PythonPortGenerator.generatePortVariablesToSendToPythonReaction(
+          pyObjects, varRef, decl);
+    } else if (varRef.getVariable() instanceof Action) {
+      actionsAsTriggers.add((Action) varRef.getVariable());
+      PythonPortGenerator.generateActionVariableToSendToPythonReaction(
+          pyObjects, (Action) varRef.getVariable(), decl);
     }
-
-    /** Return the function name of the reaction inside the self struct in the .c file.
-     *  @param reactionIndex The reaction index.
-     *  @return The function name for the reaction.
-     */
-    public static String generateCPythonReactionFunctionName(int reactionIndex) {
-        return "_lf_py_reaction_function_"+reactionIndex;
+    return "";
+  }
+
+  /**
+   * Generate Python code to link cpython functions to python functions for each reaction.
+   *
+   * @param instance The reactor instance.
+   * @param mainDef The definition of the main reactor
+   */
+  public static String generateCPythonReactionLinkers(
+      ReactorInstance instance, Instantiation mainDef) {
+    String nameOfSelfStruct = CUtil.reactorRef(instance);
+    Reactor reactor = ASTUtils.toDefinition(instance.getDefinition().getReactorClass());
+    CodeBuilder code = new CodeBuilder();
+
+    // Initialize the name field to the unique name of the instance
+    code.pr(nameOfSelfStruct + "->_lf_name = \"" + instance.uniqueID() + "_lf\";");
+
+    for (ReactionInstance reaction : instance.reactions) {
+      // Reactions marked with a {@code @_c_body} attribute are generated in C
+      if (AttributeUtils.hasCBody(reaction.getDefinition())) continue;
+      // Create a PyObject for each reaction
+      code.pr(generateCPythonReactionLinker(instance, reaction, nameOfSelfStruct));
     }
-
-    /** Return the function name of the deadline function inside the self struct in the .c file.
-     *  @param reactionIndex The reaction index.
-     *  @return The function name for the reaction.
-     */
-    public static String generateCPythonDeadlineFunctionName(int reactionIndex) {
-        return "_lf_py_deadline_function_"+reactionIndex;
+    return code.toString();
+  }
+
+  /**
+   * Generate Python code to link cpython functions to python functions for a reaction.
+   *
+   * @param instance The reactor instance.
+   * @param reaction The reaction of this instance to link.
+   * @param nameOfSelfStruct The name of the self struct in cpython.
+   */
+  public static String generateCPythonReactionLinker(
+      ReactorInstance instance, ReactionInstance reaction, String nameOfSelfStruct) {
+    CodeBuilder code = new CodeBuilder();
+    code.pr(
+        generateCPythonFunctionLinker(
+            nameOfSelfStruct, generateCPythonReactionFunctionName(reaction.index),
+            instance, generatePythonReactionFunctionName(reaction.index)));
+    if (reaction.getDefinition().getStp() != null) {
+      code.pr(
+          generateCPythonFunctionLinker(
+              nameOfSelfStruct, generateCPythonSTPFunctionName(reaction.index),
+              instance, generatePythonSTPFunctionName(reaction.index)));
     }
-
-    /** Return the function name of the STP violation handler function inside the self struct in the .c file.
-     *  @param reactionIndex The reaction index.
-     *  @return The function name for the reaction.
-     */
-    public static String generateCPythonSTPFunctionName(int reactionIndex) {
-        return "_lf_py_STP_function_"+reactionIndex;
+    if (reaction.getDefinition().getDeadline() != null) {
+      code.pr(
+          generateCPythonFunctionLinker(
+              nameOfSelfStruct, generateCPythonDeadlineFunctionName(reaction.index),
+              instance, generatePythonDeadlineFunctionName(reaction.index)));
     }
-
-    /** Return the function name of the reaction in the .py file.
-     *  @param reactionIndex The reaction index.
-     *  @return The function name for the reaction.
-     */
-    public static String generatePythonReactionFunctionName(int reactionIndex) {
-        return "reaction_function_" + reactionIndex;
+    return code.toString();
+  }
+
+  /**
+   * Generate code to link "pythonFunctionName" to "cpythonFunctionName" in "nameOfSelfStruct" of
+   * "instance".
+   *
+   * @param nameOfSelfStruct the self struct name of instance
+   * @param cpythonFunctionName the name of the cpython function
+   * @param instance the reactor instance
+   * @param pythonFunctionName the name of the python function
+   */
+  private static String generateCPythonFunctionLinker(
+      String nameOfSelfStruct,
+      String cpythonFunctionName,
+      ReactorInstance instance,
+      String pythonFunctionName) {
+    return String.join(
+        "\n",
+        nameOfSelfStruct + "->" + cpythonFunctionName + " = ",
+        "get_python_function(\"__main__\", ",
+        "    " + nameOfSelfStruct + "->_lf_name,",
+        "    " + CUtil.runtimeIndex(instance) + ",",
+        "    \"" + pythonFunctionName + "\");",
+        "if(" + nameOfSelfStruct + "->" + cpythonFunctionName + " == NULL) {",
+        "    lf_print_error_and_exit(\"Could not load function " + pythonFunctionName + "\");",
+        "}");
+  }
+
+  /**
+   * Generate the function that is executed whenever the deadline of the reaction with the given
+   * reaction index is missed
+   *
+   * @param reaction The reaction to generate deadline miss code for
+   * @param reactionIndex The agreed-upon index of the reaction in the reactor (should match the C
+   *     generated code)
+   * @param reactionParameters The parameters to the deadline violation function, which are the same
+   *     as the reaction function
+   */
+  public static String generatePythonFunction(
+      String pythonFunctionName,
+      String inits,
+      String reactionBody,
+      List<String> reactionParameters) {
+    String params =
+        reactionParameters.size() > 0 ? ", " + String.join(", ", reactionParameters) : "";
+    CodeBuilder code = new CodeBuilder();
+    code.pr("def " + pythonFunctionName + "(self" + params + "):");
+    code.indent();
+    code.pr(inits);
+    code.pr(reactionBody);
+    code.pr("return 0");
+    return code.toString();
+  }
+
+  /**
+   * Generate the Python code for reactions in reactor
+   *
+   * @param reactor The reactor
+   * @param reactions The reactions of reactor
+   */
+  public static String generatePythonReactions(Reactor reactor, List<Reaction> reactions) {
+    CodeBuilder code = new CodeBuilder();
+    int reactionIndex = 0;
+    for (Reaction reaction : reactions) {
+      code.pr(generatePythonReaction(reactor, reaction, reactionIndex));
+      reactionIndex++;
     }
-
-    /** Return the function name of the deadline function in the .py file.
-     *  @param reactionIndex The reaction index.
-     *  @return The function name for the reaction.
-     */
-    public static String generatePythonDeadlineFunctionName(int reactionIndex) {
-        return "deadline_function_" + reactionIndex;
+    return code.toString();
+  }
+
+  /**
+   * Generate the Python code for reaction in reactor
+   *
+   * @param reactor The reactor
+   * @param reaction The reaction of reactor
+   */
+  public static String generatePythonReaction(
+      Reactor reactor, Reaction reaction, int reactionIndex) {
+    // Reactions marked with a {@code @_c_body} attribute are generated in C
+    if (AttributeUtils.hasCBody(reaction)) return "";
+
+    CodeBuilder code = new CodeBuilder();
+    List<String> reactionParameters =
+        new ArrayList<>(); // Will contain parameters for the function (e.g., Foo(x,y,z,...)
+    CodeBuilder inits = new CodeBuilder(); // Will contain initialization code for some parameters
+    PythonReactionGenerator.generatePythonReactionParametersAndInitializations(
+        reactionParameters, inits, reactor, reaction);
+    code.pr(
+        generatePythonFunction(
+            generatePythonReactionFunctionName(reactionIndex),
+            inits.toString(),
+            ASTUtils.toText(reaction.getCode()),
+            reactionParameters));
+    // Generate code for the STP violation handler function, if there is one.
+    if (reaction.getStp() != null) {
+      code.pr(
+          generatePythonFunction(
+              generatePythonSTPFunctionName(reactionIndex),
+              "",
+              ASTUtils.toText(reaction.getStp().getCode()),
+              reactionParameters));
     }
-
-    /** Return the function name of the STP violation handler function in the .py file.
-     *  @param reactionIndex The reaction index.
-     *  @return The function name for the reaction.
-     */
-    public static String generatePythonSTPFunctionName(int reactionIndex) {
-        return "STP_function_" + reactionIndex;
+    // Generate code for the deadline violation function, if there is one.
+    if (reaction.getDeadline() != null) {
+      code.pr(
+          generatePythonFunction(
+              generatePythonDeadlineFunctionName(reactionIndex),
+              "",
+              ASTUtils.toText(reaction.getDeadline().getCode()),
+              reactionParameters));
     }
+    return code.toString();
+  }
+
+  /**
+   * Return the function name of the reaction inside the self struct in the .c file.
+   *
+   * @param reactionIndex The reaction index.
+   * @return The function name for the reaction.
+   */
+  public static String generateCPythonReactionFunctionName(int reactionIndex) {
+    return "_lf_py_reaction_function_" + reactionIndex;
+  }
+
+  /**
+   * Return the function name of the deadline function inside the self struct in the .c file.
+   *
+   * @param reactionIndex The reaction index.
+   * @return The function name for the reaction.
+   */
+  public static String generateCPythonDeadlineFunctionName(int reactionIndex) {
+    return "_lf_py_deadline_function_" + reactionIndex;
+  }
+
+  /**
+   * Return the function name of the STP violation handler function inside the self struct in the .c
+   * file.
+   *
+   * @param reactionIndex The reaction index.
+   * @return The function name for the reaction.
+   */
+  public static String generateCPythonSTPFunctionName(int reactionIndex) {
+    return "_lf_py_STP_function_" + reactionIndex;
+  }
+
+  /**
+   * Return the function name of the reaction in the .py file.
+   *
+   * @param reactionIndex The reaction index.
+   * @return The function name for the reaction.
+   */
+  public static String generatePythonReactionFunctionName(int reactionIndex) {
+    return "reaction_function_" + reactionIndex;
+  }
+
+  /**
+   * Return the function name of the deadline function in the .py file.
+   *
+   * @param reactionIndex The reaction index.
+   * @return The function name for the reaction.
+   */
+  public static String generatePythonDeadlineFunctionName(int reactionIndex) {
+    return "deadline_function_" + reactionIndex;
+  }
+
+  /**
+   * Return the function name of the STP violation handler function in the .py file.
+   *
+   * @param reactionIndex The reaction index.
+   * @return The function name for the reaction.
+   */
+  public static String generatePythonSTPFunctionName(int reactionIndex) {
+    return "STP_function_" + reactionIndex;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonReactorGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonReactorGenerator.java
index 6e1a7f0183..8f2d3fd8ad 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonReactorGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonReactorGenerator.java
@@ -11,149 +11,162 @@
 import org.lflang.lf.ReactorDecl;
 
 public class PythonReactorGenerator {
-    /**
-     * Wrapper function for the more elaborate generatePythonReactorClass that keeps track
-     * of visited reactors to avoid duplicate generation
-     * @param instance The reactor instance to be generated
-     */
-    public static String generatePythonClass(ReactorInstance instance, ReactorInstance main, PythonTypes types) {
-        List<String> instantiatedClasses = new ArrayList<>();
-        return generatePythonClass(instance, instantiatedClasses, main, types);
-    }
-
-    /**
-     * Generate a Python class corresponding to decl
-     * @param instance The reactor instance to be generated
-     * @param instantiatedClasses A list of visited instances to avoid generating duplicates
-     */
-    public static String generatePythonClass(ReactorInstance instance,
-                                           List<String> instantiatedClasses,
-                                           ReactorInstance main, PythonTypes types) {
-        CodeBuilder pythonClasses = new CodeBuilder();
-        ReactorDecl decl = instance.getDefinition().getReactorClass();
-        Reactor reactor = ASTUtils.toDefinition(decl);
-        String className = PyUtil.getName(instance.tpr);
-        if (instantiatedClasses == null) {
-            return "";
-        }
-
-        if (!instantiatedClasses.contains(className)) {
-            pythonClasses.pr(generatePythonClassHeader(className));
-            // Generate preamble code
-            pythonClasses.indent();
-            pythonClasses.pr(PythonPreambleGenerator.generatePythonPreambles(reactor.getPreambles()));
-            // Handle runtime initializations
-            pythonClasses.pr(generatePythonConstructor(decl, types));
-            pythonClasses.pr(PythonParameterGenerator.generatePythonGetters(decl));
-            // Generate methods
-            pythonClasses.pr(PythonMethodGenerator.generateMethods(reactor));
-            // Generate reactions
-            List<Reaction> reactionToGenerate = ASTUtils.allReactions(reactor);
-            pythonClasses.pr(PythonReactionGenerator.generatePythonReactions(reactor, reactionToGenerate));
-            pythonClasses.unindent();
-            pythonClasses.pr("\n");
-            instantiatedClasses.add(className);
-        }
+  /**
+   * Wrapper function for the more elaborate generatePythonReactorClass that keeps track of visited
+   * reactors to avoid duplicate generation
+   *
+   * @param instance The reactor instance to be generated
+   */
+  public static String generatePythonClass(
+      ReactorInstance instance, ReactorInstance main, PythonTypes types) {
+    List<String> instantiatedClasses = new ArrayList<>();
+    return generatePythonClass(instance, instantiatedClasses, main, types);
+  }
 
-        for (ReactorInstance child : instance.children) {
-            pythonClasses.pr(generatePythonClass(child, instantiatedClasses, main, types));
-        }
-        return pythonClasses.getCode();
+  /**
+   * Generate a Python class corresponding to decl
+   *
+   * @param instance The reactor instance to be generated
+   * @param instantiatedClasses A list of visited instances to avoid generating duplicates
+   */
+  public static String generatePythonClass(
+      ReactorInstance instance,
+      List<String> instantiatedClasses,
+      ReactorInstance main,
+      PythonTypes types) {
+    CodeBuilder pythonClasses = new CodeBuilder();
+    ReactorDecl decl = instance.getDefinition().getReactorClass();
+    Reactor reactor = ASTUtils.toDefinition(decl);
+    String className = PyUtil.getName(instance.tpr);
+    if (instantiatedClasses == null) {
+      return "";
     }
 
-    private static String generatePythonClassHeader(String className) {
-        return String.join("\n",
-            "# Python class for reactor "+className+"",
-            "class _"+className+":"
-        );
+    if (!instantiatedClasses.contains(className)) {
+      pythonClasses.pr(generatePythonClassHeader(className));
+      // Generate preamble code
+      pythonClasses.indent();
+      pythonClasses.pr(PythonPreambleGenerator.generatePythonPreambles(reactor.getPreambles()));
+      // Handle runtime initializations
+      pythonClasses.pr(generatePythonConstructor(decl, types));
+      pythonClasses.pr(PythonParameterGenerator.generatePythonGetters(decl));
+      // Generate methods
+      pythonClasses.pr(PythonMethodGenerator.generateMethods(reactor));
+      // Generate reactions
+      List<Reaction> reactionToGenerate = ASTUtils.allReactions(reactor);
+      pythonClasses.pr(
+          PythonReactionGenerator.generatePythonReactions(reactor, reactionToGenerate));
+      pythonClasses.unindent();
+      pythonClasses.pr("\n");
+      instantiatedClasses.add(className);
     }
 
-    /**
-     * Generate code that instantiates and initializes parameters and state variables for a reactor 'decl'.
-     *
-     * @param decl The reactor declaration
-     * @return The generated code as a StringBuilder
-     */
-     private static String generatePythonConstructor(ReactorDecl decl, PythonTypes types) {
-        CodeBuilder code = new CodeBuilder();
-        code.pr("# Constructor");
-        code.pr("def __init__(self, **kwargs):");
-        code.indent();
-        code.pr(PythonParameterGenerator.generatePythonInstantiations(decl, types));
-        code.pr(PythonStateGenerator.generatePythonInstantiations(decl));
-        return code.toString();
+    for (ReactorInstance child : instance.children) {
+      pythonClasses.pr(generatePythonClass(child, instantiatedClasses, main, types));
     }
+    return pythonClasses.getCode();
+  }
 
-    /**
-     * Generate code to instantiate a Python list that will hold the Python
-     * class instance of reactor <code>instance<code>. Will recursively do
-     * the same for the children of <code>instance<code> as well.
-     *
-     * @param instance The reactor instance for which the Python list will be created.
-     */
-    public static String generateListsToHoldClassInstances(ReactorInstance instance) {
-        CodeBuilder code = new CodeBuilder();
-        code.pr(PyUtil.reactorRefName(instance)+" = [None] * "+instance.getTotalWidth());
-        for (ReactorInstance child : instance.children) {
-            code.pr(generateListsToHoldClassInstances(child));
-        }
-        return code.toString();
+  private static String generatePythonClassHeader(String className) {
+    return String.join(
+        "\n", "# Python class for reactor " + className + "", "class _" + className + ":");
+  }
+
+  /**
+   * Generate code that instantiates and initializes parameters and state variables for a reactor
+   * 'decl'.
+   *
+   * @param decl The reactor declaration
+   * @return The generated code as a StringBuilder
+   */
+  private static String generatePythonConstructor(ReactorDecl decl, PythonTypes types) {
+    CodeBuilder code = new CodeBuilder();
+    code.pr("# Constructor");
+    code.pr("def __init__(self, **kwargs):");
+    code.indent();
+    code.pr(PythonParameterGenerator.generatePythonInstantiations(decl, types));
+    code.pr(PythonStateGenerator.generatePythonInstantiations(decl));
+    return code.toString();
+  }
+
+  /**
+   * Generate code to instantiate a Python list that will hold the Python
+   * class instance of reactor <code>instance<code>. Will recursively do
+   * the same for the children of <code>instance<code> as well.
+   *
+   * @param instance The reactor instance for which the Python list will be created.
+   */
+  public static String generateListsToHoldClassInstances(ReactorInstance instance) {
+    CodeBuilder code = new CodeBuilder();
+    code.pr(PyUtil.reactorRefName(instance) + " = [None] * " + instance.getTotalWidth());
+    for (ReactorInstance child : instance.children) {
+      code.pr(generateListsToHoldClassInstances(child));
     }
+    return code.toString();
+  }
 
-    /**
-     * Instantiate classes in Python, as well as subclasses.
-     * Instances are always instantiated as a list of className = [_className, _className, ...] depending on the size of the bank.
-     * If there is no bank or the size is 1, the instance would be generated as className = [_className]
-     * @param instance The reactor instance to be instantiated
-     * @param main The main reactor
-     */
-    public static String generatePythonClassInstantiations(ReactorInstance instance,
-                        ReactorInstance main) {
-        CodeBuilder code = new CodeBuilder();
+  /**
+   * Instantiate classes in Python, as well as subclasses. Instances are always instantiated as a
+   * list of className = [_className, _className, ...] depending on the size of the bank. If there
+   * is no bank or the size is 1, the instance would be generated as className = [_className]
+   *
+   * @param instance The reactor instance to be instantiated
+   * @param main The main reactor
+   */
+  public static String generatePythonClassInstantiations(
+      ReactorInstance instance, ReactorInstance main) {
+    CodeBuilder code = new CodeBuilder();
 
-        String className = PyUtil.getName(instance.tpr);
+    String className = PyUtil.getName(instance.tpr);
 
-        if (instance.getWidth() > 0) {
-            // For each reactor instance, create a list regardless of whether it is a bank or not.
-            // Non-bank reactor instances will be a list of size 1.
-            String fullName = instance.getFullName();
-            code.pr(String.join("\n",
-                "# Start initializing "+fullName+" of class "+className,
-                "for "+PyUtil.bankIndexName(instance)+" in range("+instance.getWidth()+"):"
-            ));
-            code.indent();
-            // Define a bank_index local variable so that it can be used while
-            // setting parameter values.
-            code.pr("bank_index = "+PyUtil.bankIndexName(instance));
-            code.pr(generatePythonClassInstantiation(instance, className));
-        }
+    if (instance.getWidth() > 0) {
+      // For each reactor instance, create a list regardless of whether it is a bank or not.
+      // Non-bank reactor instances will be a list of size 1.
+      String fullName = instance.getFullName();
+      code.pr(
+          String.join(
+              "\n",
+              "# Start initializing " + fullName + " of class " + className,
+              "for " + PyUtil.bankIndexName(instance) + " in range(" + instance.getWidth() + "):"));
+      code.indent();
+      // Define a bank_index local variable so that it can be used while
+      // setting parameter values.
+      code.pr("bank_index = " + PyUtil.bankIndexName(instance));
+      code.pr(generatePythonClassInstantiation(instance, className));
+    }
 
-        for (ReactorInstance child : instance.children) {
-            code.pr(generatePythonClassInstantiations(child, main));
-        }
-        code.unindent();
-        return code.toString();
+    for (ReactorInstance child : instance.children) {
+      code.pr(generatePythonClassInstantiations(child, main));
     }
+    code.unindent();
+    return code.toString();
+  }
 
-    /**
-     * Instantiate a class with className in instance.
-     * @param instance The reactor instance to be instantiated
-     * @param className The name of the class to instantiate
-     */
-    private static String generatePythonClassInstantiation(ReactorInstance instance,
-                                                           String className) {
-        CodeBuilder code = new CodeBuilder();
-        code.pr(PyUtil.reactorRef(instance)+" = _"+className+"(");
-        code.indent();
-        // Always add the bank_index
-        code.pr("_bank_index = "+PyUtil.bankIndex(instance)+",");
-        for (ParameterInstance param : instance.parameters) {
-            if (!param.getName().equals("bank_index")) {
-                code.pr("_"+param.getName()+"="+ PythonParameterGenerator.generatePythonInitializer(param)+",");
-            }
-        }
-        code.unindent();
-        code.pr(")");
-        return code.toString();
+  /**
+   * Instantiate a class with className in instance.
+   *
+   * @param instance The reactor instance to be instantiated
+   * @param className The name of the class to instantiate
+   */
+  private static String generatePythonClassInstantiation(
+      ReactorInstance instance, String className) {
+    CodeBuilder code = new CodeBuilder();
+    code.pr(PyUtil.reactorRef(instance) + " = _" + className + "(");
+    code.indent();
+    // Always add the bank_index
+    code.pr("_bank_index = " + PyUtil.bankIndex(instance) + ",");
+    for (ParameterInstance param : instance.parameters) {
+      if (!param.getName().equals("bank_index")) {
+        code.pr(
+            "_"
+                + param.getName()
+                + "="
+                + PythonParameterGenerator.generatePythonInitializer(param)
+                + ",");
+      }
     }
+    code.unindent();
+    code.pr(")");
+    return code.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonStateGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonStateGenerator.java
index e318a8812c..45dc8cf7d5 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonStateGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonStateGenerator.java
@@ -2,36 +2,38 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.ReactorDecl;
 import org.lflang.lf.StateVar;
 
 public class PythonStateGenerator {
-    /**
-     * Generate state variable instantiations for reactor "decl"
-     * @param decl The reactor declaration to generate state variables.
-     */
-    public static String generatePythonInstantiations(ReactorDecl decl) {
-        List<String> lines = new ArrayList<>();
-        lines.add("# Define state variables");
-        // Next, handle state variables
-        for (StateVar state : ASTUtils.allStateVars(ASTUtils.toDefinition(decl))) {
-            lines.add("self."+state.getName()+" = "+generatePythonInitializer(state));
-        }
-        lines.add("");
-        return String.join("\n", lines);
+  /**
+   * Generate state variable instantiations for reactor "decl"
+   *
+   * @param decl The reactor declaration to generate state variables.
+   */
+  public static String generatePythonInstantiations(ReactorDecl decl) {
+    List<String> lines = new ArrayList<>();
+    lines.add("# Define state variables");
+    // Next, handle state variables
+    for (StateVar state : ASTUtils.allStateVars(ASTUtils.toDefinition(decl))) {
+      lines.add("self." + state.getName() + " = " + generatePythonInitializer(state));
     }
+    lines.add("");
+    return String.join("\n", lines);
+  }
 
-    /**
-     * Handle initialization for state variable
-     * @param state a state variable
-     */
-    public static String generatePythonInitializer(StateVar state) {
-        if (!ASTUtils.isInitialized(state)) {
-            return "None";
-        }
-        List<String> list = state.getInit().getExprs().stream().map(PyUtil::getPythonTargetValue).toList();
-        return list.size() > 1 ? "[" + String.join(", ", list) + "]" : list.get(0);
+  /**
+   * Handle initialization for state variable
+   *
+   * @param state a state variable
+   */
+  public static String generatePythonInitializer(StateVar state) {
+    if (!ASTUtils.isInitialized(state)) {
+      return "None";
     }
+    List<String> list =
+        state.getInit().getExprs().stream().map(PyUtil::getPythonTargetValue).toList();
+    return list.size() > 1 ? "[" + String.join(", ", list) + "]" : list.get(0);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonTypes.java b/org.lflang/src/org/lflang/generator/python/PythonTypes.java
index 5b62ee5f97..66abfabf5f 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonTypes.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonTypes.java
@@ -3,74 +3,74 @@
 import java.util.List;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-
 import org.lflang.InferredType;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.generator.c.CTypes;
-import org.lflang.generator.c.CUtil;
 import org.lflang.lf.ParameterReference;
 
 public class PythonTypes extends CTypes {
 
-    // Regular expression pattern for pointer types. The star at the end has to be visible.
-    static final Pattern pointerPatternVariable = Pattern.compile("^\\s*+(\\w+)\\s*\\*\\s*$");
-    private static final PythonTypes INSTANCE = new PythonTypes();
+  // Regular expression pattern for pointer types. The star at the end has to be visible.
+  static final Pattern pointerPatternVariable = Pattern.compile("^\\s*+(\\w+)\\s*\\*\\s*$");
+  private static final PythonTypes INSTANCE = new PythonTypes();
 
-    @Override
-    public String getTargetUndefinedType() {
-        return "PyObject*";
-    }
+  @Override
+  public String getTargetUndefinedType() {
+    return "PyObject*";
+  }
 
-    /**
-     * This generator inherits types from the CGenerator.
-     * This function reverts them back to Python types
-     * For example, the types double is converted to float,
-     * the * for pointer types is removed, etc.
-     * @param type The type
-     * @return The Python equivalent of a C type
-     */
-    public String getPythonType(InferredType type) {
-        var result = super.getTargetType(type);
+  /**
+   * This generator inherits types from the CGenerator. This function reverts them back to Python
+   * types For example, the types double is converted to float, the * for pointer types is removed,
+   * etc.
+   *
+   * @param type The type
+   * @return The Python equivalent of a C type
+   */
+  public String getPythonType(InferredType type) {
+    var result = super.getTargetType(type);
 
-        result = switch (result) {
-            case "double" -> "float";
-            case "string" -> "object";
-            default -> result;
+    result =
+        switch (result) {
+          case "double" -> "float";
+          case "string" -> "object";
+          default -> result;
         };
 
-        var matcher = pointerPatternVariable.matcher(result);
-        if (matcher.find()) {
-            return matcher.group(1);
-        }
-
-        return result;
+    var matcher = pointerPatternVariable.matcher(result);
+    if (matcher.find()) {
+      return matcher.group(1);
     }
 
-    @Override
-    public String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
-        return "self." + expr.getParameter().getName();
-    }
+    return result;
+  }
 
-    @Override
-    public String getFixedSizeListInitExpression(List<String> contents, int listSize, boolean withBraces) {
-        return contents.stream().collect(Collectors.joining(", ", "[ ", " ]"));
-    }
+  @Override
+  public String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
+    return "self." + expr.getParameter().getName();
+  }
 
-    @Override
-    public String getVariableSizeListInitExpression(List<String> contents, boolean withBraces) {
-        return contents.stream().collect(Collectors.joining(", ", "[ ", " ]"));
-    }
+  @Override
+  public String getFixedSizeListInitExpression(
+      List<String> contents, int listSize, boolean withBraces) {
+    return contents.stream().collect(Collectors.joining(", ", "[ ", " ]"));
+  }
 
-    public static PythonTypes getInstance() {
-        return INSTANCE;
-    }
+  @Override
+  public String getVariableSizeListInitExpression(List<String> contents, boolean withBraces) {
+    return contents.stream().collect(Collectors.joining(", ", "[ ", " ]"));
+  }
 
-    public static PythonTypes generateParametersIn(ReactorInstance instance) {
-        return new PythonTypes() {
-            @Override
-            public String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
-                return PyUtil.reactorRef(instance) + "." + expr.getParameter().getName();
-            }
-        };
-    }
+  public static PythonTypes getInstance() {
+    return INSTANCE;
+  }
+
+  public static PythonTypes generateParametersIn(ReactorInstance instance) {
+    return new PythonTypes() {
+      @Override
+      public String getTargetParamRef(ParameterReference expr, InferredType typeOrNull) {
+        return PyUtil.reactorRef(instance) + "." + expr.getParameter().getName();
+      }
+    };
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/python/PythonValidator.java b/org.lflang/src/org/lflang/generator/python/PythonValidator.java
index 989d4181fc..dc87417c51 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonValidator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonValidator.java
@@ -1,5 +1,11 @@
 package org.lflang.generator.python;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.List;
@@ -8,9 +14,7 @@
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.generator.CodeMap;
@@ -20,13 +24,6 @@
 import org.lflang.generator.ValidationStrategy;
 import org.lflang.util.LFCommand;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-
 /**
  * A validator for generated Python.
  *
@@ -34,317 +31,375 @@
  */
 public class PythonValidator extends org.lflang.generator.Validator {
 
-    /** The pattern that diagnostics from the Python compiler typically follow. */
-    private static final Pattern DIAGNOSTIC_MESSAGE_PATTERN = Pattern.compile(
-        "(\\*\\*\\*)?\\s*File \"(?<path>.*?\\.py)\", line (?<line>\\d+)"
-    );
-    /** The pattern typically followed by the message that typically follows the main diagnostic line. */
-    private static final Pattern MESSAGE = Pattern.compile("\\w*Error: .*");
-    /** An alternative pattern that at least some diagnostics from the Python compiler may follow. */
-    private static final Pattern ALT_DIAGNOSTIC_MESSAGE_PATTERN = Pattern.compile(
-        ".*Error:.*line (?<line>\\d+)\\)"
-    );
-
-    /** The JSON parser. */
-    private static final ObjectMapper mapper = new ObjectMapper()
-        .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-
-    private final Set<String> protoNames;
-
-    /**
-     * The message format of Pylint's JSON output.
-     */
-    @SuppressWarnings( {"FieldCanBeLocal", "unused"})  // Unused fields are included for completeness.
-    private static final class PylintMessage {
-        private String type;
-        private String module;
-        private String obj;
-        private Integer line;
-        private Integer column;
-        private Integer endLine;
-        private Integer endColumn;
-        private Path path;
-        private String symbol;
-        private String message;
-        private String messageId;
-        public void setType(String type) { this.type = type; }
-        public void setModule(String module) { this.module = module; }
-        public void setObj(String obj) { this.obj = obj; }
-        public void setLine(int line) { this.line = line; }
-        public void setColumn(int column) { this.column = column; }
-        public void setEndLine(int endLine) { this.endLine = endLine; }
-        public void setEndColumn(int endColumn) { this.endColumn = endColumn; }
-        public void setPath(String path) { this.path = Path.of(path); }
-        public void setSymbol(String symbol) { this.symbol = symbol; }
-        public void setMessage(String message) { this.message = message; }
-        @JsonProperty("message-id")
-        public void setMessageId(String messageId) { this.messageId = messageId; }
-        public Position getStart() {
-            if (line != null && column != null) return Position.fromZeroBased(line - 1, column);
-            // Use 0 as fallback for the column. This will cause bugs by taking some positions out of the line
-            // adjuster's range.
-            if (line != null) return Position.fromZeroBased(line - 1, 0);
-            // This fallback will always fail with the line adjuster, but at least the program will not crash.
-            return Position.ORIGIN;
-        }
-        public Position getEnd() {
-            return endLine == null || endColumn == null ? getStart().plus(" ") :
-                   Position.fromZeroBased(endLine - 1, endColumn);
-        }
-        public Path getPath(Path relativeTo) { return relativeTo.resolve(path); }
-        public DiagnosticSeverity getSeverity() {
-            // The following is consistent with VS Code's default behavior for pure Python:
-            // https://code.visualstudio.com/docs/python/linting#_pylint
-            switch (type.toLowerCase()) {
-            case "refactor":
-                return DiagnosticSeverity.Hint;
-            case "warning":
-                return DiagnosticSeverity.Warning;
-            case "error":
-            case "fatal":
-                return DiagnosticSeverity.Error;
-            case "convention":
-            default:
-                return DiagnosticSeverity.Information;
-            }
-        }
+  /** The pattern that diagnostics from the Python compiler typically follow. */
+  private static final Pattern DIAGNOSTIC_MESSAGE_PATTERN =
+      Pattern.compile("(\\*\\*\\*)?\\s*File \"(?<path>.*?\\.py)\", line (?<line>\\d+)");
+  /**
+   * The pattern typically followed by the message that typically follows the main diagnostic line.
+   */
+  private static final Pattern MESSAGE = Pattern.compile("\\w*Error: .*");
+  /** An alternative pattern that at least some diagnostics from the Python compiler may follow. */
+  private static final Pattern ALT_DIAGNOSTIC_MESSAGE_PATTERN =
+      Pattern.compile(".*Error:.*line (?<line>\\d+)\\)");
+
+  /** The JSON parser. */
+  private static final ObjectMapper mapper =
+      new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+  private final Set<String> protoNames;
+
+  /** The message format of Pylint's JSON output. */
+  @SuppressWarnings({"FieldCanBeLocal", "unused"}) // Unused fields are included for completeness.
+  private static final class PylintMessage {
+    private String type;
+    private String module;
+    private String obj;
+    private Integer line;
+    private Integer column;
+    private Integer endLine;
+    private Integer endColumn;
+    private Path path;
+    private String symbol;
+    private String message;
+    private String messageId;
+
+    public void setType(String type) {
+      this.type = type;
     }
 
-    private static final Pattern PylintNoNamePattern = Pattern.compile("Instance of '(?<name>\\w+)' has no .*");
-
-    private final FileConfig fileConfig;
-    private final ErrorReporter errorReporter;
-    private final ImmutableMap<Path, CodeMap> codeMaps;
-
-    /**
-     * Initialize a {@code PythonValidator} for a build process using {@code fileConfig} and
-     * report errors to {@code errorReporter}.
-     * @param fileConfig The file configuration of this build.
-     * @param errorReporter The reporter to which diagnostics should be sent.
-     * @param codeMaps A mapping from generated file paths to code maps that map them back to
-     *                 LF sources.
-     * @param protoNames The names of any protocol buffer message types that are used in the LF
-     *                   program being built.
-     */
-    public PythonValidator(
-        FileConfig fileConfig,
-        ErrorReporter errorReporter,
-        Map<Path,CodeMap> codeMaps,
-        Set<String> protoNames
-    ) {
-        super(errorReporter, codeMaps);
-        this.fileConfig = fileConfig;
-        this.errorReporter = errorReporter;
-        this.codeMaps = ImmutableMap.copyOf(codeMaps);
-        this.protoNames = ImmutableSet.copyOf(protoNames);
+    public void setModule(String module) {
+      this.module = module;
     }
 
-    @Override
-    protected Collection<ValidationStrategy> getPossibleStrategies() { return List.of(
+    public void setObj(String obj) {
+      this.obj = obj;
+    }
+
+    public void setLine(int line) {
+      this.line = line;
+    }
+
+    public void setColumn(int column) {
+      this.column = column;
+    }
+
+    public void setEndLine(int endLine) {
+      this.endLine = endLine;
+    }
+
+    public void setEndColumn(int endColumn) {
+      this.endColumn = endColumn;
+    }
+
+    public void setPath(String path) {
+      this.path = Path.of(path);
+    }
+
+    public void setSymbol(String symbol) {
+      this.symbol = symbol;
+    }
+
+    public void setMessage(String message) {
+      this.message = message;
+    }
+
+    @JsonProperty("message-id")
+    public void setMessageId(String messageId) {
+      this.messageId = messageId;
+    }
+
+    public Position getStart() {
+      if (line != null && column != null) return Position.fromZeroBased(line - 1, column);
+      // Use 0 as fallback for the column. This will cause bugs by taking some positions out of the
+      // line
+      // adjuster's range.
+      if (line != null) return Position.fromZeroBased(line - 1, 0);
+      // This fallback will always fail with the line adjuster, but at least the program will not
+      // crash.
+      return Position.ORIGIN;
+    }
+
+    public Position getEnd() {
+      return endLine == null || endColumn == null
+          ? getStart().plus(" ")
+          : Position.fromZeroBased(endLine - 1, endColumn);
+    }
+
+    public Path getPath(Path relativeTo) {
+      return relativeTo.resolve(path);
+    }
+
+    public DiagnosticSeverity getSeverity() {
+      // The following is consistent with VS Code's default behavior for pure Python:
+      // https://code.visualstudio.com/docs/python/linting#_pylint
+      switch (type.toLowerCase()) {
+        case "refactor":
+          return DiagnosticSeverity.Hint;
+        case "warning":
+          return DiagnosticSeverity.Warning;
+        case "error":
+        case "fatal":
+          return DiagnosticSeverity.Error;
+        case "convention":
+        default:
+          return DiagnosticSeverity.Information;
+      }
+    }
+  }
+
+  private static final Pattern PylintNoNamePattern =
+      Pattern.compile("Instance of '(?<name>\\w+)' has no .*");
+
+  private final FileConfig fileConfig;
+  private final ErrorReporter errorReporter;
+  private final ImmutableMap<Path, CodeMap> codeMaps;
+
+  /**
+   * Initialize a {@code PythonValidator} for a build process using {@code fileConfig} and report
+   * errors to {@code errorReporter}.
+   *
+   * @param fileConfig The file configuration of this build.
+   * @param errorReporter The reporter to which diagnostics should be sent.
+   * @param codeMaps A mapping from generated file paths to code maps that map them back to LF
+   *     sources.
+   * @param protoNames The names of any protocol buffer message types that are used in the LF
+   *     program being built.
+   */
+  public PythonValidator(
+      FileConfig fileConfig,
+      ErrorReporter errorReporter,
+      Map<Path, CodeMap> codeMaps,
+      Set<String> protoNames) {
+    super(errorReporter, codeMaps);
+    this.fileConfig = fileConfig;
+    this.errorReporter = errorReporter;
+    this.codeMaps = ImmutableMap.copyOf(codeMaps);
+    this.protoNames = ImmutableSet.copyOf(protoNames);
+  }
+
+  @Override
+  protected Collection<ValidationStrategy> getPossibleStrategies() {
+    return List.of(
         new ValidationStrategy() {
-            @Override
-            public LFCommand getCommand(Path generatedFile) {
-                return LFCommand.get(
-                    "python3",
-                    List.of("-c", "import compileall; compileall.compile_dir('.', quiet=1)"),
-                    true,
-                    fileConfig.getSrcGenPkgPath()
-                );
-            }
+          @Override
+          public LFCommand getCommand(Path generatedFile) {
+            return LFCommand.get(
+                "python3",
+                List.of("-c", "import compileall; compileall.compile_dir('.', quiet=1)"),
+                true,
+                fileConfig.getSrcGenPkgPath());
+          }
 
-            @Override
-            public Strategy getErrorReportingStrategy() {
-                return (a, b, c) -> {};
-            }
+          @Override
+          public Strategy getErrorReportingStrategy() {
+            return (a, b, c) -> {};
+          }
 
-            @Override
-            public Strategy getOutputReportingStrategy() {
-                return (String validationOutput, ErrorReporter errorReporter, Map<Path, CodeMap> map) -> {
-                    String[] lines = (validationOutput + "\n\n\n").lines().toArray(String[]::new);
-                    for (int i = 0; i < lines.length - 3; i++) {
-                        if (!tryReportTypical(lines, i)) {
-                            tryReportAlternative(lines, i);
-                        }
-                    }
-                };
-            }
+          @Override
+          public Strategy getOutputReportingStrategy() {
+            return (String validationOutput,
+                ErrorReporter errorReporter,
+                Map<Path, CodeMap> map) -> {
+              String[] lines = (validationOutput + "\n\n\n").lines().toArray(String[]::new);
+              for (int i = 0; i < lines.length - 3; i++) {
+                if (!tryReportTypical(lines, i)) {
+                  tryReportAlternative(lines, i);
+                }
+              }
+            };
+          }
 
-            /**
-             * Try to report a typical error message from the Python compiler.
-             *
-             * @param lines The lines of output from the compiler.
-             * @param i     The current index at which a message may start. Guaranteed to be less
-             *              than
-             *              {@code lines.length - 3}.
-             * @return Whether an error message was reported.
-             */
-            private boolean tryReportTypical(String[] lines, int i) {
-                Matcher main = DIAGNOSTIC_MESSAGE_PATTERN.matcher(lines[i]);
-                Matcher messageMatcher = MESSAGE.matcher(lines[i + 3]);
-                String message = messageMatcher.matches() ? messageMatcher.group() : "Syntax Error";
-                if (main.matches()) {
-                    int line = Integer.parseInt(main.group("line"));
-                    CodeMap map = codeMaps.get(fileConfig.getSrcGenPkgPath().resolve(Path.of(main.group("path"))).normalize());
-                    Position genPosition = Position.fromOneBased(line, Integer.MAX_VALUE); // Column is just a placeholder.
-                    if (map == null) {
-                        errorReporter.report(null, DiagnosticSeverity.Error, message, 1);  // Undesirable fallback
-                    } else {
-                        for (Path lfFile : map.lfSourcePaths()) {
-                            Position lfPosition = map.adjusted(lfFile, genPosition);
-                            // TODO: We could be more precise than just getting the right line, but the way the output
-                            //  is formatted (with leading whitespace possibly trimmed) does not make it easy.
-                            errorReporter.report(lfFile, DiagnosticSeverity.Error, message, lfPosition.getOneBasedLine());
-                        }
-                    }
-                    return true;
+          /**
+           * Try to report a typical error message from the Python compiler.
+           *
+           * @param lines The lines of output from the compiler.
+           * @param i The current index at which a message may start. Guaranteed to be less than
+           *     {@code lines.length - 3}.
+           * @return Whether an error message was reported.
+           */
+          private boolean tryReportTypical(String[] lines, int i) {
+            Matcher main = DIAGNOSTIC_MESSAGE_PATTERN.matcher(lines[i]);
+            Matcher messageMatcher = MESSAGE.matcher(lines[i + 3]);
+            String message = messageMatcher.matches() ? messageMatcher.group() : "Syntax Error";
+            if (main.matches()) {
+              int line = Integer.parseInt(main.group("line"));
+              CodeMap map =
+                  codeMaps.get(
+                      fileConfig
+                          .getSrcGenPkgPath()
+                          .resolve(Path.of(main.group("path")))
+                          .normalize());
+              Position genPosition =
+                  Position.fromOneBased(line, Integer.MAX_VALUE); // Column is just a placeholder.
+              if (map == null) {
+                errorReporter.report(
+                    null, DiagnosticSeverity.Error, message, 1); // Undesirable fallback
+              } else {
+                for (Path lfFile : map.lfSourcePaths()) {
+                  Position lfPosition = map.adjusted(lfFile, genPosition);
+                  // TODO: We could be more precise than just getting the right line, but the way
+                  // the output
+                  //  is formatted (with leading whitespace possibly trimmed) does not make it easy.
+                  errorReporter.report(
+                      lfFile, DiagnosticSeverity.Error, message, lfPosition.getOneBasedLine());
                 }
-                return false;
+              }
+              return true;
             }
+            return false;
+          }
 
-            /**
-             * Try to report an alternative error message from the Python compiler.
-             *
-             * @param lines The lines of output from the compiler.
-             * @param i     The current index at which a message may start.
-             */
-            private void tryReportAlternative(String[] lines, int i) {
-                Matcher main = ALT_DIAGNOSTIC_MESSAGE_PATTERN.matcher(lines[i]);
-                if (main.matches()) {
-                    int line = Integer.parseInt(main.group("line"));
-                    Iterable<CodeMap> relevantMaps = codeMaps.keySet().stream()
-                                                             .filter(p -> main.group().contains(p.getFileName().toString()))
-                                                             .map(codeMaps::get)::iterator;
-                    for (CodeMap map : relevantMaps) {  // There should almost always be exactly one of these
-                        for (Path lfFile : map.lfSourcePaths()) {
-                            errorReporter.report(
-                                lfFile,
-                                DiagnosticSeverity.Error,
-                                main.group().replace("*** ", "").replace("Sorry: ", ""),
-                                map.adjusted(lfFile, Position.fromOneBased(line, 1)).getOneBasedLine()
-                            );
-                        }
-                    }
+          /**
+           * Try to report an alternative error message from the Python compiler.
+           *
+           * @param lines The lines of output from the compiler.
+           * @param i The current index at which a message may start.
+           */
+          private void tryReportAlternative(String[] lines, int i) {
+            Matcher main = ALT_DIAGNOSTIC_MESSAGE_PATTERN.matcher(lines[i]);
+            if (main.matches()) {
+              int line = Integer.parseInt(main.group("line"));
+              Iterable<CodeMap> relevantMaps =
+                  codeMaps.keySet().stream()
+                          .filter(p -> main.group().contains(p.getFileName().toString()))
+                          .map(codeMaps::get)
+                      ::iterator;
+              for (CodeMap map :
+                  relevantMaps) { // There should almost always be exactly one of these
+                for (Path lfFile : map.lfSourcePaths()) {
+                  errorReporter.report(
+                      lfFile,
+                      DiagnosticSeverity.Error,
+                      main.group().replace("*** ", "").replace("Sorry: ", ""),
+                      map.adjusted(lfFile, Position.fromOneBased(line, 1)).getOneBasedLine());
                 }
+              }
             }
+          }
 
-            @Override
-            public boolean isFullBatch() {
-                return true;
-            }
+          @Override
+          public boolean isFullBatch() {
+            return true;
+          }
 
-            @Override
-            public int getPriority() {
-                return 0;
-            }
+          @Override
+          public int getPriority() {
+            return 0;
+          }
         },
         new ValidationStrategy() {
-            @Override
-            public LFCommand getCommand(Path generatedFile) {
-                return LFCommand.get(
-                    "pylint",
-                    List.of("--output-format=json", generatedFile.getFileName().toString()),
-                    true,
-                    fileConfig.getSrcGenPath()
-                );
-            }
+          @Override
+          public LFCommand getCommand(Path generatedFile) {
+            return LFCommand.get(
+                "pylint",
+                List.of("--output-format=json", generatedFile.getFileName().toString()),
+                true,
+                fileConfig.getSrcGenPath());
+          }
 
-            @Override
-            public Strategy getErrorReportingStrategy() {
-                return (a, b, c) -> {};
-            }
+          @Override
+          public Strategy getErrorReportingStrategy() {
+            return (a, b, c) -> {};
+          }
 
-            @Override
-            public Strategy getOutputReportingStrategy() {
-                return (validationOutput, errorReporter, codeMaps) -> {
-                    if (validationOutput.isBlank()) return;
-                    try {
-                        for (PylintMessage message : mapper.readValue(validationOutput, PylintMessage[].class)) {
-                            if (shouldIgnore(message)) continue;
-                            CodeMap map = codeMaps.get(message.getPath(fileConfig.getSrcGenPath()));
-                            if (map != null) {
-                                for (Path lfFile : map.lfSourcePaths()) {
-                                    Function<Position, Position> adjust = p -> map.adjusted(lfFile, p);
-                                    String humanMessage = DiagnosticReporting.messageOf(
-                                        message.message,
-                                        message.getPath(fileConfig.getSrcGenPath()),
-                                        message.getStart()
-                                    );
-                                    Position lfStart = adjust.apply(message.getStart());
-                                    Position lfEnd = adjust.apply(message.getEnd());
-                                    bestEffortReport(
-                                        errorReporter,
-                                        adjust,
-                                        lfStart,
-                                        lfEnd,
-                                        lfFile,
-                                        message.getSeverity(),
-                                        humanMessage
-                                    );
-                                }
-                            }
-                        }
-                    } catch (JsonProcessingException e) {
-                        System.err.printf("Failed to parse \"%s\":%n", validationOutput);
-                        e.printStackTrace();
-                        errorReporter.reportWarning(
-                            "Failed to parse linter output. The Lingua Franca code generator is tested with Pylint "
-                             + "version 2.12.2. Consider updating Pylint if you have an older version."
-                        );
+          @Override
+          public Strategy getOutputReportingStrategy() {
+            return (validationOutput, errorReporter, codeMaps) -> {
+              if (validationOutput.isBlank()) return;
+              try {
+                for (PylintMessage message :
+                    mapper.readValue(validationOutput, PylintMessage[].class)) {
+                  if (shouldIgnore(message)) continue;
+                  CodeMap map = codeMaps.get(message.getPath(fileConfig.getSrcGenPath()));
+                  if (map != null) {
+                    for (Path lfFile : map.lfSourcePaths()) {
+                      Function<Position, Position> adjust = p -> map.adjusted(lfFile, p);
+                      String humanMessage =
+                          DiagnosticReporting.messageOf(
+                              message.message,
+                              message.getPath(fileConfig.getSrcGenPath()),
+                              message.getStart());
+                      Position lfStart = adjust.apply(message.getStart());
+                      Position lfEnd = adjust.apply(message.getEnd());
+                      bestEffortReport(
+                          errorReporter,
+                          adjust,
+                          lfStart,
+                          lfEnd,
+                          lfFile,
+                          message.getSeverity(),
+                          humanMessage);
                     }
-                };
-            }
+                  }
+                }
+              } catch (JsonProcessingException e) {
+                System.err.printf("Failed to parse \"%s\":%n", validationOutput);
+                e.printStackTrace();
+                errorReporter.reportWarning(
+                    "Failed to parse linter output. The Lingua Franca code generator is tested with"
+                        + " Pylint version 2.12.2. Consider updating Pylint if you have an older"
+                        + " version.");
+              }
+            };
+          }
 
-            /**
-             * Return whether the given message should be ignored.
-             * @param message A Pylint message that is a candidate to be reported.
-             * @return whether {@code message} should be reported.
-             */
-            private boolean shouldIgnore(PylintMessage message) {
-                // Code generation does not preserve whitespace, so this check is unreliable.
-                if (message.symbol.equals("trailing-whitespace") || message.symbol.equals("line-too-long")) return true;
-                // This filters out Pylint messages concerning missing members in types defined by protocol buffers.
-                // FIXME: Make this unnecessary, perhaps using https://github.com/nelfin/pylint-protobuf.
-                Matcher matcher = PylintNoNamePattern.matcher(message.message);
-                return message.symbol.equals("no-member")
-                        && matcher.matches() && protoNames.contains(matcher.group("name"));
-            }
+          /**
+           * Return whether the given message should be ignored.
+           *
+           * @param message A Pylint message that is a candidate to be reported.
+           * @return whether {@code message} should be reported.
+           */
+          private boolean shouldIgnore(PylintMessage message) {
+            // Code generation does not preserve whitespace, so this check is unreliable.
+            if (message.symbol.equals("trailing-whitespace")
+                || message.symbol.equals("line-too-long")) return true;
+            // This filters out Pylint messages concerning missing members in types defined by
+            // protocol buffers.
+            // FIXME: Make this unnecessary, perhaps using
+            // https://github.com/nelfin/pylint-protobuf.
+            Matcher matcher = PylintNoNamePattern.matcher(message.message);
+            return message.symbol.equals("no-member")
+                && matcher.matches()
+                && protoNames.contains(matcher.group("name"));
+          }
 
-            /** Make a best-effort attempt to place the diagnostic on the correct line. */
-            private void bestEffortReport(
-                ErrorReporter errorReporter,
-                Function<Position, Position> adjust,
-                Position lfStart,
-                Position lfEnd,
-                Path file,
-                DiagnosticSeverity severity,
-                String humanMessage
-            ) {
-                if (!lfEnd.equals(Position.ORIGIN) && !lfStart.equals(Position.ORIGIN)) { // Ideal case
-                    errorReporter.report(file, severity, humanMessage, lfStart, lfEnd);
-                } else {  // Fallback: Try to report on the correct line, or failing that, just line 1.
-                    if (lfStart.equals(Position.ORIGIN)) lfStart = adjust.apply(
-                        Position.fromZeroBased(lfStart.getZeroBasedLine(), Integer.MAX_VALUE)
-                    );
-                    // FIXME: It might be better to improve style of generated code instead of quietly returning here.
-                    if (lfStart.equals(Position.ORIGIN) && severity != DiagnosticSeverity.Error) return;
-                    errorReporter.report(file, severity, humanMessage, lfStart.getOneBasedLine());
-                }
+          /** Make a best-effort attempt to place the diagnostic on the correct line. */
+          private void bestEffortReport(
+              ErrorReporter errorReporter,
+              Function<Position, Position> adjust,
+              Position lfStart,
+              Position lfEnd,
+              Path file,
+              DiagnosticSeverity severity,
+              String humanMessage) {
+            if (!lfEnd.equals(Position.ORIGIN) && !lfStart.equals(Position.ORIGIN)) { // Ideal case
+              errorReporter.report(file, severity, humanMessage, lfStart, lfEnd);
+            } else { // Fallback: Try to report on the correct line, or failing that, just line 1.
+              if (lfStart.equals(Position.ORIGIN))
+                lfStart =
+                    adjust.apply(
+                        Position.fromZeroBased(lfStart.getZeroBasedLine(), Integer.MAX_VALUE));
+              // FIXME: It might be better to improve style of generated code instead of quietly
+              // returning here.
+              if (lfStart.equals(Position.ORIGIN) && severity != DiagnosticSeverity.Error) return;
+              errorReporter.report(file, severity, humanMessage, lfStart.getOneBasedLine());
             }
+          }
 
-            @Override
-            public boolean isFullBatch() {
-                return false;
-            }
+          @Override
+          public boolean isFullBatch() {
+            return false;
+          }
 
-            @Override
-            public int getPriority() {
-                return 1;
-            }
-        }
-    ); }
+          @Override
+          public int getPriority() {
+            return 1;
+          }
+        });
+  }
 
-    @Override
-    protected Pair<Strategy, Strategy> getBuildReportingStrategies() {
-        return new Pair<>((a, b, c) -> {}, (a, b, c) -> {});
-    }
+  @Override
+  protected Pair<Strategy, Strategy> getBuildReportingStrategies() {
+    return new Pair<>((a, b, c) -> {}, (a, b, c) -> {});
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/rust/CargoDependencySpec.java b/org.lflang/src/org/lflang/generator/rust/CargoDependencySpec.java
index 69efcd3fab..ff97860970 100644
--- a/org.lflang/src/org/lflang/generator/rust/CargoDependencySpec.java
+++ b/org.lflang/src/org/lflang/generator/rust/CargoDependencySpec.java
@@ -31,9 +31,9 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.lflang.ast.ASTUtils;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.TargetPropertyType;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.InvalidLfSourceException;
 import org.lflang.lf.Array;
 import org.lflang.lf.Element;
@@ -202,14 +202,12 @@ private static CargoDependencySpec parseValue(Element element, boolean isRuntime
               pair.getValue(), "Expected string literal for key '" + name + "'");
         }
         switch (name) {
-        case "version" -> version = literal;
-        case "git" -> gitRepo = literal;
-        case "rev" -> rev = literal;
-        case "tag" -> tag = literal;
-        case "path" -> localPath = literal;
-        default -> throw new InvalidLfSourceException(pair,
-                                                      "Unknown key: '" + name
-                                                          + "'");
+          case "version" -> version = literal;
+          case "git" -> gitRepo = literal;
+          case "rev" -> rev = literal;
+          case "tag" -> tag = literal;
+          case "path" -> localPath = literal;
+          default -> throw new InvalidLfSourceException(pair, "Unknown key: '" + name + "'");
         }
       }
       if (isRuntimeCrate || version != null || localPath != null || gitRepo != null) {
diff --git a/org.lflang/src/org/lflang/generator/rust/RustTargetConfig.java b/org.lflang/src/org/lflang/generator/rust/RustTargetConfig.java
index f2ff9d9c3f..b4e9a1778b 100644
--- a/org.lflang/src/org/lflang/generator/rust/RustTargetConfig.java
+++ b/org.lflang/src/org/lflang/generator/rust/RustTargetConfig.java
@@ -29,11 +29,8 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.lflang.ErrorReporter;
 import org.lflang.TargetProperty.BuildType;
 
@@ -44,83 +41,66 @@
  */
 public final class RustTargetConfig {
 
-
-    /**
-     * List of Cargo features of the generated crate to enable.
-     */
-    private List<String> cargoFeatures = new ArrayList<>();
-
-    /**
-     * Map of Cargo dependency to dependency properties.
-     */
-    private Map<String, CargoDependencySpec> cargoDependencies = new HashMap<>();
-
-    /**
-     * List of top-level modules, those are absolute paths.
-     */
-    private final List<Path> rustTopLevelModules = new ArrayList<>();
-
-    /**
-     * Cargo profile, default is debug (corresponds to cargo dev profile).
-     */
-    private BuildType profile = BuildType.DEBUG;
-
-    public void setCargoFeatures(List<String> cargoFeatures) {
-        this.cargoFeatures = cargoFeatures;
-    }
-
-    public void setCargoDependencies(Map<String, CargoDependencySpec> cargoDependencies) {
-        this.cargoDependencies = cargoDependencies;
+  /** List of Cargo features of the generated crate to enable. */
+  private List<String> cargoFeatures = new ArrayList<>();
+
+  /** Map of Cargo dependency to dependency properties. */
+  private Map<String, CargoDependencySpec> cargoDependencies = new HashMap<>();
+
+  /** List of top-level modules, those are absolute paths. */
+  private final List<Path> rustTopLevelModules = new ArrayList<>();
+
+  /** Cargo profile, default is debug (corresponds to cargo dev profile). */
+  private BuildType profile = BuildType.DEBUG;
+
+  public void setCargoFeatures(List<String> cargoFeatures) {
+    this.cargoFeatures = cargoFeatures;
+  }
+
+  public void setCargoDependencies(Map<String, CargoDependencySpec> cargoDependencies) {
+    this.cargoDependencies = cargoDependencies;
+  }
+
+  public void addAndCheckTopLevelModule(Path path, EObject errorOwner, ErrorReporter err) {
+    String fileName = path.getFileName().toString();
+    if (!Files.exists(path)) {
+      err.reportError(errorOwner, "File not found");
+    } else if (Files.isRegularFile(path) && !fileName.endsWith(".rs")) {
+      err.reportError(errorOwner, "Not a rust file");
+    } else if (fileName.equals("main.rs")) {
+      err.reportError(errorOwner, "Cannot use 'main.rs' as a module name (reserved)");
+    } else if (fileName.equals("reactors") || fileName.equals("reactors.rs")) {
+      err.reportError(errorOwner, "Cannot use 'reactors' as a module name (reserved)");
+    } else if (Files.isDirectory(path) && !Files.exists(path.resolve("mod.rs"))) {
+      err.reportError(errorOwner, "Cannot find module descriptor in directory");
     }
-
-    public void addAndCheckTopLevelModule(Path path, EObject errorOwner, ErrorReporter err) {
-        String fileName = path.getFileName().toString();
-        if (!Files.exists(path)) {
-            err.reportError(errorOwner, "File not found");
-        } else if (Files.isRegularFile(path) && !fileName.endsWith(".rs")) {
-            err.reportError(errorOwner, "Not a rust file");
-        } else if (fileName.equals("main.rs")) {
-            err.reportError(errorOwner, "Cannot use 'main.rs' as a module name (reserved)");
-        } else if (fileName.equals("reactors") || fileName.equals("reactors.rs")) {
-            err.reportError(errorOwner, "Cannot use 'reactors' as a module name (reserved)");
-        } else if (Files.isDirectory(path) && !Files.exists(path.resolve("mod.rs"))) {
-            err.reportError(errorOwner, "Cannot find module descriptor in directory");
-        }
-        this.rustTopLevelModules.add(path);
-    }
-
-    public List<String> getCargoFeatures() {
-        return cargoFeatures;
-    }
-
-    /**
-     * Returns a map of cargo dependencies.
-     */
-    public Map<String, CargoDependencySpec> getCargoDependencies() {
-        return cargoDependencies;
-    }
-
-    /**
-     * Returns the list of top-level module files to include in main.rs.
-     * Those files were checked to exists previously.
-     */
-    public List<Path> getRustTopLevelModules() {
-        return rustTopLevelModules;
-    }
-
-    /**
-     * The build type to use. Corresponds to a Cargo profile.
-     */
-    public BuildType getBuildType() {
-        return profile;
-    }
-
-
-    /**
-     * Set a build profile chosen based on a cmake profile.
-     */
-    public void setBuildType(BuildType profile) {
-        this.profile = profile;
-    }
-
+    this.rustTopLevelModules.add(path);
+  }
+
+  public List<String> getCargoFeatures() {
+    return cargoFeatures;
+  }
+
+  /** Returns a map of cargo dependencies. */
+  public Map<String, CargoDependencySpec> getCargoDependencies() {
+    return cargoDependencies;
+  }
+
+  /**
+   * Returns the list of top-level module files to include in main.rs. Those files were checked to
+   * exists previously.
+   */
+  public List<Path> getRustTopLevelModules() {
+    return rustTopLevelModules;
+  }
+
+  /** The build type to use. Corresponds to a Cargo profile. */
+  public BuildType getBuildType() {
+    return profile;
+  }
+
+  /** Set a build profile chosen based on a cmake profile. */
+  public void setBuildType(BuildType profile) {
+    this.profile = profile;
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/ts/TSDockerGenerator.java b/org.lflang/src/org/lflang/generator/ts/TSDockerGenerator.java
index cf89596a56..1e88ba4c12 100644
--- a/org.lflang/src/org/lflang/generator/ts/TSDockerGenerator.java
+++ b/org.lflang/src/org/lflang/generator/ts/TSDockerGenerator.java
@@ -10,20 +10,19 @@
  */
 public class TSDockerGenerator extends DockerGenerator {
 
-    /** Construct a new Docker generator. */
-    public TSDockerGenerator(LFGeneratorContext context) {
-        super(context);
-    }
+  /** Construct a new Docker generator. */
+  public TSDockerGenerator(LFGeneratorContext context) {
+    super(context);
+  }
 
-    /**
-    * Return the content of the docker file for [tsFileName].
-    */
-    public String generateDockerFileContent() {
-        return """
+  /** Return the content of the docker file for [tsFileName]. */
+  public String generateDockerFileContent() {
+    return """
         |FROM node:alpine
         |WORKDIR /linguafranca/$name
         |COPY . .
         |ENTRYPOINT ["node", "dist/%s.js"]
-        """.formatted(context.getFileConfig().name);
-    }
+        """
+        .formatted(context.getFileConfig().name);
+  }
 }
diff --git a/org.lflang/src/org/lflang/generator/ts/TSTypes.java b/org.lflang/src/org/lflang/generator/ts/TSTypes.java
index 2e2c6a6dff..0fe4fc8a5e 100644
--- a/org.lflang/src/org/lflang/generator/ts/TSTypes.java
+++ b/org.lflang/src/org/lflang/generator/ts/TSTypes.java
@@ -1,75 +1,73 @@
 package org.lflang.generator.ts;
 
 import java.util.List;
-
-import org.lflang.ast.ASTUtils;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.TargetTypes;
 import org.lflang.generator.UnsupportedGeneratorFeatureException;
 import org.lflang.lf.StateVar;
 
 public class TSTypes implements TargetTypes {
 
-    private static TSTypes INSTANCE = new TSTypes();
-
-    private TSTypes() {
-
-    }
-
-    @Override
-    public String getTargetType(StateVar s) {
-        var type = TargetTypes.super.getTargetType(s);
-        if (!ASTUtils.isInitialized(s)) {
-            return "%s | undefined".formatted(type);
-        } else {
-            return type;
-        }
-    }
-
-    @Override
-    public boolean supportsGenerics() {
-        return true;
-    }
-
-    @Override
-    public String getTargetTimeType() {
-        return "TimeValue";
-    }
-
-    @Override
-    public String getTargetTagType() {
-        return "TimeValue";
-    }
+  private static TSTypes INSTANCE = new TSTypes();
 
-    @Override
-    public String getTargetUndefinedType() {
-        return "Present";
-    }
-
-    public String getTargetTimeExpr(TimeValue value) {
-        if (value.unit != null) {
-            return "TimeValue.%s(%s)".formatted(value.unit.getCanonicalName(), value.time);
-        } else {
-            // The value must be zero.
-            return "TimeValue.zero()";
-        }
-    }
+  private TSTypes() {}
 
-    @Override
-    public String getTargetFixedSizeListType(String baseType, int size) {
-        throw new UnsupportedGeneratorFeatureException("TypeScript does not support fixed-size array types.");
+  @Override
+  public String getTargetType(StateVar s) {
+    var type = TargetTypes.super.getTargetType(s);
+    if (!ASTUtils.isInitialized(s)) {
+      return "%s | undefined".formatted(type);
+    } else {
+      return type;
     }
-
-    @Override
-    public String getTargetVariableSizeListType(String baseType) {
-        return "Array<%s>".formatted(baseType); // same as "$baseType[]"
-    }
-
-    public String getVariableSizeListInitExpression(List<String> contents, boolean withBraces) {
-        return "[" + String.join(", ", contents) + "]";
-    }
-
-    public static TSTypes getInstance() {
-        return INSTANCE;
+  }
+
+  @Override
+  public boolean supportsGenerics() {
+    return true;
+  }
+
+  @Override
+  public String getTargetTimeType() {
+    return "TimeValue";
+  }
+
+  @Override
+  public String getTargetTagType() {
+    return "TimeValue";
+  }
+
+  @Override
+  public String getTargetUndefinedType() {
+    return "Present";
+  }
+
+  public String getTargetTimeExpr(TimeValue value) {
+    if (value.unit != null) {
+      return "TimeValue.%s(%s)".formatted(value.unit.getCanonicalName(), value.time);
+    } else {
+      // The value must be zero.
+      return "TimeValue.zero()";
     }
+  }
+
+  @Override
+  public String getTargetFixedSizeListType(String baseType, int size) {
+    throw new UnsupportedGeneratorFeatureException(
+        "TypeScript does not support fixed-size array types.");
+  }
+
+  @Override
+  public String getTargetVariableSizeListType(String baseType) {
+    return "Array<%s>".formatted(baseType); // same as "$baseType[]"
+  }
+
+  public String getVariableSizeListInitExpression(List<String> contents, boolean withBraces) {
+    return "[" + String.join(", ", contents) + "]";
+  }
+
+  public static TSTypes getInstance() {
+    return INSTANCE;
+  }
 }
diff --git a/org.lflang/src/org/lflang/graph/DirectedGraph.java b/org.lflang/src/org/lflang/graph/DirectedGraph.java
index 771bbca539..0e506dbe30 100644
--- a/org.lflang/src/org/lflang/graph/DirectedGraph.java
+++ b/org.lflang/src/org/lflang/graph/DirectedGraph.java
@@ -1,25 +1,25 @@
 /*************
- Copyright (c) 2019, The University of California at Berkeley.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
 
 package org.lflang.graph;
@@ -27,7 +27,6 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
-
 import org.lflang.util.CollectionUtil;
 
 /**
@@ -38,287 +37,254 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  */
 public class DirectedGraph<T> implements Graph<T> {
 
-    // Note that while both those maps are mutable, the sets
-    // they use as values may not be. They should only be
-    // manipulated through CollectionUtil
-
-    // If a node has no neighbors, it is still in the map with an empty set as a value.
-
-    /**
-     * Adjacency map from vertices to their downstream immediate neighbors.
-     */
-    private final Map<T, Set<T>> downstreamAdjacentNodes = new LinkedHashMap<>();
-
-    /**
-     * Adjacency map from vertices to their upstream immediate neighbors.
-     */
-    private final Map<T, Set<T>> upstreamAdjacentNodes = new LinkedHashMap<>();
-
-
-    /**
-     * Mark the graph to have changed so that any cached analysis is refreshed
-     * accordingly.
-     */
-    protected void graphChanged() {
-        // To be overridden by subclasses that perform analysis.
-    }
-
-
-    /**
-     * Return true if this graph has the given node in it.
-     *
-     * @param node The node to look for.
-     */
-    @Override
-    public boolean hasNode(T node) {
-        return nodes().contains(node);
-    }
-
-
-    /**
-     * Return all immediate upstream neighbors of a given node.
-     *
-     * @param node The node to report the immediate upstream neighbors of.
-     */
-    public Set<T> getUpstreamAdjacentNodes(T node) {
-        return Collections.unmodifiableSet(this.upstreamAdjacentNodes.getOrDefault(node, Set.of()));
-    }
-
-
-    /**
-     * Return all immediate downstream neighbors of a given node.
-     *
-     * @param node The node to report the immediate downstream neighbors of.
-     */
-    public Set<T> getDownstreamAdjacentNodes(T node) {
-        return Collections.unmodifiableSet(this.downstreamAdjacentNodes.getOrDefault(node, Set.of()));
-    }
-
-
-    @Override
-    public void addNode(T node) {
-        this.graphChanged();
-        this.upstreamAdjacentNodes.putIfAbsent(node, Set.of());
-        this.downstreamAdjacentNodes.putIfAbsent(node, Set.of());
-    }
-
-
-    @Override
-    public void removeNode(T node) {
-        this.graphChanged();
-        this.upstreamAdjacentNodes.remove(node);
-        this.downstreamAdjacentNodes.remove(node);
-        // The node also needs to be removed from the sets that represent connections to the node.
-        CollectionUtil.removeFromValues(this.upstreamAdjacentNodes, node);
-        CollectionUtil.removeFromValues(this.downstreamAdjacentNodes, node);
-    }
-
-
-    /**
-     * Add a new directed edge to the graph. The first argument is
-     * the downstream node, the second argument the upstream node.
-     * If either argument is null, do nothing.
-     *
-     * @param sink   The downstream immediate neighbor.
-     * @param source The upstream immediate neighbor.
-     */
-    @Override
-    public void addEdge(T sink, T source) {
-        this.graphChanged();
-        if (sink != null && source != null) {
-            this.downstreamAdjacentNodes.compute(source, (k, set) -> CollectionUtil.plus(set, sink));
-            this.upstreamAdjacentNodes.compute(sink, (k, set) -> CollectionUtil.plus(set, source));
-        }
-    }
-
-
-    /**
-     * Add new directed edges to the graph. The first argument is the
-     * downstream node, the second argument a set of upstream nodes.
-     *
-     * @param sink    The downstream immediate neighbor.
-     * @param sources The upstream immediate neighbors.
-     */
-    @Override
-    public void addEdges(T sink, List<T> sources) {
-        for (T source : sources) {
-            this.addEdge(sink, source);
-        }
-    }
-
-
-    /**
-     * Remove a directed edge from the graph.
-     *
-     * @param sink   The downstream immediate neighbor.
-     * @param source The upstream immediate neighbor.
-     */
-    @Override
-    public void removeEdge(T sink, T source) {
-        this.graphChanged();
-        this.upstreamAdjacentNodes.computeIfPresent(sink, (k, upstream) -> CollectionUtil.minus(upstream, source));
-        this.downstreamAdjacentNodes.computeIfPresent(source, (k, downstream) -> CollectionUtil.minus(downstream, sink));
-    }
-
-
-    /**
-     * Obtain a copy of this graph by creating an new instance and copying
-     * the adjacency maps.
-     */
-    public DirectedGraph<T> copy() {
-        var graph = new DirectedGraph<T>();
-        for (var entry : this.upstreamAdjacentNodes.entrySet()) {
-            graph.upstreamAdjacentNodes.put(entry.getKey(), CollectionUtil.copy(entry.getValue()));
-        }
-        for (var entry : this.downstreamAdjacentNodes.entrySet()) {
-            graph.downstreamAdjacentNodes.put(entry.getKey(), CollectionUtil.copy(entry.getValue()));
-        }
-        return graph;
-    }
-
-
-    /**
-     * For a given a two adjacency maps, copy missing edges from the first
-     * map to the second.
-     *
-     * @param srcMap The adjacency map to copy edges from.
-     * @param dstMap The adjacency map to copy edges to.
-     */
-    private void mirror(Map<T, Set<T>> srcMap, Map<T, Set<T>> dstMap) {
-        if (srcMap != null && dstMap != null) {
-            for (Entry<T, Set<T>> entry : srcMap.entrySet()) {
-                var node = entry.getKey();
-                var srcEdges = entry.getValue();
-                dstMap.compute(node, (_node, dstEdges) -> {
-                    // Node does not exist; add it.
-                    if (dstEdges == null) {
-                        return CollectionUtil.copy(srcEdges);
-                    }
-
-                    // Node does exist; add the missing edges.
-                    var set = dstEdges;
-                    for (T edge : srcEdges) {
-                        set = CollectionUtil.plus(set, edge);
-                    }
-                    return set;
-                });
-            }
-        }
-    }
-
-
-    /**
-     * Merge another directed graph into this one.
-     *
-     * @param another The graph to merge into this one.
-     */
-    public void merge(DirectedGraph<T> another) {
-        this.graphChanged();
-        mirror(another.upstreamAdjacentNodes, this.upstreamAdjacentNodes);
-        mirror(another.downstreamAdjacentNodes, this.downstreamAdjacentNodes);
-    }
-
-
-    /**
-     * Return the set of nodes that have no neighbors listed in the given
-     * adjacency map.
-     */
-    private Set<T> independentNodes(Map<T, Set<T>> adjacencyMap) {
-        var independent = new LinkedHashSet<T>();
-        for (T node : nodes()) {
-            var neighbors = adjacencyMap.get(node);
-            if (neighbors == null || neighbors.size() == 0) {
-                independent.add(node);
-            }
-        }
-        return independent;
+  // Note that while both those maps are mutable, the sets
+  // they use as values may not be. They should only be
+  // manipulated through CollectionUtil
+
+  // If a node has no neighbors, it is still in the map with an empty set as a value.
+
+  /** Adjacency map from vertices to their downstream immediate neighbors. */
+  private final Map<T, Set<T>> downstreamAdjacentNodes = new LinkedHashMap<>();
+
+  /** Adjacency map from vertices to their upstream immediate neighbors. */
+  private final Map<T, Set<T>> upstreamAdjacentNodes = new LinkedHashMap<>();
+
+  /** Mark the graph to have changed so that any cached analysis is refreshed accordingly. */
+  protected void graphChanged() {
+    // To be overridden by subclasses that perform analysis.
+  }
+
+  /**
+   * Return true if this graph has the given node in it.
+   *
+   * @param node The node to look for.
+   */
+  @Override
+  public boolean hasNode(T node) {
+    return nodes().contains(node);
+  }
+
+  /**
+   * Return all immediate upstream neighbors of a given node.
+   *
+   * @param node The node to report the immediate upstream neighbors of.
+   */
+  public Set<T> getUpstreamAdjacentNodes(T node) {
+    return Collections.unmodifiableSet(this.upstreamAdjacentNodes.getOrDefault(node, Set.of()));
+  }
+
+  /**
+   * Return all immediate downstream neighbors of a given node.
+   *
+   * @param node The node to report the immediate downstream neighbors of.
+   */
+  public Set<T> getDownstreamAdjacentNodes(T node) {
+    return Collections.unmodifiableSet(this.downstreamAdjacentNodes.getOrDefault(node, Set.of()));
+  }
+
+  @Override
+  public void addNode(T node) {
+    this.graphChanged();
+    this.upstreamAdjacentNodes.putIfAbsent(node, Set.of());
+    this.downstreamAdjacentNodes.putIfAbsent(node, Set.of());
+  }
+
+  @Override
+  public void removeNode(T node) {
+    this.graphChanged();
+    this.upstreamAdjacentNodes.remove(node);
+    this.downstreamAdjacentNodes.remove(node);
+    // The node also needs to be removed from the sets that represent connections to the node.
+    CollectionUtil.removeFromValues(this.upstreamAdjacentNodes, node);
+    CollectionUtil.removeFromValues(this.downstreamAdjacentNodes, node);
+  }
+
+  /**
+   * Add a new directed edge to the graph. The first argument is the downstream node, the second
+   * argument the upstream node. If either argument is null, do nothing.
+   *
+   * @param sink The downstream immediate neighbor.
+   * @param source The upstream immediate neighbor.
+   */
+  @Override
+  public void addEdge(T sink, T source) {
+    this.graphChanged();
+    if (sink != null && source != null) {
+      this.downstreamAdjacentNodes.compute(source, (k, set) -> CollectionUtil.plus(set, sink));
+      this.upstreamAdjacentNodes.compute(sink, (k, set) -> CollectionUtil.plus(set, source));
     }
-
-
-    /**
-     * Return the root nodes of this graph.
-     * Root nodes have no upstream neighbors.
-     */
-    public Set<T> rootNodes() {
-        return independentNodes(this.upstreamAdjacentNodes);
+  }
+
+  /**
+   * Add new directed edges to the graph. The first argument is the downstream node, the second
+   * argument a set of upstream nodes.
+   *
+   * @param sink The downstream immediate neighbor.
+   * @param sources The upstream immediate neighbors.
+   */
+  @Override
+  public void addEdges(T sink, List<T> sources) {
+    for (T source : sources) {
+      this.addEdge(sink, source);
     }
-
-
-    /**
-     * Return the leaf nodes of this graph.
-     * Leaf nodes have no downstream neighbors.
-     */
-    public Set<T> leafNodes() {
-        return independentNodes(this.downstreamAdjacentNodes);
+  }
+
+  /**
+   * Remove a directed edge from the graph.
+   *
+   * @param sink The downstream immediate neighbor.
+   * @param source The upstream immediate neighbor.
+   */
+  @Override
+  public void removeEdge(T sink, T source) {
+    this.graphChanged();
+    this.upstreamAdjacentNodes.computeIfPresent(
+        sink, (k, upstream) -> CollectionUtil.minus(upstream, source));
+    this.downstreamAdjacentNodes.computeIfPresent(
+        source, (k, downstream) -> CollectionUtil.minus(downstream, sink));
+  }
+
+  /** Obtain a copy of this graph by creating an new instance and copying the adjacency maps. */
+  public DirectedGraph<T> copy() {
+    var graph = new DirectedGraph<T>();
+    for (var entry : this.upstreamAdjacentNodes.entrySet()) {
+      graph.upstreamAdjacentNodes.put(entry.getKey(), CollectionUtil.copy(entry.getValue()));
     }
-
-
-    @Override
-    public int nodeCount() {
-        return downstreamAdjacentNodes.size();
+    for (var entry : this.downstreamAdjacentNodes.entrySet()) {
+      graph.downstreamAdjacentNodes.put(entry.getKey(), CollectionUtil.copy(entry.getValue()));
     }
-
-
-    @Override
-    public int edgeCount() {
-        return this.upstreamAdjacentNodes.values().stream().mapToInt(Set::size).sum();
+    return graph;
+  }
+
+  /**
+   * For a given a two adjacency maps, copy missing edges from the first map to the second.
+   *
+   * @param srcMap The adjacency map to copy edges from.
+   * @param dstMap The adjacency map to copy edges to.
+   */
+  private void mirror(Map<T, Set<T>> srcMap, Map<T, Set<T>> dstMap) {
+    if (srcMap != null && dstMap != null) {
+      for (Entry<T, Set<T>> entry : srcMap.entrySet()) {
+        var node = entry.getKey();
+        var srcEdges = entry.getValue();
+        dstMap.compute(
+            node,
+            (_node, dstEdges) -> {
+              // Node does not exist; add it.
+              if (dstEdges == null) {
+                return CollectionUtil.copy(srcEdges);
+              }
+
+              // Node does exist; add the missing edges.
+              var set = dstEdges;
+              for (T edge : srcEdges) {
+                set = CollectionUtil.plus(set, edge);
+              }
+              return set;
+            });
+      }
     }
-
-
-    @Override
-    public Set<T> nodes() {
-        return Collections.unmodifiableSet(this.downstreamAdjacentNodes.keySet());
+  }
+
+  /**
+   * Merge another directed graph into this one.
+   *
+   * @param another The graph to merge into this one.
+   */
+  public void merge(DirectedGraph<T> another) {
+    this.graphChanged();
+    mirror(another.upstreamAdjacentNodes, this.upstreamAdjacentNodes);
+    mirror(another.downstreamAdjacentNodes, this.downstreamAdjacentNodes);
+  }
+
+  /** Return the set of nodes that have no neighbors listed in the given adjacency map. */
+  private Set<T> independentNodes(Map<T, Set<T>> adjacencyMap) {
+    var independent = new LinkedHashSet<T>();
+    for (T node : nodes()) {
+      var neighbors = adjacencyMap.get(node);
+      if (neighbors == null || neighbors.size() == 0) {
+        independent.add(node);
+      }
     }
-
-
-    public void clear() {
-        this.graphChanged();
-        this.downstreamAdjacentNodes.clear();
-        this.upstreamAdjacentNodes.clear();
+    return independent;
+  }
+
+  /** Return the root nodes of this graph. Root nodes have no upstream neighbors. */
+  public Set<T> rootNodes() {
+    return independentNodes(this.upstreamAdjacentNodes);
+  }
+
+  /** Return the leaf nodes of this graph. Leaf nodes have no downstream neighbors. */
+  public Set<T> leafNodes() {
+    return independentNodes(this.downstreamAdjacentNodes);
+  }
+
+  @Override
+  public int nodeCount() {
+    return downstreamAdjacentNodes.size();
+  }
+
+  @Override
+  public int edgeCount() {
+    return this.upstreamAdjacentNodes.values().stream().mapToInt(Set::size).sum();
+  }
+
+  @Override
+  public Set<T> nodes() {
+    return Collections.unmodifiableSet(this.downstreamAdjacentNodes.keySet());
+  }
+
+  public void clear() {
+    this.graphChanged();
+    this.downstreamAdjacentNodes.clear();
+    this.upstreamAdjacentNodes.clear();
+  }
+
+  /** Return a textual list of the nodes. */
+  @Override
+  public String toString() {
+    return nodes().stream().map(Objects::toString).collect(Collectors.joining(", ", "{", "}"));
+  }
+
+  /** Return the DOT (GraphViz) representation of the graph. */
+  @Override
+  public String toDOT() {
+    StringBuilder dotRepresentation = new StringBuilder();
+    StringBuilder edges = new StringBuilder();
+
+    // Start the digraph with a left-write rank
+    dotRepresentation.append("digraph {\n");
+    dotRepresentation.append("    rankdir=LF;\n");
+
+    Set<T> nodes = nodes();
+    for (T node : nodes) {
+      // Draw the node
+      dotRepresentation.append(
+          "    node_"
+              + (node.toString().hashCode() & 0xfffffff)
+              + " [label=\""
+              + node.toString()
+              + "\"]\n");
+
+      // Draw the edges
+      Set<T> downstreamNodes = getDownstreamAdjacentNodes(node);
+      for (T downstreamNode : downstreamNodes) {
+        edges.append(
+            "    node_"
+                + (node.toString().hashCode() & 0xfffffff)
+                + " -> node_"
+                + (downstreamNode.toString().hashCode() & 0xfffffff)
+                + "\n");
+      }
     }
 
+    // Add the edges to the definition of the graph at the bottom
+    dotRepresentation.append(edges);
 
-    /**
-     * Return a textual list of the nodes.
-     */
-    @Override
-    public String toString() {
-        return nodes().stream().map(Objects::toString).collect(Collectors.joining(", ", "{", "}"));
-    }
+    // Close the digraph
+    dotRepresentation.append("}\n");
 
-    /**
-     * Return the DOT (GraphViz) representation of the graph.
-     */
-    @Override
-    public String toDOT() {
-        StringBuilder dotRepresentation = new StringBuilder();
-        StringBuilder edges = new StringBuilder();
-
-        // Start the digraph with a left-write rank
-        dotRepresentation.append("digraph {\n");
-        dotRepresentation.append("    rankdir=LF;\n");
-
-        Set<T> nodes = nodes();
-        for (T node: nodes) {
-            // Draw the node
-            dotRepresentation.append("    node_" + (node.toString().hashCode() & 0xfffffff)
-            + " [label=\""+ node.toString() +"\"]\n");
-
-            // Draw the edges
-            Set<T> downstreamNodes = getDownstreamAdjacentNodes(node);
-            for (T downstreamNode: downstreamNodes) {
-                edges.append("    node_" + (node.toString().hashCode() & 0xfffffff)
-                                 + " -> node_" + (downstreamNode.toString().hashCode() & 0xfffffff) + "\n");
-            }
-        }
-
-        // Add the edges to the definition of the graph at the bottom
-        dotRepresentation.append(edges);
-
-        // Close the digraph
-        dotRepresentation.append("}\n");
-
-        // Return the DOT representation
-        return dotRepresentation.toString();
-    }
+    // Return the DOT representation
+    return dotRepresentation.toString();
+  }
 }
diff --git a/org.lflang/src/org/lflang/graph/Graph.java b/org.lflang/src/org/lflang/graph/Graph.java
index 4e9a1723d9..07371c1255 100644
--- a/org.lflang/src/org/lflang/graph/Graph.java
+++ b/org.lflang/src/org/lflang/graph/Graph.java
@@ -1,26 +1,26 @@
 /*************
- Copyright (c) 2020, The University of California at Berkeley.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) 2020, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
 
 package org.lflang.graph;
@@ -35,49 +35,36 @@
  */
 public interface Graph<T> {
 
-    /**
-     * Return an unmodifiable set of nodes in this graph.
-     */
-    Set<T> nodes();
-
-
-    boolean hasNode(T node);
-
-
-    /** Add the given node to the graph. */
-    void addNode(T node);
-
-
-    /**
-     * Remove the given node from the graph. This also eliminates any
-     * edges from upstream and to downstream neighbors of this node.
-     *
-     * @param node The node to remove.
-     */
-    void removeNode(T node);
-
-
-    // todo order of parameters here is unintuitive... from -> to is more usual
-
-    void addEdge(T to, T from);
+  /** Return an unmodifiable set of nodes in this graph. */
+  Set<T> nodes();
 
+  boolean hasNode(T node);
 
-    void addEdges(T to, List<T> from);
+  /** Add the given node to the graph. */
+  void addNode(T node);
 
+  /**
+   * Remove the given node from the graph. This also eliminates any edges from upstream and to
+   * downstream neighbors of this node.
+   *
+   * @param node The node to remove.
+   */
+  void removeNode(T node);
 
-    void removeEdge(T to, T from);
+  // todo order of parameters here is unintuitive... from -> to is more usual
 
+  void addEdge(T to, T from);
 
-    /**
-     * Return the number of nodes in this graph.
-     */
-    int nodeCount();
+  void addEdges(T to, List<T> from);
 
+  void removeEdge(T to, T from);
 
-    /** Return the number of directed edges in this graph. */
-    int edgeCount();
+  /** Return the number of nodes in this graph. */
+  int nodeCount();
 
+  /** Return the number of directed edges in this graph. */
+  int edgeCount();
 
-    /** Return the DOT (GraphViz) representation of the graph. */
-    String toDOT();
+  /** Return the DOT (GraphViz) representation of the graph. */
+  String toDOT();
 }
diff --git a/org.lflang/src/org/lflang/graph/InstantiationGraph.java b/org.lflang/src/org/lflang/graph/InstantiationGraph.java
index b32c97e2f2..dca5492fd0 100644
--- a/org.lflang/src/org/lflang/graph/InstantiationGraph.java
+++ b/org.lflang/src/org/lflang/graph/InstantiationGraph.java
@@ -1,35 +1,34 @@
 /**
  * Copyright (c) 2020, The University of California at Berkeley.
  *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
+ * <p>Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
  *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
+ * <p>1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
  *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
+ * <p>2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials provided with
+ * the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package org.lflang.graph;
 
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Iterables;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-
 import org.eclipse.emf.ecore.resource.Resource;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Instantiation;
@@ -38,138 +37,124 @@
 import org.lflang.lf.ReactorDecl;
 import org.lflang.util.IteratorUtil;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Iterables;
-
 /**
- * A graph with vertices that are Reactors (not ReactorInstances) and edges that denote
- * dependencies between them. A "dependency" from reactor class A to
- * reactor class B (A depends on B) means that A instantiates within
- * it at least one instance of B. Note that there a potentially
- * confusing and subtle distinction here between an "instantiation"
- * and an "instance". They are not the same thing at all. An
- * "instantiation" is an AST node representing a statement like
- * {@code a = new A();}. This can result in many instances of reactor
- * class A (if the containing reactor class is instantiated multiple times).
+ * A graph with vertices that are Reactors (not ReactorInstances) and edges that denote dependencies
+ * between them. A "dependency" from reactor class A to reactor class B (A depends on B) means that
+ * A instantiates within it at least one instance of B. Note that there a potentially confusing and
+ * subtle distinction here between an "instantiation" and an "instance". They are not the same thing
+ * at all. An "instantiation" is an AST node representing a statement like {@code a = new A();}.
+ * This can result in many instances of reactor class A (if the containing reactor class is
+ * instantiated multiple times).
  *
- * In addition to the graph, this class keeps track of the instantiations
- * that induce the dependencies. These can be retrieved using the method
- * {@code getInstantiations(Reactor)}.
+ * <p>In addition to the graph, this class keeps track of the instantiations that induce the
+ * dependencies. These can be retrieved using the method {@code getInstantiations(Reactor)}.
  *
  * @author Marten Lohstroh
  */
 public class InstantiationGraph extends PrecedenceGraph<Reactor> {
-    /**
-     * A mapping from reactors to the sites of their instantiation.
-     */
-    protected final HashMultimap<Reactor, Instantiation> reactorToInstantiation =
-        HashMultimap.create();
+  /** A mapping from reactors to the sites of their instantiation. */
+  protected final HashMultimap<Reactor, Instantiation> reactorToInstantiation =
+      HashMultimap.create();
 
-    /**
-     * A mapping from reactor classes to their declarations.
-     */
-    protected final HashMultimap<Reactor, ReactorDecl> reactorToDecl =
-        HashMultimap.create();
+  /** A mapping from reactor classes to their declarations. */
+  protected final HashMultimap<Reactor, ReactorDecl> reactorToDecl = HashMultimap.create();
 
-    /**
-     * Return the instantiations that point to a given reactor definition.
-     * If none are known, returns an empty set. * The returned set may be
-     * unmodifiable.
-     */
-    public Set<Instantiation> getInstantiations(final Reactor definition) {
-        Set<Instantiation> instantiations = this.reactorToInstantiation.get(definition);
-        if (instantiations != null) {
-            return instantiations;
-        } else {
-            return Collections.emptySet();
-        }
+  /**
+   * Return the instantiations that point to a given reactor definition. If none are known, returns
+   * an empty set. * The returned set may be unmodifiable.
+   */
+  public Set<Instantiation> getInstantiations(final Reactor definition) {
+    Set<Instantiation> instantiations = this.reactorToInstantiation.get(definition);
+    if (instantiations != null) {
+      return instantiations;
+    } else {
+      return Collections.emptySet();
     }
+  }
 
-    /**
-     * Return the declarations that point to a given reactor definition.
-     * A declaration is either a reactor definition or an import statement.
-     */
-    public Set<ReactorDecl> getDeclarations(final Reactor definition) {
-        return this.reactorToDecl.get(definition);
-    }
+  /**
+   * Return the declarations that point to a given reactor definition. A declaration is either a
+   * reactor definition or an import statement.
+   */
+  public Set<ReactorDecl> getDeclarations(final Reactor definition) {
+    return this.reactorToDecl.get(definition);
+  }
 
-    /**
-     * Return the reactor definitions referenced by instantiations in this graph
-     * ordered topologically. Each reactor in the returned list is preceded by
-     * any reactors that it may instantiate.
-     */
-    public List<Reactor> getReactors() {
-        return this.nodesInTopologicalOrder();
-    }
+  /**
+   * Return the reactor definitions referenced by instantiations in this graph ordered
+   * topologically. Each reactor in the returned list is preceded by any reactors that it may
+   * instantiate.
+   */
+  public List<Reactor> getReactors() {
+    return this.nodesInTopologicalOrder();
+  }
 
-    /**
-     * Construct an instantiation graph based on the given AST and, if the
-     * detectCycles argument is true, run Tarjan's algorithm to detect cyclic
-     * dependencies between instantiations.
-     * @param resource The resource associated with the AST.
-     * @param detectCycles Whether or not to detect cycles.
-     */
-    public InstantiationGraph(final Resource resource, final boolean detectCycles) {
-        final Iterable<Instantiation> instantiations = Iterables.filter(
-                IteratorUtil.asIterable(resource.getAllContents()),
-                Instantiation.class);
-        Optional<Reactor> main = IteratorUtil
-                .asFilteredStream(resource.getAllContents(), Reactor.class)
-                .filter(reactor -> reactor.isMain() || reactor.isFederated())
-                .findFirst();
+  /**
+   * Construct an instantiation graph based on the given AST and, if the detectCycles argument is
+   * true, run Tarjan's algorithm to detect cyclic dependencies between instantiations.
+   *
+   * @param resource The resource associated with the AST.
+   * @param detectCycles Whether or not to detect cycles.
+   */
+  public InstantiationGraph(final Resource resource, final boolean detectCycles) {
+    final Iterable<Instantiation> instantiations =
+        Iterables.filter(IteratorUtil.asIterable(resource.getAllContents()), Instantiation.class);
+    Optional<Reactor> main =
+        IteratorUtil.asFilteredStream(resource.getAllContents(), Reactor.class)
+            .filter(reactor -> reactor.isMain() || reactor.isFederated())
+            .findFirst();
 
-        if (main.isPresent()) {
-            this.addNode(main.get());
-        }
-        for (final Instantiation i : instantiations) {
-            this.buildGraph(i, new HashSet<>());
-        }
-        if (detectCycles) {
-            this.detectCycles();
-        }
+    if (main.isPresent()) {
+      this.addNode(main.get());
+    }
+    for (final Instantiation i : instantiations) {
+      this.buildGraph(i, new HashSet<>());
+    }
+    if (detectCycles) {
+      this.detectCycles();
     }
+  }
 
-    /**
-     * Construct an instantiation graph based on the given AST and, if the
-     * detectCycles argument is true, run Tarjan's algorithm to detect cyclic
-     * dependencies between instantiations.
-     * @param model The root of the AST.
-     * @param detectCycles Whether or not to detect cycles.
-     */
-    public InstantiationGraph(final Model model, final boolean detectCycles) {
-        for (final Reactor r : model.getReactors()) {
-            for (final Instantiation i : r.getInstantiations()) {
-                this.buildGraph(i, new HashSet<>());
-            }
-        }
-        if (detectCycles) {
-            this.detectCycles();
-        }
+  /**
+   * Construct an instantiation graph based on the given AST and, if the detectCycles argument is
+   * true, run Tarjan's algorithm to detect cyclic dependencies between instantiations.
+   *
+   * @param model The root of the AST.
+   * @param detectCycles Whether or not to detect cycles.
+   */
+  public InstantiationGraph(final Model model, final boolean detectCycles) {
+    for (final Reactor r : model.getReactors()) {
+      for (final Instantiation i : r.getInstantiations()) {
+        this.buildGraph(i, new HashSet<>());
+      }
+    }
+    if (detectCycles) {
+      this.detectCycles();
     }
+  }
 
-    /**
-     * Traverse the AST and build this precedence graph relating the
-     * encountered instantiations. Also map each reactor to all
-     * declarations associated with it and each reactor to the sites of
-     * its instantiations.
-     */
-    private void buildGraph(final Instantiation instantiation, final Set<Instantiation> visited) {
-        final ReactorDecl decl = instantiation.getReactorClass();
-        final Reactor reactor = ASTUtils.toDefinition(decl);
-        if (reactor != null) {
-            Reactor container = ASTUtils.getEnclosingReactor(instantiation);
-            if (visited.add(instantiation)) {
-                this.reactorToInstantiation.put(reactor, instantiation);
-                this.reactorToDecl.put(reactor, decl);
-                if (container != null) {
-                    this.addEdge(container, reactor);
-                } else {
-                    this.addNode(reactor);
-                }
-                for (final Instantiation inst : reactor.getInstantiations()) {
-                    this.buildGraph(inst, visited);
-                }
-            }
+  /**
+   * Traverse the AST and build this precedence graph relating the encountered instantiations. Also
+   * map each reactor to all declarations associated with it and each reactor to the sites of its
+   * instantiations.
+   */
+  private void buildGraph(final Instantiation instantiation, final Set<Instantiation> visited) {
+    final ReactorDecl decl = instantiation.getReactorClass();
+    final Reactor reactor = ASTUtils.toDefinition(decl);
+    if (reactor != null) {
+      Reactor container = ASTUtils.getEnclosingReactor(instantiation);
+      if (visited.add(instantiation)) {
+        this.reactorToInstantiation.put(reactor, instantiation);
+        this.reactorToDecl.put(reactor, decl);
+        if (container != null) {
+          this.addEdge(container, reactor);
+        } else {
+          this.addNode(reactor);
+        }
+        for (final Instantiation inst : reactor.getInstantiations()) {
+          this.buildGraph(inst, visited);
         }
+      }
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/graph/NodeAnnotation.java b/org.lflang/src/org/lflang/graph/NodeAnnotation.java
index b8b91c92ad..191967d043 100644
--- a/org.lflang/src/org/lflang/graph/NodeAnnotation.java
+++ b/org.lflang/src/org/lflang/graph/NodeAnnotation.java
@@ -1,66 +1,54 @@
 /**
  * Copyright (c) 2019, The University of California at Berkeley.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * <p>Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * <p>1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * <p>2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials provided with
+ * the distribution.
+ *
+ * <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package org.lflang.graph;
 
 /**
- * Note annotations used in Tarjan's algorithm for finding strongly connected
- * components.
- * 
+ * Note annotations used in Tarjan's algorithm for finding strongly connected components.
+ *
  * @author Marten Lohstroh
  */
 public class NodeAnnotation {
-    /**
-     * Sequence number that is assigned when this node is discovered.
-     * A node with a lower index was discovered later than this one;
-     * a node with a higher index was discovered later than this one.
-     */
-    public int index = -1;
-    
-    /**
-     * Temporary mark do be used in topological sort algorithm.
-     */
-    public boolean hasTempMark = false;
-    
-    /**
-     * Temporary mark do be used in topological sort algorithm.
-     */
-    public boolean hasPermMark = false;
-    
-    /**
-     * The smallest index of any node known to be reachable from this node.
-     */
-    public int lowLink = -1;
-    
-    /**
-     * Whether or not this node is currently on the stack that
-     * keeps track of visited nodes that potentially form a cycle.
-     */
-    public boolean onStack = false;
-    
-    /**
-     * Whether or not this node has a dependency on itself.
-     */
-    public boolean selfLoop = false;
-}
+  /**
+   * Sequence number that is assigned when this node is discovered. A node with a lower index was
+   * discovered later than this one; a node with a higher index was discovered later than this one.
+   */
+  public int index = -1;
+
+  /** Temporary mark do be used in topological sort algorithm. */
+  public boolean hasTempMark = false;
+
+  /** Temporary mark do be used in topological sort algorithm. */
+  public boolean hasPermMark = false;
 
+  /** The smallest index of any node known to be reachable from this node. */
+  public int lowLink = -1;
+
+  /**
+   * Whether or not this node is currently on the stack that keeps track of visited nodes that
+   * potentially form a cycle.
+   */
+  public boolean onStack = false;
+
+  /** Whether or not this node has a dependency on itself. */
+  public boolean selfLoop = false;
+}
diff --git a/org.lflang/src/org/lflang/graph/NodeAnnotations.java b/org.lflang/src/org/lflang/graph/NodeAnnotations.java
index 346149a8c4..6efe85760a 100644
--- a/org.lflang/src/org/lflang/graph/NodeAnnotations.java
+++ b/org.lflang/src/org/lflang/graph/NodeAnnotations.java
@@ -1,46 +1,42 @@
 /**
  * Copyright (c) 2019, The University of California at Berkeley.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * <p>Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * <p>1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * <p>2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials provided with
+ * the distribution.
+ *
+ * <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package org.lflang.graph;
 
 import java.util.HashMap;
 
-/**
- * Maps a node in the graph to its annotation.
- * Creates a new annotation if no annotation exists.
- */
+/** Maps a node in the graph to its annotation. Creates a new annotation if no annotation exists. */
 public class NodeAnnotations<T extends Object> {
   private HashMap<T, NodeAnnotation> annotations = new HashMap<T, NodeAnnotation>();
-  
+
   public NodeAnnotation get(final T node) {
     NodeAnnotation annotation = this.annotations.get(node);
     if (annotation == null) {
-        annotation = new NodeAnnotation();
-        this.annotations.put(node, annotation);
+      annotation = new NodeAnnotation();
+      this.annotations.put(node, annotation);
     }
     return annotation;
   }
-  
+
   public NodeAnnotation put(final T node, final NodeAnnotation annotation) {
     return this.annotations.put(node, annotation);
   }
diff --git a/org.lflang/src/org/lflang/graph/PrecedenceGraph.java b/org.lflang/src/org/lflang/graph/PrecedenceGraph.java
index 03fd266f6a..80abb21455 100644
--- a/org.lflang/src/org/lflang/graph/PrecedenceGraph.java
+++ b/org.lflang/src/org/lflang/graph/PrecedenceGraph.java
@@ -1,242 +1,219 @@
 /*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.graph;
 
+import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.Stack;
-
 import org.eclipse.xtext.xbase.lib.ListExtensions;
 
-import java.util.ArrayList;
-
-/** 
- * Elaboration of {@code DirectedGraph} that is capable of identifying strongly
- * connected components and topologically sorting its nodes.
- * 
+/**
+ * Elaboration of {@code DirectedGraph} that is capable of identifying strongly connected components
+ * and topologically sorting its nodes.
+ *
  * @author Marten Lohstroh
  */
 public class PrecedenceGraph<T extends Object> extends DirectedGraph<T> {
 
-    /**
-     * Annotations used during the execution of Tarjan's algorithm.
-     */
-    private NodeAnnotations<T> annotations = new NodeAnnotations<T>();
-
-    /**
-     * Indicates whether or not the graph has been analyzed for cycles.
-     * If this variable is false, Tarjan's algorithm need to be ran to find out
-     * whether or not this graph has cycles.
-     */
-    private boolean cycleAnalysisDone = false;
-
-    /**
-     * Indicates whether or not the graph has been sorted.
-     * If this variable is false, a new DFS has to be done to compute a
-     * topological sort.
-     */
-    private boolean isSorted = false;
-    
-    /**
-     * Index used in Tarjan's algorithm.
-     */
-    private int index = 0;
-    
-    /**
-     * After analysis has completed, this list contains all nodes in reverse
-     * topological order.
-     */
-    private List<T> sortedNodes = new ArrayList<>();
-    
-    /**
-     * Stack used in Tarjan's algorithm.
-     */
-    private Stack<T> stack = new Stack<>();
-    
-    /**
-     * After analysis has completed, this list contains all all sets of nodes
-     * that are part of the same strongly connected component.
-     */
-    protected List<Set<T>> cycles = new ArrayList<>();
-
-    /**
-     * Invalidate cached analysis due to changes in the graph structure.
-     */
-    @Override
-    public void graphChanged() {
-        this.cycleAnalysisDone = false;
-        this.isSorted = false;
-    }
-
-    /**
-     * Construct a new dependency graph.
-     */
-    public PrecedenceGraph() {}
-
-    /**
-     * Topologically sort the nodes in the graph.
-     */
-    private void sortNodes() {
-        if (!this.isSorted) {
-            // Cleanup.
-            this.sortedNodes = new ArrayList<>();
-            this.nodes().forEach(
-                it -> {
-                    this.annotations.get(it).hasTempMark = false;
-                    this.annotations.get(it).hasPermMark = false;
-                }
-            );
-
-            // Start sorting.
-            for (T node : this.nodes()) {
-                if (!this.annotations.get(node).hasPermMark) {
-                    // Unmarked node.
-                    this.visit(node);
-                }
-            }
-            this.isSorted = true;
+  /** Annotations used during the execution of Tarjan's algorithm. */
+  private NodeAnnotations<T> annotations = new NodeAnnotations<T>();
+
+  /**
+   * Indicates whether or not the graph has been analyzed for cycles. If this variable is false,
+   * Tarjan's algorithm need to be ran to find out whether or not this graph has cycles.
+   */
+  private boolean cycleAnalysisDone = false;
+
+  /**
+   * Indicates whether or not the graph has been sorted. If this variable is false, a new DFS has to
+   * be done to compute a topological sort.
+   */
+  private boolean isSorted = false;
+
+  /** Index used in Tarjan's algorithm. */
+  private int index = 0;
+
+  /** After analysis has completed, this list contains all nodes in reverse topological order. */
+  private List<T> sortedNodes = new ArrayList<>();
+
+  /** Stack used in Tarjan's algorithm. */
+  private Stack<T> stack = new Stack<>();
+
+  /**
+   * After analysis has completed, this list contains all all sets of nodes that are part of the
+   * same strongly connected component.
+   */
+  protected List<Set<T>> cycles = new ArrayList<>();
+
+  /** Invalidate cached analysis due to changes in the graph structure. */
+  @Override
+  public void graphChanged() {
+    this.cycleAnalysisDone = false;
+    this.isSorted = false;
+  }
+
+  /** Construct a new dependency graph. */
+  public PrecedenceGraph() {}
+
+  /** Topologically sort the nodes in the graph. */
+  private void sortNodes() {
+    if (!this.isSorted) {
+      // Cleanup.
+      this.sortedNodes = new ArrayList<>();
+      this.nodes()
+          .forEach(
+              it -> {
+                this.annotations.get(it).hasTempMark = false;
+                this.annotations.get(it).hasPermMark = false;
+              });
+
+      // Start sorting.
+      for (T node : this.nodes()) {
+        if (!this.annotations.get(node).hasPermMark) {
+          // Unmarked node.
+          this.visit(node);
         }
+      }
+      this.isSorted = true;
     }
-    
-    /**
-     * Recursively visit all nodes reachable from the given node; after all
-     * those nodes have been visited add the current node to a list which will
-     * be sorted in reverse order.
-     */
-    private void visit(T node) {
-        NodeAnnotation annotation = this.annotations.get(node);
-        if (annotation.hasPermMark) {
-            return;
-        }
-        if (annotation.hasTempMark) {
-            // Not a DAG.
-            throw new Error("Cannot order nodes due to cycle in the graph.");
-        }
-        annotation.hasTempMark = true;
-        for (T dep : this.getDownstreamAdjacentNodes(node)) {
-            visit(dep);
-        }
-        annotation.hasTempMark = false;
-        annotation.hasPermMark = true;
-        this.sortedNodes.add(node);
-    }
-    
-    /**
-     * Run Tarjan's algorithm for finding strongly connected components.
-     * After invoking this method, the detected cycles with be listed 
-     * in the class variable {@code cycles}.
-     */
-    public void detectCycles() {
-        if (!this.cycleAnalysisDone) {
-            this.index = 0;
-            this.stack = new Stack<>();
-            this.cycles = new ArrayList<>();
-            this.nodes().forEach(it -> { 
-                this.annotations.get(it).index = -1; 
-            });
-            for (T node : this.nodes()) {
-                if (this.annotations.get(node).index == -1) {
-                    this.strongConnect(node);
-                }
-            }
-            this.cycleAnalysisDone = true;
-            stack = null;
-        }
+  }
+
+  /**
+   * Recursively visit all nodes reachable from the given node; after all those nodes have been
+   * visited add the current node to a list which will be sorted in reverse order.
+   */
+  private void visit(T node) {
+    NodeAnnotation annotation = this.annotations.get(node);
+    if (annotation.hasPermMark) {
+      return;
     }
-    
-    /**
-     * Report whether this graph has any cycles in it.
-     */
-    public boolean hasCycles() {
-        this.detectCycles();
-        return this.cycles.size() > 0;
+    if (annotation.hasTempMark) {
+      // Not a DAG.
+      throw new Error("Cannot order nodes due to cycle in the graph.");
     }
-    
-    /**
-     * Return a list of strongly connected components that exist in this graph.
-     */
-    public List<Set<T>> getCycles() {
-        this.detectCycles();
-        return this.cycles;
+    annotation.hasTempMark = true;
+    for (T dep : this.getDownstreamAdjacentNodes(node)) {
+      visit(dep);
     }
-    
-    /**
-     * Traverse the graph to visit unvisited dependencies and determine
-     * whether they are part of a cycle. 
-     */
-    public void strongConnect(T node) {
-        NodeAnnotation annotation = this.annotations.get(node);
-        annotation.index = this.index;
-        annotation.lowLink = this.index;
-        annotation.onStack = true;
-        this.index++;
-        this.stack.push(node);
-        for (T dep : this.getUpstreamAdjacentNodes(node)) {
-            NodeAnnotation depAnnotation = this.annotations.get(dep);
-            if (depAnnotation.onStack) {
-                annotation.lowLink = Math.min(annotation.lowLink, depAnnotation.index);
-                if (node.equals(dep)) {
-                    annotation.selfLoop = true;
-                }
-            } else if (depAnnotation.index == -1) {
-                strongConnect(dep);
-                annotation.lowLink = Math.min(annotation.lowLink, depAnnotation.lowLink);
-            }
-        }
-
-        if (annotation.lowLink == annotation.index) {
-            Set<T> scc = new LinkedHashSet<>();
-            T dep = null;
-            do {
-                dep = this.stack.pop();
-                this.annotations.get(dep).onStack = false;
-                scc.add(dep);
-            } while (!node.equals(dep));
-            // Only report self loops or cycles with two or more nodes.
-            if (scc.size() > 1 || annotation.selfLoop) {
-                this.cycles.add(scc);
-            }
+    annotation.hasTempMark = false;
+    annotation.hasPermMark = true;
+    this.sortedNodes.add(node);
+  }
+
+  /**
+   * Run Tarjan's algorithm for finding strongly connected components. After invoking this method,
+   * the detected cycles with be listed in the class variable {@code cycles}.
+   */
+  public void detectCycles() {
+    if (!this.cycleAnalysisDone) {
+      this.index = 0;
+      this.stack = new Stack<>();
+      this.cycles = new ArrayList<>();
+      this.nodes()
+          .forEach(
+              it -> {
+                this.annotations.get(it).index = -1;
+              });
+      for (T node : this.nodes()) {
+        if (this.annotations.get(node).index == -1) {
+          this.strongConnect(node);
         }
+      }
+      this.cycleAnalysisDone = true;
+      stack = null;
     }
-    
-    /**
-     * Return the nodes of this graph in reverse topological order. Each node
-     * in the returned list is succeeded by the nodes that it depends on.
-     */
-    public List<T> nodesInReverseTopologicalOrder() {
-        this.sortNodes();
-        return this.sortedNodes;
+  }
+
+  /** Report whether this graph has any cycles in it. */
+  public boolean hasCycles() {
+    this.detectCycles();
+    return this.cycles.size() > 0;
+  }
+
+  /** Return a list of strongly connected components that exist in this graph. */
+  public List<Set<T>> getCycles() {
+    this.detectCycles();
+    return this.cycles;
+  }
+
+  /**
+   * Traverse the graph to visit unvisited dependencies and determine whether they are part of a
+   * cycle.
+   */
+  public void strongConnect(T node) {
+    NodeAnnotation annotation = this.annotations.get(node);
+    annotation.index = this.index;
+    annotation.lowLink = this.index;
+    annotation.onStack = true;
+    this.index++;
+    this.stack.push(node);
+    for (T dep : this.getUpstreamAdjacentNodes(node)) {
+      NodeAnnotation depAnnotation = this.annotations.get(dep);
+      if (depAnnotation.onStack) {
+        annotation.lowLink = Math.min(annotation.lowLink, depAnnotation.index);
+        if (node.equals(dep)) {
+          annotation.selfLoop = true;
+        }
+      } else if (depAnnotation.index == -1) {
+        strongConnect(dep);
+        annotation.lowLink = Math.min(annotation.lowLink, depAnnotation.lowLink);
+      }
     }
-    
-    /**
-     * Return the nodes of this graph in reverse topological order. Each node
-     * in the returned list is preceded by the nodes that it depends on.
-     */
-    public List<T> nodesInTopologicalOrder() {
-        this.sortNodes();
-        return ListExtensions.reverse(this.sortedNodes);
+
+    if (annotation.lowLink == annotation.index) {
+      Set<T> scc = new LinkedHashSet<>();
+      T dep = null;
+      do {
+        dep = this.stack.pop();
+        this.annotations.get(dep).onStack = false;
+        scc.add(dep);
+      } while (!node.equals(dep));
+      // Only report self loops or cycles with two or more nodes.
+      if (scc.size() > 1 || annotation.selfLoop) {
+        this.cycles.add(scc);
+      }
     }
+  }
+
+  /**
+   * Return the nodes of this graph in reverse topological order. Each node in the returned list is
+   * succeeded by the nodes that it depends on.
+   */
+  public List<T> nodesInReverseTopologicalOrder() {
+    this.sortNodes();
+    return this.sortedNodes;
+  }
+
+  /**
+   * Return the nodes of this graph in reverse topological order. Each node in the returned list is
+   * preceded by the nodes that it depends on.
+   */
+  public List<T> nodesInTopologicalOrder() {
+    this.sortNodes();
+    return ListExtensions.reverse(this.sortedNodes);
+  }
 }
diff --git a/org.lflang/src/org/lflang/graph/TopologyGraph.java b/org.lflang/src/org/lflang/graph/TopologyGraph.java
index c680c5f7e1..300d09048f 100644
--- a/org.lflang/src/org/lflang/graph/TopologyGraph.java
+++ b/org.lflang/src/org/lflang/graph/TopologyGraph.java
@@ -1,16 +1,16 @@
 /*************
  * Copyright (c) 2020, The University of California at Berkeley.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  * this list of conditions and the following disclaimer.
- * 
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  * this list of conditions and the following disclaimer in the documentation
  * and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -28,7 +28,6 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-
 import org.lflang.generator.NamedInstance;
 import org.lflang.generator.PortInstance;
 import org.lflang.generator.ReactionInstance;
@@ -39,138 +38,139 @@
 import org.lflang.lf.Variable;
 
 /**
- * A graph with vertices that are ports or reactions and edges that denote
- * dependencies between them.
- * 
- * NOTE: This is not used anywhere anymore, but we keep it in case this particular
- * graph structure proves useful in the future.
- * 
+ * A graph with vertices that are ports or reactions and edges that denote dependencies between
+ * them.
+ *
+ * <p>NOTE: This is not used anywhere anymore, but we keep it in case this particular graph
+ * structure proves useful in the future.
+ *
  * @author Marten Lohstroh
  */
 public class TopologyGraph extends PrecedenceGraph<NamedInstance<?>> {
 
-    /**
-     * Construct a graph with vertices that are reactions or ports and edges
-     * that represent (zero-delay) dependencies.
-     * 
-     * After constructing the graph, run Tarjan's algorithm to detect cyclic
-     * dependencies between reactions. It is assumed that no instantiation
-     * cycles are present in the program. Checks for instantiation cycles thus
-     * must be carried out prior to constructing this graph.
-     * 
-     * @param reactors The reactor instances to construct the graph for.
-     */
-    public TopologyGraph(Collection<? extends ReactorInstance> reactors) {
-        for (var r : reactors) {
-            collectNodesFrom(r);
-        }
-        this.detectCycles();
+  /**
+   * Construct a graph with vertices that are reactions or ports and edges that represent
+   * (zero-delay) dependencies.
+   *
+   * <p>After constructing the graph, run Tarjan's algorithm to detect cyclic dependencies between
+   * reactions. It is assumed that no instantiation cycles are present in the program. Checks for
+   * instantiation cycles thus must be carried out prior to constructing this graph.
+   *
+   * @param reactors The reactor instances to construct the graph for.
+   */
+  public TopologyGraph(Collection<? extends ReactorInstance> reactors) {
+    for (var r : reactors) {
+      collectNodesFrom(r);
     }
+    this.detectCycles();
+  }
 
-    /** See description on other constructor. */
-    public TopologyGraph(ReactorInstance... reactors) {
-        this(Arrays.asList(reactors));
-    }
+  /** See description on other constructor. */
+  public TopologyGraph(ReactorInstance... reactors) {
+    this(Arrays.asList(reactors));
+  }
 
-    /**
-     * Build the graph by recursively visiting reactor instances contained in
-     * the passed in reactor instance.
-     * 
-     * @param reactor A reactor instance to harvest dependencies from.
-     */
-    public void collectNodesFrom(ReactorInstance reactor) {
-        ReactionInstance previousReaction = null;
-        for (var reaction : reactor.reactions) {
-            this.addNode(reaction);
+  /**
+   * Build the graph by recursively visiting reactor instances contained in the passed in reactor
+   * instance.
+   *
+   * @param reactor A reactor instance to harvest dependencies from.
+   */
+  public void collectNodesFrom(ReactorInstance reactor) {
+    ReactionInstance previousReaction = null;
+    for (var reaction : reactor.reactions) {
+      this.addNode(reaction);
 
-            this.addSources(reaction);
-            this.addEffects(reaction);
+      this.addSources(reaction);
+      this.addEffects(reaction);
 
-            // If there is an earlier reaction in this same reactor, then
-            // create a link in the reaction graph.
-            if (previousReaction != null) {
-                this.addEdge(reaction, previousReaction);
-            }
-            previousReaction = reaction;
-        }
-        // Recursively add nodes and edges from contained reactors.
-        for (var child : reactor.children) {
-            collectNodesFrom(child);
-        }
+      // If there is an earlier reaction in this same reactor, then
+      // create a link in the reaction graph.
+      if (previousReaction != null) {
+        this.addEdge(reaction, previousReaction);
+      }
+      previousReaction = reaction;
     }
+    // Recursively add nodes and edges from contained reactors.
+    for (var child : reactor.children) {
+      collectNodesFrom(child);
+    }
+  }
 
-    /**
-     * Given a reaction instance, record dependencies implied by its effects.
-     * 
-     * Excluded from the recorded dependencies are those that are broken by
-     * physical connections or "after" delays.
-     * 
-     * @param reaction The reaction to record the dependencies of.
-     */
-    private void addEffects(ReactionInstance reaction) {
-        for (TriggerInstance<? extends Variable> effect : reaction.effects) {
-            if (effect instanceof PortInstance) {
-                addEdge(effect, reaction);
-                PortInstance orig = (PortInstance) effect;
-                for (SendRange sendRange : orig.getDependentPorts()) {
-                    sendRange.destinations.forEach(dest -> {
-                        recordDependency(reaction, orig, dest.instance, sendRange.connection);
-                    });
-                }
-            }
+  /**
+   * Given a reaction instance, record dependencies implied by its effects.
+   *
+   * <p>Excluded from the recorded dependencies are those that are broken by physical connections or
+   * "after" delays.
+   *
+   * @param reaction The reaction to record the dependencies of.
+   */
+  private void addEffects(ReactionInstance reaction) {
+    for (TriggerInstance<? extends Variable> effect : reaction.effects) {
+      if (effect instanceof PortInstance) {
+        addEdge(effect, reaction);
+        PortInstance orig = (PortInstance) effect;
+        for (SendRange sendRange : orig.getDependentPorts()) {
+          sendRange.destinations.forEach(
+              dest -> {
+                recordDependency(reaction, orig, dest.instance, sendRange.connection);
+              });
         }
+      }
     }
+  }
 
-    /**
-     * Given a reaction instance, record dependencies implied by its sources.
-     * 
-     * Excluded from the recorded dependencies are those that are broken by
-     * physical connections or "after" delays.
-     * 
-     * @param reaction The reaction to record the dependencies of.
-     */
-    private void addSources(ReactionInstance reaction) {
-        for (TriggerInstance<? extends Variable> source : reaction.sources) {
-            if (source instanceof PortInstance) {
-                addEdge(reaction, source);
-                PortInstance dest = (PortInstance) source;
-                dest.getDependsOnPorts().forEach(orig -> {
-                    // FIXME: Don't have connection information here, hence the null argument.
-                    // This will like result in invalid cycle detection.
-                    recordDependency(reaction, orig.instance, dest, null);
+  /**
+   * Given a reaction instance, record dependencies implied by its sources.
+   *
+   * <p>Excluded from the recorded dependencies are those that are broken by physical connections or
+   * "after" delays.
+   *
+   * @param reaction The reaction to record the dependencies of.
+   */
+  private void addSources(ReactionInstance reaction) {
+    for (TriggerInstance<? extends Variable> source : reaction.sources) {
+      if (source instanceof PortInstance) {
+        addEdge(reaction, source);
+        PortInstance dest = (PortInstance) source;
+        dest.getDependsOnPorts()
+            .forEach(
+                orig -> {
+                  // FIXME: Don't have connection information here, hence the null argument.
+                  // This will like result in invalid cycle detection.
+                  recordDependency(reaction, orig.instance, dest, null);
                 });
-            }
-        }
+      }
     }
+  }
 
-    /**
-     * Record a dependency between two port instances, but only if there is a
-     * zero-delay path from origin to destination.
-     * 
-     * @param reaction A reaction that has one of the given ports as a source or
-     *                 effect.
-     * @param orig     The upstream port.
-     * @param dest     The downstream port.
-     * @param connection The connection creating this dependency or null if not
-     *  created by a connection.
-     */
-    private void recordDependency(ReactionInstance reaction, PortInstance orig,
-            PortInstance dest, Connection connection) {
-        if (!dependencyBroken(connection)) {
-            addEdge(dest, orig);
-        }
+  /**
+   * Record a dependency between two port instances, but only if there is a zero-delay path from
+   * origin to destination.
+   *
+   * @param reaction A reaction that has one of the given ports as a source or effect.
+   * @param orig The upstream port.
+   * @param dest The downstream port.
+   * @param connection The connection creating this dependency or null if not created by a
+   *     connection.
+   */
+  private void recordDependency(
+      ReactionInstance reaction, PortInstance orig, PortInstance dest, Connection connection) {
+    if (!dependencyBroken(connection)) {
+      addEdge(dest, orig);
     }
+  }
 
-    /**
-     * Report whether or not the given connection breaks dependencies or not.
-     * 
-     * @param c An AST object that represents a connection.
-     * @return true if the connection is physical or has a delay.
-     */
-    private boolean dependencyBroken(Connection c) {
-        if (c != null && (c.isPhysical() || c.getDelay() != null)) {
-            return true;
-        }
-        return false;
+  /**
+   * Report whether or not the given connection breaks dependencies or not.
+   *
+   * @param c An AST object that represents a connection.
+   * @return true if the connection is physical or has a delay.
+   */
+  private boolean dependencyBroken(Connection c) {
+    if (c != null && (c.isPhysical() || c.getDelay() != null)) {
+      return true;
     }
+    return false;
+  }
 }
diff --git a/org.lflang/src/org/lflang/ide/LFIdeModule.java b/org.lflang/src/org/lflang/ide/LFIdeModule.java
index 6c63d9c6e0..81aa863bd1 100644
--- a/org.lflang/src/org/lflang/ide/LFIdeModule.java
+++ b/org.lflang/src/org/lflang/ide/LFIdeModule.java
@@ -3,9 +3,5 @@
  */
 package org.lflang.ide;
 
-
-/**
- * Use this class to register ide components.
- */
-public class LFIdeModule extends AbstractLFIdeModule {
-}
+/** Use this class to register ide components. */
+public class LFIdeModule extends AbstractLFIdeModule {}
diff --git a/org.lflang/src/org/lflang/ide/LFIdeSetup.java b/org.lflang/src/org/lflang/ide/LFIdeSetup.java
index 2e6b969952..7465bda78b 100644
--- a/org.lflang/src/org/lflang/ide/LFIdeSetup.java
+++ b/org.lflang/src/org/lflang/ide/LFIdeSetup.java
@@ -6,17 +6,14 @@
 import org.lflang.LFRuntimeModule;
 import org.lflang.LFStandaloneSetup;
 
-/**
- * Initialization support for running Xtext languages as language servers.
- */
+/** Initialization support for running Xtext languages as language servers. */
 public class LFIdeSetup extends LFStandaloneSetup {
 
-	public LFIdeSetup() {
-		super(new LFRuntimeModule(), new LFIdeModule());
-	}
-
-	public static void doSetup() {
-		new LFIdeSetup().createInjectorAndDoEMFRegistration();
-	}
+  public LFIdeSetup() {
+    super(new LFRuntimeModule(), new LFIdeModule());
+  }
 
+  public static void doSetup() {
+    new LFIdeSetup().createInjectorAndDoEMFRegistration();
+  }
 }
diff --git a/org.lflang/src/org/lflang/scoping/LFGlobalScopeProvider.java b/org.lflang/src/org/lflang/scoping/LFGlobalScopeProvider.java
index 119ccae842..18c7a3a8af 100644
--- a/org.lflang/src/org/lflang/scoping/LFGlobalScopeProvider.java
+++ b/org.lflang/src/org/lflang/scoping/LFGlobalScopeProvider.java
@@ -25,134 +25,121 @@
 import com.google.common.base.Splitter;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
-
 import java.util.LinkedHashSet;
 import java.util.Set;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.EcoreUtil2;
 import org.eclipse.xtext.resource.IResourceDescription;
 import org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider;
 import org.eclipse.xtext.util.IResourceScopeCache;
-
-import org.lflang.lf.LfPackage;
 import org.lflang.LFResourceDescriptionStrategy;
+import org.lflang.lf.LfPackage;
 
 /**
- * Global scope provider that limits access to only those files that were
- * explicitly imported.
- * <p>
- * Adapted from from Xtext manual, Chapter 8.7.
+ * Global scope provider that limits access to only those files that were explicitly imported.
+ *
+ * <p>Adapted from from Xtext manual, Chapter 8.7.
  *
  * @author Marten Lohstroh
- * @see <a href="https://www.eclipse.org/Xtext/documentation/2.6.0/Xtext%20Documentation.pdf">xtext doc</a>
+ * @see <a href="https://www.eclipse.org/Xtext/documentation/2.6.0/Xtext%20Documentation.pdf">xtext
+ *     doc</a>
  */
 public class LFGlobalScopeProvider extends ImportUriGlobalScopeProvider {
 
-    /**
-     * Splitter used to process user-data annotations of Model nodes.
-     */
-    static final Splitter SPLITTER = Splitter.on(LFResourceDescriptionStrategy.DELIMITER);
-
-    static final String IMPORTED_URIS = "IMPORTED_URIS";
-
-    static final String IMPORTED_RESOURCES = "IMPORTED_RESOURCES";
-
-    @Inject
-    private IResourceDescription.Manager descriptionManager;
-
-    @Inject
-    private IResourceScopeCache cache;
-
-    /**
-     * Return the set of URI objects pointing to the resources that must be
-     * included for compilation.
-     */
-    @Override
-    protected LinkedHashSet<URI> getImportedUris(Resource resource) {
-        return cache.get(IMPORTED_URIS, resource,
-                         new Provider<LinkedHashSet<URI>>() {
-                             /**
-                              * Collect unique URIs in case the cache is not populated yet.
-                              */
-                             @Override
-                             public LinkedHashSet<URI> get() {
-                                 var uniqueImportURIs = new LinkedHashSet<URI>(5);
-                                 collectImportUris(resource, uniqueImportURIs);
-                                 uniqueImportURIs.removeIf(uri -> !EcoreUtil2.isValidUri(resource, uri));
-                                 return uniqueImportURIs;
-                             }
-
-                             /**
-                              * Helper method to recursively collect unique URIs.
-                              */
-                             void collectImportUris(Resource resource, LinkedHashSet<URI> uniqueImportURIs) {
-                                 for (var imported : getImportedResources(resource, uniqueImportURIs)) {
-                                     collectImportUris(imported, uniqueImportURIs);
-                                 }
-                             }
-                         });
-    }
-
-    /**
-     * Return the resources imported by the given resource.
-     */
-    public Set<Resource> getImportedResources(Resource resource) {
-        return cache.get(IMPORTED_RESOURCES, resource, () -> getImportedResources(resource, null));
-    }
-
-    /**
-     * Resolve a resource identifier.
-     *
-     * @param uriStr   resource identifier to resolve.
-     * @param resource resource to (initially) resolve it relative to.
-     */
-    protected URI resolve(String uriStr, Resource resource) {
-        var uriObj = URI.createURI(uriStr);
-        if (uriObj != null && "lf".equalsIgnoreCase(uriObj.fileExtension())) {
-            // FIXME: If this doesn't work, try other things:
-            // (1) Look for a .project file up the file structure and try to
-            // resolve relative to the directory in which it is found.
-            // (2) Look for package description files try to resolve relative
-            // to the paths it includes.
-            // FIXME: potentially use a cache here to speed things up.
-            // See OnChangeEvictingCache
-            return uriObj.resolve(resource.getURI());
-        }
-        return null;
+  /** Splitter used to process user-data annotations of Model nodes. */
+  static final Splitter SPLITTER = Splitter.on(LFResourceDescriptionStrategy.DELIMITER);
+
+  static final String IMPORTED_URIS = "IMPORTED_URIS";
+
+  static final String IMPORTED_RESOURCES = "IMPORTED_RESOURCES";
+
+  @Inject private IResourceDescription.Manager descriptionManager;
+
+  @Inject private IResourceScopeCache cache;
+
+  /**
+   * Return the set of URI objects pointing to the resources that must be included for compilation.
+   */
+  @Override
+  protected LinkedHashSet<URI> getImportedUris(Resource resource) {
+    return cache.get(
+        IMPORTED_URIS,
+        resource,
+        new Provider<LinkedHashSet<URI>>() {
+          /** Collect unique URIs in case the cache is not populated yet. */
+          @Override
+          public LinkedHashSet<URI> get() {
+            var uniqueImportURIs = new LinkedHashSet<URI>(5);
+            collectImportUris(resource, uniqueImportURIs);
+            uniqueImportURIs.removeIf(uri -> !EcoreUtil2.isValidUri(resource, uri));
+            return uniqueImportURIs;
+          }
+
+          /** Helper method to recursively collect unique URIs. */
+          void collectImportUris(Resource resource, LinkedHashSet<URI> uniqueImportURIs) {
+            for (var imported : getImportedResources(resource, uniqueImportURIs)) {
+              collectImportUris(imported, uniqueImportURIs);
+            }
+          }
+        });
+  }
+
+  /** Return the resources imported by the given resource. */
+  public Set<Resource> getImportedResources(Resource resource) {
+    return cache.get(IMPORTED_RESOURCES, resource, () -> getImportedResources(resource, null));
+  }
+
+  /**
+   * Resolve a resource identifier.
+   *
+   * @param uriStr resource identifier to resolve.
+   * @param resource resource to (initially) resolve it relative to.
+   */
+  protected URI resolve(String uriStr, Resource resource) {
+    var uriObj = URI.createURI(uriStr);
+    if (uriObj != null && "lf".equalsIgnoreCase(uriObj.fileExtension())) {
+      // FIXME: If this doesn't work, try other things:
+      // (1) Look for a .project file up the file structure and try to
+      // resolve relative to the directory in which it is found.
+      // (2) Look for package description files try to resolve relative
+      // to the paths it includes.
+      // FIXME: potentially use a cache here to speed things up.
+      // See OnChangeEvictingCache
+      return uriObj.resolve(resource.getURI());
     }
-
-    /**
-     * Return the resources imported by a given resource, excluding those
-     * already discovered and therefore are present in the given set of
-     * import URIs.
-     *
-     * @param resource         The resource to analyze.
-     * @param uniqueImportURIs The set of discovered import URIs
-     */
-    protected Set<Resource> getImportedResources(Resource resource, LinkedHashSet<URI> uniqueImportURIs) {
-        var resourceDescription = descriptionManager.getResourceDescription(resource);
-        var models = resourceDescription.getExportedObjectsByType(LfPackage.Literals.MODEL);
-        var resources = new LinkedHashSet<Resource>();
-        for (var model : models) {
-            var userData = model.getUserData(LFResourceDescriptionStrategy.INCLUDES);
-            if (userData != null) {
-                for (String uri : SPLITTER.split(userData)) {// Attempt to resolve the URI
-                    var includedUri = this.resolve(uri, resource);
-                    if (includedUri != null) {
-                        try {
-                            if (uniqueImportURIs == null || uniqueImportURIs.add(includedUri)) {
-                                resources.add(resource.getResourceSet().getResource(includedUri, true));
-                            }
-                        } catch (RuntimeException e) {
-                            System.err.println("Unable to import " + includedUri + ": " + e.getMessage());
-                        }
-                    }
-
-                }
+    return null;
+  }
+
+  /**
+   * Return the resources imported by a given resource, excluding those already discovered and
+   * therefore are present in the given set of import URIs.
+   *
+   * @param resource The resource to analyze.
+   * @param uniqueImportURIs The set of discovered import URIs
+   */
+  protected Set<Resource> getImportedResources(
+      Resource resource, LinkedHashSet<URI> uniqueImportURIs) {
+    var resourceDescription = descriptionManager.getResourceDescription(resource);
+    var models = resourceDescription.getExportedObjectsByType(LfPackage.Literals.MODEL);
+    var resources = new LinkedHashSet<Resource>();
+    for (var model : models) {
+      var userData = model.getUserData(LFResourceDescriptionStrategy.INCLUDES);
+      if (userData != null) {
+        for (String uri : SPLITTER.split(userData)) { // Attempt to resolve the URI
+          var includedUri = this.resolve(uri, resource);
+          if (includedUri != null) {
+            try {
+              if (uniqueImportURIs == null || uniqueImportURIs.add(includedUri)) {
+                resources.add(resource.getResourceSet().getResource(includedUri, true));
+              }
+            } catch (RuntimeException e) {
+              System.err.println("Unable to import " + includedUri + ": " + e.getMessage());
             }
+          }
         }
-        return resources;
+      }
     }
+    return resources;
+  }
 }
diff --git a/org.lflang/src/org/lflang/scoping/LFScopeProvider.java b/org.lflang/src/org/lflang/scoping/LFScopeProvider.java
index 9967ddaabe..6a303b0eaf 100644
--- a/org.lflang/src/org/lflang/scoping/LFScopeProvider.java
+++ b/org.lflang/src/org/lflang/scoping/LFScopeProvider.java
@@ -3,13 +3,10 @@
  */
 package org.lflang.scoping;
 
-
 /**
  * This class contains custom scoping description.
- * 
- * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#scoping
- * on how and when to use it.
+ *
+ * <p>See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#scoping on how and
+ * when to use it.
  */
-public class LFScopeProvider extends LFScopeProviderImpl {
-
-}
+public class LFScopeProvider extends LFScopeProviderImpl {}
diff --git a/org.lflang/src/org/lflang/scoping/LFScopeProviderImpl.java b/org.lflang/src/org/lflang/scoping/LFScopeProviderImpl.java
index 0e521e8cc4..c5cbea4e7e 100644
--- a/org.lflang/src/org/lflang/scoping/LFScopeProviderImpl.java
+++ b/org.lflang/src/org/lflang/scoping/LFScopeProviderImpl.java
@@ -1,27 +1,27 @@
 /*************
-Copyright (c) 2020, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2020, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 
 package org.lflang.scoping;
 
@@ -29,16 +29,13 @@
 import static org.lflang.ast.ASTUtils.*;
 
 import com.google.inject.Inject;
-
 import java.util.ArrayList;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.xtext.naming.SimpleNameProvider;
 import org.eclipse.xtext.scoping.IScope;
 import org.eclipse.xtext.scoping.Scopes;
 import org.eclipse.xtext.scoping.impl.SelectableBasedScope;
-
 import org.lflang.lf.Assignment;
 import org.lflang.lf.Connection;
 import org.lflang.lf.Deadline;
@@ -63,220 +60,220 @@
  */
 public class LFScopeProviderImpl extends AbstractLFScopeProvider {
 
-    @Inject
-    private SimpleNameProvider nameProvider;
+  @Inject private SimpleNameProvider nameProvider;
 
-    @Inject
-    private LFGlobalScopeProvider scopeProvider;
+  @Inject private LFGlobalScopeProvider scopeProvider;
 
-    /**
-     * Enumerate of the kinds of references.
-     */
-    enum RefType {
-        NULL,
-        TRIGGER,
-        SOURCE,
-        EFFECT,
-        WATCHDOG,
-        DEADLINE,
-        CLEFT,
-        CRIGHT
-    }
+  /** Enumerate of the kinds of references. */
+  enum RefType {
+    NULL,
+    TRIGGER,
+    SOURCE,
+    EFFECT,
+    WATCHDOG,
+    DEADLINE,
+    CLEFT,
+    CRIGHT
+  }
 
-    /**
-     * Depending on the provided context, construct the appropriate scope
-     * for the given reference.
-     *
-     * @param context   The AST node in which a to-be-resolved reference occurs.
-     * @param reference The reference to resolve.
-     */
-    @Override
-    public IScope getScope(EObject context, EReference reference) {
-        if (context instanceof VarRef) {
-            return getScopeForVarRef((VarRef) context, reference);
-        } else if (context instanceof Assignment) {
-            return getScopeForAssignment((Assignment) context, reference);
-        } else if (context instanceof Instantiation) {
-            return getScopeForReactorDecl(context, reference);
-        } else if (context instanceof Reactor) {
-            return getScopeForReactorDecl(context, reference);
-        } else if (context instanceof ImportedReactor) {
-            return getScopeForImportedReactor((ImportedReactor) context, reference);
-        }
-        return super.getScope(context, reference);
+  /**
+   * Depending on the provided context, construct the appropriate scope for the given reference.
+   *
+   * @param context The AST node in which a to-be-resolved reference occurs.
+   * @param reference The reference to resolve.
+   */
+  @Override
+  public IScope getScope(EObject context, EReference reference) {
+    if (context instanceof VarRef) {
+      return getScopeForVarRef((VarRef) context, reference);
+    } else if (context instanceof Assignment) {
+      return getScopeForAssignment((Assignment) context, reference);
+    } else if (context instanceof Instantiation) {
+      return getScopeForReactorDecl(context, reference);
+    } else if (context instanceof Reactor) {
+      return getScopeForReactorDecl(context, reference);
+    } else if (context instanceof ImportedReactor) {
+      return getScopeForImportedReactor((ImportedReactor) context, reference);
     }
+    return super.getScope(context, reference);
+  }
 
-    /**
-     * Filter out candidates that do not originate from the file listed in
-     * this particular import statement.
-     */
-    protected IScope getScopeForImportedReactor(ImportedReactor context, EReference reference) {
-        String importURI = ((Import) context.eContainer()).getImportURI();
-        var importedURI = scopeProvider.resolve(importURI == null ? "" : importURI, context.eResource());
-        if (importedURI != null) {
-            var uniqueImportURIs = scopeProvider.getImportedUris(context.eResource());
-            var descriptions = scopeProvider.getResourceDescriptions(context.eResource(), uniqueImportURIs);
-            var description = descriptions.getResourceDescription(importedURI);
-            return SelectableBasedScope.createScope(IScope.NULLSCOPE, description, null, reference.getEReferenceType(), false);
-        }
-        return Scopes.scopeFor(emptyList());
+  /**
+   * Filter out candidates that do not originate from the file listed in this particular import
+   * statement.
+   */
+  protected IScope getScopeForImportedReactor(ImportedReactor context, EReference reference) {
+    String importURI = ((Import) context.eContainer()).getImportURI();
+    var importedURI =
+        scopeProvider.resolve(importURI == null ? "" : importURI, context.eResource());
+    if (importedURI != null) {
+      var uniqueImportURIs = scopeProvider.getImportedUris(context.eResource());
+      var descriptions =
+          scopeProvider.getResourceDescriptions(context.eResource(), uniqueImportURIs);
+      var description = descriptions.getResourceDescription(importedURI);
+      return SelectableBasedScope.createScope(
+          IScope.NULLSCOPE, description, null, reference.getEReferenceType(), false);
     }
+    return Scopes.scopeFor(emptyList());
+  }
 
-    /**
-     * @param obj       Instantiation or Reactor that has a ReactorDecl to resolve.
-     * @param reference The reference to link to a ReactorDecl node.
-     */
-    protected IScope getScopeForReactorDecl(EObject obj, EReference reference) {
+  /**
+   * @param obj Instantiation or Reactor that has a ReactorDecl to resolve.
+   * @param reference The reference to link to a ReactorDecl node.
+   */
+  protected IScope getScopeForReactorDecl(EObject obj, EReference reference) {
 
-        // Find the local Model
-        Model model = null;
-        EObject container = obj;
-        while(model == null && container != null) {
-            container = container.eContainer();
-            if (container instanceof Model) {
-                model = (Model)container;
-            }
-        }
-        if (model == null) {
-            return Scopes.scopeFor(emptyList());
-        }
+    // Find the local Model
+    Model model = null;
+    EObject container = obj;
+    while (model == null && container != null) {
+      container = container.eContainer();
+      if (container instanceof Model) {
+        model = (Model) container;
+      }
+    }
+    if (model == null) {
+      return Scopes.scopeFor(emptyList());
+    }
 
-        // Collect eligible candidates, all of which are local (i.e., not in other files).
-        var locals = new ArrayList<ReactorDecl>(model.getReactors());
+    // Collect eligible candidates, all of which are local (i.e., not in other files).
+    var locals = new ArrayList<ReactorDecl>(model.getReactors());
 
-        // Either point to the import statement (if it is renamed)
-        // or directly to the reactor definition.
-        for (Import it : model.getImports()) {
-            for (ImportedReactor ir : it.getReactorClasses()) {
-                if (ir.getName() != null) {
-                    locals.add(ir);
-                } else if (ir.getReactorClass() != null) {
-                    locals.add(ir.getReactorClass());
-                }
-            }
+    // Either point to the import statement (if it is renamed)
+    // or directly to the reactor definition.
+    for (Import it : model.getImports()) {
+      for (ImportedReactor ir : it.getReactorClasses()) {
+        if (ir.getName() != null) {
+          locals.add(ir);
+        } else if (ir.getReactorClass() != null) {
+          locals.add(ir.getReactorClass());
         }
-        return Scopes.scopeFor(locals);
+      }
     }
+    return Scopes.scopeFor(locals);
+  }
 
-    protected IScope getScopeForAssignment(Assignment assignment, EReference reference) {
+  protected IScope getScopeForAssignment(Assignment assignment, EReference reference) {
 
-        if (reference == LfPackage.Literals.ASSIGNMENT__LHS) {
-            var defn = toDefinition(((Instantiation) assignment.eContainer()).getReactorClass());
-            if (defn != null) {
-                return Scopes.scopeFor(allParameters(defn));
-            }
-        }
-        if (reference == LfPackage.Literals.ASSIGNMENT__RHS) {
-            return Scopes.scopeFor(((Reactor) assignment.eContainer().eContainer()).getParameters());
-        }
-        return Scopes.scopeFor(emptyList());
+    if (reference == LfPackage.Literals.ASSIGNMENT__LHS) {
+      var defn = toDefinition(((Instantiation) assignment.eContainer()).getReactorClass());
+      if (defn != null) {
+        return Scopes.scopeFor(allParameters(defn));
+      }
+    }
+    if (reference == LfPackage.Literals.ASSIGNMENT__RHS) {
+      return Scopes.scopeFor(((Reactor) assignment.eContainer().eContainer()).getParameters());
     }
+    return Scopes.scopeFor(emptyList());
+  }
 
-    protected IScope getScopeForVarRef(VarRef variable, EReference reference) {
-        if (reference == LfPackage.Literals.VAR_REF__VARIABLE) {
-            // Resolve hierarchical reference
-            Reactor reactor;
-            Mode mode = null;
-            if (variable.eContainer().eContainer() instanceof Reactor) {
-                reactor = (Reactor) variable.eContainer().eContainer();
-            } else if (variable.eContainer().eContainer() instanceof Mode) {
-                mode = (Mode) variable.eContainer().eContainer();
-                reactor = (Reactor) variable.eContainer().eContainer().eContainer();
-            } else {
-                return Scopes.scopeFor(emptyList());
-            }
+  protected IScope getScopeForVarRef(VarRef variable, EReference reference) {
+    if (reference == LfPackage.Literals.VAR_REF__VARIABLE) {
+      // Resolve hierarchical reference
+      Reactor reactor;
+      Mode mode = null;
+      if (variable.eContainer().eContainer() instanceof Reactor) {
+        reactor = (Reactor) variable.eContainer().eContainer();
+      } else if (variable.eContainer().eContainer() instanceof Mode) {
+        mode = (Mode) variable.eContainer().eContainer();
+        reactor = (Reactor) variable.eContainer().eContainer().eContainer();
+      } else {
+        return Scopes.scopeFor(emptyList());
+      }
 
-            RefType type = getRefType(variable);
+      RefType type = getRefType(variable);
 
-            if (variable.getContainer() != null) { // Resolve hierarchical port reference
-                var instanceName = nameProvider.getFullyQualifiedName(variable.getContainer());
-                var instances = new ArrayList<Instantiation>(reactor.getInstantiations());
-                if (mode != null) {
-                    instances.addAll(mode.getInstantiations());
-                }
+      if (variable.getContainer() != null) { // Resolve hierarchical port reference
+        var instanceName = nameProvider.getFullyQualifiedName(variable.getContainer());
+        var instances = new ArrayList<Instantiation>(reactor.getInstantiations());
+        if (mode != null) {
+          instances.addAll(mode.getInstantiations());
+        }
 
-                if (instanceName != null) {
-                    for (var instance : instances) {
-                        var defn = toDefinition(instance.getReactorClass());
-                        if (defn != null && instance.getName().equals(instanceName.toString())) {
-                            switch (type) {
-                            case TRIGGER:
-                            case SOURCE:
-                            case CLEFT:
-                                return Scopes.scopeFor(allOutputs(defn));
-                            case EFFECT:
-                            case DEADLINE:
-                            case CRIGHT:
-                                return Scopes.scopeFor(allInputs(defn));
-                            }
-                        }
-                    }
-                }
-                return Scopes.scopeFor(emptyList());
-            } else {
-                // Resolve local reference
-                switch (type) {
-                case TRIGGER: {
-                    var candidates = new ArrayList<EObject>();
-                    if (mode != null) {
-                        candidates.addAll(mode.getActions());
-                        candidates.addAll(mode.getTimers());
-                    }
-                    candidates.addAll(allInputs(reactor));
-                    candidates.addAll(allActions(reactor));
-                    candidates.addAll(allTimers(reactor));
-                    candidates.addAll(allWatchdogs(reactor));
-                    return Scopes.scopeFor(candidates);
-                }
+        if (instanceName != null) {
+          for (var instance : instances) {
+            var defn = toDefinition(instance.getReactorClass());
+            if (defn != null && instance.getName().equals(instanceName.toString())) {
+              switch (type) {
+                case TRIGGER:
                 case SOURCE:
-                    return super.getScope(variable, reference);
-                case EFFECT: {
-                    var candidates = new ArrayList<EObject>();
-                    if (mode != null) {
-                        candidates.addAll(mode.getActions());
-                        candidates.addAll(reactor.getModes());
-                    }
-                    candidates.addAll(allOutputs(reactor));
-                    candidates.addAll(allActions(reactor));
-                    candidates.addAll(allWatchdogs(reactor));
-                    return Scopes.scopeFor(candidates);
-                }
-                case WATCHDOG:
-                    return Scopes.scopeFor(allWatchdogs(reactor));
-                case DEADLINE:
                 case CLEFT:
-                    return Scopes.scopeFor(allInputs(reactor));
+                  return Scopes.scopeFor(allOutputs(defn));
+                case EFFECT:
+                case DEADLINE:
                 case CRIGHT:
-                    return Scopes.scopeFor(allOutputs(reactor));
-                default:
-                    return Scopes.scopeFor(emptyList());
-                }
+                  return Scopes.scopeFor(allInputs(defn));
+              }
             }
-        } else { // Resolve instance
-            return super.getScope(variable, reference);
+          }
         }
-    }
-
-    private RefType getRefType(VarRef variable) {
-        if (variable.eContainer() instanceof Deadline) {
-            return RefType.DEADLINE;
-        } else if (variable.eContainer() instanceof Reaction) {
-            var reaction = (Reaction) variable.eContainer();
-            if (reaction.getTriggers().contains(variable)) {
-                return RefType.TRIGGER;
-            } else if (reaction.getSources().contains(variable)) {
-                return RefType.SOURCE;
-            } else if (reaction.getEffects().contains(variable)) {
-                return RefType.EFFECT;
+        return Scopes.scopeFor(emptyList());
+      } else {
+        // Resolve local reference
+        switch (type) {
+          case TRIGGER:
+            {
+              var candidates = new ArrayList<EObject>();
+              if (mode != null) {
+                candidates.addAll(mode.getActions());
+                candidates.addAll(mode.getTimers());
+              }
+              candidates.addAll(allInputs(reactor));
+              candidates.addAll(allActions(reactor));
+              candidates.addAll(allTimers(reactor));
+              candidates.addAll(allWatchdogs(reactor));
+              return Scopes.scopeFor(candidates);
             }
-        } else if (variable.eContainer() instanceof Connection) {
-            var conn = (Connection) variable.eContainer();
-            if (conn.getLeftPorts().contains(variable)) {
-                return RefType.CLEFT;
-            } else if (conn.getRightPorts().contains(variable)) {
-                return RefType.CRIGHT;
+          case SOURCE:
+            return super.getScope(variable, reference);
+          case EFFECT:
+            {
+              var candidates = new ArrayList<EObject>();
+              if (mode != null) {
+                candidates.addAll(mode.getActions());
+                candidates.addAll(reactor.getModes());
+              }
+              candidates.addAll(allOutputs(reactor));
+              candidates.addAll(allActions(reactor));
+              candidates.addAll(allWatchdogs(reactor));
+              return Scopes.scopeFor(candidates);
             }
+          case WATCHDOG:
+            return Scopes.scopeFor(allWatchdogs(reactor));
+          case DEADLINE:
+          case CLEFT:
+            return Scopes.scopeFor(allInputs(reactor));
+          case CRIGHT:
+            return Scopes.scopeFor(allOutputs(reactor));
+          default:
+            return Scopes.scopeFor(emptyList());
         }
-        return RefType.NULL;
+      }
+    } else { // Resolve instance
+      return super.getScope(variable, reference);
+    }
+  }
+
+  private RefType getRefType(VarRef variable) {
+    if (variable.eContainer() instanceof Deadline) {
+      return RefType.DEADLINE;
+    } else if (variable.eContainer() instanceof Reaction) {
+      var reaction = (Reaction) variable.eContainer();
+      if (reaction.getTriggers().contains(variable)) {
+        return RefType.TRIGGER;
+      } else if (reaction.getSources().contains(variable)) {
+        return RefType.SOURCE;
+      } else if (reaction.getEffects().contains(variable)) {
+        return RefType.EFFECT;
+      }
+    } else if (variable.eContainer() instanceof Connection) {
+      var conn = (Connection) variable.eContainer();
+      if (conn.getLeftPorts().contains(variable)) {
+        return RefType.CLEFT;
+      } else if (conn.getRightPorts().contains(variable)) {
+        return RefType.CRIGHT;
+      }
     }
+    return RefType.NULL;
+  }
 }
diff --git a/org.lflang/src/org/lflang/util/ArduinoUtil.java b/org.lflang/src/org/lflang/util/ArduinoUtil.java
index 85eac8ae8f..af741da7f2 100644
--- a/org.lflang/src/org/lflang/util/ArduinoUtil.java
+++ b/org.lflang/src/org/lflang/util/ArduinoUtil.java
@@ -5,123 +5,153 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.List;
-
+import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 import org.lflang.generator.GeneratorCommandFactory;
 import org.lflang.generator.LFGeneratorContext;
 
-import org.eclipse.xtext.xbase.lib.Exceptions;
-
 /**
  * Utilities for Building using Arduino CLI.
  *
- * We take in a Generator Context, Command Factory, and Error Reporter and 
- * make subsequent calls to arduino-cli given a FileConfig and TargetConfig.
- * 
- * This should be used immediately after CodeGen to compile if the user provides
- * a board type within their LF file. If the user also provides a port with flash enabled,
- * we will also attempt to upload the compiled sketch directly to the board.
+ * <p>We take in a Generator Context, Command Factory, and Error Reporter and make subsequent calls
+ * to arduino-cli given a FileConfig and TargetConfig.
+ *
+ * <p>This should be used immediately after CodeGen to compile if the user provides a board type
+ * within their LF file. If the user also provides a port with flash enabled, we will also attempt
+ * to upload the compiled sketch directly to the board.
  */
 public class ArduinoUtil {
 
-    private LFGeneratorContext context;
-    private GeneratorCommandFactory commandFactory;
-    private ErrorReporter errorReporter;
+  private LFGeneratorContext context;
+  private GeneratorCommandFactory commandFactory;
+  private ErrorReporter errorReporter;
 
-    public ArduinoUtil (LFGeneratorContext context, GeneratorCommandFactory commandFactory, ErrorReporter errorReporter) {
-        this.context = context;
-        this.commandFactory = commandFactory;
-        this.errorReporter = errorReporter;
-    }
+  public ArduinoUtil(
+      LFGeneratorContext context,
+      GeneratorCommandFactory commandFactory,
+      ErrorReporter errorReporter) {
+    this.context = context;
+    this.commandFactory = commandFactory;
+    this.errorReporter = errorReporter;
+  }
 
-    /**
-     * Return true if arduino-cli exists, false otherwise.
-     */
-    private boolean checkArduinoCLIExists() {
-        LFCommand checkCommand = LFCommand.get("arduino-cli", List.of("version"));
-        return checkCommand != null && checkCommand.run() == 0;
-    }
+  /** Return true if arduino-cli exists, false otherwise. */
+  private boolean checkArduinoCLIExists() {
+    LFCommand checkCommand = LFCommand.get("arduino-cli", List.of("version"));
+    return checkCommand != null && checkCommand.run() == 0;
+  }
 
-    /**
-     * Generate an LF style command for Arduino compilation based on FQBN
-     * @param fileConfig
-     * @param targetConfig
-     * @return LFCommand to compile an Arduino program given an FQBN.
-     * @throws IOException
-     */
-    private LFCommand arduinoCompileCommand(FileConfig fileConfig, TargetConfig targetConfig) throws IOException {
-        if (!checkArduinoCLIExists()) {
-            throw new IOException("Must have arduino-cli installed to auto-compile.");
-        } else {
-            var srcGenPath = fileConfig.getSrcGenPath();
-            try {
-                // Write to a temporary file to execute since ProcessBuilder does not like spaces and double quotes in its arguments.
-                File testScript = File.createTempFile("arduino", null);
-                testScript.deleteOnExit();
-                if (!testScript.setExecutable(true)) {
-                    throw new IOException("Failed to make compile script executable");
-                }
-                var fileWriter = new FileWriter(testScript.getAbsoluteFile(), true);
-                BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
-                String board = targetConfig.platformOptions.board != null ? targetConfig.platformOptions.board : "arduino:avr:leonardo";
-                String isThreaded = targetConfig.platformOptions.board.contains("mbed") ? "-DLF_THREADED" : "-DLF_UNTHREADED";
-                bufferedWriter.write("arduino-cli compile -b " + board + " --build-property " +
-                    "compiler.c.extra_flags=\"" + isThreaded + " -DPLATFORM_ARDUINO -DINITIAL_EVENT_QUEUE_SIZE=10 -DINITIAL_REACT_QUEUE_SIZE=10\" " +
-                    "--build-property compiler.cpp.extra_flags=\"" + isThreaded + " -DPLATFORM_ARDUINO -DINITIAL_EVENT_QUEUE_SIZE=10 -DINITIAL_REACT_QUEUE_SIZE=10\" "
-                    + srcGenPath.toString());
-                bufferedWriter.close();
-                return commandFactory.createCommand(
-                    testScript.getAbsolutePath(), List.of(), null);
-            } catch (IOException e) {
-               e.printStackTrace();
-               throw new IOException(e);
-            }
+  /**
+   * Generate an LF style command for Arduino compilation based on FQBN
+   *
+   * @param fileConfig
+   * @param targetConfig
+   * @return LFCommand to compile an Arduino program given an FQBN.
+   * @throws IOException
+   */
+  private LFCommand arduinoCompileCommand(FileConfig fileConfig, TargetConfig targetConfig)
+      throws IOException {
+    if (!checkArduinoCLIExists()) {
+      throw new IOException("Must have arduino-cli installed to auto-compile.");
+    } else {
+      var srcGenPath = fileConfig.getSrcGenPath();
+      try {
+        // Write to a temporary file to execute since ProcessBuilder does not like spaces and double
+        // quotes in its arguments.
+        File testScript = File.createTempFile("arduino", null);
+        testScript.deleteOnExit();
+        if (!testScript.setExecutable(true)) {
+          throw new IOException("Failed to make compile script executable");
         }
+        var fileWriter = new FileWriter(testScript.getAbsoluteFile(), true);
+        BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
+        String board =
+            targetConfig.platformOptions.board != null
+                ? targetConfig.platformOptions.board
+                : "arduino:avr:leonardo";
+        String isThreaded =
+            targetConfig.platformOptions.board.contains("mbed")
+                ? "-DLF_THREADED"
+                : "-DLF_UNTHREADED";
+        bufferedWriter.write(
+            "arduino-cli compile -b "
+                + board
+                + " --build-property "
+                + "compiler.c.extra_flags=\""
+                + isThreaded
+                + " -DPLATFORM_ARDUINO -DINITIAL_EVENT_QUEUE_SIZE=10"
+                + " -DINITIAL_REACT_QUEUE_SIZE=10\" --build-property compiler.cpp.extra_flags=\""
+                + isThreaded
+                + " -DPLATFORM_ARDUINO -DINITIAL_EVENT_QUEUE_SIZE=10"
+                + " -DINITIAL_REACT_QUEUE_SIZE=10\" "
+                + srcGenPath.toString());
+        bufferedWriter.close();
+        return commandFactory.createCommand(testScript.getAbsolutePath(), List.of(), null);
+      } catch (IOException e) {
+        e.printStackTrace();
+        throw new IOException(e);
+      }
     }
+  }
 
-    /**
-     * Compiles (and possibly auto-flashes) an Arduino program once code generation is completed.
-     * @param fileConfig
-     * @param targetConfig
-     */
-    public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
-        System.out.println("Retrieving Arduino Compile Script");
-        try {
-            LFCommand command = arduinoCompileCommand(fileConfig, targetConfig); // Use ProcessBuilder for finer control.
-            int retCode = 0;
-            retCode = command.run(context.getCancelIndicator());
-            if (retCode != 0 && context.getMode() == LFGeneratorContext.Mode.STANDALONE) {
-                errorReporter.reportError("arduino-cli failed with error code " + retCode);
-                throw new IOException("arduino-cli failure");
-            }
-        } catch (IOException e){
-            Exceptions.sneakyThrow(e);
+  /**
+   * Compiles (and possibly auto-flashes) an Arduino program once code generation is completed.
+   *
+   * @param fileConfig
+   * @param targetConfig
+   */
+  public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
+    System.out.println("Retrieving Arduino Compile Script");
+    try {
+      LFCommand command =
+          arduinoCompileCommand(fileConfig, targetConfig); // Use ProcessBuilder for finer control.
+      int retCode = 0;
+      retCode = command.run(context.getCancelIndicator());
+      if (retCode != 0 && context.getMode() == LFGeneratorContext.Mode.STANDALONE) {
+        errorReporter.reportError("arduino-cli failed with error code " + retCode);
+        throw new IOException("arduino-cli failure");
+      }
+    } catch (IOException e) {
+      Exceptions.sneakyThrow(e);
+    }
+    System.out.println(
+        "SUCCESS: Compiling generated code for " + fileConfig.name + " finished with no errors.");
+    if (targetConfig.platformOptions.flash) {
+      if (targetConfig.platformOptions.port != null) {
+        System.out.println("Invoking flash command for Arduino");
+        LFCommand flash =
+            commandFactory.createCommand(
+                "arduino-cli",
+                List.of(
+                    "upload",
+                    "-b",
+                    targetConfig.platformOptions.board,
+                    "-p",
+                    targetConfig.platformOptions.port),
+                fileConfig.getSrcGenPath());
+        if (flash == null) {
+          errorReporter.reportError("Could not create arduino-cli flash command.");
         }
-        System.out.println("SUCCESS: Compiling generated code for " + fileConfig.name + " finished with no errors.");
-        if (targetConfig.platformOptions.flash) {
-            if (targetConfig.platformOptions.port != null) {
-                System.out.println("Invoking flash command for Arduino");
-                LFCommand flash = commandFactory.createCommand(
-                    "arduino-cli", List.of("upload", "-b", targetConfig.platformOptions.board, "-p", targetConfig.platformOptions.port), fileConfig.getSrcGenPath());
-                if (flash == null) {
-                    errorReporter.reportError(
-                    "Could not create arduino-cli flash command."
-                    );
-                }
-                int flashRet = flash.run();
-                if (flashRet != 0) {
-                    errorReporter.reportError("arduino-cli flash command failed with error code " + flashRet);
-                } else {
-                    System.out.println("SUCCESS: Flashed board using arduino-cli");
-                }
-            } else {
-                errorReporter.reportError("Need to provide a port on which to automatically flash.");
-            }
+        int flashRet = flash.run();
+        if (flashRet != 0) {
+          errorReporter.reportError("arduino-cli flash command failed with error code " + flashRet);
         } else {
-            System.out.println("********");
-            System.out.println("To flash your program, run the following command to see information about the board you plugged in:\n\n\tarduino-cli board list\n\nGrab the FQBN and PORT from the command and run the following command in the generated sources directory:\n\n\tarduino-cli upload -b <FQBN> -p <PORT>\n");
+          System.out.println("SUCCESS: Flashed board using arduino-cli");
         }
+      } else {
+        errorReporter.reportError("Need to provide a port on which to automatically flash.");
+      }
+    } else {
+      System.out.println("********");
+      System.out.println(
+          "To flash your program, run the following command to see information about the board you"
+              + " plugged in:\n\n"
+              + "\tarduino-cli board list\n\n"
+              + "Grab the FQBN and PORT from the command and run the following command in the"
+              + " generated sources directory:\n\n"
+              + "\tarduino-cli upload -b <FQBN> -p <PORT>\n");
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/util/Averager.java b/org.lflang/src/org/lflang/util/Averager.java
index 81349c9db1..f156eafb22 100644
--- a/org.lflang/src/org/lflang/util/Averager.java
+++ b/org.lflang/src/org/lflang/util/Averager.java
@@ -1,27 +1,26 @@
 package org.lflang.util;
 
 import java.util.Arrays;
-
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
 
 /** Average asynchronously reported numbers and do something with them. */
 public class Averager {
-    private final int n;
-    private final int[] reports;
+  private final int n;
+  private final int[] reports;
 
-    /** Create an averager of reports from {@code n} processes. */
-    public Averager(int n) {
-        this.n = n;
-        reports = new int[n];
-    }
+  /** Create an averager of reports from {@code n} processes. */
+  public Averager(int n) {
+    this.n = n;
+    reports = new int[n];
+  }
 
-    /**
-     * Receive {@code x} from process {@code id} and invoke {@code callback}
-     * on the mean of the numbers most recently reported by the processes.
-     */
-    public synchronized void report(int id, int x, Procedure1<Integer> callback) {
-        assert 0 <= id && id < n;
-        reports[id] = x;
-        callback.apply(Arrays.stream(reports).sum() / n);
-    }
+  /**
+   * Receive {@code x} from process {@code id} and invoke {@code callback} on the mean of the
+   * numbers most recently reported by the processes.
+   */
+  public synchronized void report(int id, int x, Procedure1<Integer> callback) {
+    assert 0 <= id && id < n;
+    reports[id] = x;
+    callback.apply(Arrays.stream(reports).sum() / n);
+  }
 }
diff --git a/org.lflang/src/org/lflang/util/CollectionUtil.java b/org.lflang/src/org/lflang/util/CollectionUtil.java
index 221cbc68ec..8510856c78 100644
--- a/org.lflang/src/org/lflang/util/CollectionUtil.java
+++ b/org.lflang/src/org/lflang/util/CollectionUtil.java
@@ -14,176 +14,159 @@
 /**
  * Utilities to manipulate collections.
  *
- * <p>Most of these methods are using specialized collection
- * implementations (possibly unmodifiable) for small collection
- * sizes. No guarantee is made on the mutability of the collections
- * returned from these functions, meaning, callers should always
- * assume they are unmodifiable. Functions that take a collection
- * parameter as input to produce a new one with a transformation
- * require the input collection to have been obtained from one of
- * the utility functions of this class in the first place.
+ * <p>Most of these methods are using specialized collection implementations (possibly unmodifiable)
+ * for small collection sizes. No guarantee is made on the mutability of the collections returned
+ * from these functions, meaning, callers should always assume they are unmodifiable. Functions that
+ * take a collection parameter as input to produce a new one with a transformation require the input
+ * collection to have been obtained from one of the utility functions of this class in the first
+ * place.
  */
 public class CollectionUtil {
 
-    /**
-     * Returns a set which contains the elements of the given
-     * set plus the given element. The returned set should be
-     * considered unmodifiable.
-     *
-     * @param set initial set, nullable
-     * @param t   new element
-     * @param <T> Type of elements
-     * @return A new set, or the same
-     */
-    public static <T> Set<T> plus(Set<T> set, T t) {
-        if (set == null || set.isEmpty()) {
-            return Set.of(t);
-        } else if (set.size() == 1) {
-            if (set.contains(t)) {
-                return set;
-            }
-            // make mutable
-            set = new LinkedHashSet<>(set);
-        } // else it's already mutable.
-
-        set.add(t);
+  /**
+   * Returns a set which contains the elements of the given set plus the given element. The returned
+   * set should be considered unmodifiable.
+   *
+   * @param set initial set, nullable
+   * @param t new element
+   * @param <T> Type of elements
+   * @return A new set, or the same
+   */
+  public static <T> Set<T> plus(Set<T> set, T t) {
+    if (set == null || set.isEmpty()) {
+      return Set.of(t);
+    } else if (set.size() == 1) {
+      if (set.contains(t)) {
         return set;
+      }
+      // make mutable
+      set = new LinkedHashSet<>(set);
+    } // else it's already mutable.
+
+    set.add(t);
+    return set;
+  }
+
+  public static <K, V> Map<K, V> plus(Map<K, V> map, K k, V v) {
+    if (map == null || map.isEmpty()) {
+      return Collections.singletonMap(k, v);
+    } else if (map.size() == 1) {
+      Entry<K, V> e = map.entrySet().iterator().next();
+      if (e.getKey().equals(k)) {
+        return Map.of(k, v);
+      }
+      // make mutable
+      map = new LinkedHashMap<>(map);
+    } // else it's already mutable.
+
+    map.put(k, v);
+    return map;
+  }
+
+  /**
+   * Remove the given value from all the sets that are values in the given map. Use this if the
+   * values of the map (the sets) were build with {@link #plus(Set, Object)}.
+   *
+   * <p>In {@link org.lflang.graph.DirectedGraph}, this is used to properly remove nodes from a
+   * graph. There, we use maps to represent edges, where a value in a map is a set of nodes adjacent
+   * to the key for that value. Hence, when a node is removed, it needs to be removed not just as a
+   * key, but it also needs to be removed from the neighbors sets of any other keys that may contain
+   * it.
+   *
+   * @param map A modifiable map
+   * @param valueToRemove Value to remove
+   */
+  public static <K, V> void removeFromValues(Map<K, Set<V>> map, V valueToRemove) {
+    mapValuesInPlace(map, set -> minus(set, valueToRemove));
+  }
+
+  /**
+   * Apply a transform to the values of the map. If the mapping function returns null, the entry is
+   * removed.
+   */
+  private static <K, V> void mapValuesInPlace(Map<K, V> map, Function<V, V> mapper) {
+    Iterator<Entry<K, V>> iterator = map.entrySet().iterator();
+    while (iterator.hasNext()) {
+      Entry<K, V> e = iterator.next();
+      V existing = e.getValue();
+      V mapped = mapper.apply(existing);
+      if (mapped == null) {
+        iterator.remove();
+      } else if (mapped != existing) {
+        e.setValue(mapped);
+      }
     }
-
-
-    public static <K, V> Map<K, V> plus(Map<K, V> map, K k, V v) {
-        if (map == null || map.isEmpty()) {
-            return Collections.singletonMap(k, v);
-        } else if (map.size() == 1) {
-            Entry<K, V> e = map.entrySet().iterator().next();
-            if (e.getKey().equals(k)) {
-                return Map.of(k, v);
-            }
-            // make mutable
-            map = new LinkedHashMap<>(map);
-        } // else it's already mutable.
-
-        map.put(k, v);
-        return map;
+  }
+
+  /**
+   * Returns a set that contains the elements of the given set minus one element. An empty set is
+   * considered empty.
+   */
+  public static <T> Set<T> minus(Set<T> set, T eltToRemove) {
+    if (set instanceof LinkedHashSet) {
+      set.remove(eltToRemove);
+      return set;
     }
 
-
-    /**
-     * Remove the given value from all the sets that are values
-     * in the given map. Use this if the values of the map (the
-     * sets) were build with {@link #plus(Set, Object)}.
-     * <p>
-     * In {@link org.lflang.graph.DirectedGraph}, this is used
-     * to properly remove nodes from a graph. There, we use
-     * maps to represent edges, where a value in a map is a
-     * set of nodes adjacent to the key for that value.
-     * Hence, when a node is removed, it needs to be removed
-     * not just as a key, but it also needs to be removed
-     * from the neighbors sets of any other keys that may contain it.
-     *
-     * @param map           A modifiable map
-     * @param valueToRemove Value to remove
-     */
-    public static <K, V> void removeFromValues(Map<K, Set<V>> map, V valueToRemove) {
-        mapValuesInPlace(map, set -> minus(set, valueToRemove));
+    if (set == null || set.isEmpty()) {
+      return Collections.emptySet();
+    } else if (set.size() == 1) {
+      return set.contains(eltToRemove) ? Collections.emptySet() : set;
     }
-
-
-    /**
-     * Apply a transform to the values of the map. If the mapping
-     * function returns null, the entry is removed.
-     */
-    private static <K, V> void mapValuesInPlace(Map<K, V> map, Function<V, V> mapper) {
-        Iterator<Entry<K, V>> iterator = map.entrySet().iterator();
-        while (iterator.hasNext()) {
-            Entry<K, V> e = iterator.next();
-            V existing = e.getValue();
-            V mapped = mapper.apply(existing);
-            if (mapped == null) {
-                iterator.remove();
-            } else if (mapped != existing) {
-                e.setValue(mapped);
-            }
-        }
+    throw new AssertionError("should be unreachable");
+  }
+
+  /**
+   * Returns a map that is identical to the original map, except the value for key {@code k} is
+   * transformed using the given function. The transformation function takes the key and current
+   * value (null if the key is not present) as inputs, and returns the new value to associate to the
+   * key (null if the mapping should be removed).
+   *
+   * @see Map#compute(Object, BiFunction)
+   */
+  public static <K, V> Map<K, V> compute(Map<K, V> map, K k, BiFunction<K, V, V> computation) {
+    if (map == null || map.isEmpty()) {
+      return Collections.singletonMap(k, computation.apply(k, null));
+    } else if (map.size() == 1) {
+      Entry<K, V> e = map.entrySet().iterator().next();
+      if (e.getKey().equals(k)) {
+        return Collections.singletonMap(k, computation.apply(k, e.getValue()));
+      }
+      // make mutable
+      map = new LinkedHashMap<>(map);
+    } // else it's already mutable.
+
+    map.compute(k, computation);
+    return map;
+  }
+
+  /**
+   * Returns a copy of the set. The returned set should be considered unmodifiable.
+   *
+   * @param set initial set, nullable
+   * @param <T> Type of elements
+   * @return A new set, or the same
+   */
+  public static <T> Set<T> copy(Set<T> set) {
+    if (set == null || set.size() <= 1) {
+      return set; // it's unmodifiable
+    } else {
+      return new LinkedHashSet<>(set);
     }
-
-
-    /**
-     * Returns a set that contains the elements of the given
-     * set minus one element. An empty set is considered empty.
-     */
-    public static <T> Set<T> minus(Set<T> set, T eltToRemove) {
-        if (set instanceof LinkedHashSet) {
-            set.remove(eltToRemove);
-            return set;
-        }
-
-        if (set == null || set.isEmpty()) {
-            return Collections.emptySet();
-        } else if (set.size() == 1) {
-            return set.contains(eltToRemove) ? Collections.emptySet() : set;
-        }
-        throw new AssertionError("should be unreachable");
+  }
+
+  /**
+   * Returns an immutable Set that contains all argument values. Duplicate elements are removed
+   * without error (contrary to {@link Set#of()} and friends).
+   */
+  @SafeVarargs
+  public static <T> Set<T> immutableSetOf(T first, T... rest) {
+    if (rest.length == 0) {
+      return Set.of(first);
     }
-
-
-    /**
-     * Returns a map that is identical to the original map,
-     * except the value for key {@code k} is transformed using
-     * the given function. The transformation function takes the
-     * key and current value (null if the key is not present) as inputs,
-     * and returns the new value to associate to the key (null if the mapping should be removed).
-     *
-     * @see Map#compute(Object, BiFunction)
-     */
-    public static <K, V> Map<K, V> compute(Map<K, V> map, K k, BiFunction<K, V, V> computation) {
-        if (map == null || map.isEmpty()) {
-            return Collections.singletonMap(k, computation.apply(k, null));
-        } else if (map.size() == 1) {
-            Entry<K, V> e = map.entrySet().iterator().next();
-            if (e.getKey().equals(k)) {
-                return Collections.singletonMap(k, computation.apply(k, e.getValue()));
-            }
-            // make mutable
-            map = new LinkedHashMap<>(map);
-        } // else it's already mutable.
-
-        map.compute(k, computation);
-        return map;
-    }
-
-
-    /**
-     * Returns a copy of the set. The returned set should be
-     * considered unmodifiable.
-     *
-     * @param set initial set, nullable
-     * @param <T> Type of elements
-     * @return A new set, or the same
-     */
-    public static <T> Set<T> copy(Set<T> set) {
-        if (set == null || set.size() <= 1) {
-            return set; // it's unmodifiable
-        } else {
-            return new LinkedHashSet<>(set);
-        }
-    }
-
-
-    /**
-     * Returns an immutable Set that contains all argument values.
-     * Duplicate elements are removed without error (contrary
-     * to {@link Set#of()} and friends).
-     */
-    @SafeVarargs
-    public static <T> Set<T> immutableSetOf(T first, T... rest) {
-        if (rest.length == 0) {
-            return Set.of(first);
-        }
-        Set<T> result = new LinkedHashSet<>();
-        result.add(first);
-        result.addAll(Arrays.asList(rest));
-        return result;
-    }
-
+    Set<T> result = new LinkedHashSet<>();
+    result.add(first);
+    result.addAll(Arrays.asList(rest));
+    return result;
+  }
 }
diff --git a/org.lflang/src/org/lflang/util/FileUtil.java b/org.lflang/src/org/lflang/util/FileUtil.java
index eb2550127e..e46a30d501 100644
--- a/org.lflang/src/org/lflang/util/FileUtil.java
+++ b/org.lflang/src/org/lflang/util/FileUtil.java
@@ -23,9 +23,7 @@
 import java.util.jar.JarFile;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRoot;
@@ -35,890 +33,906 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.util.RuntimeIOException;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 
 public class FileUtil {
 
-    /**
-     * Return the name of the file excluding its file extension.
-     * @param file A Path object
-     * @return The name of the file excluding its file extension.
-     */
-    public static String nameWithoutExtension(Path file) {
-        String name = file.getFileName().toString();
-        int idx = name.lastIndexOf('.');
-        return idx < 0 ? name : name.substring(0, idx);
-    }
-
-    /**
-     * Return the name of the file associated with the given resource,
-     * excluding its file extension.
-     * @param r Any {@code Resource}.
-     * @return The name of the file associated with the given resource,
-     * excluding its file extension.
-     * @throws IOException If the resource has an invalid URI.
-     */
-    public static String nameWithoutExtension(Resource r) throws IOException {
-        return nameWithoutExtension(toPath(r));
-    }
-
-    /**
-     * Return a java.nio.Path object corresponding to the given URI.
-     * @throws IOException If the given URI is invalid.
-     */
-    public static Path toPath(URI uri) throws IOException {
-        return Paths.get(toIPath(uri).toFile().getAbsolutePath());
-    }
-
-    /**
-     * Return a java.nio.Path object corresponding to the given Resource.
-     * @throws IOException If the given resource has an invalid URI.
-     */
-    public static Path toPath(Resource resource) throws IOException {
-        return toPath(resource.getURI());
-    }
-
-    /**
-     * Return an org.eclipse.core.runtime.Path object corresponding to the
-     * given URI.
-     * @throws IOException If the given URI is invalid.
-     */
-    public static IPath toIPath(URI uri) throws IOException {
-        if (uri.isPlatform()) {
-            IPath path = new org.eclipse.core.runtime.Path(uri.toPlatformString(true));
-            if (path.segmentCount() == 1) {
-                return ResourcesPlugin.getWorkspace().getRoot().getProject(path.lastSegment()).getLocation();
-            } else {
-                return ResourcesPlugin.getWorkspace().getRoot().getFile(path).getLocation();
-            }
-        } else if (uri.isFile()) {
-            return new org.eclipse.core.runtime.Path(uri.toFileString());
-        } else {
-            throw new IOException("Unrecognized file protocol in URI " + uri);
-        }
-    }
-
-    /**
-     * Convert a given path to a unix-style string.
-     *
-     * This ensures that '/' is used instead of '\' as file separator.
-     */
-    public static String toUnixString(Path path) {
-        return path.toString().replace('\\', '/');
-    }
-    
-    /**
-     * Parse the string as file location and return it as URI.
-     * Supports URIs, plain file paths, and paths relative to a model.
-     * 
-     * @param path the file location as string.
-     * @param resource the model resource this file should be resolved relatively. May be null.
-     * @return the (Java) URI or null if no file can be located.
-     */
-    public static java.net.URI locateFile(String path, Resource resource) {
-        // Check if path is URL
+  /**
+   * Return the name of the file excluding its file extension.
+   *
+   * @param file A Path object
+   * @return The name of the file excluding its file extension.
+   */
+  public static String nameWithoutExtension(Path file) {
+    String name = file.getFileName().toString();
+    int idx = name.lastIndexOf('.');
+    return idx < 0 ? name : name.substring(0, idx);
+  }
+
+  /**
+   * Return the name of the file associated with the given resource, excluding its file extension.
+   *
+   * @param r Any {@code Resource}.
+   * @return The name of the file associated with the given resource, excluding its file extension.
+   * @throws IOException If the resource has an invalid URI.
+   */
+  public static String nameWithoutExtension(Resource r) throws IOException {
+    return nameWithoutExtension(toPath(r));
+  }
+
+  /**
+   * Return a java.nio.Path object corresponding to the given URI.
+   *
+   * @throws IOException If the given URI is invalid.
+   */
+  public static Path toPath(URI uri) throws IOException {
+    return Paths.get(toIPath(uri).toFile().getAbsolutePath());
+  }
+
+  /**
+   * Return a java.nio.Path object corresponding to the given Resource.
+   *
+   * @throws IOException If the given resource has an invalid URI.
+   */
+  public static Path toPath(Resource resource) throws IOException {
+    return toPath(resource.getURI());
+  }
+
+  /**
+   * Return an org.eclipse.core.runtime.Path object corresponding to the given URI.
+   *
+   * @throws IOException If the given URI is invalid.
+   */
+  public static IPath toIPath(URI uri) throws IOException {
+    if (uri.isPlatform()) {
+      IPath path = new org.eclipse.core.runtime.Path(uri.toPlatformString(true));
+      if (path.segmentCount() == 1) {
+        return ResourcesPlugin.getWorkspace()
+            .getRoot()
+            .getProject(path.lastSegment())
+            .getLocation();
+      } else {
+        return ResourcesPlugin.getWorkspace().getRoot().getFile(path).getLocation();
+      }
+    } else if (uri.isFile()) {
+      return new org.eclipse.core.runtime.Path(uri.toFileString());
+    } else {
+      throw new IOException("Unrecognized file protocol in URI " + uri);
+    }
+  }
+
+  /**
+   * Convert a given path to a unix-style string.
+   *
+   * <p>This ensures that '/' is used instead of '\' as file separator.
+   */
+  public static String toUnixString(Path path) {
+    return path.toString().replace('\\', '/');
+  }
+
+  /**
+   * Parse the string as file location and return it as URI. Supports URIs, plain file paths, and
+   * paths relative to a model.
+   *
+   * @param path the file location as string.
+   * @param resource the model resource this file should be resolved relatively. May be null.
+   * @return the (Java) URI or null if no file can be located.
+   */
+  public static java.net.URI locateFile(String path, Resource resource) {
+    // Check if path is URL
+    try {
+      var uri = new java.net.URI(path);
+      if (uri.getScheme() != null) { // check if path was meant to be a URI
+        return uri;
+      }
+    } catch (Exception e) {
+      // nothing
+    }
+    // Check if path exists as it is
+    File file = new File(path);
+    if (file.exists()) {
+      try {
+        return file.toURI();
+      } catch (Exception e) {
+        // nothing
+      }
+    }
+    // Check if path is relative to LF file
+    if (resource != null) {
+      URI eURI = resource.getURI();
+      if (eURI != null) {
+        java.net.URI sourceURI = null;
         try {
-            var uri = new java.net.URI(path);
-            if(uri.getScheme() != null) { // check if path was meant to be a URI
-                return uri;
-            }
+          if (eURI.isFile()) {
+            sourceURI = new java.net.URI(eURI.toString());
+            sourceURI =
+                new java.net.URI(
+                    sourceURI.getScheme(),
+                    null,
+                    sourceURI.getPath().substring(0, sourceURI.getPath().lastIndexOf("/")),
+                    null);
+          } else if (eURI.isPlatformResource()) {
+            IResource iFile =
+                ResourcesPlugin.getWorkspace().getRoot().findMember(eURI.toPlatformString(true));
+            sourceURI =
+                iFile != null ? iFile.getRawLocation().toFile().getParentFile().toURI() : null;
+          }
+          if (sourceURI != null) {
+            return sourceURI.resolve(path);
+          }
         } catch (Exception e) {
-            // nothing
-        }
-        // Check if path exists as it is
-        File file = new File(path);
-        if (file.exists()) {
-            try {
-                return file.toURI();
-            } catch (Exception e) {
-                // nothing
-            }
-        }
-        // Check if path is relative to LF file
-        if (resource != null) {
-            URI eURI = resource.getURI();
-            if (eURI != null) {
-                java.net.URI sourceURI = null;
-                try {
-                    if (eURI.isFile()) {
-                        sourceURI = new java.net.URI(eURI.toString());
-                        sourceURI = new java.net.URI(sourceURI.getScheme(), null,
-                                sourceURI.getPath().substring(0, sourceURI.getPath().lastIndexOf("/")), null);
-                    } else if (eURI.isPlatformResource()) {
-                        IResource iFile = ResourcesPlugin.getWorkspace().getRoot().findMember(eURI.toPlatformString(true));
-                        sourceURI = iFile != null ? iFile.getRawLocation().toFile().getParentFile().toURI() : null; 
-                    }
-                    if (sourceURI != null) {
-                        return sourceURI.resolve(path);
-                    }
-                } catch (Exception e) {
-                    // nothing
-                }
+          // nothing
+        }
+      }
+    }
+    // fail
+    return null;
+  }
+
+  /**
+   * Recursively copy the contents of the given source directory into the given destination
+   * directory. Existing files of the destination may be overwritten.
+   *
+   * @param srcDir The source directory path.
+   * @param dstDir The destination directory path.
+   * @param skipIfUnchanged If true, don't overwrite anything in the destination if its content
+   *     would not be changed.
+   * @throws IOException If the operation fails.
+   */
+  public static void copyDirectoryContents(
+      final Path srcDir, final Path dstDir, final boolean skipIfUnchanged) throws IOException {
+    try (Stream<Path> stream = Files.walk(srcDir)) {
+      stream.forEach(
+          source -> {
+            // Handling checked exceptions in lambda expressions is
+            // hard. See
+            // https://www.baeldung.com/java-lambda-exceptions#handling-checked-exceptions.
+            // An alternative would be to create a custom Consumer interface and use that
+            // here.
+            if (Files.isRegularFile(source)) { // do not copy directories
+              try {
+                Path target = dstDir.resolve(srcDir.relativize(source));
+                Files.createDirectories(target.getParent());
+                copyFile(source, target, skipIfUnchanged);
+              } catch (IOException e) {
+                throw new RuntimeIOException(e);
+              } catch (Exception e) {
+                throw new RuntimeException(e);
+              }
             }
-        }
-        // fail
+          });
+    }
+  }
+
+  /**
+   * Copy the given source directory into the given destination directory. For example, if the
+   * source directory is {@code foo/bar} and the destination is {@code baz}, then copies of the
+   * contents of {@code foo/bar} will be located in {@code baz/bar}.
+   *
+   * @param srcDir The source directory path.
+   * @param dstDir The destination directory path.
+   * @param skipIfUnchanged If true, don't overwrite anything in the destination if its content
+   *     would not be changed.
+   * @throws IOException If the operation fails.
+   */
+  public static void copyDirectory(
+      final Path srcDir, final Path dstDir, final boolean skipIfUnchanged) throws IOException {
+    copyDirectoryContents(srcDir, dstDir.resolve(srcDir.getFileName()), skipIfUnchanged);
+  }
+
+  /**
+   * Recursively copy the contents of the given source directory into the given destination
+   * directory. Existing files of the destination may be overwritten.
+   *
+   * @param srcDir The directory to copy files from.
+   * @param dstDir The directory to copy files to.
+   * @throws IOException if copy fails.
+   */
+  public static void copyDirectoryContents(final Path srcDir, final Path dstDir)
+      throws IOException {
+    copyDirectoryContents(srcDir, dstDir, false);
+  }
+
+  /**
+   * Copy a given source file to a given destination file.
+   *
+   * <p>This also creates new directories on the path to {@code dstFile} that do not yet exist.
+   *
+   * @param srcFile The source file path.
+   * @param dstFile The destination file path.
+   * @param skipIfUnchanged If true, don't overwrite the destination file if its content would not
+   *     be changed.
+   * @throws IOException If the operation fails.
+   */
+  public static void copyFile(Path srcFile, Path dstFile, boolean skipIfUnchanged)
+      throws IOException {
+    BufferedInputStream stream = new BufferedInputStream(new FileInputStream(srcFile.toFile()));
+    try (stream) {
+      copyInputStream(stream, dstFile, skipIfUnchanged);
+    }
+  }
+
+  /**
+   * Copy a given source file to a given destination file.
+   *
+   * <p>This also creates new directories for any directories on the path to {@code dstFile} that do
+   * not yet exist.
+   *
+   * @param srcFile The source file path.
+   * @param dstFile The destination file path.
+   * @throws IOException if copy fails.
+   */
+  public static void copyFile(Path srcFile, Path dstFile) throws IOException {
+    copyFile(srcFile, dstFile, false);
+  }
+
+  /**
+   * Find the given {@code file} in the package and return the path to the file that was found; null
+   * if it was not found.
+   *
+   * @param file The file to look for.
+   * @param dstDir The directory to copy it to.
+   * @param fileConfig The file configuration that specifies where look for the file.
+   * @return The path to the file that was found, or null if it was not found.
+   */
+  public static Path findAndCopyFile(String file, Path dstDir, FileConfig fileConfig) {
+    var path = Paths.get(file);
+    var found = FileUtil.findInPackage(path, fileConfig);
+    if (found != null) {
+      try {
+        FileUtil.copyFile(found, dstDir.resolve(path.getFileName()));
+        return found;
+      } catch (IOException e) {
         return null;
-    }
-
-    /**
-     * Recursively copy the contents of the given source directory into the given destination
-     * directory. Existing files of the destination may be overwritten.
-     *
-     * @param srcDir The source directory path.
-     * @param dstDir The destination directory path.
-     * @param skipIfUnchanged If true, don't overwrite anything in the destination if its content
-     * would not be changed.
-     * @throws IOException If the operation fails.
-     */
-    public static void copyDirectoryContents(final Path srcDir, final Path dstDir, final boolean skipIfUnchanged) throws IOException {
-        try (Stream<Path> stream = Files.walk(srcDir)) {
-            stream.forEach(source -> {
-                // Handling checked exceptions in lambda expressions is
-                // hard. See
-                // https://www.baeldung.com/java-lambda-exceptions#handling-checked-exceptions.
-                // An alternative would be to create a custom Consumer interface and use that
-                // here.
-                if (Files.isRegularFile(source)) { // do not copy directories
-                    try {
-                        Path target = dstDir.resolve(srcDir.relativize(source));
-                        Files.createDirectories(target.getParent());
-                        copyFile(source, target, skipIfUnchanged);
-                    } catch (IOException e) {
-                        throw new RuntimeIOException(e);
-                    } catch (Exception e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-            });
-        }
-    }
-
-    /**
-     * Copy the given source directory into the given destination directory. For example, if the
-     * source directory is {@code foo/bar} and the destination is {@code baz}, then copies of the
-     * contents of {@code foo/bar} will be located in {@code baz/bar}.
-     * @param srcDir The source directory path.
-     * @param dstDir The destination directory path.
-     * @param skipIfUnchanged If true, don't overwrite anything in the destination if its content
-     * would not be changed.
-     * @throws IOException If the operation fails.
-     */
-    public static void copyDirectory(
-        final Path srcDir, final Path dstDir, final boolean skipIfUnchanged) throws IOException {
-        copyDirectoryContents(srcDir, dstDir.resolve(srcDir.getFileName()), skipIfUnchanged);
-    }
-
-    /**
-     * Recursively copy the contents of the given source directory into the given destination
-     * directory. Existing files of the destination may be overwritten.
-     *
-     * @param srcDir The directory to copy files from.
-     * @param dstDir The directory to copy files to.
-     * @throws IOException if copy fails.
-     */
-    public static void copyDirectoryContents(final Path srcDir, final Path dstDir) throws IOException {
-        copyDirectoryContents(srcDir, dstDir, false);
-    }
-
-    /**
-     * Copy a given source file to a given destination file.
-     *
-     * This also creates new directories on the path to {@code dstFile} that do not yet exist.
-     *
-     * @param srcFile The source file path.
-     * @param dstFile The destination file path.
-     * @param skipIfUnchanged If true, don't overwrite the destination file if its content
-     * would not be changed.
-     * @throws IOException If the operation fails.
-     */
-    public static void copyFile(Path srcFile, Path dstFile, boolean skipIfUnchanged)  throws IOException {
-        BufferedInputStream stream = new BufferedInputStream(new FileInputStream(srcFile.toFile()));
-        try (stream) {
-            copyInputStream(stream, dstFile, skipIfUnchanged);
-        }
-    }
-
-    /**
-     * Copy a given source file to a given destination file.
-     *
-     * This also creates new directories for any directories
-     * on the path to {@code dstFile} that do not yet exist.
-     *
-     * @param srcFile The source file path.
-     * @param dstFile The destination file path.
-     * @throws IOException if copy fails.
-     */
-    public static void copyFile(Path srcFile, Path dstFile)  throws IOException {
-        copyFile(srcFile, dstFile, false);
-    }
-
-    /**
-     * Find the given {@code file} in the package and return the path to the file that was found; null
-     * if it was not found.
-     *
-     * @param file The file to look for.
-     * @param dstDir The directory to copy it to.
-     * @param fileConfig The file configuration that specifies where look for the file.
-     * @return The path to the file that was found, or null if it was not found.
-     */
-    public static Path findAndCopyFile(
-        String file,
-        Path dstDir,
-        FileConfig fileConfig
-    ) {
-        var path = Paths.get(file);
-        var found = FileUtil.findInPackage(path, fileConfig);
-        if (found != null) {
-            try {
-                FileUtil.copyFile(found, dstDir.resolve(path.getFileName()));
-                return found;
-            } catch (IOException e) {
-                return null;
-            }
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Given a list of files or directories, attempt to find each entry based on the given generator
-     * context and copy it to the destination directory. Entries are searched for in the file system
-     * first, relative to the source file and relative to the package root. Entries that cannot be
-     * found in the file system are looked for on the class path.
-     * <p>
-     * If {@code contentsOnly} is true, then for each entry that is a directory, only its contents
-     * are copied, not the directory itself.
-     * For example, if the entry is a directory {@code foo/bar} and the destination is {@code baz},
-     * then copies of the contents of {@code foo/bar} will be located directly in {@code baz}.
-     * If {@code contentsOnly} is false, then copies of the contents of {@code foo/bar} will be
-     * located in {@code baz/bar}.
-     *
-     * @param entries The files or directories to copy from.
-     * @param dstDir The location to copy the files to.
-     * @param fileConfig The file configuration that specifies where the find entries the given entries.
-     * @param errorReporter An error reporter to report problems.
-     */
-    public static void copyFilesOrDirectories(
-        List<String> entries,
-        Path dstDir,
-        FileConfig fileConfig,
-        ErrorReporter errorReporter,
-        boolean fileEntriesOnly
-    ) {
-        for (String fileOrDirectory : entries) {
-            var path = Paths.get(fileOrDirectory);
-            var found = FileUtil.findInPackage(path, fileConfig);
-            if (found != null) {
-                try {
-                    if (fileEntriesOnly) {
-                        FileUtil.copyFile(found, dstDir.resolve(path.getFileName()));
-                    } else {
-                        FileUtil.copyFromFileSystem(found, dstDir, false);
-                    }
-                    System.out.println("Copied '" + fileOrDirectory + "' from the file system.");
-                } catch (IOException e) {
-                    errorReporter.reportError(
-                        "Unable to copy '" + fileOrDirectory + "' from the file system. Reason: " + e.toString()
-                    );
-                }
-            } else {
-                try {
-                    if (fileEntriesOnly) {
-                          copyFileFromClassPath(fileOrDirectory, dstDir, false);
-                    } else {
-                        FileUtil.copyFromClassPath(
-                            fileOrDirectory,
-                            dstDir,
-                            false,
-                            false
-                        );
-                        System.out.println("Copied '" + fileOrDirectory + "' from the class path.");
-                    }
-                } catch(IOException e) {
-                    errorReporter.reportError(
-                        "Unable to copy '" + fileOrDirectory + "' from the class path. Reason: " + e.toString()
-                    );
-                }
-            }
-        }
-    }
-
-    /**
-     * If the given {@code entry} is a file, then copy it into the destination. If the {@code entry}
-     * is a directory and {@code contentsOnly} is true, then copy its contents to the destination
-     * directory. If the {@code entry} is a directory and {@code contentsOnly} is true, then copy it
-     * including its contents to the destination directory.
-     *
-     * @param entry A file or directory to copy to the destination directory.
-     * @param dstDir A directory to copy the entry or its contents to.
-     * @param contentsOnly If true and {@code entry} is a directory, then copy its contents but not
-     * the directory itself.
-     * @throws IOException If the operation fails.
-     */
-    public static void copyFromFileSystem(Path entry, Path dstDir, boolean contentsOnly) throws IOException {
-        if (Files.isDirectory(entry)) {
-            if (contentsOnly) {
-                copyDirectoryContents(entry, dstDir);
-            } else {
-                copyDirectory(entry, dstDir, false);
-            }
-        } else if (Files.isRegularFile(entry)) {
-            FileUtil.copyFile(entry, dstDir.resolve(entry.getFileName()));
-        } else {
-            throw new IllegalArgumentException("Source is neither a directory nor a regular file.");
-        }
-    }
-    /**
-     * Copy a given input stream to a destination file.
-     *
-     * This also creates new directories for any directories on the destination
-     * path that do not yet exist.
-     *
-     * @param source The source input stream.
-     * @param destination The destination file path.
-     * @param skipIfUnchanged If true, don't overwrite the destination file if its content would
-     * not be changed.
-     * @throws IOException If the operation fails.
-     */
-    private static void copyInputStream(InputStream source, Path destination, boolean skipIfUnchanged) throws IOException {
-        // Read the stream once and keep a copy of all bytes. This is required as a stream cannot be read twice.
-        final var bytes = source.readAllBytes();
-        final var parent = destination.getParent();
-        if (Files.isRegularFile(destination)) {
-            if (skipIfUnchanged) {
-                if (Arrays.equals(bytes, Files.readAllBytes(destination))) {
-                    // Abort if the file contents are the same.
-                    return;
-                }
-            } else {
-                // Delete the file exists but the contents don't match.
-                Files.delete(destination);
-            }
-        } else if (Files.isDirectory(destination)) {
-            deleteDirectory(destination);
-        } else if (!Files.exists(parent)) {
-            Files.createDirectories(parent);
-        }
-
-        Files.write(destination, bytes);
-    }
-
-    /**
-     * Look up the given {@code entry} in the classpath. If it is found and is a file, copy it into
-     * the destination directory. If the entry is not found or not a file, throw an exception.
-     *
-     * @param entry A file copy to the destination directory.
-     * @param dstDir A directory to copy the entry to.
-     * @param skipIfUnchanged If true, don't overwrite the destination file if its content would
-     * not be changed.
-     * @throws IOException If the operation failed.
-     */
-    public static void copyFileFromClassPath(final String entry, final Path dstDir, final boolean skipIfUnchanged) throws IOException {
-        final URL resource = FileConfig.class.getResource(entry);
-
-        if (resource == null) {
-            throw new TargetResourceNotFoundException(entry);
-        }
+      }
+    } else {
+      return null;
+    }
+  }
+
+  /**
+   * Given a list of files or directories, attempt to find each entry based on the given generator
+   * context and copy it to the destination directory. Entries are searched for in the file system
+   * first, relative to the source file and relative to the package root. Entries that cannot be
+   * found in the file system are looked for on the class path.
+   *
+   * <p>If {@code contentsOnly} is true, then for each entry that is a directory, only its contents
+   * are copied, not the directory itself. For example, if the entry is a directory {@code foo/bar}
+   * and the destination is {@code baz}, then copies of the contents of {@code foo/bar} will be
+   * located directly in {@code baz}. If {@code contentsOnly} is false, then copies of the contents
+   * of {@code foo/bar} will be located in {@code baz/bar}.
+   *
+   * @param entries The files or directories to copy from.
+   * @param dstDir The location to copy the files to.
+   * @param fileConfig The file configuration that specifies where the find entries the given
+   *     entries.
+   * @param errorReporter An error reporter to report problems.
+   */
+  public static void copyFilesOrDirectories(
+      List<String> entries,
+      Path dstDir,
+      FileConfig fileConfig,
+      ErrorReporter errorReporter,
+      boolean fileEntriesOnly) {
+    for (String fileOrDirectory : entries) {
+      var path = Paths.get(fileOrDirectory);
+      var found = FileUtil.findInPackage(path, fileConfig);
+      if (found != null) {
+        try {
+          if (fileEntriesOnly) {
+            FileUtil.copyFile(found, dstDir.resolve(path.getFileName()));
+          } else {
+            FileUtil.copyFromFileSystem(found, dstDir, false);
+          }
+          System.out.println("Copied '" + fileOrDirectory + "' from the file system.");
+        } catch (IOException e) {
+          errorReporter.reportError(
+              "Unable to copy '"
+                  + fileOrDirectory
+                  + "' from the file system. Reason: "
+                  + e.toString());
+        }
+      } else {
+        try {
+          if (fileEntriesOnly) {
+            copyFileFromClassPath(fileOrDirectory, dstDir, false);
+          } else {
+            FileUtil.copyFromClassPath(fileOrDirectory, dstDir, false, false);
+            System.out.println("Copied '" + fileOrDirectory + "' from the class path.");
+          }
+        } catch (IOException e) {
+          errorReporter.reportError(
+              "Unable to copy '"
+                  + fileOrDirectory
+                  + "' from the class path. Reason: "
+                  + e.toString());
+        }
+      }
+    }
+  }
+
+  /**
+   * If the given {@code entry} is a file, then copy it into the destination. If the {@code entry}
+   * is a directory and {@code contentsOnly} is true, then copy its contents to the destination
+   * directory. If the {@code entry} is a directory and {@code contentsOnly} is true, then copy it
+   * including its contents to the destination directory.
+   *
+   * @param entry A file or directory to copy to the destination directory.
+   * @param dstDir A directory to copy the entry or its contents to.
+   * @param contentsOnly If true and {@code entry} is a directory, then copy its contents but not
+   *     the directory itself.
+   * @throws IOException If the operation fails.
+   */
+  public static void copyFromFileSystem(Path entry, Path dstDir, boolean contentsOnly)
+      throws IOException {
+    if (Files.isDirectory(entry)) {
+      if (contentsOnly) {
+        copyDirectoryContents(entry, dstDir);
+      } else {
+        copyDirectory(entry, dstDir, false);
+      }
+    } else if (Files.isRegularFile(entry)) {
+      FileUtil.copyFile(entry, dstDir.resolve(entry.getFileName()));
+    } else {
+      throw new IllegalArgumentException("Source is neither a directory nor a regular file.");
+    }
+  }
+  /**
+   * Copy a given input stream to a destination file.
+   *
+   * <p>This also creates new directories for any directories on the destination path that do not
+   * yet exist.
+   *
+   * @param source The source input stream.
+   * @param destination The destination file path.
+   * @param skipIfUnchanged If true, don't overwrite the destination file if its content would not
+   *     be changed.
+   * @throws IOException If the operation fails.
+   */
+  private static void copyInputStream(InputStream source, Path destination, boolean skipIfUnchanged)
+      throws IOException {
+    // Read the stream once and keep a copy of all bytes. This is required as a stream cannot be
+    // read twice.
+    final var bytes = source.readAllBytes();
+    final var parent = destination.getParent();
+    if (Files.isRegularFile(destination)) {
+      if (skipIfUnchanged) {
+        if (Arrays.equals(bytes, Files.readAllBytes(destination))) {
+          // Abort if the file contents are the same.
+          return;
+        }
+      } else {
+        // Delete the file exists but the contents don't match.
+        Files.delete(destination);
+      }
+    } else if (Files.isDirectory(destination)) {
+      deleteDirectory(destination);
+    } else if (!Files.exists(parent)) {
+      Files.createDirectories(parent);
+    }
+
+    Files.write(destination, bytes);
+  }
+
+  /**
+   * Look up the given {@code entry} in the classpath. If it is found and is a file, copy it into
+   * the destination directory. If the entry is not found or not a file, throw an exception.
+   *
+   * @param entry A file copy to the destination directory.
+   * @param dstDir A directory to copy the entry to.
+   * @param skipIfUnchanged If true, don't overwrite the destination file if its content would not
+   *     be changed.
+   * @throws IOException If the operation failed.
+   */
+  public static void copyFileFromClassPath(
+      final String entry, final Path dstDir, final boolean skipIfUnchanged) throws IOException {
+    final URL resource = FileConfig.class.getResource(entry);
+
+    if (resource == null) {
+      throw new TargetResourceNotFoundException(entry);
+    }
+
+    final URLConnection connection = resource.openConnection();
+    if (connection instanceof JarURLConnection) {
+      if (!copyFileFromJar((JarURLConnection) connection, dstDir, skipIfUnchanged)) {
+        throw new IOException("'" + entry + "' is not a file");
+      }
+    } else {
+      try {
+        Path path = Paths.get(FileLocator.toFileURL(resource).toURI());
+        copyFile(path, dstDir.resolve(path.getFileName()), skipIfUnchanged);
+      } catch (URISyntaxException e) {
+        // This should never happen as toFileURL should always return a valid URL
+        throw new IOException("Unexpected error while resolving " + entry + " on the classpath");
+      }
+    }
+  }
+
+  /**
+   * Look up the given {@code entry} in the classpath. If it is a file, copy it into the destination
+   * directory. If the {@code entry} is a directory and {@code contentsOnly} is true, then copy its
+   * contents to the destination directory. If the {@code entry} is a directory and {@code
+   * contentsOnly} is true, then copy it including its contents to the destination directory.
+   *
+   * <p>This also creates new directories for any directories on the destination path that do not
+   * yet exist.
+   *
+   * @param entry The entry to be found on the class path and copied to the given destination.
+   * @param dstDir The file system path that found files are to be copied to.
+   * @param skipIfUnchanged If true, don't overwrite the file or directory if its content would not
+   *     be changed
+   * @param contentsOnly If true and the entry is a directory, then copy its contents but not the
+   *     directory itself.
+   * @throws IOException If the operation failed.
+   */
+  public static void copyFromClassPath(
+      final String entry,
+      final Path dstDir,
+      final boolean skipIfUnchanged,
+      final boolean contentsOnly)
+      throws IOException {
+    final URL resource = FileConfig.class.getResource(entry);
+
+    if (resource == null) {
+      throw new TargetResourceNotFoundException(entry);
+    }
+
+    final URLConnection connection = resource.openConnection();
+    if (connection instanceof JarURLConnection) {
+      boolean copiedFiles =
+          copyFromJar((JarURLConnection) connection, dstDir, skipIfUnchanged, contentsOnly);
+      if (!copiedFiles) {
+        throw new TargetResourceNotFoundException(entry);
+      }
+    } else {
+      try {
+        Path path = Paths.get(FileLocator.toFileURL(resource).toURI());
+        if (path.toFile().isDirectory()) {
+          if (contentsOnly) {
+            copyDirectoryContents(path, dstDir, skipIfUnchanged);
+          } else {
+            copyDirectory(path, dstDir, skipIfUnchanged);
+          }
 
-        final URLConnection connection = resource.openConnection();
-        if (connection instanceof JarURLConnection) {
-            if (!copyFileFromJar((JarURLConnection) connection, dstDir, skipIfUnchanged)) {
-                throw new IOException("'" + entry + "' is not a file");
-            }
         } else {
-            try {
-                Path path = Paths.get(FileLocator.toFileURL(resource).toURI());
-                copyFile(path, dstDir.resolve(path.getFileName()), skipIfUnchanged);
-            } catch(URISyntaxException e) {
-                // This should never happen as toFileURL should always return a valid URL
-                throw new IOException("Unexpected error while resolving " + entry + " on the classpath");
-            }
-        }
-    }
-
-    /**
-     * Look up the given {@code entry} in the classpath. If it is a file, copy it into the destination
-     * directory.
-     * If the {@code entry} is a directory and {@code contentsOnly} is true, then copy its contents
-     * to the destination directory. If the {@code entry} is a directory and {@code contentsOnly} is
-     * true, then copy it including its contents to the destination directory.
-     *
-     * This also creates new directories for any directories on the destination
-     * path that do not yet exist.
-     *
-     * @param entry The entry to be found on the class path and copied to the given destination.
-     * @param dstDir The file system path that found files are to be copied to.
-     * @param skipIfUnchanged If true, don't overwrite the file or directory if its content would not be changed
-     * @param contentsOnly If true and the entry is a directory, then copy its contents but not the directory itself.
-     * @throws IOException If the operation failed.
-     */
-    public static void copyFromClassPath(
-        final String entry,
-        final Path dstDir,
-        final boolean skipIfUnchanged,
-        final boolean contentsOnly
-    ) throws IOException {
-        final URL resource = FileConfig.class.getResource(entry);
-
-        if (resource == null) {
-            throw new TargetResourceNotFoundException(entry);
-        }
-
-        final URLConnection connection = resource.openConnection();
-        if (connection instanceof JarURLConnection) {
-            boolean copiedFiles = copyFromJar((JarURLConnection) connection, dstDir, skipIfUnchanged, contentsOnly);
-            if (!copiedFiles) {
-                throw new TargetResourceNotFoundException(entry);
-            }
+          copyFile(path, dstDir.resolve(path.getFileName()), skipIfUnchanged);
+        }
+      } catch (URISyntaxException e) {
+        // This should never happen as toFileURL should always return a valid URL
+        throw new IOException("Unexpected error while resolving " + entry + " on the classpath");
+      }
+    }
+  }
+
+  /**
+   * Return true if the given connection points to a file.
+   *
+   * @param connection A connection to a JAR file.
+   * @throws IOException If the connection is faulty.
+   */
+  private static boolean isFileInJar(JarURLConnection connection) throws IOException {
+    return connection.getJarFile().stream()
+        .anyMatch(it -> it.getName().equals(connection.getEntryName()));
+  }
+
+  /**
+   * Given a JAR file and a {@code srcFile} entry, copy it into the given destination directory.
+   *
+   * @param jar The JAR file from which to copy {@code srcFile}.
+   * @param srcFile The source file to copy from the given {@code jar}.
+   * @param dstDir The directory to top the source file into.
+   * @param skipIfUnchanged If true, don't overwrite the destination file if its content would * not
+   *     be changed.
+   * @throws IOException If the operation fails.
+   */
+  private static void copyFileFromJar(
+      JarFile jar, String srcFile, Path dstDir, boolean skipIfUnchanged) throws IOException {
+    var entry = jar.getJarEntry(srcFile);
+    var filename = Paths.get(entry.getName()).getFileName();
+    InputStream is = jar.getInputStream(entry);
+    try (is) {
+      copyInputStream(is, dstDir.resolve(filename), skipIfUnchanged);
+    }
+  }
+
+  /**
+   * Copy the contents from an entry in a JAR to destination directory in the filesystem. The entry
+   * may be a file, in which case it will be copied under the same name into the destination
+   * directory. If the entry is a directory, then if {@code contentsOnly} is true, only the contents
+   * of the directory will be copied into the destination directory (not the directory itself). A
+   * directory will be copied as a whole, including its contents, if {@code contentsOnly} is false.
+   *
+   * <p>This method should only be used in standalone mode (lfc).
+   *
+   * <p>This also creates new directories for any directories on the destination path that do not
+   * yet exist.
+   *
+   * @param connection a URLConnection to the source entry within the jar
+   * @param dstDir The file system path that entries are copied to.
+   * @param skipIfUnchanged If true, don't overwrite the file if its content would not be changed.
+   * @param contentsOnly If true, and the connection points to a directory, copy its contents only
+   *     (not the directory itself).
+   * @return true if any files were copied
+   * @throws IOException If the given source cannot be copied.
+   */
+  private static boolean copyFromJar(
+      JarURLConnection connection,
+      Path dstDir,
+      final boolean skipIfUnchanged,
+      final boolean contentsOnly)
+      throws IOException {
+
+    if (copyFileFromJar(connection, dstDir, skipIfUnchanged)) {
+      return true;
+    }
+    return copyDirectoryFromJar(connection, dstDir, skipIfUnchanged, contentsOnly);
+  }
+
+  /**
+   * Given a connection to a JAR file that points to an entry that is a directory, recursively copy
+   * all entries located in that directory into the given {@code dstDir}.
+   *
+   * <p>If {@code contentsOnly} is true, only the contents of the directory will be copied into the
+   * destination directory (not the directory itself). The directory will be copied as a whole,
+   * including its contents, if {@code contentsOnly} is false.
+   *
+   * @param connection A connection to a JAR file that points to a directory entry.
+   * @param dstDir The destination directory to copy the matching entries to.
+   * @param skipIfUnchanged
+   * @param contentsOnly
+   * @return
+   * @throws IOException
+   */
+  private static boolean copyDirectoryFromJar(
+      JarURLConnection connection,
+      Path dstDir,
+      final boolean skipIfUnchanged,
+      final boolean contentsOnly)
+      throws IOException {
+    final JarFile jar = connection.getJarFile();
+    final String source = connection.getEntryName();
+
+    boolean copiedFiles = false;
+    if (!contentsOnly) {
+      dstDir = dstDir.resolve(Paths.get(source).getFileName());
+    }
+    // Iterate all entries in the jar file.
+    for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements(); ) {
+      final JarEntry entry = e.nextElement();
+      final String entryName = entry.getName();
+      if (entryName.startsWith(source)) {
+        String filename = entry.getName().substring(source.length() + 1);
+        Path currentFile = dstDir.resolve(filename);
+        if (entry.isDirectory()) {
+          Files.createDirectories(currentFile);
         } else {
-            try {
-                Path path = Paths.get(FileLocator.toFileURL(resource).toURI());
-                if (path.toFile().isDirectory()) {
-                    if (contentsOnly) {
-                        copyDirectoryContents(path, dstDir, skipIfUnchanged);
-                    } else {
-                        copyDirectory(path, dstDir, skipIfUnchanged);
-                    }
-
-                } else {
-                    copyFile(path, dstDir.resolve(path.getFileName()), skipIfUnchanged);
-                }
-            } catch(URISyntaxException e) {
-                // This should never happen as toFileURL should always return a valid URL
-                throw new IOException("Unexpected error while resolving " + entry + " on the classpath");
-            }
-        }
-    }
-
-    /**
-     * Return true if the given connection points to a file.
-     * @param connection A connection to a JAR file.
-     * @throws IOException If the connection is faulty.
-     */
-    private static boolean isFileInJar(JarURLConnection connection) throws IOException {
-        return connection.getJarFile().stream().anyMatch(
-            it -> it.getName().equals(connection.getEntryName())
-        );
-    }
-
-    /**
-     * Given a JAR file and a {@code srcFile} entry, copy it into the given destination directory.
-     *
-     * @param jar The JAR file from which to copy {@code srcFile}.
-     * @param srcFile The source file to copy from the given {@code jar}.
-     * @param dstDir The directory to top the source file into.
-     * @param skipIfUnchanged If true, don't overwrite the destination file if its content would
-     *      * not be changed.
-     * @throws IOException If the operation fails.
-     */
-    private static void copyFileFromJar(JarFile jar, String srcFile, Path dstDir, boolean skipIfUnchanged) throws IOException {
-        var entry = jar.getJarEntry(srcFile);
-        var filename = Paths.get(entry.getName()).getFileName();
-        InputStream is = jar.getInputStream(entry);
-        try (is) {
-            copyInputStream(is, dstDir.resolve(filename), skipIfUnchanged);
-        }
-    }
-
-    /**
-     * Copy the contents from an entry in a JAR to destination directory in the filesystem. The entry
-     * may be a file, in which case it will be copied under the same name into the destination
-     * directory. If the entry is a directory, then if {@code contentsOnly} is true, only the
-     * contents of the directory will be copied into the destination directory (not the directory
-     * itself). A directory will be copied as a whole, including its contents, if
-     * {@code contentsOnly} is false.
-     *
-     * This method should only be used in standalone mode (lfc).
-     *
-     * This also creates new directories for any directories on
-     * the destination path that do not yet exist.
-     *
-     * @param connection a URLConnection to the source entry within the jar
-     * @param dstDir The file system path that entries are copied to.
-     * @param skipIfUnchanged If true, don't overwrite the file if its content would not be changed.
-     * @param contentsOnly If true, and the connection points to a directory, copy its contents only
-     * (not the directory itself).
-     * @return true if any files were copied
-     * @throws IOException If the given source cannot be copied.
-     */
-    private static boolean copyFromJar(
-        JarURLConnection connection,
-        Path dstDir,
-        final boolean skipIfUnchanged,
-        final boolean contentsOnly
-    ) throws IOException {
-
-        if (copyFileFromJar(connection, dstDir, skipIfUnchanged)) {
-            return true;
-        }
-        return copyDirectoryFromJar(connection, dstDir, skipIfUnchanged, contentsOnly);
-    }
-
-    /**
-     * Given a connection to a JAR file that points to an entry that is a directory, recursively copy
-     * all entries located in that directory into the given {@code dstDir}.
-     * <p>
-     * If {@code contentsOnly} is true, only the contents of the directory will be copied into the
-     * destination directory (not the directory itself). The directory will be copied as a whole,
-     * including its contents, if {@code contentsOnly} is false.
-     * @param connection A connection to a JAR file that points to a directory entry.
-     * @param dstDir The destination directory to copy the matching entries to.
-     * @param skipIfUnchanged
-     * @param contentsOnly
-     * @return
-     * @throws IOException
-     */
-    private static boolean copyDirectoryFromJar(JarURLConnection connection,
-        Path dstDir,
-        final boolean skipIfUnchanged,
-        final boolean contentsOnly) throws IOException {
-        final JarFile jar = connection.getJarFile();
-        final String source = connection.getEntryName();
-
-        boolean copiedFiles = false;
-        if (!contentsOnly) {
-            dstDir = dstDir.resolve(Paths.get(source).getFileName());
-        }
-        // Iterate all entries in the jar file.
-        for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements(); ) {
-            final JarEntry entry = e.nextElement();
-            final String entryName = entry.getName();
-            if (entryName.startsWith(source)) {
-                String filename = entry.getName().substring(source.length() + 1);
-                Path currentFile = dstDir.resolve(filename);
-                if (entry.isDirectory()) {
-                    Files.createDirectories(currentFile);
-                } else {
-                    InputStream is = jar.getInputStream(entry);
-                    try (is) {
-                        copyInputStream(is, currentFile, skipIfUnchanged);
-                        copiedFiles = true;
-                    }
-                }
-            }
-        }
-        return copiedFiles;
-    }
-
-    /**
-     * Given a connection to a JAR file that points to an entry that is a file, copy the file into the
-     * given {@code dstDir}.
-     * @param connection A connection to a JAR file that points to a directory entry.
-     * @param dstDir The destination directory to copy the file to.
-     * @param skipIfUnchanged
-     * @return {@code true} the connection entry is a file, and it was copied successfully;
-     * {@code false} if the connection entry is not a file and the copy operation was aborted.
-     * @throws IOException If the operation failed.
-     */
-    private static boolean copyFileFromJar(
-        JarURLConnection connection,
-        Path dstDir,
-        final boolean skipIfUnchanged
-    ) throws IOException {
-        final JarFile jar = connection.getJarFile();
-        final String source = connection.getEntryName();
-
-        if (!isFileInJar(connection)) {
-            return false;
-        }
-        copyFileFromJar(jar, source, dstDir, skipIfUnchanged);
-
-        return true;
-    }
-
-    /**
-     * Delete unused Files from Arduino-CLI based compilation.
-     *
-     * Arduino-CLI (the build system) uses lazy compilation (i.e. compiles every file recursively from 
-     * a source directory). This does the work of CMake by explicitly deleting files that 
-     * shouldn't get compiled by the CLI. Generally, we delete all CMake artifacts and multithreaded
-     * support files (including semaphores and thread folders)
-     *
-     * @param dir The folder to search for folders and files to delete. 
-     * @throws IOException If the given folder and unneeded files cannot be deleted.
-     */
-    public static void arduinoDeleteHelper(Path dir, boolean threadingOn) throws IOException {
-        deleteDirectory(dir.resolve("core/federated")); // TODO: Add Federated Support to Arduino
-        deleteDirectory(dir.resolve("include/core/federated")); // TODO: Add Federated Support to Arduino
-        
-        if (!threadingOn) {
-            deleteDirectory(dir.resolve("core/threaded")); // No Threaded Support for Arduino
-            deleteDirectory(dir.resolve("include/core/threaded")); // No Threaded Support for Arduino
-            deleteDirectory(dir.resolve("core/platform/arduino_mbed")); // No Threaded Support for Arduino
-        } 
-
-        List<Path> allPaths = Files.walk(dir)
-                    .sorted(Comparator.reverseOrder())
-                    .toList();
-        for (Path path : allPaths) {
-            String toCheck = path.toString().toLowerCase();
-            if (toCheck.contains("cmake")) {
-                Files.delete(path);
-            }
-        }
-    }
-
-    /**
-     * Helper function for getting the string representation of the relative path 
-     * to take to get from one file (currPath) to get to the other (fileName).
-     *
-     * Generally, this is useful for converting includes to have relative pathing when 
-     * you lack access to adding additional include paths when compiling.
-     * 
-     * @param fileName File to search for.
-     * @param currPath The current path to the file whose include statements we are modifying.
-     * @param fileStringToFilePath Mapping of File Names to their paths.
-     */
-    private static String fileNameMatchConverter(String fileName, Path currPath, Map<String, Path> fileStringToFilePath) 
-        throws NullPointerException {
-        // First get the child file
-        int lastPath = fileName.lastIndexOf(File.separator);
-        if (lastPath != -1){
-            fileName = fileName.substring(lastPath+1);
-        }
-        Path p = fileStringToFilePath.get(fileName);
-        if(p == null) {
-            return "#include \"" + fileName + "\"";
-        }
-        String relativePath = currPath.getParent().relativize(p).toString();
-        return "#include \"" + relativePath + "\"";
-    }
-
-    /**
-     * Return true if the given path points to a C file, false otherwise.
-     */
-    public static boolean isCFile(Path path) {
-        String fileName = path.getFileName().toString();
-        return fileName.endsWith(".c") || fileName.endsWith(".cpp") || fileName.endsWith(".h");
-    }
-
-    /**
-     * Convert all includes recursively inside files within a specified folder to relative links
-     *
-     * @param dir The folder to search for includes to change. 
-     * @throws IOException If the given set of files cannot be relativized.
-     */
-    public static void relativeIncludeHelper(Path dir, Path includePath) throws IOException {
-        System.out.println("Relativizing all includes in " + dir.toString());
-        List<Path> includePaths = Files.walk(includePath)
+          InputStream is = jar.getInputStream(entry);
+          try (is) {
+            copyInputStream(is, currentFile, skipIfUnchanged);
+            copiedFiles = true;
+          }
+        }
+      }
+    }
+    return copiedFiles;
+  }
+
+  /**
+   * Given a connection to a JAR file that points to an entry that is a file, copy the file into the
+   * given {@code dstDir}.
+   *
+   * @param connection A connection to a JAR file that points to a directory entry.
+   * @param dstDir The destination directory to copy the file to.
+   * @param skipIfUnchanged
+   * @return {@code true} the connection entry is a file, and it was copied successfully; {@code
+   *     false} if the connection entry is not a file and the copy operation was aborted.
+   * @throws IOException If the operation failed.
+   */
+  private static boolean copyFileFromJar(
+      JarURLConnection connection, Path dstDir, final boolean skipIfUnchanged) throws IOException {
+    final JarFile jar = connection.getJarFile();
+    final String source = connection.getEntryName();
+
+    if (!isFileInJar(connection)) {
+      return false;
+    }
+    copyFileFromJar(jar, source, dstDir, skipIfUnchanged);
+
+    return true;
+  }
+
+  /**
+   * Delete unused Files from Arduino-CLI based compilation.
+   *
+   * <p>Arduino-CLI (the build system) uses lazy compilation (i.e. compiles every file recursively
+   * from a source directory). This does the work of CMake by explicitly deleting files that
+   * shouldn't get compiled by the CLI. Generally, we delete all CMake artifacts and multithreaded
+   * support files (including semaphores and thread folders)
+   *
+   * @param dir The folder to search for folders and files to delete.
+   * @throws IOException If the given folder and unneeded files cannot be deleted.
+   */
+  public static void arduinoDeleteHelper(Path dir, boolean threadingOn) throws IOException {
+    deleteDirectory(dir.resolve("core/federated")); // TODO: Add Federated Support to Arduino
+    deleteDirectory(
+        dir.resolve("include/core/federated")); // TODO: Add Federated Support to Arduino
+
+    if (!threadingOn) {
+      deleteDirectory(dir.resolve("core/threaded")); // No Threaded Support for Arduino
+      deleteDirectory(dir.resolve("include/core/threaded")); // No Threaded Support for Arduino
+      deleteDirectory(dir.resolve("core/platform/arduino_mbed")); // No Threaded Support for Arduino
+    }
+
+    List<Path> allPaths = Files.walk(dir).sorted(Comparator.reverseOrder()).toList();
+    for (Path path : allPaths) {
+      String toCheck = path.toString().toLowerCase();
+      if (toCheck.contains("cmake")) {
+        Files.delete(path);
+      }
+    }
+  }
+
+  /**
+   * Helper function for getting the string representation of the relative path to take to get from
+   * one file (currPath) to get to the other (fileName).
+   *
+   * <p>Generally, this is useful for converting includes to have relative pathing when you lack
+   * access to adding additional include paths when compiling.
+   *
+   * @param fileName File to search for.
+   * @param currPath The current path to the file whose include statements we are modifying.
+   * @param fileStringToFilePath Mapping of File Names to their paths.
+   */
+  private static String fileNameMatchConverter(
+      String fileName, Path currPath, Map<String, Path> fileStringToFilePath)
+      throws NullPointerException {
+    // First get the child file
+    int lastPath = fileName.lastIndexOf(File.separator);
+    if (lastPath != -1) {
+      fileName = fileName.substring(lastPath + 1);
+    }
+    Path p = fileStringToFilePath.get(fileName);
+    if (p == null) {
+      return "#include \"" + fileName + "\"";
+    }
+    String relativePath = currPath.getParent().relativize(p).toString();
+    return "#include \"" + relativePath + "\"";
+  }
+
+  /** Return true if the given path points to a C file, false otherwise. */
+  public static boolean isCFile(Path path) {
+    String fileName = path.getFileName().toString();
+    return fileName.endsWith(".c") || fileName.endsWith(".cpp") || fileName.endsWith(".h");
+  }
+
+  /**
+   * Convert all includes recursively inside files within a specified folder to relative links
+   *
+   * @param dir The folder to search for includes to change.
+   * @throws IOException If the given set of files cannot be relativized.
+   */
+  public static void relativeIncludeHelper(Path dir, Path includePath) throws IOException {
+    System.out.println("Relativizing all includes in " + dir.toString());
+    List<Path> includePaths =
+        Files.walk(includePath)
             .filter(Files::isRegularFile)
             .filter(FileUtil::isCFile)
             .sorted(Comparator.reverseOrder())
             .toList();
-        List<Path> srcPaths = Files.walk(dir)
+    List<Path> srcPaths =
+        Files.walk(dir)
             .filter(Files::isRegularFile)
             .filter(FileUtil::isCFile)
             .sorted(Comparator.reverseOrder())
             .toList();
-        Map<String, Path> fileStringToFilePath = new HashMap<String, Path>();
-        for (Path path : includePaths) {
-            String fileName = path.getFileName().toString();
-            if (path.getFileName().toString().contains("CMakeLists.txt")) continue;
-            if (fileStringToFilePath.put(fileName, path) != null) {
-                throw new IOException("Directory has different files with the same name. Cannot Relativize.");
-            }
-        }
-        Pattern regexExpression = Pattern.compile("#include\s+[\"]([^\"]+)*[\"]");
-        for (Path path : srcPaths) {
-            String fileContents = Files.readString(path);
-            Matcher matcher = regexExpression.matcher(fileContents);
-            int lastIndex = 0;
-            StringBuilder output = new StringBuilder();
-            while (matcher.find()) {
-                output.append(fileContents, lastIndex, matcher.start())
-                    .append(fileNameMatchConverter(matcher.group(1), path, fileStringToFilePath));
-                lastIndex = matcher.end();
-            }
-            if (lastIndex < fileContents.length()) {
-                output.append(fileContents, lastIndex, fileContents.length());
-            }
-            writeToFile(output.toString(), path);
-        }
-    }
-
-    /**
-     * Delete the given file or directory if it exists. If {@code fileOrDirectory} is a directory,
-     * deletion is recursive.
-     *
-     * @param fileOrDirectory The file or directory to delete.
-     * @throws IOException If the operation failed.
-     */
-    public static void delete(Path fileOrDirectory) throws IOException {
-        if (Files.isRegularFile(fileOrDirectory)) {
-            Files.deleteIfExists(fileOrDirectory);
-        }
-        if (Files.isDirectory(fileOrDirectory)) {
-            deleteDirectory(fileOrDirectory);
-        }
-    }
-
-    /**
-     * Recursively delete a directory if it exists.
-     *
-     * @throws IOException If an I/O error occurs.
-     */
-    public static void deleteDirectory(Path dir) throws IOException {
-        if (Files.isDirectory(dir)) {
-            System.out.println("Cleaning " + dir);
-            List<Path> pathsToDelete = Files.walk(dir)
-                    .sorted(Comparator.reverseOrder())
-                    .toList();
-            for (Path path : pathsToDelete) {
-                Files.deleteIfExists(path);
-            }
-        }
-    }
-
-    /**
-     * Return an absolute path to the given file or directory if it can be found within the package.
-     * Otherwise, return null.
-     *
-     * NOTE: If the given file or directory is given as an absolute path but cannot be found, it is
-     * interpreted as a relative path with respect to the project root.
-     *
-     * @param fileOrDirectory The file or directory to look for.
-     * @param fileConfig A file configuration that determines where the package is located.
-     * @return An absolute path of the file or directory was found; null otherwise.
-     */
-    public static Path findInPackage(Path fileOrDirectory, FileConfig fileConfig) {
-        if (fileOrDirectory.isAbsolute() && Files.exists(fileOrDirectory)) {
-            return fileOrDirectory;
+    Map<String, Path> fileStringToFilePath = new HashMap<String, Path>();
+    for (Path path : includePaths) {
+      String fileName = path.getFileName().toString();
+      if (path.getFileName().toString().contains("CMakeLists.txt")) continue;
+      if (fileStringToFilePath.put(fileName, path) != null) {
+        throw new IOException(
+            "Directory has different files with the same name. Cannot Relativize.");
+      }
+    }
+    Pattern regexExpression = Pattern.compile("#include\s+[\"]([^\"]+)*[\"]");
+    for (Path path : srcPaths) {
+      String fileContents = Files.readString(path);
+      Matcher matcher = regexExpression.matcher(fileContents);
+      int lastIndex = 0;
+      StringBuilder output = new StringBuilder();
+      while (matcher.find()) {
+        output
+            .append(fileContents, lastIndex, matcher.start())
+            .append(fileNameMatchConverter(matcher.group(1), path, fileStringToFilePath));
+        lastIndex = matcher.end();
+      }
+      if (lastIndex < fileContents.length()) {
+        output.append(fileContents, lastIndex, fileContents.length());
+      }
+      writeToFile(output.toString(), path);
+    }
+  }
+
+  /**
+   * Delete the given file or directory if it exists. If {@code fileOrDirectory} is a directory,
+   * deletion is recursive.
+   *
+   * @param fileOrDirectory The file or directory to delete.
+   * @throws IOException If the operation failed.
+   */
+  public static void delete(Path fileOrDirectory) throws IOException {
+    if (Files.isRegularFile(fileOrDirectory)) {
+      Files.deleteIfExists(fileOrDirectory);
+    }
+    if (Files.isDirectory(fileOrDirectory)) {
+      deleteDirectory(fileOrDirectory);
+    }
+  }
+
+  /**
+   * Recursively delete a directory if it exists.
+   *
+   * @throws IOException If an I/O error occurs.
+   */
+  public static void deleteDirectory(Path dir) throws IOException {
+    if (Files.isDirectory(dir)) {
+      System.out.println("Cleaning " + dir);
+      List<Path> pathsToDelete = Files.walk(dir).sorted(Comparator.reverseOrder()).toList();
+      for (Path path : pathsToDelete) {
+        Files.deleteIfExists(path);
+      }
+    }
+  }
+
+  /**
+   * Return an absolute path to the given file or directory if it can be found within the package.
+   * Otherwise, return null.
+   *
+   * <p>NOTE: If the given file or directory is given as an absolute path but cannot be found, it is
+   * interpreted as a relative path with respect to the project root.
+   *
+   * @param fileOrDirectory The file or directory to look for.
+   * @param fileConfig A file configuration that determines where the package is located.
+   * @return An absolute path of the file or directory was found; null otherwise.
+   */
+  public static Path findInPackage(Path fileOrDirectory, FileConfig fileConfig) {
+    if (fileOrDirectory.isAbsolute() && Files.exists(fileOrDirectory)) {
+      return fileOrDirectory;
+    } else {
+      Path relPath;
+      // Disregard root and interpret as relative path
+      if (fileOrDirectory.isAbsolute()) {
+        relPath =
+            Paths.get(
+                String.valueOf(fileOrDirectory)
+                    .replaceFirst(String.valueOf(fileOrDirectory.getRoot()), ""));
+      } else {
+        relPath = fileOrDirectory;
+      }
+
+      // Look relative to the source file and relative to the package root.
+      var locations = List.of(fileConfig.srcPath, fileConfig.srcPkgPath);
+      var found = locations.stream().filter(loc -> Files.exists(loc.resolve(relPath))).findFirst();
+      if (found.isPresent()) {
+        return found.get().resolve(relPath).toAbsolutePath();
+      }
+    }
+    return null;
+  }
+
+  /** Get the iResource corresponding to the provided resource if it can be found. */
+  public static IResource getIResource(Resource r) throws IOException {
+    return getIResource(FileUtil.toPath(r).toFile().toURI());
+  }
+
+  /** Get the specified path as an Eclipse IResource or null if it is not found. */
+  public static IResource getIResource(Path path) {
+    IResource ret = getIResource(path.toUri());
+    if (ret != null) return ret;
+    try {
+      // Handle a bug that not everyone can reproduce in which a path originating in the Ecore model
+      // is a relative
+      // path prefixed with a segment named "resource".
+      return ResourcesPlugin.getWorkspace()
+          .getRoot()
+          .findMember(
+              org.eclipse.core.runtime.Path.fromOSString(
+                  path.subpath(1, path.getNameCount()).toString()));
+    } catch (IllegalStateException e) {
+      // We are outside of Eclipse.
+    }
+    return null;
+  }
+
+  /**
+   * Get the specified uri as an Eclipse IResource or null if it is not found.
+   *
+   * <p>Also returns null if this is not called from within a running Eclipse instance.
+   *
+   * @param uri A java.net.uri of the form "file://path".
+   */
+  public static IResource getIResource(java.net.URI uri) {
+    // For some peculiar reason known only to Eclipse developers,
+    // the resource cannot be used directly but has to be converted
+    // a resource relative to the workspace root.
+    try {
+      IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
+
+      IFile[] files = workspaceRoot.findFilesForLocationURI(uri);
+      if (files != null && files.length > 0 && files[0] != null) {
+        return files[0];
+      }
+    } catch (IllegalStateException e) {
+      // We are outside of Eclipse.
+    }
+    return null;
+  }
+
+  /**
+   * Write text to a file.
+   *
+   * @param text The text to be written.
+   * @param path The file to write the code to.
+   * @param skipIfUnchanged If true, don't overwrite the destination file if its content would not
+   *     be changed
+   */
+  public static void writeToFile(String text, Path path, boolean skipIfUnchanged)
+      throws IOException {
+    Files.createDirectories(path.getParent());
+    final byte[] bytes = text.getBytes();
+    if (skipIfUnchanged && Files.isRegularFile(path)) {
+      if (Arrays.equals(bytes, Files.readAllBytes(path))) {
+        return;
+      }
+    }
+    Files.write(path, text.getBytes());
+  }
+
+  /**
+   * Write text to a file.
+   *
+   * @param text The text to be written.
+   * @param path The file to write the code to.
+   */
+  public static void writeToFile(String text, Path path) throws IOException {
+    writeToFile(text, path, false);
+  }
+
+  /**
+   * Write text to a file.
+   *
+   * @param text The text to be written.
+   * @param path The file to write the code to.
+   */
+  public static void writeToFile(CharSequence text, Path path) throws IOException {
+    writeToFile(text.toString(), path, false);
+  }
+
+  public static void createDirectoryIfDoesNotExist(File dir) {
+    if (!dir.exists()) dir.mkdirs();
+  }
+
+  /**
+   * Return a list of files ending with "str".
+   *
+   * @param currentDir The current directory.
+   * @param str The pattern to match against.
+   */
+  public static List<Path> globFilesEndsWith(Path currentDir, String str) {
+    List<Path> matches = new ArrayList<>();
+    File[] files = currentDir.toFile().listFiles();
+    if (files != null) {
+      for (File file : files) {
+        if (file.isDirectory()) {
+          matches.addAll(globFilesEndsWith(file.toPath(), str));
         } else {
-            Path relPath;
-            // Disregard root and interpret as relative path
-            if (fileOrDirectory.isAbsolute()) {
-                relPath = Paths.get(
-                    String.valueOf(fileOrDirectory).replaceFirst(
-                        String.valueOf(fileOrDirectory.getRoot()),
-                        "")
-                );
-            } else {
-                relPath = fileOrDirectory;
-            }
-
-            // Look relative to the source file and relative to the package root.
-            var locations = List.of(fileConfig.srcPath, fileConfig.srcPkgPath);
-            var found = locations.stream().filter(
-                    loc -> Files.exists(loc.resolve(relPath))
-                ).findFirst();
-            if (found.isPresent()) {
-                return found.get().resolve(relPath).toAbsolutePath();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Get the iResource corresponding to the provided resource if it can be
-     * found.
-     */
-    public static IResource getIResource(Resource r) throws IOException {
-        return getIResource(FileUtil.toPath(r).toFile().toURI());
-    }
-
-    /**
-     * Get the specified path as an Eclipse IResource or null if it is not found.
-     */
-    public static IResource getIResource(Path path) {
-        IResource ret = getIResource(path.toUri());
-        if (ret != null) return ret;
-        try {
-            // Handle a bug that not everyone can reproduce in which a path originating in the Ecore model is a relative
-            // path prefixed with a segment named "resource".
-            return ResourcesPlugin.getWorkspace().getRoot().findMember(org.eclipse.core.runtime.Path.fromOSString(
-                path.subpath(1, path.getNameCount()).toString()
-            ));
-        } catch (IllegalStateException e) {
-            // We are outside of Eclipse.
-        }
-        return null;
-    }
-
-    /**
-     * Get the specified uri as an Eclipse IResource or null if it is not found.
-     *
-     * Also returns null if this is not called from within a running Eclipse instance.
-     *
-     * @param uri A java.net.uri of the form "file://path".
-     */
-    public static IResource getIResource(java.net.URI uri) {
-        // For some peculiar reason known only to Eclipse developers,
-        // the resource cannot be used directly but has to be converted
-        // a resource relative to the workspace root.
-        try {
-            IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-
-            IFile[] files = workspaceRoot.findFilesForLocationURI(uri);
-            if (files != null && files.length > 0 && files[0] != null) {
-                return files[0];
-            }
-        } catch (IllegalStateException e) {
-            // We are outside of Eclipse.
-        }
-        return null;
-    }
-
-    /**
-     * Write text to a file.
-     * @param text The text to be written.
-     * @param path The file to write the code to.
-     * @param skipIfUnchanged If true, don't overwrite the destination file if its content would not be changed
-     */
-    public static void writeToFile(String text, Path path, boolean skipIfUnchanged) throws IOException {
-        Files.createDirectories(path.getParent());
-        final byte[] bytes = text.getBytes();
-        if (skipIfUnchanged && Files.isRegularFile(path)) {
-            if (Arrays.equals(bytes, Files.readAllBytes(path))) {
-                return;
-            }
-        }
-        Files.write(path, text.getBytes());
-    }
-
-    /**
-     * Write text to a file.
-     * @param text The text to be written.
-     * @param path The file to write the code to.
-     */
-    public static void writeToFile(String text, Path path) throws IOException {
-        writeToFile(text, path, false);
-    }
-
-    /**
-     * Write text to a file.
-     * @param text The text to be written.
-     * @param path The file to write the code to.
-     */
-    public static void writeToFile(CharSequence text, Path path) throws IOException {
-        writeToFile(text.toString(), path, false);
-    }
-
-    public static void createDirectoryIfDoesNotExist(File dir) {
-        if (!dir.exists()) dir.mkdirs();
-    }
-
-    /**
-     * Return a list of files ending with "str".
-     *
-     * @param currentDir The current directory.
-     * @param str The pattern to match against.
-     */
-    public static List<Path> globFilesEndsWith(Path currentDir, String str) {
-        List<Path> matches = new ArrayList<>();
-        File[] files = currentDir.toFile().listFiles();
-        if (files != null) {
-            for (File file : files) {
-                if (file.isDirectory()) {
-                    matches.addAll(globFilesEndsWith(file.toPath(), str));
-                } else {
-                    if (file.getName().endsWith(str)) {
-                        matches.add(file.getAbsoluteFile().toPath());
-                    }
-                }
-            }
+          if (file.getName().endsWith(str)) {
+            matches.add(file.getAbsoluteFile().toPath());
+          }
         }
-        return matches;
+      }
     }
+    return matches;
+  }
 }
diff --git a/org.lflang/src/org/lflang/util/IteratorUtil.java b/org.lflang/src/org/lflang/util/IteratorUtil.java
index 37ddadf56d..559739ed00 100644
--- a/org.lflang/src/org/lflang/util/IteratorUtil.java
+++ b/org.lflang/src/org/lflang/util/IteratorUtil.java
@@ -4,8 +4,6 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import org.lflang.lf.Reactor;
-
 /**
  * A utility class for Iterator.
  *
@@ -14,55 +12,53 @@
  */
 public final class IteratorUtil {
 
-    private IteratorUtil() {
-        // Don't let anyone instantiate this class.
-    }
+  private IteratorUtil() {
+    // Don't let anyone instantiate this class.
+  }
+
+  /**
+   * Turn an iterator into a sequential stream.
+   *
+   * @param iterator The iterator to create a sequential stream for.
+   * @return A stream.
+   */
+  public static <T> Stream<T> asStream(Iterator<T> iterator) {
+    return asStream(iterator, false);
+  }
 
-    /**
-     * Turn an iterator into a sequential stream.
-     *
-     * @param iterator The iterator to create a sequential stream for.
-     * @return A stream.
-     */
-    public static <T> Stream<T> asStream(Iterator<T> iterator) {
-        return asStream(iterator, false);
-    }
+  /**
+   * Given an iterator of type T, turn it into a stream containing only the instances of the given
+   * class of type S.
+   *
+   * @param <T> The type of elements the iterator iterates over.
+   * @param <S> The type of class to filter out instance of.
+   * @param iterator An iterator of type T.
+   * @param cls A given class of type S.
+   * @return A filtered stream that only has in it instances of the given class.
+   */
+  public static <T, S> Stream<S> asFilteredStream(Iterator<T> iterator, Class<S> cls) {
+    return asStream(iterator, false).filter(cls::isInstance).map(cls::cast);
+  }
 
-    /**
-     * Given an iterator of type T, turn it into a stream containing only the
-     * instances of the given class of type S.
-     * 
-     * @param <T>      The type of elements the iterator iterates over.
-     * @param <S>      The type of class to filter out instance of.
-     * @param iterator An iterator of type T.
-     * @param cls      A given class of type S.
-     * @return A filtered stream that only has in it instances of the given
-     *         class.
-     */
-    public static <T, S> Stream<S> asFilteredStream(Iterator<T> iterator,
-            Class<S> cls) {
-        return asStream(iterator, false).filter(cls::isInstance).map(cls::cast);
-    }
-    
-    /**
-     * Turn an iterator into a sequential or parallel stream.
-     *
-     * @param iterator The iterator to create a stream for.
-     * @param parallel Whether or not the stream should be parallel.
-     * @return A stream.
-     */
-    public static <T> Stream<T> asStream(Iterator<T> iterator, boolean parallel) {
-        Iterable<T> iterable = () -> iterator;
-        return StreamSupport.stream(iterable.spliterator(), parallel);
-    }
+  /**
+   * Turn an iterator into a sequential or parallel stream.
+   *
+   * @param iterator The iterator to create a stream for.
+   * @param parallel Whether or not the stream should be parallel.
+   * @return A stream.
+   */
+  public static <T> Stream<T> asStream(Iterator<T> iterator, boolean parallel) {
+    Iterable<T> iterable = () -> iterator;
+    return StreamSupport.stream(iterable.spliterator(), parallel);
+  }
 
-    /**
-     * Function to get Iterable from Iterator.
-     *
-     * @param iterator The iterator to get an iterable from.
-     * @return An iterable.
-     */
-    public static <T> Iterable<T> asIterable(Iterator<T> iterator) {
-        return () -> iterator;
-    }
+  /**
+   * Function to get Iterable from Iterator.
+   *
+   * @param iterator The iterator to get an iterable from.
+   * @return An iterable.
+   */
+  public static <T> Iterable<T> asIterable(Iterator<T> iterator) {
+    return () -> iterator;
+  }
 }
diff --git a/org.lflang/src/org/lflang/util/LFCommand.java b/org.lflang/src/org/lflang/util/LFCommand.java
index 4f6927dcf0..4b4116f264 100644
--- a/org.lflang/src/org/lflang/util/LFCommand.java
+++ b/org.lflang/src/org/lflang/util/LFCommand.java
@@ -1,26 +1,26 @@
 /*************
- Copyright (c) 2019-2021 TU Dresden
- Copyright (c) 2019-2021 UC Berkeley
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) 2019-2021 TU Dresden
+ * Copyright (c) 2019-2021 UC Berkeley
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
 
 package org.lflang.util;
@@ -42,370 +42,353 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
 import org.eclipse.xtext.util.CancelIndicator;
 
 /**
  * An abstraction for an external command
- * <p>
- * This is a wrapper around ProcessBuilder which allows for a more convenient usage in our code base.
+ *
+ * <p>This is a wrapper around ProcessBuilder which allows for a more convenient usage in our code
+ * base.
  */
 public class LFCommand {
 
-    /**
-     * The period with which the cancel indicator is
-     * checked and the output and error streams are
-     * forwarded.
-     */
-    private static final int PERIOD_MILLISECONDS = 200;
-    /**
-     * The maximum amount of time to wait for the
-     * forwarding of output and error streams to finish.
-     */
-    private static final int READ_TIMEOUT_MILLISECONDS = 1000;
-
-    protected ProcessBuilder processBuilder;
-    protected boolean didRun = false;
-    protected ByteArrayOutputStream output = new ByteArrayOutputStream();
-    protected ByteArrayOutputStream errors = new ByteArrayOutputStream();
-    protected boolean quiet;
-
-
-    /**
-     * Construct an LFCommand that executes the command carried by {@code pb}.
-     */
-    protected LFCommand(ProcessBuilder pb, boolean quiet) {
-        this.processBuilder = pb;
-        this.quiet = quiet;
-    }
-
-
-    /**
-     * Get the output collected during command execution
-     */
-    public OutputStream getOutput() { return output; }
-
-
-    /**
-     * Get the error output collected during command execution
-     */
-    public OutputStream getErrors() { return errors; }
-
-    /** Get this command's program and arguments. */
-    public List<String> command() { return processBuilder.command(); }
-
-    /** Get this command's working directory. */
-    public File directory() { return processBuilder.directory(); }
-
-    /**
-     * Get a String representation of the stored command
-     */
-    public String toString() { return String.join(" ", processBuilder.command()); }
-
-
-    /**
-     * Collect as much output as possible from {@code in} without blocking, print it to
-     * {@code print} if not quiet, and store it in {@code store}.
-     */
-    private void collectOutput(InputStream in, ByteArrayOutputStream store, PrintStream print) {
-        byte[] buffer = new byte[64];
-        int len;
-        do {
-            try {
-                // This depends on in.available() being
-                //  greater than zero if data is available
-                //  (so that all data is collected)
-                //  and upper-bounded by maximum number of
-                //  bytes that can be read without blocking.
-                //  Only the latter of these two conditions
-                //  is guaranteed by the spec.
-                len = in.read(buffer, 0, Math.min(in.available(), buffer.length));
-                if (len > 0) {
-                    store.write(buffer, 0, len);
-                    if (!quiet) print.write(buffer, 0, len);
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-                break;
-            }
-        } while (len > 0);  // Do not necessarily continue
-        // to EOF (len == -1) because a blocking read
-        // operation is hard to interrupt.
-    }
-
-    /**
-     * Handle user cancellation if necessary, and handle any output from {@code process}
-     * otherwise.
-     * @param process a {@code Process}
-     * @param cancelIndicator a flag indicating whether a
-     *                        cancellation of {@code process}
-     *                        is requested
-     * directly to stderr and stdout).
-     */
-    private void poll(Process process, CancelIndicator cancelIndicator) {
-        if (cancelIndicator != null && cancelIndicator.isCanceled()) {
-            process.descendants().forEach(ProcessHandle::destroyForcibly);
-            process.destroyForcibly();
-        } else {
-            collectOutput(process.getInputStream(), output, System.out);
-            collectOutput(process.getErrorStream(), errors, System.err);
+  /**
+   * The period with which the cancel indicator is checked and the output and error streams are
+   * forwarded.
+   */
+  private static final int PERIOD_MILLISECONDS = 200;
+  /**
+   * The maximum amount of time to wait for the forwarding of output and error streams to finish.
+   */
+  private static final int READ_TIMEOUT_MILLISECONDS = 1000;
+
+  protected ProcessBuilder processBuilder;
+  protected boolean didRun = false;
+  protected ByteArrayOutputStream output = new ByteArrayOutputStream();
+  protected ByteArrayOutputStream errors = new ByteArrayOutputStream();
+  protected boolean quiet;
+
+  /** Construct an LFCommand that executes the command carried by {@code pb}. */
+  protected LFCommand(ProcessBuilder pb, boolean quiet) {
+    this.processBuilder = pb;
+    this.quiet = quiet;
+  }
+
+  /** Get the output collected during command execution */
+  public OutputStream getOutput() {
+    return output;
+  }
+
+  /** Get the error output collected during command execution */
+  public OutputStream getErrors() {
+    return errors;
+  }
+
+  /** Get this command's program and arguments. */
+  public List<String> command() {
+    return processBuilder.command();
+  }
+
+  /** Get this command's working directory. */
+  public File directory() {
+    return processBuilder.directory();
+  }
+
+  /** Get a String representation of the stored command */
+  public String toString() {
+    return String.join(" ", processBuilder.command());
+  }
+
+  /**
+   * Collect as much output as possible from {@code in} without blocking, print it to {@code print}
+   * if not quiet, and store it in {@code store}.
+   */
+  private void collectOutput(InputStream in, ByteArrayOutputStream store, PrintStream print) {
+    byte[] buffer = new byte[64];
+    int len;
+    do {
+      try {
+        // This depends on in.available() being
+        //  greater than zero if data is available
+        //  (so that all data is collected)
+        //  and upper-bounded by maximum number of
+        //  bytes that can be read without blocking.
+        //  Only the latter of these two conditions
+        //  is guaranteed by the spec.
+        len = in.read(buffer, 0, Math.min(in.available(), buffer.length));
+        if (len > 0) {
+          store.write(buffer, 0, len);
+          if (!quiet) print.write(buffer, 0, len);
         }
+      } catch (IOException e) {
+        e.printStackTrace();
+        break;
+      }
+    } while (len > 0); // Do not necessarily continue
+    // to EOF (len == -1) because a blocking read
+    // operation is hard to interrupt.
+  }
+
+  /**
+   * Handle user cancellation if necessary, and handle any output from {@code process} otherwise.
+   *
+   * @param process a {@code Process}
+   * @param cancelIndicator a flag indicating whether a cancellation of {@code process} is requested
+   *     directly to stderr and stdout).
+   */
+  private void poll(Process process, CancelIndicator cancelIndicator) {
+    if (cancelIndicator != null && cancelIndicator.isCanceled()) {
+      process.descendants().forEach(ProcessHandle::destroyForcibly);
+      process.destroyForcibly();
+    } else {
+      collectOutput(process.getInputStream(), output, System.out);
+      collectOutput(process.getErrorStream(), errors, System.err);
     }
-
-
-    /**
-     * Execute the command.
-     * <p>
-     * Executing a process directly with {@code processBuilder.start()} could
-     * lead to a deadlock as the subprocess blocks when output or error
-     * buffers are full. This method ensures that output and error messages
-     * are continuously read and forwards them to the system output and
-     * error streams as well as to the output and error streams hold in
-     * this class.
-     * </p>
-     * <p>
-     * If the current operation is cancelled (as indicated
-     * by <code>cancelIndicator</code>), the subprocess
-     * is destroyed. Output and error streams until that
-     * point are still collected.
-     * </p>
-     *
-     * @param cancelIndicator The indicator of whether the underlying process
-     * should be terminated.
-     * @return the process' return code
-     * @author Christian Menard
-     */
-    public int run(CancelIndicator cancelIndicator) {
-        assert !didRun;
-        didRun = true;
-
-        System.out.println("--- Current working directory: " + processBuilder.directory().toString());
-        System.out.println("--- Executing command: " + String.join(" ", processBuilder.command()));
-
-        final Process process = startProcess();
-        if (process == null) return -1;
-
-        ScheduledExecutorService poller = Executors.newSingleThreadScheduledExecutor();
-        poller.scheduleAtFixedRate(
-            () -> poll(process, cancelIndicator),
-            0, PERIOD_MILLISECONDS, TimeUnit.MILLISECONDS
-        );
-
-        try {
-            final int returnCode = process.waitFor();
-            poller.shutdown();
-            poller.awaitTermination(READ_TIMEOUT_MILLISECONDS, TimeUnit.MILLISECONDS);
-            // Finish collecting any remaining data
-            poll(process, cancelIndicator);
-            return returnCode;
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-            return -2;
-        }
+  }
+
+  /**
+   * Execute the command.
+   *
+   * <p>Executing a process directly with {@code processBuilder.start()} could lead to a deadlock as
+   * the subprocess blocks when output or error buffers are full. This method ensures that output
+   * and error messages are continuously read and forwards them to the system output and error
+   * streams as well as to the output and error streams hold in this class.
+   *
+   * <p>If the current operation is cancelled (as indicated by <code>cancelIndicator</code>), the
+   * subprocess is destroyed. Output and error streams until that point are still collected.
+   *
+   * @param cancelIndicator The indicator of whether the underlying process should be terminated.
+   * @return the process' return code
+   * @author Christian Menard
+   */
+  public int run(CancelIndicator cancelIndicator) {
+    assert !didRun;
+    didRun = true;
+
+    System.out.println("--- Current working directory: " + processBuilder.directory().toString());
+    System.out.println("--- Executing command: " + String.join(" ", processBuilder.command()));
+
+    final Process process = startProcess();
+    if (process == null) return -1;
+
+    ScheduledExecutorService poller = Executors.newSingleThreadScheduledExecutor();
+    poller.scheduleAtFixedRate(
+        () -> poll(process, cancelIndicator), 0, PERIOD_MILLISECONDS, TimeUnit.MILLISECONDS);
+
+    try {
+      final int returnCode = process.waitFor();
+      poller.shutdown();
+      poller.awaitTermination(READ_TIMEOUT_MILLISECONDS, TimeUnit.MILLISECONDS);
+      // Finish collecting any remaining data
+      poll(process, cancelIndicator);
+      return returnCode;
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      return -2;
     }
-
-    /**
-     * Execute the command. Do not allow user cancellation.
-     * @return the process' return code
-     */
-    public int run() {
-        return run(null);
-    }
-
-
-    /**
-     * Add the given variables and their values to the command's environment.
-     *
-     * @param variables A map of variable names and their values
-     */
-    public void setEnvironmentVariables(Map<String, String> variables) {
-        processBuilder.environment().putAll(variables);
+  }
+
+  /**
+   * Execute the command. Do not allow user cancellation.
+   *
+   * @return the process' return code
+   */
+  public int run() {
+    return run(null);
+  }
+
+  /**
+   * Add the given variables and their values to the command's environment.
+   *
+   * @param variables A map of variable names and their values
+   */
+  public void setEnvironmentVariables(Map<String, String> variables) {
+    processBuilder.environment().putAll(variables);
+  }
+
+  /**
+   * Add the given variable and its value to the command's environment.
+   *
+   * @param variableName name of the variable to add
+   * @param value the variable's value
+   */
+  public void setEnvironmentVariable(String variableName, String value) {
+    processBuilder.environment().put(variableName, value);
+  }
+
+  /**
+   * Replace the given variable and its value in the command's environment.
+   *
+   * @param variableName name of the variable to add
+   * @param value the variable's value
+   */
+  public void replaceEnvironmentVariable(String variableName, String value) {
+    processBuilder.environment().remove(variableName);
+    processBuilder.environment().put(variableName, value);
+  }
+
+  /** Require this to be quiet, overriding the verbosity specified at construction time. */
+  public void setQuiet() {
+    quiet = true;
+  }
+
+  /**
+   * Create a LFCommand instance from a given command and argument list in the current working
+   * directory.
+   *
+   * @see #get(String, List, boolean, Path)
+   */
+  public static LFCommand get(final String cmd, final List<String> args) {
+    return get(cmd, args, false, Paths.get(""));
+  }
+
+  /**
+   * Create a LFCommand instance from a given command and argument list in the current working
+   * directory.
+   *
+   * @see #get(String, List, boolean, Path)
+   */
+  public static LFCommand get(final String cmd, final List<String> args, boolean quiet) {
+    return get(cmd, args, quiet, Paths.get(""));
+  }
+
+  /**
+   * Create a LFCommand instance from a given command, an argument list and a directory.
+   *
+   * <p>This will check first if the command can actually be found and executed. If the command is
+   * not found, null is returned. In order to find the command, different methods are applied in the
+   * following order:
+   *
+   * <p>1. Check if the given command {@code cmd} is an executable file within {@code dir}. 2. If
+   * the above fails 'which <cmd>' (or 'where <cmd>' on Windows) is executed to see if the command
+   * is available on the PATH. 3. If both points above fail, a third attempt is started using bash
+   * to indirectly execute the command (see below for an explanation).
+   *
+   * <p>A bit more context: If the command cannot be found directly, then a second attempt is made
+   * using a Bash shell with the --login option, which sources the user's ~/.bash_profile,
+   * ~/.bash_login, or ~/.bashrc (whichever is first found) before running the command. This helps
+   * to ensure that the user's PATH variable is set according to their usual environment, assuming
+   * that they use a bash shell.
+   *
+   * <p>More information: Unfortunately, at least on a Mac if you are running within Eclipse, the
+   * PATH variable is extremely limited; supposedly, it is given by the default provided in
+   * /etc/paths, but at least on my machine, it does not even include directories in that file for
+   * some reason. One way to add a directory like /usr/local/bin to the path once-and-for-all is
+   * this:
+   *
+   * <p>sudo launchctl config user path /usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
+   *
+   * <p>But asking users to do that is not ideal. Hence, we try a more hack-y approach of just
+   * trying to execute using a bash shell. Also note that while ProcessBuilder can be configured to
+   * use custom environment variables, these variables do not affect the command that is to be
+   * executed but merely the environment in which the command executes.
+   *
+   * @param cmd The command
+   * @param args A list of arguments to pass to the command
+   * @param quiet If true, the commands stdout and stderr will be suppressed
+   * @param dir The directory in which the command should be executed
+   * @return Returns an LFCommand if the given command could be found or null otherwise.
+   */
+  public static LFCommand get(final String cmd, final List<String> args, boolean quiet, Path dir) {
+    assert cmd != null && args != null && dir != null;
+    dir = dir.toAbsolutePath();
+
+    // a list containing the command as first element and then all arguments
+    List<String> cmdList = new ArrayList<>();
+    cmdList.add(cmd);
+    cmdList.addAll(args);
+
+    ProcessBuilder builder = null;
+
+    // First, see if the command is a local executable file
+    final File cmdFile = dir.resolve(cmd).toFile();
+    if (cmdFile.exists() && cmdFile.canExecute()) {
+      builder = new ProcessBuilder(cmdList);
+    } else if (findCommand(cmd) != null) {
+      builder = new ProcessBuilder(cmdList);
+    } else if (checkIfCommandIsExecutableWithBash(cmd, dir)) {
+      builder =
+          new ProcessBuilder(
+              "bash", "--login", "-c", String.format("\"%s\"", String.join(" ", cmdList)));
     }
 
-
-    /**
-     * Add the given variable and its value to the command's environment.
-     *
-     * @param variableName name of the variable to add
-     * @param value        the variable's value
-     */
-    public void setEnvironmentVariable(String variableName, String value) {
-        processBuilder.environment().put(variableName, value);
-    }
-    
-    /**
-     * Replace the given variable and its value in the command's environment.
-     * 
-     * @param variableName name of the variable to add
-     * @param value        the variable's value
-     */
-    public void replaceEnvironmentVariable(String variableName, String value) {
-        processBuilder.environment().remove(variableName);
-        processBuilder.environment().put(variableName, value);
+    if (builder != null) {
+      builder.directory(dir.toFile());
+      return new LFCommand(builder, quiet);
     }
 
-    /**
-     * Require this to be quiet, overriding the verbosity specified at construction time.
-     */
-    public void setQuiet() {
-        quiet = true;
+    return null;
+  }
+
+  /**
+   * Search for matches to the given command by following the PATH environment variable.
+   *
+   * @param command A command for which to search.
+   * @return The file locations of matches to the given command.
+   */
+  private static List<File> findCommand(final String command) {
+    final String whichCmd = System.getProperty("os.name").startsWith("Windows") ? "where" : "which";
+    final ProcessBuilder whichBuilder = new ProcessBuilder(List.of(whichCmd, command));
+    try {
+      Process p = whichBuilder.start();
+      if (p.waitFor() != 0) return null;
+      return Arrays.stream(new String(p.getInputStream().readAllBytes()).split("\n"))
+          .map(String::strip)
+          .map(File::new)
+          .filter(File::canExecute)
+          .collect(Collectors.toList());
+    } catch (InterruptedException | IOException e) {
+      e.printStackTrace();
+      return null;
     }
-
-    /**
-     * Create a LFCommand instance from a given command and argument list in the current working directory.
-     *
-     * @see #get(String, List, boolean, Path)
-     */
-    public static LFCommand get(final String cmd, final List<String> args) {
-        return get(cmd, args, false, Paths.get(""));
+  }
+
+  /**
+   * Attempt to start the execution of this command.
+   *
+   * <p>First collect a list of paths where the executable might be found, then select an executable
+   * that successfully executes from the list of paths. Return the {@code Process} instance that is
+   * the result of a successful execution, or {@code null} if no successful execution happened.
+   *
+   * @return The {@code Process} that is started by this command, or {@code null} in case of
+   *     failure.
+   */
+  private Process startProcess() {
+    ArrayDeque<String> commands = new ArrayDeque<>();
+    List<File> matchesOnPath = findCommand(processBuilder.command().get(0));
+    if (matchesOnPath != null) {
+      matchesOnPath.stream().map(File::toString).forEach(commands::addLast);
     }
-
-    /**
-     * Create a LFCommand instance from a given command and argument list in the current working directory.
-     *
-     * @see #get(String, List, boolean, Path)
-     */
-    public static LFCommand get(final String cmd, final List<String> args, boolean quiet) {
-        return get(cmd, args, quiet, Paths.get(""));
-    }
-
-
-    /**
-     * Create a LFCommand instance from a given command, an argument list and a directory.
-     * <p>
-     * This will check first if the command can actually be found and executed. If the command is not found, null is
-     * returned. In order to find the command, different methods are applied in the following order:
-     * <p>
-     * 1. Check if the given command {@code cmd} is an executable file within {@code dir}.
-     * 2. If the above fails 'which <cmd>' (or 'where <cmd>' on Windows) is executed to see if the command is available
-     * on the PATH.
-     * 3. If both points above fail, a third attempt is started using bash to indirectly execute the command (see below
-     * for an explanation).
-     * <p>
-     * A bit more context:
-     * If the command cannot be found directly, then a second attempt is made using a Bash shell with the --login
-     * option, which sources the user's ~/.bash_profile, ~/.bash_login, or ~/.bashrc (whichever is first found) before
-     * running the command. This helps to ensure that the user's PATH variable is set according to their usual
-     * environment, assuming that they use a bash shell.
-     * <p>
-     * More information: Unfortunately, at least on a Mac if you are running within Eclipse, the PATH variable is
-     * extremely limited; supposedly, it is given by the default provided in /etc/paths, but at least on my machine, it
-     * does not even include directories in that file for some reason. One way to add a directory like /usr/local/bin
-     * to
-     * the path once-and-for-all is this:
-     * <p>
-     * sudo launchctl config user path /usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
-     * <p>
-     * But asking users to do that is not ideal. Hence, we try a more hack-y approach of just trying to execute using a
-     * bash shell. Also note that while ProcessBuilder can be configured to use custom environment variables, these
-     * variables do not affect the command that is to be executed but merely the environment in which the command
-     * executes.
-     *
-     * @param cmd  The command
-     * @param args A list of arguments to pass to the command
-     * @param quiet If true, the commands stdout and stderr will be suppressed
-     * @param dir  The directory in which the command should be executed
-     * @return Returns an LFCommand if the given command could be found or null otherwise.
-     */
-    public static LFCommand get(final String cmd, final List<String> args, boolean quiet, Path dir) {
-        assert cmd != null && args != null && dir != null;
-        dir = dir.toAbsolutePath();
-
-        // a list containing the command as first element and then all arguments
-        List<String> cmdList = new ArrayList<>();
-        cmdList.add(cmd);
-        cmdList.addAll(args);
-
-        ProcessBuilder builder = null;
-
-        // First, see if the command is a local executable file
-        final File cmdFile = dir.resolve(cmd).toFile();
-        if (cmdFile.exists() && cmdFile.canExecute()) {
-            builder = new ProcessBuilder(cmdList);
-        } else if (findCommand(cmd) != null) {
-            builder = new ProcessBuilder(cmdList);
-        } else if (checkIfCommandIsExecutableWithBash(cmd, dir)) {
-            builder = new ProcessBuilder("bash", "--login", "-c", String.format("\"%s\"", String.join(" ", cmdList)));
-        }
-
-        if (builder != null) {
-            builder.directory(dir.toFile());
-            return new LFCommand(builder, quiet);
-        }
-
-        return null;
-    }
-
-
-    /**
-     * Search for matches to the given command by following the PATH environment variable.
-     * @param command A command for which to search.
-     * @return The file locations of matches to the given command.
-     */
-    private static List<File> findCommand(final String command) {
-        final String whichCmd = System.getProperty("os.name").startsWith("Windows") ? "where" : "which";
-        final ProcessBuilder whichBuilder = new ProcessBuilder(List.of(whichCmd, command));
-        try {
-            Process p = whichBuilder.start();
-            if (p.waitFor() != 0) return null;
-            return Arrays.stream(new String(p.getInputStream().readAllBytes()).split("\n"))
-                .map(String::strip).map(File::new).filter(File::canExecute).collect(Collectors.toList());
-        } catch (InterruptedException | IOException e) {
-            e.printStackTrace();
-            return null;
+    while (true) {
+      try {
+        return processBuilder.start();
+      } catch (IOException e) {
+        if (commands.isEmpty()) {
+          e.printStackTrace();
+          return null;
         }
+      }
+      processBuilder.command().set(0, commands.removeFirst());
     }
+  }
 
-    /**
-     * Attempt to start the execution of this command.
-     * 
-     * First collect a list of paths where the executable might be found,
-     * then select an executable that successfully executes from the 
-     * list of paths. Return the {@code Process} instance that is the 
-     * result of a successful execution, or {@code null} if no successful
-     * execution happened.
-     * @return The {@code Process} that is started by this command, or {@code null} in case of failure.
-     */
-    private Process startProcess() {
-        ArrayDeque<String> commands = new ArrayDeque<>();
-        List<File> matchesOnPath = findCommand(processBuilder.command().get(0));
-        if (matchesOnPath != null) {
-            matchesOnPath.stream().map(File::toString).forEach(commands::addLast);
-        }
-        while (true) {
-            try {
-                return processBuilder.start();
-            } catch (IOException e) {
-                if (commands.isEmpty()) {
-                    e.printStackTrace();
-                    return null;
-                }
-            }
-            processBuilder.command().set(0, commands.removeFirst());
-        }
+  private static boolean checkIfCommandIsExecutableWithBash(final String command, final Path dir) {
+    // check first if bash is installed
+    if (findCommand("bash") == null) {
+      return false;
     }
 
-
-    private static boolean checkIfCommandIsExecutableWithBash(final String command, final Path dir) {
-        // check first if bash is installed
-        if (findCommand("bash") == null) {
-            return false;
-        }
-
-        // then try to find command with bash
-        final ProcessBuilder bashBuilder = new ProcessBuilder(List.of(
-            "bash",
-            "--login",
-            "-c",
-            String.format("\"which %s\"", command)
-        ));
-        bashBuilder.directory(dir.toFile());
-        try {
-            int bashReturn = bashBuilder.start().waitFor();
-            return bashReturn == 0;
-        } catch (InterruptedException | IOException e) {
-            e.printStackTrace();
-            return false;
-        }
+    // then try to find command with bash
+    final ProcessBuilder bashBuilder =
+        new ProcessBuilder(
+            List.of("bash", "--login", "-c", String.format("\"which %s\"", command)));
+    bashBuilder.directory(dir.toFile());
+    try {
+      int bashReturn = bashBuilder.start().waitFor();
+      return bashReturn == 0;
+    } catch (InterruptedException | IOException e) {
+      e.printStackTrace();
+      return false;
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/util/Pair.java b/org.lflang/src/org/lflang/util/Pair.java
index 2de5923a30..a1fb07ac7b 100644
--- a/org.lflang/src/org/lflang/util/Pair.java
+++ b/org.lflang/src/org/lflang/util/Pair.java
@@ -1,21 +1,21 @@
 package org.lflang.util;
 
 public class Pair<F, S> {
-    private final F first; 
-    private final S second; 
+  private final F first;
+  private final S second;
 
-    public Pair(F first, S second) {
-        this.first = first;
-        this.second = second;
-    }
+  public Pair(F first, S second) {
+    this.first = first;
+    this.second = second;
+  }
 
-    public F getFirst() {
-        return first;
-    }
+  public F getFirst() {
+    return first;
+  }
 
-    public S getSecond() {
-        return second;
-    }
+  public S getSecond() {
+    return second;
+  }
 }
 
-//TimeValue maxSTP = findMaxSTP(connection, coordination);
\ No newline at end of file
+// TimeValue maxSTP = findMaxSTP(connection, coordination);
diff --git a/org.lflang/src/org/lflang/util/StringUtil.java b/org.lflang/src/org/lflang/util/StringUtil.java
index 31beef8a9b..516f340c06 100644
--- a/org.lflang/src/org/lflang/util/StringUtil.java
+++ b/org.lflang/src/org/lflang/util/StringUtil.java
@@ -36,137 +36,133 @@
  */
 public final class StringUtil {
 
-    /**
-     * Matches the boundary of a camel-case word. That's a zero-length match.
-     */
-    private static final Pattern CAMEL_WORD_BOUNDARY =
-        Pattern.compile("(?<![A-Z])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])");
+  /** Matches the boundary of a camel-case word. That's a zero-length match. */
+  private static final Pattern CAMEL_WORD_BOUNDARY =
+      Pattern.compile("(?<![A-Z])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])");
 
-    private StringUtil() {
-        // utility class
-    }
+  private StringUtil() {
+    // utility class
+  }
 
-    /**
-     * Convert a string in Camel case to snake case. E.g.
-     * {@code MinimalReactor} will be converted to {@code minimal_reactor}.
-     * The string is assumed to be a single camel case identifier
-     * (no whitespace).
-     */
-    public static String camelToSnakeCase(String str) {
-        return CAMEL_WORD_BOUNDARY.splitAsStream(str)
-                                  .filter(it -> !it.isEmpty())
-                                  .map(it -> it.toLowerCase(Locale.ROOT))
-                                  .collect(Collectors.joining("_"));
-    }
+  /**
+   * Convert a string in Camel case to snake case. E.g. {@code MinimalReactor} will be converted to
+   * {@code minimal_reactor}. The string is assumed to be a single camel case identifier (no
+   * whitespace).
+   */
+  public static String camelToSnakeCase(String str) {
+    return CAMEL_WORD_BOUNDARY
+        .splitAsStream(str)
+        .filter(it -> !it.isEmpty())
+        .map(it -> it.toLowerCase(Locale.ROOT))
+        .collect(Collectors.joining("_"));
+  }
 
-    /**
-     * If the given string is surrounded by single or double
-     * quotes, returns what's inside the quotes. Otherwise
-     * returns the same string.
-     *
-     * <p>Returns null if the parameter is null.
-     */
-    public static String removeQuotes(String str) {
-        if (str == null) {
-            return null;
-        }
-        if (str.length() < 2) {
-            return str;
-        }
-        if (hasQuotes(str)) {
-            return str.substring(1, str.length() - 1);
-        }
-        return str;
+  /**
+   * If the given string is surrounded by single or double quotes, returns what's inside the quotes.
+   * Otherwise returns the same string.
+   *
+   * <p>Returns null if the parameter is null.
+   */
+  public static String removeQuotes(String str) {
+    if (str == null) {
+      return null;
+    }
+    if (str.length() < 2) {
+      return str;
+    }
+    if (hasQuotes(str)) {
+      return str.substring(1, str.length() - 1);
     }
+    return str;
+  }
 
-    /**
-     * Return true if the given string is surrounded by single or double
-     * quotes,
-     */
-    public static boolean hasQuotes(String str) {
-        if (str == null) {
-            return false;
-        }
-        return str.startsWith("\"") && str.endsWith("\"") || str.startsWith("'") && str.endsWith("'");
+  /** Return true if the given string is surrounded by single or double quotes, */
+  public static boolean hasQuotes(String str) {
+    if (str == null) {
+      return false;
     }
+    return str.startsWith("\"") && str.endsWith("\"") || str.startsWith("'") && str.endsWith("'");
+  }
 
-    /**
-     * Intelligently trim the white space in a code block.
-	 *
-	 * The leading whitespaces of the first non-empty
-	 * code line is considered as a common prefix across all code lines. If the
-	 * remaining code lines indeed start with this prefix, it removes the prefix
-	 * from the code line.
-	 *
-     * For examples, this code
-     * <pre>{@code
-     *        int test = 4;
-     *        if (test == 42) {
-     *            printf("Hello\n");
-     *        }
-     * }</pre>
-     * will be trimmed to this:
-     * <pre>{@code
-     * int test = 4;
-     * if (test == 42) {
-     *     printf("Hello\n");
-     * }
-     * }</pre>
-     *
-     * @param code the code block to be trimmed
-     * @param firstLineToConsider The first line not to ignore.
-     * @return trimmed code block
-     */
-    public static String trimCodeBlock(String code, int firstLineToConsider) {
-        String[] codeLines = code.split("(\r\n?)|\n");
-        int prefix = getWhitespacePrefix(code, firstLineToConsider);
-        StringBuilder buffer = new StringBuilder();
-        boolean stillProcessingLeadingBlankLines = true;
-        for (int i = 0; i < firstLineToConsider; i++) {
-            var endIndex = codeLines[i].contains("//") ?
-                codeLines[i].indexOf("//") : codeLines[i].length();
-            // The following will break Rust attributes in multiline code blocks
-            // where they appear next to the opening {= brace.
-            endIndex = codeLines[i].contains("#") ?
-                Math.min(endIndex, codeLines[i].indexOf("#")) : endIndex;
-            String toAppend = codeLines[i].substring(0, endIndex).strip();
-            if (!toAppend.isBlank()) buffer.append(toAppend).append("\n");
-        }
-        for (int i = firstLineToConsider; i < codeLines.length; i++) {
-            final String line = codeLines[i];
-            if (!line.isBlank()) stillProcessingLeadingBlankLines = false;
-            if (stillProcessingLeadingBlankLines) continue;
-            if (!line.isBlank()) buffer.append(line.substring(prefix));
-            buffer.append("\n");
-        }
-        return buffer.toString().stripTrailing();
+  /**
+   * Intelligently trim the white space in a code block.
+   *
+   * <p>The leading whitespaces of the first non-empty code line is considered as a common prefix
+   * across all code lines. If the remaining code lines indeed start with this prefix, it removes
+   * the prefix from the code line.
+   *
+   * <p>For examples, this code
+   *
+   * <pre>{@code
+   * int test = 4;
+   * if (test == 42) {
+   *     printf("Hello\n");
+   * }
+   * }</pre>
+   *
+   * will be trimmed to this:
+   *
+   * <pre>{@code
+   * int test = 4;
+   * if (test == 42) {
+   *     printf("Hello\n");
+   * }
+   * }</pre>
+   *
+   * @param code the code block to be trimmed
+   * @param firstLineToConsider The first line not to ignore.
+   * @return trimmed code block
+   */
+  public static String trimCodeBlock(String code, int firstLineToConsider) {
+    String[] codeLines = code.split("(\r\n?)|\n");
+    int prefix = getWhitespacePrefix(code, firstLineToConsider);
+    StringBuilder buffer = new StringBuilder();
+    boolean stillProcessingLeadingBlankLines = true;
+    for (int i = 0; i < firstLineToConsider; i++) {
+      var endIndex =
+          codeLines[i].contains("//") ? codeLines[i].indexOf("//") : codeLines[i].length();
+      // The following will break Rust attributes in multiline code blocks
+      // where they appear next to the opening {= brace.
+      endIndex =
+          codeLines[i].contains("#") ? Math.min(endIndex, codeLines[i].indexOf("#")) : endIndex;
+      String toAppend = codeLines[i].substring(0, endIndex).strip();
+      if (!toAppend.isBlank()) buffer.append(toAppend).append("\n");
+    }
+    for (int i = firstLineToConsider; i < codeLines.length; i++) {
+      final String line = codeLines[i];
+      if (!line.isBlank()) stillProcessingLeadingBlankLines = false;
+      if (stillProcessingLeadingBlankLines) continue;
+      if (!line.isBlank()) buffer.append(line.substring(prefix));
+      buffer.append("\n");
     }
+    return buffer.toString().stripTrailing();
+  }
 
-    private static int getWhitespacePrefix(String code, int firstLineToConsider) {
-        String[] codeLines = code.split("(\r\n?)|\n");
-        int minLength = Integer.MAX_VALUE;
-        for (int j = firstLineToConsider; j < codeLines.length; j++) {
-            String line = codeLines[j];
-            for (var i = 0; i < line.length(); i++) {
-                if (!Character.isWhitespace(line.charAt(i))) {
-                    minLength = Math.min(minLength, i);
-                    break;
-                }
-            }
+  private static int getWhitespacePrefix(String code, int firstLineToConsider) {
+    String[] codeLines = code.split("(\r\n?)|\n");
+    int minLength = Integer.MAX_VALUE;
+    for (int j = firstLineToConsider; j < codeLines.length; j++) {
+      String line = codeLines[j];
+      for (var i = 0; i < line.length(); i++) {
+        if (!Character.isWhitespace(line.charAt(i))) {
+          minLength = Math.min(minLength, i);
+          break;
         }
-        return minLength == Integer.MAX_VALUE ? 0 : minLength;
+      }
     }
+    return minLength == Integer.MAX_VALUE ? 0 : minLength;
+  }
 
-    public static String addDoubleQuotes(String str) {
-        return "\""+str+"\"";
-    }
+  public static String addDoubleQuotes(String str) {
+    return "\"" + str + "\"";
+  }
 
-    public static <T> String joinObjects(List<T> things, String delimiter) {
-        return things.stream().map(T::toString).collect(Collectors.joining(delimiter));
-    }
+  public static <T> String joinObjects(List<T> things, String delimiter) {
+    return things.stream().map(T::toString).collect(Collectors.joining(delimiter));
+  }
 
-    /** Normalize end-of-line sequences to the Linux style. */
-    public static String normalizeEol(String s) {
-        return s.replaceAll("(\\r\\n?)|\\n", "\n");
-    }
+  /** Normalize end-of-line sequences to the Linux style. */
+  public static String normalizeEol(String s) {
+    return s.replaceAll("(\\r\\n?)|\\n", "\n");
+  }
 }
diff --git a/org.lflang/src/org/lflang/util/TargetResourceNotFoundException.java b/org.lflang/src/org/lflang/util/TargetResourceNotFoundException.java
index dfcc1d671a..acc55fb0f3 100644
--- a/org.lflang/src/org/lflang/util/TargetResourceNotFoundException.java
+++ b/org.lflang/src/org/lflang/util/TargetResourceNotFoundException.java
@@ -3,12 +3,15 @@
 import java.io.IOException;
 
 public class TargetResourceNotFoundException extends IOException {
-    public TargetResourceNotFoundException(String resourcePath) {
-        super(String.format("""
+  public TargetResourceNotFoundException(String resourcePath) {
+    super(
+        String.format(
+            """
             A required resource could not be found on the classpath or is an empty directory: %s
             Perhaps a git submodule is missing or not up to date.
             Try running 'git submodule update --init --recursive' and rebuild.
-            Also see https://www.lf-lang.org/docs/handbook/developer-setup. 
-            """, resourcePath));
-    }
+            Also see https://www.lf-lang.org/docs/handbook/developer-setup.
+            """,
+            resourcePath));
+  }
 }
diff --git a/org.lflang/src/org/lflang/validation/AttributeSpec.java b/org.lflang/src/org/lflang/validation/AttributeSpec.java
index 59c69c255f..71ec56e53c 100644
--- a/org.lflang/src/org/lflang/validation/AttributeSpec.java
+++ b/org.lflang/src/org/lflang/validation/AttributeSpec.java
@@ -1,16 +1,16 @@
 /*************
  * Copyright (c) 2019-2022, The University of California at Berkeley.
-
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
-
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
-
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
-
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -31,7 +31,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.AttrParm;
 import org.lflang.lf.Attribute;
@@ -40,192 +39,189 @@
 
 /**
  * Specification of the structure of an attribute annotation.
+ *
  * @author Clément Fournier
  * @author Shaokai Lin
  */
 public class AttributeSpec {
 
-    private final Map<String, AttrParamSpec> paramSpecByName;
+  private final Map<String, AttrParamSpec> paramSpecByName;
 
-    public static final String VALUE_ATTR = "value";
-    public static final String NETWORK_MESSAGE_ACTIONS = "network_message_actions";
-    public static final String DEPENDENCY_PAIRS = "dependencyPairs";
-    public static final String EACH_ATTR = "each";
+  public static final String VALUE_ATTR = "value";
+  public static final String NETWORK_MESSAGE_ACTIONS = "network_message_actions";
+  public static final String DEPENDENCY_PAIRS = "dependencyPairs";
+  public static final String EACH_ATTR = "each";
 
-    /** A map from a string to a supported AttributeSpec */
-    public static final Map<String, AttributeSpec> ATTRIBUTE_SPECS_BY_NAME = new HashMap<>();
+  /** A map from a string to a supported AttributeSpec */
+  public static final Map<String, AttributeSpec> ATTRIBUTE_SPECS_BY_NAME = new HashMap<>();
 
-    public AttributeSpec(List<AttrParamSpec> params) {
-        if (params != null) {
-            paramSpecByName = params.stream().collect(Collectors.toMap(it -> it.name, it -> it));
-        } else {
-            paramSpecByName = null;
-        }
+  public AttributeSpec(List<AttrParamSpec> params) {
+    if (params != null) {
+      paramSpecByName = params.stream().collect(Collectors.toMap(it -> it.name, it -> it));
+    } else {
+      paramSpecByName = null;
+    }
+  }
+
+  /** Check that the attribute conforms to this spec and whether attr has the correct name. */
+  public void check(LFValidator validator, Attribute attr) {
+    Set<String> seen;
+    // If there is just one parameter, it is required to be named "value".
+    if (attr.getAttrParms() != null
+        && attr.getAttrParms().size() == 1
+        && attr.getAttrParms().get(0).getName() == null) {
+      // If we are in this branch,
+      // then the user has provided @attr("value"),
+      // which is a shorthand for @attr(value="value").
+      if (paramSpecByName == null) {
+        validator.error("Attribute doesn't take a parameter.", Literals.ATTRIBUTE__ATTR_NAME);
+        return;
+      }
+      AttrParamSpec valueSpec = paramSpecByName.get(VALUE_ATTR);
+      if (valueSpec == null) {
+        validator.error("Attribute doesn't have a 'value' parameter.", Literals.ATTR_PARM__NAME);
+        return;
+      }
+
+      valueSpec.check(validator, attr.getAttrParms().get(0));
+      seen = Set.of(VALUE_ATTR);
+    } else {
+      // Process multiple parameters, each of which has to be named.
+      seen = processNamedAttrParms(validator, attr);
     }
 
-    /**
-     * Check that the attribute conforms to this spec and whether
-     * attr has the correct name.
-     */
-    public void check(LFValidator validator, Attribute attr) {
-        Set<String> seen;
-        // If there is just one parameter, it is required to be named "value".
-        if (attr.getAttrParms() != null
-                && attr.getAttrParms().size() == 1
-                && attr.getAttrParms().get(0).getName() == null) {
-            // If we are in this branch,
-            // then the user has provided @attr("value"),
-            // which is a shorthand for @attr(value="value").
-            if (paramSpecByName == null) {
-                validator.error("Attribute doesn't take a parameter.", Literals.ATTRIBUTE__ATTR_NAME);
-                return;
+    // Check if there are any missing parameters required by this attribute.
+    if (paramSpecByName != null) {
+      Map<String, AttrParamSpec> missingParams = new HashMap<>(paramSpecByName);
+      missingParams.keySet().removeAll(seen);
+      missingParams.forEach(
+          (name, paramSpec) -> {
+            if (!paramSpec.isOptional) {
+              validator.error(
+                  "Missing required attribute parameter '" + name + "'.",
+                  Literals.ATTRIBUTE__ATTR_PARMS);
             }
-            AttrParamSpec valueSpec = paramSpecByName.get(VALUE_ATTR);
-            if (valueSpec == null) {
-                validator.error("Attribute doesn't have a 'value' parameter.", Literals.ATTR_PARM__NAME);
-                return;
-            }
-
-            valueSpec.check(validator, attr.getAttrParms().get(0));
-            seen = Set.of(VALUE_ATTR);
-        } else {
-            // Process multiple parameters, each of which has to be named.
-            seen = processNamedAttrParms(validator, attr);
+          });
+    }
+  }
+
+  /**
+   * Check whether the attribute parameters are named, whether these names are known, and whether
+   * the named parameters conform to the param spec (whether the param has the right type, etc.).
+   *
+   * @param validator The current validator in use.
+   * @param attr The attribute being checked.
+   * @return A set of named attribute parameters the user provides.
+   */
+  private Set<String> processNamedAttrParms(LFValidator validator, Attribute attr) {
+    Set<String> seen = new HashSet<>();
+    if (attr.getAttrParms() != null) {
+      for (AttrParm parm : attr.getAttrParms()) {
+        if (paramSpecByName == null) {
+          validator.error("Attribute does not take parameters.", Literals.ATTRIBUTE__ATTR_NAME);
+          break;
         }
-
-        // Check if there are any missing parameters required by this attribute.
-        if (paramSpecByName != null) {
-            Map<String, AttrParamSpec> missingParams = new HashMap<>(paramSpecByName);
-            missingParams.keySet().removeAll(seen);
-            missingParams.forEach((name, paramSpec) -> {
-                if (!paramSpec.isOptional) {
-                    validator.error("Missing required attribute parameter '" + name + "'.", Literals.ATTRIBUTE__ATTR_PARMS);
-                }
-            });
+        if (parm.getName() == null) {
+          validator.error("Missing name for attribute parameter.", Literals.ATTRIBUTE__ATTR_NAME);
+          continue;
         }
-    }
 
-    /**
-     * Check whether the attribute parameters are named, whether
-     * these names are known, and whether the named parameters
-     * conform to the param spec (whether the param has the
-     * right type, etc.).
-     *
-     * @param validator The current validator in use.
-     * @param attr The attribute being checked.
-     * @return A set of named attribute parameters the user provides.
-     */
-    private Set<String> processNamedAttrParms(LFValidator validator, Attribute attr) {
-        Set<String> seen = new HashSet<>();
-        if (attr.getAttrParms() != null) {
-            for (AttrParm parm : attr.getAttrParms()) {
-                if (paramSpecByName == null) {
-                    validator.error("Attribute does not take parameters.", Literals.ATTRIBUTE__ATTR_NAME);
-                    break;
-                }
-                if (parm.getName() == null) {
-                    validator.error("Missing name for attribute parameter.", Literals.ATTRIBUTE__ATTR_NAME);
-                    continue;
-                }
-
-                AttrParamSpec parmSpec = paramSpecByName.get(parm.getName());
-                if (parmSpec == null) {
-                    validator.error("\"" + parm.getName() + "\"" + " is an unknown attribute parameter.",
-                                    Literals.ATTRIBUTE__ATTR_NAME);
-                    continue;
-                }
-                // Check whether a parameter conforms to its spec.
-                parmSpec.check(validator, parm);
-                seen.add(parm.getName());
-            }
+        AttrParamSpec parmSpec = paramSpecByName.get(parm.getName());
+        if (parmSpec == null) {
+          validator.error(
+              "\"" + parm.getName() + "\"" + " is an unknown attribute parameter.",
+              Literals.ATTRIBUTE__ATTR_NAME);
+          continue;
         }
-        return seen;
+        // Check whether a parameter conforms to its spec.
+        parmSpec.check(validator, parm);
+        seen.add(parm.getName());
+      }
     }
-
-    /**
-     * The specification of the attribute parameter.
-     *
-     * @param name The name of the attribute parameter
-     * @param type The type of the parameter
-     * @param isOptional True if the parameter is optional.
-     */
-    record AttrParamSpec(String name, AttrParamType type, boolean isOptional) {
-
-        // Check if a parameter has the right type.
-        // Currently, only String, Int, Boolean, Float, and target language are supported.
-        public void check(LFValidator validator, AttrParm parm) {
-            switch (type) {
-            case STRING -> {
-                if (!StringUtil.hasQuotes(parm.getValue())) {
-                    validator.error("Incorrect type: \"" + parm.getName() + "\""
-                            + " should have type String.",
-                        Literals.ATTRIBUTE__ATTR_NAME);
-                }
-            }
-            case INT -> {
-                if (!ASTUtils.isInteger(parm.getValue())) {
-                    validator.error(
-                        "Incorrect type: \"" + parm.getName() + "\""
-                            + " should have type Int.",
-                        Literals.ATTRIBUTE__ATTR_NAME);
-                }
-            }
-            case BOOLEAN -> {
-                if (!ASTUtils.isBoolean(parm.getValue())) {
-                    validator.error(
-                        "Incorrect type: \"" + parm.getName() + "\""
-                            + " should have type Boolean.",
-                        Literals.ATTRIBUTE__ATTR_NAME);
-                }
-            }
-            case FLOAT -> {
-                if (!ASTUtils.isFloat(parm.getValue())) {
-                    validator.error(
-                        "Incorrect type: \"" + parm.getName() + "\""
-                            + " should have type Float.",
-                        Literals.ATTRIBUTE__ATTR_NAME);
-                }
-            }
-            default -> throw new IllegalArgumentException("unexpected type");
-            }
+    return seen;
+  }
+
+  /**
+   * The specification of the attribute parameter.
+   *
+   * @param name The name of the attribute parameter
+   * @param type The type of the parameter
+   * @param isOptional True if the parameter is optional.
+   */
+  record AttrParamSpec(String name, AttrParamType type, boolean isOptional) {
+
+    // Check if a parameter has the right type.
+    // Currently, only String, Int, Boolean, Float, and target language are supported.
+    public void check(LFValidator validator, AttrParm parm) {
+      switch (type) {
+        case STRING -> {
+          if (!StringUtil.hasQuotes(parm.getValue())) {
+            validator.error(
+                "Incorrect type: \"" + parm.getName() + "\"" + " should have type String.",
+                Literals.ATTRIBUTE__ATTR_NAME);
+          }
         }
+        case INT -> {
+          if (!ASTUtils.isInteger(parm.getValue())) {
+            validator.error(
+                "Incorrect type: \"" + parm.getName() + "\"" + " should have type Int.",
+                Literals.ATTRIBUTE__ATTR_NAME);
+          }
+        }
+        case BOOLEAN -> {
+          if (!ASTUtils.isBoolean(parm.getValue())) {
+            validator.error(
+                "Incorrect type: \"" + parm.getName() + "\"" + " should have type Boolean.",
+                Literals.ATTRIBUTE__ATTR_NAME);
+          }
+        }
+        case FLOAT -> {
+          if (!ASTUtils.isFloat(parm.getValue())) {
+            validator.error(
+                "Incorrect type: \"" + parm.getName() + "\"" + " should have type Float.",
+                Literals.ATTRIBUTE__ATTR_NAME);
+          }
+        }
+        default -> throw new IllegalArgumentException("unexpected type");
+      }
     }
-
-    /**
-     * The type of attribute parameters currently supported.
-     */
-    enum AttrParamType {
-        STRING,
-        INT,
-        BOOLEAN,
-        FLOAT,
-    }
-
-    /*
-     * The specs of the known annotations are declared here.
-     * Note: If an attribute only has one parameter, the parameter name should be "value."
-     */
-    static {
-        // @label("value")
-        ATTRIBUTE_SPECS_BY_NAME.put("label", new AttributeSpec(
-            List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))
-        ));
-        // @sparse
-        ATTRIBUTE_SPECS_BY_NAME.put("sparse", new AttributeSpec(null));
-        // @icon("value")
-        ATTRIBUTE_SPECS_BY_NAME.put("icon", new AttributeSpec(
-            List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))
-        ));
-        // @enclave(each=boolean)
-        ATTRIBUTE_SPECS_BY_NAME.put("enclave", new AttributeSpec(
-            List.of(new AttrParamSpec(EACH_ATTR, AttrParamType.BOOLEAN, true))
-        ));
-
-        ATTRIBUTE_SPECS_BY_NAME.put("_fed_config", new AttributeSpec(
-            List.of(new AttrParamSpec(AttributeSpec.NETWORK_MESSAGE_ACTIONS,
-                                      AttrParamType.STRING, false),
-                    new AttrParamSpec(AttributeSpec.DEPENDENCY_PAIRS, 
-                    AttrParamType.STRING, false))));
-        ATTRIBUTE_SPECS_BY_NAME.put("_c_body", new AttributeSpec(null));
-    }
+  }
+
+  /** The type of attribute parameters currently supported. */
+  enum AttrParamType {
+    STRING,
+    INT,
+    BOOLEAN,
+    FLOAT,
+  }
+
+  /*
+   * The specs of the known annotations are declared here.
+   * Note: If an attribute only has one parameter, the parameter name should be "value."
+   */
+  static {
+    // @label("value")
+    ATTRIBUTE_SPECS_BY_NAME.put(
+        "label",
+        new AttributeSpec(List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))));
+    // @sparse
+    ATTRIBUTE_SPECS_BY_NAME.put("sparse", new AttributeSpec(null));
+    // @icon("value")
+    ATTRIBUTE_SPECS_BY_NAME.put(
+        "icon",
+        new AttributeSpec(List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))));
+    // @enclave(each=boolean)
+    ATTRIBUTE_SPECS_BY_NAME.put(
+        "enclave",
+        new AttributeSpec(List.of(new AttrParamSpec(EACH_ATTR, AttrParamType.BOOLEAN, true))));
+
+    ATTRIBUTE_SPECS_BY_NAME.put(
+        "_fed_config",
+        new AttributeSpec(
+            List.of(
+                new AttrParamSpec(
+                    AttributeSpec.NETWORK_MESSAGE_ACTIONS, AttrParamType.STRING, false),
+                new AttrParamSpec(AttributeSpec.DEPENDENCY_PAIRS, AttrParamType.STRING, false))));
+    ATTRIBUTE_SPECS_BY_NAME.put("_c_body", new AttributeSpec(null));
+  }
 }
diff --git a/org.lflang/src/org/lflang/validation/BaseLFValidator.java b/org.lflang/src/org/lflang/validation/BaseLFValidator.java
index 34e184a720..bcdc14dd94 100644
--- a/org.lflang/src/org/lflang/validation/BaseLFValidator.java
+++ b/org.lflang/src/org/lflang/validation/BaseLFValidator.java
@@ -28,55 +28,53 @@
 
 import java.lang.reflect.Method;
 import java.util.Map;
-
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.validation.Check;
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.CheckType;
-import org.lflang.ast.ASTUtils;
 import org.lflang.TimeUnit;
+import org.lflang.ast.ASTUtils;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Time;
 
 public class BaseLFValidator extends AbstractLFValidator {
 
-    @Check(CheckType.FAST)
-    public void checkTime(Time time) {
-        if (!ASTUtils.isValidTime(time)) {
-            error("Invalid time unit. " +
-                  "Should be one of " +
-                  TimeUnit.list() + ".", Literals.TIME__UNIT);
-        }
+  @Check(CheckType.FAST)
+  public void checkTime(Time time) {
+    if (!ASTUtils.isValidTime(time)) {
+      error(
+          "Invalid time unit. " + "Should be one of " + TimeUnit.list() + ".", Literals.TIME__UNIT);
     }
+  }
 
-    /**
-     * Provides convenient access to the inner state of the validator.
-     * <p>
-     * The validator only gives protected access to its own state. With
-     * this class, we can grant access to the inner state to other objects.
-     *
-     * @author Christian Menard
-     */
-    protected class ValidatorStateAccess {
-        public EObject getCurrentObject() {
-            return BaseLFValidator.this.getCurrentObject();
-        }
+  /**
+   * Provides convenient access to the inner state of the validator.
+   *
+   * <p>The validator only gives protected access to its own state. With this class, we can grant
+   * access to the inner state to other objects.
+   *
+   * @author Christian Menard
+   */
+  protected class ValidatorStateAccess {
+    public EObject getCurrentObject() {
+      return BaseLFValidator.this.getCurrentObject();
+    }
 
-        public Method getCurrentMethod() {
-            return BaseLFValidator.this.getCurrentMethod();
-        }
+    public Method getCurrentMethod() {
+      return BaseLFValidator.this.getCurrentMethod();
+    }
 
-        public DiagnosticChain getChain() {
-            return BaseLFValidator.this.getChain();
-        }
+    public DiagnosticChain getChain() {
+      return BaseLFValidator.this.getChain();
+    }
 
-        public CheckMode getCheckMode() {
-            return BaseLFValidator.this.getCheckMode();
-        }
+    public CheckMode getCheckMode() {
+      return BaseLFValidator.this.getCheckMode();
+    }
 
-        public Map<Object, Object> getContext() {
-            return BaseLFValidator.this.getContext();
-        }
+    public Map<Object, Object> getContext() {
+      return BaseLFValidator.this.getContext();
     }
+  }
 }
diff --git a/org.lflang/src/org/lflang/validation/LFNamesAreUniqueValidationHelper.java b/org.lflang/src/org/lflang/validation/LFNamesAreUniqueValidationHelper.java
index 75020fdc2b..9c6267cb0a 100644
--- a/org.lflang/src/org/lflang/validation/LFNamesAreUniqueValidationHelper.java
+++ b/org.lflang/src/org/lflang/validation/LFNamesAreUniqueValidationHelper.java
@@ -2,27 +2,24 @@
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.xtext.validation.NamesAreUniqueValidationHelper;
-
 import org.lflang.lf.LfPackage;
 
 public class LFNamesAreUniqueValidationHelper extends NamesAreUniqueValidationHelper {
 
-    /**
-     * Lump all inputs, outputs, timers, actions, parameters, and 
-     * instantiations in the same cluster type. This ensures that
-     * names amongst them are checked for uniqueness.
-     */
-    @Override public EClass getAssociatedClusterType(EClass eClass) {
-        if (LfPackage.Literals.INPUT == eClass || 
-            LfPackage.Literals.OUTPUT == eClass ||
-            LfPackage.Literals.TIMER == eClass ||
-            LfPackage.Literals.ACTION == eClass ||
-            LfPackage.Literals.PARAMETER == eClass ||
-            LfPackage.Literals.INSTANTIATION == eClass
-        )  {
-            return LfPackage.Literals.VARIABLE;
-        }
-        return super.getAssociatedClusterType(eClass);
+  /**
+   * Lump all inputs, outputs, timers, actions, parameters, and instantiations in the same cluster
+   * type. This ensures that names amongst them are checked for uniqueness.
+   */
+  @Override
+  public EClass getAssociatedClusterType(EClass eClass) {
+    if (LfPackage.Literals.INPUT == eClass
+        || LfPackage.Literals.OUTPUT == eClass
+        || LfPackage.Literals.TIMER == eClass
+        || LfPackage.Literals.ACTION == eClass
+        || LfPackage.Literals.PARAMETER == eClass
+        || LfPackage.Literals.INSTANTIATION == eClass) {
+      return LfPackage.Literals.VARIABLE;
     }
-    
+    return super.getAssociatedClusterType(eClass);
+  }
 }
diff --git a/org.lflang/src/org/lflang/validation/LFValidator.java b/org.lflang/src/org/lflang/validation/LFValidator.java
index 36c09cf678..747b22ffc3 100644
--- a/org.lflang/src/org/lflang/validation/LFValidator.java
+++ b/org.lflang/src/org/lflang/validation/LFValidator.java
@@ -2,17 +2,17 @@
 
 /*************
  * Copyright (c) 2019-2020, The University of California at Berkeley.
-
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
-
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
-
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
-
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -28,12 +28,10 @@
 
 import static org.lflang.ast.ASTUtils.inferPortWidth;
 import static org.lflang.ast.ASTUtils.isGeneric;
-import static org.lflang.ast.ASTUtils.isInteger;
-import static org.lflang.ast.ASTUtils.isOfTimeType;
-import static org.lflang.ast.ASTUtils.isZero;
 import static org.lflang.ast.ASTUtils.toDefinition;
 import static org.lflang.ast.ASTUtils.toOriginalText;
 
+import com.google.inject.Inject;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -46,7 +44,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EAttribute;
@@ -56,13 +53,13 @@
 import org.eclipse.xtext.validation.Check;
 import org.eclipse.xtext.validation.CheckType;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
-import org.lflang.ast.ASTUtils;
 import org.lflang.AttributeUtils;
 import org.lflang.InferredType;
 import org.lflang.ModelInfo;
 import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
 import org.lflang.federated.serialization.SupportedSerializers;
 import org.lflang.federated.validation.FedValidator;
 import org.lflang.generator.NamedInstance;
@@ -117,12 +114,10 @@
 import org.lflang.lf.WidthTerm;
 import org.lflang.util.FileUtil;
 
-import com.google.inject.Inject;
-
 /**
  * Custom validation checks for Lingua Franca programs.
  *
- * Also see: https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#validation
+ * <p>Also see: https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#validation
  *
  * @author Edward A. Lee
  * @author Marten Lohstroh
@@ -133,1763 +128,1853 @@
  */
 public class LFValidator extends BaseLFValidator {
 
-    //////////////////////////////////////////////////////////////
-    //// Public check methods.
-
-    // These methods are automatically invoked on AST nodes matching
-    // the types of their arguments.
-    // CheckType.FAST ensures that these checks run whenever a file is modified.
-    // Alternatives are CheckType.NORMAL (when saving) and
-    // CheckType.EXPENSIVE (only when right-click, validate).
-    // FIXME: What is the default when nothing is specified?
-
-    // These methods are listed in alphabetical order, and, although
-    // it is isn't strictly required, follow a naming convention
-    // checkClass, where Class is the AST class, where possible.
-
-    @Check(CheckType.FAST)
-    public void checkAction(Action action) {
-        checkName(action.getName(), Literals.VARIABLE__NAME);
-        if (action.getOrigin() == ActionOrigin.NONE) {
-            error(
-                "Action must have modifier {@code logical} or {@code physical}.",
-                Literals.ACTION__ORIGIN
-            );
-        }
-        if (action.getPolicy() != null &&
-            !SPACING_VIOLATION_POLICIES.contains(action.getPolicy())) {
-            error(
-                "Unrecognized spacing violation policy: " + action.getPolicy() +
-                    ". Available policies are: " +
-                    String.join(", ", SPACING_VIOLATION_POLICIES) + ".",
-                Literals.ACTION__POLICY);
-        }
-        checkExpressionIsTime(action.getMinDelay(), Literals.ACTION__MIN_DELAY);
-        checkExpressionIsTime(action.getMinSpacing(), Literals.ACTION__MIN_SPACING);
+  //////////////////////////////////////////////////////////////
+  //// Public check methods.
+
+  // These methods are automatically invoked on AST nodes matching
+  // the types of their arguments.
+  // CheckType.FAST ensures that these checks run whenever a file is modified.
+  // Alternatives are CheckType.NORMAL (when saving) and
+  // CheckType.EXPENSIVE (only when right-click, validate).
+  // FIXME: What is the default when nothing is specified?
+
+  // These methods are listed in alphabetical order, and, although
+  // it is isn't strictly required, follow a naming convention
+  // checkClass, where Class is the AST class, where possible.
+
+  @Check(CheckType.FAST)
+  public void checkAction(Action action) {
+    checkName(action.getName(), Literals.VARIABLE__NAME);
+    if (action.getOrigin() == ActionOrigin.NONE) {
+      error(
+          "Action must have modifier {@code logical} or {@code physical}.",
+          Literals.ACTION__ORIGIN);
     }
-
-
-    @Check(CheckType.FAST)
-    public void checkInitializer(Initializer init) {
-        if (init.isBraces() && target != Target.CPP) {
-            error("Brace initializers are only supported for the C++ target", Literals.INITIALIZER__BRACES);
-        } else if (init.isParens() && target.mandatesEqualsInitializers()) {
-            var message = "This syntax is deprecated in the " + target
-                + " target, use an equal sign instead of parentheses for assignment.";
-            if (init.getExprs().size() == 1) {
-                message += " (run the formatter to fix this automatically)";
-            }
-            warning(message, Literals.INITIALIZER__PARENS);
-        } else if (!init.isAssign() && init.eContainer() instanceof Assignment) {
-            var feature = init.isBraces() ? Literals.INITIALIZER__BRACES
-                : Literals.INITIALIZER__PARENS;
-            var message = "This syntax is deprecated, do not use parentheses or braces but an equal sign.";
-            if (init.getExprs().size() == 1) {
-                message += " (run the formatter to fix this automatically)";
-            }
-            warning(message, feature);
-        }
+    if (action.getPolicy() != null && !SPACING_VIOLATION_POLICIES.contains(action.getPolicy())) {
+      error(
+          "Unrecognized spacing violation policy: "
+              + action.getPolicy()
+              + ". Available policies are: "
+              + String.join(", ", SPACING_VIOLATION_POLICIES)
+              + ".",
+          Literals.ACTION__POLICY);
     }
-
-    @Check(CheckType.FAST)
-    public void checkBracedExpression(BracedListExpression expr) {
-        if (!target.allowsBracedListExpressions()) {
-            var message = "Braced expression lists are not a valid expression for the " + target
-                + " target.";
-            error(message, Literals.BRACED_LIST_EXPRESSION.eContainmentFeature());
-        }
+    checkExpressionIsTime(action.getMinDelay(), Literals.ACTION__MIN_DELAY);
+    checkExpressionIsTime(action.getMinSpacing(), Literals.ACTION__MIN_SPACING);
+  }
+
+  @Check(CheckType.FAST)
+  public void checkInitializer(Initializer init) {
+    if (init.isBraces() && target != Target.CPP) {
+      error(
+          "Brace initializers are only supported for the C++ target", Literals.INITIALIZER__BRACES);
+    } else if (init.isParens() && target.mandatesEqualsInitializers()) {
+      var message =
+          "This syntax is deprecated in the "
+              + target
+              + " target, use an equal sign instead of parentheses for assignment.";
+      if (init.getExprs().size() == 1) {
+        message += " (run the formatter to fix this automatically)";
+      }
+      warning(message, Literals.INITIALIZER__PARENS);
+    } else if (!init.isAssign() && init.eContainer() instanceof Assignment) {
+      var feature = init.isBraces() ? Literals.INITIALIZER__BRACES : Literals.INITIALIZER__PARENS;
+      var message =
+          "This syntax is deprecated, do not use parentheses or braces but an equal sign.";
+      if (init.getExprs().size() == 1) {
+        message += " (run the formatter to fix this automatically)";
+      }
+      warning(message, feature);
     }
-
-    @Check(CheckType.FAST)
-    public void checkAssignment(Assignment assignment) {
-
-        // If the left-hand side is a time parameter, make sure the assignment has units
-        typeCheck(assignment.getRhs(), ASTUtils.getInferredType(assignment.getLhs()), Literals.ASSIGNMENT__RHS);
-        // If this assignment overrides a parameter that is used in a deadline,
-        // report possible overflow.
-        if (isCBasedTarget() &&
-            this.info.overflowingAssignments.contains(assignment)) {
-            error(
-                "Time value used to specify a deadline exceeds the maximum of " +
-                    TimeValue.MAX_LONG_DEADLINE + " nanoseconds.",
-                Literals.ASSIGNMENT__RHS);
-        }
-
+  }
+
+  @Check(CheckType.FAST)
+  public void checkBracedExpression(BracedListExpression expr) {
+    if (!target.allowsBracedListExpressions()) {
+      var message =
+          "Braced expression lists are not a valid expression for the " + target + " target.";
+      error(message, Literals.BRACED_LIST_EXPRESSION.eContainmentFeature());
     }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkAssignment(Assignment assignment) {
+
+    // If the left-hand side is a time parameter, make sure the assignment has units
+    typeCheck(
+        assignment.getRhs(),
+        ASTUtils.getInferredType(assignment.getLhs()),
+        Literals.ASSIGNMENT__RHS);
+    // If this assignment overrides a parameter that is used in a deadline,
+    // report possible overflow.
+    if (isCBasedTarget() && this.info.overflowingAssignments.contains(assignment)) {
+      error(
+          "Time value used to specify a deadline exceeds the maximum of "
+              + TimeValue.MAX_LONG_DEADLINE
+              + " nanoseconds.",
+          Literals.ASSIGNMENT__RHS);
+    }
+  }
 
-    @Check(CheckType.FAST)
-    public void checkConnection(Connection connection) {
-
-        // Report if connection is part of a cycle.
-        Set<NamedInstance<?>> cycles = this.info.topologyCycles();
-        for (VarRef lp : connection.getLeftPorts()) {
-            for (VarRef rp : connection.getRightPorts()) {
-                boolean leftInCycle = false;
-
-                for (NamedInstance<?> it : cycles) {
-                    if ((lp.getContainer() == null && it.getDefinition().equals(lp.getVariable()))
-                        || (it.getDefinition().equals(lp.getVariable()) && it.getParent().equals(lp.getContainer()))) {
-                        leftInCycle = true;
-                        break;
-                    }
-                }
-
-                for (NamedInstance<?> it : cycles) {
-                    if ((rp.getContainer() == null && it.getDefinition().equals(rp.getVariable()))
-                        || (it.getDefinition().equals(rp.getVariable()) && it.getParent().equals(rp.getContainer()))) {
-                        if (leftInCycle) {
-                            Reactor reactor = ASTUtils.getEnclosingReactor(connection);
-                            String reactorName = reactor.getName();
-                            error(String.format("Connection in reactor %s creates", reactorName) +
-                                  String.format("a cyclic dependency between %s and %s.", toOriginalText(lp), toOriginalText(rp)),
-                                  Literals.CONNECTION__DELAY);
-                        }
-                    }
-                }
-            }
-        }
-
-        // FIXME: look up all ReactorInstance objects that have a definition equal to the
-        // container of this connection. For each of those occurrences, the widths have to match.
-        // For the C target, since C has such a weak type system, check that
-        // the types on both sides of every connection match. For other languages,
-        // we leave type compatibility that language's compiler or interpreter.
-        if (isCBasedTarget()) {
-            Type type = (Type) null;
-            for (VarRef port : (Iterable<? extends VarRef>) () -> Stream.concat(
-                        connection.getLeftPorts().stream(),
-                        connection.getRightPorts().stream()
-                    ).iterator()) {
-                // If the variable is not a port, then there is some other
-                // error. Avoid a class cast exception.
-                if (port.getVariable() instanceof Port) {
-                    if (type == null) {
-                        type = ((Port) port.getVariable()).getType();
-                    } else {
-                        var portType = ((Port) port.getVariable()).getType();
-                        portType = port.getContainer() == null ? portType : new TypeParameterizedReactor(port.getContainer()).resolveType(portType);
-                        if (!sameType(type, portType)) {
-                            error("Types do not match.", Literals.CONNECTION__LEFT_PORTS);
-                        }
-                    }
-                }
-            }
-        }
+  @Check(CheckType.FAST)
+  public void checkConnection(Connection connection) {
 
-        // Check whether the total width of the left side of the connection
-        // matches the total width of the right side. This cannot be determined
-        // here if the width is not given as a constant. In that case, it is up
-        // to the code generator to check it.
-        int leftWidth = 0;
-        for (VarRef port : connection.getLeftPorts()) {
-            int width = inferPortWidth(port, null, null); // null args imply incomplete check.
-            if (width < 0 || leftWidth < 0) {
-                // Cannot determine the width of the left ports.
-                leftWidth = -1;
-            } else {
-                leftWidth += width;
-            }
-        }
-        int rightWidth = 0;
-        for (VarRef port : connection.getRightPorts()) {
-            int width = inferPortWidth(port, null, null); // null args imply incomplete check.
-            if (width < 0 || rightWidth < 0) {
-                // Cannot determine the width of the left ports.
-                rightWidth = -1;
-            } else {
-                rightWidth += width;
-            }
-        }
+    // Report if connection is part of a cycle.
+    Set<NamedInstance<?>> cycles = this.info.topologyCycles();
+    for (VarRef lp : connection.getLeftPorts()) {
+      for (VarRef rp : connection.getRightPorts()) {
+        boolean leftInCycle = false;
 
-        if (leftWidth != -1 && rightWidth != -1 && leftWidth != rightWidth) {
-            if (connection.isIterated()) {
-                if (leftWidth == 0 || rightWidth % leftWidth != 0) {
-                    // FIXME: The second argument should be Literals.CONNECTION, but
-                    // stupidly, xtext will not accept that. There seems to be no way to
-                    // report an error for the whole connection statement.
-                    warning(String.format("Left width %s does not divide right width %s", leftWidth, rightWidth),
-                            Literals.CONNECTION__LEFT_PORTS
-                    );
-                }
-            } else {
-                // FIXME: The second argument should be Literals.CONNECTION, but
-                // stupidly, xtext will not accept that. There seems to be no way to
-                // report an error for the whole connection statement.
-                warning(String.format("Left width %s does not match right width %s", leftWidth, rightWidth),
-                        Literals.CONNECTION__LEFT_PORTS
-                );
-            }
-        }
-
-        Reactor reactor = ASTUtils.getEnclosingReactor(connection);
-
-        // Make sure the right port is not already an effect of a reaction.
-        for (Reaction reaction : ASTUtils.allReactions(reactor)) {
-            for (VarRef effect : reaction.getEffects()) {
-                for (VarRef rightPort : connection.getRightPorts()) {
-                    if (rightPort.getVariable().equals(effect.getVariable()) && // Refers to the same variable
-                        rightPort.getContainer() == effect.getContainer() && // Refers to the same instance
-                        (   reaction.eContainer() instanceof Reactor || // Either is not part of a mode
-                            connection.eContainer() instanceof Reactor ||
-                            connection.eContainer() == reaction.eContainer() // Or they are in the same mode
-                        )) {
-                        error("Cannot connect: Port named '" + effect.getVariable().getName() +
-                            "' is already effect of a reaction.",
-                            Literals.CONNECTION__RIGHT_PORTS);
-                    }
-                }
-            }
+        for (NamedInstance<?> it : cycles) {
+          if ((lp.getContainer() == null && it.getDefinition().equals(lp.getVariable()))
+              || (it.getDefinition().equals(lp.getVariable())
+                  && it.getParent().equals(lp.getContainer()))) {
+            leftInCycle = true;
+            break;
+          }
         }
 
-        // Check that the right port does not already have some other
-        // upstream connection.
-        for (Connection c : reactor.getConnections()) {
-            if (c != connection) {
-                for (VarRef thisRightPort : connection.getRightPorts()) {
-                    for (VarRef thatRightPort : c.getRightPorts()) {
-                        if (thisRightPort.getVariable().equals(thatRightPort.getVariable()) && // Refers to the same variable
-                            thisRightPort.getContainer() == thatRightPort.getContainer() && // Refers to the same instance
-                            (   connection.eContainer() instanceof Reactor || // Or either of the connections in not part of a mode
-                                c.eContainer() instanceof Reactor ||
-                                connection.eContainer() == c.eContainer() // Or they are in the same mode
-                            )) {
-                            error(
-                                "Cannot connect: Port named '" + thisRightPort.getVariable().getName() +
-                                    "' may only appear once on the right side of a connection.",
-                                Literals.CONNECTION__RIGHT_PORTS);
-                        }
-                    }
-                }
+        for (NamedInstance<?> it : cycles) {
+          if ((rp.getContainer() == null && it.getDefinition().equals(rp.getVariable()))
+              || (it.getDefinition().equals(rp.getVariable())
+                  && it.getParent().equals(rp.getContainer()))) {
+            if (leftInCycle) {
+              Reactor reactor = ASTUtils.getEnclosingReactor(connection);
+              String reactorName = reactor.getName();
+              error(
+                  String.format("Connection in reactor %s creates", reactorName)
+                      + String.format(
+                          "a cyclic dependency between %s and %s.",
+                          toOriginalText(lp), toOriginalText(rp)),
+                  Literals.CONNECTION__DELAY);
             }
+          }
         }
+      }
+    }
 
-        // Check the after delay
-        if (connection.getDelay() != null) {
-            final var delay = connection.getDelay();
-            if (delay instanceof ParameterReference || delay instanceof Time || delay instanceof Literal) {
-                checkExpressionIsTime(delay, Literals.CONNECTION__DELAY);
-            } else {
-                error("After delays can only be given by time literals or parameters.",
-                      Literals.CONNECTION__DELAY);
+    // FIXME: look up all ReactorInstance objects that have a definition equal to the
+    // container of this connection. For each of those occurrences, the widths have to match.
+    // For the C target, since C has such a weak type system, check that
+    // the types on both sides of every connection match. For other languages,
+    // we leave type compatibility that language's compiler or interpreter.
+    if (isCBasedTarget()) {
+      Type type = (Type) null;
+      for (VarRef port :
+          (Iterable<? extends VarRef>)
+              () ->
+                  Stream.concat(
+                          connection.getLeftPorts().stream(), connection.getRightPorts().stream())
+                      .iterator()) {
+        // If the variable is not a port, then there is some other
+        // error. Avoid a class cast exception.
+        if (port.getVariable() instanceof Port) {
+          if (type == null) {
+            type = ((Port) port.getVariable()).getType();
+          } else {
+            var portType = ((Port) port.getVariable()).getType();
+            portType =
+                port.getContainer() == null
+                    ? portType
+                    : new TypeParameterizedReactor(port.getContainer()).resolveType(portType);
+            if (!sameType(type, portType)) {
+              error("Types do not match.", Literals.CONNECTION__LEFT_PORTS);
             }
+          }
         }
+      }
     }
 
-    @Check(CheckType.FAST)
-    public void checkDeadline(Deadline deadline) {
-        if (isCBasedTarget() &&
-            this.info.overflowingDeadlines.contains(deadline)) {
-            error(
-                "Deadline exceeds the maximum of " +
-                    TimeValue.MAX_LONG_DEADLINE + " nanoseconds.",
-                Literals.DEADLINE__DELAY);
-        }
-        checkExpressionIsTime(deadline.getDelay(), Literals.DEADLINE__DELAY);
+    // Check whether the total width of the left side of the connection
+    // matches the total width of the right side. This cannot be determined
+    // here if the width is not given as a constant. In that case, it is up
+    // to the code generator to check it.
+    int leftWidth = 0;
+    for (VarRef port : connection.getLeftPorts()) {
+      int width = inferPortWidth(port, null, null); // null args imply incomplete check.
+      if (width < 0 || leftWidth < 0) {
+        // Cannot determine the width of the left ports.
+        leftWidth = -1;
+      } else {
+        leftWidth += width;
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkHost(Host host) {
-        String addr = host.getAddr();
-        String user = host.getUser();
-        if (user != null && !user.matches(USERNAME_REGEX)) {
-            warning(
-                "Invalid user name.",
-                Literals.HOST__USER
-            );
-        }
-        if (host instanceof IPV4Host && !addr.matches(IPV4_REGEX)) {
-            warning(
-                "Invalid IP address.",
-                Literals.HOST__ADDR
-            );
-        } else if (host instanceof IPV6Host && !addr.matches(IPV6_REGEX)) {
-            warning(
-                "Invalid IP address.",
-                Literals.HOST__ADDR
-            );
-        } else if (host instanceof NamedHost && !addr.matches(HOST_OR_FQN_REGEX)) {
-            warning(
-                "Invalid host name or fully qualified domain name.",
-                Literals.HOST__ADDR
-            );
-        }
+    int rightWidth = 0;
+    for (VarRef port : connection.getRightPorts()) {
+      int width = inferPortWidth(port, null, null); // null args imply incomplete check.
+      if (width < 0 || rightWidth < 0) {
+        // Cannot determine the width of the left ports.
+        rightWidth = -1;
+      } else {
+        rightWidth += width;
+      }
     }
 
-   @Check
-    public void checkImport(Import imp) {
-        if (toDefinition(imp.getReactorClasses().get(0)).eResource().getErrors().size() > 0) {
-            error("Error loading resource.", Literals.IMPORT__IMPORT_URI); // FIXME: print specifics.
-            return;
-        }
-
-        // FIXME: report error if resource cannot be resolved.
-        for (ImportedReactor reactor : imp.getReactorClasses()) {
-            if (!isUnused(reactor)) {
-                return;
-            }
-        }
-        warning("Unused import.", Literals.IMPORT__IMPORT_URI);
+    if (leftWidth != -1 && rightWidth != -1 && leftWidth != rightWidth) {
+      if (connection.isIterated()) {
+        if (leftWidth == 0 || rightWidth % leftWidth != 0) {
+          // FIXME: The second argument should be Literals.CONNECTION, but
+          // stupidly, xtext will not accept that. There seems to be no way to
+          // report an error for the whole connection statement.
+          warning(
+              String.format("Left width %s does not divide right width %s", leftWidth, rightWidth),
+              Literals.CONNECTION__LEFT_PORTS);
+        }
+      } else {
+        // FIXME: The second argument should be Literals.CONNECTION, but
+        // stupidly, xtext will not accept that. There seems to be no way to
+        // report an error for the whole connection statement.
+        warning(
+            String.format("Left width %s does not match right width %s", leftWidth, rightWidth),
+            Literals.CONNECTION__LEFT_PORTS);
+      }
     }
 
-    @Check
-    public void checkImportedReactor(ImportedReactor reactor) {
-        if (isUnused(reactor)) {
-            warning("Unused reactor class.",
-                Literals.IMPORTED_REACTOR__REACTOR_CLASS);
-        }
-
-        if (info.instantiationGraph.hasCycles()) {
-            Set<Reactor> cycleSet = new HashSet<>();
-            for (Set<Reactor> cycle : info.instantiationGraph.getCycles()) {
-                cycleSet.addAll(cycle);
-            }
-            if (dependsOnCycle(toDefinition(reactor), cycleSet, new HashSet<>())) {
-                error("Imported reactor '" + toDefinition(reactor).getName() +
-                      "' has cyclic instantiation in it.", Literals.IMPORTED_REACTOR__REACTOR_CLASS);
-            }
+    Reactor reactor = ASTUtils.getEnclosingReactor(connection);
+
+    // Make sure the right port is not already an effect of a reaction.
+    for (Reaction reaction : ASTUtils.allReactions(reactor)) {
+      for (VarRef effect : reaction.getEffects()) {
+        for (VarRef rightPort : connection.getRightPorts()) {
+          if (rightPort.getVariable().equals(effect.getVariable())
+              && // Refers to the same variable
+              rightPort.getContainer() == effect.getContainer()
+              && // Refers to the same instance
+              (reaction.eContainer() instanceof Reactor
+                  || // Either is not part of a mode
+                  connection.eContainer() instanceof Reactor
+                  || connection.eContainer()
+                      == reaction.eContainer() // Or they are in the same mode
+              )) {
+            error(
+                "Cannot connect: Port named '"
+                    + effect.getVariable().getName()
+                    + "' is already effect of a reaction.",
+                Literals.CONNECTION__RIGHT_PORTS);
+          }
         }
+      }
     }
 
-    @Check(CheckType.FAST)
-    public void checkInput(Input input) {
-        Reactor parent = (Reactor)input.eContainer();
-        if (parent.isMain() || parent.isFederated()) {
-            error("Main reactor cannot have inputs.", Literals.VARIABLE__NAME);
-        }
-        checkName(input.getName(), Literals.VARIABLE__NAME);
-        if (target.requiresTypes) {
-            if (input.getType() == null) {
-                error("Input must have a type.", Literals.TYPED_VARIABLE__TYPE);
+    // Check that the right port does not already have some other
+    // upstream connection.
+    for (Connection c : reactor.getConnections()) {
+      if (c != connection) {
+        for (VarRef thisRightPort : connection.getRightPorts()) {
+          for (VarRef thatRightPort : c.getRightPorts()) {
+            if (thisRightPort.getVariable().equals(thatRightPort.getVariable())
+                && // Refers to the same variable
+                thisRightPort.getContainer() == thatRightPort.getContainer()
+                && // Refers to the same instance
+                (connection.eContainer() instanceof Reactor
+                    || // Or either of the connections in not part of a mode
+                    c.eContainer() instanceof Reactor
+                    || connection.eContainer() == c.eContainer() // Or they are in the same mode
+                )) {
+              error(
+                  "Cannot connect: Port named '"
+                      + thisRightPort.getVariable().getName()
+                      + "' may only appear once on the right side of a connection.",
+                  Literals.CONNECTION__RIGHT_PORTS);
             }
+          }
         }
-
-        // mutable has no meaning in C++
-        if (input.isMutable() && this.target == Target.CPP) {
-            warning(
-                "The mutable qualifier has no meaning for the C++ target and should be removed. " +
-                "In C++, any value can be made mutable by calling get_mutable_copy().",
-                Literals.INPUT__MUTABLE
-            );
-        }
-
-        // Variable width multiports are not supported (yet?).
-        if (input.getWidthSpec() != null && input.getWidthSpec().isOfVariableLength()) {
-            error("Variable-width multiports are not supported.", Literals.PORT__WIDTH_SPEC);
-        }
+      }
     }
 
-    @Check(CheckType.FAST)
-    public void checkInstantiation(Instantiation instantiation) {
-        checkName(instantiation.getName(), Literals.INSTANTIATION__NAME);
-        Reactor reactor = toDefinition(instantiation.getReactorClass());
-        if (reactor.isMain() || reactor.isFederated()) {
-            error(
-                "Cannot instantiate a main (or federated) reactor: " +
-                    instantiation.getReactorClass().getName(),
-                Literals.INSTANTIATION__REACTOR_CLASS
-            );
-        }
+    // Check the after delay
+    if (connection.getDelay() != null) {
+      final var delay = connection.getDelay();
+      if (delay instanceof ParameterReference
+          || delay instanceof Time
+          || delay instanceof Literal) {
+        checkExpressionIsTime(delay, Literals.CONNECTION__DELAY);
+      } else {
+        error(
+            "After delays can only be given by time literals or parameters.",
+            Literals.CONNECTION__DELAY);
+      }
+    }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkDeadline(Deadline deadline) {
+    if (isCBasedTarget() && this.info.overflowingDeadlines.contains(deadline)) {
+      error(
+          "Deadline exceeds the maximum of " + TimeValue.MAX_LONG_DEADLINE + " nanoseconds.",
+          Literals.DEADLINE__DELAY);
+    }
+    checkExpressionIsTime(deadline.getDelay(), Literals.DEADLINE__DELAY);
+  }
+
+  @Check(CheckType.FAST)
+  public void checkHost(Host host) {
+    String addr = host.getAddr();
+    String user = host.getUser();
+    if (user != null && !user.matches(USERNAME_REGEX)) {
+      warning("Invalid user name.", Literals.HOST__USER);
+    }
+    if (host instanceof IPV4Host && !addr.matches(IPV4_REGEX)) {
+      warning("Invalid IP address.", Literals.HOST__ADDR);
+    } else if (host instanceof IPV6Host && !addr.matches(IPV6_REGEX)) {
+      warning("Invalid IP address.", Literals.HOST__ADDR);
+    } else if (host instanceof NamedHost && !addr.matches(HOST_OR_FQN_REGEX)) {
+      warning("Invalid host name or fully qualified domain name.", Literals.HOST__ADDR);
+    }
+  }
 
-        // Report error if this instantiation is part of a cycle.
-        // FIXME: improve error message.
-        // FIXME: Also report if there exists a cycle within.
-        if (this.info.instantiationGraph.getCycles().size() > 0) {
-            for (Set<Reactor> cycle : this.info.instantiationGraph.getCycles()) {
-                Reactor container = (Reactor) instantiation.eContainer();
-                if (cycle.contains(container) && cycle.contains(reactor)) {
-                    List<String> names = new ArrayList<>();
-                    for (Reactor r : cycle) {
-                        names.add(r.getName());
-                    }
-
-                    error(
-                        "Instantiation is part of a cycle: " + String.join(", ", names) + ".",
-                        Literals.INSTANTIATION__REACTOR_CLASS
-                    );
-                }
-            }
-        }
-        // Variable width multiports are not supported (yet?).
-        if (instantiation.getWidthSpec() != null
-                && instantiation.getWidthSpec().isOfVariableLength()
-        ) {
-            if (isCBasedTarget()) {
-                warning("Variable-width banks are for internal use only.",
-                    Literals.INSTANTIATION__WIDTH_SPEC
-                );
-            } else {
-                error("Variable-width banks are not supported.",
-                    Literals.INSTANTIATION__WIDTH_SPEC
-                );
-            }
-        }
+  @Check
+  public void checkImport(Import imp) {
+    if (toDefinition(imp.getReactorClasses().get(0)).eResource().getErrors().size() > 0) {
+      error("Error loading resource.", Literals.IMPORT__IMPORT_URI); // FIXME: print specifics.
+      return;
     }
 
-    /** Check target parameters, which are key-value pairs. */
-    @Check(CheckType.FAST)
-    public void checkKeyValuePair(KeyValuePair param) {
-        // Check only if the container's container is a Target.
-        if (param.eContainer().eContainer() instanceof TargetDecl) {
-            TargetProperty prop = TargetProperty.forName(param.getName());
-
-            // Make sure the key is valid.
-            if (prop == null) {
-                String options = TargetProperty.getOptions().stream()
-                                               .map(p -> p.description).sorted()
-                                               .collect(Collectors.joining(", "));
-                warning(
-                    "Unrecognized target parameter: " + param.getName() +
-                        ". Recognized parameters are: " + options,
-                    Literals.KEY_VALUE_PAIR__NAME);
-            } else {
-                // Check whether the property is supported by the target.
-                if (!prop.supportedBy.contains(this.target)) {
-                    warning(
-                        "The target parameter: " + param.getName() +
-                            " is not supported by the " + this.target +
-                            " target and will thus be ignored.",
-                        Literals.KEY_VALUE_PAIR__NAME);
-                }
+    // FIXME: report error if resource cannot be resolved.
+    for (ImportedReactor reactor : imp.getReactorClasses()) {
+      if (!isUnused(reactor)) {
+        return;
+      }
+    }
+    warning("Unused import.", Literals.IMPORT__IMPORT_URI);
+  }
 
-                // Report problem with the assigned value.
-                prop.type.check(param.getValue(), param.getName(), this);
-            }
+  @Check
+  public void checkImportedReactor(ImportedReactor reactor) {
+    if (isUnused(reactor)) {
+      warning("Unused reactor class.", Literals.IMPORTED_REACTOR__REACTOR_CLASS);
+    }
 
-            for (String it : targetPropertyErrors) {
-                error(it, Literals.KEY_VALUE_PAIR__VALUE);
-            }
-            targetPropertyErrors.clear();
+    if (info.instantiationGraph.hasCycles()) {
+      Set<Reactor> cycleSet = new HashSet<>();
+      for (Set<Reactor> cycle : info.instantiationGraph.getCycles()) {
+        cycleSet.addAll(cycle);
+      }
+      if (dependsOnCycle(toDefinition(reactor), cycleSet, new HashSet<>())) {
+        error(
+            "Imported reactor '"
+                + toDefinition(reactor).getName()
+                + "' has cyclic instantiation in it.",
+            Literals.IMPORTED_REACTOR__REACTOR_CLASS);
+      }
+    }
+  }
 
-            for (String it : targetPropertyWarnings) {
-                error(it, Literals.KEY_VALUE_PAIR__VALUE);
-            }
-            targetPropertyWarnings.clear();
-        }
+  @Check(CheckType.FAST)
+  public void checkInput(Input input) {
+    Reactor parent = (Reactor) input.eContainer();
+    if (parent.isMain() || parent.isFederated()) {
+      error("Main reactor cannot have inputs.", Literals.VARIABLE__NAME);
+    }
+    checkName(input.getName(), Literals.VARIABLE__NAME);
+    if (target.requiresTypes) {
+      if (input.getType() == null) {
+        error("Input must have a type.", Literals.TYPED_VARIABLE__TYPE);
+      }
     }
 
-    @Check(CheckType.FAST)
-    public void checkModel(Model model) {
-        // Since we're doing a fast check, we only want to update
-        // if the model info hasn't been initialized yet. If it has,
-        // we use the old information and update it during a normal
-        // check (see below).
-        if (!info.updated) {
-            info.update(model, errorReporter);
-        }
+    // mutable has no meaning in C++
+    if (input.isMutable() && this.target == Target.CPP) {
+      warning(
+          "The mutable qualifier has no meaning for the C++ target and should be removed. "
+              + "In C++, any value can be made mutable by calling get_mutable_copy().",
+          Literals.INPUT__MUTABLE);
     }
 
-    @Check(CheckType.NORMAL)
-    public void updateModelInfo(Model model) {
-        info.update(model, errorReporter);
+    // Variable width multiports are not supported (yet?).
+    if (input.getWidthSpec() != null && input.getWidthSpec().isOfVariableLength()) {
+      error("Variable-width multiports are not supported.", Literals.PORT__WIDTH_SPEC);
+    }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkInstantiation(Instantiation instantiation) {
+    checkName(instantiation.getName(), Literals.INSTANTIATION__NAME);
+    Reactor reactor = toDefinition(instantiation.getReactorClass());
+    if (reactor.isMain() || reactor.isFederated()) {
+      error(
+          "Cannot instantiate a main (or federated) reactor: "
+              + instantiation.getReactorClass().getName(),
+          Literals.INSTANTIATION__REACTOR_CLASS);
     }
 
-    @Check(CheckType.FAST)
-    public void checkOutput(Output output) {
-        Reactor parent = (Reactor)output.eContainer();
-        if (parent.isMain() || parent.isFederated()) {
-            error("Main reactor cannot have outputs.", Literals.VARIABLE__NAME);
-        }
-        checkName(output.getName(), Literals.VARIABLE__NAME);
-        if (this.target.requiresTypes) {
-            if (output.getType() == null) {
-                error("Output must have a type.", Literals.TYPED_VARIABLE__TYPE);
-            }
-        }
+    // Report error if this instantiation is part of a cycle.
+    // FIXME: improve error message.
+    // FIXME: Also report if there exists a cycle within.
+    if (this.info.instantiationGraph.getCycles().size() > 0) {
+      for (Set<Reactor> cycle : this.info.instantiationGraph.getCycles()) {
+        Reactor container = (Reactor) instantiation.eContainer();
+        if (cycle.contains(container) && cycle.contains(reactor)) {
+          List<String> names = new ArrayList<>();
+          for (Reactor r : cycle) {
+            names.add(r.getName());
+          }
 
-        // Variable width multiports are not supported (yet?).
-        if (output.getWidthSpec() != null && output.getWidthSpec().isOfVariableLength()) {
-            error("Variable-width multiports are not supported.", Literals.PORT__WIDTH_SPEC);
+          error(
+              "Instantiation is part of a cycle: " + String.join(", ", names) + ".",
+              Literals.INSTANTIATION__REACTOR_CLASS);
         }
+      }
+    }
+    // Variable width multiports are not supported (yet?).
+    if (instantiation.getWidthSpec() != null && instantiation.getWidthSpec().isOfVariableLength()) {
+      if (isCBasedTarget()) {
+        warning(
+            "Variable-width banks are for internal use only.", Literals.INSTANTIATION__WIDTH_SPEC);
+      } else {
+        error("Variable-width banks are not supported.", Literals.INSTANTIATION__WIDTH_SPEC);
+      }
+    }
+  }
+
+  /** Check target parameters, which are key-value pairs. */
+  @Check(CheckType.FAST)
+  public void checkKeyValuePair(KeyValuePair param) {
+    // Check only if the container's container is a Target.
+    if (param.eContainer().eContainer() instanceof TargetDecl) {
+      TargetProperty prop = TargetProperty.forName(param.getName());
+
+      // Make sure the key is valid.
+      if (prop == null) {
+        String options =
+            TargetProperty.getOptions().stream()
+                .map(p -> p.description)
+                .sorted()
+                .collect(Collectors.joining(", "));
+        warning(
+            "Unrecognized target parameter: "
+                + param.getName()
+                + ". Recognized parameters are: "
+                + options,
+            Literals.KEY_VALUE_PAIR__NAME);
+      } else {
+        // Check whether the property is supported by the target.
+        if (!prop.supportedBy.contains(this.target)) {
+          warning(
+              "The target parameter: "
+                  + param.getName()
+                  + " is not supported by the "
+                  + this.target
+                  + " target and will thus be ignored.",
+              Literals.KEY_VALUE_PAIR__NAME);
+        }
+
+        // Report problem with the assigned value.
+        prop.type.check(param.getValue(), param.getName(), this);
+      }
+
+      for (String it : targetPropertyErrors) {
+        error(it, Literals.KEY_VALUE_PAIR__VALUE);
+      }
+      targetPropertyErrors.clear();
+
+      for (String it : targetPropertyWarnings) {
+        error(it, Literals.KEY_VALUE_PAIR__VALUE);
+      }
+      targetPropertyWarnings.clear();
+    }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkModel(Model model) {
+    // Since we're doing a fast check, we only want to update
+    // if the model info hasn't been initialized yet. If it has,
+    // we use the old information and update it during a normal
+    // check (see below).
+    if (!info.updated) {
+      info.update(model, errorReporter);
+    }
+  }
+
+  @Check(CheckType.NORMAL)
+  public void updateModelInfo(Model model) {
+    info.update(model, errorReporter);
+  }
+
+  @Check(CheckType.FAST)
+  public void checkOutput(Output output) {
+    Reactor parent = (Reactor) output.eContainer();
+    if (parent.isMain() || parent.isFederated()) {
+      error("Main reactor cannot have outputs.", Literals.VARIABLE__NAME);
+    }
+    checkName(output.getName(), Literals.VARIABLE__NAME);
+    if (this.target.requiresTypes) {
+      if (output.getType() == null) {
+        error("Output must have a type.", Literals.TYPED_VARIABLE__TYPE);
+      }
     }
 
-    @Check(CheckType.FAST)
-    public void checkParameter(Parameter param) {
-        checkName(param.getName(), Literals.PARAMETER__NAME);
-
-        if (param.getInit() == null) {
-            // todo make initialization non-mandatory
-            //  https://github.com/lf-lang/lingua-franca/issues/623
-            error("Parameter must have a default value.", Literals.PARAMETER__INIT);
-            return;
-        }
+    // Variable width multiports are not supported (yet?).
+    if (output.getWidthSpec() != null && output.getWidthSpec().isOfVariableLength()) {
+      error("Variable-width multiports are not supported.", Literals.PORT__WIDTH_SPEC);
+    }
+  }
 
-        if (this.target.requiresTypes) {
-            // Report missing target type. param.inferredType.undefine
-            if (ASTUtils.getInferredType(param).isUndefined()) {
-                error("Type declaration missing.", Literals.PARAMETER__TYPE);
-            }
-        }
+  @Check(CheckType.FAST)
+  public void checkParameter(Parameter param) {
+    checkName(param.getName(), Literals.PARAMETER__NAME);
 
-        if (param.getType() != null) {
-            typeCheck(param.getInit(), ASTUtils.getInferredType(param), Literals.PARAMETER__INIT);
-        }
+    if (param.getInit() == null) {
+      // todo make initialization non-mandatory
+      //  https://github.com/lf-lang/lingua-franca/issues/623
+      error("Parameter must have a default value.", Literals.PARAMETER__INIT);
+      return;
+    }
 
-        if (param.getInit() != null) {
-            for (Expression expr : param.getInit().getExprs()) {
-                if (expr instanceof ParameterReference) {
-                    // Initialization using parameters is forbidden.
-                    error("Parameter cannot be initialized using parameter.",
-                        Literals.PARAMETER__INIT);
-                }
-            }
-        }
+    if (this.target.requiresTypes) {
+      // Report missing target type. param.inferredType.undefine
+      if (ASTUtils.getInferredType(param).isUndefined()) {
+        error("Type declaration missing.", Literals.PARAMETER__TYPE);
+      }
+    }
 
-        if (this.target == Target.CPP) {
-            EObject container = param.eContainer();
-            Reactor reactor = (Reactor) container;
-            if (reactor.isMain()) {
-                // we need to check for the cli parameters that are always taken
-                List<String> cliParams = List.of("t", "threads", "o", "timeout", "f", "fast", "help");
-                if (cliParams.contains(param.getName())) {
-                    error("Parameter '" + param.getName()
-                            + "' is already in use as command line argument by Lingua Franca,",
-                        Literals.PARAMETER__NAME);
-                }
-            }
-        }
+    if (param.getType() != null) {
+      typeCheck(param.getInit(), ASTUtils.getInferredType(param), Literals.PARAMETER__INIT);
+    }
 
-        if (isCBasedTarget() &&
-            this.info.overflowingParameters.contains(param)) {
-            error(
-                "Time value used to specify a deadline exceeds the maximum of " +
-                    TimeValue.MAX_LONG_DEADLINE + " nanoseconds.",
-                Literals.PARAMETER__INIT);
+    if (param.getInit() != null) {
+      for (Expression expr : param.getInit().getExprs()) {
+        if (expr instanceof ParameterReference) {
+          // Initialization using parameters is forbidden.
+          error("Parameter cannot be initialized using parameter.", Literals.PARAMETER__INIT);
         }
+      }
+    }
 
+    if (this.target == Target.CPP) {
+      EObject container = param.eContainer();
+      Reactor reactor = (Reactor) container;
+      if (reactor.isMain()) {
+        // we need to check for the cli parameters that are always taken
+        List<String> cliParams = List.of("t", "threads", "o", "timeout", "f", "fast", "help");
+        if (cliParams.contains(param.getName())) {
+          error(
+              "Parameter '"
+                  + param.getName()
+                  + "' is already in use as command line argument by Lingua Franca,",
+              Literals.PARAMETER__NAME);
+        }
+      }
     }
 
-    @Check(CheckType.FAST)
-    public void checkPreamble(Preamble preamble) {
-        if (this.target == Target.CPP) {
-            if (preamble.getVisibility() == Visibility.NONE) {
-                error(
-                    "Preambles for the C++ target need a visibility qualifier (private or public)!",
-                    Literals.PREAMBLE__VISIBILITY
-                );
-            } else if (preamble.getVisibility() == Visibility.PRIVATE) {
-                EObject container = preamble.eContainer();
-                if (container != null && container instanceof Reactor) {
-                    Reactor reactor = (Reactor) container;
-                    if (isGeneric(reactor)) {
-                        warning(
-                            "Private preambles in generic reactors are not truly private. " +
-                                "Since the generated code is placed in a *_impl.hh file, it will " +
-                                "be visible on the public interface. Consider using a public " +
-                                "preamble within the reactor or a private preamble on file scope.",
-                            Literals.PREAMBLE__VISIBILITY);
-                    }
-                }
-            }
-        } else if (preamble.getVisibility() != Visibility.NONE) {
+    if (isCBasedTarget() && this.info.overflowingParameters.contains(param)) {
+      error(
+          "Time value used to specify a deadline exceeds the maximum of "
+              + TimeValue.MAX_LONG_DEADLINE
+              + " nanoseconds.",
+          Literals.PARAMETER__INIT);
+    }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkPreamble(Preamble preamble) {
+    if (this.target == Target.CPP) {
+      if (preamble.getVisibility() == Visibility.NONE) {
+        error(
+            "Preambles for the C++ target need a visibility qualifier (private or public)!",
+            Literals.PREAMBLE__VISIBILITY);
+      } else if (preamble.getVisibility() == Visibility.PRIVATE) {
+        EObject container = preamble.eContainer();
+        if (container != null && container instanceof Reactor) {
+          Reactor reactor = (Reactor) container;
+          if (isGeneric(reactor)) {
             warning(
-                String.format("The %s qualifier has no meaning for the %s target. It should be removed.",
-                              preamble.getVisibility(), this.target.name()),
-                Literals.PREAMBLE__VISIBILITY
-            );
+                "Private preambles in generic reactors are not truly private. "
+                    + "Since the generated code is placed in a *_impl.hh file, it will "
+                    + "be visible on the public interface. Consider using a public "
+                    + "preamble within the reactor or a private preamble on file scope.",
+                Literals.PREAMBLE__VISIBILITY);
+          }
         }
+      }
+    } else if (preamble.getVisibility() != Visibility.NONE) {
+      warning(
+          String.format(
+              "The %s qualifier has no meaning for the %s target. It should be removed.",
+              preamble.getVisibility(), this.target.name()),
+          Literals.PREAMBLE__VISIBILITY);
     }
+  }
 
-    @Check(CheckType.FAST)
-    public void checkReaction(Reaction reaction) {
-
-        if (reaction.getTriggers() == null || reaction.getTriggers().size() == 0) {
-            warning("Reaction has no trigger.", Literals.REACTION__TRIGGERS);
-        }
-        HashSet<Variable> triggers = new HashSet<>();
-        // Make sure input triggers have no container and output sources do.
-        for (TriggerRef trigger : reaction.getTriggers()) {
-            if (trigger instanceof VarRef) {
-                VarRef triggerVarRef = (VarRef) trigger;
-                triggers.add(triggerVarRef.getVariable());
-                if (triggerVarRef instanceof Input) {
-                    if (triggerVarRef.getContainer() != null) {
-                        error(String.format("Cannot have an input of a contained reactor as a trigger: %s.%s", triggerVarRef.getContainer().getName(), triggerVarRef.getVariable().getName()),
-                        Literals.REACTION__TRIGGERS);
-                    }
-                } else if (triggerVarRef.getVariable() instanceof Output) {
-                    if (triggerVarRef.getContainer() == null) {
-                        error(String.format("Cannot have an output of this reactor as a trigger: %s", triggerVarRef.getVariable().getName()),
-                            Literals.REACTION__TRIGGERS);
-                    }
-                }
-            }
-        }
-
-        // Make sure input sources have no container and output sources do.
-        // Also check that a source is not already listed as a trigger.
-        for (VarRef source : reaction.getSources()) {
-            if (triggers.contains(source.getVariable())) {
-                error(String.format("Source is already listed as a trigger: %s", source.getVariable().getName()),
-                    Literals.REACTION__SOURCES);
-            }
-            if (source.getVariable() instanceof Input) {
-                if (source.getContainer() != null) {
-                    error(String.format("Cannot have an input of a contained reactor as a source: %s.%s", source.getContainer().getName(), source.getVariable().getName()),
-                        Literals.REACTION__SOURCES);
-                }
-            } else if (source.getVariable() instanceof Output) {
-                if (source.getContainer() == null) {
-                    error(String.format("Cannot have an output of this reactor as a source: %s", source.getVariable().getName()),
-                        Literals.REACTION__SOURCES);
-                }
-            }
-        }
-
-        // Make sure output effects have no container and input effects do.
-        for (VarRef effect : reaction.getEffects()) {
-            if (effect.getVariable() instanceof Input) {
-                if (effect.getContainer() == null) {
-                    error(String.format("Cannot have an input of this reactor as an effect: %s", effect.getVariable().getName()),
-                        Literals.REACTION__EFFECTS);
-                }
-            } else if (effect.getVariable() instanceof Output) {
-                if (effect.getContainer() != null) {
-                    error(String.format("Cannot have an output of a contained reactor as an effect: %s.%s", effect.getContainer().getName(), effect.getVariable().getName()),
-                        Literals.REACTION__EFFECTS);
-                }
-            }
-        }
-
-        // // Report error if this reaction is part of a cycle.
-        Set<NamedInstance<?>> cycles = this.info.topologyCycles();
-        Reactor reactor = ASTUtils.getEnclosingReactor(reaction);
-        boolean reactionInCycle = false;
-        for (NamedInstance<?> it : cycles) {
-            if (it.getDefinition().equals(reaction)) {
-                reactionInCycle = true;
-                break;
-            }
-        }
-        if (reactionInCycle) {
-            // Report involved triggers.
-            List<CharSequence> trigs = new ArrayList<>();
-            for (TriggerRef t : reaction.getTriggers()) {
-                if (!(t instanceof VarRef)) {
-                    continue;
-                }
-                VarRef tVarRef = (VarRef) t;
-                boolean triggerExistsInCycle = false;
-                for (NamedInstance<?> c : cycles) {
-                    if (c.getDefinition().equals(tVarRef.getVariable())) {
-                        triggerExistsInCycle = true;
-                        break;
-                    }
-                }
-                if (triggerExistsInCycle) {
-                    trigs.add(toOriginalText(tVarRef));
-                }
-            }
-            if (trigs.size() > 0) {
-                error(String.format("Reaction triggers involved in cyclic dependency in reactor %s: %s.", reactor.getName(), String.join(", ", trigs)),
-                    Literals.REACTION__TRIGGERS);
-            }
+  @Check(CheckType.FAST)
+  public void checkReaction(Reaction reaction) {
 
-            // Report involved sources.
-            List<CharSequence> sources = new ArrayList<>();
-            for (VarRef t : reaction.getSources()) {
-                boolean sourceExistInCycle = false;
-                for (NamedInstance<?> c : cycles) {
-                    if (c.getDefinition().equals(t.getVariable())) {
-                        sourceExistInCycle = true;
-                        break;
-                    }
-                }
-                if (sourceExistInCycle) {
-                    sources.add(toOriginalText(t));
-                }
-            }
-            if (sources.size() > 0) {
-                error(String.format("Reaction sources involved in cyclic dependency in reactor %s: %s.", reactor.getName(), String.join(", ", sources)),
-                    Literals.REACTION__SOURCES);
-            }
-
-            // Report involved effects.
-            List<CharSequence> effects = new ArrayList<>();
-            for (VarRef t : reaction.getEffects()) {
-                boolean effectExistInCycle = false;
-                for (NamedInstance<?> c : cycles) {
-                    if (c.getDefinition().equals(t.getVariable())) {
-                        effectExistInCycle = true;
-                        break;
-                    }
-                }
-                if (effectExistInCycle) {
-                    effects.add(toOriginalText(t));
-                }
-            }
-            if (effects.size() > 0) {
-                error(String.format("Reaction effects involved in cyclic dependency in reactor %s: %s.", reactor.getName(), String.join(", ", effects)),
-                    Literals.REACTION__EFFECTS);
-            }
-
-            if (trigs.size() + sources.size() == 0) {
-                error(
-                    String.format("Cyclic dependency due to preceding reaction. Consider reordering reactions within reactor %s to avoid causality loop.", reactor.getName()),
-                    reaction.eContainer(),
-                    Literals.REACTOR__REACTIONS,
-                    reactor.getReactions().indexOf(reaction)
-                );
-            } else if (effects.size() == 0) {
-                error(
-                    String.format("Cyclic dependency due to succeeding reaction. Consider reordering reactions within reactor %s to avoid causality loop.", reactor.getName()),
-                    reaction.eContainer(),
-                    Literals.REACTOR__REACTIONS,
-                    reactor.getReactions().indexOf(reaction)
-                );
-            }
-            // Not reporting reactions that are part of cycle _only_ due to reaction ordering.
-            // Moving them won't help solve the problem.
-        }
-    // FIXME: improve error message.
+    if (reaction.getTriggers() == null || reaction.getTriggers().size() == 0) {
+      warning("Reaction has no trigger.", Literals.REACTION__TRIGGERS);
     }
-
-    public void checkReactorName(String name) throws IOException {
-        // Check for illegal names.
-        checkName(name, Literals.REACTOR_DECL__NAME);
-
-        // C++ reactors may not be called 'preamble'
-        if (this.target == Target.CPP &&  name.equalsIgnoreCase("preamble")) {
+    HashSet<Variable> triggers = new HashSet<>();
+    // Make sure input triggers have no container and output sources do.
+    for (TriggerRef trigger : reaction.getTriggers()) {
+      if (trigger instanceof VarRef) {
+        VarRef triggerVarRef = (VarRef) trigger;
+        triggers.add(triggerVarRef.getVariable());
+        if (triggerVarRef instanceof Input) {
+          if (triggerVarRef.getContainer() != null) {
             error(
-                "Reactor cannot be named '" + name + "'",
-                Literals.REACTOR_DECL__NAME
-            );
+                String.format(
+                    "Cannot have an input of a contained reactor as a trigger: %s.%s",
+                    triggerVarRef.getContainer().getName(), triggerVarRef.getVariable().getName()),
+                Literals.REACTION__TRIGGERS);
+          }
+        } else if (triggerVarRef.getVariable() instanceof Output) {
+          if (triggerVarRef.getContainer() == null) {
+            error(
+                String.format(
+                    "Cannot have an output of this reactor as a trigger: %s",
+                    triggerVarRef.getVariable().getName()),
+                Literals.REACTION__TRIGGERS);
+          }
         }
+      }
     }
 
-    @Check(CheckType.FAST)
-    public void checkReactor(Reactor reactor) throws IOException {
-        String fileName = FileUtil.nameWithoutExtension(reactor.eResource());
-
-        if (reactor.isFederated() || reactor.isMain()) {
-            // Do not allow multiple main/federated reactors.
-            TreeIterator<EObject> iter = reactor.eResource().getAllContents();
-            int nMain = countMainOrFederated(iter);
-            if (nMain > 1) {
-                EAttribute attribute = Literals.REACTOR__MAIN;
-                if (reactor.isFederated()) {
-                    attribute = Literals.REACTOR__FEDERATED;
-                }
-                error(
-                    "Multiple definitions of main or federated reactor.",
-                    attribute
-                );
-            }
-
-            if(reactor.getName() != null && !reactor.getName().equals(fileName)) {
-                // Make sure that if the name is given, it matches the expected name.
-                error(
-                    "Name of main reactor must match the file name (or be omitted).",
-                    Literals.REACTOR_DECL__NAME
-                );
-            }
-
-            // check the reactor name indicated by the file name
-            // Skip this check if the file is named __synthetic0. This Name is used during testing,
-            // and we would get an unexpected error due to the '__' prefix otherwise.
-            if (!fileName.equals("__synthetic0")) {
-                checkReactorName(fileName);
-            }
-        } else {
-            // Not federated or main.
-            if (reactor.getName() == null) {
-                error(
-                    "Reactor must be named.",
-                    Literals.REACTOR_DECL__NAME
-                );
-            } else {
-                checkReactorName(reactor.getName());
-
-                TreeIterator<EObject> iter = reactor.eResource().getAllContents();
-                int nMain = countMainOrFederated(iter);
-                if (nMain > 0 && reactor.getName().equals(fileName)) {
-                    error(
-                        "Name conflict with main reactor.",
-                        Literals.REACTOR_DECL__NAME
-                    );
-                }
-            }
-        }
+    // Make sure input sources have no container and output sources do.
+    // Also check that a source is not already listed as a trigger.
+    for (VarRef source : reaction.getSources()) {
+      if (triggers.contains(source.getVariable())) {
+        error(
+            String.format(
+                "Source is already listed as a trigger: %s", source.getVariable().getName()),
+            Literals.REACTION__SOURCES);
+      }
+      if (source.getVariable() instanceof Input) {
+        if (source.getContainer() != null) {
+          error(
+              String.format(
+                  "Cannot have an input of a contained reactor as a source: %s.%s",
+                  source.getContainer().getName(), source.getVariable().getName()),
+              Literals.REACTION__SOURCES);
+        }
+      } else if (source.getVariable() instanceof Output) {
+        if (source.getContainer() == null) {
+          error(
+              String.format(
+                  "Cannot have an output of this reactor as a source: %s",
+                  source.getVariable().getName()),
+              Literals.REACTION__SOURCES);
+        }
+      }
+    }
 
+    // Make sure output effects have no container and input effects do.
+    for (VarRef effect : reaction.getEffects()) {
+      if (effect.getVariable() instanceof Input) {
+        if (effect.getContainer() == null) {
+          error(
+              String.format(
+                  "Cannot have an input of this reactor as an effect: %s",
+                  effect.getVariable().getName()),
+              Literals.REACTION__EFFECTS);
+        }
+      } else if (effect.getVariable() instanceof Output) {
+        if (effect.getContainer() != null) {
+          error(
+              String.format(
+                  "Cannot have an output of a contained reactor as an effect: %s.%s",
+                  effect.getContainer().getName(), effect.getVariable().getName()),
+              Literals.REACTION__EFFECTS);
+        }
+      }
+    }
 
-        Set<Reactor> superClasses = ASTUtils.superClasses(reactor);
-        if (superClasses == null) {
-            error(
-                    "Problem with superclasses: Either they form a cycle or are not defined",
-                    Literals.REACTOR_DECL__NAME
-            );
-            // Continue checks, but without any superclasses.
-            superClasses = new LinkedHashSet<>();
+    // // Report error if this reaction is part of a cycle.
+    Set<NamedInstance<?>> cycles = this.info.topologyCycles();
+    Reactor reactor = ASTUtils.getEnclosingReactor(reaction);
+    boolean reactionInCycle = false;
+    for (NamedInstance<?> it : cycles) {
+      if (it.getDefinition().equals(reaction)) {
+        reactionInCycle = true;
+        break;
+      }
+    }
+    if (reactionInCycle) {
+      // Report involved triggers.
+      List<CharSequence> trigs = new ArrayList<>();
+      for (TriggerRef t : reaction.getTriggers()) {
+        if (!(t instanceof VarRef)) {
+          continue;
+        }
+        VarRef tVarRef = (VarRef) t;
+        boolean triggerExistsInCycle = false;
+        for (NamedInstance<?> c : cycles) {
+          if (c.getDefinition().equals(tVarRef.getVariable())) {
+            triggerExistsInCycle = true;
+            break;
+          }
         }
-
-        if (reactor.getHost() != null) {
-            if (!reactor.isFederated()) {
-                error(
-                    "Cannot assign a host to reactor '" + reactor.getName() +
-                    "' because it is not federated.",
-                    Literals.REACTOR__HOST
-                );
-            }
+        if (triggerExistsInCycle) {
+          trigs.add(toOriginalText(tVarRef));
+        }
+      }
+      if (trigs.size() > 0) {
+        error(
+            String.format(
+                "Reaction triggers involved in cyclic dependency in reactor %s: %s.",
+                reactor.getName(), String.join(", ", trigs)),
+            Literals.REACTION__TRIGGERS);
+      }
+
+      // Report involved sources.
+      List<CharSequence> sources = new ArrayList<>();
+      for (VarRef t : reaction.getSources()) {
+        boolean sourceExistInCycle = false;
+        for (NamedInstance<?> c : cycles) {
+          if (c.getDefinition().equals(t.getVariable())) {
+            sourceExistInCycle = true;
+            break;
+          }
         }
-
-        List<Variable> variables = new ArrayList<>();
-        variables.addAll(reactor.getInputs());
-        variables.addAll(reactor.getOutputs());
-        variables.addAll(reactor.getActions());
-        variables.addAll(reactor.getTimers());
-
-        if (!reactor.getSuperClasses().isEmpty() && !target.supportsInheritance()) {
-            error("The " + target.getDisplayName() + " target does not support reactor inheritance.",
-                Literals.REACTOR__SUPER_CLASSES);
+        if (sourceExistInCycle) {
+          sources.add(toOriginalText(t));
+        }
+      }
+      if (sources.size() > 0) {
+        error(
+            String.format(
+                "Reaction sources involved in cyclic dependency in reactor %s: %s.",
+                reactor.getName(), String.join(", ", sources)),
+            Literals.REACTION__SOURCES);
+      }
+
+      // Report involved effects.
+      List<CharSequence> effects = new ArrayList<>();
+      for (VarRef t : reaction.getEffects()) {
+        boolean effectExistInCycle = false;
+        for (NamedInstance<?> c : cycles) {
+          if (c.getDefinition().equals(t.getVariable())) {
+            effectExistInCycle = true;
+            break;
+          }
         }
+        if (effectExistInCycle) {
+          effects.add(toOriginalText(t));
+        }
+      }
+      if (effects.size() > 0) {
+        error(
+            String.format(
+                "Reaction effects involved in cyclic dependency in reactor %s: %s.",
+                reactor.getName(), String.join(", ", effects)),
+            Literals.REACTION__EFFECTS);
+      }
+
+      if (trigs.size() + sources.size() == 0) {
+        error(
+            String.format(
+                "Cyclic dependency due to preceding reaction. Consider reordering reactions within"
+                    + " reactor %s to avoid causality loop.",
+                reactor.getName()),
+            reaction.eContainer(),
+            Literals.REACTOR__REACTIONS,
+            reactor.getReactions().indexOf(reaction));
+      } else if (effects.size() == 0) {
+        error(
+            String.format(
+                "Cyclic dependency due to succeeding reaction. Consider reordering reactions within"
+                    + " reactor %s to avoid causality loop.",
+                reactor.getName()),
+            reaction.eContainer(),
+            Literals.REACTOR__REACTIONS,
+            reactor.getReactions().indexOf(reaction));
+      }
+      // Not reporting reactions that are part of cycle _only_ due to reaction ordering.
+      // Moving them won't help solve the problem.
+    }
+    // FIXME: improve error message.
+  }
 
-        // Perform checks on super classes.
-        for (Reactor superClass : superClasses) {
-            HashSet<Variable> conflicts = new HashSet<>();
-
-            // Detect input conflicts
-            checkConflict(superClass.getInputs(), reactor.getInputs(), variables, conflicts);
-            // Detect output conflicts
-            checkConflict(superClass.getOutputs(), reactor.getOutputs(), variables, conflicts);
-            // Detect output conflicts
-            checkConflict(superClass.getActions(), reactor.getActions(), variables, conflicts);
-            // Detect conflicts
-            for (Timer timer : superClass.getTimers()) {
-                List<Variable> filteredVariables = new ArrayList<>(variables);
-                filteredVariables.removeIf(it -> reactor.getTimers().contains(it));
-                if (hasNameConflict(timer, filteredVariables)) {
-                    conflicts.add(timer);
-                } else {
-                    variables.add(timer);
-                }
-            }
-
-            // Report conflicts.
-            if (conflicts.size() > 0) {
-                List<String> names = new ArrayList<>();
-                for (Variable it : conflicts) {
-                    names.add(it.getName());
-                }
-                error(
-                    String.format("Cannot extend %s due to the following conflicts: %s.",
-                            superClass.getName(), String.join(",", names)),
-                    Literals.REACTOR__SUPER_CLASSES
-                );
-            }
-        }
+  public void checkReactorName(String name) throws IOException {
+    // Check for illegal names.
+    checkName(name, Literals.REACTOR_DECL__NAME);
 
+    // C++ reactors may not be called 'preamble'
+    if (this.target == Target.CPP && name.equalsIgnoreCase("preamble")) {
+      error("Reactor cannot be named '" + name + "'", Literals.REACTOR_DECL__NAME);
+    }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkReactor(Reactor reactor) throws IOException {
+    String fileName = FileUtil.nameWithoutExtension(reactor.eResource());
+
+    if (reactor.isFederated() || reactor.isMain()) {
+      // Do not allow multiple main/federated reactors.
+      TreeIterator<EObject> iter = reactor.eResource().getAllContents();
+      int nMain = countMainOrFederated(iter);
+      if (nMain > 1) {
+        EAttribute attribute = Literals.REACTOR__MAIN;
         if (reactor.isFederated()) {
-            if (!target.supportsFederated()) {
-                error("The " + target.getDisplayName() + " target does not support federated execution.",
-                    Literals.REACTOR__FEDERATED);
-            }
+          attribute = Literals.REACTOR__FEDERATED;
+        }
+        error("Multiple definitions of main or federated reactor.", attribute);
+      }
+
+      if (reactor.getName() != null && !reactor.getName().equals(fileName)) {
+        // Make sure that if the name is given, it matches the expected name.
+        error(
+            "Name of main reactor must match the file name (or be omitted).",
+            Literals.REACTOR_DECL__NAME);
+      }
+
+      // check the reactor name indicated by the file name
+      // Skip this check if the file is named __synthetic0. This Name is used during testing,
+      // and we would get an unexpected error due to the '__' prefix otherwise.
+      if (!fileName.equals("__synthetic0")) {
+        checkReactorName(fileName);
+      }
+    } else {
+      // Not federated or main.
+      if (reactor.getName() == null) {
+        error("Reactor must be named.", Literals.REACTOR_DECL__NAME);
+      } else {
+        checkReactorName(reactor.getName());
+
+        TreeIterator<EObject> iter = reactor.eResource().getAllContents();
+        int nMain = countMainOrFederated(iter);
+        if (nMain > 0 && reactor.getName().equals(fileName)) {
+          error("Name conflict with main reactor.", Literals.REACTOR_DECL__NAME);
+        }
+      }
+    }
 
-            FedValidator.validateFederatedReactor(reactor, this.errorReporter);
-        }
+    Set<Reactor> superClasses = ASTUtils.superClasses(reactor);
+    if (superClasses == null) {
+      error(
+          "Problem with superclasses: Either they form a cycle or are not defined",
+          Literals.REACTOR_DECL__NAME);
+      // Continue checks, but without any superclasses.
+      superClasses = new LinkedHashSet<>();
     }
 
-    /**
-     * Check if the requested serialization is supported.
-     */
-    @Check(CheckType.FAST)
-    public void checkSerializer(Serializer serializer) {
-        boolean isValidSerializer = false;
-        for (SupportedSerializers method : SupportedSerializers.values()) {
-          if (method.name().equalsIgnoreCase(serializer.getType())){
-              isValidSerializer = true;
-          }
-        }
+    if (reactor.getHost() != null) {
+      if (!reactor.isFederated()) {
+        error(
+            "Cannot assign a host to reactor '"
+                + reactor.getName()
+                + "' because it is not federated.",
+            Literals.REACTOR__HOST);
+      }
+    }
 
-        if (!isValidSerializer) {
-            error(
-                "Serializer can be " + Arrays.asList(SupportedSerializers.values()),
-                Literals.SERIALIZER__TYPE
-            );
-        }
+    List<Variable> variables = new ArrayList<>();
+    variables.addAll(reactor.getInputs());
+    variables.addAll(reactor.getOutputs());
+    variables.addAll(reactor.getActions());
+    variables.addAll(reactor.getTimers());
+
+    if (!reactor.getSuperClasses().isEmpty() && !target.supportsInheritance()) {
+      error(
+          "The " + target.getDisplayName() + " target does not support reactor inheritance.",
+          Literals.REACTOR__SUPER_CLASSES);
     }
 
-    @Check(CheckType.FAST)
-    public void checkState(StateVar stateVar) {
-        checkName(stateVar.getName(), Literals.STATE_VAR__NAME);
-        if (stateVar.getInit() != null && stateVar.getInit().getExprs().size() != 0) {
-            typeCheck(stateVar.getInit(), ASTUtils.getInferredType(stateVar), Literals.STATE_VAR__INIT);
-        }
+    // Perform checks on super classes.
+    for (Reactor superClass : superClasses) {
+      HashSet<Variable> conflicts = new HashSet<>();
+
+      // Detect input conflicts
+      checkConflict(superClass.getInputs(), reactor.getInputs(), variables, conflicts);
+      // Detect output conflicts
+      checkConflict(superClass.getOutputs(), reactor.getOutputs(), variables, conflicts);
+      // Detect output conflicts
+      checkConflict(superClass.getActions(), reactor.getActions(), variables, conflicts);
+      // Detect conflicts
+      for (Timer timer : superClass.getTimers()) {
+        List<Variable> filteredVariables = new ArrayList<>(variables);
+        filteredVariables.removeIf(it -> reactor.getTimers().contains(it));
+        if (hasNameConflict(timer, filteredVariables)) {
+          conflicts.add(timer);
+        } else {
+          variables.add(timer);
+        }
+      }
+
+      // Report conflicts.
+      if (conflicts.size() > 0) {
+        List<String> names = new ArrayList<>();
+        for (Variable it : conflicts) {
+          names.add(it.getName());
+        }
+        error(
+            String.format(
+                "Cannot extend %s due to the following conflicts: %s.",
+                superClass.getName(), String.join(",", names)),
+            Literals.REACTOR__SUPER_CLASSES);
+      }
+    }
 
-        if (this.target.requiresTypes && ASTUtils.getInferredType(stateVar).isUndefined()) {
-            // Report if a type is missing
-            error("State must have a type.", Literals.STATE_VAR__TYPE);
-        }
+    if (reactor.isFederated()) {
+      if (!target.supportsFederated()) {
+        error(
+            "The " + target.getDisplayName() + " target does not support federated execution.",
+            Literals.REACTOR__FEDERATED);
+      }
 
-        if (isCBasedTarget()
-            && ASTUtils.isListInitializer(stateVar.getInit())
-            && stateVar.getInit().getExprs().stream().anyMatch(it -> it instanceof ParameterReference)) {
-            // In C, if initialization is done with a list, elements cannot
-            // refer to parameters.
-            error("List items cannot refer to a parameter.",
-                Literals.STATE_VAR__INIT);
-        }
+      FedValidator.validateFederatedReactor(reactor, this.errorReporter);
+    }
+  }
+
+  /** Check if the requested serialization is supported. */
+  @Check(CheckType.FAST)
+  public void checkSerializer(Serializer serializer) {
+    boolean isValidSerializer = false;
+    for (SupportedSerializers method : SupportedSerializers.values()) {
+      if (method.name().equalsIgnoreCase(serializer.getType())) {
+        isValidSerializer = true;
+      }
+    }
 
+    if (!isValidSerializer) {
+      error(
+          "Serializer can be " + Arrays.asList(SupportedSerializers.values()),
+          Literals.SERIALIZER__TYPE);
     }
+  }
 
-    @Check(CheckType.FAST)
-    public void checkSTPOffset(STP stp) {
-        if (isCBasedTarget() &&
-            this.info.overflowingSTP.contains(stp)) {
-            error(
-                "STP offset exceeds the maximum of " +
-                    TimeValue.MAX_LONG_DEADLINE + " nanoseconds.",
-                Literals.STP__VALUE);
-        }
+  @Check(CheckType.FAST)
+  public void checkState(StateVar stateVar) {
+    checkName(stateVar.getName(), Literals.STATE_VAR__NAME);
+    if (stateVar.getInit() != null && stateVar.getInit().getExprs().size() != 0) {
+      typeCheck(stateVar.getInit(), ASTUtils.getInferredType(stateVar), Literals.STATE_VAR__INIT);
     }
 
-    @Check(CheckType.FAST)
-    public void checkTargetDecl(TargetDecl target) throws IOException {
-        Optional<Target> targetOpt = Target.forName(target.getName());
-        if (targetOpt.isEmpty()) {
-            error("Unrecognized target: " + target.getName(),
-                Literals.TARGET_DECL__NAME);
-        } else {
-            this.target = targetOpt.get();
-        }
-        String lfFileName = FileUtil.nameWithoutExtension(target.eResource());
-        if (Character.isDigit(lfFileName.charAt(0))) {
-            errorReporter.reportError("LF file names must not start with a number");
-        }
+    if (this.target.requiresTypes && ASTUtils.getInferredType(stateVar).isUndefined()) {
+      // Report if a type is missing
+      error("State must have a type.", Literals.STATE_VAR__TYPE);
     }
 
-    /**
-     * Check for consistency of the target properties, which are
-     * defined as KeyValuePairs.
-     *
-     * @param targetProperties The target properties defined
-     *  in the current Lingua Franca program.
-     */
-    @Check(CheckType.EXPENSIVE)
-    public void checkTargetProperties(KeyValuePairs targetProperties) {
-        validateFastTargetProperty(targetProperties);
-        validateClockSyncTargetProperties(targetProperties);
-        validateSchedulerTargetProperties(targetProperties);
-        validateRos2TargetProperties(targetProperties);
-        validateKeepalive(targetProperties);
-    }
-
-    private KeyValuePair getKeyValuePair(KeyValuePairs targetProperties, TargetProperty property) {
-        List<KeyValuePair> properties = targetProperties.getPairs().stream()
+    if (isCBasedTarget()
+        && ASTUtils.isListInitializer(stateVar.getInit())
+        && stateVar.getInit().getExprs().stream()
+            .anyMatch(it -> it instanceof ParameterReference)) {
+      // In C, if initialization is done with a list, elements cannot
+      // refer to parameters.
+      error("List items cannot refer to a parameter.", Literals.STATE_VAR__INIT);
+    }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkSTPOffset(STP stp) {
+    if (isCBasedTarget() && this.info.overflowingSTP.contains(stp)) {
+      error(
+          "STP offset exceeds the maximum of " + TimeValue.MAX_LONG_DEADLINE + " nanoseconds.",
+          Literals.STP__VALUE);
+    }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkTargetDecl(TargetDecl target) throws IOException {
+    Optional<Target> targetOpt = Target.forName(target.getName());
+    if (targetOpt.isEmpty()) {
+      error("Unrecognized target: " + target.getName(), Literals.TARGET_DECL__NAME);
+    } else {
+      this.target = targetOpt.get();
+    }
+    String lfFileName = FileUtil.nameWithoutExtension(target.eResource());
+    if (Character.isDigit(lfFileName.charAt(0))) {
+      errorReporter.reportError("LF file names must not start with a number");
+    }
+  }
+
+  /**
+   * Check for consistency of the target properties, which are defined as KeyValuePairs.
+   *
+   * @param targetProperties The target properties defined in the current Lingua Franca program.
+   */
+  @Check(CheckType.EXPENSIVE)
+  public void checkTargetProperties(KeyValuePairs targetProperties) {
+    validateFastTargetProperty(targetProperties);
+    validateClockSyncTargetProperties(targetProperties);
+    validateSchedulerTargetProperties(targetProperties);
+    validateRos2TargetProperties(targetProperties);
+    validateKeepalive(targetProperties);
+  }
+
+  private KeyValuePair getKeyValuePair(KeyValuePairs targetProperties, TargetProperty property) {
+    List<KeyValuePair> properties =
+        targetProperties.getPairs().stream()
             .filter(pair -> pair.getName().equals(property.description))
             .toList();
-        assert (properties.size() <= 1);
-        return properties.size() > 0 ? properties.get(0) : null;
-    }
-    private void validateFastTargetProperty(KeyValuePairs targetProperties) {
-        KeyValuePair fastTargetProperty = getKeyValuePair(targetProperties, TargetProperty.FAST);
-
-        if (fastTargetProperty != null) {
-            // Check for federated
-            for (Reactor reactor : info.model.getReactors()) {
-                // Check to see if the program has a federated reactor
-                if (reactor.isFederated()) {
-                    error(
-                        "The fast target property is incompatible with federated programs.",
-                        fastTargetProperty,
-                        Literals.KEY_VALUE_PAIR__NAME
-                    );
-                    break;
-                }
-            }
+    assert (properties.size() <= 1);
+    return properties.size() > 0 ? properties.get(0) : null;
+  }
 
-            // Check for physical actions
-            for (Reactor reactor : info.model.getReactors()) {
-                // Check to see if the program has a physical action in a reactor
-                for (Action action : reactor.getActions()) {
-                    if (action.getOrigin().equals(ActionOrigin.PHYSICAL)) {
-                        error(
-                            "The fast target property is incompatible with physical actions.",
-                            fastTargetProperty,
-                            Literals.KEY_VALUE_PAIR__NAME
-                        );
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    private void validateClockSyncTargetProperties(KeyValuePairs targetProperties) {
-        KeyValuePair clockSyncTargetProperty = getKeyValuePair(targetProperties, TargetProperty.CLOCK_SYNC);
+  private void validateFastTargetProperty(KeyValuePairs targetProperties) {
+    KeyValuePair fastTargetProperty = getKeyValuePair(targetProperties, TargetProperty.FAST);
 
-        if (clockSyncTargetProperty != null) {
-            boolean federatedExists = false;
-            for (Reactor reactor : info.model.getReactors()) {
-                if (reactor.isFederated()) {
-                    federatedExists = true;
-                }
-            }
-            if (!federatedExists) {
-                warning(
-                    "The clock-sync target property is incompatible with non-federated programs.",
-                    clockSyncTargetProperty,
-                    Literals.KEY_VALUE_PAIR__NAME
-                );
-            }
+    if (fastTargetProperty != null) {
+      // Check for federated
+      for (Reactor reactor : info.model.getReactors()) {
+        // Check to see if the program has a federated reactor
+        if (reactor.isFederated()) {
+          error(
+              "The fast target property is incompatible with federated programs.",
+              fastTargetProperty,
+              Literals.KEY_VALUE_PAIR__NAME);
+          break;
+        }
+      }
+
+      // Check for physical actions
+      for (Reactor reactor : info.model.getReactors()) {
+        // Check to see if the program has a physical action in a reactor
+        for (Action action : reactor.getActions()) {
+          if (action.getOrigin().equals(ActionOrigin.PHYSICAL)) {
+            error(
+                "The fast target property is incompatible with physical actions.",
+                fastTargetProperty,
+                Literals.KEY_VALUE_PAIR__NAME);
+            break;
+          }
         }
+      }
     }
+  }
 
-    private void validateSchedulerTargetProperties(KeyValuePairs targetProperties) {
-        KeyValuePair schedulerTargetProperty = getKeyValuePair(targetProperties, TargetProperty.SCHEDULER);
-        if (schedulerTargetProperty != null) {
-            String schedulerName = ASTUtils.elementToSingleString(schedulerTargetProperty.getValue());
-            try {
-                if (!TargetProperty.SchedulerOption.valueOf(schedulerName)
-                                                   .prioritizesDeadline()) {
-                    // Check if a deadline is assigned to any reaction
-                    // Filter reactors that contain at least one reaction that
-                    // has a deadline handler.
-                    if (info.model.getReactors().stream().anyMatch(
-                        // Filter reactors that contain at least one reaction that
-                        // has a deadline handler.
-                        reactor -> ASTUtils.allReactions(reactor).stream().anyMatch(
-                            reaction -> reaction.getDeadline() != null
-                        ))
-                    ) {
-                        warning("This program contains deadlines, but the chosen "
-                                    + schedulerName
-                                    + " scheduler does not prioritize reaction execution "
-                                    + "based on deadlines. This might result in a sub-optimal "
-                                    + "scheduling.", schedulerTargetProperty,
-                                Literals.KEY_VALUE_PAIR__VALUE);
-                    }
-                }
-            } catch (IllegalArgumentException e) {
-                // the given scheduler is invalid, but this is already checked by
-                // checkTargetProperties
-            }
-        }
-    }
+  private void validateClockSyncTargetProperties(KeyValuePairs targetProperties) {
+    KeyValuePair clockSyncTargetProperty =
+        getKeyValuePair(targetProperties, TargetProperty.CLOCK_SYNC);
 
-    private void validateKeepalive(KeyValuePairs targetProperties) {
-        KeyValuePair keepalive = getKeyValuePair(targetProperties, TargetProperty.KEEPALIVE);
-        if (keepalive != null && target == Target.CPP) {
-            warning("The keepalive property is inferred automatically by the C++ " +
-                "runtime and the value given here is ignored", keepalive, Literals.KEY_VALUE_PAIR__NAME);
-        }
+    if (clockSyncTargetProperty != null) {
+      boolean federatedExists = false;
+      for (Reactor reactor : info.model.getReactors()) {
+        if (reactor.isFederated()) {
+          federatedExists = true;
+        }
+      }
+      if (!federatedExists) {
+        warning(
+            "The clock-sync target property is incompatible with non-federated programs.",
+            clockSyncTargetProperty,
+            Literals.KEY_VALUE_PAIR__NAME);
+      }
     }
-
-    private void validateRos2TargetProperties(KeyValuePairs targetProperties) {
-        KeyValuePair ros2 = getKeyValuePair(targetProperties, TargetProperty.ROS2);
-        KeyValuePair ros2Dependencies = getKeyValuePair(targetProperties, TargetProperty.ROS2_DEPENDENCIES);
-        if (ros2Dependencies != null && (ros2 == null || !ASTUtils.toBoolean(ros2.getValue()))) {
+  }
+
+  private void validateSchedulerTargetProperties(KeyValuePairs targetProperties) {
+    KeyValuePair schedulerTargetProperty =
+        getKeyValuePair(targetProperties, TargetProperty.SCHEDULER);
+    if (schedulerTargetProperty != null) {
+      String schedulerName = ASTUtils.elementToSingleString(schedulerTargetProperty.getValue());
+      try {
+        if (!TargetProperty.SchedulerOption.valueOf(schedulerName).prioritizesDeadline()) {
+          // Check if a deadline is assigned to any reaction
+          // Filter reactors that contain at least one reaction that
+          // has a deadline handler.
+          if (info.model.getReactors().stream()
+              .anyMatch(
+                  // Filter reactors that contain at least one reaction that
+                  // has a deadline handler.
+                  reactor ->
+                      ASTUtils.allReactions(reactor).stream()
+                          .anyMatch(reaction -> reaction.getDeadline() != null))) {
             warning(
-                "Ignoring ros2-dependencies as ros2 compilation is disabled",
-                ros2Dependencies,
-                Literals.KEY_VALUE_PAIR__NAME
-            );
+                "This program contains deadlines, but the chosen "
+                    + schedulerName
+                    + " scheduler does not prioritize reaction execution "
+                    + "based on deadlines. This might result in a sub-optimal "
+                    + "scheduling.",
+                schedulerTargetProperty,
+                Literals.KEY_VALUE_PAIR__VALUE);
+          }
         }
+      } catch (IllegalArgumentException e) {
+        // the given scheduler is invalid, but this is already checked by
+        // checkTargetProperties
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkTimer(Timer timer) {
-        checkName(timer.getName(), Literals.VARIABLE__NAME);
-        checkExpressionIsTime(timer.getOffset(), Literals.TIMER__OFFSET);
-        checkExpressionIsTime(timer.getPeriod(), Literals.TIMER__PERIOD);
+  }
+
+  private void validateKeepalive(KeyValuePairs targetProperties) {
+    KeyValuePair keepalive = getKeyValuePair(targetProperties, TargetProperty.KEEPALIVE);
+    if (keepalive != null && target == Target.CPP) {
+      warning(
+          "The keepalive property is inferred automatically by the C++ "
+              + "runtime and the value given here is ignored",
+          keepalive,
+          Literals.KEY_VALUE_PAIR__NAME);
     }
-
-    @Check(CheckType.FAST)
-    public void checkType(Type type) {
-        // FIXME: disallow the use of generics in C
-        if (this.target == Target.Python) {
-            if (type != null) {
-                error(
-                    "Types are not allowed in the Python target",
-                    Literals.TYPE__ID
-                );
-            }
-        }
+  }
+
+  private void validateRos2TargetProperties(KeyValuePairs targetProperties) {
+    KeyValuePair ros2 = getKeyValuePair(targetProperties, TargetProperty.ROS2);
+    KeyValuePair ros2Dependencies =
+        getKeyValuePair(targetProperties, TargetProperty.ROS2_DEPENDENCIES);
+    if (ros2Dependencies != null && (ros2 == null || !ASTUtils.toBoolean(ros2.getValue()))) {
+      warning(
+          "Ignoring ros2-dependencies as ros2 compilation is disabled",
+          ros2Dependencies,
+          Literals.KEY_VALUE_PAIR__NAME);
     }
-
-    @Check(CheckType.FAST)
-    public void checkVarRef(VarRef varRef) {
-        // check correct usage of interleaved
-        if (varRef.isInterleaved()) {
-            var supportedTargets = List.of(Target.CPP, Target.Python, Target.Rust);
-            if (!supportedTargets.contains(this.target) && !isCBasedTarget()) {
-                error("This target does not support interleaved port references.", Literals.VAR_REF__INTERLEAVED);
-            }
-            if (!(varRef.eContainer() instanceof Connection)) {
-                error("interleaved can only be used in connections.", Literals.VAR_REF__INTERLEAVED);
-            }
-
-            if (varRef.getVariable() instanceof Port) {
-                // This test only works correctly if the variable is actually a port. If it is not a port, other
-                // validator rules will produce error messages.
-                if (varRef.getContainer() == null || varRef.getContainer().getWidthSpec() == null ||
-                    ((Port) varRef.getVariable()).getWidthSpec() == null
-                ) {
-                    error("interleaved can only be used for multiports contained within banks.", Literals.VAR_REF__INTERLEAVED);
-                }
-            }
-        }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkTimer(Timer timer) {
+    checkName(timer.getName(), Literals.VARIABLE__NAME);
+    checkExpressionIsTime(timer.getOffset(), Literals.TIMER__OFFSET);
+    checkExpressionIsTime(timer.getPeriod(), Literals.TIMER__PERIOD);
+  }
+
+  @Check(CheckType.FAST)
+  public void checkType(Type type) {
+    // FIXME: disallow the use of generics in C
+    if (this.target == Target.Python) {
+      if (type != null) {
+        error("Types are not allowed in the Python target", Literals.TYPE__ID);
+      }
     }
-
-    /**
-     * Check whether an attribute is supported
-     * and the validity of the attribute.
-     *
-     * @param attr The attribute being checked
-     */
-    @Check(CheckType.FAST)
-    public void checkAttributes(Attribute attr) {
-        String name = attr.getAttrName().toString();
-        AttributeSpec spec = AttributeSpec.ATTRIBUTE_SPECS_BY_NAME.get(name);
-        if (spec == null) {
-            error("Unknown attribute.", Literals.ATTRIBUTE__ATTR_NAME);
-            return;
-        }
-        // Check the validity of the attribute.
-        spec.check(this, attr);
+  }
+
+  @Check(CheckType.FAST)
+  public void checkVarRef(VarRef varRef) {
+    // check correct usage of interleaved
+    if (varRef.isInterleaved()) {
+      var supportedTargets = List.of(Target.CPP, Target.Python, Target.Rust);
+      if (!supportedTargets.contains(this.target) && !isCBasedTarget()) {
+        error(
+            "This target does not support interleaved port references.",
+            Literals.VAR_REF__INTERLEAVED);
+      }
+      if (!(varRef.eContainer() instanceof Connection)) {
+        error("interleaved can only be used in connections.", Literals.VAR_REF__INTERLEAVED);
+      }
+
+      if (varRef.getVariable() instanceof Port) {
+        // This test only works correctly if the variable is actually a port. If it is not a port,
+        // other
+        // validator rules will produce error messages.
+        if (varRef.getContainer() == null
+            || varRef.getContainer().getWidthSpec() == null
+            || ((Port) varRef.getVariable()).getWidthSpec() == null) {
+          error(
+              "interleaved can only be used for multiports contained within banks.",
+              Literals.VAR_REF__INTERLEAVED);
+        }
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkWidthSpec(WidthSpec widthSpec) {
-        if (!this.target.supportsMultiports()) {
-            error("Multiports and banks are currently not supported by the given target.",
+  }
+
+  /**
+   * Check whether an attribute is supported and the validity of the attribute.
+   *
+   * @param attr The attribute being checked
+   */
+  @Check(CheckType.FAST)
+  public void checkAttributes(Attribute attr) {
+    String name = attr.getAttrName().toString();
+    AttributeSpec spec = AttributeSpec.ATTRIBUTE_SPECS_BY_NAME.get(name);
+    if (spec == null) {
+      error("Unknown attribute.", Literals.ATTRIBUTE__ATTR_NAME);
+      return;
+    }
+    // Check the validity of the attribute.
+    spec.check(this, attr);
+  }
+
+  @Check(CheckType.FAST)
+  public void checkWidthSpec(WidthSpec widthSpec) {
+    if (!this.target.supportsMultiports()) {
+      error(
+          "Multiports and banks are currently not supported by the given target.",
+          Literals.WIDTH_SPEC__TERMS);
+    } else {
+      for (WidthTerm term : widthSpec.getTerms()) {
+        if (term.getParameter() != null) {
+          if (!this.target.supportsParameterizedWidths()) {
+            error(
+                "Parameterized widths are not supported by this target.",
                 Literals.WIDTH_SPEC__TERMS);
-        } else {
-            for (WidthTerm term : widthSpec.getTerms()) {
-                if (term.getParameter() != null) {
-                    if (!this.target.supportsParameterizedWidths()) {
-                        error("Parameterized widths are not supported by this target.", Literals.WIDTH_SPEC__TERMS);
-                    }
-                } else if (term.getPort() != null) {
-                    // Widths given with {@code widthof()} are not supported (yet?).
-                    // This feature is currently only used for after delays.
-                    error("widthof is not supported.", Literals.WIDTH_SPEC__TERMS);
-                } else if (term.getCode() != null) {
-                     if (this.target != Target.CPP) {
-                        error("This target does not support width given as code.", Literals.WIDTH_SPEC__TERMS);
-                    }
-                } else if (term.getWidth() < 0) {
-                    error("Width must be a positive integer.", Literals.WIDTH_SPEC__TERMS);
-                }
-            }
+          }
+        } else if (term.getPort() != null) {
+          // Widths given with {@code widthof()} are not supported (yet?).
+          // This feature is currently only used for after delays.
+          error("widthof is not supported.", Literals.WIDTH_SPEC__TERMS);
+        } else if (term.getCode() != null) {
+          if (this.target != Target.CPP) {
+            error("This target does not support width given as code.", Literals.WIDTH_SPEC__TERMS);
+          }
+        } else if (term.getWidth() < 0) {
+          error("Width must be a positive integer.", Literals.WIDTH_SPEC__TERMS);
         }
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkReactorIconAttribute(Reactor reactor) {
-        var path = AttributeUtils.getIconPath(reactor);
-        if (path != null) {
-            var param = AttributeUtils.findAttributeByName(reactor, "icon").getAttrParms().get(0);
-            // Check file extension
-            var validExtensions = Set.of("bmp", "png", "gif", "ico", "jpeg");
-            var extensionStrart = path.lastIndexOf(".");
-            var extension = extensionStrart != -1 ? path.substring(extensionStrart + 1) : "";
-            if (!validExtensions.contains(extension.toLowerCase())) {
-                warning("File extension '" + extension + "' is not supported. Provide any of: " + String.join(", ", validExtensions),
-                        param, Literals.ATTR_PARM__VALUE);
-                return;
-            }
-
-            // Check file location
-            var iconLocation = FileUtil.locateFile(path, reactor.eResource());
-            if (iconLocation == null) {
-                warning("Cannot locate icon file.", param, Literals.ATTR_PARM__VALUE);
-            }
-            if (("file".equals(iconLocation.getScheme()) || iconLocation.getScheme() == null) && !(new File(iconLocation.getPath()).exists())) {
-                warning("Icon does not exist.", param, Literals.ATTR_PARM__VALUE);
-            }
-        }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkReactorIconAttribute(Reactor reactor) {
+    var path = AttributeUtils.getIconPath(reactor);
+    if (path != null) {
+      var param = AttributeUtils.findAttributeByName(reactor, "icon").getAttrParms().get(0);
+      // Check file extension
+      var validExtensions = Set.of("bmp", "png", "gif", "ico", "jpeg");
+      var extensionStrart = path.lastIndexOf(".");
+      var extension = extensionStrart != -1 ? path.substring(extensionStrart + 1) : "";
+      if (!validExtensions.contains(extension.toLowerCase())) {
+        warning(
+            "File extension '"
+                + extension
+                + "' is not supported. Provide any of: "
+                + String.join(", ", validExtensions),
+            param,
+            Literals.ATTR_PARM__VALUE);
+        return;
+      }
+
+      // Check file location
+      var iconLocation = FileUtil.locateFile(path, reactor.eResource());
+      if (iconLocation == null) {
+        warning("Cannot locate icon file.", param, Literals.ATTR_PARM__VALUE);
+      }
+      if (("file".equals(iconLocation.getScheme()) || iconLocation.getScheme() == null)
+          && !(new File(iconLocation.getPath()).exists())) {
+        warning("Icon does not exist.", param, Literals.ATTR_PARM__VALUE);
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkInitialMode(Reactor reactor) {
-        if (!reactor.getModes().isEmpty()) {
-            long initialModesCount = reactor.getModes().stream().filter(m -> m.isInitial()).count();
-            if (initialModesCount == 0) {
-                error("Every modal reactor requires one initial mode.", Literals.REACTOR__MODES, 0);
-            } else if (initialModesCount > 1) {
-                reactor.getModes().stream().filter(m -> m.isInitial()).skip(1).forEach(m -> {
-                    error("A modal reactor can only have one initial mode.",
-                        Literals.REACTOR__MODES, reactor.getModes().indexOf(m));
+  }
+
+  @Check(CheckType.FAST)
+  public void checkInitialMode(Reactor reactor) {
+    if (!reactor.getModes().isEmpty()) {
+      long initialModesCount = reactor.getModes().stream().filter(m -> m.isInitial()).count();
+      if (initialModesCount == 0) {
+        error("Every modal reactor requires one initial mode.", Literals.REACTOR__MODES, 0);
+      } else if (initialModesCount > 1) {
+        reactor.getModes().stream()
+            .filter(m -> m.isInitial())
+            .skip(1)
+            .forEach(
+                m -> {
+                  error(
+                      "A modal reactor can only have one initial mode.",
+                      Literals.REACTOR__MODES,
+                      reactor.getModes().indexOf(m));
                 });
-            }
+      }
+    }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkModeStateNamespace(Reactor reactor) {
+    if (!reactor.getModes().isEmpty()) {
+      var names = new ArrayList<String>();
+      reactor.getStateVars().stream().map(it -> it.getName()).forEach(it -> names.add(it));
+      for (var mode : reactor.getModes()) {
+        for (var stateVar : mode.getStateVars()) {
+          if (names.contains(stateVar.getName())) {
+            error(
+                String.format(
+                    "Duplicate state variable '%s'. (State variables are currently scoped on"
+                        + " reactor level not modes)",
+                    stateVar.getName()),
+                stateVar,
+                Literals.STATE_VAR__NAME);
+          }
+          names.add(stateVar.getName());
         }
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkModeStateNamespace(Reactor reactor) {
-        if (!reactor.getModes().isEmpty()) {
-            var names = new ArrayList<String>();
-            reactor.getStateVars().stream().map(it -> it.getName()).forEach(it -> names.add(it));
-            for (var mode : reactor.getModes()) {
-                for (var stateVar : mode.getStateVars()) {
-                    if (names.contains(stateVar.getName())) {
-                        error(String.format("Duplicate state variable '%s'. (State variables are currently scoped on reactor level not modes)",
-                            stateVar.getName()), stateVar, Literals.STATE_VAR__NAME);
-                    }
-                    names.add(stateVar.getName());
-                }
-            }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkModeTimerNamespace(Reactor reactor) {
+    if (!reactor.getModes().isEmpty()) {
+      var names = new ArrayList<String>();
+      reactor.getTimers().stream().map(it -> it.getName()).forEach(it -> names.add(it));
+      for (var mode : reactor.getModes()) {
+        for (var timer : mode.getTimers()) {
+          if (names.contains(timer.getName())) {
+            error(
+                String.format(
+                    "Duplicate Timer '%s'. (Timers are currently scoped on reactor level not"
+                        + " modes)",
+                    timer.getName()),
+                timer,
+                Literals.VARIABLE__NAME);
+          }
+          names.add(timer.getName());
         }
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkModeTimerNamespace(Reactor reactor) {
-        if (!reactor.getModes().isEmpty()) {
-            var names = new ArrayList<String>();
-            reactor.getTimers().stream().map(it -> it.getName()).forEach(it -> names.add(it));
-            for (var mode : reactor.getModes()) {
-                for (var timer : mode.getTimers()) {
-                    if (names.contains(timer.getName())) {
-                        error(String.format("Duplicate Timer '%s'. (Timers are currently scoped on reactor level not modes)",
-                            timer.getName()), timer, Literals.VARIABLE__NAME);
-                    }
-                    names.add(timer.getName());
-                }
-            }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkModeActionNamespace(Reactor reactor) {
+    if (!reactor.getModes().isEmpty()) {
+      var names = new ArrayList<String>();
+      reactor.getActions().stream().map(it -> it.getName()).forEach(it -> names.add(it));
+      for (var mode : reactor.getModes()) {
+        for (var action : mode.getActions()) {
+          if (names.contains(action.getName())) {
+            error(
+                String.format(
+                    "Duplicate Action '%s'. (Actions are currently scoped on reactor level not"
+                        + " modes)",
+                    action.getName()),
+                action,
+                Literals.VARIABLE__NAME);
+          }
+          names.add(action.getName());
         }
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkModeActionNamespace(Reactor reactor) {
-        if (!reactor.getModes().isEmpty()) {
-            var names = new ArrayList<String>();
-            reactor.getActions().stream().map(it -> it.getName()).forEach(it -> names.add(it));
-            for (var mode : reactor.getModes()) {
-                for (var action : mode.getActions()) {
-                    if (names.contains(action.getName())) {
-                        error(String.format("Duplicate Action '%s'. (Actions are currently scoped on reactor level not modes)",
-                            action.getName()), action, Literals.VARIABLE__NAME);
-                    }
-                    names.add(action.getName());
-                }
-            }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkModeInstanceNamespace(Reactor reactor) {
+    if (!reactor.getModes().isEmpty()) {
+      var names = new ArrayList<String>();
+      reactor.getActions().stream().map(it -> it.getName()).forEach(it -> names.add(it));
+      for (var mode : reactor.getModes()) {
+        for (var instantiation : mode.getInstantiations()) {
+          if (names.contains(instantiation.getName())) {
+            error(
+                String.format(
+                    "Duplicate Instantiation '%s'. (Instantiations are currently scoped on reactor"
+                        + " level not modes)",
+                    instantiation.getName()),
+                instantiation,
+                Literals.INSTANTIATION__NAME);
+          }
+          names.add(instantiation.getName());
         }
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkModeInstanceNamespace(Reactor reactor) {
-        if (!reactor.getModes().isEmpty()) {
-            var names = new ArrayList<String>();
-            reactor.getActions().stream().map(it -> it.getName()).forEach(it -> names.add(it));
-            for (var mode : reactor.getModes()) {
-                for (var instantiation : mode.getInstantiations()) {
-                    if (names.contains(instantiation.getName())) {
-                        error(String.format("Duplicate Instantiation '%s'. (Instantiations are currently scoped on reactor level not modes)",
-                            instantiation.getName()), instantiation, Literals.INSTANTIATION__NAME);
-                    }
-                    names.add(instantiation.getName());
-                }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkMissingStateResetInMode(Reactor reactor) {
+    if (!reactor.getModes().isEmpty()) {
+      var resetModes = new HashSet<Mode>();
+      // Collect all modes that may be reset
+      for (var m : reactor.getModes()) {
+        for (var r : m.getReactions()) {
+          for (var e : r.getEffects()) {
+            if (e.getVariable() instanceof Mode && e.getTransition() != ModeTransition.HISTORY) {
+              resetModes.add((Mode) e.getVariable());
             }
+          }
         }
-    }
-
-    @Check(CheckType.FAST)
-    public void checkMissingStateResetInMode(Reactor reactor) {
-        if (!reactor.getModes().isEmpty()) {
-            var resetModes = new HashSet<Mode>();
-            // Collect all modes that may be reset
-            for (var m : reactor.getModes()) {
-                for (var r : m.getReactions()) {
-                    for (var e : r.getEffects()) {
-                        if (e.getVariable() instanceof Mode && e.getTransition() != ModeTransition.HISTORY) {
-                            resetModes.add((Mode) e.getVariable());
-                        }
-                    }
-                }
+      }
+      for (var m : resetModes) {
+        // Check state variables in this mode
+        if (!m.getStateVars().isEmpty()) {
+          var hasResetReaction =
+              m.getReactions().stream()
+                  .anyMatch(
+                      r ->
+                          r.getTriggers().stream()
+                              .anyMatch(
+                                  t ->
+                                      (t instanceof BuiltinTriggerRef
+                                          && ((BuiltinTriggerRef) t).getType()
+                                              == BuiltinTrigger.RESET)));
+          if (!hasResetReaction) {
+            for (var s : m.getStateVars()) {
+              if (!s.isReset()) {
+                error(
+                    "State variable is not reset upon mode entry. It is neither marked for"
+                        + " automatic reset nor is there a reset reaction.",
+                    m,
+                    Literals.MODE__STATE_VARS,
+                    m.getStateVars().indexOf(s));
+              }
             }
-            for (var m : resetModes) {
-                // Check state variables in this mode
-                if (!m.getStateVars().isEmpty()) {
-                    var hasResetReaction = m.getReactions().stream().anyMatch(
-                            r -> r.getTriggers().stream().anyMatch(
-                                    t -> (t instanceof BuiltinTriggerRef &&
-                                         ((BuiltinTriggerRef) t).getType() == BuiltinTrigger.RESET)));
-                    if (!hasResetReaction) {
-                        for (var s : m.getStateVars()) {
-                            if (!s.isReset()) {
-                                error("State variable is not reset upon mode entry. It is neither marked for automatic reset nor is there a reset reaction.",
-                                        m, Literals.MODE__STATE_VARS, m.getStateVars().indexOf(s));
-                            }
-                        }
-                    }
+          }
+        }
+        // Check state variables in instantiated reactors
+        if (!m.getInstantiations().isEmpty()) {
+          for (var i : m.getInstantiations()) {
+            var error = new LinkedHashSet<StateVar>();
+            var checked = new HashSet<Reactor>();
+            var toCheck = new LinkedList<Reactor>();
+            toCheck.add((Reactor) i.getReactorClass());
+            while (!toCheck.isEmpty()) {
+              var check = toCheck.pop();
+              checked.add(check);
+              if (!check.getStateVars().isEmpty()) {
+                var hasResetReaction =
+                    check.getReactions().stream()
+                        .anyMatch(
+                            r ->
+                                r.getTriggers().stream()
+                                    .anyMatch(
+                                        t ->
+                                            (t instanceof BuiltinTriggerRef
+                                                && ((BuiltinTriggerRef) t).getType()
+                                                    == BuiltinTrigger.RESET)));
+                if (!hasResetReaction) {
+                  // Add state vars that are not self-resetting to the error
+                  check.getStateVars().stream()
+                      .filter(s -> !s.isReset())
+                      .forEachOrdered(error::add);
                 }
-                // Check state variables in instantiated reactors
-                if (!m.getInstantiations().isEmpty()) {
-                    for (var i : m.getInstantiations()) {
-                        var error = new LinkedHashSet<StateVar>();
-                        var checked = new HashSet<Reactor>();
-                        var toCheck = new LinkedList<Reactor>();
-                        toCheck.add((Reactor) i.getReactorClass());
-                        while (!toCheck.isEmpty()) {
-                            var check = toCheck.pop();
-                            checked.add(check);
-                            if (!check.getStateVars().isEmpty()) {
-                                var hasResetReaction = check.getReactions().stream().anyMatch(
-                                        r -> r.getTriggers().stream().anyMatch(
-                                                t -> (t instanceof BuiltinTriggerRef &&
-                                                     ((BuiltinTriggerRef) t).getType() == BuiltinTrigger.RESET)));
-                                if (!hasResetReaction) {
-                                    // Add state vars that are not self-resetting to the error
-                                    check.getStateVars().stream().filter(s -> !s.isReset()).forEachOrdered(error::add);
-                                }
-                            }
-                            // continue with inner
-                            for (var innerInstance : check.getInstantiations()) {
-                                var next = (Reactor) innerInstance.getReactorClass();
-                                if (!checked.contains(next)) {
-                                    toCheck.push(next);
-                                }
-                            }
-                        }
-                        if (!error.isEmpty()) {
-                            error("This reactor contains state variables that are not reset upon mode entry: "
-                                    + error.stream().map(e -> e.getName() + " in "
-                                            + ASTUtils.getEnclosingReactor(e).getName()).collect(Collectors.joining(", "))
-                                    + ".\nThe state variables are neither marked for automatic reset nor have a dedicated reset reaction. "
-                                    + "It is unsafe to instantiate this reactor inside a mode entered with reset.",
-                                    m, Literals.MODE__INSTANTIATIONS,
-                                    m.getInstantiations().indexOf(i));
-                        }
-                    }
+              }
+              // continue with inner
+              for (var innerInstance : check.getInstantiations()) {
+                var next = (Reactor) innerInstance.getReactorClass();
+                if (!checked.contains(next)) {
+                  toCheck.push(next);
                 }
+              }
+            }
+            if (!error.isEmpty()) {
+              error(
+                  "This reactor contains state variables that are not reset upon mode entry: "
+                      + error.stream()
+                          .map(
+                              e -> e.getName() + " in " + ASTUtils.getEnclosingReactor(e).getName())
+                          .collect(Collectors.joining(", "))
+                      + ".\n"
+                      + "The state variables are neither marked for automatic reset nor have a"
+                      + " dedicated reset reaction. It is unsafe to instantiate this reactor inside"
+                      + " a mode entered with reset.",
+                  m,
+                  Literals.MODE__INSTANTIATIONS,
+                  m.getInstantiations().indexOf(i));
             }
+          }
         }
+      }
     }
-
-    @Check(CheckType.FAST)
-    public void checkStateResetWithoutInitialValue(StateVar state) {
-        if (state.isReset() && (state.getInit() == null || state.getInit().getExprs().isEmpty())) {
-            error("The state variable can not be automatically reset without an initial value.", state, Literals.STATE_VAR__RESET);
-        }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkStateResetWithoutInitialValue(StateVar state) {
+    if (state.isReset() && (state.getInit() == null || state.getInit().getExprs().isEmpty())) {
+      error(
+          "The state variable can not be automatically reset without an initial value.",
+          state,
+          Literals.STATE_VAR__RESET);
     }
-
-    @Check(CheckType.FAST)
-    public void checkUnspecifiedTransitionType(Reaction reaction) {
-        for (var effect : reaction.getEffects()) {
-            var variable = effect.getVariable();
-            if (variable instanceof Mode) {
-                // The transition type is always set to default by Xtext.
-                // Hence, check if there is an explicit node for the transition type in the AST.
-                var transitionAssignment = NodeModelUtils.findNodesForFeature((EObject) effect, Literals.VAR_REF__TRANSITION);
-                if (transitionAssignment.isEmpty()) { // Transition type not explicitly specified.
-                    var mode = (Mode) variable;
-                    // Check if reset or history transition would make a difference.
-                    var makesDifference = !mode.getStateVars().isEmpty()
-                            || !mode.getTimers().isEmpty()
-                            || !mode.getActions().isEmpty()
-                            || mode.getConnections().stream().anyMatch(c -> c.getDelay() != null);
-                    if (!makesDifference && !mode.getInstantiations().isEmpty()) {
-                        // Also check instantiated reactors
-                        for (var i : mode.getInstantiations()) {
-                            var checked = new HashSet<Reactor>();
-                            var toCheck = new LinkedList<Reactor>();
-                            toCheck.add((Reactor) i.getReactorClass());
-                            while (!toCheck.isEmpty() && !makesDifference) {
-                                var check = toCheck.pop();
-                                checked.add(check);
-
-                                makesDifference |= !check.getModes().isEmpty()
-                                        || !ASTUtils.allStateVars(check).isEmpty()
-                                        || !ASTUtils.allTimers(check).isEmpty()
-                                        || !ASTUtils.allActions(check).isEmpty()
-                                        || ASTUtils.allConnections(check).stream().anyMatch(c -> c.getDelay() != null);
-
-                                // continue with inner
-                                for (var innerInstance : check.getInstantiations()) {
-                                    var next = (Reactor) innerInstance.getReactorClass();
-                                    if (!checked.contains(next)) {
-                                        toCheck.push(next);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    if (makesDifference) {
-                        warning("You should specify a transition type! "
-                                + "Reset and history transitions have different effects on this target mode. "
-                                + "Currently, a reset type is implicitly assumed.",
-                                reaction, Literals.REACTION__EFFECTS, reaction.getEffects().indexOf(effect));
-                    }
+  }
+
+  @Check(CheckType.FAST)
+  public void checkUnspecifiedTransitionType(Reaction reaction) {
+    for (var effect : reaction.getEffects()) {
+      var variable = effect.getVariable();
+      if (variable instanceof Mode) {
+        // The transition type is always set to default by Xtext.
+        // Hence, check if there is an explicit node for the transition type in the AST.
+        var transitionAssignment =
+            NodeModelUtils.findNodesForFeature((EObject) effect, Literals.VAR_REF__TRANSITION);
+        if (transitionAssignment.isEmpty()) { // Transition type not explicitly specified.
+          var mode = (Mode) variable;
+          // Check if reset or history transition would make a difference.
+          var makesDifference =
+              !mode.getStateVars().isEmpty()
+                  || !mode.getTimers().isEmpty()
+                  || !mode.getActions().isEmpty()
+                  || mode.getConnections().stream().anyMatch(c -> c.getDelay() != null);
+          if (!makesDifference && !mode.getInstantiations().isEmpty()) {
+            // Also check instantiated reactors
+            for (var i : mode.getInstantiations()) {
+              var checked = new HashSet<Reactor>();
+              var toCheck = new LinkedList<Reactor>();
+              toCheck.add((Reactor) i.getReactorClass());
+              while (!toCheck.isEmpty() && !makesDifference) {
+                var check = toCheck.pop();
+                checked.add(check);
+
+                makesDifference |=
+                    !check.getModes().isEmpty()
+                        || !ASTUtils.allStateVars(check).isEmpty()
+                        || !ASTUtils.allTimers(check).isEmpty()
+                        || !ASTUtils.allActions(check).isEmpty()
+                        || ASTUtils.allConnections(check).stream()
+                            .anyMatch(c -> c.getDelay() != null);
+
+                // continue with inner
+                for (var innerInstance : check.getInstantiations()) {
+                  var next = (Reactor) innerInstance.getReactorClass();
+                  if (!checked.contains(next)) {
+                    toCheck.push(next);
+                  }
                 }
+              }
             }
+          }
+          if (makesDifference) {
+            warning(
+                "You should specify a transition type! "
+                    + "Reset and history transitions have different effects on this target mode. "
+                    + "Currently, a reset type is implicitly assumed.",
+                reaction,
+                Literals.REACTION__EFFECTS,
+                reaction.getEffects().indexOf(effect));
+          }
         }
+      }
+    }
+  }
+
+  //////////////////////////////////////////////////////////////
+  //// Public methods.
+
+  /** Return the error reporter for this validator. */
+  public ValidatorErrorReporter getErrorReporter() {
+    return this.errorReporter;
+  }
+
+  /** Implementation required by xtext to report validation errors. */
+  @Override
+  public ValidationMessageAcceptor getMessageAcceptor() {
+    return messageAcceptor == null ? this : messageAcceptor;
+  }
+
+  /** Return a list of error messages for the target declaration. */
+  public List<String> getTargetPropertyErrors() {
+    return this.targetPropertyErrors;
+  }
+
+  //////////////////////////////////////////////////////////////
+  //// Protected methods.
+
+  /** Generate an error message for an AST node. */
+  @Override
+  protected void error(java.lang.String message, org.eclipse.emf.ecore.EStructuralFeature feature) {
+    super.error(message, feature);
+  }
+
+  //////////////////////////////////////////////////////////////
+  //// Private methods.
+
+  /**
+   * For each input, report a conflict if: 1) the input exists and the type doesn't match; or 2) the
+   * input has a name clash with variable that is not an input.
+   *
+   * @param superVars List of typed variables of a particular kind (i.e., inputs, outputs, or
+   *     actions), found in a super class.
+   * @param sameKind Typed variables of the same kind, found in the subclass.
+   * @param allOwn Accumulator of non-conflicting variables incorporated in the subclass.
+   * @param conflicts Set of variables that are in conflict, to be used by this function to report
+   *     conflicts.
+   */
+  private <T extends TypedVariable> void checkConflict(
+      EList<T> superVars, EList<T> sameKind, List<Variable> allOwn, HashSet<Variable> conflicts) {
+    for (T superVar : superVars) {
+      T match = null;
+      for (T it : sameKind) {
+        if (it.getName().equals(superVar.getName())) {
+          match = it;
+          break;
+        }
+      }
+      List<Variable> rest = new ArrayList<>(allOwn);
+      rest.removeIf(it -> sameKind.contains(it));
+
+      if ((match != null && superVar.getType() != match.getType())
+          || hasNameConflict(superVar, rest)) {
+        conflicts.add(superVar);
+      } else {
+        allOwn.add(superVar);
+      }
+    }
+  }
+
+  /**
+   * Check the name of a feature for illegal substrings such as reserved identifiers and names with
+   * double leading underscores.
+   *
+   * @param name The name.
+   * @param feature The feature containing the name (for error reporting).
+   */
+  private void checkName(String name, EStructuralFeature feature) {
+
+    // Raises an error if the string starts with two underscores.
+    if (name.length() >= 2 && name.substring(0, 2).equals("__")) {
+      error(UNDERSCORE_MESSAGE + name, feature);
     }
 
-    //////////////////////////////////////////////////////////////
-    //// Public methods.
-
-    /**
-     * Return the error reporter for this validator.
-     */
-    public ValidatorErrorReporter getErrorReporter() {
-        return this.errorReporter;
-    }
-
-    /**
-     * Implementation required by xtext to report validation errors.
-     */
-    @Override
-    public ValidationMessageAcceptor getMessageAcceptor() {
-        return messageAcceptor == null ? this : messageAcceptor;
-    }
-
-    /**
-     * Return a list of error messages for the target declaration.
-     */
-    public List<String> getTargetPropertyErrors() {
-        return this.targetPropertyErrors;
-    }
-
-    //////////////////////////////////////////////////////////////
-    //// Protected methods.
-
-    /**
-     * Generate an error message for an AST node.
-     */
-    @Override
-    protected void error(java.lang.String message,
-        org.eclipse.emf.ecore.EStructuralFeature feature) {
-        super.error(message, feature);
-    }
-
-    //////////////////////////////////////////////////////////////
-    //// Private methods.
-
-    /**
-     * For each input, report a conflict if:
-     *   1) the input exists and the type doesn't match; or
-     *   2) the input has a name clash with variable that is not an input.
-     * @param superVars List of typed variables of a particular kind (i.e.,
-     *  inputs, outputs, or actions), found in a super class.
-     * @param sameKind Typed variables of the same kind, found in the subclass.
-     * @param allOwn Accumulator of non-conflicting variables incorporated in the
-     *  subclass.
-     * @param conflicts Set of variables that are in conflict, to be used by this
-     *  function to report conflicts.
-     */
-    private <T extends TypedVariable> void checkConflict (
-            EList<T> superVars, EList<T> sameKind, List<Variable> allOwn, HashSet<Variable> conflicts
-    ) {
-        for (T superVar : superVars) {
-            T match = null;
-            for (T it : sameKind) {
-                if (it.getName().equals(superVar.getName())) {
-                    match = it;
-                    break;
-                }
-            }
-            List<Variable> rest = new ArrayList<>(allOwn);
-            rest.removeIf(it -> sameKind.contains(it));
+    if (this.target.isReservedIdent(name)) {
+      error(RESERVED_MESSAGE + name, feature);
+    }
 
-            if ((match != null && superVar.getType() != match.getType()) || hasNameConflict(superVar, rest)) {
-                conflicts.add(superVar);
-            } else {
-                allOwn.add(superVar);
-            }
-        }
+    if (this.target == Target.TS) {
+      // "actions" is a reserved word within a TS reaction
+      if (name.equals("actions")) {
+        error(ACTIONS_MESSAGE + name, feature);
+      }
+    }
+  }
+
+  /**
+   * Check that the initializer is compatible with the type. Note that if the type is inferred it
+   * will necessarily be compatible so this method is not harmful.
+   */
+  public void typeCheck(Initializer init, InferredType type, EStructuralFeature feature) {
+    if (init == null) {
+      return;
     }
 
-    /**
-     * Check the name of a feature for illegal substrings such as reserved
-     * identifiers and names with double leading underscores.
-     * @param name The name.
-     * @param feature The feature containing the name (for error reporting).
-     */
-    private void checkName(String name, EStructuralFeature feature) {
+    // TODO:
+    //  type is list => init is list
+    //  type is fixed with size n => init is fixed with size n
+    // Specifically for C: list can only be literal or time lists
 
-        // Raises an error if the string starts with two underscores.
-        if (name.length() >= 2 && name.substring(0, 2).equals("__")) {
-            error(UNDERSCORE_MESSAGE + name, feature);
+    if (type.isTime) {
+      if (type.isList) {
+        // list of times
+        var exprs = init.getExprs();
+        if (exprs.isEmpty()) {
+          error("Expected at least one time value.", feature);
+          return;
         }
-
-        if (this.target.isReservedIdent(name)) {
-            error(RESERVED_MESSAGE + name, feature);
+        if (exprs.size() == 1 && exprs.get(0) instanceof BracedListExpression) {
+          exprs = ((BracedListExpression) exprs.get(0)).getItems();
         }
-
-        if (this.target == Target.TS) {
-            // "actions" is a reserved word within a TS reaction
-            if (name.equals("actions")) {
-                error(ACTIONS_MESSAGE + name, feature);
-            }
+        for (var component : exprs) {
+          checkExpressionIsTime(component, feature);
         }
+      } else {
+        checkExpressionIsTime(init, feature);
+      }
     }
+  }
 
-
-    /**
-     * Check that the initializer is compatible with the type.
-     * Note that if the type is inferred it will necessarily be compatible
-     * so this method is not harmful.
-     */
-    public void typeCheck(Initializer init, InferredType type, EStructuralFeature feature) {
-        if (init == null) {
-            return;
-        }
-
-        // TODO:
-        //  type is list => init is list
-        //  type is fixed with size n => init is fixed with size n
-        // Specifically for C: list can only be literal or time lists
-
-        if (type.isTime) {
-            if (type.isList) {
-                // list of times
-                var exprs = init.getExprs();
-                if (exprs.isEmpty()) {
-                    error("Expected at least one time value.", feature);
-                    return;
-                }
-                if (exprs.size() == 1 && exprs.get(0) instanceof BracedListExpression) {
-                    exprs = ((BracedListExpression) exprs.get(0)).getItems();
-                }
-                for (var component : exprs) {
-                    checkExpressionIsTime(component, feature);
-                }
-            } else {
-                checkExpressionIsTime(init, feature);
-            }
-        }
+  private void checkExpressionIsTime(Initializer init, EStructuralFeature feature) {
+    if (init == null) {
+      return;
     }
 
-    private void checkExpressionIsTime(Initializer init, EStructuralFeature feature) {
-        if (init == null) {
-            return;
-        }
-
-        if (init.getExprs().size() != 1) {
-            error("Expected exactly one time value.", feature);
-        } else {
-            checkExpressionIsTime(ASTUtils.asSingleExpr(init), feature);
-        }
+    if (init.getExprs().size() != 1) {
+      error("Expected exactly one time value.", feature);
+    } else {
+      checkExpressionIsTime(ASTUtils.asSingleExpr(init), feature);
     }
+  }
 
-    private void checkExpressionIsTime(Expression value, EStructuralFeature feature) {
-        if (value == null || value instanceof Time) {
-            return;
-        }
-
-        if (value instanceof ParameterReference) {
-            if (!ASTUtils.isOfTimeType(((ParameterReference) value).getParameter())
-                && target.requiresTypes) {
-                error("Referenced parameter is not of time type.", feature);
-            }
-            return;
-        } else if (value instanceof Literal) {
-            if (ASTUtils.isZero(((Literal) value).getLiteral())) {
-                return;
-            }
-
-            if (ASTUtils.isInteger(((Literal) value).getLiteral())) {
-                error("Missing time unit.", feature);
-                return;
-            }
-            // fallthrough
-        }
-
-        error("Invalid time value.", feature);
+  private void checkExpressionIsTime(Expression value, EStructuralFeature feature) {
+    if (value == null || value instanceof Time) {
+      return;
     }
 
-    /**
-     * Return the number of main or federated reactors declared.
-     *
-     * @param iter An iterator over all objects in the resource.
-     */
-    private int countMainOrFederated(TreeIterator<EObject> iter) {
-        int nMain = 0;
-        while (iter.hasNext()) {
-            EObject obj = iter.next();
-            if (!(obj instanceof Reactor)) {
-                continue;
-            }
-            Reactor r = (Reactor) obj;
-            if (r.isMain() || r.isFederated()) {
-                nMain++;
-            }
-        }
-        return nMain;
-    }
-
-    /**
-     * Report whether a given reactor has dependencies on a cyclic
-     * instantiation pattern. This means the reactor has an instantiation
-     * in it -- directly or in one of its contained reactors -- that is
-     * self-referential.
-     * @param reactor The reactor definition to find out whether it has any
-     * dependencies on cyclic instantiations.
-     * @param cycleSet The set of all reactors that are part of an
-     * instantiation cycle.
-     * @param visited The set of nodes already visited in this graph traversal.
-     */
-    private boolean dependsOnCycle(
-            Reactor reactor, Set<Reactor> cycleSet, Set<Reactor> visited
-    ) {
-        Set<Reactor> origins = info.instantiationGraph.getUpstreamAdjacentNodes(reactor);
-        if (visited.contains(reactor)) {
-            return false;
-        } else {
-            visited.add(reactor);
-            for (Reactor it : origins) {
-                if (cycleSet.contains(it) || dependsOnCycle(it, cycleSet, visited)) {
-                    // Reached a cycle.
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Report whether the name of the given element matches any variable in
-     * the ones to check against.
-     * @param element The element to compare against all variables in the given iterable.
-     * @param toCheckAgainst Iterable variables to compare the given element against.
-     */
-    private boolean hasNameConflict(Variable element,
-        Iterable<Variable> toCheckAgainst) {
-        int numNameConflicts = 0;
-        for (Variable it : toCheckAgainst) {
-            if (it.getName().equals(element.getName())) {
-                numNameConflicts++;
-            }
-        }
-        return numNameConflicts > 0;
+    if (value instanceof ParameterReference) {
+      if (!ASTUtils.isOfTimeType(((ParameterReference) value).getParameter())
+          && target.requiresTypes) {
+        error("Referenced parameter is not of time type.", feature);
+      }
+      return;
+    } else if (value instanceof Literal) {
+      if (ASTUtils.isZero(((Literal) value).getLiteral())) {
+        return;
+      }
+
+      if (ASTUtils.isInteger(((Literal) value).getLiteral())) {
+        error("Missing time unit.", feature);
+        return;
+      }
+      // fallthrough
     }
 
-    /**
-     * Return true if target is C or a C-based target like CCpp.
-     */
-    private boolean isCBasedTarget() {
-        return (this.target == Target.C || this.target == Target.CCPP);
+    error("Invalid time value.", feature);
+  }
+
+  /**
+   * Return the number of main or federated reactors declared.
+   *
+   * @param iter An iterator over all objects in the resource.
+   */
+  private int countMainOrFederated(TreeIterator<EObject> iter) {
+    int nMain = 0;
+    while (iter.hasNext()) {
+      EObject obj = iter.next();
+      if (!(obj instanceof Reactor)) {
+        continue;
+      }
+      Reactor r = (Reactor) obj;
+      if (r.isMain() || r.isFederated()) {
+        nMain++;
+      }
     }
-
-    /**
-     * Report whether a given imported reactor is used in this resource or not.
-     * @param reactor The imported reactor to check whether it is used.
-     */
-    private boolean isUnused(ImportedReactor reactor) {
-        TreeIterator<EObject> instantiations = reactor.eResource().getAllContents();
-        TreeIterator<EObject> subclasses = reactor.eResource().getAllContents();
-
-        boolean instantiationsCheck = true;
-        while (instantiations.hasNext() && instantiationsCheck) {
-            EObject obj = instantiations.next();
-            if (!(obj instanceof Instantiation)) {
-                continue;
-            }
-            Instantiation inst = (Instantiation) obj;
-            instantiationsCheck &= (inst.getReactorClass() != reactor && inst.getReactorClass() != reactor.getReactorClass());
-        }
-
-        boolean subclassesCheck = true;
-        while (subclasses.hasNext() && subclassesCheck) {
-            EObject obj = subclasses.next();
-            if (!(obj instanceof Reactor)) {
-                continue;
-            }
-            Reactor subclass = (Reactor) obj;
-            for (ReactorDecl decl : subclass.getSuperClasses()) {
-                subclassesCheck &= (decl != reactor && decl != reactor.getReactorClass());
-            }
-        }
-        return instantiationsCheck && subclassesCheck;
+    return nMain;
+  }
+
+  /**
+   * Report whether a given reactor has dependencies on a cyclic instantiation pattern. This means
+   * the reactor has an instantiation in it -- directly or in one of its contained reactors -- that
+   * is self-referential.
+   *
+   * @param reactor The reactor definition to find out whether it has any dependencies on cyclic
+   *     instantiations.
+   * @param cycleSet The set of all reactors that are part of an instantiation cycle.
+   * @param visited The set of nodes already visited in this graph traversal.
+   */
+  private boolean dependsOnCycle(Reactor reactor, Set<Reactor> cycleSet, Set<Reactor> visited) {
+    Set<Reactor> origins = info.instantiationGraph.getUpstreamAdjacentNodes(reactor);
+    if (visited.contains(reactor)) {
+      return false;
+    } else {
+      visited.add(reactor);
+      for (Reactor it : origins) {
+        if (cycleSet.contains(it) || dependsOnCycle(it, cycleSet, visited)) {
+          // Reached a cycle.
+          return true;
+        }
+      }
     }
-
-    /**
-     * Return true if the two types match. Unfortunately, xtext does not
-     * seem to create a suitable equals() method for Type, so we have to
-     * do this manually.
-     */
-    private boolean sameType(Type type1, Type type2) {
-        if (type1 == null) {
-            return type2 == null;
-        }
-        if (type2 == null) {
-            return type1 == null;
-        }
-        // Most common case first.
-        if (type1.getId() != null) {
-            if (type1.getStars() != null) {
-                if (type2.getStars() == null) return false;
-                if (type1.getStars().size() != type2.getStars().size()) return false;
-            }
-            return (type1.getId().equals(type2.getId()));
-        }
-
-        // Type specification in the grammar is:
-        // (time?='time' (arraySpec=ArraySpec)?) | ((id=(DottedName) (stars+='*')* ('<' typeParms+=TypeParm (',' typeParms+=TypeParm)* '>')? (arraySpec=ArraySpec)?) | code=Code);
-        if (type1.isTime()) {
-            if (!type2.isTime()) return false;
-            // Ignore the arraySpec because that is checked when connection
-            // is checked for balance.
-            return true;
-        }
-        // Type must be given in a code body
-        return type1.getCode().getBody().equals(type2.getCode().getBody());
+    return false;
+  }
+
+  /**
+   * Report whether the name of the given element matches any variable in the ones to check against.
+   *
+   * @param element The element to compare against all variables in the given iterable.
+   * @param toCheckAgainst Iterable variables to compare the given element against.
+   */
+  private boolean hasNameConflict(Variable element, Iterable<Variable> toCheckAgainst) {
+    int numNameConflicts = 0;
+    for (Variable it : toCheckAgainst) {
+      if (it.getName().equals(element.getName())) {
+        numNameConflicts++;
+      }
+    }
+    return numNameConflicts > 0;
+  }
+
+  /** Return true if target is C or a C-based target like CCpp. */
+  private boolean isCBasedTarget() {
+    return (this.target == Target.C || this.target == Target.CCPP);
+  }
+
+  /**
+   * Report whether a given imported reactor is used in this resource or not.
+   *
+   * @param reactor The imported reactor to check whether it is used.
+   */
+  private boolean isUnused(ImportedReactor reactor) {
+    TreeIterator<EObject> instantiations = reactor.eResource().getAllContents();
+    TreeIterator<EObject> subclasses = reactor.eResource().getAllContents();
+
+    boolean instantiationsCheck = true;
+    while (instantiations.hasNext() && instantiationsCheck) {
+      EObject obj = instantiations.next();
+      if (!(obj instanceof Instantiation)) {
+        continue;
+      }
+      Instantiation inst = (Instantiation) obj;
+      instantiationsCheck &=
+          (inst.getReactorClass() != reactor
+              && inst.getReactorClass() != reactor.getReactorClass());
     }
 
-    //////////////////////////////////////////////////////////////
-    //// Private fields.
-
-    /** The error reporter. */
-    private ValidatorErrorReporter errorReporter
-        = new ValidatorErrorReporter(getMessageAcceptor(), new ValidatorStateAccess());
-
-    /** Helper class containing information about the model. */
-    private ModelInfo info = new ModelInfo();
-
-    @Inject(optional = true)
-    private ValidationMessageAcceptor messageAcceptor;
-
-    /** The declared target. */
-    private Target target;
-
-    private List<String> targetPropertyErrors = new ArrayList<>();
-
-    private List<String> targetPropertyWarnings = new ArrayList<>();
-
-    //////////////////////////////////////////////////////////////
-    //// Private static constants.
-
-    private static String ACTIONS_MESSAGE
-        = "\"actions\" is a reserved word for the TypeScript target for objects "
-                + "(inputs, outputs, actions, timers, parameters, state, reactor definitions, "
-                + "and reactor instantiation): ";
-
-    private static String HOST_OR_FQN_REGEX
-        = "^([a-z0-9]+(-[a-z0-9]+)*)|(([a-z0-9]+(-[a-z0-9]+)*\\.)+[a-z]{2,})$";
-
-    /**
-     * Regular expression to check the validity of IPV4 addresses (due to David M. Syzdek).
-     */
-    private static String IPV4_REGEX = "((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}" +
-                                      "(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])";
-
-    /**
-     * Regular expression to check the validity of IPV6 addresses (due to David M. Syzdek),
-     * with minor adjustment to allow up to six IPV6 segments (without truncation) in front
-     * of an embedded IPv4-address.
-     **/
-    private static String IPV6_REGEX =
-                "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|" +
-                "([0-9a-fA-F]{1,4}:){1,7}:|" +
-                "([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|" +
-                "([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|" +
-                "([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|" +
-                "([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|" +
-                "([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|" +
-                 "[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|" +
-                                 ":((:[0-9a-fA-F]{1,4}){1,7}|:)|" +
-        "fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|" +
-        "::(ffff(:0{1,4}){0,1}:){0,1}" + IPV4_REGEX + "|" +
-        "([0-9a-fA-F]{1,4}:){1,4}:"    + IPV4_REGEX + "|" +
-        "([0-9a-fA-F]{1,4}:){1,6}"     + IPV4_REGEX + ")";
-
-    private static String RESERVED_MESSAGE = "Reserved words in the target language are not allowed for objects "
-            + "(inputs, outputs, actions, timers, parameters, state, reactor definitions, and reactor instantiation): ";
-
-    private static List<String> SPACING_VIOLATION_POLICIES = List.of("defer", "drop", "replace");
-
-    private static String UNDERSCORE_MESSAGE = "Names of objects (inputs, outputs, actions, timers, parameters, "
-            + "state, reactor definitions, and reactor instantiation) may not start with \"__\": ";
-
-    private static String USERNAME_REGEX = "^[a-z_]([a-z0-9_-]{0,31}|[a-z0-9_-]{0,30}\\$)$";
+    boolean subclassesCheck = true;
+    while (subclasses.hasNext() && subclassesCheck) {
+      EObject obj = subclasses.next();
+      if (!(obj instanceof Reactor)) {
+        continue;
+      }
+      Reactor subclass = (Reactor) obj;
+      for (ReactorDecl decl : subclass.getSuperClasses()) {
+        subclassesCheck &= (decl != reactor && decl != reactor.getReactorClass());
+      }
+    }
+    return instantiationsCheck && subclassesCheck;
+  }
+
+  /**
+   * Return true if the two types match. Unfortunately, xtext does not seem to create a suitable
+   * equals() method for Type, so we have to do this manually.
+   */
+  private boolean sameType(Type type1, Type type2) {
+    if (type1 == null) {
+      return type2 == null;
+    }
+    if (type2 == null) {
+      return type1 == null;
+    }
+    // Most common case first.
+    if (type1.getId() != null) {
+      if (type1.getStars() != null) {
+        if (type2.getStars() == null) return false;
+        if (type1.getStars().size() != type2.getStars().size()) return false;
+      }
+      return (type1.getId().equals(type2.getId()));
+    }
 
+    // Type specification in the grammar is:
+    // (time?='time' (arraySpec=ArraySpec)?) | ((id=(DottedName) (stars+='*')* ('<'
+    // typeParms+=TypeParm (',' typeParms+=TypeParm)* '>')? (arraySpec=ArraySpec)?) | code=Code);
+    if (type1.isTime()) {
+      if (!type2.isTime()) return false;
+      // Ignore the arraySpec because that is checked when connection
+      // is checked for balance.
+      return true;
+    }
+    // Type must be given in a code body
+    return type1.getCode().getBody().equals(type2.getCode().getBody());
+  }
+
+  //////////////////////////////////////////////////////////////
+  //// Private fields.
+
+  /** The error reporter. */
+  private ValidatorErrorReporter errorReporter =
+      new ValidatorErrorReporter(getMessageAcceptor(), new ValidatorStateAccess());
+
+  /** Helper class containing information about the model. */
+  private ModelInfo info = new ModelInfo();
+
+  @Inject(optional = true)
+  private ValidationMessageAcceptor messageAcceptor;
+
+  /** The declared target. */
+  private Target target;
+
+  private List<String> targetPropertyErrors = new ArrayList<>();
+
+  private List<String> targetPropertyWarnings = new ArrayList<>();
+
+  //////////////////////////////////////////////////////////////
+  //// Private static constants.
+
+  private static String ACTIONS_MESSAGE =
+      "\"actions\" is a reserved word for the TypeScript target for objects "
+          + "(inputs, outputs, actions, timers, parameters, state, reactor definitions, "
+          + "and reactor instantiation): ";
+
+  private static String HOST_OR_FQN_REGEX =
+      "^([a-z0-9]+(-[a-z0-9]+)*)|(([a-z0-9]+(-[a-z0-9]+)*\\.)+[a-z]{2,})$";
+
+  /** Regular expression to check the validity of IPV4 addresses (due to David M. Syzdek). */
+  private static String IPV4_REGEX =
+      "((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}"
+          + "(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])";
+
+  /**
+   * Regular expression to check the validity of IPV6 addresses (due to David M. Syzdek), with minor
+   * adjustment to allow up to six IPV6 segments (without truncation) in front of an embedded
+   * IPv4-address.
+   */
+  private static String IPV6_REGEX =
+      "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|"
+          + "([0-9a-fA-F]{1,4}:){1,7}:|"
+          + "([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|"
+          + "([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|"
+          + "([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|"
+          + "([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|"
+          + "([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|"
+          + "[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|"
+          + ":((:[0-9a-fA-F]{1,4}){1,7}|:)|"
+          + "fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|"
+          + "::(ffff(:0{1,4}){0,1}:){0,1}"
+          + IPV4_REGEX
+          + "|"
+          + "([0-9a-fA-F]{1,4}:){1,4}:"
+          + IPV4_REGEX
+          + "|"
+          + "([0-9a-fA-F]{1,4}:){1,6}"
+          + IPV4_REGEX
+          + ")";
+
+  private static String RESERVED_MESSAGE =
+      "Reserved words in the target language are not allowed for objects (inputs, outputs, actions,"
+          + " timers, parameters, state, reactor definitions, and reactor instantiation): ";
+
+  private static List<String> SPACING_VIOLATION_POLICIES = List.of("defer", "drop", "replace");
+
+  private static String UNDERSCORE_MESSAGE =
+      "Names of objects (inputs, outputs, actions, timers, parameters, "
+          + "state, reactor definitions, and reactor instantiation) may not start with \"__\": ";
+
+  private static String USERNAME_REGEX = "^[a-z_]([a-z0-9_-]{0,31}|[a-z0-9_-]{0,30}\\$)$";
 }
diff --git a/org.lflang/src/org/lflang/validation/ValidatorErrorReporter.java b/org.lflang/src/org/lflang/validation/ValidatorErrorReporter.java
index ace55683f6..d21458a3a9 100644
--- a/org.lflang/src/org/lflang/validation/ValidatorErrorReporter.java
+++ b/org.lflang/src/org/lflang/validation/ValidatorErrorReporter.java
@@ -1,16 +1,16 @@
 /*************
  * Copyright (c) 2021, TU Dresden.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  * this list of conditions and the following disclaimer.
- * 
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  * this list of conditions and the following disclaimer in the documentation
  * and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -27,155 +27,160 @@
 package org.lflang.validation;
 
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
-
 import org.lflang.ErrorReporter;
 
 /**
- * This class translates messages reported via the ErrorReporrter interface to
- * the interface of a given ValidationMessageAcceptor.
- * 
- * Effectively this allows to report errors via the ErrorReporter interface
- * during validator checks, while having the validator still track all the
- * reported warnings and messages. This is required for some functionality, like
- * the construction of an instance graph in LFValidator.checkModel(). Since the
- * instance graph is also used in other components, it does not report directly
- * to the validator, but uses our custom ErrorReporter interface that we use
- * during code generation. This class bridges the gap between the ErrorReporter
- * interface and the messages that the validator expects.
- * 
+ * This class translates messages reported via the ErrorReporrter interface to the interface of a
+ * given ValidationMessageAcceptor.
+ *
+ * <p>Effectively this allows to report errors via the ErrorReporter interface during validator
+ * checks, while having the validator still track all the reported warnings and messages. This is
+ * required for some functionality, like the construction of an instance graph in
+ * LFValidator.checkModel(). Since the instance graph is also used in other components, it does not
+ * report directly to the validator, but uses our custom ErrorReporter interface that we use during
+ * code generation. This class bridges the gap between the ErrorReporter interface and the messages
+ * that the validator expects.
+ *
  * @author Christian Menard
  */
 public class ValidatorErrorReporter implements ErrorReporter {
 
-    private ValidationMessageAcceptor acceptor;
-    private BaseLFValidator.ValidatorStateAccess validatorState;
-    private boolean errorsOccurred = false;
-
-    public ValidatorErrorReporter(ValidationMessageAcceptor acceptor,
-            BaseLFValidator.ValidatorStateAccess stateAccess) {
-        this.acceptor = acceptor;
-        this.validatorState = stateAccess;
-    }
-
-    /**
-     * Report the given message as an error on the object currently under
-     * validation.
-     */
-    @Override
-    public String reportError(String message) {
-        errorsOccurred = true;
-        acceptor.acceptError(message, validatorState.getCurrentObject(), null,
-                ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-        return message;
-    }
-
-    /**
-     * Report the given message as an error on the given object.
-     */
-    @Override
-    public String reportError(EObject object, String message) {
-        errorsOccurred = true;
-        acceptor.acceptError(message, object, null,
-                ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-        return message;
-    }
-
-    /**
-     * Report the given message as an error on the current object.
-     * 
-     * Unfortunately, there is no way to provide a path and a line number to the
-     * ValidationMessageAcceptor as messages can only be reported directly as
-     * EObjects. While it is not an ideal solution, this method composes a
-     * messages indicating the location of the error and reports this on the
-     * object currently under validation. This way, the error message is not
-     * lost, but it is not necessarily reported precisely at the location of the
-     * actual error.
-     */
-    @Override
-    public String reportError(Path file, Integer line, String message) {
-        errorsOccurred = true;
-        String fullMessage = message + " (Reported from " + file.toString() + " on line "
-            + line.toString() + ")";
-        acceptor.acceptError(fullMessage, validatorState.getCurrentObject(),
-                null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-        return fullMessage;
-    }
-
-    /**
-     * Report the given message as a waring on the object currently under
-     * validation.
-     */
-    @Override
-    public String reportWarning(String message) {
-        acceptor.acceptWarning(message, validatorState.getCurrentObject(), null,
-                ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-        return message;
-    }
-
-    @Override
-    public String reportInfo(String message) {
-        acceptor.acceptInfo(message, validatorState.getCurrentObject(), null,
-                               ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-        return message;
-    }
-
-    /**
-     * Report the given message as a warning on the given object.
-     */
-    @Override
-    public String reportWarning(EObject object, String message) {
-        acceptor.acceptWarning(message, object, null,
-                ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-        return message;
-    }
-
-    @Override
-    public String reportInfo(EObject object, String message) {
-        acceptor.acceptInfo(message, object, null,
-                               ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-        return message;
-    }
-
-
-    /**
-     * Report the given message as an warning on the current object.
-     * 
-     * Unfortunately, there is no way to provide a path and a line number to the
-     * ValidationMessageAcceptor as messages can only be reported directly as
-     * EObjects. While it is not an ideal solution, this method composes a
-     * messages indicating the location of the warning and reports this on the
-     * object currently under validation. This way, the warning message is not
-     * lost, but it is not necessarily reported precisely at the location of the
-     * actual warning.
-     */
-    @Override
-    public String reportWarning(Path file, Integer line, String message) {
-        String fullMessage = message + " (Reported from " + file.toString() + " on line "
-            + line.toString() + ")";
-        acceptor.acceptWarning(fullMessage, validatorState.getCurrentObject(),
-                null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-        return fullMessage;
-    }
-
-    @Override
-    public String reportInfo(Path file, Integer line, String message) {
-        String fullMessage = message + " (Reported from " + file.toString() + " on line "
-            + line.toString() + ")";
-        acceptor.acceptInfo(fullMessage, validatorState.getCurrentObject(),
-                               null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-        return fullMessage;
-    }
-
-    /**
-     * Check if errors where reported.
-     *
-     * @return true if errors where reported
-     */
-    @Override
-    public boolean getErrorsOccurred() {
-        return errorsOccurred;
-    }
+  private ValidationMessageAcceptor acceptor;
+  private BaseLFValidator.ValidatorStateAccess validatorState;
+  private boolean errorsOccurred = false;
+
+  public ValidatorErrorReporter(
+      ValidationMessageAcceptor acceptor, BaseLFValidator.ValidatorStateAccess stateAccess) {
+    this.acceptor = acceptor;
+    this.validatorState = stateAccess;
+  }
+
+  /** Report the given message as an error on the object currently under validation. */
+  @Override
+  public String reportError(String message) {
+    errorsOccurred = true;
+    acceptor.acceptError(
+        message,
+        validatorState.getCurrentObject(),
+        null,
+        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
+        null);
+    return message;
+  }
+
+  /** Report the given message as an error on the given object. */
+  @Override
+  public String reportError(EObject object, String message) {
+    errorsOccurred = true;
+    acceptor.acceptError(
+        message, object, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+    return message;
+  }
+
+  /**
+   * Report the given message as an error on the current object.
+   *
+   * <p>Unfortunately, there is no way to provide a path and a line number to the
+   * ValidationMessageAcceptor as messages can only be reported directly as EObjects. While it is
+   * not an ideal solution, this method composes a messages indicating the location of the error and
+   * reports this on the object currently under validation. This way, the error message is not lost,
+   * but it is not necessarily reported precisely at the location of the actual error.
+   */
+  @Override
+  public String reportError(Path file, Integer line, String message) {
+    errorsOccurred = true;
+    String fullMessage =
+        message + " (Reported from " + file.toString() + " on line " + line.toString() + ")";
+    acceptor.acceptError(
+        fullMessage,
+        validatorState.getCurrentObject(),
+        null,
+        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
+        null);
+    return fullMessage;
+  }
+
+  /** Report the given message as a waring on the object currently under validation. */
+  @Override
+  public String reportWarning(String message) {
+    acceptor.acceptWarning(
+        message,
+        validatorState.getCurrentObject(),
+        null,
+        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
+        null);
+    return message;
+  }
+
+  @Override
+  public String reportInfo(String message) {
+    acceptor.acceptInfo(
+        message,
+        validatorState.getCurrentObject(),
+        null,
+        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
+        null);
+    return message;
+  }
+
+  /** Report the given message as a warning on the given object. */
+  @Override
+  public String reportWarning(EObject object, String message) {
+    acceptor.acceptWarning(
+        message, object, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+    return message;
+  }
+
+  @Override
+  public String reportInfo(EObject object, String message) {
+    acceptor.acceptInfo(message, object, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+    return message;
+  }
+
+  /**
+   * Report the given message as an warning on the current object.
+   *
+   * <p>Unfortunately, there is no way to provide a path and a line number to the
+   * ValidationMessageAcceptor as messages can only be reported directly as EObjects. While it is
+   * not an ideal solution, this method composes a messages indicating the location of the warning
+   * and reports this on the object currently under validation. This way, the warning message is not
+   * lost, but it is not necessarily reported precisely at the location of the actual warning.
+   */
+  @Override
+  public String reportWarning(Path file, Integer line, String message) {
+    String fullMessage =
+        message + " (Reported from " + file.toString() + " on line " + line.toString() + ")";
+    acceptor.acceptWarning(
+        fullMessage,
+        validatorState.getCurrentObject(),
+        null,
+        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
+        null);
+    return fullMessage;
+  }
+
+  @Override
+  public String reportInfo(Path file, Integer line, String message) {
+    String fullMessage =
+        message + " (Reported from " + file.toString() + " on line " + line.toString() + ")";
+    acceptor.acceptInfo(
+        fullMessage,
+        validatorState.getCurrentObject(),
+        null,
+        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
+        null);
+    return fullMessage;
+  }
+
+  /**
+   * Check if errors where reported.
+   *
+   * @return true if errors where reported
+   */
+  @Override
+  public boolean getErrorsOccurred() {
+    return errorsOccurred;
+  }
 }

From c890283650cce95312741dfe55883aa25c74e4b9 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Fri, 2 Jun 2023 22:55:34 +0200
Subject: [PATCH 0197/1114] Disable logging again for Zephyr

---
 org.lflang.tests/src/org/lflang/tests/Configurators.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/org.lflang.tests/src/org/lflang/tests/Configurators.java b/org.lflang.tests/src/org/lflang/tests/Configurators.java
index c1b15e9e8b..7aa6ba97bf 100644
--- a/org.lflang.tests/src/org/lflang/tests/Configurators.java
+++ b/org.lflang.tests/src/org/lflang/tests/Configurators.java
@@ -71,6 +71,10 @@ public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
     test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
     test.getContext().getTargetConfig().platformOptions.flash = true;
     test.getContext().getTargetConfig().platformOptions.board = "native_posix";
+    
+    // FIXME: Zephyr  emulations fails with debug log-levels.
+    test.getContext().getTargetConfig().logLevel = LogLevel.WARN;
+    test.getContext().getArgs().setProperty("logging", "warning");
     return true;
   }
 
@@ -80,6 +84,10 @@ public static boolean makeZephyrCompatible(LFTest test) {
     test.getContext().getTargetConfig().platformOptions.flash = true;
     test.getContext().getTargetConfig().platformOptions.board = "native_posix";
 
+    // FIXME: Zephyr  emulations fails with debug log-levels.
+    test.getContext().getTargetConfig().logLevel = LogLevel.WARN;
+    test.getContext().getArgs().setProperty("logging", "warning");
+
     return true;
   }
   /**

From a6a111e553afbe067fd22fd13dbdb00e9945bbd9 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 2 Jun 2023 15:15:23 -0700
Subject: [PATCH 0198/1114] Fix compilation errors from merge.

---
 .../org/lflang/federated/generator/FedASTUtils.java |  6 +-----
 .../src/org/lflang/generator/GeneratorBase.java     | 13 -------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java b/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
index 66a5a95a15..2da640fa27 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedASTUtils.java
@@ -129,7 +129,6 @@ public static Reactor findFederatedReactor(Resource resource) {
    *
    * @param connection Network connection between two federates.
    * @param resource
-   * @param mainDef
    * @param coordination One of CoordinationType.DECENTRALIZED or CoordinationType.CENTRALIZED.
    * @param errorReporter Used to report errors encountered.
    */
@@ -203,8 +202,6 @@ private static Action createNetworkAction(FedConnectionInstance connection) {
     } else {
       action.setOrigin(ActionOrigin.LOGICAL);
     }
-    reactionBankIndices.put(reaction, bankIndex);
-  }
 
     return action;
   }
@@ -547,7 +544,7 @@ else if (federate.contains(port.getParent())) {
 
   /**
    * Follow reactions upstream. This is part of the algorithm of {@link
-   * #findUpstreamPortsInFederate(FederateInstance, PortInstance, Set)}.
+   * #findUpstreamPortsInFederate}.
    */
   private static void followReactionUpstream(
       FederateInstance federate,
@@ -798,7 +795,6 @@ private static Reactor getNetworkSenderReactor(
    * @param connection Network connection between two federates.
    * @param coordination One of CoordinationType.DECENTRALIZED or CoordinationType.CENTRALIZED.
    * @param resource
-   * @param mainDef
    * @param errorReporter FIXME
    * @note Used in federated execution
    */
diff --git a/org.lflang/src/org/lflang/generator/GeneratorBase.java b/org.lflang/src/org/lflang/generator/GeneratorBase.java
index 078f608ffa..942956c2d5 100644
--- a/org.lflang/src/org/lflang/generator/GeneratorBase.java
+++ b/org.lflang/src/org/lflang/generator/GeneratorBase.java
@@ -415,19 +415,6 @@ protected void checkWatchdogSupport(boolean isSupported) {
     }
   }
 
-  /**
-   * Check whether watchdogs are present and are supported.
-   *
-   * @param isSupported indicates whether or not this is a supported target and whether or not it is
-   *     a threaded runtime.
-   */
-  protected void checkWatchdogSupport(boolean isSupported) {
-    if (hasWatchdogs && !isSupported) {
-      errorReporter.reportError(
-          "Watchdogs are currently only supported for threaded programs in the C target.");
-    }
-  }
-
   /**
    * Finds and transforms connections into forwarding reactions iff the connections have the same
    * destination as other connections or reaction in mutually exclusive modes.

From 904efa1d48e2c963379a4978837bb6822de7c0ef Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 2 Jun 2023 16:02:51 -0700
Subject: [PATCH 0199/1114] Bugfix in CI.

---
 .github/workflows/check-diff.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
index af14720136..f714c3cd3e 100644
--- a/.github/workflows/check-diff.yml
+++ b/.github/workflows/check-diff.yml
@@ -36,7 +36,7 @@ jobs:
     - id: do
       run: |
         wget https://raw.githubusercontent.com/lf-lang/lingua-franca/master/.github/scripts/check-diff.sh
-        source check-diff.sh "core/src/main/java/generator/c\|/home/peter/lingua-franca/core/src/main/resources/lib/c\|core/src/main/resources/lib/platform\|test/C" C
+        source check-diff.sh "core/src/main/java/generator/c\|core/src/main/resources/lib/c\|core/src/main/resources/lib/platform\|test/C" C
         source check-diff.sh "core/src/main/kotlin/generator/cpp\|core/src/main/resources/lib/cpp\|test/Cpp" CPP
         source check-diff.sh "core/src/main/java/generator/python\|core/src/main/resources/lib/py\|test/Python" PY
         source check-diff.sh "core/src/main/kotlin/generator/rust\|core/src/main/java/generator/rust\|core/src/main/resources/lib/rs\|test/Rust" RS

From cd8542dd8ab9e79064729ab0455a6b2a9c2e51dd Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 2 Jun 2023 16:20:45 -0700
Subject: [PATCH 0200/1114] Address failing unit tests.

---
 .../main/java/org/lflang/generator/ReactionInstanceGraph.java   | 2 ++
 core/src/main/resources/lib/c/reactor-c                         | 2 +-
 .../test/java/org/lflang/tests/compiler/PortInstanceTests.java  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
index 11567c961b..2628b30262 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
@@ -107,6 +107,8 @@ public void rebuild() {
    * @param main
    */
   private void addDependentNetworkEdges(ReactorInstance main) {
+    // FIXME: I do not think this belongs here because it pertains to federated execution. Also, it
+    // seems to relate to a design that we do not intend to use?
     Attribute attribute =
         AttributeUtils.findAttributeByName(main.definition.getReactorClass(), "_fed_config");
     String actionsStr =
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 3e82ce9c65..42ae9c2539 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 3e82ce9c655f4671d03738f14d2d367902c9389a
+Subproject commit 42ae9c2539381835e7a8c74ff796ef05578b034d
diff --git a/core/src/test/java/org/lflang/tests/compiler/PortInstanceTests.java b/core/src/test/java/org/lflang/tests/compiler/PortInstanceTests.java
index 8b8ef52a8f..802bfdadd9 100644
--- a/core/src/test/java/org/lflang/tests/compiler/PortInstanceTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/PortInstanceTests.java
@@ -205,7 +205,7 @@ protected PortInstance newOutputPort(String name, ReactorInstance container) {
   protected ReactionInstance newReaction(PortInstance trigger) {
     Reaction r = factory.createReaction();
     ReactionInstance result =
-        new ReactionInstance(r, trigger.getParent(), false, trigger.getDependentReactions().size());
+        new ReactionInstance(r, trigger.getParent(), trigger.getDependentReactions().size());
     trigger.getDependentReactions().add(result);
     trigger.getParent().reactions.add(result);
     return result;

From 26aba407e3b1b2fb1fb5757fd7439ec4b6e45b4f Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 2 Jun 2023 17:16:28 -0700
Subject: [PATCH 0201/1114] Run all categories of C tests.

I do not want to stop running tests when one category fails. I would
also like to experiment with increasing the amount of parallelism.
---
 .github/workflows/c-tests.yml | 19 ++++++--
 .github/workflows/only-c.yml  | 87 ++++++++++++++++++++++++++++++++++-
 2 files changed, 102 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml
index 956fb4c967..2bf7a3a371 100644
--- a/.github/workflows/c-tests.yml
+++ b/.github/workflows/c-tests.yml
@@ -20,9 +20,14 @@ on:
         required: false
         default: true
         type: boolean
+      selected-tests:
+        required: false
+        default: "" # "" means run all tests until failure
+        type: string
 
 jobs:
   regular-tests:
+    name: ${{ inputs.selected-tests }}
     strategy:
       matrix:
         platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-latest"]') }}
@@ -55,15 +60,23 @@ jobs:
         if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }}
       - name: Perform tests for C target with default scheduler
         run: ./gradlew targetTest -Ptarget=C
-        if: ${{ !inputs.use-cpp && !inputs.scheduler }}
+        if: ${{ !inputs.use-cpp && !inputs.scheduler && inputs.selected-tests == '' }}
       - name: Perform tests for C target with specified scheduler (no LSP tests)
         run: |
           echo "Specified scheduler: ${{ inputs.scheduler }}"
           ./gradlew targetTest -Ptarget=C -Dscheduler=${{ inputs.scheduler }}
-        if: ${{ !inputs.use-cpp && inputs.scheduler }}
+        if: ${{ !inputs.use-cpp && inputs.scheduler && inputs.selected-tests == '' }}
       - name: Perform tests for CCpp target with default scheduler
         run: ./gradlew targetTest -Ptarget=CCpp
-        if: ${{ inputs.use-cpp && !inputs.scheduler }}
+        if: ${{ inputs.use-cpp && !inputs.scheduler && inputs.selected-tests == '' }}
+      - name: Perform tests for C target with default scheduler
+        run: ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CTest.${{ inputs.selected-tests }}
+        if: ${{ !inputs.use-cpp && !inputs.scheduler && inputs.selected-tests != '' }}
+      - name: Perform tests for C target with specified scheduler (no LSP tests)
+        run: |
+          echo "Specified scheduler: ${{ inputs.scheduler }}"
+          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CTest.${{ inputs.selected-tests }} -Dscheduler=${{ inputs.scheduler }}
+        if: ${{ inputs.use-cpp && !inputs.scheduler && inputs.selected-tests != '' }}
       - name: Collect code coverage
         run: ./gradlew jacocoTestReport
       - name: Report to CodeCov
diff --git a/.github/workflows/only-c.yml b/.github/workflows/only-c.yml
index bb4752471b..195624cedc 100644
--- a/.github/workflows/only-c.yml
+++ b/.github/workflows/only-c.yml
@@ -17,11 +17,96 @@ concurrency:
 
 jobs:
   # Run the C integration tests.
-  default:
+  default0:
     if: ${{ inputs.all || github.event.pull_request.draft }}
     uses: ./.github/workflows/c-tests.yml
     with:
       all-platforms: ${{ !github.event.pull_request.draft  }}
+      selected-tests: runGenericTests
+
+  default1:
+    if: ${{ inputs.all || github.event.pull_request.draft }}
+    uses: ./.github/workflows/c-tests.yml
+    with:
+      all-platforms: ${{ !github.event.pull_request.draft  }}
+      selected-tests: runTargetSpecificTests
+
+  default2:
+    if: ${{ inputs.all || github.event.pull_request.draft }}
+    uses: ./.github/workflows/c-tests.yml
+    with:
+      all-platforms: ${{ !github.event.pull_request.draft  }}
+      selected-tests: runMultiportTests
+
+  default3:
+    if: ${{ inputs.all || github.event.pull_request.draft }}
+    uses: ./.github/workflows/c-tests.yml
+    with:
+      all-platforms: ${{ !github.event.pull_request.draft  }}
+      selected-tests: runTypeParameterTests
+
+  default4:
+    if: ${{ inputs.all || github.event.pull_request.draft }}
+    uses: ./.github/workflows/c-tests.yml
+    with:
+      all-platforms: ${{ !github.event.pull_request.draft  }}
+      selected-tests: runAsFederated
+
+  default5:
+    if: ${{ inputs.all || github.event.pull_request.draft }}
+    uses: ./.github/workflows/c-tests.yml
+    with:
+      all-platforms: ${{ !github.event.pull_request.draft  }}
+      selected-tests: runConcurrentTests
+
+  default6:
+    if: ${{ inputs.all || github.event.pull_request.draft }}
+    uses: ./.github/workflows/c-tests.yml
+    with:
+      all-platforms: ${{ !github.event.pull_request.draft  }}
+      selected-tests: runFederatedTests
+
+  default7:
+    if: ${{ inputs.all || github.event.pull_request.draft }}
+    uses: ./.github/workflows/c-tests.yml
+    with:
+      all-platforms: ${{ !github.event.pull_request.draft  }}
+      selected-tests: runModalTests
+
+  default8:
+    if: ${{ inputs.all || github.event.pull_request.draft }}
+    uses: ./.github/workflows/c-tests.yml
+    with:
+      all-platforms: ${{ !github.event.pull_request.draft  }}
+      selected-tests: runNoInliningTests
+
+  default9:
+    if: ${{ inputs.all || github.event.pull_request.draft }}
+    uses: ./.github/workflows/c-tests.yml
+    with:
+      all-platforms: ${{ !github.event.pull_request.draft  }}
+      selected-tests: runDockerTests
+
+  default10:
+    if: ${{ inputs.all || github.event.pull_request.draft }}
+    uses: ./.github/workflows/c-tests.yml
+    with:
+      all-platforms: ${{ !github.event.pull_request.draft  }}
+      selected-tests: runDockerFederatedTests
+
+  default11:
+    if: ${{ inputs.all || github.event.pull_request.draft }}
+    uses: ./.github/workflows/c-tests.yml
+    with:
+      all-platforms: ${{ !github.event.pull_request.draft  }}
+      selected-tests: runWithThreadingOff
+
+  default12:
+    if: ${{ inputs.all || github.event.pull_request.draft }}
+    uses: ./.github/workflows/c-tests.yml
+    with:
+      all-platforms: ${{ !github.event.pull_request.draft  }}
+      selected-tests: runEnclaveTests
 
   # Run the C benchmark tests.
   benchmarking:

From 40b9ce26b03b46630b52fd3879d8841a370683e4 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sun, 4 Jun 2023 23:26:51 +0800
Subject: [PATCH 0202/1114] Only extend horizon when it becomes larger

---
 org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
index 381a98a49b..9cc6d308f3 100644
--- a/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
+++ b/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
@@ -174,7 +174,7 @@ public String visitUntil(MTLParser.UntilContext ctx,
         long lowerBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
         long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
         long currentHorizon = horizon + upperBoundNanoSec;
-        this.horizon = currentHorizon;
+        if (currentHorizon > this.horizon) this.horizon = currentHorizon;
         String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
                                                     upperBoundNanoSec, "j" + QFIdx, prefixIdx);
 
@@ -204,7 +204,7 @@ public String visitNegation(MTLParser.NegationContext ctx,
 
     public String visitNext(MTLParser.NextContext ctx,
         String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-
+        // FIXME: Horizon needs to advance!
         return visitPrimary(ctx.formula, ("(" + prefixIdx + "+1)"), QFIdx, prevPrefixIdx, horizon);
     }
 
@@ -221,7 +221,7 @@ public String visitGlobally(MTLParser.GloballyContext ctx,
         long lowerBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
         long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
         long currentHorizon = horizon + upperBoundNanoSec;
-        this.horizon = currentHorizon;
+        if (currentHorizon > this.horizon) this.horizon = currentHorizon;
         String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
                                                     upperBoundNanoSec, "j" + QFIdx, prefixIdx);        
         return "(" + "finite_forall " + "(" + "j" + QFIdx + " : integer) in indices :: "
@@ -248,7 +248,7 @@ public String visitFinally(MTLParser.FinallyContext ctx,
         long lowerBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
         long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
         long currentHorizon = horizon + upperBoundNanoSec;
-        this.horizon = currentHorizon;
+        if (currentHorizon > this.horizon) this.horizon = currentHorizon;
         String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
                                                     upperBoundNanoSec, "j" + QFIdx, prefixIdx);        
         return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "

From a36c9918ba7e4c175dc07e36acbffda55e2da5c8 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 5 Jun 2023 01:14:54 +0800
Subject: [PATCH 0203/1114] Remove top level org.lflang

---
 org.lflang/build.gradle                       |  334 ---
 org.lflang/src/org/lflang/ASTUtils.java       | 1808 ----------------
 org.lflang/src/org/lflang/FileConfig.java     |  358 ----
 org.lflang/src/org/lflang/TargetConfig.java   |  514 -----
 org.lflang/src/org/lflang/TargetProperty.java | 1872 -----------------
 org.lflang/src/org/lflang/TimeValue.java      |  234 ---
 .../analyses/cast/AbstractAstVisitor.java     |   17 -
 .../org/lflang/analyses/cast/AstUtils.java    |   78 -
 .../org/lflang/analyses/cast/AstVisitor.java  |   25 -
 .../cast/BuildAstParseTreeVisitor.java        |  681 ------
 .../src/org/lflang/analyses/cast/CAst.java    |  361 ----
 .../org/lflang/analyses/cast/CAstVisitor.java |   78 -
 .../lflang/analyses/cast/CBaseAstVisitor.java |  360 ----
 .../lflang/analyses/cast/CToUclidVisitor.java |  291 ---
 .../analyses/cast/IfNormalFormAstVisitor.java |   95 -
 .../cast/VariablePrecedenceVisitor.java       |   50 -
 .../org/lflang/analyses/cast/Visitable.java   |   12 -
 .../org/lflang/analyses/statespace/Event.java |   55 -
 .../analyses/statespace/EventQueue.java       |   24 -
 .../lflang/analyses/statespace/StateInfo.java |   29 -
 .../statespace/StateSpaceDiagram.java         |  192 --
 .../statespace/StateSpaceExplorer.java        |  376 ----
 .../analyses/statespace/StateSpaceNode.java   |  114 -
 .../org/lflang/analyses/statespace/Tag.java   |   67 -
 .../org/lflang/analyses/uclid/MTLVisitor.java |  465 ----
 .../lflang/analyses/uclid/UclidGenerator.java | 1611 --------------
 .../lflang/analyses/uclid/UclidRunner.java    |  264 ---
 org.lflang/src/org/lflang/cli/Lfc.java        |  286 ---
 org.lflang/src/org/lflang/dsl/antlr4/C.g4     |  908 --------
 .../src/org/lflang/dsl/antlr4/MTLLexer.g4     |  117 --
 .../src/org/lflang/dsl/antlr4/MTLParser.g4    |   82 -
 .../org/lflang/generator/GeneratorBase.java   |  705 -------
 .../src/org/lflang/generator/LFGenerator.java |  238 ---
 .../lflang/generator/LFGeneratorContext.java  |  165 --
 .../org/lflang/generator/NamedInstance.java   |  334 ---
 .../lflang/generator/ReactionInstance.java    |  598 ------
 .../generator/ReactionInstanceGraph.java      |  440 ----
 .../org/lflang/generator/ReactorInstance.java | 1156 ----------
 .../org/lflang/generator/TriggerInstance.java |  180 --
 .../org/lflang/validation/AttributeSpec.java  |  241 ---
 40 files changed, 15815 deletions(-)
 delete mode 100644 org.lflang/build.gradle
 delete mode 100644 org.lflang/src/org/lflang/ASTUtils.java
 delete mode 100644 org.lflang/src/org/lflang/FileConfig.java
 delete mode 100644 org.lflang/src/org/lflang/TargetConfig.java
 delete mode 100644 org.lflang/src/org/lflang/TargetProperty.java
 delete mode 100644 org.lflang/src/org/lflang/TimeValue.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/cast/AbstractAstVisitor.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/cast/AstUtils.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/cast/AstVisitor.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/cast/CAst.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/cast/CAstVisitor.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/cast/CBaseAstVisitor.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/cast/CToUclidVisitor.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/cast/VariablePrecedenceVisitor.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/cast/Visitable.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/statespace/Event.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/statespace/EventQueue.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/statespace/StateInfo.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/statespace/Tag.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
 delete mode 100644 org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
 delete mode 100644 org.lflang/src/org/lflang/cli/Lfc.java
 delete mode 100644 org.lflang/src/org/lflang/dsl/antlr4/C.g4
 delete mode 100644 org.lflang/src/org/lflang/dsl/antlr4/MTLLexer.g4
 delete mode 100644 org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4
 delete mode 100644 org.lflang/src/org/lflang/generator/GeneratorBase.java
 delete mode 100644 org.lflang/src/org/lflang/generator/LFGenerator.java
 delete mode 100644 org.lflang/src/org/lflang/generator/LFGeneratorContext.java
 delete mode 100644 org.lflang/src/org/lflang/generator/NamedInstance.java
 delete mode 100644 org.lflang/src/org/lflang/generator/ReactionInstance.java
 delete mode 100644 org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
 delete mode 100644 org.lflang/src/org/lflang/generator/ReactorInstance.java
 delete mode 100644 org.lflang/src/org/lflang/generator/TriggerInstance.java
 delete mode 100644 org.lflang/src/org/lflang/validation/AttributeSpec.java

diff --git a/org.lflang/build.gradle b/org.lflang/build.gradle
deleted file mode 100644
index 849b46aed4..0000000000
--- a/org.lflang/build.gradle
+++ /dev/null
@@ -1,334 +0,0 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
-repositories {
-    mavenCentral()
-    // TODO Replace this unofficial maven repository as soon as Klighd is released to maven central in the future.
-    maven {
-        url "https://rtsys.informatik.uni-kiel.de/~kieler/files/repo/"
-    }
-}
-dependencies {
-    implementation "org.eclipse.xtext:org.eclipse.xtext:${xtextVersion}"
-    implementation "org.eclipse.xtext:org.eclipse.xtext.xbase.lib:${xtextVersion}"
-    implementation "org.eclipse.xtext:org.eclipse.xtext.ide:${xtextVersion}"
-    // https://mvnrepository.com/artifact/org.eclipse.platform/org.eclipse.core.resources
-    implementation group: 'org.eclipse.platform', name: 'org.eclipse.core.resources', version: "${resourcesVersion}"
-    // https://mvnrepository.com/artifact/org.eclipse.emf/org.eclipse.emf.mwe2.launch
-    implementation group: 'org.eclipse.emf', name: 'org.eclipse.emf.mwe2.launch', version: "${mwe2LaunchVersion}"
-    // https://mvnrepository.com/artifact/org.eclipse.lsp4j/org.eclipse.lsp4j
-    implementation group: 'org.eclipse.lsp4j', name: 'org.eclipse.lsp4j', version: "${lsp4jVersion}"
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.12.4'
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.12.4'
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.4'
-    implementation ("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.lsp:${klighdVersion}") {
-        exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt.*'
-        exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
-    }
-    implementation ("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.standalone:${klighdVersion}") {
-        exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt.*'
-        exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
-    }
-}
-
-configurations {
-    mwe2 {
-        extendsFrom implementation
-    }
-}
-
-dependencies {
-    mwe2 'org.eclipse.emf:org.eclipse.emf.mwe2.launch'
-    mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
-    mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
-}
-
-task generateXtextLanguage(type: JavaExec) {
-    main = 'org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher'
-    classpath = configurations.mwe2
-    inputs.file "src/org/lflang/GenerateLinguaFranca.mwe2"
-    inputs.file "src/org/lflang/LinguaFranca.xtext"
-    outputs.dir "src-gen"
-    args += "src/org/lflang/GenerateLinguaFranca.mwe2"
-    args += "-p"
-    args += "rootPath=/${projectDir}/.."
-
-    // Currently we don't need to delete any generated files because we use the
-    // Java/Xtend implementations.  However, if we commit to porting such files
-    // to Kotlin, we might to reintroduce the deletion mechanism below.
-    /*doLast {
-        def filesToDelete = [
-                "org.lflang.validation.LFValidator",
-                "org.lflang.LFRuntimeModule",
-                "org.lflang.LFStandaloneSetup",
-                "org.lflang.generator.LFGenerator",
-                "org.lflang.scoping.LFScopeProvider"
-        ]
-
-        filesToDelete.each { qname ->
-            def path = qname.replace('.', '/')
-            def ktFile = file("src/${path}.kt")
-            def javaFile = file("src/${path}.java")
-            def xtendFile = file("src/${path}.xtend")
-
-            if (ktFile.exists() || xtendFile.exists()) {
-                def chosenLang = ktFile.exists() ? "Kotlin" : "Xtend"
-                project.logger.info("deleting ${projectDir.relativePath(javaFile)}, the ${chosenLang} file prevails")
-                project.delete(javaFile) // generated by Xtend
-            } else {
-                project.logger.info("no ${projectDir.relativePath(ktFile)}, leaving the Java implementation in")
-            }
-        }
-    }*/
-}
-processResources.dependsOn(generateXtextLanguage)
-generateXtext.dependsOn(generateXtextLanguage)
-clean.dependsOn(cleanGenerateXtextLanguage)
-eclipse.classpath.plusConfigurations += [configurations.mwe2]
-
-configurations {
-    cli_impl {
-        extendsFrom implementation
-    }
-}
-
-task getSubmoduleVersions(type: Exec) {
-    description('Run a Git command to get the current status of submodules')
-    workingDir project.rootDir
-   // This will make gradle execute git submodule status every time updateRustRuntime is called
-    outputs.upToDateWhen { false }
-
-    def command = "git submodule status"
-    if (System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows')) {
-        commandLine 'cmd', '/c', command
-    } else {
-        commandLine 'sh', '-c', command
-    }
-    standardOutput = new ByteArrayOutputStream()
-
-    ext.outputFile = file("$project.buildDir/submodule-status.properties")
-    outputs.file(outputFile)
-
-    doLast {
-        def matcher = standardOutput.toString() =~ ~"(?m)^[-+ ]?([0-9a-f]+) org.lflang/src/lib/\\w+/reactor-([-a-zA-Z]+)"
-        def properties = new StringBuilder()
-        while (matcher.find()) {
-            def rev = matcher.group(1)
-            def language = matcher.group(2)
-            properties << "$language = $rev\n"
-        }
-        outputFile.text = properties
-    }
-}
-
-task updateRustRuntime {
-    description('Record the VCS revisions of the language runtimes into a properties file available at runtime.')
-
-    dependsOn getSubmoduleVersions
-    // If the output of the git submodule status did not change (the getSubmoduleVersions task), then this task is considered up to date.
-    inputs.files(getSubmoduleVersions.outputs)
-    ext.outputFile = file("$project.projectDir/src/lib/rs/runtime-version.properties")
-    outputs.file(outputFile)
-
-    doLast {
-        def upToDateProps = new Properties()
-        getSubmoduleVersions.outputFile.withReader { r -> upToDateProps.load(r) }
-        outputFile.text = "rs = " + upToDateProps.get("rs") + "\n"
-    }
-}
-// add the generated file as an output
-sourceSets.main.output.dir tasks.updateRustRuntime.outputFile, builtBy: updateRustRuntime
-tasks.processResources.dependsOn(updateRustRuntime)
-
-task checkRuntimeVersionFileUpToDate {
-    description('Check that the runtime version recorded in the built Jar for LFC matches the version of the checked out submodule')
-    dependsOn getSubmoduleVersions
-    inputs.file updateRustRuntime.outputFile
-
-    doLast {
-        def rtProps = new Properties()
-        updateRustRuntime.outputFile.withReader { r -> rtProps.load(r) }
-        def upToDateProps = new Properties()
-        getSubmoduleVersions.outputFile.withReader { r -> upToDateProps.load(r) }
-
-        upToDateProps.each { language, rev ->
-            def actualLanguage = rtProps.get(language)
-            if (actualLanguage == null)
-                return
-            if (actualLanguage != rev) {
-                logger.error("Runtime for $language is not checked out at correct revision:\n" +
-                        "expected: $rev\n" +
-                        "actual:   $actualLanguage\n" +
-                        "You may need to call `./gradlew updateRustRuntime`.")
-            } else {
-                logger.info("Success: Runtime for $language is checked out at expected revision $rev")
-            }
-        }
-    }
-}
-
-apply plugin: 'application'
-apply plugin: 'com.github.johnrengelman.shadow'
-
-task buildAll() {
-    apply plugin: 'application'
-    apply plugin: 'com.github.johnrengelman.shadow'
-    mainClassName = 'org.lflang.cli.Lfc'
-}
-
-// define buildLfc as an alias to buildAll
-task buildLfc {
-    dependsOn buildAll
-    doFirst({{logger.warn("The buildLfc task is deprecated! Please use buildAll instead.")}})
-}
-
-task jarCliTools(type: ShadowJar) {
-    manifest {
-        attributes('Main-Class': 'org.lflang.cli.Lfc')
-    }
-    configurations = [project.configurations.cli_impl]
-    exclude 'test/*'
-    exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA'
-    // We should use minimize() here to reduce the size of the JAR, but it causes problems
-    // with regard to our Kotlin classes. Since we don't use imports to load them but load
-    // the classes manually, minimize does not see the dependency. While we can add an exclude
-    // rule, this does not seem to work very well and causes problems when compiling for a
-    // second time. Also see https://github.com/lf-lang/lingua-franca/pull/1285
-    transform(com.github.jengelman.gradle.plugins.shadow.transformers.AppendingTransformer){
-        resource = 'plugin.properties'
-    }
-    from sourceSets.main.output
-}
-
-buildAll.finalizedBy jarCliTools
-
-// Tasks for running specific CLI tools.
-// The working directory will be the root directory of the lingua franca project
-// CLI arguments can be passed to lfc by using --args. Note that you need
-// to escape cli flags which start with --.For instance --args ' --help'.
-// Otherwise they're parsed as arguments to the Gradle CLI, not lfc.
-
-task runLfc(type: JavaExec) {
-    // builds and runs lfc
-    description = "Build and run lfc, use --args to pass arguments"
-    group = "application"
-    classpath = sourceSets.main.runtimeClasspath
-    mainClass = 'org.lflang.cli.Lfc'
-    workingDir = '..'
-}
-
-task runLff(type: JavaExec) {
-    // builds and runs lff
-    description = "Build and run lff, use --args to pass arguments"
-    group = "application"
-    classpath = sourceSets.main.runtimeClasspath
-    mainClass = 'org.lflang.cli.Lff'
-    workingDir = '..'
-}
-
-// Add Antlr4 for various DSLs, including MTL for verification.
-task runAntlr4(type:JavaExec) {
-   //see incremental task api, prevents rerun if nothing has changed.
-   inputs.dir "$projectDir/src/org/lflang/dsl/antlr4/"
-   outputs.dir "$projectDir/src/org/lflang/dsl/generated/antlr4/main/"
-
-   classpath = configurations.antlr4
-
-   main = "org.antlr.v4.Tool" 
-
-   args = [ "-visitor", 
-            "-o",  "$projectDir/src/org/lflang/dsl/generated/antlr4/main/",  
-            "-package", "org.lflang.dsl",
-            "$projectDir/src/org/lflang/dsl/antlr4/MTLLexer.g4",
-            "$projectDir/src/org/lflang/dsl/antlr4/MTLParser.g4",
-            "$projectDir/src/org/lflang/dsl/antlr4/C.g4"]
-}
-processResources.dependsOn(runAntlr4)
-compileKotlin.dependsOn(runAntlr4)
-compileJava.dependsOn(runAntlr4)
-
-clean {
-    delete file("${projectDir}/src/org/lflang/dsl/generated")
-}
-
-task generateLanguageDiagramServer {
-    description 'Creates a jar that implements a language server with diagram support for LF.'    
-
-    apply plugin: 'java'
-    apply plugin: 'application'
-    apply plugin: 'com.github.johnrengelman.shadow'
-
-    mainClassName = "org.lflang.diagram.lsp.LanguageDiagramServer"
-    
-    compileJava {
-        options.compilerArgs << '-Xlint:unchecked'
-    }
-
-    shadowJar {
-        classifier = 'lds'
-        
-        // Handling of service loader registrations via META-INF/services/*
-        mergeServiceFiles()
-
-        // Merge properties
-        transform(com.github.jengelman.gradle.plugins.shadow.transformers.AppendingTransformer){
-            resource = 'plugin.properties'
-        }
-
-        // Exclude files that are known to be dispensable for a language server
-        exclude(
-            '*._trace',
-            '*.ecore',
-            '*.ecorediag',
-            '*.g',
-            '*.genmodel',
-            '*.html',
-            '*.mwe2',
-            '*.profile',
-            '*.xtext',
-            '*readme.txt',
-            '.api_description',
-            '.options',
-            'about.*',
-            'about_*',
-            'about_files/*',
-            'ant_tasks/*',
-            'cheatsheets/*',
-            'com/*/*.java',
-            'de/*/*.java',
-            'docs/*',
-            'log4j.properties',
-            'META-INF/*.DSA',
-            'META-INF/*.RSA',
-            'META-INF/*.SF',
-            'META-INF/changelog.txt',
-            'META-INF/DEPENDENCIES',
-            'META-INF/eclipse.inf',
-            'META-INF/INDEX.LIST',
-            'META-INF/maven/*',
-            'META-INF/NOTICE',
-            'META-INF/NOTICE.txt',
-            'META-INF/p2.inf',
-            'META-INF/versions/*/module-info.class',
-            'modeling32.png',
-            'module-info.class',
-            'org/*/*.java',
-            'OSGI-INF/l10n/bundle.properties',
-            'plugin.xml',
-            'profile.list',
-            'schema/*',
-            'systembundle.properties',
-            'xtend-gen/*',
-            'xtext32.png',
-        )
-
-        // Minimizing should be enabled with caution because some classes are only
-        // loaded via services (e.g. diagram syntheses and some xtext aspects)
-        // and would be removed when minimized
-        // minimize() {
-        //     exclude(dependency('log4j:log4j:.*'))
-        //     exclude(dependency('org.eclipse.xtext:.*ide:.*'))
-        // }
-    }
-}
-
-generateLanguageDiagramServer.finalizedBy shadowJar
diff --git a/org.lflang/src/org/lflang/ASTUtils.java b/org.lflang/src/org/lflang/ASTUtils.java
deleted file mode 100644
index 5b6b5ff276..0000000000
--- a/org.lflang/src/org/lflang/ASTUtils.java
+++ /dev/null
@@ -1,1808 +0,0 @@
-/*
-Copyright (c) 2020, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package org.lflang;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.function.Predicate;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.TerminalRule;
-import org.eclipse.xtext.nodemodel.ICompositeNode;
-import org.eclipse.xtext.nodemodel.INode;
-import org.eclipse.xtext.nodemodel.impl.HiddenLeafNode;
-import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
-import org.eclipse.xtext.util.Pair;
-import org.eclipse.xtext.util.Tuples;
-import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.lflang.ast.ToText;
-import org.lflang.generator.CodeMap;
-import org.lflang.generator.InvalidSourceException;
-import org.lflang.lf.Action;
-import org.lflang.lf.Assignment;
-import org.lflang.lf.AttrParm;
-import org.lflang.lf.Attribute;
-import org.lflang.lf.Code;
-import org.lflang.lf.Connection;
-import org.lflang.lf.Element;
-import org.lflang.lf.Expression;
-import org.lflang.lf.ImportedReactor;
-import org.lflang.lf.Initializer;
-import org.lflang.lf.Input;
-import org.lflang.lf.Instantiation;
-import org.lflang.lf.LfFactory;
-import org.lflang.lf.LfPackage;
-import org.lflang.lf.Literal;
-import org.lflang.lf.Method;
-import org.lflang.lf.Mode;
-import org.lflang.lf.Model;
-import org.lflang.lf.Output;
-import org.lflang.lf.Parameter;
-import org.lflang.lf.ParameterReference;
-import org.lflang.lf.Port;
-import org.lflang.lf.Reaction;
-import org.lflang.lf.Reactor;
-import org.lflang.lf.ReactorDecl;
-import org.lflang.lf.StateVar;
-import org.lflang.lf.TargetDecl;
-import org.lflang.lf.Time;
-import org.lflang.lf.Timer;
-import org.lflang.lf.Type;
-import org.lflang.lf.VarRef;
-import org.lflang.lf.Variable;
-import org.lflang.lf.WidthSpec;
-import org.lflang.lf.WidthTerm;
-import org.lflang.util.StringUtil;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Iterators;
-
-/**
- * A helper class for modifying and analyzing the AST.
- * @author Marten Lohstroh
- * @author Edward A. Lee
- * @author Christian Menard
- */
-public class ASTUtils {
-
-    /**
-     * The Lingua Franca factory for creating new AST nodes.
-     */
-    public static final LfFactory factory = LfFactory.eINSTANCE;
-
-    /**
-     * The Lingua Franca feature package.
-     */
-    public static final LfPackage featurePackage = LfPackage.eINSTANCE;
-
-    /* Match an abbreviated form of a float literal. */
-    private static final Pattern ABBREVIATED_FLOAT = Pattern.compile("[+\\-]?\\.\\d+[\\deE+\\-]*");
-
-    /**
-     * A mapping from Reactor features to corresponding Mode features for collecting contained elements.
-     */
-    private static final Map<EStructuralFeature, EStructuralFeature> reactorModeFeatureMap = Map.of(
-            featurePackage.getReactor_Actions(),        featurePackage.getMode_Actions(),
-            featurePackage.getReactor_Connections(),    featurePackage.getMode_Connections(),
-            featurePackage.getReactor_Instantiations(), featurePackage.getMode_Instantiations(),
-            featurePackage.getReactor_Reactions(),      featurePackage.getMode_Reactions(),
-            featurePackage.getReactor_StateVars(),      featurePackage.getMode_StateVars(),
-            featurePackage.getReactor_Timers(),         featurePackage.getMode_Timers()
-            );
-
-
-    /**
-     * Get all reactors defined in the given resource.
-     * @param resource the resource to extract reactors from
-     * @return An iterable over all reactors found in the resource
-     */
-    public static List<Reactor> getAllReactors(Resource resource) {
-        return StreamSupport.stream(IteratorExtensions.toIterable(resource.getAllContents()).spliterator(), false)
-                     .filter(Reactor.class::isInstance)
-                     .map(Reactor.class::cast)
-                     .collect(Collectors.toList());
-    }
-
-    /**
-     * Get the main reactor defined in the given resource.
-     * @param resource the resource to extract reactors from
-     * @return An iterable over all reactors found in the resource
-     */
-    public static Reactor getMainReactor(Resource resource) {
-        return StreamSupport.stream(IteratorExtensions.toIterable(resource.getAllContents()).spliterator(), false)
-                    .filter(Reactor.class::isInstance)
-                    .map(Reactor.class::cast)
-                    .filter(it -> it.isMain())
-                    .findFirst()
-                    .get(); 
-    }
-    
-    /**
-     * Find connections in the given resource that would be conflicting writes if they were not located in mutually
-     * exclusive modes.
-     *
-     * @param resource The AST.
-     * @return a list of connections being able to be transformed
-     */
-    public static Collection<Connection> findConflictingConnectionsInModalReactors(Resource resource) {
-        var transform = new HashSet<Connection>();
-
-        for (Reactor reactor : getAllReactors(resource)) {
-            if (!reactor.getModes().isEmpty()) { // Only for modal reactors
-                var allWriters = HashMultimap.<Pair<Instantiation, Variable>, EObject>create();
-
-                // Collect destinations
-                for (var rea : allReactions(reactor)) {
-                    for (var eff : rea.getEffects()) {
-                        if (eff.getVariable() instanceof Port) {
-                            allWriters.put(Tuples.pair(eff.getContainer(), eff.getVariable()), rea);
-                        }
-                    }
-                }
-                for (var con : ASTUtils.<Connection>collectElements(reactor, featurePackage.getReactor_Connections(), false, true)) {
-                    for (var port : con.getRightPorts()) {
-                        allWriters.put(Tuples.pair(port.getContainer(), port.getVariable()), con);
-                    }
-                }
-
-                // Handle conflicting writers
-                for (var key : allWriters.keySet()) {
-                    var writers = allWriters.get(key);
-                    if (writers.size() > 1) { // has multiple sources
-                        var writerModes = HashMultimap.<Mode, EObject>create();
-                        // find modes
-                        for (var writer : writers) {
-                            if (writer.eContainer() instanceof Mode) {
-                                writerModes.put((Mode) writer.eContainer(), writer);
-                            } else {
-                                writerModes.put(null, writer);
-                            }
-                        }
-                        // Conflicting connection can only be handled if..
-                        if (!writerModes.containsKey(null) && // no writer is on root level (outside of modes) and...
-                            writerModes.keySet().stream().map(writerModes::get).allMatch(writersInMode -> // all writers in a mode are either...
-                                writersInMode.size() == 1 || // the only writer or...
-                                writersInMode.stream().allMatch(w -> w instanceof Reaction) // all are reactions and hence ordered
-                            )) {
-                            // Add connections to transform list
-                            writers.stream().filter(w -> w instanceof Connection).forEach(c -> transform.add((Connection) c));
-                        }
-                    }
-                }
-            }
-        }
-
-        return transform;
-    }
-
-    /**
-     * Return the enclosing reactor of an LF EObject in a reactor or mode.
-     * @param obj the LF model element
-     * @return the reactor or null
-     */
-    public static Reactor getEnclosingReactor(EObject obj) {
-        if (obj.eContainer() instanceof Reactor) {
-            return (Reactor) obj.eContainer();
-        } else if (obj.eContainer() instanceof Mode) {
-            return (Reactor) obj.eContainer().eContainer();
-        }
-        return null;
-    }
-
-    /**
-     * Return the main reactor in the given resource if there is one, null otherwise.
-     */
-    public static Reactor findMainReactor(Resource resource) {
-        return IteratorExtensions.findFirst(
-                Iterators.filter(resource.getAllContents(), Reactor.class),
-                Reactor::isMain
-        );
-    }
-
-    /**
-     * Find the main reactor and change it to a federated reactor.
-     * Return true if the transformation was successful (or the given resource
-     * already had a federated reactor); return false otherwise.
-     */
-    public static boolean makeFederated(Resource resource) {
-        // Find the main reactor
-        Reactor r = findMainReactor(resource);
-        if (r == null) {
-            return false;
-        }
-        r.setMain(false);
-        r.setFederated(true);
-        return true;
-    }
-
-    /**
-     * Change the target name to 'newTargetName'.
-     * For example, change C to CCpp.
-     */
-    public static boolean changeTargetName(Resource resource, String newTargetName) {
-        targetDecl(resource).setName(newTargetName);
-        return true;
-    }
-
-    /**
-     * Add a new target property to the given resource.
-     *
-     * This also creates a config object if the resource does not yey have one.
-     *
-     * @param resource The resource to modify
-     * @param name Name of the property to add
-     * @param value Value to be assigned to the property
-     */
-    public static boolean addTargetProperty(final Resource resource, final String name, final Element value) {
-        var config = targetDecl(resource).getConfig();
-        if (config == null) {
-            config = LfFactory.eINSTANCE.createKeyValuePairs();
-            targetDecl(resource).setConfig(config);
-        }
-        final var newProperty = LfFactory.eINSTANCE.createKeyValuePair();
-        newProperty.setName(name);
-        newProperty.setValue(value);
-        config.getPairs().add(newProperty);
-        return true;
-    }
-
-    /**
-     * Return true if the connection involves multiple ports on the left or right side of the connection, or
-     * if the port on the left or right of the connection involves a bank of reactors or a multiport.
-     * @param connection The connection.
-     */
-    public static boolean hasMultipleConnections(Connection connection) {
-        if (connection.getLeftPorts().size() > 1 || connection.getRightPorts().size() > 1) {
-            return true;
-        }
-        VarRef leftPort  = connection.getLeftPorts().get(0);
-        VarRef rightPort = connection.getRightPorts().get(0);
-        Instantiation leftContainer  = leftPort.getContainer();
-        Instantiation rightContainer = rightPort.getContainer();
-        Port leftPortAsPort  = (Port) leftPort.getVariable();
-        Port rightPortAsPort = (Port) rightPort.getVariable();
-        return leftPortAsPort.getWidthSpec() != null
-            || leftContainer != null && leftContainer.getWidthSpec() != null
-            || rightPortAsPort.getWidthSpec() != null
-            || rightContainer != null && rightContainer.getWidthSpec() != null;
-    }
-
-    /**
-     * Produce a unique identifier within a reactor based on a
-     * given based name. If the name does not exists, it is returned;
-     * if does exist, an index is appended that makes the name unique.
-     * @param reactor The reactor to find a unique identifier within.
-     * @param name The name to base the returned identifier on.
-     */
-    public static String getUniqueIdentifier(Reactor reactor, String name) {
-        LinkedHashSet<String> vars = new LinkedHashSet<>();
-        allActions(reactor).forEach(it -> vars.add(it.getName()));
-        allTimers(reactor).forEach(it -> vars.add(it.getName()));
-        allParameters(reactor).forEach(it -> vars.add(it.getName()));
-        allInputs(reactor).forEach(it -> vars.add(it.getName()));
-        allOutputs(reactor).forEach(it -> vars.add(it.getName()));
-        allStateVars(reactor).forEach(it -> vars.add(it.getName()));
-        allInstantiations(reactor).forEach(it -> vars.add(it.getName()));
-
-        int index = 0;
-        String suffix = "";
-        boolean exists = true;
-        while (exists) {
-            String id = name + suffix;
-            if (IterableExtensions.exists(vars, it -> it.equals(id))) {
-                suffix = "_" + index;
-                index++;
-            } else {
-                exists = false;
-            }
-        }
-        return name + suffix;
-    }
-
-    ////////////////////////////////
-    //// Utility functions for supporting inheritance and modes
-
-    /**
-     * Given a reactor class, return a list of all its actions,
-     * which includes actions of base classes that it extends.
-     * This also includes actions in modes, returning a flattened
-     * view over all modes.
-     * @param definition Reactor class definition.
-     */
-    public static List<Action> allActions(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Actions());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its connections,
-     * which includes connections of base classes that it extends.
-     * This also includes connections in modes, returning a flattened
-     * view over all modes.
-     * @param definition Reactor class definition.
-     */
-    public static List<Connection> allConnections(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Connections());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its inputs,
-     * which includes inputs of base classes that it extends.
-     * If the base classes include a cycle, where X extends Y and Y extends X,
-     * then return only the input defined in the base class.
-     * The returned list may be empty.
-     * @param definition Reactor class definition.
-     */
-    public static List<Input> allInputs(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Inputs());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its instantiations,
-     * which includes instantiations of base classes that it extends.
-     * This also includes instantiations in modes, returning a flattened
-     * view over all modes.
-     * @param definition Reactor class definition.
-     */
-    public static List<Instantiation> allInstantiations(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Instantiations());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its methods,
-     * which includes methods of base classes that it extends.
-     * @param definition Reactor class definition.
-     */
-    public static List<Method> allMethods(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Methods());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its outputs,
-     * which includes outputs of base classes that it extends.
-     * @param definition Reactor class definition.
-     */
-    public static List<Output> allOutputs(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Outputs());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its parameters,
-     * which includes parameters of base classes that it extends.
-     * @param definition Reactor class definition.
-     */
-    public static List<Parameter> allParameters(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Parameters());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its reactions,
-     * which includes reactions of base classes that it extends.
-     * This also includes reactions in modes, returning a flattened
-     * view over all modes.
-     * @param definition Reactor class definition.
-     */
-    public static List<Reaction> allReactions(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Reactions());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its state variables,
-     * which includes state variables of base classes that it extends.
-     * This also includes reactions in modes, returning a flattened
-     * view over all modes.
-     * @param definition Reactor class definition.
-     */
-    public static List<StateVar> allStateVars(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_StateVars());
-    }
-
-    /**
-     * Given a reactor class, return a list of all its timers,
-     * which includes timers of base classes that it extends.
-     * This also includes reactions in modes, returning a flattened
-     * view over all modes.
-     * @param definition Reactor class definition.
-     */
-    public static List<Timer> allTimers(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Timers());
-    }
-
-    /**
-     * Given a reactor class, returns a list of all its modes,
-     * which includes modes of base classes that it extends.
-     * @param definition Reactor class definition.
-     */
-    public static List<Mode> allModes(Reactor definition) {
-        return ASTUtils.collectElements(definition, featurePackage.getReactor_Modes());
-    }
-
-    /**
-     * Return all the superclasses of the specified reactor
-     * in deepest-first order. For example, if A extends B and C, and
-     * B and C both extend D, this will return the list [D, B, C, A].
-     * Duplicates are removed. If the specified reactor does not extend
-     * any other reactor, then return an empty list.
-     * If a cycle is found, where X extends Y and Y extends X, or if
-     * a superclass is declared that is not found, then return null.
-     * @param reactor The specified reactor.
-     */
-    public static LinkedHashSet<Reactor> superClasses(Reactor reactor) {
-        return superClasses(reactor, new LinkedHashSet<>());
-    }
-
-    /**
-     * Collect elements of type T from the class hierarchy and modes
-     * defined by a given reactor definition.
-     * @param definition The reactor definition.
-     * @param <T> The type of elements to collect (e.g., Port, Timer, etc.)
-     * @return A list of all elements of type T found
-     */
-    public static <T extends EObject> List<T> collectElements(Reactor definition, EStructuralFeature feature) {
-        return ASTUtils.collectElements(definition, feature, true, true);
-    }
-
-    /**
-     * Collect elements of type T contained in given reactor definition, including
-     * modes and the class hierarchy defined depending on configuration.
-     * @param definition The reactor definition.
-     * @param feature The structual model elements to collect.
-     * @param includeSuperClasses Whether to include elements in super classes.
-     * @param includeModes Whether to include elements in modes.
-     * @param <T> The type of elements to collect (e.g., Port, Timer, etc.)
-     * @return A list of all elements of type T found
-     */
-    @SuppressWarnings("unchecked")
-    public static <T extends EObject> List<T> collectElements(Reactor definition, EStructuralFeature feature, boolean includeSuperClasses, boolean includeModes) {
-        List<T> result = new ArrayList<>();
-
-        if (includeSuperClasses) {
-            // Add elements of elements defined in superclasses.
-            LinkedHashSet<Reactor> s = superClasses(definition);
-            if (s != null) {
-                for (Reactor superClass : s) {
-                    result.addAll((EList<T>) superClass.eGet(feature));
-                }
-            }
-        }
-
-        // Add elements of the current reactor.
-        result.addAll((EList<T>) definition.eGet(feature));
-
-        if (includeModes && reactorModeFeatureMap.containsKey(feature)) {
-            var modeFeature = reactorModeFeatureMap.get(feature);
-            // Add elements of elements defined in modes.
-            for (Mode mode : includeSuperClasses ? allModes(definition) : definition.getModes()) {
-                insertModeElementsAtTextualPosition(result, (EList<T>) mode.eGet(modeFeature), mode);
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Adds the elements into the given list at a location matching to their textual position.
-     *
-     * When creating a flat view onto reactor elements including modes, the final list must be ordered according
-     * to the textual positions.
-     *
-     * Example:
-     * reactor R {
-     *   reaction // -> is R.reactions[0]
-     *   mode M {
-     *      reaction // -> is R.mode[0].reactions[0]
-     *      reaction // -> is R.mode[0].reactions[1]
-     *   }
-     *   reaction // -> is R.reactions[1]
-     * }
-     * In this example, it is important that the reactions in the mode are inserted between the top-level
-     * reactions to retain the correct global reaction ordering, which will be derived from this flattened view.
-     *
-     * @param list The list to add the elements into.
-     * @param elements The elements to add.
-     * @param mode The mode containing the elements.
-     * @param <T> The type of elements to add (e.g., Port, Timer, etc.)
-     */
-    private static <T extends EObject> void insertModeElementsAtTextualPosition(List<T> list, List<T> elements, Mode mode) {
-        if (elements.isEmpty()) {
-            return; // Nothing to add
-        }
-
-        var idx = list.size();
-        if (idx > 0) {
-            // If there are elements in the list, first check if the last element has the same container as the mode.
-            // I.e. we don't want to compare textual positions of different reactors (super classes)
-            if (mode.eContainer() == list.get(list.size() - 1).eContainer()) {
-                var modeAstNode = NodeModelUtils.getNode(mode);
-                if (modeAstNode != null) {
-                    var modePos = modeAstNode.getOffset();
-                    // Now move the insertion index from the last element forward as long as this element has a textual
-                    // position after the mode.
-                    do {
-                        var astNode = NodeModelUtils.getNode(list.get(idx - 1));
-                        if (astNode != null && astNode.getOffset() > modePos) {
-                            idx--;
-                        } else {
-                            break; // Insertion index is ok.
-                        }
-                    } while (idx > 0);
-                }
-            }
-        }
-        list.addAll(idx, elements);
-    }
-
-    public static <T extends EObject> Iterable<T> allElementsOfClass(
-        Resource resource,
-        Class<T> elementClass
-    ) {
-        //noinspection StaticPseudoFunctionalStyleMethod
-        return Iterables.filter(IteratorExtensions.toIterable(resource.getAllContents()), elementClass);
-    }
-
-    ////////////////////////////////
-    //// Utility functions for translating AST nodes into text
-
-    /**
-     * Translate the given code into its textual representation
-     * with {@code CodeMap.Correspondence} tags inserted, or
-     * return the empty string if {@code node} is {@code null}.
-     * This method should be used to generate code.
-     * @param node AST node to render as string.
-     * @return Textual representation of the given argument.
-     */
-    public static String toText(EObject node) {
-        if (node == null) return "";
-        return CodeMap.Correspondence.tag(node, toOriginalText(node), node instanceof Code);
-    }
-
-    /**
-     * Translate the given code into its textual representation
-     * without {@code CodeMap.Correspondence} tags, or return
-     * the empty string if {@code node} is {@code null}.
-     * This method should be used for analyzing AST nodes in
-     * cases where they are easiest to analyze as strings.
-     * @param node AST node to render as string.
-     * @return Textual representation of the given argument.
-     */
-    public static String toOriginalText(EObject node) {
-        if (node == null) return "";
-        return ToText.instance.doSwitch(node);
-    }
-
-    /**
-     * Return an integer representation of the given element.
-     *
-     * Internally, this method uses Integer.decode, so it will
-     * also understand hexadecimal, binary, etc.
-     *
-     * @param e The element to be rendered as an integer.
-     */
-    public static Integer toInteger(Element e) {
-        return Integer.decode(e.getLiteral());
-    }
-
-    /**
-     * Return a time value based on the given element.
-     *
-     * @param e The element to be rendered as a time value.
-     */
-    public static TimeValue toTimeValue(Element e) {
-        return new TimeValue(e.getTime(), TimeUnit.fromName(e.getUnit()));
-    }
-
-    /**
-     * Returns the time value represented by the given AST node.
-     */
-    public static TimeValue toTimeValue(Time e) {
-        if (!isValidTime(e)) {
-            // invalid unit, will have been reported by validator
-            throw new IllegalArgumentException();
-        }
-        return new TimeValue(e.getInterval(), TimeUnit.fromName(e.getUnit()));
-    }
-
-    /**
-     * Return a boolean based on the given element.
-     *
-     * @param e The element to be rendered as a boolean.
-     */
-    public static boolean toBoolean(Element e) {
-        return elementToSingleString(e).equalsIgnoreCase("true");
-    }
-
-    /**
-     * Given the right-hand side of a target property, return a string that
-     * represents the given value/
-     *
-     * If the given value is not a literal or and id (but for instance and array or dict),
-     * an empty string is returned. If the element is a string, any quotes are removed.
-     *
-     * @param e The right-hand side of a target property.
-     */
-    public static String elementToSingleString(Element e) {
-        if (e.getLiteral() != null) {
-            return StringUtil.removeQuotes(e.getLiteral()).trim();
-        } else if (e.getId() != null) {
-            return e.getId();
-        }
-        return "";
-    }
-
-    /**
-     * Given the right-hand side of a target property, return a list with all
-     * the strings that the property lists.
-     *
-     * Arrays are traversed, so strings are collected recursively. Empty strings
-     * are ignored; they are not added to the list.
-     * @param value The right-hand side of a target property.
-     */
-    public static List<String> elementToListOfStrings(Element value) {
-        List<String> elements = new ArrayList<>();
-        if (value.getArray() != null) {
-            for (Element element : value.getArray().getElements()) {
-                elements.addAll(elementToListOfStrings(element));
-            }
-            return elements;
-        } else {
-            String v = elementToSingleString(value);
-            if (!v.isEmpty()) {
-                elements.add(v);
-            }
-        }
-        return elements;
-    }
-
-    /**
-     * Convert key-value pairs in an Element to a map, assuming that both the key
-     * and the value are strings.
-     */
-    public static Map<String, String> elementToStringMaps(Element value) {
-        Map<String, String> elements = new HashMap<>();
-        for (var element: value.getKeyvalue().getPairs()) {
-            elements.put(
-                element.getName().trim(),
-                StringUtil.removeQuotes(elementToSingleString(element.getValue()))
-            );
-        }
-        return elements;
-    }
-
-    // Various utility methods to convert various data types to Elements
-
-    /**
-     * Convert a <String, String> map to key-value pairs in an Element.
-     */
-    public static Element toElement(Map<String, String> map) {
-        Element e = LfFactory.eINSTANCE.createElement();
-        if (map.size() == 0) return null;
-        else {
-            var kv = LfFactory.eINSTANCE.createKeyValuePairs();
-            for (var entry : map.entrySet()) {
-                var pair = LfFactory.eINSTANCE.createKeyValuePair();
-                pair.setName(entry.getKey());
-                var element = LfFactory.eINSTANCE.createElement();
-                element.setLiteral(StringUtil.addDoubleQuotes(entry.getValue()));
-                pair.setValue(element);
-                kv.getPairs().add(pair);
-            }
-            e.setKeyvalue(kv);
-        }
-
-        return e;
-    }
-
-    /**
-     * Given a single string, convert it into its AST representation.
-     * {@code addQuotes} controls if the generated representation should be
-     * accompanied by double quotes ("") or not.
-     */
-    private static Element toElement(String str, boolean addQuotes) {
-        if (str == null) return null;
-        var strToReturn = addQuotes? StringUtil.addDoubleQuotes(str):str;
-        Element e = LfFactory.eINSTANCE.createElement();
-        e.setLiteral(strToReturn);
-        return e;
-
-    }
-
-    /**
-     * Given a single string, convert it into its AST representation.
-     */
-    public static Element toElement(String str) {
-        return toElement(str, true);
-    }
-
-    /**
-     * Given a list of strings, convert it into its AST representation.
-     * Stores the list in the Array field of the element, unless the list only has one string,
-     * in which case it is stored in the Literal field. Returns null if the provided list is empty.
-     */
-    public static Element toElement(List<String> list) {
-        Element e = LfFactory.eINSTANCE.createElement();
-        if (list.size() == 0) return null;
-        else if (list.size() == 1) {
-            return toElement(list.get(0));
-        } else {
-            var arr = LfFactory.eINSTANCE.createArray();
-            for (String s : list) {
-                arr.getElements().add(ASTUtils.toElement(s));
-            }
-            e.setArray(arr);
-        }
-        return e;
-    }
-
-    /**
-     * Convert a TimeValue to its AST representation. The value is type-cast to int in order to fit inside an Element.
-     */
-    public static Element toElement(TimeValue tv) {
-        Element e = LfFactory.eINSTANCE.createElement();
-        e.setTime((int)tv.time);
-        if (tv.unit != null) {
-            e.setUnit(tv.unit.toString());
-        }
-        return e;
-    }
-
-    public static Element toElement(boolean val) {
-        return toElement(Boolean.toString(val), false);
-    }
-
-    public static Element toElement(int val) {
-        return toElement(Integer.toString(val), false);
-    }
-
-    /**
-     * Translate the given type into its textual representation, but
-     * do not append any array specifications or type arguments.
-     * @param type AST node to render as string.
-     * @return Textual representation of the given argument.
-     */
-    public static String baseType(Type type) {
-        if (type != null) {
-            if (type.getCode() != null) {
-                return toText(type.getCode());
-            } else {
-                if (type.isTime()) {
-                    return "time";
-                } else {
-                    StringBuilder result = new StringBuilder(type.getId());
-
-                    for (String s : convertToEmptyListIfNull(type.getStars())) {
-                        result.append(s);
-                    }
-                    return result.toString();
-                }
-            }
-        }
-        return "";
-    }
-
-    /**
-     * Report whether the given literal is zero or not.
-     * @param literal AST node to inspect.
-     * @return True if the given literal denotes the constant `0`, false
-     * otherwise.
-     */
-    public static boolean isZero(String literal) {
-        try {
-            if (literal != null &&
-                Integer.parseInt(literal) == 0) {
-                return true;
-            }
-        } catch (NumberFormatException e) {
-            // Not an int.
-        }
-        return false;
-    }
-
-    /**
-     * Report whether the given expression is zero or not.
-     *
-     * @param expr AST node to inspect.
-     * @return True if the given value denotes the constant `0`, false otherwise.
-     */
-    public static boolean isZero(Expression expr) {
-        if (expr instanceof Literal) {
-            return isZero(((Literal) expr).getLiteral());
-        }
-        return false;
-    }
-
-    /**
-     * Report whether the given string literal is an integer number or not.
-     *
-     * @param literal AST node to inspect.
-     * @return True if the given value is an integer, false otherwise.
-     */
-    public static boolean isInteger(String literal) {
-        try {
-            //noinspection ResultOfMethodCallIgnored
-            Integer.decode(literal);
-        } catch (NumberFormatException e) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Report whether the given string literal is a boolean value or not.
-     * @param literal AST node to inspect.
-     * @return True if the given value is a boolean, false otherwise.
-     */
-    public static boolean isBoolean(String literal) {
-        return literal.equalsIgnoreCase("true") || literal.equalsIgnoreCase("false");
-    }
-
-    /**
-     * Report whether the given string literal is a float value or not.
-     * @param literal AST node to inspect.
-     * @return True if the given value is a float, false otherwise.
-     */
-    public static boolean isFloat(String literal) {
-        try {
-            //noinspection ResultOfMethodCallIgnored
-            Float.parseFloat(literal);
-        } catch (NumberFormatException e) {
-            return false;
-        }
-        return true;
-    }
-
-	/**
-     * Report whether the given code is an integer number or not.
-     * @param code AST node to inspect.
-     * @return True if the given code is an integer, false otherwise.
-     */
-	public static boolean isInteger(Code code) {
-        return isInteger(toText(code));
-    }
-
-    /**
-     * Report whether the given expression is an integer number or not.
-     * @param expr AST node to inspect.
-     * @return True if the given value is an integer, false otherwise.
-     */
-    public static boolean isInteger(Expression expr) {
-        if (expr instanceof Literal) {
-            return isInteger(((Literal) expr).getLiteral());
-        } else if (expr instanceof Code) {
-            return isInteger((Code) expr);
-        }
-        return false;
-    }
-
-    /**
-     * Report whether the given expression denotes a valid time or not.
-     * @param expr AST node to inspect.
-     * @return True if the argument denotes a valid time, false otherwise.
-     */
-    public static boolean isValidTime(Expression expr) {
-            if (expr instanceof ParameterReference) {
-                return isOfTimeType(((ParameterReference)expr).getParameter());
-            } else if (expr instanceof Time) {
-                return isValidTime((Time) expr);
-            } else if (expr instanceof Literal) {
-                return isZero(((Literal) expr).getLiteral());
-            }
-        return false;
-    }
-
-    /**
-     * Report whether the given time denotes a valid time or not.
-     * @param t AST node to inspect.
-     * @return True if the argument denotes a valid time, false otherwise.
-     */
-    public static boolean isValidTime(Time t) {
-        if (t == null) return false;
-        String unit = t.getUnit();
-        return t.getInterval() == 0 ||
-               TimeUnit.isValidUnit(unit);
-    }
-
-    /**
-     * If the initializer contains exactly one expression,
-     * return it. Otherwise, return null.
-     */
-    public static Expression asSingleExpr(Initializer init) {
-        if (init == null) {
-            return null;
-        }
-        var exprs = init.getExprs();
-        return exprs.size() == 1 ? exprs.get(0) : null;
-    }
-
-    public static boolean isSingleExpr(Initializer init) {
-        // todo expand that to = initialization
-        if (init == null) {
-            return false;
-        }
-        var exprs = init.getExprs();
-        return exprs.size() == 1;
-    }
-
-    public static boolean isListInitializer(Initializer init) {
-        return init != null && !isSingleExpr(init);
-    }
-
-    /**
-     * Return the type of a declaration with the given
-     * (nullable) explicit type, and the given (nullable)
-     * initializer. If the explicit type is null, then the
-     * type is inferred from the initializer. Only two types
-     * can be inferred: "time" and "timeList". Return the
-     * "undefined" type if neither can be inferred.
-     *
-     * @param type     Explicit type declared on the declaration
-     * @param init The initializer expression
-     * @return The inferred type, or "undefined" if none could be inferred.
-     */
-    public static InferredType getInferredType(Type type, Initializer init) {
-        if (type != null) {
-            return InferredType.fromAST(type);
-        } else if (init == null) {
-            return InferredType.undefined();
-        }
-
-        var single = asSingleExpr(init);
-        if (single != null) {
-            // If there is a single element in the list, and it is a proper
-            // time value with units, we infer the type "time".
-            if (single instanceof ParameterReference) {
-                return getInferredType(((ParameterReference) single).getParameter());
-            } else if (single instanceof Time) {
-                return InferredType.time();
-            }
-        } else if (init.getExprs().size() > 1) {
-            // If there are multiple elements in the list, and there is at
-            // least one proper time value with units, and all other elements
-            // are valid times (including zero without units), we infer the
-            // type "time list".
-            var allValidTime = true;
-            var foundNonZero = false;
-
-            for (var e : init.getExprs()) {
-                if (!ASTUtils.isValidTime(e)) {
-                    allValidTime = false;
-                }
-                if (!ASTUtils.isZero(e)) {
-                    foundNonZero = true;
-                }
-            }
-
-            if (allValidTime && foundNonZero) {
-                // Conservatively, no bounds are inferred; the returned type
-                // is a variable-size list.
-                return InferredType.timeList();
-            }
-        }
-        return InferredType.undefined();
-    }
-
-    /**
-     * Given a parameter, return an inferred type. Only two types can be
-     * inferred: "time" and "timeList". Return the "undefined" type if
-     * neither can be inferred.
-     *
-     * @param p A parameter to infer the type of.
-     * @return The inferred type, or "undefined" if none could be inferred.
-     */
-    public static InferredType getInferredType(Parameter p) {
-        return getInferredType(p.getType(), p.getInit());
-    }
-
-    /**
-     * Given a state variable, return an inferred type. Only two types can be
-     * inferred: "time" and "timeList". Return the "undefined" type if
-     * neither can be inferred.
-     *
-     * @param s A state variable to infer the type of.
-     * @return The inferred type, or "undefined" if none could be inferred.
-     */
-    public static InferredType getInferredType(StateVar s) {
-        return getInferredType(s.getType(), s.getInit());
-    }
-
-    /**
-     * Construct an inferred type from an "action" AST node based
-     * on its declared type. If no type is declared, return the "undefined"
-     * type.
-     *
-     * @param a An action to construct an inferred type object for.
-     * @return The inferred type, or "undefined" if none was declared.
-     */
-    public static InferredType getInferredType(Action a) {
-        return getInferredType(a.getType(), null);
-    }
-
-    /**
-     * Construct an inferred type from a "port" AST node based on its declared
-     * type. If no type is declared, return the "undefined" type.
-     *
-     * @param p A port to construct an inferred type object for.
-     * @return The inferred type, or "undefined" if none was declared.
-     */
-    public static InferredType getInferredType(Port p) {
-        return getInferredType(p.getType(), null);
-    }
-
-
-
-    /**
-     * If the given string can be recognized as a floating-point number that has a leading decimal point,
-     * prepend the string with a zero and return it. Otherwise, return the original string.
-     *
-     * @param literal A string might be recognizable as a floating point number with a leading decimal point.
-     * @return an equivalent representation of <code>literal
-     * </code>
-     */
-    public static String addZeroToLeadingDot(String literal) {
-        Matcher m = ABBREVIATED_FLOAT.matcher(literal);
-        if (m.matches()) {
-            return literal.replace(".", "0.");
-        }
-        return literal;
-    }
-
-    /**
-     * Return true if the specified port is a multiport.
-     * @param port The port.
-     * @return True if the port is a multiport.
-     */
-    public static boolean isMultiport(Port port) {
-        return port.getWidthSpec() != null;
-    }
-
-    ////////////////////////////////
-    //// Utility functions for translating AST nodes into text
-    // This is a continuation of a large section of ASTUtils.xtend
-    // with the same name.
-
-    /**
-     * Generate code for referencing a port, action, or timer.
-     * @param reference The reference to the variable.
-     */
-    public static String generateVarRef(VarRef reference) {
-        var prefix = "";
-        if (reference.getContainer() != null) {
-            prefix = reference.getContainer().getName() + ".";
-        }
-        return prefix + reference.getVariable().getName();
-    }
-
-    /**
-     * Assuming that the given expression denotes a valid time literal,
-     * return a time value.
-     */
-    public static TimeValue getLiteralTimeValue(Expression expr) {
-        if (expr instanceof Time) {
-            return toTimeValue((Time)expr);
-        } else if (expr instanceof Literal && isZero(((Literal) expr).getLiteral())) {
-            return TimeValue.ZERO;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * If the parameter is of time type, return its default value.
-     * Otherwise, return null.
-     */
-    public static TimeValue getDefaultAsTimeValue(Parameter p) {
-        if (isOfTimeType(p)) {
-            var init = asSingleExpr(p.getInit());
-            if (init != null) {
-                return getLiteralTimeValue(init);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Return whether the given state variable is inferred
-     * to a time type.
-     */
-    public static boolean isOfTimeType(StateVar state) {
-        InferredType t = getInferredType(state);
-        return t.isTime && !t.isList;
-    }
-
-    /**
-     * Return whether the given parameter is inferred
-     * to a time type.
-     */
-    public static boolean isOfTimeType(Parameter param) {
-        InferredType t = getInferredType(param);
-        return t.isTime && !t.isList;
-    }
-
-    /**
-     * Given a parameter, return its initial value.
-     * The initial value is a list of instances of Expressions.
-     *
-     * If the instantiations argument is null or an empty list, then the
-     * value returned is simply the default value given when the parameter
-     * is defined.
-     *
-     * If a list of instantiations is given, then the first instantiation
-     * is required to be an instantiation of the reactor class that is
-     * parameterized by the parameter. I.e.,
-     * ```
-     *     parameter.eContainer == instantiations.get(0).reactorClass
-     * ```
-     * If a second instantiation is given, then it is required to be an instantiation of a
-     * reactor class that contains the first instantiation.  That is,
-     * ```
-     *     instantiations.get(0).eContainer == instantiations.get(1).reactorClass
-     * ```
-     * More generally, for all 0 <= i < instantiations.size - 1,
-     * ```
-     *     instantiations.get(i).eContainer == instantiations.get(i + 1).reactorClass
-     * ```
-     * If any of these conditions is not satisfied, then an IllegalArgumentException
-     * will be thrown.
-     *
-     * Note that this chain of reactions cannot be inferred from the parameter because
-     * in each of the predicates above, there may be more than one instantiation that
-     * can appear on the right hand side of the predicate.
-     *
-     * For example, consider the following program:
-     * ```
-     *     reactor A(x:int(1)) {}
-     *     reactor B(y:int(2)) {
-     *         a1 = new A(x = y);
-     *         a2 = new A(x = -1);
-     *     }
-     *     reactor C(z:int(3)) {
-     *         b1 = new B(y = z);
-     *         b2 = new B(y = -2);
-     *     }
-     * ```
-     * Notice that there are a total of four instances of reactor class A.
-     * Then
-     * ```
-     *     initialValue(x, null) returns 1
-     *     initialValue(x, [a1]) returns 2
-     *     initialValue(x, [a2]) returns -1
-     *     initialValue(x, [a1, b1]) returns 3
-     *     initialValue(x, [a2, b1]) returns -1
-     *     initialValue(x, [a1, b2]) returns -2
-     *     initialValue(x, [a2, b2]) returns -1
-     * ```
-     * (Actually, in each of the above cases, the returned value is a list with
-     * one entry, a Literal, e.g. ["1"]).
-     *
-     * There are two instances of reactor class B.
-     * ```
-     *     initialValue(y, null) returns 2
-     *     initialValue(y, [a1]) throws an IllegalArgumentException
-     *     initialValue(y, [b1]) returns 3
-     *     initialValue(y, [b2]) returns -2
-     * ```
-     *
-     * @param parameter The parameter.
-     * @param instantiations The (optional) list of instantiations.
-     *
-     * @return The value of the parameter.
-     *
-     * @throws IllegalArgumentException If an instantiation provided is not an
-     *  instantiation of the reactor class that is parameterized by the
-     *  respective parameter or if the chain of instantiations is not nested.
-     */
-    public static List<Expression> initialValue(Parameter parameter, List<Instantiation> instantiations) {
-        // If instantiations are given, then check to see whether this parameter gets overridden in
-        // the first of those instantiations.
-        if (instantiations != null && instantiations.size() > 0) {
-            // Check to be sure that the instantiation is in fact an instantiation
-            // of the reactor class for which this is a parameter.
-            Instantiation instantiation = instantiations.get(0);
-
-            if (!belongsTo(parameter, instantiation)) {
-                throw new IllegalArgumentException("Parameter "
-                    + parameter.getName()
-                    + " is not a parameter of reactor instance "
-                    + instantiation.getName()
-                    + "."
-                );
-            }
-            // In case there is more than one assignment to this parameter, we need to
-            // find the last one.
-            Assignment lastAssignment = null;
-            for (Assignment assignment: instantiation.getParameters()) {
-                if (assignment.getLhs().equals(parameter)) {
-                    lastAssignment = assignment;
-                }
-            }
-            if (lastAssignment != null) {
-                // Right hand side can be a list. Collect the entries.
-                List<Expression> result = new ArrayList<>();
-                for (Expression expr: lastAssignment.getRhs().getExprs()) {
-                    if (expr instanceof ParameterReference) {
-                        if (instantiations.size() > 1
-                            && instantiation.eContainer() != instantiations.get(1).getReactorClass()
-                        ) {
-                            throw new IllegalArgumentException("Reactor instance "
-                                    + instantiation.getName()
-                                    + " is not contained by instance "
-                                    + instantiations.get(1).getName()
-                                    + "."
-                            );
-                        }
-                        result.addAll(initialValue(((ParameterReference)expr).getParameter(),
-                                instantiations.subList(1, instantiations.size())));
-                    } else {
-                        result.add(expr);
-                    }
-                }
-                return result;
-            }
-        }
-        // If we reach here, then either no instantiation was supplied or
-        // there was no assignment in the instantiation. So just use the
-        // parameter's initial value.
-        return parameter.getInit().getExprs();
-    }
-
-    /**
-     * Return true if the specified object (a Parameter, Port, Action, or Timer)
-     * belongs to the specified instantiation, meaning that it is defined in
-     * the reactor class being instantiated or one of its base classes.
-     * @param eobject The object.
-     * @param instantiation The instantiation.
-     */
-    public static boolean belongsTo(EObject eobject, Instantiation instantiation) {
-        Reactor reactor = toDefinition(instantiation.getReactorClass());
-        return belongsTo(eobject, reactor);
-    }
-
-    /**
-     * Return true if the specified object (a Parameter, Port, Action, or Timer)
-     * belongs to the specified reactor, meaning that it is defined in
-     * reactor class or one of its base classes.
-     * @param eobject The object.
-     * @param reactor The reactor.
-     */
-    public static boolean belongsTo(EObject eobject, Reactor reactor) {
-        if (eobject.eContainer() == reactor) return true;
-        for (ReactorDecl baseClass : reactor.getSuperClasses()) {
-            if (belongsTo(eobject, toDefinition(baseClass))) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Given a parameter return its integer value or null
-     * if it does not have an integer value.
-     * If the value of the parameter is a list of integers,
-     * return the sum of value in the list.
-     * The instantiations parameter is as in
-     * {@link #initialValue(Parameter, List)}.
-     *
-     * @param parameter The parameter.
-     * @param instantiations The (optional) list of instantiations.
-     *
-     * @return The integer value of the parameter, or null if it does not have an integer value.
-     *
-     * @throws IllegalArgumentException If an instantiation provided is not an
-     *  instantiation of the reactor class that is parameterized by the
-     *  respective parameter or if the chain of instantiations is not nested.
-     */
-    public static Integer initialValueInt(Parameter parameter, List<Instantiation> instantiations) {
-        List<Expression> expressions = initialValue(parameter, instantiations);
-        int result = 0;
-        for (Expression expr: expressions) {
-            if (!(expr instanceof Literal)) {
-                return null;
-            }
-            try {
-                result += Integer.decode(((Literal) expr).getLiteral());
-            } catch (NumberFormatException ex) {
-                return null;
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Given the width specification of port or instantiation
-     * and an (optional) list of nested instantiations, return
-     * the width if it can be determined and -1 if not.
-     * It will not be able to be determined if either the
-     * width is variable (in which case you should use
-     * {@link #inferPortWidth(VarRef, Connection, List)} )
-     * or the list of instantiations is incomplete or missing.
-     * If there are parameter references in the width, they are
-     * evaluated to the extent possible given the instantiations list.
-     *
-     * The instantiations list is as in
-     * {@link #initialValue(Parameter, List)}.
-     * If the spec belongs to an instantiation (for a bank of reactors),
-     * then the first element on this list should be the instantiation
-     * that contains this instantiation. If the spec belongs to a port,
-     * then the first element on the list should be the instantiation
-     * of the reactor that contains the port.
-     *
-     * @param spec The width specification or null (to return 1).
-     * @param instantiations The (optional) list of instantiations.
-     *
-     * @return The width, or -1 if the width could not be determined.
-     *
-     * @throws IllegalArgumentException If an instantiation provided is not as
-     *  given above or if the chain of instantiations is not nested.
-     */
-    public static int width(WidthSpec spec, List<Instantiation> instantiations) {
-        if (spec == null) {
-            return 1;
-        }
-        if (spec.isOfVariableLength() && spec.eContainer() instanceof Instantiation) {
-            return inferWidthFromConnections(spec, instantiations);
-        }
-        var result = 0;
-        for (WidthTerm term: spec.getTerms()) {
-            if (term.getParameter() != null) {
-                Integer termWidth = initialValueInt(term.getParameter(), instantiations);
-                if (termWidth != null) {
-                    result += termWidth;
-                } else {
-                    return -1;
-                }
-            } else if (term.getWidth() > 0) {
-                result += term.getWidth();
-            } else {
-                // If the width cannot be determined because term's width <= 0, which means the term's width
-                // must be inferred, try to infer the width using connections.
-                if (spec.eContainer() instanceof Instantiation) {
-                    try {
-                        return inferWidthFromConnections(spec, instantiations);
-                    } catch (InvalidSourceException e) {
-                        // If the inference fails, return -1.
-                        return -1;
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Infer the width of a port reference in a connection.
-     * The port reference one or two parts, a port and an (optional) container
-     * which is an Instantiation that may refer to a bank of reactors.
-     * The width will be the product of the bank width and the port width.
-     * The returned value will be 1 if the port is not in a bank and is not a multiport.
-     *
-     * If the width cannot be determined, this will return -1.
-     * The width cannot be determined if the list of instantiations is
-     * missing or incomplete.
-     *
-     * The instantiations list is as in
-     * {@link #initialValue(Parameter, List)}.
-     * The first element on this list should be the instantiation
-     * that contains the specified connection.
-     *
-     * @param reference A port reference.
-     * @param connection A connection, or null if not in the context of a connection.
-     * @param instantiations The (optional) list of instantiations.
-     *
-     * @return The width or -1 if it could not be determined.
-     *
-     * @throws IllegalArgumentException If an instantiation provided is not as
-     *  given above or if the chain of instantiations is not nested.
-     */
-    public static int inferPortWidth(
-        VarRef reference, Connection connection, List<Instantiation> instantiations
-    ) {
-        if (reference.getVariable() instanceof Port) {
-            // If the port is given as a.b, then we want to prepend a to
-            // the list of instantiations to determine the width of this port.
-            List<Instantiation> extended = instantiations;
-            if (reference.getContainer() != null) {
-                extended = new ArrayList<>();
-                extended.add(reference.getContainer());
-                if (instantiations != null) {
-                    extended.addAll(instantiations);
-                }
-            }
-
-            int portWidth = width(((Port) reference.getVariable()).getWidthSpec(), extended);
-            if (portWidth < 0) {
-                // Could not determine port width.
-                return -1;
-            }
-
-            // Next determine the bank width. This may be unspecified, in which
-            // case it has to be inferred using the connection.
-            int bankWidth = 1;
-            if (reference.getContainer() != null) {
-                bankWidth = width(reference.getContainer().getWidthSpec(), instantiations);
-                if (bankWidth < 0 && connection != null) {
-                    // Try to infer the bank width from the connection.
-                    if (reference.getContainer().getWidthSpec().isOfVariableLength()) {
-                        // This occurs for a bank of delays.
-                        int leftWidth = 0;
-                        int rightWidth = 0;
-                        int leftOrRight = 0;
-                        for (VarRef leftPort : connection.getLeftPorts()) {
-                            if (leftPort == reference) {
-                                if (leftOrRight != 0) {
-                                    throw new InvalidSourceException("Multiple ports with variable width on a connection.");
-                                }
-                                // Indicate that this port is on the left.
-                                leftOrRight = -1;
-                            } else {
-                                // The left port is not the same as this reference.
-                                int otherWidth = inferPortWidth(leftPort, connection, instantiations);
-                                if (otherWidth < 0) {
-                                    // Cannot determine width.
-                                    return -1;
-                                }
-                                leftWidth += otherWidth;
-                            }
-                        }
-                        for (VarRef rightPort : connection.getRightPorts()) {
-                            if (rightPort == reference) {
-                                if (leftOrRight != 0) {
-                                    throw new InvalidSourceException("Multiple ports with variable width on a connection.");
-                                }
-                                // Indicate that this port is on the right.
-                                leftOrRight = 1;
-                            } else {
-                                int otherWidth = inferPortWidth(rightPort, connection, instantiations);
-                                if (otherWidth < 0) {
-                                    // Cannot determine width.
-                                    return -1;
-                                }
-                                rightWidth += otherWidth;
-                            }
-                        }
-                        int discrepancy = 0;
-                        if (leftOrRight < 0) {
-                            // This port is on the left.
-                            discrepancy = rightWidth - leftWidth;
-                        } else if (leftOrRight > 0) {
-                            // This port is on the right.
-                            discrepancy = leftWidth - rightWidth;
-                        }
-                        // Check that portWidth divides the discrepancy.
-                        if (discrepancy % portWidth != 0) {
-                            // This is an error.
-                            return -1;
-                        }
-                        bankWidth = discrepancy / portWidth;
-                    } else {
-                        // Could not determine the bank width.
-                        return -1;
-                    }
-                }
-            }
-            return portWidth * bankWidth;
-        }
-        // Argument is not a port.
-        return -1;
-    }
-
-    /**
-     * Given an instantiation of a reactor or bank of reactors, return
-     * the width. This will be 1 if this is not a reactor bank. Otherwise,
-     * this will attempt to determine the width. If the width is declared
-     * as a literal constant, it will return that constant. If the width
-     * is specified as a reference to a parameter, this will throw an
-     * exception. If the width is variable, this will find
-     * connections in the enclosing reactor and attempt to infer the
-     * width. If the width cannot be determined, it will throw an exception.
-     *
-     * IMPORTANT: This method should not be used you really need to
-     * determine the width! It will not evaluate parameter values.
-     * @see #width(WidthSpec, List)
-     *
-     * @param instantiation A reactor instantiation.
-     *
-     * @return The width, if it can be determined.
-     * @deprecated
-     */
-    @Deprecated
-    public static int widthSpecification(Instantiation instantiation) {
-        int result = width(instantiation.getWidthSpec(), null);
-        if (result < 0) {
-            throw new InvalidSourceException("Cannot determine width for the instance "
-                    + instantiation.getName());
-        }
-        return result;
-    }
-
-    /**
-     * Report whether a state variable has been initialized or not.
-     * @param v The state variable to be checked.
-     * @return True if the variable was initialized, false otherwise.
-     */
-    public static boolean isInitialized(StateVar v) {
-        return v != null && v.getInit() != null;
-    }
-
-    /**
-     * Report whether the given time state variable is initialized using a
-     * parameter or not.
-     * @param s A state variable.
-     * @return True if the argument is initialized using a parameter, false
-     * otherwise.
-     */
-    public static boolean isParameterized(StateVar s) {
-        return s.getInit() != null &&
-               IterableExtensions.exists(s.getInit().getExprs(), it -> it instanceof ParameterReference);
-    }
-
-    /**
-     * Check if the reactor class uses generics
-     * @param r the reactor to check
-     * @return true if the reactor uses generics
-     */
-    public static boolean isGeneric(Reactor r) {
-        if (r == null) {
-            return false;
-        }
-        return r.getTypeParms().size() != 0;
-    }
-
-    /**
-     * If the specified reactor declaration is an import, then
-     * return the imported reactor class definition. Otherwise,
-     * just return the argument.
-     * @param r A Reactor or an ImportedReactor.
-     * @return The Reactor class definition or null if no definition is found.
-     */
-    public static Reactor toDefinition(ReactorDecl r) {
-        if (r == null)
-            return null;
-        if (r instanceof Reactor) {
-            return (Reactor) r;
-        } else if (r instanceof ImportedReactor) {
-            return ((ImportedReactor) r).getReactorClass();
-        }
-        return null;
-    }
-
-    /**
-     * Return all single-line or multi-line comments immediately preceding the
-     * given EObject.
-     */
-    public static Stream<String> getPrecedingComments(
-        ICompositeNode compNode,
-        Predicate<INode> filter
-    ) {
-        return getPrecedingCommentNodes(compNode, filter).map(INode::getText);
-    }
-
-    /**
-     * Return all single-line or multi-line comments immediately preceding the
-     * given EObject.
-     */
-    public static Stream<INode> getPrecedingCommentNodes(
-        ICompositeNode compNode,
-        Predicate<INode> filter
-    ) {
-        if (compNode == null) return Stream.of();
-        List<INode> ret = new ArrayList<>();
-        for (INode node : compNode.getAsTreeIterable()) {
-            if (!(node instanceof ICompositeNode)) {
-                if (isComment(node)) {
-                    if (filter.test(node)) ret.add(node);
-                } else if (!node.getText().isBlank()) {
-                    break;
-                }
-            }
-        }
-        return ret.stream();
-    }
-
-    /** Return whether {@code node} is a comment. */
-    public static boolean isComment(INode node) {
-        return node instanceof HiddenLeafNode hlNode
-            && hlNode.getGrammarElement() instanceof TerminalRule tRule
-            && tRule.getName().endsWith("_COMMENT");
-    }
-
-    /**
-     * Return true if the given node starts on the same line as the given other
-     * node.
-     */
-    public static Predicate<INode> sameLine(ICompositeNode compNode) {
-        return other -> {
-            for (INode node : compNode.getAsTreeIterable()) {
-                if (!(node instanceof ICompositeNode) && !node.getText().isBlank() && !isComment(node)) {
-                    return node.getStartLine() == other.getStartLine();
-                }
-            }
-            return false;
-        };
-    }
-
-    /**
-     * Find the main reactor and set its name if none was defined.
-     * @param resource The resource to find the main reactor in.
-     */
-    public static void setMainName(Resource resource, String name) {
-        Reactor main = IteratorExtensions.findFirst(Iterators.filter(resource.getAllContents(), Reactor.class),
-            it -> it.isMain() || it.isFederated()
-        );
-        if (main != null && StringExtensions.isNullOrEmpty(main.getName())) {
-            main.setName(name);
-        }
-    }
-
-    /**
-     * Create a new instantiation node with the given reactor as its defining class.
-     * @param reactor The reactor class to create an instantiation of.
-     */
-    public static Instantiation createInstantiation(Reactor reactor) {
-        Instantiation inst = LfFactory.eINSTANCE.createInstantiation();
-        inst.setReactorClass(reactor);
-        // If the reactor is federated or at the top level, then it
-        // may not have a name. In the generator's doGenerate()
-        // method, the name gets set using setMainName().
-        // But this may be called before that, e.g. during
-        // diagram synthesis.  We assign a temporary name here.
-        if (reactor.getName() == null) {
-            if (reactor.isFederated() || reactor.isMain()) {
-                inst.setName("main");
-            } else {
-                inst.setName("");
-            }
-
-        } else {
-            inst.setName(reactor.getName());
-        }
-        return inst;
-    }
-
-    /**
-     * Returns the target declaration in the given model.
-     * Non-null because it would cause a parse error.
-     */
-    public static TargetDecl targetDecl(Model model) {
-        return IteratorExtensions.head(Iterators.filter(model.eAllContents(), TargetDecl.class));
-    }
-
-    /**
-     * Returns the target declaration in the given resource.
-     * Non-null because it would cause a parse error.
-     */
-    public static TargetDecl targetDecl(Resource model) {
-        return IteratorExtensions.head(Iterators.filter(model.getAllContents(), TargetDecl.class));
-    }
-
-    /////////////////////////////////////////////////////////
-    //// Private methods
-
-    /**
-     * Returns the list if it is not null. Otherwise, return an empty list.
-     */
-    public static <T> List<T> convertToEmptyListIfNull(List<T> list) {
-        return list != null ? list : new ArrayList<>();
-    }
-
-    /**
-     * Return all the superclasses of the specified reactor
-     * in deepest-first order. For example, if A extends B and C, and
-     * B and C both extend D, this will return the list [D, B, C, A].
-     * Duplicates are removed. If the specified reactor does not extend
-     * any other reactor, then return an empty list.
-     * If a cycle is found, where X extends Y and Y extends X, or if
-     * a superclass is declared that is not found, then return null.
-     * @param reactor The specified reactor.
-     * @param extensions A set of reactors extending the specified reactor
-     *  (used to detect circular extensions).
-     */
-    private static LinkedHashSet<Reactor> superClasses(Reactor reactor, Set<Reactor> extensions) {
-        LinkedHashSet<Reactor> result = new LinkedHashSet<>();
-        for (ReactorDecl superDecl : convertToEmptyListIfNull(reactor.getSuperClasses())) {
-            Reactor r = toDefinition(superDecl);
-            if (r == reactor || r == null) return null;
-            // If r is in the extensions, then we have a circular inheritance structure.
-            if (extensions.contains(r)) return null;
-            extensions.add(r);
-            LinkedHashSet<Reactor> baseExtends = superClasses(r, extensions);
-            extensions.remove(r);
-            if (baseExtends == null) return null;
-            result.addAll(baseExtends);
-            result.add(r);
-        }
-        return result;
-    }
-
-    /**
-     * We may be able to infer the width by examining the connections of
-     * the enclosing reactor definition. This works, for example, with
-     * delays between multiports or banks of reactors.
-     * Attempt to infer the width from connections and return -1 if the width cannot be inferred.
-     *
-     * @param spec The width specification or null (to return 1).
-     * @param instantiations The (optional) list of instantiations.
-     *
-     * @return The width, or -1 if the width could not be inferred from connections.
-     */
-    private static int inferWidthFromConnections(WidthSpec spec, List<Instantiation> instantiations) {
-        for (Connection c : ((Reactor) spec.eContainer().eContainer()).getConnections()) {
-            int leftWidth = 0;
-            int rightWidth = 0;
-            int leftOrRight = 0;
-            for (VarRef leftPort : c.getLeftPorts()) {
-                if (leftPort.getContainer() == spec.eContainer()) {
-                    if (leftOrRight != 0) {
-                        throw new InvalidSourceException("Multiple ports with variable width on a connection.");
-                    }
-                    // Indicate that the port is on the left.
-                    leftOrRight = -1;
-                } else {
-                    leftWidth += inferPortWidth(leftPort, c, instantiations);
-                }
-            }
-            for (VarRef rightPort : c.getRightPorts()) {
-                if (rightPort.getContainer() == spec.eContainer()) {
-                    if (leftOrRight != 0) {
-                        throw new InvalidSourceException("Multiple ports with variable width on a connection.");
-                    }
-                    // Indicate that the port is on the right.
-                    leftOrRight = 1;
-                } else {
-                    rightWidth += inferPortWidth(rightPort, c, instantiations);
-                }
-            }
-            if (leftOrRight < 0) {
-                return rightWidth - leftWidth;
-            } else if (leftOrRight > 0) {
-                return leftWidth - rightWidth;
-            }
-        }
-        // A connection was not found with the instantiation.
-        return -1;
-    }
-
-    public static void addReactionAttribute(Reaction reaction, String name) {
-        var fedAttr = factory.createAttribute();
-        fedAttr.setAttrName(name);
-        reaction.getAttributes().add(fedAttr);
-    }
-}
diff --git a/org.lflang/src/org/lflang/FileConfig.java b/org.lflang/src/org/lflang/FileConfig.java
deleted file mode 100644
index 69b952fa6f..0000000000
--- a/org.lflang/src/org/lflang/FileConfig.java
+++ /dev/null
@@ -1,358 +0,0 @@
-package org.lflang;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.function.Consumer;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.generator.IFileSystemAccess2;
-
-
-import org.lflang.federated.generator.FedFileConfig;
-import org.lflang.generator.GeneratorUtils;
-import org.lflang.util.FileUtil;
-import org.lflang.util.LFCommand;
-
-/**
- * Base class that governs the interactions between code generators and the file system.
- *
- * @author Marten Lohstroh
- *
- */
-public abstract class FileConfig {
-
-    // Public static fields.
-
-    public static final String DEFAULT_SRC_DIR = "src";
-
-    /**
-     * Default name of the directory to store binaries in.
-     */
-    public static final String DEFAULT_BIN_DIR = "bin";
-
-    /**
-     * Default name of the directory to store generated sources in.
-     */
-    public static final String DEFAULT_SRC_GEN_DIR = "src-gen";
-
-    /**
-     * Default name of the directory to store generated verification models in.
-     */
-    public static final String DEFAULT_MODEL_GEN_DIR = "model-gen";
-
-    // Public fields.
-
-    /**
-     * The directory in which to put binaries, if the code generator produces any.
-     */
-    public final Path binPath;
-
-    /**
-     * The name of the main reactor, which has to match the file name (without
-     * the '.lf' extension).
-     */
-    public final String name;
-
-    /**
-     * The directory that is the root of the package in which the .lf source file resides. This path is determined
-     * differently depending on whether the compiler is invoked through the IDE or from the command line. In the former
-     * case, the package is the project root that the source resides in. In the latter case, it is the parent directory
-     * of the nearest `src` directory up the hierarchy, if there is one, or just the `outPath` if there is none. It is
-     * recommended to always keep the sources in a `src` directory regardless of the workflow, in which case the
-     * output behavior will be identical irrespective of the way the compiler is invoked.
-     */
-    public final Path srcPkgPath;
-
-    /**
-     * The file containing the main source code.
-     * This is the Eclipse eCore view of the file, which is distinct
-     * from the XText view of the file and the OS view of the file.
-     */
-    public final Resource resource;
-
-    /**
-     * If running in an Eclipse IDE, the iResource refers to the
-     * IFile representing the Lingua Franca program.
-     * This is the XText view of the file, which is distinct
-     * from the Eclipse eCore view of the file and the OS view of the file.
-     * <p>
-     * This is null if running outside an Eclipse IDE.
-     */
-    public final IResource iResource;
-
-    /**
-     * The full path to the file containing the .lf file including the
-     * full filename with the .lf extension.
-     */
-    public final Path srcFile;
-
-    /**
-     * The directory in which the source .lf file was found.
-     */
-    public final Path srcPath; // FIXME: rename this to srcDir?
-
-    /**
-     * Indicate whether the bin directory should be hierarchical.
-     */
-    public final boolean useHierarchicalBin;
-
-    // Protected fields.
-
-    /**
-     * Path representation of srcGenRoot, the root directory for generated
-     * sources.
-     */
-    protected Path srcGenBasePath;
-
-    /**
-     * The directory in which to put the generated sources.
-     * This takes into account the location of the source file relative to the
-     * package root. Specifically, if the source file is x/y/Z.lf relative
-     * to the package root, then the generated sources will be put in x/y/Z
-     * relative to srcGenBasePath.
-     */
-    protected Path srcGenPath;
-
-    /**
-     * Path representation of the root directory for generated
-     * verification models.
-     */
-    protected Path modelGenBasePath;
-
-    /**
-     * The directory in which to put the generated verification models.
-     */
-    protected Path modelGenPath;
-
-    // private fields
-
-    /**
-     * The parent of the directory designated for placing generated sources into (`./src-gen` by default). Additional
-     * directories (such as `bin` or `build`) should be created as siblings of the directory for generated sources,
-     * which means that such directories should be created relative to the path assigned to this class variable.
-     * <p>
-     * The generated source directory is specified in the IDE (Project Properties->LF->Compiler->Output Folder). When
-     * invoking the standalone compiler, the output path is specified directly using the `-o` or `--output-path` option.
-     */
-    private final Path outPath;
-
-    /**
-     * The directory that denotes the root of the package to which the
-     * generated sources belong. Even if the target language does not have a
-     * notion of packages, this directory groups all files associated with a
-     * single main reactor.
-     * of packages.
-     */
-    private final Path srcGenPkgPath;
-
-    public FileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchicalBin) throws IOException {
-        this.resource = resource;
-        this.useHierarchicalBin = useHierarchicalBin;
-
-        this.srcFile = FileUtil.toPath(this.resource);
-
-        this.srcPath = srcFile.getParent();
-        this.srcPkgPath = getPkgPath(resource);
-
-        this.srcGenBasePath = srcGenBasePath;
-        this.name = FileUtil.nameWithoutExtension(this.srcFile);
-        this.srcGenPath = srcGenBasePath.resolve(getSubPkgPath(srcPath)).resolve(name);
-        this.srcGenPkgPath = this.srcGenPath;
-        this.outPath = srcGenBasePath.getParent();
-
-        Path binRoot = outPath.resolve(DEFAULT_BIN_DIR);
-        this.binPath = useHierarchicalBin ? binRoot.resolve(getSubPkgPath(srcPath)) : binRoot;
-
-        this.modelGenBasePath = outPath.resolve(DEFAULT_MODEL_GEN_DIR);
-        this.modelGenPath = modelGenBasePath.resolve(getSubPkgPath(srcPath)).resolve(name);
-
-        this.iResource = FileUtil.getIResource(resource);
-    }
-
-    /**
-     * Get the directory a resource is located in relative to the root package
-     */
-    public Path getDirectory(Resource r) throws IOException {
-        return getSubPkgPath(FileUtil.toPath(r).getParent());
-    }
-
-    /**
-     * The parent of the directory designated for placing generated sources into (`./src-gen` by default). Additional
-     * directories (such as `bin` or `build`) should be created as siblings of the directory for generated sources,
-     * which means that such directories should be created relative to the path assigned to this class variable.
-     * <p>
-     * The generated source directory is specified in the IDE (Project Properties->LF->Compiler->Output Folder). When
-     * invoking the standalone compiler, the output path is specified directly using the `-o` or `--output-path` option.
-     */
-    public Path getOutPath() {
-        return outPath;
-    }
-
-    /**
-     * The directory in which to put the generated sources.
-     * This takes into account the location of the source file relative to the
-     * package root. Specifically, if the source file is x/y/Z.lf relative
-     * to the package root, then the generated sources will be put in x/y/Z
-     * relative to srcGenBasePath.
-     */
-    public Path getSrcGenPath() {
-        return srcGenPath;
-    }
-
-
-    /**
-     * Path representation of srcGenRoot, the root directory for generated
-     * sources. This is the root, meaning that if the source file is x/y/Z.lf
-     * relative to the package root, then the generated sources will be put in x/y/Z
-     * relative to this URI.
-     */
-    public Path getSrcGenBasePath() {
-        return srcGenBasePath;
-    }
-
-    /**
-     * The directory that denotes the root of the package to which the
-     * generated sources belong. Even if the target language does not have a
-     * notion of packages, this directory groups all files associated with a
-     * single main reactor.
-     */
-    public Path getSrcGenPkgPath() {
-        return srcGenPkgPath;
-    }
-
-    /**
-     * Returns the root directory for generated sources.
-     */
-    public static Path getSrcGenRoot(IFileSystemAccess2 fsa) throws IOException {
-        URI srcGenURI = fsa.getURI("");
-        if (srcGenURI.hasTrailingPathSeparator()) {
-            srcGenURI = srcGenURI.trimSegments(1);
-        }
-        return FileUtil.toPath(srcGenURI);
-    }
-
-    /**
-     * Given a path that denotes the full path to a source file (not including the
-     * file itself), return the relative path from the root of the 'src'
-     * directory, or, if there is no 'src' directory, the relative path
-     * from the root of the package.
-     * @param srcPath The path to the source.
-     * @return the relative path from the root of the 'src'
-     * directory, or, if there is no 'src' directory, the relative path
-     * from the root of the package
-     */
-    protected Path getSubPkgPath(Path srcPath) {
-        Path relSrcPath = srcPkgPath.relativize(srcPath);
-        if (relSrcPath.startsWith(DEFAULT_SRC_DIR)) {
-            int segments = relSrcPath.getNameCount();
-            if (segments == 1) {
-                return Paths.get("");
-            } else {
-                relSrcPath = relSrcPath.subpath(1, segments);
-            }
-        }
-        return relSrcPath;
-    }
-
-    /**
-     * Path representation of the root directory for generated
-     * verification models.
-     * This is the root, meaning that if the source file is x/y/Z.lf
-     * relative to the package root, then the generated sources will be put in x/y/Z
-     * relative to this URI.
-     */
-    public Path getModelGenBasePath() {
-        return modelGenBasePath;
-    }
-
-    /**
-     * The directory in which to put the generated verification models.
-     */
-    public Path getModelGenPath() {
-        return modelGenPath;
-    }
-
-    /**
-     * Clean any artifacts produced by the code generator and target compilers.
-     * <p>
-     * The base implementation deletes the bin and src-gen directories. If the
-     * target code generator creates additional files or directories, the
-     * corresponding generator should override this method.
-     *
-     * @throws IOException If an I/O error occurs.
-     */
-    public void doClean() throws IOException {
-        FileUtil.deleteDirectory(binPath);
-        FileUtil.deleteDirectory(srcGenBasePath);
-        FileUtil.deleteDirectory(modelGenBasePath);
-    }
-
-    private static Path getPkgPath(Resource resource) throws IOException {
-        if (resource.getURI().isPlatform()) {
-            // We are in the RCA.
-            Path srcFile = FileUtil.toPath(resource);
-            for (IProject r : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
-                Path p = Paths.get(r.getLocation().toFile().getAbsolutePath());
-                Path f = srcFile.toAbsolutePath();
-                if (f.startsWith(p)) {
-                    return p;
-                }
-            }
-        }
-        return findPackageRoot(FileUtil.toPath(resource), s -> {});
-    }
-
-    /**
-     * Find the package root by looking for an 'src'
-     * directory. If none can be found, return the current
-     * working directory instead.
-     *
-     * @param input The *.lf file to find the package root
-     *              for.
-     * @return The package root, or the current working
-     * directory if none exists.
-     */
-    public static Path findPackageRoot(final Path input, final Consumer<String> printWarning) {
-        Path p = input;
-        do {
-            p = p.getParent();
-            if (p == null) {
-                printWarning.accept("File '" + input.getFileName() + "' is not located in an 'src' directory.");
-                printWarning.accept("Adopting the current working directory as the package root.");
-                return Paths.get(".").toAbsolutePath(); // todo #1478 replace with Io::getWd
-            }
-        } while (!p.toFile().getName().equals("src"));
-        return p.getParent();
-    }
-
-    /**
-     * Return an LFCommand instance that can be used to execute the program under compilation.
-     */
-    public LFCommand getCommand() {
-        String cmd = GeneratorUtils.isHostWindows() ?
-            getExecutable().toString() :
-            srcPkgPath.relativize(getExecutable()).toString();
-        return LFCommand.get(cmd, List.of(), true, srcPkgPath);
-    }
-
-    /**
-     * Return the extension used for binaries on the platform on which compilation takes place.
-     */
-    protected String getExecutableExtension() {
-        return (GeneratorUtils.isHostWindows() ? ".exe" : "");
-    }
-
-    /**
-     * Return a path to an executable version of the program under compilation.
-     */
-    public Path getExecutable() {
-        return binPath.resolve(name + getExecutableExtension());
-    }
-}
diff --git a/org.lflang/src/org/lflang/TargetConfig.java b/org.lflang/src/org/lflang/TargetConfig.java
deleted file mode 100644
index 3f401427fb..0000000000
--- a/org.lflang/src/org/lflang/TargetConfig.java
+++ /dev/null
@@ -1,514 +0,0 @@
-/*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
-package org.lflang;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Properties;
-import java.util.Set;
-
-import org.lflang.TargetProperty.BuildType;
-import org.lflang.TargetProperty.ClockSyncMode;
-import org.lflang.TargetProperty.CoordinationType;
-import org.lflang.TargetProperty.LogLevel;
-import org.lflang.TargetProperty.Platform;
-import org.lflang.TargetProperty.SchedulerOption;
-import org.lflang.TargetProperty.UnionType;
-import org.lflang.generator.rust.RustTargetConfig;
-import org.lflang.lf.KeyValuePair;
-import org.lflang.lf.TargetDecl;
-
-/**
- * A class for keeping the current target configuration.
- *
- * Class members of type String are initialized as empty strings,
- * unless otherwise stated.
- * @author Marten Lohstroh
- */
-public class TargetConfig {
-
-    /**
-     * The target of this configuration (e.g., C, TypeScript, Python).
-     */
-    public final Target target;
-
-    /**
-     * Create a new target configuration based on the given target declaration AST node only.
-     * @param target AST node of a target declaration.
-     */
-    public TargetConfig(TargetDecl target) { // FIXME: eliminate this constructor if we can
-        this.target = Target.fromDecl(target);
-    }
-
-    /**
-     * Create a new target configuration based on the given commandline arguments and target
-     * declaration AST node.
-     * @param cliArgs Arguments passed on the commandline.
-     * @param target AST node of a target declaration.
-     * @param errorReporter An error reporter to report problems.
-     */
-    public TargetConfig(
-        Properties cliArgs,
-        TargetDecl target,
-        ErrorReporter errorReporter
-    ) {
-        this(target);
-        if (target.getConfig() != null) {
-            List<KeyValuePair> pairs = target.getConfig().getPairs();
-            TargetProperty.set(this, pairs != null ? pairs : List.of(), errorReporter);
-        }
-        if (cliArgs.containsKey("no-compile")) {
-            this.noCompile = true;
-        }
-        if (cliArgs.containsKey("no-verify")) {
-            this.noVerify = true;
-        }
-        if (cliArgs.containsKey("docker")) {
-            var arg = cliArgs.getProperty("docker");
-            if (Boolean.parseBoolean(arg)) {
-                this.dockerOptions = new DockerOptions();
-            } else {
-                this.dockerOptions = null;
-            }
-            // FIXME: this is pretty ad-hoc and does not account for more complex overrides yet.
-        }
-        if (cliArgs.containsKey("build-type")) {
-            this.cmakeBuildType = (BuildType) UnionType.BUILD_TYPE_UNION.forName(cliArgs.getProperty("build-type"));
-        }
-        if (cliArgs.containsKey("logging")) {
-            this.logLevel = LogLevel.valueOf(cliArgs.getProperty("logging").toUpperCase());
-        }
-        if (cliArgs.containsKey("workers")) {
-            this.workers = Integer.parseInt(cliArgs.getProperty("workers"));
-        }
-        if (cliArgs.containsKey("threading")) {
-            this.threading = Boolean.parseBoolean(cliArgs.getProperty("threading"));
-        }
-        if (cliArgs.containsKey("target-compiler")) {
-            this.compiler = cliArgs.getProperty("target-compiler");
-        }
-        if (cliArgs.containsKey("tracing")) {
-            this.tracing = new TracingOptions();
-        }
-        if (cliArgs.containsKey("scheduler")) {
-            this.schedulerType = SchedulerOption.valueOf(
-                cliArgs.getProperty("scheduler")
-            );
-            this.setByUser.add(TargetProperty.SCHEDULER);
-        }
-        if (cliArgs.containsKey("target-flags")) {
-            this.compilerFlags.clear();
-            if (!cliArgs.getProperty("target-flags").isEmpty()) {
-                this.compilerFlags.addAll(List.of(
-                    cliArgs.getProperty("target-flags").split(" ")
-                ));
-            }
-        }
-        if (cliArgs.containsKey("runtime-version")) {
-            this.runtimeVersion = cliArgs.getProperty("runtime-version");
-        }
-        if (cliArgs.containsKey("external-runtime-path")) {
-            this.externalRuntimePath = cliArgs.getProperty("external-runtime-path");
-        }
-        if (cliArgs.containsKey(TargetProperty.KEEPALIVE.description)) {
-            this.keepalive = Boolean.parseBoolean(
-                cliArgs.getProperty(TargetProperty.KEEPALIVE.description));
-        }
-    }
-
-    /**
-     * Keep track of every target property that is explicitly set by the user.
-     */
-    public Set<TargetProperty> setByUser = new HashSet<>();
-
-    /**
-     * A list of custom build commands that replace the default build process of
-     * directly invoking a designated compiler. A common usage of this target
-     * property is to set the command to build on the basis of a Makefile.
-     */
-    public List<String> buildCommands = new ArrayList<>();
-
-    /**
-     * The mode of clock synchronization to be used in federated programs.
-     * The default is 'initial'.
-     */
-    public ClockSyncMode clockSync = ClockSyncMode.INIT;
-
-    /**
-     * Clock sync options.
-     */
-    public ClockSyncOptions clockSyncOptions = new ClockSyncOptions();
-
-    /**
-     * Parameter passed to cmake. The default is 'Release'.
-     */
-    public BuildType cmakeBuildType = BuildType.RELEASE;
-
-    /**
-     * Optional additional extensions to include in the generated CMakeLists.txt.
-     */
-    public List<String> cmakeIncludes = new ArrayList<>();
-
-    /**
-     * List of cmake-includes from the cmake-include target property with no path info.
-     * Useful for copying them to remote machines. This is needed because
-     * target cmake-includes can be resources with resource paths.
-     */
-    public List<String> cmakeIncludesWithoutPath = new ArrayList<>();
-
-    /**
-     * The compiler to invoke, unless a build command has been specified.
-     */
-    public String compiler = "";
-
-    /**
-     * Additional sources to add to the compile command if appropriate.
-     */
-    public List<String> compileAdditionalSources = new ArrayList<>();
-
-    /**
-     * Additional (preprocessor) definitions to add to the compile command if appropriate.
-     *
-     * The first string is the definition itself, and the second string is the value to attribute to that definition, if any.
-     * The second value could be left empty.
-     */
-    public Map<String, String> compileDefinitions = new HashMap<>();
-
-    /**
-     * Additional libraries to add to the compile command using the "-l" command-line option.
-     */
-    public List<String> compileLibraries = new ArrayList<>();
-
-    /**
-     * Flags to pass to the compiler, unless a build command has been specified.
-     */
-    public List<String> compilerFlags = new ArrayList<>();
-
-    /**
-     * The type of coordination used during the execution of a federated program.
-     * The default is 'centralized'.
-     */
-    public CoordinationType coordination = CoordinationType.CENTRALIZED;
-
-    /**
-     * Docker options.
-     */
-    public DockerOptions dockerOptions = null;
-
-    /**
-     * Coordination options.
-     */
-    public CoordinationOptions coordinationOptions = new CoordinationOptions();
-
-    /**
-     * Link to an external runtime library instead of the default one.
-     */
-    public String externalRuntimePath = null;
-
-    /**
-     * If true, configure the execution environment such that it does not
-     * wait for physical time to match logical time. The default is false.
-     */
-    public boolean fastMode = false;
-
-    /**
-     * List of files to be copied to src-gen.
-     */
-    public List<String> fileNames = new ArrayList<>();
-
-    /**
-     * List of file names from the files target property with no path info.
-     * Useful for copying them to remote machines. This is needed because
-     * target files can be resources with resource paths.
-     */
-    public List<String> filesNamesWithoutPath = new ArrayList<>();
-
-    /**
-     * If true, configure the execution environment to keep executing if there
-     * are no more events on the event queue. The default is false.
-     */
-    public boolean keepalive = false;
-
-    /**
-     * The level of logging during execution. The default is INFO.
-     */
-    public LogLevel logLevel = LogLevel.INFO;
-
-    /**
-     * Flags to pass to the linker, unless a build command has been specified.
-     */
-    public String linkerFlags = "";
-
-    /**
-     * If true, do not invoke the target compiler or build command.
-     * The default is false.
-     */
-    public boolean noCompile = false;
-
-    /**
-     * If true, do not perform runtime validation. The default is false.
-     */
-    public boolean noRuntimeValidation = false;
-
-    /**
-     * If true, do not check the generated verification model.
-     * The default is false.
-     */
-    public boolean noVerify = false;
-
-    /**
-     * Set the target platform config.
-     * This tells the build system what platform-specific support
-     * files it needs to incorporate at compile time.
-     * 
-     * This is now a wrapped class to account for overloaded definitions 
-     * of defining platform (either a string or dictionary of values)
-     */
-    public PlatformOptions platformOptions = new PlatformOptions();
-
-    /**
-     * List of proto files to be processed by the code generator.
-     */
-    public List<String> protoFiles = new ArrayList<>();
-
-    /**
-     * If true, generate ROS2 specific code.
-     */
-    public boolean ros2 = false;
-
-    /**
-     * Additional ROS2 packages that the LF program depends on.
-     */
-    public List<String> ros2Dependencies = null;
-
-    /**
-     * The version of the runtime library to be used in the generated target.
-     */
-    public String runtimeVersion = null;
-
-    /** Whether all reactors are to be generated into a single target language file. */
-    public boolean singleFileProject = false;
-
-    /** What runtime scheduler to use. */
-    public SchedulerOption schedulerType = SchedulerOption.getDefault();
-
-    /**
-     * The number of worker threads to deploy. The default is zero, which indicates that
-     * the runtime is allowed to freely choose the number of workers.
-     */
-    public int workers = 0;
-
-    /**
-     * Indicate whether HMAC authentication is used.
-     */
-    public boolean auth = false;
-
-    /**
-     * Indicate whether the runtime should use multithreaded execution.
-     */
-    public boolean threading = true;
-
-    /**
-     * The timeout to be observed during execution of the program.
-     */
-    public TimeValue timeout;
-
-    /**
-     * If non-null, configure the runtime environment to perform tracing.
-     * The default is null.
-     */
-    public TracingOptions tracing = null;
-
-
-    /**
-     * If true, the resulting binary will output a graph visualizing all reaction dependencies.
-     *
-     * This option is currently only used for C++ and Rust. This export function is a valuable tool
-     * for debugging LF programs and helps to understand the dependencies inferred by the runtime.
-     */
-    public boolean exportDependencyGraph = false;
-
-
-    /**
-     * If true, the resulting binary will output a yaml file describing the whole reactor structure
-     * of the program.
-     *
-     * This option is currently only used for C++. This export function is a valuable tool for debugging
-     * LF programs and performing external analysis.
-     */
-    public boolean exportToYaml = false;
-
-    /** Rust-specific configuration. */
-    public final RustTargetConfig rust = new RustTargetConfig(); // FIXME: https://issue.lf-lang.org/1558
-
-    /** Path to a C file used by the Python target to setup federated execution. */
-    public String fedSetupPreamble = null; // FIXME: https://issue.lf-lang.org/1558
-
-    /**
-     * Settings related to clock synchronization.
-     */
-    public static class ClockSyncOptions {
-
-        /**
-         * Dampen the adjustments to the clock synchronization offset by this rate.
-         * The default is 10.
-         */
-        public int attenuation = 10;
-
-        /**
-         * Whether to collect statistics while performing clock synchronization.
-         * This setting is only considered when clock synchronization has been activated.
-         * The default is true.
-         */
-        public boolean collectStats = true;
-
-        /**
-         * Enable clock synchronization for federates on the same machine.
-         * Default is false.
-         */
-        public boolean localFederatesOn = false;
-
-
-        /**
-         * Interval at which clock synchronization is initiated by the RTI (will be passed
-         * to it as an argument on the command-line).
-         * The default is 5 milliseconds.
-         */
-        public TimeValue period = new TimeValue(5, TimeUnit.MILLI);
-
-        /**
-         * Indicate the number of exchanges to be had per each clock synchronization round.
-         * See /lib/core/federated/clock-sync.h for more details.
-         * The default is 10.
-         */
-        public int trials = 10;
-
-        /**
-         * Used to create an artificial clock synchronization error for the purpose of testing.
-         * The default is null.
-         */
-        public TimeValue testOffset;
-    }
-
-    /**
-     * Settings related to coordination of federated execution.
-     */
-    public static class CoordinationOptions {
-
-        /**
-         * For centralized coordination, if a federate has a physical action that can trigger
-         * an output, directly or indirectly, then it will send NET (next event tag) messages
-         * to the RTI periodically as its physical clock advances. This option sets the amount
-         * of time to wait between sending such messages. Increasing this value results in
-         * downstream federates that lag further behind physical time (if the "after" delays
-         * are insufficient).
-         * The default is null, which means it is up the implementation to choose an interval.
-         */
-        public TimeValue advance_message_interval = null;
-    }
-
-    /**
-     * Settings related to Docker options.
-     */
-    public static class DockerOptions {
-        /**
-         * The base image and tag from which to build the Docker image. The default is "alpine:latest".
-         */
-        public String from = "alpine:latest";
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            DockerOptions that = (DockerOptions) o;
-            return from.equals(that.from);
-        }
-    }
-
-    /**
-     * Settings related to Platform Options.
-     */
-    public static class PlatformOptions {
-        
-        /**
-         * The base platform we build our LF Files on. Should be set to AUTO by default unless developing for specific OS/Embedded Platform
-         */
-        public Platform platform = Platform.AUTO;
-
-        /**
-         * The string value used to determine what type of embedded board we work with and can be used to simplify the build process. For example,
-         * when we want to flash to an Arduino Nano 33 BLE board, we can use the string arduino:mbed_nano:nano33ble
-         */
-        public String board = null;
-
-
-        /**
-         * The string value used to determine the port on which to flash the compiled program (i.e. /dev/cu.usbmodem21301)
-         */
-        public String port = null;
-
-        /**
-         * The baud rate used as a parameter to certain embedded platforms. 9600 is a standard rate amongst systems like Arduino, so it's the default value.
-         */
-        public int baudRate = 9600;
-
-        /**
-         * The boolean statement used to determine whether we should automatically attempt to flash once we compile. This may require the use of board and
-         * port values depending on the infrastructure you use to flash the boards.
-         */
-        public boolean flash = false;
-    }   
-
-    /**
-     * Settings related to tracing options.
-     */
-    public static class TracingOptions {
-        /**
-         * The name to use as the root of the trace file produced.
-         * This defaults to the name of the .lf file.
-         */
-        public String traceFileName = null;
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            TracingOptions that = (TracingOptions) o;
-            return Objects.equals(traceFileName, that.traceFileName); // traceFileName may be null
-        }
-    }
-}
diff --git a/org.lflang/src/org/lflang/TargetProperty.java b/org.lflang/src/org/lflang/TargetProperty.java
deleted file mode 100644
index 70f10f8560..0000000000
--- a/org.lflang/src/org/lflang/TargetProperty.java
+++ /dev/null
@@ -1,1872 +0,0 @@
-/*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
-
-package org.lflang;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import org.eclipse.xtext.util.RuntimeIOException;
-import org.lflang.TargetConfig.DockerOptions;
-import org.lflang.TargetConfig.PlatformOptions;
-import org.lflang.TargetConfig.TracingOptions;
-import org.lflang.generator.InvalidLfSourceException;
-import org.lflang.generator.rust.CargoDependencySpec;
-import org.lflang.generator.rust.CargoDependencySpec.CargoDependenciesPropertyType;
-import org.lflang.lf.Array;
-import org.lflang.lf.Element;
-import org.lflang.lf.KeyValuePair;
-import org.lflang.lf.KeyValuePairs;
-import org.lflang.lf.LfFactory;
-import org.lflang.lf.TargetDecl;
-import org.lflang.util.FileUtil;
-import org.lflang.util.StringUtil;
-import org.lflang.validation.LFValidator;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * A target properties along with a type and a list of supporting targets
- * that supports it, as well as a function for configuration updates.
- *
- * @author Marten Lohstroh
- */
-public enum TargetProperty {
-    /**
-     * Directive to allow including OpenSSL libraries and process HMAC authentication.
-     */
-    AUTH("auth", PrimitiveType.BOOLEAN,
-            Arrays.asList(Target.C, Target.CCPP),
-         (config) -> ASTUtils.toElement(config.auth),
-         (config, value, err) -> {
-                config.auth = ASTUtils.toBoolean(value);
-            }),
-    /**
-     * Directive to let the generator use the custom build command.
-     */
-    BUILD("build", UnionType.STRING_OR_STRING_ARRAY,
-            Arrays.asList(Target.C, Target.CCPP),
-            (config) -> ASTUtils.toElement(config.buildCommands),
-            (config, value, err) -> {
-                config.buildCommands = ASTUtils.elementToListOfStrings(value);
-            }),
-
-    /**
-     * Directive to specify the target build type such as 'Release' or 'Debug'.
-     * This is also used in the Rust target to select a Cargo profile.
-     */
-    BUILD_TYPE("build-type", UnionType.BUILD_TYPE_UNION,
-            Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Rust),
-            (config) -> ASTUtils.toElement(config.cmakeBuildType.toString()),
-            (config, value, err) -> {
-                config.cmakeBuildType = (BuildType) UnionType.BUILD_TYPE_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-                // set it there too, because the default is different.
-                config.rust.setBuildType(config.cmakeBuildType);
-            }),
-
-    /**
-     * Directive to let the federate execution handle clock synchronization in software.
-     */
-    CLOCK_SYNC("clock-sync", UnionType.CLOCK_SYNC_UNION,
-               Arrays.asList(Target.C, Target.CCPP, Target.Python),
-               (config) -> ASTUtils.toElement(config.clockSync.toString()),
-               (config, value, err) -> {
-                    config.clockSync = (ClockSyncMode) UnionType.CLOCK_SYNC_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-               }),
-    /**
-     * Key-value pairs giving options for clock synchronization.
-     */
-    CLOCK_SYNC_OPTIONS("clock-sync-options",
-            DictionaryType.CLOCK_SYNC_OPTION_DICT, Arrays.asList(Target.C, Target.CCPP, Target.Python),
-            (config) -> {
-                Element e = LfFactory.eINSTANCE.createElement();
-                KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                for (ClockSyncOption opt : ClockSyncOption.values()) {
-                    KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                    pair.setName(opt.toString());
-                    switch (opt) {
-                        case ATTENUATION:
-                            pair.setValue(ASTUtils.toElement(config.clockSyncOptions.attenuation));
-                            break;
-                        case COLLECT_STATS:
-                            pair.setValue(ASTUtils.toElement(config.clockSyncOptions.collectStats));
-                            break;
-                        case LOCAL_FEDERATES_ON:
-                            pair.setValue(ASTUtils.toElement(config.clockSyncOptions.localFederatesOn));
-                            break;
-                        case PERIOD:
-                            if (config.clockSyncOptions.period == null) continue; // don't set if null
-                            pair.setValue(ASTUtils.toElement(config.clockSyncOptions.period));
-                            break;
-                        case TEST_OFFSET:
-                            if (config.clockSyncOptions.testOffset == null) continue; // don't set if null
-                            pair.setValue(ASTUtils.toElement(config.clockSyncOptions.testOffset));
-                            break;
-                        case TRIALS:
-                            pair.setValue(ASTUtils.toElement(config.clockSyncOptions.trials));
-                            break;
-                    }
-                    kvp.getPairs().add(pair);
-                }
-                e.setKeyvalue(kvp);
-                // kvp will never be empty
-                return e;
-            },
-            (config, value, err) -> {
-                for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                    ClockSyncOption option = (ClockSyncOption) DictionaryType.CLOCK_SYNC_OPTION_DICT
-                            .forName(entry.getName());
-                    switch (option) {
-                        case ATTENUATION:
-                            config.clockSyncOptions.attenuation = ASTUtils
-                                    .toInteger(entry.getValue());
-                            break;
-                        case COLLECT_STATS:
-                            config.clockSyncOptions.collectStats = ASTUtils
-                                    .toBoolean(entry.getValue());
-                            break;
-                        case LOCAL_FEDERATES_ON:
-                            config.clockSyncOptions.localFederatesOn = ASTUtils
-                                    .toBoolean(entry.getValue());
-                            break;
-                        case PERIOD:
-                            config.clockSyncOptions.period = ASTUtils
-                                    .toTimeValue(entry.getValue());
-                            break;
-                        case TEST_OFFSET:
-                            config.clockSyncOptions.testOffset = ASTUtils
-                                    .toTimeValue(entry.getValue());
-                            break;
-                        case TRIALS:
-                            config.clockSyncOptions.trials = ASTUtils
-                                    .toInteger(entry.getValue());
-                            break;
-                        default:
-                            break;
-                    }
-                }
-            }),
-
-    /**
-     * Directive to specify a cmake to be included by the generated build
-     * systems.
-     *
-     * This gives full control over the C/C++ build as any cmake parameters
-     * can be adjusted in the included file.
-     */
-    CMAKE_INCLUDE("cmake-include", UnionType.FILE_OR_FILE_ARRAY,
-            Arrays.asList(Target.CPP, Target.C, Target.CCPP),
-            (config) -> ASTUtils.toElement(config.cmakeIncludes),
-            (config, value, err) -> {
-                config.cmakeIncludes = ASTUtils.elementToListOfStrings(value);
-            },
-            // FIXME: This merging of lists is potentially dangerous since
-            // the incoming list of cmake-includes can belong to a .lf file that is
-            // located in a different location, and keeping just filename
-            // strings like this without absolute paths is incorrect.
-            (config, value, err) -> {
-                config.cmakeIncludes.addAll(ASTUtils.elementToListOfStrings(value));
-            }),
-    /**
-     * Directive to specify the target compiler.
-     */
-    COMPILER("compiler", PrimitiveType.STRING, Target.ALL,
-            (config) -> ASTUtils.toElement(config.compiler),
-            (config, value, err) -> {
-                config.compiler = ASTUtils.elementToSingleString(value);
-            }),
-
-    /**
-     * Directive to specify compile-time definitions.
-     */
-    COMPILE_DEFINITIONS("compile-definitions", StringDictionaryType.COMPILE_DEFINITION,
-            Arrays.asList(Target.C, Target.CCPP, Target.Python),
-            (config) -> ASTUtils.toElement(config.compileDefinitions),
-            (config, value, err) -> {
-                config.compileDefinitions = ASTUtils.elementToStringMaps(value);
-            }),
-
-    /**
-     * Directive to generate a Dockerfile. This is either a boolean,
-     * true or false, or a dictionary of options.
-     */
-    DOCKER("docker", UnionType.DOCKER_UNION,
-            Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS),
-            (config) -> {
-                if (config.dockerOptions == null) {
-                    return null;
-                } else if(config.dockerOptions.equals(new DockerOptions())) {
-                    // default configuration
-                    return ASTUtils.toElement(true);
-                } else {
-                    Element e = LfFactory.eINSTANCE.createElement();
-                    KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                    for (DockerOption opt : DockerOption.values()) {
-                        KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                        pair.setName(opt.toString());
-                        switch (opt) {
-                            case FROM:
-                                if (config.dockerOptions.from == null) continue;
-                                pair.setValue(ASTUtils.toElement(config.dockerOptions.from));
-                                break;
-                        }
-                        kvp.getPairs().add(pair);
-                    }
-                    e.setKeyvalue(kvp);
-                    if (kvp.getPairs().isEmpty()) return null;
-                    return e;
-                }
-            },
-            (config, value, err) -> setDockerProperty(config, value),
-            (config, value, err) -> setDockerProperty(config, value)),
-
-    /**
-     * Directive for specifying a path to an external runtime to be used for the
-     * compiled binary.
-     */
-    EXTERNAL_RUNTIME_PATH("external-runtime-path", PrimitiveType.STRING,
-            List.of(Target.CPP),
-            (config) -> ASTUtils.toElement(config.externalRuntimePath),
-            (config, value, err) -> {
-                config.externalRuntimePath = ASTUtils.elementToSingleString(value);
-            }),
-
-    /**
-     * Directive to let the execution engine allow logical time to elapse
-     * faster than physical time.
-     */
-    FAST("fast", PrimitiveType.BOOLEAN, Target.ALL,
-            (config) -> ASTUtils.toElement(config.fastMode),
-            (config, value, err) -> {
-                config.fastMode = ASTUtils.toBoolean(value);
-            }),
-
-    /**
-     * Directive to stage particular files on the class path to be
-     * processed by the code generator.
-     */
-    FILES("files", UnionType.FILE_OR_FILE_ARRAY, List.of(Target.C, Target.CCPP, Target.Python),
-            (config) -> ASTUtils.toElement(config.fileNames),
-            (config, value, err) -> {
-                config.fileNames = ASTUtils.elementToListOfStrings(value);
-            },
-            // FIXME: This merging of lists is potentially dangerous since
-            // the incoming list of files can belong to a .lf file that is
-            // located in a different location, and keeping just filename
-            // strings like this without absolute paths is incorrect.
-            (config, value, err) -> {
-                config.fileNames.addAll(ASTUtils.elementToListOfStrings(value));
-            }),
-
-    /**
-     * Flags to be passed on to the target compiler.
-     */
-    FLAGS("flags", UnionType.STRING_OR_STRING_ARRAY,
-            Arrays.asList(Target.C, Target.CCPP),
-            (config) -> ASTUtils.toElement(config.compilerFlags),
-            (config, value, err) -> {
-                config.compilerFlags = ASTUtils.elementToListOfStrings(value);
-            }),
-
-    /**
-     * Directive to specify the coordination mode
-     */
-    COORDINATION("coordination", UnionType.COORDINATION_UNION,
-            Arrays.asList(Target.C, Target.CCPP, Target.Python),
-            (config) -> ASTUtils.toElement(config.coordination.toString()),
-            (config, value, err) -> {
-                config.coordination = (CoordinationType) UnionType.COORDINATION_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-            },
-            (config, value, err) -> {
-                config.coordination = (CoordinationType) UnionType.COORDINATION_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-            }),
-
-    /**
-     * Key-value pairs giving options for clock synchronization.
-     */
-    COORDINATION_OPTIONS("coordination-options",
-            DictionaryType.COORDINATION_OPTION_DICT, Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS),
-            (config) -> {
-                Element e = LfFactory.eINSTANCE.createElement();
-                KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                for (CoordinationOption opt : CoordinationOption.values()) {
-                    KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                    pair.setName(opt.toString());
-                    switch (opt) {
-                        case ADVANCE_MESSAGE_INTERVAL:
-                            if (config.coordinationOptions.advance_message_interval == null) continue;
-                            pair.setValue(ASTUtils.toElement(config.coordinationOptions.advance_message_interval));
-                            break;
-                    }
-                    kvp.getPairs().add(pair);
-                }
-                e.setKeyvalue(kvp);
-                if (kvp.getPairs().isEmpty()) return null;
-                return e;
-            },
-            (config, value, err) -> {
-                for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                    CoordinationOption option = (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT
-                            .forName(entry.getName());
-                    switch (option) {
-                        case ADVANCE_MESSAGE_INTERVAL:
-                            config.coordinationOptions.advance_message_interval = ASTUtils
-                                    .toTimeValue(entry.getValue());
-                            break;
-                        default:
-                            break;
-                    }
-                }
-            },
-            (config, value, err) -> {
-             for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                 CoordinationOption option = (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT
-                     .forName(entry.getName());
-                 switch (option) {
-                 case ADVANCE_MESSAGE_INTERVAL:
-                     config.coordinationOptions.advance_message_interval = ASTUtils
-                         .toTimeValue(entry.getValue());
-                     break;
-                 default:
-                     break;
-                 }
-             }
-            }),
-
-    /**
-     * Directive to let the execution engine remain active also if there
-     * are no more events in the event queue.
-     */
-    KEEPALIVE("keepalive", PrimitiveType.BOOLEAN, Target.ALL,
-            (config) -> ASTUtils.toElement(config.keepalive),
-            (config, value, err) -> {
-                config.keepalive = ASTUtils.toBoolean(value);
-            }),
-
-    /**
-     * Directive to specify the grain at which to report log messages during execution.
-     */
-    LOGGING("logging", UnionType.LOGGING_UNION, Target.ALL,
-            (config) -> ASTUtils.toElement(config.logLevel.toString()),
-            (config, value, err) -> {
-                config.logLevel = (LogLevel) UnionType.LOGGING_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-            },
-            (config, value, err) -> {
-                config.logLevel = (LogLevel) UnionType.LOGGING_UNION
-                    .forName(ASTUtils.elementToSingleString(value));
-            }),
-
-    /**
-     * Directive to not invoke the target compiler.
-     */
-    NO_COMPILE("no-compile", PrimitiveType.BOOLEAN,
-            Arrays.asList(Target.C, Target.CPP, Target.CCPP, Target.Python),
-            (config) -> ASTUtils.toElement(config.noCompile),
-            (config, value, err) -> {
-                config.noCompile = ASTUtils.toBoolean(value);
-            }),
-
-    /**
-     * Directive to disable validation of reactor rules at runtime.
-     */
-    NO_RUNTIME_VALIDATION("no-runtime-validation", PrimitiveType.BOOLEAN,
-            Arrays.asList(Target.CPP),
-            (config) -> ASTUtils.toElement(config.noRuntimeValidation),
-            (config, value, err) -> {
-                config.noRuntimeValidation = ASTUtils.toBoolean(value);
-            }),
-
-    /**
-     * Directive to not check the generated verification model.
-     */
-    NO_VERIFY("no-verify", PrimitiveType.BOOLEAN,
-            Arrays.asList(Target.C),
-            (config) -> ASTUtils.toElement(config.noVerify),
-            (config, value, err) -> {
-                config.noVerify = ASTUtils.toBoolean(value);
-            }),
-
-    /**
-     * Directive to specify the platform for cross code generation. This is either a string of the platform
-     * or a dictionary of options that includes the string name. 
-     */
-    PLATFORM("platform", UnionType.PLATFORM_STRING_OR_DICTIONARY, Target.ALL,
-            (config) -> {
-                Element e = LfFactory.eINSTANCE.createElement();
-                KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                for (PlatformOption opt : PlatformOption.values()) {
-                    KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                    pair.setName(opt.toString());
-                    switch (opt) {
-                        case NAME:
-                            pair.setValue(ASTUtils.toElement(config.platformOptions.platform.toString()));
-                            break;
-                        case BAUDRATE:
-                            pair.setValue(ASTUtils.toElement(config.platformOptions.baudRate));
-                            break;
-                        case BOARD:
-                            pair.setValue(ASTUtils.toElement(config.platformOptions.board));
-                            break;
-                        case FLASH:
-                            pair.setValue(ASTUtils.toElement(config.platformOptions.flash));
-                            break;
-                        case PORT:
-                            pair.setValue(ASTUtils.toElement(config.platformOptions.port));
-                            break;
-                    }
-                    kvp.getPairs().add(pair);
-                }
-                e.setKeyvalue(kvp);
-                if (kvp.getPairs().isEmpty()) return null;
-                return e;
-            },
-            (config, value, err) -> {
-                if (value.getLiteral() != null) {
-                    config.platformOptions = new PlatformOptions();
-                    config.platformOptions.platform = (Platform) UnionType.PLATFORM_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-                } else {
-                    config.platformOptions= new PlatformOptions();
-                    for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                        PlatformOption option = (PlatformOption) DictionaryType.PLATFORM_DICT
-                                .forName(entry.getName());
-                        switch (option) {
-                            case NAME:
-                                Platform p = (Platform) UnionType.PLATFORM_UNION
-                                    .forName(ASTUtils.elementToSingleString(entry.getValue()));
-                                if(p == null) {
-                                    String s = "Unidentified Platform Type, LF supports the following platform types: " + Arrays.asList(Platform.values()).toString();
-                                    err.reportError(s);
-                                    throw new AssertionError(s);
-                                }
-                                config.platformOptions.platform = p;
-                                break;
-                            case BAUDRATE:
-                                config.platformOptions.baudRate = ASTUtils.toInteger(entry.getValue());
-                                break;
-                            case BOARD:
-                                config.platformOptions.board = ASTUtils.elementToSingleString(entry.getValue());
-                                break;
-                            case FLASH:
-                                config.platformOptions.flash = ASTUtils.toBoolean(entry.getValue());
-                                break;
-                            case PORT:
-                                config.platformOptions.port = ASTUtils.elementToSingleString(entry.getValue());
-                                break;
-                            default:
-                                break;
-                        }
-                    }
-                }
-            }),
-
-    /**
-     * Directive for specifying .proto files that need to be compiled and their
-     * code included in the sources.
-     */
-    PROTOBUFS("protobufs", UnionType.FILE_OR_FILE_ARRAY,
-            Arrays.asList(Target.C, Target.CCPP, Target.TS, Target.Python),
-            (config) -> ASTUtils.toElement(config.protoFiles),
-            (config, value, err) -> {
-                config.protoFiles = ASTUtils.elementToListOfStrings(value);
-            }),
-
-
-    /**
-     * Directive to specify that ROS2 specific code is generated,
-     */
-    ROS2("ros2", PrimitiveType.BOOLEAN,
-         List.of(Target.CPP),
-         (config) -> ASTUtils.toElement(config.ros2),
-         (config, value, err) -> {
-             config.ros2 = ASTUtils.toBoolean(value);
-    }),
-
-    /**
-     * Directive to specify additional ROS2 packages that this LF program depends on.
-     */
-    ROS2_DEPENDENCIES("ros2-dependencies", ArrayType.STRING_ARRAY,
-        List.of(Target.CPP),
-                      (config) -> ASTUtils.toElement(config.ros2Dependencies),
-                      (config, value, err) -> {
-            config.ros2Dependencies = ASTUtils.elementToListOfStrings(value);
-    }),
-
-    /**
-     * Directive for specifying a specific version of the reactor runtime library.
-     */
-    RUNTIME_VERSION("runtime-version", PrimitiveType.STRING,
-            Arrays.asList(Target.CPP),
-            (config) -> ASTUtils.toElement(config.runtimeVersion),
-            (config, value, err) -> {
-                config.runtimeVersion = ASTUtils.elementToSingleString(value);
-            }),
-
-
-    /**
-     * Directive for specifying a specific runtime scheduler, if supported.
-     */
-    SCHEDULER("scheduler", UnionType.SCHEDULER_UNION,
-            Arrays.asList(Target.C, Target.CCPP, Target.Python),
-            (config) -> ASTUtils.toElement(config.schedulerType.toString()),
-            (config, value, err) -> {
-                config.schedulerType = (SchedulerOption) UnionType.SCHEDULER_UNION
-                        .forName(ASTUtils.elementToSingleString(value));
-            }),
-
-    /**
-     * Directive to specify that all code is generated in a single file.
-     */
-    SINGLE_FILE_PROJECT("single-file-project", PrimitiveType.BOOLEAN,
-            List.of(Target.Rust),
-            (config) -> ASTUtils.toElement(config.singleFileProject),
-            (config, value, err) -> {
-                config.singleFileProject = ASTUtils.toBoolean(value);
-            }),
-
-    /**
-     * Directive to indicate whether the runtime should use multi-threading.
-     */
-    THREADING("threading", PrimitiveType.BOOLEAN,
-              List.of(Target.C, Target.CCPP, Target.Python),
-              (config) -> ASTUtils.toElement(config.threading),
-              (config, value, err) -> {
-                  config.threading = ASTUtils.toBoolean(value);
-              }),
-
-    /**
-     * Directive to specify the number of worker threads used by the runtime.
-     */
-    WORKERS("workers", PrimitiveType.NON_NEGATIVE_INTEGER,
-            List.of(Target.C, Target.CCPP, Target.Python, Target.CPP, Target.Rust),
-            (config) -> ASTUtils.toElement(config.workers),
-            (config, value, err) -> {
-                config.workers = ASTUtils.toInteger(value);
-            }),
-
-    /**
-     * Directive to specify the execution timeout.
-     */
-    TIMEOUT("timeout", PrimitiveType.TIME_VALUE, Target.ALL,
-            (config) -> ASTUtils.toElement(config.timeout),
-            (config, value, err) -> {
-                config.timeout = ASTUtils.toTimeValue(value);
-            },
-            (config, value, err) -> {
-                config.timeout = ASTUtils.toTimeValue(value);
-            }),
-
-    /**
-     * Directive to generate a Dockerfile. This is either a boolean,
-     * true or false, or a dictionary of options.
-     */
-    TRACING("tracing", UnionType.TRACING_UNION,
-            Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Python),
-            (config) -> {
-                if (config.tracing == null) {
-                    return null;
-                } else if (config.tracing.equals(new TracingOptions())) {
-                    // default values
-                    return ASTUtils.toElement(true);
-                } else {
-                    Element e = LfFactory.eINSTANCE.createElement();
-                    KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                    for (TracingOption opt : TracingOption.values()) {
-                        KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                        pair.setName(opt.toString());
-                        switch (opt) {
-                            case TRACE_FILE_NAME:
-                                 if (config.tracing.traceFileName == null) continue;
-                                 pair.setValue(ASTUtils.toElement(config.tracing.traceFileName));
-                        }
-                        kvp.getPairs().add(pair);
-                    }
-                    e.setKeyvalue(kvp);
-                    if (kvp.getPairs().isEmpty()) return null;
-                    return e;
-                }
-            },
-            (config, value, err) -> {
-                if (value.getLiteral() != null) {
-                    if (ASTUtils.toBoolean(value)) {
-                        config.tracing = new TracingOptions();
-                    } else {
-                        config.tracing = null;
-                    }
-                } else {
-                    config.tracing = new TracingOptions();
-                    for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                        TracingOption option = (TracingOption) DictionaryType.TRACING_DICT
-                            .forName(entry.getName());
-                        switch (option) {
-                        case TRACE_FILE_NAME:
-                            config.tracing.traceFileName = ASTUtils.elementToSingleString(entry.getValue());
-                            break;
-                        default:
-                            break;
-                        }
-                    }
-                }
-            }),
-
-    /**
-     * Directive to let the runtime export its internal dependency graph.
-     *
-     * This is a debugging feature and currently only used for C++ and Rust programs.
-     */
-    EXPORT_DEPENDENCY_GRAPH("export-dependency-graph", PrimitiveType.BOOLEAN,
-                           List.of(Target.CPP, Target.Rust),
-                           (config) -> ASTUtils.toElement(config.exportDependencyGraph),
-                           (config, value, err) -> {
-        config.exportDependencyGraph = ASTUtils.toBoolean(value);
-    }),
-
-    /**
-     * Directive to let the runtime export the program structure to a yaml file.
-     *
-     * This is a debugging feature and currently only used for C++ programs.
-     */
-    EXPORT_TO_YAML("export-to-yaml", PrimitiveType.BOOLEAN,
-                           List.of(Target.CPP),
-                           (config) -> ASTUtils.toElement(config.exportToYaml),
-                           (config, value, err) -> {
-                               config.exportToYaml = ASTUtils.toBoolean(value);
-                           }),
-
-    /**
-     * List of module files to link into the crate as top-level.
-     * For instance, a {@code target Rust { rust-modules: [ "foo.rs" ] }}
-     * will cause the file to be copied into the generated project,
-     * and the generated `main.rs` will include it with a `mod foo;`.
-     * If one of the paths is a directory, it must contain a `mod.rs`
-     * file, and all its contents are copied.
-     */
-    RUST_INCLUDE("rust-include",
-                 UnionType.FILE_OR_FILE_ARRAY,
-                 List.of(Target.Rust),
-                 (config) -> {
-                    // do not check paths here, and simply copy the absolute path over
-                    List<Path> paths = config.rust.getRustTopLevelModules();
-                    if (paths.isEmpty()) return null;
-                    else if (paths.size() == 1) {
-                        return ASTUtils.toElement(paths.get(0).toString());
-                    } else {
-                        Element e = LfFactory.eINSTANCE.createElement();
-                        Array arr = LfFactory.eINSTANCE.createArray();
-                        for (Path p : paths) {
-                            arr.getElements().add(ASTUtils.toElement(p.toString()));
-                        }
-                        e.setArray(arr);
-                        return e;
-                    }
-                 },
-                (config, value, err) -> {
-                    Path referencePath;
-                    try {
-                        referencePath = FileUtil.toPath(value.eResource().getURI()).toAbsolutePath();
-                    } catch (IOException e) {
-                        err.reportError(value, "Invalid path? " + e.getMessage());
-                        throw new RuntimeIOException(e);
-                    }
-
-                    // we'll resolve relative paths to check that the files
-                    // are as expected.
-
-                    if (value.getLiteral() != null) {
-                        Path resolved = referencePath.resolveSibling(StringUtil.removeQuotes(value.getLiteral()));
-
-                        config.rust.addAndCheckTopLevelModule(resolved, value, err);
-                    } else if (value.getArray() != null) {
-                        for (Element element : value.getArray().getElements()) {
-                            String literal = StringUtil.removeQuotes(element.getLiteral());
-                            Path resolved = referencePath.resolveSibling(literal);
-                            config.rust.addAndCheckTopLevelModule(resolved, element, err);
-                        }
-                    }
-                }),
-
-    /**
-     * Directive for specifying Cargo features of the generated
-     * program to enable.
-     */
-    CARGO_FEATURES("cargo-features", ArrayType.STRING_ARRAY,
-                   List.of(Target.Rust),
-                   (config) -> ASTUtils.toElement(config.rust.getCargoFeatures()),
-                   (config, value, err) -> {
-        config.rust.setCargoFeatures(ASTUtils.elementToListOfStrings(value));
-    }),
-
-    /**
-     * Dependency specifications for Cargo. This property looks like this:
-     * <pre>{@code
-     * cargo-dependencies: {
-     *    // Name-of-the-crate: "version"
-     *    rand: "0.8",
-     *    // Equivalent to using an explicit map:
-     *    rand: {
-     *      version: "0.8"
-     *    },
-     *    // The map allows specifying more details
-     *    rand: {
-     *      // A path to a local unpublished crate.
-     *      // Note 'path' is mutually exclusive with 'version'.
-     *      path: "/home/me/Git/local-rand-clone"
-     *    },
-     *    rand: {
-     *      version: "0.8",
-     *      // you can specify cargo features
-     *      features: ["some-cargo-feature",]
-     *    }
-     * }
-     * }</pre>
-     */
-    CARGO_DEPENDENCIES("cargo-dependencies",
-                       CargoDependenciesPropertyType.INSTANCE,
-                       List.of(Target.Rust),
-                       (config) -> {
-                            var deps = config.rust.getCargoDependencies();
-                            if (deps.size() == 0) return null;
-                            else {
-                                Element e = LfFactory.eINSTANCE.createElement();
-                                KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                                for (var ent : deps.entrySet()) {
-                                    KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                                    pair.setName(ent.getKey());
-                                    pair.setValue(CargoDependencySpec.extractSpec(ent.getValue()));
-                                    kvp.getPairs().add(pair);
-                                }
-                                e.setKeyvalue(kvp);
-                                return e;
-                            }
-                       },
-                       (config, value, err) -> {
-                            config.rust.setCargoDependencies(CargoDependencySpec.parseAll(value));
-    }),
-
-    /**
-     * Directs the C or Python target to include the associated C file used for
-     * setting up federated execution before processing the first tag.
-     */
-    FED_SETUP("_fed_setup", PrimitiveType.FILE,
-              Arrays.asList(Target.C, Target.CCPP, Target.Python),
-              (config) -> ASTUtils.toElement(config.fedSetupPreamble),
-              (config, value, err) ->
-                  config.fedSetupPreamble = StringUtil.removeQuotes(ASTUtils.elementToSingleString(value))
-    )
-    ;
-
-    /**
-     * Update {@code config}.dockerOptions based on value.
-     */
-    private static void setDockerProperty(TargetConfig config, Element value) {
-        if (value.getLiteral() != null) {
-            if (ASTUtils.toBoolean(value)) {
-                config.dockerOptions = new DockerOptions();
-            } else {
-                config.dockerOptions = null;
-            }
-        } else {
-            config.dockerOptions = new DockerOptions();
-            for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                DockerOption option = (DockerOption) DictionaryType.DOCKER_DICT
-                        .forName(entry.getName());
-                switch (option) {
-                    case FROM:
-                        config.dockerOptions.from = ASTUtils.elementToSingleString(entry.getValue());
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-    }
-
-    /**
-     * String representation of this target property.
-     */
-    public final String description;
-
-    /**
-     * List of targets that support this property. If a property is used for
-     * a target that does not support it, a warning reported during
-     * validation.
-     */
-    public final List<Target> supportedBy;
-
-    /**
-     * The type of values that can be assigned to this property.
-     */
-    public final TargetPropertyType type;
-
-    /**
-     * Function that given a configuration object and an Element AST node
-     * sets the configuration. It is assumed that validation already
-     * occurred, so this code should be straightforward.
-     */
-    public final PropertyParser setter;
-
-    /**
-     * Function that given a configuration object and an Element AST node
-     * sets the configuration. It is assumed that validation already
-     * occurred, so this code should be straightforward.
-     */
-    public final PropertyParser updater;
-
-    @FunctionalInterface
-    private interface PropertyParser {
-
-        /**
-         * Parse the given element into the given target config.
-         * May use the error reporter to report format errors.
-         */
-        void parseIntoTargetConfig(TargetConfig config, Element element, ErrorReporter err);
-    }
-
-    public final PropertyGetter getter;
-
-    @FunctionalInterface
-    private interface PropertyGetter {
-
-        /**
-         * Read this property from the target config and build an element which represents it for the AST.
-         * May return null if the given value of this property is the same as the default.
-         */
-        Element getPropertyElement(TargetConfig config);
-    }
-
-    /**
-     * Private constructor for target properties.
-     *
-     * @param description String representation of this property.
-     * @param type        The type that values assigned to this property
-     *                    should conform to.
-     * @param supportedBy List of targets that support this property.
-     * @param setter      Function for configuration updates.
-     */
-    TargetProperty(String description, TargetPropertyType type,
-                   List<Target> supportedBy,
-                   PropertyGetter getter,
-                   PropertyParser setter) {
-        this.description = description;
-        this.type = type;
-        this.supportedBy = supportedBy;
-        this.getter = getter;
-        this.setter = setter;
-        this.updater = setter; // (Re)set by default
-    }
-
-    /**
-     * Private constructor for target properties. This will take an additional
-     * `updater`, which will be used to merge target properties from imported resources.
-     *
-     * @param description String representation of this property.
-     * @param type        The type that values assigned to this property
-     *                    should conform to.
-     * @param supportedBy List of targets that support this property.
-     * @param setter      Function for setting configuration values.
-     * @param updater     Function for updating configuration values.
-     */
-    TargetProperty(String description, TargetPropertyType type,
-                   List<Target> supportedBy,
-                   PropertyGetter getter,
-                   PropertyParser setter,
-                   PropertyParser updater) {
-        this.description = description;
-        this.type = type;
-        this.supportedBy = supportedBy;
-        this.getter = getter;
-        this.setter = setter;
-        this.updater = updater;
-    }
-
-    /**
-     * Return the name of the property in lingua franca. This
-     * is suitable for use as a key in a target properties block.
-     * It may be an invalid identifier in other languages (may
-     * contains dashes {@code -}).
-     */
-    public String getDisplayName() {
-        return description;
-    }
-
-    /**
-     * Set the given configuration using the given target properties.
-     *
-     * @param config     The configuration object to update.
-     * @param properties AST node that holds all the target properties.
-     * @param err        Error reporter on which property format errors will be reported
-     */
-    public static void set(TargetConfig config, List<KeyValuePair> properties, ErrorReporter err) {
-        properties.forEach(property ->  {
-            TargetProperty p = forName(property.getName());
-            if (p != null) {
-                // Mark the specified target property as set by the user
-                config.setByUser.add(p);
-                try {
-                    p.setter.parseIntoTargetConfig(config, property.getValue(), err);
-                } catch (InvalidLfSourceException e) {
-                    err.reportError(e.getNode(), e.getProblem());
-                }
-            }
-        });
-    }
-
-    /**
-     * Extracts all properties as a list of key-value pairs from a TargetConfig. Only extracts properties explicitly set by user.
-     * @param config The TargetConfig to extract from.
-     * @return The extracted properties.
-     */
-    public static List<KeyValuePair> extractProperties(TargetConfig config) {
-        var res = new LinkedList<KeyValuePair>();
-        for (TargetProperty p : config.setByUser) {
-            KeyValuePair kv = LfFactory.eINSTANCE.createKeyValuePair();
-            kv.setName(p.toString());
-            kv.setValue(p.getter.getPropertyElement(config));
-            if (kv.getValue() != null)
-                res.add(kv);
-        }
-        return res;
-    }
-
-    /**
-     * Constructs a TargetDecl by extracting the fields of the given TargetConfig.
-     * @param target  The target to generate for.
-     * @param config  The TargetConfig to extract from.
-     * @return        A generated TargetDecl.
-     */
-    public static TargetDecl extractTargetDecl(Target target, TargetConfig config) {
-        TargetDecl decl = LfFactory.eINSTANCE.createTargetDecl();
-        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-        for (KeyValuePair p : extractProperties(config)) {
-            kvp.getPairs().add(p);
-        }
-        decl.setName(target.toString());
-        decl.setConfig(kvp);
-        return decl;
-    }
-
-    /**
-     * Update the given configuration using the given target properties.
-     *
-     * @param config     The configuration object to update.
-     * @param properties AST node that holds all the target properties.
-     */
-    public static void update(TargetConfig config, List<KeyValuePair> properties, ErrorReporter err) {
-        properties.forEach(property ->  {
-            TargetProperty p = forName(property.getName());
-            if (p != null) {
-                // Mark the specified target property as set by the user
-                config.setByUser.add(p);
-                p.updater.parseIntoTargetConfig(config, property.getValue(), err);
-            }
-        });
-    }
-
-    /**
-     * Update one of the target properties, given by 'propertyName'.
-     * For convenience, a list of target properties (e.g., taken from
-     * a file or resource) can be passed without any filtering. This
-     * function will do nothing if the list of target properties doesn't
-     * include the property given by 'propertyName'.
-     *
-     * @param config     The target config to apply the update to.
-     * @param property   The target property.
-     * @param properties AST node that holds all the target properties.
-     * @param err        Error reporter on which property format errors will be reported
-     */
-    public static void updateOne(TargetConfig config, TargetProperty property, List<KeyValuePair> properties, ErrorReporter err) {
-        properties.stream()
-            .filter(p -> p.getName().equals(property.getDisplayName()))
-            .findFirst()
-            .map(KeyValuePair::getValue)
-            .ifPresent(value -> property.updater.parseIntoTargetConfig(
-                config,
-                value,
-                err
-            ));
-    }
-
-    /**
-     * Return the entry that matches the given string.
-     * @param name The string to match against.
-     */
-    public static TargetProperty forName(String name) {
-        return Target.match(name, TargetProperty.values());
-    }
-
-    /**
-     * Return a list with all target properties.
-     *
-     * @return All existing target properties.
-     */
-    public static List<TargetProperty> getOptions() {
-        return Arrays.asList(TargetProperty.values());
-    }
-
-    /**
-     * Return the description.
-     */
-    @Override
-    public String toString() {
-        return this.description;
-    }
-
-    // Inner classes for the various supported types.
-
-    /**
-     * Dictionary type that allows for keys that will be interpreted as strings
-     * and string values.
-     */
-    public enum StringDictionaryType implements TargetPropertyType {
-        COMPILE_DEFINITION();
-        @Override
-        public boolean validate(Element e) {
-            if (e.getKeyvalue() != null) {
-                return true;
-            }
-            return false;
-        }
-
-        @Override
-        public void check(Element e, String name, LFValidator v) {
-            KeyValuePairs kv = e.getKeyvalue();
-            if (kv == null) {
-                TargetPropertyType.produceError(name, this.toString(), v);
-            } else {
-                for (KeyValuePair pair : kv.getPairs()) {
-                    String key = pair.getName();
-                    Element val = pair.getValue();
-
-                    // Make sure the type is string
-                    PrimitiveType.STRING.check(val, name + "." + key, v);
-                }
-            }
-
-        }
-    }
-
-    /**
-     * Interface for dictionary elements. It associates an entry with a type.
-     */
-    public interface DictionaryElement {
-
-        TargetPropertyType getType();
-    }
-
-    /**
-     * A dictionary type with a predefined set of possible keys and assignable
-     * types.
-     *
-     * @author Marten Lohstroh
-     *
-     */
-    public enum DictionaryType implements TargetPropertyType {
-        CLOCK_SYNC_OPTION_DICT(Arrays.asList(ClockSyncOption.values())),
-        DOCKER_DICT(Arrays.asList(DockerOption.values())),
-        PLATFORM_DICT(Arrays.asList(PlatformOption.values())),
-        COORDINATION_OPTION_DICT(Arrays.asList(CoordinationOption.values())),
-        TRACING_DICT(Arrays.asList(TracingOption.values()));
-
-        /**
-         * The keys and assignable types that are allowed in this dictionary.
-         */
-        public List<DictionaryElement> options;
-
-        /**
-         * A dictionary type restricted to sets of predefined keys and types of
-         * values.
-         *
-         * @param options The dictionary elements allowed by this type.
-         */
-        private DictionaryType(List<DictionaryElement> options) {
-            this.options = options;
-        }
-
-        /**
-         * Return the dictionary element of which the key matches the given
-         * string.
-         *
-         * @param name The string to match against.
-         * @return The matching dictionary element (or null if there is none).
-         */
-        public DictionaryElement forName(String name) {
-            return Target.match(name, options);
-        }
-
-        /**
-         * Recursively check that the passed in element conforms to the rules of
-         * this dictionary.
-         */
-        @Override
-        public void check(Element e, String name, LFValidator v) {
-            KeyValuePairs kv = e.getKeyvalue();
-            if (kv == null) {
-                TargetPropertyType.produceError(name, this.toString(), v);
-            } else {
-                for (KeyValuePair pair : kv.getPairs()) {
-                    String key = pair.getName();
-                    Element val = pair.getValue();
-                    Optional<DictionaryElement> match = this.options.stream()
-                            .filter(element -> key.equalsIgnoreCase(element.toString())).findAny();
-                    if (match.isPresent()) {
-                        // Make sure the type is correct, too.
-                        TargetPropertyType type = match.get().getType();
-                        type.check(val, name + "." + key, v);
-                    } else {
-                        // No match found; report error.
-                        TargetPropertyType.produceError(name,
-                                this.toString(), v);
-                    }
-                }
-            }
-        }
-
-        /**
-         * Return true if the given element represents a dictionary, false
-         * otherwise.
-         */
-        @Override
-        public boolean validate(Element e) {
-            if (e.getKeyvalue() != null) {
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Return a human-readable description of this type.
-         */
-        @Override
-        public String toString() {
-            return "a dictionary with one or more of the following keys: "
-                    + options.stream().map(option -> option.toString())
-                            .collect(Collectors.joining(", "));
-        }
-    }
-    /**
-     * A type that can assume one of several types.
-     *
-     * @author Marten Lohstroh
-     *
-     */
-    public enum UnionType implements TargetPropertyType {
-        STRING_OR_STRING_ARRAY(
-                Arrays.asList(PrimitiveType.STRING, ArrayType.STRING_ARRAY),
-                null),
-        PLATFORM_STRING_OR_DICTIONARY(
-                Arrays.asList(PrimitiveType.STRING, DictionaryType.PLATFORM_DICT),
-                null),
-        FILE_OR_FILE_ARRAY(
-                Arrays.asList(PrimitiveType.FILE, ArrayType.FILE_ARRAY), null),
-        BUILD_TYPE_UNION(Arrays.asList(BuildType.values()), null),
-        COORDINATION_UNION(Arrays.asList(CoordinationType.values()),
-                CoordinationType.CENTRALIZED),
-        SCHEDULER_UNION(Arrays.asList(SchedulerOption.values()), SchedulerOption.getDefault()),
-        LOGGING_UNION(Arrays.asList(LogLevel.values()), LogLevel.INFO),
-        PLATFORM_UNION(Arrays.asList(Platform.values()), Platform.AUTO),
-        CLOCK_SYNC_UNION(Arrays.asList(ClockSyncMode.values()),
-                ClockSyncMode.INIT),
-        DOCKER_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.DOCKER_DICT),
-                null),
-        TRACING_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.TRACING_DICT),
-                null);
-
-        /**
-         * The constituents of this type union.
-         */
-        public final List<Enum<?>> options;
-
-        /**
-         * The default type, if there is one.
-         */
-        private final Enum<?> defaultOption;
-
-        /**
-         * Private constructor for creating unions types.
-         *
-         * @param options The types that that are part of the union.
-         * @param defaultOption The default type.
-         */
-        private UnionType(List<Enum<?>> options, Enum<?> defaultOption) {
-            this.options = options;
-            this.defaultOption = defaultOption;
-        }
-
-        /**
-         * Return the type among those in this type union that matches the given
-         * name.
-         *
-         * @param name The string to match against.
-         * @return The matching dictionary element (or null if there is none).
-         */
-        public Enum<?> forName(String name) {
-            return Target.match(name, options);
-        }
-
-        /**
-         * Recursively check that the passed in element conforms to the rules of
-         * this union.
-         */
-        @Override
-        public void check(Element e, String name, LFValidator v) {
-            Optional<Enum<?>> match = this.match(e);
-            if (match.isPresent()) {
-                // Go deeper if the element is an array or dictionary.
-                Enum<?> type = match.get();
-                if (type instanceof DictionaryType) {
-                    ((DictionaryType) type).check(e, name, v);
-                } else if (type instanceof ArrayType) {
-                    ((ArrayType) type).check(e, name, v);
-                } else if (type instanceof PrimitiveType) {
-                    ((PrimitiveType) type).check(e, name, v);
-                } else if (!(type instanceof Enum<?>)) {
-                    throw new RuntimeException("Encountered an unknown type.");
-                }
-            } else {
-                // No match found; report error.
-                TargetPropertyType.produceError(name, this.toString(), v);
-            }
-        }
-
-        /**
-         * Internal method for matching a given element against the allowable
-         * types.
-         *
-         * @param e AST node that represents the value of a target property.
-         * @return The matching type wrapped in an Optional object.
-         */
-        private Optional<Enum<?>> match(Element e) {
-            return this.options.stream().filter(option -> {
-                if (option instanceof TargetPropertyType) {
-                    return ((TargetPropertyType) option).validate(e);
-                } else {
-                    return ASTUtils.elementToSingleString(e)
-                            .equalsIgnoreCase(option.toString());
-                }
-            }).findAny();
-        }
-
-        /**
-         * Return true if this union has an option that matches the given
-         * element.
-         * @param e The element to match against this type.
-         */
-        @Override
-        public boolean validate(Element e) {
-            if (this.match(e).isPresent()) {
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Return a human-readable description of this type. If three is a
-         * default option, then indicate it.
-         */
-        @Override
-        public String toString() {
-            return "one of the following: " + options.stream().map(option -> {
-                if (option == this.defaultOption) {
-                    return option.toString() + " (default)";
-                } else {
-                    return option.toString();
-                }
-            }).collect(Collectors.joining(", "));
-        }
-
-    }
-
-    /**
-     * An array type of which the elements confirm to a given type.
-     *
-     * @author Marten Lohstroh
-     *
-     */
-    public enum ArrayType implements TargetPropertyType {
-        STRING_ARRAY(PrimitiveType.STRING),
-        FILE_ARRAY(PrimitiveType.FILE);
-
-        /**
-         * Type parameter of this array type.
-         */
-        public TargetPropertyType type;
-
-        /**
-         * Private constructor to create a new array type.
-         *
-         * @param type The type of elements in the array.
-         */
-        private ArrayType(TargetPropertyType type) {
-            this.type = type;
-        }
-
-        /**
-         * Check that the passed in element represents an array and ensure that
-         * its elements are all of the correct type.
-         */
-        @Override
-        public void check(Element e, String name, LFValidator v) {
-            Array array = e.getArray();
-            if (array == null) {
-                TargetPropertyType.produceError(name, this.toString(), v);
-            } else {
-                List<Element> elements = array.getElements();
-                for (int i = 0; i < elements.size(); i++) {
-                    this.type.check(elements.get(i), name + "[" + i + "]", v);
-                }
-            }
-        }
-
-        /**
-         * Return true of the given element is an array.
-         */
-        @Override
-        public boolean validate(Element e) {
-            if (e.getArray() != null) {
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Return a human-readable description of this type.
-         */
-        @Override
-        public String toString() {
-            return "an array of which each element is " + this.type.toString();
-        }
-    }
-
-    /**
-     * Enumeration of Cmake build types. These are also mapped
-     * to Cargo profiles for the Rust target (see {@link org.lflang.generator.rust.RustTargetConfig})
-     *
-     * @author Christian Menard
-     */
-    public enum BuildType {
-        RELEASE("Release"),
-        DEBUG("Debug"),
-        TEST("Test"),
-        REL_WITH_DEB_INFO("RelWithDebInfo"),
-        MIN_SIZE_REL("MinSizeRel");
-
-        /**
-         * Alias used in toString method.
-         */
-        private final String alias;
-
-        /**
-         * Private constructor for Cmake build types.
-         */
-        BuildType(String alias) {
-            this.alias = alias;
-        }
-
-        /**
-         * Return the alias.
-         */
-        @Override
-        public String toString() {
-            return this.alias;
-        }
-    }
-
-    /**
-     * Enumeration of coordination types.
-     *
-     * @author Marten Lohstroh
-     */
-    public enum CoordinationType {
-        CENTRALIZED, DECENTRALIZED;
-
-        /**
-         * Return the name in lower case.
-         */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
-    }
-
-
-    /**
-     * Enumeration of clock synchronization modes.
-     *
-     * - OFF: The clock synchronization is universally off.
-     * - STARTUP: Clock synchronization occurs at startup only.
-     * - ON: Clock synchronization occurs at startup and at runtime.
-     *
-     * @author Edward A. Lee
-     */
-    public enum ClockSyncMode {
-        OFF, INIT, ON; // TODO Discuss initial in now a mode keyword (same as startup) and cannot be used as target property value, thus changed it to init
-        // FIXME I could not test if this change breaks anything
-
-        /**
-         * Return the name in lower case.
-         */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
-    }
-
-    /**
-     * An interface for types associated with target properties.
-     *
-     * @author Marten Lohstroh
-     */
-    public interface TargetPropertyType {
-
-        /**
-         * Return true if the the given Element is a valid instance of this
-         * type.
-         *
-         * @param e The Element to validate.
-         * @return True if the element conforms to this type, false otherwise.
-         */
-        public boolean validate(Element e);
-
-        /**
-         * Check (recursively) the given Element against its associated type(s)
-         * and add found problems to the given list of errors.
-         *
-         * @param e    The Element to type check.
-         * @param name The name of the target property.
-         * @param v    A reference to the validator to report errors to.
-         */
-        public void check(Element e, String name, LFValidator v);
-
-        /**
-         * Helper function to produce an error during type checking.
-         *
-         * @param name        The description of the target property.
-         * @param description The description of the type.
-         * @param v           A reference to the validator to report errors to.
-         */
-        public static void produceError(String name, String description,
-                LFValidator v) {
-            v.getTargetPropertyErrors().add("Target property '" + name
-                    + "' is required to be " + description + ".");
-        }
-    }
-
-    /**
-     * Primitive types for target properties, each with a description used in
-     * error messages and predicate used for validating values.
-     *
-     * @author Marten Lohstroh
-     */
-    public enum PrimitiveType implements TargetPropertyType {
-        BOOLEAN("'true' or 'false'",
-                v -> ASTUtils.elementToSingleString(v).equalsIgnoreCase("true")
-                        || ASTUtils.elementToSingleString(v).equalsIgnoreCase("false")),
-        INTEGER("an integer", v -> {
-            try {
-                Integer.parseInt(ASTUtils.elementToSingleString(v));
-            } catch (NumberFormatException e) {
-                return false;
-            }
-            return true;
-        }),
-        NON_NEGATIVE_INTEGER("a non-negative integer", v -> {
-            try {
-                int result = Integer.parseInt(ASTUtils.elementToSingleString(v));
-                if (result < 0)
-                    return false;
-            } catch (NumberFormatException e) {
-                return false;
-            }
-            return true;
-        }),
-        TIME_VALUE("a time value with units", v ->
-            v.getKeyvalue() == null && v.getArray() == null
-                && v.getLiteral() == null && v.getId() == null
-                && (v.getTime() == 0 || v.getUnit() != null)),
-        STRING("a string", v -> v.getLiteral() != null && !isCharLiteral(v.getLiteral()) || v.getId() != null),
-        FILE("a path to a file", STRING.validator);
-
-        /**
-         * A description of this type, featured in error messages.
-         */
-        private final String description;
-
-        /**
-         * A predicate for determining whether a given Element conforms to this
-         * type.
-         */
-        public final Predicate<Element> validator;
-
-        /**
-         * Private constructor to create a new primitive type.
-         * @param description A textual description of the type that should
-         * start with "a/an".
-         * @param validator A predicate that returns true if a given Element
-         * conforms to this type.
-         */
-        private PrimitiveType(String description,
-                Predicate<Element> validator) {
-            this.description = description;
-            this.validator = validator;
-        }
-
-        /**
-         * Return true if the the given Element is a valid instance of this type.
-         */
-        public boolean validate(Element e) {
-            return this.validator.test(e);
-        }
-
-        /**
-         * Check (recursively) the given Element against its associated type(s)
-         * and add found problems to the given list of errors.
-         *
-         * @param e      The element to type check.
-         * @param name   The name of the target property.
-         * @param v      The LFValidator to append errors to.
-         */
-        public void check(Element e, String name, LFValidator v) {
-            if (!this.validate(e)) {
-                TargetPropertyType.produceError(name, this.description, v);
-            }
-            // If this is a file, perform an additional check to make sure
-            // the file actually exists.
-            // FIXME: premature because we first need a mechanism for looking up files!
-            // Looking in the same directory is too restrictive. Disabling this check for now.
-            /*
-            if (this == FILE) {
-                String file = ASTUtils.toSingleString(e);
-
-                if (!FileConfig.fileExists(file, FileConfig.toPath(e.eResource().getURI()).toFile().getParent())) {
-                    v.targetPropertyWarnings
-                            .add("Could not find file: '" + file + "'.");
-                }
-            }
-            */
-        }
-
-        /**
-         * Return a textual description of this type.
-         */
-        @Override
-        public String toString() {
-            return this.description;
-        }
-
-
-        private static boolean isCharLiteral(String s) {
-            return s.length() > 2
-                && '\'' == s.charAt(0)
-                && '\'' == s.charAt(s.length() - 1);
-        }
-    }
-
-    /**
-     * Clock synchronization options.
-     * @author Marten Lohstroh
-     */
-    public enum ClockSyncOption implements DictionaryElement {
-        ATTENUATION("attenuation", PrimitiveType.NON_NEGATIVE_INTEGER),
-        LOCAL_FEDERATES_ON("local-federates-on", PrimitiveType.BOOLEAN),
-        PERIOD("period", PrimitiveType.TIME_VALUE),
-        TEST_OFFSET("test-offset", PrimitiveType.TIME_VALUE),
-        TRIALS("trials", PrimitiveType.NON_NEGATIVE_INTEGER),
-        COLLECT_STATS("collect-stats", PrimitiveType.BOOLEAN);
-
-        public final PrimitiveType type;
-
-        private final String description;
-
-        private ClockSyncOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
-
-
-        /**
-         * Return the description of this dictionary element.
-         */
-        @Override
-        public String toString() {
-            return this.description;
-        }
-
-        /**
-         * Return the type associated with this dictionary element.
-         */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
-    }
-
-    /**
-     * Docker options.
-     * @author Edward A. Lee
-     */
-    public enum DockerOption implements DictionaryElement {
-        FROM("FROM", PrimitiveType.STRING);
-
-        public final PrimitiveType type;
-
-        private final String description;
-
-        private DockerOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
-
-        /**
-         * Return the description of this dictionary element.
-         */
-        @Override
-        public String toString() {
-            return this.description;
-        }
-
-        /**
-         * Return the type associated with this dictionary element.
-         */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
-    }
-
-
-    /**
-     * Platform options.
-     * @author Anirudh Rengarajan
-     */
-    public enum PlatformOption implements DictionaryElement {
-        NAME("name", PrimitiveType.STRING),
-        BAUDRATE("baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER),
-        BOARD("board", PrimitiveType.STRING),
-        FLASH("flash", PrimitiveType.BOOLEAN),
-        PORT("port", PrimitiveType.STRING);
-
-        public final PrimitiveType type;
-
-        private final String description;
-
-        private PlatformOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
-
-
-        /**
-         * Return the description of this dictionary element.
-         */
-        @Override
-        public String toString() {
-            return this.description;
-        }
-
-        /**
-         * Return the type associated with this dictionary element.
-         */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
-    }
-
-    /**
-     * Coordination options.
-     * @author Edward A. Lee
-     */
-    public enum CoordinationOption implements DictionaryElement {
-        ADVANCE_MESSAGE_INTERVAL("advance-message-interval", PrimitiveType.TIME_VALUE);
-
-        public final PrimitiveType type;
-
-        private final String description;
-
-        private CoordinationOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
-
-
-        /**
-         * Return the description of this dictionary element.
-         */
-        @Override
-        public String toString() {
-            return this.description;
-        }
-
-        /**
-         * Return the type associated with this dictionary element.
-         */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
-    }
-
-    /**
-     * Log levels in descending order of severity.
-     * @author Marten Lohstroh
-     */
-    public enum LogLevel {
-        ERROR, WARN, INFO, LOG, DEBUG;
-
-        /**
-         * Return the name in lower case.
-         */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
-    }
-
-    /**
-     * Enumeration of supported platforms
-     */
-    public enum Platform {
-        AUTO,
-        ARDUINO,
-        NRF52("Nrf52"),
-        LINUX("Linux"),
-        MAC("Darwin"),
-        ZEPHYR("Zephyr"),
-        WINDOWS("Windows");
-
-        String cMakeName;
-        Platform() {
-            this.cMakeName = this.toString();
-        }
-        Platform(String cMakeName) {
-            this.cMakeName = cMakeName;
-        }
-
-        /**
-         * Return the name in lower case.
-         */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
-
-        /**
-         * Get the CMake name for the platform.
-         */
-        public String getcMakeName() {
-            return this.cMakeName;
-        }
-    }
-
-    /**
-     * Supported schedulers.
-     * @author Soroush Bateni
-     */
-    public enum SchedulerOption {
-        NP(false),         // Non-preemptive
-        ADAPTIVE(false, List.of(
-            Path.of("scheduler_adaptive.c"),
-            Path.of("worker_assignments.h"),
-            Path.of("worker_states.h"),
-            Path.of("data_collection.h")
-        )),
-        GEDF_NP(true),    // Global EDF non-preemptive
-        GEDF_NP_CI(true); // Global EDF non-preemptive with chain ID
-        // PEDF_NP(true);    // Partitioned EDF non-preemptive (FIXME: To be re-added in a future PR)
-
-        /**
-         * Indicate whether or not the scheduler prioritizes reactions by deadline.
-         */
-        private final boolean prioritizesDeadline;
-
-        /** Relative paths to files required by this scheduler. */
-        private final List<Path> relativePaths;
-
-        SchedulerOption(boolean prioritizesDeadline) {
-            this(prioritizesDeadline, null);
-        }
-
-        SchedulerOption(boolean prioritizesDeadline, List<Path> relativePaths) {
-            this.prioritizesDeadline = prioritizesDeadline;
-            this.relativePaths = relativePaths;
-        }
-
-        /**
-         * Return true if the scheduler prioritizes reactions by deadline.
-         */
-        public boolean prioritizesDeadline() {
-            return this.prioritizesDeadline;
-        }
-
-        public List<Path> getRelativePaths() {
-            return relativePaths != null ? ImmutableList.copyOf(relativePaths) :
-                   List.of(Path.of("scheduler_" + this + ".c"));
-        }
-
-        public static SchedulerOption getDefault() {
-            return NP;
-        }
-    }
-
-    /**
-     * Tracing options.
-     * @author Edward A. Lee
-     */
-    public enum TracingOption implements DictionaryElement {
-        TRACE_FILE_NAME("trace-file-name", PrimitiveType.STRING);
-
-        public final PrimitiveType type;
-
-        private final String description;
-
-        private TracingOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
-
-        /**
-         * Return the description of this dictionary element.
-         */
-        @Override
-        public String toString() {
-            return this.description;
-        }
-
-        /**
-         * Return the type associated with this dictionary element.
-         */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
-    }
-
-}
diff --git a/org.lflang/src/org/lflang/TimeValue.java b/org.lflang/src/org/lflang/TimeValue.java
deleted file mode 100644
index 9eab5aa68b..0000000000
--- a/org.lflang/src/org/lflang/TimeValue.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
-
-package org.lflang;
-
-/**
- * Represents an amount of time (a duration).
- *
- * @author Marten Lohstroh
- * @author Clément Fournier - TU Dresden, INSA Rennes
- */
-public final class TimeValue implements Comparable<TimeValue> {
-
-    /**
-     * The maximum value of this type. This is approximately equal to 292 years.
-     */
-    public static final TimeValue MAX_VALUE = new TimeValue(Long.MAX_VALUE, TimeUnit.NANO);
-    /**
-     * A time value equal to zero.
-     */
-    public static final TimeValue ZERO = new TimeValue(0, null);
-
-
-    /**
-     * Primitive numerical representation of this time value,
-     * to be interpreted in terms the associated time unit.
-     */
-    public final long time;
-
-    /**
-     * Units associated with this time value. May be null.
-     */
-    public final TimeUnit unit;
-
-    /**
-     * Maximum size of a deadline in primitive representation.
-     * NOTE: if we were to use an unsigned data type this would be
-     * 0xFFFFFFFFFFFF
-     */
-    public static final long MAX_LONG_DEADLINE = Long.decode("0x7FFFFFFFFFFF");
-
-    /**
-     * Create a new time value.
-     *
-     * @throws IllegalArgumentException If time is non-zero and the unit is null
-     */
-    public TimeValue(long time, TimeUnit unit) {
-        if (unit == null && time != 0) {
-            throw new IllegalArgumentException("Non-zero time values must have a unit");
-        }
-        this.time = time;
-        this.unit = unit;
-    }
-
-    @Override
-    public boolean equals(Object t1) {
-        if (t1 instanceof TimeValue) {
-            return this.compareTo((TimeValue) t1) == 0;
-        }
-        return false;
-    }
-    
-    public static int compare(TimeValue t1, TimeValue t2) {
-        if (t1.isEarlierThan(t2)) {
-            return -1;
-        }
-        if (t2.isEarlierThan(t1)) {
-            return 1;
-        }
-        return 0;
-    }
-    
-    private static long makeNanosecs(long time, TimeUnit unit) {
-        if (unit == null) {
-            return time; // == 0, see constructor.
-        }
-        switch (unit) {
-        case NANO:
-            return time;
-        case MICRO:
-            return time * 1000;
-        case MILLI:
-            return time * 1_000_000;
-        case SECOND:
-            return time * 1_000_000_000;
-        case MINUTE:
-            return time * 60_000_000_000L;
-        case HOUR:
-            return time * 3_600_000_000_000L;
-        case DAY:
-            return time * 86_400_000_000_000L;
-        case WEEK:
-            return time * 604_800_016_558_522L;
-        }
-        throw new AssertionError("unreachable");
-    }
-
-    /**
-     * Returns whether this time value is earlier than another.
-     */
-    public boolean isEarlierThan(TimeValue other) {
-        return this.compareTo(other) < 0;
-    }
-
-    @Override
-    public int compareTo(TimeValue o) {
-        return Long.compare(this.toNanoSeconds(), o.toNanoSeconds());
-    }
-
-    /**
-     * Return the magnitude of this value, as expressed in the
-     * {@linkplain #getUnit() unit} of this value.
-     */
-    public long getMagnitude() {
-        return time;
-    }
-
-    /**
-     * Units associated with this time value. May be null,
-     * but only if the magnitude is zero.
-     */
-    public TimeUnit getUnit() {
-        return unit;
-    }
-
-    /**
-     * Get this time value in number of nanoseconds.
-     */
-    public long toNanoSeconds() {
-        return makeNanosecs(time, unit);
-    }
-
-    /**
-     * Return a TimeValue based on a nanosecond value.
-     */
-    public static TimeValue fromNanoSeconds(long ns) {
-        if (ns == 0) return ZERO;
-        long time;
-        if ((time = ns / 604_800_016_558_522L) > 0 && ns % 604_800_016_558_522L == 0) {
-            return new TimeValue(time, TimeUnit.WEEK);
-        }
-        if ((time = ns / 86_400_000_000_000L) > 0 && ns % 86_400_000_000_000L == 0) {
-            return new TimeValue(time, TimeUnit.DAY);
-        }
-        if ((time = ns / 3_600_000_000_000L) > 0 && ns % 3_600_000_000_000L == 0) {
-            return new TimeValue(time, TimeUnit.HOUR);
-        }
-        if ((time = ns / 60_000_000_000L) > 0 && ns % 60_000_000_000L == 0) {
-            return new TimeValue(time, TimeUnit.MINUTE);
-        }
-        if ((time = ns / 1_000_000_000) > 0 && ns % 1_000_000_000 == 0) {
-            return new TimeValue(time, TimeUnit.SECOND);
-        }
-        if ((time = ns / 1_000_000) > 0 && ns % 1_000_000 == 0) {
-            return new TimeValue(time, TimeUnit.MILLI);
-        }
-        if ((time = ns / 1000) > 0 && ns % 1000 == 0) {
-            return new TimeValue(time, TimeUnit.MICRO);
-        }
-        return new TimeValue(ns, TimeUnit.NANO);
-    }
-
-    /**
-     * Return a string representation of this time value.
-     */
-    public String toString() {
-        return unit != null ? time + " " + unit.getCanonicalName()
-                                     : Long.toString(time);
-    }
-
-    /** Return the latest of both values. */
-    public static TimeValue max(TimeValue t1, TimeValue t2) {
-        return t1.isEarlierThan(t2) ? t2 : t1;
-    }
-
-    /** Return the earliest of both values. */
-    public static TimeValue min(TimeValue t1, TimeValue t2) {
-        return t1.isEarlierThan(t2) ? t1 : t2;
-    }
-    
-    /**
-     * Return the sum of this duration and the one represented by b.
-     * <p>
-     * The unit of the returned TimeValue will be the minimum
-     * of the units of both operands except if only one of the units
-     * is TimeUnit.NONE. In that case, the unit of the other input is used.
-     *
-     * @param b The right operand
-     * @return A new TimeValue (the current value will not be affected)
-     */
-    public TimeValue add(TimeValue b) {
-        // Figure out the actual sum
-        final long sumOfNumbers;
-        try {
-            sumOfNumbers = Math.addExact(this.toNanoSeconds(), b.toNanoSeconds());
-        } catch (ArithmeticException overflow) {
-            return MAX_VALUE;
-        }
-
-        if (this.unit == null || b.unit == null) {
-            // A time value with no unit is necessarily zero. So
-            // if this is null, (this + b) == b, if b is none, (this+b) == this.
-            return b.unit == null ? this : b;
-        }
-        boolean isThisUnitSmallerThanBUnit = this.unit.compareTo(b.unit) <= 0;
-        TimeUnit smallestUnit = isThisUnitSmallerThanBUnit ? this.unit : b.unit;
-        // Find the appropriate divider to bring sumOfNumbers from nanoseconds to returnUnit
-        var unitDivider = makeNanosecs(1, smallestUnit);
-        return new TimeValue(sumOfNumbers / unitDivider, smallestUnit);
-    }
-
-}
diff --git a/org.lflang/src/org/lflang/analyses/cast/AbstractAstVisitor.java b/org.lflang/src/org/lflang/analyses/cast/AbstractAstVisitor.java
deleted file mode 100644
index c3483e2d3e..0000000000
--- a/org.lflang/src/org/lflang/analyses/cast/AbstractAstVisitor.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.lflang.analyses.cast;
-
-import java.util.List;
-
-/** Modeled after AbstractParseTreeVisitor.class */
-public abstract class AbstractAstVisitor<T> implements AstVisitor<T> {
-    
-    @Override
-    public T visit(CAst.AstNode tree) {
-      return tree.accept(this);
-    }
-
-    @Override
-    public T visit(CAst.AstNode tree, List<CAst.AstNode> nodeList) {
-      return tree.accept(this, nodeList);
-    }
-}
diff --git a/org.lflang/src/org/lflang/analyses/cast/AstUtils.java b/org.lflang/src/org/lflang/analyses/cast/AstUtils.java
deleted file mode 100644
index bed532e424..0000000000
--- a/org.lflang/src/org/lflang/analyses/cast/AstUtils.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.lflang.analyses.cast;
-
-import java.util.List;
-
-import org.antlr.v4.runtime.ParserRuleContext;
-import org.antlr.v4.runtime.misc.Interval;
-
-public class AstUtils {
-    
-    public static CAst.AstNode takeConjunction(List<CAst.AstNode> conditions) {
-        if (conditions.size() == 0) {
-            return new CAst.LiteralNode("true");
-        } else if (conditions.size() == 1) {
-            return conditions.get(0);
-        } else {
-            // Take the conjunction of all the conditions.
-            CAst.LogicalAndNode top = new CAst.LogicalAndNode();
-            CAst.LogicalAndNode cur = top;
-            for (int i = 0; i < conditions.size()-1; i++) {
-                cur.left = conditions.get(i);
-                if (i == conditions.size()-2) {
-                    cur.right = conditions.get(i+1);
-                } else {
-                    cur.right = new CAst.LogicalAndNode();
-                    cur =(CAst.LogicalAndNode)cur.right;
-                }
-            }
-            return top;
-        }
-    }
-
-    public static CAst.AstNode takeDisjunction(List<CAst.AstNode> conditions) {
-        if (conditions.size() == 0) {
-            return new CAst.LiteralNode("true");
-        } else if (conditions.size() == 1) {
-            return conditions.get(0);
-        } else {
-            // Take the conjunction of all the conditions.
-            CAst.LogicalOrNode top = new CAst.LogicalOrNode();
-            CAst.LogicalOrNode cur = top;
-            for (int i = 0; i < conditions.size()-1; i++) {
-                cur.left = conditions.get(i);
-                if (i == conditions.size()-2) {
-                    cur.right = conditions.get(i+1);
-                } else {
-                    cur.right = new CAst.LogicalOrNode();
-                    cur =(CAst.LogicalOrNode)cur.right;
-                }
-            }
-            return top;
-        }
-    }
-
-    // A handy function for debugging ASTs.
-    // It prints the stack trace of the visitor functions
-    // and shows the text matched by the ANTLR rules.
-    public static void printStackTraceAndMatchedText(ParserRuleContext ctx) {
-        System.out.println("========== AST DEBUG ==========");
-
-        // Print matched text
-        int a = ctx.start.getStartIndex();
-        int b = ctx.stop.getStopIndex();
-        Interval interval = new Interval(a,b);
-        String matchedText = ctx.start.getInputStream().getText(interval);
-        System.out.println("Matched text: " + matchedText);
-
-        // Print stack trace
-        StackTraceElement[] cause = Thread.currentThread().getStackTrace();
-        System.out.print("Stack trace: ");
-        for (int i = 0; i < cause.length; i++) {
-            System.out.print(cause[i].getMethodName());
-            if (i != cause.length - 1) System.out.print(", ");
-        }
-        System.out.println(".");
-
-        System.out.println("===============================");
-    }
-}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/analyses/cast/AstVisitor.java b/org.lflang/src/org/lflang/analyses/cast/AstVisitor.java
deleted file mode 100644
index 47861e303b..0000000000
--- a/org.lflang/src/org/lflang/analyses/cast/AstVisitor.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.lflang.analyses.cast;
-
-import java.util.List;
-
-/** Modeled after ParseTreeVisitor.class */
-public interface AstVisitor<T> {
-    
-    /** 
-     * Visit an AST, and return a user-defined result of the operation.
-     * 
-     * @param tree The {@link CAst.AstNode} to visit.
-	 * @return The result of visiting the parse tree.
-     */
-    T visit(CAst.AstNode tree);
-
-    /** 
-     * Visit an AST with a list of other AST nodes holding some information,
-     * and return a user-defined result of the operation.
-     * 
-     * @param tree The {@link CAst.AstNode} to visit.
-     * @param nodeList A list of {@link CAst.AstNode} passed down the recursive call.
-	 * @return The result of visiting the parse tree.
-     */
-    T visit(CAst.AstNode tree, List<CAst.AstNode> nodeList);
-}
diff --git a/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java b/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
deleted file mode 100644
index 450a4798e4..0000000000
--- a/org.lflang/src/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
+++ /dev/null
@@ -1,681 +0,0 @@
-package org.lflang.analyses.cast;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.lflang.dsl.CBaseVisitor;
-import org.lflang.dsl.CParser.*;
-
-public class BuildAstParseTreeVisitor extends CBaseVisitor<CAst.AstNode> {
-
-    @Override
-    public CAst.AstNode visitBlockItemList(BlockItemListContext ctx) {
-        CAst.StatementSequenceNode stmtSeq = new CAst.StatementSequenceNode();
-        // Populate the children.
-        for (BlockItemContext blockItem : ctx.blockItem()) {
-            stmtSeq.children.add(visit(blockItem));
-        }
-        return stmtSeq;
-    }
-
-    @Override
-    public CAst.AstNode visitBlockItem(BlockItemContext ctx) {
-        if (ctx.statement() != null)
-            return visit(ctx.statement());
-        else
-            return visit(ctx.declaration());
-    }
-
-    @Override
-    public CAst.AstNode visitDeclaration(DeclarationContext ctx) {
-        if (ctx.declarationSpecifiers() != null 
-            && ctx.initDeclaratorList() != null) {
-            //// Extract type from declarationSpecifiers.
-            List<DeclarationSpecifierContext> declSpecList 
-                = ctx.declarationSpecifiers().declarationSpecifier();
-            
-            // Cannot handle more than 1 specifiers, e.g. static const int.
-            // We can augment the analytical capability later.
-            if (declSpecList.size() > 1) {
-                System.out.println(String.join(" ", 
-                    "Warning (line " + ctx.getStart().getLine() + "):",
-                    "the analyzer cannot handle more than 1 specifiers,",
-                    "e.g. static const int.",
-                    "Marking the declaration as opaque."
-                ));
-                return new CAst.OpaqueNode();
-            }
-            
-            // Check if the declaration specifier is a type specifier: e.g. int or long.
-            DeclarationSpecifierContext declSpec = declSpecList.get(0);
-            if (declSpec.typeSpecifier() == null) {
-                System.out.println(String.join(" ", 
-                    "Warning (line " + ctx.getStart().getLine() + "):",
-                    "only type specifiers are supported.",
-                    "e.g. \"static const int\" is not analyzable.",
-                    "Marking the declaration as opaque."
-                ));
-                return new CAst.OpaqueNode();
-            }
-            
-            // Check if the type specifier is what we currently support.
-            // Right now we only support int, long, & double.
-            CAst.VariableNode.Type type;
-            ArrayList<String> supportedTypes = new ArrayList<String>(
-                Arrays.asList(
-                    "int",
-                    "long",
-                    "double",
-                    "_Bool"
-                )
-            );
-            if (declSpec.typeSpecifier().Int() != null
-                || declSpec.typeSpecifier().Long() != null
-                || declSpec.typeSpecifier().Double() != null) 
-                type = CAst.VariableNode.Type.INT;
-            else if (declSpec.typeSpecifier().Bool() != null)
-                type = CAst.VariableNode.Type.BOOLEAN;
-            // Mark the declaration unanalyzable if the type is unsupported.
-            else {
-                System.out.println(String.join(" ", 
-                    "Warning (line " + ctx.getStart().getLine() + "):",
-                    "unsupported type detected at " + declSpec.typeSpecifier(),
-                    "Only " + supportedTypes + " are supported.",
-                    "Marking the declaration as opaque."
-                ));
-                return new CAst.OpaqueNode();
-            }
-
-            //// Extract variable name and value from initDeclaratorList.
-            List<InitDeclaratorContext> initDeclList
-                = ctx.initDeclaratorList().initDeclarator();
-            
-            // Cannot handle more than 1 initDeclarator: e.g. x = 1, y = 2;
-            // We can augment the analytical capability later.
-            if (initDeclList.size() > 1) {
-                System.out.println(String.join(" ", 
-                    "Warning (line " + ctx.getStart().getLine() + "):",
-                    "more than 1 declarators are detected on a single line,",
-                    "e.g. \"int x = 1, y = 2;\" is not yet analyzable.",
-                    "Marking the declaration as opaque."
-                ));
-                return new CAst.OpaqueNode();
-            }
-
-            // Get the variable name from the declarator.
-            DeclaratorContext decl = initDeclList.get(0).declarator();
-            if (decl.pointer() != null) {
-                System.out.println(String.join(" ", 
-                    "Warning (line " + ctx.getStart().getLine() + "):",
-                    "pointers are currently not supported,",
-                    "e.g. \"int *x;\" is not yet analyzable.",
-                    "Marking the declaration as opaque."
-                ));
-                return new CAst.OpaqueNode();
-            }
-            if (decl.gccDeclaratorExtension().size() > 0) {
-                System.out.println(String.join(" ", 
-                    "Warning (line " + ctx.getStart().getLine() + "):",
-                    "GCC declarator extensions are currently not supported,",
-                    "e.g. \"__asm\" and \"__attribute__\" are not yet analyzable.",
-                    "Marking the declaration as opaque."
-                ));
-                return new CAst.OpaqueNode();
-            }
-            DirectDeclaratorContext directDecl = decl.directDeclarator();
-            if (directDecl.Identifier() == null) {
-                System.out.println(String.join(" ", 
-                    "Warning (line " + ctx.getStart().getLine() + "):",
-                    "the variable identifier is missing.",
-                    "Marking the declaration as opaque."
-                ));
-                return new CAst.OpaqueNode();
-            }
-
-            // Extract the name of the variable.
-            String name = directDecl.Identifier().getText();             
-            // Create a variable Ast node.
-            CAst.VariableNode variable = new CAst.VariableNode(type, name);
-
-
-            //// Convert the initializer to a value.
-
-            // Make sure that there is an initializer.
-            InitDeclaratorContext initDecl = initDeclList.get(0);
-            if (initDecl.initializer() == null) {
-                System.out.println(String.join(" ", 
-                    "Warning (line " + ctx.getStart().getLine() + "):",
-                    "the initializer is missing,",
-                    "e.g. \"int x;\" is not yet analyzable.",
-                    "Marking the declaration as opaque."
-                ));
-                return new CAst.OpaqueNode();
-
-                // FIXME: Use UninitCAst.VariableNode to perform special encoding.
-                // return new UninitCAst.VariableNode(type, name);
-            }
-
-            // Extract the primaryExpression from the initializer.
-            if (initDecl.initializer().assignmentExpression() == null
-                || initDecl.initializer().assignmentExpression()
-                    .conditionalExpression() == null) {
-                System.out.println(String.join(" ", 
-                    "Warning (line " + ctx.getStart().getLine() + "):",
-                    "assignmentExpression or conditionalExpression is missing.",
-                    "Marking the declaration as opaque."
-                ));
-                return new CAst.OpaqueNode();
-            }
-
-            // Finally return the assignment node.
-            CAst.AssignmentNode assignmentNode = new CAst.AssignmentNode();
-            CAst.AstNode initNode = visitAssignmentExpression(initDecl.initializer().assignmentExpression());
-            assignmentNode.left = variable;
-            assignmentNode.right = initNode;
-            return assignmentNode;
-        }
-        // Return OpaqueNode as default.
-        return new CAst.OpaqueNode();
-    }
-
-    /**
-     * This visit function builds StatementSequenceNode, AssignmentNode,
-     * OpaqueNode, IfBlockNode,
-     * AdditionNode, SubtractionNode, MultiplicationNode, DivisionNode,
-     * EqualNode, NotEqualNode, LessThanNode, GreaterThanNode, LessEqualNode, GreaterEqualNode,
-     * SetPortNode, ScheduleActionNode.
-     * 
-     * @param ctx
-     * @return
-     */
-    @Override
-    public CAst.AstNode visitStatement(StatementContext ctx) {
-        if (ctx.compoundStatement() != null) {
-            BlockItemListContext bilCtx = ctx.compoundStatement().blockItemList();
-            if (bilCtx != null) {
-                return visitBlockItemList(bilCtx);
-            }
-        } else if (ctx.expressionStatement() != null) {
-            ExpressionContext exprCtx = ctx.expressionStatement().expression();
-            if (exprCtx != null) {
-                return visitExpression(exprCtx);
-            }
-        } else if (ctx.selectionStatement() != null) {
-            return visitSelectionStatement(ctx.selectionStatement());
-        }
-        return new CAst.OpaqueNode();
-    }
-
-    @Override
-    public CAst.AstNode visitExpression(ExpressionContext ctx) {
-        if (ctx.assignmentExpression().size() == 1) {
-            return visitAssignmentExpression(ctx.assignmentExpression().get(0));
-        }
-        System.out.println(String.join(" ", 
-            "Warning (line " + ctx.getStart().getLine() + "):",
-            "only one assignmentExpression in an expression is currently supported.",
-            "Marking the statement as opaque."
-        ));
-        return new CAst.OpaqueNode();
-    }
-
-    @Override
-    public CAst.AstNode visitPrimaryExpression(PrimaryExpressionContext ctx) {
-        if (ctx.Identifier() != null) {
-            return new CAst.VariableNode(ctx.Identifier().getText());
-        } else if (ctx.Constant() != null) {
-            return new CAst.LiteralNode(ctx.Constant().getText());
-        }  else if (ctx.expression() != null) {
-            return visitExpression(ctx.expression());
-        }
-        System.out.println(String.join(" ", 
-            "Warning (line " + ctx.getStart().getLine() + "):",
-            "only identifier, constant, and expressions are supported in a primary expression.",
-            "Marking the declaration as opaque."
-        ));
-        return new CAst.OpaqueNode();
-    }
-
-    // FIXME: More checks needed. This implementation currently silently omit
-    // certain cases, such as arr[1].
-    @Override
-    public CAst.AstNode visitPostfixExpression(PostfixExpressionContext ctx) {
-        if (ctx.PlusPlus().size() > 0
-            || ctx.MinusMinus().size() > 0
-            || ctx.Dot().size() > 0
-            || (ctx.LeftBracket().size() > 0 && ctx.RightBracket().size() > 0)) {
-            System.out.println(String.join(" ", 
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "Postfix '++', '--', '.', '[]' are currently not supported.",
-                "Marking the statement as opaque."
-            ));
-            return new CAst.OpaqueNode();
-        }
-        // State variables on the self struct, ports and actions.
-        if (ctx.primaryExpression() != null
-            && ctx.Identifier().size() == 1
-            && ctx.Arrow().size() == 1) {
-            CAst.AstNode primaryExprNode = visitPrimaryExpression(ctx.primaryExpression());
-            if (primaryExprNode instanceof CAst.LiteralNode) {
-                // Unreachable.
-                System.out.println("Unreachable!");
-                return new CAst.OpaqueNode(); // FIXME: Throw an exception instead.
-            }
-            CAst.VariableNode varNode = (CAst.VariableNode) primaryExprNode;
-            if (varNode.name.equals("self")) {
-                // return a state variable node.
-                return new CAst.StateVarNode(ctx.Identifier().get(0).getText());
-            } else if (ctx.Identifier().get(0).getText().equals("value")) {
-                // return a trigger present node.
-                return new CAst.TriggerValueNode(varNode.name);
-            } else if (ctx.Identifier().get(0).getText().equals("is_present")) {
-                // return a trigger value node.
-                return new CAst.TriggerIsPresentNode(varNode.name);
-            } else {
-                // Generic pointer dereference, unanalyzable.
-                System.out.println(String.join(" ", 
-                    "Warning (line " + ctx.getStart().getLine() + "):",
-                    "Generic pointer dereference is not supported in a postfix expression.",
-                    "Marking the declaration as opaque."
-                ));
-                return new CAst.OpaqueNode();
-            }
-        }
-        // LF built-in function calls (set or schedule)
-        if (ctx.primaryExpression() != null
-            && ctx.argumentExpressionList().size() == 1
-            && ctx.LeftParen() != null && ctx.RightParen() != null) {
-            CAst.AstNode primaryExprNode = visitPrimaryExpression(ctx.primaryExpression());
-            List<AssignmentExpressionContext> params = ctx.argumentExpressionList().get(0).assignmentExpression();
-            if (primaryExprNode instanceof CAst.LiteralNode) {
-                // Unreachable.
-                System.out.println("Unreachable!");
-                return new CAst.OpaqueNode(); // FIXME: Throw an exception instead.
-            }
-            CAst.VariableNode varNode = (CAst.VariableNode) primaryExprNode;
-            if (varNode.name.equals("lf_set")) {
-                // return a set port node.
-                if (params.size() != 2) {
-                    System.out.println(String.join(" ", 
-                        "Warning (line " + ctx.getStart().getLine() + "):",
-                        "lf_set must have 2 arguments. Detected " + ctx.argumentExpressionList().size(),
-                        "Marking the function call as opaque."
-                    ));
-                    return new CAst.OpaqueNode();
-                }
-                CAst.SetPortNode node = new CAst.SetPortNode();
-                node.left = visitAssignmentExpression(params.get(0));
-                node.right = visitAssignmentExpression(params.get(1));
-                return node;
-            } else if (varNode.name.equals("lf_schedule")) {
-                // return a set port node.
-                if (params.size() != 2) {
-                    System.out.println(String.join(" ", 
-                        "Warning (line " + ctx.getStart().getLine() + "):",
-                        "lf_schedule must have two arguments. Detected " + ctx.argumentExpressionList().size(),
-                        "Marking the function call as opaque."
-                    ));
-                    return new CAst.OpaqueNode();
-                }
-                CAst.ScheduleActionNode node = new CAst.ScheduleActionNode();
-                for (AssignmentExpressionContext param : params) {
-                    node.children.add(visitAssignmentExpression(param));
-                }
-                return node;
-            } else if (varNode.name.equals("lf_schedule_int")) {
-                // return a set port node.
-                if (params.size() != 3) {
-                    System.out.println(String.join(" ", 
-                        "Warning (line " + ctx.getStart().getLine() + "):",
-                        "lf_schedule_int must have three arguments. Detected " + ctx.argumentExpressionList().size(),
-                        "Marking the function call as opaque."
-                    ));
-                    return new CAst.OpaqueNode();
-                }
-                CAst.ScheduleActionIntNode node = new CAst.ScheduleActionIntNode();
-                for (AssignmentExpressionContext param : params) {
-                    node.children.add(visitAssignmentExpression(param));
-                }
-                return node;
-            } else {
-                // Generic pointer dereference, unanalyzable.
-                System.out.println(String.join(" ", 
-                    "Warning (line " + ctx.getStart().getLine() + "):",
-                    "Generic pointer dereference and function calls are not supported in a postfix expression.",
-                    "Marking the declaration as opaque."
-                ));
-                return new CAst.OpaqueNode();
-            }
-        }
-        // Variable or literal
-        if (ctx.primaryExpression() != null) {
-            return visitPrimaryExpression(ctx.primaryExpression());
-        }
-        System.out.println(String.join(" ", 
-            "Warning (line " + ctx.getStart().getLine() + "):",
-            "only an identifier, constant, state variable, port, and action are supported in a primary expression.",
-            "Marking the declaration as opaque."
-        ));
-        return new CAst.OpaqueNode();
-    }
-
-    @Override
-    public CAst.AstNode visitUnaryExpression(UnaryExpressionContext ctx) {
-        // Check for prefixes and mark them as opaque (unsupported for now).
-        if (ctx.PlusPlus().size() > 0
-            || ctx.MinusMinus().size() > 0
-            || ctx.Sizeof().size() > 0) {
-            System.out.println(String.join(" ", 
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "Prefix '++', '--', and 'sizeof' are currently not supported.",
-                "Marking the statement as opaque."
-            ));
-            AstUtils.printStackTraceAndMatchedText(ctx);
-            return new CAst.OpaqueNode();
-        }
-        // Handle the postfixExpression rule
-        // (look up the grammar in C.g4 to get more details).
-        if (ctx.postfixExpression() != null) {
-            return visitPostfixExpression(ctx.postfixExpression());
-        }
-        // Handle the unary operators '!' (logical not)
-        // and '-' (negative).
-        if (ctx.unaryOperator() != null
-            && ctx.castExpression() != null) {
-            CAst.AstNodeUnary node;
-            if (ctx.unaryOperator().Not() != null) {
-                // Handle the logical not expression.
-                node = new CAst.LogicalNotNode();
-                node.child = visitCastExpression(ctx.castExpression());
-                return node;
-            }
-            else if (ctx.unaryOperator().Minus() != null) {
-                // Handle negative numbers.
-                // -5 will be translated as -1 * (5)
-                // which is a NegativeNode with a
-                // LiteralNode inside.
-                //
-                // FIXME: Need to perform precise error handling
-                // because we will go from a castExpression to
-                // a Constant under primaryExpression and anything
-                // else matching besides Constant could be problematic.
-                // For example, we cannot have a NegativeNode with
-                // a StringLiteralNode inside. This can be caught by
-                // the GCC, but if compilation is not involved, it
-                // would be useful to catch it here ourselves.
-                node = new CAst.NegativeNode();
-                node.child = visitCastExpression(ctx.castExpression());
-                return node;
-            }
-        }
-        
-        // Mark all the remaining cases as opaque.
-        System.out.println(String.join(" ", 
-            "Warning (line " + ctx.getStart().getLine() + "):",
-            "only postfixExpression and '!' in a unaryExpression is currently supported.",
-            "Marking the statement as opaque."
-        ));
-        AstUtils.printStackTraceAndMatchedText(ctx);
-        return new CAst.OpaqueNode();
-    }
-
-    @Override
-    public CAst.AstNode visitCastExpression(CastExpressionContext ctx) {
-        if (ctx.unaryExpression() != null) {
-            return visitUnaryExpression(ctx.unaryExpression());
-        }
-        System.out.println(String.join(" ", 
-            "Warning (line " + ctx.getStart().getLine() + "):",
-            "only unaryExpression in a castExpression is currently supported.",
-            "Marking the statement as opaque."
-        ));
-        return new CAst.OpaqueNode();
-    }
-
-    @Override
-    public CAst.AstNode visitMultiplicativeExpression(MultiplicativeExpressionContext ctx) {
-        if (ctx.castExpression().size() > 1) {
-            CAst.AstNodeBinary node;
-            if (ctx.Star().size() > 0) {
-                node = new CAst.MultiplicationNode();
-            } else if (ctx.Div().size() > 0) {
-                node = new CAst.DivisionNode();
-            } else if (ctx.Mod().size() > 0) {
-                System.out.println(String.join(" ", 
-                    "Warning (line " + ctx.getStart().getLine() + "):",
-                    "Mod expression '%' is currently unsupported.",
-                    "Marking the expression as opaque."
-                ));
-                return new CAst.OpaqueNode();
-            } else {
-                node = new CAst.AstNodeBinary();
-            }
-            node.left = visitCastExpression(ctx.castExpression().get(0));
-            node.right = visitCastExpression(ctx.castExpression().get(1));
-            return node;
-        }
-        return visitCastExpression(ctx.castExpression().get(0));
-    }
-
-    @Override
-    public CAst.AstNode visitAdditiveExpression(AdditiveExpressionContext ctx) {
-        if (ctx.multiplicativeExpression().size() > 1) {
-            CAst.AstNodeBinary node;
-            if (ctx.Plus().size() > 0) {
-                node = new CAst.AdditionNode();
-            } else if (ctx.Minus().size() > 0) {
-                node = new CAst.SubtractionNode();
-            } else {
-                node = new CAst.AstNodeBinary();
-            }
-            node.left = visitMultiplicativeExpression(ctx.multiplicativeExpression().get(0));
-            node.right = visitMultiplicativeExpression(ctx.multiplicativeExpression().get(1));
-            return node;
-        }
-        return visitMultiplicativeExpression(ctx.multiplicativeExpression().get(0));
-    }
-
-    @Override
-    public CAst.AstNode visitShiftExpression(ShiftExpressionContext ctx) {
-        if (ctx.additiveExpression().size() > 1) {
-            System.out.println(String.join(" ", 
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "Shift expression '<<' or '>>' is currently unsupported.",
-                "Marking the expression as opaque."
-            ));
-            return new CAst.OpaqueNode();
-        }
-        return visitAdditiveExpression(ctx.additiveExpression().get(0));
-    }
-
-    @Override
-    public CAst.AstNode visitRelationalExpression(RelationalExpressionContext ctx) {
-        if (ctx.shiftExpression().size() > 1) {
-            CAst.AstNodeBinary node;
-            if (ctx.Less().size() > 0) {
-                node = new CAst.LessThanNode();
-            } else if (ctx.LessEqual().size() > 0) {
-                node = new CAst.LessEqualNode();
-            } else if (ctx.Greater().size() > 0) { 
-                node = new CAst.GreaterThanNode();
-            } else if (ctx.GreaterEqual().size() > 0) {
-                node = new CAst.GreaterEqualNode();
-            } else {
-                node = new CAst.AstNodeBinary();
-            }
-            node.left = visitShiftExpression(ctx.shiftExpression().get(0));
-            node.right = visitShiftExpression(ctx.shiftExpression().get(1));
-            return node;
-        }
-        return visitShiftExpression(ctx.shiftExpression().get(0));
-    }
-
-    @Override
-    public CAst.AstNode visitEqualityExpression(EqualityExpressionContext ctx) {
-        if (ctx.relationalExpression().size() > 1) {
-            CAst.AstNodeBinary node;
-            if (ctx.Equal().size() > 0) {
-                node = new CAst.EqualNode();
-            }
-            else if (ctx.NotEqual().size() > 0) {
-                node = new CAst.NotEqualNode();
-            } else {
-                node = new CAst.AstNodeBinary();
-            }
-            node.left = visitRelationalExpression(ctx.relationalExpression().get(0));
-            node.right = visitRelationalExpression(ctx.relationalExpression().get(1));
-            return node;
-        }
-        return visitRelationalExpression(ctx.relationalExpression().get(0));
-    }
-
-    @Override
-    public CAst.AstNode visitAndExpression(AndExpressionContext ctx) {
-        if (ctx.equalityExpression().size() > 1) {
-            System.out.println(String.join(" ", 
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "And expression '&' is currently unsupported.",
-                "Marking the expression as opaque."
-            ));
-            return new CAst.OpaqueNode();
-        }
-        return visitEqualityExpression(ctx.equalityExpression().get(0));
-    }
-
-    @Override
-    public CAst.AstNode visitExclusiveOrExpression(ExclusiveOrExpressionContext ctx) {
-        if (ctx.andExpression().size() > 1) {
-            System.out.println(String.join(" ", 
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "Exclusive Or '^' is currently unsupported.",
-                "Marking the expression as opaque."
-            ));
-            return new CAst.OpaqueNode();
-        }
-        return visitAndExpression(ctx.andExpression().get(0));
-    }
-
-    @Override
-    public CAst.AstNode visitInclusiveOrExpression(InclusiveOrExpressionContext ctx) {
-        if (ctx.exclusiveOrExpression().size() > 1) {
-            System.out.println(String.join(" ", 
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "Inclusive Or '|' is currently unsupported.",
-                "Marking the expression as opaque."
-            ));
-            return new CAst.OpaqueNode();
-        }
-        return visitExclusiveOrExpression(ctx.exclusiveOrExpression().get(0));
-    }
-
-    @Override
-    public CAst.AstNode visitLogicalAndExpression(LogicalAndExpressionContext ctx) {
-        if (ctx.inclusiveOrExpression().size() > 1) {
-            CAst.LogicalAndNode node = new CAst.LogicalAndNode();
-            node.left = visitInclusiveOrExpression(ctx.inclusiveOrExpression().get(0));
-            node.right = visitInclusiveOrExpression(ctx.inclusiveOrExpression().get(1));
-            return node;
-        }
-        return visitInclusiveOrExpression(ctx.inclusiveOrExpression().get(0));
-    }
-
-    @Override
-    public CAst.AstNode visitLogicalOrExpression(LogicalOrExpressionContext ctx) {
-        if (ctx.logicalAndExpression().size() > 1) {
-            CAst.LogicalOrNode node = new CAst.LogicalOrNode();
-            node.left = visitLogicalAndExpression(ctx.logicalAndExpression().get(0));
-            node.right = visitLogicalAndExpression(ctx.logicalAndExpression().get(1));
-            return node;
-        }
-        return visitLogicalAndExpression(ctx.logicalAndExpression().get(0));
-    }
-
-    @Override
-    public CAst.AstNode visitConditionalExpression(ConditionalExpressionContext ctx) {
-        if (ctx.expression() != null) {
-            System.out.println(String.join(" ", 
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "Currently do not support inline conditional expression.",
-                "Marking the expression as opaque."
-            ));
-            return new CAst.OpaqueNode();
-        }
-        return visitLogicalOrExpression(ctx.logicalOrExpression());
-    }
-
-    @Override
-    public CAst.AstNode visitAssignmentExpression(AssignmentExpressionContext ctx) {
-        if (ctx.conditionalExpression() != null) {
-            return visitConditionalExpression(ctx.conditionalExpression());
-        }
-        if (ctx.unaryExpression() != null
-            && ctx.assignmentExpression() != null) {
-            CAst.AstNodeBinary assignmentNode = new CAst.AssignmentNode();
-            assignmentNode.left = visitUnaryExpression(ctx.unaryExpression());
-            if (ctx.assignmentOperator().getText().equals("=")) {
-                assignmentNode.right = visitAssignmentExpression(ctx.assignmentExpression());
-            }
-            else if (ctx.assignmentOperator().getText().equals("+=")) {
-                CAst.AdditionNode subnode = new CAst.AdditionNode();
-                subnode.left = visitUnaryExpression(ctx.unaryExpression());
-                subnode.right = visitAssignmentExpression(ctx.assignmentExpression());
-                assignmentNode.right = subnode;
-            }
-            else if (ctx.assignmentOperator().getText().equals("-=")) {
-                CAst.SubtractionNode subnode = new CAst.SubtractionNode();
-                subnode.left = visitUnaryExpression(ctx.unaryExpression());
-                subnode.right = visitAssignmentExpression(ctx.assignmentExpression());
-                assignmentNode.right = subnode;
-            }
-            else if (ctx.assignmentOperator().getText().equals("*=")) {
-                CAst.MultiplicationNode subnode = new CAst.MultiplicationNode();
-                subnode.left = visitUnaryExpression(ctx.unaryExpression());
-                subnode.right = visitAssignmentExpression(ctx.assignmentExpression());
-                assignmentNode.right = subnode;
-            }
-            else if (ctx.assignmentOperator().getText().equals("/=")) {
-                CAst.DivisionNode subnode = new CAst.DivisionNode();
-                subnode.left = visitUnaryExpression(ctx.unaryExpression());
-                subnode.right = visitAssignmentExpression(ctx.assignmentExpression());
-                assignmentNode.right = subnode;
-            }
-            else {
-                System.out.println(String.join(" ", 
-                    "Warning (line " + ctx.getStart().getLine() + "):",
-                    "Only '=', '+=', '-=', '*=', '/=' assignment operators are supported.",
-                    "Marking the expression as opaque."
-                ));
-                return new CAst.OpaqueNode();
-            }
-            return assignmentNode;
-        }
-        System.out.println(String.join(" ", 
-            "Warning (line " + ctx.getStart().getLine() + "):",
-            "DigitSequence in an assignmentExpression is currently not supported.",
-            "Marking the expression as opaque."
-        ));
-        return new CAst.OpaqueNode();
-    }
-
-    @Override
-    public CAst.AstNode visitSelectionStatement(SelectionStatementContext ctx) {
-        if (ctx.Switch() != null) {
-            System.out.println(String.join(" ", 
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "Switch case statement is currently not supported.",
-                "Marking the expression as opaque."
-            ));
-            return new CAst.OpaqueNode();
-        }
-        CAst.IfBlockNode ifBlockNode =  new CAst.IfBlockNode();
-        CAst.IfBodyNode ifBodyNode =  new CAst.IfBodyNode();
-        ifBlockNode.left = visitExpression(ctx.expression());
-        ifBlockNode.right = ifBodyNode;
-        ifBodyNode.left = visitStatement(ctx.statement().get(0));
-        if (ctx.statement().size() > 1) {
-            ifBodyNode.right = visitStatement(ctx.statement().get(1));
-        }
-        return ifBlockNode;
-    }
-}
diff --git a/org.lflang/src/org/lflang/analyses/cast/CAst.java b/org.lflang/src/org/lflang/analyses/cast/CAst.java
deleted file mode 100644
index d5ce1ee896..0000000000
--- a/org.lflang/src/org/lflang/analyses/cast/CAst.java
+++ /dev/null
@@ -1,361 +0,0 @@
-package org.lflang.analyses.cast;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class CAst {
-    
-    public static class AstNode implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitAstNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitAstNode(this, nodeList);
-        }
-    }
-
-    public static class AstNodeUnary extends AstNode implements Visitable {
-        public AstNode child;
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitAstNodeUnary(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitAstNodeUnary(this, nodeList);
-        }
-    }
-    
-    public static class AstNodeBinary extends AstNode implements Visitable {
-        public AstNode left;
-        public AstNode right;
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitAstNodeBinary(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitAstNodeBinary(this, nodeList);
-        }
-    }
-
-    public static class AstNodeDynamic extends AstNode implements Visitable {
-        public ArrayList<AstNode> children = new ArrayList<>();
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitAstNodeDynamic(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitAstNodeDynamic(this, nodeList);
-        }
-    }
-
-    public static class AssignmentNode extends AstNodeBinary implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitAssignmentNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitAssignmentNode(this, nodeList);
-        }
-    }
-
-    /**
-     * AST node for an IF block.
-     * The left node is the condition.
-     * The right node is the IF body.
-     */
-    public static class IfBlockNode extends AstNodeBinary implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitIfBlockNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitIfBlockNode(this, nodeList);
-        }
-    }
-
-    /**
-     * AST node for the body of an IF block.
-     * The left node is the THEN branch.
-     * The right node is the ELSE branch.
-     */
-    public static class IfBodyNode extends AstNodeBinary implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitIfBodyNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitIfBodyNode(this, nodeList);
-        }
-    }
-
-    public static class LiteralNode extends AstNode implements Visitable {
-        public String literal;      
-        public LiteralNode(String literal) {
-            super();
-            this.literal = literal;
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitLiteralNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitLiteralNode(this, nodeList);
-        }
-    }
-
-    public static class LogicalNotNode extends AstNodeUnary implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitLogicalNotNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitLogicalNotNode(this, nodeList);
-        }
-    }
-
-    public static class LogicalAndNode extends AstNodeBinary implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitLogicalAndNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitLogicalAndNode(this, nodeList);
-        }
-    }
-
-    public static class LogicalOrNode extends AstNodeBinary implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitLogicalOrNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitLogicalOrNode(this, nodeList);
-        }
-    }
-
-    /**
-     * An Ast node that indicates the code
-     * represented by this node is unanalyzable.
-     */
-    public static class OpaqueNode extends AstNode implements Visitable {  
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitOpaqueNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitOpaqueNode(this, nodeList);
-        }
-    }
-
-    public static class StatementSequenceNode extends AstNodeDynamic implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitStatementSequenceNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitStatementSequenceNode(this, nodeList);
-        }
-    }
-
-    public static class VariableNode extends AstNode implements Visitable {
-        public enum Type {
-            UNKNOWN, INT, BOOLEAN
-        }
-        public Type type;
-        public String name;
-        public VariableNode(String name) {
-            super();
-            this.type = Type.UNKNOWN;
-            this.name = name;
-        }
-        public VariableNode(Type type, String name) {
-            super();
-            this.type = type;
-            this.name = name;
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitVariableNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitVariableNode(this, nodeList);
-        }
-    }
-
-    /** Arithmetic operations */
-
-    public static class AdditionNode extends AstNodeBinary implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitAdditionNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitAdditionNode(this, nodeList);
-        }
-    }
-
-    public static class SubtractionNode extends AstNodeBinary implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitSubtractionNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitSubtractionNode(this, nodeList);
-        }
-    }
-
-    public static class MultiplicationNode extends AstNodeBinary implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitMultiplicationNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitMultiplicationNode(this, nodeList);
-        }
-    }
-
-    public static class DivisionNode extends AstNodeBinary implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitDivisionNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitDivisionNode(this, nodeList);
-        }
-    }
-
-    /** Comparison operators */
-
-    public static class EqualNode extends AstNodeBinary implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitEqualNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitEqualNode(this, nodeList);
-        }
-    }
-
-    public static class NotEqualNode extends AstNodeBinary implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitNotEqualNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitNotEqualNode(this, nodeList);
-        }
-    }
-
-    public static class NegativeNode extends AstNodeUnary implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitNegativeNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitNegativeNode(this, nodeList);
-        }
-    }
-
-    public static class LessThanNode extends AstNodeBinary implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitLessThanNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitLessThanNode(this, nodeList);
-        }
-    }
-
-    public static class LessEqualNode extends AstNodeBinary implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitLessEqualNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitLessEqualNode(this, nodeList);
-        }
-    }
-
-    public static class GreaterThanNode extends AstNodeBinary implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitGreaterThanNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitGreaterThanNode(this, nodeList);
-        }
-    }
-
-    public static class GreaterEqualNode extends AstNodeBinary implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitGreaterEqualNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitGreaterEqualNode(this, nodeList);
-        }
-    }
-
-    /** LF built-in operations */
-    /**
-     * AST node for an lf_set call. The left child is the port being set.
-     * The right node is the value of the port.
-     */
-    public static class SetPortNode extends AstNodeBinary implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitSetPortNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitSetPortNode(this, nodeList);
-        }
-    }
-
-    /**
-     * AST node for a `lf_schedule(action, additional_delay)` call.
-     */
-    public static class ScheduleActionNode extends AstNodeDynamic implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitScheduleActionNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitScheduleActionNode(this, nodeList);
-        }
-    }
-
-    /**
-     * AST node for a `lf_schedule_int(action, additional_delay, integer)` call.
-     */
-    public static class ScheduleActionIntNode extends AstNodeDynamic implements Visitable {
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitScheduleActionIntNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitScheduleActionIntNode(this, nodeList);
-        }
-    }
-
-    /**
-     * Handle state variables appearing as self-><name>
-     */
-    public static class StateVarNode extends AstNode implements Visitable {
-        public String name;
-        public boolean prev = false; // By default, this is not a previous state.
-        public StateVarNode(String name) {
-            this.name = name;
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitStateVarNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitStateVarNode(this, nodeList);
-        }
-    }
-
-    /**
-     * Handle trigger values appearing as <name>->value
-     */
-    public static class TriggerValueNode extends AstNode implements Visitable {
-        public String name;
-        public TriggerValueNode(String name) {
-            this.name = name;
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitTriggerValueNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitTriggerValueNode(this, nodeList);
-        }
-    }
-
-    /**
-     * Handle trigger presence appearing as <name>->is_present
-     */
-    public static class TriggerIsPresentNode extends AstNode implements Visitable {
-        public String name;
-        public TriggerIsPresentNode(String name) {
-            this.name = name;
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor) {
-            return ((CAstVisitor<? extends T>)visitor).visitTriggerIsPresentNode(this);
-        }
-        @Override public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
-            return ((CAstVisitor<? extends T>)visitor).visitTriggerIsPresentNode(this, nodeList);
-        }
-    }
-}
diff --git a/org.lflang/src/org/lflang/analyses/cast/CAstVisitor.java b/org.lflang/src/org/lflang/analyses/cast/CAstVisitor.java
deleted file mode 100644
index 0f4f0763dd..0000000000
--- a/org.lflang/src/org/lflang/analyses/cast/CAstVisitor.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.lflang.analyses.cast;
-
-import java.util.List;
-
-/** Modeled after CVisitor.java */
-public interface CAstVisitor<T> extends AstVisitor<T> {
-    
-	T visitAstNode(CAst.AstNode node);
-	T visitAstNodeUnary(CAst.AstNodeUnary node);
-	T visitAstNodeBinary(CAst.AstNodeBinary node);
-	T visitAstNodeDynamic(CAst.AstNodeDynamic node);
-    T visitAssignmentNode(CAst.AssignmentNode node);
-	T visitIfBlockNode(CAst.IfBlockNode node);
-	T visitIfBodyNode(CAst.IfBodyNode node);
-	T visitLiteralNode(CAst.LiteralNode node);
-	T visitLogicalNotNode(CAst.LogicalNotNode node);
-	T visitLogicalAndNode(CAst.LogicalAndNode node);
-	T visitLogicalOrNode(CAst.LogicalOrNode node);
-	T visitOpaqueNode(CAst.OpaqueNode node);
-	T visitStatementSequenceNode(CAst.StatementSequenceNode node);
-	T visitVariableNode(CAst.VariableNode node);
-
-	T visitAdditionNode(CAst.AdditionNode node);
-	T visitSubtractionNode(CAst.SubtractionNode node);
-	T visitMultiplicationNode(CAst.MultiplicationNode node);
-	T visitDivisionNode(CAst.DivisionNode node);
-
-	T visitEqualNode(CAst.EqualNode node);
-	T visitNotEqualNode(CAst.NotEqualNode node);
-	T visitNegativeNode(CAst.NegativeNode node);
-	T visitLessThanNode(CAst.LessThanNode node);
-	T visitLessEqualNode(CAst.LessEqualNode node);
-	T visitGreaterThanNode(CAst.GreaterThanNode node);
-	T visitGreaterEqualNode(CAst.GreaterEqualNode node);
-
-	T visitSetPortNode(CAst.SetPortNode node);
-	T visitScheduleActionNode(CAst.ScheduleActionNode node);
-	T visitScheduleActionIntNode(CAst.ScheduleActionIntNode node);
-	T visitStateVarNode(CAst.StateVarNode node);
-	T visitTriggerValueNode(CAst.TriggerValueNode node);
-	T visitTriggerIsPresentNode(CAst.TriggerIsPresentNode node);
-
-	/** Used for converting an AST into If Normal Form. */
-	T visitAstNode(CAst.AstNode node, List<CAst.AstNode> nodeList);
-	T visitAstNodeUnary(CAst.AstNodeUnary node, List<CAst.AstNode> nodeList);
-	T visitAstNodeBinary(CAst.AstNodeBinary node, List<CAst.AstNode> nodeList);
-	T visitAstNodeDynamic(CAst.AstNodeDynamic node, List<CAst.AstNode> nodeList);
-    T visitAssignmentNode(CAst.AssignmentNode node, List<CAst.AstNode> nodeList);
-	T visitIfBlockNode(CAst.IfBlockNode node, List<CAst.AstNode> nodeList);
-	T visitIfBodyNode(CAst.IfBodyNode node, List<CAst.AstNode> nodeList);
-	T visitLiteralNode(CAst.LiteralNode node, List<CAst.AstNode> nodeList);
-	T visitLogicalNotNode(CAst.LogicalNotNode node, List<CAst.AstNode> nodeList);
-	T visitLogicalAndNode(CAst.LogicalAndNode node, List<CAst.AstNode> nodeList);
-	T visitLogicalOrNode(CAst.LogicalOrNode node, List<CAst.AstNode> nodeList);
-	T visitOpaqueNode(CAst.OpaqueNode node, List<CAst.AstNode> nodeList);
-	T visitStatementSequenceNode(CAst.StatementSequenceNode node, List<CAst.AstNode> nodeList);
-	T visitVariableNode(CAst.VariableNode node, List<CAst.AstNode> nodeList);
-
-	T visitAdditionNode(CAst.AdditionNode node, List<CAst.AstNode> nodeList);
-	T visitSubtractionNode(CAst.SubtractionNode node, List<CAst.AstNode> nodeList);
-	T visitMultiplicationNode(CAst.MultiplicationNode node, List<CAst.AstNode> nodeList);
-	T visitDivisionNode(CAst.DivisionNode node, List<CAst.AstNode> nodeList);
-
-	T visitEqualNode(CAst.EqualNode node, List<CAst.AstNode> nodeList);
-	T visitNotEqualNode(CAst.NotEqualNode node, List<CAst.AstNode> nodeList);
-	T visitNegativeNode(CAst.NegativeNode node, List<CAst.AstNode> nodeList);
-	T visitLessThanNode(CAst.LessThanNode node, List<CAst.AstNode> nodeList);
-	T visitLessEqualNode(CAst.LessEqualNode node, List<CAst.AstNode> nodeList);
-	T visitGreaterThanNode(CAst.GreaterThanNode node, List<CAst.AstNode> nodeList);
-	T visitGreaterEqualNode(CAst.GreaterEqualNode node, List<CAst.AstNode> nodeList);
-
-	T visitSetPortNode(CAst.SetPortNode node, List<CAst.AstNode> nodeList);
-	T visitScheduleActionNode(CAst.ScheduleActionNode node, List<CAst.AstNode> nodeList);
-	T visitScheduleActionIntNode(CAst.ScheduleActionIntNode node, List<CAst.AstNode> nodeList);
-	T visitStateVarNode(CAst.StateVarNode node, List<CAst.AstNode> nodeList);
-	T visitTriggerValueNode(CAst.TriggerValueNode node, List<CAst.AstNode> nodeList);
-	T visitTriggerIsPresentNode(CAst.TriggerIsPresentNode node, List<CAst.AstNode> nodeList);
-}
diff --git a/org.lflang/src/org/lflang/analyses/cast/CBaseAstVisitor.java b/org.lflang/src/org/lflang/analyses/cast/CBaseAstVisitor.java
deleted file mode 100644
index d30d4f75e2..0000000000
--- a/org.lflang/src/org/lflang/analyses/cast/CBaseAstVisitor.java
+++ /dev/null
@@ -1,360 +0,0 @@
-package org.lflang.analyses.cast;
-
-import java.util.List;
-
-/** 
- * A base class that provides default implementations
- * of the visit functions. Other C AST visitors extend
- * this class.
- */
-public class CBaseAstVisitor<T> extends AbstractAstVisitor<T> implements CAstVisitor<T> {
-    
-	/** 
-	 * These default implementations are not meant to be used.
-	 * They should be overriden by the child class.
-	 * In theory, this base visitor can be deleted?
-	 * Let's keep it here for now for consistency.
-	 */
-	@Override
-	public T visitAstNode(CAst.AstNode node) {
-		return null;
-	}
-
-	@Override
-	public T visitAstNodeUnary(CAst.AstNodeUnary node) {
-		if (node.child != null) {
-			T result = visit(node.child);
-		} else {
-			System.out.println("*** Child is empty in " + node + "!");
-		}
-		return null;
-	}
-
-	@Override
-	public T visitAstNodeBinary(CAst.AstNodeBinary node) {
-		if (node.left != null) {
-			T leftResult = visit(node.left);
-		} else {
-			System.out.println("*** Left child is empty in " + node + "!");
-		}
-		if (node.right != null) {
-			T rightResult = visit(node.right);
-		} else {
-			System.out.println("*** Right child is empty in " + node + "!");
-		}
-		// Aggregate results...
-		return null;
-	}
-
-	@Override
-	public T visitAstNodeDynamic(CAst.AstNodeDynamic node) {
-		for (CAst.AstNode n : node.children) {
-			T result = visit(n);
-		}
-		return null;
-	}
-
-    @Override
-	public T visitAssignmentNode(CAst.AssignmentNode node) {
-		return visitAstNodeBinary(node);
-	}
-
-	@Override
-	public T visitIfBlockNode(CAst.IfBlockNode node) {
-		return visitAstNodeBinary(node);
-	}
-
-	@Override
-	public T visitIfBodyNode(CAst.IfBodyNode node) {
-		return visitAstNodeBinary(node);
-	}
-
-	@Override
-	public T visitLiteralNode(CAst.LiteralNode node) {
-		return null;
-	}
-
-	@Override
-	public T visitLogicalNotNode(CAst.LogicalNotNode node) {
-		return visitAstNodeUnary(node);
-	}
-
-	@Override
-	public T visitLogicalAndNode(CAst.LogicalAndNode node) {
-		return visitAstNodeBinary(node);
-	}
-
-	@Override
-	public T visitLogicalOrNode(CAst.LogicalOrNode node) {
-		return visitAstNodeBinary(node);
-	}
-
-	@Override
-	public T visitOpaqueNode(CAst.OpaqueNode node) {
-		return visitAstNode(node);
-	}
-
-	@Override
-	public T visitStatementSequenceNode(CAst.StatementSequenceNode node) {
-		return visitAstNodeDynamic(node);
-	}
-
-	@Override
-	public T visitVariableNode(CAst.VariableNode node) {
-		return null;
-	}
-
-	/** Arithmetic operators */
-
-	@Override
-	public T visitAdditionNode(CAst.AdditionNode node) {
-		return visitAstNodeBinary(node);
-	}
-
-	@Override
-	public T visitSubtractionNode(CAst.SubtractionNode node) {
-		return visitAstNodeBinary(node);
-	}
-
-	@Override
-	public T visitMultiplicationNode(CAst.MultiplicationNode node) {
-		return visitAstNodeBinary(node);
-	}
-
-	@Override
-	public T visitDivisionNode(CAst.DivisionNode node) {
-		return visitAstNodeBinary(node);
-	}
-
-	/** Comparison operators */
-
-	@Override
-	public T visitEqualNode(CAst.EqualNode node) {
-		return visitAstNodeBinary(node);
-	}
-
-	@Override
-	public T visitNotEqualNode(CAst.NotEqualNode node) {
-		return visitAstNodeBinary(node);
-	}
-
-	@Override
-	public T visitNegativeNode(CAst.NegativeNode node) {
-		return visitNegativeNode(node);
-	}
-
-	@Override
-	public T visitLessThanNode(CAst.LessThanNode node) {
-		return visitAstNodeBinary(node);
-	}
-
-	@Override
-	public T visitLessEqualNode(CAst.LessEqualNode node) {
-		return visitAstNodeBinary(node);
-	}
-
-	@Override
-	public T visitGreaterThanNode(CAst.GreaterThanNode node) {
-		return visitAstNodeBinary(node);
-	}
-
-	@Override
-	public T visitGreaterEqualNode(CAst.GreaterEqualNode node) {
-		return visitAstNodeBinary(node);
-	}
-
-	/** LF built-in operations */
-
-	@Override
-	public T visitSetPortNode(CAst.SetPortNode node) {
-		return visitAstNodeBinary(node);
-	}
-
-	@Override
-	public T visitScheduleActionNode(CAst.ScheduleActionNode node) {
-		return visitAstNodeDynamic(node);
-	}
-
-	@Override
-	public T visitScheduleActionIntNode(CAst.ScheduleActionIntNode node) {
-		return visitAstNodeDynamic(node);
-	}
-
-	@Override
-	public T visitStateVarNode(CAst.StateVarNode node) {
-		return null;
-	}
-
-	@Override
-	public T visitTriggerValueNode(CAst.TriggerValueNode node) {
-		return null;
-	}
-
-	@Override
-	public T visitTriggerIsPresentNode(CAst.TriggerIsPresentNode node) {
-		return null;
-	}
-
-	//// With one more parameter.
-	@Override
-	public T visitAstNode(CAst.AstNode node, List<CAst.AstNode> nodeList) {
-		return visitAstNode(node);
-	}
-
-	@Override
-	public T visitAstNodeUnary(CAst.AstNodeUnary node, List<CAst.AstNode> nodeList) {
-		return visitAstNodeUnary(node);
-	}
-
-	@Override
-	public T visitAstNodeBinary(CAst.AstNodeBinary node, List<CAst.AstNode> nodeList) {
-		return visitAstNodeBinary(node);
-	}
-
-	@Override
-	public T visitAstNodeDynamic(CAst.AstNodeDynamic node, List<CAst.AstNode> nodeList) {
-		return visitAstNodeDynamic(node);
-	}
-
-	@Override
-	public T visitAssignmentNode(CAst.AssignmentNode node, List<CAst.AstNode> nodeList) {
-		return visitAssignmentNode(node);
-	}
-
-	@Override
-	public T visitIfBlockNode(CAst.IfBlockNode node, List<CAst.AstNode> nodeList) {
-		return visitIfBlockNode(node);
-	}
-
-	@Override
-	public T visitIfBodyNode(CAst.IfBodyNode node, List<CAst.AstNode> nodeList) {
-		return visitIfBodyNode(node);
-	}
-
-	@Override
-	public T visitLiteralNode(CAst.LiteralNode node, List<CAst.AstNode> nodeList) {
-		return visitLiteralNode(node);
-	}
-
-	@Override
-	public T visitLogicalNotNode(CAst.LogicalNotNode node, List<CAst.AstNode> nodeList) {
-		return visitLogicalNotNode(node);
-	}
-
-	@Override
-	public T visitLogicalAndNode(CAst.LogicalAndNode node, List<CAst.AstNode> nodeList) {
-		return visitLogicalAndNode(node);
-	}
-
-	@Override
-	public T visitLogicalOrNode(CAst.LogicalOrNode node, List<CAst.AstNode> nodeList) {
-		return visitLogicalOrNode(node);
-	}
-
-	@Override
-	public T visitOpaqueNode(CAst.OpaqueNode node, List<CAst.AstNode> nodeList) {
-		return visitOpaqueNode(node);
-	}
-
-	@Override
-	public T visitStatementSequenceNode(CAst.StatementSequenceNode node, List<CAst.AstNode> nodeList) {
-		return visitStatementSequenceNode(node);
-	}
-
-	@Override
-	public T visitVariableNode(CAst.VariableNode node, List<CAst.AstNode> nodeList) {
-		return visitVariableNode(node);
-	}
-
-	/** Arithmetic operators */
-	
-	@Override
-	public T visitAdditionNode(CAst.AdditionNode node, List<CAst.AstNode> nodeList) {
-		return visitAdditionNode(node);
-	}
-
-	@Override
-	public T visitSubtractionNode(CAst.SubtractionNode node, List<CAst.AstNode> nodeList) {
-		return visitSubtractionNode(node);
-	}
-
-	@Override
-	public T visitMultiplicationNode(CAst.MultiplicationNode node, List<CAst.AstNode> nodeList) {
-		return visitMultiplicationNode(node);
-	}
-
-	@Override
-	public T visitDivisionNode(CAst.DivisionNode node, List<CAst.AstNode> nodeList) {
-		return visitDivisionNode(node);
-	}
-
-	/** Comparison operators */
-	
-	@Override
-	public T visitEqualNode(CAst.EqualNode node, List<CAst.AstNode> nodeList) {
-		return visitEqualNode(node);
-	}
-
-	@Override
-	public T visitNotEqualNode(CAst.NotEqualNode node, List<CAst.AstNode> nodeList) {
-		return visitNotEqualNode(node);
-	}
-
-	@Override
-	public T visitNegativeNode(CAst.NegativeNode node, List<CAst.AstNode> nodeList) {
-		return visitNegativeNode(node);
-	}
-
-	@Override
-	public T visitLessThanNode(CAst.LessThanNode node, List<CAst.AstNode> nodeList) {
-		return visitLessThanNode(node);
-	}
-
-	@Override
-	public T visitLessEqualNode(CAst.LessEqualNode node, List<CAst.AstNode> nodeList) {
-		return visitLessEqualNode(node);
-	}
-
-	@Override
-	public T visitGreaterThanNode(CAst.GreaterThanNode node, List<CAst.AstNode> nodeList) {
-		return visitGreaterThanNode(node);
-	}
-
-	@Override
-	public T visitGreaterEqualNode(CAst.GreaterEqualNode node, List<CAst.AstNode> nodeList) {
-		return visitGreaterEqualNode(node);
-	}
-
-	/** LF built-in operations */
-
-	@Override
-	public T visitSetPortNode(CAst.SetPortNode node, List<CAst.AstNode> nodeList) {
-		return visitSetPortNode(node);
-	}
-
-	@Override
-	public T visitScheduleActionNode(CAst.ScheduleActionNode node, List<CAst.AstNode> nodeList) {
-		return visitScheduleActionNode(node);
-	}
-
-	@Override
-	public T visitScheduleActionIntNode(CAst.ScheduleActionIntNode node, List<CAst.AstNode> nodeList) {
-		return visitScheduleActionIntNode(node);
-	}
-
-	@Override
-	public T visitStateVarNode(CAst.StateVarNode node, List<CAst.AstNode> nodeList) {
-		return visitStateVarNode(node);
-	}
-
-	@Override
-	public T visitTriggerValueNode(CAst.TriggerValueNode node, List<CAst.AstNode> nodeList) {
-		return visitTriggerValueNode(node);
-	}
-
-	@Override
-	public T visitTriggerIsPresentNode(CAst.TriggerIsPresentNode node, List<CAst.AstNode> nodeList) {
-		return visitTriggerIsPresentNode(node);
-	}
-
-}
diff --git a/org.lflang/src/org/lflang/analyses/cast/CToUclidVisitor.java b/org.lflang/src/org/lflang/analyses/cast/CToUclidVisitor.java
deleted file mode 100644
index c794186cbe..0000000000
--- a/org.lflang/src/org/lflang/analyses/cast/CToUclidVisitor.java
+++ /dev/null
@@ -1,291 +0,0 @@
-package org.lflang.analyses.cast;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.lflang.generator.ActionInstance;
-import org.lflang.generator.NamedInstance;
-import org.lflang.generator.PortInstance;
-import org.lflang.generator.ReactionInstance;
-import org.lflang.generator.ReactorInstance;
-import org.lflang.generator.StateVariableInstance;
-import org.lflang.generator.TriggerInstance;
-import org.lflang.analyses.uclid.UclidGenerator;
-import org.lflang.analyses.cast.CAst.*;
-
-public class CToUclidVisitor extends CBaseAstVisitor<String> {
-
-    // The Uclid generator instance
-    protected UclidGenerator generator;
-
-    // The reaction instance for the generated axiom
-    protected ReactionInstance.Runtime reaction;
-    
-    // The reactor that contains the reaction
-    protected ReactorInstance reactor;
-
-    // A list of all the named instances
-    protected List<NamedInstance> instances = new ArrayList<NamedInstance>();
-
-    // Quantified variable
-    protected String qv = "i";
-    protected String qv2 = "j";
-
-    // Unchanged variables and triggers
-    protected List<StateVariableInstance> unchangedStates;
-    protected List<TriggerInstance> unchangedTriggers;
-
-    // FIXME: Make this more flexible and infer value from program.
-    // Default reset value
-    String defaultValue = "0";
-    String defaultPresence = "false";
-
-    public CToUclidVisitor(UclidGenerator generator, ReactionInstance.Runtime reaction) {
-        this.generator = generator;
-        this.reaction = reaction;
-        this.reactor = reaction.getReaction().getParent();
-        instances.addAll(this.reactor.inputs);
-        instances.addAll(this.reactor.outputs);
-        instances.addAll(this.reactor.actions);
-        instances.addAll(this.reactor.states);
-    }
-
-    @Override
-    public String visitAdditionNode(AdditionNode node) {
-        String lhs = visit(node.left);
-        String rhs = visit(node.right);
-        return "(" + lhs + " + " + rhs + ")";
-    }
-
-    @Override
-    public String visitAssignmentNode(AssignmentNode node) {
-        String lhs = visit(node.left);
-        String rhs = visit(node.right);
-        return "(" + lhs + " == " + rhs + ")";
-    }
-
-    @Override
-    public String visitDivisionNode(DivisionNode node) {
-        String lhs = visit(node.left);
-        String rhs = visit(node.right);
-        return "(" + lhs + " / " + rhs + ")";
-    }
-
-    @Override
-    public String visitEqualNode(EqualNode node) {
-        String lhs = visit(node.left);
-        String rhs = visit(node.right);
-        return "(" + lhs + " == " + rhs + ")";
-    }
-
-    @Override
-    public String visitGreaterEqualNode(GreaterEqualNode node) {
-        String lhs = visit(node.left);
-        String rhs = visit(node.right);
-        return "(" + lhs + " >= " + rhs + ")";
-    }
-
-    @Override
-    public String visitGreaterThanNode(GreaterThanNode node) {
-        String lhs = visit(node.left);
-        String rhs = visit(node.right);
-        return "(" + lhs + " > " + rhs + ")";
-    }
-
-    @Override
-    public String visitIfBlockNode(IfBlockNode node) {
-        String antecedent = visit(node.left); // Process if condition
-        String consequent = visit(((IfBodyNode)node.right).left);
-        return "(" + antecedent + " ==> " + "(" + consequent + "\n))";
-    }
-
-    @Override
-    public String visitLessEqualNode(LessEqualNode node) {
-        String lhs = visit(node.left);
-        String rhs = visit(node.right);
-        return "(" + lhs + " <= " + rhs + ")";
-    }
-
-    @Override
-    public String visitLessThanNode(LessThanNode node) {
-        String lhs = visit(node.left);
-        String rhs = visit(node.right);
-        return "(" + lhs + " < " + rhs + ")";
-    }
-
-    @Override
-    public String visitLiteralNode(LiteralNode node) {
-        return node.literal;
-    }
-
-    @Override
-    public String visitLogicalAndNode(LogicalAndNode node) {
-        String lhs = visit(node.left);
-        String rhs = visit(node.right);
-        return "(" + lhs + " && " + rhs + ")";
-    }
-
-    @Override
-    public String visitLogicalNotNode(LogicalNotNode node) {
-        return "!" + "(" + visit(node.child) + ")";
-    }
-
-    @Override
-    public String visitLogicalOrNode(LogicalOrNode node) {
-        String lhs = visit(node.left);
-        String rhs = visit(node.right);
-        return "(" + lhs + " || " + rhs + ")";
-    }
-
-    @Override
-    public String visitMultiplicationNode(MultiplicationNode node) {
-        String lhs = visit(node.left);
-        String rhs = visit(node.right);
-        return "(" + lhs + " * " + rhs + ")";
-    }
-
-    @Override
-    public String visitNotEqualNode(NotEqualNode node) {
-        String lhs = visit(node.left);
-        String rhs = visit(node.right);
-        return "(" + lhs + " != " + rhs + ")";
-    }
-
-    @Override
-    public String visitNegativeNode(NegativeNode node) {
-        return "(" + "-1*(" + visit(node.child) + "))";
-    }
-
-    @Override
-    public String visitScheduleActionNode(ScheduleActionNode node) {
-        String name = ((VariableNode)node.children.get(0)).name;
-        NamedInstance instance = getInstanceByName(name);
-        ActionInstance action = (ActionInstance)instance;
-        String additionalDelay = visit(node.children.get(1));
-        String str = "\n(" 
-            + "(finite_exists (" + this.qv2 + " : integer) in indices :: (" + this.qv2 + " > " + this.qv + " && " + this.qv2 + " <= END_TRACE) && ("
-            + "\n    " + action.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv2 + ")" + ")"
-            + "\n    " + "&& " + "tag_same" + "(" + "g(" + this.qv2 + ")" + ", " + "tag_schedule" + "(" + "g" + "(" + this.qv + ")" + ", " + "(" + action.getMinDelay().toNanoSeconds() + "+" + additionalDelay + ")" + ")" + ")"
-            + "\n    " + "&& " + action.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv2 + ")" + ")" + " == " + "0"
-            + "\n)) // Closes finite_exists"
-            + "\n&& " + action.getFullNameWithJoiner("_") + "_scheduled" + "(" + "d" + "(" + this.qv + ")" + ")"
-            + "\n)";
-        return str;
-    }
-
-    @Override
-    public String visitScheduleActionIntNode(ScheduleActionIntNode node) {
-        String name = ((VariableNode)node.children.get(0)).name;
-        NamedInstance instance = getInstanceByName(name);
-        ActionInstance action = (ActionInstance)instance;
-        String additionalDelay = visit(node.children.get(1));
-        String intValue = visit(node.children.get(2));
-        String str = "\n(" 
-            + "(finite_exists (" + this.qv2 + " : integer) in indices :: (" + this.qv2 + " > " + this.qv + " && " + this.qv2 + " <= END_TRACE) && ("
-            + "\n    " + action.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv2 + ")" + ")"
-            + "\n    " + "&& " + "tag_same" + "(" + "g(" + this.qv2 + ")" + ", " + "tag_schedule" + "(" + "g" + "(" + this.qv + ")" + ", " + "(" + action.getMinDelay().toNanoSeconds() + "+" + additionalDelay + ")" + ")" + ")"
-            + "\n)) // Closes finite_exists"
-            + "\n&& " + action.getFullNameWithJoiner("_") + "_scheduled" + "(" + "d" + "(" + this.qv + ")" + ")"
-            + "\n&& " + action.getFullNameWithJoiner("_") + "_scheduled_payload" + "(" + "pl" + "(" + this.qv + ")" + ")" + " == " + intValue
-            + "\n)";
-        return str;
-    }
-
-    @Override
-    public String visitSetPortNode(SetPortNode node) {
-        NamedInstance port = getInstanceByName(((VariableNode)node.left).name);
-        String value = visit(node.right);
-        // Remove this port from the unchanged list.
-        // this.unchangedTriggers.remove(port);
-        return "("
-            + "("
-            + port.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")"
-            + " == " + value
-            + ")"
-            + " && "
-            + "(" + port.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv + ")" + ")" + ")"
-            + ")";
-    }
-
-    @Override
-    public String visitStateVarNode(StateVarNode node) {
-        NamedInstance instance = getInstanceByName(node.name);
-        if (instance != null) {
-            return instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + (node.prev ? "-1" : "") + ")" + ")";
-        }
-        // FIXME: Throw exception
-        return "";
-    }
-
-    @Override
-    public String visitStatementSequenceNode(StatementSequenceNode node) {
-        String axiom = "";
-        for (int i = 0; i < node.children.size(); i++) {
-            axiom += visit(node.children.get(i));
-            if (i != node.children.size() - 1) axiom += "\n" + "        " + "&& ";
-        }
-        return axiom;
-    }
-
-    @Override
-    public String visitSubtractionNode(SubtractionNode node) {
-        String lhs = visit(node.left);
-        String rhs = visit(node.right);
-        return "(" + lhs + " - " + rhs + ")";
-    }
-
-    @Override
-    public String visitTriggerIsPresentNode(TriggerIsPresentNode node) {
-        // Find the trigger instance by name.
-        NamedInstance instance = getInstanceByName(node.name);
-        if (instance != null) {
-            return instance.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + this.qv + ")" + ")";
-        }
-        // FIXME: Throw exception
-        return "";
-    }
-
-    @Override
-    public String visitTriggerValueNode(TriggerValueNode node) {
-        // Find the trigger instance by name.
-        NamedInstance instance = getInstanceByName(node.name);
-        if (instance != null) {
-            return instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
-        }
-        // FIXME: Throw exception
-        return "";
-    }
-
-    @Override
-    public String visitVariableNode(VariableNode node) {
-        NamedInstance instance = getInstanceByName(node.name);
-        if (instance != null) {
-            return instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
-        }
-        // FIXME: Throw exception
-        return "";
-    }
-
-    /////////////////////////////
-    //// Private functions
-
-    private NamedInstance getInstanceByName(String name) {
-        for (NamedInstance i : this.instances) {
-            if (i instanceof ActionInstance) {
-                if (((ActionInstance)i).getDefinition().getName().equals(name)) {
-                    return i;
-                }
-            } else if (i instanceof PortInstance) {
-                if (((PortInstance)i).getDefinition().getName().equals(name)) {
-                    return i;
-                }
-            } else if (i instanceof StateVariableInstance) {
-                if (((StateVariableInstance)i).getDefinition().getName().equals(name)) {
-                    return i;
-                }
-            }
-        }
-        System.out.println("Named instance" + "not found.");
-        return null;
-    }
-}
diff --git a/org.lflang/src/org/lflang/analyses/cast/IfNormalFormAstVisitor.java b/org.lflang/src/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
deleted file mode 100644
index 31b2f4c5a7..0000000000
--- a/org.lflang/src/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.lflang.analyses.cast;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * An AST visitor that converts an original AST into the If Normal Form.
- * See "Bounded Model Checking of Software using SMT Solvers instead of
- * SAT Solvers" for details about the If Normal Form 
- * (https://link.springer.com/chapter/10.1007/11691617_9).
- * 
- * There are several requirements for an AST to be in INF:
- * 1. There should be a single StatementSequence (SS) root node;
- * 2. Each child of the SS node should be an IfBlockNode;
- * 3. Variables in a subsequent child should be marked as "primed"
- *    versions of those in the previous child.
- * 
- * Limitations:
- * 1. The implementation does not take the scope into account.
- *    E.g. "int i = 0; { int j = 0; }" is treated the same as
- *    "int i = 0; int j = 0;".
- * 2. Due to the above limitation, the implementation assumes
- *    that each variable has a unique name.
- *    E.g. "{ int i = 0; }{ int i = 0; }" is an ill-formed program.
- * 
- * In this program, visit() is the normalise() in the paper.
- */
-public class IfNormalFormAstVisitor extends CBaseAstVisitor<Void> {
-
-    public CAst.StatementSequenceNode INF = new CAst.StatementSequenceNode();
-    
-    @Override
-    public Void visitStatementSequenceNode(CAst.StatementSequenceNode node, List<CAst.AstNode> conditions) {
-        // Create a new StatementSequenceNode.        
-        for (CAst.AstNode child : node.children) {
-            visit(child, conditions);
-        }
-        return null;
-    }
-
-    @Override
-    public Void visitAssignmentNode(CAst.AssignmentNode node, List<CAst.AstNode> conditions) {
-        this.INF.children.add(generateIfBlock(node, conditions));
-        return null;
-    }
-
-    @Override
-    public Void visitSetPortNode(CAst.SetPortNode node, List<CAst.AstNode> conditions) {
-        this.INF.children.add(generateIfBlock(node, conditions));
-        return null;
-    }
-
-	@Override
-	public Void visitScheduleActionNode(CAst.ScheduleActionNode node, List<CAst.AstNode> conditions) {
-		this.INF.children.add(generateIfBlock(node, conditions));
-        return null;
-	}
-
-    @Override
-	public Void visitScheduleActionIntNode(CAst.ScheduleActionIntNode node, List<CAst.AstNode> conditions) {
-		this.INF.children.add(generateIfBlock(node, conditions));
-        return null;
-	}
-
-    @Override
-    public Void visitIfBlockNode(CAst.IfBlockNode node, List<CAst.AstNode> conditions) {
-        List<CAst.AstNode> leftConditions = new ArrayList<>(conditions);
-        leftConditions.add(node.left);
-        visit(((CAst.IfBodyNode)node.right).left, leftConditions);
-        if (((CAst.IfBodyNode)node.right).right != null) {
-            List<CAst.AstNode> rightConditions = new ArrayList<>(conditions);
-            // Add a not node.
-            CAst.LogicalNotNode notNode = new CAst.LogicalNotNode();
-            notNode.child = node.left; // Negate the condition.
-            rightConditions.add(notNode);
-            visit(((CAst.IfBodyNode)node.right).right, rightConditions);
-        }
-        return null;
-    }
-
-    private CAst.IfBlockNode generateIfBlock(CAst.AstNode node, List<CAst.AstNode> conditions) {
-        // Create an If Block node.
-        CAst.IfBlockNode ifNode = new CAst.IfBlockNode();
-        // Set the condition of the if block node.
-        CAst.AstNode conjunction = AstUtils.takeConjunction(conditions);
-        ifNode.left = conjunction;
-        // Create a new body node.
-        CAst.IfBodyNode body = new CAst.IfBodyNode();
-        ifNode.right = body;
-        // Set the then branch to the assignment.
-        body.left = node;
-
-        return ifNode;
-    }
-}
diff --git a/org.lflang/src/org/lflang/analyses/cast/VariablePrecedenceVisitor.java b/org.lflang/src/org/lflang/analyses/cast/VariablePrecedenceVisitor.java
deleted file mode 100644
index bada1be519..0000000000
--- a/org.lflang/src/org/lflang/analyses/cast/VariablePrecedenceVisitor.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.lflang.analyses.cast;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.lflang.analyses.cast.CAst.*;
-
-/**
- * This visitor marks certain variable node as "previous."
- */
-public class VariablePrecedenceVisitor extends CBaseAstVisitor<Void> {
-
-    // This is a temporary solution and cannot handle,
-    // e.g., self->s = (self->s + 1) - (2 * 2).
-    @Override
-    public Void visitAssignmentNode(AssignmentNode node) {
-        // System.out.println("******* In assignment!!!");
-        if (node.left instanceof StateVarNode) {
-            if (node.right instanceof AstNodeBinary) {
-                AstNodeBinary n = (AstNodeBinary)node.right;
-                if (n.left instanceof StateVarNode) {
-                    ((StateVarNode)n.left).prev = true;
-                }
-                if (n.right instanceof StateVarNode) {
-                    ((StateVarNode)n.right).prev = true;
-                }
-            }
-        } else {
-            System.out.println("Unreachable!"); // FIXME: Throw exception.
-        }
-        return null;
-    }
-
-    @Override
-    public Void visitIfBlockNode(IfBlockNode node) {
-        if (((IfBodyNode)node.right).left != null)
-            visit(((IfBodyNode)node.right).left);
-        if (((IfBodyNode)node.right).right != null)
-            visit(((IfBodyNode)node.right).right);
-        return null;
-    }
-
-    @Override
-    public Void visitStatementSequenceNode(StatementSequenceNode node) {
-        for (int i = 0; i < node.children.size(); i++) {
-            visit(node.children.get(i));
-        }
-        return null;
-    }
-}
diff --git a/org.lflang/src/org/lflang/analyses/cast/Visitable.java b/org.lflang/src/org/lflang/analyses/cast/Visitable.java
deleted file mode 100644
index 835894f06b..0000000000
--- a/org.lflang/src/org/lflang/analyses/cast/Visitable.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.lflang.analyses.cast;
-
-import java.util.List;
-
-public interface Visitable {
-    
-    /** The {@link AstVisitor} needs a double dispatch method. */
-    <T> T accept(AstVisitor<? extends T> visitor);
-
-    /** The {@link AstVisitor} needs a double dispatch method. */
-    <T> T accept(AstVisitor<? extends T> visitor, List<CAst.AstNode> nodeList);
-}
diff --git a/org.lflang/src/org/lflang/analyses/statespace/Event.java b/org.lflang/src/org/lflang/analyses/statespace/Event.java
deleted file mode 100644
index dc8613af92..0000000000
--- a/org.lflang/src/org/lflang/analyses/statespace/Event.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/** 
- * A node in the state space diagram representing a step
- * in the execution of an LF program.
- * 
- * 
- */
-package org.lflang.analyses.statespace;
-
-import org.lflang.generator.TriggerInstance;
-
-public class Event implements Comparable<Event> {
-
-    public TriggerInstance trigger;
-    public Tag tag;
-
-    public Event(TriggerInstance trigger, Tag tag) {
-        this.trigger = trigger;
-        this.tag = tag;
-    }
-
-    public TriggerInstance getTrigger() {
-        return this.trigger;
-    }
-    
-    @Override
-    public int compareTo(Event e) {
-        // Compare tags first.
-        int ret = this.tag.compareTo(e.tag);
-        // If tags match, compare trigger names.
-        if (ret == 0)
-            ret = this.trigger.getFullName()
-                              .compareTo(e.trigger.getFullName());
-        return ret;
-    }
-
-    /**
-     * This equals() method does NOT compare tags,
-     * only compares triggers.
-     */
-    @Override
-    public boolean equals(Object o) {
-        if (o == null) return false;
-        if (o instanceof Event) {
-            Event e = (Event) o;
-            if (this.trigger.equals(e.trigger))
-                return true;
-        }
-        return false;
-    }
-
-    @Override
-    public String toString() {
-        return "(" + trigger.getFullName() + ", " + tag + ")";
-    }
-}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/analyses/statespace/EventQueue.java b/org.lflang/src/org/lflang/analyses/statespace/EventQueue.java
deleted file mode 100644
index 4c809d091a..0000000000
--- a/org.lflang/src/org/lflang/analyses/statespace/EventQueue.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * An event queue implementation that
- * sorts events by time tag order
- *
- * 
- */
-package org.lflang.analyses.statespace;
-
-import java.util.PriorityQueue;
-
-public class EventQueue extends PriorityQueue<Event> {
-
-    /**
-     * Modify the original add() by enforcing uniqueness.
-     * There cannot be duplicate events in the event queue.
-     */
-    @Override
-    public boolean add(Event e) {
-        if (this.contains(e))
-            return false;
-        super.add(e);
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateInfo.java b/org.lflang/src/org/lflang/analyses/statespace/StateInfo.java
deleted file mode 100644
index 7930336d7e..0000000000
--- a/org.lflang/src/org/lflang/analyses/statespace/StateInfo.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/** 
- * A class that represents information in a step
- * in a counterexample trace
- * 
- * 
- */
-package org.lflang.analyses.statespace;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-public class StateInfo {
-
-    public ArrayList<String>        reactions   = new ArrayList<>();
-    public Tag                      tag;
-    public HashMap<String, String>  variables   = new HashMap<>();
-    public HashMap<String, String>  triggers    = new HashMap<>();
-    public HashMap<String, String>  scheduled   = new HashMap<>();
-    public HashMap<String, String>  payloads    = new HashMap<>();
-
-    public void display() {
-        System.out.println("reactions: " + reactions);
-        System.out.println("tag: " + tag);
-        System.out.println("variables: " + variables);
-        System.out.println("triggers: " + triggers);
-        System.out.println("scheduled: " + scheduled);
-        System.out.println("payloads: " + payloads);
-    }
-}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
deleted file mode 100644
index 4615dececd..0000000000
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceDiagram.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/** 
- * A directed graph representing the state space of an LF program.
- * 
- * 
- */
-package org.lflang.analyses.statespace;
-
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
-
-import org.lflang.TimeValue;
-import org.lflang.generator.CodeBuilder;
-import org.lflang.generator.ReactionInstance;
-import org.lflang.graph.DirectedGraph;
-
-// FIXME: Use a linkedlist instead.
-public class StateSpaceDiagram extends DirectedGraph<StateSpaceNode> {
-
-    /**
-     * The first node of the state space diagram.
-     */
-    public StateSpaceNode head;
-
-    /**
-     * The last node of the state space diagram.
-     */
-    public StateSpaceNode tail;
-
-    /**
-     * The previously encountered node which the tail node
-     * goes back to, i.e. the location where the back loop happens.
-     */
-    public StateSpaceNode loopNode;
-
-    /**
-     * Store the state when the loop node is reached for
-     * the 2nd time. This is used to calculate the elapsed
-     * logical time on the back loop edge.
-     */
-    public StateSpaceNode loopNodeNext;
-
-    /**
-     * The logical time elapsed for each loop iteration.
-     */
-    public long loopPeriod;
-
-    /**
-     * A dot file that represents the diagram
-     */
-    private CodeBuilder dot;
-
-    /**
-     * 
-     */
-    private final boolean compactDot = false;
-
-    /**
-     * Before adding the node, assign it an index.
-     */
-    @Override
-    public void addNode(StateSpaceNode node) {
-        node.index = this.nodeCount();
-        super.addNode(node);
-    }
-
-    /**
-     * Get the immediately downstream node.
-     */
-    public StateSpaceNode getDownstreamNode(StateSpaceNode node) {
-        Set<StateSpaceNode> downstream = this.getDownstreamAdjacentNodes(node);
-        if (downstream == null || downstream.size() == 0)
-            return null;
-        return (StateSpaceNode)downstream.toArray()[0];
-    }
-
-    /**
-     * Pretty print the diagram.
-     */
-    public void display() {
-        System.out.println("*************************************************");
-        System.out.println("* Pretty printing worst-case state space diagram:");
-        long timestamp;
-        StateSpaceNode node = this.head;
-        if (node == null) {
-            System.out.println("* EMPTY");
-            System.out.println("*************************************************");
-            return;
-        }
-        while(node != this.tail) {
-            System.out.print("* State " + node.index + ": ");
-            node.display();
-
-            // Store the tag of the prior step.
-            timestamp = node.tag.timestamp;
-
-            // Assume a unique next state.
-            node = getDownstreamNode(node);
-
-            // Compute time difference
-            if (node != null) {
-                TimeValue tsDiff = TimeValue.fromNanoSeconds(node.tag.timestamp - timestamp);
-                System.out.println("*     => Advance time by " + tsDiff);
-            }
-        }
-
-        // Print tail node
-        System.out.print("* (Tail) state " + node.index + ": ");
-        node.display();
-
-        if (this.loopNode != null) {
-            // Compute time difference
-            TimeValue tsDiff = TimeValue.fromNanoSeconds(loopNodeNext.tag.timestamp - tail.tag.timestamp);
-            System.out.println("*     => Advance time by " + tsDiff);
-
-            System.out.println("* Goes back to loop node: state " + this.loopNode.index);
-            System.out.print("* Loop node reached 2nd time: ");
-            this.loopNodeNext.display();
-        }
-        System.out.println("*************************************************");
-    }
-
-    /**
-     * Generate a dot file from the state space diagram.
-     * 
-     * @return a CodeBuilder with the generated code
-     */
-    public CodeBuilder generateDot() {
-        if (dot == null) {
-            dot = new CodeBuilder();
-            dot.pr("digraph G {");
-            dot.indent();
-            if (this.loopNode != null) {
-                dot.pr("layout=circo;");
-            }
-            dot.pr("rankdir=LR;");
-            if (this.compactDot) {
-                dot.pr("mindist=1.5;");
-                dot.pr("overlap=false");
-                dot.pr("node [shape=Mrecord fontsize=40]");
-                dot.pr("edge [fontsize=40 penwidth=3 arrowsize=2]");
-            } else {
-                dot.pr("node [shape=Mrecord]");
-            }
-            // Generate a node for each state.
-            if (this.compactDot) {
-                for (StateSpaceNode n : this.nodes()) {
-                    dot.pr("S" + n.index + " [" + "label = \" {" + "S" + n.index
-                        + " | " + n.reactionsInvoked.size() + " | " + n.eventQ.size() + "}"
-                        + " | " + n.tag
-                        + "\"" + "]");
-                }
-            } else {
-                for (StateSpaceNode n : this.nodes()) {
-                    List<String> reactions = n.reactionsInvoked.stream()
-                        .map(ReactionInstance::getFullName).collect(Collectors.toList());
-                    String reactionsStr = String.join("\\n", reactions);
-                    List<String> events = n.eventQ.stream()
-                        .map(Event::toString).collect(Collectors.toList());
-                    String eventsStr = String.join("\\n", events);
-                    dot.pr("S" + n.index + " [" + "label = \"" + "S" + n.index
-                        + " | " + n.tag
-                        + " | " + "Reactions invoked:\\n" + reactionsStr
-                        + " | " + "Pending events:\\n" + eventsStr
-                        + "\"" + "]");
-                }
-            }
-
-            StateSpaceNode current = this.head;
-            StateSpaceNode next = getDownstreamNode(this.head);
-            while (current != null && next != null && current != this.tail) {
-                TimeValue tsDiff = TimeValue.fromNanoSeconds(next.tag.timestamp - current.tag.timestamp);
-                dot.pr("S" + current.index + " -> " + "S" + next.index + " [label = " + "\"" + "+" + tsDiff + "\"" + "]");
-                current = next;
-                next = getDownstreamNode(next);
-            }
-
-            if (loopNode != null) {
-                TimeValue tsDiff = TimeValue.fromNanoSeconds(loopNodeNext.tag.timestamp - tail.tag.timestamp);
-                TimeValue period = TimeValue.fromNanoSeconds(loopPeriod);
-                dot.pr("S" + current.index + " -> " + "S" + next.index
-                    + " [label = " + "\"" + "+" + tsDiff + " -" + period + "\""
-                    + " weight = 0 " + "]");
-            }
-
-            dot.unindent();
-            dot.pr("}");
-        }
-        return this.dot;
-    }
-}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
deleted file mode 100644
index df708228de..0000000000
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceExplorer.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/**
- * Explores the state space of an LF program.
- */
-package org.lflang.analyses.statespace;
-
-import java.lang.Integer;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.xtext.xbase.lib.Exceptions;
-
-import org.lflang.TimeUnit;
-import org.lflang.TimeValue;
-import org.lflang.analyses.statespace.Event;
-import org.lflang.analyses.statespace.Tag;
-import org.lflang.generator.ActionInstance;
-import org.lflang.generator.CodeBuilder;
-import org.lflang.generator.PortInstance;
-import org.lflang.generator.ReactionInstance;
-import org.lflang.generator.ReactorInstance;
-import org.lflang.generator.RuntimeRange;
-import org.lflang.generator.SendRange;
-import org.lflang.generator.TimerInstance;
-import org.lflang.generator.TriggerInstance;
-import org.lflang.lf.Expression;
-import org.lflang.lf.Time;
-import org.lflang.lf.Variable;
-
-public class StateSpaceExplorer {
-
-    // Instantiate an empty state space diagram.
-    public StateSpaceDiagram diagram = new StateSpaceDiagram();
-
-    // Indicate whether a back loop is found in the state space.
-    // A back loop suggests periodic behavior.
-    public boolean loopFound = false;
-
-    /**
-     * Instantiate a global event queue.
-     * We will use this event queue to symbolically simulate
-     * the logical timeline. This simulation is also valid
-     * for runtime implementations that are federated or relax
-     * global barrier synchronization, since an LF program
-     * defines a unique logical timeline (assuming all reactions
-     * behave _consistently_ throughout the execution).
-     */
-    public EventQueue eventQ = new EventQueue();
-
-    /**
-     * The main reactor instance based on which the state space
-     * is explored.
-     */
-    public ReactorInstance main;
-
-    // Constructor
-    public StateSpaceExplorer(ReactorInstance main) {
-        this.main = main;
-    }
-
-    /**
-     * Recursively add the first events to the event queue.
-     */
-    public void addInitialEvents(ReactorInstance reactor) {
-        // Add the startup trigger, if exists.
-        var startup = reactor.getStartupTrigger();
-        if (startup != null)
-            eventQ.add(new Event(startup, new Tag(0, 0, false)));
-
-        // Add the initial timer firings, if exist.
-        for (TimerInstance timer : reactor.timers) {
-            eventQ.add(
-                new Event(
-                    timer,
-                    new Tag(timer.getOffset().toNanoSeconds(), 0, false)
-                )
-            );
-        }
-
-        // Recursion
-        for (var child : reactor.children) {
-            addInitialEvents(child);
-        }
-    } 
-
-    /**
-     * Explore the state space and populate the state space diagram
-     * until the specified horizon (i.e. the end tag) is reached
-     * OR until the event queue is empty.
-     * 
-     * As an optimization, if findLoop is true, the algorithm
-     * tries to find a loop in the state space during exploration.
-     * If a loop is found (i.e. a previously encountered state
-     * is reached again) during exploration, the function returns early.
-     * 
-     * TODOs:
-     * 1. Handle action with 0 min delay.
-     * 2. Check if zero-delay connection works.
-     */
-    public void explore(Tag horizon, boolean findLoop) {
-        // Traverse the main reactor instance recursively to find
-        // the known initial events (startup and timers' first firings).
-        // FIXME: It seems that we need to handle shutdown triggers 
-        // separately, because they could break the back loop.
-        addInitialEvents(this.main);
-        
-        Tag             previousTag  = null; // Tag in the previous loop ITERATION
-        Tag             currentTag   = null;  // Tag in the current  loop ITERATION
-        StateSpaceNode  currentNode  = null;
-        StateSpaceNode  previousNode = null;
-        HashMap<Integer,StateSpaceNode> uniqueNodes = new HashMap<>();
-        boolean         stop         = true;
-        if (this.eventQ.size() > 0) {
-            stop = false;
-            currentTag = (eventQ.peek()).tag;
-        }
-
-        // A list of reactions invoked at the current logical tag
-        Set<ReactionInstance> reactionsInvoked;
-        // A temporary list of reactions processed in the current LOOP ITERATION
-        Set<ReactionInstance> reactionsTemp;
-
-        while (!stop) {
-
-            // Pop the events from the earliest tag off the event queue.
-            ArrayList<Event> currentEvents = new ArrayList<Event>();
-            // FIXME: Use stream methods here?
-            while (
-                eventQ.size() > 0 
-                && eventQ.peek().tag.compareTo(currentTag) == 0
-            ) {
-                Event e = eventQ.poll();
-                // System.out.println("DEBUG: Popped an event: " + e);
-                currentEvents.add(e);
-            }
-
-            // Collect all the reactions invoked in this current LOOP ITERATION
-            // triggered by the earliest events.
-            // Using a hash set here to make sure the reactions invoked
-            // are unique. Sometimes multiple events can trigger the same reaction,
-            // and we do not want to record duplicate reaction invocations.
-            reactionsTemp = new HashSet<ReactionInstance>();
-            for (Event e : currentEvents) {
-                Set<ReactionInstance> dependentReactions
-                    = e.trigger.getDependentReactions();
-                reactionsTemp.addAll(dependentReactions);
-                // System.out.println("DEBUG: ReactionTemp: " + reactionsTemp);
-
-                // If the event is a timer firing, enqueue the next firing.
-                if (e.trigger instanceof TimerInstance) {
-                    TimerInstance timer = (TimerInstance) e.trigger;
-                    eventQ.add(new Event(
-                        timer,
-                        new Tag(
-                            e.tag.timestamp + timer.getPeriod().toNanoSeconds(),
-                            0, // A time advancement resets microstep to 0.
-                            false
-                        ))
-                    );
-                }
-            }
-
-            // For each reaction invoked, compute the new events produced.
-            for (ReactionInstance reaction : reactionsTemp) {
-                // Iterate over all the effects produced by this reaction.
-                // If the effect is a port, obtain the downstream port along
-                // a connection and enqueue a future event for that port.
-                // If the effect is an action, enqueue a future event for
-                // this action.
-                for (TriggerInstance<? extends Variable> effect : reaction.effects) {
-                    if (effect instanceof PortInstance) {
-                        
-                        for (SendRange senderRange
-                                : ((PortInstance)effect).getDependentPorts()) {
-
-                            for (RuntimeRange<PortInstance> destinationRange
-                                    : senderRange.destinations) {
-                                PortInstance downstreamPort = destinationRange.instance;
-
-                                // Getting delay from connection
-                                // FIXME: Is there a more concise way to do this?
-                                long delay = 0;
-                                Expression delayExpr = senderRange.connection.getDelay();
-                                if (delayExpr instanceof Time) {
-                                    long interval = ((Time) delayExpr).getInterval();
-                                    String unit = ((Time) delayExpr).getUnit();
-                                    TimeValue timeValue = new TimeValue(interval, TimeUnit.fromName(unit));
-                                    delay = timeValue.toNanoSeconds();
-                                }
-
-                                // Create and enqueue a new event.
-                                Event e = new Event(
-                                    downstreamPort,
-                                    new Tag(currentTag.timestamp + delay, 0, false)
-                                );
-                                // System.out.println("DEBUG: Added a port event: " + e);
-                                eventQ.add(e);
-                            }
-                        }
-                    }
-                    else if (effect instanceof ActionInstance) {
-                        // Get the minimum delay of this action.
-                        long min_delay = ((ActionInstance)effect).getMinDelay().toNanoSeconds();
-                        long microstep = 0;
-                        if (min_delay == 0) {
-                            microstep = currentTag.microstep + 1;
-                        }
-                        // Create and enqueue a new event.
-                        Event e = new Event(
-                            effect,
-                            new Tag(currentTag.timestamp + min_delay, microstep, false)
-                        );
-                        // System.out.println("DEBUG: Added an action event: " + e);
-                        eventQ.add(e);
-                    }
-                }
-            }
-
-            // We are at the first iteration.
-            // Initialize currentNode.
-            if (previousTag == null) {
-                // System.out.println("DEBUG: Case 1");
-                //// Now we are done with the node at the previous tag,
-                //// work on the new node at the current timestamp.
-                // Copy the reactions in reactionsTemp.
-                reactionsInvoked = new HashSet<ReactionInstance>(reactionsTemp);
-
-                // Create a new state in the SSD for the current tag,
-                // add the reactions triggered to the state,
-                // and add a snapshot of the event queue (with new events
-                // generated by reaction invocations in the curren tag)
-                // to the state.
-                StateSpaceNode node = new StateSpaceNode(
-                    currentTag,                    // Current tag
-                    reactionsInvoked,              // Reactions invoked at this tag
-                    new ArrayList<Event>(eventQ)   // A snapshot of the event queue
-                );
-
-                // Initialize currentNode.
-                currentNode = node;
-            }
-            // When we advance to a new TIMESTAMP (not a new tag),
-            // create a new node in the state space diagram
-            // for everything processed in the previous timestamp.
-            // This makes sure that the granularity of nodes is
-            // at the timestamp-level, so that we don't have to
-            // worry about microsteps.
-            else if (
-                previousTag != null
-                && currentTag.timestamp > previousTag.timestamp
-            ) {
-                // System.out.println("DEBUG: Case 2");
-                // Whenever we finish a tag, check for loops fist.
-                // If currentNode matches an existing node in uniqueNodes,
-                // duplicate is set to the existing node.
-                StateSpaceNode duplicate;
-                if (findLoop &&
-                    (duplicate = uniqueNodes.put(
-                        currentNode.hash(), currentNode)) != null) {
-
-                    // Mark the loop in the diagram.
-                    loopFound = true;
-                    this.diagram.loopNode = duplicate;
-                    this.diagram.loopNodeNext = currentNode;
-                    this.diagram.tail = previousNode;
-                    // Loop period is the time difference between the 1st time
-                    // the node is reached and the 2nd time the node is reached.
-                    this.diagram.loopPeriod = this.diagram.loopNodeNext.tag.timestamp
-                                                - this.diagram.loopNode.tag.timestamp;
-                    this.diagram.addEdge(this.diagram.loopNode, this.diagram.tail);
-                    return; // Exit the while loop early.
-                }
-
-                // Now we are at a new tag, and a loop is not found,
-                // add the node to the state space diagram.
-                // Adding a node to the graph once it is finalized
-                // because this makes checking duplicate nodes easier.
-                // We don't have to remove a node from the graph.
-                this.diagram.addNode(currentNode);
-                this.diagram.tail = currentNode; // Update the current tail.
-                
-                // If the head is not empty, add an edge from the previous state
-                // to the next state. Otherwise initialize the head to the new node.
-                if (previousNode != null) {
-                    // System.out.println("--- Add a new edge between " + currentNode + " and " + node);
-                    // this.diagram.addEdge(currentNode, previousNode); // Sink first, then source
-                    if (previousNode != currentNode)
-                        this.diagram.addEdge(currentNode, previousNode);
-                }
-                else
-                    this.diagram.head = currentNode; // Initialize the head.
-
-                //// Now we are done with the node at the previous tag,
-                //// work on the new node at the current timestamp.
-                // Copy the reactions in reactionsTemp.
-                reactionsInvoked = new HashSet<ReactionInstance>(reactionsTemp);
-
-                // Create a new state in the SSD for the current tag,
-                // add the reactions triggered to the state,
-                // and add a snapshot of the event queue (with new events
-                // generated by reaction invocations in the curren tag)
-                // to the state.
-                StateSpaceNode node = new StateSpaceNode(
-                    currentTag,                    // Current tag
-                    reactionsInvoked,              // Reactions invoked at this tag
-                    new ArrayList<Event>(eventQ)    // A snapshot of the event queue
-                );
-                
-                // Update the previous node.
-                previousNode = currentNode;
-                // Update the current node to the new (potentially incomplete) node.
-                currentNode = node;
-            }
-            // Timestamp does not advance because we are processing
-            // connections with zero delay.
-            else if (
-                previousTag != null
-                && currentTag.timestamp == previousTag.timestamp
-            ) {
-                // System.out.println("DEBUG: Case 3");
-                // Add reactions explored in the current loop iteration
-                // to the existing state space node.
-                currentNode.reactionsInvoked.addAll(reactionsTemp);
-                // Update the eventQ snapshot.
-                currentNode.eventQ = new ArrayList<Event>(eventQ);            }
-            else {
-                // Unreachable
-                Exceptions.sneakyThrow(new Exception("Reached an unreachable part."));
-            }
-
-            // Update the current tag for the next iteration.
-            if (eventQ.size() > 0) {
-                previousTag = currentTag;
-                currentTag = eventQ.peek().tag;
-            }
-
-            // Stop if:
-            // 1. the event queue is empty, or
-            // 2. the horizon is reached.
-            if (eventQ.size() == 0) {
-                // System.out.println("DEBUG: Stopping because eventQ is empty!");
-                stop = true;
-            }
-            else if (currentTag.timestamp > horizon.timestamp) {
-                // System.out.println("DEBUG: Stopping because horizon is reached! Horizon: " + horizon + " Current Tag: " + currentTag);
-                // System.out.println("DEBUG: EventQ: " + eventQ);
-                stop = true;
-            }
-        }
-
-        // Check if the last current node is added to the graph yet.
-        // If not, add it now.
-        // This could happen when condition (previousTag == null)
-        // or (previousTag != null
-        // && currentTag.compareTo(previousTag) > 0) is true and then
-        // the simulation ends, leaving a new node dangling.
-        if (previousNode == null 
-            || previousNode.tag.timestamp < currentNode.tag.timestamp) {
-            this.diagram.addNode(currentNode);
-            this.diagram.tail = currentNode; // Update the current tail.
-            if (previousNode != null) {
-                this.diagram.addEdge(currentNode, previousNode);
-            }
-        }
-
-        // When we exit and we still don't have a head,
-        // that means there is only one node in the diagram.
-        // Set the current node as the head.
-        if (this.diagram.head == null)
-            this.diagram.head = currentNode;
-        
-        return;
-    }
-}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java b/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
deleted file mode 100644
index 35c588bcbc..0000000000
--- a/org.lflang/src/org/lflang/analyses/statespace/StateSpaceNode.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/** 
- * A node in the state space diagram representing a step
- * in the execution of an LF program.
- * 
- * 
- */
-package org.lflang.analyses.statespace;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.lflang.TimeValue;
-import org.lflang.generator.ReactionInstance;
-import org.lflang.generator.TriggerInstance;
-
-public class StateSpaceNode {
-
-    public int index;       // Set in StateSpaceDiagram.java
-    public Tag tag;
-    public TimeValue time;  // Readable representation of tag.timestamp
-    public Set<ReactionInstance> reactionsInvoked;
-    public ArrayList<Event> eventQ;
-
-    public StateSpaceNode(
-        Tag tag,
-        Set<ReactionInstance> reactionsInvoked,
-        ArrayList<Event> eventQ
-    ) {
-        this.tag    = tag;
-        this.eventQ = eventQ;
-        this.reactionsInvoked = reactionsInvoked;
-        this.time   = TimeValue.fromNanoSeconds(tag.timestamp);
-    }
-
-    /**
-     * Assuming both eventQs have the same length,
-     * for each pair of events in eventQ1 and eventQ2,
-     * check if the time distances between the node's tag
-     * and the two events' tags are equal.
-     */
-    private boolean equidistant(StateSpaceNode n1,
-                                StateSpaceNode n2) {
-        if (n1.eventQ.size() != n2.eventQ.size())
-            return false;
-        for (int i = 0; i < n1.eventQ.size(); i++) {
-            if (n1.eventQ.get(i).tag.timestamp - n1.tag.timestamp
-                != n2.eventQ.get(i).tag.timestamp - n2.tag.timestamp) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Two methods for pretty printing
-     */
-    public void display() {
-        System.out.println("(" + this.time + ", " + reactionsInvoked + ", " + eventQ + ")");
-    }
-    public String toString() {
-        return "(" + this.time + ", " + reactionsInvoked + ", " + eventQ + ")";
-    }
-
-    /**
-     * This equals method does NOT compare tags,
-     * only compares reactionsInvoked, eventQ,
-     * and whether future events are equally distant.
-     */
-    @Override
-    public boolean equals(Object o) {
-        if (o == null) return false;
-        if (o instanceof StateSpaceNode) {
-            StateSpaceNode node = (StateSpaceNode) o;
-            if (this.reactionsInvoked.equals(node.reactionsInvoked)
-                && this.eventQ.equals(node.eventQ)
-                && equidistant(this, node))
-                return true;
-        }
-        return false;
-    }
-
-    /**
-     * Generate hash for the node.
-     * This hash function is used for checking
-     * the uniqueness of nodes.
-     * It is not meant to be used as a hashCode()
-     * because doing so interferes with node
-     * insertion in the state space diagram.
-     */
-    public int hash() {
-        // Initial value
-        int result = 17;
-
-        // Generate hash for the reactions invoked.
-        result = 31 * result + reactionsInvoked.hashCode();
-
-        // Generate hash for the triggers in the queued events.
-        List<String> eventNames = this.eventQ.stream()
-                                    .map(Event::getTrigger)
-                                    .map(TriggerInstance::getFullName)
-                                    .collect(Collectors.toList());
-        result = 31 * result + eventNames.hashCode();
-
-        // Generate hash for the time differences.
-        List<Long> timeDiff = this.eventQ.stream().map(e -> {
-            return e.tag.timestamp - this.tag.timestamp;
-        }).collect(Collectors.toList());
-        result = 31 * result + timeDiff.hashCode();
-
-        return result;
-    }
-}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/analyses/statespace/Tag.java b/org.lflang/src/org/lflang/analyses/statespace/Tag.java
deleted file mode 100644
index 362632ea3d..0000000000
--- a/org.lflang/src/org/lflang/analyses/statespace/Tag.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/** 
- * Class representing a logical time tag,
- * which is a pair that consists of a
- * timestamp (type long) and a microstep (type long).
- * 
- * 
- */
-package org.lflang.analyses.statespace;
-
-import org.lflang.TimeValue;
-
-public class Tag implements Comparable<Tag> {
-
-    public long timestamp;
-    public long microstep;
-    public boolean forever; // Whether the tag is FOREVER into the future.
-
-    public Tag(long timestamp, long microstep, boolean forever) {
-        this.timestamp = timestamp;
-        this.microstep = microstep;
-        this.forever   = forever;
-    }
-    
-    @Override
-    public int compareTo(Tag t) {
-        // If one tag is forever, and the other is not,
-        // then forever tag is later. If both tags are
-        // forever, then they are equal.
-        if (this.forever && !t.forever) return 1;
-        else if (!this.forever && t.forever) return -1;
-        else if (this.forever && t.forever) return 0;
-
-        // Compare the timestamps if they are not equal.
-        if (this.timestamp != t.timestamp) {
-            if (this.timestamp > t.timestamp) return 1;
-            else if (this.timestamp < t.timestamp) return -1;
-            else return 0;
-        }
-
-        // Otherwise, compare the microsteps.
-        if (this.microstep > t.microstep) return 1;
-        else if (this.microstep < t.microstep) return -1;
-        else return 0;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o instanceof Tag) {
-            Tag t = (Tag) o;
-            if (this.timestamp == t.timestamp
-                && this.microstep == t.microstep
-                && this.forever == t.forever)
-                return true;
-        }
-        return false;
-    }
-
-    @Override
-    public String toString() {
-        if (this.forever) return "(FOREVER, " + this.microstep + ")";
-        else {
-            TimeValue time = TimeValue.fromNanoSeconds(this.timestamp);
-            return "(" + time + ", " + this.microstep + ")";
-        }
-    }
-}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java b/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
deleted file mode 100644
index 9cc6d308f3..0000000000
--- a/org.lflang/src/org/lflang/analyses/uclid/MTLVisitor.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*************
-Copyright (c) 2021, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
-
-/** 
- * (EXPERIMENTAL) Transpiler from an MTL specification to a Uclid axiom.
- * 
- * 
- */
-package org.lflang.analyses.uclid;
-
-import org.lflang.TimeUnit;
-import org.lflang.TimeValue;
-import org.lflang.dsl.MTLParser;
-import org.lflang.dsl.MTLParserBaseVisitor;
-import org.lflang.generator.CodeBuilder;
-
-public class MTLVisitor extends MTLParserBaseVisitor<String> {
-
-    ////////////////////////////////////////////
-    //// Protected fields
-
-    /** The main place to put generated code. */
-    protected CodeBuilder code  = new CodeBuilder();
-
-    /** Tactic to be used to prove the property. */
-    protected String tactic;
-
-    /** Time horizon (in nanoseconds) of the property */
-    protected long horizon = 0;
-
-    // Constructor
-    public MTLVisitor(String tactic) {
-        this.tactic = tactic;
-    }
-
-    ////////////////////////////////////////////
-    //// Public methods
-    public String visitMtl(MTLParser.MtlContext ctx,
-        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-
-        return visitEquivalence(ctx.equivalence(),
-            prefixIdx, QFIdx, prevPrefixIdx, horizon);
-    }
-
-    public String visitEquivalence(MTLParser.EquivalenceContext ctx,
-        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-
-        if (ctx.right == null) {
-            return visitImplication(ctx.left,
-            prefixIdx, QFIdx, prevPrefixIdx, horizon);
-        }
-        return "(" + visitImplication(ctx.left,
-            prefixIdx, QFIdx, prevPrefixIdx, horizon) 
-            + ")"
-            + " <==> " 
-            + "(" + visitImplication(ctx.right,
-            prefixIdx, QFIdx, prevPrefixIdx, horizon)
-            + ")";
-    }
-
-    public String visitImplication(MTLParser.ImplicationContext ctx,
-        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-        
-        if (ctx.right == null) {
-            return visitDisjunction(ctx.left,
-            prefixIdx, QFIdx, prevPrefixIdx, horizon);
-        }
-        return "(" + visitDisjunction(ctx.left,
-            prefixIdx, QFIdx, prevPrefixIdx, horizon) 
-            + ")"
-            + " ==> " 
-            + "(" + visitDisjunction(ctx.right,
-            prefixIdx, QFIdx, prevPrefixIdx, horizon)
-            + ")";
-    }
-
-    public String visitDisjunction(MTLParser.DisjunctionContext ctx,
-        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-        
-        String str = "";
-        for (int i = 0; i < ctx.terms.size(); i++) {
-            str += "("
-                + visitConjunction(ctx.terms.get(i),
-                prefixIdx, QFIdx, prevPrefixIdx, horizon)
-                + ")"
-                + (i == ctx.terms.size()-1 ? "" : "||");
-        }
-        return str;
-    }
-
-    public String visitConjunction(MTLParser.ConjunctionContext ctx,
-        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-        
-        String str = "";
-        for (int i = 0; i < ctx.terms.size(); i++) {
-            str += "("
-                + visitUntil((MTLParser.UntilContext)ctx.terms.get(i),
-                    prefixIdx, QFIdx, prevPrefixIdx, horizon)
-                + ")"
-                + (i == ctx.terms.size()-1 ? "" : "&&");
-        }
-        return str;
-    }
-
-    // A custom dispatch function
-    public String _visitUnaryOp(MTLParser.UnaryOpContext ctx,
-        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-
-        // FIXME: Is there a more "antlr" way to do dispatch here?
-        if (ctx instanceof MTLParser.NoUnaryOpContext) {
-            return visitNoUnaryOp((MTLParser.NoUnaryOpContext)ctx, 
-                prefixIdx, QFIdx, prevPrefixIdx, horizon);
-        }
-        if (ctx instanceof MTLParser.NegationContext) {
-            return visitNegation((MTLParser.NegationContext)ctx,
-                prefixIdx, QFIdx, prevPrefixIdx, horizon);
-        }
-        if (ctx instanceof MTLParser.NextContext) {
-            return visitNext((MTLParser.NextContext)ctx,
-                prefixIdx, QFIdx, prevPrefixIdx, horizon);
-        }
-        if (ctx instanceof MTLParser.GloballyContext) {
-            return visitGlobally((MTLParser.GloballyContext)ctx,
-                prefixIdx, QFIdx, prevPrefixIdx, horizon);
-        }
-        if (ctx instanceof MTLParser.FinallyContext) {
-            return visitFinally((MTLParser.FinallyContext)ctx,
-                prefixIdx, QFIdx, prevPrefixIdx, horizon);
-        }
-
-        // FIXME: Throw an exception.
-        return "";
-    }
-
-    public String visitUntil(MTLParser.UntilContext ctx,
-        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-
-        // If right is null, continue recursion.
-        if (ctx.right == null) {
-            return _visitUnaryOp(ctx.left,
-                prefixIdx, QFIdx, prevPrefixIdx, horizon);
-        }
-
-        String end;
-        if (this.tactic.equals("induction")) {
-            end = "(" + prefixIdx + " + CT)";
-        } else {
-            end = "END";
-        }
-
-        // Otherwise, create the Until formula.
-        // Check if the time interval is a range or a singleton.
-        long lowerBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
-        long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
-        long currentHorizon = horizon + upperBoundNanoSec;
-        if (currentHorizon > this.horizon) this.horizon = currentHorizon;
-        String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
-                                                    upperBoundNanoSec, "j" + QFIdx, prefixIdx);
-
-        return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
-                + "j" + QFIdx + " >= " + prefixIdx + " && " + "j" + QFIdx + " <= " + end
-                + " && " + "!" + "isNULL" + "(" + "j" + QFIdx + ")"
-                + " && " + "(" + _visitUnaryOp(ctx.right, ("j"+QFIdx), QFIdx+1, prefixIdx, currentHorizon) + ")"
-                + " && " + "(" + "\n" 
-                + "// Time Predicate\n"
-                + timePredicate + "\n"
-                + ")" + " && " + "(" + "finite_forall " + "(" + "i" + QFIdx + " : integer) in indices :: "
-                + "(" + "i" + QFIdx + " >= " + prefixIdx + " && " + "i" + QFIdx + " < " + "j" + QFIdx + ")"
-                + " ==> " + "(" + _visitUnaryOp(ctx.left, ("i"+QFIdx), QFIdx+1, ("j"+QFIdx), currentHorizon) + ")" + ")";
-    }
-
-    public String visitNoUnaryOp(MTLParser.NoUnaryOpContext ctx,
-        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-
-        return visitPrimary(ctx.formula, prefixIdx, QFIdx, prevPrefixIdx, horizon);
-    }
-
-    public String visitNegation(MTLParser.NegationContext ctx,
-        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-
-        return "!(" + visitPrimary(ctx.formula, prefixIdx, QFIdx, prevPrefixIdx, horizon) + ")";
-    }
-
-    public String visitNext(MTLParser.NextContext ctx,
-        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-        // FIXME: Horizon needs to advance!
-        return visitPrimary(ctx.formula, ("(" + prefixIdx + "+1)"), QFIdx, prevPrefixIdx, horizon);
-    }
-
-    public String visitGlobally(MTLParser.GloballyContext ctx,
-        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-
-        String end;
-        if (this.tactic.equals("induction")) {
-            end = "(" + prefixIdx + " + CT)";
-        } else {
-            end = "END";
-        }
-        
-        long lowerBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
-        long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
-        long currentHorizon = horizon + upperBoundNanoSec;
-        if (currentHorizon > this.horizon) this.horizon = currentHorizon;
-        String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
-                                                    upperBoundNanoSec, "j" + QFIdx, prefixIdx);        
-        return "(" + "finite_forall " + "(" + "j" + QFIdx + " : integer) in indices :: "
-                + "(" + "j" + QFIdx + " >= " + prefixIdx + " && " + "j" + QFIdx + " <= " + end
-                + " && " + "!" + "isNULL" + "(" + "j" + QFIdx + ")"
-                + " && " + "(" + "\n" 
-                + "// Time Predicate\n"
-                + timePredicate + "\n"
-                + ")" + ")"
-                + " ==> " + "(" + visitPrimary(ctx.formula, ("j"+QFIdx), QFIdx+1, prefixIdx, currentHorizon) + ")"
-                + ")";
-    }
-
-    public String visitFinally(MTLParser.FinallyContext ctx,
-        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-
-        String end;
-        if (this.tactic.equals("induction")) {
-            end = "(" + prefixIdx + " + CT)";
-        } else {
-            end = "END";
-        }
-
-        long lowerBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
-        long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
-        long currentHorizon = horizon + upperBoundNanoSec;
-        if (currentHorizon > this.horizon) this.horizon = currentHorizon;
-        String timePredicate = generateTimePredicate(ctx.timeInterval, lowerBoundNanoSec,
-                                                    upperBoundNanoSec, "j" + QFIdx, prefixIdx);        
-        return "finite_exists " + "(" + "j" + QFIdx + " : integer) in indices :: "
-                + "j" + QFIdx + " >= " + prefixIdx + " && " + "j" + QFIdx + " <= " + end
-                + " && " + "!" + "isNULL" + "(" + "j" + QFIdx + ")"
-                + " && " + "(" + visitPrimary(ctx.formula, ("j"+QFIdx), QFIdx+1, prefixIdx, currentHorizon) + ")"
-                + " && " + "(" + "\n" 
-                + "// Time Predicate\n"
-                + timePredicate + "\n"
-                + ")";
-    }
-
-    public String visitPrimary(MTLParser.PrimaryContext ctx,
-        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-
-        if (ctx.atom != null)
-            return visitAtomicProp(ctx.atom, prefixIdx, QFIdx, prevPrefixIdx, horizon);
-        else if (ctx.id != null) {
-            // Check if the ID is a reaction.
-            // FIXME: Not robust.
-            if (ctx.id.getText().contains("_reaction_")) {
-                return ctx.id.getText() + "(" + "rxn(" + prefixIdx + ")" + ")";
-            } else if (ctx.id.getText().contains("_is_present")) { 
-                return ctx.id.getText() + "(" + "t(" + prefixIdx + ")" + ")";
-            } else {
-                return ctx.id.getText() + "(" + "s(" + prefixIdx + ")" + ")";
-            }
-        }
-        else
-            return visitMtl(ctx.formula, prefixIdx, QFIdx, prevPrefixIdx, horizon);
-    }
-
-    public String visitAtomicProp(MTLParser.AtomicPropContext ctx,
-        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-
-        if (ctx.primitive != null)
-            return ctx.primitive.getText();
-        else
-            return visitExpr(ctx.left, prefixIdx, QFIdx, prevPrefixIdx, horizon)
-                    + " " + ctx.op.getText() + " "
-                    + visitExpr(ctx.right, prefixIdx, QFIdx, prevPrefixIdx, horizon);
-    }
-
-    public String visitExpr(MTLParser.ExprContext ctx,
-        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-
-        if (ctx.ID() != null)
-            return ctx.ID().getText() + "(" + "s(" + prefixIdx + ")" + ")";
-        else if (ctx.INTEGER() != null)
-            return ctx.INTEGER().getText();
-        else
-            return visitSum(ctx.sum(), prefixIdx, QFIdx, prevPrefixIdx, horizon);
-    }
-
-    public String visitSum(MTLParser.SumContext ctx,
-        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-        
-        String str = "";
-        for (int i = 0; i < ctx.terms.size(); i++) {
-            str += "("
-                + visitDifference(ctx.terms.get(i),
-                prefixIdx, QFIdx, prevPrefixIdx, horizon)
-                + ")"
-                + (i == ctx.terms.size()-1 ? "" : "+");
-        }
-        return str;
-    }
-
-    public String visitDifference(MTLParser.DifferenceContext ctx,
-        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-        
-        String str = "";
-        for (int i = 0; i < ctx.terms.size(); i++) {
-            str += "("
-                + visitProduct(ctx.terms.get(i),
-                prefixIdx, QFIdx, prevPrefixIdx, horizon)
-                + ")"
-                + (i == ctx.terms.size()-1 ? "" : "-");
-        }
-        return str;
-    }
-
-    public String visitProduct(MTLParser.ProductContext ctx,
-        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-        
-        String str = "";
-        for (int i = 0; i < ctx.terms.size(); i++) {
-            str += "("
-                + visitQuotient(ctx.terms.get(i),
-                prefixIdx, QFIdx, prevPrefixIdx, horizon)
-                + ")"
-                + (i == ctx.terms.size()-1 ? "" : "*");
-        }
-        return str;
-    }
-
-    public String visitQuotient(MTLParser.QuotientContext ctx,
-        String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
-        
-        String str = "";
-        for (int i = 0; i < ctx.terms.size(); i++) {
-            str += "("
-                + visitExpr(ctx.terms.get(i),
-                prefixIdx, QFIdx, prevPrefixIdx, horizon)
-                + ")"
-                + (i == ctx.terms.size()-1 ? "" : "/");
-        }
-        return str;
-    }
-
-    ///////////////////////////////////////
-    //// Private methods
-
-    /**
-     * Return a time value in nanoseconds from an IntervalContext.
-     * 
-     * @param ctx
-     * @param getUpper
-     * @return
-     */
-    private long getNanoSecFromIntervalContext(MTLParser.IntervalContext ctx, boolean getUpper) {
-        // If we have a singleton, the return value is the same regardless of getUpper.
-        if (ctx instanceof MTLParser.SingletonContext) {
-            MTLParser.SingletonContext singletonCtx = (MTLParser.SingletonContext)ctx;
-            String timeInstantValue = singletonCtx.instant.value.getText();
-            String timeInstantUnit = "";
-            long timeInstantNanoSec = 0;
-            if (!timeInstantValue.equals("0")) {
-                timeInstantUnit = singletonCtx.instant.unit.getText();
-                TimeValue timeValue = new TimeValue(
-                    Integer.valueOf(timeInstantValue), 
-                    TimeUnit.fromName(timeInstantUnit));
-                timeInstantNanoSec = timeValue.toNanoSeconds();
-            }
-            return timeInstantNanoSec;
-        }
-        
-        MTLParser.RangeContext rangeCtx = (MTLParser.RangeContext)ctx;
-        if (!getUpper) {
-            String lowerBoundTimeValue = rangeCtx.lowerbound.value.getText();
-            String lowerBoundTimeUnit = "";
-            long lowerBoundNanoSec = 0;
-            if (!lowerBoundTimeValue.equals("0")) {
-                lowerBoundTimeUnit = rangeCtx.lowerbound.unit.getText();
-                TimeValue lowerTimeValue = new TimeValue(
-                    Integer.valueOf(lowerBoundTimeValue), 
-                    TimeUnit.fromName(lowerBoundTimeUnit));
-                lowerBoundNanoSec = lowerTimeValue.toNanoSeconds();
-            }
-            return lowerBoundNanoSec;
-        } else {
-            String upperBoundTimeValue = rangeCtx.upperbound.value.getText();
-            String upperBoundTimeUnit = "";
-            long upperBoundNanoSec = 0;
-            if (!upperBoundTimeValue.equals("0")) {
-                upperBoundTimeUnit = rangeCtx.upperbound.unit.getText();
-                TimeValue upperTimeValue = new TimeValue(
-                    Integer.valueOf(upperBoundTimeValue), 
-                    TimeUnit.fromName(upperBoundTimeUnit));
-                upperBoundNanoSec = upperTimeValue.toNanoSeconds();
-            }
-            return upperBoundNanoSec;
-        }
-    }
-
-    /**
-     * Generate a time predicate from a range.
-     * 
-     * @param ctx
-     * @param lowerBoundNanoSec
-     * @param upperBoundNanoSec
-     * @return
-     */
-    private String generateTimePredicate(MTLParser.IntervalContext ctx,
-        long lowerBoundNanoSec, long upperBoundNanoSec,
-        String prefixIdx, String prevPrefixIdx) {
-        String timePredicate = "";
-
-        if (ctx instanceof MTLParser.SingletonContext) {
-            MTLParser.SingletonContext singletonCtx = (MTLParser.SingletonContext)ctx;
-            timePredicate += "tag_same(g(" + prefixIdx + "), " + "tag_delay(g(" 
-                                + prevPrefixIdx + "), " + upperBoundNanoSec + "))";
-        } else {
-            // Since MTL doesn't include microsteps, we only compare timestamps here.
-            MTLParser.RangeContext rangeCtx = (MTLParser.RangeContext)ctx;
-            timePredicate += "(";
-            if (rangeCtx.LBRACKET() != null) {
-                timePredicate += "pi1(g(" + prefixIdx + "))" + " >= "
-                    + "(" + "pi1(g(" + prevPrefixIdx + "))" + " + " + lowerBoundNanoSec + ")";
-            } else {
-                timePredicate += "pi1(g(" + prefixIdx + "))" + " > "
-                    + "(" + "pi1(g(" + prevPrefixIdx + "))" + " + " + lowerBoundNanoSec + ")";
-            }
-            timePredicate += ") && (";
-            if (rangeCtx.RBRACKET() != null) {
-                timePredicate += "pi1(g(" + prefixIdx + "))" + " <= "
-                    + "(" + "pi1(g(" + prevPrefixIdx + "))" + " + " + upperBoundNanoSec + ")";
-            } else {
-                timePredicate += "pi1(g(" + prefixIdx + "))" + " < "
-                    + "(" + "pi1(g(" + prevPrefixIdx + "))" + " + " + upperBoundNanoSec + ")";
-            }
-            timePredicate += ")";
-        }
-
-        return timePredicate;
-    }
-
-    /**
-     * Get the time horizon (in nanoseconds) of the property.
-     */
-    public long getHorizon() {
-        return this.horizon;
-    }
-}
diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java b/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
deleted file mode 100644
index 2b3ec21dfc..0000000000
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidGenerator.java
+++ /dev/null
@@ -1,1611 +0,0 @@
-/*************
-Copyright (c) 2021, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
-
-/** 
- * (EXPERIMENTAL) Generator for Uclid5 models.
- * 
- * 
- */
-package org.lflang.analyses.uclid;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.tree.ParseTree;
-import org.antlr.v4.runtime.tree.ParseTreeWalker;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.xtext.xbase.lib.Exceptions;
-
-import org.lflang.ASTUtils;
-import org.lflang.ErrorReporter;
-import org.lflang.FileConfig;
-import org.lflang.Target;
-import org.lflang.TimeUnit;
-import org.lflang.TimeValue;
-import org.lflang.analyses.cast.AstUtils;
-import org.lflang.analyses.cast.BuildAstParseTreeVisitor;
-import org.lflang.analyses.cast.CAst;
-import org.lflang.analyses.cast.CBaseAstVisitor;
-import org.lflang.analyses.cast.CToUclidVisitor;
-import org.lflang.analyses.cast.IfNormalFormAstVisitor;
-import org.lflang.analyses.cast.VariablePrecedenceVisitor;
-import org.lflang.analyses.statespace.Event;
-import org.lflang.analyses.statespace.StateSpaceDiagram;
-import org.lflang.analyses.statespace.StateSpaceExplorer;
-import org.lflang.analyses.statespace.StateSpaceNode;
-import org.lflang.analyses.statespace.Tag;
-import org.lflang.dsl.CLexer;
-import org.lflang.dsl.CParser;
-import org.lflang.dsl.MTLLexer;
-import org.lflang.dsl.MTLParser;
-import org.lflang.dsl.CParser.BlockItemListContext;
-import org.lflang.dsl.MTLParser.MtlContext;
-import org.lflang.generator.ActionInstance;
-import org.lflang.generator.CodeBuilder;
-import org.lflang.generator.GeneratorBase;
-import org.lflang.generator.GeneratorUtils;
-import org.lflang.generator.LFGeneratorContext;
-import org.lflang.generator.NamedInstance;
-import org.lflang.generator.PortInstance;
-import org.lflang.generator.ReactionInstance;
-import org.lflang.generator.ReactionInstanceGraph;
-import org.lflang.generator.ReactorInstance;
-import org.lflang.generator.RuntimeRange;
-import org.lflang.generator.SendRange;
-import org.lflang.generator.StateVariableInstance;
-import org.lflang.generator.TargetTypes;
-import org.lflang.generator.TimerInstance;
-import org.lflang.generator.TriggerInstance;
-import org.lflang.generator.c.CGenerator;
-import org.lflang.lf.Action;
-import org.lflang.lf.AttrParm;
-import org.lflang.lf.Attribute;
-import org.lflang.lf.Code;
-import org.lflang.lf.Connection;
-import org.lflang.lf.Expression;
-import org.lflang.lf.Reaction;
-import org.lflang.lf.Time;
-import org.lflang.lf.VarRef;
-import org.lflang.util.StringUtil;
-
-import static org.lflang.ASTUtils.*;
-
-public class UclidGenerator extends GeneratorBase {
-
-    ////////////////////////////////////////////
-    //// Public fields
-    // Data structures for storing info about the runtime instances.
-    public List<ReactorInstance>        reactorInstances    = new ArrayList<ReactorInstance>();
-    public List<ReactionInstance.Runtime> reactionInstances = new ArrayList<ReactionInstance.Runtime>();
-
-    // State variables in the system
-    public List<StateVariableInstance>  stateVariables      = new ArrayList<StateVariableInstance>();
-    
-    // Triggers in the system
-    public List<ActionInstance>         actionInstances     = new ArrayList<ActionInstance>();
-    public List<PortInstance>           inputInstances      = new ArrayList<PortInstance>();
-    public List<PortInstance>           outputInstances     = new ArrayList<PortInstance>();
-    public List<PortInstance>           portInstances       = new ArrayList<PortInstance>();
-    public List<TimerInstance>          timerInstances      = new ArrayList<TimerInstance>();
-
-    // Joint lists of the lists above.
-    public List<TriggerInstance>        triggerInstances;   // Triggers = ports + actions + timers
-    public List<NamedInstance>          namedInstances;     // Named instances = triggers + state variables
-
-    // A list of paths to the uclid files generated
-    public List<Path>                   generatedFiles      = new ArrayList<>();
-    public Map<Path, String>            expectations        = new HashMap<>();
-
-    // The directory where the generated files are placed
-    public Path                         outputDir;
-
-    // A runner for the generated Uclid files
-    public UclidRunner                  runner;
-
-    // If true, use logical time-based semantics;
-    // otherwise, use event-based semantics,
-    // as described in Sirjani et. al (2020).
-    public boolean                      logicalTimeBased    = false;
-
-    ////////////////////////////////////////////
-    //// Protected fields
-
-    // A list of MTL properties represented in Attributes.
-    protected List<Attribute>           properties;
-
-    /** The main place to put generated code. */
-    protected CodeBuilder               code                = new CodeBuilder();
-
-    /** Strings from the property attribute */
-    protected String                    name;
-    protected String                    tactic;
-    protected String                    spec; // SMTL
-    protected String                    expect;
-
-    /** 
-     * The horizon (the total time interval required for evaluating
-     * an MTL property, which is derived from the MTL spec),
-     * the completeness threshold (CT) (the number of transitions
-     * required for evaluating the FOL spec in the trace),
-     * and the transpiled FOL spec.
-     */
-    protected long                      horizon             = 0; // in nanoseconds
-    protected String                    FOLSpec             = "";
-    protected int                       CT                  = 0;
-    protected static final int          CT_MAX_SUPPORTED    = 100;
-
-    // Constructor
-    public UclidGenerator(LFGeneratorContext context, List<Attribute> properties) {
-        super(context);
-        this.properties = properties;
-        this.runner = new UclidRunner(this);
-    }
-
-    ////////////////////////////////////////////////////////////
-    //// Public methods
-    public void doGenerate(Resource resource, LFGeneratorContext context) {
-
-        // FIXME: How much of doGenerate() from GeneratorBase is needed?
-        super.printInfo(context.getMode());
-        ASTUtils.setMainName(
-            context.getFileConfig().resource,
-            context.getFileConfig().name);
-        // FIXME: Perform an analysis on the property and remove unrelevant components.
-        super.createMainInstantiation();
-        
-        ////////////////////////////////////////
-        
-        // Create the main reactor instance if there is a main reactor.
-        createMainReactorInstance();
-
-        // Extract information from the named instances.
-        populateDataStructures();
-
-        // Create the src-gen directory
-        setupDirectories();
-
-        // Generate a Uclid model for each property.
-        for (Attribute prop : this.properties) {
-            this.name = StringUtil.removeQuotes(
-                            prop.getAttrParms().stream()
-                            .filter(attr -> attr.getName().equals("name"))
-                            .findFirst()
-                            .get()
-                            .getValue());
-            this.tactic = StringUtil.removeQuotes(
-                            prop.getAttrParms().stream()
-                            .filter(attr -> attr.getName().equals("tactic"))
-                            .findFirst()
-                            .get()
-                            .getValue());
-            this.spec = StringUtil.removeQuotes(
-                            prop.getAttrParms().stream()
-                            .filter(attr -> attr.getName().equals("spec"))
-                            .findFirst()
-                            .get()
-                            .getValue());
-
-            processMTLSpec();
-            
-            Optional<AttrParm> CTAttr = prop.getAttrParms().stream()
-                            .filter(attr -> attr.getName().equals("CT"))
-                            .findFirst();
-            if (CTAttr.isPresent()) {
-                this.CT = Integer.parseInt(CTAttr.get().getValue());
-            } else {
-                computeCT();
-            }
-            // For automating data collection, print the CT to stderr.
-            System.err.println("CT: " + this.CT);
-            if (this.CT > CT_MAX_SUPPORTED) {
-                System.out.println("ERROR: The maximum steps supported is " + CT_MAX_SUPPORTED
-                    + " but checking this property requires " + this.CT + " steps. "
-                    + "This property will NOT be checked.");
-                continue;
-            }
-
-            Optional<AttrParm> ExpectAttr = prop.getAttrParms().stream()
-                            .filter(attr -> attr.getName().equals("expect"))
-                            .findFirst();
-            if (ExpectAttr.isPresent())
-                this.expect = ExpectAttr.get().getValue();
-
-            generateUclidFile();
-        }
-    }
-
-    ////////////////////////////////////////////////////////////
-    //// Protected methods
-
-    /**
-     * Generate the Uclid model.
-     */
-    protected void generateUclidFile() {
-        try {  
-            // Generate main.ucl and print to file
-            code = new CodeBuilder();
-            Path file = this.outputDir.resolve(this.tactic + "_" + this.name + ".ucl");
-            String filename = file.toString();
-            generateUclidCode();
-            code.writeToFile(filename);
-            this.generatedFiles.add(file);
-            if (this.expect != null)
-                this.expectations.put(file, this.expect);
-        } catch (IOException e) {
-            Exceptions.sneakyThrow(e);
-        }
-    }
-
-    /**
-     * The main function that generates Uclid code.
-     */
-    protected void generateUclidCode() {
-        code.pr(String.join("\n", 
-            "/*******************************",
-            " * Auto-generated UCLID5 model *",
-            " ******************************/"
-        ));
-
-        code.pr("module main {");
-        code.indent();
-
-        // Timing semantics
-        generateTimingSemantics();
-
-        // Trace definition
-        generateTraceDefinition();
-
-        // Reaction IDs and state variables
-        generateReactionIdsAndStateVars();
-
-        // Reactor semantics
-        generateReactorSemantics();
-
-        // Triggers and reactions
-        generateTriggersAndReactions();
-
-        // Initial Condition
-        generateInitialConditions();
-
-        // Reaction bodies
-        generateReactionAxioms();
-
-        // Properties
-        generateProperty();
-
-        // Control block
-        generateControlBlock();
-
-        code.unindent();
-        code.pr("}");
-    }
-
-    /**
-     * Macros for timing semantics
-     */
-    protected void generateTimingSemantics() {
-        code.pr(String.join("\n", 
-            "/*******************************",
-            " * Time and Related Operations *",
-            " ******************************/",
-            "type timestamp_t = integer;                     // The unit is nanoseconds",
-            "type microstep_t = integer;",
-            "type tag_t = {",
-            "    timestamp_t,",
-            "    microstep_t",
-            "};",
-            "type interval_t  = tag_t;",
-            "",
-            "// Projection macros",
-            "define pi1(t : tag_t) : timestamp_t = t._1;     // Get timestamp from tag",
-            "define pi2(t : tag_t) : microstep_t = t._2;     // Get microstep from tag",
-            "",
-            "// Interval constructor",
-            "define zero() : interval_t",
-            "= {0, 0};",
-            "define startup() : interval_t",
-            "= zero();",
-            "define mstep() : interval_t",
-            "= {0, 1};",
-            "define nsec(t : integer) : interval_t",
-            "= {t, 0};",
-            "define usec(t : integer) : interval_t",
-            "= {t * 1000, 0};",
-            "define msec(t : integer) : interval_t",
-            "= {t * 1000000, 0};",
-            "define sec(t : integer) : interval_t",
-            "= {t * 1000000000, 0};",
-            "define inf() : interval_t",
-            "= {-1, 0};",
-            "",
-            "// Helper function",
-            "define isInf(i : interval_t) : boolean",
-            "= pi1(i) < 0;",
-            "",
-            "// Tag comparison",
-            "define tag_later(t1 : tag_t, t2 : tag_t) : boolean",
-            "= pi1(t1) > pi1(t2)",
-            "    || (pi1(t1) == pi1(t2) && pi2(t1) > pi2(t2))",
-            "    || (isInf(t1) && !isInf(t2));",
-            "",
-            "define tag_same(t1 : tag_t, t2 : tag_t) : boolean",
-            "= t1 == t2;",
-            "",
-            "define tag_earlier(t1 : tag_t, t2 : tag_t) : boolean",
-            "= pi1(t1) < pi1(t2)",
-            "    || (pi1(t1) == pi1(t2) && pi2(t1) < pi2(t2))",
-            "    || (!isInf(t1) && isInf(t2));",
-            "",
-            "// Used for incrementing a tag through an action",
-            "define tag_schedule(t : tag_t, i : integer) : tag_t",
-            "= if (i == 0) then { pi1(t), pi2(t)+1 } else { pi1(t)+i, 0 };",
-            "",
-            "// Used for incrementing a tag along a connection",
-            "define tag_delay(t : tag_t, i : integer) : tag_t",
-            "= if (i == 0) then { pi1(t), pi2(t) } else { pi1(t)+i, 0 };",
-            "",
-            "// Only consider timestamp for now.",
-            "define tag_diff(t1, t2: tag_t) : interval_t",
-            "= if (!isInf(t1) && !isInf(t2))",
-            "    then { pi1(t1) - pi1(t2), pi2(t1) - pi2(t2) }",
-            "    else inf();",
-            "\n"
-        ));
-    }
-
-    /**
-     * Macros, type definitions, and variable declarations for trace (path)
-     */
-    protected void generateTraceDefinition() {
-        //// Why do we have a padding at the end of the trace?
-        //
-        // To handle bounded traces for a potentially unbounded execution
-        // (due to, for example, timers or systems forming a loop),
-        // we need to let certain axioms "terminate" the execution and
-        // put any "spilled-over" states in the trace padding.
-        //
-        // For example, an axiom could say "if a reaction is triggered
-        // at step i, it schedules an action that appears 1 sec later
-        // in some future step." Assuming our completeness threshold is 10,
-        // this axiom can block the model (i.e. returns TRIVIALLY true)
-        // at step 10 because there are not any more steps in the bounded trace.
-        // To avoid this, a padding of the size of the number of reactions
-        // is added to the trace. In addition, an antecedent of the form
-        // "i >= START && i <= END" is added to all the axioms. The padding
-        // will store all the spilled-over states in order to prevent
-        // model blocking.
-        int traceEndIndex = this.CT + this.reactionInstances.size();
-
-        // Define various constants.
-        code.pr(String.join("\n", 
-            "/********************",
-            " * Trace Definition *",
-            " *******************/",
-            "const START : integer = 0; // The start index of the trace.",
-            "const END : integer = " + String.valueOf(this.CT)
-                + "; // The end index of the trace (without padding)",
-            "const END_TRACE : integer = "
-                + String.valueOf(traceEndIndex)
-                + "; // The end index of the trace with padding",
-            "\n"
-        ));
-
-        // Define trace indices as a group,
-        // so that we can use finite quantifiers.
-        code.pr("group indices : integer = {");
-        code.indent();
-        String indices = "";
-        for (int i = 0; i <= traceEndIndex; i++) {
-            indices += String.valueOf(i) + (i == traceEndIndex ? "" : ", ");
-        }
-        code.pr(indices);
-        code.unindent();
-        code.pr("};\n\n");
-
-        // Define step, event, and trace types.
-        code.pr(String.join("\n",
-            "// Define step and event types.",
-            "type step_t = integer;",
-            "type event_t = { rxn_t, tag_t, state_t, trigger_t, sched_t, payload_t };",
-            "",
-            "// Create a bounded trace with length " + String.valueOf(this.CT)
-        ));
-        code.pr("// Potentially unbounded trace, we bound this later.");
-        code.pr("type trace_t  = [integer]event_t;");
-
-        // Declare start time and trace.
-        code.pr(String.join("\n", 
-            "// Declare start time.",
-            "var start_time : timestamp_t;",
-            "",
-            "// Declare trace.",
-            "var trace : trace_t;"
-        ));
-
-        // Start generating helper macros.
-        code.pr(String.join("\n", 
-            "/*****************",
-            " * Helper Macros *",
-            " ****************/"
-        ));
-
-        // Define a getter for uclid arrays.
-        String initialReactions = "";
-        if (this.reactionInstances.size() > 0) {
-            initialReactions = "false, ".repeat(this.reactionInstances.size());
-            initialReactions = initialReactions.substring(0, initialReactions.length()-2);
-        } else {
-            // Initialize a dummy variable just to make the code compile.
-            initialReactions = "false";
-        }
-        initialReactions = "{" + initialReactions + "}";
-        String initialStates = "";
-        if (this.namedInstances.size() > 0) {
-            initialStates = "0, ".repeat(this.namedInstances.size());
-            initialStates = initialStates.substring(0, initialStates.length()-2);
-        } else {
-            // Initialize a dummy variable just to make the code compile.
-            initialStates = "0";
-        }
-        String initialTriggerPresence = "";
-        if (this.triggerInstances.size() > 0) {
-            initialTriggerPresence = "false, ".repeat(this.triggerInstances.size());
-            initialTriggerPresence = initialTriggerPresence.substring(0, initialTriggerPresence.length()-2);
-        } else {
-            // Initialize a dummy variable just to make the code compile.
-            initialTriggerPresence = "false";
-        }
-        String initialActionsScheduled = "";
-        if (this.actionInstances.size() > 0) {
-            initialActionsScheduled = "false, ".repeat(this.actionInstances.size());
-            initialActionsScheduled = initialActionsScheduled.substring(0, initialActionsScheduled.length()-2);
-        } else {
-            // Initialize a dummy variable just to make the code compile.
-            initialActionsScheduled = "false";
-        }
-        String initialActionsScheduledPayload = "";
-        if (this.actionInstances.size() > 0) {
-            initialActionsScheduledPayload = "0, ".repeat(this.actionInstances.size());
-            initialActionsScheduledPayload = initialActionsScheduledPayload.substring(0, initialActionsScheduledPayload.length()-2);
-        } else {
-            // Initialize a dummy variable just to make the code compile.
-            initialActionsScheduledPayload = "0";
-        }
-        code.pr("// Helper macro that returns an element based on index.");
-        code.pr("define get(tr : trace_t, i : step_t) : event_t =");
-        code.pr("if (i >= START || i <= END_TRACE) then tr[i] else");
-        code.pr("{ " + initialReactions + ", inf(), { " + initialStates + " }, { " + initialTriggerPresence
-            + " }, {" + initialActionsScheduled + " }, {" + initialActionsScheduledPayload + "} };");
-
-        // Define an event getter from the trace.
-        code.pr(String.join("\n", 
-            "define elem(i : step_t) : event_t",
-            "= get(trace, i);",
-            "",
-            "// projection macros",
-            "define rxn      (i : step_t) : rxn_t        = elem(i)._1;",
-            "define g        (i : step_t) : tag_t        = elem(i)._2;",
-            "define s        (i : step_t) : state_t      = elem(i)._3;",
-            "define t        (i : step_t) : trigger_t    = elem(i)._4;",
-            "define d        (i : step_t) : sched_t      = elem(i)._5;",
-            "define pl       (i : step_t) : payload_t    = elem(i)._6;",
-            "define isNULL   (i : step_t) : boolean      = rxn(i) == " + initialReactions + ";"
-        ));
-    }
-
-    /**
-     * Type definitions for runtime reaction Ids and state variables
-     */
-    protected void generateReactionIdsAndStateVars() {
-        // Encode the components and the logical delays
-        // present in a reactor system.
-        code.pr(String.join("\n",
-            "/**********************************",
-            " * Reaction IDs & State Variables *",
-            " *********************************/",
-            "",
-            "//////////////////////////",
-            "// Application Specific"
-        ));
-
-        // Enumerate over all reactions.
-        code.pr(String.join("\n",
-            "// Reactions",
-            "type rxn_t = {"
-        ));
-        code.indent();
-        for (var i = 0 ; i < this.reactionInstances.size(); i++) {
-            // Print a list of reaction IDs.
-            // Add a comma if not last.
-            code.pr("boolean" + ((i == this.reactionInstances.size() - 1) ? "" : ",")
-                + "\t// " + this.reactionInstances.get(i));
-        }
-        code.unindent();
-        code.pr("};\n");
-
-        // Generate projection macros.
-        code.pr("// Reaction projection macros");
-        for (var i = 0 ; i < this.reactionInstances.size(); i++) {
-            code.pr("define " + this.reactionInstances.get(i).getReaction().getFullNameWithJoiner("_")
-                + "(n : rxn_t) : boolean = n._" + (i+1) + ";");
-        }
-        code.pr("\n"); // Newline
-
-        // State variables and triggers
-        // FIXME: expand to data types other than integer
-        code.pr("// State variables and triggers");
-        code.pr("type state_t = {");
-        code.indent();
-        if (this.namedInstances.size() > 0) {
-            for (var i = 0 ; i < this.namedInstances.size(); i++) {
-                code.pr("integer" + ((i == this.namedInstances.size() - 1) ? "" : ",")
-                    + "\t// " + this.namedInstances.get(i));
-            }
-        } else {
-            code.pr(String.join("\n", 
-                "// There are no ports or state variables.",
-                "// Insert a dummy integer to make the model compile.",
-                "integer"
-            ));            
-        }
-        code.unindent();
-        code.pr("};");
-        code.pr("// State variable projection macros");
-        for (var i = 0; i < this.namedInstances.size(); i++) {
-            code.pr("define " + this.namedInstances.get(i).getFullNameWithJoiner("_")
-                + "(s : state_t) : integer = s._" + (i+1) + ";");
-        }
-        code.pr("\n"); // Newline
-
-        // A boolean tuple indicating whether triggers are present.
-        code.pr("// A boolean tuple indicating whether triggers are present.");
-        code.pr("type trigger_t = {");
-        code.indent();
-        if (this.triggerInstances.size() > 0) {
-            for (var i = 0 ; i < this.triggerInstances.size(); i++) {
-                code.pr("boolean" + ((i == this.triggerInstances.size() - 1) ? "" : ",")
-                    + "\t// " + this.triggerInstances.get(i));
-            }
-        } else {
-            code.pr(String.join("\n", 
-                "// There are no triggers.",
-                "// Insert a dummy boolean to make the model compile.",
-                "boolean"
-            ));            
-        }
-        code.unindent();
-        code.pr("};");
-        code.pr("// Trigger presence projection macros");
-        for (var i = 0; i < this.triggerInstances.size(); i++) {
-            code.pr("define " + this.triggerInstances.get(i).getFullNameWithJoiner("_")
-                + "_is_present" + "(t : trigger_t) : boolean = t._" + (i+1) + ";");
-        }
-
-        // A boolean tuple indicating whether actions are scheduled by reactions
-        // at the instant when they are triggered.
-        code.pr(String.join("\n",
-            "// A boolean tuple indicating whether actions are scheduled by reactions",
-            "// at the instant when they are triggered."
-        ));
-        code.pr("type sched_t = {");
-        code.indent();
-        if (this.actionInstances.size() > 0) {
-            for (var i = 0 ; i < this.actionInstances.size(); i++) {
-                code.pr("boolean" + ((i == this.actionInstances.size() - 1) ? "" : ",")
-                    + "\t// " + this.actionInstances.get(i));
-            }
-        } else {
-            code.pr(String.join("\n", 
-                "// There are no actions.",
-                "// Insert a dummy boolean to make the model compile.",
-                "boolean"
-            ));            
-        }
-        code.unindent();
-        code.pr("};");
-        code.pr("// Projection macros for action schedule flag");
-        for (var i = 0; i < this.actionInstances.size(); i++) {
-            code.pr("define " + this.actionInstances.get(i).getFullNameWithJoiner("_")
-                + "_scheduled" + "(d : sched_t) : boolean = d._" + (i+1) + ";");
-        }
-
-        // A integer tuple indicating the integer payloads scheduled by reactions
-        // at the instant when they are triggered.
-        code.pr(String.join("\n",
-            "// A integer tuple indicating the integer payloads scheduled by reactions",
-            "// at the instant when they are triggered."
-        ));
-        code.pr("type payload_t = {");
-        code.indent();
-        if (this.actionInstances.size() > 0) {
-            for (var i = 0 ; i < this.actionInstances.size(); i++) {
-                code.pr("integer" + ((i == this.actionInstances.size() - 1) ? "" : ",")
-                    + "\t// " + this.actionInstances.get(i));
-            }
-        } else {
-            code.pr(String.join("\n", 
-                "// There are no actions.",
-                "// Insert a dummy integer to make the model compile.",
-                "integer"
-            ));            
-        }
-        code.unindent();
-        code.pr("};");
-        code.pr("// Projection macros for scheduled payloads");
-        for (var i = 0; i < this.actionInstances.size(); i++) {
-            code.pr("define " + this.actionInstances.get(i).getFullNameWithJoiner("_")
-                + "_scheduled_payload" + "(payload : payload_t) : integer = payload._" + (i+1) + ";");
-        }
-    }
-
-    /**
-     * Axioms for reactor semantics
-     */
-    protected void generateReactorSemantics() {
-        code.pr(String.join("\n", 
-            "/*********************",
-            " * Reactor Semantics *",
-            " *********************/",
-            ""
-        ));
-
-        // Non-federated "happened-before"
-        code.pr(String.join("\n", 
-            "// Non-federated \"happened-before\"",
-            "define hb(e1, e2 : event_t) : boolean",
-            "= tag_earlier(e1._2, e2._2)"
-        ));
-        if (!this.logicalTimeBased) {
-            code.indent();
-            // Get happen-before relation between two reactions.
-            code.pr("|| (tag_same(e1._2, e2._2) && ( false");
-            // Iterate over reactions based on upstream/downstream relations.
-            for (var upstreamRuntime : this.reactionInstances) {
-                var downstreamReactions = upstreamRuntime.getReaction().dependentReactions();
-                for (var downstream : downstreamReactions) {
-                    // If the downstream reaction and the upstream
-                    // reaction are in the same reactor, skip, since
-                    // they will be accounted for in the for loop below.
-                    if (downstream.getParent().equals(upstreamRuntime.getReaction().getParent())) continue;
-                    for (var downstreamRuntime : downstream.getRuntimeInstances()) {
-                        code.pr("|| (" + upstreamRuntime.getReaction().getFullNameWithJoiner("_") + "(e1._1)"
-                            + " && " + downstreamRuntime.getReaction().getFullNameWithJoiner("_") + "(e2._1)" + ")");
-                    }
-                }
-            }
-            // Iterate over reactions based on priorities.
-            for (var reactor : this.reactorInstances) {
-                for (int i = 0; i < reactor.reactions.size(); i++) {
-                    for (int j = i+1; j < reactor.reactions.size(); j++) {
-                        code.pr("|| (" + reactor.reactions.get(i).getFullNameWithJoiner("_") + "(e1._1)"
-                            + " && " + reactor.reactions.get(j).getFullNameWithJoiner("_") + "(e2._1)" + ")");
-                    }
-                }
-            }
-            code.unindent();
-            code.pr("))");
-        }
-        code.pr(";");
-
-        code.pr(String.join("\n", 
-            "/** transition relation **/",
-            "// transition relation constrains future states",
-            "// based on previous states.",
-            "",
-            "// Events are ordered by \"happened-before\" relation.",
-            "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END_TRACE) ==> (finite_forall (j : integer) in indices ::",
-            "    (j >= START && j <= END_TRACE) ==> (hb(elem(i), elem(j)) ==> i < j)));",
-            "",
-            "// Tags should be non-negative.",
-            "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END_TRACE)",
-            "    ==> pi1(g(i)) >= 0);",
-            "",
-            "// Microsteps should be non-negative.",
-            "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END_TRACE)",
-            "    ==> pi2(g(i)) >= 0);",
-            "",
-            "// Begin the frame at the start time specified.",
-            "define start_frame(i : step_t) : boolean =",
-            "    (tag_same(g(i), {start_time, 0}) || tag_later(g(i), {start_time, 0}));",
-            "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END_TRACE)",
-            "    ==> start_frame(i));",
-            "",
-            "// NULL events should appear in the suffix, except for START.",
-            "axiom(finite_forall (j : integer) in indices :: (j > START && j <= END_TRACE) ==> (",
-            "    !isNULL(j)) ==> ",
-            "        (finite_forall (i : integer) in indices :: (i > START && i < j) ==> (!isNULL(i))));",
-            ""
-        ));
-
-        //// Axioms for the event-based semantics
-        if (!this.logicalTimeBased) {
-            code.pr("//// Axioms for the event-based semantics");
-
-            // the same event can only trigger once in a logical instant
-            code.pr(String.join("\n",
-                "// the same event can only trigger once in a logical instant",
-                "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (finite_forall (j : integer) in indices ::",
-                "    (j >= START && j <= END) ==> ((rxn(i) == rxn(j) && i != j)",
-                "        ==> !tag_same(g(i), g(j)))));",
-                ""
-            ));
-
-            // Only one reaction gets triggered at a time.
-            ArrayList<String> reactionsStatus = new ArrayList<>();
-            for (int i = 0; i < this.reactionInstances.size(); i++)
-                reactionsStatus.add("false");
-            code.pr(String.join("\n",
-                "// Only one reaction gets triggered at a time.",
-                "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (",
-                "    isNULL(i)"));
-            code.indent();
-            for (int i = 0; i < this.reactionInstances.size(); i++) {
-                String[] li = reactionsStatus.toArray(String[]::new);
-                li[i] = "true";
-                code.pr("|| rxn(i) == " + "{" + String.join(", ", li) + "}");
-            }
-            code.unindent();
-            code.pr("));");
-        }
-    }
-
-    /**
-     * Axioms for the trigger mechanism
-     */
-    protected void generateTriggersAndReactions() {
-        code.pr(String.join("\n", 
-            "/***************",
-            " * Connections *",
-            " ***************/"
-        ));
-        // FIXME: Support banks and multiports. Figure out how to work with ranges.
-        // Iterate over all the ports. Generate an axiom for each connection
-        // (i.e. a pair of input-output ports).
-        // A "range" holds the connection information.
-        // See connectPortInstances() in ReactorInstance.java for more details.
-        for (var port : this.portInstances) {
-            for (SendRange range : port.getDependentPorts()) {
-                PortInstance source = range.instance;
-                Connection connection = range.connection;
-                List<RuntimeRange<PortInstance>> destinations = range.destinations;
-                
-                // Extract delay value
-                long delay = 0;
-                if (connection.getDelay() != null) {
-                    // Somehow delay is an Expression,
-                    // which makes it hard to convert to nanoseconds.
-                    Expression delayExpr = connection.getDelay();
-                    if (delayExpr instanceof Time) {
-                        long interval = ((Time) delayExpr).getInterval();
-                        String unit = ((Time) delayExpr).getUnit();
-                        TimeValue timeValue = new TimeValue(interval, TimeUnit.fromName(unit));
-                        delay = timeValue.toNanoSeconds();
-                    }
-                }
-
-                for (var portRange : destinations) {
-                    var destination = portRange.instance;
-
-                    // We have extracted the source, destination, and connection AST node.
-                    // Now we are ready to generate an axiom for this triple.
-                    code.pr("// " + source.getFullNameWithJoiner("_") + " "
-                        + (connection.isPhysical() ? "~>" : "->") + " " 
-                        + destination.getFullNameWithJoiner("_"));
-                    code.pr(String.join("\n", 
-                        "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
-                        "// If " + source.getFullNameWithJoiner("_") + " is present, then "
-                            + destination.getFullNameWithJoiner("_") + " will be present.",
-                        "// with the same value after some fixed delay of " + delay + " nanoseconds.",
-                        "(" + source.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> ((",
-                        "    finite_exists (j : integer) in indices :: j > i && j <= END",
-                        "    && " + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(j))",
-                        "    && " + destination.getFullNameWithJoiner("_") + "(s(j)) == " + source.getFullNameWithJoiner("_") + "(s(i))",
-                        connection.isPhysical() ? "" : "&& g(j) == tag_delay(g(i), " + delay + ")",
-                        ")",
-                        ")) // Closes (" + source.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> ((.",
-                        //// Separator
-                        "// If " + destination.getFullNameWithJoiner("_") + " is present, there exists an " + source.getFullNameWithJoiner("_") + " in prior steps.",
-                        "// This additional term establishes a one-to-one relationship between two ports' signals.",
-                        "&& (" + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
-                        "    finite_exists (j : integer) in indices :: j >= START && j < i",
-                        "    && " + source.getFullNameWithJoiner("_") + "_is_present" + "(t(j))",
-                        connection.isPhysical() ? "" : "    && g(i) == tag_delay(g(j), " + delay + ")",
-                        ")) // Closes the one-to-one relationship.",
-                        "));"
-                    ));
-
-                    // If destination is not present, then its value resets to 0.
-                    code.pr(String.join("\n", 
-                        "// If " + destination.getFullNameWithJoiner("_") + " is not present, then its value resets to 0.",
-                        "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END && !isNULL(i)) ==> (",
-                        "    (!" + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
-                        "        " + destination.getFullNameWithJoiner("_") + "(s(i)) == 0",
-                        "    ))",
-                        "));"
-                    ));
-                }
-            }
-        }
-
-        if (this.actionInstances.size() > 0) {
-            code.pr(String.join("\n", 
-            "/***********",
-            " * Actions *",
-            " ***********/"
-            ));
-            for (var action : this.actionInstances) {
-                Set<ReactionInstance> dependsOnReactions = action.getDependsOnReactions();
-                String comment = "If " + action.getFullNameWithJoiner("_")
-                                    + " is present, these reactions could schedule it: ";
-                String triggerStr = "";
-                for (var reaction : dependsOnReactions) {
-                    comment += reaction.getFullNameWithJoiner("_") + ", ";
-                    triggerStr += String.join("\n", 
-                        "// " + reaction.getFullNameWithJoiner("_"),
-                        // OR because only any present trigger can trigger the reaction.
-                        "|| (" + action.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
-                        "    finite_exists (j : integer) in indices :: j >= START && j < i",
-                        "    && " + reaction.getFullNameWithJoiner("_") + "(rxn(j))",
-                        "    && g(i) == tag_schedule(g(j), " + action.getMinDelay().toNanoSeconds() + ")",
-                        "    && " + action.getFullNameWithJoiner("_") + "_scheduled" + "(d(j))",
-                        "    && " + action.getFullNameWithJoiner("_") + "(s(i))" + " == " + action.getFullNameWithJoiner("_") + "_scheduled_payload" + "(pl(j))",
-                        "))"
-                    );
-                }
-
-                // After populating the string segments,
-                // print the generated code string.
-                code.pr(String.join("\n", 
-                    "// " + comment,
-                    "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> ( false",
-                    triggerStr,
-                    "));"
-                ));
-
-                // If the action is not present, then its value resets to 0.
-                code.pr(String.join("\n", 
-                    "// If " + action.getFullNameWithJoiner("_") + "  is not present, then its value resets to 0.",
-                    "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END && !isNULL(i)) ==> (",
-                    "    (!" + action.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
-                    "        " + action.getFullNameWithJoiner("_") + "(s(i)) == 0",
-                    "    ))",
-                    "));"
-                ));
-            }
-        }
-
-        if (this.timerInstances.size() > 0) {
-            code.pr(String.join("\n", 
-            "/**********",
-            " * Timers *",
-            " **********/"
-            ));
-            /**
-             * The timer axioms take the following form:
-             * 
-             * // An initial firing at {offset, 0}
-             * axiom(
-             *     ((g(END)._1 >= 500000000) ==> (
-             *         finite_exists (j : integer) in indices :: (j > START && j <= END)
-             *             && Timer_t_is_present(t(j))
-             *             && tag_same(g(j), {500000000, 0})
-             *     ))
-             *     && ((g(END)._1 < 500000000) ==> (
-             *         finite_forall (i : integer) in indices :: (i > START && i <= END)
-             *             ==> (!isNULL(i))
-             *     ))
-             * );
-             * // Schedule subsequent firings.
-             * axiom(
-             *     finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (
-             *         Timer_t_is_present(t(i)) ==> (
-             *             (
-             *                 finite_exists (j : integer) in indices :: (j >= START && j > i)
-             *                     && Timer_t_is_present(t(j))
-             *                     && (g(j) == tag_schedule(g(i), 1000000000))
-             *             )
-             *         )
-             *     )
-             * );
-             * // All firings must be evenly spaced out.
-             * axiom(
-             *     finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (
-             *         Timer_t_is_present(t(i)) ==> (
-             *             // Timestamp must be offset + n * period
-             *             (
-             *                 exists (n : integer) :: (
-             *                     n >= 0 &&
-             *                     g(i)._1 == 500000000 + n * 1000000000
-             *                 )
-             *             )
-             *             // Microstep must be 0
-             *             && (
-             *                 g(i)._2 == 0
-             *             )
-             *         )
-             *     )
-             * );
-             */
-            for (var timer : this.timerInstances) {
-                long offset = timer.getOffset().toNanoSeconds();
-                long period = timer.getPeriod().toNanoSeconds();
-
-                code.pr("//// Axioms for " + timer.getFullName());
-                
-                // An initial firing at {offset, 0}
-                code.pr(String.join("\n", 
-                    "// " + timer.getFullName() + ": an initial firing at (" + offset + ", 0)",
-                    "axiom(",
-                    "    ((pi1(g(END)) >= " + offset + ") ==> (",
-                    "        finite_exists (j : integer) in indices :: (j > START && j <= END)",
-                    "            && " + timer.getFullNameWithJoiner("_") + "_is_present(t(j))",
-                    "            && tag_same(g(j), {" + offset + ", 0})",
-                    "     ))",
-                    "     && ((pi1(g(END)) < " + offset + ") ==> (",
-                    "        finite_forall (i : integer) in indices :: (i > START && i <= END)",
-                    "            ==> (!isNULL(i))",
-                    "     ))",
-                    ");"
-                ));
-
-                // Schedule subsequent firings.
-                code.pr(String.join("\n", 
-                    "// " + timer.getFullName() + ": schedule subsequent firings every " + period + " ns",
-                    "axiom(",
-                    "    finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (",
-                    "        " + timer.getFullNameWithJoiner("_") + "_is_present(t(i)) ==> (",
-                    "            (",
-                    "                finite_exists (j : integer) in indices :: (j >= START && j > i)",
-                    "                    && " + timer.getFullNameWithJoiner("_") + "_is_present(t(j))",
-                    "                    && (g(j) == tag_schedule(g(i), " + period + "))",
-                    "            )",
-                    "        )",
-                    "    )",
-                    ");"
-                ));
-
-                // All firings must be evenly spaced out.
-                code.pr(String.join("\n", 
-                    "// " + timer.getFullName() + ": all firings must be evenly spaced out.",
-                    "axiom(",
-                    "    finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (",
-                    "        " + timer.getFullNameWithJoiner("_") + "_is_present(t(i)) ==> (",
-                    "            // Timestamp must be offset + n * period.",
-                    "            (",
-                    "                exists (n : integer) :: (",
-                    "                    n >= 0 &&",
-                    "                    pi1(g(i)) == " + offset + " + n * " + period,
-                    "                )",
-                    "            )",
-                    "            // Microstep must be 0.",
-                    "            && (pi2(g(i)) == 0)",
-                    "        )",
-                    "    )",
-                    ");"
-                ));
-            }
-        }
-
-        code.pr(String.join("\n", 
-            "/********************************",
-            " * Reactions and Their Triggers *",
-            " ********************************/"
-        ));
-        // Iterate over all reactions, generate conditions for them
-        // to be triggered.
-        outerLoop:
-        for (ReactionInstance.Runtime reaction : this.reactionInstances) {
-            String str = String.join("\n", 
-                "// " + reaction.getReaction().getFullNameWithJoiner("_") + " is invoked when any of it triggers are present.",
-                "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END_TRACE) ==> ((",
-                "    false"
-            );
-
-            // Iterate over the triggers of the reaction.
-            for (TriggerInstance trigger : reaction.getReaction().triggers) {
-                String triggerPresentStr = "";
-                
-                if (trigger.isStartup()) {
-                    // FIXME: Treat startup as a variable.
-                    // triggerPresentStr = "g(i) == zero()";
-                    
-                    // Handle startup.
-                    code.pr(String.join("\n", 
-                        "// If startup is within frame (and all variables have default values),",
-                        "// " + reaction.getReaction().getFullNameWithJoiner("_") + " must be invoked.",
-                        "axiom(",
-                        "    ((start_time == 0) ==> (",
-                        "        finite_exists (i : integer) in indices :: i > START && i <= END",
-                        "            && " + reaction.getReaction().getFullNameWithJoiner("_") + "(rxn(i))" + " && tag_same(g(i), zero())",
-                        "            && !(",
-                        "            finite_exists (j : integer) in indices :: j > START && j <= END",
-                        "            && " + reaction.getReaction().getFullNameWithJoiner("_") + "(rxn(j))",
-                        "            && j != i",
-                        "            )",
-                        "    ))",
-                        ");"
-                    ));
-                    continue outerLoop;
-                } else if (trigger.isShutdown()) {
-                    // FIXME: For a future version.
-                    System.out.println("Not implemented!");
-                }
-                else {
-                    // If the trigger is a port/action/timer.
-                    triggerPresentStr = trigger.getFullNameWithJoiner("_") + "_is_present" + "(t(i))";
-                }
-
-                // Check if the trigger triggers other reactions.
-                // If so, we need to assert in the axioms that
-                // the other reactions are excluded (not invoked),
-                // to preserve the interleaving semantics.
-                String exclusion = "";
-                for (var instance : trigger.getDependentReactions()) {
-                    for (var runtime : ((ReactionInstance)instance).getRuntimeInstances()) {
-                        if (runtime == reaction) continue; // Skip the current reaction.
-                        exclusion += " && !" + runtime.getReaction().getFullNameWithJoiner("_") + "(rxn(i))";
-                    }
-                }
-                
-                // code.pr("|| (" + triggerPresentStr + exclusion + ")");
-                str += "\n|| (" + triggerPresentStr + exclusion + ")";
-            }
-
-            // If any of the above trigger is present, then trigger the reaction.
-            str += "\n) <==> (" + reaction.getReaction().getFullNameWithJoiner("_") + "(rxn(i))" + ")));";
-            code.pr(str);
-        }
-    }
-
-    /**
-     * Macros for initial conditions
-     */
-    protected void generateInitialConditions() {
-        code.pr(String.join("\n", 
-            "/*********************",
-            " * Initial Condition *",
-            " *********************/",
-            "define initial_condition() : boolean",
-            "= start_time == 0",
-            "    && isNULL(0)",
-            "    && g(0) == {0, 0}"
-        ));
-        code.indent();
-        for (var v : this.stateVariables) {
-            code.pr("&& " + v.getFullNameWithJoiner("_") + "(s(0))" + " == " + "0");
-        }
-        for (var t : this.triggerInstances) {
-            code.pr("&& " + t.getFullNameWithJoiner("_") + "(s(0))" + " == " + "0");
-        }
-        for (var t : this.triggerInstances) {
-            code.pr("&& !" + t.getFullNameWithJoiner("_") + "_is_present" + "(t(0))");
-        }
-        for (var d : this.actionInstances) {
-            code.pr("&& !" + d.getFullNameWithJoiner("_") + "_scheduled" + "(d(0))");
-        }
-        code.unindent();
-        code.pr(";\n");
-    }
-
-    /**
-     * Lift reaction bodies into Uclid axioms.
-     */
-    protected void generateReactionAxioms() {
-        code.pr(String.join("\n", 
-            "/*************",
-            " * Reactions *",
-            " *************/"
-        ));
-
-        for (ReactionInstance.Runtime reaction : this.reactionInstances) {
-            String body = reaction.getReaction().getDefinition().getCode().getBody();
-            // System.out.println("DEBUG: Printing reaction body of " + reaction);
-            // System.out.println(body);
-
-            // Generate a parse tree.
-            CLexer lexer = new CLexer(CharStreams.fromString(body));
-            CommonTokenStream tokens = new CommonTokenStream(lexer);
-            CParser parser = new CParser(tokens);
-            BlockItemListContext parseTree = parser.blockItemList();
-
-            // Build an AST.
-            BuildAstParseTreeVisitor buildAstVisitor = new BuildAstParseTreeVisitor();
-            CAst.AstNode ast = buildAstVisitor.visitBlockItemList(parseTree);
-
-            // VariablePrecedenceVisitor
-            VariablePrecedenceVisitor precVisitor = new VariablePrecedenceVisitor();
-            precVisitor.visit(ast);
-
-            // Convert the AST to If Normal Form (INF).
-            IfNormalFormAstVisitor infVisitor = new IfNormalFormAstVisitor();
-            infVisitor.visit(ast, new ArrayList<CAst.AstNode>());
-            CAst.StatementSequenceNode inf = infVisitor.INF;
-
-            // For the variables that are USED inside this reaction, extract the conditions
-            // for setting them, and take the negation of their conjunction
-            // to get the condition for maintaining their values.
-            List<StateVariableInstance> unusedStates = new ArrayList<>(this.stateVariables);
-            List<PortInstance> unusedOutputs = new ArrayList<>(this.outputInstances);
-            List<ActionInstance> unusedActions = new ArrayList<>(this.actionInstances);
-            HashMap<NamedInstance, List<CAst.AstNode>> defaultBehaviorConditions = new HashMap<>();
-            for (CAst.AstNode node : inf.children) {
-                CAst.IfBlockNode ifBlockNode = (CAst.IfBlockNode)node;
-                // Under the INF form, a C statement is
-                // the THEN branch of an IF block.
-                CAst.AstNode stmt = ((CAst.IfBodyNode)ifBlockNode.right).left;
-                NamedInstance instance = null;
-                // Match stmt with different cases
-                if ((stmt instanceof CAst.AssignmentNode 
-                    && ((CAst.AssignmentNode)stmt).left instanceof CAst.StateVarNode)) {
-                    CAst.StateVarNode n = (CAst.StateVarNode)((CAst.AssignmentNode)stmt).left;
-                    instance = reaction.getReaction().getParent().states.stream()
-                                .filter(s -> s.getName().equals(n.name)).findFirst().get();
-                    unusedStates.remove(instance);
-                } else if (stmt instanceof CAst.SetPortNode) {
-                    CAst.SetPortNode n = (CAst.SetPortNode)stmt;
-                    String name = ((CAst.VariableNode)n.left).name;
-                    instance = reaction.getReaction().getParent().outputs.stream()
-                                .filter(s -> s.getName().equals(name)).findFirst().get();
-                    unusedOutputs.remove(instance);
-                } else if (stmt instanceof CAst.ScheduleActionNode) {
-                    CAst.ScheduleActionNode n = (CAst.ScheduleActionNode)stmt;
-                    String name = ((CAst.VariableNode)n.children.get(0)).name;
-                    instance = reaction.getReaction().getParent().actions.stream()
-                                .filter(s -> s.getName().equals(name)).findFirst().get();
-                    unusedActions.remove(instance);
-                } else if (stmt instanceof CAst.ScheduleActionIntNode) {
-                    CAst.ScheduleActionIntNode n = (CAst.ScheduleActionIntNode)stmt;
-                    String name = ((CAst.VariableNode)n.children.get(0)).name;
-                    instance = reaction.getReaction().getParent().actions.stream()
-                                .filter(s -> s.getName().equals(name)).findFirst().get();
-                    unusedStates.remove(instance);
-                    unusedActions.remove(instance);
-                } else continue;
-                // Create a new entry in the list if there isn't one yet.
-                if (defaultBehaviorConditions.get(instance) == null) {
-                    defaultBehaviorConditions.put(instance, new ArrayList<CAst.AstNode>());
-                }
-                defaultBehaviorConditions.get(instance).add(ifBlockNode.left);
-                // System.out.println("DEBUG: Added a reset condition: " + ifBlockNode.left);
-            }
-
-            // Generate Uclid axiom for the C AST.
-            CToUclidVisitor c2uVisitor = new CToUclidVisitor(this, reaction);
-            String axiom = c2uVisitor.visit(inf);
-            code.pr(String.join("\n", 
-                "// Reaction body of " + reaction,
-                "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
-                "    (" + reaction.getReaction().getFullNameWithJoiner("_") + "(rxn(i))" + ")",
-                "        ==> " + "(" + "(" + axiom + ")",
-                "&& " + "( " + "true"
-            ));
-            for (NamedInstance key : defaultBehaviorConditions.keySet()) {
-                CAst.AstNode disjunction = AstUtils.takeDisjunction(defaultBehaviorConditions.get(key));
-                CAst.LogicalNotNode notNode = new CAst.LogicalNotNode();
-                notNode.child = disjunction;
-                String resetCondition = c2uVisitor.visit(notNode);
-                
-                // Check for invalid reset conditions.
-                // If found, stop the execution.
-                // FIXME: A more systematic check is needed
-                // to ensure that the generated Uclid file
-                // is valid.
-                try {
-                    if (resetCondition.contains("null")) {
-                        throw new Exception("Null detected in a reset condition. Stop.");
-                    }
-                } catch (Exception e) {
-                    Exceptions.sneakyThrow(e);
-                }
-                code.pr("// Unused state variables and ports are reset by default.");
-                code.pr("&& " + "(" + "(" + resetCondition + ")" + " ==> " + "(");
-                if (key instanceof StateVariableInstance) {
-                    StateVariableInstance n = (StateVariableInstance)key;
-                    code.pr(n.getFullNameWithJoiner("_") + "(" + "s" + "(" + "i" + ")" + ")"
-                    + " == "
-                    + n.getFullNameWithJoiner("_") + "(" + "s" + "(" + "i" + "-1" + ")" + ")");
-                } else if (key instanceof PortInstance) {
-                    PortInstance n = (PortInstance)key;
-                    code.pr(
-                        "("
-                        + " true"
-                        // Reset value
-                        + "\n&& " + n.getFullNameWithJoiner("_") + "(" + "s" + "(" + "i" + ")" + ")"
-                        + " == "
-                        + "0" // Default value
-                        // Reset presence
-                        + "\n&& " + n.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + "i" + ")" + ")"
-                        + " == "
-                        + "false" // default presence
-                        + ")"
-                    );
-                } else if (key instanceof ActionInstance) {
-                    ActionInstance n = (ActionInstance)key;
-                    code.pr(n.getFullNameWithJoiner("_") + "_scheduled" + "(" + "d" + "(" + "i" + ")" + ")" + " == " + "false");
-                } else {    
-                    System.out.println("Unreachable!");
-                }
-                code.pr("))");
-            }
-
-            // For state variables and ports that are NOT used in this reaction,
-            // their values stay the same by default.
-            code.pr("// By default, the value of the variables used in this reaction stay the same.");
-            if (this.logicalTimeBased) {
-                // If all other reactions that can modify the SAME state variable
-                // are not triggered, then the state variable stay the same.
-                //
-                // FIXME: What if two reactions modifying the same state variable
-                // are triggered at the same time?
-                // How to use axioms to model reaction priority?
-                // The main difficulty of logical time based semantics is composing
-                // the effect of simultaneous reactions.
-                //
-                // A path way to implement it in the future:
-                // 1. For each variable, port, and action, determine a list of
-                //    reactions that can modify/schedule it.
-                // 2. Reaction axioms should be generated wrt each reactor.
-                //    For example, assuming a reactor with two input ports,
-                //    each triggering a distinct reaction. The axioms will need
-                //    to handle four cases: i. reaction 1 gets triggered and 2
-                //    does not; ii. reaction 2 gets triggered and 1 does not;
-                //    iii. both reactions get triggered; iv. none of them get
-                //    triggered. Since it is hard to specify in an independent way,
-                //    due to reaction priorities,
-                //    what happens when two reactions (modifying the same state var.)
-                //    get triggered simultaneously, some combinatorial blowup will
-                //    be incurred. In this example, four axioms (instead of two),
-                //    each handling one case, seems needed. The good news is that
-                //    axioms across reactors may be specified independently.
-                //    For example, if there is another reactor of the same class,
-                //    Only four more axioms need to be added (in total 2^2 + 2^2),
-                //    instead of 16 axioms (2^4).
-            } else {
-                for (StateVariableInstance s : unusedStates) {
-                    code.pr("&& (true ==> (");
-                    code.pr(s.getFullNameWithJoiner("_") + "(" + "s" + "(" + "i" + ")" + ")"
-                        + " == "
-                        + s.getFullNameWithJoiner("_") + "(" + "s" + "(" + "i" + "-1" + ")" + ")");
-                    code.pr("))");
-                }
-                for (PortInstance p : unusedOutputs) {
-                    code.pr("&& (true ==> (");
-                    code.pr(
-                            "("
-                            + " true"
-                            // Reset value
-                            + "\n&& " + p.getFullNameWithJoiner("_") + "(" + "s" + "(" + "i" + ")" + ")"
-                            + " == "
-                            + "0" // Default value
-                            // Reset presence
-                            + "\n&& " + p.getFullNameWithJoiner("_") + "_is_present" + "(" + "t" + "(" + "i" + ")" + ")"
-                            + " == "
-                            + false // default presence
-                            + ")"
-                        );
-                    code.pr("))");
-                }
-                for (ActionInstance a : unusedActions) {
-                    code.pr("&& (true ==> (");
-                    code.pr(a.getFullNameWithJoiner("_") + "_scheduled" + "(" + "d" + "(" + "i" + ")" + ")" + " == " + "false");
-                    code.pr("))");
-                }
-                code.pr("))));");
-            }
-        }
-    }
-
-    protected void generateProperty() {
-        code.pr(String.join("\n", 
-            "/************",
-            " * Property *",
-            " ************/"
-        ));
-        
-        code.pr("// The FOL property translated from user-defined MTL property:");
-        code.pr("// " + this.spec);
-        code.pr("define p(i : step_t) : boolean =");
-        code.indent();
-        code.pr(this.FOLSpec + ";");
-        code.unindent();
-
-        if (this.tactic.equals("bmc")) {
-            code.pr(String.join("\n", 
-                "// BMC",
-                "property " + "bmc_" + this.name + " : " + "initial_condition() ==> p(0);"
-            ));
-        } else {
-            code.pr(String.join("\n", 
-                "// Induction: initiation step",
-                "property " + "initiation_" + this.name + " : " + "initial_condition() ==> p(0);",
-                "// Induction: consecution step",
-                "property " + "consecution_" + this.name + " : " + "p(0) ==> p(1);"
-            ));
-        }
-    }
-
-    /**
-     * Uclid5 control block
-     */
-    protected void generateControlBlock() {
-        code.pr(String.join("\n", 
-            "control {",
-            "    v = bmc(0);",
-            "    check;",
-            "    print_results;",
-            "    v.print_cex_json;",
-            "}"
-        ));
-    }
-
-    ////////////////////////////////////////////////////////////
-    //// Private methods
-
-    /**
-     * If a main or federated reactor has been declared, create a ReactorInstance
-     * for this top level. This will also assign levels to reactions, then,
-     * if the program is federated, perform an AST transformation to disconnect
-     * connections between federates.
-     */
-    private void createMainReactorInstance() {
-        if (this.mainDef != null) {
-            if (this.main == null) {
-                // Recursively build instances. This is done once because
-                // it is the same for all federates.
-                this.main = new ReactorInstance(toDefinition(mainDef.getReactorClass()), errorReporter);
-                var reactionInstanceGraph = this.main.assignLevels();
-                if (reactionInstanceGraph.nodeCount() > 0) {
-                    errorReporter.reportError("Main reactor has causality cycles. Skipping code generation.");
-                    return;
-                }
-            }
-        }
-    }
-
-    private void setupDirectories() {
-        // Make sure the target directory exists.
-        Path modelGenDir = context.getFileConfig().getModelGenPath();
-        this.outputDir = Paths.get(modelGenDir.toString());
-        try {
-            Files.createDirectories(outputDir);
-        } catch (IOException e) {
-            Exceptions.sneakyThrow(e);
-        }
-        System.out.println("The models will be located in: " + outputDir);
-    }
-
-    /**
-     * Populate the data structures.
-     */
-    private void populateDataStructures() {
-        // Populate lists of reactor/reaction instances,
-        // state variables, actions, ports, and timers.
-        populateLists(this.main);
-
-        // Join actions, ports, and timers into a list of triggers.
-        this.triggerInstances = new ArrayList<TriggerInstance>(this.actionInstances);
-        this.triggerInstances.addAll(portInstances);
-        this.triggerInstances.addAll(timerInstances);
-
-        // Join state variables and triggers
-        this.namedInstances = new ArrayList<NamedInstance>(this.stateVariables);
-        namedInstances.addAll(this.triggerInstances);
-    }
-
-    private void populateLists(ReactorInstance reactor) {
-        // Reactor and reaction instances
-        this.reactorInstances.add(reactor);
-        for (var reaction : reactor.reactions) {
-            this.reactionInstances.addAll(reaction.getRuntimeInstances());
-        }
-
-        // State variables, actions, ports, timers.
-        for (var state : reactor.states) {
-            this.stateVariables.add(state);
-        }
-        for (var action : reactor.actions) {
-            this.actionInstances.add(action);
-        }
-        for (var port : reactor.inputs) {
-            this.inputInstances.add(port);
-            this.portInstances.add(port);
-        }
-        for (var port : reactor.outputs) {
-            this.outputInstances.add(port);
-            this.portInstances.add(port);
-        }
-        for (var timer : reactor.timers) {
-            this.timerInstances.add(timer);
-        }
-
-        // Recursion
-        for (var child : reactor.children) {
-            populateLists(child);
-        }
-    }
-
-    /**
-     * Compute a completeness threadhold for each property
-     * by simulating a worst-case execution by traversing
-     * the reactor instance graph and building a
-     * state space diagram.
-     */
-    private void computeCT() {
-        
-        StateSpaceExplorer explorer = new StateSpaceExplorer(this.main);
-        explorer.explore(
-            new Tag(this.horizon, 0, false),
-            true // findLoop
-        );
-        StateSpaceDiagram diagram = explorer.diagram;
-        diagram.display();
-
-        // Generate a dot file.
-        try {
-            CodeBuilder dot = diagram.generateDot();
-            Path file = this.outputDir.resolve(this.tactic + "_" + this.name + ".dot");
-            String filename = file.toString();
-            dot.writeToFile(filename);
-        } catch (IOException e) {
-            Exceptions.sneakyThrow(e);
-        }
-
-        //// Compute CT
-        if (!explorer.loopFound) {
-            if (this.logicalTimeBased)
-                this.CT = diagram.nodeCount();
-            else {
-                // FIXME: This could be much more efficient with
-                // a linkedlist implementation. We can go straight
-                // to the next node.
-                StateSpaceNode node = diagram.head;
-                this.CT = diagram.head.reactionsInvoked.size();
-                while (node != diagram.tail) {
-                    node = diagram.getDownstreamNode(node);
-                    this.CT += node.reactionsInvoked.size();
-                }
-            }
-        } 
-        // Over-approximate CT by estimating the number of loop iterations required.
-        else {
-            // Subtract the non-periodic logical time
-            // interval from the total horizon.
-            long horizonRemained =
-                Math.subtractExact(this.horizon, diagram.loopNode.tag.timestamp);
-        
-            // Check how many loop iteration is required
-            // to check the remaining horizon.
-            int loopIterations = 0; 
-            if (diagram.loopPeriod == 0 && horizonRemained != 0)
-                Exceptions.sneakyThrow(new Exception(
-                    "ERROR: Zeno behavior detected while the horizon is non-zero. The program has no finite CT."));
-            else if (diagram.loopPeriod == 0 && horizonRemained == 0) {
-                // Handle this edge case.
-                Exceptions.sneakyThrow(new Exception(
-                    "Unhandled case: both the horizon and period are 0!"));
-            }
-            else {
-                loopIterations = (int) Math.ceil(
-                    (double) horizonRemained / diagram.loopPeriod);
-            }
-            
-            if (this.logicalTimeBased) {
-                /*
-                CT = steps required for the non-periodic part
-                     + steps required for the periodic part
-                
-                this.CT = (diagram.loopNode.index + 1)
-                    + (diagram.tail.index - diagram.loopNode.index + 1) * loopIterations;
-                
-                An overflow-safe version of the line above
-                */
-                int t0 = Math.addExact(diagram.loopNode.index, 1);
-                int t1 = Math.subtractExact(diagram.tail.index, diagram.loopNode.index);
-                int t2 = Math.addExact(t1, 1);
-                int t3 = Math.multiplyExact(t2, loopIterations);
-                this.CT = Math.addExact(t0, t3);
-                
-            } else {
-                // Get the number of events before the loop starts.
-                // This stops right before the loopNode is encountered.
-                StateSpaceNode node = diagram.head;
-                int numReactionInvocationsBeforeLoop = 0;
-                while (node != diagram.loopNode) {
-                    numReactionInvocationsBeforeLoop += node.reactionsInvoked.size();
-                    node = diagram.getDownstreamNode(node);
-                }
-                // Account for the loop node in numReactionInvocationsBeforeLoop.
-                numReactionInvocationsBeforeLoop += node.reactionsInvoked.size();
-                
-                // Count the events from the loop node until
-                // loop node is reached again.
-                int numReactionInvocationsInsideLoop = 0;
-                do {
-                    node = diagram.getDownstreamNode(node);
-                    numReactionInvocationsInsideLoop += node.reactionsInvoked.size();
-                } while (node != diagram.loopNode);
-
-                /*
-                CT = steps required for the non-periodic part
-                     + steps required for the periodic part
-                
-                this.CT = numReactionInvocationsBeforeLoop
-                    + numReactionInvocationsInsideLoop * loopIterations;
-                
-                An overflow-safe version of the line above
-                */
-                // System.out.println("DEBUG: numReactionInvocationsBeforeLoop: " + numReactionInvocationsBeforeLoop);
-                // System.out.println("DEBUG: numReactionInvocationsInsideLoop: " + numReactionInvocationsInsideLoop);
-                // System.out.println("DEBUG: loopIterations: " + loopIterations);
-                int t0 = Math.multiplyExact(numReactionInvocationsInsideLoop, loopIterations);
-                this.CT = Math.addExact(numReactionInvocationsBeforeLoop, t0);
-            }
-        }
-    }
-
-    /**
-     * Process an MTL property.
-     */
-    private void processMTLSpec() {
-        MTLLexer            lexer   = new MTLLexer(CharStreams.fromString(this.spec));
-        CommonTokenStream   tokens  = new CommonTokenStream(lexer);
-        MTLParser           parser  = new MTLParser(tokens);
-        MtlContext          mtlCtx  = parser.mtl();
-        MTLVisitor          visitor = new MTLVisitor(this.tactic);
-
-        // The visitor transpiles the MTL into a Uclid axiom.
-        this.FOLSpec = visitor.visitMtl(mtlCtx, "i", 0, "0", 0);
-        this.horizon = visitor.getHorizon();
-    }
-
-    /////////////////////////////////////////////////
-    //// Functions from generatorBase
-    
-    @Override
-    public Target getTarget() {
-        return Target.C; // Works with a C subset.
-    }
-     
-    @Override
-    public TargetTypes getTargetTypes() {
-        throw new UnsupportedOperationException("TODO: auto-generated method stub");
-    }
-}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java b/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
deleted file mode 100644
index 2469e2da8c..0000000000
--- a/org.lflang/src/org/lflang/analyses/uclid/UclidRunner.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/** 
- * (EXPERIMENTAL) Runner for Uclid5 models.
- * 
- * 
- */
-package org.lflang.analyses.uclid;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import org.lflang.ErrorReporter;
-import org.lflang.FileConfig;
-import org.lflang.analyses.statespace.StateInfo;
-import org.lflang.analyses.statespace.Tag;
-import org.lflang.generator.GeneratorCommandFactory;
-import org.lflang.util.LFCommand;
-
-public class UclidRunner {
-
-    /**
-     * A list of paths to the generated files
-     */
-    List<Path> filePaths;
-
-    /**
-     * The directory where the generated files are placed
-     */
-    public Path outputDir;
-
-    /**
-     * A factory for compiler commands.
-     */
-    GeneratorCommandFactory commandFactory;
-
-    /**
-     * A UclidGenerator instance
-     */
-    UclidGenerator generator;
-
-    // Constructor
-    public UclidRunner(UclidGenerator generator) {
-        this.generator = generator;
-        this.commandFactory =
-            new GeneratorCommandFactory(
-                generator.context.getErrorReporter(),
-                generator.context.getFileConfig());
-    }
-
-    /**
-     * Parse information from an SMT model
-     * for a step in the trace.
-     */
-    public StateInfo parseStateInfo(String smtStr) {
-        StateInfo info = new StateInfo();
-
-        // Check for any let bindings.
-        Pattern p = Pattern.compile("\\(let \\(\\((a!\\d+) \\(_tuple_\\d+ ((.)+?)\\)\\)\\)(\\\\n|\\s)+\\(_tuple_\\d+ ((.|\\n)+)\\)");
-        HashMap<String, String> symbolTable = new HashMap<>();
-        Matcher m = p.matcher(smtStr.strip());
-        String itemized = "";
-        if (m.find()) {
-            // FIXME: Handle multiple let bindings.
-            String symbol = m.group(1).strip();
-            String value  = m.group(2).strip();
-            symbolTable.put(symbol, value);
-            itemized = m.group(5).strip();
-        }
-        else {
-            // Remove the outer tuple layer.
-            p = Pattern.compile("\\(_tuple_\\d+((.|\\n)*)\\)");
-            m = p.matcher(smtStr.strip());
-            m.find();
-            itemized = m.group(1).strip();
-        }
-
-        // Process each sub-tuple by matching (_tuple_n ...)
-        // or matching a!n, where n is an integer.
-        p = Pattern.compile("(a!\\d+)|\\(_tuple_\\d+((\\s|\\\\n|\\d|\\(- \\d+\\)|true|false)+)\\)");
-        m = p.matcher(itemized);
-
-        // Reactions
-        m.find();
-        String reactionsStr = "";
-        // Found a let binding.
-        if (m.group(1) != null) {
-            reactionsStr = symbolTable.get(m.group(1)).strip();
-        }
-        // The rest falls into group 2.
-        else {
-            reactionsStr = m.group(2).strip();
-        }
-        String[] reactions = reactionsStr.split("\\s+");
-        // Iterating over generator lists avoids accounting for
-        // the single dummy Uclid variable inserted earlier.
-        for (int i = 0; i < generator.reactionInstances.size(); i++) {
-            if (reactions[i].equals("true"))
-                info.reactions.add(generator.reactionInstances.get(i).getReaction().getFullName());
-        }
-
-        // Time tag
-        m.find();
-        String tagStr = "";
-        // Found a let binding.
-        if (m.group(1) != null)
-            tagStr = symbolTable.get(m.group(1)).strip();
-        // The rest falls into group 2.
-        else tagStr = m.group(2).strip();
-        String[] tag = tagStr.split("\\s+");
-        info.tag = new Tag(
-            Long.parseLong(tag[0]),
-            Long.parseLong(tag[1]), false);
-
-        // Variables
-        // Currently all integers.
-        // Negative numbers could appear.
-        m.find();
-        String variablesStr = "";
-        // Found a let binding.
-        if (m.group(1) != null)
-            variablesStr = symbolTable.get(m.group(1)).strip();
-        // The rest falls into group 2.
-        else variablesStr = m.group(2).strip();
-        String[] variables = variablesStr.replaceAll("\\(-\\s(.*?)\\)", "-$1")
-                            .split("\\s+");
-        for (int i = 0; i < generator.namedInstances.size(); i++) {
-            info.variables.put(generator.namedInstances.get(i).getFullName(), variables[i]);
-        }
-
-        // Triggers
-        m.find();
-        String triggersStr = "";
-        // Found a let binding.
-        if (m.group(1) != null)
-            triggersStr = symbolTable.get(m.group(1)).strip();
-        // The rest falls into group 2.
-        else triggersStr = m.group(2).strip();
-        String[] triggers = triggersStr.split("\\s+");
-        for (int i = 0; i < generator.triggerInstances.size(); i++) {
-            info.triggers.put(generator.triggerInstances.get(i).getFullName(), triggers[i]);
-        }
-
-        // Actions scheduled
-        m.find();
-        String scheduledStr = "";
-        // Found a let binding.
-        if (m.group(1) != null)
-            scheduledStr = symbolTable.get(m.group(1)).strip();
-        // The rest falls into group 2.
-        else scheduledStr = m.group(2).strip();
-        String[] scheduled = scheduledStr.split("\\s+");
-        for (int i = 0; i < generator.actionInstances.size(); i++) {
-            info.scheduled.put(generator.actionInstances.get(i).getFullName(), scheduled[i]);
-        }
-
-        // Scheduled payloads
-        // Currently all integers.
-        // Negative numbers could appear.
-        m.find();
-        String payloadsStr = "";
-        // Found a let binding.
-        if (m.group(1) != null)
-            payloadsStr = symbolTable.get(m.group(1)).strip();
-        // The rest falls into group 2.
-        else payloadsStr = m.group(2).strip();
-        String[] payloads = payloadsStr
-                            .replaceAll("\\(-\\s(.*?)\\)", "-$1")
-                            .split("\\s+");
-        for (int i = 0; i < generator.actionInstances.size(); i++) {
-            info.payloads.put(generator.actionInstances.get(i).getFullName(), payloads[i]);
-        }
-
-        return info;
-    }
-
-    /**
-     * Run all the generated Uclid models, report outputs,
-     * and generate counterexample trace diagrams.
-     */
-    public void run() {
-        for (Path path : generator.generatedFiles) {
-            // Execute uclid for each property.
-            LFCommand command = commandFactory.createCommand(
-                "uclid", List.of(
-                    path.toString(),
-                    // Any counterexample will be in <path.toString()>.json
-                    "--json-cex", path.toString()),
-                generator.outputDir);
-            command.run();
-            
-            String output = command.getOutput().toString();
-            boolean valid = !output.contains("FAILED");
-            if (valid) {
-                System.out.println("Valid!");
-            } else {
-                System.out.println("Not valid!");
-                try {
-                    // Read from the JSON counterexample (cex).
-                    String cexJSONStr = Files.readString(
-                        Paths.get(path.toString() + ".json"),
-                        StandardCharsets.UTF_8);
-                    JSONObject cexJSON = new JSONObject(cexJSONStr);
-
-                    //// Extract the counterexample trace from JSON.
-                    // Get the first key "property_*"
-                    Iterator<String> keys = cexJSON.keys();
-                    String firstKey = keys.next();
-                    JSONObject propertyObj = cexJSON.getJSONObject(firstKey);
-
-                    // Get Uclid trace.
-                    JSONArray uclidTrace = propertyObj.getJSONArray("trace");
-                    
-                    // Get the first step of the Uclid trace.
-                    JSONObject uclidTraceStepOne = uclidTrace.getJSONObject(0);
-
-                    // Get the actual trace defined in the verification model.
-                    JSONObject trace = uclidTraceStepOne.getJSONArray("trace").getJSONObject(0);
-
-                    String stepStr = "";
-                    for (int i = 0; i <= generator.CT; i++) {
-                        try {
-                            stepStr = trace.getString(String.valueOf(i));
-                        } catch(JSONException e) {
-                            stepStr = trace.getString("-");
-                        }
-                        System.out.println("============ Step " + i + " ============");
-                        StateInfo info = parseStateInfo(stepStr);
-                        info.display();
-                    }
-                } catch (IOException e) {
-                    System.out.println("ERROR: Not able to read from " + path.toString());
-                }
-            }
-
-            // If "expect" is set, check if the result matches it.
-            // If not, exit with error code 1.
-            String expect = generator.expectations.get(path);
-            if (expect != null) {
-                boolean expectValid = Boolean.parseBoolean(expect);
-                if (expectValid != valid) {
-                    System.out.println(
-                        "ERROR: The expected result does not match the actual result. Expected: "
-                        + expectValid + ", Result: " + valid);
-                    System.exit(1);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/cli/Lfc.java b/org.lflang/src/org/lflang/cli/Lfc.java
deleted file mode 100644
index adf04be4e5..0000000000
--- a/org.lflang/src/org/lflang/cli/Lfc.java
+++ /dev/null
@@ -1,286 +0,0 @@
-package org.lflang.cli;
-
-
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Properties;
-
-import picocli.CommandLine.Command;
-import picocli.CommandLine.Option;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.generator.GeneratorDelegate;
-import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
-import org.eclipse.xtext.util.CancelIndicator;
-
-import org.lflang.ASTUtils;
-import org.lflang.FileConfig;
-
-import org.lflang.generator.LFGeneratorContext;
-import org.lflang.generator.LFGeneratorContext.BuildParm;
-import org.lflang.generator.MainContext;
-
-import com.google.inject.Inject;
-
-/**
- * Standalone version of the Lingua Franca compiler (lfc).
- *
- * @author Marten Lohstroh
- * @author Christian Menard
- * @author Atharva Patil
- */
-@Command(
-    name = "lfc",
-    // Enable usageHelp (--help) and versionHelp (--version) options.
-    mixinStandardHelpOptions = true,
-    versionProvider = VersionProvider.class)
-public class Lfc extends CliBase {
-    /**
-     * Injected code generator.
-     */
-    @Inject
-    private GeneratorDelegate generator;
-
-    /**
-     * Injected file access object.
-     */
-    @Inject
-    private JavaIoFileSystemAccess fileAccess;
-
-    /*
-     * Supported CLI options.
-     */
-
-    @Option(
-        names = "--build-type",
-        description = "The build type to use.")
-    private String buildType;
-
-    @Option(
-        names = {"-c", "--clean"},
-        arity = "0",
-        description = "Clean before building.")
-    private boolean clean;
-
-    @Option(
-        names = "--target-compiler",
-        description = "Target compiler to invoke.")
-    private String targetCompiler;
-
-    @Option(
-        names = "--external-runtime-path",
-        description = "Specify an external runtime library to be used by the"
-                    + " compiled binary.")
-    private Path externalRuntimePath;
-
-    @Option(
-        names = {"-f", "--federated"},
-        arity = "0",
-        description = "Treat main reactor as federated.")
-    private boolean federated;
-
-    @Option(
-        names = "--logging",
-        description = "The logging level to use by the generated binary")
-    private String logging;
-
-    @Option(
-        names = {"-l", "--lint"},
-        arity = "0",
-        description = "Enable linting of generated code.")
-    private boolean lint;
-
-    @Option(
-        names = {"-n", "--no-compile"},
-        arity = "0",
-        description = "Do not invoke target compiler.")
-    private boolean noCompile;
-
-    @Option(
-        names = {"--no-verify"},
-        arity = "0",
-        description = "Do not run the generated verification models.")
-    private boolean noVerify;
-
-    @Option(
-        names = {"-q", "--quiet"},
-        arity = "0",
-        description = 
-            "Suppress output of the target compiler and other commands")
-    private boolean quiet;
-
-    @Option(
-        names = {"-r", "--rti"},
-        description = "Specify the location of the RTI.")
-    private String rti;
-
-    @Option(
-        names = "--runtime-version",
-        description = "Specify the version of the runtime library used for"
-                    + " compiling LF programs.")
-    private String runtimeVersion;
-
-    @Option(
-        names = {"-s", "--scheduler"},
-        description = "Specify the runtime scheduler (if supported).")
-    private String scheduler;
-
-    @Option(
-        names = {"-t", "--threading"},
-        paramLabel = "<true/false>",
-        description = "Specify whether the runtime should use multi-threading"
-                    + " (true/false).")
-    private String threading;
-
-    @Option(
-        names = {"-w", "--workers"},
-        description = "Specify the default number of worker threads.")
-    private Integer workers;
-
-    /**
-     * Main function of the stand-alone compiler.
-     * Caution: this will invoke System.exit.
-     *
-     * @param args CLI arguments
-     */
-    public static void main(final String[] args) {
-        main(Io.SYSTEM, args);
-    }
-
-    /**
-     * Main function of the standalone compiler, with a custom IO.
-     *
-     * @param io IO streams.
-     * @param args Command-line arguments.
-     */
-    public static void main(Io io, final String... args) {
-        cliMain("lfc", Lfc.class, io, args);
-    }
-
-    /**
-     * Load the resource, validate it, and, invoke the code generator.
-     */
-    @Override
-    public void run() {
-        List<Path> paths = getInputPaths();
-        final Path outputRoot = getOutputRoot();
-        // Hard code the props based on the options we want.
-        Properties properties = this.filterPassOnProps();
-
-        try {
-            // Invoke the generator on all input file paths.
-            invokeGenerator(paths, outputRoot, properties);
-        } catch (RuntimeException e) {
-            reporter.printFatalErrorAndExit("An unexpected error occurred:", e);
-        }
-    }
-
-    /**
-     * Invoke the code generator on the given validated file paths.
-     */
-    private void invokeGenerator(
-            List<Path> files, Path root, Properties properties) {
-        for (Path path : files) {
-            path = toAbsolutePath(path);
-            String outputPath = getActualOutputPath(root, path).toString();
-            this.fileAccess.setOutputPath(outputPath);
-
-            final Resource resource = getResource(path);
-            if (resource == null) {
-                reporter.printFatalErrorAndExit(path 
-                    + " is not an LF file. Use the .lf file extension to"
-                    + " denote LF files.");
-            } else if (federated) {
-                if (!ASTUtils.makeFederated(resource)) {
-                    reporter.printError(
-                        "Unable to change main reactor to federated reactor.");
-                }
-            }
-
-            validateResource(resource);
-            exitIfCollectedErrors();
-
-            LFGeneratorContext context = new MainContext(
-                LFGeneratorContext.Mode.STANDALONE, CancelIndicator.NullImpl,
-                (m, p) -> {}, properties, resource, this.fileAccess,
-                fileConfig -> errorReporter
-            );
-
-            try {
-                this.generator.generate(resource, this.fileAccess, context);
-            } catch (Exception e) {
-                reporter.printFatalErrorAndExit("Error running generator", e);
-            }
-
-            exitIfCollectedErrors();
-            // Print all other issues (not errors).
-            issueCollector.getAllIssues().forEach(reporter::printIssue);
-
-            this.io.getOut().println("Code generation finished.");
-        }
-    }
-
-    private Path getActualOutputPath(Path root, Path path) {
-        if (root != null) {
-            return root.resolve("src-gen");
-        } else {
-            Path pkgRoot = FileConfig.findPackageRoot(
-                path, reporter::printWarning);
-            return pkgRoot.resolve("src-gen");
-        }
-    }
-
-    /**
-     * Filter the command-line arguments needed by the code generator, and
-     * return them as properties.
-     *
-     * @return Properties for the code generator.
-     */
-    protected Properties filterPassOnProps() {
-        Properties props = new Properties();
-
-        if (buildType != null) {
-            props.setProperty(BuildParm.BUILD_TYPE.getKey(), buildType);
-        }
-        if (clean) {
-            props.setProperty(BuildParm.CLEAN.getKey(), "true");
-        }
-        if (externalRuntimePath != null) {
-            props.setProperty(BuildParm.EXTERNAL_RUNTIME_PATH.getKey(), externalRuntimePath.toString());
-        }
-        if (lint) {
-            props.setProperty(BuildParm.LINT.getKey(), "true");
-        }
-        if (logging != null) {
-            props.setProperty(BuildParm.LOGGING.getKey(), logging);
-        }
-        if (noCompile) {
-            props.setProperty(BuildParm.NO_COMPILE.getKey(), "true");
-        }
-        if (noVerify) {
-            props.setProperty(BuildParm.NO_VERIFY.getKey(), "true");
-        }
-        if (targetCompiler != null) {
-            props.setProperty(BuildParm.TARGET_COMPILER.getKey(), targetCompiler);
-        }
-        if (quiet) {
-            props.setProperty(BuildParm.QUIET.getKey(), "true");
-        }
-        if (rti != null) {
-            props.setProperty(BuildParm.RTI.getKey(), rti);
-        }
-        if (runtimeVersion != null) {
-            props.setProperty(BuildParm.RUNTIME_VERSION.getKey(), runtimeVersion);
-        }
-        if (scheduler != null) {
-            props.setProperty(BuildParm.SCHEDULER.getKey(), scheduler);
-        }
-        if (threading != null) {
-            props.setProperty(BuildParm.THREADING.getKey(), threading);
-        }
-        if (workers != null) {
-            props.setProperty(BuildParm.WORKERS.getKey(), workers.toString());
-        }
-        
-        return props;
-    }
-}
diff --git a/org.lflang/src/org/lflang/dsl/antlr4/C.g4 b/org.lflang/src/org/lflang/dsl/antlr4/C.g4
deleted file mode 100644
index 2fd6c3aedf..0000000000
--- a/org.lflang/src/org/lflang/dsl/antlr4/C.g4
+++ /dev/null
@@ -1,908 +0,0 @@
-/*
- [The "BSD licence"]
- Copyright (c) 2013 Sam Harwell
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/** C 2011 grammar built from the C11 Spec */
-grammar C;
-
-
-primaryExpression
-    :   Identifier
-    |   Constant
-    |   StringLiteral+
-    |   '(' expression ')'
-    |   genericSelection
-    |   '__extension__'? '(' compoundStatement ')' // Blocks (GCC extension)
-    |   '__builtin_va_arg' '(' unaryExpression ',' typeName ')'
-    |   '__builtin_offsetof' '(' typeName ',' unaryExpression ')'
-    ;
-
-genericSelection
-    :   '_Generic' '(' assignmentExpression ',' genericAssocList ')'
-    ;
-
-genericAssocList
-    :   genericAssociation (',' genericAssociation)*
-    ;
-
-genericAssociation
-    :   (typeName | 'default') ':' assignmentExpression
-    ;
-
-postfixExpression
-    :
-    (   primaryExpression
-    |   '__extension__'? '(' typeName ')' '{' initializerList ','? '}'
-    )
-    ('[' expression ']'
-    | '(' argumentExpressionList? ')'
-    | ('.' | '->') Identifier
-    | ('++' | '--')
-    )*
-    ;
-
-argumentExpressionList
-    :   assignmentExpression (',' assignmentExpression)*
-    ;
-
-unaryExpression
-    :
-    ('++' |  '--' |  'sizeof')*
-    (postfixExpression
-    |   unaryOperator castExpression
-    |   ('sizeof' | '_Alignof') '(' typeName ')'
-    |   '&&' Identifier // GCC extension address of label
-    )
-    ;
-
-unaryOperator
-    :   '&' | '*' | '+' | '-' | '~' | '!'
-    ;
-
-castExpression
-    :   '__extension__'? '(' typeName ')' castExpression
-    |   unaryExpression
-    |   DigitSequence // for
-    ;
-
-multiplicativeExpression
-    :   castExpression (('*'|'/'|'%') castExpression)*
-    ;
-
-additiveExpression
-    :   multiplicativeExpression (('+'|'-') multiplicativeExpression)*
-    ;
-
-shiftExpression
-    :   additiveExpression (('<<'|'>>') additiveExpression)*
-    ;
-
-relationalExpression
-    :   shiftExpression (('<'|'>'|'<='|'>=') shiftExpression)*
-    ;
-
-equalityExpression
-    :   relationalExpression (('=='| '!=') relationalExpression)*
-    ;
-
-andExpression
-    :   equalityExpression ( '&' equalityExpression)*
-    ;
-
-exclusiveOrExpression
-    :   andExpression ('^' andExpression)*
-    ;
-
-inclusiveOrExpression
-    :   exclusiveOrExpression ('|' exclusiveOrExpression)*
-    ;
-
-logicalAndExpression
-    :   inclusiveOrExpression ('&&' inclusiveOrExpression)*
-    ;
-
-logicalOrExpression
-    :   logicalAndExpression ( '||' logicalAndExpression)*
-    ;
-
-conditionalExpression
-    :   logicalOrExpression ('?' expression ':' conditionalExpression)?
-    ;
-
-assignmentExpression
-    :   conditionalExpression
-    |   unaryExpression assignmentOperator assignmentExpression
-    |   DigitSequence // for
-    ;
-
-assignmentOperator
-    :   '=' | '*=' | '/=' | '%=' | '+=' | '-=' | '<<=' | '>>=' | '&=' | '^=' | '|='
-    ;
-
-expression
-    :   assignmentExpression (',' assignmentExpression)*
-    ;
-
-constantExpression
-    :   conditionalExpression
-    ;
-
-declaration
-    :   declarationSpecifiers initDeclaratorList? ';'
-    |   staticAssertDeclaration
-    ;
-
-declarationSpecifiers
-    :   declarationSpecifier+
-    ;
-
-declarationSpecifiers2
-    :   declarationSpecifier+
-    ;
-
-declarationSpecifier
-    :   storageClassSpecifier
-    |   typeSpecifier
-    |   typeQualifier
-    |   functionSpecifier
-    |   alignmentSpecifier
-    ;
-
-initDeclaratorList
-    :   initDeclarator (',' initDeclarator)*
-    ;
-
-initDeclarator
-    :   declarator ('=' initializer)?
-    ;
-
-storageClassSpecifier
-    :   'typedef'
-    |   'extern'
-    |   'static'
-    |   '_Thread_local'
-    |   'auto'
-    |   'register'
-    ;
-
-typeSpecifier
-    :   ('void'
-    |   'char'
-    |   'short'
-    |   'int'
-    |   'long'
-    |   'float'
-    |   'double'
-    |   'signed'
-    |   'unsigned'
-    |   '_Bool'
-    |   '_Complex'
-    |   '__m128'
-    |   '__m128d'
-    |   '__m128i')
-    |   '__extension__' '(' ('__m128' | '__m128d' | '__m128i') ')'
-    |   atomicTypeSpecifier
-    |   structOrUnionSpecifier
-    |   enumSpecifier
-    |   typedefName
-    |   '__typeof__' '(' constantExpression ')' // GCC extension
-    ;
-
-structOrUnionSpecifier
-    :   structOrUnion Identifier? '{' structDeclarationList '}'
-    |   structOrUnion Identifier
-    ;
-
-structOrUnion
-    :   'struct'
-    |   'union'
-    ;
-
-structDeclarationList
-    :   structDeclaration+
-    ;
-
-structDeclaration // The first two rules have priority order and cannot be simplified to one expression.
-    :   specifierQualifierList structDeclaratorList ';'
-    |   specifierQualifierList ';'
-    |   staticAssertDeclaration
-    ;
-
-specifierQualifierList
-    :   (typeSpecifier| typeQualifier) specifierQualifierList?
-    ;
-
-structDeclaratorList
-    :   structDeclarator (',' structDeclarator)*
-    ;
-
-structDeclarator
-    :   declarator
-    |   declarator? ':' constantExpression
-    ;
-
-enumSpecifier
-    :   'enum' Identifier? '{' enumeratorList ','? '}'
-    |   'enum' Identifier
-    ;
-
-enumeratorList
-    :   enumerator (',' enumerator)*
-    ;
-
-enumerator
-    :   enumerationConstant ('=' constantExpression)?
-    ;
-
-enumerationConstant
-    :   Identifier
-    ;
-
-atomicTypeSpecifier
-    :   '_Atomic' '(' typeName ')'
-    ;
-
-typeQualifier
-    :   'const'
-    |   'restrict'
-    |   'volatile'
-    |   '_Atomic'
-    ;
-
-functionSpecifier
-    :   ('inline'
-    |   '_Noreturn'
-    |   '__inline__' // GCC extension
-    |   '__stdcall')
-    |   gccAttributeSpecifier
-    |   '__declspec' '(' Identifier ')'
-    ;
-
-alignmentSpecifier
-    :   '_Alignas' '(' (typeName | constantExpression) ')'
-    ;
-
-declarator
-    :   pointer? directDeclarator gccDeclaratorExtension*
-    ;
-
-directDeclarator
-    :   Identifier
-    |   '(' declarator ')'
-    |   directDeclarator '[' typeQualifierList? assignmentExpression? ']'
-    |   directDeclarator '[' 'static' typeQualifierList? assignmentExpression ']'
-    |   directDeclarator '[' typeQualifierList 'static' assignmentExpression ']'
-    |   directDeclarator '[' typeQualifierList? '*' ']'
-    |   directDeclarator '(' parameterTypeList ')'
-    |   directDeclarator '(' identifierList? ')'
-    |   Identifier ':' DigitSequence  // bit field
-    |   vcSpecificModifer Identifier // Visual C Extension
-    |   '(' vcSpecificModifer declarator ')' // Visual C Extension
-    ;
-
-vcSpecificModifer
-    :   ('__cdecl' 
-    |   '__clrcall' 
-    |   '__stdcall' 
-    |   '__fastcall' 
-    |   '__thiscall' 
-    |   '__vectorcall') 
-    ;
-
-
-gccDeclaratorExtension
-    :   '__asm' '(' StringLiteral+ ')'
-    |   gccAttributeSpecifier
-    ;
-
-gccAttributeSpecifier
-    :   '__attribute__' '(' '(' gccAttributeList ')' ')'
-    ;
-
-gccAttributeList
-    :   gccAttribute? (',' gccAttribute?)*
-    ;
-
-gccAttribute
-    :   ~(',' | '(' | ')') // relaxed def for "identifier or reserved word"
-        ('(' argumentExpressionList? ')')?
-    ;
-
-nestedParenthesesBlock
-    :   (   ~('(' | ')')
-        |   '(' nestedParenthesesBlock ')'
-        )*
-    ;
-
-pointer
-    :  (('*'|'^') typeQualifierList?)+ // ^ - Blocks language extension
-    ;
-
-typeQualifierList
-    :   typeQualifier+
-    ;
-
-parameterTypeList
-    :   parameterList (',' '...')?
-    ;
-
-parameterList
-    :   parameterDeclaration (',' parameterDeclaration)*
-    ;
-
-parameterDeclaration
-    :   declarationSpecifiers declarator
-    |   declarationSpecifiers2 abstractDeclarator?
-    ;
-
-identifierList
-    :   Identifier (',' Identifier)*
-    ;
-
-typeName
-    :   specifierQualifierList abstractDeclarator?
-    ;
-
-abstractDeclarator
-    :   pointer
-    |   pointer? directAbstractDeclarator gccDeclaratorExtension*
-    ;
-
-directAbstractDeclarator
-    :   '(' abstractDeclarator ')' gccDeclaratorExtension*
-    |   '[' typeQualifierList? assignmentExpression? ']'
-    |   '[' 'static' typeQualifierList? assignmentExpression ']'
-    |   '[' typeQualifierList 'static' assignmentExpression ']'
-    |   '[' '*' ']'
-    |   '(' parameterTypeList? ')' gccDeclaratorExtension*
-    |   directAbstractDeclarator '[' typeQualifierList? assignmentExpression? ']'
-    |   directAbstractDeclarator '[' 'static' typeQualifierList? assignmentExpression ']'
-    |   directAbstractDeclarator '[' typeQualifierList 'static' assignmentExpression ']'
-    |   directAbstractDeclarator '[' '*' ']'
-    |   directAbstractDeclarator '(' parameterTypeList? ')' gccDeclaratorExtension*
-    ;
-
-typedefName
-    :   Identifier
-    ;
-
-initializer
-    :   assignmentExpression
-    |   '{' initializerList ','? '}'
-    ;
-
-initializerList
-    :   designation? initializer (',' designation? initializer)*
-    ;
-
-designation
-    :   designatorList '='
-    ;
-
-designatorList
-    :   designator+
-    ;
-
-designator
-    :   '[' constantExpression ']'
-    |   '.' Identifier
-    ;
-
-staticAssertDeclaration
-    :   '_Static_assert' '(' constantExpression ',' StringLiteral+ ')' ';'
-    ;
-
-statement
-    :   labeledStatement
-    |   compoundStatement
-    |   expressionStatement
-    |   selectionStatement
-    |   iterationStatement
-    |   jumpStatement
-    |   ('__asm' | '__asm__') ('volatile' | '__volatile__') '(' (logicalOrExpression (',' logicalOrExpression)*)? (':' (logicalOrExpression (',' logicalOrExpression)*)?)* ')' ';'
-    ;
-
-labeledStatement
-    :   Identifier ':' statement
-    |   'case' constantExpression ':' statement
-    |   'default' ':' statement
-    ;
-
-compoundStatement
-    :   '{' blockItemList? '}'
-    ;
-
-blockItemList
-    :   blockItem+
-    ;
-
-// Reaction body is a blockItem.
-blockItem
-    :   statement
-    |   declaration
-    ;
-
-expressionStatement
-    :   expression? ';'
-    ;
-
-selectionStatement
-    :   'if' '(' expression ')' statement ('else' statement)?
-    |   'switch' '(' expression ')' statement
-    ;
-
-iterationStatement
-    :   While '(' expression ')' statement
-    |   Do statement While '(' expression ')' ';'
-    |   For '(' forCondition ')' statement
-    ;
-
-//    |   'for' '(' expression? ';' expression?  ';' forUpdate? ')' statement
-//    |   For '(' declaration  expression? ';' expression? ')' statement
-
-forCondition
-	:   (forDeclaration | expression?) ';' forExpression? ';' forExpression?
-	;
-
-forDeclaration
-    :   declarationSpecifiers initDeclaratorList?
-    ;
-
-forExpression
-    :   assignmentExpression (',' assignmentExpression)*
-    ;
-
-jumpStatement
-    :   ('goto' Identifier
-    |   ('continue'| 'break')
-    |   'return' expression?
-    |   'goto' unaryExpression // GCC extension
-    )
-    ';'
-    ;
-
-compilationUnit
-    :   translationUnit? EOF
-    ;
-
-translationUnit
-    :   externalDeclaration+
-    ;
-
-externalDeclaration
-    :   functionDefinition
-    |   declaration
-    |   ';' // stray ;
-    ;
-
-functionDefinition
-    :   declarationSpecifiers? declarator declarationList? compoundStatement
-    ;
-
-declarationList
-    :   declaration+
-    ;
-
-Auto : 'auto';
-Break : 'break';
-Case : 'case';
-Char : 'char';
-Const : 'const';
-Continue : 'continue';
-Default : 'default';
-Do : 'do';
-Double : 'double';
-Else : 'else';
-Enum : 'enum';
-Extern : 'extern';
-Float : 'float';
-For : 'for';
-Goto : 'goto';
-If : 'if';
-Inline : 'inline';
-Int : 'int';
-Long : 'long';
-Register : 'register';
-Restrict : 'restrict';
-Return : 'return';
-Short : 'short';
-Signed : 'signed';
-Sizeof : 'sizeof';
-Static : 'static';
-Struct : 'struct';
-Switch : 'switch';
-Typedef : 'typedef';
-Union : 'union';
-Unsigned : 'unsigned';
-Void : 'void';
-Volatile : 'volatile';
-While : 'while';
-
-Alignas : '_Alignas';
-Alignof : '_Alignof';
-Atomic : '_Atomic';
-Bool : '_Bool';
-Complex : '_Complex';
-Generic : '_Generic';
-Imaginary : '_Imaginary';
-Noreturn : '_Noreturn';
-StaticAssert : '_Static_assert';
-ThreadLocal : '_Thread_local';
-
-LeftParen : '(';
-RightParen : ')';
-LeftBracket : '[';
-RightBracket : ']';
-LeftBrace : '{';
-RightBrace : '}';
-
-Less : '<';
-LessEqual : '<=';
-Greater : '>';
-GreaterEqual : '>=';
-LeftShift : '<<';
-RightShift : '>>';
-
-Plus : '+';
-PlusPlus : '++';
-Minus : '-';
-MinusMinus : '--';
-Star : '*';
-Div : '/';
-Mod : '%';
-
-And : '&';
-Or : '|';
-AndAnd : '&&';
-OrOr : '||';
-Caret : '^';
-Not : '!';
-Tilde : '~';
-
-Question : '?';
-Colon : ':';
-Semi : ';';
-Comma : ',';
-
-Assign : '=';
-// '*=' | '/=' | '%=' | '+=' | '-=' | '<<=' | '>>=' | '&=' | '^=' | '|='
-StarAssign : '*=';
-DivAssign : '/=';
-ModAssign : '%=';
-PlusAssign : '+=';
-MinusAssign : '-=';
-LeftShiftAssign : '<<=';
-RightShiftAssign : '>>=';
-AndAssign : '&=';
-XorAssign : '^=';
-OrAssign : '|=';
-
-Equal : '==';
-NotEqual : '!=';
-
-Arrow : '->';
-Dot : '.';
-Ellipsis : '...';
-
-Identifier
-    :   IdentifierNondigit
-        (   IdentifierNondigit
-        |   Digit
-        )*
-    ;
-
-fragment
-IdentifierNondigit
-    :   Nondigit
-    |   UniversalCharacterName
-    //|   // other implementation-defined characters...
-    ;
-
-fragment
-Nondigit
-    :   [a-zA-Z_]
-    ;
-
-fragment
-Digit
-    :   [0-9]
-    ;
-
-fragment
-UniversalCharacterName
-    :   '\\u' HexQuad
-    |   '\\U' HexQuad HexQuad
-    ;
-
-fragment
-HexQuad
-    :   HexadecimalDigit HexadecimalDigit HexadecimalDigit HexadecimalDigit
-    ;
-
-Constant
-    :   IntegerConstant
-    |   FloatingConstant
-    //|   EnumerationConstant
-    |   CharacterConstant
-    ;
-
-fragment
-IntegerConstant
-    :   DecimalConstant IntegerSuffix?
-    |   OctalConstant IntegerSuffix?
-    |   HexadecimalConstant IntegerSuffix?
-    |	BinaryConstant
-    ;
-
-fragment
-BinaryConstant
-	:	'0' [bB] [0-1]+
-	;
-
-fragment
-DecimalConstant
-    :   NonzeroDigit Digit*
-    ;
-
-fragment
-OctalConstant
-    :   '0' OctalDigit*
-    ;
-
-fragment
-HexadecimalConstant
-    :   HexadecimalPrefix HexadecimalDigit+
-    ;
-
-fragment
-HexadecimalPrefix
-    :   '0' [xX]
-    ;
-
-fragment
-NonzeroDigit
-    :   [1-9]
-    ;
-
-fragment
-OctalDigit
-    :   [0-7]
-    ;
-
-fragment
-HexadecimalDigit
-    :   [0-9a-fA-F]
-    ;
-
-fragment
-IntegerSuffix
-    :   UnsignedSuffix LongSuffix?
-    |   UnsignedSuffix LongLongSuffix
-    |   LongSuffix UnsignedSuffix?
-    |   LongLongSuffix UnsignedSuffix?
-    ;
-
-fragment
-UnsignedSuffix
-    :   [uU]
-    ;
-
-fragment
-LongSuffix
-    :   [lL]
-    ;
-
-fragment
-LongLongSuffix
-    :   'll' | 'LL'
-    ;
-
-fragment
-FloatingConstant
-    :   DecimalFloatingConstant
-    |   HexadecimalFloatingConstant
-    ;
-
-fragment
-DecimalFloatingConstant
-    :   FractionalConstant ExponentPart? FloatingSuffix?
-    |   DigitSequence ExponentPart FloatingSuffix?
-    ;
-
-fragment
-HexadecimalFloatingConstant
-    :   HexadecimalPrefix (HexadecimalFractionalConstant | HexadecimalDigitSequence) BinaryExponentPart FloatingSuffix?
-    ;
-
-fragment
-FractionalConstant
-    :   DigitSequence? '.' DigitSequence
-    |   DigitSequence '.'
-    ;
-
-fragment
-ExponentPart
-    :   [eE] Sign? DigitSequence
-    ;
-
-fragment
-Sign
-    :   [+-]
-    ;
-
-DigitSequence
-    :   Digit+
-    ;
-
-fragment
-HexadecimalFractionalConstant
-    :   HexadecimalDigitSequence? '.' HexadecimalDigitSequence
-    |   HexadecimalDigitSequence '.'
-    ;
-
-fragment
-BinaryExponentPart
-    :   [pP] Sign? DigitSequence
-    ;
-
-fragment
-HexadecimalDigitSequence
-    :   HexadecimalDigit+
-    ;
-
-fragment
-FloatingSuffix
-    :   [flFL]
-    ;
-
-fragment
-CharacterConstant
-    :   '\'' CCharSequence '\''
-    |   'L\'' CCharSequence '\''
-    |   'u\'' CCharSequence '\''
-    |   'U\'' CCharSequence '\''
-    ;
-
-fragment
-CCharSequence
-    :   CChar+
-    ;
-
-fragment
-CChar
-    :   ~['\\\r\n]
-    |   EscapeSequence
-    ;
-
-fragment
-EscapeSequence
-    :   SimpleEscapeSequence
-    |   OctalEscapeSequence
-    |   HexadecimalEscapeSequence
-    |   UniversalCharacterName
-    ;
-
-fragment
-SimpleEscapeSequence
-    :   '\\' ['"?abfnrtv\\]
-    ;
-
-fragment
-OctalEscapeSequence
-    :   '\\' OctalDigit OctalDigit? OctalDigit?
-    ;
-
-fragment
-HexadecimalEscapeSequence
-    :   '\\x' HexadecimalDigit+
-    ;
-
-StringLiteral
-    :   EncodingPrefix? '"' SCharSequence? '"'
-    ;
-
-fragment
-EncodingPrefix
-    :   'u8'
-    |   'u'
-    |   'U'
-    |   'L'
-    ;
-
-fragment
-SCharSequence
-    :   SChar+
-    ;
-
-fragment
-SChar
-    :   ~["\\\r\n]
-    |   EscapeSequence
-    |   '\\\n'   // Added line
-    |   '\\\r\n' // Added line
-    ;
-
-ComplexDefine
-    :   '#' Whitespace? 'define'  ~[#\r\n]*
-        -> skip
-    ;
-
-IncludeDirective
-    :   '#' Whitespace? 'include' Whitespace? (('"' ~[\r\n]* '"') | ('<' ~[\r\n]* '>' )) Whitespace? Newline
-        -> skip
-    ;
-
-// ignore the following asm blocks:
-/*
-    asm
-    {
-        mfspr x, 286;
-    }
- */
-AsmBlock
-    :   'asm' ~'{'* '{' ~'}'* '}'
-	-> skip
-    ;
-
-// ignore the lines generated by c preprocessor
-// sample line : '#line 1 "/home/dm/files/dk1.h" 1'
-LineAfterPreprocessing
-    :   '#line' Whitespace* ~[\r\n]*
-        -> skip
-    ;
-
-LineDirective
-    :   '#' Whitespace? DecimalConstant Whitespace? StringLiteral ~[\r\n]*
-        -> skip
-    ;
-
-PragmaDirective
-    :   '#' Whitespace? 'pragma' Whitespace ~[\r\n]*
-        -> skip
-    ;
-
-Whitespace
-    :   [ \t]+
-        -> skip
-    ;
-
-Newline
-    :   (   '\r' '\n'?
-        |   '\n'
-        )
-        -> skip
-    ;
-
-BlockComment
-    :   '/*' .*? '*/'
-        -> skip
-    ;
-
-LineComment
-    :   '//' ~[\r\n]*
-        -> skip
-    ;
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/dsl/antlr4/MTLLexer.g4 b/org.lflang/src/org/lflang/dsl/antlr4/MTLLexer.g4
deleted file mode 100644
index b8fe9c118d..0000000000
--- a/org.lflang/src/org/lflang/dsl/antlr4/MTLLexer.g4
+++ /dev/null
@@ -1,117 +0,0 @@
-lexer grammar MTLLexer;
-
-COMMA
-    : ','
-    ;
-
-LPAREN
-    : '('
-    ;
-
-RPAREN
-    : ')'
-    ;
-
-LBRACKET
-    : '['
-    ;
-
-RBRACKET
-    : ']'
-    ;
-
-LAND
-    : '&&'
-    ;
-
-LOR
-    : '||'
-    ;
-
-EQUI
-    : '<==>'
-    ;
-
-IMPL
-    : '==>'
-    ;
-
-UNTIL
-    : 'U'
-    ;
-
-NEGATION
-    : '!'
-    ;
-
-NEXT
-    : 'X'
-    ;
-
-GLOBALLY
-    : 'G'
-    ;
-
-FINALLY
-    : 'F'
-    ;
-
-WS
-    : [ \t\r\n]+ -> skip
-    ;
-
-TRUE
-    : 'true'
-    ;
-
-FALSE
-    : 'false'
-    ;
-
-PLUS
-    : '+'
-    ;
-
-MINUS
-    : '-'
-    ;
-
-TIMES
-    : '*'
-    ;
-
-DIV
-    : '/'
-    ;
-
-EQ
-    : '=='
-    ;
-
-NEQ
-    : '!='
-    ;
-
-LT
-    : '<'
-    ;
-
-LE
-    : '<='
-    ;
-
-GT
-    : '>'
-    ;
-
-GE
-    : '>='
-    ;
-
-INTEGER
-    : [0-9]+
-    ;
-
-ID
-    : ([a-zA-Z0-9]|'_')+
-    ;
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4 b/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4
deleted file mode 100644
index 1a5d39b9b4..0000000000
--- a/org.lflang/src/org/lflang/dsl/antlr4/MTLParser.g4
+++ /dev/null
@@ -1,82 +0,0 @@
-parser grammar MTLParser;
-
-options { tokenVocab=MTLLexer; }
-
-mtl
-    : equivalence
-    ;
-
-equivalence
-    : left=implication ( EQUI right=implication )?
-    ;
-
-implication
-    : left=disjunction ( IMPL right=disjunction )?
-    ;
-
-disjunction
-    : terms+=conjunction ( LOR terms+=conjunction )*
-    ;
-
-conjunction
-    : terms+=binaryOp ( LAND terms+=binaryOp )*
-    ;
-
-binaryOp
-    : left=unaryOp ( UNTIL timeInterval=interval right=unaryOp )? # Until
-    ;
-
-unaryOp
-    : formula=primary # NoUnaryOp
-    | NEGATION formula=primary # Negation
-    | NEXT timeInterval=interval formula=primary # Next
-    | GLOBALLY timeInterval=interval formula=primary # Globally
-    | FINALLY timeInterval=interval formula=primary # Finally
-    ;
-
-primary
-    : atom=atomicProp
-    | id=ID
-    | LPAREN formula=mtl RPAREN
-    ;
-
-atomicProp
-    : primitive=TRUE
-    | primitive=FALSE
-    | left=expr op=relOp right=expr
-    ;
-
-interval
-    : (LPAREN|LBRACKET) lowerbound=time COMMA upperbound=time (RPAREN|RBRACKET) # Range
-    | LBRACKET instant=time RBRACKET # Singleton
-    ;
-
-time
-    : value=INTEGER (unit=ID)?
-    ;
-
-sum 
-    : terms+=difference (PLUS terms+=difference)*
-    ;
-
-difference
-    : terms+=product (MINUS terms+=product)*
-    ;
-
-product
-    : terms+=quotient (TIMES terms+=quotient)*
-    ;
-
-quotient
-    : terms+=expr (DIV terms+=expr)*
-    ;
-
-relOp
-    : EQ | NEQ | LT | LE | GT | GE
-    ;
-
-expr
-    : ID
-    | LPAREN sum RPAREN
-    | INTEGER
-    ;
diff --git a/org.lflang/src/org/lflang/generator/GeneratorBase.java b/org.lflang/src/org/lflang/generator/GeneratorBase.java
deleted file mode 100644
index 9e1e07034a..0000000000
--- a/org.lflang/src/org/lflang/generator/GeneratorBase.java
+++ /dev/null
@@ -1,705 +0,0 @@
-/*************
- * Copyright (c) 2019-2020, The University of California at Berkeley.
-
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
-
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
-
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
-
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- ***************/
-package org.lflang.generator;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-
-import org.lflang.ASTUtils;
-import org.lflang.ErrorReporter;
-import org.lflang.FileConfig;
-import org.lflang.MainConflictChecker;
-import org.lflang.Target;
-import org.lflang.TargetConfig;
-import org.lflang.TimeUnit;
-import org.lflang.TimeValue;
-import org.lflang.ast.AstTransformation;
-import org.lflang.graph.InstantiationGraph;
-import org.lflang.lf.Connection;
-import org.lflang.lf.Expression;
-import org.lflang.lf.Instantiation;
-import org.lflang.lf.LfFactory;
-import org.lflang.lf.Mode;
-
-import org.lflang.lf.Reaction;
-import org.lflang.lf.Reactor;
-import org.lflang.lf.Time;
-import org.lflang.validation.AbstractLFValidator;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.Iterables;
-
-/**
- * Generator base class for specifying core functionality
- * that all code generators should have.
- *
- * @author Edward A. Lee
- * @author Marten Lohstroh
- * @author Christian Menard
- * @author Matt Weber
- * @author Soroush Bateni
- */
-public abstract class GeneratorBase extends AbstractLFValidator {
-
-    ////////////////////////////////////////////
-    //// Public fields.
-
-    /**
-     * The main (top-level) reactor instance.
-     */
-    public ReactorInstance main;
-
-    /** An error reporter for reporting any errors or warnings during the code generation */
-    public ErrorReporter errorReporter;
-
-    ////////////////////////////////////////////
-    //// Protected fields.
-
-    /**
-     * The current target configuration.
-     */
-    protected final TargetConfig targetConfig;
-
-    public TargetConfig getTargetConfig() { return this.targetConfig;}
-
-    public final LFGeneratorContext context;
-
-    /**
-     * A factory for compiler commands.
-     */
-    protected GeneratorCommandFactory commandFactory;
-
-    public GeneratorCommandFactory getCommandFactory() { return commandFactory; }
-
-    /**
-     * Definition of the main (top-level) reactor.
-     * This is an automatically generated AST node for the top-level
-     * reactor.
-     */
-    protected Instantiation mainDef;
-    public Instantiation getMainDef() { return mainDef; }
-
-    /**
-     * A list of Reactor definitions in the main resource, including non-main
-     * reactors defined in imported resources. These are ordered in the list in
-     * such a way that each reactor is preceded by any reactor that it instantiates
-     * using a command like `foo = new Foo();`
-     */
-    protected List<Reactor> reactors = new ArrayList<>();
-
-    /**
-     * The set of resources referenced reactor classes reside in.
-     */
-    protected Set<LFResource> resources = new LinkedHashSet<>(); // FIXME: Why do we need this?
-
-    /**
-     * Graph that tracks dependencies between instantiations.
-     * This is a graph where each node is a Reactor (not a ReactorInstance)
-     * and an arc from Reactor A to Reactor B means that B contains an instance of A, constructed with a statement
-     * like `a = new A();`  After creating the graph,
-     * sort the reactors in topological order and assign them to the reactors class variable.
-     * Hence, after this method returns, `this.reactors` will be a list of Reactors such that any
-     * reactor is preceded in the list by reactors that it instantiates.
-     */
-    protected InstantiationGraph instantiationGraph;
-
-    /**
-     * The set of unordered reactions. An unordered reaction is one that does
-     * not have any dependency on other reactions in the containing reactor,
-     * and where no other reaction in the containing reactor depends on it.
-     * There is currently no way in the syntax of LF to make a reaction
-     * unordered, deliberately, because it can introduce unexpected
-     * nondeterminacy. However, certain automatically generated reactions are
-     * known to be safe to be unordered because they do not interact with the
-     * state of the containing reactor. To make a reaction unordered, when
-     * the Reaction instance is created, add that instance to this set.
-     */
-    protected Set<Reaction> unorderedReactions = null;
-
-    /**
-     * Map from reactions to bank indices
-     */
-    protected Map<Reaction,Integer> reactionBankIndices = null;
-
-    /**
-     * Indicates whether the current Lingua Franca program
-     * contains model reactors.
-     */
-    public boolean hasModalReactors = false;
-
-    /**
-     * Indicates whether the program has any deadlines and thus
-     * needs to propagate deadlines through the reaction instance graph
-     */
-    public boolean hasDeadlines = false;
-
-    // //////////////////////////////////////////
-    // // Private fields.
-
-    /**
-     * A list ot AST transformations to apply before code generation
-     */
-    private final List<AstTransformation> astTransformations = new ArrayList<>();
-
-    /**
-     * Create a new GeneratorBase object.
-     */
-    public GeneratorBase(LFGeneratorContext context) {
-        this.context = context;
-        this.targetConfig = context.getTargetConfig();
-        this.errorReporter = context.getErrorReporter();
-        this.commandFactory = new GeneratorCommandFactory(errorReporter, context.getFileConfig());
-    }
-
-    /**
-     * Register an AST transformation to be applied to the AST.
-     *
-     * The transformations will be applied in the order that they are registered in.
-     */
-    protected void registerTransformation(AstTransformation transformation) {
-        astTransformations.add(transformation);
-    }
-
-    // //////////////////////////////////////////
-    // // Code generation functions to override for a concrete code generator.
-
-    /**
-     * If there is a main or federated reactor, then create a synthetic Instantiation
-     * for that top-level reactor and set the field mainDef to refer to it.
-     */
-    protected void createMainInstantiation() {
-        // Find the main reactor and create an AST node for its instantiation.
-        Iterable<EObject> nodes = IteratorExtensions.toIterable(context.getFileConfig().resource.getAllContents());
-        for (Reactor reactor : Iterables.filter(nodes, Reactor.class)) {
-            if (reactor.isMain()) {
-                // Creating a definition for the main reactor because there isn't one.
-                this.mainDef = LfFactory.eINSTANCE.createInstantiation();
-                this.mainDef.setName(reactor.getName());
-                this.mainDef.setReactorClass(reactor);
-            }
-        }
-    }
-
-    /**
-     * Generate code from the Lingua Franca model contained by the specified resource.
-     *
-     * This is the main entry point for code generation. This base class finds all
-     * reactor class definitions, including any reactors defined in imported .lf files
-     * (except any main reactors in those imported files), and adds them to the
-     * {@link GeneratorBase#reactors reactors} list. If errors occur during
-     * generation, then a subsequent call to errorsOccurred() will return true.
-     * @param resource The resource containing the source code.
-     * @param context Context relating to invocation of the code generator.
-     * In standalone mode, this object is also used to relay CLI arguments.
-     */
-    public void doGenerate(Resource resource, LFGeneratorContext context) {
-
-        printInfo(context.getMode());
-
-        // Clear any IDE markers that may have been created by a previous build.
-        // Markers mark problems in the Eclipse IDE when running in integrated mode.
-        errorReporter.clearHistory();
-
-        ASTUtils.setMainName(context.getFileConfig().resource, context.getFileConfig().name);
-
-        createMainInstantiation();
-
-        // Check if there are any conflicting main reactors elsewhere in the package.
-        if (Objects.equal(context.getMode(), LFGeneratorContext.Mode.STANDALONE) && mainDef != null) {
-            for (String conflict : new MainConflictChecker(context.getFileConfig()).conflicts) {
-                errorReporter.reportError(this.mainDef.getReactorClass(), "Conflicting main reactor in " + conflict);
-            }
-        }
-
-        // Configure the command factory
-        commandFactory.setVerbose();
-        if (Objects.equal(context.getMode(), LFGeneratorContext.Mode.STANDALONE) && context.getArgs().containsKey("quiet")) {
-            commandFactory.setQuiet();
-        }
-
-        // Process target files. Copy each of them into the src-gen dir.
-        // FIXME: Should we do this here? This doesn't make sense for federates the way it is
-        // done here.
-        copyUserFiles(this.targetConfig, context.getFileConfig());
-
-        // Collect reactors and create an instantiation graph.
-        // These are needed to figure out which resources we need
-        // to validate, which happens in setResources().
-        setReactorsAndInstantiationGraph(context.getMode());
-
-        List<Resource> allResources = GeneratorUtils.getResources(reactors);
-        resources.addAll(allResources.stream()  // FIXME: This filter reproduces the behavior of the method it replaces. But why must it be so complicated? Why are we worried about weird corner cases like this?
-            .filter(it -> !Objects.equal(it, context.getFileConfig().resource) || mainDef != null && it == mainDef.getReactorClass().eResource())
-            .map(it -> GeneratorUtils.getLFResource(it, context.getFileConfig().getSrcGenBasePath(), context, errorReporter))
-            .toList()
-        );
-        GeneratorUtils.accommodatePhysicalActionsIfPresent(
-            allResources,
-            getTarget().setsKeepAliveOptionAutomatically(),
-            targetConfig,
-            errorReporter
-        );
-        // FIXME: Should the GeneratorBase pull in `files` from imported
-        // resources?
-
-        for (AstTransformation transformation : astTransformations) {
-            transformation.applyTransformation(reactors);
-        }
-
-        // Transform connections that reside in mutually exclusive modes and are otherwise conflicting
-        // This should be done before creating the instantiation graph
-        transformConflictingConnectionsInModalReactors();
-
-        // Invoke these functions a second time because transformations
-        // may have introduced new reactors!
-        setReactorsAndInstantiationGraph(context.getMode());
-
-        // Check for existence and support of modes
-        hasModalReactors = IterableExtensions.exists(reactors, it -> !it.getModes().isEmpty());
-        checkModalReactorSupport(false);
-        additionalPostProcessingForModes();
-    }
-
-    /**
-     * Create a new instantiation graph. This is a graph where each node is a Reactor (not a ReactorInstance)
-     * and an arc from Reactor A to Reactor B means that B contains an instance of A, constructed with a statement
-     * like `a = new A();`  After creating the graph,
-     * sort the reactors in topological order and assign them to the reactors class variable.
-     * Hence, after this method returns, `this.reactors` will be a list of Reactors such that any
-     * reactor is preceded in the list by reactors that it instantiates.
-     */
-    protected void setReactorsAndInstantiationGraph(LFGeneratorContext.Mode mode) {
-        // Build the instantiation graph .
-        instantiationGraph = new InstantiationGraph(context.getFileConfig().resource, false);
-
-        // Topologically sort the reactors such that all of a reactor's instantiation dependencies occur earlier in
-        // the sorted list of reactors. This helps the code generator output code in the correct order.
-        // For example if `reactor Foo {bar = new Bar()}` then the definition of `Bar` has to be generated before
-        // the definition of `Foo`.
-        reactors = instantiationGraph.nodesInTopologicalOrder();
-
-        // If there is no main reactor or if all reactors in the file need to be validated, then make sure the reactors
-        // list includes even reactors that are not instantiated anywhere.
-        if (mainDef == null || Objects.equal(mode, LFGeneratorContext.Mode.LSP_MEDIUM)) {
-            Iterable<EObject> nodes = IteratorExtensions.toIterable(context.getFileConfig().resource.getAllContents());
-            for (Reactor r : IterableExtensions.filter(nodes, Reactor.class)) {
-                if (!reactors.contains(r)) {
-                    reactors.add(r);
-                }
-            }
-        }
-    }
-
-    /**
-     * Copy user specific files to the src-gen folder.
-     *
-     * This should be overridden by the target generators.
-     *
-     * @param targetConfig The targetConfig to read the `files` from.
-     * @param fileConfig The fileConfig used to make the copy and resolve paths.
-     */
-    protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {}
-
-    /**
-     * Return true if errors occurred in the last call to doGenerate().
-     * This will return true if any of the reportError methods was called.
-     * @return True if errors occurred.
-     */
-    public boolean errorsOccurred() {
-        return errorReporter.getErrorsOccurred();
-    }
-
-    /*
-     * Return the TargetTypes instance associated with this.
-     */
-    public abstract TargetTypes getTargetTypes();
-
-    /**
-     * Mark the reaction unordered. An unordered reaction is one that does not
-     * have any dependency on other reactions in the containing reactor, and
-     * where no other reaction in the containing reactor depends on it. There
-     * is currently no way in the syntax of LF to make a reaction unordered,
-     * deliberately, because it can introduce unexpected nondeterminacy.
-     * However, certain automatically generated reactions are known to be safe
-     * to be unordered because they do not interact with the state of the
-     * containing reactor. To make a reaction unordered, when the Reaction
-     * instance is created, add that instance to this set.
-     * @param reaction The reaction to make unordered.
-     */
-    public void makeUnordered(Reaction reaction) {
-        if (unorderedReactions == null) {
-            unorderedReactions = new LinkedHashSet<>();
-        }
-        unorderedReactions.add(reaction);
-    }
-
-    /**
-     * Mark the specified reaction to belong to only the specified
-     * bank index. This is needed because reactions cannot declare
-     * a specific bank index as an effect or trigger. Reactions that
-     * send messages between federates, including absent messages,
-     * need to be specific to a bank member.
-     * @param reaction The reaction.
-     * @param bankIndex The bank index, or -1 if there is no bank.
-     */
-    public void setReactionBankIndex(Reaction reaction, int bankIndex) {
-        if (bankIndex < 0) {
-            return;
-        }
-        if (reactionBankIndices == null) {
-            reactionBankIndices = new LinkedHashMap<>();
-        }
-        reactionBankIndices.put(reaction, bankIndex);
-    }
-
-    /**
-     * Return the reaction bank index.
-     * @see #setReactionBankIndex(Reaction reaction, int bankIndex)
-     * @param reaction The reaction.
-     * @return The reaction bank index, if one has been set, and -1 otherwise.
-     */
-    public int getReactionBankIndex(Reaction reaction) {
-        if (reactionBankIndices == null) return -1;
-        if (reactionBankIndices.get(reaction) == null) return -1;
-        return reactionBankIndices.get(reaction);
-    }
-
-    /**
-     * Given a representation of time that may possibly include units, return
-     * a string that the target language can recognize as a value. In this base
-     * class, if units are given, e.g. "msec", then we convert the units to upper
-     * case and return an expression of the form "MSEC(value)". Particular target
-     * generators will need to either define functions or macros for each possible
-     * time unit or override this method to return something acceptable to the
-     * target language.
-     * @param time A TimeValue that represents a time.
-     * @return A string, such as "MSEC(100)" for 100 milliseconds.
-     */
-    public static String timeInTargetLanguage(TimeValue time) {
-        if (time != null) {
-            if (time.unit != null) {
-                return cMacroName(time.unit) + "(" + time.getMagnitude() + ")";
-            } else {
-                return Long.valueOf(time.getMagnitude()).toString();
-            }
-        }
-        return "0"; // FIXME: do this or throw exception?
-    }
-
-    // note that this is moved out by #544
-    public static String cMacroName(TimeUnit unit) {
-        return unit.getCanonicalName().toUpperCase();
-    }
-
-    // //////////////////////////////////////////
-    // // Protected methods.
-
-    /**
-     * Checks whether modal reactors are present and require appropriate code generation.
-     * This will set the hasModalReactors variable.
-     * @param isSupported indicates if modes are supported by this code generation.
-     */
-    protected void checkModalReactorSupport(boolean isSupported) {
-        if (hasModalReactors && !isSupported) {
-            errorReporter.reportError("The currently selected code generation or " +
-                                      "target configuration does not support modal reactors!");
-        }
-    }
-
-    /**
-     * Finds and transforms connections into forwarding reactions iff the connections have the same destination as other
-     * connections or reaction in mutually exclusive modes.
-     */
-    private void transformConflictingConnectionsInModalReactors() {
-        for (LFResource r : resources) {
-            var transform = ASTUtils.findConflictingConnectionsInModalReactors(r.eResource);
-            if (!transform.isEmpty()) {
-                var factory = LfFactory.eINSTANCE;
-                for (Connection connection : transform) {
-                    // Currently only simple transformations are supported
-                    if (connection.isPhysical() || connection.getDelay() != null || connection.isIterated() ||
-                        connection.getLeftPorts().size() > 1 || connection.getRightPorts().size() > 1
-                    ) {
-                        errorReporter.reportError(connection, "Cannot transform connection in modal reactor. Connection uses currently not supported features.");
-                    } else {
-                        var reaction = factory.createReaction();
-                        ((Mode)connection.eContainer()).getReactions().add(reaction);
-
-                        var sourceRef = connection.getLeftPorts().get(0);
-                        var destRef = connection.getRightPorts().get(0);
-                        reaction.getTriggers().add(sourceRef);
-                        reaction.getEffects().add(destRef);
-
-                        var code = factory.createCode();
-                        var source = (sourceRef.getContainer() != null ?
-                                sourceRef.getContainer().getName() + "." : "") + sourceRef.getVariable().getName();
-                        var dest = (destRef.getContainer() != null ?
-                                destRef.getContainer().getName() + "." : "") + destRef.getVariable().getName();
-                        code.setBody(getConflictingConnectionsInModalReactorsBody(source, dest));
-                        reaction.setCode(code);
-
-                        EcoreUtil.remove(connection);
-                    }
-                }
-            }
-        }
-    }
-    /**
-     * Return target code for forwarding reactions iff the connections have the
-     * same destination as other connections or reaction in mutually exclusive modes.
-     *
-     * This method needs to be overridden in target specific code generators that
-     * support modal reactors.
-     */
-    protected String getConflictingConnectionsInModalReactorsBody(String source, String dest) {
-        errorReporter.reportError("The currently selected code generation " +
-                                  "is missing an implementation for conflicting " +
-                                  "transforming connections in modal reactors.");
-        return "MODAL MODELS NOT SUPPORTED";
-    }
-
-    /**
-     * Hook for additional post-processing of the model.
-     */
-    protected void additionalPostProcessingForModes() {
-        // Do nothing
-    }
-
-    /**
-     * Parsed error message from a compiler is returned here.
-     */
-    public static class ErrorFileAndLine {
-        public String filepath = null;
-        public String line = "1";
-        public String character = "0";
-        public String message = "";
-        public boolean isError = true; // false for a warning.
-
-        @Override
-        public String toString() {
-          return (isError ? "Error" : "Non-error") + " at " + line + ":" + character + " of file " + filepath + ": " + message;
-        }
-    }
-
-    /**
-     * Given a line of text from the output of a compiler, return
-     * an instance of ErrorFileAndLine if the line is recognized as
-     * the first line of an error message. Otherwise, return null.
-     * This base class simply returns null.
-     * @param line A line of output from a compiler or other external
-     * tool that might generate errors.
-     * @return If the line is recognized as the start of an error message,
-     * then return a class containing the path to the file on which the
-     * error occurred (or null if there is none), the line number (or the
-     * string "1" if there is none), the character position (or the string
-     * "0" if there is none), and the message (or an empty string if there
-     * is none).
-     */
-    protected ErrorFileAndLine parseCommandOutput(String line) {
-        return null;
-    }
-
-    /**
-     * Parse the specified string for command errors that can be reported
-     * using marks in the Eclipse IDE. In this class, we attempt to parse
-     * the messages to look for file and line information, thereby generating
-     * marks on the appropriate lines. This should not be called in standalone
-     * mode.
-     *
-     * @param stderr The output on standard error of executing a command.
-     */
-    public void reportCommandErrors(String stderr) {
-        // NOTE: If the VS Code branch passes code review, then this function,
-        //  parseCommandOutput, and ErrorFileAndLine will be deleted soon after.
-        // First, split the message into lines.
-        String[] lines = stderr.split("\\r?\\n");
-        StringBuilder message = new StringBuilder();
-        Integer lineNumber = null;
-        Path path = context.getFileConfig().srcFile;
-        // In case errors occur within an imported file, record the original path.
-        Path originalPath = path;
-
-        int severity = IMarker.SEVERITY_ERROR;
-        for (String line : lines) {
-            ErrorFileAndLine parsed = parseCommandOutput(line);
-            if (parsed != null) {
-                // Found a new line number designator.
-                // If there is a previously accumulated message, report it.
-                if (message.length() > 0) {
-                    if (severity == IMarker.SEVERITY_ERROR)
-                        errorReporter.reportError(path, lineNumber, message.toString());
-                    else
-                        errorReporter.reportWarning(path, lineNumber, message.toString());
-
-                    if (!Objects.equal(originalPath.toFile(), path.toFile())) {
-                        // Report an error also in the top-level resource.
-                        // FIXME: It should be possible to descend through the import
-                        // statements to find which one matches and mark all the
-                        // import statements down the chain. But what a pain!
-                        if (severity == IMarker.SEVERITY_ERROR) {
-                            errorReporter.reportError(originalPath, 1, "Error in imported file: " + path);
-                        } else {
-                            errorReporter.reportWarning(originalPath, 1, "Warning in imported file: " + path);
-                        }
-                     }
-                }
-                if (parsed.isError) {
-                    severity = IMarker.SEVERITY_ERROR;
-                } else {
-                    severity = IMarker.SEVERITY_WARNING;
-                }
-
-                // Start accumulating a new message.
-                message = new StringBuilder();
-                // Append the message on the line number designator line.
-                message.append(parsed.message);
-
-                // Set the new line number.
-                try {
-                    lineNumber = Integer.decode(parsed.line);
-                } catch (Exception ex) {
-                    // Set the line number unknown.
-                    lineNumber = null;
-                }
-                // FIXME: Ignoring the position within the line.
-                // Determine the path within which the error occurred.
-                path = Paths.get(parsed.filepath);
-            } else {
-                // No line designator.
-                if (message.length() > 0) {
-                    message.append("\n");
-                } else {
-                    if (!line.toLowerCase().contains("error:")) {
-                        severity = IMarker.SEVERITY_WARNING;
-                    }
-                }
-                message.append(line);
-            }
-        }
-        if (message.length() > 0) {
-            if (severity == IMarker.SEVERITY_ERROR) {
-                errorReporter.reportError(path, lineNumber, message.toString());
-            } else {
-                errorReporter.reportWarning(path, lineNumber, message.toString());
-            }
-
-            if (originalPath.toFile() != path.toFile()) {
-                // Report an error also in the top-level resource.
-                // FIXME: It should be possible to descend through the import
-                // statements to find which one matches and mark all the
-                // import statements down the chain. But what a pain!
-                if (severity == IMarker.SEVERITY_ERROR) {
-                    errorReporter.reportError(originalPath, 1, "Error in imported file: " + path);
-                } else {
-                    errorReporter.reportWarning(originalPath, 1, "Warning in imported file: " + path);
-                }
-            }
-        }
-    }
-
-    // //////////////////////////////////////////////////
-    // // Private functions
-
-    /**
-     * Print to stdout information about what source file is being generated,
-     * what mode the generator is in, and where the generated sources are to be put.
-     */
-    public void printInfo(LFGeneratorContext.Mode mode) {
-        System.out.println("Generating code for: " + context.getFileConfig().resource.getURI().toString());
-        System.out.println("******** mode: " + mode);
-        System.out.println("******** generated sources: " + context.getFileConfig().getSrcGenPath());
-    }
-
-    /**
-     * Get the buffer type used for network messages
-     */
-    public String getNetworkBufferType() { return ""; }
-
-    /**
-     * Return the Targets enum for the current target
-     */
-    public abstract Target getTarget();
-
-    /**
-     * Get textual representation of a time in the target language.
-     *
-     * @param t A time AST node
-     * @return A time string in the target language
-     */
-    // FIXME: this should be placed in ExpressionGenerator
-    public static String getTargetTime(Time t) {
-        TimeValue value = new TimeValue(t.getInterval(), TimeUnit.fromName(t.getUnit()));
-        return timeInTargetLanguage(value);
-    }
-
-    /**
-     * Get textual representation of a value in the target language.
-     *
-     * If the value evaluates to 0, it is interpreted as a normal value.
-     *
-     * @param expr An AST node
-     * @return A string in the target language
-     */
-    // FIXME: this should be placed in ExpressionGenerator
-    public static String getTargetValue(Expression expr) {
-        if (expr instanceof Time) {
-            return getTargetTime((Time)expr);
-        }
-        return ASTUtils.toText(expr);
-    }
-
-    /**
-     * Get textual representation of a value in the target language.
-     *
-     * If the value evaluates to 0, it is interpreted as a time.
-     *
-     * @param expr A time AST node
-     * @return A time string in the target language
-     */
-    // FIXME: this should be placed in ExpressionGenerator
-    public static String getTargetTime(Expression expr) {
-        if (expr instanceof Time) {
-            return getTargetTime((Time)expr);
-        } else if (ASTUtils.isZero(expr)) {
-            TimeValue value = TimeValue.ZERO;
-            return timeInTargetLanguage(value);
-        }
-        return ASTUtils.toText(expr);
-    }
-}
diff --git a/org.lflang/src/org/lflang/generator/LFGenerator.java b/org.lflang/src/org/lflang/generator/LFGenerator.java
deleted file mode 100644
index c96dfa95cc..0000000000
--- a/org.lflang/src/org/lflang/generator/LFGenerator.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package org.lflang.generator;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.generator.AbstractGenerator;
-import org.eclipse.xtext.generator.IFileSystemAccess2;
-import org.eclipse.xtext.generator.IGeneratorContext;
-import org.eclipse.xtext.util.RuntimeIOException;
-
-import org.lflang.ASTUtils;
-import org.lflang.AttributeUtils;
-import org.lflang.ErrorReporter;
-import org.lflang.FileConfig;
-import org.lflang.Target;
-import org.lflang.analyses.uclid.UclidGenerator;
-import org.lflang.analyses.uclid.UclidRunner;
-import org.lflang.federated.generator.FedASTUtils;
-import org.lflang.federated.generator.FedFileConfig;
-import org.lflang.federated.generator.FedGenerator;
-import org.lflang.generator.c.CFileConfig;
-import org.lflang.generator.c.CGenerator;
-import org.lflang.generator.python.PyFileConfig;
-import org.lflang.generator.python.PythonGenerator;
-import org.lflang.lf.Attribute;
-import org.lflang.lf.Reactor;
-import org.lflang.scoping.LFGlobalScopeProvider;
-
-import com.google.inject.Inject;
-
-/**
- * Generates code from your model files on save.
- *
- * See
- * https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#code-generation
- */
-public class LFGenerator extends AbstractGenerator {
-
-    @Inject
-    private LFGlobalScopeProvider scopeProvider;
-
-    // Indicator of whether generator errors occurred.
-    protected boolean generatorErrorsOccurred = false;
-
-    /**
-     * Create a target-specific FileConfig object in Kotlin
-     * <p>
-     * Since the CppFileConfig and TSFileConfig class are implemented in Kotlin, the classes are
-     * not visible from all contexts. If the RCA is run from within Eclipse via
-     * "Run as Eclipse Application", the Kotlin classes are unfortunately not
-     * available at runtime due to bugs in the Eclipse Kotlin plugin. (See
-     * https://stackoverflow.com/questions/68095816/is-ist-possible-to-build-mixed-kotlin-and-java-applications-with-a-recent-eclips)
-     * <p>
-     * If the FileConfig class is found, this method returns an instance.
-     * Otherwise, it returns an Instance of FileConfig.
-     *
-     * @return A FileConfig object in Kotlin if the class can be found.
-     * @throws IOException If the file config could not be created properly
-     */
-    public static FileConfig createFileConfig(Resource resource, Path srcGenBasePath,
-                                        boolean useHierarchicalBin) {
-
-        final Target target = Target.fromDecl(ASTUtils.targetDecl(resource));
-        assert target != null;
-
-        // Since our Eclipse Plugin uses code injection via guice, we need to
-        // play a few tricks here so that FileConfig does not appear as an
-        // import. Instead, we look the class up at runtime and instantiate it if
-        // found.
-        try {
-            if (FedASTUtils.findFederatedReactor(resource) != null) {
-                return new FedFileConfig(resource, srcGenBasePath, useHierarchicalBin);
-            }
-            switch (target) {
-            case CCPP:
-            case C: return new CFileConfig(resource, srcGenBasePath, useHierarchicalBin);
-            case Python: return new PyFileConfig(resource, srcGenBasePath, useHierarchicalBin);
-            case CPP:
-            case Rust:
-            case TS:
-                String className = "org.lflang.generator." + target.packageName + "." + target.classNamePrefix + "FileConfig";
-                try {
-                    return (FileConfig) Class.forName(className)
-                                             .getDeclaredConstructor(Resource.class, Path.class, boolean.class)
-                                             .newInstance(resource, srcGenBasePath, useHierarchicalBin);
-                } catch (ReflectiveOperationException e) {
-                    throw new RuntimeException(
-                        "Exception instantiating " + className, e.getCause());
-                }
-            default:
-                throw new RuntimeException("Could not find FileConfig implementation for target " + target);
-            }
-        } catch (IOException e) {
-            throw new RuntimeException("Unable to create FileConfig object for target " + target + ": " + e.getStackTrace());
-        }
-    }
-
-    /**
-     *  Create a generator object for the given target.
-     *  Returns null if the generator could not be created.
-     */
-    private GeneratorBase createGenerator(LFGeneratorContext context) {
-        final Target target = Target.fromDecl(ASTUtils.targetDecl(context.getFileConfig().resource));
-        assert target != null;
-        return switch (target) {
-            case C -> new CGenerator(context, false);
-            case CCPP -> new CGenerator(context, true);
-            case Python -> new PythonGenerator(context);
-            case CPP, TS, Rust ->
-                createKotlinBaseGenerator(target, context);
-            // If no case matched, then throw a runtime exception.
-            default -> throw new RuntimeException("Unexpected target!");
-        };
-    }
-
-
-    /**
-     * Create a code generator in Kotlin.
-     * <p>
-     * Since the CppGenerator and TSGenerator class are implemented in Kotlin, the classes are
-     * not visible from all contexts. If the RCA is run from within Eclipse via
-     * "Run as Eclipse Application", the Kotlin classes are unfortunately not
-     * available at runtime due to bugs in the Eclipse Kotlin plugin. (See
-     * https://stackoverflow.com/questions/68095816/is-ist-possible-to-build-mixed-kotlin-and-java-applications-with-a-recent-eclips)
-     * In this case, the method returns null
-     *
-     * @return A Kotlin Generator object if the class can be found
-     */
-    private GeneratorBase createKotlinBaseGenerator(Target target, LFGeneratorContext context) {
-        // Since our Eclipse Plugin uses code injection via guice, we need to
-        // play a few tricks here so that Kotlin FileConfig and
-        // Kotlin Generator do not appear as an import. Instead, we look the
-        // class up at runtime and instantiate it if found.
-        String classPrefix = "org.lflang.generator." + target.packageName + "." + target.classNamePrefix;
-        try {
-            Class<?> generatorClass = Class.forName(classPrefix + "Generator");
-            Constructor<?> ctor = generatorClass
-                .getDeclaredConstructor(LFGeneratorContext.class, LFGlobalScopeProvider.class);
-
-            return (GeneratorBase) ctor.newInstance(context, scopeProvider);
-        } catch (ReflectiveOperationException e) {
-            generatorErrorsOccurred = true;
-            context.getErrorReporter().reportError(
-                "The code generator for the " + target + " target could not be found. "
-                    + "This is likely because you built Epoch using "
-                    + "Eclipse. The " + target + " code generator is written in Kotlin "
-                    + "and, unfortunately, the plugin that Eclipse uses "
-                    + "for compiling Kotlin code is broken. "
-                    + "Please consider building Epoch using Maven.\n"
-                    + "For step-by-step instructions, see: "
-                    + "https://github.com/icyphy/lingua-franca/wiki/Running-Lingua-Franca-IDE-%28Epoch%29-with-Kotlin-based-Code-Generators-Enabled-%28without-Eclipse-Environment%29");
-            return null;
-        }
-    }
-
-    @Override
-    public void doGenerate(Resource resource, IFileSystemAccess2 fsa,
-            IGeneratorContext context) {
-        final LFGeneratorContext lfContext;
-        if (context instanceof LFGeneratorContext) {
-            lfContext = (LFGeneratorContext)context;
-        } else {
-            lfContext = LFGeneratorContext.lfGeneratorContextOf(resource, fsa, context);
-        }
-
-        // The fastest way to generate code is to not generate any code.
-        if (lfContext.getMode() == LFGeneratorContext.Mode.LSP_FAST) return;
-
-        if (FedASTUtils.findFederatedReactor(resource) != null) {
-            try {
-                generatorErrorsOccurred = (new FedGenerator(lfContext)).doGenerate(resource, lfContext);
-            } catch (IOException e) {
-                throw new RuntimeIOException("Error during federated code generation", e);
-            }
-
-        } else {
-
-            // If "-c" or "--clean" is specified, delete any existing generated directories.
-            cleanIfNeeded(lfContext);
-
-            // Check if @property is used. If so, instantiate a UclidGenerator.
-            // The verification model needs to be generated before the target code
-            // since code generation changes LF program (desugar connections, etc.).
-            Reactor main = ASTUtils.getMainReactor(resource);
-            List<Attribute> properties = AttributeUtils.getAttributes(main)
-                                        .stream()
-                                        .filter(attr -> attr.getAttrName().equals("property"))
-                                        .collect(Collectors.toList());
-            if (properties.size() > 0) {
-                UclidGenerator uclidGenerator = new UclidGenerator(lfContext, properties);
-                // Generate uclid files.
-                uclidGenerator.doGenerate(resource, lfContext);
-                if (!uclidGenerator.targetConfig.noVerify) {
-                    // Invoke the generated uclid files.
-                    uclidGenerator.runner.run();
-                } else {
-                    System.out.println("\"no-verify\" is set to true. Skip checking the verification model.");
-                }
-            }
-
-            final GeneratorBase generator = createGenerator(lfContext);
-
-            if (generator != null) {
-                generator.doGenerate(resource, lfContext);
-                generatorErrorsOccurred = generator.errorsOccurred();
-            }
-        }
-        final ErrorReporter errorReporter = lfContext.getErrorReporter();
-        if (errorReporter instanceof LanguageServerErrorReporter) {
-            ((LanguageServerErrorReporter) errorReporter).publishDiagnostics();
-        }
-    }
-
-    /** Return true if errors occurred in the last call to doGenerate(). */
-    public boolean errorsOccurred() {
-        return generatorErrorsOccurred;
-    }
-
-    /**
-     * Check if a clean was requested from the standalone compiler and perform
-     * the clean step.
-     */
-    protected void cleanIfNeeded(LFGeneratorContext context) {
-        if (context.getArgs().containsKey("clean")) {
-            try {
-                context.getFileConfig().doClean();
-            } catch (IOException e) {
-                System.err.println("WARNING: IO Error during clean");
-            }
-        }
-    }
-}
diff --git a/org.lflang/src/org/lflang/generator/LFGeneratorContext.java b/org.lflang/src/org/lflang/generator/LFGeneratorContext.java
deleted file mode 100644
index e6ca3c1103..0000000000
--- a/org.lflang/src/org/lflang/generator/LFGeneratorContext.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package org.lflang.generator;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Properties;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.generator.IFileSystemAccess2;
-import org.eclipse.xtext.generator.IGeneratorContext;
-import org.eclipse.xtext.util.RuntimeIOException;
-
-import org.lflang.ErrorReporter;
-import org.lflang.FileConfig;
-import org.lflang.TargetConfig;
-
-/**
- * An {@code LFGeneratorContext} is the context of a Lingua Franca build process.
- * It is the point of communication between a build process and the environment
- * in which it is executed.
- *
- * @author Peter Donovan
- */
-public interface LFGeneratorContext extends IGeneratorContext {
-
-    /**
-     * Enumeration of keys used to parameterize the build process.
-     */
-    enum BuildParm {
-        BUILD_TYPE("The build type to use"),
-        CLEAN("Clean before building."),
-        EXTERNAL_RUNTIME_PATH("Specify an external runtime library to be used by the compiled binary."),
-        FEDERATED("Treat main reactor as federated."),
-        HELP("Display this information."),
-        LOGGING("The logging level to use by the generated binary"),
-        LINT("Enable or disable linting of generated code."),
-        NO_COMPILE("Do not invoke target compiler."),
-        NO_VERIFY("Do not check the generated verification model."),
-        OUTPUT_PATH("Specify the root output directory."),
-        QUIET("Suppress output of the target compiler and other commands"),
-        RTI("Specify the location of the RTI."),
-        RUNTIME_VERSION("Specify the version of the runtime library used for compiling LF programs."),
-        SCHEDULER("Specify the runtime scheduler (if supported)."),
-        TARGET_COMPILER("Target compiler to invoke."),
-        THREADING("Specify whether the runtime should use multi-threading (true/false)."),
-        VERSION("Print version information."),
-        WORKERS("Specify the default number of worker threads.");
-
-        public final String description;
-
-        BuildParm(String description) {
-            this.description = description;
-        }
-
-        /**
-         * Return the string to use as the key to store a value relating to this parameter.
-         */
-        public String getKey() {
-            return this.name().toLowerCase().replace('_', '-');
-        }
-
-        /**
-         * Return the value corresponding to this parameter or `null` if there is none.
-         * @param context The context passed to the code generator.
-         */
-        public String getValue(LFGeneratorContext context) {
-            return context.getArgs().getProperty(this.getKey());
-        }
-    }
-
-
-    enum Mode {
-        STANDALONE,
-        EPOCH,
-        LSP_FAST,
-        LSP_MEDIUM,
-        LSP_SLOW,
-        UNDEFINED
-    }
-
-    /**
-     * Return the mode of operation, which indicates how the compiler has been invoked 
-     * (e.g., from within Epoch, from the command line, or via a Language Server).
-     */
-    Mode getMode();
-
-    /**
-     * Return any arguments that will override target properties.
-     */
-    Properties getArgs();
-
-    /**
-     * Get the error reporter for this context; construct one if it hasn't been
-     * constructed yet.
-     */
-    ErrorReporter getErrorReporter();
-
-    /**
-     * Mark the code generation process performed in this
-     * context as finished with the result {@code result}.
-     * @param result The result of the code generation
-     *               process that was performed in this
-     *               context.
-     */
-    void finish(GeneratorResult result);
-
-    /**
-     * Return the result of the code generation process that was performed in
-     * this context.
-     * @return the result of the code generation process that was performed in
-     * this context
-     */
-    GeneratorResult getResult();
-
-    FileConfig getFileConfig();
-
-    TargetConfig getTargetConfig();
-
-    /**
-     * Report the progress of a build.
-     * @param message A message for the LF programmer to read.
-     * @param percentage The approximate percent completion of the build.
-     */
-    void reportProgress(String message, int percentage);
-
-    /**
-     * Conclude this build and record the result if necessary.
-     * @param status The status of the result.
-     * @param codeMaps The generated files and their corresponding code maps.
-     */
-    default void finish(
-        GeneratorResult.Status status,
-        Map<Path, CodeMap> codeMaps
-    ) {
-        finish(new GeneratorResult(status, this, codeMaps));
-    }
-
-    /**
-     * Conclude this build and record that it was unsuccessful.
-     */
-    default void unsuccessfulFinish() {
-        finish(
-            getCancelIndicator() != null && getCancelIndicator().isCanceled() ?
-            GeneratorResult.CANCELLED : GeneratorResult.FAILED
-        );
-    }
-
-    /**
-     * Return the {@code LFGeneratorContext} that best describes the given {@code context} when
-     * building {@code Resource}.
-     * @param resource
-     * @param fsa
-     * @param context The context of a Lingua Franca build process.
-     * @return The {@code LFGeneratorContext} that best describes the given {@code context} when
-     * building {@code Resource}.
-     */
-    static LFGeneratorContext lfGeneratorContextOf(Resource resource, IFileSystemAccess2 fsa, IGeneratorContext context) {
-        if (context instanceof LFGeneratorContext) return (LFGeneratorContext) context;
-
-        if (resource.getURI().isPlatform()) return new MainContext(Mode.EPOCH, resource, fsa, context.getCancelIndicator());
-
-        return new MainContext(Mode.LSP_FAST, resource, fsa, context.getCancelIndicator());
-    }
-}
diff --git a/org.lflang/src/org/lflang/generator/NamedInstance.java b/org.lflang/src/org/lflang/generator/NamedInstance.java
deleted file mode 100644
index c056300ffe..0000000000
--- a/org.lflang/src/org/lflang/generator/NamedInstance.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/* Base class for instances with names in Lingua Franca. */
-
-/*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
-
-package org.lflang.generator;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-
-/** 
- * Base class for compile-time instances with names in Lingua Franca.
- * An instance of concrete subclasses of this class represents one or
- * more runtime instances of a reactor, port, reaction, etc. There
- * will be more than one runtime instance if the object or any of its
- * parents is a bank of reactors.
- *  
- * @author Marten Lohstroh
- * @author Edward A. Lee
- */
-public abstract class NamedInstance<T extends EObject> {
-        
-    /**
-     * Construct a new instance with the specified definition
-     * and parent. E.g., for a reactor instance, the definition
-     * is Instantiation, and for a port instance, it is Port. These are
-     * nodes in the AST. This is protected because only subclasses
-     * should be constructed.
-     * @param definition The definition in the AST for this instance.
-     * @param parent The reactor instance that creates this instance.
-     */
-    protected NamedInstance(T definition, ReactorInstance parent) {
-        this.definition = definition;
-        this.parent = parent;
-
-        // Calculate the depth.
-        this.depth = 0;
-        ReactorInstance p = parent;
-        while (p != null) {
-            p = p.parent;
-            this.depth++;
-        }
-    }
-    
-    //////////////////////////////////////////////////////
-    //// Public fields.
-        
-    /** A limit on the number of characters returned by uniqueID. */
-    public static int identifierLengthLimit = 40;
-    
-    //////////////////////////////////////////////////////
-    //// Public methods.
-
-    /**
-     * Return the definition, which is the AST node for this object.
-     */
-    public T getDefinition() {
-        return definition;
-    }
-    
-    /**
-     * Get the depth of the reactor instance. This is 0 for the main reactor,
-     * 1 for reactors immediately contained therein, etc.
-     */
-    public int getDepth() {
-        return depth;
-    }
-    
-    /** 
-     * Return the full name of this instance, which has the form
-     * "a.b.c", where "c" is the name of this instance, "b" is the name
-     * of its container, and "a" is the name of its container, stopping
-     * at the container in main. If any reactor in the hierarchy is
-     * in a bank of reactors then, it will appear as a[index].
-     * Similarly, if c is a port in a multiport, it will appear as
-     * c[index].
-     * @return The full name of this instance.
-     */
-    public String getFullName() {
-        return getFullNameWithJoiner(".");
-    }
-    
-    /**
-     * Return the name of this instance as given in its definition.
-     * Note that this is unique only relative to other instances with
-     * the same parent.
-     * @return The name of this instance within its parent.
-     */
-    public abstract String getName();
-    
-    /**
-     * Return the parent or null if this is a top-level reactor.
-     */
-    public ReactorInstance getParent() {
-        return parent;
-    }
-    
-    /**
-     * Return the parent at the given depth or null if there is
-     * no parent at the given depth.
-     * @param d The depth.
-     */
-    public ReactorInstance getParent(int d) {
-        if (d >= depth || d < 0) return null;
-        ReactorInstance p = parent;
-        while (p != null) {
-            if (p.depth == d) return p;
-            p = p.parent;
-        }
-        return null;
-    }
-
-    /**
-     * Return the width of this instance, which in this base class is 1.
-     * Subclasses PortInstance and ReactorInstance change this to the
-     * multiport and bank widths respectively.
-     */
-    public int getWidth() {
-        return width;
-    }
-    
-    /**
-     * Return true if this instance has the specified parent
-     * (possibly indirectly, anywhere up the hierarchy).
-     */
-    public boolean hasParent(ReactorInstance container) {
-        
-        ReactorInstance p = parent;
-        
-        while (p != null) {
-            if (p == container) return true;
-            p = p.parent;
-        }
-        return false;
-    }
-    
-    /**
-     * Return a list of all the parents starting with the root().
-     */
-    public List<ReactorInstance> parents() {
-        List<ReactorInstance> result = new ArrayList<ReactorInstance>(depth + 1);
-        if (this instanceof ReactorInstance && parent == null) {
-            // This is the top level, so it must be a reactor.
-            result.add((ReactorInstance) this);
-        }
-        ReactorInstance container = parent;
-        while (container != null) {
-            result.add(container);
-            container = container.parent;
-        }
-        return result;
-    }
-    
-    /**
-     * Return the root reactor, which is the top-level parent.
-     * @return The top-level parent.
-     */
-    public ReactorInstance root() {
-        if (parent != null) {
-            return parent.root();
-        } else {
-            return (ReactorInstance)this;
-        }
-    }
-            
-    /**
-     * Set the width. This method is here for testing only and should
-     * not be used for any other purpose.
-     * @param width The new width.
-     */
-    public void setWidth(int width) {
-        this.width = width;
-    }
-
-    /**
-     * Return an identifier for this instance, which has the form "a_b_c"
-     * or "a_b_c_n", where "c" is the name of this instance, "b" is the name
-     * of its container, and "a" is the name of its container, stopping
-     * at the container in main. All names are converted to lower case.
-     * The suffix _n is usually omitted, but it is possible to get name
-     * collisions using the above scheme, in which case _n will be an
-     * increasing integer until there is no collision.
-     * If the length of the root of the name as calculated above (the root
-     * is without the _n suffix) is longer than
-     * the static variable identifierLengthLimit, then the name will be
-     * truncated. The returned name will be the tail of the name calculated
-     * above with the prefix '_'.
-     * @return An identifier for this instance that is guaranteed to be
-     *  unique within the top-level parent.
-     */
-    public String uniqueID() {
-        if (_uniqueID == null) {
-            // Construct the unique ID only if it has not been
-            // previously constructed.
-            String prefix = getFullNameWithJoiner("_").toLowerCase();
-            
-            // Replace all non-alphanumeric (Latin) characters with underscore.
-            prefix = prefix.replaceAll("[^A-Za-z0-9]", "_");
-            
-            // Truncate, if necessary.
-            if (prefix.length() > identifierLengthLimit) {
-                prefix = '_' 
-                    + prefix.substring(prefix.length() - identifierLengthLimit + 1);
-            }
-            
-            // Ensure uniqueness.
-            ReactorInstance toplevel = root();
-            if (toplevel.uniqueIDCount == null) {
-                toplevel.uniqueIDCount = new HashMap<String,Integer>();
-            }
-            var count = toplevel.uniqueIDCount.get(prefix);
-            if (count == null) {
-                toplevel.uniqueIDCount.put(prefix, 1);
-                _uniqueID = prefix;
-            } else {
-                toplevel.uniqueIDCount.put(prefix, count + 1);
-                // NOTE: The length of this name could exceed
-                // identifierLengthLimit. Is this OK?
-                _uniqueID = prefix + '_' + (count + 1);
-            }
-        }
-        return _uniqueID;
-    }
-    
-    /**
-     * Returns the directly/indirectly enclosing mode.
-     * @param direct flag whether to check only for direct enclosing mode
-     *   or also consider modes of parent reactor instances.
-     * @return The mode, if any, null otherwise.
-     */
-    public ModeInstance getMode(boolean direct) {
-        ModeInstance mode = null;
-        if (parent != null) {
-            if (!parent.modes.isEmpty()) {
-                mode = parent.modes.stream().filter(it -> it.contains(this)).findFirst().orElse(null);
-            }
-            if (mode == null && !direct) {
-                mode = parent.getMode(false);
-            }
-        }
-        return mode;
-    }
-
-    /**
-     * Return a string of the form
-     * "a.b.c", where "." is replaced by the specified joiner,
-     * "c" is the name of this instance, "b" is the name
-     * of its container, and "a" is the name of its container, stopping
-     * at the container in main.
-     * @return A string representing this instance.
-     */
-    public String getFullNameWithJoiner(String joiner) {
-        // This is not cached because _uniqueID is cached.
-        if (parent == null) {
-            return this.getName();
-        } else if (getMode(true) != null) {
-            return parent.getFullNameWithJoiner(joiner) + joiner + getMode(true).getName() + joiner + this.getName();
-        } else {
-            return parent.getFullNameWithJoiner(joiner) + joiner + this.getName();
-        }
-    }
-
-    //////////////////////////////////////////////////////
-    //// Protected fields.
-
-    /** The Instantiation AST object from which this was created. */
-    T definition;
-
-    /** The reactor instance that creates this instance. */
-    ReactorInstance parent;
-
-    /**
-     * Map from a name of the form a_b_c to the number of
-     * unique IDs with that prefix that have been already
-     * assigned. If none have been assigned, then there is
-     * no entry in this map. This map should be non-null only
-     * for the main reactor (the top level).
-     */
-    HashMap<String,Integer> uniqueIDCount;
-
-    /** 
-     * The width of this instance. This is 1 for everything
-     * except a PortInstance representing a multiport and a
-     * ReactorInstance representing a bank.
-     */
-    int width = 1;
-
-    //////////////////////////////////////////////////////
-    //// Protected fields.
-
-    /**
-     * The depth in the hierarchy of this instance.
-     * This is 0 for main or federated, 1 for the reactors immediately contained, etc.
-     */
-    protected int depth = 0;
-
-    //////////////////////////////////////////////////////
-    //// Private fields.
-    
-    /**
-     * The full name of this instance.
-     */
-    private String _fullName = null;
-    
-    /**
-     * Unique ID for this instance. This is null until
-     * uniqueID() is called.
-     */
-    private String _uniqueID = null;
-}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/generator/ReactionInstance.java b/org.lflang/src/org/lflang/generator/ReactionInstance.java
deleted file mode 100644
index c036a931bd..0000000000
--- a/org.lflang/src/org/lflang/generator/ReactionInstance.java
+++ /dev/null
@@ -1,598 +0,0 @@
-/** Representation of a runtime instance of a reaction. */
-
-/*************
-Copyright (c) 2019-2022, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
-
-package org.lflang.generator;
-
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import org.lflang.ASTUtils;
-import org.lflang.TimeValue;
-import org.lflang.lf.Action;
-import org.lflang.lf.BuiltinTriggerRef;
-import org.lflang.lf.Port;
-import org.lflang.lf.Reaction;
-import org.lflang.lf.Timer;
-import org.lflang.lf.TriggerRef;
-import org.lflang.lf.VarRef;
-import org.lflang.lf.Variable;
-
-/**
- * Representation of a compile-time instance of a reaction.
- * Like {@link ReactorInstance}, if one or more parents of this reaction
- * is a bank of reactors, then there will be more than one runtime instance
- * corresponding to this compile-time instance.  The {@link #getRuntimeInstances()}
- * method returns a list of these runtime instances, each an instance of the
- * inner class {@link ReactionInstance.Runtime}.  Each runtime instance has a "level", which is
- * its depth an acyclic precedence graph representing the dependencies between
- * reactions at a tag.
- *  
- * @author Edward A. Lee
- * @author Marten Lohstroh
- */
-public class ReactionInstance extends NamedInstance<Reaction> {
-
-    /**
-     * Create a new reaction instance from the specified definition
-     * within the specified parent. This constructor should be called
-     * only by the ReactorInstance class, but it is public to enable unit tests.
-     * @param definition A reaction definition.
-     * @param parent The parent reactor instance, which cannot be null.
-     * @param isUnordered Indicator that this reaction is unordered w.r.t. other reactions.
-     * @param index The index of the reaction within the reactor (0 for the
-     * first reaction, 1 for the second, etc.).
-     */
-    public ReactionInstance(
-            Reaction definition, 
-            ReactorInstance parent, 
-            boolean isUnordered, 
-            int index
-    ) {
-        super(definition, parent);
-        this.index = index;
-        this.isUnordered = isUnordered;
-        
-        // If the reaction body starts with the magic string
-        // UNORDERED_REACTION_MARKER, then mark it unordered,
-        // overriding the argument.
-        String body = ASTUtils.toText(definition.getCode());
-        if (body.contains(UNORDERED_REACTION_MARKER)) {
-            this.isUnordered = true;
-        }
-        
-        // Identify the dependencies for this reaction.
-        // First handle the triggers.
-        for (TriggerRef trigger : definition.getTriggers()) {
-            if (trigger instanceof VarRef) {
-                Variable variable = ((VarRef)trigger).getVariable();
-                if (variable instanceof Port) {
-                    PortInstance portInstance = parent.lookupPortInstance((Port)variable);
-                    // If the trigger is the port of a contained bank, then the
-                    // portInstance will be null and we have to instead search for
-                    // each port instance in the bank.
-                    if (portInstance != null) {
-                        this.sources.add(portInstance);
-                        portInstance.dependentReactions.add(this);
-                        this.triggers.add(portInstance);
-                    } else if (((VarRef)trigger).getContainer() != null) {
-                        // Port belongs to a contained reactor or bank.
-                        ReactorInstance containedReactor 
-                                = parent.lookupReactorInstance(((VarRef)trigger).getContainer());
-                        if (containedReactor != null) {
-                            portInstance = containedReactor.lookupPortInstance((Port)variable);
-                            if (portInstance != null) {
-                                this.sources.add(portInstance);
-                                portInstance.dependentReactions.add(this);
-                                this.triggers.add(portInstance);
-                            }
-                        }
-                    }
-                } else if (variable instanceof Action) {
-                    var actionInstance = parent.lookupActionInstance(
-                        (Action)((VarRef)trigger).getVariable());
-                    this.triggers.add(actionInstance);
-                    actionInstance.dependentReactions.add(this);
-                    this.sources.add(actionInstance);
-                } else if (variable instanceof Timer) {
-                    var timerInstance = parent.lookupTimerInstance(
-                            (Timer)((VarRef)trigger).getVariable());
-                    this.triggers.add(timerInstance);
-                    timerInstance.dependentReactions.add(this);
-                    this.sources.add(timerInstance);
-                }
-            } else if (trigger instanceof BuiltinTriggerRef) {
-                var builtinTriggerInstance
-                    = parent.getOrCreateBuiltinTrigger((BuiltinTriggerRef) trigger);
-                this.triggers.add(builtinTriggerInstance);
-                builtinTriggerInstance.dependentReactions.add(this);
-            }
-        }
-        // Next handle the ports that this reaction reads.
-        for (VarRef source : definition.getSources()) {
-            Variable variable = source.getVariable();
-            if (variable instanceof Port) {
-                var portInstance = parent.lookupPortInstance((Port)variable);
-                
-                // If the trigger is the port of a contained bank, then the
-                // portInstance will be null and we have to instead search for
-                // each port instance in the bank.
-                if (portInstance != null) {
-                    this.sources.add(portInstance);
-                    this.reads.add(portInstance);
-                    portInstance.dependentReactions.add(this);
-                } else if (source.getContainer() != null) {
-                    ReactorInstance containedReactor
-                            = parent.lookupReactorInstance(source.getContainer());
-                    if (containedReactor != null) {
-                        portInstance = containedReactor.lookupPortInstance((Port)variable);
-                        if (portInstance != null) {
-                            this.sources.add(portInstance);
-                            portInstance.dependentReactions.add(this);
-                            this.triggers.add(portInstance);
-                        }
-                    }
-                }
-            }
-        }
-        
-        // Finally, handle the effects.
-        for (VarRef effect : definition.getEffects()) {
-            Variable variable = effect.getVariable();
-            if (variable instanceof Port) {
-                var portInstance = parent.lookupPortInstance(effect);
-                if (portInstance != null) {
-                    this.effects.add(portInstance);
-                    portInstance.dependsOnReactions.add(this);
-                } else {
-                    throw new InvalidSourceException(
-                            "Unexpected effect. Cannot find port " + variable.getName());
-                }
-            } else if (variable instanceof Action) {
-                // Effect is an Action.
-                var actionInstance = parent.lookupActionInstance(
-                    (Action)variable);
-                this.effects.add(actionInstance);
-                actionInstance.dependsOnReactions.add(this);
-            } else {
-                // Effect is either a mode or an unresolved reference.
-                // Do nothing, transitions will be set up by the ModeInstance.
-            }
-        }
-        // Create a deadline instance if one has been defined.
-        if (this.definition.getDeadline() != null) {
-            this.declaredDeadline = new DeadlineInstance(
-                this.definition.getDeadline(), this);
-        }
-    }
-
-    //////////////////////////////////////////////////////
-    //// Public fields.
-
-    /** 
-     * Indicates the chain this reaction is a part of. It is constructed
-     * through a bit-wise or among all upstream chains. Each fork in the
-     * dependency graph setting a new, unused bit to true in order to
-     * disambiguate it from parallel chains. Note that zero results in
-     * no overlap with any other reaction, which means the reaction can
-     * execute in parallel with any other reaction. The default is 1L.
-     * If left at the default, parallel execution will be based purely
-     * on levels.
-     */
-    public long chainID = 1L;
-
-    /**
-     * The ports or actions that this reaction may write to.
-     */
-    public Set<TriggerInstance<? extends Variable>> effects = new LinkedHashSet<>();
-
-    /**
-     * The ports, actions, or timers that this reaction is triggered by or uses.
-     */
-    public Set<TriggerInstance<? extends Variable>> sources = new LinkedHashSet<>();
-    // FIXME: Above sources is misnamed because in the grammar,
-    // "sources" are only the inputs a reaction reads without being
-    // triggered by them. The name "reads" used here would be a better
-    // choice in the grammar.
-    
-    /**
-     * Deadline for this reaction instance, if declared.
-     */
-    public DeadlineInstance declaredDeadline;
-
-    /**
-     * Sadly, we have no way to mark reaction "unordered" in the AST,
-     * so instead, we use a magic comment at the start of the reaction body.
-     * This is that magic comment.
-     */
-    public static String UNORDERED_REACTION_MARKER
-            = "**** This reaction is unordered.";
-
-    /**
-     * Index of order of occurrence within the reactor definition.
-     * The first reaction has index 0, the second index 1, etc.
-     */
-    public int index;
-
-    /**
-     * Whether or not this reaction is ordered with respect to other
-     * reactions in the same reactor.
-     */
-    public boolean isUnordered;
-
-    /**
-     * The ports that this reaction reads but that do not trigger it.
-     */
-    public Set<TriggerInstance<? extends Variable>> reads = new LinkedHashSet<>();
-
-    /**
-     * The trigger instances (input ports, timers, and actions
-     * that trigger reactions) that trigger this reaction.
-     */
-    public Set<TriggerInstance<? extends Variable>> triggers = new LinkedHashSet<>();
-
-    //////////////////////////////////////////////////////
-    //// Public methods.
-
-    /**
-     * Clear caches used in reporting dependentReactions() and dependsOnReactions().
-     * This method should be called if any changes are made to triggers, sources,
-     * or effects.
-     * @param includingRuntimes If false, leave the runtime instances intact.
-     *  This is useful for federated execution where levels are computed using
-     *  the top-level connections, but then those connections are discarded.
-     */
-    public void clearCaches(boolean includingRuntimes) {
-        dependentReactionsCache = null;
-        dependsOnReactionsCache = null;
-        if (includingRuntimes) runtimeInstances = null;
-    }
-    
-    /**
-     * Return the set of immediate downstream reactions, which are reactions
-     * that receive data produced by this reaction plus
-     * at most one reaction in the same reactor whose definition
-     * lexically follows this one (unless this reaction is unordered).
-     */
-    public Set<ReactionInstance> dependentReactions() {
-        // Cache the result.
-        if (dependentReactionsCache != null) return dependentReactionsCache;
-        dependentReactionsCache = new LinkedHashSet<>();
-        
-        // First, add the next lexical reaction, if appropriate.
-        if (!isUnordered && parent.reactions.size() > index + 1) {
-            // Find the next reaction in the parent's reaction list.
-            dependentReactionsCache.add(parent.reactions.get(index + 1));
-        }
-        
-        // Next, add reactions that get data from this one via a port.
-        for (TriggerInstance<? extends Variable> effect : effects) {
-            if (effect instanceof PortInstance) {
-                for (SendRange senderRange
-                        : ((PortInstance)effect).eventualDestinations()) {
-                    for (RuntimeRange<PortInstance> destinationRange
-                            : senderRange.destinations) {
-                        dependentReactionsCache.addAll(
-                                destinationRange.instance.dependentReactions);
-                    }
-                }
-            }
-        }
-        return dependentReactionsCache;
-    }
-    
-    /**
-     * Return the set of immediate upstream reactions, which are reactions
-     * that send data to this one plus at most one reaction in the same
-     * reactor whose definition immediately precedes the definition of this one
-     * (unless this reaction is unordered).
-     */
-    public Set<ReactionInstance> dependsOnReactions() {
-        // Cache the result.
-        if (dependsOnReactionsCache != null) return dependsOnReactionsCache;
-        dependsOnReactionsCache = new LinkedHashSet<>();
-        
-        // First, add the previous lexical reaction, if appropriate.
-        if (!isUnordered && index > 0) {
-            // Find the previous ordered reaction in the parent's reaction list.
-            int earlierIndex = index - 1;
-            ReactionInstance earlierOrderedReaction = parent.reactions.get(earlierIndex);
-            while (earlierOrderedReaction.isUnordered && --earlierIndex >= 0) {
-                earlierOrderedReaction = parent.reactions.get(earlierIndex);
-            }
-            if (earlierIndex >= 0) {
-                dependsOnReactionsCache.add(parent.reactions.get(index - 1));
-            }
-        }
-        
-        // Next, add reactions that send data to this one.
-        for (TriggerInstance<? extends Variable> source : sources) {
-            if (source instanceof PortInstance) {
-                // First, add reactions that send data through an intermediate port.
-                for (RuntimeRange<PortInstance> senderRange
-                        : ((PortInstance)source).eventualSources()) {
-                    dependsOnReactionsCache.addAll(senderRange.instance.dependsOnReactions);
-                }
-                // Then, add reactions that send directly to this port.
-                dependsOnReactionsCache.addAll(source.dependsOnReactions);
-            }
-        }
-        return dependsOnReactionsCache;
-    }
-
-    /**
-     * Return a set of levels that runtime instances of this reaction have.
-     * A ReactionInstance may have more than one level if it lies within
-     * a bank and its dependencies on other reactions pass through multiports.
-     */
-    public Set<Integer> getLevels() {
-        Set<Integer> result = new LinkedHashSet<>();
-        // Force calculation of levels if it has not been done.
-        // FIXME: Comment out this as I think it is redundant.
-        //  If it is NOT redundant then deadline propagation is not correct
-        // parent.assignLevels();
-        for (Runtime runtime : runtimeInstances) {
-            result.add(runtime.level);
-        }
-        return result;
-    }
-    
-    /**
-     * Return a set of deadlines that runtime instances of this reaction have.
-     * A ReactionInstance may have more than one deadline if it lies within.
-     */
-    public Set<TimeValue> getInferredDeadlines() {
-        Set<TimeValue> result = new LinkedHashSet<>();
-        for (Runtime runtime : runtimeInstances) {
-            result.add(runtime.deadline);
-        }
-        return result;
-    }
-        
-
-    /**
-     * Return a list of levels that runtime instances of this reaction have.
-     * The size of this list is the total number of runtime instances.
-     * A ReactionInstance may have more than one level if it lies within
-     * a bank and its dependencies on other reactions pass through multiports.
-     */
-    public List<Integer> getLevelsList() {
-        List<Integer> result = new LinkedList<>();
-        // Force calculation of levels if it has not been done.
-        // FIXME: Comment out this as I think it is redundant.
-        //  If it is NOT redundant then deadline propagation is not correct
-        // parent.assignLevels();
-        for (Runtime runtime : runtimeInstances) {
-            result.add(runtime.level);
-        }
-        return result;
-    }
-    
-    /**
-     * Return a list of the deadlines that runtime instances of this reaction have.
-     * The size of this list is the total number of runtime instances.
-     * A ReactionInstance may have more than one deadline if it lies within
-     */
-    public List<TimeValue> getInferredDeadlinesList() {
-        List<TimeValue> result = new LinkedList<>();
-        for (Runtime runtime : runtimeInstances) {
-            result.add(runtime.deadline);
-        }
-        return result;
-    }
-
-
-    /**
-     * Return the name of this reaction, which is 'reaction_n',
-     * where n is replaced by the reaction index. 
-     * @return The name of this reaction.
-     */
-    @Override
-    public String getName() {
-        return "reaction_" + this.index;
-    }
-        
-    /**
-     * Return an array of runtime instances of this reaction in a
-     * **natural order**, defined as follows.  The position within the
-     * returned list of the runtime instance is given by a mixed-radix
-     * number where the low-order digit is the bank index within the
-     * container reactor (or 0 if it is not a bank), the second low order
-     * digit is the bank index of the container's container (or 0 if
-     * it is not a bank), etc., until the container that is directly
-     * contained by the top level (the top-level reactor need not be
-     * included because its index is always 0).
-     * 
-     * The size of the returned array is the product of the widths of all of the
-     * container ReactorInstance objects. If none of these is a bank,
-     * then the size will be 1.
-     *     
-     * This method creates this array the first time it is called, but then
-     * holds on to it.  The array is used by {@link ReactionInstanceGraph}
-     * to determine and record levels and deadline for runtime instances
-     * of reactors.
-     */
-    public List<Runtime> getRuntimeInstances() {
-        if (runtimeInstances != null) return runtimeInstances;
-        int size = parent.getTotalWidth();
-        // If the width cannot be determined, assume there is only one instance.
-        if (size < 0) size = 1;
-        runtimeInstances = new ArrayList<>(size);
-        for (int i = 0; i < size; i++) {
-            Runtime r = new Runtime();
-            r.id = i;
-            if (declaredDeadline != null) {
-                r.deadline = declaredDeadline.maxDelay;
-            }
-            runtimeInstances.add(r);
-        }
-        return runtimeInstances;
-    }
-
-    /**
-     * Purge 'portInstance' from this reaction, removing it from the list
-     * of triggers, sources, effects, and reads.  Note that this leaves
-     * the runtime instances intact, including their level information.
-     */
-    public void removePortInstance(PortInstance portInstance) {
-        this.triggers.remove(portInstance);
-        this.sources.remove(portInstance);
-        this.effects.remove(portInstance);
-        this.reads.remove(portInstance);
-        clearCaches(false);
-        portInstance.clearCaches();
-    }
-    
-    /**
-     * Return a descriptive string.
-     */
-    @Override
-    public String toString() {
-        return getName() + " of " + parent.getFullName();
-    }
-
-    /**
-     * Determine logical execution time for each reaction during compile
-     * time based on immediate downstream logical delays (after delays and actions)
-     * and label each reaction with the minimum of all such delays.
-     */
-    public TimeValue assignLogicalExecutionTime() {
-        if (this.let != null) {
-            return this.let;
-        }
-
-        if (this.parent.isGeneratedDelay()) {
-            return this.let = TimeValue.ZERO;
-        }
-
-        TimeValue let = null;
-
-        // Iterate over effect and find minimum delay.
-        for (TriggerInstance<? extends Variable> effect : effects) {
-            if (effect instanceof PortInstance) {
-                var afters = this.parent.getParent().children.stream().filter(c -> {
-                    if (c.isGeneratedDelay()) {
-                        return c.inputs.get(0).getDependsOnPorts().get(0).instance
-                                       .equals((PortInstance) effect);
-                    }
-                    return false;
-                }).map(c -> c.actions.get(0).getMinDelay())
-                  .min(TimeValue::compare);
-                
-                if (afters.isPresent()) {
-                    if (let == null) {
-                        let = afters.get();
-                    } else {
-                        let = TimeValue.min(afters.get(), let);
-                    }
-                }
-            } else if (effect instanceof ActionInstance) {
-                var action = ((ActionInstance) effect).getMinDelay();
-                if (let == null) {
-                    let = action;
-                } else {
-                    let = TimeValue.min(action, let);
-                }
-            }
-        }
-
-        if (let == null) {
-            let = TimeValue.ZERO;
-        }
-        return this.let = let;
-    }
-
-    //////////////////////////////////////////////////////
-    //// Private variables.
-
-    /** Cache of the set of downstream reactions. */
-    private Set<ReactionInstance> dependentReactionsCache;
-
-    /** Cache of the set of upstream reactions. */
-    private Set<ReactionInstance> dependsOnReactionsCache;
-    
-    /**
-     * Array of runtime instances of this reaction.
-     * This has length 1 unless the reaction is contained
-     * by one or more banks.  Suppose that this reaction
-     * has depth 3, with full name r0.r1.r2.r. The top-level
-     * reactor is r0, which contains r1, which contains r2,
-     * which contains this reaction r.  Suppose the widths
-     * of the containing reactors are w0, w1, and w2, and
-     * we are interested in the instance at bank indexes
-     * b0, b1, and b2.  That instance is in this array at
-     * location given by the **natural ordering**, which
-     * is the mixed radix number b2%w2; b1%w1.
-     */
-    private List<Runtime> runtimeInstances;
-
-    private TimeValue let = null;
-
-    ///////////////////////////////////////////////////////////
-    //// Inner classes
-
-    /** Inner class representing a runtime instance of a reaction. */
-    public class Runtime {
-        public TimeValue deadline;
-        // If this reaction instance depends on exactly one upstream
-        // reaction (via a port), then the "dominating" field will
-        // point to that upstream reaction.
-        public Runtime dominating;
-        /** ID ranging from 0 to parent.getTotalWidth() - 1. */
-        public int id;
-        public int level;
-        
-        public ReactionInstance getReaction() {
-            return ReactionInstance.this;
-        }
-
-        @Override
-        public String toString() {
-            String result = ReactionInstance.this + "(level: " + level;
-            if (deadline != null && deadline != TimeValue.MAX_VALUE) {
-               result += ", deadline: " + deadline;
-            }
-            if (dominating != null) {
-                result += ", dominating: " + dominating.getReaction();
-            }
-            result += ")";
-            return result;
-        }
-
-        public Runtime() {
-            this.dominating = null;
-            this.id = 0;
-            this.level = 0;
-            if (ReactionInstance.this.declaredDeadline != null) {
-                this.deadline = ReactionInstance.this.declaredDeadline.maxDelay;
-            } else {
-                this.deadline = TimeValue.MAX_VALUE;
-            }
-        }
-    }
-}
diff --git a/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java b/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
deleted file mode 100644
index 9b601cae53..0000000000
--- a/org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java
+++ /dev/null
@@ -1,440 +0,0 @@
-/** A graph that represents causality cycles formed by reaction instances. */
-
-/*************
-Copyright (c) 2021, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
-
-package org.lflang.generator;
-
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.lflang.generator.ReactionInstance.Runtime;
-import org.lflang.generator.c.CUtil;
-import org.lflang.graph.PrecedenceGraph;
-import org.lflang.lf.Variable;
-
-/**
- * This class analyzes the dependencies between reaction runtime instances.
- * For each ReactionInstance, there may be more than one runtime instance because
- * the ReactionInstance may be nested within one or more banks.
- * In the worst case, of these runtime instances may have distinct dependencies,
- * and hence distinct levels in the graph. Moreover, some of these instances
- * may be involved in cycles while others are not.
- * 
- * Upon construction of this class, the runtime instances are created if necessary,
- * stored each ReactionInstance, and assigned levels (maximum number of
- * upstream reaction instances), deadlines, and single dominating reactions.
- * 
- * After creation, the resulting graph will be empty unless there are causality
- * cycles, in which case, the resulting graph is a graph of runtime reaction
- * instances that form cycles.
- * 
- * @author Marten Lohstroh
- * @author Edward A. Lee
- */
-public class ReactionInstanceGraph extends PrecedenceGraph<ReactionInstance.Runtime> {
-    
-    /**
-     * Create a new graph by traversing the maps in the named instances 
-     * embedded in the hierarchy of the program. 
-     */
-    public ReactionInstanceGraph(ReactorInstance main) {
-        this.main = main;
-        rebuild();
-    }
-
-    ///////////////////////////////////////////////////////////
-    //// Public fields
-
-    /**
-     * The main reactor instance that this graph is associated with.
-     */
-    public final ReactorInstance main;
-    
-    ///////////////////////////////////////////////////////////
-    //// Public methods
-    
-    /**
-     * Rebuild this graph by clearing and repeating the traversal that 
-     * adds all the nodes and edges.
-     */
-    public void rebuild() {
-        this.clear();
-        addNodesAndEdges(main);
-
-        // FIXME: Use {@link TargetProperty#EXPORT_DEPENDENCY_GRAPH}.
-        // System.out.println(toDOT());
-
-        // Assign a level to each reaction. 
-        // If there are cycles present in the graph, it will be detected here.
-        assignLevels();
-        if (nodeCount() != 0) {
-            // The graph has cycles.
-            // main.reporter.reportError("Reactions form a cycle! " + toString());
-            // Do not throw an exception so that cycle visualization can proceed.
-            // throw new InvalidSourceException("Reactions form a cycle!");
-        }
-    }
-    /**
-     * This function rebuilds the graph and propagates and assigns deadlines
-     * to all reactions.
-     */
-    public void rebuildAndAssignDeadlines() {
-        this.clear();
-        addNodesAndEdges(main);
-        assignInferredDeadlines();
-        this.clear();
-    }
-    
-    /*
-     * Get an array of non-negative integers representing the number of reactions 
-     * per each level, where levels are indices of the array.
-     */
-    public Integer[] getNumReactionsPerLevel() {
-        return numReactionsPerLevel.toArray(new Integer[0]);
-    }
-
-    /**
-     * Return the max breadth of the reaction dependency graph
-     */
-    public int getBreadth() {
-        var maxBreadth = 0;
-        for (Integer breadth: numReactionsPerLevel ) {
-            if (breadth > maxBreadth) {
-                maxBreadth = breadth;
-            }
-        }
-        return maxBreadth;
-    }
-
-    ///////////////////////////////////////////////////////////
-    //// Protected methods
-        
-    /**
-     * Add to the graph edges between the given reaction and all the reactions
-     * that depend on the specified port.
-     * @param port The port that the given reaction has as an effect.
-     * @param reaction The reaction to relate downstream reactions to.
-     */
-    protected void addDownstreamReactions(PortInstance port, ReactionInstance reaction) {
-        // Use mixed-radix numbers to increment over the ranges.
-        List<Runtime> srcRuntimes = reaction.getRuntimeInstances();
-        List<SendRange> eventualDestinations = port.eventualDestinations();
-        
-        int srcDepth = (port.isInput())? 2 : 1;
-        
-        for (SendRange sendRange : eventualDestinations) {
-            for (RuntimeRange<PortInstance> dstRange : sendRange.destinations) {
-                
-                int dstDepth = (dstRange.instance.isOutput())? 2 : 1;
-                MixedRadixInt dstRangePosition = dstRange.startMR();
-                int dstRangeCount = 0;
-
-                MixedRadixInt sendRangePosition = sendRange.startMR();
-                int sendRangeCount = 0;
-                
-                while (dstRangeCount++ < dstRange.width) {
-                    int srcIndex = sendRangePosition.get(srcDepth);
-                    int dstIndex = dstRangePosition.get(dstDepth);
-                    for (ReactionInstance dstReaction : dstRange.instance.dependentReactions) {
-                        List<Runtime> dstRuntimes = dstReaction.getRuntimeInstances();
-                        Runtime srcRuntime = srcRuntimes.get(srcIndex);
-                        Runtime dstRuntime = dstRuntimes.get(dstIndex);
-                        // Only add this dependency if the reactions are not in modes at all or in the same mode or in modes of separate reactors
-                        // This allows modes to break cycles since modes are always mutually exclusive.
-                        if (srcRuntime.getReaction().getMode(true) == null ||
-                                dstRuntime.getReaction().getMode(true) == null ||
-                                srcRuntime.getReaction().getMode(true) == dstRuntime.getReaction().getMode(true) ||
-                                srcRuntime.getReaction().getParent() != dstRuntime.getReaction().getParent()) {
-                            addEdge(dstRuntime, srcRuntime);
-                        }
-
-                        // Propagate the deadlines, if any.
-                        if (srcRuntime.deadline.compareTo(dstRuntime.deadline) > 0) {
-                            srcRuntime.deadline = dstRuntime.deadline;
-                        }
-                        
-                        // If this seems to be a single dominating reaction, set it.
-                        // If another upstream reaction shows up, then this will be
-                        // reset to null.
-                        if (this.getUpstreamAdjacentNodes(dstRuntime).size() == 1
-                                && (dstRuntime.getReaction().isUnordered
-                                        || dstRuntime.getReaction().index == 0)) {
-                            dstRuntime.dominating = srcRuntime;
-                        } else {
-                            dstRuntime.dominating = null;
-                        }
-                    }
-                    dstRangePosition.increment();
-                    sendRangePosition.increment();
-                    sendRangeCount++;
-                    if (sendRangeCount >= sendRange.width) {
-                        // Reset to multicast.
-                        sendRangeCount = 0;
-                        sendRangePosition = sendRange.startMR();
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Build the graph by adding nodes and edges based on the given reactor 
-     * instance.
-     * @param reactor The reactor on the basis of which to add nodes and edges.
-     */
-    protected void addNodesAndEdges(ReactorInstance reactor) {
-        ReactionInstance previousReaction = null;
-        for (ReactionInstance reaction : reactor.reactions) {
-            List<Runtime> runtimes = reaction.getRuntimeInstances();
-            
-            // Add reactions of this reactor.
-            for (Runtime runtime : runtimes) {
-                this.addNode(runtime);                
-            }
-            
-            // If this is not an unordered reaction, then create a dependency
-            // on any previously defined reaction.
-            if (!reaction.isUnordered) {
-                // If there is an earlier reaction in this same reactor, then
-                // create a link in the reaction graph for all runtime instances.
-                if (previousReaction != null) {
-                    List<Runtime> previousRuntimes = previousReaction.getRuntimeInstances();
-                    int count = 0;
-                    for (Runtime runtime : runtimes) {
-                        // Only add the reaction order edge if previous reaction is outside of a mode or both are in the same mode
-                        // This allows modes to break cycles since modes are always mutually exclusive.
-                        if (runtime.getReaction().getMode(true) == null || runtime.getReaction().getMode(true) == reaction.getMode(true)) {
-                            this.addEdge(runtime, previousRuntimes.get(count));
-                            count++;
-                        }
-                    }
-                }
-                previousReaction = reaction;
-            }
-
-            // Add downstream reactions. Note that this is sufficient.
-            // We don't need to also add upstream reactions because this reaction
-            // will be downstream of those upstream reactions.
-            for (TriggerInstance<? extends Variable> effect : reaction.effects) {
-                if (effect instanceof PortInstance) {
-                    addDownstreamReactions((PortInstance)effect, reaction);
-                }
-            }
-        }
-        // Recursively add nodes and edges from contained reactors.
-        for (ReactorInstance child : reactor.children) {
-            addNodesAndEdges(child);
-        }
-    }
-    
-    ///////////////////////////////////////////////////////////
-    //// Private fields
-    
-    /**
-     * Number of reactions per level, represented as a list of 
-     * integers where the indices are the levels.
-     */
-    private List<Integer> numReactionsPerLevel = new ArrayList<>(List.of(0));
-
-    ///////////////////////////////////////////////////////////
-    //// Private methods
-
-    /**
-     * Analyze the dependencies between reactions and assign each reaction
-     * instance a level. This method removes nodes from this graph as it
-     * assigns levels. Any remaining nodes are part of causality cycles.
-     * 
-     * This procedure is based on Kahn's algorithm for topological sorting.
-     * Rather than establishing a total order, we establish a partial order.
-     * In this order, the level of each reaction is the least upper bound of
-     * the levels of the reactions it depends on.
-     */
-    private void assignLevels() {
-        List<ReactionInstance.Runtime> start = new ArrayList<>(rootNodes());
-        
-        // All root nodes start with level 0.
-        for (Runtime origin : start) {
-            origin.level = 0;
-        }
-
-        // No need to do any of this if there are no root nodes; 
-        // the graph must be cyclic.
-        while (!start.isEmpty()) {
-            Runtime origin = start.remove(0);
-            Set<Runtime> toRemove = new LinkedHashSet<>();
-            Set<Runtime> downstreamAdjacentNodes = getDownstreamAdjacentNodes(origin);
-
-            // Visit effect nodes.
-            for (Runtime effect : downstreamAdjacentNodes) {
-                // Stage edge between origin and effect for removal.
-                toRemove.add(effect);
-                
-                // Update level of downstream node.
-                effect.level = origin.level + 1;
-            }
-            // Remove visited edges.
-            for (Runtime effect : toRemove) {
-                removeEdge(effect, origin);
-                // If the effect node has no more incoming edges,
-                // then move it in the start set.
-                if (getUpstreamAdjacentNodes(effect).size() == 0) {
-                    start.add(effect);
-                }
-            }
-            
-            // Remove visited origin.
-            removeNode(origin);
-
-            // Update numReactionsPerLevel info
-            adjustNumReactionsPerLevel(origin.level, 1);
-        }
-    }
-   
-    /**
-     * This function assigns inferred deadlines to all the reactions in the graph.
-     * It is modeled after `assignLevels` but it starts at the leaf nodes and uses
-     * Kahns algorithm to build a reverse topologically sorted graph
-     * 
-     */
-    private void assignInferredDeadlines() {
-        List<ReactionInstance.Runtime> start = new ArrayList<>(leafNodes());
-        
-        // All leaf nodes have deadline initialized to their declared deadline or MAX_VALUE
-        while (!start.isEmpty()) {
-            Runtime origin = start.remove(0);
-            Set<Runtime> toRemove = new LinkedHashSet<>();
-            Set<Runtime> upstreamAdjacentNodes = getUpstreamAdjacentNodes(origin);
-
-            // Visit effect nodes.
-            for (Runtime upstream : upstreamAdjacentNodes) {
-                // Stage edge between origin and upstream for removal.
-                toRemove.add(upstream);
-                
-                // Update deadline of upstream node if origins deadline is earlier.
-                if (origin.deadline.isEarlierThan(upstream.deadline)) {
-                    upstream.deadline = origin.deadline;
-                }
-            }
-            // Remove visited edges.
-            for (Runtime upstream : toRemove) {
-                removeEdge(origin, upstream);
-                // If the upstream node has no more outgoing edges,
-                // then move it in the start set.
-                if (getDownstreamAdjacentNodes(upstream).size() == 0) {
-                    start.add(upstream);
-                }
-            }
-            
-            // Remove visited origin.
-            removeNode(origin);
-        }
-    }
-    
-    /**
-     * Adjust {@link #numReactionsPerLevel} at index <code>level<code> by
-     * adding to the previously recorded number <code>valueToAdd<code>.
-     * If there is no previously recorded number for this level, then
-     * create one with index <code>level</code> and value <code>valueToAdd</code>.
-     * @param level The level.
-     * @param valueToAdd The value to add to the number of levels.
-     */
-    private void adjustNumReactionsPerLevel(int level, int valueToAdd) {
-        if (numReactionsPerLevel.size() > level) {
-            numReactionsPerLevel.set(level, numReactionsPerLevel.get(level) + valueToAdd);
-        } else {
-            while (numReactionsPerLevel.size() < level) {
-                numReactionsPerLevel.add(0);
-            }
-            numReactionsPerLevel.add(valueToAdd);
-        }
-    }
-
-    /**
-     * Return the DOT (GraphViz) representation of the graph.
-     */
-    @Override
-    public String toDOT() {
-        var dotRepresentation = new CodeBuilder();
-        var edges = new StringBuilder();
-
-        // Start the digraph with a left-write rank
-        dotRepresentation.pr(
-        """
-        digraph {
-            rankdir=LF;
-            graph [compound=True, rank=LR, rankdir=LR];
-            node [fontname=Times, shape=rectangle];
-            edge [fontname=Times];
-        """);
-
-        var nodes = nodes();
-        // Group nodes by levels
-        var groupedNodes =
-            nodes.stream()
-                 .collect(
-                     Collectors.groupingBy(it -> it.level)
-                 );
-
-        dotRepresentation.indent();
-        // For each level
-        for (var level : groupedNodes.keySet()) {
-            // Create a subgraph
-            dotRepresentation.pr("subgraph cluster_level_" + level + " {");
-            dotRepresentation.pr("    graph [compound=True, label = \"level " + level + "\"];");
-
-            // Get the nodes at the current level
-            var currentLevelNodes = groupedNodes.get(level);
-            for (var node: currentLevelNodes) {
-                // Draw the node
-                var label = CUtil.getName(node.getReaction().getParent().reactorDeclaration) + "." + node.getReaction().getName();
-                // Need a positive number to name the nodes in GraphViz
-                var labelHashCode = label.hashCode() & 0xfffffff;
-                dotRepresentation.pr("    node_" + labelHashCode  + " [label=\""+ label +"\"];");
-
-                // Draw the edges
-                var downstreamNodes = getDownstreamAdjacentNodes(node);
-                for (var downstreamNode: downstreamNodes) {
-                    var downstreamLabel =  CUtil.getName(downstreamNode.getReaction().getParent().reactorDeclaration) + "." + downstreamNode.getReaction().getName();
-                    edges.append("    node_" + labelHashCode + " -> node_" +
-                                     (downstreamLabel.hashCode() & 0xfffffff) + ";\n"
-                    );
-                }
-            }
-            // Close the subgraph
-            dotRepresentation.pr("}");
-        }
-        dotRepresentation.unindent();
-        // Add the edges to the definition of the graph at the bottom
-        dotRepresentation.pr(edges);
-        // Close the digraph
-        dotRepresentation.pr("}");
-
-        // Return the DOT representation
-        return dotRepresentation.toString();
-    }
-}
\ No newline at end of file
diff --git a/org.lflang/src/org/lflang/generator/ReactorInstance.java b/org.lflang/src/org/lflang/generator/ReactorInstance.java
deleted file mode 100644
index 5a183421be..0000000000
--- a/org.lflang/src/org/lflang/generator/ReactorInstance.java
+++ /dev/null
@@ -1,1156 +0,0 @@
-/** A data structure for a reactor instance. */
-
-/*************
-Copyright (c) 2019-2022, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
-
-package org.lflang.generator;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.lflang.ASTUtils;
-import org.lflang.AttributeUtils;
-import org.lflang.ErrorReporter;
-import org.lflang.TimeValue;
-import org.lflang.generator.TriggerInstance.BuiltinTriggerVariable;
-import org.lflang.lf.Action;
-import org.lflang.lf.BuiltinTrigger;
-import org.lflang.lf.BuiltinTriggerRef;
-import org.lflang.lf.Connection;
-import org.lflang.lf.Expression;
-import org.lflang.lf.Input;
-import org.lflang.lf.Instantiation;
-import org.lflang.lf.LfFactory;
-import org.lflang.lf.Mode;
-import org.lflang.lf.Output;
-import org.lflang.lf.Parameter;
-import org.lflang.lf.ParameterReference;
-import org.lflang.lf.Port;
-import org.lflang.lf.Reaction;
-import org.lflang.lf.Reactor;
-import org.lflang.lf.ReactorDecl;
-import org.lflang.lf.StateVar;
-import org.lflang.lf.Timer;
-import org.lflang.lf.VarRef;
-import org.lflang.lf.Variable;
-import org.lflang.lf.WidthSpec;
-
-
-/**
- * Representation of a compile-time instance of a reactor.
- * If the reactor is instantiated as a bank of reactors, or if any
- * of its parents is instantiated as a bank of reactors, then one instance
- * of this ReactorInstance class represents all the runtime instances within
- * these banks.  The {@link #getTotalWidth()} method returns the number of such
- * runtime instances, which is the product of the bank width of this reactor
- * instance and the bank widths of all of its parents.
- * There is exactly one instance of this ReactorInstance class for each
- * graphical rendition of a reactor in the diagram view.
- * 
- * For the main reactor, which has no parent, once constructed,
- * this object represents the entire Lingua Franca program.
- * If the program has causality loops (a programming error), then
- * {@link #hasCycles()} will return true and {@link #getCycles()} will
- * return the ports and reaction instances involved in the cycles.
- *
- * @author Marten Lohstroh
- * @author Edward A. Lee
- */
-public class ReactorInstance extends NamedInstance<Instantiation> {
-
-    /**
-     * Create a new instantiation hierarchy that starts with the given top-level reactor.
-     * @param reactor The top-level reactor.
-     * @param reporter The error reporter.
-     */
-    public ReactorInstance(Reactor reactor, ErrorReporter reporter) {
-        this(ASTUtils.createInstantiation(reactor), null, reporter, -1);
-    }
-
-    /**
-     * Create a new instantiation hierarchy that starts with the given top-level reactor
-     * but only creates contained reactors up to the specified depth.
-     * @param reactor The top-level reactor.
-     * @param reporter The error reporter.
-     * @param desiredDepth The depth to which to go, or -1 to construct the full hierarchy.
-     */
-    public ReactorInstance(Reactor reactor, ErrorReporter reporter, int desiredDepth) {
-        this(ASTUtils.createInstantiation(reactor), null, reporter, desiredDepth);
-    }
-
-    /**
-     * Create a new instantiation with the specified parent.
-     * This constructor is here to allow for unit tests.
-     * It should not be used for any other purpose.
-     * @param reactor The top-level reactor.
-     * @param parent The parent reactor instance.
-     * @param reporter The error reporter.
-     */
-    public ReactorInstance(Reactor reactor, ReactorInstance parent, ErrorReporter reporter) {
-        this(ASTUtils.createInstantiation(reactor), parent, reporter, -1);
-    }
-
-    //////////////////////////////////////////////////////
-    //// Public fields.
-
-    /** The action instances belonging to this reactor instance. */
-    public final List<ActionInstance> actions = new ArrayList<>();
-
-    /**
-     * The contained reactor instances, in order of declaration.
-     * For banks of reactors, this includes both the bank definition
-     * Reactor (which has bankIndex == -2) followed by each of the
-     * bank members (which have bankIndex >= 0).
-     */
-    public final List<ReactorInstance> children = new ArrayList<>();
-    
-    /** The input port instances belonging to this reactor instance. */
-    public final List<PortInstance> inputs = new ArrayList<>();
-
-    /** The output port instances belonging to this reactor instance. */
-    public final List<PortInstance> outputs = new ArrayList<>();
-
-    /** The state variable instances belonging to this reactor instance. */
-    public final List<StateVariableInstance> states = new ArrayList<>();
-
-    /** The parameters of this instance. */
-    public final List<ParameterInstance> parameters = new ArrayList<>();
-
-    /** List of reaction instances for this reactor instance. */
-    public final List<ReactionInstance> reactions = new ArrayList<>();
-
-    /** The timer instances belonging to this reactor instance. */
-    public final List<TimerInstance> timers = new ArrayList<>();
-    
-    /** The mode instances belonging to this reactor instance. */
-    public final List<ModeInstance> modes = new ArrayList<>();
-
-    /** The reactor declaration in the AST. This is either an import or Reactor declaration. */
-    public final ReactorDecl reactorDeclaration;
-
-    /** The reactor after imports are resolve. */
-    public final Reactor reactorDefinition;
-
-    /** Indicator that this reactor has itself as a parent, an error condition. */
-    public final boolean recursive;
-
-    //////////////////////////////////////////////////////
-    //// Public methods.
-    
-    /**
-     * Assign levels to all reactions within the same root as this
-     * reactor. The level of a reaction r is equal to the length of the
-     * longest chain of reactions that must have the opportunity to
-     * execute before r at each logical tag. This fails and returns
-     * false if a causality cycle exists.
-     * 
-     * This method uses a variant of Kahn's algorithm, which is linear
-     * in V + E, where V is the number of vertices (reactions) and E
-     * is the number of edges (dependencies between reactions).
-     * 
-     * @return An empty graph if successful and otherwise a graph
-     *  with runtime reaction instances that form cycles.
-     */
-    public ReactionInstanceGraph assignLevels() {
-        if (depth != 0) return root().assignLevels();
-        if (cachedReactionLoopGraph == null) {
-            cachedReactionLoopGraph = new ReactionInstanceGraph(this);
-        }
-        return cachedReactionLoopGraph;
-    }
-
-    /**
-     * This function assigns/propagates deadlines through the Reaction Instance Graph.
-     * It performs Kahn`s algorithm in reverse, starting from the leaf nodes and
-     * propagates deadlines upstream. To reduce cost, it should only be invoked when
-     * there are user-specified deadlines in the program.
-     * @return
-     */
-    public ReactionInstanceGraph assignDeadlines() {
-        if (depth != 0) return root().assignDeadlines();
-        if (cachedReactionLoopGraph == null) {
-            cachedReactionLoopGraph = new ReactionInstanceGraph(this);
-        }
-        cachedReactionLoopGraph.rebuildAndAssignDeadlines();
-        return cachedReactionLoopGraph;
-    }
-    
-    /** 
-     * Return the instance of a child rector created by the specified
-     * definition or null if there is none.
-     * @param definition The definition of the child reactor ("new" statement).
-     */
-    public ReactorInstance getChildReactorInstance(Instantiation definition) {
-        for (ReactorInstance child : this.children) {
-            if (child.definition == definition) {
-                return child;
-            }
-        }
-        return null;
-    }
-    
-    /**
-     * Clear any cached data in this reactor and its children.
-     * This is useful if a mutation has been realized.
-     */
-    public void clearCaches() {
-        clearCaches(true);
-    }
-
-    /**
-     * Clear any cached data in this reactor and its children.
-     * This is useful if a mutation has been realized.
-     * @param includingRuntimes If false, leave the runtime instances of reactions intact.
-     *  This is useful for federated execution where levels are computed using
-     *  the top-level connections, but then those connections are discarded.
-     */
-    public void clearCaches(boolean includingRuntimes) {
-        if (includingRuntimes) cachedReactionLoopGraph = null;
-        for (ReactorInstance child : children) {
-            child.clearCaches(includingRuntimes);
-        }
-        for (PortInstance port : inputs) {
-            port.clearCaches();
-        }
-        for (PortInstance port : outputs) {
-            port.clearCaches();
-        }
-        for (ReactionInstance reaction : reactions) {
-            reaction.clearCaches(includingRuntimes);
-        }
-        cachedCycles = null;
-    }
-    
-    /**
-     * Return the set of ReactionInstance and PortInstance that form causality
-     * loops in the topmost parent reactor in the instantiation hierarchy. This will return an
-     * empty set if there are no causality loops.
-     */
-    public Set<NamedInstance<?>> getCycles() {
-        if (depth != 0) return root().getCycles();
-        if (cachedCycles != null) return cachedCycles;
-        cachedCycles = new LinkedHashSet<>();
-        
-        ReactionInstanceGraph reactionRuntimes = assignLevels();
-        if (reactionRuntimes.nodes().size() > 0) {
-            Set<ReactionInstance> reactions = new LinkedHashSet<>();
-            Set<PortInstance> ports = new LinkedHashSet<>();
-            // There are cycles. But the nodes set includes not
-            // just the cycles, but also nodes that are downstream of the
-            // cycles.  Use Tarjan's algorithm to get just the cycles.
-            var cycleNodes = reactionRuntimes.getCycles();
-            for (var cycle : cycleNodes) {
-                for (ReactionInstance.Runtime runtime : cycle) {
-                    reactions.add(runtime.getReaction());
-                }
-            }
-            // Need to figure out which ports are involved in the cycles.
-            // It may not be all ports that depend on this reaction.
-            for (ReactionInstance r : reactions) {
-                for (TriggerInstance<? extends Variable> p : r.effects) {
-                    if (p instanceof PortInstance) {
-                        findPaths((PortInstance)p, reactions, ports);
-                    }
-                }
-            }
-            cachedCycles.addAll(reactions);
-            cachedCycles.addAll(ports);
-        }
-        
-        return cachedCycles;
-    }
-
-    /**
-     * Return the specified input by name or null if there is no such input.
-     * @param name The input name.
-     */
-    public PortInstance getInput(String name) {
-        for (PortInstance port: inputs) {
-            if (port.getName().equals(name)) {
-                return port;
-            }
-        }
-        return null;
-    }
-    
-    /** 
-     * Override the base class to append [i_d], where d is the depth,
-     * if this reactor is in a bank of reactors.
-     * @return The name of this instance.
-     */
-    @Override
-    public String getName() {
-        return this.definition.getName();
-    }
-
-    /**
-     * @see NamedInstance#uniqueID()
-     *
-     * Append `_main` to the name of the main reactor to allow instantiations
-     * within that reactor to have the same name.
-     */
-    @Override
-    public String uniqueID() {
-       if (this.isMainOrFederated()) {
-          return super.uniqueID() + "_main";
-       }
-       return super.uniqueID();
-    }
-
-    /**
-     * Return the specified output by name or null if there is no such output.
-     * @param name The output name.
-     */
-    public PortInstance getOutput(String name) {
-        for (PortInstance port: outputs) {
-            if (port.getName().equals(name)) {
-                return port;
-            }
-        }
-        return null;
-    }
-    
-    /**
-     * Return a parameter matching the specified name if the reactor has one
-     * and otherwise return null.
-     * @param name The parameter name.
-     */
-    public ParameterInstance getParameter(String name) {
-        for (ParameterInstance parameter: parameters) {
-            if (parameter.getName().equals(name)) {
-                return parameter;
-            }
-        }
-        return null;
-    }
-    
-    /**
-     * Return the startup trigger or null if not used in any reaction.
-     */
-    public TriggerInstance<BuiltinTriggerVariable> getStartupTrigger() {
-        return builtinTriggers.get(BuiltinTrigger.STARTUP);
-    }
-
-    /**
-     * Return the shutdown trigger or null if not used in any reaction.
-     */
-    public TriggerInstance<BuiltinTriggerVariable> getShutdownTrigger() {
-        return builtinTriggers.get(BuiltinTrigger.SHUTDOWN);
-    }
-    
-    /**
-     * If this reactor is a bank or any of its parents is a bank,
-     * return the total number of runtime instances, which is the product
-     * of the widths of all the parents.
-     * Return -1 if the width cannot be determined.
-     */
-    public int getTotalWidth() {
-        return getTotalWidth(0);
-    }
-    
-    /**
-     * If this reactor is a bank or any of its parents is a bank,
-     * return the total number of runtime instances, which is the product
-     * of the widths of all the parents.
-     * Return -1 if the width cannot be determined.
-     * @param atDepth The depth at which to determine the width.
-     *  Use 0 to get the total number of instances.
-     *  Use 1 to get the number of instances within a single top-level
-     *  bank member (this is useful for federates). 
-     */
-    public int getTotalWidth(int atDepth) {
-        if (width <= 0) return -1;
-        if (depth <= atDepth) return 1;
-        int result = width;
-        ReactorInstance p = parent;
-        while (p != null && p.depth > atDepth) {
-            if (p.width <= 0) return -1;
-            result *= p.width;
-            p = p.parent;
-        }
-        return result;
-    }
-
-    /** 
-     * Return the trigger instances (input ports, timers, and actions
-     * that trigger reactions) belonging to this reactor instance.
-     */
-    public Set<TriggerInstance<? extends Variable>> getTriggers() {
-        // FIXME: Cache this.
-        var triggers = new LinkedHashSet<TriggerInstance<? extends Variable>>();
-        for (ReactionInstance reaction : this.reactions) {
-            triggers.addAll(reaction.triggers);
-        }
-        return triggers;
-    }
-
-    /** 
-     * Return the trigger instances (input ports, timers, and actions
-     * that trigger reactions) together the ports that the reaction reads
-     * but that don't trigger it.
-     * 
-     * @return The trigger instances belonging to this reactor instance.
-     */
-    public Set<TriggerInstance<? extends Variable>> getTriggersAndReads() {
-        // FIXME: Cache this.
-        var triggers = new LinkedHashSet<TriggerInstance<? extends Variable>>();
-        for (ReactionInstance reaction : this.reactions) {
-            triggers.addAll(reaction.triggers);
-            triggers.addAll(reaction.reads);
-        }
-        return triggers;
-    }
-    
-    /**
-     * Return true if the top-level parent of this reactor has causality cycles.
-     */
-    public boolean hasCycles() {
-        return assignLevels().nodeCount() != 0;
-    }
-    
-    /**
-     * Given a parameter definition for this reactor, return the initial integer
-     * value of the parameter. If the parameter is overridden when instantiating
-     * this reactor or any of its containing reactors, use that value.
-     * Otherwise, use the default value in the reactor definition.
-     * If the parameter cannot be found or its value is not an integer, return null.
-     * 
-     * @param parameter The parameter definition (a syntactic object in the AST).
-     * 
-     * @return An integer value or null.
-     */
-    public Integer initialIntParameterValue(Parameter parameter) {
-        return ASTUtils.initialValueInt(parameter, instantiations());
-    }  
-
-    /**
-     * Given a parameter definition for this reactor, return the initial value
-     * of the parameter. If the parameter is overridden when instantiating
-     * this reactor or any of its containing reactors, use that value.
-     * Otherwise, use the default value in the reactor definition.
-     * 
-     * The returned list of Value objects is such that each element is an
-     * instance of Time, String, or Code, never Parameter.
-     * For most uses, this list has only one element, but parameter
-     * values can be lists of elements, so the returned value is a list.
-     * 
-     * @param parameter The parameter definition (a syntactic object in the AST).
-     * 
-     * @return A list of Value objects, or null if the parameter is not found.
-     *  Return an empty list if no initial value is given.
-     *  Each value is an instance of Literal if a literal value is given,
-     *  a Time if a time value was given, or a Code, if a code value was
-     *  given (text in the target language delimited by {= ... =}
-     */
-    public List<Expression> initialParameterValue(Parameter parameter) {
-        return ASTUtils.initialValue(parameter, instantiations());
-    }
-
-    /**
-     * Return a list of Instantiation objects for evaluating parameter
-     * values.  The first object in the list is the AST Instantiation
-     * that created this reactor instance, the second is the AST instantiation
-     * that created the containing reactor instance, and so on until there
-     * are no more containing reactor instances. This will return an empty
-     * list if this reactor instance is at the top level (is main).
-     */
-    public List<Instantiation> instantiations() {
-        if (_instantiations == null) {
-            _instantiations = new ArrayList<>();
-            if (definition != null) {
-                _instantiations.add(definition);
-                if (parent != null) {
-                    _instantiations.addAll(parent.instantiations());
-                }
-            }
-        }
-        return _instantiations;
-    }
-
-    /**
-     * Returns true if this is a bank of reactors.
-     * @return true if a reactor is a bank, false otherwise
-     */
-    public boolean isBank() {
-        return definition.getWidthSpec() != null;
-    }
-
-    /**
-     * Returns whether this is a main or federated reactor.
-     * @return true if reactor definition is marked as main or federated, false otherwise.
-     */
-    public boolean isMainOrFederated() {
-        return reactorDefinition != null 
-                && (reactorDefinition.isMain() || reactorDefinition.isFederated());
-    }
-    
-    /**
-     * Return true if the specified reactor instance is either equal to this
-     * reactor instance or a parent of it.
-     * @param r The reactor instance.
-     */
-    public boolean isParent(ReactorInstance r) {
-        ReactorInstance p = this;
-        while (p != null) {
-            if (p == r) return true;
-            p = p.getParent();
-        }
-        return false;
-    }
-    
-    ///////////////////////////////////////////////////
-    //// Methods for finding instances in this reactor given an AST node.
-    
-    /** 
-     * Return the action instance within this reactor 
-     * instance corresponding to the specified action reference.
-     * @param action The action as an AST node.
-     * @return The corresponding action instance or null if the
-     *  action does not belong to this reactor.
-     */
-    public ActionInstance lookupActionInstance(Action action) {
-        for (ActionInstance actionInstance : actions) {
-            if (actionInstance.definition == action) {
-                return actionInstance;
-            }
-        }
-        return null;
-    }
-
-    /** 
-     * Given a parameter definition, return the parameter instance
-     * corresponding to that definition, or null if there is
-     * no such instance.
-     * @param parameter The parameter definition (a syntactic object in the AST).
-     * @return A parameter instance, or null if there is none.
-     */
-    public ParameterInstance lookupParameterInstance(Parameter parameter) {
-        for (ParameterInstance param : parameters) {
-            if (param.definition == parameter) {
-                return param;
-            }
-        }
-        return null;
-    }
-    
-    /** 
-     * Given a port definition, return the port instance
-     * corresponding to that definition, or null if there is
-     * no such instance.
-     * @param port The port definition (a syntactic object in the AST).
-     * @return A port instance, or null if there is none.
-     */
-    public PortInstance lookupPortInstance(Port port) {
-        // Search one of the inputs and outputs sets.
-        List<PortInstance> ports = null;
-        if (port instanceof Input) {
-            ports = this.inputs;
-        } else if (port instanceof Output) {
-            ports = this.outputs;
-        }
-        for (PortInstance portInstance : ports) {
-            if (portInstance.definition == port) {
-                return portInstance;
-            }
-        }
-        return null;
-    }
-
-    /** 
-     * Given a reference to a port belonging to this reactor
-     * instance, return the port instance.
-     * Return null if there is no such instance.
-     * @param reference The port reference.
-     * @return A port instance, or null if there is none.
-     */
-    public PortInstance lookupPortInstance(VarRef reference) {
-        if (!(reference.getVariable() instanceof Port)) {
-            // Trying to resolve something that is not a port
-            return null;
-        }
-        if (reference.getContainer() == null) {
-            // Handle local reference
-            return lookupPortInstance((Port) reference.getVariable());
-        } else {
-            // Handle hierarchical reference
-            var containerInstance = getChildReactorInstance(reference.getContainer());
-            if (containerInstance == null) return null;
-            return containerInstance.lookupPortInstance((Port) reference.getVariable());
-        }
-    }
-
-    /** 
-     * Return the reaction instance within this reactor 
-     * instance corresponding to the specified reaction.
-     * @param reaction The reaction as an AST node.
-     * @return The corresponding reaction instance or null if the
-     *  reaction does not belong to this reactor.
-     */
-    public ReactionInstance lookupReactionInstance(Reaction reaction) {
-        for (ReactionInstance reactionInstance : reactions) {
-            if (reactionInstance.definition == reaction) {
-                return reactionInstance;
-            }
-        }
-        return null;
-    }
-    
-    /**
-     * Return the reactor instance within this reactor
-     * that has the specified instantiation. Note that this
-     * may be a bank of reactors. Return null if there
-     * is no such reactor instance.
-     */
-    public ReactorInstance lookupReactorInstance(Instantiation instantiation) {
-        for (ReactorInstance reactorInstance : children) {
-            if (reactorInstance.definition == instantiation) {
-                return reactorInstance;
-            }
-        }
-        return null;
-    }
-    
-    /** 
-     * Return the timer instance within this reactor 
-     * instance corresponding to the specified timer reference.
-     * @param timer The timer as an AST node.
-     * @return The corresponding timer instance or null if the
-     *  timer does not belong to this reactor.
-     */
-    public TimerInstance lookupTimerInstance(Timer timer) {
-        for (TimerInstance timerInstance : timers) {
-            if (timerInstance.definition == timer) {
-                return timerInstance;
-            }
-        }
-        return null;
-    }
-    
-    /** Returns the mode instance within this reactor 
-     *  instance corresponding to the specified mode reference.
-     *  @param mode The mode as an AST node.
-     *  @return The corresponding mode instance or null if the
-     *   mode does not belong to this reactor.
-     */
-    public ModeInstance lookupModeInstance(Mode mode) {
-        for (ModeInstance modeInstance : modes) {
-            if (modeInstance.definition == mode) {
-                return modeInstance;
-            }
-        }
-        return null;
-    }
-
-    /** 
-     * Return a descriptive string.
-     */
-    @Override
-    public String toString() {
-        return "ReactorInstance " + getFullName();
-    }
-    
-    /**
-     * Assuming that the given expression denotes a valid time, return a time value.
-     *
-     * If the value is given as a parameter reference, this will look up the
-     * precise time value assigned to this reactor instance.
-     */
-    public TimeValue getTimeValue(Expression expr) {
-        if (expr instanceof ParameterReference) {
-            final var param = ((ParameterReference)expr).getParameter();
-            // Avoid a runtime error in validator for invalid programs.
-            if (lookupParameterInstance(param).getInitialValue().isEmpty()) return null;
-            return ASTUtils.getLiteralTimeValue(lookupParameterInstance(param).getInitialValue().get(0));
-        } else {
-            return ASTUtils.getLiteralTimeValue(expr);
-        }
-    }
-    
-    //////////////////////////////////////////////////////
-    //// Protected fields.
-
-    /** The generator that created this reactor instance. */
-    protected ErrorReporter reporter; // FIXME: This accumulates a lot of redundant references
-
-    /** The map of used built-in triggers. */
-    protected Map<BuiltinTrigger, TriggerInstance<BuiltinTriggerVariable>> builtinTriggers = new HashMap<>();
-
-    /**
-     * The LF syntax does not currently support declaring reactions unordered,
-     * but unordered reactions are created in the AST transformations handling
-     * federated communication and after delays. Unordered reactions can execute
-     * in any order and concurrently even though they are in the same reactor.
-     * FIXME: Remove this when the language provides syntax.
-     */
-    protected Set<Reaction> unorderedReactions = new LinkedHashSet<>();
-
-    /** The nested list of instantiations that created this reactor instance. */
-    protected List<Instantiation> _instantiations;
-
-    //////////////////////////////////////////////////////
-    //// Protected methods.
-    
-    /** 
-     * Create all the reaction instances of this reactor instance
-     * and record the dependencies and antidependencies
-     * between ports, actions, and timers and reactions.
-     * This also records the dependencies between reactions
-     * that follows from the order in which they are defined.
-     */
-    protected void createReactionInstances() {
-        List<Reaction> reactions = ASTUtils.allReactions(reactorDefinition);
-        if (reactions != null) {
-            int count = 0;
-
-            // Check for startup and shutdown triggers.
-            for (Reaction reaction : reactions) {
-                if (AttributeUtils.isUnordered(reaction)) {
-                    unorderedReactions.add(reaction);
-                }
-                // Create the reaction instance.
-                var reactionInstance = new ReactionInstance(reaction, this,
-                    unorderedReactions.contains(reaction), count++);
-                
-                // Add the reaction instance to the map of reactions for this
-                // reactor.
-                this.reactions.add(reactionInstance);
-            }
-        }
-    }
-
-    /**
-     * Returns the built-in trigger or create a new one if none exists.
-     */
-    protected TriggerInstance<BuiltinTriggerVariable> getOrCreateBuiltinTrigger(BuiltinTriggerRef trigger) {
-        return builtinTriggers.computeIfAbsent(trigger.getType(), ref -> TriggerInstance.builtinTrigger(trigger, this));
-    }
-    
-    ////////////////////////////////////////
-    //// Private constructors
-    
-    /**
-     * Create a runtime instance from the specified definition
-     * and with the specified parent that instantiated it.
-     * @param definition The instantiation statement in the AST.
-     * @param parent The parent, or null for the main rector.
-     * @param reporter An error reporter.
-     * @param desiredDepth The depth to which to expand the hierarchy.
-     */
-    private ReactorInstance(
-            Instantiation definition, 
-            ReactorInstance parent,
-            ErrorReporter reporter,
-            int desiredDepth) {
-        super(definition, parent);
-        this.reporter = reporter;
-        this.reactorDeclaration = definition.getReactorClass();
-        this.reactorDefinition = ASTUtils.toDefinition(reactorDeclaration);
-        
-        // check for recursive instantiation
-        var currentParent = parent;
-        var foundSelfAsParent = false;
-        do {
-            if (currentParent != null) {
-                if (currentParent.reactorDefinition == this.reactorDefinition) {
-                    foundSelfAsParent = true;
-                    currentParent = null; // break
-                } else {
-                    currentParent = currentParent.parent;
-                }
-            }
-        } while(currentParent != null);
-        
-        this.recursive = foundSelfAsParent;
-        if (recursive) {
-            reporter.reportError(definition, "Recursive reactor instantiation.");
-        }
-                
-        // If the reactor definition is null, give up here. Otherwise, diagram generation
-        // will fail an NPE.
-        if (reactorDefinition == null) {
-            reporter.reportError(definition, "Reactor instantiation has no matching reactor definition.");
-            return;
-        }
-        
-        setInitialWidth();
-        
-        // Apply overrides and instantiate parameters for this reactor instance.
-        for (Parameter parameter : ASTUtils.allParameters(reactorDefinition)) {
-            this.parameters.add(new ParameterInstance(parameter, this));
-        }
-
-        // Instantiate inputs for this reactor instance.
-        for (Input inputDecl : ASTUtils.allInputs(reactorDefinition)) {
-            this.inputs.add(new PortInstance(inputDecl, this, reporter));
-        }
-
-        // Instantiate outputs for this reactor instance.
-        for (Output outputDecl : ASTUtils.allOutputs(reactorDefinition)) {
-            this.outputs.add(new PortInstance(outputDecl, this, reporter));
-        }
-
-        // Instantiate state variables for this reactor instance.
-        for (StateVar state : ASTUtils.allStateVars(reactorDefinition)) {
-            this.states.add(new StateVariableInstance(state, this, reporter));
-        }
-
-        // Do not process content (except interface above) if recursive
-        if (!recursive && (desiredDepth < 0 || this.depth < desiredDepth)) {
-            // Instantiate children for this reactor instance.
-            // While doing this, assign an index offset to each.
-            for (Instantiation child : ASTUtils.allInstantiations(reactorDefinition)) {
-                var childInstance = new ReactorInstance(
-                    child, 
-                    this, 
-                    reporter, 
-                    desiredDepth
-                );
-                this.children.add(childInstance);
-            }
-
-            // Instantiate timers for this reactor instance
-            for (Timer timerDecl : ASTUtils.allTimers(reactorDefinition)) {
-                this.timers.add(new TimerInstance(timerDecl, this));
-            }
-
-            // Instantiate actions for this reactor instance
-            for (Action actionDecl : ASTUtils.allActions(reactorDefinition)) {
-                this.actions.add(new ActionInstance(actionDecl, this));
-            }
-
-            establishPortConnections();
-
-            // Create the reaction instances in this reactor instance.
-            // This also establishes all the implied dependencies.
-            // Note that this can only happen _after_ the children, 
-            // port, action, and timer instances have been created.
-            createReactionInstances();
-            
-            // Instantiate modes for this reactor instance
-            // This must come after the child elements (reactions, etc) of this reactor
-            // are created in order to allow their association with modes
-            for (Mode modeDecl : ASTUtils.allModes(reactorDefinition)) {
-                this.modes.add(new ModeInstance(modeDecl, this));
-            }
-            for (ModeInstance mode : this.modes) {
-                mode.setupTranstions();
-            }
-        }
-    }
-    
-    //////////////////////////////////////////////////////
-    //// Private methods.
-
-    /**
-     * Connect the given left port range to the given right port range.
-     * 
-     * NOTE: This method is public to enable its use in unit tests.
-     * Otherwise, it should be private. This is why it is defined here,
-     * in the section labeled "Private methods."
-     * 
-     * @param src The source range.
-     * @param dst The destination range.
-     * @param connection The connection establishing this relationship.
-     */
-    public static void connectPortInstances(
-            RuntimeRange<PortInstance> src,
-            RuntimeRange<PortInstance> dst,
-            Connection connection
-    ) {
-        SendRange range = new SendRange(src, dst, src._interleaved, connection);
-        src.instance.dependentPorts.add(range);
-        dst.instance.dependsOnPorts.add(src);
-    }
-
-    /**
-     * Populate connectivity information in the port instances.
-     * Note that this can only happen _after_ the children and port instances have been created.
-     * Unfortunately, we have to do some complicated things here
-     * to support multiport-to-multiport, multiport-to-bank,
-     * and bank-to-multiport communication.  The principle being followed is:
-     * in each connection statement, for each port instance on the left,
-     * connect to the next available port on the right.
-     */
-    private void establishPortConnections() {
-        for (Connection connection : ASTUtils.allConnections(reactorDefinition)) {
-            List<RuntimeRange<PortInstance>> leftPorts = listPortInstances(connection.getLeftPorts(), connection);
-            Iterator<RuntimeRange<PortInstance>> srcRanges = leftPorts.iterator();
-            List<RuntimeRange<PortInstance>> rightPorts = listPortInstances(connection.getRightPorts(), connection);
-            Iterator<RuntimeRange<PortInstance>> dstRanges = rightPorts.iterator();
-            
-            // Check for empty lists.
-            if (!srcRanges.hasNext()) {
-                if (dstRanges.hasNext()) {
-                    reporter.reportWarning(connection, "No sources to provide inputs.");
-                }
-                return;
-            } else if (!dstRanges.hasNext()) {
-                reporter.reportWarning(connection, "No destination. Outputs will be lost.");
-                return;
-            }
-            
-            RuntimeRange<PortInstance> src = srcRanges.next();
-            RuntimeRange<PortInstance> dst = dstRanges.next();
-
-            while(true) {
-                if (dst.width == src.width) {
-                    connectPortInstances(src, dst, connection);
-                    if (!dstRanges.hasNext()) {
-                        if (srcRanges.hasNext()) {
-                            // Should not happen (checked by the validator).
-                            reporter.reportWarning(connection, 
-                                    "Source is wider than the destination. Outputs will be lost.");
-                        }
-                        break;
-                    }
-                    if (!srcRanges.hasNext()) {
-                        if (connection.isIterated()) {
-                            srcRanges = leftPorts.iterator();
-                        } else {
-                            if (dstRanges.hasNext()) {
-                                // Should not happen (checked by the validator).
-                                reporter.reportWarning(connection, 
-                                        "Destination is wider than the source. Inputs will be missing.");
-                            }
-                            break;
-                        }
-                    }
-                    dst = dstRanges.next();
-                    src = srcRanges.next();
-                } else if (dst.width < src.width) {
-                    // Split the left (src) range in two.
-                    connectPortInstances(src.head(dst.width), dst, connection);
-                    src = src.tail(dst.width);
-                    if (!dstRanges.hasNext()) {
-                        // Should not happen (checked by the validator).
-                        reporter.reportWarning(connection, 
-                                "Source is wider than the destination. Outputs will be lost.");
-                        break;
-                    }
-                    dst = dstRanges.next();
-                } else if (src.width < dst.width) {
-                    // Split the right (dst) range in two.
-                    connectPortInstances(src, dst.head(src.width), connection);
-                    dst = dst.tail(src.width);
-                    if (!srcRanges.hasNext()) {
-                        if (connection.isIterated()) {
-                            srcRanges = leftPorts.iterator();
-                        } else {
-                            reporter.reportWarning(connection, 
-                                    "Destination is wider than the source. Inputs will be missing.");
-                            break;
-                        }
-                    }
-                    src = srcRanges.next();
-                }
-            }
-        }
-    }
-    
-    /**
-     * If path exists from the specified port to any reaction in the specified
-     * set of reactions, then add the specified port and all ports along the path
-     * to the specified set of ports.
-     * @return True if the specified port was added.
-     */
-    private boolean findPaths(
-            PortInstance port, 
-            Set<ReactionInstance> reactions,
-            Set<PortInstance> ports
-    ) {
-        if (ports.contains(port)) return false;
-        boolean result = false;
-        for (ReactionInstance d : port.getDependentReactions()) {
-            if (reactions.contains(d)) ports.add(port);
-            result = true;
-        }
-        // Perform a depth-first search.
-        for (SendRange r : port.dependentPorts) {
-            for (RuntimeRange<PortInstance> p : r.destinations) {
-                boolean added = findPaths(p.instance, reactions, ports);
-                if (added) {
-                    result = true;
-                    ports.add(port);
-                }
-            }
-        }
-        return result;
-    }
-    
-    /**
-     * Given a list of port references, as found on either side of a connection,
-     * return a list of the port instance ranges referenced. These may be multiports,
-     * and may be ports of a contained bank (a port representing ports of the bank
-     * members) so the returned list includes ranges of banks and channels.
-     * 
-     * If a given port reference has the form `interleaved(b.m)`, where `b` is
-     * a bank and `m` is a multiport, then the corresponding range in the returned
-     * list is marked interleaved.
-     * 
-     * For example, if `b` and `m` have width 2, without the interleaved keyword,
-     * the returned range represents the sequence `[b0.m0, b0.m1, b1.m0, b1.m1]`.
-     * With the interleaved marking, the returned range represents the sequence
-     * `[b0.m0, b1.m0, b0.m1, b1.m1]`. Both ranges will have width 4.
-     * 
-     * @param references The variable references on one side of the connection.
-     * @param connection The connection.
-     */
-    private List<RuntimeRange<PortInstance>> listPortInstances(
-            List<VarRef> references, Connection connection
-    ) {
-        List<RuntimeRange<PortInstance>> result = new ArrayList<>();
-        List<RuntimeRange<PortInstance>> tails = new LinkedList<>();
-        int count = 0;
-        for (VarRef portRef : references) {
-            // Simple error checking first.
-            if (!(portRef.getVariable() instanceof Port)) {
-                reporter.reportError(portRef, "Not a port.");
-                return result;
-            }
-            // First, figure out which reactor we are dealing with.
-            // The reactor we want is the container of the port.
-            // If the port reference has no container, then the reactor is this one.
-            var reactor = this;
-            if (portRef.getContainer() != null) {
-                reactor = getChildReactorInstance(portRef.getContainer());
-            }
-            // The reactor can be null only if there is an error in the code.
-            // Skip this portRef so that diagram synthesis can complete.
-            if (reactor != null) {
-                PortInstance portInstance = reactor.lookupPortInstance(
-                        (Port) portRef.getVariable());
-                
-                Set<ReactorInstance> interleaved = new LinkedHashSet<>();
-                if (portRef.isInterleaved()) {
-                    // NOTE: Here, we are assuming that the interleaved()
-                    // keyword is only allowed on the multiports contained by
-                    // contained reactors.
-                    interleaved.add(portInstance.parent);
-                }
-                RuntimeRange<PortInstance> range = new RuntimeRange.Port(
-                        portInstance, interleaved);
-                // If this portRef is not the last one in the references list
-                // then we have to check whether the range can be incremented at
-                // the lowest two levels (port and container).  If not,
-                // split the range and add the tail to list to iterate over again.
-                // The reason for this is that the connection has only local visibility,
-                // but the range width may be reflective of bank structure higher
-                // in the hierarchy.
-                if (count < references.size() - 1) {
-                    int portWidth = portInstance.width;
-                    int portParentWidth = portInstance.parent.width;
-                    // If the port is being connected on the inside and there is
-                    // more than one port in the list, then we can only connect one
-                    // bank member at a time.
-                    if (reactor == this && references.size() > 1) {
-                        portParentWidth = 1;
-                    }
-                    int widthBound = portWidth * portParentWidth;
-                                        
-                    // If either of these widths cannot be determined, assume infinite.
-                    if (portWidth < 0) widthBound = Integer.MAX_VALUE;
-                    if (portParentWidth < 0) widthBound = Integer.MAX_VALUE;
-                    
-                    if (widthBound < range.width) {
-                        // Need to split the range.
-                        tails.add(range.tail(widthBound));
-                        range = range.head(widthBound);
-                    }
-                }
-                result.add(range);
-            }
-        }
-        // Iterate over the tails.
-        while(tails.size() > 0) {
-            List<RuntimeRange<PortInstance>> moreTails = new LinkedList<>();
-            count = 0;
-            for (RuntimeRange<PortInstance> tail : tails) {
-                if (count < tails.size() - 1) {
-                    int widthBound = tail.instance.width;
-                    if (tail._interleaved.contains(tail.instance.parent)) {
-                        widthBound = tail.instance.parent.width;
-                    }
-                    // If the width cannot be determined, assume infinite.
-                    if (widthBound < 0) widthBound = Integer.MAX_VALUE;
-                    
-                    if (widthBound < tail.width) {
-                        // Need to split the range again
-                        moreTails.add(tail.tail(widthBound));
-                        tail = tail.head(widthBound);
-                    }
-                }
-                result.add(tail);
-            }
-            tails = moreTails;
-        }
-        return result;
-    }
-
-    /**
-     * If this is a bank of reactors, set the width.
-     * It will be set to -1 if it cannot be determined.
-     */
-    private void setInitialWidth() {
-        WidthSpec widthSpec = definition.getWidthSpec();
-        if (widthSpec != null) {
-            // We need the instantiations list of the containing reactor,
-            // not this one.
-            width = ASTUtils.width(widthSpec, parent.instantiations());
-        }
-    }
-    
-    //////////////////////////////////////////////////////
-    //// Private fields.
-
-    /**
-     * Cached set of reactions and ports that form a causality loop.
-     */
-    private Set<NamedInstance<?>> cachedCycles;
-
-    /**
-     * Cached reaction graph containing reactions that form a causality loop.
-     */
-    private ReactionInstanceGraph cachedReactionLoopGraph = null;
-    
-    /**
-     * Return true if this is a generated delay reactor that originates from
-     * an "after" delay on a connection.
-     * 
-     * @return True if this is a generated delay, false otherwise.
-     */
-    public boolean isGeneratedDelay() {
-        if (this.definition.getReactorClass().getName().contains(DelayBodyGenerator.GEN_DELAY_CLASS_NAME)) {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/org.lflang/src/org/lflang/generator/TriggerInstance.java b/org.lflang/src/org/lflang/generator/TriggerInstance.java
deleted file mode 100644
index 7130dc8b90..0000000000
--- a/org.lflang/src/org/lflang/generator/TriggerInstance.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/** Instance of a trigger (port, action, or timer). */
-
-/*************
-Copyright (c) 2019, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
-
-package org.lflang.generator;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.lflang.lf.BuiltinTrigger;
-import org.lflang.lf.BuiltinTriggerRef;
-import org.lflang.lf.TriggerRef;
-import org.lflang.lf.Variable;
-import org.lflang.lf.impl.VariableImpl;
-
-/** Instance of a trigger (port, action, or timer).
- *
- *  @author Marten Lohstroh
- *  @author Edward A. Lee
- *  @author Alexander Schulz-Rosengarten
- */
-public class TriggerInstance<T extends Variable> extends NamedInstance<T> {
-
-    /** Construct a new instance with the specified definition
-     *  and parent. E.g., for a action instance, the definition
-     *  is Action, and for a port instance, it is Port. These are
-     *  nodes in the AST. This is protected because only subclasses
-     *  should be constructed.
-     *  @param definition The definition in the AST for this instance.
-     *  @param parent The reactor instance that creates this instance.
-     */
-    protected TriggerInstance(T definition, ReactorInstance parent) {
-        super(definition, parent);
-    }
-
-    /**
-     * Construct a new instance for a special builtin trigger.
-     *
-     * @param trigger The actual trigger definition.
-     * @param parent The reactor instance that creates this instance.
-     */
-    static TriggerInstance<BuiltinTriggerVariable> builtinTrigger(BuiltinTriggerRef trigger, ReactorInstance parent) {
-        return new TriggerInstance<>(new BuiltinTriggerVariable(trigger), parent);
-    }
-
-    /////////////////////////////////////////////
-    //// Public Methods
-
-    /**
-     * Return the reaction instances that are triggered or read by this trigger.
-     * If this port is an output, then the reaction instances
-     * belong to the parent of the port's parent. If the port
-     * is an input, then the reaction instances belong to the
-     * port's parent.
-     */
-    public Set<ReactionInstance> getDependentReactions() {
-        return dependentReactions;
-    }
-
-    /**
-     * Return the reaction instances that may send data via this port.
-     * If this port is an input, then the reaction instance
-     * belongs to parent of the port's parent. If it is an output,
-     * the reaction instance belongs to the port's parent.
-     */
-    public Set<ReactionInstance> getDependsOnReactions() {
-        return dependsOnReactions;
-    }
-
-    /**
-     * Return the name of this trigger.
-     * @return The name of this trigger.
-     */
-    @Override
-    public String getName() {
-        return definition.getName();
-    }
-
-    /**
-     * Return true if this trigger is "shutdown".
-     */
-    public boolean isShutdown() {
-        return isBuiltInType(BuiltinTrigger.SHUTDOWN);
-    }
-
-    /**
-     * Return true if this trigger is "startup"./
-     */
-    public boolean isStartup() {
-        return isBuiltInType(BuiltinTrigger.STARTUP);
-    }
-
-    /**
-     * Return true if this trigger is "startup"./
-     */
-    public boolean isReset() {
-        return isBuiltInType(BuiltinTrigger.RESET);
-    }
-
-    /////////////////////////////////////////////
-    //// Private Methods
-
-    private boolean isBuiltInType(BuiltinTrigger type) {
-        return this.definition instanceof BuiltinTriggerVariable
-            && ((BuiltinTriggerRef) ((BuiltinTriggerVariable) this.definition).definition).getType().equals(type);
-    }
-
-    /////////////////////////////////////////////
-    //// Protected Fields
-
-    /**
-     * Reaction instances that are triggered or read by this trigger.
-     * If this port is an output, then the reaction instances
-     * belong to the parent of the port's parent. If the port
-     * is an input, then the reaction instances belong to the
-     * port's parent.
-     */
-    Set<ReactionInstance> dependentReactions = new LinkedHashSet<>();
-
-    /**
-     * Reaction instances that may send data via this port.
-     * If this port is an input, then the reaction instance
-     * belongs to parent of the port's parent. If it is an output,
-     * the reaction instance belongs to the port's parent.
-     */
-    Set<ReactionInstance> dependsOnReactions = new LinkedHashSet<>();
-
-    /////////////////////////////////////////////
-    //// Special class for builtin triggers
-
-    /**
-     * This class allows to have BuiltinTriggers represented by a Variable type.
-     */
-    static public class BuiltinTriggerVariable extends VariableImpl {
-
-        /** The builtin trigger type represented by this variable. */
-        public final BuiltinTrigger type;
-
-        /** The actual TriggerRef definition in the AST. */
-        public final TriggerRef definition;
-
-        public BuiltinTriggerVariable(BuiltinTriggerRef trigger) {
-            this.type = trigger.getType();
-            this.definition = trigger;
-        }
-
-        @Override
-        public String getName() {
-            return this.type.name().toLowerCase();
-        }
-
-        @Override
-        public void setName(String newName) {
-            throw new UnsupportedOperationException(
-                    this.getClass().getName() + " has an immutable name.");
-        }
-    }
-}
diff --git a/org.lflang/src/org/lflang/validation/AttributeSpec.java b/org.lflang/src/org/lflang/validation/AttributeSpec.java
deleted file mode 100644
index 006e6c228c..0000000000
--- a/org.lflang/src/org/lflang/validation/AttributeSpec.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*************
- * Copyright (c) 2019-2022, The University of California at Berkeley.
-
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
-
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
-
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
-
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- ***************/
-
-package org.lflang.validation;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.lflang.ASTUtils;
-import org.lflang.lf.AttrParm;
-import org.lflang.lf.Attribute;
-import org.lflang.lf.LfPackage.Literals;
-import org.lflang.util.StringUtil;
-
-/**
- * Specification of the structure of an attribute annotation.
- * @author Clément Fournier
- * @author Shaokai Lin
- */
-public class AttributeSpec {
-
-    private final Map<String, AttrParamSpec> paramSpecByName;
-
-    public static final String VALUE_ATTR = "value";
-    public static final String NETWORK_MESSAGE_ACTIONS = "network_message_actions";
-    public static final String EACH_ATTR = "each";
-
-    /** A map from a string to a supported AttributeSpec */
-    public static final Map<String, AttributeSpec> ATTRIBUTE_SPECS_BY_NAME = new HashMap<>();
-
-    public AttributeSpec(List<AttrParamSpec> params) {
-        if (params != null) {
-            paramSpecByName = params.stream().collect(Collectors.toMap(it -> it.name, it -> it));
-        } else {
-            paramSpecByName = null;
-        }
-    }
-
-    /**
-     * Check that the attribute conforms to this spec and whether
-     * attr has the correct name.
-     */
-    public void check(LFValidator validator, Attribute attr) {
-        Set<String> seen;
-        // If there is just one parameter, it is required to be named "value".
-        if (attr.getAttrParms() != null
-                && attr.getAttrParms().size() == 1
-                && attr.getAttrParms().get(0).getName() == null) {
-            // If we are in this branch,
-            // then the user has provided @attr("value"),
-            // which is a shorthand for @attr(value="value").
-            if (paramSpecByName == null) {
-                validator.error("Attribute doesn't take a parameter.", Literals.ATTRIBUTE__ATTR_NAME);
-                return;
-            }
-            AttrParamSpec valueSpec = paramSpecByName.get(VALUE_ATTR);
-            if (valueSpec == null) {
-                validator.error("Attribute doesn't have a 'value' parameter.", Literals.ATTR_PARM__NAME);
-                return;
-            }
-
-            valueSpec.check(validator, attr.getAttrParms().get(0));
-            seen = Set.of(VALUE_ATTR);
-        } else {
-            // Process multiple parameters, each of which has to be named.
-            seen = processNamedAttrParms(validator, attr);
-        }
-
-        // Check if there are any missing parameters required by this attribute.
-        if (paramSpecByName != null) {
-            Map<String, AttrParamSpec> missingParams = new HashMap<>(paramSpecByName);
-            missingParams.keySet().removeAll(seen);
-            missingParams.forEach((name, paramSpec) -> {
-                if (!paramSpec.isOptional) {
-                    validator.error("Missing required attribute parameter '" + name + "'.", Literals.ATTRIBUTE__ATTR_PARMS);
-                }
-            });
-        }
-    }
-
-    /**
-     * Check whether the attribute parameters are named, whether
-     * these names are known, and whether the named parameters
-     * conform to the param spec (whether the param has the
-     * right type, etc.).
-     *
-     * @param validator The current validator in use.
-     * @param attr The attribute being checked.
-     * @return A set of named attribute parameters the user provides.
-     */
-    private Set<String> processNamedAttrParms(LFValidator validator, Attribute attr) {
-        Set<String> seen = new HashSet<>();
-        if (attr.getAttrParms() != null) {
-            for (AttrParm parm : attr.getAttrParms()) {
-                if (paramSpecByName == null) {
-                    validator.error("Attribute does not take parameters.", Literals.ATTRIBUTE__ATTR_NAME);
-                    break;
-                }
-                if (parm.getName() == null) {
-                    validator.error("Missing name for attribute parameter.", Literals.ATTRIBUTE__ATTR_NAME);
-                    continue;
-                }
-
-                AttrParamSpec parmSpec = paramSpecByName.get(parm.getName());
-                if (parmSpec == null) {
-                    validator.error("\"" + parm.getName() + "\"" + " is an unknown attribute parameter.",
-                                    Literals.ATTRIBUTE__ATTR_NAME);
-                    continue;
-                }
-                // Check whether a parameter conforms to its spec.
-                parmSpec.check(validator, parm);
-                seen.add(parm.getName());
-            }
-        }
-        return seen;
-    }
-
-    /**
-     * The specification of the attribute parameter.
-     *
-     * @param name The name of the attribute parameter
-     * @param type The type of the parameter
-     * @param isOptional True if the parameter is optional.
-     */
-    record AttrParamSpec(String name, AttrParamType type, boolean isOptional) {
-
-        // Check if a parameter has the right type.
-        // Currently, only String, Int, Boolean, Float, and target language are supported.
-        public void check(LFValidator validator, AttrParm parm) {
-            switch (type) {
-            case STRING -> {
-                if (!StringUtil.hasQuotes(parm.getValue())) {
-                    validator.error("Incorrect type: \"" + parm.getName() + "\""
-                            + " should have type String.",
-                        Literals.ATTRIBUTE__ATTR_NAME);
-                }
-            }
-            case INT -> {
-                if (!ASTUtils.isInteger(parm.getValue())) {
-                    validator.error(
-                        "Incorrect type: \"" + parm.getName() + "\""
-                            + " should have type Int.",
-                        Literals.ATTRIBUTE__ATTR_NAME);
-                }
-            }
-            case BOOLEAN -> {
-                if (!ASTUtils.isBoolean(parm.getValue())) {
-                    validator.error(
-                        "Incorrect type: \"" + parm.getName() + "\""
-                            + " should have type Boolean.",
-                        Literals.ATTRIBUTE__ATTR_NAME);
-                }
-            }
-            case FLOAT -> {
-                if (!ASTUtils.isFloat(parm.getValue())) {
-                    validator.error(
-                        "Incorrect type: \"" + parm.getName() + "\""
-                            + " should have type Float.",
-                        Literals.ATTRIBUTE__ATTR_NAME);
-                }
-            }
-            default -> throw new IllegalArgumentException("unexpected type");
-            }
-        }
-    }
-
-    /**
-     * The type of attribute parameters currently supported.
-     */
-    enum AttrParamType {
-        STRING,
-        INT,
-        BOOLEAN,
-        FLOAT,
-    }
-
-    /*
-     * The specs of the known annotations are declared here.
-     * Note: If an attribute only has one parameter, the parameter name should be "value."
-     */
-    static {
-        // @label("value")
-        ATTRIBUTE_SPECS_BY_NAME.put("label", new AttributeSpec(
-            List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))
-        ));
-        // @sparse
-        ATTRIBUTE_SPECS_BY_NAME.put("sparse", new AttributeSpec(null));
-        // @icon("value")
-        ATTRIBUTE_SPECS_BY_NAME.put("icon", new AttributeSpec(
-            List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))
-        ));
-        // @property(name="<property_name>", tactic="<induction|bmc>", spec="<SMTL_spec>")
-        // SMTL is the safety fragment of Metric Temporal Logic (MTL).
-        ATTRIBUTE_SPECS_BY_NAME.put("property", new AttributeSpec(
-            List.of(
-                new AttrParamSpec("name", AttrParamType.STRING, false),
-                new AttrParamSpec("tactic", AttrParamType.STRING, false),
-                new AttrParamSpec("spec", AttrParamType.STRING, false),
-                new AttrParamSpec("CT", AttrParamType.INT, true),
-                new AttrParamSpec("expect", AttrParamType.BOOLEAN, true)
-            )
-        ));
-        // @enclave(each=boolean)
-        ATTRIBUTE_SPECS_BY_NAME.put("enclave", new AttributeSpec(
-            List.of(new AttrParamSpec(EACH_ATTR, AttrParamType.BOOLEAN, true))
-        ));
-
-        // attributes that are used internally only by the federated code generation
-        ATTRIBUTE_SPECS_BY_NAME.put("_unordered", new AttributeSpec(null));
-        ATTRIBUTE_SPECS_BY_NAME.put("_fed_config", new AttributeSpec(
-            List.of(new AttrParamSpec(AttributeSpec.NETWORK_MESSAGE_ACTIONS,
-                                      AttrParamType.STRING, false))));
-        ATTRIBUTE_SPECS_BY_NAME.put("_c_body", new AttributeSpec(null));
-    }
-}

From 8b20b53f95ddc16b2f3891b9641ede8e6a1f272d Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 5 Jun 2023 01:15:45 +0800
Subject: [PATCH 0204/1114] Update gradle and relocate analyses and dsl folders

---
 build.gradle                                  |   11 -
 core/build.gradle                             |   36 +-
 .../analyses/cast/AbstractAstVisitor.java     |   17 +
 .../org/lflang/analyses/cast/AstUtils.java    |   77 +
 .../org/lflang/analyses/cast/AstVisitor.java  |   25 +
 .../cast/BuildAstParseTreeVisitor.java        |  691 +++++++
 .../java/org/lflang/analyses/cast/CAst.java   |  451 +++++
 .../org/lflang/analyses/cast/CAstVisitor.java |  132 ++
 .../lflang/analyses/cast/CBaseAstVisitor.java |  352 ++++
 .../lflang/analyses/cast/CToUclidVisitor.java |  432 ++++
 .../analyses/cast/IfNormalFormAstVisitor.java |   92 +
 .../cast/VariablePrecedenceVisitor.java       |   43 +
 .../org/lflang/analyses/cast/Visitable.java   |   12 +
 .../org/lflang/analyses/statespace/Event.java |   44 +
 .../analyses/statespace/EventQueue.java       |   18 +
 .../lflang/analyses/statespace/StateInfo.java |   24 +
 .../statespace/StateSpaceDiagram.java         |  217 ++
 .../statespace/StateSpaceExplorer.java        |  326 ++++
 .../analyses/statespace/StateSpaceNode.java   |   99 +
 .../org/lflang/analyses/statespace/Tag.java   |   63 +
 .../org/lflang/analyses/uclid/MTLVisitor.java |  659 +++++++
 .../lflang/analyses/uclid/UclidGenerator.java | 1737 +++++++++++++++++
 .../lflang/analyses/uclid/UclidRunner.java    |  236 +++
 core/src/main/java/org/lflang/dsl/antlr4/C.g4 |  908 +++++++++
 .../java/org/lflang/dsl/antlr4/MTLLexer.g4    |  117 ++
 .../java/org/lflang/dsl/antlr4/MTLParser.g4   |   82 +
 26 files changed, 6886 insertions(+), 15 deletions(-)
 create mode 100644 core/src/main/java/org/lflang/analyses/cast/AbstractAstVisitor.java
 create mode 100644 core/src/main/java/org/lflang/analyses/cast/AstUtils.java
 create mode 100644 core/src/main/java/org/lflang/analyses/cast/AstVisitor.java
 create mode 100644 core/src/main/java/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
 create mode 100644 core/src/main/java/org/lflang/analyses/cast/CAst.java
 create mode 100644 core/src/main/java/org/lflang/analyses/cast/CAstVisitor.java
 create mode 100644 core/src/main/java/org/lflang/analyses/cast/CBaseAstVisitor.java
 create mode 100644 core/src/main/java/org/lflang/analyses/cast/CToUclidVisitor.java
 create mode 100644 core/src/main/java/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
 create mode 100644 core/src/main/java/org/lflang/analyses/cast/VariablePrecedenceVisitor.java
 create mode 100644 core/src/main/java/org/lflang/analyses/cast/Visitable.java
 create mode 100644 core/src/main/java/org/lflang/analyses/statespace/Event.java
 create mode 100644 core/src/main/java/org/lflang/analyses/statespace/EventQueue.java
 create mode 100644 core/src/main/java/org/lflang/analyses/statespace/StateInfo.java
 create mode 100644 core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java
 create mode 100644 core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
 create mode 100644 core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java
 create mode 100644 core/src/main/java/org/lflang/analyses/statespace/Tag.java
 create mode 100644 core/src/main/java/org/lflang/analyses/uclid/MTLVisitor.java
 create mode 100644 core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
 create mode 100644 core/src/main/java/org/lflang/analyses/uclid/UclidRunner.java
 create mode 100644 core/src/main/java/org/lflang/dsl/antlr4/C.g4
 create mode 100644 core/src/main/java/org/lflang/dsl/antlr4/MTLLexer.g4
 create mode 100644 core/src/main/java/org/lflang/dsl/antlr4/MTLParser.g4

diff --git a/build.gradle b/build.gradle
index 33eb1ec553..a6aa3d6eef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,17 +6,6 @@ plugins {
     id 'idea'
 }
 
-// Antlr4
-configurations {
-    antlr4
-}
-
-dependencies {
-    antlr4 'org.antlr:antlr4:4.7.2'
-    implementation 'org.antlr:antlr4-runtime:4.7.2'
-    implementation 'org.json:json:20200518' // JSON
-}
-
 spotless {
     format 'misc', {
         target rootProject.fileTree(rootProject.rootDir) {
diff --git a/core/build.gradle b/core/build.gradle
index 59b91d3674..10dae91f90 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -24,6 +24,11 @@ sourceSets {
     }
 }
 
+// Antlr4
+configurations {
+    antlr4
+}
+
 dependencies {
     api "org.eclipse.xtext:org.eclipse.xtext:$xtextVersion"
     api "org.eclipse.xtext:org.eclipse.xtext.xbase.lib:$xtextVersion"
@@ -44,6 +49,10 @@ dependencies {
         exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
     }
 
+    antlr4 'org.antlr:antlr4:4.7.2'
+    implementation 'org.antlr:antlr4-runtime:4.7.2'
+    implementation 'org.json:json:20200518' // JSON
+
     testImplementation "org.junit.jupiter:junit-jupiter-api:$jupiterVersion"
     testImplementation "org.junit.jupiter:junit-jupiter-engine:$jupiterVersion"
     testImplementation "org.junit.platform:junit-platform-commons:$jUnitPlatformVersion"
@@ -79,12 +88,31 @@ tasks.register('generateXtextLanguage', JavaExec) {
     args += "rootPath=/${projectDir}/.."
 }
 
-compileJava.dependsOn(generateXtextLanguage)
-compileKotlin.dependsOn(generateXtextLanguage)
-processResources.dependsOn(generateXtextLanguage)
+// Add Antlr4 for various DSLs, including MTL for verification.
+tasks.register('runAntlr4', JavaExec) {
+   //see incremental task api, prevents rerun if nothing has changed.
+   inputs.dir "$projectDir/src/main/java/org/lflang/dsl/antlr4/"
+   outputs.dir "$projectDir/src/main/java/org/lflang/dsl/generated/antlr4/main/"
+
+   classpath = configurations.antlr4
+
+   main = "org.antlr.v4.Tool"
+
+   args = [ "-visitor",
+            "-o",  "$projectDir/src/main/java/org/lflang/dsl/generated/antlr4/main/",
+            "-package", "org.lflang.dsl",
+            "$projectDir/src/main/java/org/lflang/dsl/antlr4/MTLLexer.g4",
+            "$projectDir/src/main/java/org/lflang/dsl/antlr4/MTLParser.g4",
+            "$projectDir/src/main/java/org/lflang/dsl/antlr4/C.g4"]
+}
+
+compileJava.dependsOn(generateXtextLanguage, runAntlr4)
+compileKotlin.dependsOn(generateXtextLanguage, runAntlr4)
+processResources.dependsOn(generateXtextLanguage, runAntlr4)
 clean.dependsOn(cleanGenerateXtextLanguage)
 spotlessJava.mustRunAfter(generateXtextLanguage)
-rootProject.spotlessMisc.mustRunAfter(generateXtextLanguage)
+runAntlr4.mustRunAfter(spotlessJava)
+rootProject.spotlessMisc.mustRunAfter(generateXtextLanguage, runAntlr4)
 
 tasks.register('getSubmoduleVersions', Exec) {
     description('Run a Git command to get the current status of submodules')
diff --git a/core/src/main/java/org/lflang/analyses/cast/AbstractAstVisitor.java b/core/src/main/java/org/lflang/analyses/cast/AbstractAstVisitor.java
new file mode 100644
index 0000000000..c780a9c682
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/cast/AbstractAstVisitor.java
@@ -0,0 +1,17 @@
+package org.lflang.analyses.cast;
+
+import java.util.List;
+
+/** Modeled after AbstractParseTreeVisitor.class */
+public abstract class AbstractAstVisitor<T> implements AstVisitor<T> {
+
+  @Override
+  public T visit(CAst.AstNode tree) {
+    return tree.accept(this);
+  }
+
+  @Override
+  public T visit(CAst.AstNode tree, List<CAst.AstNode> nodeList) {
+    return tree.accept(this, nodeList);
+  }
+}
diff --git a/core/src/main/java/org/lflang/analyses/cast/AstUtils.java b/core/src/main/java/org/lflang/analyses/cast/AstUtils.java
new file mode 100644
index 0000000000..1b87562cb4
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/cast/AstUtils.java
@@ -0,0 +1,77 @@
+package org.lflang.analyses.cast;
+
+import java.util.List;
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.misc.Interval;
+
+public class AstUtils {
+
+  public static CAst.AstNode takeConjunction(List<CAst.AstNode> conditions) {
+    if (conditions.size() == 0) {
+      return new CAst.LiteralNode("true");
+    } else if (conditions.size() == 1) {
+      return conditions.get(0);
+    } else {
+      // Take the conjunction of all the conditions.
+      CAst.LogicalAndNode top = new CAst.LogicalAndNode();
+      CAst.LogicalAndNode cur = top;
+      for (int i = 0; i < conditions.size() - 1; i++) {
+        cur.left = conditions.get(i);
+        if (i == conditions.size() - 2) {
+          cur.right = conditions.get(i + 1);
+        } else {
+          cur.right = new CAst.LogicalAndNode();
+          cur = (CAst.LogicalAndNode) cur.right;
+        }
+      }
+      return top;
+    }
+  }
+
+  public static CAst.AstNode takeDisjunction(List<CAst.AstNode> conditions) {
+    if (conditions.size() == 0) {
+      return new CAst.LiteralNode("true");
+    } else if (conditions.size() == 1) {
+      return conditions.get(0);
+    } else {
+      // Take the conjunction of all the conditions.
+      CAst.LogicalOrNode top = new CAst.LogicalOrNode();
+      CAst.LogicalOrNode cur = top;
+      for (int i = 0; i < conditions.size() - 1; i++) {
+        cur.left = conditions.get(i);
+        if (i == conditions.size() - 2) {
+          cur.right = conditions.get(i + 1);
+        } else {
+          cur.right = new CAst.LogicalOrNode();
+          cur = (CAst.LogicalOrNode) cur.right;
+        }
+      }
+      return top;
+    }
+  }
+
+  // A handy function for debugging ASTs.
+  // It prints the stack trace of the visitor functions
+  // and shows the text matched by the ANTLR rules.
+  public static void printStackTraceAndMatchedText(ParserRuleContext ctx) {
+    System.out.println("========== AST DEBUG ==========");
+
+    // Print matched text
+    int a = ctx.start.getStartIndex();
+    int b = ctx.stop.getStopIndex();
+    Interval interval = new Interval(a, b);
+    String matchedText = ctx.start.getInputStream().getText(interval);
+    System.out.println("Matched text: " + matchedText);
+
+    // Print stack trace
+    StackTraceElement[] cause = Thread.currentThread().getStackTrace();
+    System.out.print("Stack trace: ");
+    for (int i = 0; i < cause.length; i++) {
+      System.out.print(cause[i].getMethodName());
+      if (i != cause.length - 1) System.out.print(", ");
+    }
+    System.out.println(".");
+
+    System.out.println("===============================");
+  }
+}
diff --git a/core/src/main/java/org/lflang/analyses/cast/AstVisitor.java b/core/src/main/java/org/lflang/analyses/cast/AstVisitor.java
new file mode 100644
index 0000000000..b19e5cbfc7
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/cast/AstVisitor.java
@@ -0,0 +1,25 @@
+package org.lflang.analyses.cast;
+
+import java.util.List;
+
+/** Modeled after ParseTreeVisitor.class */
+public interface AstVisitor<T> {
+
+  /**
+   * Visit an AST, and return a user-defined result of the operation.
+   *
+   * @param tree The {@link CAst.AstNode} to visit.
+   * @return The result of visiting the parse tree.
+   */
+  T visit(CAst.AstNode tree);
+
+  /**
+   * Visit an AST with a list of other AST nodes holding some information, and return a user-defined
+   * result of the operation.
+   *
+   * @param tree The {@link CAst.AstNode} to visit.
+   * @param nodeList A list of {@link CAst.AstNode} passed down the recursive call.
+   * @return The result of visiting the parse tree.
+   */
+  T visit(CAst.AstNode tree, List<CAst.AstNode> nodeList);
+}
diff --git a/core/src/main/java/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java b/core/src/main/java/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
new file mode 100644
index 0000000000..97e1bd40be
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
@@ -0,0 +1,691 @@
+package org.lflang.analyses.cast;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.lflang.dsl.CBaseVisitor;
+import org.lflang.dsl.CParser.*;
+
+public class BuildAstParseTreeVisitor extends CBaseVisitor<CAst.AstNode> {
+
+  @Override
+  public CAst.AstNode visitBlockItemList(BlockItemListContext ctx) {
+    CAst.StatementSequenceNode stmtSeq = new CAst.StatementSequenceNode();
+    // Populate the children.
+    for (BlockItemContext blockItem : ctx.blockItem()) {
+      stmtSeq.children.add(visit(blockItem));
+    }
+    return stmtSeq;
+  }
+
+  @Override
+  public CAst.AstNode visitBlockItem(BlockItemContext ctx) {
+    if (ctx.statement() != null) return visit(ctx.statement());
+    else return visit(ctx.declaration());
+  }
+
+  @Override
+  public CAst.AstNode visitDeclaration(DeclarationContext ctx) {
+    if (ctx.declarationSpecifiers() != null && ctx.initDeclaratorList() != null) {
+      //// Extract type from declarationSpecifiers.
+      List<DeclarationSpecifierContext> declSpecList =
+          ctx.declarationSpecifiers().declarationSpecifier();
+
+      // Cannot handle more than 1 specifiers, e.g. static const int.
+      // We can augment the analytical capability later.
+      if (declSpecList.size() > 1) {
+        System.out.println(
+            String.join(
+                " ",
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "the analyzer cannot handle more than 1 specifiers,",
+                "e.g. static const int.",
+                "Marking the declaration as opaque."));
+        return new CAst.OpaqueNode();
+      }
+
+      // Check if the declaration specifier is a type specifier: e.g. int or long.
+      DeclarationSpecifierContext declSpec = declSpecList.get(0);
+      if (declSpec.typeSpecifier() == null) {
+        System.out.println(
+            String.join(
+                " ",
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "only type specifiers are supported.",
+                "e.g. \"static const int\" is not analyzable.",
+                "Marking the declaration as opaque."));
+        return new CAst.OpaqueNode();
+      }
+
+      // Check if the type specifier is what we currently support.
+      // Right now we only support int, long, & double.
+      CAst.VariableNode.Type type;
+      ArrayList<String> supportedTypes =
+          new ArrayList<String>(Arrays.asList("int", "long", "double", "_Bool"));
+      if (declSpec.typeSpecifier().Int() != null
+          || declSpec.typeSpecifier().Long() != null
+          || declSpec.typeSpecifier().Double() != null) type = CAst.VariableNode.Type.INT;
+      else if (declSpec.typeSpecifier().Bool() != null) type = CAst.VariableNode.Type.BOOLEAN;
+      // Mark the declaration unanalyzable if the type is unsupported.
+      else {
+        System.out.println(
+            String.join(
+                " ",
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "unsupported type detected at " + declSpec.typeSpecifier(),
+                "Only " + supportedTypes + " are supported.",
+                "Marking the declaration as opaque."));
+        return new CAst.OpaqueNode();
+      }
+
+      //// Extract variable name and value from initDeclaratorList.
+      List<InitDeclaratorContext> initDeclList = ctx.initDeclaratorList().initDeclarator();
+
+      // Cannot handle more than 1 initDeclarator: e.g. x = 1, y = 2;
+      // We can augment the analytical capability later.
+      if (initDeclList.size() > 1) {
+        System.out.println(
+            String.join(
+                " ",
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "more than 1 declarators are detected on a single line,",
+                "e.g. \"int x = 1, y = 2;\" is not yet analyzable.",
+                "Marking the declaration as opaque."));
+        return new CAst.OpaqueNode();
+      }
+
+      // Get the variable name from the declarator.
+      DeclaratorContext decl = initDeclList.get(0).declarator();
+      if (decl.pointer() != null) {
+        System.out.println(
+            String.join(
+                " ",
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "pointers are currently not supported,",
+                "e.g. \"int *x;\" is not yet analyzable.",
+                "Marking the declaration as opaque."));
+        return new CAst.OpaqueNode();
+      }
+      if (decl.gccDeclaratorExtension().size() > 0) {
+        System.out.println(
+            String.join(
+                " ",
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "GCC declarator extensions are currently not supported,",
+                "e.g. \"__asm\" and \"__attribute__\" are not yet analyzable.",
+                "Marking the declaration as opaque."));
+        return new CAst.OpaqueNode();
+      }
+      DirectDeclaratorContext directDecl = decl.directDeclarator();
+      if (directDecl.Identifier() == null) {
+        System.out.println(
+            String.join(
+                " ",
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "the variable identifier is missing.",
+                "Marking the declaration as opaque."));
+        return new CAst.OpaqueNode();
+      }
+
+      // Extract the name of the variable.
+      String name = directDecl.Identifier().getText();
+      // Create a variable Ast node.
+      CAst.VariableNode variable = new CAst.VariableNode(type, name);
+
+      //// Convert the initializer to a value.
+
+      // Make sure that there is an initializer.
+      InitDeclaratorContext initDecl = initDeclList.get(0);
+      if (initDecl.initializer() == null) {
+        System.out.println(
+            String.join(
+                " ",
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "the initializer is missing,",
+                "e.g. \"int x;\" is not yet analyzable.",
+                "Marking the declaration as opaque."));
+        return new CAst.OpaqueNode();
+
+        // FIXME: Use UninitCAst.VariableNode to perform special encoding.
+        // return new UninitCAst.VariableNode(type, name);
+      }
+
+      // Extract the primaryExpression from the initializer.
+      if (initDecl.initializer().assignmentExpression() == null
+          || initDecl.initializer().assignmentExpression().conditionalExpression() == null) {
+        System.out.println(
+            String.join(
+                " ",
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "assignmentExpression or conditionalExpression is missing.",
+                "Marking the declaration as opaque."));
+        return new CAst.OpaqueNode();
+      }
+
+      // Finally return the assignment node.
+      CAst.AssignmentNode assignmentNode = new CAst.AssignmentNode();
+      CAst.AstNode initNode =
+          visitAssignmentExpression(initDecl.initializer().assignmentExpression());
+      assignmentNode.left = variable;
+      assignmentNode.right = initNode;
+      return assignmentNode;
+    }
+    // Return OpaqueNode as default.
+    return new CAst.OpaqueNode();
+  }
+
+  /**
+   * This visit function builds StatementSequenceNode, AssignmentNode, OpaqueNode, IfBlockNode,
+   * AdditionNode, SubtractionNode, MultiplicationNode, DivisionNode, EqualNode, NotEqualNode,
+   * LessThanNode, GreaterThanNode, LessEqualNode, GreaterEqualNode, SetPortNode,
+   * ScheduleActionNode.
+   *
+   * @param ctx
+   * @return
+   */
+  @Override
+  public CAst.AstNode visitStatement(StatementContext ctx) {
+    if (ctx.compoundStatement() != null) {
+      BlockItemListContext bilCtx = ctx.compoundStatement().blockItemList();
+      if (bilCtx != null) {
+        return visitBlockItemList(bilCtx);
+      }
+    } else if (ctx.expressionStatement() != null) {
+      ExpressionContext exprCtx = ctx.expressionStatement().expression();
+      if (exprCtx != null) {
+        return visitExpression(exprCtx);
+      }
+    } else if (ctx.selectionStatement() != null) {
+      return visitSelectionStatement(ctx.selectionStatement());
+    }
+    return new CAst.OpaqueNode();
+  }
+
+  @Override
+  public CAst.AstNode visitExpression(ExpressionContext ctx) {
+    if (ctx.assignmentExpression().size() == 1) {
+      return visitAssignmentExpression(ctx.assignmentExpression().get(0));
+    }
+    System.out.println(
+        String.join(
+            " ",
+            "Warning (line " + ctx.getStart().getLine() + "):",
+            "only one assignmentExpression in an expression is currently supported.",
+            "Marking the statement as opaque."));
+    return new CAst.OpaqueNode();
+  }
+
+  @Override
+  public CAst.AstNode visitPrimaryExpression(PrimaryExpressionContext ctx) {
+    if (ctx.Identifier() != null) {
+      return new CAst.VariableNode(ctx.Identifier().getText());
+    } else if (ctx.Constant() != null) {
+      return new CAst.LiteralNode(ctx.Constant().getText());
+    } else if (ctx.expression() != null) {
+      return visitExpression(ctx.expression());
+    }
+    System.out.println(
+        String.join(
+            " ",
+            "Warning (line " + ctx.getStart().getLine() + "):",
+            "only identifier, constant, and expressions are supported in a primary expression.",
+            "Marking the declaration as opaque."));
+    return new CAst.OpaqueNode();
+  }
+
+  // FIXME: More checks needed. This implementation currently silently omit
+  // certain cases, such as arr[1].
+  @Override
+  public CAst.AstNode visitPostfixExpression(PostfixExpressionContext ctx) {
+    if (ctx.PlusPlus().size() > 0
+        || ctx.MinusMinus().size() > 0
+        || ctx.Dot().size() > 0
+        || (ctx.LeftBracket().size() > 0 && ctx.RightBracket().size() > 0)) {
+      System.out.println(
+          String.join(
+              " ",
+              "Warning (line " + ctx.getStart().getLine() + "):",
+              "Postfix '++', '--', '.', '[]' are currently not supported.",
+              "Marking the statement as opaque."));
+      return new CAst.OpaqueNode();
+    }
+    // State variables on the self struct, ports and actions.
+    if (ctx.primaryExpression() != null
+        && ctx.Identifier().size() == 1
+        && ctx.Arrow().size() == 1) {
+      CAst.AstNode primaryExprNode = visitPrimaryExpression(ctx.primaryExpression());
+      if (primaryExprNode instanceof CAst.LiteralNode) {
+        // Unreachable.
+        System.out.println("Unreachable!");
+        return new CAst.OpaqueNode(); // FIXME: Throw an exception instead.
+      }
+      CAst.VariableNode varNode = (CAst.VariableNode) primaryExprNode;
+      if (varNode.name.equals("self")) {
+        // return a state variable node.
+        return new CAst.StateVarNode(ctx.Identifier().get(0).getText());
+      } else if (ctx.Identifier().get(0).getText().equals("value")) {
+        // return a trigger present node.
+        return new CAst.TriggerValueNode(varNode.name);
+      } else if (ctx.Identifier().get(0).getText().equals("is_present")) {
+        // return a trigger value node.
+        return new CAst.TriggerIsPresentNode(varNode.name);
+      } else {
+        // Generic pointer dereference, unanalyzable.
+        System.out.println(
+            String.join(
+                " ",
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "Generic pointer dereference is not supported in a postfix expression.",
+                "Marking the declaration as opaque."));
+        return new CAst.OpaqueNode();
+      }
+    }
+    // LF built-in function calls (set or schedule)
+    if (ctx.primaryExpression() != null
+        && ctx.argumentExpressionList().size() == 1
+        && ctx.LeftParen() != null
+        && ctx.RightParen() != null) {
+      CAst.AstNode primaryExprNode = visitPrimaryExpression(ctx.primaryExpression());
+      List<AssignmentExpressionContext> params =
+          ctx.argumentExpressionList().get(0).assignmentExpression();
+      if (primaryExprNode instanceof CAst.LiteralNode) {
+        // Unreachable.
+        System.out.println("Unreachable!");
+        return new CAst.OpaqueNode(); // FIXME: Throw an exception instead.
+      }
+      CAst.VariableNode varNode = (CAst.VariableNode) primaryExprNode;
+      if (varNode.name.equals("lf_set")) {
+        // return a set port node.
+        if (params.size() != 2) {
+          System.out.println(
+              String.join(
+                  " ",
+                  "Warning (line " + ctx.getStart().getLine() + "):",
+                  "lf_set must have 2 arguments. Detected " + ctx.argumentExpressionList().size(),
+                  "Marking the function call as opaque."));
+          return new CAst.OpaqueNode();
+        }
+        CAst.SetPortNode node = new CAst.SetPortNode();
+        node.left = visitAssignmentExpression(params.get(0));
+        node.right = visitAssignmentExpression(params.get(1));
+        return node;
+      } else if (varNode.name.equals("lf_schedule")) {
+        // return a set port node.
+        if (params.size() != 2) {
+          System.out.println(
+              String.join(
+                  " ",
+                  "Warning (line " + ctx.getStart().getLine() + "):",
+                  "lf_schedule must have two arguments. Detected "
+                      + ctx.argumentExpressionList().size(),
+                  "Marking the function call as opaque."));
+          return new CAst.OpaqueNode();
+        }
+        CAst.ScheduleActionNode node = new CAst.ScheduleActionNode();
+        for (AssignmentExpressionContext param : params) {
+          node.children.add(visitAssignmentExpression(param));
+        }
+        return node;
+      } else if (varNode.name.equals("lf_schedule_int")) {
+        // return a set port node.
+        if (params.size() != 3) {
+          System.out.println(
+              String.join(
+                  " ",
+                  "Warning (line " + ctx.getStart().getLine() + "):",
+                  "lf_schedule_int must have three arguments. Detected "
+                      + ctx.argumentExpressionList().size(),
+                  "Marking the function call as opaque."));
+          return new CAst.OpaqueNode();
+        }
+        CAst.ScheduleActionIntNode node = new CAst.ScheduleActionIntNode();
+        for (AssignmentExpressionContext param : params) {
+          node.children.add(visitAssignmentExpression(param));
+        }
+        return node;
+      } else {
+        // Generic pointer dereference, unanalyzable.
+        System.out.println(
+            String.join(
+                " ",
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "Generic pointer dereference and function calls are not supported in a postfix"
+                    + " expression.",
+                "Marking the declaration as opaque."));
+        return new CAst.OpaqueNode();
+      }
+    }
+    // Variable or literal
+    if (ctx.primaryExpression() != null) {
+      return visitPrimaryExpression(ctx.primaryExpression());
+    }
+    System.out.println(
+        String.join(
+            " ",
+            "Warning (line " + ctx.getStart().getLine() + "):",
+            "only an identifier, constant, state variable, port, and action are supported in a"
+                + " primary expression.",
+            "Marking the declaration as opaque."));
+    return new CAst.OpaqueNode();
+  }
+
+  @Override
+  public CAst.AstNode visitUnaryExpression(UnaryExpressionContext ctx) {
+    // Check for prefixes and mark them as opaque (unsupported for now).
+    if (ctx.PlusPlus().size() > 0 || ctx.MinusMinus().size() > 0 || ctx.Sizeof().size() > 0) {
+      System.out.println(
+          String.join(
+              " ",
+              "Warning (line " + ctx.getStart().getLine() + "):",
+              "Prefix '++', '--', and 'sizeof' are currently not supported.",
+              "Marking the statement as opaque."));
+      AstUtils.printStackTraceAndMatchedText(ctx);
+      return new CAst.OpaqueNode();
+    }
+    // Handle the postfixExpression rule
+    // (look up the grammar in C.g4 to get more details).
+    if (ctx.postfixExpression() != null) {
+      return visitPostfixExpression(ctx.postfixExpression());
+    }
+    // Handle the unary operators '!' (logical not)
+    // and '-' (negative).
+    if (ctx.unaryOperator() != null && ctx.castExpression() != null) {
+      CAst.AstNodeUnary node;
+      if (ctx.unaryOperator().Not() != null) {
+        // Handle the logical not expression.
+        node = new CAst.LogicalNotNode();
+        node.child = visitCastExpression(ctx.castExpression());
+        return node;
+      } else if (ctx.unaryOperator().Minus() != null) {
+        // Handle negative numbers.
+        // -5 will be translated as -1 * (5)
+        // which is a NegativeNode with a
+        // LiteralNode inside.
+        //
+        // FIXME: Need to perform precise error handling
+        // because we will go from a castExpression to
+        // a Constant under primaryExpression and anything
+        // else matching besides Constant could be problematic.
+        // For example, we cannot have a NegativeNode with
+        // a StringLiteralNode inside. This can be caught by
+        // the GCC, but if compilation is not involved, it
+        // would be useful to catch it here ourselves.
+        node = new CAst.NegativeNode();
+        node.child = visitCastExpression(ctx.castExpression());
+        return node;
+      }
+    }
+
+    // Mark all the remaining cases as opaque.
+    System.out.println(
+        String.join(
+            " ",
+            "Warning (line " + ctx.getStart().getLine() + "):",
+            "only postfixExpression and '!' in a unaryExpression is currently supported.",
+            "Marking the statement as opaque."));
+    AstUtils.printStackTraceAndMatchedText(ctx);
+    return new CAst.OpaqueNode();
+  }
+
+  @Override
+  public CAst.AstNode visitCastExpression(CastExpressionContext ctx) {
+    if (ctx.unaryExpression() != null) {
+      return visitUnaryExpression(ctx.unaryExpression());
+    }
+    System.out.println(
+        String.join(
+            " ",
+            "Warning (line " + ctx.getStart().getLine() + "):",
+            "only unaryExpression in a castExpression is currently supported.",
+            "Marking the statement as opaque."));
+    return new CAst.OpaqueNode();
+  }
+
+  @Override
+  public CAst.AstNode visitMultiplicativeExpression(MultiplicativeExpressionContext ctx) {
+    if (ctx.castExpression().size() > 1) {
+      CAst.AstNodeBinary node;
+      if (ctx.Star().size() > 0) {
+        node = new CAst.MultiplicationNode();
+      } else if (ctx.Div().size() > 0) {
+        node = new CAst.DivisionNode();
+      } else if (ctx.Mod().size() > 0) {
+        System.out.println(
+            String.join(
+                " ",
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "Mod expression '%' is currently unsupported.",
+                "Marking the expression as opaque."));
+        return new CAst.OpaqueNode();
+      } else {
+        node = new CAst.AstNodeBinary();
+      }
+      node.left = visitCastExpression(ctx.castExpression().get(0));
+      node.right = visitCastExpression(ctx.castExpression().get(1));
+      return node;
+    }
+    return visitCastExpression(ctx.castExpression().get(0));
+  }
+
+  @Override
+  public CAst.AstNode visitAdditiveExpression(AdditiveExpressionContext ctx) {
+    if (ctx.multiplicativeExpression().size() > 1) {
+      CAst.AstNodeBinary node;
+      if (ctx.Plus().size() > 0) {
+        node = new CAst.AdditionNode();
+      } else if (ctx.Minus().size() > 0) {
+        node = new CAst.SubtractionNode();
+      } else {
+        node = new CAst.AstNodeBinary();
+      }
+      node.left = visitMultiplicativeExpression(ctx.multiplicativeExpression().get(0));
+      node.right = visitMultiplicativeExpression(ctx.multiplicativeExpression().get(1));
+      return node;
+    }
+    return visitMultiplicativeExpression(ctx.multiplicativeExpression().get(0));
+  }
+
+  @Override
+  public CAst.AstNode visitShiftExpression(ShiftExpressionContext ctx) {
+    if (ctx.additiveExpression().size() > 1) {
+      System.out.println(
+          String.join(
+              " ",
+              "Warning (line " + ctx.getStart().getLine() + "):",
+              "Shift expression '<<' or '>>' is currently unsupported.",
+              "Marking the expression as opaque."));
+      return new CAst.OpaqueNode();
+    }
+    return visitAdditiveExpression(ctx.additiveExpression().get(0));
+  }
+
+  @Override
+  public CAst.AstNode visitRelationalExpression(RelationalExpressionContext ctx) {
+    if (ctx.shiftExpression().size() > 1) {
+      CAst.AstNodeBinary node;
+      if (ctx.Less().size() > 0) {
+        node = new CAst.LessThanNode();
+      } else if (ctx.LessEqual().size() > 0) {
+        node = new CAst.LessEqualNode();
+      } else if (ctx.Greater().size() > 0) {
+        node = new CAst.GreaterThanNode();
+      } else if (ctx.GreaterEqual().size() > 0) {
+        node = new CAst.GreaterEqualNode();
+      } else {
+        node = new CAst.AstNodeBinary();
+      }
+      node.left = visitShiftExpression(ctx.shiftExpression().get(0));
+      node.right = visitShiftExpression(ctx.shiftExpression().get(1));
+      return node;
+    }
+    return visitShiftExpression(ctx.shiftExpression().get(0));
+  }
+
+  @Override
+  public CAst.AstNode visitEqualityExpression(EqualityExpressionContext ctx) {
+    if (ctx.relationalExpression().size() > 1) {
+      CAst.AstNodeBinary node;
+      if (ctx.Equal().size() > 0) {
+        node = new CAst.EqualNode();
+      } else if (ctx.NotEqual().size() > 0) {
+        node = new CAst.NotEqualNode();
+      } else {
+        node = new CAst.AstNodeBinary();
+      }
+      node.left = visitRelationalExpression(ctx.relationalExpression().get(0));
+      node.right = visitRelationalExpression(ctx.relationalExpression().get(1));
+      return node;
+    }
+    return visitRelationalExpression(ctx.relationalExpression().get(0));
+  }
+
+  @Override
+  public CAst.AstNode visitAndExpression(AndExpressionContext ctx) {
+    if (ctx.equalityExpression().size() > 1) {
+      System.out.println(
+          String.join(
+              " ",
+              "Warning (line " + ctx.getStart().getLine() + "):",
+              "And expression '&' is currently unsupported.",
+              "Marking the expression as opaque."));
+      return new CAst.OpaqueNode();
+    }
+    return visitEqualityExpression(ctx.equalityExpression().get(0));
+  }
+
+  @Override
+  public CAst.AstNode visitExclusiveOrExpression(ExclusiveOrExpressionContext ctx) {
+    if (ctx.andExpression().size() > 1) {
+      System.out.println(
+          String.join(
+              " ",
+              "Warning (line " + ctx.getStart().getLine() + "):",
+              "Exclusive Or '^' is currently unsupported.",
+              "Marking the expression as opaque."));
+      return new CAst.OpaqueNode();
+    }
+    return visitAndExpression(ctx.andExpression().get(0));
+  }
+
+  @Override
+  public CAst.AstNode visitInclusiveOrExpression(InclusiveOrExpressionContext ctx) {
+    if (ctx.exclusiveOrExpression().size() > 1) {
+      System.out.println(
+          String.join(
+              " ",
+              "Warning (line " + ctx.getStart().getLine() + "):",
+              "Inclusive Or '|' is currently unsupported.",
+              "Marking the expression as opaque."));
+      return new CAst.OpaqueNode();
+    }
+    return visitExclusiveOrExpression(ctx.exclusiveOrExpression().get(0));
+  }
+
+  @Override
+  public CAst.AstNode visitLogicalAndExpression(LogicalAndExpressionContext ctx) {
+    if (ctx.inclusiveOrExpression().size() > 1) {
+      CAst.LogicalAndNode node = new CAst.LogicalAndNode();
+      node.left = visitInclusiveOrExpression(ctx.inclusiveOrExpression().get(0));
+      node.right = visitInclusiveOrExpression(ctx.inclusiveOrExpression().get(1));
+      return node;
+    }
+    return visitInclusiveOrExpression(ctx.inclusiveOrExpression().get(0));
+  }
+
+  @Override
+  public CAst.AstNode visitLogicalOrExpression(LogicalOrExpressionContext ctx) {
+    if (ctx.logicalAndExpression().size() > 1) {
+      CAst.LogicalOrNode node = new CAst.LogicalOrNode();
+      node.left = visitLogicalAndExpression(ctx.logicalAndExpression().get(0));
+      node.right = visitLogicalAndExpression(ctx.logicalAndExpression().get(1));
+      return node;
+    }
+    return visitLogicalAndExpression(ctx.logicalAndExpression().get(0));
+  }
+
+  @Override
+  public CAst.AstNode visitConditionalExpression(ConditionalExpressionContext ctx) {
+    if (ctx.expression() != null) {
+      System.out.println(
+          String.join(
+              " ",
+              "Warning (line " + ctx.getStart().getLine() + "):",
+              "Currently do not support inline conditional expression.",
+              "Marking the expression as opaque."));
+      return new CAst.OpaqueNode();
+    }
+    return visitLogicalOrExpression(ctx.logicalOrExpression());
+  }
+
+  @Override
+  public CAst.AstNode visitAssignmentExpression(AssignmentExpressionContext ctx) {
+    if (ctx.conditionalExpression() != null) {
+      return visitConditionalExpression(ctx.conditionalExpression());
+    }
+    if (ctx.unaryExpression() != null && ctx.assignmentExpression() != null) {
+      CAst.AstNodeBinary assignmentNode = new CAst.AssignmentNode();
+      assignmentNode.left = visitUnaryExpression(ctx.unaryExpression());
+      if (ctx.assignmentOperator().getText().equals("=")) {
+        assignmentNode.right = visitAssignmentExpression(ctx.assignmentExpression());
+      } else if (ctx.assignmentOperator().getText().equals("+=")) {
+        CAst.AdditionNode subnode = new CAst.AdditionNode();
+        subnode.left = visitUnaryExpression(ctx.unaryExpression());
+        subnode.right = visitAssignmentExpression(ctx.assignmentExpression());
+        assignmentNode.right = subnode;
+      } else if (ctx.assignmentOperator().getText().equals("-=")) {
+        CAst.SubtractionNode subnode = new CAst.SubtractionNode();
+        subnode.left = visitUnaryExpression(ctx.unaryExpression());
+        subnode.right = visitAssignmentExpression(ctx.assignmentExpression());
+        assignmentNode.right = subnode;
+      } else if (ctx.assignmentOperator().getText().equals("*=")) {
+        CAst.MultiplicationNode subnode = new CAst.MultiplicationNode();
+        subnode.left = visitUnaryExpression(ctx.unaryExpression());
+        subnode.right = visitAssignmentExpression(ctx.assignmentExpression());
+        assignmentNode.right = subnode;
+      } else if (ctx.assignmentOperator().getText().equals("/=")) {
+        CAst.DivisionNode subnode = new CAst.DivisionNode();
+        subnode.left = visitUnaryExpression(ctx.unaryExpression());
+        subnode.right = visitAssignmentExpression(ctx.assignmentExpression());
+        assignmentNode.right = subnode;
+      } else {
+        System.out.println(
+            String.join(
+                " ",
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "Only '=', '+=', '-=', '*=', '/=' assignment operators are supported.",
+                "Marking the expression as opaque."));
+        return new CAst.OpaqueNode();
+      }
+      return assignmentNode;
+    }
+    System.out.println(
+        String.join(
+            " ",
+            "Warning (line " + ctx.getStart().getLine() + "):",
+            "DigitSequence in an assignmentExpression is currently not supported.",
+            "Marking the expression as opaque."));
+    return new CAst.OpaqueNode();
+  }
+
+  @Override
+  public CAst.AstNode visitSelectionStatement(SelectionStatementContext ctx) {
+    if (ctx.Switch() != null) {
+      System.out.println(
+          String.join(
+              " ",
+              "Warning (line " + ctx.getStart().getLine() + "):",
+              "Switch case statement is currently not supported.",
+              "Marking the expression as opaque."));
+      return new CAst.OpaqueNode();
+    }
+    CAst.IfBlockNode ifBlockNode = new CAst.IfBlockNode();
+    CAst.IfBodyNode ifBodyNode = new CAst.IfBodyNode();
+    ifBlockNode.left = visitExpression(ctx.expression());
+    ifBlockNode.right = ifBodyNode;
+    ifBodyNode.left = visitStatement(ctx.statement().get(0));
+    if (ctx.statement().size() > 1) {
+      ifBodyNode.right = visitStatement(ctx.statement().get(1));
+    }
+    return ifBlockNode;
+  }
+}
diff --git a/core/src/main/java/org/lflang/analyses/cast/CAst.java b/core/src/main/java/org/lflang/analyses/cast/CAst.java
new file mode 100644
index 0000000000..ea04d45426
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/cast/CAst.java
@@ -0,0 +1,451 @@
+package org.lflang.analyses.cast;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CAst {
+
+  public static class AstNode implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitAstNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitAstNode(this, nodeList);
+    }
+  }
+
+  public static class AstNodeUnary extends AstNode implements Visitable {
+    public AstNode child;
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitAstNodeUnary(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitAstNodeUnary(this, nodeList);
+    }
+  }
+
+  public static class AstNodeBinary extends AstNode implements Visitable {
+    public AstNode left;
+    public AstNode right;
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitAstNodeBinary(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitAstNodeBinary(this, nodeList);
+    }
+  }
+
+  public static class AstNodeDynamic extends AstNode implements Visitable {
+    public ArrayList<AstNode> children = new ArrayList<>();
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitAstNodeDynamic(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitAstNodeDynamic(this, nodeList);
+    }
+  }
+
+  public static class AssignmentNode extends AstNodeBinary implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitAssignmentNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitAssignmentNode(this, nodeList);
+    }
+  }
+
+  /** AST node for an IF block. The left node is the condition. The right node is the IF body. */
+  public static class IfBlockNode extends AstNodeBinary implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitIfBlockNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitIfBlockNode(this, nodeList);
+    }
+  }
+
+  /**
+   * AST node for the body of an IF block. The left node is the THEN branch. The right node is the
+   * ELSE branch.
+   */
+  public static class IfBodyNode extends AstNodeBinary implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitIfBodyNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitIfBodyNode(this, nodeList);
+    }
+  }
+
+  public static class LiteralNode extends AstNode implements Visitable {
+    public String literal;
+
+    public LiteralNode(String literal) {
+      super();
+      this.literal = literal;
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitLiteralNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitLiteralNode(this, nodeList);
+    }
+  }
+
+  public static class LogicalNotNode extends AstNodeUnary implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitLogicalNotNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitLogicalNotNode(this, nodeList);
+    }
+  }
+
+  public static class LogicalAndNode extends AstNodeBinary implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitLogicalAndNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitLogicalAndNode(this, nodeList);
+    }
+  }
+
+  public static class LogicalOrNode extends AstNodeBinary implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitLogicalOrNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitLogicalOrNode(this, nodeList);
+    }
+  }
+
+  /** An Ast node that indicates the code represented by this node is unanalyzable. */
+  public static class OpaqueNode extends AstNode implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitOpaqueNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitOpaqueNode(this, nodeList);
+    }
+  }
+
+  public static class StatementSequenceNode extends AstNodeDynamic implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitStatementSequenceNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitStatementSequenceNode(this, nodeList);
+    }
+  }
+
+  public static class VariableNode extends AstNode implements Visitable {
+    public enum Type {
+      UNKNOWN,
+      INT,
+      BOOLEAN
+    }
+
+    public Type type;
+    public String name;
+
+    public VariableNode(String name) {
+      super();
+      this.type = Type.UNKNOWN;
+      this.name = name;
+    }
+
+    public VariableNode(Type type, String name) {
+      super();
+      this.type = type;
+      this.name = name;
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitVariableNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitVariableNode(this, nodeList);
+    }
+  }
+
+  /** Arithmetic operations */
+  public static class AdditionNode extends AstNodeBinary implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitAdditionNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitAdditionNode(this, nodeList);
+    }
+  }
+
+  public static class SubtractionNode extends AstNodeBinary implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitSubtractionNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitSubtractionNode(this, nodeList);
+    }
+  }
+
+  public static class MultiplicationNode extends AstNodeBinary implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitMultiplicationNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitMultiplicationNode(this, nodeList);
+    }
+  }
+
+  public static class DivisionNode extends AstNodeBinary implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitDivisionNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitDivisionNode(this, nodeList);
+    }
+  }
+
+  /** Comparison operators */
+  public static class EqualNode extends AstNodeBinary implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitEqualNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitEqualNode(this, nodeList);
+    }
+  }
+
+  public static class NotEqualNode extends AstNodeBinary implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitNotEqualNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitNotEqualNode(this, nodeList);
+    }
+  }
+
+  public static class NegativeNode extends AstNodeUnary implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitNegativeNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitNegativeNode(this, nodeList);
+    }
+  }
+
+  public static class LessThanNode extends AstNodeBinary implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitLessThanNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitLessThanNode(this, nodeList);
+    }
+  }
+
+  public static class LessEqualNode extends AstNodeBinary implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitLessEqualNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitLessEqualNode(this, nodeList);
+    }
+  }
+
+  public static class GreaterThanNode extends AstNodeBinary implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitGreaterThanNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitGreaterThanNode(this, nodeList);
+    }
+  }
+
+  public static class GreaterEqualNode extends AstNodeBinary implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitGreaterEqualNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitGreaterEqualNode(this, nodeList);
+    }
+  }
+
+  /** LF built-in operations */
+  /**
+   * AST node for an lf_set call. The left child is the port being set. The right node is the value
+   * of the port.
+   */
+  public static class SetPortNode extends AstNodeBinary implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitSetPortNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitSetPortNode(this, nodeList);
+    }
+  }
+
+  /** AST node for a `lf_schedule(action, additional_delay)` call. */
+  public static class ScheduleActionNode extends AstNodeDynamic implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitScheduleActionNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitScheduleActionNode(this, nodeList);
+    }
+  }
+
+  /** AST node for a `lf_schedule_int(action, additional_delay, integer)` call. */
+  public static class ScheduleActionIntNode extends AstNodeDynamic implements Visitable {
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitScheduleActionIntNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitScheduleActionIntNode(this, nodeList);
+    }
+  }
+
+  /** Handle state variables appearing as self-><name> */
+  public static class StateVarNode extends AstNode implements Visitable {
+    public String name;
+    public boolean prev = false; // By default, this is not a previous state.
+
+    public StateVarNode(String name) {
+      this.name = name;
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitStateVarNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitStateVarNode(this, nodeList);
+    }
+  }
+
+  /** Handle trigger values appearing as <name>->value */
+  public static class TriggerValueNode extends AstNode implements Visitable {
+    public String name;
+
+    public TriggerValueNode(String name) {
+      this.name = name;
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitTriggerValueNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitTriggerValueNode(this, nodeList);
+    }
+  }
+
+  /** Handle trigger presence appearing as <name>->is_present */
+  public static class TriggerIsPresentNode extends AstNode implements Visitable {
+    public String name;
+
+    public TriggerIsPresentNode(String name) {
+      this.name = name;
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor) {
+      return ((CAstVisitor<? extends T>) visitor).visitTriggerIsPresentNode(this);
+    }
+
+    @Override
+    public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
+      return ((CAstVisitor<? extends T>) visitor).visitTriggerIsPresentNode(this, nodeList);
+    }
+  }
+}
diff --git a/core/src/main/java/org/lflang/analyses/cast/CAstVisitor.java b/core/src/main/java/org/lflang/analyses/cast/CAstVisitor.java
new file mode 100644
index 0000000000..034a93449c
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/cast/CAstVisitor.java
@@ -0,0 +1,132 @@
+package org.lflang.analyses.cast;
+
+import java.util.List;
+
+/** Modeled after CVisitor.java */
+public interface CAstVisitor<T> extends AstVisitor<T> {
+
+  T visitAstNode(CAst.AstNode node);
+
+  T visitAstNodeUnary(CAst.AstNodeUnary node);
+
+  T visitAstNodeBinary(CAst.AstNodeBinary node);
+
+  T visitAstNodeDynamic(CAst.AstNodeDynamic node);
+
+  T visitAssignmentNode(CAst.AssignmentNode node);
+
+  T visitIfBlockNode(CAst.IfBlockNode node);
+
+  T visitIfBodyNode(CAst.IfBodyNode node);
+
+  T visitLiteralNode(CAst.LiteralNode node);
+
+  T visitLogicalNotNode(CAst.LogicalNotNode node);
+
+  T visitLogicalAndNode(CAst.LogicalAndNode node);
+
+  T visitLogicalOrNode(CAst.LogicalOrNode node);
+
+  T visitOpaqueNode(CAst.OpaqueNode node);
+
+  T visitStatementSequenceNode(CAst.StatementSequenceNode node);
+
+  T visitVariableNode(CAst.VariableNode node);
+
+  T visitAdditionNode(CAst.AdditionNode node);
+
+  T visitSubtractionNode(CAst.SubtractionNode node);
+
+  T visitMultiplicationNode(CAst.MultiplicationNode node);
+
+  T visitDivisionNode(CAst.DivisionNode node);
+
+  T visitEqualNode(CAst.EqualNode node);
+
+  T visitNotEqualNode(CAst.NotEqualNode node);
+
+  T visitNegativeNode(CAst.NegativeNode node);
+
+  T visitLessThanNode(CAst.LessThanNode node);
+
+  T visitLessEqualNode(CAst.LessEqualNode node);
+
+  T visitGreaterThanNode(CAst.GreaterThanNode node);
+
+  T visitGreaterEqualNode(CAst.GreaterEqualNode node);
+
+  T visitSetPortNode(CAst.SetPortNode node);
+
+  T visitScheduleActionNode(CAst.ScheduleActionNode node);
+
+  T visitScheduleActionIntNode(CAst.ScheduleActionIntNode node);
+
+  T visitStateVarNode(CAst.StateVarNode node);
+
+  T visitTriggerValueNode(CAst.TriggerValueNode node);
+
+  T visitTriggerIsPresentNode(CAst.TriggerIsPresentNode node);
+
+  /** Used for converting an AST into If Normal Form. */
+  T visitAstNode(CAst.AstNode node, List<CAst.AstNode> nodeList);
+
+  T visitAstNodeUnary(CAst.AstNodeUnary node, List<CAst.AstNode> nodeList);
+
+  T visitAstNodeBinary(CAst.AstNodeBinary node, List<CAst.AstNode> nodeList);
+
+  T visitAstNodeDynamic(CAst.AstNodeDynamic node, List<CAst.AstNode> nodeList);
+
+  T visitAssignmentNode(CAst.AssignmentNode node, List<CAst.AstNode> nodeList);
+
+  T visitIfBlockNode(CAst.IfBlockNode node, List<CAst.AstNode> nodeList);
+
+  T visitIfBodyNode(CAst.IfBodyNode node, List<CAst.AstNode> nodeList);
+
+  T visitLiteralNode(CAst.LiteralNode node, List<CAst.AstNode> nodeList);
+
+  T visitLogicalNotNode(CAst.LogicalNotNode node, List<CAst.AstNode> nodeList);
+
+  T visitLogicalAndNode(CAst.LogicalAndNode node, List<CAst.AstNode> nodeList);
+
+  T visitLogicalOrNode(CAst.LogicalOrNode node, List<CAst.AstNode> nodeList);
+
+  T visitOpaqueNode(CAst.OpaqueNode node, List<CAst.AstNode> nodeList);
+
+  T visitStatementSequenceNode(CAst.StatementSequenceNode node, List<CAst.AstNode> nodeList);
+
+  T visitVariableNode(CAst.VariableNode node, List<CAst.AstNode> nodeList);
+
+  T visitAdditionNode(CAst.AdditionNode node, List<CAst.AstNode> nodeList);
+
+  T visitSubtractionNode(CAst.SubtractionNode node, List<CAst.AstNode> nodeList);
+
+  T visitMultiplicationNode(CAst.MultiplicationNode node, List<CAst.AstNode> nodeList);
+
+  T visitDivisionNode(CAst.DivisionNode node, List<CAst.AstNode> nodeList);
+
+  T visitEqualNode(CAst.EqualNode node, List<CAst.AstNode> nodeList);
+
+  T visitNotEqualNode(CAst.NotEqualNode node, List<CAst.AstNode> nodeList);
+
+  T visitNegativeNode(CAst.NegativeNode node, List<CAst.AstNode> nodeList);
+
+  T visitLessThanNode(CAst.LessThanNode node, List<CAst.AstNode> nodeList);
+
+  T visitLessEqualNode(CAst.LessEqualNode node, List<CAst.AstNode> nodeList);
+
+  T visitGreaterThanNode(CAst.GreaterThanNode node, List<CAst.AstNode> nodeList);
+
+  T visitGreaterEqualNode(CAst.GreaterEqualNode node, List<CAst.AstNode> nodeList);
+
+  T visitSetPortNode(CAst.SetPortNode node, List<CAst.AstNode> nodeList);
+
+  T visitScheduleActionNode(CAst.ScheduleActionNode node, List<CAst.AstNode> nodeList);
+
+  T visitScheduleActionIntNode(CAst.ScheduleActionIntNode node, List<CAst.AstNode> nodeList);
+
+  T visitStateVarNode(CAst.StateVarNode node, List<CAst.AstNode> nodeList);
+
+  T visitTriggerValueNode(CAst.TriggerValueNode node, List<CAst.AstNode> nodeList);
+
+  T visitTriggerIsPresentNode(CAst.TriggerIsPresentNode node, List<CAst.AstNode> nodeList);
+}
diff --git a/core/src/main/java/org/lflang/analyses/cast/CBaseAstVisitor.java b/core/src/main/java/org/lflang/analyses/cast/CBaseAstVisitor.java
new file mode 100644
index 0000000000..ce212c53a7
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/cast/CBaseAstVisitor.java
@@ -0,0 +1,352 @@
+package org.lflang.analyses.cast;
+
+import java.util.List;
+
+/**
+ * A base class that provides default implementations of the visit functions. Other C AST visitors
+ * extend this class.
+ */
+public class CBaseAstVisitor<T> extends AbstractAstVisitor<T> implements CAstVisitor<T> {
+
+  /**
+   * These default implementations are not meant to be used. They should be overriden by the child
+   * class. In theory, this base visitor can be deleted? Let's keep it here for now for consistency.
+   */
+  @Override
+  public T visitAstNode(CAst.AstNode node) {
+    return null;
+  }
+
+  @Override
+  public T visitAstNodeUnary(CAst.AstNodeUnary node) {
+    if (node.child != null) {
+      T result = visit(node.child);
+    } else {
+      System.out.println("*** Child is empty in " + node + "!");
+    }
+    return null;
+  }
+
+  @Override
+  public T visitAstNodeBinary(CAst.AstNodeBinary node) {
+    if (node.left != null) {
+      T leftResult = visit(node.left);
+    } else {
+      System.out.println("*** Left child is empty in " + node + "!");
+    }
+    if (node.right != null) {
+      T rightResult = visit(node.right);
+    } else {
+      System.out.println("*** Right child is empty in " + node + "!");
+    }
+    // Aggregate results...
+    return null;
+  }
+
+  @Override
+  public T visitAstNodeDynamic(CAst.AstNodeDynamic node) {
+    for (CAst.AstNode n : node.children) {
+      T result = visit(n);
+    }
+    return null;
+  }
+
+  @Override
+  public T visitAssignmentNode(CAst.AssignmentNode node) {
+    return visitAstNodeBinary(node);
+  }
+
+  @Override
+  public T visitIfBlockNode(CAst.IfBlockNode node) {
+    return visitAstNodeBinary(node);
+  }
+
+  @Override
+  public T visitIfBodyNode(CAst.IfBodyNode node) {
+    return visitAstNodeBinary(node);
+  }
+
+  @Override
+  public T visitLiteralNode(CAst.LiteralNode node) {
+    return null;
+  }
+
+  @Override
+  public T visitLogicalNotNode(CAst.LogicalNotNode node) {
+    return visitAstNodeUnary(node);
+  }
+
+  @Override
+  public T visitLogicalAndNode(CAst.LogicalAndNode node) {
+    return visitAstNodeBinary(node);
+  }
+
+  @Override
+  public T visitLogicalOrNode(CAst.LogicalOrNode node) {
+    return visitAstNodeBinary(node);
+  }
+
+  @Override
+  public T visitOpaqueNode(CAst.OpaqueNode node) {
+    return visitAstNode(node);
+  }
+
+  @Override
+  public T visitStatementSequenceNode(CAst.StatementSequenceNode node) {
+    return visitAstNodeDynamic(node);
+  }
+
+  @Override
+  public T visitVariableNode(CAst.VariableNode node) {
+    return null;
+  }
+
+  /** Arithmetic operators */
+  @Override
+  public T visitAdditionNode(CAst.AdditionNode node) {
+    return visitAstNodeBinary(node);
+  }
+
+  @Override
+  public T visitSubtractionNode(CAst.SubtractionNode node) {
+    return visitAstNodeBinary(node);
+  }
+
+  @Override
+  public T visitMultiplicationNode(CAst.MultiplicationNode node) {
+    return visitAstNodeBinary(node);
+  }
+
+  @Override
+  public T visitDivisionNode(CAst.DivisionNode node) {
+    return visitAstNodeBinary(node);
+  }
+
+  /** Comparison operators */
+  @Override
+  public T visitEqualNode(CAst.EqualNode node) {
+    return visitAstNodeBinary(node);
+  }
+
+  @Override
+  public T visitNotEqualNode(CAst.NotEqualNode node) {
+    return visitAstNodeBinary(node);
+  }
+
+  @Override
+  public T visitNegativeNode(CAst.NegativeNode node) {
+    return visitNegativeNode(node);
+  }
+
+  @Override
+  public T visitLessThanNode(CAst.LessThanNode node) {
+    return visitAstNodeBinary(node);
+  }
+
+  @Override
+  public T visitLessEqualNode(CAst.LessEqualNode node) {
+    return visitAstNodeBinary(node);
+  }
+
+  @Override
+  public T visitGreaterThanNode(CAst.GreaterThanNode node) {
+    return visitAstNodeBinary(node);
+  }
+
+  @Override
+  public T visitGreaterEqualNode(CAst.GreaterEqualNode node) {
+    return visitAstNodeBinary(node);
+  }
+
+  /** LF built-in operations */
+  @Override
+  public T visitSetPortNode(CAst.SetPortNode node) {
+    return visitAstNodeBinary(node);
+  }
+
+  @Override
+  public T visitScheduleActionNode(CAst.ScheduleActionNode node) {
+    return visitAstNodeDynamic(node);
+  }
+
+  @Override
+  public T visitScheduleActionIntNode(CAst.ScheduleActionIntNode node) {
+    return visitAstNodeDynamic(node);
+  }
+
+  @Override
+  public T visitStateVarNode(CAst.StateVarNode node) {
+    return null;
+  }
+
+  @Override
+  public T visitTriggerValueNode(CAst.TriggerValueNode node) {
+    return null;
+  }
+
+  @Override
+  public T visitTriggerIsPresentNode(CAst.TriggerIsPresentNode node) {
+    return null;
+  }
+
+  //// With one more parameter.
+  @Override
+  public T visitAstNode(CAst.AstNode node, List<CAst.AstNode> nodeList) {
+    return visitAstNode(node);
+  }
+
+  @Override
+  public T visitAstNodeUnary(CAst.AstNodeUnary node, List<CAst.AstNode> nodeList) {
+    return visitAstNodeUnary(node);
+  }
+
+  @Override
+  public T visitAstNodeBinary(CAst.AstNodeBinary node, List<CAst.AstNode> nodeList) {
+    return visitAstNodeBinary(node);
+  }
+
+  @Override
+  public T visitAstNodeDynamic(CAst.AstNodeDynamic node, List<CAst.AstNode> nodeList) {
+    return visitAstNodeDynamic(node);
+  }
+
+  @Override
+  public T visitAssignmentNode(CAst.AssignmentNode node, List<CAst.AstNode> nodeList) {
+    return visitAssignmentNode(node);
+  }
+
+  @Override
+  public T visitIfBlockNode(CAst.IfBlockNode node, List<CAst.AstNode> nodeList) {
+    return visitIfBlockNode(node);
+  }
+
+  @Override
+  public T visitIfBodyNode(CAst.IfBodyNode node, List<CAst.AstNode> nodeList) {
+    return visitIfBodyNode(node);
+  }
+
+  @Override
+  public T visitLiteralNode(CAst.LiteralNode node, List<CAst.AstNode> nodeList) {
+    return visitLiteralNode(node);
+  }
+
+  @Override
+  public T visitLogicalNotNode(CAst.LogicalNotNode node, List<CAst.AstNode> nodeList) {
+    return visitLogicalNotNode(node);
+  }
+
+  @Override
+  public T visitLogicalAndNode(CAst.LogicalAndNode node, List<CAst.AstNode> nodeList) {
+    return visitLogicalAndNode(node);
+  }
+
+  @Override
+  public T visitLogicalOrNode(CAst.LogicalOrNode node, List<CAst.AstNode> nodeList) {
+    return visitLogicalOrNode(node);
+  }
+
+  @Override
+  public T visitOpaqueNode(CAst.OpaqueNode node, List<CAst.AstNode> nodeList) {
+    return visitOpaqueNode(node);
+  }
+
+  @Override
+  public T visitStatementSequenceNode(
+      CAst.StatementSequenceNode node, List<CAst.AstNode> nodeList) {
+    return visitStatementSequenceNode(node);
+  }
+
+  @Override
+  public T visitVariableNode(CAst.VariableNode node, List<CAst.AstNode> nodeList) {
+    return visitVariableNode(node);
+  }
+
+  /** Arithmetic operators */
+  @Override
+  public T visitAdditionNode(CAst.AdditionNode node, List<CAst.AstNode> nodeList) {
+    return visitAdditionNode(node);
+  }
+
+  @Override
+  public T visitSubtractionNode(CAst.SubtractionNode node, List<CAst.AstNode> nodeList) {
+    return visitSubtractionNode(node);
+  }
+
+  @Override
+  public T visitMultiplicationNode(CAst.MultiplicationNode node, List<CAst.AstNode> nodeList) {
+    return visitMultiplicationNode(node);
+  }
+
+  @Override
+  public T visitDivisionNode(CAst.DivisionNode node, List<CAst.AstNode> nodeList) {
+    return visitDivisionNode(node);
+  }
+
+  /** Comparison operators */
+  @Override
+  public T visitEqualNode(CAst.EqualNode node, List<CAst.AstNode> nodeList) {
+    return visitEqualNode(node);
+  }
+
+  @Override
+  public T visitNotEqualNode(CAst.NotEqualNode node, List<CAst.AstNode> nodeList) {
+    return visitNotEqualNode(node);
+  }
+
+  @Override
+  public T visitNegativeNode(CAst.NegativeNode node, List<CAst.AstNode> nodeList) {
+    return visitNegativeNode(node);
+  }
+
+  @Override
+  public T visitLessThanNode(CAst.LessThanNode node, List<CAst.AstNode> nodeList) {
+    return visitLessThanNode(node);
+  }
+
+  @Override
+  public T visitLessEqualNode(CAst.LessEqualNode node, List<CAst.AstNode> nodeList) {
+    return visitLessEqualNode(node);
+  }
+
+  @Override
+  public T visitGreaterThanNode(CAst.GreaterThanNode node, List<CAst.AstNode> nodeList) {
+    return visitGreaterThanNode(node);
+  }
+
+  @Override
+  public T visitGreaterEqualNode(CAst.GreaterEqualNode node, List<CAst.AstNode> nodeList) {
+    return visitGreaterEqualNode(node);
+  }
+
+  /** LF built-in operations */
+  @Override
+  public T visitSetPortNode(CAst.SetPortNode node, List<CAst.AstNode> nodeList) {
+    return visitSetPortNode(node);
+  }
+
+  @Override
+  public T visitScheduleActionNode(CAst.ScheduleActionNode node, List<CAst.AstNode> nodeList) {
+    return visitScheduleActionNode(node);
+  }
+
+  @Override
+  public T visitScheduleActionIntNode(
+      CAst.ScheduleActionIntNode node, List<CAst.AstNode> nodeList) {
+    return visitScheduleActionIntNode(node);
+  }
+
+  @Override
+  public T visitStateVarNode(CAst.StateVarNode node, List<CAst.AstNode> nodeList) {
+    return visitStateVarNode(node);
+  }
+
+  @Override
+  public T visitTriggerValueNode(CAst.TriggerValueNode node, List<CAst.AstNode> nodeList) {
+    return visitTriggerValueNode(node);
+  }
+
+  @Override
+  public T visitTriggerIsPresentNode(CAst.TriggerIsPresentNode node, List<CAst.AstNode> nodeList) {
+    return visitTriggerIsPresentNode(node);
+  }
+}
diff --git a/core/src/main/java/org/lflang/analyses/cast/CToUclidVisitor.java b/core/src/main/java/org/lflang/analyses/cast/CToUclidVisitor.java
new file mode 100644
index 0000000000..231f0c5ae3
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/cast/CToUclidVisitor.java
@@ -0,0 +1,432 @@
+package org.lflang.analyses.cast;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.lflang.analyses.cast.CAst.*;
+import org.lflang.analyses.uclid.UclidGenerator;
+import org.lflang.generator.ActionInstance;
+import org.lflang.generator.NamedInstance;
+import org.lflang.generator.PortInstance;
+import org.lflang.generator.ReactionInstance;
+import org.lflang.generator.ReactorInstance;
+import org.lflang.generator.StateVariableInstance;
+import org.lflang.generator.TriggerInstance;
+
+public class CToUclidVisitor extends CBaseAstVisitor<String> {
+
+  // The Uclid generator instance
+  protected UclidGenerator generator;
+
+  // The reaction instance for the generated axiom
+  protected ReactionInstance.Runtime reaction;
+
+  // The reactor that contains the reaction
+  protected ReactorInstance reactor;
+
+  // A list of all the named instances
+  protected List<NamedInstance> instances = new ArrayList<NamedInstance>();
+
+  // Quantified variable
+  protected String qv = "i";
+  protected String qv2 = "j";
+
+  // Unchanged variables and triggers
+  protected List<StateVariableInstance> unchangedStates;
+  protected List<TriggerInstance> unchangedTriggers;
+
+  // FIXME: Make this more flexible and infer value from program.
+  // Default reset value
+  String defaultValue = "0";
+  String defaultPresence = "false";
+
+  public CToUclidVisitor(UclidGenerator generator, ReactionInstance.Runtime reaction) {
+    this.generator = generator;
+    this.reaction = reaction;
+    this.reactor = reaction.getReaction().getParent();
+    instances.addAll(this.reactor.inputs);
+    instances.addAll(this.reactor.outputs);
+    instances.addAll(this.reactor.actions);
+    instances.addAll(this.reactor.states);
+  }
+
+  @Override
+  public String visitAdditionNode(AdditionNode node) {
+    String lhs = visit(node.left);
+    String rhs = visit(node.right);
+    return "(" + lhs + " + " + rhs + ")";
+  }
+
+  @Override
+  public String visitAssignmentNode(AssignmentNode node) {
+    String lhs = visit(node.left);
+    String rhs = visit(node.right);
+    return "(" + lhs + " == " + rhs + ")";
+  }
+
+  @Override
+  public String visitDivisionNode(DivisionNode node) {
+    String lhs = visit(node.left);
+    String rhs = visit(node.right);
+    return "(" + lhs + " / " + rhs + ")";
+  }
+
+  @Override
+  public String visitEqualNode(EqualNode node) {
+    String lhs = visit(node.left);
+    String rhs = visit(node.right);
+    return "(" + lhs + " == " + rhs + ")";
+  }
+
+  @Override
+  public String visitGreaterEqualNode(GreaterEqualNode node) {
+    String lhs = visit(node.left);
+    String rhs = visit(node.right);
+    return "(" + lhs + " >= " + rhs + ")";
+  }
+
+  @Override
+  public String visitGreaterThanNode(GreaterThanNode node) {
+    String lhs = visit(node.left);
+    String rhs = visit(node.right);
+    return "(" + lhs + " > " + rhs + ")";
+  }
+
+  @Override
+  public String visitIfBlockNode(IfBlockNode node) {
+    String antecedent = visit(node.left); // Process if condition
+    String consequent = visit(((IfBodyNode) node.right).left);
+    return "(" + antecedent + " ==> " + "(" + consequent + "\n))";
+  }
+
+  @Override
+  public String visitLessEqualNode(LessEqualNode node) {
+    String lhs = visit(node.left);
+    String rhs = visit(node.right);
+    return "(" + lhs + " <= " + rhs + ")";
+  }
+
+  @Override
+  public String visitLessThanNode(LessThanNode node) {
+    String lhs = visit(node.left);
+    String rhs = visit(node.right);
+    return "(" + lhs + " < " + rhs + ")";
+  }
+
+  @Override
+  public String visitLiteralNode(LiteralNode node) {
+    return node.literal;
+  }
+
+  @Override
+  public String visitLogicalAndNode(LogicalAndNode node) {
+    String lhs = visit(node.left);
+    String rhs = visit(node.right);
+    return "(" + lhs + " && " + rhs + ")";
+  }
+
+  @Override
+  public String visitLogicalNotNode(LogicalNotNode node) {
+    return "!" + "(" + visit(node.child) + ")";
+  }
+
+  @Override
+  public String visitLogicalOrNode(LogicalOrNode node) {
+    String lhs = visit(node.left);
+    String rhs = visit(node.right);
+    return "(" + lhs + " || " + rhs + ")";
+  }
+
+  @Override
+  public String visitMultiplicationNode(MultiplicationNode node) {
+    String lhs = visit(node.left);
+    String rhs = visit(node.right);
+    return "(" + lhs + " * " + rhs + ")";
+  }
+
+  @Override
+  public String visitNotEqualNode(NotEqualNode node) {
+    String lhs = visit(node.left);
+    String rhs = visit(node.right);
+    return "(" + lhs + " != " + rhs + ")";
+  }
+
+  @Override
+  public String visitNegativeNode(NegativeNode node) {
+    return "(" + "-1*(" + visit(node.child) + "))";
+  }
+
+  @Override
+  public String visitScheduleActionNode(ScheduleActionNode node) {
+    String name = ((VariableNode) node.children.get(0)).name;
+    NamedInstance instance = getInstanceByName(name);
+    ActionInstance action = (ActionInstance) instance;
+    String additionalDelay = visit(node.children.get(1));
+    String str =
+        "\n("
+            + "(finite_exists ("
+            + this.qv2
+            + " : integer) in indices :: ("
+            + this.qv2
+            + " > "
+            + this.qv
+            + " && "
+            + this.qv2
+            + " <= END_TRACE) && ("
+            + "\n    "
+            + action.getFullNameWithJoiner("_")
+            + "_is_present"
+            + "("
+            + "t"
+            + "("
+            + this.qv2
+            + ")"
+            + ")"
+            + "\n    "
+            + "&& "
+            + "tag_same"
+            + "("
+            + "g("
+            + this.qv2
+            + ")"
+            + ", "
+            + "tag_schedule"
+            + "("
+            + "g"
+            + "("
+            + this.qv
+            + ")"
+            + ", "
+            + "("
+            + action.getMinDelay().toNanoSeconds()
+            + "+"
+            + additionalDelay
+            + ")"
+            + ")"
+            + ")"
+            + "\n    "
+            + "&& "
+            + action.getFullNameWithJoiner("_")
+            + "("
+            + "s"
+            + "("
+            + this.qv2
+            + ")"
+            + ")"
+            + " == "
+            + "0"
+            + "\n)) // Closes finite_exists"
+            + "\n&& "
+            + action.getFullNameWithJoiner("_")
+            + "_scheduled"
+            + "("
+            + "d"
+            + "("
+            + this.qv
+            + ")"
+            + ")"
+            + "\n)";
+    return str;
+  }
+
+  @Override
+  public String visitScheduleActionIntNode(ScheduleActionIntNode node) {
+    String name = ((VariableNode) node.children.get(0)).name;
+    NamedInstance instance = getInstanceByName(name);
+    ActionInstance action = (ActionInstance) instance;
+    String additionalDelay = visit(node.children.get(1));
+    String intValue = visit(node.children.get(2));
+    String str =
+        "\n("
+            + "(finite_exists ("
+            + this.qv2
+            + " : integer) in indices :: ("
+            + this.qv2
+            + " > "
+            + this.qv
+            + " && "
+            + this.qv2
+            + " <= END_TRACE) && ("
+            + "\n    "
+            + action.getFullNameWithJoiner("_")
+            + "_is_present"
+            + "("
+            + "t"
+            + "("
+            + this.qv2
+            + ")"
+            + ")"
+            + "\n    "
+            + "&& "
+            + "tag_same"
+            + "("
+            + "g("
+            + this.qv2
+            + ")"
+            + ", "
+            + "tag_schedule"
+            + "("
+            + "g"
+            + "("
+            + this.qv
+            + ")"
+            + ", "
+            + "("
+            + action.getMinDelay().toNanoSeconds()
+            + "+"
+            + additionalDelay
+            + ")"
+            + ")"
+            + ")"
+            + "\n)) // Closes finite_exists"
+            + "\n&& "
+            + action.getFullNameWithJoiner("_")
+            + "_scheduled"
+            + "("
+            + "d"
+            + "("
+            + this.qv
+            + ")"
+            + ")"
+            + "\n&& "
+            + action.getFullNameWithJoiner("_")
+            + "_scheduled_payload"
+            + "("
+            + "pl"
+            + "("
+            + this.qv
+            + ")"
+            + ")"
+            + " == "
+            + intValue
+            + "\n)";
+    return str;
+  }
+
+  @Override
+  public String visitSetPortNode(SetPortNode node) {
+    NamedInstance port = getInstanceByName(((VariableNode) node.left).name);
+    String value = visit(node.right);
+    // Remove this port from the unchanged list.
+    // this.unchangedTriggers.remove(port);
+    return "("
+        + "("
+        + port.getFullNameWithJoiner("_")
+        + "("
+        + "s"
+        + "("
+        + this.qv
+        + ")"
+        + ")"
+        + " == "
+        + value
+        + ")"
+        + " && "
+        + "("
+        + port.getFullNameWithJoiner("_")
+        + "_is_present"
+        + "("
+        + "t"
+        + "("
+        + this.qv
+        + ")"
+        + ")"
+        + ")"
+        + ")";
+  }
+
+  @Override
+  public String visitStateVarNode(StateVarNode node) {
+    NamedInstance instance = getInstanceByName(node.name);
+    if (instance != null) {
+      return instance.getFullNameWithJoiner("_")
+          + "("
+          + "s"
+          + "("
+          + this.qv
+          + (node.prev ? "-1" : "")
+          + ")"
+          + ")";
+    }
+    // FIXME: Throw exception
+    return "";
+  }
+
+  @Override
+  public String visitStatementSequenceNode(StatementSequenceNode node) {
+    String axiom = "";
+    for (int i = 0; i < node.children.size(); i++) {
+      axiom += visit(node.children.get(i));
+      if (i != node.children.size() - 1) axiom += "\n" + "        " + "&& ";
+    }
+    return axiom;
+  }
+
+  @Override
+  public String visitSubtractionNode(SubtractionNode node) {
+    String lhs = visit(node.left);
+    String rhs = visit(node.right);
+    return "(" + lhs + " - " + rhs + ")";
+  }
+
+  @Override
+  public String visitTriggerIsPresentNode(TriggerIsPresentNode node) {
+    // Find the trigger instance by name.
+    NamedInstance instance = getInstanceByName(node.name);
+    if (instance != null) {
+      return instance.getFullNameWithJoiner("_")
+          + "_is_present"
+          + "("
+          + "t"
+          + "("
+          + this.qv
+          + ")"
+          + ")";
+    }
+    // FIXME: Throw exception
+    return "";
+  }
+
+  @Override
+  public String visitTriggerValueNode(TriggerValueNode node) {
+    // Find the trigger instance by name.
+    NamedInstance instance = getInstanceByName(node.name);
+    if (instance != null) {
+      return instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
+    }
+    // FIXME: Throw exception
+    return "";
+  }
+
+  @Override
+  public String visitVariableNode(VariableNode node) {
+    NamedInstance instance = getInstanceByName(node.name);
+    if (instance != null) {
+      return instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
+    }
+    // FIXME: Throw exception
+    return "";
+  }
+
+  /////////////////////////////
+  //// Private functions
+
+  private NamedInstance getInstanceByName(String name) {
+    for (NamedInstance i : this.instances) {
+      if (i instanceof ActionInstance) {
+        if (((ActionInstance) i).getDefinition().getName().equals(name)) {
+          return i;
+        }
+      } else if (i instanceof PortInstance) {
+        if (((PortInstance) i).getDefinition().getName().equals(name)) {
+          return i;
+        }
+      } else if (i instanceof StateVariableInstance) {
+        if (((StateVariableInstance) i).getDefinition().getName().equals(name)) {
+          return i;
+        }
+      }
+    }
+    System.out.println("Named instance" + "not found.");
+    return null;
+  }
+}
diff --git a/core/src/main/java/org/lflang/analyses/cast/IfNormalFormAstVisitor.java b/core/src/main/java/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
new file mode 100644
index 0000000000..180fe1f45f
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
@@ -0,0 +1,92 @@
+package org.lflang.analyses.cast;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * An AST visitor that converts an original AST into the If Normal Form. See "Bounded Model Checking
+ * of Software using SMT Solvers instead of SAT Solvers" for details about the If Normal Form
+ * (https://link.springer.com/chapter/10.1007/11691617_9).
+ *
+ * <p>There are several requirements for an AST to be in INF: 1. There should be a single
+ * StatementSequence (SS) root node; 2. Each child of the SS node should be an IfBlockNode; 3.
+ * Variables in a subsequent child should be marked as "primed" versions of those in the previous
+ * child.
+ *
+ * <p>Limitations: 1. The implementation does not take the scope into account. E.g. "int i = 0; {
+ * int j = 0; }" is treated the same as "int i = 0; int j = 0;". 2. Due to the above limitation, the
+ * implementation assumes that each variable has a unique name. E.g. "{ int i = 0; }{ int i = 0; }"
+ * is an ill-formed program.
+ *
+ * <p>In this program, visit() is the normalise() in the paper.
+ */
+public class IfNormalFormAstVisitor extends CBaseAstVisitor<Void> {
+
+  public CAst.StatementSequenceNode INF = new CAst.StatementSequenceNode();
+
+  @Override
+  public Void visitStatementSequenceNode(
+      CAst.StatementSequenceNode node, List<CAst.AstNode> conditions) {
+    // Create a new StatementSequenceNode.
+    for (CAst.AstNode child : node.children) {
+      visit(child, conditions);
+    }
+    return null;
+  }
+
+  @Override
+  public Void visitAssignmentNode(CAst.AssignmentNode node, List<CAst.AstNode> conditions) {
+    this.INF.children.add(generateIfBlock(node, conditions));
+    return null;
+  }
+
+  @Override
+  public Void visitSetPortNode(CAst.SetPortNode node, List<CAst.AstNode> conditions) {
+    this.INF.children.add(generateIfBlock(node, conditions));
+    return null;
+  }
+
+  @Override
+  public Void visitScheduleActionNode(CAst.ScheduleActionNode node, List<CAst.AstNode> conditions) {
+    this.INF.children.add(generateIfBlock(node, conditions));
+    return null;
+  }
+
+  @Override
+  public Void visitScheduleActionIntNode(
+      CAst.ScheduleActionIntNode node, List<CAst.AstNode> conditions) {
+    this.INF.children.add(generateIfBlock(node, conditions));
+    return null;
+  }
+
+  @Override
+  public Void visitIfBlockNode(CAst.IfBlockNode node, List<CAst.AstNode> conditions) {
+    List<CAst.AstNode> leftConditions = new ArrayList<>(conditions);
+    leftConditions.add(node.left);
+    visit(((CAst.IfBodyNode) node.right).left, leftConditions);
+    if (((CAst.IfBodyNode) node.right).right != null) {
+      List<CAst.AstNode> rightConditions = new ArrayList<>(conditions);
+      // Add a not node.
+      CAst.LogicalNotNode notNode = new CAst.LogicalNotNode();
+      notNode.child = node.left; // Negate the condition.
+      rightConditions.add(notNode);
+      visit(((CAst.IfBodyNode) node.right).right, rightConditions);
+    }
+    return null;
+  }
+
+  private CAst.IfBlockNode generateIfBlock(CAst.AstNode node, List<CAst.AstNode> conditions) {
+    // Create an If Block node.
+    CAst.IfBlockNode ifNode = new CAst.IfBlockNode();
+    // Set the condition of the if block node.
+    CAst.AstNode conjunction = AstUtils.takeConjunction(conditions);
+    ifNode.left = conjunction;
+    // Create a new body node.
+    CAst.IfBodyNode body = new CAst.IfBodyNode();
+    ifNode.right = body;
+    // Set the then branch to the assignment.
+    body.left = node;
+
+    return ifNode;
+  }
+}
diff --git a/core/src/main/java/org/lflang/analyses/cast/VariablePrecedenceVisitor.java b/core/src/main/java/org/lflang/analyses/cast/VariablePrecedenceVisitor.java
new file mode 100644
index 0000000000..e6124bc516
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/cast/VariablePrecedenceVisitor.java
@@ -0,0 +1,43 @@
+package org.lflang.analyses.cast;
+
+import org.lflang.analyses.cast.CAst.*;
+
+/** This visitor marks certain variable node as "previous." */
+public class VariablePrecedenceVisitor extends CBaseAstVisitor<Void> {
+
+  // This is a temporary solution and cannot handle,
+  // e.g., self->s = (self->s + 1) - (2 * 2).
+  @Override
+  public Void visitAssignmentNode(AssignmentNode node) {
+    // System.out.println("******* In assignment!!!");
+    if (node.left instanceof StateVarNode) {
+      if (node.right instanceof AstNodeBinary) {
+        AstNodeBinary n = (AstNodeBinary) node.right;
+        if (n.left instanceof StateVarNode) {
+          ((StateVarNode) n.left).prev = true;
+        }
+        if (n.right instanceof StateVarNode) {
+          ((StateVarNode) n.right).prev = true;
+        }
+      }
+    } else {
+      System.out.println("Unreachable!"); // FIXME: Throw exception.
+    }
+    return null;
+  }
+
+  @Override
+  public Void visitIfBlockNode(IfBlockNode node) {
+    if (((IfBodyNode) node.right).left != null) visit(((IfBodyNode) node.right).left);
+    if (((IfBodyNode) node.right).right != null) visit(((IfBodyNode) node.right).right);
+    return null;
+  }
+
+  @Override
+  public Void visitStatementSequenceNode(StatementSequenceNode node) {
+    for (int i = 0; i < node.children.size(); i++) {
+      visit(node.children.get(i));
+    }
+    return null;
+  }
+}
diff --git a/core/src/main/java/org/lflang/analyses/cast/Visitable.java b/core/src/main/java/org/lflang/analyses/cast/Visitable.java
new file mode 100644
index 0000000000..458d629bc2
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/cast/Visitable.java
@@ -0,0 +1,12 @@
+package org.lflang.analyses.cast;
+
+import java.util.List;
+
+public interface Visitable {
+
+  /** The {@link AstVisitor} needs a double dispatch method. */
+  <T> T accept(AstVisitor<? extends T> visitor);
+
+  /** The {@link AstVisitor} needs a double dispatch method. */
+  <T> T accept(AstVisitor<? extends T> visitor, List<CAst.AstNode> nodeList);
+}
diff --git a/core/src/main/java/org/lflang/analyses/statespace/Event.java b/core/src/main/java/org/lflang/analyses/statespace/Event.java
new file mode 100644
index 0000000000..ce96c878aa
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/statespace/Event.java
@@ -0,0 +1,44 @@
+/** A node in the state space diagram representing a step in the execution of an LF program. */
+package org.lflang.analyses.statespace;
+
+import org.lflang.generator.TriggerInstance;
+
+public class Event implements Comparable<Event> {
+
+  public TriggerInstance trigger;
+  public Tag tag;
+
+  public Event(TriggerInstance trigger, Tag tag) {
+    this.trigger = trigger;
+    this.tag = tag;
+  }
+
+  public TriggerInstance getTrigger() {
+    return this.trigger;
+  }
+
+  @Override
+  public int compareTo(Event e) {
+    // Compare tags first.
+    int ret = this.tag.compareTo(e.tag);
+    // If tags match, compare trigger names.
+    if (ret == 0) ret = this.trigger.getFullName().compareTo(e.trigger.getFullName());
+    return ret;
+  }
+
+  /** This equals() method does NOT compare tags, only compares triggers. */
+  @Override
+  public boolean equals(Object o) {
+    if (o == null) return false;
+    if (o instanceof Event) {
+      Event e = (Event) o;
+      if (this.trigger.equals(e.trigger)) return true;
+    }
+    return false;
+  }
+
+  @Override
+  public String toString() {
+    return "(" + trigger.getFullName() + ", " + tag + ")";
+  }
+}
diff --git a/core/src/main/java/org/lflang/analyses/statespace/EventQueue.java b/core/src/main/java/org/lflang/analyses/statespace/EventQueue.java
new file mode 100644
index 0000000000..67cc485f68
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/statespace/EventQueue.java
@@ -0,0 +1,18 @@
+/** An event queue implementation that sorts events by time tag order */
+package org.lflang.analyses.statespace;
+
+import java.util.PriorityQueue;
+
+public class EventQueue extends PriorityQueue<Event> {
+
+  /**
+   * Modify the original add() by enforcing uniqueness. There cannot be duplicate events in the
+   * event queue.
+   */
+  @Override
+  public boolean add(Event e) {
+    if (this.contains(e)) return false;
+    super.add(e);
+    return true;
+  }
+}
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateInfo.java b/core/src/main/java/org/lflang/analyses/statespace/StateInfo.java
new file mode 100644
index 0000000000..8226d784d7
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateInfo.java
@@ -0,0 +1,24 @@
+/** A class that represents information in a step in a counterexample trace */
+package org.lflang.analyses.statespace;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class StateInfo {
+
+  public ArrayList<String> reactions = new ArrayList<>();
+  public Tag tag;
+  public HashMap<String, String> variables = new HashMap<>();
+  public HashMap<String, String> triggers = new HashMap<>();
+  public HashMap<String, String> scheduled = new HashMap<>();
+  public HashMap<String, String> payloads = new HashMap<>();
+
+  public void display() {
+    System.out.println("reactions: " + reactions);
+    System.out.println("tag: " + tag);
+    System.out.println("variables: " + variables);
+    System.out.println("triggers: " + triggers);
+    System.out.println("scheduled: " + scheduled);
+    System.out.println("payloads: " + payloads);
+  }
+}
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java
new file mode 100644
index 0000000000..82d46f0e4a
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java
@@ -0,0 +1,217 @@
+/** A directed graph representing the state space of an LF program. */
+package org.lflang.analyses.statespace;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.lflang.TimeValue;
+import org.lflang.generator.CodeBuilder;
+import org.lflang.generator.ReactionInstance;
+import org.lflang.graph.DirectedGraph;
+
+// FIXME: Use a linkedlist instead.
+public class StateSpaceDiagram extends DirectedGraph<StateSpaceNode> {
+
+  /** The first node of the state space diagram. */
+  public StateSpaceNode head;
+
+  /** The last node of the state space diagram. */
+  public StateSpaceNode tail;
+
+  /**
+   * The previously encountered node which the tail node goes back to, i.e. the location where the
+   * back loop happens.
+   */
+  public StateSpaceNode loopNode;
+
+  /**
+   * Store the state when the loop node is reached for the 2nd time. This is used to calculate the
+   * elapsed logical time on the back loop edge.
+   */
+  public StateSpaceNode loopNodeNext;
+
+  /** The logical time elapsed for each loop iteration. */
+  public long loopPeriod;
+
+  /** A dot file that represents the diagram */
+  private CodeBuilder dot;
+
+  /** */
+  private final boolean compactDot = false;
+
+  /** Before adding the node, assign it an index. */
+  @Override
+  public void addNode(StateSpaceNode node) {
+    node.index = this.nodeCount();
+    super.addNode(node);
+  }
+
+  /** Get the immediately downstream node. */
+  public StateSpaceNode getDownstreamNode(StateSpaceNode node) {
+    Set<StateSpaceNode> downstream = this.getDownstreamAdjacentNodes(node);
+    if (downstream == null || downstream.size() == 0) return null;
+    return (StateSpaceNode) downstream.toArray()[0];
+  }
+
+  /** Pretty print the diagram. */
+  public void display() {
+    System.out.println("*************************************************");
+    System.out.println("* Pretty printing worst-case state space diagram:");
+    long timestamp;
+    StateSpaceNode node = this.head;
+    if (node == null) {
+      System.out.println("* EMPTY");
+      System.out.println("*************************************************");
+      return;
+    }
+    while (node != this.tail) {
+      System.out.print("* State " + node.index + ": ");
+      node.display();
+
+      // Store the tag of the prior step.
+      timestamp = node.tag.timestamp;
+
+      // Assume a unique next state.
+      node = getDownstreamNode(node);
+
+      // Compute time difference
+      if (node != null) {
+        TimeValue tsDiff = TimeValue.fromNanoSeconds(node.tag.timestamp - timestamp);
+        System.out.println("*     => Advance time by " + tsDiff);
+      }
+    }
+
+    // Print tail node
+    System.out.print("* (Tail) state " + node.index + ": ");
+    node.display();
+
+    if (this.loopNode != null) {
+      // Compute time difference
+      TimeValue tsDiff = TimeValue.fromNanoSeconds(loopNodeNext.tag.timestamp - tail.tag.timestamp);
+      System.out.println("*     => Advance time by " + tsDiff);
+
+      System.out.println("* Goes back to loop node: state " + this.loopNode.index);
+      System.out.print("* Loop node reached 2nd time: ");
+      this.loopNodeNext.display();
+    }
+    System.out.println("*************************************************");
+  }
+
+  /**
+   * Generate a dot file from the state space diagram.
+   *
+   * @return a CodeBuilder with the generated code
+   */
+  public CodeBuilder generateDot() {
+    if (dot == null) {
+      dot = new CodeBuilder();
+      dot.pr("digraph G {");
+      dot.indent();
+      if (this.loopNode != null) {
+        dot.pr("layout=circo;");
+      }
+      dot.pr("rankdir=LR;");
+      if (this.compactDot) {
+        dot.pr("mindist=1.5;");
+        dot.pr("overlap=false");
+        dot.pr("node [shape=Mrecord fontsize=40]");
+        dot.pr("edge [fontsize=40 penwidth=3 arrowsize=2]");
+      } else {
+        dot.pr("node [shape=Mrecord]");
+      }
+      // Generate a node for each state.
+      if (this.compactDot) {
+        for (StateSpaceNode n : this.nodes()) {
+          dot.pr(
+              "S"
+                  + n.index
+                  + " ["
+                  + "label = \" {"
+                  + "S"
+                  + n.index
+                  + " | "
+                  + n.reactionsInvoked.size()
+                  + " | "
+                  + n.eventQ.size()
+                  + "}"
+                  + " | "
+                  + n.tag
+                  + "\""
+                  + "]");
+        }
+      } else {
+        for (StateSpaceNode n : this.nodes()) {
+          List<String> reactions =
+              n.reactionsInvoked.stream()
+                  .map(ReactionInstance::getFullName)
+                  .collect(Collectors.toList());
+          String reactionsStr = String.join("\\n", reactions);
+          List<String> events = n.eventQ.stream().map(Event::toString).collect(Collectors.toList());
+          String eventsStr = String.join("\\n", events);
+          dot.pr(
+              "S"
+                  + n.index
+                  + " ["
+                  + "label = \""
+                  + "S"
+                  + n.index
+                  + " | "
+                  + n.tag
+                  + " | "
+                  + "Reactions invoked:\\n"
+                  + reactionsStr
+                  + " | "
+                  + "Pending events:\\n"
+                  + eventsStr
+                  + "\""
+                  + "]");
+        }
+      }
+
+      StateSpaceNode current = this.head;
+      StateSpaceNode next = getDownstreamNode(this.head);
+      while (current != null && next != null && current != this.tail) {
+        TimeValue tsDiff = TimeValue.fromNanoSeconds(next.tag.timestamp - current.tag.timestamp);
+        dot.pr(
+            "S"
+                + current.index
+                + " -> "
+                + "S"
+                + next.index
+                + " [label = "
+                + "\""
+                + "+"
+                + tsDiff
+                + "\""
+                + "]");
+        current = next;
+        next = getDownstreamNode(next);
+      }
+
+      if (loopNode != null) {
+        TimeValue tsDiff =
+            TimeValue.fromNanoSeconds(loopNodeNext.tag.timestamp - tail.tag.timestamp);
+        TimeValue period = TimeValue.fromNanoSeconds(loopPeriod);
+        dot.pr(
+            "S"
+                + current.index
+                + " -> "
+                + "S"
+                + next.index
+                + " [label = "
+                + "\""
+                + "+"
+                + tsDiff
+                + " -"
+                + period
+                + "\""
+                + " weight = 0 "
+                + "]");
+      }
+
+      dot.unindent();
+      dot.pr("}");
+    }
+    return this.dot;
+  }
+}
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
new file mode 100644
index 0000000000..97befc4a58
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
@@ -0,0 +1,326 @@
+/** Explores the state space of an LF program. */
+package org.lflang.analyses.statespace;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+import org.eclipse.xtext.xbase.lib.Exceptions;
+import org.lflang.TimeUnit;
+import org.lflang.TimeValue;
+import org.lflang.generator.ActionInstance;
+import org.lflang.generator.PortInstance;
+import org.lflang.generator.ReactionInstance;
+import org.lflang.generator.ReactorInstance;
+import org.lflang.generator.RuntimeRange;
+import org.lflang.generator.SendRange;
+import org.lflang.generator.TimerInstance;
+import org.lflang.generator.TriggerInstance;
+import org.lflang.lf.Expression;
+import org.lflang.lf.Time;
+import org.lflang.lf.Variable;
+
+public class StateSpaceExplorer {
+
+  // Instantiate an empty state space diagram.
+  public StateSpaceDiagram diagram = new StateSpaceDiagram();
+
+  // Indicate whether a back loop is found in the state space.
+  // A back loop suggests periodic behavior.
+  public boolean loopFound = false;
+
+  /**
+   * Instantiate a global event queue. We will use this event queue to symbolically simulate the
+   * logical timeline. This simulation is also valid for runtime implementations that are federated
+   * or relax global barrier synchronization, since an LF program defines a unique logical timeline
+   * (assuming all reactions behave _consistently_ throughout the execution).
+   */
+  public EventQueue eventQ = new EventQueue();
+
+  /** The main reactor instance based on which the state space is explored. */
+  public ReactorInstance main;
+
+  // Constructor
+  public StateSpaceExplorer(ReactorInstance main) {
+    this.main = main;
+  }
+
+  /** Recursively add the first events to the event queue. */
+  public void addInitialEvents(ReactorInstance reactor) {
+    // Add the startup trigger, if exists.
+    var startup = reactor.getStartupTrigger();
+    if (startup != null) eventQ.add(new Event(startup, new Tag(0, 0, false)));
+
+    // Add the initial timer firings, if exist.
+    for (TimerInstance timer : reactor.timers) {
+      eventQ.add(new Event(timer, new Tag(timer.getOffset().toNanoSeconds(), 0, false)));
+    }
+
+    // Recursion
+    for (var child : reactor.children) {
+      addInitialEvents(child);
+    }
+  }
+
+  /**
+   * Explore the state space and populate the state space diagram until the specified horizon (i.e.
+   * the end tag) is reached OR until the event queue is empty.
+   *
+   * <p>As an optimization, if findLoop is true, the algorithm tries to find a loop in the state
+   * space during exploration. If a loop is found (i.e. a previously encountered state is reached
+   * again) during exploration, the function returns early.
+   *
+   * <p>TODOs: 1. Handle action with 0 min delay. 2. Check if zero-delay connection works.
+   */
+  public void explore(Tag horizon, boolean findLoop) {
+    // Traverse the main reactor instance recursively to find
+    // the known initial events (startup and timers' first firings).
+    // FIXME: It seems that we need to handle shutdown triggers
+    // separately, because they could break the back loop.
+    addInitialEvents(this.main);
+
+    Tag previousTag = null; // Tag in the previous loop ITERATION
+    Tag currentTag = null; // Tag in the current  loop ITERATION
+    StateSpaceNode currentNode = null;
+    StateSpaceNode previousNode = null;
+    HashMap<Integer, StateSpaceNode> uniqueNodes = new HashMap<>();
+    boolean stop = true;
+    if (this.eventQ.size() > 0) {
+      stop = false;
+      currentTag = (eventQ.peek()).tag;
+    }
+
+    // A list of reactions invoked at the current logical tag
+    Set<ReactionInstance> reactionsInvoked;
+    // A temporary list of reactions processed in the current LOOP ITERATION
+    Set<ReactionInstance> reactionsTemp;
+
+    while (!stop) {
+
+      // Pop the events from the earliest tag off the event queue.
+      ArrayList<Event> currentEvents = new ArrayList<Event>();
+      // FIXME: Use stream methods here?
+      while (eventQ.size() > 0 && eventQ.peek().tag.compareTo(currentTag) == 0) {
+        Event e = eventQ.poll();
+        // System.out.println("DEBUG: Popped an event: " + e);
+        currentEvents.add(e);
+      }
+
+      // Collect all the reactions invoked in this current LOOP ITERATION
+      // triggered by the earliest events.
+      // Using a hash set here to make sure the reactions invoked
+      // are unique. Sometimes multiple events can trigger the same reaction,
+      // and we do not want to record duplicate reaction invocations.
+      reactionsTemp = new HashSet<ReactionInstance>();
+      for (Event e : currentEvents) {
+        Set<ReactionInstance> dependentReactions = e.trigger.getDependentReactions();
+        reactionsTemp.addAll(dependentReactions);
+        // System.out.println("DEBUG: ReactionTemp: " + reactionsTemp);
+
+        // If the event is a timer firing, enqueue the next firing.
+        if (e.trigger instanceof TimerInstance) {
+          TimerInstance timer = (TimerInstance) e.trigger;
+          eventQ.add(
+              new Event(
+                  timer,
+                  new Tag(
+                      e.tag.timestamp + timer.getPeriod().toNanoSeconds(),
+                      0, // A time advancement resets microstep to 0.
+                      false)));
+        }
+      }
+
+      // For each reaction invoked, compute the new events produced.
+      for (ReactionInstance reaction : reactionsTemp) {
+        // Iterate over all the effects produced by this reaction.
+        // If the effect is a port, obtain the downstream port along
+        // a connection and enqueue a future event for that port.
+        // If the effect is an action, enqueue a future event for
+        // this action.
+        for (TriggerInstance<? extends Variable> effect : reaction.effects) {
+          if (effect instanceof PortInstance) {
+
+            for (SendRange senderRange : ((PortInstance) effect).getDependentPorts()) {
+
+              for (RuntimeRange<PortInstance> destinationRange : senderRange.destinations) {
+                PortInstance downstreamPort = destinationRange.instance;
+
+                // Getting delay from connection
+                // FIXME: Is there a more concise way to do this?
+                long delay = 0;
+                Expression delayExpr = senderRange.connection.getDelay();
+                if (delayExpr instanceof Time) {
+                  long interval = ((Time) delayExpr).getInterval();
+                  String unit = ((Time) delayExpr).getUnit();
+                  TimeValue timeValue = new TimeValue(interval, TimeUnit.fromName(unit));
+                  delay = timeValue.toNanoSeconds();
+                }
+
+                // Create and enqueue a new event.
+                Event e =
+                    new Event(downstreamPort, new Tag(currentTag.timestamp + delay, 0, false));
+                // System.out.println("DEBUG: Added a port event: " + e);
+                eventQ.add(e);
+              }
+            }
+          } else if (effect instanceof ActionInstance) {
+            // Get the minimum delay of this action.
+            long min_delay = ((ActionInstance) effect).getMinDelay().toNanoSeconds();
+            long microstep = 0;
+            if (min_delay == 0) {
+              microstep = currentTag.microstep + 1;
+            }
+            // Create and enqueue a new event.
+            Event e =
+                new Event(effect, new Tag(currentTag.timestamp + min_delay, microstep, false));
+            // System.out.println("DEBUG: Added an action event: " + e);
+            eventQ.add(e);
+          }
+        }
+      }
+
+      // We are at the first iteration.
+      // Initialize currentNode.
+      if (previousTag == null) {
+        // System.out.println("DEBUG: Case 1");
+        //// Now we are done with the node at the previous tag,
+        //// work on the new node at the current timestamp.
+        // Copy the reactions in reactionsTemp.
+        reactionsInvoked = new HashSet<ReactionInstance>(reactionsTemp);
+
+        // Create a new state in the SSD for the current tag,
+        // add the reactions triggered to the state,
+        // and add a snapshot of the event queue (with new events
+        // generated by reaction invocations in the curren tag)
+        // to the state.
+        StateSpaceNode node =
+            new StateSpaceNode(
+                currentTag, // Current tag
+                reactionsInvoked, // Reactions invoked at this tag
+                new ArrayList<Event>(eventQ) // A snapshot of the event queue
+                );
+
+        // Initialize currentNode.
+        currentNode = node;
+      }
+      // When we advance to a new TIMESTAMP (not a new tag),
+      // create a new node in the state space diagram
+      // for everything processed in the previous timestamp.
+      // This makes sure that the granularity of nodes is
+      // at the timestamp-level, so that we don't have to
+      // worry about microsteps.
+      else if (previousTag != null && currentTag.timestamp > previousTag.timestamp) {
+        // System.out.println("DEBUG: Case 2");
+        // Whenever we finish a tag, check for loops fist.
+        // If currentNode matches an existing node in uniqueNodes,
+        // duplicate is set to the existing node.
+        StateSpaceNode duplicate;
+        if (findLoop && (duplicate = uniqueNodes.put(currentNode.hash(), currentNode)) != null) {
+
+          // Mark the loop in the diagram.
+          loopFound = true;
+          this.diagram.loopNode = duplicate;
+          this.diagram.loopNodeNext = currentNode;
+          this.diagram.tail = previousNode;
+          // Loop period is the time difference between the 1st time
+          // the node is reached and the 2nd time the node is reached.
+          this.diagram.loopPeriod =
+              this.diagram.loopNodeNext.tag.timestamp - this.diagram.loopNode.tag.timestamp;
+          this.diagram.addEdge(this.diagram.loopNode, this.diagram.tail);
+          return; // Exit the while loop early.
+        }
+
+        // Now we are at a new tag, and a loop is not found,
+        // add the node to the state space diagram.
+        // Adding a node to the graph once it is finalized
+        // because this makes checking duplicate nodes easier.
+        // We don't have to remove a node from the graph.
+        this.diagram.addNode(currentNode);
+        this.diagram.tail = currentNode; // Update the current tail.
+
+        // If the head is not empty, add an edge from the previous state
+        // to the next state. Otherwise initialize the head to the new node.
+        if (previousNode != null) {
+          // System.out.println("--- Add a new edge between " + currentNode + " and " + node);
+          // this.diagram.addEdge(currentNode, previousNode); // Sink first, then source
+          if (previousNode != currentNode) this.diagram.addEdge(currentNode, previousNode);
+        } else this.diagram.head = currentNode; // Initialize the head.
+
+        //// Now we are done with the node at the previous tag,
+        //// work on the new node at the current timestamp.
+        // Copy the reactions in reactionsTemp.
+        reactionsInvoked = new HashSet<ReactionInstance>(reactionsTemp);
+
+        // Create a new state in the SSD for the current tag,
+        // add the reactions triggered to the state,
+        // and add a snapshot of the event queue (with new events
+        // generated by reaction invocations in the curren tag)
+        // to the state.
+        StateSpaceNode node =
+            new StateSpaceNode(
+                currentTag, // Current tag
+                reactionsInvoked, // Reactions invoked at this tag
+                new ArrayList<Event>(eventQ) // A snapshot of the event queue
+                );
+
+        // Update the previous node.
+        previousNode = currentNode;
+        // Update the current node to the new (potentially incomplete) node.
+        currentNode = node;
+      }
+      // Timestamp does not advance because we are processing
+      // connections with zero delay.
+      else if (previousTag != null && currentTag.timestamp == previousTag.timestamp) {
+        // System.out.println("DEBUG: Case 3");
+        // Add reactions explored in the current loop iteration
+        // to the existing state space node.
+        currentNode.reactionsInvoked.addAll(reactionsTemp);
+        // Update the eventQ snapshot.
+        currentNode.eventQ = new ArrayList<Event>(eventQ);
+      } else {
+        // Unreachable
+        Exceptions.sneakyThrow(new Exception("Reached an unreachable part."));
+      }
+
+      // Update the current tag for the next iteration.
+      if (eventQ.size() > 0) {
+        previousTag = currentTag;
+        currentTag = eventQ.peek().tag;
+      }
+
+      // Stop if:
+      // 1. the event queue is empty, or
+      // 2. the horizon is reached.
+      if (eventQ.size() == 0) {
+        // System.out.println("DEBUG: Stopping because eventQ is empty!");
+        stop = true;
+      } else if (currentTag.timestamp > horizon.timestamp) {
+        // System.out.println("DEBUG: Stopping because horizon is reached! Horizon: " + horizon + "
+        // Current Tag: " + currentTag);
+        // System.out.println("DEBUG: EventQ: " + eventQ);
+        stop = true;
+      }
+    }
+
+    // Check if the last current node is added to the graph yet.
+    // If not, add it now.
+    // This could happen when condition (previousTag == null)
+    // or (previousTag != null
+    // && currentTag.compareTo(previousTag) > 0) is true and then
+    // the simulation ends, leaving a new node dangling.
+    if (previousNode == null || previousNode.tag.timestamp < currentNode.tag.timestamp) {
+      this.diagram.addNode(currentNode);
+      this.diagram.tail = currentNode; // Update the current tail.
+      if (previousNode != null) {
+        this.diagram.addEdge(currentNode, previousNode);
+      }
+    }
+
+    // When we exit and we still don't have a head,
+    // that means there is only one node in the diagram.
+    // Set the current node as the head.
+    if (this.diagram.head == null) this.diagram.head = currentNode;
+
+    return;
+  }
+}
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java
new file mode 100644
index 0000000000..a2f0918b02
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java
@@ -0,0 +1,99 @@
+/** A node in the state space diagram representing a step in the execution of an LF program. */
+package org.lflang.analyses.statespace;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.lflang.TimeValue;
+import org.lflang.generator.ReactionInstance;
+import org.lflang.generator.TriggerInstance;
+
+public class StateSpaceNode {
+
+  public int index; // Set in StateSpaceDiagram.java
+  public Tag tag;
+  public TimeValue time; // Readable representation of tag.timestamp
+  public Set<ReactionInstance> reactionsInvoked;
+  public ArrayList<Event> eventQ;
+
+  public StateSpaceNode(Tag tag, Set<ReactionInstance> reactionsInvoked, ArrayList<Event> eventQ) {
+    this.tag = tag;
+    this.eventQ = eventQ;
+    this.reactionsInvoked = reactionsInvoked;
+    this.time = TimeValue.fromNanoSeconds(tag.timestamp);
+  }
+
+  /**
+   * Assuming both eventQs have the same length, for each pair of events in eventQ1 and eventQ2,
+   * check if the time distances between the node's tag and the two events' tags are equal.
+   */
+  private boolean equidistant(StateSpaceNode n1, StateSpaceNode n2) {
+    if (n1.eventQ.size() != n2.eventQ.size()) return false;
+    for (int i = 0; i < n1.eventQ.size(); i++) {
+      if (n1.eventQ.get(i).tag.timestamp - n1.tag.timestamp
+          != n2.eventQ.get(i).tag.timestamp - n2.tag.timestamp) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /** Two methods for pretty printing */
+  public void display() {
+    System.out.println("(" + this.time + ", " + reactionsInvoked + ", " + eventQ + ")");
+  }
+
+  public String toString() {
+    return "(" + this.time + ", " + reactionsInvoked + ", " + eventQ + ")";
+  }
+
+  /**
+   * This equals method does NOT compare tags, only compares reactionsInvoked, eventQ, and whether
+   * future events are equally distant.
+   */
+  @Override
+  public boolean equals(Object o) {
+    if (o == null) return false;
+    if (o instanceof StateSpaceNode) {
+      StateSpaceNode node = (StateSpaceNode) o;
+      if (this.reactionsInvoked.equals(node.reactionsInvoked)
+          && this.eventQ.equals(node.eventQ)
+          && equidistant(this, node)) return true;
+    }
+    return false;
+  }
+
+  /**
+   * Generate hash for the node. This hash function is used for checking the uniqueness of nodes. It
+   * is not meant to be used as a hashCode() because doing so interferes with node insertion in the
+   * state space diagram.
+   */
+  public int hash() {
+    // Initial value
+    int result = 17;
+
+    // Generate hash for the reactions invoked.
+    result = 31 * result + reactionsInvoked.hashCode();
+
+    // Generate hash for the triggers in the queued events.
+    List<String> eventNames =
+        this.eventQ.stream()
+            .map(Event::getTrigger)
+            .map(TriggerInstance::getFullName)
+            .collect(Collectors.toList());
+    result = 31 * result + eventNames.hashCode();
+
+    // Generate hash for the time differences.
+    List<Long> timeDiff =
+        this.eventQ.stream()
+            .map(
+                e -> {
+                  return e.tag.timestamp - this.tag.timestamp;
+                })
+            .collect(Collectors.toList());
+    result = 31 * result + timeDiff.hashCode();
+
+    return result;
+  }
+}
diff --git a/core/src/main/java/org/lflang/analyses/statespace/Tag.java b/core/src/main/java/org/lflang/analyses/statespace/Tag.java
new file mode 100644
index 0000000000..718db3e6ad
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/statespace/Tag.java
@@ -0,0 +1,63 @@
+/**
+ * Class representing a logical time tag, which is a pair that consists of a timestamp (type long)
+ * and a microstep (type long).
+ */
+package org.lflang.analyses.statespace;
+
+import org.lflang.TimeValue;
+
+public class Tag implements Comparable<Tag> {
+
+  public long timestamp;
+  public long microstep;
+  public boolean forever; // Whether the tag is FOREVER into the future.
+
+  public Tag(long timestamp, long microstep, boolean forever) {
+    this.timestamp = timestamp;
+    this.microstep = microstep;
+    this.forever = forever;
+  }
+
+  @Override
+  public int compareTo(Tag t) {
+    // If one tag is forever, and the other is not,
+    // then forever tag is later. If both tags are
+    // forever, then they are equal.
+    if (this.forever && !t.forever) return 1;
+    else if (!this.forever && t.forever) return -1;
+    else if (this.forever && t.forever) return 0;
+
+    // Compare the timestamps if they are not equal.
+    if (this.timestamp != t.timestamp) {
+      if (this.timestamp > t.timestamp) return 1;
+      else if (this.timestamp < t.timestamp) return -1;
+      else return 0;
+    }
+
+    // Otherwise, compare the microsteps.
+    if (this.microstep > t.microstep) return 1;
+    else if (this.microstep < t.microstep) return -1;
+    else return 0;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o instanceof Tag) {
+      Tag t = (Tag) o;
+      if (this.timestamp == t.timestamp
+          && this.microstep == t.microstep
+          && this.forever == t.forever) return true;
+    }
+    return false;
+  }
+
+  @Override
+  public String toString() {
+    if (this.forever) return "(FOREVER, " + this.microstep + ")";
+    else {
+      TimeValue time = TimeValue.fromNanoSeconds(this.timestamp);
+      return "(" + time + ", " + this.microstep + ")";
+    }
+  }
+}
diff --git a/core/src/main/java/org/lflang/analyses/uclid/MTLVisitor.java b/core/src/main/java/org/lflang/analyses/uclid/MTLVisitor.java
new file mode 100644
index 0000000000..b83c3849a6
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/uclid/MTLVisitor.java
@@ -0,0 +1,659 @@
+/*************
+ * Copyright (c) 2021, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
+
+/** (EXPERIMENTAL) Transpiler from an MTL specification to a Uclid axiom. */
+package org.lflang.analyses.uclid;
+
+import org.lflang.TimeUnit;
+import org.lflang.TimeValue;
+import org.lflang.dsl.MTLParser;
+import org.lflang.dsl.MTLParserBaseVisitor;
+import org.lflang.generator.CodeBuilder;
+
+public class MTLVisitor extends MTLParserBaseVisitor<String> {
+
+  ////////////////////////////////////////////
+  //// Protected fields
+
+  /** The main place to put generated code. */
+  protected CodeBuilder code = new CodeBuilder();
+
+  /** Tactic to be used to prove the property. */
+  protected String tactic;
+
+  /** Time horizon (in nanoseconds) of the property */
+  protected long horizon = 0;
+
+  // Constructor
+  public MTLVisitor(String tactic) {
+    this.tactic = tactic;
+  }
+
+  ////////////////////////////////////////////
+  //// Public methods
+  public String visitMtl(
+      MTLParser.MtlContext ctx, String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
+
+    return visitEquivalence(ctx.equivalence(), prefixIdx, QFIdx, prevPrefixIdx, horizon);
+  }
+
+  public String visitEquivalence(
+      MTLParser.EquivalenceContext ctx,
+      String prefixIdx,
+      int QFIdx,
+      String prevPrefixIdx,
+      long horizon) {
+
+    if (ctx.right == null) {
+      return visitImplication(ctx.left, prefixIdx, QFIdx, prevPrefixIdx, horizon);
+    }
+    return "("
+        + visitImplication(ctx.left, prefixIdx, QFIdx, prevPrefixIdx, horizon)
+        + ")"
+        + " <==> "
+        + "("
+        + visitImplication(ctx.right, prefixIdx, QFIdx, prevPrefixIdx, horizon)
+        + ")";
+  }
+
+  public String visitImplication(
+      MTLParser.ImplicationContext ctx,
+      String prefixIdx,
+      int QFIdx,
+      String prevPrefixIdx,
+      long horizon) {
+
+    if (ctx.right == null) {
+      return visitDisjunction(ctx.left, prefixIdx, QFIdx, prevPrefixIdx, horizon);
+    }
+    return "("
+        + visitDisjunction(ctx.left, prefixIdx, QFIdx, prevPrefixIdx, horizon)
+        + ")"
+        + " ==> "
+        + "("
+        + visitDisjunction(ctx.right, prefixIdx, QFIdx, prevPrefixIdx, horizon)
+        + ")";
+  }
+
+  public String visitDisjunction(
+      MTLParser.DisjunctionContext ctx,
+      String prefixIdx,
+      int QFIdx,
+      String prevPrefixIdx,
+      long horizon) {
+
+    String str = "";
+    for (int i = 0; i < ctx.terms.size(); i++) {
+      str +=
+          "("
+              + visitConjunction(ctx.terms.get(i), prefixIdx, QFIdx, prevPrefixIdx, horizon)
+              + ")"
+              + (i == ctx.terms.size() - 1 ? "" : "||");
+    }
+    return str;
+  }
+
+  public String visitConjunction(
+      MTLParser.ConjunctionContext ctx,
+      String prefixIdx,
+      int QFIdx,
+      String prevPrefixIdx,
+      long horizon) {
+
+    String str = "";
+    for (int i = 0; i < ctx.terms.size(); i++) {
+      str +=
+          "("
+              + visitUntil(
+                  (MTLParser.UntilContext) ctx.terms.get(i),
+                  prefixIdx,
+                  QFIdx,
+                  prevPrefixIdx,
+                  horizon)
+              + ")"
+              + (i == ctx.terms.size() - 1 ? "" : "&&");
+    }
+    return str;
+  }
+
+  // A custom dispatch function
+  public String _visitUnaryOp(
+      MTLParser.UnaryOpContext ctx,
+      String prefixIdx,
+      int QFIdx,
+      String prevPrefixIdx,
+      long horizon) {
+
+    // FIXME: Is there a more "antlr" way to do dispatch here?
+    if (ctx instanceof MTLParser.NoUnaryOpContext) {
+      return visitNoUnaryOp(
+          (MTLParser.NoUnaryOpContext) ctx, prefixIdx, QFIdx, prevPrefixIdx, horizon);
+    }
+    if (ctx instanceof MTLParser.NegationContext) {
+      return visitNegation(
+          (MTLParser.NegationContext) ctx, prefixIdx, QFIdx, prevPrefixIdx, horizon);
+    }
+    if (ctx instanceof MTLParser.NextContext) {
+      return visitNext((MTLParser.NextContext) ctx, prefixIdx, QFIdx, prevPrefixIdx, horizon);
+    }
+    if (ctx instanceof MTLParser.GloballyContext) {
+      return visitGlobally(
+          (MTLParser.GloballyContext) ctx, prefixIdx, QFIdx, prevPrefixIdx, horizon);
+    }
+    if (ctx instanceof MTLParser.FinallyContext) {
+      return visitFinally((MTLParser.FinallyContext) ctx, prefixIdx, QFIdx, prevPrefixIdx, horizon);
+    }
+
+    // FIXME: Throw an exception.
+    return "";
+  }
+
+  public String visitUntil(
+      MTLParser.UntilContext ctx, String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
+
+    // If right is null, continue recursion.
+    if (ctx.right == null) {
+      return _visitUnaryOp(ctx.left, prefixIdx, QFIdx, prevPrefixIdx, horizon);
+    }
+
+    String end;
+    if (this.tactic.equals("induction")) {
+      end = "(" + prefixIdx + " + CT)";
+    } else {
+      end = "END";
+    }
+
+    // Otherwise, create the Until formula.
+    // Check if the time interval is a range or a singleton.
+    long lowerBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
+    long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
+    long currentHorizon = horizon + upperBoundNanoSec;
+    if (currentHorizon > this.horizon) this.horizon = currentHorizon;
+    String timePredicate =
+        generateTimePredicate(
+            ctx.timeInterval, lowerBoundNanoSec, upperBoundNanoSec, "j" + QFIdx, prefixIdx);
+
+    return "finite_exists "
+        + "("
+        + "j"
+        + QFIdx
+        + " : integer) in indices :: "
+        + "j"
+        + QFIdx
+        + " >= "
+        + prefixIdx
+        + " && "
+        + "j"
+        + QFIdx
+        + " <= "
+        + end
+        + " && "
+        + "!"
+        + "isNULL"
+        + "("
+        + "j"
+        + QFIdx
+        + ")"
+        + " && "
+        + "("
+        + _visitUnaryOp(ctx.right, ("j" + QFIdx), QFIdx + 1, prefixIdx, currentHorizon)
+        + ")"
+        + " && "
+        + "("
+        + "\n"
+        + "// Time Predicate\n"
+        + timePredicate
+        + "\n"
+        + ")"
+        + " && "
+        + "("
+        + "finite_forall "
+        + "("
+        + "i"
+        + QFIdx
+        + " : integer) in indices :: "
+        + "("
+        + "i"
+        + QFIdx
+        + " >= "
+        + prefixIdx
+        + " && "
+        + "i"
+        + QFIdx
+        + " < "
+        + "j"
+        + QFIdx
+        + ")"
+        + " ==> "
+        + "("
+        + _visitUnaryOp(ctx.left, ("i" + QFIdx), QFIdx + 1, ("j" + QFIdx), currentHorizon)
+        + ")"
+        + ")";
+  }
+
+  public String visitNoUnaryOp(
+      MTLParser.NoUnaryOpContext ctx,
+      String prefixIdx,
+      int QFIdx,
+      String prevPrefixIdx,
+      long horizon) {
+
+    return visitPrimary(ctx.formula, prefixIdx, QFIdx, prevPrefixIdx, horizon);
+  }
+
+  public String visitNegation(
+      MTLParser.NegationContext ctx,
+      String prefixIdx,
+      int QFIdx,
+      String prevPrefixIdx,
+      long horizon) {
+
+    return "!(" + visitPrimary(ctx.formula, prefixIdx, QFIdx, prevPrefixIdx, horizon) + ")";
+  }
+
+  public String visitNext(
+      MTLParser.NextContext ctx, String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
+    // FIXME: Horizon needs to advance!
+    return visitPrimary(ctx.formula, ("(" + prefixIdx + "+1)"), QFIdx, prevPrefixIdx, horizon);
+  }
+
+  public String visitGlobally(
+      MTLParser.GloballyContext ctx,
+      String prefixIdx,
+      int QFIdx,
+      String prevPrefixIdx,
+      long horizon) {
+
+    String end;
+    if (this.tactic.equals("induction")) {
+      end = "(" + prefixIdx + " + CT)";
+    } else {
+      end = "END";
+    }
+
+    long lowerBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
+    long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
+    long currentHorizon = horizon + upperBoundNanoSec;
+    if (currentHorizon > this.horizon) this.horizon = currentHorizon;
+    String timePredicate =
+        generateTimePredicate(
+            ctx.timeInterval, lowerBoundNanoSec, upperBoundNanoSec, "j" + QFIdx, prefixIdx);
+    return "("
+        + "finite_forall "
+        + "("
+        + "j"
+        + QFIdx
+        + " : integer) in indices :: "
+        + "("
+        + "j"
+        + QFIdx
+        + " >= "
+        + prefixIdx
+        + " && "
+        + "j"
+        + QFIdx
+        + " <= "
+        + end
+        + " && "
+        + "!"
+        + "isNULL"
+        + "("
+        + "j"
+        + QFIdx
+        + ")"
+        + " && "
+        + "("
+        + "\n"
+        + "// Time Predicate\n"
+        + timePredicate
+        + "\n"
+        + ")"
+        + ")"
+        + " ==> "
+        + "("
+        + visitPrimary(ctx.formula, ("j" + QFIdx), QFIdx + 1, prefixIdx, currentHorizon)
+        + ")"
+        + ")";
+  }
+
+  public String visitFinally(
+      MTLParser.FinallyContext ctx,
+      String prefixIdx,
+      int QFIdx,
+      String prevPrefixIdx,
+      long horizon) {
+
+    String end;
+    if (this.tactic.equals("induction")) {
+      end = "(" + prefixIdx + " + CT)";
+    } else {
+      end = "END";
+    }
+
+    long lowerBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, false);
+    long upperBoundNanoSec = getNanoSecFromIntervalContext(ctx.timeInterval, true);
+    long currentHorizon = horizon + upperBoundNanoSec;
+    if (currentHorizon > this.horizon) this.horizon = currentHorizon;
+    String timePredicate =
+        generateTimePredicate(
+            ctx.timeInterval, lowerBoundNanoSec, upperBoundNanoSec, "j" + QFIdx, prefixIdx);
+    return "finite_exists "
+        + "("
+        + "j"
+        + QFIdx
+        + " : integer) in indices :: "
+        + "j"
+        + QFIdx
+        + " >= "
+        + prefixIdx
+        + " && "
+        + "j"
+        + QFIdx
+        + " <= "
+        + end
+        + " && "
+        + "!"
+        + "isNULL"
+        + "("
+        + "j"
+        + QFIdx
+        + ")"
+        + " && "
+        + "("
+        + visitPrimary(ctx.formula, ("j" + QFIdx), QFIdx + 1, prefixIdx, currentHorizon)
+        + ")"
+        + " && "
+        + "("
+        + "\n"
+        + "// Time Predicate\n"
+        + timePredicate
+        + "\n"
+        + ")";
+  }
+
+  public String visitPrimary(
+      MTLParser.PrimaryContext ctx,
+      String prefixIdx,
+      int QFIdx,
+      String prevPrefixIdx,
+      long horizon) {
+
+    if (ctx.atom != null)
+      return visitAtomicProp(ctx.atom, prefixIdx, QFIdx, prevPrefixIdx, horizon);
+    else if (ctx.id != null) {
+      // Check if the ID is a reaction.
+      // FIXME: Not robust.
+      if (ctx.id.getText().contains("_reaction_")) {
+        return ctx.id.getText() + "(" + "rxn(" + prefixIdx + ")" + ")";
+      } else if (ctx.id.getText().contains("_is_present")) {
+        return ctx.id.getText() + "(" + "t(" + prefixIdx + ")" + ")";
+      } else {
+        return ctx.id.getText() + "(" + "s(" + prefixIdx + ")" + ")";
+      }
+    } else return visitMtl(ctx.formula, prefixIdx, QFIdx, prevPrefixIdx, horizon);
+  }
+
+  public String visitAtomicProp(
+      MTLParser.AtomicPropContext ctx,
+      String prefixIdx,
+      int QFIdx,
+      String prevPrefixIdx,
+      long horizon) {
+
+    if (ctx.primitive != null) return ctx.primitive.getText();
+    else
+      return visitExpr(ctx.left, prefixIdx, QFIdx, prevPrefixIdx, horizon)
+          + " "
+          + ctx.op.getText()
+          + " "
+          + visitExpr(ctx.right, prefixIdx, QFIdx, prevPrefixIdx, horizon);
+  }
+
+  public String visitExpr(
+      MTLParser.ExprContext ctx, String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
+
+    if (ctx.ID() != null) return ctx.ID().getText() + "(" + "s(" + prefixIdx + ")" + ")";
+    else if (ctx.INTEGER() != null) return ctx.INTEGER().getText();
+    else return visitSum(ctx.sum(), prefixIdx, QFIdx, prevPrefixIdx, horizon);
+  }
+
+  public String visitSum(
+      MTLParser.SumContext ctx, String prefixIdx, int QFIdx, String prevPrefixIdx, long horizon) {
+
+    String str = "";
+    for (int i = 0; i < ctx.terms.size(); i++) {
+      str +=
+          "("
+              + visitDifference(ctx.terms.get(i), prefixIdx, QFIdx, prevPrefixIdx, horizon)
+              + ")"
+              + (i == ctx.terms.size() - 1 ? "" : "+");
+    }
+    return str;
+  }
+
+  public String visitDifference(
+      MTLParser.DifferenceContext ctx,
+      String prefixIdx,
+      int QFIdx,
+      String prevPrefixIdx,
+      long horizon) {
+
+    String str = "";
+    for (int i = 0; i < ctx.terms.size(); i++) {
+      str +=
+          "("
+              + visitProduct(ctx.terms.get(i), prefixIdx, QFIdx, prevPrefixIdx, horizon)
+              + ")"
+              + (i == ctx.terms.size() - 1 ? "" : "-");
+    }
+    return str;
+  }
+
+  public String visitProduct(
+      MTLParser.ProductContext ctx,
+      String prefixIdx,
+      int QFIdx,
+      String prevPrefixIdx,
+      long horizon) {
+
+    String str = "";
+    for (int i = 0; i < ctx.terms.size(); i++) {
+      str +=
+          "("
+              + visitQuotient(ctx.terms.get(i), prefixIdx, QFIdx, prevPrefixIdx, horizon)
+              + ")"
+              + (i == ctx.terms.size() - 1 ? "" : "*");
+    }
+    return str;
+  }
+
+  public String visitQuotient(
+      MTLParser.QuotientContext ctx,
+      String prefixIdx,
+      int QFIdx,
+      String prevPrefixIdx,
+      long horizon) {
+
+    String str = "";
+    for (int i = 0; i < ctx.terms.size(); i++) {
+      str +=
+          "("
+              + visitExpr(ctx.terms.get(i), prefixIdx, QFIdx, prevPrefixIdx, horizon)
+              + ")"
+              + (i == ctx.terms.size() - 1 ? "" : "/");
+    }
+    return str;
+  }
+
+  ///////////////////////////////////////
+  //// Private methods
+
+  /**
+   * Return a time value in nanoseconds from an IntervalContext.
+   *
+   * @param ctx
+   * @param getUpper
+   * @return
+   */
+  private long getNanoSecFromIntervalContext(MTLParser.IntervalContext ctx, boolean getUpper) {
+    // If we have a singleton, the return value is the same regardless of getUpper.
+    if (ctx instanceof MTLParser.SingletonContext) {
+      MTLParser.SingletonContext singletonCtx = (MTLParser.SingletonContext) ctx;
+      String timeInstantValue = singletonCtx.instant.value.getText();
+      String timeInstantUnit = "";
+      long timeInstantNanoSec = 0;
+      if (!timeInstantValue.equals("0")) {
+        timeInstantUnit = singletonCtx.instant.unit.getText();
+        TimeValue timeValue =
+            new TimeValue(Integer.valueOf(timeInstantValue), TimeUnit.fromName(timeInstantUnit));
+        timeInstantNanoSec = timeValue.toNanoSeconds();
+      }
+      return timeInstantNanoSec;
+    }
+
+    MTLParser.RangeContext rangeCtx = (MTLParser.RangeContext) ctx;
+    if (!getUpper) {
+      String lowerBoundTimeValue = rangeCtx.lowerbound.value.getText();
+      String lowerBoundTimeUnit = "";
+      long lowerBoundNanoSec = 0;
+      if (!lowerBoundTimeValue.equals("0")) {
+        lowerBoundTimeUnit = rangeCtx.lowerbound.unit.getText();
+        TimeValue lowerTimeValue =
+            new TimeValue(
+                Integer.valueOf(lowerBoundTimeValue), TimeUnit.fromName(lowerBoundTimeUnit));
+        lowerBoundNanoSec = lowerTimeValue.toNanoSeconds();
+      }
+      return lowerBoundNanoSec;
+    } else {
+      String upperBoundTimeValue = rangeCtx.upperbound.value.getText();
+      String upperBoundTimeUnit = "";
+      long upperBoundNanoSec = 0;
+      if (!upperBoundTimeValue.equals("0")) {
+        upperBoundTimeUnit = rangeCtx.upperbound.unit.getText();
+        TimeValue upperTimeValue =
+            new TimeValue(
+                Integer.valueOf(upperBoundTimeValue), TimeUnit.fromName(upperBoundTimeUnit));
+        upperBoundNanoSec = upperTimeValue.toNanoSeconds();
+      }
+      return upperBoundNanoSec;
+    }
+  }
+
+  /**
+   * Generate a time predicate from a range.
+   *
+   * @param ctx
+   * @param lowerBoundNanoSec
+   * @param upperBoundNanoSec
+   * @return
+   */
+  private String generateTimePredicate(
+      MTLParser.IntervalContext ctx,
+      long lowerBoundNanoSec,
+      long upperBoundNanoSec,
+      String prefixIdx,
+      String prevPrefixIdx) {
+    String timePredicate = "";
+
+    if (ctx instanceof MTLParser.SingletonContext) {
+      MTLParser.SingletonContext singletonCtx = (MTLParser.SingletonContext) ctx;
+      timePredicate +=
+          "tag_same(g("
+              + prefixIdx
+              + "), "
+              + "tag_delay(g("
+              + prevPrefixIdx
+              + "), "
+              + upperBoundNanoSec
+              + "))";
+    } else {
+      // Since MTL doesn't include microsteps, we only compare timestamps here.
+      MTLParser.RangeContext rangeCtx = (MTLParser.RangeContext) ctx;
+      timePredicate += "(";
+      if (rangeCtx.LBRACKET() != null) {
+        timePredicate +=
+            "pi1(g("
+                + prefixIdx
+                + "))"
+                + " >= "
+                + "("
+                + "pi1(g("
+                + prevPrefixIdx
+                + "))"
+                + " + "
+                + lowerBoundNanoSec
+                + ")";
+      } else {
+        timePredicate +=
+            "pi1(g("
+                + prefixIdx
+                + "))"
+                + " > "
+                + "("
+                + "pi1(g("
+                + prevPrefixIdx
+                + "))"
+                + " + "
+                + lowerBoundNanoSec
+                + ")";
+      }
+      timePredicate += ") && (";
+      if (rangeCtx.RBRACKET() != null) {
+        timePredicate +=
+            "pi1(g("
+                + prefixIdx
+                + "))"
+                + " <= "
+                + "("
+                + "pi1(g("
+                + prevPrefixIdx
+                + "))"
+                + " + "
+                + upperBoundNanoSec
+                + ")";
+      } else {
+        timePredicate +=
+            "pi1(g("
+                + prefixIdx
+                + "))"
+                + " < "
+                + "("
+                + "pi1(g("
+                + prevPrefixIdx
+                + "))"
+                + " + "
+                + upperBoundNanoSec
+                + ")";
+      }
+      timePredicate += ")";
+    }
+
+    return timePredicate;
+  }
+
+  /** Get the time horizon (in nanoseconds) of the property. */
+  public long getHorizon() {
+    return this.horizon;
+  }
+}
diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
new file mode 100644
index 0000000000..2f34d04c05
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -0,0 +1,1737 @@
+/*************
+ * Copyright (c) 2021, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
+
+/** (EXPERIMENTAL) Generator for Uclid5 models. */
+package org.lflang.analyses.uclid;
+
+import static org.lflang.ASTUtils.*;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.xbase.lib.Exceptions;
+import org.lflang.ASTUtils;
+import org.lflang.Target;
+import org.lflang.TimeUnit;
+import org.lflang.TimeValue;
+import org.lflang.analyses.cast.AstUtils;
+import org.lflang.analyses.cast.BuildAstParseTreeVisitor;
+import org.lflang.analyses.cast.CAst;
+import org.lflang.analyses.cast.CToUclidVisitor;
+import org.lflang.analyses.cast.IfNormalFormAstVisitor;
+import org.lflang.analyses.cast.VariablePrecedenceVisitor;
+import org.lflang.analyses.statespace.StateSpaceDiagram;
+import org.lflang.analyses.statespace.StateSpaceExplorer;
+import org.lflang.analyses.statespace.StateSpaceNode;
+import org.lflang.analyses.statespace.Tag;
+import org.lflang.dsl.CLexer;
+import org.lflang.dsl.CParser;
+import org.lflang.dsl.CParser.BlockItemListContext;
+import org.lflang.dsl.MTLLexer;
+import org.lflang.dsl.MTLParser;
+import org.lflang.dsl.MTLParser.MtlContext;
+import org.lflang.generator.ActionInstance;
+import org.lflang.generator.CodeBuilder;
+import org.lflang.generator.GeneratorBase;
+import org.lflang.generator.LFGeneratorContext;
+import org.lflang.generator.NamedInstance;
+import org.lflang.generator.PortInstance;
+import org.lflang.generator.ReactionInstance;
+import org.lflang.generator.ReactorInstance;
+import org.lflang.generator.RuntimeRange;
+import org.lflang.generator.SendRange;
+import org.lflang.generator.StateVariableInstance;
+import org.lflang.generator.TargetTypes;
+import org.lflang.generator.TimerInstance;
+import org.lflang.generator.TriggerInstance;
+import org.lflang.lf.AttrParm;
+import org.lflang.lf.Attribute;
+import org.lflang.lf.Connection;
+import org.lflang.lf.Expression;
+import org.lflang.lf.Time;
+import org.lflang.util.StringUtil;
+
+public class UclidGenerator extends GeneratorBase {
+
+  ////////////////////////////////////////////
+  //// Public fields
+  // Data structures for storing info about the runtime instances.
+  public List<ReactorInstance> reactorInstances = new ArrayList<ReactorInstance>();
+  public List<ReactionInstance.Runtime> reactionInstances =
+      new ArrayList<ReactionInstance.Runtime>();
+
+  // State variables in the system
+  public List<StateVariableInstance> stateVariables = new ArrayList<StateVariableInstance>();
+
+  // Triggers in the system
+  public List<ActionInstance> actionInstances = new ArrayList<ActionInstance>();
+  public List<PortInstance> inputInstances = new ArrayList<PortInstance>();
+  public List<PortInstance> outputInstances = new ArrayList<PortInstance>();
+  public List<PortInstance> portInstances = new ArrayList<PortInstance>();
+  public List<TimerInstance> timerInstances = new ArrayList<TimerInstance>();
+
+  // Joint lists of the lists above.
+  public List<TriggerInstance> triggerInstances; // Triggers = ports + actions + timers
+  public List<NamedInstance> namedInstances; // Named instances = triggers + state variables
+
+  // A list of paths to the uclid files generated
+  public List<Path> generatedFiles = new ArrayList<>();
+  public Map<Path, String> expectations = new HashMap<>();
+
+  // The directory where the generated files are placed
+  public Path outputDir;
+
+  // A runner for the generated Uclid files
+  public UclidRunner runner;
+
+  // If true, use logical time-based semantics;
+  // otherwise, use event-based semantics,
+  // as described in Sirjani et. al (2020).
+  public boolean logicalTimeBased = false;
+
+  ////////////////////////////////////////////
+  //// Protected fields
+
+  // A list of MTL properties represented in Attributes.
+  protected List<Attribute> properties;
+
+  /** The main place to put generated code. */
+  protected CodeBuilder code = new CodeBuilder();
+
+  /** Strings from the property attribute */
+  protected String name;
+
+  protected String tactic;
+  protected String spec; // SMTL
+  protected String expect;
+
+  /**
+   * The horizon (the total time interval required for evaluating an MTL property, which is derived
+   * from the MTL spec), the completeness threshold (CT) (the number of transitions required for
+   * evaluating the FOL spec in the trace), and the transpiled FOL spec.
+   */
+  protected long horizon = 0; // in nanoseconds
+
+  protected String FOLSpec = "";
+  protected int CT = 0;
+  protected static final int CT_MAX_SUPPORTED = 100;
+
+  // Constructor
+  public UclidGenerator(LFGeneratorContext context, List<Attribute> properties) {
+    super(context);
+    this.properties = properties;
+    this.runner = new UclidRunner(this);
+  }
+
+  ////////////////////////////////////////////////////////////
+  //// Public methods
+  public void doGenerate(Resource resource, LFGeneratorContext context) {
+
+    // FIXME: How much of doGenerate() from GeneratorBase is needed?
+    super.printInfo(context.getMode());
+    ASTUtils.setMainName(context.getFileConfig().resource, context.getFileConfig().name);
+    // FIXME: Perform an analysis on the property and remove unrelevant components.
+    super.createMainInstantiation();
+
+    ////////////////////////////////////////
+
+    // Create the main reactor instance if there is a main reactor.
+    createMainReactorInstance();
+
+    // Extract information from the named instances.
+    populateDataStructures();
+
+    // Create the src-gen directory
+    setupDirectories();
+
+    // Generate a Uclid model for each property.
+    for (Attribute prop : this.properties) {
+      this.name =
+          StringUtil.removeQuotes(
+              prop.getAttrParms().stream()
+                  .filter(attr -> attr.getName().equals("name"))
+                  .findFirst()
+                  .get()
+                  .getValue());
+      this.tactic =
+          StringUtil.removeQuotes(
+              prop.getAttrParms().stream()
+                  .filter(attr -> attr.getName().equals("tactic"))
+                  .findFirst()
+                  .get()
+                  .getValue());
+      this.spec =
+          StringUtil.removeQuotes(
+              prop.getAttrParms().stream()
+                  .filter(attr -> attr.getName().equals("spec"))
+                  .findFirst()
+                  .get()
+                  .getValue());
+
+      processMTLSpec();
+
+      Optional<AttrParm> CTAttr =
+          prop.getAttrParms().stream().filter(attr -> attr.getName().equals("CT")).findFirst();
+      if (CTAttr.isPresent()) {
+        this.CT = Integer.parseInt(CTAttr.get().getValue());
+      } else {
+        computeCT();
+      }
+      // For automating data collection, print the CT to stderr.
+      System.err.println("CT: " + this.CT);
+      if (this.CT > CT_MAX_SUPPORTED) {
+        System.out.println(
+            "ERROR: The maximum steps supported is "
+                + CT_MAX_SUPPORTED
+                + " but checking this property requires "
+                + this.CT
+                + " steps. "
+                + "This property will NOT be checked.");
+        continue;
+      }
+
+      Optional<AttrParm> ExpectAttr =
+          prop.getAttrParms().stream().filter(attr -> attr.getName().equals("expect")).findFirst();
+      if (ExpectAttr.isPresent()) this.expect = ExpectAttr.get().getValue();
+
+      generateUclidFile();
+    }
+  }
+
+  ////////////////////////////////////////////////////////////
+  //// Protected methods
+
+  /** Generate the Uclid model. */
+  protected void generateUclidFile() {
+    try {
+      // Generate main.ucl and print to file
+      code = new CodeBuilder();
+      Path file = this.outputDir.resolve(this.tactic + "_" + this.name + ".ucl");
+      String filename = file.toString();
+      generateUclidCode();
+      code.writeToFile(filename);
+      this.generatedFiles.add(file);
+      if (this.expect != null) this.expectations.put(file, this.expect);
+    } catch (IOException e) {
+      Exceptions.sneakyThrow(e);
+    }
+  }
+
+  /** The main function that generates Uclid code. */
+  protected void generateUclidCode() {
+    code.pr(
+        String.join(
+            "\n",
+            "/*******************************",
+            " * Auto-generated UCLID5 model *",
+            " ******************************/"));
+
+    code.pr("module main {");
+    code.indent();
+
+    // Timing semantics
+    generateTimingSemantics();
+
+    // Trace definition
+    generateTraceDefinition();
+
+    // Reaction IDs and state variables
+    generateReactionIdsAndStateVars();
+
+    // Reactor semantics
+    generateReactorSemantics();
+
+    // Triggers and reactions
+    generateTriggersAndReactions();
+
+    // Initial Condition
+    generateInitialConditions();
+
+    // Reaction bodies
+    generateReactionAxioms();
+
+    // Properties
+    generateProperty();
+
+    // Control block
+    generateControlBlock();
+
+    code.unindent();
+    code.pr("}");
+  }
+
+  /** Macros for timing semantics */
+  protected void generateTimingSemantics() {
+    code.pr(
+        String.join(
+            "\n",
+            "/*******************************",
+            " * Time and Related Operations *",
+            " ******************************/",
+            "type timestamp_t = integer;                     // The unit is nanoseconds",
+            "type microstep_t = integer;",
+            "type tag_t = {",
+            "    timestamp_t,",
+            "    microstep_t",
+            "};",
+            "type interval_t  = tag_t;",
+            "",
+            "// Projection macros",
+            "define pi1(t : tag_t) : timestamp_t = t._1;     // Get timestamp from tag",
+            "define pi2(t : tag_t) : microstep_t = t._2;     // Get microstep from tag",
+            "",
+            "// Interval constructor",
+            "define zero() : interval_t",
+            "= {0, 0};",
+            "define startup() : interval_t",
+            "= zero();",
+            "define mstep() : interval_t",
+            "= {0, 1};",
+            "define nsec(t : integer) : interval_t",
+            "= {t, 0};",
+            "define usec(t : integer) : interval_t",
+            "= {t * 1000, 0};",
+            "define msec(t : integer) : interval_t",
+            "= {t * 1000000, 0};",
+            "define sec(t : integer) : interval_t",
+            "= {t * 1000000000, 0};",
+            "define inf() : interval_t",
+            "= {-1, 0};",
+            "",
+            "// Helper function",
+            "define isInf(i : interval_t) : boolean",
+            "= pi1(i) < 0;",
+            "",
+            "// Tag comparison",
+            "define tag_later(t1 : tag_t, t2 : tag_t) : boolean",
+            "= pi1(t1) > pi1(t2)",
+            "    || (pi1(t1) == pi1(t2) && pi2(t1) > pi2(t2))",
+            "    || (isInf(t1) && !isInf(t2));",
+            "",
+            "define tag_same(t1 : tag_t, t2 : tag_t) : boolean",
+            "= t1 == t2;",
+            "",
+            "define tag_earlier(t1 : tag_t, t2 : tag_t) : boolean",
+            "= pi1(t1) < pi1(t2)",
+            "    || (pi1(t1) == pi1(t2) && pi2(t1) < pi2(t2))",
+            "    || (!isInf(t1) && isInf(t2));",
+            "",
+            "// Used for incrementing a tag through an action",
+            "define tag_schedule(t : tag_t, i : integer) : tag_t",
+            "= if (i == 0) then { pi1(t), pi2(t)+1 } else { pi1(t)+i, 0 };",
+            "",
+            "// Used for incrementing a tag along a connection",
+            "define tag_delay(t : tag_t, i : integer) : tag_t",
+            "= if (i == 0) then { pi1(t), pi2(t) } else { pi1(t)+i, 0 };",
+            "",
+            "// Only consider timestamp for now.",
+            "define tag_diff(t1, t2: tag_t) : interval_t",
+            "= if (!isInf(t1) && !isInf(t2))",
+            "    then { pi1(t1) - pi1(t2), pi2(t1) - pi2(t2) }",
+            "    else inf();",
+            "\n"));
+  }
+
+  /** Macros, type definitions, and variable declarations for trace (path) */
+  protected void generateTraceDefinition() {
+    //// Why do we have a padding at the end of the trace?
+    //
+    // To handle bounded traces for a potentially unbounded execution
+    // (due to, for example, timers or systems forming a loop),
+    // we need to let certain axioms "terminate" the execution and
+    // put any "spilled-over" states in the trace padding.
+    //
+    // For example, an axiom could say "if a reaction is triggered
+    // at step i, it schedules an action that appears 1 sec later
+    // in some future step." Assuming our completeness threshold is 10,
+    // this axiom can block the model (i.e. returns TRIVIALLY true)
+    // at step 10 because there are not any more steps in the bounded trace.
+    // To avoid this, a padding of the size of the number of reactions
+    // is added to the trace. In addition, an antecedent of the form
+    // "i >= START && i <= END" is added to all the axioms. The padding
+    // will store all the spilled-over states in order to prevent
+    // model blocking.
+    int traceEndIndex = this.CT + this.reactionInstances.size();
+
+    // Define various constants.
+    code.pr(
+        String.join(
+            "\n",
+            "/********************",
+            " * Trace Definition *",
+            " *******************/",
+            "const START : integer = 0; // The start index of the trace.",
+            "const END : integer = "
+                + String.valueOf(this.CT)
+                + "; // The end index of the trace (without padding)",
+            "const END_TRACE : integer = "
+                + String.valueOf(traceEndIndex)
+                + "; // The end index of the trace with padding",
+            "\n"));
+
+    // Define trace indices as a group,
+    // so that we can use finite quantifiers.
+    code.pr("group indices : integer = {");
+    code.indent();
+    String indices = "";
+    for (int i = 0; i <= traceEndIndex; i++) {
+      indices += String.valueOf(i) + (i == traceEndIndex ? "" : ", ");
+    }
+    code.pr(indices);
+    code.unindent();
+    code.pr("};\n\n");
+
+    // Define step, event, and trace types.
+    code.pr(
+        String.join(
+            "\n",
+            "// Define step and event types.",
+            "type step_t = integer;",
+            "type event_t = { rxn_t, tag_t, state_t, trigger_t, sched_t, payload_t };",
+            "",
+            "// Create a bounded trace with length " + String.valueOf(this.CT)));
+    code.pr("// Potentially unbounded trace, we bound this later.");
+    code.pr("type trace_t  = [integer]event_t;");
+
+    // Declare start time and trace.
+    code.pr(
+        String.join(
+            "\n",
+            "// Declare start time.",
+            "var start_time : timestamp_t;",
+            "",
+            "// Declare trace.",
+            "var trace : trace_t;"));
+
+    // Start generating helper macros.
+    code.pr(String.join("\n", "/*****************", " * Helper Macros *", " ****************/"));
+
+    // Define a getter for uclid arrays.
+    String initialReactions = "";
+    if (this.reactionInstances.size() > 0) {
+      initialReactions = "false, ".repeat(this.reactionInstances.size());
+      initialReactions = initialReactions.substring(0, initialReactions.length() - 2);
+    } else {
+      // Initialize a dummy variable just to make the code compile.
+      initialReactions = "false";
+    }
+    initialReactions = "{" + initialReactions + "}";
+    String initialStates = "";
+    if (this.namedInstances.size() > 0) {
+      initialStates = "0, ".repeat(this.namedInstances.size());
+      initialStates = initialStates.substring(0, initialStates.length() - 2);
+    } else {
+      // Initialize a dummy variable just to make the code compile.
+      initialStates = "0";
+    }
+    String initialTriggerPresence = "";
+    if (this.triggerInstances.size() > 0) {
+      initialTriggerPresence = "false, ".repeat(this.triggerInstances.size());
+      initialTriggerPresence =
+          initialTriggerPresence.substring(0, initialTriggerPresence.length() - 2);
+    } else {
+      // Initialize a dummy variable just to make the code compile.
+      initialTriggerPresence = "false";
+    }
+    String initialActionsScheduled = "";
+    if (this.actionInstances.size() > 0) {
+      initialActionsScheduled = "false, ".repeat(this.actionInstances.size());
+      initialActionsScheduled =
+          initialActionsScheduled.substring(0, initialActionsScheduled.length() - 2);
+    } else {
+      // Initialize a dummy variable just to make the code compile.
+      initialActionsScheduled = "false";
+    }
+    String initialActionsScheduledPayload = "";
+    if (this.actionInstances.size() > 0) {
+      initialActionsScheduledPayload = "0, ".repeat(this.actionInstances.size());
+      initialActionsScheduledPayload =
+          initialActionsScheduledPayload.substring(0, initialActionsScheduledPayload.length() - 2);
+    } else {
+      // Initialize a dummy variable just to make the code compile.
+      initialActionsScheduledPayload = "0";
+    }
+    code.pr("// Helper macro that returns an element based on index.");
+    code.pr("define get(tr : trace_t, i : step_t) : event_t =");
+    code.pr("if (i >= START || i <= END_TRACE) then tr[i] else");
+    code.pr(
+        "{ "
+            + initialReactions
+            + ", inf(), { "
+            + initialStates
+            + " }, { "
+            + initialTriggerPresence
+            + " }, {"
+            + initialActionsScheduled
+            + " }, {"
+            + initialActionsScheduledPayload
+            + "} };");
+
+    // Define an event getter from the trace.
+    code.pr(
+        String.join(
+            "\n",
+            "define elem(i : step_t) : event_t",
+            "= get(trace, i);",
+            "",
+            "// projection macros",
+            "define rxn      (i : step_t) : rxn_t        = elem(i)._1;",
+            "define g        (i : step_t) : tag_t        = elem(i)._2;",
+            "define s        (i : step_t) : state_t      = elem(i)._3;",
+            "define t        (i : step_t) : trigger_t    = elem(i)._4;",
+            "define d        (i : step_t) : sched_t      = elem(i)._5;",
+            "define pl       (i : step_t) : payload_t    = elem(i)._6;",
+            "define isNULL   (i : step_t) : boolean      = rxn(i) == " + initialReactions + ";"));
+  }
+
+  /** Type definitions for runtime reaction Ids and state variables */
+  protected void generateReactionIdsAndStateVars() {
+    // Encode the components and the logical delays
+    // present in a reactor system.
+    code.pr(
+        String.join(
+            "\n",
+            "/**********************************",
+            " * Reaction IDs & State Variables *",
+            " *********************************/",
+            "",
+            "//////////////////////////",
+            "// Application Specific"));
+
+    // Enumerate over all reactions.
+    code.pr(String.join("\n", "// Reactions", "type rxn_t = {"));
+    code.indent();
+    for (var i = 0; i < this.reactionInstances.size(); i++) {
+      // Print a list of reaction IDs.
+      // Add a comma if not last.
+      code.pr(
+          "boolean"
+              + ((i == this.reactionInstances.size() - 1) ? "" : ",")
+              + "\t// "
+              + this.reactionInstances.get(i));
+    }
+    code.unindent();
+    code.pr("};\n");
+
+    // Generate projection macros.
+    code.pr("// Reaction projection macros");
+    for (var i = 0; i < this.reactionInstances.size(); i++) {
+      code.pr(
+          "define "
+              + this.reactionInstances.get(i).getReaction().getFullNameWithJoiner("_")
+              + "(n : rxn_t) : boolean = n._"
+              + (i + 1)
+              + ";");
+    }
+    code.pr("\n"); // Newline
+
+    // State variables and triggers
+    // FIXME: expand to data types other than integer
+    code.pr("// State variables and triggers");
+    code.pr("type state_t = {");
+    code.indent();
+    if (this.namedInstances.size() > 0) {
+      for (var i = 0; i < this.namedInstances.size(); i++) {
+        code.pr(
+            "integer"
+                + ((i == this.namedInstances.size() - 1) ? "" : ",")
+                + "\t// "
+                + this.namedInstances.get(i));
+      }
+    } else {
+      code.pr(
+          String.join(
+              "\n",
+              "// There are no ports or state variables.",
+              "// Insert a dummy integer to make the model compile.",
+              "integer"));
+    }
+    code.unindent();
+    code.pr("};");
+    code.pr("// State variable projection macros");
+    for (var i = 0; i < this.namedInstances.size(); i++) {
+      code.pr(
+          "define "
+              + this.namedInstances.get(i).getFullNameWithJoiner("_")
+              + "(s : state_t) : integer = s._"
+              + (i + 1)
+              + ";");
+    }
+    code.pr("\n"); // Newline
+
+    // A boolean tuple indicating whether triggers are present.
+    code.pr("// A boolean tuple indicating whether triggers are present.");
+    code.pr("type trigger_t = {");
+    code.indent();
+    if (this.triggerInstances.size() > 0) {
+      for (var i = 0; i < this.triggerInstances.size(); i++) {
+        code.pr(
+            "boolean"
+                + ((i == this.triggerInstances.size() - 1) ? "" : ",")
+                + "\t// "
+                + this.triggerInstances.get(i));
+      }
+    } else {
+      code.pr(
+          String.join(
+              "\n",
+              "// There are no triggers.",
+              "// Insert a dummy boolean to make the model compile.",
+              "boolean"));
+    }
+    code.unindent();
+    code.pr("};");
+    code.pr("// Trigger presence projection macros");
+    for (var i = 0; i < this.triggerInstances.size(); i++) {
+      code.pr(
+          "define "
+              + this.triggerInstances.get(i).getFullNameWithJoiner("_")
+              + "_is_present"
+              + "(t : trigger_t) : boolean = t._"
+              + (i + 1)
+              + ";");
+    }
+
+    // A boolean tuple indicating whether actions are scheduled by reactions
+    // at the instant when they are triggered.
+    code.pr(
+        String.join(
+            "\n",
+            "// A boolean tuple indicating whether actions are scheduled by reactions",
+            "// at the instant when they are triggered."));
+    code.pr("type sched_t = {");
+    code.indent();
+    if (this.actionInstances.size() > 0) {
+      for (var i = 0; i < this.actionInstances.size(); i++) {
+        code.pr(
+            "boolean"
+                + ((i == this.actionInstances.size() - 1) ? "" : ",")
+                + "\t// "
+                + this.actionInstances.get(i));
+      }
+    } else {
+      code.pr(
+          String.join(
+              "\n",
+              "// There are no actions.",
+              "// Insert a dummy boolean to make the model compile.",
+              "boolean"));
+    }
+    code.unindent();
+    code.pr("};");
+    code.pr("// Projection macros for action schedule flag");
+    for (var i = 0; i < this.actionInstances.size(); i++) {
+      code.pr(
+          "define "
+              + this.actionInstances.get(i).getFullNameWithJoiner("_")
+              + "_scheduled"
+              + "(d : sched_t) : boolean = d._"
+              + (i + 1)
+              + ";");
+    }
+
+    // A integer tuple indicating the integer payloads scheduled by reactions
+    // at the instant when they are triggered.
+    code.pr(
+        String.join(
+            "\n",
+            "// A integer tuple indicating the integer payloads scheduled by reactions",
+            "// at the instant when they are triggered."));
+    code.pr("type payload_t = {");
+    code.indent();
+    if (this.actionInstances.size() > 0) {
+      for (var i = 0; i < this.actionInstances.size(); i++) {
+        code.pr(
+            "integer"
+                + ((i == this.actionInstances.size() - 1) ? "" : ",")
+                + "\t// "
+                + this.actionInstances.get(i));
+      }
+    } else {
+      code.pr(
+          String.join(
+              "\n",
+              "// There are no actions.",
+              "// Insert a dummy integer to make the model compile.",
+              "integer"));
+    }
+    code.unindent();
+    code.pr("};");
+    code.pr("// Projection macros for scheduled payloads");
+    for (var i = 0; i < this.actionInstances.size(); i++) {
+      code.pr(
+          "define "
+              + this.actionInstances.get(i).getFullNameWithJoiner("_")
+              + "_scheduled_payload"
+              + "(payload : payload_t) : integer = payload._"
+              + (i + 1)
+              + ";");
+    }
+  }
+
+  /** Axioms for reactor semantics */
+  protected void generateReactorSemantics() {
+    code.pr(
+        String.join(
+            "\n",
+            "/*********************",
+            " * Reactor Semantics *",
+            " *********************/",
+            ""));
+
+    // Non-federated "happened-before"
+    code.pr(
+        String.join(
+            "\n",
+            "// Non-federated \"happened-before\"",
+            "define hb(e1, e2 : event_t) : boolean",
+            "= tag_earlier(e1._2, e2._2)"));
+    if (!this.logicalTimeBased) {
+      code.indent();
+      // Get happen-before relation between two reactions.
+      code.pr("|| (tag_same(e1._2, e2._2) && ( false");
+      // Iterate over reactions based on upstream/downstream relations.
+      for (var upstreamRuntime : this.reactionInstances) {
+        var downstreamReactions = upstreamRuntime.getReaction().dependentReactions();
+        for (var downstream : downstreamReactions) {
+          // If the downstream reaction and the upstream
+          // reaction are in the same reactor, skip, since
+          // they will be accounted for in the for loop below.
+          if (downstream.getParent().equals(upstreamRuntime.getReaction().getParent())) continue;
+          for (var downstreamRuntime : downstream.getRuntimeInstances()) {
+            code.pr(
+                "|| ("
+                    + upstreamRuntime.getReaction().getFullNameWithJoiner("_")
+                    + "(e1._1)"
+                    + " && "
+                    + downstreamRuntime.getReaction().getFullNameWithJoiner("_")
+                    + "(e2._1)"
+                    + ")");
+          }
+        }
+      }
+      // Iterate over reactions based on priorities.
+      for (var reactor : this.reactorInstances) {
+        for (int i = 0; i < reactor.reactions.size(); i++) {
+          for (int j = i + 1; j < reactor.reactions.size(); j++) {
+            code.pr(
+                "|| ("
+                    + reactor.reactions.get(i).getFullNameWithJoiner("_")
+                    + "(e1._1)"
+                    + " && "
+                    + reactor.reactions.get(j).getFullNameWithJoiner("_")
+                    + "(e2._1)"
+                    + ")");
+          }
+        }
+      }
+      code.unindent();
+      code.pr("))");
+    }
+    code.pr(";");
+
+    code.pr(
+        String.join(
+            "\n",
+            "/** transition relation **/",
+            "// transition relation constrains future states",
+            "// based on previous states.",
+            "",
+            "// Events are ordered by \"happened-before\" relation.",
+            "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END_TRACE) ==>"
+                + " (finite_forall (j : integer) in indices ::",
+            "    (j >= START && j <= END_TRACE) ==> (hb(elem(i), elem(j)) ==> i < j)));",
+            "",
+            "// Tags should be non-negative.",
+            "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END_TRACE)",
+            "    ==> pi1(g(i)) >= 0);",
+            "",
+            "// Microsteps should be non-negative.",
+            "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END_TRACE)",
+            "    ==> pi2(g(i)) >= 0);",
+            "",
+            "// Begin the frame at the start time specified.",
+            "define start_frame(i : step_t) : boolean =",
+            "    (tag_same(g(i), {start_time, 0}) || tag_later(g(i), {start_time, 0}));",
+            "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END_TRACE)",
+            "    ==> start_frame(i));",
+            "",
+            "// NULL events should appear in the suffix, except for START.",
+            "axiom(finite_forall (j : integer) in indices :: (j > START && j <= END_TRACE) ==> (",
+            "    !isNULL(j)) ==> ",
+            "        (finite_forall (i : integer) in indices :: (i > START && i < j) ==>"
+                + " (!isNULL(i))));",
+            ""));
+
+    //// Axioms for the event-based semantics
+    if (!this.logicalTimeBased) {
+      code.pr("//// Axioms for the event-based semantics");
+
+      // the same event can only trigger once in a logical instant
+      code.pr(
+          String.join(
+              "\n",
+              "// the same event can only trigger once in a logical instant",
+              "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END) ==>"
+                  + " (finite_forall (j : integer) in indices ::",
+              "    (j >= START && j <= END) ==> ((rxn(i) == rxn(j) && i != j)",
+              "        ==> !tag_same(g(i), g(j)))));",
+              ""));
+
+      // Only one reaction gets triggered at a time.
+      ArrayList<String> reactionsStatus = new ArrayList<>();
+      for (int i = 0; i < this.reactionInstances.size(); i++) reactionsStatus.add("false");
+      code.pr(
+          String.join(
+              "\n",
+              "// Only one reaction gets triggered at a time.",
+              "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (",
+              "    isNULL(i)"));
+      code.indent();
+      for (int i = 0; i < this.reactionInstances.size(); i++) {
+        String[] li = reactionsStatus.toArray(String[]::new);
+        li[i] = "true";
+        code.pr("|| rxn(i) == " + "{" + String.join(", ", li) + "}");
+      }
+      code.unindent();
+      code.pr("));");
+    }
+  }
+
+  /** Axioms for the trigger mechanism */
+  protected void generateTriggersAndReactions() {
+    code.pr(String.join("\n", "/***************", " * Connections *", " ***************/"));
+    // FIXME: Support banks and multiports. Figure out how to work with ranges.
+    // Iterate over all the ports. Generate an axiom for each connection
+    // (i.e. a pair of input-output ports).
+    // A "range" holds the connection information.
+    // See connectPortInstances() in ReactorInstance.java for more details.
+    for (var port : this.portInstances) {
+      for (SendRange range : port.getDependentPorts()) {
+        PortInstance source = range.instance;
+        Connection connection = range.connection;
+        List<RuntimeRange<PortInstance>> destinations = range.destinations;
+
+        // Extract delay value
+        long delay = 0;
+        if (connection.getDelay() != null) {
+          // Somehow delay is an Expression,
+          // which makes it hard to convert to nanoseconds.
+          Expression delayExpr = connection.getDelay();
+          if (delayExpr instanceof Time) {
+            long interval = ((Time) delayExpr).getInterval();
+            String unit = ((Time) delayExpr).getUnit();
+            TimeValue timeValue = new TimeValue(interval, TimeUnit.fromName(unit));
+            delay = timeValue.toNanoSeconds();
+          }
+        }
+
+        for (var portRange : destinations) {
+          var destination = portRange.instance;
+
+          // We have extracted the source, destination, and connection AST node.
+          // Now we are ready to generate an axiom for this triple.
+          code.pr(
+              "// "
+                  + source.getFullNameWithJoiner("_")
+                  + " "
+                  + (connection.isPhysical() ? "~>" : "->")
+                  + " "
+                  + destination.getFullNameWithJoiner("_"));
+          code.pr(
+              String.join(
+                  "\n",
+                  "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
+                  "// If "
+                      + source.getFullNameWithJoiner("_")
+                      + " is present, then "
+                      + destination.getFullNameWithJoiner("_")
+                      + " will be present.",
+                  "// with the same value after some fixed delay of " + delay + " nanoseconds.",
+                  "(" + source.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> ((",
+                  "    finite_exists (j : integer) in indices :: j > i && j <= END",
+                  "    && " + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(j))",
+                  "    && "
+                      + destination.getFullNameWithJoiner("_")
+                      + "(s(j)) == "
+                      + source.getFullNameWithJoiner("_")
+                      + "(s(i))",
+                  connection.isPhysical() ? "" : "&& g(j) == tag_delay(g(i), " + delay + ")",
+                  ")",
+                  ")) // Closes ("
+                      + source.getFullNameWithJoiner("_")
+                      + "_is_present"
+                      + "(t(i)) ==> ((.",
+                  //// Separator
+                  "// If "
+                      + destination.getFullNameWithJoiner("_")
+                      + " is present, there exists an "
+                      + source.getFullNameWithJoiner("_")
+                      + " in prior steps.",
+                  "// This additional term establishes a one-to-one relationship between two ports'"
+                      + " signals.",
+                  "&& (" + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
+                  "    finite_exists (j : integer) in indices :: j >= START && j < i",
+                  "    && " + source.getFullNameWithJoiner("_") + "_is_present" + "(t(j))",
+                  connection.isPhysical() ? "" : "    && g(i) == tag_delay(g(j), " + delay + ")",
+                  ")) // Closes the one-to-one relationship.",
+                  "));"));
+
+          // If destination is not present, then its value resets to 0.
+          code.pr(
+              String.join(
+                  "\n",
+                  "// If "
+                      + destination.getFullNameWithJoiner("_")
+                      + " is not present, then its value resets to 0.",
+                  "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END &&"
+                      + " !isNULL(i)) ==> (",
+                  "    (!"
+                      + destination.getFullNameWithJoiner("_")
+                      + "_is_present"
+                      + "(t(i)) ==> (",
+                  "        " + destination.getFullNameWithJoiner("_") + "(s(i)) == 0",
+                  "    ))",
+                  "));"));
+        }
+      }
+    }
+
+    if (this.actionInstances.size() > 0) {
+      code.pr(String.join("\n", "/***********", " * Actions *", " ***********/"));
+      for (var action : this.actionInstances) {
+        Set<ReactionInstance> dependsOnReactions = action.getDependsOnReactions();
+        String comment =
+            "If "
+                + action.getFullNameWithJoiner("_")
+                + " is present, these reactions could schedule it: ";
+        String triggerStr = "";
+        for (var reaction : dependsOnReactions) {
+          comment += reaction.getFullNameWithJoiner("_") + ", ";
+          triggerStr +=
+              String.join(
+                  "\n",
+                  "// " + reaction.getFullNameWithJoiner("_"),
+                  // OR because only any present trigger can trigger the reaction.
+                  "|| (" + action.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
+                  "    finite_exists (j : integer) in indices :: j >= START && j < i",
+                  "    && " + reaction.getFullNameWithJoiner("_") + "(rxn(j))",
+                  "    && g(i) == tag_schedule(g(j), " + action.getMinDelay().toNanoSeconds() + ")",
+                  "    && " + action.getFullNameWithJoiner("_") + "_scheduled" + "(d(j))",
+                  "    && "
+                      + action.getFullNameWithJoiner("_")
+                      + "(s(i))"
+                      + " == "
+                      + action.getFullNameWithJoiner("_")
+                      + "_scheduled_payload"
+                      + "(pl(j))",
+                  "))");
+        }
+
+        // After populating the string segments,
+        // print the generated code string.
+        code.pr(
+            String.join(
+                "\n",
+                "// " + comment,
+                "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> ("
+                    + " false",
+                triggerStr,
+                "));"));
+
+        // If the action is not present, then its value resets to 0.
+        code.pr(
+            String.join(
+                "\n",
+                "// If "
+                    + action.getFullNameWithJoiner("_")
+                    + "  is not present, then its value resets to 0.",
+                "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END &&"
+                    + " !isNULL(i)) ==> (",
+                "    (!" + action.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
+                "        " + action.getFullNameWithJoiner("_") + "(s(i)) == 0",
+                "    ))",
+                "));"));
+      }
+    }
+
+    if (this.timerInstances.size() > 0) {
+      code.pr(String.join("\n", "/**********", " * Timers *", " **********/"));
+      /**
+       * The timer axioms take the following form:
+       *
+       * <p>// An initial firing at {offset, 0} axiom( ((g(END)._1 >= 500000000) ==> ( finite_exists
+       * (j : integer) in indices :: (j > START && j <= END) && Timer_t_is_present(t(j)) &&
+       * tag_same(g(j), {500000000, 0}) )) && ((g(END)._1 < 500000000) ==> ( finite_forall (i :
+       * integer) in indices :: (i > START && i <= END) ==> (!isNULL(i)) )) ); // Schedule
+       * subsequent firings. axiom( finite_forall (i : integer) in indices :: (i >= START && i <=
+       * END) ==> ( Timer_t_is_present(t(i)) ==> ( ( finite_exists (j : integer) in indices :: (j >=
+       * START && j > i) && Timer_t_is_present(t(j)) && (g(j) == tag_schedule(g(i), 1000000000)) ) )
+       * ) ); // All firings must be evenly spaced out. axiom( finite_forall (i : integer) in
+       * indices :: (i >= START && i <= END) ==> ( Timer_t_is_present(t(i)) ==> ( // Timestamp must
+       * be offset + n * period ( exists (n : integer) :: ( n >= 0 && g(i)._1 == 500000000 + n *
+       * 1000000000 ) ) // Microstep must be 0 && ( g(i)._2 == 0 ) ) ) );
+       */
+      for (var timer : this.timerInstances) {
+        long offset = timer.getOffset().toNanoSeconds();
+        long period = timer.getPeriod().toNanoSeconds();
+
+        code.pr("//// Axioms for " + timer.getFullName());
+
+        // An initial firing at {offset, 0}
+        code.pr(
+            String.join(
+                "\n",
+                "// " + timer.getFullName() + ": an initial firing at (" + offset + ", 0)",
+                "axiom(",
+                "    ((pi1(g(END)) >= " + offset + ") ==> (",
+                "        finite_exists (j : integer) in indices :: (j > START && j <= END)",
+                "            && " + timer.getFullNameWithJoiner("_") + "_is_present(t(j))",
+                "            && tag_same(g(j), {" + offset + ", 0})",
+                "     ))",
+                "     && ((pi1(g(END)) < " + offset + ") ==> (",
+                "        finite_forall (i : integer) in indices :: (i > START && i <= END)",
+                "            ==> (!isNULL(i))",
+                "     ))",
+                ");"));
+
+        // Schedule subsequent firings.
+        code.pr(
+            String.join(
+                "\n",
+                "// "
+                    + timer.getFullName()
+                    + ": schedule subsequent firings every "
+                    + period
+                    + " ns",
+                "axiom(",
+                "    finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (",
+                "        " + timer.getFullNameWithJoiner("_") + "_is_present(t(i)) ==> (",
+                "            (",
+                "                finite_exists (j : integer) in indices :: (j >= START && j > i)",
+                "                    && " + timer.getFullNameWithJoiner("_") + "_is_present(t(j))",
+                "                    && (g(j) == tag_schedule(g(i), " + period + "))",
+                "            )",
+                "        )",
+                "    )",
+                ");"));
+
+        // All firings must be evenly spaced out.
+        code.pr(
+            String.join(
+                "\n",
+                "// " + timer.getFullName() + ": all firings must be evenly spaced out.",
+                "axiom(",
+                "    finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (",
+                "        " + timer.getFullNameWithJoiner("_") + "_is_present(t(i)) ==> (",
+                "            // Timestamp must be offset + n * period.",
+                "            (",
+                "                exists (n : integer) :: (",
+                "                    n >= 0 &&",
+                "                    pi1(g(i)) == " + offset + " + n * " + period,
+                "                )",
+                "            )",
+                "            // Microstep must be 0.",
+                "            && (pi2(g(i)) == 0)",
+                "        )",
+                "    )",
+                ");"));
+      }
+    }
+
+    code.pr(
+        String.join(
+            "\n",
+            "/********************************",
+            " * Reactions and Their Triggers *",
+            " ********************************/"));
+    // Iterate over all reactions, generate conditions for them
+    // to be triggered.
+    outerLoop:
+    for (ReactionInstance.Runtime reaction : this.reactionInstances) {
+      String str =
+          String.join(
+              "\n",
+              "// "
+                  + reaction.getReaction().getFullNameWithJoiner("_")
+                  + " is invoked when any of it triggers are present.",
+              "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END_TRACE) ==>"
+                  + " ((",
+              "    false");
+
+      // Iterate over the triggers of the reaction.
+      for (TriggerInstance trigger : reaction.getReaction().triggers) {
+        String triggerPresentStr = "";
+
+        if (trigger.isStartup()) {
+          // FIXME: Treat startup as a variable.
+          // triggerPresentStr = "g(i) == zero()";
+
+          // Handle startup.
+          code.pr(
+              String.join(
+                  "\n",
+                  "// If startup is within frame (and all variables have default values),",
+                  "// " + reaction.getReaction().getFullNameWithJoiner("_") + " must be invoked.",
+                  "axiom(",
+                  "    ((start_time == 0) ==> (",
+                  "        finite_exists (i : integer) in indices :: i > START && i <= END",
+                  "            && "
+                      + reaction.getReaction().getFullNameWithJoiner("_")
+                      + "(rxn(i))"
+                      + " && tag_same(g(i), zero())",
+                  "            && !(",
+                  "            finite_exists (j : integer) in indices :: j > START && j <= END",
+                  "            && "
+                      + reaction.getReaction().getFullNameWithJoiner("_")
+                      + "(rxn(j))",
+                  "            && j != i",
+                  "            )",
+                  "    ))",
+                  ");"));
+          continue outerLoop;
+        } else if (trigger.isShutdown()) {
+          // FIXME: For a future version.
+          System.out.println("Not implemented!");
+        } else {
+          // If the trigger is a port/action/timer.
+          triggerPresentStr = trigger.getFullNameWithJoiner("_") + "_is_present" + "(t(i))";
+        }
+
+        // Check if the trigger triggers other reactions.
+        // If so, we need to assert in the axioms that
+        // the other reactions are excluded (not invoked),
+        // to preserve the interleaving semantics.
+        String exclusion = "";
+        for (var instance : trigger.getDependentReactions()) {
+          for (var runtime : ((ReactionInstance) instance).getRuntimeInstances()) {
+            if (runtime == reaction) continue; // Skip the current reaction.
+            exclusion += " && !" + runtime.getReaction().getFullNameWithJoiner("_") + "(rxn(i))";
+          }
+        }
+
+        // code.pr("|| (" + triggerPresentStr + exclusion + ")");
+        str += "\n|| (" + triggerPresentStr + exclusion + ")";
+      }
+
+      // If any of the above trigger is present, then trigger the reaction.
+      str += "\n) <==> (" + reaction.getReaction().getFullNameWithJoiner("_") + "(rxn(i))" + ")));";
+      code.pr(str);
+    }
+  }
+
+  /** Macros for initial conditions */
+  protected void generateInitialConditions() {
+    code.pr(
+        String.join(
+            "\n",
+            "/*********************",
+            " * Initial Condition *",
+            " *********************/",
+            "define initial_condition() : boolean",
+            "= start_time == 0",
+            "    && isNULL(0)",
+            "    && g(0) == {0, 0}"));
+    code.indent();
+    for (var v : this.stateVariables) {
+      code.pr("&& " + v.getFullNameWithJoiner("_") + "(s(0))" + " == " + "0");
+    }
+    for (var t : this.triggerInstances) {
+      code.pr("&& " + t.getFullNameWithJoiner("_") + "(s(0))" + " == " + "0");
+    }
+    for (var t : this.triggerInstances) {
+      code.pr("&& !" + t.getFullNameWithJoiner("_") + "_is_present" + "(t(0))");
+    }
+    for (var d : this.actionInstances) {
+      code.pr("&& !" + d.getFullNameWithJoiner("_") + "_scheduled" + "(d(0))");
+    }
+    code.unindent();
+    code.pr(";\n");
+  }
+
+  /** Lift reaction bodies into Uclid axioms. */
+  protected void generateReactionAxioms() {
+    code.pr(String.join("\n", "/*************", " * Reactions *", " *************/"));
+
+    for (ReactionInstance.Runtime reaction : this.reactionInstances) {
+      String body = reaction.getReaction().getDefinition().getCode().getBody();
+      // System.out.println("DEBUG: Printing reaction body of " + reaction);
+      // System.out.println(body);
+
+      // Generate a parse tree.
+      CLexer lexer = new CLexer(CharStreams.fromString(body));
+      CommonTokenStream tokens = new CommonTokenStream(lexer);
+      CParser parser = new CParser(tokens);
+      BlockItemListContext parseTree = parser.blockItemList();
+
+      // Build an AST.
+      BuildAstParseTreeVisitor buildAstVisitor = new BuildAstParseTreeVisitor();
+      CAst.AstNode ast = buildAstVisitor.visitBlockItemList(parseTree);
+
+      // VariablePrecedenceVisitor
+      VariablePrecedenceVisitor precVisitor = new VariablePrecedenceVisitor();
+      precVisitor.visit(ast);
+
+      // Convert the AST to If Normal Form (INF).
+      IfNormalFormAstVisitor infVisitor = new IfNormalFormAstVisitor();
+      infVisitor.visit(ast, new ArrayList<CAst.AstNode>());
+      CAst.StatementSequenceNode inf = infVisitor.INF;
+
+      // For the variables that are USED inside this reaction, extract the conditions
+      // for setting them, and take the negation of their conjunction
+      // to get the condition for maintaining their values.
+      List<StateVariableInstance> unusedStates = new ArrayList<>(this.stateVariables);
+      List<PortInstance> unusedOutputs = new ArrayList<>(this.outputInstances);
+      List<ActionInstance> unusedActions = new ArrayList<>(this.actionInstances);
+      HashMap<NamedInstance, List<CAst.AstNode>> defaultBehaviorConditions = new HashMap<>();
+      for (CAst.AstNode node : inf.children) {
+        CAst.IfBlockNode ifBlockNode = (CAst.IfBlockNode) node;
+        // Under the INF form, a C statement is
+        // the THEN branch of an IF block.
+        CAst.AstNode stmt = ((CAst.IfBodyNode) ifBlockNode.right).left;
+        NamedInstance instance = null;
+        // Match stmt with different cases
+        if ((stmt instanceof CAst.AssignmentNode
+            && ((CAst.AssignmentNode) stmt).left instanceof CAst.StateVarNode)) {
+          CAst.StateVarNode n = (CAst.StateVarNode) ((CAst.AssignmentNode) stmt).left;
+          instance =
+              reaction.getReaction().getParent().states.stream()
+                  .filter(s -> s.getName().equals(n.name))
+                  .findFirst()
+                  .get();
+          unusedStates.remove(instance);
+        } else if (stmt instanceof CAst.SetPortNode) {
+          CAst.SetPortNode n = (CAst.SetPortNode) stmt;
+          String name = ((CAst.VariableNode) n.left).name;
+          instance =
+              reaction.getReaction().getParent().outputs.stream()
+                  .filter(s -> s.getName().equals(name))
+                  .findFirst()
+                  .get();
+          unusedOutputs.remove(instance);
+        } else if (stmt instanceof CAst.ScheduleActionNode) {
+          CAst.ScheduleActionNode n = (CAst.ScheduleActionNode) stmt;
+          String name = ((CAst.VariableNode) n.children.get(0)).name;
+          instance =
+              reaction.getReaction().getParent().actions.stream()
+                  .filter(s -> s.getName().equals(name))
+                  .findFirst()
+                  .get();
+          unusedActions.remove(instance);
+        } else if (stmt instanceof CAst.ScheduleActionIntNode) {
+          CAst.ScheduleActionIntNode n = (CAst.ScheduleActionIntNode) stmt;
+          String name = ((CAst.VariableNode) n.children.get(0)).name;
+          instance =
+              reaction.getReaction().getParent().actions.stream()
+                  .filter(s -> s.getName().equals(name))
+                  .findFirst()
+                  .get();
+          unusedStates.remove(instance);
+          unusedActions.remove(instance);
+        } else continue;
+        // Create a new entry in the list if there isn't one yet.
+        if (defaultBehaviorConditions.get(instance) == null) {
+          defaultBehaviorConditions.put(instance, new ArrayList<CAst.AstNode>());
+        }
+        defaultBehaviorConditions.get(instance).add(ifBlockNode.left);
+        // System.out.println("DEBUG: Added a reset condition: " + ifBlockNode.left);
+      }
+
+      // Generate Uclid axiom for the C AST.
+      CToUclidVisitor c2uVisitor = new CToUclidVisitor(this, reaction);
+      String axiom = c2uVisitor.visit(inf);
+      code.pr(
+          String.join(
+              "\n",
+              "// Reaction body of " + reaction,
+              "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> (",
+              "    (" + reaction.getReaction().getFullNameWithJoiner("_") + "(rxn(i))" + ")",
+              "        ==> " + "(" + "(" + axiom + ")",
+              "&& " + "( " + "true"));
+      for (NamedInstance key : defaultBehaviorConditions.keySet()) {
+        CAst.AstNode disjunction = AstUtils.takeDisjunction(defaultBehaviorConditions.get(key));
+        CAst.LogicalNotNode notNode = new CAst.LogicalNotNode();
+        notNode.child = disjunction;
+        String resetCondition = c2uVisitor.visit(notNode);
+
+        // Check for invalid reset conditions.
+        // If found, stop the execution.
+        // FIXME: A more systematic check is needed
+        // to ensure that the generated Uclid file
+        // is valid.
+        try {
+          if (resetCondition.contains("null")) {
+            throw new Exception("Null detected in a reset condition. Stop.");
+          }
+        } catch (Exception e) {
+          Exceptions.sneakyThrow(e);
+        }
+        code.pr("// Unused state variables and ports are reset by default.");
+        code.pr("&& " + "(" + "(" + resetCondition + ")" + " ==> " + "(");
+        if (key instanceof StateVariableInstance) {
+          StateVariableInstance n = (StateVariableInstance) key;
+          code.pr(
+              n.getFullNameWithJoiner("_")
+                  + "("
+                  + "s"
+                  + "("
+                  + "i"
+                  + ")"
+                  + ")"
+                  + " == "
+                  + n.getFullNameWithJoiner("_")
+                  + "("
+                  + "s"
+                  + "("
+                  + "i"
+                  + "-1"
+                  + ")"
+                  + ")");
+        } else if (key instanceof PortInstance) {
+          PortInstance n = (PortInstance) key;
+          code.pr(
+              "("
+                  + " true"
+                  // Reset value
+                  + "\n&& "
+                  + n.getFullNameWithJoiner("_")
+                  + "("
+                  + "s"
+                  + "("
+                  + "i"
+                  + ")"
+                  + ")"
+                  + " == "
+                  + "0" // Default value
+                  // Reset presence
+                  + "\n&& "
+                  + n.getFullNameWithJoiner("_")
+                  + "_is_present"
+                  + "("
+                  + "t"
+                  + "("
+                  + "i"
+                  + ")"
+                  + ")"
+                  + " == "
+                  + "false" // default presence
+                  + ")");
+        } else if (key instanceof ActionInstance) {
+          ActionInstance n = (ActionInstance) key;
+          code.pr(
+              n.getFullNameWithJoiner("_")
+                  + "_scheduled"
+                  + "("
+                  + "d"
+                  + "("
+                  + "i"
+                  + ")"
+                  + ")"
+                  + " == "
+                  + "false");
+        } else {
+          System.out.println("Unreachable!");
+        }
+        code.pr("))");
+      }
+
+      // For state variables and ports that are NOT used in this reaction,
+      // their values stay the same by default.
+      code.pr("// By default, the value of the variables used in this reaction stay the same.");
+      if (this.logicalTimeBased) {
+        // If all other reactions that can modify the SAME state variable
+        // are not triggered, then the state variable stay the same.
+        //
+        // FIXME: What if two reactions modifying the same state variable
+        // are triggered at the same time?
+        // How to use axioms to model reaction priority?
+        // The main difficulty of logical time based semantics is composing
+        // the effect of simultaneous reactions.
+        //
+        // A path way to implement it in the future:
+        // 1. For each variable, port, and action, determine a list of
+        //    reactions that can modify/schedule it.
+        // 2. Reaction axioms should be generated wrt each reactor.
+        //    For example, assuming a reactor with two input ports,
+        //    each triggering a distinct reaction. The axioms will need
+        //    to handle four cases: i. reaction 1 gets triggered and 2
+        //    does not; ii. reaction 2 gets triggered and 1 does not;
+        //    iii. both reactions get triggered; iv. none of them get
+        //    triggered. Since it is hard to specify in an independent way,
+        //    due to reaction priorities,
+        //    what happens when two reactions (modifying the same state var.)
+        //    get triggered simultaneously, some combinatorial blowup will
+        //    be incurred. In this example, four axioms (instead of two),
+        //    each handling one case, seems needed. The good news is that
+        //    axioms across reactors may be specified independently.
+        //    For example, if there is another reactor of the same class,
+        //    Only four more axioms need to be added (in total 2^2 + 2^2),
+        //    instead of 16 axioms (2^4).
+      } else {
+        for (StateVariableInstance s : unusedStates) {
+          code.pr("&& (true ==> (");
+          code.pr(
+              s.getFullNameWithJoiner("_")
+                  + "("
+                  + "s"
+                  + "("
+                  + "i"
+                  + ")"
+                  + ")"
+                  + " == "
+                  + s.getFullNameWithJoiner("_")
+                  + "("
+                  + "s"
+                  + "("
+                  + "i"
+                  + "-1"
+                  + ")"
+                  + ")");
+          code.pr("))");
+        }
+        for (PortInstance p : unusedOutputs) {
+          code.pr("&& (true ==> (");
+          code.pr(
+              "("
+                  + " true"
+                  // Reset value
+                  + "\n&& "
+                  + p.getFullNameWithJoiner("_")
+                  + "("
+                  + "s"
+                  + "("
+                  + "i"
+                  + ")"
+                  + ")"
+                  + " == "
+                  + "0" // Default value
+                  // Reset presence
+                  + "\n&& "
+                  + p.getFullNameWithJoiner("_")
+                  + "_is_present"
+                  + "("
+                  + "t"
+                  + "("
+                  + "i"
+                  + ")"
+                  + ")"
+                  + " == "
+                  + false // default presence
+                  + ")");
+          code.pr("))");
+        }
+        for (ActionInstance a : unusedActions) {
+          code.pr("&& (true ==> (");
+          code.pr(
+              a.getFullNameWithJoiner("_")
+                  + "_scheduled"
+                  + "("
+                  + "d"
+                  + "("
+                  + "i"
+                  + ")"
+                  + ")"
+                  + " == "
+                  + "false");
+          code.pr("))");
+        }
+        code.pr("))));");
+      }
+    }
+  }
+
+  protected void generateProperty() {
+    code.pr(String.join("\n", "/************", " * Property *", " ************/"));
+
+    code.pr("// The FOL property translated from user-defined MTL property:");
+    code.pr("// " + this.spec);
+    code.pr("define p(i : step_t) : boolean =");
+    code.indent();
+    code.pr(this.FOLSpec + ";");
+    code.unindent();
+
+    if (this.tactic.equals("bmc")) {
+      code.pr(
+          String.join(
+              "\n",
+              "// BMC",
+              "property " + "bmc_" + this.name + " : " + "initial_condition() ==> p(0);"));
+    } else {
+      code.pr(
+          String.join(
+              "\n",
+              "// Induction: initiation step",
+              "property " + "initiation_" + this.name + " : " + "initial_condition() ==> p(0);",
+              "// Induction: consecution step",
+              "property " + "consecution_" + this.name + " : " + "p(0) ==> p(1);"));
+    }
+  }
+
+  /** Uclid5 control block */
+  protected void generateControlBlock() {
+    code.pr(
+        String.join(
+            "\n",
+            "control {",
+            "    v = bmc(0);",
+            "    check;",
+            "    print_results;",
+            "    v.print_cex_json;",
+            "}"));
+  }
+
+  ////////////////////////////////////////////////////////////
+  //// Private methods
+
+  /**
+   * If a main or federated reactor has been declared, create a ReactorInstance for this top level.
+   * This will also assign levels to reactions, then, if the program is federated, perform an AST
+   * transformation to disconnect connections between federates.
+   */
+  private void createMainReactorInstance() {
+    if (this.mainDef != null) {
+      if (this.main == null) {
+        // Recursively build instances. This is done once because
+        // it is the same for all federates.
+        this.main = new ReactorInstance(toDefinition(mainDef.getReactorClass()), errorReporter);
+        var reactionInstanceGraph = this.main.assignLevels();
+        if (reactionInstanceGraph.nodeCount() > 0) {
+          errorReporter.reportError("Main reactor has causality cycles. Skipping code generation.");
+          return;
+        }
+      }
+    }
+  }
+
+  private void setupDirectories() {
+    // Make sure the target directory exists.
+    Path modelGenDir = context.getFileConfig().getModelGenPath();
+    this.outputDir = Paths.get(modelGenDir.toString());
+    try {
+      Files.createDirectories(outputDir);
+    } catch (IOException e) {
+      Exceptions.sneakyThrow(e);
+    }
+    System.out.println("The models will be located in: " + outputDir);
+  }
+
+  /** Populate the data structures. */
+  private void populateDataStructures() {
+    // Populate lists of reactor/reaction instances,
+    // state variables, actions, ports, and timers.
+    populateLists(this.main);
+
+    // Join actions, ports, and timers into a list of triggers.
+    this.triggerInstances = new ArrayList<TriggerInstance>(this.actionInstances);
+    this.triggerInstances.addAll(portInstances);
+    this.triggerInstances.addAll(timerInstances);
+
+    // Join state variables and triggers
+    this.namedInstances = new ArrayList<NamedInstance>(this.stateVariables);
+    namedInstances.addAll(this.triggerInstances);
+  }
+
+  private void populateLists(ReactorInstance reactor) {
+    // Reactor and reaction instances
+    this.reactorInstances.add(reactor);
+    for (var reaction : reactor.reactions) {
+      this.reactionInstances.addAll(reaction.getRuntimeInstances());
+    }
+
+    // State variables, actions, ports, timers.
+    for (var state : reactor.states) {
+      this.stateVariables.add(state);
+    }
+    for (var action : reactor.actions) {
+      this.actionInstances.add(action);
+    }
+    for (var port : reactor.inputs) {
+      this.inputInstances.add(port);
+      this.portInstances.add(port);
+    }
+    for (var port : reactor.outputs) {
+      this.outputInstances.add(port);
+      this.portInstances.add(port);
+    }
+    for (var timer : reactor.timers) {
+      this.timerInstances.add(timer);
+    }
+
+    // Recursion
+    for (var child : reactor.children) {
+      populateLists(child);
+    }
+  }
+
+  /**
+   * Compute a completeness threadhold for each property by simulating a worst-case execution by
+   * traversing the reactor instance graph and building a state space diagram.
+   */
+  private void computeCT() {
+
+    StateSpaceExplorer explorer = new StateSpaceExplorer(this.main);
+    explorer.explore(
+        new Tag(this.horizon, 0, false), true // findLoop
+        );
+    StateSpaceDiagram diagram = explorer.diagram;
+    diagram.display();
+
+    // Generate a dot file.
+    try {
+      CodeBuilder dot = diagram.generateDot();
+      Path file = this.outputDir.resolve(this.tactic + "_" + this.name + ".dot");
+      String filename = file.toString();
+      dot.writeToFile(filename);
+    } catch (IOException e) {
+      Exceptions.sneakyThrow(e);
+    }
+
+    //// Compute CT
+    if (!explorer.loopFound) {
+      if (this.logicalTimeBased) this.CT = diagram.nodeCount();
+      else {
+        // FIXME: This could be much more efficient with
+        // a linkedlist implementation. We can go straight
+        // to the next node.
+        StateSpaceNode node = diagram.head;
+        this.CT = diagram.head.reactionsInvoked.size();
+        while (node != diagram.tail) {
+          node = diagram.getDownstreamNode(node);
+          this.CT += node.reactionsInvoked.size();
+        }
+      }
+    }
+    // Over-approximate CT by estimating the number of loop iterations required.
+    else {
+      // Subtract the non-periodic logical time
+      // interval from the total horizon.
+      long horizonRemained = Math.subtractExact(this.horizon, diagram.loopNode.tag.timestamp);
+
+      // Check how many loop iteration is required
+      // to check the remaining horizon.
+      int loopIterations = 0;
+      if (diagram.loopPeriod == 0 && horizonRemained != 0)
+        Exceptions.sneakyThrow(
+            new Exception(
+                "ERROR: Zeno behavior detected while the horizon is non-zero. The program has no"
+                    + " finite CT."));
+      else if (diagram.loopPeriod == 0 && horizonRemained == 0) {
+        // Handle this edge case.
+        Exceptions.sneakyThrow(new Exception("Unhandled case: both the horizon and period are 0!"));
+      } else {
+        loopIterations = (int) Math.ceil((double) horizonRemained / diagram.loopPeriod);
+      }
+
+      if (this.logicalTimeBased) {
+        /*
+        CT = steps required for the non-periodic part
+             + steps required for the periodic part
+
+        this.CT = (diagram.loopNode.index + 1)
+            + (diagram.tail.index - diagram.loopNode.index + 1) * loopIterations;
+
+        An overflow-safe version of the line above
+        */
+        int t0 = Math.addExact(diagram.loopNode.index, 1);
+        int t1 = Math.subtractExact(diagram.tail.index, diagram.loopNode.index);
+        int t2 = Math.addExact(t1, 1);
+        int t3 = Math.multiplyExact(t2, loopIterations);
+        this.CT = Math.addExact(t0, t3);
+
+      } else {
+        // Get the number of events before the loop starts.
+        // This stops right before the loopNode is encountered.
+        StateSpaceNode node = diagram.head;
+        int numReactionInvocationsBeforeLoop = 0;
+        while (node != diagram.loopNode) {
+          numReactionInvocationsBeforeLoop += node.reactionsInvoked.size();
+          node = diagram.getDownstreamNode(node);
+        }
+        // Account for the loop node in numReactionInvocationsBeforeLoop.
+        numReactionInvocationsBeforeLoop += node.reactionsInvoked.size();
+
+        // Count the events from the loop node until
+        // loop node is reached again.
+        int numReactionInvocationsInsideLoop = 0;
+        do {
+          node = diagram.getDownstreamNode(node);
+          numReactionInvocationsInsideLoop += node.reactionsInvoked.size();
+        } while (node != diagram.loopNode);
+
+        /*
+        CT = steps required for the non-periodic part
+             + steps required for the periodic part
+
+        this.CT = numReactionInvocationsBeforeLoop
+            + numReactionInvocationsInsideLoop * loopIterations;
+
+        An overflow-safe version of the line above
+        */
+        // System.out.println("DEBUG: numReactionInvocationsBeforeLoop: " +
+        // numReactionInvocationsBeforeLoop);
+        // System.out.println("DEBUG: numReactionInvocationsInsideLoop: " +
+        // numReactionInvocationsInsideLoop);
+        // System.out.println("DEBUG: loopIterations: " + loopIterations);
+        int t0 = Math.multiplyExact(numReactionInvocationsInsideLoop, loopIterations);
+        this.CT = Math.addExact(numReactionInvocationsBeforeLoop, t0);
+      }
+    }
+  }
+
+  /** Process an MTL property. */
+  private void processMTLSpec() {
+    MTLLexer lexer = new MTLLexer(CharStreams.fromString(this.spec));
+    CommonTokenStream tokens = new CommonTokenStream(lexer);
+    MTLParser parser = new MTLParser(tokens);
+    MtlContext mtlCtx = parser.mtl();
+    MTLVisitor visitor = new MTLVisitor(this.tactic);
+
+    // The visitor transpiles the MTL into a Uclid axiom.
+    this.FOLSpec = visitor.visitMtl(mtlCtx, "i", 0, "0", 0);
+    this.horizon = visitor.getHorizon();
+  }
+
+  /////////////////////////////////////////////////
+  //// Functions from generatorBase
+
+  @Override
+  public Target getTarget() {
+    return Target.C; // Works with a C subset.
+  }
+
+  @Override
+  public TargetTypes getTargetTypes() {
+    throw new UnsupportedOperationException("TODO: auto-generated method stub");
+  }
+}
diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidRunner.java b/core/src/main/java/org/lflang/analyses/uclid/UclidRunner.java
new file mode 100644
index 0000000000..4b34fd9cfa
--- /dev/null
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidRunner.java
@@ -0,0 +1,236 @@
+/** (EXPERIMENTAL) Runner for Uclid5 models. */
+package org.lflang.analyses.uclid;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.lflang.analyses.statespace.StateInfo;
+import org.lflang.analyses.statespace.Tag;
+import org.lflang.generator.GeneratorCommandFactory;
+import org.lflang.util.LFCommand;
+
+public class UclidRunner {
+
+  /** A list of paths to the generated files */
+  List<Path> filePaths;
+
+  /** The directory where the generated files are placed */
+  public Path outputDir;
+
+  /** A factory for compiler commands. */
+  GeneratorCommandFactory commandFactory;
+
+  /** A UclidGenerator instance */
+  UclidGenerator generator;
+
+  // Constructor
+  public UclidRunner(UclidGenerator generator) {
+    this.generator = generator;
+    this.commandFactory =
+        new GeneratorCommandFactory(
+            generator.context.getErrorReporter(), generator.context.getFileConfig());
+  }
+
+  /** Parse information from an SMT model for a step in the trace. */
+  public StateInfo parseStateInfo(String smtStr) {
+    StateInfo info = new StateInfo();
+
+    // Check for any let bindings.
+    Pattern p =
+        Pattern.compile(
+            "\\(let \\(\\((a!\\d+) \\(_tuple_\\d+ ((.)+?)\\)\\)\\)(\\\\n"
+                + "|\\s)+\\(_tuple_\\d+ ((.|\\n"
+                + ")+)\\)");
+    HashMap<String, String> symbolTable = new HashMap<>();
+    Matcher m = p.matcher(smtStr.strip());
+    String itemized = "";
+    if (m.find()) {
+      // FIXME: Handle multiple let bindings.
+      String symbol = m.group(1).strip();
+      String value = m.group(2).strip();
+      symbolTable.put(symbol, value);
+      itemized = m.group(5).strip();
+    } else {
+      // Remove the outer tuple layer.
+      p = Pattern.compile("\\(_tuple_\\d+((.|\\n)*)\\)");
+      m = p.matcher(smtStr.strip());
+      m.find();
+      itemized = m.group(1).strip();
+    }
+
+    // Process each sub-tuple by matching (_tuple_n ...)
+    // or matching a!n, where n is an integer.
+    p = Pattern.compile("(a!\\d+)|\\(_tuple_\\d+((\\s|\\\\n|\\d|\\(- \\d+\\)|true|false)+)\\)");
+    m = p.matcher(itemized);
+
+    // Reactions
+    m.find();
+    String reactionsStr = "";
+    // Found a let binding.
+    if (m.group(1) != null) {
+      reactionsStr = symbolTable.get(m.group(1)).strip();
+    }
+    // The rest falls into group 2.
+    else {
+      reactionsStr = m.group(2).strip();
+    }
+    String[] reactions = reactionsStr.split("\\s+");
+    // Iterating over generator lists avoids accounting for
+    // the single dummy Uclid variable inserted earlier.
+    for (int i = 0; i < generator.reactionInstances.size(); i++) {
+      if (reactions[i].equals("true"))
+        info.reactions.add(generator.reactionInstances.get(i).getReaction().getFullName());
+    }
+
+    // Time tag
+    m.find();
+    String tagStr = "";
+    // Found a let binding.
+    if (m.group(1) != null) tagStr = symbolTable.get(m.group(1)).strip();
+    // The rest falls into group 2.
+    else tagStr = m.group(2).strip();
+    String[] tag = tagStr.split("\\s+");
+    info.tag = new Tag(Long.parseLong(tag[0]), Long.parseLong(tag[1]), false);
+
+    // Variables
+    // Currently all integers.
+    // Negative numbers could appear.
+    m.find();
+    String variablesStr = "";
+    // Found a let binding.
+    if (m.group(1) != null) variablesStr = symbolTable.get(m.group(1)).strip();
+    // The rest falls into group 2.
+    else variablesStr = m.group(2).strip();
+    String[] variables = variablesStr.replaceAll("\\(-\\s(.*?)\\)", "-$1").split("\\s+");
+    for (int i = 0; i < generator.namedInstances.size(); i++) {
+      info.variables.put(generator.namedInstances.get(i).getFullName(), variables[i]);
+    }
+
+    // Triggers
+    m.find();
+    String triggersStr = "";
+    // Found a let binding.
+    if (m.group(1) != null) triggersStr = symbolTable.get(m.group(1)).strip();
+    // The rest falls into group 2.
+    else triggersStr = m.group(2).strip();
+    String[] triggers = triggersStr.split("\\s+");
+    for (int i = 0; i < generator.triggerInstances.size(); i++) {
+      info.triggers.put(generator.triggerInstances.get(i).getFullName(), triggers[i]);
+    }
+
+    // Actions scheduled
+    m.find();
+    String scheduledStr = "";
+    // Found a let binding.
+    if (m.group(1) != null) scheduledStr = symbolTable.get(m.group(1)).strip();
+    // The rest falls into group 2.
+    else scheduledStr = m.group(2).strip();
+    String[] scheduled = scheduledStr.split("\\s+");
+    for (int i = 0; i < generator.actionInstances.size(); i++) {
+      info.scheduled.put(generator.actionInstances.get(i).getFullName(), scheduled[i]);
+    }
+
+    // Scheduled payloads
+    // Currently all integers.
+    // Negative numbers could appear.
+    m.find();
+    String payloadsStr = "";
+    // Found a let binding.
+    if (m.group(1) != null) payloadsStr = symbolTable.get(m.group(1)).strip();
+    // The rest falls into group 2.
+    else payloadsStr = m.group(2).strip();
+    String[] payloads = payloadsStr.replaceAll("\\(-\\s(.*?)\\)", "-$1").split("\\s+");
+    for (int i = 0; i < generator.actionInstances.size(); i++) {
+      info.payloads.put(generator.actionInstances.get(i).getFullName(), payloads[i]);
+    }
+
+    return info;
+  }
+
+  /**
+   * Run all the generated Uclid models, report outputs, and generate counterexample trace diagrams.
+   */
+  public void run() {
+    for (Path path : generator.generatedFiles) {
+      // Execute uclid for each property.
+      LFCommand command =
+          commandFactory.createCommand(
+              "uclid",
+              List.of(
+                  path.toString(),
+                  // Any counterexample will be in <path.toString()>.json
+                  "--json-cex",
+                  path.toString()),
+              generator.outputDir);
+      command.run();
+
+      String output = command.getOutput().toString();
+      boolean valid = !output.contains("FAILED");
+      if (valid) {
+        System.out.println("Valid!");
+      } else {
+        System.out.println("Not valid!");
+        try {
+          // Read from the JSON counterexample (cex).
+          String cexJSONStr =
+              Files.readString(Paths.get(path.toString() + ".json"), StandardCharsets.UTF_8);
+          JSONObject cexJSON = new JSONObject(cexJSONStr);
+
+          //// Extract the counterexample trace from JSON.
+          // Get the first key "property_*"
+          Iterator<String> keys = cexJSON.keys();
+          String firstKey = keys.next();
+          JSONObject propertyObj = cexJSON.getJSONObject(firstKey);
+
+          // Get Uclid trace.
+          JSONArray uclidTrace = propertyObj.getJSONArray("trace");
+
+          // Get the first step of the Uclid trace.
+          JSONObject uclidTraceStepOne = uclidTrace.getJSONObject(0);
+
+          // Get the actual trace defined in the verification model.
+          JSONObject trace = uclidTraceStepOne.getJSONArray("trace").getJSONObject(0);
+
+          String stepStr = "";
+          for (int i = 0; i <= generator.CT; i++) {
+            try {
+              stepStr = trace.getString(String.valueOf(i));
+            } catch (JSONException e) {
+              stepStr = trace.getString("-");
+            }
+            System.out.println("============ Step " + i + " ============");
+            StateInfo info = parseStateInfo(stepStr);
+            info.display();
+          }
+        } catch (IOException e) {
+          System.out.println("ERROR: Not able to read from " + path.toString());
+        }
+      }
+
+      // If "expect" is set, check if the result matches it.
+      // If not, exit with error code 1.
+      String expect = generator.expectations.get(path);
+      if (expect != null) {
+        boolean expectValid = Boolean.parseBoolean(expect);
+        if (expectValid != valid) {
+          System.out.println(
+              "ERROR: The expected result does not match the actual result. Expected: "
+                  + expectValid
+                  + ", Result: "
+                  + valid);
+          System.exit(1);
+        }
+      }
+    }
+  }
+}
diff --git a/core/src/main/java/org/lflang/dsl/antlr4/C.g4 b/core/src/main/java/org/lflang/dsl/antlr4/C.g4
new file mode 100644
index 0000000000..2fd6c3aedf
--- /dev/null
+++ b/core/src/main/java/org/lflang/dsl/antlr4/C.g4
@@ -0,0 +1,908 @@
+/*
+ [The "BSD licence"]
+ Copyright (c) 2013 Sam Harwell
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/** C 2011 grammar built from the C11 Spec */
+grammar C;
+
+
+primaryExpression
+    :   Identifier
+    |   Constant
+    |   StringLiteral+
+    |   '(' expression ')'
+    |   genericSelection
+    |   '__extension__'? '(' compoundStatement ')' // Blocks (GCC extension)
+    |   '__builtin_va_arg' '(' unaryExpression ',' typeName ')'
+    |   '__builtin_offsetof' '(' typeName ',' unaryExpression ')'
+    ;
+
+genericSelection
+    :   '_Generic' '(' assignmentExpression ',' genericAssocList ')'
+    ;
+
+genericAssocList
+    :   genericAssociation (',' genericAssociation)*
+    ;
+
+genericAssociation
+    :   (typeName | 'default') ':' assignmentExpression
+    ;
+
+postfixExpression
+    :
+    (   primaryExpression
+    |   '__extension__'? '(' typeName ')' '{' initializerList ','? '}'
+    )
+    ('[' expression ']'
+    | '(' argumentExpressionList? ')'
+    | ('.' | '->') Identifier
+    | ('++' | '--')
+    )*
+    ;
+
+argumentExpressionList
+    :   assignmentExpression (',' assignmentExpression)*
+    ;
+
+unaryExpression
+    :
+    ('++' |  '--' |  'sizeof')*
+    (postfixExpression
+    |   unaryOperator castExpression
+    |   ('sizeof' | '_Alignof') '(' typeName ')'
+    |   '&&' Identifier // GCC extension address of label
+    )
+    ;
+
+unaryOperator
+    :   '&' | '*' | '+' | '-' | '~' | '!'
+    ;
+
+castExpression
+    :   '__extension__'? '(' typeName ')' castExpression
+    |   unaryExpression
+    |   DigitSequence // for
+    ;
+
+multiplicativeExpression
+    :   castExpression (('*'|'/'|'%') castExpression)*
+    ;
+
+additiveExpression
+    :   multiplicativeExpression (('+'|'-') multiplicativeExpression)*
+    ;
+
+shiftExpression
+    :   additiveExpression (('<<'|'>>') additiveExpression)*
+    ;
+
+relationalExpression
+    :   shiftExpression (('<'|'>'|'<='|'>=') shiftExpression)*
+    ;
+
+equalityExpression
+    :   relationalExpression (('=='| '!=') relationalExpression)*
+    ;
+
+andExpression
+    :   equalityExpression ( '&' equalityExpression)*
+    ;
+
+exclusiveOrExpression
+    :   andExpression ('^' andExpression)*
+    ;
+
+inclusiveOrExpression
+    :   exclusiveOrExpression ('|' exclusiveOrExpression)*
+    ;
+
+logicalAndExpression
+    :   inclusiveOrExpression ('&&' inclusiveOrExpression)*
+    ;
+
+logicalOrExpression
+    :   logicalAndExpression ( '||' logicalAndExpression)*
+    ;
+
+conditionalExpression
+    :   logicalOrExpression ('?' expression ':' conditionalExpression)?
+    ;
+
+assignmentExpression
+    :   conditionalExpression
+    |   unaryExpression assignmentOperator assignmentExpression
+    |   DigitSequence // for
+    ;
+
+assignmentOperator
+    :   '=' | '*=' | '/=' | '%=' | '+=' | '-=' | '<<=' | '>>=' | '&=' | '^=' | '|='
+    ;
+
+expression
+    :   assignmentExpression (',' assignmentExpression)*
+    ;
+
+constantExpression
+    :   conditionalExpression
+    ;
+
+declaration
+    :   declarationSpecifiers initDeclaratorList? ';'
+    |   staticAssertDeclaration
+    ;
+
+declarationSpecifiers
+    :   declarationSpecifier+
+    ;
+
+declarationSpecifiers2
+    :   declarationSpecifier+
+    ;
+
+declarationSpecifier
+    :   storageClassSpecifier
+    |   typeSpecifier
+    |   typeQualifier
+    |   functionSpecifier
+    |   alignmentSpecifier
+    ;
+
+initDeclaratorList
+    :   initDeclarator (',' initDeclarator)*
+    ;
+
+initDeclarator
+    :   declarator ('=' initializer)?
+    ;
+
+storageClassSpecifier
+    :   'typedef'
+    |   'extern'
+    |   'static'
+    |   '_Thread_local'
+    |   'auto'
+    |   'register'
+    ;
+
+typeSpecifier
+    :   ('void'
+    |   'char'
+    |   'short'
+    |   'int'
+    |   'long'
+    |   'float'
+    |   'double'
+    |   'signed'
+    |   'unsigned'
+    |   '_Bool'
+    |   '_Complex'
+    |   '__m128'
+    |   '__m128d'
+    |   '__m128i')
+    |   '__extension__' '(' ('__m128' | '__m128d' | '__m128i') ')'
+    |   atomicTypeSpecifier
+    |   structOrUnionSpecifier
+    |   enumSpecifier
+    |   typedefName
+    |   '__typeof__' '(' constantExpression ')' // GCC extension
+    ;
+
+structOrUnionSpecifier
+    :   structOrUnion Identifier? '{' structDeclarationList '}'
+    |   structOrUnion Identifier
+    ;
+
+structOrUnion
+    :   'struct'
+    |   'union'
+    ;
+
+structDeclarationList
+    :   structDeclaration+
+    ;
+
+structDeclaration // The first two rules have priority order and cannot be simplified to one expression.
+    :   specifierQualifierList structDeclaratorList ';'
+    |   specifierQualifierList ';'
+    |   staticAssertDeclaration
+    ;
+
+specifierQualifierList
+    :   (typeSpecifier| typeQualifier) specifierQualifierList?
+    ;
+
+structDeclaratorList
+    :   structDeclarator (',' structDeclarator)*
+    ;
+
+structDeclarator
+    :   declarator
+    |   declarator? ':' constantExpression
+    ;
+
+enumSpecifier
+    :   'enum' Identifier? '{' enumeratorList ','? '}'
+    |   'enum' Identifier
+    ;
+
+enumeratorList
+    :   enumerator (',' enumerator)*
+    ;
+
+enumerator
+    :   enumerationConstant ('=' constantExpression)?
+    ;
+
+enumerationConstant
+    :   Identifier
+    ;
+
+atomicTypeSpecifier
+    :   '_Atomic' '(' typeName ')'
+    ;
+
+typeQualifier
+    :   'const'
+    |   'restrict'
+    |   'volatile'
+    |   '_Atomic'
+    ;
+
+functionSpecifier
+    :   ('inline'
+    |   '_Noreturn'
+    |   '__inline__' // GCC extension
+    |   '__stdcall')
+    |   gccAttributeSpecifier
+    |   '__declspec' '(' Identifier ')'
+    ;
+
+alignmentSpecifier
+    :   '_Alignas' '(' (typeName | constantExpression) ')'
+    ;
+
+declarator
+    :   pointer? directDeclarator gccDeclaratorExtension*
+    ;
+
+directDeclarator
+    :   Identifier
+    |   '(' declarator ')'
+    |   directDeclarator '[' typeQualifierList? assignmentExpression? ']'
+    |   directDeclarator '[' 'static' typeQualifierList? assignmentExpression ']'
+    |   directDeclarator '[' typeQualifierList 'static' assignmentExpression ']'
+    |   directDeclarator '[' typeQualifierList? '*' ']'
+    |   directDeclarator '(' parameterTypeList ')'
+    |   directDeclarator '(' identifierList? ')'
+    |   Identifier ':' DigitSequence  // bit field
+    |   vcSpecificModifer Identifier // Visual C Extension
+    |   '(' vcSpecificModifer declarator ')' // Visual C Extension
+    ;
+
+vcSpecificModifer
+    :   ('__cdecl' 
+    |   '__clrcall' 
+    |   '__stdcall' 
+    |   '__fastcall' 
+    |   '__thiscall' 
+    |   '__vectorcall') 
+    ;
+
+
+gccDeclaratorExtension
+    :   '__asm' '(' StringLiteral+ ')'
+    |   gccAttributeSpecifier
+    ;
+
+gccAttributeSpecifier
+    :   '__attribute__' '(' '(' gccAttributeList ')' ')'
+    ;
+
+gccAttributeList
+    :   gccAttribute? (',' gccAttribute?)*
+    ;
+
+gccAttribute
+    :   ~(',' | '(' | ')') // relaxed def for "identifier or reserved word"
+        ('(' argumentExpressionList? ')')?
+    ;
+
+nestedParenthesesBlock
+    :   (   ~('(' | ')')
+        |   '(' nestedParenthesesBlock ')'
+        )*
+    ;
+
+pointer
+    :  (('*'|'^') typeQualifierList?)+ // ^ - Blocks language extension
+    ;
+
+typeQualifierList
+    :   typeQualifier+
+    ;
+
+parameterTypeList
+    :   parameterList (',' '...')?
+    ;
+
+parameterList
+    :   parameterDeclaration (',' parameterDeclaration)*
+    ;
+
+parameterDeclaration
+    :   declarationSpecifiers declarator
+    |   declarationSpecifiers2 abstractDeclarator?
+    ;
+
+identifierList
+    :   Identifier (',' Identifier)*
+    ;
+
+typeName
+    :   specifierQualifierList abstractDeclarator?
+    ;
+
+abstractDeclarator
+    :   pointer
+    |   pointer? directAbstractDeclarator gccDeclaratorExtension*
+    ;
+
+directAbstractDeclarator
+    :   '(' abstractDeclarator ')' gccDeclaratorExtension*
+    |   '[' typeQualifierList? assignmentExpression? ']'
+    |   '[' 'static' typeQualifierList? assignmentExpression ']'
+    |   '[' typeQualifierList 'static' assignmentExpression ']'
+    |   '[' '*' ']'
+    |   '(' parameterTypeList? ')' gccDeclaratorExtension*
+    |   directAbstractDeclarator '[' typeQualifierList? assignmentExpression? ']'
+    |   directAbstractDeclarator '[' 'static' typeQualifierList? assignmentExpression ']'
+    |   directAbstractDeclarator '[' typeQualifierList 'static' assignmentExpression ']'
+    |   directAbstractDeclarator '[' '*' ']'
+    |   directAbstractDeclarator '(' parameterTypeList? ')' gccDeclaratorExtension*
+    ;
+
+typedefName
+    :   Identifier
+    ;
+
+initializer
+    :   assignmentExpression
+    |   '{' initializerList ','? '}'
+    ;
+
+initializerList
+    :   designation? initializer (',' designation? initializer)*
+    ;
+
+designation
+    :   designatorList '='
+    ;
+
+designatorList
+    :   designator+
+    ;
+
+designator
+    :   '[' constantExpression ']'
+    |   '.' Identifier
+    ;
+
+staticAssertDeclaration
+    :   '_Static_assert' '(' constantExpression ',' StringLiteral+ ')' ';'
+    ;
+
+statement
+    :   labeledStatement
+    |   compoundStatement
+    |   expressionStatement
+    |   selectionStatement
+    |   iterationStatement
+    |   jumpStatement
+    |   ('__asm' | '__asm__') ('volatile' | '__volatile__') '(' (logicalOrExpression (',' logicalOrExpression)*)? (':' (logicalOrExpression (',' logicalOrExpression)*)?)* ')' ';'
+    ;
+
+labeledStatement
+    :   Identifier ':' statement
+    |   'case' constantExpression ':' statement
+    |   'default' ':' statement
+    ;
+
+compoundStatement
+    :   '{' blockItemList? '}'
+    ;
+
+blockItemList
+    :   blockItem+
+    ;
+
+// Reaction body is a blockItem.
+blockItem
+    :   statement
+    |   declaration
+    ;
+
+expressionStatement
+    :   expression? ';'
+    ;
+
+selectionStatement
+    :   'if' '(' expression ')' statement ('else' statement)?
+    |   'switch' '(' expression ')' statement
+    ;
+
+iterationStatement
+    :   While '(' expression ')' statement
+    |   Do statement While '(' expression ')' ';'
+    |   For '(' forCondition ')' statement
+    ;
+
+//    |   'for' '(' expression? ';' expression?  ';' forUpdate? ')' statement
+//    |   For '(' declaration  expression? ';' expression? ')' statement
+
+forCondition
+	:   (forDeclaration | expression?) ';' forExpression? ';' forExpression?
+	;
+
+forDeclaration
+    :   declarationSpecifiers initDeclaratorList?
+    ;
+
+forExpression
+    :   assignmentExpression (',' assignmentExpression)*
+    ;
+
+jumpStatement
+    :   ('goto' Identifier
+    |   ('continue'| 'break')
+    |   'return' expression?
+    |   'goto' unaryExpression // GCC extension
+    )
+    ';'
+    ;
+
+compilationUnit
+    :   translationUnit? EOF
+    ;
+
+translationUnit
+    :   externalDeclaration+
+    ;
+
+externalDeclaration
+    :   functionDefinition
+    |   declaration
+    |   ';' // stray ;
+    ;
+
+functionDefinition
+    :   declarationSpecifiers? declarator declarationList? compoundStatement
+    ;
+
+declarationList
+    :   declaration+
+    ;
+
+Auto : 'auto';
+Break : 'break';
+Case : 'case';
+Char : 'char';
+Const : 'const';
+Continue : 'continue';
+Default : 'default';
+Do : 'do';
+Double : 'double';
+Else : 'else';
+Enum : 'enum';
+Extern : 'extern';
+Float : 'float';
+For : 'for';
+Goto : 'goto';
+If : 'if';
+Inline : 'inline';
+Int : 'int';
+Long : 'long';
+Register : 'register';
+Restrict : 'restrict';
+Return : 'return';
+Short : 'short';
+Signed : 'signed';
+Sizeof : 'sizeof';
+Static : 'static';
+Struct : 'struct';
+Switch : 'switch';
+Typedef : 'typedef';
+Union : 'union';
+Unsigned : 'unsigned';
+Void : 'void';
+Volatile : 'volatile';
+While : 'while';
+
+Alignas : '_Alignas';
+Alignof : '_Alignof';
+Atomic : '_Atomic';
+Bool : '_Bool';
+Complex : '_Complex';
+Generic : '_Generic';
+Imaginary : '_Imaginary';
+Noreturn : '_Noreturn';
+StaticAssert : '_Static_assert';
+ThreadLocal : '_Thread_local';
+
+LeftParen : '(';
+RightParen : ')';
+LeftBracket : '[';
+RightBracket : ']';
+LeftBrace : '{';
+RightBrace : '}';
+
+Less : '<';
+LessEqual : '<=';
+Greater : '>';
+GreaterEqual : '>=';
+LeftShift : '<<';
+RightShift : '>>';
+
+Plus : '+';
+PlusPlus : '++';
+Minus : '-';
+MinusMinus : '--';
+Star : '*';
+Div : '/';
+Mod : '%';
+
+And : '&';
+Or : '|';
+AndAnd : '&&';
+OrOr : '||';
+Caret : '^';
+Not : '!';
+Tilde : '~';
+
+Question : '?';
+Colon : ':';
+Semi : ';';
+Comma : ',';
+
+Assign : '=';
+// '*=' | '/=' | '%=' | '+=' | '-=' | '<<=' | '>>=' | '&=' | '^=' | '|='
+StarAssign : '*=';
+DivAssign : '/=';
+ModAssign : '%=';
+PlusAssign : '+=';
+MinusAssign : '-=';
+LeftShiftAssign : '<<=';
+RightShiftAssign : '>>=';
+AndAssign : '&=';
+XorAssign : '^=';
+OrAssign : '|=';
+
+Equal : '==';
+NotEqual : '!=';
+
+Arrow : '->';
+Dot : '.';
+Ellipsis : '...';
+
+Identifier
+    :   IdentifierNondigit
+        (   IdentifierNondigit
+        |   Digit
+        )*
+    ;
+
+fragment
+IdentifierNondigit
+    :   Nondigit
+    |   UniversalCharacterName
+    //|   // other implementation-defined characters...
+    ;
+
+fragment
+Nondigit
+    :   [a-zA-Z_]
+    ;
+
+fragment
+Digit
+    :   [0-9]
+    ;
+
+fragment
+UniversalCharacterName
+    :   '\\u' HexQuad
+    |   '\\U' HexQuad HexQuad
+    ;
+
+fragment
+HexQuad
+    :   HexadecimalDigit HexadecimalDigit HexadecimalDigit HexadecimalDigit
+    ;
+
+Constant
+    :   IntegerConstant
+    |   FloatingConstant
+    //|   EnumerationConstant
+    |   CharacterConstant
+    ;
+
+fragment
+IntegerConstant
+    :   DecimalConstant IntegerSuffix?
+    |   OctalConstant IntegerSuffix?
+    |   HexadecimalConstant IntegerSuffix?
+    |	BinaryConstant
+    ;
+
+fragment
+BinaryConstant
+	:	'0' [bB] [0-1]+
+	;
+
+fragment
+DecimalConstant
+    :   NonzeroDigit Digit*
+    ;
+
+fragment
+OctalConstant
+    :   '0' OctalDigit*
+    ;
+
+fragment
+HexadecimalConstant
+    :   HexadecimalPrefix HexadecimalDigit+
+    ;
+
+fragment
+HexadecimalPrefix
+    :   '0' [xX]
+    ;
+
+fragment
+NonzeroDigit
+    :   [1-9]
+    ;
+
+fragment
+OctalDigit
+    :   [0-7]
+    ;
+
+fragment
+HexadecimalDigit
+    :   [0-9a-fA-F]
+    ;
+
+fragment
+IntegerSuffix
+    :   UnsignedSuffix LongSuffix?
+    |   UnsignedSuffix LongLongSuffix
+    |   LongSuffix UnsignedSuffix?
+    |   LongLongSuffix UnsignedSuffix?
+    ;
+
+fragment
+UnsignedSuffix
+    :   [uU]
+    ;
+
+fragment
+LongSuffix
+    :   [lL]
+    ;
+
+fragment
+LongLongSuffix
+    :   'll' | 'LL'
+    ;
+
+fragment
+FloatingConstant
+    :   DecimalFloatingConstant
+    |   HexadecimalFloatingConstant
+    ;
+
+fragment
+DecimalFloatingConstant
+    :   FractionalConstant ExponentPart? FloatingSuffix?
+    |   DigitSequence ExponentPart FloatingSuffix?
+    ;
+
+fragment
+HexadecimalFloatingConstant
+    :   HexadecimalPrefix (HexadecimalFractionalConstant | HexadecimalDigitSequence) BinaryExponentPart FloatingSuffix?
+    ;
+
+fragment
+FractionalConstant
+    :   DigitSequence? '.' DigitSequence
+    |   DigitSequence '.'
+    ;
+
+fragment
+ExponentPart
+    :   [eE] Sign? DigitSequence
+    ;
+
+fragment
+Sign
+    :   [+-]
+    ;
+
+DigitSequence
+    :   Digit+
+    ;
+
+fragment
+HexadecimalFractionalConstant
+    :   HexadecimalDigitSequence? '.' HexadecimalDigitSequence
+    |   HexadecimalDigitSequence '.'
+    ;
+
+fragment
+BinaryExponentPart
+    :   [pP] Sign? DigitSequence
+    ;
+
+fragment
+HexadecimalDigitSequence
+    :   HexadecimalDigit+
+    ;
+
+fragment
+FloatingSuffix
+    :   [flFL]
+    ;
+
+fragment
+CharacterConstant
+    :   '\'' CCharSequence '\''
+    |   'L\'' CCharSequence '\''
+    |   'u\'' CCharSequence '\''
+    |   'U\'' CCharSequence '\''
+    ;
+
+fragment
+CCharSequence
+    :   CChar+
+    ;
+
+fragment
+CChar
+    :   ~['\\\r\n]
+    |   EscapeSequence
+    ;
+
+fragment
+EscapeSequence
+    :   SimpleEscapeSequence
+    |   OctalEscapeSequence
+    |   HexadecimalEscapeSequence
+    |   UniversalCharacterName
+    ;
+
+fragment
+SimpleEscapeSequence
+    :   '\\' ['"?abfnrtv\\]
+    ;
+
+fragment
+OctalEscapeSequence
+    :   '\\' OctalDigit OctalDigit? OctalDigit?
+    ;
+
+fragment
+HexadecimalEscapeSequence
+    :   '\\x' HexadecimalDigit+
+    ;
+
+StringLiteral
+    :   EncodingPrefix? '"' SCharSequence? '"'
+    ;
+
+fragment
+EncodingPrefix
+    :   'u8'
+    |   'u'
+    |   'U'
+    |   'L'
+    ;
+
+fragment
+SCharSequence
+    :   SChar+
+    ;
+
+fragment
+SChar
+    :   ~["\\\r\n]
+    |   EscapeSequence
+    |   '\\\n'   // Added line
+    |   '\\\r\n' // Added line
+    ;
+
+ComplexDefine
+    :   '#' Whitespace? 'define'  ~[#\r\n]*
+        -> skip
+    ;
+
+IncludeDirective
+    :   '#' Whitespace? 'include' Whitespace? (('"' ~[\r\n]* '"') | ('<' ~[\r\n]* '>' )) Whitespace? Newline
+        -> skip
+    ;
+
+// ignore the following asm blocks:
+/*
+    asm
+    {
+        mfspr x, 286;
+    }
+ */
+AsmBlock
+    :   'asm' ~'{'* '{' ~'}'* '}'
+	-> skip
+    ;
+
+// ignore the lines generated by c preprocessor
+// sample line : '#line 1 "/home/dm/files/dk1.h" 1'
+LineAfterPreprocessing
+    :   '#line' Whitespace* ~[\r\n]*
+        -> skip
+    ;
+
+LineDirective
+    :   '#' Whitespace? DecimalConstant Whitespace? StringLiteral ~[\r\n]*
+        -> skip
+    ;
+
+PragmaDirective
+    :   '#' Whitespace? 'pragma' Whitespace ~[\r\n]*
+        -> skip
+    ;
+
+Whitespace
+    :   [ \t]+
+        -> skip
+    ;
+
+Newline
+    :   (   '\r' '\n'?
+        |   '\n'
+        )
+        -> skip
+    ;
+
+BlockComment
+    :   '/*' .*? '*/'
+        -> skip
+    ;
+
+LineComment
+    :   '//' ~[\r\n]*
+        -> skip
+    ;
\ No newline at end of file
diff --git a/core/src/main/java/org/lflang/dsl/antlr4/MTLLexer.g4 b/core/src/main/java/org/lflang/dsl/antlr4/MTLLexer.g4
new file mode 100644
index 0000000000..b8fe9c118d
--- /dev/null
+++ b/core/src/main/java/org/lflang/dsl/antlr4/MTLLexer.g4
@@ -0,0 +1,117 @@
+lexer grammar MTLLexer;
+
+COMMA
+    : ','
+    ;
+
+LPAREN
+    : '('
+    ;
+
+RPAREN
+    : ')'
+    ;
+
+LBRACKET
+    : '['
+    ;
+
+RBRACKET
+    : ']'
+    ;
+
+LAND
+    : '&&'
+    ;
+
+LOR
+    : '||'
+    ;
+
+EQUI
+    : '<==>'
+    ;
+
+IMPL
+    : '==>'
+    ;
+
+UNTIL
+    : 'U'
+    ;
+
+NEGATION
+    : '!'
+    ;
+
+NEXT
+    : 'X'
+    ;
+
+GLOBALLY
+    : 'G'
+    ;
+
+FINALLY
+    : 'F'
+    ;
+
+WS
+    : [ \t\r\n]+ -> skip
+    ;
+
+TRUE
+    : 'true'
+    ;
+
+FALSE
+    : 'false'
+    ;
+
+PLUS
+    : '+'
+    ;
+
+MINUS
+    : '-'
+    ;
+
+TIMES
+    : '*'
+    ;
+
+DIV
+    : '/'
+    ;
+
+EQ
+    : '=='
+    ;
+
+NEQ
+    : '!='
+    ;
+
+LT
+    : '<'
+    ;
+
+LE
+    : '<='
+    ;
+
+GT
+    : '>'
+    ;
+
+GE
+    : '>='
+    ;
+
+INTEGER
+    : [0-9]+
+    ;
+
+ID
+    : ([a-zA-Z0-9]|'_')+
+    ;
\ No newline at end of file
diff --git a/core/src/main/java/org/lflang/dsl/antlr4/MTLParser.g4 b/core/src/main/java/org/lflang/dsl/antlr4/MTLParser.g4
new file mode 100644
index 0000000000..1a5d39b9b4
--- /dev/null
+++ b/core/src/main/java/org/lflang/dsl/antlr4/MTLParser.g4
@@ -0,0 +1,82 @@
+parser grammar MTLParser;
+
+options { tokenVocab=MTLLexer; }
+
+mtl
+    : equivalence
+    ;
+
+equivalence
+    : left=implication ( EQUI right=implication )?
+    ;
+
+implication
+    : left=disjunction ( IMPL right=disjunction )?
+    ;
+
+disjunction
+    : terms+=conjunction ( LOR terms+=conjunction )*
+    ;
+
+conjunction
+    : terms+=binaryOp ( LAND terms+=binaryOp )*
+    ;
+
+binaryOp
+    : left=unaryOp ( UNTIL timeInterval=interval right=unaryOp )? # Until
+    ;
+
+unaryOp
+    : formula=primary # NoUnaryOp
+    | NEGATION formula=primary # Negation
+    | NEXT timeInterval=interval formula=primary # Next
+    | GLOBALLY timeInterval=interval formula=primary # Globally
+    | FINALLY timeInterval=interval formula=primary # Finally
+    ;
+
+primary
+    : atom=atomicProp
+    | id=ID
+    | LPAREN formula=mtl RPAREN
+    ;
+
+atomicProp
+    : primitive=TRUE
+    | primitive=FALSE
+    | left=expr op=relOp right=expr
+    ;
+
+interval
+    : (LPAREN|LBRACKET) lowerbound=time COMMA upperbound=time (RPAREN|RBRACKET) # Range
+    | LBRACKET instant=time RBRACKET # Singleton
+    ;
+
+time
+    : value=INTEGER (unit=ID)?
+    ;
+
+sum 
+    : terms+=difference (PLUS terms+=difference)*
+    ;
+
+difference
+    : terms+=product (MINUS terms+=product)*
+    ;
+
+product
+    : terms+=quotient (TIMES terms+=quotient)*
+    ;
+
+quotient
+    : terms+=expr (DIV terms+=expr)*
+    ;
+
+relOp
+    : EQ | NEQ | LT | LE | GT | GE
+    ;
+
+expr
+    : ID
+    | LPAREN sum RPAREN
+    | INTEGER
+    ;

From 224104797c6bf7c88bd967d420725d910a70a6e2 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 5 Jun 2023 08:54:56 +0800
Subject: [PATCH 0205/1114] Update CI and spotless

---
 .github/workflows/ci.yml                      | 130 ------------------
 .github/workflows/uclid-verifier-c-tests.yml  |   2 +-
 .../generator/StateVariableInstance.java      | 126 ++++++++---------
 3 files changed, 64 insertions(+), 194 deletions(-)
 delete mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
deleted file mode 100644
index 06ff46d06a..0000000000
--- a/.github/workflows/ci.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-# Main workflow for testing the Lingua Franca compiler.
-name: CI
-
-on:
-  # Trigger this workflow on push events, but only on master.
-  push:
-    branches:
-      - master
-  # Trigger this workflow also on pull_request events, but ignore the 'nightly' branch.
-  pull_request:
-    branches-ignore:
-      - 'nightly'
-
-env:
-  # 2020.11
-  vcpkgGitRef: 0bf3923f9fab4001c00f0f429682a0853b5749e0
-
-jobs:
-  # Cancel previous workflow runs.
-  cancel:
-    uses: lf-lang/lingua-franca/.github/workflows/cancel.yml@master
-
-  # Test the Gradle build.
-  build:
-    uses: lf-lang/lingua-franca/.github/workflows/build.yml@master
-    needs: cancel
-
-  # Build the tools used for processing execution traces
-  build-tracing-tools:
-    uses: lf-lang/lingua-franca/.github/workflows/build-trace-tools.yml@master
-    needs: cancel
-
-  # Check that automatic code formatting works.
-  # TODO: Uncomment after fed-gen is merged.
-  # format:
-  #   uses: lf-lang/lingua-franca/.github/workflows/format.yml@master
-  #   needs: cancel
-
-  # Run the unit tests.
-  unit-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/unit-tests.yml@master
-    needs: cancel
-
-  # Run tests for the standalone compiler.
-  cli-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/cli-tests.yml@master
-    needs: cancel
-
-  # Run the C benchmark tests.
-  c-benchmark-tests:
-    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
-    with:
-      target: 'C'
-    needs: cancel
-
-  # Run language server tests.
-  lsp-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/lsp-tests.yml@master
-    needs: cancel
-
-  # Run the C integration tests.
-  c-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
-    needs: cancel
-  
-  # Run the C Arduino integration tests.
-  c-arduino-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/c-arduino-tests.yml@master
-    needs: cancel
-  
-  # Run the C Zephyr integration tests.
-  c-zephyr-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/c-zephyr-tests.yml@master
-    needs: cancel
-
-  # Run the CCpp integration tests.
-  ccpp-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
-    with:
-      use-cpp: true
-    needs: cancel
-
-  # Run the C++ benchmark tests.
-  cpp-benchmark-tests:
-    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
-    with:
-      target: 'Cpp'
-    needs: cancel
-
-  # Run the C++ integration tests.
-  cpp-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/cpp-tests.yml@master
-    needs: cancel
-
-  # Run the C++ integration tests on ROS2.
-  cpp-ros2-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/cpp-ros2-tests.yml@master
-    needs: cancel
-
-  # Run the Python integration tests.
-  py-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/py-tests.yml@master
-    needs: cancel
-
-  # Run the Rust integration tests.
-  rs-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/rs-tests.yml@master
-    needs: cancel
-
-  # Run the Rust benchmark tests.
-  rs-benchmark-tests:
-    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
-    with:
-      target: 'Rust'
-    needs: cancel
-
-  # Run the TypeScript integration tests.
-  ts-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/ts-tests.yml@master
-    needs: cancel
-
-  # Run the serialization tests
-  serialization-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/serialization-tests.yml@master
-    needs: cancel
-
-  # Run the Uclid benchmark tests.
-  uclid-verifier-c-tests:
-    uses: ./.github/workflows/uclid-verifier-c-tests.yml
-    needs: cancel
diff --git a/.github/workflows/uclid-verifier-c-tests.yml b/.github/workflows/uclid-verifier-c-tests.yml
index cb1c9e7e1b..083065ff93 100644
--- a/.github/workflows/uclid-verifier-c-tests.yml
+++ b/.github/workflows/uclid-verifier-c-tests.yml
@@ -66,4 +66,4 @@ jobs:
           echo "$(pwd)/uclid-0.9.5/bin" >> $GITHUB_PATH
       - name: Run the test script
         working-directory: lf-verifier-benchmarks/
-        run: ./scripts/test-lf-verifier
\ No newline at end of file
+        run: ./scripts/test-lf-verifier
diff --git a/core/src/main/java/org/lflang/generator/StateVariableInstance.java b/core/src/main/java/org/lflang/generator/StateVariableInstance.java
index 661602b01c..8c7916e7a0 100644
--- a/core/src/main/java/org/lflang/generator/StateVariableInstance.java
+++ b/core/src/main/java/org/lflang/generator/StateVariableInstance.java
@@ -1,79 +1,79 @@
 /** A data structure for a state variable. */
 
 /*************
-Copyright (c) 2019-2022, The University of California at Berkeley.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***************/
+ * Copyright (c) 2019-2022, The University of California at Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***************/
 package org.lflang.generator;
 
 import org.lflang.ErrorReporter;
 import org.lflang.lf.StateVar;
 
-/** 
- * Representation of a compile-time instance of a state variable.
- *  
- * 
- */
+/** Representation of a compile-time instance of a state variable. */
 public class StateVariableInstance extends NamedInstance<StateVar> {
 
-    /**
-     * Create a runtime instance from the specified definition
-     * and with the specified parent that instantiated it.
-     * @param definition The declaration in the AST.
-     * @param parent The parent.
-     */
-    public StateVariableInstance(StateVar definition, ReactorInstance parent) {
-        this(definition, parent, null);
-    }
+  /**
+   * Create a runtime instance from the specified definition and with the specified parent that
+   * instantiated it.
+   *
+   * @param definition The declaration in the AST.
+   * @param parent The parent.
+   */
+  public StateVariableInstance(StateVar definition, ReactorInstance parent) {
+    this(definition, parent, null);
+  }
+
+  /**
+   * Create a port instance from the specified definition and with the specified parent that
+   * instantiated it.
+   *
+   * @param definition The declaration in the AST.
+   * @param parent The parent.
+   * @param errorReporter An error reporter, or null to throw exceptions.
+   */
+  public StateVariableInstance(
+      StateVar definition, ReactorInstance parent, ErrorReporter errorReporter) {
+    super(definition, parent);
 
-    /**
-     * Create a port instance from the specified definition
-     * and with the specified parent that instantiated it.
-     * @param definition The declaration in the AST.
-     * @param parent The parent.
-     * @param errorReporter An error reporter, or null to throw exceptions.
-     */
-    public StateVariableInstance(StateVar definition, ReactorInstance parent, ErrorReporter errorReporter) {
-        super(definition, parent);
-        
-        if (parent == null) {
-            throw new NullPointerException("Cannot create a StateVariableInstance with no parent.");
-        }        
+    if (parent == null) {
+      throw new NullPointerException("Cannot create a StateVariableInstance with no parent.");
     }
+  }
 
-    //////////////////////////////////////////////////////
-    //// Public methods
+  //////////////////////////////////////////////////////
+  //// Public methods
 
-    /** 
-     * Return the name of this trigger. 
-     * @return The name of this trigger.
-     */
-    @Override
-    public String getName() {
-        return definition.getName();
-    }
+  /**
+   * Return the name of this trigger.
+   *
+   * @return The name of this trigger.
+   */
+  @Override
+  public String getName() {
+    return definition.getName();
+  }
 
-    @Override
-    public String toString() {
-        return "StateVariableInstance " + getFullName();
-    }
+  @Override
+  public String toString() {
+    return "StateVariableInstance " + getFullName();
+  }
 }

From dee847d7fedfd6322e406379360c1b91bb71b7cc Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Mon, 5 Jun 2023 10:40:06 +0200
Subject: [PATCH 0206/1114] Add the EnclaveReactorTransformation

---
 .../c/CEnclavedReactorTransformation.java     | 487 ++++++++++++++++++
 1 file changed, 487 insertions(+)
 create mode 100644 core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java

diff --git a/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java b/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
new file mode 100644
index 0000000000..950782fc66
--- /dev/null
+++ b/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
@@ -0,0 +1,487 @@
+package org.lflang.generator.c;
+
+import static org.lflang.AttributeUtils.isEnclave;
+import static org.lflang.AttributeUtils.setEnclaveAttribute;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.xbase.lib.IteratorExtensions;
+
+import org.lflang.ast.ASTUtils;
+import org.lflang.ast.AstTransformation;
+import org.lflang.generator.CodeBuilder;
+import org.lflang.generator.DelayBodyGenerator;
+import org.lflang.generator.TargetTypes;
+import org.lflang.lf.Action;
+import org.lflang.lf.ActionOrigin;
+import org.lflang.lf.Assignment;
+import org.lflang.lf.Code;
+import org.lflang.lf.Connection;
+import org.lflang.lf.Expression;
+import org.lflang.lf.Initializer;
+import org.lflang.lf.Input;
+import org.lflang.lf.Instantiation;
+import org.lflang.lf.LfFactory;
+import org.lflang.lf.Mode;
+import org.lflang.lf.Model;
+import org.lflang.lf.Output;
+import org.lflang.lf.Parameter;
+import org.lflang.lf.ParameterReference;
+import org.lflang.lf.Preamble;
+import org.lflang.lf.Reaction;
+import org.lflang.lf.Reactor;
+import org.lflang.lf.Time;
+import org.lflang.lf.Type;
+import org.lflang.lf.TypeParm;
+import org.lflang.lf.VarRef;
+import org.lflang.util.IteratorUtil;
+
+import com.google.common.collect.Iterables;
+
+public class CEnclavedReactorTransformation implements AstTransformation {
+
+    public static final LfFactory factory = ASTUtils.factory;
+
+    private final Resource mainResource;
+    public CEnclavedReactorTransformation(Resource mainResource) {
+        this.mainResource = mainResource;
+    }
+
+    // We only need a single ConnectionReactor since it uses generics.
+    Reactor connectionReactor = null;
+
+    public void applyTransformation(List<Reactor> reactors) {
+        // This function performs the whole AST transformation consisting in
+        // 1. Get all Enclave Reactors
+        List <Instantiation> enclaveInsts = getEnclaveInsts(reactors);
+        List <Reactor> enclaveDefs = enclaveInsts.stream().map(r -> ASTUtils.toDefinition(r.getReactorClass())).distinct().toList();
+
+        // 2. create ReactorWrappers for all of them.
+        Map<Reactor, Reactor> defMap = createEnclaveWrappers(enclaveDefs);
+
+        // 2. Replace enclave Reactor instances with wrapper instances.
+        Map<Instantiation, Instantiation> instMap =
+            replaceEnclavesWithWrappers(enclaveInsts, defMap);
+
+        connectWrappers(reactors, instMap);
+
+    }
+    // Get the reactor definitions of all the enclaves
+    private List<Instantiation> getEnclaveInsts(List<Reactor> reactors) {
+        List<Instantiation> enclaves = new ArrayList<>();
+        for (Reactor container : reactors) {
+            for (Instantiation inst : container.getInstantiations()) {
+                if (isEnclave(inst)) {
+                    enclaves.add(inst);
+                }
+            }
+        }
+        return enclaves;
+    }
+
+    // Side-effect: Fills the enclaveToWrapperMap with the newly created EnclaveWrappers
+    private Map<Reactor, Reactor> createEnclaveWrappers(List<Reactor> enclaves) {
+        Map<Reactor, Reactor> map= new LinkedHashMap<>();
+        for (Reactor enclave: enclaves) {
+            Reactor wrapper = createEnclaveWrapperClass(enclave);
+
+            // Hook it into AST
+            EObject node =
+                IteratorExtensions.findFirst(mainResource.getAllContents(), Model.class::isInstance);
+            ((Model) node).getReactors().add(wrapper);
+
+            map.put(enclave, wrapper);
+        }
+        return map;
+    }
+
+    private Reactor createEnclaveWrapperClass(Reactor enclaveDef) {
+        // TODO: Add the same parameters to wrapper
+        // TODO: Copy wrapper parameters to the inst
+        Reactor wrapper = factory.createReactor();
+        wrapper.setName(wrapperClassName(enclaveDef.getName()));
+        Instantiation wrappedEnclaveInst = ASTUtils.createInstantiation(enclaveDef);
+        wrappedEnclaveInst.setName(wrappedInstanceName(enclaveDef.getName()));
+        wrapper.getInstantiations().add(wrappedEnclaveInst);
+        for (Input input: enclaveDef.getInputs()) {
+            Input in = factory.createInput();
+            Type type = input.getType();
+            in.setName(input.getName());
+            in.setType(EcoreUtil.copy(input.getType()));
+            Parameter delayParam = createDelayParameter(input.getName() + "_delay");
+            wrapper.getParameters().add(delayParam);
+            ParameterReference delayParamRef = factory.createParameterReference();
+            delayParamRef.setParameter(delayParam);
+
+            // Create Connection reactor def and inst
+            Reactor connReactorDef = createEnclaveConnectionClass();
+            Instantiation connReactorInst = factory.createInstantiation();
+            connReactorInst.setReactorClass(connReactorDef);
+            connReactorInst.setName(connReactorDef.getName() + input.getName());
+            connReactorInst.getTypeArgs().add(EcoreUtil.copy(type));
+
+            // Set the delay parameter of the ConnectionRactor
+            Assignment delayAssignment = factory.createAssignment();
+            delayAssignment.setLhs(connReactorDef.getParameters().get(0));
+            Initializer init = factory.createInitializer();
+            init.getExprs().add(Objects.requireNonNull(delayParamRef));
+            delayAssignment.setRhs(init);
+            connReactorInst.getParameters().add(delayAssignment);
+
+            // Create the two actual connections between top-level, connection-reactor and wrapped enclave
+            Connection conn1 = factory.createConnection();
+            Connection conn2 = factory.createConnection();
+
+            // Create var-refs fpr ports
+            VarRef topInRef = factory.createVarRef();
+            VarRef encInRef = factory.createVarRef();
+            VarRef connInRef = factory.createVarRef();
+            VarRef connOutRef = factory.createVarRef();
+
+            // Tie the var-refs to their ports
+            topInRef.setVariable(in);
+
+            encInRef.setContainer(wrappedEnclaveInst);
+            encInRef.setVariable(input);
+
+            connInRef.setContainer(connReactorInst);
+            connInRef.setVariable(connReactorDef.getInputs().get(0));
+
+            connOutRef.setContainer(connReactorInst);
+            connOutRef.setVariable(connReactorDef.getOutputs().get(0));
+
+            // Connect var-refs and connections
+            conn1.getLeftPorts().add(topInRef);
+            conn1.getRightPorts().add(connInRef);
+
+            conn2.getLeftPorts().add(connOutRef);
+            conn2.getRightPorts().add(encInRef);
+
+            // Add all objects to the wrapper class
+            wrapper.getInputs().add(in);
+            wrapper.getConnections().add(conn1);
+            wrapper.getConnections().add(conn2);
+            wrapper.getInstantiations().add(connReactorInst);
+        }
+
+        for (Output output: enclaveDef.getOutputs()) {
+            Output out = factory.createOutput();
+            Type type = output.getType();
+            out.setName(output.getName());
+            out.setType(EcoreUtil.copy(type));
+
+            // Create the two actual connections between top-level, connection-reactor and wrapped enclave
+            Connection conn1 = factory.createConnection();
+
+            // Create var-refs fpr ports
+            VarRef topOutRef = factory.createVarRef();
+            VarRef encOutRef = factory.createVarRef();
+
+            // Tie the var-refs to their ports
+            topOutRef.setVariable(out);
+
+            encOutRef.setContainer(wrappedEnclaveInst);
+            encOutRef.setVariable(output);
+
+            // Connect var-refs and connections
+            conn1.getLeftPorts().add(encOutRef);
+            conn1.getRightPorts().add(topOutRef);
+
+            // Add all objects to the wrapper class
+            wrapper.getOutputs().add(out);
+            wrapper.getConnections().add(conn1);
+        }
+
+        return wrapper;
+    }
+    private String wrapperClassName(String originalName) {
+        return "_" + originalName + "Wrapper";
+    }
+
+    private String wrappedInstanceName(String originalName) {
+        return "_" + originalName + "_wrapped";
+    }
+
+    private void connectWrapperThroughConnectionReactor(VarRef lhs, VarRef rhs, Instantiation connReactor) {
+
+    }
+
+    // Side effect: We overwrite the Reactor-list passed into the AST. We remove and add Reactors as
+    // children into the hierarchy. This function should also remove all old connections between reactors
+    // and original enclaves with new instances.
+    private Map<Instantiation, Instantiation> replaceEnclavesWithWrappers(List<Instantiation> enclaveInsts, Map<Reactor, Reactor> defMap) {
+        Map<Instantiation, Instantiation> instMap = new LinkedHashMap<>();
+
+        for (Instantiation inst: enclaveInsts) {
+            EObject parent = inst.eContainer();
+            Reactor wrapperDef = defMap.get(ASTUtils.toDefinition(inst.getReactorClass()));
+            Instantiation wrapperInst = ASTUtils.createInstantiation(wrapperDef);
+            wrapperInst.setName("_wrapper_"+inst.getName());
+
+            setEnclaveAttribute(wrapperInst);
+            // TODO: Copy parameters from inst to wrapperInst
+
+            if (parent instanceof Reactor) {
+                ((Reactor) parent).getInstantiations().remove(inst);
+                ((Reactor) parent).getInstantiations().add(wrapperInst);
+            } else if (parent instanceof Mode) {
+                ((Mode) parent).getInstantiations().remove(inst);
+                ((Mode) parent).getInstantiations().add(wrapperInst);
+            }
+
+            instMap.put(inst, wrapperInst);
+        }
+        return instMap;
+    }
+
+    private void connectWrappers(List<Reactor> reactors, Map<Instantiation, Instantiation> instMap) {
+        for (Reactor container : reactors) {
+            for (Connection connection : ASTUtils.allConnections(container)) {
+                replaceConnection(connection, instMap);
+            }
+        }
+    }
+
+    // TODO: Handle all connection patterns.
+    private void replaceConnection(Connection conn, Map<Instantiation, Instantiation> instMap) {
+       if (isEnclave2EnclaveConn(conn)) {
+           replaceEnclave2EnclaveConn(conn, instMap);
+       }
+    }
+    private boolean isEnclavePort(VarRef portRef) {
+        return isEnclave(portRef.getContainer());
+    }
+
+    private boolean isEnclave2EnclaveConn(Connection conn) {
+        VarRef lhs = conn.getLeftPorts().get(0);
+        VarRef rhs = conn.getRightPorts().get(0);
+        return isEnclavePort(lhs) && isEnclavePort(rhs);
+    }
+
+    private void replaceEnclave2EnclaveConn(Connection oldConn, Map<Instantiation, Instantiation> instMap) {
+        Connection newConn  = factory.createConnection();
+        VarRef wrapperSrcOutput = factory.createVarRef();
+        VarRef wrapperDestInput = factory.createVarRef();
+
+        VarRef oldOutput = oldConn.getLeftPorts().get(0);
+        VarRef oldInput = oldConn.getRightPorts().get(0);
+        Instantiation src = oldOutput.getContainer();
+        Instantiation dest = oldInput.getContainer();
+        Instantiation wrapperSrc = instMap.get(src);
+        Instantiation wrapperDest = instMap.get(dest);
+
+        // Set the delay parameter of the enclaved connection which is inside the wrapperDest
+        // FIXME: clean up
+        Expression connDelay = oldConn.getDelay();
+        if (connDelay != null) {
+            Assignment delayAssignment = factory.createAssignment();
+            // Hide behind function maybe?
+            delayAssignment.setLhs(getParameter(wrapperDest, oldInput.getVariable().getName() + "_delay"));
+            Initializer init = factory.createInitializer();
+            init.getExprs().add(connDelay);
+            delayAssignment.setRhs(init);
+            wrapperDest.getParameters().add(delayAssignment);
+        }
+
+
+        wrapperSrcOutput.setContainer(wrapperSrc);
+        wrapperSrcOutput.setVariable(getInstanceOutputPortByName(wrapperSrc, oldOutput.getVariable().getName()));
+        wrapperDestInput.setContainer(wrapperDest);
+        wrapperDestInput.setVariable(getInstanceInputPortByName(wrapperDest, oldInput.getVariable().getName()));
+
+        newConn.getLeftPorts().add(wrapperSrcOutput);
+        newConn.getRightPorts().add(wrapperDestInput);
+
+        replaceConnInAST(oldConn, newConn);
+    }
+
+    private void replaceConnInAST(Connection oldConn, Connection newConn) {
+        var container = oldConn.eContainer();
+        if (container instanceof Reactor) {
+            ((Reactor) container).getConnections().remove(oldConn);
+            ((Reactor) container).getConnections().add(newConn);
+        } else if (container instanceof Mode) {
+            ((Mode) container).getConnections().remove(oldConn);
+            ((Mode) container).getConnections().add(newConn);
+        }
+    }
+
+    private Input getInstanceInputPortByName(Instantiation inst, String name) {
+        for (Input in: ASTUtils.toDefinition(inst.getReactorClass()).getInputs()) {
+            if (in.getName() == name) {
+                return in;
+            }
+        }
+        assert(false);
+        return factory.createInput();
+    }
+
+    private Output getInstanceOutputPortByName(Instantiation inst, String name) {
+        for (Output out: ASTUtils.toDefinition(inst.getReactorClass()).getOutputs()) {
+            if (out.getName().equals(name)) {
+                return out;
+            }
+        }
+        assert(false);
+        return factory.createOutput();
+    }
+
+    // FIXME: Replace with library reactor. But couldnt figure out how to load it
+    private Reactor createEnclaveConnectionClass() {
+        if (connectionReactor != null) {
+            return connectionReactor;
+        }
+        Type type = factory.createType();
+        type.setId("T");
+
+        TypeParm typeParam = factory.createTypeParm();
+        typeParam.setLiteral("T");
+
+        Preamble preamble = factory.createPreamble();
+        preamble.setCode(factory.createCode());
+        preamble.getCode().setBody(String.join("\n",
+            "#include \"reactor_common.h\"",
+            "#include <string.h>"
+        ));
+
+        String className = "EnclaveConnectionReactor";
+        Reactor connReactor = factory.createReactor();
+        connReactor.getTypeParms().add(typeParam);
+        connReactor.getPreambles().add(preamble);
+        Parameter delayParameter = createDelayParameter("delay");
+        var paramRef = factory.createParameterReference();
+        paramRef.setParameter(delayParameter);
+
+        Action action = factory.createAction();
+        VarRef triggerRef = factory.createVarRef();
+        VarRef effectRef = factory.createVarRef();
+        Input input = factory.createInput();
+        Output output = factory.createOutput();
+        VarRef inRef = factory.createVarRef();
+        VarRef outRef = factory.createVarRef();
+
+        Reaction r1 = factory.createReaction();
+        Reaction r2 = factory.createReaction();
+
+        // Name the newly created action; set its delay and type.
+        action.setName("act");
+        action.setMinDelay(paramRef);
+        action.setOrigin(ActionOrigin.LOGICAL);
+        action.setType(EcoreUtil.copy(type));
+
+
+        input.setName("in");
+        input.setType(EcoreUtil.copy(type));
+
+        output.setName("out");
+        output.setType(EcoreUtil.copy(type));
+
+        // Establish references to the involved ports.
+        inRef.setVariable(input);
+        outRef.setVariable(output);
+
+        // Establish references to the action.
+        triggerRef.setVariable(action);
+        effectRef.setVariable(action);
+
+        // Add the action to the reactor.
+        connReactor.setName(className);
+        connReactor.getActions().add(action);
+
+        // Configure the second reaction, which reads the input.
+        r1.getTriggers().add(inRef);
+        r1.getEffects().add(effectRef);
+        r1.setCode(factory.createCode());
+        r1.getCode().setBody(enclavedConnectionDelayBody());
+
+        // Configure the first reaction, which produces the output.
+        r2.getTriggers().add(triggerRef);
+        r2.getEffects().add(outRef);
+        r2.setCode(factory.createCode());
+        r2.getCode().setBody(enclavedConnectionForwardBody());
+
+        // Add the reactions to the newly created reactor class.
+        // These need to go in the opposite order in case
+        // a new input arrives at the same time the delayed
+        // output is delivered!
+        connReactor.getReactions().add(r2);
+        connReactor.getReactions().add(r1);
+
+        connReactor.getInputs().add(input);
+        connReactor.getOutputs().add(output);
+        connReactor.getParameters().add(delayParameter);
+
+        // Hook it into AST
+        EObject node =
+            IteratorExtensions.findFirst(mainResource.getAllContents(), Model.class::isInstance);
+        ((Model) node).getReactors().add(connReactor);
+
+        connectionReactor = connReactor;
+
+        return connReactor;
+    }
+
+    private String enclavedConnectionDelayBody() {
+        CodeBuilder code = new CodeBuilder();
+        code.pr("environment_t* src_env = in->_base.source_reactor->environment;");
+        code.pr("environment_t* dest_env = self->base.environment;");
+        code.pr("// Calculate the tag at which to schedule the event at the target");
+        code.pr("tag_t target_tag = lf_delay_tag(src_env->current_tag, self->delay);");
+        code.pr("int length = 1;");
+        code.pr("if (in->token) length = in->length;");
+        code.pr("token_template_t* template = (token_template_t*)act;");
+        code.pr("lf_critical_section_enter(dest_env);");
+        code.pr("lf_token_t* token = _lf_initialize_token(template, length);");
+        code.pr("memcpy(token->value, &(in->value), template->type.element_size * length);");
+        code.pr("// Schedule event to the destination environment.");
+        code.pr("trigger_handle_t result = _lf_schedule_at_tag(dest_env, act->_base.trigger, target_tag, token);");
+        code.pr("// Notify the main thread in case it is waiting for physical time to elapse");
+        code.pr("lf_notify_of_event(dest_env);");
+        code.pr("lf_critical_section_exit(dest_env);");
+        return code.toString();
+    }
+
+    private String enclavedConnectionForwardBody() {
+       CodeBuilder code = new CodeBuilder();
+       code.pr("lf_set(out, act->value);");
+       return code.toString();
+    }
+
+    private Parameter createDelayParameter(String name) {
+
+        Parameter delayParameter = factory.createParameter();
+
+        delayParameter.setName(name);
+        delayParameter.setType(factory.createType());
+        delayParameter.getType().setId("time");
+        delayParameter.getType().setTime(true);
+        Time defaultTime = factory.createTime();
+        defaultTime.setUnit(null);
+        defaultTime.setInterval(0);
+        Initializer init = factory.createInitializer();
+        init.setParens(true);
+        init.setBraces(false);
+        init.getExprs().add(defaultTime);
+        delayParameter.setInit(init);
+
+        return delayParameter;
+    }
+
+    private Parameter getParameter(Instantiation inst, String name) {
+        Reactor reactorDef = ASTUtils.toDefinition(inst.getReactorClass());
+        for (Parameter p: reactorDef.getParameters()) {
+            if (p.getName().equals(name)) {
+                return p;
+            }
+        }
+        assert(false);
+        return factory.createParameter();
+    }
+}

From f0a743b78752c8308be653b6afa6d3671988b61c Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Mon, 5 Jun 2023 11:00:19 +0200
Subject: [PATCH 0207/1114] Finish merge

---
 .../main/java/org/lflang/AttributeUtils.java  |  15 +
 .../org/lflang/generator/EnclaveInfo.java     |  18 +
 .../c/CEnclavedReactorTransformation.java     | 487 ------------------
 .../c/CEnvironmentFunctionGenerator.java      |  94 ++++
 .../org/lflang/generator/c/CGenerator.java    |  15 +-
 .../generator/python/PythonGenerator.java     |   4 +-
 ...dCommunication.lf => DelayedConnection.lf} |   1 +
 .../failing/EnclavedConnectionReactor.lf      |  39 ++
 .../src/enclaves/failing/SimpleConnection.lf  |  40 ++
 9 files changed, 213 insertions(+), 500 deletions(-)
 create mode 100644 core/src/main/java/org/lflang/generator/EnclaveInfo.java
 delete mode 100644 core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
 create mode 100644 core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
 rename test/C/src/enclaves/failing/{DelayedCommunication.lf => DelayedConnection.lf} (99%)
 create mode 100644 test/C/src/enclaves/failing/EnclavedConnectionReactor.lf
 create mode 100644 test/C/src/enclaves/failing/SimpleConnection.lf

diff --git a/core/src/main/java/org/lflang/AttributeUtils.java b/core/src/main/java/org/lflang/AttributeUtils.java
index 6703df2d0e..348cf39030 100644
--- a/core/src/main/java/org/lflang/AttributeUtils.java
+++ b/core/src/main/java/org/lflang/AttributeUtils.java
@@ -25,6 +25,8 @@
 
 package org.lflang;
 
+import static org.lflang.ast.ASTUtils.factory;
+
 import java.util.List;
 import java.util.Objects;
 import org.eclipse.emf.ecore.EObject;
@@ -244,4 +246,17 @@ public static Attribute getEnclaveAttribute(Instantiation node) {
   public static boolean isEnclave(Instantiation node) {
     return getEnclaveAttribute(node) != null;
   }
+
+
+  /**
+   * Annotate `node` with enclave @attribute
+   * @param node
+   */
+  public static void setEnclaveAttribute(Instantiation node) {
+    if (!isEnclave(node)) {
+      Attribute enclaveAttr = factory.createAttribute();
+      enclaveAttr.setAttrName("enclave");
+      node.getAttributes().add(enclaveAttr);
+    }
+  }
 }
diff --git a/core/src/main/java/org/lflang/generator/EnclaveInfo.java b/core/src/main/java/org/lflang/generator/EnclaveInfo.java
new file mode 100644
index 0000000000..1898d82124
--- /dev/null
+++ b/core/src/main/java/org/lflang/generator/EnclaveInfo.java
@@ -0,0 +1,18 @@
+package org.lflang.generator;
+
+public class EnclaveInfo {
+  public int numIsPresentFields = 0;
+  public int numStartupReactions = 0;
+  public int numShutdownReactions = 0;
+  public int numTimerTriggers = 0;
+  public int numResetReactions = 0;
+  public int numWorkers = 1;
+  public int numModalReactors = 0;
+  public int numModalResetStates = 0;
+
+  private ReactorInstance instance;
+
+  public EnclaveInfo(ReactorInstance inst) {
+    instance = inst;
+  }
+}
diff --git a/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java b/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
deleted file mode 100644
index 950782fc66..0000000000
--- a/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
+++ /dev/null
@@ -1,487 +0,0 @@
-package org.lflang.generator.c;
-
-import static org.lflang.AttributeUtils.isEnclave;
-import static org.lflang.AttributeUtils.setEnclaveAttribute;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-
-import org.lflang.ast.ASTUtils;
-import org.lflang.ast.AstTransformation;
-import org.lflang.generator.CodeBuilder;
-import org.lflang.generator.DelayBodyGenerator;
-import org.lflang.generator.TargetTypes;
-import org.lflang.lf.Action;
-import org.lflang.lf.ActionOrigin;
-import org.lflang.lf.Assignment;
-import org.lflang.lf.Code;
-import org.lflang.lf.Connection;
-import org.lflang.lf.Expression;
-import org.lflang.lf.Initializer;
-import org.lflang.lf.Input;
-import org.lflang.lf.Instantiation;
-import org.lflang.lf.LfFactory;
-import org.lflang.lf.Mode;
-import org.lflang.lf.Model;
-import org.lflang.lf.Output;
-import org.lflang.lf.Parameter;
-import org.lflang.lf.ParameterReference;
-import org.lflang.lf.Preamble;
-import org.lflang.lf.Reaction;
-import org.lflang.lf.Reactor;
-import org.lflang.lf.Time;
-import org.lflang.lf.Type;
-import org.lflang.lf.TypeParm;
-import org.lflang.lf.VarRef;
-import org.lflang.util.IteratorUtil;
-
-import com.google.common.collect.Iterables;
-
-public class CEnclavedReactorTransformation implements AstTransformation {
-
-    public static final LfFactory factory = ASTUtils.factory;
-
-    private final Resource mainResource;
-    public CEnclavedReactorTransformation(Resource mainResource) {
-        this.mainResource = mainResource;
-    }
-
-    // We only need a single ConnectionReactor since it uses generics.
-    Reactor connectionReactor = null;
-
-    public void applyTransformation(List<Reactor> reactors) {
-        // This function performs the whole AST transformation consisting in
-        // 1. Get all Enclave Reactors
-        List <Instantiation> enclaveInsts = getEnclaveInsts(reactors);
-        List <Reactor> enclaveDefs = enclaveInsts.stream().map(r -> ASTUtils.toDefinition(r.getReactorClass())).distinct().toList();
-
-        // 2. create ReactorWrappers for all of them.
-        Map<Reactor, Reactor> defMap = createEnclaveWrappers(enclaveDefs);
-
-        // 2. Replace enclave Reactor instances with wrapper instances.
-        Map<Instantiation, Instantiation> instMap =
-            replaceEnclavesWithWrappers(enclaveInsts, defMap);
-
-        connectWrappers(reactors, instMap);
-
-    }
-    // Get the reactor definitions of all the enclaves
-    private List<Instantiation> getEnclaveInsts(List<Reactor> reactors) {
-        List<Instantiation> enclaves = new ArrayList<>();
-        for (Reactor container : reactors) {
-            for (Instantiation inst : container.getInstantiations()) {
-                if (isEnclave(inst)) {
-                    enclaves.add(inst);
-                }
-            }
-        }
-        return enclaves;
-    }
-
-    // Side-effect: Fills the enclaveToWrapperMap with the newly created EnclaveWrappers
-    private Map<Reactor, Reactor> createEnclaveWrappers(List<Reactor> enclaves) {
-        Map<Reactor, Reactor> map= new LinkedHashMap<>();
-        for (Reactor enclave: enclaves) {
-            Reactor wrapper = createEnclaveWrapperClass(enclave);
-
-            // Hook it into AST
-            EObject node =
-                IteratorExtensions.findFirst(mainResource.getAllContents(), Model.class::isInstance);
-            ((Model) node).getReactors().add(wrapper);
-
-            map.put(enclave, wrapper);
-        }
-        return map;
-    }
-
-    private Reactor createEnclaveWrapperClass(Reactor enclaveDef) {
-        // TODO: Add the same parameters to wrapper
-        // TODO: Copy wrapper parameters to the inst
-        Reactor wrapper = factory.createReactor();
-        wrapper.setName(wrapperClassName(enclaveDef.getName()));
-        Instantiation wrappedEnclaveInst = ASTUtils.createInstantiation(enclaveDef);
-        wrappedEnclaveInst.setName(wrappedInstanceName(enclaveDef.getName()));
-        wrapper.getInstantiations().add(wrappedEnclaveInst);
-        for (Input input: enclaveDef.getInputs()) {
-            Input in = factory.createInput();
-            Type type = input.getType();
-            in.setName(input.getName());
-            in.setType(EcoreUtil.copy(input.getType()));
-            Parameter delayParam = createDelayParameter(input.getName() + "_delay");
-            wrapper.getParameters().add(delayParam);
-            ParameterReference delayParamRef = factory.createParameterReference();
-            delayParamRef.setParameter(delayParam);
-
-            // Create Connection reactor def and inst
-            Reactor connReactorDef = createEnclaveConnectionClass();
-            Instantiation connReactorInst = factory.createInstantiation();
-            connReactorInst.setReactorClass(connReactorDef);
-            connReactorInst.setName(connReactorDef.getName() + input.getName());
-            connReactorInst.getTypeArgs().add(EcoreUtil.copy(type));
-
-            // Set the delay parameter of the ConnectionRactor
-            Assignment delayAssignment = factory.createAssignment();
-            delayAssignment.setLhs(connReactorDef.getParameters().get(0));
-            Initializer init = factory.createInitializer();
-            init.getExprs().add(Objects.requireNonNull(delayParamRef));
-            delayAssignment.setRhs(init);
-            connReactorInst.getParameters().add(delayAssignment);
-
-            // Create the two actual connections between top-level, connection-reactor and wrapped enclave
-            Connection conn1 = factory.createConnection();
-            Connection conn2 = factory.createConnection();
-
-            // Create var-refs fpr ports
-            VarRef topInRef = factory.createVarRef();
-            VarRef encInRef = factory.createVarRef();
-            VarRef connInRef = factory.createVarRef();
-            VarRef connOutRef = factory.createVarRef();
-
-            // Tie the var-refs to their ports
-            topInRef.setVariable(in);
-
-            encInRef.setContainer(wrappedEnclaveInst);
-            encInRef.setVariable(input);
-
-            connInRef.setContainer(connReactorInst);
-            connInRef.setVariable(connReactorDef.getInputs().get(0));
-
-            connOutRef.setContainer(connReactorInst);
-            connOutRef.setVariable(connReactorDef.getOutputs().get(0));
-
-            // Connect var-refs and connections
-            conn1.getLeftPorts().add(topInRef);
-            conn1.getRightPorts().add(connInRef);
-
-            conn2.getLeftPorts().add(connOutRef);
-            conn2.getRightPorts().add(encInRef);
-
-            // Add all objects to the wrapper class
-            wrapper.getInputs().add(in);
-            wrapper.getConnections().add(conn1);
-            wrapper.getConnections().add(conn2);
-            wrapper.getInstantiations().add(connReactorInst);
-        }
-
-        for (Output output: enclaveDef.getOutputs()) {
-            Output out = factory.createOutput();
-            Type type = output.getType();
-            out.setName(output.getName());
-            out.setType(EcoreUtil.copy(type));
-
-            // Create the two actual connections between top-level, connection-reactor and wrapped enclave
-            Connection conn1 = factory.createConnection();
-
-            // Create var-refs fpr ports
-            VarRef topOutRef = factory.createVarRef();
-            VarRef encOutRef = factory.createVarRef();
-
-            // Tie the var-refs to their ports
-            topOutRef.setVariable(out);
-
-            encOutRef.setContainer(wrappedEnclaveInst);
-            encOutRef.setVariable(output);
-
-            // Connect var-refs and connections
-            conn1.getLeftPorts().add(encOutRef);
-            conn1.getRightPorts().add(topOutRef);
-
-            // Add all objects to the wrapper class
-            wrapper.getOutputs().add(out);
-            wrapper.getConnections().add(conn1);
-        }
-
-        return wrapper;
-    }
-    private String wrapperClassName(String originalName) {
-        return "_" + originalName + "Wrapper";
-    }
-
-    private String wrappedInstanceName(String originalName) {
-        return "_" + originalName + "_wrapped";
-    }
-
-    private void connectWrapperThroughConnectionReactor(VarRef lhs, VarRef rhs, Instantiation connReactor) {
-
-    }
-
-    // Side effect: We overwrite the Reactor-list passed into the AST. We remove and add Reactors as
-    // children into the hierarchy. This function should also remove all old connections between reactors
-    // and original enclaves with new instances.
-    private Map<Instantiation, Instantiation> replaceEnclavesWithWrappers(List<Instantiation> enclaveInsts, Map<Reactor, Reactor> defMap) {
-        Map<Instantiation, Instantiation> instMap = new LinkedHashMap<>();
-
-        for (Instantiation inst: enclaveInsts) {
-            EObject parent = inst.eContainer();
-            Reactor wrapperDef = defMap.get(ASTUtils.toDefinition(inst.getReactorClass()));
-            Instantiation wrapperInst = ASTUtils.createInstantiation(wrapperDef);
-            wrapperInst.setName("_wrapper_"+inst.getName());
-
-            setEnclaveAttribute(wrapperInst);
-            // TODO: Copy parameters from inst to wrapperInst
-
-            if (parent instanceof Reactor) {
-                ((Reactor) parent).getInstantiations().remove(inst);
-                ((Reactor) parent).getInstantiations().add(wrapperInst);
-            } else if (parent instanceof Mode) {
-                ((Mode) parent).getInstantiations().remove(inst);
-                ((Mode) parent).getInstantiations().add(wrapperInst);
-            }
-
-            instMap.put(inst, wrapperInst);
-        }
-        return instMap;
-    }
-
-    private void connectWrappers(List<Reactor> reactors, Map<Instantiation, Instantiation> instMap) {
-        for (Reactor container : reactors) {
-            for (Connection connection : ASTUtils.allConnections(container)) {
-                replaceConnection(connection, instMap);
-            }
-        }
-    }
-
-    // TODO: Handle all connection patterns.
-    private void replaceConnection(Connection conn, Map<Instantiation, Instantiation> instMap) {
-       if (isEnclave2EnclaveConn(conn)) {
-           replaceEnclave2EnclaveConn(conn, instMap);
-       }
-    }
-    private boolean isEnclavePort(VarRef portRef) {
-        return isEnclave(portRef.getContainer());
-    }
-
-    private boolean isEnclave2EnclaveConn(Connection conn) {
-        VarRef lhs = conn.getLeftPorts().get(0);
-        VarRef rhs = conn.getRightPorts().get(0);
-        return isEnclavePort(lhs) && isEnclavePort(rhs);
-    }
-
-    private void replaceEnclave2EnclaveConn(Connection oldConn, Map<Instantiation, Instantiation> instMap) {
-        Connection newConn  = factory.createConnection();
-        VarRef wrapperSrcOutput = factory.createVarRef();
-        VarRef wrapperDestInput = factory.createVarRef();
-
-        VarRef oldOutput = oldConn.getLeftPorts().get(0);
-        VarRef oldInput = oldConn.getRightPorts().get(0);
-        Instantiation src = oldOutput.getContainer();
-        Instantiation dest = oldInput.getContainer();
-        Instantiation wrapperSrc = instMap.get(src);
-        Instantiation wrapperDest = instMap.get(dest);
-
-        // Set the delay parameter of the enclaved connection which is inside the wrapperDest
-        // FIXME: clean up
-        Expression connDelay = oldConn.getDelay();
-        if (connDelay != null) {
-            Assignment delayAssignment = factory.createAssignment();
-            // Hide behind function maybe?
-            delayAssignment.setLhs(getParameter(wrapperDest, oldInput.getVariable().getName() + "_delay"));
-            Initializer init = factory.createInitializer();
-            init.getExprs().add(connDelay);
-            delayAssignment.setRhs(init);
-            wrapperDest.getParameters().add(delayAssignment);
-        }
-
-
-        wrapperSrcOutput.setContainer(wrapperSrc);
-        wrapperSrcOutput.setVariable(getInstanceOutputPortByName(wrapperSrc, oldOutput.getVariable().getName()));
-        wrapperDestInput.setContainer(wrapperDest);
-        wrapperDestInput.setVariable(getInstanceInputPortByName(wrapperDest, oldInput.getVariable().getName()));
-
-        newConn.getLeftPorts().add(wrapperSrcOutput);
-        newConn.getRightPorts().add(wrapperDestInput);
-
-        replaceConnInAST(oldConn, newConn);
-    }
-
-    private void replaceConnInAST(Connection oldConn, Connection newConn) {
-        var container = oldConn.eContainer();
-        if (container instanceof Reactor) {
-            ((Reactor) container).getConnections().remove(oldConn);
-            ((Reactor) container).getConnections().add(newConn);
-        } else if (container instanceof Mode) {
-            ((Mode) container).getConnections().remove(oldConn);
-            ((Mode) container).getConnections().add(newConn);
-        }
-    }
-
-    private Input getInstanceInputPortByName(Instantiation inst, String name) {
-        for (Input in: ASTUtils.toDefinition(inst.getReactorClass()).getInputs()) {
-            if (in.getName() == name) {
-                return in;
-            }
-        }
-        assert(false);
-        return factory.createInput();
-    }
-
-    private Output getInstanceOutputPortByName(Instantiation inst, String name) {
-        for (Output out: ASTUtils.toDefinition(inst.getReactorClass()).getOutputs()) {
-            if (out.getName().equals(name)) {
-                return out;
-            }
-        }
-        assert(false);
-        return factory.createOutput();
-    }
-
-    // FIXME: Replace with library reactor. But couldnt figure out how to load it
-    private Reactor createEnclaveConnectionClass() {
-        if (connectionReactor != null) {
-            return connectionReactor;
-        }
-        Type type = factory.createType();
-        type.setId("T");
-
-        TypeParm typeParam = factory.createTypeParm();
-        typeParam.setLiteral("T");
-
-        Preamble preamble = factory.createPreamble();
-        preamble.setCode(factory.createCode());
-        preamble.getCode().setBody(String.join("\n",
-            "#include \"reactor_common.h\"",
-            "#include <string.h>"
-        ));
-
-        String className = "EnclaveConnectionReactor";
-        Reactor connReactor = factory.createReactor();
-        connReactor.getTypeParms().add(typeParam);
-        connReactor.getPreambles().add(preamble);
-        Parameter delayParameter = createDelayParameter("delay");
-        var paramRef = factory.createParameterReference();
-        paramRef.setParameter(delayParameter);
-
-        Action action = factory.createAction();
-        VarRef triggerRef = factory.createVarRef();
-        VarRef effectRef = factory.createVarRef();
-        Input input = factory.createInput();
-        Output output = factory.createOutput();
-        VarRef inRef = factory.createVarRef();
-        VarRef outRef = factory.createVarRef();
-
-        Reaction r1 = factory.createReaction();
-        Reaction r2 = factory.createReaction();
-
-        // Name the newly created action; set its delay and type.
-        action.setName("act");
-        action.setMinDelay(paramRef);
-        action.setOrigin(ActionOrigin.LOGICAL);
-        action.setType(EcoreUtil.copy(type));
-
-
-        input.setName("in");
-        input.setType(EcoreUtil.copy(type));
-
-        output.setName("out");
-        output.setType(EcoreUtil.copy(type));
-
-        // Establish references to the involved ports.
-        inRef.setVariable(input);
-        outRef.setVariable(output);
-
-        // Establish references to the action.
-        triggerRef.setVariable(action);
-        effectRef.setVariable(action);
-
-        // Add the action to the reactor.
-        connReactor.setName(className);
-        connReactor.getActions().add(action);
-
-        // Configure the second reaction, which reads the input.
-        r1.getTriggers().add(inRef);
-        r1.getEffects().add(effectRef);
-        r1.setCode(factory.createCode());
-        r1.getCode().setBody(enclavedConnectionDelayBody());
-
-        // Configure the first reaction, which produces the output.
-        r2.getTriggers().add(triggerRef);
-        r2.getEffects().add(outRef);
-        r2.setCode(factory.createCode());
-        r2.getCode().setBody(enclavedConnectionForwardBody());
-
-        // Add the reactions to the newly created reactor class.
-        // These need to go in the opposite order in case
-        // a new input arrives at the same time the delayed
-        // output is delivered!
-        connReactor.getReactions().add(r2);
-        connReactor.getReactions().add(r1);
-
-        connReactor.getInputs().add(input);
-        connReactor.getOutputs().add(output);
-        connReactor.getParameters().add(delayParameter);
-
-        // Hook it into AST
-        EObject node =
-            IteratorExtensions.findFirst(mainResource.getAllContents(), Model.class::isInstance);
-        ((Model) node).getReactors().add(connReactor);
-
-        connectionReactor = connReactor;
-
-        return connReactor;
-    }
-
-    private String enclavedConnectionDelayBody() {
-        CodeBuilder code = new CodeBuilder();
-        code.pr("environment_t* src_env = in->_base.source_reactor->environment;");
-        code.pr("environment_t* dest_env = self->base.environment;");
-        code.pr("// Calculate the tag at which to schedule the event at the target");
-        code.pr("tag_t target_tag = lf_delay_tag(src_env->current_tag, self->delay);");
-        code.pr("int length = 1;");
-        code.pr("if (in->token) length = in->length;");
-        code.pr("token_template_t* template = (token_template_t*)act;");
-        code.pr("lf_critical_section_enter(dest_env);");
-        code.pr("lf_token_t* token = _lf_initialize_token(template, length);");
-        code.pr("memcpy(token->value, &(in->value), template->type.element_size * length);");
-        code.pr("// Schedule event to the destination environment.");
-        code.pr("trigger_handle_t result = _lf_schedule_at_tag(dest_env, act->_base.trigger, target_tag, token);");
-        code.pr("// Notify the main thread in case it is waiting for physical time to elapse");
-        code.pr("lf_notify_of_event(dest_env);");
-        code.pr("lf_critical_section_exit(dest_env);");
-        return code.toString();
-    }
-
-    private String enclavedConnectionForwardBody() {
-       CodeBuilder code = new CodeBuilder();
-       code.pr("lf_set(out, act->value);");
-       return code.toString();
-    }
-
-    private Parameter createDelayParameter(String name) {
-
-        Parameter delayParameter = factory.createParameter();
-
-        delayParameter.setName(name);
-        delayParameter.setType(factory.createType());
-        delayParameter.getType().setId("time");
-        delayParameter.getType().setTime(true);
-        Time defaultTime = factory.createTime();
-        defaultTime.setUnit(null);
-        defaultTime.setInterval(0);
-        Initializer init = factory.createInitializer();
-        init.setParens(true);
-        init.setBraces(false);
-        init.getExprs().add(defaultTime);
-        delayParameter.setInit(init);
-
-        return delayParameter;
-    }
-
-    private Parameter getParameter(Instantiation inst, String name) {
-        Reactor reactorDef = ASTUtils.toDefinition(inst.getReactorClass());
-        for (Parameter p: reactorDef.getParameters()) {
-            if (p.getName().equals(name)) {
-                return p;
-            }
-        }
-        assert(false);
-        return factory.createParameter();
-    }
-}
diff --git a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
new file mode 100644
index 0000000000..6881badefb
--- /dev/null
+++ b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -0,0 +1,94 @@
+package org.lflang.generator.c;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.lflang.generator.CodeBuilder;
+import org.lflang.generator.ReactorInstance;
+
+public class CEnvironmentFunctionGenerator {
+
+  public CEnvironmentFunctionGenerator(ReactorInstance main) {
+    this.enclaves = CUtil.getEnclaves(main);
+  }
+
+  public String generateDeclarations() {
+    CodeBuilder code = new CodeBuilder();
+    code.pr(generateEnvironmentEnum());
+    code.pr(generateEnvironmentArray());
+    return code.toString();
+  }
+
+  public String generateDefinitions() {
+    CodeBuilder code = new CodeBuilder();
+    code.pr(generateCreateEnvironments());
+    code.pr(generateGetEnvironments());
+    return code.toString();
+  }
+
+  private List<ReactorInstance> enclaves = new ArrayList<>();
+
+  private String generateEnvironmentArray() {
+    return String.join(
+        "\n",
+        "// The global array of environments associated with each enclave",
+        "environment_t envs[_num_enclaves];");
+  }
+
+  private String generateGetEnvironments() {
+    return String.join(
+        "\n",
+        "// Update the pointer argument to point to the beginning of the environment array",
+        "// and return the size of that array",
+        "int _lf_get_environments(environment_t ** return_envs) {",
+        "   (*return_envs) = (environment_t *) envs;",
+        "   return _num_enclaves;",
+        "}");
+  }
+
+  private String generateEnvironmentEnum() {
+    CodeBuilder code = new CodeBuilder();
+    code.pr("typedef enum {");
+    code.indent();
+    for (ReactorInstance enclave : enclaves) {
+      code.pr(CUtil.getEnvironmentId(enclave) + ",");
+    }
+    code.pr("_num_enclaves");
+    code.unindent();
+    code.pr("} _enclave_id;");
+
+    return code.toString();
+  }
+
+  private String generateCreateEnvironments() {
+    CodeBuilder code = new CodeBuilder();
+    code.pr("// 'Create' and initialize the environments in the program");
+    code.pr("void _lf_create_environments() {");
+    code.indent();
+    for (ReactorInstance enclave : enclaves) {
+      // Decide the number of workers to use. If this is the top-level
+      // use the global variable _lf_number_of_workers which accounts for federation etc.
+      String numWorkers = String.valueOf(enclave.enclaveInfo.numWorkers);
+      if (enclave.isMainOrFederated()) {
+        numWorkers = "_lf_number_of_workers";
+      }
+
+
+      code.pr(
+          "environment_init(&"
+              + CUtil.getEnvironmentStruct(enclave) + ","
+              + CUtil.getEnvironmentId(enclave)+ ","
+              + numWorkers + ","
+              + enclave.enclaveInfo.numTimerTriggers + ","
+              + enclave.enclaveInfo.numStartupReactions + ","
+              + enclave.enclaveInfo.numShutdownReactions + ","
+              + enclave.enclaveInfo.numResetReactions + ","
+              + enclave.enclaveInfo.numIsPresentFields + ","
+              + enclave.enclaveInfo.numModalReactors + ","
+              + enclave.enclaveInfo.numModalResetStates
+              + ");");
+    }
+    code.unindent();
+    code.pr("}");
+    return code.toString();
+  }
+}
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index e9f42c082b..0b3048679c 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -312,24 +312,17 @@ protected CGenerator(
       boolean CCppMode,
       CTypes types,
       CCmakeGenerator cmakeGenerator,
-      DelayBodyGenerator delayConnectionBodyGenerator,
-      DelayBodyGenerator enclavedConnectionBodyGenerator) {
+      DelayBodyGenerator delayConnectionBodyGenerator
+  ) {
     super(context);
     this.fileConfig = (CFileConfig) context.getFileConfig();
     this.CCppMode = CCppMode;
     this.types = types;
     this.cmakeGenerator = cmakeGenerator;
 
-    // Register the delayed connection transformation to be applied by GeneratorBase.
-    // transform both after delays and physical connections
-    //        registerTransformation(new
-    // EnclavedConnectionTransformation(enclavedConnectionBodyGenerator, types, fileConfig.resource,
-    // true, true));
     registerTransformation(
         new DelayedConnectionTransformation(
             delayConnectionBodyGenerator, types, fileConfig.resource, true, true));
-
-    // TODO: Register the enclaved connection transformation to be applied by generatorBase
   }
 
   public CGenerator(LFGeneratorContext context, boolean ccppMode) {
@@ -338,8 +331,8 @@ public CGenerator(LFGeneratorContext context, boolean ccppMode) {
         ccppMode,
         new CTypes(),
         new CCmakeGenerator(context.getFileConfig(), List.of()),
-        new CDelayBodyGenerator(new CTypes()),
-        new CEnclavedConnectionBodyGenerator(new CTypes()));
+        new CDelayBodyGenerator(new CTypes())
+    );
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index 6113b8e547..b299eb7365 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -111,8 +111,8 @@ private PythonGenerator(
         false,
         types,
         cmakeGenerator,
-        new PythonDelayBodyGenerator(types),
-        null); // FIXME: What to pass to Python?
+        new PythonDelayBodyGenerator(types)
+        ); // FIXME: What to pass to Python?
     this.targetConfig.compiler = "gcc";
     this.targetConfig.compilerFlags = new ArrayList<>();
     this.targetConfig.linkerFlags = "";
diff --git a/test/C/src/enclaves/failing/DelayedCommunication.lf b/test/C/src/enclaves/failing/DelayedConnection.lf
similarity index 99%
rename from test/C/src/enclaves/failing/DelayedCommunication.lf
rename to test/C/src/enclaves/failing/DelayedConnection.lf
index cb66e52897..f9d4c8c864 100644
--- a/test/C/src/enclaves/failing/DelayedCommunication.lf
+++ b/test/C/src/enclaves/failing/DelayedConnection.lf
@@ -30,6 +30,7 @@ reactor Receiver {
 }
 
 main reactor {
+
     sender = new Sender()
     receiver = new Receiver()
 
diff --git a/test/C/src/enclaves/failing/EnclavedConnectionReactor.lf b/test/C/src/enclaves/failing/EnclavedConnectionReactor.lf
new file mode 100644
index 0000000000..689a543cbd
--- /dev/null
+++ b/test/C/src/enclaves/failing/EnclavedConnectionReactor.lf
@@ -0,0 +1,39 @@
+// This is a library reactor used to implemented connections between enclaves.
+target C;
+
+// FIXME: Handle token types also by checking whether it is a token type.
+// I guess we can just 
+reactor ConnectionReactor<T>(delay: time = 0){
+
+    preamble {=
+        #include "platform.h"
+    =}
+    input in: T 
+    output out: T
+
+    logical action act: T
+
+    reaction(act) -> out {=
+        lf_set(out, act->value);
+    =}
+
+    reaction(in) -> act {=
+        environment_t* src_env = in->_base.source_reactor->environment;
+        environment_t* dest_env = self->base.environment;
+        // Calculate the tag at which to schedule the event at the target
+        tag_t target_tag = lf_delay_tag(src_env->current_tag, self->delay);
+        token_template_t* template = (token_template_t*)act;
+        lf_critical_section_enter(dest_env);
+        lf_token_t* token = _lf_initialize_token(template, in->length);
+        memcpy(token->value, in->value, template->type.element_size * in->length);
+        // Schedule event to the destination environment.
+        trigger_handle_t result = _lf_schedule_at_tag(dest_env, act->_base.trigger, target_tag, token);
+        // Notify the main thread in case it is waiting for physical time to elapse
+        lf_notify_of_event(dest_env);
+        lf_critical_section_exit(dest_env);
+    =}
+}
+
+main reactor {
+    conn = new ConnectionReactor<int>();
+}
\ No newline at end of file
diff --git a/test/C/src/enclaves/failing/SimpleConnection.lf b/test/C/src/enclaves/failing/SimpleConnection.lf
new file mode 100644
index 0000000000..7d53a10f8b
--- /dev/null
+++ b/test/C/src/enclaves/failing/SimpleConnection.lf
@@ -0,0 +1,40 @@
+target C {
+    timeout: 2 sec
+}
+
+reactor Sender {
+    output out: int
+
+    timer t(0, 50 msec)
+    state cnt: int = 0
+
+    reaction(t) -> out {= lf_set(out, self->cnt++); =}
+}
+
+reactor Receiver {
+    input in: int
+    state last: time_t = 0
+    state cnt: int = 0
+
+    reaction(in) {=
+        time_t now = lf_time_logical_elapsed();
+        lf_print("Received event t=" PRINTF_TIME", count=%u", now, in->value);
+
+        lf_assert(self->cnt == in->value, "recv=%u exp=%u", in->value, self->cnt);
+        if (now != 0) {
+            lf_assert(now - self->last == MSEC(50), "now="PRINTF_TIME" last="PRINTF_TIME, now, self->last);
+        }
+
+        self->last = now;
+        self->cnt++;
+    =}
+}
+
+main reactor {
+    @enclave
+    sender = new Sender()
+    @enclave
+    receiver = new Receiver()
+
+    sender.out -> receiver.in after 50 msec
+}

From 056d26b8658002ab77c97b4faea6698635277950 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Mon, 5 Jun 2023 11:14:40 +0200
Subject: [PATCH 0208/1114] Run Spotless

---
 .../main/java/org/lflang/AttributeUtils.java  |  2 +-
 .../federated/extensions/CExtension.java      |  3 +-
 .../c/CEnvironmentFunctionGenerator.java      | 28 +++++++----
 .../org/lflang/generator/c/CGenerator.java    | 29 ++++++------
 .../lflang/generator/c/CModesGenerator.java   | 46 ++++++++++++++-----
 .../lflang/generator/c/CPortGenerator.java    |  4 +-
 .../generator/c/CReactionGenerator.java       | 35 +++++++-------
 .../generator/c/CTriggerObjectsGenerator.java | 20 +++++---
 .../generator/c/CWatchdogGenerator.java       |  3 +-
 .../generator/python/PythonGenerator.java     |  3 +-
 .../java/org/lflang/tests/Configurators.java  |  2 +-
 11 files changed, 106 insertions(+), 69 deletions(-)

diff --git a/core/src/main/java/org/lflang/AttributeUtils.java b/core/src/main/java/org/lflang/AttributeUtils.java
index 348cf39030..634d77f67a 100644
--- a/core/src/main/java/org/lflang/AttributeUtils.java
+++ b/core/src/main/java/org/lflang/AttributeUtils.java
@@ -247,9 +247,9 @@ public static boolean isEnclave(Instantiation node) {
     return getEnclaveAttribute(node) != null;
   }
 
-
   /**
    * Annotate `node` with enclave @attribute
+   *
    * @param node
    */
   public static void setEnclaveAttribute(Instantiation node) {
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index f5c940eac2..301fbfe9a9 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -447,7 +447,8 @@ public String generateNetworkInputControlReactionBody(
       result.pr("max_STP = " + CTypes.getInstance().getTargetTimeExpr(maxSTP) + ";");
     }
     result.pr("// Wait until the port status is known");
-    result.pr("wait_until_port_status_known(self->base.environment, " + receivingPortID + ", max_STP);");
+    result.pr(
+        "wait_until_port_status_known(self->base.environment, " + receivingPortID + ", max_STP);");
     return result.toString();
   }
 
diff --git a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
index 6881badefb..4c820c5dbf 100644
--- a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -72,18 +72,26 @@ private String generateCreateEnvironments() {
         numWorkers = "_lf_number_of_workers";
       }
 
-
       code.pr(
           "environment_init(&"
-              + CUtil.getEnvironmentStruct(enclave) + ","
-              + CUtil.getEnvironmentId(enclave)+ ","
-              + numWorkers + ","
-              + enclave.enclaveInfo.numTimerTriggers + ","
-              + enclave.enclaveInfo.numStartupReactions + ","
-              + enclave.enclaveInfo.numShutdownReactions + ","
-              + enclave.enclaveInfo.numResetReactions + ","
-              + enclave.enclaveInfo.numIsPresentFields + ","
-              + enclave.enclaveInfo.numModalReactors + ","
+              + CUtil.getEnvironmentStruct(enclave)
+              + ","
+              + CUtil.getEnvironmentId(enclave)
+              + ","
+              + numWorkers
+              + ","
+              + enclave.enclaveInfo.numTimerTriggers
+              + ","
+              + enclave.enclaveInfo.numStartupReactions
+              + ","
+              + enclave.enclaveInfo.numShutdownReactions
+              + ","
+              + enclave.enclaveInfo.numResetReactions
+              + ","
+              + enclave.enclaveInfo.numIsPresentFields
+              + ","
+              + enclave.enclaveInfo.numModalReactors
+              + ","
               + enclave.enclaveInfo.numModalResetStates
               + ");");
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 0b3048679c..adf045ce75 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -225,15 +225,15 @@
  *       <h2 id="runtime-tables">Runtime Tables</h2>
  *       This generator creates an populates the following tables used at run time. These tables may
  *       have to be resized and adjusted when mutations occur.
- *   <li>is_present_fields: An array of pointers to booleans indicating whether an event is
- *       present. The _lf_start_time_step() function in reactor_common.c uses this to mark every
- *       event absent at the start of a time step. The size of this table is contained in the
- *       variable is_present_fields_size.
+ *   <li>is_present_fields: An array of pointers to booleans indicating whether an event is present.
+ *       The _lf_start_time_step() function in reactor_common.c uses this to mark every event absent
+ *       at the start of a time step. The size of this table is contained in the variable
+ *       is_present_fields_size.
  *       <ul>
- *         <li>This table is accompanied by another list, is_present_fields_abbreviated, which
- *             only contains the is_present fields that have been set to true in the current tag.
- *             This list can allow a performance improvement if most ports are seldom present
- *             because only fields that have been set to true need to be reset to false.
+ *         <li>This table is accompanied by another list, is_present_fields_abbreviated, which only
+ *             contains the is_present fields that have been set to true in the current tag. This
+ *             list can allow a performance improvement if most ports are seldom present because
+ *             only fields that have been set to true need to be reset to false.
  *       </ul>
  *   <li>_lf_shutdown_triggers: An array of pointers to trigger_t structs for shutdown reactions.
  *       The length of this table is in the _lf_shutdown_triggers_size variable.
@@ -312,8 +312,7 @@ protected CGenerator(
       boolean CCppMode,
       CTypes types,
       CCmakeGenerator cmakeGenerator,
-      DelayBodyGenerator delayConnectionBodyGenerator
-  ) {
+      DelayBodyGenerator delayConnectionBodyGenerator) {
     super(context);
     this.fileConfig = (CFileConfig) context.getFileConfig();
     this.CCppMode = CCppMode;
@@ -331,8 +330,7 @@ public CGenerator(LFGeneratorContext context, boolean ccppMode) {
         ccppMode,
         new CTypes(),
         new CCmakeGenerator(context.getFileConfig(), List.of()),
-        new CDelayBodyGenerator(new CTypes())
-    );
+        new CDelayBodyGenerator(new CTypes()));
   }
 
   /**
@@ -1601,8 +1599,8 @@ private void generateStartTimeStep(ReactorInstance instance) {
    * For each timer in the given reactor, generate initialization code for the offset and period
    * fields.
    *
-   * <p>This method will also populate the global timer_triggers array, which is used to start
-   * all timers at the start of execution.
+   * <p>This method will also populate the global timer_triggers array, which is used to start all
+   * timers at the start of execution.
    *
    * @param instance A reactor instance.
    */
@@ -1824,7 +1822,8 @@ protected void generateStateVariableInitializations(ReactorInstance instance) {
         initializeTriggerObjects.pr(
             CStateGenerator.generateInitializer(instance, selfRef, stateVar, mode, types));
         if (mode != null && stateVar.isReset()) {
-          CUtil.getClosestEnclave(instance).enclaveInfo.numModalResetStates += instance.getTotalWidth();
+          CUtil.getClosestEnclave(instance).enclaveInfo.numModalResetStates +=
+              instance.getTotalWidth();
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CModesGenerator.java b/core/src/main/java/org/lflang/generator/c/CModesGenerator.java
index 1780a69803..b91487d9f0 100644
--- a/core/src/main/java/org/lflang/generator/c/CModesGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CModesGenerator.java
@@ -126,7 +126,9 @@ public static void generateModeStructure(ReactorInstance instance, CodeBuilder c
       code.pr("// Register for transition handling");
       code.pr(
           CUtil.getEnvironmentStruct(instance)
-              + ".modes->modal_reactor_states[modal_reactor_count["+CUtil.getEnvironmentId(instance)+"]++] = &((self_base_t*)"
+              + ".modes->modal_reactor_states[modal_reactor_count["
+              + CUtil.getEnvironmentId(instance)
+              + "]++] = &((self_base_t*)"
               + nameOfSelfStruct
               + ")->_lf__mode_state;");
     }
@@ -142,29 +144,51 @@ public static void generateModeStructure(ReactorInstance instance, CodeBuilder c
    * @param type The size of the initial value
    */
   public static String generateStateResetStructure(
-      ReactorInstance instance, String modeRef, String selfRef, String varName, String source, String type) {
+      ReactorInstance instance,
+      String modeRef,
+      String selfRef,
+      String varName,
+      String source,
+      String type) {
     var env = CUtil.getEnvironmentStruct(instance);
     var envId = CUtil.getEnvironmentId(instance);
     return String.join(
         "\n",
         "// Register for automatic reset",
-        env+".modes->state_resets[modal_state_reset_count["+envId+"]].mode = " + modeRef + ";",
-        env+".modes->state_resets[modal_state_reset_count["+envId+"]].target = &("
+        env
+            + ".modes->state_resets[modal_state_reset_count["
+            + envId
+            + "]].mode = "
+            + modeRef
+            + ";",
+        env
+            + ".modes->state_resets[modal_state_reset_count["
+            + envId
+            + "]].target = &("
             + selfRef
             + "->"
             + varName
             + ");",
-        env+".modes->state_resets[modal_state_reset_count["+envId+"]].source = &" + source + ";",
-        env+".modes->state_resets[modal_state_reset_count["+envId+"]].size = sizeof(" + type + ");",
-        "modal_state_reset_count["+envId+"]++;");
+        env
+            + ".modes->state_resets[modal_state_reset_count["
+            + envId
+            + "]].source = &"
+            + source
+            + ";",
+        env
+            + ".modes->state_resets[modal_state_reset_count["
+            + envId
+            + "]].size = sizeof("
+            + type
+            + ");",
+        "modal_state_reset_count[" + envId + "]++;");
   }
 
   /**
-   * Generate code to call {@code _lf_process_mode_changes}.
-   ** @param hasModalReactors True if there is modal model reactors, false otherwise
+   * Generate code to call {@code _lf_process_mode_changes}. * @param hasModalReactors True if there
+   * is modal model reactors, false otherwise
    */
-  public static String generateLfHandleModeChanges(
-      boolean hasModalReactors) {
+  public static String generateLfHandleModeChanges(boolean hasModalReactors) {
     if (!hasModalReactors) {
       return "";
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CPortGenerator.java b/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
index aa82dbce00..04fbfec925 100644
--- a/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
@@ -131,9 +131,7 @@ public static String initializeInputMultiport(PortInstance input, String reactor
             "    if (sparse_io_record_sizes.start == NULL) {",
             "        sparse_io_record_sizes = vector_new(1);",
             "    }",
-            "    vector_push(&sparse_io_record_sizes, (void*)&"
-                + portRefName
-                + "__sparse->size);",
+            "    vector_push(&sparse_io_record_sizes, (void*)&" + portRefName + "__sparse->size);",
             "}");
       }
       return result;
diff --git a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
index f808919ed7..f27f218cb8 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
@@ -1179,24 +1179,25 @@ public static String generateLfTriggerStartupReactions(boolean hasModalReactors)
 
   /** Generate the _lf_trigger_shutdown_reactions function. */
   public static String generateLfTriggerShutdownReactions() {
-    return String.join("\n",
+    return String.join(
+        "\n",
         "void _lf_trigger_shutdown_reactions(environment_t *env) {",
-            "    for (int i = 0; i < env->shutdown_reactions_size; i++) {",
-            "        if (env->shutdown_reactions[i] != NULL) {",
-            "#ifdef MODAL_REACTORS",
-            "            if (env->shutdown_reactions[i]->mode != NULL) {",
-            "                // Skip reactions in modes",
-            "                continue;",
-            "            }",
-            "#endif",
-            "            _lf_trigger_reaction(env, env->shutdown_reactions[i], -1);", //
-            "        }",
-            "    }",
-            "#ifdef MODAL_REACTORS",
-            "    _lf_handle_mode_shutdown_reactions(env, env->shutdown_reactions, env->shutdown_reactions_size);",
-            "#endif",
-            "}"
-    );
+        "    for (int i = 0; i < env->shutdown_reactions_size; i++) {",
+        "        if (env->shutdown_reactions[i] != NULL) {",
+        "#ifdef MODAL_REACTORS",
+        "            if (env->shutdown_reactions[i]->mode != NULL) {",
+        "                // Skip reactions in modes",
+        "                continue;",
+        "            }",
+        "#endif",
+        "            _lf_trigger_reaction(env, env->shutdown_reactions[i], -1);", //
+        "        }",
+        "    }",
+        "#ifdef MODAL_REACTORS",
+        "    _lf_handle_mode_shutdown_reactions(env, env->shutdown_reactions,"
+            + " env->shutdown_reactions_size);",
+        "#endif",
+        "}");
   }
 
   /** Generate the _lf_handle_mode_triggered_reactions function. */
diff --git a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 05c394c515..41908238de 100644
--- a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -65,12 +65,18 @@ public static String generateInitializeTriggerObjects(
     code.pr(
         String.join(
             "\n",
-            "int startup_reaction_count[_num_enclaves] = {0}; SUPPRESS_UNUSED_WARNING(startup_reaction_count);",
-            "int shutdown_reaction_count[_num_enclaves] = {0}; SUPPRESS_UNUSED_WARNING(shutdown_reaction_count);",
-            "int reset_reaction_count[_num_enclaves] = {0}; SUPPRESS_UNUSED_WARNING(reset_reaction_count);",
-            "int timer_triggers_count[_num_enclaves] = {0}; SUPPRESS_UNUSED_WARNING(timer_triggers_count);",
-            "int modal_state_reset_count[_num_enclaves] = {0}; SUPPRESS_UNUSED_WARNING(modal_state_reset_count);",
-            "int modal_reactor_count[_num_enclaves] = {0}; SUPPRESS_UNUSED_WARNING(modal_reactor_count);"));
+            "int startup_reaction_count[_num_enclaves] = {0};"
+                + " SUPPRESS_UNUSED_WARNING(startup_reaction_count);",
+            "int shutdown_reaction_count[_num_enclaves] = {0};"
+                + " SUPPRESS_UNUSED_WARNING(shutdown_reaction_count);",
+            "int reset_reaction_count[_num_enclaves] = {0};"
+                + " SUPPRESS_UNUSED_WARNING(reset_reaction_count);",
+            "int timer_triggers_count[_num_enclaves] = {0};"
+                + " SUPPRESS_UNUSED_WARNING(timer_triggers_count);",
+            "int modal_state_reset_count[_num_enclaves] = {0};"
+                + " SUPPRESS_UNUSED_WARNING(modal_state_reset_count);",
+            "int modal_reactor_count[_num_enclaves] = {0};"
+                + " SUPPRESS_UNUSED_WARNING(modal_reactor_count);"));
 
     // Create the table to initialize intended tag fields to 0 between time
     // steps.
@@ -793,7 +799,7 @@ private static String deferredOutputNumDestinations(ReactorInstance reactor) {
                 + ";");
         code.endScopedRangeBlock(sendingRange);
       }
-      
+
       if (output.eventualDestinations().size() == 0) {
         // Dangling output. Still set the source reactor
         code.pr(
diff --git a/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java b/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
index e55017dbbc..d304593352 100644
--- a/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
@@ -259,7 +259,8 @@ private static String generateFunction(String header, String init, Watchdog watc
     function.pr(header + " {");
     function.indent();
     function.pr(init);
-    function.pr("_lf_schedule(self->base.environment, (*" + watchdog.getName() + ").trigger, 0, NULL);");
+    function.pr(
+        "_lf_schedule(self->base.environment, (*" + watchdog.getName() + ").trigger, 0, NULL);");
     function.prSourceLineNumber(watchdog.getCode());
     function.pr(ASTUtils.toText(watchdog.getCode()));
     function.unindent();
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index b299eb7365..ed722373db 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -111,8 +111,7 @@ private PythonGenerator(
         false,
         types,
         cmakeGenerator,
-        new PythonDelayBodyGenerator(types)
-        ); // FIXME: What to pass to Python?
+        new PythonDelayBodyGenerator(types)); // FIXME: What to pass to Python?
     this.targetConfig.compiler = "gcc";
     this.targetConfig.compilerFlags = new ArrayList<>();
     this.targetConfig.linkerFlags = "";
diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index 7aa6ba97bf..15dc29e18d 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -71,7 +71,7 @@ public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
     test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
     test.getContext().getTargetConfig().platformOptions.flash = true;
     test.getContext().getTargetConfig().platformOptions.board = "native_posix";
-    
+
     // FIXME: Zephyr  emulations fails with debug log-levels.
     test.getContext().getTargetConfig().logLevel = LogLevel.WARN;
     test.getContext().getArgs().setProperty("logging", "warning");

From faeda3a4c3b7ee0dd341589630a49b57a66d2dac Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Mon, 5 Jun 2023 15:30:22 +0200
Subject: [PATCH 0209/1114] Split Zephyr tests into threaded and unthreaded.

---
 .../org/lflang/tests/runtime/CCppTest.java    |  3 +-
 .../org/lflang/tests/runtime/CZephyrTest.java | 18 +++++--
 core/src/main/resources/lib/c/reactor-c       |  2 +-
 .../java/org/lflang/tests/Configurators.java  | 14 ++---
 .../java/org/lflang/tests/TestRegistry.java   | 54 ++++++++-----------
 .../src/zephyr/{ => threaded}/UserThreads.lf  |  0
 .../zephyr/{ => unthreaded}/HelloZephyr.lf    |  2 +-
 test/C/src/zephyr/{ => unthreaded}/Timer.lf   |  5 +-
 util/RunZephyrTests.sh                        | 33 +++++++++++-
 9 files changed, 83 insertions(+), 48 deletions(-)
 rename test/C/src/zephyr/{ => threaded}/UserThreads.lf (100%)
 rename test/C/src/zephyr/{ => unthreaded}/HelloZephyr.lf (77%)
 rename test/C/src/zephyr/{ => unthreaded}/Timer.lf (68%)

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java
index ba1865e870..3142058c23 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java
@@ -42,7 +42,8 @@ private static boolean isExcludedFromCCpp(TestCategory category) {
     excluded |= isWindows() && (category == TestCategory.DOCKER_FEDERATED);
     excluded |=
         isMac() && (category == TestCategory.DOCKER_FEDERATED || category == TestCategory.DOCKER);
-    excluded |= category == TestCategory.ZEPHYR;
+    excluded |= category == TestCategory.ZEPHYR_UNTHREADED;
+    excluded |= category == TestCategory.ZEPHYR_THREADED;
     excluded |= category == TestCategory.ARDUINO;
     excluded |= category == TestCategory.NO_INLINING;
     return !excluded;
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java
index 80579081be..6ca8de12c5 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java
@@ -44,12 +44,24 @@ public CZephyrTest() {
   }
 
   @Test
-  public void runZephyrTests() {
+  public void runZephyrUnthreadedTests() {
     Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
     super.runTestsFor(
         List.of(Target.C),
         Message.DESC_ZEPHYR,
-        TestCategory.ZEPHYR::equals,
+        TestCategory.ZEPHYR_UNTHREADED::equals,
+        Configurators::makeZephyrCompatibleUnthreaded,
+        TestLevel.BUILD,
+        false);
+  }
+
+  @Test
+  public void runZephyrThreadedTests() {
+    Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
+    super.runTestsFor(
+        List.of(Target.C),
+        Message.DESC_ZEPHYR,
+        TestCategory.ZEPHYR_THREADED::equals,
         Configurators::makeZephyrCompatible,
         TestLevel.BUILD,
         false);
@@ -62,7 +74,7 @@ public void runGenericTests() {
         List.of(Target.C),
         Message.DESC_GENERIC,
         TestCategory.GENERIC::equals,
-        Configurators::makeZephyrCompatibleUnthreaded,
+        Configurators::makeZephyrCompatible,
         TestLevel.BUILD,
         false);
   }
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 6ad2cc42d9..a0d0bf6cac 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 6ad2cc42d9a129dca8deec99d0f7d0bb7da3bddf
+Subproject commit a0d0bf6cac3c1e78461fe6bf8f3ec0cc8947050c
diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index 7aa6ba97bf..b72d8ca231 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -66,12 +66,12 @@ public static boolean disableThreading(LFTest test) {
 
   public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
     test.getContext().getArgs().setProperty("tracing", "false");
-    test.getContext().getTargetConfig().threading = false;
     test.getContext().getTargetConfig().setByUser.add(TargetProperty.THREADING);
+    test.getContext().getTargetConfig().threading = false;
     test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
-    test.getContext().getTargetConfig().platformOptions.flash = true;
-    test.getContext().getTargetConfig().platformOptions.board = "native_posix";
-    
+    test.getContext().getTargetConfig().platformOptions.flash = false;
+    test.getContext().getTargetConfig().platformOptions.board = "qemu_cortex_a53";
+
     // FIXME: Zephyr  emulations fails with debug log-levels.
     test.getContext().getTargetConfig().logLevel = LogLevel.WARN;
     test.getContext().getArgs().setProperty("logging", "warning");
@@ -81,8 +81,8 @@ public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
   public static boolean makeZephyrCompatible(LFTest test) {
     test.getContext().getArgs().setProperty("tracing", "false");
     test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
-    test.getContext().getTargetConfig().platformOptions.flash = true;
-    test.getContext().getTargetConfig().platformOptions.board = "native_posix";
+    test.getContext().getTargetConfig().platformOptions.flash = false;
+    test.getContext().getTargetConfig().platformOptions.board = "qemu_cortex_a53";
 
     // FIXME: Zephyr  emulations fails with debug log-levels.
     test.getContext().getTargetConfig().logLevel = LogLevel.WARN;
@@ -113,7 +113,7 @@ public static boolean compatibleWithThreadingOff(TestCategory category) {
             || category == TestCategory.DOCKER_FEDERATED
             || category == TestCategory.DOCKER
             || category == TestCategory.ARDUINO
-            || category == TestCategory.ZEPHYR;
+            || category == TestCategory.ZEPHYR_UNTHREADED;
 
     // SERIALIZATION and TARGET tests are excluded on Windows.
     excluded |= TestBase.isWindows() && (category == TestCategory.TARGET);
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
index 483448bd8f..0de6e51ae9 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
@@ -115,29 +115,31 @@ public Set<LFTest> getTests(Target t, TestCategory c) {
    */
   public enum TestCategory {
     /** Tests about concurrent execution. */
-    CONCURRENT(true),
+    CONCURRENT(true, "", TestLevel.EXECUTION),
     /** Test about enclaves */
-    ENCLAVE(false),
+    ENCLAVE(false, "", TestLevel.EXECUTION),
     /** Generic tests, ie, tests that all targets are supposed to implement. */
-    GENERIC(true),
+    GENERIC(true, "", TestLevel.EXECUTION),
     /** Tests about generics, not to confuse with {@link #GENERIC}. */
-    GENERICS(true),
+    GENERICS(true, "", TestLevel.EXECUTION),
     /** Tests about multiports and banks of reactors. */
-    MULTIPORT(true),
+    MULTIPORT(true, "", TestLevel.EXECUTION),
     /** Tests about federated execution. */
-    FEDERATED(true),
+    FEDERATED(true, "", TestLevel.EXECUTION),
     /** Tests about specific target properties. */
-    PROPERTIES(true),
+    PROPERTIES(true, "", TestLevel.EXECUTION),
     /** Tests concerning modal reactors */
-    MODAL_MODELS(true),
-    NO_INLINING(false),
+    MODAL_MODELS(true, "", TestLevel.EXECUTION),
+    NO_INLINING(false, "", TestLevel.EXECUTION),
     // non-shared tests
-    DOCKER(true),
-    DOCKER_FEDERATED(true, "docker" + File.separator + "federated"),
-    SERIALIZATION(false),
-    ARDUINO(false, TestLevel.BUILD),
-    ZEPHYR(false, TestLevel.BUILD),
-    TARGET(false);
+    DOCKER(true, "", TestLevel.EXECUTION),
+    DOCKER_FEDERATED(true, "docker" + File.separator + "federated", TestLevel.EXECUTION),
+    SERIALIZATION(false, "", TestLevel.EXECUTION),
+    ARDUINO(false, "", TestLevel.BUILD),
+
+    ZEPHYR_THREADED(false, "zephyr" + File.separator + "threaded", TestLevel.BUILD),
+    ZEPHYR_UNTHREADED(false, "zephyr" + File.separator + "unthreaded", TestLevel.BUILD),
+    TARGET(false, "", TestLevel.EXECUTION);
 
     /** Whether we should compare coverage against other targets. */
     public final boolean isCommon;
@@ -146,26 +148,16 @@ public enum TestCategory {
     public final TestLevel level;
 
     /** Create a new test category. */
-    TestCategory(boolean isCommon) {
+    TestCategory(boolean isCommon, String path, TestLevel level) {
       this.isCommon = isCommon;
-      this.path = this.name().toLowerCase();
-      this.level = TestLevel.EXECUTION;
-    }
+      if (!path.isEmpty()) {
+          this.path = path;
+      } else {
+        this.path = this.name().toLowerCase();
 
-    /** Create a new test category. */
-    TestCategory(boolean isCommon, TestLevel level) {
-      this.isCommon = isCommon;
-      this.path = this.name().toLowerCase();
+      }
       this.level = level;
     }
-
-    /** Create a new test category. */
-    TestCategory(boolean isCommon, String path) {
-      this.isCommon = isCommon;
-      this.path = path;
-      this.level = TestLevel.EXECUTION;
-    }
-
     public String getPath() {
       return path;
     }
diff --git a/test/C/src/zephyr/UserThreads.lf b/test/C/src/zephyr/threaded/UserThreads.lf
similarity index 100%
rename from test/C/src/zephyr/UserThreads.lf
rename to test/C/src/zephyr/threaded/UserThreads.lf
diff --git a/test/C/src/zephyr/HelloZephyr.lf b/test/C/src/zephyr/unthreaded/HelloZephyr.lf
similarity index 77%
rename from test/C/src/zephyr/HelloZephyr.lf
rename to test/C/src/zephyr/unthreaded/HelloZephyr.lf
index 3ce632796b..2cabb44461 100644
--- a/test/C/src/zephyr/HelloZephyr.lf
+++ b/test/C/src/zephyr/unthreaded/HelloZephyr.lf
@@ -1,5 +1,5 @@
 target C {
-    platform: "Zephyr"
+    platform: "Zephyr",
 }
 
 main reactor {
diff --git a/test/C/src/zephyr/Timer.lf b/test/C/src/zephyr/unthreaded/Timer.lf
similarity index 68%
rename from test/C/src/zephyr/Timer.lf
rename to test/C/src/zephyr/unthreaded/Timer.lf
index a3dd0e68cc..c3bf32739e 100644
--- a/test/C/src/zephyr/Timer.lf
+++ b/test/C/src/zephyr/unthreaded/Timer.lf
@@ -1,9 +1,10 @@
 target C {
     platform: {
         name: Zephyr,
-        board: qemu_cortex_m3
+        board: native_posix
     },
-    timeout: 10 sec
+    timeout: 10 sec,
+    fast: true
 }
 
 main reactor {
diff --git a/util/RunZephyrTests.sh b/util/RunZephyrTests.sh
index 80968f91ec..60a6132141 100755
--- a/util/RunZephyrTests.sh
+++ b/util/RunZephyrTests.sh
@@ -20,7 +20,7 @@ find_kconfig_folders() {
             echo "Skipping: $test_name"
         else
             echo "Running: $test_name"
-            if run_zephyr_test "$folder"; then
+            if run_native_zephyr_test "$folder"; then
                 echo "Test $test_name successful"
                 let "num_successes+=1"
             else
@@ -38,11 +38,40 @@ find_kconfig_folders() {
             find_kconfig_folders "$folder"
         fi
     done
+}
+
+run_native_zephyr_test() {
+    return_val=0
+    pushd $1/build
+
+    rm -f res.text
+
+    timeout 60s make run | tee res.txt
+    result=$?
+
+    if [ $result -eq 0 ]; then
+        echo "Command completed within the timeout."
+        return_val=0
+    else
+        echo "Command terminated or timed out."
+        echo "Test output:"
+        echo "----------------------------------------------------------------"
+        cat res.txt
+        echo "----------------------------------------------------------------"
+        return_val=1
+    fi
+
+    popd
+    return "$return_val"
+
+
+
+
 }
 
 # Run Zephyr test until either: Timeout or finds match in output
 # https://www.unix.com/shell-programming-and-scripting/171401-kill-process-if-grep-match-found.html
-run_zephyr_test() {
+run_qemu_zephyr_test() {
     success=false
     pushd $1/build
 

From cbab4a3a38e42de4d4aad8aabd7714522c44116e Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Mon, 5 Jun 2023 15:59:30 +0200
Subject: [PATCH 0210/1114] Run spotless

---
 core/src/main/resources/lib/c/reactor-c                       | 2 +-
 core/src/testFixtures/java/org/lflang/tests/TestRegistry.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index a0d0bf6cac..7dde6eb2fe 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit a0d0bf6cac3c1e78461fe6bf8f3ec0cc8947050c
+Subproject commit 7dde6eb2fe1be8ca006ed1cb7c0034a538bbac3b
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
index 0de6e51ae9..47bb2ab055 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
@@ -151,13 +151,13 @@ public enum TestCategory {
     TestCategory(boolean isCommon, String path, TestLevel level) {
       this.isCommon = isCommon;
       if (!path.isEmpty()) {
-          this.path = path;
+        this.path = path;
       } else {
         this.path = this.name().toLowerCase();
-
       }
       this.level = level;
     }
+
     public String getPath() {
       return path;
     }

From 31bea4e25afef8b16a0f00399101f2a0ee08a85d Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Mon, 5 Jun 2023 16:09:19 +0200
Subject: [PATCH 0211/1114] Go back to qemu-based Zephyr testing

---
 util/RunZephyrTests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/RunZephyrTests.sh b/util/RunZephyrTests.sh
index 60a6132141..f394ae9409 100755
--- a/util/RunZephyrTests.sh
+++ b/util/RunZephyrTests.sh
@@ -20,7 +20,7 @@ find_kconfig_folders() {
             echo "Skipping: $test_name"
         else
             echo "Running: $test_name"
-            if run_native_zephyr_test "$folder"; then
+            if run_qemu_zephyr_test "$folder"; then
                 echo "Test $test_name successful"
                 let "num_successes+=1"
             else

From 9e01f1fb2e29daf83b693f619bad1189b9295590 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Mon, 5 Jun 2023 16:11:40 +0200
Subject: [PATCH 0212/1114] Bump reactor-C

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 7dde6eb2fe..53f8bffb79 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 7dde6eb2fe1be8ca006ed1cb7c0034a538bbac3b
+Subproject commit 53f8bffb79c15c9aca663d0406127de5c77faf35

From f795afb6320f7524d6839613e66cb9503548dd42 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Mon, 5 Jun 2023 16:19:49 +0200
Subject: [PATCH 0213/1114] Lint

---
 test/C/src/zephyr/unthreaded/HelloZephyr.lf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/C/src/zephyr/unthreaded/HelloZephyr.lf b/test/C/src/zephyr/unthreaded/HelloZephyr.lf
index 2cabb44461..3ce632796b 100644
--- a/test/C/src/zephyr/unthreaded/HelloZephyr.lf
+++ b/test/C/src/zephyr/unthreaded/HelloZephyr.lf
@@ -1,5 +1,5 @@
 target C {
-    platform: "Zephyr",
+    platform: "Zephyr"
 }
 
 main reactor {

From f690c27fa9fcae32606f9da51c17f7636cf0495c Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Mon, 5 Jun 2023 16:41:51 +0200
Subject: [PATCH 0214/1114] Dont do ZEPHYR_THREADED except for in the Zephyr
 tests

---
 .../testFixtures/java/org/lflang/tests/Configurators.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index b72d8ca231..0e1e3a3331 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -70,7 +70,7 @@ public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
     test.getContext().getTargetConfig().threading = false;
     test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
     test.getContext().getTargetConfig().platformOptions.flash = false;
-    test.getContext().getTargetConfig().platformOptions.board = "qemu_cortex_a53";
+    test.getContext().getTargetConfig().platformOptions.board = "qemu_cortex_m3";
 
     // FIXME: Zephyr  emulations fails with debug log-levels.
     test.getContext().getTargetConfig().logLevel = LogLevel.WARN;
@@ -82,7 +82,7 @@ public static boolean makeZephyrCompatible(LFTest test) {
     test.getContext().getArgs().setProperty("tracing", "false");
     test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
     test.getContext().getTargetConfig().platformOptions.flash = false;
-    test.getContext().getTargetConfig().platformOptions.board = "qemu_cortex_a53";
+    test.getContext().getTargetConfig().platformOptions.board = "qemu_cortex_m3";
 
     // FIXME: Zephyr  emulations fails with debug log-levels.
     test.getContext().getTargetConfig().logLevel = LogLevel.WARN;
@@ -114,6 +114,7 @@ public static boolean compatibleWithThreadingOff(TestCategory category) {
             || category == TestCategory.DOCKER
             || category == TestCategory.ARDUINO
             || category == TestCategory.ZEPHYR_UNTHREADED;
+            || category == TestCategory.ZEPHYR_THREADED;
 
     // SERIALIZATION and TARGET tests are excluded on Windows.
     excluded |= TestBase.isWindows() && (category == TestCategory.TARGET);

From 0c49c12e31037cfd5fdcbe6212f546ea9effd5d9 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Mon, 5 Jun 2023 16:51:16 +0200
Subject: [PATCH 0215/1114] Typo

---
 core/src/testFixtures/java/org/lflang/tests/Configurators.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index 0e1e3a3331..4fd80816e1 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -113,7 +113,7 @@ public static boolean compatibleWithThreadingOff(TestCategory category) {
             || category == TestCategory.DOCKER_FEDERATED
             || category == TestCategory.DOCKER
             || category == TestCategory.ARDUINO
-            || category == TestCategory.ZEPHYR_UNTHREADED;
+            || category == TestCategory.ZEPHYR_UNTHREADED
             || category == TestCategory.ZEPHYR_THREADED;
 
     // SERIALIZATION and TARGET tests are excluded on Windows.

From e9f856a6b0ba46f0074c24878fae6022693f4529 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Mon, 5 Jun 2023 18:13:33 +0200
Subject: [PATCH 0216/1114] Mova some failing federated tests temporarily to
 failing

---
 test/C/src/federated/DistributedStop.lf       | 119 ------------------
 .../DistributedPhysicalActionUpstreamLong.lf  |   0
 2 files changed, 119 deletions(-)
 delete mode 100644 test/C/src/federated/DistributedStop.lf
 rename test/C/src/federated/{ => failing}/DistributedPhysicalActionUpstreamLong.lf (100%)

diff --git a/test/C/src/federated/DistributedStop.lf b/test/C/src/federated/DistributedStop.lf
deleted file mode 100644
index 2d4a616664..0000000000
--- a/test/C/src/federated/DistributedStop.lf
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * Test for lf_request_stop() in federated execution with centralized
- * coordination.
- *
- * @author Soroush Bateni
- */
-target C
-
-reactor Sender {
-    output out: int
-    timer t(0, 1 usec)
-    logical action act
-    state reaction_invoked_correctly: bool = false
-
-    reaction(t, act) -> out, act {=
-        lf_print("Sending 42 at (%lld, %u).",
-                     lf_time_logical_elapsed(),
-                     lf_tag().microstep);
-        lf_set(out, 42);
-        if (lf_tag().microstep == 0) {
-            // Instead of having a separate reaction
-            // for 'act' like Stop.lf, we trigger the
-            // same reaction to test lf_request_stop() being
-            // called multiple times
-            lf_schedule(act, 0);
-        }
-        if (lf_time_logical_elapsed() == USEC(1)) {
-            // Call lf_request_stop() both at (1 usec, 0) and
-            // (1 usec, 1)
-            lf_print("Requesting stop at (%lld, %u).",
-                     lf_time_logical_elapsed(),
-                     lf_tag().microstep);
-            lf_request_stop();
-        }
-
-        tag_t _1usec1 = (tag_t) { .time = USEC(1) + lf_time_start(), .microstep = 1u };
-        if (lf_tag_compare(lf_tag(), _1usec1) == 0) {
-            // The reaction was invoked at (1 usec, 1) as expected
-            self->reaction_invoked_correctly = true;
-        } else if (lf_tag_compare(lf_tag(), _1usec1) > 0) {
-            // The reaction should not have been invoked at tags larger than (1 usec, 1)
-            lf_print_error_and_exit("ERROR: Invoked reaction(t, act) at tag bigger than shutdown.");
-        }
-    =}
-
-    reaction(shutdown) {=
-        if (lf_time_logical_elapsed() != USEC(1) ||
-            lf_tag().microstep != 1) {
-            lf_print_error_and_exit("ERROR: Sender failed to stop the federation in time. "
-                    "Stopping at (%lld, %u).",
-                     lf_time_logical_elapsed(),
-                     lf_tag().microstep);
-        } else if (self->reaction_invoked_correctly == false) {
-            lf_print_error_and_exit("ERROR: Sender reaction(t, act) was not invoked at (1 usec, 1). "
-                    "Stopping at (%lld, %u).",
-                     lf_time_logical_elapsed(),
-                     lf_tag().microstep);
-        }
-        lf_print("SUCCESS: Successfully stopped the federation at (%lld, %u).",
-                     lf_time_logical_elapsed(),
-                     lf_tag().microstep);
-    =}
-}
-
-reactor Receiver(
-    stp_offset: time = 10 msec  // Used in the decentralized variant of the test
-) {
-    input in: int
-    state reaction_invoked_correctly: bool = false
-
-    reaction(in) {=
-        lf_print("Received %d at (%lld, %u).",
-                     in->value,
-                     lf_time_logical_elapsed(),
-                     lf_tag().microstep);
-        if (lf_time_logical_elapsed() == USEC(1)) {
-            lf_print("Requesting stop at (%lld, %u).",
-                     lf_time_logical_elapsed(),
-                     lf_tag().microstep);
-            lf_request_stop();
-            // The receiver should receive a message at tag
-            // (1 usec, 1) and trigger this reaction
-            self->reaction_invoked_correctly = true;
-        }
-
-        tag_t _1usec1 = (tag_t) { .time = USEC(1) + lf_time_start(), .microstep = 1u };
-        if (lf_tag_compare(lf_tag(), _1usec1) > 0) {
-            self->reaction_invoked_correctly = false;
-        }
-    =}
-
-    reaction(shutdown) {=
-        // Sender should have requested stop earlier than the receiver.
-        // Therefore, the shutdown events must occur at (1000, 0) on the
-        // receiver.
-        if (lf_time_logical_elapsed() != USEC(1) ||
-            lf_tag().microstep != 1) {
-            lf_print_error_and_exit("Receiver failed to stop the federation at the right time. "
-                    "Stopping at (%lld, %u).",
-                     lf_time_logical_elapsed(),
-                     lf_tag().microstep);
-        } else if (self->reaction_invoked_correctly == false) {
-            lf_print_error_and_exit("Receiver reaction(in) was not invoked the correct number of times. "
-                    "Stopping at (%lld, %u).",
-                     lf_time_logical_elapsed(),
-                     lf_tag().microstep);
-        }
-        lf_print("SUCCESS: Successfully stopped the federation at (%lld, %u).",
-                     lf_time_logical_elapsed(),
-                     lf_tag().microstep);
-    =}
-}
-
-federated reactor DistributedStop {
-    sender = new Sender()
-    receiver = new Receiver()
-
-    sender.out -> receiver.in
-}
diff --git a/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf b/test/C/src/federated/failing/DistributedPhysicalActionUpstreamLong.lf
similarity index 100%
rename from test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf
rename to test/C/src/federated/failing/DistributedPhysicalActionUpstreamLong.lf

From 3827c5c12c646670e7bba0c3c77190616c2189f9 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 6 Jun 2023 08:41:52 +0200
Subject: [PATCH 0217/1114] Add enclave AST transformation

---
 .../c/CEnclavedReactorTransformation.java     | 487 ++++++++++++++++++
 1 file changed, 487 insertions(+)
 create mode 100644 core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java

diff --git a/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java b/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
new file mode 100644
index 0000000000..950782fc66
--- /dev/null
+++ b/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
@@ -0,0 +1,487 @@
+package org.lflang.generator.c;
+
+import static org.lflang.AttributeUtils.isEnclave;
+import static org.lflang.AttributeUtils.setEnclaveAttribute;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.xbase.lib.IteratorExtensions;
+
+import org.lflang.ast.ASTUtils;
+import org.lflang.ast.AstTransformation;
+import org.lflang.generator.CodeBuilder;
+import org.lflang.generator.DelayBodyGenerator;
+import org.lflang.generator.TargetTypes;
+import org.lflang.lf.Action;
+import org.lflang.lf.ActionOrigin;
+import org.lflang.lf.Assignment;
+import org.lflang.lf.Code;
+import org.lflang.lf.Connection;
+import org.lflang.lf.Expression;
+import org.lflang.lf.Initializer;
+import org.lflang.lf.Input;
+import org.lflang.lf.Instantiation;
+import org.lflang.lf.LfFactory;
+import org.lflang.lf.Mode;
+import org.lflang.lf.Model;
+import org.lflang.lf.Output;
+import org.lflang.lf.Parameter;
+import org.lflang.lf.ParameterReference;
+import org.lflang.lf.Preamble;
+import org.lflang.lf.Reaction;
+import org.lflang.lf.Reactor;
+import org.lflang.lf.Time;
+import org.lflang.lf.Type;
+import org.lflang.lf.TypeParm;
+import org.lflang.lf.VarRef;
+import org.lflang.util.IteratorUtil;
+
+import com.google.common.collect.Iterables;
+
+public class CEnclavedReactorTransformation implements AstTransformation {
+
+    public static final LfFactory factory = ASTUtils.factory;
+
+    private final Resource mainResource;
+    public CEnclavedReactorTransformation(Resource mainResource) {
+        this.mainResource = mainResource;
+    }
+
+    // We only need a single ConnectionReactor since it uses generics.
+    Reactor connectionReactor = null;
+
+    public void applyTransformation(List<Reactor> reactors) {
+        // This function performs the whole AST transformation consisting in
+        // 1. Get all Enclave Reactors
+        List <Instantiation> enclaveInsts = getEnclaveInsts(reactors);
+        List <Reactor> enclaveDefs = enclaveInsts.stream().map(r -> ASTUtils.toDefinition(r.getReactorClass())).distinct().toList();
+
+        // 2. create ReactorWrappers for all of them.
+        Map<Reactor, Reactor> defMap = createEnclaveWrappers(enclaveDefs);
+
+        // 2. Replace enclave Reactor instances with wrapper instances.
+        Map<Instantiation, Instantiation> instMap =
+            replaceEnclavesWithWrappers(enclaveInsts, defMap);
+
+        connectWrappers(reactors, instMap);
+
+    }
+    // Get the reactor definitions of all the enclaves
+    private List<Instantiation> getEnclaveInsts(List<Reactor> reactors) {
+        List<Instantiation> enclaves = new ArrayList<>();
+        for (Reactor container : reactors) {
+            for (Instantiation inst : container.getInstantiations()) {
+                if (isEnclave(inst)) {
+                    enclaves.add(inst);
+                }
+            }
+        }
+        return enclaves;
+    }
+
+    // Side-effect: Fills the enclaveToWrapperMap with the newly created EnclaveWrappers
+    private Map<Reactor, Reactor> createEnclaveWrappers(List<Reactor> enclaves) {
+        Map<Reactor, Reactor> map= new LinkedHashMap<>();
+        for (Reactor enclave: enclaves) {
+            Reactor wrapper = createEnclaveWrapperClass(enclave);
+
+            // Hook it into AST
+            EObject node =
+                IteratorExtensions.findFirst(mainResource.getAllContents(), Model.class::isInstance);
+            ((Model) node).getReactors().add(wrapper);
+
+            map.put(enclave, wrapper);
+        }
+        return map;
+    }
+
+    private Reactor createEnclaveWrapperClass(Reactor enclaveDef) {
+        // TODO: Add the same parameters to wrapper
+        // TODO: Copy wrapper parameters to the inst
+        Reactor wrapper = factory.createReactor();
+        wrapper.setName(wrapperClassName(enclaveDef.getName()));
+        Instantiation wrappedEnclaveInst = ASTUtils.createInstantiation(enclaveDef);
+        wrappedEnclaveInst.setName(wrappedInstanceName(enclaveDef.getName()));
+        wrapper.getInstantiations().add(wrappedEnclaveInst);
+        for (Input input: enclaveDef.getInputs()) {
+            Input in = factory.createInput();
+            Type type = input.getType();
+            in.setName(input.getName());
+            in.setType(EcoreUtil.copy(input.getType()));
+            Parameter delayParam = createDelayParameter(input.getName() + "_delay");
+            wrapper.getParameters().add(delayParam);
+            ParameterReference delayParamRef = factory.createParameterReference();
+            delayParamRef.setParameter(delayParam);
+
+            // Create Connection reactor def and inst
+            Reactor connReactorDef = createEnclaveConnectionClass();
+            Instantiation connReactorInst = factory.createInstantiation();
+            connReactorInst.setReactorClass(connReactorDef);
+            connReactorInst.setName(connReactorDef.getName() + input.getName());
+            connReactorInst.getTypeArgs().add(EcoreUtil.copy(type));
+
+            // Set the delay parameter of the ConnectionRactor
+            Assignment delayAssignment = factory.createAssignment();
+            delayAssignment.setLhs(connReactorDef.getParameters().get(0));
+            Initializer init = factory.createInitializer();
+            init.getExprs().add(Objects.requireNonNull(delayParamRef));
+            delayAssignment.setRhs(init);
+            connReactorInst.getParameters().add(delayAssignment);
+
+            // Create the two actual connections between top-level, connection-reactor and wrapped enclave
+            Connection conn1 = factory.createConnection();
+            Connection conn2 = factory.createConnection();
+
+            // Create var-refs fpr ports
+            VarRef topInRef = factory.createVarRef();
+            VarRef encInRef = factory.createVarRef();
+            VarRef connInRef = factory.createVarRef();
+            VarRef connOutRef = factory.createVarRef();
+
+            // Tie the var-refs to their ports
+            topInRef.setVariable(in);
+
+            encInRef.setContainer(wrappedEnclaveInst);
+            encInRef.setVariable(input);
+
+            connInRef.setContainer(connReactorInst);
+            connInRef.setVariable(connReactorDef.getInputs().get(0));
+
+            connOutRef.setContainer(connReactorInst);
+            connOutRef.setVariable(connReactorDef.getOutputs().get(0));
+
+            // Connect var-refs and connections
+            conn1.getLeftPorts().add(topInRef);
+            conn1.getRightPorts().add(connInRef);
+
+            conn2.getLeftPorts().add(connOutRef);
+            conn2.getRightPorts().add(encInRef);
+
+            // Add all objects to the wrapper class
+            wrapper.getInputs().add(in);
+            wrapper.getConnections().add(conn1);
+            wrapper.getConnections().add(conn2);
+            wrapper.getInstantiations().add(connReactorInst);
+        }
+
+        for (Output output: enclaveDef.getOutputs()) {
+            Output out = factory.createOutput();
+            Type type = output.getType();
+            out.setName(output.getName());
+            out.setType(EcoreUtil.copy(type));
+
+            // Create the two actual connections between top-level, connection-reactor and wrapped enclave
+            Connection conn1 = factory.createConnection();
+
+            // Create var-refs fpr ports
+            VarRef topOutRef = factory.createVarRef();
+            VarRef encOutRef = factory.createVarRef();
+
+            // Tie the var-refs to their ports
+            topOutRef.setVariable(out);
+
+            encOutRef.setContainer(wrappedEnclaveInst);
+            encOutRef.setVariable(output);
+
+            // Connect var-refs and connections
+            conn1.getLeftPorts().add(encOutRef);
+            conn1.getRightPorts().add(topOutRef);
+
+            // Add all objects to the wrapper class
+            wrapper.getOutputs().add(out);
+            wrapper.getConnections().add(conn1);
+        }
+
+        return wrapper;
+    }
+    private String wrapperClassName(String originalName) {
+        return "_" + originalName + "Wrapper";
+    }
+
+    private String wrappedInstanceName(String originalName) {
+        return "_" + originalName + "_wrapped";
+    }
+
+    private void connectWrapperThroughConnectionReactor(VarRef lhs, VarRef rhs, Instantiation connReactor) {
+
+    }
+
+    // Side effect: We overwrite the Reactor-list passed into the AST. We remove and add Reactors as
+    // children into the hierarchy. This function should also remove all old connections between reactors
+    // and original enclaves with new instances.
+    private Map<Instantiation, Instantiation> replaceEnclavesWithWrappers(List<Instantiation> enclaveInsts, Map<Reactor, Reactor> defMap) {
+        Map<Instantiation, Instantiation> instMap = new LinkedHashMap<>();
+
+        for (Instantiation inst: enclaveInsts) {
+            EObject parent = inst.eContainer();
+            Reactor wrapperDef = defMap.get(ASTUtils.toDefinition(inst.getReactorClass()));
+            Instantiation wrapperInst = ASTUtils.createInstantiation(wrapperDef);
+            wrapperInst.setName("_wrapper_"+inst.getName());
+
+            setEnclaveAttribute(wrapperInst);
+            // TODO: Copy parameters from inst to wrapperInst
+
+            if (parent instanceof Reactor) {
+                ((Reactor) parent).getInstantiations().remove(inst);
+                ((Reactor) parent).getInstantiations().add(wrapperInst);
+            } else if (parent instanceof Mode) {
+                ((Mode) parent).getInstantiations().remove(inst);
+                ((Mode) parent).getInstantiations().add(wrapperInst);
+            }
+
+            instMap.put(inst, wrapperInst);
+        }
+        return instMap;
+    }
+
+    private void connectWrappers(List<Reactor> reactors, Map<Instantiation, Instantiation> instMap) {
+        for (Reactor container : reactors) {
+            for (Connection connection : ASTUtils.allConnections(container)) {
+                replaceConnection(connection, instMap);
+            }
+        }
+    }
+
+    // TODO: Handle all connection patterns.
+    private void replaceConnection(Connection conn, Map<Instantiation, Instantiation> instMap) {
+       if (isEnclave2EnclaveConn(conn)) {
+           replaceEnclave2EnclaveConn(conn, instMap);
+       }
+    }
+    private boolean isEnclavePort(VarRef portRef) {
+        return isEnclave(portRef.getContainer());
+    }
+
+    private boolean isEnclave2EnclaveConn(Connection conn) {
+        VarRef lhs = conn.getLeftPorts().get(0);
+        VarRef rhs = conn.getRightPorts().get(0);
+        return isEnclavePort(lhs) && isEnclavePort(rhs);
+    }
+
+    private void replaceEnclave2EnclaveConn(Connection oldConn, Map<Instantiation, Instantiation> instMap) {
+        Connection newConn  = factory.createConnection();
+        VarRef wrapperSrcOutput = factory.createVarRef();
+        VarRef wrapperDestInput = factory.createVarRef();
+
+        VarRef oldOutput = oldConn.getLeftPorts().get(0);
+        VarRef oldInput = oldConn.getRightPorts().get(0);
+        Instantiation src = oldOutput.getContainer();
+        Instantiation dest = oldInput.getContainer();
+        Instantiation wrapperSrc = instMap.get(src);
+        Instantiation wrapperDest = instMap.get(dest);
+
+        // Set the delay parameter of the enclaved connection which is inside the wrapperDest
+        // FIXME: clean up
+        Expression connDelay = oldConn.getDelay();
+        if (connDelay != null) {
+            Assignment delayAssignment = factory.createAssignment();
+            // Hide behind function maybe?
+            delayAssignment.setLhs(getParameter(wrapperDest, oldInput.getVariable().getName() + "_delay"));
+            Initializer init = factory.createInitializer();
+            init.getExprs().add(connDelay);
+            delayAssignment.setRhs(init);
+            wrapperDest.getParameters().add(delayAssignment);
+        }
+
+
+        wrapperSrcOutput.setContainer(wrapperSrc);
+        wrapperSrcOutput.setVariable(getInstanceOutputPortByName(wrapperSrc, oldOutput.getVariable().getName()));
+        wrapperDestInput.setContainer(wrapperDest);
+        wrapperDestInput.setVariable(getInstanceInputPortByName(wrapperDest, oldInput.getVariable().getName()));
+
+        newConn.getLeftPorts().add(wrapperSrcOutput);
+        newConn.getRightPorts().add(wrapperDestInput);
+
+        replaceConnInAST(oldConn, newConn);
+    }
+
+    private void replaceConnInAST(Connection oldConn, Connection newConn) {
+        var container = oldConn.eContainer();
+        if (container instanceof Reactor) {
+            ((Reactor) container).getConnections().remove(oldConn);
+            ((Reactor) container).getConnections().add(newConn);
+        } else if (container instanceof Mode) {
+            ((Mode) container).getConnections().remove(oldConn);
+            ((Mode) container).getConnections().add(newConn);
+        }
+    }
+
+    private Input getInstanceInputPortByName(Instantiation inst, String name) {
+        for (Input in: ASTUtils.toDefinition(inst.getReactorClass()).getInputs()) {
+            if (in.getName() == name) {
+                return in;
+            }
+        }
+        assert(false);
+        return factory.createInput();
+    }
+
+    private Output getInstanceOutputPortByName(Instantiation inst, String name) {
+        for (Output out: ASTUtils.toDefinition(inst.getReactorClass()).getOutputs()) {
+            if (out.getName().equals(name)) {
+                return out;
+            }
+        }
+        assert(false);
+        return factory.createOutput();
+    }
+
+    // FIXME: Replace with library reactor. But couldnt figure out how to load it
+    private Reactor createEnclaveConnectionClass() {
+        if (connectionReactor != null) {
+            return connectionReactor;
+        }
+        Type type = factory.createType();
+        type.setId("T");
+
+        TypeParm typeParam = factory.createTypeParm();
+        typeParam.setLiteral("T");
+
+        Preamble preamble = factory.createPreamble();
+        preamble.setCode(factory.createCode());
+        preamble.getCode().setBody(String.join("\n",
+            "#include \"reactor_common.h\"",
+            "#include <string.h>"
+        ));
+
+        String className = "EnclaveConnectionReactor";
+        Reactor connReactor = factory.createReactor();
+        connReactor.getTypeParms().add(typeParam);
+        connReactor.getPreambles().add(preamble);
+        Parameter delayParameter = createDelayParameter("delay");
+        var paramRef = factory.createParameterReference();
+        paramRef.setParameter(delayParameter);
+
+        Action action = factory.createAction();
+        VarRef triggerRef = factory.createVarRef();
+        VarRef effectRef = factory.createVarRef();
+        Input input = factory.createInput();
+        Output output = factory.createOutput();
+        VarRef inRef = factory.createVarRef();
+        VarRef outRef = factory.createVarRef();
+
+        Reaction r1 = factory.createReaction();
+        Reaction r2 = factory.createReaction();
+
+        // Name the newly created action; set its delay and type.
+        action.setName("act");
+        action.setMinDelay(paramRef);
+        action.setOrigin(ActionOrigin.LOGICAL);
+        action.setType(EcoreUtil.copy(type));
+
+
+        input.setName("in");
+        input.setType(EcoreUtil.copy(type));
+
+        output.setName("out");
+        output.setType(EcoreUtil.copy(type));
+
+        // Establish references to the involved ports.
+        inRef.setVariable(input);
+        outRef.setVariable(output);
+
+        // Establish references to the action.
+        triggerRef.setVariable(action);
+        effectRef.setVariable(action);
+
+        // Add the action to the reactor.
+        connReactor.setName(className);
+        connReactor.getActions().add(action);
+
+        // Configure the second reaction, which reads the input.
+        r1.getTriggers().add(inRef);
+        r1.getEffects().add(effectRef);
+        r1.setCode(factory.createCode());
+        r1.getCode().setBody(enclavedConnectionDelayBody());
+
+        // Configure the first reaction, which produces the output.
+        r2.getTriggers().add(triggerRef);
+        r2.getEffects().add(outRef);
+        r2.setCode(factory.createCode());
+        r2.getCode().setBody(enclavedConnectionForwardBody());
+
+        // Add the reactions to the newly created reactor class.
+        // These need to go in the opposite order in case
+        // a new input arrives at the same time the delayed
+        // output is delivered!
+        connReactor.getReactions().add(r2);
+        connReactor.getReactions().add(r1);
+
+        connReactor.getInputs().add(input);
+        connReactor.getOutputs().add(output);
+        connReactor.getParameters().add(delayParameter);
+
+        // Hook it into AST
+        EObject node =
+            IteratorExtensions.findFirst(mainResource.getAllContents(), Model.class::isInstance);
+        ((Model) node).getReactors().add(connReactor);
+
+        connectionReactor = connReactor;
+
+        return connReactor;
+    }
+
+    private String enclavedConnectionDelayBody() {
+        CodeBuilder code = new CodeBuilder();
+        code.pr("environment_t* src_env = in->_base.source_reactor->environment;");
+        code.pr("environment_t* dest_env = self->base.environment;");
+        code.pr("// Calculate the tag at which to schedule the event at the target");
+        code.pr("tag_t target_tag = lf_delay_tag(src_env->current_tag, self->delay);");
+        code.pr("int length = 1;");
+        code.pr("if (in->token) length = in->length;");
+        code.pr("token_template_t* template = (token_template_t*)act;");
+        code.pr("lf_critical_section_enter(dest_env);");
+        code.pr("lf_token_t* token = _lf_initialize_token(template, length);");
+        code.pr("memcpy(token->value, &(in->value), template->type.element_size * length);");
+        code.pr("// Schedule event to the destination environment.");
+        code.pr("trigger_handle_t result = _lf_schedule_at_tag(dest_env, act->_base.trigger, target_tag, token);");
+        code.pr("// Notify the main thread in case it is waiting for physical time to elapse");
+        code.pr("lf_notify_of_event(dest_env);");
+        code.pr("lf_critical_section_exit(dest_env);");
+        return code.toString();
+    }
+
+    private String enclavedConnectionForwardBody() {
+       CodeBuilder code = new CodeBuilder();
+       code.pr("lf_set(out, act->value);");
+       return code.toString();
+    }
+
+    private Parameter createDelayParameter(String name) {
+
+        Parameter delayParameter = factory.createParameter();
+
+        delayParameter.setName(name);
+        delayParameter.setType(factory.createType());
+        delayParameter.getType().setId("time");
+        delayParameter.getType().setTime(true);
+        Time defaultTime = factory.createTime();
+        defaultTime.setUnit(null);
+        defaultTime.setInterval(0);
+        Initializer init = factory.createInitializer();
+        init.setParens(true);
+        init.setBraces(false);
+        init.getExprs().add(defaultTime);
+        delayParameter.setInit(init);
+
+        return delayParameter;
+    }
+
+    private Parameter getParameter(Instantiation inst, String name) {
+        Reactor reactorDef = ASTUtils.toDefinition(inst.getReactorClass());
+        for (Parameter p: reactorDef.getParameters()) {
+            if (p.getName().equals(name)) {
+                return p;
+            }
+        }
+        assert(false);
+        return factory.createParameter();
+    }
+}

From f6045b1a3022408fc8b524db869d649103236fd3 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 6 Jun 2023 08:54:30 +0200
Subject: [PATCH 0218/1114] Add AST transformation

---
 .../generator/c/CEnclavedReactorTransformation.java   |  5 +++++
 .../main/java/org/lflang/generator/c/CGenerator.java  |  2 ++
 test/C/src/enclaves/failing/DelayedConnection.lf      | 11 ++++++-----
 test/C/src/enclaves/failing/SimpleConnection.lf       |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java b/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
index 950782fc66..ef11c2b427 100644
--- a/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
+++ b/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
@@ -61,6 +61,11 @@ public void applyTransformation(List<Reactor> reactors) {
         // This function performs the whole AST transformation consisting in
         // 1. Get all Enclave Reactors
         List <Instantiation> enclaveInsts = getEnclaveInsts(reactors);
+
+        if (enclaveInsts.size() == 0) {
+            return;
+        }
+
         List <Reactor> enclaveDefs = enclaveInsts.stream().map(r -> ASTUtils.toDefinition(r.getReactorClass())).distinct().toList();
 
         // 2. create ReactorWrappers for all of them.
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index adf045ce75..78d9748d95 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -319,6 +319,8 @@ protected CGenerator(
     this.types = types;
     this.cmakeGenerator = cmakeGenerator;
 
+    registerTransformation(new CEnclavedReactorTransformation(fileConfig.resource));
+
     registerTransformation(
         new DelayedConnectionTransformation(
             delayConnectionBodyGenerator, types, fileConfig.resource, true, true));
diff --git a/test/C/src/enclaves/failing/DelayedConnection.lf b/test/C/src/enclaves/failing/DelayedConnection.lf
index f9d4c8c864..e16ffbc323 100644
--- a/test/C/src/enclaves/failing/DelayedConnection.lf
+++ b/test/C/src/enclaves/failing/DelayedConnection.lf
@@ -18,14 +18,15 @@ reactor Receiver {
 
     reaction(in) {=
         time_t now = lf_time_logical_elapsed();
-        if (now - self->last != MSEC(50)) {
-            lf_print_error_and_exit("now=%lli last=%lli", now, self->last);
-        }
-        if (self->cnt++ != in->value) {
-            lf_print_error_and_exit("recv=%u exp=%u", in->value, self->cnt);
+        lf_print("Received event t=" PRINTF_TIME", count=%u", now, in->value);
+
+        lf_assert(self->cnt == in->value, "recv=%u exp=%u", in->value, self->cnt);
+        if (now != 0) {
+            lf_assert(now - self->last == MSEC(50), "now="PRINTF_TIME" last="PRINTF_TIME, now, self->last);
         }
 
         self->last = now;
+        self->cnt++;
     =}
 }
 
diff --git a/test/C/src/enclaves/failing/SimpleConnection.lf b/test/C/src/enclaves/failing/SimpleConnection.lf
index 7d53a10f8b..d559a65e3a 100644
--- a/test/C/src/enclaves/failing/SimpleConnection.lf
+++ b/test/C/src/enclaves/failing/SimpleConnection.lf
@@ -36,5 +36,5 @@ main reactor {
     @enclave
     receiver = new Receiver()
 
-    sender.out -> receiver.in after 50 msec
+    sender.out -> receiver.in
 }

From d912c7f70416ff21451395b9fa064467f3fb672f Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 6 Jun 2023 08:55:22 +0200
Subject: [PATCH 0219/1114] Move enclaves tests out of failing

---
 test/C/src/enclaves/{failing => }/DelayedConnection.lf         | 0
 test/C/src/enclaves/{failing => }/EnclavedConnectionReactor.lf | 0
 test/C/src/enclaves/{failing => }/NonCommunicating.lf          | 0
 test/C/src/enclaves/{failing => }/SimpleConnection.lf          | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename test/C/src/enclaves/{failing => }/DelayedConnection.lf (100%)
 rename test/C/src/enclaves/{failing => }/EnclavedConnectionReactor.lf (100%)
 rename test/C/src/enclaves/{failing => }/NonCommunicating.lf (100%)
 rename test/C/src/enclaves/{failing => }/SimpleConnection.lf (100%)

diff --git a/test/C/src/enclaves/failing/DelayedConnection.lf b/test/C/src/enclaves/DelayedConnection.lf
similarity index 100%
rename from test/C/src/enclaves/failing/DelayedConnection.lf
rename to test/C/src/enclaves/DelayedConnection.lf
diff --git a/test/C/src/enclaves/failing/EnclavedConnectionReactor.lf b/test/C/src/enclaves/EnclavedConnectionReactor.lf
similarity index 100%
rename from test/C/src/enclaves/failing/EnclavedConnectionReactor.lf
rename to test/C/src/enclaves/EnclavedConnectionReactor.lf
diff --git a/test/C/src/enclaves/failing/NonCommunicating.lf b/test/C/src/enclaves/NonCommunicating.lf
similarity index 100%
rename from test/C/src/enclaves/failing/NonCommunicating.lf
rename to test/C/src/enclaves/NonCommunicating.lf
diff --git a/test/C/src/enclaves/failing/SimpleConnection.lf b/test/C/src/enclaves/SimpleConnection.lf
similarity index 100%
rename from test/C/src/enclaves/failing/SimpleConnection.lf
rename to test/C/src/enclaves/SimpleConnection.lf

From 9108b7427bdd6beaf4f800ebeec588a78db93c5f Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 6 Jun 2023 09:30:21 +0200
Subject: [PATCH 0220/1114] Rename run back to build in Zephyr

---
 .../java/org/lflang/tests/runtime/CZephyrTest.java        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java
index 56ba6c8f4b..145f4b1d53 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java
@@ -44,7 +44,7 @@ public CZephyrTest() {
   }
 
   @Test
-  public void runZephyrUnthreadedTests() {
+  public void buildZephyrUnthreadedTests() {
     Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
     super.runTestsFor(
         List.of(Target.C),
@@ -56,7 +56,7 @@ public void runZephyrUnthreadedTests() {
   }
 
   @Test
-  public void runZephyrThreadedTests() {
+  public void buildZephyrThreadedTests() {
     Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
     super.runTestsFor(
         List.of(Target.C),
@@ -68,7 +68,7 @@ public void runZephyrThreadedTests() {
   }
 
   @Test
-  public void runBasicTests() {
+  public void buildBasicTests() {
     Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
     super.runTestsFor(
         List.of(Target.C),
@@ -80,7 +80,7 @@ public void runBasicTests() {
   }
 
   @Test
-  public void runConcurrentTests() {
+  public void buildConcurrentTests() {
     Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
 
     super.runTestsFor(

From 9d80a4557285ef7b0ab1da25612ccf71d6c78356 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 6 Jun 2023 09:31:23 +0200
Subject: [PATCH 0221/1114] Fix merge

---
 core/src/testFixtures/java/org/lflang/tests/TestRegistry.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
index 72a4ac5cda..8dd2249554 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
@@ -118,8 +118,8 @@ public enum TestCategory {
     CONCURRENT(true, "", TestLevel.EXECUTION),
     /** Test about enclaves */
     ENCLAVE(false, "", TestLevel.EXECUTION),
-    /** Generic tests, ie, tests that all targets are supposed to implement. */
-    GENERIC(true, "", TestLevel.EXECUTION),
+    /** Basic tests, ie, tests that all targets are supposed to implement. */
+    BASIC(true, "", TestLevel.EXECUTION),
     /** Tests about generics, not to confuse with {@link #GENERIC}. */
     GENERICS(true, "", TestLevel.EXECUTION),
     /** Tests about multiports and banks of reactors. */

From 2dc0fd220fc0a3de70277ec8b2ce1417656ae8c8 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 6 Jun 2023 09:47:26 +0200
Subject: [PATCH 0222/1114] Spotless

---
 .../org/lflang/generator/ReactorInstance.java |   4 +-
 .../c/CEnclavedReactorTransformation.java     | 833 +++++++++---------
 2 files changed, 419 insertions(+), 418 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/ReactorInstance.java b/core/src/main/java/org/lflang/generator/ReactorInstance.java
index df7f29f3b6..8077524de8 100644
--- a/core/src/main/java/org/lflang/generator/ReactorInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactorInstance.java
@@ -815,8 +815,8 @@ public ReactorInstance(
         parent == null
             ? new TypeParameterizedReactor(definition, reactors)
             : new TypeParameterizedReactor(definition, parent.tpr);
-    
-    // If this instance is an enclave (or the main reactor). Create an 
+
+    // If this instance is an enclave (or the main reactor). Create an
     // enclaveInfo object to track information about the enclave needed for
     // later code-generation
     if (isEnclave(definition) || this.isMainOrFederated()) {
diff --git a/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java b/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
index ef11c2b427..415807d4cf 100644
--- a/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
+++ b/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
@@ -8,21 +8,16 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-
-import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.ast.AstTransformation;
 import org.lflang.generator.CodeBuilder;
-import org.lflang.generator.DelayBodyGenerator;
-import org.lflang.generator.TargetTypes;
 import org.lflang.lf.Action;
 import org.lflang.lf.ActionOrigin;
 import org.lflang.lf.Assignment;
-import org.lflang.lf.Code;
 import org.lflang.lf.Connection;
 import org.lflang.lf.Expression;
 import org.lflang.lf.Initializer;
@@ -41,452 +36,458 @@
 import org.lflang.lf.Type;
 import org.lflang.lf.TypeParm;
 import org.lflang.lf.VarRef;
-import org.lflang.util.IteratorUtil;
-
-import com.google.common.collect.Iterables;
 
 public class CEnclavedReactorTransformation implements AstTransformation {
 
-    public static final LfFactory factory = ASTUtils.factory;
+  public static final LfFactory factory = ASTUtils.factory;
 
-    private final Resource mainResource;
-    public CEnclavedReactorTransformation(Resource mainResource) {
-        this.mainResource = mainResource;
-    }
+  private final Resource mainResource;
 
-    // We only need a single ConnectionReactor since it uses generics.
-    Reactor connectionReactor = null;
+  public CEnclavedReactorTransformation(Resource mainResource) {
+    this.mainResource = mainResource;
+  }
 
-    public void applyTransformation(List<Reactor> reactors) {
-        // This function performs the whole AST transformation consisting in
-        // 1. Get all Enclave Reactors
-        List <Instantiation> enclaveInsts = getEnclaveInsts(reactors);
+  // We only need a single ConnectionReactor since it uses generics.
+  Reactor connectionReactor = null;
 
-        if (enclaveInsts.size() == 0) {
-            return;
-        }
+  public void applyTransformation(List<Reactor> reactors) {
+    // This function performs the whole AST transformation consisting in
+    // 1. Get all Enclave Reactors
+    List<Instantiation> enclaveInsts = getEnclaveInsts(reactors);
 
-        List <Reactor> enclaveDefs = enclaveInsts.stream().map(r -> ASTUtils.toDefinition(r.getReactorClass())).distinct().toList();
-
-        // 2. create ReactorWrappers for all of them.
-        Map<Reactor, Reactor> defMap = createEnclaveWrappers(enclaveDefs);
-
-        // 2. Replace enclave Reactor instances with wrapper instances.
-        Map<Instantiation, Instantiation> instMap =
-            replaceEnclavesWithWrappers(enclaveInsts, defMap);
-
-        connectWrappers(reactors, instMap);
-
-    }
-    // Get the reactor definitions of all the enclaves
-    private List<Instantiation> getEnclaveInsts(List<Reactor> reactors) {
-        List<Instantiation> enclaves = new ArrayList<>();
-        for (Reactor container : reactors) {
-            for (Instantiation inst : container.getInstantiations()) {
-                if (isEnclave(inst)) {
-                    enclaves.add(inst);
-                }
-            }
-        }
-        return enclaves;
+    if (enclaveInsts.size() == 0) {
+      return;
     }
 
-    // Side-effect: Fills the enclaveToWrapperMap with the newly created EnclaveWrappers
-    private Map<Reactor, Reactor> createEnclaveWrappers(List<Reactor> enclaves) {
-        Map<Reactor, Reactor> map= new LinkedHashMap<>();
-        for (Reactor enclave: enclaves) {
-            Reactor wrapper = createEnclaveWrapperClass(enclave);
-
-            // Hook it into AST
-            EObject node =
-                IteratorExtensions.findFirst(mainResource.getAllContents(), Model.class::isInstance);
-            ((Model) node).getReactors().add(wrapper);
-
-            map.put(enclave, wrapper);
+    List<Reactor> enclaveDefs =
+        enclaveInsts.stream()
+            .map(r -> ASTUtils.toDefinition(r.getReactorClass()))
+            .distinct()
+            .toList();
+
+    // 2. create ReactorWrappers for all of them.
+    Map<Reactor, Reactor> defMap = createEnclaveWrappers(enclaveDefs);
+
+    // 2. Replace enclave Reactor instances with wrapper instances.
+    Map<Instantiation, Instantiation> instMap = replaceEnclavesWithWrappers(enclaveInsts, defMap);
+
+    connectWrappers(reactors, instMap);
+  }
+  // Get the reactor definitions of all the enclaves
+  private List<Instantiation> getEnclaveInsts(List<Reactor> reactors) {
+    List<Instantiation> enclaves = new ArrayList<>();
+    for (Reactor container : reactors) {
+      for (Instantiation inst : container.getInstantiations()) {
+        if (isEnclave(inst)) {
+          enclaves.add(inst);
         }
-        return map;
+      }
     }
+    return enclaves;
+  }
 
-    private Reactor createEnclaveWrapperClass(Reactor enclaveDef) {
-        // TODO: Add the same parameters to wrapper
-        // TODO: Copy wrapper parameters to the inst
-        Reactor wrapper = factory.createReactor();
-        wrapper.setName(wrapperClassName(enclaveDef.getName()));
-        Instantiation wrappedEnclaveInst = ASTUtils.createInstantiation(enclaveDef);
-        wrappedEnclaveInst.setName(wrappedInstanceName(enclaveDef.getName()));
-        wrapper.getInstantiations().add(wrappedEnclaveInst);
-        for (Input input: enclaveDef.getInputs()) {
-            Input in = factory.createInput();
-            Type type = input.getType();
-            in.setName(input.getName());
-            in.setType(EcoreUtil.copy(input.getType()));
-            Parameter delayParam = createDelayParameter(input.getName() + "_delay");
-            wrapper.getParameters().add(delayParam);
-            ParameterReference delayParamRef = factory.createParameterReference();
-            delayParamRef.setParameter(delayParam);
-
-            // Create Connection reactor def and inst
-            Reactor connReactorDef = createEnclaveConnectionClass();
-            Instantiation connReactorInst = factory.createInstantiation();
-            connReactorInst.setReactorClass(connReactorDef);
-            connReactorInst.setName(connReactorDef.getName() + input.getName());
-            connReactorInst.getTypeArgs().add(EcoreUtil.copy(type));
-
-            // Set the delay parameter of the ConnectionRactor
-            Assignment delayAssignment = factory.createAssignment();
-            delayAssignment.setLhs(connReactorDef.getParameters().get(0));
-            Initializer init = factory.createInitializer();
-            init.getExprs().add(Objects.requireNonNull(delayParamRef));
-            delayAssignment.setRhs(init);
-            connReactorInst.getParameters().add(delayAssignment);
-
-            // Create the two actual connections between top-level, connection-reactor and wrapped enclave
-            Connection conn1 = factory.createConnection();
-            Connection conn2 = factory.createConnection();
-
-            // Create var-refs fpr ports
-            VarRef topInRef = factory.createVarRef();
-            VarRef encInRef = factory.createVarRef();
-            VarRef connInRef = factory.createVarRef();
-            VarRef connOutRef = factory.createVarRef();
-
-            // Tie the var-refs to their ports
-            topInRef.setVariable(in);
-
-            encInRef.setContainer(wrappedEnclaveInst);
-            encInRef.setVariable(input);
-
-            connInRef.setContainer(connReactorInst);
-            connInRef.setVariable(connReactorDef.getInputs().get(0));
-
-            connOutRef.setContainer(connReactorInst);
-            connOutRef.setVariable(connReactorDef.getOutputs().get(0));
-
-            // Connect var-refs and connections
-            conn1.getLeftPorts().add(topInRef);
-            conn1.getRightPorts().add(connInRef);
-
-            conn2.getLeftPorts().add(connOutRef);
-            conn2.getRightPorts().add(encInRef);
-
-            // Add all objects to the wrapper class
-            wrapper.getInputs().add(in);
-            wrapper.getConnections().add(conn1);
-            wrapper.getConnections().add(conn2);
-            wrapper.getInstantiations().add(connReactorInst);
-        }
-
-        for (Output output: enclaveDef.getOutputs()) {
-            Output out = factory.createOutput();
-            Type type = output.getType();
-            out.setName(output.getName());
-            out.setType(EcoreUtil.copy(type));
-
-            // Create the two actual connections between top-level, connection-reactor and wrapped enclave
-            Connection conn1 = factory.createConnection();
-
-            // Create var-refs fpr ports
-            VarRef topOutRef = factory.createVarRef();
-            VarRef encOutRef = factory.createVarRef();
+  // Side-effect: Fills the enclaveToWrapperMap with the newly created EnclaveWrappers
+  private Map<Reactor, Reactor> createEnclaveWrappers(List<Reactor> enclaves) {
+    Map<Reactor, Reactor> map = new LinkedHashMap<>();
+    for (Reactor enclave : enclaves) {
+      Reactor wrapper = createEnclaveWrapperClass(enclave);
 
-            // Tie the var-refs to their ports
-            topOutRef.setVariable(out);
+      // Hook it into AST
+      EObject node =
+          IteratorExtensions.findFirst(mainResource.getAllContents(), Model.class::isInstance);
+      ((Model) node).getReactors().add(wrapper);
 
-            encOutRef.setContainer(wrappedEnclaveInst);
-            encOutRef.setVariable(output);
-
-            // Connect var-refs and connections
-            conn1.getLeftPorts().add(encOutRef);
-            conn1.getRightPorts().add(topOutRef);
-
-            // Add all objects to the wrapper class
-            wrapper.getOutputs().add(out);
-            wrapper.getConnections().add(conn1);
-        }
-
-        return wrapper;
+      map.put(enclave, wrapper);
     }
-    private String wrapperClassName(String originalName) {
-        return "_" + originalName + "Wrapper";
+    return map;
+  }
+
+  private Reactor createEnclaveWrapperClass(Reactor enclaveDef) {
+    // TODO: Add the same parameters to wrapper
+    // TODO: Copy wrapper parameters to the inst
+    Reactor wrapper = factory.createReactor();
+    wrapper.setName(wrapperClassName(enclaveDef.getName()));
+    Instantiation wrappedEnclaveInst = ASTUtils.createInstantiation(enclaveDef);
+    wrappedEnclaveInst.setName(wrappedInstanceName(enclaveDef.getName()));
+    wrapper.getInstantiations().add(wrappedEnclaveInst);
+    for (Input input : enclaveDef.getInputs()) {
+      Input in = factory.createInput();
+      Type type = input.getType();
+      in.setName(input.getName());
+      in.setType(EcoreUtil.copy(input.getType()));
+      Parameter delayParam = createDelayParameter(input.getName() + "_delay");
+      wrapper.getParameters().add(delayParam);
+      ParameterReference delayParamRef = factory.createParameterReference();
+      delayParamRef.setParameter(delayParam);
+
+      // Create Connection reactor def and inst
+      Reactor connReactorDef = createEnclaveConnectionClass();
+      Instantiation connReactorInst = factory.createInstantiation();
+      connReactorInst.setReactorClass(connReactorDef);
+      connReactorInst.setName(connReactorDef.getName() + input.getName());
+      connReactorInst.getTypeArgs().add(EcoreUtil.copy(type));
+
+      // Set the delay parameter of the ConnectionRactor
+      Assignment delayAssignment = factory.createAssignment();
+      delayAssignment.setLhs(connReactorDef.getParameters().get(0));
+      Initializer init = factory.createInitializer();
+      init.getExprs().add(Objects.requireNonNull(delayParamRef));
+      delayAssignment.setRhs(init);
+      connReactorInst.getParameters().add(delayAssignment);
+
+      // Create the two actual connections between top-level, connection-reactor and wrapped enclave
+      Connection conn1 = factory.createConnection();
+      Connection conn2 = factory.createConnection();
+
+      // Create var-refs fpr ports
+      VarRef topInRef = factory.createVarRef();
+      VarRef encInRef = factory.createVarRef();
+      VarRef connInRef = factory.createVarRef();
+      VarRef connOutRef = factory.createVarRef();
+
+      // Tie the var-refs to their ports
+      topInRef.setVariable(in);
+
+      encInRef.setContainer(wrappedEnclaveInst);
+      encInRef.setVariable(input);
+
+      connInRef.setContainer(connReactorInst);
+      connInRef.setVariable(connReactorDef.getInputs().get(0));
+
+      connOutRef.setContainer(connReactorInst);
+      connOutRef.setVariable(connReactorDef.getOutputs().get(0));
+
+      // Connect var-refs and connections
+      conn1.getLeftPorts().add(topInRef);
+      conn1.getRightPorts().add(connInRef);
+
+      conn2.getLeftPorts().add(connOutRef);
+      conn2.getRightPorts().add(encInRef);
+
+      // Add all objects to the wrapper class
+      wrapper.getInputs().add(in);
+      wrapper.getConnections().add(conn1);
+      wrapper.getConnections().add(conn2);
+      wrapper.getInstantiations().add(connReactorInst);
     }
 
-    private String wrappedInstanceName(String originalName) {
-        return "_" + originalName + "_wrapped";
-    }
+    for (Output output : enclaveDef.getOutputs()) {
+      Output out = factory.createOutput();
+      Type type = output.getType();
+      out.setName(output.getName());
+      out.setType(EcoreUtil.copy(type));
 
-    private void connectWrapperThroughConnectionReactor(VarRef lhs, VarRef rhs, Instantiation connReactor) {
+      // Create the two actual connections between top-level, connection-reactor and wrapped enclave
+      Connection conn1 = factory.createConnection();
 
-    }
+      // Create var-refs fpr ports
+      VarRef topOutRef = factory.createVarRef();
+      VarRef encOutRef = factory.createVarRef();
 
-    // Side effect: We overwrite the Reactor-list passed into the AST. We remove and add Reactors as
-    // children into the hierarchy. This function should also remove all old connections between reactors
-    // and original enclaves with new instances.
-    private Map<Instantiation, Instantiation> replaceEnclavesWithWrappers(List<Instantiation> enclaveInsts, Map<Reactor, Reactor> defMap) {
-        Map<Instantiation, Instantiation> instMap = new LinkedHashMap<>();
-
-        for (Instantiation inst: enclaveInsts) {
-            EObject parent = inst.eContainer();
-            Reactor wrapperDef = defMap.get(ASTUtils.toDefinition(inst.getReactorClass()));
-            Instantiation wrapperInst = ASTUtils.createInstantiation(wrapperDef);
-            wrapperInst.setName("_wrapper_"+inst.getName());
-
-            setEnclaveAttribute(wrapperInst);
-            // TODO: Copy parameters from inst to wrapperInst
-
-            if (parent instanceof Reactor) {
-                ((Reactor) parent).getInstantiations().remove(inst);
-                ((Reactor) parent).getInstantiations().add(wrapperInst);
-            } else if (parent instanceof Mode) {
-                ((Mode) parent).getInstantiations().remove(inst);
-                ((Mode) parent).getInstantiations().add(wrapperInst);
-            }
-
-            instMap.put(inst, wrapperInst);
-        }
-        return instMap;
-    }
+      // Tie the var-refs to their ports
+      topOutRef.setVariable(out);
 
-    private void connectWrappers(List<Reactor> reactors, Map<Instantiation, Instantiation> instMap) {
-        for (Reactor container : reactors) {
-            for (Connection connection : ASTUtils.allConnections(container)) {
-                replaceConnection(connection, instMap);
-            }
-        }
-    }
+      encOutRef.setContainer(wrappedEnclaveInst);
+      encOutRef.setVariable(output);
 
-    // TODO: Handle all connection patterns.
-    private void replaceConnection(Connection conn, Map<Instantiation, Instantiation> instMap) {
-       if (isEnclave2EnclaveConn(conn)) {
-           replaceEnclave2EnclaveConn(conn, instMap);
-       }
-    }
-    private boolean isEnclavePort(VarRef portRef) {
-        return isEnclave(portRef.getContainer());
-    }
+      // Connect var-refs and connections
+      conn1.getLeftPorts().add(encOutRef);
+      conn1.getRightPorts().add(topOutRef);
 
-    private boolean isEnclave2EnclaveConn(Connection conn) {
-        VarRef lhs = conn.getLeftPorts().get(0);
-        VarRef rhs = conn.getRightPorts().get(0);
-        return isEnclavePort(lhs) && isEnclavePort(rhs);
+      // Add all objects to the wrapper class
+      wrapper.getOutputs().add(out);
+      wrapper.getConnections().add(conn1);
     }
 
-    private void replaceEnclave2EnclaveConn(Connection oldConn, Map<Instantiation, Instantiation> instMap) {
-        Connection newConn  = factory.createConnection();
-        VarRef wrapperSrcOutput = factory.createVarRef();
-        VarRef wrapperDestInput = factory.createVarRef();
-
-        VarRef oldOutput = oldConn.getLeftPorts().get(0);
-        VarRef oldInput = oldConn.getRightPorts().get(0);
-        Instantiation src = oldOutput.getContainer();
-        Instantiation dest = oldInput.getContainer();
-        Instantiation wrapperSrc = instMap.get(src);
-        Instantiation wrapperDest = instMap.get(dest);
-
-        // Set the delay parameter of the enclaved connection which is inside the wrapperDest
-        // FIXME: clean up
-        Expression connDelay = oldConn.getDelay();
-        if (connDelay != null) {
-            Assignment delayAssignment = factory.createAssignment();
-            // Hide behind function maybe?
-            delayAssignment.setLhs(getParameter(wrapperDest, oldInput.getVariable().getName() + "_delay"));
-            Initializer init = factory.createInitializer();
-            init.getExprs().add(connDelay);
-            delayAssignment.setRhs(init);
-            wrapperDest.getParameters().add(delayAssignment);
-        }
-
-
-        wrapperSrcOutput.setContainer(wrapperSrc);
-        wrapperSrcOutput.setVariable(getInstanceOutputPortByName(wrapperSrc, oldOutput.getVariable().getName()));
-        wrapperDestInput.setContainer(wrapperDest);
-        wrapperDestInput.setVariable(getInstanceInputPortByName(wrapperDest, oldInput.getVariable().getName()));
-
-        newConn.getLeftPorts().add(wrapperSrcOutput);
-        newConn.getRightPorts().add(wrapperDestInput);
-
-        replaceConnInAST(oldConn, newConn);
+    return wrapper;
+  }
+
+  private String wrapperClassName(String originalName) {
+    return "_" + originalName + "Wrapper";
+  }
+
+  private String wrappedInstanceName(String originalName) {
+    return "_" + originalName + "_wrapped";
+  }
+
+  private void connectWrapperThroughConnectionReactor(
+      VarRef lhs, VarRef rhs, Instantiation connReactor) {}
+
+  // Side effect: We overwrite the Reactor-list passed into the AST. We remove and add Reactors as
+  // children into the hierarchy. This function should also remove all old connections between
+  // reactors
+  // and original enclaves with new instances.
+  private Map<Instantiation, Instantiation> replaceEnclavesWithWrappers(
+      List<Instantiation> enclaveInsts, Map<Reactor, Reactor> defMap) {
+    Map<Instantiation, Instantiation> instMap = new LinkedHashMap<>();
+
+    for (Instantiation inst : enclaveInsts) {
+      EObject parent = inst.eContainer();
+      Reactor wrapperDef = defMap.get(ASTUtils.toDefinition(inst.getReactorClass()));
+      Instantiation wrapperInst = ASTUtils.createInstantiation(wrapperDef);
+      wrapperInst.setName("_wrapper_" + inst.getName());
+
+      setEnclaveAttribute(wrapperInst);
+      // TODO: Copy parameters from inst to wrapperInst
+
+      if (parent instanceof Reactor) {
+        ((Reactor) parent).getInstantiations().remove(inst);
+        ((Reactor) parent).getInstantiations().add(wrapperInst);
+      } else if (parent instanceof Mode) {
+        ((Mode) parent).getInstantiations().remove(inst);
+        ((Mode) parent).getInstantiations().add(wrapperInst);
+      }
+
+      instMap.put(inst, wrapperInst);
     }
-
-    private void replaceConnInAST(Connection oldConn, Connection newConn) {
-        var container = oldConn.eContainer();
-        if (container instanceof Reactor) {
-            ((Reactor) container).getConnections().remove(oldConn);
-            ((Reactor) container).getConnections().add(newConn);
-        } else if (container instanceof Mode) {
-            ((Mode) container).getConnections().remove(oldConn);
-            ((Mode) container).getConnections().add(newConn);
-        }
+    return instMap;
+  }
+
+  private void connectWrappers(List<Reactor> reactors, Map<Instantiation, Instantiation> instMap) {
+    for (Reactor container : reactors) {
+      for (Connection connection : ASTUtils.allConnections(container)) {
+        replaceConnection(connection, instMap);
+      }
     }
+  }
 
-    private Input getInstanceInputPortByName(Instantiation inst, String name) {
-        for (Input in: ASTUtils.toDefinition(inst.getReactorClass()).getInputs()) {
-            if (in.getName() == name) {
-                return in;
-            }
-        }
-        assert(false);
-        return factory.createInput();
+  // TODO: Handle all connection patterns.
+  private void replaceConnection(Connection conn, Map<Instantiation, Instantiation> instMap) {
+    if (isEnclave2EnclaveConn(conn)) {
+      replaceEnclave2EnclaveConn(conn, instMap);
     }
-
-    private Output getInstanceOutputPortByName(Instantiation inst, String name) {
-        for (Output out: ASTUtils.toDefinition(inst.getReactorClass()).getOutputs()) {
-            if (out.getName().equals(name)) {
-                return out;
-            }
-        }
-        assert(false);
-        return factory.createOutput();
+  }
+
+  private boolean isEnclavePort(VarRef portRef) {
+    return isEnclave(portRef.getContainer());
+  }
+
+  private boolean isEnclave2EnclaveConn(Connection conn) {
+    VarRef lhs = conn.getLeftPorts().get(0);
+    VarRef rhs = conn.getRightPorts().get(0);
+    return isEnclavePort(lhs) && isEnclavePort(rhs);
+  }
+
+  private void replaceEnclave2EnclaveConn(
+      Connection oldConn, Map<Instantiation, Instantiation> instMap) {
+    Connection newConn = factory.createConnection();
+    VarRef wrapperSrcOutput = factory.createVarRef();
+    VarRef wrapperDestInput = factory.createVarRef();
+
+    VarRef oldOutput = oldConn.getLeftPorts().get(0);
+    VarRef oldInput = oldConn.getRightPorts().get(0);
+    Instantiation src = oldOutput.getContainer();
+    Instantiation dest = oldInput.getContainer();
+    Instantiation wrapperSrc = instMap.get(src);
+    Instantiation wrapperDest = instMap.get(dest);
+
+    // Set the delay parameter of the enclaved connection which is inside the wrapperDest
+    // FIXME: clean up
+    Expression connDelay = oldConn.getDelay();
+    if (connDelay != null) {
+      Assignment delayAssignment = factory.createAssignment();
+      // Hide behind function maybe?
+      delayAssignment.setLhs(
+          getParameter(wrapperDest, oldInput.getVariable().getName() + "_delay"));
+      Initializer init = factory.createInitializer();
+      init.getExprs().add(connDelay);
+      delayAssignment.setRhs(init);
+      wrapperDest.getParameters().add(delayAssignment);
     }
 
-    // FIXME: Replace with library reactor. But couldnt figure out how to load it
-    private Reactor createEnclaveConnectionClass() {
-        if (connectionReactor != null) {
-            return connectionReactor;
-        }
-        Type type = factory.createType();
-        type.setId("T");
-
-        TypeParm typeParam = factory.createTypeParm();
-        typeParam.setLiteral("T");
-
-        Preamble preamble = factory.createPreamble();
-        preamble.setCode(factory.createCode());
-        preamble.getCode().setBody(String.join("\n",
-            "#include \"reactor_common.h\"",
-            "#include <string.h>"
-        ));
-
-        String className = "EnclaveConnectionReactor";
-        Reactor connReactor = factory.createReactor();
-        connReactor.getTypeParms().add(typeParam);
-        connReactor.getPreambles().add(preamble);
-        Parameter delayParameter = createDelayParameter("delay");
-        var paramRef = factory.createParameterReference();
-        paramRef.setParameter(delayParameter);
-
-        Action action = factory.createAction();
-        VarRef triggerRef = factory.createVarRef();
-        VarRef effectRef = factory.createVarRef();
-        Input input = factory.createInput();
-        Output output = factory.createOutput();
-        VarRef inRef = factory.createVarRef();
-        VarRef outRef = factory.createVarRef();
-
-        Reaction r1 = factory.createReaction();
-        Reaction r2 = factory.createReaction();
-
-        // Name the newly created action; set its delay and type.
-        action.setName("act");
-        action.setMinDelay(paramRef);
-        action.setOrigin(ActionOrigin.LOGICAL);
-        action.setType(EcoreUtil.copy(type));
-
-
-        input.setName("in");
-        input.setType(EcoreUtil.copy(type));
-
-        output.setName("out");
-        output.setType(EcoreUtil.copy(type));
-
-        // Establish references to the involved ports.
-        inRef.setVariable(input);
-        outRef.setVariable(output);
-
-        // Establish references to the action.
-        triggerRef.setVariable(action);
-        effectRef.setVariable(action);
-
-        // Add the action to the reactor.
-        connReactor.setName(className);
-        connReactor.getActions().add(action);
-
-        // Configure the second reaction, which reads the input.
-        r1.getTriggers().add(inRef);
-        r1.getEffects().add(effectRef);
-        r1.setCode(factory.createCode());
-        r1.getCode().setBody(enclavedConnectionDelayBody());
-
-        // Configure the first reaction, which produces the output.
-        r2.getTriggers().add(triggerRef);
-        r2.getEffects().add(outRef);
-        r2.setCode(factory.createCode());
-        r2.getCode().setBody(enclavedConnectionForwardBody());
-
-        // Add the reactions to the newly created reactor class.
-        // These need to go in the opposite order in case
-        // a new input arrives at the same time the delayed
-        // output is delivered!
-        connReactor.getReactions().add(r2);
-        connReactor.getReactions().add(r1);
-
-        connReactor.getInputs().add(input);
-        connReactor.getOutputs().add(output);
-        connReactor.getParameters().add(delayParameter);
-
-        // Hook it into AST
-        EObject node =
-            IteratorExtensions.findFirst(mainResource.getAllContents(), Model.class::isInstance);
-        ((Model) node).getReactors().add(connReactor);
-
-        connectionReactor = connReactor;
-
-        return connReactor;
+    wrapperSrcOutput.setContainer(wrapperSrc);
+    wrapperSrcOutput.setVariable(
+        getInstanceOutputPortByName(wrapperSrc, oldOutput.getVariable().getName()));
+    wrapperDestInput.setContainer(wrapperDest);
+    wrapperDestInput.setVariable(
+        getInstanceInputPortByName(wrapperDest, oldInput.getVariable().getName()));
+
+    newConn.getLeftPorts().add(wrapperSrcOutput);
+    newConn.getRightPorts().add(wrapperDestInput);
+
+    replaceConnInAST(oldConn, newConn);
+  }
+
+  private void replaceConnInAST(Connection oldConn, Connection newConn) {
+    var container = oldConn.eContainer();
+    if (container instanceof Reactor) {
+      ((Reactor) container).getConnections().remove(oldConn);
+      ((Reactor) container).getConnections().add(newConn);
+    } else if (container instanceof Mode) {
+      ((Mode) container).getConnections().remove(oldConn);
+      ((Mode) container).getConnections().add(newConn);
     }
+  }
 
-    private String enclavedConnectionDelayBody() {
-        CodeBuilder code = new CodeBuilder();
-        code.pr("environment_t* src_env = in->_base.source_reactor->environment;");
-        code.pr("environment_t* dest_env = self->base.environment;");
-        code.pr("// Calculate the tag at which to schedule the event at the target");
-        code.pr("tag_t target_tag = lf_delay_tag(src_env->current_tag, self->delay);");
-        code.pr("int length = 1;");
-        code.pr("if (in->token) length = in->length;");
-        code.pr("token_template_t* template = (token_template_t*)act;");
-        code.pr("lf_critical_section_enter(dest_env);");
-        code.pr("lf_token_t* token = _lf_initialize_token(template, length);");
-        code.pr("memcpy(token->value, &(in->value), template->type.element_size * length);");
-        code.pr("// Schedule event to the destination environment.");
-        code.pr("trigger_handle_t result = _lf_schedule_at_tag(dest_env, act->_base.trigger, target_tag, token);");
-        code.pr("// Notify the main thread in case it is waiting for physical time to elapse");
-        code.pr("lf_notify_of_event(dest_env);");
-        code.pr("lf_critical_section_exit(dest_env);");
-        return code.toString();
+  private Input getInstanceInputPortByName(Instantiation inst, String name) {
+    for (Input in : ASTUtils.toDefinition(inst.getReactorClass()).getInputs()) {
+      if (in.getName() == name) {
+        return in;
+      }
     }
-
-    private String enclavedConnectionForwardBody() {
-       CodeBuilder code = new CodeBuilder();
-       code.pr("lf_set(out, act->value);");
-       return code.toString();
+    assert (false);
+    return factory.createInput();
+  }
+
+  private Output getInstanceOutputPortByName(Instantiation inst, String name) {
+    for (Output out : ASTUtils.toDefinition(inst.getReactorClass()).getOutputs()) {
+      if (out.getName().equals(name)) {
+        return out;
+      }
     }
-
-    private Parameter createDelayParameter(String name) {
-
-        Parameter delayParameter = factory.createParameter();
-
-        delayParameter.setName(name);
-        delayParameter.setType(factory.createType());
-        delayParameter.getType().setId("time");
-        delayParameter.getType().setTime(true);
-        Time defaultTime = factory.createTime();
-        defaultTime.setUnit(null);
-        defaultTime.setInterval(0);
-        Initializer init = factory.createInitializer();
-        init.setParens(true);
-        init.setBraces(false);
-        init.getExprs().add(defaultTime);
-        delayParameter.setInit(init);
-
-        return delayParameter;
+    assert (false);
+    return factory.createOutput();
+  }
+
+  // FIXME: Replace with library reactor. But couldnt figure out how to load it
+  private Reactor createEnclaveConnectionClass() {
+    if (connectionReactor != null) {
+      return connectionReactor;
     }
-
-    private Parameter getParameter(Instantiation inst, String name) {
-        Reactor reactorDef = ASTUtils.toDefinition(inst.getReactorClass());
-        for (Parameter p: reactorDef.getParameters()) {
-            if (p.getName().equals(name)) {
-                return p;
-            }
-        }
-        assert(false);
-        return factory.createParameter();
+    Type type = factory.createType();
+    type.setId("T");
+
+    TypeParm typeParam = factory.createTypeParm();
+    typeParam.setLiteral("T");
+
+    Preamble preamble = factory.createPreamble();
+    preamble.setCode(factory.createCode());
+    preamble
+        .getCode()
+        .setBody(String.join("\n", "#include \"reactor_common.h\"", "#include <string.h>"));
+
+    String className = "EnclaveConnectionReactor";
+    Reactor connReactor = factory.createReactor();
+    connReactor.getTypeParms().add(typeParam);
+    connReactor.getPreambles().add(preamble);
+    Parameter delayParameter = createDelayParameter("delay");
+    var paramRef = factory.createParameterReference();
+    paramRef.setParameter(delayParameter);
+
+    Action action = factory.createAction();
+    VarRef triggerRef = factory.createVarRef();
+    VarRef effectRef = factory.createVarRef();
+    Input input = factory.createInput();
+    Output output = factory.createOutput();
+    VarRef inRef = factory.createVarRef();
+    VarRef outRef = factory.createVarRef();
+
+    Reaction r1 = factory.createReaction();
+    Reaction r2 = factory.createReaction();
+
+    // Name the newly created action; set its delay and type.
+    action.setName("act");
+    action.setMinDelay(paramRef);
+    action.setOrigin(ActionOrigin.LOGICAL);
+    action.setType(EcoreUtil.copy(type));
+
+    input.setName("in");
+    input.setType(EcoreUtil.copy(type));
+
+    output.setName("out");
+    output.setType(EcoreUtil.copy(type));
+
+    // Establish references to the involved ports.
+    inRef.setVariable(input);
+    outRef.setVariable(output);
+
+    // Establish references to the action.
+    triggerRef.setVariable(action);
+    effectRef.setVariable(action);
+
+    // Add the action to the reactor.
+    connReactor.setName(className);
+    connReactor.getActions().add(action);
+
+    // Configure the second reaction, which reads the input.
+    r1.getTriggers().add(inRef);
+    r1.getEffects().add(effectRef);
+    r1.setCode(factory.createCode());
+    r1.getCode().setBody(enclavedConnectionDelayBody());
+
+    // Configure the first reaction, which produces the output.
+    r2.getTriggers().add(triggerRef);
+    r2.getEffects().add(outRef);
+    r2.setCode(factory.createCode());
+    r2.getCode().setBody(enclavedConnectionForwardBody());
+
+    // Add the reactions to the newly created reactor class.
+    // These need to go in the opposite order in case
+    // a new input arrives at the same time the delayed
+    // output is delivered!
+    connReactor.getReactions().add(r2);
+    connReactor.getReactions().add(r1);
+
+    connReactor.getInputs().add(input);
+    connReactor.getOutputs().add(output);
+    connReactor.getParameters().add(delayParameter);
+
+    // Hook it into AST
+    EObject node =
+        IteratorExtensions.findFirst(mainResource.getAllContents(), Model.class::isInstance);
+    ((Model) node).getReactors().add(connReactor);
+
+    connectionReactor = connReactor;
+
+    return connReactor;
+  }
+
+  private String enclavedConnectionDelayBody() {
+    CodeBuilder code = new CodeBuilder();
+    code.pr("environment_t* src_env = in->_base.source_reactor->environment;");
+    code.pr("environment_t* dest_env = self->base.environment;");
+    code.pr("// Calculate the tag at which to schedule the event at the target");
+    code.pr("tag_t target_tag = lf_delay_tag(src_env->current_tag, self->delay);");
+    code.pr("int length = 1;");
+    code.pr("if (in->token) length = in->length;");
+    code.pr("token_template_t* template = (token_template_t*)act;");
+    code.pr("lf_critical_section_enter(dest_env);");
+    code.pr("lf_token_t* token = _lf_initialize_token(template, length);");
+    code.pr("memcpy(token->value, &(in->value), template->type.element_size * length);");
+    code.pr("// Schedule event to the destination environment.");
+    code.pr(
+        "trigger_handle_t result = _lf_schedule_at_tag(dest_env, act->_base.trigger, target_tag,"
+            + " token);");
+    code.pr("// Notify the main thread in case it is waiting for physical time to elapse");
+    code.pr("lf_notify_of_event(dest_env);");
+    code.pr("lf_critical_section_exit(dest_env);");
+    return code.toString();
+  }
+
+  private String enclavedConnectionForwardBody() {
+    CodeBuilder code = new CodeBuilder();
+    code.pr("lf_set(out, act->value);");
+    return code.toString();
+  }
+
+  private Parameter createDelayParameter(String name) {
+
+    Parameter delayParameter = factory.createParameter();
+
+    delayParameter.setName(name);
+    delayParameter.setType(factory.createType());
+    delayParameter.getType().setId("time");
+    delayParameter.getType().setTime(true);
+    Time defaultTime = factory.createTime();
+    defaultTime.setUnit(null);
+    defaultTime.setInterval(0);
+    Initializer init = factory.createInitializer();
+    init.setParens(true);
+    init.setBraces(false);
+    init.getExprs().add(defaultTime);
+    delayParameter.setInit(init);
+
+    return delayParameter;
+  }
+
+  private Parameter getParameter(Instantiation inst, String name) {
+    Reactor reactorDef = ASTUtils.toDefinition(inst.getReactorClass());
+    for (Parameter p : reactorDef.getParameters()) {
+      if (p.getName().equals(name)) {
+        return p;
+      }
     }
+    assert (false);
+    return factory.createParameter();
+  }
 }

From 4f7e89b012d80ba76c5805100e3aaf8e54098280 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 6 Jun 2023 09:53:39 +0200
Subject: [PATCH 0223/1114] Add back missing tests

---
 test/C/src/federated/DistributedStop.lf | 119 ++++++++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 test/C/src/federated/DistributedStop.lf

diff --git a/test/C/src/federated/DistributedStop.lf b/test/C/src/federated/DistributedStop.lf
new file mode 100644
index 0000000000..2d4a616664
--- /dev/null
+++ b/test/C/src/federated/DistributedStop.lf
@@ -0,0 +1,119 @@
+/**
+ * Test for lf_request_stop() in federated execution with centralized
+ * coordination.
+ *
+ * @author Soroush Bateni
+ */
+target C
+
+reactor Sender {
+    output out: int
+    timer t(0, 1 usec)
+    logical action act
+    state reaction_invoked_correctly: bool = false
+
+    reaction(t, act) -> out, act {=
+        lf_print("Sending 42 at (%lld, %u).",
+                     lf_time_logical_elapsed(),
+                     lf_tag().microstep);
+        lf_set(out, 42);
+        if (lf_tag().microstep == 0) {
+            // Instead of having a separate reaction
+            // for 'act' like Stop.lf, we trigger the
+            // same reaction to test lf_request_stop() being
+            // called multiple times
+            lf_schedule(act, 0);
+        }
+        if (lf_time_logical_elapsed() == USEC(1)) {
+            // Call lf_request_stop() both at (1 usec, 0) and
+            // (1 usec, 1)
+            lf_print("Requesting stop at (%lld, %u).",
+                     lf_time_logical_elapsed(),
+                     lf_tag().microstep);
+            lf_request_stop();
+        }
+
+        tag_t _1usec1 = (tag_t) { .time = USEC(1) + lf_time_start(), .microstep = 1u };
+        if (lf_tag_compare(lf_tag(), _1usec1) == 0) {
+            // The reaction was invoked at (1 usec, 1) as expected
+            self->reaction_invoked_correctly = true;
+        } else if (lf_tag_compare(lf_tag(), _1usec1) > 0) {
+            // The reaction should not have been invoked at tags larger than (1 usec, 1)
+            lf_print_error_and_exit("ERROR: Invoked reaction(t, act) at tag bigger than shutdown.");
+        }
+    =}
+
+    reaction(shutdown) {=
+        if (lf_time_logical_elapsed() != USEC(1) ||
+            lf_tag().microstep != 1) {
+            lf_print_error_and_exit("ERROR: Sender failed to stop the federation in time. "
+                    "Stopping at (%lld, %u).",
+                     lf_time_logical_elapsed(),
+                     lf_tag().microstep);
+        } else if (self->reaction_invoked_correctly == false) {
+            lf_print_error_and_exit("ERROR: Sender reaction(t, act) was not invoked at (1 usec, 1). "
+                    "Stopping at (%lld, %u).",
+                     lf_time_logical_elapsed(),
+                     lf_tag().microstep);
+        }
+        lf_print("SUCCESS: Successfully stopped the federation at (%lld, %u).",
+                     lf_time_logical_elapsed(),
+                     lf_tag().microstep);
+    =}
+}
+
+reactor Receiver(
+    stp_offset: time = 10 msec  // Used in the decentralized variant of the test
+) {
+    input in: int
+    state reaction_invoked_correctly: bool = false
+
+    reaction(in) {=
+        lf_print("Received %d at (%lld, %u).",
+                     in->value,
+                     lf_time_logical_elapsed(),
+                     lf_tag().microstep);
+        if (lf_time_logical_elapsed() == USEC(1)) {
+            lf_print("Requesting stop at (%lld, %u).",
+                     lf_time_logical_elapsed(),
+                     lf_tag().microstep);
+            lf_request_stop();
+            // The receiver should receive a message at tag
+            // (1 usec, 1) and trigger this reaction
+            self->reaction_invoked_correctly = true;
+        }
+
+        tag_t _1usec1 = (tag_t) { .time = USEC(1) + lf_time_start(), .microstep = 1u };
+        if (lf_tag_compare(lf_tag(), _1usec1) > 0) {
+            self->reaction_invoked_correctly = false;
+        }
+    =}
+
+    reaction(shutdown) {=
+        // Sender should have requested stop earlier than the receiver.
+        // Therefore, the shutdown events must occur at (1000, 0) on the
+        // receiver.
+        if (lf_time_logical_elapsed() != USEC(1) ||
+            lf_tag().microstep != 1) {
+            lf_print_error_and_exit("Receiver failed to stop the federation at the right time. "
+                    "Stopping at (%lld, %u).",
+                     lf_time_logical_elapsed(),
+                     lf_tag().microstep);
+        } else if (self->reaction_invoked_correctly == false) {
+            lf_print_error_and_exit("Receiver reaction(in) was not invoked the correct number of times. "
+                    "Stopping at (%lld, %u).",
+                     lf_time_logical_elapsed(),
+                     lf_tag().microstep);
+        }
+        lf_print("SUCCESS: Successfully stopped the federation at (%lld, %u).",
+                     lf_time_logical_elapsed(),
+                     lf_tag().microstep);
+    =}
+}
+
+federated reactor DistributedStop {
+    sender = new Sender()
+    receiver = new Receiver()
+
+    sender.out -> receiver.in
+}

From 0217c65ed62dd2dd811246149b4f3fa4315c4751 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 6 Jun 2023 10:01:42 +0200
Subject: [PATCH 0224/1114] Spotless

---
 test/C/src/enclaves/DelayedConnection.lf      |  1 -
 .../src/enclaves/EnclavedConnectionReactor.lf | 19 ++++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/test/C/src/enclaves/DelayedConnection.lf b/test/C/src/enclaves/DelayedConnection.lf
index e16ffbc323..63a7d5980b 100644
--- a/test/C/src/enclaves/DelayedConnection.lf
+++ b/test/C/src/enclaves/DelayedConnection.lf
@@ -31,7 +31,6 @@ reactor Receiver {
 }
 
 main reactor {
-
     sender = new Sender()
     receiver = new Receiver()
 
diff --git a/test/C/src/enclaves/EnclavedConnectionReactor.lf b/test/C/src/enclaves/EnclavedConnectionReactor.lf
index 689a543cbd..a70535f8d7 100644
--- a/test/C/src/enclaves/EnclavedConnectionReactor.lf
+++ b/test/C/src/enclaves/EnclavedConnectionReactor.lf
@@ -1,21 +1,18 @@
 // This is a library reactor used to implemented connections between enclaves.
-target C;
-
-// FIXME: Handle token types also by checking whether it is a token type.
-// I guess we can just 
-reactor ConnectionReactor<T>(delay: time = 0){
+target C
 
+// FIXME: Handle token types also by checking whether it is a token type. I
+// guess we can just
+reactor ConnectionReactor<T>(delay: time = 0) {
     preamble {=
         #include "platform.h"
     =}
-    input in: T 
+    input in: T
     output out: T
 
     logical action act: T
 
-    reaction(act) -> out {=
-        lf_set(out, act->value);
-    =}
+    reaction(act) -> out {= lf_set(out, act->value); =}
 
     reaction(in) -> act {=
         environment_t* src_env = in->_base.source_reactor->environment;
@@ -35,5 +32,5 @@ reactor ConnectionReactor<T>(delay: time = 0){
 }
 
 main reactor {
-    conn = new ConnectionReactor<int>();
-}
\ No newline at end of file
+    conn = new ConnectionReactor<int>()
+}

From 6afd8e25e99d88142e537c6018fe4be15d65d2a7 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 6 Jun 2023 10:17:02 +0200
Subject: [PATCH 0225/1114] Remove the use of a variable named template for the
 CCpp target

---
 .../lflang/generator/c/CEnclavedReactorTransformation.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java b/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
index 415807d4cf..931f9f16d9 100644
--- a/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
+++ b/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
@@ -440,10 +440,10 @@ private String enclavedConnectionDelayBody() {
     code.pr("tag_t target_tag = lf_delay_tag(src_env->current_tag, self->delay);");
     code.pr("int length = 1;");
     code.pr("if (in->token) length = in->length;");
-    code.pr("token_template_t* template = (token_template_t*)act;");
+    code.pr("token_template_t* tmplate = (token_template_t*)act;");
     code.pr("lf_critical_section_enter(dest_env);");
-    code.pr("lf_token_t* token = _lf_initialize_token(template, length);");
-    code.pr("memcpy(token->value, &(in->value), template->type.element_size * length);");
+    code.pr("lf_token_t* token = _lf_initialize_token(tmplate, length);");
+    code.pr("memcpy(token->value, &(in->value), tmplate->type.element_size * length);");
     code.pr("// Schedule event to the destination environment.");
     code.pr(
         "trigger_handle_t result = _lf_schedule_at_tag(dest_env, act->_base.trigger, target_tag,"

From 179dec6589d8e4cc884cd92bd31feba7a2b78efd Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 6 Jun 2023 10:27:46 +0200
Subject: [PATCH 0226/1114] Add extern C for CCpp

---
 .../generator/c/CEnclavedReactorTransformation.java | 13 ++++++++++++-
 test/C/src/enclaves/DelayedConnection.lf            |  4 ++--
 test/C/src/enclaves/SimpleConnection.lf             |  4 ++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java b/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
index 931f9f16d9..8a4bc77d0c 100644
--- a/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
+++ b/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
@@ -354,7 +354,18 @@ private Reactor createEnclaveConnectionClass() {
     preamble.setCode(factory.createCode());
     preamble
         .getCode()
-        .setBody(String.join("\n", "#include \"reactor_common.h\"", "#include <string.h>"));
+        .setBody(
+            String.join(
+                "\n",
+                "#ifdef __cplusplus",
+                "extern \"C\"",
+                "{",
+                "#endif",
+                "#include \"reactor_common.h\"",
+                "#include <string.h>",
+                "#ifdef __cplusplus",
+                "}",
+                "#endif"));
 
     String className = "EnclaveConnectionReactor";
     Reactor connReactor = factory.createReactor();
diff --git a/test/C/src/enclaves/DelayedConnection.lf b/test/C/src/enclaves/DelayedConnection.lf
index 63a7d5980b..61b11a600b 100644
--- a/test/C/src/enclaves/DelayedConnection.lf
+++ b/test/C/src/enclaves/DelayedConnection.lf
@@ -18,11 +18,11 @@ reactor Receiver {
 
     reaction(in) {=
         time_t now = lf_time_logical_elapsed();
-        lf_print("Received event t=" PRINTF_TIME", count=%u", now, in->value);
+        lf_print("Received event t=" PRINTF_TIME ", count=%u", now, in->value);
 
         lf_assert(self->cnt == in->value, "recv=%u exp=%u", in->value, self->cnt);
         if (now != 0) {
-            lf_assert(now - self->last == MSEC(50), "now="PRINTF_TIME" last="PRINTF_TIME, now, self->last);
+            lf_assert(now - self->last == MSEC(50), "now=" PRINTF_TIME " last=" PRINTF_TIME, now, self->last);
         }
 
         self->last = now;
diff --git a/test/C/src/enclaves/SimpleConnection.lf b/test/C/src/enclaves/SimpleConnection.lf
index d559a65e3a..a26e2a7913 100644
--- a/test/C/src/enclaves/SimpleConnection.lf
+++ b/test/C/src/enclaves/SimpleConnection.lf
@@ -18,11 +18,11 @@ reactor Receiver {
 
     reaction(in) {=
         time_t now = lf_time_logical_elapsed();
-        lf_print("Received event t=" PRINTF_TIME", count=%u", now, in->value);
+        lf_print("Received event t=" PRINTF_TIME ", count=%u", now, in->value);
 
         lf_assert(self->cnt == in->value, "recv=%u exp=%u", in->value, self->cnt);
         if (now != 0) {
-            lf_assert(now - self->last == MSEC(50), "now="PRINTF_TIME" last="PRINTF_TIME, now, self->last);
+            lf_assert(now - self->last == MSEC(50), "now=" PRINTF_TIME " last=" PRINTF_TIME, now, self->last);
         }
 
         self->last = now;

From 3d3f8f94627d5cc4b505f9c9a58acc64e3a333b7 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 6 Jun 2023 10:44:17 +0200
Subject: [PATCH 0227/1114] Fix ConnectionReactor for CCpp

---
 .../src/enclaves/EnclavedConnectionReactor.lf | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/test/C/src/enclaves/EnclavedConnectionReactor.lf b/test/C/src/enclaves/EnclavedConnectionReactor.lf
index a70535f8d7..c21f3d4a94 100644
--- a/test/C/src/enclaves/EnclavedConnectionReactor.lf
+++ b/test/C/src/enclaves/EnclavedConnectionReactor.lf
@@ -1,11 +1,24 @@
 // This is a library reactor used to implemented connections between enclaves.
+// Currently it only serves as a reference implementation for what is code
+// generated in LFC
 target C
 
 // FIXME: Handle token types also by checking whether it is a token type. I
-// guess we can just
 reactor ConnectionReactor<T>(delay: time = 0) {
     preamble {=
+
+        #ifdef __cplusplus
+        extern "C" {
+        #endif
+        
+        #include <string.h>
         #include "platform.h"
+        #include "reactor_common.h"
+        
+        #ifdef __cplusplus
+        }
+        #endif
+
     =}
     input in: T
     output out: T
@@ -19,10 +32,10 @@ reactor ConnectionReactor<T>(delay: time = 0) {
         environment_t* dest_env = self->base.environment;
         // Calculate the tag at which to schedule the event at the target
         tag_t target_tag = lf_delay_tag(src_env->current_tag, self->delay);
-        token_template_t* template = (token_template_t*)act;
+        token_template_t* tmplate = (token_template_t*)act;
         lf_critical_section_enter(dest_env);
-        lf_token_t* token = _lf_initialize_token(template, in->length);
-        memcpy(token->value, in->value, template->type.element_size * in->length);
+        lf_token_t* token = _lf_initialize_token(tmplate, in->length);
+        memcpy(token->value, &(in->value), tmplate->type.element_size * in->length);
         // Schedule event to the destination environment.
         trigger_handle_t result = _lf_schedule_at_tag(dest_env, act->_base.trigger, target_tag, token);
         // Notify the main thread in case it is waiting for physical time to elapse

From 29b63a13ba436b0c641b172c86888b34cb8f77b6 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 6 Jun 2023 10:58:14 +0200
Subject: [PATCH 0228/1114] Spotless

---
 test/C/src/enclaves/EnclavedConnectionReactor.lf | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/C/src/enclaves/EnclavedConnectionReactor.lf b/test/C/src/enclaves/EnclavedConnectionReactor.lf
index c21f3d4a94..04c02d9f47 100644
--- a/test/C/src/enclaves/EnclavedConnectionReactor.lf
+++ b/test/C/src/enclaves/EnclavedConnectionReactor.lf
@@ -6,19 +6,17 @@ target C
 // FIXME: Handle token types also by checking whether it is a token type. I
 reactor ConnectionReactor<T>(delay: time = 0) {
     preamble {=
-
         #ifdef __cplusplus
         extern "C" {
         #endif
-        
+
         #include <string.h>
         #include "platform.h"
         #include "reactor_common.h"
-        
+
         #ifdef __cplusplus
         }
         #endif
-
     =}
     input in: T
     output out: T

From 16481107db5dcd3d6e7149fb000af7b4ed5020f7 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 6 Jun 2023 11:19:04 +0200
Subject: [PATCH 0229/1114] Remove debug logging from test

---
 test/C/src/concurrent/TimeoutZeroThreaded.lf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/C/src/concurrent/TimeoutZeroThreaded.lf b/test/C/src/concurrent/TimeoutZeroThreaded.lf
index 02f36016e1..849d16ef3e 100644
--- a/test/C/src/concurrent/TimeoutZeroThreaded.lf
+++ b/test/C/src/concurrent/TimeoutZeroThreaded.lf
@@ -6,7 +6,6 @@
  */
 target C {
     timeout: 0 sec,
-    logging: Debug
 }
 
 import Sender from "../lib/LoopedActionSender.lf"

From 60680bc82c0bc6f75330df91bab9c5681cd8480b Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 6 Jun 2023 11:19:11 +0200
Subject: [PATCH 0230/1114] Code aut-formatted with Spotless

---
 test/C/src/concurrent/TimeoutZeroThreaded.lf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/C/src/concurrent/TimeoutZeroThreaded.lf b/test/C/src/concurrent/TimeoutZeroThreaded.lf
index 849d16ef3e..7865b486a9 100644
--- a/test/C/src/concurrent/TimeoutZeroThreaded.lf
+++ b/test/C/src/concurrent/TimeoutZeroThreaded.lf
@@ -5,7 +5,7 @@
  * @author Soroush Bateni
  */
 target C {
-    timeout: 0 sec,
+    timeout: 0 sec
 }
 
 import Sender from "../lib/LoopedActionSender.lf"

From 6a9c3cca5296689ff43dacd81c250563d42cc3e9 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 6 Jun 2023 11:24:06 +0200
Subject: [PATCH 0231/1114] Update gitignore

---
 .gitignore | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index dcb7b5f75f..ff997a5803 100644
--- a/.gitignore
+++ b/.gitignore
@@ -157,4 +157,8 @@ gradle-app.setting
 
 ### xtext artifaccts
 *.jar
-core/model/
\ No newline at end of file
+core/model/
+org.lflang/model/generated
+
+#### Zephyr/west
+.west/
\ No newline at end of file

From 9adfe983b5b37baa0bc2463c7db4a0e688c59c65 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Tue, 6 Jun 2023 13:36:14 +0200
Subject: [PATCH 0232/1114] Update Zephyr tests

---
 .github/workflows/c-zephyr-tests.yml              | 15 +++++++++++++--
 .../java/org/lflang/tests/TestRegistry.java       |  1 -
 .../{enclaves => enclave}/DelayedConnection.lf    |  0
 .../EnclavedConnectionReactor.lf                  |  0
 .../src/{enclaves => enclave}/NonCommunicating.lf |  0
 .../src/{enclaves => enclave}/SimpleConnection.lf |  0
 6 files changed, 13 insertions(+), 3 deletions(-)
 rename test/C/src/{enclaves => enclave}/DelayedConnection.lf (100%)
 rename test/C/src/{enclaves => enclave}/EnclavedConnectionReactor.lf (100%)
 rename test/C/src/{enclaves => enclave}/NonCommunicating.lf (100%)
 rename test/C/src/{enclaves => enclave}/SimpleConnection.lf (100%)

diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index 94935ec09d..dba90f9844 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -39,10 +39,21 @@ jobs:
           path: core/src/main/resources/lib/c/reactor-c
           ref: ${{ inputs.runtime-ref }}
         if: ${{ inputs.runtime-ref }}
-      - name: Perform Zephyr tests for C target with default scheduler
+      - name: Run Zephyr smoke tests
         run: |
-          ./gradlew targetTest -Ptarget=CZephyr
+          ./gradlew core:integrationTest --test org.lflang.tests.runtime.CZephyrTest.buildZephyr*
           util/RunZephyrTests.sh test/C/src-gen
+          rm -r test/C/src-gen
+      - name: Run basic tests
+        run: |
+          ./gradlew core:integrationTest --test org.lflang.tests.runtime.CZephyrTest.buildBasic*
+          util/RunZephyrTests.sh test/C/src-gen
+          rm -r test/C/src-gen
+      - name: Run concurrent tests
+        run: |
+          ./gradlew core:integrationTest --test org.lflang.tests.runtime.CZephyrTest.buildConcurrent*
+          util/RunZephyrTests.sh test/C/src-gen
+          rm -r test/C/src-gen
       - name: Collect code coverage
         run: ./gradlew jacocoTestReport
       - name: Report to CodeCov
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
index 8dd2249554..a44c7c3e0a 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
@@ -136,7 +136,6 @@ public enum TestCategory {
     DOCKER_FEDERATED(true, "docker" + File.separator + "federated", TestLevel.EXECUTION),
     SERIALIZATION(false, "", TestLevel.EXECUTION),
     ARDUINO(false, "", TestLevel.BUILD),
-
     ZEPHYR_THREADED(false, "zephyr" + File.separator + "threaded", TestLevel.BUILD),
     ZEPHYR_UNTHREADED(false, "zephyr" + File.separator + "unthreaded", TestLevel.BUILD),
     TARGET(false, "", TestLevel.EXECUTION);
diff --git a/test/C/src/enclaves/DelayedConnection.lf b/test/C/src/enclave/DelayedConnection.lf
similarity index 100%
rename from test/C/src/enclaves/DelayedConnection.lf
rename to test/C/src/enclave/DelayedConnection.lf
diff --git a/test/C/src/enclaves/EnclavedConnectionReactor.lf b/test/C/src/enclave/EnclavedConnectionReactor.lf
similarity index 100%
rename from test/C/src/enclaves/EnclavedConnectionReactor.lf
rename to test/C/src/enclave/EnclavedConnectionReactor.lf
diff --git a/test/C/src/enclaves/NonCommunicating.lf b/test/C/src/enclave/NonCommunicating.lf
similarity index 100%
rename from test/C/src/enclaves/NonCommunicating.lf
rename to test/C/src/enclave/NonCommunicating.lf
diff --git a/test/C/src/enclaves/SimpleConnection.lf b/test/C/src/enclave/SimpleConnection.lf
similarity index 100%
rename from test/C/src/enclaves/SimpleConnection.lf
rename to test/C/src/enclave/SimpleConnection.lf

From 9c233fdb2aa75dae99a817d4177b126404941346 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Tue, 6 Jun 2023 13:51:17 +0200
Subject: [PATCH 0233/1114] CI

---
 .github/workflows/c-zephyr-tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index dba90f9844..ed12b4e64e 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -41,17 +41,17 @@ jobs:
         if: ${{ inputs.runtime-ref }}
       - name: Run Zephyr smoke tests
         run: |
-          ./gradlew core:integrationTest --test org.lflang.tests.runtime.CZephyrTest.buildZephyr*
+          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildZephyr*
           util/RunZephyrTests.sh test/C/src-gen
           rm -r test/C/src-gen
       - name: Run basic tests
         run: |
-          ./gradlew core:integrationTest --test org.lflang.tests.runtime.CZephyrTest.buildBasic*
+          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildBasic*
           util/RunZephyrTests.sh test/C/src-gen
           rm -r test/C/src-gen
       - name: Run concurrent tests
         run: |
-          ./gradlew core:integrationTest --test org.lflang.tests.runtime.CZephyrTest.buildConcurrent*
+          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildConcurrent*
           util/RunZephyrTests.sh test/C/src-gen
           rm -r test/C/src-gen
       - name: Collect code coverage

From 0d0c3dbfbba26a2a3d2d92bfbbbed1dc38ae4213 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Tue, 6 Jun 2023 14:08:27 +0200
Subject: [PATCH 0234/1114] Remove assertion on deadline avoidance, because CI
 suck at real-time

---
 test/C/src/enclave/NonCommunicating.lf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/C/src/enclave/NonCommunicating.lf b/test/C/src/enclave/NonCommunicating.lf
index e969c65a71..2d457022c6 100644
--- a/test/C/src/enclave/NonCommunicating.lf
+++ b/test/C/src/enclave/NonCommunicating.lf
@@ -14,7 +14,7 @@ reactor Fast {
 
     reaction(t) {=  =} deadline(10 msec) {=
         time_t lag = lf_time_physical() - lf_time_logical();
-        lf_print_error_and_exit("Fast Reactor was stalled lag=" PRINTF_TIME, lag);
+        lf_print_warning("Fast Reactor was stalled lag=" PRINTF_TIME, lag);
     =}
 }
 

From 7aa75c73c249720b10a83b61d7bf195086838897 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 6 Jun 2023 13:43:21 -0700
Subject: [PATCH 0235/1114] Comment out addDependentNetworkEdges.

---
 .../main/java/org/lflang/generator/ReactionInstanceGraph.java | 4 ++--
 core/src/testFixtures/java/org/lflang/tests/TestRegistry.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
index 2628b30262..3dba4029f9 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
@@ -87,7 +87,7 @@ public void rebuild() {
 
     // FIXME: Use {@link TargetProperty#EXPORT_DEPENDENCY_GRAPH}.
     // System.out.println(toDOT());
-    addDependentNetworkEdges(main);
+//    addDependentNetworkEdges(main);
 
     // Assign a level to each reaction.
     // If there are cycles present in the graph, it will be detected here.
@@ -141,7 +141,7 @@ private void addDependentNetworkEdges(ReactorInstance main) {
   public void rebuildAndAssignDeadlines() {
     this.clear();
     addNodesAndEdges(main);
-    addDependentNetworkEdges(main);
+//    addDependentNetworkEdges(main);
     assignInferredDeadlines();
     this.clear();
   }
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
index 483448bd8f..f8d0d22bbd 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
@@ -204,7 +204,7 @@ public String getHeader() {
         if (Files.exists(dir)) {
           new TestDirVisitor(rs, target, dir).walk();
         } else {
-          System.out.println("WARNING: No test directory for target  " + target + "\n");
+          System.out.println("WARNING: No test directory for target " + target + "\n");
         }
 
       } catch (IOException e) {

From ab308d3661bf8d314be4678b3023859484b889c1 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 6 Jun 2023 13:58:19 -0700
Subject: [PATCH 0236/1114] Trivial changes.

---
 .github/workflows/only-c.yml                                | 6 +++---
 .../java/org/lflang/generator/ReactionInstanceGraph.java    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/only-c.yml b/.github/workflows/only-c.yml
index 195624cedc..18a712fe7f 100644
--- a/.github/workflows/only-c.yml
+++ b/.github/workflows/only-c.yml
@@ -22,7 +22,7 @@ jobs:
     uses: ./.github/workflows/c-tests.yml
     with:
       all-platforms: ${{ !github.event.pull_request.draft  }}
-      selected-tests: runGenericTests
+      selected-tests: runBasicTests
 
   default1:
     if: ${{ inputs.all || github.event.pull_request.draft }}
@@ -43,7 +43,7 @@ jobs:
     uses: ./.github/workflows/c-tests.yml
     with:
       all-platforms: ${{ !github.event.pull_request.draft  }}
-      selected-tests: runTypeParameterTests
+      selected-tests: runGenericsTests
 
   default4:
     if: ${{ inputs.all || github.event.pull_request.draft }}
@@ -113,7 +113,7 @@ jobs:
     if: ${{ inputs.all || github.event.pull_request.draft }}
     uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@gradle
     with:
-      target: 'C'
+      target: "C"
 
   # Run the C Arduino integration tests.
   arduino:
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
index 3dba4029f9..a0dd1df962 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
@@ -87,7 +87,7 @@ public void rebuild() {
 
     // FIXME: Use {@link TargetProperty#EXPORT_DEPENDENCY_GRAPH}.
     // System.out.println(toDOT());
-//    addDependentNetworkEdges(main);
+    //    addDependentNetworkEdges(main);
 
     // Assign a level to each reaction.
     // If there are cycles present in the graph, it will be detected here.
@@ -141,7 +141,7 @@ private void addDependentNetworkEdges(ReactorInstance main) {
   public void rebuildAndAssignDeadlines() {
     this.clear();
     addNodesAndEdges(main);
-//    addDependentNetworkEdges(main);
+    //    addDependentNetworkEdges(main);
     assignInferredDeadlines();
     this.clear();
   }

From 98c8af6e391dbe71cbfd6003891ab4bf40b14375 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 6 Jun 2023 14:55:34 -0700
Subject: [PATCH 0237/1114] Temporarily comment out portAbsentReaction.

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 42ae9c2539..191a98d2a8 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 42ae9c2539381835e7a8c74ff796ef05578b034d
+Subproject commit 191a98d2a837df3062066e52c900ee28fb99308f

From 82da1c0efbb608ca75b48d3af8ae751bdcda5a70 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 6 Jun 2023 16:03:05 -0700
Subject: [PATCH 0238/1114] Update submodule.

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 191a98d2a8..bcdde365e8 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 191a98d2a837df3062066e52c900ee28fb99308f
+Subproject commit bcdde365e8a46cb9a6657fc02be76b248fd0a252

From 72fe448b68b9ca3b1d81ba8bd7620cfd4362cb03 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 6 Jun 2023 22:24:44 -0700
Subject: [PATCH 0239/1114] Fix formatting

---
 core/src/main/java/org/lflang/AttributeUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/AttributeUtils.java b/core/src/main/java/org/lflang/AttributeUtils.java
index 23e2b82c3b..b49158c6e7 100644
--- a/core/src/main/java/org/lflang/AttributeUtils.java
+++ b/core/src/main/java/org/lflang/AttributeUtils.java
@@ -232,8 +232,8 @@ public static String getIconPath(EObject node) {
   }
 
   /**
-   * Return the {@code @side} annotation for the given node (presumably a port)
-   * or null if there is no such annotation.
+   * Return the {@code @side} annotation for the given node (presumably a port) or null if there is
+   * no such annotation.
    */
   public static String getPortSide(EObject node) {
     return getAttributeValue(node, "side");

From 20b06a1078417e4f6365ece3f01c743f857618b8 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Wed, 7 Jun 2023 09:50:55 +0200
Subject: [PATCH 0240/1114] Move _lf_initialize_timers to reactor-c

---
 .../org/lflang/generator/c/CGenerator.java    |  3 --
 .../lflang/generator/c/CTimerGenerator.java   | 34 -------------------
 2 files changed, 37 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index d942531ffe..dbb0e4d7a6 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -646,9 +646,6 @@ private void generateCodeFor(String lfModuleName) throws IOException {
       // Generate function to trigger startup reactions for all reactors.
       code.pr(CReactionGenerator.generateLfTriggerStartupReactions(hasModalReactors));
 
-      // Generate function to schedule timers for all reactors.
-      code.pr(CTimerGenerator.generateLfInitializeTimer());
-
       // Generate a function that will either do nothing
       // (if there is only one federate or the coordination
       // is set to decentralized) or, if there are
diff --git a/core/src/main/java/org/lflang/generator/c/CTimerGenerator.java b/core/src/main/java/org/lflang/generator/c/CTimerGenerator.java
index 742220a2b0..8eca277a59 100644
--- a/core/src/main/java/org/lflang/generator/c/CTimerGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CTimerGenerator.java
@@ -46,38 +46,4 @@ public static String generateInitializer(TimerInstance timer) {
                 + ";",
             triggerStructName + ".mode = " + modeRef + ";"));
   }
-
-  /**
-   * Generate code to declare the timer table.
-   *
-   * @param timerCount The total number of timers in the program
-   */
-  public static String generateDeclarations(int timerCount) {
-    return String.join(
-        "\n",
-        List.of(
-            "// Array of pointers to timer triggers to be scheduled in _lf_initialize_timers().",
-            (timerCount > 0
-                    ? "trigger_t* timer_triggers[" + timerCount + "]"
-                    : "trigger_t** timer_triggers = NULL")
-                + ";",
-            "int timer_triggers_size = " + timerCount + ";"));
-  }
-
-  /**
-   * Generate code to call {@code _lf_initialize_timer} on each timer.
-   *
-   * @param timerCount The total number of timers in the program
-   */
-  public static String generateLfInitializeTimer() {
-    return String.join(
-        "\n",
-        "void _lf_initialize_timers(environment_t *env) {",
-        "   for (int i = 0; i < env->timer_triggers_size; i++) {",
-        "       if (env->timer_triggers[i] != NULL) {",
-        "            _lf_initialize_timer(env, env->timer_triggers[i]);",
-        "        }",
-        "    }",
-        "}");
-  }
 }

From 0938349db034a1125c6e06e0724d0e7fd95517e5 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Wed, 7 Jun 2023 09:51:35 +0200
Subject: [PATCH 0241/1114] Bump reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 53f8bffb79..a0e1d5d9db 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 53f8bffb79c15c9aca663d0406127de5c77faf35
+Subproject commit a0e1d5d9dbc93a2da66b02f083d408de88254bea

From 43e7a1c2694f48908e5aef48bcc9bd9a3a5c7185 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Wed, 7 Jun 2023 10:02:56 +0200
Subject: [PATCH 0242/1114] Move _lf_trigger_Startup_reactions to reactor-c

---
 .../org/lflang/generator/c/CGenerator.java    |  3 --
 .../generator/c/CReactionGenerator.java       | 50 -------------------
 core/src/main/resources/lib/c/reactor-c       |  2 +-
 3 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index dbb0e4d7a6..da7030af00 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -643,9 +643,6 @@ private void generateCodeFor(String lfModuleName) throws IOException {
           CTriggerObjectsGenerator.generateInitializeTriggerObjects(
               main, targetConfig, initializeTriggerObjects, startTimeStep, types, lfModuleName));
 
-      // Generate function to trigger startup reactions for all reactors.
-      code.pr(CReactionGenerator.generateLfTriggerStartupReactions(hasModalReactors));
-
       // Generate a function that will either do nothing
       // (if there is only one federate or the coordination
       // is set to decentralized) or, if there are
diff --git a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
index f27f218cb8..3d2f66647e 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
@@ -1127,56 +1127,6 @@ public static void generateBuiltinTriggeredReactionsArray(
             "self->_lf__" + name + ".is_timer = false;"));
   }
 
-  public static String generateBuiltinTriggersTable(int reactionCount, String name) {
-    return String.join(
-        "\n",
-        List.of(
-            "// Array of pointers to " + name + " triggers.",
-            (reactionCount > 0
-                    ? "reaction_t* _lf_" + name + "_reactions[" + reactionCount + "]"
-                    : "reaction_t** _lf_" + name + "_reactions = NULL")
-                + ";",
-            "int _lf_" + name + "_reactions_size = " + reactionCount + ";"));
-  }
-
-  /** Generate the _lf_trigger_startup_reactions function. */
-  public static String generateLfTriggerStartupReactions(boolean hasModalReactors) {
-    var s = new StringBuilder();
-    s.append("void _lf_trigger_startup_reactions(environment_t *env) {");
-    s.append("\n");
-    if (hasModalReactors) {
-      s.append(
-          String.join(
-              "\n",
-              "    for (int i = 0; i < env->startup_reactions_size; i++) {",
-              "        if (env->startup_reactions[i] != NULL) {",
-              "            if (env->startup_reactions[i]->mode != NULL) {",
-              "                // Skip reactions in modes",
-              "                continue;",
-              "            }",
-              "            _lf_trigger_reaction(env, env->startup_reactions[i], -1);",
-              "        }",
-              "    }",
-              "    _lf_handle_mode_startup_reset_reactions(",
-              "        env,",
-              "        env->startup_reactions, env->startup_reactions_size,",
-              "        NULL, 0,",
-              "        env->modes->modal_reactor_states, env->modes->modal_reactor_states_size);"));
-    } else {
-      s.append(
-          String.join(
-              "\n",
-              "    for (int i = 0; i < env->startup_reactions_size; i++) {",
-              "        if (env->startup_reactions[i] != NULL) {",
-              "            _lf_trigger_reaction(env, env->startup_reactions[i], -1);",
-              "        }",
-              "    }"));
-    }
-    s.append("\n");
-    s.append("}\n");
-    return s.toString();
-  }
-
   /** Generate the _lf_trigger_shutdown_reactions function. */
   public static String generateLfTriggerShutdownReactions() {
     return String.join(
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index a0e1d5d9db..3d7b1d89c4 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit a0e1d5d9dbc93a2da66b02f083d408de88254bea
+Subproject commit 3d7b1d89c46949ca64391688bc25b0b837f8fbe1

From 94458a0e5f28a7245cbc874ce63be6046d220f97 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Wed, 7 Jun 2023 10:46:37 +0200
Subject: [PATCH 0243/1114] Move code-generated mode functions back to
 reactor-c

---
 .../org/lflang/generator/c/CGenerator.java    | 11 -----
 .../lflang/generator/c/CModesGenerator.java   | 42 -------------------
 .../generator/c/CReactionGenerator.java       | 39 -----------------
 core/src/main/resources/lib/c/reactor-c       |  2 +-
 4 files changed, 1 insertion(+), 93 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index da7030af00..1c308b2593 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -658,10 +658,6 @@ private void generateCodeFor(String lfModuleName) throws IOException {
                   "        _lf_logical_tag_complete(tag_to_send);"),
               "}"));
 
-      // Generate function to schedule shutdown reactions if any
-      // reactors have reactions to shutdown.
-      code.pr(CReactionGenerator.generateLfTriggerShutdownReactions());
-
       // Generate an empty termination function for non-federated
       // execution. For federated execution, an implementation is
       // provided in federate.c.  That implementation will resign
@@ -671,13 +667,6 @@ private void generateCodeFor(String lfModuleName) throws IOException {
                  #ifndef FEDERATED
                  void terminate_execution(environment_t* env) {}
                  #endif""");
-
-      // Generate functions for modes
-      code.pr(CModesGenerator.generateLfInitializeModes(hasModalReactors));
-      code.pr(CModesGenerator.generateLfHandleModeChanges(hasModalReactors));
-      code.pr(
-          CReactionGenerator.generateLfModeTriggeredReactions(
-              resetReactionCount, hasModalReactors));
     }
   }
 
diff --git a/core/src/main/java/org/lflang/generator/c/CModesGenerator.java b/core/src/main/java/org/lflang/generator/c/CModesGenerator.java
index b91487d9f0..d3599988f4 100644
--- a/core/src/main/java/org/lflang/generator/c/CModesGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CModesGenerator.java
@@ -183,46 +183,4 @@ public static String generateStateResetStructure(
             + ");",
         "modal_state_reset_count[" + envId + "]++;");
   }
-
-  /**
-   * Generate code to call {@code _lf_process_mode_changes}. * @param hasModalReactors True if there
-   * is modal model reactors, false otherwise
-   */
-  public static String generateLfHandleModeChanges(boolean hasModalReactors) {
-    if (!hasModalReactors) {
-      return "";
-    }
-    return String.join(
-        "\n",
-        "void _lf_handle_mode_changes(environment_t* env) {",
-        "    _lf_process_mode_changes(",
-        "        env, ",
-        "        env->modes->modal_reactor_states, ",
-        "        env->modes->modal_reactor_states_size, ",
-        "        env->modes->state_resets, ",
-        "        env->modes->state_resets_size, ",
-        "        env->timer_triggers, ",
-        "        env->timer_triggers_size",
-        "    );",
-        "}");
-  }
-
-  /**
-   * Generate code to call {@code _lf_initialize_modes}.
-   *
-   * @param hasModalReactors True if there is modal model reactors, false otherwise
-   */
-  public static String generateLfInitializeModes(boolean hasModalReactors) {
-    if (!hasModalReactors) {
-      return "";
-    }
-    return String.join(
-        "\n",
-        "void _lf_initialize_modes(environment_t* env) {",
-        "    _lf_initialize_mode_states(",
-        "        env, ",
-        "        env->modes->modal_reactor_states, ",
-        "        env->modes->modal_reactor_states_size);",
-        "}");
-  }
 }
diff --git a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
index 3d2f66647e..c826fdafb9 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
@@ -1127,45 +1127,6 @@ public static void generateBuiltinTriggeredReactionsArray(
             "self->_lf__" + name + ".is_timer = false;"));
   }
 
-  /** Generate the _lf_trigger_shutdown_reactions function. */
-  public static String generateLfTriggerShutdownReactions() {
-    return String.join(
-        "\n",
-        "void _lf_trigger_shutdown_reactions(environment_t *env) {",
-        "    for (int i = 0; i < env->shutdown_reactions_size; i++) {",
-        "        if (env->shutdown_reactions[i] != NULL) {",
-        "#ifdef MODAL_REACTORS",
-        "            if (env->shutdown_reactions[i]->mode != NULL) {",
-        "                // Skip reactions in modes",
-        "                continue;",
-        "            }",
-        "#endif",
-        "            _lf_trigger_reaction(env, env->shutdown_reactions[i], -1);", //
-        "        }",
-        "    }",
-        "#ifdef MODAL_REACTORS",
-        "    _lf_handle_mode_shutdown_reactions(env, env->shutdown_reactions,"
-            + " env->shutdown_reactions_size);",
-        "#endif",
-        "}");
-  }
-
-  /** Generate the _lf_handle_mode_triggered_reactions function. */
-  public static String generateLfModeTriggeredReactions(
-      int resetReactionCount, boolean hasModalReactors) {
-    if (!hasModalReactors) {
-      return "";
-    }
-    var s = new StringBuilder();
-    s.append("void _lf_handle_mode_triggered_reactions(environment_t* env) {\n");
-    s.append("    _lf_handle_mode_startup_reset_reactions(\n");
-    s.append("        env, env->startup_reactions, env->startup_reactions_size,\n");
-    s.append("        env->reset_reactions, env->reset_reactions_size,\n");
-    s.append("        env->modes->modal_reactor_states, env->modes->modal_reactor_states_size);\n");
-    s.append("}\n");
-    return s.toString();
-  }
-
   /**
    * Generate a reaction function definition for a reactor. This function will have a single
    * argument that is a void* pointing to a struct that contains parameters, state variables, inputs
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 3d7b1d89c4..51f40aec3f 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 3d7b1d89c46949ca64391688bc25b0b837f8fbe1
+Subproject commit 51f40aec3f4a184037fd663048794cd7b155570f

From 00172c7551083795243db6fd2b4f8d6c17aef0b9 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 7 Jun 2023 16:55:34 +0800
Subject: [PATCH 0244/1114] Fix git merge issues

---
 cli/lfc/src/main/java/org/lflang/cli/Lfc.java | 10 ++++
 core/src/main/java/org/lflang/FileConfig.java | 38 +++++++++++++++
 .../main/java/org/lflang/TargetConfig.java    |  9 ++++
 .../main/java/org/lflang/TargetProperty.java  | 10 ++++
 core/src/main/java/org/lflang/TimeValue.java  | 30 ++++++++++++
 .../statespace/StateSpaceExplorer.java        |  6 ++-
 .../lflang/analyses/uclid/UclidGenerator.java |  9 +---
 .../main/java/org/lflang/ast/ASTUtils.java    | 14 ++++++
 .../org/lflang/generator/GeneratorBase.java   | 43 ++++++-----------
 .../org/lflang/generator/LFGenerator.java     | 46 ++++++++++++++++++
 .../lflang/generator/LFGeneratorContext.java  |  1 +
 .../org/lflang/generator/NamedInstance.java   | 47 +++++++++----------
 .../lflang/generator/ReactionInstance.java    |  5 +-
 .../org/lflang/generator/ReactorInstance.java | 17 +++++--
 .../org/lflang/validation/AttributeSpec.java  | 12 ++++-
 15 files changed, 228 insertions(+), 69 deletions(-)

diff --git a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
index 19869f9394..6f3e9fe6b6 100644
--- a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
+++ b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
@@ -79,6 +79,12 @@ public class Lfc extends CliBase {
       description = "Do not invoke target compiler.")
   private boolean noCompile;
 
+  @Option(
+      names = {"--no-verify"},
+      arity = "0",
+      description = "Do not run the generated verification models.")
+  private boolean noVerify;
+
   @Option(
       names = {"--print-statistics"},
       arity = "0",
@@ -250,6 +256,10 @@ public Properties getGeneratorArgs() {
       props.setProperty(BuildParm.NO_COMPILE.getKey(), "true");
     }
 
+    if (noVerify) {
+      props.setProperty(BuildParm.NO_VERIFY.getKey(), "true");
+    }
+
     if (targetCompiler != null) {
       props.setProperty(BuildParm.TARGET_COMPILER.getKey(), targetCompiler);
     }
diff --git a/core/src/main/java/org/lflang/FileConfig.java b/core/src/main/java/org/lflang/FileConfig.java
index 831cb7957f..c30a237461 100644
--- a/core/src/main/java/org/lflang/FileConfig.java
+++ b/core/src/main/java/org/lflang/FileConfig.java
@@ -32,6 +32,11 @@ public abstract class FileConfig {
   /** Default name of the directory to store generated sources in. */
   public static final String DEFAULT_SRC_GEN_DIR = "src-gen";
 
+  /**
+   * Default name of the directory to store generated verification models in.
+   */
+  public static final String DEFAULT_MODEL_GEN_DIR = "model-gen";
+
   // Public fields.
 
   /** The directory in which to put binaries, if the code generator produces any. */
@@ -93,6 +98,17 @@ public abstract class FileConfig {
    */
   protected Path srcGenPath;
 
+  /**
+   * Path representation of the root directory for generated
+   * verification models.
+   */
+  protected Path modelGenBasePath;
+
+  /**
+   * The directory in which to put the generated verification models.
+   */
+  protected Path modelGenPath;
+
   // private fields
 
   /**
@@ -133,6 +149,9 @@ public FileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchica
     Path binRoot = outPath.resolve(DEFAULT_BIN_DIR);
     this.binPath = useHierarchicalBin ? binRoot.resolve(getSubPkgPath(srcPath)) : binRoot;
 
+    this.modelGenBasePath = outPath.resolve(DEFAULT_MODEL_GEN_DIR);
+    this.modelGenPath = modelGenBasePath.resolve(getSubPkgPath(srcPath)).resolve(name);
+
     this.iResource = FileUtil.getIResource(resource);
   }
 
@@ -214,6 +233,24 @@ protected Path getSubPkgPath(Path srcPath) {
     return relSrcPath;
   }
 
+  /**
+   * Path representation of the root directory for generated
+   * verification models.
+   * This is the root, meaning that if the source file is x/y/Z.lf
+   * relative to the package root, then the generated sources will be put in x/y/Z
+   * relative to this URI.
+   */
+  public Path getModelGenBasePath() {
+    return modelGenBasePath;
+  }
+
+  /**
+   * The directory in which to put the generated verification models.
+   */
+  public Path getModelGenPath() {
+    return modelGenPath;
+  }
+
   /**
    * Clean any artifacts produced by the code generator and target compilers.
    *
@@ -226,6 +263,7 @@ protected Path getSubPkgPath(Path srcPath) {
   public void doClean() throws IOException {
     FileUtil.deleteDirectory(binPath);
     FileUtil.deleteDirectory(srcGenBasePath);
+    FileUtil.deleteDirectory(modelGenBasePath);
   }
 
   private static Path getPkgPath(Resource resource) throws IOException {
diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index fcb8c88a62..0b97f29e06 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -82,6 +82,9 @@ public TargetConfig(Properties cliArgs, TargetDecl target, ErrorReporter errorRe
     if (cliArgs.containsKey("no-compile")) {
       this.noCompile = true;
     }
+    if (cliArgs.containsKey("no-verify")) {
+      this.noVerify = true;
+    }
     if (cliArgs.containsKey("docker")) {
       var arg = cliArgs.getProperty("docker");
       if (Boolean.parseBoolean(arg)) {
@@ -232,6 +235,12 @@ public TargetConfig(Properties cliArgs, TargetDecl target, ErrorReporter errorRe
   /** If true, do not perform runtime validation. The default is false. */
   public boolean noRuntimeValidation = false;
 
+  /**
+   * If true, do not check the generated verification model.
+   * The default is false.
+   */
+  public boolean noVerify = false;
+
   /**
    * Set the target platform config. This tells the build system what platform-specific support
    * files it needs to incorporate at compile time.
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 4a68fc3796..b7e4ec7233 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -412,6 +412,16 @@ public enum TargetProperty {
         config.noRuntimeValidation = ASTUtils.toBoolean(value);
       }),
 
+  /**
+   * Directive to not check the generated verification model.
+   */
+  NO_VERIFY("no-verify", PrimitiveType.BOOLEAN,
+      Arrays.asList(Target.C),
+      (config) -> ASTUtils.toElement(config.noVerify),
+      (config, value, err) -> {
+          config.noVerify = ASTUtils.toBoolean(value);
+      }),
+
   /**
    * Directive to specify the platform for cross code generation. This is either a string of the
    * platform or a dictionary of options that includes the string name.
diff --git a/core/src/main/java/org/lflang/TimeValue.java b/core/src/main/java/org/lflang/TimeValue.java
index f0bb94820c..bec3b6cdbb 100644
--- a/core/src/main/java/org/lflang/TimeValue.java
+++ b/core/src/main/java/org/lflang/TimeValue.java
@@ -137,6 +137,36 @@ public long toNanoSeconds() {
     return makeNanosecs(time, unit);
   }
 
+  /**
+   * Return a TimeValue based on a nanosecond value.
+   */
+  public static TimeValue fromNanoSeconds(long ns) {
+    if (ns == 0) return ZERO;
+    long time;
+    if ((time = ns / 604_800_016_558_522L) > 0 && ns % 604_800_016_558_522L == 0) {
+        return new TimeValue(time, TimeUnit.WEEK);
+    }
+    if ((time = ns / 86_400_000_000_000L) > 0 && ns % 86_400_000_000_000L == 0) {
+        return new TimeValue(time, TimeUnit.DAY);
+    }
+    if ((time = ns / 3_600_000_000_000L) > 0 && ns % 3_600_000_000_000L == 0) {
+        return new TimeValue(time, TimeUnit.HOUR);
+    }
+    if ((time = ns / 60_000_000_000L) > 0 && ns % 60_000_000_000L == 0) {
+        return new TimeValue(time, TimeUnit.MINUTE);
+    }
+    if ((time = ns / 1_000_000_000) > 0 && ns % 1_000_000_000 == 0) {
+        return new TimeValue(time, TimeUnit.SECOND);
+    }
+    if ((time = ns / 1_000_000) > 0 && ns % 1_000_000 == 0) {
+        return new TimeValue(time, TimeUnit.MILLI);
+    }
+    if ((time = ns / 1000) > 0 && ns % 1000 == 0) {
+        return new TimeValue(time, TimeUnit.MICRO);
+    }
+    return new TimeValue(ns, TimeUnit.NANO);
+  }
+
   /** Return a string representation of this time value. */
   public String toString() {
     return unit != null ? time + " " + unit.getCanonicalName() : Long.toString(time);
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
index 97befc4a58..394a3f26bc 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
@@ -78,6 +78,7 @@ public void explore(Tag horizon, boolean findLoop) {
     // FIXME: It seems that we need to handle shutdown triggers
     // separately, because they could break the back loop.
     addInitialEvents(this.main);
+    // System.out.println("DEBUG: Event queue: " + this.eventQ);
 
     Tag previousTag = null; // Tag in the previous loop ITERATION
     Tag currentTag = null; // Tag in the current  loop ITERATION
@@ -105,6 +106,7 @@ public void explore(Tag horizon, boolean findLoop) {
         // System.out.println("DEBUG: Popped an event: " + e);
         currentEvents.add(e);
       }
+      // System.out.println("DEBUG: currentEvents: " + currentEvents);
 
       // Collect all the reactions invoked in this current LOOP ITERATION
       // triggered by the earliest events.
@@ -115,6 +117,7 @@ public void explore(Tag horizon, boolean findLoop) {
       for (Event e : currentEvents) {
         Set<ReactionInstance> dependentReactions = e.trigger.getDependentReactions();
         reactionsTemp.addAll(dependentReactions);
+        // System.out.println("DEBUG: dependentReactions: " + dependentReactions);
         // System.out.println("DEBUG: ReactionTemp: " + reactionsTemp);
 
         // If the event is a timer firing, enqueue the next firing.
@@ -295,8 +298,7 @@ else if (previousTag != null && currentTag.timestamp == previousTag.timestamp) {
         // System.out.println("DEBUG: Stopping because eventQ is empty!");
         stop = true;
       } else if (currentTag.timestamp > horizon.timestamp) {
-        // System.out.println("DEBUG: Stopping because horizon is reached! Horizon: " + horizon + "
-        // Current Tag: " + currentTag);
+        // System.out.println("DEBUG: Stopping because horizon is reached! Horizon: " + horizon + "Current Tag: " + currentTag);
         // System.out.println("DEBUG: EventQ: " + eventQ);
         stop = true;
       }
diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
index 2f34d04c05..a22beb7071 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -25,8 +25,6 @@
 /** (EXPERIMENTAL) Generator for Uclid5 models. */
 package org.lflang.analyses.uclid;
 
-import static org.lflang.ASTUtils.*;
-
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -41,7 +39,6 @@
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.Exceptions;
-import org.lflang.ASTUtils;
 import org.lflang.Target;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
@@ -55,6 +52,7 @@
 import org.lflang.analyses.statespace.StateSpaceExplorer;
 import org.lflang.analyses.statespace.StateSpaceNode;
 import org.lflang.analyses.statespace.Tag;
+import org.lflang.ast.ASTUtils;
 import org.lflang.dsl.CLexer;
 import org.lflang.dsl.CParser;
 import org.lflang.dsl.CParser.BlockItemListContext;
@@ -1096,8 +1094,6 @@ protected void generateTriggersAndReactions() {
 
         if (trigger.isStartup()) {
           // FIXME: Treat startup as a variable.
-          // triggerPresentStr = "g(i) == zero()";
-
           // Handle startup.
           code.pr(
               String.join(
@@ -1141,7 +1137,6 @@ protected void generateTriggersAndReactions() {
           }
         }
 
-        // code.pr("|| (" + triggerPresentStr + exclusion + ")");
         str += "\n|| (" + triggerPresentStr + exclusion + ")";
       }
 
@@ -1524,7 +1519,7 @@ private void createMainReactorInstance() {
       if (this.main == null) {
         // Recursively build instances. This is done once because
         // it is the same for all federates.
-        this.main = new ReactorInstance(toDefinition(mainDef.getReactorClass()), errorReporter);
+        this.main = new ReactorInstance(ASTUtils.toDefinition(mainDef.getReactorClass()), errorReporter);
         var reactionInstanceGraph = this.main.assignLevels();
         if (reactionInstanceGraph.nodeCount() > 0) {
           errorReporter.reportError("Main reactor has causality cycles. Skipping code generation.");
diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 078505d958..40930fedb5 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -144,6 +144,20 @@ public static List<Reactor> getAllReactors(Resource resource) {
         .collect(Collectors.toList());
   }
 
+  /**
+   * Get the main reactor defined in the given resource.
+   * @param resource the resource to extract reactors from
+   * @return An iterable over all reactors found in the resource
+   */
+  public static Reactor getMainReactor(Resource resource) {
+    return StreamSupport.stream(IteratorExtensions.toIterable(resource.getAllContents()).spliterator(), false)
+                        .filter(Reactor.class::isInstance)
+                        .map(Reactor.class::cast)
+                        .filter(it -> it.isMain())
+                        .findFirst()
+                        .get(); 
+  }
+
   /**
    * Find connections in the given resource that would be conflicting writes if they were not
    * located in mutually exclusive modes.
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index c8ebbc38a2..dd00740aca 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -179,24 +179,6 @@ protected void registerTransformation(AstTransformation transformation) {
   // //////////////////////////////////////////
   // // Code generation functions to override for a concrete code generator.
 
-  /**
-   * If there is a main or federated reactor, then create a synthetic Instantiation for that
-   * top-level reactor and set the field mainDef to refer to it.
-   */
-  private void createMainInstantiation() {
-    // Find the main reactor and create an AST node for its instantiation.
-    Iterable<EObject> nodes =
-        IteratorExtensions.toIterable(context.getFileConfig().resource.getAllContents());
-    for (Reactor reactor : Iterables.filter(nodes, Reactor.class)) {
-      if (reactor.isMain()) {
-        // Creating a definition for the main reactor because there isn't one.
-        this.mainDef = LfFactory.eINSTANCE.createInstantiation();
-        this.mainDef.setName(reactor.getName());
-        this.mainDef.setReactorClass(reactor);
-      }
-    }
-  }
-
   /**
    * Generate code from the Lingua Franca model contained by the specified resource.
    *
@@ -211,10 +193,6 @@ private void createMainInstantiation() {
    */
   public void doGenerate(Resource resource, LFGeneratorContext context) {
 
-    // FIXME: the signature can be reduced to only take context.
-    // The constructor also need not take a file config because this is tied to the context as well.
-    cleanIfNeeded(context);
-
     printInfo(context.getMode());
 
     // Clear any IDE markers that may have been created by a previous build.
@@ -292,13 +270,20 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     additionalPostProcessingForModes();
   }
 
-  /** Check if a clean was requested from the standalone compiler and perform the clean step. */
-  protected void cleanIfNeeded(LFGeneratorContext context) {
-    if (context.getArgs().containsKey("clean")) {
-      try {
-        context.getFileConfig().doClean();
-      } catch (IOException e) {
-        System.err.println("WARNING: IO Error during clean");
+  /**
+   * If there is a main or federated reactor, then create a synthetic Instantiation for that
+   * top-level reactor and set the field mainDef to refer to it.
+   */
+  protected void createMainInstantiation() {
+    // Find the main reactor and create an AST node for its instantiation.
+    Iterable<EObject> nodes =
+        IteratorExtensions.toIterable(context.getFileConfig().resource.getAllContents());
+    for (Reactor reactor : Iterables.filter(nodes, Reactor.class)) {
+      if (reactor.isMain()) {
+        // Creating a definition for the main reactor because there isn't one.
+        this.mainDef = LfFactory.eINSTANCE.createInstantiation();
+        this.mainDef.setName(reactor.getName());
+        this.mainDef.setReactorClass(reactor);
       }
     }
   }
diff --git a/core/src/main/java/org/lflang/generator/LFGenerator.java b/core/src/main/java/org/lflang/generator/LFGenerator.java
index f2881c9fb8..d340211d73 100644
--- a/core/src/main/java/org/lflang/generator/LFGenerator.java
+++ b/core/src/main/java/org/lflang/generator/LFGenerator.java
@@ -4,14 +4,19 @@
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.AbstractGenerator;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 import org.eclipse.xtext.generator.IGeneratorContext;
 import org.eclipse.xtext.util.RuntimeIOException;
+import org.lflang.AttributeUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.Target;
+import org.lflang.analyses.uclid.UclidGenerator;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedASTUtils;
 import org.lflang.federated.generator.FedFileConfig;
@@ -20,6 +25,8 @@
 import org.lflang.generator.c.CGenerator;
 import org.lflang.generator.python.PyFileConfig;
 import org.lflang.generator.python.PythonGenerator;
+import org.lflang.lf.Attribute;
+import org.lflang.lf.Reactor;
 import org.lflang.scoping.LFGlobalScopeProvider;
 
 /**
@@ -180,6 +187,29 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorCont
 
     } else {
 
+      // If "-c" or "--clean" is specified, delete any existing generated directories.
+      cleanIfNeeded(lfContext);
+
+      // Check if @property is used. If so, instantiate a UclidGenerator.
+      // The verification model needs to be generated before the target code
+      // since code generation changes LF program (desugar connections, etc.).
+      Reactor main = ASTUtils.getMainReactor(resource);
+      List<Attribute> properties = AttributeUtils.getAttributes(main)
+                                  .stream()
+                                  .filter(attr -> attr.getAttrName().equals("property"))
+                                  .collect(Collectors.toList());
+      if (properties.size() > 0) {
+          UclidGenerator uclidGenerator = new UclidGenerator(lfContext, properties);
+          // Generate uclid files.
+          uclidGenerator.doGenerate(resource, lfContext);
+          if (!uclidGenerator.targetConfig.noVerify) {
+              // Invoke the generated uclid files.
+              uclidGenerator.runner.run();
+          } else {
+              System.out.println("\"no-verify\" is set to true. Skip checking the verification model.");
+          }
+      }
+
       final GeneratorBase generator = createGenerator(lfContext);
 
       if (generator != null) {
@@ -197,4 +227,20 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorCont
   public boolean errorsOccurred() {
     return generatorErrorsOccurred;
   }
+
+  /**
+   * Check if a clean was requested from the standalone compiler and perform
+   * the clean step.
+   * 
+   * FIXME: the signature can be reduced to only take context.
+   */
+  protected void cleanIfNeeded(LFGeneratorContext context) {
+    if (context.getArgs().containsKey("clean")) {
+      try {
+        context.getFileConfig().doClean();
+      } catch (IOException e) {
+        System.err.println("WARNING: IO Error during clean");
+      }
+    }
+  }
 }
diff --git a/core/src/main/java/org/lflang/generator/LFGeneratorContext.java b/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
index 727ce229b9..0deff053ce 100644
--- a/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
+++ b/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
@@ -28,6 +28,7 @@ enum BuildParm {
     LOGGING("The logging level to use by the generated binary"),
     LINT("Enable or disable linting of generated code."),
     NO_COMPILE("Do not invoke target compiler."),
+    NO_VERIFY("Do not check the generated verification model."),
     OUTPUT_PATH("Specify the root output directory."),
     PRINT_STATISTICS("Instruct the runtime to collect and print statistics."),
     QUIET("Suppress output of the target compiler and other commands"),
diff --git a/core/src/main/java/org/lflang/generator/NamedInstance.java b/core/src/main/java/org/lflang/generator/NamedInstance.java
index 3455bcdf40..51b55f026f 100644
--- a/core/src/main/java/org/lflang/generator/NamedInstance.java
+++ b/core/src/main/java/org/lflang/generator/NamedInstance.java
@@ -97,6 +97,28 @@ public String getFullName() {
     return getFullNameWithJoiner(".");
   }
 
+  /**
+   * Return a string of the form "a.b.c", where "." is replaced by the specified joiner, "c" is the
+   * name of this instance, "b" is the name of its container, and "a" is the name of its container,
+   * stopping at the container in main.
+   *
+   * @return A string representing this instance.
+   */
+  public String getFullNameWithJoiner(String joiner) {
+    // This is not cached because _uniqueID is cached.
+    if (parent == null) {
+      return this.getName();
+    } else if (getMode(true) != null) {
+      return parent.getFullNameWithJoiner(joiner)
+          + joiner
+          + getMode(true).getName()
+          + joiner
+          + this.getName();
+    } else {
+      return parent.getFullNameWithJoiner(joiner) + joiner + this.getName();
+    }
+  }
+
   /**
    * Return the name of this instance as given in its definition. Note that this is unique only
    * relative to other instances with the same parent.
@@ -274,31 +296,6 @@ public ModeInstance getMode(boolean direct) {
    */
   int width = 1;
 
-  //////////////////////////////////////////////////////
-  //// Protected methods.
-
-  /**
-   * Return a string of the form "a.b.c", where "." is replaced by the specified joiner, "c" is the
-   * name of this instance, "b" is the name of its container, and "a" is the name of its container,
-   * stopping at the container in main.
-   *
-   * @return A string representing this instance.
-   */
-  protected String getFullNameWithJoiner(String joiner) {
-    // This is not cached because _uniqueID is cached.
-    if (parent == null) {
-      return this.getName();
-    } else if (getMode(true) != null) {
-      return parent.getFullNameWithJoiner(joiner)
-          + joiner
-          + getMode(true).getName()
-          + joiner
-          + this.getName();
-    } else {
-      return parent.getFullNameWithJoiner(joiner) + joiner + this.getName();
-    }
-  }
-
   //////////////////////////////////////////////////////
   //// Protected fields.
 
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstance.java b/core/src/main/java/org/lflang/generator/ReactionInstance.java
index a1e35ffb19..81c79d5712 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstance.java
@@ -120,7 +120,10 @@ public ReactionInstance(
           this.sources.add(timerInstance);
         }
       } else if (trigger instanceof BuiltinTriggerRef) {
-        this.triggers.add(parent.getOrCreateBuiltinTrigger((BuiltinTriggerRef) trigger));
+        var builtinTriggerInstance
+          = parent.getOrCreateBuiltinTrigger((BuiltinTriggerRef) trigger);
+        this.triggers.add(builtinTriggerInstance);
+        builtinTriggerInstance.dependentReactions.add(this);
       }
     }
     // Next handle the ports that this reaction reads.
diff --git a/core/src/main/java/org/lflang/generator/ReactorInstance.java b/core/src/main/java/org/lflang/generator/ReactorInstance.java
index 9288744d65..aa0aeced29 100644
--- a/core/src/main/java/org/lflang/generator/ReactorInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactorInstance.java
@@ -60,6 +60,7 @@
 import org.lflang.lf.Reaction;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.ReactorDecl;
+import org.lflang.lf.StateVar;
 import org.lflang.lf.Timer;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
@@ -123,7 +124,7 @@ public ReactorInstance(Reactor reactor, ReactorInstance parent, ErrorReporter re
   //// Public fields.
 
   /** The action instances belonging to this reactor instance. */
-  public List<ActionInstance> actions = new ArrayList<>();
+  public final List<ActionInstance> actions = new ArrayList<>();
 
   /**
    * The contained reactor instances, in order of declaration. For banks of reactors, this includes
@@ -138,6 +139,9 @@ public ReactorInstance(Reactor reactor, ReactorInstance parent, ErrorReporter re
   /** The output port instances belonging to this reactor instance. */
   public final List<PortInstance> outputs = new ArrayList<>();
 
+  /** The state variable instances belonging to this reactor instance. */
+  public final List<StateVariableInstance> states = new ArrayList<>();
+
   /** The parameters of this instance. */
   public final List<ParameterInstance> parameters = new ArrayList<>();
 
@@ -830,17 +834,22 @@ public ReactorInstance(
       this.parameters.add(new ParameterInstance(parameter, this));
     }
 
-    // Instantiate inputs for this reactor instance
+    // Instantiate inputs for this reactor instance.
     for (Input inputDecl : ASTUtils.allInputs(reactorDefinition)) {
       this.inputs.add(new PortInstance(inputDecl, this, reporter));
     }
 
-    // Instantiate outputs for this reactor instance
+    // Instantiate outputs for this reactor instance.
     for (Output outputDecl : ASTUtils.allOutputs(reactorDefinition)) {
       this.outputs.add(new PortInstance(outputDecl, this, reporter));
     }
 
-    // Do not process content (except interface above) if recursive
+    // Instantiate state variables for this reactor instance.
+    for (StateVar state : ASTUtils.allStateVars(reactorDefinition)) {
+      this.states.add(new StateVariableInstance(state, this, reporter));
+    }
+
+    // Do not process content (except interface above) if recursive.
     if (!recursive && (desiredDepth < 0 || this.depth < desiredDepth)) {
       // Instantiate children for this reactor instance.
       // While doing this, assign an index offset to each.
diff --git a/core/src/main/java/org/lflang/validation/AttributeSpec.java b/core/src/main/java/org/lflang/validation/AttributeSpec.java
index 45c984204e..6eb4277cc3 100644
--- a/core/src/main/java/org/lflang/validation/AttributeSpec.java
+++ b/core/src/main/java/org/lflang/validation/AttributeSpec.java
@@ -213,7 +213,17 @@ enum AttrParamType {
     ATTRIBUTE_SPECS_BY_NAME.put(
         "enclave",
         new AttributeSpec(List.of(new AttrParamSpec(EACH_ATTR, AttrParamType.BOOLEAN, true))));
-
+    // @property(name="<property_name>", tactic="<induction|bmc>", spec="<SMTL_spec>")
+    // SMTL is the safety fragment of Metric Temporal Logic (MTL).
+    ATTRIBUTE_SPECS_BY_NAME.put("property", new AttributeSpec(
+      List.of(
+        new AttrParamSpec("name", AttrParamType.STRING, false),
+        new AttrParamSpec("tactic", AttrParamType.STRING, false),
+        new AttrParamSpec("spec", AttrParamType.STRING, false),
+        new AttrParamSpec("CT", AttrParamType.INT, true),
+        new AttrParamSpec("expect", AttrParamType.BOOLEAN, true)
+      )
+    ));
     // attributes that are used internally only by the federated code generation
     ATTRIBUTE_SPECS_BY_NAME.put("_unordered", new AttributeSpec(null));
     ATTRIBUTE_SPECS_BY_NAME.put(

From b94c641e0260c8b9a30e21bb344d7e066e187cb0 Mon Sep 17 00:00:00 2001
From: erling <erling.jellum@gmail.com>
Date: Wed, 7 Jun 2023 10:56:22 +0200
Subject: [PATCH 0245/1114] Apply suggestions from code review

Co-authored-by: Marten Lohstroh <marten@berkeley.edu>
---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index ff997a5803..75c22bebf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -161,4 +161,4 @@ core/model/
 org.lflang/model/generated
 
 #### Zephyr/west
-.west/
\ No newline at end of file
+.west/

From 697d069a6a76621c425fee42fc8c36f26f9bc521 Mon Sep 17 00:00:00 2001
From: erling <erling.jellum@gmail.com>
Date: Wed, 7 Jun 2023 10:57:16 +0200
Subject: [PATCH 0246/1114] Apply suggestions from code review

Co-authored-by: Marten Lohstroh <marten@berkeley.edu>
---
 core/src/main/java/org/lflang/AttributeUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/AttributeUtils.java b/core/src/main/java/org/lflang/AttributeUtils.java
index 634d77f67a..8324854441 100644
--- a/core/src/main/java/org/lflang/AttributeUtils.java
+++ b/core/src/main/java/org/lflang/AttributeUtils.java
@@ -248,7 +248,7 @@ public static boolean isEnclave(Instantiation node) {
   }
 
   /**
-   * Annotate `node` with enclave @attribute
+   * Annotate @{code node} with enclave @attribute
    *
    * @param node
    */

From 57854e1abd3c6b16d31a45fe3bd6ecd63c7d7289 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Wed, 7 Jun 2023 11:21:21 +0200
Subject: [PATCH 0247/1114] Remove initialization of action parent

---
 .../main/java/org/lflang/generator/c/CActionGenerator.java   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CActionGenerator.java b/core/src/main/java/org/lflang/generator/c/CActionGenerator.java
index 45f0717937..83f47a3afc 100644
--- a/core/src/main/java/org/lflang/generator/c/CActionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CActionGenerator.java
@@ -49,14 +49,11 @@ public static String generateInitializers(ReactorInstance instance) {
                     ? CTypes.getInstance().getTargetTimeExpr(minSpacing)
                     : CGenerator.UNDEFINED_MIN_SPACING)
                 + ";";
-        var parentInitializer =
-            triggerStructName + ".parent = (void *) " + CUtil.reactorRef(action.getParent()) + ";";
         code.addAll(
             List.of(
                 "// Initializing action " + action.getFullName(),
                 offsetInitializer,
-                periodInitializer,
-                parentInitializer));
+                periodInitializer));
 
         var mode = action.getMode(false);
         if (mode != null) {

From 756229273937657ef6b68e8955f664612b9c63ee Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Wed, 7 Jun 2023 11:37:32 +0200
Subject: [PATCH 0248/1114] Docs

---
 .../c/CEnclavedReactorTransformation.java     | 53 ++++++++++++-------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java b/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
index 8a4bc77d0c..fe4f212e31 100644
--- a/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
+++ b/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
@@ -37,6 +37,17 @@
 import org.lflang.lf.TypeParm;
 import org.lflang.lf.VarRef;
 
+/**
+ * This class implements an AST transformation enabling enclaved execution in the C target.
+ * The challenge is to enable communication of data between the enclaves, which excute in different environments.
+ * This is achieved through special connection Reactors which are inspired by the DelayedConnection reactors.
+ * They reside in the environment of the target enclave, but is executed by the scheduler of the source enclave.
+ * It implements the communication by scheduling events on the event queue of the target enclave.
+ * 
+ * In order to put the connection Reactors inside the target environment, we create a wrapper reactor around each enclave.
+ * This wrapper will contain the enclave as well as connection reactors connected to all its inputs.
+ */
+
 public class CEnclavedReactorTransformation implements AstTransformation {
 
   public static final LfFactory factory = ASTUtils.factory;
@@ -59,20 +70,24 @@ public void applyTransformation(List<Reactor> reactors) {
       return;
     }
 
+    // Get reactor definitions of the enclaves
     List<Reactor> enclaveDefs =
         enclaveInsts.stream()
             .map(r -> ASTUtils.toDefinition(r.getReactorClass()))
             .distinct()
             .toList();
 
-    // 2. create ReactorWrappers for all of them.
+    // 2. create wrapper reactor definitions for for all of the reactors which have enclaved instances.
     Map<Reactor, Reactor> defMap = createEnclaveWrappers(enclaveDefs);
 
     // 2. Replace enclave Reactor instances with wrapper instances.
     Map<Instantiation, Instantiation> instMap = replaceEnclavesWithWrappers(enclaveInsts, defMap);
 
+    // 3. Disconnect the old instances and connect the new wrapper instances.
+    //  also resolve the delay parameters needed for the ConnectionReactors
     connectWrappers(reactors, instMap);
   }
+
   // Get the reactor definitions of all the enclaves
   private List<Instantiation> getEnclaveInsts(List<Reactor> reactors) {
     List<Instantiation> enclaves = new ArrayList<>();
@@ -103,8 +118,7 @@ private Map<Reactor, Reactor> createEnclaveWrappers(List<Reactor> enclaves) {
   }
 
   private Reactor createEnclaveWrapperClass(Reactor enclaveDef) {
-    // TODO: Add the same parameters to wrapper
-    // TODO: Copy wrapper parameters to the inst
+    // TODO: Support enclaves with parameters by duplicating the parameters in the wrapper class
     Reactor wrapper = factory.createReactor();
     wrapper.setName(wrapperClassName(enclaveDef.getName()));
     Instantiation wrappedEnclaveInst = ASTUtils.createInstantiation(enclaveDef);
@@ -213,10 +227,6 @@ private String wrappedInstanceName(String originalName) {
   private void connectWrapperThroughConnectionReactor(
       VarRef lhs, VarRef rhs, Instantiation connReactor) {}
 
-  // Side effect: We overwrite the Reactor-list passed into the AST. We remove and add Reactors as
-  // children into the hierarchy. This function should also remove all old connections between
-  // reactors
-  // and original enclaves with new instances.
   private Map<Instantiation, Instantiation> replaceEnclavesWithWrappers(
       List<Instantiation> enclaveInsts, Map<Reactor, Reactor> defMap) {
     Map<Instantiation, Instantiation> instMap = new LinkedHashMap<>();
@@ -251,7 +261,11 @@ private void connectWrappers(List<Reactor> reactors, Map<Instantiation, Instanti
     }
   }
 
-  // TODO: Handle all connection patterns.
+  // TODO: Handle all connection patterns. We are currently missing:
+  //  1. Enclave -> Parent Output port
+  //  2. Enclave -> Parent reaction
+  //  3. Parent input port -> Enclave
+  //  4. Parent reaction -> Enclave
   private void replaceConnection(Connection conn, Map<Instantiation, Instantiation> instMap) {
     if (isEnclave2EnclaveConn(conn)) {
       replaceEnclave2EnclaveConn(conn, instMap);
@@ -282,11 +296,9 @@ private void replaceEnclave2EnclaveConn(
     Instantiation wrapperDest = instMap.get(dest);
 
     // Set the delay parameter of the enclaved connection which is inside the wrapperDest
-    // FIXME: clean up
     Expression connDelay = oldConn.getDelay();
     if (connDelay != null) {
       Assignment delayAssignment = factory.createAssignment();
-      // Hide behind function maybe?
       delayAssignment.setLhs(
           getParameter(wrapperDest, oldInput.getVariable().getName() + "_delay"));
       Initializer init = factory.createInitializer();
@@ -325,8 +337,7 @@ private Input getInstanceInputPortByName(Instantiation inst, String name) {
         return in;
       }
     }
-    assert (false);
-    return factory.createInput();
+    throw new RuntimeException();
   }
 
   private Output getInstanceOutputPortByName(Instantiation inst, String name) {
@@ -335,11 +346,12 @@ private Output getInstanceOutputPortByName(Instantiation inst, String name) {
         return out;
       }
     }
-    assert (false);
-    return factory.createOutput();
+    throw new RuntimeException();
   }
 
-  // FIXME: Replace with library reactor. But couldnt figure out how to load it
+  /**
+   * Create the EnclavedConnectionReactor definition.
+   */
   private Reactor createEnclaveConnectionClass() {
     if (connectionReactor != null) {
       return connectionReactor;
@@ -471,10 +483,11 @@ private String enclavedConnectionForwardBody() {
     return code.toString();
   }
 
+  /**
+   * Utility for creating a delay parameters initialized to 0
+   */
   private Parameter createDelayParameter(String name) {
-
     Parameter delayParameter = factory.createParameter();
-
     delayParameter.setName(name);
     delayParameter.setType(factory.createType());
     delayParameter.getType().setId("time");
@@ -491,6 +504,9 @@ private Parameter createDelayParameter(String name) {
     return delayParameter;
   }
 
+  /**
+   * Utility for getting a parameter by name. Exception is thrown if it does not exist
+   */
   private Parameter getParameter(Instantiation inst, String name) {
     Reactor reactorDef = ASTUtils.toDefinition(inst.getReactorClass());
     for (Parameter p : reactorDef.getParameters()) {
@@ -498,7 +514,6 @@ private Parameter getParameter(Instantiation inst, String name) {
         return p;
       }
     }
-    assert (false);
-    return factory.createParameter();
+    throw new RuntimeException();
   }
 }

From d52e328cc67ec542d23ce677a1bcb138263a9014 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Wed, 7 Jun 2023 11:38:12 +0200
Subject: [PATCH 0249/1114] Code auto-formatted with Spotless

---
 .../c/CEnclavedReactorTransformation.java     | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java b/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
index fe4f212e31..3b9e00c5f9 100644
--- a/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
+++ b/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
@@ -38,16 +38,17 @@
 import org.lflang.lf.VarRef;
 
 /**
- * This class implements an AST transformation enabling enclaved execution in the C target.
- * The challenge is to enable communication of data between the enclaves, which excute in different environments.
- * This is achieved through special connection Reactors which are inspired by the DelayedConnection reactors.
- * They reside in the environment of the target enclave, but is executed by the scheduler of the source enclave.
- * It implements the communication by scheduling events on the event queue of the target enclave.
- * 
- * In order to put the connection Reactors inside the target environment, we create a wrapper reactor around each enclave.
- * This wrapper will contain the enclave as well as connection reactors connected to all its inputs.
+ * This class implements an AST transformation enabling enclaved execution in the C target. The
+ * challenge is to enable communication of data between the enclaves, which excute in different
+ * environments. This is achieved through special connection Reactors which are inspired by the
+ * DelayedConnection reactors. They reside in the environment of the target enclave, but is executed
+ * by the scheduler of the source enclave. It implements the communication by scheduling events on
+ * the event queue of the target enclave.
+ *
+ * <p>In order to put the connection Reactors inside the target environment, we create a wrapper
+ * reactor around each enclave. This wrapper will contain the enclave as well as connection reactors
+ * connected to all its inputs.
  */
-
 public class CEnclavedReactorTransformation implements AstTransformation {
 
   public static final LfFactory factory = ASTUtils.factory;
@@ -77,7 +78,8 @@ public void applyTransformation(List<Reactor> reactors) {
             .distinct()
             .toList();
 
-    // 2. create wrapper reactor definitions for for all of the reactors which have enclaved instances.
+    // 2. create wrapper reactor definitions for for all of the reactors which have enclaved
+    // instances.
     Map<Reactor, Reactor> defMap = createEnclaveWrappers(enclaveDefs);
 
     // 2. Replace enclave Reactor instances with wrapper instances.
@@ -349,9 +351,7 @@ private Output getInstanceOutputPortByName(Instantiation inst, String name) {
     throw new RuntimeException();
   }
 
-  /**
-   * Create the EnclavedConnectionReactor definition.
-   */
+  /** Create the EnclavedConnectionReactor definition. */
   private Reactor createEnclaveConnectionClass() {
     if (connectionReactor != null) {
       return connectionReactor;
@@ -483,9 +483,7 @@ private String enclavedConnectionForwardBody() {
     return code.toString();
   }
 
-  /**
-   * Utility for creating a delay parameters initialized to 0
-   */
+  /** Utility for creating a delay parameters initialized to 0 */
   private Parameter createDelayParameter(String name) {
     Parameter delayParameter = factory.createParameter();
     delayParameter.setName(name);
@@ -504,9 +502,7 @@ private Parameter createDelayParameter(String name) {
     return delayParameter;
   }
 
-  /**
-   * Utility for getting a parameter by name. Exception is thrown if it does not exist
-   */
+  /** Utility for getting a parameter by name. Exception is thrown if it does not exist */
   private Parameter getParameter(Instantiation inst, String name) {
     Reactor reactorDef = ASTUtils.toDefinition(inst.getReactorClass());
     for (Parameter p : reactorDef.getParameters()) {

From 990c3a69e8b2f1eeb4dabc685867c6a148dacfa6 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Wed, 7 Jun 2023 11:39:55 +0200
Subject: [PATCH 0250/1114] Docs

---
 .../org/lflang/generator/c/CEnvironmentFunctionGenerator.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
index 4c820c5dbf..4d7fc96467 100644
--- a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -5,6 +5,10 @@
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ReactorInstance;
 
+/**
+ * This class is in charge of code generating functions and global variables related to the environments
+ */
+
 public class CEnvironmentFunctionGenerator {
 
   public CEnvironmentFunctionGenerator(ReactorInstance main) {

From 9f8b4954cf3fb15d188ef1a705e08a93d43f20cf Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Wed, 7 Jun 2023 11:42:31 +0200
Subject: [PATCH 0251/1114] Docs++

---
 .../generator/c/CReactionGenerator.java       | 28 ++-----------------
 test/C/src/zephyr/unthreaded/Timer.lf         |  6 +---
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
index c826fdafb9..9604f53b5f 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
@@ -327,30 +327,6 @@ public static String generateDelayBody(String ref, String actionName, boolean is
         : "lf_schedule_copy(" + actionName + ", 0, &" + ref + "->value, 1);  // Length is 1.";
   }
 
-  public static String generateEnclavedConnectionDelayBody(
-      String ref, String actionName, boolean isTokenType) {
-    // Note that the action.type set by the base class is actually
-    // the port type.
-    return isTokenType
-        ? "lf_print_error_and_exit(\"Enclaved connection not implemented for token types\")"
-        : String.join(
-            "\n",
-            "// Calculate the tag at which the event shall be inserted in the destination"
-                + " environment",
-            "tag_t target_tag = lf_delay_tag(self->source_environment->curren_tag,"
-                + " act->trigger->offset);",
-            "token_template_t* template = (token_template_t*)action;",
-            "lf_critical_section_enter(self->destination_environment);",
-            "lf_token_t* token = _lf_initialize_token(template, length);",
-            "memcpy(token->value, value, template->type.element_size * length);",
-            "// Schedule event to the destination environment.",
-            "trigger_handle_t result = _lf_schedule_at_tag(self->destination_environment,"
-                + " action->trigger, tag, token);",
-            "// Notify the main thread in case it is waiting for physical time to elapse.",
-            "lf_notify_of_event(env);",
-            "lf_critical_section_exit(self->destination_length);");
-  }
-
   public static String generateForwardBody(
       String outputName, String targetType, String actionName, boolean isTokenType) {
     return isTokenType
@@ -368,7 +344,7 @@ public static String generateForwardBody(
                 + outputName
                 + ", (lf_token_t*)self->_lf__"
                 + actionName
-                + ".tmplt.token);", // FIXME: Enclaves step1 hack
+                + ".tmplt.token);",
             "self->_lf_" + outputName + ".is_present = true;")
         : "lf_set(" + outputName + ", " + actionName + "->value);";
   }
@@ -586,7 +562,7 @@ private static String generateActionVariablesInReaction(
                 + action.getName()
                 + ", "
                 + tokenPointer
-                + ");") // FIXME: Enclaves step1 hack
+                + ");")
         );
     // Set the value field only if there is a type.
     if (!type.isUndefined()) {
diff --git a/test/C/src/zephyr/unthreaded/Timer.lf b/test/C/src/zephyr/unthreaded/Timer.lf
index c3bf32739e..de8a348b69 100644
--- a/test/C/src/zephyr/unthreaded/Timer.lf
+++ b/test/C/src/zephyr/unthreaded/Timer.lf
@@ -1,14 +1,10 @@
 target C {
-    platform: {
-        name: Zephyr,
-        board: native_posix
-    },
+    platform: "Zephyr",
     timeout: 10 sec,
     fast: true
 }
 
 main reactor {
     timer t(0, 1 sec)
-
     reaction(t) {= printf("Hello\n"); =}
 }

From 2d888be79e1a987eb5e488697de5461c30ced162 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Wed, 7 Jun 2023 11:43:32 +0200
Subject: [PATCH 0252/1114] Code auto-formatted with Spotless

---
 .../org/lflang/generator/c/CEnvironmentFunctionGenerator.java | 4 ++--
 .../main/java/org/lflang/generator/c/CReactionGenerator.java  | 3 +--
 test/C/src/zephyr/unthreaded/Timer.lf                         | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
index 4d7fc96467..2b5b35ef2b 100644
--- a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -6,9 +6,9 @@
 import org.lflang.generator.ReactorInstance;
 
 /**
- * This class is in charge of code generating functions and global variables related to the environments
+ * This class is in charge of code generating functions and global variables related to the
+ * environments
  */
-
 public class CEnvironmentFunctionGenerator {
 
   public CEnvironmentFunctionGenerator(ReactorInstance main) {
diff --git a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
index 9604f53b5f..d9c24aa1db 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
@@ -562,8 +562,7 @@ private static String generateActionVariablesInReaction(
                 + action.getName()
                 + ", "
                 + tokenPointer
-                + ");")
-        );
+                + ");"));
     // Set the value field only if there is a type.
     if (!type.isUndefined()) {
       // The value field will either be a copy (for primitive types)
diff --git a/test/C/src/zephyr/unthreaded/Timer.lf b/test/C/src/zephyr/unthreaded/Timer.lf
index de8a348b69..93ef511f7a 100644
--- a/test/C/src/zephyr/unthreaded/Timer.lf
+++ b/test/C/src/zephyr/unthreaded/Timer.lf
@@ -6,5 +6,6 @@ target C {
 
 main reactor {
     timer t(0, 1 sec)
+
     reaction(t) {= printf("Hello\n"); =}
 }

From 70e0fc580b0647fd578901f434c0d44f33b922ac Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Wed, 7 Jun 2023 11:45:48 +0200
Subject: [PATCH 0253/1114] Remove some stale functions

---
 .../java/org/lflang/generator/c/CUtil.java    | 28 +------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CUtil.java b/core/src/main/java/org/lflang/generator/c/CUtil.java
index ce62d799be..74833872aa 100644
--- a/core/src/main/java/org/lflang/generator/c/CUtil.java
+++ b/core/src/main/java/org/lflang/generator/c/CUtil.java
@@ -809,7 +809,6 @@ public static String getShortenedName(ReactorInstance instance) {
   }
 
   // Returns the ReactorInstance of the closest enclave in the containment hierarchy.
-  // FIXME: Does this work, is a ReactorInstance == an instantiation which can be enclaved?
   public static ReactorInstance getClosestEnclave(ReactorInstance inst) {
     if (inst.isMainOrFederated() || isEnclave(inst.getDefinition())) {
       return inst;
@@ -822,7 +821,7 @@ public static String getEnvironmentId(ReactorInstance inst) {
     return enclave.uniqueID();
   }
 
-  // Returns a string which represents a C literal which points to the struct of the environment
+  // Returns a string which represents a C variable which points to the struct of the environment
   // of the ReactorInstance inst.
   public static String getEnvironmentStruct(ReactorInstance inst) {
     return "envs[" + getEnvironmentId(inst) + "]";
@@ -846,29 +845,4 @@ public static List<ReactorInstance> getEnclaves(ReactorInstance root) {
     }
     return enclaves;
   }
-
-  // FIXME: All the functions below needs to be implemented, somehow
-  public static int numStartupReactionsInEnclave(ReactorInstance enclave) {
-    return 1;
-  }
-
-  public static int numShutdownReactionsInEnclave(ReactorInstance enclave) {
-    return 1;
-  }
-
-  public static int numResetReactionsInEnclave(ReactorInstance enclave) {
-    return 1;
-  }
-
-  public static int numWorkersInEnclave(ReactorInstance enclave) {
-    return 1;
-  }
-
-  public static int numTimerTriggersInEnclave(ReactorInstance enclave) {
-    return 1;
-  }
-
-  public static int numIsPresentFieldsInEnclave(ReactorInstance enclave) {
-    return 3;
-  }
 }

From db799f2d8685d95abf349f11edcae7b96ff2ab97 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Wed, 7 Jun 2023 12:03:07 +0200
Subject: [PATCH 0254/1114] Bump reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 51f40aec3f..6933319d90 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 51f40aec3f4a184037fd663048794cd7b155570f
+Subproject commit 6933319d90080b9ae02d3368dac9d639996463f0

From a297808406889c4b6ffa5b363b5fc83af38ac383 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 7 Jun 2023 18:49:16 +0800
Subject: [PATCH 0255/1114] Add warnings and check dependencies

---
 .../org/lflang/generator/LFGenerator.java     | 82 ++++++++++++++-----
 1 file changed, 63 insertions(+), 19 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/LFGenerator.java b/core/src/main/java/org/lflang/generator/LFGenerator.java
index d340211d73..397622cc2e 100644
--- a/core/src/main/java/org/lflang/generator/LFGenerator.java
+++ b/core/src/main/java/org/lflang/generator/LFGenerator.java
@@ -1,7 +1,10 @@
 package org.lflang.generator;
 
 import com.google.inject.Inject;
+
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.lang.reflect.Constructor;
 import java.nio.file.Path;
 import java.util.List;
@@ -190,25 +193,8 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorCont
       // If "-c" or "--clean" is specified, delete any existing generated directories.
       cleanIfNeeded(lfContext);
 
-      // Check if @property is used. If so, instantiate a UclidGenerator.
-      // The verification model needs to be generated before the target code
-      // since code generation changes LF program (desugar connections, etc.).
-      Reactor main = ASTUtils.getMainReactor(resource);
-      List<Attribute> properties = AttributeUtils.getAttributes(main)
-                                  .stream()
-                                  .filter(attr -> attr.getAttrName().equals("property"))
-                                  .collect(Collectors.toList());
-      if (properties.size() > 0) {
-          UclidGenerator uclidGenerator = new UclidGenerator(lfContext, properties);
-          // Generate uclid files.
-          uclidGenerator.doGenerate(resource, lfContext);
-          if (!uclidGenerator.targetConfig.noVerify) {
-              // Invoke the generated uclid files.
-              uclidGenerator.runner.run();
-          } else {
-              System.out.println("\"no-verify\" is set to true. Skip checking the verification model.");
-          }
-      }
+      // If @property annotations are used, run the LF verifier.
+      runVerifierIfPropertiesDetected(resource, lfContext);
 
       final GeneratorBase generator = createGenerator(lfContext);
 
@@ -243,4 +229,62 @@ protected void cleanIfNeeded(LFGeneratorContext context) {
       }
     }
   }
+
+  /**
+   * Check if @property is used. If so, instantiate a UclidGenerator.
+   * The verification model needs to be generated before the target code
+   * since code generation changes LF program (desugar connections, etc.).
+   */
+  private void runVerifierIfPropertiesDetected(Resource resource, LFGeneratorContext lfContext) {
+    Reactor main = ASTUtils.getMainReactor(resource);
+    List<Attribute> properties = AttributeUtils.getAttributes(main)
+                                .stream()
+                                .filter(attr -> attr.getAttrName().equals("property"))
+                                .collect(Collectors.toList());
+    if (properties.size() > 0) {
+
+      System.out.println("*** WARNING: @property is an experimental feature. Use it with caution. ***");
+
+      // Check if Uclid5 and Z3 are installed.
+      if (execInstalled("uclid", "--help", "uclid 0.9.5")
+          && execInstalled("z3", "--version", "Z3 version")) {
+        UclidGenerator uclidGenerator = new UclidGenerator(lfContext, properties);
+        // Generate uclid files.
+        uclidGenerator.doGenerate(resource, lfContext);
+        if (!uclidGenerator.targetConfig.noVerify) {
+          // Invoke the generated uclid files.
+          uclidGenerator.runner.run();
+        } else {
+          System.out.println("\"no-verify\" is set to true. Skip checking the verification model.");
+        }
+      } else {
+        System.out.println("*** WARNING: Uclid5 or Z3 is not installed. @property is skipped. ***");
+      }
+    }
+  }
+
+  /**
+   * A helper function for checking if a dependency is installed on the command line.
+   * 
+   * @param binaryName The name of the binary
+   * @param arg An argument following the binary name
+   * @param expectedSubstring An expected substring in the output
+   * @return
+   */
+  public static boolean execInstalled(String binaryName, String arg, String expectedSubstring) {
+    ProcessBuilder processBuilder = new ProcessBuilder(binaryName, arg);
+    try {
+      Process process = processBuilder.start();
+      BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+      String line;
+      while ((line = reader.readLine()) != null) {
+        if (line.contains(expectedSubstring)) {
+          return true;
+        }
+      }
+    } catch (IOException e) {
+      return false; // binary not present
+    }
+    return false;
+  }
 }

From 8525fb0c44fcacbfe74f847ea4bc0bd18fa256b8 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 7 Jun 2023 21:34:21 +0800
Subject: [PATCH 0256/1114] Update CI

---
 .github/workflows/only-c.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/only-c.yml b/.github/workflows/only-c.yml
index b353474e94..c0d1dd9797 100644
--- a/.github/workflows/only-c.yml
+++ b/.github/workflows/only-c.yml
@@ -50,3 +50,11 @@ jobs:
     with:
       use-cpp: true
       all-platforms: ${{ !github.event.pull_request.draft  }}
+
+  # Run the Uclid-based LF Verifier tests.
+  uclid:
+    if: ${{ inputs.all || github.event.pull_request.draft }}
+    uses: ./.github/workflows/uclid-verifier-c-tests.yml
+    with:
+      use-cpp: true
+      all-platforms: ${{ !github.event.pull_request.draft  }}

From 9cc84c31881d8757e27bf6e2fab164d3eff289b9 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 7 Jun 2023 21:42:51 +0800
Subject: [PATCH 0257/1114] Update CI

---
 .github/workflows/only-c.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/only-c.yml b/.github/workflows/only-c.yml
index c0d1dd9797..8c547a7f28 100644
--- a/.github/workflows/only-c.yml
+++ b/.github/workflows/only-c.yml
@@ -55,6 +55,3 @@ jobs:
   uclid:
     if: ${{ inputs.all || github.event.pull_request.draft }}
     uses: ./.github/workflows/uclid-verifier-c-tests.yml
-    with:
-      use-cpp: true
-      all-platforms: ${{ !github.event.pull_request.draft  }}

From aa7ed02040bfee78c8f562a9aeaa6326ac3a7fdc Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 7 Jun 2023 22:00:38 +0800
Subject: [PATCH 0258/1114] Update CI

---
 .github/workflows/uclid-verifier-c-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/uclid-verifier-c-tests.yml b/.github/workflows/uclid-verifier-c-tests.yml
index 083065ff93..9e21f3b9e5 100644
--- a/.github/workflows/uclid-verifier-c-tests.yml
+++ b/.github/workflows/uclid-verifier-c-tests.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Install Lingua Franca
         working-directory: lingua-franca/
         run: |
-          ./bin/build-lf-cli
+          ./gradlew assemble
           ./bin/lfc --version
           echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: Download Z3

From 861557ccee5306e2424e81614dfd8d4de0352ec4 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Wed, 7 Jun 2023 16:13:10 +0200
Subject: [PATCH 0259/1114] Bump reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 6933319d90..f6ebfbf206 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 6933319d90080b9ae02d3368dac9d639996463f0
+Subproject commit f6ebfbf206def1e1e733fc880ea9aef0d28d4832

From bcfb3f2462d7469d065a7df04765917a3779046b Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 7 Jun 2023 17:16:40 +0200
Subject: [PATCH 0260/1114] Bump reactor-C

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index f6ebfbf206..4049bfa418 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit f6ebfbf206def1e1e733fc880ea9aef0d28d4832
+Subproject commit 4049bfa4183b20fdcd9d061fc4090f960875d20c

From 5ccf29a7ef68f9ad7e3946598c48cddfb3d2ac09 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 7 Jun 2023 17:26:40 +0200
Subject: [PATCH 0261/1114] Bump reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 4049bfa418..6284e95d34 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 4049bfa4183b20fdcd9d061fc4090f960875d20c
+Subproject commit 6284e95d34bd2137e5f02e84474f3e9ccd4b6992

From 622b496033529041fc8101ac3c8da81fdc310a49 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Wed, 7 Jun 2023 10:34:17 -0700
Subject: [PATCH 0262/1114] Format Java files.

---
 core/src/main/java/org/lflang/FileConfig.java | 25 ++++----------
 .../main/java/org/lflang/TargetConfig.java    |  5 +--
 .../main/java/org/lflang/TargetProperty.java  | 10 +++---
 core/src/main/java/org/lflang/TimeValue.java  | 18 +++++-----
 .../statespace/StateSpaceExplorer.java        |  3 +-
 .../lflang/analyses/uclid/UclidGenerator.java |  3 +-
 .../main/java/org/lflang/ast/ASTUtils.java    | 14 ++++----
 .../org/lflang/generator/GeneratorBase.java   |  1 -
 .../org/lflang/generator/LFGenerator.java     | 34 +++++++++----------
 .../lflang/generator/ReactionInstance.java    |  3 +-
 .../org/lflang/validation/AttributeSpec.java  | 18 +++++-----
 11 files changed, 59 insertions(+), 75 deletions(-)

diff --git a/core/src/main/java/org/lflang/FileConfig.java b/core/src/main/java/org/lflang/FileConfig.java
index c30a237461..9012e0963d 100644
--- a/core/src/main/java/org/lflang/FileConfig.java
+++ b/core/src/main/java/org/lflang/FileConfig.java
@@ -32,9 +32,7 @@ public abstract class FileConfig {
   /** Default name of the directory to store generated sources in. */
   public static final String DEFAULT_SRC_GEN_DIR = "src-gen";
 
-  /**
-   * Default name of the directory to store generated verification models in.
-   */
+  /** Default name of the directory to store generated verification models in. */
   public static final String DEFAULT_MODEL_GEN_DIR = "model-gen";
 
   // Public fields.
@@ -98,15 +96,10 @@ public abstract class FileConfig {
    */
   protected Path srcGenPath;
 
-  /**
-   * Path representation of the root directory for generated
-   * verification models.
-   */
+  /** Path representation of the root directory for generated verification models. */
   protected Path modelGenBasePath;
 
-  /**
-   * The directory in which to put the generated verification models.
-   */
+  /** The directory in which to put the generated verification models. */
   protected Path modelGenPath;
 
   // private fields
@@ -234,19 +227,15 @@ protected Path getSubPkgPath(Path srcPath) {
   }
 
   /**
-   * Path representation of the root directory for generated
-   * verification models.
-   * This is the root, meaning that if the source file is x/y/Z.lf
-   * relative to the package root, then the generated sources will be put in x/y/Z
-   * relative to this URI.
+   * Path representation of the root directory for generated verification models. This is the root,
+   * meaning that if the source file is x/y/Z.lf relative to the package root, then the generated
+   * sources will be put in x/y/Z relative to this URI.
    */
   public Path getModelGenBasePath() {
     return modelGenBasePath;
   }
 
-  /**
-   * The directory in which to put the generated verification models.
-   */
+  /** The directory in which to put the generated verification models. */
   public Path getModelGenPath() {
     return modelGenPath;
   }
diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index 0b97f29e06..25924670fc 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -235,10 +235,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, ErrorReporter errorRe
   /** If true, do not perform runtime validation. The default is false. */
   public boolean noRuntimeValidation = false;
 
-  /**
-   * If true, do not check the generated verification model.
-   * The default is false.
-   */
+  /** If true, do not check the generated verification model. The default is false. */
   public boolean noVerify = false;
 
   /**
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index b7e4ec7233..14e3db0ea0 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -412,14 +412,14 @@ public enum TargetProperty {
         config.noRuntimeValidation = ASTUtils.toBoolean(value);
       }),
 
-  /**
-   * Directive to not check the generated verification model.
-   */
-  NO_VERIFY("no-verify", PrimitiveType.BOOLEAN,
+  /** Directive to not check the generated verification model. */
+  NO_VERIFY(
+      "no-verify",
+      PrimitiveType.BOOLEAN,
       Arrays.asList(Target.C),
       (config) -> ASTUtils.toElement(config.noVerify),
       (config, value, err) -> {
-          config.noVerify = ASTUtils.toBoolean(value);
+        config.noVerify = ASTUtils.toBoolean(value);
       }),
 
   /**
diff --git a/core/src/main/java/org/lflang/TimeValue.java b/core/src/main/java/org/lflang/TimeValue.java
index bec3b6cdbb..899fe97aa8 100644
--- a/core/src/main/java/org/lflang/TimeValue.java
+++ b/core/src/main/java/org/lflang/TimeValue.java
@@ -137,32 +137,30 @@ public long toNanoSeconds() {
     return makeNanosecs(time, unit);
   }
 
-  /**
-   * Return a TimeValue based on a nanosecond value.
-   */
+  /** Return a TimeValue based on a nanosecond value. */
   public static TimeValue fromNanoSeconds(long ns) {
     if (ns == 0) return ZERO;
     long time;
     if ((time = ns / 604_800_016_558_522L) > 0 && ns % 604_800_016_558_522L == 0) {
-        return new TimeValue(time, TimeUnit.WEEK);
+      return new TimeValue(time, TimeUnit.WEEK);
     }
     if ((time = ns / 86_400_000_000_000L) > 0 && ns % 86_400_000_000_000L == 0) {
-        return new TimeValue(time, TimeUnit.DAY);
+      return new TimeValue(time, TimeUnit.DAY);
     }
     if ((time = ns / 3_600_000_000_000L) > 0 && ns % 3_600_000_000_000L == 0) {
-        return new TimeValue(time, TimeUnit.HOUR);
+      return new TimeValue(time, TimeUnit.HOUR);
     }
     if ((time = ns / 60_000_000_000L) > 0 && ns % 60_000_000_000L == 0) {
-        return new TimeValue(time, TimeUnit.MINUTE);
+      return new TimeValue(time, TimeUnit.MINUTE);
     }
     if ((time = ns / 1_000_000_000) > 0 && ns % 1_000_000_000 == 0) {
-        return new TimeValue(time, TimeUnit.SECOND);
+      return new TimeValue(time, TimeUnit.SECOND);
     }
     if ((time = ns / 1_000_000) > 0 && ns % 1_000_000 == 0) {
-        return new TimeValue(time, TimeUnit.MILLI);
+      return new TimeValue(time, TimeUnit.MILLI);
     }
     if ((time = ns / 1000) > 0 && ns % 1000 == 0) {
-        return new TimeValue(time, TimeUnit.MICRO);
+      return new TimeValue(time, TimeUnit.MICRO);
     }
     return new TimeValue(ns, TimeUnit.NANO);
   }
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
index 394a3f26bc..8e05b95cc2 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
@@ -298,7 +298,8 @@ else if (previousTag != null && currentTag.timestamp == previousTag.timestamp) {
         // System.out.println("DEBUG: Stopping because eventQ is empty!");
         stop = true;
       } else if (currentTag.timestamp > horizon.timestamp) {
-        // System.out.println("DEBUG: Stopping because horizon is reached! Horizon: " + horizon + "Current Tag: " + currentTag);
+        // System.out.println("DEBUG: Stopping because horizon is reached! Horizon: " + horizon +
+        // "Current Tag: " + currentTag);
         // System.out.println("DEBUG: EventQ: " + eventQ);
         stop = true;
       }
diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
index a22beb7071..fdedc7d818 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -1519,7 +1519,8 @@ private void createMainReactorInstance() {
       if (this.main == null) {
         // Recursively build instances. This is done once because
         // it is the same for all federates.
-        this.main = new ReactorInstance(ASTUtils.toDefinition(mainDef.getReactorClass()), errorReporter);
+        this.main =
+            new ReactorInstance(ASTUtils.toDefinition(mainDef.getReactorClass()), errorReporter);
         var reactionInstanceGraph = this.main.assignLevels();
         if (reactionInstanceGraph.nodeCount() > 0) {
           errorReporter.reportError("Main reactor has causality cycles. Skipping code generation.");
diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 40930fedb5..9ff57cdb79 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -146,16 +146,18 @@ public static List<Reactor> getAllReactors(Resource resource) {
 
   /**
    * Get the main reactor defined in the given resource.
+   *
    * @param resource the resource to extract reactors from
    * @return An iterable over all reactors found in the resource
    */
   public static Reactor getMainReactor(Resource resource) {
-    return StreamSupport.stream(IteratorExtensions.toIterable(resource.getAllContents()).spliterator(), false)
-                        .filter(Reactor.class::isInstance)
-                        .map(Reactor.class::cast)
-                        .filter(it -> it.isMain())
-                        .findFirst()
-                        .get(); 
+    return StreamSupport.stream(
+            IteratorExtensions.toIterable(resource.getAllContents()).spliterator(), false)
+        .filter(Reactor.class::isInstance)
+        .map(Reactor.class::cast)
+        .filter(it -> it.isMain())
+        .findFirst()
+        .get();
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index dd00740aca..7181cd6ce9 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -26,7 +26,6 @@
 
 import com.google.common.base.Objects;
 import com.google.common.collect.Iterables;
-import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
diff --git a/core/src/main/java/org/lflang/generator/LFGenerator.java b/core/src/main/java/org/lflang/generator/LFGenerator.java
index 1e9918e69c..893e3c5b20 100644
--- a/core/src/main/java/org/lflang/generator/LFGenerator.java
+++ b/core/src/main/java/org/lflang/generator/LFGenerator.java
@@ -1,15 +1,13 @@
 package org.lflang.generator;
 
 import com.google.inject.Inject;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.lang.reflect.Constructor;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.Arrays;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.AbstractGenerator;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
@@ -24,8 +22,6 @@
 import org.lflang.federated.generator.FedASTUtils;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FedGenerator;
-import org.lflang.lf.Attribute;
-import org.lflang.lf.Reactor;
 import org.lflang.generator.c.CFileConfig;
 import org.lflang.generator.c.CGenerator;
 import org.lflang.generator.cpp.CppFileConfig;
@@ -36,6 +32,8 @@
 import org.lflang.generator.rust.RustGenerator;
 import org.lflang.generator.ts.TSFileConfig;
 import org.lflang.generator.ts.TSGenerator;
+import org.lflang.lf.Attribute;
+import org.lflang.lf.Reactor;
 import org.lflang.scoping.LFGlobalScopeProvider;
 
 /** Generates code from your model files on save. */
@@ -139,10 +137,9 @@ public boolean errorsOccurred() {
   }
 
   /**
-   * Check if a clean was requested from the standalone compiler and perform
-   * the clean step.
-   * 
-   * FIXME: the signature can be reduced to only take context.
+   * Check if a clean was requested from the standalone compiler and perform the clean step.
+   *
+   * <p>FIXME: the signature can be reduced to only take context.
    */
   protected void cleanIfNeeded(LFGeneratorContext context) {
     if (context.getArgs().containsKey("clean")) {
@@ -155,19 +152,20 @@ protected void cleanIfNeeded(LFGeneratorContext context) {
   }
 
   /**
-   * Check if @property is used. If so, instantiate a UclidGenerator.
-   * The verification model needs to be generated before the target code
-   * since code generation changes LF program (desugar connections, etc.).
+   * Check if @property is used. If so, instantiate a UclidGenerator. The verification model needs
+   * to be generated before the target code since code generation changes LF program (desugar
+   * connections, etc.).
    */
   private void runVerifierIfPropertiesDetected(Resource resource, LFGeneratorContext lfContext) {
     Reactor main = ASTUtils.getMainReactor(resource);
-    List<Attribute> properties = AttributeUtils.getAttributes(main)
-                                .stream()
-                                .filter(attr -> attr.getAttrName().equals("property"))
-                                .collect(Collectors.toList());
+    List<Attribute> properties =
+        AttributeUtils.getAttributes(main).stream()
+            .filter(attr -> attr.getAttrName().equals("property"))
+            .collect(Collectors.toList());
     if (properties.size() > 0) {
 
-      System.out.println("*** WARNING: @property is an experimental feature. Use it with caution. ***");
+      System.out.println(
+          "*** WARNING: @property is an experimental feature. Use it with caution. ***");
 
       // Check if Uclid5 and Z3 are installed.
       if (execInstalled("uclid", "--help", "uclid 0.9.5")
@@ -189,7 +187,7 @@ && execInstalled("z3", "--version", "Z3 version")) {
 
   /**
    * A helper function for checking if a dependency is installed on the command line.
-   * 
+   *
    * @param binaryName The name of the binary
    * @param arg An argument following the binary name
    * @param expectedSubstring An expected substring in the output
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstance.java b/core/src/main/java/org/lflang/generator/ReactionInstance.java
index 81c79d5712..41958d921a 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstance.java
@@ -120,8 +120,7 @@ public ReactionInstance(
           this.sources.add(timerInstance);
         }
       } else if (trigger instanceof BuiltinTriggerRef) {
-        var builtinTriggerInstance
-          = parent.getOrCreateBuiltinTrigger((BuiltinTriggerRef) trigger);
+        var builtinTriggerInstance = parent.getOrCreateBuiltinTrigger((BuiltinTriggerRef) trigger);
         this.triggers.add(builtinTriggerInstance);
         builtinTriggerInstance.dependentReactions.add(this);
       }
diff --git a/core/src/main/java/org/lflang/validation/AttributeSpec.java b/core/src/main/java/org/lflang/validation/AttributeSpec.java
index 6eb4277cc3..9ac1f95eec 100644
--- a/core/src/main/java/org/lflang/validation/AttributeSpec.java
+++ b/core/src/main/java/org/lflang/validation/AttributeSpec.java
@@ -215,15 +215,15 @@ enum AttrParamType {
         new AttributeSpec(List.of(new AttrParamSpec(EACH_ATTR, AttrParamType.BOOLEAN, true))));
     // @property(name="<property_name>", tactic="<induction|bmc>", spec="<SMTL_spec>")
     // SMTL is the safety fragment of Metric Temporal Logic (MTL).
-    ATTRIBUTE_SPECS_BY_NAME.put("property", new AttributeSpec(
-      List.of(
-        new AttrParamSpec("name", AttrParamType.STRING, false),
-        new AttrParamSpec("tactic", AttrParamType.STRING, false),
-        new AttrParamSpec("spec", AttrParamType.STRING, false),
-        new AttrParamSpec("CT", AttrParamType.INT, true),
-        new AttrParamSpec("expect", AttrParamType.BOOLEAN, true)
-      )
-    ));
+    ATTRIBUTE_SPECS_BY_NAME.put(
+        "property",
+        new AttributeSpec(
+            List.of(
+                new AttrParamSpec("name", AttrParamType.STRING, false),
+                new AttrParamSpec("tactic", AttrParamType.STRING, false),
+                new AttrParamSpec("spec", AttrParamType.STRING, false),
+                new AttrParamSpec("CT", AttrParamType.INT, true),
+                new AttrParamSpec("expect", AttrParamType.BOOLEAN, true))));
     // attributes that are used internally only by the federated code generation
     ATTRIBUTE_SPECS_BY_NAME.put("_unordered", new AttributeSpec(null));
     ATTRIBUTE_SPECS_BY_NAME.put(

From 6adfa6974f9c3e4f1f02d11e94c73e27f008cdd1 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Thu, 8 Jun 2023 10:48:17 +0200
Subject: [PATCH 0263/1114] Make no_inlining compatible with environments

---
 .../org/lflang/generator/c/CReactorHeaderFileGenerator.java  | 5 ++++-
 .../{failing => }/BankMultiportToReactionNoInlining.lf       | 0
 .../no_inlining/{failing => }/BankToReactionNoInlining.lf    | 0
 test/C/src/no_inlining/{failing => }/Count.lf                | 0
 test/C/src/no_inlining/{failing => }/CountHierarchy.lf       | 0
 test/C/src/no_inlining/{failing => }/IntPrint.lf             | 0
 .../{failing => }/MultiportToReactionNoInlining.lf           | 0
 7 files changed, 4 insertions(+), 1 deletion(-)
 rename test/C/src/no_inlining/{failing => }/BankMultiportToReactionNoInlining.lf (100%)
 rename test/C/src/no_inlining/{failing => }/BankToReactionNoInlining.lf (100%)
 rename test/C/src/no_inlining/{failing => }/Count.lf (100%)
 rename test/C/src/no_inlining/{failing => }/CountHierarchy.lf (100%)
 rename test/C/src/no_inlining/{failing => }/IntPrint.lf (100%)
 rename test/C/src/no_inlining/{failing => }/MultiportToReactionNoInlining.lf (100%)

diff --git a/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java
index b57a19d8a7..e583f383c7 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java
@@ -96,6 +96,8 @@ private static String userFacingSelfType(TypeParameterizedReactor tpr) {
   private static void appendSelfStruct(
       CodeBuilder builder, CTypes types, TypeParameterizedReactor tpr) {
     builder.pr("typedef struct " + userFacingSelfType(tpr) + "{");
+    builder.indent();
+    builder.pr("self_base_t base; // This field is only to be used by the runtime, not the user.");
     for (Parameter p : tpr.reactor().getParameters()) {
       builder.pr(types.getTargetType(p) + " " + p.getName() + ";");
     }
@@ -103,6 +105,7 @@ private static void appendSelfStruct(
       builder.pr(types.getTargetType(s) + " " + s.getName() + ";");
     }
     builder.pr("int end[0]; // placeholder; MSVC does not compile empty structs");
+    builder.unindent();
     builder.pr("} " + userFacingSelfType(tpr) + ";");
   }
 
@@ -120,7 +123,7 @@ private static String reactionParameters(Reaction r, TypeParameterizedReactor tp
   }
 
   private static String getApiSelfStruct(TypeParameterizedReactor tpr) {
-    return "(" + userFacingSelfType(tpr) + "*) (((char*) self) + sizeof(self_base_t))";
+    return "(" + userFacingSelfType(tpr) + "*) self";
   }
 
   /** Generate initialization code that is needed if {@code r} is not inlined. */
diff --git a/test/C/src/no_inlining/failing/BankMultiportToReactionNoInlining.lf b/test/C/src/no_inlining/BankMultiportToReactionNoInlining.lf
similarity index 100%
rename from test/C/src/no_inlining/failing/BankMultiportToReactionNoInlining.lf
rename to test/C/src/no_inlining/BankMultiportToReactionNoInlining.lf
diff --git a/test/C/src/no_inlining/failing/BankToReactionNoInlining.lf b/test/C/src/no_inlining/BankToReactionNoInlining.lf
similarity index 100%
rename from test/C/src/no_inlining/failing/BankToReactionNoInlining.lf
rename to test/C/src/no_inlining/BankToReactionNoInlining.lf
diff --git a/test/C/src/no_inlining/failing/Count.lf b/test/C/src/no_inlining/Count.lf
similarity index 100%
rename from test/C/src/no_inlining/failing/Count.lf
rename to test/C/src/no_inlining/Count.lf
diff --git a/test/C/src/no_inlining/failing/CountHierarchy.lf b/test/C/src/no_inlining/CountHierarchy.lf
similarity index 100%
rename from test/C/src/no_inlining/failing/CountHierarchy.lf
rename to test/C/src/no_inlining/CountHierarchy.lf
diff --git a/test/C/src/no_inlining/failing/IntPrint.lf b/test/C/src/no_inlining/IntPrint.lf
similarity index 100%
rename from test/C/src/no_inlining/failing/IntPrint.lf
rename to test/C/src/no_inlining/IntPrint.lf
diff --git a/test/C/src/no_inlining/failing/MultiportToReactionNoInlining.lf b/test/C/src/no_inlining/MultiportToReactionNoInlining.lf
similarity index 100%
rename from test/C/src/no_inlining/failing/MultiportToReactionNoInlining.lf
rename to test/C/src/no_inlining/MultiportToReactionNoInlining.lf

From 927b40cd937f539e6259e75ca57cab6f19af0309 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Thu, 8 Jun 2023 11:00:05 +0200
Subject: [PATCH 0264/1114] Remove the enclaved stuff from this PR and only
 focus on the environment

---
 .../c/CEnclavedReactorTransformation.java     | 515 ------------------
 .../org/lflang/generator/c/CGenerator.java    |   2 -
 test/C/src/enclave/DelayedConnection.lf       |  38 --
 .../src/enclave/EnclavedConnectionReactor.lf  |  47 --
 test/C/src/enclave/NonCommunicating.lf        |  25 -
 test/C/src/enclave/SimpleConnection.lf        |  40 --
 6 files changed, 667 deletions(-)
 delete mode 100644 core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
 delete mode 100644 test/C/src/enclave/DelayedConnection.lf
 delete mode 100644 test/C/src/enclave/EnclavedConnectionReactor.lf
 delete mode 100644 test/C/src/enclave/NonCommunicating.lf
 delete mode 100644 test/C/src/enclave/SimpleConnection.lf

diff --git a/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java b/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
deleted file mode 100644
index 3b9e00c5f9..0000000000
--- a/core/src/main/java/org/lflang/generator/c/CEnclavedReactorTransformation.java
+++ /dev/null
@@ -1,515 +0,0 @@
-package org.lflang.generator.c;
-
-import static org.lflang.AttributeUtils.isEnclave;
-import static org.lflang.AttributeUtils.setEnclaveAttribute;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-import org.lflang.ast.ASTUtils;
-import org.lflang.ast.AstTransformation;
-import org.lflang.generator.CodeBuilder;
-import org.lflang.lf.Action;
-import org.lflang.lf.ActionOrigin;
-import org.lflang.lf.Assignment;
-import org.lflang.lf.Connection;
-import org.lflang.lf.Expression;
-import org.lflang.lf.Initializer;
-import org.lflang.lf.Input;
-import org.lflang.lf.Instantiation;
-import org.lflang.lf.LfFactory;
-import org.lflang.lf.Mode;
-import org.lflang.lf.Model;
-import org.lflang.lf.Output;
-import org.lflang.lf.Parameter;
-import org.lflang.lf.ParameterReference;
-import org.lflang.lf.Preamble;
-import org.lflang.lf.Reaction;
-import org.lflang.lf.Reactor;
-import org.lflang.lf.Time;
-import org.lflang.lf.Type;
-import org.lflang.lf.TypeParm;
-import org.lflang.lf.VarRef;
-
-/**
- * This class implements an AST transformation enabling enclaved execution in the C target. The
- * challenge is to enable communication of data between the enclaves, which excute in different
- * environments. This is achieved through special connection Reactors which are inspired by the
- * DelayedConnection reactors. They reside in the environment of the target enclave, but is executed
- * by the scheduler of the source enclave. It implements the communication by scheduling events on
- * the event queue of the target enclave.
- *
- * <p>In order to put the connection Reactors inside the target environment, we create a wrapper
- * reactor around each enclave. This wrapper will contain the enclave as well as connection reactors
- * connected to all its inputs.
- */
-public class CEnclavedReactorTransformation implements AstTransformation {
-
-  public static final LfFactory factory = ASTUtils.factory;
-
-  private final Resource mainResource;
-
-  public CEnclavedReactorTransformation(Resource mainResource) {
-    this.mainResource = mainResource;
-  }
-
-  // We only need a single ConnectionReactor since it uses generics.
-  Reactor connectionReactor = null;
-
-  public void applyTransformation(List<Reactor> reactors) {
-    // This function performs the whole AST transformation consisting in
-    // 1. Get all Enclave Reactors
-    List<Instantiation> enclaveInsts = getEnclaveInsts(reactors);
-
-    if (enclaveInsts.size() == 0) {
-      return;
-    }
-
-    // Get reactor definitions of the enclaves
-    List<Reactor> enclaveDefs =
-        enclaveInsts.stream()
-            .map(r -> ASTUtils.toDefinition(r.getReactorClass()))
-            .distinct()
-            .toList();
-
-    // 2. create wrapper reactor definitions for for all of the reactors which have enclaved
-    // instances.
-    Map<Reactor, Reactor> defMap = createEnclaveWrappers(enclaveDefs);
-
-    // 2. Replace enclave Reactor instances with wrapper instances.
-    Map<Instantiation, Instantiation> instMap = replaceEnclavesWithWrappers(enclaveInsts, defMap);
-
-    // 3. Disconnect the old instances and connect the new wrapper instances.
-    //  also resolve the delay parameters needed for the ConnectionReactors
-    connectWrappers(reactors, instMap);
-  }
-
-  // Get the reactor definitions of all the enclaves
-  private List<Instantiation> getEnclaveInsts(List<Reactor> reactors) {
-    List<Instantiation> enclaves = new ArrayList<>();
-    for (Reactor container : reactors) {
-      for (Instantiation inst : container.getInstantiations()) {
-        if (isEnclave(inst)) {
-          enclaves.add(inst);
-        }
-      }
-    }
-    return enclaves;
-  }
-
-  // Side-effect: Fills the enclaveToWrapperMap with the newly created EnclaveWrappers
-  private Map<Reactor, Reactor> createEnclaveWrappers(List<Reactor> enclaves) {
-    Map<Reactor, Reactor> map = new LinkedHashMap<>();
-    for (Reactor enclave : enclaves) {
-      Reactor wrapper = createEnclaveWrapperClass(enclave);
-
-      // Hook it into AST
-      EObject node =
-          IteratorExtensions.findFirst(mainResource.getAllContents(), Model.class::isInstance);
-      ((Model) node).getReactors().add(wrapper);
-
-      map.put(enclave, wrapper);
-    }
-    return map;
-  }
-
-  private Reactor createEnclaveWrapperClass(Reactor enclaveDef) {
-    // TODO: Support enclaves with parameters by duplicating the parameters in the wrapper class
-    Reactor wrapper = factory.createReactor();
-    wrapper.setName(wrapperClassName(enclaveDef.getName()));
-    Instantiation wrappedEnclaveInst = ASTUtils.createInstantiation(enclaveDef);
-    wrappedEnclaveInst.setName(wrappedInstanceName(enclaveDef.getName()));
-    wrapper.getInstantiations().add(wrappedEnclaveInst);
-    for (Input input : enclaveDef.getInputs()) {
-      Input in = factory.createInput();
-      Type type = input.getType();
-      in.setName(input.getName());
-      in.setType(EcoreUtil.copy(input.getType()));
-      Parameter delayParam = createDelayParameter(input.getName() + "_delay");
-      wrapper.getParameters().add(delayParam);
-      ParameterReference delayParamRef = factory.createParameterReference();
-      delayParamRef.setParameter(delayParam);
-
-      // Create Connection reactor def and inst
-      Reactor connReactorDef = createEnclaveConnectionClass();
-      Instantiation connReactorInst = factory.createInstantiation();
-      connReactorInst.setReactorClass(connReactorDef);
-      connReactorInst.setName(connReactorDef.getName() + input.getName());
-      connReactorInst.getTypeArgs().add(EcoreUtil.copy(type));
-
-      // Set the delay parameter of the ConnectionRactor
-      Assignment delayAssignment = factory.createAssignment();
-      delayAssignment.setLhs(connReactorDef.getParameters().get(0));
-      Initializer init = factory.createInitializer();
-      init.getExprs().add(Objects.requireNonNull(delayParamRef));
-      delayAssignment.setRhs(init);
-      connReactorInst.getParameters().add(delayAssignment);
-
-      // Create the two actual connections between top-level, connection-reactor and wrapped enclave
-      Connection conn1 = factory.createConnection();
-      Connection conn2 = factory.createConnection();
-
-      // Create var-refs fpr ports
-      VarRef topInRef = factory.createVarRef();
-      VarRef encInRef = factory.createVarRef();
-      VarRef connInRef = factory.createVarRef();
-      VarRef connOutRef = factory.createVarRef();
-
-      // Tie the var-refs to their ports
-      topInRef.setVariable(in);
-
-      encInRef.setContainer(wrappedEnclaveInst);
-      encInRef.setVariable(input);
-
-      connInRef.setContainer(connReactorInst);
-      connInRef.setVariable(connReactorDef.getInputs().get(0));
-
-      connOutRef.setContainer(connReactorInst);
-      connOutRef.setVariable(connReactorDef.getOutputs().get(0));
-
-      // Connect var-refs and connections
-      conn1.getLeftPorts().add(topInRef);
-      conn1.getRightPorts().add(connInRef);
-
-      conn2.getLeftPorts().add(connOutRef);
-      conn2.getRightPorts().add(encInRef);
-
-      // Add all objects to the wrapper class
-      wrapper.getInputs().add(in);
-      wrapper.getConnections().add(conn1);
-      wrapper.getConnections().add(conn2);
-      wrapper.getInstantiations().add(connReactorInst);
-    }
-
-    for (Output output : enclaveDef.getOutputs()) {
-      Output out = factory.createOutput();
-      Type type = output.getType();
-      out.setName(output.getName());
-      out.setType(EcoreUtil.copy(type));
-
-      // Create the two actual connections between top-level, connection-reactor and wrapped enclave
-      Connection conn1 = factory.createConnection();
-
-      // Create var-refs fpr ports
-      VarRef topOutRef = factory.createVarRef();
-      VarRef encOutRef = factory.createVarRef();
-
-      // Tie the var-refs to their ports
-      topOutRef.setVariable(out);
-
-      encOutRef.setContainer(wrappedEnclaveInst);
-      encOutRef.setVariable(output);
-
-      // Connect var-refs and connections
-      conn1.getLeftPorts().add(encOutRef);
-      conn1.getRightPorts().add(topOutRef);
-
-      // Add all objects to the wrapper class
-      wrapper.getOutputs().add(out);
-      wrapper.getConnections().add(conn1);
-    }
-
-    return wrapper;
-  }
-
-  private String wrapperClassName(String originalName) {
-    return "_" + originalName + "Wrapper";
-  }
-
-  private String wrappedInstanceName(String originalName) {
-    return "_" + originalName + "_wrapped";
-  }
-
-  private void connectWrapperThroughConnectionReactor(
-      VarRef lhs, VarRef rhs, Instantiation connReactor) {}
-
-  private Map<Instantiation, Instantiation> replaceEnclavesWithWrappers(
-      List<Instantiation> enclaveInsts, Map<Reactor, Reactor> defMap) {
-    Map<Instantiation, Instantiation> instMap = new LinkedHashMap<>();
-
-    for (Instantiation inst : enclaveInsts) {
-      EObject parent = inst.eContainer();
-      Reactor wrapperDef = defMap.get(ASTUtils.toDefinition(inst.getReactorClass()));
-      Instantiation wrapperInst = ASTUtils.createInstantiation(wrapperDef);
-      wrapperInst.setName("_wrapper_" + inst.getName());
-
-      setEnclaveAttribute(wrapperInst);
-      // TODO: Copy parameters from inst to wrapperInst
-
-      if (parent instanceof Reactor) {
-        ((Reactor) parent).getInstantiations().remove(inst);
-        ((Reactor) parent).getInstantiations().add(wrapperInst);
-      } else if (parent instanceof Mode) {
-        ((Mode) parent).getInstantiations().remove(inst);
-        ((Mode) parent).getInstantiations().add(wrapperInst);
-      }
-
-      instMap.put(inst, wrapperInst);
-    }
-    return instMap;
-  }
-
-  private void connectWrappers(List<Reactor> reactors, Map<Instantiation, Instantiation> instMap) {
-    for (Reactor container : reactors) {
-      for (Connection connection : ASTUtils.allConnections(container)) {
-        replaceConnection(connection, instMap);
-      }
-    }
-  }
-
-  // TODO: Handle all connection patterns. We are currently missing:
-  //  1. Enclave -> Parent Output port
-  //  2. Enclave -> Parent reaction
-  //  3. Parent input port -> Enclave
-  //  4. Parent reaction -> Enclave
-  private void replaceConnection(Connection conn, Map<Instantiation, Instantiation> instMap) {
-    if (isEnclave2EnclaveConn(conn)) {
-      replaceEnclave2EnclaveConn(conn, instMap);
-    }
-  }
-
-  private boolean isEnclavePort(VarRef portRef) {
-    return isEnclave(portRef.getContainer());
-  }
-
-  private boolean isEnclave2EnclaveConn(Connection conn) {
-    VarRef lhs = conn.getLeftPorts().get(0);
-    VarRef rhs = conn.getRightPorts().get(0);
-    return isEnclavePort(lhs) && isEnclavePort(rhs);
-  }
-
-  private void replaceEnclave2EnclaveConn(
-      Connection oldConn, Map<Instantiation, Instantiation> instMap) {
-    Connection newConn = factory.createConnection();
-    VarRef wrapperSrcOutput = factory.createVarRef();
-    VarRef wrapperDestInput = factory.createVarRef();
-
-    VarRef oldOutput = oldConn.getLeftPorts().get(0);
-    VarRef oldInput = oldConn.getRightPorts().get(0);
-    Instantiation src = oldOutput.getContainer();
-    Instantiation dest = oldInput.getContainer();
-    Instantiation wrapperSrc = instMap.get(src);
-    Instantiation wrapperDest = instMap.get(dest);
-
-    // Set the delay parameter of the enclaved connection which is inside the wrapperDest
-    Expression connDelay = oldConn.getDelay();
-    if (connDelay != null) {
-      Assignment delayAssignment = factory.createAssignment();
-      delayAssignment.setLhs(
-          getParameter(wrapperDest, oldInput.getVariable().getName() + "_delay"));
-      Initializer init = factory.createInitializer();
-      init.getExprs().add(connDelay);
-      delayAssignment.setRhs(init);
-      wrapperDest.getParameters().add(delayAssignment);
-    }
-
-    wrapperSrcOutput.setContainer(wrapperSrc);
-    wrapperSrcOutput.setVariable(
-        getInstanceOutputPortByName(wrapperSrc, oldOutput.getVariable().getName()));
-    wrapperDestInput.setContainer(wrapperDest);
-    wrapperDestInput.setVariable(
-        getInstanceInputPortByName(wrapperDest, oldInput.getVariable().getName()));
-
-    newConn.getLeftPorts().add(wrapperSrcOutput);
-    newConn.getRightPorts().add(wrapperDestInput);
-
-    replaceConnInAST(oldConn, newConn);
-  }
-
-  private void replaceConnInAST(Connection oldConn, Connection newConn) {
-    var container = oldConn.eContainer();
-    if (container instanceof Reactor) {
-      ((Reactor) container).getConnections().remove(oldConn);
-      ((Reactor) container).getConnections().add(newConn);
-    } else if (container instanceof Mode) {
-      ((Mode) container).getConnections().remove(oldConn);
-      ((Mode) container).getConnections().add(newConn);
-    }
-  }
-
-  private Input getInstanceInputPortByName(Instantiation inst, String name) {
-    for (Input in : ASTUtils.toDefinition(inst.getReactorClass()).getInputs()) {
-      if (in.getName() == name) {
-        return in;
-      }
-    }
-    throw new RuntimeException();
-  }
-
-  private Output getInstanceOutputPortByName(Instantiation inst, String name) {
-    for (Output out : ASTUtils.toDefinition(inst.getReactorClass()).getOutputs()) {
-      if (out.getName().equals(name)) {
-        return out;
-      }
-    }
-    throw new RuntimeException();
-  }
-
-  /** Create the EnclavedConnectionReactor definition. */
-  private Reactor createEnclaveConnectionClass() {
-    if (connectionReactor != null) {
-      return connectionReactor;
-    }
-    Type type = factory.createType();
-    type.setId("T");
-
-    TypeParm typeParam = factory.createTypeParm();
-    typeParam.setLiteral("T");
-
-    Preamble preamble = factory.createPreamble();
-    preamble.setCode(factory.createCode());
-    preamble
-        .getCode()
-        .setBody(
-            String.join(
-                "\n",
-                "#ifdef __cplusplus",
-                "extern \"C\"",
-                "{",
-                "#endif",
-                "#include \"reactor_common.h\"",
-                "#include <string.h>",
-                "#ifdef __cplusplus",
-                "}",
-                "#endif"));
-
-    String className = "EnclaveConnectionReactor";
-    Reactor connReactor = factory.createReactor();
-    connReactor.getTypeParms().add(typeParam);
-    connReactor.getPreambles().add(preamble);
-    Parameter delayParameter = createDelayParameter("delay");
-    var paramRef = factory.createParameterReference();
-    paramRef.setParameter(delayParameter);
-
-    Action action = factory.createAction();
-    VarRef triggerRef = factory.createVarRef();
-    VarRef effectRef = factory.createVarRef();
-    Input input = factory.createInput();
-    Output output = factory.createOutput();
-    VarRef inRef = factory.createVarRef();
-    VarRef outRef = factory.createVarRef();
-
-    Reaction r1 = factory.createReaction();
-    Reaction r2 = factory.createReaction();
-
-    // Name the newly created action; set its delay and type.
-    action.setName("act");
-    action.setMinDelay(paramRef);
-    action.setOrigin(ActionOrigin.LOGICAL);
-    action.setType(EcoreUtil.copy(type));
-
-    input.setName("in");
-    input.setType(EcoreUtil.copy(type));
-
-    output.setName("out");
-    output.setType(EcoreUtil.copy(type));
-
-    // Establish references to the involved ports.
-    inRef.setVariable(input);
-    outRef.setVariable(output);
-
-    // Establish references to the action.
-    triggerRef.setVariable(action);
-    effectRef.setVariable(action);
-
-    // Add the action to the reactor.
-    connReactor.setName(className);
-    connReactor.getActions().add(action);
-
-    // Configure the second reaction, which reads the input.
-    r1.getTriggers().add(inRef);
-    r1.getEffects().add(effectRef);
-    r1.setCode(factory.createCode());
-    r1.getCode().setBody(enclavedConnectionDelayBody());
-
-    // Configure the first reaction, which produces the output.
-    r2.getTriggers().add(triggerRef);
-    r2.getEffects().add(outRef);
-    r2.setCode(factory.createCode());
-    r2.getCode().setBody(enclavedConnectionForwardBody());
-
-    // Add the reactions to the newly created reactor class.
-    // These need to go in the opposite order in case
-    // a new input arrives at the same time the delayed
-    // output is delivered!
-    connReactor.getReactions().add(r2);
-    connReactor.getReactions().add(r1);
-
-    connReactor.getInputs().add(input);
-    connReactor.getOutputs().add(output);
-    connReactor.getParameters().add(delayParameter);
-
-    // Hook it into AST
-    EObject node =
-        IteratorExtensions.findFirst(mainResource.getAllContents(), Model.class::isInstance);
-    ((Model) node).getReactors().add(connReactor);
-
-    connectionReactor = connReactor;
-
-    return connReactor;
-  }
-
-  private String enclavedConnectionDelayBody() {
-    CodeBuilder code = new CodeBuilder();
-    code.pr("environment_t* src_env = in->_base.source_reactor->environment;");
-    code.pr("environment_t* dest_env = self->base.environment;");
-    code.pr("// Calculate the tag at which to schedule the event at the target");
-    code.pr("tag_t target_tag = lf_delay_tag(src_env->current_tag, self->delay);");
-    code.pr("int length = 1;");
-    code.pr("if (in->token) length = in->length;");
-    code.pr("token_template_t* tmplate = (token_template_t*)act;");
-    code.pr("lf_critical_section_enter(dest_env);");
-    code.pr("lf_token_t* token = _lf_initialize_token(tmplate, length);");
-    code.pr("memcpy(token->value, &(in->value), tmplate->type.element_size * length);");
-    code.pr("// Schedule event to the destination environment.");
-    code.pr(
-        "trigger_handle_t result = _lf_schedule_at_tag(dest_env, act->_base.trigger, target_tag,"
-            + " token);");
-    code.pr("// Notify the main thread in case it is waiting for physical time to elapse");
-    code.pr("lf_notify_of_event(dest_env);");
-    code.pr("lf_critical_section_exit(dest_env);");
-    return code.toString();
-  }
-
-  private String enclavedConnectionForwardBody() {
-    CodeBuilder code = new CodeBuilder();
-    code.pr("lf_set(out, act->value);");
-    return code.toString();
-  }
-
-  /** Utility for creating a delay parameters initialized to 0 */
-  private Parameter createDelayParameter(String name) {
-    Parameter delayParameter = factory.createParameter();
-    delayParameter.setName(name);
-    delayParameter.setType(factory.createType());
-    delayParameter.getType().setId("time");
-    delayParameter.getType().setTime(true);
-    Time defaultTime = factory.createTime();
-    defaultTime.setUnit(null);
-    defaultTime.setInterval(0);
-    Initializer init = factory.createInitializer();
-    init.setParens(true);
-    init.setBraces(false);
-    init.getExprs().add(defaultTime);
-    delayParameter.setInit(init);
-
-    return delayParameter;
-  }
-
-  /** Utility for getting a parameter by name. Exception is thrown if it does not exist */
-  private Parameter getParameter(Instantiation inst, String name) {
-    Reactor reactorDef = ASTUtils.toDefinition(inst.getReactorClass());
-    for (Parameter p : reactorDef.getParameters()) {
-      if (p.getName().equals(name)) {
-        return p;
-      }
-    }
-    throw new RuntimeException();
-  }
-}
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 1c308b2593..a10d9e6737 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -319,8 +319,6 @@ protected CGenerator(
     this.types = types;
     this.cmakeGenerator = cmakeGenerator;
 
-    registerTransformation(new CEnclavedReactorTransformation(fileConfig.resource));
-
     registerTransformation(
         new DelayedConnectionTransformation(
             delayConnectionBodyGenerator, types, fileConfig.resource, true, true));
diff --git a/test/C/src/enclave/DelayedConnection.lf b/test/C/src/enclave/DelayedConnection.lf
deleted file mode 100644
index 61b11a600b..0000000000
--- a/test/C/src/enclave/DelayedConnection.lf
+++ /dev/null
@@ -1,38 +0,0 @@
-target C {
-    timeout: 2 sec
-}
-
-reactor Sender {
-    output out: int
-
-    timer t(0, 50 msec)
-    state cnt: int = 0
-
-    reaction(t) -> out {= lf_set(out, self->cnt++); =}
-}
-
-reactor Receiver {
-    input in: int
-    state last: time_t = 0
-    state cnt: int = 0
-
-    reaction(in) {=
-        time_t now = lf_time_logical_elapsed();
-        lf_print("Received event t=" PRINTF_TIME ", count=%u", now, in->value);
-
-        lf_assert(self->cnt == in->value, "recv=%u exp=%u", in->value, self->cnt);
-        if (now != 0) {
-            lf_assert(now - self->last == MSEC(50), "now=" PRINTF_TIME " last=" PRINTF_TIME, now, self->last);
-        }
-
-        self->last = now;
-        self->cnt++;
-    =}
-}
-
-main reactor {
-    sender = new Sender()
-    receiver = new Receiver()
-
-    sender.out -> receiver.in after 50 msec
-}
diff --git a/test/C/src/enclave/EnclavedConnectionReactor.lf b/test/C/src/enclave/EnclavedConnectionReactor.lf
deleted file mode 100644
index 04c02d9f47..0000000000
--- a/test/C/src/enclave/EnclavedConnectionReactor.lf
+++ /dev/null
@@ -1,47 +0,0 @@
-// This is a library reactor used to implemented connections between enclaves.
-// Currently it only serves as a reference implementation for what is code
-// generated in LFC
-target C
-
-// FIXME: Handle token types also by checking whether it is a token type. I
-reactor ConnectionReactor<T>(delay: time = 0) {
-    preamble {=
-        #ifdef __cplusplus
-        extern "C" {
-        #endif
-
-        #include <string.h>
-        #include "platform.h"
-        #include "reactor_common.h"
-
-        #ifdef __cplusplus
-        }
-        #endif
-    =}
-    input in: T
-    output out: T
-
-    logical action act: T
-
-    reaction(act) -> out {= lf_set(out, act->value); =}
-
-    reaction(in) -> act {=
-        environment_t* src_env = in->_base.source_reactor->environment;
-        environment_t* dest_env = self->base.environment;
-        // Calculate the tag at which to schedule the event at the target
-        tag_t target_tag = lf_delay_tag(src_env->current_tag, self->delay);
-        token_template_t* tmplate = (token_template_t*)act;
-        lf_critical_section_enter(dest_env);
-        lf_token_t* token = _lf_initialize_token(tmplate, in->length);
-        memcpy(token->value, &(in->value), tmplate->type.element_size * in->length);
-        // Schedule event to the destination environment.
-        trigger_handle_t result = _lf_schedule_at_tag(dest_env, act->_base.trigger, target_tag, token);
-        // Notify the main thread in case it is waiting for physical time to elapse
-        lf_notify_of_event(dest_env);
-        lf_critical_section_exit(dest_env);
-    =}
-}
-
-main reactor {
-    conn = new ConnectionReactor<int>()
-}
diff --git a/test/C/src/enclave/NonCommunicating.lf b/test/C/src/enclave/NonCommunicating.lf
deleted file mode 100644
index 2d457022c6..0000000000
--- a/test/C/src/enclave/NonCommunicating.lf
+++ /dev/null
@@ -1,25 +0,0 @@
-target C {
-    scheduler: NP,
-    timeout: 1 sec
-}
-
-reactor Slow {
-    timer t(0, 100 msec)
-
-    reaction(t) {= lf_sleep(MSEC(50)); =}
-}
-
-reactor Fast {
-    timer t(0, 20 msec)
-
-    reaction(t) {=  =} deadline(10 msec) {=
-        time_t lag = lf_time_physical() - lf_time_logical();
-        lf_print_warning("Fast Reactor was stalled lag=" PRINTF_TIME, lag);
-    =}
-}
-
-main reactor {
-    s = new Slow()
-    @enclave
-    f = new Fast()
-}
diff --git a/test/C/src/enclave/SimpleConnection.lf b/test/C/src/enclave/SimpleConnection.lf
deleted file mode 100644
index a26e2a7913..0000000000
--- a/test/C/src/enclave/SimpleConnection.lf
+++ /dev/null
@@ -1,40 +0,0 @@
-target C {
-    timeout: 2 sec
-}
-
-reactor Sender {
-    output out: int
-
-    timer t(0, 50 msec)
-    state cnt: int = 0
-
-    reaction(t) -> out {= lf_set(out, self->cnt++); =}
-}
-
-reactor Receiver {
-    input in: int
-    state last: time_t = 0
-    state cnt: int = 0
-
-    reaction(in) {=
-        time_t now = lf_time_logical_elapsed();
-        lf_print("Received event t=" PRINTF_TIME ", count=%u", now, in->value);
-
-        lf_assert(self->cnt == in->value, "recv=%u exp=%u", in->value, self->cnt);
-        if (now != 0) {
-            lf_assert(now - self->last == MSEC(50), "now=" PRINTF_TIME " last=" PRINTF_TIME, now, self->last);
-        }
-
-        self->last = now;
-        self->cnt++;
-    =}
-}
-
-main reactor {
-    @enclave
-    sender = new Sender()
-    @enclave
-    receiver = new Receiver()
-
-    sender.out -> receiver.in
-}

From 688c9d83761d92bafad2af5f80f92e6f0a3a0617 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Thu, 8 Jun 2023 11:23:32 +0200
Subject: [PATCH 0265/1114] Update tracing API

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 test/C/src/concurrent/Tracing.lf        | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 6284e95d34..d5810851e1 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 6284e95d34bd2137e5f02e84474f3e9ccd4b6992
+Subproject commit d5810851e14df8bdccb7ac899fa6bddff6951a48
diff --git a/test/C/src/concurrent/Tracing.lf b/test/C/src/concurrent/Tracing.lf
index cbc4513732..0b67d31fb6 100644
--- a/test/C/src/concurrent/Tracing.lf
+++ b/test/C/src/concurrent/Tracing.lf
@@ -4,7 +4,6 @@ target C {
     tracing: true,
     // Disable compiler optimization so that TakeTime actually takes time.
     flags: "",
-    logging: DEBUG
 }
 
 preamble {=
@@ -49,7 +48,7 @@ reactor TakeTime(bank_index: int = 0) {
         for (int i = 0; i < 100000000; i++) {
             offset++;
         }
-        tracepoint_user_event(self->event);
+        tracepoint_user_event(self, self->event);
         lf_set(out, in->value + offset);
     =}
 
@@ -76,7 +75,7 @@ reactor Destination(width: int = 4) {
 
     reaction(in) {=
         self->count++;
-        tracepoint_user_value("Number of Destination invocations", self->count);
+        tracepoint_user_value(self, "Number of Destination invocations", self->count);
         int sum = 0;
         for (int i = 0; i < in_width; i++) {
             sum += in[i]->value;

From e558cca22fffc655375b7fcb5aa4cba74517adcf Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Thu, 8 Jun 2023 11:33:18 +0200
Subject: [PATCH 0266/1114] Move back federated test from failiing

---
 .../{failing => }/DistributedPhysicalActionUpstreamLong.lf        | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/C/src/federated/{failing => }/DistributedPhysicalActionUpstreamLong.lf (100%)

diff --git a/test/C/src/federated/failing/DistributedPhysicalActionUpstreamLong.lf b/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf
similarity index 100%
rename from test/C/src/federated/failing/DistributedPhysicalActionUpstreamLong.lf
rename to test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf

From a1e003cd3b46173248acae6a1ff44ba4638e2987 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Thu, 8 Jun 2023 15:12:47 +0200
Subject: [PATCH 0267/1114] Handle tracing per environment

---
 .../org/lflang/generator/EnclaveInfo.java     |  1 +
 .../c/CEnvironmentFunctionGenerator.java      | 35 ++++++++++++++++++-
 .../org/lflang/generator/c/CGenerator.java    |  5 ++-
 .../lflang/generator/c/CTracingGenerator.java |  9 +++--
 .../generator/c/CTriggerObjectsGenerator.java | 15 --------
 .../java/org/lflang/generator/c/CUtil.java    |  4 +++
 core/src/main/resources/lib/c/reactor-c       |  2 +-
 7 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/EnclaveInfo.java b/core/src/main/java/org/lflang/generator/EnclaveInfo.java
index 1898d82124..c628281c12 100644
--- a/core/src/main/java/org/lflang/generator/EnclaveInfo.java
+++ b/core/src/main/java/org/lflang/generator/EnclaveInfo.java
@@ -10,6 +10,7 @@ public class EnclaveInfo {
   public int numModalReactors = 0;
   public int numModalResetStates = 0;
 
+  public String traceFileName = null;
   private ReactorInstance instance;
 
   public EnclaveInfo(ReactorInstance inst) {
diff --git a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
index 2b5b35ef2b..986c42a927 100644
--- a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -2,6 +2,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
+import org.lflang.Target;
+import org.lflang.TargetConfig;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ReactorInstance;
 
@@ -11,8 +14,16 @@
  */
 public class CEnvironmentFunctionGenerator {
 
-  public CEnvironmentFunctionGenerator(ReactorInstance main) {
+  /**
+   *
+   * @param main The top-level reactor instance of the program
+   * @param targetConfig The target config of the program
+   * @param lfModuleName The lfModuleName of the program
+   */
+  public CEnvironmentFunctionGenerator(ReactorInstance main, TargetConfig targetConfig, String lfModuleName) {
     this.enclaves = CUtil.getEnclaves(main);
+    this.targetConfig = targetConfig;
+    this.lfModuleName = lfModuleName;
   }
 
   public String generateDeclarations() {
@@ -30,6 +41,8 @@ public String generateDefinitions() {
   }
 
   private List<ReactorInstance> enclaves = new ArrayList<>();
+  private TargetConfig targetConfig;
+  private String lfModuleName;
 
   private String generateEnvironmentArray() {
     return String.join(
@@ -76,6 +89,24 @@ private String generateCreateEnvironments() {
         numWorkers = "_lf_number_of_workers";
       }
 
+      // Figure out the name of the trace file
+      String traceFileName = "NULL";
+      if (targetConfig.tracing != null) {
+        if (targetConfig.tracing.traceFileName != null) {
+          if (enclave.isMainOrFederated()) {
+            traceFileName = "\"" + targetConfig.tracing.traceFileName + ".lft\"";
+          } else {
+            traceFileName = "\"" + targetConfig.tracing.traceFileName + enclave.getName() + ".lft\"";
+          }
+        } else {
+          if (enclave.isMainOrFederated()) {
+            traceFileName = "\"" + lfModuleName + ".lft\"";
+          } else {
+            traceFileName = "\"" + lfModuleName + enclave.getName() + ".lft\"";
+          }
+        }
+      }
+
       code.pr(
           "environment_init(&"
               + CUtil.getEnvironmentStruct(enclave)
@@ -97,6 +128,8 @@ private String generateCreateEnvironments() {
               + enclave.enclaveInfo.numModalReactors
               + ","
               + enclave.enclaveInfo.numModalResetStates
+              + ","
+              + traceFileName
               + ");");
     }
     code.unindent();
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index a10d9e6737..974453a702 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -605,7 +605,7 @@ private void generateCodeFor(String lfModuleName) throws IOException {
     // Note that any main reactors in imported files are ignored.
     // Skip generation if there are cycles.
     if (main != null) {
-      var envFuncGen = new CEnvironmentFunctionGenerator(main);
+      var envFuncGen = new CEnvironmentFunctionGenerator(main, targetConfig, lfModuleName);
 
       code.pr(envFuncGen.generateDeclarations());
       initializeTriggerObjects.pr(
@@ -1380,10 +1380,13 @@ private void recordBuiltinTriggers(ReactorInstance instance) {
           if (targetConfig.tracing != null) {
             var description = CUtil.getShortenedName(reactor);
             var reactorRef = CUtil.reactorRef(reactor);
+            var envRef = "&" + CUtil.getEnvironmentStruct(reactor);
             temp.pr(
                 String.join(
                     "\n",
                     "_lf_register_trace_event("
+                        + envRef
+                        + ","
                         + reactorRef
                         + ", &("
                         + reactorRef
diff --git a/core/src/main/java/org/lflang/generator/c/CTracingGenerator.java b/core/src/main/java/org/lflang/generator/c/CTracingGenerator.java
index 8439d562b0..d8fa1e951f 100644
--- a/core/src/main/java/org/lflang/generator/c/CTracingGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CTracingGenerator.java
@@ -30,10 +30,12 @@ public static String generateTraceTableEntries(ReactorInstance instance) {
     List<String> code = new ArrayList<>();
     var description = CUtil.getShortenedName(instance);
     var selfStruct = CUtil.reactorRef(instance);
-    code.add(registerTraceEvent(selfStruct, "NULL", "trace_reactor", description));
+    var envRef = "&" + CUtil.getEnvironmentStruct(instance);
+    code.add(registerTraceEvent(envRef, selfStruct, "NULL", "trace_reactor", description));
     for (ActionInstance action : instance.actions) {
       code.add(
           registerTraceEvent(
+              envRef,
               selfStruct,
               getTrigger(selfStruct, action.getName()),
               "trace_trigger",
@@ -42,6 +44,7 @@ public static String generateTraceTableEntries(ReactorInstance instance) {
     for (TimerInstance timer : instance.timers) {
       code.add(
           registerTraceEvent(
+              envRef,
               selfStruct,
               getTrigger(selfStruct, timer.getName()),
               "trace_trigger",
@@ -51,8 +54,10 @@ public static String generateTraceTableEntries(ReactorInstance instance) {
   }
 
   private static String registerTraceEvent(
-      String obj, String trigger, String type, String description) {
+      String env, String obj, String trigger, String type, String description) {
     return "_lf_register_trace_event("
+        + env
+        + ", "
         + obj
         + ", "
         + trigger
diff --git a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 41908238de..64ac349a39 100644
--- a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -45,21 +45,6 @@ public static String generateInitializeTriggerObjects(
     code.pr("void _lf_initialize_trigger_objects() {");
     code.indent();
 
-    // Initialize tracing if it is enabled
-    if (targetConfig.tracing != null) {
-      var traceFileName = lfModuleName;
-      if (targetConfig.tracing.traceFileName != null) {
-        traceFileName = targetConfig.tracing.traceFileName;
-      }
-      code.pr(
-          String.join(
-              "\n",
-              "// Initialize tracing",
-              "start_trace("
-                  + addDoubleQuotes(traceFileName + ".lft")
-                  + ");")); // .lft is for Lingua Franca trace
-    }
-
     // Create arrays of counters for managing pointer arrays of startup, shutdown, reset and
     // triggers
     code.pr(
diff --git a/core/src/main/java/org/lflang/generator/c/CUtil.java b/core/src/main/java/org/lflang/generator/c/CUtil.java
index 74833872aa..39ac625f1c 100644
--- a/core/src/main/java/org/lflang/generator/c/CUtil.java
+++ b/core/src/main/java/org/lflang/generator/c/CUtil.java
@@ -827,6 +827,10 @@ public static String getEnvironmentStruct(ReactorInstance inst) {
     return "envs[" + getEnvironmentId(inst) + "]";
   }
 
+  public static String getEnvironmentName(ReactorInstance inst) {
+    ReactorInstance enclave = getClosestEnclave(inst);
+    return enclave.getName();
+  }
   // Given an instance, e.g. the main reactor, return a list of all enclaves in the program
   public static List<ReactorInstance> getEnclaves(ReactorInstance root) {
     List<ReactorInstance> enclaves = new ArrayList<>();
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index d5810851e1..11bd51402a 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit d5810851e14df8bdccb7ac899fa6bddff6951a48
+Subproject commit 11bd51402ad29d5769b5d620e718bf898a1be9f9

From abd36827171d1a1e1934670671894551e6211582 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Thu, 8 Jun 2023 15:14:41 +0200
Subject: [PATCH 0268/1114] Code auto-formatted with Spotless

---
 .../c/CEnvironmentFunctionGenerator.java      |  9 ++++----
 test/C/src/concurrent/ScheduleAt.lf           | 14 ++++++------
 .../src/federated/DistributedNetworkOrder.lf  | 22 +++++++++----------
 test/C/src/zephyr/unthreaded/Timer.lf         |  6 ++---
 4 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
index 986c42a927..71134fb806 100644
--- a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -2,8 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
-import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ReactorInstance;
@@ -15,12 +13,12 @@
 public class CEnvironmentFunctionGenerator {
 
   /**
-   *
    * @param main The top-level reactor instance of the program
    * @param targetConfig The target config of the program
    * @param lfModuleName The lfModuleName of the program
    */
-  public CEnvironmentFunctionGenerator(ReactorInstance main, TargetConfig targetConfig, String lfModuleName) {
+  public CEnvironmentFunctionGenerator(
+      ReactorInstance main, TargetConfig targetConfig, String lfModuleName) {
     this.enclaves = CUtil.getEnclaves(main);
     this.targetConfig = targetConfig;
     this.lfModuleName = lfModuleName;
@@ -96,7 +94,8 @@ private String generateCreateEnvironments() {
           if (enclave.isMainOrFederated()) {
             traceFileName = "\"" + targetConfig.tracing.traceFileName + ".lft\"";
           } else {
-            traceFileName = "\"" + targetConfig.tracing.traceFileName + enclave.getName() + ".lft\"";
+            traceFileName =
+                "\"" + targetConfig.tracing.traceFileName + enclave.getName() + ".lft\"";
           }
         } else {
           if (enclave.isMainOrFederated()) {
diff --git a/test/C/src/concurrent/ScheduleAt.lf b/test/C/src/concurrent/ScheduleAt.lf
index 8abc613d21..d2d866ac0b 100644
--- a/test/C/src/concurrent/ScheduleAt.lf
+++ b/test/C/src/concurrent/ScheduleAt.lf
@@ -56,13 +56,13 @@ reactor Scheduler {
   // Size = 9
   state action_hit_list_index: int = 0
 
-    reaction(startup) -> act {=
-        for (int i=0; i < 16; i++) {
-            _lf_schedule_at_tag(self->base.environment, act->_base.trigger,
-                (tag_t) { .time = self->times[i] + lf_time_logical(), .microstep = self->microstep_delay_list[i]},
-                NULL);
-        }
-    =}
+  reaction(startup) -> act {=
+    for (int i=0; i < 16; i++) {
+        _lf_schedule_at_tag(self->base.environment, act->_base.trigger,
+            (tag_t) { .time = self->times[i] + lf_time_logical(), .microstep = self->microstep_delay_list[i]},
+            NULL);
+    }
+  =}
 
   reaction(act) {=
     microstep_t microstep = lf_tag().microstep;
diff --git a/test/C/src/federated/DistributedNetworkOrder.lf b/test/C/src/federated/DistributedNetworkOrder.lf
index 25f137ad89..552affa999 100644
--- a/test/C/src/federated/DistributedNetworkOrder.lf
+++ b/test/C/src/federated/DistributedNetworkOrder.lf
@@ -26,17 +26,17 @@ reactor Sender {
   output out: int
   timer t(0, 1 msec)
 
-    reaction(t) -> out {=
-        int payload = 1;
-        if (lf_time_logical_elapsed() == 0LL) {
-            send_timed_message(self->base.environment, MSEC(10), MSG_TYPE_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
-                                (unsigned char*)&payload);
-        } else if (lf_time_logical_elapsed() == MSEC(5)) {
-            payload = 2;
-            send_timed_message(self->base.environment, MSEC(5), MSG_TYPE_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
-                                (unsigned char*)&payload);
-        }
-    =}
+  reaction(t) -> out {=
+    int payload = 1;
+    if (lf_time_logical_elapsed() == 0LL) {
+        send_timed_message(self->base.environment, MSEC(10), MSG_TYPE_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
+                            (unsigned char*)&payload);
+    } else if (lf_time_logical_elapsed() == MSEC(5)) {
+        payload = 2;
+        send_timed_message(self->base.environment, MSEC(5), MSG_TYPE_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
+                            (unsigned char*)&payload);
+    }
+  =}
 }
 
 reactor Receiver {
diff --git a/test/C/src/zephyr/unthreaded/Timer.lf b/test/C/src/zephyr/unthreaded/Timer.lf
index 33e01b1306..17ca51b842 100644
--- a/test/C/src/zephyr/unthreaded/Timer.lf
+++ b/test/C/src/zephyr/unthreaded/Timer.lf
@@ -1,7 +1,7 @@
 target C {
-    platform: "Zephyr",
-    timeout: 10 sec,
-    fast: true
+  platform: "Zephyr",
+  timeout: 10 sec,
+  fast: true
 }
 
 main reactor {

From b3e054281878664856e380dbf881a305862569f4 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Thu, 8 Jun 2023 15:25:46 +0200
Subject: [PATCH 0269/1114] Bump reactor-C

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 11bd51402a..1b5bbbf343 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 11bd51402ad29d5769b5d620e718bf898a1be9f9
+Subproject commit 1b5bbbf343adca57166a82dc7c6952b8c805a8e2

From 146d9b652d98e3188c3a3ec130b17db8973a6487 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Thu, 8 Jun 2023 16:10:52 +0200
Subject: [PATCH 0270/1114] Update tracing test to use new Tracing API

---
 test/C/src/concurrent/Tracing.lf | 54 ++++++++++++++++----------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/test/C/src/concurrent/Tracing.lf b/test/C/src/concurrent/Tracing.lf
index 3b60730766..b151896e23 100644
--- a/test/C/src/concurrent/Tracing.lf
+++ b/test/C/src/concurrent/Tracing.lf
@@ -34,23 +34,23 @@ reactor TakeTime(bank_index: int = 0) {
     snprintf(self->event, length, format, self->bank_index);
 
     // Register the user trace event.
-    if (!register_user_trace_event(self->event)) {
+    if (!register_user_trace_event(self, self->event)) {
         fprintf(stderr, "ERROR: Failed to register trace event.\n");
         exit(1);
     }
   =}
 
-    reaction(in) -> out {=
-        // struct timespec sleep_time = {(time_t) 0, (long)200000000};
-        // struct timespec remaining_time;
-        // nanosleep(&sleep_time, &remaining_time);
-        int offset = 0;
-        for (int i = 0; i < 100000000; i++) {
-            offset++;
-        }
-        tracepoint_user_event(self, self->event);
-        lf_set(out, in->value + offset);
-    =}
+  reaction(in) -> out {=
+    // struct timespec sleep_time = {(time_t) 0, (long)200000000};
+    // struct timespec remaining_time;
+    // nanosleep(&sleep_time, &remaining_time);
+    int offset = 0;
+    for (int i = 0; i < 100000000; i++) {
+        offset++;
+    }
+    tracepoint_user_event(self, self->event);
+    lf_set(out, in->value + offset);
+  =}
 
   reaction(shutdown) {=
     // NOTE: Can't actually free this because the tracepoint
@@ -67,26 +67,26 @@ reactor Destination(width: int = 4) {
 
   reaction(startup) {=
     // Register the user value event.
-    if (!register_user_trace_event("Number of Destination invocations")) {
+    if (!register_user_trace_event(self, "Number of Destination invocations")) {
         fprintf(stderr, "ERROR: Failed to register trace event.\n");
         exit(1);
     }
   =}
 
-    reaction(in) {=
-        self->count++;
-        tracepoint_user_value(self, "Number of Destination invocations", self->count);
-        int sum = 0;
-        for (int i = 0; i < in_width; i++) {
-            sum += in[i]->value;
-        }
-        printf("Sum of received: %d.\n", sum);
-        if (sum != self->s) {
-            printf("ERROR: Expected %d.\n", self->s);
-            exit(1);
-        }
-        self->s += in_width;
-    =}
+  reaction(in) {=
+    self->count++;
+    tracepoint_user_value(self, "Number of Destination invocations", self->count);
+    int sum = 0;
+    for (int i = 0; i < in_width; i++) {
+        sum += in[i]->value;
+    }
+    printf("Sum of received: %d.\n", sum);
+    if (sum != self->s) {
+        printf("ERROR: Expected %d.\n", self->s);
+        exit(1);
+    }
+    self->s += in_width;
+  =}
 }
 
 main reactor(width: int = 4) {

From 530889987900ac5b1fd6320d3a460db598f61b9e Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Thu, 8 Jun 2023 16:31:03 +0200
Subject: [PATCH 0271/1114] Bump reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 1b5bbbf343..30fd68ab33 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 1b5bbbf343adca57166a82dc7c6952b8c805a8e2
+Subproject commit 30fd68ab333b5b4c6e4c9656e705bf10943f6656

From d867f12d880a20f4768cb0a4a0c1057e97dc3bac Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 8 Jun 2023 08:38:45 -0700
Subject: [PATCH 0272/1114] Check to avoid repeated CI runs

---
 .github/workflows/all-misc.yml    | 5 +++++
 .github/workflows/all-targets.yml | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/.github/workflows/all-misc.yml b/.github/workflows/all-misc.yml
index 7efaee5131..2a7c22cc59 100644
--- a/.github/workflows/all-misc.yml
+++ b/.github/workflows/all-misc.yml
@@ -19,8 +19,13 @@ concurrency:
   cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
 
 jobs:
+  check-redundant:
+    uses: fkirc/skip-duplicate-actions@v5.3.0
+    if: ${{ github.ref == 'refs/heads/master' }}
+
   check-diff:
     uses: ./.github/workflows/check-diff.yml
+    needs: check-redundant
 
   # Test the Gradle build.
   building:
diff --git a/.github/workflows/all-targets.yml b/.github/workflows/all-targets.yml
index bc740a36b9..25fb5dfde8 100644
--- a/.github/workflows/all-targets.yml
+++ b/.github/workflows/all-targets.yml
@@ -19,8 +19,13 @@ concurrency:
   cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
 
 jobs:
+  check-redundant:
+    uses: fkirc/skip-duplicate-actions@v5.3.0
+    if: ${{ github.ref == 'refs/heads/master' }}
+
   check-diff:
     uses: ./.github/workflows/check-diff.yml
+    needs: check-redundant
 
   c:
     uses: ./.github/workflows/only-c.yml

From 2fc8588143f6275a8fb58777139b3ce88db4e695 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 8 Jun 2023 10:07:13 -0700
Subject: [PATCH 0273/1114] Run skip-duplicate-actions in check-diff workflow

---
 .github/scripts/check-diff.sh     | 2 +-
 .github/workflows/all-misc.yml    | 4 ----
 .github/workflows/all-targets.yml | 5 -----
 .github/workflows/check-diff.yml  | 5 +++++
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/scripts/check-diff.sh b/.github/scripts/check-diff.sh
index c7bdda6d5f..29dab281f9 100644
--- a/.github/scripts/check-diff.sh
+++ b/.github/scripts/check-diff.sh
@@ -3,7 +3,7 @@ changes() {
 }
 
 if changes | grep -q $1; then
-  echo "CHANGED_$2=1" >> $GITHUB_OUTPUT
+  echo "CHANGED_$2=${{ steps.check.outputs.should_skip != 'true' }}" >> $GITHUB_OUTPUT
 else
   echo "CHANGED_$2=0" >> $GITHUB_OUTPUT
 fi
diff --git a/.github/workflows/all-misc.yml b/.github/workflows/all-misc.yml
index 2a7c22cc59..8dea3460f0 100644
--- a/.github/workflows/all-misc.yml
+++ b/.github/workflows/all-misc.yml
@@ -19,10 +19,6 @@ concurrency:
   cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
 
 jobs:
-  check-redundant:
-    uses: fkirc/skip-duplicate-actions@v5.3.0
-    if: ${{ github.ref == 'refs/heads/master' }}
-
   check-diff:
     uses: ./.github/workflows/check-diff.yml
     needs: check-redundant
diff --git a/.github/workflows/all-targets.yml b/.github/workflows/all-targets.yml
index 25fb5dfde8..bc740a36b9 100644
--- a/.github/workflows/all-targets.yml
+++ b/.github/workflows/all-targets.yml
@@ -19,13 +19,8 @@ concurrency:
   cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
 
 jobs:
-  check-redundant:
-    uses: fkirc/skip-duplicate-actions@v5.3.0
-    if: ${{ github.ref == 'refs/heads/master' }}
-
   check-diff:
     uses: ./.github/workflows/check-diff.yml
-    needs: check-redundant
 
   c:
     uses: ./.github/workflows/only-c.yml
diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
index 3633344d5d..92ef7bff5b 100644
--- a/.github/workflows/check-diff.yml
+++ b/.github/workflows/check-diff.yml
@@ -33,6 +33,10 @@ jobs:
         repository: lf-lang/lingua-franca
         submodules: true
         fetch-depth: 0
+    - name: Check for redundant runs
+      id: check
+      uses: fkirc/skip-duplicate-actions@v5.3.0
+      if: ${{ github.ref == 'refs/heads/master' }}
     - id: do
       run: |
         wget https://raw.githubusercontent.com/lf-lang/lingua-franca/master/.github/scripts/check-diff.sh
@@ -43,3 +47,4 @@ jobs:
         source check-diff.sh "core/src/main/kotlin/org/lflang/generator/ts\|core/src/main/java/org/lflang/generator/ts\|core/src/main/resources/lib/ts\|test/TypeScript" TS
         source check-diff.sh "util/tracing" TRACING
       shell: bash
+      if: ${{ steps.check.outputs.should_skip != 'true' }}

From 402fda74d3387a4fa6dc52e7b2ada40d6bdb7abe Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 8 Jun 2023 11:14:24 -0700
Subject: [PATCH 0274/1114] Update submodule.

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index bcdde365e8..032855f151 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit bcdde365e8a46cb9a6657fc02be76b248fd0a252
+Subproject commit 032855f15187e004caa620b90f51e046edcbc74a

From 99baeeb9ee032840e7da9f8d0e1d7e415cddd5ca Mon Sep 17 00:00:00 2001
From: Abhi Gundrala <gundralaa@berkeley.edu>
Date: Thu, 8 Jun 2023 13:14:43 -0700
Subject: [PATCH 0275/1114] target property pico

---
 core/src/main/java/org/lflang/TargetProperty.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 4a68fc3796..e0562367cd 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -1731,6 +1731,7 @@ public enum Platform {
     LINUX("Linux"),
     MAC("Darwin"),
     ZEPHYR("Zephyr"),
+    PICO("Pico"),
     WINDOWS("Windows");
 
     String cMakeName;

From b79ba35b10422659ce3bc35012740ea858edbeb2 Mon Sep 17 00:00:00 2001
From: Abhi Gundrala <gundralaa@berkeley.edu>
Date: Thu, 8 Jun 2023 13:59:33 -0700
Subject: [PATCH 0276/1114] tests and main

---
 .../org/lflang/generator/c/CMainFunctionGenerator.java   | 7 +++++++
 test/C/src/pico/HelloPico.lf                             | 9 +++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 test/C/src/pico/HelloPico.lf

diff --git a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
index 044874029f..811eda498e 100644
--- a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
@@ -62,6 +62,13 @@ private String generateMainFunction() {
           "   int res = lf_reactor_c_main(0, NULL);",
           "   exit(res);",
           "}");
+    } else if (targetConfig.platformOptions.platform == Platform.PICO) {
+      // Pico platform cannont use command line args. 
+      return String.join(
+          "\n",
+          "void main(void) {",
+          "   return lf_reactor_c_main(0, NULL);",
+          "}");
     } else {
       return String.join(
           "\n",
diff --git a/test/C/src/pico/HelloPico.lf b/test/C/src/pico/HelloPico.lf
new file mode 100644
index 0000000000..ef25cdeba8
--- /dev/null
+++ b/test/C/src/pico/HelloPico.lf
@@ -0,0 +1,9 @@
+target C {
+    platform: "Pico"
+}
+
+main reactor {
+    reaction(startup) {=
+        printf("Hello World!\n");
+    =}
+}
\ No newline at end of file

From 462f70c83bc40235f984ef86758e7785df18b232 Mon Sep 17 00:00:00 2001
From: Abhi Gundrala <gundralaa@berkeley.edu>
Date: Thu, 8 Jun 2023 15:34:47 -0700
Subject: [PATCH 0277/1114] pico-sdk find and include

---
 .../lflang/generator/c/CCmakeGenerator.java   | 60 ++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index fd818b45a5..53f7b045e8 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -133,7 +133,24 @@ CodeBuilder generateCMakeCode(
       cMakeCode.newLine();
     }
 
-    cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
+    if (targetConfig.platformOptions.platform == Platform.Pico) {
+      // resolve pico-sdk path 
+      cMakeCode.pr("# Recommended to place the pico-sdk path in the shell environment variable")
+      cMakeCode.pr("if(DEFINED ENV{PICO_SDK_PATH})");
+      cMakeCode.pr("  message(Found SDK path in ENV)");
+      cMakeCode.pr("  set(PICO_SDK_PATH $ENV{PICO_SDK_PATH})");
+      cMakeCode.pr("else()");
+      cMakeCode.pr("  message(Could not find SDK path in ENV)");
+      cMakeCode.pr("  set(PICO_SDK_PATH ./pico-sdk)");
+      cMakeCode.pr("endif()");
+      cMakeCode.pr("message(PICO_SDK_PATH=\"${PICO_SDK_PATH}\")");
+      cMakeCode.newLine();
+      // include cmake
+      cMakeCode.pr("include(\"{PICO_SDK_PATH}/pico_sdk_init.cmake\")");
+      cMakeCode.newLine();
+    }
+    // FIXME: added ASM for pico platform might not be needed 
+    cMakeCode.pr("project(" + executableName + " LANGUAGES C ASM)");
     cMakeCode.newLine();
 
     // The Test build type is the Debug type plus coverage generation
@@ -207,6 +224,12 @@ CodeBuilder generateCMakeCode(
               hasMain,
               executableName,
               Stream.concat(additionalSources.stream(), sources.stream())));
+    } else if (targetConfig.platformOptions.platform == Platform.Pico) {
+      cMakeCode.pr(
+          setUpMainTargetPico(
+              hasMain,
+              executableName,
+              Stream.concat(additionalSources.stream(), sources.stream())));
     } else {
       cMakeCode.pr(
           setUpMainTarget.getCmakeCode(
@@ -401,4 +424,39 @@ private static String setUpMainTargetZephyr(
     code.newLine();
     return code.toString();
   }
+
+  private static String setUpMainTargetPico(
+      boolean hasMain, String executableName, Stream<String> cSources) {
+    var code = new CodeBuilder();
+    code.pr("add_subdirectory(core)");
+    code.pr("target_link_libraries(core PUBLIC zephyr_interface)");
+    // FIXME: Linking the reactor-c corelib with the zephyr kernel lib
+    //  resolves linker issues but I am not yet sure if it is safe
+    code.pr("target_link_libraries(core PRIVATE kernel)");
+    code.newLine();
+
+    if (hasMain) {
+      code.pr("# Declare a new executable target and list all its sources");
+      code.pr("set(LF_MAIN_TARGET app)");
+      code.pr("target_sources(");
+    } else {
+      code.pr("# Declare a new library target and list all its sources");
+      code.pr("set(LF_MAIN_TARGET" + executableName + ")");
+      code.pr("add_library(");
+    }
+    code.indent();
+    code.pr("${LF_MAIN_TARGET}");
+
+    if (hasMain) {
+      code.pr("PRIVATE");
+    }
+
+    cSources.forEach(code::pr);
+    code.unindent();
+    code.pr(")");
+    code.newLine();
+    return code.toString();
+  }
 }
+
+

From 223165f7e489f858be36a9374701e55271522de7 Mon Sep 17 00:00:00 2001
From: Abhi Gundrala <gundralaa@berkeley.edu>
Date: Thu, 8 Jun 2023 17:17:56 -0700
Subject: [PATCH 0278/1114] cmake generator for pico

---
 .../lflang/generator/c/CCmakeGenerator.java   | 57 ++++++++++---------
 .../generator/c/CMainFunctionGenerator.java   |  2 +-
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 53f7b045e8..dcbe52521a 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -133,25 +133,28 @@ CodeBuilder generateCMakeCode(
       cMakeCode.newLine();
     }
 
-    if (targetConfig.platformOptions.platform == Platform.Pico) {
+    if (targetConfig.platformOptions.platform == Platform.PICO) {
       // resolve pico-sdk path 
-      cMakeCode.pr("# Recommended to place the pico-sdk path in the shell environment variable")
+      cMakeCode.pr("# Recommended to place the pico-sdk path in the shell environment variable");
       cMakeCode.pr("if(DEFINED ENV{PICO_SDK_PATH})");
-      cMakeCode.pr("  message(Found SDK path in ENV)");
+      cMakeCode.pr("  message(\"Found SDK path in ENV\")");
       cMakeCode.pr("  set(PICO_SDK_PATH $ENV{PICO_SDK_PATH})");
       cMakeCode.pr("else()");
-      cMakeCode.pr("  message(Could not find SDK path in ENV)");
+      cMakeCode.pr("  message(\"Could not find SDK path in ENV\")");
       cMakeCode.pr("  set(PICO_SDK_PATH ./pico-sdk)");
       cMakeCode.pr("endif()");
       cMakeCode.pr("message(PICO_SDK_PATH=\"${PICO_SDK_PATH}\")");
       cMakeCode.newLine();
       // include cmake
-      cMakeCode.pr("include(\"{PICO_SDK_PATH}/pico_sdk_init.cmake\")");
+      cMakeCode.pr("include(\"${PICO_SDK_PATH}/pico_sdk_init.cmake\")");
+      cMakeCode.newLine();
+      // pico sdk uses asm cpp and c sources
+      cMakeCode.pr("project(" + executableName + " LANGUAGES C CXX ASM)");
+      cMakeCode.newLine();
+    } else {
+      cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
       cMakeCode.newLine();
     }
-    // FIXME: added ASM for pico platform might not be needed 
-    cMakeCode.pr("project(" + executableName + " LANGUAGES C ASM)");
-    cMakeCode.newLine();
 
     // The Test build type is the Debug type plus coverage generation
     cMakeCode.pr("if(CMAKE_BUILD_TYPE STREQUAL \"Test\")");
@@ -224,7 +227,7 @@ CodeBuilder generateCMakeCode(
               hasMain,
               executableName,
               Stream.concat(additionalSources.stream(), sources.stream())));
-    } else if (targetConfig.platformOptions.platform == Platform.Pico) {
+    } else if (targetConfig.platformOptions.platform == Platform.PICO) {
       cMakeCode.pr(
           setUpMainTargetPico(
               hasMain,
@@ -265,12 +268,14 @@ CodeBuilder generateCMakeCode(
     }
 
     if (targetConfig.threading || targetConfig.tracing != null) {
-      // If threaded computation is requested, add the threads option.
-      cMakeCode.pr("# Find threads and link to it");
-      cMakeCode.pr("find_package(Threads REQUIRED)");
-      cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE Threads::Threads)");
-      cMakeCode.newLine();
-
+      // dont include thread library for pico platform
+      if (targetConfig.platformOptions.platform != Platform.PICO) {
+        // If threaded computation is requested, add the threads option.
+        cMakeCode.pr("# Find threads and link to it");
+        cMakeCode.pr("find_package(Threads REQUIRED)");
+        cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE Threads::Threads)");
+        cMakeCode.newLine();
+      }
       // If the LF program itself is threaded or if tracing is enabled, we need to define
       // NUMBER_OF_WORKERS so that platform-specific C files will contain the appropriate functions
       cMakeCode.pr("# Set the number of workers to enable threading/tracing");
@@ -428,35 +433,33 @@ private static String setUpMainTargetZephyr(
   private static String setUpMainTargetPico(
       boolean hasMain, String executableName, Stream<String> cSources) {
     var code = new CodeBuilder();
+    // FIXME: remove this and move to lingo build
+    code.pr("add_compile_options(-Wall -Wextra -DLF_UNTHREADED)");
+    //  
+    code.pr("pico_sdk_init()");
     code.pr("add_subdirectory(core)");
-    code.pr("target_link_libraries(core PUBLIC zephyr_interface)");
-    // FIXME: Linking the reactor-c corelib with the zephyr kernel lib
-    //  resolves linker issues but I am not yet sure if it is safe
-    code.pr("target_link_libraries(core PRIVATE kernel)");
+    code.pr("target_link_libraries(core PUBLIC pico_stdlib)");
+    code.pr("target_link_libraries(core PUBLIC pico_multicore)");
+    code.pr("target_link_libraries(core PUBLIC pico_sync)");
     code.newLine();
+    code.pr("set(LF_MAIN_TARGET " + executableName + ")");
 
     if (hasMain) {
       code.pr("# Declare a new executable target and list all its sources");
-      code.pr("set(LF_MAIN_TARGET app)");
-      code.pr("target_sources(");
+      code.pr("add_executable(");
     } else {
       code.pr("# Declare a new library target and list all its sources");
-      code.pr("set(LF_MAIN_TARGET" + executableName + ")");
       code.pr("add_library(");
     }
     code.indent();
     code.pr("${LF_MAIN_TARGET}");
-
-    if (hasMain) {
-      code.pr("PRIVATE");
-    }
-
     cSources.forEach(code::pr);
     code.unindent();
     code.pr(")");
     code.newLine();
     return code.toString();
   }
+
 }
 
 
diff --git a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
index 811eda498e..3e9dcd5fe2 100644
--- a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
@@ -66,7 +66,7 @@ private String generateMainFunction() {
       // Pico platform cannont use command line args. 
       return String.join(
           "\n",
-          "void main(void) {",
+          "int main(void) {",
           "   return lf_reactor_c_main(0, NULL);",
           "}");
     } else {

From e42b4bd3e7545de929b975862cb9ad79a9f32a9e Mon Sep 17 00:00:00 2001
From: Abhi Gundrala <gundralaa@berkeley.edu>
Date: Thu, 8 Jun 2023 17:19:33 -0700
Subject: [PATCH 0279/1114] swithc to reactor-c pico support branch

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index c5613560e1..fa78ba216c 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit c5613560e160349154785ff5328ab8f1f764e504
+Subproject commit fa78ba216c375681baa73137782eed47ed3a9577

From 914028642ae5c445ecfeb674f796e99e25598689 Mon Sep 17 00:00:00 2001
From: Abhi Gundrala <gundralaa@berkeley.edu>
Date: Thu, 8 Jun 2023 17:28:02 -0700
Subject: [PATCH 0280/1114] patch newline

---
 core/src/main/java/org/lflang/generator/CodeBuilder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/CodeBuilder.java b/core/src/main/java/org/lflang/generator/CodeBuilder.java
index e4e92294fb..43ccde35c6 100644
--- a/core/src/main/java/org/lflang/generator/CodeBuilder.java
+++ b/core/src/main/java/org/lflang/generator/CodeBuilder.java
@@ -68,7 +68,7 @@ public int length() {
 
   /** Add a new line. */
   public void newLine() {
-    this.pr("");
+    this.pr("\n");
   }
 
   /**

From c9b1a60495c8b36412918913321ee2988793a11f Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 8 Jun 2023 20:29:37 -0700
Subject: [PATCH 0281/1114] Update submodule.

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 032855f151..0bcec558d5 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 032855f15187e004caa620b90f51e046edcbc74a
+Subproject commit 0bcec558d5bd8869beccd4780b392f831b3dc0e8

From bfd66d564d6640218915a5bc3ae210977b2cb865 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 9 Jun 2023 00:26:08 -0700
Subject: [PATCH 0282/1114] Augment diff checks and allow skipping if redundant

---
 .github/scripts/check-diff.sh     |   8 +-
 .github/workflows/all-misc.yml    |  13 ++--
 .github/workflows/all-targets.yml |  12 +--
 .github/workflows/check-diff.yml  | 121 ++++++++++++++++++++----------
 4 files changed, 101 insertions(+), 53 deletions(-)
 mode change 100644 => 100755 .github/scripts/check-diff.sh

diff --git a/.github/scripts/check-diff.sh b/.github/scripts/check-diff.sh
old mode 100644
new mode 100755
index 29dab281f9..5be32c9c17
--- a/.github/scripts/check-diff.sh
+++ b/.github/scripts/check-diff.sh
@@ -1,9 +1,11 @@
+#!/bin/bash
+
 changes() {
   git diff --name-only HEAD $(git merge-base HEAD origin/master)
 }
 
-if changes | grep -q $1; then
-  echo "CHANGED_$2=${{ steps.check.outputs.should_skip != 'true' }}" >> $GITHUB_OUTPUT
+if changes | grep $1 | grep -q -v '^.*md\|txt$'; then
+  echo "changed_$2=1" >> $GITHUB_OUTPUT
 else
-  echo "CHANGED_$2=0" >> $GITHUB_OUTPUT
+  echo "changed_$2=0" >> $GITHUB_OUTPUT
 fi
diff --git a/.github/workflows/all-misc.yml b/.github/workflows/all-misc.yml
index 8dea3460f0..8a891b65cb 100644
--- a/.github/workflows/all-misc.yml
+++ b/.github/workflows/all-misc.yml
@@ -21,32 +21,35 @@ concurrency:
 jobs:
   check-diff:
     uses: ./.github/workflows/check-diff.yml
-    needs: check-redundant
 
   # Test the Gradle build.
   building:
+    needs: check-diff
     uses: ./.github/workflows/build.yml
     with:
       all-platforms: ${{ !github.event.pull_request.draft }}
+    if: ${{ needs.check-diff.outputs.skip_all != 'true' }}
 
   # Build the tools used for processing execution traces
   tracing:
-    if: ${{ !github.event.pull_request.draft || needs.check-diff.outputs.changed-tracing == 1 }}
-    uses: ./.github/workflows/build-trace-tools.yml
     needs: check-diff
+    if: ${{ !github.event.pull_request.draft || needs.check-diff.outputs.run_tracing == 'true' }}
+    uses: ./.github/workflows/build-trace-tools.yml
     with:
       all-platforms: ${{ !github.event.pull_request.draft }}
 
   # Run tests for the standalone compiler.
   cli:
-    if: ${{ !github.event.pull_request.draft }}
+    if: ${{ !github.event.pull_request.draft && needs.check-diff.outputs.skip_all != 'true' }}
+    needs: check-diff
     uses: ./.github/workflows/cli-tests.yml
     with:
       all-platforms: ${{ !github.event.pull_request.draft }}
 
   # Run language server tests.
   lsp:
-    if: ${{ !github.event.pull_request.draft }}
+    if: ${{ !github.event.pull_request.draft && needs.check-diff.outputs.skip_all != 'true' }}
+    needs: check-diff
     uses: ./.github/workflows/lsp-tests.yml
     with:
       all-platforms: ${{ !github.event.pull_request.draft }}
diff --git a/.github/workflows/all-targets.yml b/.github/workflows/all-targets.yml
index bc740a36b9..c11c64a589 100644
--- a/.github/workflows/all-targets.yml
+++ b/.github/workflows/all-targets.yml
@@ -25,29 +25,29 @@ jobs:
   c:
     uses: ./.github/workflows/only-c.yml
     needs: check-diff
-    if: ${{  !github.event.pull_request.draft || needs.check-diff.outputs.changed-c == 1 }}
+    if: ${{ !github.event.pull_request.draft || needs.check-diff.outputs.run_c == 'true' }}
 
   cpp:
     uses: ./.github/workflows/only-cpp.yml
     needs: check-diff
-    if: ${{  !github.event.pull_request.draft || needs.check-diff.outputs.changed-cpp == 1 }}
+    if: ${{ !github.event.pull_request.draft || needs.check-diff.outputs.run_cpp == 'true' }}
 
   py:
     uses: ./.github/workflows/only-py.yml
     needs: check-diff
-    if: ${{  !github.event.pull_request.draft || needs.check-diff.outputs.changed-py == 1 }}
+    if: ${{ !github.event.pull_request.draft || needs.check-diff.outputs.run_py == 'true' }}
 
   rs:
     uses: ./.github/workflows/only-rs.yml
     needs: check-diff
-    if: ${{  !github.event.pull_request.draft || needs.check-diff.outputs.changed-rs == 1 }}
+    if: ${{ !github.event.pull_request.draft || needs.check-diff.outputs.run_rs == 'true' }}
 
   ts:
     uses: ./.github/workflows/only-ts.yml
     needs: check-diff
-    if: ${{  !github.event.pull_request.draft || needs.check-diff.outputs.changed-ts == 1 }}
+    if: ${{ !github.event.pull_request.draft || needs.check-diff.outputs.run_ts == 'true' }}
 
   serialization:
-    if: ${{ !github.event.pull_request.draft || needs.check-diff.outputs.changed-c == 1 || needs.check-diff.outputs.changed-py == 1 || needs.check-diff.outputs.changed-ts == 1 }}
+    if: ${{ !github.event.pull_request.draft || needs.check-diff.outputs.run_c == 'true' || needs.check-diff.outputs.run_py == 'true' || needs.check-diff.outputs.run_ts == 'true' }}
     needs: check-diff
     uses: ./.github/workflows/serialization-tests.yml
diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
index 92ef7bff5b..a8bb15f35a 100644
--- a/.github/workflows/check-diff.yml
+++ b/.github/workflows/check-diff.yml
@@ -3,48 +3,91 @@ name: Check diff from master
 on:
   workflow_call:
     outputs:
-      changed-c:
-        value: ${{ jobs.check.outputs.changed-c }}
-      changed-cpp:
-        value: ${{ jobs.check.outputs.changed-cpp }}
-      changed-py:
-        value: ${{ jobs.check.outputs.changed-py }}
-      changed-rs:
-        value: ${{ jobs.check.outputs.changed-rs }}
-      changed-ts:
-        value: ${{ jobs.check.outputs.changed-ts }}
-      changed-tracing:
-        value: ${{ jobs.check.outputs.changed-tracing }}
+      run_c:
+        description: 'Return true if C tests should be run'
+        value: ${{ jobs.check.outputs.changed_c == 1 && jobs.check.outputs.skip_all != 'true' }}
+      run_cpp:
+        description: 'Return true if C++ tests should be run'
+        value: ${{ jobs.check.outputs.changed_cpp == 1 && jobs.check.outputs.skip_all != 'true' }}
+      run_py:
+        description: 'Return true if Python tests should be run'
+        value: ${{ (jobs.check.outputs.changed_py == 1 || jobs.check.outputs.changed_c == 1) && jobs.check.outputs.skip_all != 'true' }}
+      run_rs:
+        description: 'Return true if Rust tests should be run'
+        value: ${{ jobs.check.outputs.changed_rs == 1 && jobs.check.outputs.skip_all != 'true' }}
+      run_ts:
+        description: 'Return true if TypeScript tests should be run'
+        value: ${{ jobs.check.outputs.changed_ts == 1 && jobs.check.outputs.skip_all != 'true' }}
+      run_tracing:
+        description: 'Return true if tracing tests should be run'
+        value: ${{ jobs.check.outputs.changed_tracing == 1 && jobs.check.outputs.skip_all != 'true' }}
+      skip_all:
+        description: 'Return true if tests should not be run'
+        value: ${{ jobs.check.outputs.skip_all == 'true' }}
 
 jobs:
   check:
     runs-on: ubuntu-latest
     outputs:
-      changed-c: ${{ steps.do.outputs.CHANGED_C }}
-      changed-cpp: ${{ steps.do.outputs.CHANGED_CPP }}
-      changed-py: ${{ steps.do.outputs.CHANGED_PY }}
-      changed-rs: ${{ steps.do.outputs.CHANGED_RS }}
-      changed-ts: ${{ steps.do.outputs.CHANGED_TS }}
-      changed-tracing: ${{ steps.do.outputs.CHANGED_TRACING }}
+      changed_c: ${{ steps.do.outputs.changed_c }}
+      changed_cpp: ${{ steps.do.outputs.changed_cpp }}
+      changed_py: ${{ steps.do.outputs.changed_py }}
+      changed_rs: ${{ steps.do.outputs.changed_rs }}
+      changed_ts: ${{ steps.do.outputs.changed_ts }}
+      changed_tracing: ${{ steps.do.outputs.changed_tracing }}
+      skip_all: ${{ steps.duplicate.outputs.should_skip }}
     steps:
-    - name: Check out lingua-franca repository
-      uses: actions/checkout@v3
-      with:
-        repository: lf-lang/lingua-franca
-        submodules: true
-        fetch-depth: 0
-    - name: Check for redundant runs
-      id: check
-      uses: fkirc/skip-duplicate-actions@v5.3.0
-      if: ${{ github.ref == 'refs/heads/master' }}
-    - id: do
-      run: |
-        wget https://raw.githubusercontent.com/lf-lang/lingua-franca/master/.github/scripts/check-diff.sh
-        source check-diff.sh "core/src/main/java/org/lflang/generator/c\|core/src/main/resources/lib/c\|core/src/main/resources/lib/platform\|test/C" C
-        source check-diff.sh "core/src/main/kotlin/org/lflang/generator/cpp\|core/src/main/resources/lib/cpp\|test/Cpp" CPP
-        source check-diff.sh "core/src/main/java/org/lflang/generator/python\|core/src/main/resources/lib/py\|test/Python" PY
-        source check-diff.sh "core/src/main/kotlin/org/lflang/generator/rust\|core/src/main/java/org/lflang/generator/rust\|core/src/main/resources/lib/rs\|test/Rust" RS
-        source check-diff.sh "core/src/main/kotlin/org/lflang/generator/ts\|core/src/main/java/org/lflang/generator/ts\|core/src/main/resources/lib/ts\|test/TypeScript" TS
-        source check-diff.sh "util/tracing" TRACING
-      shell: bash
-      if: ${{ steps.check.outputs.should_skip != 'true' }}
+      - name: Check out lingua-franca repository
+        uses: actions/checkout@v3
+        with:
+          repository: lf-lang/lingua-franca
+          submodules: true
+          fetch-depth: 0
+      - name: Check for redundant runs
+        id: duplicate
+        uses: fkirc/skip-duplicate-actions@v5.3.0
+      - id: do
+        name: Check which targets have changes
+        run: |
+          ./check-diff.sh "lflang/generator/c\|resources/lib/c\|resources/lib/platform\|test/C" c
+          ./check-diff.sh "lflang/generator/cpp\|resources/lib/cpp\|test/Cpp" cpp
+          ./check-diff.sh "lflang/generator/python\|resources/lib/py\|test/Python" py
+          ./check-diff.sh "lflang/generator/rust\|resources/lib/rs\|test/Rust" rs
+          ./check-diff.sh "lflang/generator/ts\|resources/lib/ts\|test/TypeScript" ts
+          ./check-diff.sh "util/tracing" tracing
+        shell: bash
+        working-directory: .github/scripts
+      - id: summarize
+        name: "Create summary"
+        run: |
+          echo '## Summary' > $GITHUB_STEP_SUMMARY
+      - id: skip-all
+        name: "Explain skipping all checks"
+        run: |
+          echo ":tada: A successful prior run has been found:" >> $GITHUB_STEP_SUMMARY
+          echo "${{ steps.duplicate.outputs.skipped_by }}" >> $GITHUB_STEP_SUMMARY
+          echo ":heavy_check_mark: Skipping tests." >> $GITHUB_STEP_SUMMARY
+        if: ${{ steps.do.outputs.skip_all == 'true' }}
+      - id: run-some
+        name: "Explain running some checks"
+        run: |
+          echo ":hourglass: No successful prior run has been found." >> $GITHUB_STEP_SUMMARY
+        if: ${{ steps.do.outputs.skip_all != 'true' }}
+      - id: ready-mode
+        name: 'Report on full test run'
+        run: |
+          echo ":heavy_check_mark: Performing all tests." >> $GITHUB_STEP_SUMMARY
+        if: ${{ !github.event.pull_request.draft }}
+      - id: draft-mode
+        name: 'Report on partial test run'
+        run: |
+          echo ":heavy_check_mark: Performing tests affected by detected changes." >> $GITHUB_STEP_SUMMARY
+          echo '|         | running                                   |' >> $GITHUB_STEP_SUMMARY
+          echo '|---------|-------------------------------------------|' >> $GITHUB_STEP_SUMMARY
+          echo '| c       | `${{ steps.do.outputs.changed_c == 1 }}`       |' >> $GITHUB_STEP_SUMMARY
+          echo '| cpp     | `${{ steps.do.outputs.changed_cpp == 1 }}`     |' >> $GITHUB_STEP_SUMMARY
+          echo '| py      | `${{ steps.do.outputs.changed_py == 1 }}`      |' >> $GITHUB_STEP_SUMMARY
+          echo '| rs      | `${{ steps.do.outputs.changed_rs == 1 }}`      |' >> $GITHUB_STEP_SUMMARY
+          echo '| ts      | `${{ steps.do.outputs.changed_ts == 1 }}`      |' >> $GITHUB_STEP_SUMMARY
+          echo '| tracing | `${{ steps.do.outputs.changed_tracing == 1 }}` |' >> $GITHUB_STEP_SUMMARY
+        if: ${{ github.event.pull_request.draft }}

From 8b53bdc2faf0e994908802fd693664bfc3d0cf1f Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 9 Jun 2023 00:59:42 -0700
Subject: [PATCH 0283/1114] Also do no run checks in master if changes are
 inconsequential

---
 .github/workflows/all-misc.yml    |  6 +++---
 .github/workflows/all-targets.yml | 12 ++++++------
 .github/workflows/check-diff.yml  |  3 ++-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/all-misc.yml b/.github/workflows/all-misc.yml
index 8a891b65cb..4764f02219 100644
--- a/.github/workflows/all-misc.yml
+++ b/.github/workflows/all-misc.yml
@@ -33,14 +33,14 @@ jobs:
   # Build the tools used for processing execution traces
   tracing:
     needs: check-diff
-    if: ${{ !github.event.pull_request.draft || needs.check-diff.outputs.run_tracing == 'true' }}
+    if: ${{ needs.check-diff.outputs.skip_all != 'true' && (needs.check-diff.outputs.run_tracing == 'true' || !github.event.pull_request.draft) }}
     uses: ./.github/workflows/build-trace-tools.yml
     with:
       all-platforms: ${{ !github.event.pull_request.draft }}
 
   # Run tests for the standalone compiler.
   cli:
-    if: ${{ !github.event.pull_request.draft && needs.check-diff.outputs.skip_all != 'true' }}
+    if: ${{ needs.check-diff.outputs.skip_all != 'true' && !github.event.pull_request.draft }}
     needs: check-diff
     uses: ./.github/workflows/cli-tests.yml
     with:
@@ -48,7 +48,7 @@ jobs:
 
   # Run language server tests.
   lsp:
-    if: ${{ !github.event.pull_request.draft && needs.check-diff.outputs.skip_all != 'true' }}
+    if: ${{ needs.check-diff.outputs.skip_all != 'true' && !github.event.pull_request.draft }}
     needs: check-diff
     uses: ./.github/workflows/lsp-tests.yml
     with:
diff --git a/.github/workflows/all-targets.yml b/.github/workflows/all-targets.yml
index c11c64a589..ef880cc0c0 100644
--- a/.github/workflows/all-targets.yml
+++ b/.github/workflows/all-targets.yml
@@ -25,29 +25,29 @@ jobs:
   c:
     uses: ./.github/workflows/only-c.yml
     needs: check-diff
-    if: ${{ !github.event.pull_request.draft || needs.check-diff.outputs.run_c == 'true' }}
+    if: ${{ needs.check-diff.outputs.skip_all != 'true' && (!github.event.pull_request.draft || needs.check-diff.outputs.run_c == 'true') }}
 
   cpp:
     uses: ./.github/workflows/only-cpp.yml
     needs: check-diff
-    if: ${{ !github.event.pull_request.draft || needs.check-diff.outputs.run_cpp == 'true' }}
+    if: ${{ needs.check-diff.outputs.skip_all != 'true' && (!github.event.pull_request.draft || needs.check-diff.outputs.run_cpp == 'true') }}
 
   py:
     uses: ./.github/workflows/only-py.yml
     needs: check-diff
-    if: ${{ !github.event.pull_request.draft || needs.check-diff.outputs.run_py == 'true' }}
+    if: ${{ needs.check-diff.outputs.skip_all != 'true' && (!github.event.pull_request.draft || needs.check-diff.outputs.run_py == 'true') }}
 
   rs:
     uses: ./.github/workflows/only-rs.yml
     needs: check-diff
-    if: ${{ !github.event.pull_request.draft || needs.check-diff.outputs.run_rs == 'true' }}
+    if: ${{ needs.check-diff.outputs.skip_all != 'true' && (!github.event.pull_request.draft || needs.check-diff.outputs.run_rs == 'true') }}
 
   ts:
     uses: ./.github/workflows/only-ts.yml
     needs: check-diff
-    if: ${{ !github.event.pull_request.draft || needs.check-diff.outputs.run_ts == 'true' }}
+    if: ${{ needs.check-diff.outputs.skip_all != 'true' && (!github.event.pull_request.draft || needs.check-diff.outputs.run_ts == 'true') }}
 
   serialization:
-    if: ${{ !github.event.pull_request.draft || needs.check-diff.outputs.run_c == 'true' || needs.check-diff.outputs.run_py == 'true' || needs.check-diff.outputs.run_ts == 'true' }}
+    if: ${{ needs.check-diff.outputs.skip_all != 'true' && (!github.event.pull_request.draft || needs.check-diff.outputs.run_c == 'true' || needs.check-diff.outputs.run_py == 'true' || needs.check-diff.outputs.run_ts == 'true') }}
     needs: check-diff
     uses: ./.github/workflows/serialization-tests.yml
diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
index a8bb15f35a..3232b22d25 100644
--- a/.github/workflows/check-diff.yml
+++ b/.github/workflows/check-diff.yml
@@ -35,7 +35,7 @@ jobs:
       changed_rs: ${{ steps.do.outputs.changed_rs }}
       changed_ts: ${{ steps.do.outputs.changed_ts }}
       changed_tracing: ${{ steps.do.outputs.changed_tracing }}
-      skip_all: ${{ steps.duplicate.outputs.should_skip }}
+      skip_all: ${{ steps.duplicate.outputs.should_skip == 'true' || steps.do.outputs.changed_any == 0 }}
     steps:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3
@@ -55,6 +55,7 @@ jobs:
           ./check-diff.sh "lflang/generator/rust\|resources/lib/rs\|test/Rust" rs
           ./check-diff.sh "lflang/generator/ts\|resources/lib/ts\|test/TypeScript" ts
           ./check-diff.sh "util/tracing" tracing
+          ./check-diff.sh "*" any
         shell: bash
         working-directory: .github/scripts
       - id: summarize

From 1205d1fdf04afa604962b8d8de3364eca0997718 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 9 Jun 2023 01:01:17 -0700
Subject: [PATCH 0284/1114] Consistent ordering of terms

---
 .github/workflows/all-misc.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/all-misc.yml b/.github/workflows/all-misc.yml
index 4764f02219..0ad64bbc8f 100644
--- a/.github/workflows/all-misc.yml
+++ b/.github/workflows/all-misc.yml
@@ -33,7 +33,7 @@ jobs:
   # Build the tools used for processing execution traces
   tracing:
     needs: check-diff
-    if: ${{ needs.check-diff.outputs.skip_all != 'true' && (needs.check-diff.outputs.run_tracing == 'true' || !github.event.pull_request.draft) }}
+    if: ${{ needs.check-diff.outputs.skip_all != 'true' && (!github.event.pull_request.draft || needs.check-diff.outputs.run_tracing == 'true') }}
     uses: ./.github/workflows/build-trace-tools.yml
     with:
       all-platforms: ${{ !github.event.pull_request.draft }}

From 89476c8aa4b808efe649cedd16641eec5b4c63db Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 9 Jun 2023 01:04:17 -0700
Subject: [PATCH 0285/1114] Regex

---
 .github/workflows/check-diff.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
index 3232b22d25..4b23a4260a 100644
--- a/.github/workflows/check-diff.yml
+++ b/.github/workflows/check-diff.yml
@@ -55,7 +55,7 @@ jobs:
           ./check-diff.sh "lflang/generator/rust\|resources/lib/rs\|test/Rust" rs
           ./check-diff.sh "lflang/generator/ts\|resources/lib/ts\|test/TypeScript" ts
           ./check-diff.sh "util/tracing" tracing
-          ./check-diff.sh "*" any
+          ./check-diff.sh ".+" any
         shell: bash
         working-directory: .github/scripts
       - id: summarize

From ee01a34b442e27d4ecb41931a70b7b12364e0498 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 9 Jun 2023 01:06:53 -0700
Subject: [PATCH 0286/1114] Fix grep

---
 .github/workflows/check-diff.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
index 4b23a4260a..1f495c5a43 100644
--- a/.github/workflows/check-diff.yml
+++ b/.github/workflows/check-diff.yml
@@ -35,7 +35,7 @@ jobs:
       changed_rs: ${{ steps.do.outputs.changed_rs }}
       changed_ts: ${{ steps.do.outputs.changed_ts }}
       changed_tracing: ${{ steps.do.outputs.changed_tracing }}
-      skip_all: ${{ steps.duplicate.outputs.should_skip == 'true' || steps.do.outputs.changed_any == 0 }}
+      skip_all: ${{ steps.duplicate.outputs.should_skip == 'true' && steps.do.outputs.changed_any == 0 }}
     steps:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3
@@ -55,7 +55,7 @@ jobs:
           ./check-diff.sh "lflang/generator/rust\|resources/lib/rs\|test/Rust" rs
           ./check-diff.sh "lflang/generator/ts\|resources/lib/ts\|test/TypeScript" ts
           ./check-diff.sh "util/tracing" tracing
-          ./check-diff.sh ".+" any
+          ./check-diff.sh "" any
         shell: bash
         working-directory: .github/scripts
       - id: summarize

From 89d74ddb389804503cb7fbf00e9b414a92dd756c Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Fri, 9 Jun 2023 12:45:46 +0200
Subject: [PATCH 0287/1114] Another update on trace API

---
 .../main/java/org/lflang/generator/c/CGenerator.java |  4 ++--
 .../org/lflang/generator/c/CTracingGenerator.java    | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 974453a702..ad58403e1b 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -1380,12 +1380,12 @@ private void recordBuiltinTriggers(ReactorInstance instance) {
           if (targetConfig.tracing != null) {
             var description = CUtil.getShortenedName(reactor);
             var reactorRef = CUtil.reactorRef(reactor);
-            var envRef = "&" + CUtil.getEnvironmentStruct(reactor);
+            var envTraceRef = CUtil.getEnvironmentStruct(reactor) + ".trace";
             temp.pr(
                 String.join(
                     "\n",
                     "_lf_register_trace_event("
-                        + envRef
+                        + envTraceRef
                         + ","
                         + reactorRef
                         + ", &("
diff --git a/core/src/main/java/org/lflang/generator/c/CTracingGenerator.java b/core/src/main/java/org/lflang/generator/c/CTracingGenerator.java
index d8fa1e951f..b013913756 100644
--- a/core/src/main/java/org/lflang/generator/c/CTracingGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CTracingGenerator.java
@@ -30,12 +30,12 @@ public static String generateTraceTableEntries(ReactorInstance instance) {
     List<String> code = new ArrayList<>();
     var description = CUtil.getShortenedName(instance);
     var selfStruct = CUtil.reactorRef(instance);
-    var envRef = "&" + CUtil.getEnvironmentStruct(instance);
-    code.add(registerTraceEvent(envRef, selfStruct, "NULL", "trace_reactor", description));
+    var envTraceRef = CUtil.getEnvironmentStruct(instance) + ".trace";
+    code.add(registerTraceEvent(envTraceRef, selfStruct, "NULL", "trace_reactor", description));
     for (ActionInstance action : instance.actions) {
       code.add(
           registerTraceEvent(
-              envRef,
+              envTraceRef,
               selfStruct,
               getTrigger(selfStruct, action.getName()),
               "trace_trigger",
@@ -44,7 +44,7 @@ public static String generateTraceTableEntries(ReactorInstance instance) {
     for (TimerInstance timer : instance.timers) {
       code.add(
           registerTraceEvent(
-              envRef,
+              envTraceRef,
               selfStruct,
               getTrigger(selfStruct, timer.getName()),
               "trace_trigger",
@@ -54,9 +54,9 @@ public static String generateTraceTableEntries(ReactorInstance instance) {
   }
 
   private static String registerTraceEvent(
-      String env, String obj, String trigger, String type, String description) {
+      String envTrace, String obj, String trigger, String type, String description) {
     return "_lf_register_trace_event("
-        + env
+        + envTrace
         + ", "
         + obj
         + ", "

From f24d464a4a753a864aabd0e9eb4f5f377aa2da9d Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Fri, 9 Jun 2023 14:13:55 +0200
Subject: [PATCH 0288/1114] Bump reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 30fd68ab33..6544de7f4c 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 30fd68ab333b5b4c6e4c9656e705bf10943f6656
+Subproject commit 6544de7f4c29eb7db3134acfdb2ee03e7f78cc70

From 9f0f09365b8fe0a444a352faa2521593f3de46f0 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Fri, 9 Jun 2023 15:10:24 +0200
Subject: [PATCH 0289/1114] Bump reactor-C

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 6544de7f4c..97c4311392 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 6544de7f4c29eb7db3134acfdb2ee03e7f78cc70
+Subproject commit 97c4311392129079beb0e5c6d31892a77017d19b

From 256e4194b322ba652b6ece681e3d16e6329fe63b Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 9 Jun 2023 09:18:16 -0700
Subject: [PATCH 0290/1114] Add logic to handle build_anyway

---
 .github/workflows/all-misc.yml   |  2 +-
 .github/workflows/check-diff.yml | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/all-misc.yml b/.github/workflows/all-misc.yml
index 0ad64bbc8f..481c651aa1 100644
--- a/.github/workflows/all-misc.yml
+++ b/.github/workflows/all-misc.yml
@@ -28,7 +28,7 @@ jobs:
     uses: ./.github/workflows/build.yml
     with:
       all-platforms: ${{ !github.event.pull_request.draft }}
-    if: ${{ needs.check-diff.outputs.skip_all != 'true' }}
+    if: ${{ needs.check-diff.outputs.skip_all != 'true' || needs.check-diff.outputs.build_anyway == 'true' }}
 
   # Build the tools used for processing execution traces
   tracing:
diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
index 1f495c5a43..31f0d9668b 100644
--- a/.github/workflows/check-diff.yml
+++ b/.github/workflows/check-diff.yml
@@ -3,6 +3,9 @@ name: Check diff from master
 on:
   workflow_call:
     outputs:
+      build_anyway:
+        description: 'Return true if building is still needed when skipping tests'
+        value: ${{ jobs.check.outputs.build_anyway == 1 }}
       run_c:
         description: 'Return true if C tests should be run'
         value: ${{ jobs.check.outputs.changed_c == 1 && jobs.check.outputs.skip_all != 'true' }}
@@ -29,6 +32,7 @@ jobs:
   check:
     runs-on: ubuntu-latest
     outputs:
+      build_anyway: ${{ steps.skip-ignore.outputs.changed_build }}  
       changed_c: ${{ steps.do.outputs.changed_c }}
       changed_cpp: ${{ steps.do.outputs.changed_cpp }}
       changed_py: ${{ steps.do.outputs.changed_py }}
@@ -62,13 +66,20 @@ jobs:
         name: "Create summary"
         run: |
           echo '## Summary' > $GITHUB_STEP_SUMMARY
-      - id: skip-all
-        name: "Explain skipping all checks"
+      - id: skip-redundant
+        name: "Explain skipping all checks due to a prior run"
         run: |
           echo ":tada: A successful prior run has been found:" >> $GITHUB_STEP_SUMMARY
           echo "${{ steps.duplicate.outputs.skipped_by }}" >> $GITHUB_STEP_SUMMARY
-          echo ":heavy_check_mark: Skipping tests." >> $GITHUB_STEP_SUMMARY
+          echo ":heavy_check_mark: Skipping all tests." >> $GITHUB_STEP_SUMMARY
         if: ${{ steps.do.outputs.skip_all == 'true' }}
+      - id: skip-ignore
+        name: "Explain skipping all checks due to inconsequential changes"
+        run: |
+          echo "The detected changes did not affect any code." >> $GITHUB_STEP_SUMMARY
+          echo ":heavy_check_mark: Skipping tests. Only running build." >> $GITHUB_STEP_SUMMARY
+          echo "build_anyway=1" >> $GITHUB_OUTPUT
+        if: ${{ steps.do.outputs.skip_all != 'true' && steps.do.outputs.changed_any == 0 }}
       - id: run-some
         name: "Explain running some checks"
         run: |

From 273133a956150ad8f1dd73407013460881e92ccb Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 9 Jun 2023 11:25:08 -0700
Subject: [PATCH 0291/1114] Fix the federated launch script (again).

This fixes another way tests can pass when they should be failing.
---
 .../org/lflang/federated/launcher/FedLauncherGenerator.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index b3be6acad0..c06ced57f3 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -203,7 +203,7 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
                 "# The errors are handled separately via trap.",
                 "for pid in \"${pids[@]}\"",
                 "do",
-                "    wait $pid",
+                "    wait $pid || exit $?",
                 "done",
                 "echo \"All done.\"",
                 "EXITED_SUCCESSFULLY=true")

From 5f9f5a78e7d7a73a087b0176df148eabaf9b967e Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 9 Jun 2023 12:48:14 -0700
Subject: [PATCH 0292/1114] Simplifications

---
 .github/workflows/all-misc.yml    |  8 ++--
 .github/workflows/all-targets.yml | 12 +++---
 .github/workflows/check-diff.yml  | 61 +++++++++++++++----------------
 3 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/all-misc.yml b/.github/workflows/all-misc.yml
index 481c651aa1..0cbdd2a21d 100644
--- a/.github/workflows/all-misc.yml
+++ b/.github/workflows/all-misc.yml
@@ -28,19 +28,19 @@ jobs:
     uses: ./.github/workflows/build.yml
     with:
       all-platforms: ${{ !github.event.pull_request.draft }}
-    if: ${{ needs.check-diff.outputs.skip_all != 'true' || needs.check-diff.outputs.build_anyway == 'true' }}
+    if: ${{ needs.check-diff.outputs.run_build == 'true' }}
 
   # Build the tools used for processing execution traces
   tracing:
     needs: check-diff
-    if: ${{ needs.check-diff.outputs.skip_all != 'true' && (!github.event.pull_request.draft || needs.check-diff.outputs.run_tracing == 'true') }}
+    if: ${{ needs.check-diff.outputs.run_tracing == 'true' }}
     uses: ./.github/workflows/build-trace-tools.yml
     with:
       all-platforms: ${{ !github.event.pull_request.draft }}
 
   # Run tests for the standalone compiler.
   cli:
-    if: ${{ needs.check-diff.outputs.skip_all != 'true' && !github.event.pull_request.draft }}
+    if: ${{ needs.check-diff.outputs.run_misc == 'true' }}
     needs: check-diff
     uses: ./.github/workflows/cli-tests.yml
     with:
@@ -48,7 +48,7 @@ jobs:
 
   # Run language server tests.
   lsp:
-    if: ${{ needs.check-diff.outputs.skip_all != 'true' && !github.event.pull_request.draft }}
+    if: ${{ needs.check-diff.outputs.run_misc == 'true' }}
     needs: check-diff
     uses: ./.github/workflows/lsp-tests.yml
     with:
diff --git a/.github/workflows/all-targets.yml b/.github/workflows/all-targets.yml
index ef880cc0c0..4068bc2576 100644
--- a/.github/workflows/all-targets.yml
+++ b/.github/workflows/all-targets.yml
@@ -25,29 +25,29 @@ jobs:
   c:
     uses: ./.github/workflows/only-c.yml
     needs: check-diff
-    if: ${{ needs.check-diff.outputs.skip_all != 'true' && (!github.event.pull_request.draft || needs.check-diff.outputs.run_c == 'true') }}
+    if: ${{ needs.check-diff.outputs.run_c == 'true' }}
 
   cpp:
     uses: ./.github/workflows/only-cpp.yml
     needs: check-diff
-    if: ${{ needs.check-diff.outputs.skip_all != 'true' && (!github.event.pull_request.draft || needs.check-diff.outputs.run_cpp == 'true') }}
+    if: ${{ needs.check-diff.outputs.run_cpp == 'true' }}
 
   py:
     uses: ./.github/workflows/only-py.yml
     needs: check-diff
-    if: ${{ needs.check-diff.outputs.skip_all != 'true' && (!github.event.pull_request.draft || needs.check-diff.outputs.run_py == 'true') }}
+    if: ${{ needs.check-diff.outputs.run_py == 'true' || needs.check-diff.outputs.run_c == 'true' }}
 
   rs:
     uses: ./.github/workflows/only-rs.yml
     needs: check-diff
-    if: ${{ needs.check-diff.outputs.skip_all != 'true' && (!github.event.pull_request.draft || needs.check-diff.outputs.run_rs == 'true') }}
+    if: ${{ needs.check-diff.outputs.run_rs == 'true' }}
 
   ts:
     uses: ./.github/workflows/only-ts.yml
     needs: check-diff
-    if: ${{ needs.check-diff.outputs.skip_all != 'true' && (!github.event.pull_request.draft || needs.check-diff.outputs.run_ts == 'true') }}
+    if: ${{ needs.check-diff.outputs.run_ts == 'true' }}
 
   serialization:
-    if: ${{ needs.check-diff.outputs.skip_all != 'true' && (!github.event.pull_request.draft || needs.check-diff.outputs.run_c == 'true' || needs.check-diff.outputs.run_py == 'true' || needs.check-diff.outputs.run_ts == 'true') }}
+    if: ${{ needs.check-diff.outputs.run_c == 'true' || needs.check-diff.outputs.run_py == 'true' || needs.check-diff.outputs.run_ts == 'true' }}
     needs: check-diff
     uses: ./.github/workflows/serialization-tests.yml
diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
index 31f0d9668b..fc3e38277f 100644
--- a/.github/workflows/check-diff.yml
+++ b/.github/workflows/check-diff.yml
@@ -3,43 +3,43 @@ name: Check diff from master
 on:
   workflow_call:
     outputs:
-      build_anyway:
-        description: 'Return true if building is still needed when skipping tests'
-        value: ${{ jobs.check.outputs.build_anyway == 1 }}
       run_c:
         description: 'Return true if C tests should be run'
-        value: ${{ jobs.check.outputs.changed_c == 1 && jobs.check.outputs.skip_all != 'true' }}
+        value: ${{ jobs.check.outputs.run_c == 'true' && jobs.check.outputs.skip != 'true' }}
       run_cpp:
         description: 'Return true if C++ tests should be run'
-        value: ${{ jobs.check.outputs.changed_cpp == 1 && jobs.check.outputs.skip_all != 'true' }}
+        value: ${{ jobs.check.outputs.run_cpp == 'true' && jobs.check.outputs.skip != 'true' }}
       run_py:
         description: 'Return true if Python tests should be run'
-        value: ${{ (jobs.check.outputs.changed_py == 1 || jobs.check.outputs.changed_c == 1) && jobs.check.outputs.skip_all != 'true' }}
+        value: ${{ jobs.check.outputs.run_py == 'true' && jobs.check.outputs.skip != 'true' }}
       run_rs:
         description: 'Return true if Rust tests should be run'
-        value: ${{ jobs.check.outputs.changed_rs == 1 && jobs.check.outputs.skip_all != 'true' }}
+        value: ${{ jobs.check.outputs.run_rs == 'true' && jobs.check.outputs.skip != 'true' }}
       run_ts:
         description: 'Return true if TypeScript tests should be run'
-        value: ${{ jobs.check.outputs.changed_ts == 1 && jobs.check.outputs.skip_all != 'true' }}
+        value: ${{ jobs.check.outputs.run_ts == 'true' && jobs.check.outputs.skip != 'true' }}
       run_tracing:
         description: 'Return true if tracing tests should be run'
-        value: ${{ jobs.check.outputs.changed_tracing == 1 && jobs.check.outputs.skip_all != 'true' }}
-      skip_all:
-        description: 'Return true if tests should not be run'
-        value: ${{ jobs.check.outputs.skip_all == 'true' }}
+        value: ${{ jobs.check.outputs.run_tracing == 'true' && jobs.check.outputs.skip != 'true' }}
+      run_build:
+        description: 'Return true if the build should be run'
+        value: ${{ jobs.check.outputs.skip != 'true' }}
+      run_misc:
+            description: 'Return true if the build should be run'
+            value: ${{ jobs.check.outputs.run_misc == 'true' && jobs.check.outputs.skip != 'true' }}
 
 jobs:
   check:
     runs-on: ubuntu-latest
     outputs:
-      build_anyway: ${{ steps.skip-ignore.outputs.changed_build }}  
-      changed_c: ${{ steps.do.outputs.changed_c }}
-      changed_cpp: ${{ steps.do.outputs.changed_cpp }}
-      changed_py: ${{ steps.do.outputs.changed_py }}
-      changed_rs: ${{ steps.do.outputs.changed_rs }}
-      changed_ts: ${{ steps.do.outputs.changed_ts }}
-      changed_tracing: ${{ steps.do.outputs.changed_tracing }}
-      skip_all: ${{ steps.duplicate.outputs.should_skip == 'true' && steps.do.outputs.changed_any == 0 }}
+      skip: ${{ steps.duplicate.outputs.should_skip == 'true' }}
+      run_c: ${{ steps.do.outputs.changed_c == 1 || !github.event.pull_request.draft }}
+      run_cpp: ${{ steps.do.outputs.changed_cpp == 1 || !github.event.pull_request.draft }}
+      run_misc: ${{ steps.do.outputs.changed_any == 1 || !github.event.pull_request.draft }}
+      run_py: ${{ steps.do.outputs.changed_py == 1 || !github.event.pull_request.draft }}
+      run_rs: ${{ steps.do.outputs.changed_rs == 1 || !github.event.pull_request.draft }}
+      run_ts: ${{ steps.do.outputs.changed_ts == 1|| !github.event.pull_request.draft }}
+      run_tracing: ${{ steps.do.outputs.changed_tracing == 1 || !github.event.pull_request.draft }}
     steps:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3
@@ -67,28 +67,27 @@ jobs:
         run: |
           echo '## Summary' > $GITHUB_STEP_SUMMARY
       - id: skip-redundant
-        name: "Explain skipping all checks due to a prior run"
+        name: "Explain skipping checks due to a prior run"
         run: |
           echo ":tada: A successful prior run has been found:" >> $GITHUB_STEP_SUMMARY
           echo "${{ steps.duplicate.outputs.skipped_by }}" >> $GITHUB_STEP_SUMMARY
-          echo ":heavy_check_mark: Skipping all tests." >> $GITHUB_STEP_SUMMARY
-        if: ${{ steps.do.outputs.skip_all == 'true' }}
+          echo ":heavy_check_mark: Skipping all tests. Only building." >> $GITHUB_STEP_SUMMARY
+        if: ${{ steps.duplicate.outputs.should_skip == 'true' }}
       - id: skip-ignore
-        name: "Explain skipping all checks due to inconsequential changes"
+        name: "Explain skipping checks due to inconsequential changes"
         run: |
-          echo "The detected changes did not affect any code." >> $GITHUB_STEP_SUMMARY
-          echo ":heavy_check_mark: Skipping tests. Only running build." >> $GITHUB_STEP_SUMMARY
-          echo "build_anyway=1" >> $GITHUB_OUTPUT
-        if: ${{ steps.do.outputs.skip_all != 'true' && steps.do.outputs.changed_any == 0 }}
+          echo ":octopus: The detected changes did not affect any code." >> $GITHUB_STEP_SUMMARY
+          echo ":heavy_check_mark: Skipping tests. Only building." >> $GITHUB_STEP_SUMMARY
+        if: ${{ steps.duplicate.outputs.should_skip != 'true' && steps.do.outputs.changed_any == 0 }}
       - id: run-some
         name: "Explain running some checks"
         run: |
-          echo ":hourglass: No successful prior run has been found." >> $GITHUB_STEP_SUMMARY
-        if: ${{ steps.do.outputs.skip_all != 'true' }}
+          echo ":octopus: No successful prior run has been found." >> $GITHUB_STEP_SUMMARY
+        if: ${{ steps.duplicate.outputs.should_skip != 'true' }}
       - id: ready-mode
         name: 'Report on full test run'
         run: |
-          echo ":heavy_check_mark: Performing all tests." >> $GITHUB_STEP_SUMMARY
+          echo ":hourglass: Performing all tests." >> $GITHUB_STEP_SUMMARY
         if: ${{ !github.event.pull_request.draft }}
       - id: draft-mode
         name: 'Report on partial test run'

From b9c75b12655c5d18fc31991eb6c32a203b89b62e Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 9 Jun 2023 13:17:36 -0700
Subject: [PATCH 0293/1114] Updated reporting

---
 .github/workflows/check-diff.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
index fc3e38277f..d5e77e757f 100644
--- a/.github/workflows/check-diff.yml
+++ b/.github/workflows/check-diff.yml
@@ -67,32 +67,32 @@ jobs:
         run: |
           echo '## Summary' > $GITHUB_STEP_SUMMARY
       - id: skip-redundant
-        name: "Explain skipping checks due to a prior run"
+        name: "Report skipping checks due to a prior run"
         run: |
           echo ":tada: A successful prior run has been found:" >> $GITHUB_STEP_SUMMARY
           echo "${{ steps.duplicate.outputs.skipped_by }}" >> $GITHUB_STEP_SUMMARY
-          echo ":heavy_check_mark: Skipping all tests. Only building." >> $GITHUB_STEP_SUMMARY
+          echo ":heavy_check_mark: Skipping all tests." >> $GITHUB_STEP_SUMMARY
         if: ${{ steps.duplicate.outputs.should_skip == 'true' }}
       - id: skip-ignore
-        name: "Explain skipping checks due to inconsequential changes"
+        name: "Report skipping checks due to inconsequential changes"
         run: |
           echo ":octopus: The detected changes did not affect any code." >> $GITHUB_STEP_SUMMARY
           echo ":heavy_check_mark: Skipping tests. Only building." >> $GITHUB_STEP_SUMMARY
         if: ${{ steps.duplicate.outputs.should_skip != 'true' && steps.do.outputs.changed_any == 0 }}
       - id: run-some
-        name: "Explain running some checks"
+        name: "Report running some checks"
         run: |
           echo ":octopus: No successful prior run has been found." >> $GITHUB_STEP_SUMMARY
-        if: ${{ steps.duplicate.outputs.should_skip != 'true' }}
-      - id: ready-mode
+          if: ${{ steps.duplicate.outputs.should_skip != 'true' && steps.do.outputs.changed_any != 0}}
+      - id: run-ready-mode
         name: 'Report on full test run'
         run: |
           echo ":hourglass: Performing all tests." >> $GITHUB_STEP_SUMMARY
-        if: ${{ !github.event.pull_request.draft }}
-      - id: draft-mode
+        if: ${{ steps.duplicate.outputs.should_skip != 'true' && steps.do.outputs.changed_any != 0 && !github.event.pull_request.draft}}
+      - id: run-draft-mode
         name: 'Report on partial test run'
         run: |
-          echo ":heavy_check_mark: Performing tests affected by detected changes." >> $GITHUB_STEP_SUMMARY
+          echo ":hourglass: Performing tests affected by detected changes." >> $GITHUB_STEP_SUMMARY
           echo '|         | running                                   |' >> $GITHUB_STEP_SUMMARY
           echo '|---------|-------------------------------------------|' >> $GITHUB_STEP_SUMMARY
           echo '| c       | `${{ steps.do.outputs.changed_c == 1 }}`       |' >> $GITHUB_STEP_SUMMARY
@@ -101,4 +101,4 @@ jobs:
           echo '| rs      | `${{ steps.do.outputs.changed_rs == 1 }}`      |' >> $GITHUB_STEP_SUMMARY
           echo '| ts      | `${{ steps.do.outputs.changed_ts == 1 }}`      |' >> $GITHUB_STEP_SUMMARY
           echo '| tracing | `${{ steps.do.outputs.changed_tracing == 1 }}` |' >> $GITHUB_STEP_SUMMARY
-        if: ${{ github.event.pull_request.draft }}
+        if: ${{ steps.duplicate.outputs.should_skip != 'true' && steps.do.outputs.changed_any != 0 && github.event.pull_request.draft}}

From d3bc1d5bd6ba4ddfabf7bd4de150587ad9c3e819 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 9 Jun 2023 13:20:34 -0700
Subject: [PATCH 0294/1114] Indentation

---
 .github/workflows/check-diff.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
index d5e77e757f..2b7cf982a7 100644
--- a/.github/workflows/check-diff.yml
+++ b/.github/workflows/check-diff.yml
@@ -83,7 +83,7 @@ jobs:
         name: "Report running some checks"
         run: |
           echo ":octopus: No successful prior run has been found." >> $GITHUB_STEP_SUMMARY
-          if: ${{ steps.duplicate.outputs.should_skip != 'true' && steps.do.outputs.changed_any != 0}}
+        if: ${{ steps.duplicate.outputs.should_skip != 'true' && steps.do.outputs.changed_any != 0}}
       - id: run-ready-mode
         name: 'Report on full test run'
         run: |

From 15222f117eb2e00f16495ea14b28fc91678c8363 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Fri, 9 Jun 2023 22:24:02 +0200
Subject: [PATCH 0295/1114] Rename lf test because of naming conflict with
 windows

---
 test/C/c/sendreceive.c             | 4 ++--
 test/C/src/no_inlining/IntPrint.lf | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/C/c/sendreceive.c b/test/C/c/sendreceive.c
index 95a08176e7..6f3698793c 100644
--- a/test/C/c/sendreceive.c
+++ b/test/C/c/sendreceive.c
@@ -4,11 +4,11 @@
 #include "../include/IntPrint/Check.h"
 #include "../include/api/set.h"
 
-void send(print_self_t* self, print_out_t* out) {
+void sender(print_self_t* self, print_out_t* out) {
     lf_set(out, 42);
 }
 
-void receive(check_self_t* self, check_in_t* in) {
+void receiver(check_self_t* self, check_in_t* in) {
     printf("Received: %d\n", in->value);
     if (in->value != self->expected) {
         printf("ERROR: Expected value to be %d.\n", self->expected);
diff --git a/test/C/src/no_inlining/IntPrint.lf b/test/C/src/no_inlining/IntPrint.lf
index fd7639d45d..cea9014124 100644
--- a/test/C/src/no_inlining/IntPrint.lf
+++ b/test/C/src/no_inlining/IntPrint.lf
@@ -6,13 +6,13 @@ target C {
 reactor Print {
   output out: int
 
-  reaction(startup) -> out named send
+  reaction(startup) -> out named sender
 }
 
 reactor Check(expected: int = 42) {  // expected parameter is for testing.
   input in: int
 
-  reaction(in) named receive
+  reaction(in) named receiver
 }
 
 main reactor {

From 9b8f8e074fe219877c31af3fda1544e0ee0aa09f Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Fri, 9 Jun 2023 22:24:15 +0200
Subject: [PATCH 0296/1114] Bump reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 97c4311392..332fe31368 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 97c4311392129079beb0e5c6d31892a77017d19b
+Subproject commit 332fe31368e766ebeeef37dc29684e87835265d3

From cf79432fa2c328e7d1ebaaee28946e71ed450b51 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 9 Jun 2023 13:30:15 -0700
Subject: [PATCH 0297/1114] Minor tweaks

---
 .github/workflows/check-diff.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
index 2b7cf982a7..2859713497 100644
--- a/.github/workflows/check-diff.yml
+++ b/.github/workflows/check-diff.yml
@@ -25,8 +25,8 @@ on:
         description: 'Return true if the build should be run'
         value: ${{ jobs.check.outputs.skip != 'true' }}
       run_misc:
-            description: 'Return true if the build should be run'
-            value: ${{ jobs.check.outputs.run_misc == 'true' && jobs.check.outputs.skip != 'true' }}
+        description: 'Return true if the build should be run'
+        value: ${{ jobs.check.outputs.run_misc == 'true' && jobs.check.outputs.skip != 'true' }}
 
 jobs:
   check:
@@ -67,7 +67,7 @@ jobs:
         run: |
           echo '## Summary' > $GITHUB_STEP_SUMMARY
       - id: skip-redundant
-        name: "Report skipping checks due to a prior run"
+        name: "Report on skipping checks (prior run found)"
         run: |
           echo ":tada: A successful prior run has been found:" >> $GITHUB_STEP_SUMMARY
           echo "${{ steps.duplicate.outputs.skipped_by }}" >> $GITHUB_STEP_SUMMARY
@@ -80,7 +80,7 @@ jobs:
           echo ":heavy_check_mark: Skipping tests. Only building." >> $GITHUB_STEP_SUMMARY
         if: ${{ steps.duplicate.outputs.should_skip != 'true' && steps.do.outputs.changed_any == 0 }}
       - id: run-some
-        name: "Report running some checks"
+        name: "Report on running checks (no prior run found)"
         run: |
           echo ":octopus: No successful prior run has been found." >> $GITHUB_STEP_SUMMARY
         if: ${{ steps.duplicate.outputs.should_skip != 'true' && steps.do.outputs.changed_any != 0}}

From 4e2c553659fee46f3c75b0c654992555d027758a Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 9 Jun 2023 13:41:12 -0700
Subject: [PATCH 0298/1114] Fix quotation problem

---
 .github/scripts/check-diff.sh    | 2 +-
 .github/workflows/check-diff.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/scripts/check-diff.sh b/.github/scripts/check-diff.sh
index 5be32c9c17..dad8d5c909 100755
--- a/.github/scripts/check-diff.sh
+++ b/.github/scripts/check-diff.sh
@@ -4,7 +4,7 @@ changes() {
   git diff --name-only HEAD $(git merge-base HEAD origin/master)
 }
 
-if changes | grep $1 | grep -q -v '^.*md\|txt$'; then
+if changes | grep "$1" | grep -q -v "^.*md\|txt$"; then
   echo "changed_$2=1" >> $GITHUB_OUTPUT
 else
   echo "changed_$2=0" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
index 2859713497..5e933733f0 100644
--- a/.github/workflows/check-diff.yml
+++ b/.github/workflows/check-diff.yml
@@ -59,7 +59,7 @@ jobs:
           ./check-diff.sh "lflang/generator/rust\|resources/lib/rs\|test/Rust" rs
           ./check-diff.sh "lflang/generator/ts\|resources/lib/ts\|test/TypeScript" ts
           ./check-diff.sh "util/tracing" tracing
-          ./check-diff.sh "" any
+          ./check-diff.sh ".*" any
         shell: bash
         working-directory: .github/scripts
       - id: summarize

From 1761d9cc49f8a4faeea088b24eb43f2c603b16bc Mon Sep 17 00:00:00 2001
From: ChadliaJerad <chadlia.jerad@gmail.com>
Date: Fri, 9 Jun 2023 13:47:32 -0700
Subject: [PATCH 0299/1114] Fix for #1834

---
 util/tracing/visualization/fedsd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/tracing/visualization/fedsd.py b/util/tracing/visualization/fedsd.py
index 3eb13d11bc..6cf866fb37 100644
--- a/util/tracing/visualization/fedsd.py
+++ b/util/tracing/visualization/fedsd.py
@@ -134,7 +134,7 @@ def load_and_process_csv_file(csv_file) :
                 x_coor[fed_id] = (padding * 2) + (spacing * (len(actors)-1))
                 fed_df['x1'] = x_coor[fed_id]
                 # Append into trace_df
-                trace_df = trace_df.append(fed_df, sort=False, ignore_index=True)
+                trace_df = pd.concat([trace_df, fed_df])
                 fed_df = fed_df[0:0]
     
     # Sort all traces by physical time and then reset the index

From a33e13590be0c2d1be30e88b6fb7866979f79ca0 Mon Sep 17 00:00:00 2001
From: ChadliaJerad <chadlia.jerad@gmail.com>
Date: Fri, 9 Jun 2023 14:02:16 -0700
Subject: [PATCH 0300/1114] Remove no more relevant FIXMEs

---
 util/tracing/visualization/fedsd.py | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/util/tracing/visualization/fedsd.py b/util/tracing/visualization/fedsd.py
index 6cf866fb37..76addcd15a 100644
--- a/util/tracing/visualization/fedsd.py
+++ b/util/tracing/visualization/fedsd.py
@@ -51,15 +51,6 @@
                     help='List of the federates csv trace files.')
 
 
-''' Clock synchronization error '''
-''' FIXME: There should be a value for each communicating pair '''
-clock_sync_error = 0
-
-''' Bound on the network latency '''
-''' FIXME: There should be a value for each communicating pair '''
-network_latency = 100000000 # That is 100us
-
-
 def load_and_process_csv_file(csv_file) :
     '''
     Loads and processes the csv entries, based on the type of the actor (if RTI
@@ -141,11 +132,6 @@ def load_and_process_csv_file(csv_file) :
     trace_df = trace_df.sort_values(by=['physical_time'])
     trace_df = trace_df.reset_index(drop=True)
 
-    # FIXME: For now, we need to remove the rows with negative physical time values...
-    # Until the reason behinf such values is investigated. The negative physical
-    # time is when federates are still in the process of joining
-    # trace_df = trace_df[trace_df['physical_time'] >= 0]
-
     # Add the Y column and initialize it with the padding value 
     trace_df['y1'] = math.ceil(padding * 3 / 2) # Or set a small shift
 
@@ -213,9 +199,7 @@ def load_and_process_csv_file(csv_file) :
                 trace_df.loc[index, 'arrow'] = 'dot'
             else:
                 # If there is one or more matching rows, then consider 
-                # the first one, since it is an out -> in arrow, and  
-                # since it is the closet in time
-                # FIXME: What other possible choices to consider?
+                # the first one
                 if (inout == 'out'):
                     matching_index = matching_df.index[0]
                     matching_row = matching_df.loc[matching_index]

From c749a39254561a90c5037d7ca4471497faa03aaf Mon Sep 17 00:00:00 2001
From: ChadliaJerad <chadlia.jerad@gmail.com>
Date: Fri, 9 Jun 2023 14:29:31 -0700
Subject: [PATCH 0301/1114] fedsd: Add support for physical connections
 matching

---
 util/tracing/visualization/fedsd.py | 35 +++++++++++++++++++----------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/util/tracing/visualization/fedsd.py b/util/tracing/visualization/fedsd.py
index 76addcd15a..2866f9cfdf 100644
--- a/util/tracing/visualization/fedsd.py
+++ b/util/tracing/visualization/fedsd.py
@@ -50,6 +50,10 @@
 parser.add_argument('-f','--federates', nargs='+', action='append',
                     help='List of the federates csv trace files.')
 
+# Events matching at the sender and receiver ends depend on whether they are tagged
+# (the elapsed logical time and microstep have to be the same) or not. 
+# Set of tagged events (messages)
+non_tagged_messages = {'FED_ID', 'ACK', 'REJECT', 'ADR_RQ', 'ADR_AD', 'MSG', 'P2P_MSG'}
 
 def load_and_process_csv_file(csv_file) :
     '''
@@ -183,15 +187,25 @@ def load_and_process_csv_file(csv_file) :
             inout = trace_df.at[index, 'inout']
 
             # Match tracepoints
-            matching_df = trace_df[\
-                (trace_df['inout'] != inout) & \
-                (trace_df['self_id'] == partner_id) & \
-                (trace_df['partner_id'] == self_id) & \
-                (trace_df['arrow'] == 'pending') & \
-                (trace_df['event'] == event) & \
-                (trace_df['logical_time'] == logical_time) & \
-                (trace_df['microstep'] == microstep) \
-            ]
+            # Depends on whether the event is tagged or not
+            if (trace_df.at[index,'event'] not in non_tagged_messages):
+                matching_df = trace_df[\
+                    (trace_df['inout'] != inout) & \
+                    (trace_df['self_id'] == partner_id) & \
+                    (trace_df['partner_id'] == self_id) & \
+                    (trace_df['arrow'] == 'pending') & \
+                    (trace_df['event'] == event) & \
+                    (trace_df['logical_time'] == logical_time) & \
+                    (trace_df['microstep'] == microstep) \
+                ]
+            else :
+                matching_df = trace_df[\
+                    (trace_df['inout'] != inout) & \
+                    (trace_df['self_id'] == partner_id) & \
+                    (trace_df['partner_id'] == self_id) & \
+                    (trace_df['arrow'] == 'pending') & \
+                    (trace_df['event'] == event)
+                ]
 
             if (matching_df.empty) :
                 # If no matching receiver, than set the arrow to 'dot',
@@ -261,9 +275,6 @@ def load_and_process_csv_file(csv_file) :
 
             if (row['event'] in {'FED_ID', 'ACK', 'REJECT', 'ADR_RQ', 'ADR_AD', 'MSG', 'P2P_MSG'}):
                 label = row['event']
-            elif (row['logical_time'] == -1678240241788173894) :
-                # FIXME: This isn't right.  NEVER == -9223372036854775808.
-                label = row['event'] + '(NEVER)'
             else:
                 label = row['event'] + '(' + f'{int(row["logical_time"]):,}' + ', ' + str(row['microstep']) + ')'
             

From 6fd493b090c7abffd1ff81d3413fbf0b1d174252 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 9 Jun 2023 14:55:19 -0700
Subject: [PATCH 0302/1114] Do not skip checks upon ready_for_review event

---
 .github/workflows/check-diff.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
index 5e933733f0..32c8dc4b20 100644
--- a/.github/workflows/check-diff.yml
+++ b/.github/workflows/check-diff.yml
@@ -66,29 +66,33 @@ jobs:
         name: "Create summary"
         run: |
           echo '## Summary' > $GITHUB_STEP_SUMMARY
+      - id: should-skip
+        name: "Determine whether to skip checks"
+        run: |
+          echo "skip=${{ steps.duplicate.outputs.should_skip == 'true' && github.event.action != 'ready_for_review' }}" >> $GITHUB_OUTPUT
       - id: skip-redundant
         name: "Report on skipping checks (prior run found)"
         run: |
           echo ":tada: A successful prior run has been found:" >> $GITHUB_STEP_SUMMARY
           echo "${{ steps.duplicate.outputs.skipped_by }}" >> $GITHUB_STEP_SUMMARY
           echo ":heavy_check_mark: Skipping all tests." >> $GITHUB_STEP_SUMMARY
-        if: ${{ steps.duplicate.outputs.should_skip == 'true' }}
+        if: ${{ steps.should-skip.outputs.skip == 'true' }}
       - id: skip-ignore
         name: "Report skipping checks due to inconsequential changes"
         run: |
           echo ":octopus: The detected changes did not affect any code." >> $GITHUB_STEP_SUMMARY
           echo ":heavy_check_mark: Skipping tests. Only building." >> $GITHUB_STEP_SUMMARY
-        if: ${{ steps.duplicate.outputs.should_skip != 'true' && steps.do.outputs.changed_any == 0 }}
+        if: ${{ steps.should-skip.outputs.skip != 'true' && steps.do.outputs.changed_any == 0 }}
       - id: run-some
         name: "Report on running checks (no prior run found)"
         run: |
           echo ":octopus: No successful prior run has been found." >> $GITHUB_STEP_SUMMARY
-        if: ${{ steps.duplicate.outputs.should_skip != 'true' && steps.do.outputs.changed_any != 0}}
+        if: ${{ steps.should-skip.outputs.skip != 'true' && steps.do.outputs.changed_any != 0}}
       - id: run-ready-mode
         name: 'Report on full test run'
         run: |
           echo ":hourglass: Performing all tests." >> $GITHUB_STEP_SUMMARY
-        if: ${{ steps.duplicate.outputs.should_skip != 'true' && steps.do.outputs.changed_any != 0 && !github.event.pull_request.draft}}
+        if: ${{ steps.should-skip.outputs.skip != 'true' && steps.do.outputs.changed_any != 0 && !github.event.pull_request.draft}}
       - id: run-draft-mode
         name: 'Report on partial test run'
         run: |
@@ -101,4 +105,4 @@ jobs:
           echo '| rs      | `${{ steps.do.outputs.changed_rs == 1 }}`      |' >> $GITHUB_STEP_SUMMARY
           echo '| ts      | `${{ steps.do.outputs.changed_ts == 1 }}`      |' >> $GITHUB_STEP_SUMMARY
           echo '| tracing | `${{ steps.do.outputs.changed_tracing == 1 }}` |' >> $GITHUB_STEP_SUMMARY
-        if: ${{ steps.duplicate.outputs.should_skip != 'true' && steps.do.outputs.changed_any != 0 && github.event.pull_request.draft}}
+        if: ${{ steps.should-skip.outputs.skip != 'true' && steps.do.outputs.changed_any != 0 && github.event.pull_request.draft}}

From b26c80188c2b2a2b0d2296e6c374643dd951bf89 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 9 Jun 2023 14:57:50 -0700
Subject: [PATCH 0303/1114] Bugfix

---
 .github/workflows/check-diff.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
index 32c8dc4b20..f122db7d3c 100644
--- a/.github/workflows/check-diff.yml
+++ b/.github/workflows/check-diff.yml
@@ -32,7 +32,7 @@ jobs:
   check:
     runs-on: ubuntu-latest
     outputs:
-      skip: ${{ steps.duplicate.outputs.should_skip == 'true' }}
+      skip: ${{ steps.should-skip.outputs.skip == 'true' }}
       run_c: ${{ steps.do.outputs.changed_c == 1 || !github.event.pull_request.draft }}
       run_cpp: ${{ steps.do.outputs.changed_cpp == 1 || !github.event.pull_request.draft }}
       run_misc: ${{ steps.do.outputs.changed_any == 1 || !github.event.pull_request.draft }}

From 3ae866bbc437c1fa31d7eada20b7e7f17b28e84c Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 9 Jun 2023 15:03:58 -0700
Subject: [PATCH 0304/1114] Wording

---
 .github/workflows/check-diff.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
index f122db7d3c..f455692275 100644
--- a/.github/workflows/check-diff.yml
+++ b/.github/workflows/check-diff.yml
@@ -96,7 +96,7 @@ jobs:
       - id: run-draft-mode
         name: 'Report on partial test run'
         run: |
-          echo ":hourglass: Performing tests affected by detected changes." >> $GITHUB_STEP_SUMMARY
+          echo ":hourglass: Performing tests potentially affected by detected changes." >> $GITHUB_STEP_SUMMARY
           echo '|         | running                                   |' >> $GITHUB_STEP_SUMMARY
           echo '|---------|-------------------------------------------|' >> $GITHUB_STEP_SUMMARY
           echo '| c       | `${{ steps.do.outputs.changed_c == 1 }}`       |' >> $GITHUB_STEP_SUMMARY

From bef6a1419fdf0eebc550cf6996a1e6a289e5a5ee Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 9 Jun 2023 15:17:17 -0700
Subject: [PATCH 0305/1114] Wording

---
 .github/workflows/check-diff.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
index f455692275..55f5f404e8 100644
--- a/.github/workflows/check-diff.yml
+++ b/.github/workflows/check-diff.yml
@@ -86,7 +86,7 @@ jobs:
       - id: run-some
         name: "Report on running checks (no prior run found)"
         run: |
-          echo ":octopus: No successful prior run has been found." >> $GITHUB_STEP_SUMMARY
+          echo ":octopus: No (complete) successful prior run has been found." >> $GITHUB_STEP_SUMMARY
         if: ${{ steps.should-skip.outputs.skip != 'true' && steps.do.outputs.changed_any != 0}}
       - id: run-ready-mode
         name: 'Report on full test run'

From f7a8c017bf816c927d8e8ea52a00c90ec0c1099f Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 9 Jun 2023 16:23:10 -0700
Subject: [PATCH 0306/1114] Point to main branch for benchmarks

---
 .github/workflows/only-c.yml   | 2 +-
 .github/workflows/only-cpp.yml | 2 +-
 .github/workflows/only-rs.yml  | 2 +-
 .github/workflows/only-ts.yml  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/only-c.yml b/.github/workflows/only-c.yml
index 2d12dd9da8..9b457b6d01 100644
--- a/.github/workflows/only-c.yml
+++ b/.github/workflows/only-c.yml
@@ -21,7 +21,7 @@ jobs:
 
   # Run the C benchmark tests.
   benchmarking:
-    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@gradle
+    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
     with:
       target: "C"
 
diff --git a/.github/workflows/only-cpp.yml b/.github/workflows/only-cpp.yml
index fdac226930..b30f079657 100644
--- a/.github/workflows/only-cpp.yml
+++ b/.github/workflows/only-cpp.yml
@@ -15,7 +15,7 @@ concurrency:
 jobs:
   # Run the C++ benchmark tests.
   cpp-benchmark-tests:
-    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@gradle
+    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
     with:
       target: "Cpp"
 
diff --git a/.github/workflows/only-rs.yml b/.github/workflows/only-rs.yml
index ef3f31e7d9..149978d820 100644
--- a/.github/workflows/only-rs.yml
+++ b/.github/workflows/only-rs.yml
@@ -21,6 +21,6 @@ jobs:
 
   # Run the Rust benchmark tests.
   rs-benchmark-tests:
-    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@gradle
+    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
     with:
       target: "Rust"
diff --git a/.github/workflows/only-ts.yml b/.github/workflows/only-ts.yml
index 131c06ab17..0059a4ec49 100644
--- a/.github/workflows/only-ts.yml
+++ b/.github/workflows/only-ts.yml
@@ -15,7 +15,7 @@ concurrency:
 jobs:
   # Run the TypeScript benchmark tests.
   benchmarking:
-    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@gradle
+    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
     with:
       target: "TS"
 

From ec8513d9ed152097f649642066af559cd1631412 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 9 Jun 2023 16:57:33 -0700
Subject: [PATCH 0307/1114] Start implementing code generation of indexers.

It is necessary to index into elements of a multiport. This is one way
to do that. This change is still incomplete.
---
 .../federated/generator/FedASTUtils.java      | 14 +++--
 .../federated/generator/FedGenerator.java     | 63 +++++++++++++++++++
 .../federated/generator/FedMainEmitter.java   |  7 ++-
 .../federated/generator/FederateInstance.java |  5 ++
 4 files changed, 83 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 2da640fa27..fde1a32eaf 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -206,6 +206,15 @@ private static Action createNetworkAction(FedConnectionInstance connection) {
     return action;
   }
 
+  /** Add a reactor definition with the given name to the given resource and return it. */
+  public static Reactor addReactorDefinition(String name, Resource resource) {
+    var reactor = LfFactory.eINSTANCE.createReactor();
+    reactor.setName(name);
+    EObject node = IteratorExtensions.findFirst(resource.getAllContents(), Model.class::isInstance);
+    ((Model) node).getReactors().add(reactor);
+    return reactor;
+  }
+
   /**
    * Add a network receiver reactor for a given input port 'destination' to destination's parent
    * reactor. This reaction will react to a generated 'networkAction' (triggered asynchronously,
@@ -230,7 +239,7 @@ private static void addNetworkReceiverReactor(
     VarRef instRef = factory.createVarRef(); // instantiation connection
     VarRef destRef = factory.createVarRef(); // destination connection
 
-    Reactor receiver = factory.createReactor();
+    Reactor receiver = addReactorDefinition("NetworkReceiver_" + networkIDReceiver++, resource);
     Reaction networkReceiverReaction = factory.createReaction();
 
     Output out = factory.createOutput();
@@ -247,9 +256,6 @@ private static void addNetworkReceiverReactor(
 
     receiver.getReactions().add(networkReceiverReaction);
     receiver.getOutputs().add(out);
-    EObject node = IteratorExtensions.findFirst(resource.getAllContents(), Model.class::isInstance);
-    ((Model) node).getReactors().add(receiver);
-    receiver.setName("NetworkReceiver_" + networkIDReceiver++);
     // networkReceiverReaction.setName("NetworkReceiverReaction_" + networkIDReceiver++);
 
     networkInstance.setReactorClass(receiver);
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 4b369dfbda..17839eaa4b 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -51,9 +51,11 @@
 import org.lflang.generator.SendRange;
 import org.lflang.generator.SubContext;
 import org.lflang.lf.Expression;
+import org.lflang.lf.Input;
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.Reactor;
+import org.lflang.lf.VarRef;
 import org.lflang.util.Averager;
 
 public class FedGenerator {
@@ -484,6 +486,8 @@ private void replaceFederateConnectionsWithProxies(Reactor federation, Resource
     // that those contain.
     ReactorInstance mainInstance = new ReactorInstance(federation, errorReporter);
 
+    insertIndexers(mainInstance, resource);
+
     for (ReactorInstance child : mainInstance.children) {
       for (PortInstance output : child.outputs) {
         replaceConnectionFromOutputPort(output, resource);
@@ -498,6 +502,65 @@ private void replaceFederateConnectionsWithProxies(Reactor federation, Resource
     mainInstance.clearCaches(false);
   }
 
+  /**
+   * Insert reactors that split a multiport into many ports. This is necessary in order to index
+   * into specific entries of a multiport.
+   */
+  private void insertIndexers(ReactorInstance mainInstance, Resource resource) {
+    for (ReactorInstance child : mainInstance.children) {
+      for (PortInstance input : child.inputs) {
+        var indexer = indexer(child, input, resource);
+        var count = 0;
+        for (FederateInstance federate : federatesByInstantiation.get(child.getDefinition())) {
+          var outerConnection = LfFactory.eINSTANCE.createConnection();
+          var instantiation = LfFactory.eINSTANCE.createInstantiation();
+          instantiation.setReactorClass(indexer);
+          instantiation.setName(indexer.getName() + count++);
+          federate.networkHelperInstantiations.add(instantiation);
+          outerConnection.getLeftPorts().add(varRefOf(instantiation, "port"));
+          outerConnection.getRightPorts().add(varRefOf(child.getDefinition(), input.getName()));
+          federate.networkConnections.add(outerConnection);
+        }
+      }
+    }
+  }
+
+  /**
+   * Add an {@code indexer} to the model and return it. An indexer is a reactor that is an adapter
+   * from many ports to just one port
+   */
+  private Reactor indexer(ReactorInstance reactorInstance, PortInstance input, Resource resource) {
+    var indexer =
+        FedASTUtils.addReactorDefinition(
+            "_" + reactorInstance.getName() + input.getName(), resource);
+    var output = LfFactory.eINSTANCE.createOutput();
+    output.setName("port");
+    indexer.getOutputs().add(output);
+    for (int i = 0; i < (input.isMultiport() ? input.getWidth() : 1); i++) {
+      var splitInput = LfFactory.eINSTANCE.createInput();
+      splitInput.setName("port" + i);
+      indexer.getInputs().add(splitInput);
+    }
+    var innerConnection = LfFactory.eINSTANCE.createConnection();
+    indexer.getInputs().stream()
+        .map(Input::getName)
+        .map(it -> FedGenerator.varRefOf(null, it))
+        .forEach(innerConnection.getLeftPorts()::add);
+    innerConnection.getRightPorts().add(varRefOf(null, output.getName()));
+    indexer.getConnections().add(innerConnection);
+    return indexer;
+  }
+
+  /** Return a {@code VarRef} with the given name. */
+  private static VarRef varRefOf(Instantiation container, String name) {
+    var varRef = LfFactory.eINSTANCE.createVarRef();
+    var variable = LfFactory.eINSTANCE.createVariable();
+    variable.setName(name);
+    varRef.setVariable(variable);
+    varRef.setContainer(container);
+    return varRef;
+  }
+
   /**
    * Replace the connections from the specified output port.
    *
diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index ecedc3b583..3fb1b87fd4 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -64,8 +64,11 @@ String generateMainReactor(
                     .map(renderer)
                     .collect(Collectors.joining("\n")),
                 federate.networkReceiverInstantiations.stream()
-                    .map(renderer)
-                    .collect(Collectors.joining("\n")),
+                        .map(renderer)
+                        .collect(Collectors.joining("\n")),
+                federate.networkHelperInstantiations.stream()
+                        .map(renderer)
+                        .collect(Collectors.joining("\n")),
                 federate.networkConnections.stream()
                     .map(renderer)
                     .collect(Collectors.joining("\n")))
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index ed6a4c7d42..5a9171c4e9 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -261,6 +261,11 @@ public Instantiation getInstantiation() {
    */
   public List<Instantiation> networkReceiverInstantiations = new ArrayList<>();
 
+  /**
+   * List of generated instantiations that serve as helpers for forming the network connections.
+   */
+  public List<Instantiation> networkHelperInstantiations = new ArrayList<>();
+
   /** Parsed target config of the federate. */
   public TargetConfig targetConfig;
 

From 43a0543f680e34e24b4c8526911ec48f1629ded9 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 10 Jun 2023 17:27:36 -0700
Subject: [PATCH 0308/1114] Fix comment duplication issue.

---
 core/src/main/java/org/lflang/ast/ToLf.java | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 9505c57478..4066dfd3bc 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -111,7 +111,9 @@ public MalleableString doSwitch(EObject eObject) {
     var ancestorComments = getAncestorComments(node);
     Predicate<INode> doesNotBelongToAncestor = n -> !ancestorComments.contains(n);
     List<String> followingComments =
-        getFollowingComments(node, ASTUtils.sameLine(node).and(doesNotBelongToAncestor)).toList();
+        getFollowingComments(
+                node, ASTUtils.sameLine(node).and(doesNotBelongToAncestor), doesNotBelongToAncestor)
+            .toList();
     var previous = getNextCompositeSibling(node, INode::getPreviousSibling);
     Predicate<INode> doesNotBelongToPrevious =
         doesNotBelongToAncestor.and(
@@ -174,12 +176,17 @@ private static Stream<INode> getFollowingNonCompositeSiblings(ICompositeNode nod
    * Return comments that follow {@code node} in the source code and that either satisfy {@code
    * filter} or that cannot belong to any following sibling of {@code node}.
    */
-  private static Stream<String> getFollowingComments(ICompositeNode node, Predicate<INode> filter) {
+  private static Stream<String> getFollowingComments(
+      ICompositeNode node, Predicate<INode> precedingFilter, Predicate<INode> followingFilter) {
     ICompositeNode sibling = getNextCompositeSibling(node, INode::getNextSibling);
     Stream<String> followingSiblingComments =
-        getFollowingNonCompositeSiblings(node).filter(ASTUtils::isComment).map(INode::getText);
+        getFollowingNonCompositeSiblings(node)
+            .filter(ASTUtils::isComment)
+            .filter(followingFilter)
+            .map(INode::getText);
     if (sibling == null) return followingSiblingComments;
-    return Stream.concat(followingSiblingComments, ASTUtils.getPrecedingComments(sibling, filter));
+    return Stream.concat(
+        followingSiblingComments, ASTUtils.getPrecedingComments(sibling, precedingFilter));
   }
 
   /**

From a0ffd9c6853de503d135385ffd32cd403bdc3f4f Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 10 Jun 2023 17:59:42 -0700
Subject: [PATCH 0309/1114] Do not destructively modify Ecore model.

---
 core/src/main/java/org/lflang/ast/ToLf.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 4066dfd3bc..7748c1909b 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -908,7 +908,7 @@ private MalleableString initializer(Initializer init) {
       // This turns C array initializers into a braced expression.
       // C++ variants are not converted.
       BracedListExpression list = LfFactory.eINSTANCE.createBracedListExpression();
-      list.getItems().addAll(init.getExprs());
+      init.getExprs().forEach(it -> list.getItems().add(it));
       return new Builder().append(" = ").append(doSwitch(list)).get();
     }
     String prefix;

From 8a663c4fde984899d34a1bff6934d6b36dcd1629 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 10 Jun 2023 19:22:04 -0700
Subject: [PATCH 0310/1114] Do not skip doSwitch.

doSwitch is what finds the comments. If you skip doSwitch and call
directly into the code that is specific to the given EObject, you will
drop comments.
---
 core/src/main/java/org/lflang/ast/ToLf.java | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 7748c1909b..693a81eb3b 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -488,7 +488,7 @@ public MalleableString caseStateVar(StateVar object) {
     }
     msb.append("state ").append(object.getName());
     msb.append(typeAnnotationFor(object.getType()));
-    msb.append(initializer(object.getInit()));
+    msb.append(doSwitch(object.getInit()));
 
     return msb.get();
   }
@@ -877,15 +877,10 @@ public MalleableString caseAssignment(Assignment object) {
     // ));
     Builder msb = new Builder();
     msb.append(object.getLhs().getName());
-    msb.append(initializer(object.getRhs()));
+    msb.append(doSwitch(object.getRhs()));
     return msb.get();
   }
 
-  @Override
-  public MalleableString caseInitializer(Initializer object) {
-    return initializer(object);
-  }
-
   /**
    * Return true if the initializer should be output with an equals initializer. Old-style
    * assignments with parentheses are also output that way to help with the transition.
@@ -895,7 +890,8 @@ private boolean shouldOutputAsAssignment(Initializer init) {
         || init.getExprs().size() == 1 && ASTUtils.getTarget(init).mandatesEqualsInitializers();
   }
 
-  private MalleableString initializer(Initializer init) {
+  @Override
+  public MalleableString caseInitializer(Initializer init) {
     if (init == null) {
       return MalleableString.anyOf("");
     }
@@ -935,7 +931,7 @@ public MalleableString caseParameter(Parameter object) {
     return builder
         .append(object.getName())
         .append(typeAnnotationFor(object.getType()))
-        .append(initializer(object.getInit()))
+        .append(doSwitch(object.getInit()))
         .get();
   }
 

From b24c0f907c159276ade06480b08fd613e39b4fe3 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 10 Jun 2023 23:11:59 -0700
Subject: [PATCH 0311/1114] Try again to fix destructive reads of init list.

---
 core/src/main/java/org/lflang/ast/ToLf.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 693a81eb3b..8899642956 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -904,7 +904,11 @@ public MalleableString caseInitializer(Initializer init) {
       // This turns C array initializers into a braced expression.
       // C++ variants are not converted.
       BracedListExpression list = LfFactory.eINSTANCE.createBracedListExpression();
-      init.getExprs().forEach(it -> list.getItems().add(it));
+      var list2 = new ArrayList<Expression>();
+      for (var expr : init.getExprs()) {
+        list2.add(expr);
+      }
+      list.getItems().addAll(list2);
       return new Builder().append(" = ").append(doSwitch(list)).get();
     }
     String prefix;

From a7588fb4bce1117457cb3680c1915af1fb67fbee Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 10 Jun 2023 23:46:57 -0700
Subject: [PATCH 0312/1114] Fix NPE.

---
 core/src/main/java/org/lflang/ast/ToLf.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 8899642956..d0de40a650 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -488,7 +488,7 @@ public MalleableString caseStateVar(StateVar object) {
     }
     msb.append("state ").append(object.getName());
     msb.append(typeAnnotationFor(object.getType()));
-    msb.append(doSwitch(object.getInit()));
+    if (object.getInit() != null) msb.append(doSwitch(object.getInit()));
 
     return msb.get();
   }

From 9be69551581073a41874be23e76ce87bf2bfc705 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 10 Jun 2023 23:47:55 -0700
Subject: [PATCH 0313/1114] Really fix the destructive copying this time.

There is some black magic happening in the implementation of EList::add
that removes EObjects from their containers when they are added to a new
container. This works around that by just not adding the EObjects to a
container.
---
 core/src/main/java/org/lflang/ast/ToLf.java | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index d0de40a650..9ca4c124dc 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -47,7 +47,6 @@
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
-import org.lflang.lf.LfFactory;
 import org.lflang.lf.Literal;
 import org.lflang.lf.Method;
 import org.lflang.lf.MethodArgument;
@@ -818,9 +817,17 @@ public MalleableString caseBracedListExpression(BracedListExpression object) {
     if (object.getItems().isEmpty()) {
       return MalleableString.anyOf("{}");
     }
+    return bracedListExpression(object.getItems());
+  }
+
+  /**
+   * Represent a braced list expression. Do not invoke on expressions that may have comments
+   * attached.
+   */
+  private MalleableString bracedListExpression(List<Expression> items) {
     // Note that this strips the trailing comma. There is no way
     // to implement trailing commas with the current set of list() methods AFAIU.
-    return list(", ", "{", "}", false, false, object.getItems());
+    return list(", ", "{", "}", false, false, items);
   }
 
   @Override
@@ -903,13 +910,7 @@ public MalleableString caseInitializer(Initializer init) {
     if (ASTUtils.getTarget(init) == Target.C) {
       // This turns C array initializers into a braced expression.
       // C++ variants are not converted.
-      BracedListExpression list = LfFactory.eINSTANCE.createBracedListExpression();
-      var list2 = new ArrayList<Expression>();
-      for (var expr : init.getExprs()) {
-        list2.add(expr);
-      }
-      list.getItems().addAll(list2);
-      return new Builder().append(" = ").append(doSwitch(list)).get();
+      return new Builder().append(" = ").append(bracedListExpression(init.getExprs())).get();
     }
     String prefix;
     String suffix;

From fb2ed8a8be5f6744c8c63e9e86c211ff8510c6e0 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 12 Jun 2023 15:14:52 +0200
Subject: [PATCH 0314/1114] Fix ROS2 test configuration

---
 .../org/lflang/tests/runtime/CppRos2Test.java |  6 +++--
 .../main/java/org/lflang/ast/ASTUtils.java    | 22 -------------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
index dc2612c14b..4b0dc28cec 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
@@ -3,7 +3,6 @@
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.lflang.Target;
-import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.LfFactory;
 import org.lflang.tests.TestBase;
@@ -30,7 +29,10 @@ public void runWithRos2() {
     runTestsForTargets(
         Message.DESC_ROS2,
         it -> true,
-        it -> ASTUtils.addTargetProperty(it.getFileConfig().resource, "ros2", trueLiteral),
+        it -> {
+          it.getContext().getTargetConfig().ros2 = true;
+          return true;
+        },
         TestLevel.EXECUTION,
         true);
   }
diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 60b5538372..4489b1523b 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -265,28 +265,6 @@ public static Target getTarget(EObject object) {
     return Target.fromDecl(targetDecl);
   }
 
-  /**
-   * Add a new target property to the given resource. This also creates a config object if the
-   * resource does not yey have one.
-   *
-   * @param resource The resource to modify
-   * @param name Name of the property to add
-   * @param value Value to be assigned to the property
-   */
-  public static boolean addTargetProperty(
-      final Resource resource, final String name, final Element value) {
-    var config = targetDecl(resource).getConfig();
-    if (config == null) {
-      config = LfFactory.eINSTANCE.createKeyValuePairs();
-      targetDecl(resource).setConfig(config);
-    }
-    final var newProperty = LfFactory.eINSTANCE.createKeyValuePair();
-    newProperty.setName(name);
-    newProperty.setValue(value);
-    config.getPairs().add(newProperty);
-    return true;
-  }
-
   /**
    * Return true if the connection involves multiple ports on the left or right side of the
    * connection, or if the port on the left or right of the connection involves a bank of reactors

From b88e1916d6015871b1bd3937c8d157e1c004a031 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Sun, 11 Jun 2023 12:38:13 +0200
Subject: [PATCH 0315/1114] fix ROS2 compilation

---
 .../kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
index 22e3c3045a..f3fac39e42 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
@@ -79,7 +79,7 @@ class CppRos2NodeGenerator(
             |}
             |
             |$nodeName::~$nodeName() {
-            |  if (lf_env->phase() == reactor::Environment::Phase::Execution) { 
+            |  if (lf_env->phase() == reactor::Phase::Execution) {
             |    lf_env->async_shutdown();
             |  }
             |  lf_shutdown_thread.join();

From 9783074acba6cc6c5d89af3d3d4f456778865d10 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 12 Jun 2023 15:55:00 +0200
Subject: [PATCH 0316/1114] also pass cmake arguments in ros2 compilation

---
 .../org/lflang/generator/cpp/CppPlatformGenerator.kt   | 10 ++++++++++
 .../org/lflang/generator/cpp/CppRos2Generator.kt       |  3 +--
 .../org/lflang/generator/cpp/CppStandaloneGenerator.kt |  9 ++-------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
index 102657522b..09296cfe36 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
@@ -22,4 +22,14 @@ abstract class CppPlatformGenerator(protected val generator: CppGenerator) {
     abstract fun generatePlatformFiles()
 
     abstract fun doCompile(context: LFGeneratorContext, onlyGenerateBuildFiles: Boolean = false): Boolean
+
+    protected val cmakeArgs: List<String>
+        get() = listOf(
+            "-DCMAKE_BUILD_TYPE=${targetConfig.cmakeBuildType}",
+            "-DREACTOR_CPP_VALIDATE=${if (targetConfig.noRuntimeValidation) "OFF" else "ON"}",
+            "-DREACTOR_CPP_PRINT_STATISTICS=${if (targetConfig.printStatistics) "ON" else "OFF"}",
+            "-DREACTOR_CPP_TRACE=${if (targetConfig.tracing != null) "ON" else "OFF"}",
+            "-DREACTOR_CPP_LOG_LEVEL=${targetConfig.logLevel.severity}",
+            "-DLF_SRC_PKG_PATH=${fileConfig.srcPkgPath}",
+        )
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt
index a689a53c88..17c2c70315 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt
@@ -54,8 +54,7 @@ class CppRos2Generator(generator: CppGenerator) : CppPlatformGenerator(generator
                 packageGenerator.reactorCppName,
                 "--cmake-args",
                 "-DLF_REACTOR_CPP_SUFFIX=${packageGenerator.reactorCppSuffix}",
-                "-DLF_SRC_PKG_PATH=${fileConfig.srcPkgPath}"
-            ),
+            ) + cmakeArgs,
             fileConfig.outPath
         )
         val returnCode = colconCommand?.run(context.cancelIndicator);
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
index f307559d9e..8e6e60227a 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
@@ -160,15 +160,10 @@ class CppStandaloneGenerator(generator: CppGenerator) :
 
     private fun createCmakeCommand(buildPath: Path, outPath: Path): LFCommand {
         val cmd = commandFactory.createCommand(
-            "cmake", listOf(
-                "-DCMAKE_BUILD_TYPE=${targetConfig.cmakeBuildType}",
+            "cmake",
+            cmakeArgs + listOf(
                 "-DCMAKE_INSTALL_PREFIX=${outPath.toUnixString()}",
                 "-DCMAKE_INSTALL_BINDIR=${outPath.relativize(fileConfig.binPath).toUnixString()}",
-                "-DREACTOR_CPP_VALIDATE=${if (targetConfig.noRuntimeValidation) "OFF" else "ON"}",
-                "-DREACTOR_CPP_PRINT_STATISTICS=${if (targetConfig.printStatistics) "ON" else "OFF"}",
-                "-DREACTOR_CPP_TRACE=${if (targetConfig.tracing != null) "ON" else "OFF"}",
-                "-DREACTOR_CPP_LOG_LEVEL=${targetConfig.logLevel.severity}",
-                "-DLF_SRC_PKG_PATH=${fileConfig.srcPkgPath}",
                 fileConfig.srcGenBasePath.toUnixString()
             ),
             buildPath

From 23534c7f876b39309fc6f47e4e0d57e80e4b23fc Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 12 Jun 2023 16:07:22 +0200
Subject: [PATCH 0317/1114] also clean the install directory

---
 core/src/main/kotlin/org/lflang/generator/cpp/CppFileConfig.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppFileConfig.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppFileConfig.kt
index ec4ad15713..42a5e0ab10 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppFileConfig.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppFileConfig.kt
@@ -49,7 +49,8 @@ class CppFileConfig(resource: Resource, srcGenBasePath: Path, useHierarchicalBin
         this.outPath.resolve("build"),
         this.outPath.resolve("lib"),
         this.outPath.resolve("include"),
-        this.outPath.resolve("share")
+        this.outPath.resolve("share"),
+        this.outPath.resolve("install")
     )
 
     /** Relative path to the directory where all source files for this resource should be generated in. */

From 9d8e3a82422ae468e4938b89506e5430484584f3 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 12 Jun 2023 17:13:12 +0200
Subject: [PATCH 0318/1114] update reactor-cpp

---
 core/src/main/resources/lib/cpp/reactor-cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/cpp/reactor-cpp b/core/src/main/resources/lib/cpp/reactor-cpp
index b607f1f640..e3564782f0 160000
--- a/core/src/main/resources/lib/cpp/reactor-cpp
+++ b/core/src/main/resources/lib/cpp/reactor-cpp
@@ -1 +1 @@
-Subproject commit b607f1f64083ab531e7a676b29de75f076aa1cde
+Subproject commit e3564782f0e1a2bc427e5932a88ff8f87dacd50c

From bf8b28e811a3d6e6158c51827aa3669e0542d5f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Mon, 12 Jun 2023 17:32:44 +0200
Subject: [PATCH 0319/1114] Delete changes in java files

---
 .../LanguageServerErrorReporter.java          | 32 ++++---
 .../src/org/lflang/generator/Validator.java   | 12 ++-
 .../src/org/lflang/generator/c/CUtil.java     | 86 +++++++++++--------
 .../generator/python/PythonValidator.java     | 66 +++++++-------
 org.lflang/src/org/lflang/util/LFCommand.java | 25 +++---
 5 files changed, 117 insertions(+), 104 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java b/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java
index 6e73c3dc42..31304f43c9 100644
--- a/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java
+++ b/org.lflang/src/org/lflang/generator/LanguageServerErrorReporter.java
@@ -11,6 +11,7 @@
 import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.lsp4j.PublishDiagnosticsParams;
+import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.lflang.ErrorReporter;
@@ -114,19 +115,18 @@ public String report(Path file, DiagnosticSeverity severity, String message, int
         file,
         severity,
         message,
-        new Range(
-            Position.fromOneBased(line, 1),
-            Position.fromOneBased(line, 1 + (text.isEmpty() ? 0 : text.get().length()))));
+        Position.fromOneBased(line, 1),
+        Position.fromOneBased(line, 1 + (text.isEmpty() ? 0 : text.get().length())));
   }
 
   @Override
-  public String report(Path file, DiagnosticSeverity severity, String message, Range range) {
-    if (file == null) {
-      file = getMainFile();
-    }
+  public String report(
+      Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
+    if (file == null) file = getMainFile();
+    diagnostics.putIfAbsent(file, new ArrayList<>());
     diagnostics
-        .computeIfAbsent(file, k -> new ArrayList<>())
-        .add(new Diagnostic(toEclipseRange(range), message, severity, "LF Language Server"));
+        .get(file)
+        .add(new Diagnostic(toRange(startPos, endPos), message, severity, "LF Language Server"));
     return "" + severity + ": " + message;
   }
 
@@ -181,11 +181,15 @@ private Optional<String> getLine(int line) {
     return getText().lines().skip(line).findFirst();
   }
 
-  /** Convert an instance of our range class to the equivalent eclipse class. */
-  private org.eclipse.lsp4j.Range toEclipseRange(Range range) {
-    Position p0 = range.getStartInclusive();
-    Position p1 = range.getEndExclusive();
-    return new org.eclipse.lsp4j.Range(
+  /**
+   * Return the Range that starts at {@code p0} and ends at {@code p1}.
+   *
+   * @param p0 an arbitrary Position
+   * @param p1 a Position that is greater than {@code p0}
+   * @return the Range that starts at {@code p0} and ends at {@code p1}
+   */
+  private Range toRange(Position p0, Position p1) {
+    return new Range(
         new org.eclipse.lsp4j.Position(p0.getZeroBasedLine(), p0.getZeroBasedColumn()),
         new org.eclipse.lsp4j.Position(p1.getZeroBasedLine(), p1.getZeroBasedColumn()));
   }
diff --git a/org.lflang/src/org/lflang/generator/Validator.java b/org.lflang/src/org/lflang/generator/Validator.java
index 53efd6412e..f9ae61f854 100644
--- a/org.lflang/src/org/lflang/generator/Validator.java
+++ b/org.lflang/src/org/lflang/generator/Validator.java
@@ -77,11 +77,11 @@ public final void doValidate(LFGeneratorContext context)
       f.get()
           .first
           .getErrorReportingStrategy()
-          .report(f.get().second.getErrors(), errorReporter, codeMaps);
+          .report(f.get().second.getErrors().toString(), errorReporter, codeMaps);
       f.get()
           .first
           .getOutputReportingStrategy()
-          .report(f.get().second.getOutput(), errorReporter, codeMaps);
+          .report(f.get().second.getOutput().toString(), errorReporter, codeMaps);
     }
   }
 
@@ -141,8 +141,12 @@ private static <T> List<Future<T>> getFutures(List<Callable<T>> tasks)
    */
   public final int run(LFCommand command, CancelIndicator cancelIndicator) {
     final int returnCode = command.run(cancelIndicator);
-    getBuildReportingStrategies().first.report(command.getErrors(), errorReporter, codeMaps);
-    getBuildReportingStrategies().second.report(command.getOutput(), errorReporter, codeMaps);
+    getBuildReportingStrategies()
+        .first
+        .report(command.getErrors().toString(), errorReporter, codeMaps);
+    getBuildReportingStrategies()
+        .second
+        .report(command.getOutput().toString(), errorReporter, codeMaps);
     return returnCode;
   }
 
diff --git a/org.lflang/src/org/lflang/generator/c/CUtil.java b/org.lflang/src/org/lflang/generator/c/CUtil.java
index c8af2b37ab..3a7f151a2c 100644
--- a/org.lflang/src/org/lflang/generator/c/CUtil.java
+++ b/org.lflang/src/org/lflang/generator/c/CUtil.java
@@ -32,7 +32,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import org.lflang.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.InferredType;
@@ -132,12 +131,12 @@ public static String channelIndexName(PortInstance port) {
   }
 
   /**
-   * Return the name of the reactor. A '_main` is appended to the name if the reactor is main (to
-   * allow for instantiations that have the same name as the main reactor or the .lf file).
+   * Return the name of the reactor. A {@code _main} is appended to the name if the reactor is main
+   * (to allow for instantiations that have the same name as the main reactor or the .lf file).
    */
-  public static String getName(Reactor reactor) {
-    String name = reactor.getName().toLowerCase() + reactor.hashCode();
-    if (reactor.isMain()) {
+  public static String getName(TypeParameterizedReactor reactor) {
+    String name = reactor.reactor().getName().toLowerCase() + reactor.hashCode();
+    if (reactor.reactor().isMain()) {
       return name + "_main";
     }
     return name;
@@ -148,18 +147,23 @@ public static String getName(Reactor reactor) {
    *
    * <p>The returned string will have one of the following forms:
    *
-   * <p>* selfStructs[k]->_lf_portName * selfStructs[k]->_lf_portName *
-   * selfStructs[k]->_lf_portName[i] * selfStructs[k]->_lf_parent.portName *
-   * selfStructs[k]->_lf_parent.portName[i] * selfStructs[k]->_lf_parent[j].portName *
-   * selfStructs[k]->_lf_parent[j].portName[i]
+   * <ul>
+   *   <li>{@code selfStructs[k]->_lf_portName}
+   *   <li>{@code selfStructs[k]->_lf_portName}
+   *   <li>{@code selfStructs[k]->_lf_portName[i]}
+   *   <li>{@code selfStructs[k]->_lf_parent.portName}
+   *   <li>{@code selfStructs[k]->_lf_parent.portName[i]}
+   *   <li>{@code selfStructs[k]->_lf_parent[j].portName}
+   *   <li>{@code selfStructs[k]->_lf_parent[j].portName[i]}
+   * </ul>
    *
-   * <p>where k is the runtime index of either the port's parent or the port's parent's parent, the
-   * latter when isNested is true. The index j is present if the parent is a bank, and the index i
-   * is present if the port is a multiport.
+   * where {@code k} is the runtime index of either the port's parent or the port's parent's parent,
+   * the latter when isNested is {@code true}. The index {@code j} is present if the parent is a
+   * bank, and the index {@code i} is present if the port is a multiport.
    *
    * <p>The first two forms are used if isNested is false, and the remaining four are used if
-   * isNested is true. Set isNested to true when referencing a port belonging to a contained
-   * reactor.
+   * isNested is true. Set {@code isNested} to {@code true} when referencing a port belonging to a
+   * contained reactor.
    *
    * @param port The port.
    * @param isNested True to return a reference relative to the parent's parent.
@@ -197,8 +201,8 @@ public static String portRef(
   /**
    * Return a reference to the port on the self struct of the port's parent. This is used when an
    * input port triggers a reaction in the port's parent or when an output port is written to by a
-   * reaction in the port's parent. This is equivalent to calling `portRef(port, false, true, null,
-   * null)`.
+   * reaction in the port's parent. This is equivalent to calling {@code portRef(port, false, true,
+   * null, null)}.
    *
    * @param port An instance of the port to be referenced.
    */
@@ -210,7 +214,7 @@ public static String portRef(PortInstance port) {
    * Return a reference to the port on the self struct of the port's parent using the specified
    * index variables. This is used when an input port triggers a reaction in the port's parent or
    * when an output port is written to by a reaction in the port's parent. This is equivalent to
-   * calling `portRef(port, false, true, bankIndex, channelIndex)`.
+   * calling {@code portRef(port, false, true, bankIndex, channelIndex)}.
    *
    * @param port An instance of the port to be referenced.
    * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
@@ -256,7 +260,7 @@ public static String portRefName(
    * Return a port reference to a port on the self struct of the parent of the port's parent. This
    * is used when an input port is written to by a reaction in the parent of the port's parent, or
    * when an output port triggers a reaction in the parent of the port's parent. This is equivalent
-   * to calling `portRef(port, true, true, null, null, null)`.
+   * to calling {@code portRef(port, true, true, null, null, null)}.
    *
    * @param port The port.
    */
@@ -268,7 +272,7 @@ public static String portRefNested(PortInstance port) {
    * Return a reference to the port on the self struct of the parent of the port's parent. This is
    * used when an input port is written to by a reaction in the parent of the port's parent, or when
    * an output port triggers a reaction in the parent of the port's parent. This is equivalent to
-   * calling `portRef(port, true, true, runtimeIndex, bankIndex, channelIndex)`.
+   * calling {@code portRef(port, true, true, runtimeIndex, bankIndex, channelIndex)}.
    *
    * @param port The port.
    * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
@@ -287,8 +291,8 @@ public static String portRefNested(
    * Return a reference to the port on the self struct of the parent of the port's parent, but
    * without the channel indexing, even if it is a multiport. This is used when an input port is
    * written to by a reaction in the parent of the port's parent, or when an output port triggers a
-   * reaction in the parent of the port's parent. This is equivalent to calling `portRef(port, true,
-   * false, null, null, null)`.
+   * reaction in the parent of the port's parent. This is equivalent to calling {@code portRef(port,
+   * true, false, null, null, null)}.
    *
    * @param port The port.
    */
@@ -300,8 +304,8 @@ public static String portRefNestedName(PortInstance port) {
    * Return a reference to the port on the self struct of the parent of the port's parent, but
    * without the channel indexing, even if it is a multiport. This is used when an input port is
    * written to by a reaction in the parent of the port's parent, or when an output port triggers a
-   * reaction in the parent of the port's parent. This is equivalent to calling `portRefNested(port,
-   * true, false, runtimeIndex, bankIndex, channelIndex)`.
+   * reaction in the parent of the port's parent. This is equivalent to calling {@code
+   * portRefNested(port, true, false, runtimeIndex, bankIndex, channelIndex)}.
    *
    * @param port The port.
    * @param runtimeIndex A variable name to use to index the runtime instance or null to use the
@@ -455,7 +459,9 @@ public static String reactorRefNested(
    * or the variable name returned by {@link #bankIndexName(ReactorInstance)} if the parent is a
    * bank. The returned expression, when evaluated, will yield the following value:
    *
-   * <p>d0 + w0 * (d1 + w1 * ( ... (dn-1 + wn-1 * dn) ... )
+   * <pre>
+   *     d0 + w0 * (d1 + w1 * ( ... (dn-1 + wn-1 * dn) ... )
+   * </pre>
    *
    * @param reactor The reactor.
    */
@@ -488,8 +494,8 @@ public static String runtimeIndex(ReactorInstance reactor) {
    * @param reactor The reactor class.
    * @return The type of a self struct for the specified reactor class.
    */
-  public static String selfType(Reactor reactor) {
-    if (reactor.isMain()) {
+  public static String selfType(TypeParameterizedReactor reactor) {
+    if (reactor.reactor().isMain()) {
       return "_" + CUtil.getName(reactor) + "_main_self_t";
     }
     return "_" + CUtil.getName(reactor) + "_self_t";
@@ -497,7 +503,7 @@ public static String selfType(Reactor reactor) {
 
   /** Construct a unique type for the "self" struct of the class of the given reactor. */
   public static String selfType(ReactorInstance instance) {
-    return selfType(ASTUtils.toDefinition(instance.getDefinition().getReactorClass()));
+    return selfType(instance.tpr);
   }
 
   /**
@@ -575,10 +581,13 @@ public interface ReportCommandErrors {
    *
    * <p>The following environment variables will be available to the command:
    *
-   * <p>* LF_CURRENT_WORKING_DIRECTORY: The directory in which the command is invoked. *
-   * LF_SOURCE_DIRECTORY: The directory containing the .lf file being compiled. *
-   * LF_SOURCE_GEN_DIRECTORY: The directory in which generated files are placed. * LF_BIN_DIRECTORY:
-   * The directory into which to put binaries.
+   * <ul>
+   *   <li>{@code: LF_CURRENT_WORKING_DIRECTORY}: The directory in which the command is invoked.
+   *   <li>{@code:LF_SOURCE_DIRECTORY}: The directory containing the .lf file being compiled.
+   *   <li>{@code:LF_PACKAGE_DIRECTORY}: The directory that is the root of the package.
+   *   <li>{@code:LF_SOURCE_GEN_DIRECTORY}: The directory in which generated files are placed.
+   *   <li>{@code:LF_BIN_DIRECTORY}: The directory into which to put binaries.
+   * </ul>
    */
   public static void runBuildCommand(
       FileConfig fileConfig,
@@ -606,8 +615,8 @@ public static void runBuildCommand(
       }
       // For warnings (vs. errors), the return code is 0.
       // But we still want to mark the IDE.
-      if (!cmd.getErrors().isEmpty() && mode == LFGeneratorContext.Mode.EPOCH) {
-        reportCommandErrors.report(cmd.getErrors());
+      if (!cmd.getErrors().toString().isEmpty() && mode == LFGeneratorContext.Mode.EPOCH) {
+        reportCommandErrors.report(cmd.getErrors().toString());
         return; // FIXME: Why do we return here? Even if there are warnings, the build process
         // should proceed.
       }
@@ -719,7 +728,7 @@ private static List<String> multiportWidthTerms(Variable variable) {
             if (term.getParameter() != null) {
               result.add(getTargetReference(term.getParameter()));
             } else {
-              result.add("" + term.getWidth());
+              result.add(String.valueOf(term.getWidth()));
             }
           }
         }
@@ -738,8 +747,11 @@ private static List<String> multiportWidthTerms(Variable variable) {
   public static boolean isTokenType(InferredType type, CTypes types) {
     if (type.isUndefined()) return false;
     // This is a hacky way to do this. It is now considered to be a bug (#657)
-    String targetType = types.getVariableDeclaration(type, "", false);
-    return type.isVariableSizeList || targetType.trim().endsWith("*");
+    return type.isVariableSizeList
+        || type.astType != null
+            && (!type.astType.getStars().isEmpty()
+                || type.astType.getCode() != null
+                    && type.astType.getCode().getBody().stripTrailing().endsWith("*"));
   }
 
   public static String generateWidthVariable(String var) {
diff --git a/org.lflang/src/org/lflang/generator/python/PythonValidator.java b/org.lflang/src/org/lflang/generator/python/PythonValidator.java
index 6ca352134d..dc87417c51 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonValidator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonValidator.java
@@ -11,7 +11,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.UnaryOperator;
+import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.lsp4j.DiagnosticSeverity;
@@ -21,7 +21,6 @@
 import org.lflang.generator.DiagnosticReporting;
 import org.lflang.generator.DiagnosticReporting.Strategy;
 import org.lflang.generator.Position;
-import org.lflang.generator.Range;
 import org.lflang.generator.ValidationStrategy;
 import org.lflang.util.LFCommand;
 
@@ -306,12 +305,33 @@ public Strategy getErrorReportingStrategy() {
           @Override
           public Strategy getOutputReportingStrategy() {
             return (validationOutput, errorReporter, codeMaps) -> {
-              if (validationOutput.isBlank()) {
-                return;
-              }
-              PylintMessage[] pylintMessages;
+              if (validationOutput.isBlank()) return;
               try {
-                pylintMessages = mapper.readValue(validationOutput, PylintMessage[].class);
+                for (PylintMessage message :
+                    mapper.readValue(validationOutput, PylintMessage[].class)) {
+                  if (shouldIgnore(message)) continue;
+                  CodeMap map = codeMaps.get(message.getPath(fileConfig.getSrcGenPath()));
+                  if (map != null) {
+                    for (Path lfFile : map.lfSourcePaths()) {
+                      Function<Position, Position> adjust = p -> map.adjusted(lfFile, p);
+                      String humanMessage =
+                          DiagnosticReporting.messageOf(
+                              message.message,
+                              message.getPath(fileConfig.getSrcGenPath()),
+                              message.getStart());
+                      Position lfStart = adjust.apply(message.getStart());
+                      Position lfEnd = adjust.apply(message.getEnd());
+                      bestEffortReport(
+                          errorReporter,
+                          adjust,
+                          lfStart,
+                          lfEnd,
+                          lfFile,
+                          message.getSeverity(),
+                          humanMessage);
+                    }
+                  }
+                }
               } catch (JsonProcessingException e) {
                 System.err.printf("Failed to parse \"%s\":%n", validationOutput);
                 e.printStackTrace();
@@ -319,34 +339,6 @@ public Strategy getOutputReportingStrategy() {
                     "Failed to parse linter output. The Lingua Franca code generator is tested with"
                         + " Pylint version 2.12.2. Consider updating Pylint if you have an older"
                         + " version.");
-                return;
-              }
-              for (PylintMessage message : pylintMessages) {
-                if (shouldIgnore(message)) {
-                  continue;
-                }
-                CodeMap map = codeMaps.get(message.getPath(fileConfig.getSrcGenPath()));
-                if (map == null) {
-                  continue;
-                }
-                for (Path lfFile : map.lfSourcePaths()) {
-                  UnaryOperator<Position> adjust = p -> map.adjusted(lfFile, p);
-                  String humanMessage =
-                      DiagnosticReporting.messageOf(
-                          message.message,
-                          message.getPath(fileConfig.getSrcGenPath()),
-                          message.getStart());
-                  Position lfStart = adjust.apply(message.getStart());
-                  Position lfEnd = adjust.apply(message.getEnd());
-                  bestEffortReport(
-                      errorReporter,
-                      adjust,
-                      lfStart,
-                      lfEnd,
-                      lfFile,
-                      message.getSeverity(),
-                      humanMessage);
-                }
               }
             };
           }
@@ -374,14 +366,14 @@ private boolean shouldIgnore(PylintMessage message) {
           /** Make a best-effort attempt to place the diagnostic on the correct line. */
           private void bestEffortReport(
               ErrorReporter errorReporter,
-              UnaryOperator<Position> adjust,
+              Function<Position, Position> adjust,
               Position lfStart,
               Position lfEnd,
               Path file,
               DiagnosticSeverity severity,
               String humanMessage) {
             if (!lfEnd.equals(Position.ORIGIN) && !lfStart.equals(Position.ORIGIN)) { // Ideal case
-              errorReporter.report(file, severity, humanMessage, new Range(lfStart, lfEnd));
+              errorReporter.report(file, severity, humanMessage, lfStart, lfEnd);
             } else { // Fallback: Try to report on the correct line, or failing that, just line 1.
               if (lfStart.equals(Position.ORIGIN))
                 lfStart =
diff --git a/org.lflang/src/org/lflang/util/LFCommand.java b/org.lflang/src/org/lflang/util/LFCommand.java
index 749c150748..4b4116f264 100644
--- a/org.lflang/src/org/lflang/util/LFCommand.java
+++ b/org.lflang/src/org/lflang/util/LFCommand.java
@@ -29,6 +29,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.PrintStream;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -74,13 +75,13 @@ protected LFCommand(ProcessBuilder pb, boolean quiet) {
   }
 
   /** Get the output collected during command execution */
-  public String getOutput() {
-    return output.toString();
+  public OutputStream getOutput() {
+    return output;
   }
 
   /** Get the error output collected during command execution */
-  public String getErrors() {
-    return errors.toString();
+  public OutputStream getErrors() {
+    return errors;
   }
 
   /** Get this command's program and arguments. */
@@ -148,10 +149,10 @@ private void poll(Process process, CancelIndicator cancelIndicator) {
   /**
    * Execute the command.
    *
-   * <p>Executing a process directly with `processBuilder.start()` could lead to a deadlock as the
-   * subprocess blocks when output or error buffers are full. This method ensures that output and
-   * error messages are continuously read and forwards them to the system output and error streams
-   * as well as to the output and error streams hold in this class.
+   * <p>Executing a process directly with {@code processBuilder.start()} could lead to a deadlock as
+   * the subprocess blocks when output or error buffers are full. This method ensures that output
+   * and error messages are continuously read and forwards them to the system output and error
+   * streams as well as to the output and error streams hold in this class.
    *
    * <p>If the current operation is cancelled (as indicated by <code>cancelIndicator</code>), the
    * subprocess is destroyed. Output and error streams until that point are still collected.
@@ -258,10 +259,10 @@ public static LFCommand get(final String cmd, final List<String> args, boolean q
    * not found, null is returned. In order to find the command, different methods are applied in the
    * following order:
    *
-   * <p>1. Check if the given command `cmd` is an executable file within `dir`. 2. If the above
-   * fails 'which <cmd>' (or 'where <cmd>' on Windows) is executed to see if the command is
-   * available on the PATH. 3. If both points above fail, a third attempt is started using bash to
-   * indirectly execute the command (see below for an explanation).
+   * <p>1. Check if the given command {@code cmd} is an executable file within {@code dir}. 2. If
+   * the above fails 'which <cmd>' (or 'where <cmd>' on Windows) is executed to see if the command
+   * is available on the PATH. 3. If both points above fail, a third attempt is started using bash
+   * to indirectly execute the command (see below for an explanation).
    *
    * <p>A bit more context: If the command cannot be found directly, then a second attempt is made
    * using a Bash shell with the --login option, which sources the user's ~/.bash_profile,

From 117aad0745de5cc2ff90bc58c28678c1a78ff976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Mon, 12 Jun 2023 17:49:03 +0200
Subject: [PATCH 0320/1114] Cleanup

---
 .../src/org/lflang/generator/Validator.java    |  8 ++++----
 .../src/org/lflang/generator/c/CCompiler.java  | 18 +++++++++---------
 .../src/org/lflang/generator/c/CUtil.java      |  4 ++--
 .../generator/cpp/CppStandaloneGenerator.kt    |  2 +-
 .../org/lflang/generator/rust/RustValidator.kt |  2 +-
 .../src/org/lflang/generator/ts/TSGenerator.kt |  2 +-
 org.lflang/src/org/lflang/util/LFCommand.java  |  8 ++++----
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/Validator.java b/org.lflang/src/org/lflang/generator/Validator.java
index f9ae61f854..51d2e8412e 100644
--- a/org.lflang/src/org/lflang/generator/Validator.java
+++ b/org.lflang/src/org/lflang/generator/Validator.java
@@ -77,11 +77,11 @@ public final void doValidate(LFGeneratorContext context)
       f.get()
           .first
           .getErrorReportingStrategy()
-          .report(f.get().second.getErrors().toString(), errorReporter, codeMaps);
+          .report(f.get().second.getErrors(), errorReporter, codeMaps);
       f.get()
           .first
           .getOutputReportingStrategy()
-          .report(f.get().second.getOutput().toString(), errorReporter, codeMaps);
+          .report(f.get().second.getOutput(), errorReporter, codeMaps);
     }
   }
 
@@ -143,10 +143,10 @@ public final int run(LFCommand command, CancelIndicator cancelIndicator) {
     final int returnCode = command.run(cancelIndicator);
     getBuildReportingStrategies()
         .first
-        .report(command.getErrors().toString(), errorReporter, codeMaps);
+        .report(command.getErrors(), errorReporter, codeMaps);
     getBuildReportingStrategies()
         .second
-        .report(command.getOutput().toString(), errorReporter, codeMaps);
+        .report(command.getOutput(), errorReporter, codeMaps);
     return returnCode;
   }
 
diff --git a/org.lflang/src/org/lflang/generator/c/CCompiler.java b/org.lflang/src/org/lflang/generator/c/CCompiler.java
index f919977ba5..7570cf4fd6 100644
--- a/org.lflang/src/org/lflang/generator/c/CCompiler.java
+++ b/org.lflang/src/org/lflang/generator/c/CCompiler.java
@@ -133,17 +133,17 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
 
     if (cMakeReturnCode != 0
         && context.getMode() == LFGeneratorContext.Mode.STANDALONE
-        && !outputContainsKnownCMakeErrors(compile.getErrors().toString())) {
+        && !outputContainsKnownCMakeErrors(compile.getErrors())) {
       errorReporter.reportError(
           targetConfig.compiler + " failed with error code " + cMakeReturnCode);
     }
 
     // For warnings (vs. errors), the return code is 0.
     // But we still want to mark the IDE.
-    if (compile.getErrors().toString().length() > 0
+    if (compile.getErrors().length() > 0
         && context.getMode() != LFGeneratorContext.Mode.STANDALONE
-        && !outputContainsKnownCMakeErrors(compile.getErrors().toString())) {
-      generator.reportCommandErrors(compile.getErrors().toString());
+        && !outputContainsKnownCMakeErrors(compile.getErrors())) {
+      generator.reportCommandErrors(compile.getErrors());
     }
 
     int makeReturnCode = 0;
@@ -155,20 +155,20 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
 
       if (makeReturnCode != 0
           && context.getMode() == LFGeneratorContext.Mode.STANDALONE
-          && !outputContainsKnownCMakeErrors(build.getErrors().toString())) {
+          && !outputContainsKnownCMakeErrors(build.getErrors())) {
         errorReporter.reportError(
             targetConfig.compiler + " failed with error code " + makeReturnCode);
       }
 
       // For warnings (vs. errors), the return code is 0.
       // But we still want to mark the IDE.
-      if (build.getErrors().toString().length() > 0
+      if (build.getErrors().length() > 0
           && context.getMode() != LFGeneratorContext.Mode.STANDALONE
-          && !outputContainsKnownCMakeErrors(build.getErrors().toString())) {
-        generator.reportCommandErrors(build.getErrors().toString());
+          && !outputContainsKnownCMakeErrors(build.getErrors())) {
+        generator.reportCommandErrors(build.getErrors());
       }
 
-      if (makeReturnCode == 0 && build.getErrors().toString().length() == 0) {
+      if (makeReturnCode == 0 && build.getErrors().length() == 0) {
         System.out.println(
             "SUCCESS: Compiling generated code for "
                 + fileConfig.name
diff --git a/org.lflang/src/org/lflang/generator/c/CUtil.java b/org.lflang/src/org/lflang/generator/c/CUtil.java
index 3a7f151a2c..e4bd60bc10 100644
--- a/org.lflang/src/org/lflang/generator/c/CUtil.java
+++ b/org.lflang/src/org/lflang/generator/c/CUtil.java
@@ -615,8 +615,8 @@ public static void runBuildCommand(
       }
       // For warnings (vs. errors), the return code is 0.
       // But we still want to mark the IDE.
-      if (!cmd.getErrors().toString().isEmpty() && mode == LFGeneratorContext.Mode.EPOCH) {
-        reportCommandErrors.report(cmd.getErrors().toString());
+      if (!cmd.getErrors().isEmpty() && mode == LFGeneratorContext.Mode.EPOCH) {
+        reportCommandErrors.report(cmd.getErrors());
         return; // FIXME: Why do we return here? Even if there are warnings, the build process
         // should proceed.
       }
diff --git a/org.lflang/src/org/lflang/generator/cpp/CppStandaloneGenerator.kt b/org.lflang/src/org/lflang/generator/cpp/CppStandaloneGenerator.kt
index 381df52070..bbe3826bb0 100644
--- a/org.lflang/src/org/lflang/generator/cpp/CppStandaloneGenerator.kt
+++ b/org.lflang/src/org/lflang/generator/cpp/CppStandaloneGenerator.kt
@@ -95,7 +95,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
         var version: String? = null
         if (cmd != null && cmd.run() == 0) {
             val regex = "\\d+(\\.\\d+)+".toRegex()
-            version = regex.find(cmd.output)?.value
+            version = regex.find(cmd.output.toString())?.value
         }
         if (version == null || version.compareVersion("3.5.0") < 0) {
             errorReporter.reportError(
diff --git a/org.lflang/src/org/lflang/generator/rust/RustValidator.kt b/org.lflang/src/org/lflang/generator/rust/RustValidator.kt
index c29b508f7b..ebf449ffa5 100644
--- a/org.lflang/src/org/lflang/generator/rust/RustValidator.kt
+++ b/org.lflang/src/org/lflang/generator/rust/RustValidator.kt
@@ -129,7 +129,7 @@ class RustValidator(
                 ?: return@lazy null
 
         command.run { false }
-        command.output.toString()
+        command.output
             .lines()
             .filter { it.startsWith("{") }
             .firstNotNullOfOrNull {
diff --git a/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt b/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
index 517a21ff48..af7e445c16 100644
--- a/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
+++ b/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
@@ -323,7 +323,7 @@ class TSGenerator(
             if (npmInstall.run(context.cancelIndicator) != 0) {
                 errorReporter.reportError(
                     GeneratorUtils.findTargetDecl(resource),
-                    "ERROR: npm install command failed: " + npmInstall.errors.toString())
+                    "ERROR: npm install command failed: " + npmInstall.errors)
                 errorReporter.reportError(
                     GeneratorUtils.findTargetDecl(resource), "ERROR: npm install command failed." +
                         "\nFor installation instructions, see: https://www.npmjs.com/get-npm")
diff --git a/org.lflang/src/org/lflang/util/LFCommand.java b/org.lflang/src/org/lflang/util/LFCommand.java
index 4b4116f264..a064a057e0 100644
--- a/org.lflang/src/org/lflang/util/LFCommand.java
+++ b/org.lflang/src/org/lflang/util/LFCommand.java
@@ -75,13 +75,13 @@ protected LFCommand(ProcessBuilder pb, boolean quiet) {
   }
 
   /** Get the output collected during command execution */
-  public OutputStream getOutput() {
-    return output;
+  public String getOutput() {
+    return output.toString();
   }
 
   /** Get the error output collected during command execution */
-  public OutputStream getErrors() {
-    return errors;
+  public String getErrors() {
+    return errors.toString();
   }
 
   /** Get this command's program and arguments. */

From f44bf4fb79f0b3e8d02394d93cd4df8b8025d7bf Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 12 Jun 2023 17:26:12 -0700
Subject: [PATCH 0321/1114] Do not extract comments that are in code blocks.

This only applies when the comment is in the body of the code block.
According to the grammar, the body does not start until some
tokens appear -- that means non-whitespace, non-comment characters.
---
 core/src/main/java/org/lflang/ast/ToLf.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 9ca4c124dc..fe4912459b 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -16,6 +16,7 @@
 import java.util.stream.Stream;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.impl.ParserRuleImpl;
 import org.eclipse.xtext.nodemodel.ICompositeNode;
 import org.eclipse.xtext.nodemodel.INode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
@@ -205,6 +206,10 @@ private static List<INode> getContainedComments(INode node) {
           && (child.getText().contains("\n") || child.getText().contains("\r"))
           && !inSemanticallyInsignificantLeadingRubbish) {
         break;
+      } else if (child instanceof ICompositeNode compositeNode
+          && compositeNode.getGrammarElement().eContainer() instanceof ParserRuleImpl pri
+          && pri.getName().equals("Body")) {
+        break;
       }
     }
     return ret;

From c70b5b80053bf2b57d1324a9c07f64e20e961cf0 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 12 Jun 2023 17:53:09 -0700
Subject: [PATCH 0322/1114] Add semicolon.

---
 core/src/main/java/org/lflang/ast/ToLf.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index fe4912459b..1a6e6bd4be 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -743,7 +743,7 @@ public MalleableString caseInstantiation(Instantiation object) {
     msb.append(list(", ", "<", ">", true, false, object.getTypeArgs()));
     msb.append(list(false, object.getParameters()));
     // TODO: Delete the following case when the corresponding feature is removed
-    if (object.getHost() != null) msb.append(" at ").append(doSwitch(object.getHost()));
+    if (object.getHost() != null) msb.append(" at ").append(doSwitch(object.getHost())).append(";");
     return msb.get();
   }
 

From 95e55f6dbb510e7137772e6ce2df8a16e77665b6 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 12 Jun 2023 18:05:18 -0700
Subject: [PATCH 0323/1114] Make formatter check itself at runtime.

This may slow down the formatter. It also is not certain to work
because isEqual could contain mistakes. However, it may substantially
reduce the likelihood that the formatter silently produces wrong
results. It is hard to be sure about this, however, because it is
already rare for the formatter to produce wrong results.
---
 cli/lff/src/main/java/org/lflang/cli/Lff.java | 10 +++
 .../java/org/lflang/ast/ParsingUtils.java     | 65 ++++++++++++++++++
 .../java/org/lflang/tests/LfParsingUtil.java  | 66 +------------------
 .../lflang/tests/compiler/RoundTripTests.java |  6 +-
 4 files changed, 82 insertions(+), 65 deletions(-)
 create mode 100644 core/src/main/java/org/lflang/ast/ParsingUtils.java

diff --git a/cli/lff/src/main/java/org/lflang/cli/Lff.java b/cli/lff/src/main/java/org/lflang/cli/Lff.java
index 21a72fad16..e987a8a6d4 100644
--- a/cli/lff/src/main/java/org/lflang/cli/Lff.java
+++ b/cli/lff/src/main/java/org/lflang/cli/Lff.java
@@ -10,6 +10,8 @@
 import java.util.List;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.lflang.ast.FormattingUtils;
+import org.lflang.ast.IsEqual;
+import org.lflang.ast.ParsingUtils;
 import org.lflang.util.FileUtil;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
@@ -171,8 +173,16 @@ private void formatSingleFile(Path path, Path inputRoot, Path outputRoot) {
     if (!ignoreErrors) {
       exitIfCollectedErrors();
     }
+
     final String formattedFileContents =
         FormattingUtils.render(resource.getContents().get(0), lineLength);
+    if (!new IsEqual(resource.getContents().get(0))
+        .doSwitch(
+            ParsingUtils.parseSourceAsIfInDirectory(path.getParent(), formattedFileContents))) {
+      reporter.printFatalErrorAndExit(
+          "The formatter failed to produce output that is semantically equivalent to its input."
+              + " Please file a bug report with Lingua Franca.");
+    }
 
     try {
       if (check) {
diff --git a/core/src/main/java/org/lflang/ast/ParsingUtils.java b/core/src/main/java/org/lflang/ast/ParsingUtils.java
new file mode 100644
index 0000000000..0b638b656d
--- /dev/null
+++ b/core/src/main/java/org/lflang/ast/ParsingUtils.java
@@ -0,0 +1,65 @@
+package org.lflang.ast;
+
+import com.google.inject.Injector;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.resource.XtextResource;
+import org.eclipse.xtext.resource.XtextResourceSet;
+import org.lflang.LFStandaloneSetup;
+import org.lflang.lf.Model;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public class ParsingUtils {
+  public static Model parse(Path file) {
+    // Source:
+    // https://wiki.eclipse.org/Xtext/FAQ#How_do_I_load_my_model_in_a_standalone_Java_application_.3F
+    Injector injector = new LFStandaloneSetup().createInjectorAndDoEMFRegistration();
+    XtextResourceSet resourceSet = injector.getInstance(XtextResourceSet.class);
+    resourceSet.addLoadOption(XtextResource.OPTION_RESOLVE_ALL, Boolean.TRUE);
+    Resource resource =
+        resourceSet.getResource(URI.createFileURI(file.toFile().getAbsolutePath()), true);
+    return (Model) resource.getContents().get(0);
+  }
+
+  public static Model parse(String fileContents) {
+    Path file = null;
+    try {
+      file = Files.createTempFile("lftests", ".lf");
+      Files.writeString(file, fileContents);
+      return parse(file);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    } finally {
+      if (file != null) {
+        try {
+          Files.deleteIfExists(file);
+        } catch (IOException e) {
+          throw new RuntimeException(e);
+        }
+      }
+    }
+  }
+
+  public static Model parseSourceAsIfInDirectory(Path directory, String sourceText) {
+    int num = 0;
+    while (Files.exists(directory.resolve("file" + num + ".lf"))) {
+      num++;
+    }
+    Path file = directory.resolve("file" + num + ".lf");
+    try {
+      Files.writeString(file, sourceText);
+      return parse(file);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    } finally {
+      try {
+        Files.deleteIfExists(file);
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    }
+  }
+}
diff --git a/core/src/test/java/org/lflang/tests/LfParsingUtil.java b/core/src/test/java/org/lflang/tests/LfParsingUtil.java
index ae45bf4e7c..6f00d61129 100644
--- a/core/src/test/java/org/lflang/tests/LfParsingUtil.java
+++ b/core/src/test/java/org/lflang/tests/LfParsingUtil.java
@@ -1,15 +1,7 @@
 package org.lflang.tests;
 
-import com.google.inject.Injector;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.resource.XtextResource;
-import org.eclipse.xtext.resource.XtextResourceSet;
 import org.junit.jupiter.api.Assertions;
-import org.lflang.LFStandaloneSetup;
+import org.lflang.ast.ParsingUtils;
 import org.lflang.lf.Model;
 
 /**
@@ -19,12 +11,12 @@ public class LfParsingUtil {
 
   /** Parse the given file, asserts that there are no parsing errors. */
   public static Model parseValidModel(String fileName, String reformattedTestCase) {
-    Model resultingModel = parse(reformattedTestCase);
+    Model resultingModel = ParsingUtils.parse(reformattedTestCase);
     checkValid(fileName, resultingModel);
     return resultingModel;
   }
 
-  private static void checkValid(String fileName, Model resultingModel) {
+  public static void checkValid(String fileName, Model resultingModel) {
     Assertions.assertNotNull(resultingModel);
     if (!resultingModel.eResource().getErrors().isEmpty()) {
       resultingModel.eResource().getErrors().forEach(System.err::println);
@@ -32,56 +24,4 @@ private static void checkValid(String fileName, Model resultingModel) {
           resultingModel.eResource().getErrors().isEmpty(), "Parsing errors in " + fileName);
     }
   }
-
-  public static Model parseSourceAsIfInDirectory(Path directory, String sourceText) {
-    int num = 0;
-    while (Files.exists(directory.resolve("file" + num + ".lf"))) {
-      num++;
-    }
-    Path file = directory.resolve("file" + num + ".lf");
-    try {
-      Files.writeString(file, sourceText);
-      Model resultingModel = parse(file);
-      checkValid("file in " + directory, resultingModel);
-      return resultingModel;
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    } finally {
-      try {
-        Files.deleteIfExists(file);
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-    }
-  }
-
-  public static Model parse(String fileContents) {
-    Path file = null;
-    try {
-      file = Files.createTempFile("lftests", ".lf");
-      Files.writeString(file, fileContents);
-      return parse(file);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    } finally {
-      if (file != null) {
-        try {
-          Files.deleteIfExists(file);
-        } catch (IOException e) {
-          throw new RuntimeException(e);
-        }
-      }
-    }
-  }
-
-  public static Model parse(Path file) {
-    // Source:
-    // https://wiki.eclipse.org/Xtext/FAQ#How_do_I_load_my_model_in_a_standalone_Java_application_.3F
-    Injector injector = new LFStandaloneSetup().createInjectorAndDoEMFRegistration();
-    XtextResourceSet resourceSet = injector.getInstance(XtextResourceSet.class);
-    resourceSet.addLoadOption(XtextResource.OPTION_RESOLVE_ALL, Boolean.TRUE);
-    Resource resource =
-        resourceSet.getResource(URI.createFileURI(file.toFile().getAbsolutePath()), true);
-    return (Model) resource.getContents().get(0);
-  }
 }
diff --git a/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java b/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
index 1beb54b81a..9987ead64d 100644
--- a/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
@@ -14,6 +14,7 @@
 import org.lflang.Target;
 import org.lflang.ast.FormattingUtils;
 import org.lflang.ast.IsEqual;
+import org.lflang.ast.ParsingUtils;
 import org.lflang.lf.Model;
 import org.lflang.tests.LFInjectorProvider;
 import org.lflang.tests.LFTest;
@@ -41,14 +42,15 @@ public void roundTripTest() {
   }
 
   private void run(Path file) throws Exception {
-    Model originalModel = LfParsingUtil.parse(file);
+    Model originalModel = ParsingUtils.parse(file);
     System.out.println(file);
     assertThat(originalModel.eResource().getErrors(), equalTo(emptyList()));
     // TODO: Check that the output is a fixed point
     final int smallLineLength = 20;
     final String squishedTestCase = FormattingUtils.render(originalModel, smallLineLength);
     final Model resultingModel =
-        LfParsingUtil.parseSourceAsIfInDirectory(file.getParent(), squishedTestCase);
+        ParsingUtils.parseSourceAsIfInDirectory(file.getParent(), squishedTestCase);
+    LfParsingUtil.checkValid("file in " + file.getParent(), resultingModel);
 
     assertThat(resultingModel.eResource().getErrors(), equalTo(emptyList()));
     Assertions.assertTrue(

From d32e80f4fbbd4f335d8c6b7e451f7a210c09802b Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 12 Jun 2023 19:21:29 -0700
Subject: [PATCH 0324/1114] Equality is symmetric.

---
 cli/lff/src/main/java/org/lflang/cli/Lff.java |  6 ++-
 .../src/main/java/org/lflang/ast/IsEqual.java | 44 ++++++++++++-------
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/cli/lff/src/main/java/org/lflang/cli/Lff.java b/cli/lff/src/main/java/org/lflang/cli/Lff.java
index e987a8a6d4..adfb23bada 100644
--- a/cli/lff/src/main/java/org/lflang/cli/Lff.java
+++ b/cli/lff/src/main/java/org/lflang/cli/Lff.java
@@ -180,8 +180,10 @@ private void formatSingleFile(Path path, Path inputRoot, Path outputRoot) {
         .doSwitch(
             ParsingUtils.parseSourceAsIfInDirectory(path.getParent(), formattedFileContents))) {
       reporter.printFatalErrorAndExit(
-          "The formatter failed to produce output that is semantically equivalent to its input."
-              + " Please file a bug report with Lingua Franca.");
+          "The formatter failed to produce output that is semantically equivalent to its input when"
+              + " executed on the file "
+              + path
+              + ". Please file a bug report with Lingua Franca.");
     }
 
     try {
diff --git a/core/src/main/java/org/lflang/ast/IsEqual.java b/core/src/main/java/org/lflang/ast/IsEqual.java
index bc0fc31abf..a79d1c71fa 100644
--- a/core/src/main/java/org/lflang/ast/IsEqual.java
+++ b/core/src/main/java/org/lflang/ast/IsEqual.java
@@ -7,6 +7,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import org.eclipse.emf.ecore.EObject;
+import org.lflang.Target;
 import org.lflang.TimeUnit;
 import org.lflang.lf.Action;
 import org.lflang.lf.Array;
@@ -174,13 +175,22 @@ public Boolean caseStateVar(StateVar object) {
   public Boolean caseInitializer(Initializer object) {
     // Empty braces are not equivalent to no init.
     return new ComparisonMachine<>(object, Initializer.class)
-        .equalAsObjects(Initializer::isBraces)
-        // An initializer with no parens is equivalent to one with parens,
-        // if the list has a single element. This is probably going to change
-        // when we introduce equals initializers.
-        // .equalAsObjects(Initializer::isParens)
-        .listsEquivalent(Initializer::getExprs)
-        .conclusion;
+            .equalAsObjects(Initializer::isBraces)
+            // An initializer with no parens is equivalent to one with parens,
+            // if the list has a single element. This is probably going to change
+            // when we introduce equals initializers.
+//            .equalAsObjects(Initializer::isParens)
+            .listsEquivalent(Initializer::getExprs)
+            .conclusion
+        || otherObject instanceof Initializer i && i.getExprs().size() == 1 && i.getExprs().get(0) instanceof BracedListExpression ble
+            && initializerAndBracedListExpression(object, ble)
+        || otherObject instanceof Initializer i2 && object.getExprs().size() == 1 && object.getExprs().get(0) instanceof BracedListExpression ble2
+        && initializerAndBracedListExpression(i2, ble2);
+  }
+
+  private static boolean initializerAndBracedListExpression(Initializer object, BracedListExpression otherObject) {
+    return ASTUtils.getTarget(object) == Target.C
+            && listsEqualish(otherObject.getItems(), object.getExprs(), (a, b) -> new IsEqual(a).doSwitch(b));
   }
 
   @Override
@@ -583,6 +593,17 @@ private UnsupportedOperationException thereIsAMoreSpecificCase(
                 .collect(Collectors.joining(" or "))));
   }
 
+  private static <T> boolean listsEqualish(List<T> list0, List<T> list1, BiPredicate<T, T> equalish) {
+    if (list0 == list1) return true; // e.g., they are both null
+    if (list0.size() != list1.size()) return false;
+    for (int i = 0; i < list0.size(); i++) {
+      if (!equalish.test(list0.get(i), list1.get(i))) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   /** Fluently compare a pair of parse tree nodes for equivalence. */
   private class ComparisonMachine<E extends EObject> {
     private final E object;
@@ -613,14 +634,7 @@ <T> boolean listsEqualish(
       if (!conclusion) return false;
       List<T> list0 = listGetter.apply(object);
       List<T> list1 = listGetter.apply(other);
-      if (list0 == list1) return true; // e.g., they are both null
-      if (list0.size() != list1.size()) return false;
-      for (int i = 0; i < list0.size(); i++) {
-        if (!equalish.test(list0.get(i), list1.get(i))) {
-          return false;
-        }
-      }
-      return true;
+      return IsEqual.listsEqualish(list0, list1, equalish);
     }
 
     /** Conclude false if the two properties are not equal as objects. */

From ee744acd63532ed0dc1c31753e9d83284bc7fa12 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 12 Jun 2023 21:53:53 -0700
Subject: [PATCH 0325/1114] Attempt to make merge queue work again

---
 .github/workflows/check-diff.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
index 55f5f404e8..31a9a174db 100644
--- a/.github/workflows/check-diff.yml
+++ b/.github/workflows/check-diff.yml
@@ -69,7 +69,8 @@ jobs:
       - id: should-skip
         name: "Determine whether to skip checks"
         run: |
-          echo "skip=${{ steps.duplicate.outputs.should_skip == 'true' && github.event.action != 'ready_for_review' }}" >> $GITHUB_OUTPUT
+          echo "skip=${{ steps.duplicate.outputs.should_skip == 'true' && github.event.action != 'ready_for_review' && github.event.sender.login != 'github-merge-queue' }}" >> $GITHUB_OUTPUT
+          echo "(Run initiated by ${{ github.event.sender.login }} )"
       - id: skip-redundant
         name: "Report on skipping checks (prior run found)"
         run: |

From d4f350705a474d79c7509a7f9d173372e344efd1 Mon Sep 17 00:00:00 2001
From: Christian Menard <Christian.Menard@tu-dresden.de>
Date: Tue, 13 Jun 2023 10:06:05 +0200
Subject: [PATCH 0326/1114] Detect if we are running on a merge queue commit

---
 .github/workflows/check-diff.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
index 31a9a174db..e67c36bb01 100644
--- a/.github/workflows/check-diff.yml
+++ b/.github/workflows/check-diff.yml
@@ -69,8 +69,14 @@ jobs:
       - id: should-skip
         name: "Determine whether to skip checks"
         run: |
-          echo "skip=${{ steps.duplicate.outputs.should_skip == 'true' && github.event.action != 'ready_for_review' && github.event.sender.login != 'github-merge-queue' }}" >> $GITHUB_OUTPUT
-          echo "(Run initiated by ${{ github.event.sender.login }} )"
+          echo ${{ github.ref_name }}
+          if echo ${{ github.ref_name }} | grep 'gh-readonly-queues'; then
+            echo "Don't skip, because this is a merge queue commit."
+            echo "skip=false" >> $GITHUB_OUTPUT
+          else
+            echo "skip=${{ steps.duplicate.outputs.should_skip == 'true' && github.event.action != 'ready_for_review' }}" >> $GITHUB_OUTPUT
+          fi
+        shell: bash
       - id: skip-redundant
         name: "Report on skipping checks (prior run found)"
         run: |

From 12f741bbd50770d347720302f1154d074e334bec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Tue, 13 Jun 2023 14:06:13 +0200
Subject: [PATCH 0327/1114] Refactor error reporter

---
 .../lflang/cli/StandaloneErrorReporter.java   |  75 ++++-----
 .../kotlin/org/lflang/cli/ReportingUtil.kt    |  16 ++
 .../java/org/lflang/DefaultErrorReporter.java |  65 +++-----
 .../main/java/org/lflang/ErrorReporter.java   | 146 ++++++++++++------
 .../java/org/lflang/ErrorReporterBase.java    |  56 +++++++
 .../util/SynthesisErrorReporter.java          |  48 ++----
 .../generator/LineAdjustingErrorReporter.java |  88 +++--------
 .../generator/SynchronizedErrorReporter.java  |  63 ++------
 .../LanguageServerErrorReporter.java          |  86 +++--------
 .../validation/ValidatorErrorReporter.java    | 141 ++++-------------
 10 files changed, 308 insertions(+), 476 deletions(-)
 create mode 100644 core/src/main/java/org/lflang/ErrorReporterBase.java

diff --git a/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java b/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java
index 83e58eb15c..2ac9b48559 100644
--- a/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java
+++ b/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java
@@ -28,74 +28,51 @@
 package org.lflang.cli;
 
 import com.google.inject.Inject;
+
 import java.nio.file.Path;
+
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.diagnostics.Severity;
+
 import org.lflang.ErrorReporter;
+import org.lflang.ErrorReporterBase;
+import org.lflang.generator.Range;
 
 /**
  * An error reporter that forwards all messages to an {@link IssueCollector}. They'll be sorted out
  * later.
  */
-public class StandaloneErrorReporter implements ErrorReporter {
-
-  @Inject private StandaloneIssueAcceptor issueAcceptor;
-
-  private String reportWithNode(String message, Severity severity, EObject obj) {
-    issueAcceptor.accept(severity, message, obj, null, 0, null);
-    return message;
-  }
-
-  private String reportSimpleFileCtx(String message, Severity severity, Integer line, Path path) {
-    LfIssue issue = new LfIssue(message, severity, line, 1, line, 1, 0, path);
-    issueAcceptor.accept(issue);
-    // Return a string that can be inserted into the generated code.
-    return message;
-  }
-
-  @Override
-  public String reportError(String message) {
-    return reportSimpleFileCtx(message, Severity.ERROR, null, null);
-  }
-
-  @Override
-  public String reportWarning(String message) {
-    return reportSimpleFileCtx(message, Severity.WARNING, null, null);
+public class StandaloneErrorReporter extends ErrorReporterBase {
+
+  @Inject
+  private StandaloneIssueAcceptor issueAcceptor;
+
+  static Severity convertSeverity(DiagnosticSeverity severity) {
+    return switch (severity) {
+      case Error -> Severity.ERROR;
+      case Warning -> Severity.WARNING;
+      case Information -> Severity.INFO;
+      case Hint -> Severity.IGNORE;
+    };
   }
 
   @Override
-  public String reportInfo(String message) {
-    return reportSimpleFileCtx(message, Severity.INFO, null, null);
+  protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+    issueAcceptor.accept(convertSeverity(severity), message, node, null, 0, null);
   }
 
   @Override
-  public String reportError(EObject obj, String message) {
-    return reportWithNode(message, Severity.ERROR, obj);
-  }
-
-  @Override
-  public String reportWarning(EObject obj, String message) {
-    return reportWithNode(message, Severity.WARNING, obj);
-  }
-
-  @Override
-  public String reportInfo(EObject obj, String message) {
-    return reportWithNode(message, Severity.INFO, obj);
-  }
-
-  @Override
-  public String reportError(Path file, Integer line, String message) {
-    return reportSimpleFileCtx(message, Severity.ERROR, line, file);
+  protected void report(Path path, Range range, DiagnosticSeverity severity, String message) {
+    LfIssue issue = new LfIssue(message, convertSeverity(severity), path, range);
+    issueAcceptor.accept(issue);
   }
 
   @Override
-  public String reportWarning(Path file, Integer line, String message) {
-    return reportSimpleFileCtx(message, Severity.WARNING, line, file);
-  }
+  protected void reportWithoutPosition(DiagnosticSeverity severity, String message) {
+    LfIssue issue = new LfIssue(message, convertSeverity(severity), null, null);
+    issueAcceptor.accept(issue);
 
-  @Override
-  public String reportInfo(Path file, Integer line, String message) {
-    return reportSimpleFileCtx(message, Severity.INFO, line, file);
   }
 
   @Override
diff --git a/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt b/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt
index efdd0e731f..b8e94083cf 100644
--- a/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt
+++ b/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt
@@ -27,6 +27,7 @@ package org.lflang.cli
 import com.google.inject.Inject
 import com.google.inject.Singleton
 import org.eclipse.xtext.diagnostics.Severity
+import org.lflang.generator.Range
 import java.io.IOException
 import java.io.PrintStream
 import java.lang.Error
@@ -135,6 +136,21 @@ data class LfIssue(
     val file: Path?
 ) : Comparable<LfIssue> {
 
+    constructor(
+        message: String,
+        severity: Severity,
+        path: Path?,
+        range: Range?
+    ) : this(
+        message, severity,
+        line = range?.startInclusive?.oneBasedLine,
+        column = range?.startInclusive?.oneBasedColumn,
+        endLine = range?.endExclusive?.oneBasedLine,
+        endColumn = range?.endExclusive?.oneBasedColumn,
+        length = null,
+        file = path
+    )
+
     override operator fun compareTo(other: LfIssue): Int =
         issueComparator.compare(this, other)
 
diff --git a/core/src/main/java/org/lflang/DefaultErrorReporter.java b/core/src/main/java/org/lflang/DefaultErrorReporter.java
index 2698d2b582..1b245c45c7 100644
--- a/core/src/main/java/org/lflang/DefaultErrorReporter.java
+++ b/core/src/main/java/org/lflang/DefaultErrorReporter.java
@@ -1,68 +1,39 @@
 package org.lflang;
 
 import java.nio.file.Path;
+
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.lsp4j.DiagnosticSeverity;
+
+import org.lflang.ErrorReporter2.Stage2;
+import org.lflang.generator.Range;
 
 /** Simple implementation of the ErrorReport interface that simply prints to standard out. */
-public class DefaultErrorReporter implements ErrorReporter {
+public class DefaultErrorReporter extends ErrorReporterBase implements ErrorReporter {
 
-  private boolean errorsOccurred = false;
 
-  private String println(String s) {
+  private void println(String s) {
     System.out.println(s);
-    return s;
-  }
-
-  @Override
-  public String reportError(String message) {
-    errorsOccurred = true;
-    return println("ERROR: " + message);
-  }
-
-  @Override
-  public String reportError(EObject object, String message) {
-    errorsOccurred = true;
-    return println("ERROR: " + message);
-  }
-
-  @Override
-  public String reportError(Path file, Integer line, String message) {
-    errorsOccurred = true;
-    return println("ERROR: " + message);
   }
 
   @Override
-  public String reportWarning(String message) {
-    return println("WARNING: " + message);
+  protected void report(Path path, Range range, DiagnosticSeverity severity, String message) {
+    reportWithoutPosition(severity, message);
   }
 
   @Override
-  public String reportInfo(String message) {
-    return println("INFO: " + message);
+  protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+    reportWithoutPosition(severity, message);
   }
 
   @Override
-  public String reportWarning(EObject object, String message) {
-    return println("WARNING: " + message);
+  protected void reportWithoutPosition(DiagnosticSeverity severity, String message) {
+    switch (severity) {
+    case Error -> println("ERROR: " + message);
+    case Warning -> println("WARNING: " + message);
+    case Information -> println("INFO: " + message);
+    case Hint -> println("HINT: " + message);
+    }
   }
 
-  @Override
-  public String reportInfo(EObject object, String message) {
-    return println("INFO: " + message);
-  }
-
-  @Override
-  public String reportWarning(Path file, Integer line, String message) {
-    return println("WARNING: " + message);
-  }
-
-  @Override
-  public String reportInfo(Path file, Integer line, String message) {
-    return println("INFO: " + message);
-  }
-
-  @Override
-  public boolean getErrorsOccurred() {
-    return errorsOccurred;
-  }
 }
diff --git a/core/src/main/java/org/lflang/ErrorReporter.java b/core/src/main/java/org/lflang/ErrorReporter.java
index f7fe6dcb31..7fec74e434 100644
--- a/core/src/main/java/org/lflang/ErrorReporter.java
+++ b/core/src/main/java/org/lflang/ErrorReporter.java
@@ -1,9 +1,13 @@
 package org.lflang;
 
 import java.nio.file.Path;
+
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
+
+import org.lflang.Stage2;
 import org.lflang.generator.Position;
+import org.lflang.generator.Range;
 
 /**
  * Interface for reporting errors.
@@ -14,13 +18,76 @@
  */
 public interface ErrorReporter {
 
+  Stage2 at(Path file, Range range);
+
+  Stage2 at(EObject object);
+
+  default Stage2 at(Path file) {
+    return at(file, 1);
+  }
+
+  default Stage2 at(Path file, int line) {
+    return at(file, Position.fromOneBased(line, 1));
+  }
+
+  default Stage2 at(Path file, Position pos) {
+    return at(file, Range.degenerateRange(pos));
+  }
+
+  Stage2 nowhere();
+
+
+  interface Stage2 {
+
+    /**
+     * Report an error.
+     *
+     * @param message The error message.
+     */
+    default void error(String message) {
+      report(DiagnosticSeverity.Error, message);
+    }
+
+    /**
+     * Report a warning.
+     *
+     * @param message The warning message.
+     */
+    default void warning(String message) {
+      report(DiagnosticSeverity.Warning, message);
+    }
+
+    /**
+     * Report an informational message.
+     *
+     * @param message The message to report
+     */
+    default void info(String message) {
+      report(DiagnosticSeverity.Information, message);
+    }
+
+
+    /**
+     * Report a message with the given severity
+     *
+     * @param severity The severity
+     * @param message The message to report
+     */
+    void report(DiagnosticSeverity severity, String message);
+
+  }
+
+
   /**
    * Report an error.
    *
    * @param message The error message.
    * @return a string that describes the error.
    */
-  String reportError(String message);
+  default String reportError(String message) {
+    nowhere().error(message);
+    return message;
+  }
 
   /**
    * Report a warning.
@@ -28,7 +95,10 @@ public interface ErrorReporter {
    * @param message The warning message.
    * @return a string that describes the warning.
    */
-  String reportWarning(String message);
+  default String reportWarning(String message) {
+    nowhere().warning(message);
+    return message;
+  }
 
   /**
    * Report an informational message.
@@ -36,7 +106,10 @@ public interface ErrorReporter {
    * @param message The message to report
    * @return a string that describes the error
    */
-  String reportInfo(String message);
+  default String reportInfo(String message) {
+    nowhere().info(message);
+    return message;
+  }
 
   /**
    * Report an error on the specified parse tree object.
@@ -45,7 +118,10 @@ public interface ErrorReporter {
    * @param message The error message.
    * @return a string that describes the error.
    */
-  String reportError(EObject object, String message);
+  default String reportError(EObject object, String message) {
+    at(object).error(message);
+    return message;
+  }
 
   /**
    * Report a warning on the specified parse tree object.
@@ -54,17 +130,11 @@ public interface ErrorReporter {
    * @param message The error message.
    * @return a string that describes the warning.
    */
-  String reportWarning(EObject object, String message);
-
-  /**
-   * Report an informational message on the specified parse tree object.
-   *
-   * @param object The parse tree object.
-   * @param message The informational message
-   * @return a string that describes the info
-   */
-  String reportInfo(EObject object, String message);
-
+  default String reportWarning(EObject object, String message) {
+    at(object).warning(message);
+    return message;
+  }
+  
   /**
    * Report an error at the specified line within a file.
    *
@@ -73,7 +143,11 @@ public interface ErrorReporter {
    * @param file The file to report at.
    * @return a string that describes the error.
    */
-  String reportError(Path file, Integer line, String message);
+  default String reportError(Path file, Integer line, String message) {
+    Stage2 stage2 = line != null ? at(file, line) : at(file);
+    stage2.report(DiagnosticSeverity.Error, message);
+    return message;
+  }
 
   /**
    * Report a warning at the specified line within a file.
@@ -83,17 +157,12 @@ public interface ErrorReporter {
    * @param file The file to report at.
    * @return a string that describes the warning.
    */
-  String reportWarning(Path file, Integer line, String message);
+  default String reportWarning(Path file, Integer line, String message) {
+    Stage2 stage2 = line!=null? at(file,line):at(file);
+    stage2.report(DiagnosticSeverity.Warning, message);
+    return message;
+  }
 
-  /**
-   * Report an informational message at the specified line within a file.
-   *
-   * @param file The file to report at.
-   * @param line The one-based line number to report at.
-   * @param message The error message.
-   * @return
-   */
-  String reportInfo(Path file, Integer line, String message);
 
   /**
    * Report a message of severity {@code severity}.
@@ -104,16 +173,8 @@ public interface ErrorReporter {
    * @return a string that describes the diagnostic
    */
   default String report(Path file, DiagnosticSeverity severity, String message) {
-    switch (severity) {
-      case Error:
-        return reportError(message);
-      case Warning:
-      case Hint:
-      case Information:
-        return reportInfo(message);
-      default:
-        return reportWarning(message);
-    }
+    at(file).report(severity, message);
+    return message;
   }
 
   /**
@@ -127,16 +188,8 @@ default String report(Path file, DiagnosticSeverity severity, String message) {
    * @return a string that describes the diagnostic
    */
   default String report(Path file, DiagnosticSeverity severity, String message, int line) {
-    switch (severity) {
-      case Error:
-        return reportError(file, line, message);
-      case Warning:
-      case Hint:
-      case Information:
-        return reportInfo(file, line, message);
-      default:
-        return reportWarning(file, line, message);
-    }
+    at(file, line).report(severity, message);
+    return message;
   }
 
   /**
@@ -155,6 +208,7 @@ default String report(
     return report(file, severity, message, startPos.getOneBasedLine());
   }
 
+
   /**
    * Check if errors where reported.
    *
diff --git a/core/src/main/java/org/lflang/ErrorReporterBase.java b/core/src/main/java/org/lflang/ErrorReporterBase.java
new file mode 100644
index 0000000000..c376f8a547
--- /dev/null
+++ b/core/src/main/java/org/lflang/ErrorReporterBase.java
@@ -0,0 +1,56 @@
+package org.lflang;
+
+import java.nio.file.Path;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.lsp4j.DiagnosticSeverity;
+
+import org.lflang.generator.Range;
+
+/** Simple implementation of the ErrorReport interface that simply prints to standard out. */
+public abstract class ErrorReporterBase implements ErrorReporter {
+
+  private boolean errorsOccurred = false;
+
+  @Override
+  public boolean getErrorsOccurred() {
+    return errorsOccurred;
+  }
+
+  @Override
+  public void clearHistory() {
+    errorsOccurred = false;
+  }
+
+  /** A wrapper that takes care of setting the error flag if needed. */
+  protected Stage2 wrap(Stage2 e) {
+    return (severity, message) -> {
+      if (severity == DiagnosticSeverity.Error) {
+        errorsOccurred = true;
+      }
+      e.report(severity, message);
+    };
+  }
+
+  @Override
+  public Stage2 at(Path file, Range range) {
+    return wrap((severity, message) -> report(file, range, severity, message));
+  }
+
+  @Override
+  public Stage2 at(EObject object) {
+    return wrap((severity, message) -> reportOnNode(object, severity, message));
+  }
+
+  @Override
+  public Stage2 nowhere() {
+    return wrap(this::reportWithoutPosition);
+  }
+
+  protected abstract void report(Path path, Range range, DiagnosticSeverity severity, String message);
+
+  protected abstract void reportOnNode(EObject node, DiagnosticSeverity severity, String message);
+
+  protected abstract void reportWithoutPosition(DiagnosticSeverity severity, String message);
+
+}
diff --git a/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java b/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
index a249c009fd..c2488dbac2 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
@@ -25,56 +25,32 @@
 package org.lflang.diagram.synthesis.util;
 
 import java.nio.file.Path;
+
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.lsp4j.DiagnosticSeverity;
+
 import org.lflang.ErrorReporter;
+import org.lflang.ErrorReporterBase;
+import org.lflang.generator.Range;
 
 /**
  * @author Alexander Schulz-Rosengarten
  */
-public class SynthesisErrorReporter implements ErrorReporter {
-  @Override
-  public String reportError(String message) {
-    return null;
-  }
-
-  @Override
-  public String reportError(EObject object, String message) {
-    return null;
-  }
-
-  @Override
-  public String reportError(Path file, Integer line, String message) {
-    return null;
-  }
-
-  @Override
-  public String reportWarning(String message) {
-    return null;
-  }
-
-  @Override
-  public String reportWarning(EObject object, String message) {
-    return null;
-  }
-
-  @Override
-  public String reportWarning(Path file, Integer line, String message) {
-    return null;
-  }
+public class SynthesisErrorReporter extends ErrorReporterBase {
 
   @Override
-  public String reportInfo(String message) {
-    return null;
+  protected void reportWithoutPosition(DiagnosticSeverity severity, String message) {
+    // ignore
   }
 
   @Override
-  public String reportInfo(EObject object, String message) {
-    return null;
+  protected void report(Path path, Range range, DiagnosticSeverity severity, String message) {
+    // ignore
   }
 
   @Override
-  public String reportInfo(Path file, Integer line, String message) {
-    return null;
+  protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+    // ignore
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java b/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java
index aa2f49b6da..8b00c1ae08 100644
--- a/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java
+++ b/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java
@@ -5,6 +5,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.lflang.ErrorReporter;
+import org.lflang.ErrorReporterBase;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.Position;
 import org.lflang.generator.Range;
@@ -19,92 +20,43 @@ public LineAdjustingErrorReporter(ErrorReporter parent, Map<Path, CodeMap> codeM
     this.codeMapMap = codeMapMap;
   }
 
-  @Override
-  public String reportError(String message) {
-    return parent.reportError(message);
-  }
-
-  @Override
-  public String reportWarning(String message) {
-    return parent.reportWarning(message);
-  }
-
-  @Override
-  public String reportInfo(String message) {
-    return parent.reportInfo(message);
-  }
-
-  @Override
-  public String reportError(EObject object, String message) {
-    return parent.reportError(object, message);
-  }
-
-  @Override
-  public String reportWarning(EObject object, String message) {
-    return parent.reportWarning(object, message);
-  }
 
   @Override
-  public String reportInfo(EObject object, String message) {
-    return parent.reportInfo(object, message);
+  public Stage2 at(EObject object) {
+    return parent.at(object);
   }
 
   @Override
-  public String reportError(Path file, Integer line, String message) {
-    return report(file, line, message, DiagnosticSeverity.Error);
+  public Stage2 nowhere() {
+    return parent.nowhere();
   }
 
   @Override
-  public String reportWarning(Path file, Integer line, String message) {
-    return report(file, line, message, DiagnosticSeverity.Warning);
+  public Stage2 at(Path file, int line) {
+    // encompass the whole line
+    var endOfLine = Position.fromOneBased(line, Integer.MAX_VALUE);
+    var startOfLine = Position.fromOneBased(line, 1);
+    return at(file, new Range(startOfLine, endOfLine));
   }
 
   @Override
-  public String reportInfo(Path file, Integer line, String message) {
-    return report(file, line, message, DiagnosticSeverity.Information);
-  }
-
-  private String report(Path file, Integer line, String message, DiagnosticSeverity severity) {
-    if (line == null) return report(file, severity, message);
-    var position = Position.fromOneBased(line, Integer.MAX_VALUE);
-    return report(
-        file, severity, message, Position.fromZeroBased(position.getZeroBasedLine(), 0), position);
-  }
-
-  @Override
-  public String report(Path file, DiagnosticSeverity severity, String message) {
-    return ErrorReporter.super.report(file, severity, message);
-  }
-
-  @Override
-  public String report(Path file, DiagnosticSeverity severity, String message, int line) {
-    return ErrorReporter.super.report(file, severity, message, line);
-  }
-
-  @Override
-  public String report(
-      Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
-    String ret = null;
+  public Stage2 at(Path file, Range range) {
     if (codeMapMap.containsKey(file)) {
       var relevantMap = codeMapMap.get(file);
       for (Path lfSource : relevantMap.lfSourcePaths()) {
-        var adjustedRange = relevantMap.adjusted(lfSource, new Range(startPos, endPos));
-        ret =
-            parent.report(
-                lfSource,
-                severity,
-                message,
-                adjustedRange.getStartInclusive().equals(Position.ORIGIN)
-                    ? Position.fromZeroBased(adjustedRange.getEndExclusive().getZeroBasedLine(), 0)
-                    : adjustedRange.getStartInclusive(),
-                adjustedRange.getEndExclusive());
+        var adjustedRange = relevantMap.adjusted(lfSource, range);
+        adjustedRange = new Range(
+            adjustedRange.getStartInclusive().equals(Position.ORIGIN)
+                ? Position.fromZeroBased(adjustedRange.getEndExclusive().getZeroBasedLine(), 0)
+                : adjustedRange.getStartInclusive(),
+            adjustedRange.getEndExclusive());
+        return parent.at(lfSource, adjustedRange);
       }
     }
-    if (ret == null)
-      return severity == DiagnosticSeverity.Error ? reportError(message) : reportWarning(message);
-    return ret;
+    return nowhere();
   }
 
+
   @Override
   public boolean getErrorsOccurred() {
     return parent.getErrorsOccurred();
diff --git a/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java b/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java
index 08c47c4cd3..e371499fbd 100644
--- a/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java
+++ b/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java
@@ -4,9 +4,11 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.lflang.ErrorReporter;
+import org.lflang.ErrorReporterBase;
 import org.lflang.generator.Position;
+import org.lflang.generator.Range;
 
-public class SynchronizedErrorReporter implements ErrorReporter {
+public class SynchronizedErrorReporter extends ErrorReporterBase {
 
   private final ErrorReporter parent;
 
@@ -15,65 +17,18 @@ public SynchronizedErrorReporter(ErrorReporter parent) {
   }
 
   @Override
-  public synchronized String reportError(String message) {
-    return parent.reportError(message);
+  protected synchronized void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+    parent.at(node).report(severity, message);
   }
 
   @Override
-  public synchronized String reportWarning(String message) {
-    return parent.reportWarning(message);
+  protected synchronized void report(Path path, Range range, DiagnosticSeverity severity, String message) {
+    parent.at(path, range).report(severity, message);
   }
 
   @Override
-  public synchronized String reportInfo(String message) {
-    return parent.reportInfo(message);
-  }
-
-  @Override
-  public synchronized String reportError(EObject object, String message) {
-    return parent.reportError(object, message);
-  }
-
-  @Override
-  public synchronized String reportWarning(EObject object, String message) {
-    return parent.reportWarning(object, message);
-  }
-
-  @Override
-  public synchronized String reportInfo(EObject object, String message) {
-    return parent.reportInfo(object, message);
-  }
-
-  @Override
-  public synchronized String reportError(Path file, Integer line, String message) {
-    return parent.reportError(file, line, message);
-  }
-
-  @Override
-  public synchronized String reportWarning(Path file, Integer line, String message) {
-    return parent.reportWarning(file, line, message);
-  }
-
-  @Override
-  public synchronized String reportInfo(Path file, Integer line, String message) {
-    return parent.reportInfo(file, line, message);
-  }
-
-  @Override
-  public synchronized String report(Path file, DiagnosticSeverity severity, String message) {
-    return parent.report(file, severity, message);
-  }
-
-  @Override
-  public synchronized String report(
-      Path file, DiagnosticSeverity severity, String message, int line) {
-    return parent.report(file, severity, message, line);
-  }
-
-  @Override
-  public synchronized String report(
-      Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
-    return parent.report(file, severity, message, startPos, endPos);
+  protected synchronized void reportWithoutPosition(DiagnosticSeverity severity, String message) {
+    parent.nowhere().report(severity, message);
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java b/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
index 31304f43c9..b1cb30f1f0 100644
--- a/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
+++ b/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
@@ -6,6 +6,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalInt;
+
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.Diagnostic;
@@ -15,13 +17,14 @@
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.lflang.ErrorReporter;
+import org.lflang.ErrorReporterBase;
 
 /**
  * Report diagnostics to the language client.
  *
  * @author Peter Donovan
  */
-public class LanguageServerErrorReporter implements ErrorReporter {
+public class LanguageServerErrorReporter extends ErrorReporterBase {
 
   /**
    * The language client to which errors should be reported, if such a client is available. FIXME:
@@ -47,52 +50,38 @@ public LanguageServerErrorReporter(EObject parseRoot) {
     this.diagnostics = new HashMap<>();
   }
 
-  /* -----------------------  PUBLIC METHODS  ------------------------- */
-
-  @Override
-  public String reportError(String message) {
-    return report(getMainFile(), DiagnosticSeverity.Error, message);
-  }
-
-  @Override
-  public String reportWarning(String message) {
-    return report(getMainFile(), DiagnosticSeverity.Warning, message);
-  }
-
-  @Override
-  public String reportInfo(String message) {
-    return report(getMainFile(), DiagnosticSeverity.Information, message);
-  }
-
   @Override
-  public String reportError(EObject object, String message) {
-    return reportError(message);
+  protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+    reportWithoutPosition(severity, message);
   }
 
   @Override
-  public String reportWarning(EObject object, String message) {
-    return reportWarning(message);
+  protected void reportWithoutPosition(DiagnosticSeverity severity, String message) {
+    report(getMainFile(), org.lflang.generator.Range.degenerateRange(Position.ORIGIN), severity, message);
   }
 
   @Override
-  public String reportInfo(EObject object, String message) {
-    return reportInfo(message);
-  }
-
-  @Override
-  public String reportError(Path file, Integer line, String message) {
-    return report(file, DiagnosticSeverity.Error, message, line != null ? line : 1);
+  public Stage2 at(Path file, int line) {
+    // Create a range for the whole line
+    Optional<String> text = getLine(line - 1);
+    org.lflang.generator.Range range = new org.lflang.generator.Range(
+        Position.fromOneBased(line, 1),
+        Position.fromOneBased(line, 1 + text.map(String::length).orElse(0))
+    );
+    return at(file, range);
   }
 
   @Override
-  public String reportWarning(Path file, Integer line, String message) {
-    return report(file, DiagnosticSeverity.Warning, message, line != null ? line : 1);
-  }
+  protected void report(Path path, org.lflang.generator.Range range, DiagnosticSeverity severity, String message) {
+    if (path == null) {
+      path = getMainFile();
+    }
+    diagnostics.computeIfAbsent(path, p -> new ArrayList<>())
+        .add(new Diagnostic(toRange(range.getStartInclusive(), range.getEndExclusive()),
+            message, severity, "LF Language Server"));
 
-  @Override
-  public String reportInfo(Path file, Integer line, String message) {
-    return report(file, DiagnosticSeverity.Information, message, line != null ? line : 1);
   }
+  /* -----------------------  PUBLIC METHODS  ------------------------- */
 
   @Override
   public boolean getErrorsOccurred() {
@@ -103,33 +92,6 @@ public boolean getErrorsOccurred() {
                     .anyMatch(diagnostic -> diagnostic.getSeverity() == DiagnosticSeverity.Error));
   }
 
-  @Override
-  public String report(Path file, DiagnosticSeverity severity, String message) {
-    return report(file, severity, message, 1);
-  }
-
-  @Override
-  public String report(Path file, DiagnosticSeverity severity, String message, int line) {
-    Optional<String> text = getLine(line - 1);
-    return report(
-        file,
-        severity,
-        message,
-        Position.fromOneBased(line, 1),
-        Position.fromOneBased(line, 1 + (text.isEmpty() ? 0 : text.get().length())));
-  }
-
-  @Override
-  public String report(
-      Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
-    if (file == null) file = getMainFile();
-    diagnostics.putIfAbsent(file, new ArrayList<>());
-    diagnostics
-        .get(file)
-        .add(new Diagnostic(toRange(startPos, endPos), message, severity, "LF Language Server"));
-    return "" + severity + ": " + message;
-  }
-
   /**
    * Save a reference to the language client.
    *
diff --git a/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java b/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java
index d21458a3a9..bc8876bc5a 100644
--- a/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java
+++ b/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java
@@ -27,9 +27,13 @@
 package org.lflang.validation;
 
 import java.nio.file.Path;
+
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
-import org.lflang.ErrorReporter;
+
+import org.lflang.ErrorReporterBase;
+import org.lflang.generator.Range;
 
 /**
  * This class translates messages reported via the ErrorReporrter interface to the interface of a
@@ -45,11 +49,10 @@
  *
  * @author Christian Menard
  */
-public class ValidatorErrorReporter implements ErrorReporter {
+public class ValidatorErrorReporter extends ErrorReporterBase {
 
-  private ValidationMessageAcceptor acceptor;
-  private BaseLFValidator.ValidatorStateAccess validatorState;
-  private boolean errorsOccurred = false;
+  private final ValidationMessageAcceptor acceptor;
+  private final BaseLFValidator.ValidatorStateAccess validatorState;
 
   public ValidatorErrorReporter(
       ValidationMessageAcceptor acceptor, BaseLFValidator.ValidatorStateAccess stateAccess) {
@@ -57,26 +60,9 @@ public ValidatorErrorReporter(
     this.validatorState = stateAccess;
   }
 
-  /** Report the given message as an error on the object currently under validation. */
-  @Override
-  public String reportError(String message) {
-    errorsOccurred = true;
-    acceptor.acceptError(
-        message,
-        validatorState.getCurrentObject(),
-        null,
-        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
-        null);
-    return message;
-  }
-
-  /** Report the given message as an error on the given object. */
   @Override
-  public String reportError(EObject object, String message) {
-    errorsOccurred = true;
-    acceptor.acceptError(
-        message, object, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-    return message;
+  protected void reportWithoutPosition(DiagnosticSeverity severity, String message) {
+    reportOnNode(validatorState.getCurrentObject(), severity, message);
   }
 
   /**
@@ -84,103 +70,30 @@ public String reportError(EObject object, String message) {
    *
    * <p>Unfortunately, there is no way to provide a path and a line number to the
    * ValidationMessageAcceptor as messages can only be reported directly as EObjects. While it is
-   * not an ideal solution, this method composes a messages indicating the location of the error and
-   * reports this on the object currently under validation. This way, the error message is not lost,
+   * not an ideal solution, this method composes a messages indicating the location of the error
+   * and
+   * reports this on the object currently under validation. This way, the error message is not
+   * lost,
    * but it is not necessarily reported precisely at the location of the actual error.
    */
   @Override
-  public String reportError(Path file, Integer line, String message) {
-    errorsOccurred = true;
-    String fullMessage =
-        message + " (Reported from " + file.toString() + " on line " + line.toString() + ")";
-    acceptor.acceptError(
-        fullMessage,
-        validatorState.getCurrentObject(),
-        null,
-        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
-        null);
-    return fullMessage;
-  }
-
-  /** Report the given message as a waring on the object currently under validation. */
-  @Override
-  public String reportWarning(String message) {
-    acceptor.acceptWarning(
-        message,
-        validatorState.getCurrentObject(),
-        null,
-        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
-        null);
-    return message;
-  }
-
-  @Override
-  public String reportInfo(String message) {
-    acceptor.acceptInfo(
-        message,
-        validatorState.getCurrentObject(),
-        null,
-        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
-        null);
-    return message;
-  }
-
-  /** Report the given message as a warning on the given object. */
-  @Override
-  public String reportWarning(EObject object, String message) {
-    acceptor.acceptWarning(
-        message, object, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-    return message;
-  }
-
-  @Override
-  public String reportInfo(EObject object, String message) {
-    acceptor.acceptInfo(message, object, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-    return message;
-  }
-
-  /**
-   * Report the given message as an warning on the current object.
-   *
-   * <p>Unfortunately, there is no way to provide a path and a line number to the
-   * ValidationMessageAcceptor as messages can only be reported directly as EObjects. While it is
-   * not an ideal solution, this method composes a messages indicating the location of the warning
-   * and reports this on the object currently under validation. This way, the warning message is not
-   * lost, but it is not necessarily reported precisely at the location of the actual warning.
-   */
-  @Override
-  public String reportWarning(Path file, Integer line, String message) {
+  protected void report(Path path, Range range, DiagnosticSeverity severity, String message) {
     String fullMessage =
-        message + " (Reported from " + file.toString() + " on line " + line.toString() + ")";
-    acceptor.acceptWarning(
-        fullMessage,
-        validatorState.getCurrentObject(),
-        null,
-        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
-        null);
-    return fullMessage;
+        message + " (Reported from " + path + " on line "
+            + range.getStartInclusive().getOneBasedLine() + ")";
+    reportOnNode(validatorState.getCurrentObject(), severity, fullMessage);
   }
 
   @Override
-  public String reportInfo(Path file, Integer line, String message) {
-    String fullMessage =
-        message + " (Reported from " + file.toString() + " on line " + line.toString() + ")";
-    acceptor.acceptInfo(
-        fullMessage,
-        validatorState.getCurrentObject(),
-        null,
-        ValidationMessageAcceptor.INSIGNIFICANT_INDEX,
-        null);
-    return fullMessage;
+  protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+    switch (severity) {
+    case Error -> acceptor.acceptError(
+        message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+    case Warning -> acceptor.acceptWarning(
+        message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+    case Information, Hint -> acceptor.acceptInfo(
+        message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+    }
   }
 
-  /**
-   * Check if errors where reported.
-   *
-   * @return true if errors where reported
-   */
-  @Override
-  public boolean getErrorsOccurred() {
-    return errorsOccurred;
-  }
 }

From 214e45bec2e103ed3d9a0e2d2126f8fcf9c060ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Tue, 13 Jun 2023 14:09:22 +0200
Subject: [PATCH 0328/1114] Update usages

---
 .../main/java/org/lflang/ErrorReporter.java   | 35 +-------------
 .../main/java/org/lflang/TargetProperty.java  |  4 +-
 .../federated/generator/FedGenerator.java     | 18 ++++----
 .../launcher/FedLauncherGenerator.java        | 14 +++---
 .../FedROS2CPPSerialization.java              | 11 ++---
 .../org/lflang/generator/GeneratorBase.java   | 11 ++---
 .../generator/GeneratorCommandFactory.java    |  4 +-
 .../org/lflang/generator/GeneratorUtils.java  |  6 +--
 .../lflang/generator/c/CCmakeGenerator.java   |  8 ++--
 .../org/lflang/generator/c/CCompiler.java     | 46 +++++++++----------
 .../org/lflang/generator/c/CGenerator.java    | 29 ++++++------
 .../java/org/lflang/generator/c/CUtil.java    | 15 +++---
 .../generator/python/PythonGenerator.java     |  6 +--
 .../generator/python/PythonValidator.java     |  6 +--
 .../java/org/lflang/util/ArduinoUtil.java     | 11 +++--
 .../main/java/org/lflang/util/FileUtil.java   | 20 ++++----
 .../org/lflang/validation/LFValidator.java    |  2 +-
 .../lflang/generator/cpp/CppRos2Generator.kt  |  5 +-
 .../generator/cpp/CppStandaloneGenerator.kt   |  9 ++--
 .../lflang/generator/rust/RustGenerator.kt    | 10 ++--
 .../org/lflang/generator/rust/RustModel.kt    |  4 +-
 .../org/lflang/generator/ts/TSGenerator.kt    | 16 ++++---
 .../generator/ts/TSReactionGenerator.kt       |  8 +++-
 23 files changed, 138 insertions(+), 160 deletions(-)

diff --git a/core/src/main/java/org/lflang/ErrorReporter.java b/core/src/main/java/org/lflang/ErrorReporter.java
index 7fec74e434..b45a5e171e 100644
--- a/core/src/main/java/org/lflang/ErrorReporter.java
+++ b/core/src/main/java/org/lflang/ErrorReporter.java
@@ -78,39 +78,6 @@ default void info(String message) {
   }
 
 
-  /**
-   * Report an error.
-   *
-   * @param message The error message.
-   * @return a string that describes the error.
-   */
-  default String reportError(String message) {
-    nowhere().error(message);
-    return message;
-  }
-
-  /**
-   * Report a warning.
-   *
-   * @param message The warning message.
-   * @return a string that describes the warning.
-   */
-  default String reportWarning(String message) {
-    nowhere().warning(message);
-    return message;
-  }
-
-  /**
-   * Report an informational message.
-   *
-   * @param message The message to report
-   * @return a string that describes the error
-   */
-  default String reportInfo(String message) {
-    nowhere().info(message);
-    return message;
-  }
-
   /**
    * Report an error on the specified parse tree object.
    *
@@ -134,7 +101,7 @@ default String reportWarning(EObject object, String message) {
     at(object).warning(message);
     return message;
   }
-  
+
   /**
    * Report an error at the specified line within a file.
    *
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 4a68fc3796..92832e6214 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -472,8 +472,8 @@ public enum TargetProperty {
                   String s =
                       "Unidentified Platform Type, LF supports the following platform types: "
                           + Arrays.asList(Platform.values()).toString();
-                  err.reportError(s);
-                  throw new AssertionError(s);
+                    err.nowhere().error(s);
+                    throw new AssertionError(s);
                 }
                 config.platformOptions.platform = p;
                 break;
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 6656a489f8..acbec3dadf 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -164,10 +164,10 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
               subContexts.forEach(
                   c -> {
                     if (c.getErrorReporter().getErrorsOccurred()) {
-                      context
-                          .getErrorReporter()
-                          .reportError(
-                              "Failure during code generation of " + c.getFileConfig().srcFile);
+                      ErrorReporter errorReporter1 = context
+                          .getErrorReporter();
+                      errorReporter1.at(c.getFileConfig().srcFile).error(
+                          "Failure during code generation of " + c.getFileConfig().srcFile);
                     }
                   });
             });
@@ -231,11 +231,11 @@ private boolean federatedExecutionIsSupported(Resource resource) {
     var targetOK =
         List.of(Target.C, Target.Python, Target.TS, Target.CPP, Target.CCPP).contains(target);
     if (!targetOK) {
-      errorReporter.reportError("Federated execution is not supported with target " + target + ".");
+      errorReporter.nowhere().error(
+          "Federated execution is not supported with target " + target + ".");
     }
     if (target.equals(Target.C) && GeneratorUtils.isHostWindows()) {
-      errorReporter.reportError(
-          "Federated LF programs with a C target are currently not supported on Windows.");
+      errorReporter.nowhere().error("Federated LF programs with a C target are currently not supported on Windows.");
       targetOK = false;
     }
 
@@ -330,7 +330,9 @@ public TargetConfig getTargetConfig() {
     try {
       compileThreadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
     } catch (Exception e) {
-      context.getErrorReporter().reportError("Failure during code generation: " + e.getMessage());
+      ErrorReporter errorReporter1 = context.getErrorReporter();
+      String message = "Failure during code generation: " + e.getMessage();
+      errorReporter1.nowhere().error(message);
       e.printStackTrace();
     } finally {
       finalizer.accept(subContexts);
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index b3be6acad0..b93a7bee03 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -214,7 +214,7 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
       try {
         Files.createDirectories(fileConfig.binPath);
       } catch (IOException e) {
-        errorReporter.reportError("Unable to create directory: " + fileConfig.binPath);
+        errorReporter.nowhere().error("Unable to create directory: " + fileConfig.binPath);
       }
     }
 
@@ -232,17 +232,17 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
     try {
       fOut = new FileOutputStream(file);
     } catch (FileNotFoundException e) {
-      errorReporter.reportError("Unable to find file: " + file);
+      errorReporter.nowhere().error("Unable to find file: " + file);
     }
     try {
       fOut.write(shCode.toString().getBytes());
       fOut.close();
     } catch (IOException e) {
-      errorReporter.reportError("Unable to write to file: " + file);
+      errorReporter.nowhere().error("Unable to write to file: " + file);
     }
 
     if (!file.setExecutable(true, false)) {
-      errorReporter.reportWarning("Unable to make launcher script executable.");
+      errorReporter.nowhere().warning("Unable to make launcher script executable.");
     }
 
     // Write the distributor file.
@@ -257,12 +257,12 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
         fOut.write(distCode.toString().getBytes());
         fOut.close();
         if (!file.setExecutable(true, false)) {
-          errorReporter.reportWarning("Unable to make file executable: " + file);
+          errorReporter.nowhere().warning("Unable to make file executable: " + file);
         }
       } catch (FileNotFoundException e) {
-        errorReporter.reportError("Unable to find file: " + file);
+        errorReporter.nowhere().error("Unable to find file: " + file);
       } catch (IOException e) {
-        errorReporter.reportError("Unable to write to file " + file);
+        errorReporter.nowhere().error("Unable to write to file " + file);
       }
     }
   }
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
index 1384d11517..ae0449f9e7 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
@@ -47,13 +47,12 @@ public class FedROS2CPPSerialization implements FedSerialization {
   @Override
   public boolean isCompatible(GeneratorBase generator) {
     if (generator.getTarget() != Target.C) {
-      generator.errorReporter.reportError(
-          "ROS serialization is currently only supported for the C target.");
-      return false;
+        generator.errorReporter.nowhere().error("ROS serialization is currently only supported for the C target.");
+        return false;
     } else if (!generator.getTargetConfig().compiler.equalsIgnoreCase("g++")) {
-      generator.errorReporter.reportError(
-          "Please use the 'compiler: \"g++\"' target property \n" + "for ROS serialization");
-      return false;
+        generator.errorReporter.nowhere().error(
+            "Please use the 'compiler: \"g++\"' target property \n" + "for ROS serialization");
+        return false;
     }
     return true;
   }
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index c8ebbc38a2..6a5c189744 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -425,9 +425,8 @@ public int getReactionBankIndex(Reaction reaction) {
    */
   protected void checkModalReactorSupport(boolean isSupported) {
     if (hasModalReactors && !isSupported) {
-      errorReporter.reportError(
-          "The currently selected code generation or "
-              + "target configuration does not support modal reactors!");
+      errorReporter.nowhere().error("The currently selected code generation or "
+                + "target configuration does not support modal reactors!");
     }
   }
 
@@ -439,8 +438,7 @@ protected void checkModalReactorSupport(boolean isSupported) {
    */
   protected void checkWatchdogSupport(boolean isSupported) {
     if (hasWatchdogs && !isSupported) {
-      errorReporter.reportError(
-          "Watchdogs are currently only supported for threaded programs in the C target.");
+      errorReporter.nowhere().error("Watchdogs are currently only supported for threaded programs in the C target.");
     }
   }
 
@@ -498,8 +496,7 @@ private void transformConflictingConnectionsInModalReactors() {
    * reactors.
    */
   protected String getConflictingConnectionsInModalReactorsBody(String source, String dest) {
-    errorReporter.reportError(
-        "The currently selected code generation "
+    errorReporter.nowhere().error("The currently selected code generation "
             + "is missing an implementation for conflicting "
             + "transforming connections in modal reactors.");
     return "MODAL MODELS NOT SUPPORTED";
diff --git a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
index b1dc44e094..471e85aa89 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
@@ -145,9 +145,9 @@ public LFCommand createCommand(String cmd, List<String> args, Path dir, boolean
               + " is installed. "
               + "You can set PATH in ~/.bash_profile on Linux or Mac.";
       if (failOnError) {
-        errorReporter.reportError(message);
+        errorReporter.nowhere().error(message);
       } else {
-        errorReporter.reportWarning(message);
+          errorReporter.nowhere().warning(message);
       }
     }
 
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index 04ae33ba0c..6f0e217c48 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -175,9 +175,9 @@ public static boolean canGenerate(
     }
     // abort if there is no main reactor
     if (mainDef == null) {
-      errorReporter.reportInfo(
-          "INFO: The given Lingua Franca program does not define a main reactor. Therefore, no code"
-              + " was generated.");
+      errorReporter.nowhere().info(
+          "The given Lingua Franca program does not define a main reactor. Therefore, no code"
+                + " was generated.");
       context.finish(GeneratorResult.NOTHING);
       return false;
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index fd818b45a5..061ba50d38 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -312,10 +312,10 @@ CodeBuilder generateCMakeCode(
             break;
           }
         default:
-          errorReporter.reportWarning(
-              "Using the flags target property with cmake is dangerous.\n"
-                  + " Use cmake-include instead.");
-          cMakeCode.pr("add_compile_options( " + compilerFlag + " )");
+            errorReporter.nowhere().warning(
+                "Using the flags target property with cmake is dangerous.\n"
+                          + " Use cmake-include instead.");
+            cMakeCode.pr("add_compile_options( " + compilerFlag + " )");
           cMakeCode.pr("add_link_options( " + compilerFlag + ")");
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index 7570cf4fd6..2af631b349 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -134,8 +134,8 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
     if (cMakeReturnCode != 0
         && context.getMode() == LFGeneratorContext.Mode.STANDALONE
         && !outputContainsKnownCMakeErrors(compile.getErrors())) {
-      errorReporter.reportError(
-          targetConfig.compiler + " failed with error code " + cMakeReturnCode);
+        errorReporter.nowhere().error(
+            targetConfig.compiler + " failed with error code " + cMakeReturnCode);
     }
 
     // For warnings (vs. errors), the return code is 0.
@@ -156,8 +156,8 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
       if (makeReturnCode != 0
           && context.getMode() == LFGeneratorContext.Mode.STANDALONE
           && !outputContainsKnownCMakeErrors(build.getErrors())) {
-        errorReporter.reportError(
-            targetConfig.compiler + " failed with error code " + makeReturnCode);
+          errorReporter.nowhere().error(
+              targetConfig.compiler + " failed with error code " + makeReturnCode);
       }
 
       // For warnings (vs. errors), the return code is 0.
@@ -181,7 +181,7 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
         LFCommand flash = buildWestFlashCommand();
         int flashRet = flash.run();
         if (flashRet != 0) {
-          errorReporter.reportError("West flash command failed with error code " + flashRet);
+            errorReporter.nowhere().error("West flash command failed with error code " + flashRet);
         } else {
           System.out.println("SUCCESS: Flashed application with west");
         }
@@ -201,11 +201,10 @@ public LFCommand compileCmakeCommand() {
     LFCommand command =
         commandFactory.createCommand("cmake", cmakeOptions(targetConfig, fileConfig), buildPath);
     if (command == null) {
-      errorReporter.reportError(
-          "The C/CCpp target requires CMAKE >= "
-              + CCmakeGenerator.MIN_CMAKE_VERSION
-              + " to compile the generated code. "
-              + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
+        errorReporter.nowhere().error("The C/CCpp target requires CMAKE >= "
+                  + CCmakeGenerator.MIN_CMAKE_VERSION
+                  + " to compile the generated code. "
+                  + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
     }
     return command;
   }
@@ -292,9 +291,9 @@ public LFCommand buildCmakeCommand() {
                 buildTypeToCmakeConfig(targetConfig.cmakeBuildType)),
             buildPath);
     if (command == null) {
-      errorReporter.reportError(
-          "The C/CCpp target requires CMAKE >= 3.5 to compile the generated code. "
-              + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
+        errorReporter.nowhere().error(
+            "The C/CCpp target requires CMAKE >= 3.5 to compile the generated code. "
+                  + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
     }
     return command;
   }
@@ -315,7 +314,7 @@ public LFCommand buildWestFlashCommand() {
       cmd = commandFactory.createCommand("west", List.of("flash"), buildPath);
     }
     if (cmd == null) {
-      errorReporter.reportError("Could not create west flash command.");
+        errorReporter.nowhere().error("Could not create west flash command.");
     }
 
     return cmd;
@@ -341,14 +340,13 @@ private boolean outputContainsKnownCMakeErrors(String CMakeOutput) {
     if (CMakeOutput.contains("The CMAKE_C_COMPILER is set to a C++ compiler")) {
       // If so, print an appropriate error message
       if (targetConfig.compiler != null) {
-        errorReporter.reportError(
-            "A C++ compiler was requested in the compiler target property."
-                + " Use the CCpp or the Cpp target instead.");
+          errorReporter.nowhere().error(
+              "A C++ compiler was requested in the compiler target property."
+                      + " Use the CCpp or the Cpp target instead.");
       } else {
-        errorReporter.reportError(
-            "\"A C++ compiler was detected."
-                + " The C target works best with a C compiler."
-                + " Use the CCpp or the Cpp target instead.\"");
+          errorReporter.nowhere().error("\"A C++ compiler was detected."
+                      + " The C target works best with a C compiler."
+                      + " Use the CCpp or the Cpp target instead.\"");
       }
       return true;
     }
@@ -416,9 +414,9 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
     LFCommand command =
         commandFactory.createCommand(targetConfig.compiler, compileArgs, fileConfig.getOutPath());
     if (command == null) {
-      errorReporter.reportError(
-          "The C/CCpp target requires GCC >= 7 to compile the generated code. "
-              + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
+        errorReporter.nowhere().error(
+            "The C/CCpp target requires GCC >= 7 to compile the generated code. "
+                  + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
     }
     return command;
   }
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 7bed894341..cf1aee06a8 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -49,6 +49,7 @@
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
+
 import org.lflang.FileConfig;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
@@ -374,9 +375,9 @@ public void accommodatePhysicalActionsIfPresent() {
   protected boolean isOSCompatible() {
     if (GeneratorUtils.isHostWindows()) {
       if (CCppMode) {
-        errorReporter.reportError(
+        errorReporter.nowhere().error(
             "LF programs with a CCpp target are currently not supported on Windows. "
-                + "Exiting code generation.");
+                    + "Exiting code generation.");
         return false;
       }
     }
@@ -415,9 +416,11 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
       generateHeaders();
       code.writeToFile(targetFile);
     } catch (IOException e) {
-      errorReporter.reportError(e.getMessage());
+      String message = e.getMessage();
+      errorReporter.nowhere().error(message);
     } catch (RuntimeException e) {
-      errorReporter.reportError(e.getMessage());
+      String message = e.getMessage();
+      errorReporter.nowhere().error(message);
       throw e;
     }
 
@@ -827,7 +830,7 @@ protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
             fileConfig.srcFile.getParent().resolve(targetConfig.fedSetupPreamble),
             destination.resolve(targetConfig.fedSetupPreamble));
       } catch (IOException e) {
-        errorReporter.reportError(
+        errorReporter.nowhere().error(
             "Failed to find _fed_setup file " + targetConfig.fedSetupPreamble);
       }
     }
@@ -938,7 +941,7 @@ private void pickCompilePlatform() {
     if (targetConfig.platformOptions.platform != Platform.AUTO) {
       osName = targetConfig.platformOptions.platform.toString();
     } else if (Stream.of("mac", "darwin", "win", "nux").noneMatch(osName::contains)) {
-      errorReporter.reportError("Platform " + osName + " is not supported");
+      errorReporter.nowhere().error("Platform " + osName + " is not supported");
     }
   }
 
@@ -1631,7 +1634,7 @@ public void processProtoFile(String filename) {
             List.of("--c_out=" + this.fileConfig.getSrcGenPath(), filename),
             fileConfig.srcPath);
     if (protoc == null) {
-      errorReporter.reportError("Processing .proto files requires protoc-c >= 1.3.3.");
+      errorReporter.nowhere().error("Processing .proto files requires protoc-c >= 1.3.3.");
       return;
     }
     var returnCode = protoc.run();
@@ -1644,7 +1647,7 @@ public void processProtoFile(String filename) {
       targetConfig.compileLibraries.add("protobuf-c");
       targetConfig.compilerFlags.add("-lprotobuf-c");
     } else {
-      errorReporter.reportError("protoc-c returns error code " + returnCode);
+      errorReporter.nowhere().error("protoc-c returns error code " + returnCode);
     }
   }
 
@@ -1979,9 +1982,9 @@ protected void setUpGeneralParameters() {
           PlatformOption.USER_THREADS.name(),
           String.valueOf(targetConfig.platformOptions.userThreads));
     } else if (targetConfig.platformOptions.userThreads > 0) {
-      errorReporter.reportWarning(
-          "Specifying user threads is only for threaded Lingua Franca on the Zephyr platform. This"
-              + " option will be ignored.");
+        errorReporter.nowhere().warning(
+            "Specifying user threads is only for threaded Lingua Franca on the Zephyr platform. This"
+                  + " option will be ignored.");
     }
 
     if (targetConfig.threading) { // FIXME: This logic is duplicated in CMake
@@ -2099,7 +2102,7 @@ private void createMainReactorInstance() {
             new ReactorInstance(toDefinition(mainDef.getReactorClass()), errorReporter, reactors);
         var reactionInstanceGraph = this.main.assignLevels();
         if (reactionInstanceGraph.nodeCount() > 0) {
-          errorReporter.reportError("Main reactor has causality cycles. Skipping code generation.");
+          errorReporter.nowhere().error("Main reactor has causality cycles. Skipping code generation.");
           return;
         }
         if (hasDeadlines) {
@@ -2108,7 +2111,7 @@ private void createMainReactorInstance() {
         // Inform the run-time of the breadth/parallelism of the reaction graph
         var breadth = reactionInstanceGraph.getBreadth();
         if (breadth == 0) {
-          errorReporter.reportWarning("The program has no reactions");
+            errorReporter.nowhere().warning("The program has no reactions");
         } else {
           targetConfig.compileDefinitions.put(
               "LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth()));
diff --git a/core/src/main/java/org/lflang/generator/c/CUtil.java b/core/src/main/java/org/lflang/generator/c/CUtil.java
index f526bb76f1..590797a769 100644
--- a/core/src/main/java/org/lflang/generator/c/CUtil.java
+++ b/core/src/main/java/org/lflang/generator/c/CUtil.java
@@ -619,13 +619,14 @@ public static void runBuildCommand(
     for (LFCommand cmd : commands) {
       int returnCode = cmd.run();
       if (returnCode != 0 && mode != LFGeneratorContext.Mode.EPOCH) {
-        errorReporter.reportError(
-            String.format(
-                // FIXME: Why is the content of stderr not provided to the user in this error
-                // message?
-                "Build command \"%s\" failed with error code %d.",
-                targetConfig.buildCommands, returnCode));
-        return;
+          // FIXME: Why is the content of stderr not provided to the user in this error
+          // message?
+          errorReporter.nowhere().error(String.format(
+                      // FIXME: Why is the content of stderr not provided to the user in this error
+                      // message?
+                      "Build command \"%s\" failed with error code %d.",
+                      targetConfig.buildCommands, returnCode));
+          return;
       }
       // For warnings (vs. errors), the return code is 0.
       // But we still want to mark the IDE.
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index 91fdfaffad..6da6e6a8c5 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -303,14 +303,14 @@ public void processProtoFile(String filename) {
             fileConfig.srcPath);
 
     if (protoc == null) {
-      errorReporter.reportError("Processing .proto files requires libprotoc >= 3.6.1");
-      return;
+        errorReporter.nowhere().error("Processing .proto files requires libprotoc >= 3.6.1");
+        return;
     }
     int returnCode = protoc.run();
     if (returnCode == 0) {
       pythonRequiredModules.add("google-api-python-client");
     } else {
-      errorReporter.reportError("protoc returns error code " + returnCode);
+        errorReporter.nowhere().error("protoc returns error code " + returnCode);
     }
   }
 
diff --git a/core/src/main/java/org/lflang/generator/python/PythonValidator.java b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
index 7d040bace0..fa2584ce4c 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonValidator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
@@ -337,10 +337,10 @@ public Strategy getOutputReportingStrategy() {
               } catch (JsonProcessingException e) {
                 System.err.printf("Failed to parse \"%s\":%n", validationOutput);
                 e.printStackTrace();
-                errorReporter.reportWarning(
+                errorReporter.nowhere().warning(
                     "Failed to parse linter output. The Lingua Franca code generator is tested with"
-                        + " Pylint version 2.12.2. Consider updating Pylint if you have an older"
-                        + " version.");
+                                    + " Pylint version 2.12.2. Consider updating Pylint if you have an older"
+                                    + " version.");
               }
             };
           }
diff --git a/core/src/main/java/org/lflang/util/ArduinoUtil.java b/core/src/main/java/org/lflang/util/ArduinoUtil.java
index af741da7f2..e749a0568a 100644
--- a/core/src/main/java/org/lflang/util/ArduinoUtil.java
+++ b/core/src/main/java/org/lflang/util/ArduinoUtil.java
@@ -110,8 +110,8 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
       int retCode = 0;
       retCode = command.run(context.getCancelIndicator());
       if (retCode != 0 && context.getMode() == LFGeneratorContext.Mode.STANDALONE) {
-        errorReporter.reportError("arduino-cli failed with error code " + retCode);
-        throw new IOException("arduino-cli failure");
+          errorReporter.nowhere().error("arduino-cli failed with error code " + retCode);
+          throw new IOException("arduino-cli failure");
       }
     } catch (IOException e) {
       Exceptions.sneakyThrow(e);
@@ -132,16 +132,17 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
                     targetConfig.platformOptions.port),
                 fileConfig.getSrcGenPath());
         if (flash == null) {
-          errorReporter.reportError("Could not create arduino-cli flash command.");
+            errorReporter.nowhere().error("Could not create arduino-cli flash command.");
         }
         int flashRet = flash.run();
         if (flashRet != 0) {
-          errorReporter.reportError("arduino-cli flash command failed with error code " + flashRet);
+            errorReporter.nowhere().error(
+                "arduino-cli flash command failed with error code " + flashRet);
         } else {
           System.out.println("SUCCESS: Flashed board using arduino-cli");
         }
       } else {
-        errorReporter.reportError("Need to provide a port on which to automatically flash.");
+          errorReporter.nowhere().error("Need to provide a port on which to automatically flash.");
       }
     } else {
       System.out.println("********");
diff --git a/core/src/main/java/org/lflang/util/FileUtil.java b/core/src/main/java/org/lflang/util/FileUtil.java
index 23108c7375..0b12105dfc 100644
--- a/core/src/main/java/org/lflang/util/FileUtil.java
+++ b/core/src/main/java/org/lflang/util/FileUtil.java
@@ -327,11 +327,11 @@ public static void copyFilesOrDirectories(
           }
           System.out.println("Copied '" + fileOrDirectory + "' from the file system.");
         } catch (IOException e) {
-          errorReporter.reportError(
-              "Unable to copy '"
-                  + fileOrDirectory
-                  + "' from the file system. Reason: "
-                  + e.toString());
+            String message = "Unable to copy '"
+                + fileOrDirectory
+                + "' from the file system. Reason: "
+                + e.toString();
+            errorReporter.nowhere().error(message);
         }
       } else {
         try {
@@ -342,11 +342,11 @@ public static void copyFilesOrDirectories(
             System.out.println("Copied '" + fileOrDirectory + "' from the class path.");
           }
         } catch (IOException e) {
-          errorReporter.reportError(
-              "Unable to copy '"
-                  + fileOrDirectory
-                  + "' from the class path. Reason: "
-                  + e.toString());
+            String message = "Unable to copy '"
+                + fileOrDirectory
+                + "' from the class path. Reason: "
+                + e.toString();
+            errorReporter.nowhere().error(message);
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index d228a2dba6..31afa8e1ac 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -1076,7 +1076,7 @@ public void checkTargetDecl(TargetDecl target) throws IOException {
     }
     String lfFileName = FileUtil.nameWithoutExtension(target.eResource());
     if (Character.isDigit(lfFileName.charAt(0))) {
-      errorReporter.reportError("LF file names must not start with a number");
+        errorReporter.nowhere().error("LF file names must not start with a number");
     }
   }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt
index a689a53c88..ac0184707b 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt
@@ -39,7 +39,8 @@ class CppRos2Generator(generator: CppGenerator) : CppPlatformGenerator(generator
         val ros2Version = System.getenv("ROS_DISTRO")
 
         if (ros2Version.isNullOrBlank()) {
-            errorReporter.reportError(
+            errorReporter.nowhere(
+            ).error(
                 "Could not find a ROS2 installation! Please install ROS2 and source the setup script. " +
                         "Also see https://docs.ros.org/en/galactic/Installation.html"
             )
@@ -61,7 +62,7 @@ class CppRos2Generator(generator: CppGenerator) : CppPlatformGenerator(generator
         val returnCode = colconCommand?.run(context.cancelIndicator);
         if (returnCode != 0 && !errorReporter.errorsOccurred) {
             // If errors occurred but none were reported, then the following message is the best we can do.
-            errorReporter.reportError("colcon failed with error code $returnCode")
+            errorReporter.nowhere().error("colcon failed with error code $returnCode")
         }
 
         return !errorReporter.errorsOccurred
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
index bbe3826bb0..7d470bc2bf 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
@@ -79,11 +79,11 @@ class CppStandaloneGenerator(generator: CppGenerator) :
                 }
                 if ((makeReturnCode != 0 || installReturnCode != 0) && !errorReporter.errorsOccurred) {
                     // If errors occurred but none were reported, then the following message is the best we can do.
-                    errorReporter.reportError("make failed with error code $makeReturnCode")
+                    errorReporter.nowhere().error("make failed with error code $makeReturnCode")
                 }
             }
             if (cmakeReturnCode != 0) {
-                errorReporter.reportError("cmake failed with error code $cmakeReturnCode")
+                errorReporter.nowhere().error("cmake failed with error code $cmakeReturnCode")
             }
         }
         return !errorReporter.errorsOccurred
@@ -98,7 +98,8 @@ class CppStandaloneGenerator(generator: CppGenerator) :
             version = regex.find(cmd.output.toString())?.value
         }
         if (version == null || version.compareVersion("3.5.0") < 0) {
-            errorReporter.reportError(
+            errorReporter.nowhere(
+            ).error(
                 "The C++ target requires CMAKE >= 3.5.0 to compile the generated code. " +
                         "Auto-compiling can be disabled using the \"no-compile: true\" target property."
             )
@@ -138,7 +139,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
     private fun createMakeCommand(buildPath: Path, version: String, target: String): LFCommand {
         val makeArgs: List<String>
         if (version.compareVersion("3.12.0") < 0) {
-            errorReporter.reportWarning("CMAKE is older than version 3.12. Parallel building is not supported.")
+            errorReporter.nowhere().warning("CMAKE is older than version 3.12. Parallel building is not supported.")
             makeArgs =
                 listOf("--build", ".", "--target", target, "--config", targetConfig.cmakeBuildType?.toString() ?: "Release")
         } else {
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
index c8f50d9b56..007d606620 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
@@ -25,7 +25,6 @@
 package org.lflang.generator.rust
 
 import org.eclipse.emf.ecore.resource.Resource
-import org.lflang.ErrorReporter
 import org.lflang.Target
 import org.lflang.TargetProperty.BuildType
 import org.lflang.generator.GeneratorUtils.canGenerate
@@ -143,9 +142,12 @@ class RustGenerator(
         } else if (context.cancelIndicator.isCanceled) {
             context.finish(GeneratorResult.CANCELLED)
         } else {
-            if (!errorsOccurred()) errorReporter.reportError(
-                "cargo failed with error code $cargoReturnCode and reported the following error(s):\n${cargoCommand.errors}"
-            )
+            if (!errorsOccurred()) {
+                errorReporter.nowhere(
+                ).error(
+                    "cargo failed with error code $cargoReturnCode and reported the following error(s):\n${cargoCommand.errors}"
+                )
+            }
             context.finish(GeneratorResult.FAILED)
         }
     }
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
index 0238beca0c..e5f58e40c2 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
@@ -465,7 +465,7 @@ object RustModelBuilder {
                 // Print info to reduce surprise. If the env var is not set,
                 // the runtime will be fetched from the internet by Cargo. If
                 // the value is incorrect, Cargo will crash.
-                errorReporter.reportInfo("Using the Rust runtime from environment variable LOCAL_RUST_REACTOR_RT=$it")
+                errorReporter.nowhere().info("Using the Rust runtime from environment variable LOCAL_RUST_REACTOR_RT=$it")
             }
 
             if (localPath == null) {
@@ -510,7 +510,7 @@ object RustModelBuilder {
             }
 
             if (!targetConfig.threading && PARALLEL_RT_FEATURE in userSpec.features) {
-                errorReporter.reportWarning("Threading cannot be disabled as it was enabled manually as a runtime feature.")
+                errorReporter.nowhere().warning("Threading cannot be disabled as it was enabled manually as a runtime feature.")
             }
 
             return userSpec
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
index af7e445c16..ba17bbc769 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -309,14 +309,16 @@ class TSGenerator(
             }
             installProtoBufsIfNeeded(true, path, context.cancelIndicator)
         } else {
-            errorReporter.reportWarning(
+            errorReporter.nowhere(
+            ).warning(
                 "Falling back on npm. To prevent an accumulation of replicated dependencies, " +
-                        "it is highly recommended to install pnpm globally (npm install -g pnpm).")
+                        "it is highly recommended to install pnpm globally (npm install -g pnpm)."
+            )
 
             val npmInstall = commandFactory.createCommand("npm", if (production) listOf("install", "--production") else listOf("install"), path)
 
             if (npmInstall == null) {
-                errorReporter.reportError(NO_NPM_MESSAGE)
+                errorReporter.nowhere().error(NO_NPM_MESSAGE)
                 return
             }
 
@@ -378,7 +380,7 @@ class TSGenerator(
         val protoc = commandFactory.createCommand("protoc", protocArgs, fileConfig.srcPath)
 
         if (protoc == null) {
-            errorReporter.reportError("Processing .proto files requires libprotoc >= 3.6.1.")
+            errorReporter.nowhere().error("Processing .proto files requires libprotoc >= 3.6.1.")
             return
         }
 
@@ -393,7 +395,7 @@ class TSGenerator(
 //                targetConfig.compileLibraries.add('-l')
 //                targetConfig.compileLibraries.add('protobuf-c')
         } else {
-            errorReporter.reportError("protoc failed with error code $returnCode.")
+            errorReporter.nowhere().error("protoc failed with error code $returnCode.")
         }
         // FIXME: report errors from this command.
     }
@@ -419,14 +421,14 @@ class TSGenerator(
         val tsc = commandFactory.createCommand("npm", listOf("run", "build"), fileConfig.srcGenPkgPath)
 
         if (tsc == null) {
-            errorReporter.reportError(NO_NPM_MESSAGE)
+            errorReporter.nowhere().error(NO_NPM_MESSAGE)
             return
         }
 
         if (validator.run(tsc, cancelIndicator) == 0) {
             println("SUCCESS (compiling generated TypeScript code)")
         } else {
-            errorReporter.reportError("Compiler failed with the following errors:\n${tsc.errors}")
+            errorReporter.nowhere().error("Compiler failed with the following errors:\n${tsc.errors}")
         }
     }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
index b82e1d20af..d32e0a9860 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
@@ -136,7 +136,11 @@ class TSReactionGenerator(
             is Timer  -> "__Tag"
             is Action -> (trigOrSource.variable as Action).tsActionType
             is Port   -> (trigOrSource.variable as Port).tsPortType
-            else      -> errorReporter.reportError("Invalid trigger: ${trigOrSource.variable.name}")
+            else      -> {
+                val message = "Invalid trigger: ${trigOrSource.variable.name}"
+                errorReporter.nowhere().error(message)
+                message
+            }
         }
 
         val portClassType = if (trigOrSource.variable.isMultiport) {
@@ -298,7 +302,7 @@ class TSReactionGenerator(
             val functArg = effect.generateVarRef()
             when (val effectVar = effect.variable) {
                 is Timer  -> {
-                    errorReporter.reportError("A timer cannot be an effect of a reaction")
+                    errorReporter.nowhere().error("A timer cannot be an effect of a reaction")
                 }
 
                 is Action -> {

From f4c249eed3bef3e8399030939cae043b5b0f72b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Tue, 13 Jun 2023 14:14:29 +0200
Subject: [PATCH 0329/1114] More updates...

---
 .../main/java/org/lflang/ErrorReporter.java   | 12 ----------
 core/src/main/java/org/lflang/ModelInfo.java  |  4 ++--
 .../main/java/org/lflang/TargetProperty.java  |  8 ++++---
 .../federated/generator/FedGenerator.java     |  8 +++----
 .../federated/generator/FedMainEmitter.java   |  5 ++--
 .../federated/generator/FederateInstance.java |  5 ++--
 .../federated/validation/FedValidator.java    |  6 ++---
 .../org/lflang/generator/GeneratorBase.java   |  9 ++++----
 .../org/lflang/generator/PortInstance.java    |  5 ++--
 .../org/lflang/generator/ReactorInstance.java | 11 +++++----
 .../org/lflang/generator/TimerInstance.java   |  8 +++++--
 .../lflang/generator/c/CPortGenerator.java    |  5 ++--
 .../generator/c/CReactionGenerator.java       | 12 +++++-----
 .../generator/c/CWatchdogGenerator.java       |  9 ++++----
 .../python/PythonReactionGenerator.java       | 10 ++++----
 .../generator/rust/CargoDependencySpec.java   |  9 +++++++-
 .../generator/rust/RustTargetConfig.java      | 10 ++++----
 .../generator/cpp/CppActionGenerator.kt       | 12 ++++++----
 .../generator/cpp/CppInstanceGenerator.kt     |  4 ++--
 .../org/lflang/generator/ts/TSGenerator.kt    | 23 +++++++++----------
 .../lflang/generator/ts/TSReactorGenerator.kt | 12 ----------
 21 files changed, 89 insertions(+), 98 deletions(-)

diff --git a/core/src/main/java/org/lflang/ErrorReporter.java b/core/src/main/java/org/lflang/ErrorReporter.java
index b45a5e171e..0f8e7509f9 100644
--- a/core/src/main/java/org/lflang/ErrorReporter.java
+++ b/core/src/main/java/org/lflang/ErrorReporter.java
@@ -78,18 +78,6 @@ default void info(String message) {
   }
 
 
-  /**
-   * Report an error on the specified parse tree object.
-   *
-   * @param object The parse tree object.
-   * @param message The error message.
-   * @return a string that describes the error.
-   */
-  default String reportError(EObject object, String message) {
-    at(object).error(message);
-    return message;
-  }
-
   /**
    * Report a warning on the specified parse tree object.
    *
diff --git a/core/src/main/java/org/lflang/ModelInfo.java b/core/src/main/java/org/lflang/ModelInfo.java
index 17ee7cfb76..6bacd33a0e 100644
--- a/core/src/main/java/org/lflang/ModelInfo.java
+++ b/core/src/main/java/org/lflang/ModelInfo.java
@@ -35,6 +35,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.NamedInstance;
 import org.lflang.generator.ReactorInstance;
@@ -145,8 +146,7 @@ public void checkCaseInsensitiveNameCollisions(Model model, ErrorReporter report
           .filter(it -> getName(it).toLowerCase().equals(badName))
           .forEach(
               it ->
-                  reporter.reportError(
-                      it, "Multiple reactors have the same name up to case differences."));
+                  reporter.at(it).error("Multiple reactors have the same name up to case differences."));
     }
   }
 
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 92832e6214..00aefd43b2 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -35,6 +35,8 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.util.RuntimeIOException;
 import org.lflang.TargetConfig.DockerOptions;
 import org.lflang.TargetConfig.PlatformOptions;
@@ -718,8 +720,8 @@ else if (paths.size() == 1) {
         try {
           referencePath = FileUtil.toPath(value.eResource().getURI()).toAbsolutePath();
         } catch (IOException e) {
-          err.reportError(value, "Invalid path? " + e.getMessage());
-          throw new RuntimeIOException(e);
+            err.at(value).error("Invalid path? " + e.getMessage());
+            throw new RuntimeIOException(e);
         }
 
         // we'll resolve relative paths to check that the files
@@ -951,7 +953,7 @@ public static void set(TargetConfig config, List<KeyValuePair> properties, Error
             try {
               p.setter.parseIntoTargetConfig(config, property.getValue(), err);
             } catch (InvalidLfSourceException e) {
-              err.reportError(e.getNode(), e.getProblem());
+                err.at(e.getNode()).error(e.getProblem());
             }
           }
         });
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index acbec3dadf..f97b81cf05 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -21,6 +21,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
 import org.eclipse.xtext.resource.XtextResource;
@@ -414,8 +415,7 @@ private void analyzeFederates(Reactor federation, LFGeneratorContext context) {
     for (Instantiation instantiation : ASTUtils.allInstantiations(federation)) {
       int bankWidth = ASTUtils.width(instantiation.getWidthSpec(), mainReactorContext);
       if (bankWidth < 0) {
-        errorReporter.reportError(
-            instantiation, "Cannot determine bank width! Assuming width of 1.");
+        errorReporter.at(instantiation).error("Cannot determine bank width! Assuming width of 1.");
         // Continue with a bank width of 1.
         bankWidth = 1;
       }
@@ -509,8 +509,8 @@ private void replaceConnectionFromOutputPort(PortInstance output) {
     for (SendRange srcRange : output.getDependentPorts()) {
       if (srcRange.connection == null) {
         // This should not happen.
-        errorReporter.reportError(
-            output.getDefinition(), "Unexpected error. Cannot find output connection for port");
+        EObject object = output.getDefinition();
+        errorReporter.at(object).error("Unexpected error. Cannot find output connection for port");
         continue;
       }
       // Iterate through destinations
diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index 86ce4f02b9..9d132d412a 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -24,9 +24,8 @@ String generateMainReactor(
       FederateInstance federate, Reactor originalMainReactor, ErrorReporter errorReporter) {
     // FIXME: Handle modes at the top-level
     if (!ASTUtils.allModes(originalMainReactor).isEmpty()) {
-      errorReporter.reportError(
-          ASTUtils.allModes(originalMainReactor).stream().findFirst().get(),
-          "Modes at the top level are not supported under federated execution.");
+        errorReporter.at(ASTUtils.allModes(originalMainReactor).stream().findFirst().get())
+            .error("Modes at the top level are not supported under federated execution.");
     }
     var renderer = FormattingUtils.renderer(federate.targetConfig.target);
 
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index ee3c0a46f0..f59085cc00 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -510,9 +510,8 @@ private boolean containsAllVarRefs(Iterable<VarRef> varRefs) {
         referencesFederate = true;
       } else {
         if (referencesFederate) {
-          errorReporter.reportError(
-              varRef,
-              "Mixed triggers and effects from" + " different federates. This is not permitted");
+            errorReporter.at(varRef).error(
+                "Mixed triggers and effects from" + " different federates. This is not permitted");
         }
         inFederate = false;
       }
diff --git a/core/src/main/java/org/lflang/federated/validation/FedValidator.java b/core/src/main/java/org/lflang/federated/validation/FedValidator.java
index 9aeb535d2f..40c9d4bdcb 100644
--- a/core/src/main/java/org/lflang/federated/validation/FedValidator.java
+++ b/core/src/main/java/org/lflang/federated/validation/FedValidator.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
+
 import org.lflang.ErrorReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Input;
@@ -57,9 +58,8 @@ private static void containsAllVarRefs(List<VarRef> varRefs, ErrorReporter error
         instantiation = varRef.getContainer();
         referencesFederate = true;
       } else if (!varRef.getContainer().equals(instantiation)) {
-        errorReporter.reportError(
-            varRef,
-            "Mixed triggers and effects from" + " different federates. This is not permitted");
+          errorReporter.at(varRef).error(
+              "Mixed triggers and effects from" + " different federates. This is not permitted");
       }
     }
   }
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 6a5c189744..c35b1531d9 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -228,8 +228,8 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     // Check if there are any conflicting main reactors elsewhere in the package.
     if (Objects.equal(context.getMode(), LFGeneratorContext.Mode.STANDALONE) && mainDef != null) {
       for (String conflict : new MainConflictChecker(context.getFileConfig()).conflicts) {
-        errorReporter.reportError(
-            this.mainDef.getReactorClass(), "Conflicting main reactor in " + conflict);
+        EObject object = this.mainDef.getReactorClass();
+        errorReporter.at(object).error("Conflicting main reactor in " + conflict);
       }
     }
 
@@ -458,10 +458,9 @@ private void transformConflictingConnectionsInModalReactors() {
               || connection.isIterated()
               || connection.getLeftPorts().size() > 1
               || connection.getRightPorts().size() > 1) {
-            errorReporter.reportError(
-                connection,
+            errorReporter.at(connection).error(
                 "Cannot transform connection in modal reactor. Connection uses currently not"
-                    + " supported features.");
+                            + " supported features.");
           } else {
             var reaction = factory.createReaction();
             ((Mode) connection.eContainer()).getReactions().add(reaction);
diff --git a/core/src/main/java/org/lflang/generator/PortInstance.java b/core/src/main/java/org/lflang/generator/PortInstance.java
index 60a904ef5b..7d88cdd28d 100644
--- a/core/src/main/java/org/lflang/generator/PortInstance.java
+++ b/core/src/main/java/org/lflang/generator/PortInstance.java
@@ -29,6 +29,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.PriorityQueue;
+
 import org.lflang.ErrorReporter;
 import org.lflang.lf.Input;
 import org.lflang.lf.Output;
@@ -396,8 +397,8 @@ private void setInitialWidth(ErrorReporter errorReporter) {
 
     if (widthSpec != null) {
       if (widthSpec.isOfVariableLength()) {
-        errorReporter.reportError(
-            definition, "Variable-width multiports not supported (yet): " + definition.getName());
+          String message = "Variable-width multiports not supported (yet): " + definition.getName();
+          errorReporter.at(definition).error(message);
       } else {
         isMultiport = true;
 
diff --git a/core/src/main/java/org/lflang/generator/ReactorInstance.java b/core/src/main/java/org/lflang/generator/ReactorInstance.java
index 5a1fdf4b8d..a2d98ab7b5 100644
--- a/core/src/main/java/org/lflang/generator/ReactorInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactorInstance.java
@@ -35,6 +35,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+
 import org.lflang.AttributeUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.TimeValue;
@@ -829,14 +830,14 @@ public ReactorInstance(
 
     this.recursive = foundSelfAsParent;
     if (recursive) {
-      reporter.reportError(definition, "Recursive reactor instantiation.");
+        reporter.at(definition).error("Recursive reactor instantiation.");
     }
 
     // If the reactor definition is null, give up here. Otherwise, diagram generation
     // will fail an NPE.
     if (reactorDefinition == null) {
-      reporter.reportError(definition, "Reactor instantiation has no matching reactor definition.");
-      return;
+        reporter.at(definition).error("Reactor instantiation has no matching reactor definition.");
+        return;
     }
 
     setInitialWidth();
@@ -1053,8 +1054,8 @@ private List<RuntimeRange<PortInstance>> listPortInstances(
     for (VarRef portRef : references) {
       // Simple error checking first.
       if (!(portRef.getVariable() instanceof Port)) {
-        reporter.reportError(portRef, "Not a port.");
-        return result;
+          reporter.at(portRef).error("Not a port.");
+          return result;
       }
       // First, figure out which reactor we are dealing with.
       // The reactor we want is the container of the port.
diff --git a/core/src/main/java/org/lflang/generator/TimerInstance.java b/core/src/main/java/org/lflang/generator/TimerInstance.java
index b25552bb6c..38dc374bf6 100644
--- a/core/src/main/java/org/lflang/generator/TimerInstance.java
+++ b/core/src/main/java/org/lflang/generator/TimerInstance.java
@@ -26,6 +26,8 @@
 
 package org.lflang.generator;
 
+import org.eclipse.emf.ecore.EObject;
+
 import org.lflang.TimeValue;
 import org.lflang.lf.Timer;
 
@@ -63,14 +65,16 @@ public TimerInstance(Timer definition, ReactorInstance parent) {
         try {
           this.offset = parent.getTimeValue(definition.getOffset());
         } catch (IllegalArgumentException ex) {
-          parent.reporter.reportError(definition.getOffset(), "Invalid time.");
+            EObject object = definition.getOffset();
+            parent.reporter.at(object).error("Invalid time.");
         }
       }
       if (definition.getPeriod() != null) {
         try {
           this.period = parent.getTimeValue(definition.getPeriod());
         } catch (IllegalArgumentException ex) {
-          parent.reporter.reportError(definition.getPeriod(), "Invalid time.");
+            EObject object = definition.getPeriod();
+            parent.reporter.at(object).error("Invalid time.");
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CPortGenerator.java b/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
index 53ccc24af3..e8a195b98f 100644
--- a/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
@@ -197,8 +197,9 @@ private static String valueDeclaration(
       CTypes types) {
     if (port.getType() == null && target.requiresTypes) {
       // This should have been caught by the validator.
-      errorReporter.reportError(port, "Port is required to have a type: " + port.getName());
-      return "";
+        String message = "Port is required to have a type: " + port.getName();
+        errorReporter.at(port).error(message);
+        return "";
     }
     // Do not convert to lf_token_t* using lfTypeToTokenType because there
     // will be a separate field pointing to the token.
diff --git a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
index 824dc97ee6..5aaa6599e8 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
@@ -9,6 +9,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig;
@@ -189,8 +190,8 @@ public static String generateInitializationForReaction(
                         : "reset_transition")
                     + ";");
           } else {
-            errorReporter.reportError(
-                reaction, "In generateReaction(): " + name + " not a valid mode of this reactor.");
+              errorReporter.at(reaction).error(
+                  "In generateReaction(): " + name + " not a valid mode of this reactor.");
           }
         } else {
           if (variable instanceof Output) {
@@ -207,8 +208,7 @@ public static String generateInitializationForReaction(
           } else if (variable instanceof Watchdog) {
             reactionInitialization.pr(generateWatchdogVariablesInReaction(effect));
           } else {
-            errorReporter.reportError(
-                reaction, "In generateReaction(): effect is not an input, output, or watchdog.");
+              errorReporter.at(reaction).error("In generateReaction(): effect is not an input, output, or watchdog.");
           }
         }
       }
@@ -767,8 +767,8 @@ public static String generateOutputVariablesInReaction(
     String outputName = output.getName();
     String outputWidth = generateWidthVariable(outputName);
     if (output.getType() == null && requiresTypes) {
-      errorReporter.reportError(output, "Output is required to have a type: " + outputName);
-      return "";
+        errorReporter.at(output).error("Output is required to have a type: " + outputName);
+        return "";
     } else {
       // The container of the output may be a contained reactor or
       // the reactor containing the reaction.
diff --git a/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java b/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
index f864ca2661..7379bce5ee 100644
--- a/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
@@ -9,6 +9,7 @@
 package org.lflang.generator.c;
 
 import java.util.List;
+
 import org.lflang.ErrorReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
@@ -225,11 +226,9 @@ private static String generateInitializationForWatchdog(
                         : "reset_transition")
                     + ";");
           } else {
-            errorReporter.reportError(
-                watchdog,
-                "In generateInitializationForWatchdog(): "
-                    + name
-                    + " not a valid mode of this reactor.");
+              errorReporter.at(watchdog).error("In generateInitializationForWatchdog(): "
+                              + name
+                              + " not a valid mode of this reactor.");
           }
         }
       }
diff --git a/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
index 87f594a71a..07c1b498eb 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
@@ -4,6 +4,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+
 import org.lflang.AttributeUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.Target;
@@ -269,11 +270,10 @@ private static String generateCPythonInitializers(
                 PythonPortGenerator.generateVariablesForSendingToContainedReactors(
                     pyObjects, effect.getContainer(), (Input) effect.getVariable()));
           } else {
-            errorReporter.reportError(
-                reaction,
-                "In generateReaction(): "
-                    + effect.getVariable().getName()
-                    + " is neither an input nor an output.");
+              String message = "In generateReaction(): "
+                  + effect.getVariable().getName()
+                  + " is neither an input nor an output.";
+              errorReporter.at(reaction).error(message);
           }
         }
       }
diff --git a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
index ff97860970..4dc3593f77 100644
--- a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
+++ b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
@@ -31,6 +31,10 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.lflang.ErrorReporter;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.TargetPropertyType;
 import org.lflang.ast.ASTUtils;
@@ -281,7 +285,10 @@ public void check(Element element, String name, LFValidator v) {
         try {
           parseValue(pair);
         } catch (InvalidLfSourceException e) {
-          v.getErrorReporter().reportError(e.getNode(), e.getProblem());
+            ErrorReporter errorReporter = v.getErrorReporter();
+            EObject object = e.getNode();
+            String message = e.getProblem();
+            errorReporter.at(object).error(message);
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
index b4e9a1778b..db249c442b 100644
--- a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
+++ b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
@@ -64,15 +64,15 @@ public void setCargoDependencies(Map<String, CargoDependencySpec> cargoDependenc
   public void addAndCheckTopLevelModule(Path path, EObject errorOwner, ErrorReporter err) {
     String fileName = path.getFileName().toString();
     if (!Files.exists(path)) {
-      err.reportError(errorOwner, "File not found");
+        err.at(errorOwner).error("File not found");
     } else if (Files.isRegularFile(path) && !fileName.endsWith(".rs")) {
-      err.reportError(errorOwner, "Not a rust file");
+        err.at(errorOwner).error("Not a rust file");
     } else if (fileName.equals("main.rs")) {
-      err.reportError(errorOwner, "Cannot use 'main.rs' as a module name (reserved)");
+        err.at(errorOwner).error("Cannot use 'main.rs' as a module name (reserved)");
     } else if (fileName.equals("reactors") || fileName.equals("reactors.rs")) {
-      err.reportError(errorOwner, "Cannot use 'reactors' as a module name (reserved)");
+        err.at(errorOwner).error("Cannot use 'reactors' as a module name (reserved)");
     } else if (Files.isDirectory(path) && !Files.exists(path.resolve("mod.rs"))) {
-      err.reportError(errorOwner, "Cannot find module descriptor in directory");
+        err.at(errorOwner).error("Cannot find module descriptor in directory");
     }
     this.rustTopLevelModules.add(path);
   }
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppActionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppActionGenerator.kt
index 27ad6380cd..632b3cab39 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppActionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppActionGenerator.kt
@@ -55,10 +55,12 @@ class CppActionGenerator(private val reactor: Reactor, private val errorReporter
 
     private fun generateLogicalInitializer(action: Action): String {
         return if (action.minSpacing != null || !action.policy.isNullOrEmpty()) {
-            errorReporter.reportError(
-                action,
+            errorReporter.at(
+                action
+            ).error(
                 "minSpacing and spacing violation policies are not yet supported for logical actions in reactor-ccp!"
             )
+            "minSpacing and spacing violation policies are not yet supported for logical actions in reactor-ccp!"
         } else {
             val time = action.minDelay.orZero().toCppTime()
             """, ${action.name}{"${action.name}", this, $time}"""
@@ -67,10 +69,12 @@ class CppActionGenerator(private val reactor: Reactor, private val errorReporter
 
     private fun initializePhysicalInitializer(action: Action): String {
         return if (action.minDelay != null || action.minSpacing != null || !action.policy.isNullOrEmpty()) {
-            errorReporter.reportError(
-                action,
+            errorReporter.at(
+                action
+            ).error(
                 "minDelay, minSpacing and spacing violation policies are not yet supported for physical actions in reactor-ccp!"
             )
+            "minDelay, minSpacing and spacing violation policies are not yet supported for physical actions in reactor-ccp!"
         } else {
             """, ${action.name}{"${action.name}", this}"""
         }
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppInstanceGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppInstanceGenerator.kt
index 19622f9ef7..88a66ef558 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppInstanceGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppInstanceGenerator.kt
@@ -87,12 +87,12 @@ class CppInstanceGenerator(
         val assignments = parameters.mapNotNull {
             when {
                 it.rhs.isParens || it.rhs.isBraces -> {
-                    errorReporter.reportError(it, "Parenthesis based initialization is not allowed here!")
+                    errorReporter.at(it).error("Parenthesis based initialization is not allowed here!")
                     null
                 }
 
                 it.rhs.exprs.size != 1             -> {
-                    errorReporter.reportError(it, "Expected exactly one expression.")
+                    errorReporter.at(it).error("Expected exactly one expression.")
                     null
                 }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
index ba17bbc769..4afa183152 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -303,9 +303,8 @@ class TSGenerator(
             val ret = pnpmInstall.run(context.cancelIndicator)
             if (ret != 0) {
                 val errors: String = pnpmInstall.errors
-                errorReporter.reportError(
-                    GeneratorUtils.findTargetDecl(resource),
-                    "ERROR: pnpm install command failed" + if (errors.isBlank()) "." else ":\n$errors")
+                errorReporter.at(GeneratorUtils.findTargetDecl(resource))
+                    .error("pnpm install command failed" + if (errors.isBlank()) "." else ":\n$errors")
             }
             installProtoBufsIfNeeded(true, path, context.cancelIndicator)
         } else {
@@ -323,12 +322,13 @@ class TSGenerator(
             }
 
             if (npmInstall.run(context.cancelIndicator) != 0) {
-                errorReporter.reportError(
-                    GeneratorUtils.findTargetDecl(resource),
-                    "ERROR: npm install command failed: " + npmInstall.errors)
-                errorReporter.reportError(
-                    GeneratorUtils.findTargetDecl(resource), "ERROR: npm install command failed." +
-                        "\nFor installation instructions, see: https://www.npmjs.com/get-npm")
+                errorReporter.at(GeneratorUtils.findTargetDecl(resource))
+                    .error("npm install command failed: " + npmInstall.errors)
+                errorReporter.at(GeneratorUtils.findTargetDecl(resource))
+                    .error(
+                    "npm install command failed." +
+                            "\nFor installation instructions, see: https://www.npmjs.com/get-npm"
+                )
                 return
             }
 
@@ -338,9 +338,8 @@ class TSGenerator(
                 val rtPath = path.resolve("node_modules").resolve("@lf-lang").resolve("reactor-ts")
                 val buildRuntime = commandFactory.createCommand("npm", listOf("run", "build"), rtPath)
                 if (buildRuntime.run(context.cancelIndicator) != 0) {
-                    errorReporter.reportError(
-                        GeneratorUtils.findTargetDecl(resource),
-                        "ERROR: unable to build runtime in dev mode: " + buildRuntime.errors.toString())
+                    errorReporter.at(GeneratorUtils.findTargetDecl(resource))
+                        .error("Unable to build runtime in dev mode: " + buildRuntime.errors.toString())
                 }
             }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
index 4d537f5a19..4a0ef62092 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
@@ -30,18 +30,6 @@ class TSReactorGenerator(
             """
     }
 
-    // Initializer functions
-    fun getTargetInitializerHelper(param: Parameter,
-                                   list: List<String>): String {
-        return if (list.isEmpty()) {
-            errorReporter.reportError(param, "Parameters must have a default value!")
-        } else if (list.size == 1) {
-            list[0]
-        } else {
-            list.joinToString(", ", "[", "]")
-        }
-    }
-
     /** Generate the main app instance. This function is only used once
      *  because all other reactors are instantiated as properties of the
      *  main one.

From 7c76d5c404a8ea21af8bbd856e8b42ca68ff6bf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Tue, 13 Jun 2023 14:15:19 +0200
Subject: [PATCH 0330/1114] More updates...

---
 .../main/java/org/lflang/ErrorReporter.java   | 12 -------
 .../federated/extensions/CExtension.java      | 32 +++++++++----------
 .../federated/extensions/TSExtension.java     | 32 +++++++++----------
 .../org/lflang/generator/GeneratorUtils.java  |  9 +++---
 .../org/lflang/generator/ReactorInstance.java | 22 ++++++-------
 .../org/lflang/generator/c/CGenerator.java    | 13 ++++----
 6 files changed, 52 insertions(+), 68 deletions(-)

diff --git a/core/src/main/java/org/lflang/ErrorReporter.java b/core/src/main/java/org/lflang/ErrorReporter.java
index 0f8e7509f9..6334d21dd1 100644
--- a/core/src/main/java/org/lflang/ErrorReporter.java
+++ b/core/src/main/java/org/lflang/ErrorReporter.java
@@ -78,18 +78,6 @@ default void info(String message) {
   }
 
 
-  /**
-   * Report a warning on the specified parse tree object.
-   *
-   * @param object The parse tree object.
-   * @param message The error message.
-   * @return a string that describes the warning.
-   */
-  default String reportWarning(EObject object, String message) {
-    at(object).warning(message);
-    return message;
-  }
-
   /**
    * Report an error at the specified line within a file.
    *
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 121cf5d817..639da88033 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -33,6 +33,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
+
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.Target;
@@ -788,22 +789,21 @@ private String generateCodeForPhysicalActions(
       if (minDelay != TimeValue.MAX_VALUE) {
         // Unless silenced, issue a warning.
         if (federate.targetConfig.coordinationOptions.advance_message_interval == null) {
-          errorReporter.reportWarning(
-              outputFound,
-              String.join(
-                  "\n",
-                  "Found a path from a physical action to output for reactor "
-                      + addDoubleQuotes(instance.getName())
-                      + ". ",
-                  "The amount of delay is " + minDelay + ".",
-                  "With centralized coordination, this can result in a large number of messages to"
-                      + " the RTI.",
-                  "Consider refactoring the code so that the output does not depend on the physical"
-                      + " action,",
-                  "or consider using decentralized coordination. To silence this warning, set the"
-                      + " target",
-                  "parameter coordination-options with a value like {advance-message-interval: 10"
-                      + " msec}"));
+          String message = String.join(
+              "\n",
+              "Found a path from a physical action to output for reactor "
+                  + addDoubleQuotes(instance.getName())
+                  + ". ",
+              "The amount of delay is " + minDelay + ".",
+              "With centralized coordination, this can result in a large number of messages to"
+                  + " the RTI.",
+              "Consider refactoring the code so that the output does not depend on the physical"
+                  + " action,",
+              "or consider using decentralized coordination. To silence this warning, set the"
+                  + " target",
+              "parameter coordination-options with a value like {advance-message-interval: 10"
+                  + " msec}");
+          errorReporter.at(outputFound).warning(message);
         }
         code.pr(
             "_fed.min_delay_from_physical_action_to_federate_output = "
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 14df96afb5..ea6895022c 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
+
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetProperty.CoordinationType;
@@ -174,22 +175,21 @@ private TimeValue getMinOutputDelay(
       if (minOutputDelay != TimeValue.MAX_VALUE) {
         // Unless silenced, issue a warning.
         if (federate.targetConfig.coordinationOptions.advance_message_interval == null) {
-          errorReporter.reportWarning(
-              outputFound,
-              String.join(
-                  "\n",
-                  "Found a path from a physical action to output for reactor "
-                      + addDoubleQuotes(instance.getName())
-                      + ". ",
-                  "The amount of delay is " + minOutputDelay + ".",
-                  "With centralized coordination, this can result in a large number of messages to"
-                      + " the RTI.",
-                  "Consider refactoring the code so that the output does not depend on the physical"
-                      + " action,",
-                  "or consider using decentralized coordination. To silence this warning, set the"
-                      + " target",
-                  "parameter coordination-options with a value like {advance-message-interval: 10"
-                      + " msec}"));
+            String message = String.join(
+                "\n",
+                "Found a path from a physical action to output for reactor "
+                    + addDoubleQuotes(instance.getName())
+                    + ". ",
+                "The amount of delay is " + minOutputDelay + ".",
+                "With centralized coordination, this can result in a large number of messages to"
+                    + " the RTI.",
+                "Consider refactoring the code so that the output does not depend on the physical"
+                    + " action,",
+                "or consider using decentralized coordination. To silence this warning, set the"
+                    + " target",
+                "parameter coordination-options with a value like {advance-message-interval: 10"
+                    + " msec}");
+            errorReporter.at(outputFound).warning(message);
         }
         return minOutputDelay;
       }
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index 6f0e217c48..d16c9c3270 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -61,11 +61,10 @@ public static void accommodatePhysicalActionsIfPresent(
             && !targetConfig.keepalive) {
           // If not, set it to true
           targetConfig.keepalive = true;
-          errorReporter.reportWarning(
-              action,
-              String.format(
-                  "Setting %s to true because of the physical action %s.",
-                  TargetProperty.KEEPALIVE.getDisplayName(), action.getName()));
+          String message = String.format(
+              "Setting %s to true because of the physical action %s.",
+              TargetProperty.KEEPALIVE.getDisplayName(), action.getName());
+          errorReporter.at(action).warning(message);
           return;
         }
       }
diff --git a/core/src/main/java/org/lflang/generator/ReactorInstance.java b/core/src/main/java/org/lflang/generator/ReactorInstance.java
index a2d98ab7b5..8599b43ad9 100644
--- a/core/src/main/java/org/lflang/generator/ReactorInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactorInstance.java
@@ -935,12 +935,12 @@ private void establishPortConnections() {
       // Check for empty lists.
       if (!srcRanges.hasNext()) {
         if (dstRanges.hasNext()) {
-          reporter.reportWarning(connection, "No sources to provide inputs.");
+            reporter.at(connection).warning("No sources to provide inputs.");
         }
         return;
       } else if (!dstRanges.hasNext()) {
-        reporter.reportWarning(connection, "No destination. Outputs will be lost.");
-        return;
+          reporter.at(connection).warning("No destination. Outputs will be lost.");
+          return;
       }
 
       RuntimeRange<PortInstance> src = srcRanges.next();
@@ -952,8 +952,7 @@ private void establishPortConnections() {
           if (!dstRanges.hasNext()) {
             if (srcRanges.hasNext()) {
               // Should not happen (checked by the validator).
-              reporter.reportWarning(
-                  connection, "Source is wider than the destination. Outputs will be lost.");
+                reporter.at(connection).warning("Source is wider than the destination. Outputs will be lost.");
             }
             break;
           }
@@ -963,8 +962,7 @@ private void establishPortConnections() {
             } else {
               if (dstRanges.hasNext()) {
                 // Should not happen (checked by the validator).
-                reporter.reportWarning(
-                    connection, "Destination is wider than the source. Inputs will be missing.");
+                  reporter.at(connection).warning("Destination is wider than the source. Inputs will be missing.");
               }
               break;
             }
@@ -977,9 +975,8 @@ private void establishPortConnections() {
           src = src.tail(dst.width);
           if (!dstRanges.hasNext()) {
             // Should not happen (checked by the validator).
-            reporter.reportWarning(
-                connection, "Source is wider than the destination. Outputs will be lost.");
-            break;
+              reporter.at(connection).warning("Source is wider than the destination. Outputs will be lost.");
+              break;
           }
           dst = dstRanges.next();
         } else if (src.width < dst.width) {
@@ -990,9 +987,8 @@ private void establishPortConnections() {
             if (connection.isIterated()) {
               srcRanges = leftPorts.iterator();
             } else {
-              reporter.reportWarning(
-                  connection, "Destination is wider than the source. Inputs will be missing.");
-              break;
+                reporter.at(connection).warning("Destination is wider than the source. Inputs will be missing.");
+                break;
             }
           }
           src = srcRanges.next();
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index cf1aee06a8..5c4993b8aa 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -45,6 +45,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -356,12 +357,12 @@ public void accommodatePhysicalActionsIfPresent() {
           if (!targetConfig.threading
               && !targetConfig.setByUser.contains(TargetProperty.THREADING)) {
             targetConfig.threading = true;
-            errorReporter.reportWarning(
-                action,
-                "Using the threaded C runtime to allow for asynchronous handling of physical action"
-                    + " "
-                    + action.getName());
-            return;
+              String message =
+                  "Using the threaded C runtime to allow for asynchronous handling of physical action"
+                      + " "
+                      + action.getName();
+              errorReporter.at(action).warning(message);
+              return;
           }
         }
       }

From d6befa3904fd4effdf4714b4f74fc69ec4745db8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Tue, 13 Jun 2023 14:34:41 +0200
Subject: [PATCH 0331/1114] Finish cleaning up ErrorReporter

---
 .../main/java/org/lflang/ErrorReporter.java   | 64 ++-----------------
 .../org/lflang/generator/GeneratorBase.java   | 29 +++++----
 .../HumanReadableReportingStrategy.java       |  6 +-
 .../lflang/generator/IntegratedBuilder.java   | 33 ++++------
 .../generator/python/PythonValidator.java     | 26 ++++----
 .../lflang/generator/rust/RustValidator.kt    |  8 +--
 .../org/lflang/generator/ts/TSValidator.kt    | 28 +++-----
 7 files changed, 62 insertions(+), 132 deletions(-)

diff --git a/core/src/main/java/org/lflang/ErrorReporter.java b/core/src/main/java/org/lflang/ErrorReporter.java
index 6334d21dd1..dfe32c4845 100644
--- a/core/src/main/java/org/lflang/ErrorReporter.java
+++ b/core/src/main/java/org/lflang/ErrorReporter.java
@@ -26,6 +26,13 @@ default Stage2 at(Path file) {
     return at(file, 1);
   }
 
+  default Stage2 atNullableLine(Path file, Integer line) {
+    if (line != null) {
+      return at(file, line);
+    }
+    return at(file);
+  }
+
   default Stage2 at(Path file, int line) {
     return at(file, Position.fromOneBased(line, 1));
   }
@@ -78,47 +85,6 @@ default void info(String message) {
   }
 
 
-  /**
-   * Report an error at the specified line within a file.
-   *
-   * @param message The error message.
-   * @param line The one-based line number to report at.
-   * @param file The file to report at.
-   * @return a string that describes the error.
-   */
-  default String reportError(Path file, Integer line, String message) {
-    Stage2 stage2 = line != null ? at(file, line) : at(file);
-    stage2.report(DiagnosticSeverity.Error, message);
-    return message;
-  }
-
-  /**
-   * Report a warning at the specified line within a file.
-   *
-   * @param message The error message.
-   * @param line The one-based line number to report at.
-   * @param file The file to report at.
-   * @return a string that describes the warning.
-   */
-  default String reportWarning(Path file, Integer line, String message) {
-    Stage2 stage2 = line!=null? at(file,line):at(file);
-    stage2.report(DiagnosticSeverity.Warning, message);
-    return message;
-  }
-
-
-  /**
-   * Report a message of severity {@code severity}.
-   *
-   * @param file The file to which the message pertains, or {@code null} if the file is unknown.
-   * @param severity the severity of the message
-   * @param message the message to send to the IDE
-   * @return a string that describes the diagnostic
-   */
-  default String report(Path file, DiagnosticSeverity severity, String message) {
-    at(file).report(severity, message);
-    return message;
-  }
 
   /**
    * Report a message of severity {@code severity} that pertains to line {@code line} of an LF
@@ -135,22 +101,6 @@ default String report(Path file, DiagnosticSeverity severity, String message, in
     return message;
   }
 
-  /**
-   * Report a message of severity {@code severity} that pertains to the range [{@code startPos},
-   * {@code endPos}) of an LF source file.
-   *
-   * @param file The file to which the message pertains, or {@code null} if the file is unknown.
-   * @param severity the severity of the message
-   * @param message the message to send to the IDE
-   * @param startPos the position of the first character of the range of interest
-   * @param endPos the position immediately AFTER the final character of the range of interest
-   * @return a string that describes the diagnostic
-   */
-  default String report(
-      Path file, DiagnosticSeverity severity, String message, Position startPos, Position endPos) {
-    return report(file, severity, message, startPos.getOneBasedLine());
-  }
-
 
   /**
    * Check if errors where reported.
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index c35b1531d9..2edb4c09a7 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -39,9 +39,12 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
+
 import org.lflang.ErrorReporter;
+import org.lflang.ErrorReporter.Stage2;
 import org.lflang.FileConfig;
 import org.lflang.MainConflictChecker;
 import org.lflang.Target;
@@ -569,9 +572,7 @@ public void reportCommandErrors(String stderr) {
         // Found a new line number designator.
         // If there is a previously accumulated message, report it.
         if (message.length() > 0) {
-          if (severity == IMarker.SEVERITY_ERROR)
-            errorReporter.reportError(path, lineNumber, message.toString());
-          else errorReporter.reportWarning(path, lineNumber, message.toString());
+          reportIssue(message, lineNumber, path, severity);
 
           if (!Objects.equal(originalPath.toFile(), path.toFile())) {
             // Report an error also in the top-level resource.
@@ -579,9 +580,9 @@ public void reportCommandErrors(String stderr) {
             // statements to find which one matches and mark all the
             // import statements down the chain. But what a pain!
             if (severity == IMarker.SEVERITY_ERROR) {
-              errorReporter.reportError(originalPath, 1, "Error in imported file: " + path);
+              errorReporter.at(originalPath).error("Error in imported file: " + path);
             } else {
-              errorReporter.reportWarning(originalPath, 1, "Warning in imported file: " + path);
+              errorReporter.at(originalPath).warning("Warning in imported file: " + path);
             }
           }
         }
@@ -619,11 +620,7 @@ public void reportCommandErrors(String stderr) {
       }
     }
     if (message.length() > 0) {
-      if (severity == IMarker.SEVERITY_ERROR) {
-        errorReporter.reportError(path, lineNumber, message.toString());
-      } else {
-        errorReporter.reportWarning(path, lineNumber, message.toString());
-      }
+      reportIssue(message, lineNumber, path, severity);
 
       if (originalPath.toFile() != path.toFile()) {
         // Report an error also in the top-level resource.
@@ -631,14 +628,22 @@ public void reportCommandErrors(String stderr) {
         // statements to find which one matches and mark all the
         // import statements down the chain. But what a pain!
         if (severity == IMarker.SEVERITY_ERROR) {
-          errorReporter.reportError(originalPath, 1, "Error in imported file: " + path);
+          errorReporter.at(originalPath).error("Error in imported file: " + path);
         } else {
-          errorReporter.reportWarning(originalPath, 1, "Warning in imported file: " + path);
+          errorReporter.at(originalPath).warning("Warning in imported file: " + path);
         }
       }
     }
   }
 
+  private void reportIssue(StringBuilder message, Integer lineNumber, Path path, int severity) {
+    DiagnosticSeverity convertedSeverity = severity == IMarker.SEVERITY_ERROR
+        ? DiagnosticSeverity.Error
+        : DiagnosticSeverity.Warning;
+    errorReporter.atNullableLine(path, lineNumber)
+        .report(convertedSeverity, message.toString());
+  }
+
   // //////////////////////////////////////////////////
   // // Private functions
 
diff --git a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
index 320c2b109f..42923fb7a9 100644
--- a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
+++ b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
@@ -108,16 +108,16 @@ private void reportErrorLine(
       final CodeMap map = maps.get(relativeTo != null ? relativeTo.resolve(path) : path);
       final DiagnosticSeverity severity = DiagnosticReporting.severityOf(matcher.group("severity"));
       if (map == null) {
-        errorReporter.report(null, severity, message);
+        errorReporter.nowhere().report(severity, message);
         return;
       }
       for (Path srcFile : map.lfSourcePaths()) {
         Position lfFilePosition = map.adjusted(srcFile, generatedFilePosition);
         if (matcher.group("column") != null) {
           reportAppropriateRange(
-              range -> errorReporter.report(srcFile, severity, message, range), lfFilePosition, it);
+              range -> errorReporter.at(srcFile, range).report(severity, message), lfFilePosition, it);
         } else {
-          errorReporter.report(srcFile, severity, message, lfFilePosition.getOneBasedLine());
+          errorReporter.at(srcFile, lfFilePosition.getOneBasedLine()).report(severity, message);
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
index f87c81728d..e243b30de3 100644
--- a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
+++ b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
@@ -9,6 +9,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.diagnostics.Severity;
 import org.eclipse.xtext.generator.GeneratorDelegate;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
@@ -16,7 +17,9 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.eclipse.xtext.validation.Issue;
+
 import org.lflang.ErrorReporter;
+import org.lflang.ErrorReporter.Stage2;
 import org.lflang.FileConfig;
 import org.lflang.generator.LFGeneratorContext.Mode;
 
@@ -36,15 +39,6 @@ public interface ReportProgress {
     void apply(String message, Integer percentage);
   }
 
-  // Note: This class is not currently used in response to
-  //  document edits, even though the validator and code
-  //  generator are invoked by Xtext in response to
-  //  document edits.
-  /** A {@code ReportMethod} is a way of reporting issues. */
-  private interface ReportMethod {
-    void apply(Path file, Integer line, String message);
-  }
-
   /* ---------------------- INJECTED DEPENDENCIES ---------------------- */
 
   @Inject private IResourceValidator validator;
@@ -93,8 +87,9 @@ public GeneratorResult run(
   private void validate(URI uri, ErrorReporter errorReporter) {
     for (Issue issue :
         validator.validate(getResource(uri), CheckMode.ALL, CancelIndicator.NullImpl)) {
-      getReportMethod(errorReporter, issue.getSeverity())
-          .apply(Path.of(uri.path()), issue.getLineNumber(), issue.getMessage());
+      errorReporter.atNullableLine(Path.of(uri.path()), issue.getLineNumber())
+              .report(convertSeverity(issue.getSeverity()),
+                  issue.getMessage());
     }
   }
 
@@ -135,14 +130,12 @@ private Resource getResource(URI uri) {
     return resourceSetProvider.get().getResource(uri, true);
   }
 
-  /**
-   * Returns the appropriate reporting method for the given {@code Severity}.
-   *
-   * @param severity An arbitrary {@code Severity}.
-   * @return The appropriate reporting method for {@code severity}.
-   */
-  private ReportMethod getReportMethod(ErrorReporter errorReporter, Severity severity) {
-    if (severity == Severity.ERROR) return errorReporter::reportError;
-    return errorReporter::reportWarning;
+  static DiagnosticSeverity convertSeverity(Severity severity) {
+    return switch (severity) {
+      case ERROR -> DiagnosticSeverity.Error;
+      case WARNING -> DiagnosticSeverity.Warning;
+      case INFO -> DiagnosticSeverity.Information;
+      case IGNORE -> DiagnosticSeverity.Hint;
+    };
   }
 }
diff --git a/core/src/main/java/org/lflang/generator/python/PythonValidator.java b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
index fa2584ce4c..9b3b80de05 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonValidator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
@@ -21,6 +21,7 @@
 import org.lflang.generator.DiagnosticReporting;
 import org.lflang.generator.DiagnosticReporting.Strategy;
 import org.lflang.generator.Position;
+import org.lflang.generator.Range;
 import org.lflang.generator.ValidationStrategy;
 import org.lflang.util.LFCommand;
 
@@ -232,16 +233,14 @@ private boolean tryReportTypical(String[] lines, int i) {
               Position genPosition =
                   Position.fromOneBased(line, Integer.MAX_VALUE); // Column is just a placeholder.
               if (map == null) {
-                errorReporter.report(
-                    null, DiagnosticSeverity.Error, message, 1); // Undesirable fallback
+                errorReporter.nowhere().error(message); // Undesirable fallback
               } else {
                 for (Path lfFile : map.lfSourcePaths()) {
                   Position lfPosition = map.adjusted(lfFile, genPosition);
                   // TODO: We could be more precise than just getting the right line, but the way
                   // the output
                   //  is formatted (with leading whitespace possibly trimmed) does not make it easy.
-                  errorReporter.report(
-                      lfFile, DiagnosticSeverity.Error, message, lfPosition.getOneBasedLine());
+                  errorReporter.at(lfFile, lfPosition).error(message);
                 }
               }
               return true;
@@ -264,16 +263,12 @@ private void tryReportAlternative(String[] lines, int i) {
                           .filter(p -> main.group().contains(p.getFileName().toString()))
                           .map(codeMaps::get)
                       ::iterator;
-              for (CodeMap map :
-                  relevantMaps) { // There should almost always be exactly one of these
+              for (CodeMap map : relevantMaps) { // There should almost always be exactly one of these
                 for (Path lfFile : map.lfSourcePaths()) {
-                  errorReporter.report(
-                      lfFile,
-                      DiagnosticSeverity.Error,
-                      main.group().replace("*** ", "").replace("Sorry: ", ""),
-                      map.adjusted(
-                              lfFile, Position.fromOneBased(line, map.firstNonWhitespace(line)))
-                          .getOneBasedLine());
+                  Position pos = map.adjusted(
+                      lfFile, Position.fromOneBased(line, map.firstNonWhitespace(line)));
+                  errorReporter.at(lfFile, pos)
+                      .error(main.group().replace("*** ", "").replace("Sorry: ", ""));
                 }
               }
             }
@@ -375,7 +370,8 @@ private void bestEffortReport(
               DiagnosticSeverity severity,
               String humanMessage) {
             if (!lfEnd.equals(Position.ORIGIN) && !lfStart.equals(Position.ORIGIN)) { // Ideal case
-              errorReporter.report(file, severity, humanMessage, lfStart, lfEnd);
+              errorReporter.at(file, new Range(lfStart, lfEnd))
+                  .report(severity, humanMessage);
             } else { // Fallback: Try to report on the correct line, or failing that, just line 1.
               if (lfStart.equals(Position.ORIGIN))
                 lfStart =
@@ -384,7 +380,7 @@ private void bestEffortReport(
               // FIXME: It might be better to improve style of generated code instead of quietly
               // returning here.
               if (lfStart.equals(Position.ORIGIN) && severity != DiagnosticSeverity.Error) return;
-              errorReporter.report(file, severity, humanMessage, lfStart.getOneBasedLine());
+              errorReporter.at(file, lfStart).report(severity, humanMessage);
             }
           }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt
index ebf449ffa5..88ad8b6261 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt
@@ -161,17 +161,15 @@ class RustValidator(
 
                 val message = mapper.readValue(messageLine, RustCompilerMessage::class.java).message
 
-                if (message.spans.isEmpty()) errorReporter.report(null, message.severity, message.message)
+                if (message.spans.isEmpty()) errorReporter.nowhere().report(message.severity, message.message)
                 for (span in message.spans) {
                     val genFilePath = metadata?.workspaceRoot?.resolve(span.fileName)
                     val codeMap = map[genFilePath] ?: continue
 
                     for (lfSourcePath in codeMap.lfSourcePaths()) { // fixme error is reported several times
-                        errorReporter.report(
-                            lfSourcePath,
+                        errorReporter.at(lfSourcePath, codeMap.adjusted(lfSourcePath, span.range)).report(
                             message.severity,
-                            DiagnosticReporting.messageOf(message.message, genFilePath, span.start),
-                            codeMap.adjusted(lfSourcePath, span.range),
+                            DiagnosticReporting.messageOf(message.message, genFilePath, span.start)
                         )
                     }
                 }
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSValidator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSValidator.kt
index 420dd71f09..e60c1a99df 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSValidator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSValidator.kt
@@ -4,17 +4,9 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.eclipse.lsp4j.DiagnosticSeverity
-import org.eclipse.xtext.util.CancelIndicator
 import org.lflang.ErrorReporter
 import org.lflang.FileConfig
-import org.lflang.generator.CodeMap
-import org.lflang.generator.DiagnosticReporting
-import org.lflang.generator.HumanReadableReportingStrategy
-import org.lflang.generator.LFGeneratorContext
-import org.lflang.generator.Position
-import org.lflang.generator.Range
-import org.lflang.generator.ValidationStrategy
-import org.lflang.generator.Validator
+import org.lflang.generator.*
 import org.lflang.util.LFCommand
 import java.nio.file.Path
 import java.util.regex.Pattern
@@ -71,6 +63,7 @@ class TSValidator(
         ) {
             val start: Position = Position.fromOneBased(line, column)
             val end: Position = if (endLine >= line) Position.fromOneBased(endLine, endColumn) else start.plus(" ")
+            val range: Range get() = Range(start, end)
             val severity: DiagnosticSeverity = when (_severity) {
                 0 -> DiagnosticSeverity.Information
                 1 -> DiagnosticSeverity.Warning
@@ -103,18 +96,13 @@ class TSValidator(
                             val codeMap = map[genPath] ?: continue
 
                             for (path in codeMap.lfSourcePaths()) {
-                                val lfStart = codeMap.adjusted(path, message.start)
-                                val lfEnd = codeMap.adjusted(path, message.end)
-                                if (lfStart != Position.ORIGIN) {  // Ignore linting errors in non-user-supplied code.
-                                    errorReporter.report(
-                                        path,
-                                        message.severity,
-                                        DiagnosticReporting.messageOf(message.message, genPath, message.start),
-                                        Range(
-                                            lfStart,
-                                            if (lfEnd > lfStart) lfEnd else lfStart + " ",
+                                val range = codeMap.adjusted(path, message.range)
+                                if (range.startInclusive != Position.ORIGIN) {  // Ignore linting errors in non-user-supplied code.
+                                    errorReporter.at(path, range)
+                                        .report(
+                                            message.severity,
+                                            DiagnosticReporting.messageOf(message.message, genPath, message.start)
                                         )
-                                    )
                                 }
                             }
                         }

From 6b11edd68f34d28906f3d57a2a80e19a1324b954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Tue, 13 Jun 2023 14:48:30 +0200
Subject: [PATCH 0332/1114] Doc

---
 .../java/org/lflang/DefaultErrorReporter.java |  1 -
 .../main/java/org/lflang/ErrorReporter.java   | 81 ++++++++++++-------
 .../java/org/lflang/ErrorReporterBase.java    | 25 +++++-
 3 files changed, 74 insertions(+), 33 deletions(-)

diff --git a/core/src/main/java/org/lflang/DefaultErrorReporter.java b/core/src/main/java/org/lflang/DefaultErrorReporter.java
index 1b245c45c7..bc66b78ab7 100644
--- a/core/src/main/java/org/lflang/DefaultErrorReporter.java
+++ b/core/src/main/java/org/lflang/DefaultErrorReporter.java
@@ -5,7 +5,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 
-import org.lflang.ErrorReporter2.Stage2;
 import org.lflang.generator.Range;
 
 /** Simple implementation of the ErrorReport interface that simply prints to standard out. */
diff --git a/core/src/main/java/org/lflang/ErrorReporter.java b/core/src/main/java/org/lflang/ErrorReporter.java
index dfe32c4845..89b810c7ed 100644
--- a/core/src/main/java/org/lflang/ErrorReporter.java
+++ b/core/src/main/java/org/lflang/ErrorReporter.java
@@ -1,49 +1,89 @@
 package org.lflang;
 
 import java.nio.file.Path;
+import java.util.OptionalInt;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 
-import org.lflang.Stage2;
 import org.lflang.generator.Position;
 import org.lflang.generator.Range;
 
 /**
  * Interface for reporting errors.
+ * This interface is a staged builder: first call one of the {@code at}
+ * methods to specify the position of the message, then use one
+ * of the report methods on the returned {@link Stage2} instance.
+ *
+ * <p>Examples:
+ * <pre>{@code
+ * errorReporter.at(file, line).error("an error")
+ * errorReporter.at(node).warning("a warning reported on a node")
+ * errorReporter.nowhere().error("Some error that has no specific position")
+ * }</pre>
+ *
+ * @see ErrorReporterBase
  *
  * @author Edward A. Lee
  * @author Marten Lohstroh
  * @author Christian Menard
+ * @author Clément Fournier
  */
 public interface ErrorReporter {
 
+  /** Position the message on the given range in a given file. */
+
   Stage2 at(Path file, Range range);
 
+  /** Position the message on the given node. */
   Stage2 at(EObject object);
 
+  /**
+   * Position the message in the file, at an unknown line.
+   * Implementations usually will report on the first line of the file.
+   */
   default Stage2 at(Path file) {
     return at(file, 1);
   }
 
-  default Stage2 atNullableLine(Path file, Integer line) {
-    if (line != null) {
-      return at(file, line);
-    }
-    return at(file);
-  }
-
+  /**
+   * Position the message in the file, on the given line.
+   */
   default Stage2 at(Path file, int line) {
     return at(file, Position.fromOneBased(line, 1));
   }
 
+  /**
+   * Position the message in the file, using a position object.
+   */
   default Stage2 at(Path file, Position pos) {
     return at(file, Range.degenerateRange(pos));
   }
 
+  /**
+   * Specify that the message has no relevant position, ie
+   * it does not belong to a particular file.
+   */
   Stage2 nowhere();
 
+  /**
+   * Position the message in the given file. The line may be
+   * null. This is a convenience wrapper that calls either
+   * {@link #at(Path, int)} or {@link #at(Path)}.
+   */
+  default Stage2 atNullableLine(Path file, Integer line) {
+    if (line != null) {
+      return at(file, line);
+    }
+    return at(file);
+  }
 
+
+  /**
+   * Interface to report a message with a specific severity.
+   * This is returned by one of the positioning functions like
+   * {@link #at(Path)}. This instance holds an implicit position.
+   */
   interface Stage2 {
 
     /**
@@ -75,7 +115,8 @@ default void info(String message) {
 
 
     /**
-     * Report a message with the given severity
+     * Report a message with the given severity. This is the only
+     * member that needs to be implemented.
      *
      * @param severity The severity
      * @param message The message to report
@@ -84,24 +125,6 @@ default void info(String message) {
 
   }
 
-
-
-  /**
-   * Report a message of severity {@code severity} that pertains to line {@code line} of an LF
-   * source file.
-   *
-   * @param file The file to which the message pertains, or {@code null} if the file is unknown.
-   * @param severity the severity of the message
-   * @param message the message to send to the IDE
-   * @param line the one-based line number associated with the message
-   * @return a string that describes the diagnostic
-   */
-  default String report(Path file, DiagnosticSeverity severity, String message, int line) {
-    at(file, line).report(severity, message);
-    return message;
-  }
-
-
   /**
    * Check if errors where reported.
    *
@@ -110,8 +133,8 @@ default String report(Path file, DiagnosticSeverity severity, String message, in
   boolean getErrorsOccurred();
 
   /**
-   * Clear error history, if exists. This is usually only the case for error markers in Epoch
-   * (Eclipse).
+   * Clear error history, if exists. This is usually only the
+   * case for error markers in Epoch (Eclipse).
    */
   default void clearHistory() {}
 }
diff --git a/core/src/main/java/org/lflang/ErrorReporterBase.java b/core/src/main/java/org/lflang/ErrorReporterBase.java
index c376f8a547..de51d5785e 100644
--- a/core/src/main/java/org/lflang/ErrorReporterBase.java
+++ b/core/src/main/java/org/lflang/ErrorReporterBase.java
@@ -7,11 +7,16 @@
 
 import org.lflang.generator.Range;
 
-/** Simple implementation of the ErrorReport interface that simply prints to standard out. */
+/**
+ * Base implementation of the {@link ErrorReporter} interface.
+ */
 public abstract class ErrorReporterBase implements ErrorReporter {
 
   private boolean errorsOccurred = false;
 
+  protected ErrorReporterBase() {
+  }
+
   @Override
   public boolean getErrorsOccurred() {
     return errorsOccurred;
@@ -38,8 +43,8 @@ public Stage2 at(Path file, Range range) {
   }
 
   @Override
-  public Stage2 at(EObject object) {
-    return wrap((severity, message) -> reportOnNode(object, severity, message));
+  public Stage2 at(EObject node) {
+    return wrap((severity, message) -> reportOnNode(node, severity, message));
   }
 
   @Override
@@ -47,10 +52,24 @@ public Stage2 nowhere() {
     return wrap(this::reportWithoutPosition);
   }
 
+
+  // These methods are the terminal ones that are called when a call to
+  // Stage2#report is issued by a caller.
+
+
+  /**
+   * Implementation of the reporting methods that use a path and range as position.
+   */
   protected abstract void report(Path path, Range range, DiagnosticSeverity severity, String message);
 
+  /**
+   * Implementation of the reporting methods that use a node as position.
+   */
   protected abstract void reportOnNode(EObject node, DiagnosticSeverity severity, String message);
 
+  /**
+   * Implementation of the reporting methods for {@link #nowhere()}.
+   */
   protected abstract void reportWithoutPosition(DiagnosticSeverity severity, String message);
 
 }

From d0500d80e4401fa1bf76195423239136ce7f7dba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Tue, 13 Jun 2023 15:00:06 +0200
Subject: [PATCH 0333/1114] Cleanups

---
 .../main/java/org/lflang/ErrorReporter.java   |  8 +++----
 .../federated/generator/FedGenerator.java     | 24 +++++++++----------
 .../federated/generator/FederateInstance.java |  4 ++--
 .../generator/GeneratorCommandFactory.java    | 14 +++++++----
 .../LanguageServerErrorReporter.java          |  2 --
 .../org/lflang/generator/TimerInstance.java   |  8 ++-----
 .../org/lflang/generator/c/CCompiler.java     |  8 +++----
 7 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/core/src/main/java/org/lflang/ErrorReporter.java b/core/src/main/java/org/lflang/ErrorReporter.java
index 89b810c7ed..fed2e58752 100644
--- a/core/src/main/java/org/lflang/ErrorReporter.java
+++ b/core/src/main/java/org/lflang/ErrorReporter.java
@@ -31,15 +31,15 @@
  */
 public interface ErrorReporter {
 
-  /** Position the message on the given range in a given file. */
+  /** Position the message on the given range in a given file (both must be non-null). */
 
   Stage2 at(Path file, Range range);
 
-  /** Position the message on the given node. */
+  /** Position the message on the given node (must be non-null). */
   Stage2 at(EObject object);
 
   /**
-   * Position the message in the file, at an unknown line.
+   * Position the message in the file (non-null), at an unknown line.
    * Implementations usually will report on the first line of the file.
    */
   default Stage2 at(Path file) {
@@ -47,7 +47,7 @@ default Stage2 at(Path file) {
   }
 
   /**
-   * Position the message in the file, on the given line.
+   * Position the message in the file (non-null), on the given line.
    */
   default Stage2 at(Path file, int line) {
     return at(file, Position.fromOneBased(line, 1));
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index f97b81cf05..29b49a50ce 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -55,6 +55,7 @@
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.Reactor;
+import org.lflang.lf.TargetDecl;
 import org.lflang.util.Averager;
 
 public class FedGenerator {
@@ -165,10 +166,9 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
               subContexts.forEach(
                   c -> {
                     if (c.getErrorReporter().getErrorsOccurred()) {
-                      ErrorReporter errorReporter1 = context
-                          .getErrorReporter();
-                      errorReporter1.at(c.getFileConfig().srcFile).error(
-                          "Failure during code generation of " + c.getFileConfig().srcFile);
+                      context.getErrorReporter()
+                          .at(c.getFileConfig().srcFile)
+                          .error("Failure during code generation of " + c.getFileConfig().srcFile);
                     }
                   });
             });
@@ -228,15 +228,16 @@ private void cleanIfNeeded(LFGeneratorContext context) {
 
   /** Return whether federated execution is supported for {@code resource}. */
   private boolean federatedExecutionIsSupported(Resource resource) {
-    var target = Target.fromDecl(GeneratorUtils.findTargetDecl(resource));
+    TargetDecl targetDecl = GeneratorUtils.findTargetDecl(resource);
+    var target = Target.fromDecl(targetDecl);
     var targetOK =
         List.of(Target.C, Target.Python, Target.TS, Target.CPP, Target.CCPP).contains(target);
     if (!targetOK) {
-      errorReporter.nowhere().error(
+      errorReporter.at(targetDecl).error(
           "Federated execution is not supported with target " + target + ".");
     }
     if (target.equals(Target.C) && GeneratorUtils.isHostWindows()) {
-      errorReporter.nowhere().error("Federated LF programs with a C target are currently not supported on Windows.");
+      errorReporter.at(targetDecl).error("Federated LF programs with a C target are currently not supported on Windows.");
       targetOK = false;
     }
 
@@ -331,9 +332,8 @@ public TargetConfig getTargetConfig() {
     try {
       compileThreadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
     } catch (Exception e) {
-      ErrorReporter errorReporter1 = context.getErrorReporter();
-      String message = "Failure during code generation: " + e.getMessage();
-      errorReporter1.nowhere().error(message);
+      context.getErrorReporter().nowhere().error(
+          "Failure during code generation: " + e.getMessage());
       e.printStackTrace();
     } finally {
       finalizer.accept(subContexts);
@@ -509,8 +509,8 @@ private void replaceConnectionFromOutputPort(PortInstance output) {
     for (SendRange srcRange : output.getDependentPorts()) {
       if (srcRange.connection == null) {
         // This should not happen.
-        EObject object = output.getDefinition();
-        errorReporter.at(object).error("Unexpected error. Cannot find output connection for port");
+        errorReporter.at(output.getDefinition())
+            .error("Cannot find output connection for port");
         continue;
       }
       // Iterate through destinations
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index f59085cc00..3a0ba7d488 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -510,8 +510,8 @@ private boolean containsAllVarRefs(Iterable<VarRef> varRefs) {
         referencesFederate = true;
       } else {
         if (referencesFederate) {
-            errorReporter.at(varRef).error(
-                "Mixed triggers and effects from" + " different federates. This is not permitted");
+            errorReporter.at(varRef)
+                .error("Mixed triggers and effects from different federates. This is not permitted");
         }
         inFederate = false;
       }
diff --git a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
index 471e85aa89..a53c9b90b1 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
@@ -25,10 +25,16 @@
 
 package org.lflang.generator;
 
+import static org.eclipse.lsp4j.DiagnosticSeverity.Error;
+import static org.eclipse.lsp4j.DiagnosticSeverity.Warning;
+
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Objects;
+
+import org.eclipse.lsp4j.DiagnosticSeverity;
+
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.util.LFCommand;
@@ -144,11 +150,9 @@ public LFCommand createCommand(String cmd, List<String> args, Path dir, boolean
               + cmd
               + " is installed. "
               + "You can set PATH in ~/.bash_profile on Linux or Mac.";
-      if (failOnError) {
-        errorReporter.nowhere().error(message);
-      } else {
-          errorReporter.nowhere().warning(message);
-      }
+
+      DiagnosticSeverity severity = failOnError ? Error : Warning;
+      errorReporter.nowhere().report(severity, message);
     }
 
     return command;
diff --git a/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java b/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
index b1cb30f1f0..3fe1a2907e 100644
--- a/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
+++ b/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
@@ -37,7 +37,6 @@ public class LanguageServerErrorReporter extends ErrorReporterBase {
   /** The list of all diagnostics since the last reset. */
   private final Map<Path, List<Diagnostic>> diagnostics;
 
-  /* ------------------------  CONSTRUCTORS  -------------------------- */
 
   /**
    * Initialize a {@code DiagnosticAcceptor} for the document whose parse tree root node is {@code
@@ -81,7 +80,6 @@ protected void report(Path path, org.lflang.generator.Range range, DiagnosticSev
             message, severity, "LF Language Server"));
 
   }
-  /* -----------------------  PUBLIC METHODS  ------------------------- */
 
   @Override
   public boolean getErrorsOccurred() {
diff --git a/core/src/main/java/org/lflang/generator/TimerInstance.java b/core/src/main/java/org/lflang/generator/TimerInstance.java
index 38dc374bf6..1f4626f5be 100644
--- a/core/src/main/java/org/lflang/generator/TimerInstance.java
+++ b/core/src/main/java/org/lflang/generator/TimerInstance.java
@@ -26,8 +26,6 @@
 
 package org.lflang.generator;
 
-import org.eclipse.emf.ecore.EObject;
-
 import org.lflang.TimeValue;
 import org.lflang.lf.Timer;
 
@@ -65,16 +63,14 @@ public TimerInstance(Timer definition, ReactorInstance parent) {
         try {
           this.offset = parent.getTimeValue(definition.getOffset());
         } catch (IllegalArgumentException ex) {
-            EObject object = definition.getOffset();
-            parent.reporter.at(object).error("Invalid time.");
+          parent.reporter.at(definition.getOffset()).error("Invalid time.");
         }
       }
       if (definition.getPeriod() != null) {
         try {
           this.period = parent.getTimeValue(definition.getPeriod());
         } catch (IllegalArgumentException ex) {
-            EObject object = definition.getPeriod();
-            parent.reporter.at(object).error("Invalid time.");
+          parent.reporter.at(definition.getPeriod()).error("Invalid time.");
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index 2af631b349..858098d9ac 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -134,8 +134,8 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
     if (cMakeReturnCode != 0
         && context.getMode() == LFGeneratorContext.Mode.STANDALONE
         && !outputContainsKnownCMakeErrors(compile.getErrors())) {
-        errorReporter.nowhere().error(
-            targetConfig.compiler + " failed with error code " + cMakeReturnCode);
+        errorReporter.nowhere()
+            .error(targetConfig.compiler + " failed with error code " + cMakeReturnCode);
     }
 
     // For warnings (vs. errors), the return code is 0.
@@ -156,8 +156,8 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
       if (makeReturnCode != 0
           && context.getMode() == LFGeneratorContext.Mode.STANDALONE
           && !outputContainsKnownCMakeErrors(build.getErrors())) {
-          errorReporter.nowhere().error(
-              targetConfig.compiler + " failed with error code " + makeReturnCode);
+          errorReporter.nowhere()
+              .error(targetConfig.compiler + " failed with error code " + makeReturnCode);
       }
 
       // For warnings (vs. errors), the return code is 0.

From 4f614b2e23fe6d5ff7a0e2ba8d7995b2b1e72869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Tue, 13 Jun 2023 15:12:30 +0200
Subject: [PATCH 0334/1114] Another cleanup

---
 .../HumanReadableReportingStrategy.java       | 64 ++++++++-----------
 1 file changed, 26 insertions(+), 38 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
index 42923fb7a9..488b6620dc 100644
--- a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
+++ b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
@@ -4,12 +4,10 @@
 import java.nio.file.Paths;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.eclipse.lsp4j.DiagnosticSeverity;
-import org.eclipse.xtext.xbase.lib.Procedures.Procedure0;
 
 import org.lflang.ErrorReporter;
 
@@ -95,27 +93,27 @@ private void reportErrorLine(
     Matcher matcher = diagnosticMessagePattern.matcher(stripEscaped(line));
     if (matcher.matches()) {
       final Path path = Paths.get(matcher.group("path"));
+      final DiagnosticSeverity severity = DiagnosticReporting.severityOf(matcher.group("severity"));
+
+      String column = matcher.group("column");
       final Position generatedFilePosition =
           Position.fromOneBased(
               Integer.parseInt(matcher.group("line")),
-              Integer.parseInt(
-                  matcher.group("column") != null
-                      ? matcher.group("column")
-                      : "0") // FIXME: Unreliable heuristic
-              );
+              column == null ? 1 // FIXME: Unreliable heuristic
+                  : Integer.parseInt(column)
+          );
       final String message =
           DiagnosticReporting.messageOf(matcher.group("message"), path, generatedFilePosition);
       final CodeMap map = maps.get(relativeTo != null ? relativeTo.resolve(path) : path);
-      final DiagnosticSeverity severity = DiagnosticReporting.severityOf(matcher.group("severity"));
       if (map == null) {
         errorReporter.nowhere().report(severity, message);
         return;
       }
       for (Path srcFile : map.lfSourcePaths()) {
         Position lfFilePosition = map.adjusted(srcFile, generatedFilePosition);
-        if (matcher.group("column") != null) {
-          reportAppropriateRange(
-              range -> errorReporter.at(srcFile, range).report(severity, message), lfFilePosition, it);
+        if (column != null) {
+          Range range = findAppropriateRange(lfFilePosition, it);
+          errorReporter.at(srcFile, range).report(severity, message);
         } else {
           errorReporter.at(srcFile, lfFilePosition.getOneBasedLine()).report(severity, message);
         }
@@ -124,38 +122,28 @@ private void reportErrorLine(
   }
 
   /**
-   * Report the appropriate range to {@code report}.
+   * Find the appropriate range to {@code report}.
    *
-   * @param report A reporting method whose first and second parameters are the (included) start and
-   *     (excluded) end of the relevant range.
    * @param lfFilePosition The point about which the relevant range is anchored.
    * @param it An iterator over the lines immediately following a diagnostic message.
    */
-  private void reportAppropriateRange(
-      Consumer<Range> report, Position lfFilePosition, Iterator<String> it) {
-    Procedure0 failGracefully =
-        () -> report.accept(new Range(lfFilePosition, lfFilePosition.plus(" ")));
-    if (!it.hasNext()) {
-      failGracefully.apply();
-      return;
-    }
-    String line = it.next();
-    Matcher labelMatcher = labelPattern.matcher(line);
-    if (labelMatcher.find()) {
-      report.accept(
-          new Range(
-              Position.fromZeroBased(
-                  lfFilePosition.getZeroBasedLine(),
-                  lfFilePosition.getZeroBasedColumn() - labelMatcher.group(1).length()),
-              lfFilePosition.plus(labelMatcher.group(2))));
-      return;
-    }
-    if (diagnosticMessagePattern.matcher(line).find()) {
-      failGracefully.apply();
-      bufferedLine = line;
-      return;
+  private Range findAppropriateRange(Position lfFilePosition, Iterator<String> it) {
+    while (it.hasNext()) {
+      String line = it.next();
+      Matcher labelMatcher = labelPattern.matcher(line);
+      if (labelMatcher.find()) {
+        Position start = Position.fromZeroBased(
+            lfFilePosition.getZeroBasedLine(),
+            lfFilePosition.getZeroBasedColumn() - labelMatcher.group(1).length());
+        Position end = lfFilePosition.plus(labelMatcher.group(2));
+        return new Range(start, end);
+      } else if (diagnosticMessagePattern.matcher(line).find()) {
+        bufferedLine = line;
+        break;
+      }
     }
-    reportAppropriateRange(report, lfFilePosition, it);
+    // fallback, we didn't find it.
+    return new Range(lfFilePosition, lfFilePosition.plus(" "));
   }
 
   /**

From d328d410f7c1ff432bd2e750dfc5dd764a701a00 Mon Sep 17 00:00:00 2001
From: Christian Menard <Christian.Menard@tu-dresden.de>
Date: Tue, 13 Jun 2023 17:42:11 +0200
Subject: [PATCH 0335/1114] fix typo

---
 .github/workflows/check-diff.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
index e67c36bb01..40fe15834d 100644
--- a/.github/workflows/check-diff.yml
+++ b/.github/workflows/check-diff.yml
@@ -70,7 +70,7 @@ jobs:
         name: "Determine whether to skip checks"
         run: |
           echo ${{ github.ref_name }}
-          if echo ${{ github.ref_name }} | grep 'gh-readonly-queues'; then
+          if echo ${{ github.ref_name }} | grep 'gh-readonly-queue'; then
             echo "Don't skip, because this is a merge queue commit."
             echo "skip=false" >> $GITHUB_OUTPUT
           else

From 72cfe4609c744c1ff1a00927925ea2f0c7f61f8f Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 13 Jun 2023 16:29:04 -0700
Subject: [PATCH 0336/1114] Fixes in isEqual.

---
 .../src/main/java/org/lflang/ast/IsEqual.java | 21 ++++++++++++-------
 .../java/org/lflang/ast/ParsingUtils.java     |  7 +++----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/IsEqual.java b/core/src/main/java/org/lflang/ast/IsEqual.java
index a79d1c71fa..af06923d35 100644
--- a/core/src/main/java/org/lflang/ast/IsEqual.java
+++ b/core/src/main/java/org/lflang/ast/IsEqual.java
@@ -179,18 +179,24 @@ public Boolean caseInitializer(Initializer object) {
             // An initializer with no parens is equivalent to one with parens,
             // if the list has a single element. This is probably going to change
             // when we introduce equals initializers.
-//            .equalAsObjects(Initializer::isParens)
+            //            .equalAsObjects(Initializer::isParens)
             .listsEquivalent(Initializer::getExprs)
             .conclusion
-        || otherObject instanceof Initializer i && i.getExprs().size() == 1 && i.getExprs().get(0) instanceof BracedListExpression ble
+        || otherObject instanceof Initializer i
+            && i.getExprs().size() == 1
+            && i.getExprs().get(0) instanceof BracedListExpression ble
             && initializerAndBracedListExpression(object, ble)
-        || otherObject instanceof Initializer i2 && object.getExprs().size() == 1 && object.getExprs().get(0) instanceof BracedListExpression ble2
-        && initializerAndBracedListExpression(i2, ble2);
+        || otherObject instanceof Initializer i2
+            && object.getExprs().size() == 1
+            && object.getExprs().get(0) instanceof BracedListExpression ble2
+            && initializerAndBracedListExpression(i2, ble2);
   }
 
-  private static boolean initializerAndBracedListExpression(Initializer object, BracedListExpression otherObject) {
+  private static boolean initializerAndBracedListExpression(
+      Initializer object, BracedListExpression otherObject) {
     return ASTUtils.getTarget(object) == Target.C
-            && listsEqualish(otherObject.getItems(), object.getExprs(), (a, b) -> new IsEqual(a).doSwitch(b));
+        && listsEqualish(
+            otherObject.getItems(), object.getExprs(), (a, b) -> new IsEqual(a).doSwitch(b));
   }
 
   @Override
@@ -593,7 +599,8 @@ private UnsupportedOperationException thereIsAMoreSpecificCase(
                 .collect(Collectors.joining(" or "))));
   }
 
-  private static <T> boolean listsEqualish(List<T> list0, List<T> list1, BiPredicate<T, T> equalish) {
+  private static <T> boolean listsEqualish(
+      List<T> list0, List<T> list1, BiPredicate<T, T> equalish) {
     if (list0 == list1) return true; // e.g., they are both null
     if (list0.size() != list1.size()) return false;
     for (int i = 0; i < list0.size(); i++) {
diff --git a/core/src/main/java/org/lflang/ast/ParsingUtils.java b/core/src/main/java/org/lflang/ast/ParsingUtils.java
index 0b638b656d..caa0bb0174 100644
--- a/core/src/main/java/org/lflang/ast/ParsingUtils.java
+++ b/core/src/main/java/org/lflang/ast/ParsingUtils.java
@@ -1,6 +1,9 @@
 package org.lflang.ast;
 
 import com.google.inject.Injector;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.resource.XtextResource;
@@ -8,10 +11,6 @@
 import org.lflang.LFStandaloneSetup;
 import org.lflang.lf.Model;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
 public class ParsingUtils {
   public static Model parse(Path file) {
     // Source:

From 7c503345797528f664adf158aeb6e1af5a8169c8 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 13 Jun 2023 17:39:52 -0700
Subject: [PATCH 0337/1114] Do not capture certain comments in toText.

---
 core/src/main/java/org/lflang/ast/ToText.java | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ToText.java b/core/src/main/java/org/lflang/ast/ToText.java
index f1d47b7c69..0c001ad67e 100644
--- a/core/src/main/java/org/lflang/ast/ToText.java
+++ b/core/src/main/java/org/lflang/ast/ToText.java
@@ -47,21 +47,15 @@ public String caseCode(Code code) {
     ICompositeNode node = NodeModelUtils.getNode(code);
     if (node != null) {
       StringBuilder builder = new StringBuilder(Math.max(node.getTotalLength(), 1));
+      boolean started = false;
       for (ILeafNode leaf : node.getLeafNodes()) {
-        builder.append(leaf.getText());
+        if (!leaf.getText().contains("{=")
+            && (leaf.getText().contains("\n") && !ASTUtils.isComment(leaf))) {
+          started = true;
+        }
+        if (started && !leaf.getText().contains("=}")) builder.append(leaf.getText());
       }
       String str = builder.toString().trim();
-      // Remove the code delimiters (and any surrounding comments).
-      // This assumes any comment before {= does not include {=.
-      int start = str.indexOf("{=");
-      int end = str.lastIndexOf("=}");
-      if (start == -1 || end == -1) {
-        // Silent failure is needed here because toText is needed to create the intermediate
-        // representation,
-        // which the validator uses.
-        return str;
-      }
-      str = str.substring(start + 2, end);
       if (str.split("\n").length > 1) {
         // multi line code
         return StringUtil.trimCodeBlock(str, 1);

From 202d425a42388bc5da70e7a90cfe2a1c317018a3 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 13 Jun 2023 18:30:41 -0700
Subject: [PATCH 0338/1114] More tinkering with comments around Code eObjects.

---
 core/src/main/java/org/lflang/ast/ToLf.java   |  7 ++++---
 core/src/main/java/org/lflang/ast/ToText.java | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 1a6e6bd4be..bc5808e925 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -206,9 +206,10 @@ private static List<INode> getContainedComments(INode node) {
           && (child.getText().contains("\n") || child.getText().contains("\r"))
           && !inSemanticallyInsignificantLeadingRubbish) {
         break;
-      } else if (child instanceof ICompositeNode compositeNode
-          && compositeNode.getGrammarElement().eContainer() instanceof ParserRuleImpl pri
-          && pri.getName().equals("Body")) {
+      } else if (child.getParent() != null
+          && child.getParent().getGrammarElement().eContainer() instanceof ParserRuleImpl pri
+          && pri.getName().equals("Body")
+          && !child.getText().isBlank()) {
         break;
       }
     }
diff --git a/core/src/main/java/org/lflang/ast/ToText.java b/core/src/main/java/org/lflang/ast/ToText.java
index 0c001ad67e..103303f51e 100644
--- a/core/src/main/java/org/lflang/ast/ToText.java
+++ b/core/src/main/java/org/lflang/ast/ToText.java
@@ -49,16 +49,19 @@ public String caseCode(Code code) {
       StringBuilder builder = new StringBuilder(Math.max(node.getTotalLength(), 1));
       boolean started = false;
       for (ILeafNode leaf : node.getLeafNodes()) {
-        if (!leaf.getText().contains("{=")
-            && (leaf.getText().contains("\n") && !ASTUtils.isComment(leaf))) {
-          started = true;
+        if (!leaf.getText().equals("{=") && !leaf.getText().equals("=}")) {
+          var nothing = leaf.getText().isBlank() || ASTUtils.isComment(leaf);
+          if (!nothing || started || leaf.getText().startsWith("\n"))
+            builder.append(leaf.getText());
+          if ((leaf.getText().contains("\n") || (!nothing))) {
+            started = true;
+          }
         }
-        if (started && !leaf.getText().contains("=}")) builder.append(leaf.getText());
       }
-      String str = builder.toString().trim();
-      if (str.split("\n").length > 1) {
+      String str = builder.toString();
+      if (str.contains("\n")) {
         // multi line code
-        return StringUtil.trimCodeBlock(str, 1);
+        return StringUtil.trimCodeBlock(str, 0);
       } else {
         // single line code
         return str.trim();

From 580edd4e3f61e08b4b7021fd38a96896f6c55a99 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 14 Jun 2023 11:20:16 +0200
Subject: [PATCH 0339/1114] Address Peter's comments

---
 .../generator/c/CTriggerObjectsGenerator.java |  5 ++--
 .../java/org/lflang/generator/c/CUtil.java    | 23 +++++++++++++++----
 .../generator/python/PythonGenerator.java     |  2 +-
 core/src/main/resources/lib/c/reactor-c       |  2 +-
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 64ac349a39..a7aa77446b 100644
--- a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -127,16 +127,15 @@ public static String generateSchedulerInitializerMain(
     return code.toString();
   }
 
-  // FIXME: Probably we want some enclaveConfig handed off
   public static String generateSchedulerInitializerEnclave(
       ReactorInstance enclave, TargetConfig targetConfig) {
     return String.join(
         "\n",
         "lf_sched_init(",
-        "    &" + CUtil.getEnvironmentStruct(enclave) + ",", // FIXME: Hack for enclaves step1
+        "    &" + CUtil.getEnvironmentStruct(enclave) + ",",
         "    "
             + CUtil.getEnvironmentStruct(enclave)
-            + ".num_workers,", // FIXME: Need better way of setting this
+            + ".num_workers,",
         "    &sched_params",
         ");");
   }
diff --git a/core/src/main/java/org/lflang/generator/c/CUtil.java b/core/src/main/java/org/lflang/generator/c/CUtil.java
index 39ac625f1c..cf63d5345f 100644
--- a/core/src/main/java/org/lflang/generator/c/CUtil.java
+++ b/core/src/main/java/org/lflang/generator/c/CUtil.java
@@ -808,7 +808,9 @@ public static String getShortenedName(ReactorInstance instance) {
     return description;
   }
 
-  // Returns the ReactorInstance of the closest enclave in the containment hierarchy.
+  /** Returns the ReactorInstance of the closest enclave in the containment hierarchy. 
+   * @param inst The instance
+  */
   public static ReactorInstance getClosestEnclave(ReactorInstance inst) {
     if (inst.isMainOrFederated() || isEnclave(inst.getDefinition())) {
       return inst;
@@ -816,22 +818,35 @@ public static ReactorInstance getClosestEnclave(ReactorInstance inst) {
     return getClosestEnclave(inst.getParent());
   }
 
+  /** Returns the unique ID of the environment. This ID is a global variable
+   * in the generated C file.
+   * @param inst The instance
+   */
   public static String getEnvironmentId(ReactorInstance inst) {
     ReactorInstance enclave = getClosestEnclave(inst);
     return enclave.uniqueID();
   }
 
-  // Returns a string which represents a C variable which points to the struct of the environment
-  // of the ReactorInstance inst.
+  /**
+   * Returns a string which represents a C variable which points to the struct of the environment
+   * of the ReactorInstance inst.
+   * @param inst The instance
+   */
   public static String getEnvironmentStruct(ReactorInstance inst) {
     return "envs[" + getEnvironmentId(inst) + "]";
   }
 
+  /**  Returns the name of the environment which `inst` is in 
+   * @param inst The instance
+  */
   public static String getEnvironmentName(ReactorInstance inst) {
     ReactorInstance enclave = getClosestEnclave(inst);
     return enclave.getName();
   }
-  // Given an instance, e.g. the main reactor, return a list of all enclaves in the program
+
+  /** Given an instance, e.g. the main reactor, return a list of all enclaves in the program 
+   * @param inst The instance
+  */
   public static List<ReactorInstance> getEnclaves(ReactorInstance root) {
     List<ReactorInstance> enclaves = new ArrayList<>();
     Queue<ReactorInstance> queue = new LinkedList<>();
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index ed722373db..f06015f8f3 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -111,7 +111,7 @@ private PythonGenerator(
         false,
         types,
         cmakeGenerator,
-        new PythonDelayBodyGenerator(types)); // FIXME: What to pass to Python?
+        new PythonDelayBodyGenerator(types));
     this.targetConfig.compiler = "gcc";
     this.targetConfig.compilerFlags = new ArrayList<>();
     this.targetConfig.linkerFlags = "";
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 332fe31368..b238c88a00 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 332fe31368e766ebeeef37dc29684e87835265d3
+Subproject commit b238c88a00f690a96e3b28a568f73ed89c4d13ae

From 16b4570e7ad54797ed8e00036939c581e95a885e Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 14 Jun 2023 11:28:40 +0200
Subject: [PATCH 0340/1114] Code auto-formatted with Spotless

---
 .../generator/c/CTriggerObjectsGenerator.java |  4 +--
 .../java/org/lflang/generator/c/CUtil.java    | 28 ++++++++++++-------
 .../generator/python/PythonGenerator.java     |  7 +----
 .../java/org/lflang/tests/TestRegistry.java   |  2 +-
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
index a7aa77446b..4d1124a3b9 100644
--- a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -133,9 +133,7 @@ public static String generateSchedulerInitializerEnclave(
         "\n",
         "lf_sched_init(",
         "    &" + CUtil.getEnvironmentStruct(enclave) + ",",
-        "    "
-            + CUtil.getEnvironmentStruct(enclave)
-            + ".num_workers,",
+        "    " + CUtil.getEnvironmentStruct(enclave) + ".num_workers,",
         "    &sched_params",
         ");");
   }
diff --git a/core/src/main/java/org/lflang/generator/c/CUtil.java b/core/src/main/java/org/lflang/generator/c/CUtil.java
index cf63d5345f..ab873ca987 100644
--- a/core/src/main/java/org/lflang/generator/c/CUtil.java
+++ b/core/src/main/java/org/lflang/generator/c/CUtil.java
@@ -808,9 +808,11 @@ public static String getShortenedName(ReactorInstance instance) {
     return description;
   }
 
-  /** Returns the ReactorInstance of the closest enclave in the containment hierarchy. 
+  /**
+   * Returns the ReactorInstance of the closest enclave in the containment hierarchy.
+   *
    * @param inst The instance
-  */
+   */
   public static ReactorInstance getClosestEnclave(ReactorInstance inst) {
     if (inst.isMainOrFederated() || isEnclave(inst.getDefinition())) {
       return inst;
@@ -818,8 +820,9 @@ public static ReactorInstance getClosestEnclave(ReactorInstance inst) {
     return getClosestEnclave(inst.getParent());
   }
 
-  /** Returns the unique ID of the environment. This ID is a global variable
-   * in the generated C file.
+  /**
+   * Returns the unique ID of the environment. This ID is a global variable in the generated C file.
+   *
    * @param inst The instance
    */
   public static String getEnvironmentId(ReactorInstance inst) {
@@ -828,25 +831,30 @@ public static String getEnvironmentId(ReactorInstance inst) {
   }
 
   /**
-   * Returns a string which represents a C variable which points to the struct of the environment
-   * of the ReactorInstance inst.
+   * Returns a string which represents a C variable which points to the struct of the environment of
+   * the ReactorInstance inst.
+   *
    * @param inst The instance
    */
   public static String getEnvironmentStruct(ReactorInstance inst) {
     return "envs[" + getEnvironmentId(inst) + "]";
   }
 
-  /**  Returns the name of the environment which `inst` is in 
+  /**
+   * Returns the name of the environment which `inst` is in
+   *
    * @param inst The instance
-  */
+   */
   public static String getEnvironmentName(ReactorInstance inst) {
     ReactorInstance enclave = getClosestEnclave(inst);
     return enclave.getName();
   }
 
-  /** Given an instance, e.g. the main reactor, return a list of all enclaves in the program 
+  /**
+   * Given an instance, e.g. the main reactor, return a list of all enclaves in the program
+   *
    * @param inst The instance
-  */
+   */
   public static List<ReactorInstance> getEnclaves(ReactorInstance root) {
     List<ReactorInstance> enclaves = new ArrayList<>();
     Queue<ReactorInstance> queue = new LinkedList<>();
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index f06015f8f3..91fdfaffad 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -106,12 +106,7 @@ public PythonGenerator(LFGeneratorContext context) {
 
   private PythonGenerator(
       LFGeneratorContext context, PythonTypes types, CCmakeGenerator cmakeGenerator) {
-    super(
-        context,
-        false,
-        types,
-        cmakeGenerator,
-        new PythonDelayBodyGenerator(types));
+    super(context, false, types, cmakeGenerator, new PythonDelayBodyGenerator(types));
     this.targetConfig.compiler = "gcc";
     this.targetConfig.compilerFlags = new ArrayList<>();
     this.targetConfig.linkerFlags = "";
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
index a44c7c3e0a..0a0a2dc5c2 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
@@ -120,7 +120,7 @@ public enum TestCategory {
     ENCLAVE(false, "", TestLevel.EXECUTION),
     /** Basic tests, ie, tests that all targets are supposed to implement. */
     BASIC(true, "", TestLevel.EXECUTION),
-    /** Tests about generics, not to confuse with {@link #GENERIC}. */
+    /** Tests about generics */
     GENERICS(true, "", TestLevel.EXECUTION),
     /** Tests about multiports and banks of reactors. */
     MULTIPORT(true, "", TestLevel.EXECUTION),

From a2fa03cdbb4f63e93fa4563846f36433d98d4753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Wed, 14 Jun 2023 13:18:06 +0200
Subject: [PATCH 0341/1114] Format

---
 .../lflang/cli/StandaloneErrorReporter.java   |  8 +--
 .../java/org/lflang/DefaultErrorReporter.java | 11 +---
 .../main/java/org/lflang/ErrorReporter.java   | 49 ++++++----------
 .../java/org/lflang/ErrorReporterBase.java    | 27 +++------
 core/src/main/java/org/lflang/ModelInfo.java  |  5 +-
 .../main/java/org/lflang/TargetProperty.java  | 12 ++--
 .../util/SynthesisErrorReporter.java          |  3 -
 .../federated/extensions/CExtension.java      | 30 +++++-----
 .../federated/extensions/TSExtension.java     | 32 +++++------
 .../federated/generator/FedGenerator.java     | 22 ++++---
 .../federated/generator/FedMainEmitter.java   |  5 +-
 .../federated/generator/FederateInstance.java |  5 +-
 .../generator/LineAdjustingErrorReporter.java | 15 ++---
 .../generator/SynchronizedErrorReporter.java  |  7 ++-
 .../FedROS2CPPSerialization.java              | 15 +++--
 .../federated/validation/FedValidator.java    |  7 ++-
 .../org/lflang/generator/GeneratorBase.java   | 38 +++++++------
 .../generator/GeneratorCommandFactory.java    |  2 -
 .../org/lflang/generator/GeneratorUtils.java  | 15 +++--
 .../HumanReadableReportingStrategy.java       | 15 +++--
 .../lflang/generator/IntegratedBuilder.java   |  8 +--
 .../LanguageServerErrorReporter.java          | 33 ++++++-----
 .../org/lflang/generator/PortInstance.java    |  5 +-
 .../org/lflang/generator/ReactorInstance.java | 37 +++++++-----
 .../java/org/lflang/generator/Validator.java  |  8 +--
 .../lflang/generator/c/CCmakeGenerator.java   | 10 ++--
 .../org/lflang/generator/c/CCompiler.java     | 57 ++++++++++++-------
 .../org/lflang/generator/c/CGenerator.java    | 39 +++++++------
 .../lflang/generator/c/CPortGenerator.java    |  6 +-
 .../generator/c/CReactionGenerator.java       | 14 +++--
 .../java/org/lflang/generator/c/CUtil.java    | 19 ++++---
 .../generator/c/CWatchdogGenerator.java       | 10 ++--
 .../generator/python/PythonGenerator.java     |  6 +-
 .../python/PythonReactionGenerator.java       | 10 ++--
 .../generator/python/PythonValidator.java     | 24 ++++----
 .../generator/rust/CargoDependencySpec.java   | 10 ++--
 .../generator/rust/RustTargetConfig.java      | 10 ++--
 .../java/org/lflang/util/ArduinoUtil.java     | 13 +++--
 .../main/java/org/lflang/util/FileUtil.java   | 22 +++----
 .../main/java/org/lflang/util/LFCommand.java  |  1 -
 .../org/lflang/validation/LFValidator.java    |  2 +-
 .../validation/ValidatorErrorReporter.java    | 29 +++++-----
 42 files changed, 353 insertions(+), 343 deletions(-)

diff --git a/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java b/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java
index 2ac9b48559..36ce472280 100644
--- a/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java
+++ b/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java
@@ -28,14 +28,10 @@
 package org.lflang.cli;
 
 import com.google.inject.Inject;
-
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.diagnostics.Severity;
-
-import org.lflang.ErrorReporter;
 import org.lflang.ErrorReporterBase;
 import org.lflang.generator.Range;
 
@@ -45,8 +41,7 @@
  */
 public class StandaloneErrorReporter extends ErrorReporterBase {
 
-  @Inject
-  private StandaloneIssueAcceptor issueAcceptor;
+  @Inject private StandaloneIssueAcceptor issueAcceptor;
 
   static Severity convertSeverity(DiagnosticSeverity severity) {
     return switch (severity) {
@@ -72,7 +67,6 @@ protected void report(Path path, Range range, DiagnosticSeverity severity, Strin
   protected void reportWithoutPosition(DiagnosticSeverity severity, String message) {
     LfIssue issue = new LfIssue(message, convertSeverity(severity), null, null);
     issueAcceptor.accept(issue);
-
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/DefaultErrorReporter.java b/core/src/main/java/org/lflang/DefaultErrorReporter.java
index bc66b78ab7..9be737671b 100644
--- a/core/src/main/java/org/lflang/DefaultErrorReporter.java
+++ b/core/src/main/java/org/lflang/DefaultErrorReporter.java
@@ -1,16 +1,13 @@
 package org.lflang;
 
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.generator.Range;
 
 /** Simple implementation of the ErrorReport interface that simply prints to standard out. */
 public class DefaultErrorReporter extends ErrorReporterBase implements ErrorReporter {
 
-
   private void println(String s) {
     System.out.println(s);
   }
@@ -28,11 +25,9 @@ protected void reportOnNode(EObject node, DiagnosticSeverity severity, String me
   @Override
   protected void reportWithoutPosition(DiagnosticSeverity severity, String message) {
     switch (severity) {
-    case Error -> println("ERROR: " + message);
-    case Warning -> println("WARNING: " + message);
-    case Information -> println("INFO: " + message);
-    case Hint -> println("HINT: " + message);
+      case Error -> println("ERROR: " + message);
+      case Warning -> println("WARNING: " + message);
+      case Information, Hint -> println("INFO: " + message);
     }
   }
-
 }
diff --git a/core/src/main/java/org/lflang/ErrorReporter.java b/core/src/main/java/org/lflang/ErrorReporter.java
index fed2e58752..3b39b14503 100644
--- a/core/src/main/java/org/lflang/ErrorReporter.java
+++ b/core/src/main/java/org/lflang/ErrorReporter.java
@@ -1,21 +1,18 @@
 package org.lflang;
 
 import java.nio.file.Path;
-import java.util.OptionalInt;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.generator.Position;
 import org.lflang.generator.Range;
 
 /**
- * Interface for reporting errors.
- * This interface is a staged builder: first call one of the {@code at}
- * methods to specify the position of the message, then use one
- * of the report methods on the returned {@link Stage2} instance.
+ * Interface for reporting errors. This interface is a staged builder: first call one of the {@code
+ * at} methods to specify the position of the message, then use one of the report methods on the
+ * returned {@link Stage2} instance.
  *
  * <p>Examples:
+ *
  * <pre>{@code
  * errorReporter.at(file, line).error("an error")
  * errorReporter.at(node).warning("a warning reported on a node")
@@ -23,7 +20,6 @@
  * }</pre>
  *
  * @see ErrorReporterBase
- *
  * @author Edward A. Lee
  * @author Marten Lohstroh
  * @author Christian Menard
@@ -32,44 +28,37 @@
 public interface ErrorReporter {
 
   /** Position the message on the given range in a given file (both must be non-null). */
-
   Stage2 at(Path file, Range range);
 
   /** Position the message on the given node (must be non-null). */
   Stage2 at(EObject object);
 
   /**
-   * Position the message in the file (non-null), at an unknown line.
-   * Implementations usually will report on the first line of the file.
+   * Position the message in the file (non-null), at an unknown line. Implementations usually will
+   * report on the first line of the file.
    */
   default Stage2 at(Path file) {
     return at(file, 1);
   }
 
-  /**
-   * Position the message in the file (non-null), on the given line.
-   */
+  /** Position the message in the file (non-null), on the given line. */
   default Stage2 at(Path file, int line) {
     return at(file, Position.fromOneBased(line, 1));
   }
 
-  /**
-   * Position the message in the file, using a position object.
-   */
+  /** Position the message in the file, using a position object. */
   default Stage2 at(Path file, Position pos) {
     return at(file, Range.degenerateRange(pos));
   }
 
   /**
-   * Specify that the message has no relevant position, ie
-   * it does not belong to a particular file.
+   * Specify that the message has no relevant position, ie it does not belong to a particular file.
    */
   Stage2 nowhere();
 
   /**
-   * Position the message in the given file. The line may be
-   * null. This is a convenience wrapper that calls either
-   * {@link #at(Path, int)} or {@link #at(Path)}.
+   * Position the message in the given file. The line may be null. This is a convenience wrapper
+   * that calls either {@link #at(Path, int)} or {@link #at(Path)}.
    */
   default Stage2 atNullableLine(Path file, Integer line) {
     if (line != null) {
@@ -78,11 +67,9 @@ default Stage2 atNullableLine(Path file, Integer line) {
     return at(file);
   }
 
-
   /**
-   * Interface to report a message with a specific severity.
-   * This is returned by one of the positioning functions like
-   * {@link #at(Path)}. This instance holds an implicit position.
+   * Interface to report a message with a specific severity. This is returned by one of the
+   * positioning functions like {@link #at(Path)}. This instance holds an implicit position.
    */
   interface Stage2 {
 
@@ -113,16 +100,14 @@ default void info(String message) {
       report(DiagnosticSeverity.Information, message);
     }
 
-
     /**
-     * Report a message with the given severity. This is the only
-     * member that needs to be implemented.
+     * Report a message with the given severity. This is the only member that needs to be
+     * implemented.
      *
      * @param severity The severity
      * @param message The message to report
      */
     void report(DiagnosticSeverity severity, String message);
-
   }
 
   /**
@@ -133,8 +118,8 @@ default void info(String message) {
   boolean getErrorsOccurred();
 
   /**
-   * Clear error history, if exists. This is usually only the
-   * case for error markers in Epoch (Eclipse).
+   * Clear error history, if exists. This is usually only the case for error markers in Epoch
+   * (Eclipse).
    */
   default void clearHistory() {}
 }
diff --git a/core/src/main/java/org/lflang/ErrorReporterBase.java b/core/src/main/java/org/lflang/ErrorReporterBase.java
index de51d5785e..c1364b6308 100644
--- a/core/src/main/java/org/lflang/ErrorReporterBase.java
+++ b/core/src/main/java/org/lflang/ErrorReporterBase.java
@@ -1,21 +1,16 @@
 package org.lflang;
 
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.generator.Range;
 
-/**
- * Base implementation of the {@link ErrorReporter} interface.
- */
+/** Base implementation of the {@link ErrorReporter} interface. */
 public abstract class ErrorReporterBase implements ErrorReporter {
 
   private boolean errorsOccurred = false;
 
-  protected ErrorReporterBase() {
-  }
+  protected ErrorReporterBase() {}
 
   @Override
   public boolean getErrorsOccurred() {
@@ -52,24 +47,16 @@ public Stage2 nowhere() {
     return wrap(this::reportWithoutPosition);
   }
 
-
   // These methods are the terminal ones that are called when a call to
   // Stage2#report is issued by a caller.
 
+  /** Implementation of the reporting methods that use a path and range as position. */
+  protected abstract void report(
+      Path path, Range range, DiagnosticSeverity severity, String message);
 
-  /**
-   * Implementation of the reporting methods that use a path and range as position.
-   */
-  protected abstract void report(Path path, Range range, DiagnosticSeverity severity, String message);
-
-  /**
-   * Implementation of the reporting methods that use a node as position.
-   */
+  /** Implementation of the reporting methods that use a node as position. */
   protected abstract void reportOnNode(EObject node, DiagnosticSeverity severity, String message);
 
-  /**
-   * Implementation of the reporting methods for {@link #nowhere()}.
-   */
+  /** Implementation of the reporting methods for {@link #nowhere()}. */
   protected abstract void reportWithoutPosition(DiagnosticSeverity severity, String message);
-
 }
diff --git a/core/src/main/java/org/lflang/ModelInfo.java b/core/src/main/java/org/lflang/ModelInfo.java
index 6bacd33a0e..5898e1691a 100644
--- a/core/src/main/java/org/lflang/ModelInfo.java
+++ b/core/src/main/java/org/lflang/ModelInfo.java
@@ -35,7 +35,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.NamedInstance;
 import org.lflang.generator.ReactorInstance;
@@ -146,7 +145,9 @@ public void checkCaseInsensitiveNameCollisions(Model model, ErrorReporter report
           .filter(it -> getName(it).toLowerCase().equals(badName))
           .forEach(
               it ->
-                  reporter.at(it).error("Multiple reactors have the same name up to case differences."));
+                  reporter
+                      .at(it)
+                      .error("Multiple reactors have the same name up to case differences."));
     }
   }
 
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 00aefd43b2..8fd948d2d5 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -35,8 +35,6 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.util.RuntimeIOException;
 import org.lflang.TargetConfig.DockerOptions;
 import org.lflang.TargetConfig.PlatformOptions;
@@ -474,8 +472,8 @@ public enum TargetProperty {
                   String s =
                       "Unidentified Platform Type, LF supports the following platform types: "
                           + Arrays.asList(Platform.values()).toString();
-                    err.nowhere().error(s);
-                    throw new AssertionError(s);
+                  err.at(entry).error(s);
+                  throw new AssertionError(s);
                 }
                 config.platformOptions.platform = p;
                 break;
@@ -720,8 +718,8 @@ else if (paths.size() == 1) {
         try {
           referencePath = FileUtil.toPath(value.eResource().getURI()).toAbsolutePath();
         } catch (IOException e) {
-            err.at(value).error("Invalid path? " + e.getMessage());
-            throw new RuntimeIOException(e);
+          err.at(value).error("Invalid path? " + e.getMessage());
+          throw new RuntimeIOException(e);
         }
 
         // we'll resolve relative paths to check that the files
@@ -953,7 +951,7 @@ public static void set(TargetConfig config, List<KeyValuePair> properties, Error
             try {
               p.setter.parseIntoTargetConfig(config, property.getValue(), err);
             } catch (InvalidLfSourceException e) {
-                err.at(e.getNode()).error(e.getProblem());
+              err.at(e.getNode()).error(e.getProblem());
             }
           }
         });
diff --git a/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java b/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
index c2488dbac2..b6294901de 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
@@ -25,11 +25,8 @@
 package org.lflang.diagram.synthesis.util;
 
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
-import org.lflang.ErrorReporter;
 import org.lflang.ErrorReporterBase;
 import org.lflang.generator.Range;
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 639da88033..8f75dd2f44 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -33,7 +33,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.Target;
@@ -789,20 +788,21 @@ private String generateCodeForPhysicalActions(
       if (minDelay != TimeValue.MAX_VALUE) {
         // Unless silenced, issue a warning.
         if (federate.targetConfig.coordinationOptions.advance_message_interval == null) {
-          String message = String.join(
-              "\n",
-              "Found a path from a physical action to output for reactor "
-                  + addDoubleQuotes(instance.getName())
-                  + ". ",
-              "The amount of delay is " + minDelay + ".",
-              "With centralized coordination, this can result in a large number of messages to"
-                  + " the RTI.",
-              "Consider refactoring the code so that the output does not depend on the physical"
-                  + " action,",
-              "or consider using decentralized coordination. To silence this warning, set the"
-                  + " target",
-              "parameter coordination-options with a value like {advance-message-interval: 10"
-                  + " msec}");
+          String message =
+              String.join(
+                  "\n",
+                  "Found a path from a physical action to output for reactor "
+                      + addDoubleQuotes(instance.getName())
+                      + ". ",
+                  "The amount of delay is " + minDelay + ".",
+                  "With centralized coordination, this can result in a large number of messages to"
+                      + " the RTI.",
+                  "Consider refactoring the code so that the output does not depend on the physical"
+                      + " action,",
+                  "or consider using decentralized coordination. To silence this warning, set the"
+                      + " target",
+                  "parameter coordination-options with a value like {advance-message-interval: 10"
+                      + " msec}");
           errorReporter.at(outputFound).warning(message);
         }
         code.pr(
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index ea6895022c..665a322407 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -6,7 +6,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetProperty.CoordinationType;
@@ -175,21 +174,22 @@ private TimeValue getMinOutputDelay(
       if (minOutputDelay != TimeValue.MAX_VALUE) {
         // Unless silenced, issue a warning.
         if (federate.targetConfig.coordinationOptions.advance_message_interval == null) {
-            String message = String.join(
-                "\n",
-                "Found a path from a physical action to output for reactor "
-                    + addDoubleQuotes(instance.getName())
-                    + ". ",
-                "The amount of delay is " + minOutputDelay + ".",
-                "With centralized coordination, this can result in a large number of messages to"
-                    + " the RTI.",
-                "Consider refactoring the code so that the output does not depend on the physical"
-                    + " action,",
-                "or consider using decentralized coordination. To silence this warning, set the"
-                    + " target",
-                "parameter coordination-options with a value like {advance-message-interval: 10"
-                    + " msec}");
-            errorReporter.at(outputFound).warning(message);
+          String message =
+              String.join(
+                  "\n",
+                  "Found a path from a physical action to output for reactor "
+                      + addDoubleQuotes(instance.getName())
+                      + ". ",
+                  "The amount of delay is " + minOutputDelay + ".",
+                  "With centralized coordination, this can result in a large number of messages to"
+                      + " the RTI.",
+                  "Consider refactoring the code so that the output does not depend on the physical"
+                      + " action,",
+                  "or consider using decentralized coordination. To silence this warning, set the"
+                      + " target",
+                  "parameter coordination-options with a value like {advance-message-interval: 10"
+                      + " msec}");
+          errorReporter.at(outputFound).warning(message);
         }
         return minOutputDelay;
       }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 29b49a50ce..f87cb8705a 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -21,7 +21,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
 import org.eclipse.xtext.resource.XtextResource;
@@ -166,7 +165,8 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
               subContexts.forEach(
                   c -> {
                     if (c.getErrorReporter().getErrorsOccurred()) {
-                      context.getErrorReporter()
+                      context
+                          .getErrorReporter()
                           .at(c.getFileConfig().srcFile)
                           .error("Failure during code generation of " + c.getFileConfig().srcFile);
                     }
@@ -233,11 +233,14 @@ private boolean federatedExecutionIsSupported(Resource resource) {
     var targetOK =
         List.of(Target.C, Target.Python, Target.TS, Target.CPP, Target.CCPP).contains(target);
     if (!targetOK) {
-      errorReporter.at(targetDecl).error(
-          "Federated execution is not supported with target " + target + ".");
+      errorReporter
+          .at(targetDecl)
+          .error("Federated execution is not supported with target " + target + ".");
     }
     if (target.equals(Target.C) && GeneratorUtils.isHostWindows()) {
-      errorReporter.at(targetDecl).error("Federated LF programs with a C target are currently not supported on Windows.");
+      errorReporter
+          .at(targetDecl)
+          .error("Federated LF programs with a C target are currently not supported on Windows.");
       targetOK = false;
     }
 
@@ -332,8 +335,10 @@ public TargetConfig getTargetConfig() {
     try {
       compileThreadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
     } catch (Exception e) {
-      context.getErrorReporter().nowhere().error(
-          "Failure during code generation: " + e.getMessage());
+      context
+          .getErrorReporter()
+          .nowhere()
+          .error("Failure during code generation: " + e.getMessage());
       e.printStackTrace();
     } finally {
       finalizer.accept(subContexts);
@@ -509,8 +514,7 @@ private void replaceConnectionFromOutputPort(PortInstance output) {
     for (SendRange srcRange : output.getDependentPorts()) {
       if (srcRange.connection == null) {
         // This should not happen.
-        errorReporter.at(output.getDefinition())
-            .error("Cannot find output connection for port");
+        errorReporter.at(output.getDefinition()).error("Cannot find output connection for port");
         continue;
       }
       // Iterate through destinations
diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index 9d132d412a..b3aceeafe0 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -24,8 +24,9 @@ String generateMainReactor(
       FederateInstance federate, Reactor originalMainReactor, ErrorReporter errorReporter) {
     // FIXME: Handle modes at the top-level
     if (!ASTUtils.allModes(originalMainReactor).isEmpty()) {
-        errorReporter.at(ASTUtils.allModes(originalMainReactor).stream().findFirst().get())
-            .error("Modes at the top level are not supported under federated execution.");
+      errorReporter
+          .at(ASTUtils.allModes(originalMainReactor).stream().findFirst().get())
+          .error("Modes at the top level are not supported under federated execution.");
     }
     var renderer = FormattingUtils.renderer(federate.targetConfig.target);
 
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index 3a0ba7d488..5fbcf93b78 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -510,8 +510,9 @@ private boolean containsAllVarRefs(Iterable<VarRef> varRefs) {
         referencesFederate = true;
       } else {
         if (referencesFederate) {
-            errorReporter.at(varRef)
-                .error("Mixed triggers and effects from different federates. This is not permitted");
+          errorReporter
+              .at(varRef)
+              .error("Mixed triggers and effects from different federates. This is not permitted");
         }
         inFederate = false;
       }
diff --git a/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java b/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java
index 8b00c1ae08..0fde6e0461 100644
--- a/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java
+++ b/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java
@@ -3,9 +3,7 @@
 import java.nio.file.Path;
 import java.util.Map;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.lflang.ErrorReporter;
-import org.lflang.ErrorReporterBase;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.Position;
 import org.lflang.generator.Range;
@@ -20,7 +18,6 @@ public LineAdjustingErrorReporter(ErrorReporter parent, Map<Path, CodeMap> codeM
     this.codeMapMap = codeMapMap;
   }
 
-
   @Override
   public Stage2 at(EObject object) {
     return parent.at(object);
@@ -45,18 +42,18 @@ public Stage2 at(Path file, Range range) {
       var relevantMap = codeMapMap.get(file);
       for (Path lfSource : relevantMap.lfSourcePaths()) {
         var adjustedRange = relevantMap.adjusted(lfSource, range);
-        adjustedRange = new Range(
-            adjustedRange.getStartInclusive().equals(Position.ORIGIN)
-                ? Position.fromZeroBased(adjustedRange.getEndExclusive().getZeroBasedLine(), 0)
-                : adjustedRange.getStartInclusive(),
-            adjustedRange.getEndExclusive());
+        adjustedRange =
+            new Range(
+                adjustedRange.getStartInclusive().equals(Position.ORIGIN)
+                    ? Position.fromZeroBased(adjustedRange.getEndExclusive().getZeroBasedLine(), 0)
+                    : adjustedRange.getStartInclusive(),
+                adjustedRange.getEndExclusive());
         return parent.at(lfSource, adjustedRange);
       }
     }
     return nowhere();
   }
 
-
   @Override
   public boolean getErrorsOccurred() {
     return parent.getErrorsOccurred();
diff --git a/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java b/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java
index e371499fbd..7cf7bb0610 100644
--- a/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java
+++ b/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java
@@ -5,7 +5,6 @@
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.lflang.ErrorReporter;
 import org.lflang.ErrorReporterBase;
-import org.lflang.generator.Position;
 import org.lflang.generator.Range;
 
 public class SynchronizedErrorReporter extends ErrorReporterBase {
@@ -17,12 +16,14 @@ public SynchronizedErrorReporter(ErrorReporter parent) {
   }
 
   @Override
-  protected synchronized void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+  protected synchronized void reportOnNode(
+      EObject node, DiagnosticSeverity severity, String message) {
     parent.at(node).report(severity, message);
   }
 
   @Override
-  protected synchronized void report(Path path, Range range, DiagnosticSeverity severity, String message) {
+  protected synchronized void report(
+      Path path, Range range, DiagnosticSeverity severity, String message) {
     parent.at(path, range).report(severity, message);
   }
 
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
index ae0449f9e7..2e29aacdb4 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
@@ -47,12 +47,17 @@ public class FedROS2CPPSerialization implements FedSerialization {
   @Override
   public boolean isCompatible(GeneratorBase generator) {
     if (generator.getTarget() != Target.C) {
-        generator.errorReporter.nowhere().error("ROS serialization is currently only supported for the C target.");
-        return false;
+      generator
+          .errorReporter
+          .nowhere()
+          .error("ROS serialization is currently only supported for the C target.");
+      return false;
     } else if (!generator.getTargetConfig().compiler.equalsIgnoreCase("g++")) {
-        generator.errorReporter.nowhere().error(
-            "Please use the 'compiler: \"g++\"' target property \n" + "for ROS serialization");
-        return false;
+      generator
+          .errorReporter
+          .nowhere()
+          .error("Please use the 'compiler: \"g++\"' target property \n" + "for ROS serialization");
+      return false;
     }
     return true;
   }
diff --git a/core/src/main/java/org/lflang/federated/validation/FedValidator.java b/core/src/main/java/org/lflang/federated/validation/FedValidator.java
index 40c9d4bdcb..31e96c80f3 100644
--- a/core/src/main/java/org/lflang/federated/validation/FedValidator.java
+++ b/core/src/main/java/org/lflang/federated/validation/FedValidator.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
-
 import org.lflang.ErrorReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Input;
@@ -58,8 +57,10 @@ private static void containsAllVarRefs(List<VarRef> varRefs, ErrorReporter error
         instantiation = varRef.getContainer();
         referencesFederate = true;
       } else if (!varRef.getContainer().equals(instantiation)) {
-          errorReporter.at(varRef).error(
-              "Mixed triggers and effects from" + " different federates. This is not permitted");
+        errorReporter
+            .at(varRef)
+            .error(
+                "Mixed triggers and effects from" + " different federates. This is not permitted");
       }
     }
   }
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 2edb4c09a7..32fe62337b 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -42,9 +42,7 @@
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-
 import org.lflang.ErrorReporter;
-import org.lflang.ErrorReporter.Stage2;
 import org.lflang.FileConfig;
 import org.lflang.MainConflictChecker;
 import org.lflang.Target;
@@ -428,8 +426,11 @@ public int getReactionBankIndex(Reaction reaction) {
    */
   protected void checkModalReactorSupport(boolean isSupported) {
     if (hasModalReactors && !isSupported) {
-      errorReporter.nowhere().error("The currently selected code generation or "
-                + "target configuration does not support modal reactors!");
+      errorReporter
+          .nowhere()
+          .error(
+              "The currently selected code generation or "
+                  + "target configuration does not support modal reactors!");
     }
   }
 
@@ -441,7 +442,9 @@ protected void checkModalReactorSupport(boolean isSupported) {
    */
   protected void checkWatchdogSupport(boolean isSupported) {
     if (hasWatchdogs && !isSupported) {
-      errorReporter.nowhere().error("Watchdogs are currently only supported for threaded programs in the C target.");
+      errorReporter
+          .nowhere()
+          .error("Watchdogs are currently only supported for threaded programs in the C target.");
     }
   }
 
@@ -461,9 +464,11 @@ private void transformConflictingConnectionsInModalReactors() {
               || connection.isIterated()
               || connection.getLeftPorts().size() > 1
               || connection.getRightPorts().size() > 1) {
-            errorReporter.at(connection).error(
-                "Cannot transform connection in modal reactor. Connection uses currently not"
-                            + " supported features.");
+            errorReporter
+                .at(connection)
+                .error(
+                    "Cannot transform connection in modal reactor. Connection uses currently not"
+                        + " supported features.");
           } else {
             var reaction = factory.createReaction();
             ((Mode) connection.eContainer()).getReactions().add(reaction);
@@ -498,9 +503,12 @@ private void transformConflictingConnectionsInModalReactors() {
    * reactors.
    */
   protected String getConflictingConnectionsInModalReactorsBody(String source, String dest) {
-    errorReporter.nowhere().error("The currently selected code generation "
-            + "is missing an implementation for conflicting "
-            + "transforming connections in modal reactors.");
+    errorReporter
+        .nowhere()
+        .error(
+            "The currently selected code generation "
+                + "is missing an implementation for conflicting "
+                + "transforming connections in modal reactors.");
     return "MODAL MODELS NOT SUPPORTED";
   }
 
@@ -637,11 +645,9 @@ public void reportCommandErrors(String stderr) {
   }
 
   private void reportIssue(StringBuilder message, Integer lineNumber, Path path, int severity) {
-    DiagnosticSeverity convertedSeverity = severity == IMarker.SEVERITY_ERROR
-        ? DiagnosticSeverity.Error
-        : DiagnosticSeverity.Warning;
-    errorReporter.atNullableLine(path, lineNumber)
-        .report(convertedSeverity, message.toString());
+    DiagnosticSeverity convertedSeverity =
+        severity == IMarker.SEVERITY_ERROR ? DiagnosticSeverity.Error : DiagnosticSeverity.Warning;
+    errorReporter.atNullableLine(path, lineNumber).report(convertedSeverity, message.toString());
   }
 
   // //////////////////////////////////////////////////
diff --git a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
index a53c9b90b1..31cf87ce41 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
@@ -32,9 +32,7 @@
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Objects;
-
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.util.LFCommand;
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index d16c9c3270..db2e36041e 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -61,9 +61,10 @@ public static void accommodatePhysicalActionsIfPresent(
             && !targetConfig.keepalive) {
           // If not, set it to true
           targetConfig.keepalive = true;
-          String message = String.format(
-              "Setting %s to true because of the physical action %s.",
-              TargetProperty.KEEPALIVE.getDisplayName(), action.getName());
+          String message =
+              String.format(
+                  "Setting %s to true because of the physical action %s.",
+                  TargetProperty.KEEPALIVE.getDisplayName(), action.getName());
           errorReporter.at(action).warning(message);
           return;
         }
@@ -174,9 +175,11 @@ public static boolean canGenerate(
     }
     // abort if there is no main reactor
     if (mainDef == null) {
-      errorReporter.nowhere().info(
-          "The given Lingua Franca program does not define a main reactor. Therefore, no code"
-                + " was generated.");
+      errorReporter
+          .nowhere()
+          .info(
+              "The given Lingua Franca program does not define a main reactor. Therefore, no code"
+                  + " was generated.");
       context.finish(GeneratorResult.NOTHING);
       return false;
     }
diff --git a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
index 488b6620dc..ca2b75bded 100644
--- a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
+++ b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
@@ -6,9 +6,7 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.eclipse.lsp4j.DiagnosticSeverity;
-
 import org.lflang.ErrorReporter;
 
 /**
@@ -99,9 +97,9 @@ private void reportErrorLine(
       final Position generatedFilePosition =
           Position.fromOneBased(
               Integer.parseInt(matcher.group("line")),
-              column == null ? 1 // FIXME: Unreliable heuristic
-                  : Integer.parseInt(column)
-          );
+              column == null
+                  ? 1 // FIXME: Unreliable heuristic
+                  : Integer.parseInt(column));
       final String message =
           DiagnosticReporting.messageOf(matcher.group("message"), path, generatedFilePosition);
       final CodeMap map = maps.get(relativeTo != null ? relativeTo.resolve(path) : path);
@@ -132,9 +130,10 @@ private Range findAppropriateRange(Position lfFilePosition, Iterator<String> it)
       String line = it.next();
       Matcher labelMatcher = labelPattern.matcher(line);
       if (labelMatcher.find()) {
-        Position start = Position.fromZeroBased(
-            lfFilePosition.getZeroBasedLine(),
-            lfFilePosition.getZeroBasedColumn() - labelMatcher.group(1).length());
+        Position start =
+            Position.fromZeroBased(
+                lfFilePosition.getZeroBasedLine(),
+                lfFilePosition.getZeroBasedColumn() - labelMatcher.group(1).length());
         Position end = lfFilePosition.plus(labelMatcher.group(2));
         return new Range(start, end);
       } else if (diagnosticMessagePattern.matcher(line).find()) {
diff --git a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
index e243b30de3..717f4f7c3c 100644
--- a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
+++ b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
@@ -17,9 +17,7 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.eclipse.xtext.validation.Issue;
-
 import org.lflang.ErrorReporter;
-import org.lflang.ErrorReporter.Stage2;
 import org.lflang.FileConfig;
 import org.lflang.generator.LFGeneratorContext.Mode;
 
@@ -87,9 +85,9 @@ public GeneratorResult run(
   private void validate(URI uri, ErrorReporter errorReporter) {
     for (Issue issue :
         validator.validate(getResource(uri), CheckMode.ALL, CancelIndicator.NullImpl)) {
-      errorReporter.atNullableLine(Path.of(uri.path()), issue.getLineNumber())
-              .report(convertSeverity(issue.getSeverity()),
-                  issue.getMessage());
+      errorReporter
+          .atNullableLine(Path.of(uri.path()), issue.getLineNumber())
+          .report(convertSeverity(issue.getSeverity()), issue.getMessage());
     }
   }
 
diff --git a/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java b/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
index 3fe1a2907e..d71f943a16 100644
--- a/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
+++ b/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
@@ -6,8 +6,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.OptionalInt;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.Diagnostic;
@@ -16,7 +14,6 @@
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
-import org.lflang.ErrorReporter;
 import org.lflang.ErrorReporterBase;
 
 /**
@@ -37,7 +34,6 @@ public class LanguageServerErrorReporter extends ErrorReporterBase {
   /** The list of all diagnostics since the last reset. */
   private final Map<Path, List<Diagnostic>> diagnostics;
 
-
   /**
    * Initialize a {@code DiagnosticAcceptor} for the document whose parse tree root node is {@code
    * parseRoot}.
@@ -56,29 +52,38 @@ protected void reportOnNode(EObject node, DiagnosticSeverity severity, String me
 
   @Override
   protected void reportWithoutPosition(DiagnosticSeverity severity, String message) {
-    report(getMainFile(), org.lflang.generator.Range.degenerateRange(Position.ORIGIN), severity, message);
+    report(
+        getMainFile(),
+        org.lflang.generator.Range.degenerateRange(Position.ORIGIN),
+        severity,
+        message);
   }
 
   @Override
   public Stage2 at(Path file, int line) {
     // Create a range for the whole line
     Optional<String> text = getLine(line - 1);
-    org.lflang.generator.Range range = new org.lflang.generator.Range(
-        Position.fromOneBased(line, 1),
-        Position.fromOneBased(line, 1 + text.map(String::length).orElse(0))
-    );
+    org.lflang.generator.Range range =
+        new org.lflang.generator.Range(
+            Position.fromOneBased(line, 1),
+            Position.fromOneBased(line, 1 + text.map(String::length).orElse(0)));
     return at(file, range);
   }
 
   @Override
-  protected void report(Path path, org.lflang.generator.Range range, DiagnosticSeverity severity, String message) {
+  protected void report(
+      Path path, org.lflang.generator.Range range, DiagnosticSeverity severity, String message) {
     if (path == null) {
       path = getMainFile();
     }
-    diagnostics.computeIfAbsent(path, p -> new ArrayList<>())
-        .add(new Diagnostic(toRange(range.getStartInclusive(), range.getEndExclusive()),
-            message, severity, "LF Language Server"));
-
+    diagnostics
+        .computeIfAbsent(path, p -> new ArrayList<>())
+        .add(
+            new Diagnostic(
+                toRange(range.getStartInclusive(), range.getEndExclusive()),
+                message,
+                severity,
+                "LF Language Server"));
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/generator/PortInstance.java b/core/src/main/java/org/lflang/generator/PortInstance.java
index 7d88cdd28d..9db13babf1 100644
--- a/core/src/main/java/org/lflang/generator/PortInstance.java
+++ b/core/src/main/java/org/lflang/generator/PortInstance.java
@@ -29,7 +29,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.PriorityQueue;
-
 import org.lflang.ErrorReporter;
 import org.lflang.lf.Input;
 import org.lflang.lf.Output;
@@ -397,8 +396,8 @@ private void setInitialWidth(ErrorReporter errorReporter) {
 
     if (widthSpec != null) {
       if (widthSpec.isOfVariableLength()) {
-          String message = "Variable-width multiports not supported (yet): " + definition.getName();
-          errorReporter.at(definition).error(message);
+        String message = "Variable-width multiports not supported (yet): " + definition.getName();
+        errorReporter.at(definition).error(message);
       } else {
         isMultiport = true;
 
diff --git a/core/src/main/java/org/lflang/generator/ReactorInstance.java b/core/src/main/java/org/lflang/generator/ReactorInstance.java
index 8599b43ad9..74fa05c8ba 100644
--- a/core/src/main/java/org/lflang/generator/ReactorInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactorInstance.java
@@ -35,7 +35,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-
 import org.lflang.AttributeUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.TimeValue;
@@ -830,14 +829,14 @@ public ReactorInstance(
 
     this.recursive = foundSelfAsParent;
     if (recursive) {
-        reporter.at(definition).error("Recursive reactor instantiation.");
+      reporter.at(definition).error("Recursive reactor instantiation.");
     }
 
     // If the reactor definition is null, give up here. Otherwise, diagram generation
     // will fail an NPE.
     if (reactorDefinition == null) {
-        reporter.at(definition).error("Reactor instantiation has no matching reactor definition.");
-        return;
+      reporter.at(definition).error("Reactor instantiation has no matching reactor definition.");
+      return;
     }
 
     setInitialWidth();
@@ -935,12 +934,12 @@ private void establishPortConnections() {
       // Check for empty lists.
       if (!srcRanges.hasNext()) {
         if (dstRanges.hasNext()) {
-            reporter.at(connection).warning("No sources to provide inputs.");
+          reporter.at(connection).warning("No sources to provide inputs.");
         }
         return;
       } else if (!dstRanges.hasNext()) {
-          reporter.at(connection).warning("No destination. Outputs will be lost.");
-          return;
+        reporter.at(connection).warning("No destination. Outputs will be lost.");
+        return;
       }
 
       RuntimeRange<PortInstance> src = srcRanges.next();
@@ -952,7 +951,9 @@ private void establishPortConnections() {
           if (!dstRanges.hasNext()) {
             if (srcRanges.hasNext()) {
               // Should not happen (checked by the validator).
-                reporter.at(connection).warning("Source is wider than the destination. Outputs will be lost.");
+              reporter
+                  .at(connection)
+                  .warning("Source is wider than the destination. Outputs will be lost.");
             }
             break;
           }
@@ -962,7 +963,9 @@ private void establishPortConnections() {
             } else {
               if (dstRanges.hasNext()) {
                 // Should not happen (checked by the validator).
-                  reporter.at(connection).warning("Destination is wider than the source. Inputs will be missing.");
+                reporter
+                    .at(connection)
+                    .warning("Destination is wider than the source. Inputs will be missing.");
               }
               break;
             }
@@ -975,8 +978,10 @@ private void establishPortConnections() {
           src = src.tail(dst.width);
           if (!dstRanges.hasNext()) {
             // Should not happen (checked by the validator).
-              reporter.at(connection).warning("Source is wider than the destination. Outputs will be lost.");
-              break;
+            reporter
+                .at(connection)
+                .warning("Source is wider than the destination. Outputs will be lost.");
+            break;
           }
           dst = dstRanges.next();
         } else if (src.width < dst.width) {
@@ -987,8 +992,10 @@ private void establishPortConnections() {
             if (connection.isIterated()) {
               srcRanges = leftPorts.iterator();
             } else {
-                reporter.at(connection).warning("Destination is wider than the source. Inputs will be missing.");
-                break;
+              reporter
+                  .at(connection)
+                  .warning("Destination is wider than the source. Inputs will be missing.");
+              break;
             }
           }
           src = srcRanges.next();
@@ -1050,8 +1057,8 @@ private List<RuntimeRange<PortInstance>> listPortInstances(
     for (VarRef portRef : references) {
       // Simple error checking first.
       if (!(portRef.getVariable() instanceof Port)) {
-          reporter.at(portRef).error("Not a port.");
-          return result;
+        reporter.at(portRef).error("Not a port.");
+        return result;
       }
       // First, figure out which reactor we are dealing with.
       // The reactor we want is the container of the port.
diff --git a/core/src/main/java/org/lflang/generator/Validator.java b/core/src/main/java/org/lflang/generator/Validator.java
index 51d2e8412e..53efd6412e 100644
--- a/core/src/main/java/org/lflang/generator/Validator.java
+++ b/core/src/main/java/org/lflang/generator/Validator.java
@@ -141,12 +141,8 @@ private static <T> List<Future<T>> getFutures(List<Callable<T>> tasks)
    */
   public final int run(LFCommand command, CancelIndicator cancelIndicator) {
     final int returnCode = command.run(cancelIndicator);
-    getBuildReportingStrategies()
-        .first
-        .report(command.getErrors(), errorReporter, codeMaps);
-    getBuildReportingStrategies()
-        .second
-        .report(command.getOutput(), errorReporter, codeMaps);
+    getBuildReportingStrategies().first.report(command.getErrors(), errorReporter, codeMaps);
+    getBuildReportingStrategies().second.report(command.getOutput(), errorReporter, codeMaps);
     return returnCode;
   }
 
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 061ba50d38..3ddc2a856c 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -312,10 +312,12 @@ CodeBuilder generateCMakeCode(
             break;
           }
         default:
-            errorReporter.nowhere().warning(
-                "Using the flags target property with cmake is dangerous.\n"
-                          + " Use cmake-include instead.");
-            cMakeCode.pr("add_compile_options( " + compilerFlag + " )");
+          errorReporter
+              .nowhere()
+              .warning(
+                  "Using the flags target property with cmake is dangerous.\n"
+                      + " Use cmake-include instead.");
+          cMakeCode.pr("add_compile_options( " + compilerFlag + " )");
           cMakeCode.pr("add_link_options( " + compilerFlag + ")");
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index 858098d9ac..c70311978c 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -134,8 +134,9 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
     if (cMakeReturnCode != 0
         && context.getMode() == LFGeneratorContext.Mode.STANDALONE
         && !outputContainsKnownCMakeErrors(compile.getErrors())) {
-        errorReporter.nowhere()
-            .error(targetConfig.compiler + " failed with error code " + cMakeReturnCode);
+      errorReporter
+          .nowhere()
+          .error(targetConfig.compiler + " failed with error code " + cMakeReturnCode);
     }
 
     // For warnings (vs. errors), the return code is 0.
@@ -156,8 +157,9 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
       if (makeReturnCode != 0
           && context.getMode() == LFGeneratorContext.Mode.STANDALONE
           && !outputContainsKnownCMakeErrors(build.getErrors())) {
-          errorReporter.nowhere()
-              .error(targetConfig.compiler + " failed with error code " + makeReturnCode);
+        errorReporter
+            .nowhere()
+            .error(targetConfig.compiler + " failed with error code " + makeReturnCode);
       }
 
       // For warnings (vs. errors), the return code is 0.
@@ -181,7 +183,7 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
         LFCommand flash = buildWestFlashCommand();
         int flashRet = flash.run();
         if (flashRet != 0) {
-            errorReporter.nowhere().error("West flash command failed with error code " + flashRet);
+          errorReporter.nowhere().error("West flash command failed with error code " + flashRet);
         } else {
           System.out.println("SUCCESS: Flashed application with west");
         }
@@ -201,10 +203,13 @@ public LFCommand compileCmakeCommand() {
     LFCommand command =
         commandFactory.createCommand("cmake", cmakeOptions(targetConfig, fileConfig), buildPath);
     if (command == null) {
-        errorReporter.nowhere().error("The C/CCpp target requires CMAKE >= "
+      errorReporter
+          .nowhere()
+          .error(
+              "The C/CCpp target requires CMAKE >= "
                   + CCmakeGenerator.MIN_CMAKE_VERSION
-                  + " to compile the generated code. "
-                  + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
+                  + " to compile the generated code. Auto-compiling can be disabled using the"
+                  + " \"no-compile: true\" target property.");
     }
     return command;
   }
@@ -291,9 +296,12 @@ public LFCommand buildCmakeCommand() {
                 buildTypeToCmakeConfig(targetConfig.cmakeBuildType)),
             buildPath);
     if (command == null) {
-        errorReporter.nowhere().error(
-            "The C/CCpp target requires CMAKE >= 3.5 to compile the generated code. "
-                  + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
+      errorReporter
+          .nowhere()
+          .error(
+              "The C/CCpp target requires CMAKE >= 3.5 to compile the generated code."
+                  + " Auto-compiling can be disabled using the \"no-compile: true\" target"
+                  + " property.");
     }
     return command;
   }
@@ -314,7 +322,7 @@ public LFCommand buildWestFlashCommand() {
       cmd = commandFactory.createCommand("west", List.of("flash"), buildPath);
     }
     if (cmd == null) {
-        errorReporter.nowhere().error("Could not create west flash command.");
+      errorReporter.nowhere().error("Could not create west flash command.");
     }
 
     return cmd;
@@ -340,13 +348,18 @@ private boolean outputContainsKnownCMakeErrors(String CMakeOutput) {
     if (CMakeOutput.contains("The CMAKE_C_COMPILER is set to a C++ compiler")) {
       // If so, print an appropriate error message
       if (targetConfig.compiler != null) {
-          errorReporter.nowhere().error(
-              "A C++ compiler was requested in the compiler target property."
-                      + " Use the CCpp or the Cpp target instead.");
+        errorReporter
+            .nowhere()
+            .error(
+                "A C++ compiler was requested in the compiler target property."
+                    + " Use the CCpp or the Cpp target instead.");
       } else {
-          errorReporter.nowhere().error("\"A C++ compiler was detected."
-                      + " The C target works best with a C compiler."
-                      + " Use the CCpp or the Cpp target instead.\"");
+        errorReporter
+            .nowhere()
+            .error(
+                "\"A C++ compiler was detected."
+                    + " The C target works best with a C compiler."
+                    + " Use the CCpp or the Cpp target instead.\"");
       }
       return true;
     }
@@ -414,9 +427,11 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
     LFCommand command =
         commandFactory.createCommand(targetConfig.compiler, compileArgs, fileConfig.getOutPath());
     if (command == null) {
-        errorReporter.nowhere().error(
-            "The C/CCpp target requires GCC >= 7 to compile the generated code. "
-                  + "Auto-compiling can be disabled using the \"no-compile: true\" target property.");
+      errorReporter
+          .nowhere()
+          .error(
+              "The C/CCpp target requires GCC >= 7 to compile the generated code. Auto-compiling"
+                  + " can be disabled using the \"no-compile: true\" target property.");
     }
     return command;
   }
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 5c4993b8aa..0bc8ee0202 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -45,12 +45,10 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
-
 import org.lflang.FileConfig;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
@@ -357,12 +355,12 @@ public void accommodatePhysicalActionsIfPresent() {
           if (!targetConfig.threading
               && !targetConfig.setByUser.contains(TargetProperty.THREADING)) {
             targetConfig.threading = true;
-              String message =
-                  "Using the threaded C runtime to allow for asynchronous handling of physical action"
-                      + " "
-                      + action.getName();
-              errorReporter.at(action).warning(message);
-              return;
+            String message =
+                "Using the threaded C runtime to allow for asynchronous handling of physical action"
+                    + " "
+                    + action.getName();
+            errorReporter.at(action).warning(message);
+            return;
           }
         }
       }
@@ -376,8 +374,10 @@ public void accommodatePhysicalActionsIfPresent() {
   protected boolean isOSCompatible() {
     if (GeneratorUtils.isHostWindows()) {
       if (CCppMode) {
-        errorReporter.nowhere().error(
-            "LF programs with a CCpp target are currently not supported on Windows. "
+        errorReporter
+            .nowhere()
+            .error(
+                "LF programs with a CCpp target are currently not supported on Windows. "
                     + "Exiting code generation.");
         return false;
       }
@@ -831,8 +831,9 @@ protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
             fileConfig.srcFile.getParent().resolve(targetConfig.fedSetupPreamble),
             destination.resolve(targetConfig.fedSetupPreamble));
       } catch (IOException e) {
-        errorReporter.nowhere().error(
-            "Failed to find _fed_setup file " + targetConfig.fedSetupPreamble);
+        errorReporter
+            .nowhere()
+            .error("Failed to find _fed_setup file " + targetConfig.fedSetupPreamble);
       }
     }
   }
@@ -1983,9 +1984,11 @@ protected void setUpGeneralParameters() {
           PlatformOption.USER_THREADS.name(),
           String.valueOf(targetConfig.platformOptions.userThreads));
     } else if (targetConfig.platformOptions.userThreads > 0) {
-        errorReporter.nowhere().warning(
-            "Specifying user threads is only for threaded Lingua Franca on the Zephyr platform. This"
-                  + " option will be ignored.");
+      errorReporter
+          .nowhere()
+          .warning(
+              "Specifying user threads is only for threaded Lingua Franca on the Zephyr platform."
+                  + " This option will be ignored.");
     }
 
     if (targetConfig.threading) { // FIXME: This logic is duplicated in CMake
@@ -2103,7 +2106,9 @@ private void createMainReactorInstance() {
             new ReactorInstance(toDefinition(mainDef.getReactorClass()), errorReporter, reactors);
         var reactionInstanceGraph = this.main.assignLevels();
         if (reactionInstanceGraph.nodeCount() > 0) {
-          errorReporter.nowhere().error("Main reactor has causality cycles. Skipping code generation.");
+          errorReporter
+              .nowhere()
+              .error("Main reactor has causality cycles. Skipping code generation.");
           return;
         }
         if (hasDeadlines) {
@@ -2112,7 +2117,7 @@ private void createMainReactorInstance() {
         // Inform the run-time of the breadth/parallelism of the reaction graph
         var breadth = reactionInstanceGraph.getBreadth();
         if (breadth == 0) {
-            errorReporter.nowhere().warning("The program has no reactions");
+          errorReporter.nowhere().warning("The program has no reactions");
         } else {
           targetConfig.compileDefinitions.put(
               "LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth()));
diff --git a/core/src/main/java/org/lflang/generator/c/CPortGenerator.java b/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
index e8a195b98f..33c85d9f6d 100644
--- a/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
@@ -197,9 +197,9 @@ private static String valueDeclaration(
       CTypes types) {
     if (port.getType() == null && target.requiresTypes) {
       // This should have been caught by the validator.
-        String message = "Port is required to have a type: " + port.getName();
-        errorReporter.at(port).error(message);
-        return "";
+      String message = "Port is required to have a type: " + port.getName();
+      errorReporter.at(port).error(message);
+      return "";
     }
     // Do not convert to lf_token_t* using lfTypeToTokenType because there
     // will be a separate field pointing to the token.
diff --git a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
index 5aaa6599e8..a232f735c2 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
@@ -9,7 +9,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig;
@@ -190,8 +189,9 @@ public static String generateInitializationForReaction(
                         : "reset_transition")
                     + ";");
           } else {
-              errorReporter.at(reaction).error(
-                  "In generateReaction(): " + name + " not a valid mode of this reactor.");
+            errorReporter
+                .at(reaction)
+                .error("In generateReaction(): " + name + " not a valid mode of this reactor.");
           }
         } else {
           if (variable instanceof Output) {
@@ -208,7 +208,9 @@ public static String generateInitializationForReaction(
           } else if (variable instanceof Watchdog) {
             reactionInitialization.pr(generateWatchdogVariablesInReaction(effect));
           } else {
-              errorReporter.at(reaction).error("In generateReaction(): effect is not an input, output, or watchdog.");
+            errorReporter
+                .at(reaction)
+                .error("In generateReaction(): effect is not an input, output, or watchdog.");
           }
         }
       }
@@ -767,8 +769,8 @@ public static String generateOutputVariablesInReaction(
     String outputName = output.getName();
     String outputWidth = generateWidthVariable(outputName);
     if (output.getType() == null && requiresTypes) {
-        errorReporter.at(output).error("Output is required to have a type: " + outputName);
-        return "";
+      errorReporter.at(output).error("Output is required to have a type: " + outputName);
+      return "";
     } else {
       // The container of the output may be a contained reactor or
       // the reactor containing the reaction.
diff --git a/core/src/main/java/org/lflang/generator/c/CUtil.java b/core/src/main/java/org/lflang/generator/c/CUtil.java
index 590797a769..25688d3284 100644
--- a/core/src/main/java/org/lflang/generator/c/CUtil.java
+++ b/core/src/main/java/org/lflang/generator/c/CUtil.java
@@ -619,14 +619,17 @@ public static void runBuildCommand(
     for (LFCommand cmd : commands) {
       int returnCode = cmd.run();
       if (returnCode != 0 && mode != LFGeneratorContext.Mode.EPOCH) {
-          // FIXME: Why is the content of stderr not provided to the user in this error
-          // message?
-          errorReporter.nowhere().error(String.format(
-                      // FIXME: Why is the content of stderr not provided to the user in this error
-                      // message?
-                      "Build command \"%s\" failed with error code %d.",
-                      targetConfig.buildCommands, returnCode));
-          return;
+        // FIXME: Why is the content of stderr not provided to the user in this error
+        // message?
+        errorReporter
+            .nowhere()
+            .error(
+                String.format(
+                    // FIXME: Why is the content of stderr not provided to the user in this error
+                    // message?
+                    "Build command \"%s\" failed with error code %d.",
+                    targetConfig.buildCommands, returnCode));
+        return;
       }
       // For warnings (vs. errors), the return code is 0.
       // But we still want to mark the IDE.
diff --git a/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java b/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
index 7379bce5ee..b360693466 100644
--- a/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
@@ -9,7 +9,6 @@
 package org.lflang.generator.c;
 
 import java.util.List;
-
 import org.lflang.ErrorReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
@@ -226,9 +225,12 @@ private static String generateInitializationForWatchdog(
                         : "reset_transition")
                     + ";");
           } else {
-              errorReporter.at(watchdog).error("In generateInitializationForWatchdog(): "
-                              + name
-                              + " not a valid mode of this reactor.");
+            errorReporter
+                .at(watchdog)
+                .error(
+                    "In generateInitializationForWatchdog(): "
+                        + name
+                        + " not a valid mode of this reactor.");
           }
         }
       }
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index 6da6e6a8c5..de2a41918d 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -303,14 +303,14 @@ public void processProtoFile(String filename) {
             fileConfig.srcPath);
 
     if (protoc == null) {
-        errorReporter.nowhere().error("Processing .proto files requires libprotoc >= 3.6.1");
-        return;
+      errorReporter.nowhere().error("Processing .proto files requires libprotoc >= 3.6.1");
+      return;
     }
     int returnCode = protoc.run();
     if (returnCode == 0) {
       pythonRequiredModules.add("google-api-python-client");
     } else {
-        errorReporter.nowhere().error("protoc returns error code " + returnCode);
+      errorReporter.nowhere().error("protoc returns error code " + returnCode);
     }
   }
 
diff --git a/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
index 07c1b498eb..288b53d318 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
@@ -4,7 +4,6 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
-
 import org.lflang.AttributeUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.Target;
@@ -270,10 +269,11 @@ private static String generateCPythonInitializers(
                 PythonPortGenerator.generateVariablesForSendingToContainedReactors(
                     pyObjects, effect.getContainer(), (Input) effect.getVariable()));
           } else {
-              String message = "In generateReaction(): "
-                  + effect.getVariable().getName()
-                  + " is neither an input nor an output.";
-              errorReporter.at(reaction).error(message);
+            String message =
+                "In generateReaction(): "
+                    + effect.getVariable().getName()
+                    + " is neither an input nor an output.";
+            errorReporter.at(reaction).error(message);
           }
         }
       }
diff --git a/core/src/main/java/org/lflang/generator/python/PythonValidator.java b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
index 9b3b80de05..b216210850 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonValidator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
@@ -263,11 +263,14 @@ private void tryReportAlternative(String[] lines, int i) {
                           .filter(p -> main.group().contains(p.getFileName().toString()))
                           .map(codeMaps::get)
                       ::iterator;
-              for (CodeMap map : relevantMaps) { // There should almost always be exactly one of these
+              for (CodeMap map :
+                  relevantMaps) { // There should almost always be exactly one of these
                 for (Path lfFile : map.lfSourcePaths()) {
-                  Position pos = map.adjusted(
-                      lfFile, Position.fromOneBased(line, map.firstNonWhitespace(line)));
-                  errorReporter.at(lfFile, pos)
+                  Position pos =
+                      map.adjusted(
+                          lfFile, Position.fromOneBased(line, map.firstNonWhitespace(line)));
+                  errorReporter
+                      .at(lfFile, pos)
                       .error(main.group().replace("*** ", "").replace("Sorry: ", ""));
                 }
               }
@@ -332,10 +335,12 @@ public Strategy getOutputReportingStrategy() {
               } catch (JsonProcessingException e) {
                 System.err.printf("Failed to parse \"%s\":%n", validationOutput);
                 e.printStackTrace();
-                errorReporter.nowhere().warning(
-                    "Failed to parse linter output. The Lingua Franca code generator is tested with"
-                                    + " Pylint version 2.12.2. Consider updating Pylint if you have an older"
-                                    + " version.");
+                errorReporter
+                    .nowhere()
+                    .warning(
+                        "Failed to parse linter output. The Lingua Franca code generator is tested"
+                            + " with Pylint version 2.12.2. Consider updating Pylint if you have an"
+                            + " older version.");
               }
             };
           }
@@ -370,8 +375,7 @@ private void bestEffortReport(
               DiagnosticSeverity severity,
               String humanMessage) {
             if (!lfEnd.equals(Position.ORIGIN) && !lfStart.equals(Position.ORIGIN)) { // Ideal case
-              errorReporter.at(file, new Range(lfStart, lfEnd))
-                  .report(severity, humanMessage);
+              errorReporter.at(file, new Range(lfStart, lfEnd)).report(severity, humanMessage);
             } else { // Fallback: Try to report on the correct line, or failing that, just line 1.
               if (lfStart.equals(Position.ORIGIN))
                 lfStart =
diff --git a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
index 4dc3593f77..ceeaec7fc9 100644
--- a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
+++ b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
@@ -31,9 +31,7 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.lflang.ErrorReporter;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.TargetPropertyType;
@@ -285,10 +283,10 @@ public void check(Element element, String name, LFValidator v) {
         try {
           parseValue(pair);
         } catch (InvalidLfSourceException e) {
-            ErrorReporter errorReporter = v.getErrorReporter();
-            EObject object = e.getNode();
-            String message = e.getProblem();
-            errorReporter.at(object).error(message);
+          ErrorReporter errorReporter = v.getErrorReporter();
+          EObject object = e.getNode();
+          String message = e.getProblem();
+          errorReporter.at(object).error(message);
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
index db249c442b..fdb83fab6a 100644
--- a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
+++ b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
@@ -64,15 +64,15 @@ public void setCargoDependencies(Map<String, CargoDependencySpec> cargoDependenc
   public void addAndCheckTopLevelModule(Path path, EObject errorOwner, ErrorReporter err) {
     String fileName = path.getFileName().toString();
     if (!Files.exists(path)) {
-        err.at(errorOwner).error("File not found");
+      err.at(errorOwner).error("File not found");
     } else if (Files.isRegularFile(path) && !fileName.endsWith(".rs")) {
-        err.at(errorOwner).error("Not a rust file");
+      err.at(errorOwner).error("Not a rust file");
     } else if (fileName.equals("main.rs")) {
-        err.at(errorOwner).error("Cannot use 'main.rs' as a module name (reserved)");
+      err.at(errorOwner).error("Cannot use 'main.rs' as a module name (reserved)");
     } else if (fileName.equals("reactors") || fileName.equals("reactors.rs")) {
-        err.at(errorOwner).error("Cannot use 'reactors' as a module name (reserved)");
+      err.at(errorOwner).error("Cannot use 'reactors' as a module name (reserved)");
     } else if (Files.isDirectory(path) && !Files.exists(path.resolve("mod.rs"))) {
-        err.at(errorOwner).error("Cannot find module descriptor in directory");
+      err.at(errorOwner).error("Cannot find module descriptor in directory");
     }
     this.rustTopLevelModules.add(path);
   }
diff --git a/core/src/main/java/org/lflang/util/ArduinoUtil.java b/core/src/main/java/org/lflang/util/ArduinoUtil.java
index e749a0568a..460ae2eb86 100644
--- a/core/src/main/java/org/lflang/util/ArduinoUtil.java
+++ b/core/src/main/java/org/lflang/util/ArduinoUtil.java
@@ -110,8 +110,8 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
       int retCode = 0;
       retCode = command.run(context.getCancelIndicator());
       if (retCode != 0 && context.getMode() == LFGeneratorContext.Mode.STANDALONE) {
-          errorReporter.nowhere().error("arduino-cli failed with error code " + retCode);
-          throw new IOException("arduino-cli failure");
+        errorReporter.nowhere().error("arduino-cli failed with error code " + retCode);
+        throw new IOException("arduino-cli failure");
       }
     } catch (IOException e) {
       Exceptions.sneakyThrow(e);
@@ -132,17 +132,18 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
                     targetConfig.platformOptions.port),
                 fileConfig.getSrcGenPath());
         if (flash == null) {
-            errorReporter.nowhere().error("Could not create arduino-cli flash command.");
+          errorReporter.nowhere().error("Could not create arduino-cli flash command.");
         }
         int flashRet = flash.run();
         if (flashRet != 0) {
-            errorReporter.nowhere().error(
-                "arduino-cli flash command failed with error code " + flashRet);
+          errorReporter
+              .nowhere()
+              .error("arduino-cli flash command failed with error code " + flashRet);
         } else {
           System.out.println("SUCCESS: Flashed board using arduino-cli");
         }
       } else {
-          errorReporter.nowhere().error("Need to provide a port on which to automatically flash.");
+        errorReporter.nowhere().error("Need to provide a port on which to automatically flash.");
       }
     } else {
       System.out.println("********");
diff --git a/core/src/main/java/org/lflang/util/FileUtil.java b/core/src/main/java/org/lflang/util/FileUtil.java
index 0b12105dfc..3d6600621d 100644
--- a/core/src/main/java/org/lflang/util/FileUtil.java
+++ b/core/src/main/java/org/lflang/util/FileUtil.java
@@ -327,11 +327,12 @@ public static void copyFilesOrDirectories(
           }
           System.out.println("Copied '" + fileOrDirectory + "' from the file system.");
         } catch (IOException e) {
-            String message = "Unable to copy '"
-                + fileOrDirectory
-                + "' from the file system. Reason: "
-                + e.toString();
-            errorReporter.nowhere().error(message);
+          String message =
+              "Unable to copy '"
+                  + fileOrDirectory
+                  + "' from the file system. Reason: "
+                  + e.toString();
+          errorReporter.nowhere().error(message);
         }
       } else {
         try {
@@ -342,11 +343,12 @@ public static void copyFilesOrDirectories(
             System.out.println("Copied '" + fileOrDirectory + "' from the class path.");
           }
         } catch (IOException e) {
-            String message = "Unable to copy '"
-                + fileOrDirectory
-                + "' from the class path. Reason: "
-                + e.toString();
-            errorReporter.nowhere().error(message);
+          String message =
+              "Unable to copy '"
+                  + fileOrDirectory
+                  + "' from the class path. Reason: "
+                  + e.toString();
+          errorReporter.nowhere().error(message);
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/util/LFCommand.java b/core/src/main/java/org/lflang/util/LFCommand.java
index a064a057e0..518401f305 100644
--- a/core/src/main/java/org/lflang/util/LFCommand.java
+++ b/core/src/main/java/org/lflang/util/LFCommand.java
@@ -29,7 +29,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.PrintStream;
 import java.nio.file.Path;
 import java.nio.file.Paths;
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 31afa8e1ac..237a3aad13 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -1076,7 +1076,7 @@ public void checkTargetDecl(TargetDecl target) throws IOException {
     }
     String lfFileName = FileUtil.nameWithoutExtension(target.eResource());
     if (Character.isDigit(lfFileName.charAt(0))) {
-        errorReporter.nowhere().error("LF file names must not start with a number");
+      errorReporter.nowhere().error("LF file names must not start with a number");
     }
   }
 
diff --git a/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java b/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java
index bc8876bc5a..e50a4f5e2a 100644
--- a/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java
+++ b/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java
@@ -27,11 +27,9 @@
 package org.lflang.validation;
 
 import java.nio.file.Path;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
-
 import org.lflang.ErrorReporterBase;
 import org.lflang.generator.Range;
 
@@ -70,30 +68,31 @@ protected void reportWithoutPosition(DiagnosticSeverity severity, String message
    *
    * <p>Unfortunately, there is no way to provide a path and a line number to the
    * ValidationMessageAcceptor as messages can only be reported directly as EObjects. While it is
-   * not an ideal solution, this method composes a messages indicating the location of the error
-   * and
-   * reports this on the object currently under validation. This way, the error message is not
-   * lost,
+   * not an ideal solution, this method composes a messages indicating the location of the error and
+   * reports this on the object currently under validation. This way, the error message is not lost,
    * but it is not necessarily reported precisely at the location of the actual error.
    */
   @Override
   protected void report(Path path, Range range, DiagnosticSeverity severity, String message) {
     String fullMessage =
-        message + " (Reported from " + path + " on line "
-            + range.getStartInclusive().getOneBasedLine() + ")";
+        message
+            + " (Reported from "
+            + path
+            + " on line "
+            + range.getStartInclusive().getOneBasedLine()
+            + ")";
     reportOnNode(validatorState.getCurrentObject(), severity, fullMessage);
   }
 
   @Override
   protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
     switch (severity) {
-    case Error -> acceptor.acceptError(
-        message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-    case Warning -> acceptor.acceptWarning(
-        message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
-    case Information, Hint -> acceptor.acceptInfo(
-        message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+      case Error -> acceptor.acceptError(
+          message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+      case Warning -> acceptor.acceptWarning(
+          message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+      case Information, Hint -> acceptor.acceptInfo(
+          message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
     }
   }
-
 }

From 9c19846bca725112d814f5c5a5512cc3f5d83ff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Wed, 14 Jun 2023 17:10:36 +0200
Subject: [PATCH 0342/1114] Use dynamic tests

---
 core/build.gradle                             |  5 ++-
 .../java/org/lflang/tests/LfParsingUtil.java  |  3 +-
 .../lflang/tests/compiler/RoundTripTests.java | 35 ++++++++++++++-----
 .../test/resources/junit-platform.properties  |  1 +
 gradle/wrapper/gradle-wrapper.properties      |  4 +--
 5 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 core/src/test/resources/junit-platform.properties

diff --git a/core/build.gradle b/core/build.gradle
index 59b91d3674..131d7dc85f 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -14,7 +14,10 @@ sourceSets {
     }
     test {
         java {
-            srcDirs = ['src/test/java', 'test-gen']
+            srcDirs = ['src/test/java']
+        }
+        resources {
+            srcDirs = [ 'src/test/resources' ]
         }
     }
     testFixtures {
diff --git a/core/src/test/java/org/lflang/tests/LfParsingUtil.java b/core/src/test/java/org/lflang/tests/LfParsingUtil.java
index ae45bf4e7c..295c580b2c 100644
--- a/core/src/test/java/org/lflang/tests/LfParsingUtil.java
+++ b/core/src/test/java/org/lflang/tests/LfParsingUtil.java
@@ -34,7 +34,8 @@ private static void checkValid(String fileName, Model resultingModel) {
   }
 
   public static Model parseSourceAsIfInDirectory(Path directory, String sourceText) {
-    int num = 0;
+    // Use a non-trivial number to avoid TOCTOU errors when executing tests concurrently.
+    int num = sourceText.hashCode();
     while (Files.exists(directory.resolve("file" + num + ".lf"))) {
       num++;
     }
diff --git a/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java b/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
index 1beb54b81a..240adb56c3 100644
--- a/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
@@ -5,12 +5,23 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.fail;
 
+import java.net.URI;
 import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
+
 import org.lflang.Target;
 import org.lflang.ast.FormattingUtils;
 import org.lflang.ast.IsEqual;
@@ -23,26 +34,32 @@
 
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
+@Execution(ExecutionMode.CONCURRENT)
 public class RoundTripTests {
 
-  @Test
-  public void roundTripTest() {
+  @TestFactory
+  public Collection<DynamicTest> roundTripTestFactory() {
+    List<DynamicTest> result = new ArrayList<>();
+    Path cwd = Paths.get(".").toAbsolutePath();
     for (Target target : Target.values()) {
       for (TestCategory category : TestCategory.values()) {
         for (LFTest test : TestRegistry.getRegisteredTests(target, category, false)) {
-          try {
-            run(test.getSrcPath());
-          } catch (Throwable thrown) {
-            fail("Test case " + test.getSrcPath() + " failed", thrown);
-          }
+          URI testSourceUri = test.getSrcPath().toUri();
+          result.add(
+              DynamicTest.dynamicTest(
+                  "Round trip " + cwd.relativize(test.getSrcPath()),
+                  testSourceUri,
+                  () -> run(test.getSrcPath())
+              )
+          );
         }
       }
     }
+    return result;
   }
 
-  private void run(Path file) throws Exception {
+  private static void run(Path file) {
     Model originalModel = LfParsingUtil.parse(file);
-    System.out.println(file);
     assertThat(originalModel.eResource().getErrors(), equalTo(emptyList()));
     // TODO: Check that the output is a fixed point
     final int smallLineLength = 20;
diff --git a/core/src/test/resources/junit-platform.properties b/core/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..1d27b78fbb
--- /dev/null
+++ b/core/src/test/resources/junit-platform.properties
@@ -0,0 +1 @@
+junit.jupiter.execution.parallel.enabled=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 61227331ef..e4e2b69d51 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-8.0.2-bin.zip
-distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
+distributionUrl=https://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 486c90ed6cda29585584dfa9c0dc89a69f6274b9 Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Wed, 14 Jun 2023 18:11:16 +0200
Subject: [PATCH 0343/1114] Fixed access to URIs which caused NPEs in Epoch

---
 core/src/main/java/org/lflang/ModelInfo.java  |  2 +-
 .../main/java/org/lflang/TargetProperty.java  |  2 +-
 .../federated/generator/FedTargetConfig.java  |  5 +++--
 .../LanguageServerErrorReporter.java          |  3 ++-
 .../c/CReactorHeaderFileGenerator.java        |  2 +-
 .../main/java/org/lflang/util/FileUtil.java   | 20 +++++++++----------
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/core/src/main/java/org/lflang/ModelInfo.java b/core/src/main/java/org/lflang/ModelInfo.java
index 17ee7cfb76..9b65ca3406 100644
--- a/core/src/main/java/org/lflang/ModelInfo.java
+++ b/core/src/main/java/org/lflang/ModelInfo.java
@@ -153,7 +153,7 @@ public void checkCaseInsensitiveNameCollisions(Model model, ErrorReporter report
   private String getName(Reactor r) {
     return r.getName() != null
         ? r.getName()
-        : FileUtil.nameWithoutExtension(Path.of(model.eResource().getURI().toFileString()));
+        : FileUtil.nameWithoutExtension(FileUtil.toPath(model.eResource().getURI()));
   }
 
   public Set<NamedInstance<?>> topologyCycles() {
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 4a68fc3796..ab26c8088b 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -717,7 +717,7 @@ else if (paths.size() == 1) {
         Path referencePath;
         try {
           referencePath = FileUtil.toPath(value.eResource().getURI()).toAbsolutePath();
-        } catch (IOException e) {
+        } catch (IllegalArgumentException e) {
           err.reportError(value, "Invalid path? " + e.getMessage());
           throw new RuntimeIOException(e);
         }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
index aa0cfccc14..1c9a53da4a 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
@@ -9,6 +9,7 @@
 import org.lflang.TargetProperty;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGeneratorContext;
+import org.lflang.util.FileUtil;
 
 /**
  * Subclass of TargetConfig with a specialized constructor for creating configurations for
@@ -67,9 +68,9 @@ private void mergeImportedConfig(
   }
 
   private Path getRelativePath(Resource source, Resource target) {
-    return Path.of(source.getURI().toFileString())
+    return FileUtil.toPath(source.getURI())
         .getParent()
-        .relativize(Path.of(target.getURI().toFileString()).getParent());
+        .relativize(FileUtil.toPath(target.getURI()).getParent());
   }
 
   /** Method for the removal of things that should not appear in the target config of a federate. */
diff --git a/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java b/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
index 31304f43c9..bc5f04e0c0 100644
--- a/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
+++ b/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
@@ -15,6 +15,7 @@
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.lflang.ErrorReporter;
+import org.lflang.util.FileUtil;
 
 /**
  * Report diagnostics to the language client.
@@ -159,7 +160,7 @@ public void publishDiagnostics() {
 
   /** Return the file on which the current validation process was triggered. */
   private Path getMainFile() {
-    return Path.of(parseRoot.eResource().getURI().toFileString());
+    return FileUtil.toPath(parseRoot.eResource().getURI());
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java
index b57a19d8a7..4834afebb8 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java
@@ -30,7 +30,7 @@ public interface GenerateAuxiliaryStructs {
   /** Return the path to the user-visible header file that would be generated for {@code r}. */
   public static Path outputPath(TypeParameterizedReactor tpr) {
     return Path.of(
-            Path.of(tpr.reactor().eResource().getURI().toFileString())
+            FileUtil.toPath(tpr.reactor().eResource().getURI())
                 .getFileName()
                 .toString()
                 .replaceFirst("[.][^.]+$", ""))
diff --git a/core/src/main/java/org/lflang/util/FileUtil.java b/core/src/main/java/org/lflang/util/FileUtil.java
index 23108c7375..d5bd2a3ba0 100644
--- a/core/src/main/java/org/lflang/util/FileUtil.java
+++ b/core/src/main/java/org/lflang/util/FileUtil.java
@@ -55,36 +55,36 @@ public static String nameWithoutExtension(Path file) {
    *
    * @param r Any {@code Resource}.
    * @return The name of the file associated with the given resource, excluding its file extension.
-   * @throws IOException If the resource has an invalid URI.
+   * @throws IllegalArgumentException If the resource has an invalid URI.
    */
-  public static String nameWithoutExtension(Resource r) throws IOException {
+  public static String nameWithoutExtension(Resource r) {
     return nameWithoutExtension(toPath(r));
   }
 
   /**
    * Return a java.nio.Path object corresponding to the given URI.
    *
-   * @throws IOException If the given URI is invalid.
+   * @throws IllegalArgumentException If the given URI is invalid.
    */
-  public static Path toPath(URI uri) throws IOException {
+  public static Path toPath(URI uri) {
     return Paths.get(toIPath(uri).toFile().getAbsolutePath());
   }
 
   /**
    * Return a java.nio.Path object corresponding to the given Resource.
    *
-   * @throws IOException If the given resource has an invalid URI.
+   * @throws IllegalArgumentException If the given resource has an invalid URI.
    */
-  public static Path toPath(Resource resource) throws IOException {
+  public static Path toPath(Resource resource) {
     return toPath(resource.getURI());
   }
 
   /**
    * Return an org.eclipse.core.runtime.Path object corresponding to the given URI.
    *
-   * @throws IOException If the given URI is invalid.
+   * @throws IllegalArgumentException If the given URI is invalid.
    */
-  public static IPath toIPath(URI uri) throws IOException {
+  public static IPath toIPath(URI uri) {
     if (uri.isPlatform()) {
       IPath path = new org.eclipse.core.runtime.Path(uri.toPlatformString(true));
       if (path.segmentCount() == 1) {
@@ -98,7 +98,7 @@ public static IPath toIPath(URI uri) throws IOException {
     } else if (uri.isFile()) {
       return new org.eclipse.core.runtime.Path(uri.toFileString());
     } else {
-      throw new IOException("Unrecognized file protocol in URI " + uri);
+      throw new IllegalArgumentException("Unrecognized file protocol in URI " + uri);
     }
   }
 
@@ -822,7 +822,7 @@ public static Path findInPackage(Path fileOrDirectory, FileConfig fileConfig) {
   }
 
   /** Get the iResource corresponding to the provided resource if it can be found. */
-  public static IResource getIResource(Resource r) throws IOException {
+  public static IResource getIResource(Resource r) {
     return getIResource(FileUtil.toPath(r).toFile().toURI());
   }
 

From 8b37f2bb2afffda5a3b077886b605843511fdd61 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Wed, 14 Jun 2023 12:42:57 -0700
Subject: [PATCH 0344/1114] Reduce comment inlining.

This avoids inlining comments when the target syntactic element is
multiple lines long. In such cases the comment instead gets its own
line.
---
 .../java/org/lflang/ast/FormattingUtils.java  |   1 +
 test/C/all.csv                                |  29 ++++
 test/C/federate__receiver.csv                 |  11 ++
 test/C/federate__receiver_summary.csv         |  16 +++
 test/C/federate__sender.csv                   |  20 +++
 test/C/federate__sender_summary.csv           |  27 ++++
 test/C/rti.csv                                |  15 +++
 test/C/rti_summary.csv                        |  16 +++
 test/C/src/ActionWithNoReaction.lf            |   3 +-
 test/C/src/ArrayAsType.lf                     |   3 +-
 test/C/src/ArrayPrint.lf                      |   3 +-
 test/C/src/DelayArray.lf                      |   3 +-
 test/C/src/DelayArrayWithAfter.lf             |   3 +-
 test/C/src/DelayStruct.lf                     |   3 +-
 test/C/src/DelayStructWithAfter.lf            |   3 +-
 test/C/src/DelayStructWithAfterOverlapped.lf  |   3 +-
 test/C/src/FloatLiteral.lf                    |   3 +-
 test/C/src/HelloWorld.lf                      |   3 +-
 test/C/src/ManualDelayedReaction.lf           |   3 +-
 test/C/src/MethodsRecursive.lf                |   3 +-
 test/C/src/NativeListsAndTimes.lf             |   3 +-
 test/C/src/SendsPointerTest.lf                |   3 +-
 test/C/src/SetArray.lf                        |   3 +-
 test/C/src/SetToken.lf                        |   3 +-
 test/C/src/StructAsType.lf                    |   3 +-
 test/C/src/StructAsTypeDirect.lf              |   3 +-
 test/C/src/StructPrint.lf                     |   3 +-
 test/C/src/StructScale.lf                     |   3 +-
 test/C/src/docker/HelloWorldContainerized.lf  |   3 +-
 .../DistributedLoopedPhysicalAction.lf        |   3 +-
 .../modal_models/BanksCount3ModesComplex.lf   |   3 +-
 .../modal_models/BanksCount3ModesSimple.lf    |   3 +-
 .../src/modal_models/BanksModalStateReset.lf  |   3 +-
 test/C/src/modal_models/ConvertCaseTest.lf    |   3 +-
 test/C/src/modal_models/Count3Modes.lf        |   3 +-
 test/C/src/modal_models/ModalCycleBreaker.lf  |   3 +-
 .../src/modal_models/ModalNestedReactions.lf  |   3 +-
 .../src/modal_models/ModalStartupShutdown.lf  |   3 +-
 test/C/src/multiport/MultiportMutableInput.lf |   3 +-
 .../multiport/MultiportMutableInputArray.lf   |   3 +-
 test/C/src/multiport/MultiportToBank.lf       |   4 +-
 test/C/src/multiport/MultiportToBankDouble.lf |   4 +-
 test/C/src/no_inlining/IntPrint.lf            |   3 +-
 test/C/temp.txt                               | 124 ++++++++++++++++++
 test/C/trace_svg.html                         |  97 ++++++++++++++
 test/Cpp/src/FloatLiteral.lf                  |   3 +-
 test/Cpp/src/ManualDelayedReaction.lf         |   3 +-
 test/Cpp/src/NativeListsAndTimes.lf           |   7 +-
 test/Python/src/ActionWithNoReaction.lf       |   3 +-
 test/Python/src/ArrayAsType.lf                |   3 +-
 test/Python/src/ArrayPrint.lf                 |   3 +-
 test/Python/src/DelayArray.lf                 |   3 +-
 test/Python/src/DelayArrayWithAfter.lf        |   3 +-
 test/Python/src/DelayStruct.lf                |   3 +-
 test/Python/src/DelayStructWithAfter.lf       |   3 +-
 .../src/DelayStructWithAfterOverlapped.lf     |   3 +-
 test/Python/src/FloatLiteral.lf               |   3 +-
 test/Python/src/ManualDelayedReaction.lf      |   3 +-
 test/Python/src/MethodsRecursive.lf           |   3 +-
 test/Python/src/NativeListsAndTimes.lf        |   3 +-
 test/Python/src/SetArray.lf                   |   3 +-
 test/Python/src/StructAsType.lf               |   3 +-
 test/Python/src/StructAsTypeDirect.lf         |   3 +-
 test/Python/src/StructPrint.lf                |   3 +-
 test/Python/src/StructScale.lf                |   3 +-
 test/Python/src/lib/ImportedAgain.lf          |   3 +-
 .../modal_models/BanksCount3ModesComplex.lf   |   3 +-
 .../modal_models/BanksCount3ModesSimple.lf    |   3 +-
 .../src/modal_models/BanksModalStateReset.lf  |   3 +-
 .../src/modal_models/ConvertCaseTest.lf       |   3 +-
 test/Python/src/modal_models/Count3Modes.lf   |   3 +-
 .../src/modal_models/ModalCycleBreaker.lf     |   3 +-
 .../src/modal_models/ModalNestedReactions.lf  |   3 +-
 .../src/modal_models/ModalStartupShutdown.lf  |   3 +-
 .../src/multiport/MultiportMutableInput.lf    |   3 +-
 .../multiport/MultiportMutableInputArray.lf   |   3 +-
 test/Rust/src/FloatLiteral.lf                 |   3 +-
 test/Rust/src/NativeListsAndTimes.lf          |   3 +-
 test/Rust/src/StructAsType.lf                 |   3 +-
 test/TypeScript/src/ArrayAsType.lf            |   3 +-
 test/TypeScript/src/ArrayPrint.lf             |   3 +-
 test/TypeScript/src/Deadline.lf               |   3 +-
 test/TypeScript/src/FloatLiteral.lf           |   3 +-
 test/TypeScript/src/NativeListsAndTimes.lf    |   3 +-
 test/TypeScript/src/StructAsType.lf           |   3 +-
 test/TypeScript/src/StructAsTypeDirect.lf     |   3 +-
 test/TypeScript/src/StructPrint.lf            |   3 +-
 test/TypeScript/src/TimeLimit.lf              |   3 +-
 .../src/multiport/MultiportMutableInput.lf    |   3 +-
 .../multiport/MultiportMutableInputArray.lf   |   3 +-
 .../src/multiport/MultiportToBankDouble.lf    |   4 +-
 91 files changed, 522 insertions(+), 84 deletions(-)
 create mode 100644 test/C/all.csv
 create mode 100644 test/C/federate__receiver.csv
 create mode 100644 test/C/federate__receiver_summary.csv
 create mode 100644 test/C/federate__sender.csv
 create mode 100644 test/C/federate__sender_summary.csv
 create mode 100644 test/C/rti.csv
 create mode 100644 test/C/rti_summary.csv
 create mode 100644 test/C/temp.txt
 create mode 100644 test/C/trace_svg.html

diff --git a/core/src/main/java/org/lflang/ast/FormattingUtils.java b/core/src/main/java/org/lflang/ast/FormattingUtils.java
index 7ec3d7d59a..500edc465d 100644
--- a/core/src/main/java/org/lflang/ast/FormattingUtils.java
+++ b/core/src/main/java/org/lflang/ast/FormattingUtils.java
@@ -220,6 +220,7 @@ static boolean placeComment(
       for (int j = 0; j < components.size(); j++) {
         String current = components.get(j);
         if (j >= i && current.contains("\n")) {
+          if (components.get(j).lines().filter(it -> !it.isBlank()).count() > 1) break;
           components.set(
               j,
               components
diff --git a/test/C/all.csv b/test/C/all.csv
new file mode 100644
index 0000000000..4705d450d4
--- /dev/null
+++ b/test/C/all.csv
@@ -0,0 +1,29 @@
+,event,self_id,partner_id,logical_time,microstep,physical_time,inout,x1,y1,arrow,x2,y2
+0,FED_ID,1,-1,-1686279803405901114,0,-1041305535,out,300,75,arrow,100,96
+1,FED_ID,-1,1,-1686279803405901114,0,-1041279256,in,100,96,marked,-1,-1
+2,ACK,-1,1,-1686279803405901114,0,-1041277413,out,100,116,arrow,300,137
+3,ACK,1,-1,-1686279803405901114,0,-1041236205,in,300,137,marked,-1,-1
+4,TIMESTAMP,1,-1,-1041185840,0,-1041181933,out,300,158,arrow,100,245
+5,FED_ID,0,-1,-1686279803405901114,0,-1040825162,out,500,180,arrow,100,204
+6,FED_ID,-1,0,-1686279803405901114,0,-1000243598,in,100,204,marked,-1,-1
+7,ACK,-1,0,-1686279803405901114,0,-1000241414,out,100,224,arrow,500,266
+8,TIMESTAMP,-1,1,-1041185840,0,-1000221006,in,100,245,marked,-1,-1
+9,ACK,0,-1,-1686279803405901114,0,-1000187212,in,500,266,marked,-1,-1
+10,TIMESTAMP,0,-1,-1000000000,0,-999986915,out,500,288,arrow,100,309
+11,TIMESTAMP,-1,0,-1000000000,0,-999957680,in,100,309,marked,-1,-1
+12,TIMESTAMP,-1,0,0,0,-999953903,out,100,329,arrow,500,371
+13,TIMESTAMP,-1,1,0,0,-999941831,out,100,350,arrow,300,391
+14,TIMESTAMP,0,-1,0,0,-999913577,in,500,371,marked,-1,-1
+15,TIMESTAMP,1,-1,0,0,-999906524,in,300,391,marked,-1,-1
+16,NET,1,-1,0,0,87819,out,300,416,arrow,100,477
+17,NET,0,-1,0,0,88491,out,500,435,arrow,100,456
+18,NET,-1,0,0,0,136240,in,100,456,marked,-1,-1
+19,NET,-1,1,0,0,168822,in,100,477,marked,-1,-1
+20,PTAG,-1,1,0,0,182147,out,100,498,arrow,300,539
+21,PTAG,-1,0,0,0,201463,out,100,519,arrow,500,559
+22,PTAG,1,-1,0,0,208607,in,300,539,marked,-1,-1
+23,PTAG,0,-1,0,0,216271,in,500,559,marked,-1,-1
+24,T_MSG,0,-1,0,0,446263,out,500,581,arrow,100,605
+25,T_MSG,-1,0,0,0,43615435,in,100,605,marked,-1,-1
+26,T_MSG,-1,1,0,0,43618230,out,100,625,arrow,300,646
+27,T_MSG,1,-1,0,0,43665168,in,300,646,marked,-1,-1
diff --git a/test/C/federate__receiver.csv b/test/C/federate__receiver.csv
new file mode 100644
index 0000000000..f6a261ca92
--- /dev/null
+++ b/test/C/federate__receiver.csv
@@ -0,0 +1,11 @@
+Event, Reactor, Source, Destination, Elapsed Logical Time, Microstep, Elapsed Physical Time, Trigger, Extra Delay
+Worker wait starts, NO REACTOR, 1, -1, 0, 0, 341276, NO TRIGGER, 0
+Worker wait starts, NO REACTOR, 2, -1, 0, 0, 376362, NO TRIGGER, 0
+Sending FED_ID, NO REACTOR, 1, -1, -1686279803405901114, 0, -1041305535, NO TRIGGER, 0
+Receiving ACK, NO REACTOR, 1, -1, -1686279803405901114, 0, -1041236205, NO TRIGGER, 0
+Sending TIMESTAMP, NO REACTOR, 1, -1, -1041185840, 0, -1041181933, NO TRIGGER, 0
+Receiving TIMESTAMP, NO REACTOR, 1, -1, 0, 0, -999906524, NO TRIGGER, 0
+Sending NET, NO REACTOR, 1, -1, 0, 0, 87819, NO TRIGGER, 0
+Receiving PTAG, NO REACTOR, 1, -1, 0, 0, 208607, NO TRIGGER, 0
+Worker wait starts, NO REACTOR, 0, -1, 0, 0, 326138, NO TRIGGER, 0
+Receiving TAGGED_MSG, NO REACTOR, 1, -1, 0, 0, 43665168, NO TRIGGER, 0
diff --git a/test/C/federate__receiver_summary.csv b/test/C/federate__receiver_summary.csv
new file mode 100644
index 0000000000..da8d04534b
--- /dev/null
+++ b/test/C/federate__receiver_summary.csv
@@ -0,0 +1,16 @@
+Start time:, 1686279803405901114
+End time:, 1686279803449566282
+Total time:, 43665168
+
+Total Event Occurrences
+Worker wait starts, 3
+Sending TIMESTAMP, 1
+Sending NET, 1
+Sending FED_ID, 1
+Receiving ACK, 1
+Receiving TIMESTAMP, 1
+Receiving PTAG, 1
+Receiving TAGGED_MSG, 1
+
+Reaction Executions
+Reactor, Reaction, Occurrences, Total Time, Pct Total Time, Avg Time, Max Time, Min Time
diff --git a/test/C/federate__sender.csv b/test/C/federate__sender.csv
new file mode 100644
index 0000000000..ea34698814
--- /dev/null
+++ b/test/C/federate__sender.csv
@@ -0,0 +1,20 @@
+Event, Reactor, Source, Destination, Elapsed Logical Time, Microstep, Elapsed Physical Time, Trigger, Extra Delay
+Worker wait starts, NO REACTOR, 1, -1, 0, 0, 326829, NO TRIGGER, 0
+Worker wait starts, NO REACTOR, 2, -1, 0, 0, 377073, NO TRIGGER, 0
+Sending FED_ID, NO REACTOR, 0, -1, -1686279803405901114, 0, -1040825162, NO TRIGGER, 0
+Receiving ACK, NO REACTOR, 0, -1, -1686279803405901114, 0, -1000187212, NO TRIGGER, 0
+Sending TIMESTAMP, NO REACTOR, 0, -1, -1000000000, 0, -999986915, NO TRIGGER, 0
+Receiving TIMESTAMP, NO REACTOR, 0, -1, 0, 0, -999913577, NO TRIGGER, 0
+Schedule called, sender, 0, 0, 0, 0, -999848234, sender.t, 0
+Schedule called, sender, 0, 0, 0, 0, -999845519, sender.t, 1000
+Sending NET, NO REACTOR, 0, -1, 0, 0, 88491, NO TRIGGER, 0
+Receiving PTAG, NO REACTOR, 0, -1, 0, 0, 216271, NO TRIGGER, 0
+Reaction starts, sender, 0, 0, 0, 0, 274490, NO TRIGGER, 0
+Schedule called, sender, 0, 0, 0, 0, 411548, sender.act, 0
+Reaction ends, sender, 0, 0, 0, 0, 413973, NO TRIGGER, 0
+Worker wait starts, NO REACTOR, 0, -1, 0, 0, 429051, NO TRIGGER, 0
+Worker wait ends, NO REACTOR, 0, -1, 0, 0, 434481, NO TRIGGER, 0
+Reaction starts, ns_federate__receiver, 0, 0, 0, 0, 442847, NO TRIGGER, 0
+Sending TAGGED_MSG, NO REACTOR, 0, -1, 0, 0, 446263, NO TRIGGER, 0
+Reaction ends, ns_federate__receiver, 0, 0, 0, 0, 463346, NO TRIGGER, 0
+Worker wait starts, NO REACTOR, 0, -1, 0, 0, 469397, NO TRIGGER, 0
diff --git a/test/C/federate__sender_summary.csv b/test/C/federate__sender_summary.csv
new file mode 100644
index 0000000000..c3c8a72e1b
--- /dev/null
+++ b/test/C/federate__sender_summary.csv
@@ -0,0 +1,27 @@
+Start time:, 1686279803405901114
+End time:, 1686279803406370511
+Total time:, 469397
+
+Total Event Occurrences
+Reaction starts, 2
+Reaction ends, 2
+Schedule called, 3
+Worker wait starts, 4
+Worker wait ends, 1
+Sending TIMESTAMP, 1
+Sending NET, 1
+Sending FED_ID, 1
+Sending TAGGED_MSG, 1
+Receiving ACK, 1
+Receiving TIMESTAMP, 1
+Receiving PTAG, 1
+
+Reaction Executions
+Reactor, Reaction, Occurrences, Total Time, Pct Total Time, Avg Time, Max Time, Min Time
+sender, 0, 1, 139483, 29.715358, 139483, 139483, 139483
+ns_federate__receiver, 0, 1, 20499, 4.367092, 20499, 20499, 20499
+
+Schedule calls
+Trigger, Occurrences
+sender.act, 1
+sender.t, 2
diff --git a/test/C/rti.csv b/test/C/rti.csv
new file mode 100644
index 0000000000..8bd2112691
--- /dev/null
+++ b/test/C/rti.csv
@@ -0,0 +1,15 @@
+Event, Reactor, Source, Destination, Elapsed Logical Time, Microstep, Elapsed Physical Time, Trigger, Extra Delay
+Receiving FED_ID, NO REACTOR, -1, 1, -1686279803405901114, 0, -1041279256, NO TRIGGER, 0
+Sending ACK, NO REACTOR, -1, 1, -1686279803405901114, 0, -1041277413, NO TRIGGER, 0
+Receiving TIMESTAMP, NO REACTOR, -1, 1, -1041185840, 0, -1000221006, NO TRIGGER, 0
+Sending TIMESTAMP, NO REACTOR, -1, 1, 0, 0, -999941831, NO TRIGGER, 0
+Receiving NET, NO REACTOR, -1, 1, 0, 0, 168822, NO TRIGGER, 0
+Sending PTAG, NO REACTOR, -1, 1, 0, 0, 182147, NO TRIGGER, 0
+Sending TAGGED_MSG, NO REACTOR, -1, 1, 0, 0, 43618230, NO TRIGGER, 0
+Receiving FED_ID, NO REACTOR, -1, 0, -1686279803405901114, 0, -1000243598, NO TRIGGER, 0
+Sending ACK, NO REACTOR, -1, 0, -1686279803405901114, 0, -1000241414, NO TRIGGER, 0
+Receiving TIMESTAMP, NO REACTOR, -1, 0, -1000000000, 0, -999957680, NO TRIGGER, 0
+Sending TIMESTAMP, NO REACTOR, -1, 0, 0, 0, -999953903, NO TRIGGER, 0
+Receiving NET, NO REACTOR, -1, 0, 0, 0, 136240, NO TRIGGER, 0
+Sending PTAG, NO REACTOR, -1, 0, 0, 0, 201463, NO TRIGGER, 0
+Receiving TAGGED_MSG, NO REACTOR, -1, 0, 0, 0, 43615435, NO TRIGGER, 0
diff --git a/test/C/rti_summary.csv b/test/C/rti_summary.csv
new file mode 100644
index 0000000000..31fcc3dc4a
--- /dev/null
+++ b/test/C/rti_summary.csv
@@ -0,0 +1,16 @@
+Start time:, 1686279803405901114
+End time:, 1686279803449519344
+Total time:, 43618230
+
+Total Event Occurrences
+Sending ACK, 2
+Sending TIMESTAMP, 2
+Sending PTAG, 2
+Sending TAGGED_MSG, 1
+Receiving TIMESTAMP, 2
+Receiving NET, 2
+Receiving FED_ID, 2
+Receiving TAGGED_MSG, 1
+
+Reaction Executions
+Reactor, Reaction, Occurrences, Total Time, Pct Total Time, Avg Time, Max Time, Min Time
diff --git a/test/C/src/ActionWithNoReaction.lf b/test/C/src/ActionWithNoReaction.lf
index 87f1c707c2..0143d67cce 100644
--- a/test/C/src/ActionWithNoReaction.lf
+++ b/test/C/src/ActionWithNoReaction.lf
@@ -10,7 +10,8 @@ reactor foo {
   output y: int
   logical action a: int*
 
-  reaction(x) -> y, a {=  // reaction(a) {= =}
+  // reaction(a) {= =}
+  reaction(x) -> y, a {=
     lf_set(y, 2*x->value);
     lf_schedule(a, MSEC(500));
   =}
diff --git a/test/C/src/ArrayAsType.lf b/test/C/src/ArrayAsType.lf
index 07dc9d1843..8339c6f9c2 100644
--- a/test/C/src/ArrayAsType.lf
+++ b/test/C/src/ArrayAsType.lf
@@ -13,7 +13,8 @@ reactor Source {
   =}
 }
 
-reactor Print(scale: int = 1) {  // The scale parameter is just for testing.
+// The scale parameter is just for testing.
+reactor Print(scale: int = 1) {
   input in: int[3]
 
   reaction(in) {=
diff --git a/test/C/src/ArrayPrint.lf b/test/C/src/ArrayPrint.lf
index 9cbf0e2fd6..49aaca5c12 100644
--- a/test/C/src/ArrayPrint.lf
+++ b/test/C/src/ArrayPrint.lf
@@ -24,7 +24,8 @@ reactor Source(size: int = 3) {
   =}
 }
 
-reactor Print(scale: int = 1, size: int = 3) {  // The scale parameter is just for testing.
+// The scale parameter is just for testing.
+reactor Print(scale: int = 1, size: int = 3) {
   input in: int[]
   state count: int = 0
 
diff --git a/test/C/src/DelayArray.lf b/test/C/src/DelayArray.lf
index 62f36b059e..f818446991 100644
--- a/test/C/src/DelayArray.lf
+++ b/test/C/src/DelayArray.lf
@@ -29,7 +29,8 @@ reactor Source {
   =}
 }
 
-reactor Print(scale: int = 1) {  // The scale parameter is just for testing.
+// The scale parameter is just for testing.
+reactor Print(scale: int = 1) {
   input in: int[]
 
   reaction(in) {=
diff --git a/test/C/src/DelayArrayWithAfter.lf b/test/C/src/DelayArrayWithAfter.lf
index 094d264b08..3c3866b00c 100644
--- a/test/C/src/DelayArrayWithAfter.lf
+++ b/test/C/src/DelayArrayWithAfter.lf
@@ -22,7 +22,8 @@ reactor Source {
   =}
 }
 
-reactor Print(scale: int = 1) {  // The scale parameter is just for testing.
+// The scale parameter is just for testing.
+reactor Print(scale: int = 1) {
   input in: int[]
   state iteration: int = 1
   state inputs_received: int = 0
diff --git a/test/C/src/DelayStruct.lf b/test/C/src/DelayStruct.lf
index 6394ddbc1f..3d8ca9c665 100644
--- a/test/C/src/DelayStruct.lf
+++ b/test/C/src/DelayStruct.lf
@@ -39,7 +39,8 @@ reactor Source {
   =}
 }
 
-reactor Print(expected: int = 42) {  // expected parameter is for testing.
+// expected parameter is for testing.
+reactor Print(expected: int = 42) {
   input in: hello_t*
 
   reaction(in) {=
diff --git a/test/C/src/DelayStructWithAfter.lf b/test/C/src/DelayStructWithAfter.lf
index e3cf5b5b59..0207ba3ea2 100644
--- a/test/C/src/DelayStructWithAfter.lf
+++ b/test/C/src/DelayStructWithAfter.lf
@@ -20,7 +20,8 @@ reactor Source {
   =}
 }
 
-reactor Print(expected: int = 42) {  // expected parameter is for testing.
+// expected parameter is for testing.
+reactor Print(expected: int = 42) {
   input in: hello_t*
 
   reaction(in) {=
diff --git a/test/C/src/DelayStructWithAfterOverlapped.lf b/test/C/src/DelayStructWithAfterOverlapped.lf
index d10772a964..b098e9ecf1 100644
--- a/test/C/src/DelayStructWithAfterOverlapped.lf
+++ b/test/C/src/DelayStructWithAfterOverlapped.lf
@@ -25,7 +25,8 @@ reactor Source {
   =}
 }
 
-reactor Print {  // expected parameter is for testing.
+// expected parameter is for testing.
+reactor Print {
   input in: hello_t*
   state s: int = 0
 
diff --git a/test/C/src/FloatLiteral.lf b/test/C/src/FloatLiteral.lf
index dd6a39fc95..0179275083 100644
--- a/test/C/src/FloatLiteral.lf
+++ b/test/C/src/FloatLiteral.lf
@@ -1,6 +1,7 @@
 target C
 
-main reactor {  // This test verifies that floating-point literals are handled correctly.
+// This test verifies that floating-point literals are handled correctly.
+main reactor {
   preamble {=
     #include <math.h>
   =}
diff --git a/test/C/src/HelloWorld.lf b/test/C/src/HelloWorld.lf
index 07b49b0afd..470ebabb6b 100644
--- a/test/C/src/HelloWorld.lf
+++ b/test/C/src/HelloWorld.lf
@@ -1,5 +1,6 @@
 target C {
-  tracing: {  // To test generating a custom trace file name.
+  // To test generating a custom trace file name.
+  tracing: {
     trace-file-name: "HelloWorldTrace"
   },
   logging: error,
diff --git a/test/C/src/ManualDelayedReaction.lf b/test/C/src/ManualDelayedReaction.lf
index 61e2519fc3..3432f15ec2 100644
--- a/test/C/src/ManualDelayedReaction.lf
+++ b/test/C/src/ManualDelayedReaction.lf
@@ -5,7 +5,8 @@ target C {
   keepalive: false
 }
 
-reactor GeneratedDelay {  // That's the stuff that shall be generated for the after
+// That's the stuff that shall be generated for the after
+reactor GeneratedDelay {
   input y_in: int
   output y_out: int
   state y_state: int = 0
diff --git a/test/C/src/MethodsRecursive.lf b/test/C/src/MethodsRecursive.lf
index 3f2ec1fd00..8ba8a5627b 100644
--- a/test/C/src/MethodsRecursive.lf
+++ b/test/C/src/MethodsRecursive.lf
@@ -4,7 +4,8 @@ target C
 main reactor {
   state foo: int = 2
 
-  method fib(n: int): int {=  // Return the n-th Fibonacci number.
+  // Return the n-th Fibonacci number.
+  method fib(n: int): int {=
     if (n <= 1) return 1;
     return add(fib(n-1), fib(n-2));
   =}
diff --git a/test/C/src/NativeListsAndTimes.lf b/test/C/src/NativeListsAndTimes.lf
index fa82f181a1..cbb1a6d861 100644
--- a/test/C/src/NativeListsAndTimes.lf
+++ b/test/C/src/NativeListsAndTimes.lf
@@ -1,6 +1,7 @@
 target C
 
-main reactor(  // This test passes if it is successfully compiled into valid target code.
+// This test passes if it is successfully compiled into valid target code.
+main reactor(
   x: int = 0,
   y: time = 0,                  // Units are missing but not required
   z = 1 msec,                   // Type is missing but not required
diff --git a/test/C/src/SendsPointerTest.lf b/test/C/src/SendsPointerTest.lf
index 0ec366cadb..639798709f 100644
--- a/test/C/src/SendsPointerTest.lf
+++ b/test/C/src/SendsPointerTest.lf
@@ -13,7 +13,8 @@ reactor SendsPointer {
   =}
 }
 
-reactor Print(expected: int = 42) {  // expected parameter is for testing.
+// expected parameter is for testing.
+reactor Print(expected: int = 42) {
   input in: int_pointer
 
   reaction(in) {=
diff --git a/test/C/src/SetArray.lf b/test/C/src/SetArray.lf
index 72c2e938de..8926144e62 100644
--- a/test/C/src/SetArray.lf
+++ b/test/C/src/SetArray.lf
@@ -17,7 +17,8 @@ reactor Source {
   =}
 }
 
-reactor Print(scale: int = 1) {  // The scale parameter is just for testing.
+// The scale parameter is just for testing.
+reactor Print(scale: int = 1) {
   input in: int[]
 
   reaction(in) {=
diff --git a/test/C/src/SetToken.lf b/test/C/src/SetToken.lf
index 3ac1958b83..ff5e63066b 100644
--- a/test/C/src/SetToken.lf
+++ b/test/C/src/SetToken.lf
@@ -10,7 +10,8 @@ reactor Source {
   reaction(a) -> out {= lf_set_token(out, a->token); =}
 }
 
-reactor Print(expected: int = 42) {  // expected parameter is for testing.
+// expected parameter is for testing.
+reactor Print(expected: int = 42) {
   input in: int*
 
   reaction(in) {=
diff --git a/test/C/src/StructAsType.lf b/test/C/src/StructAsType.lf
index eded331cb9..bf7efbae41 100644
--- a/test/C/src/StructAsType.lf
+++ b/test/C/src/StructAsType.lf
@@ -23,7 +23,8 @@ reactor Source {
   =}
 }
 
-reactor Print(expected: int = 42) {  // expected parameter is for testing.
+// expected parameter is for testing.
+reactor Print(expected: int = 42) {
   input in: hello_t
 
   reaction(in) {=
diff --git a/test/C/src/StructAsTypeDirect.lf b/test/C/src/StructAsTypeDirect.lf
index b12e46b08e..4a7832ec68 100644
--- a/test/C/src/StructAsTypeDirect.lf
+++ b/test/C/src/StructAsTypeDirect.lf
@@ -17,7 +17,8 @@ reactor Source {
   =}
 }
 
-reactor Print(expected: int = 42) {  // expected parameter is for testing.
+// expected parameter is for testing.
+reactor Print(expected: int = 42) {
   input in: hello_t
 
   reaction(in) {=
diff --git a/test/C/src/StructPrint.lf b/test/C/src/StructPrint.lf
index 43d699860b..10bea74d49 100644
--- a/test/C/src/StructPrint.lf
+++ b/test/C/src/StructPrint.lf
@@ -20,7 +20,8 @@ reactor Print {
   =}
 }
 
-reactor Check(expected: int = 42) {  // expected parameter is for testing.
+// expected parameter is for testing.
+reactor Check(expected: int = 42) {
   input in: hello_t*
 
   reaction(in) {=
diff --git a/test/C/src/StructScale.lf b/test/C/src/StructScale.lf
index bbc4d5d078..39293c2503 100644
--- a/test/C/src/StructScale.lf
+++ b/test/C/src/StructScale.lf
@@ -21,7 +21,8 @@ reactor Source {
   =}
 }
 
-reactor TestInput(expected: int = 42) {  // expected parameter is for testing.
+// expected parameter is for testing.
+reactor TestInput(expected: int = 42) {
   input in: hello_t*
   state invoked: bool = false
 
diff --git a/test/C/src/docker/HelloWorldContainerized.lf b/test/C/src/docker/HelloWorldContainerized.lf
index f486c7bb9a..d63ea45f93 100644
--- a/test/C/src/docker/HelloWorldContainerized.lf
+++ b/test/C/src/docker/HelloWorldContainerized.lf
@@ -1,5 +1,6 @@
 target C {
-  tracing: {  // To test generating a custom trace file name.
+  // To test generating a custom trace file name.
+  tracing: {
     trace-file-name: "HelloWorldTrace"
   },
   logging: error,
diff --git a/test/C/src/federated/DistributedLoopedPhysicalAction.lf b/test/C/src/federated/DistributedLoopedPhysicalAction.lf
index dd7375cdb7..ace74a219f 100644
--- a/test/C/src/federated/DistributedLoopedPhysicalAction.lf
+++ b/test/C/src/federated/DistributedLoopedPhysicalAction.lf
@@ -10,7 +10,8 @@
  */
 target C {
   timeout: 1 sec,
-  coordination-options: {  // Silences warning.
+  // Silences warning.
+  coordination-options: {
     advance-message-interval: 10 msec
   }
 }
diff --git a/test/C/src/modal_models/BanksCount3ModesComplex.lf b/test/C/src/modal_models/BanksCount3ModesComplex.lf
index b8afa7064f..220f63c949 100644
--- a/test/C/src/modal_models/BanksCount3ModesComplex.lf
+++ b/test/C/src/modal_models/BanksCount3ModesComplex.lf
@@ -70,7 +70,8 @@ main reactor {
 
   counters.always, counters.mode1, counters.mode2, counters.never -> test.events
 
-  reaction(stepper) -> counters.next {=  // Trigger
+  // Trigger
+  reaction(stepper) -> counters.next {=
     for(int i = 0; i < 2; i++) {
         lf_set(counters[i].next, true);
     }
diff --git a/test/C/src/modal_models/BanksCount3ModesSimple.lf b/test/C/src/modal_models/BanksCount3ModesSimple.lf
index 8ca84403c9..e4f9ea6ec6 100644
--- a/test/C/src/modal_models/BanksCount3ModesSimple.lf
+++ b/test/C/src/modal_models/BanksCount3ModesSimple.lf
@@ -24,7 +24,8 @@ main reactor {
 
   counters.count -> test.events
 
-  reaction(stepper) -> counters.next {=  // Trigger
+  // Trigger
+  reaction(stepper) -> counters.next {=
     for(int i = 0; i < 3; i++) {
         lf_set(counters[i].next, true);
     }
diff --git a/test/C/src/modal_models/BanksModalStateReset.lf b/test/C/src/modal_models/BanksModalStateReset.lf
index d8130611c7..57228081c2 100644
--- a/test/C/src/modal_models/BanksModalStateReset.lf
+++ b/test/C/src/modal_models/BanksModalStateReset.lf
@@ -45,7 +45,8 @@ main reactor {
   reset2.count2
     -> test.events
 
-  reaction(stepper) -> reset1.next {=  // Trigger mode change (separately because of #1278)
+  // Trigger mode change (separately because of #1278)
+  reaction(stepper) -> reset1.next {=
     for(int i = 0; i < reset1_width; i++) {
         lf_set(reset1[i].next, true);
     }
diff --git a/test/C/src/modal_models/ConvertCaseTest.lf b/test/C/src/modal_models/ConvertCaseTest.lf
index 24afa7439e..400c40e9ad 100644
--- a/test/C/src/modal_models/ConvertCaseTest.lf
+++ b/test/C/src/modal_models/ConvertCaseTest.lf
@@ -122,7 +122,8 @@ main reactor {
 
   reset_processor.converted, history_processor.converted -> test.events
 
-  reaction(stepper) -> reset_processor.discard, history_processor.discard {=  // Trigger mode change
+  // Trigger mode change
+  reaction(stepper) -> reset_processor.discard, history_processor.discard {=
     lf_set(reset_processor.discard, true);
     lf_set(history_processor.discard, true);
   =}
diff --git a/test/C/src/modal_models/Count3Modes.lf b/test/C/src/modal_models/Count3Modes.lf
index 93e5119759..dc4063d865 100644
--- a/test/C/src/modal_models/Count3Modes.lf
+++ b/test/C/src/modal_models/Count3Modes.lf
@@ -38,7 +38,8 @@ main reactor {
 
   reaction(stepper) -> counter.next {= lf_set(counter.next, true); =}  // Trigger
 
-  reaction(stepper) counter.count {=  // Check
+  // Check
+  reaction(stepper) counter.count {=
     printf("%d\n", counter.count->value);
 
     if (!counter.count->is_present) {
diff --git a/test/C/src/modal_models/ModalCycleBreaker.lf b/test/C/src/modal_models/ModalCycleBreaker.lf
index c411fcbe3b..4ac9f509a7 100644
--- a/test/C/src/modal_models/ModalCycleBreaker.lf
+++ b/test/C/src/modal_models/ModalCycleBreaker.lf
@@ -16,7 +16,8 @@ reactor Modal {
   input in2: int
   output out: int
 
-  mode Two {  // Defining reaction to in2 before in1 would cause cycle if no mode were present
+  // Defining reaction to in2 before in1 would cause cycle if no mode were present
+  mode Two {
     timer wait(150 msec, 1 sec)
     reaction(in2) {=
       // lf_set(out, in2->value);
diff --git a/test/C/src/modal_models/ModalNestedReactions.lf b/test/C/src/modal_models/ModalNestedReactions.lf
index f42ad4573f..be7d19fe7c 100644
--- a/test/C/src/modal_models/ModalNestedReactions.lf
+++ b/test/C/src/modal_models/ModalNestedReactions.lf
@@ -46,7 +46,8 @@ main reactor {
 
   reaction(stepper) -> counter.next {= lf_set(counter.next, true); =}  // Trigger
 
-  reaction(stepper) counter.count, counter.only_in_two {=  // Check
+  // Check
+  reaction(stepper) counter.count, counter.only_in_two {=
     printf("%d\n", counter.count->value);
 
     if (!counter.count->is_present) {
diff --git a/test/C/src/modal_models/ModalStartupShutdown.lf b/test/C/src/modal_models/ModalStartupShutdown.lf
index 389856c9e7..3a93cebfdd 100644
--- a/test/C/src/modal_models/ModalStartupShutdown.lf
+++ b/test/C/src/modal_models/ModalStartupShutdown.lf
@@ -88,7 +88,8 @@ reactor Modal {
     =}
   }
 
-  mode Five {  // Unreachable!
+  // Unreachable!
+  mode Five {
     reaction(startup) -> startup5 {=
       printf("Startup 5 at (%lld, %u).\n", lf_time_logical_elapsed(), lf_tag().microstep);
       lf_set(startup5, 1);
diff --git a/test/C/src/multiport/MultiportMutableInput.lf b/test/C/src/multiport/MultiportMutableInput.lf
index 187b4d47be..50de03cc4d 100644
--- a/test/C/src/multiport/MultiportMutableInput.lf
+++ b/test/C/src/multiport/MultiportMutableInput.lf
@@ -11,7 +11,8 @@ reactor Source {
   =}
 }
 
-reactor Print(scale: int = 1) {  // The scale parameter is just for testing.
+// The scale parameter is just for testing.
+reactor Print(scale: int = 1) {
   input[2] in: int
 
   reaction(in) {=
diff --git a/test/C/src/multiport/MultiportMutableInputArray.lf b/test/C/src/multiport/MultiportMutableInputArray.lf
index 07f8a97365..f38eb78af1 100644
--- a/test/C/src/multiport/MultiportMutableInputArray.lf
+++ b/test/C/src/multiport/MultiportMutableInputArray.lf
@@ -25,7 +25,8 @@ reactor Source {
   =}
 }
 
-reactor Print(scale: int = 1) {  // The scale parameter is just for testing.
+// The scale parameter is just for testing.
+reactor Print(scale: int = 1) {
   input[2] in: int[]
 
   reaction(in) {=
diff --git a/test/C/src/multiport/MultiportToBank.lf b/test/C/src/multiport/MultiportToBank.lf
index 4e0e89d05e..3249f3f61e 100644
--- a/test/C/src/multiport/MultiportToBank.lf
+++ b/test/C/src/multiport/MultiportToBank.lf
@@ -16,7 +16,9 @@ reactor Source(width: int = 2) {
 
   // Test also that multiple appearances of the same effect port do not result in multiple
   // allocations of memory for the port.
-  reaction(dummy) -> out {=  // Contents of the reactions does not matter (either could be empty)
+  reaction(dummy) ->
+  // Contents of the reactions does not matter (either could be empty)
+  out {=
     for(int i = 0; i < out_width; i++) {
         lf_set(out[i], i);
     }
diff --git a/test/C/src/multiport/MultiportToBankDouble.lf b/test/C/src/multiport/MultiportToBankDouble.lf
index baf752b338..0fd905379d 100644
--- a/test/C/src/multiport/MultiportToBankDouble.lf
+++ b/test/C/src/multiport/MultiportToBankDouble.lf
@@ -16,7 +16,9 @@ reactor Source {
 
   // Test also that multiple appearances of the same effect port do not result in multiple
   // allocations of memory for the port.
-  reaction(startup) -> out {=  // Contents of the reactions does not matter (either could be empty)
+  reaction(startup) ->
+  // Contents of the reactions does not matter (either could be empty)
+  out {=
     for(int i = 0; i < out_width; i++) {
         lf_set(out[i], i * 2);
     }
diff --git a/test/C/src/no_inlining/IntPrint.lf b/test/C/src/no_inlining/IntPrint.lf
index fd7639d45d..fd9f7d1e04 100644
--- a/test/C/src/no_inlining/IntPrint.lf
+++ b/test/C/src/no_inlining/IntPrint.lf
@@ -9,7 +9,8 @@ reactor Print {
   reaction(startup) -> out named send
 }
 
-reactor Check(expected: int = 42) {  // expected parameter is for testing.
+// expected parameter is for testing.
+reactor Check(expected: int = 42) {
   input in: int
 
   reaction(in) named receive
diff --git a/test/C/temp.txt b/test/C/temp.txt
new file mode 100644
index 0000000000..6e6a4106e0
--- /dev/null
+++ b/test/C/temp.txt
@@ -0,0 +1,124 @@
+Federate DistributedStop in Federation ID 'f4c5b423c156433c8b908f3c6595eb9aafd814168075d202'
+#### Launching the federate federate__sender.
+#### Launching the federate federate__receiver.
+#### Bringing the RTI back to foreground so it can receive Control-C.
+RTI -i ${FEDERATION_ID} -n 2 -c init exchanges-per-interval 10
+Federation ID for executable /home/peter/vscode-lingua-franca/lingua-franca/test/C/fed-gen/DistributedStop/bin/federate__sender: f4c5b423c156433c8b908f3c6595eb9aafd814168075d202
+DEBUG: _lf_new_token: Allocated memory for token: 0x55d77b60dab0
+DEBUG: _lf_new_token: Allocated memory for token: 0x55d77b60dec0
+DEBUG: Scheduler: Initializing with 3 workers
+DEBUG: Scheduler: Max reaction level: 2
+DEBUG: Scheduler: Initialized vector of reactions for level 0 with size 1
+DEBUG: Scheduler: Initialized vector of reactions for level 1 with size 2
+DEBUG: Scheduler: Initialized vector of reactions for level 2 with size 1
+Federate 0: LOG: Connecting to the RTI.
+Federate 0: LOG: Connected to an RTI. Sending federation ID for authentication.
+Federate 0: DEBUG: Waiting for response to federation ID from the RTI.
+Federate 0: LOG: Received acknowledgment from the RTI.
+Federate 0: Connected to RTI at localhost:15045.
+Federate 0: DEBUG: Physical time: 1686279449775465785. Elapsed: -7537092587079310023. Offset: 0
+Federate 0: DEBUG: Start time: 1686279449775465785ns
+---- Start execution at time Thu Jun  8 19:57:29 2023
+---- plus 775465785 nanoseconds.
+Federate 0: ---- Using 3 workers.
+Federate 0: DEBUG: Scheduler: Initializing with 3 workers
+Federate 0: DEBUG: Synchronizing with other federates.
+Federate 0: DEBUG: Physical time: 1686279449775522231. Elapsed: 56446. Offset: 0
+Federate 0: DEBUG: Sending time 1686279449775522231 to the RTI.
+Federate 0: DEBUG: Read 9 bytes.
+Federate 0: Starting timestamp is: 1686279450818001739.
+Federate 0: DEBUG: Physical time: 1686279449818147343. Elapsed: 42681558. Offset: 0
+Federate 0: LOG: Current physical time is: 1686279449818147343.
+Federate 0: DEBUG: Scheduler: Enqueing reaction federate__sender.sender reaction 0, which has level 0.
+Federate 0: DEBUG: Scheduler: Trying to lock the mutex for level 0.
+Federate 0: DEBUG: Scheduler: Locked the mutex for level 0.
+Federate 0: DEBUG: Scheduler: Accessing triggered reactions at the level 0 with index 0.
+Federate 0: DEBUG: Scheduler: Index for level 0 is at 0.
+Federate 0: LOG: Waiting for start time 1686279450818001739 plus STA 0.
+Federate 0: DEBUG: -------- Waiting until physical time matches logical time 1686279450818001739
+Federate 0: DEBUG: Physical time: 1686279449818230780. Elapsed: -999770959. Offset: 0
+Federate 0: DEBUG: -------- Clock offset is 0 ns.
+Federate 0: DEBUG: -------- Waiting 999770959 ns for physical time to match logical time 0.
+Federate 0: DEBUG: Physical time: 1686279450818067383. Elapsed: 65644. Offset: 0
+Federate 0: DEBUG: Done waiting for start time 1686279450818001739.
+Federate 0: DEBUG: Physical time: 1686279450818079496. Elapsed: 77757. Offset: 0
+Federate 0: DEBUG: Physical time is ahead of current time by 77757. This should be small.
+Federate 0: DEBUG: Checking NET to see whether it should be bounded by physical time. Min delay from physical action: -9223372036854775808.
+Federate 0: DEBUG: Sending tag (0, 0) to the RTI.
+Federate 0: LOG: Sent next event tag (NET) (0, 0) to RTI.
+Federate 0: DEBUG: Not waiting for reply to NET (0, 0) because I have no upstream federates.
+Federate 0: DEBUG: Executing output control reactions.
+Federate 0: LOG: Starting 3 worker threads.
+Federate 0: DEBUG: Waiting for worker threads to exit.
+Federate 0: DEBUG: Number of threads: 3.
+Federate 0: LOG: Worker thread 0 started.
+Federate 0: DEBUG: Scheduler: Worker 0 popping reaction with level 0, index for level: 0.
+Federate 0: DEBUG: Worker 0: Got from scheduler reaction federate__sender.sender reaction 0: level: 0, is control reaction: 0, chain ID: 1, and deadline -9223372036854775808.
+Federate 0: LOG: Worker 0: Invoking reaction federate__sender.sender reaction 0 at elapsed tag (0, 0).
+Federate 0: DEBUG: _lf_replace_template_token: template: 0x55d77b60d5e0 newtoken: 0x55d77b60dab0.
+Federate 0: DEBUG: _lf_replace_template_token: Incremented ref_count of 0x55d77b60dab0 to 2.
+Federate 0: Sending 42 at (0, 0).
+Federate 0: DEBUG: _lf_schedule: scheduling trigger 0x55d77b60d910 with delay 0 and token (nil).
+Federate 0: DEBUG: _lf_schedule: current_tag.time = 168627Federation ID for executable /home/peter/vscode-lingua-franca/lingua-franca/test/C/fed-gen/DistributedStop/bin/federate__receiver: f4c5b423c156433c8b908f3c6595eb9aafd814168075d202
+DEBUG: _lf_new_token: Allocated memory for token: 0x55c15e3ebc00
+DEBUG: Scheduler: Initializing with 3 workers
+DEBUG: Scheduler: Max reaction level: 2
+DEBUG: Scheduler: Initialized vector of reactions for level 0 with size 1
+DEBUG: Scheduler: Initialized vector of reactions for level 1 with size 1
+DEBUG: Scheduler: Initialized vector of reactions for level 2 with size 1
+Federate 1: LOG: Connecting to the RTI.
+Federate 1: LOG: Connected to an RTI. Sending federation ID for authentication.
+Federate 1: DEBUG: Waiting for response to federation ID from the RTI.
+Federate 1: LOG: Received acknowledgment from the RTI.
+Federate 1: Connected to RTI at localhost:15045.
+Federate 1: DEBUG: Physical time: 1686279449817891932. Elapsed: -7537092587036883876. Offset: 0
+Federate 1: DEBUG: Start time: 1686279449817891932ns
+---- Start execution at time Thu Jun  8 19:57:29 2023
+---- plus 817891932 nanoseconds.
+Federate 1: ---- Using 3 workers.
+Federate 1: DEBUG: Scheduler: Initializing with 3 workers
+Federate 1: DEBUG: Synchronizing with other federates.
+Federate 1: DEBUG: Physical time: 1686279449818001739. Elapsed: 109807. Offset: 0
+Federate 1: DEBUG: Sending time 1686279449818001739 to the RTI.
+Federate 1: DEBUG: Read 9 bytes.
+Federate 1: Starting timestamp is: 1686279450818001739.
+Federate 1: DEBUG: Physical time: 1686279449818123568. Elapsed: 231636. Offset: 0
+Federate 1: LOG: Current physical time is: 1686279449818123568.
+Federate 1: LOG: Waiting for start time 1686279450818001739 plus STA 0.
+Federate 1: DEBUG: -------- Waiting until physical time matches logical time 1686279450818001739
+Federate 1: DEBUG: Physical time: 1686279449818218526. Elapsed: -999783213. Offset: 0
+Federate 1: DEBUG: -------- Clock offset is 0 ns.
+Federate 1: DEBUG: -------- Waiting 999783213 ns for physical time to match logical time 0.
+Federate 1: DEBUG: Physical time: 1686279450818074676. Elapsed: 72937. Offset: 0
+Federate 1: DEBUG: Done waiting for start time 1686279450818001739.
+Federate 1: DEBUG: Physical time: 1686279450818083933. Elapsed: 82194. Offset: 0
+Federate 1: DEBUG: Physical time is ahead of current time by 82194. This should be small.
+Federate 1: DEBUG: Checking NET to see whether it should be bounded by physical time. Min delay from physical action: -9223372036854775808.
+Federate 1: DEBUG: Sending tag (0, 0) to the RTI.
+Federate 1: LOG: Sent next event tag (NET) (0, 0) to RTI.
+Federate 1: DEBUG: Waiting for a TAG from the RTI.
+Federate 1: LOG: At tag (0, 0), received Provisional Tag Advance Grant (PTAG): (0, 0).
+Federate 1: LOG: Starting 3 worker threads.
+Federate 1: DEBUG: Waiting for worker threads to exit.
+Federate 1: DEBUG: Number of threads: 3.
+Federate 1: LOG: Worker thread 0 started.
+Federate 1: DEBUG: Worker 0 is out of ready reactions.
+Federate 1: DEBUG: Scheduler: Worker 0 is trying to acquire the scheduling semaphore.
+Federate 1: LOG: Worker thread 1 started.
+Federate 1: DEBUG: Worker 1 is out of ready reactions.
+Federate 1: DEBUG: Scheduler: Worker 1 is trying to acquire the scheduling semaphore.
+Federate 1: LOG: Worker thread 2 started.
+Federate 1: DEBUG: Worker 2 is out of ready reactions.
+Federate 1: DEBUG: Scheduler: Worker 2 is the last idle thread.
+Federate 1: DEBUG: Receiving message to port 0 of length 4.
+Federate 1: DEBUG: Physical time: 1686279450861618465. Elapsed: 43616726. Offset: 0
+Federate 1: LOG: Received message with tag: (0, 0), Current tag: (0, 0).
+Federate 1: DEBUG: _lf_new_token: Allocated memory for token: 0x7f1664000ce0
+Federate 1: DEBUG: Updating the last known status tag of port 0 to (0, 0).
+Federate 1: LOG: Inserting reactions directly at tag (0, 0). Intended tag: (0, 0).
+Federate 1: DEBUG: _lf_replace_template_token: template: 0x55c15e3eba68 newtoken: 0x7f1664000ce0.
+Federate 1: DEBUG: _lf_done_using: token = 0x55c15e3ebc00, ref_count = 1.
+Federate 1: DEBUG: _lf_free_token: Putting token on the recycling bin: 0x55c15e3ebc00
+FedeKilling federate 66286.
+Killing federate 66288.
+#### Killing RTI 66280.
diff --git a/test/C/trace_svg.html b/test/C/trace_svg.html
new file mode 100644
index 0000000000..f2ceb2f918
--- /dev/null
+++ b/test/C/trace_svg.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html>
+<body>
+
+<svg width="800" height="696">
+ <style>     line {         stroke: black;         stroke-width: 2;     }     .ABS {stroke: #d9dd1f; fill: #d9dd1f; }     .LTC { stroke: #073b4c; fill: #073b4c;}     .T_MSG { stroke: #ef476f; fill: #ef476f}     .NET { stroke: #118ab2; fill: #118ab2}     .PTAG { stroke: #06d6a0; fill: #06d6a0}     .TAG { stroke: #08a578; fill: #08a578}     .TIMESTAMP { stroke: grey; fill: grey }     .FED_ID {stroke: #80DD99; fill: #80DD99 }     .ADV {stroke-linecap="round" ; stroke: "red" ; fill: "red"}     text {         font-size: smaller;         font-family: sans-serif;     }     text.time {fill: #074936; } </style> 
+	<!-- RTI Actor and line -->
+	<line x1="100" y1="25" x2="100" y2="696"/>
+	<circle cx="100" cy="25" r="20" stroke="black" stroke-width="2" fill="white"/>
+	<text x="85" y="30" fill="black">RTI</text>
+
+	<!-- Federate 1: federate__receiver Actor and line -->
+	<line x1="300" y1="25" x2="300" y2="696"/>
+	<circle cx="300" cy="25" r="20" stroke="black" stroke-width="2" fill="white"/>
+	<text x="295" y="30" fill="black">federate__receiver</text>
+
+	<!-- Federate 0: federate__sender Actor and line -->
+	<line x1="500" y1="25" x2="500" y2="696"/>
+	<circle cx="500" cy="25" r="20" stroke="black" stroke-width="2" fill="white"/>
+	<text x="495" y="30" fill="black">federate__sender</text>
+
+	<!-- Draw interactions -->
+	<line x1="300" y1="75" x2="100" y2="96" class="FED_ID"/>
+	<path d="M100 96 L110 101 L110 91 Z" transform="rotate(-6)" transform-origin="100 96" class="FED_ID"/>
+	<text text-anchor="end" transform="translate(290, 70) rotate(-6)">FED_ID</text>
+	<text text-anchor="start" class="time" transform="translate(305, 80)">-1,041,305</text>
+	<text text-anchor="end" class="time" transform="translate(95, 101)">-1,041,279</text>
+	<line x1="100" y1="116" x2="300" y2="137" class="ACK"/>
+	<path d="M300 137 L290 142 L290 132 Z" transform="rotate(5)" transform-origin="300 137" class="ACK"/>
+	<text transform="translate(110, 111) rotate(5)" text-anchor="start">ACK</text>
+	<text text-anchor="end" class="time" transform="translate(95, 121)">-1,041,277</text>
+	<text text-anchor="start" class="time" transform="translate(305, 142)">-1,041,236</text>
+	<line x1="300" y1="158" x2="100" y2="245" class="TIMESTAMP"/>
+	<path d="M100 245 L110 250 L110 240 Z" transform="rotate(-24)" transform-origin="100 245" class="TIMESTAMP"/>
+	<text text-anchor="end" transform="translate(290, 153) rotate(-24)">TIMESTAMP(-1,041,185,840, 0)</text>
+	<text text-anchor="start" class="time" transform="translate(305, 163)">-1,041,181</text>
+	<line x1="500" y1="180" x2="100" y2="204" class="FED_ID"/>
+	<path d="M100 204 L110 209 L110 199 Z" transform="rotate(-4)" transform-origin="100 204" class="FED_ID"/>
+	<text text-anchor="end" transform="translate(490, 175) rotate(-4)">FED_ID</text>
+	<text text-anchor="start" class="time" transform="translate(505, 185)">-1,040,825</text>
+	<text text-anchor="end" class="time" transform="translate(95, 209)">-1,000,243</text>
+	<line x1="100" y1="224" x2="500" y2="266" class="ACK"/>
+	<path d="M500 266 L490 271 L490 261 Z" transform="rotate(5)" transform-origin="500 266" class="ACK"/>
+	<text transform="translate(110, 219) rotate(5)" text-anchor="start">ACK</text>
+	<text text-anchor="end" class="time" transform="translate(95, 229)">-1,000,241</text>
+	<text text-anchor="end" class="time" transform="translate(95, 250)">-1,000,221</text>
+	<text text-anchor="start" class="time" transform="translate(505, 271)">-1,000,187</text>
+	<line x1="500" y1="288" x2="100" y2="309" class="TIMESTAMP"/>
+	<path d="M100 309 L110 314 L110 304 Z" transform="rotate(-3)" transform-origin="100 309" class="TIMESTAMP"/>
+	<text text-anchor="end" transform="translate(490, 283) rotate(-3)">TIMESTAMP(-1,000,000,000, 0)</text>
+	<text text-anchor="start" class="time" transform="translate(505, 293)">-999,986</text>
+	<text text-anchor="end" class="time" transform="translate(95, 314)">-999,957</text>
+	<line x1="100" y1="329" x2="500" y2="371" class="TIMESTAMP"/>
+	<path d="M500 371 L490 376 L490 366 Z" transform="rotate(5)" transform-origin="500 371" class="TIMESTAMP"/>
+	<text transform="translate(110, 324) rotate(5)" text-anchor="start">TIMESTAMP(0, 0)</text>
+	<text text-anchor="end" class="time" transform="translate(95, 334)">-999,953</text>
+	<line x1="100" y1="350" x2="300" y2="391" class="TIMESTAMP"/>
+	<path d="M300 391 L290 396 L290 386 Z" transform="rotate(11)" transform-origin="300 391" class="TIMESTAMP"/>
+	<text transform="translate(110, 345) rotate(11)" text-anchor="start">TIMESTAMP(0, 0)</text>
+	<text text-anchor="end" class="time" transform="translate(95, 355)">-999,941</text>
+	<text text-anchor="start" class="time" transform="translate(505, 376)">-999,913</text>
+	<text text-anchor="start" class="time" transform="translate(305, 396)">-999,906</text>
+	<line x1="300" y1="416" x2="100" y2="477" class="NET"/>
+	<path d="M100 477 L110 482 L110 472 Z" transform="rotate(-17)" transform-origin="100 477" class="NET"/>
+	<text text-anchor="end" transform="translate(290, 411) rotate(-17)">NET(0, 0)</text>
+	<text text-anchor="start" class="time" transform="translate(305, 421)">87</text>
+	<line x1="500" y1="435" x2="100" y2="456" class="NET"/>
+	<path d="M100 456 L110 461 L110 451 Z" transform="rotate(-3)" transform-origin="100 456" class="NET"/>
+	<text text-anchor="end" transform="translate(490, 430) rotate(-3)">NET(0, 0)</text>
+	<text text-anchor="start" class="time" transform="translate(505, 440)">88</text>
+	<text text-anchor="end" class="time" transform="translate(95, 461)">136</text>
+	<text text-anchor="end" class="time" transform="translate(95, 482)">168</text>
+	<line x1="100" y1="498" x2="300" y2="539" class="PTAG"/>
+	<path d="M300 539 L290 544 L290 534 Z" transform="rotate(11)" transform-origin="300 539" class="PTAG"/>
+	<text transform="translate(110, 493) rotate(11)" text-anchor="start">PTAG(0, 0)</text>
+	<text text-anchor="end" class="time" transform="translate(95, 503)">182</text>
+	<line x1="100" y1="519" x2="500" y2="559" class="PTAG"/>
+	<path d="M500 559 L490 564 L490 554 Z" transform="rotate(5)" transform-origin="500 559" class="PTAG"/>
+	<text transform="translate(110, 514) rotate(5)" text-anchor="start">PTAG(0, 0)</text>
+	<text text-anchor="end" class="time" transform="translate(95, 524)">201</text>
+	<text text-anchor="start" class="time" transform="translate(305, 544)">208</text>
+	<text text-anchor="start" class="time" transform="translate(505, 564)">216</text>
+	<line x1="500" y1="581" x2="100" y2="605" class="T_MSG"/>
+	<path d="M100 605 L110 610 L110 600 Z" transform="rotate(-4)" transform-origin="100 605" class="T_MSG"/>
+	<text text-anchor="end" transform="translate(490, 576) rotate(-4)">T_MSG(0, 0)</text>
+	<text text-anchor="start" class="time" transform="translate(505, 586)">446</text>
+	<text text-anchor="end" class="time" transform="translate(95, 610)">43,615</text>
+	<line x1="100" y1="625" x2="300" y2="646" class="T_MSG"/>
+	<path d="M300 646 L290 651 L290 641 Z" transform="rotate(5)" transform-origin="300 646" class="T_MSG"/>
+	<text transform="translate(110, 620) rotate(5)" text-anchor="start">T_MSG(0, 0)</text>
+	<text text-anchor="end" class="time" transform="translate(95, 630)">43,618</text>
+	<text text-anchor="start" class="time" transform="translate(305, 651)">43,665</text>
+
+</svg>
+
+</body>
+</html>
diff --git a/test/Cpp/src/FloatLiteral.lf b/test/Cpp/src/FloatLiteral.lf
index 4f57e36caa..f66aacbb12 100644
--- a/test/Cpp/src/FloatLiteral.lf
+++ b/test/Cpp/src/FloatLiteral.lf
@@ -1,6 +1,7 @@
 target Cpp
 
-main reactor {  // This test verifies that floating-point literals are handled correctly.
+// This test verifies that floating-point literals are handled correctly.
+main reactor {
   state N: double = 6.0221409e+23
   state charge: double = -1.6021766E-19
   state minus_epsilon: double = -.01e0
diff --git a/test/Cpp/src/ManualDelayedReaction.lf b/test/Cpp/src/ManualDelayedReaction.lf
index f3b8991136..f1917be62f 100644
--- a/test/Cpp/src/ManualDelayedReaction.lf
+++ b/test/Cpp/src/ManualDelayedReaction.lf
@@ -1,6 +1,7 @@
 target Cpp
 
-reactor GeneratedDelay {  // That's the stuff that shall be generated for the after
+// That's the stuff that shall be generated for the after
+reactor GeneratedDelay {
   input y_in: int
   output y_out: int
   state y_state: int = 0
diff --git a/test/Cpp/src/NativeListsAndTimes.lf b/test/Cpp/src/NativeListsAndTimes.lf
index 59d0101087..7320f5acc5 100644
--- a/test/Cpp/src/NativeListsAndTimes.lf
+++ b/test/Cpp/src/NativeListsAndTimes.lf
@@ -1,6 +1,7 @@
 target Cpp
 
-reactor Foo(  // This test passes if it is successfully compiled into valid target code.
+// This test passes if it is successfully compiled into valid target code.
+reactor Foo(
   x: int = 0,
   y: time = 0,                // Units are missing but not required
   z = 1 msec,                 // Type is missing but not required
@@ -18,9 +19,7 @@ reactor Foo(  // This test passes if it is successfully compiled into valid targ
   timer toe(z)       // Implicit type time
   state baz = p      // Implicit type int[]
   state period = z   // Implicit type time
-  state times: std::vector<  // a list of lists
-    std::vector<{= reactor::Duration =}>
-  >{q, g}
+  state times: std::vector<std::vector<{= reactor::Duration =}>>{q, g}  // a list of lists
   state empty_list: int[] = {}
 
   reaction(tick) {=
diff --git a/test/Python/src/ActionWithNoReaction.lf b/test/Python/src/ActionWithNoReaction.lf
index a219377e6e..5e9456356d 100644
--- a/test/Python/src/ActionWithNoReaction.lf
+++ b/test/Python/src/ActionWithNoReaction.lf
@@ -10,7 +10,8 @@ reactor foo {
   output y
   logical action a
 
-  reaction(x) -> y, a {=  # reaction(a) {= =}
+  # reaction(a) {= =}
+  reaction(x) -> y, a {=
     y.set(2*x.value)
     a.schedule(MSEC(500))
   =}
diff --git a/test/Python/src/ArrayAsType.lf b/test/Python/src/ArrayAsType.lf
index de1490d332..554293a623 100644
--- a/test/Python/src/ArrayAsType.lf
+++ b/test/Python/src/ArrayAsType.lf
@@ -11,7 +11,8 @@ reactor Source {
   =}
 }
 
-reactor Print(scale = 1) {  # The scale parameter is just for testing.
+# The scale parameter is just for testing.
+reactor Print(scale = 1) {
   input _in
 
   reaction(_in) {=
diff --git a/test/Python/src/ArrayPrint.lf b/test/Python/src/ArrayPrint.lf
index f13d44c7bf..3d77584d1d 100644
--- a/test/Python/src/ArrayPrint.lf
+++ b/test/Python/src/ArrayPrint.lf
@@ -11,7 +11,8 @@ reactor Source {
   =}
 }
 
-reactor Print(scale = 1) {  # The scale parameter is just for testing.
+# The scale parameter is just for testing.
+reactor Print(scale = 1) {
   input _in
 
   reaction(_in) {=
diff --git a/test/Python/src/DelayArray.lf b/test/Python/src/DelayArray.lf
index b931821682..fd2c113c0f 100644
--- a/test/Python/src/DelayArray.lf
+++ b/test/Python/src/DelayArray.lf
@@ -24,7 +24,8 @@ reactor Source {
   =}
 }
 
-reactor Print(scale = 1) {  # The scale parameter is just for testing.
+# The scale parameter is just for testing.
+reactor Print(scale = 1) {
   input _in
 
   reaction(_in) {=
diff --git a/test/Python/src/DelayArrayWithAfter.lf b/test/Python/src/DelayArrayWithAfter.lf
index 1567074c22..a13dbe1c2d 100644
--- a/test/Python/src/DelayArrayWithAfter.lf
+++ b/test/Python/src/DelayArrayWithAfter.lf
@@ -17,7 +17,8 @@ reactor Source {
   =}
 }
 
-reactor Print(scale = 1) {  # The scale parameter is just for testing.
+# The scale parameter is just for testing.
+reactor Print(scale = 1) {
   input _in
   state iteration = 1
   state inputs_received = 0
diff --git a/test/Python/src/DelayStruct.lf b/test/Python/src/DelayStruct.lf
index 94d232011b..d02f43ce58 100644
--- a/test/Python/src/DelayStruct.lf
+++ b/test/Python/src/DelayStruct.lf
@@ -25,7 +25,8 @@ reactor Source {
   reaction(startup) -> out {= out.set(hello.hello("Earth", 42)) =}
 }
 
-reactor Print(expected = 42) {  # expected parameter is for testing.
+# expected parameter is for testing.
+reactor Print(expected = 42) {
   input _in
 
   reaction(_in) {=
diff --git a/test/Python/src/DelayStructWithAfter.lf b/test/Python/src/DelayStructWithAfter.lf
index b7d34f127a..4ea5827157 100644
--- a/test/Python/src/DelayStructWithAfter.lf
+++ b/test/Python/src/DelayStructWithAfter.lf
@@ -11,7 +11,8 @@ reactor Source {
   reaction(startup) -> out {= out.set(hello.hello("Earth", 42)) =}
 }
 
-reactor Print(expected = 42) {  # expected parameter is for testing.
+# expected parameter is for testing.
+reactor Print(expected = 42) {
   input _in
 
   reaction(_in) {=
diff --git a/test/Python/src/DelayStructWithAfterOverlapped.lf b/test/Python/src/DelayStructWithAfterOverlapped.lf
index ed9270de31..1137efeb22 100644
--- a/test/Python/src/DelayStructWithAfterOverlapped.lf
+++ b/test/Python/src/DelayStructWithAfterOverlapped.lf
@@ -18,7 +18,8 @@ reactor Source {
   =}
 }
 
-reactor Print {  # expected parameter is for testing.
+# expected parameter is for testing.
+reactor Print {
   input _in
   state s = 0
 
diff --git a/test/Python/src/FloatLiteral.lf b/test/Python/src/FloatLiteral.lf
index 8d1edd93f1..2f029996f4 100644
--- a/test/Python/src/FloatLiteral.lf
+++ b/test/Python/src/FloatLiteral.lf
@@ -1,6 +1,7 @@
 target Python
 
-main reactor {  # This test verifies that floating-point literals are handled correctly.
+# This test verifies that floating-point literals are handled correctly.
+main reactor {
   state N = 6.0221409e+23
   state charge = -1.6021766E-19
   state minus_epsilon = -.01e0
diff --git a/test/Python/src/ManualDelayedReaction.lf b/test/Python/src/ManualDelayedReaction.lf
index 573c588b67..645c58f6ea 100644
--- a/test/Python/src/ManualDelayedReaction.lf
+++ b/test/Python/src/ManualDelayedReaction.lf
@@ -5,7 +5,8 @@ target Python {
   keepalive: false
 }
 
-reactor GeneratedDelay {  # That's the stuff that shall be generated for the after
+# That's the stuff that shall be generated for the after
+reactor GeneratedDelay {
   input y_in
   output y_out
   state y_state = 0
diff --git a/test/Python/src/MethodsRecursive.lf b/test/Python/src/MethodsRecursive.lf
index a1fa182792..bc3cedb8cd 100644
--- a/test/Python/src/MethodsRecursive.lf
+++ b/test/Python/src/MethodsRecursive.lf
@@ -4,7 +4,8 @@ target Python
 main reactor {
   state foo = 2
 
-  method fib(n) {=  # Return the n-th Fibonacci number.
+  # Return the n-th Fibonacci number.
+  method fib(n) {=
     if n <= 1:
         return 1
     return self.add(self.fib(n-1), self.fib(n-2))
diff --git a/test/Python/src/NativeListsAndTimes.lf b/test/Python/src/NativeListsAndTimes.lf
index 775d074343..28a7d5c015 100644
--- a/test/Python/src/NativeListsAndTimes.lf
+++ b/test/Python/src/NativeListsAndTimes.lf
@@ -1,6 +1,7 @@
 target Python
 
-main reactor(  # This test passes if it is successfully compiled into valid target code.
+# This test passes if it is successfully compiled into valid target code.
+main reactor(
   x = 0,
   y = 0,             # Units are missing but not required
   z = 1 msec,        # Type is missing but not required
diff --git a/test/Python/src/SetArray.lf b/test/Python/src/SetArray.lf
index c27408647b..2e7e504836 100644
--- a/test/Python/src/SetArray.lf
+++ b/test/Python/src/SetArray.lf
@@ -8,7 +8,8 @@ reactor Source {
   reaction(startup) -> out {= out.set([0,1,2]) =}
 }
 
-reactor Print(scale = 1) {  # The scale parameter is just for testing.
+# The scale parameter is just for testing.
+reactor Print(scale = 1) {
   input _in
 
   reaction(_in) {=
diff --git a/test/Python/src/StructAsType.lf b/test/Python/src/StructAsType.lf
index cd200a86ff..a16831f641 100644
--- a/test/Python/src/StructAsType.lf
+++ b/test/Python/src/StructAsType.lf
@@ -13,7 +13,8 @@ reactor Source {
   =}
 }
 
-reactor Print(expected = 42) {  # expected parameter is for testing.
+# expected parameter is for testing.
+reactor Print(expected = 42) {
   input _in
 
   reaction(_in) {=
diff --git a/test/Python/src/StructAsTypeDirect.lf b/test/Python/src/StructAsTypeDirect.lf
index 9e44cc6f34..7b903272a8 100644
--- a/test/Python/src/StructAsTypeDirect.lf
+++ b/test/Python/src/StructAsTypeDirect.lf
@@ -16,7 +16,8 @@ reactor Source {
   =}
 }
 
-reactor Print(expected = 42) {  # expected parameter is for testing.
+# expected parameter is for testing.
+reactor Print(expected = 42) {
   input _in
 
   reaction(_in) {=
diff --git a/test/Python/src/StructPrint.lf b/test/Python/src/StructPrint.lf
index 191f72bc6d..e4303e1d09 100644
--- a/test/Python/src/StructPrint.lf
+++ b/test/Python/src/StructPrint.lf
@@ -12,7 +12,8 @@ reactor Print {
   reaction(startup) -> out {= out.set(hello.hello("Earth", 42)) =}
 }
 
-reactor Check(expected = 42) {  # expected parameter is for testing.
+# expected parameter is for testing.
+reactor Check(expected = 42) {
   input _in
 
   reaction(_in) {=
diff --git a/test/Python/src/StructScale.lf b/test/Python/src/StructScale.lf
index ce4a25bc67..fa650211d8 100644
--- a/test/Python/src/StructScale.lf
+++ b/test/Python/src/StructScale.lf
@@ -12,7 +12,8 @@ reactor Source {
   reaction(startup) -> out {= out.set(hello.hello("Earth", 42)) =}
 }
 
-reactor TestInput(expected = 42) {  # expected parameter is for testing.
+# expected parameter is for testing.
+reactor TestInput(expected = 42) {
   input _in
 
   reaction(_in) {=
diff --git a/test/Python/src/lib/ImportedAgain.lf b/test/Python/src/lib/ImportedAgain.lf
index 9371712337..cabbf73f0a 100644
--- a/test/Python/src/lib/ImportedAgain.lf
+++ b/test/Python/src/lib/ImportedAgain.lf
@@ -2,7 +2,8 @@
 # reactor definition.
 target Python
 
-reactor ImportedAgain {  # import Imported from "Imported.lf"
+# import Imported from "Imported.lf"
+reactor ImportedAgain {
   input x  # y = new Imported(); // FIXME: Address this bug
 
   reaction(x) {=
diff --git a/test/Python/src/modal_models/BanksCount3ModesComplex.lf b/test/Python/src/modal_models/BanksCount3ModesComplex.lf
index 97447dc0b5..af97eec07b 100644
--- a/test/Python/src/modal_models/BanksCount3ModesComplex.lf
+++ b/test/Python/src/modal_models/BanksCount3ModesComplex.lf
@@ -67,7 +67,8 @@ main reactor {
 
   counters.always, counters.mode1, counters.mode2, counters.never -> test.events
 
-  reaction(stepper) -> counters.next {=  # Trigger
+  # Trigger
+  reaction(stepper) -> counters.next {=
     for i in range(len(counters)):
         counters[i].next.set(True)
   =}
diff --git a/test/Python/src/modal_models/BanksCount3ModesSimple.lf b/test/Python/src/modal_models/BanksCount3ModesSimple.lf
index f36a82178a..503a5b99eb 100644
--- a/test/Python/src/modal_models/BanksCount3ModesSimple.lf
+++ b/test/Python/src/modal_models/BanksCount3ModesSimple.lf
@@ -24,7 +24,8 @@ main reactor {
 
   counters.count -> test.events
 
-  reaction(stepper) -> counters.next {=  # Trigger
+  # Trigger
+  reaction(stepper) -> counters.next {=
     for counter in counters:
         counter.next.set(True)
   =}
diff --git a/test/Python/src/modal_models/BanksModalStateReset.lf b/test/Python/src/modal_models/BanksModalStateReset.lf
index 65080b5da9..d127288e0b 100644
--- a/test/Python/src/modal_models/BanksModalStateReset.lf
+++ b/test/Python/src/modal_models/BanksModalStateReset.lf
@@ -45,7 +45,8 @@ main reactor {
   reset2.count2
     -> test.events
 
-  reaction(stepper) -> reset1.next {=  # Trigger mode change (separately because of #1278)
+  # Trigger mode change (separately because of #1278)
+  reaction(stepper) -> reset1.next {=
     for i in range(len(reset1)):
         reset1[i].next.set(True)
   =}
diff --git a/test/Python/src/modal_models/ConvertCaseTest.lf b/test/Python/src/modal_models/ConvertCaseTest.lf
index 85e6c6f5e9..b6723f12d8 100644
--- a/test/Python/src/modal_models/ConvertCaseTest.lf
+++ b/test/Python/src/modal_models/ConvertCaseTest.lf
@@ -107,7 +107,8 @@ main reactor {
 
   reset_processor.converted, history_processor.converted -> test.events
 
-  reaction(stepper) -> reset_processor.discard, history_processor.discard {=  # Trigger mode change
+  # Trigger mode change
+  reaction(stepper) -> reset_processor.discard, history_processor.discard {=
     reset_processor.discard.set(True)
     history_processor.discard.set(True)
   =}
diff --git a/test/Python/src/modal_models/Count3Modes.lf b/test/Python/src/modal_models/Count3Modes.lf
index 77fb09d1c0..5815c0bb99 100644
--- a/test/Python/src/modal_models/Count3Modes.lf
+++ b/test/Python/src/modal_models/Count3Modes.lf
@@ -38,7 +38,8 @@ main reactor {
 
   reaction(stepper) -> counter.next {= counter.next.set(True) =}  # Trigger
 
-  reaction(stepper) counter.count {=  # Check
+  # Check
+  reaction(stepper) counter.count {=
     print(f"{counter.count.value}")
 
     if counter.count.is_present is not True:
diff --git a/test/Python/src/modal_models/ModalCycleBreaker.lf b/test/Python/src/modal_models/ModalCycleBreaker.lf
index 97155b1534..f790373131 100644
--- a/test/Python/src/modal_models/ModalCycleBreaker.lf
+++ b/test/Python/src/modal_models/ModalCycleBreaker.lf
@@ -16,7 +16,8 @@ reactor Modal {
   input in2
   output out
 
-  mode Two {  # Defining reaction to in2 before in1 would cause cycle if no mode were present
+  # Defining reaction to in2 before in1 would cause cycle if no mode were present
+  mode Two {
     timer wait(150 msec, 1 sec)
     reaction(in2) {=  =}
 
diff --git a/test/Python/src/modal_models/ModalNestedReactions.lf b/test/Python/src/modal_models/ModalNestedReactions.lf
index 2a9dc780f0..82fbbd5275 100644
--- a/test/Python/src/modal_models/ModalNestedReactions.lf
+++ b/test/Python/src/modal_models/ModalNestedReactions.lf
@@ -46,7 +46,8 @@ main reactor {
 
   reaction(stepper) -> counter.next {= counter.next.set(True) =}  # Trigger
 
-  reaction(stepper) counter.count, counter.only_in_two {=  # Check
+  # Check
+  reaction(stepper) counter.count, counter.only_in_two {=
     print(counter.count.value)
 
     if counter.count.is_present is not True:
diff --git a/test/Python/src/modal_models/ModalStartupShutdown.lf b/test/Python/src/modal_models/ModalStartupShutdown.lf
index cd0770ef5f..f5210580d1 100644
--- a/test/Python/src/modal_models/ModalStartupShutdown.lf
+++ b/test/Python/src/modal_models/ModalStartupShutdown.lf
@@ -88,7 +88,8 @@ reactor Modal {
     =}
   }
 
-  mode Five {  # Unreachable!
+  # Unreachable!
+  mode Five {
     reaction(startup) -> startup5 {=
       print(f"Startup 5 at ({lf.time.logical_elapsed()}, {lf.tag().microstep}).")
       startup5.set(1)
diff --git a/test/Python/src/multiport/MultiportMutableInput.lf b/test/Python/src/multiport/MultiportMutableInput.lf
index a8e15b8bd6..bfc691d1c2 100644
--- a/test/Python/src/multiport/MultiportMutableInput.lf
+++ b/test/Python/src/multiport/MultiportMutableInput.lf
@@ -11,7 +11,8 @@ reactor Source {
   =}
 }
 
-reactor Print(scale = 1) {  # The scale parameter is just for testing.
+# The scale parameter is just for testing.
+reactor Print(scale = 1) {
   input[2] _in
 
   reaction(_in) {=
diff --git a/test/Python/src/multiport/MultiportMutableInputArray.lf b/test/Python/src/multiport/MultiportMutableInputArray.lf
index 9e6a7630de..a936910ddd 100644
--- a/test/Python/src/multiport/MultiportMutableInputArray.lf
+++ b/test/Python/src/multiport/MultiportMutableInputArray.lf
@@ -12,7 +12,8 @@ reactor Source {
   =}
 }
 
-reactor Print(scale = 1) {  # The scale parameter is just for testing.
+# The scale parameter is just for testing.
+reactor Print(scale = 1) {
   input[2] _in
 
   reaction(_in) {=
diff --git a/test/Rust/src/FloatLiteral.lf b/test/Rust/src/FloatLiteral.lf
index a0d61c9fdf..072e896779 100644
--- a/test/Rust/src/FloatLiteral.lf
+++ b/test/Rust/src/FloatLiteral.lf
@@ -1,6 +1,7 @@
 target Rust
 
-main reactor {  // This test verifies that floating-point literals are handled correctly.
+// This test verifies that floating-point literals are handled correctly.
+main reactor {
   state N: f64 = 6.0221409e+23
   state charge: f64 = -1.6021766E-19
   state minus_epsilon: f64 = -.01e0
diff --git a/test/Rust/src/NativeListsAndTimes.lf b/test/Rust/src/NativeListsAndTimes.lf
index 21c44e17d8..5d95f2fa07 100644
--- a/test/Rust/src/NativeListsAndTimes.lf
+++ b/test/Rust/src/NativeListsAndTimes.lf
@@ -1,6 +1,7 @@
 target Rust
 
-reactor Foo(  // This test passes if it is successfully compiled into valid target code.
+// This test passes if it is successfully compiled into valid target code.
+reactor Foo(
   x: i32 = 0,
   y: time = 0,  // Units are missing but not required
   z = 1 msec,  // Type is missing but not required
diff --git a/test/Rust/src/StructAsType.lf b/test/Rust/src/StructAsType.lf
index 93450959b5..38242be033 100644
--- a/test/Rust/src/StructAsType.lf
+++ b/test/Rust/src/StructAsType.lf
@@ -18,7 +18,8 @@ reactor Source {
   =}
 }
 
-reactor Print(expected: i32 = 42) {  // expected parameter is for testing.
+// expected parameter is for testing.
+reactor Print(expected: i32 = 42) {
   input inp: {= super::source::Hello =}
   state expected: i32 = expected
 
diff --git a/test/TypeScript/src/ArrayAsType.lf b/test/TypeScript/src/ArrayAsType.lf
index 45df34464c..fdeb482535 100644
--- a/test/TypeScript/src/ArrayAsType.lf
+++ b/test/TypeScript/src/ArrayAsType.lf
@@ -14,7 +14,8 @@ reactor Source {
   =}
 }
 
-reactor Print(scale: number = 1) {  // The scale parameter is just for testing.
+// The scale parameter is just for testing.
+reactor Print(scale: number = 1) {
   input x: {= Array<number> =}
 
   reaction(x) {=
diff --git a/test/TypeScript/src/ArrayPrint.lf b/test/TypeScript/src/ArrayPrint.lf
index 8eff86be03..f072536b91 100644
--- a/test/TypeScript/src/ArrayPrint.lf
+++ b/test/TypeScript/src/ArrayPrint.lf
@@ -14,7 +14,8 @@ reactor Source {
   =}
 }
 
-reactor Print(scale: number = 1) {  // The scale parameter is just for testing.
+// The scale parameter is just for testing.
+reactor Print(scale: number = 1) {
   input x: {= Array<number> =}
 
   reaction(x) {=
diff --git a/test/TypeScript/src/Deadline.lf b/test/TypeScript/src/Deadline.lf
index f83647dbf3..e6a6037090 100644
--- a/test/TypeScript/src/Deadline.lf
+++ b/test/TypeScript/src/Deadline.lf
@@ -4,7 +4,8 @@ target TypeScript {
   timeout: 4 sec
 }
 
-reactor Source(period: time = 2 sec) {  // run = "bin/Deadline -timeout 4 sec"
+// run = "bin/Deadline -timeout 4 sec"
+reactor Source(period: time = 2 sec) {
   output y: number
   timer t(0, period)
   state count: number = 0
diff --git a/test/TypeScript/src/FloatLiteral.lf b/test/TypeScript/src/FloatLiteral.lf
index 42c9edf35a..a7c57397d4 100644
--- a/test/TypeScript/src/FloatLiteral.lf
+++ b/test/TypeScript/src/FloatLiteral.lf
@@ -1,6 +1,7 @@
 target TypeScript
 
-main reactor {  // This test verifies that floating-point literals are handled correctly.
+// This test verifies that floating-point literals are handled correctly.
+main reactor {
   state N: number = 6.0221409e+23
   state charge: number = -1.6021766E-19
   state minus_epsilon: number = -.01e0
diff --git a/test/TypeScript/src/NativeListsAndTimes.lf b/test/TypeScript/src/NativeListsAndTimes.lf
index 3e28688c79..393d7873b9 100644
--- a/test/TypeScript/src/NativeListsAndTimes.lf
+++ b/test/TypeScript/src/NativeListsAndTimes.lf
@@ -1,6 +1,7 @@
 target TypeScript
 
-main reactor(  // This test passes if it is successfully compiled into valid target code.
+// This test passes if it is successfully compiled into valid target code.
+main reactor(
   x: number = 0,
   y: time = 0,               // Units are missing but not required
   z = 1 msec,                // Type is missing but not required
diff --git a/test/TypeScript/src/StructAsType.lf b/test/TypeScript/src/StructAsType.lf
index 117f760536..bef058e295 100644
--- a/test/TypeScript/src/StructAsType.lf
+++ b/test/TypeScript/src/StructAsType.lf
@@ -18,7 +18,8 @@ reactor Source {
   =}
 }
 
-reactor Print(expected: number = 42) {  // expected parameter is for testing.
+// expected parameter is for testing.
+reactor Print(expected: number = 42) {
   input x: hello_t
 
   reaction(x) {=
diff --git a/test/TypeScript/src/StructAsTypeDirect.lf b/test/TypeScript/src/StructAsTypeDirect.lf
index 70b8d4b681..a2e6425172 100644
--- a/test/TypeScript/src/StructAsTypeDirect.lf
+++ b/test/TypeScript/src/StructAsTypeDirect.lf
@@ -18,7 +18,8 @@ reactor Source {
   =}
 }
 
-reactor Print(expected: number = 42) {  // expected parameter is for testing.
+// expected parameter is for testing.
+reactor Print(expected: number = 42) {
   input x: hello_t
 
   reaction(x) {=
diff --git a/test/TypeScript/src/StructPrint.lf b/test/TypeScript/src/StructPrint.lf
index 4a79efb807..9268100161 100644
--- a/test/TypeScript/src/StructPrint.lf
+++ b/test/TypeScript/src/StructPrint.lf
@@ -17,7 +17,8 @@ reactor Source {
   =}
 }
 
-reactor Print(expected: number = 42) {  // expected parameter is for testing.
+// expected parameter is for testing.
+reactor Print(expected: number = 42) {
   input x: hello_t
 
   reaction(x) {=
diff --git a/test/TypeScript/src/TimeLimit.lf b/test/TypeScript/src/TimeLimit.lf
index 030879b594..c0b818c2e9 100644
--- a/test/TypeScript/src/TimeLimit.lf
+++ b/test/TypeScript/src/TimeLimit.lf
@@ -29,7 +29,8 @@ reactor Destination {
   =}
 }
 
-main reactor TimeLimit(period: time = 1 msec) {  // usecs take a little too long
+// usecs take a little too long
+main reactor TimeLimit(period: time = 1 msec) {
   timer stop(10 sec)
 
   c = new Clock(period = period)
diff --git a/test/TypeScript/src/multiport/MultiportMutableInput.lf b/test/TypeScript/src/multiport/MultiportMutableInput.lf
index bfab84c4a2..aad2281b3d 100644
--- a/test/TypeScript/src/multiport/MultiportMutableInput.lf
+++ b/test/TypeScript/src/multiport/MultiportMutableInput.lf
@@ -11,7 +11,8 @@ reactor Source {
   =}
 }
 
-reactor Print(scale: number = 1) {  // The scale parameter is just for testing.
+// The scale parameter is just for testing.
+reactor Print(scale: number = 1) {
   input[2] inp: number
 
   reaction(inp) {=
diff --git a/test/TypeScript/src/multiport/MultiportMutableInputArray.lf b/test/TypeScript/src/multiport/MultiportMutableInputArray.lf
index ab863f8f1d..3450885edf 100644
--- a/test/TypeScript/src/multiport/MultiportMutableInputArray.lf
+++ b/test/TypeScript/src/multiport/MultiportMutableInputArray.lf
@@ -25,7 +25,8 @@ reactor Source {
   =}
 }
 
-reactor Print(scale: number = 1) {  // The scale parameter is just for testing.
+// The scale parameter is just for testing.
+reactor Print(scale: number = 1) {
   input[2] inp: {= Array<number> =}
 
   reaction(inp) {=
diff --git a/test/TypeScript/src/multiport/MultiportToBankDouble.lf b/test/TypeScript/src/multiport/MultiportToBankDouble.lf
index 9f5ccf62ad..966fdf3b32 100644
--- a/test/TypeScript/src/multiport/MultiportToBankDouble.lf
+++ b/test/TypeScript/src/multiport/MultiportToBankDouble.lf
@@ -15,7 +15,9 @@ reactor Source {
 
   // Test also that multiple appearances of the same effect port do not result in multiple
   // allocations of memory for the port.
-  reaction(startup) -> out {=  // Contents of the reactions does not matter (either could be empty)
+  reaction(startup) ->
+  // Contents of the reactions does not matter (either could be empty)
+  out {=
     for (let i = 0; i < out.length; i++) {
         out[i] = i * 2;
     }

From 1dffb58b74ee25b1dc40a6883d354843c7ffbaa9 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Wed, 14 Jun 2023 12:46:43 -0700
Subject: [PATCH 0345/1114] Rename Utils -> Util.

---
 cli/lff/src/main/java/org/lflang/cli/Lff.java        | 12 ++++++------
 .../{FormattingUtils.java => FormattingUtil.java}    |  4 ++--
 .../main/java/org/lflang/ast/MalleableString.java    |  6 +++---
 .../ast/{ParsingUtils.java => ParsingUtil.java}      |  2 +-
 .../diagram/synthesis/LinguaFrancaSynthesis.java     |  6 +++---
 .../lflang/federated/generator/FedImportEmitter.java |  4 ++--
 .../lflang/federated/generator/FedMainEmitter.java   |  4 ++--
 .../federated/generator/FedReactorEmitter.java       |  4 ++--
 .../lflang/federated/generator/FedTargetEmitter.java |  4 ++--
 .../java/org/lflang/formatting2/LFFormatter.java     |  4 ++--
 .../test/java/org/lflang/tests/LfParsingUtil.java    |  4 ++--
 .../lflang/tests/compiler/FormattingUnitTests.java   |  4 ++--
 .../org/lflang/tests/compiler/RoundTripTests.java    | 10 +++++-----
 13 files changed, 34 insertions(+), 34 deletions(-)
 rename core/src/main/java/org/lflang/ast/{FormattingUtils.java => FormattingUtil.java} (98%)
 rename core/src/main/java/org/lflang/ast/{ParsingUtils.java => ParsingUtil.java} (98%)

diff --git a/cli/lff/src/main/java/org/lflang/cli/Lff.java b/cli/lff/src/main/java/org/lflang/cli/Lff.java
index adfb23bada..7d33c2419d 100644
--- a/cli/lff/src/main/java/org/lflang/cli/Lff.java
+++ b/cli/lff/src/main/java/org/lflang/cli/Lff.java
@@ -9,9 +9,9 @@
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.List;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.lflang.ast.FormattingUtils;
+import org.lflang.ast.FormattingUtil;
 import org.lflang.ast.IsEqual;
-import org.lflang.ast.ParsingUtils;
+import org.lflang.ast.ParsingUtil;
 import org.lflang.util.FileUtil;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
@@ -47,8 +47,8 @@ public class Lff extends CliBase {
   @Option(
       names = {"-w", "--wrap"},
       description = "Causes the formatter to line wrap the files to a" + " specified length.",
-      defaultValue = "" + FormattingUtils.DEFAULT_LINE_LENGTH,
-      fallbackValue = "" + FormattingUtils.DEFAULT_LINE_LENGTH)
+      defaultValue = "" + FormattingUtil.DEFAULT_LINE_LENGTH,
+      fallbackValue = "" + FormattingUtil.DEFAULT_LINE_LENGTH)
   private int lineLength;
 
   @Option(
@@ -175,10 +175,10 @@ private void formatSingleFile(Path path, Path inputRoot, Path outputRoot) {
     }
 
     final String formattedFileContents =
-        FormattingUtils.render(resource.getContents().get(0), lineLength);
+        FormattingUtil.render(resource.getContents().get(0), lineLength);
     if (!new IsEqual(resource.getContents().get(0))
         .doSwitch(
-            ParsingUtils.parseSourceAsIfInDirectory(path.getParent(), formattedFileContents))) {
+            ParsingUtil.parseSourceAsIfInDirectory(path.getParent(), formattedFileContents))) {
       reporter.printFatalErrorAndExit(
           "The formatter failed to produce output that is semantically equivalent to its input when"
               + " executed on the file "
diff --git a/core/src/main/java/org/lflang/ast/FormattingUtils.java b/core/src/main/java/org/lflang/ast/FormattingUtil.java
similarity index 98%
rename from core/src/main/java/org/lflang/ast/FormattingUtils.java
rename to core/src/main/java/org/lflang/ast/FormattingUtil.java
index 500edc465d..7eb7069ef2 100644
--- a/core/src/main/java/org/lflang/ast/FormattingUtils.java
+++ b/core/src/main/java/org/lflang/ast/FormattingUtil.java
@@ -18,7 +18,7 @@
  * @author Peter Donovan
  * @author Billy Bao
  */
-public class FormattingUtils {
+public class FormattingUtil {
   /**
    * The minimum number of columns that should be allotted to a comment. This is relevant in case of
    * high indentation/small wrapLength.
@@ -214,7 +214,7 @@ static boolean placeComment(
       String singleLineCommentPrefix,
       int startColumn) {
     if (comment.stream().allMatch(String::isBlank)) return true;
-    String wrapped = FormattingUtils.lineWrapComments(comment, width, singleLineCommentPrefix);
+    String wrapped = FormattingUtil.lineWrapComments(comment, width, singleLineCommentPrefix);
     if (keepCommentsOnSameLine && wrapped.lines().count() == 1 && !wrapped.startsWith("/**")) {
       int sum = 0;
       for (int j = 0; j < components.size(); j++) {
diff --git a/core/src/main/java/org/lflang/ast/MalleableString.java b/core/src/main/java/org/lflang/ast/MalleableString.java
index 3daff23e07..d4dff9dae7 100644
--- a/core/src/main/java/org/lflang/ast/MalleableString.java
+++ b/core/src/main/java/org/lflang/ast/MalleableString.java
@@ -276,7 +276,7 @@ public RenderResult render(
       int numCommentsDisplacedHere = 0;
       if (commentsFromChildren.stream().anyMatch(s -> !s.isEmpty())) {
         for (int i = 0; i < commentsFromChildren.size(); i++) {
-          if (!FormattingUtils.placeComment(
+          if (!FormattingUtil.placeComment(
               commentsFromChildren.get(i),
               stringComponents,
               i,
@@ -317,7 +317,7 @@ private int inlineCommentStartColumn(
         if (i > 0) minNonCommentWidth = Math.min(minNonCommentWidth, i);
       }
       for (int i : lineLengths) {
-        if (i < minNonCommentWidth + FormattingUtils.MAX_WHITESPACE_USED_FOR_ALIGNMENT) {
+        if (i < minNonCommentWidth + FormattingUtil.MAX_WHITESPACE_USED_FOR_ALIGNMENT) {
           maxNonIgnoredCommentWidth = Math.max(maxNonIgnoredCommentWidth, i);
           numIgnored--;
         }
@@ -438,7 +438,7 @@ public RenderResult render(
               codeMapTag,
               sourceEObject != null ? sourceEObject : enclosingEObject);
       String renderedComments =
-          FormattingUtils.lineWrapComments(
+          FormattingUtil.lineWrapComments(
               result.unplacedComments.toList(), width - indentation, singleLineCommentPrefix);
       return new RenderResult(
           this.comments.stream(),
diff --git a/core/src/main/java/org/lflang/ast/ParsingUtils.java b/core/src/main/java/org/lflang/ast/ParsingUtil.java
similarity index 98%
rename from core/src/main/java/org/lflang/ast/ParsingUtils.java
rename to core/src/main/java/org/lflang/ast/ParsingUtil.java
index caa0bb0174..6277db6234 100644
--- a/core/src/main/java/org/lflang/ast/ParsingUtils.java
+++ b/core/src/main/java/org/lflang/ast/ParsingUtil.java
@@ -11,7 +11,7 @@
 import org.lflang.LFStandaloneSetup;
 import org.lflang.lf.Model;
 
-public class ParsingUtils {
+public class ParsingUtil {
   public static Model parse(Path file) {
     // Source:
     // https://wiki.eclipse.org/Xtext/FAQ#How_do_I_load_my_model_in_a_standalone_Java_application_.3F
diff --git a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index 060e73507d..b26fea12a2 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -95,7 +95,7 @@
 import org.lflang.AttributeUtils;
 import org.lflang.InferredType;
 import org.lflang.ast.ASTUtils;
-import org.lflang.ast.FormattingUtils;
+import org.lflang.ast.FormattingUtil;
 import org.lflang.diagram.synthesis.action.CollapseAllReactorsAction;
 import org.lflang.diagram.synthesis.action.ExpandAllReactorsAction;
 import org.lflang.diagram.synthesis.action.FilterCycleAction;
@@ -1473,7 +1473,7 @@ private String createParameterLabel(ParameterInstance param) {
     if (param.getOverride() != null) {
       b.append(" = ");
       var init = param.getActualValue();
-      b.append(FormattingUtils.render(init));
+      b.append(FormattingUtil.render(init));
     }
     return b.toString();
   }
@@ -1504,7 +1504,7 @@ private String createStateVariableLabel(StateVar variable) {
       b.append(":").append(t.toOriginalText());
     }
     if (variable.getInit() != null) {
-      b.append(FormattingUtils.render(variable.getInit()));
+      b.append(FormattingUtil.render(variable.getInit()));
     }
     return b.toString();
   }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java
index baf13d6a0a..2e21534fc4 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java
@@ -5,7 +5,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.lflang.ast.FormattingUtils;
+import org.lflang.ast.FormattingUtil;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.lf.Import;
 import org.lflang.lf.Model;
@@ -49,7 +49,7 @@ String generateImports(FederateInstance federate, FedFileConfig fileConfig) {
                       .removeIf(importedReactor -> !federate.contains(importedReactor));
                   return new_import;
                 })
-            .map(FormattingUtils.renderer(federate.targetConfig.target))
+            .map(FormattingUtil.renderer(federate.targetConfig.target))
             .collect(Collectors.joining("\n")));
 
     return importStatements.getCode();
diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index 86ce4f02b9..31cb435e31 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -5,7 +5,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.lflang.ErrorReporter;
 import org.lflang.ast.ASTUtils;
-import org.lflang.ast.FormattingUtils;
+import org.lflang.ast.FormattingUtil;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.Variable;
 
@@ -28,7 +28,7 @@ String generateMainReactor(
           ASTUtils.allModes(originalMainReactor).stream().findFirst().get(),
           "Modes at the top level are not supported under federated execution.");
     }
-    var renderer = FormattingUtils.renderer(federate.targetConfig.target);
+    var renderer = FormattingUtil.renderer(federate.targetConfig.target);
 
     return String.join(
         "\n",
diff --git a/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java
index 69a6342486..f00d590f12 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java
@@ -1,7 +1,7 @@
 package org.lflang.federated.generator;
 
 import java.util.stream.Collectors;
-import org.lflang.ast.FormattingUtils;
+import org.lflang.ast.FormattingUtil;
 import org.lflang.lf.Model;
 
 public class FedReactorEmitter {
@@ -16,7 +16,7 @@ String generateReactorDefinitions(FederateInstance federate) {
     return ((Model) federate.instantiation.eContainer().eContainer())
         .getReactors().stream()
             .filter(federate::contains)
-            .map(FormattingUtils.renderer(federate.targetConfig.target))
+            .map(FormattingUtil.renderer(federate.targetConfig.target))
             .collect(Collectors.joining("\n"));
   }
 }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
index 402138f283..b411ff0a44 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
@@ -3,7 +3,7 @@
 import java.io.IOException;
 import org.lflang.ErrorReporter;
 import org.lflang.TargetProperty;
-import org.lflang.ast.FormattingUtils;
+import org.lflang.ast.FormattingUtil;
 import org.lflang.federated.extensions.FedTargetExtensionFactory;
 import org.lflang.federated.launcher.RtiConfig;
 import org.lflang.generator.LFGeneratorContext;
@@ -27,7 +27,7 @@ String generateTarget(
         .initializeTargetConfig(
             context, numOfFederates, federate, fileConfig, errorReporter, rtiConfig);
 
-    return FormattingUtils.renderer(federate.targetConfig.target)
+    return FormattingUtil.renderer(federate.targetConfig.target)
         .apply(
             TargetProperty.extractTargetDecl(federate.targetConfig.target, federate.targetConfig));
   }
diff --git a/core/src/main/java/org/lflang/formatting2/LFFormatter.java b/core/src/main/java/org/lflang/formatting2/LFFormatter.java
index 7df4053eef..4d7c511b76 100644
--- a/core/src/main/java/org/lflang/formatting2/LFFormatter.java
+++ b/core/src/main/java/org/lflang/formatting2/LFFormatter.java
@@ -15,7 +15,7 @@
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
-import org.lflang.ast.FormattingUtils;
+import org.lflang.ast.FormattingUtil;
 
 public class LFFormatter implements IFormatter2 {
 
@@ -41,6 +41,6 @@ public List<ITextReplacement> format(FormatterRequest request) {
             request.getTextRegionAccess(),
             documentRegion.getOffset(),
             documentRegion.getLength(),
-            FormattingUtils.render(documentContents.get(0))));
+            FormattingUtil.render(documentContents.get(0))));
   }
 }
diff --git a/core/src/test/java/org/lflang/tests/LfParsingUtil.java b/core/src/test/java/org/lflang/tests/LfParsingUtil.java
index 6f00d61129..d677195275 100644
--- a/core/src/test/java/org/lflang/tests/LfParsingUtil.java
+++ b/core/src/test/java/org/lflang/tests/LfParsingUtil.java
@@ -1,7 +1,7 @@
 package org.lflang.tests;
 
 import org.junit.jupiter.api.Assertions;
-import org.lflang.ast.ParsingUtils;
+import org.lflang.ast.ParsingUtil;
 import org.lflang.lf.Model;
 
 /**
@@ -11,7 +11,7 @@ public class LfParsingUtil {
 
   /** Parse the given file, asserts that there are no parsing errors. */
   public static Model parseValidModel(String fileName, String reformattedTestCase) {
-    Model resultingModel = ParsingUtils.parse(reformattedTestCase);
+    Model resultingModel = ParsingUtil.parse(reformattedTestCase);
     checkValid(fileName, resultingModel);
     return resultingModel;
   }
diff --git a/core/src/test/java/org/lflang/tests/compiler/FormattingUnitTests.java b/core/src/test/java/org/lflang/tests/compiler/FormattingUnitTests.java
index 96cca6b559..67114894ea 100644
--- a/core/src/test/java/org/lflang/tests/compiler/FormattingUnitTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/FormattingUnitTests.java
@@ -5,7 +5,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.lflang.ast.FormattingUtils;
+import org.lflang.ast.FormattingUtil;
 import org.lflang.lf.Model;
 import org.lflang.tests.LFInjectorProvider;
 import org.lflang.tests.LfParsingUtil;
@@ -98,7 +98,7 @@ private void assertIsFormatted(String input) {
 
   private void assertFormatsTo(String input, String expectedOutput) {
     Model inputModel = LfParsingUtil.parseValidModel("test input", input);
-    String formattedString = FormattingUtils.render(inputModel);
+    String formattedString = FormattingUtil.render(inputModel);
     Assertions.assertEquals(
         expectedOutput, formattedString, "Formatted output is different from what was expected");
   }
diff --git a/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java b/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
index 9987ead64d..d55cc6fad3 100644
--- a/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
@@ -12,9 +12,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.lflang.Target;
-import org.lflang.ast.FormattingUtils;
+import org.lflang.ast.FormattingUtil;
 import org.lflang.ast.IsEqual;
-import org.lflang.ast.ParsingUtils;
+import org.lflang.ast.ParsingUtil;
 import org.lflang.lf.Model;
 import org.lflang.tests.LFInjectorProvider;
 import org.lflang.tests.LFTest;
@@ -42,14 +42,14 @@ public void roundTripTest() {
   }
 
   private void run(Path file) throws Exception {
-    Model originalModel = ParsingUtils.parse(file);
+    Model originalModel = ParsingUtil.parse(file);
     System.out.println(file);
     assertThat(originalModel.eResource().getErrors(), equalTo(emptyList()));
     // TODO: Check that the output is a fixed point
     final int smallLineLength = 20;
-    final String squishedTestCase = FormattingUtils.render(originalModel, smallLineLength);
+    final String squishedTestCase = FormattingUtil.render(originalModel, smallLineLength);
     final Model resultingModel =
-        ParsingUtils.parseSourceAsIfInDirectory(file.getParent(), squishedTestCase);
+        ParsingUtil.parseSourceAsIfInDirectory(file.getParent(), squishedTestCase);
     LfParsingUtil.checkValid("file in " + file.getParent(), resultingModel);
 
     assertThat(resultingModel.eResource().getErrors(), equalTo(emptyList()));

From 8b28c94d2ccbb2c2ab87e347b6e97941291f8af9 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Wed, 14 Jun 2023 13:48:22 -0700
Subject: [PATCH 0346/1114] Do not move multiline comments out.

If a code block begins with a multiline comment, the multiline comment
should still belong to the code block.
---
 .../main/java/org/lflang/ast/ASTUtils.java    | 23 +++++++++++++++++--
 core/src/main/java/org/lflang/ast/ToLf.java   |  8 ++-----
 core/src/main/java/org/lflang/ast/ToText.java |  2 +-
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 60b5538372..96e92f7430 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -47,6 +47,7 @@
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.TerminalRule;
+import org.eclipse.xtext.impl.ParserRuleImpl;
 import org.eclipse.xtext.nodemodel.ICompositeNode;
 import org.eclipse.xtext.nodemodel.INode;
 import org.eclipse.xtext.nodemodel.impl.HiddenLeafNode;
@@ -1660,9 +1661,27 @@ public static Stream<INode> getPrecedingCommentNodes(
 
   /** Return whether {@code node} is a comment. */
   public static boolean isComment(INode node) {
+    return isMultilineComment(node) || isSingleLineComment(node);
+  }
+
+  /** Return whether {@code node} is a multiline comment. */
+  public static boolean isMultilineComment(INode node) {
     return node instanceof HiddenLeafNode hlNode
-        && hlNode.getGrammarElement() instanceof TerminalRule tRule
-        && tRule.getName().endsWith("_COMMENT");
+            && hlNode.getGrammarElement() instanceof TerminalRule tRule
+            && tRule.getName().equals("ML_COMMENT");
+  }
+
+  /** Return whether {@code node} is a multiline comment. */
+  public static boolean isSingleLineComment(INode node) {
+    return node instanceof HiddenLeafNode hlNode
+            && hlNode.getGrammarElement() instanceof TerminalRule tRule
+            && tRule.getName().equals("SL_COMMENT");
+  }
+
+  public static boolean isInCode(INode node) {
+    return node.getParent() != null
+            && node.getParent().getGrammarElement().eContainer() instanceof ParserRuleImpl pri
+            && pri.getName().equals("Body");
   }
 
   /** Return true if the given node starts on the same line as the given other node. */
diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index bc5808e925..3468d5dab0 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -16,7 +16,6 @@
 import java.util.stream.Stream;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.impl.ParserRuleImpl;
 import org.eclipse.xtext.nodemodel.ICompositeNode;
 import org.eclipse.xtext.nodemodel.INode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
@@ -198,7 +197,7 @@ private static List<INode> getContainedComments(INode node) {
     boolean inSemanticallyInsignificantLeadingRubbish = true;
     for (INode child : node.getAsTreeIterable()) {
       if (!inSemanticallyInsignificantLeadingRubbish && ASTUtils.isComment(child)) {
-        ret.add(child);
+        if (!(ASTUtils.isMultilineComment(child) && ASTUtils.isInCode(child))) ret.add(child);
       } else if (!(child instanceof ICompositeNode) && !child.getText().isBlank()) {
         inSemanticallyInsignificantLeadingRubbish = false;
       }
@@ -206,10 +205,7 @@ private static List<INode> getContainedComments(INode node) {
           && (child.getText().contains("\n") || child.getText().contains("\r"))
           && !inSemanticallyInsignificantLeadingRubbish) {
         break;
-      } else if (child.getParent() != null
-          && child.getParent().getGrammarElement().eContainer() instanceof ParserRuleImpl pri
-          && pri.getName().equals("Body")
-          && !child.getText().isBlank()) {
+      } else if (ASTUtils.isInCode(node) && !child.getText().isBlank()) {
         break;
       }
     }
diff --git a/core/src/main/java/org/lflang/ast/ToText.java b/core/src/main/java/org/lflang/ast/ToText.java
index 103303f51e..f7c37fd98a 100644
--- a/core/src/main/java/org/lflang/ast/ToText.java
+++ b/core/src/main/java/org/lflang/ast/ToText.java
@@ -50,7 +50,7 @@ public String caseCode(Code code) {
       boolean started = false;
       for (ILeafNode leaf : node.getLeafNodes()) {
         if (!leaf.getText().equals("{=") && !leaf.getText().equals("=}")) {
-          var nothing = leaf.getText().isBlank() || ASTUtils.isComment(leaf);
+          var nothing = leaf.getText().isBlank() || ASTUtils.isSingleLineComment(leaf);
           if (!nothing || started || leaf.getText().startsWith("\n"))
             builder.append(leaf.getText());
           if ((leaf.getText().contains("\n") || (!nothing))) {

From de397f04d2a197ce9e0b8db008299ae55bfc3d00 Mon Sep 17 00:00:00 2001
From: Abhi Gundrala <gundralaa@berkeley.edu>
Date: Wed, 14 Jun 2023 13:54:16 -0700
Subject: [PATCH 0347/1114] for use in lf-pico

---
 core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index dcbe52521a..9c87d4047a 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -141,7 +141,7 @@ CodeBuilder generateCMakeCode(
       cMakeCode.pr("  set(PICO_SDK_PATH $ENV{PICO_SDK_PATH})");
       cMakeCode.pr("else()");
       cMakeCode.pr("  message(\"Could not find SDK path in ENV\")");
-      cMakeCode.pr("  set(PICO_SDK_PATH ./pico-sdk)");
+      cMakeCode.pr("  set(PICO_SDK_PATH ./lib/pico-sdk)");
       cMakeCode.pr("endif()");
       cMakeCode.pr("message(PICO_SDK_PATH=\"${PICO_SDK_PATH}\")");
       cMakeCode.newLine();

From 8ac18cd2edcd0173d02369843d2cfc6bcb48c59a Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Wed, 14 Jun 2023 13:49:20 -0700
Subject: [PATCH 0348/1114] Add tests.

---
 .../test/java/org/lflang/cli/LffCliTest.java  | 102 ++++++++++++++++--
 1 file changed, 95 insertions(+), 7 deletions(-)

diff --git a/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java b/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
index 792681eda5..3334d7093c 100644
--- a/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
+++ b/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
@@ -32,6 +32,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.lflang.LocalStrings;
@@ -58,6 +59,90 @@ public class LffCliTest {
           reaction(startup) {=  =}
         }
         """;
+
+  private static final List<List<String>> TEST_CASES =
+      List.of(
+          List.of(
+              """
+                  target C
+                  reactor Test { // this is a test
+                  logical action a # this is an a
+                  output humbug: int
+                  reaction (a) -> /* moo */ humbug {=  // this is a humbug reaction
+                    /* it reacts like this*/ react react
+                  =}
+                  }
+                  """,
+              """
+                  target C
+
+                  // this is a test
+                  reactor Test {
+                    logical action a  // this is an a
+                    output humbug: int
+
+                    /** moo */
+                    // this is a humbug reaction
+                    reaction(a) -> humbug {= /* it reacts like this*/ react react =}
+                  }
+                  """),
+          List.of(
+              """
+                  target C
+                  // Documentation
+                   @icon("Variables.png")
+                   reactor Variables {}
+                  """,
+              """
+                  target C
+                  
+                  // Documentation
+                  @icon("Variables.png")
+                  reactor Variables {
+                  }
+                  """),
+          List.of(
+              """
+                  target C
+                  reactor Filter(period: int = 0, b: double[](0, 0)) {}
+                  main reactor {
+                  az_f = new Filter(
+                       period = 100,
+                       b = (0.229019233988375, 0.421510777305010)
+                   )
+                   }
+                   """,
+              """
+                  target C
+
+                  reactor Filter(period: int = 0, b: double[] = {0, 0}) {
+                  }
+
+                  main reactor {
+                    az_f = new Filter(period = 100, b = {0.229019233988375, 0.421510777305010})
+                  }
+                  """),
+          List.of(
+              """
+                  target Rust
+                  reactor Snake {  // q
+                  state grid: SnakeGrid ({= /* foo */ SnakeGrid::new(grid_side, &snake) =}); // note that this one borrows snake temporarily
+                  state grid2: SnakeGrid ({= // baz
+                  SnakeGrid::new(grid_side, &snake) =});
+                  }
+                  """,
+              """
+                  target Rust
+                  
+                  // q
+                  reactor Snake {
+                    // note that this one borrows snake temporarily
+                    state grid: SnakeGrid = {= /* foo */ SnakeGrid::new(grid_side, &snake) =}
+                    // baz
+                    state grid2: SnakeGrid = {= SnakeGrid::new(grid_side, &snake) =}
+                  }
+                  """));
+
   LffTestFixture lffTester = new LffTestFixture();
 
   @Test
@@ -86,13 +171,16 @@ public void testWrongCliArg() {
 
   @Test
   public void testFormatSingleFileInPlace(@TempDir Path tempDir) throws IOException {
-    dirBuilder(tempDir).file("src/File.lf", FILE_BEFORE_REFORMAT);
-
-    ExecutionResult result = lffTester.run(tempDir, "src/File.lf");
-
-    result.checkOk();
-
-    dirChecker(tempDir).checkContentsOf("src/File.lf", equalTo(FILE_AFTER_REFORMAT));
+    for (var pair : TEST_CASES) {
+      var before = pair.get(0);
+      var after = pair.get(1);
+      dirBuilder(tempDir).file("src/File.lf", before);
+      for (int i = 0; i < 2; i++) {
+        ExecutionResult result = lffTester.run(tempDir, "src/File.lf");
+        result.checkOk();
+        dirChecker(tempDir).checkContentsOf("src/File.lf", equalTo(after));
+      }
+    }
   }
 
   @Test

From 907196de56f5a2bfa5212019f18c3152b7dfa0eb Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Wed, 14 Jun 2023 13:57:27 -0700
Subject: [PATCH 0349/1114] Remove files accidentally committed.

---
 .../test/java/org/lflang/cli/LffCliTest.java  |  4 +--
 .../main/java/org/lflang/ast/ASTUtils.java    | 12 ++++----
 test/C/all.csv                                | 29 -------------------
 test/C/federate__receiver.csv                 | 11 -------
 test/C/federate__receiver_summary.csv         | 16 ----------
 test/C/federate__sender.csv                   | 20 -------------
 test/C/federate__sender_summary.csv           | 27 -----------------
 test/C/rti.csv                                | 15 ----------
 test/C/rti_summary.csv                        | 16 ----------
 9 files changed, 8 insertions(+), 142 deletions(-)
 delete mode 100644 test/C/all.csv
 delete mode 100644 test/C/federate__receiver.csv
 delete mode 100644 test/C/federate__receiver_summary.csv
 delete mode 100644 test/C/federate__sender.csv
 delete mode 100644 test/C/federate__sender_summary.csv
 delete mode 100644 test/C/rti.csv
 delete mode 100644 test/C/rti_summary.csv

diff --git a/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java b/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
index 3334d7093c..43c045919b 100644
--- a/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
+++ b/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
@@ -95,7 +95,7 @@ public class LffCliTest {
                   """,
               """
                   target C
-                  
+
                   // Documentation
                   @icon("Variables.png")
                   reactor Variables {
@@ -133,7 +133,7 @@ reactor Filter(period: int = 0, b: double[] = {0, 0}) {
                   """,
               """
                   target Rust
-                  
+
                   // q
                   reactor Snake {
                     // note that this one borrows snake temporarily
diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 96e92f7430..8b8269b8b6 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -1667,21 +1667,21 @@ public static boolean isComment(INode node) {
   /** Return whether {@code node} is a multiline comment. */
   public static boolean isMultilineComment(INode node) {
     return node instanceof HiddenLeafNode hlNode
-            && hlNode.getGrammarElement() instanceof TerminalRule tRule
-            && tRule.getName().equals("ML_COMMENT");
+        && hlNode.getGrammarElement() instanceof TerminalRule tRule
+        && tRule.getName().equals("ML_COMMENT");
   }
 
   /** Return whether {@code node} is a multiline comment. */
   public static boolean isSingleLineComment(INode node) {
     return node instanceof HiddenLeafNode hlNode
-            && hlNode.getGrammarElement() instanceof TerminalRule tRule
-            && tRule.getName().equals("SL_COMMENT");
+        && hlNode.getGrammarElement() instanceof TerminalRule tRule
+        && tRule.getName().equals("SL_COMMENT");
   }
 
   public static boolean isInCode(INode node) {
     return node.getParent() != null
-            && node.getParent().getGrammarElement().eContainer() instanceof ParserRuleImpl pri
-            && pri.getName().equals("Body");
+        && node.getParent().getGrammarElement().eContainer() instanceof ParserRuleImpl pri
+        && pri.getName().equals("Body");
   }
 
   /** Return true if the given node starts on the same line as the given other node. */
diff --git a/test/C/all.csv b/test/C/all.csv
deleted file mode 100644
index 4705d450d4..0000000000
--- a/test/C/all.csv
+++ /dev/null
@@ -1,29 +0,0 @@
-,event,self_id,partner_id,logical_time,microstep,physical_time,inout,x1,y1,arrow,x2,y2
-0,FED_ID,1,-1,-1686279803405901114,0,-1041305535,out,300,75,arrow,100,96
-1,FED_ID,-1,1,-1686279803405901114,0,-1041279256,in,100,96,marked,-1,-1
-2,ACK,-1,1,-1686279803405901114,0,-1041277413,out,100,116,arrow,300,137
-3,ACK,1,-1,-1686279803405901114,0,-1041236205,in,300,137,marked,-1,-1
-4,TIMESTAMP,1,-1,-1041185840,0,-1041181933,out,300,158,arrow,100,245
-5,FED_ID,0,-1,-1686279803405901114,0,-1040825162,out,500,180,arrow,100,204
-6,FED_ID,-1,0,-1686279803405901114,0,-1000243598,in,100,204,marked,-1,-1
-7,ACK,-1,0,-1686279803405901114,0,-1000241414,out,100,224,arrow,500,266
-8,TIMESTAMP,-1,1,-1041185840,0,-1000221006,in,100,245,marked,-1,-1
-9,ACK,0,-1,-1686279803405901114,0,-1000187212,in,500,266,marked,-1,-1
-10,TIMESTAMP,0,-1,-1000000000,0,-999986915,out,500,288,arrow,100,309
-11,TIMESTAMP,-1,0,-1000000000,0,-999957680,in,100,309,marked,-1,-1
-12,TIMESTAMP,-1,0,0,0,-999953903,out,100,329,arrow,500,371
-13,TIMESTAMP,-1,1,0,0,-999941831,out,100,350,arrow,300,391
-14,TIMESTAMP,0,-1,0,0,-999913577,in,500,371,marked,-1,-1
-15,TIMESTAMP,1,-1,0,0,-999906524,in,300,391,marked,-1,-1
-16,NET,1,-1,0,0,87819,out,300,416,arrow,100,477
-17,NET,0,-1,0,0,88491,out,500,435,arrow,100,456
-18,NET,-1,0,0,0,136240,in,100,456,marked,-1,-1
-19,NET,-1,1,0,0,168822,in,100,477,marked,-1,-1
-20,PTAG,-1,1,0,0,182147,out,100,498,arrow,300,539
-21,PTAG,-1,0,0,0,201463,out,100,519,arrow,500,559
-22,PTAG,1,-1,0,0,208607,in,300,539,marked,-1,-1
-23,PTAG,0,-1,0,0,216271,in,500,559,marked,-1,-1
-24,T_MSG,0,-1,0,0,446263,out,500,581,arrow,100,605
-25,T_MSG,-1,0,0,0,43615435,in,100,605,marked,-1,-1
-26,T_MSG,-1,1,0,0,43618230,out,100,625,arrow,300,646
-27,T_MSG,1,-1,0,0,43665168,in,300,646,marked,-1,-1
diff --git a/test/C/federate__receiver.csv b/test/C/federate__receiver.csv
deleted file mode 100644
index f6a261ca92..0000000000
--- a/test/C/federate__receiver.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-Event, Reactor, Source, Destination, Elapsed Logical Time, Microstep, Elapsed Physical Time, Trigger, Extra Delay
-Worker wait starts, NO REACTOR, 1, -1, 0, 0, 341276, NO TRIGGER, 0
-Worker wait starts, NO REACTOR, 2, -1, 0, 0, 376362, NO TRIGGER, 0
-Sending FED_ID, NO REACTOR, 1, -1, -1686279803405901114, 0, -1041305535, NO TRIGGER, 0
-Receiving ACK, NO REACTOR, 1, -1, -1686279803405901114, 0, -1041236205, NO TRIGGER, 0
-Sending TIMESTAMP, NO REACTOR, 1, -1, -1041185840, 0, -1041181933, NO TRIGGER, 0
-Receiving TIMESTAMP, NO REACTOR, 1, -1, 0, 0, -999906524, NO TRIGGER, 0
-Sending NET, NO REACTOR, 1, -1, 0, 0, 87819, NO TRIGGER, 0
-Receiving PTAG, NO REACTOR, 1, -1, 0, 0, 208607, NO TRIGGER, 0
-Worker wait starts, NO REACTOR, 0, -1, 0, 0, 326138, NO TRIGGER, 0
-Receiving TAGGED_MSG, NO REACTOR, 1, -1, 0, 0, 43665168, NO TRIGGER, 0
diff --git a/test/C/federate__receiver_summary.csv b/test/C/federate__receiver_summary.csv
deleted file mode 100644
index da8d04534b..0000000000
--- a/test/C/federate__receiver_summary.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-Start time:, 1686279803405901114
-End time:, 1686279803449566282
-Total time:, 43665168
-
-Total Event Occurrences
-Worker wait starts, 3
-Sending TIMESTAMP, 1
-Sending NET, 1
-Sending FED_ID, 1
-Receiving ACK, 1
-Receiving TIMESTAMP, 1
-Receiving PTAG, 1
-Receiving TAGGED_MSG, 1
-
-Reaction Executions
-Reactor, Reaction, Occurrences, Total Time, Pct Total Time, Avg Time, Max Time, Min Time
diff --git a/test/C/federate__sender.csv b/test/C/federate__sender.csv
deleted file mode 100644
index ea34698814..0000000000
--- a/test/C/federate__sender.csv
+++ /dev/null
@@ -1,20 +0,0 @@
-Event, Reactor, Source, Destination, Elapsed Logical Time, Microstep, Elapsed Physical Time, Trigger, Extra Delay
-Worker wait starts, NO REACTOR, 1, -1, 0, 0, 326829, NO TRIGGER, 0
-Worker wait starts, NO REACTOR, 2, -1, 0, 0, 377073, NO TRIGGER, 0
-Sending FED_ID, NO REACTOR, 0, -1, -1686279803405901114, 0, -1040825162, NO TRIGGER, 0
-Receiving ACK, NO REACTOR, 0, -1, -1686279803405901114, 0, -1000187212, NO TRIGGER, 0
-Sending TIMESTAMP, NO REACTOR, 0, -1, -1000000000, 0, -999986915, NO TRIGGER, 0
-Receiving TIMESTAMP, NO REACTOR, 0, -1, 0, 0, -999913577, NO TRIGGER, 0
-Schedule called, sender, 0, 0, 0, 0, -999848234, sender.t, 0
-Schedule called, sender, 0, 0, 0, 0, -999845519, sender.t, 1000
-Sending NET, NO REACTOR, 0, -1, 0, 0, 88491, NO TRIGGER, 0
-Receiving PTAG, NO REACTOR, 0, -1, 0, 0, 216271, NO TRIGGER, 0
-Reaction starts, sender, 0, 0, 0, 0, 274490, NO TRIGGER, 0
-Schedule called, sender, 0, 0, 0, 0, 411548, sender.act, 0
-Reaction ends, sender, 0, 0, 0, 0, 413973, NO TRIGGER, 0
-Worker wait starts, NO REACTOR, 0, -1, 0, 0, 429051, NO TRIGGER, 0
-Worker wait ends, NO REACTOR, 0, -1, 0, 0, 434481, NO TRIGGER, 0
-Reaction starts, ns_federate__receiver, 0, 0, 0, 0, 442847, NO TRIGGER, 0
-Sending TAGGED_MSG, NO REACTOR, 0, -1, 0, 0, 446263, NO TRIGGER, 0
-Reaction ends, ns_federate__receiver, 0, 0, 0, 0, 463346, NO TRIGGER, 0
-Worker wait starts, NO REACTOR, 0, -1, 0, 0, 469397, NO TRIGGER, 0
diff --git a/test/C/federate__sender_summary.csv b/test/C/federate__sender_summary.csv
deleted file mode 100644
index c3c8a72e1b..0000000000
--- a/test/C/federate__sender_summary.csv
+++ /dev/null
@@ -1,27 +0,0 @@
-Start time:, 1686279803405901114
-End time:, 1686279803406370511
-Total time:, 469397
-
-Total Event Occurrences
-Reaction starts, 2
-Reaction ends, 2
-Schedule called, 3
-Worker wait starts, 4
-Worker wait ends, 1
-Sending TIMESTAMP, 1
-Sending NET, 1
-Sending FED_ID, 1
-Sending TAGGED_MSG, 1
-Receiving ACK, 1
-Receiving TIMESTAMP, 1
-Receiving PTAG, 1
-
-Reaction Executions
-Reactor, Reaction, Occurrences, Total Time, Pct Total Time, Avg Time, Max Time, Min Time
-sender, 0, 1, 139483, 29.715358, 139483, 139483, 139483
-ns_federate__receiver, 0, 1, 20499, 4.367092, 20499, 20499, 20499
-
-Schedule calls
-Trigger, Occurrences
-sender.act, 1
-sender.t, 2
diff --git a/test/C/rti.csv b/test/C/rti.csv
deleted file mode 100644
index 8bd2112691..0000000000
--- a/test/C/rti.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-Event, Reactor, Source, Destination, Elapsed Logical Time, Microstep, Elapsed Physical Time, Trigger, Extra Delay
-Receiving FED_ID, NO REACTOR, -1, 1, -1686279803405901114, 0, -1041279256, NO TRIGGER, 0
-Sending ACK, NO REACTOR, -1, 1, -1686279803405901114, 0, -1041277413, NO TRIGGER, 0
-Receiving TIMESTAMP, NO REACTOR, -1, 1, -1041185840, 0, -1000221006, NO TRIGGER, 0
-Sending TIMESTAMP, NO REACTOR, -1, 1, 0, 0, -999941831, NO TRIGGER, 0
-Receiving NET, NO REACTOR, -1, 1, 0, 0, 168822, NO TRIGGER, 0
-Sending PTAG, NO REACTOR, -1, 1, 0, 0, 182147, NO TRIGGER, 0
-Sending TAGGED_MSG, NO REACTOR, -1, 1, 0, 0, 43618230, NO TRIGGER, 0
-Receiving FED_ID, NO REACTOR, -1, 0, -1686279803405901114, 0, -1000243598, NO TRIGGER, 0
-Sending ACK, NO REACTOR, -1, 0, -1686279803405901114, 0, -1000241414, NO TRIGGER, 0
-Receiving TIMESTAMP, NO REACTOR, -1, 0, -1000000000, 0, -999957680, NO TRIGGER, 0
-Sending TIMESTAMP, NO REACTOR, -1, 0, 0, 0, -999953903, NO TRIGGER, 0
-Receiving NET, NO REACTOR, -1, 0, 0, 0, 136240, NO TRIGGER, 0
-Sending PTAG, NO REACTOR, -1, 0, 0, 0, 201463, NO TRIGGER, 0
-Receiving TAGGED_MSG, NO REACTOR, -1, 0, 0, 0, 43615435, NO TRIGGER, 0
diff --git a/test/C/rti_summary.csv b/test/C/rti_summary.csv
deleted file mode 100644
index 31fcc3dc4a..0000000000
--- a/test/C/rti_summary.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-Start time:, 1686279803405901114
-End time:, 1686279803449519344
-Total time:, 43618230
-
-Total Event Occurrences
-Sending ACK, 2
-Sending TIMESTAMP, 2
-Sending PTAG, 2
-Sending TAGGED_MSG, 1
-Receiving TIMESTAMP, 2
-Receiving NET, 2
-Receiving FED_ID, 2
-Receiving TAGGED_MSG, 1
-
-Reaction Executions
-Reactor, Reaction, Occurrences, Total Time, Pct Total Time, Avg Time, Max Time, Min Time

From bb538e6f38cde4be9929e19254090c5841b3cb7a Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Wed, 14 Jun 2023 14:22:21 -0700
Subject: [PATCH 0350/1114] Try to pass formatting test on Windows.

I believe this is the CRLF/LF thing.
---
 core/src/main/java/org/lflang/ast/ToText.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ToText.java b/core/src/main/java/org/lflang/ast/ToText.java
index f7c37fd98a..c677f0730b 100644
--- a/core/src/main/java/org/lflang/ast/ToText.java
+++ b/core/src/main/java/org/lflang/ast/ToText.java
@@ -51,8 +51,10 @@ public String caseCode(Code code) {
       for (ILeafNode leaf : node.getLeafNodes()) {
         if (!leaf.getText().equals("{=") && !leaf.getText().equals("=}")) {
           var nothing = leaf.getText().isBlank() || ASTUtils.isSingleLineComment(leaf);
-          if (!nothing || started || leaf.getText().startsWith("\n"))
-            builder.append(leaf.getText());
+          if (!nothing
+              || started
+              || leaf.getText().startsWith("\n")
+              || leaf.getText().startsWith("\r")) builder.append(leaf.getText());
           if ((leaf.getText().contains("\n") || (!nothing))) {
             started = true;
           }

From bad3fa22de10566fe11c5220496b3f72b592e5bc Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Wed, 14 Jun 2023 17:04:50 -0700
Subject: [PATCH 0351/1114] Remove accidental check-in.

---
 test/C/temp.txt | 124 ------------------------------------------------
 1 file changed, 124 deletions(-)
 delete mode 100644 test/C/temp.txt

diff --git a/test/C/temp.txt b/test/C/temp.txt
deleted file mode 100644
index 6e6a4106e0..0000000000
--- a/test/C/temp.txt
+++ /dev/null
@@ -1,124 +0,0 @@
-Federate DistributedStop in Federation ID 'f4c5b423c156433c8b908f3c6595eb9aafd814168075d202'
-#### Launching the federate federate__sender.
-#### Launching the federate federate__receiver.
-#### Bringing the RTI back to foreground so it can receive Control-C.
-RTI -i ${FEDERATION_ID} -n 2 -c init exchanges-per-interval 10
-Federation ID for executable /home/peter/vscode-lingua-franca/lingua-franca/test/C/fed-gen/DistributedStop/bin/federate__sender: f4c5b423c156433c8b908f3c6595eb9aafd814168075d202
-DEBUG: _lf_new_token: Allocated memory for token: 0x55d77b60dab0
-DEBUG: _lf_new_token: Allocated memory for token: 0x55d77b60dec0
-DEBUG: Scheduler: Initializing with 3 workers
-DEBUG: Scheduler: Max reaction level: 2
-DEBUG: Scheduler: Initialized vector of reactions for level 0 with size 1
-DEBUG: Scheduler: Initialized vector of reactions for level 1 with size 2
-DEBUG: Scheduler: Initialized vector of reactions for level 2 with size 1
-Federate 0: LOG: Connecting to the RTI.
-Federate 0: LOG: Connected to an RTI. Sending federation ID for authentication.
-Federate 0: DEBUG: Waiting for response to federation ID from the RTI.
-Federate 0: LOG: Received acknowledgment from the RTI.
-Federate 0: Connected to RTI at localhost:15045.
-Federate 0: DEBUG: Physical time: 1686279449775465785. Elapsed: -7537092587079310023. Offset: 0
-Federate 0: DEBUG: Start time: 1686279449775465785ns
----- Start execution at time Thu Jun  8 19:57:29 2023
----- plus 775465785 nanoseconds.
-Federate 0: ---- Using 3 workers.
-Federate 0: DEBUG: Scheduler: Initializing with 3 workers
-Federate 0: DEBUG: Synchronizing with other federates.
-Federate 0: DEBUG: Physical time: 1686279449775522231. Elapsed: 56446. Offset: 0
-Federate 0: DEBUG: Sending time 1686279449775522231 to the RTI.
-Federate 0: DEBUG: Read 9 bytes.
-Federate 0: Starting timestamp is: 1686279450818001739.
-Federate 0: DEBUG: Physical time: 1686279449818147343. Elapsed: 42681558. Offset: 0
-Federate 0: LOG: Current physical time is: 1686279449818147343.
-Federate 0: DEBUG: Scheduler: Enqueing reaction federate__sender.sender reaction 0, which has level 0.
-Federate 0: DEBUG: Scheduler: Trying to lock the mutex for level 0.
-Federate 0: DEBUG: Scheduler: Locked the mutex for level 0.
-Federate 0: DEBUG: Scheduler: Accessing triggered reactions at the level 0 with index 0.
-Federate 0: DEBUG: Scheduler: Index for level 0 is at 0.
-Federate 0: LOG: Waiting for start time 1686279450818001739 plus STA 0.
-Federate 0: DEBUG: -------- Waiting until physical time matches logical time 1686279450818001739
-Federate 0: DEBUG: Physical time: 1686279449818230780. Elapsed: -999770959. Offset: 0
-Federate 0: DEBUG: -------- Clock offset is 0 ns.
-Federate 0: DEBUG: -------- Waiting 999770959 ns for physical time to match logical time 0.
-Federate 0: DEBUG: Physical time: 1686279450818067383. Elapsed: 65644. Offset: 0
-Federate 0: DEBUG: Done waiting for start time 1686279450818001739.
-Federate 0: DEBUG: Physical time: 1686279450818079496. Elapsed: 77757. Offset: 0
-Federate 0: DEBUG: Physical time is ahead of current time by 77757. This should be small.
-Federate 0: DEBUG: Checking NET to see whether it should be bounded by physical time. Min delay from physical action: -9223372036854775808.
-Federate 0: DEBUG: Sending tag (0, 0) to the RTI.
-Federate 0: LOG: Sent next event tag (NET) (0, 0) to RTI.
-Federate 0: DEBUG: Not waiting for reply to NET (0, 0) because I have no upstream federates.
-Federate 0: DEBUG: Executing output control reactions.
-Federate 0: LOG: Starting 3 worker threads.
-Federate 0: DEBUG: Waiting for worker threads to exit.
-Federate 0: DEBUG: Number of threads: 3.
-Federate 0: LOG: Worker thread 0 started.
-Federate 0: DEBUG: Scheduler: Worker 0 popping reaction with level 0, index for level: 0.
-Federate 0: DEBUG: Worker 0: Got from scheduler reaction federate__sender.sender reaction 0: level: 0, is control reaction: 0, chain ID: 1, and deadline -9223372036854775808.
-Federate 0: LOG: Worker 0: Invoking reaction federate__sender.sender reaction 0 at elapsed tag (0, 0).
-Federate 0: DEBUG: _lf_replace_template_token: template: 0x55d77b60d5e0 newtoken: 0x55d77b60dab0.
-Federate 0: DEBUG: _lf_replace_template_token: Incremented ref_count of 0x55d77b60dab0 to 2.
-Federate 0: Sending 42 at (0, 0).
-Federate 0: DEBUG: _lf_schedule: scheduling trigger 0x55d77b60d910 with delay 0 and token (nil).
-Federate 0: DEBUG: _lf_schedule: current_tag.time = 168627Federation ID for executable /home/peter/vscode-lingua-franca/lingua-franca/test/C/fed-gen/DistributedStop/bin/federate__receiver: f4c5b423c156433c8b908f3c6595eb9aafd814168075d202
-DEBUG: _lf_new_token: Allocated memory for token: 0x55c15e3ebc00
-DEBUG: Scheduler: Initializing with 3 workers
-DEBUG: Scheduler: Max reaction level: 2
-DEBUG: Scheduler: Initialized vector of reactions for level 0 with size 1
-DEBUG: Scheduler: Initialized vector of reactions for level 1 with size 1
-DEBUG: Scheduler: Initialized vector of reactions for level 2 with size 1
-Federate 1: LOG: Connecting to the RTI.
-Federate 1: LOG: Connected to an RTI. Sending federation ID for authentication.
-Federate 1: DEBUG: Waiting for response to federation ID from the RTI.
-Federate 1: LOG: Received acknowledgment from the RTI.
-Federate 1: Connected to RTI at localhost:15045.
-Federate 1: DEBUG: Physical time: 1686279449817891932. Elapsed: -7537092587036883876. Offset: 0
-Federate 1: DEBUG: Start time: 1686279449817891932ns
----- Start execution at time Thu Jun  8 19:57:29 2023
----- plus 817891932 nanoseconds.
-Federate 1: ---- Using 3 workers.
-Federate 1: DEBUG: Scheduler: Initializing with 3 workers
-Federate 1: DEBUG: Synchronizing with other federates.
-Federate 1: DEBUG: Physical time: 1686279449818001739. Elapsed: 109807. Offset: 0
-Federate 1: DEBUG: Sending time 1686279449818001739 to the RTI.
-Federate 1: DEBUG: Read 9 bytes.
-Federate 1: Starting timestamp is: 1686279450818001739.
-Federate 1: DEBUG: Physical time: 1686279449818123568. Elapsed: 231636. Offset: 0
-Federate 1: LOG: Current physical time is: 1686279449818123568.
-Federate 1: LOG: Waiting for start time 1686279450818001739 plus STA 0.
-Federate 1: DEBUG: -------- Waiting until physical time matches logical time 1686279450818001739
-Federate 1: DEBUG: Physical time: 1686279449818218526. Elapsed: -999783213. Offset: 0
-Federate 1: DEBUG: -------- Clock offset is 0 ns.
-Federate 1: DEBUG: -------- Waiting 999783213 ns for physical time to match logical time 0.
-Federate 1: DEBUG: Physical time: 1686279450818074676. Elapsed: 72937. Offset: 0
-Federate 1: DEBUG: Done waiting for start time 1686279450818001739.
-Federate 1: DEBUG: Physical time: 1686279450818083933. Elapsed: 82194. Offset: 0
-Federate 1: DEBUG: Physical time is ahead of current time by 82194. This should be small.
-Federate 1: DEBUG: Checking NET to see whether it should be bounded by physical time. Min delay from physical action: -9223372036854775808.
-Federate 1: DEBUG: Sending tag (0, 0) to the RTI.
-Federate 1: LOG: Sent next event tag (NET) (0, 0) to RTI.
-Federate 1: DEBUG: Waiting for a TAG from the RTI.
-Federate 1: LOG: At tag (0, 0), received Provisional Tag Advance Grant (PTAG): (0, 0).
-Federate 1: LOG: Starting 3 worker threads.
-Federate 1: DEBUG: Waiting for worker threads to exit.
-Federate 1: DEBUG: Number of threads: 3.
-Federate 1: LOG: Worker thread 0 started.
-Federate 1: DEBUG: Worker 0 is out of ready reactions.
-Federate 1: DEBUG: Scheduler: Worker 0 is trying to acquire the scheduling semaphore.
-Federate 1: LOG: Worker thread 1 started.
-Federate 1: DEBUG: Worker 1 is out of ready reactions.
-Federate 1: DEBUG: Scheduler: Worker 1 is trying to acquire the scheduling semaphore.
-Federate 1: LOG: Worker thread 2 started.
-Federate 1: DEBUG: Worker 2 is out of ready reactions.
-Federate 1: DEBUG: Scheduler: Worker 2 is the last idle thread.
-Federate 1: DEBUG: Receiving message to port 0 of length 4.
-Federate 1: DEBUG: Physical time: 1686279450861618465. Elapsed: 43616726. Offset: 0
-Federate 1: LOG: Received message with tag: (0, 0), Current tag: (0, 0).
-Federate 1: DEBUG: _lf_new_token: Allocated memory for token: 0x7f1664000ce0
-Federate 1: DEBUG: Updating the last known status tag of port 0 to (0, 0).
-Federate 1: LOG: Inserting reactions directly at tag (0, 0). Intended tag: (0, 0).
-Federate 1: DEBUG: _lf_replace_template_token: template: 0x55c15e3eba68 newtoken: 0x7f1664000ce0.
-Federate 1: DEBUG: _lf_done_using: token = 0x55c15e3ebc00, ref_count = 1.
-Federate 1: DEBUG: _lf_free_token: Putting token on the recycling bin: 0x55c15e3ebc00
-FedeKilling federate 66286.
-Killing federate 66288.
-#### Killing RTI 66280.

From 1dbe9402b95a57a9c4772975e5ba09138bc16c1b Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Wed, 14 Jun 2023 17:41:30 -0700
Subject: [PATCH 0352/1114] DistributedMultiport compiles and almost works.

In the beginning, several messages are dropped.
---
 .../org/lflang/federated/generator/FedASTUtils.java  | 12 ++++++++----
 .../org/lflang/federated/generator/FedGenerator.java |  7 +++++++
 .../lflang/federated/generator/FederateInstance.java |  4 +++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index fde1a32eaf..3b491a04ce 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -316,15 +316,19 @@ private static void addNetworkReceiverReactor(
     // Establish references to the involved ports.
     sourceRef.setContainer(connection.getSourcePortInstance().getParent().getDefinition());
     sourceRef.setVariable(connection.getSourcePortInstance().getDefinition());
-    destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
-    destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
+    destRef.setContainer(
+        connection
+            .getDstFederate()
+            .networkPortToIndexer
+            .get(connection.getDestinationPortInstance()));
+    var v = LfFactory.eINSTANCE.createVariable();
+    v.setName("port" + connection.getDstChannel());
+    destRef.setVariable(v);
     instRef.setContainer(networkInstance);
     instRef.setVariable(out);
 
     out.setName("msg");
     out.setType(type);
-    out.setWidthSpec(
-        EcoreUtil.copy(connection.getDestinationPortInstance().getDefinition().getWidthSpec()));
     outRef.setVariable(out);
 
     // Add the output port at the receiver reactor as an effect
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 17839eaa4b..0ffa5e7b80 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -20,8 +20,10 @@
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.resource.XtextResourceSet;
@@ -512,10 +514,12 @@ private void insertIndexers(ReactorInstance mainInstance, Resource resource) {
         var indexer = indexer(child, input, resource);
         var count = 0;
         for (FederateInstance federate : federatesByInstantiation.get(child.getDefinition())) {
+          federate.networkReactors.add(indexer);
           var outerConnection = LfFactory.eINSTANCE.createConnection();
           var instantiation = LfFactory.eINSTANCE.createInstantiation();
           instantiation.setReactorClass(indexer);
           instantiation.setName(indexer.getName() + count++);
+          federate.networkPortToIndexer.put(input, instantiation);
           federate.networkHelperInstantiations.add(instantiation);
           outerConnection.getLeftPorts().add(varRefOf(instantiation, "port"));
           outerConnection.getRightPorts().add(varRefOf(child.getDefinition(), input.getName()));
@@ -534,11 +538,14 @@ private Reactor indexer(ReactorInstance reactorInstance, PortInstance input, Res
         FedASTUtils.addReactorDefinition(
             "_" + reactorInstance.getName() + input.getName(), resource);
     var output = LfFactory.eINSTANCE.createOutput();
+    output.setWidthSpec(EcoreUtil.copy(input.getDefinition().getWidthSpec()));
+    output.setType(EcoreUtil.copy(input.getDefinition().getType()));
     output.setName("port");
     indexer.getOutputs().add(output);
     for (int i = 0; i < (input.isMultiport() ? input.getWidth() : 1); i++) {
       var splitInput = LfFactory.eINSTANCE.createInput();
       splitInput.setName("port" + i);
+      splitInput.setType(EcoreUtil.copy(input.getDefinition().getType()));
       indexer.getInputs().add(splitInput);
     }
     var innerConnection = LfFactory.eINSTANCE.createConnection();
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index 5a9171c4e9..7728ea536e 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -76,7 +76,7 @@
  * @author Edward A. Lee
  * @author Soroush Bateni
  */
-public class FederateInstance { // why does this not extend ReactorInstance?
+public class FederateInstance {
 
   /**
    * Construct a new instance with the specified instantiation of of a top-level reactor. The
@@ -243,6 +243,8 @@ public Instantiation getInstantiation() {
    */
   public Map<PortInstance, Instantiation> networkPortToInstantiation = new HashMap<>();
 
+  public Map<PortInstance, Instantiation> networkPortToIndexer = new HashMap<>();
+
   /**
    * List of generated network connections (network input and outputs) that belong to this federate
    * instance.

From 5fd6baba22983875bb9c299ee06603b668121ed0 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Wed, 14 Jun 2023 19:27:42 -0700
Subject: [PATCH 0353/1114] Pass DistributedMultiport.

---
 core/src/main/resources/lib/c/reactor-c      | 2 +-
 test/C/src/federated/DistributedMultiport.lf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 0bcec558d5..936ff80d1b 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 0bcec558d5bd8869beccd4780b392f831b3dc0e8
+Subproject commit 936ff80d1b2536e52b050ff9484c4c0636438e80
diff --git a/test/C/src/federated/DistributedMultiport.lf b/test/C/src/federated/DistributedMultiport.lf
index 7590710339..864f4e57d8 100644
--- a/test/C/src/federated/DistributedMultiport.lf
+++ b/test/C/src/federated/DistributedMultiport.lf
@@ -23,7 +23,7 @@ reactor Destination {
   reaction(in) {=
     for (int i = 0; i < in_width; i++) {
         if (in[i]->is_present) {
-            lf_print("Received %d.", in[i]->value);
+            lf_print("Received %d at %d.", in[i]->value, i);
             if (in[i]->value != self->count++) {
                 lf_print_error_and_exit("Expected %d.", self->count - 1);
             }

From fddbfbc2bf6ad6b7904164879ad64a11416190e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Thu, 15 Jun 2023 11:10:33 +0200
Subject: [PATCH 0354/1114] Reuse injector for parsing

---
 ...fParsingUtil.java => LfParsingHelper.java} | 19 ++++++++++++-------
 .../tests/compiler/EquivalenceUnitTests.java  | 12 +++++++-----
 .../tests/compiler/FormattingUnitTests.java   |  4 ++--
 .../lflang/tests/compiler/RoundTripTests.java | 12 ++++++------
 4 files changed, 27 insertions(+), 20 deletions(-)
 rename core/src/test/java/org/lflang/tests/{LfParsingUtil.java => LfParsingHelper.java} (81%)

diff --git a/core/src/test/java/org/lflang/tests/LfParsingUtil.java b/core/src/test/java/org/lflang/tests/LfParsingHelper.java
similarity index 81%
rename from core/src/test/java/org/lflang/tests/LfParsingUtil.java
rename to core/src/test/java/org/lflang/tests/LfParsingHelper.java
index 295c580b2c..e80b848b27 100644
--- a/core/src/test/java/org/lflang/tests/LfParsingUtil.java
+++ b/core/src/test/java/org/lflang/tests/LfParsingHelper.java
@@ -13,18 +13,24 @@
 import org.lflang.lf.Model;
 
 /**
+ * Utility to parse LF classes. Not static so that we can reuse
+ * the injector, as dependency injection takes a lot of time.
+ *
  * @author Clément Fournier
  */
-public class LfParsingUtil {
+public class LfParsingHelper {
+
+  private final Injector injector =
+      new LFStandaloneSetup().createInjectorAndDoEMFRegistration();
 
   /** Parse the given file, asserts that there are no parsing errors. */
-  public static Model parseValidModel(String fileName, String reformattedTestCase) {
+  public Model parseValidModel(String fileName, String reformattedTestCase) {
     Model resultingModel = parse(reformattedTestCase);
     checkValid(fileName, resultingModel);
     return resultingModel;
   }
 
-  private static void checkValid(String fileName, Model resultingModel) {
+  private void checkValid(String fileName, Model resultingModel) {
     Assertions.assertNotNull(resultingModel);
     if (!resultingModel.eResource().getErrors().isEmpty()) {
       resultingModel.eResource().getErrors().forEach(System.err::println);
@@ -33,7 +39,7 @@ private static void checkValid(String fileName, Model resultingModel) {
     }
   }
 
-  public static Model parseSourceAsIfInDirectory(Path directory, String sourceText) {
+  public Model parseSourceAsIfInDirectory(Path directory, String sourceText) {
     // Use a non-trivial number to avoid TOCTOU errors when executing tests concurrently.
     int num = sourceText.hashCode();
     while (Files.exists(directory.resolve("file" + num + ".lf"))) {
@@ -56,7 +62,7 @@ public static Model parseSourceAsIfInDirectory(Path directory, String sourceText
     }
   }
 
-  public static Model parse(String fileContents) {
+  public Model parse(String fileContents) {
     Path file = null;
     try {
       file = Files.createTempFile("lftests", ".lf");
@@ -75,10 +81,9 @@ public static Model parse(String fileContents) {
     }
   }
 
-  public static Model parse(Path file) {
+  public Model parse(Path file) {
     // Source:
     // https://wiki.eclipse.org/Xtext/FAQ#How_do_I_load_my_model_in_a_standalone_Java_application_.3F
-    Injector injector = new LFStandaloneSetup().createInjectorAndDoEMFRegistration();
     XtextResourceSet resourceSet = injector.getInstance(XtextResourceSet.class);
     resourceSet.addLoadOption(XtextResource.OPTION_RESOLVE_ALL, Boolean.TRUE);
     Resource resource =
diff --git a/core/src/test/java/org/lflang/tests/compiler/EquivalenceUnitTests.java b/core/src/test/java/org/lflang/tests/compiler/EquivalenceUnitTests.java
index 5d4fe9940c..056b5c6f42 100644
--- a/core/src/test/java/org/lflang/tests/compiler/EquivalenceUnitTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/EquivalenceUnitTests.java
@@ -8,7 +8,7 @@
 import org.lflang.ast.IsEqual;
 import org.lflang.lf.Model;
 import org.lflang.tests.LFInjectorProvider;
-import org.lflang.tests.LfParsingUtil;
+import org.lflang.tests.LfParsingHelper;
 
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
@@ -67,10 +67,11 @@ reactor A(a: int(0)) {}
   }
 
   private void assertSelfEquivalence(String input) {
-    Model inputModel = LfParsingUtil.parseValidModel("test input", input);
+    LfParsingHelper parser = new LfParsingHelper();
+    Model inputModel = parser.parseValidModel("test input", input);
     // need to parse twice otherwise they are trivially equivalent
     // because they're the same object.
-    Model otherModel = LfParsingUtil.parseValidModel("other", input);
+    Model otherModel = parser.parseValidModel("other", input);
 
     // test equivalence of the models.
     Assertions.assertTrue(
@@ -79,8 +80,9 @@ private void assertSelfEquivalence(String input) {
   }
 
   private void assertEquivalent(String input, String other) {
-    Model inputModel = LfParsingUtil.parseValidModel("test input", input);
-    Model outputModel = LfParsingUtil.parseValidModel("other", other);
+    LfParsingHelper parser = new LfParsingHelper();
+    Model inputModel = parser.parseValidModel("test input", input);
+    Model outputModel = parser.parseValidModel("other", other);
 
     // test equivalence of the models.
     Assertions.assertTrue(
diff --git a/core/src/test/java/org/lflang/tests/compiler/FormattingUnitTests.java b/core/src/test/java/org/lflang/tests/compiler/FormattingUnitTests.java
index 96cca6b559..3da9779fae 100644
--- a/core/src/test/java/org/lflang/tests/compiler/FormattingUnitTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/FormattingUnitTests.java
@@ -8,7 +8,7 @@
 import org.lflang.ast.FormattingUtils;
 import org.lflang.lf.Model;
 import org.lflang.tests.LFInjectorProvider;
-import org.lflang.tests.LfParsingUtil;
+import org.lflang.tests.LfParsingHelper;
 
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
@@ -97,7 +97,7 @@ private void assertIsFormatted(String input) {
   }
 
   private void assertFormatsTo(String input, String expectedOutput) {
-    Model inputModel = LfParsingUtil.parseValidModel("test input", input);
+    Model inputModel = new LfParsingHelper().parseValidModel("test input", input);
     String formattedString = FormattingUtils.render(inputModel);
     Assertions.assertEquals(
         expectedOutput, formattedString, "Formatted output is different from what was expected");
diff --git a/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java b/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
index 240adb56c3..39d2a2065d 100644
--- a/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
@@ -16,7 +16,6 @@
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DynamicTest;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.parallel.Execution;
@@ -28,7 +27,7 @@
 import org.lflang.lf.Model;
 import org.lflang.tests.LFInjectorProvider;
 import org.lflang.tests.LFTest;
-import org.lflang.tests.LfParsingUtil;
+import org.lflang.tests.LfParsingHelper;
 import org.lflang.tests.TestRegistry;
 import org.lflang.tests.TestRegistry.TestCategory;
 
@@ -41,6 +40,7 @@ public class RoundTripTests {
   public Collection<DynamicTest> roundTripTestFactory() {
     List<DynamicTest> result = new ArrayList<>();
     Path cwd = Paths.get(".").toAbsolutePath();
+    LfParsingHelper parser = new LfParsingHelper();
     for (Target target : Target.values()) {
       for (TestCategory category : TestCategory.values()) {
         for (LFTest test : TestRegistry.getRegisteredTests(target, category, false)) {
@@ -49,7 +49,7 @@ public Collection<DynamicTest> roundTripTestFactory() {
               DynamicTest.dynamicTest(
                   "Round trip " + cwd.relativize(test.getSrcPath()),
                   testSourceUri,
-                  () -> run(test.getSrcPath())
+                  () -> run(parser, test.getSrcPath())
               )
           );
         }
@@ -58,14 +58,14 @@ public Collection<DynamicTest> roundTripTestFactory() {
     return result;
   }
 
-  private static void run(Path file) {
-    Model originalModel = LfParsingUtil.parse(file);
+  private static void run(LfParsingHelper parser, Path file) {
+    Model originalModel = parser.parse(file);
     assertThat(originalModel.eResource().getErrors(), equalTo(emptyList()));
     // TODO: Check that the output is a fixed point
     final int smallLineLength = 20;
     final String squishedTestCase = FormattingUtils.render(originalModel, smallLineLength);
     final Model resultingModel =
-        LfParsingUtil.parseSourceAsIfInDirectory(file.getParent(), squishedTestCase);
+        parser.parseSourceAsIfInDirectory(file.getParent(), squishedTestCase);
 
     assertThat(resultingModel.eResource().getErrors(), equalTo(emptyList()));
     Assertions.assertTrue(

From 628fb954e50f1bded85a8d2eecce574609a0ee07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Thu, 15 Jun 2023 13:29:51 +0200
Subject: [PATCH 0355/1114] Format

---
 cli/lff/src/main/java/org/lflang/cli/Lff.java       |  3 ++-
 .../main/java/org/lflang/ast/LfParsingHelper.java   | 13 ++++---------
 .../java/org/lflang/tests/LfParsingTestHelper.java  |  5 ++---
 .../org/lflang/tests/compiler/RoundTripTests.java   |  7 +------
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/cli/lff/src/main/java/org/lflang/cli/Lff.java b/cli/lff/src/main/java/org/lflang/cli/Lff.java
index c7e7219348..fa534b15d0 100644
--- a/cli/lff/src/main/java/org/lflang/cli/Lff.java
+++ b/cli/lff/src/main/java/org/lflang/cli/Lff.java
@@ -178,7 +178,8 @@ private void formatSingleFile(Path path, Path inputRoot, Path outputRoot) {
         FormattingUtil.render(resource.getContents().get(0), lineLength);
     if (!new IsEqual(resource.getContents().get(0))
         .doSwitch(
-            new LfParsingHelper().parseSourceAsIfInDirectory(path.getParent(), formattedFileContents))) {
+            new LfParsingHelper()
+                .parseSourceAsIfInDirectory(path.getParent(), formattedFileContents))) {
       reporter.printFatalErrorAndExit(
           "The formatter failed to produce output that is semantically equivalent to its input when"
               + " executed on the file "
diff --git a/core/src/main/java/org/lflang/ast/LfParsingHelper.java b/core/src/main/java/org/lflang/ast/LfParsingHelper.java
index 503851fbf6..85a0ba6890 100644
--- a/core/src/main/java/org/lflang/ast/LfParsingHelper.java
+++ b/core/src/main/java/org/lflang/ast/LfParsingHelper.java
@@ -1,30 +1,25 @@
 package org.lflang.ast;
 
+import com.google.inject.Injector;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.resource.XtextResourceSet;
-
 import org.lflang.LFStandaloneSetup;
 import org.lflang.lf.Model;
 
-import com.google.inject.Injector;
-
 /**
- * Utility to parse LF classes. Not static so that we can reuse
- * the injector, as dependency injection takes a lot of time.
+ * Utility to parse LF classes. Not static so that we can reuse the injector, as dependency
+ * injection takes a lot of time.
  *
  * @author Clément Fournier
  */
 public class LfParsingHelper {
 
-  private final Injector injector =
-      new LFStandaloneSetup().createInjectorAndDoEMFRegistration();
-
+  private final Injector injector = new LFStandaloneSetup().createInjectorAndDoEMFRegistration();
 
   public Model parse(Path file) {
     // Source:
diff --git a/core/src/test/java/org/lflang/tests/LfParsingTestHelper.java b/core/src/test/java/org/lflang/tests/LfParsingTestHelper.java
index 2eab36f8d4..9b6dcc3903 100644
--- a/core/src/test/java/org/lflang/tests/LfParsingTestHelper.java
+++ b/core/src/test/java/org/lflang/tests/LfParsingTestHelper.java
@@ -1,13 +1,12 @@
 package org.lflang.tests;
 
 import org.junit.jupiter.api.Assertions;
-
 import org.lflang.ast.LfParsingHelper;
 import org.lflang.lf.Model;
 
 /**
- * Utility to parse LF classes. Not static so that we can reuse
- * the injector, as dependency injection takes a lot of time.
+ * Utility to parse LF classes. Not static so that we can reuse the injector, as dependency
+ * injection takes a lot of time.
  *
  * @author Clément Fournier
  */
diff --git a/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java b/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
index 6c5ff13391..dcd32b5846 100644
--- a/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
@@ -3,7 +3,6 @@
 import static java.util.Collections.emptyList;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.fail;
 
 import java.net.URI;
 import java.nio.file.Path;
@@ -11,7 +10,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.junit.jupiter.api.Assertions;
@@ -20,7 +18,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
-
 import org.lflang.Target;
 import org.lflang.ast.FormattingUtil;
 import org.lflang.ast.IsEqual;
@@ -50,9 +47,7 @@ public Collection<DynamicTest> roundTripTestFactory() {
               DynamicTest.dynamicTest(
                   "Round trip " + cwd.relativize(test.getSrcPath()),
                   testSourceUri,
-                  () -> run(parser, test.getSrcPath())
-              )
-          );
+                  () -> run(parser, test.getSrcPath())));
         }
       }
     }

From 991040103ec4387add4978adf19c20b12008102f Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 15 Jun 2023 13:48:08 +0200
Subject: [PATCH 0356/1114] formatter: don't add a space after interleaved

---
 core/src/main/java/org/lflang/ast/ToLf.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 3468d5dab0..7123a352b9 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -332,7 +332,7 @@ public MalleableString caseVarRef(VarRef v) {
     //     variable=[Variable]) ')'
     if (!v.isInterleaved()) return MalleableString.anyOf(ToText.instance.doSwitch(v));
     return new Builder()
-        .append("interleaved ")
+        .append("interleaved")
         .append(list(false, ToText.instance.doSwitch(v)))
         .get();
   }

From 038e28815c5fe08f7a519fbb36bc1a606d713287 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 15 Jun 2023 13:50:38 +0200
Subject: [PATCH 0357/1114] update formatting in tests

---
 test/C/src/multiport/FullyConnectedAddressable.lf        | 4 ++--
 test/C/src/multiport/FullyConnectedAddressableAfter.lf   | 4 ++--
 test/C/src/multiport/NestedInterleavedBanks.lf           | 2 +-
 test/Cpp/src/multiport/FullyConnectedAddressable.lf      | 4 ++--
 test/Cpp/src/multiport/FullyConnectedAddressableAfter.lf | 4 ++--
 test/Python/src/multiport/NestedInterleavedBanks.lf      | 2 +-
 test/Rust/src/multiport/FullyConnectedAddressable.lf     | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/C/src/multiport/FullyConnectedAddressable.lf b/test/C/src/multiport/FullyConnectedAddressable.lf
index 2fd5e03ad2..a5c764764e 100644
--- a/test/C/src/multiport/FullyConnectedAddressable.lf
+++ b/test/C/src/multiport/FullyConnectedAddressable.lf
@@ -47,8 +47,8 @@ reactor Node(num_nodes: size_t = 4, bank_index: int = 0) {
 
 main reactor(num_nodes: size_t = 4) {
   nodes1 = new[num_nodes] Node(num_nodes = num_nodes)
-  nodes1.out -> interleaved (nodes1.in)
+  nodes1.out -> interleaved(nodes1.in)
 
   nodes2 = new[num_nodes] Node(num_nodes = num_nodes)
-  interleaved (nodes2.out) -> nodes2.in
+  interleaved(nodes2.out) -> nodes2.in
 }
diff --git a/test/C/src/multiport/FullyConnectedAddressableAfter.lf b/test/C/src/multiport/FullyConnectedAddressableAfter.lf
index e71c5194bb..5828d12659 100644
--- a/test/C/src/multiport/FullyConnectedAddressableAfter.lf
+++ b/test/C/src/multiport/FullyConnectedAddressableAfter.lf
@@ -5,8 +5,8 @@ import Node from "FullyConnectedAddressable.lf"
 
 main reactor(num_nodes: size_t = 4) {
   nodes1 = new[num_nodes] Node(num_nodes = num_nodes)
-  nodes1.out -> interleaved (nodes1.in) after 200 msec
+  nodes1.out -> interleaved(nodes1.in) after 200 msec
 
   nodes2 = new[num_nodes] Node(num_nodes = num_nodes)
-  interleaved (nodes2.out) -> nodes2.in after 400 msec
+  interleaved(nodes2.out) -> nodes2.in after 400 msec
 }
diff --git a/test/C/src/multiport/NestedInterleavedBanks.lf b/test/C/src/multiport/NestedInterleavedBanks.lf
index 2d8f10e518..b453473223 100644
--- a/test/C/src/multiport/NestedInterleavedBanks.lf
+++ b/test/C/src/multiport/NestedInterleavedBanks.lf
@@ -18,7 +18,7 @@ reactor A(bank_index: int = 0, outer_bank_index: int = 0) {
 reactor B(bank_index: int = 0) {
   output[4] q: int
   a = new[2] A(outer_bank_index = bank_index)
-  interleaved (a.p) -> q
+  interleaved(a.p) -> q
 }
 
 reactor C {
diff --git a/test/Cpp/src/multiport/FullyConnectedAddressable.lf b/test/Cpp/src/multiport/FullyConnectedAddressable.lf
index ed148437a5..5047109cf8 100644
--- a/test/Cpp/src/multiport/FullyConnectedAddressable.lf
+++ b/test/Cpp/src/multiport/FullyConnectedAddressable.lf
@@ -43,8 +43,8 @@ reactor Node(bank_index: size_t = 0, num_nodes: size_t = 4) {
 
 main reactor(num_nodes: size_t = 4) {
   nodes1 = new[num_nodes] Node(num_nodes = num_nodes)
-  nodes1.out -> interleaved (nodes1.in)
+  nodes1.out -> interleaved(nodes1.in)
 
   nodes2 = new[num_nodes] Node(num_nodes = num_nodes)
-  interleaved (nodes2.out) -> nodes2.in
+  interleaved(nodes2.out) -> nodes2.in
 }
diff --git a/test/Cpp/src/multiport/FullyConnectedAddressableAfter.lf b/test/Cpp/src/multiport/FullyConnectedAddressableAfter.lf
index e33511a41a..d3593ab530 100644
--- a/test/Cpp/src/multiport/FullyConnectedAddressableAfter.lf
+++ b/test/Cpp/src/multiport/FullyConnectedAddressableAfter.lf
@@ -5,8 +5,8 @@ import Node from "FullyConnectedAddressable.lf"
 
 main reactor(num_nodes: size_t = 4) {
   nodes1 = new[num_nodes] Node(num_nodes = num_nodes)
-  nodes1.out -> interleaved (nodes1.in) after 200 msec
+  nodes1.out -> interleaved(nodes1.in) after 200 msec
 
   nodes2 = new[num_nodes] Node(num_nodes = num_nodes)
-  interleaved (nodes2.out) -> nodes2.in after 400 msec
+  interleaved(nodes2.out) -> nodes2.in after 400 msec
 }
diff --git a/test/Python/src/multiport/NestedInterleavedBanks.lf b/test/Python/src/multiport/NestedInterleavedBanks.lf
index ea124666af..5e7967d217 100644
--- a/test/Python/src/multiport/NestedInterleavedBanks.lf
+++ b/test/Python/src/multiport/NestedInterleavedBanks.lf
@@ -17,7 +17,7 @@ reactor A(bank_index = 0, outer_bank_index = 0) {
 reactor B(bank_index = 0) {
   output[4] q
   a = new[2] A(outer_bank_index = bank_index)
-  interleaved (a.p) -> q
+  interleaved(a.p) -> q
 }
 
 reactor C {
diff --git a/test/Rust/src/multiport/FullyConnectedAddressable.lf b/test/Rust/src/multiport/FullyConnectedAddressable.lf
index f0c952ccfd..335648f8f9 100644
--- a/test/Rust/src/multiport/FullyConnectedAddressable.lf
+++ b/test/Rust/src/multiport/FullyConnectedAddressable.lf
@@ -45,8 +45,8 @@ reactor Node(bank_index: usize = 0, num_nodes: usize = 4) {
 
 main reactor(num_nodes: usize = 4) {
   nodes1 = new[num_nodes] Node(num_nodes = num_nodes)
-  nodes1.out -> interleaved (nodes1.inpt)
+  nodes1.out -> interleaved(nodes1.inpt)
 
   nodes2 = new[num_nodes] Node(num_nodes = num_nodes)
-  interleaved (nodes2.out) -> nodes2.inpt
+  interleaved(nodes2.out) -> nodes2.inpt
 }

From 00a1b4788d6871dace463f1e60ea96489ebe62ec Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Thu, 15 Jun 2023 17:40:04 +0200
Subject: [PATCH 0358/1114] Removed unused imports

---
 core/src/main/java/org/lflang/ModelInfo.java      | 1 -
 core/src/main/java/org/lflang/TargetProperty.java | 1 -
 2 files changed, 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/ModelInfo.java b/core/src/main/java/org/lflang/ModelInfo.java
index 9b65ca3406..ef7081878d 100644
--- a/core/src/main/java/org/lflang/ModelInfo.java
+++ b/core/src/main/java/org/lflang/ModelInfo.java
@@ -28,7 +28,6 @@
 import static org.eclipse.xtext.xbase.lib.IterableExtensions.filter;
 import static org.eclipse.xtext.xbase.lib.IteratorExtensions.toIterable;
 
-import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index ab26c8088b..923891ce66 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -26,7 +26,6 @@
 package org.lflang;
 
 import com.google.common.collect.ImmutableList;
-import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.LinkedList;

From 59a18464217db5cc20c90209b48176f2812017b8 Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Thu, 15 Jun 2023 17:54:40 +0200
Subject: [PATCH 0359/1114] Fixed exception no longer thrown

---
 .../src/main/java/org/lflang/cli/StandaloneIssueAcceptor.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cli/base/src/main/java/org/lflang/cli/StandaloneIssueAcceptor.java b/cli/base/src/main/java/org/lflang/cli/StandaloneIssueAcceptor.java
index cb9712a7cb..d8fd14640a 100644
--- a/cli/base/src/main/java/org/lflang/cli/StandaloneIssueAcceptor.java
+++ b/cli/base/src/main/java/org/lflang/cli/StandaloneIssueAcceptor.java
@@ -1,7 +1,6 @@
 package org.lflang.cli;
 
 import com.google.inject.Inject;
-import java.io.IOException;
 import java.nio.file.Path;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -53,7 +52,7 @@ private Path getPath(EObjectDiagnosticImpl diagnostic) {
     Path file = null;
     try {
       file = FileUtil.toPath(diagnostic.getUriToProblem());
-    } catch (IOException e) {
+    } catch (IllegalArgumentException e) {
       // just continue with null
     }
     return file;

From 8e2341831f3d59759d0dfc97211f585abb55ad64 Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Thu, 15 Jun 2023 18:05:31 +0200
Subject: [PATCH 0360/1114] Fixed exception no longer thrown

---
 cli/base/src/main/java/org/lflang/cli/CliBase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/base/src/main/java/org/lflang/cli/CliBase.java b/cli/base/src/main/java/org/lflang/cli/CliBase.java
index 3daab73ab0..0d098ec758 100644
--- a/cli/base/src/main/java/org/lflang/cli/CliBase.java
+++ b/cli/base/src/main/java/org/lflang/cli/CliBase.java
@@ -262,7 +262,7 @@ public void validateResource(Resource resource) {
       if (uri != null) {
         try {
           path = FileUtil.toPath(uri);
-        } catch (IOException e) {
+        } catch (IllegalArgumentException e) {
           reporter.printError("Unable to convert '" + uri + "' to path." + e);
         }
       }

From 47fb539c3972519ddf76e5d5d66cc22bf6e30148 Mon Sep 17 00:00:00 2001
From: revol-xut <revol-xut@protonmail.com>
Date: Thu, 15 Jun 2023 19:21:56 +0200
Subject: [PATCH 0361/1114] adjusting code generation for declarative port
 graphs

---
 .../cpp/CppAssembleMethodGenerator.kt         | 45 ++++++-------------
 .../generator/cpp/CppConnectionGenerator.kt   | 12 ++---
 org.lflang/src/lib/cpp/reactor-cpp            |  1 +
 3 files changed, 21 insertions(+), 37 deletions(-)
 create mode 160000 org.lflang/src/lib/cpp/reactor-cpp

diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
index 0bb63e24c3..93f70ef548 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
@@ -100,6 +100,12 @@ class CppAssembleMethodGenerator(private val reactor: Reactor) {
         }
     }
 
+    private val Connection.cppDelay: String 
+        get() = if (delay != null) "${delay.toCppTime()}" else "0s"
+
+    private val Connection.properties: String
+        get() = "ConnectionProperties{$cppType, $cppDelay, nullptr}"
+
     private fun declareTrigger(reaction: Reaction, trigger: TriggerRef): String =
         if (trigger is VarRef && trigger.variable is Port) {
             // if the trigger is a port, then it could be a multiport or contained in a bank
@@ -153,17 +159,9 @@ class CppAssembleMethodGenerator(private val reactor: Reactor) {
             val leftPort = c.leftPorts[0]
             val rightPort = c.rightPorts[0]
 
-            if (c.requiresConnectionClass)
-                """
-                    // connection $idx
-                    ${c.name}.bind_upstream_port(&${leftPort.name});
-                    ${c.name}.bind_downstream_port(&${rightPort.name});
-                """.trimIndent()
-            else
-                """
-                    // connection $idx
-                    ${leftPort.name}.bind_to(&${rightPort.name});
-                """.trimIndent()
+            """
+                left.environment()->draw_connection(${leftPort.name}, ${rightPort.name}, ${c.properties})
+            """.trimIndent()
         }
 
     /**
@@ -199,26 +197,11 @@ class CppAssembleMethodGenerator(private val reactor: Reactor) {
     }
 
     private fun Connection.getConnectionLambda(portType: String): String {
-        return when {
-            isEnclaveConnection     -> """
-                    [this]($portType left, $portType right, std::size_t idx) {
-                      $name.push_back(std::make_unique<$cppType>(
-                          "$name" + std::to_string(idx), right->environment()${if (delay != null) ", ${delay.toCppTime()}" else ""}));
-                      $name.back()->bind_upstream_port(left);
-                      $name.back()->bind_downstream_port(right);
-                    }
-                """.trimIndent()
-
-            requiresConnectionClass -> """
-                    [this]($portType left, $portType right, std::size_t idx) {
-                      $name.push_back(std::make_unique<$cppType>("$name" + std::to_string(idx), this, ${delay.toCppTime()}));
-                      $name.back()->bind_upstream_port(left);
-                      $name.back()->bind_downstream_port(right);
-                    }
-                """.trimIndent()
-
-            else                    -> "[]($portType left, $portType right, [[maybe_unused]]std::size_t idx) {  left->bind_to(right); }"
-        }
+        return """
+            [this](const BasePort& left, const BasePort& right, std::size_t idx) {
+                left.environment()->draw_connection(left, right, $properties)
+            }
+        """.trimIndent()
     }
 
     private fun addAllPortsToVector(varRef: VarRef, vectorName: String): String =
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionGenerator.kt
index c9af656291..a88cd20b3f 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionGenerator.kt
@@ -28,14 +28,14 @@ class CppConnectionGenerator(private val reactor: Reactor) {
                 val leftPort = leftPorts.first()
                 return when {
                     isEnclaveConnection -> when {
-                        isPhysical    -> "reactor::PhysicalEnclaveConnection<${leftPort.dataType}>"
-                        delay != null -> "reactor::DelayedEnclaveConnection<${leftPort.dataType}>"
-                        else          -> "reactor::EnclaveConnection<${leftPort.dataType}>"
+                        isPhysical    -> "ConnectionType::PhysicalEnclaved"
+                        delay != null -> "ConnectionType::DelayedEnclaved"
+                        else          -> "ConnectionType::Enclaved"
                     }
 
-                    isPhysical          -> "reactor::PhysicalConnection<${leftPort.dataType}>"
-                    delay != null       -> "reactor::DelayedConnection<${leftPort.dataType}>"
-                    else                -> throw IllegalArgumentException("Unsupported connection type")
+                    isPhysical          -> "ConnectionType::Physical"
+                    delay != null       -> "ConnectionType::Delayed"
+                    else                -> "ConnectionType::Normal"
                 }
             }
 
diff --git a/org.lflang/src/lib/cpp/reactor-cpp b/org.lflang/src/lib/cpp/reactor-cpp
new file mode 160000
index 0000000000..b607f1f640
--- /dev/null
+++ b/org.lflang/src/lib/cpp/reactor-cpp
@@ -0,0 +1 @@
+Subproject commit b607f1f64083ab531e7a676b29de75f076aa1cde

From 6dd0dbb8a8051a690eda364c0c37cf280e2e99d1 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 15 Jun 2023 12:12:13 -0700
Subject: [PATCH 0362/1114] Update .gitignore.

This removes an accidentally tracked file.
---
 .gitignore            |  4 +-
 test/C/trace_svg.html | 97 -------------------------------------------
 2 files changed, 3 insertions(+), 98 deletions(-)
 delete mode 100644 test/C/trace_svg.html

diff --git a/.gitignore b/.gitignore
index dcb7b5f75f..672bc383e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 *.lft
+*.csv
+**/trace_svg.html
 *.out
 *.class
 *.DS_Store
@@ -157,4 +159,4 @@ gradle-app.setting
 
 ### xtext artifaccts
 *.jar
-core/model/
\ No newline at end of file
+core/model/
diff --git a/test/C/trace_svg.html b/test/C/trace_svg.html
deleted file mode 100644
index f2ceb2f918..0000000000
--- a/test/C/trace_svg.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-
-<svg width="800" height="696">
- <style>     line {         stroke: black;         stroke-width: 2;     }     .ABS {stroke: #d9dd1f; fill: #d9dd1f; }     .LTC { stroke: #073b4c; fill: #073b4c;}     .T_MSG { stroke: #ef476f; fill: #ef476f}     .NET { stroke: #118ab2; fill: #118ab2}     .PTAG { stroke: #06d6a0; fill: #06d6a0}     .TAG { stroke: #08a578; fill: #08a578}     .TIMESTAMP { stroke: grey; fill: grey }     .FED_ID {stroke: #80DD99; fill: #80DD99 }     .ADV {stroke-linecap="round" ; stroke: "red" ; fill: "red"}     text {         font-size: smaller;         font-family: sans-serif;     }     text.time {fill: #074936; } </style> 
-	<!-- RTI Actor and line -->
-	<line x1="100" y1="25" x2="100" y2="696"/>
-	<circle cx="100" cy="25" r="20" stroke="black" stroke-width="2" fill="white"/>
-	<text x="85" y="30" fill="black">RTI</text>
-
-	<!-- Federate 1: federate__receiver Actor and line -->
-	<line x1="300" y1="25" x2="300" y2="696"/>
-	<circle cx="300" cy="25" r="20" stroke="black" stroke-width="2" fill="white"/>
-	<text x="295" y="30" fill="black">federate__receiver</text>
-
-	<!-- Federate 0: federate__sender Actor and line -->
-	<line x1="500" y1="25" x2="500" y2="696"/>
-	<circle cx="500" cy="25" r="20" stroke="black" stroke-width="2" fill="white"/>
-	<text x="495" y="30" fill="black">federate__sender</text>
-
-	<!-- Draw interactions -->
-	<line x1="300" y1="75" x2="100" y2="96" class="FED_ID"/>
-	<path d="M100 96 L110 101 L110 91 Z" transform="rotate(-6)" transform-origin="100 96" class="FED_ID"/>
-	<text text-anchor="end" transform="translate(290, 70) rotate(-6)">FED_ID</text>
-	<text text-anchor="start" class="time" transform="translate(305, 80)">-1,041,305</text>
-	<text text-anchor="end" class="time" transform="translate(95, 101)">-1,041,279</text>
-	<line x1="100" y1="116" x2="300" y2="137" class="ACK"/>
-	<path d="M300 137 L290 142 L290 132 Z" transform="rotate(5)" transform-origin="300 137" class="ACK"/>
-	<text transform="translate(110, 111) rotate(5)" text-anchor="start">ACK</text>
-	<text text-anchor="end" class="time" transform="translate(95, 121)">-1,041,277</text>
-	<text text-anchor="start" class="time" transform="translate(305, 142)">-1,041,236</text>
-	<line x1="300" y1="158" x2="100" y2="245" class="TIMESTAMP"/>
-	<path d="M100 245 L110 250 L110 240 Z" transform="rotate(-24)" transform-origin="100 245" class="TIMESTAMP"/>
-	<text text-anchor="end" transform="translate(290, 153) rotate(-24)">TIMESTAMP(-1,041,185,840, 0)</text>
-	<text text-anchor="start" class="time" transform="translate(305, 163)">-1,041,181</text>
-	<line x1="500" y1="180" x2="100" y2="204" class="FED_ID"/>
-	<path d="M100 204 L110 209 L110 199 Z" transform="rotate(-4)" transform-origin="100 204" class="FED_ID"/>
-	<text text-anchor="end" transform="translate(490, 175) rotate(-4)">FED_ID</text>
-	<text text-anchor="start" class="time" transform="translate(505, 185)">-1,040,825</text>
-	<text text-anchor="end" class="time" transform="translate(95, 209)">-1,000,243</text>
-	<line x1="100" y1="224" x2="500" y2="266" class="ACK"/>
-	<path d="M500 266 L490 271 L490 261 Z" transform="rotate(5)" transform-origin="500 266" class="ACK"/>
-	<text transform="translate(110, 219) rotate(5)" text-anchor="start">ACK</text>
-	<text text-anchor="end" class="time" transform="translate(95, 229)">-1,000,241</text>
-	<text text-anchor="end" class="time" transform="translate(95, 250)">-1,000,221</text>
-	<text text-anchor="start" class="time" transform="translate(505, 271)">-1,000,187</text>
-	<line x1="500" y1="288" x2="100" y2="309" class="TIMESTAMP"/>
-	<path d="M100 309 L110 314 L110 304 Z" transform="rotate(-3)" transform-origin="100 309" class="TIMESTAMP"/>
-	<text text-anchor="end" transform="translate(490, 283) rotate(-3)">TIMESTAMP(-1,000,000,000, 0)</text>
-	<text text-anchor="start" class="time" transform="translate(505, 293)">-999,986</text>
-	<text text-anchor="end" class="time" transform="translate(95, 314)">-999,957</text>
-	<line x1="100" y1="329" x2="500" y2="371" class="TIMESTAMP"/>
-	<path d="M500 371 L490 376 L490 366 Z" transform="rotate(5)" transform-origin="500 371" class="TIMESTAMP"/>
-	<text transform="translate(110, 324) rotate(5)" text-anchor="start">TIMESTAMP(0, 0)</text>
-	<text text-anchor="end" class="time" transform="translate(95, 334)">-999,953</text>
-	<line x1="100" y1="350" x2="300" y2="391" class="TIMESTAMP"/>
-	<path d="M300 391 L290 396 L290 386 Z" transform="rotate(11)" transform-origin="300 391" class="TIMESTAMP"/>
-	<text transform="translate(110, 345) rotate(11)" text-anchor="start">TIMESTAMP(0, 0)</text>
-	<text text-anchor="end" class="time" transform="translate(95, 355)">-999,941</text>
-	<text text-anchor="start" class="time" transform="translate(505, 376)">-999,913</text>
-	<text text-anchor="start" class="time" transform="translate(305, 396)">-999,906</text>
-	<line x1="300" y1="416" x2="100" y2="477" class="NET"/>
-	<path d="M100 477 L110 482 L110 472 Z" transform="rotate(-17)" transform-origin="100 477" class="NET"/>
-	<text text-anchor="end" transform="translate(290, 411) rotate(-17)">NET(0, 0)</text>
-	<text text-anchor="start" class="time" transform="translate(305, 421)">87</text>
-	<line x1="500" y1="435" x2="100" y2="456" class="NET"/>
-	<path d="M100 456 L110 461 L110 451 Z" transform="rotate(-3)" transform-origin="100 456" class="NET"/>
-	<text text-anchor="end" transform="translate(490, 430) rotate(-3)">NET(0, 0)</text>
-	<text text-anchor="start" class="time" transform="translate(505, 440)">88</text>
-	<text text-anchor="end" class="time" transform="translate(95, 461)">136</text>
-	<text text-anchor="end" class="time" transform="translate(95, 482)">168</text>
-	<line x1="100" y1="498" x2="300" y2="539" class="PTAG"/>
-	<path d="M300 539 L290 544 L290 534 Z" transform="rotate(11)" transform-origin="300 539" class="PTAG"/>
-	<text transform="translate(110, 493) rotate(11)" text-anchor="start">PTAG(0, 0)</text>
-	<text text-anchor="end" class="time" transform="translate(95, 503)">182</text>
-	<line x1="100" y1="519" x2="500" y2="559" class="PTAG"/>
-	<path d="M500 559 L490 564 L490 554 Z" transform="rotate(5)" transform-origin="500 559" class="PTAG"/>
-	<text transform="translate(110, 514) rotate(5)" text-anchor="start">PTAG(0, 0)</text>
-	<text text-anchor="end" class="time" transform="translate(95, 524)">201</text>
-	<text text-anchor="start" class="time" transform="translate(305, 544)">208</text>
-	<text text-anchor="start" class="time" transform="translate(505, 564)">216</text>
-	<line x1="500" y1="581" x2="100" y2="605" class="T_MSG"/>
-	<path d="M100 605 L110 610 L110 600 Z" transform="rotate(-4)" transform-origin="100 605" class="T_MSG"/>
-	<text text-anchor="end" transform="translate(490, 576) rotate(-4)">T_MSG(0, 0)</text>
-	<text text-anchor="start" class="time" transform="translate(505, 586)">446</text>
-	<text text-anchor="end" class="time" transform="translate(95, 610)">43,615</text>
-	<line x1="100" y1="625" x2="300" y2="646" class="T_MSG"/>
-	<path d="M300 646 L290 651 L290 641 Z" transform="rotate(5)" transform-origin="300 646" class="T_MSG"/>
-	<text transform="translate(110, 620) rotate(5)" text-anchor="start">T_MSG(0, 0)</text>
-	<text text-anchor="end" class="time" transform="translate(95, 630)">43,618</text>
-	<text text-anchor="start" class="time" transform="translate(305, 651)">43,665</text>
-
-</svg>
-
-</body>
-</html>

From 42e809a5e9d3cc02653075209b49a540b7e33f43 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 15 Jun 2023 15:25:05 -0700
Subject: [PATCH 0363/1114] Update formatter.

This runs another pass of optimization. Yes, this is
totally a hacky heuristic, but it should not affect idempotency nor
other correctness criteria. This can affect performance, but I modified
the formatter to keep track of whether anything has changed so that it
knows whether further optimization passes have the potential to give any
improved results.
---
 .../java/org/lflang/ast/MalleableString.java  | 38 +++++++++++--------
 .../DistributedLogicalActionUpstreamLong.lf   |  3 +-
 .../DistributedPhysicalActionUpstreamLong.lf  |  3 +-
 .../src/modal_models/BanksModalStateReset.lf  |  3 +-
 test/C/src/modal_models/ModalActions.lf       |  3 +-
 .../src/modal_models/ModalStartupShutdown.lf  |  3 +-
 .../src/modal_models/BanksModalStateReset.lf  |  3 +-
 test/Python/src/modal_models/ModalActions.lf  |  3 +-
 .../src/modal_models/ModalStartupShutdown.lf  |  3 +-
 test/TypeScript/src/DeadlineHandledAbove.lf   |  4 +-
 test/TypeScript/src/SimpleDeadline.lf         |  4 +-
 11 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/MalleableString.java b/core/src/main/java/org/lflang/ast/MalleableString.java
index d4dff9dae7..1081182ec8 100644
--- a/core/src/main/java/org/lflang/ast/MalleableString.java
+++ b/core/src/main/java/org/lflang/ast/MalleableString.java
@@ -42,8 +42,9 @@ public MalleableString indent() {
    *     whole of this.
    * @param indentation The number of spaces used per level of indentation.
    * @param singleLineCommentPrefix The prefix that marks the start of a single-line comment.
+   * @return Whether the best representation changed.
    */
-  public abstract void findBestRepresentation(
+  public abstract boolean findBestRepresentation(
       Supplier<RenderResult> providedRender,
       ToLongFunction<RenderResult> badness,
       int width,
@@ -348,7 +349,7 @@ private List<String> getLinesOfInterest(
     }
 
     @Override
-    public void findBestRepresentation(
+    public boolean findBestRepresentation(
         Supplier<RenderResult> providedRender,
         ToLongFunction<RenderResult> badness,
         int width,
@@ -356,32 +357,37 @@ public void findBestRepresentation(
         String singleLineCommentPrefix) {
       this.width = width;
       keepCommentsOnSameLine = true;
-      optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);
+      var everChanged = false;
+      var changed = optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);
+      everChanged = changed;
+      if (changed) changed = optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);
       if (components.stream()
           .noneMatch(
               it ->
                   it.render(indentation, singleLineCommentPrefix, false, null)
                       .unplacedComments
                       .findAny()
-                      .isPresent())) return;
+                      .isPresent())) return changed;
       long badnessTrue = badness.applyAsLong(providedRender.get());
       keepCommentsOnSameLine = false;
-      optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);
+      changed = optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);
+      everChanged |= changed;
       long badnessFalse = badness.applyAsLong(providedRender.get());
       keepCommentsOnSameLine = badnessTrue < badnessFalse;
-      optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);
-      optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);
+      if (changed) changed = optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);
+      if (changed) optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);
+      return everChanged;
     }
 
-    private void optimizeChildren(
+    private boolean optimizeChildren(
         Supplier<RenderResult> providedRender,
         ToLongFunction<RenderResult> badness,
         int width,
         int indentation,
         String singleLineCommentPrefix) {
-      components
+      return components
           .reverse()
-          .forEach(
+          .stream().anyMatch(
               it ->
                   it.findBestRepresentation(
                       providedRender, badness, width, indentation, singleLineCommentPrefix));
@@ -409,14 +415,14 @@ public MalleableString indent() {
     }
 
     @Override
-    public void findBestRepresentation(
+    public boolean findBestRepresentation(
         Supplier<RenderResult> providedRender,
         ToLongFunction<RenderResult> badness,
         int width,
         int indentation,
         String singleLineCommentPrefix) {
       this.width = width;
-      nested.findBestRepresentation(
+      return nested.findBestRepresentation(
           providedRender, badness, width - indentation, indentation, singleLineCommentPrefix);
     }
 
@@ -462,12 +468,13 @@ public String toString() {
     }
 
     @Override
-    public void findBestRepresentation(
+    public boolean findBestRepresentation(
         Supplier<RenderResult> providedRender,
         ToLongFunction<RenderResult> badness,
         int width,
         int indentation,
         String singleLineCommentPrefix) {
+      var initialChosenPossibility = getChosenPossibility();
       bestPossibility =
           Collections.min(
               getPossibilities(),
@@ -479,9 +486,10 @@ public void findBestRepresentation(
                 return Math.toIntExact(badnessA - badnessB);
               });
       if (bestPossibility instanceof MalleableString ms) {
-        ms.findBestRepresentation(
-            providedRender, badness, width, indentation, singleLineCommentPrefix);
+        if (ms.findBestRepresentation(
+            providedRender, badness, width, indentation, singleLineCommentPrefix)) return true;
       }
+      return getChosenPossibility() != initialChosenPossibility;
     }
 
     /** Return the best representation of this. */
diff --git a/test/C/src/federated/DistributedLogicalActionUpstreamLong.lf b/test/C/src/federated/DistributedLogicalActionUpstreamLong.lf
index 87dd86229e..3205c466c2 100644
--- a/test/C/src/federated/DistributedLogicalActionUpstreamLong.lf
+++ b/test/C/src/federated/DistributedLogicalActionUpstreamLong.lf
@@ -46,8 +46,7 @@ federated reactor {
   passThroughs7.out,
   passThroughs8.out,
   passThroughs9.out,
-  passThroughs10.out
-    ->
+  passThroughs10.out ->
     passThroughs1.in,
     passThroughs2.in,
     passThroughs3.in,
diff --git a/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf b/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf
index 4fe2407b54..cc9f556df0 100644
--- a/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf
+++ b/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf
@@ -71,8 +71,7 @@ federated reactor {
   passThroughs7.out,
   passThroughs8.out,
   passThroughs9.out,
-  passThroughs10.out
-    ->
+  passThroughs10.out ->
     passThroughs1.in,
     passThroughs2.in,
     passThroughs3.in,
diff --git a/test/C/src/modal_models/BanksModalStateReset.lf b/test/C/src/modal_models/BanksModalStateReset.lf
index 57228081c2..90d7eaf932 100644
--- a/test/C/src/modal_models/BanksModalStateReset.lf
+++ b/test/C/src/modal_models/BanksModalStateReset.lf
@@ -42,8 +42,7 @@ main reactor {
   reset2.mode_switch,
   reset2.count0,
   reset2.count1,
-  reset2.count2
-    -> test.events
+  reset2.count2 -> test.events
 
   // Trigger mode change (separately because of #1278)
   reaction(stepper) -> reset1.next {=
diff --git a/test/C/src/modal_models/ModalActions.lf b/test/C/src/modal_models/ModalActions.lf
index 594273bb6f..449119d315 100644
--- a/test/C/src/modal_models/ModalActions.lf
+++ b/test/C/src/modal_models/ModalActions.lf
@@ -87,8 +87,7 @@ main reactor {
   modal.action1_sched,
   modal.action1_exec,
   modal.action2_sched,
-  modal.action2_exec
-    -> test.events
+  modal.action2_exec -> test.events
 
   reaction(stepper) -> modal.next {= lf_set(modal.next, true); =}  // Trigger mode change
 }
diff --git a/test/C/src/modal_models/ModalStartupShutdown.lf b/test/C/src/modal_models/ModalStartupShutdown.lf
index 3a93cebfdd..3de03e3ab5 100644
--- a/test/C/src/modal_models/ModalStartupShutdown.lf
+++ b/test/C/src/modal_models/ModalStartupShutdown.lf
@@ -135,8 +135,7 @@ main reactor {
   modal.shutdown4,
   modal.startup5,
   modal.reset5,
-  modal.shutdown5
-    -> test.events
+  modal.shutdown5 -> test.events
 
   reaction(stepper) -> modal.next {= lf_set(modal.next, true); =}  // Trigger mode change
 }
diff --git a/test/Python/src/modal_models/BanksModalStateReset.lf b/test/Python/src/modal_models/BanksModalStateReset.lf
index d127288e0b..c81f8eea3e 100644
--- a/test/Python/src/modal_models/BanksModalStateReset.lf
+++ b/test/Python/src/modal_models/BanksModalStateReset.lf
@@ -42,8 +42,7 @@ main reactor {
   reset2.mode_switch,
   reset2.count0,
   reset2.count1,
-  reset2.count2
-    -> test.events
+  reset2.count2 -> test.events
 
   # Trigger mode change (separately because of #1278)
   reaction(stepper) -> reset1.next {=
diff --git a/test/Python/src/modal_models/ModalActions.lf b/test/Python/src/modal_models/ModalActions.lf
index fd4adf8eb8..73f565c62a 100644
--- a/test/Python/src/modal_models/ModalActions.lf
+++ b/test/Python/src/modal_models/ModalActions.lf
@@ -87,8 +87,7 @@ main reactor {
   modal.action1_sched,
   modal.action1_exec,
   modal.action2_sched,
-  modal.action2_exec
-    -> test.events
+  modal.action2_exec -> test.events
 
   reaction(stepper) -> modal.next {= modal.next.set(True) =}  # Trigger mode change
 }
diff --git a/test/Python/src/modal_models/ModalStartupShutdown.lf b/test/Python/src/modal_models/ModalStartupShutdown.lf
index f5210580d1..e464f79c42 100644
--- a/test/Python/src/modal_models/ModalStartupShutdown.lf
+++ b/test/Python/src/modal_models/ModalStartupShutdown.lf
@@ -135,8 +135,7 @@ main reactor {
   modal.shutdown4,
   modal.startup5,
   modal.reset5,
-  modal.shutdown5
-    -> test.events
+  modal.shutdown5 -> test.events
 
   reaction(stepper) -> modal.next {= modal.next.set(True) =}  # Trigger mode change
 }
diff --git a/test/TypeScript/src/DeadlineHandledAbove.lf b/test/TypeScript/src/DeadlineHandledAbove.lf
index 8ab2bb5617..8d4f18976a 100644
--- a/test/TypeScript/src/DeadlineHandledAbove.lf
+++ b/test/TypeScript/src/DeadlineHandledAbove.lf
@@ -10,9 +10,7 @@ reactor Deadline(threshold: time = 100 msec) {
 
   reaction(x) -> deadline_violation {=
     util.requestErrorStop("ERROR: Deadline violation was not detected!")
-  =} deadline(
-    threshold
-  ) {=
+  =} deadline(threshold) {=
     console.log("Deadline violation detected.");
     deadline_violation = true;
   =}
diff --git a/test/TypeScript/src/SimpleDeadline.lf b/test/TypeScript/src/SimpleDeadline.lf
index dde3cd07e9..56ffd3f64f 100644
--- a/test/TypeScript/src/SimpleDeadline.lf
+++ b/test/TypeScript/src/SimpleDeadline.lf
@@ -8,9 +8,7 @@ reactor Deadline(threshold: time = 100 msec) {
 
   reaction(x) -> deadlineViolation {=
     util.requestErrorStop("ERROR: Deadline violation was not detected!")
-  =} deadline(
-    threshold
-  ) {=
+  =} deadline(threshold) {=
     console.log("Deadline violation detected.");
     deadlineViolation = true;
   =}

From 8a0cc25cf9df92568356eb9f75d0518d638d16f0 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 15 Jun 2023 15:27:14 -0700
Subject: [PATCH 0364/1114] Run the formatter if there are no syntax errors.

Previously any messages (even just info messages!) would stop the
formatter from being run, which is an unnecessary requirement. If we can
understand the AST, we can format it.
---
 .../java/org/lflang/formatting2/LFFormatter.java    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/lflang/formatting2/LFFormatter.java b/core/src/main/java/org/lflang/formatting2/LFFormatter.java
index 4d7c511b76..e2ea020af1 100644
--- a/core/src/main/java/org/lflang/formatting2/LFFormatter.java
+++ b/core/src/main/java/org/lflang/formatting2/LFFormatter.java
@@ -7,6 +7,7 @@
 import com.google.inject.Inject;
 import java.util.List;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.diagnostics.Severity;
 import org.eclipse.xtext.formatting2.FormatterRequest;
 import org.eclipse.xtext.formatting2.IFormatter2;
 import org.eclipse.xtext.formatting2.regionaccess.ITextReplacement;
@@ -24,13 +25,11 @@ public class LFFormatter implements IFormatter2 {
   @Override
   public List<ITextReplacement> format(FormatterRequest request) {
     // TODO: Use a CancelIndicator that actually cancels?
-    if (!request.getTextRegionAccess().getResource().getErrors().isEmpty()
-        || !validator
-            .validate(
-                request.getTextRegionAccess().getResource(),
-                CheckMode.ALL,
-                CancelIndicator.NullImpl)
-            .isEmpty()) {
+    if (validator
+        .validate(
+            request.getTextRegionAccess().getResource(), CheckMode.ALL, CancelIndicator.NullImpl)
+        .stream()
+        .anyMatch(it -> it.isSyntaxError() && it.getSeverity() == Severity.ERROR)) {
       return List.of();
     }
     ITextSegment documentRegion = request.getTextRegionAccess().regionForDocument();

From 0484b4e7f2db2e6c11cfab6849cfb9cce7a882ff Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 15 Jun 2023 15:31:36 -0700
Subject: [PATCH 0365/1114] Format Java.

---
 .../java/org/lflang/ast/MalleableString.java  | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/MalleableString.java b/core/src/main/java/org/lflang/ast/MalleableString.java
index 1081182ec8..7a9c42b231 100644
--- a/core/src/main/java/org/lflang/ast/MalleableString.java
+++ b/core/src/main/java/org/lflang/ast/MalleableString.java
@@ -358,9 +358,12 @@ public boolean findBestRepresentation(
       this.width = width;
       keepCommentsOnSameLine = true;
       var everChanged = false;
-      var changed = optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);
+      var changed =
+          optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);
       everChanged = changed;
-      if (changed) changed = optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);
+      if (changed)
+        changed =
+            optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);
       if (components.stream()
           .noneMatch(
               it ->
@@ -370,12 +373,16 @@ public boolean findBestRepresentation(
                       .isPresent())) return changed;
       long badnessTrue = badness.applyAsLong(providedRender.get());
       keepCommentsOnSameLine = false;
-      changed = optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);
+      changed =
+          optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);
       everChanged |= changed;
       long badnessFalse = badness.applyAsLong(providedRender.get());
       keepCommentsOnSameLine = badnessTrue < badnessFalse;
-      if (changed) changed = optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);
-      if (changed) optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);
+      if (changed)
+        changed =
+            optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);
+      if (changed)
+        optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);
       return everChanged;
     }
 
@@ -385,9 +392,8 @@ private boolean optimizeChildren(
         int width,
         int indentation,
         String singleLineCommentPrefix) {
-      return components
-          .reverse()
-          .stream().anyMatch(
+      return components.reverse().stream()
+          .anyMatch(
               it ->
                   it.findBestRepresentation(
                       providedRender, badness, width, indentation, singleLineCommentPrefix));

From f67d77fab5847bdc0567dd681835e29e3fbe4ec3 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 15 Jun 2023 15:37:16 -0700
Subject: [PATCH 0366/1114] Add test case.

---
 .../test/java/org/lflang/cli/LffCliTest.java  | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java b/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
index 43c045919b..89e09674ba 100644
--- a/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
+++ b/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
@@ -141,7 +141,37 @@ reactor Filter(period: int = 0, b: double[] = {0, 0}) {
                     // baz
                     state grid2: SnakeGrid = {= SnakeGrid::new(grid_side, &snake) =}
                   }
-                  """));
+                  """),
+          List.of(
+              """
+                  target Cpp
+                  
+                  reactor ContextManager<Req, Resp, Ctx> {
+                  
+                  
+                     \s
+                  }
+                  
+                  reactor MACService {
+                    mul_cm = new ContextManager<loooooooooooooooooooooooooooooong, looooooooooooooong, loooooooooooooong>()
+                  }
+                  
+                  """,
+              """
+                  target Cpp
+                  
+                  reactor ContextManager<Req, Resp, Ctx> {
+                  }
+                  
+                  reactor MACService {
+                    mul_cm = new ContextManager<
+                      loooooooooooooooooooooooooooooong,
+                      looooooooooooooong,
+                      loooooooooooooong
+                    >()
+                  }
+                  """
+              ));
 
   LffTestFixture lffTester = new LffTestFixture();
 

From 679ad1822aebd0369d84642bc359d5577448e271 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 15 Jun 2023 17:40:14 -0700
Subject: [PATCH 0367/1114] Try to get more test output.

---
 core/src/testFixtures/java/org/lflang/tests/LFTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/LFTest.java b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
index c38160150c..64e7b36dc3 100644
--- a/core/src/testFixtures/java/org/lflang/tests/LFTest.java
+++ b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
@@ -258,8 +258,7 @@ private Thread recordStream(StringBuffer builder, InputStream inputStream) {
               char[] buf = new char[1024];
               while ((len = reader.read(buf)) > 0) {
                 builder.append(buf, 0, len);
-                if (Runtime.getRuntime().freeMemory()
-                    < Runtime.getRuntime().totalMemory() * 3 / 4) {
+                if (Runtime.getRuntime().freeMemory() < Runtime.getRuntime().totalMemory() / 3) {
                   builder.delete(0, builder.length() / 2);
                 }
               }

From 1b785a932a9420b32099ef6d73b9b5a079a02fa2 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 15 Jun 2023 23:01:14 -0700
Subject: [PATCH 0368/1114] Format Java.

---
 .../test/java/org/lflang/cli/LffCliTest.java    | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java b/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
index 89e09674ba..27c43c80cc 100644
--- a/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
+++ b/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
@@ -145,24 +145,24 @@ reactor Filter(period: int = 0, b: double[] = {0, 0}) {
           List.of(
               """
                   target Cpp
-                  
+
                   reactor ContextManager<Req, Resp, Ctx> {
-                  
-                  
+
+
                      \s
                   }
-                  
+
                   reactor MACService {
                     mul_cm = new ContextManager<loooooooooooooooooooooooooooooong, looooooooooooooong, loooooooooooooong>()
                   }
-                  
+
                   """,
               """
                   target Cpp
-                  
+
                   reactor ContextManager<Req, Resp, Ctx> {
                   }
-                  
+
                   reactor MACService {
                     mul_cm = new ContextManager<
                       loooooooooooooooooooooooooooooong,
@@ -170,8 +170,7 @@ reactor Filter(period: int = 0, b: double[] = {0, 0}) {
                       loooooooooooooong
                     >()
                   }
-                  """
-              ));
+                  """));
 
   LffTestFixture lffTester = new LffTestFixture();
 

From c8b9f1ad454a5b45834a7d8348563da236ec227e Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 16 Jun 2023 00:00:39 -0700
Subject: [PATCH 0369/1114] Add comment.

---
 core/src/main/java/org/lflang/ast/MalleableString.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/src/main/java/org/lflang/ast/MalleableString.java b/core/src/main/java/org/lflang/ast/MalleableString.java
index 7a9c42b231..ac4014748d 100644
--- a/core/src/main/java/org/lflang/ast/MalleableString.java
+++ b/core/src/main/java/org/lflang/ast/MalleableString.java
@@ -357,6 +357,14 @@ public boolean findBestRepresentation(
         String singleLineCommentPrefix) {
       this.width = width;
       keepCommentsOnSameLine = true;
+      // Multiple calls to optimizeChildren may be required because as parts of the textual
+      // representation are updated, the optimal representation of other parts may change.
+      // For example, if the text is wider than 100 characters, the line may only need to be
+      // broken in one place, but it will be broken in multiple places a second optimization pass
+      // is not made. This is a heuristic in the sense that two passes are not guaranteed to result
+      // in a fixed point, but since a subsequent call to the formatter will get the same AST and
+      // therefore have the same starting point, the formatter as a whole should still be
+      // idempotent.
       var everChanged = false;
       var changed =
           optimizeChildren(providedRender, badness, width, indentation, singleLineCommentPrefix);

From c90c84bb6d034188be30f4e7c421924712970114 Mon Sep 17 00:00:00 2001
From: revol-xut <revol-xut@protonmail.com>
Date: Fri, 16 Jun 2023 10:16:52 +0200
Subject: [PATCH 0370/1114] updating reactor-cpp

---
 org.lflang/src/lib/cpp/reactor-cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/lib/cpp/reactor-cpp b/org.lflang/src/lib/cpp/reactor-cpp
index b607f1f640..f6551c8a12 160000
--- a/org.lflang/src/lib/cpp/reactor-cpp
+++ b/org.lflang/src/lib/cpp/reactor-cpp
@@ -1 +1 @@
-Subproject commit b607f1f64083ab531e7a676b29de75f076aa1cde
+Subproject commit f6551c8a12dd8870e8bf065b192ba8f2ada35ef2

From 08896ddd2dac0997b382b79c5c062449f52d5779 Mon Sep 17 00:00:00 2001
From: revol-xut <revol-xut@protonmail.com>
Date: Fri, 16 Jun 2023 10:55:26 +0200
Subject: [PATCH 0371/1114] updating reactor-cpp

---
 .gitmodules                        | 2 +-
 org.lflang/src/lib/cpp/reactor-cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 9cd89ffe1a..2bbfceff4a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/lf-lang/reactor-c.git
 [submodule "org.lflang/src/lib/cpp/reactor-cpp"]
 	path = core/src/main/resources/lib/cpp/reactor-cpp
-	url = https://github.com/lf-lang/reactor-cpp
+	url = https://github.com/lf-lang/reactor-cpp/connection-optimization
 [submodule "org.lflang/src/lib/rs/reactor-rs"]
 	path = core/src/main/resources/lib/rs/reactor-rs
 	url = https://github.com/lf-lang/reactor-rs
diff --git a/org.lflang/src/lib/cpp/reactor-cpp b/org.lflang/src/lib/cpp/reactor-cpp
index f6551c8a12..b607f1f640 160000
--- a/org.lflang/src/lib/cpp/reactor-cpp
+++ b/org.lflang/src/lib/cpp/reactor-cpp
@@ -1 +1 @@
-Subproject commit f6551c8a12dd8870e8bf065b192ba8f2ada35ef2
+Subproject commit b607f1f64083ab531e7a676b29de75f076aa1cde

From 49c88443373ce537d1246b4f3bfd6376854b0fbb Mon Sep 17 00:00:00 2001
From: revol-xut <revol-xut@protonmail.com>
Date: Fri, 16 Jun 2023 11:02:08 +0200
Subject: [PATCH 0372/1114] updating reactor-cpp

---
 .gitmodules                        | 3 ++-
 org.lflang/src/lib/cpp/reactor-cpp | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 160000 org.lflang/src/lib/cpp/reactor-cpp

diff --git a/.gitmodules b/.gitmodules
index 2bbfceff4a..036edd9440 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,8 @@
 	url = https://github.com/lf-lang/reactor-c.git
 [submodule "org.lflang/src/lib/cpp/reactor-cpp"]
 	path = core/src/main/resources/lib/cpp/reactor-cpp
-	url = https://github.com/lf-lang/reactor-cpp/connection-optimization
+    url = https://github.com/lf-lang/reactor-cpp.git
+    branch = "connection-optimization"
 [submodule "org.lflang/src/lib/rs/reactor-rs"]
 	path = core/src/main/resources/lib/rs/reactor-rs
 	url = https://github.com/lf-lang/reactor-rs
diff --git a/org.lflang/src/lib/cpp/reactor-cpp b/org.lflang/src/lib/cpp/reactor-cpp
deleted file mode 160000
index b607f1f640..0000000000
--- a/org.lflang/src/lib/cpp/reactor-cpp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b607f1f64083ab531e7a676b29de75f076aa1cde

From 9fd718797df7d8041d043e158cfff19129b23895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Fri, 16 Jun 2023 15:18:33 +0200
Subject: [PATCH 0373/1114] Make LfInjectorProvider a singleton

Make TestRegistry a non-static singleton that can be injected.
---
 core/build.gradle                             |   2 +-
 .../java/org/lflang/ast/LfParsingHelper.java  |   6 +-
 .../tests/compiler/FormattingUnitTests.java   |   7 +-
 .../lflang/tests/compiler/RoundTripTests.java |   9 +-
 .../org/lflang/tests/LFInjectorProvider.java  |  67 +++++
 .../java/org/lflang/tests/TestBase.java       |   7 +-
 .../java/org/lflang/tests/TestRegistry.java   | 268 +++++++++---------
 7 files changed, 223 insertions(+), 143 deletions(-)
 create mode 100644 core/src/testFixtures/java/org/lflang/tests/LFInjectorProvider.java

diff --git a/core/build.gradle b/core/build.gradle
index 131d7dc85f..80c72c4618 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -22,7 +22,7 @@ sourceSets {
     }
     testFixtures {
         java {
-            srcDirs = ['src/testFixtures/java', 'test-gen']
+            srcDirs = ['src/testFixtures/java']
         }
     }
 }
diff --git a/core/src/main/java/org/lflang/ast/LfParsingHelper.java b/core/src/main/java/org/lflang/ast/LfParsingHelper.java
index 85a0ba6890..f44b18039b 100644
--- a/core/src/main/java/org/lflang/ast/LfParsingHelper.java
+++ b/core/src/main/java/org/lflang/ast/LfParsingHelper.java
@@ -1,5 +1,6 @@
 package org.lflang.ast;
 
+import com.google.inject.Inject;
 import com.google.inject.Injector;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -20,11 +21,14 @@
 public class LfParsingHelper {
 
   private final Injector injector = new LFStandaloneSetup().createInjectorAndDoEMFRegistration();
+  @Inject
+  XtextResourceSet resourceSet;
 
   public Model parse(Path file) {
     // Source:
     // https://wiki.eclipse.org/Xtext/FAQ#How_do_I_load_my_model_in_a_standalone_Java_application_.3F
-    XtextResourceSet resourceSet = injector.getInstance(XtextResourceSet.class);
+    XtextResourceSet resourceSet = this.resourceSet != null ? this.resourceSet
+        : injector.getInstance(XtextResourceSet.class);
     resourceSet.addLoadOption(XtextResource.OPTION_RESOLVE_ALL, Boolean.TRUE);
     Resource resource =
         resourceSet.getResource(URI.createFileURI(file.toFile().getAbsolutePath()), true);
diff --git a/core/src/test/java/org/lflang/tests/compiler/FormattingUnitTests.java b/core/src/test/java/org/lflang/tests/compiler/FormattingUnitTests.java
index 882fa66e42..b6afecbfa7 100644
--- a/core/src/test/java/org/lflang/tests/compiler/FormattingUnitTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/FormattingUnitTests.java
@@ -10,6 +10,8 @@
 import org.lflang.tests.LFInjectorProvider;
 import org.lflang.tests.LfParsingTestHelper;
 
+import com.google.inject.Inject;
+
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
 public class FormattingUnitTests {
@@ -92,12 +94,15 @@ public void testCppInits() {
                 """);
   }
 
+  @Inject
+  LfParsingTestHelper parser;
+
   private void assertIsFormatted(String input) {
     assertFormatsTo(input, input);
   }
 
   private void assertFormatsTo(String input, String expectedOutput) {
-    Model inputModel = new LfParsingTestHelper().parseValidModel("test input", input);
+    Model inputModel = parser.parseValidModel("test input", input);
     String formattedString = FormattingUtil.render(inputModel);
     Assertions.assertEquals(
         expectedOutput, formattedString, "Formatted output is different from what was expected");
diff --git a/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java b/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
index dcd32b5846..a61ef91fec 100644
--- a/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
@@ -29,19 +29,24 @@
 import org.lflang.tests.TestRegistry;
 import org.lflang.tests.TestRegistry.TestCategory;
 
+import com.google.inject.Inject;
+
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
 @Execution(ExecutionMode.CONCURRENT)
 public class RoundTripTests {
+  @Inject
+  private LfParsingHelper parser;
+  @Inject
+  private TestRegistry testRegistry;
 
   @TestFactory
   public Collection<DynamicTest> roundTripTestFactory() {
     List<DynamicTest> result = new ArrayList<>();
     Path cwd = Paths.get(".").toAbsolutePath();
-    LfParsingHelper parser = new LfParsingHelper();
     for (Target target : Target.values()) {
       for (TestCategory category : TestCategory.values()) {
-        for (LFTest test : TestRegistry.getRegisteredTests(target, category, false)) {
+        for (LFTest test : testRegistry.getRegisteredTests(target, category, false)) {
           URI testSourceUri = test.getSrcPath().toUri();
           result.add(
               DynamicTest.dynamicTest(
diff --git a/core/src/testFixtures/java/org/lflang/tests/LFInjectorProvider.java b/core/src/testFixtures/java/org/lflang/tests/LFInjectorProvider.java
new file mode 100644
index 0000000000..b88b4ee16c
--- /dev/null
+++ b/core/src/testFixtures/java/org/lflang/tests/LFInjectorProvider.java
@@ -0,0 +1,67 @@
+/*
+ * generated by Xtext 2.28.0
+ */
+
+package org.lflang.tests;
+
+import org.eclipse.xtext.testing.GlobalRegistries;
+import org.eclipse.xtext.testing.IInjectorProvider;
+
+import org.lflang.LFRuntimeModule;
+import org.lflang.LFStandaloneSetup;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Singleton;
+
+/**
+ * Note: this is a copy of a file generated by XText. The main
+ * modifications is to make this a {@link Singleton}.
+ * This is because XText initialization relies on global static
+ * fields, and concurrent test class initialization may not work
+ * properly.
+ * This modified version also does not implement {@link org.eclipse.xtext.testing.IRegistryConfigurator},
+ * which would have cleaned up the registry in a non-deterministic way.
+ * The global XText state is thus shared by all concurrent tests and
+ * initialized exactly once.
+ */
+@Singleton
+public class LFInjectorProvider implements IInjectorProvider {
+
+    protected volatile Injector injector;
+
+    @Override
+    public Injector getInjector() {
+        if (injector == null) {
+            synchronized (this) {
+                if (injector == null) {
+                    GlobalRegistries.initializeDefaults();
+                    this.injector = internalCreateInjector();
+                }
+            }
+        }
+        return injector;
+    }
+
+    protected Injector internalCreateInjector() {
+        return new LFStandaloneSetup() {
+            @Override
+            public Injector createInjector() {
+                return Guice.createInjector(createRuntimeModule());
+            }
+        }.createInjectorAndDoEMFRegistration();
+    }
+
+    protected LFRuntimeModule createRuntimeModule() {
+        // make it work also with Maven/Tycho and OSGI
+        // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
+        return new LFRuntimeModule() {
+            @Override
+            public ClassLoader bindClassLoaderToInstance() {
+                return LFInjectorProvider.class
+                    .getClassLoader();
+            }
+        };
+    }
+
+}
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index c149c550c6..b801bcadcb 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -68,6 +68,8 @@ public abstract class TestBase {
   @Inject JavaIoFileSystemAccess fileAccess;
   @Inject Provider<ResourceSet> resourceSetProvider;
 
+  @Inject TestRegistry testRegistry;
+
   /** Reference to System.out. */
   private static final PrintStream out = System.out;
 
@@ -174,7 +176,6 @@ protected TestBase(Target first) {
   protected TestBase(List<Target> targets) {
     assertFalse(targets.isEmpty(), "empty target list");
     this.targets = Collections.unmodifiableList(targets);
-    TestRegistry.initialize();
   }
 
   /**
@@ -195,13 +196,13 @@ protected final void runTestsAndPrintResults(
     var categories = Arrays.stream(TestCategory.values()).filter(selected).toList();
     for (var category : categories) {
       System.out.println(category.getHeader());
-      var tests = TestRegistry.getRegisteredTests(target, category, copy);
+      var tests = testRegistry.getRegisteredTests(target, category, copy);
       try {
         validateAndRun(tests, configurator, level);
       } catch (IOException e) {
         throw new RuntimeIOException(e);
       }
-      System.out.println(TestRegistry.getCoverageReport(target, category));
+      System.out.println(testRegistry.getCoverageReport(target, category));
       checkAndReportFailures(tests);
     }
   }
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
index bda0fabb1c..55318936f3 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
@@ -12,6 +12,7 @@
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Arrays;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -28,41 +29,17 @@
 import org.lflang.lf.Reactor;
 import org.lflang.tests.TestBase.TestLevel;
 
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
 /**
  * A registry to retrieve tests from, organized by target and category.
  *
  * @author Marten Lohstroh
  */
+@Singleton
 public class TestRegistry {
 
-  static class TestMap {
-    /** Registry that maps targets to maps from categories to sets of tests. */
-    protected final Map<Target, Map<TestCategory, Set<LFTest>>> map = new HashMap<>();
-
-    /** Create a new test map. */
-    public TestMap() {
-      // Populate the internal datastructures.
-      for (Target target : Target.values()) {
-        Map<TestCategory, Set<LFTest>> categories = new HashMap<>();
-        for (TestCategory cat : TestCategory.values()) {
-          categories.put(cat, new TreeSet<>());
-        }
-        map.put(target, categories);
-      }
-    }
-
-    /**
-     * Return a set of tests given a target and test category.
-     *
-     * @param t The target.
-     * @param c The test category.
-     * @return A set of tests for the given target and test category.
-     */
-    public Set<LFTest> getTests(Target t, TestCategory c) {
-      return this.map.get(t).get(c);
-    }
-  }
-
   /**
    * List of directories that should be skipped when indexing test files. Any test file that has a
    * directory in its path that matches an entry in this array will not be discovered.
@@ -78,117 +55,29 @@ public Set<LFTest> getTests(Target t, TestCategory c) {
   public static final Path LF_TEST_PATH = LF_REPO_PATH.resolve("test");
 
   /** Internal data structure that stores registered tests. */
-  protected static final TestMap registered = new TestMap();
+  private final TestMap registered = new TestMap();
 
   /**
    * Internal data structure that stores ignored tests. For instance, source files with no main
    * reactor are indexed here.
    */
-  protected static final TestMap ignored = new TestMap();
+  private final TestMap ignored = new TestMap();
 
   /**
    * A map from each test category to a set of tests that is the union of all registered tests in
    * that category across all targets.
    */
-  protected static final Map<TestCategory, Set<LFTest>> allTargets = new HashMap<>();
+  private final Map<TestCategory, Set<LFTest>> allTargets = new EnumMap<>(TestCategory.class);
 
-  /**
-   * Enumeration of test categories, used to map tests to categories. The nearest containing
-   * directory that matches any of the categories will determine the category that the test is
-   * mapped to. Matching is case insensitive.
-   *
-   * <p>For example, the following files will all map to THREADED:
-   *
-   * <ul>
-   *   <li>C/threaded/Foo.lf
-   *   <li>C/THREADED/Foo.lf
-   *   <li>C/Threaded/Foo.lf
-   *   <li>C/foo/threaded/Bar.lf
-   *   <li>C/foo/bar/threaded/Threaded.lf
-   *   <li>C/federated/threaded/bar.lf but the following will not:
-   *   <li>C/Foo.lf (maps to COMMON)
-   *   <li>C/Threaded.lf (maps to COMMON)
-   *   <li>C/threaded/federated/foo.lf (maps to FEDERATED)
-   * </ul>
-   *
-   * @author Marten Lohstroh
-   */
-  public enum TestCategory {
-    /** Tests about concurrent execution. */
-    CONCURRENT(true),
-    /** Test about enclaves */
-    ENCLAVE(false),
-    /** Basic tests, i.e., tests that all targets are supposed to implement. */
-    BASIC(true),
-    /** Tests about generics. */
-    GENERICS(true),
-    /** Tests about multiports and banks of reactors. */
-    MULTIPORT(true),
-    /** Tests about federated execution. */
-    FEDERATED(true),
-    /** Tests about specific target properties. */
-    PROPERTIES(true),
-    /** Tests concerning modal reactors */
-    MODAL_MODELS(true),
-    NO_INLINING(false),
-    // non-shared tests
-    DOCKER(true),
-    DOCKER_FEDERATED(true, "docker" + File.separator + "federated"),
-    SERIALIZATION(false),
-    ARDUINO(false, TestLevel.BUILD),
-    ZEPHYR(false, TestLevel.BUILD),
-    TARGET(false);
-
-    /** Whether we should compare coverage against other targets. */
-    public final boolean isCommon;
-
-    public final String path;
-    public final TestLevel level;
-
-    /** Create a new test category. */
-    TestCategory(boolean isCommon) {
-      this.isCommon = isCommon;
-      this.path = this.name().toLowerCase();
-      this.level = TestLevel.EXECUTION;
-    }
-
-    /** Create a new test category. */
-    TestCategory(boolean isCommon, TestLevel level) {
-      this.isCommon = isCommon;
-      this.path = this.name().toLowerCase();
-      this.level = level;
-    }
-
-    /** Create a new test category. */
-    TestCategory(boolean isCommon, String path) {
-      this.isCommon = isCommon;
-      this.path = path;
-      this.level = TestLevel.EXECUTION;
-    }
-
-    public String getPath() {
-      return path;
-    }
-
-    /**
-     * Return a header associated with the category.
-     *
-     * @return A header to print in the test report.
-     */
-    public String getHeader() {
-      return TestBase.THICK_LINE + "Category: " + this.name();
-    }
-  }
+  @Inject
+  private LFResourceProvider resourceProvider;
 
   // Static code that performs the file system traversal and discovers
   // all .lf files to be included in the registry.
-  static {
+  @Inject
+  public void initialize() {
     System.out.println("Indexing...");
-    ResourceSet rs =
-        new LFStandaloneSetup()
-            .createInjectorAndDoEMFRegistration()
-            .getInstance(LFResourceProvider.class)
-            .getResourceSet();
+    ResourceSet rs = resourceProvider.getResourceSet();
 
     // Prepare for the collection of tests per category.
     for (TestCategory t : TestCategory.values()) {
@@ -217,12 +106,6 @@ public String getHeader() {
     }
   }
 
-  /**
-   * Calling this function forces the lazy initialization of the static code that indexes all files.
-   * It is advisable to do this prior to executing other code that prints to standard out so that
-   * any error messages printed while indexing are printed first.
-   */
-  public static void initialize() {}
 
   /**
    * Return the tests that were indexed for a given target and category.
@@ -233,7 +116,7 @@ public static void initialize() {}
    *     themselves.
    * @return A set of tests for the given target/category.
    */
-  public static Set<LFTest> getRegisteredTests(Target target, TestCategory category, boolean copy) {
+  public Set<LFTest> getRegisteredTests(Target target, TestCategory category, boolean copy) {
     if (copy) {
       Set<LFTest> copies = new TreeSet<>();
       for (LFTest test : registered.getTests(target, category)) {
@@ -246,13 +129,13 @@ public static Set<LFTest> getRegisteredTests(Target target, TestCategory categor
   }
 
   /** Return the test that were found but not indexed because they did not have a main reactor. */
-  public static Set<LFTest> getIgnoredTests(Target target, TestCategory category) {
+  public Set<LFTest> getIgnoredTests(Target target, TestCategory category) {
     return ignored.getTests(target, category);
   }
 
-  public static String getCoverageReport(Target target, TestCategory category) {
+  public String getCoverageReport(Target target, TestCategory category) {
     StringBuilder s = new StringBuilder();
-    Set<LFTest> ignored = TestRegistry.getIgnoredTests(target, category);
+    Set<LFTest> ignored = getIgnoredTests(target, category);
     s.append(TestBase.THIN_LINE);
     s.append("Ignored: ").append(ignored.size()).append("\n");
     s.append(TestBase.THIN_LINE);
@@ -294,7 +177,7 @@ public static String getCoverageReport(Target target, TestCategory category) {
    *
    * @author Marten Lohstroh
    */
-  public static class TestDirVisitor extends SimpleFileVisitor<Path> {
+  private class TestDirVisitor extends SimpleFileVisitor<Path> {
 
     /** The stack of which the top element indicates the "current" category. */
     protected Stack<TestCategory> stack = new Stack<>();
@@ -381,4 +264,119 @@ public void walk() throws IOException {
       Files.walkFileTree(srcBasePath, this);
     }
   }
+  static class TestMap {
+    /** Registry that maps targets to maps from categories to sets of tests. */
+    protected final Map<Target, Map<TestCategory, Set<LFTest>>> map = new HashMap<>();
+
+    /** Create a new test map. */
+    public TestMap() {
+      // Populate the internal datastructures.
+      for (Target target : Target.values()) {
+        Map<TestCategory, Set<LFTest>> categories = new HashMap<>();
+        for (TestCategory cat : TestCategory.values()) {
+          categories.put(cat, new TreeSet<>());
+        }
+        map.put(target, categories);
+      }
+    }
+
+    /**
+     * Return a set of tests given a target and test category.
+     *
+     * @param t The target.
+     * @param c The test category.
+     * @return A set of tests for the given target and test category.
+     */
+    public Set<LFTest> getTests(Target t, TestCategory c) {
+      return this.map.get(t).get(c);
+    }
+  }
+  /**
+   * Enumeration of test categories, used to map tests to categories. The nearest containing
+   * directory that matches any of the categories will determine the category that the test is
+   * mapped to. Matching is case insensitive.
+   *
+   * <p>For example, the following files will all map to THREADED:
+   *
+   * <ul>
+   *   <li>C/threaded/Foo.lf
+   *   <li>C/THREADED/Foo.lf
+   *   <li>C/Threaded/Foo.lf
+   *   <li>C/foo/threaded/Bar.lf
+   *   <li>C/foo/bar/threaded/Threaded.lf
+   *   <li>C/federated/threaded/bar.lf but the following will not:
+   *   <li>C/Foo.lf (maps to COMMON)
+   *   <li>C/Threaded.lf (maps to COMMON)
+   *   <li>C/threaded/federated/foo.lf (maps to FEDERATED)
+   * </ul>
+   *
+   * @author Marten Lohstroh
+   */
+  public enum TestCategory {
+    /** Tests about concurrent execution. */
+    CONCURRENT(true),
+    /** Test about enclaves */
+    ENCLAVE(false),
+    /** Basic tests, i.e., tests that all targets are supposed to implement. */
+    BASIC(true),
+    /** Tests about generics. */
+    GENERICS(true),
+    /** Tests about multiports and banks of reactors. */
+    MULTIPORT(true),
+    /** Tests about federated execution. */
+    FEDERATED(true),
+    /** Tests about specific target properties. */
+    PROPERTIES(true),
+    /** Tests concerning modal reactors */
+    MODAL_MODELS(true),
+    NO_INLINING(false),
+    // non-shared tests
+    DOCKER(true),
+    DOCKER_FEDERATED(true, "docker" + File.separator + "federated"),
+    SERIALIZATION(false),
+    ARDUINO(false, TestLevel.BUILD),
+    ZEPHYR(false, TestLevel.BUILD),
+    TARGET(false);
+
+    /** Whether we should compare coverage against other targets. */
+    public final boolean isCommon;
+
+    public final String path;
+    public final TestLevel level;
+
+    /** Create a new test category. */
+    TestCategory(boolean isCommon) {
+      this.isCommon = isCommon;
+      this.path = this.name().toLowerCase();
+      this.level = TestLevel.EXECUTION;
+    }
+
+    /** Create a new test category. */
+    TestCategory(boolean isCommon, TestLevel level) {
+      this.isCommon = isCommon;
+      this.path = this.name().toLowerCase();
+      this.level = level;
+    }
+
+    /** Create a new test category. */
+    TestCategory(boolean isCommon, String path) {
+      this.isCommon = isCommon;
+      this.path = path;
+      this.level = TestLevel.EXECUTION;
+    }
+
+    public String getPath() {
+      return path;
+    }
+
+    /**
+     * Return a header associated with the category.
+     *
+     * @return A header to print in the test report.
+     */
+    public String getHeader() {
+      return TestBase.THICK_LINE + "Category: " + this.name();
+    }
+  }
+
 }

From fddce8e7ee5fa0d305228527cf09cb1084a52275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Fri, 16 Jun 2023 15:42:21 +0200
Subject: [PATCH 0374/1114] Also use dynamic tests for target property checks

---
 .../compiler/LinguaFrancaValidationTest.java  | 130 ++++++++++--------
 1 file changed, 76 insertions(+), 54 deletions(-)

diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 72e3574b33..4dd0ceccff 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -28,17 +28,27 @@
 package org.lflang.tests.compiler;
 
 import com.google.inject.Inject;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.eclipse.xtext.testing.util.ParseHelper;
 import org.eclipse.xtext.testing.validation.ValidationTestHelper;
 import org.eclipse.xtext.validation.Issue;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
+
 import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.ArrayType;
@@ -55,8 +65,6 @@
 import org.lflang.tests.LFInjectorProvider;
 import org.lflang.util.StringUtil;
 
-@ExtendWith(InjectionExtension.class)
-@InjectWith(LFInjectorProvider.class)
 
 /**
  * Collection of unit tests to ensure validation is done correctly.
@@ -67,6 +75,8 @@
  * @author Christian Menard
  * @author Alexander Schulz-Rosengarten
  */
+@ExtendWith(InjectionExtension.class)
+@InjectWith(LFInjectorProvider.class)
 public class LinguaFrancaValidationTest {
 
   @Inject ParseHelper<Model> parser;
@@ -1216,13 +1226,15 @@ public void recognizeHostNames() throws Exception {
       Map.of(
           PrimitiveType.BOOLEAN, List.of("1 sec", "foo", "\"foo\"", "[1]", "{baz: 42}", "'c'"),
           PrimitiveType.INTEGER,
-              List.of("foo", "\"bar\"", "1 sec", "[1, 2]", "{foo: \"bar\"}", "'c'"),
+          List.of("foo", "\"bar\"", "1 sec", "[1, 2]", "{foo: \"bar\"}", "'c'"),
           PrimitiveType.NON_NEGATIVE_INTEGER,
-              List.of("-42", "foo", "\"bar\"", "1 sec", "[1, 2]", "{foo: \"bar\"}", "'c'"),
+          List.of("-42", "foo", "\"bar\"", "1 sec", "[1, 2]", "{foo: \"bar\"}", "'c'"),
           PrimitiveType.TIME_VALUE,
-              List.of(
-                  "foo", "\"bar\"", "\"3 sec\"", "\"4 weeks\"", "[1, 2]", "{foo: \"bar\"}", "'c'"),
-          PrimitiveType.STRING, List.of("1 msec", "[1, 2]", "{foo: \"bar\"}", "'c'"));
+          List.of(
+              "foo", "\"bar\"", "\"3 sec\"", "\"4 weeks\"", "[1, 2]", "{foo: \"bar\"}", "'c'"),
+          PrimitiveType.STRING, List.of("1 msec", "[1, 2]", "{foo: \"bar\"}", "'c'"),
+          PrimitiveType.FILE, List.of("\"\"")
+      );
 
   /**
    * Maps a type to a list, each entry of which represents a list with three entries: a known wrong
@@ -1361,8 +1373,11 @@ private List<String> synthesizeExamples(TargetPropertyType type, boolean correct
     if (type instanceof PrimitiveType) {
       Map<PrimitiveType, List<String>> values =
           correct ? primitiveTypeToKnownGood : primitiveTypeToKnownBad;
+      if (type == PrimitiveType.FILE) {
+        return Collections.emptyList();
+      }
       List<String> examples = values.get(type);
-      Assertions.assertNotNull(examples);
+      Assertions.assertNotNull(examples, "No examples for " + type);
       return examples;
     } else {
       if (type instanceof UnionType) {
@@ -1386,7 +1401,6 @@ private List<String> synthesizeExamples(TargetPropertyType type, boolean correct
    */
   private Model createModel(TargetProperty key, String value) throws Exception {
     String target = key.supportedBy.get(0).getDisplayName();
-    System.out.printf("%s: %s%n", key, value);
     return parseWithoutError(
         """
                 target %s {%s: %s};
@@ -1399,29 +1413,34 @@ private Model createModel(TargetProperty key, String value) throws Exception {
   }
 
   /** Perform checks on target properties. */
-  @Test
-  public void checkTargetProperties() throws Exception {
+  @TestFactory
+  public Collection<DynamicTest> checkTargetProperties() throws Exception {
+    List<DynamicTest> result = new ArrayList<>();
+
     for (TargetProperty prop : TargetProperty.getOptions()) {
       if (prop == TargetProperty.CARGO_DEPENDENCIES) {
         // we test that separately as it has better error messages
-        return;
+        continue;
       }
-      System.out.printf("Testing target property %s which is %s%n", prop, prop.type);
-      System.out.println("====");
-      System.out.println("Known good assignments:");
       List<String> knownCorrect = synthesizeExamples(prop.type, true);
 
       for (String it : knownCorrect) {
-        Model model = createModel(prop, it);
-        validator.assertNoErrors(model);
-        // Also make sure warnings are produced when files are not present.
-        if (prop.type == PrimitiveType.FILE) {
-          validator.assertWarning(
-              model,
-              LfPackage.eINSTANCE.getKeyValuePair(),
-              null,
-              String.format("Could not find file: '%s'.", StringUtil.removeQuotes(it)));
-        }
+        var test = DynamicTest.dynamicTest(
+            "Property %s (%s) - known good assignment: %s".formatted(prop, prop.type, it),
+            () -> {
+              Model model = createModel(prop, it);
+              validator.assertNoErrors(model);
+              // Also make sure warnings are produced when files are not present.
+              if (prop.type == PrimitiveType.FILE) {
+                validator.assertWarning(
+                    model,
+                    LfPackage.eINSTANCE.getKeyValuePair(),
+                    null,
+                    String.format("Could not find file: '%s'.", StringUtil.removeQuotes(it)));
+              }
+            }
+        );
+        result.add(test);
       }
 
       // Extra checks for filenames. (This piece of code was commented out in the original xtend
@@ -1439,47 +1458,50 @@ public void checkTargetProperties() throws Exception {
       //                ]
       //            }
 
-      System.out.println("Known bad assignments:");
       List<String> knownIncorrect = synthesizeExamples(prop.type, false);
       if (!(knownIncorrect == null || knownIncorrect.isEmpty())) {
         for (String it : knownIncorrect) {
-          if (prop.type instanceof StringDictionaryType) {
-            validator.assertError(
-                createModel(prop, it),
-                LfPackage.eINSTANCE.getKeyValuePair(),
-                null,
-                String.format("Target property '%s.", prop),
-                "' is required to be a string.");
-          } else {
-            validator.assertError(
-                createModel(prop, it),
-                LfPackage.eINSTANCE.getKeyValuePair(),
-                null,
-                String.format("Target property '%s' is required to be %s.", prop, prop.type));
-          }
+          var test = DynamicTest.dynamicTest(
+              "Property %s (%s) - known bad assignment: %s".formatted(prop, prop.type, it),
+              () -> {
+                if (prop.type instanceof StringDictionaryType) {
+                  validator.assertError(
+                      createModel(prop, it),
+                      LfPackage.eINSTANCE.getKeyValuePair(),
+                      null,
+                      String.format("Target property '%s.", prop),
+                      "' is required to be a string.");
+                } else {
+                  validator.assertError(
+                      createModel(prop, it),
+                      LfPackage.eINSTANCE.getKeyValuePair(),
+                      null,
+                      String.format("Target property '%s' is required to be %s.", prop, prop.type));
+                }
+              }
+          );
+          result.add(test);
         }
       } else {
         // No type was synthesized. It must be a composite type.
         List<List<Object>> list = compositeTypeToKnownBad.get(prop.type);
-        if (list == null) {
-          System.out.printf(
-              "No known incorrect values provided for target property '%s'. Aborting test.%n",
-              prop);
-          Assertions.fail();
-        } else {
+        if (list != null) {
           for (List<Object> it : list) {
-            validator.assertError(
-                createModel(prop, it.get(0).toString()),
-                LfPackage.eINSTANCE.getKeyValuePair(),
-                null,
-                String.format(
-                    "Target property '%s%s' is required to be %s.", prop, it.get(1), it.get(2)));
+            var test = DynamicTest.dynamicTest(
+                "Property %s (%s) - known bad assignment: %s".formatted(prop, prop.type, it),
+                () -> validator.assertError(
+                    createModel(prop, it.get(0).toString()),
+                    LfPackage.eINSTANCE.getKeyValuePair(),
+                    null,
+                    String.format(
+                        "Target property '%s%s' is required to be %s.", prop, it.get(1), it.get(2)))
+            );
+            result.add(test);
           }
         }
       }
-      System.out.println("====");
     }
-    System.out.println("Done!");
+    return result;
   }
 
   @Test

From dcec369f704e136f0f61c53b78ba86474be3a010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Fri, 16 Jun 2023 15:43:25 +0200
Subject: [PATCH 0375/1114] Format

---
 .../java/org/lflang/ast/LfParsingHelper.java  |   7 +-
 .../tests/compiler/FormattingUnitTests.java   |   6 +-
 .../compiler/LinguaFrancaValidationTest.java  | 111 +++++++++---------
 .../lflang/tests/compiler/RoundTripTests.java |   9 +-
 .../org/lflang/tests/LFInjectorProvider.java  |  85 ++++++--------
 .../java/org/lflang/tests/TestRegistry.java   |  12 +-
 6 files changed, 107 insertions(+), 123 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/LfParsingHelper.java b/core/src/main/java/org/lflang/ast/LfParsingHelper.java
index f44b18039b..7018bc6ac2 100644
--- a/core/src/main/java/org/lflang/ast/LfParsingHelper.java
+++ b/core/src/main/java/org/lflang/ast/LfParsingHelper.java
@@ -21,14 +21,13 @@
 public class LfParsingHelper {
 
   private final Injector injector = new LFStandaloneSetup().createInjectorAndDoEMFRegistration();
-  @Inject
-  XtextResourceSet resourceSet;
+  @Inject XtextResourceSet resourceSet;
 
   public Model parse(Path file) {
     // Source:
     // https://wiki.eclipse.org/Xtext/FAQ#How_do_I_load_my_model_in_a_standalone_Java_application_.3F
-    XtextResourceSet resourceSet = this.resourceSet != null ? this.resourceSet
-        : injector.getInstance(XtextResourceSet.class);
+    XtextResourceSet resourceSet =
+        this.resourceSet != null ? this.resourceSet : injector.getInstance(XtextResourceSet.class);
     resourceSet.addLoadOption(XtextResource.OPTION_RESOLVE_ALL, Boolean.TRUE);
     Resource resource =
         resourceSet.getResource(URI.createFileURI(file.toFile().getAbsolutePath()), true);
diff --git a/core/src/test/java/org/lflang/tests/compiler/FormattingUnitTests.java b/core/src/test/java/org/lflang/tests/compiler/FormattingUnitTests.java
index b6afecbfa7..4eeb089972 100644
--- a/core/src/test/java/org/lflang/tests/compiler/FormattingUnitTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/FormattingUnitTests.java
@@ -1,5 +1,6 @@
 package org.lflang.tests.compiler;
 
+import com.google.inject.Inject;
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.junit.jupiter.api.Assertions;
@@ -10,8 +11,6 @@
 import org.lflang.tests.LFInjectorProvider;
 import org.lflang.tests.LfParsingTestHelper;
 
-import com.google.inject.Inject;
-
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
 public class FormattingUnitTests {
@@ -94,8 +93,7 @@ public void testCppInits() {
                 """);
   }
 
-  @Inject
-  LfParsingTestHelper parser;
+  @Inject LfParsingTestHelper parser;
 
   private void assertIsFormatted(String input) {
     assertFormatsTo(input, input);
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 4dd0ceccff..fd6f6511ec 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -28,14 +28,12 @@
 package org.lflang.tests.compiler;
 
 import com.google.inject.Inject;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.eclipse.xtext.testing.util.ParseHelper;
@@ -46,9 +44,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
-
 import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.ArrayType;
@@ -65,7 +60,6 @@
 import org.lflang.tests.LFInjectorProvider;
 import org.lflang.util.StringUtil;
 
-
 /**
  * Collection of unit tests to ensure validation is done correctly.
  *
@@ -1224,17 +1218,18 @@ public void recognizeHostNames() throws Exception {
   /** Maps a type to a list of known bad values. */
   Map<PrimitiveType, List<String>> primitiveTypeToKnownBad =
       Map.of(
-          PrimitiveType.BOOLEAN, List.of("1 sec", "foo", "\"foo\"", "[1]", "{baz: 42}", "'c'"),
+          PrimitiveType.BOOLEAN,
+          List.of("1 sec", "foo", "\"foo\"", "[1]", "{baz: 42}", "'c'"),
           PrimitiveType.INTEGER,
           List.of("foo", "\"bar\"", "1 sec", "[1, 2]", "{foo: \"bar\"}", "'c'"),
           PrimitiveType.NON_NEGATIVE_INTEGER,
           List.of("-42", "foo", "\"bar\"", "1 sec", "[1, 2]", "{foo: \"bar\"}", "'c'"),
           PrimitiveType.TIME_VALUE,
-          List.of(
-              "foo", "\"bar\"", "\"3 sec\"", "\"4 weeks\"", "[1, 2]", "{foo: \"bar\"}", "'c'"),
-          PrimitiveType.STRING, List.of("1 msec", "[1, 2]", "{foo: \"bar\"}", "'c'"),
-          PrimitiveType.FILE, List.of("\"\"")
-      );
+          List.of("foo", "\"bar\"", "\"3 sec\"", "\"4 weeks\"", "[1, 2]", "{foo: \"bar\"}", "'c'"),
+          PrimitiveType.STRING,
+          List.of("1 msec", "[1, 2]", "{foo: \"bar\"}", "'c'"),
+          PrimitiveType.FILE,
+          List.of("\"\""));
 
   /**
    * Maps a type to a list, each entry of which represents a list with three entries: a known wrong
@@ -1374,6 +1369,9 @@ private List<String> synthesizeExamples(TargetPropertyType type, boolean correct
       Map<PrimitiveType, List<String>> values =
           correct ? primitiveTypeToKnownGood : primitiveTypeToKnownBad;
       if (type == PrimitiveType.FILE) {
+        // We ignore the file type as there is no validator check in place.
+        // The validator does not report non-existing files, and any string
+        // is accepted.
         return Collections.emptyList();
       }
       List<String> examples = values.get(type);
@@ -1425,21 +1423,21 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
       List<String> knownCorrect = synthesizeExamples(prop.type, true);
 
       for (String it : knownCorrect) {
-        var test = DynamicTest.dynamicTest(
-            "Property %s (%s) - known good assignment: %s".formatted(prop, prop.type, it),
-            () -> {
-              Model model = createModel(prop, it);
-              validator.assertNoErrors(model);
-              // Also make sure warnings are produced when files are not present.
-              if (prop.type == PrimitiveType.FILE) {
-                validator.assertWarning(
-                    model,
-                    LfPackage.eINSTANCE.getKeyValuePair(),
-                    null,
-                    String.format("Could not find file: '%s'.", StringUtil.removeQuotes(it)));
-              }
-            }
-        );
+        var test =
+            DynamicTest.dynamicTest(
+                "Property %s (%s) - known good assignment: %s".formatted(prop, prop.type, it),
+                () -> {
+                  Model model = createModel(prop, it);
+                  validator.assertNoErrors(model);
+                  // Also make sure warnings are produced when files are not present.
+                  if (prop.type == PrimitiveType.FILE) {
+                    validator.assertWarning(
+                        model,
+                        LfPackage.eINSTANCE.getKeyValuePair(),
+                        null,
+                        String.format("Could not find file: '%s'.", StringUtil.removeQuotes(it)));
+                  }
+                });
         result.add(test);
       }
 
@@ -1461,25 +1459,26 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
       List<String> knownIncorrect = synthesizeExamples(prop.type, false);
       if (!(knownIncorrect == null || knownIncorrect.isEmpty())) {
         for (String it : knownIncorrect) {
-          var test = DynamicTest.dynamicTest(
-              "Property %s (%s) - known bad assignment: %s".formatted(prop, prop.type, it),
-              () -> {
-                if (prop.type instanceof StringDictionaryType) {
-                  validator.assertError(
-                      createModel(prop, it),
-                      LfPackage.eINSTANCE.getKeyValuePair(),
-                      null,
-                      String.format("Target property '%s.", prop),
-                      "' is required to be a string.");
-                } else {
-                  validator.assertError(
-                      createModel(prop, it),
-                      LfPackage.eINSTANCE.getKeyValuePair(),
-                      null,
-                      String.format("Target property '%s' is required to be %s.", prop, prop.type));
-                }
-              }
-          );
+          var test =
+              DynamicTest.dynamicTest(
+                  "Property %s (%s) - known bad assignment: %s".formatted(prop, prop.type, it),
+                  () -> {
+                    if (prop.type instanceof StringDictionaryType) {
+                      validator.assertError(
+                          createModel(prop, it),
+                          LfPackage.eINSTANCE.getKeyValuePair(),
+                          null,
+                          String.format("Target property '%s.", prop),
+                          "' is required to be a string.");
+                    } else {
+                      validator.assertError(
+                          createModel(prop, it),
+                          LfPackage.eINSTANCE.getKeyValuePair(),
+                          null,
+                          String.format(
+                              "Target property '%s' is required to be %s.", prop, prop.type));
+                    }
+                  });
           result.add(test);
         }
       } else {
@@ -1487,15 +1486,17 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
         List<List<Object>> list = compositeTypeToKnownBad.get(prop.type);
         if (list != null) {
           for (List<Object> it : list) {
-            var test = DynamicTest.dynamicTest(
-                "Property %s (%s) - known bad assignment: %s".formatted(prop, prop.type, it),
-                () -> validator.assertError(
-                    createModel(prop, it.get(0).toString()),
-                    LfPackage.eINSTANCE.getKeyValuePair(),
-                    null,
-                    String.format(
-                        "Target property '%s%s' is required to be %s.", prop, it.get(1), it.get(2)))
-            );
+            var test =
+                DynamicTest.dynamicTest(
+                    "Property %s (%s) - known bad assignment: %s".formatted(prop, prop.type, it),
+                    () ->
+                        validator.assertError(
+                            createModel(prop, it.get(0).toString()),
+                            LfPackage.eINSTANCE.getKeyValuePair(),
+                            null,
+                            String.format(
+                                "Target property '%s%s' is required to be %s.",
+                                prop, it.get(1), it.get(2))));
             result.add(test);
           }
         }
diff --git a/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java b/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
index a61ef91fec..7df80e7e3c 100644
--- a/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
@@ -4,6 +4,7 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import com.google.inject.Inject;
 import java.net.URI;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -29,16 +30,12 @@
 import org.lflang.tests.TestRegistry;
 import org.lflang.tests.TestRegistry.TestCategory;
 
-import com.google.inject.Inject;
-
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)
 @Execution(ExecutionMode.CONCURRENT)
 public class RoundTripTests {
-  @Inject
-  private LfParsingHelper parser;
-  @Inject
-  private TestRegistry testRegistry;
+  @Inject private LfParsingHelper parser;
+  @Inject private TestRegistry testRegistry;
 
   @TestFactory
   public Collection<DynamicTest> roundTripTestFactory() {
diff --git a/core/src/testFixtures/java/org/lflang/tests/LFInjectorProvider.java b/core/src/testFixtures/java/org/lflang/tests/LFInjectorProvider.java
index b88b4ee16c..0c17145f2e 100644
--- a/core/src/testFixtures/java/org/lflang/tests/LFInjectorProvider.java
+++ b/core/src/testFixtures/java/org/lflang/tests/LFInjectorProvider.java
@@ -4,64 +4,57 @@
 
 package org.lflang.tests;
 
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Singleton;
 import org.eclipse.xtext.testing.GlobalRegistries;
 import org.eclipse.xtext.testing.IInjectorProvider;
-
 import org.lflang.LFRuntimeModule;
 import org.lflang.LFStandaloneSetup;
 
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Singleton;
-
 /**
- * Note: this is a copy of a file generated by XText. The main
- * modifications is to make this a {@link Singleton}.
- * This is because XText initialization relies on global static
- * fields, and concurrent test class initialization may not work
- * properly.
- * This modified version also does not implement {@link org.eclipse.xtext.testing.IRegistryConfigurator},
- * which would have cleaned up the registry in a non-deterministic way.
- * The global XText state is thus shared by all concurrent tests and
- * initialized exactly once.
+ * Note: this is a copy of a file generated by XText. The main modifications is to make this a
+ * {@link Singleton}. This is because XText initialization relies on global static fields, and
+ * concurrent test class initialization may not work properly. This modified version also does not
+ * implement {@link org.eclipse.xtext.testing.IRegistryConfigurator}, which would have cleaned up
+ * the registry in a non-deterministic way. The global XText state is thus shared by all concurrent
+ * tests and initialized exactly once.
  */
 @Singleton
 public class LFInjectorProvider implements IInjectorProvider {
 
-    protected volatile Injector injector;
+  protected volatile Injector injector;
 
-    @Override
-    public Injector getInjector() {
+  @Override
+  public Injector getInjector() {
+    if (injector == null) {
+      synchronized (this) {
         if (injector == null) {
-            synchronized (this) {
-                if (injector == null) {
-                    GlobalRegistries.initializeDefaults();
-                    this.injector = internalCreateInjector();
-                }
-            }
+          GlobalRegistries.initializeDefaults();
+          this.injector = internalCreateInjector();
         }
-        return injector;
-    }
-
-    protected Injector internalCreateInjector() {
-        return new LFStandaloneSetup() {
-            @Override
-            public Injector createInjector() {
-                return Guice.createInjector(createRuntimeModule());
-            }
-        }.createInjectorAndDoEMFRegistration();
+      }
     }
-
-    protected LFRuntimeModule createRuntimeModule() {
-        // make it work also with Maven/Tycho and OSGI
-        // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
-        return new LFRuntimeModule() {
-            @Override
-            public ClassLoader bindClassLoaderToInstance() {
-                return LFInjectorProvider.class
-                    .getClassLoader();
-            }
-        };
-    }
-
+    return injector;
+  }
+
+  protected Injector internalCreateInjector() {
+    return new LFStandaloneSetup() {
+      @Override
+      public Injector createInjector() {
+        return Guice.createInjector(createRuntimeModule());
+      }
+    }.createInjectorAndDoEMFRegistration();
+  }
+
+  protected LFRuntimeModule createRuntimeModule() {
+    // make it work also with Maven/Tycho and OSGI
+    // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
+    return new LFRuntimeModule() {
+      @Override
+      public ClassLoader bindClassLoaderToInstance() {
+        return LFInjectorProvider.class.getClassLoader();
+      }
+    };
+  }
 }
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
index 55318936f3..0804a9ef0e 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
@@ -3,6 +3,8 @@
 import static java.nio.file.FileVisitResult.CONTINUE;
 import static java.nio.file.FileVisitResult.SKIP_SUBTREE;
 
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
@@ -24,14 +26,10 @@
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.lflang.LFResourceProvider;
-import org.lflang.LFStandaloneSetup;
 import org.lflang.Target;
 import org.lflang.lf.Reactor;
 import org.lflang.tests.TestBase.TestLevel;
 
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
 /**
  * A registry to retrieve tests from, organized by target and category.
  *
@@ -69,8 +67,7 @@ public class TestRegistry {
    */
   private final Map<TestCategory, Set<LFTest>> allTargets = new EnumMap<>(TestCategory.class);
 
-  @Inject
-  private LFResourceProvider resourceProvider;
+  @Inject private LFResourceProvider resourceProvider;
 
   // Static code that performs the file system traversal and discovers
   // all .lf files to be included in the registry.
@@ -106,7 +103,6 @@ public void initialize() {
     }
   }
 
-
   /**
    * Return the tests that were indexed for a given target and category.
    *
@@ -264,6 +260,7 @@ public void walk() throws IOException {
       Files.walkFileTree(srcBasePath, this);
     }
   }
+
   static class TestMap {
     /** Registry that maps targets to maps from categories to sets of tests. */
     protected final Map<Target, Map<TestCategory, Set<LFTest>>> map = new HashMap<>();
@@ -378,5 +375,4 @@ public String getHeader() {
       return TestBase.THICK_LINE + "Category: " + this.name();
     }
   }
-
 }

From e86c44e20a5d1e4546cedc0c0775f482f023c358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Fri, 16 Jun 2023 16:25:18 +0200
Subject: [PATCH 0376/1114] Fix LspTests

---
 .../groovy/org.lflang.test-conventions.gradle |  1 +
 .../java/org/lflang/tests/RunSingleTest.java  |  5 ++--
 .../java/org/lflang/tests/lsp/LspTests.java   | 25 +++++++++++++------
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle b/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle
index 00be562a02..8ca44f7319 100644
--- a/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle
@@ -36,6 +36,7 @@ testing {
             dependencies {
                 implementation project()
                 implementation testFixtures(project())
+                implementation "org.eclipse.xtext:org.eclipse.xtext.testing:$xtextVersion"
             }
         }
     }
diff --git a/core/src/integrationTest/java/org/lflang/tests/RunSingleTest.java b/core/src/integrationTest/java/org/lflang/tests/RunSingleTest.java
index 3746369c89..424568109a 100644
--- a/core/src/integrationTest/java/org/lflang/tests/RunSingleTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/RunSingleTest.java
@@ -53,9 +53,10 @@ public class RunSingleTest {
 
   @Test
   public void runSingleTest() throws FileNotFoundException {
-    assumeTrue(System.getProperty("singleTest") != null);
+    String singleTestPath = System.getProperty("singleTest");
+    assumeTrue(singleTestPath != null && !singleTestPath.isBlank());
 
-    var path = Paths.get(System.getProperty("singleTest"));
+    var path = Paths.get(singleTestPath);
     if (!Files.exists(path)) {
       throw new FileNotFoundException("No such test file: " + path);
     }
diff --git a/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java b/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java
index fe52d6016c..865ee1871e 100644
--- a/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java
+++ b/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java
@@ -9,26 +9,34 @@
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
+
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.lsp4j.Diagnostic;
+import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.lflang.LFRuntimeModule;
-import org.lflang.LFStandaloneSetup;
+import org.junit.jupiter.api.extension.ExtendWith;
+
 import org.lflang.Target;
 import org.lflang.generator.IntegratedBuilder;
 import org.lflang.generator.LanguageServerErrorReporter;
+import org.lflang.tests.LFInjectorProvider;
 import org.lflang.tests.LFTest;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry;
 import org.lflang.tests.TestRegistry.TestCategory;
 import org.lflang.tests.lsp.ErrorInserter.AlteredTest;
 
+import com.google.inject.Inject;
+
 /**
  * Test the code generator features that are required by the language server.
  *
  * @author Peter Donovan
  */
+@ExtendWith(InjectionExtension.class)
+@InjectWith(LFInjectorProvider.class)
 class LspTests {
 
   /** The test categories that should be excluded from LSP tests. */
@@ -49,10 +57,13 @@ class LspTests {
   private static final int SAMPLES_PER_CATEGORY_VALIDATION_TESTS = 3;
 
   /** The {@code IntegratedBuilder} instance whose behavior is to be tested. */
-  private static final IntegratedBuilder builder =
-      new LFStandaloneSetup(new LFRuntimeModule())
-          .createInjectorAndDoEMFRegistration()
-          .getInstance(IntegratedBuilder.class);
+  @Inject
+  private IntegratedBuilder builder;
+
+  @Inject
+  private TestRegistry testRegistry;
+
+
 
   /** Test for false negatives in Python syntax-only validation. */
   @Test
@@ -177,7 +188,7 @@ private void checkDiagnostics(
   private Set<LFTest> selectTests(Target target, Random random) {
     Set<LFTest> ret = new HashSet<>();
     for (TestCategory category : selectedCategories()) {
-      Set<LFTest> registeredTests = TestRegistry.getRegisteredTests(target, category, false);
+      Set<LFTest> registeredTests = testRegistry.getRegisteredTests(target, category, false);
       if (registeredTests.size() == 0) continue;
       int relativeIndex = random.nextInt(registeredTests.size());
       for (LFTest t : registeredTests) {

From c6d43afa22e961278d5104a72312ac2fc19876a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Fri, 16 Jun 2023 16:29:42 +0200
Subject: [PATCH 0377/1114] Remove dependency on xtext.testing

---
 .../groovy/org.lflang.test-conventions.gradle |  1 -
 .../java/org/lflang/tests/lsp/LspTests.java   | 22 +++++--------------
 .../org/lflang/tests/LfInjectedTestBase.java  | 15 +++++++++++++
 .../java/org/lflang/tests/TestBase.java       | 10 +++------
 4 files changed, 23 insertions(+), 25 deletions(-)
 create mode 100644 core/src/testFixtures/java/org/lflang/tests/LfInjectedTestBase.java

diff --git a/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle b/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle
index 8ca44f7319..00be562a02 100644
--- a/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle
@@ -36,7 +36,6 @@ testing {
             dependencies {
                 implementation project()
                 implementation testFixtures(project())
-                implementation "org.eclipse.xtext:org.eclipse.xtext.testing:$xtextVersion"
             }
         }
     }
diff --git a/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java b/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java
index 865ee1871e..4d6911f6c7 100644
--- a/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java
+++ b/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java
@@ -1,5 +1,6 @@
 package org.lflang.tests.lsp;
 
+import com.google.inject.Inject;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -9,35 +10,26 @@
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.lsp4j.Diagnostic;
-import org.eclipse.xtext.testing.InjectWith;
-import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.lflang.Target;
 import org.lflang.generator.IntegratedBuilder;
 import org.lflang.generator.LanguageServerErrorReporter;
-import org.lflang.tests.LFInjectorProvider;
 import org.lflang.tests.LFTest;
+import org.lflang.tests.LfInjectedTestBase;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry;
 import org.lflang.tests.TestRegistry.TestCategory;
 import org.lflang.tests.lsp.ErrorInserter.AlteredTest;
 
-import com.google.inject.Inject;
-
 /**
  * Test the code generator features that are required by the language server.
  *
  * @author Peter Donovan
  */
-@ExtendWith(InjectionExtension.class)
-@InjectWith(LFInjectorProvider.class)
-class LspTests {
+class LspTests extends LfInjectedTestBase {
 
   /** The test categories that should be excluded from LSP tests. */
   private static final TestCategory[] EXCLUDED_CATEGORIES = {
@@ -57,13 +49,9 @@ class LspTests {
   private static final int SAMPLES_PER_CATEGORY_VALIDATION_TESTS = 3;
 
   /** The {@code IntegratedBuilder} instance whose behavior is to be tested. */
-  @Inject
-  private IntegratedBuilder builder;
-
-  @Inject
-  private TestRegistry testRegistry;
-
+  @Inject private IntegratedBuilder builder;
 
+  @Inject private TestRegistry testRegistry;
 
   /** Test for false negatives in Python syntax-only validation. */
   @Test
diff --git a/core/src/testFixtures/java/org/lflang/tests/LfInjectedTestBase.java b/core/src/testFixtures/java/org/lflang/tests/LfInjectedTestBase.java
new file mode 100644
index 0000000000..bd81f06651
--- /dev/null
+++ b/core/src/testFixtures/java/org/lflang/tests/LfInjectedTestBase.java
@@ -0,0 +1,15 @@
+package org.lflang.tests;
+
+import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.extensions.InjectionExtension;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+/**
+ * Base class for test classes that can use {@link com.google.inject.Inject} annotations to provide
+ * dependencies.
+ *
+ * @author Clément Fournier
+ */
+@ExtendWith(InjectionExtension.class)
+@InjectWith(LFInjectorProvider.class)
+public abstract class LfInjectedTestBase {}
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index b801bcadcb..a9c901f456 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -31,13 +31,10 @@
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.xtext.diagnostics.Severity;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
-import org.eclipse.xtext.testing.InjectWith;
-import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.util.RuntimeIOException;
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.lflang.DefaultErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.LFRuntimeModule;
@@ -55,13 +52,12 @@
 import org.lflang.util.LFCommand;
 
 /**
- * Base class for test classes that define JUnit tests.
+ * Base class for test classes that define tests that parse and build LF files from the {@link
+ * TestRegistry}.
  *
  * @author Marten Lohstroh
  */
-@ExtendWith(InjectionExtension.class)
-@InjectWith(LFInjectorProvider.class)
-public abstract class TestBase {
+public abstract class TestBase extends LfInjectedTestBase {
 
   @Inject IResourceValidator validator;
   @Inject LFGenerator generator;

From de0d534989b65591472c4f8b32208adbf37998aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Fri, 16 Jun 2023 17:07:25 +0200
Subject: [PATCH 0378/1114] Fix dependency problem

Several versions of org.eclipse.core.runtime were being provided
to the integrationTest module, which made IntelliJ fail with a
SecurityException
---
 buildSrc/src/main/groovy/org.lflang.test-conventions.gradle | 2 +-
 core/build.gradle                                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle b/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle
index 00be562a02..b098edcc2d 100644
--- a/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle
@@ -21,7 +21,7 @@ dependencies {
     testFixturesImplementation "org.junit.platform:junit-platform-commons:$jUnitPlatformVersion"
     testFixturesImplementation "org.junit.platform:junit-platform-engine:$jUnitPlatformVersion"
     testFixturesImplementation "org.opentest4j:opentest4j:$openTest4jVersion"
-    testFixturesImplementation "org.eclipse.xtext:org.eclipse.xtext.testing:$xtextVersion"
+    testFixturesImplementation platform("org.eclipse.xtext:org.eclipse.xtext.testing:$xtextVersion")
     testFixturesImplementation "org.eclipse.xtext:org.eclipse.xtext.xbase.testing:$xtextVersion"
 }
 
diff --git a/core/build.gradle b/core/build.gradle
index 80c72c4618..43af8d6c21 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -28,7 +28,7 @@ sourceSets {
 }
 
 dependencies {
-    api "org.eclipse.xtext:org.eclipse.xtext:$xtextVersion"
+    api enforcedPlatform("org.eclipse.xtext:org.eclipse.xtext:$xtextVersion")
     api "org.eclipse.xtext:org.eclipse.xtext.xbase.lib:$xtextVersion"
     api "org.eclipse.xtext:org.eclipse.xtext.ide:$xtextVersion"
 

From 1f4b68cec222a8ea64f16c2dfa821d25e8d77a7a Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Fri, 16 Jun 2023 16:57:08 +0200
Subject: [PATCH 0379/1114] minimal implementation of lfd

---
 bin/lfd                                       |  1 +
 bin/lfd.ps1                                   |  9 +++
 .../groovy/org.lflang.java-conventions.gradle | 21 +++++++
 cli/lfd/build.gradle                          | 31 ++++++++++
 cli/lfd/src/main/java/org/lflang/cli/Lfd.java | 58 +++++++++++++++++++
 gradle.properties                             |  2 +
 settings.gradle                               |  2 +-
 util/scripts/launch.ps1                       |  2 +-
 util/scripts/launch.sh                        |  4 +-
 9 files changed, 127 insertions(+), 3 deletions(-)
 create mode 120000 bin/lfd
 create mode 100644 bin/lfd.ps1
 create mode 100644 cli/lfd/build.gradle
 create mode 100644 cli/lfd/src/main/java/org/lflang/cli/Lfd.java

diff --git a/bin/lfd b/bin/lfd
new file mode 120000
index 0000000000..1a3eb8bc0d
--- /dev/null
+++ b/bin/lfd
@@ -0,0 +1 @@
+../util/scripts/launch.sh
\ No newline at end of file
diff --git a/bin/lfd.ps1 b/bin/lfd.ps1
new file mode 100644
index 0000000000..54ce9397f4
--- /dev/null
+++ b/bin/lfd.ps1
@@ -0,0 +1,9 @@
+#==========================================================
+# Description: 	    Run the lff compiler.
+# Authors:          Ruomu Xu
+# Usage:            Usage: lff [options] files...
+#==========================================================
+
+$launchScript="$PSScriptRoot\..\util\scripts\launch.ps1"
+# PS requires spattling: https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_Splatting?view=powershell-7.2
+. $launchScript @args
diff --git a/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle b/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle
index 4cbea8bf20..c3d06302b7 100644
--- a/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle
@@ -17,3 +17,24 @@ spotless {
         formatAnnotations()
     }
 }
+
+configurations.all {
+    resolutionStrategy {
+        dependencySubstitution {
+            // The maven property ${osgi.platform} is not handled by Gradle
+            // so we replace the dependency, using the osgi platform from the project settings
+            //def swtVersion = "3.123.0"
+            def swtVersion = '3.124.0'
+            def os = System.getProperty("os.name").toLowerCase()
+            if (os.contains("windows")) {
+                substitute module('org.eclipse.platform:org.eclipse.swt.${osgi.platform}') using module("org.eclipse.platform:org.eclipse.swt.win32.win32.x86_64:${swtVersion}")
+            }
+            else if (os.contains("linux")) {
+                substitute module('org.eclipse.platform:org.eclipse.swt.${osgi.platform}') using module("org.eclipse.platform:org.eclipse.swt.gtk.linux.x86_64:${swtVersion}")
+            }
+            else if (os.contains("mac")) {
+                substitute module('org.eclipse.platform:org.eclipse.swt.${osgi.platform}') using module("org.eclipse.platform:org.eclipse.swt.cocoa.macosx.x86_64:${swtVersion}")
+            }
+        }
+    }
+}
diff --git a/cli/lfd/build.gradle b/cli/lfd/build.gradle
new file mode 100644
index 0000000000..a83405cadc
--- /dev/null
+++ b/cli/lfd/build.gradle
@@ -0,0 +1,31 @@
+plugins {
+    id 'org.lflang.java-application-conventions'
+    id 'com.github.johnrengelman.shadow'
+}
+
+dependencies {
+    implementation project(':cli:base')
+    implementation ("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.standalone:$klighdVersion") {
+        exclude group: 'de.cau.cs.kieler.swt.mock'
+    }
+    implementation ("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.piccolo:${klighdVersion}") {
+        exclude group: 'de.cau.cs.kieler.swt.mock'
+    }
+    implementation ("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.piccolo.freehep:${klighdVersion}") {
+        exclude group: 'de.cau.cs.kieler.swt.mock'
+    }
+    implementation ("org.freehep:freehep-graphicsio-svg:${freehepVersion}")
+}
+
+application {
+    mainClass = 'org.lflang.cli.Lfd'
+    tasks.run.workingDir = System.getProperty("user.dir")
+}
+
+test {
+    useJUnitPlatform()
+    testLogging {
+        events "passed", "skipped", "failed"
+        showStandardStreams = true
+    }
+}
diff --git a/cli/lfd/src/main/java/org/lflang/cli/Lfd.java b/cli/lfd/src/main/java/org/lflang/cli/Lfd.java
new file mode 100644
index 0000000000..8377381b34
--- /dev/null
+++ b/cli/lfd/src/main/java/org/lflang/cli/Lfd.java
@@ -0,0 +1,58 @@
+package org.lflang.cli;
+
+import de.cau.cs.kieler.klighd.LightDiagramServices;
+import de.cau.cs.kieler.klighd.standalone.KlighdStandaloneSetup;
+import java.nio.file.Path;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.lflang.lf.Model;
+import org.lflang.util.FileUtil;
+import picocli.CommandLine.Command;
+
+/**
+ * Command lin tool for generating diagrams from Lingua Franca programs.
+ *
+ * @author Christian Menard
+ */
+@Command(
+    name = "lfd",
+    // Enable usageHelp (--help) and versionHelp (--version) options.
+    mixinStandardHelpOptions = true,
+    versionProvider = VersionProvider.class)
+public class Lfd extends CliBase {
+
+  @Override
+  public void doRun() {
+    KlighdStandaloneSetup.initialize();
+
+    for (Path relativePath : getInputPaths()) {
+      Path path = toAbsolutePath(relativePath);
+      final Resource resource = getResource(path);
+      final Model model = (Model) resource.getContents().get(0);
+      String baseName = FileUtil.nameWithoutExtension(relativePath);
+      IStatus status = LightDiagramServices.renderOffScreen(model, "svg", baseName + ".svg");
+      if (!status.isOK()) {
+        reporter.printFatalErrorAndExit(status.getMessage());
+      }
+    }
+  }
+
+  /**
+   * Main entry point of the diagram tool.
+   *
+   * @param args CLI arguments
+   */
+  public static void main(String[] args) {
+    main(Io.SYSTEM, args);
+  }
+
+  /**
+   * Programmatic entry point, with a custom IO.
+   *
+   * @param io IO streams.
+   * @param args Command-line arguments.
+   */
+  public static void main(Io io, final String... args) {
+    cliMain("lfd", Lfd.class, io, args);
+  }
+}
diff --git a/gradle.properties b/gradle.properties
index e294dedf05..2164bf48ef 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,6 +16,8 @@ picocliVersion=4.7.0
 resourcesVersion=3.16.0
 xtextVersion=2.28.0
 klighdVersion=2.3.0.v20230606
+freehepVersion=2.4
+swtVersion=3.124.0
 
 [manifestPropertyNames]
 org.eclipse.xtext=xtextVersion
diff --git a/settings.gradle b/settings.gradle
index b7b8588ae0..27a7c330bd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
 rootProject.name = 'org.lflang'
-include('core', 'lsp', 'cli:base', 'cli:lfc', 'cli:lff')
+include('core', 'lsp', 'cli:base', 'cli:lfc', 'cli:lff', 'cli:lfd')
diff --git a/util/scripts/launch.ps1 b/util/scripts/launch.ps1
index be874fd26a..b81b818933 100644
--- a/util/scripts/launch.ps1
+++ b/util/scripts/launch.ps1
@@ -10,7 +10,7 @@
 $invokerPath = $MyInvocation.PSCommandPath
 $invokerName = [System.IO.Path]::GetFileNameWithoutExtension("$(Split-Path -Path $invokerPath -Leaf -Resolve)")
 
-$mainClassTable = @{"lfc" = "org.lflang.cli.Lfc"; "lff" = "org.lflang.cli.Lff"}
+$mainClassTable = @{"lfc" = "org.lflang.cli.Lfc"; "lff" = "org.lflang.cli.Lff"; "lfd" = "org.lflang.cli.Lfd}
 $tool = $null
 foreach ($k in $mainClassTable.Keys) {
     if ($invokerName.EndsWith($k)) {
diff --git a/util/scripts/launch.sh b/util/scripts/launch.sh
index f1e685f288..36a342bd25 100755
--- a/util/scripts/launch.sh
+++ b/util/scripts/launch.sh
@@ -57,8 +57,10 @@ if [[ "$0" == *lfc ]]; then
   tool="lfc"
 elif [[ "$0" == *lff ]]; then
   tool="lff"
+elif [[ "$0" == *lfd ]]; then
+    tool="lfd"
 else
-  known_commands="[lfc, lff]"
+  known_commands="[lfc, lff, lfd]"
   echo \
   "ERROR: $0 is not a known lf command! Known commands are ${known_commands}.
        In case you use a symbolic or hard link to one of the Lingua Franca

From 34543e7cf58c06599ab0ab95fd45c865fd885156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Fri, 16 Jun 2023 18:01:17 +0200
Subject: [PATCH 0380/1114] Replace most System.out.println with usage of error
 reporter

---
 .../lflang/federated/extensions/CExtension.java    |  2 +-
 .../federated/extensions/CExtensionUtils.java      | 14 ++++++++------
 .../org/lflang/federated/generator/FedEmitter.java |  2 +-
 .../lflang/federated/generator/FedGenerator.java   |  2 +-
 .../federated/launcher/FedLauncherGenerator.java   |  2 +-
 .../lflang/generator/DockerComposeGenerator.java   |  5 ++++-
 .../main/java/org/lflang/generator/DockerData.java | 11 ++++++-----
 .../java/org/lflang/generator/DockerGenerator.java |  2 +-
 .../java/org/lflang/generator/GeneratorBase.java   |  6 +++---
 .../java/org/lflang/generator/LFGenerator.java     |  8 +++++++-
 .../lflang/generator/ReactionInstanceGraph.java    |  2 +-
 .../java/org/lflang/generator/c/CCompiler.java     |  6 +++---
 .../java/org/lflang/generator/c/CGenerator.java    | 14 +++++++-------
 .../lflang/generator/python/PythonGenerator.java   |  4 ++--
 .../src/main/java/org/lflang/util/ArduinoUtil.java | 12 ++++++------
 core/src/main/java/org/lflang/util/FileUtil.java   | 10 ++++++----
 core/src/main/java/org/lflang/util/LFCommand.java  |  1 +
 .../kotlin/org/lflang/generator/ts/TSGenerator.kt  |  4 ++--
 18 files changed, 61 insertions(+), 46 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 8f75dd2f44..e8ec17fc56 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -83,7 +83,7 @@ public void initializeTargetConfig(
       RtiConfig rtiConfig)
       throws IOException {
 
-    CExtensionUtils.handleCompileDefinitions(federate, numOfFederates, rtiConfig);
+    CExtensionUtils.handleCompileDefinitions(federate, numOfFederates, rtiConfig, errorReporter);
 
     generateCMakeInclude(federate, fileConfig);
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 391204fdb5..c3cf9940d1 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -7,6 +7,8 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.regex.Pattern;
+
+import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig.ClockSyncOptions;
 import org.lflang.TargetProperty;
@@ -239,7 +241,7 @@ static boolean isSharedPtrType(InferredType type, CTypes types) {
   }
 
   public static void handleCompileDefinitions(
-      FederateInstance federate, int numOfFederates, RtiConfig rtiConfig) {
+      FederateInstance federate, int numOfFederates, RtiConfig rtiConfig, ErrorReporter errorReporter) {
     federate.targetConfig.setByUser.add(TargetProperty.COMPILE_DEFINITIONS);
     federate.targetConfig.compileDefinitions.put("FEDERATED", "");
     federate.targetConfig.compileDefinitions.put(
@@ -255,7 +257,7 @@ public static void handleCompileDefinitions(
 
     handleAdvanceMessageInterval(federate);
 
-    initializeClockSynchronization(federate, rtiConfig);
+    initializeClockSynchronization(federate, rtiConfig, errorReporter);
   }
 
   /**
@@ -295,13 +297,13 @@ static boolean clockSyncIsOn(FederateInstance federate, RtiConfig rtiConfig) {
    *     href="https://github.com/icyphy/lingua-franca/wiki/Distributed-Execution#clock-synchronization">Documentation</a>
    */
   public static void initializeClockSynchronization(
-      FederateInstance federate, RtiConfig rtiConfig) {
+      FederateInstance federate, RtiConfig rtiConfig, ErrorReporter errorReporter) {
     // Check if clock synchronization should be enabled for this federate in the first place
     if (clockSyncIsOn(federate, rtiConfig)) {
-      System.out.println("Initial clock synchronization is enabled for federate " + federate.id);
+      errorReporter.nowhere().info("Initial clock synchronization is enabled for federate " + federate.id);
       if (federate.targetConfig.clockSync == ClockSyncMode.ON) {
         if (federate.targetConfig.clockSyncOptions.collectStats) {
-          System.out.println("Will collect clock sync statistics for federate " + federate.id);
+          errorReporter.nowhere().info("Will collect clock sync statistics for federate " + federate.id);
           // Add libm to the compiler flags
           // FIXME: This is a linker flag not compile flag but we don't have a way to add linker
           // flags
@@ -310,7 +312,7 @@ public static void initializeClockSynchronization(
           federate.targetConfig.compilerFlags.add("-lm");
           federate.targetConfig.setByUser.add(TargetProperty.FLAGS);
         }
-        System.out.println("Runtime clock synchronization is enabled for federate " + federate.id);
+        errorReporter.nowhere().info("Runtime clock synchronization is enabled for federate " + federate.id);
       }
 
       addClockSyncCompileDefinitions(federate);
diff --git a/core/src/main/java/org/lflang/federated/generator/FedEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
index bdf912d0c8..dda4dd6662 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
@@ -40,7 +40,7 @@ Map<Path, CodeMap> generateFederate(
       throws IOException {
     String fedName = federate.name;
     Files.createDirectories(fileConfig.getSrcPath());
-    System.out.println(
+    errorReporter.nowhere().info(
         "##### Generating code for federate "
             + fedName
             + " in directory "
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index f87cb8705a..37e103882f 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -264,7 +264,7 @@ private Map<Path, CodeMap> compileFederates(
         Math.min(
             6, Math.min(Math.max(federates.size(), 1), Runtime.getRuntime().availableProcessors()));
     var compileThreadPool = Executors.newFixedThreadPool(numOfCompileThreads);
-    System.out.println(
+    errorReporter.nowhere().info(
         "******** Using " + numOfCompileThreads + " threads to compile the program.");
     Map<Path, CodeMap> codeMapMap = new ConcurrentHashMap<>();
     List<SubContext> subContexts = Collections.synchronizedList(new ArrayList<>());
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index b93a7bee03..9480aae5ea 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -218,7 +218,7 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
       }
     }
 
-    System.out.println(
+    errorReporter.nowhere().info(
         "##### Generating launcher for federation " + " in directory " + fileConfig.binPath);
 
     // Write the launcher file.
diff --git a/core/src/main/java/org/lflang/generator/DockerComposeGenerator.java b/core/src/main/java/org/lflang/generator/DockerComposeGenerator.java
index a3e5028317..7e7ff22646 100644
--- a/core/src/main/java/org/lflang/generator/DockerComposeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/DockerComposeGenerator.java
@@ -4,6 +4,7 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.stream.Collectors;
+
 import org.lflang.util.FileUtil;
 
 /**
@@ -16,9 +17,11 @@ public class DockerComposeGenerator {
 
   /** Path to the docker-compose.yml file. */
   protected final Path path;
+  private final LFGeneratorContext context;
 
   public DockerComposeGenerator(LFGeneratorContext context) {
     this.path = context.getFileConfig().getSrcGenPath().resolve("docker-compose.yml");
+    this.context = context;
   }
 
   /**
@@ -112,6 +115,6 @@ public void writeDockerComposeFile(List<DockerData> services, String networkName
         String.join(
             "\n", this.generateDockerServices(services), this.generateDockerNetwork(networkName));
     FileUtil.writeToFile(contents, path);
-    System.out.println(getUsageInstructions());
+    context.getErrorReporter().nowhere().info(getUsageInstructions());
   }
 }
diff --git a/core/src/main/java/org/lflang/generator/DockerData.java b/core/src/main/java/org/lflang/generator/DockerData.java
index af29e9e1d5..850670f387 100644
--- a/core/src/main/java/org/lflang/generator/DockerData.java
+++ b/core/src/main/java/org/lflang/generator/DockerData.java
@@ -1,6 +1,7 @@
 package org.lflang.generator;
 
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import org.lflang.util.FileUtil;
 
@@ -18,8 +19,10 @@ public class DockerData {
 
   /** The name of the service. */
   public final String serviceName;
+  private final LFGeneratorContext context;
 
-  public DockerData(String serviceName, Path dockerFilePath, String dockerFileContent) {
+  public DockerData(String serviceName, Path dockerFilePath, String dockerFileContent, LFGeneratorContext context) {
+    this.context = context;
 
     if (!dockerFilePath.toFile().isAbsolute()) {
       throw new RuntimeException("Cannot use relative docker file path in DockerData instance");
@@ -31,10 +34,8 @@ public DockerData(String serviceName, Path dockerFilePath, String dockerFileCont
 
   /** Write a docker file based on this data. */
   public void writeDockerFile() throws IOException {
-    if (dockerFilePath.toFile().exists()) {
-      dockerFilePath.toFile().delete();
-    }
+    Files.deleteIfExists(dockerFilePath);
     FileUtil.writeToFile(dockerFileContent, dockerFilePath);
-    System.out.println("Dockerfile written to " + dockerFilePath);
+    context.getErrorReporter().nowhere().info("Dockerfile written to " + dockerFilePath);
   }
 }
diff --git a/core/src/main/java/org/lflang/generator/DockerGenerator.java b/core/src/main/java/org/lflang/generator/DockerGenerator.java
index cf6044f14f..d7d842d15e 100644
--- a/core/src/main/java/org/lflang/generator/DockerGenerator.java
+++ b/core/src/main/java/org/lflang/generator/DockerGenerator.java
@@ -38,7 +38,7 @@ public DockerData generateDockerData() {
     var dockerFilePath = context.getFileConfig().getSrcGenPath().resolve("Dockerfile");
     var dockerFileContent = generateDockerFileContent();
 
-    return new DockerData(name.replace("_", ""), dockerFilePath, dockerFileContent);
+    return new DockerData(name.replace("_", ""), dockerFilePath, dockerFileContent, context);
   }
 
   public static DockerGenerator dockerGeneratorFactory(LFGeneratorContext context) {
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 32fe62337b..e1912c9615 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -658,10 +658,10 @@ private void reportIssue(StringBuilder message, Integer lineNumber, Path path, i
    * is in, and where the generated sources are to be put.
    */
   public void printInfo(LFGeneratorContext.Mode mode) {
-    System.out.println(
+    errorReporter.nowhere().info(
         "Generating code for: " + context.getFileConfig().resource.getURI().toString());
-    System.out.println("******** mode: " + mode);
-    System.out.println("******** generated sources: " + context.getFileConfig().getSrcGenPath());
+    errorReporter.nowhere().info("******** mode: " + mode);
+    errorReporter.nowhere().info("******** generated sources: " + context.getFileConfig().getSrcGenPath());
   }
 
   /** Get the buffer type used for network messages */
diff --git a/core/src/main/java/org/lflang/generator/LFGenerator.java b/core/src/main/java/org/lflang/generator/LFGenerator.java
index 8427f165f6..8d11c55674 100644
--- a/core/src/main/java/org/lflang/generator/LFGenerator.java
+++ b/core/src/main/java/org/lflang/generator/LFGenerator.java
@@ -1,6 +1,8 @@
 package org.lflang.generator;
 
 import com.google.inject.Inject;
+import com.google.inject.Injector;
+
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -32,6 +34,7 @@
 public class LFGenerator extends AbstractGenerator {
 
   @Inject private LFGlobalScopeProvider scopeProvider;
+  @Inject private Injector injector;
 
   // Indicator of whether generator errors occurred.
   protected boolean generatorErrorsOccurred = false;
@@ -85,6 +88,7 @@ private GeneratorBase createGenerator(LFGeneratorContext context) {
 
   @Override
   public void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorContext context) {
+    assert injector!=null;
     final LFGeneratorContext lfContext;
     if (context instanceof LFGeneratorContext) {
       lfContext = (LFGeneratorContext) context;
@@ -97,7 +101,9 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorCont
 
     if (FedASTUtils.findFederatedReactor(resource) != null) {
       try {
-        generatorErrorsOccurred = (new FedGenerator(lfContext)).doGenerate(resource, lfContext);
+        FedGenerator fedGenerator = new FedGenerator(lfContext);
+        injector.injectMembers(fedGenerator);
+        generatorErrorsOccurred = fedGenerator.doGenerate(resource, lfContext);
       } catch (IOException e) {
         throw new RuntimeIOException("Error during federated code generation", e);
       }
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
index 57d171e327..36d13e2960 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
@@ -81,7 +81,7 @@ public void rebuild() {
     addNodesAndEdges(main);
 
     // FIXME: Use {@link TargetProperty#EXPORT_DEPENDENCY_GRAPH}.
-    // System.out.println(toDOT());
+    // errorReporter.nowhere().info(toDOT());
 
     // Assign a level to each reaction.
     // If there are cycles present in the graph, it will be detected here.
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index c70311978c..ef73c053a6 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -171,7 +171,7 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
       }
 
       if (makeReturnCode == 0 && build.getErrors().length() == 0) {
-        System.out.println(
+        errorReporter.nowhere().info(
             "SUCCESS: Compiling generated code for "
                 + fileConfig.name
                 + " finished with no errors.");
@@ -179,13 +179,13 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
 
       if (targetConfig.platformOptions.platform == Platform.ZEPHYR
           && targetConfig.platformOptions.flash) {
-        System.out.println("Invoking flash command for Zephyr");
+        errorReporter.nowhere().info("Invoking flash command for Zephyr");
         LFCommand flash = buildWestFlashCommand();
         int flashRet = flash.run();
         if (flashRet != 0) {
           errorReporter.nowhere().error("West flash command failed with error code " + flashRet);
         } else {
-          System.out.println("SUCCESS: Flashed application with west");
+          errorReporter.nowhere().info("SUCCESS: Flashed application with west");
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 0bc8ee0202..854d1afb97 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -465,8 +465,8 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         Path include = fileConfig.getSrcGenPath().resolve("include/");
         Path src = fileConfig.getSrcGenPath().resolve("src/");
         FileUtil.arduinoDeleteHelper(src, targetConfig.threading);
-        FileUtil.relativeIncludeHelper(src, include);
-        FileUtil.relativeIncludeHelper(include, include);
+        FileUtil.relativeIncludeHelper(src, include, errorReporter);
+        FileUtil.relativeIncludeHelper(include, include, errorReporter);
       } catch (IOException e) {
         //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
         Exceptions.sneakyThrow(e);
@@ -476,8 +476,8 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         arduinoUtil.buildArduino(fileConfig, targetConfig);
         context.finish(GeneratorResult.Status.COMPILED, null);
       } else {
-        System.out.println("********");
-        System.out.println(
+        errorReporter.nowhere().info("********");
+        errorReporter.nowhere().info(
             "To compile your program, run the following command to see information about the board"
                 + " you plugged in:\n\n"
                 + "\tarduino-cli board list\n\n"
@@ -595,7 +595,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         context.finish(GeneratorResult.Status.COMPILED, null);
       }
       if (!errorsOccurred()) {
-        System.out.println("Compiled binary is in " + fileConfig.binPath);
+        errorReporter.nowhere().info("Compiled binary is in " + fileConfig.binPath);
       }
     } else {
       context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, null));
@@ -1961,7 +1961,7 @@ protected void setUpGeneralParameters() {
         && (targetConfig.platformOptions.board == null
             || !targetConfig.platformOptions.board.contains("mbed"))) {
       // non-MBED boards should not use threading
-      System.out.println(
+      errorReporter.nowhere().info(
           "Threading is incompatible on your current Arduino flavor. Setting threading to false.");
       targetConfig.threading = false;
     }
@@ -1969,7 +1969,7 @@ protected void setUpGeneralParameters() {
     if (targetConfig.platformOptions.platform == Platform.ARDUINO
         && !targetConfig.noCompile
         && targetConfig.platformOptions.board == null) {
-      System.out.println(
+      errorReporter.nowhere().info(
           "To enable compilation for the Arduino platform, you must specify the fully-qualified"
               + " board name (FQBN) in the target property. For example, platform: {name: arduino,"
               + " board: arduino:avr:leonardo}. Entering \"no-compile\" mode and generating target"
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index de2a41918d..f74c369d5b 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -397,14 +397,14 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         copyTargetFiles();
         new PythonValidator(fileConfig, errorReporter, codeMaps, protoNames).doValidate(context);
         if (targetConfig.noCompile) {
-          System.out.println(PythonInfoGenerator.generateSetupInfo(fileConfig));
+          errorReporter.nowhere().info(PythonInfoGenerator.generateSetupInfo(fileConfig));
         }
       } catch (Exception e) {
         //noinspection ConstantConditions
         throw Exceptions.sneakyThrow(e);
       }
 
-      System.out.println(PythonInfoGenerator.generateRunInfo(fileConfig, lfModuleName));
+      errorReporter.nowhere().info(PythonInfoGenerator.generateRunInfo(fileConfig, lfModuleName));
     }
 
     if (errorReporter.getErrorsOccurred()) {
diff --git a/core/src/main/java/org/lflang/util/ArduinoUtil.java b/core/src/main/java/org/lflang/util/ArduinoUtil.java
index 460ae2eb86..4fec0b51cf 100644
--- a/core/src/main/java/org/lflang/util/ArduinoUtil.java
+++ b/core/src/main/java/org/lflang/util/ArduinoUtil.java
@@ -103,7 +103,7 @@ private LFCommand arduinoCompileCommand(FileConfig fileConfig, TargetConfig targ
    * @param targetConfig
    */
   public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
-    System.out.println("Retrieving Arduino Compile Script");
+    errorReporter.nowhere().info("Retrieving Arduino Compile Script");
     try {
       LFCommand command =
           arduinoCompileCommand(fileConfig, targetConfig); // Use ProcessBuilder for finer control.
@@ -116,11 +116,11 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
     } catch (IOException e) {
       Exceptions.sneakyThrow(e);
     }
-    System.out.println(
+    errorReporter.nowhere().info(
         "SUCCESS: Compiling generated code for " + fileConfig.name + " finished with no errors.");
     if (targetConfig.platformOptions.flash) {
       if (targetConfig.platformOptions.port != null) {
-        System.out.println("Invoking flash command for Arduino");
+        errorReporter.nowhere().info("Invoking flash command for Arduino");
         LFCommand flash =
             commandFactory.createCommand(
                 "arduino-cli",
@@ -140,14 +140,14 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
               .nowhere()
               .error("arduino-cli flash command failed with error code " + flashRet);
         } else {
-          System.out.println("SUCCESS: Flashed board using arduino-cli");
+          errorReporter.nowhere().info("SUCCESS: Flashed board using arduino-cli");
         }
       } else {
         errorReporter.nowhere().error("Need to provide a port on which to automatically flash.");
       }
     } else {
-      System.out.println("********");
-      System.out.println(
+      errorReporter.nowhere().info("********");
+      errorReporter.nowhere().info(
           "To flash your program, run the following command to see information about the board you"
               + " plugged in:\n\n"
               + "\tarduino-cli board list\n\n"
diff --git a/core/src/main/java/org/lflang/util/FileUtil.java b/core/src/main/java/org/lflang/util/FileUtil.java
index 3d6600621d..c84bc4da8f 100644
--- a/core/src/main/java/org/lflang/util/FileUtil.java
+++ b/core/src/main/java/org/lflang/util/FileUtil.java
@@ -325,7 +325,7 @@ public static void copyFilesOrDirectories(
           } else {
             FileUtil.copyFromFileSystem(found, dstDir, false);
           }
-          System.out.println("Copied '" + fileOrDirectory + "' from the file system.");
+          errorReporter.nowhere().info("Copied '" + fileOrDirectory + "' from the file system.");
         } catch (IOException e) {
           String message =
               "Unable to copy '"
@@ -340,7 +340,7 @@ public static void copyFilesOrDirectories(
             copyFileFromClassPath(fileOrDirectory, dstDir, false);
           } else {
             FileUtil.copyFromClassPath(fileOrDirectory, dstDir, false, false);
-            System.out.println("Copied '" + fileOrDirectory + "' from the class path.");
+            errorReporter.nowhere().info("Copied '" + fileOrDirectory + "' from the class path.");
           }
         } catch (IOException e) {
           String message =
@@ -712,10 +712,11 @@ public static boolean isCFile(Path path) {
    * Convert all includes recursively inside files within a specified folder to relative links
    *
    * @param dir The folder to search for includes to change.
+   * @param errorReporter Error reporter
    * @throws IOException If the given set of files cannot be relativized.
    */
-  public static void relativeIncludeHelper(Path dir, Path includePath) throws IOException {
-    System.out.println("Relativizing all includes in " + dir.toString());
+  public static void relativeIncludeHelper(Path dir, Path includePath, ErrorReporter errorReporter) throws IOException {
+    errorReporter.nowhere().info("Relativizing all includes in " + dir.toString());
     List<Path> includePaths =
         Files.walk(includePath)
             .filter(Files::isRegularFile)
@@ -779,6 +780,7 @@ public static void delete(Path fileOrDirectory) throws IOException {
    */
   public static void deleteDirectory(Path dir) throws IOException {
     if (Files.isDirectory(dir)) {
+      // fixme system.out
       System.out.println("Cleaning " + dir);
       List<Path> pathsToDelete = Files.walk(dir).sorted(Comparator.reverseOrder()).toList();
       for (Path path : pathsToDelete) {
diff --git a/core/src/main/java/org/lflang/util/LFCommand.java b/core/src/main/java/org/lflang/util/LFCommand.java
index 518401f305..8bed14916e 100644
--- a/core/src/main/java/org/lflang/util/LFCommand.java
+++ b/core/src/main/java/org/lflang/util/LFCommand.java
@@ -164,6 +164,7 @@ public int run(CancelIndicator cancelIndicator) {
     assert !didRun;
     didRun = true;
 
+    // FIXME remove system out
     System.out.println("--- Current working directory: " + processBuilder.directory().toString());
     System.out.println("--- Executing command: " + String.join(" ", processBuilder.command()));
 
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
index 4afa183152..de43c5abef 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -222,9 +222,9 @@ class TSGenerator(
     private fun copyConfigFiles() {
         FileUtil.copyFromClassPath(LIB_PATH, fileConfig.srcGenPath, true, true)
         for (configFile in CONFIG_FILES) {
-            var override = FileUtil.findAndCopyFile(configFile, fileConfig.srcGenPath, fileConfig);
+            val override = FileUtil.findAndCopyFile(configFile, fileConfig.srcGenPath, fileConfig);
             if (override != null) {
-                System.out.println("Using user-provided '" + override + "'");
+                errorReporter.nowhere().info("Using user-provided '" + override + "'");
             } else {
                 System.out.println("Using default '" + configFile + "'");
             }

From d9de0dcac9569a0f8f7b5b442418a826950e0c0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Fri, 16 Jun 2023 18:02:47 +0200
Subject: [PATCH 0381/1114] Rename ErrorReporter -> MessageReporter

---
 .../src/main/java/org/lflang/cli/CliBase.java |  4 +-
 .../org/lflang/cli/LFStandaloneModule.java    |  4 +-
 ...er.java => StandaloneMessageReporter.java} |  4 +-
 cli/lfc/src/main/java/org/lflang/cli/Lfc.java |  2 +-
 .../java/org/lflang/tests/lsp/LspTests.java   |  4 +-
 ...orter.java => DefaultMessageReporter.java} |  2 +-
 .../main/java/org/lflang/LFRuntimeModule.java |  4 +-
 ...rrorReporter.java => MessageReporter.java} |  6 +-
 ...rterBase.java => MessageReporterBase.java} |  6 +-
 core/src/main/java/org/lflang/ModelInfo.java  |  4 +-
 .../main/java/org/lflang/TargetConfig.java    |  6 +-
 .../main/java/org/lflang/TargetProperty.java  |  8 +--
 .../synthesis/LinguaFrancaSynthesis.java      |  6 +-
 ...ter.java => SynthesisMessageReporter.java} |  4 +-
 .../federated/extensions/CExtension.java      | 56 +++++++++---------
 .../federated/extensions/CExtensionUtils.java | 14 ++---
 .../extensions/FedTargetExtension.java        | 18 +++---
 .../federated/extensions/PythonExtension.java | 14 ++---
 .../federated/extensions/TSExtension.java     | 20 +++----
 .../federated/generator/FedASTUtils.java      | 34 +++++------
 .../federated/generator/FedEmitter.java       | 16 ++---
 .../federated/generator/FedGenerator.java     | 38 ++++++------
 .../federated/generator/FedMainEmitter.java   |  8 +--
 .../generator/FedPreambleEmitter.java         |  6 +-
 .../federated/generator/FedTargetConfig.java  |  8 +--
 .../federated/generator/FedTargetEmitter.java |  6 +-
 .../federated/generator/FederateInstance.java | 12 ++--
 ...java => LineAdjustingMessageReporter.java} |  8 +--
 ....java => SynchronizedMessageReporter.java} | 10 ++--
 .../federated/launcher/BuildConfig.java       | 10 ++--
 .../federated/launcher/CBuildConfig.java      |  8 +--
 .../launcher/FedLauncherGenerator.java        | 38 ++++++------
 .../federated/launcher/PyBuildConfig.java     |  6 +-
 .../federated/launcher/TsBuildConfig.java     |  6 +-
 .../FedROS2CPPSerialization.java              |  4 +-
 .../federated/validation/FedValidator.java    | 10 ++--
 .../lflang/generator/DiagnosticReporting.java |  6 +-
 .../org/lflang/generator/GeneratorBase.java   | 44 +++++++-------
 .../generator/GeneratorCommandFactory.java    | 10 ++--
 .../org/lflang/generator/GeneratorUtils.java  | 16 ++---
 .../HumanReadableReportingStrategy.java       | 18 +++---
 .../lflang/generator/IntegratedBuilder.java   | 16 ++---
 .../generator/InvalidSourceException.java     |  2 +-
 .../org/lflang/generator/LFGenerator.java     |  8 +--
 .../lflang/generator/LFGeneratorContext.java  |  4 +-
 ...ava => LanguageServerMessageReporter.java} |  8 +--
 .../org/lflang/generator/MainContext.java     | 20 +++----
 .../org/lflang/generator/PortInstance.java    | 14 ++---
 .../org/lflang/generator/ReactorInstance.java | 14 ++---
 .../java/org/lflang/generator/SubContext.java |  6 +-
 .../java/org/lflang/generator/Validator.java  | 16 ++---
 .../lflang/generator/c/CCmakeGenerator.java   |  8 +--
 .../org/lflang/generator/c/CCompiler.java     | 36 ++++++------
 .../org/lflang/generator/c/CGenerator.java    | 58 +++++++++----------
 .../lflang/generator/c/CPortGenerator.java    | 12 ++--
 .../generator/c/CReactionGenerator.java       | 18 +++---
 .../java/org/lflang/generator/c/CUtil.java    |  6 +-
 .../generator/c/CWatchdogGenerator.java       | 14 ++---
 .../generator/python/PythonGenerator.java     | 14 ++---
 .../python/PythonReactionGenerator.java       | 14 ++---
 .../generator/python/PythonValidator.java     | 26 ++++-----
 .../generator/rust/CargoDependencySpec.java   |  6 +-
 .../generator/rust/RustTargetConfig.java      |  4 +-
 .../java/org/lflang/util/ArduinoUtil.java     | 28 ++++-----
 .../main/java/org/lflang/util/FileUtil.java   | 20 +++----
 .../org/lflang/validation/LFValidator.java    |  6 +-
 ...ter.java => ValidatorMessageReporter.java} |  6 +-
 .../generator/cpp/CppActionGenerator.kt       |  8 +--
 .../org/lflang/generator/cpp/CppGenerator.kt  |  6 +-
 .../generator/cpp/CppInstanceGenerator.kt     |  6 +-
 .../generator/cpp/CppPlatformGenerator.kt     |  6 +-
 .../generator/cpp/CppReactorGenerator.kt      |  8 +--
 .../lflang/generator/cpp/CppRos2Generator.kt  |  8 +--
 .../generator/cpp/CppStandaloneGenerator.kt   | 14 ++---
 .../org/lflang/generator/cpp/CppValidator.kt  |  6 +-
 .../lflang/generator/rust/RustGenerator.kt    | 10 ++--
 .../org/lflang/generator/rust/RustModel.kt    | 10 ++--
 .../lflang/generator/rust/RustValidator.kt    |  6 +-
 .../generator/ts/TSConnectionGenerator.kt     |  6 +-
 .../generator/ts/TSConstructorGenerator.kt    |  8 +--
 .../org/lflang/generator/ts/TSGenerator.kt    | 30 +++++-----
 .../generator/ts/TSReactionGenerator.kt       |  8 +--
 .../lflang/generator/ts/TSReactorGenerator.kt |  4 +-
 .../org/lflang/generator/ts/TSValidator.kt    | 12 ++--
 .../tests/compiler/LetInferenceTests.java     |  4 +-
 .../LinguaFrancaDependencyAnalysisTest.java   |  6 +-
 .../tests/compiler/PortInstanceTests.java     |  6 +-
 .../org/lflang/tests/compiler/RangeTests.java |  6 +-
 .../java/org/lflang/tests/TestBase.java       |  4 +-
 .../diagram/lsp/LanguageDiagramServer.java    |  4 +-
 90 files changed, 539 insertions(+), 539 deletions(-)
 rename cli/base/src/main/java/org/lflang/cli/{StandaloneErrorReporter.java => StandaloneMessageReporter.java} (96%)
 rename core/src/main/java/org/lflang/{DefaultErrorReporter.java => DefaultMessageReporter.java} (90%)
 rename core/src/main/java/org/lflang/{ErrorReporter.java => MessageReporter.java} (94%)
 rename core/src/main/java/org/lflang/{ErrorReporterBase.java => MessageReporterBase.java} (90%)
 rename core/src/main/java/org/lflang/diagram/synthesis/util/{SynthesisErrorReporter.java => SynthesisMessageReporter.java} (95%)
 rename core/src/main/java/org/lflang/federated/generator/{LineAdjustingErrorReporter.java => LineAdjustingMessageReporter.java} (86%)
 rename core/src/main/java/org/lflang/federated/generator/{SynchronizedErrorReporter.java => SynchronizedMessageReporter.java} (77%)
 rename core/src/main/java/org/lflang/generator/{LanguageServerErrorReporter.java => LanguageServerMessageReporter.java} (95%)
 rename core/src/main/java/org/lflang/validation/{ValidatorErrorReporter.java => ValidatorMessageReporter.java} (96%)

diff --git a/cli/base/src/main/java/org/lflang/cli/CliBase.java b/cli/base/src/main/java/org/lflang/cli/CliBase.java
index 3daab73ab0..e1ecfd893a 100644
--- a/cli/base/src/main/java/org/lflang/cli/CliBase.java
+++ b/cli/base/src/main/java/org/lflang/cli/CliBase.java
@@ -27,7 +27,7 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.eclipse.xtext.validation.Issue;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.LFRuntimeModule;
 import org.lflang.LFStandaloneSetup;
 import org.lflang.util.FileUtil;
@@ -88,7 +88,7 @@ static class MutuallyExclusive {
   @Inject protected ReportingBackend reporter;
 
   /** Used to report error messages at the end. */
-  @Inject protected ErrorReporter errorReporter;
+  @Inject protected MessageReporter messageReporter;
 
   /** IO context of this run. */
   @Inject protected Io io;
diff --git a/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java b/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java
index abf01bfcd3..8cb8395d5b 100644
--- a/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java
+++ b/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java
@@ -34,7 +34,7 @@
 import org.eclipse.emf.ecore.EValidator;
 import org.eclipse.emf.ecore.impl.EValidatorRegistryImpl;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.LFRuntimeModule;
 
 /**
@@ -56,7 +56,7 @@ public LFStandaloneModule(ReportingBackend helper, Io io) {
 
   @Override
   public void configure(Binder binder) {
-    binder.bind(ErrorReporter.class).to(StandaloneErrorReporter.class);
+    binder.bind(MessageReporter.class).to(StandaloneMessageReporter.class);
     binder.bind(ReportingBackend.class).toInstance(helper);
     binder.bind(Io.class).toInstance(io);
     binder.bind(ValidationMessageAcceptor.class).to(StandaloneIssueAcceptor.class);
diff --git a/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java b/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java
similarity index 96%
rename from cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java
rename to cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java
index 36ce472280..a6cbbd39cd 100644
--- a/cli/base/src/main/java/org/lflang/cli/StandaloneErrorReporter.java
+++ b/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java
@@ -32,14 +32,14 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.diagnostics.Severity;
-import org.lflang.ErrorReporterBase;
+import org.lflang.MessageReporterBase;
 import org.lflang.generator.Range;
 
 /**
  * An error reporter that forwards all messages to an {@link IssueCollector}. They'll be sorted out
  * later.
  */
-public class StandaloneErrorReporter extends ErrorReporterBase {
+public class StandaloneMessageReporter extends MessageReporterBase {
 
   @Inject private StandaloneIssueAcceptor issueAcceptor;
 
diff --git a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
index 19869f9394..021fb1c9fa 100644
--- a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
+++ b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
@@ -181,7 +181,7 @@ private void invokeGenerator(List<Path> files, Path root, Properties properties)
               properties,
               resource,
               this.fileAccess,
-              fileConfig -> errorReporter);
+              fileConfig -> messageReporter);
 
       try {
         this.generator.generate(resource, this.fileAccess, context);
diff --git a/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java b/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java
index fe52d6016c..305f29ea21 100644
--- a/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java
+++ b/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java
@@ -17,7 +17,7 @@
 import org.lflang.LFStandaloneSetup;
 import org.lflang.Target;
 import org.lflang.generator.IntegratedBuilder;
-import org.lflang.generator.LanguageServerErrorReporter;
+import org.lflang.generator.LanguageServerMessageReporter;
 import org.lflang.tests.LFTest;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry;
@@ -151,7 +151,7 @@ private void checkDiagnostics(
       Random random)
       throws IOException {
     MockLanguageClient client = new MockLanguageClient();
-    LanguageServerErrorReporter.setClient(client);
+    LanguageServerMessageReporter.setClient(client);
     for (LFTest test : selectTests(target, random)) {
       client.clearDiagnostics();
       if (alterer != null) {
diff --git a/core/src/main/java/org/lflang/DefaultErrorReporter.java b/core/src/main/java/org/lflang/DefaultMessageReporter.java
similarity index 90%
rename from core/src/main/java/org/lflang/DefaultErrorReporter.java
rename to core/src/main/java/org/lflang/DefaultMessageReporter.java
index 9be737671b..9ea3ede28a 100644
--- a/core/src/main/java/org/lflang/DefaultErrorReporter.java
+++ b/core/src/main/java/org/lflang/DefaultMessageReporter.java
@@ -6,7 +6,7 @@
 import org.lflang.generator.Range;
 
 /** Simple implementation of the ErrorReport interface that simply prints to standard out. */
-public class DefaultErrorReporter extends ErrorReporterBase implements ErrorReporter {
+public class DefaultMessageReporter extends MessageReporterBase implements MessageReporter {
 
   private void println(String s) {
     System.out.println(s);
diff --git a/core/src/main/java/org/lflang/LFRuntimeModule.java b/core/src/main/java/org/lflang/LFRuntimeModule.java
index a01986dfb3..e69b413081 100644
--- a/core/src/main/java/org/lflang/LFRuntimeModule.java
+++ b/core/src/main/java/org/lflang/LFRuntimeModule.java
@@ -46,8 +46,8 @@ public Class<? extends ISyntaxErrorMessageProvider> bindISyntaxErrorMessageProvi
   }
 
   /** The error reporter. {@code org.lflang.lfc.LFStandaloneModule} overrides this binding. */
-  public Class<? extends ErrorReporter> bindErrorReporter() {
-    return DefaultErrorReporter.class;
+  public Class<? extends MessageReporter> bindErrorReporter() {
+    return DefaultMessageReporter.class;
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/ErrorReporter.java b/core/src/main/java/org/lflang/MessageReporter.java
similarity index 94%
rename from core/src/main/java/org/lflang/ErrorReporter.java
rename to core/src/main/java/org/lflang/MessageReporter.java
index 3b39b14503..578f9c781a 100644
--- a/core/src/main/java/org/lflang/ErrorReporter.java
+++ b/core/src/main/java/org/lflang/MessageReporter.java
@@ -7,7 +7,7 @@
 import org.lflang.generator.Range;
 
 /**
- * Interface for reporting errors. This interface is a staged builder: first call one of the {@code
+ * Interface for reporting messages like errors or info. This interface is a staged builder: first call one of the {@code
  * at} methods to specify the position of the message, then use one of the report methods on the
  * returned {@link Stage2} instance.
  *
@@ -19,13 +19,13 @@
  * errorReporter.nowhere().error("Some error that has no specific position")
  * }</pre>
  *
- * @see ErrorReporterBase
+ * @see MessageReporterBase
  * @author Edward A. Lee
  * @author Marten Lohstroh
  * @author Christian Menard
  * @author Clément Fournier
  */
-public interface ErrorReporter {
+public interface MessageReporter {
 
   /** Position the message on the given range in a given file (both must be non-null). */
   Stage2 at(Path file, Range range);
diff --git a/core/src/main/java/org/lflang/ErrorReporterBase.java b/core/src/main/java/org/lflang/MessageReporterBase.java
similarity index 90%
rename from core/src/main/java/org/lflang/ErrorReporterBase.java
rename to core/src/main/java/org/lflang/MessageReporterBase.java
index c1364b6308..0ee7b0286e 100644
--- a/core/src/main/java/org/lflang/ErrorReporterBase.java
+++ b/core/src/main/java/org/lflang/MessageReporterBase.java
@@ -5,12 +5,12 @@
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.lflang.generator.Range;
 
-/** Base implementation of the {@link ErrorReporter} interface. */
-public abstract class ErrorReporterBase implements ErrorReporter {
+/** Base implementation of the {@link MessageReporter} interface. */
+public abstract class MessageReporterBase implements MessageReporter {
 
   private boolean errorsOccurred = false;
 
-  protected ErrorReporterBase() {}
+  protected MessageReporterBase() {}
 
   @Override
   public boolean getErrorsOccurred() {
diff --git a/core/src/main/java/org/lflang/ModelInfo.java b/core/src/main/java/org/lflang/ModelInfo.java
index 5898e1691a..313f4675dd 100644
--- a/core/src/main/java/org/lflang/ModelInfo.java
+++ b/core/src/main/java/org/lflang/ModelInfo.java
@@ -98,7 +98,7 @@ public class ModelInfo {
    *
    * @param model the model to analyze.
    */
-  public void update(Model model, ErrorReporter reporter) {
+  public void update(Model model, MessageReporter reporter) {
     this.updated = true;
     this.model = model;
     this.instantiationGraph = new InstantiationGraph(model, true);
@@ -132,7 +132,7 @@ public void update(Model model, ErrorReporter reporter) {
     checkCaseInsensitiveNameCollisions(model, reporter);
   }
 
-  public void checkCaseInsensitiveNameCollisions(Model model, ErrorReporter reporter) {
+  public void checkCaseInsensitiveNameCollisions(Model model, MessageReporter reporter) {
     var reactorNames = new HashSet<>();
     var bad = new ArrayList<>();
     for (var reactor : model.getReactors()) {
diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index fcb8c88a62..a61df711e9 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -71,13 +71,13 @@ public TargetConfig(TargetDecl target) { // FIXME: eliminate this constructor if
    *
    * @param cliArgs Arguments passed on the commandline.
    * @param target AST node of a target declaration.
-   * @param errorReporter An error reporter to report problems.
+   * @param messageReporter An error reporter to report problems.
    */
-  public TargetConfig(Properties cliArgs, TargetDecl target, ErrorReporter errorReporter) {
+  public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messageReporter) {
     this(target);
     if (target.getConfig() != null) {
       List<KeyValuePair> pairs = target.getConfig().getPairs();
-      TargetProperty.set(this, pairs != null ? pairs : List.of(), errorReporter);
+      TargetProperty.set(this, pairs != null ? pairs : List.of(), messageReporter);
     }
     if (cliArgs.containsKey("no-compile")) {
       this.noCompile = true;
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 8fd948d2d5..c2df7fea30 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -863,7 +863,7 @@ private interface PropertyParser {
      * Parse the given element into the given target config. May use the error reporter to report
      * format errors.
      */
-    void parseIntoTargetConfig(TargetConfig config, Element element, ErrorReporter err);
+    void parseIntoTargetConfig(TargetConfig config, Element element, MessageReporter err);
   }
 
   public final PropertyGetter getter;
@@ -941,7 +941,7 @@ public String getDisplayName() {
    * @param properties AST node that holds all the target properties.
    * @param err Error reporter on which property format errors will be reported
    */
-  public static void set(TargetConfig config, List<KeyValuePair> properties, ErrorReporter err) {
+  public static void set(TargetConfig config, List<KeyValuePair> properties, MessageReporter err) {
     properties.forEach(
         property -> {
           TargetProperty p = forName(property.getName());
@@ -1002,7 +1002,7 @@ public static TargetDecl extractTargetDecl(Target target, TargetConfig config) {
    *     properties originate.
    */
   public static void update(
-      TargetConfig config, List<KeyValuePair> properties, Path relativePath, ErrorReporter err) {
+      TargetConfig config, List<KeyValuePair> properties, Path relativePath, MessageReporter err) {
     properties.forEach(
         property -> {
           TargetProperty p = forName(property.getName());
@@ -1045,7 +1045,7 @@ public static void updateOne(
       TargetConfig config,
       TargetProperty property,
       List<KeyValuePair> properties,
-      ErrorReporter err) {
+      MessageReporter err) {
     properties.stream()
         .filter(p -> p.getName().equals(property.getDisplayName()))
         .findFirst()
diff --git a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index b26fea12a2..a8c24abdb1 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -112,7 +112,7 @@
 import org.lflang.diagram.synthesis.util.ModeDiagrams;
 import org.lflang.diagram.synthesis.util.NamedInstanceUtil;
 import org.lflang.diagram.synthesis.util.ReactorIcons;
-import org.lflang.diagram.synthesis.util.SynthesisErrorReporter;
+import org.lflang.diagram.synthesis.util.SynthesisMessageReporter;
 import org.lflang.diagram.synthesis.util.UtilityExtensions;
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.ParameterInstance;
@@ -309,7 +309,7 @@ public KNode transform(final Model model) {
       Reactor main =
           IterableExtensions.findFirst(model.getReactors(), _utilityExtensions::isMainOrFederated);
       if (main != null) {
-        ReactorInstance reactorInstance = new ReactorInstance(main, new SynthesisErrorReporter());
+        ReactorInstance reactorInstance = new ReactorInstance(main, new SynthesisMessageReporter());
         rootNode
             .getChildren()
             .addAll(createReactorNode(reactorInstance, true, null, null, new HashMap<>()));
@@ -325,7 +325,7 @@ public KNode transform(final Model model) {
         for (Reactor reactor : model.getReactors()) {
           if (reactor == main) continue;
           ReactorInstance reactorInstance =
-              new ReactorInstance(reactor, new SynthesisErrorReporter());
+              new ReactorInstance(reactor, new SynthesisMessageReporter());
           reactorNodes.addAll(
               createReactorNode(
                   reactorInstance,
diff --git a/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java b/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisMessageReporter.java
similarity index 95%
rename from core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
rename to core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisMessageReporter.java
index b6294901de..539dca74a7 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisMessageReporter.java
@@ -27,13 +27,13 @@
 import java.nio.file.Path;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-import org.lflang.ErrorReporterBase;
+import org.lflang.MessageReporterBase;
 import org.lflang.generator.Range;
 
 /**
  * @author Alexander Schulz-Rosengarten
  */
-public class SynthesisErrorReporter extends ErrorReporterBase {
+public class SynthesisMessageReporter extends MessageReporterBase {
 
   @Override
   protected void reportWithoutPosition(DiagnosticSeverity severity, String message) {
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index e8ec17fc56..3a47701475 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -33,7 +33,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.InferredType;
 import org.lflang.Target;
 import org.lflang.TargetProperty;
@@ -79,11 +79,11 @@ public void initializeTargetConfig(
       int numOfFederates,
       FederateInstance federate,
       FedFileConfig fileConfig,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       RtiConfig rtiConfig)
       throws IOException {
 
-    CExtensionUtils.handleCompileDefinitions(federate, numOfFederates, rtiConfig, errorReporter);
+    CExtensionUtils.handleCompileDefinitions(federate, numOfFederates, rtiConfig, messageReporter);
 
     generateCMakeInclude(federate, fileConfig);
 
@@ -119,7 +119,7 @@ protected void generateCMakeInclude(FederateInstance federate, FedFileConfig fil
    * @param connection FIXME
    * @param type FIXME
    * @param coordinationType The coordination type
-   * @param errorReporter
+   * @param messageReporter
    */
   public String generateNetworkReceiverBody(
       Action action,
@@ -128,7 +128,7 @@ public String generateNetworkReceiverBody(
       FedConnectionInstance connection,
       InferredType type,
       CoordinationType coordinationType,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     var receiveRef =
         CUtil.portRefInReaction(receivingPort, connection.getDstBank(), connection.getDstChannel());
     var result = new CodeBuilder();
@@ -148,7 +148,7 @@ public String generateNetworkReceiverBody(
           receiveRef + "->intended_tag = self->_lf__" + action.getName() + ".intended_tag;\n");
     }
 
-    deserialize(action, receivingPort, connection, type, receiveRef, result, errorReporter);
+    deserialize(action, receivingPort, connection, type, receiveRef, result, messageReporter);
     return result.toString();
   }
 
@@ -161,7 +161,7 @@ public String generateNetworkReceiverBody(
    * @param type Type for the port
    * @param receiveRef A target language reference to the receiving port
    * @param result Used to put generated code in
-   * @param errorReporter Used to report errors, if any
+   * @param messageReporter Used to report errors, if any
    */
   protected void deserialize(
       Action action,
@@ -170,7 +170,7 @@ protected void deserialize(
       InferredType type,
       String receiveRef,
       CodeBuilder result,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     CTypes types = new CTypes();
     // Adjust the type of the action and the receivingPort.
     // If it is "string", then change it to "char*".
@@ -242,7 +242,7 @@ protected void deserialize(
    * @param connection
    * @param type
    * @param coordinationType
-   * @param errorReporter FIXME
+   * @param messageReporter FIXME
    */
   public String generateNetworkSenderBody(
       VarRef sendingPort,
@@ -250,7 +250,7 @@ public String generateNetworkSenderBody(
       FedConnectionInstance connection,
       InferredType type,
       CoordinationType coordinationType,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     var sendRef =
         CUtil.portRefInReaction(sendingPort, connection.getSrcBank(), connection.getSrcChannel());
     var receiveRef =
@@ -330,7 +330,7 @@ public String generateNetworkSenderBody(
               + ", message_length";
     }
 
-    serializeAndSend(connection, type, sendRef, result, sendingFunction, commonArgs, errorReporter);
+    serializeAndSend(connection, type, sendRef, result, sendingFunction, commonArgs, messageReporter);
     return result.toString();
   }
 
@@ -343,7 +343,7 @@ public String generateNetworkSenderBody(
    * @param result
    * @param sendingFunction
    * @param commonArgs
-   * @param errorReporter
+   * @param messageReporter
    */
   protected void serializeAndSend(
       FedConnectionInstance connection,
@@ -352,7 +352,7 @@ protected void serializeAndSend(
       CodeBuilder result,
       String sendingFunction,
       String commonArgs,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     CTypes types = new CTypes();
     var lengthExpression = "";
     var pointerExpression = "";
@@ -507,10 +507,10 @@ public String generatePreamble(
       FederateInstance federate,
       FedFileConfig fileConfig,
       RtiConfig rtiConfig,
-      ErrorReporter errorReporter)
+      MessageReporter messageReporter)
       throws IOException {
     // Put the C preamble in a {@code include/_federate.name + _preamble.h} file
-    String cPreamble = makePreamble(federate, fileConfig, rtiConfig, errorReporter);
+    String cPreamble = makePreamble(federate, fileConfig, rtiConfig, messageReporter);
     String relPath = getPreamblePath(federate);
     Path fedPreamblePath = fileConfig.getSrcPath().resolve(relPath);
     Files.createDirectories(fedPreamblePath.getParent());
@@ -539,7 +539,7 @@ protected String makePreamble(
       FederateInstance federate,
       FedFileConfig fileConfig,
       RtiConfig rtiConfig,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
 
     var code = new CodeBuilder();
 
@@ -561,9 +561,9 @@ protected String makePreamble(
         """
             .formatted(numOfNetworkActions));
 
-    code.pr(generateExecutablePreamble(federate, rtiConfig, errorReporter));
+    code.pr(generateExecutablePreamble(federate, rtiConfig, messageReporter));
 
-    code.pr(generateInitializeTriggers(federate, errorReporter));
+    code.pr(generateInitializeTriggers(federate, messageReporter));
 
     code.pr(CExtensionUtils.generateFederateNeighborStructure(federate));
 
@@ -582,18 +582,18 @@ protected String generateSerializationIncludes(
    * receiving network messages).
    *
    * @param federate The federate to initialize triggers for.
-   * @param errorReporter Used to report errors.
+   * @param messageReporter Used to report errors.
    * @return The generated code for the macro.
    */
   private String generateInitializeTriggers(
-      FederateInstance federate, ErrorReporter errorReporter) {
+      FederateInstance federate, MessageReporter messageReporter) {
     CodeBuilder code = new CodeBuilder();
     // Temporarily change the original federate reactor's name in the AST to
     // the federate's name so that trigger references are accurate.
     var federatedReactor = FedASTUtils.findFederatedReactor(federate.instantiation.eResource());
     var oldFederatedReactorName = federatedReactor.getName();
     federatedReactor.setName(federate.name);
-    var main = new ReactorInstance(federatedReactor, errorReporter, 1);
+    var main = new ReactorInstance(federatedReactor, messageReporter, 1);
     code.pr(CExtensionUtils.initializeTriggersForNetworkActions(federate, main));
     code.pr(CExtensionUtils.initializeTriggerForControlReactions(main, main, federate));
     federatedReactor.setName(oldFederatedReactorName);
@@ -610,10 +610,10 @@ private String generateInitializeTriggers(
 
   /** Generate code for an executed preamble. */
   private String generateExecutablePreamble(
-      FederateInstance federate, RtiConfig rtiConfig, ErrorReporter errorReporter) {
+      FederateInstance federate, RtiConfig rtiConfig, MessageReporter messageReporter) {
     CodeBuilder code = new CodeBuilder();
 
-    code.pr(generateCodeForPhysicalActions(federate, errorReporter));
+    code.pr(generateCodeForPhysicalActions(federate, messageReporter));
 
     code.pr(generateCodeToInitializeFederate(federate, rtiConfig));
 
@@ -758,11 +758,11 @@ private String generateCodeToInitializeFederate(FederateInstance federate, RtiCo
   /**
    * Generate code to handle physical actions in the {@code federate}.
    *
-   * @param errorReporter Used to report errors.
+   * @param messageReporter Used to report errors.
    * @return Generated code.
    */
   private String generateCodeForPhysicalActions(
-      FederateInstance federate, ErrorReporter errorReporter) {
+      FederateInstance federate, MessageReporter messageReporter) {
     CodeBuilder code = new CodeBuilder();
     if (federate.targetConfig.coordination.equals(CoordinationType.CENTRALIZED)) {
       // If this program uses centralized coordination then check
@@ -772,9 +772,9 @@ private String generateCodeForPhysicalActions(
       var main =
           new ReactorInstance(
               FedASTUtils.findFederatedReactor(federate.instantiation.eResource()),
-              errorReporter,
+              messageReporter,
               1);
-      var instance = new ReactorInstance(federateClass, main, errorReporter);
+      var instance = new ReactorInstance(federateClass, main, messageReporter);
       var outputDelayMap = federate.findOutputsConnectedToPhysicalActions(instance);
       var minDelay = TimeValue.MAX_VALUE;
       Output outputFound = null;
@@ -803,7 +803,7 @@ private String generateCodeForPhysicalActions(
                       + " target",
                   "parameter coordination-options with a value like {advance-message-interval: 10"
                       + " msec}");
-          errorReporter.at(outputFound).warning(message);
+          messageReporter.at(outputFound).warning(message);
         }
         code.pr(
             "_fed.min_delay_from_physical_action_to_federate_output = "
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index c3cf9940d1..6afba48178 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -8,7 +8,7 @@
 import java.util.List;
 import java.util.regex.Pattern;
 
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig.ClockSyncOptions;
 import org.lflang.TargetProperty;
@@ -241,7 +241,7 @@ static boolean isSharedPtrType(InferredType type, CTypes types) {
   }
 
   public static void handleCompileDefinitions(
-      FederateInstance federate, int numOfFederates, RtiConfig rtiConfig, ErrorReporter errorReporter) {
+      FederateInstance federate, int numOfFederates, RtiConfig rtiConfig, MessageReporter messageReporter) {
     federate.targetConfig.setByUser.add(TargetProperty.COMPILE_DEFINITIONS);
     federate.targetConfig.compileDefinitions.put("FEDERATED", "");
     federate.targetConfig.compileDefinitions.put(
@@ -257,7 +257,7 @@ public static void handleCompileDefinitions(
 
     handleAdvanceMessageInterval(federate);
 
-    initializeClockSynchronization(federate, rtiConfig, errorReporter);
+    initializeClockSynchronization(federate, rtiConfig, messageReporter);
   }
 
   /**
@@ -297,13 +297,13 @@ static boolean clockSyncIsOn(FederateInstance federate, RtiConfig rtiConfig) {
    *     href="https://github.com/icyphy/lingua-franca/wiki/Distributed-Execution#clock-synchronization">Documentation</a>
    */
   public static void initializeClockSynchronization(
-      FederateInstance federate, RtiConfig rtiConfig, ErrorReporter errorReporter) {
+      FederateInstance federate, RtiConfig rtiConfig, MessageReporter messageReporter) {
     // Check if clock synchronization should be enabled for this federate in the first place
     if (clockSyncIsOn(federate, rtiConfig)) {
-      errorReporter.nowhere().info("Initial clock synchronization is enabled for federate " + federate.id);
+      messageReporter.nowhere().info("Initial clock synchronization is enabled for federate " + federate.id);
       if (federate.targetConfig.clockSync == ClockSyncMode.ON) {
         if (federate.targetConfig.clockSyncOptions.collectStats) {
-          errorReporter.nowhere().info("Will collect clock sync statistics for federate " + federate.id);
+          messageReporter.nowhere().info("Will collect clock sync statistics for federate " + federate.id);
           // Add libm to the compiler flags
           // FIXME: This is a linker flag not compile flag but we don't have a way to add linker
           // flags
@@ -312,7 +312,7 @@ public static void initializeClockSynchronization(
           federate.targetConfig.compilerFlags.add("-lm");
           federate.targetConfig.setByUser.add(TargetProperty.FLAGS);
         }
-        errorReporter.nowhere().info("Runtime clock synchronization is enabled for federate " + federate.id);
+        messageReporter.nowhere().info("Runtime clock synchronization is enabled for federate " + federate.id);
       }
 
       addClockSyncCompileDefinitions(federate);
diff --git a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
index 17ac198781..2b3328ab88 100644
--- a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
@@ -1,7 +1,7 @@
 package org.lflang.federated.extensions;
 
 import java.io.IOException;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
@@ -23,14 +23,14 @@ public interface FedTargetExtension {
    * @param numOfFederates
    * @param federate The federate instance.
    * @param fileConfig An instance of {@code FedFileConfig}.
-   * @param errorReporter Used to report errors.
+   * @param messageReporter Used to report errors.
    */
   void initializeTargetConfig(
       LFGeneratorContext context,
       int numOfFederates,
       FederateInstance federate,
       FedFileConfig fileConfig,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       RtiConfig rtiConfig)
       throws IOException;
 
@@ -44,7 +44,7 @@ void initializeTargetConfig(
    * @param connection FIXME
    * @param type FIXME
    * @param coordinationType The coordination type
-   * @param errorReporter
+   * @param messageReporter
    */
   String generateNetworkReceiverBody(
       Action action,
@@ -53,7 +53,7 @@ String generateNetworkReceiverBody(
       FedConnectionInstance connection,
       InferredType type,
       CoordinationType coordinationType,
-      ErrorReporter errorReporter);
+      MessageReporter messageReporter);
 
   /**
    * Generate code for the body of a reaction that handles an output that is to be sent over the
@@ -64,7 +64,7 @@ String generateNetworkReceiverBody(
    * @param connection
    * @param type
    * @param coordinationType
-   * @param errorReporter FIXME
+   * @param messageReporter FIXME
    */
   String generateNetworkSenderBody(
       VarRef sendingPort,
@@ -72,7 +72,7 @@ String generateNetworkSenderBody(
       FedConnectionInstance connection,
       InferredType type,
       CoordinationType coordinationType,
-      ErrorReporter errorReporter);
+      MessageReporter messageReporter);
 
   /**
    * Generate code for the body of a reaction that decides whether the trigger for the given port is
@@ -113,13 +113,13 @@ default void annotateReaction(Reaction reaction) {}
    *
    * @param federate
    * @param rtiConfig
-   * @param errorReporter
+   * @param messageReporter
    * @return
    */
   String generatePreamble(
       FederateInstance federate,
       FedFileConfig fileConfig,
       RtiConfig rtiConfig,
-      ErrorReporter errorReporter)
+      MessageReporter messageReporter)
       throws IOException;
 }
diff --git a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
index 6fd1cb3dc9..3f290d5639 100644
--- a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
@@ -27,7 +27,7 @@
 package org.lflang.federated.extensions;
 
 import java.io.IOException;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.ast.ASTUtils;
@@ -86,7 +86,7 @@ public String generateNetworkSenderBody(
       FedConnectionInstance connection,
       InferredType type,
       CoordinationType coordinationType,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     var result = new CodeBuilder();
 
     // We currently have no way to mark a reaction "unordered"
@@ -95,7 +95,7 @@ public String generateNetworkSenderBody(
     result.pr(PyUtil.generateGILAcquireCode() + "\n");
     result.pr(
         super.generateNetworkSenderBody(
-            sendingPort, receivingPort, connection, type, coordinationType, errorReporter));
+            sendingPort, receivingPort, connection, type, coordinationType, messageReporter));
     result.pr(PyUtil.generateGILReleaseCode() + "\n");
     return result.getCode();
   }
@@ -108,7 +108,7 @@ public String generateNetworkReceiverBody(
       FedConnectionInstance connection,
       InferredType type,
       CoordinationType coordinationType,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     var result = new CodeBuilder();
 
     // We currently have no way to mark a reaction "unordered"
@@ -117,7 +117,7 @@ public String generateNetworkReceiverBody(
     result.pr(PyUtil.generateGILAcquireCode() + "\n");
     result.pr(
         super.generateNetworkReceiverBody(
-            action, sendingPort, receivingPort, connection, type, coordinationType, errorReporter));
+            action, sendingPort, receivingPort, connection, type, coordinationType, messageReporter));
     result.pr(PyUtil.generateGILReleaseCode() + "\n");
     return result.getCode();
   }
@@ -130,7 +130,7 @@ protected void deserialize(
       InferredType type,
       String receiveRef,
       CodeBuilder result,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     String value = "";
     switch (connection.getSerializer()) {
       case NATIVE:
@@ -160,7 +160,7 @@ protected void serializeAndSend(
       CodeBuilder result,
       String sendingFunction,
       String commonArgs,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     String lengthExpression = "";
     String pointerExpression = "";
     switch (connection.getSerializer()) {
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 665a322407..61b62de554 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -6,7 +6,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
@@ -32,7 +32,7 @@ public void initializeTargetConfig(
       int numOfFederates,
       FederateInstance federate,
       FedFileConfig fileConfig,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       RtiConfig rtiConfig)
       throws IOException {}
 
@@ -44,7 +44,7 @@ public String generateNetworkReceiverBody(
       FedConnectionInstance connection,
       InferredType type,
       CoordinationType coordinationType,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     return """
         // generateNetworkReceiverBody
         if (%1$s !== undefined) {
@@ -64,7 +64,7 @@ public String generateNetworkSenderBody(
       FedConnectionInstance connection,
       InferredType type,
       CoordinationType coordinationType,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     return """
         if (%1$s.%2$s !== undefined) {
             this.util.sendRTITimedMessage(%1$s.%2$s, %3$s, %4$s, %5$s);
@@ -110,8 +110,8 @@ public String generatePreamble(
       FederateInstance federate,
       FedFileConfig fileConfig,
       RtiConfig rtiConfig,
-      ErrorReporter errorReporter) {
-    var minOutputDelay = getMinOutputDelay(federate, fileConfig, errorReporter);
+      MessageReporter messageReporter) {
+    var minOutputDelay = getMinOutputDelay(federate, fileConfig, messageReporter);
     var upstreamConnectionDelays = getUpstreamConnectionDelays(federate);
     return """
         const defaultFederateConfig: __FederateConfig = {
@@ -149,7 +149,7 @@ public String generatePreamble(
   }
 
   private TimeValue getMinOutputDelay(
-      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+      FederateInstance federate, FedFileConfig fileConfig, MessageReporter messageReporter) {
     if (federate.targetConfig.coordination.equals(CoordinationType.CENTRALIZED)) {
       // If this program uses centralized coordination then check
       // for outputs that depend on physical actions so that null messages can be
@@ -158,9 +158,9 @@ private TimeValue getMinOutputDelay(
       var main =
           new ReactorInstance(
               FedASTUtils.findFederatedReactor(federate.instantiation.eResource()),
-              errorReporter,
+              messageReporter,
               1);
-      var instance = new ReactorInstance(federateClass, main, errorReporter);
+      var instance = new ReactorInstance(federateClass, main, messageReporter);
       var outputDelayMap = federate.findOutputsConnectedToPhysicalActions(instance);
       var minOutputDelay = TimeValue.MAX_VALUE;
       Output outputFound = null;
@@ -189,7 +189,7 @@ private TimeValue getMinOutputDelay(
                       + " target",
                   "parameter coordination-options with a value like {advance-message-interval: 10"
                       + " msec}");
-          errorReporter.at(outputFound).warning(message);
+          messageReporter.at(outputFound).warning(message);
         }
         return minOutputDelay;
       }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 338fbff242..a3f76f2bdb 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -42,7 +42,7 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.InferredType;
 import org.lflang.ModelInfo;
 import org.lflang.TargetProperty.CoordinationType;
@@ -125,15 +125,15 @@ public static Reactor findFederatedReactor(Resource resource) {
    *
    * @param connection Network connection between two federates.
    * @param coordination One of CoordinationType.DECENTRALIZED or CoordinationType.CENTRALIZED.
-   * @param errorReporter Used to report errors encountered.
+   * @param messageReporter Used to report errors encountered.
    */
   public static void makeCommunication(
       FedConnectionInstance connection,
       CoordinationType coordination,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
 
     // Add the sender reaction.
-    addNetworkSenderReaction(connection, coordination, errorReporter);
+    addNetworkSenderReaction(connection, coordination, messageReporter);
 
     // Next, generate control reactions
     if (!connection.getDefinition().isPhysical()
@@ -146,7 +146,7 @@ public static void makeCommunication(
       FedASTUtils.addNetworkOutputControlReaction(connection);
 
       // Add the network input control reaction to the parent
-      FedASTUtils.addNetworkInputControlReaction(connection, coordination, errorReporter);
+      FedASTUtils.addNetworkInputControlReaction(connection, coordination, messageReporter);
     }
 
     // Create the network action (@see createNetworkAction)
@@ -159,7 +159,7 @@ public static void makeCommunication(
     ((Reactor) connection.getDefinition().eContainer()).getActions().add(networkAction);
 
     // Add the network receiver reaction in the destinationFederate
-    addNetworkReceiverReaction(networkAction, connection, coordination, errorReporter);
+    addNetworkReceiverReaction(networkAction, connection, coordination, messageReporter);
   }
 
   /**
@@ -223,7 +223,7 @@ private static void addNetworkReceiverReaction(
       Action networkAction,
       FedConnectionInstance connection,
       CoordinationType coordination,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     LfFactory factory = LfFactory.eINSTANCE;
     VarRef sourceRef = factory.createVarRef();
     VarRef destRef = factory.createVarRef();
@@ -278,7 +278,7 @@ private static void addNetworkReceiverReaction(
                     connection,
                     ASTUtils.getInferredType(networkAction),
                     coordination,
-                    errorReporter));
+                    messageReporter));
 
     ASTUtils.addReactionAttribute(networkReceiverReaction, "_unordered");
 
@@ -297,7 +297,7 @@ private static void addNetworkReceiverReaction(
     ) {
       // Add necessary dependencies to reaction to ensure that it executes correctly
       // relative to other network input control reactions in the federate.
-      addRelativeDependency(connection, networkReceiverReaction, errorReporter);
+      addRelativeDependency(connection, networkReceiverReaction, messageReporter);
     }
   }
 
@@ -308,13 +308,13 @@ private static void addNetworkReceiverReaction(
    *
    * @param connection FIXME
    * @param coordination FIXME
-   * @param errorReporter
+   * @param messageReporter
    * @note Used in federated execution
    */
   private static void addNetworkInputControlReaction(
       FedConnectionInstance connection,
       CoordinationType coordination,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
 
     LfFactory factory = LfFactory.eINSTANCE;
     Reaction reaction = factory.createReaction();
@@ -383,7 +383,7 @@ private static void addNetworkInputControlReaction(
 
     // Add necessary dependencies to reaction to ensure that it executes correctly
     // relative to other network input control reactions in the federate.
-    addRelativeDependency(connection, reaction, errorReporter);
+    addRelativeDependency(connection, reaction, messageReporter);
   }
 
   /**
@@ -399,7 +399,7 @@ private static void addNetworkInputControlReaction(
   private static void addRelativeDependency(
       FedConnectionInstance connection,
       Reaction networkInputReaction,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     var upstreamOutputPortsInFederate =
         findUpstreamPortsInFederate(
             connection.dstFederate,
@@ -416,7 +416,7 @@ private static void addRelativeDependency(
       networkInputReaction.getSources().add(sourceRef);
 
       // Remove the port if it introduces cycles
-      info.update((Model) networkInputReaction.eContainer().eContainer(), errorReporter);
+      info.update((Model) networkInputReaction.eContainer().eContainer(), messageReporter);
       if (!info.topologyCycles().isEmpty()) {
         networkInputReaction.getSources().remove(sourceRef);
       }
@@ -646,13 +646,13 @@ public static <E> List<E> safe(List<E> list) {
    *
    * @param connection Network connection between two federates.
    * @param coordination One of CoordinationType.DECENTRALIZED or CoordinationType.CENTRALIZED.
-   * @param errorReporter FIXME
+   * @param messageReporter FIXME
    * @note Used in federated execution
    */
   private static void addNetworkSenderReaction(
       FedConnectionInstance connection,
       CoordinationType coordination,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     LfFactory factory = LfFactory.eINSTANCE;
     // Assume all the types are the same, so just use the first on the right.
     Type type = EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getType());
@@ -700,7 +700,7 @@ private static void addNetworkSenderReaction(
                     connection,
                     InferredType.fromAST(type),
                     coordination,
-                    errorReporter));
+                    messageReporter));
 
     ASTUtils.addReactionAttribute(networkSenderReaction, "_unordered");
 
diff --git a/core/src/main/java/org/lflang/federated/generator/FedEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
index dda4dd6662..dc642a5612 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
@@ -5,7 +5,7 @@
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.federated.launcher.RtiConfig;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.LFGeneratorContext;
@@ -16,17 +16,17 @@ public class FedEmitter {
 
   private final FedFileConfig fileConfig;
   private final Reactor originalMainReactor;
-  private final ErrorReporter errorReporter;
+  private final MessageReporter messageReporter;
   private final RtiConfig rtiConfig;
 
   public FedEmitter(
       FedFileConfig fileConfig,
       Reactor originalMainReactor,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       RtiConfig rtiConfig) {
     this.fileConfig = fileConfig;
     this.originalMainReactor = originalMainReactor;
-    this.errorReporter = errorReporter;
+    this.messageReporter = messageReporter;
     this.rtiConfig = rtiConfig;
   }
 
@@ -40,7 +40,7 @@ Map<Path, CodeMap> generateFederate(
       throws IOException {
     String fedName = federate.name;
     Files.createDirectories(fileConfig.getSrcPath());
-    errorReporter.nowhere().info(
+    messageReporter.nowhere().info(
         "##### Generating code for federate "
             + fedName
             + " in directory "
@@ -51,12 +51,12 @@ Map<Path, CodeMap> generateFederate(
             "\n",
             new FedTargetEmitter()
                 .generateTarget(
-                    context, numOfFederates, federate, fileConfig, errorReporter, rtiConfig),
+                    context, numOfFederates, federate, fileConfig, messageReporter, rtiConfig),
             new FedImportEmitter().generateImports(federate, fileConfig),
             new FedPreambleEmitter()
-                .generatePreamble(federate, fileConfig, rtiConfig, errorReporter),
+                .generatePreamble(federate, fileConfig, rtiConfig, messageReporter),
             new FedReactorEmitter().generateReactorDefinitions(federate),
-            new FedMainEmitter().generateMainReactor(federate, originalMainReactor, errorReporter));
+            new FedMainEmitter().generateMainReactor(federate, originalMainReactor, messageReporter));
     Map<Path, CodeMap> codeMapMap = new HashMap<>();
     var lfFilePath = lfFilePath(fileConfig, federate);
     try (var srcWriter = Files.newBufferedWriter(lfFilePath)) {
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 37e103882f..2b418b1ad7 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -26,7 +26,7 @@
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.resource.XtextResourceSet;
 import org.eclipse.xtext.util.RuntimeIOException;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.LFStandaloneSetup;
 import org.lflang.Target;
@@ -60,7 +60,7 @@
 public class FedGenerator {
 
   /** */
-  private final ErrorReporter errorReporter;
+  private final MessageReporter messageReporter;
 
   /** A list of federate instances. */
   private final List<FederateInstance> federates = new ArrayList<>();
@@ -101,7 +101,7 @@ public class FedGenerator {
   public FedGenerator(LFGeneratorContext context) {
     this.fileConfig = (FedFileConfig) context.getFileConfig();
     this.targetConfig = context.getTargetConfig();
-    this.errorReporter = context.getErrorReporter();
+    this.messageReporter = context.getErrorReporter();
   }
 
   /**
@@ -140,7 +140,7 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
 
     FedEmitter fedEmitter =
         new FedEmitter(
-            fileConfig, ASTUtils.toDefinition(mainDef.getReactorClass()), errorReporter, rtiConfig);
+            fileConfig, ASTUtils.toDefinition(mainDef.getReactorClass()), messageReporter, rtiConfig);
 
     // Generate LF code for each federate.
     Map<Path, CodeMap> lf2lfCodeMapMap = new HashMap<>();
@@ -178,7 +178,7 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
   }
 
   private void generateLaunchScript() {
-    new FedLauncherGenerator(this.targetConfig, this.fileConfig, this.errorReporter)
+    new FedLauncherGenerator(this.targetConfig, this.fileConfig, this.messageReporter)
         .doGenerate(federates, rtiConfig);
   }
 
@@ -233,12 +233,12 @@ private boolean federatedExecutionIsSupported(Resource resource) {
     var targetOK =
         List.of(Target.C, Target.Python, Target.TS, Target.CPP, Target.CCPP).contains(target);
     if (!targetOK) {
-      errorReporter
+      messageReporter
           .at(targetDecl)
           .error("Federated execution is not supported with target " + target + ".");
     }
     if (target.equals(Target.C) && GeneratorUtils.isHostWindows()) {
-      errorReporter
+      messageReporter
           .at(targetDecl)
           .error("Federated LF programs with a C target are currently not supported on Windows.");
       targetOK = false;
@@ -264,12 +264,12 @@ private Map<Path, CodeMap> compileFederates(
         Math.min(
             6, Math.min(Math.max(federates.size(), 1), Runtime.getRuntime().availableProcessors()));
     var compileThreadPool = Executors.newFixedThreadPool(numOfCompileThreads);
-    errorReporter.nowhere().info(
+    messageReporter.nowhere().info(
         "******** Using " + numOfCompileThreads + " threads to compile the program.");
     Map<Path, CodeMap> codeMapMap = new ConcurrentHashMap<>();
     List<SubContext> subContexts = Collections.synchronizedList(new ArrayList<>());
     Averager averager = new Averager(federates.size());
-    final var threadSafeErrorReporter = new SynchronizedErrorReporter(errorReporter);
+    final var threadSafeErrorReporter = new SynchronizedMessageReporter(messageReporter);
     for (int i = 0; i < federates.size(); i++) {
       FederateInstance fed = federates.get(i);
       final int id = i;
@@ -282,8 +282,8 @@ private Map<Path, CodeMap> compileFederates(
                     true);
             FileConfig subFileConfig =
                 LFGenerator.createFileConfig(res, fileConfig.getSrcGenPath(), true);
-            ErrorReporter subContextErrorReporter =
-                new LineAdjustingErrorReporter(threadSafeErrorReporter, lf2lfCodeMapMap);
+            MessageReporter subContextMessageReporter =
+                new LineAdjustingMessageReporter(threadSafeErrorReporter, lf2lfCodeMapMap);
 
             var props = new Properties();
             if (targetConfig.dockerOptions != null && targetConfig.target.buildsUsingDocker()) {
@@ -295,12 +295,12 @@ private Map<Path, CodeMap> compileFederates(
                 new TargetConfig(
                     props,
                     GeneratorUtils.findTargetDecl(subFileConfig.resource),
-                    subContextErrorReporter);
+                    subContextMessageReporter);
             SubContext subContext =
                 new SubContext(context, IntegratedBuilder.VALIDATED_PERCENT_PROGRESS, 100) {
                   @Override
-                  public ErrorReporter getErrorReporter() {
-                    return subContextErrorReporter;
+                  public MessageReporter getErrorReporter() {
+                    return subContextMessageReporter;
                   }
 
                   @Override
@@ -420,7 +420,7 @@ private void analyzeFederates(Reactor federation, LFGeneratorContext context) {
     for (Instantiation instantiation : ASTUtils.allInstantiations(federation)) {
       int bankWidth = ASTUtils.width(instantiation.getWidthSpec(), mainReactorContext);
       if (bankWidth < 0) {
-        errorReporter.at(instantiation).error("Cannot determine bank width! Assuming width of 1.");
+        messageReporter.at(instantiation).error("Cannot determine bank width! Assuming width of 1.");
         // Continue with a bank width of 1.
         bankWidth = 1;
       }
@@ -452,7 +452,7 @@ private List<FederateInstance> getFederateInstances(
       var resource = instantiation.getReactorClass().eResource();
       var federateTargetConfig = new FedTargetConfig(context, resource);
       FederateInstance federateInstance =
-          new FederateInstance(instantiation, federateID, i, federateTargetConfig, errorReporter);
+          new FederateInstance(instantiation, federateID, i, federateTargetConfig, messageReporter);
       federates.add(federateInstance);
       federateInstances.add(federateInstance);
 
@@ -488,7 +488,7 @@ private void replaceFederateConnectionsWithProxies(Reactor federation) {
     // to duplicate the rather complicated logic in that class. We specify a depth of 1,
     // so it only creates the reactors immediately within the top level, not reactors
     // that those contain.
-    ReactorInstance mainInstance = new ReactorInstance(federation, errorReporter);
+    ReactorInstance mainInstance = new ReactorInstance(federation, messageReporter);
 
     for (ReactorInstance child : mainInstance.children) {
       for (PortInstance output : child.outputs) {
@@ -514,7 +514,7 @@ private void replaceConnectionFromOutputPort(PortInstance output) {
     for (SendRange srcRange : output.getDependentPorts()) {
       if (srcRange.connection == null) {
         // This should not happen.
-        errorReporter.at(output.getDefinition()).error("Cannot find output connection for port");
+        messageReporter.at(output.getDefinition()).error("Cannot find output connection for port");
         continue;
       }
       // Iterate through destinations
@@ -606,6 +606,6 @@ private void replaceFedConnection(FedConnectionInstance connection) {
       }
     }
 
-    FedASTUtils.makeCommunication(connection, targetConfig.coordination, errorReporter);
+    FedASTUtils.makeCommunication(connection, targetConfig.coordination, messageReporter);
   }
 }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index dc583702e2..4d262d1bb4 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -3,7 +3,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import org.eclipse.emf.ecore.EObject;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.ast.FormattingUtil;
 import org.lflang.lf.Reactor;
@@ -17,14 +17,14 @@ public class FedMainEmitter {
    *
    * @param federate
    * @param originalMainReactor The original main reactor.
-   * @param errorReporter Used to report errors.
+   * @param messageReporter Used to report errors.
    * @return The main reactor.
    */
   String generateMainReactor(
-      FederateInstance federate, Reactor originalMainReactor, ErrorReporter errorReporter) {
+      FederateInstance federate, Reactor originalMainReactor, MessageReporter messageReporter) {
     // FIXME: Handle modes at the top-level
     if (!ASTUtils.allModes(originalMainReactor).isEmpty()) {
-      errorReporter
+      messageReporter
           .at(ASTUtils.allModes(originalMainReactor).stream().findFirst().get())
           .error("Modes at the top level are not supported under federated execution.");
     }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedPreambleEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedPreambleEmitter.java
index 9cb35b2949..7966bc73dd 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedPreambleEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedPreambleEmitter.java
@@ -3,7 +3,7 @@
 import static org.lflang.ast.ASTUtils.toText;
 
 import java.io.IOException;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.extensions.FedTargetExtensionFactory;
 import org.lflang.federated.launcher.RtiConfig;
@@ -23,7 +23,7 @@ String generatePreamble(
       FederateInstance federate,
       FedFileConfig fileConfig,
       RtiConfig rtiConfig,
-      ErrorReporter errorReporter)
+      MessageReporter messageReporter)
       throws IOException {
     CodeBuilder preambleCode = new CodeBuilder();
 
@@ -48,7 +48,7 @@ String generatePreamble(
             =}"""
             .formatted(
                 FedTargetExtensionFactory.getExtension(federate.targetConfig.target)
-                    .generatePreamble(federate, fileConfig, rtiConfig, errorReporter)));
+                    .generatePreamble(federate, fileConfig, rtiConfig, messageReporter)));
 
     return preambleCode.getCode();
   }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
index aa0cfccc14..15694e1c0b 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
@@ -4,7 +4,7 @@
 
 import java.nio.file.Path;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.generator.GeneratorUtils;
@@ -46,10 +46,10 @@ public FedTargetConfig(LFGeneratorContext context, Resource federateResource) {
    *
    * @param federateResource The resource where the class of the federate is specified.
    * @param mainResource The resource in which the federation (i.e., main reactor) is specified.
-   * @param errorReporter An error reporter to use when problems are encountered.
+   * @param messageReporter An error reporter to use when problems are encountered.
    */
   private void mergeImportedConfig(
-      Resource federateResource, Resource mainResource, ErrorReporter errorReporter) {
+      Resource federateResource, Resource mainResource, MessageReporter messageReporter) {
     // If the federate is imported, then update the configuration based on target properties
     // in the imported file.
     if (!federateResource.equals(mainResource)) {
@@ -61,7 +61,7 @@ private void mergeImportedConfig(
             this,
             convertToEmptyListIfNull(targetProperties.getPairs()),
             getRelativePath(mainResource, federateResource),
-            errorReporter);
+            messageReporter);
       }
     }
   }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
index b411ff0a44..2e9b26a7ff 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
@@ -1,7 +1,7 @@
 package org.lflang.federated.generator;
 
 import java.io.IOException;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.TargetProperty;
 import org.lflang.ast.FormattingUtil;
 import org.lflang.federated.extensions.FedTargetExtensionFactory;
@@ -15,7 +15,7 @@ String generateTarget(
       int numOfFederates,
       FederateInstance federate,
       FedFileConfig fileConfig,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       RtiConfig rtiConfig)
       throws IOException {
 
@@ -25,7 +25,7 @@ String generateTarget(
     // See https://issues.lf-lang.org/1667
     FedTargetExtensionFactory.getExtension(federate.targetConfig.target)
         .initializeTargetConfig(
-            context, numOfFederates, federate, fileConfig, errorReporter, rtiConfig);
+            context, numOfFederates, federate, fileConfig, messageReporter, rtiConfig);
 
     return FormattingUtil.renderer(federate.targetConfig.target)
         .apply(
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index 5fbcf93b78..22e70a6c73 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -36,7 +36,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.eclipse.emf.ecore.EObject;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
@@ -83,18 +83,18 @@ public class FederateInstance { // why does this not extend ReactorInstance?
    *     been defined.
    * @param id The federate ID.
    * @param bankIndex If instantiation.widthSpec !== null, this gives the bank position.
-   * @param errorReporter The error reporter
+   * @param messageReporter The error reporter
    */
   public FederateInstance(
       Instantiation instantiation,
       int id,
       int bankIndex,
       TargetConfig targetConfig,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     this.instantiation = instantiation;
     this.id = id;
     this.bankIndex = bankIndex;
-    this.errorReporter = errorReporter;
+    this.messageReporter = messageReporter;
     this.targetConfig = targetConfig;
 
     if (instantiation != null) {
@@ -510,7 +510,7 @@ private boolean containsAllVarRefs(Iterable<VarRef> varRefs) {
         referencesFederate = true;
       } else {
         if (referencesFederate) {
-          errorReporter
+          messageReporter
               .at(varRef)
               .error("Mixed triggers and effects from different federates. This is not permitted");
         }
@@ -568,7 +568,7 @@ public String toString() {
   private Set<Reaction> excludeReactions = null;
 
   /** An error reporter */
-  private final ErrorReporter errorReporter;
+  private final MessageReporter messageReporter;
 
   /**
    * Find the nearest (shortest) path to a physical action trigger from this 'reaction' in terms of
diff --git a/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java b/core/src/main/java/org/lflang/federated/generator/LineAdjustingMessageReporter.java
similarity index 86%
rename from core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java
rename to core/src/main/java/org/lflang/federated/generator/LineAdjustingMessageReporter.java
index 0fde6e0461..9a08f007cb 100644
--- a/core/src/main/java/org/lflang/federated/generator/LineAdjustingErrorReporter.java
+++ b/core/src/main/java/org/lflang/federated/generator/LineAdjustingMessageReporter.java
@@ -3,17 +3,17 @@
 import java.nio.file.Path;
 import java.util.Map;
 import org.eclipse.emf.ecore.EObject;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.Position;
 import org.lflang.generator.Range;
 
-public class LineAdjustingErrorReporter implements ErrorReporter {
+public class LineAdjustingMessageReporter implements MessageReporter {
 
-  private final ErrorReporter parent;
+  private final MessageReporter parent;
   private final Map<Path, CodeMap> codeMapMap;
 
-  public LineAdjustingErrorReporter(ErrorReporter parent, Map<Path, CodeMap> codeMapMap) {
+  public LineAdjustingMessageReporter(MessageReporter parent, Map<Path, CodeMap> codeMapMap) {
     this.parent = parent;
     this.codeMapMap = codeMapMap;
   }
diff --git a/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java b/core/src/main/java/org/lflang/federated/generator/SynchronizedMessageReporter.java
similarity index 77%
rename from core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java
rename to core/src/main/java/org/lflang/federated/generator/SynchronizedMessageReporter.java
index 7cf7bb0610..e51a118d70 100644
--- a/core/src/main/java/org/lflang/federated/generator/SynchronizedErrorReporter.java
+++ b/core/src/main/java/org/lflang/federated/generator/SynchronizedMessageReporter.java
@@ -3,15 +3,15 @@
 import java.nio.file.Path;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-import org.lflang.ErrorReporter;
-import org.lflang.ErrorReporterBase;
+import org.lflang.MessageReporter;
+import org.lflang.MessageReporterBase;
 import org.lflang.generator.Range;
 
-public class SynchronizedErrorReporter extends ErrorReporterBase {
+public class SynchronizedMessageReporter extends MessageReporterBase {
 
-  private final ErrorReporter parent;
+  private final MessageReporter parent;
 
-  public SynchronizedErrorReporter(ErrorReporter parent) {
+  public SynchronizedMessageReporter(MessageReporter parent) {
     this.parent = parent;
   }
 
diff --git a/core/src/main/java/org/lflang/federated/launcher/BuildConfig.java b/core/src/main/java/org/lflang/federated/launcher/BuildConfig.java
index 47345af147..48b297da01 100644
--- a/core/src/main/java/org/lflang/federated/launcher/BuildConfig.java
+++ b/core/src/main/java/org/lflang/federated/launcher/BuildConfig.java
@@ -1,6 +1,6 @@
 package org.lflang.federated.launcher;
 
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
 
@@ -11,7 +11,7 @@ public abstract class BuildConfig {
   protected final FederateInstance federate;
 
   /** An error reporter to report problems. */
-  protected final ErrorReporter errorReporter;
+  protected final MessageReporter messageReporter;
 
   /** The file configuration of the federation that the federate belongs to. */
   protected final FedFileConfig fileConfig;
@@ -21,11 +21,11 @@ public abstract class BuildConfig {
    *
    * @param federate The federate that this configuration applies to.
    * @param fileConfig The file configuration of the federation that the federate belongs to.
-   * @param errorReporter An error reporter to report problems.
+   * @param messageReporter An error reporter to report problems.
    */
   public BuildConfig(
-      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-    this.errorReporter = errorReporter;
+      FederateInstance federate, FedFileConfig fileConfig, MessageReporter messageReporter) {
+    this.messageReporter = messageReporter;
     this.federate = federate;
     this.fileConfig = fileConfig;
   }
diff --git a/core/src/main/java/org/lflang/federated/launcher/CBuildConfig.java b/core/src/main/java/org/lflang/federated/launcher/CBuildConfig.java
index d77ea3988c..8a3609801c 100644
--- a/core/src/main/java/org/lflang/federated/launcher/CBuildConfig.java
+++ b/core/src/main/java/org/lflang/federated/launcher/CBuildConfig.java
@@ -26,7 +26,7 @@
 package org.lflang.federated.launcher;
 
 import java.io.File;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
 import org.lflang.generator.c.CCompiler;
@@ -41,8 +41,8 @@
 public class CBuildConfig extends BuildConfig {
 
   public CBuildConfig(
-      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-    super(federate, fileConfig, errorReporter);
+      FederateInstance federate, FedFileConfig fileConfig, MessageReporter messageReporter) {
+    super(federate, fileConfig, messageReporter);
   }
 
   @Override
@@ -56,7 +56,7 @@ public String compileCommand() {
     if (!federate.targetConfig.compileAdditionalSources.contains(linuxPlatformSupport)) {
       federate.targetConfig.compileAdditionalSources.add(linuxPlatformSupport);
     }
-    CCompiler cCompiler = new CCompiler(federate.targetConfig, fileConfig, errorReporter, false);
+    CCompiler cCompiler = new CCompiler(federate.targetConfig, fileConfig, messageReporter, false);
     commandToReturn =
         String.join(
             " ",
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index 9480aae5ea..f4a148ff18 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -33,7 +33,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty.ClockSyncMode;
 import org.lflang.federated.generator.FedFileConfig;
@@ -48,19 +48,19 @@
 public class FedLauncherGenerator {
   protected TargetConfig targetConfig;
   protected FedFileConfig fileConfig;
-  protected ErrorReporter errorReporter;
+  protected MessageReporter messageReporter;
 
   /**
    * @param targetConfig The current target configuration.
    * @param fileConfig The current file configuration.
-   * @param errorReporter A error reporter for reporting any errors or warnings during the code
+   * @param messageReporter A error reporter for reporting any errors or warnings during the code
    *     generation
    */
   public FedLauncherGenerator(
-      TargetConfig targetConfig, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+      TargetConfig targetConfig, FedFileConfig fileConfig, MessageReporter messageReporter) {
     this.targetConfig = targetConfig;
     this.fileConfig = fileConfig;
-    this.errorReporter = errorReporter;
+    this.messageReporter = messageReporter;
   }
 
   /**
@@ -156,7 +156,7 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
     // Index used for storing pids of federates
     int federateIndex = 0;
     for (FederateInstance federate : federates) {
-      var buildConfig = getBuildConfig(federate, fileConfig, errorReporter);
+      var buildConfig = getBuildConfig(federate, fileConfig, messageReporter);
       if (federate.isRemote) {
         Path fedRelSrcGenPath =
             fileConfig.getOutPath().relativize(fileConfig.getSrcGenPath()).resolve(federate.name);
@@ -214,11 +214,11 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
       try {
         Files.createDirectories(fileConfig.binPath);
       } catch (IOException e) {
-        errorReporter.nowhere().error("Unable to create directory: " + fileConfig.binPath);
+        messageReporter.nowhere().error("Unable to create directory: " + fileConfig.binPath);
       }
     }
 
-    errorReporter.nowhere().info(
+    messageReporter.nowhere().info(
         "##### Generating launcher for federation " + " in directory " + fileConfig.binPath);
 
     // Write the launcher file.
@@ -232,17 +232,17 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
     try {
       fOut = new FileOutputStream(file);
     } catch (FileNotFoundException e) {
-      errorReporter.nowhere().error("Unable to find file: " + file);
+      messageReporter.nowhere().error("Unable to find file: " + file);
     }
     try {
       fOut.write(shCode.toString().getBytes());
       fOut.close();
     } catch (IOException e) {
-      errorReporter.nowhere().error("Unable to write to file: " + file);
+      messageReporter.nowhere().error("Unable to write to file: " + file);
     }
 
     if (!file.setExecutable(true, false)) {
-      errorReporter.nowhere().warning("Unable to make launcher script executable.");
+      messageReporter.nowhere().warning("Unable to make launcher script executable.");
     }
 
     // Write the distributor file.
@@ -257,12 +257,12 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
         fOut.write(distCode.toString().getBytes());
         fOut.close();
         if (!file.setExecutable(true, false)) {
-          errorReporter.nowhere().warning("Unable to make file executable: " + file);
+          messageReporter.nowhere().warning("Unable to make file executable: " + file);
         }
       } catch (FileNotFoundException e) {
-        errorReporter.nowhere().error("Unable to find file: " + file);
+        messageReporter.nowhere().error("Unable to find file: " + file);
       } catch (IOException e) {
-        errorReporter.nowhere().error("Unable to write to file " + file);
+        messageReporter.nowhere().error("Unable to write to file " + file);
       }
     }
   }
@@ -498,15 +498,15 @@ private String getFedLocalLaunchCode(
    *
    * @param federate The federate to which the build configuration applies.
    * @param fileConfig The file configuration of the federation to which the federate belongs.
-   * @param errorReporter An error reporter to report problems.
+   * @param messageReporter An error reporter to report problems.
    * @return
    */
   private BuildConfig getBuildConfig(
-      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
+      FederateInstance federate, FedFileConfig fileConfig, MessageReporter messageReporter) {
     return switch (federate.targetConfig.target) {
-      case C, CCPP -> new CBuildConfig(federate, fileConfig, errorReporter);
-      case Python -> new PyBuildConfig(federate, fileConfig, errorReporter);
-      case TS -> new TsBuildConfig(federate, fileConfig, errorReporter);
+      case C, CCPP -> new CBuildConfig(federate, fileConfig, messageReporter);
+      case Python -> new PyBuildConfig(federate, fileConfig, messageReporter);
+      case TS -> new TsBuildConfig(federate, fileConfig, messageReporter);
       case CPP, Rust -> throw new UnsupportedOperationException();
     };
   }
diff --git a/core/src/main/java/org/lflang/federated/launcher/PyBuildConfig.java b/core/src/main/java/org/lflang/federated/launcher/PyBuildConfig.java
index 1a8a996349..09f7fac34f 100644
--- a/core/src/main/java/org/lflang/federated/launcher/PyBuildConfig.java
+++ b/core/src/main/java/org/lflang/federated/launcher/PyBuildConfig.java
@@ -1,14 +1,14 @@
 package org.lflang.federated.launcher;
 
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
 
 public class PyBuildConfig extends BuildConfig {
 
   public PyBuildConfig(
-      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-    super(federate, fileConfig, errorReporter);
+      FederateInstance federate, FedFileConfig fileConfig, MessageReporter messageReporter) {
+    super(federate, fileConfig, messageReporter);
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/federated/launcher/TsBuildConfig.java b/core/src/main/java/org/lflang/federated/launcher/TsBuildConfig.java
index 97f40c767a..82a0e2c7ae 100644
--- a/core/src/main/java/org/lflang/federated/launcher/TsBuildConfig.java
+++ b/core/src/main/java/org/lflang/federated/launcher/TsBuildConfig.java
@@ -25,7 +25,7 @@
 
 package org.lflang.federated.launcher;
 
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
 
@@ -40,8 +40,8 @@
 public class TsBuildConfig extends BuildConfig {
 
   public TsBuildConfig(
-      FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
-    super(federate, fileConfig, errorReporter);
+      FederateInstance federate, FedFileConfig fileConfig, MessageReporter messageReporter) {
+    super(federate, fileConfig, messageReporter);
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
index 2e29aacdb4..5f7364b3de 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
@@ -48,13 +48,13 @@ public class FedROS2CPPSerialization implements FedSerialization {
   public boolean isCompatible(GeneratorBase generator) {
     if (generator.getTarget() != Target.C) {
       generator
-          .errorReporter
+          .messageReporter
           .nowhere()
           .error("ROS serialization is currently only supported for the C target.");
       return false;
     } else if (!generator.getTargetConfig().compiler.equalsIgnoreCase("g++")) {
       generator
-          .errorReporter
+          .messageReporter
           .nowhere()
           .error("Please use the 'compiler: \"g++\"' target property \n" + "for ROS serialization");
       return false;
diff --git a/core/src/main/java/org/lflang/federated/validation/FedValidator.java b/core/src/main/java/org/lflang/federated/validation/FedValidator.java
index 31e96c80f3..fc82733e0d 100644
--- a/core/src/main/java/org/lflang/federated/validation/FedValidator.java
+++ b/core/src/main/java/org/lflang/federated/validation/FedValidator.java
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Input;
 import org.lflang.lf.Instantiation;
@@ -15,7 +15,7 @@
 /** Helper class that is used to validate a federated reactor. */
 public class FedValidator {
 
-  public static void validateFederatedReactor(Reactor reactor, ErrorReporter errorReporter) {
+  public static void validateFederatedReactor(Reactor reactor, MessageReporter messageReporter) {
     if (!reactor.isFederated()) return;
 
     // Construct the set of excluded reactions for this federate.
@@ -41,7 +41,7 @@ public static void validateFederatedReactor(Reactor reactor, ErrorReporter error
       // Add all the effects that are inputs
       allVarRefsReferencingFederates.addAll(
           react.getEffects().stream().filter(it -> it.getVariable() instanceof Input).toList());
-      containsAllVarRefs(allVarRefsReferencingFederates, errorReporter);
+      containsAllVarRefs(allVarRefsReferencingFederates, messageReporter);
     }
   }
 
@@ -49,7 +49,7 @@ public static void validateFederatedReactor(Reactor reactor, ErrorReporter error
    * Check if this federate contains all the {@code varRefs}. If not, report an error using {@code
    * errorReporter}.
    */
-  private static void containsAllVarRefs(List<VarRef> varRefs, ErrorReporter errorReporter) {
+  private static void containsAllVarRefs(List<VarRef> varRefs, MessageReporter messageReporter) {
     var referencesFederate = false;
     Instantiation instantiation = null;
     for (VarRef varRef : varRefs) {
@@ -57,7 +57,7 @@ private static void containsAllVarRefs(List<VarRef> varRefs, ErrorReporter error
         instantiation = varRef.getContainer();
         referencesFederate = true;
       } else if (!varRef.getContainer().equals(instantiation)) {
-        errorReporter
+        messageReporter
             .at(varRef)
             .error(
                 "Mixed triggers and effects from" + " different federates. This is not permitted");
diff --git a/core/src/main/java/org/lflang/generator/DiagnosticReporting.java b/core/src/main/java/org/lflang/generator/DiagnosticReporting.java
index 871f417a0d..0ebbeb31ac 100644
--- a/core/src/main/java/org/lflang/generator/DiagnosticReporting.java
+++ b/core/src/main/java/org/lflang/generator/DiagnosticReporting.java
@@ -3,7 +3,7 @@
 import java.nio.file.Path;
 import java.util.Map;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 
 /**
  * {@code DiagnosticReporting} provides utilities for reporting validation output.
@@ -23,10 +23,10 @@ public interface Strategy {
      * Parse the validation output and report any errors that it contains.
      *
      * @param validationOutput any validation output
-     * @param errorReporter any error reporter
+     * @param messageReporter any error reporter
      * @param map the map from generated files to CodeMaps
      */
-    void report(String validationOutput, ErrorReporter errorReporter, Map<Path, CodeMap> map);
+    void report(String validationOutput, MessageReporter messageReporter, Map<Path, CodeMap> map);
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index e1912c9615..5f7f7c54e9 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -42,7 +42,7 @@
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.MainConflictChecker;
 import org.lflang.Target;
@@ -77,7 +77,7 @@ public abstract class GeneratorBase extends AbstractLFValidator {
   public ReactorInstance main;
 
   /** An error reporter for reporting any errors or warnings during the code generation */
-  public ErrorReporter errorReporter;
+  public MessageReporter messageReporter;
 
   ////////////////////////////////////////////
   //// Protected fields.
@@ -164,8 +164,8 @@ public Instantiation getMainDef() {
   public GeneratorBase(LFGeneratorContext context) {
     this.context = context;
     this.targetConfig = context.getTargetConfig();
-    this.errorReporter = context.getErrorReporter();
-    this.commandFactory = new GeneratorCommandFactory(errorReporter, context.getFileConfig());
+    this.messageReporter = context.getErrorReporter();
+    this.commandFactory = new GeneratorCommandFactory(messageReporter, context.getFileConfig());
   }
 
   /**
@@ -220,7 +220,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
 
     // Clear any IDE markers that may have been created by a previous build.
     // Markers mark problems in the Eclipse IDE when running in integrated mode.
-    errorReporter.clearHistory();
+    messageReporter.clearHistory();
 
     ASTUtils.setMainName(context.getFileConfig().resource, context.getFileConfig().name);
 
@@ -230,7 +230,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     if (Objects.equal(context.getMode(), LFGeneratorContext.Mode.STANDALONE) && mainDef != null) {
       for (String conflict : new MainConflictChecker(context.getFileConfig()).conflicts) {
         EObject object = this.mainDef.getReactorClass();
-        errorReporter.at(object).error("Conflicting main reactor in " + conflict);
+        messageReporter.at(object).error("Conflicting main reactor in " + conflict);
       }
     }
 
@@ -264,10 +264,10 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
             .map(
                 it ->
                     GeneratorUtils.getLFResource(
-                        it, context.getFileConfig().getSrcGenBasePath(), context, errorReporter))
+                        it, context.getFileConfig().getSrcGenBasePath(), context, messageReporter))
             .toList());
     GeneratorUtils.accommodatePhysicalActionsIfPresent(
-        allResources, getTarget().setsKeepAliveOptionAutomatically(), targetConfig, errorReporter);
+        allResources, getTarget().setsKeepAliveOptionAutomatically(), targetConfig, messageReporter);
     // FIXME: Should the GeneratorBase pull in {@code files} from imported
     // resources?
 
@@ -348,7 +348,7 @@ protected void setReactorsAndInstantiationGraph(LFGeneratorContext.Mode mode) {
    */
   protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
     var dst = this.context.getFileConfig().getSrcGenPath();
-    FileUtil.copyFilesOrDirectories(targetConfig.files, dst, fileConfig, errorReporter, false);
+    FileUtil.copyFilesOrDirectories(targetConfig.files, dst, fileConfig, messageReporter, false);
   }
 
   /**
@@ -358,7 +358,7 @@ protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
    * @return True if errors occurred.
    */
   public boolean errorsOccurred() {
-    return errorReporter.getErrorsOccurred();
+    return messageReporter.getErrorsOccurred();
   }
 
   /*
@@ -426,7 +426,7 @@ public int getReactionBankIndex(Reaction reaction) {
    */
   protected void checkModalReactorSupport(boolean isSupported) {
     if (hasModalReactors && !isSupported) {
-      errorReporter
+      messageReporter
           .nowhere()
           .error(
               "The currently selected code generation or "
@@ -442,7 +442,7 @@ protected void checkModalReactorSupport(boolean isSupported) {
    */
   protected void checkWatchdogSupport(boolean isSupported) {
     if (hasWatchdogs && !isSupported) {
-      errorReporter
+      messageReporter
           .nowhere()
           .error("Watchdogs are currently only supported for threaded programs in the C target.");
     }
@@ -464,7 +464,7 @@ private void transformConflictingConnectionsInModalReactors() {
               || connection.isIterated()
               || connection.getLeftPorts().size() > 1
               || connection.getRightPorts().size() > 1) {
-            errorReporter
+            messageReporter
                 .at(connection)
                 .error(
                     "Cannot transform connection in modal reactor. Connection uses currently not"
@@ -503,7 +503,7 @@ private void transformConflictingConnectionsInModalReactors() {
    * reactors.
    */
   protected String getConflictingConnectionsInModalReactorsBody(String source, String dest) {
-    errorReporter
+    messageReporter
         .nowhere()
         .error(
             "The currently selected code generation "
@@ -588,9 +588,9 @@ public void reportCommandErrors(String stderr) {
             // statements to find which one matches and mark all the
             // import statements down the chain. But what a pain!
             if (severity == IMarker.SEVERITY_ERROR) {
-              errorReporter.at(originalPath).error("Error in imported file: " + path);
+              messageReporter.at(originalPath).error("Error in imported file: " + path);
             } else {
-              errorReporter.at(originalPath).warning("Warning in imported file: " + path);
+              messageReporter.at(originalPath).warning("Warning in imported file: " + path);
             }
           }
         }
@@ -636,9 +636,9 @@ public void reportCommandErrors(String stderr) {
         // statements to find which one matches and mark all the
         // import statements down the chain. But what a pain!
         if (severity == IMarker.SEVERITY_ERROR) {
-          errorReporter.at(originalPath).error("Error in imported file: " + path);
+          messageReporter.at(originalPath).error("Error in imported file: " + path);
         } else {
-          errorReporter.at(originalPath).warning("Warning in imported file: " + path);
+          messageReporter.at(originalPath).warning("Warning in imported file: " + path);
         }
       }
     }
@@ -647,7 +647,7 @@ public void reportCommandErrors(String stderr) {
   private void reportIssue(StringBuilder message, Integer lineNumber, Path path, int severity) {
     DiagnosticSeverity convertedSeverity =
         severity == IMarker.SEVERITY_ERROR ? DiagnosticSeverity.Error : DiagnosticSeverity.Warning;
-    errorReporter.atNullableLine(path, lineNumber).report(convertedSeverity, message.toString());
+    messageReporter.atNullableLine(path, lineNumber).report(convertedSeverity, message.toString());
   }
 
   // //////////////////////////////////////////////////
@@ -658,10 +658,10 @@ private void reportIssue(StringBuilder message, Integer lineNumber, Path path, i
    * is in, and where the generated sources are to be put.
    */
   public void printInfo(LFGeneratorContext.Mode mode) {
-    errorReporter.nowhere().info(
+    messageReporter.nowhere().info(
         "Generating code for: " + context.getFileConfig().resource.getURI().toString());
-    errorReporter.nowhere().info("******** mode: " + mode);
-    errorReporter.nowhere().info("******** generated sources: " + context.getFileConfig().getSrcGenPath());
+    messageReporter.nowhere().info("******** mode: " + mode);
+    messageReporter.nowhere().info("******** generated sources: " + context.getFileConfig().getSrcGenPath());
   }
 
   /** Get the buffer type used for network messages */
diff --git a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
index 31cf87ce41..b32777b1af 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
@@ -33,7 +33,7 @@
 import java.util.List;
 import java.util.Objects;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.util.LFCommand;
 
@@ -47,12 +47,12 @@
  */
 public class GeneratorCommandFactory {
 
-  protected final ErrorReporter errorReporter;
+  protected final MessageReporter messageReporter;
   protected final FileConfig fileConfig;
   protected boolean quiet = false;
 
-  public GeneratorCommandFactory(ErrorReporter errorReporter, FileConfig fileConfig) {
-    this.errorReporter = Objects.requireNonNull(errorReporter);
+  public GeneratorCommandFactory(MessageReporter messageReporter, FileConfig fileConfig) {
+    this.messageReporter = Objects.requireNonNull(messageReporter);
     this.fileConfig = Objects.requireNonNull(fileConfig);
   }
 
@@ -150,7 +150,7 @@ public LFCommand createCommand(String cmd, List<String> args, Path dir, boolean
               + "You can set PATH in ~/.bash_profile on Linux or Mac.";
 
       DiagnosticSeverity severity = failOnError ? Error : Warning;
-      errorReporter.nowhere().report(severity, message);
+      messageReporter.nowhere().report(severity, message);
     }
 
     return command;
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index db2e36041e..8fd9b09524 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -10,7 +10,7 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
@@ -48,7 +48,7 @@ public static void accommodatePhysicalActionsIfPresent(
       List<Resource> resources,
       boolean setsKeepAliveOptionAutomatically,
       TargetConfig targetConfig,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     if (!setsKeepAliveOptionAutomatically) {
       return;
     }
@@ -65,7 +65,7 @@ public static void accommodatePhysicalActionsIfPresent(
               String.format(
                   "Setting %s to true because of the physical action %s.",
                   TargetProperty.KEEPALIVE.getDisplayName(), action.getName());
-          errorReporter.at(action).warning(message);
+          messageReporter.at(action).warning(message);
           return;
         }
       }
@@ -110,20 +110,20 @@ public static List<Resource> getResources(Iterable<Reactor> reactors) {
    * @param srcGenBasePath The root directory for any generated sources associated with the
    *     resource.
    * @param context The generator invocation context.
-   * @param errorReporter An error message acceptor.
+   * @param messageReporter An error message acceptor.
    * @return the {@code LFResource} representation of the given resource.
    */
   public static LFResource getLFResource(
       Resource resource,
       Path srcGenBasePath,
       LFGeneratorContext context,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     var target = ASTUtils.targetDecl(resource);
     KeyValuePairs config = target.getConfig();
     var targetConfig = new TargetConfig(target);
     if (config != null) {
       List<KeyValuePair> pairs = config.getPairs();
-      TargetProperty.set(targetConfig, pairs != null ? pairs : List.of(), errorReporter);
+      TargetProperty.set(targetConfig, pairs != null ? pairs : List.of(), messageReporter);
     }
     FileConfig fc =
         LFGenerator.createFileConfig(
@@ -166,7 +166,7 @@ public static boolean isHostWindows() {
   public static boolean canGenerate(
       Boolean errorsOccurred,
       Instantiation mainDef,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       LFGeneratorContext context) {
     // stop if there are any errors found in the program by doGenerate() in GeneratorBase
     if (errorsOccurred) {
@@ -175,7 +175,7 @@ public static boolean canGenerate(
     }
     // abort if there is no main reactor
     if (mainDef == null) {
-      errorReporter
+      messageReporter
           .nowhere()
           .info(
               "The given Lingua Franca program does not define a main reactor. Therefore, no code"
diff --git a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
index ca2b75bded..6030ccc1fd 100644
--- a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
+++ b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
@@ -7,7 +7,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 
 /**
  * An error reporting strategy that parses human-readable output.
@@ -66,14 +66,14 @@ public HumanReadableReportingStrategy(
   }
 
   @Override
-  public void report(String validationOutput, ErrorReporter errorReporter, Map<Path, CodeMap> map) {
+  public void report(String validationOutput, MessageReporter messageReporter, Map<Path, CodeMap> map) {
     Iterator<String> it = validationOutput.lines().iterator();
     while (it.hasNext() || bufferedLine != null) {
       if (bufferedLine != null) {
-        reportErrorLine(bufferedLine, it, errorReporter, map);
+        reportErrorLine(bufferedLine, it, messageReporter, map);
         bufferedLine = null;
       } else {
-        reportErrorLine(it.next(), it, errorReporter, map);
+        reportErrorLine(it.next(), it, messageReporter, map);
       }
     }
   }
@@ -83,11 +83,11 @@ public void report(String validationOutput, ErrorReporter errorReporter, Map<Pat
    *
    * @param line The current line.
    * @param it An iterator over the lines that follow the current line.
-   * @param errorReporter An arbitrary ErrorReporter.
+   * @param messageReporter An arbitrary ErrorReporter.
    * @param maps A mapping from generated file paths to CodeMaps.
    */
   private void reportErrorLine(
-      String line, Iterator<String> it, ErrorReporter errorReporter, Map<Path, CodeMap> maps) {
+      String line, Iterator<String> it, MessageReporter messageReporter, Map<Path, CodeMap> maps) {
     Matcher matcher = diagnosticMessagePattern.matcher(stripEscaped(line));
     if (matcher.matches()) {
       final Path path = Paths.get(matcher.group("path"));
@@ -104,16 +104,16 @@ private void reportErrorLine(
           DiagnosticReporting.messageOf(matcher.group("message"), path, generatedFilePosition);
       final CodeMap map = maps.get(relativeTo != null ? relativeTo.resolve(path) : path);
       if (map == null) {
-        errorReporter.nowhere().report(severity, message);
+        messageReporter.nowhere().report(severity, message);
         return;
       }
       for (Path srcFile : map.lfSourcePaths()) {
         Position lfFilePosition = map.adjusted(srcFile, generatedFilePosition);
         if (column != null) {
           Range range = findAppropriateRange(lfFilePosition, it);
-          errorReporter.at(srcFile, range).report(severity, message);
+          messageReporter.at(srcFile, range).report(severity, message);
         } else {
-          errorReporter.at(srcFile, lfFilePosition.getOneBasedLine()).report(severity, message);
+          messageReporter.at(srcFile, lfFilePosition.getOneBasedLine()).report(severity, message);
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
index 717f4f7c3c..9c229e17e9 100644
--- a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
+++ b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
@@ -17,7 +17,7 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.eclipse.xtext.validation.Issue;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.generator.LFGeneratorContext.Mode;
 
@@ -64,12 +64,12 @@ public GeneratorResult run(
             .toString());
     List<EObject> parseRoots = getResource(uri).getContents();
     if (parseRoots.isEmpty()) return GeneratorResult.NOTHING;
-    ErrorReporter errorReporter = new LanguageServerErrorReporter(parseRoots.get(0));
+    MessageReporter messageReporter = new LanguageServerMessageReporter(parseRoots.get(0));
     reportProgress.apply("Validating...", START_PERCENT_PROGRESS);
-    validate(uri, errorReporter);
+    validate(uri, messageReporter);
     reportProgress.apply("Code validation complete.", VALIDATED_PERCENT_PROGRESS);
     if (cancelIndicator.isCanceled()) return GeneratorResult.CANCELLED;
-    if (errorReporter.getErrorsOccurred()) return GeneratorResult.FAILED;
+    if (messageReporter.getErrorsOccurred()) return GeneratorResult.FAILED;
     reportProgress.apply("Generating code...", VALIDATED_PERCENT_PROGRESS);
     return doGenerate(uri, mustComplete, reportProgress, cancelIndicator);
   }
@@ -80,12 +80,12 @@ public GeneratorResult run(
    * Validates the Lingua Franca file {@code f}.
    *
    * @param uri The URI of a Lingua Franca file.
-   * @param errorReporter The error reporter.
+   * @param messageReporter The error reporter.
    */
-  private void validate(URI uri, ErrorReporter errorReporter) {
+  private void validate(URI uri, MessageReporter messageReporter) {
     for (Issue issue :
         validator.validate(getResource(uri), CheckMode.ALL, CancelIndicator.NullImpl)) {
-      errorReporter
+      messageReporter
           .atNullableLine(Path.of(uri.path()), issue.getLineNumber())
           .report(convertSeverity(issue.getSeverity()), issue.getMessage());
     }
@@ -113,7 +113,7 @@ private GeneratorResult doGenerate(
             new Properties(),
             resource,
             fileAccess,
-            fileConfig -> new LanguageServerErrorReporter(resource.getContents().get(0)));
+            fileConfig -> new LanguageServerMessageReporter(resource.getContents().get(0)));
     generator.generate(getResource(uri), fileAccess, context);
     return context.getResult();
   }
diff --git a/core/src/main/java/org/lflang/generator/InvalidSourceException.java b/core/src/main/java/org/lflang/generator/InvalidSourceException.java
index 88b65d0c24..f4dc12ae8a 100644
--- a/core/src/main/java/org/lflang/generator/InvalidSourceException.java
+++ b/core/src/main/java/org/lflang/generator/InvalidSourceException.java
@@ -27,7 +27,7 @@
 /**
  * This exception is thrown when a program fails a validity check performed by a code generator (and
  * not the validator). This should be thrown only when local control flow cannot recover, otherwise
- * using {@link GeneratorBase#errorReporter} should be preferred, in order to collect more errors
+ * using {@link GeneratorBase#messageReporter} should be preferred, in order to collect more errors
  * before failing.
  *
  * @author Clément Fournier
diff --git a/core/src/main/java/org/lflang/generator/LFGenerator.java b/core/src/main/java/org/lflang/generator/LFGenerator.java
index 8d11c55674..0647fbd31d 100644
--- a/core/src/main/java/org/lflang/generator/LFGenerator.java
+++ b/core/src/main/java/org/lflang/generator/LFGenerator.java
@@ -11,7 +11,7 @@
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 import org.eclipse.xtext.generator.IGeneratorContext;
 import org.eclipse.xtext.util.RuntimeIOException;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
@@ -117,9 +117,9 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorCont
         generatorErrorsOccurred = generator.errorsOccurred();
       }
     }
-    final ErrorReporter errorReporter = lfContext.getErrorReporter();
-    if (errorReporter instanceof LanguageServerErrorReporter) {
-      ((LanguageServerErrorReporter) errorReporter).publishDiagnostics();
+    final MessageReporter messageReporter = lfContext.getErrorReporter();
+    if (messageReporter instanceof LanguageServerMessageReporter) {
+      ((LanguageServerMessageReporter) messageReporter).publishDiagnostics();
     }
   }
 
diff --git a/core/src/main/java/org/lflang/generator/LFGeneratorContext.java b/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
index 727ce229b9..1ad1400b10 100644
--- a/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
+++ b/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
@@ -6,7 +6,7 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 import org.eclipse.xtext.generator.IGeneratorContext;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 
@@ -79,7 +79,7 @@ enum Mode {
   Properties getArgs();
 
   /** Get the error reporter for this context; construct one if it hasn't been constructed yet. */
-  ErrorReporter getErrorReporter();
+  MessageReporter getErrorReporter();
 
   /**
    * Mark the code generation process performed in this context as finished with the result {@code
diff --git a/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java b/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java
similarity index 95%
rename from core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
rename to core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java
index d71f943a16..2a1f9c4e5a 100644
--- a/core/src/main/java/org/lflang/generator/LanguageServerErrorReporter.java
+++ b/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java
@@ -14,14 +14,14 @@
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
-import org.lflang.ErrorReporterBase;
+import org.lflang.MessageReporterBase;
 
 /**
  * Report diagnostics to the language client.
  *
  * @author Peter Donovan
  */
-public class LanguageServerErrorReporter extends ErrorReporterBase {
+public class LanguageServerMessageReporter extends MessageReporterBase {
 
   /**
    * The language client to which errors should be reported, if such a client is available. FIXME:
@@ -40,7 +40,7 @@ public class LanguageServerErrorReporter extends ErrorReporterBase {
    *
    * @param parseRoot the root of the AST of the document for which this is an error reporter
    */
-  public LanguageServerErrorReporter(EObject parseRoot) {
+  public LanguageServerMessageReporter(EObject parseRoot) {
     this.parseRoot = parseRoot;
     this.diagnostics = new HashMap<>();
   }
@@ -101,7 +101,7 @@ public boolean getErrorsOccurred() {
    * @param client the language client
    */
   public static void setClient(LanguageClient client) {
-    LanguageServerErrorReporter.client = client;
+    LanguageServerMessageReporter.client = client;
   }
 
   /** Publish diagnostics by forwarding them to the language client. */
diff --git a/core/src/main/java/org/lflang/generator/MainContext.java b/core/src/main/java/org/lflang/generator/MainContext.java
index 4a60c4d6a8..c724c37dba 100644
--- a/core/src/main/java/org/lflang/generator/MainContext.java
+++ b/core/src/main/java/org/lflang/generator/MainContext.java
@@ -8,8 +8,8 @@
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.util.RuntimeIOException;
-import org.lflang.DefaultErrorReporter;
-import org.lflang.ErrorReporter;
+import org.lflang.DefaultMessageReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 import org.lflang.generator.IntegratedBuilder.ReportProgress;
@@ -23,7 +23,7 @@
 public class MainContext implements LFGeneratorContext {
 
   /** This constructor will be set by the LF plugin, if the generator is running in Epoch. */
-  public static Function<FileConfig, ErrorReporter> EPOCH_ERROR_REPORTER_CONSTRUCTOR = null;
+  public static Function<FileConfig, MessageReporter> EPOCH_ERROR_REPORTER_CONSTRUCTOR = null;
 
   /** The indicator that shows whether this build process is canceled. */
   private final CancelIndicator cancelIndicator;
@@ -41,7 +41,7 @@ public class MainContext implements LFGeneratorContext {
   private GeneratorResult result = null;
 
   private final Properties args;
-  private final ErrorReporter errorReporter;
+  private final MessageReporter messageReporter;
 
   /**
    * Initialize the context of a build process whose cancellation is indicated by {@code
@@ -62,7 +62,7 @@ public MainContext(
         fsa,
         (mode == Mode.EPOCH && EPOCH_ERROR_REPORTER_CONSTRUCTOR != null)
             ? EPOCH_ERROR_REPORTER_CONSTRUCTOR
-            : fileConfig -> new DefaultErrorReporter());
+            : fileConfig -> new DefaultMessageReporter());
   }
 
   /**
@@ -86,7 +86,7 @@ public MainContext(
       Properties args,
       Resource resource,
       IFileSystemAccess2 fsa,
-      Function<FileConfig, ErrorReporter> constructErrorReporter) {
+      Function<FileConfig, MessageReporter> constructErrorReporter) {
     this.mode = mode;
     this.cancelIndicator = cancelIndicator == null ? () -> false : cancelIndicator;
     this.reportProgress = reportProgress;
@@ -104,7 +104,7 @@ public MainContext(
       throw new RuntimeIOException("Error during FileConfig instantiation", e);
     }
 
-    this.errorReporter = constructErrorReporter.apply(this.fileConfig);
+    this.messageReporter = constructErrorReporter.apply(this.fileConfig);
 
     loadTargetConfig();
   }
@@ -125,8 +125,8 @@ public Properties getArgs() {
   }
 
   @Override
-  public ErrorReporter getErrorReporter() {
-    return errorReporter;
+  public MessageReporter getErrorReporter() {
+    return messageReporter;
   }
 
   @Override
@@ -165,6 +165,6 @@ public void reportProgress(String message, int percentage) {
    */
   public void loadTargetConfig() {
     this.targetConfig =
-        new TargetConfig(args, GeneratorUtils.findTargetDecl(fileConfig.resource), errorReporter);
+        new TargetConfig(args, GeneratorUtils.findTargetDecl(fileConfig.resource), messageReporter);
   }
 }
diff --git a/core/src/main/java/org/lflang/generator/PortInstance.java b/core/src/main/java/org/lflang/generator/PortInstance.java
index 9db13babf1..c9e89f40b0 100644
--- a/core/src/main/java/org/lflang/generator/PortInstance.java
+++ b/core/src/main/java/org/lflang/generator/PortInstance.java
@@ -29,7 +29,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.PriorityQueue;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.lf.Input;
 import org.lflang.lf.Output;
 import org.lflang.lf.Parameter;
@@ -70,16 +70,16 @@ public PortInstance(Port definition, ReactorInstance parent) {
    *
    * @param definition The declaration in the AST.
    * @param parent The parent.
-   * @param errorReporter An error reporter, or null to throw exceptions.
+   * @param messageReporter An error reporter, or null to throw exceptions.
    */
-  public PortInstance(Port definition, ReactorInstance parent, ErrorReporter errorReporter) {
+  public PortInstance(Port definition, ReactorInstance parent, MessageReporter messageReporter) {
     super(definition, parent);
 
     if (parent == null) {
       throw new NullPointerException("Cannot create a PortInstance with no parent.");
     }
 
-    setInitialWidth(errorReporter);
+    setInitialWidth(messageReporter);
   }
 
   //////////////////////////////////////////////////////
@@ -388,16 +388,16 @@ private List<RuntimeRange<PortInstance>> eventualSources(RuntimeRange<PortInstan
    * Set the initial multiport width, if this is a multiport, from the widthSpec in the definition.
    * This will be set to -1 if the width cannot be determined.
    *
-   * @param errorReporter For reporting errors.
+   * @param messageReporter For reporting errors.
    */
-  private void setInitialWidth(ErrorReporter errorReporter) {
+  private void setInitialWidth(MessageReporter messageReporter) {
     // If this is a multiport, determine the width.
     WidthSpec widthSpec = definition.getWidthSpec();
 
     if (widthSpec != null) {
       if (widthSpec.isOfVariableLength()) {
         String message = "Variable-width multiports not supported (yet): " + definition.getName();
-        errorReporter.at(definition).error(message);
+        messageReporter.at(definition).error(message);
       } else {
         isMultiport = true;
 
diff --git a/core/src/main/java/org/lflang/generator/ReactorInstance.java b/core/src/main/java/org/lflang/generator/ReactorInstance.java
index 74fa05c8ba..11a055b007 100644
--- a/core/src/main/java/org/lflang/generator/ReactorInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactorInstance.java
@@ -36,7 +36,7 @@
 import java.util.Optional;
 import java.util.Set;
 import org.lflang.AttributeUtils;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.TriggerInstance.BuiltinTriggerVariable;
@@ -89,7 +89,7 @@ public class ReactorInstance extends NamedInstance<Instantiation> {
    * @param reactor The top-level reactor.
    * @param reporter The error reporter.
    */
-  public ReactorInstance(Reactor reactor, ErrorReporter reporter, List<Reactor> reactors) {
+  public ReactorInstance(Reactor reactor, MessageReporter reporter, List<Reactor> reactors) {
     this(ASTUtils.createInstantiation(reactor), null, reporter, -1, reactors);
     assert !reactors.isEmpty();
   }
@@ -100,7 +100,7 @@ public ReactorInstance(Reactor reactor, ErrorReporter reporter, List<Reactor> re
    * @param reactor The top-level reactor.
    * @param reporter The error reporter.
    */
-  public ReactorInstance(Reactor reactor, ErrorReporter reporter) {
+  public ReactorInstance(Reactor reactor, MessageReporter reporter) {
     this(ASTUtils.createInstantiation(reactor), null, reporter, -1, List.of());
   }
 
@@ -112,7 +112,7 @@ public ReactorInstance(Reactor reactor, ErrorReporter reporter) {
    * @param reporter The error reporter.
    * @param desiredDepth The depth to which to go, or -1 to construct the full hierarchy.
    */
-  public ReactorInstance(Reactor reactor, ErrorReporter reporter, int desiredDepth) {
+  public ReactorInstance(Reactor reactor, MessageReporter reporter, int desiredDepth) {
     this(ASTUtils.createInstantiation(reactor), null, reporter, desiredDepth, List.of());
   }
 
@@ -124,7 +124,7 @@ public ReactorInstance(Reactor reactor, ErrorReporter reporter, int desiredDepth
    * @param parent The parent reactor instance.
    * @param reporter The error reporter.
    */
-  public ReactorInstance(Reactor reactor, ReactorInstance parent, ErrorReporter reporter) {
+  public ReactorInstance(Reactor reactor, ReactorInstance parent, MessageReporter reporter) {
     this(ASTUtils.createInstantiation(reactor), parent, reporter, -1, List.of());
   }
 
@@ -718,7 +718,7 @@ public TimeValue getTimeValue(Expression expr) {
   //// Protected fields.
 
   /** The generator that created this reactor instance. */
-  protected ErrorReporter reporter; // FIXME: This accumulates a lot of redundant references
+  protected MessageReporter reporter; // FIXME: This accumulates a lot of redundant references
 
   /** The map of used built-in triggers. */
   protected Map<BuiltinTrigger, TriggerInstance<BuiltinTriggerVariable>> builtinTriggers =
@@ -801,7 +801,7 @@ protected void createWatchdogInstances() {
   public ReactorInstance(
       Instantiation definition,
       ReactorInstance parent,
-      ErrorReporter reporter,
+      MessageReporter reporter,
       int desiredDepth,
       List<Reactor> reactors) {
     super(definition, parent);
diff --git a/core/src/main/java/org/lflang/generator/SubContext.java b/core/src/main/java/org/lflang/generator/SubContext.java
index cf90cb1fda..1620e10bc7 100644
--- a/core/src/main/java/org/lflang/generator/SubContext.java
+++ b/core/src/main/java/org/lflang/generator/SubContext.java
@@ -2,7 +2,7 @@
 
 import java.util.Properties;
 import org.eclipse.xtext.util.CancelIndicator;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 
@@ -20,7 +20,7 @@ public class SubContext implements LFGeneratorContext {
   private final int endPercentProgress;
   private GeneratorResult result = null;
 
-  protected ErrorReporter errorReporter;
+  protected MessageReporter messageReporter;
 
   /**
    * Initializes the context within {@code containingContext} of the process that extends from
@@ -55,7 +55,7 @@ public Properties getArgs() {
   }
 
   @Override
-  public ErrorReporter getErrorReporter() {
+  public MessageReporter getErrorReporter() {
     return containingContext.getErrorReporter();
   }
 
diff --git a/core/src/main/java/org/lflang/generator/Validator.java b/core/src/main/java/org/lflang/generator/Validator.java
index 53efd6412e..33eaec4238 100644
--- a/core/src/main/java/org/lflang/generator/Validator.java
+++ b/core/src/main/java/org/lflang/generator/Validator.java
@@ -15,7 +15,7 @@
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 import org.eclipse.xtext.util.CancelIndicator;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.util.LFCommand;
 
 /**
@@ -43,15 +43,15 @@ public Pair(S first, T second) {
     }
   }
 
-  protected final ErrorReporter errorReporter;
+  protected final MessageReporter messageReporter;
   protected final ImmutableMap<Path, CodeMap> codeMaps;
 
   /**
    * Initialize a {@code Validator} that reports errors to {@code errorReporter} and adjusts
    * document positions using {@code codeMaps}.
    */
-  protected Validator(ErrorReporter errorReporter, Map<Path, CodeMap> codeMaps) {
-    this.errorReporter = errorReporter;
+  protected Validator(MessageReporter messageReporter, Map<Path, CodeMap> codeMaps) {
+    this.messageReporter = messageReporter;
     this.codeMaps = ImmutableMap.copyOf(codeMaps);
   }
 
@@ -77,11 +77,11 @@ public final void doValidate(LFGeneratorContext context)
       f.get()
           .first
           .getErrorReportingStrategy()
-          .report(f.get().second.getErrors(), errorReporter, codeMaps);
+          .report(f.get().second.getErrors(), messageReporter, codeMaps);
       f.get()
           .first
           .getOutputReportingStrategy()
-          .report(f.get().second.getOutput(), errorReporter, codeMaps);
+          .report(f.get().second.getOutput(), messageReporter, codeMaps);
     }
   }
 
@@ -141,8 +141,8 @@ private static <T> List<Future<T>> getFutures(List<Callable<T>> tasks)
    */
   public final int run(LFCommand command, CancelIndicator cancelIndicator) {
     final int returnCode = command.run(cancelIndicator);
-    getBuildReportingStrategies().first.report(command.getErrors(), errorReporter, codeMaps);
-    getBuildReportingStrategies().second.report(command.getOutput(), errorReporter, codeMaps);
+    getBuildReportingStrategies().first.report(command.getErrors(), messageReporter, codeMaps);
+    getBuildReportingStrategies().second.report(command.getOutput(), messageReporter, codeMaps);
     return returnCode;
   }
 
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 3ddc2a856c..6fb049ca16 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -31,7 +31,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty.Platform;
@@ -86,7 +86,7 @@ public CCmakeGenerator(
    *
    * @param sources A list of .c files to build.
    * @param executableName The name of the output executable.
-   * @param errorReporter Used to report errors.
+   * @param messageReporter Used to report errors.
    * @param CppMode Indicate if the compilation should happen in C++ mode
    * @param hasMain Indicate if the .lf file has a main reactor or not. If not, a library target
    *     will be created instead of an executable.
@@ -97,7 +97,7 @@ public CCmakeGenerator(
   CodeBuilder generateCMakeCode(
       List<String> sources,
       String executableName,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       boolean CppMode,
       boolean hasMain,
       String cMakeExtras,
@@ -312,7 +312,7 @@ CodeBuilder generateCMakeCode(
             break;
           }
         default:
-          errorReporter
+          messageReporter
               .nowhere()
               .warning(
                   "Using the flags target property with cmake is dangerous.\n"
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index ef73c053a6..baee9a7f39 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -33,7 +33,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
@@ -60,7 +60,7 @@ public class CCompiler {
 
   FileConfig fileConfig;
   TargetConfig targetConfig;
-  ErrorReporter errorReporter;
+  MessageReporter messageReporter;
 
   /**
    * Indicate whether the compiler is in C++ mode. In C++ mode, the compiler produces .cpp files
@@ -76,18 +76,18 @@ public class CCompiler {
    *
    * @param targetConfig The current target configuration.
    * @param fileConfig The current file configuration.
-   * @param errorReporter Used to report errors.
+   * @param messageReporter Used to report errors.
    * @param cppMode Whether the generated code should be compiled as if it were C++.
    */
   public CCompiler(
       TargetConfig targetConfig,
       FileConfig fileConfig,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       boolean cppMode) {
     this.fileConfig = fileConfig;
     this.targetConfig = targetConfig;
-    this.errorReporter = errorReporter;
-    this.commandFactory = new GeneratorCommandFactory(errorReporter, fileConfig);
+    this.messageReporter = messageReporter;
+    this.commandFactory = new GeneratorCommandFactory(messageReporter, fileConfig);
     this.cppMode = cppMode;
   }
 
@@ -134,7 +134,7 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
     if (cMakeReturnCode != 0
         && context.getMode() == LFGeneratorContext.Mode.STANDALONE
         && !outputContainsKnownCMakeErrors(compile.getErrors())) {
-      errorReporter
+      messageReporter
           .nowhere()
           .error(targetConfig.compiler + " failed with error code " + cMakeReturnCode);
     }
@@ -157,7 +157,7 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
       if (makeReturnCode != 0
           && context.getMode() == LFGeneratorContext.Mode.STANDALONE
           && !outputContainsKnownCMakeErrors(build.getErrors())) {
-        errorReporter
+        messageReporter
             .nowhere()
             .error(targetConfig.compiler + " failed with error code " + makeReturnCode);
       }
@@ -171,7 +171,7 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
       }
 
       if (makeReturnCode == 0 && build.getErrors().length() == 0) {
-        errorReporter.nowhere().info(
+        messageReporter.nowhere().info(
             "SUCCESS: Compiling generated code for "
                 + fileConfig.name
                 + " finished with no errors.");
@@ -179,13 +179,13 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
 
       if (targetConfig.platformOptions.platform == Platform.ZEPHYR
           && targetConfig.platformOptions.flash) {
-        errorReporter.nowhere().info("Invoking flash command for Zephyr");
+        messageReporter.nowhere().info("Invoking flash command for Zephyr");
         LFCommand flash = buildWestFlashCommand();
         int flashRet = flash.run();
         if (flashRet != 0) {
-          errorReporter.nowhere().error("West flash command failed with error code " + flashRet);
+          messageReporter.nowhere().error("West flash command failed with error code " + flashRet);
         } else {
-          errorReporter.nowhere().info("SUCCESS: Flashed application with west");
+          messageReporter.nowhere().info("SUCCESS: Flashed application with west");
         }
       }
     }
@@ -203,7 +203,7 @@ public LFCommand compileCmakeCommand() {
     LFCommand command =
         commandFactory.createCommand("cmake", cmakeOptions(targetConfig, fileConfig), buildPath);
     if (command == null) {
-      errorReporter
+      messageReporter
           .nowhere()
           .error(
               "The C/CCpp target requires CMAKE >= "
@@ -296,7 +296,7 @@ public LFCommand buildCmakeCommand() {
                 buildTypeToCmakeConfig(targetConfig.cmakeBuildType)),
             buildPath);
     if (command == null) {
-      errorReporter
+      messageReporter
           .nowhere()
           .error(
               "The C/CCpp target requires CMAKE >= 3.5 to compile the generated code."
@@ -322,7 +322,7 @@ public LFCommand buildWestFlashCommand() {
       cmd = commandFactory.createCommand("west", List.of("flash"), buildPath);
     }
     if (cmd == null) {
-      errorReporter.nowhere().error("Could not create west flash command.");
+      messageReporter.nowhere().error("Could not create west flash command.");
     }
 
     return cmd;
@@ -348,13 +348,13 @@ private boolean outputContainsKnownCMakeErrors(String CMakeOutput) {
     if (CMakeOutput.contains("The CMAKE_C_COMPILER is set to a C++ compiler")) {
       // If so, print an appropriate error message
       if (targetConfig.compiler != null) {
-        errorReporter
+        messageReporter
             .nowhere()
             .error(
                 "A C++ compiler was requested in the compiler target property."
                     + " Use the CCpp or the Cpp target instead.");
       } else {
-        errorReporter
+        messageReporter
             .nowhere()
             .error(
                 "\"A C++ compiler was detected."
@@ -427,7 +427,7 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
     LFCommand command =
         commandFactory.createCommand(targetConfig.compiler, compileArgs, fileConfig.getOutPath());
     if (command == null) {
-      errorReporter
+      messageReporter
           .nowhere()
           .error(
               "The C/CCpp target requires GCC >= 7 to compile the generated code. Auto-compiling"
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 854d1afb97..db7a700845 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -359,7 +359,7 @@ public void accommodatePhysicalActionsIfPresent() {
                 "Using the threaded C runtime to allow for asynchronous handling of physical action"
                     + " "
                     + action.getName();
-            errorReporter.at(action).warning(message);
+            messageReporter.at(action).warning(message);
             return;
           }
         }
@@ -374,7 +374,7 @@ public void accommodatePhysicalActionsIfPresent() {
   protected boolean isOSCompatible() {
     if (GeneratorUtils.isHostWindows()) {
       if (CCppMode) {
-        errorReporter
+        messageReporter
             .nowhere()
             .error(
                 "LF programs with a CCpp target are currently not supported on Windows. "
@@ -396,7 +396,7 @@ protected boolean isOSCompatible() {
   @Override
   public void doGenerate(Resource resource, LFGeneratorContext context) {
     super.doGenerate(resource, context);
-    if (!GeneratorUtils.canGenerate(errorsOccurred(), mainDef, errorReporter, context)) return;
+    if (!GeneratorUtils.canGenerate(errorsOccurred(), mainDef, messageReporter, context)) return;
     if (!isOSCompatible()) return; // Incompatible OS and configuration
 
     // Perform set up that does not generate code
@@ -418,10 +418,10 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
       code.writeToFile(targetFile);
     } catch (IOException e) {
       String message = e.getMessage();
-      errorReporter.nowhere().error(message);
+      messageReporter.nowhere().error(message);
     } catch (RuntimeException e) {
       String message = e.getMessage();
-      errorReporter.nowhere().error(message);
+      messageReporter.nowhere().error(message);
       throw e;
     }
 
@@ -449,7 +449,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
           cmakeGenerator.generateCMakeCode(
               sources,
               lfModuleName,
-              errorReporter,
+              messageReporter,
               CCppMode,
               mainDef != null,
               cMakeExtras,
@@ -465,19 +465,19 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         Path include = fileConfig.getSrcGenPath().resolve("include/");
         Path src = fileConfig.getSrcGenPath().resolve("src/");
         FileUtil.arduinoDeleteHelper(src, targetConfig.threading);
-        FileUtil.relativeIncludeHelper(src, include, errorReporter);
-        FileUtil.relativeIncludeHelper(include, include, errorReporter);
+        FileUtil.relativeIncludeHelper(src, include, messageReporter);
+        FileUtil.relativeIncludeHelper(include, include, messageReporter);
       } catch (IOException e) {
         //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
         Exceptions.sneakyThrow(e);
       }
       if (!targetConfig.noCompile) {
-        ArduinoUtil arduinoUtil = new ArduinoUtil(context, commandFactory, errorReporter);
+        ArduinoUtil arduinoUtil = new ArduinoUtil(context, commandFactory, messageReporter);
         arduinoUtil.buildArduino(fileConfig, targetConfig);
         context.finish(GeneratorResult.Status.COMPILED, null);
       } else {
-        errorReporter.nowhere().info("********");
-        errorReporter.nowhere().info(
+        messageReporter.nowhere().info("********");
+        messageReporter.nowhere().info(
             "To compile your program, run the following command to see information about the board"
                 + " you plugged in:\n\n"
                 + "\tarduino-cli board list\n\n"
@@ -564,7 +564,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
       // ); // FIXME: Move to FedGenerator
       // Create the compiler to be used later
 
-      var cCompiler = new CCompiler(targetConfig, threadFileConfig, errorReporter, CppMode);
+      var cCompiler = new CCompiler(targetConfig, threadFileConfig, messageReporter, CppMode);
       try {
         if (!cCompiler.runCCompiler(generator, context)) {
           // If compilation failed, remove any bin files that may have been created.
@@ -589,13 +589,13 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
             fileConfig,
             targetConfig,
             commandFactory,
-            errorReporter,
+            messageReporter,
             this::reportCommandErrors,
             context.getMode());
         context.finish(GeneratorResult.Status.COMPILED, null);
       }
       if (!errorsOccurred()) {
-        errorReporter.nowhere().info("Compiled binary is in " + fileConfig.binPath);
+        messageReporter.nowhere().info("Compiled binary is in " + fileConfig.binPath);
       }
     } else {
       context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, null));
@@ -822,7 +822,7 @@ protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
     var destination = this.fileConfig.getSrcGenPath();
 
     FileUtil.copyFilesOrDirectories(
-        targetConfig.cmakeIncludes, destination, fileConfig, errorReporter, true);
+        targetConfig.cmakeIncludes, destination, fileConfig, messageReporter, true);
 
     // FIXME: Unclear what the following does, but it does not appear to belong here.
     if (!StringExtensions.isNullOrEmpty(targetConfig.fedSetupPreamble)) {
@@ -831,7 +831,7 @@ protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
             fileConfig.srcFile.getParent().resolve(targetConfig.fedSetupPreamble),
             destination.resolve(targetConfig.fedSetupPreamble));
       } catch (IOException e) {
-        errorReporter
+        messageReporter
             .nowhere()
             .error("Failed to find _fed_setup file " + targetConfig.fedSetupPreamble);
       }
@@ -890,7 +890,7 @@ private void generateHeaders() throws IOException {
                                             it.tpr,
                                             p,
                                             getTarget(),
-                                            errorReporter,
+                                            messageReporter,
                                             types,
                                             new CodeBuilder(),
                                             true,
@@ -943,7 +943,7 @@ private void pickCompilePlatform() {
     if (targetConfig.platformOptions.platform != Platform.AUTO) {
       osName = targetConfig.platformOptions.platform.toString();
     } else if (Stream.of("mac", "darwin", "win", "nux").noneMatch(osName::contains)) {
-      errorReporter.nowhere().error("Platform " + osName + " is not supported");
+      messageReporter.nowhere().error("Platform " + osName + " is not supported");
     }
   }
 
@@ -1048,7 +1048,7 @@ private void generateReactorClassBody(
     generateAuxiliaryStructs(header, tpr, false);
     // The following must go before the self struct so the #include watchdog.h ends up in the
     // header.
-    CWatchdogGenerator.generateWatchdogs(src, header, tpr, errorReporter);
+    CWatchdogGenerator.generateWatchdogs(src, header, tpr, messageReporter);
     generateSelfStruct(header, tpr, constructorCode);
     generateMethods(src, tpr);
     generateReactions(src, tpr);
@@ -1120,7 +1120,7 @@ protected void generateAuxiliaryStructs(
     for (Port p : allPorts(tpr.reactor())) {
       builder.pr(
           CPortGenerator.generateAuxiliaryStruct(
-              tpr, p, getTarget(), errorReporter, types, federatedExtension, userFacing, null));
+              tpr, p, getTarget(), messageReporter, types, federatedExtension, userFacing, null));
     }
     // The very first item on this struct needs to be
     // a trigger_t* because the struct will be cast to (trigger_t*)
@@ -1389,7 +1389,7 @@ protected void generateReaction(
             tpr,
             reactionIndex,
             mainDef,
-            errorReporter,
+            messageReporter,
             types,
             targetConfig,
             getTarget().requiresTypes));
@@ -1636,7 +1636,7 @@ public void processProtoFile(String filename) {
             List.of("--c_out=" + this.fileConfig.getSrcGenPath(), filename),
             fileConfig.srcPath);
     if (protoc == null) {
-      errorReporter.nowhere().error("Processing .proto files requires protoc-c >= 1.3.3.");
+      messageReporter.nowhere().error("Processing .proto files requires protoc-c >= 1.3.3.");
       return;
     }
     var returnCode = protoc.run();
@@ -1649,7 +1649,7 @@ public void processProtoFile(String filename) {
       targetConfig.compileLibraries.add("protobuf-c");
       targetConfig.compilerFlags.add("-lprotobuf-c");
     } else {
-      errorReporter.nowhere().error("protoc-c returns error code " + returnCode);
+      messageReporter.nowhere().error("protoc-c returns error code " + returnCode);
     }
   }
 
@@ -1961,7 +1961,7 @@ protected void setUpGeneralParameters() {
         && (targetConfig.platformOptions.board == null
             || !targetConfig.platformOptions.board.contains("mbed"))) {
       // non-MBED boards should not use threading
-      errorReporter.nowhere().info(
+      messageReporter.nowhere().info(
           "Threading is incompatible on your current Arduino flavor. Setting threading to false.");
       targetConfig.threading = false;
     }
@@ -1969,7 +1969,7 @@ protected void setUpGeneralParameters() {
     if (targetConfig.platformOptions.platform == Platform.ARDUINO
         && !targetConfig.noCompile
         && targetConfig.platformOptions.board == null) {
-      errorReporter.nowhere().info(
+      messageReporter.nowhere().info(
           "To enable compilation for the Arduino platform, you must specify the fully-qualified"
               + " board name (FQBN) in the target property. For example, platform: {name: arduino,"
               + " board: arduino:avr:leonardo}. Entering \"no-compile\" mode and generating target"
@@ -1984,7 +1984,7 @@ protected void setUpGeneralParameters() {
           PlatformOption.USER_THREADS.name(),
           String.valueOf(targetConfig.platformOptions.userThreads));
     } else if (targetConfig.platformOptions.userThreads > 0) {
-      errorReporter
+      messageReporter
           .nowhere()
           .warning(
               "Specifying user threads is only for threaded Lingua Franca on the Zephyr platform."
@@ -2103,10 +2103,10 @@ private void createMainReactorInstance() {
       if (this.main == null) {
         // Recursively build instances.
         this.main =
-            new ReactorInstance(toDefinition(mainDef.getReactorClass()), errorReporter, reactors);
+            new ReactorInstance(toDefinition(mainDef.getReactorClass()), messageReporter, reactors);
         var reactionInstanceGraph = this.main.assignLevels();
         if (reactionInstanceGraph.nodeCount() > 0) {
-          errorReporter
+          messageReporter
               .nowhere()
               .error("Main reactor has causality cycles. Skipping code generation.");
           return;
@@ -2117,7 +2117,7 @@ private void createMainReactorInstance() {
         // Inform the run-time of the breadth/parallelism of the reaction graph
         var breadth = reactionInstanceGraph.getBreadth();
         if (breadth == 0) {
-          errorReporter.nowhere().warning("The program has no reactions");
+          messageReporter.nowhere().warning("The program has no reactions");
         } else {
           targetConfig.compileDefinitions.put(
               "LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth()));
diff --git a/core/src/main/java/org/lflang/generator/c/CPortGenerator.java b/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
index 33c85d9f6d..85c70a82e1 100644
--- a/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
@@ -3,7 +3,7 @@
 import static org.lflang.generator.c.CGenerator.variableStructType;
 
 import org.lflang.AttributeUtils;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
@@ -37,7 +37,7 @@ public static void generateDeclarations(
    * @param tpr The reactor
    * @param port The port to generate the struct
    * @param target The target of the code generation (C, CCpp or Python)
-   * @param errorReporter The error reporter
+   * @param messageReporter The error reporter
    * @param types The helper object for types related stuff
    * @param federatedExtension The code needed to support federated execution
    * @param userFacing Whether this struct is to be presented in a user-facing header
@@ -49,7 +49,7 @@ public static String generateAuxiliaryStruct(
       TypeParameterizedReactor tpr,
       Port port,
       Target target,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       CTypes types,
       CodeBuilder federatedExtension,
       boolean userFacing,
@@ -70,7 +70,7 @@ public static String generateAuxiliaryStruct(
             "size_t length;", // From token_template_t
             "bool is_present;",
             "lf_port_internal_t _base;"));
-    code.pr(valueDeclaration(tpr, port, target, errorReporter, types));
+    code.pr(valueDeclaration(tpr, port, target, messageReporter, types));
     code.pr(federatedExtension.toString());
     code.unindent();
     var name =
@@ -193,12 +193,12 @@ private static String valueDeclaration(
       TypeParameterizedReactor tpr,
       Port port,
       Target target,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       CTypes types) {
     if (port.getType() == null && target.requiresTypes) {
       // This should have been caught by the validator.
       String message = "Port is required to have a type: " + port.getName();
-      errorReporter.at(port).error(message);
+      messageReporter.at(port).error(message);
       return "";
     }
     // Do not convert to lf_token_t* using lfTypeToTokenType because there
diff --git a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
index a232f735c2..c8a16546ae 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig;
 import org.lflang.ast.ASTUtils;
@@ -57,7 +57,7 @@ public static String generateInitializationForReaction(
       TypeParameterizedReactor tpr,
       int reactionIndex,
       CTypes types,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       Instantiation mainDef,
       boolean requiresTypes) {
     // Construct the reactionInitialization code to go into
@@ -189,14 +189,14 @@ public static String generateInitializationForReaction(
                         : "reset_transition")
                     + ";");
           } else {
-            errorReporter
+            messageReporter
                 .at(reaction)
                 .error("In generateReaction(): " + name + " not a valid mode of this reactor.");
           }
         } else {
           if (variable instanceof Output) {
             reactionInitialization.pr(
-                generateOutputVariablesInReaction(effect, tpr, errorReporter, requiresTypes));
+                generateOutputVariablesInReaction(effect, tpr, messageReporter, requiresTypes));
           } else if (variable instanceof Input) {
             // It is the input of a contained reactor.
             generateVariablesForSendingToContainedReactors(
@@ -208,7 +208,7 @@ public static String generateInitializationForReaction(
           } else if (variable instanceof Watchdog) {
             reactionInitialization.pr(generateWatchdogVariablesInReaction(effect));
           } else {
-            errorReporter
+            messageReporter
                 .at(reaction)
                 .error("In generateReaction(): effect is not an input, output, or watchdog.");
           }
@@ -763,13 +763,13 @@ private static String generateInputVariablesInReaction(
   public static String generateOutputVariablesInReaction(
       VarRef effect,
       TypeParameterizedReactor tpr,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       boolean requiresTypes) {
     Output output = (Output) effect.getVariable();
     String outputName = output.getName();
     String outputWidth = generateWidthVariable(outputName);
     if (output.getType() == null && requiresTypes) {
-      errorReporter.at(output).error("Output is required to have a type: " + outputName);
+      messageReporter.at(output).error("Output is required to have a type: " + outputName);
       return "";
     } else {
       // The container of the output may be a contained reactor or
@@ -1232,7 +1232,7 @@ public static String generateReaction(
       TypeParameterizedReactor tpr,
       int reactionIndex,
       Instantiation mainDef,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       CTypes types,
       TargetConfig targetConfig,
       boolean requiresType) {
@@ -1240,7 +1240,7 @@ public static String generateReaction(
     var body = ASTUtils.toText(getCode(types, reaction, tpr));
     String init =
         generateInitializationForReaction(
-            body, reaction, tpr, reactionIndex, types, errorReporter, mainDef, requiresType);
+            body, reaction, tpr, reactionIndex, types, messageReporter, mainDef, requiresType);
 
     code.pr("#include " + StringUtil.addDoubleQuotes(CCoreFilesUtils.getCTargetSetHeader()));
 
diff --git a/core/src/main/java/org/lflang/generator/c/CUtil.java b/core/src/main/java/org/lflang/generator/c/CUtil.java
index 25688d3284..194e6887e1 100644
--- a/core/src/main/java/org/lflang/generator/c/CUtil.java
+++ b/core/src/main/java/org/lflang/generator/c/CUtil.java
@@ -33,7 +33,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig;
@@ -607,7 +607,7 @@ public static void runBuildCommand(
       FileConfig fileConfig,
       TargetConfig targetConfig,
       GeneratorCommandFactory commandFactory,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       ReportCommandErrors reportCommandErrors,
       LFGeneratorContext.Mode mode) {
     List<LFCommand> commands =
@@ -621,7 +621,7 @@ public static void runBuildCommand(
       if (returnCode != 0 && mode != LFGeneratorContext.Mode.EPOCH) {
         // FIXME: Why is the content of stderr not provided to the user in this error
         // message?
-        errorReporter
+        messageReporter
             .nowhere()
             .error(
                 String.format(
diff --git a/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java b/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
index b360693466..876d98a123 100644
--- a/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CWatchdogGenerator.java
@@ -9,7 +9,7 @@
 package org.lflang.generator.c;
 
 import java.util.List;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ReactorInstance;
@@ -100,11 +100,11 @@ protected static void generateWatchdogs(
       CodeBuilder src,
       CodeBuilder header,
       TypeParameterizedReactor tpr,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     if (hasWatchdogs(tpr.reactor())) {
       header.pr("#include \"core/threaded/watchdog.h\"");
       for (Watchdog watchdog : ASTUtils.allWatchdogs(tpr.reactor())) {
-        src.pr(generateWatchdogFunction(watchdog, tpr, errorReporter));
+        src.pr(generateWatchdogFunction(watchdog, tpr, messageReporter));
       }
     }
   }
@@ -180,7 +180,7 @@ protected static String generateWatchdogTable(int count) {
    * @param tpr The concrete reactor class that has the watchdog
    */
   private static String generateInitializationForWatchdog(
-      Watchdog watchdog, TypeParameterizedReactor tpr, ErrorReporter errorReporter) {
+      Watchdog watchdog, TypeParameterizedReactor tpr, MessageReporter messageReporter) {
 
     // Construct the reactionInitialization code to go into
     // the body of the function before the verbatim code.
@@ -225,7 +225,7 @@ private static String generateInitializationForWatchdog(
                         : "reset_transition")
                     + ";");
           } else {
-            errorReporter
+            messageReporter
                 .at(watchdog)
                 .error(
                     "In generateInitializationForWatchdog(): "
@@ -270,10 +270,10 @@ private static String generateFunction(String header, String init, Watchdog watc
 
   /** Generate the watchdog handler function. */
   private static String generateWatchdogFunction(
-      Watchdog watchdog, TypeParameterizedReactor tpr, ErrorReporter errorReporter) {
+      Watchdog watchdog, TypeParameterizedReactor tpr, MessageReporter messageReporter) {
     return generateFunction(
         generateWatchdogFunctionHeader(watchdog, tpr),
-        generateInitializationForWatchdog(watchdog, tpr, errorReporter),
+        generateInitializationForWatchdog(watchdog, tpr, messageReporter),
         watchdog);
   }
 
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index f74c369d5b..f925acd9c5 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -303,14 +303,14 @@ public void processProtoFile(String filename) {
             fileConfig.srcPath);
 
     if (protoc == null) {
-      errorReporter.nowhere().error("Processing .proto files requires libprotoc >= 3.6.1");
+      messageReporter.nowhere().error("Processing .proto files requires libprotoc >= 3.6.1");
       return;
     }
     int returnCode = protoc.run();
     if (returnCode == 0) {
       pythonRequiredModules.add("google-api-python-client");
     } else {
-      errorReporter.nowhere().error("protoc returns error code " + returnCode);
+      messageReporter.nowhere().error("protoc returns error code " + returnCode);
     }
   }
 
@@ -395,19 +395,19 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
                 generatePythonFileName(lfModuleName));
         codeMaps.putAll(codeMapsForFederate);
         copyTargetFiles();
-        new PythonValidator(fileConfig, errorReporter, codeMaps, protoNames).doValidate(context);
+        new PythonValidator(fileConfig, messageReporter, codeMaps, protoNames).doValidate(context);
         if (targetConfig.noCompile) {
-          errorReporter.nowhere().info(PythonInfoGenerator.generateSetupInfo(fileConfig));
+          messageReporter.nowhere().info(PythonInfoGenerator.generateSetupInfo(fileConfig));
         }
       } catch (Exception e) {
         //noinspection ConstantConditions
         throw Exceptions.sneakyThrow(e);
       }
 
-      errorReporter.nowhere().info(PythonInfoGenerator.generateRunInfo(fileConfig, lfModuleName));
+      messageReporter.nowhere().info(PythonInfoGenerator.generateRunInfo(fileConfig, lfModuleName));
     }
 
-    if (errorReporter.getErrorsOccurred()) {
+    if (messageReporter.getErrorsOccurred()) {
       context.unsuccessfulFinish();
     } else {
       context.finish(GeneratorResult.Status.COMPILED, codeMaps);
@@ -440,7 +440,7 @@ protected void generateReaction(
     }
     src.pr(
         PythonReactionGenerator.generateCReaction(
-            reaction, tpr, reactor, reactionIndex, mainDef, errorReporter, types));
+            reaction, tpr, reactor, reactionIndex, mainDef, messageReporter, types));
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
index 288b53d318..a39b38b619 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
@@ -5,7 +5,7 @@
 import java.util.List;
 import java.util.Set;
 import org.lflang.AttributeUtils;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
@@ -134,7 +134,7 @@ private static String generateCPythonFunctionCaller(
    * @param r The reactor to which <code>reaction<code> belongs to.
    * @param reactionIndex The index number of the reaction in decl.
    * @param mainDef The main reactor.
-   * @param errorReporter An error reporter.
+   * @param messageReporter An error reporter.
    * @param types A helper class for type-related stuff.
    */
   public static String generateCReaction(
@@ -143,14 +143,14 @@ public static String generateCReaction(
       Reactor r,
       int reactionIndex,
       Instantiation mainDef,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       CTypes types) {
     // Contains the actual comma separated list of inputs to the reaction of type
     // generic_port_instance_struct.
     // Each input must be cast to (PyObject *) (aka their descriptors for Py_BuildValue are "O")
     List<String> pyObjects = new ArrayList<>();
     CodeBuilder code = new CodeBuilder();
-    String cPyInit = generateCPythonInitializers(reaction, r, pyObjects, errorReporter);
+    String cPyInit = generateCPythonInitializers(reaction, r, pyObjects, messageReporter);
     String cInit =
         CReactionGenerator.generateInitializationForReaction(
             "",
@@ -158,7 +158,7 @@ public static String generateCReaction(
             tpr,
             reactionIndex,
             types,
-            errorReporter,
+            messageReporter,
             mainDef,
             Target.Python.requiresTypes);
     code.pr("#include " + StringUtil.addDoubleQuotes(CCoreFilesUtils.getCTargetSetHeader()));
@@ -214,7 +214,7 @@ public static String generateFunction(String header, String init, Code code, Str
    *  We will use as a format string, "(O...O)" where the number of O's is equal to the length of the list.
    */
   private static String generateCPythonInitializers(
-      Reaction reaction, ReactorDecl decl, List<String> pyObjects, ErrorReporter errorReporter) {
+      Reaction reaction, ReactorDecl decl, List<String> pyObjects, MessageReporter messageReporter) {
     Set<Action> actionsAsTriggers = new LinkedHashSet<>();
     Reactor reactor = ASTUtils.toDefinition(decl);
     CodeBuilder code = new CodeBuilder();
@@ -273,7 +273,7 @@ private static String generateCPythonInitializers(
                 "In generateReaction(): "
                     + effect.getVariable().getName()
                     + " is neither an input nor an output.";
-            errorReporter.at(reaction).error(message);
+            messageReporter.at(reaction).error(message);
           }
         }
       }
diff --git a/core/src/main/java/org/lflang/generator/python/PythonValidator.java b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
index b216210850..9f9d76339e 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonValidator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
@@ -15,7 +15,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.DiagnosticReporting;
@@ -152,7 +152,7 @@ public DiagnosticSeverity getSeverity() {
       Pattern.compile("Instance of '(?<name>\\w+)' has no .*");
 
   private final FileConfig fileConfig;
-  private final ErrorReporter errorReporter;
+  private final MessageReporter messageReporter;
   private final ImmutableMap<Path, CodeMap> codeMaps;
 
   /**
@@ -160,7 +160,7 @@ public DiagnosticSeverity getSeverity() {
    * errors to {@code errorReporter}.
    *
    * @param fileConfig The file configuration of this build.
-   * @param errorReporter The reporter to which diagnostics should be sent.
+   * @param messageReporter The reporter to which diagnostics should be sent.
    * @param codeMaps A mapping from generated file paths to code maps that map them back to LF
    *     sources.
    * @param protoNames The names of any protocol buffer message types that are used in the LF
@@ -168,12 +168,12 @@ public DiagnosticSeverity getSeverity() {
    */
   public PythonValidator(
       FileConfig fileConfig,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       Map<Path, CodeMap> codeMaps,
       Set<String> protoNames) {
-    super(errorReporter, codeMaps);
+    super(messageReporter, codeMaps);
     this.fileConfig = fileConfig;
-    this.errorReporter = errorReporter;
+    this.messageReporter = messageReporter;
     this.codeMaps = ImmutableMap.copyOf(codeMaps);
     this.protoNames = ImmutableSet.copyOf(protoNames);
   }
@@ -199,7 +199,7 @@ public Strategy getErrorReportingStrategy() {
           @Override
           public Strategy getOutputReportingStrategy() {
             return (String validationOutput,
-                ErrorReporter errorReporter,
+                MessageReporter messageReporter,
                 Map<Path, CodeMap> map) -> {
               String[] lines = (validationOutput + "\n\n\n").lines().toArray(String[]::new);
               for (int i = 0; i < lines.length - 3; i++) {
@@ -233,14 +233,14 @@ private boolean tryReportTypical(String[] lines, int i) {
               Position genPosition =
                   Position.fromOneBased(line, Integer.MAX_VALUE); // Column is just a placeholder.
               if (map == null) {
-                errorReporter.nowhere().error(message); // Undesirable fallback
+                messageReporter.nowhere().error(message); // Undesirable fallback
               } else {
                 for (Path lfFile : map.lfSourcePaths()) {
                   Position lfPosition = map.adjusted(lfFile, genPosition);
                   // TODO: We could be more precise than just getting the right line, but the way
                   // the output
                   //  is formatted (with leading whitespace possibly trimmed) does not make it easy.
-                  errorReporter.at(lfFile, lfPosition).error(message);
+                  messageReporter.at(lfFile, lfPosition).error(message);
                 }
               }
               return true;
@@ -269,7 +269,7 @@ private void tryReportAlternative(String[] lines, int i) {
                   Position pos =
                       map.adjusted(
                           lfFile, Position.fromOneBased(line, map.firstNonWhitespace(line)));
-                  errorReporter
+                  messageReporter
                       .at(lfFile, pos)
                       .error(main.group().replace("*** ", "").replace("Sorry: ", ""));
                 }
@@ -367,7 +367,7 @@ private boolean shouldIgnore(PylintMessage message) {
 
           /** Make a best-effort attempt to place the diagnostic on the correct line. */
           private void bestEffortReport(
-              ErrorReporter errorReporter,
+              MessageReporter messageReporter,
               Function<Position, Position> adjust,
               Position lfStart,
               Position lfEnd,
@@ -375,7 +375,7 @@ private void bestEffortReport(
               DiagnosticSeverity severity,
               String humanMessage) {
             if (!lfEnd.equals(Position.ORIGIN) && !lfStart.equals(Position.ORIGIN)) { // Ideal case
-              errorReporter.at(file, new Range(lfStart, lfEnd)).report(severity, humanMessage);
+              messageReporter.at(file, new Range(lfStart, lfEnd)).report(severity, humanMessage);
             } else { // Fallback: Try to report on the correct line, or failing that, just line 1.
               if (lfStart.equals(Position.ORIGIN))
                 lfStart =
@@ -384,7 +384,7 @@ private void bestEffortReport(
               // FIXME: It might be better to improve style of generated code instead of quietly
               // returning here.
               if (lfStart.equals(Position.ORIGIN) && severity != DiagnosticSeverity.Error) return;
-              errorReporter.at(file, lfStart).report(severity, humanMessage);
+              messageReporter.at(file, lfStart).report(severity, humanMessage);
             }
           }
 
diff --git a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
index ceeaec7fc9..cd160f53c1 100644
--- a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
+++ b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
@@ -32,7 +32,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.eclipse.emf.ecore.EObject;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.TargetPropertyType;
 import org.lflang.ast.ASTUtils;
@@ -283,10 +283,10 @@ public void check(Element element, String name, LFValidator v) {
         try {
           parseValue(pair);
         } catch (InvalidLfSourceException e) {
-          ErrorReporter errorReporter = v.getErrorReporter();
+          MessageReporter messageReporter = v.getErrorReporter();
           EObject object = e.getNode();
           String message = e.getProblem();
-          errorReporter.at(object).error(message);
+          messageReporter.at(object).error(message);
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
index fdb83fab6a..7c164c1957 100644
--- a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
+++ b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
@@ -31,7 +31,7 @@
 import java.util.List;
 import java.util.Map;
 import org.eclipse.emf.ecore.EObject;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.TargetProperty.BuildType;
 
 /**
@@ -61,7 +61,7 @@ public void setCargoDependencies(Map<String, CargoDependencySpec> cargoDependenc
     this.cargoDependencies = cargoDependencies;
   }
 
-  public void addAndCheckTopLevelModule(Path path, EObject errorOwner, ErrorReporter err) {
+  public void addAndCheckTopLevelModule(Path path, EObject errorOwner, MessageReporter err) {
     String fileName = path.getFileName().toString();
     if (!Files.exists(path)) {
       err.at(errorOwner).error("File not found");
diff --git a/core/src/main/java/org/lflang/util/ArduinoUtil.java b/core/src/main/java/org/lflang/util/ArduinoUtil.java
index 4fec0b51cf..9844195cb8 100644
--- a/core/src/main/java/org/lflang/util/ArduinoUtil.java
+++ b/core/src/main/java/org/lflang/util/ArduinoUtil.java
@@ -6,7 +6,7 @@
 import java.io.IOException;
 import java.util.List;
 import org.eclipse.xtext.xbase.lib.Exceptions;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
 import org.lflang.generator.GeneratorCommandFactory;
@@ -26,15 +26,15 @@ public class ArduinoUtil {
 
   private LFGeneratorContext context;
   private GeneratorCommandFactory commandFactory;
-  private ErrorReporter errorReporter;
+  private MessageReporter messageReporter;
 
   public ArduinoUtil(
       LFGeneratorContext context,
       GeneratorCommandFactory commandFactory,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     this.context = context;
     this.commandFactory = commandFactory;
-    this.errorReporter = errorReporter;
+    this.messageReporter = messageReporter;
   }
 
   /** Return true if arduino-cli exists, false otherwise. */
@@ -103,24 +103,24 @@ private LFCommand arduinoCompileCommand(FileConfig fileConfig, TargetConfig targ
    * @param targetConfig
    */
   public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
-    errorReporter.nowhere().info("Retrieving Arduino Compile Script");
+    messageReporter.nowhere().info("Retrieving Arduino Compile Script");
     try {
       LFCommand command =
           arduinoCompileCommand(fileConfig, targetConfig); // Use ProcessBuilder for finer control.
       int retCode = 0;
       retCode = command.run(context.getCancelIndicator());
       if (retCode != 0 && context.getMode() == LFGeneratorContext.Mode.STANDALONE) {
-        errorReporter.nowhere().error("arduino-cli failed with error code " + retCode);
+        messageReporter.nowhere().error("arduino-cli failed with error code " + retCode);
         throw new IOException("arduino-cli failure");
       }
     } catch (IOException e) {
       Exceptions.sneakyThrow(e);
     }
-    errorReporter.nowhere().info(
+    messageReporter.nowhere().info(
         "SUCCESS: Compiling generated code for " + fileConfig.name + " finished with no errors.");
     if (targetConfig.platformOptions.flash) {
       if (targetConfig.platformOptions.port != null) {
-        errorReporter.nowhere().info("Invoking flash command for Arduino");
+        messageReporter.nowhere().info("Invoking flash command for Arduino");
         LFCommand flash =
             commandFactory.createCommand(
                 "arduino-cli",
@@ -132,22 +132,22 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
                     targetConfig.platformOptions.port),
                 fileConfig.getSrcGenPath());
         if (flash == null) {
-          errorReporter.nowhere().error("Could not create arduino-cli flash command.");
+          messageReporter.nowhere().error("Could not create arduino-cli flash command.");
         }
         int flashRet = flash.run();
         if (flashRet != 0) {
-          errorReporter
+          messageReporter
               .nowhere()
               .error("arduino-cli flash command failed with error code " + flashRet);
         } else {
-          errorReporter.nowhere().info("SUCCESS: Flashed board using arduino-cli");
+          messageReporter.nowhere().info("SUCCESS: Flashed board using arduino-cli");
         }
       } else {
-        errorReporter.nowhere().error("Need to provide a port on which to automatically flash.");
+        messageReporter.nowhere().error("Need to provide a port on which to automatically flash.");
       }
     } else {
-      errorReporter.nowhere().info("********");
-      errorReporter.nowhere().info(
+      messageReporter.nowhere().info("********");
+      messageReporter.nowhere().info(
           "To flash your program, run the following command to see information about the board you"
               + " plugged in:\n\n"
               + "\tarduino-cli board list\n\n"
diff --git a/core/src/main/java/org/lflang/util/FileUtil.java b/core/src/main/java/org/lflang/util/FileUtil.java
index c84bc4da8f..74ed6b8653 100644
--- a/core/src/main/java/org/lflang/util/FileUtil.java
+++ b/core/src/main/java/org/lflang/util/FileUtil.java
@@ -33,7 +33,7 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.util.RuntimeIOException;
-import org.lflang.ErrorReporter;
+import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 
 public class FileUtil {
@@ -307,13 +307,13 @@ public static Path findAndCopyFile(String file, Path dstDir, FileConfig fileConf
    * @param dstDir The location to copy the files to.
    * @param fileConfig The file configuration that specifies where the find entries the given
    *     entries.
-   * @param errorReporter An error reporter to report problems.
+   * @param messageReporter An error reporter to report problems.
    */
   public static void copyFilesOrDirectories(
       List<String> entries,
       Path dstDir,
       FileConfig fileConfig,
-      ErrorReporter errorReporter,
+      MessageReporter messageReporter,
       boolean fileEntriesOnly) {
     for (String fileOrDirectory : entries) {
       var path = Paths.get(fileOrDirectory);
@@ -325,14 +325,14 @@ public static void copyFilesOrDirectories(
           } else {
             FileUtil.copyFromFileSystem(found, dstDir, false);
           }
-          errorReporter.nowhere().info("Copied '" + fileOrDirectory + "' from the file system.");
+          messageReporter.nowhere().info("Copied '" + fileOrDirectory + "' from the file system.");
         } catch (IOException e) {
           String message =
               "Unable to copy '"
                   + fileOrDirectory
                   + "' from the file system. Reason: "
                   + e.toString();
-          errorReporter.nowhere().error(message);
+          messageReporter.nowhere().error(message);
         }
       } else {
         try {
@@ -340,7 +340,7 @@ public static void copyFilesOrDirectories(
             copyFileFromClassPath(fileOrDirectory, dstDir, false);
           } else {
             FileUtil.copyFromClassPath(fileOrDirectory, dstDir, false, false);
-            errorReporter.nowhere().info("Copied '" + fileOrDirectory + "' from the class path.");
+            messageReporter.nowhere().info("Copied '" + fileOrDirectory + "' from the class path.");
           }
         } catch (IOException e) {
           String message =
@@ -348,7 +348,7 @@ public static void copyFilesOrDirectories(
                   + fileOrDirectory
                   + "' from the class path. Reason: "
                   + e.toString();
-          errorReporter.nowhere().error(message);
+          messageReporter.nowhere().error(message);
         }
       }
     }
@@ -712,11 +712,11 @@ public static boolean isCFile(Path path) {
    * Convert all includes recursively inside files within a specified folder to relative links
    *
    * @param dir The folder to search for includes to change.
-   * @param errorReporter Error reporter
+   * @param messageReporter Error reporter
    * @throws IOException If the given set of files cannot be relativized.
    */
-  public static void relativeIncludeHelper(Path dir, Path includePath, ErrorReporter errorReporter) throws IOException {
-    errorReporter.nowhere().info("Relativizing all includes in " + dir.toString());
+  public static void relativeIncludeHelper(Path dir, Path includePath, MessageReporter messageReporter) throws IOException {
+    messageReporter.nowhere().info("Relativizing all includes in " + dir.toString());
     List<Path> includePaths =
         Files.walk(includePath)
             .filter(Files::isRegularFile)
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 237a3aad13..4cd61b9aa6 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -1615,7 +1615,7 @@ public void checkUnspecifiedTransitionType(Reaction reaction) {
   //// Public methods.
 
   /** Return the error reporter for this validator. */
-  public ValidatorErrorReporter getErrorReporter() {
+  public ValidatorMessageReporter getErrorReporter() {
     return this.errorReporter;
   }
 
@@ -1912,8 +1912,8 @@ private boolean sameType(Type type1, Type type2) {
   //// Private fields.
 
   /** The error reporter. */
-  private ValidatorErrorReporter errorReporter =
-      new ValidatorErrorReporter(getMessageAcceptor(), new ValidatorStateAccess());
+  private ValidatorMessageReporter errorReporter =
+      new ValidatorMessageReporter(getMessageAcceptor(), new ValidatorStateAccess());
 
   /** Helper class containing information about the model. */
   private ModelInfo info = new ModelInfo();
diff --git a/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java b/core/src/main/java/org/lflang/validation/ValidatorMessageReporter.java
similarity index 96%
rename from core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java
rename to core/src/main/java/org/lflang/validation/ValidatorMessageReporter.java
index e50a4f5e2a..3ef4e05798 100644
--- a/core/src/main/java/org/lflang/validation/ValidatorErrorReporter.java
+++ b/core/src/main/java/org/lflang/validation/ValidatorMessageReporter.java
@@ -30,7 +30,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
-import org.lflang.ErrorReporterBase;
+import org.lflang.MessageReporterBase;
 import org.lflang.generator.Range;
 
 /**
@@ -47,12 +47,12 @@
  *
  * @author Christian Menard
  */
-public class ValidatorErrorReporter extends ErrorReporterBase {
+public class ValidatorMessageReporter extends MessageReporterBase {
 
   private final ValidationMessageAcceptor acceptor;
   private final BaseLFValidator.ValidatorStateAccess validatorState;
 
-  public ValidatorErrorReporter(
+  public ValidatorMessageReporter(
       ValidationMessageAcceptor acceptor, BaseLFValidator.ValidatorStateAccess stateAccess) {
     this.acceptor = acceptor;
     this.validatorState = stateAccess;
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppActionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppActionGenerator.kt
index 632b3cab39..a0e31d0b47 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppActionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppActionGenerator.kt
@@ -24,7 +24,7 @@
 
 package org.lflang.generator.cpp
 
-import org.lflang.ErrorReporter
+import org.lflang.MessageReporter
 import org.lflang.generator.PrependOperator
 import org.lflang.generator.orZero
 import org.lflang.inferredType
@@ -34,7 +34,7 @@ import org.lflang.lf.BuiltinTrigger
 import org.lflang.lf.Reactor
 
 /** A C++ code generator for actions */
-class CppActionGenerator(private val reactor: Reactor, private val errorReporter: ErrorReporter) {
+class CppActionGenerator(private val reactor: Reactor, private val messageReporter: MessageReporter) {
 
     companion object {
         val Action.cppType: String
@@ -55,7 +55,7 @@ class CppActionGenerator(private val reactor: Reactor, private val errorReporter
 
     private fun generateLogicalInitializer(action: Action): String {
         return if (action.minSpacing != null || !action.policy.isNullOrEmpty()) {
-            errorReporter.at(
+            messageReporter.at(
                 action
             ).error(
                 "minSpacing and spacing violation policies are not yet supported for logical actions in reactor-ccp!"
@@ -69,7 +69,7 @@ class CppActionGenerator(private val reactor: Reactor, private val errorReporter
 
     private fun initializePhysicalInitializer(action: Action): String {
         return if (action.minDelay != null || action.minSpacing != null || !action.policy.isNullOrEmpty()) {
-            errorReporter.at(
+            messageReporter.at(
                 action
             ).error(
                 "minDelay, minSpacing and spacing violation policies are not yet supported for physical actions in reactor-ccp!"
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
index e739560ba8..359811e8d9 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
@@ -67,7 +67,7 @@ class CppGenerator(
     override fun doGenerate(resource: Resource, context: LFGeneratorContext) {
         super.doGenerate(resource, context)
 
-        if (!canGenerate(errorsOccurred(), mainDef, errorReporter, context)) return
+        if (!canGenerate(errorsOccurred(), mainDef, messageReporter, context)) return
 
         // create a platform-specific generator
         val platformGenerator: CppPlatformGenerator =
@@ -88,7 +88,7 @@ class CppGenerator(
             )
 
             if (platformGenerator.doCompile(context)) {
-                CppValidator(fileConfig, errorReporter, codeMaps).doValidate(context)
+                CppValidator(fileConfig, messageReporter, codeMaps).doValidate(context)
                 context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, codeMaps))
             } else {
                 context.unsuccessfulFinish()
@@ -149,7 +149,7 @@ class CppGenerator(
 
         // generate header and source files for all reactors
         for (r in reactors) {
-            val generator = CppReactorGenerator(r, fileConfig, errorReporter)
+            val generator = CppReactorGenerator(r, fileConfig, messageReporter)
             val headerFile = fileConfig.getReactorHeaderPath(r)
             val sourceFile = if (r.isGeneric) fileConfig.getReactorHeaderImplPath(r) else fileConfig.getReactorSourcePath(r)
             val reactorCodeMap = CodeMap.fromGeneratedCode(generator.generateSource())
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppInstanceGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppInstanceGenerator.kt
index 88a66ef558..19466c2fce 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppInstanceGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppInstanceGenerator.kt
@@ -34,7 +34,7 @@ import org.lflang.validation.AttributeSpec
 class CppInstanceGenerator(
     private val reactor: Reactor,
     private val fileConfig: CppFileConfig,
-    private val errorReporter: ErrorReporter
+    private val messageReporter: MessageReporter
 ) {
     companion object {
         val Instantiation.isEnclave: Boolean get() = AttributeUtils.isEnclave(this)
@@ -87,12 +87,12 @@ class CppInstanceGenerator(
         val assignments = parameters.mapNotNull {
             when {
                 it.rhs.isParens || it.rhs.isBraces -> {
-                    errorReporter.at(it).error("Parenthesis based initialization is not allowed here!")
+                    messageReporter.at(it).error("Parenthesis based initialization is not allowed here!")
                     null
                 }
 
                 it.rhs.exprs.size != 1             -> {
-                    errorReporter.at(it).error("Expected exactly one expression.")
+                    messageReporter.at(it).error("Expected exactly one expression.")
                     null
                 }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
index 09296cfe36..e2106456b8 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
@@ -1,6 +1,6 @@
 package org.lflang.generator.cpp
 
-import org.lflang.ErrorReporter
+import org.lflang.MessageReporter
 import org.lflang.TargetConfig
 import org.lflang.generator.GeneratorCommandFactory
 import org.lflang.generator.LFGeneratorContext
@@ -11,7 +11,7 @@ import java.nio.file.Path
 abstract class CppPlatformGenerator(protected val generator: CppGenerator) {
     protected val codeMaps = generator.codeMaps
     protected val cppSources = generator.cppSources
-    protected val errorReporter: ErrorReporter = generator.errorReporter
+    protected val messageReporter: MessageReporter = generator.messageReporter
     protected val fileConfig: CppFileConfig = generator.fileConfig
     protected val targetConfig: TargetConfig = generator.targetConfig
     protected val commandFactory: GeneratorCommandFactory = generator.commandFactory
@@ -32,4 +32,4 @@ abstract class CppPlatformGenerator(protected val generator: CppGenerator) {
             "-DREACTOR_CPP_LOG_LEVEL=${targetConfig.logLevel.severity}",
             "-DLF_SRC_PKG_PATH=${fileConfig.srcPkgPath}",
         )
-}
\ No newline at end of file
+}
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppReactorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppReactorGenerator.kt
index 78df4519f2..c28aa607ab 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppReactorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppReactorGenerator.kt
@@ -23,7 +23,7 @@
  ***************/
 package org.lflang.generator.cpp
 
-import org.lflang.ErrorReporter
+import org.lflang.MessageReporter
 import org.lflang.generator.PrependOperator
 import org.lflang.isGeneric
 import org.lflang.lf.Reactor
@@ -33,7 +33,7 @@ import org.lflang.toUnixString
 /**
  * A C++ code generator that produces a C++ class representing a single reactor
  */
-class CppReactorGenerator(private val reactor: Reactor, fileConfig: CppFileConfig, errorReporter: ErrorReporter) {
+class CppReactorGenerator(private val reactor: Reactor, fileConfig: CppFileConfig, messageReporter: MessageReporter) {
 
     /** Comment to be inserted at the top of generated files */
     private val fileComment = fileComment(reactor.eResource())
@@ -50,9 +50,9 @@ class CppReactorGenerator(private val reactor: Reactor, fileConfig: CppFileConfi
     private val parameters = CppParameterGenerator(reactor)
     private val state = CppStateGenerator(reactor)
     private val methods = CppMethodGenerator(reactor)
-    private val instances = CppInstanceGenerator(reactor, fileConfig, errorReporter)
+    private val instances = CppInstanceGenerator(reactor, fileConfig, messageReporter)
     private val timers = CppTimerGenerator(reactor)
-    private val actions = CppActionGenerator(reactor, errorReporter)
+    private val actions = CppActionGenerator(reactor, messageReporter)
     private val ports = CppPortGenerator(reactor)
     private val reactions = CppReactionGenerator(reactor, ports, instances)
     private val assemble = CppAssembleMethodGenerator(reactor)
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt
index c24f6cae59..76969269c0 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt
@@ -39,7 +39,7 @@ class CppRos2Generator(generator: CppGenerator) : CppPlatformGenerator(generator
         val ros2Version = System.getenv("ROS_DISTRO")
 
         if (ros2Version.isNullOrBlank()) {
-            errorReporter.nowhere(
+            messageReporter.nowhere(
             ).error(
                 "Could not find a ROS2 installation! Please install ROS2 and source the setup script. " +
                         "Also see https://docs.ros.org/en/galactic/Installation.html"
@@ -59,11 +59,11 @@ class CppRos2Generator(generator: CppGenerator) : CppPlatformGenerator(generator
             fileConfig.outPath
         )
         val returnCode = colconCommand?.run(context.cancelIndicator);
-        if (returnCode != 0 && !errorReporter.errorsOccurred) {
+        if (returnCode != 0 && !messageReporter.errorsOccurred) {
             // If errors occurred but none were reported, then the following message is the best we can do.
-            errorReporter.nowhere().error("colcon failed with error code $returnCode")
+            messageReporter.nowhere().error("colcon failed with error code $returnCode")
         }
 
-        return !errorReporter.errorsOccurred
+        return !messageReporter.errorsOccurred
     }
 }
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
index 7f0efe2c00..45fa65f4f5 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
@@ -66,7 +66,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
             if (cmakeReturnCode == 0 && runMake) {
                 // If cmake succeeded, run make
                 val makeCommand = createMakeCommand(fileConfig.buildPath, version, fileConfig.name)
-                val makeReturnCode = CppValidator(fileConfig, errorReporter, codeMaps).run(makeCommand, context.cancelIndicator)
+                val makeReturnCode = CppValidator(fileConfig, messageReporter, codeMaps).run(makeCommand, context.cancelIndicator)
                 var installReturnCode = 0
                 if (makeReturnCode == 0) {
                     val installCommand = createMakeCommand(fileConfig.buildPath, version, "install")
@@ -77,16 +77,16 @@ class CppStandaloneGenerator(generator: CppGenerator) :
                         println("Compiled binary is in ${fileConfig.binPath}")
                     }
                 }
-                if ((makeReturnCode != 0 || installReturnCode != 0) && !errorReporter.errorsOccurred) {
+                if ((makeReturnCode != 0 || installReturnCode != 0) && !messageReporter.errorsOccurred) {
                     // If errors occurred but none were reported, then the following message is the best we can do.
-                    errorReporter.nowhere().error("make failed with error code $makeReturnCode")
+                    messageReporter.nowhere().error("make failed with error code $makeReturnCode")
                 }
             }
             if (cmakeReturnCode != 0) {
-                errorReporter.nowhere().error("cmake failed with error code $cmakeReturnCode")
+                messageReporter.nowhere().error("cmake failed with error code $cmakeReturnCode")
             }
         }
-        return !errorReporter.errorsOccurred
+        return !messageReporter.errorsOccurred
     }
 
     private fun checkCmakeVersion(): String? {
@@ -98,7 +98,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
             version = regex.find(cmd.output.toString())?.value
         }
         if (version == null || version.compareVersion("3.5.0") < 0) {
-            errorReporter.nowhere(
+            messageReporter.nowhere(
             ).error(
                 "The C++ target requires CMAKE >= 3.5.0 to compile the generated code. " +
                         "Auto-compiling can be disabled using the \"no-compile: true\" target property."
@@ -139,7 +139,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
     private fun createMakeCommand(buildPath: Path, version: String, target: String): LFCommand {
         val makeArgs: List<String>
         if (version.compareVersion("3.12.0") < 0) {
-            errorReporter.nowhere().warning("CMAKE is older than version 3.12. Parallel building is not supported.")
+            messageReporter.nowhere().warning("CMAKE is older than version 3.12. Parallel building is not supported.")
             makeArgs =
                 listOf("--build", ".", "--target", target, "--config", targetConfig.cmakeBuildType?.toString() ?: "Release")
         } else {
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppValidator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppValidator.kt
index 8a1be2a810..fd642a94bf 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppValidator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppValidator.kt
@@ -1,6 +1,6 @@
 package org.lflang.generator.cpp
 
-import org.lflang.ErrorReporter
+import org.lflang.MessageReporter
 import org.lflang.generator.CodeMap
 import org.lflang.generator.DiagnosticReporting
 import org.lflang.generator.HumanReadableReportingStrategy
@@ -19,9 +19,9 @@ import java.util.regex.Pattern
  */
 class CppValidator(
     private val fileConfig: CppFileConfig,
-    errorReporter: ErrorReporter,
+    messageReporter: MessageReporter,
     codeMaps: Map<Path, CodeMap>
-): Validator(errorReporter, codeMaps) {
+): Validator(messageReporter, codeMaps) {
 
     companion object {
         /** This matches a line in the CMake cache. */
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
index 007d606620..41128800e3 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
@@ -71,11 +71,11 @@ class RustGenerator(
     override fun doGenerate(resource: Resource, context: LFGeneratorContext) {
         super.doGenerate(resource, context)
 
-        if (!canGenerate(errorsOccurred(), mainDef, errorReporter, context)) return
+        if (!canGenerate(errorsOccurred(), mainDef, messageReporter, context)) return
 
         Files.createDirectories(fileConfig.srcGenPath)
 
-        val gen = RustModelBuilder.makeGenerationInfo(targetConfig, reactors, errorReporter)
+        val gen = RustModelBuilder.makeGenerationInfo(targetConfig, reactors, messageReporter)
         val codeMaps: Map<Path, CodeMap> = RustEmitter.generateRustProject(fileConfig, gen)
 
         if (targetConfig.noCompile || errorsOccurred()) {
@@ -86,7 +86,7 @@ class RustGenerator(
                 "Code generation complete. Compiling...", IntegratedBuilder.GENERATED_PERCENT_PROGRESS
             )
             Files.deleteIfExists(fileConfig.executable) // cleanup, cargo doesn't do it
-            if (context.mode == LFGeneratorContext.Mode.LSP_MEDIUM) RustValidator(fileConfig, errorReporter, codeMaps).doValidate(context)
+            if (context.mode == LFGeneratorContext.Mode.LSP_MEDIUM) RustValidator(fileConfig, messageReporter, codeMaps).doValidate(context)
             else invokeRustCompiler(context, codeMaps)
         }
     }
@@ -120,7 +120,7 @@ class RustGenerator(
         ) ?: return
         cargoCommand.setQuiet()
 
-        val validator = RustValidator(fileConfig, errorReporter, codeMaps)
+        val validator = RustValidator(fileConfig, messageReporter, codeMaps)
         val cargoReturnCode = validator.run(cargoCommand, context.cancelIndicator)
 
         if (cargoReturnCode == 0) {
@@ -143,7 +143,7 @@ class RustGenerator(
             context.finish(GeneratorResult.CANCELLED)
         } else {
             if (!errorsOccurred()) {
-                errorReporter.nowhere(
+                messageReporter.nowhere(
                 ).error(
                     "cargo failed with error code $cargoReturnCode and reported the following error(s):\n${cargoCommand.errors}"
                 )
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
index e5f58e40c2..b2bacb0ce3 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
@@ -422,7 +422,7 @@ object RustModelBuilder {
     /**
      * Given the input to the generator, produce the model classes.
      */
-    fun makeGenerationInfo(targetConfig: TargetConfig, reactors: List<Reactor>, errorReporter: ErrorReporter): GenerationInfo {
+    fun makeGenerationInfo(targetConfig: TargetConfig, reactors: List<Reactor>, messageReporter: MessageReporter): GenerationInfo {
         val reactorsInfos = makeReactorInfos(reactors)
         // todo how do we pick the main reactor? it seems like super.doGenerate sets that field...
         val mainReactor = reactorsInfos.lastOrNull { it.isMain } ?: reactorsInfos.last()
@@ -430,7 +430,7 @@ object RustModelBuilder {
 
         val dependencies = targetConfig.rust.cargoDependencies.toMutableMap()
         dependencies.compute(RustEmitterBase.runtimeCrateFullName) { _, spec ->
-            computeDefaultRuntimeConfiguration(spec, targetConfig, errorReporter)
+            computeDefaultRuntimeConfiguration(spec, targetConfig, messageReporter)
         }
 
         return GenerationInfo(
@@ -458,14 +458,14 @@ object RustModelBuilder {
     private fun computeDefaultRuntimeConfiguration(
         userSpec: CargoDependencySpec?,
         targetConfig: TargetConfig,
-        errorReporter: ErrorReporter
+        messageReporter: MessageReporter
     ): CargoDependencySpec {
         fun CargoDependencySpec.useDefaultRuntimePath() {
             this.localPath = System.getenv("LOCAL_RUST_REACTOR_RT")?.also {
                 // Print info to reduce surprise. If the env var is not set,
                 // the runtime will be fetched from the internet by Cargo. If
                 // the value is incorrect, Cargo will crash.
-                errorReporter.nowhere().info("Using the Rust runtime from environment variable LOCAL_RUST_REACTOR_RT=$it")
+                messageReporter.nowhere().info("Using the Rust runtime from environment variable LOCAL_RUST_REACTOR_RT=$it")
             }
 
             if (localPath == null) {
@@ -510,7 +510,7 @@ object RustModelBuilder {
             }
 
             if (!targetConfig.threading && PARALLEL_RT_FEATURE in userSpec.features) {
-                errorReporter.nowhere().warning("Threading cannot be disabled as it was enabled manually as a runtime feature.")
+                messageReporter.nowhere().warning("Threading cannot be disabled as it was enabled manually as a runtime feature.")
             }
 
             return userSpec
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt
index 88ad8b6261..5ee732acd0 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonProcessingException
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.eclipse.lsp4j.DiagnosticSeverity
-import org.lflang.ErrorReporter
+import org.lflang.MessageReporter
 import org.lflang.FileConfig
 import org.lflang.generator.CodeMap
 import org.lflang.generator.DiagnosticReporting
@@ -25,9 +25,9 @@ import java.nio.file.Paths
 @Suppress("ArrayInDataClass")  // Data classes here must not be used in data structures such as hashmaps.
 class RustValidator(
     private val fileConfig: FileConfig,
-    errorReporter: ErrorReporter,
+    messageReporter: MessageReporter,
     codeMaps: Map<Path, CodeMap>
-): Validator(errorReporter, codeMaps) {
+): Validator(messageReporter, codeMaps) {
     companion object {
         private val mapper = ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
         private const val COMPILER_MESSAGE_REASON = "compiler-message"
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSConnectionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSConnectionGenerator.kt
index 9083fc049e..acdd762bdc 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSConnectionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSConnectionGenerator.kt
@@ -1,6 +1,6 @@
 package org.lflang.generator.ts
 
-import org.lflang.ErrorReporter
+import org.lflang.MessageReporter
 import org.lflang.hasMultipleConnections
 import org.lflang.isBank
 import org.lflang.lf.Connection
@@ -13,7 +13,7 @@ import java.util.*
  */
 class TSConnectionGenerator (
     private val connections: List<Connection>,
-    private val errorReporter: ErrorReporter
+    private val messageReporter: MessageReporter
 ) {
     // There is no generateClassProperties() for connections
 
@@ -70,4 +70,4 @@ class TSConnectionGenerator (
         }
         return connectionInstantiations.joinToString("\n")
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
index a1ec96c9ac..c28d9277bb 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
@@ -1,6 +1,6 @@
 package org.lflang.generator.ts
 
-import org.lflang.ErrorReporter
+import org.lflang.MessageReporter
 import org.lflang.TargetConfig
 import org.lflang.generator.PrependOperator
 import org.lflang.generator.getTargetInitializer
@@ -18,7 +18,7 @@ import java.util.*
  * registrations.
  */
 class TSConstructorGenerator(
-    private val errorReporter: ErrorReporter,
+    private val messageReporter: MessageReporter,
     private val reactor: Reactor
 ) {
 
@@ -94,8 +94,8 @@ class TSConstructorGenerator(
         isFederate: Boolean,
         networkMessageActions: List<String>
     ): String {
-        val connections = TSConnectionGenerator(reactor.connections, errorReporter)
-        val reactions = TSReactionGenerator(errorReporter, reactor)
+        val connections = TSConnectionGenerator(reactor.connections, messageReporter)
+        val reactions = TSReactionGenerator(messageReporter, reactor)
 
         return with(PrependOperator) {
             """
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
index de43c5abef..a9f1e60be4 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -112,7 +112,7 @@ class TSGenerator(
 
         instantiationGraph
 
-        if (!canGenerate(errorsOccurred(), mainDef, errorReporter, context)) return
+        if (!canGenerate(errorsOccurred(), mainDef, messageReporter, context)) return
         if (!isOsCompatible()) return
 
         // createMainReactorInstance()
@@ -148,7 +148,7 @@ class TSGenerator(
                 println("No .proto files have been imported. Skipping protocol buffer compilation.")
             }
             val parsingContext = SubContext(context, COLLECTED_DEPENDENCIES_PERCENT_PROGRESS, 100)
-            val validator = TSValidator(fileConfig, errorReporter, codeMaps)
+            val validator = TSValidator(fileConfig, messageReporter, codeMaps)
             if (!context.cancelIndicator.isCanceled) {
                 if (context.mode == LFGeneratorContext.Mode.LSP_MEDIUM) {
                     if (!passesChecks(validator, parsingContext)) {
@@ -224,7 +224,7 @@ class TSGenerator(
         for (configFile in CONFIG_FILES) {
             val override = FileUtil.findAndCopyFile(configFile, fileConfig.srcGenPath, fileConfig);
             if (override != null) {
-                errorReporter.nowhere().info("Using user-provided '" + override + "'");
+                messageReporter.nowhere().info("Using user-provided '" + override + "'");
             } else {
                 System.out.println("Using default '" + configFile + "'");
             }
@@ -253,7 +253,7 @@ class TSGenerator(
         val (mainParameters, parameterCode) = parameterGenerator.generateParameters()
         tsCode.append(parameterCode)
 
-        val reactorGenerator = TSReactorGenerator(this, errorReporter, targetConfig)
+        val reactorGenerator = TSReactorGenerator(this, messageReporter, targetConfig)
         for (reactor in reactors) {
             tsCode.append(reactorGenerator.generateReactor(reactor))
         }
@@ -303,12 +303,12 @@ class TSGenerator(
             val ret = pnpmInstall.run(context.cancelIndicator)
             if (ret != 0) {
                 val errors: String = pnpmInstall.errors
-                errorReporter.at(GeneratorUtils.findTargetDecl(resource))
+                messageReporter.at(GeneratorUtils.findTargetDecl(resource))
                     .error("pnpm install command failed" + if (errors.isBlank()) "." else ":\n$errors")
             }
             installProtoBufsIfNeeded(true, path, context.cancelIndicator)
         } else {
-            errorReporter.nowhere(
+            messageReporter.nowhere(
             ).warning(
                 "Falling back on npm. To prevent an accumulation of replicated dependencies, " +
                         "it is highly recommended to install pnpm globally (npm install -g pnpm)."
@@ -317,14 +317,14 @@ class TSGenerator(
             val npmInstall = commandFactory.createCommand("npm", if (production) listOf("install", "--production") else listOf("install"), path)
 
             if (npmInstall == null) {
-                errorReporter.nowhere().error(NO_NPM_MESSAGE)
+                messageReporter.nowhere().error(NO_NPM_MESSAGE)
                 return
             }
 
             if (npmInstall.run(context.cancelIndicator) != 0) {
-                errorReporter.at(GeneratorUtils.findTargetDecl(resource))
+                messageReporter.at(GeneratorUtils.findTargetDecl(resource))
                     .error("npm install command failed: " + npmInstall.errors)
-                errorReporter.at(GeneratorUtils.findTargetDecl(resource))
+                messageReporter.at(GeneratorUtils.findTargetDecl(resource))
                     .error(
                     "npm install command failed." +
                             "\nFor installation instructions, see: https://www.npmjs.com/get-npm"
@@ -338,7 +338,7 @@ class TSGenerator(
                 val rtPath = path.resolve("node_modules").resolve("@lf-lang").resolve("reactor-ts")
                 val buildRuntime = commandFactory.createCommand("npm", listOf("run", "build"), rtPath)
                 if (buildRuntime.run(context.cancelIndicator) != 0) {
-                    errorReporter.at(GeneratorUtils.findTargetDecl(resource))
+                    messageReporter.at(GeneratorUtils.findTargetDecl(resource))
                         .error("Unable to build runtime in dev mode: " + buildRuntime.errors.toString())
                 }
             }
@@ -379,7 +379,7 @@ class TSGenerator(
         val protoc = commandFactory.createCommand("protoc", protocArgs, fileConfig.srcPath)
 
         if (protoc == null) {
-            errorReporter.nowhere().error("Processing .proto files requires libprotoc >= 3.6.1.")
+            messageReporter.nowhere().error("Processing .proto files requires libprotoc >= 3.6.1.")
             return
         }
 
@@ -394,7 +394,7 @@ class TSGenerator(
 //                targetConfig.compileLibraries.add('-l')
 //                targetConfig.compileLibraries.add('protobuf-c')
         } else {
-            errorReporter.nowhere().error("protoc failed with error code $returnCode.")
+            messageReporter.nowhere().error("protoc failed with error code $returnCode.")
         }
         // FIXME: report errors from this command.
     }
@@ -420,14 +420,14 @@ class TSGenerator(
         val tsc = commandFactory.createCommand("npm", listOf("run", "build"), fileConfig.srcGenPkgPath)
 
         if (tsc == null) {
-            errorReporter.nowhere().error(NO_NPM_MESSAGE)
+            messageReporter.nowhere().error(NO_NPM_MESSAGE)
             return
         }
 
         if (validator.run(tsc, cancelIndicator) == 0) {
             println("SUCCESS (compiling generated TypeScript code)")
         } else {
-            errorReporter.nowhere().error("Compiler failed with the following errors:\n${tsc.errors}")
+            messageReporter.nowhere().error("Compiler failed with the following errors:\n${tsc.errors}")
         }
     }
 
@@ -436,7 +436,7 @@ class TSGenerator(
      * @param context The context of the compilation.
      */
     private fun concludeCompilation(context: LFGeneratorContext, codeMaps: Map<Path, CodeMap>) {
-        if (errorReporter.errorsOccurred) {
+        if (messageReporter.errorsOccurred) {
             context.unsuccessfulFinish()
         } else {
             context.finish(GeneratorResult.Status.COMPILED, codeMaps)
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
index d32e0a9860..ac2e7af402 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
@@ -1,6 +1,6 @@
 package org.lflang.generator.ts
 
-import org.lflang.ErrorReporter
+import org.lflang.MessageReporter
 import org.lflang.ast.ASTUtils
 import org.lflang.generator.PrependOperator
 import org.lflang.isBank
@@ -24,7 +24,7 @@ import java.util.LinkedList
  *  @author Hokeun Kim
  */
 class TSReactionGenerator(
-    private val errorReporter: ErrorReporter,
+    private val messageReporter: MessageReporter,
     private val reactor: Reactor
 ) {
 
@@ -138,7 +138,7 @@ class TSReactionGenerator(
             is Port   -> (trigOrSource.variable as Port).tsPortType
             else      -> {
                 val message = "Invalid trigger: ${trigOrSource.variable.name}"
-                errorReporter.nowhere().error(message)
+                messageReporter.nowhere().error(message)
                 message
             }
         }
@@ -302,7 +302,7 @@ class TSReactionGenerator(
             val functArg = effect.generateVarRef()
             when (val effectVar = effect.variable) {
                 is Timer  -> {
-                    errorReporter.nowhere().error("A timer cannot be an effect of a reaction")
+                    messageReporter.nowhere().error("A timer cannot be an effect of a reaction")
                 }
 
                 is Action -> {
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
index 4a0ef62092..29e99af361 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
@@ -17,7 +17,7 @@ import java.util.*
  */
 class TSReactorGenerator(
     private val tsGenerator: TSGenerator,
-    private val errorReporter: ErrorReporter,
+    private val messageReporter: MessageReporter,
     private val targetConfig: TargetConfig
 ) {
 
@@ -125,7 +125,7 @@ ${"             |"..preamble.code.toText()}
         val actionGenerator = TSActionGenerator(reactor.actions, networkMessageActions)
         val portGenerator = TSPortGenerator(reactor.inputs, reactor.outputs)
 
-        val constructorGenerator = TSConstructorGenerator(errorReporter, reactor)
+        val constructorGenerator = TSConstructorGenerator(messageReporter, reactor)
         return with(PrependOperator) {
             """
                 |// =============== START reactor class ${reactor.name}
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSValidator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSValidator.kt
index e60c1a99df..65af1b8f11 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSValidator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSValidator.kt
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.eclipse.lsp4j.DiagnosticSeverity
-import org.lflang.ErrorReporter
+import org.lflang.MessageReporter
 import org.lflang.FileConfig
 import org.lflang.generator.*
 import org.lflang.util.LFCommand
@@ -24,15 +24,15 @@ private val TSC_LABEL: Pattern = Pattern.compile("((?<=\\s))(~+)")
 @Suppress("ArrayInDataClass")  // Data classes here must not be used in data structures such as hashmaps.
 class TSValidator(
     private val fileConfig: FileConfig,
-    errorReporter: ErrorReporter,
+    messageReporter: MessageReporter,
     codeMaps: Map<Path, CodeMap>
-): Validator(errorReporter, codeMaps) {
+): Validator(messageReporter, codeMaps) {
 
     private class TSLinter(
         private val fileConfig: FileConfig,
-        errorReporter: ErrorReporter,
+        messageReporter: MessageReporter,
         codeMaps: Map<Path, CodeMap>
-    ): Validator(errorReporter, codeMaps) {
+    ): Validator(messageReporter, codeMaps) {
         companion object {
             private val mapper = ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
         }
@@ -145,7 +145,7 @@ class TSValidator(
      * @param context The context of the current build.
      */
     fun doLint(context: LFGeneratorContext) {
-        TSLinter(fileConfig, errorReporter, codeMaps).doValidate(context)
+        TSLinter(fileConfig, messageReporter, codeMaps).doValidate(context)
     }
 
     // If this is not true, then the user might as well be writing JavaScript.
diff --git a/core/src/test/java/org/lflang/tests/compiler/LetInferenceTests.java b/core/src/test/java/org/lflang/tests/compiler/LetInferenceTests.java
index 38387ac8a4..8f78cd5906 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LetInferenceTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LetInferenceTests.java
@@ -36,7 +36,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.lflang.DefaultErrorReporter;
+import org.lflang.DefaultMessageReporter;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
@@ -125,7 +125,7 @@ public void testLet() throws Exception {
     }
 
     ReactorInstance mainInstance =
-        new ReactorInstance(toDefinition(mainDef.getReactorClass()), new DefaultErrorReporter());
+        new ReactorInstance(toDefinition(mainDef.getReactorClass()), new DefaultMessageReporter());
 
     for (ReactorInstance reactorInstance : mainInstance.children) {
       if (reactorInstance.isGeneratedDelay()) {
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaDependencyAnalysisTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaDependencyAnalysisTest.java
index 516c712498..182a421e10 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaDependencyAnalysisTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaDependencyAnalysisTest.java
@@ -37,7 +37,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.lflang.DefaultErrorReporter;
+import org.lflang.DefaultMessageReporter;
 import org.lflang.ModelInfo;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Instantiation;
@@ -144,7 +144,7 @@ public void cyclicDependency() throws Exception {
     }
 
     ReactorInstance instance =
-        new ReactorInstance(toDefinition(mainDef.getReactorClass()), new DefaultErrorReporter());
+        new ReactorInstance(toDefinition(mainDef.getReactorClass()), new DefaultMessageReporter());
     Assertions.assertFalse(instance.getCycles().isEmpty());
   }
 
@@ -171,7 +171,7 @@ public void circularInstantiation() throws Exception {
     Assertions.assertNotNull(model);
 
     ModelInfo info = new ModelInfo();
-    info.update(model, new DefaultErrorReporter());
+    info.update(model, new DefaultMessageReporter());
     Assertions.assertTrue(
         info.instantiationGraph.hasCycles() == true, "Did not detect cyclic instantiation.");
   }
diff --git a/core/src/test/java/org/lflang/tests/compiler/PortInstanceTests.java b/core/src/test/java/org/lflang/tests/compiler/PortInstanceTests.java
index 8b8ef52a8f..e5c94dbec3 100644
--- a/core/src/test/java/org/lflang/tests/compiler/PortInstanceTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/PortInstanceTests.java
@@ -3,8 +3,8 @@
 import java.util.List;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.lflang.DefaultErrorReporter;
-import org.lflang.ErrorReporter;
+import org.lflang.DefaultMessageReporter;
+import org.lflang.MessageReporter;
 import org.lflang.generator.PortInstance;
 import org.lflang.generator.ReactionInstance;
 import org.lflang.generator.ReactorInstance;
@@ -17,7 +17,7 @@
 
 public class PortInstanceTests {
 
-  private ErrorReporter reporter = new DefaultErrorReporter();
+  private MessageReporter reporter = new DefaultMessageReporter();
   private static LfFactory factory = LfFactory.eINSTANCE;
 
   @Test
diff --git a/core/src/test/java/org/lflang/tests/compiler/RangeTests.java b/core/src/test/java/org/lflang/tests/compiler/RangeTests.java
index 2c17145aaa..07d7a3da34 100644
--- a/core/src/test/java/org/lflang/tests/compiler/RangeTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/RangeTests.java
@@ -4,8 +4,8 @@
 import java.util.Set;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.lflang.DefaultErrorReporter;
-import org.lflang.ErrorReporter;
+import org.lflang.DefaultMessageReporter;
+import org.lflang.MessageReporter;
 import org.lflang.generator.PortInstance;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.generator.RuntimeRange;
@@ -16,7 +16,7 @@
 
 public class RangeTests {
 
-  private ErrorReporter reporter = new DefaultErrorReporter();
+  private MessageReporter reporter = new DefaultMessageReporter();
   private static LfFactory factory = LfFactory.eINSTANCE;
 
   @Test
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index c149c550c6..a0002f0723 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -38,7 +38,7 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.lflang.DefaultErrorReporter;
+import org.lflang.DefaultMessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.LFRuntimeModule;
 import org.lflang.LFStandaloneSetup;
@@ -428,7 +428,7 @@ private void configure(LFTest test, Configurator configurator, TestLevel level)
             props,
             r,
             fileAccess,
-            fileConfig -> new DefaultErrorReporter());
+            fileConfig -> new DefaultMessageReporter());
 
     test.configure(context);
 
diff --git a/lsp/src/main/java/org/lflang/diagram/lsp/LanguageDiagramServer.java b/lsp/src/main/java/org/lflang/diagram/lsp/LanguageDiagramServer.java
index 96e887d242..0531d97721 100644
--- a/lsp/src/main/java/org/lflang/diagram/lsp/LanguageDiagramServer.java
+++ b/lsp/src/main/java/org/lflang/diagram/lsp/LanguageDiagramServer.java
@@ -19,7 +19,7 @@
 import org.eclipse.xtext.ide.server.LanguageServerImpl;
 import org.eclipse.xtext.service.AbstractGenericModule;
 import org.eclipse.xtext.util.Modules2;
-import org.lflang.generator.LanguageServerErrorReporter;
+import org.lflang.generator.LanguageServerMessageReporter;
 import org.lflang.ide.LFIdeSetup;
 
 /**
@@ -77,7 +77,7 @@ public void onConnect() {
       super.onConnect();
       constraints.setClient((KGraphLanguageClient) languageClient);
       rectPack.setClient((KGraphLanguageClient) languageClient);
-      LanguageServerErrorReporter.setClient(languageClient);
+      LanguageServerMessageReporter.setClient(languageClient);
       lfExtension.setClient(languageClient);
       // The following is needed because VS Code treats System.err like System.out and System.out
       // like a shout

From 62350e8708ba4f6c3b896da46367f3bba494925e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Fri, 16 Jun 2023 18:06:20 +0200
Subject: [PATCH 0382/1114] Format

---
 .../src/main/java/org/lflang/cli/CliBase.java |  2 +-
 .../org/lflang/cli/LFStandaloneModule.java    |  2 +-
 .../lflang/cli/StandaloneMessageReporter.java |  3 +-
 .../main/java/org/lflang/MessageReporter.java |  6 +--
 .../main/java/org/lflang/TargetProperty.java  |  1 -
 .../federated/extensions/CExtension.java      |  5 +-
 .../federated/extensions/CExtensionUtils.java | 20 +++++---
 .../extensions/FedTargetExtension.java        |  2 +-
 .../federated/extensions/PythonExtension.java | 10 +++-
 .../federated/extensions/TSExtension.java     |  2 +-
 .../federated/generator/FedASTUtils.java      |  2 +-
 .../federated/generator/FedEmitter.java       | 15 +++---
 .../federated/generator/FedGenerator.java     | 16 ++++--
 .../launcher/FedLauncherGenerator.java        |  5 +-
 .../generator/DockerComposeGenerator.java     |  2 +-
 .../java/org/lflang/generator/DockerData.java |  7 ++-
 .../org/lflang/generator/GeneratorBase.java   | 16 ++++--
 .../generator/GeneratorCommandFactory.java    |  2 +-
 .../org/lflang/generator/GeneratorUtils.java  |  2 +-
 .../HumanReadableReportingStrategy.java       |  3 +-
 .../lflang/generator/IntegratedBuilder.java   |  2 +-
 .../org/lflang/generator/LFGenerator.java     |  5 +-
 .../lflang/generator/LFGeneratorContext.java  |  2 +-
 .../LanguageServerMessageReporter.java        |  2 -
 .../org/lflang/generator/MainContext.java     |  2 +-
 .../java/org/lflang/generator/SubContext.java |  2 +-
 .../lflang/generator/c/CCmakeGenerator.java   |  2 +-
 .../org/lflang/generator/c/CCompiler.java     | 12 +++--
 .../org/lflang/generator/c/CGenerator.java    | 50 +++++++++++--------
 .../generator/c/CReactionGenerator.java       |  2 +-
 .../java/org/lflang/generator/c/CUtil.java    |  2 +-
 .../python/PythonReactionGenerator.java       |  5 +-
 .../generator/python/PythonValidator.java     |  2 +-
 .../java/org/lflang/util/ArduinoUtil.java     | 26 ++++++----
 .../main/java/org/lflang/util/FileUtil.java   |  5 +-
 35 files changed, 148 insertions(+), 96 deletions(-)

diff --git a/cli/base/src/main/java/org/lflang/cli/CliBase.java b/cli/base/src/main/java/org/lflang/cli/CliBase.java
index d93f093eea..0b61fa767b 100644
--- a/cli/base/src/main/java/org/lflang/cli/CliBase.java
+++ b/cli/base/src/main/java/org/lflang/cli/CliBase.java
@@ -27,9 +27,9 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.eclipse.xtext.validation.Issue;
-import org.lflang.MessageReporter;
 import org.lflang.LFRuntimeModule;
 import org.lflang.LFStandaloneSetup;
+import org.lflang.MessageReporter;
 import org.lflang.util.FileUtil;
 import picocli.CommandLine;
 import picocli.CommandLine.ArgGroup;
diff --git a/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java b/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java
index 8cb8395d5b..99dfd9a0b8 100644
--- a/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java
+++ b/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java
@@ -34,8 +34,8 @@
 import org.eclipse.emf.ecore.EValidator;
 import org.eclipse.emf.ecore.impl.EValidatorRegistryImpl;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
-import org.lflang.MessageReporter;
 import org.lflang.LFRuntimeModule;
+import org.lflang.MessageReporter;
 
 /**
  * Module that is only available when running LFC as a standalone program.
diff --git a/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java b/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java
index a6cbbd39cd..1ecffbdedb 100644
--- a/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java
+++ b/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java
@@ -47,8 +47,7 @@ static Severity convertSeverity(DiagnosticSeverity severity) {
     return switch (severity) {
       case Error -> Severity.ERROR;
       case Warning -> Severity.WARNING;
-      case Information -> Severity.INFO;
-      case Hint -> Severity.IGNORE;
+      case Information, Hint -> Severity.INFO;
     };
   }
 
diff --git a/core/src/main/java/org/lflang/MessageReporter.java b/core/src/main/java/org/lflang/MessageReporter.java
index 578f9c781a..949c708592 100644
--- a/core/src/main/java/org/lflang/MessageReporter.java
+++ b/core/src/main/java/org/lflang/MessageReporter.java
@@ -7,9 +7,9 @@
 import org.lflang.generator.Range;
 
 /**
- * Interface for reporting messages like errors or info. This interface is a staged builder: first call one of the {@code
- * at} methods to specify the position of the message, then use one of the report methods on the
- * returned {@link Stage2} instance.
+ * Interface for reporting messages like errors or info. This interface is a staged builder: first
+ * call one of the {@code at} methods to specify the position of the message, then use one of the
+ * report methods on the returned {@link Stage2} instance.
  *
  * <p>Examples:
  *
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index cfca699994..f86f87ea2b 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -34,7 +34,6 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import org.eclipse.xtext.util.RuntimeIOException;
 import org.lflang.TargetConfig.DockerOptions;
 import org.lflang.TargetConfig.PlatformOptions;
 import org.lflang.TargetConfig.TracingOptions;
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 3a47701475..4ae1c7328c 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -33,8 +33,8 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-import org.lflang.MessageReporter;
 import org.lflang.InferredType;
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.CoordinationType;
@@ -330,7 +330,8 @@ public String generateNetworkSenderBody(
               + ", message_length";
     }
 
-    serializeAndSend(connection, type, sendRef, result, sendingFunction, commonArgs, messageReporter);
+    serializeAndSend(
+        connection, type, sendRef, result, sendingFunction, commonArgs, messageReporter);
     return result.toString();
   }
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 6afba48178..bacd99d56c 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -7,9 +7,8 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.regex.Pattern;
-
-import org.lflang.MessageReporter;
 import org.lflang.InferredType;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig.ClockSyncOptions;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.ClockSyncMode;
@@ -241,7 +240,10 @@ static boolean isSharedPtrType(InferredType type, CTypes types) {
   }
 
   public static void handleCompileDefinitions(
-      FederateInstance federate, int numOfFederates, RtiConfig rtiConfig, MessageReporter messageReporter) {
+      FederateInstance federate,
+      int numOfFederates,
+      RtiConfig rtiConfig,
+      MessageReporter messageReporter) {
     federate.targetConfig.setByUser.add(TargetProperty.COMPILE_DEFINITIONS);
     federate.targetConfig.compileDefinitions.put("FEDERATED", "");
     federate.targetConfig.compileDefinitions.put(
@@ -300,10 +302,14 @@ public static void initializeClockSynchronization(
       FederateInstance federate, RtiConfig rtiConfig, MessageReporter messageReporter) {
     // Check if clock synchronization should be enabled for this federate in the first place
     if (clockSyncIsOn(federate, rtiConfig)) {
-      messageReporter.nowhere().info("Initial clock synchronization is enabled for federate " + federate.id);
+      messageReporter
+          .nowhere()
+          .info("Initial clock synchronization is enabled for federate " + federate.id);
       if (federate.targetConfig.clockSync == ClockSyncMode.ON) {
         if (federate.targetConfig.clockSyncOptions.collectStats) {
-          messageReporter.nowhere().info("Will collect clock sync statistics for federate " + federate.id);
+          messageReporter
+              .nowhere()
+              .info("Will collect clock sync statistics for federate " + federate.id);
           // Add libm to the compiler flags
           // FIXME: This is a linker flag not compile flag but we don't have a way to add linker
           // flags
@@ -312,7 +318,9 @@ public static void initializeClockSynchronization(
           federate.targetConfig.compilerFlags.add("-lm");
           federate.targetConfig.setByUser.add(TargetProperty.FLAGS);
         }
-        messageReporter.nowhere().info("Runtime clock synchronization is enabled for federate " + federate.id);
+        messageReporter
+            .nowhere()
+            .info("Runtime clock synchronization is enabled for federate " + federate.id);
       }
 
       addClockSyncCompileDefinitions(federate);
diff --git a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
index 2b3328ab88..616cfa8fce 100644
--- a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
@@ -1,8 +1,8 @@
 package org.lflang.federated.extensions;
 
 import java.io.IOException;
-import org.lflang.MessageReporter;
 import org.lflang.InferredType;
+import org.lflang.MessageReporter;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
 import org.lflang.federated.generator.FedConnectionInstance;
diff --git a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
index 3f290d5639..d467e981e0 100644
--- a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
@@ -27,8 +27,8 @@
 package org.lflang.federated.extensions;
 
 import java.io.IOException;
-import org.lflang.MessageReporter;
 import org.lflang.InferredType;
+import org.lflang.MessageReporter;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedConnectionInstance;
@@ -117,7 +117,13 @@ public String generateNetworkReceiverBody(
     result.pr(PyUtil.generateGILAcquireCode() + "\n");
     result.pr(
         super.generateNetworkReceiverBody(
-            action, sendingPort, receivingPort, connection, type, coordinationType, messageReporter));
+            action,
+            sendingPort,
+            receivingPort,
+            connection,
+            type,
+            coordinationType,
+            messageReporter));
     result.pr(PyUtil.generateGILReleaseCode() + "\n");
     return result.getCode();
   }
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 61b62de554..884b40fbb4 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -6,8 +6,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.lflang.MessageReporter;
 import org.lflang.InferredType;
+import org.lflang.MessageReporter;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index a3f76f2bdb..71b809baf6 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -42,8 +42,8 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-import org.lflang.MessageReporter;
 import org.lflang.InferredType;
+import org.lflang.MessageReporter;
 import org.lflang.ModelInfo;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
diff --git a/core/src/main/java/org/lflang/federated/generator/FedEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
index dc642a5612..c6e515854d 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
@@ -40,11 +40,13 @@ Map<Path, CodeMap> generateFederate(
       throws IOException {
     String fedName = federate.name;
     Files.createDirectories(fileConfig.getSrcPath());
-    messageReporter.nowhere().info(
-        "##### Generating code for federate "
-            + fedName
-            + " in directory "
-            + fileConfig.getSrcPath());
+    messageReporter
+        .nowhere()
+        .info(
+            "##### Generating code for federate "
+                + fedName
+                + " in directory "
+                + fileConfig.getSrcPath());
 
     String federateCode =
         String.join(
@@ -56,7 +58,8 @@ Map<Path, CodeMap> generateFederate(
             new FedPreambleEmitter()
                 .generatePreamble(federate, fileConfig, rtiConfig, messageReporter),
             new FedReactorEmitter().generateReactorDefinitions(federate),
-            new FedMainEmitter().generateMainReactor(federate, originalMainReactor, messageReporter));
+            new FedMainEmitter()
+                .generateMainReactor(federate, originalMainReactor, messageReporter));
     Map<Path, CodeMap> codeMapMap = new HashMap<>();
     var lfFilePath = lfFilePath(fileConfig, federate);
     try (var srcWriter = Files.newBufferedWriter(lfFilePath)) {
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 2b418b1ad7..b3cd74fe48 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -26,9 +26,9 @@
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.resource.XtextResourceSet;
 import org.eclipse.xtext.util.RuntimeIOException;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.LFStandaloneSetup;
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty.CoordinationType;
@@ -140,7 +140,10 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
 
     FedEmitter fedEmitter =
         new FedEmitter(
-            fileConfig, ASTUtils.toDefinition(mainDef.getReactorClass()), messageReporter, rtiConfig);
+            fileConfig,
+            ASTUtils.toDefinition(mainDef.getReactorClass()),
+            messageReporter,
+            rtiConfig);
 
     // Generate LF code for each federate.
     Map<Path, CodeMap> lf2lfCodeMapMap = new HashMap<>();
@@ -264,8 +267,9 @@ private Map<Path, CodeMap> compileFederates(
         Math.min(
             6, Math.min(Math.max(federates.size(), 1), Runtime.getRuntime().availableProcessors()));
     var compileThreadPool = Executors.newFixedThreadPool(numOfCompileThreads);
-    messageReporter.nowhere().info(
-        "******** Using " + numOfCompileThreads + " threads to compile the program.");
+    messageReporter
+        .nowhere()
+        .info("******** Using " + numOfCompileThreads + " threads to compile the program.");
     Map<Path, CodeMap> codeMapMap = new ConcurrentHashMap<>();
     List<SubContext> subContexts = Collections.synchronizedList(new ArrayList<>());
     Averager averager = new Averager(federates.size());
@@ -420,7 +424,9 @@ private void analyzeFederates(Reactor federation, LFGeneratorContext context) {
     for (Instantiation instantiation : ASTUtils.allInstantiations(federation)) {
       int bankWidth = ASTUtils.width(instantiation.getWidthSpec(), mainReactorContext);
       if (bankWidth < 0) {
-        messageReporter.at(instantiation).error("Cannot determine bank width! Assuming width of 1.");
+        messageReporter
+            .at(instantiation)
+            .error("Cannot determine bank width! Assuming width of 1.");
         // Continue with a bank width of 1.
         bankWidth = 1;
       }
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index f4a148ff18..53b8ec6607 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -218,8 +218,9 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
       }
     }
 
-    messageReporter.nowhere().info(
-        "##### Generating launcher for federation " + " in directory " + fileConfig.binPath);
+    messageReporter
+        .nowhere()
+        .info("##### Generating launcher for federation " + " in directory " + fileConfig.binPath);
 
     // Write the launcher file.
     // Delete file previously produced, if any.
diff --git a/core/src/main/java/org/lflang/generator/DockerComposeGenerator.java b/core/src/main/java/org/lflang/generator/DockerComposeGenerator.java
index 7e7ff22646..1b2dab1c52 100644
--- a/core/src/main/java/org/lflang/generator/DockerComposeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/DockerComposeGenerator.java
@@ -4,7 +4,6 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.lflang.util.FileUtil;
 
 /**
@@ -17,6 +16,7 @@ public class DockerComposeGenerator {
 
   /** Path to the docker-compose.yml file. */
   protected final Path path;
+
   private final LFGeneratorContext context;
 
   public DockerComposeGenerator(LFGeneratorContext context) {
diff --git a/core/src/main/java/org/lflang/generator/DockerData.java b/core/src/main/java/org/lflang/generator/DockerData.java
index 850670f387..181c7fd745 100644
--- a/core/src/main/java/org/lflang/generator/DockerData.java
+++ b/core/src/main/java/org/lflang/generator/DockerData.java
@@ -19,9 +19,14 @@ public class DockerData {
 
   /** The name of the service. */
   public final String serviceName;
+
   private final LFGeneratorContext context;
 
-  public DockerData(String serviceName, Path dockerFilePath, String dockerFileContent, LFGeneratorContext context) {
+  public DockerData(
+      String serviceName,
+      Path dockerFilePath,
+      String dockerFileContent,
+      LFGeneratorContext context) {
     this.context = context;
 
     if (!dockerFilePath.toFile().isAbsolute()) {
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 5f7f7c54e9..76af5c5c25 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -42,9 +42,9 @@
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.MainConflictChecker;
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.ast.ASTUtils;
@@ -267,7 +267,10 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
                         it, context.getFileConfig().getSrcGenBasePath(), context, messageReporter))
             .toList());
     GeneratorUtils.accommodatePhysicalActionsIfPresent(
-        allResources, getTarget().setsKeepAliveOptionAutomatically(), targetConfig, messageReporter);
+        allResources,
+        getTarget().setsKeepAliveOptionAutomatically(),
+        targetConfig,
+        messageReporter);
     // FIXME: Should the GeneratorBase pull in {@code files} from imported
     // resources?
 
@@ -658,10 +661,13 @@ private void reportIssue(StringBuilder message, Integer lineNumber, Path path, i
    * is in, and where the generated sources are to be put.
    */
   public void printInfo(LFGeneratorContext.Mode mode) {
-    messageReporter.nowhere().info(
-        "Generating code for: " + context.getFileConfig().resource.getURI().toString());
+    messageReporter
+        .nowhere()
+        .info("Generating code for: " + context.getFileConfig().resource.getURI().toString());
     messageReporter.nowhere().info("******** mode: " + mode);
-    messageReporter.nowhere().info("******** generated sources: " + context.getFileConfig().getSrcGenPath());
+    messageReporter
+        .nowhere()
+        .info("******** generated sources: " + context.getFileConfig().getSrcGenPath());
   }
 
   /** Get the buffer type used for network messages */
diff --git a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
index b32777b1af..7e9575b219 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
@@ -33,8 +33,8 @@
 import java.util.List;
 import java.util.Objects;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.util.LFCommand;
 
 /**
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index 8fd9b09524..09cf940fb3 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -10,8 +10,8 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
diff --git a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
index 6030ccc1fd..fedfcb6d36 100644
--- a/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
+++ b/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
@@ -66,7 +66,8 @@ public HumanReadableReportingStrategy(
   }
 
   @Override
-  public void report(String validationOutput, MessageReporter messageReporter, Map<Path, CodeMap> map) {
+  public void report(
+      String validationOutput, MessageReporter messageReporter, Map<Path, CodeMap> map) {
     Iterator<String> it = validationOutput.lines().iterator();
     while (it.hasNext() || bufferedLine != null) {
       if (bufferedLine != null) {
diff --git a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
index 9c229e17e9..41ad7a4c3d 100644
--- a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
+++ b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
@@ -17,8 +17,8 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.eclipse.xtext.validation.Issue;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.generator.LFGeneratorContext.Mode;
 
 /**
diff --git a/core/src/main/java/org/lflang/generator/LFGenerator.java b/core/src/main/java/org/lflang/generator/LFGenerator.java
index 0647fbd31d..261a615b91 100644
--- a/core/src/main/java/org/lflang/generator/LFGenerator.java
+++ b/core/src/main/java/org/lflang/generator/LFGenerator.java
@@ -2,7 +2,6 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Injector;
-
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -11,8 +10,8 @@
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 import org.eclipse.xtext.generator.IGeneratorContext;
 import org.eclipse.xtext.util.RuntimeIOException;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedASTUtils;
@@ -88,7 +87,7 @@ private GeneratorBase createGenerator(LFGeneratorContext context) {
 
   @Override
   public void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorContext context) {
-    assert injector!=null;
+    assert injector != null;
     final LFGeneratorContext lfContext;
     if (context instanceof LFGeneratorContext) {
       lfContext = (LFGeneratorContext) context;
diff --git a/core/src/main/java/org/lflang/generator/LFGeneratorContext.java b/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
index 1ad1400b10..cc3b41c6c1 100644
--- a/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
+++ b/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
@@ -6,8 +6,8 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 import org.eclipse.xtext.generator.IGeneratorContext;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 
 /**
diff --git a/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java b/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java
index e5f74983b0..0fd51333b1 100644
--- a/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java
+++ b/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.Diagnostic;
@@ -15,7 +14,6 @@
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
-
 import org.lflang.MessageReporterBase;
 import org.lflang.util.FileUtil;
 
diff --git a/core/src/main/java/org/lflang/generator/MainContext.java b/core/src/main/java/org/lflang/generator/MainContext.java
index c724c37dba..7357929c06 100644
--- a/core/src/main/java/org/lflang/generator/MainContext.java
+++ b/core/src/main/java/org/lflang/generator/MainContext.java
@@ -9,8 +9,8 @@
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.util.RuntimeIOException;
 import org.lflang.DefaultMessageReporter;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.generator.IntegratedBuilder.ReportProgress;
 
diff --git a/core/src/main/java/org/lflang/generator/SubContext.java b/core/src/main/java/org/lflang/generator/SubContext.java
index 1620e10bc7..9c2bb24e5c 100644
--- a/core/src/main/java/org/lflang/generator/SubContext.java
+++ b/core/src/main/java/org/lflang/generator/SubContext.java
@@ -2,8 +2,8 @@
 
 import java.util.Properties;
 import org.eclipse.xtext.util.CancelIndicator;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 
 /**
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 6fb049ca16..7b6cb006c2 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -31,8 +31,8 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty.Platform;
 import org.lflang.generator.CodeBuilder;
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index baee9a7f39..681432b21b 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -33,8 +33,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.Platform;
@@ -171,10 +171,12 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
       }
 
       if (makeReturnCode == 0 && build.getErrors().length() == 0) {
-        messageReporter.nowhere().info(
-            "SUCCESS: Compiling generated code for "
-                + fileConfig.name
-                + " finished with no errors.");
+        messageReporter
+            .nowhere()
+            .info(
+                "SUCCESS: Compiling generated code for "
+                    + fileConfig.name
+                    + " finished with no errors.");
       }
 
       if (targetConfig.platformOptions.platform == Platform.ZEPHYR
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index db7a700845..d842ecb2dd 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -477,20 +477,23 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         context.finish(GeneratorResult.Status.COMPILED, null);
       } else {
         messageReporter.nowhere().info("********");
-        messageReporter.nowhere().info(
-            "To compile your program, run the following command to see information about the board"
-                + " you plugged in:\n\n"
-                + "\tarduino-cli board list\n\n"
-                + "Grab the FQBN and PORT from the command and run the following command in the"
-                + " generated sources directory:\n\n"
-                + "\tarduino-cli compile -b <FQBN> --build-property"
-                + " compiler.c.extra_flags='-DLF_UNTHREADED -DPLATFORM_ARDUINO"
-                + " -DINITIAL_EVENT_QUEUE_SIZE=10 -DINITIAL_REACT_QUEUE_SIZE=10' --build-property"
-                + " compiler.cpp.extra_flags='-DLF_UNTHREADED -DPLATFORM_ARDUINO"
-                + " -DINITIAL_EVENT_QUEUE_SIZE=10 -DINITIAL_REACT_QUEUE_SIZE=10' .\n\n"
-                + "To flash/upload your generated sketch to the board, run the following command in"
-                + " the generated sources directory:\n\n"
-                + "\tarduino-cli upload -b <FQBN> -p <PORT>\n");
+        messageReporter
+            .nowhere()
+            .info(
+                "To compile your program, run the following command to see information about the"
+                    + " board you plugged in:\n\n"
+                    + "\tarduino-cli board list\n\n"
+                    + "Grab the FQBN and PORT from the command and run the following command in the"
+                    + " generated sources directory:\n\n"
+                    + "\tarduino-cli compile -b <FQBN> --build-property"
+                    + " compiler.c.extra_flags='-DLF_UNTHREADED -DPLATFORM_ARDUINO"
+                    + " -DINITIAL_EVENT_QUEUE_SIZE=10 -DINITIAL_REACT_QUEUE_SIZE=10'"
+                    + " --build-property compiler.cpp.extra_flags='-DLF_UNTHREADED"
+                    + " -DPLATFORM_ARDUINO -DINITIAL_EVENT_QUEUE_SIZE=10"
+                    + " -DINITIAL_REACT_QUEUE_SIZE=10' .\n\n"
+                    + "To flash/upload your generated sketch to the board, run the following"
+                    + " command in the generated sources directory:\n\n"
+                    + "\tarduino-cli upload -b <FQBN> -p <PORT>\n");
         // System.out.println("For a list of all boards installed on your computer, you can use the
         // following command:\n\n\tarduino-cli board listall\n");
         context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, null));
@@ -1961,19 +1964,24 @@ protected void setUpGeneralParameters() {
         && (targetConfig.platformOptions.board == null
             || !targetConfig.platformOptions.board.contains("mbed"))) {
       // non-MBED boards should not use threading
-      messageReporter.nowhere().info(
-          "Threading is incompatible on your current Arduino flavor. Setting threading to false.");
+      messageReporter
+          .nowhere()
+          .info(
+              "Threading is incompatible on your current Arduino flavor. Setting threading to"
+                  + " false.");
       targetConfig.threading = false;
     }
 
     if (targetConfig.platformOptions.platform == Platform.ARDUINO
         && !targetConfig.noCompile
         && targetConfig.platformOptions.board == null) {
-      messageReporter.nowhere().info(
-          "To enable compilation for the Arduino platform, you must specify the fully-qualified"
-              + " board name (FQBN) in the target property. For example, platform: {name: arduino,"
-              + " board: arduino:avr:leonardo}. Entering \"no-compile\" mode and generating target"
-              + " code only.");
+      messageReporter
+          .nowhere()
+          .info(
+              "To enable compilation for the Arduino platform, you must specify the fully-qualified"
+                  + " board name (FQBN) in the target property. For example, platform: {name:"
+                  + " arduino, board: arduino:avr:leonardo}. Entering \"no-compile\" mode and"
+                  + " generating target code only.");
       targetConfig.noCompile = true;
     }
 
diff --git a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
index c8a16546ae..9d82b8f640 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
@@ -9,8 +9,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.lflang.MessageReporter;
 import org.lflang.InferredType;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.extensions.CExtensionUtils;
diff --git a/core/src/main/java/org/lflang/generator/c/CUtil.java b/core/src/main/java/org/lflang/generator/c/CUtil.java
index 194e6887e1..c2c04e7a2f 100644
--- a/core/src/main/java/org/lflang/generator/c/CUtil.java
+++ b/core/src/main/java/org/lflang/generator/c/CUtil.java
@@ -33,9 +33,9 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.InferredType;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.ActionInstance;
diff --git a/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
index a39b38b619..c65d4ad3de 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
@@ -214,7 +214,10 @@ public static String generateFunction(String header, String init, Code code, Str
    *  We will use as a format string, "(O...O)" where the number of O's is equal to the length of the list.
    */
   private static String generateCPythonInitializers(
-      Reaction reaction, ReactorDecl decl, List<String> pyObjects, MessageReporter messageReporter) {
+      Reaction reaction,
+      ReactorDecl decl,
+      List<String> pyObjects,
+      MessageReporter messageReporter) {
     Set<Action> actionsAsTriggers = new LinkedHashSet<>();
     Reactor reactor = ASTUtils.toDefinition(decl);
     CodeBuilder code = new CodeBuilder();
diff --git a/core/src/main/java/org/lflang/generator/python/PythonValidator.java b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
index 9f9d76339e..8dedb2f9d6 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonValidator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonValidator.java
@@ -15,8 +15,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.lsp4j.DiagnosticSeverity;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.DiagnosticReporting;
 import org.lflang.generator.DiagnosticReporting.Strategy;
diff --git a/core/src/main/java/org/lflang/util/ArduinoUtil.java b/core/src/main/java/org/lflang/util/ArduinoUtil.java
index 9844195cb8..13f854f9c7 100644
--- a/core/src/main/java/org/lflang/util/ArduinoUtil.java
+++ b/core/src/main/java/org/lflang/util/ArduinoUtil.java
@@ -6,8 +6,8 @@
 import java.io.IOException;
 import java.util.List;
 import org.eclipse.xtext.xbase.lib.Exceptions;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.generator.GeneratorCommandFactory;
 import org.lflang.generator.LFGeneratorContext;
@@ -116,8 +116,12 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
     } catch (IOException e) {
       Exceptions.sneakyThrow(e);
     }
-    messageReporter.nowhere().info(
-        "SUCCESS: Compiling generated code for " + fileConfig.name + " finished with no errors.");
+    messageReporter
+        .nowhere()
+        .info(
+            "SUCCESS: Compiling generated code for "
+                + fileConfig.name
+                + " finished with no errors.");
     if (targetConfig.platformOptions.flash) {
       if (targetConfig.platformOptions.port != null) {
         messageReporter.nowhere().info("Invoking flash command for Arduino");
@@ -147,13 +151,15 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
       }
     } else {
       messageReporter.nowhere().info("********");
-      messageReporter.nowhere().info(
-          "To flash your program, run the following command to see information about the board you"
-              + " plugged in:\n\n"
-              + "\tarduino-cli board list\n\n"
-              + "Grab the FQBN and PORT from the command and run the following command in the"
-              + " generated sources directory:\n\n"
-              + "\tarduino-cli upload -b <FQBN> -p <PORT>\n");
+      messageReporter
+          .nowhere()
+          .info(
+              "To flash your program, run the following command to see information about the board"
+                  + " you plugged in:\n\n"
+                  + "\tarduino-cli board list\n\n"
+                  + "Grab the FQBN and PORT from the command and run the following command in the"
+                  + " generated sources directory:\n\n"
+                  + "\tarduino-cli upload -b <FQBN> -p <PORT>\n");
     }
   }
 }
diff --git a/core/src/main/java/org/lflang/util/FileUtil.java b/core/src/main/java/org/lflang/util/FileUtil.java
index 1d72a55ad2..063e383df8 100644
--- a/core/src/main/java/org/lflang/util/FileUtil.java
+++ b/core/src/main/java/org/lflang/util/FileUtil.java
@@ -33,8 +33,8 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.util.RuntimeIOException;
-import org.lflang.MessageReporter;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 
 public class FileUtil {
 
@@ -715,7 +715,8 @@ public static boolean isCFile(Path path) {
    * @param messageReporter Error reporter
    * @throws IOException If the given set of files cannot be relativized.
    */
-  public static void relativeIncludeHelper(Path dir, Path includePath, MessageReporter messageReporter) throws IOException {
+  public static void relativeIncludeHelper(
+      Path dir, Path includePath, MessageReporter messageReporter) throws IOException {
     messageReporter.nowhere().info("Relativizing all includes in " + dir.toString());
     List<Path> includePaths =
         Files.walk(includePath)

From 5ece3e12fa6598fbdeec7486add7ff28afa65d45 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 16 Jun 2023 12:15:18 -0700
Subject: [PATCH 0383/1114] Sometimes put suffix list delimiter on same line.

---
 core/src/main/java/org/lflang/ast/ToLf.java | 40 +++++++++++----------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 7123a352b9..e3927a2398 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -100,7 +100,7 @@ private ToLf() {
   @Override
   public MalleableString caseArraySpec(ArraySpec spec) {
     if (spec.isOfVariableLength()) return MalleableString.anyOf("[]");
-    return list("", "[", "]", false, false, spec.getLength());
+    return list("", "[", "]", false, false, true, spec.getLength());
   }
 
   @Override
@@ -308,7 +308,7 @@ public MalleableString caseType(Type type) {
     } else if (type.getId() != null) {
       msb.append(type.getId()); // TODO: Multiline dottedName?
       if (type.getTypeArgs() != null) {
-        msb.append(list(", ", "<", ">", true, false, type.getTypeArgs()));
+        msb.append(list(", ", "<", ">", true, false, true, type.getTypeArgs()));
       }
       msb.append("*".repeat(type.getStars().size()));
     }
@@ -362,7 +362,7 @@ public MalleableString caseImport(Import object) {
     return new Builder()
         .append("import ")
         // TODO: This is a place where we can use conditional parentheses.
-        .append(list(", ", "", "", false, true, object.getReactorClasses()))
+        .append(list(", ", "", "", false, true, true, object.getReactorClasses()))
         .append(" from \"")
         .append(object.getImportURI())
         .append("\"")
@@ -444,7 +444,7 @@ private MalleableString reactorHeader(Reactor object) {
     if (object.isRealtime()) msb.append("realtime ");
     msb.append("reactor");
     if (object.getName() != null) msb.append(" ").append(object.getName());
-    msb.append(list(", ", "<", ">", true, false, object.getTypeParms()));
+    msb.append(list(", ", "<", ">", true, false, true, object.getTypeParms()));
     msb.append(list(true, object.getParameters()));
     if (object.getHost() != null) msb.append(" at ").append(doSwitch(object.getHost()));
     if (object.getSuperClasses() != null && !object.getSuperClasses().isEmpty()) {
@@ -619,7 +619,7 @@ public MalleableString caseReaction(Reaction object) {
       msb.append("reaction");
     }
     msb.append(list(true, object.getTriggers()));
-    msb.append(list(", ", " ", "", true, false, object.getSources()));
+    msb.append(list(", ", " ", "", true, false, true, object.getSources()));
     if (!object.getEffects().isEmpty()) {
       List<Mode> allModes = ASTUtils.allModes(ASTUtils.getEnclosingReactor(object));
       msb.append(" -> ", " ->\n")
@@ -737,7 +737,7 @@ public MalleableString caseInstantiation(Instantiation object) {
     msb.append(object.getName()).append(" = new");
     if (object.getWidthSpec() != null) msb.append(doSwitch(object.getWidthSpec()));
     msb.append(" ").append(object.getReactorClass().getName());
-    msb.append(list(", ", "<", ">", true, false, object.getTypeArgs()));
+    msb.append(list(", ", "<", ">", true, false, true, object.getTypeArgs()));
     msb.append(list(false, object.getParameters()));
     // TODO: Delete the following case when the corresponding feature is removed
     if (object.getHost() != null) msb.append(" at ").append(doSwitch(object.getHost())).append(";");
@@ -788,10 +788,10 @@ public MalleableString caseConnection(Connection object) {
 
   private MalleableString minimallyDelimitedList(List<? extends EObject> items) {
     return MalleableString.anyOf(
-        list(", ", " ", "", true, true, items),
+        list(", ", " ", "", true, true, true, items),
         new Builder()
             .append(String.format("%n"))
-            .append(list(String.format(",%n"), "", "", true, true, items).indent())
+            .append(list(String.format(",%n"), "", "", true, true, true, items).indent())
             .get());
   }
 
@@ -809,7 +809,7 @@ public MalleableString caseKeyValuePairs(KeyValuePairs object) {
     }
     return new Builder()
         .append("{\n")
-        .append(list(",\n", "", "\n", true, true, object.getPairs()).indent())
+        .append(list(",\n", "", "\n", true, true, false, object.getPairs()).indent())
         .append("}")
         .get();
   }
@@ -829,7 +829,7 @@ public MalleableString caseBracedListExpression(BracedListExpression object) {
   private MalleableString bracedListExpression(List<Expression> items) {
     // Note that this strips the trailing comma. There is no way
     // to implement trailing commas with the current set of list() methods AFAIU.
-    return list(", ", "{", "}", false, false, items);
+    return list(", ", "{", "}", false, false, true, items);
   }
 
   @Override
@@ -845,7 +845,7 @@ public MalleableString caseKeyValuePair(KeyValuePair object) {
   @Override
   public MalleableString caseArray(Array object) {
     // '[' elements+=Element (',' (elements+=Element))* ','? ']'
-    return list(", ", "[", "]", false, false, object.getElements());
+    return list(", ", "[", "]", false, false, true, object.getElements());
   }
 
   @Override
@@ -924,7 +924,7 @@ public MalleableString caseInitializer(Initializer init) {
       prefix = "(";
       suffix = ")";
     }
-    return list(", ", prefix, suffix, false, false, init.getExprs());
+    return list(", ", prefix, suffix, false, false, true, init.getExprs());
   }
 
   @Override
@@ -961,7 +961,7 @@ public MalleableString casePort(Port object) {
   public MalleableString caseWidthSpec(WidthSpec object) {
     // ofVariableLength?='[]' | '[' (terms+=WidthTerm) ('+' terms+=WidthTerm)* ']';
     if (object.isOfVariableLength()) return MalleableString.anyOf("[]");
-    return list(" + ", "[", "]", false, false, object.getTerms());
+    return list(" + ", "[", "]", false, false, true, object.getTerms());
   }
 
   @Override
@@ -1025,6 +1025,7 @@ private <E extends EObject> MalleableString list(
       String suffix,
       boolean nothingIfEmpty,
       boolean whitespaceRigid,
+      boolean suffixSameLine,
       List<E> items) {
     return list(
         separator,
@@ -1032,6 +1033,7 @@ private <E extends EObject> MalleableString list(
         suffix,
         nothingIfEmpty,
         whitespaceRigid,
+        suffixSameLine,
         (Object[]) items.toArray(EObject[]::new));
   }
 
@@ -1041,9 +1043,10 @@ private MalleableString list(
       String suffix,
       boolean nothingIfEmpty,
       boolean whitespaceRigid,
+      boolean suffixSameLine,
       Object... items) {
-    if (nothingIfEmpty && Arrays.stream(items).allMatch(Objects::isNull)) {
-      return MalleableString.anyOf("");
+    if (Arrays.stream(items).allMatch(Objects::isNull)) {
+      return MalleableString.anyOf(nothingIfEmpty ? "" : prefix + suffix);
     }
     MalleableString rigid =
         Arrays.stream(items)
@@ -1057,21 +1060,22 @@ private MalleableString list(
                 })
             .collect(new Joiner(separator, prefix, suffix));
     if (whitespaceRigid) return rigid;
+    var rigidList = list(separator.strip() + "\n", "", suffixSameLine ? "" : "\n", nothingIfEmpty, true, suffixSameLine, items);
     return MalleableString.anyOf(
         rigid,
         new Builder()
             .append(prefix.stripTrailing() + "\n")
-            .append(list(separator.strip() + "\n", "", "\n", nothingIfEmpty, true, items).indent())
+            .append(suffixSameLine ? rigidList.indent().indent() : rigidList.indent())
             .append(suffix.stripLeading())
             .get());
   }
 
   private <E extends EObject> MalleableString list(boolean nothingIfEmpty, EList<E> items) {
-    return list(", ", "(", ")", nothingIfEmpty, false, items);
+    return list(", ", "(", ")", nothingIfEmpty, false, true, items);
   }
 
   private MalleableString list(boolean nothingIfEmpty, Object... items) {
-    return list(", ", "(", ")", nothingIfEmpty, false, items);
+    return list(", ", "(", ")", nothingIfEmpty, false, true, items);
   }
 
   private MalleableString typeAnnotationFor(Type type) {

From 89066fd2dfaa87ca5e665eba5e963c7ca0d8f42c Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 16 Jun 2023 12:17:06 -0700
Subject: [PATCH 0384/1114] Do not always surround = with spaces.

---
 .../test/java/org/lflang/cli/LffCliTest.java  |  9 ++--
 .../java/org/lflang/ast/MalleableString.java  | 43 ++++++++++++++++---
 core/src/main/java/org/lflang/ast/ToLf.java   | 25 ++++++++---
 3 files changed, 61 insertions(+), 16 deletions(-)

diff --git a/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java b/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
index 27c43c80cc..4941a81046 100644
--- a/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
+++ b/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
@@ -119,7 +119,7 @@ reactor Filter(period: int = 0, b: double[] = {0, 0}) {
                   }
 
                   main reactor {
-                    az_f = new Filter(period = 100, b = {0.229019233988375, 0.421510777305010})
+                    az_f = new Filter(period=100, b = {0.229019233988375, 0.421510777305010})
                   }
                   """),
           List.of(
@@ -165,10 +165,9 @@ reactor Filter(period: int = 0, b: double[] = {0, 0}) {
 
                   reactor MACService {
                     mul_cm = new ContextManager<
-                      loooooooooooooooooooooooooooooong,
-                      looooooooooooooong,
-                      loooooooooooooong
-                    >()
+                        loooooooooooooooooooooooooooooong,
+                        looooooooooooooong,
+                        loooooooooooooong>()
                   }
                   """));
 
diff --git a/core/src/main/java/org/lflang/ast/MalleableString.java b/core/src/main/java/org/lflang/ast/MalleableString.java
index ac4014748d..a0c6646c99 100644
--- a/core/src/main/java/org/lflang/ast/MalleableString.java
+++ b/core/src/main/java/org/lflang/ast/MalleableString.java
@@ -91,6 +91,9 @@ public static MalleableString anyOf(Object... possibilities) {
     return new Leaf(objectArrayToString(possibilities));
   }
 
+  /** Apply the given transformation to leaf strings of this. */
+  public abstract MalleableString transform(Function<String, String> transformation);
+
   private static String[] objectArrayToString(Object[] objects) {
     String[] ret = new String[objects.length];
     for (int i = 0; i < objects.length; i++) {
@@ -407,6 +410,14 @@ private boolean optimizeChildren(
                       providedRender, badness, width, indentation, singleLineCommentPrefix));
     }
 
+    @Override
+    public MalleableString transform(Function<String, String> transformation) {
+      for (var component : components) {
+        component.transform(transformation);
+      }
+      return this;
+    }
+
     @Override
     public boolean isEmpty() {
       return components.stream().allMatch(MalleableString::isEmpty);
@@ -468,6 +479,12 @@ public RenderResult render(
               .replaceAll("(?<=\n|^)(?=\\h*\\S)", " ".repeat(indentation)),
           result.levelsOfCommentDisplacement());
     }
+
+    @Override
+    public MalleableString transform(Function<String, String> transformation) {
+      nested.transform(transformation);
+      return this;
+    }
   }
 
   /** Represent a {@code MalleableString} that admits multiple possible representations. */
@@ -549,28 +566,36 @@ public RenderResult render(
               sourceEObject != null ? sourceEObject : enclosingEObject)
           .with(comments.stream());
     }
+
+    @Override
+    public MalleableString transform(Function<String, String> transformation) {
+      for (var possibility : possibilities) {
+        possibility.transform(transformation);
+      }
+      return this;
+    }
   }
 
   /** A {@code Leaf} can be represented by multiple possible {@code String}s. */
   private static final class Leaf extends MalleableStringWithAlternatives<String> {
-    private final ImmutableList<String> possibilities;
+    private final String[] possibilities;
 
     private Leaf(String[] possibilities) {
-      this.possibilities = ImmutableList.copyOf(possibilities);
+      this.possibilities = possibilities;
     }
 
     private Leaf(String possibility) {
-      this.possibilities = ImmutableList.of(possibility);
+      this.possibilities = new String[]{possibility};
     }
 
     @Override
     protected List<String> getPossibilities() {
-      return this.possibilities;
+      return Arrays.asList(possibilities);
     }
 
     @Override
     public boolean isEmpty() {
-      return possibilities.stream().allMatch(String::isEmpty);
+      return Arrays.stream(possibilities).allMatch(String::isEmpty);
     }
 
     @Override
@@ -586,5 +611,13 @@ public RenderResult render(
               : getChosenPossibility(),
           0);
     }
+
+    @Override
+    public MalleableString transform(Function<String, String> transformation) {
+      for (int i = 0; i < possibilities.length; i++) {
+        possibilities[i] = transformation.apply(possibilities[i]);
+      }
+      return this;
+    }
   }
 }
diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index e3927a2398..471566424f 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -489,7 +489,7 @@ public MalleableString caseStateVar(StateVar object) {
     }
     msb.append("state ").append(object.getName());
     msb.append(typeAnnotationFor(object.getType()));
-    if (object.getInit() != null) msb.append(doSwitch(object.getInit()));
+    if (object.getInit() != null) msb.append(doSwitch(object.getInit()).transform(ToLf::whitespaceInitializer));
 
     return msb.get();
   }
@@ -886,7 +886,8 @@ public MalleableString caseAssignment(Assignment object) {
     // ));
     Builder msb = new Builder();
     msb.append(object.getLhs().getName());
-    msb.append(doSwitch(object.getRhs()));
+    var rhs = doSwitch(object.getRhs());
+    msb.append(rhs.transform(conditionalWhitespaceInitializer(MalleableString.anyOf(""), rhs)));
     return msb.get();
   }
 
@@ -907,12 +908,12 @@ public MalleableString caseInitializer(Initializer init) {
     if (shouldOutputAsAssignment(init)) {
       Expression expr = ASTUtils.asSingleExpr(init);
       Objects.requireNonNull(expr);
-      return new Builder().append(" = ").append(doSwitch(expr)).get();
+      return new Builder().append("=").append(doSwitch(expr)).get();
     }
     if (ASTUtils.getTarget(init) == Target.C) {
       // This turns C array initializers into a braced expression.
       // C++ variants are not converted.
-      return new Builder().append(" = ").append(bracedListExpression(init.getExprs())).get();
+      return new Builder().append("=").append(bracedListExpression(init.getExprs())).get();
     }
     String prefix;
     String suffix;
@@ -935,13 +936,25 @@ public MalleableString caseParameter(Parameter object) {
     // )?
     var builder = new Builder();
     addAttributes(builder, object::getAttributes);
+    var annotation = typeAnnotationFor(object.getType());
+    var init = doSwitch(object.getInit());
     return builder
         .append(object.getName())
-        .append(typeAnnotationFor(object.getType()))
-        .append(doSwitch(object.getInit()))
+        .append(annotation)
+        .append(init.transform(conditionalWhitespaceInitializer(annotation, init)))
         .get();
   }
 
+  /** Ensure that equals signs are surrounded by spaces if neither the text before nor the text after has spaces and is not a string. */
+  private static Function<String, String> conditionalWhitespaceInitializer(MalleableString before, MalleableString after) {
+    return it -> before.isEmpty() && !(after.toString().contains(" ") || after.toString().startsWith("\"")) ? it : whitespaceInitializer(it);
+  }
+
+  /** Ensure that equals signs are surrounded by spaces. */
+  private static String whitespaceInitializer(String s) {
+    return s.replaceAll("(?<! )=(?! )", " = ");
+  }
+
   @Override
   public MalleableString caseExpression(Expression object) {
     // {Literal} literal = Literal

From d969c2b67bc8e4b911896f2744cb491d437f86dc Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 16 Jun 2023 12:18:32 -0700
Subject: [PATCH 0385/1114] Reformat tests.

---
 test/C/src/ArrayAsParameter.lf                |  2 +-
 test/C/src/ArrayFree.lf                       |  2 +-
 test/C/src/ArrayFreeMultiple.lf               |  2 +-
 test/C/src/ArrayParallel.lf                   |  6 +--
 test/C/src/ArrayScale.lf                      |  2 +-
 test/C/src/CountSelf.lf                       |  2 +-
 test/C/src/CountTest.lf                       |  2 +-
 test/C/src/Hello.lf                           |  2 +-
 test/C/src/NativeListsAndTimes.lf             | 14 ++---
 test/C/src/ParameterHierarchy.lf              |  6 +--
 test/C/src/RepeatedInheritance.lf             |  2 +-
 test/C/src/Stride.lf                          |  2 +-
 test/C/src/StructParallel.lf                  |  6 +--
 test/C/src/StructScale.lf                     |  2 +-
 test/C/src/TimeLimit.lf                       |  2 +-
 test/C/src/concurrent/HelloThreaded.lf        |  2 +-
 test/C/src/concurrent/ScheduleAt.lf           | 52 +++++++++----------
 test/C/src/concurrent/Threaded.lf             |  2 +-
 test/C/src/concurrent/ThreadedMultiport.lf    |  6 +--
 test/C/src/concurrent/ThreadedThreaded.lf     |  2 +-
 test/C/src/concurrent/TimeLimitThreaded.lf    |  2 +-
 test/C/src/concurrent/Tracing.lf              |  2 +-
 test/C/src/federated/ChainWithDelay.lf        |  2 +-
 test/C/src/federated/DecentralizedP2PComm.lf  |  4 +-
 .../DecentralizedP2PUnbalancedTimeout.lf      |  2 +-
 ...centralizedP2PUnbalancedTimeoutPhysical.lf |  2 +-
 .../DistributedCountPhysicalAfterDelay.lf     |  2 +-
 .../DistributedLogicalActionUpstreamLong.lf   |  2 +-
 .../DistributedLoopedActionDecentralized.lf   | 13 +++--
 .../DistributedPhysicalActionUpstream.lf      |  2 +-
 .../DistributedPhysicalActionUpstreamLong.lf  |  2 +-
 test/C/src/federated/DistributedStop.lf       |  4 +-
 test/C/src/federated/LevelPattern.lf          |  2 +-
 .../federated/LoopDistributedCentralized.lf   |  2 +-
 .../federated/LoopDistributedCentralized2.lf  |  2 +-
 ...oopDistributedCentralizedPhysicalAction.lf |  2 +-
 .../LoopDistributedCentralizedPrecedence.lf   |  2 +-
 ...stributedCentralizedPrecedenceHierarchy.lf |  4 +-
 .../federated/LoopDistributedDecentralized.lf |  2 +-
 test/C/src/federated/LoopDistributedDouble.lf |  2 +-
 test/C/src/federated/ParallelDestinations.lf  |  4 +-
 test/C/src/federated/ParallelSources.lf       |  4 +-
 .../src/federated/ParallelSourcesMultiport.lf |  8 +--
 test/C/src/federated/PingPongDistributed.lf   |  4 +-
 .../federated/PingPongDistributedPhysical.lf  |  4 +-
 test/C/src/generics/TypeCheck.lf              |  2 +-
 test/C/src/modal_models/ModalAfter.lf         |  8 +--
 test/C/src/modal_models/util/TraceTesting.lf  |  9 ++--
 test/C/src/multiport/BankIndexInitializer.lf  |  2 +-
 test/C/src/multiport/BankMulticast.lf         |  4 +-
 test/C/src/multiport/BankToBankMultiport.lf   |  4 +-
 .../src/multiport/BankToBankMultiportAfter.lf |  4 +-
 test/C/src/multiport/BankToMultiport.lf       |  2 +-
 .../C/src/multiport/BroadcastMultipleAfter.lf |  6 +--
 test/C/src/multiport/FullyConnected.lf        |  2 +-
 .../multiport/FullyConnectedAddressable.lf    |  4 +-
 .../FullyConnectedAddressableAfter.lf         |  4 +-
 test/C/src/multiport/MultiportFromBank.lf     |  4 +-
 .../multiport/MultiportFromBankHierarchy.lf   |  6 +--
 .../MultiportFromBankHierarchyAfter.lf        |  4 +-
 .../C/src/multiport/MultiportFromHierarchy.lf |  8 +--
 test/C/src/multiport/MultiportFromReaction.lf |  2 +-
 .../src/multiport/MultiportInParameterized.lf |  2 +-
 test/C/src/multiport/MultiportMutableInput.lf |  2 +-
 .../multiport/MultiportMutableInputArray.lf   |  2 +-
 test/C/src/multiport/MultiportToBank.lf       |  2 +-
 test/C/src/multiport/MultiportToBankAfter.lf  |  2 +-
 .../src/multiport/MultiportToBankHierarchy.lf |  4 +-
 test/C/src/multiport/MultiportToHierarchy.lf  |  4 +-
 test/C/src/multiport/MultiportToMultiport.lf  |  4 +-
 test/C/src/multiport/MultiportToMultiport2.lf |  6 +--
 .../multiport/MultiportToMultiport2After.lf   |  6 +--
 .../MultiportToMultiportParameter.lf          |  4 +-
 test/C/src/multiport/MultiportToPort.lf       |  2 +-
 test/C/src/multiport/MultiportToReaction.lf   |  2 +-
 test/C/src/multiport/NestedBanks.lf           |  6 +--
 .../C/src/multiport/NestedInterleavedBanks.lf |  2 +-
 .../src/multiport/ReactionToContainedBank.lf  |  2 +-
 .../src/multiport/ReactionToContainedBank2.lf |  6 +--
 .../ReactionToContainedBankMultiport.lf       |  2 +-
 test/C/src/multiport/ReactionsToNested.lf     |  4 +-
 test/C/src/multiport/Sparse.lf                |  4 +-
 test/C/src/multiport/SparseFallback.lf        |  4 +-
 test/C/src/no_inlining/CountHierarchy.lf      |  2 +-
 .../MultiportToReactionNoInlining.lf          |  2 +-
 test/C/src/target/CMakeInclude.lf             |  5 +-
 test/C/src/token/TokenMutable.lf              |  8 +--
 test/C/src/token/TokenSourceScalePrint.lf     |  4 +-
 test/Cpp/src/ArrayParallel.lf                 |  6 +--
 test/Cpp/src/ArrayScale.lf                    |  4 +-
 test/Cpp/src/Hello.lf                         |  2 +-
 test/Cpp/src/NativeListsAndTimes.lf           | 15 +++---
 test/Cpp/src/ParameterHierarchy.lf            |  4 +-
 test/Cpp/src/ParameterizedState.lf            |  2 +-
 test/Cpp/src/ParametersOutOfOrder.lf          |  2 +-
 test/Cpp/src/Stride.lf                        |  2 +-
 test/Cpp/src/StructParallel.lf                |  6 +--
 test/Cpp/src/StructScale.lf                   |  2 +-
 test/Cpp/src/TimeLimit.lf                     |  2 +-
 test/Cpp/src/Timeout_Test.lf                  |  2 +-
 test/Cpp/src/concurrent/HelloThreaded.lf      |  2 +-
 test/Cpp/src/concurrent/TimeLimitThreaded.lf  |  2 +-
 test/Cpp/src/enclave/EnclaveBank.lf           | 11 ++--
 test/Cpp/src/enclave/EnclaveBankEach.lf       | 11 ++--
 test/Cpp/src/enclave/EnclaveHelloWorld.lf     |  4 +-
 test/Cpp/src/enclave/EnclaveHierarchy.lf      |  8 +--
 .../Cpp/src/enclave/EnclaveMultiportToPort.lf |  2 +-
 .../src/enclave/EnclaveMultiportToPort2.lf    |  2 +-
 test/Cpp/src/multiport/BankToBankMultiport.lf |  4 +-
 .../src/multiport/BankToBankMultiportAfter.lf |  4 +-
 .../src/multiport/BroadcastMultipleAfter.lf   |  6 +--
 test/Cpp/src/multiport/FullyConnected.lf      |  2 +-
 .../multiport/FullyConnectedAddressable.lf    |  4 +-
 .../FullyConnectedAddressableAfter.lf         |  4 +-
 test/Cpp/src/multiport/MultiportFromBank.lf   |  2 +-
 .../Cpp/src/multiport/MultiportToHierarchy.lf |  4 +-
 .../src/multiport/MultiportToMultiport2.lf    |  6 +--
 .../multiport/MultiportToMultiport2After.lf   |  6 +--
 test/Cpp/src/multiport/MultiportToPort.lf     |  2 +-
 test/Cpp/src/multiport/WidthGivenByCode.lf    |  4 +-
 .../src/target/BraceAndParenInitialization.lf | 10 ++--
 test/Cpp/src/target/CMakeInclude.lf           |  5 +-
 .../src/target/CliParserGenericArguments.lf   | 29 +++++------
 test/Cpp/src/target/CombinedTypeNames.lf      |  2 +-
 .../src/target/GenericParameterAndState.lf    |  4 +-
 test/Cpp/src/target/InitializerSyntax.lf      | 28 +++++-----
 test/Python/src/ArrayAsType.lf                |  2 +-
 test/Python/src/ArrayFree.lf                  |  4 +-
 test/Python/src/ArrayParallel.lf              |  6 +--
 test/Python/src/ArrayPrint.lf                 |  2 +-
 test/Python/src/ArrayScale.lf                 |  4 +-
 test/Python/src/DelayArray.lf                 |  2 +-
 test/Python/src/DelayArrayWithAfter.lf        |  2 +-
 test/Python/src/DelayStruct.lf                |  2 +-
 test/Python/src/DelayStructWithAfter.lf       |  2 +-
 test/Python/src/DoubleReaction.lf             |  2 +-
 test/Python/src/Gain.lf                       |  2 +-
 test/Python/src/Hello.lf                      |  2 +-
 test/Python/src/IdentifierLength.lf           |  7 +--
 test/Python/src/NativeListsAndTimes.lf        | 14 ++---
 test/Python/src/ParameterizedState.lf         |  2 +-
 test/Python/src/PeriodicDesugared.lf          |  2 +-
 test/Python/src/PingPong.lf                   |  4 +-
 test/Python/src/SetArray.lf                   |  2 +-
 test/Python/src/Stride.lf                     |  4 +-
 test/Python/src/StructAsType.lf               |  2 +-
 test/Python/src/StructAsTypeDirect.lf         |  2 +-
 test/Python/src/StructParallel.lf             | 10 ++--
 test/Python/src/StructPrint.lf                |  2 +-
 test/Python/src/StructScale.lf                |  6 +--
 test/Python/src/SubclassesAndStartup.lf       |  4 +-
 test/Python/src/TimeLimit.lf                  |  4 +-
 test/Python/src/TimeState.lf                  |  2 +-
 test/Python/src/federated/ChainWithDelay.lf   |  2 +-
 .../src/federated/DecentralizedP2PComm.lf     |  6 +--
 .../DecentralizedP2PUnbalancedTimeout.lf      |  4 +-
 ...centralizedP2PUnbalancedTimeoutPhysical.lf |  4 +-
 .../src/federated/DistributedLoopedAction.lf  |  2 +-
 .../DistributedLoopedPhysicalAction.lf        |  4 +-
 test/Python/src/federated/DistributedStop.lf  |  4 +-
 .../federated/DistributedStructParallel.lf    |  6 +--
 .../src/federated/DistributedStructScale.lf   |  2 +-
 ...stributedCentralizedPrecedenceHierarchy.lf | 10 ++--
 .../src/federated/ParallelDestinations.lf     |  4 +-
 test/Python/src/federated/ParallelSources.lf  |  4 +-
 .../src/federated/ParallelSourcesMultiport.lf |  8 +--
 test/Python/src/federated/PhysicalSTP.lf      |  2 +-
 .../src/federated/PingPongDistributed.lf      | 10 ++--
 test/Python/src/lib/Count.lf                  |  2 +-
 test/Python/src/lib/LoopedActionSender.lf     |  2 +-
 test/Python/src/lib/TestCount.lf              |  2 +-
 test/Python/src/lib/TestCountMultiport.lf     |  2 +-
 .../src/modal_models/ConvertCaseTest.lf       |  2 +-
 test/Python/src/modal_models/ModalAfter.lf    | 12 ++---
 .../src/modal_models/util/TraceTesting.lf     |  2 +-
 .../src/multiport/BankIndexInitializer.lf     |  8 +--
 .../src/multiport/BankReactionsInContainer.lf |  2 +-
 test/Python/src/multiport/BankToBank.lf       |  6 +--
 .../src/multiport/BankToBankMultiport.lf      | 10 ++--
 .../src/multiport/BankToBankMultiportAfter.lf |  6 +--
 test/Python/src/multiport/BankToMultiport.lf  |  8 +--
 test/Python/src/multiport/Broadcast.lf        |  4 +-
 .../src/multiport/BroadcastMultipleAfter.lf   |  8 +--
 .../Python/src/multiport/MultiportFromBank.lf |  4 +-
 .../multiport/MultiportFromBankHierarchy.lf   |  2 +-
 .../src/multiport/MultiportFromReaction.lf    |  4 +-
 .../src/multiport/MultiportInParameterized.lf |  4 +-
 .../src/multiport/MultiportMutableInput.lf    |  6 +--
 .../multiport/MultiportMutableInputArray.lf   |  6 +--
 test/Python/src/multiport/MultiportToBank.lf  |  2 +-
 .../src/multiport/MultiportToBankAfter.lf     |  2 +-
 .../src/multiport/MultiportToBankHierarchy.lf |  2 +-
 .../src/multiport/MultiportToHierarchy.lf     |  4 +-
 .../src/multiport/MultiportToMultiport.lf     |  6 +--
 .../src/multiport/MultiportToMultiport2.lf    | 10 ++--
 .../multiport/MultiportToMultiport2After.lf   |  8 +--
 .../MultiportToMultiportParameter.lf          |  6 +--
 test/Python/src/multiport/MultiportToPort.lf  |  4 +-
 .../src/multiport/MultiportToReaction.lf      |  4 +-
 test/Python/src/multiport/NestedBanks.lf      | 16 +++---
 .../src/multiport/NestedInterleavedBanks.lf   |  6 +--
 .../Python/src/multiport/ReactionsToNested.lf |  6 +--
 test/Rust/src/CtorParamMixed.lf               |  2 +-
 test/Rust/src/CtorParamSimple.lf              |  2 +-
 test/Rust/src/NativeListsAndTimes.lf          | 20 +++----
 test/Rust/src/generics/CtorParamGeneric.lf    |  5 +-
 .../Rust/src/generics/CtorParamGenericInst.lf | 10 ++--
 .../src/multiport/ConnectionToSelfBank.lf     |  2 +-
 .../multiport/ConnectionToSelfMultiport.lf    |  2 +-
 test/Rust/src/multiport/FullyConnected.lf     |  2 +-
 .../multiport/FullyConnectedAddressable.lf    |  4 +-
 test/Rust/src/multiport/MultiportFromBank.lf  |  2 +-
 .../src/multiport/MultiportToMultiport2.lf    |  6 +--
 test/Rust/src/multiport/WidthWithParameter.lf |  2 +-
 test/TypeScript/src/ArrayScale.lf             |  2 +-
 test/TypeScript/src/Hello.lf                  |  2 +-
 test/TypeScript/src/NativeListsAndTimes.lf    | 14 ++---
 test/TypeScript/src/Stride.lf                 |  2 +-
 test/TypeScript/src/StructScale.lf            |  2 +-
 test/TypeScript/src/TimeLimit.lf              |  2 +-
 .../src/federated/ChainWithDelay.lf           |  2 +-
 .../src/federated/DistributedStop.lf          |  4 +-
 .../TypeScript/src/multiport/BankMulticast.lf |  4 +-
 .../src/multiport/BankToBankMultiport.lf      |  4 +-
 .../src/multiport/BankToBankMultiportAfter.lf |  4 +-
 .../src/multiport/BroadcastMultipleAfter.lf   |  6 +--
 .../src/multiport/FullyConnected.lf           |  2 +-
 .../src/multiport/MultiportFromBank.lf        |  2 +-
 .../MultiportFromBankHierarchyAfter.lf        |  4 +-
 .../src/multiport/MultiportFromHierarchy.lf   |  8 +--
 .../src/multiport/MultiportFromReaction.lf    |  2 +-
 .../src/multiport/MultiportInParameterized.lf |  2 +-
 .../src/multiport/MultiportMutableInput.lf    |  2 +-
 .../multiport/MultiportMutableInputArray.lf   |  2 +-
 .../src/multiport/MultiportToBankAfter.lf     |  2 +-
 .../src/multiport/MultiportToHierarchy.lf     |  4 +-
 .../src/multiport/MultiportToMultiport2.lf    |  6 +--
 .../multiport/MultiportToMultiport2After.lf   |  6 +--
 .../MultiportToMultiportParameter.lf          |  4 +-
 .../src/multiport/MultiportToPort.lf          |  2 +-
 .../src/multiport/MultiportToReaction.lf      |  2 +-
 .../src/multiport/ReactionToContainedBank.lf  |  2 +-
 .../src/multiport/ReactionsToNested.lf        |  4 +-
 243 files changed, 540 insertions(+), 556 deletions(-)

diff --git a/test/C/src/ArrayAsParameter.lf b/test/C/src/ArrayAsParameter.lf
index a513cbee9f..e50f9d636c 100644
--- a/test/C/src/ArrayAsParameter.lf
+++ b/test/C/src/ArrayAsParameter.lf
@@ -40,7 +40,7 @@ reactor Print {
 }
 
 main reactor ArrayAsParameter {
-  s = new Source(sequence = {1, 2, 3, 4}, n_sequence = 4)
+  s = new Source(sequence = {1, 2, 3, 4}, n_sequence=4)
   p = new Print()
   s.out -> p.in
 }
diff --git a/test/C/src/ArrayFree.lf b/test/C/src/ArrayFree.lf
index ced36f82f7..0286836674 100644
--- a/test/C/src/ArrayFree.lf
+++ b/test/C/src/ArrayFree.lf
@@ -24,7 +24,7 @@ main reactor ArrayFree {
   s = new Source()
   c = new Free()
   c2 = new Scale()
-  p = new Print(scale = 2)
+  p = new Print(scale=2)
   s.out -> c.in
   s.out -> c2.in
   c2.out -> p.in
diff --git a/test/C/src/ArrayFreeMultiple.lf b/test/C/src/ArrayFreeMultiple.lf
index 292f5cdb10..f10fa54867 100644
--- a/test/C/src/ArrayFreeMultiple.lf
+++ b/test/C/src/ArrayFreeMultiple.lf
@@ -40,7 +40,7 @@ main reactor ArrayFreeMultiple {
   s = new Source()
   c = new Free()
   c2 = new Scale()
-  p = new Print(scale = 2)
+  p = new Print(scale=2)
   s.out -> c.in
   s.out -> c2.in
   c2.out -> p.in
diff --git a/test/C/src/ArrayParallel.lf b/test/C/src/ArrayParallel.lf
index 3edb9c659e..635ca1f6a4 100644
--- a/test/C/src/ArrayParallel.lf
+++ b/test/C/src/ArrayParallel.lf
@@ -12,9 +12,9 @@ import Source, Print from "ArrayPrint.lf"
 main reactor ArrayParallel {
   s = new Source()
   c1 = new Scale()
-  c2 = new Scale(scale = 3)
-  p1 = new Print(scale = 2)
-  p2 = new Print(scale = 3)
+  c2 = new Scale(scale=3)
+  p1 = new Print(scale=2)
+  p2 = new Print(scale=3)
   s.out -> c1.in
   s.out -> c2.in
   c1.out -> p1.in
diff --git a/test/C/src/ArrayScale.lf b/test/C/src/ArrayScale.lf
index 06744dbcf1..5c907a1c58 100644
--- a/test/C/src/ArrayScale.lf
+++ b/test/C/src/ArrayScale.lf
@@ -23,7 +23,7 @@ reactor Scale(scale: int = 2) {
 main reactor ArrayScale {
   s = new Source()
   c = new Scale()
-  p = new Print(scale = 2)
+  p = new Print(scale=2)
   s.out -> c.in
   c.out -> p.in
 }
diff --git a/test/C/src/CountSelf.lf b/test/C/src/CountSelf.lf
index ec910c1066..703437f3ba 100644
--- a/test/C/src/CountSelf.lf
+++ b/test/C/src/CountSelf.lf
@@ -23,6 +23,6 @@ reactor CountSelf2(delay: time = 100 msec) {
 
 main reactor {
   d = new CountSelf2()
-  t = new TestCount(num_inputs = 11, start = 0)
+  t = new TestCount(num_inputs=11, start=0)
   d.out -> t.in
 }
diff --git a/test/C/src/CountTest.lf b/test/C/src/CountTest.lf
index 7ac4349d2a..9652aa70c4 100644
--- a/test/C/src/CountTest.lf
+++ b/test/C/src/CountTest.lf
@@ -9,6 +9,6 @@ import TestCount from "lib/TestCount.lf"
 
 main reactor CountTest {
   count = new Count()
-  test = new TestCount(num_inputs = 4)
+  test = new TestCount(num_inputs=4)
   count.out -> test.in
 }
diff --git a/test/C/src/Hello.lf b/test/C/src/Hello.lf
index 32f822e711..283718c2ed 100644
--- a/test/C/src/Hello.lf
+++ b/test/C/src/Hello.lf
@@ -46,7 +46,7 @@ reactor Reschedule(period: time = 2 sec, message: string = "Hello C") {
 }
 
 reactor Inside(period: time = 1 sec, message: string = "Composite default message.") {
-  third_instance = new Reschedule(period = period, message = message)
+  third_instance = new Reschedule(period=period, message=message)
 }
 
 main reactor Hello {
diff --git a/test/C/src/NativeListsAndTimes.lf b/test/C/src/NativeListsAndTimes.lf
index cbb1a6d861..1bf5cfdd6f 100644
--- a/test/C/src/NativeListsAndTimes.lf
+++ b/test/C/src/NativeListsAndTimes.lf
@@ -2,13 +2,13 @@ target C
 
 // This test passes if it is successfully compiled into valid target code.
 main reactor(
-  x: int = 0,
-  y: time = 0,                  // Units are missing but not required
-  z = 1 msec,                   // Type is missing but not required
-  p: int[] = {1, 2, 3, 4},      // List of integers
-  q: interval_t[] = {1 msec, 2 msec, 3 msec},  // list of time values
-  g: time[] = {1 msec, 2 msec}  // List of time values
-) {
+    x: int = 0,
+    y: time = 0,                  // Units are missing but not required
+    z = 1 msec,                   // Type is missing but not required
+    p: int[] = {1, 2, 3, 4},      // List of integers
+    q: interval_t[] = {1 msec, 2 msec, 3 msec},  // list of time values
+    // List of time values
+    g: time[] = {1 msec, 2 msec}) {
   state s: time = y  // Reference to explicitly typed time parameter
   state t: time = z  // Reference to implicitly typed time parameter
   state v: bool      // Uninitialized boolean state variable
diff --git a/test/C/src/ParameterHierarchy.lf b/test/C/src/ParameterHierarchy.lf
index ef71b43eeb..16c136575b 100644
--- a/test/C/src/ParameterHierarchy.lf
+++ b/test/C/src/ParameterHierarchy.lf
@@ -12,13 +12,13 @@ reactor Deep(p0: int = 0) {
 }
 
 reactor Intermediate(p1: int = 10) {
-  a0 = new Deep(p0 = p1)
+  a0 = new Deep(p0=p1)
 }
 
 reactor Another(p2: int = 20) {
-  a1 = new Intermediate(p1 = p2)
+  a1 = new Intermediate(p1=p2)
 }
 
 main reactor ParameterHierarchy {
-  a2 = new Another(p2 = 42)
+  a2 = new Another(p2=42)
 }
diff --git a/test/C/src/RepeatedInheritance.lf b/test/C/src/RepeatedInheritance.lf
index 47d4e46e63..7de84864cd 100644
--- a/test/C/src/RepeatedInheritance.lf
+++ b/test/C/src/RepeatedInheritance.lf
@@ -33,7 +33,7 @@ reactor A extends B, C {
 main reactor {
   c = new Count()
   a = new A()
-  t = new TestCount(start = 4, stride = 4, num_inputs = 6)
+  t = new TestCount(start=4, stride=4, num_inputs=6)
   (c.out)+ -> a.a, a.b, a.c, a.d
   a.out -> t.in
 }
diff --git a/test/C/src/Stride.lf b/test/C/src/Stride.lf
index c4016d5059..c4721a9f0f 100644
--- a/test/C/src/Stride.lf
+++ b/test/C/src/Stride.lf
@@ -30,7 +30,7 @@ reactor Display {
 }
 
 main reactor Stride {
-  c = new Count(stride = 2)
+  c = new Count(stride=2)
   d = new Display()
   c.y -> d.x
 }
diff --git a/test/C/src/StructParallel.lf b/test/C/src/StructParallel.lf
index 237f42366e..60c5cf3ce3 100644
--- a/test/C/src/StructParallel.lf
+++ b/test/C/src/StructParallel.lf
@@ -48,9 +48,9 @@ reactor Print(scale: int = 2) {
 main reactor StructParallel {
   s = new Source()
   c1 = new Print()
-  c2 = new Print(scale = 3)
-  p1 = new Check(expected = 84)
-  p2 = new Check(expected = 126)
+  c2 = new Print(scale=3)
+  p1 = new Check(expected=84)
+  p2 = new Check(expected=126)
   s.out -> c1.in
   s.out -> c2.in
   c1.out -> p1.in
diff --git a/test/C/src/StructScale.lf b/test/C/src/StructScale.lf
index 39293c2503..038410a350 100644
--- a/test/C/src/StructScale.lf
+++ b/test/C/src/StructScale.lf
@@ -58,7 +58,7 @@ reactor Print(scale: int = 2) {
 main reactor StructScale {
   s = new Source()
   c = new Print()
-  p = new TestInput(expected = 84)
+  p = new TestInput(expected=84)
   s.out -> c.in
   c.out -> p.in
 }
diff --git a/test/C/src/TimeLimit.lf b/test/C/src/TimeLimit.lf
index efffe62f98..02f30d425f 100644
--- a/test/C/src/TimeLimit.lf
+++ b/test/C/src/TimeLimit.lf
@@ -40,7 +40,7 @@ reactor Destination {
 
 main reactor TimeLimit(period: time = 1 sec) {
   timer stop(10 sec)
-  c = new Clock(period = period)
+  c = new Clock(period=period)
   d = new Destination()
   c.y -> d.x
 
diff --git a/test/C/src/concurrent/HelloThreaded.lf b/test/C/src/concurrent/HelloThreaded.lf
index afe424aaaf..de8d1f0d72 100644
--- a/test/C/src/concurrent/HelloThreaded.lf
+++ b/test/C/src/concurrent/HelloThreaded.lf
@@ -46,7 +46,7 @@ reactor Reschedule(period: time = 2 sec, message: string = "Hello C") {
 }
 
 reactor Inside(period: time = 1 sec, message: string = "Composite default message.") {
-  third_instance = new Reschedule(period = period, message = message)
+  third_instance = new Reschedule(period=period, message=message)
 }
 
 main reactor HelloThreaded {
diff --git a/test/C/src/concurrent/ScheduleAt.lf b/test/C/src/concurrent/ScheduleAt.lf
index 199bbf502f..f830d8375f 100644
--- a/test/C/src/concurrent/ScheduleAt.lf
+++ b/test/C/src/concurrent/ScheduleAt.lf
@@ -23,36 +23,34 @@ reactor Scheduler {
   state microstep_delay_list: uint32_t[] = {0, 1, 1, 2, 2, 0, 0, 1, 1, 0, 2, 3, 3, 4, 4, 5}
 
   state times: int[] = {
-    0,
-    0,
-    0,
-    0,
-    0,
-    400 msec,
-    400 msec,
-    400 msec,
-    400 msec,  // List of the corresponding times. Size = 16
-    800 msec,
-    800 msec,
-    800 msec,
-    800 msec,
-    900 msec,
-    900 msec,
-    900 msec
-  }
+      0,
+      0,
+      0,
+      0,
+      0,
+      400 msec,
+      400 msec,
+      400 msec,
+      400 msec,  // List of the corresponding times. Size = 16
+      800 msec,
+      800 msec,
+      800 msec,
+      800 msec,
+      900 msec,
+      900 msec,
+      900 msec}
   // Size = 9
   state action_hit_list_microstep: int[] = {1, 2, 0, 1, 0, 2, 3, 4, 5}
   state action_hit_list_times: int[] = {
-    0,
-    0,
-    400 msec,
-    400 msec,
-    800 msec,
-    800 msec,
-    800 msec,
-    900 msec,
-    900 msec
-  }
+      0,
+      0,
+      400 msec,
+      400 msec,
+      800 msec,
+      800 msec,
+      800 msec,
+      900 msec,
+      900 msec}
   // Size = 9
   state action_hit_list_index: int = 0
 
diff --git a/test/C/src/concurrent/Threaded.lf b/test/C/src/concurrent/Threaded.lf
index 0b5f20a79c..424c277053 100644
--- a/test/C/src/concurrent/Threaded.lf
+++ b/test/C/src/concurrent/Threaded.lf
@@ -59,6 +59,6 @@ main reactor(width: int = 4) {
   a = new Source()
   t = new[width] TakeTime()
   (a.out)+ -> t.in
-  b = new Destination(width = width)
+  b = new Destination(width=width)
   t.out -> b.in
 }
diff --git a/test/C/src/concurrent/ThreadedMultiport.lf b/test/C/src/concurrent/ThreadedMultiport.lf
index b6bb6fbe8a..c8b500dadd 100644
--- a/test/C/src/concurrent/ThreadedMultiport.lf
+++ b/test/C/src/concurrent/ThreadedMultiport.lf
@@ -61,9 +61,9 @@ reactor Destination(width: int = 4, iterations: int = 100000000) {
 }
 
 main reactor ThreadedMultiport(width: int = 4, iterations: int = 100000000) {
-  a = new Source(width = width)
-  t = new[width] Computation(iterations = iterations)
-  b = new Destination(width = width, iterations = iterations)
+  a = new Source(width=width)
+  t = new[width] Computation(iterations=iterations)
+  b = new Destination(width=width, iterations=iterations)
   a.out -> t.in
   t.out -> b.in
 }
diff --git a/test/C/src/concurrent/ThreadedThreaded.lf b/test/C/src/concurrent/ThreadedThreaded.lf
index b644256401..10c869530b 100644
--- a/test/C/src/concurrent/ThreadedThreaded.lf
+++ b/test/C/src/concurrent/ThreadedThreaded.lf
@@ -59,6 +59,6 @@ main reactor ThreadedThreaded(width: int = 4) {
   a = new Source()
   t = new[width] TakeTime()
   (a.out)+ -> t.in
-  b = new Destination(width = width)
+  b = new Destination(width=width)
   t.out -> b.in
 }
diff --git a/test/C/src/concurrent/TimeLimitThreaded.lf b/test/C/src/concurrent/TimeLimitThreaded.lf
index e1a08b06ab..eed307999a 100644
--- a/test/C/src/concurrent/TimeLimitThreaded.lf
+++ b/test/C/src/concurrent/TimeLimitThreaded.lf
@@ -40,7 +40,7 @@ reactor Destination {
 
 main reactor(period: time = 1 sec) {
   timer stop(10 sec)
-  c = new Clock(period = period)
+  c = new Clock(period=period)
   d = new Destination()
   c.y -> d.x
 
diff --git a/test/C/src/concurrent/Tracing.lf b/test/C/src/concurrent/Tracing.lf
index 25d0157ab5..5ff0d68bbf 100644
--- a/test/C/src/concurrent/Tracing.lf
+++ b/test/C/src/concurrent/Tracing.lf
@@ -93,6 +93,6 @@ main reactor(width: int = 4) {
   a = new Source()
   t = new[width] TakeTime()
   (a.out)+ -> t.in
-  b = new Destination(width = width)
+  b = new Destination(width=width)
   t.out -> b.in
 }
diff --git a/test/C/src/federated/ChainWithDelay.lf b/test/C/src/federated/ChainWithDelay.lf
index c0a4c6a2a9..dea606bf51 100644
--- a/test/C/src/federated/ChainWithDelay.lf
+++ b/test/C/src/federated/ChainWithDelay.lf
@@ -14,7 +14,7 @@ import TestCount from "../lib/TestCount.lf"
 federated reactor {
   c = new Count(period = 1 msec)
   i = new InternalDelay(delay = 500 usec)
-  t = new TestCount(num_inputs = 3)
+  t = new TestCount(num_inputs=3)
   c.out -> i.in
   i.out -> t.in
 }
diff --git a/test/C/src/federated/DecentralizedP2PComm.lf b/test/C/src/federated/DecentralizedP2PComm.lf
index bb96cb32d2..7dd9f6942f 100644
--- a/test/C/src/federated/DecentralizedP2PComm.lf
+++ b/test/C/src/federated/DecentralizedP2PComm.lf
@@ -41,8 +41,8 @@ reactor Platform(start: int = 0, expected_start: int = 0, stp_offset_param: time
 }
 
 federated reactor DecentralizedP2PComm {
-  a = new Platform(expected_start = 100, stp_offset_param = 10 msec)
-  b = new Platform(start = 100, stp_offset_param = 10 msec)
+  a = new Platform(expected_start=100, stp_offset_param = 10 msec)
+  b = new Platform(start=100, stp_offset_param = 10 msec)
   a.out -> b.in
   b.out -> a.in
 }
diff --git a/test/C/src/federated/DecentralizedP2PUnbalancedTimeout.lf b/test/C/src/federated/DecentralizedP2PUnbalancedTimeout.lf
index d6a372d56b..aa616ab16b 100644
--- a/test/C/src/federated/DecentralizedP2PUnbalancedTimeout.lf
+++ b/test/C/src/federated/DecentralizedP2PUnbalancedTimeout.lf
@@ -46,7 +46,7 @@ reactor Destination {
 }
 
 federated reactor(period: time = 10 usec) {
-  c = new Clock(period = period)
+  c = new Clock(period=period)
   d = new Destination()
   c.y -> d.x
 }
diff --git a/test/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf b/test/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf
index bb3b6544c0..b18fb1cee9 100644
--- a/test/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf
+++ b/test/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf
@@ -44,7 +44,7 @@ reactor Destination {
 }
 
 federated reactor(period: time = 10 usec) {
-  c = new Clock(period = period)
+  c = new Clock(period=period)
   d = new Destination()
   c.y ~> d.x
 }
diff --git a/test/C/src/federated/DistributedCountPhysicalAfterDelay.lf b/test/C/src/federated/DistributedCountPhysicalAfterDelay.lf
index 9eb2a1acff..f4c4d1cd48 100644
--- a/test/C/src/federated/DistributedCountPhysicalAfterDelay.lf
+++ b/test/C/src/federated/DistributedCountPhysicalAfterDelay.lf
@@ -44,7 +44,7 @@ reactor Print {
 }
 
 federated reactor at localhost {
-  c = new Count(offset = 200 msec, period = 0)
+  c = new Count(offset = 200 msec, period=0)
   p = new Print()
   c.out ~> p.in after 400 msec  // Indicating a 'physical' connection with a 400 msec after delay.
 }
diff --git a/test/C/src/federated/DistributedLogicalActionUpstreamLong.lf b/test/C/src/federated/DistributedLogicalActionUpstreamLong.lf
index 3205c466c2..50e8951847 100644
--- a/test/C/src/federated/DistributedLogicalActionUpstreamLong.lf
+++ b/test/C/src/federated/DistributedLogicalActionUpstreamLong.lf
@@ -23,7 +23,7 @@ reactor WithLogicalAction {
 
 federated reactor {
   a = new WithLogicalAction()
-  test = new TestCount(num_inputs = 21)
+  test = new TestCount(num_inputs=21)
 
   passThroughs1 = new PassThrough()
   passThroughs2 = new PassThrough()
diff --git a/test/C/src/federated/DistributedLoopedActionDecentralized.lf b/test/C/src/federated/DistributedLoopedActionDecentralized.lf
index 0d364f026d..ea9166fdc4 100644
--- a/test/C/src/federated/DistributedLoopedActionDecentralized.lf
+++ b/test/C/src/federated/DistributedLoopedActionDecentralized.lf
@@ -75,13 +75,12 @@ reactor Receiver(take_a_break_after: int = 10, break_interval: time = 400 msec)
 }
 
 reactor STPReceiver(
-  take_a_break_after: int = 10,
-  break_interval: time = 400 msec,
-  stp_offset: time = 0
-) {
+    take_a_break_after: int = 10,
+    break_interval: time = 400 msec,
+    stp_offset: time = 0) {
   input in: int
   state last_time_updated_stp: time = 0
-  receiver = new Receiver(take_a_break_after = 10, break_interval = 400 msec)
+  receiver = new Receiver(take_a_break_after=10, break_interval = 400 msec)
   timer t(0, 1 msec)  // Force advancement of logical time
 
   reaction(in) -> receiver.in {=
@@ -110,8 +109,8 @@ reactor STPReceiver(
 }
 
 federated reactor DistributedLoopedActionDecentralized {
-  sender = new Sender(take_a_break_after = 10, break_interval = 400 msec)
-  stpReceiver = new STPReceiver(take_a_break_after = 10, break_interval = 400 msec)
+  sender = new Sender(take_a_break_after=10, break_interval = 400 msec)
+  stpReceiver = new STPReceiver(take_a_break_after=10, break_interval = 400 msec)
 
   sender.out -> stpReceiver.in
 }
diff --git a/test/C/src/federated/DistributedPhysicalActionUpstream.lf b/test/C/src/federated/DistributedPhysicalActionUpstream.lf
index e4c8ad1e68..e77744d91b 100644
--- a/test/C/src/federated/DistributedPhysicalActionUpstream.lf
+++ b/test/C/src/federated/DistributedPhysicalActionUpstream.lf
@@ -51,7 +51,7 @@ federated reactor {
   a = new WithPhysicalAction()
   m1 = new PassThrough()
   m2 = new PassThrough()
-  test = new TestCount(num_inputs = 14)
+  test = new TestCount(num_inputs=14)
   a.out -> m1.in
   m1.out -> m2.in
   m2.out -> test.in
diff --git a/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf b/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf
index cc9f556df0..5eed5390cf 100644
--- a/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf
+++ b/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf
@@ -48,7 +48,7 @@ reactor WithPhysicalAction {
 
 federated reactor {
   a = new WithPhysicalAction()
-  test = new TestCount(num_inputs = 19)
+  test = new TestCount(num_inputs=19)
 
   passThroughs1 = new PassThrough()
   passThroughs2 = new PassThrough()
diff --git a/test/C/src/federated/DistributedStop.lf b/test/C/src/federated/DistributedStop.lf
index 4af4685169..c25410b044 100644
--- a/test/C/src/federated/DistributedStop.lf
+++ b/test/C/src/federated/DistributedStop.lf
@@ -62,8 +62,8 @@ reactor Sender {
 }
 
 reactor Receiver(
-  stp_offset: time = 10 msec  // Used in the decentralized variant of the test
-) {
+    // Used in the decentralized variant of the test
+    stp_offset: time = 10 msec) {
   input in: int
   state reaction_invoked_correctly: bool = false
 
diff --git a/test/C/src/federated/LevelPattern.lf b/test/C/src/federated/LevelPattern.lf
index cdbcc46ffe..da47325ba1 100644
--- a/test/C/src/federated/LevelPattern.lf
+++ b/test/C/src/federated/LevelPattern.lf
@@ -37,7 +37,7 @@ reactor A {
 
 federated reactor {
   c = new Count()
-  test = new TestCount(num_inputs = 2)
+  test = new TestCount(num_inputs=2)
   b = new A()
   t = new Through()
 
diff --git a/test/C/src/federated/LoopDistributedCentralized.lf b/test/C/src/federated/LoopDistributedCentralized.lf
index c8b08ee317..8f7cee63c3 100644
--- a/test/C/src/federated/LoopDistributedCentralized.lf
+++ b/test/C/src/federated/LoopDistributedCentralized.lf
@@ -43,7 +43,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
 
 federated reactor LoopDistributedCentralized(delay: time = 0) {
   left = new Looper()
-  right = new Looper(incr = -1)
+  right = new Looper(incr=-1)
   left.out -> right.in
   right.out -> left.in
 }
diff --git a/test/C/src/federated/LoopDistributedCentralized2.lf b/test/C/src/federated/LoopDistributedCentralized2.lf
index e83fc1e308..b52030153c 100644
--- a/test/C/src/federated/LoopDistributedCentralized2.lf
+++ b/test/C/src/federated/LoopDistributedCentralized2.lf
@@ -70,7 +70,7 @@ reactor Looper2(incr: int = 1, delay: time = 0 msec) {
 
 federated reactor(delay: time = 0) {
   left = new Looper()
-  right = new Looper2(incr = -1)
+  right = new Looper2(incr=-1)
   left.out -> right.in
   right.out -> left.in
 }
diff --git a/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf b/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf
index 5b9d47fd88..52d1e698cc 100644
--- a/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf
+++ b/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf
@@ -67,7 +67,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
 
 federated reactor(delay: time = 0) {
   left = new Looper()
-  right = new Looper(incr = -1)
+  right = new Looper(incr=-1)
   left.out -> right.in
   right.out -> left.in
 }
diff --git a/test/C/src/federated/LoopDistributedCentralizedPrecedence.lf b/test/C/src/federated/LoopDistributedCentralizedPrecedence.lf
index 9d4ed9e4fe..a23c487981 100644
--- a/test/C/src/federated/LoopDistributedCentralizedPrecedence.lf
+++ b/test/C/src/federated/LoopDistributedCentralizedPrecedence.lf
@@ -50,7 +50,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
 
 federated reactor(delay: time = 0) {
   left = new Looper()
-  right = new Looper(incr = -1)
+  right = new Looper(incr=-1)
   left.out -> right.in
   right.out -> left.in
 }
diff --git a/test/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf b/test/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf
index da6054251c..e3a3f73a0f 100644
--- a/test/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf
+++ b/test/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf
@@ -37,7 +37,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
   state count: int = 0
   timer t(0, 1 sec)
 
-  c = new Contained(incr = incr)
+  c = new Contained(incr=incr)
   in -> c.in
 
   reaction(t) -> out {=
@@ -63,7 +63,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
 
 federated reactor(delay: time = 0) {
   left = new Looper()
-  right = new Looper(incr = -1)
+  right = new Looper(incr=-1)
   left.out -> right.in
   right.out -> left.in
 }
diff --git a/test/C/src/federated/LoopDistributedDecentralized.lf b/test/C/src/federated/LoopDistributedDecentralized.lf
index 387ec55325..7dc4197138 100644
--- a/test/C/src/federated/LoopDistributedDecentralized.lf
+++ b/test/C/src/federated/LoopDistributedDecentralized.lf
@@ -74,7 +74,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec, stp_offset: time = 0) {
 
 federated reactor LoopDistributedDecentralized(delay: time = 0) {
   left = new Looper(stp_offset = 900 usec)
-  right = new Looper(incr = -1, stp_offset = 2400 usec)
+  right = new Looper(incr=-1, stp_offset = 2400 usec)
   left.out -> right.in
   right.out -> left.in
 }
diff --git a/test/C/src/federated/LoopDistributedDouble.lf b/test/C/src/federated/LoopDistributedDouble.lf
index 69c84799c7..e8d3cd7bf8 100644
--- a/test/C/src/federated/LoopDistributedDouble.lf
+++ b/test/C/src/federated/LoopDistributedDouble.lf
@@ -90,7 +90,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
 
 federated reactor(delay: time = 0) {
   left = new Looper()
-  right = new Looper(incr = -1)
+  right = new Looper(incr=-1)
   left.out -> right.in
   right.out -> left.in
   right.out2 -> left.in2
diff --git a/test/C/src/federated/ParallelDestinations.lf b/test/C/src/federated/ParallelDestinations.lf
index 1d76627853..a4a4c026db 100644
--- a/test/C/src/federated/ParallelDestinations.lf
+++ b/test/C/src/federated/ParallelDestinations.lf
@@ -16,8 +16,8 @@ reactor Source {
 
 federated reactor {
   s = new Source()
-  t1 = new TestCount(num_inputs = 3)
-  t2 = new TestCount(num_inputs = 3)
+  t1 = new TestCount(num_inputs=3)
+  t2 = new TestCount(num_inputs=3)
 
   s.out -> t1.in, t2.in
 }
diff --git a/test/C/src/federated/ParallelSources.lf b/test/C/src/federated/ParallelSources.lf
index adcab8c689..0bedc87d68 100644
--- a/test/C/src/federated/ParallelSources.lf
+++ b/test/C/src/federated/ParallelSources.lf
@@ -9,8 +9,8 @@ import TestCount from "../lib/TestCount.lf"
 reactor Destination {
   input[2] in: int
 
-  t1 = new TestCount(num_inputs = 3)
-  t2 = new TestCount(num_inputs = 3)
+  t1 = new TestCount(num_inputs=3)
+  t2 = new TestCount(num_inputs=3)
 
   in -> t1.in, t2.in
 }
diff --git a/test/C/src/federated/ParallelSourcesMultiport.lf b/test/C/src/federated/ParallelSourcesMultiport.lf
index 7d76c31522..026c223463 100644
--- a/test/C/src/federated/ParallelSourcesMultiport.lf
+++ b/test/C/src/federated/ParallelSourcesMultiport.lf
@@ -17,9 +17,9 @@ reactor Source {
 reactor Destination1 {
   input[3] in: int
 
-  t1 = new TestCount(num_inputs = 3)
-  t2 = new TestCount(num_inputs = 3)
-  t3 = new TestCount(num_inputs = 3)
+  t1 = new TestCount(num_inputs=3)
+  t2 = new TestCount(num_inputs=3)
+  t3 = new TestCount(num_inputs=3)
 
   in -> t1.in, t2.in, t3.in
 }
@@ -28,7 +28,7 @@ federated reactor {
   s1 = new Source()
   s2 = new Source()
   d1 = new Destination1()
-  t4 = new TestCount(num_inputs = 3)
+  t4 = new TestCount(num_inputs=3)
 
   s1.out, s2.out -> d1.in, t4.in
 }
diff --git a/test/C/src/federated/PingPongDistributed.lf b/test/C/src/federated/PingPongDistributed.lf
index 5fcc1bf32b..fa89e6f306 100644
--- a/test/C/src/federated/PingPongDistributed.lf
+++ b/test/C/src/federated/PingPongDistributed.lf
@@ -21,8 +21,8 @@ target C
 import Ping, Pong from "PingPongDistributedPhysical.lf"
 
 federated reactor(count: int = 10) {
-  ping = new Ping(count = count)
-  pong = new Pong(expected = count)
+  ping = new Ping(count=count)
+  pong = new Pong(expected=count)
   ping.send -> pong.receive
   pong.send -> ping.receive
 }
diff --git a/test/C/src/federated/PingPongDistributedPhysical.lf b/test/C/src/federated/PingPongDistributedPhysical.lf
index 63ea109a14..c0f93051c3 100644
--- a/test/C/src/federated/PingPongDistributedPhysical.lf
+++ b/test/C/src/federated/PingPongDistributedPhysical.lf
@@ -70,8 +70,8 @@ reactor Pong(expected: int = 10) {
 }
 
 federated reactor(count: int = 10) {
-  ping = new Ping(count = count)
-  pong = new Pong(expected = count)
+  ping = new Ping(count=count)
+  pong = new Pong(expected=count)
   ping.send ~> pong.receive
   pong.send ~> ping.receive
 }
diff --git a/test/C/src/generics/TypeCheck.lf b/test/C/src/generics/TypeCheck.lf
index 168430bbf6..c24f75d29e 100644
--- a/test/C/src/generics/TypeCheck.lf
+++ b/test/C/src/generics/TypeCheck.lf
@@ -39,6 +39,6 @@ reactor TestCount<T>(start: int = 1, num_inputs: int = 1) {
 
 main reactor {
   count = new Count<int>()
-  testcount = new TestCount<int>(num_inputs = 4)
+  testcount = new TestCount<int>(num_inputs=4)
   count.out -> testcount.in
 }
diff --git a/test/C/src/modal_models/ModalAfter.lf b/test/C/src/modal_models/ModalAfter.lf
index f0ddd8ea6e..95661831aa 100644
--- a/test/C/src/modal_models/ModalAfter.lf
+++ b/test/C/src/modal_models/ModalAfter.lf
@@ -19,8 +19,8 @@ reactor Modal {
   output consumed2: int
 
   initial mode One {
-    producer1 = new Producer(mode_id = 1)
-    consumer1 = new Consumer(mode_id = 1)
+    producer1 = new Producer(mode_id=1)
+    consumer1 = new Consumer(mode_id=1)
     producer1.product -> produced1
     producer1.product -> consumer1.product after 500 msec
     consumer1.report -> consumed1
@@ -32,8 +32,8 @@ reactor Modal {
   }
 
   mode Two {
-    producer2 = new Producer(mode_id = 2)
-    consumer2 = new Consumer(mode_id = 2)
+    producer2 = new Producer(mode_id=2)
+    consumer2 = new Consumer(mode_id=2)
     producer2.product -> produced2
     producer2.product -> consumer2.product after 500 msec
     consumer2.report -> consumed2
diff --git a/test/C/src/modal_models/util/TraceTesting.lf b/test/C/src/modal_models/util/TraceTesting.lf
index 38b78b4173..d8b9277843 100644
--- a/test/C/src/modal_models/util/TraceTesting.lf
+++ b/test/C/src/modal_models/util/TraceTesting.lf
@@ -2,11 +2,10 @@
 target C
 
 reactor TraceTesting(
-  events_size: int = 0,
-  trace_size: int = 0,
-  trace: int[] = 0,
-  training: bool = false
-) {
+    events_size: int = 0,
+    trace_size: int = 0,
+    trace: int[] = 0,
+    training: bool = false) {
   input[events_size] events: int
 
   state last_reaction_time: int = 0
diff --git a/test/C/src/multiport/BankIndexInitializer.lf b/test/C/src/multiport/BankIndexInitializer.lf
index 4c24c2d92b..7b8012084c 100644
--- a/test/C/src/multiport/BankIndexInitializer.lf
+++ b/test/C/src/multiport/BankIndexInitializer.lf
@@ -36,6 +36,6 @@ reactor Sink(width: int = 4) {
 
 main reactor(width: int = 4) {
   source = new[width] Source(value = {= table[bank_index] =})
-  sink = new Sink(width = width)
+  sink = new Sink(width=width)
   source.out -> sink.in
 }
diff --git a/test/C/src/multiport/BankMulticast.lf b/test/C/src/multiport/BankMulticast.lf
index 312a073464..4c675d7c92 100644
--- a/test/C/src/multiport/BankMulticast.lf
+++ b/test/C/src/multiport/BankMulticast.lf
@@ -17,7 +17,7 @@ reactor Foo {
   c = new Count()
   c.out -> out
 
-  d = new TestCount(num_inputs = 4)
+  d = new TestCount(num_inputs=4)
   in -> d.in
 }
 
@@ -33,6 +33,6 @@ reactor Bar {
 main reactor {
   bar = new Bar()
 
-  d = new[4] TestCount(num_inputs = 4)
+  d = new[4] TestCount(num_inputs=4)
   bar.out -> d.in
 }
diff --git a/test/C/src/multiport/BankToBankMultiport.lf b/test/C/src/multiport/BankToBankMultiport.lf
index 502e5ed064..01a13296cf 100644
--- a/test/C/src/multiport/BankToBankMultiport.lf
+++ b/test/C/src/multiport/BankToBankMultiport.lf
@@ -43,7 +43,7 @@ reactor Destination(width: int = 1) {
 }
 
 main reactor BankToBankMultiport(bank_width: int = 4) {
-  a = new[bank_width] Source(width = 4)
-  b = new[bank_width] Destination(width = 4)
+  a = new[bank_width] Source(width=4)
+  b = new[bank_width] Destination(width=4)
   a.out -> b.in
 }
diff --git a/test/C/src/multiport/BankToBankMultiportAfter.lf b/test/C/src/multiport/BankToBankMultiportAfter.lf
index 9338be1f8c..2c787630ab 100644
--- a/test/C/src/multiport/BankToBankMultiportAfter.lf
+++ b/test/C/src/multiport/BankToBankMultiportAfter.lf
@@ -43,7 +43,7 @@ reactor Destination(width: int = 1) {
 }
 
 main reactor(bank_width: int = 4) {
-  a = new[bank_width] Source(width = 4)
-  b = new[bank_width] Destination(width = 4)
+  a = new[bank_width] Source(width=4)
+  b = new[bank_width] Destination(width=4)
   a.out -> b.in after 200 msec
 }
diff --git a/test/C/src/multiport/BankToMultiport.lf b/test/C/src/multiport/BankToMultiport.lf
index b45d812974..7669e44cfd 100644
--- a/test/C/src/multiport/BankToMultiport.lf
+++ b/test/C/src/multiport/BankToMultiport.lf
@@ -34,6 +34,6 @@ reactor Sink(width: int = 4) {
 
 main reactor BankToMultiport(width: int = 5) {
   source = new[width] Source()
-  sink = new Sink(width = width)
+  sink = new Sink(width=width)
   source.out -> sink.in
 }
diff --git a/test/C/src/multiport/BroadcastMultipleAfter.lf b/test/C/src/multiport/BroadcastMultipleAfter.lf
index 6304f27492..dc38164b9a 100644
--- a/test/C/src/multiport/BroadcastMultipleAfter.lf
+++ b/test/C/src/multiport/BroadcastMultipleAfter.lf
@@ -37,9 +37,9 @@ reactor Destination(bank_index: int = 0) {
 }
 
 main reactor {
-  a1 = new Source(value = 1)
-  a2 = new Source(value = 2)
-  a3 = new Source(value = 3)
+  a1 = new Source(value=1)
+  a2 = new Source(value=2)
+  a3 = new Source(value=3)
   b = new[9] Destination()
   (a1.out, a2.out, a3.out)+ -> b.in after 1 sec
 }
diff --git a/test/C/src/multiport/FullyConnected.lf b/test/C/src/multiport/FullyConnected.lf
index d65b64f18f..34ba622398 100644
--- a/test/C/src/multiport/FullyConnected.lf
+++ b/test/C/src/multiport/FullyConnected.lf
@@ -36,6 +36,6 @@ reactor Node(num_nodes: size_t = 4, bank_index: int = 0) {
 }
 
 main reactor(num_nodes: size_t = 4) {
-  nodes = new[num_nodes] Node(num_nodes = num_nodes)
+  nodes = new[num_nodes] Node(num_nodes=num_nodes)
   (nodes.out)+ -> nodes.in
 }
diff --git a/test/C/src/multiport/FullyConnectedAddressable.lf b/test/C/src/multiport/FullyConnectedAddressable.lf
index a5c764764e..f3ddb44e11 100644
--- a/test/C/src/multiport/FullyConnectedAddressable.lf
+++ b/test/C/src/multiport/FullyConnectedAddressable.lf
@@ -46,9 +46,9 @@ reactor Node(num_nodes: size_t = 4, bank_index: int = 0) {
 }
 
 main reactor(num_nodes: size_t = 4) {
-  nodes1 = new[num_nodes] Node(num_nodes = num_nodes)
+  nodes1 = new[num_nodes] Node(num_nodes=num_nodes)
   nodes1.out -> interleaved(nodes1.in)
 
-  nodes2 = new[num_nodes] Node(num_nodes = num_nodes)
+  nodes2 = new[num_nodes] Node(num_nodes=num_nodes)
   interleaved(nodes2.out) -> nodes2.in
 }
diff --git a/test/C/src/multiport/FullyConnectedAddressableAfter.lf b/test/C/src/multiport/FullyConnectedAddressableAfter.lf
index 5828d12659..08d7a31420 100644
--- a/test/C/src/multiport/FullyConnectedAddressableAfter.lf
+++ b/test/C/src/multiport/FullyConnectedAddressableAfter.lf
@@ -4,9 +4,9 @@ target C
 import Node from "FullyConnectedAddressable.lf"
 
 main reactor(num_nodes: size_t = 4) {
-  nodes1 = new[num_nodes] Node(num_nodes = num_nodes)
+  nodes1 = new[num_nodes] Node(num_nodes=num_nodes)
   nodes1.out -> interleaved(nodes1.in) after 200 msec
 
-  nodes2 = new[num_nodes] Node(num_nodes = num_nodes)
+  nodes2 = new[num_nodes] Node(num_nodes=num_nodes)
   interleaved(nodes2.out) -> nodes2.in after 400 msec
 }
diff --git a/test/C/src/multiport/MultiportFromBank.lf b/test/C/src/multiport/MultiportFromBank.lf
index 2bdb344cf0..9c2c439950 100644
--- a/test/C/src/multiport/MultiportFromBank.lf
+++ b/test/C/src/multiport/MultiportFromBank.lf
@@ -36,7 +36,7 @@ reactor Destination(port_width: int = 3) {
 }
 
 main reactor MultiportFromBank(width: int = 4) {
-  a = new[width] Source(check_override = 1)
-  b = new Destination(port_width = width)
+  a = new[width] Source(check_override=1)
+  b = new Destination(port_width=width)
   a.out -> b.in
 }
diff --git a/test/C/src/multiport/MultiportFromBankHierarchy.lf b/test/C/src/multiport/MultiportFromBankHierarchy.lf
index 073f76ad7a..6ceea0b3bb 100644
--- a/test/C/src/multiport/MultiportFromBankHierarchy.lf
+++ b/test/C/src/multiport/MultiportFromBankHierarchy.lf
@@ -9,12 +9,12 @@ import Source, Destination from "MultiportFromBank.lf"
 
 reactor Container(port_width: int = 3) {
   output[port_width] out: int
-  s = new[port_width] Source(check_override = 1)
+  s = new[port_width] Source(check_override=1)
   s.out -> out
 }
 
 main reactor(width: int = 4) {
-  a = new Container(port_width = width)
-  b = new Destination(port_width = width)
+  a = new Container(port_width=width)
+  b = new Destination(port_width=width)
   a.out -> b.in
 }
diff --git a/test/C/src/multiport/MultiportFromBankHierarchyAfter.lf b/test/C/src/multiport/MultiportFromBankHierarchyAfter.lf
index dab31049a8..cedcbeff41 100644
--- a/test/C/src/multiport/MultiportFromBankHierarchyAfter.lf
+++ b/test/C/src/multiport/MultiportFromBankHierarchyAfter.lf
@@ -9,7 +9,7 @@ import Destination from "MultiportFromBank.lf"
 import Container from "MultiportFromBankHierarchy.lf"
 
 main reactor MultiportFromBankHierarchyAfter {
-  a = new Container(port_width = 4)
-  b = new Destination(port_width = 4)
+  a = new Container(port_width=4)
+  b = new Destination(port_width=4)
   a.out -> b.in after 1 sec
 }
diff --git a/test/C/src/multiport/MultiportFromHierarchy.lf b/test/C/src/multiport/MultiportFromHierarchy.lf
index c7a6b36277..9c817e371f 100644
--- a/test/C/src/multiport/MultiportFromHierarchy.lf
+++ b/test/C/src/multiport/MultiportFromHierarchy.lf
@@ -44,18 +44,18 @@ reactor Destination(width: int = 3) {
 
 reactor Container(width: int = 3) {
   output[width] out: int
-  src = new InsideContainer(width = width)
+  src = new InsideContainer(width=width)
   src.out -> out
 }
 
 reactor InsideContainer(width: int = 3) {
   output[width] out: int
-  src = new Source(width = width)
+  src = new Source(width=width)
   src.out -> out
 }
 
 main reactor MultiportFromHierarchy(width: int = 4) {
-  a = new Container(width = width)
-  b = new Destination(width = width)
+  a = new Container(width=width)
+  b = new Destination(width=width)
   a.out -> b.in
 }
diff --git a/test/C/src/multiport/MultiportFromReaction.lf b/test/C/src/multiport/MultiportFromReaction.lf
index 0b0b83aa71..c262a43e6e 100644
--- a/test/C/src/multiport/MultiportFromReaction.lf
+++ b/test/C/src/multiport/MultiportFromReaction.lf
@@ -33,7 +33,7 @@ reactor Destination(width: int = 1) {
 main reactor MultiportFromReaction(width: int = 4) {
   timer t(0, 200 msec)
   state s: int = 0
-  b = new Destination(width = width)
+  b = new Destination(width=width)
 
   reaction(t) -> b.in {=
     for(int i = 0; i < b.in_width; i++) {
diff --git a/test/C/src/multiport/MultiportInParameterized.lf b/test/C/src/multiport/MultiportInParameterized.lf
index d2026c8aca..46ac0ea796 100644
--- a/test/C/src/multiport/MultiportInParameterized.lf
+++ b/test/C/src/multiport/MultiportInParameterized.lf
@@ -55,7 +55,7 @@ main reactor {
   t2 = new Computation()
   t3 = new Computation()
   t4 = new Computation()
-  b = new Destination(width = 4)
+  b = new Destination(width=4)
   a.out -> t1.in
   a.out -> t2.in
   a.out -> t3.in
diff --git a/test/C/src/multiport/MultiportMutableInput.lf b/test/C/src/multiport/MultiportMutableInput.lf
index 50de03cc4d..96026cf445 100644
--- a/test/C/src/multiport/MultiportMutableInput.lf
+++ b/test/C/src/multiport/MultiportMutableInput.lf
@@ -43,7 +43,7 @@ reactor Scale(scale: int = 2) {
 main reactor {
   s = new Source()
   c = new Scale()
-  p = new Print(scale = 2)
+  p = new Print(scale=2)
   s.out -> c.in
   c.out -> p.in
 }
diff --git a/test/C/src/multiport/MultiportMutableInputArray.lf b/test/C/src/multiport/MultiportMutableInputArray.lf
index f38eb78af1..07b344a7b1 100644
--- a/test/C/src/multiport/MultiportMutableInputArray.lf
+++ b/test/C/src/multiport/MultiportMutableInputArray.lf
@@ -71,7 +71,7 @@ reactor Scale(scale: int = 2) {
 main reactor {
   s = new Source()
   c = new Scale()
-  p = new Print(scale = 2)
+  p = new Print(scale=2)
   s.out -> c.in
   c.out -> p.in
 }
diff --git a/test/C/src/multiport/MultiportToBank.lf b/test/C/src/multiport/MultiportToBank.lf
index 3249f3f61e..0dc850c606 100644
--- a/test/C/src/multiport/MultiportToBank.lf
+++ b/test/C/src/multiport/MultiportToBank.lf
@@ -48,7 +48,7 @@ reactor Destination(bank_index: int = 0) {
 }
 
 main reactor MultiportToBank(width: int = 3) {
-  a = new Source(width = width)
+  a = new Source(width=width)
   b = new[width] Destination()
   a.out -> b.in
 }
diff --git a/test/C/src/multiport/MultiportToBankAfter.lf b/test/C/src/multiport/MultiportToBankAfter.lf
index 52945d1c67..9050661954 100644
--- a/test/C/src/multiport/MultiportToBankAfter.lf
+++ b/test/C/src/multiport/MultiportToBankAfter.lf
@@ -41,7 +41,7 @@ reactor Destination(bank_index: int = 0) {
 }
 
 main reactor(width: int = 3) {
-  a = new Source(width = width)
+  a = new Source(width=width)
   b = new[width] Destination()
   a.out -> b.in after 1 sec  // Width of the bank of delays will be inferred.
 }
diff --git a/test/C/src/multiport/MultiportToBankHierarchy.lf b/test/C/src/multiport/MultiportToBankHierarchy.lf
index dcb3b41811..eb388183c7 100644
--- a/test/C/src/multiport/MultiportToBankHierarchy.lf
+++ b/test/C/src/multiport/MultiportToBankHierarchy.lf
@@ -44,7 +44,7 @@ reactor Container(width: int = 2) {
 }
 
 main reactor MultiportToBankHierarchy(width: int = 3) {
-  a = new Source(width = width)
-  b = new Container(width = width)
+  a = new Source(width=width)
+  b = new Container(width=width)
   a.out -> b.in
 }
diff --git a/test/C/src/multiport/MultiportToHierarchy.lf b/test/C/src/multiport/MultiportToHierarchy.lf
index 2abaca76eb..d96c57d008 100644
--- a/test/C/src/multiport/MultiportToHierarchy.lf
+++ b/test/C/src/multiport/MultiportToHierarchy.lf
@@ -50,7 +50,7 @@ reactor Container(width: int = 4) {
 }
 
 main reactor MultiportToHierarchy(width: int = 4) {
-  a = new Source(width = width)
-  b = new Container(width = width)
+  a = new Source(width=width)
+  b = new Container(width=width)
   a.out -> b.in
 }
diff --git a/test/C/src/multiport/MultiportToMultiport.lf b/test/C/src/multiport/MultiportToMultiport.lf
index c24b8b59de..02594ce518 100644
--- a/test/C/src/multiport/MultiportToMultiport.lf
+++ b/test/C/src/multiport/MultiportToMultiport.lf
@@ -46,7 +46,7 @@ reactor Destination(width: int = 1) {
 }
 
 main reactor MultiportToMultiport(width: int = 4) {
-  a = new Source(width = width)
-  b = new Destination(width = width)
+  a = new Source(width=width)
+  b = new Destination(width=width)
   a.out -> b.in
 }
diff --git a/test/C/src/multiport/MultiportToMultiport2.lf b/test/C/src/multiport/MultiportToMultiport2.lf
index 4247995caa..0390cdeacc 100644
--- a/test/C/src/multiport/MultiportToMultiport2.lf
+++ b/test/C/src/multiport/MultiportToMultiport2.lf
@@ -30,8 +30,8 @@ reactor Destination(width: int = 2) {
 }
 
 main reactor MultiportToMultiport2(width1: int = 3, width2: int = 2, width3: int = 5) {
-  a1 = new Source(width = width1)
-  a2 = new Source(width = width2)
-  b = new Destination(width = width3)
+  a1 = new Source(width=width1)
+  a2 = new Source(width=width2)
+  b = new Destination(width=width3)
   a1.out, a2.out -> b.in
 }
diff --git a/test/C/src/multiport/MultiportToMultiport2After.lf b/test/C/src/multiport/MultiportToMultiport2After.lf
index 2d626610cf..aa1d7338b4 100644
--- a/test/C/src/multiport/MultiportToMultiport2After.lf
+++ b/test/C/src/multiport/MultiportToMultiport2After.lf
@@ -34,8 +34,8 @@ reactor Destination(width: int = 2) {
 }
 
 main reactor MultiportToMultiport2After {
-  a1 = new Source(width = 3)
-  a2 = new Source(width = 2)
-  b = new Destination(width = 5)
+  a1 = new Source(width=3)
+  a2 = new Source(width=2)
+  b = new Destination(width=5)
   a1.out, a2.out -> b.in after 1 sec
 }
diff --git a/test/C/src/multiport/MultiportToMultiportParameter.lf b/test/C/src/multiport/MultiportToMultiportParameter.lf
index fe311cd7fa..792d71b1ee 100644
--- a/test/C/src/multiport/MultiportToMultiportParameter.lf
+++ b/test/C/src/multiport/MultiportToMultiportParameter.lf
@@ -46,7 +46,7 @@ reactor Destination(width: int = 1) {
 }
 
 main reactor(width: int = 4) {
-  a = new Source(width = width)
-  b = new Destination(width = width)
+  a = new Source(width=width)
+  b = new Destination(width=width)
   a.out -> b.in
 }
diff --git a/test/C/src/multiport/MultiportToPort.lf b/test/C/src/multiport/MultiportToPort.lf
index 60523029cf..86a2a99d20 100644
--- a/test/C/src/multiport/MultiportToPort.lf
+++ b/test/C/src/multiport/MultiportToPort.lf
@@ -40,6 +40,6 @@ reactor Destination(expected: int = 0) {
 main reactor MultiportToPort {
   a = new Source()
   b1 = new Destination()
-  b2 = new Destination(expected = 1)
+  b2 = new Destination(expected=1)
   a.out -> b1.in, b2.in
 }
diff --git a/test/C/src/multiport/MultiportToReaction.lf b/test/C/src/multiport/MultiportToReaction.lf
index 77eba059f3..a32ecba25f 100644
--- a/test/C/src/multiport/MultiportToReaction.lf
+++ b/test/C/src/multiport/MultiportToReaction.lf
@@ -19,7 +19,7 @@ reactor Source(width: int = 1) {
 
 main reactor MultiportToReaction {
   state s: int = 6
-  b = new Source(width = 4)
+  b = new Source(width=4)
 
   reaction(b.out) {=
     int sum = 0;
diff --git a/test/C/src/multiport/NestedBanks.lf b/test/C/src/multiport/NestedBanks.lf
index 5c2953c2a4..f4291e07a6 100644
--- a/test/C/src/multiport/NestedBanks.lf
+++ b/test/C/src/multiport/NestedBanks.lf
@@ -15,7 +15,7 @@ main reactor {
 
 reactor A(bank_index: int = 0) {
   output[4] x: int
-  b = new[2] B(a_bank_index = bank_index)
+  b = new[2] B(a_bank_index=bank_index)
   b.y -> x
 }
 
@@ -31,8 +31,8 @@ reactor B(a_bank_index: int = 0, bank_index: int = 0) {
 
 reactor C(bank_index: int = 0) {
   input[2] z: int
-  f = new F(c_bank_index = bank_index)
-  g = new G(c_bank_index = bank_index)
+  f = new F(c_bank_index=bank_index)
+  g = new G(c_bank_index=bank_index)
   z -> f.w, g.s
 }
 
diff --git a/test/C/src/multiport/NestedInterleavedBanks.lf b/test/C/src/multiport/NestedInterleavedBanks.lf
index b453473223..84175c9ff8 100644
--- a/test/C/src/multiport/NestedInterleavedBanks.lf
+++ b/test/C/src/multiport/NestedInterleavedBanks.lf
@@ -17,7 +17,7 @@ reactor A(bank_index: int = 0, outer_bank_index: int = 0) {
 
 reactor B(bank_index: int = 0) {
   output[4] q: int
-  a = new[2] A(outer_bank_index = bank_index)
+  a = new[2] A(outer_bank_index=bank_index)
   interleaved(a.p) -> q
 }
 
diff --git a/test/C/src/multiport/ReactionToContainedBank.lf b/test/C/src/multiport/ReactionToContainedBank.lf
index e448913d79..8503b2c6b2 100644
--- a/test/C/src/multiport/ReactionToContainedBank.lf
+++ b/test/C/src/multiport/ReactionToContainedBank.lf
@@ -10,7 +10,7 @@ main reactor ReactionToContainedBank(width: int = 2) {
   timer t(0, 100 msec)
   state count: int = 1
 
-  test = new[width] TestCount(num_inputs = 11)
+  test = new[width] TestCount(num_inputs=11)
 
   reaction(t) -> test.in {=
     for (int i = 0; i < self->width; i++) {
diff --git a/test/C/src/multiport/ReactionToContainedBank2.lf b/test/C/src/multiport/ReactionToContainedBank2.lf
index a36e575b21..00bf6325fd 100644
--- a/test/C/src/multiport/ReactionToContainedBank2.lf
+++ b/test/C/src/multiport/ReactionToContainedBank2.lf
@@ -10,7 +10,7 @@ reactor ReactionToContainedBank(width: int = 2) {
   timer t(0, 100 msec)
   state count: int = 1
 
-  test = new[width] TestCount(num_inputs = 11)
+  test = new[width] TestCount(num_inputs=11)
 
   reaction(t) -> test.in {=
     for (int i = 0; i < self->width; i++) {
@@ -21,6 +21,6 @@ reactor ReactionToContainedBank(width: int = 2) {
 }
 
 main reactor(width: int = 2) {
-  a = new ReactionToContainedBank(width = width)
-  b = new ReactionToContainedBank(width = 4)
+  a = new ReactionToContainedBank(width=width)
+  b = new ReactionToContainedBank(width=4)
 }
diff --git a/test/C/src/multiport/ReactionToContainedBankMultiport.lf b/test/C/src/multiport/ReactionToContainedBankMultiport.lf
index e778f125c9..77832f4b80 100644
--- a/test/C/src/multiport/ReactionToContainedBankMultiport.lf
+++ b/test/C/src/multiport/ReactionToContainedBankMultiport.lf
@@ -10,7 +10,7 @@ main reactor(width: int = 2) {
   timer t(0, 100 msec)
   state count: int = 1
 
-  test = new[width] TestCountMultiport(num_inputs = 11, width = width)
+  test = new[width] TestCountMultiport(num_inputs=11, width=width)
 
   reaction(t) -> test.in {=
     for (int i = 0; i < self->width; i++) {
diff --git a/test/C/src/multiport/ReactionsToNested.lf b/test/C/src/multiport/ReactionsToNested.lf
index 71a76444b6..9260b9b53b 100644
--- a/test/C/src/multiport/ReactionsToNested.lf
+++ b/test/C/src/multiport/ReactionsToNested.lf
@@ -24,8 +24,8 @@ reactor T(expected: int = 0) {
 
 reactor D {
   input[2] y: int
-  t1 = new T(expected = 42)
-  t2 = new T(expected = 43)
+  t1 = new T(expected=42)
+  t2 = new T(expected=43)
   y -> t1.z, t2.z
 }
 
diff --git a/test/C/src/multiport/Sparse.lf b/test/C/src/multiport/Sparse.lf
index 3ebda275b1..ef3fbba631 100644
--- a/test/C/src/multiport/Sparse.lf
+++ b/test/C/src/multiport/Sparse.lf
@@ -44,7 +44,7 @@ reactor SparseSink(width: int = 20) {
 }
 
 main reactor(width: int = 20) {
-  s = new SparseSource(width = width)
-  d = new SparseSink(width = width)
+  s = new SparseSource(width=width)
+  d = new SparseSink(width=width)
   s.out -> d.in
 }
diff --git a/test/C/src/multiport/SparseFallback.lf b/test/C/src/multiport/SparseFallback.lf
index a5a0bf4284..3f5f0ebec4 100644
--- a/test/C/src/multiport/SparseFallback.lf
+++ b/test/C/src/multiport/SparseFallback.lf
@@ -47,7 +47,7 @@ reactor SparseSink(width: int = 20) {
 }
 
 main reactor(width: int = 10) {
-  s = new SparseSource(width = width)
-  d = new SparseSink(width = width)
+  s = new SparseSource(width=width)
+  d = new SparseSink(width=width)
   s.out -> d.in
 }
diff --git a/test/C/src/no_inlining/CountHierarchy.lf b/test/C/src/no_inlining/CountHierarchy.lf
index 706ca75c35..1619774c47 100644
--- a/test/C/src/no_inlining/CountHierarchy.lf
+++ b/test/C/src/no_inlining/CountHierarchy.lf
@@ -11,7 +11,7 @@ reactor Timer(m: time = 0, n: time = 0) {
 }
 
 main reactor {
-  t = new Timer(m = 0, n = 1 msec)
+  t = new Timer(m=0, n = 1 msec)
 
   state count: int
 
diff --git a/test/C/src/no_inlining/MultiportToReactionNoInlining.lf b/test/C/src/no_inlining/MultiportToReactionNoInlining.lf
index 98811fd9db..b685abc5b2 100644
--- a/test/C/src/no_inlining/MultiportToReactionNoInlining.lf
+++ b/test/C/src/no_inlining/MultiportToReactionNoInlining.lf
@@ -21,7 +21,7 @@ reactor Source(width: int = 1) {
 
 main reactor {
   state s: int = 6
-  b = new Source(width = 4)
+  b = new Source(width=4)
 
   reaction(b.out) named check
 
diff --git a/test/C/src/target/CMakeInclude.lf b/test/C/src/target/CMakeInclude.lf
index e1215fa85e..8b79c987bb 100644
--- a/test/C/src/target/CMakeInclude.lf
+++ b/test/C/src/target/CMakeInclude.lf
@@ -3,9 +3,8 @@
  */
 target C {
   cmake-include: [
-    "../include/mlib-cmake-extension.cmake",
-    "../include/foo-cmake-compile-definition.txt"
-  ],
+      "../include/mlib-cmake-extension.cmake",
+      "../include/foo-cmake-compile-definition.txt"],
   timeout: 0 sec
 }
 
diff --git a/test/C/src/token/TokenMutable.lf b/test/C/src/token/TokenMutable.lf
index 7169f421c8..dce7db38e8 100644
--- a/test/C/src/token/TokenMutable.lf
+++ b/test/C/src/token/TokenMutable.lf
@@ -12,10 +12,10 @@ import TokenSource, TokenPrint, TokenScale from "lib/Token.lf"
 
 main reactor {
   s = new TokenSource()
-  g2 = new TokenScale(scale = 2)
-  g3 = new TokenScale(scale = 3)
-  p2 = new TokenPrint(scale = 2)
-  p3 = new TokenPrint(scale = 3)
+  g2 = new TokenScale(scale=2)
+  g3 = new TokenScale(scale=3)
+  p2 = new TokenPrint(scale=2)
+  p3 = new TokenPrint(scale=3)
   s.out -> g2.in
   s.out -> g3.in
   g2.out -> p2.in
diff --git a/test/C/src/token/TokenSourceScalePrint.lf b/test/C/src/token/TokenSourceScalePrint.lf
index 01d57936ff..dbfdf18c4d 100644
--- a/test/C/src/token/TokenSourceScalePrint.lf
+++ b/test/C/src/token/TokenSourceScalePrint.lf
@@ -12,8 +12,8 @@ import TokenSource, TokenPrint, TokenScale from "lib/Token.lf"
 
 main reactor {
   s = new TokenSource()
-  g2 = new TokenScale(scale = 2)
-  p2 = new TokenPrint(scale = 2)
+  g2 = new TokenScale(scale=2)
+  p2 = new TokenPrint(scale=2)
   s.out -> g2.in
   g2.out -> p2.in
 }
diff --git a/test/Cpp/src/ArrayParallel.lf b/test/Cpp/src/ArrayParallel.lf
index 739614442c..a2ad6e8233 100644
--- a/test/Cpp/src/ArrayParallel.lf
+++ b/test/Cpp/src/ArrayParallel.lf
@@ -9,9 +9,9 @@ import Source, Print from "ArrayPrint.lf"
 main reactor ArrayParallel {
   s = new Source()
   c1 = new Scale()
-  c2 = new Scale(scale = 3)
-  p1 = new Print(scale = 2)
-  p2 = new Print(scale = 3)
+  c2 = new Scale(scale=3)
+  p1 = new Print(scale=2)
+  p2 = new Print(scale=3)
   s.out -> c1.in
   s.out -> c2.in
   c1.out -> p1.in
diff --git a/test/Cpp/src/ArrayScale.lf b/test/Cpp/src/ArrayScale.lf
index 89bdf68ab9..0efb5933d1 100644
--- a/test/Cpp/src/ArrayScale.lf
+++ b/test/Cpp/src/ArrayScale.lf
@@ -23,8 +23,8 @@ reactor Scale(scale: int = 2) {
 
 main reactor ArrayScale {
   s = new Source()
-  c = new Scale(scale = 2)
-  p = new Print(scale = 2)
+  c = new Scale(scale=2)
+  p = new Print(scale=2)
   s.out -> c.in
   c.out -> p.in
 }
diff --git a/test/Cpp/src/Hello.lf b/test/Cpp/src/Hello.lf
index 0bf2f029da..419dc9610e 100644
--- a/test/Cpp/src/Hello.lf
+++ b/test/Cpp/src/Hello.lf
@@ -36,7 +36,7 @@ reactor HelloCpp(period: time = 2 sec, message: {= std::string =} = "Hello C++")
 }
 
 reactor Inside(period: time = 1 sec, message: std::string = "Composite default message.") {
-  third_instance = new HelloCpp(period = period, message = message)
+  third_instance = new HelloCpp(period=period, message=message)
 }
 
 main reactor Hello {
diff --git a/test/Cpp/src/NativeListsAndTimes.lf b/test/Cpp/src/NativeListsAndTimes.lf
index 7320f5acc5..b6e8550c50 100644
--- a/test/Cpp/src/NativeListsAndTimes.lf
+++ b/test/Cpp/src/NativeListsAndTimes.lf
@@ -2,14 +2,13 @@ target Cpp
 
 // This test passes if it is successfully compiled into valid target code.
 reactor Foo(
-  x: int = 0,
-  y: time = 0,                // Units are missing but not required
-  z = 1 msec,                 // Type is missing but not required
-  p: int[]{1, 2, 3, 4},       // List of integers
-  q: {= std::vector<reactor::Duration> =}{1 msec, 2 msec, 3 msec},
-  g: time[]{1 msec, 2 msec},  // List of time values
-  g2: int[] = {}
-) {
+    x: int = 0,
+    y: time = 0,                // Units are missing but not required
+    z = 1 msec,                 // Type is missing but not required
+    p: int[]{1, 2, 3, 4},       // List of integers
+    q: {= std::vector<reactor::Duration> =}{1 msec, 2 msec, 3 msec},
+    g: time[]{1 msec, 2 msec},  // List of time values
+    g2: int[] = {}) {
   state s: time = y  // Reference to explicitly typed time parameter
   state t: time = z  // Reference to implicitly typed time parameter
   state v: bool      // Uninitialized boolean state variable
diff --git a/test/Cpp/src/ParameterHierarchy.lf b/test/Cpp/src/ParameterHierarchy.lf
index dcef563d68..2b88513d64 100644
--- a/test/Cpp/src/ParameterHierarchy.lf
+++ b/test/Cpp/src/ParameterHierarchy.lf
@@ -19,7 +19,7 @@ reactor Deep(p: int = 0) {
 }
 
 reactor Intermediate(p: int = 10) {
-  a = new Deep(p = p)
+  a = new Deep(p=p)
 }
 
 reactor Another(p: int = 20) {
@@ -27,5 +27,5 @@ reactor Another(p: int = 20) {
 }
 
 main reactor ParameterHierarchy {
-  a = new Intermediate(p = 42)
+  a = new Intermediate(p=42)
 }
diff --git a/test/Cpp/src/ParameterizedState.lf b/test/Cpp/src/ParameterizedState.lf
index 9bea16475f..5aa96c4ee0 100644
--- a/test/Cpp/src/ParameterizedState.lf
+++ b/test/Cpp/src/ParameterizedState.lf
@@ -12,5 +12,5 @@ reactor Foo(bar: int = 4) {
 }
 
 main reactor ParameterizedState {
-  a = new Foo(bar = 42)
+  a = new Foo(bar=42)
 }
diff --git a/test/Cpp/src/ParametersOutOfOrder.lf b/test/Cpp/src/ParametersOutOfOrder.lf
index 4fa2a933ba..f7cb0805dd 100644
--- a/test/Cpp/src/ParametersOutOfOrder.lf
+++ b/test/Cpp/src/ParametersOutOfOrder.lf
@@ -12,5 +12,5 @@ reactor Foo(a: int = 0, b: std::string = "", c: float = 0.0) {
 }
 
 main reactor {
-  foo = new Foo(c = 3.14, b = "bar", a = 42)
+  foo = new Foo(c=3.14, b="bar", a=42)
 }
diff --git a/test/Cpp/src/Stride.lf b/test/Cpp/src/Stride.lf
index be44540bb4..85b6c1ef0d 100644
--- a/test/Cpp/src/Stride.lf
+++ b/test/Cpp/src/Stride.lf
@@ -23,7 +23,7 @@ reactor Display {
 }
 
 main reactor Stride {
-  c = new Count(stride = 2)
+  c = new Count(stride=2)
   d = new Display()
   c.y -> d.x
 }
diff --git a/test/Cpp/src/StructParallel.lf b/test/Cpp/src/StructParallel.lf
index 375fa41bb2..8d45f3f014 100644
--- a/test/Cpp/src/StructParallel.lf
+++ b/test/Cpp/src/StructParallel.lf
@@ -13,9 +13,9 @@ public preamble {=
 main reactor {
   s = new Source()
   c1 = new Scale()
-  c2 = new Scale(scale = 3)
-  p1 = new Print(expected_value = 84)
-  p2 = new Print(expected_value = 126)
+  c2 = new Scale(scale=3)
+  p1 = new Print(expected_value=84)
+  p2 = new Print(expected_value=126)
   s.out -> c1.in
   s.out -> c2.in
   c1.out -> p1.in
diff --git a/test/Cpp/src/StructScale.lf b/test/Cpp/src/StructScale.lf
index de3bef6579..71cdfaf058 100644
--- a/test/Cpp/src/StructScale.lf
+++ b/test/Cpp/src/StructScale.lf
@@ -23,7 +23,7 @@ reactor Scale(scale: int = 2) {
 main reactor StructScale {
   s = new Source()
   c = new Scale()
-  p = new Print(expected_value = 84)
+  p = new Print(expected_value=84)
   s.out -> c.in
   c.out -> p.in
 }
diff --git a/test/Cpp/src/TimeLimit.lf b/test/Cpp/src/TimeLimit.lf
index a25ebdf07c..dc296e16cb 100644
--- a/test/Cpp/src/TimeLimit.lf
+++ b/test/Cpp/src/TimeLimit.lf
@@ -40,7 +40,7 @@ reactor Destination {
 
 main reactor TimeLimit(period: time = 1 sec) {
   timer stop(10 sec)
-  c = new Clock(period = period)
+  c = new Clock(period=period)
   d = new Destination()
   c.y -> d.x
 
diff --git a/test/Cpp/src/Timeout_Test.lf b/test/Cpp/src/Timeout_Test.lf
index 95971d113a..30934358e4 100644
--- a/test/Cpp/src/Timeout_Test.lf
+++ b/test/Cpp/src/Timeout_Test.lf
@@ -38,7 +38,7 @@ reactor Consumer {
 
 main reactor Timeout_Test {
   consumer = new Consumer()
-  producer = new Sender(take_a_break_after = 10, break_interval = 1 msec)
+  producer = new Sender(take_a_break_after=10, break_interval = 1 msec)
 
   producer.out -> consumer.in
 }
diff --git a/test/Cpp/src/concurrent/HelloThreaded.lf b/test/Cpp/src/concurrent/HelloThreaded.lf
index 790aadf913..148cb71ac7 100644
--- a/test/Cpp/src/concurrent/HelloThreaded.lf
+++ b/test/Cpp/src/concurrent/HelloThreaded.lf
@@ -36,7 +36,7 @@ reactor HelloCpp(period: time = 2 sec, message: {= std::string =} = "Hello C++")
 }
 
 reactor Inside(period: time = 1 sec, message: {= std::string =} = "Composite default message.") {
-  third_instance = new HelloCpp(period = period, message = message)
+  third_instance = new HelloCpp(period=period, message=message)
 }
 
 main reactor {
diff --git a/test/Cpp/src/concurrent/TimeLimitThreaded.lf b/test/Cpp/src/concurrent/TimeLimitThreaded.lf
index 195ccef79f..eb2454efb0 100644
--- a/test/Cpp/src/concurrent/TimeLimitThreaded.lf
+++ b/test/Cpp/src/concurrent/TimeLimitThreaded.lf
@@ -41,7 +41,7 @@ reactor Destination {
 
 main reactor(period: time = 1 sec) {
   timer stop(10 sec)
-  c = new Clock(period = period)
+  c = new Clock(period=period)
   d = new Destination()
   c.y -> d.x
 
diff --git a/test/Cpp/src/enclave/EnclaveBank.lf b/test/Cpp/src/enclave/EnclaveBank.lf
index 64d1cba5a2..95cfb876a3 100644
--- a/test/Cpp/src/enclave/EnclaveBank.lf
+++ b/test/Cpp/src/enclave/EnclaveBank.lf
@@ -4,11 +4,10 @@ target Cpp {
 }
 
 reactor Node(
-  bank_index: size_t = 0,
-  id: std::string = {= "node" + std::to_string(bank_index) =},
-  period: time = 500 msec,
-  duration: time = 10 msec
-) {
+    bank_index: size_t = 0,
+    id: std::string = {= "node" + std::to_string(bank_index) =},
+    period: time = 500 msec,
+    duration: time = 10 msec) {
   logical action a: void
 
   reaction(startup, a) -> a {=
@@ -23,7 +22,7 @@ reactor Node(
 }
 
 main reactor {
-  slow = new Node(id = "slow", period = 1 sec, duration = 500 msec)
+  slow = new Node(id="slow", period = 1 sec, duration = 500 msec)
   @enclave
   nodes = new[2] Node()
 }
diff --git a/test/Cpp/src/enclave/EnclaveBankEach.lf b/test/Cpp/src/enclave/EnclaveBankEach.lf
index e4c497f422..d1b94748ba 100644
--- a/test/Cpp/src/enclave/EnclaveBankEach.lf
+++ b/test/Cpp/src/enclave/EnclaveBankEach.lf
@@ -4,11 +4,10 @@ target Cpp {
 }
 
 reactor Node(
-  bank_index: size_t = 0,
-  id: std::string = {= "node" + std::to_string(bank_index) =},
-  period: {= reactor::Duration =} = {= 100ms * (bank_index+1) =},
-  duration: {= reactor::Duration =} = {= 50ms + 100ms * bank_index =}
-) {
+    bank_index: size_t = 0,
+    id: std::string = {= "node" + std::to_string(bank_index) =},
+    period: {= reactor::Duration =} = {= 100ms * (bank_index+1) =},
+    duration: {= reactor::Duration =} = {= 50ms + 100ms * bank_index =}) {
   logical action a: void
 
   reaction(startup, a) -> a {=
@@ -23,7 +22,7 @@ reactor Node(
 }
 
 main reactor {
-  slow = new Node(id = "slow", period = {= 1s =}, duration = {= 700ms =})
+  slow = new Node(id="slow", period = {= 1s =}, duration = {= 700ms =})
   @enclave(each = true)
   nodes = new[2] Node()
 }
diff --git a/test/Cpp/src/enclave/EnclaveHelloWorld.lf b/test/Cpp/src/enclave/EnclaveHelloWorld.lf
index 7947dd0bf4..21b7374a09 100644
--- a/test/Cpp/src/enclave/EnclaveHelloWorld.lf
+++ b/test/Cpp/src/enclave/EnclaveHelloWorld.lf
@@ -5,8 +5,8 @@ reactor Hello(msg: std::string = "World") {
 }
 
 main reactor(msg1: std::string = "World", msg2: std::string = "Enclave") {
-  hello1 = new Hello(msg = msg1)
+  hello1 = new Hello(msg=msg1)
 
   @enclave
-  hello2 = new Hello(msg = msg2)
+  hello2 = new Hello(msg=msg2)
 }
diff --git a/test/Cpp/src/enclave/EnclaveHierarchy.lf b/test/Cpp/src/enclave/EnclaveHierarchy.lf
index 3fd3b6d528..1f745443a0 100644
--- a/test/Cpp/src/enclave/EnclaveHierarchy.lf
+++ b/test/Cpp/src/enclave/EnclaveHierarchy.lf
@@ -18,20 +18,20 @@ reactor Node(id: std::string = "node", period: time = 100 msec, duration: time =
 
 reactor MiddleNode {
   @enclave
-  inner = new Node(id = "inner", period = 1 sec, duration = 400 msec)
+  inner = new Node(id="inner", period = 1 sec, duration = 400 msec)
 
-  middle = new Node(id = "middle", period = 200 msec, duration = 70 msec)
+  middle = new Node(id="middle", period = 200 msec, duration = 70 msec)
 }
 
 reactor OuterNode {
   @enclave
   middle = new MiddleNode()
 
-  outer = new Node(id = "outer", period = 500 msec, duration = 200 msec)
+  outer = new Node(id="outer", period = 500 msec, duration = 200 msec)
 }
 
 main reactor {
   outer = new OuterNode()
   @enclave
-  node = new Node(id = "node", period = 2 sec, duration = 500 msec)
+  node = new Node(id="node", period = 2 sec, duration = 500 msec)
 }
diff --git a/test/Cpp/src/enclave/EnclaveMultiportToPort.lf b/test/Cpp/src/enclave/EnclaveMultiportToPort.lf
index e5eb8dac90..32ecc3b9b8 100644
--- a/test/Cpp/src/enclave/EnclaveMultiportToPort.lf
+++ b/test/Cpp/src/enclave/EnclaveMultiportToPort.lf
@@ -43,6 +43,6 @@ main reactor {
   @enclave
   b1 = new Destination()
   @enclave
-  b2 = new Destination(expected = 1)
+  b2 = new Destination(expected=1)
   a.out -> b1.in, b2.in
 }
diff --git a/test/Cpp/src/enclave/EnclaveMultiportToPort2.lf b/test/Cpp/src/enclave/EnclaveMultiportToPort2.lf
index 7f3c5ff938..8d65e1a811 100644
--- a/test/Cpp/src/enclave/EnclaveMultiportToPort2.lf
+++ b/test/Cpp/src/enclave/EnclaveMultiportToPort2.lf
@@ -42,6 +42,6 @@ main reactor {
   a = new Source()
   @enclave
   b1 = new Destination()
-  b2 = new Destination(expected = 1)
+  b2 = new Destination(expected=1)
   a.out -> b1.in, b2.in
 }
diff --git a/test/Cpp/src/multiport/BankToBankMultiport.lf b/test/Cpp/src/multiport/BankToBankMultiport.lf
index faffacb0cf..e8faa69a42 100644
--- a/test/Cpp/src/multiport/BankToBankMultiport.lf
+++ b/test/Cpp/src/multiport/BankToBankMultiport.lf
@@ -45,7 +45,7 @@ reactor Destination(width: size_t = 1) {
 }
 
 main reactor(bank_width: size_t = 4) {
-  a = new[bank_width] Source(width = 4)
-  b = new[bank_width] Destination(width = 4)
+  a = new[bank_width] Source(width=4)
+  b = new[bank_width] Destination(width=4)
   a.out -> b.in
 }
diff --git a/test/Cpp/src/multiport/BankToBankMultiportAfter.lf b/test/Cpp/src/multiport/BankToBankMultiportAfter.lf
index 6c9c81c5b4..df4220ad10 100644
--- a/test/Cpp/src/multiport/BankToBankMultiportAfter.lf
+++ b/test/Cpp/src/multiport/BankToBankMultiportAfter.lf
@@ -53,7 +53,7 @@ reactor Destination(width: size_t = 1) {
 }
 
 main reactor(bank_width: size_t = 4) {
-  a = new[bank_width] Source(width = 4)
-  b = new[bank_width] Destination(width = 4)
+  a = new[bank_width] Source(width=4)
+  b = new[bank_width] Destination(width=4)
   a.out -> b.in after 200 msec
 }
diff --git a/test/Cpp/src/multiport/BroadcastMultipleAfter.lf b/test/Cpp/src/multiport/BroadcastMultipleAfter.lf
index f24a5f7c8c..0e53939ac7 100644
--- a/test/Cpp/src/multiport/BroadcastMultipleAfter.lf
+++ b/test/Cpp/src/multiport/BroadcastMultipleAfter.lf
@@ -36,9 +36,9 @@ reactor Sink(bank_index: size_t = 0) {
 }
 
 main reactor {
-  source1 = new Source(value = 1)
-  source2 = new Source(value = 2)
-  source3 = new Source(value = 3)
+  source1 = new Source(value=1)
+  source2 = new Source(value=2)
+  source3 = new Source(value=3)
   sink = new[9] Sink()
   (source1.out, source2.out, source3.out)+ -> sink.in after 1 sec
 }
diff --git a/test/Cpp/src/multiport/FullyConnected.lf b/test/Cpp/src/multiport/FullyConnected.lf
index 09826be5f2..0d89d96258 100644
--- a/test/Cpp/src/multiport/FullyConnected.lf
+++ b/test/Cpp/src/multiport/FullyConnected.lf
@@ -37,6 +37,6 @@ reactor Node(bank_index: size_t = 0, num_nodes: size_t = 4) {
 }
 
 main reactor(num_nodes: size_t = 4) {
-  nodes = new[num_nodes] Node(num_nodes = num_nodes)
+  nodes = new[num_nodes] Node(num_nodes=num_nodes)
   (nodes.out)+ -> nodes.in
 }
diff --git a/test/Cpp/src/multiport/FullyConnectedAddressable.lf b/test/Cpp/src/multiport/FullyConnectedAddressable.lf
index 5047109cf8..c52039e470 100644
--- a/test/Cpp/src/multiport/FullyConnectedAddressable.lf
+++ b/test/Cpp/src/multiport/FullyConnectedAddressable.lf
@@ -42,9 +42,9 @@ reactor Node(bank_index: size_t = 0, num_nodes: size_t = 4) {
 }
 
 main reactor(num_nodes: size_t = 4) {
-  nodes1 = new[num_nodes] Node(num_nodes = num_nodes)
+  nodes1 = new[num_nodes] Node(num_nodes=num_nodes)
   nodes1.out -> interleaved(nodes1.in)
 
-  nodes2 = new[num_nodes] Node(num_nodes = num_nodes)
+  nodes2 = new[num_nodes] Node(num_nodes=num_nodes)
   interleaved(nodes2.out) -> nodes2.in
 }
diff --git a/test/Cpp/src/multiport/FullyConnectedAddressableAfter.lf b/test/Cpp/src/multiport/FullyConnectedAddressableAfter.lf
index d3593ab530..4af328f569 100644
--- a/test/Cpp/src/multiport/FullyConnectedAddressableAfter.lf
+++ b/test/Cpp/src/multiport/FullyConnectedAddressableAfter.lf
@@ -4,9 +4,9 @@ target Cpp
 import Node from "FullyConnectedAddressable.lf"
 
 main reactor(num_nodes: size_t = 4) {
-  nodes1 = new[num_nodes] Node(num_nodes = num_nodes)
+  nodes1 = new[num_nodes] Node(num_nodes=num_nodes)
   nodes1.out -> interleaved(nodes1.in) after 200 msec
 
-  nodes2 = new[num_nodes] Node(num_nodes = num_nodes)
+  nodes2 = new[num_nodes] Node(num_nodes=num_nodes)
   interleaved(nodes2.out) -> nodes2.in after 400 msec
 }
diff --git a/test/Cpp/src/multiport/MultiportFromBank.lf b/test/Cpp/src/multiport/MultiportFromBank.lf
index 65d3554b3f..6167eb2612 100644
--- a/test/Cpp/src/multiport/MultiportFromBank.lf
+++ b/test/Cpp/src/multiport/MultiportFromBank.lf
@@ -37,6 +37,6 @@ reactor Destination(port_width: size_t = 2) {
 
 main reactor(width: size_t = 4) {
   a = new[width] Source()
-  b = new Destination(port_width = width)
+  b = new Destination(port_width=width)
   a.out -> b.in
 }
diff --git a/test/Cpp/src/multiport/MultiportToHierarchy.lf b/test/Cpp/src/multiport/MultiportToHierarchy.lf
index 6e7a8e757b..e737018a0c 100644
--- a/test/Cpp/src/multiport/MultiportToHierarchy.lf
+++ b/test/Cpp/src/multiport/MultiportToHierarchy.lf
@@ -51,7 +51,7 @@ reactor Container(width: size_t = 4) {
 }
 
 main reactor MultiportToHierarchy(width: size_t = 4) {
-  a = new Source(width = width)
-  b = new Container(width = width)
+  a = new Source(width=width)
+  b = new Container(width=width)
   a.out -> b.in
 }
diff --git a/test/Cpp/src/multiport/MultiportToMultiport2.lf b/test/Cpp/src/multiport/MultiportToMultiport2.lf
index eafe9fee3c..efc8de346d 100644
--- a/test/Cpp/src/multiport/MultiportToMultiport2.lf
+++ b/test/Cpp/src/multiport/MultiportToMultiport2.lf
@@ -29,8 +29,8 @@ reactor Destination(width: size_t = 2) {
 }
 
 main reactor MultiportToMultiport2 {
-  a1 = new Source(width = 3)
-  a2 = new Source(width = 2)
-  b = new Destination(width = 5)
+  a1 = new Source(width=3)
+  a2 = new Source(width=2)
+  b = new Destination(width=5)
   a1.out, a2.out -> b.in
 }
diff --git a/test/Cpp/src/multiport/MultiportToMultiport2After.lf b/test/Cpp/src/multiport/MultiportToMultiport2After.lf
index ed64200076..a5eca82c58 100644
--- a/test/Cpp/src/multiport/MultiportToMultiport2After.lf
+++ b/test/Cpp/src/multiport/MultiportToMultiport2After.lf
@@ -35,8 +35,8 @@ reactor Destination(width: size_t = 2) {
 }
 
 main reactor {
-  a1 = new Source(width = 3)
-  a2 = new Source(width = 2)
-  b = new Destination(width = 5)
+  a1 = new Source(width=3)
+  a2 = new Source(width=2)
+  b = new Destination(width=5)
   a1.out, a2.out -> b.in after 1 sec
 }
diff --git a/test/Cpp/src/multiport/MultiportToPort.lf b/test/Cpp/src/multiport/MultiportToPort.lf
index ed69542aa7..3238d68ec4 100644
--- a/test/Cpp/src/multiport/MultiportToPort.lf
+++ b/test/Cpp/src/multiport/MultiportToPort.lf
@@ -40,6 +40,6 @@ reactor Destination(expected: int = 0) {
 main reactor MultiportToPort {
   a = new Source()
   b1 = new Destination()
-  b2 = new Destination(expected = 1)
+  b2 = new Destination(expected=1)
   a.out -> b1.in, b2.in
 }
diff --git a/test/Cpp/src/multiport/WidthGivenByCode.lf b/test/Cpp/src/multiport/WidthGivenByCode.lf
index 6bfc814650..123b0fe177 100644
--- a/test/Cpp/src/multiport/WidthGivenByCode.lf
+++ b/test/Cpp/src/multiport/WidthGivenByCode.lf
@@ -18,8 +18,8 @@ reactor Foo(a: size_t = 8, b: size_t = 2) {
 
 main reactor {
   foo1 = new Foo()
-  foo2 = new Foo(a = 10, b = 3)
-  foo3 = new Foo(a = 9, b = 9)
+  foo2 = new Foo(a=10, b=3)
+  foo3 = new Foo(a=9, b=9)
   foo_bank = new[{= 42 =}] Foo()
 
   reaction(startup) foo_bank.out {=
diff --git a/test/Cpp/src/target/BraceAndParenInitialization.lf b/test/Cpp/src/target/BraceAndParenInitialization.lf
index e6ab2168f3..d287addb07 100644
--- a/test/Cpp/src/target/BraceAndParenInitialization.lf
+++ b/test/Cpp/src/target/BraceAndParenInitialization.lf
@@ -1,11 +1,11 @@
 target Cpp
 
 reactor Foo(
-  param_list_1: std::vector<int>(4, 2),  // list containing [2,2,2,2]
-  param_list_2: std::vector<int>{4, 2},  // list containing [4,2]
-  param_list_3: std::vector<int>(4, 2),  // list containing [2,2,2,2]
-  param_list_4: std::vector<int>{4, 2}   // list containing [4,2]
-) {
+    param_list_1: std::vector<int>(4, 2),  // list containing [2,2,2,2]
+    param_list_2: std::vector<int>{4, 2},  // list containing [4,2]
+    param_list_3: std::vector<int>(4, 2),  // list containing [2,2,2,2]
+    // list containing [4,2]
+    param_list_4: std::vector<int>{4, 2}) {
   state state_list_1: std::vector<int>(6, 42)  // list containing [42,42,42,42,42,42]
   state state_list_2: std::vector<int>{6, 42}  // list containing [6,42]
 
diff --git a/test/Cpp/src/target/CMakeInclude.lf b/test/Cpp/src/target/CMakeInclude.lf
index 1291e56425..2527966dc6 100644
--- a/test/Cpp/src/target/CMakeInclude.lf
+++ b/test/Cpp/src/target/CMakeInclude.lf
@@ -3,9 +3,8 @@
  */
 target Cpp {
   cmake-include: [
-    "../include/mlib-cmake-extension.cmake",
-    "../include/bar-cmake-compile-definition.txt"
-  ],
+      "../include/mlib-cmake-extension.cmake",
+      "../include/bar-cmake-compile-definition.txt"],
   timeout: 0 sec
 }
 
diff --git a/test/Cpp/src/target/CliParserGenericArguments.lf b/test/Cpp/src/target/CliParserGenericArguments.lf
index 4ab5729088..d8922338b1 100644
--- a/test/Cpp/src/target/CliParserGenericArguments.lf
+++ b/test/Cpp/src/target/CliParserGenericArguments.lf
@@ -43,20 +43,19 @@ private preamble {=
 =}
 
 main reactor CliParserGenericArguments(
-  int_value: int = 10,
-  signed_value: signed = -10,
-  unsigned_value: unsigned = 11,
-  long_value: long = -100,
-  unsigned_long_value: {= unsigned_long =} = 42,
-  long_long_value: {= long_long =} = -42,
-  ull_value: {= uns_long_long =} = 42,
-  bool_value: bool = false,
-  char_value: char = 'T',
-  double_value: double = 4.2,
-  long_double_value: {= long_double =} = 4.2,
-  float_value: float = 10.5,
-  string_value: string = "This is a testvalue",
-  custom_class_value: {= CustomClass =}("Peter")
-) {
+    int_value: int = 10,
+    signed_value: signed = -10,
+    unsigned_value: unsigned = 11,
+    long_value: long = -100,
+    unsigned_long_value: {= unsigned_long =} = 42,
+    long_long_value: {= long_long =} = -42,
+    ull_value: {= uns_long_long =} = 42,
+    bool_value: bool = false,
+    char_value: char = 'T',
+    double_value: double = 4.2,
+    long_double_value: {= long_double =} = 4.2,
+    float_value: float = 10.5,
+    string_value: string = "This is a testvalue",
+    custom_class_value: {= CustomClass =}("Peter")) {
   reaction(startup) {= std::cout << "Hello World!\n"; =}
 }
diff --git a/test/Cpp/src/target/CombinedTypeNames.lf b/test/Cpp/src/target/CombinedTypeNames.lf
index e4ae72cfcd..6902ef8550 100644
--- a/test/Cpp/src/target/CombinedTypeNames.lf
+++ b/test/Cpp/src/target/CombinedTypeNames.lf
@@ -15,5 +15,5 @@ reactor Foo(bar: {= unsigned int =} = 0, baz: {= const unsigned int* =} = {= nul
 }
 
 main reactor(bar: {= unsigned int =} = 42) {
-  foo = new Foo(bar = bar, baz = {= &bar =})
+  foo = new Foo(bar=bar, baz = {= &bar =})
 }
diff --git a/test/Cpp/src/target/GenericParameterAndState.lf b/test/Cpp/src/target/GenericParameterAndState.lf
index 76cb2f9c3d..0ad99fd4ca 100644
--- a/test/Cpp/src/target/GenericParameterAndState.lf
+++ b/test/Cpp/src/target/GenericParameterAndState.lf
@@ -16,6 +16,6 @@ reactor Foo<T>(bar: T = 0, expected: T = 14542135) {
 }
 
 main reactor {
-  foo = new Foo<int>(bar = 42, expected = 42)
-  bar = new Foo<int>(expected = 0)  // default value is used
+  foo = new Foo<int>(bar=42, expected=42)
+  bar = new Foo<int>(expected=0)  // default value is used
 }
diff --git a/test/Cpp/src/target/InitializerSyntax.lf b/test/Cpp/src/target/InitializerSyntax.lf
index 998c711f1f..ce77868cd9 100644
--- a/test/Cpp/src/target/InitializerSyntax.lf
+++ b/test/Cpp/src/target/InitializerSyntax.lf
@@ -31,20 +31,20 @@ public preamble {=
 =}
 
 reactor TestReactor(
-  /**
-   * FIXME: should work without an explicit initialization, see
-   * https://github.com/lf-lang/lingua-franca/issues/623
-   */
-  // p_default: TestType, constructor #1
-  p_default: TestType(),
-  p_empty: TestType(),  // constructor #1
-  p_value: TestType(24),  // constructor #2
-  p_init_empty: TestType{},  // constructor #1
-  p_init_empty2: TestType({}),  // constructor #1
-  p_init_some: TestType{2, 6, 6, 3, 1},  // constructor #1
-  p_assign_init_empty: TestType = {},  // constructor #1
-  p_assign_init_some: TestType = {4, 2, 1}  // constructor #3
-) {
+    /**
+     * FIXME: should work without an explicit initialization, see
+     * https://github.com/lf-lang/lingua-franca/issues/623
+     */
+    // p_default: TestType, constructor #1
+    p_default: TestType(),
+    p_empty: TestType(),  // constructor #1
+    p_value: TestType(24),  // constructor #2
+    p_init_empty: TestType{},  // constructor #1
+    p_init_empty2: TestType({}),  // constructor #1
+    p_init_some: TestType{2, 6, 6, 3, 1},  // constructor #1
+    p_assign_init_empty: TestType = {},  // constructor #1
+    // constructor #3
+    p_assign_init_some: TestType = {4, 2, 1}) {
   state s_default: TestType                 // constructor #1
   state s_empty: TestType()                 // constructor #1
   state s_value: TestType(24)               // constructor #2
diff --git a/test/Python/src/ArrayAsType.lf b/test/Python/src/ArrayAsType.lf
index 554293a623..2a12dc9db2 100644
--- a/test/Python/src/ArrayAsType.lf
+++ b/test/Python/src/ArrayAsType.lf
@@ -12,7 +12,7 @@ reactor Source {
 }
 
 # The scale parameter is just for testing.
-reactor Print(scale = 1) {
+reactor Print(scale=1) {
   input _in
 
   reaction(_in) {=
diff --git a/test/Python/src/ArrayFree.lf b/test/Python/src/ArrayFree.lf
index 24f9b4b754..6e41a52243 100644
--- a/test/Python/src/ArrayFree.lf
+++ b/test/Python/src/ArrayFree.lf
@@ -7,7 +7,7 @@ target Python
 import Source, Print from "ArrayPrint.lf"
 import Scale from "ArrayScale.lf"
 
-reactor Free(scale = 2) {
+reactor Free(scale=2) {
   mutable input _in
 
   reaction(_in) {=
@@ -20,7 +20,7 @@ main reactor ArrayFree {
   s = new Source()
   c = new Free()
   c2 = new Scale()
-  p = new Print(scale = 2)
+  p = new Print(scale=2)
   s.out -> c._in
   s.out -> c2._in
   c2.out -> p._in
diff --git a/test/Python/src/ArrayParallel.lf b/test/Python/src/ArrayParallel.lf
index 1316f14ee5..915adf6cf6 100644
--- a/test/Python/src/ArrayParallel.lf
+++ b/test/Python/src/ArrayParallel.lf
@@ -9,9 +9,9 @@ import Source, Print from "ArrayPrint.lf"
 main reactor ArrayParallel {
   s = new Source()
   c1 = new Scale()
-  c2 = new Scale(scale = 3)
-  p1 = new Print(scale = 2)
-  p2 = new Print(scale = 3)
+  c2 = new Scale(scale=3)
+  p1 = new Print(scale=2)
+  p2 = new Print(scale=3)
   s.out -> c1._in
   s.out -> c2._in
   c1.out -> p1._in
diff --git a/test/Python/src/ArrayPrint.lf b/test/Python/src/ArrayPrint.lf
index 3d77584d1d..1dc8d68aee 100644
--- a/test/Python/src/ArrayPrint.lf
+++ b/test/Python/src/ArrayPrint.lf
@@ -12,7 +12,7 @@ reactor Source {
 }
 
 # The scale parameter is just for testing.
-reactor Print(scale = 1) {
+reactor Print(scale=1) {
   input _in
 
   reaction(_in) {=
diff --git a/test/Python/src/ArrayScale.lf b/test/Python/src/ArrayScale.lf
index a174053b2c..69e70d850d 100644
--- a/test/Python/src/ArrayScale.lf
+++ b/test/Python/src/ArrayScale.lf
@@ -5,7 +5,7 @@ target Python
 
 import Print, Source from "ArrayPrint.lf"
 
-reactor Scale(scale = 2) {
+reactor Scale(scale=2) {
   mutable input _in
   output out
 
@@ -19,7 +19,7 @@ reactor Scale(scale = 2) {
 main reactor ArrayScale {
   s = new Source()
   c = new Scale()
-  p = new Print(scale = 2)
+  p = new Print(scale=2)
   s.out -> c._in
   c.out -> p._in
 }
diff --git a/test/Python/src/DelayArray.lf b/test/Python/src/DelayArray.lf
index fd2c113c0f..858ebd166c 100644
--- a/test/Python/src/DelayArray.lf
+++ b/test/Python/src/DelayArray.lf
@@ -25,7 +25,7 @@ reactor Source {
 }
 
 # The scale parameter is just for testing.
-reactor Print(scale = 1) {
+reactor Print(scale=1) {
   input _in
 
   reaction(_in) {=
diff --git a/test/Python/src/DelayArrayWithAfter.lf b/test/Python/src/DelayArrayWithAfter.lf
index a13dbe1c2d..35aff98699 100644
--- a/test/Python/src/DelayArrayWithAfter.lf
+++ b/test/Python/src/DelayArrayWithAfter.lf
@@ -18,7 +18,7 @@ reactor Source {
 }
 
 # The scale parameter is just for testing.
-reactor Print(scale = 1) {
+reactor Print(scale=1) {
   input _in
   state iteration = 1
   state inputs_received = 0
diff --git a/test/Python/src/DelayStruct.lf b/test/Python/src/DelayStruct.lf
index d02f43ce58..c71acc455a 100644
--- a/test/Python/src/DelayStruct.lf
+++ b/test/Python/src/DelayStruct.lf
@@ -26,7 +26,7 @@ reactor Source {
 }
 
 # expected parameter is for testing.
-reactor Print(expected = 42) {
+reactor Print(expected=42) {
   input _in
 
   reaction(_in) {=
diff --git a/test/Python/src/DelayStructWithAfter.lf b/test/Python/src/DelayStructWithAfter.lf
index 4ea5827157..9eed6f904c 100644
--- a/test/Python/src/DelayStructWithAfter.lf
+++ b/test/Python/src/DelayStructWithAfter.lf
@@ -12,7 +12,7 @@ reactor Source {
 }
 
 # expected parameter is for testing.
-reactor Print(expected = 42) {
+reactor Print(expected=42) {
   input _in
 
   reaction(_in) {=
diff --git a/test/Python/src/DoubleReaction.lf b/test/Python/src/DoubleReaction.lf
index 855dbdfe6a..b7897b77d4 100644
--- a/test/Python/src/DoubleReaction.lf
+++ b/test/Python/src/DoubleReaction.lf
@@ -5,7 +5,7 @@ target Python {
   fast: true
 }
 
-reactor Clock(offset = 0, period = 1 sec) {
+reactor Clock(offset=0, period = 1 sec) {
   output y
   timer t(offset, period)
   state count = 0
diff --git a/test/Python/src/Gain.lf b/test/Python/src/Gain.lf
index 769d08f78e..09067e7688 100644
--- a/test/Python/src/Gain.lf
+++ b/test/Python/src/Gain.lf
@@ -1,7 +1,7 @@
 # Example in the Wiki.
 target Python
 
-reactor Scale(scale = 2) {
+reactor Scale(scale=2) {
   input x
   output y
 
diff --git a/test/Python/src/Hello.lf b/test/Python/src/Hello.lf
index 4f9dd68f47..9ed82e2003 100644
--- a/test/Python/src/Hello.lf
+++ b/test/Python/src/Hello.lf
@@ -38,7 +38,7 @@ reactor Reschedule(period = 2 sec, message = "Hello Python") {
 }
 
 reactor Inside(period = 1 sec, message = "Composite default message.") {
-  third_instance = new Reschedule(period = period, message = message)
+  third_instance = new Reschedule(period=period, message=message)
 }
 
 main reactor Hello {
diff --git a/test/Python/src/IdentifierLength.lf b/test/Python/src/IdentifierLength.lf
index e80c3e3f7a..cb23bcd0fe 100644
--- a/test/Python/src/IdentifierLength.lf
+++ b/test/Python/src/IdentifierLength.lf
@@ -5,8 +5,7 @@ target Python {
 }
 
 reactor A_Really_Long_Name_For_A_Source_But_Not_Quite_255_Characters_Which_Is_The_Maximum_For_The_Python_Target(
-  period = 2 sec
-) {
+    period = 2 sec) {
   output y
   timer t(1 sec, period)
   state count = 0
@@ -31,9 +30,7 @@ reactor Another_Really_Long_Name_For_A_Test_Class {
 }
 
 main reactor IdentifierLength {
-  a_really_long_name_for_a_source_instance = new A_Really_Long_Name_For_A_Source_But_Not_Quite_255_Characters_Which_Is_The_Maximum_For_The_Python_Target(
-
-  )
+  a_really_long_name_for_a_source_instance = new A_Really_Long_Name_For_A_Source_But_Not_Quite_255_Characters_Which_Is_The_Maximum_For_The_Python_Target()
   another_really_long_name_for_a_test_instance = new Another_Really_Long_Name_For_A_Test_Class()
   a_really_long_name_for_a_source_instance.y -> another_really_long_name_for_a_test_instance.x
 }
diff --git a/test/Python/src/NativeListsAndTimes.lf b/test/Python/src/NativeListsAndTimes.lf
index 28a7d5c015..8a5de9d148 100644
--- a/test/Python/src/NativeListsAndTimes.lf
+++ b/test/Python/src/NativeListsAndTimes.lf
@@ -2,13 +2,13 @@ target Python
 
 # This test passes if it is successfully compiled into valid target code.
 main reactor(
-  x = 0,
-  y = 0,             # Units are missing but not required
-  z = 1 msec,        # Type is missing but not required
-  p(1, 2, 3, 4),     # List of integers
-  q(1 msec, 2 msec, 3 msec),  # list of time values
-  g(1 msec, 2 msec)  # List of time values
-) {
+    x=0,
+    y=0,               # Units are missing but not required
+    z = 1 msec,        # Type is missing but not required
+    p(1, 2, 3, 4),     # List of integers
+    q(1 msec, 2 msec, 3 msec),  # list of time values
+    # List of time values
+    g(1 msec, 2 msec)) {
   state s = y        # Reference to explicitly typed time parameter
   state t = z        # Reference to implicitly typed time parameter
   state v            # Uninitialized boolean state variable
diff --git a/test/Python/src/ParameterizedState.lf b/test/Python/src/ParameterizedState.lf
index 32791918de..2553cfcfd2 100644
--- a/test/Python/src/ParameterizedState.lf
+++ b/test/Python/src/ParameterizedState.lf
@@ -1,6 +1,6 @@
 target Python
 
-reactor Foo(bar = 42) {
+reactor Foo(bar=42) {
   state baz = bar
 
   reaction(startup) {= print("Baz: ", self.baz) =}
diff --git a/test/Python/src/PeriodicDesugared.lf b/test/Python/src/PeriodicDesugared.lf
index 7c6f6768f2..a0b2828cd3 100644
--- a/test/Python/src/PeriodicDesugared.lf
+++ b/test/Python/src/PeriodicDesugared.lf
@@ -3,7 +3,7 @@ target Python {
   timeout: 1 sec
 }
 
-main reactor(offset = 0, period = 500 msec) {
+main reactor(offset=0, period = 500 msec) {
   logical action init(offset)
   logical action recur(period)
 
diff --git a/test/Python/src/PingPong.lf b/test/Python/src/PingPong.lf
index 5be9cfb50b..7688ccf19e 100644
--- a/test/Python/src/PingPong.lf
+++ b/test/Python/src/PingPong.lf
@@ -21,7 +21,7 @@ target Python {
   fast: true
 }
 
-reactor Ping(count = 10) {
+reactor Ping(count=10) {
   input receive
   output send
   state pingsLeft = count
@@ -40,7 +40,7 @@ reactor Ping(count = 10) {
   =}
 }
 
-reactor Pong(expected = 10) {
+reactor Pong(expected=10) {
   input receive
   output send
   state count = 0
diff --git a/test/Python/src/SetArray.lf b/test/Python/src/SetArray.lf
index 2e7e504836..d3a25da17e 100644
--- a/test/Python/src/SetArray.lf
+++ b/test/Python/src/SetArray.lf
@@ -9,7 +9,7 @@ reactor Source {
 }
 
 # The scale parameter is just for testing.
-reactor Print(scale = 1) {
+reactor Print(scale=1) {
   input _in
 
   reaction(_in) {=
diff --git a/test/Python/src/Stride.lf b/test/Python/src/Stride.lf
index db83ecc2e6..7572ea17aa 100644
--- a/test/Python/src/Stride.lf
+++ b/test/Python/src/Stride.lf
@@ -5,7 +5,7 @@ target Python {
   fast: true
 }
 
-reactor Count(stride = 1) {
+reactor Count(stride=1) {
   state count = 1
   output y
   timer t(0, 100 msec)
@@ -29,7 +29,7 @@ reactor Display {
 }
 
 main reactor Stride {
-  c = new Count(stride = 2)
+  c = new Count(stride=2)
   d = new Display()
   c.y -> d.x
 }
diff --git a/test/Python/src/StructAsType.lf b/test/Python/src/StructAsType.lf
index a16831f641..d64690aa87 100644
--- a/test/Python/src/StructAsType.lf
+++ b/test/Python/src/StructAsType.lf
@@ -14,7 +14,7 @@ reactor Source {
 }
 
 # expected parameter is for testing.
-reactor Print(expected = 42) {
+reactor Print(expected=42) {
   input _in
 
   reaction(_in) {=
diff --git a/test/Python/src/StructAsTypeDirect.lf b/test/Python/src/StructAsTypeDirect.lf
index 7b903272a8..b668e5ba65 100644
--- a/test/Python/src/StructAsTypeDirect.lf
+++ b/test/Python/src/StructAsTypeDirect.lf
@@ -17,7 +17,7 @@ reactor Source {
 }
 
 # expected parameter is for testing.
-reactor Print(expected = 42) {
+reactor Print(expected=42) {
   input _in
 
   reaction(_in) {=
diff --git a/test/Python/src/StructParallel.lf b/test/Python/src/StructParallel.lf
index 1f5a51fa50..6721e4ae11 100644
--- a/test/Python/src/StructParallel.lf
+++ b/test/Python/src/StructParallel.lf
@@ -8,7 +8,7 @@ import Source from "StructScale.lf"
 
 preamble {= import hello =}
 
-reactor Check(expected = 42) {
+reactor Check(expected=42) {
   input _in
 
   reaction(_in) {=
@@ -19,7 +19,7 @@ reactor Check(expected = 42) {
   =}
 }
 
-reactor Print(scale = 2) {
+reactor Print(scale=2) {
   # Mutable keyword indicates that this reactor wants a writable copy of the input.
   mutable input _in
 
@@ -35,9 +35,9 @@ reactor Print(scale = 2) {
 main reactor StructParallel {
   s = new Source()
   c1 = new Print()
-  c2 = new Print(scale = 3)
-  p1 = new Check(expected = 84)
-  p2 = new Check(expected = 126)
+  c2 = new Print(scale=3)
+  p1 = new Check(expected=84)
+  p2 = new Check(expected=126)
   s.out -> c1._in
   s.out -> c2._in
   c1.out -> p1._in
diff --git a/test/Python/src/StructPrint.lf b/test/Python/src/StructPrint.lf
index e4303e1d09..897ac6567c 100644
--- a/test/Python/src/StructPrint.lf
+++ b/test/Python/src/StructPrint.lf
@@ -13,7 +13,7 @@ reactor Print {
 }
 
 # expected parameter is for testing.
-reactor Check(expected = 42) {
+reactor Check(expected=42) {
   input _in
 
   reaction(_in) {=
diff --git a/test/Python/src/StructScale.lf b/test/Python/src/StructScale.lf
index fa650211d8..c0e2cca854 100644
--- a/test/Python/src/StructScale.lf
+++ b/test/Python/src/StructScale.lf
@@ -13,7 +13,7 @@ reactor Source {
 }
 
 # expected parameter is for testing.
-reactor TestInput(expected = 42) {
+reactor TestInput(expected=42) {
   input _in
 
   reaction(_in) {=
@@ -24,7 +24,7 @@ reactor TestInput(expected = 42) {
   =}
 }
 
-reactor Print(scale = 2) {
+reactor Print(scale=2) {
   # Mutable keyword indicates that this reactor wants a writable copy of the input.
   mutable input _in
 
@@ -39,7 +39,7 @@ reactor Print(scale = 2) {
 main reactor StructScale {
   s = new Source()
   c = new Print()
-  p = new TestInput(expected = 84)
+  p = new TestInput(expected=84)
   s.out -> c._in
   c.out -> p._in
 }
diff --git a/test/Python/src/SubclassesAndStartup.lf b/test/Python/src/SubclassesAndStartup.lf
index 794ad83d53..5b53878e9d 100644
--- a/test/Python/src/SubclassesAndStartup.lf
+++ b/test/Python/src/SubclassesAndStartup.lf
@@ -15,7 +15,7 @@ reactor Super {
   =}
 }
 
-reactor SubA(name = "SubA") extends Super {
+reactor SubA(name="SubA") extends Super {
   reaction(startup) {=
     print("{:s} started".format(self.name))
     if self.count == 0:
@@ -24,7 +24,7 @@ reactor SubA(name = "SubA") extends Super {
   =}
 }
 
-reactor SubB(name = "SubB") extends Super {
+reactor SubB(name="SubB") extends Super {
   reaction(startup) {=
     print("{:s} started".format(self.name))
     if self.count == 0:
diff --git a/test/Python/src/TimeLimit.lf b/test/Python/src/TimeLimit.lf
index 54b0bbc7fb..29f5a16a2d 100644
--- a/test/Python/src/TimeLimit.lf
+++ b/test/Python/src/TimeLimit.lf
@@ -4,7 +4,7 @@ target Python {
   fast: true
 }
 
-reactor Clock(offset = 0, period = 1 sec) {
+reactor Clock(offset=0, period = 1 sec) {
   output y
   timer t(offset, period)
   state count = 0
@@ -38,7 +38,7 @@ reactor Destination {
 
 main reactor TimeLimit(period = 1 sec) {
   timer stop(10 sec)
-  c = new Clock(period = period)
+  c = new Clock(period=period)
   d = new Destination()
   c.y -> d.x
 
diff --git a/test/Python/src/TimeState.lf b/test/Python/src/TimeState.lf
index 6a82c5fbf9..ab6d435633 100644
--- a/test/Python/src/TimeState.lf
+++ b/test/Python/src/TimeState.lf
@@ -1,6 +1,6 @@
 target Python
 
-reactor Foo(bar = 42) {
+reactor Foo(bar=42) {
   state baz = 500 msec
 
   reaction(startup) {= print("Baz: ", self.baz) =}
diff --git a/test/Python/src/federated/ChainWithDelay.lf b/test/Python/src/federated/ChainWithDelay.lf
index 8199b0b319..55e77d4441 100644
--- a/test/Python/src/federated/ChainWithDelay.lf
+++ b/test/Python/src/federated/ChainWithDelay.lf
@@ -14,7 +14,7 @@ import TestCount from "../lib/TestCount.lf"
 federated reactor {
   c = new Count(period = 1 msec)
   i = new InternalDelay(delay = 500 usec)
-  t = new TestCount(num_inputs = 3)
+  t = new TestCount(num_inputs=3)
   c.out -> i.in_
   i.out -> t.in_
 }
diff --git a/test/Python/src/federated/DecentralizedP2PComm.lf b/test/Python/src/federated/DecentralizedP2PComm.lf
index 922b3a7008..8319964aaa 100644
--- a/test/Python/src/federated/DecentralizedP2PComm.lf
+++ b/test/Python/src/federated/DecentralizedP2PComm.lf
@@ -5,7 +5,7 @@ target Python {
   coordination: decentralized
 }
 
-reactor Platform(start = 0, expected_start = 0, stp_offset_param = 0) {
+reactor Platform(start=0, expected_start=0, stp_offset_param=0) {
   preamble {= import sys =}
   input in_
   output out
@@ -40,8 +40,8 @@ reactor Platform(start = 0, expected_start = 0, stp_offset_param = 0) {
 }
 
 federated reactor DecentralizedP2PComm {
-  a = new Platform(expected_start = 100, stp_offset_param = 10 msec)
-  b = new Platform(start = 100, stp_offset_param = 10 msec)
+  a = new Platform(expected_start=100, stp_offset_param = 10 msec)
+  b = new Platform(start=100, stp_offset_param = 10 msec)
   a.out -> b.in_
   b.out -> a.in_
 }
diff --git a/test/Python/src/federated/DecentralizedP2PUnbalancedTimeout.lf b/test/Python/src/federated/DecentralizedP2PUnbalancedTimeout.lf
index a91a9fd9ec..5560bcaf42 100644
--- a/test/Python/src/federated/DecentralizedP2PUnbalancedTimeout.lf
+++ b/test/Python/src/federated/DecentralizedP2PUnbalancedTimeout.lf
@@ -11,7 +11,7 @@ target Python {
 }
 
 # reason for failing: lf_tag() not supported by the python target
-reactor Clock(offset = 0, period = 1 sec) {
+reactor Clock(offset=0, period = 1 sec) {
   output y
   timer t(offset, period)
   state count = 0
@@ -50,7 +50,7 @@ reactor Destination {
 }
 
 federated reactor(period = 10 usec) {
-  c = new Clock(period = period)
+  c = new Clock(period=period)
   d = new Destination()
   c.y -> d.x
 }
diff --git a/test/Python/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf b/test/Python/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf
index 15069f0aea..f23ff8ba8c 100644
--- a/test/Python/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf
+++ b/test/Python/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf
@@ -11,7 +11,7 @@ target Python {
   coordination: decentralized
 }
 
-reactor Clock(offset = 0, period = 1 sec) {
+reactor Clock(offset=0, period = 1 sec) {
   output y
   timer t(offset, period)
   state count = 0
@@ -43,7 +43,7 @@ reactor Destination {
 }
 
 federated reactor(period = 10 usec) {
-  c = new Clock(period = period)
+  c = new Clock(period=period)
   d = new Destination()
   c.y ~> d.x
 }
diff --git a/test/Python/src/federated/DistributedLoopedAction.lf b/test/Python/src/federated/DistributedLoopedAction.lf
index c278f04922..f5c4a643a7 100644
--- a/test/Python/src/federated/DistributedLoopedAction.lf
+++ b/test/Python/src/federated/DistributedLoopedAction.lf
@@ -9,7 +9,7 @@ target Python {
 
 import Sender from "../lib/LoopedActionSender.lf"
 
-reactor Receiver(take_a_break_after = 10, break_interval = 400 msec) {
+reactor Receiver(take_a_break_after=10, break_interval = 400 msec) {
   preamble {= import sys =}
   input in_
   state received_messages = 0
diff --git a/test/Python/src/federated/DistributedLoopedPhysicalAction.lf b/test/Python/src/federated/DistributedLoopedPhysicalAction.lf
index fa72e4c264..c5afb5675f 100644
--- a/test/Python/src/federated/DistributedLoopedPhysicalAction.lf
+++ b/test/Python/src/federated/DistributedLoopedPhysicalAction.lf
@@ -13,7 +13,7 @@ target Python {
   keepalive: true
 }
 
-reactor Sender(take_a_break_after = 10, break_interval = 550 msec) {
+reactor Sender(take_a_break_after=10, break_interval = 550 msec) {
   output out
   physical action act
   state sent_messages = 0
@@ -31,7 +31,7 @@ reactor Sender(take_a_break_after = 10, break_interval = 550 msec) {
   =}
 }
 
-reactor Receiver(take_a_break_after = 10, break_interval = 550 msec) {
+reactor Receiver(take_a_break_after=10, break_interval = 550 msec) {
   preamble {= import sys =}
   input in_
   state received_messages = 0
diff --git a/test/Python/src/federated/DistributedStop.lf b/test/Python/src/federated/DistributedStop.lf
index 04d4ebc37d..af80638910 100644
--- a/test/Python/src/federated/DistributedStop.lf
+++ b/test/Python/src/federated/DistributedStop.lf
@@ -61,8 +61,8 @@ reactor Sender {
 }
 
 reactor Receiver(
-  stp_offset = 10 msec  # Used in the decentralized variant of the test
-) {
+    # Used in the decentralized variant of the test
+    stp_offset = 10 msec) {
   input in_
   state reaction_invoked_correctly = False
 
diff --git a/test/Python/src/federated/DistributedStructParallel.lf b/test/Python/src/federated/DistributedStructParallel.lf
index 332f315bec..e20bb21030 100644
--- a/test/Python/src/federated/DistributedStructParallel.lf
+++ b/test/Python/src/federated/DistributedStructParallel.lf
@@ -13,9 +13,9 @@ preamble {= import hello =}
 federated reactor {
   s = new Source()
   c1 = new Print()
-  c2 = new Print(scale = 3)
-  p1 = new Check(expected = 84)
-  p2 = new Check(expected = 126)
+  c2 = new Print(scale=3)
+  p1 = new Check(expected=84)
+  p2 = new Check(expected=126)
   s.out -> c1._in
   s.out -> c2._in
   c1.out -> p1._in
diff --git a/test/Python/src/federated/DistributedStructScale.lf b/test/Python/src/federated/DistributedStructScale.lf
index 5156de1644..1551035c29 100644
--- a/test/Python/src/federated/DistributedStructScale.lf
+++ b/test/Python/src/federated/DistributedStructScale.lf
@@ -12,7 +12,7 @@ preamble {= import hello =}
 federated reactor {
   s = new Source()
   c = new Print()
-  p = new TestInput(expected = 84)
+  p = new TestInput(expected=84)
   s.out -> c._in
   c.out -> p._in
 }
diff --git a/test/Python/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf b/test/Python/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf
index 732311e6d2..b131a0600e 100644
--- a/test/Python/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf
+++ b/test/Python/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf
@@ -13,7 +13,7 @@ target Python {
   timeout: 5 sec
 }
 
-reactor Contained(incr = 1) {
+reactor Contained(incr=1) {
   timer t(0, 1 sec)
   input inp
   state count = 0
@@ -30,13 +30,13 @@ reactor Contained(incr = 1) {
   =}
 }
 
-reactor Looper(incr = 1, delay = 0 msec) {
+reactor Looper(incr=1, delay = 0 msec) {
   input inp
   output out
   state count = 0
   timer t(0, 1 sec)
 
-  c = new Contained(incr = incr)
+  c = new Contained(incr=incr)
   inp -> c.inp
 
   reaction(t) -> out {=
@@ -58,9 +58,9 @@ reactor Looper(incr = 1, delay = 0 msec) {
   =}
 }
 
-federated reactor(delay = 0) {
+federated reactor(delay=0) {
   left = new Looper()
-  right = new Looper(incr = -1)
+  right = new Looper(incr=-1)
   left.out -> right.inp
   right.out -> left.inp
 }
diff --git a/test/Python/src/federated/ParallelDestinations.lf b/test/Python/src/federated/ParallelDestinations.lf
index 4c65ba4351..a1bce28382 100644
--- a/test/Python/src/federated/ParallelDestinations.lf
+++ b/test/Python/src/federated/ParallelDestinations.lf
@@ -16,8 +16,8 @@ reactor Source {
 
 federated reactor {
   s = new Source()
-  t1 = new TestCount(num_inputs = 3)
-  t2 = new TestCount(num_inputs = 3)
+  t1 = new TestCount(num_inputs=3)
+  t2 = new TestCount(num_inputs=3)
 
   s.out -> t1.in_, t2.in_
 }
diff --git a/test/Python/src/federated/ParallelSources.lf b/test/Python/src/federated/ParallelSources.lf
index 222cb6dab1..6dd258d82d 100644
--- a/test/Python/src/federated/ParallelSources.lf
+++ b/test/Python/src/federated/ParallelSources.lf
@@ -9,8 +9,8 @@ import TestCount from "../lib/TestCount.lf"
 reactor Destination {
   input[2] in_
 
-  t1 = new TestCount(num_inputs = 3)
-  t2 = new TestCount(num_inputs = 3)
+  t1 = new TestCount(num_inputs=3)
+  t2 = new TestCount(num_inputs=3)
 
   in_ -> t1.in_, t2.in_
 }
diff --git a/test/Python/src/federated/ParallelSourcesMultiport.lf b/test/Python/src/federated/ParallelSourcesMultiport.lf
index 553b1f95ee..194205b77e 100644
--- a/test/Python/src/federated/ParallelSourcesMultiport.lf
+++ b/test/Python/src/federated/ParallelSourcesMultiport.lf
@@ -17,9 +17,9 @@ reactor Source {
 reactor Destination1 {
   input[3] in_
 
-  t1 = new TestCount(num_inputs = 3)
-  t2 = new TestCount(num_inputs = 3)
-  t3 = new TestCount(num_inputs = 3)
+  t1 = new TestCount(num_inputs=3)
+  t2 = new TestCount(num_inputs=3)
+  t3 = new TestCount(num_inputs=3)
 
   in_ -> t1.in_, t2.in_, t3.in_
 }
@@ -28,7 +28,7 @@ federated reactor {
   s1 = new Source()
   s2 = new Source()
   d1 = new Destination1()
-  t4 = new TestCount(num_inputs = 3)
+  t4 = new TestCount(num_inputs=3)
 
   s1.out, s2.out -> d1.in_, t4.in_
 }
diff --git a/test/Python/src/federated/PhysicalSTP.lf b/test/Python/src/federated/PhysicalSTP.lf
index a51319c6b3..5d1909a38e 100644
--- a/test/Python/src/federated/PhysicalSTP.lf
+++ b/test/Python/src/federated/PhysicalSTP.lf
@@ -6,7 +6,7 @@ target Python {
 
 import Count from "../lib/Count.lf"
 
-reactor Print(STP_offset = 0) {
+reactor Print(STP_offset=0) {
   preamble {= import sys =}
   input in_
   state c = 1
diff --git a/test/Python/src/federated/PingPongDistributed.lf b/test/Python/src/federated/PingPongDistributed.lf
index d977b6956b..a96fa5f1ce 100644
--- a/test/Python/src/federated/PingPongDistributed.lf
+++ b/test/Python/src/federated/PingPongDistributed.lf
@@ -19,7 +19,7 @@
  */
 target Python
 
-reactor Ping(count = 10) {
+reactor Ping(count=10) {
   input receive
   output send
   state pingsLeft = count
@@ -39,7 +39,7 @@ reactor Ping(count = 10) {
   =}
 }
 
-reactor Pong(expected = 10) {
+reactor Pong(expected=10) {
   preamble {= import sys =}
 
   input receive
@@ -62,9 +62,9 @@ reactor Pong(expected = 10) {
   =}
 }
 
-federated reactor(count = 10) {
-  ping = new Ping(count = count)
-  pong = new Pong(expected = count)
+federated reactor(count=10) {
+  ping = new Ping(count=count)
+  pong = new Pong(expected=count)
   ping.send ~> pong.receive
   pong.send ~> ping.receive
 }
diff --git a/test/Python/src/lib/Count.lf b/test/Python/src/lib/Count.lf
index 2f86fabf60..e1d0aaa996 100644
--- a/test/Python/src/lib/Count.lf
+++ b/test/Python/src/lib/Count.lf
@@ -1,6 +1,6 @@
 target Python
 
-reactor Count(offset = 0, period = 1 sec) {
+reactor Count(offset=0, period = 1 sec) {
   state count = 1
   output out
   timer t(offset, period)
diff --git a/test/Python/src/lib/LoopedActionSender.lf b/test/Python/src/lib/LoopedActionSender.lf
index e3b7dfa961..741e42b565 100644
--- a/test/Python/src/lib/LoopedActionSender.lf
+++ b/test/Python/src/lib/LoopedActionSender.lf
@@ -10,7 +10,7 @@ target Python
  * @param break_interval: Determines how long the reactor should take a break after sending
  * take_a_break_after messages.
  */
-reactor Sender(take_a_break_after = 10, break_interval = 400 msec) {
+reactor Sender(take_a_break_after=10, break_interval = 400 msec) {
   output out
   logical action act
   state sent_messages = 0
diff --git a/test/Python/src/lib/TestCount.lf b/test/Python/src/lib/TestCount.lf
index a079ff2e37..1e527adc90 100644
--- a/test/Python/src/lib/TestCount.lf
+++ b/test/Python/src/lib/TestCount.lf
@@ -8,7 +8,7 @@
  */
 target Python
 
-reactor TestCount(start = 1, stride = 1, num_inputs = 1) {
+reactor TestCount(start=1, stride=1, num_inputs=1) {
   preamble {= import sys =}
   state count = start
   state inputs_received = 0
diff --git a/test/Python/src/lib/TestCountMultiport.lf b/test/Python/src/lib/TestCountMultiport.lf
index d5b0a635cd..ffc997607a 100644
--- a/test/Python/src/lib/TestCountMultiport.lf
+++ b/test/Python/src/lib/TestCountMultiport.lf
@@ -10,7 +10,7 @@
  */
 target Python
 
-reactor TestCountMultiport(start = 1, stride = 1, num_inputs = 1, width = 2) {
+reactor TestCountMultiport(start=1, stride=1, num_inputs=1, width=2) {
   preamble {= import sys =}
   state count = start
   state inputs_received = 0
diff --git a/test/Python/src/modal_models/ConvertCaseTest.lf b/test/Python/src/modal_models/ConvertCaseTest.lf
index b6723f12d8..c29c0703bf 100644
--- a/test/Python/src/modal_models/ConvertCaseTest.lf
+++ b/test/Python/src/modal_models/ConvertCaseTest.lf
@@ -67,7 +67,7 @@ reactor Converter {
   }
 }
 
-reactor InputFeeder(message = "") {
+reactor InputFeeder(message="") {
   output character
   state idx = 0
 
diff --git a/test/Python/src/modal_models/ModalAfter.lf b/test/Python/src/modal_models/ModalAfter.lf
index f6290e9bee..88d8f414bb 100644
--- a/test/Python/src/modal_models/ModalAfter.lf
+++ b/test/Python/src/modal_models/ModalAfter.lf
@@ -19,8 +19,8 @@ reactor Modal {
   output consumed2
 
   initial mode One {
-    producer1 = new Producer(mode_id = 1)
-    consumer1 = new Consumer(mode_id = 1)
+    producer1 = new Producer(mode_id=1)
+    consumer1 = new Consumer(mode_id=1)
     producer1.product -> produced1
     producer1.product -> consumer1.product after 500 msec
     consumer1.report -> consumed1
@@ -32,8 +32,8 @@ reactor Modal {
   }
 
   mode Two {
-    producer2 = new Producer(mode_id = 2)
-    consumer2 = new Consumer(mode_id = 2)
+    producer2 = new Producer(mode_id=2)
+    consumer2 = new Consumer(mode_id=2)
     producer2.product -> produced2
     producer2.product -> consumer2.product after 500 msec
     consumer2.report -> consumed2
@@ -45,7 +45,7 @@ reactor Modal {
   }
 }
 
-reactor Producer(mode_id = 0) {
+reactor Producer(mode_id=0) {
   output product
 
   timer t(0, 750 msec)
@@ -56,7 +56,7 @@ reactor Producer(mode_id = 0) {
   =}
 }
 
-reactor Consumer(mode_id = 0) {
+reactor Consumer(mode_id=0) {
   input product
   output report
 
diff --git a/test/Python/src/modal_models/util/TraceTesting.lf b/test/Python/src/modal_models/util/TraceTesting.lf
index 02781b42fe..24a1f26063 100644
--- a/test/Python/src/modal_models/util/TraceTesting.lf
+++ b/test/Python/src/modal_models/util/TraceTesting.lf
@@ -1,7 +1,7 @@
 /** Utility reactor to record and test execution traces. */
 target Python
 
-reactor TraceTesting(events_size = 0, trace = {= [] =}, training = False) {
+reactor TraceTesting(events_size=0, trace = {= [] =}, training=False) {
   input[events_size] events
 
   state last_reaction_time = 0
diff --git a/test/Python/src/multiport/BankIndexInitializer.lf b/test/Python/src/multiport/BankIndexInitializer.lf
index 7a717e3c57..caaf62efbf 100644
--- a/test/Python/src/multiport/BankIndexInitializer.lf
+++ b/test/Python/src/multiport/BankIndexInitializer.lf
@@ -3,13 +3,13 @@ target Python
 
 preamble {= table = [4, 3, 2, 1] =}
 
-reactor Source(bank_index = 0, value = 0) {
+reactor Source(bank_index=0, value=0) {
   output out
 
   reaction(startup) -> out {= out.set(self.value) =}
 }
 
-reactor Sink(width = 4) {
+reactor Sink(width=4) {
   input[width] _in
   state received = False
 
@@ -30,8 +30,8 @@ reactor Sink(width = 4) {
   =}
 }
 
-main reactor(width = 4) {
+main reactor(width=4) {
   source = new[width] Source(value = {= table[bank_index] =})
-  sink = new Sink(width = width)
+  sink = new Sink(width=width)
   source.out -> sink._in
 }
diff --git a/test/Python/src/multiport/BankReactionsInContainer.lf b/test/Python/src/multiport/BankReactionsInContainer.lf
index 147eddfef4..4894173d45 100644
--- a/test/Python/src/multiport/BankReactionsInContainer.lf
+++ b/test/Python/src/multiport/BankReactionsInContainer.lf
@@ -3,7 +3,7 @@ target Python {
   timeout: 1 sec
 }
 
-reactor R(bank_index = 0) {
+reactor R(bank_index=0) {
   output[2] out
   input[2] inp
   state received = False
diff --git a/test/Python/src/multiport/BankToBank.lf b/test/Python/src/multiport/BankToBank.lf
index c1924f6a53..ac4632fd46 100644
--- a/test/Python/src/multiport/BankToBank.lf
+++ b/test/Python/src/multiport/BankToBank.lf
@@ -4,7 +4,7 @@ target Python {
   fast: true
 }
 
-reactor Source(bank_index = 0) {
+reactor Source(bank_index=0) {
   timer t(0, 200 msec)
   output out
   state s = 0
@@ -15,7 +15,7 @@ reactor Source(bank_index = 0) {
   =}
 }
 
-reactor Destination(bank_index = 0) {
+reactor Destination(bank_index=0) {
   state s = 0
   input _in
 
@@ -35,7 +35,7 @@ reactor Destination(bank_index = 0) {
   =}
 }
 
-main reactor BankToBank(width = 4) {
+main reactor BankToBank(width=4) {
   a = new[width] Source()
   b = new[width] Destination()
   a.out -> b._in
diff --git a/test/Python/src/multiport/BankToBankMultiport.lf b/test/Python/src/multiport/BankToBankMultiport.lf
index ace36af77f..b1c7762871 100644
--- a/test/Python/src/multiport/BankToBankMultiport.lf
+++ b/test/Python/src/multiport/BankToBankMultiport.lf
@@ -4,7 +4,7 @@ target Python {
   fast: true
 }
 
-reactor Source(width = 1) {
+reactor Source(width=1) {
   timer t(0, 200 msec)
   output[width] out
   state s = 0
@@ -16,7 +16,7 @@ reactor Source(width = 1) {
   =}
 }
 
-reactor Destination(width = 1) {
+reactor Destination(width=1) {
   state s = 6
   input[width] _in
 
@@ -43,8 +43,8 @@ reactor Destination(width = 1) {
   =}
 }
 
-main reactor BankToBankMultiport(bank_width = 4) {
-  a = new[bank_width] Source(width = 4)
-  b = new[bank_width] Destination(width = 4)
+main reactor BankToBankMultiport(bank_width=4) {
+  a = new[bank_width] Source(width=4)
+  b = new[bank_width] Destination(width=4)
   a.out -> b._in
 }
diff --git a/test/Python/src/multiport/BankToBankMultiportAfter.lf b/test/Python/src/multiport/BankToBankMultiportAfter.lf
index 4f42b8dac2..7b9d98bf29 100644
--- a/test/Python/src/multiport/BankToBankMultiportAfter.lf
+++ b/test/Python/src/multiport/BankToBankMultiportAfter.lf
@@ -6,8 +6,8 @@ target Python {
 
 import Source, Destination from "BankToBankMultiport.lf"
 
-main reactor BankToBankMultiportAfter(bank_width = 4) {
-  a = new[bank_width] Source(width = 4)
-  b = new[bank_width] Destination(width = 4)
+main reactor BankToBankMultiportAfter(bank_width=4) {
+  a = new[bank_width] Source(width=4)
+  b = new[bank_width] Destination(width=4)
   a.out -> b._in after 200 msec
 }
diff --git a/test/Python/src/multiport/BankToMultiport.lf b/test/Python/src/multiport/BankToMultiport.lf
index 45719b6a13..574b562601 100644
--- a/test/Python/src/multiport/BankToMultiport.lf
+++ b/test/Python/src/multiport/BankToMultiport.lf
@@ -1,13 +1,13 @@
 # Test bank of reactors to multiport input with id parameter in the bank.
 target Python
 
-reactor Source(bank_index = 0) {
+reactor Source(bank_index=0) {
   output out
 
   reaction(startup) -> out {= out.set(self.bank_index) =}
 }
 
-reactor Sink(width = 4) {
+reactor Sink(width=4) {
   input[width] _in
   state received = False
 
@@ -28,8 +28,8 @@ reactor Sink(width = 4) {
   =}
 }
 
-main reactor BankToMultiport(width = 5) {
+main reactor BankToMultiport(width=5) {
   source = new[width] Source()
-  sink = new Sink(width = width)
+  sink = new Sink(width=width)
   source.out -> sink._in
 }
diff --git a/test/Python/src/multiport/Broadcast.lf b/test/Python/src/multiport/Broadcast.lf
index 09643f3679..95a106ca0d 100644
--- a/test/Python/src/multiport/Broadcast.lf
+++ b/test/Python/src/multiport/Broadcast.lf
@@ -3,13 +3,13 @@ target Python {
   fast: true
 }
 
-reactor Source(value = 42) {
+reactor Source(value=42) {
   output out
 
   reaction(startup) -> out {= out.set(self.value) =}
 }
 
-reactor Destination(bank_index = 0, delay = 0) {
+reactor Destination(bank_index=0, delay=0) {
   input _in
   state received = False
 
diff --git a/test/Python/src/multiport/BroadcastMultipleAfter.lf b/test/Python/src/multiport/BroadcastMultipleAfter.lf
index eba9455f39..e1e16dd194 100644
--- a/test/Python/src/multiport/BroadcastMultipleAfter.lf
+++ b/test/Python/src/multiport/BroadcastMultipleAfter.lf
@@ -5,7 +5,7 @@ target Python {
 
 import Source from "Broadcast.lf"
 
-reactor Destination(bank_index = 0, delay = 0) {
+reactor Destination(bank_index=0, delay=0) {
   input _in
   state received = False
 
@@ -31,9 +31,9 @@ reactor Destination(bank_index = 0, delay = 0) {
 }
 
 main reactor {
-  a1 = new Source(value = 1)
-  a2 = new Source(value = 2)
-  a3 = new Source(value = 3)
+  a1 = new Source(value=1)
+  a2 = new Source(value=2)
+  a3 = new Source(value=3)
   b = new[9] Destination(delay = 1 sec)
   (a1.out, a2.out, a3.out)+ -> b._in after 1 sec
 }
diff --git a/test/Python/src/multiport/MultiportFromBank.lf b/test/Python/src/multiport/MultiportFromBank.lf
index f1ca4769ee..51f0d943f4 100644
--- a/test/Python/src/multiport/MultiportFromBank.lf
+++ b/test/Python/src/multiport/MultiportFromBank.lf
@@ -5,7 +5,7 @@ target Python {
   fast: true
 }
 
-reactor Source(check_override = 0, bank_index = 0) {
+reactor Source(check_override=0, bank_index=0) {
   output out
 
   reaction(startup) -> out {= out.set(self.bank_index * self.check_override) =}
@@ -35,7 +35,7 @@ reactor Destination {
 }
 
 main reactor MultiportFromBank {
-  a = new[3] Source(check_override = 1)
+  a = new[3] Source(check_override=1)
   b = new Destination()
   a.out -> b._in
 }
diff --git a/test/Python/src/multiport/MultiportFromBankHierarchy.lf b/test/Python/src/multiport/MultiportFromBankHierarchy.lf
index d47481b817..253de78c1a 100644
--- a/test/Python/src/multiport/MultiportFromBankHierarchy.lf
+++ b/test/Python/src/multiport/MultiportFromBankHierarchy.lf
@@ -7,7 +7,7 @@ target Python {
 
 import Destination from "MultiportFromBank.lf"
 
-reactor Source(bank_index = 0) {
+reactor Source(bank_index=0) {
   output out
 
   reaction(startup) -> out {= out.set(self.bank_index) =}
diff --git a/test/Python/src/multiport/MultiportFromReaction.lf b/test/Python/src/multiport/MultiportFromReaction.lf
index 2b8266cffc..7fc0e6c943 100644
--- a/test/Python/src/multiport/MultiportFromReaction.lf
+++ b/test/Python/src/multiport/MultiportFromReaction.lf
@@ -4,7 +4,7 @@ target Python {
   fast: true
 }
 
-reactor Destination(width = 1) {
+reactor Destination(width=1) {
   state s = 6
   input[width] _in
 
@@ -32,7 +32,7 @@ reactor Destination(width = 1) {
 main reactor MultiportFromReaction {
   timer t(0, 200 msec)
   state s = 0
-  b = new Destination(width = 4)
+  b = new Destination(width=4)
 
   reaction(t) -> b._in {=
     for (idx, port) in enumerate(b._in):
diff --git a/test/Python/src/multiport/MultiportInParameterized.lf b/test/Python/src/multiport/MultiportInParameterized.lf
index 206fa512ac..62a6ec43b3 100644
--- a/test/Python/src/multiport/MultiportInParameterized.lf
+++ b/test/Python/src/multiport/MultiportInParameterized.lf
@@ -23,7 +23,7 @@ reactor Computation {
   reaction(_in) -> out {= out.set(_in.value) =}
 }
 
-reactor Destination(width = 1) {
+reactor Destination(width=1) {
   state s = 0
   input[width] _in
 
@@ -52,7 +52,7 @@ main reactor MultiportInParameterized {
   t2 = new Computation()
   t3 = new Computation()
   t4 = new Computation()
-  b = new Destination(width = 4)
+  b = new Destination(width=4)
   a.out -> t1._in
   a.out -> t2._in
   a.out -> t3._in
diff --git a/test/Python/src/multiport/MultiportMutableInput.lf b/test/Python/src/multiport/MultiportMutableInput.lf
index bfc691d1c2..20070fe7a4 100644
--- a/test/Python/src/multiport/MultiportMutableInput.lf
+++ b/test/Python/src/multiport/MultiportMutableInput.lf
@@ -12,7 +12,7 @@ reactor Source {
 }
 
 # The scale parameter is just for testing.
-reactor Print(scale = 1) {
+reactor Print(scale=1) {
   input[2] _in
 
   reaction(_in) {=
@@ -26,7 +26,7 @@ reactor Print(scale = 1) {
   =}
 }
 
-reactor Scale(scale = 2) {
+reactor Scale(scale=2) {
   mutable input[2] _in
   output[2] out
 
@@ -41,7 +41,7 @@ reactor Scale(scale = 2) {
 main reactor MultiportMutableInput {
   s = new Source()
   c = new Scale()
-  p = new Print(scale = 2)
+  p = new Print(scale=2)
   s.out -> c._in
   c.out -> p._in
 }
diff --git a/test/Python/src/multiport/MultiportMutableInputArray.lf b/test/Python/src/multiport/MultiportMutableInputArray.lf
index a936910ddd..67c1848fa1 100644
--- a/test/Python/src/multiport/MultiportMutableInputArray.lf
+++ b/test/Python/src/multiport/MultiportMutableInputArray.lf
@@ -13,7 +13,7 @@ reactor Source {
 }
 
 # The scale parameter is just for testing.
-reactor Print(scale = 1) {
+reactor Print(scale=1) {
   input[2] _in
 
   reaction(_in) {=
@@ -25,7 +25,7 @@ reactor Print(scale = 1) {
   =}
 }
 
-reactor Scale(scale = 2) {
+reactor Scale(scale=2) {
   mutable input[2] _in
   output[2] out
 
@@ -40,7 +40,7 @@ reactor Scale(scale = 2) {
 main reactor MultiportMutableInputArray {
   s = new Source()
   c = new Scale()
-  p = new Print(scale = 2)
+  p = new Print(scale=2)
   s.out -> c._in
   c.out -> p._in
 }
diff --git a/test/Python/src/multiport/MultiportToBank.lf b/test/Python/src/multiport/MultiportToBank.lf
index 8ac3e28321..ba9f2abe36 100644
--- a/test/Python/src/multiport/MultiportToBank.lf
+++ b/test/Python/src/multiport/MultiportToBank.lf
@@ -13,7 +13,7 @@ reactor Source {
   =}
 }
 
-reactor Destination(bank_index = 0) {
+reactor Destination(bank_index=0) {
   input _in
   state received = 0
 
diff --git a/test/Python/src/multiport/MultiportToBankAfter.lf b/test/Python/src/multiport/MultiportToBankAfter.lf
index e48624e853..3f622bdc63 100644
--- a/test/Python/src/multiport/MultiportToBankAfter.lf
+++ b/test/Python/src/multiport/MultiportToBankAfter.lf
@@ -6,7 +6,7 @@ target Python {
 
 import Source from "MultiportToBank.lf"
 
-reactor Destination(bank_index = 0) {
+reactor Destination(bank_index=0) {
   input _in
   state received = False
 
diff --git a/test/Python/src/multiport/MultiportToBankHierarchy.lf b/test/Python/src/multiport/MultiportToBankHierarchy.lf
index 8dde25e5da..0c03395839 100644
--- a/test/Python/src/multiport/MultiportToBankHierarchy.lf
+++ b/test/Python/src/multiport/MultiportToBankHierarchy.lf
@@ -7,7 +7,7 @@ target Python {
 
 import Source from "MultiportToBank.lf"
 
-reactor Destination(bank_index = 0) {
+reactor Destination(bank_index=0) {
   input _in
   state received = False
 
diff --git a/test/Python/src/multiport/MultiportToHierarchy.lf b/test/Python/src/multiport/MultiportToHierarchy.lf
index e5820481b5..19dd4bcd82 100644
--- a/test/Python/src/multiport/MultiportToHierarchy.lf
+++ b/test/Python/src/multiport/MultiportToHierarchy.lf
@@ -17,7 +17,7 @@ reactor Source {
   =}
 }
 
-reactor Destination(width = 4) {
+reactor Destination(width=4) {
   state s = 6
   input[width] _in
 
@@ -41,7 +41,7 @@ reactor Destination(width = 4) {
   =}
 }
 
-reactor Container(width = 4) {
+reactor Container(width=4) {
   input[width] _in
   dst = new Destination()
   _in -> dst._in
diff --git a/test/Python/src/multiport/MultiportToMultiport.lf b/test/Python/src/multiport/MultiportToMultiport.lf
index 33fa418feb..dafa3ffb7d 100644
--- a/test/Python/src/multiport/MultiportToMultiport.lf
+++ b/test/Python/src/multiport/MultiportToMultiport.lf
@@ -6,7 +6,7 @@ target Python {
 
 import Destination from "MultiportToHierarchy.lf"
 
-reactor Source(width = 1) {
+reactor Source(width=1) {
   timer t(0, 200 msec)
   output[width] out
   state s = 0
@@ -22,7 +22,7 @@ reactor Source(width = 1) {
 }
 
 main reactor MultiportToMultiport {
-  a = new Source(width = 4)
-  b = new Destination(width = 4)
+  a = new Source(width=4)
+  b = new Destination(width=4)
   a.out -> b._in
 }
diff --git a/test/Python/src/multiport/MultiportToMultiport2.lf b/test/Python/src/multiport/MultiportToMultiport2.lf
index 2a92c3ef3c..ba4e1d6d26 100644
--- a/test/Python/src/multiport/MultiportToMultiport2.lf
+++ b/test/Python/src/multiport/MultiportToMultiport2.lf
@@ -1,7 +1,7 @@
 # Test multiport to multiport connections. See also MultiportToMultiport.
 target Python
 
-reactor Source(width = 2) {
+reactor Source(width=2) {
   output[width] out
 
   reaction(startup) -> out {=
@@ -10,7 +10,7 @@ reactor Source(width = 2) {
   =}
 }
 
-reactor Destination(width = 2) {
+reactor Destination(width=2) {
   input[width] _in
 
   reaction(_in) {=
@@ -26,8 +26,8 @@ reactor Destination(width = 2) {
 }
 
 main reactor MultiportToMultiport2 {
-  a1 = new Source(width = 3)
-  a2 = new Source(width = 2)
-  b = new Destination(width = 5)
+  a1 = new Source(width=3)
+  a2 = new Source(width=2)
+  b = new Destination(width=5)
   a1.out, a2.out -> b._in
 }
diff --git a/test/Python/src/multiport/MultiportToMultiport2After.lf b/test/Python/src/multiport/MultiportToMultiport2After.lf
index 423a3b8b2e..df0d40a668 100644
--- a/test/Python/src/multiport/MultiportToMultiport2After.lf
+++ b/test/Python/src/multiport/MultiportToMultiport2After.lf
@@ -3,7 +3,7 @@ target Python
 
 import Source from "MultiportToMultiport2.lf"
 
-reactor Destination(width = 2) {
+reactor Destination(width=2) {
   input[width] _in
 
   reaction(_in) {=
@@ -22,8 +22,8 @@ reactor Destination(width = 2) {
 }
 
 main reactor MultiportToMultiport2After {
-  a1 = new Source(width = 3)
-  a2 = new Source(width = 2)
-  b = new Destination(width = 5)
+  a1 = new Source(width=3)
+  a2 = new Source(width=2)
+  b = new Destination(width=5)
   a1.out, a2.out -> b._in after 1 sec
 }
diff --git a/test/Python/src/multiport/MultiportToMultiportParameter.lf b/test/Python/src/multiport/MultiportToMultiportParameter.lf
index ac6b3663dc..e8da0a80d9 100644
--- a/test/Python/src/multiport/MultiportToMultiportParameter.lf
+++ b/test/Python/src/multiport/MultiportToMultiportParameter.lf
@@ -7,8 +7,8 @@ target Python {
 import Source from "MultiportToMultiport.lf"
 import Destination from "MultiportToHierarchy.lf"
 
-main reactor MultiportToMultiportParameter(width = 4) {
-  a = new Source(width = width)
-  b = new Destination(width = width)
+main reactor MultiportToMultiportParameter(width=4) {
+  a = new Source(width=width)
+  b = new Destination(width=width)
   a.out -> b._in
 }
diff --git a/test/Python/src/multiport/MultiportToPort.lf b/test/Python/src/multiport/MultiportToPort.lf
index cc8efe50d6..7573d07cd2 100644
--- a/test/Python/src/multiport/MultiportToPort.lf
+++ b/test/Python/src/multiport/MultiportToPort.lf
@@ -14,7 +14,7 @@ reactor Source {
   =}
 }
 
-reactor Destination(expected = 0) {
+reactor Destination(expected=0) {
   input _in
   state received = False
 
@@ -37,6 +37,6 @@ reactor Destination(expected = 0) {
 main reactor MultiportToPort {
   a = new Source()
   b1 = new Destination()
-  b2 = new Destination(expected = 1)
+  b2 = new Destination(expected=1)
   a.out -> b1._in, b2._in
 }
diff --git a/test/Python/src/multiport/MultiportToReaction.lf b/test/Python/src/multiport/MultiportToReaction.lf
index 811f233038..5c33074dfa 100644
--- a/test/Python/src/multiport/MultiportToReaction.lf
+++ b/test/Python/src/multiport/MultiportToReaction.lf
@@ -4,7 +4,7 @@ target Python {
   fast: true
 }
 
-reactor Source(width = 1) {
+reactor Source(width=1) {
   timer t(0, 200 msec)
   state s = 0
   output[width] out
@@ -18,7 +18,7 @@ reactor Source(width = 1) {
 
 main reactor {
   state s = 6
-  b = new Source(width = 4)
+  b = new Source(width=4)
 
   reaction(b.out) {=
     sm = 0
diff --git a/test/Python/src/multiport/NestedBanks.lf b/test/Python/src/multiport/NestedBanks.lf
index bc2c08db54..a00cdb5cb9 100644
--- a/test/Python/src/multiport/NestedBanks.lf
+++ b/test/Python/src/multiport/NestedBanks.lf
@@ -13,13 +13,13 @@ main reactor {
   (a.x)+ -> c.z, d.u, e.t
 }
 
-reactor A(bank_index = 0) {
+reactor A(bank_index=0) {
   output[4] x
-  b = new[2] B(a_bank_index = bank_index)
+  b = new[2] B(a_bank_index=bank_index)
   b.y -> x
 }
 
-reactor B(a_bank_index = 0, bank_index = 0) {
+reactor B(a_bank_index=0, bank_index=0) {
   output[2] y
 
   reaction(startup) -> y {=
@@ -29,10 +29,10 @@ reactor B(a_bank_index = 0, bank_index = 0) {
   =}
 }
 
-reactor C(bank_index = 0) {
+reactor C(bank_index=0) {
   input[2] z
-  f = new F(c_bank_index = bank_index)
-  g = new G(c_bank_index = bank_index)
+  f = new F(c_bank_index=bank_index)
+  g = new G(c_bank_index=bank_index)
   z -> f.w, g.s
 }
 
@@ -57,7 +57,7 @@ reactor E {
   =}
 }
 
-reactor F(c_bank_index = 0) {
+reactor F(c_bank_index=0) {
   input w
 
   reaction(w) {=
@@ -68,7 +68,7 @@ reactor F(c_bank_index = 0) {
   =}
 }
 
-reactor G(c_bank_index = 0) {
+reactor G(c_bank_index=0) {
   input s
 
   reaction(s) {=
diff --git a/test/Python/src/multiport/NestedInterleavedBanks.lf b/test/Python/src/multiport/NestedInterleavedBanks.lf
index 5e7967d217..46f3a12cb7 100644
--- a/test/Python/src/multiport/NestedInterleavedBanks.lf
+++ b/test/Python/src/multiport/NestedInterleavedBanks.lf
@@ -4,7 +4,7 @@
  */
 target Python
 
-reactor A(bank_index = 0, outer_bank_index = 0) {
+reactor A(bank_index=0, outer_bank_index=0) {
   output[2] p
 
   reaction(startup) -> p {=
@@ -14,9 +14,9 @@ reactor A(bank_index = 0, outer_bank_index = 0) {
   =}
 }
 
-reactor B(bank_index = 0) {
+reactor B(bank_index=0) {
   output[4] q
-  a = new[2] A(outer_bank_index = bank_index)
+  a = new[2] A(outer_bank_index=bank_index)
   interleaved(a.p) -> q
 }
 
diff --git a/test/Python/src/multiport/ReactionsToNested.lf b/test/Python/src/multiport/ReactionsToNested.lf
index 1f05d5ba5b..94edf095c4 100644
--- a/test/Python/src/multiport/ReactionsToNested.lf
+++ b/test/Python/src/multiport/ReactionsToNested.lf
@@ -3,7 +3,7 @@ target Python {
   timeout: 1 sec
 }
 
-reactor T(expected = 0) {
+reactor T(expected=0) {
   input z
   state received = False
 
@@ -24,8 +24,8 @@ reactor T(expected = 0) {
 
 reactor D {
   input[2] y
-  t1 = new T(expected = 42)
-  t2 = new T(expected = 43)
+  t1 = new T(expected=42)
+  t2 = new T(expected=43)
   y -> t1.z, t2.z
 }
 
diff --git a/test/Rust/src/CtorParamMixed.lf b/test/Rust/src/CtorParamMixed.lf
index 33c4730eb9..de9a1146bb 100644
--- a/test/Rust/src/CtorParamMixed.lf
+++ b/test/Rust/src/CtorParamMixed.lf
@@ -14,5 +14,5 @@ reactor Print(value: i32 = 42, name: String = {= "xxx".into() =}, other: bool =
 }
 
 main reactor CtorParamMixed {
-  p = new Print(other = true, name = {= "x2hr".into() =})
+  p = new Print(other=true, name = {= "x2hr".into() =})
 }
diff --git a/test/Rust/src/CtorParamSimple.lf b/test/Rust/src/CtorParamSimple.lf
index 09a3046af3..688efd3ff9 100644
--- a/test/Rust/src/CtorParamSimple.lf
+++ b/test/Rust/src/CtorParamSimple.lf
@@ -10,5 +10,5 @@ reactor Print(value: i32 = 42) {
 }
 
 main reactor CtorParamSimple {
-  p = new Print(value = 23)
+  p = new Print(value=23)
 }
diff --git a/test/Rust/src/NativeListsAndTimes.lf b/test/Rust/src/NativeListsAndTimes.lf
index 5d95f2fa07..5401d6d1b9 100644
--- a/test/Rust/src/NativeListsAndTimes.lf
+++ b/test/Rust/src/NativeListsAndTimes.lf
@@ -2,16 +2,16 @@ target Rust
 
 // This test passes if it is successfully compiled into valid target code.
 reactor Foo(
-  x: i32 = 0,
-  y: time = 0,  // Units are missing but not required
-  z = 1 msec,  // Type is missing but not required
-  p: i32[](1, 2, 3, 4),  // List of integers
-  p2: i32[] = {= vec![1] =},  // List of integers with single element
-  // todo // p2: i32[](1), // List of integers with single element p3: i32[](), // Empty list of
-  // integers List of time values
-  q: Vec<Duration>(1 msec, 2 msec, 3 msec),
-  g: time[](1 msec, 2 msec)  // List of time values
-) {
+    x: i32 = 0,
+    y: time = 0,  // Units are missing but not required
+    z = 1 msec,  // Type is missing but not required
+    p: i32[](1, 2, 3, 4),  // List of integers
+    p2: i32[] = {= vec![1] =},  // List of integers with single element
+    // todo // p2: i32[](1), // List of integers with single element p3: i32[](), // Empty list of
+    // integers List of time values
+    q: Vec<Duration>(1 msec, 2 msec, 3 msec),
+    // List of time values
+    g: time[](1 msec, 2 msec)) {
   state s: time = y  // Reference to explicitly typed time parameter
   state t: time = z  // Reference to implicitly typed time parameter
   state v: bool  // Uninitialized boolean state variable
diff --git a/test/Rust/src/generics/CtorParamGeneric.lf b/test/Rust/src/generics/CtorParamGeneric.lf
index 44d630a152..405a78ce46 100644
--- a/test/Rust/src/generics/CtorParamGeneric.lf
+++ b/test/Rust/src/generics/CtorParamGeneric.lf
@@ -2,8 +2,7 @@
 target Rust
 
 reactor Generic<{= T: Default + Eq + Sync + std::fmt::Debug =}>(
-  value: T = {= Default::default() =}
-) {
+    value: T = {= Default::default() =}) {
   input in: T
   state v: T = value
 
@@ -16,7 +15,7 @@ reactor Generic<{= T: Default + Eq + Sync + std::fmt::Debug =}>(
 }
 
 main reactor {
-  p = new Generic<u32>(value = 23)
+  p = new Generic<u32>(value=23)
 
   reaction(startup) -> p.in {= ctx.set(p__in, 23); =}
 }
diff --git a/test/Rust/src/generics/CtorParamGenericInst.lf b/test/Rust/src/generics/CtorParamGenericInst.lf
index 8c5d2522aa..0ae15ad1f9 100644
--- a/test/Rust/src/generics/CtorParamGenericInst.lf
+++ b/test/Rust/src/generics/CtorParamGenericInst.lf
@@ -3,8 +3,7 @@
 target Rust
 
 reactor Generic2<{= T: Default + Eq + Sync + std::fmt::Debug + Send + 'static =}>(
-  value: T = {= Default::default() =}
-) {
+    value: T = {= Default::default() =}) {
   input in: T
   state v: T = value
 
@@ -17,17 +16,16 @@ reactor Generic2<{= T: Default + Eq + Sync + std::fmt::Debug + Send + 'static =}
 }
 
 reactor Generic<{= T: Default + Eq + Sync + std::fmt::Debug + Copy + Send + 'static =}>(
-  value: T = {= Default::default() =}
-) {
+    value: T = {= Default::default() =}) {
   input in: T
 
-  inner = new Generic2<T>(value = value)
+  inner = new Generic2<T>(value=value)
 
   in -> inner.in
 }
 
 main reactor {
-  p = new Generic<u32>(value = 23)
+  p = new Generic<u32>(value=23)
 
   reaction(startup) -> p.in {= ctx.set(p__in, 23); =}
 }
diff --git a/test/Rust/src/multiport/ConnectionToSelfBank.lf b/test/Rust/src/multiport/ConnectionToSelfBank.lf
index f80ccecd76..c396bcb5e6 100644
--- a/test/Rust/src/multiport/ConnectionToSelfBank.lf
+++ b/test/Rust/src/multiport/ConnectionToSelfBank.lf
@@ -16,6 +16,6 @@ reactor Node(bank_index: usize = 0, num_nodes: usize = 4) {
 }
 
 main reactor(num_nodes: usize = 4) {
-  nodes = new[num_nodes] Node(num_nodes = num_nodes)
+  nodes = new[num_nodes] Node(num_nodes=num_nodes)
   (nodes.out)+ -> nodes.in
 }
diff --git a/test/Rust/src/multiport/ConnectionToSelfMultiport.lf b/test/Rust/src/multiport/ConnectionToSelfMultiport.lf
index 626b855ddb..685ef1ac08 100644
--- a/test/Rust/src/multiport/ConnectionToSelfMultiport.lf
+++ b/test/Rust/src/multiport/ConnectionToSelfMultiport.lf
@@ -20,6 +20,6 @@ reactor Node(num_nodes: usize = 4) {
 }
 
 main reactor(num_nodes: usize = 4) {
-  nodes = new Node(num_nodes = num_nodes)
+  nodes = new Node(num_nodes=num_nodes)
   nodes.out -> nodes.in  // todo: (nodes.out)+ -> nodes.in;
 }
diff --git a/test/Rust/src/multiport/FullyConnected.lf b/test/Rust/src/multiport/FullyConnected.lf
index 7d28d92c4b..e83a0cac3d 100644
--- a/test/Rust/src/multiport/FullyConnected.lf
+++ b/test/Rust/src/multiport/FullyConnected.lf
@@ -21,6 +21,6 @@ reactor Right(bank_index: usize = 0, num_nodes: usize = 4) {
 
 main reactor(num_nodes: usize = 4) {
   left = new[num_nodes] Left()
-  right = new[num_nodes] Right(num_nodes = num_nodes)
+  right = new[num_nodes] Right(num_nodes=num_nodes)
   (left.out)+ -> right.in
 }
diff --git a/test/Rust/src/multiport/FullyConnectedAddressable.lf b/test/Rust/src/multiport/FullyConnectedAddressable.lf
index 335648f8f9..5eefab68fe 100644
--- a/test/Rust/src/multiport/FullyConnectedAddressable.lf
+++ b/test/Rust/src/multiport/FullyConnectedAddressable.lf
@@ -44,9 +44,9 @@ reactor Node(bank_index: usize = 0, num_nodes: usize = 4) {
 }
 
 main reactor(num_nodes: usize = 4) {
-  nodes1 = new[num_nodes] Node(num_nodes = num_nodes)
+  nodes1 = new[num_nodes] Node(num_nodes=num_nodes)
   nodes1.out -> interleaved(nodes1.inpt)
 
-  nodes2 = new[num_nodes] Node(num_nodes = num_nodes)
+  nodes2 = new[num_nodes] Node(num_nodes=num_nodes)
   interleaved(nodes2.out) -> nodes2.inpt
 }
diff --git a/test/Rust/src/multiport/MultiportFromBank.lf b/test/Rust/src/multiport/MultiportFromBank.lf
index 1ff2d375ef..7c62a81298 100644
--- a/test/Rust/src/multiport/MultiportFromBank.lf
+++ b/test/Rust/src/multiport/MultiportFromBank.lf
@@ -23,6 +23,6 @@ reactor Destination(port_width: usize = 2) {
 
 main reactor {
   a = new[4] Source()
-  b = new Destination(port_width = 4)
+  b = new Destination(port_width=4)
   a.out -> b.in
 }
diff --git a/test/Rust/src/multiport/MultiportToMultiport2.lf b/test/Rust/src/multiport/MultiportToMultiport2.lf
index 217b06b1b4..63297bb808 100644
--- a/test/Rust/src/multiport/MultiportToMultiport2.lf
+++ b/test/Rust/src/multiport/MultiportToMultiport2.lf
@@ -25,8 +25,8 @@ reactor Destination(width: usize = 2) {
 }
 
 main reactor MultiportToMultiport2 {
-  a1 = new Source(width = 3)
-  a2 = new Source(width = 2)
-  b = new Destination(width = 5)
+  a1 = new Source(width=3)
+  a2 = new Source(width=2)
+  b = new Destination(width=5)
   a1.out, a2.out -> b.in
 }
diff --git a/test/Rust/src/multiport/WidthWithParameter.lf b/test/Rust/src/multiport/WidthWithParameter.lf
index 22e5b51925..3824413055 100644
--- a/test/Rust/src/multiport/WidthWithParameter.lf
+++ b/test/Rust/src/multiport/WidthWithParameter.lf
@@ -11,7 +11,7 @@ reactor Some(value: usize = 30) {
 }
 
 main reactor {
-  some = new Some(value = 20)
+  some = new Some(value=20)
 
   reaction(some.finished) {= println!("success"); =}
 }
diff --git a/test/TypeScript/src/ArrayScale.lf b/test/TypeScript/src/ArrayScale.lf
index 581d6d11a2..031d8af446 100644
--- a/test/TypeScript/src/ArrayScale.lf
+++ b/test/TypeScript/src/ArrayScale.lf
@@ -21,7 +21,7 @@ reactor Scale(scale: number = 2) {
 main reactor ArrayScale {
   s = new Source()
   c = new Scale()
-  p = new Print(scale = 2)
+  p = new Print(scale=2)
   s.out -> c.x
   c.out -> p.x
 }
diff --git a/test/TypeScript/src/Hello.lf b/test/TypeScript/src/Hello.lf
index 05ff305cba..ae0755366a 100644
--- a/test/TypeScript/src/Hello.lf
+++ b/test/TypeScript/src/Hello.lf
@@ -37,7 +37,7 @@ reactor Reschedule(period: time = 2 sec, message: string = "Hello TypeScript") {
 }
 
 reactor Inside(period: time = 1 sec, message: string = "Composite default message.") {
-  third_instance = new Reschedule(period = period, message = message)
+  third_instance = new Reschedule(period=period, message=message)
 }
 
 main reactor Hello {
diff --git a/test/TypeScript/src/NativeListsAndTimes.lf b/test/TypeScript/src/NativeListsAndTimes.lf
index 393d7873b9..95cf9e741d 100644
--- a/test/TypeScript/src/NativeListsAndTimes.lf
+++ b/test/TypeScript/src/NativeListsAndTimes.lf
@@ -2,13 +2,13 @@ target TypeScript
 
 // This test passes if it is successfully compiled into valid target code.
 main reactor(
-  x: number = 0,
-  y: time = 0,               // Units are missing but not required
-  z = 1 msec,                // Type is missing but not required
-  p: number[](1, 2, 3, 4),   // List of integers
-  q: TimeValue[](1 msec, 2 msec, 3 msec),  // list of time values
-  g: time[](1 msec, 2 msec)  // List of time values
-) {
+    x: number = 0,
+    y: time = 0,               // Units are missing but not required
+    z = 1 msec,                // Type is missing but not required
+    p: number[](1, 2, 3, 4),   // List of integers
+    q: TimeValue[](1 msec, 2 msec, 3 msec),  // list of time values
+    // List of time values
+    g: time[](1 msec, 2 msec)) {
   state s: time = y  // Reference to explicitly typed time parameter
   state t: time = z  // Reference to implicitly typed time parameter
   state v: boolean   // Uninitialized boolean state variable
diff --git a/test/TypeScript/src/Stride.lf b/test/TypeScript/src/Stride.lf
index e13252a60a..a8413a6aee 100644
--- a/test/TypeScript/src/Stride.lf
+++ b/test/TypeScript/src/Stride.lf
@@ -23,7 +23,7 @@ reactor Display {
 }
 
 main reactor Stride {
-  c = new Count(stride = 2)
+  c = new Count(stride=2)
   d = new Display()
   c.y -> d.x
 }
diff --git a/test/TypeScript/src/StructScale.lf b/test/TypeScript/src/StructScale.lf
index 39e74e42c4..4dc706f42b 100644
--- a/test/TypeScript/src/StructScale.lf
+++ b/test/TypeScript/src/StructScale.lf
@@ -20,7 +20,7 @@ reactor Scale(scale: number = 2) {
 main reactor StructScale {
   s = new Source()
   c = new Scale()
-  p = new Print(expected = 84)
+  p = new Print(expected=84)
   s.out -> c.x
   c.out -> p.x
 }
diff --git a/test/TypeScript/src/TimeLimit.lf b/test/TypeScript/src/TimeLimit.lf
index c0b818c2e9..8c8a039ad8 100644
--- a/test/TypeScript/src/TimeLimit.lf
+++ b/test/TypeScript/src/TimeLimit.lf
@@ -33,7 +33,7 @@ reactor Destination {
 main reactor TimeLimit(period: time = 1 msec) {
   timer stop(10 sec)
 
-  c = new Clock(period = period)
+  c = new Clock(period=period)
   d = new Destination()
   c.y -> d.x
 
diff --git a/test/TypeScript/src/federated/ChainWithDelay.lf b/test/TypeScript/src/federated/ChainWithDelay.lf
index 7c37d47d7f..d9baab73f5 100644
--- a/test/TypeScript/src/federated/ChainWithDelay.lf
+++ b/test/TypeScript/src/federated/ChainWithDelay.lf
@@ -15,7 +15,7 @@ import TestCount from "../lib/TestCount.lf"
 federated reactor {
   c = new Count(period = 1 msec)
   i = new InternalDelay(delay = 500 usec)
-  t = new TestCount(numInputs = 3)
+  t = new TestCount(numInputs=3)
   c.out -> i.inp
   i.out -> t.inp
 }
diff --git a/test/TypeScript/src/federated/DistributedStop.lf b/test/TypeScript/src/federated/DistributedStop.lf
index 0d8b9f40ba..a4708480bf 100644
--- a/test/TypeScript/src/federated/DistributedStop.lf
+++ b/test/TypeScript/src/federated/DistributedStop.lf
@@ -57,8 +57,8 @@ reactor Sender {
 }
 
 reactor Receiver(
-  stp_offset: time = 10 msec  // Used in the decentralized variant of the test
-) {
+    // Used in the decentralized variant of the test
+    stp_offset: time = 10 msec) {
   input in1: number
   state reaction_invoked_correctly: boolean = false
 
diff --git a/test/TypeScript/src/multiport/BankMulticast.lf b/test/TypeScript/src/multiport/BankMulticast.lf
index 64a944deea..436f553e6e 100644
--- a/test/TypeScript/src/multiport/BankMulticast.lf
+++ b/test/TypeScript/src/multiport/BankMulticast.lf
@@ -16,7 +16,7 @@ reactor Foo {
   c = new Count()
   c.out -> out
 
-  d = new TestCount(numInputs = 4)
+  d = new TestCount(numInputs=4)
   inp -> d.inp
 }
 
@@ -32,6 +32,6 @@ reactor Bar {
 main reactor {
   bar = new Bar()
 
-  d = new[4] TestCount(numInputs = 4)
+  d = new[4] TestCount(numInputs=4)
   bar.out -> d.inp
 }
diff --git a/test/TypeScript/src/multiport/BankToBankMultiport.lf b/test/TypeScript/src/multiport/BankToBankMultiport.lf
index b386ae631a..1fe1bad44b 100644
--- a/test/TypeScript/src/multiport/BankToBankMultiport.lf
+++ b/test/TypeScript/src/multiport/BankToBankMultiport.lf
@@ -41,7 +41,7 @@ reactor Destination(width: number = 1) {
 }
 
 main reactor BankToBankMultiport(bankWidth: number = 4) {
-  a = new[bankWidth] Source(width = 4)
-  b = new[bankWidth] Destination(width = 4)
+  a = new[bankWidth] Source(width=4)
+  b = new[bankWidth] Destination(width=4)
   a.out -> b.inp
 }
diff --git a/test/TypeScript/src/multiport/BankToBankMultiportAfter.lf b/test/TypeScript/src/multiport/BankToBankMultiportAfter.lf
index 3c8443398e..358b7db46c 100644
--- a/test/TypeScript/src/multiport/BankToBankMultiportAfter.lf
+++ b/test/TypeScript/src/multiport/BankToBankMultiportAfter.lf
@@ -41,7 +41,7 @@ reactor Destination(width: number = 1) {
 }
 
 main reactor(bankWidth: number = 4) {
-  a = new[bankWidth] Source(width = 4)
-  b = new[bankWidth] Destination(width = 4)
+  a = new[bankWidth] Source(width=4)
+  b = new[bankWidth] Destination(width=4)
   a.out -> b.inp after 200 msec
 }
diff --git a/test/TypeScript/src/multiport/BroadcastMultipleAfter.lf b/test/TypeScript/src/multiport/BroadcastMultipleAfter.lf
index 0840127f64..cb22488a8c 100644
--- a/test/TypeScript/src/multiport/BroadcastMultipleAfter.lf
+++ b/test/TypeScript/src/multiport/BroadcastMultipleAfter.lf
@@ -34,9 +34,9 @@ reactor Destination {
 }
 
 main reactor {
-  a1 = new Source(value = 1)
-  a2 = new Source(value = 2)
-  a3 = new Source(value = 3)
+  a1 = new Source(value=1)
+  a2 = new Source(value=2)
+  a3 = new Source(value=3)
   b = new[9] Destination()
   (a1.out, a2.out, a3.out)+ -> b.inp after 1 sec
 }
diff --git a/test/TypeScript/src/multiport/FullyConnected.lf b/test/TypeScript/src/multiport/FullyConnected.lf
index e33b1728c5..e9135b1e78 100644
--- a/test/TypeScript/src/multiport/FullyConnected.lf
+++ b/test/TypeScript/src/multiport/FullyConnected.lf
@@ -37,6 +37,6 @@ reactor Node(numNodes: number = 4) {
 }
 
 main reactor(numNodes: number = 4) {
-  nodes = new[numNodes] Node(numNodes = numNodes)
+  nodes = new[numNodes] Node(numNodes=numNodes)
   (nodes.out)+ -> nodes.inp
 }
diff --git a/test/TypeScript/src/multiport/MultiportFromBank.lf b/test/TypeScript/src/multiport/MultiportFromBank.lf
index 1bd32c218a..93f3d5c8f6 100644
--- a/test/TypeScript/src/multiport/MultiportFromBank.lf
+++ b/test/TypeScript/src/multiport/MultiportFromBank.lf
@@ -34,6 +34,6 @@ reactor Destination(portWidth: number = 3) {
 
 main reactor(width: number = 4) {
   a = new[width] Source()
-  b = new Destination(portWidth = width)
+  b = new Destination(portWidth=width)
   a.out -> b.inp
 }
diff --git a/test/TypeScript/src/multiport/MultiportFromBankHierarchyAfter.lf b/test/TypeScript/src/multiport/MultiportFromBankHierarchyAfter.lf
index b960ff2bc1..91a5e834ee 100644
--- a/test/TypeScript/src/multiport/MultiportFromBankHierarchyAfter.lf
+++ b/test/TypeScript/src/multiport/MultiportFromBankHierarchyAfter.lf
@@ -8,7 +8,7 @@ import Destination from "MultiportFromBank.lf"
 import Container from "MultiportFromBankHierarchy.lf"
 
 main reactor MultiportFromBankHierarchyAfter {
-  a = new Container(portWidth = 4)
-  b = new Destination(portWidth = 4)
+  a = new Container(portWidth=4)
+  b = new Destination(portWidth=4)
   a.out -> b.inp after 1 sec
 }
diff --git a/test/TypeScript/src/multiport/MultiportFromHierarchy.lf b/test/TypeScript/src/multiport/MultiportFromHierarchy.lf
index 85b32de0e6..765fc1a19f 100644
--- a/test/TypeScript/src/multiport/MultiportFromHierarchy.lf
+++ b/test/TypeScript/src/multiport/MultiportFromHierarchy.lf
@@ -42,18 +42,18 @@ reactor Destination(width: number = 3) {
 
 reactor Container(width: number = 3) {
   output[width] out: number
-  src = new InsideContainer(width = width)
+  src = new InsideContainer(width=width)
   src.out -> out
 }
 
 reactor InsideContainer(width: number = 3) {
   output[width] out: number
-  src = new Source(width = width)
+  src = new Source(width=width)
   src.out -> out
 }
 
 main reactor MultiportFromHierarchy(width: number = 4) {
-  a = new Container(width = width)
-  b = new Destination(width = width)
+  a = new Container(width=width)
+  b = new Destination(width=width)
   a.out -> b.inp
 }
diff --git a/test/TypeScript/src/multiport/MultiportFromReaction.lf b/test/TypeScript/src/multiport/MultiportFromReaction.lf
index 582467f092..6ecfe79cdc 100644
--- a/test/TypeScript/src/multiport/MultiportFromReaction.lf
+++ b/test/TypeScript/src/multiport/MultiportFromReaction.lf
@@ -31,7 +31,7 @@ reactor Destination(width: number = 1) {
 main reactor MultiportFromReaction(width: number = 4) {
   timer t(0, 200 msec)
   state s: number = 0
-  b = new Destination(width = width)
+  b = new Destination(width=width)
 
   reaction(t) -> b.inp {=
     for (let i = 0; i < b.inp.length; i++) {
diff --git a/test/TypeScript/src/multiport/MultiportInParameterized.lf b/test/TypeScript/src/multiport/MultiportInParameterized.lf
index 7736e303e5..e19c641b4d 100644
--- a/test/TypeScript/src/multiport/MultiportInParameterized.lf
+++ b/test/TypeScript/src/multiport/MultiportInParameterized.lf
@@ -55,7 +55,7 @@ main reactor {
   t2 = new Computation()
   t3 = new Computation()
   t4 = new Computation()
-  b = new Destination(width = 4)
+  b = new Destination(width=4)
   a.out -> t1.inp
   a.out -> t2.inp
   a.out -> t3.inp
diff --git a/test/TypeScript/src/multiport/MultiportMutableInput.lf b/test/TypeScript/src/multiport/MultiportMutableInput.lf
index aad2281b3d..08c3e15af2 100644
--- a/test/TypeScript/src/multiport/MultiportMutableInput.lf
+++ b/test/TypeScript/src/multiport/MultiportMutableInput.lf
@@ -43,7 +43,7 @@ reactor Scale(scale: number = 2) {
 main reactor {
   s = new Source()
   c = new Scale()
-  p = new Print(scale = 2)
+  p = new Print(scale=2)
   s.out -> c.inp
   c.out -> p.inp
 }
diff --git a/test/TypeScript/src/multiport/MultiportMutableInputArray.lf b/test/TypeScript/src/multiport/MultiportMutableInputArray.lf
index 3450885edf..c21b71a0af 100644
--- a/test/TypeScript/src/multiport/MultiportMutableInputArray.lf
+++ b/test/TypeScript/src/multiport/MultiportMutableInputArray.lf
@@ -75,7 +75,7 @@ reactor Scale(scale: number = 2) {
 main reactor {
   s = new Source()
   c = new Scale()
-  p = new Print(scale = 2)
+  p = new Print(scale=2)
   s.out -> c.inp
   c.out -> p.inp
 }
diff --git a/test/TypeScript/src/multiport/MultiportToBankAfter.lf b/test/TypeScript/src/multiport/MultiportToBankAfter.lf
index 292da3bb53..e03d0e049d 100644
--- a/test/TypeScript/src/multiport/MultiportToBankAfter.lf
+++ b/test/TypeScript/src/multiport/MultiportToBankAfter.lf
@@ -39,7 +39,7 @@ reactor Destination {
 }
 
 main reactor(width: number = 3) {
-  a = new Source(width = width)
+  a = new Source(width=width)
   b = new[width] Destination()
   a.out -> b.inp after 1 sec  // Width of the bank of delays will be inferred.
 }
diff --git a/test/TypeScript/src/multiport/MultiportToHierarchy.lf b/test/TypeScript/src/multiport/MultiportToHierarchy.lf
index e05cc29d29..30e24b1b37 100644
--- a/test/TypeScript/src/multiport/MultiportToHierarchy.lf
+++ b/test/TypeScript/src/multiport/MultiportToHierarchy.lf
@@ -48,7 +48,7 @@ reactor Container(width: number = 4) {
 }
 
 main reactor MultiportToHierarchy(width: number = 4) {
-  a = new Source(width = width)
-  b = new Container(width = width)
+  a = new Source(width=width)
+  b = new Container(width=width)
   a.out -> b.inp
 }
diff --git a/test/TypeScript/src/multiport/MultiportToMultiport2.lf b/test/TypeScript/src/multiport/MultiportToMultiport2.lf
index 205767e7db..2f167d26b0 100644
--- a/test/TypeScript/src/multiport/MultiportToMultiport2.lf
+++ b/test/TypeScript/src/multiport/MultiportToMultiport2.lf
@@ -27,8 +27,8 @@ reactor Destination(width: number = 2) {
 }
 
 main reactor MultiportToMultiport2 {
-  a1 = new Source(width = 3)
-  a2 = new Source(width = 2)
-  b = new Destination(width = 5)
+  a1 = new Source(width=3)
+  a2 = new Source(width=2)
+  b = new Destination(width=5)
   a1.out, a2.out -> b.inp
 }
diff --git a/test/TypeScript/src/multiport/MultiportToMultiport2After.lf b/test/TypeScript/src/multiport/MultiportToMultiport2After.lf
index 5a511c8253..e5dda093d5 100644
--- a/test/TypeScript/src/multiport/MultiportToMultiport2After.lf
+++ b/test/TypeScript/src/multiport/MultiportToMultiport2After.lf
@@ -34,8 +34,8 @@ reactor Destination(width: number = 2) {
 }
 
 main reactor {
-  a1 = new Source(width = 3)
-  a2 = new Source(width = 2)
-  b = new Destination(width = 5)
+  a1 = new Source(width=3)
+  a2 = new Source(width=2)
+  b = new Destination(width=5)
   a1.out, a2.out -> b.inp after 1 sec
 }
diff --git a/test/TypeScript/src/multiport/MultiportToMultiportParameter.lf b/test/TypeScript/src/multiport/MultiportToMultiportParameter.lf
index e0da646acc..00a5c15718 100644
--- a/test/TypeScript/src/multiport/MultiportToMultiportParameter.lf
+++ b/test/TypeScript/src/multiport/MultiportToMultiportParameter.lf
@@ -40,7 +40,7 @@ reactor Destination(width: number = 1) {
 }
 
 main reactor(width: number = 4) {
-  a = new Source(width = width)
-  b = new Destination(width = width)
+  a = new Source(width=width)
+  b = new Destination(width=width)
   a.out -> b.inp
 }
diff --git a/test/TypeScript/src/multiport/MultiportToPort.lf b/test/TypeScript/src/multiport/MultiportToPort.lf
index 17ff6ce9bd..30a870024b 100644
--- a/test/TypeScript/src/multiport/MultiportToPort.lf
+++ b/test/TypeScript/src/multiport/MultiportToPort.lf
@@ -37,6 +37,6 @@ reactor Destination(expected: number = 0) {
 main reactor MultiportToPort {
   a = new Source()
   b1 = new Destination()
-  b2 = new Destination(expected = 1)
+  b2 = new Destination(expected=1)
   a.out -> b1.inp, b2.inp
 }
diff --git a/test/TypeScript/src/multiport/MultiportToReaction.lf b/test/TypeScript/src/multiport/MultiportToReaction.lf
index 824e605124..9ea9097ba5 100644
--- a/test/TypeScript/src/multiport/MultiportToReaction.lf
+++ b/test/TypeScript/src/multiport/MultiportToReaction.lf
@@ -18,7 +18,7 @@ reactor Source(width: number = 1) {
 
 main reactor MultiportToReaction {
   state s: number = 6
-  b = new Source(width = 4)
+  b = new Source(width=4)
 
   reaction(b.out) {=
     let sum = 0;
diff --git a/test/TypeScript/src/multiport/ReactionToContainedBank.lf b/test/TypeScript/src/multiport/ReactionToContainedBank.lf
index da06fb7a1f..89fb884529 100644
--- a/test/TypeScript/src/multiport/ReactionToContainedBank.lf
+++ b/test/TypeScript/src/multiport/ReactionToContainedBank.lf
@@ -9,7 +9,7 @@ main reactor ReactionToContainedBank(width: number = 2) {
   timer t(0, 100 msec)
   state count: number = 1
 
-  test = new[width] TestCount(numInputs = 11)
+  test = new[width] TestCount(numInputs=11)
 
   reaction(t) -> test.inp {=
     for (let i = 0; i < width; i++) {
diff --git a/test/TypeScript/src/multiport/ReactionsToNested.lf b/test/TypeScript/src/multiport/ReactionsToNested.lf
index 299ddfc5a1..3b90660325 100644
--- a/test/TypeScript/src/multiport/ReactionsToNested.lf
+++ b/test/TypeScript/src/multiport/ReactionsToNested.lf
@@ -24,8 +24,8 @@ reactor T(expected: number = 0) {
 
 reactor D {
   input[2] y: number
-  t1 = new T(expected = 42)
-  t2 = new T(expected = 43)
+  t1 = new T(expected=42)
+  t2 = new T(expected=43)
   y -> t1.z, t2.z
 }
 

From fd198c158bd4306f8d08379783f0e10095a29eb4 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 16 Jun 2023 12:27:03 -0700
Subject: [PATCH 0386/1114] Format Java.

---
 .../java/org/lflang/ast/MalleableString.java  |  2 +-
 core/src/main/java/org/lflang/ast/ToLf.java   | 26 +++++++++++++++----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/MalleableString.java b/core/src/main/java/org/lflang/ast/MalleableString.java
index a0c6646c99..a20727a94b 100644
--- a/core/src/main/java/org/lflang/ast/MalleableString.java
+++ b/core/src/main/java/org/lflang/ast/MalleableString.java
@@ -585,7 +585,7 @@ private Leaf(String[] possibilities) {
     }
 
     private Leaf(String possibility) {
-      this.possibilities = new String[]{possibility};
+      this.possibilities = new String[] {possibility};
     }
 
     @Override
diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 471566424f..134fff5b6d 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -489,7 +489,8 @@ public MalleableString caseStateVar(StateVar object) {
     }
     msb.append("state ").append(object.getName());
     msb.append(typeAnnotationFor(object.getType()));
-    if (object.getInit() != null) msb.append(doSwitch(object.getInit()).transform(ToLf::whitespaceInitializer));
+    if (object.getInit() != null)
+      msb.append(doSwitch(object.getInit()).transform(ToLf::whitespaceInitializer));
 
     return msb.get();
   }
@@ -945,9 +946,16 @@ public MalleableString caseParameter(Parameter object) {
         .get();
   }
 
-  /** Ensure that equals signs are surrounded by spaces if neither the text before nor the text after has spaces and is not a string. */
-  private static Function<String, String> conditionalWhitespaceInitializer(MalleableString before, MalleableString after) {
-    return it -> before.isEmpty() && !(after.toString().contains(" ") || after.toString().startsWith("\"")) ? it : whitespaceInitializer(it);
+  /**
+   * Ensure that equals signs are surrounded by spaces if neither the text before nor the text after
+   * has spaces and is not a string.
+   */
+  private static Function<String, String> conditionalWhitespaceInitializer(
+      MalleableString before, MalleableString after) {
+    return it ->
+        before.isEmpty() && !(after.toString().contains(" ") || after.toString().startsWith("\""))
+            ? it
+            : whitespaceInitializer(it);
   }
 
   /** Ensure that equals signs are surrounded by spaces. */
@@ -1073,7 +1081,15 @@ private MalleableString list(
                 })
             .collect(new Joiner(separator, prefix, suffix));
     if (whitespaceRigid) return rigid;
-    var rigidList = list(separator.strip() + "\n", "", suffixSameLine ? "" : "\n", nothingIfEmpty, true, suffixSameLine, items);
+    var rigidList =
+        list(
+            separator.strip() + "\n",
+            "",
+            suffixSameLine ? "" : "\n",
+            nothingIfEmpty,
+            true,
+            suffixSameLine,
+            items);
     return MalleableString.anyOf(
         rigid,
         new Builder()

From 6b31083f3606c46b980e3682a9a39400abcdcd72 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 16 Jun 2023 13:31:32 -0700
Subject: [PATCH 0387/1114] Actually pass DistributedMultiport this time.

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 936ff80d1b..170208fed6 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 936ff80d1b2536e52b050ff9484c4c0636438e80
+Subproject commit 170208fed6c207d223527ccf1c8ca9c278f694a4

From 68b29ac0427c4c91dc672002f92c728562d09aaf Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 16 Jun 2023 18:07:55 -0700
Subject: [PATCH 0388/1114] Update
 core/src/testFixtures/java/org/lflang/tests/LFInjectorProvider.java

---
 .../testFixtures/java/org/lflang/tests/LFInjectorProvider.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/LFInjectorProvider.java b/core/src/testFixtures/java/org/lflang/tests/LFInjectorProvider.java
index 0c17145f2e..f3c7092088 100644
--- a/core/src/testFixtures/java/org/lflang/tests/LFInjectorProvider.java
+++ b/core/src/testFixtures/java/org/lflang/tests/LFInjectorProvider.java
@@ -13,7 +13,7 @@
 import org.lflang.LFStandaloneSetup;
 
 /**
- * Note: this is a copy of a file generated by XText. The main modifications is to make this a
+ * Note: this is a copy of a file generated by XText. The main modification is to make this a
  * {@link Singleton}. This is because XText initialization relies on global static fields, and
  * concurrent test class initialization may not work properly. This modified version also does not
  * implement {@link org.eclipse.xtext.testing.IRegistryConfigurator}, which would have cleaned up

From 5a13ed9fedf1f70446374efded3575b8a23a41d7 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 16 Jun 2023 21:10:54 -0700
Subject: [PATCH 0389/1114] Fix formatting

---
 .../java/org/lflang/tests/LFInjectorProvider.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/LFInjectorProvider.java b/core/src/testFixtures/java/org/lflang/tests/LFInjectorProvider.java
index f3c7092088..19f9d4ec46 100644
--- a/core/src/testFixtures/java/org/lflang/tests/LFInjectorProvider.java
+++ b/core/src/testFixtures/java/org/lflang/tests/LFInjectorProvider.java
@@ -13,12 +13,12 @@
 import org.lflang.LFStandaloneSetup;
 
 /**
- * Note: this is a copy of a file generated by XText. The main modification is to make this a
- * {@link Singleton}. This is because XText initialization relies on global static fields, and
- * concurrent test class initialization may not work properly. This modified version also does not
- * implement {@link org.eclipse.xtext.testing.IRegistryConfigurator}, which would have cleaned up
- * the registry in a non-deterministic way. The global XText state is thus shared by all concurrent
- * tests and initialized exactly once.
+ * Note: this is a copy of a file generated by XText. The main modification is to make this a {@link
+ * Singleton}. This is because XText initialization relies on global static fields, and concurrent
+ * test class initialization may not work properly. This modified version also does not implement
+ * {@link org.eclipse.xtext.testing.IRegistryConfigurator}, which would have cleaned up the registry
+ * in a non-deterministic way. The global XText state is thus shared by all concurrent tests and
+ * initialized exactly once.
  */
 @Singleton
 public class LFInjectorProvider implements IInjectorProvider {

From 6b695bbf0cf05b2ad4ad1e1a34aa641e1905d018 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 16 Jun 2023 22:52:22 -0700
Subject: [PATCH 0390/1114] Require semicolon when not specifying a body

---
 core/src/main/java/org/lflang/LinguaFranca.xtext | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/LinguaFranca.xtext b/core/src/main/java/org/lflang/LinguaFranca.xtext
index 4e1645e9db..e069a957f8 100644
--- a/core/src/main/java/org/lflang/LinguaFranca.xtext
+++ b/core/src/main/java/org/lflang/LinguaFranca.xtext
@@ -200,10 +200,13 @@ Action:
 Reaction:
     (attributes+=Attribute)*
     (('reaction') | mutation ?= 'mutation')
+    (name=ID)?
     ('(' (triggers+=TriggerRef (',' triggers+=TriggerRef)*)? ')')
     (sources+=VarRef (',' sources+=VarRef)*)?
     ('->' effects+=VarRefOrModeTransition (',' effects+=VarRefOrModeTransition)*)?
-    ((('named' name=ID)? code=Code) | 'named' name=ID)(stp=STP)?(deadline=Deadline)?
+    (((code=Code)(stp=STP)?(deadline=Deadline)? ';'?) |
+     ((stp=STP)?(deadline=Deadline)? ';')
+    )
     ;
 
 TriggerRef:
@@ -511,7 +514,7 @@ Token:
     'mutable' | 'input' | 'output' | 'timer' | 'action' | 'reaction' |
     'startup' | 'shutdown' | 'after' | 'deadline' | 'mutation' | 'preamble' |
     'new' | 'federated' | 'at' | 'as' | 'from' | 'widthof' | 'const' | 'method' |
-    'interleaved' | 'mode' | 'initial' | 'reset' | 'history' | 'watchdog' | 'named' |
+    'interleaved' | 'mode' | 'initial' | 'reset' | 'history' | 'watchdog' |
 
     // Other terminals
     NEGINT | TRUE | FALSE |

From b899ecc5ada478a8657bd4c3a5499dda7af906c1 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 16 Jun 2023 22:57:32 -0700
Subject: [PATCH 0391/1114] Adjust tests

---
 test/C/src/no_inlining/BankMultiportToReactionNoInlining.lf | 2 +-
 test/C/src/no_inlining/BankToReactionNoInlining.lf          | 2 +-
 test/C/src/no_inlining/Count.lf                             | 4 ++--
 test/C/src/no_inlining/CountHierarchy.lf                    | 4 ++--
 test/C/src/no_inlining/IntPrint.lf                          | 4 ++--
 test/C/src/no_inlining/MultiportToReactionNoInlining.lf     | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/C/src/no_inlining/BankMultiportToReactionNoInlining.lf b/test/C/src/no_inlining/BankMultiportToReactionNoInlining.lf
index 4ed83a1700..04e20c4ec2 100644
--- a/test/C/src/no_inlining/BankMultiportToReactionNoInlining.lf
+++ b/test/C/src/no_inlining/BankMultiportToReactionNoInlining.lf
@@ -20,7 +20,7 @@ main reactor {
 
   s = new[2] DoubleCount()
 
-  reaction(s.out) named check
+  reaction check(s.out);
 
   reaction(shutdown) {=
     if (!self->received) {
diff --git a/test/C/src/no_inlining/BankToReactionNoInlining.lf b/test/C/src/no_inlining/BankToReactionNoInlining.lf
index d7277d31a2..1190817c1a 100644
--- a/test/C/src/no_inlining/BankToReactionNoInlining.lf
+++ b/test/C/src/no_inlining/BankToReactionNoInlining.lf
@@ -12,5 +12,5 @@ main reactor {
 
   s = new[2] Count()
 
-  reaction(s.out) named check
+  reaction check(s.out);
 }
diff --git a/test/C/src/no_inlining/Count.lf b/test/C/src/no_inlining/Count.lf
index b57615db92..d707dd2ce2 100644
--- a/test/C/src/no_inlining/Count.lf
+++ b/test/C/src/no_inlining/Count.lf
@@ -8,9 +8,9 @@ main reactor Count {
 
   state count: int
 
-  reaction(t) named increment
+  reaction increment(t);
 
-  reaction(t) named check_done
+  reaction check_done(t);
 
   reaction(shutdown) {= printf("%s", "shutting down\n"); =}
 }
diff --git a/test/C/src/no_inlining/CountHierarchy.lf b/test/C/src/no_inlining/CountHierarchy.lf
index 706ca75c35..d59633a708 100644
--- a/test/C/src/no_inlining/CountHierarchy.lf
+++ b/test/C/src/no_inlining/CountHierarchy.lf
@@ -15,9 +15,9 @@ main reactor {
 
   state count: int
 
-  reaction(t.out) named increment
+  reaction increment(t.out);
 
-  reaction(t.out) named check_done
+  reaction check_done(t.out);
 
   reaction(shutdown) {= printf("%s", "shutting down\n"); =}
 }
diff --git a/test/C/src/no_inlining/IntPrint.lf b/test/C/src/no_inlining/IntPrint.lf
index 49aee1caef..c29d84cfad 100644
--- a/test/C/src/no_inlining/IntPrint.lf
+++ b/test/C/src/no_inlining/IntPrint.lf
@@ -6,14 +6,14 @@ target C {
 reactor Print {
   output out: int
 
-  reaction(startup) -> out named sender
+  reaction sender(startup) -> out;
 }
 
 // expected parameter is for testing.
 reactor Check(expected: int = 42) {
   input in: int
 
-  reaction(in) named receiver
+  reaction receiver(in);
 }
 
 main reactor {
diff --git a/test/C/src/no_inlining/MultiportToReactionNoInlining.lf b/test/C/src/no_inlining/MultiportToReactionNoInlining.lf
index 98811fd9db..a067aa4c67 100644
--- a/test/C/src/no_inlining/MultiportToReactionNoInlining.lf
+++ b/test/C/src/no_inlining/MultiportToReactionNoInlining.lf
@@ -23,7 +23,7 @@ main reactor {
   state s: int = 6
   b = new Source(width = 4)
 
-  reaction(b.out) named check
+  reaction check(b.out);
 
   reaction(shutdown) {=
     if (self->s <= 6) {

From 9176026d0acc9bb4ccef5ccc938868eff0e2e08a Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 17 Jun 2023 01:07:47 -0700
Subject: [PATCH 0392/1114] Update formatter

---
 core/src/main/java/org/lflang/ast/ToLf.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 7123a352b9..0e8d76b011 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -618,6 +618,7 @@ public MalleableString caseReaction(Reaction object) {
     } else {
       msb.append("reaction");
     }
+    if (object.getName() != null) msb.append(object.getName());
     msb.append(list(true, object.getTriggers()));
     msb.append(list(", ", " ", "", true, false, object.getSources()));
     if (!object.getEffects().isEmpty()) {
@@ -639,10 +640,10 @@ public MalleableString caseReaction(Reaction object) {
                               : doSwitch(varRef))
                   .collect(new Joiner(", ")));
     }
-    if (object.getName() != null) msb.append(" named ").append(object.getName());
     if (object.getCode() != null) msb.append(" ").append(doSwitch(object.getCode()));
     if (object.getStp() != null) msb.append(" ").append(doSwitch(object.getStp()));
     if (object.getDeadline() != null) msb.append(" ").append(doSwitch(object.getDeadline()));
+    if (object.getName() != null) msb.append(";");
     return msb.get();
   }
 

From 85b04cea3f75aec53aa4265712b49c85d31b6240 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 17 Jun 2023 01:17:38 -0700
Subject: [PATCH 0393/1114] Add whitespace between keyword and identifier

---
 core/src/main/java/org/lflang/ast/ToLf.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 0e8d76b011..067822c218 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -618,7 +618,7 @@ public MalleableString caseReaction(Reaction object) {
     } else {
       msb.append("reaction");
     }
-    if (object.getName() != null) msb.append(object.getName());
+    if (object.getName() != null) msb.append(" ").append(object.getName());
     msb.append(list(true, object.getTriggers()));
     msb.append(list(", ", " ", "", true, false, object.getSources()));
     if (!object.getEffects().isEmpty()) {

From 3cb8c5aacd6cec9c9a3e8ec0f84c77714c3c9dff Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 17 Jun 2023 01:20:03 -0700
Subject: [PATCH 0394/1114] Another formatter fix

---
 core/src/main/java/org/lflang/ast/ToLf.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 067822c218..55d818ae22 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -643,7 +643,7 @@ public MalleableString caseReaction(Reaction object) {
     if (object.getCode() != null) msb.append(" ").append(doSwitch(object.getCode()));
     if (object.getStp() != null) msb.append(" ").append(doSwitch(object.getStp()));
     if (object.getDeadline() != null) msb.append(" ").append(doSwitch(object.getDeadline()));
-    if (object.getName() != null) msb.append(";");
+    if (object.getCode() == null) msb.append(";");
     return msb.get();
   }
 

From 88312d5c01c2cc30aea41b632fcafa7875793495 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 17 Jun 2023 16:34:41 -0700
Subject: [PATCH 0395/1114] Get ChainWithDelay to pass locally.

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 170208fed6..00f28dd1ec 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 170208fed6c207d223527ccf1c8ca9c278f694a4
+Subproject commit 00f28dd1ecd2e05eb35a52462859026b1dd8d9ca

From 4e8d1572b14a72c8bb57ce3552f8753da31fa2d5 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 17 Jun 2023 18:54:32 -0700
Subject: [PATCH 0396/1114] Get StopAtShutdown to pass locally.

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 00f28dd1ec..c1dd61ee09 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 00f28dd1ecd2e05eb35a52462859026b1dd8d9ca
+Subproject commit c1dd61ee091bae697ad76530412fe0d2ed3e38ae

From 3d0670bbc1ab601aef63b7d0760d59b9d0b2ab47 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Sun, 18 Jun 2023 16:59:17 +0200
Subject: [PATCH 0397/1114] use the antlr gradle plugin

---
 .../org.lflang.antlr-conventions.gradle       | 11 ++++
 core/build.gradle                             | 61 ++++++-------------
 .../org/lflang/dsl/antlr4 => antlr}/C.g4      |  0
 .../lflang/dsl/antlr4 => antlr}/MTLLexer.g4   |  0
 .../lflang/dsl/antlr4 => antlr}/MTLParser.g4  |  0
 gradle.properties                             |  2 +
 6 files changed, 33 insertions(+), 41 deletions(-)
 create mode 100644 buildSrc/src/main/groovy/org.lflang.antlr-conventions.gradle
 rename core/src/main/{java/org/lflang/dsl/antlr4 => antlr}/C.g4 (100%)
 rename core/src/main/{java/org/lflang/dsl/antlr4 => antlr}/MTLLexer.g4 (100%)
 rename core/src/main/{java/org/lflang/dsl/antlr4 => antlr}/MTLParser.g4 (100%)

diff --git a/buildSrc/src/main/groovy/org.lflang.antlr-conventions.gradle b/buildSrc/src/main/groovy/org.lflang.antlr-conventions.gradle
new file mode 100644
index 0000000000..634230b72f
--- /dev/null
+++ b/buildSrc/src/main/groovy/org.lflang.antlr-conventions.gradle
@@ -0,0 +1,11 @@
+plugins {
+    id 'antlr'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    antlr "org.antlr:antlr4:${antlrVersion}"
+}
diff --git a/core/build.gradle b/core/build.gradle
index 10dae91f90..c5ab6fbb02 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,41 +1,35 @@
 plugins {
   id 'org.lflang.java-library-conventions'
   id 'org.lflang.kotlin-conventions'
+  id 'org.lflang.antlr-conventions'
 }
 
 sourceSets {
     main {
         java {
-            srcDirs = ['src/main/java', 'src-gen']
+            srcDirs += ['src-gen']
         }
         resources {
-            srcDirs = ['src/main/resources', 'src-gen']
+            srcDirs += ['src-gen']
         }
     }
     test {
         java {
-            srcDirs = ['src/test/java', 'test-gen']
+            srcDirs += ['test-gen']
         }
     }
     testFixtures {
         java {
-            srcDirs = ['src/testFixtures/java', 'test-gen']
+            srcDirs +=['test-gen']
         }
     }
 }
 
-// Antlr4
-configurations {
-    antlr4
-}
-
 dependencies {
     api "org.eclipse.xtext:org.eclipse.xtext:$xtextVersion"
     api "org.eclipse.xtext:org.eclipse.xtext.xbase.lib:$xtextVersion"
     api "org.eclipse.xtext:org.eclipse.xtext.ide:$xtextVersion"
 
-    implementation "org.eclipse.emf:org.eclipse.emf.mwe2.launch:$mwe2LaunchVersion"
-
     implementation "com.fasterxml.jackson.core:jackson-core:$fasterxmlVersion"
     implementation "com.fasterxml.jackson.core:jackson-annotations:$fasterxmlVersion"
     implementation "com.fasterxml.jackson.core:jackson-databind:$fasterxmlVersion"
@@ -49,9 +43,7 @@ dependencies {
         exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
     }
 
-    antlr4 'org.antlr:antlr4:4.7.2'
-    implementation 'org.antlr:antlr4-runtime:4.7.2'
-    implementation 'org.json:json:20200518' // JSON
+    implementation "org.json:json:$jsonVersion"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:$jupiterVersion"
     testImplementation "org.junit.jupiter:junit-jupiter-engine:$jupiterVersion"
@@ -63,15 +55,13 @@ dependencies {
 }
 
 configurations {
-    mwe2 {
-        extendsFrom implementation
-    }
+    mwe2
 }
 
 dependencies {
-    mwe2 'org.eclipse.emf:org.eclipse.emf.mwe2.launch'
-    mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
-    mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
+    mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:$mwe2LaunchVersion"
+    mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:$xtextVersion"
+    mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:$xtextVersion"
 }
 
 tasks.register('generateXtextLanguage', JavaExec) {
@@ -88,31 +78,20 @@ tasks.register('generateXtextLanguage', JavaExec) {
     args += "rootPath=/${projectDir}/.."
 }
 
-// Add Antlr4 for various DSLs, including MTL for verification.
-tasks.register('runAntlr4', JavaExec) {
-   //see incremental task api, prevents rerun if nothing has changed.
-   inputs.dir "$projectDir/src/main/java/org/lflang/dsl/antlr4/"
-   outputs.dir "$projectDir/src/main/java/org/lflang/dsl/generated/antlr4/main/"
-
-   classpath = configurations.antlr4
+compileJava.dependsOn(generateXtextLanguage)
+compileKotlin.dependsOn(generateXtextLanguage)
+processResources.dependsOn(generateXtextLanguage)
+clean.dependsOn(cleanGenerateXtextLanguage)
+spotlessJava.mustRunAfter(generateXtextLanguage)
+rootProject.spotlessMisc.mustRunAfter(generateXtextLanguage)
 
-   main = "org.antlr.v4.Tool"
 
-   args = [ "-visitor",
-            "-o",  "$projectDir/src/main/java/org/lflang/dsl/generated/antlr4/main/",
-            "-package", "org.lflang.dsl",
-            "$projectDir/src/main/java/org/lflang/dsl/antlr4/MTLLexer.g4",
-            "$projectDir/src/main/java/org/lflang/dsl/antlr4/MTLParser.g4",
-            "$projectDir/src/main/java/org/lflang/dsl/antlr4/C.g4"]
+// antlr4 configuration
+generateGrammarSource {
+    arguments += ['-visitor', '-package', 'org.lflang.dsl']
 }
+compileKotlin.dependsOn(generateGrammarSource)
 
-compileJava.dependsOn(generateXtextLanguage, runAntlr4)
-compileKotlin.dependsOn(generateXtextLanguage, runAntlr4)
-processResources.dependsOn(generateXtextLanguage, runAntlr4)
-clean.dependsOn(cleanGenerateXtextLanguage)
-spotlessJava.mustRunAfter(generateXtextLanguage)
-runAntlr4.mustRunAfter(spotlessJava)
-rootProject.spotlessMisc.mustRunAfter(generateXtextLanguage, runAntlr4)
 
 tasks.register('getSubmoduleVersions', Exec) {
     description('Run a Git command to get the current status of submodules')
diff --git a/core/src/main/java/org/lflang/dsl/antlr4/C.g4 b/core/src/main/antlr/C.g4
similarity index 100%
rename from core/src/main/java/org/lflang/dsl/antlr4/C.g4
rename to core/src/main/antlr/C.g4
diff --git a/core/src/main/java/org/lflang/dsl/antlr4/MTLLexer.g4 b/core/src/main/antlr/MTLLexer.g4
similarity index 100%
rename from core/src/main/java/org/lflang/dsl/antlr4/MTLLexer.g4
rename to core/src/main/antlr/MTLLexer.g4
diff --git a/core/src/main/java/org/lflang/dsl/antlr4/MTLParser.g4 b/core/src/main/antlr/MTLParser.g4
similarity index 100%
rename from core/src/main/java/org/lflang/dsl/antlr4/MTLParser.g4
rename to core/src/main/antlr/MTLParser.g4
diff --git a/gradle.properties b/gradle.properties
index 8d2599bdf6..db47ec6323 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,6 +16,8 @@ picocliVersion=4.7.0
 resourcesVersion=3.16.0
 xtextVersion=2.28.0
 klighdVersion=2.2.1-SNAPSHOT
+antlrVersion=4.7.2
+jsonVersion=20200518
 
 [manifestPropertyNames]
 org.eclipse.xtext=xtextVersion

From fd9a94cfaf73ab54d6630e951a6895f1e48d9152 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 18 Jun 2023 15:53:46 -0700
Subject: [PATCH 0398/1114] Update gradle.properties

---
 gradle.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 199752eda8..28cac25560 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,6 +10,7 @@ jacocoVersion=0.8.7
 jsonVersion=20200518
 jupiterVersion=5.8.2
 jUnitPlatformVersion=1.8.2
+klighdVersion=2.3.0.v20230606
 kotlinJvmTarget=17
 lsp4jVersion=0.14.0
 mwe2LaunchVersion=2.12.2
@@ -23,4 +24,4 @@ org.eclipse.xtext=xtextVersion
 org.eclipse.lsp4j=lsp4jVersion
 org.opentest4j=openTest4jVersion
 org.eclipse.core.resources=resourcesVersion
-org.junit.jupiter=jupiterVersion
\ No newline at end of file
+org.junit.jupiter=jupiterVersion

From caa69f6151ebbcf50952b61dad26b360c8ef60f7 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 18 Jun 2023 16:21:30 -0700
Subject: [PATCH 0399/1114] Always take choose sources in ambiguous situation

---
 core/src/main/java/org/lflang/LinguaFranca.xtext | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/LinguaFranca.xtext b/core/src/main/java/org/lflang/LinguaFranca.xtext
index e069a957f8..55965869db 100644
--- a/core/src/main/java/org/lflang/LinguaFranca.xtext
+++ b/core/src/main/java/org/lflang/LinguaFranca.xtext
@@ -202,11 +202,9 @@ Reaction:
     (('reaction') | mutation ?= 'mutation')
     (name=ID)?
     ('(' (triggers+=TriggerRef (',' triggers+=TriggerRef)*)? ')')
-    (sources+=VarRef (',' sources+=VarRef)*)?
+    ( => sources+=VarRef (',' sources+=VarRef)*)?
     ('->' effects+=VarRefOrModeTransition (',' effects+=VarRefOrModeTransition)*)?
-    (((code=Code)(stp=STP)?(deadline=Deadline)? ';'?) |
-     ((stp=STP)?(deadline=Deadline)? ';')
-    )
+    (code=Code)? (stp=STP)? (deadline=Deadline)? ';'?
     ;
 
 TriggerRef:

From 62113a4b0185c2107e58a53063e2b91f17303d8a Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 18 Jun 2023 17:34:21 -0700
Subject: [PATCH 0400/1114] Added validator check and fixed bug in validator

---
 .../main/java/org/lflang/LinguaFranca.xtext   |  2 +-
 .../org/lflang/validation/LFValidator.java    | 31 +++++++++++++++----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/lflang/LinguaFranca.xtext b/core/src/main/java/org/lflang/LinguaFranca.xtext
index 55965869db..e414ff6b0e 100644
--- a/core/src/main/java/org/lflang/LinguaFranca.xtext
+++ b/core/src/main/java/org/lflang/LinguaFranca.xtext
@@ -204,7 +204,7 @@ Reaction:
     ('(' (triggers+=TriggerRef (',' triggers+=TriggerRef)*)? ')')
     ( => sources+=VarRef (',' sources+=VarRef)*)?
     ('->' effects+=VarRefOrModeTransition (',' effects+=VarRefOrModeTransition)*)?
-    (code=Code)? (stp=STP)? (deadline=Deadline)? ';'?
+    (code=Code)? (stp=STP)? (deadline=Deadline)? (delimited?=';')?
     ;
 
 TriggerRef:
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index d228a2dba6..5b333b4cbe 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -24,6 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
+
 package org.lflang.validation;
 
 import static org.lflang.ast.ASTUtils.inferPortWidth;
@@ -706,12 +707,17 @@ public void checkReaction(Reaction reaction) {
     if (reaction.getTriggers() == null || reaction.getTriggers().size() == 0) {
       warning("Reaction has no trigger.", Literals.REACTION__TRIGGERS);
     }
-    HashSet<Variable> triggers = new HashSet<>();
+    if (!reaction.isDelimited()
+        && (reaction.getSources() != null || reaction.getSources().size() != 0)
+        && reaction.getCode() == null) {
+      error("Missing semicolon at the end of reaction declaration.", Literals.REACTION__SOURCES);
+    }
+    HashSet<VarRef> triggers = new HashSet<>();
     // Make sure input triggers have no container and output sources do.
     for (TriggerRef trigger : reaction.getTriggers()) {
       if (trigger instanceof VarRef) {
         VarRef triggerVarRef = (VarRef) trigger;
-        triggers.add(triggerVarRef.getVariable());
+        triggers.add(triggerVarRef);
         if (triggerVarRef instanceof Input) {
           if (triggerVarRef.getContainer() != null) {
             error(
@@ -735,7 +741,14 @@ public void checkReaction(Reaction reaction) {
     // Make sure input sources have no container and output sources do.
     // Also check that a source is not already listed as a trigger.
     for (VarRef source : reaction.getSources()) {
-      if (triggers.contains(source.getVariable())) {
+      var duplicate =
+          triggers.stream()
+              .anyMatch(
+                  t -> {
+                    return t.getVariable().equals(source.getVariable())
+                        && t.getContainer().equals(source.getContainer());
+                  });
+      if (duplicate) {
         error(
             String.format(
                 "Source is already listed as a trigger: %s", source.getVariable().getName()),
@@ -1889,8 +1902,12 @@ private boolean sameType(Type type1, Type type2) {
     // Most common case first.
     if (type1.getId() != null) {
       if (type1.getStars() != null) {
-        if (type2.getStars() == null) return false;
-        if (type1.getStars().size() != type2.getStars().size()) return false;
+        if (type2.getStars() == null) {
+          return false;
+        }
+        if (type1.getStars().size() != type2.getStars().size()) {
+          return false;
+        }
       }
       return (type1.getId().equals(type2.getId()));
     }
@@ -1899,7 +1916,9 @@ private boolean sameType(Type type1, Type type2) {
     // (time?='time' (arraySpec=ArraySpec)?) | ((id=(DottedName) (stars+='*')* ('<'
     // typeParms+=TypeParm (',' typeParms+=TypeParm)* '>')? (arraySpec=ArraySpec)?) | code=Code);
     if (type1.isTime()) {
-      if (!type2.isTime()) return false;
+      if (!type2.isTime()) {
+        return false;
+      }
       // Ignore the arraySpec because that is checked when connection
       // is checked for balance.
       return true;

From 6f09724a0a7673564f28a8ee6bef3d51db511dcb Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 18 Jun 2023 17:54:20 -0700
Subject: [PATCH 0401/1114] Added test

---
 .../compiler/LinguaFrancaValidationTest.java  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 72e3574b33..de2bdd67c5 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -172,6 +172,35 @@ public void disallowReactorCalledPreamble() throws Exception {
         "Reactor cannot be named 'Preamble'");
   }
 
+  @Test
+  public void requireSemicolonIfAmbiguous() throws Exception {
+    String testCase =
+        """
+            target C
+
+            reactor Foo {
+              output out: int
+              input inp: int
+              reaction(inp) -> out {==}
+            }
+
+            main reactor {
+              f1 = new Foo()
+              f2 = new Foo()
+              f3 = new Foo()
+
+              reaction increment(f1.out)
+              f2.out -> f3.inp
+            }
+
+            """;
+    validator.assertError(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getReaction(),
+        null,
+        "Missing semicolon at the end of reaction declaration.");
+  }
+
   /** Ensure that "__" is not allowed at the start of an input name. */
   @Test
   public void disallowUnderscoreInputs() throws Exception {

From df9d9e9b00403eb03edb259a0a4ebff47b95f3a5 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 18 Jun 2023 18:05:41 -0700
Subject: [PATCH 0402/1114] Added test and fixed logic

---
 .../java/org/lflang/validation/LFValidator.java |  2 +-
 .../compiler/LinguaFrancaValidationTest.java    | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 5b333b4cbe..b1893fd923 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -708,7 +708,7 @@ public void checkReaction(Reaction reaction) {
       warning("Reaction has no trigger.", Literals.REACTION__TRIGGERS);
     }
     if (!reaction.isDelimited()
-        && (reaction.getSources() != null || reaction.getSources().size() != 0)
+        && (reaction.getSources() != null && reaction.getSources().size() != 0)
         && reaction.getCode() == null) {
       error("Missing semicolon at the end of reaction declaration.", Literals.REACTION__SOURCES);
     }
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index de2bdd67c5..6c86efb952 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -201,6 +201,23 @@ reaction increment(f1.out)
         "Missing semicolon at the end of reaction declaration.");
   }
 
+  @Test
+  public void noSemicolonIfNotAmbiguous() throws Exception {
+    String testCase =
+        """
+            target C
+
+            main reactor {
+              timer t(0)
+
+              reaction increment(t)
+              reaction multiply(t)
+            }
+
+            """;
+    validator.assertNoErrors(parseWithoutError(testCase));
+  }
+
   /** Ensure that "__" is not allowed at the start of an input name. */
   @Test
   public void disallowUnderscoreInputs() throws Exception {

From d30ed6b6b9e18df140a534d1417cf90b10aeba63 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 18 Jun 2023 18:07:44 -0700
Subject: [PATCH 0403/1114] Adjust formatter

---
 core/src/main/java/org/lflang/ast/ToLf.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 55d818ae22..2ab43a5789 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -643,7 +643,7 @@ public MalleableString caseReaction(Reaction object) {
     if (object.getCode() != null) msb.append(" ").append(doSwitch(object.getCode()));
     if (object.getStp() != null) msb.append(" ").append(doSwitch(object.getStp()));
     if (object.getDeadline() != null) msb.append(" ").append(doSwitch(object.getDeadline()));
-    if (object.getCode() == null) msb.append(";");
+    if (object.isDelimited()) msb.append(";");
     return msb.get();
   }
 

From 146a0499f32400e51739a35d17377a99c445a153 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 18 Jun 2023 18:11:18 -0700
Subject: [PATCH 0404/1114] Apply suggestions from code review

---
 test/C/src/no_inlining/BankMultiportToReactionNoInlining.lf | 2 +-
 test/C/src/no_inlining/BankToReactionNoInlining.lf          | 2 +-
 test/C/src/no_inlining/Count.lf                             | 4 ++--
 test/C/src/no_inlining/CountHierarchy.lf                    | 4 ++--
 test/C/src/no_inlining/IntPrint.lf                          | 4 ++--
 test/C/src/no_inlining/MultiportToReactionNoInlining.lf     | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/C/src/no_inlining/BankMultiportToReactionNoInlining.lf b/test/C/src/no_inlining/BankMultiportToReactionNoInlining.lf
index 04e20c4ec2..fe725a359a 100644
--- a/test/C/src/no_inlining/BankMultiportToReactionNoInlining.lf
+++ b/test/C/src/no_inlining/BankMultiportToReactionNoInlining.lf
@@ -20,7 +20,7 @@ main reactor {
 
   s = new[2] DoubleCount()
 
-  reaction check(s.out);
+  reaction check(s.out)
 
   reaction(shutdown) {=
     if (!self->received) {
diff --git a/test/C/src/no_inlining/BankToReactionNoInlining.lf b/test/C/src/no_inlining/BankToReactionNoInlining.lf
index 1190817c1a..b28ccf80ec 100644
--- a/test/C/src/no_inlining/BankToReactionNoInlining.lf
+++ b/test/C/src/no_inlining/BankToReactionNoInlining.lf
@@ -12,5 +12,5 @@ main reactor {
 
   s = new[2] Count()
 
-  reaction check(s.out);
+  reaction check(s.out)
 }
diff --git a/test/C/src/no_inlining/Count.lf b/test/C/src/no_inlining/Count.lf
index d707dd2ce2..49ceb04482 100644
--- a/test/C/src/no_inlining/Count.lf
+++ b/test/C/src/no_inlining/Count.lf
@@ -8,9 +8,9 @@ main reactor Count {
 
   state count: int
 
-  reaction increment(t);
+  reaction increment(t)
 
-  reaction check_done(t);
+  reaction check_done(t)
 
   reaction(shutdown) {= printf("%s", "shutting down\n"); =}
 }
diff --git a/test/C/src/no_inlining/CountHierarchy.lf b/test/C/src/no_inlining/CountHierarchy.lf
index d59633a708..ab59d38386 100644
--- a/test/C/src/no_inlining/CountHierarchy.lf
+++ b/test/C/src/no_inlining/CountHierarchy.lf
@@ -15,9 +15,9 @@ main reactor {
 
   state count: int
 
-  reaction increment(t.out);
+  reaction increment(t.out)
 
-  reaction check_done(t.out);
+  reaction check_done(t.out)
 
   reaction(shutdown) {= printf("%s", "shutting down\n"); =}
 }
diff --git a/test/C/src/no_inlining/IntPrint.lf b/test/C/src/no_inlining/IntPrint.lf
index c29d84cfad..7c9fd48284 100644
--- a/test/C/src/no_inlining/IntPrint.lf
+++ b/test/C/src/no_inlining/IntPrint.lf
@@ -6,14 +6,14 @@ target C {
 reactor Print {
   output out: int
 
-  reaction sender(startup) -> out;
+  reaction sender(startup) -> out
 }
 
 // expected parameter is for testing.
 reactor Check(expected: int = 42) {
   input in: int
 
-  reaction receiver(in);
+  reaction receiver(in)
 }
 
 main reactor {
diff --git a/test/C/src/no_inlining/MultiportToReactionNoInlining.lf b/test/C/src/no_inlining/MultiportToReactionNoInlining.lf
index a067aa4c67..0730b8acc1 100644
--- a/test/C/src/no_inlining/MultiportToReactionNoInlining.lf
+++ b/test/C/src/no_inlining/MultiportToReactionNoInlining.lf
@@ -23,7 +23,7 @@ main reactor {
   state s: int = 6
   b = new Source(width = 4)
 
-  reaction check(b.out);
+  reaction check(b.out)
 
   reaction(shutdown) {=
     if (self->s <= 6) {

From 1707dda20a8ea55c84ff451eb5f19a02c793a2a1 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 18 Jun 2023 18:49:58 -0700
Subject: [PATCH 0405/1114] Update core/src/main/java/org/lflang/ast/ToLf.java

---
 core/src/main/java/org/lflang/ast/ToLf.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 2ab43a5789..410d0575f2 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -643,7 +643,6 @@ public MalleableString caseReaction(Reaction object) {
     if (object.getCode() != null) msb.append(" ").append(doSwitch(object.getCode()));
     if (object.getStp() != null) msb.append(" ").append(doSwitch(object.getStp()));
     if (object.getDeadline() != null) msb.append(" ").append(doSwitch(object.getDeadline()));
-    if (object.isDelimited()) msb.append(";");
     return msb.get();
   }
 

From a7fe954c5f117d8fcf962de036c04ffeeabd3c9e Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 18 Jun 2023 23:00:31 -0700
Subject: [PATCH 0406/1114] Stop using Present type

---
 .github/workflows/ts-tests.yml              | 2 +-
 core/src/main/resources/lib/ts/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ts-tests.yml b/.github/workflows/ts-tests.yml
index 331075b401..e8a8b91892 100644
--- a/.github/workflows/ts-tests.yml
+++ b/.github/workflows/ts-tests.yml
@@ -37,7 +37,7 @@ jobs:
         if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }}
       - name: Perform TypeScript tests
         run: |
-          ./gradlew targetTest -Ptarget=TypeScript -Druntime="git://github.com/lf-lang/reactor-ts.git#master"
+          ./gradlew targetTest -Ptarget=TypeScript -Druntime="git://github.com/lf-lang/reactor-ts.git#axmmisaka/remove-present-replace-unknown"
       - name: Collect code coverage
         run: ./gradlew jacocoTestReport
       - name: Report to CodeCov
diff --git a/core/src/main/resources/lib/ts/package.json b/core/src/main/resources/lib/ts/package.json
index fc063d791e..02149379f6 100644
--- a/core/src/main/resources/lib/ts/package.json
+++ b/core/src/main/resources/lib/ts/package.json
@@ -2,7 +2,7 @@
     "name": "LinguaFrancaDefault",
     "type": "commonjs",
     "dependencies": {
-        "@lf-lang/reactor-ts": "git://github.com/lf-lang/reactor-ts.git#master",
+        "@lf-lang/reactor-ts": "git://github.com/lf-lang/reactor-ts.git#axmmisaka/remove-present-replace-unknown",
         "command-line-args": "^5.1.1",
         "command-line-usage": "^6.1.3"
     },

From c131861fd6bb9aa4b5fe5cf51bbf1754f5383e73 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 18 Jun 2023 23:10:47 -0700
Subject: [PATCH 0407/1114] Remove several uses of `Present`

---
 .../main/kotlin/org/lflang/generator/ts/TSExtensions.kt   | 8 ++++----
 .../org/lflang/generator/ts/TSImportPreambleGenerator.kt  | 2 +-
 .../kotlin/org/lflang/generator/ts/TSTimerGenerator.kt    | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSExtensions.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSExtensions.kt
index a28e462921..f1d31e9726 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSExtensions.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSExtensions.kt
@@ -35,20 +35,20 @@ fun WidthSpec.toTSCode(): String = terms.joinToString(" + ") {
 /**
  * Return a TS type for the specified port.
  * If the type has not been specified, return
- * "Present" which is the base type for ports.
+ * `unknown`.
  * @return The TS type.
  */
 val Port.tsPortType: String
-    get() = type?.let { TSTypes.getInstance().getTargetType(it) } ?: "Present"
+    get() = type?.let { TSTypes.getInstance().getTargetType(it) } ?: "unknown"
 
 /**
  * Return a TS type for the specified action.
  * If the type has not been specified, return
- * "Present" which is the base type for Actions.
+ * `unknown` which is the base type for Actions.
  * @return The TS type.
  */
 val Action.tsActionType: String
-    get() = type?.let { TSTypes.getInstance().getTargetType(it) } ?: "Present"
+    get() = type?.let { TSTypes.getInstance().getTargetType(it) } ?: "unknown"
 
 fun Expression.toTsTime(): String = TSTypes.getInstance().getTargetTimeExpr(this)
 fun TimeValue.toTsTime(): String = TSTypes.getInstance().getTargetTimeExpr(this)
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt
index 6621794852..b39cb71664 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt
@@ -63,7 +63,7 @@ class TSImportPreambleGenerator(
             import {Reaction as __Reaction} from '@lf-lang/reactor-ts'
             import {State as __State} from '@lf-lang/reactor-ts'
             import {TimeUnit, TimeValue, Tag as __Tag, Origin as __Origin} from '@lf-lang/reactor-ts'
-            import {Args as __Args, Variable as __Variable, Triggers as __Triggers, Present, Read, Write, ReadWrite, MultiReadWrite, Sched} from '@lf-lang/reactor-ts'
+            import {Args as __Args, Variable as __Variable, Triggers as __Triggers, Read, Write, ReadWrite, MultiReadWrite, Sched} from '@lf-lang/reactor-ts'
             import {Log} from '@lf-lang/reactor-ts'
             import {ProcessedCommandLineArgs as __ProcessedCommandLineArgs, CommandLineOptionDefs as __CommandLineOptionDefs, CommandLineUsageDefs as __CommandLineUsageDefs, CommandLineOptionSpec as __CommandLineOptionSpec, unitBasedTimeValueCLAType as __unitBasedTimeValueCLAType, booleanCLAType as __booleanCLAType} from '@lf-lang/reactor-ts'
             """
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSTimerGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSTimerGenerator.kt
index 2cb1f37894..411249d7ca 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSTimerGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSTimerGenerator.kt
@@ -1,8 +1,6 @@
 package org.lflang.generator.ts
 
-import org.lflang.generator.getTargetTimeExpr
 import org.lflang.generator.orZero
-import org.lflang.lf.Expression
 import org.lflang.lf.Timer
 import java.util.*
 

From e25a8d4ab2a3b072fe910842f9b753992f7181b6 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 18 Jun 2023 23:37:45 -0700
Subject: [PATCH 0408/1114] More fixes

---
 core/src/main/java/org/lflang/Target.java                   | 1 -
 core/src/main/java/org/lflang/generator/TargetTypes.java    | 2 +-
 core/src/main/java/org/lflang/generator/ts/TSTypes.java     | 2 +-
 .../kotlin/org/lflang/generator/ts/TSDelayBodyGenerator.kt  | 6 +++---
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/lflang/Target.java b/core/src/main/java/org/lflang/Target.java
index 8f08e89fcc..4a6012f7a8 100644
--- a/core/src/main/java/org/lflang/Target.java
+++ b/core/src/main/java/org/lflang/Target.java
@@ -268,7 +268,6 @@ public enum Target {
           // underscores)
           "TimeUnit",
           "TimeValue",
-          "Present",
           "Sched",
           "Read",
           "Write",
diff --git a/core/src/main/java/org/lflang/generator/TargetTypes.java b/core/src/main/java/org/lflang/generator/TargetTypes.java
index eda5cffd11..968a641ed3 100644
--- a/core/src/main/java/org/lflang/generator/TargetTypes.java
+++ b/core/src/main/java/org/lflang/generator/TargetTypes.java
@@ -60,7 +60,7 @@ default String getTargetBracedListExpr(BracedListExpression expr, InferredType t
         .collect(Collectors.joining(",", "{", "}"));
   }
 
-  /** Return an "undefined" type which is used as a default when a type cannot be inferred. */
+  /** Return an "unknown" type which is used as a default when a type cannot be inferred. */
   String getTargetUndefinedType();
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/ts/TSTypes.java b/core/src/main/java/org/lflang/generator/ts/TSTypes.java
index 0fe4fc8a5e..cca3736c66 100644
--- a/core/src/main/java/org/lflang/generator/ts/TSTypes.java
+++ b/core/src/main/java/org/lflang/generator/ts/TSTypes.java
@@ -40,7 +40,7 @@ public String getTargetTagType() {
 
   @Override
   public String getTargetUndefinedType() {
-    return "Present";
+    return "unknown";
   }
 
   public String getTargetTimeExpr(TimeValue value) {
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSDelayBodyGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSDelayBodyGenerator.kt
index e561696524..ecdcf762a2 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSDelayBodyGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSDelayBodyGenerator.kt
@@ -9,7 +9,7 @@ object TSDelayBodyGenerator : DelayBodyGenerator {
     /**
      * Return a TS type for the specified action.
      * If the type has not been specified, return
-     * "Present" which is the base type for Actions.
+     * `unknown`.
      * @param action The action
      * @return The TS type.
      */
@@ -17,7 +17,7 @@ object TSDelayBodyGenerator : DelayBodyGenerator {
         return if (action.type != null) {
             TSTypes.getInstance().getTargetType(action.type)
         } else {
-            "Present"
+            "unknown"
         }
     }
 
@@ -30,7 +30,7 @@ object TSDelayBodyGenerator : DelayBodyGenerator {
     }
 
     override fun generateDelayGeneric(): String {
-        return "T extends Present"
+        return "T"
     }
 
     override fun generateAfterDelaysWithVariableWidth() = false

From a5e56c4430b903a332353d4a5f592222526b5eba Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 19 Jun 2023 00:10:14 -0700
Subject: [PATCH 0409/1114] Account for the fact that deadlines also
 disambiguate

---
 core/src/main/java/org/lflang/validation/LFValidator.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index b1893fd923..4f62465e39 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -708,8 +708,11 @@ public void checkReaction(Reaction reaction) {
       warning("Reaction has no trigger.", Literals.REACTION__TRIGGERS);
     }
     if (!reaction.isDelimited()
-        && (reaction.getSources() != null && reaction.getSources().size() != 0)
-        && reaction.getCode() == null) {
+        && reaction.getCode() == null
+        && reaction.getDeadline() == null
+        && reaction.getStp() == null
+        && reaction.getSources() != null
+        && reaction.getSources().size() != 0) {
       error("Missing semicolon at the end of reaction declaration.", Literals.REACTION__SOURCES);
     }
     HashSet<VarRef> triggers = new HashSet<>();

From fff61cf29ea4c5f76fce7f08604fce6bb9eaf184 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 19 Jun 2023 10:48:21 +0200
Subject: [PATCH 0410/1114] don't format generated java files

---
 buildSrc/src/main/groovy/org.lflang.java-conventions.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle b/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle
index 4cbea8bf20..b5d922535b 100644
--- a/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle
@@ -9,7 +9,7 @@ repositories {
 
 spotless {
     java {
-        targetExclude 'src-gen/**', 'test-gen/**'
+        targetExclude 'src-gen/**', 'test-gen/**', 'build/**'
         // The following is quoted from https://github.com/google/google-java-format
         // "Note: There is no configurability as to the formatter's algorithm for formatting.
         // This is a deliberate design decision to unify our code formatting on a single format."

From 56127752316d66de3d7411f5380cfe51948cf829 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 19 Jun 2023 14:51:11 +0200
Subject: [PATCH 0411/1114] fix kotlin antlr dependencies

---
 buildSrc/src/main/groovy/org.lflang.antlr-conventions.gradle | 5 +++++
 core/build.gradle                                            | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/groovy/org.lflang.antlr-conventions.gradle b/buildSrc/src/main/groovy/org.lflang.antlr-conventions.gradle
index 634230b72f..291cba30ae 100644
--- a/buildSrc/src/main/groovy/org.lflang.antlr-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.lflang.antlr-conventions.gradle
@@ -9,3 +9,8 @@ repositories {
 dependencies {
     antlr "org.antlr:antlr4:${antlrVersion}"
 }
+
+if (project.tasks.findByName('compileKotlin')) {
+    // make all kotlin compile tasks depent on the antl generation tasks
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).each(it -> it.dependsOn(tasks.withType(AntlrTask)))
+}
diff --git a/core/build.gradle b/core/build.gradle
index b65f657370..afc272355c 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -93,8 +93,6 @@ rootProject.spotlessMisc.mustRunAfter(generateXtextLanguage)
 generateGrammarSource {
     arguments += ['-visitor', '-package', 'org.lflang.dsl']
 }
-compileKotlin.dependsOn(generateGrammarSource)
-
 
 tasks.register('getSubmoduleVersions', Exec) {
     description('Run a Git command to get the current status of submodules')

From 2d9d653c1b351ae00c5071d2a579304ab2bb4803 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 19 Jun 2023 14:53:50 +0200
Subject: [PATCH 0412/1114] clean up source sets

---
 core/build.gradle | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index afc272355c..61fd39ce3a 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -13,19 +13,6 @@ sourceSets {
             srcDirs += ['src-gen']
         }
     }
-    test {
-        java {
-            srcDirs = ['src/test/java']
-        }
-        resources {
-            srcDirs = [ 'src/test/resources' ]
-        }
-    }
-    testFixtures {
-        java {
-            srcDirs = ['src/testFixtures/java']
-        }
-    }
 }
 
 dependencies {

From a26d7748693750580c5f7eff32fa617c98b5d4a7 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 19 Jun 2023 15:52:49 +0200
Subject: [PATCH 0413/1114] Cleanup gradle config

---
 core/build.gradle | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 43af8d6c21..57792bbfde 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -6,23 +6,10 @@ plugins {
 sourceSets {
     main {
         java {
-            srcDirs = ['src/main/java', 'src-gen']
+            srcDirs += ['src-gen']
         }
         resources {
-            srcDirs = ['src/main/resources', 'src-gen']
-        }
-    }
-    test {
-        java {
-            srcDirs = ['src/test/java']
-        }
-        resources {
-            srcDirs = [ 'src/test/resources' ]
-        }
-    }
-    testFixtures {
-        java {
-            srcDirs = ['src/testFixtures/java']
+            srcDirs += ['src-gen']
         }
     }
 }
@@ -32,8 +19,6 @@ dependencies {
     api "org.eclipse.xtext:org.eclipse.xtext.xbase.lib:$xtextVersion"
     api "org.eclipse.xtext:org.eclipse.xtext.ide:$xtextVersion"
 
-    implementation "org.eclipse.emf:org.eclipse.emf.mwe2.launch:$mwe2LaunchVersion"
-
     implementation "com.fasterxml.jackson.core:jackson-core:$fasterxmlVersion"
     implementation "com.fasterxml.jackson.core:jackson-annotations:$fasterxmlVersion"
     implementation "com.fasterxml.jackson.core:jackson-databind:$fasterxmlVersion"
@@ -57,15 +42,13 @@ dependencies {
 }
 
 configurations {
-    mwe2 {
-        extendsFrom implementation
-    }
+    mwe2
 }
 
 dependencies {
-    mwe2 'org.eclipse.emf:org.eclipse.emf.mwe2.launch'
-    mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
-    mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
+    mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:$mwe2LaunchVersion"
+    mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:$xtextVersion"
+    mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:$xtextVersion"
 }
 
 tasks.register('generateXtextLanguage', JavaExec) {

From 90db38bcb1cad2acf78b5cc45d51b9c1a923314c Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 19 Jun 2023 15:57:54 +0200
Subject: [PATCH 0414/1114] don't generate test-gen

---
 core/build.gradle                                       | 1 -
 core/src/main/java/org/lflang/GenerateLinguaFranca.mwe2 | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 57792bbfde..234fc07aff 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -57,7 +57,6 @@ tasks.register('generateXtextLanguage', JavaExec) {
     inputs.file "src/main/java/org/lflang/GenerateLinguaFranca.mwe2"
     inputs.file "src/main/java/org/lflang/LinguaFranca.xtext"
     outputs.dir "src-gen"
-    outputs.dir "test-gen"
     outputs.dir "model"
     outputs.file ".antlr-generator-3.2.0-patch.jar"
     args += "src/main/java/org/lflang/GenerateLinguaFranca.mwe2"
diff --git a/core/src/main/java/org/lflang/GenerateLinguaFranca.mwe2 b/core/src/main/java/org/lflang/GenerateLinguaFranca.mwe2
index 3958d74d69..a1d8638ba1 100644
--- a/core/src/main/java/org/lflang/GenerateLinguaFranca.mwe2
+++ b/core/src/main/java/org/lflang/GenerateLinguaFranca.mwe2
@@ -23,10 +23,7 @@ Workflow {
                     src = "src/main/java"
                 }
                 runtimeTest = {
-                    enabled = true
-                    name = coreProject // add into the core project
-                    src = "src/test/java"
-                    srcGen = "test-gen"
+                    enabled = false
                 }
                 // Only generate Eclipse infrastructure for the Epoch build (separate repository).
                 createEclipseMetaData = false

From e61e8bd89b7b8e11b4ba18bedc0c6758f4dff9c0 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 19 Jun 2023 17:01:06 +0200
Subject: [PATCH 0415/1114] log exceptions during diagram synthesis

---
 .../diagram/synthesis/LinguaFrancaSynthesis.java       | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index b26fea12a2..b82b49461b 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -30,6 +30,7 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Table;
 import de.cau.cs.kieler.klighd.DisplayedActionData;
+import de.cau.cs.kieler.klighd.Klighd;
 import de.cau.cs.kieler.klighd.SynthesisOption;
 import de.cau.cs.kieler.klighd.kgraph.KEdge;
 import de.cau.cs.kieler.klighd.kgraph.KLabel;
@@ -68,6 +69,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.inject.Inject;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.elk.alg.layered.options.LayerConstraint;
 import org.eclipse.elk.alg.layered.options.LayeredOptions;
 import org.eclipse.elk.alg.layered.options.NodePlacementStrategy;
@@ -366,7 +369,12 @@ public KNode transform(final Model model) {
         }
       }
     } catch (Exception e) {
-      e.printStackTrace();
+      Klighd.log(
+          new Status(
+              IStatus.ERROR,
+              LinguaFrancaSynthesis.class,
+              "An exception occurred during diagram synthesis",
+              e));
 
       KNode messageNode = _kNodeExtensions.createNode();
       _linguaFrancaShapeExtensions.addErrorMessage(

From 99eb874039ae0ff696fb4fe48303c0680c8a3dd1 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 19 Jun 2023 17:01:47 +0200
Subject: [PATCH 0416/1114] also log any errors and messages during synthesis

---
 .../util/SynthesisErrorReporter.java          | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java b/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
index a249c009fd..5d229e015b 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisErrorReporter.java
@@ -24,7 +24,10 @@
  ***************/
 package org.lflang.diagram.synthesis.util;
 
+import de.cau.cs.kieler.klighd.Klighd;
 import java.nio.file.Path;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.ecore.EObject;
 import org.lflang.ErrorReporter;
 
@@ -32,53 +35,60 @@
  * @author Alexander Schulz-Rosengarten
  */
 public class SynthesisErrorReporter implements ErrorReporter {
+
+  private boolean errorsOccurred = false;
+
   @Override
   public String reportError(String message) {
-    return null;
+    errorsOccurred = true;
+    Klighd.log(new Status(IStatus.ERROR, SynthesisErrorReporter.class, message));
+    return message;
   }
 
   @Override
   public String reportError(EObject object, String message) {
-    return null;
+    return reportError(message);
   }
 
   @Override
   public String reportError(Path file, Integer line, String message) {
-    return null;
+    return reportError(message);
   }
 
   @Override
   public String reportWarning(String message) {
-    return null;
+    Klighd.log(new Status(IStatus.WARNING, SynthesisErrorReporter.class, message));
+    return message;
   }
 
   @Override
   public String reportWarning(EObject object, String message) {
-    return null;
+    return reportWarning(message);
   }
 
   @Override
   public String reportWarning(Path file, Integer line, String message) {
-    return null;
+    return reportWarning(message);
   }
 
   @Override
   public String reportInfo(String message) {
-    return null;
+    Klighd.log(new Status(IStatus.INFO, SynthesisErrorReporter.class, message));
+    return message;
   }
 
   @Override
   public String reportInfo(EObject object, String message) {
-    return null;
+    return reportInfo(message);
   }
 
   @Override
   public String reportInfo(Path file, Integer line, String message) {
-    return null;
+    return reportInfo(message);
   }
 
   @Override
   public boolean getErrorsOccurred() {
-    return false;
+    return errorsOccurred;
   }
 }

From 644fcfdf06623898eccc0b3251b2a890e4c80a0b Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 19 Jun 2023 17:02:34 +0200
Subject: [PATCH 0417/1114] forward klighd messages to our reporter and fail on
 errors

---
 cli/lfd/src/main/java/org/lflang/cli/Lfd.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/cli/lfd/src/main/java/org/lflang/cli/Lfd.java b/cli/lfd/src/main/java/org/lflang/cli/Lfd.java
index 8377381b34..8ceeea91bd 100644
--- a/cli/lfd/src/main/java/org/lflang/cli/Lfd.java
+++ b/cli/lfd/src/main/java/org/lflang/cli/Lfd.java
@@ -1,5 +1,6 @@
 package org.lflang.cli;
 
+import de.cau.cs.kieler.klighd.Klighd;
 import de.cau.cs.kieler.klighd.LightDiagramServices;
 import de.cau.cs.kieler.klighd.standalone.KlighdStandaloneSetup;
 import java.nio.file.Path;
@@ -24,6 +25,19 @@ public class Lfd extends CliBase {
   @Override
   public void doRun() {
     KlighdStandaloneSetup.initialize();
+    Klighd.setStatusManager(
+        (status, style) -> {
+          switch (status.getSeverity()) {
+            case IStatus.ERROR -> {
+              reporter.printError(status.getMessage());
+              if (status.getException() != null) {
+                status.getException().printStackTrace();
+              }
+            }
+            case IStatus.WARNING -> reporter.printWarning(status.getMessage());
+            default -> reporter.printInfo(status.getMessage());
+          }
+        });
 
     for (Path relativePath : getInputPaths()) {
       Path path = toAbsolutePath(relativePath);
@@ -35,6 +49,8 @@ public void doRun() {
         reporter.printFatalErrorAndExit(status.getMessage());
       }
     }
+
+    reporter.exit();
   }
 
   /**

From 88d330c4db3c8903e7c2c91484eb02dd64b5c24f Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 19 Jun 2023 08:54:37 -0700
Subject: [PATCH 0418/1114] Update
 core/src/main/java/org/lflang/validation/LFValidator.java
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Clément Fournier <clement.fournier76@gmail.com>
---
 core/src/main/java/org/lflang/validation/LFValidator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 4f62465e39..40569a62ad 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -712,7 +712,7 @@ public void checkReaction(Reaction reaction) {
         && reaction.getDeadline() == null
         && reaction.getStp() == null
         && reaction.getSources() != null
-        && reaction.getSources().size() != 0) {
+        && !reaction.getSources().isEmpty()) {
       error("Missing semicolon at the end of reaction declaration.", Literals.REACTION__SOURCES);
     }
     HashSet<VarRef> triggers = new HashSet<>();

From 0217857acb50368ad4fbc830b2f77848f7d0dae8 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 19 Jun 2023 17:59:20 +0200
Subject: [PATCH 0419/1114] test diagram generation for all integration tests

---
 cli/lfd/build.gradle                          |  2 +
 .../lflang/test/DiagramGenerationTest.java    | 86 +++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 cli/lfd/src/test/java/org/lflang/test/DiagramGenerationTest.java

diff --git a/cli/lfd/build.gradle b/cli/lfd/build.gradle
index a83405cadc..688fc6092a 100644
--- a/cli/lfd/build.gradle
+++ b/cli/lfd/build.gradle
@@ -15,6 +15,8 @@ dependencies {
         exclude group: 'de.cau.cs.kieler.swt.mock'
     }
     implementation ("org.freehep:freehep-graphicsio-svg:${freehepVersion}")
+
+    testImplementation(testFixtures(project(':core')))
 }
 
 application {
diff --git a/cli/lfd/src/test/java/org/lflang/test/DiagramGenerationTest.java b/cli/lfd/src/test/java/org/lflang/test/DiagramGenerationTest.java
new file mode 100644
index 0000000000..7175256d2e
--- /dev/null
+++ b/cli/lfd/src/test/java/org/lflang/test/DiagramGenerationTest.java
@@ -0,0 +1,86 @@
+package org.lflang.tests;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import de.cau.cs.kieler.klighd.Klighd;
+import de.cau.cs.kieler.klighd.LightDiagramServices;
+import de.cau.cs.kieler.klighd.standalone.KlighdStandaloneSetup;
+import java.net.URI;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.extensions.InjectionExtension;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.TestFactory;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
+import org.lflang.Target;
+import org.lflang.lf.Model;
+
+@ExtendWith(InjectionExtension.class)
+@InjectWith(LFInjectorProvider.class)
+@Execution(ExecutionMode.SAME_THREAD)
+public class DiagramGenerationTest {
+  @Inject private TestRegistry testRegistry;
+
+  @Inject private Provider<ResourceSet> resourceSetProvider;
+
+  @TestFactory
+  public Collection<DynamicTest> diagramGenerationTestFactory(@TempDir Path tempDir) {
+    KlighdStandaloneSetup.initialize();
+    List<DynamicTest> result = new ArrayList<>();
+    Path cwd = Paths.get(".").toAbsolutePath();
+    int id = 0;
+    for (Target target : Target.values()) {
+      for (TestRegistry.TestCategory category : TestRegistry.TestCategory.values()) {
+        for (LFTest test : testRegistry.getRegisteredTests(target, category, false)) {
+          URI testSourceUri = test.getSrcPath().toUri();
+          final ResourceSet set = this.resourceSetProvider.get();
+          Resource resource =
+              set.getResource(
+                  org.eclipse.emf.common.util.URI.createFileURI(test.getSrcPath().toString()),
+                  true);
+          Path outPath = tempDir.resolve("diagram_" + id + ".svg");
+          id++;
+          result.add(
+              DynamicTest.dynamicTest(
+                  cwd.relativize(test.getSrcPath()).toString(),
+                  testSourceUri,
+                  () -> run(resource, outPath.toString())));
+        }
+      }
+    }
+    return result;
+  }
+
+  private static void run(Resource resource, String outPath) {
+    AtomicBoolean errorOccurred = new AtomicBoolean(false);
+    Klighd.setStatusManager(
+        (status, style) -> {
+          if (status.getSeverity() == IStatus.ERROR) {
+            System.out.println(status.getMessage());
+            if (status.getException() != null) {
+              status.getException().printStackTrace();
+            }
+          }
+          errorOccurred.set(true);
+        });
+
+    final Model model = (Model) resource.getContents().get(0);
+    IStatus status = LightDiagramServices.renderOffScreen(model, "svg", outPath);
+    if (!status.isOK()) {
+      System.out.println(status.getMessage());
+    }
+    assert status.isOK();
+    assert !errorOccurred.get();
+  }
+}

From e2a4438b8afd4837abbcffeefcea43a95b8dad00 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 19 Jun 2023 18:03:32 +0200
Subject: [PATCH 0420/1114] fix package name

---
 .../src/test/java/org/lflang/test/DiagramGenerationTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/lfd/src/test/java/org/lflang/test/DiagramGenerationTest.java b/cli/lfd/src/test/java/org/lflang/test/DiagramGenerationTest.java
index 7175256d2e..e40690877f 100644
--- a/cli/lfd/src/test/java/org/lflang/test/DiagramGenerationTest.java
+++ b/cli/lfd/src/test/java/org/lflang/test/DiagramGenerationTest.java
@@ -1,4 +1,4 @@
-package org.lflang.tests;
+package org.lflang.test;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

From 6030cb8e5da9dbb5f92048246d7fe96de38730a2 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 19 Jun 2023 18:21:58 +0200
Subject: [PATCH 0421/1114] make the distributions os specific

---
 build.gradle                                          |  4 +++-
 .../org.lflang.java-application-conventions.gradle    | 11 ++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index beb7cad6a5..6ba559cee3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,7 +38,9 @@ distributions {
         if (project.hasProperty('nightly')) {
           def date = new Date()
           def formattedDate = date.format('yyyyMMddHHmmss')
-          distributionClassifier = 'nightly-' + formattedDate
+          distributionClassifier = 'nightly-' + formattedDate + '-' + System.getProperty('os.name')
+        } else {
+          distributionClassifier = System.getProperty('os.name')
         }
         contents {
           from tasks.getByPath('cli:lfc:installDist').outputs
diff --git a/buildSrc/src/main/groovy/org.lflang.java-application-conventions.gradle b/buildSrc/src/main/groovy/org.lflang.java-application-conventions.gradle
index 432ebacf1b..13a8c5e415 100644
--- a/buildSrc/src/main/groovy/org.lflang.java-application-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.lflang.java-application-conventions.gradle
@@ -10,10 +10,15 @@ tasks.withType(Tar) {
     archiveExtension = 'tar.gz'
 }
 
-// Fix long path issue on Windows
-// See https://github.com/gradle/gradle/issues/1989
 startScripts {
     doLast {
-        windowsScript.text = windowsScript.text.replaceAll('set CLASSPATH=.*', 'set CLASSPATH=.;%APP_HOME%/lib/*')
+        if (System.getProperty('os.name').toLowerCase().contains('windows')) {
+            delete unixScript
+            // Fix long path issue on Windows
+            // See https://github.com/gradle/gradle/issues/1989
+            windowsScript.text = windowsScript.text.replaceAll('set CLASSPATH=.*', 'set CLASSPATH=.;%APP_HOME%/lib/*')
+        } else {
+            delete windowsScript
+        }
     }
 }

From bd973ddc90039ad38a75c6c8596faba0993e57cb Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 19 Jun 2023 18:36:13 +0200
Subject: [PATCH 0422/1114] add imports back

---
 .../src/test/java/org/lflang/test/DiagramGenerationTest.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cli/lfd/src/test/java/org/lflang/test/DiagramGenerationTest.java b/cli/lfd/src/test/java/org/lflang/test/DiagramGenerationTest.java
index e40690877f..a484f752a6 100644
--- a/cli/lfd/src/test/java/org/lflang/test/DiagramGenerationTest.java
+++ b/cli/lfd/src/test/java/org/lflang/test/DiagramGenerationTest.java
@@ -25,6 +25,9 @@
 import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.lflang.Target;
 import org.lflang.lf.Model;
+import org.lflang.tests.LFInjectorProvider;
+import org.lflang.tests.LFTest;
+import org.lflang.tests.TestRegistry;
 
 @ExtendWith(InjectionExtension.class)
 @InjectWith(LFInjectorProvider.class)

From 235cffbec2e28474d534eaab0d719f06fceaac28 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 19 Jun 2023 18:45:02 +0200
Subject: [PATCH 0423/1114] also package lfd

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index 6ba559cee3..c6a10bfa14 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,6 +45,7 @@ distributions {
         contents {
           from tasks.getByPath('cli:lfc:installDist').outputs
           from tasks.getByPath('cli:lff:installDist').outputs
+          from tasks.getByPath('cli:lfd:installDist').outputs
           duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         }
     }

From 0bd26d0c7792277e5745d2521a0a613c15a40018 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 19 Jun 2023 18:45:53 +0200
Subject: [PATCH 0424/1114] only add OS name to nightly builds

---
 build.gradle | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index c6a10bfa14..9abc03feb0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,6 @@ distributions {
           def date = new Date()
           def formattedDate = date.format('yyyyMMddHHmmss')
           distributionClassifier = 'nightly-' + formattedDate + '-' + System.getProperty('os.name')
-        } else {
-          distributionClassifier = System.getProperty('os.name')
         }
         contents {
           from tasks.getByPath('cli:lfc:installDist').outputs

From ea6f05a08cbb6b07bbd4a82203ecd23dae0fe1dc Mon Sep 17 00:00:00 2001
From: Abhi Gundrala <gundralaa@berkeley.edu>
Date: Mon, 19 Jun 2023 11:44:54 -0700
Subject: [PATCH 0425/1114] extra launch scripts

---
 .../lflang/generator/c/CCmakeGenerator.java   |  26 +-
 .../org/lflang/generator/c/CGenerator.java    |  12 +
 .../resources/lib/platform/pico/launch.json   |  29 +
 .../pico/pico_extras_import_optional.cmake    |  59 ++
 .../lib/platform/pico/pico_sdk_import.cmake   |  73 +++
 .../resources/lib/platform/pico/pico_setup.sh | 549 ++++++++++++++++++
 6 files changed, 730 insertions(+), 18 deletions(-)
 create mode 100644 core/src/main/resources/lib/platform/pico/launch.json
 create mode 100644 core/src/main/resources/lib/platform/pico/pico_extras_import_optional.cmake
 create mode 100644 core/src/main/resources/lib/platform/pico/pico_sdk_import.cmake
 create mode 100755 core/src/main/resources/lib/platform/pico/pico_setup.sh

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 9c87d4047a..3daa04a924 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -131,24 +131,13 @@ CodeBuilder generateCMakeCode(
       cMakeCode.pr("# We recommend Zephyr v3.3.0 but we are compatible with older versions also");
       cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} 3.3.0)");
       cMakeCode.newLine();
-    }
-
-    if (targetConfig.platformOptions.platform == Platform.PICO) {
-      // resolve pico-sdk path 
-      cMakeCode.pr("# Recommended to place the pico-sdk path in the shell environment variable");
-      cMakeCode.pr("if(DEFINED ENV{PICO_SDK_PATH})");
-      cMakeCode.pr("  message(\"Found SDK path in ENV\")");
-      cMakeCode.pr("  set(PICO_SDK_PATH $ENV{PICO_SDK_PATH})");
-      cMakeCode.pr("else()");
-      cMakeCode.pr("  message(\"Could not find SDK path in ENV\")");
-      cMakeCode.pr("  set(PICO_SDK_PATH ./lib/pico-sdk)");
-      cMakeCode.pr("endif()");
-      cMakeCode.pr("message(PICO_SDK_PATH=\"${PICO_SDK_PATH}\")");
-      cMakeCode.newLine();
-      // include cmake
-      cMakeCode.pr("include(\"${PICO_SDK_PATH}/pico_sdk_init.cmake\")");
+    } else if (targetConfig.platformOptions.platform == Platform.PICO) {
+      cMakeCode.pr("message(\"Run ./pico_setup.sh for unix systems in a chosen directory.\")");
+      cMakeCode.pr("message(\"The script will download all required dependencies in /pico.\")");
       cMakeCode.newLine();
-      // pico sdk uses asm cpp and c sources
+      // include cmake before project
+      cMakeCode.pr("include(pico_sdk_import.cmake)");
+      cMakeCode.pr("include(pico_extras_import_optional.cmake)");
       cMakeCode.pr("project(" + executableName + " LANGUAGES C CXX ASM)");
       cMakeCode.newLine();
     } else {
@@ -435,8 +424,9 @@ private static String setUpMainTargetPico(
     var code = new CodeBuilder();
     // FIXME: remove this and move to lingo build
     code.pr("add_compile_options(-Wall -Wextra -DLF_UNTHREADED)");
-    //  
+    // initialize sdk  
     code.pr("pico_sdk_init()");
+    code.newLine();
     code.pr("add_subdirectory(core)");
     code.pr("target_link_libraries(core PUBLIC pico_stdlib)");
     code.pr("target_link_libraries(core PUBLIC pico_multicore)");
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 7bed894341..32cfd0dc41 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -967,6 +967,18 @@ protected void copyTargetFiles() throws IOException {
       FileUtil.copyFileFromClassPath(
           "/lib/platform/zephyr/Kconfig", fileConfig.getSrcGenPath(), true);
     }
+
+    if (targetConfig.platformOptions.platform == Platform.PICO) {
+      Path vscodePath = Path.of(fileConfig.getSrcGenPath() + File.separator + ".vscode");
+      FileUtil.copyFileFromClassPath(
+          "/lib/platform/pico/pico_setup.sh", fileConfig.getSrcGenPath(), true);
+      FileUtil.copyFileFromClassPath(
+          "/lib/platform/pico/pico_sdk_import.cmake", fileConfig.getSrcGenPath(), true);
+      FileUtil.copyFileFromClassPath(
+          "/lib/platform/pico/pico_extras_import_optional.cmake", fileConfig.getSrcGenPath(), true);
+      FileUtil.copyFileFromClassPath(
+          "/lib/platform/pico/launch.json", vscodePath, true);
+    }
   }
 
   ////////////////////////////////////////////
diff --git a/core/src/main/resources/lib/platform/pico/launch.json b/core/src/main/resources/lib/platform/pico/launch.json
new file mode 100644
index 0000000000..21eec34b84
--- /dev/null
+++ b/core/src/main/resources/lib/platform/pico/launch.json
@@ -0,0 +1,29 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Pico Debug",
+            "cwd": "${workspaceRoot}",
+            "executable": "${command:cmake.launchTargetPath}",
+            "request": "launch",
+            "type": "cortex-debug",
+            "servertype": "openocd",
+            // This may need to be "arm-none-eabi-gdb" for some previous builds
+            "gdbPath" : "gdb-multiarch",
+            "device": "RP2040",
+            "configFiles": [
+                "interface/cmsis-dap.cfg",
+                "target/rp2040.cfg"
+            ],
+            "svdFile": "${env:PICO_SDK_PATH}/src/rp2040/hardware_regs/rp2040.svd",
+            "runToEntryPoint": "main",
+            // Work around for stopping at main on restart
+            "postRestartCommands": [
+                "break main",
+                "continue"
+            ],
+            "showDevDebugOutput": "raw",
+            "openOCDLaunchCommands": ["adapter speed 5000"]
+        }
+    ]
+}
diff --git a/core/src/main/resources/lib/platform/pico/pico_extras_import_optional.cmake b/core/src/main/resources/lib/platform/pico/pico_extras_import_optional.cmake
new file mode 100644
index 0000000000..692e14ad9d
--- /dev/null
+++ b/core/src/main/resources/lib/platform/pico/pico_extras_import_optional.cmake
@@ -0,0 +1,59 @@
+# This is a copy of <PICO_EXTRAS_PATH>/external/pico_extras_import.cmake
+
+# This can be dropped into an external project to help locate pico-extras
+# It should be include()ed prior to project()
+
+if (DEFINED ENV{PICO_EXTRAS_PATH} AND (NOT PICO_EXTRAS_PATH))
+    set(PICO_EXTRAS_PATH $ENV{PICO_EXTRAS_PATH})
+    message("Using PICO_EXTRAS_PATH from environment ('${PICO_EXTRAS_PATH}')")
+endif ()
+
+if (DEFINED ENV{PICO_EXTRAS_FETCH_FROM_GIT} AND (NOT PICO_EXTRAS_FETCH_FROM_GIT))
+    set(PICO_EXTRAS_FETCH_FROM_GIT $ENV{PICO_EXTRAS_FETCH_FROM_GIT})
+    message("Using PICO_EXTRAS_FETCH_FROM_GIT from environment ('${PICO_EXTRAS_FETCH_FROM_GIT}')")
+endif ()
+
+if (DEFINED ENV{PICO_EXTRAS_FETCH_FROM_GIT_PATH} AND (NOT PICO_EXTRAS_FETCH_FROM_GIT_PATH))
+    set(PICO_EXTRAS_FETCH_FROM_GIT_PATH $ENV{PICO_EXTRAS_FETCH_FROM_GIT_PATH})
+    message("Using PICO_EXTRAS_FETCH_FROM_GIT_PATH from environment ('${PICO_EXTRAS_FETCH_FROM_GIT_PATH}')")
+endif ()
+
+if (NOT PICO_EXTRAS_PATH)
+    if (PICO_EXTRAS_FETCH_FROM_GIT)
+        include(FetchContent)
+        set(FETCHCONTENT_BASE_DIR_SAVE ${FETCHCONTENT_BASE_DIR})
+        if (PICO_EXTRAS_FETCH_FROM_GIT_PATH)
+            get_filename_component(FETCHCONTENT_BASE_DIR "${PICO_EXTRAS_FETCH_FROM_GIT_PATH}" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}")
+        endif ()
+        FetchContent_Declare(
+                pico_extras
+                GIT_REPOSITORY https://github.com/raspberrypi/pico-extras
+                GIT_TAG master
+        )
+        if (NOT pico_extras)
+            message("Downloading Raspberry Pi Pico Extras")
+            FetchContent_Populate(pico_extras)
+            set(PICO_EXTRAS_PATH ${pico_extras_SOURCE_DIR})
+        endif ()
+        set(FETCHCONTENT_BASE_DIR ${FETCHCONTENT_BASE_DIR_SAVE})
+    else ()
+        if (PICO_SDK_PATH AND EXISTS "${PICO_SDK_PATH}/../pico-extras")
+            set(PICO_EXTRAS_PATH ${PICO_SDK_PATH}/../pico-extras)
+            message("Defaulting PICO_EXTRAS_PATH as sibling of PICO_SDK_PATH: ${PICO_EXTRAS_PATH}")
+        endif()
+    endif ()
+endif ()
+
+if (PICO_EXTRAS_PATH)
+    set(PICO_EXTRAS_PATH "${PICO_EXTRAS_PATH}" CACHE PATH "Path to the PICO EXTRAS")
+    set(PICO_EXTRAS_FETCH_FROM_GIT "${PICO_EXTRAS_FETCH_FROM_GIT}" CACHE BOOL "Set to ON to fetch copy of PICO EXTRAS from git if not otherwise locatable")
+    set(PICO_EXTRAS_FETCH_FROM_GIT_PATH "${PICO_EXTRAS_FETCH_FROM_GIT_PATH}" CACHE FILEPATH "location to download EXTRAS")
+
+    get_filename_component(PICO_EXTRAS_PATH "${PICO_EXTRAS_PATH}" REALPATH BASE_DIR "${CMAKE_BINARY_DIR}")
+    if (NOT EXISTS ${PICO_EXTRAS_PATH})
+        message(FATAL_ERROR "Directory '${PICO_EXTRAS_PATH}' not found")
+    endif ()
+
+    set(PICO_EXTRAS_PATH ${PICO_EXTRAS_PATH} CACHE PATH "Path to the PICO EXTRAS" FORCE)
+    add_subdirectory(${PICO_EXTRAS_PATH} pico_extras)
+endif()
\ No newline at end of file
diff --git a/core/src/main/resources/lib/platform/pico/pico_sdk_import.cmake b/core/src/main/resources/lib/platform/pico/pico_sdk_import.cmake
new file mode 100644
index 0000000000..65f8a6f7db
--- /dev/null
+++ b/core/src/main/resources/lib/platform/pico/pico_sdk_import.cmake
@@ -0,0 +1,73 @@
+# This is a copy of <PICO_SDK_PATH>/external/pico_sdk_import.cmake
+
+# This can be dropped into an external project to help locate this SDK
+# It should be include()ed prior to project()
+
+if (DEFINED ENV{PICO_SDK_PATH} AND (NOT PICO_SDK_PATH))
+    set(PICO_SDK_PATH $ENV{PICO_SDK_PATH})
+    message("Using PICO_SDK_PATH from environment ('${PICO_SDK_PATH}')")
+endif ()
+
+if (DEFINED ENV{PICO_SDK_FETCH_FROM_GIT} AND (NOT PICO_SDK_FETCH_FROM_GIT))
+    set(PICO_SDK_FETCH_FROM_GIT $ENV{PICO_SDK_FETCH_FROM_GIT})
+    message("Using PICO_SDK_FETCH_FROM_GIT from environment ('${PICO_SDK_FETCH_FROM_GIT}')")
+endif ()
+
+if (DEFINED ENV{PICO_SDK_FETCH_FROM_GIT_PATH} AND (NOT PICO_SDK_FETCH_FROM_GIT_PATH))
+    set(PICO_SDK_FETCH_FROM_GIT_PATH $ENV{PICO_SDK_FETCH_FROM_GIT_PATH})
+    message("Using PICO_SDK_FETCH_FROM_GIT_PATH from environment ('${PICO_SDK_FETCH_FROM_GIT_PATH}')")
+endif ()
+
+set(PICO_SDK_PATH "${PICO_SDK_PATH}" CACHE PATH "Path to the Raspberry Pi Pico SDK")
+set(PICO_SDK_FETCH_FROM_GIT "${PICO_SDK_FETCH_FROM_GIT}" CACHE BOOL "Set to ON to fetch copy of SDK from git if not otherwise locatable")
+set(PICO_SDK_FETCH_FROM_GIT_PATH "${PICO_SDK_FETCH_FROM_GIT_PATH}" CACHE FILEPATH "location to download SDK")
+
+if (NOT PICO_SDK_PATH)
+    if (PICO_SDK_FETCH_FROM_GIT)
+        include(FetchContent)
+        set(FETCHCONTENT_BASE_DIR_SAVE ${FETCHCONTENT_BASE_DIR})
+        if (PICO_SDK_FETCH_FROM_GIT_PATH)
+            get_filename_component(FETCHCONTENT_BASE_DIR "${PICO_SDK_FETCH_FROM_GIT_PATH}" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}")
+        endif ()
+        # GIT_SUBMODULES_RECURSE was added in 3.17
+        if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17.0")
+            FetchContent_Declare(
+                    pico_sdk
+                    GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk
+                    GIT_TAG master
+                    GIT_SUBMODULES_RECURSE FALSE
+            )
+        else ()
+            FetchContent_Declare(
+                    pico_sdk
+                    GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk
+                    GIT_TAG master
+            )
+        endif ()
+
+        if (NOT pico_sdk)
+            message("Downloading Raspberry Pi Pico SDK")
+            FetchContent_Populate(pico_sdk)
+            set(PICO_SDK_PATH ${pico_sdk_SOURCE_DIR})
+        endif ()
+        set(FETCHCONTENT_BASE_DIR ${FETCHCONTENT_BASE_DIR_SAVE})
+    else ()
+        message(FATAL_ERROR
+                "SDK location was not specified. Please set PICO_SDK_PATH or set PICO_SDK_FETCH_FROM_GIT to on to fetch from git."
+                )
+    endif ()
+endif ()
+
+get_filename_component(PICO_SDK_PATH "${PICO_SDK_PATH}" REALPATH BASE_DIR "${CMAKE_BINARY_DIR}")
+if (NOT EXISTS ${PICO_SDK_PATH})
+    message(FATAL_ERROR "Directory '${PICO_SDK_PATH}' not found")
+endif ()
+
+set(PICO_SDK_INIT_CMAKE_FILE ${PICO_SDK_PATH}/pico_sdk_init.cmake)
+if (NOT EXISTS ${PICO_SDK_INIT_CMAKE_FILE})
+    message(FATAL_ERROR "Directory '${PICO_SDK_PATH}' does not appear to contain the Raspberry Pi Pico SDK")
+endif ()
+
+set(PICO_SDK_PATH ${PICO_SDK_PATH} CACHE PATH "Path to the Raspberry Pi Pico SDK" FORCE)
+
+include(${PICO_SDK_INIT_CMAKE_FILE})
diff --git a/core/src/main/resources/lib/platform/pico/pico_setup.sh b/core/src/main/resources/lib/platform/pico/pico_setup.sh
new file mode 100755
index 0000000000..853a08c185
--- /dev/null
+++ b/core/src/main/resources/lib/platform/pico/pico_setup.sh
@@ -0,0 +1,549 @@
+#!/usr/bin/env bash
+
+# Phase 0: Preflight check
+# Verify baseline dependencies
+
+# Phase 1: Setup dev environment
+# Install the software packages from APT or Homebrew
+# Create a directory called pico
+# Download the pico-sdk repository and submodules
+# Define env variables: PICO_SDK_PATH
+# On Raspberry Pi only: configure the UART for use with Raspberry Pi Pico
+
+# Phase 2: Setting up tutorial repos
+# Download pico-examples, pico-extras, pico-playground repositories, and submodules
+# Build the blink and hello_world examples
+
+# Phase 3: Recommended tools
+# Download and build picotool (see Appendix B), and copy it to /usr/local/bin.
+# Download and build picoprobe (see Appendix A) and OpenOCD
+# Download and install Visual Studio Code and required extensions
+
+
+# Exit on error
+set -e
+
+# Trying to use a non-existent variable is an error
+set -u
+
+# if printenv DEBUG >& /dev/null; then
+    # Show all commands
+    set -x
+
+    env
+# fi
+
+# Number of cores when running make
+JNUM=4
+
+# Where will the output go?
+if printenv TARGET_DIR; then
+    echo "Using target dir from \$TARGET_DIR: ${TARGET_DIR}"
+else
+    TARGET_DIR="$(pwd)/pico"
+    echo "Using target dir: ${TARGET_DIR}"
+fi
+
+linux() {
+    # Returns true iff this is running on Linux
+    uname | grep -q "^Linux$"
+    return ${?}
+}
+
+raspbian() {
+    # Returns true iff this is running on Raspbian or close derivative such as Raspberry Pi OS, but not necessarily on a Raspberry Pi computer
+    grep -q '^NAME="Raspbian GNU/Linux"$' /etc/os-release
+    return ${?}
+}
+
+debian() {
+    # Returns true iff this is running on Debian
+    grep -q '^NAME="Debian GNU/Linux"$' /etc/os-release
+    return ${?}
+}
+
+ubuntu() {
+    # Returns true iff this is running on Ubuntu
+    grep -q '^NAME="Ubuntu"$' /etc/os-release
+    return ${?}
+}
+
+mac() {
+    # Returns true iff this is running on macOS and presumably Apple hardware
+    uname | grep -q "^Darwin$"
+    return ${?}
+}
+
+raspberry_pi() {
+    # Returns true iff this is running on a Raspberry Pi computer, regardless of the OS
+    if [ -f /proc/cpuinfo ]; then
+        grep -q "^Model\s*: Raspberry Pi" /proc/cpuinfo
+        return ${?}
+    fi
+    return 1
+}
+
+sudo_wrapper() {
+    # Some platforms have different needs for invoking sudo. This wrapper encapsulates that complexity.
+    # The output of this function should be a string on stdout, which will be used as a command. Example:
+    #   `$(sudo_wrapper) whoami`
+    # The above may equate to:
+    #   `sudo -i whoami`
+
+    if [ "${USER}" = root ]; then
+        # if we're already root, don't sudo at all. Relevant to some Docker images that don't have sudo but already run as root.
+        return
+    fi
+
+    # EC2 AMIs tend to have the user password unset, so you can't sudo without -i. It will cd /root, so you have to be
+    # careful with relative paths in the command.
+    echo sudo -i
+}
+
+phase_0() {
+    # Preflight check
+    # Checks the baseline dependencies. If you don't have these, this script won't work.
+    echo "Entering phase 0: Preflight check"
+    
+    if mac; then
+        echo "Running on macOS"
+        if which brew >> /dev/null; then
+            echo "Found brew"
+            brew update
+        else
+            echo -e 'This script requires Homebrew, the missing package manager for macOS. See https://docs.brew.sh/Installation. For quick install, run:\n/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"'
+            echo "Stopping."
+            exit 1
+        fi
+    else
+        if linux; then
+            echo "Running on Linux"
+        else
+            echo "Platform $(uname) not recognized. Use at your own risk. Continuing as though this were Linux."
+        fi
+
+        if which apt >> /dev/null; then
+            echo "Found apt"
+            $(sudo_wrapper) apt update
+        else
+            echo 'This script requires apt, the default package manager for Debian and Debian-derived distros such as Ubuntu and Raspberry Pi OS.'
+            echo "Stopping."
+            exit 1
+        fi
+    fi
+}
+
+fail() {
+    # Outputs a failure message and exits with the error code output by the previous call.
+    # All args are echoed as a failure message.
+
+    R="${?}"
+    echo "Validation failed! :'-("
+    if [ ${*} ]; then
+        echo "${*}"
+    fi
+    exit ${R}
+}
+
+validate_git_repo() {
+    # tests that the given relative path exists and is a git repo
+    git -C ${TARGET_DIR}/${1} status >& /dev/null || fail
+}
+
+validate_toolchain_linux() {
+    # test that the expected packages are installed
+    dpkg-query -s git cmake gcc-arm-none-eabi build-essential gdb-multiarch automake autoconf build-essential texinfo libtool libftdi-dev libusb-1.0-0-dev >& /dev/null || fail
+}
+
+install_dev_env_deps_linux() {
+    # Install development environment dependencies for Linux
+
+    # Avoid a certain dependency by installing ssh-client without recommends. See
+    # https://github.com/raspberrypi/pico-setup/pull/20#discussion_r608793993 for details.
+    $(sudo_wrapper) apt install -y --no-install-recommends ssh-client
+
+    DEPS="autoconf automake build-essential cmake gcc-arm-none-eabi gdb-multiarch git libftdi-dev libtool libusb-1.0-0-dev minicom pkg-config python3 texinfo"
+    if debian || ubuntu; then
+        DEPS="${DEPS} libstdc++-arm-none-eabi-newlib"
+    fi
+    $(sudo_wrapper) apt install -y ${DEPS}
+}
+
+brew_install_idempotent() {
+    # For some reason, brew install is not idempotent. This function succeeds even when the package is already installed.
+    brew list ${*} || brew install ${*}
+    return ${?}
+}
+
+validate_toolchain_mac() {
+    # test that the expected packages are installed
+    brew list git cmake pkg-config libtool automake libusb wget pkg-config gcc texinfo arm-none-eabi-gcc >& /dev/null 
+}
+
+install_dev_env_deps_mac() {
+    # Install development environment dependencies for mac
+
+    brew_install_idempotent ArmMbed/homebrew-formulae/arm-none-eabi-gcc automake cmake git libtool libusb gcc minicom pkg-config texinfo wget
+}
+
+create_TARGET_DIR() {
+    # Creates ./pico directory if necessary
+
+    mkdir -p "${TARGET_DIR}"
+}
+
+clone_raspberrypi_repo() {
+    # Clones the given repo name from GitHub and inits any submodules
+    # $1 should be the full name of the repo, ex: pico-sdk
+    # $2 should be the branch name. Defaults to master.
+    # all other args are passed to git clone
+    REPO_NAME="${1}"
+    if shift && [ ${#} -gt 0 ]; then
+        BRANCH="${1}"
+        # Can't just say `shift` because `set -e` will think it's an error and terminate the script.
+        shift || true
+    else
+        BRANCH=master
+    fi
+
+    REPO_URL="https://github.com/raspberrypi/${REPO_NAME}.git"
+    REPO_DIR="${TARGET_DIR}/${REPO_NAME}"
+
+    if [ -d "${REPO_DIR}" ]; then
+        echo "${REPO_DIR} already exists. Updating."
+        git -C "${REPO_DIR}" pull --ff-only
+    else
+        echo "Cloning ${REPO_URL}"
+        if [ ${#} -gt 0 ]; then
+            git -C "${TARGET_DIR}" clone -b "${BRANCH}" "${REPO_URL}" ${*}
+        else
+            git -C "${TARGET_DIR}" clone -b "${BRANCH}" "${REPO_URL}"
+        fi
+
+        # Any submodules
+        git -C "${REPO_DIR}" submodule update --init
+    fi
+}
+
+warn_for_bashrc() {
+    # Earlier versions of this script set environment variables in .bashrc. The location has moved to .profile or
+    # .zprofile. If the user has a .bashrc defining any pico dev env variables, they could conflict with the settings
+    # in the other files. This function raises a warning for the user.
+
+    REGEX="^\s*export\s+\"?PICO_SDK_PATH="
+    if grep -q "${REGEX}" ~/.bashrc; then
+        echo "Your ~/.bashrc file contains the following line, which may conflict with this script's settings. We recommend removing it to prevent possible issues."
+        echo -n "    "; grep "${REGEX}" ~/.bashrc
+    fi
+}
+
+set_env() {
+    # Permanently sets an environment variable by adding it to the current user's profile script
+    # The form of the arguments should be `FOO foo`, which sets the environment variable `FOO=foo`
+    NAME="${1}"
+    VALUE="${2}"
+    EXPR="${NAME}=${VALUE}"
+
+    # detect appropriate file for setting env vars
+    if echo "${SHELL}" | grep -q zsh; then
+        # zsh detected
+        FILE=~/.zprofile
+    else
+        # sh, bash and others
+        FILE=~/.profile
+    fi
+
+    # ensure that appends go to a new line
+    if [ -f "${FILE}" ]; then
+        if ! ( tail -n 1 "${FILE}" | grep -q "^$" ); then
+            # FILE exists but has no trailing newline. Adding newline.
+            echo >> "${FILE}"
+        fi
+    fi
+
+    # set for now
+    export "${EXPR}"
+
+    # set for later
+    REGEX="^\s*export\s+\"?${NAME}="
+    if grep -q "${REGEX}" "${FILE}"; then
+        # Warn the user
+        echo "Your ${FILE} already contains the following environment variable definition(s):"
+        grep "${REGEX}" "${FILE}"
+        echo "This script would normally set the following line. We're adding it, but commented out, so that you can choose which you want."
+        echo "export \"${EXPR}\""
+        # Write to file
+        echo "# pico_setup.sh commented out the following line because it conflicts with another line in this file. You should choose one or the other." >> "${FILE}"
+        echo "# export \"${EXPR}\"" >> "${FILE}"
+    else
+        echo "Setting env variable ${EXPR} in ${FILE}"
+        echo "export \"${EXPR}\"" >> "${FILE}"
+    fi
+}
+
+validate_pico_sdk() {
+    validate_git_repo pico-sdk
+
+    # test that the SDK env var is set and correct
+    test "${PICO_SDK_PATH}" = "${TARGET_DIR}/pico-sdk" || fail
+}
+
+setup_sdk() {
+    # Download the SDK
+    clone_raspberrypi_repo pico-sdk
+
+    # Set env var PICO_SDK_PATH
+    set_env PICO_SDK_PATH "${TARGET_DIR}/pico-sdk"
+}
+
+validate_uart() {
+    # test that the UART is configured. Only works on Raspberry Pi OS on Raspberry Pi hardware.
+    dpkg-query -s minicom  >& /dev/null || fail
+    grep -q "enable_uart=1" /boot/config.txt || fail
+    # note that the test for console=serial0 tests for the absence of a string
+    grep -q "console=serial0" /boot/cmdline.txt && fail
+}
+
+enable_uart() {
+    # Enable UART
+    echo "Disabling Linux serial console (UART) so we can use it for pico"
+    $(sudo_wrapper) raspi-config nonint do_serial 2
+    echo "You must run sudo reboot to finish UART setup"
+}
+
+phase_1() {
+    # Setup minimum dev environment
+    echo "Entering phase 1: Setup minimum dev environment"
+
+    if mac; then
+        install_dev_env_deps_mac
+        validate_toolchain_mac
+    else
+        install_dev_env_deps_linux
+        validate_toolchain_linux
+    fi
+
+    create_TARGET_DIR
+    setup_sdk
+    validate_pico_sdk
+
+    if raspberry_pi && which raspi-config >> /dev/null; then
+        enable_uart
+        validate_uart
+    else
+        echo "Not configuring UART, because either this is not a Raspberry Pi computer, or raspi-config is not available."
+    fi
+}
+
+build_examples() {
+    # Build a couple of examples
+    echo "Building selected examples"
+    
+    # Save the working directory
+    pushd "${TARGET_DIR}/pico-examples" >> /dev/null
+
+    mkdir -p build
+    cd build
+    cmake ../ -DCMAKE_BUILD_TYPE=Debug
+
+    for EXAMPLE in blink hello_world; do
+        echo "Building $EXAMPLE"
+        cd "$EXAMPLE"
+        make -j${JNUM}
+        cd ..
+    done
+
+    # Restore the working directory
+    popd >> /dev/null
+}
+
+validate_pico_extras() {
+    validate_git_repo pico-extras
+}
+
+validate_pico_examples() {
+    validate_git_repo pico-examples
+
+    # test that blink is built
+    test -f ${TARGET_DIR}/pico-examples/build/blink/blink.uf2 || fail
+
+    # test that hello_serial is built
+    test -f ${TARGET_DIR}/pico-examples/build/hello_world/serial/hello_serial.uf2 || fail
+
+    # test that hello_usb is built
+    test -f ${TARGET_DIR}/pico-examples/build/hello_world/usb/hello_usb.uf2 || fail
+}
+
+validate_pico_playground() {
+    validate_git_repo pico-playground
+}
+
+phase_2() {
+    # Setup tutorial repos
+    echo "Entering phase 2: Setting up tutorial repos"
+
+    for REPO_NAME in pico-examples pico-extras pico-playground; do
+        clone_raspberrypi_repo "${REPO_NAME}"
+    done
+
+    build_examples
+
+    validate_pico_examples
+    validate_pico_extras
+    validate_pico_playground
+}
+
+validate_picotool() {
+    validate_git_repo picotool
+
+    # test that the binary is built
+    test -x ${TARGET_DIR}/picotool/build/picotool || fail
+
+    # test that picotool is installed in the expected location
+    test -x /usr/local/bin/picotool || fail
+}
+
+setup_picotool() {
+    # Downloads, builds, and installs picotool
+    echo "Setting up picotool"
+
+    # Save the working directory
+    pushd "${TARGET_DIR}" >> /dev/null
+
+    clone_raspberrypi_repo picotool
+    cd "${TARGET_DIR}/picotool"
+    mkdir -p build
+    cd build
+    cmake ../
+    make -j${JNUM}
+
+    echo "Installing picotool to /usr/local/bin/picotool"
+    $(sudo_wrapper) cp "${TARGET_DIR}/picotool/build/picotool" /usr/local/bin/
+
+    # Restore the working directory
+    popd >> /dev/null
+}
+
+validate_openocd() {
+    validate_git_repo openocd
+
+    # test that the binary is built
+    test -x ${TARGET_DIR}/openocd/src/openocd || fail
+}
+
+setup_openocd() {
+    # Download, build, and install OpenOCD for picoprobe and bit-banging without picoprobe
+    echo "Setting up OpenOCD"
+
+    # Save the working directory
+    pushd "${TARGET_DIR}" >> /dev/null
+
+    clone_raspberrypi_repo openocd picoprobe --depth=1
+    cd "${TARGET_DIR}/openocd"
+    ./bootstrap
+    OPTS="--enable-ftdi --enable-bcm2835gpio  --enable-picoprobe"
+    if linux; then
+        # sysfsgpio is only available on linux
+        OPTS="${OPTS} --enable-sysfsgpio"
+    fi
+    ./configure ${OPTS}
+    make -j${JNUM}
+    $(sudo_wrapper) make -C "${TARGET_DIR}/openocd" install
+
+    # Restore the working directory
+    popd >> /dev/null
+}
+
+validate_picoprobe() {
+    validate_git_repo picoprobe || fail
+
+    # test that the binary is built
+    test -f ${TARGET_DIR}/picoprobe/build/picoprobe.uf2 || fail
+}
+
+setup_picoprobe() {
+    # Download and build picoprobe. Requires that OpenOCD is already setup
+    echo "Setting up picoprobe"
+
+    # Save the working directory
+    pushd "${TARGET_DIR}" >> /dev/null
+
+    clone_raspberrypi_repo picoprobe
+    cd "${TARGET_DIR}/picoprobe"
+    mkdir -p build
+    cd build
+    cmake ..
+    make -j${JNUM}
+
+    # Restore the working directory
+    popd >> /dev/null
+}
+
+validate_vscode_linux() {
+    dpkg-query -s code  >& /dev/null || fail
+}
+
+install_vscode_linux() {
+    # Install Visual Studio Code
+
+    # VS Code is specially added to Raspberry Pi OS repos, but might not be present on Debian/Ubuntu. So we check first.
+    if ! apt-cache show code >& /dev/null; then
+        echo "It appears that your APT repos do not offer Visual Studio Code. Skipping."
+        return
+    fi
+
+    echo "Installing Visual Studio Code"
+
+    $(sudo_wrapper) apt install -y code
+
+    # Get extensions
+    code --install-extension marus25.cortex-debug
+    code --install-extension ms-vscode.cmake-tools
+    code --install-extension ms-vscode.cpptools
+}
+
+validate_vscode_mac() {
+    echo "Not yet implemented: testing Visual Studio Code on macOS"
+}
+
+install_vscode_mac() {
+    echo "Not yet implemented: installing Visual Studio Code on macOS"
+}
+
+phase_3() {
+    # Setup recommended tools
+    echo "Setting up recommended tools"
+
+    setup_picotool
+    validate_picotool
+
+    setup_openocd
+    validate_openocd
+
+    setup_picoprobe
+    validate_picoprobe
+
+    # Install Visual Studio Code
+    if mac; then
+        install_vscode_mac
+        validate_vscode_mac
+    else
+        if dpkg-query -s xserver-xorg >& /dev/null; then
+            install_vscode_linux
+            validate_vscode_linux
+        else
+            echo "Not installing Visual Studio Code because it looks like XWindows is not installed."
+        fi
+    fi
+}
+
+main() {
+    phase_0
+    phase_1
+    phase_2
+    phase_3
+
+    echo "Congratulations, installation is complete. :D"
+}
+
+main

From 94e8da06f6946e9fab0943bee8fc0b8967ec79b7 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 19 Jun 2023 16:36:33 -0700
Subject: [PATCH 0426/1114] More sophisticated error feedback.

---
 .../org/lflang/validation/LFValidator.java    | 21 ++++++++++++-------
 .../compiler/LinguaFrancaValidationTest.java  |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 40569a62ad..b2f813115c 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -43,6 +43,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.eclipse.emf.common.util.EList;
@@ -707,14 +708,20 @@ public void checkReaction(Reaction reaction) {
     if (reaction.getTriggers() == null || reaction.getTriggers().size() == 0) {
       warning("Reaction has no trigger.", Literals.REACTION__TRIGGERS);
     }
-    if (!reaction.isDelimited()
-        && reaction.getCode() == null
-        && reaction.getDeadline() == null
-        && reaction.getStp() == null
-        && reaction.getSources() != null
-        && !reaction.getSources().isEmpty()) {
-      error("Missing semicolon at the end of reaction declaration.", Literals.REACTION__SOURCES);
+
+    if (reaction.getCode() == null && reaction.getDeadline() == null && reaction.getStp() == null) {
+      var text = NodeModelUtils.findActualNodeFor(reaction).getText();
+      var matcher = Pattern.compile("\\)\\s*[\\n\\r]+(.*[\\n\\r])*.*->").matcher(text);
+      if (matcher.find()) {
+        error(
+            "A connection statement may have been unintentionally parsed as the sources and effects"
+                + " of a reaction declaration. To correct this, add a semicolon at the end of the"
+                + " reaction declaration. To instead silence this warning, remove any newlines"
+                + " between the reaction triggers and sources.",
+            Literals.REACTION__CODE);
+      }
     }
+
     HashSet<VarRef> triggers = new HashSet<>();
     // Make sure input triggers have no container and output sources do.
     for (TriggerRef trigger : reaction.getTriggers()) {
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 6c86efb952..6ff10b299a 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -198,7 +198,7 @@ reaction increment(f1.out)
         parseWithoutError(testCase),
         LfPackage.eINSTANCE.getReaction(),
         null,
-        "Missing semicolon at the end of reaction declaration.");
+        "A connection statement may have been unintentionally parsed");
   }
 
   @Test

From 8b920a8a1f9aafe0f6eb8d0a5ab3a7196bb7b263 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 19 Jun 2023 16:48:58 -0700
Subject: [PATCH 0427/1114] Add validator check to only allow reaction
 declarations for C

---
 core/src/main/java/org/lflang/Target.java     |  9 +++++++
 .../org/lflang/validation/LFValidator.java    | 27 ++++++++++++-------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/lflang/Target.java b/core/src/main/java/org/lflang/Target.java
index 8f08e89fcc..9a578aa994 100644
--- a/core/src/main/java/org/lflang/Target.java
+++ b/core/src/main/java/org/lflang/Target.java
@@ -490,6 +490,15 @@ public boolean supportsParameterizedWidths() {
     return true;
   }
 
+  /**
+   * Return true of reaction declarations (i.e., reactions without inlined code) are supported by
+   * this target.
+   */
+  public boolean supportsReactionDeclarations() {
+    if (this.equals(Target.C)) return true;
+    else return false;
+  }
+
   /**
    * Return true if this code for this target should be built using Docker if Docker is used.
    *
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index b2f813115c..8cde51eb40 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -709,19 +709,28 @@ public void checkReaction(Reaction reaction) {
       warning("Reaction has no trigger.", Literals.REACTION__TRIGGERS);
     }
 
-    if (reaction.getCode() == null && reaction.getDeadline() == null && reaction.getStp() == null) {
-      var text = NodeModelUtils.findActualNodeFor(reaction).getText();
-      var matcher = Pattern.compile("\\)\\s*[\\n\\r]+(.*[\\n\\r])*.*->").matcher(text);
-      if (matcher.find()) {
+    if (reaction.getCode() == null) {
+      if (!this.target.supportsReactionDeclarations()) {
         error(
-            "A connection statement may have been unintentionally parsed as the sources and effects"
-                + " of a reaction declaration. To correct this, add a semicolon at the end of the"
-                + " reaction declaration. To instead silence this warning, remove any newlines"
-                + " between the reaction triggers and sources.",
+            "The "
+                + this.target
+                + " target does not support reaction declarations. Please specify a reaction body.",
             Literals.REACTION__CODE);
+        return;
+      }
+      if (reaction.getDeadline() == null && reaction.getStp() == null) {
+        var text = NodeModelUtils.findActualNodeFor(reaction).getText();
+        var matcher = Pattern.compile("\\)\\s*[\\n\\r]+(.*[\\n\\r])*.*->").matcher(text);
+        if (matcher.find()) {
+          error(
+              "A connection statement may have been unintentionally parsed as the sources and"
+                  + " effects of a reaction declaration. To correct this, add a semicolon at the"
+                  + " end of the reaction declaration. To instead silence this warning, remove any"
+                  + " newlines between the reaction triggers and sources.",
+              Literals.REACTION__CODE);
+        }
       }
     }
-
     HashSet<VarRef> triggers = new HashSet<>();
     // Make sure input triggers have no container and output sources do.
     for (TriggerRef trigger : reaction.getTriggers()) {

From a8761ac9638615a562bba76a29111a5645906436 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 19 Jun 2023 17:33:27 -0700
Subject: [PATCH 0428/1114] Update issue490.stderr.

---
 .../test/resources/org/lflang/cli/issue490.stderr  | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/cli/lfc/src/test/resources/org/lflang/cli/issue490.stderr b/cli/lfc/src/test/resources/org/lflang/cli/issue490.stderr
index fdaa4f8e0e..65a33c2fda 100644
--- a/cli/lfc/src/test/resources/org/lflang/cli/issue490.stderr
+++ b/cli/lfc/src/test/resources/org/lflang/cli/issue490.stderr
@@ -1,13 +1,21 @@
 lfc: error: Name of main reactor must match the file name (or be omitted).
---> %%%PATH.lf%%%:4:14
+--> cli/lfc/src/test/resources/org/lflang/cli/issue490.lf:4:14
   |
 3 | target Python;
 4 | main reactor R(p(3)) {
   |              ^ Name of main reactor must match the file name (or be omitted).
   |
 5 |   state liss(2, 3);
+lfc: error: The Python target does not support reaction declarations. Please specify a reaction body.
+--> cli/lfc/src/test/resources/org/lflang/cli/issue490.lf:6:3
+  |
+5 |   state liss(2, 3);
+6 |   reaction (startup) {
+  |   ^^^^^^^^^^^^^^^^^^^^ The Python target does not support reaction declarations. Please specify a reaction body.
+  |
+7 |     print(self.liss)
 lfc: error: no viable alternative at input '{'
---> %%%PATH.lf%%%:6:22
+--> cli/lfc/src/test/resources/org/lflang/cli/issue490.lf:6:22
   |
 5 |   state liss(2, 3);
 6 |   reaction (startup) {
@@ -15,7 +23,7 @@ lfc: error: no viable alternative at input '{'
   |
 7 |     print(self.liss)
 lfc: error: no viable alternative at input '('
---> %%%PATH.lf%%%:7:5
+--> cli/lfc/src/test/resources/org/lflang/cli/issue490.lf:7:5
   |
 6 |   reaction (startup) {
 7 |     print(self.liss)

From b42e42740812fd246fdf3ab64a216859a303c78e Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 19 Jun 2023 17:45:31 -0700
Subject: [PATCH 0429/1114] Use "message" instead of "warning"

---
 core/src/main/java/org/lflang/validation/LFValidator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 8cde51eb40..eb3faa2e9a 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -725,7 +725,7 @@ public void checkReaction(Reaction reaction) {
           error(
               "A connection statement may have been unintentionally parsed as the sources and"
                   + " effects of a reaction declaration. To correct this, add a semicolon at the"
-                  + " end of the reaction declaration. To instead silence this warning, remove any"
+                  + " end of the reaction declaration. To instead silence this message, remove any"
                   + " newlines between the reaction triggers and sources.",
               Literals.REACTION__CODE);
         }

From ab9bfd13b6132125c1634c791f3d43a880cbc4da Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 19 Jun 2023 19:03:49 -0700
Subject: [PATCH 0430/1114] Try again to pass issue490 test.

---
 cli/lfc/src/test/resources/org/lflang/cli/issue490.stderr | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cli/lfc/src/test/resources/org/lflang/cli/issue490.stderr b/cli/lfc/src/test/resources/org/lflang/cli/issue490.stderr
index 65a33c2fda..da3437a551 100644
--- a/cli/lfc/src/test/resources/org/lflang/cli/issue490.stderr
+++ b/cli/lfc/src/test/resources/org/lflang/cli/issue490.stderr
@@ -1,5 +1,5 @@
 lfc: error: Name of main reactor must match the file name (or be omitted).
---> cli/lfc/src/test/resources/org/lflang/cli/issue490.lf:4:14
+--> %%%PATH.lf%%%:4:14
   |
 3 | target Python;
 4 | main reactor R(p(3)) {
@@ -7,7 +7,7 @@ lfc: error: Name of main reactor must match the file name (or be omitted).
   |
 5 |   state liss(2, 3);
 lfc: error: The Python target does not support reaction declarations. Please specify a reaction body.
---> cli/lfc/src/test/resources/org/lflang/cli/issue490.lf:6:3
+--> %%%PATH.lf%%%:6:3
   |
 5 |   state liss(2, 3);
 6 |   reaction (startup) {
@@ -15,7 +15,7 @@ lfc: error: The Python target does not support reaction declarations. Please spe
   |
 7 |     print(self.liss)
 lfc: error: no viable alternative at input '{'
---> cli/lfc/src/test/resources/org/lflang/cli/issue490.lf:6:22
+--> %%%PATH.lf%%%:6:22
   |
 5 |   state liss(2, 3);
 6 |   reaction (startup) {
@@ -23,7 +23,7 @@ lfc: error: no viable alternative at input '{'
   |
 7 |     print(self.liss)
 lfc: error: no viable alternative at input '('
---> cli/lfc/src/test/resources/org/lflang/cli/issue490.lf:7:5
+--> %%%PATH.lf%%%:7:5
   |
 6 |   reaction (startup) {
 7 |     print(self.liss)

From 9285417d880eb2f337f617262e043d9f15fb7355 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 20 Jun 2023 13:48:46 +0200
Subject: [PATCH 0431/1114] allow platform specific builds

---
 build.gradle                                  |  4 +++-
 ...org.lflang.distribution-conventions.gradle | 19 +++++++++++++++
 ...lflang.java-application-conventions.gradle | 18 ---------------
 .../groovy/org.lflang.java-conventions.gradle | 23 +++++++++++--------
 .../main/groovy/org.lflang.platform.gradle    | 16 +++++++++++++
 cli/lfd/build.gradle                          |  1 -
 6 files changed, 52 insertions(+), 29 deletions(-)
 create mode 100644 buildSrc/src/main/groovy/org.lflang.platform.gradle

diff --git a/build.gradle b/build.gradle
index 9abc03feb0..81b5ae81aa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,7 +38,9 @@ distributions {
         if (project.hasProperty('nightly')) {
           def date = new Date()
           def formattedDate = date.format('yyyyMMddHHmmss')
-          distributionClassifier = 'nightly-' + formattedDate + '-' + System.getProperty('os.name')
+          distributionClassifier = 'nightly-' + formattedDate + '-' + platform.os + '-' + platform.arch
+        } else if (!platform.isNative) {
+            distributionClassifier = platform.os + '-' + platform.arch
         }
         contents {
           from tasks.getByPath('cli:lfc:installDist').outputs
diff --git a/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle b/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle
index 4d25bbb461..5ea34f91fb 100644
--- a/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle
@@ -1,8 +1,27 @@
 plugins {
     id 'distribution'
+    id 'org.lflang.platform'
 }
 
 tasks.withType(Tar) {
     compression = Compression.GZIP
     archiveExtension = 'tar.gz'
+    enabled = !platform.isWindows
+}
+
+tasks.withType(Zip) {
+    enabled = platform.isWindows
+}
+
+tasks.withType(CreateStartScripts) {
+    doLast {
+        if (platform.isWindows) {
+            delete unixScript
+            // Fix long path issue on Windows
+            // See https://github.com/gradle/gradle/issues/1989
+            windowsScript.text = windowsScript.text.replaceAll('set CLASSPATH=.*', 'set CLASSPATH=.;%APP_HOME%/lib/*')
+        } else {
+            delete windowsScript
+        }
+    }
 }
diff --git a/buildSrc/src/main/groovy/org.lflang.java-application-conventions.gradle b/buildSrc/src/main/groovy/org.lflang.java-application-conventions.gradle
index 13a8c5e415..d49afafac0 100644
--- a/buildSrc/src/main/groovy/org.lflang.java-application-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.lflang.java-application-conventions.gradle
@@ -4,21 +4,3 @@ plugins {
     id 'org.lflang.test-conventions'
     id "org.lflang.distribution-conventions"
 }
-
-tasks.withType(Tar) {
-    compression = Compression.GZIP
-    archiveExtension = 'tar.gz'
-}
-
-startScripts {
-    doLast {
-        if (System.getProperty('os.name').toLowerCase().contains('windows')) {
-            delete unixScript
-            // Fix long path issue on Windows
-            // See https://github.com/gradle/gradle/issues/1989
-            windowsScript.text = windowsScript.text.replaceAll('set CLASSPATH=.*', 'set CLASSPATH=.;%APP_HOME%/lib/*')
-        } else {
-            delete windowsScript
-        }
-    }
-}
diff --git a/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle b/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle
index c3d06302b7..5165d03fa6 100644
--- a/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'java'
     id 'com.diffplug.spotless'
+    id 'org.lflang.platform'
 }
 
 repositories {
@@ -23,17 +24,21 @@ configurations.all {
         dependencySubstitution {
             // The maven property ${osgi.platform} is not handled by Gradle
             // so we replace the dependency, using the osgi platform from the project settings
-            //def swtVersion = "3.123.0"
-            def swtVersion = '3.124.0'
-            def os = System.getProperty("os.name").toLowerCase()
-            if (os.contains("windows")) {
-                substitute module('org.eclipse.platform:org.eclipse.swt.${osgi.platform}') using module("org.eclipse.platform:org.eclipse.swt.win32.win32.x86_64:${swtVersion}")
+            def arch = platform.arch
+            if (arch != 'x86_64' && arch != 'aarch64') {
+                throw new GradleException("Your system architecture $arch is not supported")
             }
-            else if (os.contains("linux")) {
-                substitute module('org.eclipse.platform:org.eclipse.swt.${osgi.platform}') using module("org.eclipse.platform:org.eclipse.swt.gtk.linux.x86_64:${swtVersion}")
+
+            if (platform.isWindows) {
+                substitute module('org.eclipse.platform:org.eclipse.swt.${osgi.platform}') using module("org.eclipse.platform:org.eclipse.swt.win32.win32.$arch:$swtVersion")
+            }
+            else if (platform.isLinux) {
+                substitute module('org.eclipse.platform:org.eclipse.swt.${osgi.platform}') using module("org.eclipse.platform:org.eclipse.swt.gtk.linux.$arch:$swtVersion")
             }
-            else if (os.contains("mac")) {
-                substitute module('org.eclipse.platform:org.eclipse.swt.${osgi.platform}') using module("org.eclipse.platform:org.eclipse.swt.cocoa.macosx.x86_64:${swtVersion}")
+            else if (platform.isMacos) {
+                substitute module('org.eclipse.platform:org.eclipse.swt.${osgi.platform}') using module("org.eclipse.platform:org.eclipse.swt.cocoa.macosx.$arch:$swtVersion")
+            } else {
+                throw new GradleException("Your operating system ${platform.os} is not supported")
             }
         }
     }
diff --git a/buildSrc/src/main/groovy/org.lflang.platform.gradle b/buildSrc/src/main/groovy/org.lflang.platform.gradle
new file mode 100644
index 0000000000..dfe2a0ccf3
--- /dev/null
+++ b/buildSrc/src/main/groovy/org.lflang.platform.gradle
@@ -0,0 +1,16 @@
+tasks.register('platform') {
+    def osVar = project.hasProperty('targetOS') ? project.getProperty('targetOS') : System.getProperty('os.name')
+    def archVar = project.hasProperty('targetArch') ? project.getProperty('targetArch') : System.getProperty('os.arch')
+    if (archVar == 'amd64') {
+        archVar = 'x86_64'
+    }
+
+    ext {
+        os = osVar
+        arch = archVar
+        isWindows = osVar.toLowerCase().contains('windows')
+        isLinux = osVar.toLowerCase().contains('linux')
+        isMacos = osVar.toLowerCase().contains('mac')
+        isNative = !project.hasProperty('targetOS') && !project.hasProperty('targetArch')
+    }
+}
diff --git a/cli/lfd/build.gradle b/cli/lfd/build.gradle
index 688fc6092a..50d331a9e0 100644
--- a/cli/lfd/build.gradle
+++ b/cli/lfd/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id 'org.lflang.java-application-conventions'
-    id 'com.github.johnrengelman.shadow'
 }
 
 dependencies {

From 3c251c8778fc857428d53d8c26197db5a3c1b52f Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 20 Jun 2023 13:59:31 +0200
Subject: [PATCH 0432/1114] add missing quote

---
 util/scripts/launch.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/scripts/launch.ps1 b/util/scripts/launch.ps1
index b81b818933..dda258cc44 100644
--- a/util/scripts/launch.ps1
+++ b/util/scripts/launch.ps1
@@ -10,7 +10,7 @@
 $invokerPath = $MyInvocation.PSCommandPath
 $invokerName = [System.IO.Path]::GetFileNameWithoutExtension("$(Split-Path -Path $invokerPath -Leaf -Resolve)")
 
-$mainClassTable = @{"lfc" = "org.lflang.cli.Lfc"; "lff" = "org.lflang.cli.Lff"; "lfd" = "org.lflang.cli.Lfd}
+$mainClassTable = @{"lfc" = "org.lflang.cli.Lfc"; "lff" = "org.lflang.cli.Lff"; "lfd" = "org.lflang.cli.Lfd"}
 $tool = $null
 foreach ($k in $mainClassTable.Keys) {
     if ($invokerName.EndsWith($k)) {

From 0f0c6be6cfb998077ead934d5ceee1eacb4c53b9 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 20 Jun 2023 14:53:36 +0200
Subject: [PATCH 0433/1114] delete redundant test configuration

---
 cli/lfd/build.gradle | 8 --------
 cli/lff/build.gradle | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/cli/lfd/build.gradle b/cli/lfd/build.gradle
index 50d331a9e0..0fac1895dc 100644
--- a/cli/lfd/build.gradle
+++ b/cli/lfd/build.gradle
@@ -22,11 +22,3 @@ application {
     mainClass = 'org.lflang.cli.Lfd'
     tasks.run.workingDir = System.getProperty("user.dir")
 }
-
-test {
-    useJUnitPlatform()
-    testLogging {
-        events "passed", "skipped", "failed"
-        showStandardStreams = true
-    }
-}
diff --git a/cli/lff/build.gradle b/cli/lff/build.gradle
index 9f2269120c..4c36e930da 100644
--- a/cli/lff/build.gradle
+++ b/cli/lff/build.gradle
@@ -19,11 +19,3 @@ application {
     mainClass = 'org.lflang.cli.Lff'
     tasks.run.workingDir = System.getProperty("user.dir")
 }
-
-test {
-    useJUnitPlatform()
-    testLogging {
-        events "passed", "skipped", "failed"
-        showStandardStreams = true
-    }
-}

From dd2b1372851f4501d3ddd7b201777309410ff1cd Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 20 Jun 2023 14:53:58 +0200
Subject: [PATCH 0434/1114] fix zip and tar tasks

---
 .../main/groovy/org.lflang.distribution-conventions.gradle    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle b/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle
index 5ea34f91fb..777e5a56ce 100644
--- a/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle
@@ -3,13 +3,13 @@ plugins {
     id 'org.lflang.platform'
 }
 
-tasks.withType(Tar) {
+tasks.named('distTar') {
     compression = Compression.GZIP
     archiveExtension = 'tar.gz'
     enabled = !platform.isWindows
 }
 
-tasks.withType(Zip) {
+tasks.named('distZip') {
     enabled = platform.isWindows
 }
 

From 4cd7464f79cf40d86bd8dc7bddc57c1567276d3b Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 20 Jun 2023 15:21:23 +0200
Subject: [PATCH 0435/1114] adjust the nightly build

---
 .github/workflows/build.yml                               | 8 +++++++-
 .../groovy/org.lflang.distribution-conventions.gradle     | 8 ++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5095a8bef9..7b0dd9ff6e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,13 @@ jobs:
       - name: Prepare build environment
         uses: ./.github/actions/prepare-build-env
       - name: Build and package lf cli tools (nightly build)
-        run: ./gradlew build -Pnightly
+        # We assume, that the nightly build only runs once on Ubuntu
+        run: |
+          ./gradlew build -Pnightly -PtargetOS=Linux -PtargetPlatform=x86_64
+          ./gradlew assemble -Pnightly -PtargetOS=Linux -PtargetPlatform=aarch64
+          ./gradlew assemble -Pnightly -PtargetOS=MacOS -PtargetPlatform=x86_64
+          ./gradlew assemble -Pnightly -PtargetOS=MacOS -PtargetPlatform=aarch64
+          ./gradlew assemble -Pnightly -PtargetOS=Windows -PtargetPlatform=x86_64
         shell: bash
         if: ${{ inputs.nightly == true }}
       - name: Build and package lf cli tools (regular build)
diff --git a/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle b/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle
index 777e5a56ce..58e1b07f37 100644
--- a/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle
@@ -3,16 +3,20 @@ plugins {
     id 'org.lflang.platform'
 }
 
-tasks.named('distTar') {
+tasks.withType(Tar) {
     compression = Compression.GZIP
     archiveExtension = 'tar.gz'
     enabled = !platform.isWindows
 }
 
-tasks.named('distZip') {
+tasks.withType(Zip) {
     enabled = platform.isWindows
 }
 
+tasks.withType(Jar) {
+    enabled = true
+}
+
 tasks.withType(CreateStartScripts) {
     doLast {
         if (platform.isWindows) {

From 3fef72f9335030fb0588bffd651b7c73c1b97de8 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 20 Jun 2023 15:30:29 +0200
Subject: [PATCH 0436/1114] test lfd script in CI

---
 .github/scripts/test-lfd.sh     | 20 ++++++++++++++++++++
 .github/workflows/cli-tests.yml | 27 +++++++++++++++++++++++++--
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100755 .github/scripts/test-lfd.sh

diff --git a/.github/scripts/test-lfd.sh b/.github/scripts/test-lfd.sh
new file mode 100755
index 0000000000..041daf7029
--- /dev/null
+++ b/.github/scripts/test-lfd.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# Exit 1 if any command returns with a non-zero exit code.
+set -euo pipefail
+
+cd $GITHUB_WORKSPACE
+
+function test_with_links() {
+    rm -rf foo
+    mkdir -p foo/bar/baz
+    ln -s ../bin/${1} foo/link-foo
+    ln -s ../link-foo foo/bar/link-bar
+    ln -s ../link-bar foo/bar/baz/link-${1}
+    foo/bar/baz/link-${1} --help
+}
+
+bin/lfd test/C/src/Minimal.lf
+
+# Ensure that lfd is robust to symbolic links.
+test_with_links "lfd"
diff --git a/.github/workflows/cli-tests.yml b/.github/workflows/cli-tests.yml
index 9e56c40d28..338a0815c4 100644
--- a/.github/workflows/cli-tests.yml
+++ b/.github/workflows/cli-tests.yml
@@ -24,16 +24,39 @@ jobs:
       - name: Test lfc bash scripts (Linux or macOS only)
         run: |
           .github/scripts/test-lfc.sh
+          ./build/install/lf-cli/bin/lfc --version
+          ./build/install/lf-cli/bin/lfc test/C/src/Minimal.lf
         if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }}
       - name: Test lff bash scripts (Linux or macOS only)
         run: |
           .github/scripts/test-lff.sh
+          ./build/install/lf-cli/bin/lff --version
+          ./build/install/lf-cli/bin/lff test/C/src/Minimal.lf
+        if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }}
+      - name: Test lfd bash scripts (Linux or macOS only)
+        run: |
+          .github/scripts/test-lfd.sh
+          ./build/install/lf-cli/bin/lfd --version
+          ./build/install/lf-cli/bin/lfd test/C/src/Minimal.lf
         if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }}
       - name: Test lfc PowerShell script (Windows only)
         run: |
-          bin/lfc.ps1 --help
+          bin/lfc.ps1 --version
+          bin/lfc.ps1 test/C/src/Minimal.lf
+          ./build/install/lf-cli/bin/lfc.bat --version
+          ./build/install/lf-cli/bin/lfc.bat test/C/src/Minimal.lf
         if: ${{ runner.os == 'Windows' }}
       - name: Test lff PowerShell script (Windows only)
         run: |
-          bin/lff.ps1 --help
+          bin/lff.ps1 --version
+          bin/lff.ps1 test/C/src/Minimal.lf
+          ./build/install/lf-cli/bin/lff.bat --version
+          ./build/install/lf-cli/bin/lff.bat test/C/src/Minimal.lf
+        if: ${{ runner.os == 'Windows' }}
+      - name: Test lfd PowerShell script (Windows only)
+        run: |
+          bin/lfd.ps1 --version
+          bin/lfd.ps1 test/C/src/Minimal.lf
+          ./build/install/lf-cli/bin/lfd.bat --version
+          ./build/install/lf-cli/bin/lfd.bat test/C/src/Minimal.lf
         if: ${{ runner.os == 'Windows' }}

From 1937c753850b3a8003ece74af5a1664d0cab44df Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 20 Jun 2023 15:53:39 +0200
Subject: [PATCH 0437/1114] assemble before running cli checks

---
 .github/workflows/cli-tests.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/cli-tests.yml b/.github/workflows/cli-tests.yml
index 338a0815c4..2b718a774d 100644
--- a/.github/workflows/cli-tests.yml
+++ b/.github/workflows/cli-tests.yml
@@ -24,18 +24,21 @@ jobs:
       - name: Test lfc bash scripts (Linux or macOS only)
         run: |
           .github/scripts/test-lfc.sh
+          ./gradlew assemble
           ./build/install/lf-cli/bin/lfc --version
           ./build/install/lf-cli/bin/lfc test/C/src/Minimal.lf
         if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }}
       - name: Test lff bash scripts (Linux or macOS only)
         run: |
           .github/scripts/test-lff.sh
+          ./gradlew assemble
           ./build/install/lf-cli/bin/lff --version
           ./build/install/lf-cli/bin/lff test/C/src/Minimal.lf
         if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }}
       - name: Test lfd bash scripts (Linux or macOS only)
         run: |
           .github/scripts/test-lfd.sh
+          ./gradlew assemble
           ./build/install/lf-cli/bin/lfd --version
           ./build/install/lf-cli/bin/lfd test/C/src/Minimal.lf
         if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }}
@@ -43,6 +46,7 @@ jobs:
         run: |
           bin/lfc.ps1 --version
           bin/lfc.ps1 test/C/src/Minimal.lf
+          ./gradlew assemble
           ./build/install/lf-cli/bin/lfc.bat --version
           ./build/install/lf-cli/bin/lfc.bat test/C/src/Minimal.lf
         if: ${{ runner.os == 'Windows' }}
@@ -50,6 +54,7 @@ jobs:
         run: |
           bin/lff.ps1 --version
           bin/lff.ps1 test/C/src/Minimal.lf
+          ./gradlew assemble
           ./build/install/lf-cli/bin/lff.bat --version
           ./build/install/lf-cli/bin/lff.bat test/C/src/Minimal.lf
         if: ${{ runner.os == 'Windows' }}
@@ -57,6 +62,7 @@ jobs:
         run: |
           bin/lfd.ps1 --version
           bin/lfd.ps1 test/C/src/Minimal.lf
+          ./gradlew assemble
           ./build/install/lf-cli/bin/lfd.bat --version
           ./build/install/lf-cli/bin/lfd.bat test/C/src/Minimal.lf
         if: ${{ runner.os == 'Windows' }}

From e501f39b198f6ee408b75ac901ff1694f76f2571 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 20 Jun 2023 18:05:05 +0200
Subject: [PATCH 0438/1114] add cli unit tests for lfd

---
 cli/lfd/build.gradle                          |   9 +-
 cli/lfd/src/main/java/org/lflang/cli/Lfd.java |   6 +-
 .../{test => cli}/DiagramGenerationTest.java  |   2 +-
 .../test/java/org/lflang/cli/LfdCliTest.java  | 110 ++++++++++++++++++
 cli/lff/build.gradle                          |   7 --
 5 files changed, 121 insertions(+), 13 deletions(-)
 rename cli/lfd/src/test/java/org/lflang/{test => cli}/DiagramGenerationTest.java (99%)
 create mode 100644 cli/lfd/src/test/java/org/lflang/cli/LfdCliTest.java

diff --git a/cli/lfd/build.gradle b/cli/lfd/build.gradle
index 0fac1895dc..9a8c52c46c 100644
--- a/cli/lfd/build.gradle
+++ b/cli/lfd/build.gradle
@@ -4,18 +4,19 @@ plugins {
 
 dependencies {
     implementation project(':cli:base')
-    implementation ("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.standalone:$klighdVersion") {
+    implementation("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.standalone:$klighdVersion") {
         exclude group: 'de.cau.cs.kieler.swt.mock'
     }
-    implementation ("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.piccolo:${klighdVersion}") {
+    implementation("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.piccolo:${klighdVersion}") {
         exclude group: 'de.cau.cs.kieler.swt.mock'
     }
-    implementation ("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.piccolo.freehep:${klighdVersion}") {
+    implementation("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.piccolo.freehep:${klighdVersion}") {
         exclude group: 'de.cau.cs.kieler.swt.mock'
     }
-    implementation ("org.freehep:freehep-graphicsio-svg:${freehepVersion}")
+    implementation("org.freehep:freehep-graphicsio-svg:${freehepVersion}")
 
     testImplementation(testFixtures(project(':core')))
+    testImplementation(testFixtures(project(':cli:base')))
 }
 
 application {
diff --git a/cli/lfd/src/main/java/org/lflang/cli/Lfd.java b/cli/lfd/src/main/java/org/lflang/cli/Lfd.java
index 8ceeea91bd..fa19751eb1 100644
--- a/cli/lfd/src/main/java/org/lflang/cli/Lfd.java
+++ b/cli/lfd/src/main/java/org/lflang/cli/Lfd.java
@@ -42,9 +42,13 @@ public void doRun() {
     for (Path relativePath : getInputPaths()) {
       Path path = toAbsolutePath(relativePath);
       final Resource resource = getResource(path);
+      if (resource == null) {
+        reporter.printFatalErrorAndExit(path.toString() + " is not an LF program.");
+      }
       final Model model = (Model) resource.getContents().get(0);
       String baseName = FileUtil.nameWithoutExtension(relativePath);
-      IStatus status = LightDiagramServices.renderOffScreen(model, "svg", baseName + ".svg");
+      Path outFile = io.getWd().resolve(baseName + ".svg").toAbsolutePath();
+      IStatus status = LightDiagramServices.renderOffScreen(model, "svg", outFile.toString());
       if (!status.isOK()) {
         reporter.printFatalErrorAndExit(status.getMessage());
       }
diff --git a/cli/lfd/src/test/java/org/lflang/test/DiagramGenerationTest.java b/cli/lfd/src/test/java/org/lflang/cli/DiagramGenerationTest.java
similarity index 99%
rename from cli/lfd/src/test/java/org/lflang/test/DiagramGenerationTest.java
rename to cli/lfd/src/test/java/org/lflang/cli/DiagramGenerationTest.java
index a484f752a6..2fcb332fe6 100644
--- a/cli/lfd/src/test/java/org/lflang/test/DiagramGenerationTest.java
+++ b/cli/lfd/src/test/java/org/lflang/cli/DiagramGenerationTest.java
@@ -1,4 +1,4 @@
-package org.lflang.test;
+package org.lflang.cli;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
diff --git a/cli/lfd/src/test/java/org/lflang/cli/LfdCliTest.java b/cli/lfd/src/test/java/org/lflang/cli/LfdCliTest.java
new file mode 100644
index 0000000000..4ab37245e6
--- /dev/null
+++ b/cli/lfd/src/test/java/org/lflang/cli/LfdCliTest.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2022, TU Dresden.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.lflang.cli;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.lflang.cli.TestUtils.TempDirBuilder.dirBuilder;
+
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.lflang.LocalStrings;
+import org.lflang.cli.CliToolTestFixture.ExecutionResult;
+
+/**
+ * @author Clément Fournier
+ */
+public class LfdCliTest {
+
+  private static final String VALID_FILE =
+      """
+        target Python
+        main reactor {
+          reaction(startup) {==}
+        }
+        """;
+  LfdTestFixture lfdTester = new LfdTestFixture();
+
+  @Test
+  public void testHelpArg() {
+    ExecutionResult result = lfdTester.run("--help", "--version");
+    result.checkOk();
+    result.checkNoErrorOutput();
+    result.checkStdOut(containsString("Usage:"));
+    result.checkStdOut(containsString("lfd"));
+  }
+
+  @Test
+  public void testVersion() {
+    ExecutionResult result = lfdTester.run("--version");
+    result.checkOk();
+    result.checkNoErrorOutput();
+    result.checkStdOut(equalTo("lfd " + LocalStrings.VERSION + System.lineSeparator()));
+  }
+
+  @Test
+  public void testWrongCliArg() {
+    ExecutionResult result = lfdTester.run("--notanargument", "File.lf");
+    result.checkStdErr(containsString("Unknown option: '--notanargument'"));
+    result.checkFailed();
+  }
+
+  @Test
+  public void testValidFile(@TempDir Path tempDir) throws IOException {
+    dirBuilder(tempDir).file("src/File.lf", VALID_FILE);
+    ExecutionResult result = lfdTester.run(tempDir, "src/File.lf");
+    result.checkOk();
+    result.checkNoErrorOutput();
+    Files.walkFileTree(
+        tempDir,
+        new SimpleFileVisitor<>() {
+          @Override
+          public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
+            System.out.println(file);
+            return FileVisitResult.CONTINUE;
+          }
+        });
+    assert tempDir.resolve("File.svg").toFile().exists();
+  }
+
+  @Test
+  public void testInValidFile(@TempDir Path tempDir) throws IOException {
+    ExecutionResult result = lfdTester.run(tempDir, ".");
+    result.checkFailed();
+  }
+
+  static class LfdTestFixture extends CliToolTestFixture {
+    @Override
+    protected void runCliProgram(Io io, String[] args) {
+      Lfd.main(io, args);
+    }
+  }
+}
diff --git a/cli/lff/build.gradle b/cli/lff/build.gradle
index 4c36e930da..cbccc2f87f 100644
--- a/cli/lff/build.gradle
+++ b/cli/lff/build.gradle
@@ -6,13 +6,6 @@ dependencies {
     implementation project(':cli:base')
 
     testImplementation(testFixtures(project(':cli:base')))
-    testImplementation "org.junit.jupiter:junit-jupiter-api:$jupiterVersion"
-    testImplementation "org.junit.jupiter:junit-jupiter-engine:$jupiterVersion"
-    testImplementation "org.junit.platform:junit-platform-commons:$jUnitPlatformVersion"
-    testImplementation "org.junit.platform:junit-platform-engine:$jUnitPlatformVersion"
-    testImplementation "org.opentest4j:opentest4j:$openTest4jVersion"
-    testImplementation "org.eclipse.xtext:org.eclipse.xtext.testing:$xtextVersion"
-    testImplementation "org.eclipse.xtext:org.eclipse.xtext.xbase.testing:$xtextVersion"
 }
 
 application {

From b8c2a1855bb45794eb63ca2a0a9e4b0a91e91a97 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 20 Jun 2023 20:21:23 +0200
Subject: [PATCH 0439/1114] avoid mixing the real swt and the mock

---
 core/build.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/build.gradle b/core/build.gradle
index 234fc07aff..0d87a3e729 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -26,10 +26,12 @@ dependencies {
     implementation ("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.lsp:$klighdVersion") {
         exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt.*'
         exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
+        exclude group: 'de.cau.cs.kieler.swt.mock'
     }
     implementation ("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.standalone:$klighdVersion") {
         exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt.*'
         exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
+        exclude group: 'de.cau.cs.kieler.swt.mock'
     }
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:$jupiterVersion"

From daa0718da3a11a0ebaf232a1eb6a673af8db7c83 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 20 Jun 2023 12:03:01 -0700
Subject: [PATCH 0440/1114] Make handling of comments more conservative.

Also, handle ``` ``` preformatted blocks.
---
 .../java/org/lflang/ast/FormattingUtil.java   | 52 ++++++++++++-------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/FormattingUtil.java b/core/src/main/java/org/lflang/ast/FormattingUtil.java
index 7eb7069ef2..0f28a8dca4 100644
--- a/core/src/main/java/org/lflang/ast/FormattingUtil.java
+++ b/core/src/main/java/org/lflang/ast/FormattingUtil.java
@@ -127,27 +127,41 @@ static String lineWrapComments(List<String> comments, int width, String singleLi
   }
   /** Wrap lines. Do not merge lines that start with weird characters. */
   private static String lineWrapComment(String comment, int width, String singleLineCommentPrefix) {
+    if (!MULTILINE_COMMENT.matcher(comment).matches()) return comment;
     width = Math.max(width, MINIMUM_COMMENT_WIDTH_IN_COLUMNS);
-    List<List<String>> paragraphs =
-        Arrays.stream(
-                comment
-                    .strip()
-                    .replaceAll("^/?((\\*|//|#)\\s*)+", "")
-                    .replaceAll("\\s*\\*/$", "")
-                    .replaceAll("(?<=(\\r\\n|\\r|\\n))\\h*(\\*|//|#)\\h*", "")
-                    .split("(\n\\s*){2,}"))
-            .map(s -> Arrays.stream(s.split("(\\r\\n|\\r|\\n)\\h*(?=[@#$%^&*\\-+=:;<>/])")))
-            .map(stream -> stream.map(s -> s.replaceAll("\\s+", " ")))
-            .map(Stream::toList)
-            .toList();
-    if (MULTILINE_COMMENT.matcher(comment).matches()) {
-      if (paragraphs.size() == 1 && paragraphs.get(0).size() == 1) {
-        String singleLineRepresentation = String.format("/** %s */", paragraphs.get(0).get(0));
-        if (singleLineRepresentation.length() <= width) return singleLineRepresentation;
-      }
-      return String.format("/**\n%s\n */", lineWrapComment(paragraphs, width, " * "));
+    var stripped =
+        comment
+            .strip()
+            .replaceAll("^/?((\\*|//|#)\\s*)+", "")
+            .replaceAll("\\s*\\*/$", "")
+            .replaceAll("(?<=(\\r\\n|\\r|\\n))\\h*(\\*|//|#)\\h?(\\h*)", "$3");
+    var preformatted = false;
+    StringBuilder result = new StringBuilder(stripped.length() * 2);
+    for (var part : stripped.split("```")) {
+      result.append(
+          preformatted
+              ? part.lines()
+                  .skip(1)
+                  .map(it -> " * " + it)
+                  .collect(Collectors.joining("\n", "\n * ```\n", "\n * ```\n"))
+              : lineWrapComment(
+                  Arrays.stream(part.split("(\n\\s*){2,}"))
+                      .map(
+                          s ->
+                              Arrays.stream(s.split("(\\r\\n|\\r|\\n)\\h*(?=[@#$%^&*\\-+=:;<>/])")))
+                      .map(stream -> stream.map(s -> s.replaceAll("\\s+", " ")))
+                      .map(Stream::toList)
+                      .toList(),
+                  width,
+                  " * "));
+      preformatted = !preformatted;
+    }
+    if (result.indexOf("\n") == -1) {
+      String singleLineRepresentation =
+          String.format("/** %s */", result.substring(result.indexOf(" * ") + 3));
+      if (singleLineRepresentation.length() <= width) return singleLineRepresentation;
     }
-    return lineWrapComment(paragraphs, width, singleLineCommentPrefix + " ");
+    return String.format("/**\n%s\n */", result);
   }
 
   /**

From 0c8a8497c4288c7ee6456286b0f1dd6d65d0a418 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 20 Jun 2023 13:54:55 -0700
Subject: [PATCH 0441/1114] Convert all tests to use 2 spaces instead of 4.

---
 test/C/src/ActionDelay.lf                     |   6 +-
 test/C/src/ActionIsPresent.lf                 |  20 +--
 test/C/src/After.lf                           |  12 +-
 test/C/src/AfterCycles.lf                     |  20 +--
 test/C/src/AfterOverlapped.lf                 |  16 +--
 test/C/src/AfterZero.lf                       |  16 +--
 test/C/src/Alignment.lf                       |  64 ++++-----
 test/C/src/ArrayAsParameter.lf                |  10 +-
 test/C/src/ArrayAsType.lf                     |  20 +--
 test/C/src/ArrayFree.lf                       |   2 +-
 test/C/src/ArrayFreeMultiple.lf               |   2 +-
 test/C/src/ArrayPrint.lf                      |  18 +--
 test/C/src/ArrayScale.lf                      |   2 +-
 test/C/src/CharLiteralInitializer.lf          |   4 +-
 test/C/src/Composition.lf                     |   6 +-
 test/C/src/CompositionAfter.lf                |   4 +-
 test/C/src/CompositionGain.lf                 |   4 +-
 test/C/src/CompositionInheritance.lf          |   6 +-
 test/C/src/Deadline.lf                        |  18 +--
 test/C/src/DeadlineAnytime.lf                 |   4 +-
 test/C/src/DeadlineHandledAbove.lf            |  10 +-
 test/C/src/DeadlineInherited.lf               |   2 +-
 test/C/src/DeadlinePriority.lf                |   2 +-
 test/C/src/DeadlineWithAfterDelay.lf          |   2 +-
 test/C/src/DeadlineWithBanks.lf               |  36 ++---
 test/C/src/DelayArray.lf                      |  22 +--
 test/C/src/DelayArrayWithAfter.lf             |  28 ++--
 test/C/src/DelayInt.lf                        |  12 +-
 test/C/src/DelayPointer.lf                    |  12 +-
 test/C/src/DelayString.lf                     |   8 +-
 test/C/src/DelayStruct.lf                     |   4 +-
 test/C/src/DelayStructWithAfter.lf            |   4 +-
 test/C/src/DelayStructWithAfterOverlapped.lf  |   8 +-
 test/C/src/DelayedAction.lf                   |   4 +-
 test/C/src/DelayedReaction.lf                 |   4 +-
 test/C/src/Determinism.lf                     |   8 +-
 test/C/src/DoubleInvocation.lf                |   6 +-
 test/C/src/DoublePort.lf                      |   4 +-
 test/C/src/DoubleReaction.lf                  |   8 +-
 test/C/src/DoubleTrigger.lf                   |  10 +-
 test/C/src/FilePkgReader.lf                   |  10 +-
 test/C/src/FileReader.lf                      |   8 +-
 test/C/src/FloatLiteral.lf                    |  10 +-
 test/C/src/Gain.lf                            |   8 +-
 test/C/src/GetMicroStep.lf                    |   4 +-
 test/C/src/Hello.lf                           |  12 +-
 test/C/src/HelloWorld.lf                      |   4 +-
 test/C/src/Hierarchy.lf                       |   4 +-
 test/C/src/Hierarchy2.lf                      |   4 +-
 test/C/src/IdentifierLength.lf                |   4 +-
 test/C/src/ImportComposition.lf               |  12 +-
 test/C/src/InheritanceAction.lf               |   6 +-
 test/C/src/ManualDelayedReaction.lf           |   4 +-
 test/C/src/Methods.lf                         |   4 +-
 test/C/src/MethodsRecursive.lf                |   2 +-
 test/C/src/MethodsSameName.lf                 |   4 +-
 test/C/src/Microsteps.lf                      |  16 +--
 test/C/src/MovingAverage.lf                   |   4 +-
 test/C/src/MultipleContained.lf               |  10 +-
 test/C/src/MultipleOutputs.lf                 |   2 +-
 test/C/src/NativeListsAndTimes.lf             |  16 +--
 test/C/src/NestedTriggeredReactions.lf        |   4 +-
 test/C/src/ParameterHierarchy.lf              |   4 +-
 test/C/src/PeriodicDesugared.lf               |   6 +-
 test/C/src/PhysicalConnection.lf              |   4 +-
 test/C/src/PingPong.lf                        |  12 +-
 test/C/src/Preamble.lf                        |   2 +-
 test/C/src/ReadOutputOfContainedReactor.lf    |  18 +--
 test/C/src/RequestStop.lf                     |   2 +-
 test/C/src/Schedule.lf                        |   4 +-
 test/C/src/ScheduleLogicalAction.lf           |   4 +-
 test/C/src/ScheduleValue.lf                   |   4 +-
 test/C/src/SelfLoop.lf                        |   8 +-
 test/C/src/SendingInside.lf                   |   4 +-
 test/C/src/SendingInside2.lf                  |   4 +-
 test/C/src/SendsPointerTest.lf                |   4 +-
 test/C/src/SetArray.lf                        |  20 +--
 test/C/src/SetToken.lf                        |   4 +-
 test/C/src/SimpleDeadline.lf                  |   2 +-
 test/C/src/SlowingClock.lf                    |  18 +--
 test/C/src/SlowingClockPhysical.lf            |  16 +--
 test/C/src/StartupOutFromInside.lf            |   4 +-
 test/C/src/Starvation.lf                      |  36 ++---
 test/C/src/Stop.lf                            |  44 +++---
 test/C/src/StopZero.lf                        |  82 +++++------
 test/C/src/Stride.lf                          |   2 +-
 test/C/src/StructAsState.lf                   |   8 +-
 test/C/src/StructAsType.lf                    |   4 +-
 test/C/src/StructAsTypeDirect.lf              |   4 +-
 test/C/src/StructParallel.lf                  |   8 +-
 test/C/src/StructPrint.lf                     |   4 +-
 test/C/src/StructScale.lf                     |   8 +-
 test/C/src/SubclassesAndStartup.lf            |  12 +-
 test/C/src/TestForPreviousOutput.lf           |  10 +-
 test/C/src/TimeLimit.lf                       |   8 +-
 test/C/src/Timeout.lf                         |  24 ++--
 test/C/src/TimeoutZero.lf                     |  24 ++--
 test/C/src/ToReactionNested.lf                |  12 +-
 test/C/src/TriggerDownstreamOnlyIfPresent2.lf |   8 +-
 test/C/src/UnconnectedInput.lf                |   4 +-
 test/C/src/Wcet.lf                            |   4 +-
 test/C/src/arduino/Fade.lf                    |   2 +-
 test/C/src/concurrent/AsyncCallback.lf        |  34 ++---
 test/C/src/concurrent/AsyncCallbackDrop.lf    |  36 ++---
 test/C/src/concurrent/AsyncCallbackReplace.lf |  36 ++---
 test/C/src/concurrent/CompositionThreaded.lf  |   4 +-
 .../DeadlineHandledAboveThreaded.lf           |  10 +-
 test/C/src/concurrent/DeadlineThreaded.lf     |  18 +--
 test/C/src/concurrent/DelayIntThreaded.lf     |  12 +-
 test/C/src/concurrent/DeterminismThreaded.lf  |   8 +-
 .../src/concurrent/DoubleReactionThreaded.lf  |   8 +-
 test/C/src/concurrent/GainThreaded.lf         |   8 +-
 test/C/src/concurrent/HelloThreaded.lf        |  12 +-
 test/C/src/concurrent/PingPongThreaded.lf     |  12 +-
 test/C/src/concurrent/ScheduleAt.lf           |  14 +-
 test/C/src/concurrent/ScheduleTwice.lf        |  12 +-
 .../C/src/concurrent/ScheduleTwiceThreaded.lf |  12 +-
 .../C/src/concurrent/SendingInsideThreaded.lf |   4 +-
 test/C/src/concurrent/StarvationThreaded.lf   |  36 ++---
 test/C/src/concurrent/StopThreaded.lf         |  46 +++----
 test/C/src/concurrent/StopZeroThreaded.lf     |  82 +++++------
 test/C/src/concurrent/Threaded.lf             |   8 +-
 test/C/src/concurrent/ThreadedMultiport.lf    |  14 +-
 test/C/src/concurrent/ThreadedThreaded.lf     |   8 +-
 test/C/src/concurrent/TimeLimitThreaded.lf    |   8 +-
 test/C/src/concurrent/TimeoutThreaded.lf      |  24 ++--
 test/C/src/concurrent/TimeoutZeroThreaded.lf  |  24 ++--
 test/C/src/concurrent/Tracing.lf              |  16 +--
 test/C/src/concurrent/Workers.lf              |   4 +-
 test/C/src/concurrent/failing/Watchdog.lf     |  46 +++----
 test/C/src/federated/BroadcastFeedback.lf     |   6 +-
 .../BroadcastFeedbackWithHierarchy.lf         |   6 +-
 test/C/src/federated/CycleDetection.lf        |   6 +-
 test/C/src/federated/DecentralizedP2PComm.lf  |  14 +-
 .../DecentralizedP2PUnbalancedTimeout.lf      |   6 +-
 ...centralizedP2PUnbalancedTimeoutPhysical.lf |   2 +-
 test/C/src/federated/DistributedBank.lf       |   2 +-
 .../federated/DistributedBankToMultiport.lf   |  10 +-
 test/C/src/federated/DistributedCount.lf      |   6 +-
 .../DistributedCountDecentralized.lf          |  24 ++--
 .../DistributedCountDecentralizedLate.lf      |  26 ++--
 ...tributedCountDecentralizedLateHierarchy.lf |  38 +++---
 .../src/federated/DistributedCountPhysical.lf |  14 +-
 .../DistributedCountPhysicalAfterDelay.lf     |  22 +--
 .../DistributedCountPhysicalDecentralized.lf  |  14 +-
 test/C/src/federated/DistributedDoublePort.lf |   2 +-
 .../src/federated/DistributedLoopedAction.lf  |  26 ++--
 .../DistributedLoopedActionDecentralized.lf   |  66 ++++-----
 .../DistributedLoopedPhysicalAction.lf        |  26 ++--
 test/C/src/federated/DistributedMultiport.lf  |  14 +-
 .../federated/DistributedMultiportToBank.lf   |   6 +-
 .../federated/DistributedMultiportToken.lf    |  28 ++--
 .../src/federated/DistributedNetworkOrder.lf  |  30 ++--
 .../DistributedPhysicalActionUpstream.lf      |  14 +-
 .../DistributedPhysicalActionUpstreamLong.lf  |  14 +-
 test/C/src/federated/DistributedStop.lf       | 100 +++++++-------
 test/C/src/federated/DistributedStopZero.lf   |  62 ++++-----
 test/C/src/federated/DistributedToken.lf      |  32 ++---
 .../C/src/federated/FederatedFilePkgReader.lf |  10 +-
 test/C/src/federated/FederatedFileReader.lf   |  10 +-
 test/C/src/federated/FeedbackDelay.lf         |   2 +-
 test/C/src/federated/FeedbackDelaySimple.lf   |  18 +--
 test/C/src/federated/HelloDistributed.lf      |  10 +-
 .../federated/LoopDistributedCentralized.lf   |   2 +-
 .../federated/LoopDistributedCentralized2.lf  |   4 +-
 ...oopDistributedCentralizedPhysicalAction.lf |  14 +-
 .../LoopDistributedCentralizedPrecedence.lf   |   4 +-
 ...stributedCentralizedPrecedenceHierarchy.lf |   4 +-
 .../federated/LoopDistributedDecentralized.lf |  14 +-
 test/C/src/federated/LoopDistributedDouble.lf |  28 ++--
 test/C/src/federated/PhysicalSTP.lf           |  10 +-
 .../federated/PingPongDistributedPhysical.lf  |  14 +-
 test/C/src/federated/STPParameter.lf          |  12 +-
 test/C/src/federated/TopLevelArtifacts.lf     |   2 +-
 test/C/src/federated/failing/ClockSync.lf     |  38 +++---
 .../failing/DistributedDoublePortLooped.lf    |  12 +-
 .../failing/DistributedDoublePortLooped2.lf   |  28 ++--
 .../DistributedNetworkOrderDecentralized.lf   |  54 ++++----
 .../LoopDistributedDecentralizedPrecedence.lf |  48 +++----
 ...ributedDecentralizedPrecedenceHierarchy.lf |  36 ++---
 .../federated/failing/SpuriousDependency.lf   |  60 ++++----
 test/C/src/generics/TypeCheck.lf              |  10 +-
 test/C/src/lib/ImportedAgain.lf               |   4 +-
 test/C/src/lib/LoopedActionSender.lf          |  14 +-
 test/C/src/lib/Test.lf                        |   4 +-
 test/C/src/lib/TestCount.lf                   |  10 +-
 test/C/src/lib/TestCountMultiport.lf          |  24 ++--
 .../modal_models/BanksCount3ModesComplex.lf   |  36 ++---
 .../modal_models/BanksCount3ModesSimple.lf    |  20 +--
 .../src/modal_models/BanksModalStateReset.lf  |  42 +++---
 test/C/src/modal_models/ConvertCaseTest.lf    |  44 +++---
 test/C/src/modal_models/Count3Modes.lf        |  12 +-
 test/C/src/modal_models/MixedReactions.lf     |   8 +-
 test/C/src/modal_models/ModalActions.lf       |  30 ++--
 test/C/src/modal_models/ModalAfter.lf         |  30 ++--
 test/C/src/modal_models/ModalCycleBreaker.lf  |  22 +--
 .../src/modal_models/ModalNestedReactions.lf  |  12 +-
 .../src/modal_models/ModalStartupShutdown.lf  |  22 +--
 test/C/src/modal_models/ModalStateReset.lf    |  38 +++---
 .../C/src/modal_models/ModalStateResetAuto.lf |  38 +++---
 test/C/src/modal_models/ModalTimers.lf        |  22 +--
 .../MultipleOutputFeeder_2Connections.lf      |  34 ++---
 ...ultipleOutputFeeder_ReactionConnections.lf |  34 ++---
 test/C/src/modal_models/util/TraceTesting.lf  |  72 +++++-----
 test/C/src/multiport/BankIndexInitializer.lf  |  14 +-
 .../src/multiport/BankMultiportToReaction.lf  |  18 +--
 .../src/multiport/BankReactionsInContainer.lf |  50 +++----
 test/C/src/multiport/BankSelfBroadcast.lf     |  32 ++---
 test/C/src/multiport/BankToBank.lf            |   8 +-
 test/C/src/multiport/BankToBankMultiport.lf   |  12 +-
 .../src/multiport/BankToBankMultiportAfter.lf |  12 +-
 test/C/src/multiport/BankToMultiport.lf       |  18 +--
 test/C/src/multiport/BankToReaction.lf        |   8 +-
 test/C/src/multiport/Broadcast.lf             |   8 +-
 test/C/src/multiport/BroadcastAfter.lf        |  12 +-
 .../C/src/multiport/BroadcastMultipleAfter.lf |  12 +-
 test/C/src/multiport/DualBanks.lf             |  10 +-
 test/C/src/multiport/DualBanksMultiport.lf    |  22 +--
 test/C/src/multiport/FullyConnected.lf        |  14 +-
 .../multiport/FullyConnectedAddressable.lf    |  18 +--
 test/C/src/multiport/MultiportFromBank.lf     |  14 +-
 .../C/src/multiport/MultiportFromHierarchy.lf |  12 +-
 test/C/src/multiport/MultiportFromReaction.lf |  18 +--
 test/C/src/multiport/MultiportIn.lf           |  10 +-
 .../src/multiport/MultiportInParameterized.lf |  10 +-
 test/C/src/multiport/MultiportMutableInput.lf |  16 +--
 .../multiport/MultiportMutableInputArray.lf   |  36 ++---
 test/C/src/multiport/MultiportOut.lf          |  12 +-
 test/C/src/multiport/MultiportToBank.lf       |  14 +-
 test/C/src/multiport/MultiportToBankAfter.lf  |  14 +-
 test/C/src/multiport/MultiportToBankDouble.lf |  12 +-
 .../src/multiport/MultiportToBankHierarchy.lf |  10 +-
 test/C/src/multiport/MultiportToHierarchy.lf  |  12 +-
 test/C/src/multiport/MultiportToMultiport.lf  |  18 +--
 test/C/src/multiport/MultiportToMultiport2.lf |  18 +--
 .../multiport/MultiportToMultiport2After.lf   |  22 +--
 .../multiport/MultiportToMultiportArray.lf    |  28 ++--
 .../MultiportToMultiportParameter.lf          |  18 +--
 test/C/src/multiport/MultiportToPort.lf       |  12 +-
 test/C/src/multiport/MultiportToReaction.lf   |  12 +-
 test/C/src/multiport/NestedBanks.lf           |  14 +-
 .../C/src/multiport/NestedInterleavedBanks.lf |  12 +-
 test/C/src/multiport/PipelineAfter.lf         |   8 +-
 .../src/multiport/ReactionToContainedBank.lf  |   2 +-
 .../src/multiport/ReactionToContainedBank2.lf |   2 +-
 .../ReactionToContainedBankMultiport.lf       |   8 +-
 test/C/src/multiport/ReactionsToNested.lf     |   4 +-
 test/C/src/multiport/Sparse.lf                |  22 +--
 test/C/src/multiport/SparseFallback.lf        |  22 +--
 .../TriggerDownstreamOnlyIfPresent.lf         |  12 +-
 .../BankMultiportToReactionNoInlining.lf      |   2 +-
 .../MultiportToReactionNoInlining.lf          |   6 +-
 .../serialization/PersonProtocolBuffers.lf    |   6 +-
 .../serialization/ROSBuiltInSerialization.lf  |   6 +-
 .../ROSBuiltInSerializationSharedPtr.lf       |   6 +-
 test/C/src/target/HelloWorldCCPP.lf           |   4 +-
 test/C/src/token/TokenContainedPrint.lf       |   2 +-
 test/C/src/token/TokenContainedPrintBank.lf   |   8 +-
 test/C/src/token/TokenContainedSource.lf      |  20 +--
 test/C/src/token/TokenContainedSourceBank.lf  |  28 ++--
 test/C/src/token/lib/Token.lf                 |  24 ++--
 test/C/src/zephyr/UserThreads.lf              |  14 +-
 test/Cpp/src/ActionDelay.lf                   |   6 +-
 test/Cpp/src/ActionIsPresent.lf               |  20 +--
 test/Cpp/src/ActionValues.lf                  |  34 ++---
 test/Cpp/src/After.lf                         |  12 +-
 test/Cpp/src/AfterOverlapped.lf               |  12 +-
 test/Cpp/src/AfterZero.lf                     |  16 +--
 test/Cpp/src/Alignment.lf                     |  48 +++----
 test/Cpp/src/ArrayAsParameter.lf              |  10 +-
 test/Cpp/src/ArrayAsType.lf                   |  24 ++--
 test/Cpp/src/ArrayPrint.lf                    |  24 ++--
 test/Cpp/src/ArrayScale.lf                    |   2 +-
 test/Cpp/src/CharLiteralInitializer.lf        |   4 +-
 test/Cpp/src/Composition.lf                   |   8 +-
 test/Cpp/src/CompositionAfter.lf              |   8 +-
 test/Cpp/src/CompositionGain.lf               |   4 +-
 test/Cpp/src/CountTest.lf                     |   4 +-
 test/Cpp/src/Deadline.lf                      |  26 ++--
 test/Cpp/src/DeadlineHandledAbove.lf          |  10 +-
 test/Cpp/src/DelayInt.lf                      |  14 +-
 test/Cpp/src/DelayedAction.lf                 |   6 +-
 test/Cpp/src/DelayedReaction.lf               |   4 +-
 test/Cpp/src/Determinism.lf                   |   8 +-
 test/Cpp/src/DoubleInvocation.lf              |   6 +-
 test/Cpp/src/DoublePort.lf                    |  12 +-
 test/Cpp/src/DoubleReaction.lf                |  10 +-
 test/Cpp/src/DoubleTrigger.lf                 |  10 +-
 test/Cpp/src/FloatLiteral.lf                  |   8 +-
 test/Cpp/src/Gain.lf                          |   4 +-
 test/Cpp/src/GetMicroStep.lf                  |  10 +-
 test/Cpp/src/Hello.lf                         |   8 +-
 test/Cpp/src/Hierarchy.lf                     |   4 +-
 test/Cpp/src/Hierarchy2.lf                    |   4 +-
 test/Cpp/src/ImportComposition.lf             |  12 +-
 test/Cpp/src/ManualDelayedReaction.lf         |   4 +-
 test/Cpp/src/Methods.lf                       |   8 +-
 test/Cpp/src/Microsteps.lf                    |  20 +--
 test/Cpp/src/MovingAverage.lf                 |  12 +-
 test/Cpp/src/MultipleContained.lf             |   8 +-
 test/Cpp/src/NativeListsAndTimes.lf           |  16 +--
 test/Cpp/src/NestedTriggeredReactions.lf      |   8 +-
 test/Cpp/src/ParameterHierarchy.lf            |   6 +-
 test/Cpp/src/ParameterizedState.lf            |   2 +-
 test/Cpp/src/ParametersOutOfOrder.lf          |   4 +-
 test/Cpp/src/PeriodicDesugared.lf             |   4 +-
 test/Cpp/src/PhysicalConnection.lf            |   8 +-
 test/Cpp/src/Pipeline.lf                      |   8 +-
 test/Cpp/src/PreambleTest.lf                  |   6 +-
 test/Cpp/src/ReadOutputOfContainedReactor.lf  |  24 ++--
 test/Cpp/src/Schedule.lf                      |   8 +-
 test/Cpp/src/ScheduleLogicalAction.lf         |   4 +-
 test/Cpp/src/SelfLoop.lf                      |   8 +-
 test/Cpp/src/SendingInside.lf                 |   4 +-
 test/Cpp/src/SendingInside2.lf                |   4 +-
 test/Cpp/src/SimpleDeadline.lf                |   4 +-
 test/Cpp/src/SlowingClock.lf                  |  10 +-
 test/Cpp/src/SlowingClockPhysical.lf          |  10 +-
 test/Cpp/src/StartupOutFromInside.lf          |   4 +-
 test/Cpp/src/StructAsState.lf                 |   4 +-
 test/Cpp/src/StructPrint.lf                   |   4 +-
 test/Cpp/src/TestForPreviousOutput.lf         |  12 +-
 test/Cpp/src/TimeLimit.lf                     |   8 +-
 test/Cpp/src/Timeout_Test.lf                  |  12 +-
 test/Cpp/src/TimerIsPresent.lf                |  40 +++---
 test/Cpp/src/ToReactionNested.lf              |  14 +-
 .../src/TriggerDownstreamOnlyIfPresent2.lf    |   8 +-
 test/Cpp/src/concurrent/AsyncCallback.lf      |  34 ++---
 test/Cpp/src/concurrent/AsyncCallback2.lf     |  22 +--
 .../Cpp/src/concurrent/CompositionThreaded.lf |   8 +-
 .../DeadlineHandledAboveThreaded.lf           |  10 +-
 test/Cpp/src/concurrent/DeadlineThreaded.lf   |  26 ++--
 test/Cpp/src/concurrent/DelayIntThreaded.lf   |  14 +-
 .../Cpp/src/concurrent/DeterminismThreaded.lf |   8 +-
 .../src/concurrent/DoubleReactionThreaded.lf  |  10 +-
 test/Cpp/src/concurrent/GainThreaded.lf       |   4 +-
 test/Cpp/src/concurrent/HelloThreaded.lf      |   8 +-
 .../src/concurrent/SendingInsideThreaded.lf   |   4 +-
 test/Cpp/src/concurrent/Threaded.lf           |   4 +-
 test/Cpp/src/concurrent/ThreadedThreaded.lf   |   6 +-
 test/Cpp/src/concurrent/TimeLimitThreaded.lf  |   8 +-
 test/Cpp/src/concurrent/Workers.lf            |   6 +-
 test/Cpp/src/enclave/EnclaveBroadcast.lf      |   8 +-
 test/Cpp/src/enclave/EnclaveCommunication.lf  |   8 +-
 test/Cpp/src/enclave/EnclaveCommunication2.lf |   8 +-
 .../enclave/EnclaveCommunicationDelayed.lf    |   8 +-
 .../enclave/EnclaveCommunicationDelayed2.lf   |   8 +-
 .../EnclaveCommunicationDelayedLocalEvents.lf |   8 +-
 .../EnclaveCommunicationLocalEvents.lf        |   8 +-
 .../EnclaveCommunicationMultiportToBank.lf    |  14 +-
 ...laveCommunicationMultiportToBankDelayed.lf |  14 +-
 ...EnclaveCommunicationMultiportToBankEach.lf |  14 +-
 ...CommunicationMultiportToBankEachDelayed.lf |  14 +-
 ...ommunicationMultiportToBankEachPhysical.lf |  14 +-
 ...aveCommunicationMultiportToBankPhysical.lf |  14 +-
 .../enclave/EnclaveCommunicationPhysical.lf   |   8 +-
 ...EnclaveCommunicationPhysicalLocalEvents.lf |   8 +-
 test/Cpp/src/enclave/EnclaveCycle.lf          |  16 +--
 test/Cpp/src/enclave/EnclaveCycleTwoTimers.lf |  16 +--
 .../Cpp/src/enclave/EnclaveMultiportToPort.lf |  12 +-
 .../src/enclave/EnclaveMultiportToPort2.lf    |  12 +-
 test/Cpp/src/enclave/EnclaveShutdown.lf       |   8 +-
 .../enclave/EnclaveSparseUpstreamEvents.lf    |   8 +-
 .../EnclaveSparseUpstreamEventsDelayed.lf     |   8 +-
 .../EnclaveSparseUpstreamEventsPhysical.lf    |   8 +-
 test/Cpp/src/enclave/EnclaveTimeout.lf        |   8 +-
 .../enclave/EnclaveUpstreamPhysicalAction.lf  |  20 +--
 .../EnclaveUpstreamPhysicalActionDelayed.lf   |  20 +--
 test/Cpp/src/lib/ImportedAgain.lf             |   6 +-
 test/Cpp/src/lib/LoopedActionSender.lf        |   8 +-
 test/Cpp/src/multiport/BankSelfBroadcast.lf   |  28 ++--
 test/Cpp/src/multiport/BankToBank.lf          |   8 +-
 test/Cpp/src/multiport/BankToBankMultiport.lf |  12 +-
 .../src/multiport/BankToBankMultiportAfter.lf |  16 +--
 test/Cpp/src/multiport/BankToMultiport.lf     |  16 +--
 test/Cpp/src/multiport/Broadcast.lf           |   8 +-
 test/Cpp/src/multiport/BroadcastAfter.lf      |  12 +-
 .../src/multiport/BroadcastMultipleAfter.lf   |  12 +-
 test/Cpp/src/multiport/FullyConnected.lf      |  12 +-
 .../multiport/FullyConnectedAddressable.lf    |  14 +-
 .../src/multiport/IndexIntoMultiportInput.lf  |  16 +--
 .../src/multiport/IndexIntoMultiportOutput.lf |  18 +--
 test/Cpp/src/multiport/Multiport.lf           |  28 ++--
 test/Cpp/src/multiport/MultiportFromBank.lf   |  14 +-
 .../multiport/MultiportFromBankHierarchy.lf   |  14 +-
 .../MultiportFromBankHierarchyAfter.lf        |  20 +--
 .../src/multiport/MultiportFromHierarchy.lf   |  12 +-
 test/Cpp/src/multiport/MultiportIn.lf         |  10 +-
 .../Cpp/src/multiport/MultiportMultipleSet.lf |  36 ++---
 test/Cpp/src/multiport/MultiportOut.lf        |  12 +-
 test/Cpp/src/multiport/MultiportToBank.lf     |   6 +-
 .../Cpp/src/multiport/MultiportToBankAfter.lf |  10 +-
 .../src/multiport/MultiportToBankHierarchy.lf |  10 +-
 .../Cpp/src/multiport/MultiportToHierarchy.lf |  12 +-
 .../Cpp/src/multiport/MultiportToMultiport.lf |  18 +--
 .../src/multiport/MultiportToMultiport2.lf    |  18 +--
 .../multiport/MultiportToMultiport2After.lf   |  24 ++--
 .../multiport/MultiportToMultiportArray.lf    |  32 ++---
 .../multiport/MultiportToMultiportPhysical.lf |  14 +-
 test/Cpp/src/multiport/MultiportToPort.lf     |  12 +-
 test/Cpp/src/multiport/PipelineAfter.lf       |   8 +-
 .../ReadMultiportOutputOfContainedBank.lf     |  54 ++++----
 .../multiport/ReadOutputOfContainedBank.lf    |  48 +++----
 test/Cpp/src/multiport/SparseMultiport.lf     |  70 +++++-----
 test/Cpp/src/multiport/WidthGivenByCode.lf    |  20 +--
 .../multiport/WriteInputOfContainedBank.lf    |  10 +-
 .../WriteMultiportInputOfContainedBank.lf     |  22 +--
 test/Cpp/src/properties/Fast.lf               |  10 +-
 test/Cpp/src/properties/Timeout.lf            |  14 +-
 test/Cpp/src/properties/TimeoutZero.lf        |  14 +-
 test/Cpp/src/target/AfterVoid.lf              |   8 +-
 .../src/target/BraceAndParenInitialization.lf |  14 +-
 .../src/target/CliParserGenericArguments.lf   |  22 +--
 test/Cpp/src/target/CombinedTypeNames.lf      |   6 +-
 test/Cpp/src/target/InitializerSyntax.lf      |  60 ++++----
 .../src/target/MultipleContainedGeneric.lf    |   8 +-
 test/Cpp/src/target/PointerParameters.lf      |   4 +-
 test/Cpp/src/target/PreambleFile.lf           |   8 +-
 test/Python/src/ActionDelay.lf                |   6 +-
 test/Python/src/ActionIsPresent.lf            |  22 +--
 test/Python/src/After.lf                      |  12 +-
 test/Python/src/AfterCycles.lf                |  20 +--
 test/Python/src/AfterOverlapped.lf            |  12 +-
 test/Python/src/ArrayAsParameter.lf           |  10 +-
 test/Python/src/ArrayAsType.lf                |   4 +-
 test/Python/src/ArrayFree.lf                  |   2 +-
 test/Python/src/ArrayPrint.lf                 |   4 +-
 test/Python/src/ArrayScale.lf                 |   2 +-
 test/Python/src/CompareTags.lf                |  12 +-
 test/Python/src/Composition.lf                |   6 +-
 test/Python/src/CompositionAfter.lf           |   4 +-
 test/Python/src/CompositionGain.lf            |   4 +-
 test/Python/src/CompositionInheritance.lf     |   6 +-
 test/Python/src/CountSelf.lf                  |   4 +-
 test/Python/src/CountTest.lf                  |   8 +-
 test/Python/src/Deadline.lf                   |  18 +--
 test/Python/src/DeadlineHandledAbove.lf       |  10 +-
 test/Python/src/DelayArray.lf                 |   4 +-
 test/Python/src/DelayArrayWithAfter.lf        |  12 +-
 test/Python/src/DelayInt.lf                   |  14 +-
 test/Python/src/DelayString.lf                |   8 +-
 test/Python/src/DelayStruct.lf                |   4 +-
 test/Python/src/DelayStructWithAfter.lf       |   4 +-
 .../src/DelayStructWithAfterOverlapped.lf     |   8 +-
 test/Python/src/DelayedAction.lf              |   4 +-
 test/Python/src/DelayedReaction.lf            |   4 +-
 test/Python/src/Determinism.lf                |   8 +-
 test/Python/src/DoubleInvocation.lf           |   6 +-
 test/Python/src/DoubleReaction.lf             |   8 +-
 test/Python/src/FloatLiteral.lf               |  10 +-
 test/Python/src/Gain.lf                       |   8 +-
 test/Python/src/GetMicroStep.lf               |   6 +-
 test/Python/src/Hello.lf                      |   8 +-
 test/Python/src/HelloWorld.lf                 |   4 +-
 test/Python/src/Hierarchy.lf                  |   4 +-
 test/Python/src/Hierarchy2.lf                 |   8 +-
 test/Python/src/IdentifierLength.lf           |   4 +-
 test/Python/src/ImportComposition.lf          |  12 +-
 test/Python/src/ManualDelayedReaction.lf      |   4 +-
 test/Python/src/Methods.lf                    |   8 +-
 test/Python/src/MethodsRecursive.lf           |   4 +-
 test/Python/src/MethodsSameName.lf            |   8 +-
 test/Python/src/Microsteps.lf                 |  16 +--
 test/Python/src/MovingAverage.lf              |   2 +-
 test/Python/src/MultipleContained.lf          |  12 +-
 test/Python/src/NativeListsAndTimes.lf        |  20 +--
 test/Python/src/PeriodicDesugared.lf          |   6 +-
 test/Python/src/PingPong.lf                   |  16 +--
 test/Python/src/Pipeline.lf                   |  10 +-
 test/Python/src/Preamble.lf                   |   2 +-
 .../src/ReadOutputOfContainedReactor.lf       |  18 +--
 test/Python/src/Schedule.lf                   |   4 +-
 test/Python/src/ScheduleLogicalAction.lf      |   4 +-
 test/Python/src/ScheduleValue.lf              |   4 +-
 test/Python/src/SelfLoop.lf                   |   8 +-
 test/Python/src/SendingInside.lf              |   4 +-
 test/Python/src/SendingInside2.lf             |   4 +-
 test/Python/src/SetArray.lf                   |   4 +-
 test/Python/src/SimpleDeadline.lf             |   2 +-
 test/Python/src/SlowingClock.lf               |  12 +-
 test/Python/src/SlowingClockPhysical.lf       |  10 +-
 test/Python/src/StartupOutFromInside.lf       |   4 +-
 test/Python/src/Stride.lf                     |   2 +-
 test/Python/src/StructAsState.lf              |  10 +-
 test/Python/src/StructAsType.lf               |   4 +-
 test/Python/src/StructAsTypeDirect.lf         |   4 +-
 test/Python/src/StructParallel.lf             |   4 +-
 test/Python/src/StructPrint.lf                |   4 +-
 test/Python/src/StructScale.lf                |   4 +-
 test/Python/src/SubclassesAndStartup.lf       |  12 +-
 test/Python/src/TestForPreviousOutput.lf      |  10 +-
 test/Python/src/TimeLimit.lf                  |   8 +-
 test/Python/src/Timers.lf                     |   4 +-
 .../src/TriggerDownstreamOnlyIfPresent.lf     |  12 +-
 .../src/TriggerDownstreamOnlyIfPresent2.lf    |  10 +-
 test/Python/src/UnconnectedInput.lf           |   8 +-
 test/Python/src/Wcet.lf                       |   4 +-
 test/Python/src/concurrent/AsyncCallback.lf   |  32 ++---
 .../src/concurrent/AsyncCallbackNoTimer.lf    |  32 ++---
 .../src/docker/FilesPropertyContainerized.lf  |  10 +-
 .../Python/src/federated/BroadcastFeedback.lf |   8 +-
 .../BroadcastFeedbackWithHierarchy.lf         |   8 +-
 test/Python/src/federated/CycleDetection.lf   |   8 +-
 .../src/federated/DecentralizedP2PComm.lf     |   8 +-
 .../DecentralizedP2PUnbalancedTimeout.lf      |   6 +-
 ...centralizedP2PUnbalancedTimeoutPhysical.lf |   4 +-
 test/Python/src/federated/DistributedBank.lf  |   4 +-
 .../federated/DistributedBankToMultiport.lf   |  12 +-
 test/Python/src/federated/DistributedCount.lf |  12 +-
 .../DistributedCountDecentralized.lf          |  14 +-
 .../DistributedCountDecentralizedLate.lf      |  32 ++---
 ...ributedCountDecentralizedLateDownstream.lf |  24 ++--
 ...tributedCountDecentralizedLateHierarchy.lf |  22 +--
 .../src/federated/DistributedCountPhysical.lf |  12 +-
 .../DistributedCountPhysicalAfterDelay.lf     |  12 +-
 .../DistributedCountPhysicalDecentralized.lf  |  12 +-
 .../src/federated/DistributedDoublePort.lf    |   4 +-
 .../src/federated/DistributedLoopedAction.lf  |  26 ++--
 .../DistributedLoopedPhysicalAction.lf        |  30 ++--
 .../src/federated/DistributedMultiport.lf     |  20 +--
 .../federated/DistributedMultiportToBank.lf   |  10 +-
 .../federated/DistributedMultiportToken.lf    |  16 +--
 .../src/federated/DistributedNoReact.lf       |   4 +-
 .../src/federated/DistributedSendClass.lf     |   4 +-
 test/Python/src/federated/DistributedStop.lf  |  98 +++++++-------
 .../src/federated/DistributedStopZero.lf      |  54 ++++----
 test/Python/src/federated/HelloDistributed.lf |   8 +-
 ...stributedCentralizedPrecedenceHierarchy.lf |   8 +-
 test/Python/src/federated/PhysicalSTP.lf      |  16 +--
 .../src/federated/PingPongDistributed.lf      |  10 +-
 .../Python/src/federated/failing/ClockSync.lf |  86 ++++++------
 .../DistributedLoopedActionDecentralized.lf   |  72 +++++-----
 .../failing/DistributedNetworkOrder.lf        |  80 +++++------
 .../failing/LoopDistributedCentralized.lf     |  94 ++++++-------
 .../LoopDistributedCentralizedPrecedence.lf   |  74 +++++-----
 .../failing/LoopDistributedDecentralized.lf   | 110 +++++++--------
 .../failing/LoopDistributedDouble.lf          | 128 +++++++++---------
 .../federated/failing/TopLevelArtifacts.lf    |  70 +++++-----
 test/Python/src/lib/ImportedAgain.lf          |   4 +-
 test/Python/src/lib/LoopedActionSender.lf     |   8 +-
 test/Python/src/lib/Test.lf                   |   4 +-
 test/Python/src/lib/TestCount.lf              |   8 +-
 test/Python/src/lib/TestCountMultiport.lf     |  26 ++--
 .../modal_models/BanksCount3ModesComplex.lf   |  28 ++--
 .../modal_models/BanksCount3ModesSimple.lf    |  20 +--
 .../src/modal_models/BanksModalStateReset.lf  |  42 +++---
 .../src/modal_models/ConvertCaseTest.lf       |  36 ++---
 test/Python/src/modal_models/Count3Modes.lf   |  12 +-
 test/Python/src/modal_models/ModalActions.lf  |  30 ++--
 test/Python/src/modal_models/ModalAfter.lf    |  30 ++--
 .../src/modal_models/ModalCycleBreaker.lf     |  22 +--
 .../src/modal_models/ModalNestedReactions.lf  |  12 +-
 .../src/modal_models/ModalStartupShutdown.lf  |  22 +--
 .../src/modal_models/ModalStateReset.lf       |  38 +++---
 .../src/modal_models/ModalStateResetAuto.lf   |  38 +++---
 test/Python/src/modal_models/ModalTimers.lf   |  22 +--
 .../MultipleOutputFeeder_2Connections.lf      |  36 ++---
 ...ultipleOutputFeeder_ReactionConnections.lf |  36 ++---
 .../src/modal_models/util/TraceTesting.lf     |  62 ++++-----
 .../src/multiport/BankIndexInitializer.lf     |  16 +--
 .../src/multiport/BankReactionsInContainer.lf |  48 +++----
 test/Python/src/multiport/BankToBank.lf       |   8 +-
 .../src/multiport/BankToBankMultiport.lf      |  16 +--
 test/Python/src/multiport/BankToMultiport.lf  |  16 +--
 test/Python/src/multiport/Broadcast.lf        |  12 +-
 .../src/multiport/BroadcastMultipleAfter.lf   |  12 +-
 .../Python/src/multiport/MultiportFromBank.lf |  12 +-
 .../src/multiport/MultiportFromHierarchy.lf   |  16 +--
 .../src/multiport/MultiportFromReaction.lf    |  22 +--
 test/Python/src/multiport/MultiportIn.lf      |  10 +-
 .../src/multiport/MultiportInParameterized.lf |  10 +-
 .../src/multiport/MultiportMutableInput.lf    |  16 +--
 .../multiport/MultiportMutableInputArray.lf   |  14 +-
 test/Python/src/multiport/MultiportOut.lf     |  14 +-
 test/Python/src/multiport/MultiportToBank.lf  |  10 +-
 .../src/multiport/MultiportToBankAfter.lf     |  12 +-
 .../src/multiport/MultiportToBankHierarchy.lf |   8 +-
 .../src/multiport/MultiportToHierarchy.lf     |  16 +--
 .../src/multiport/MultiportToMultiport.lf     |  10 +-
 .../src/multiport/MultiportToMultiport2.lf    |  16 +--
 .../multiport/MultiportToMultiport2After.lf   |  18 +--
 .../multiport/MultiportToMultiportArray.lf    |  16 +--
 test/Python/src/multiport/MultiportToPort.lf  |  12 +-
 .../src/multiport/MultiportToReaction.lf      |  16 +--
 test/Python/src/multiport/NestedBanks.lf      |  18 +--
 .../src/multiport/NestedInterleavedBanks.lf   |  12 +-
 test/Python/src/multiport/PipelineAfter.lf    |   8 +-
 .../Python/src/multiport/ReactionsToNested.lf |   8 +-
 test/Python/src/target/AfterNoTypes.lf        |  12 +-
 test/Rust/src/ActionImplicitDelay.lf          |   4 +-
 test/Rust/src/ActionIsPresent.lf              |  20 +--
 test/Rust/src/ActionIsPresentDouble.lf        |   2 +-
 test/Rust/src/ActionScheduleMicrostep.lf      |   4 +-
 test/Rust/src/ActionValues.lf                 |  10 +-
 test/Rust/src/ActionValuesCleanup.lf          |  26 ++--
 test/Rust/src/CompositionWithPorts.lf         |   6 +-
 test/Rust/src/DependencyThroughChildPort.lf   |  16 +--
 test/Rust/src/DependencyUseAccessible.lf      |  18 +--
 test/Rust/src/DependencyUseOnLogicalAction.lf |  18 +--
 .../src/PhysicalActionKeepaliveIsSmart.lf     |   4 +-
 .../PhysicalActionWakesSleepingScheduler.lf   |   4 +-
 test/Rust/src/PhysicalActionWithKeepalive.lf  |   4 +-
 test/Rust/src/PortRefCleanup.lf               |   8 +-
 test/Rust/src/PortValueCleanup.lf             |   8 +-
 test/Rust/src/Preamble.lf                     |   2 +-
 test/Rust/src/SingleFileGeneration.lf         |   6 +-
 test/Rust/src/Stop.lf                         |  34 ++---
 test/Rust/src/StopAsync.lf                    |   4 +-
 test/Rust/src/StopTimeoutExact.lf             |   2 +-
 test/Rust/src/StructAsState.lf                |   8 +-
 test/Rust/src/StructAsType.lf                 |  12 +-
 test/Rust/src/TimerIsPresent.lf               |  36 ++---
 test/Rust/src/concurrent/AsyncCallback.lf     |  24 ++--
 test/Rust/src/concurrent/Workers.lf           |   4 +-
 test/Rust/src/generics/CtorParamGeneric.lf    |   4 +-
 .../Rust/src/generics/CtorParamGenericInst.lf |   4 +-
 test/Rust/src/generics/GenericComplexType.lf  |   4 +-
 test/Rust/src/lib/SomethingWithAPreamble.lf   |   2 +-
 .../multiport/ConnectionToSelfMultiport.lf    |   2 +-
 .../multiport/FullyConnectedAddressable.lf    |  14 +-
 test/Rust/src/multiport/MultiportFromBank.lf  |   2 +-
 .../src/multiport/MultiportFromHierarchy.lf   |   4 +-
 test/Rust/src/multiport/MultiportOut.lf       |   8 +-
 test/Rust/src/multiport/MultiportToBank.lf    |   2 +-
 .../src/multiport/MultiportToBankHierarchy.lf |   2 +-
 .../src/multiport/MultiportToMultiport.lf     |   4 +-
 .../src/multiport/MultiportToMultiport2.lf    |   8 +-
 .../multiport/ReadOutputOfContainedBank.lf    |  18 +--
 test/Rust/src/multiport/WidthWithParameter.lf |   2 +-
 .../multiport/WriteInputOfContainedBank.lf    |   2 +-
 test/TypeScript/src/ActionDelay.lf            |   4 +-
 test/TypeScript/src/After.lf                  |   2 +-
 test/TypeScript/src/ArrayAsParameter.lf       |   4 +-
 test/TypeScript/src/ArrayAsType.lf            |  18 +--
 test/TypeScript/src/ArrayPrint.lf             |  18 +--
 test/TypeScript/src/ArrayScale.lf             |   2 +-
 test/TypeScript/src/Composition.lf            |   2 +-
 test/TypeScript/src/CompositionAfter.lf       |   2 +-
 test/TypeScript/src/CountTest.lf              |   2 +-
 test/TypeScript/src/Deadline.lf               |  20 +--
 test/TypeScript/src/DeadlineHandledAbove.lf   |   8 +-
 test/TypeScript/src/DelayInt.lf               |   8 +-
 test/TypeScript/src/DelayedAction.lf          |   2 +-
 test/TypeScript/src/DelayedReaction.lf        |   2 +-
 test/TypeScript/src/Determinism.lf            |   6 +-
 test/TypeScript/src/DoubleInvocation.lf       |   4 +-
 test/TypeScript/src/DoubleReaction.lf         |   6 +-
 test/TypeScript/src/DoubleTrigger.lf          |   4 +-
 test/TypeScript/src/FloatLiteral.lf           |   4 +-
 test/TypeScript/src/Gain.lf                   |   6 +-
 test/TypeScript/src/Hello.lf                  |   6 +-
 test/TypeScript/src/Hierarchy.lf              |   2 +-
 test/TypeScript/src/Hierarchy2.lf             |   2 +-
 test/TypeScript/src/Microsteps.lf             |  12 +-
 test/TypeScript/src/MovingAverage.lf          |   6 +-
 test/TypeScript/src/MultipleContained.lf      |   4 +-
 test/TypeScript/src/NativeListsAndTimes.lf    |  12 +-
 test/TypeScript/src/PeriodicDesugared.lf      |   8 +-
 test/TypeScript/src/PhysicalConnection.lf     |   2 +-
 test/TypeScript/src/Preamble.lf               |   2 +-
 .../src/ReadOutputOfContainedReactor.lf       |  12 +-
 test/TypeScript/src/Schedule.lf               |   4 +-
 test/TypeScript/src/ScheduleLogicalAction.lf  |   2 +-
 test/TypeScript/src/SendingInside.lf          |   2 +-
 test/TypeScript/src/SendingInside2.lf         |   2 +-
 test/TypeScript/src/SendsPointerTest.lf       |   2 +-
 test/TypeScript/src/SimpleDeadline.lf         |   2 +-
 test/TypeScript/src/SlowingClock.lf           |   4 +-
 test/TypeScript/src/SlowingClockPhysical.lf   |   4 +-
 test/TypeScript/src/Stop.lf                   |  34 ++---
 test/TypeScript/src/StructAsState.lf          |   6 +-
 test/TypeScript/src/StructAsType.lf           |   6 +-
 test/TypeScript/src/StructAsTypeDirect.lf     |   6 +-
 test/TypeScript/src/StructPrint.lf            |   6 +-
 test/TypeScript/src/TestForPreviousOutput.lf  |   8 +-
 test/TypeScript/src/TimeLimit.lf              |   2 +-
 test/TypeScript/src/Wcet.lf                   |   4 +-
 .../src/concurrent/AsyncCallback.lf           |  24 ++--
 .../src/federated/DistributedCount.lf         |   6 +-
 .../src/federated/DistributedCountPhysical.lf |   6 +-
 .../src/federated/DistributedDoublePort.lf    |   4 +-
 .../src/federated/DistributedLoopedAction.lf  |  16 +--
 .../DistributedLoopedPhysicalAction.lf        |  22 +--
 .../src/federated/DistributedStop.lf          |  70 +++++-----
 .../src/federated/DistributedStopZero.lf      |  36 ++---
 .../src/federated/HelloDistributed.lf         |   8 +-
 .../src/federated/TopLevelArtifacts.lf        |   2 +-
 .../DistributedCountPhysicalAfterDelay.lf     |  32 ++---
 .../failing/LoopDistributedCentralized.lf     |  46 +++----
 .../failing/LoopDistributedDouble.lf          |  54 ++++----
 .../federated/failing/PingPongDistributed.lf  |  38 +++---
 .../failing/PingPongDistributedPhysical.lf    |  34 ++---
 test/TypeScript/src/lib/ImportedAgain.lf      |   2 +-
 test/TypeScript/src/lib/LoopedActionSender.lf |   8 +-
 test/TypeScript/src/lib/TestCount.lf          |   4 +-
 .../src/multiport/BankMultiportToReaction.lf  |  18 +--
 .../src/multiport/BankReactionsInContainer.lf |  48 +++----
 .../src/multiport/BankSelfBroadcast.lf        |  22 +--
 test/TypeScript/src/multiport/BankToBank.lf   |   4 +-
 .../src/multiport/BankToBankMultiport.lf      |  10 +-
 .../src/multiport/BankToBankMultiportAfter.lf |  10 +-
 .../src/multiport/BankToMultiport.lf          |  12 +-
 .../src/multiport/BankToReaction.lf           |   8 +-
 test/TypeScript/src/multiport/Broadcast.lf    |   2 +-
 .../src/multiport/BroadcastAfter.lf           |   6 +-
 .../src/multiport/BroadcastMultipleAfter.lf   |   6 +-
 .../src/multiport/FullyConnected.lf           |  16 +--
 .../src/multiport/MultiportFromBank.lf        |  10 +-
 .../src/multiport/MultiportFromHierarchy.lf   |  10 +-
 .../src/multiport/MultiportFromReaction.lf    |  16 +--
 test/TypeScript/src/multiport/MultiportIn.lf  |  16 +--
 .../src/multiport/MultiportInParameterized.lf |  12 +-
 .../src/multiport/MultiportMutableInput.lf    |  16 +--
 .../multiport/MultiportMutableInputArray.lf   |  46 +++----
 test/TypeScript/src/multiport/MultiportOut.lf |  10 +-
 .../src/multiport/MultiportToBank.lf          |   4 +-
 .../src/multiport/MultiportToBankAfter.lf     |   8 +-
 .../src/multiport/MultiportToBankDouble.lf    |   8 +-
 .../src/multiport/MultiportToBankHierarchy.lf |   6 +-
 .../src/multiport/MultiportToHierarchy.lf     |  10 +-
 .../src/multiport/MultiportToMultiport.lf     |  14 +-
 .../src/multiport/MultiportToMultiport2.lf    |  14 +-
 .../multiport/MultiportToMultiport2After.lf   |  20 +--
 .../multiport/MultiportToMultiportArray.lf    |  30 ++--
 .../MultiportToMultiportParameter.lf          |   8 +-
 .../src/multiport/MultiportToPort.lf          |   8 +-
 .../src/multiport/MultiportToReaction.lf      |  10 +-
 test/TypeScript/src/multiport/NestedBanks.lf  |  14 +-
 .../TypeScript/src/multiport/PipelineAfter.lf |   4 +-
 .../src/multiport/ReactionToContainedBank.lf  |   2 +-
 .../src/multiport/ReactionsToNested.lf        |   4 +-
 .../src/serialization/ProtoNoPacking.lf       |   2 +-
 732 files changed, 5247 insertions(+), 5243 deletions(-)

diff --git a/test/C/src/ActionDelay.lf b/test/C/src/ActionDelay.lf
index 4951f806c2..90847eb9d5 100644
--- a/test/C/src/ActionDelay.lf
+++ b/test/C/src/ActionDelay.lf
@@ -30,10 +30,10 @@ reactor Sink {
     interval_t physical = lf_time_physical();
     printf("Logical, physical, and elapsed logical: %lld %lld %lld.\n", logical, physical, elapsed_logical);
     if (elapsed_logical != MSEC(100)) {
-        printf("FAILURE: Expected %lld but got %lld.\n", MSEC(100), elapsed_logical);
-        exit(1);
+      printf("FAILURE: Expected %lld but got %lld.\n", MSEC(100), elapsed_logical);
+      exit(1);
     } else {
-        printf("SUCCESS. Elapsed logical time is 100 msec.\n");
+      printf("SUCCESS. Elapsed logical time is 100 msec.\n");
     }
   =}
 }
diff --git a/test/C/src/ActionIsPresent.lf b/test/C/src/ActionIsPresent.lf
index 2c0bff1293..573025a323 100644
--- a/test/C/src/ActionIsPresent.lf
+++ b/test/C/src/ActionIsPresent.lf
@@ -7,22 +7,22 @@ main reactor ActionIsPresent(offset: time = 1 nsec, period: time = 500 msec) {
 
   reaction(startup, a) -> a {=
     if (!a->is_present) {
-        if (self->offset == 0) {
-            printf("Hello World!\n");
-            self->success = true;
-        } else {
-            lf_schedule(a, self->offset);
-        }
-    } else {
-        printf("Hello World 2!\n");
+      if (self->offset == 0) {
+        printf("Hello World!\n");
         self->success = true;
+      } else {
+        lf_schedule(a, self->offset);
+      }
+    } else {
+      printf("Hello World 2!\n");
+      self->success = true;
     }
   =}
 
   reaction(shutdown) {=
     if (!self->success) {
-        fprintf(stderr, "Failed to print 'Hello World'\n");
-        exit(1);
+      fprintf(stderr, "Failed to print 'Hello World'\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/After.lf b/test/C/src/After.lf
index e7aeba5b8d..f21c6b7f76 100644
--- a/test/C/src/After.lf
+++ b/test/C/src/After.lf
@@ -21,22 +21,22 @@ reactor print {
     interval_t elapsed_time = lf_time_logical_elapsed();
     printf("Result is %d\n", x->value);
     if (x->value != 84) {
-        printf("ERROR: Expected result to be 84.\n");
-        exit(1);
+      printf("ERROR: Expected result to be 84.\n");
+      exit(1);
     }
     printf("Current logical time is: %lld\n", elapsed_time);
     printf("Current physical time is: %lld\n", lf_time_physical_elapsed());
     if (elapsed_time != self->expected_time) {
-        printf("ERROR: Expected logical time to be %lld.\n", self->expected_time);
-        exit(2);
+      printf("ERROR: Expected logical time to be %lld.\n", self->expected_time);
+      exit(2);
     }
     self->expected_time += SEC(1);
   =}
 
   reaction(shutdown) {=
     if (self->received == 0) {
-        printf("ERROR: Final reactor received no data.\n");
-        exit(3);
+      printf("ERROR: Final reactor received no data.\n");
+      exit(3);
     }
   =}
 }
diff --git a/test/C/src/AfterCycles.lf b/test/C/src/AfterCycles.lf
index 3a7301a7a2..cc2eab638e 100644
--- a/test/C/src/AfterCycles.lf
+++ b/test/C/src/AfterCycles.lf
@@ -29,12 +29,12 @@ main reactor AfterCycles {
     interval_t elapsed_time = lf_time_logical_elapsed();
     printf("Received %d from worker 0 at time %lld.\n", w0.out->value, elapsed_time);
     if (elapsed_time != MSEC(10)) {
-        fprintf(stderr, "Time should have been 10000000.\n");
-        exit(1);
+      fprintf(stderr, "Time should have been 10000000.\n");
+      exit(1);
     }
     if (w0.out->value != 1) {
-        fprintf(stderr, "Value should have been 1.\n");
-        exit(4);
+      fprintf(stderr, "Value should have been 1.\n");
+      exit(4);
     }
   =}
 
@@ -43,19 +43,19 @@ main reactor AfterCycles {
     interval_t elapsed_time = lf_time_logical_elapsed();
     printf("Received %d from worker 1 at time %lld.\n", w1.out->value, elapsed_time);
     if (elapsed_time != MSEC(20)) {
-        fprintf(stderr, "Time should have been 20000000.\n");
-        exit(3);
+      fprintf(stderr, "Time should have been 20000000.\n");
+      exit(3);
     }
     if (w1.out->value != 1) {
-        fprintf(stderr, "Value should have been 1.\n");
-        exit(4);
+      fprintf(stderr, "Value should have been 1.\n");
+      exit(4);
     }
   =}
 
   reaction(shutdown) {=
     if (self->count != 2) {
-        fprintf(stderr, "Top-level reactions should have been triggered but were not.\n");
-        exit(5);
+      fprintf(stderr, "Top-level reactions should have been triggered but were not.\n");
+      exit(5);
     }
   =}
 }
diff --git a/test/C/src/AfterOverlapped.lf b/test/C/src/AfterOverlapped.lf
index b1124c4274..51e161f98a 100644
--- a/test/C/src/AfterOverlapped.lf
+++ b/test/C/src/AfterOverlapped.lf
@@ -16,25 +16,25 @@ reactor Test {
     printf("Received %d.\n", c->value);
     (self->i)++;
     if (c->value != self->i) {
-        printf("ERROR: Expected %d but got %d\n.", self->i, c->value);
-        exit(1);
+      printf("ERROR: Expected %d but got %d\n.", self->i, c->value);
+      exit(1);
     }
     interval_t elapsed_time = lf_time_logical_elapsed();
     printf("Current logical time is: %lld\n", elapsed_time);
 
     interval_t expected_logical_time = SEC(2) + SEC(1)*(c->value - 1);
     if (elapsed_time != expected_logical_time) {
-        printf("ERROR: Expected logical time to be %lld but got %lld\n.",
-            expected_logical_time, elapsed_time
-        );
-        exit(1);
+      printf("ERROR: Expected logical time to be %lld but got %lld\n.",
+        expected_logical_time, elapsed_time
+      );
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (self->received == 0) {
-        printf("ERROR: Final reactor received no data.\n");
-        exit(3);
+      printf("ERROR: Final reactor received no data.\n");
+      exit(3);
     }
   =}
 }
diff --git a/test/C/src/AfterZero.lf b/test/C/src/AfterZero.lf
index 547222246c..10fc9d7a8b 100644
--- a/test/C/src/AfterZero.lf
+++ b/test/C/src/AfterZero.lf
@@ -21,27 +21,27 @@ reactor print {
     interval_t elapsed_time = lf_time_logical_elapsed();
     printf("Result is %d\n", x->value);
     if (x->value != 84) {
-        printf("ERROR: Expected result to be 84.\n");
-        exit(1);
+      printf("ERROR: Expected result to be 84.\n");
+      exit(1);
     }
     printf("Current logical time is: %lld\n", elapsed_time);
     printf("Current microstep is: %lld\n", lf_tag().microstep);
     printf("Current physical time is: %lld\n", lf_time_physical_elapsed());
     if (elapsed_time != self->expected_time) {
-        printf("ERROR: Expected logical time to be %lld.\n", self->expected_time);
-        exit(2);
+      printf("ERROR: Expected logical time to be %lld.\n", self->expected_time);
+      exit(2);
     }
     if (lf_tag().microstep != 1) {
-        printf("ERROR: Expected microstep to be 1\n");
-        exit(3);
+      printf("ERROR: Expected microstep to be 1\n");
+      exit(3);
     }
     self->expected_time += SEC(1);
   =}
 
   reaction(shutdown) {=
     if (self->received == 0) {
-        printf("ERROR: Final reactor received no data.\n");
-        exit(3);
+      printf("ERROR: Final reactor received no data.\n");
+      exit(3);
     }
   =}
 }
diff --git a/test/C/src/Alignment.lf b/test/C/src/Alignment.lf
index 1c5c907a37..c1cba1b948 100644
--- a/test/C/src/Alignment.lf
+++ b/test/C/src/Alignment.lf
@@ -28,44 +28,44 @@ reactor Sieve {
   reaction(in) -> out {=
     // Reject inputs that are out of bounds.
     if (in->value <= 0 || in->value > 10000) {
-        lf_print_warning("Sieve: Input value out of range: %d.", in->value);
+      lf_print_warning("Sieve: Input value out of range: %d.", in->value);
     }
     // Primes 1 and 2 are not on the list.
     if (in->value == 1 || in->value == 2) {
-        lf_set(out, true);
-        return;
+      lf_set(out, true);
+      return;
     }
     // If the input is greater than the last found prime, then
     // we have to expand the list of primes before checking to
     // see whether this is prime.
     int candidate = self->primes[self->last_prime];
     while (in->value > self->primes[self->last_prime]) {
-        // The next prime is always odd, so we can increment by two.
-        candidate += 2;
-        bool prime = true;
-        for (int i = 0; i < self->last_prime; i++) {
-            if (candidate % self->primes[i] == 0) {
-                // Candidate is not prime. Break and add 2
-                prime = false;
-                break;
-            }
-        }
-        // If the candidate is not divisible by any prime in the list, it is prime.
-        if (prime) {
-            self->last_prime++;
-            self->primes[self->last_prime] = candidate;
-            lf_print("Sieve: Found prime: %d.", candidate);
+      // The next prime is always odd, so we can increment by two.
+      candidate += 2;
+      bool prime = true;
+      for (int i = 0; i < self->last_prime; i++) {
+        if (candidate % self->primes[i] == 0) {
+          // Candidate is not prime. Break and add 2
+          prime = false;
+          break;
         }
+      }
+      // If the candidate is not divisible by any prime in the list, it is prime.
+      if (prime) {
+        self->last_prime++;
+        self->primes[self->last_prime] = candidate;
+        lf_print("Sieve: Found prime: %d.", candidate);
+      }
     }
     // We are now assured that the input is less than or
     // equal to the last prime on the list.
     // See whether the input is an already found prime.
     for (int i = self->last_prime; i >= 0; i--) {
-        // Search the primes from the end, where they are sparser.
-        if (self->primes[i] == in->value) {
-            lf_set(out, true);
-            return;
-        }
+      // Search the primes from the end, where they are sparser.
+      if (self->primes[i] == in->value) {
+        lf_set(out, true);
+        return;
+      }
     }
   =}
 }
@@ -78,17 +78,17 @@ reactor Destination {
   reaction(ok, in) {=
     tag_t current_tag = lf_tag();
     if (ok->is_present && in->is_present) {
-        lf_print("Destination: Input %d is prime at tag (%lld, %d).",
-            in->value,
-            current_tag.time - lf_time_start(), current_tag.microstep
-        );
+      lf_print("Destination: Input %d is prime at tag (%lld, %d).",
+        in->value,
+        current_tag.time - lf_time_start(), current_tag.microstep
+      );
     }
     if (lf_tag_compare(current_tag, self->last_invoked) <= 0) {
-        lf_print_error_and_exit("Invoked at tag (%lld, %d), "
-            "but previously invoked at tag (%lld, %d).",
-            current_tag.time - lf_time_start(), current_tag.microstep,
-            self->last_invoked.time - lf_time_start(), self->last_invoked.microstep
-        );
+      lf_print_error_and_exit("Invoked at tag (%lld, %d), "
+        "but previously invoked at tag (%lld, %d).",
+        current_tag.time - lf_time_start(), current_tag.microstep,
+        self->last_invoked.time - lf_time_start(), self->last_invoked.microstep
+      );
     }
     self->last_invoked = current_tag;
   =}
diff --git a/test/C/src/ArrayAsParameter.lf b/test/C/src/ArrayAsParameter.lf
index e50f9d636c..fe0133692d 100644
--- a/test/C/src/ArrayAsParameter.lf
+++ b/test/C/src/ArrayAsParameter.lf
@@ -11,7 +11,7 @@ reactor Source(sequence: int[] = {0, 1, 2}, n_sequence: int = 3) {
     lf_set(out, self->sequence[self->count]);
     self->count++;
     if (self->count < self->n_sequence) {
-        lf_schedule(next, 0);
+      lf_schedule(next, 0);
     }
   =}
 }
@@ -25,16 +25,16 @@ reactor Print {
     self->received++;
     printf("Received: %d\n", in->value);
     if (in->value != self->count) {
-        printf("ERROR: Expected %d.\n", self->count);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->count);
+      exit(1);
     }
     self->count++;
   =}
 
   reaction(shutdown) {=
     if (self->received == 0) {
-        printf("ERROR: Final reactor received no data.\n");
-        exit(3);
+      printf("ERROR: Final reactor received no data.\n");
+      exit(3);
     }
   =}
 }
diff --git a/test/C/src/ArrayAsType.lf b/test/C/src/ArrayAsType.lf
index 8339c6f9c2..d604dd5e51 100644
--- a/test/C/src/ArrayAsType.lf
+++ b/test/C/src/ArrayAsType.lf
@@ -18,22 +18,22 @@ reactor Print(scale: int = 1) {
   input in: int[3]
 
   reaction(in) {=
-    int count = 0;       // For testing.
+    int count = 0;     // For testing.
     bool failed = false; // For testing.
     printf("Received: [");
     for (int i = 0; i < 3; i++) {
-        if (i > 0) printf(", ");
-        printf("%d", in->value[i]);
-        // For testing, check whether values match expectation.
-        if (in->value[i] != self->scale * count) {
-            failed = true;
-        }
-        count++;         // For testing.
+      if (i > 0) printf(", ");
+      printf("%d", in->value[i]);
+      // For testing, check whether values match expectation.
+      if (in->value[i] != self->scale * count) {
+        failed = true;
+      }
+      count++;     // For testing.
     }
     printf("]\n");
     if (failed) {
-        printf("ERROR: Value received by Print does not match expectation!\n");
-        exit(1);
+      printf("ERROR: Value received by Print does not match expectation!\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/ArrayFree.lf b/test/C/src/ArrayFree.lf
index 0286836674..bfdc04d41a 100644
--- a/test/C/src/ArrayFree.lf
+++ b/test/C/src/ArrayFree.lf
@@ -15,7 +15,7 @@ reactor Free(scale: int = 2, size: int = 3) {
 
   reaction(in) {=
     for(int i = 0; i < self->size; i++) {
-        in->value[i] *= self->scale;
+      in->value[i] *= self->scale;
     }
   =}
 }
diff --git a/test/C/src/ArrayFreeMultiple.lf b/test/C/src/ArrayFreeMultiple.lf
index f10fa54867..f43c7cd924 100644
--- a/test/C/src/ArrayFreeMultiple.lf
+++ b/test/C/src/ArrayFreeMultiple.lf
@@ -31,7 +31,7 @@ reactor Free(scale: int = 2) {
 
   reaction(in) {=
     for(int i = 0; i < in->length; i++) {
-        in->value[i] *= self->scale;
+      in->value[i] *= self->scale;
     }
   =}
 }
diff --git a/test/C/src/ArrayPrint.lf b/test/C/src/ArrayPrint.lf
index 49aaca5c12..d1eb3b31ab 100644
--- a/test/C/src/ArrayPrint.lf
+++ b/test/C/src/ArrayPrint.lf
@@ -33,18 +33,18 @@ reactor Print(scale: int = 1, size: int = 3) {
     bool failed = false; // For testing.
     printf("Received: [");
     for (int i = 0; i < self->size; i++) {
-        if (i > 0) printf(", ");
-        printf("%d", in->value[i]);
-        // For testing, check whether values match expectation.
-        if (in->value[i] != self->scale * self->count) {
-            failed = true;
-        }
-        self->count++;         // For testing.
+      if (i > 0) printf(", ");
+      printf("%d", in->value[i]);
+      // For testing, check whether values match expectation.
+      if (in->value[i] != self->scale * self->count) {
+        failed = true;
+      }
+      self->count++;     // For testing.
     }
     printf("]\n");
     if (failed) {
-        printf("ERROR: Value received by Print does not match expectation!\n");
-        exit(1);
+      printf("ERROR: Value received by Print does not match expectation!\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/ArrayScale.lf b/test/C/src/ArrayScale.lf
index 5c907a1c58..7ec283fd81 100644
--- a/test/C/src/ArrayScale.lf
+++ b/test/C/src/ArrayScale.lf
@@ -14,7 +14,7 @@ reactor Scale(scale: int = 2) {
 
   reaction(in) -> out {=
     for(int i = 0; i < in->length; i++) {
-        in->value[i] *= self->scale;
+      in->value[i] *= self->scale;
     }
     lf_set_token(out, in->token);
   =}
diff --git a/test/C/src/CharLiteralInitializer.lf b/test/C/src/CharLiteralInitializer.lf
index ab0c12b1d8..b240640182 100644
--- a/test/C/src/CharLiteralInitializer.lf
+++ b/test/C/src/CharLiteralInitializer.lf
@@ -6,8 +6,8 @@ main reactor CharLiteralInitializer {
 
   reaction(startup) {=
     if (self->c != 'x') {
-        fprintf(stderr, "FAILED: Expected 'x', got %c.\n", self->c);
-        exit(1);
+      fprintf(stderr, "FAILED: Expected 'x', got %c.\n", self->c);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/Composition.lf b/test/C/src/Composition.lf
index 823bd1a2fe..906fa5f2f7 100644
--- a/test/C/src/Composition.lf
+++ b/test/C/src/Composition.lf
@@ -24,14 +24,14 @@ reactor Test {
     (self->count)++;
     printf("Received %d\n", x->value);
     if (x->value != self->count) {
-        fprintf(stderr, "FAILURE: Expected %d\n", self->count);
-        exit(1);
+      fprintf(stderr, "FAILURE: Expected %d\n", self->count);
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (self->count == 0) {
-        fprintf(stderr, "FAILURE: No data received.\n");
+      fprintf(stderr, "FAILURE: No data received.\n");
     }
   =}
 }
diff --git a/test/C/src/CompositionAfter.lf b/test/C/src/CompositionAfter.lf
index c0ce81f46b..8afd36a1df 100644
--- a/test/C/src/CompositionAfter.lf
+++ b/test/C/src/CompositionAfter.lf
@@ -23,8 +23,8 @@ reactor Test {
     (self->count)++;
     printf("Received %d\n", x->value);
     if (x->value != self->count) {
-        printf("FAILURE: Expected %d\n", self->count);
-        exit(1);
+      printf("FAILURE: Expected %d\n", self->count);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/CompositionGain.lf b/test/C/src/CompositionGain.lf
index 0b0ead780f..a34c95c10c 100644
--- a/test/C/src/CompositionGain.lf
+++ b/test/C/src/CompositionGain.lf
@@ -27,8 +27,8 @@ main reactor CompositionGain {
   reaction(wrapper.y) {=
     printf("Received %d\n", wrapper.y->value);
     if (wrapper.y->value != 42 * 2) {
-        fprintf(stderr, "ERROR: Received value should have been %d.\n", 42 * 2);
-        exit(2);
+      fprintf(stderr, "ERROR: Received value should have been %d.\n", 42 * 2);
+      exit(2);
     }
   =}
 }
diff --git a/test/C/src/CompositionInheritance.lf b/test/C/src/CompositionInheritance.lf
index cd345149d5..8e31e5e677 100644
--- a/test/C/src/CompositionInheritance.lf
+++ b/test/C/src/CompositionInheritance.lf
@@ -35,14 +35,14 @@ reactor Test {
     (self->count)++;
     printf("Received %d\n", x->value);
     if (x->value != self->count) {
-        fprintf(stderr, "FAILURE: Expected %d\n", self->count);
-        exit(1);
+      fprintf(stderr, "FAILURE: Expected %d\n", self->count);
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (self->count == 0) {
-        fprintf(stderr, "FAILURE: No data received.\n");
+      fprintf(stderr, "FAILURE: No data received.\n");
     }
   =}
 }
diff --git a/test/C/src/Deadline.lf b/test/C/src/Deadline.lf
index 76d5bf564e..913165b8b2 100644
--- a/test/C/src/Deadline.lf
+++ b/test/C/src/Deadline.lf
@@ -21,9 +21,9 @@ reactor Source(period: time = 3 sec) {
 
   reaction(t) -> y {=
     if (2 * (self->count / 2) != self->count) {
-        // The count variable is odd.
-        // Take time to cause a deadline violation.
-        lf_sleep(MSEC(1500));
+      // The count variable is odd.
+      // Take time to cause a deadline violation.
+      lf_sleep(MSEC(1500));
     }
     printf("Source sends: %d.\n", self->count);
     lf_set(y, self->count);
@@ -38,17 +38,17 @@ reactor Destination(timeout: time = 1 sec) {
   reaction(x) {=
     printf("Destination receives: %d\n", x->value);
     if (2 * (self->count / 2) != self->count) {
-        // The count variable is odd, so the deadline should have been violated.
-        printf("ERROR: Failed to detect deadline.\n");
-        exit(1);
+      // The count variable is odd, so the deadline should have been violated.
+      printf("ERROR: Failed to detect deadline.\n");
+      exit(1);
     }
     (self->count)++;
   =} deadline(timeout) {=
     printf("Destination deadline handler receives: %d\n", x->value);
     if (2 * (self->count / 2) == self->count) {
-        // The count variable is even, so the deadline should not have been violated.
-        printf("ERROR: Deadline miss handler invoked without deadline violation.\n");
-        exit(2);
+      // The count variable is even, so the deadline should not have been violated.
+      printf("ERROR: Deadline miss handler invoked without deadline violation.\n");
+      exit(2);
     }
     (self->count)++;
   =}
diff --git a/test/C/src/DeadlineAnytime.lf b/test/C/src/DeadlineAnytime.lf
index bc5ac67188..5ba39e36e0 100644
--- a/test/C/src/DeadlineAnytime.lf
+++ b/test/C/src/DeadlineAnytime.lf
@@ -14,9 +14,9 @@ reactor A {
 
   reaction(shutdown) {=
     if (self->i == 42) {
-        printf("SUCCESS\n");
+      printf("SUCCESS\n");
     } else {
-        lf_print_error_and_exit("Expected 42, but got %d", self->i);
+      lf_print_error_and_exit("Expected 42, but got %d", self->i);
     }
   =}
 }
diff --git a/test/C/src/DeadlineHandledAbove.lf b/test/C/src/DeadlineHandledAbove.lf
index df20467cad..5d5e35c619 100644
--- a/test/C/src/DeadlineHandledAbove.lf
+++ b/test/C/src/DeadlineHandledAbove.lf
@@ -36,17 +36,17 @@ main reactor DeadlineHandledAbove {
 
   reaction(d.deadline_violation) {=
     if (d.deadline_violation->value) {
-        printf("Output successfully produced by deadline miss handler.\n");
-        self->violation_detected = true;
+      printf("Output successfully produced by deadline miss handler.\n");
+      self->violation_detected = true;
     }
   =}
 
   reaction(shutdown) {=
     if (self->violation_detected) {
-        printf("SUCCESS. Test passes.\n");
+      printf("SUCCESS. Test passes.\n");
     } else {
-        printf("FAILURE. Container did not react to deadline violation.\n");
-        exit(2);
+      printf("FAILURE. Container did not react to deadline violation.\n");
+      exit(2);
     }
   =}
 }
diff --git a/test/C/src/DeadlineInherited.lf b/test/C/src/DeadlineInherited.lf
index de718e34a0..5c99bd56a6 100644
--- a/test/C/src/DeadlineInherited.lf
+++ b/test/C/src/DeadlineInherited.lf
@@ -20,7 +20,7 @@ reactor WithDeadline {
 
   reaction(t) {=
     if (global_cnt != 0) {
-        lf_print_error_and_exit("Deadline reaction was not executed first. cnt=%i", global_cnt);
+      lf_print_error_and_exit("Deadline reaction was not executed first. cnt=%i", global_cnt);
     }
     global_cnt--;
   =} deadline(100 sec) {=  =}
diff --git a/test/C/src/DeadlinePriority.lf b/test/C/src/DeadlinePriority.lf
index 21a810e786..58761975ac 100644
--- a/test/C/src/DeadlinePriority.lf
+++ b/test/C/src/DeadlinePriority.lf
@@ -18,7 +18,7 @@ reactor WithDeadline {
 
   reaction(t) {=
     if (global_cnt != 0) {
-        lf_print_error_and_exit("Deadline reaction was not executed first. cnt=%i", global_cnt);
+      lf_print_error_and_exit("Deadline reaction was not executed first. cnt=%i", global_cnt);
     }
     global_cnt--;
   =} deadline(100 sec) {=  =}
diff --git a/test/C/src/DeadlineWithAfterDelay.lf b/test/C/src/DeadlineWithAfterDelay.lf
index af4d1cc8c8..9478d8e00f 100644
--- a/test/C/src/DeadlineWithAfterDelay.lf
+++ b/test/C/src/DeadlineWithAfterDelay.lf
@@ -24,7 +24,7 @@ reactor SinkWithDeadline {
   reaction(in) {=
     global_cnt--;
     if (global_cnt != 0) {
-        lf_print_error_and_exit("Deadline reaction was not executed first. cnt=%i", global_cnt);
+      lf_print_error_and_exit("Deadline reaction was not executed first. cnt=%i", global_cnt);
     }
   =} deadline(100 sec) {=  =}
 }
diff --git a/test/C/src/DeadlineWithBanks.lf b/test/C/src/DeadlineWithBanks.lf
index 2e1fd9bcca..471d22682e 100644
--- a/test/C/src/DeadlineWithBanks.lf
+++ b/test/C/src/DeadlineWithBanks.lf
@@ -19,30 +19,30 @@ reactor Bank(bank_index: int = 0) {
   reaction(t) -> out {=
     int exp_cnt;
     switch(self->bank_index) {
-        case 0: {
-            exp_cnt = 3;
-            break;
-        }
-        case 1: {
-            exp_cnt = 1;
-            break;
-        }
-        case 2: {
-            exp_cnt = 0;
-            break;
-        }
-        case 3: {
-            exp_cnt = 2;
-            break;
-        }
+      case 0: {
+        exp_cnt = 3;
+        break;
+      }
+      case 1: {
+        exp_cnt = 1;
+        break;
+      }
+      case 2: {
+        exp_cnt = 0;
+        break;
+      }
+      case 3: {
+        exp_cnt = 2;
+        break;
+      }
     }
     if (global_cnt != exp_cnt) {
-        lf_print_error_and_exit("global_cnt=%i expected=%i\n", global_cnt, exp_cnt);
+      lf_print_error_and_exit("global_cnt=%i expected=%i\n", global_cnt, exp_cnt);
     }
     global_cnt++;
 
     if (self->bank_index==0) {
-        global_cnt=0;
+      global_cnt=0;
     }
   =}
 }
diff --git a/test/C/src/DelayArray.lf b/test/C/src/DelayArray.lf
index f818446991..6f4bd6a754 100644
--- a/test/C/src/DelayArray.lf
+++ b/test/C/src/DelayArray.lf
@@ -23,7 +23,7 @@ reactor Source {
     // https://www.lf-lang.org/docs/handbook/target-language-details?target=c#dynamically-allocated-data
     int* array =  (int*)malloc(3 * sizeof(int));
     for (size_t i = 0; i < 3; i++) {
-        array[i] = i;
+      array[i] = i;
     }
     lf_set(out, array);
   =}
@@ -34,22 +34,22 @@ reactor Print(scale: int = 1) {
   input in: int[]
 
   reaction(in) {=
-    int count = 0;       // For testing.
+    int count = 0;     // For testing.
     bool failed = false; // For testing.
     printf("Received: [");
     for (int i = 0; i < 3; i++) {
-        if (i > 0) printf(", ");
-        printf("%d", in->value[i]);
-        // For testing, check whether values match expectation.
-        if (in->value[i] != self->scale * count) {
-            failed = true;
-        }
-        count++;         // For testing.
+      if (i > 0) printf(", ");
+      printf("%d", in->value[i]);
+      // For testing, check whether values match expectation.
+      if (in->value[i] != self->scale * count) {
+        failed = true;
+      }
+      count++;     // For testing.
     }
     printf("]\n");
     if (failed) {
-        printf("ERROR: Value received by Print does not match expectation!\n");
-        exit(1);
+      printf("ERROR: Value received by Print does not match expectation!\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/DelayArrayWithAfter.lf b/test/C/src/DelayArrayWithAfter.lf
index 3c3866b00c..58df312758 100644
--- a/test/C/src/DelayArrayWithAfter.lf
+++ b/test/C/src/DelayArrayWithAfter.lf
@@ -30,35 +30,35 @@ reactor Print(scale: int = 1) {
 
   reaction(in) {=
     self->inputs_received++;
-    int count = 1;       // For testing.
+    int count = 1;     // For testing.
     bool failed = false; // For testing.
     printf("At time %lld, received array at address %p\n", lf_time_logical_elapsed(), in->value);
     printf("Received: [");
     for (int i = 0; i < in->length; i++) {
-        if (i > 0) printf(", ");
-        printf("%d", in->value[i]);
-        // For testing, check whether values match expectation.
-        if (in->value[i] != self->scale * count * self->iteration) {
-            failed = true;
-        }
-        count++;         // For testing.
+      if (i > 0) printf(", ");
+      printf("%d", in->value[i]);
+      // For testing, check whether values match expectation.
+      if (in->value[i] != self->scale * count * self->iteration) {
+        failed = true;
+      }
+      count++;     // For testing.
     }
     printf("]\n");
     if (failed) {
-        printf("ERROR: Value received by Print does not match expectation!\n");
-        exit(1);
+      printf("ERROR: Value received by Print does not match expectation!\n");
+      exit(1);
     }
     if (count != 4) {
-        printf("ERROR: Received array length is not 3!\n");
-        exit(2);
+      printf("ERROR: Received array length is not 3!\n");
+      exit(2);
     }
     self->iteration++;
   =}
 
   reaction(shutdown) {=
     if (self->inputs_received == 0) {
-        printf("ERROR: Print reactor received no inputs.\n");
-        exit(3);
+      printf("ERROR: Print reactor received no inputs.\n");
+      exit(3);
     }
   =}
 }
diff --git a/test/C/src/DelayInt.lf b/test/C/src/DelayInt.lf
index a8fce5fe4e..58e74b2b8a 100644
--- a/test/C/src/DelayInt.lf
+++ b/test/C/src/DelayInt.lf
@@ -32,20 +32,20 @@ reactor Test {
     interval_t elapsed = current_time - self->start_time;
     printf("After %lld nsec of logical time.\n", elapsed);
     if (elapsed != 100000000LL) {
-        printf("ERROR: Expected elapsed time to be 100000000. It was %lld.\n", elapsed);
-        exit(1);
+      printf("ERROR: Expected elapsed time to be 100000000. It was %lld.\n", elapsed);
+      exit(1);
     }
     if (in->value != 42) {
-        printf("ERROR: Expected input value to be 42. It was %d.\n", in->value);
-        exit(2);
+      printf("ERROR: Expected input value to be 42. It was %d.\n", in->value);
+      exit(2);
     }
   =}
 
   reaction(shutdown) {=
     printf("Checking that communication occurred.\n");
     if (!self->received_value) {
-        printf("ERROR: No communication occurred!\n");
-        exit(3);
+      printf("ERROR: No communication occurred!\n");
+      exit(3);
     }
   =}
 }
diff --git a/test/C/src/DelayPointer.lf b/test/C/src/DelayPointer.lf
index d0dba9d68e..57dd2269d5 100644
--- a/test/C/src/DelayPointer.lf
+++ b/test/C/src/DelayPointer.lf
@@ -46,20 +46,20 @@ reactor Test {
     interval_t elapsed = current_time - self->start_time;
     printf("After %lld nsec of logical time.\n", elapsed);
     if (elapsed != 100000000LL) {
-        printf("ERROR: Expected elapsed time to be 100000000. It was %lld.\n", elapsed);
-        exit(1);
+      printf("ERROR: Expected elapsed time to be 100000000. It was %lld.\n", elapsed);
+      exit(1);
     }
     if (*(in->value) != 42) {
-        printf("ERROR: Expected input value to be 42. It was %d.\n", *(in->value));
-        exit(2);
+      printf("ERROR: Expected input value to be 42. It was %d.\n", *(in->value));
+      exit(2);
     }
   =}
 
   reaction(shutdown) {=
     printf("Checking that communication occurred.\n");
     if (!self->received_value) {
-        printf("ERROR: No communication occurred!\n");
-        exit(3);
+      printf("ERROR: No communication occurred!\n");
+      exit(3);
     }
   =}
 }
diff --git a/test/C/src/DelayString.lf b/test/C/src/DelayString.lf
index 9eb5417375..f49cd270de 100644
--- a/test/C/src/DelayString.lf
+++ b/test/C/src/DelayString.lf
@@ -33,12 +33,12 @@ reactor Test {
     interval_t elapsed = lf_time_logical_elapsed();
     printf("After %lld nsec of logical time.\n", elapsed);
     if (elapsed != 100000000LL) {
-        printf("ERROR: Expected elapsed time to be 100000000. It was %lld.\n", elapsed);
-        exit(1);
+      printf("ERROR: Expected elapsed time to be 100000000. It was %lld.\n", elapsed);
+      exit(1);
     }
     if (strcmp(in->value, "Hello") != 0) {
-        printf("ERROR: Expected input value to be \"Hello\". It was \"%s\".\n", in->value);
-        exit(2);
+      printf("ERROR: Expected input value to be \"Hello\". It was \"%s\".\n", in->value);
+      exit(2);
     }
   =}
 }
diff --git a/test/C/src/DelayStruct.lf b/test/C/src/DelayStruct.lf
index 3d8ca9c665..11d215947b 100644
--- a/test/C/src/DelayStruct.lf
+++ b/test/C/src/DelayStruct.lf
@@ -46,8 +46,8 @@ reactor Print(expected: int = 42) {
   reaction(in) {=
     printf("Received: name = %s, value = %d\n", in->value->name, in->value->value);
     if (in->value->value != self->expected) {
-        printf("ERROR: Expected value to be %d.\n", self->expected);
-        exit(1);
+      printf("ERROR: Expected value to be %d.\n", self->expected);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/DelayStructWithAfter.lf b/test/C/src/DelayStructWithAfter.lf
index 0207ba3ea2..a8b5b773c9 100644
--- a/test/C/src/DelayStructWithAfter.lf
+++ b/test/C/src/DelayStructWithAfter.lf
@@ -27,8 +27,8 @@ reactor Print(expected: int = 42) {
   reaction(in) {=
     printf("Received: name = %s, value = %d\n", in->value->name, in->value->value);
     if (in->value->value != self->expected) {
-        printf("ERROR: Expected value to be %d.\n", self->expected);
-        exit(1);
+      printf("ERROR: Expected value to be %d.\n", self->expected);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/DelayStructWithAfterOverlapped.lf b/test/C/src/DelayStructWithAfterOverlapped.lf
index b098e9ecf1..e6a40f88fc 100644
--- a/test/C/src/DelayStructWithAfterOverlapped.lf
+++ b/test/C/src/DelayStructWithAfterOverlapped.lf
@@ -34,15 +34,15 @@ reactor Print {
     self->s++;
     printf("Received: name = %s, value = %d\n", in->value->name, in->value->value);
     if (in->value->value != 42 * self->s) {
-        printf("ERROR: Expected value to be %d.\n", 42 * self->s);
-        exit(1);
+      printf("ERROR: Expected value to be %d.\n", 42 * self->s);
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (self->s == 0) {
-        printf("ERROR: Print received no data.\n");
-        exit(2);
+      printf("ERROR: Print received no data.\n");
+      exit(2);
     }
   =}
 }
diff --git a/test/C/src/DelayedAction.lf b/test/C/src/DelayedAction.lf
index ff7ce075f4..529f92badf 100644
--- a/test/C/src/DelayedAction.lf
+++ b/test/C/src/DelayedAction.lf
@@ -18,8 +18,8 @@ main reactor DelayedAction {
     interval_t expected = self->count * 1000000000LL + 100000000LL;
     self->count++;
     if (elapsed != expected) {
-        printf("Expected %lld but got %lld.\n", expected, elapsed);
-        exit(1);
+      printf("Expected %lld but got %lld.\n", expected, elapsed);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/DelayedReaction.lf b/test/C/src/DelayedReaction.lf
index dbdec1a2e8..41cb9f3052 100644
--- a/test/C/src/DelayedReaction.lf
+++ b/test/C/src/DelayedReaction.lf
@@ -15,8 +15,8 @@ reactor Sink {
     interval_t elapsed = lf_time_logical_elapsed();
     printf("Nanoseconds since start: %lld.\n", elapsed);
     if (elapsed != 100000000LL) {
-        printf("ERROR: Expected 100000000 but.\n");
-        exit(1);
+      printf("ERROR: Expected 100000000 but.\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/Determinism.lf b/test/C/src/Determinism.lf
index a063b108f0..6ccc7dde34 100644
--- a/test/C/src/Determinism.lf
+++ b/test/C/src/Determinism.lf
@@ -14,15 +14,15 @@ reactor Destination {
   reaction(x, y) {=
     int sum = 0;
     if (x->is_present) {
-        sum += x->value;
+      sum += x->value;
     }
     if (y->is_present) {
-        sum += y->value;
+      sum += y->value;
     }
     printf("Received %d.\n", sum);
     if (sum != 2) {
-        printf("FAILURE: Expected 2.\n");
-        exit(4);
+      printf("FAILURE: Expected 2.\n");
+      exit(4);
     }
   =}
 }
diff --git a/test/C/src/DoubleInvocation.lf b/test/C/src/DoubleInvocation.lf
index 98c0d51e20..ccebca4336 100644
--- a/test/C/src/DoubleInvocation.lf
+++ b/test/C/src/DoubleInvocation.lf
@@ -33,11 +33,11 @@ reactor Print {
 
   reaction(position, velocity) {=
     if (position->is_present) {
-        printf("Position: %d.\n", position->value);
+      printf("Position: %d.\n", position->value);
     }
     if (position->value == self->previous) {
-        printf("ERROR: Multiple firings at the same logical time!\n");
-        exit(1);
+      printf("ERROR: Multiple firings at the same logical time!\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/DoublePort.lf b/test/C/src/DoublePort.lf
index 545c7fba1f..046a4f951f 100644
--- a/test/C/src/DoublePort.lf
+++ b/test/C/src/DoublePort.lf
@@ -30,8 +30,8 @@ reactor Print {
     interval_t elapsed_time = lf_time_logical_elapsed();
     printf("At tag (%lld, %u), received in = %d and in2 = %d.\n", elapsed_time, lf_tag().microstep, in->value, in2->value);
     if (in->is_present && in2->is_present) {
-        fprintf(stderr, "ERROR: invalid logical simultaneity.\n");
-        exit(1);
+      fprintf(stderr, "ERROR: invalid logical simultaneity.\n");
+      exit(1);
     }
   =}
 
diff --git a/test/C/src/DoubleReaction.lf b/test/C/src/DoubleReaction.lf
index 4dd17db7c4..b3cb5b51dd 100644
--- a/test/C/src/DoubleReaction.lf
+++ b/test/C/src/DoubleReaction.lf
@@ -24,15 +24,15 @@ reactor Destination {
   reaction(x, w) {=
     int sum = 0;
     if (x->is_present) {
-        sum += x->value;
+      sum += x->value;
     }
     if (w->is_present) {
-        sum += w->value;
+      sum += w->value;
     }
     printf("Sum of inputs is: %d\n", sum);
     if (sum != self->s) {
-        printf("FAILURE: Expected sum to be %d, but it was %d.\n", self->s, sum);
-        exit(1);
+      printf("FAILURE: Expected sum to be %d, but it was %d.\n", self->s, sum);
+      exit(1);
     }
     self->s += 2;
   =}
diff --git a/test/C/src/DoubleTrigger.lf b/test/C/src/DoubleTrigger.lf
index c36eaa0362..755f58abe8 100644
--- a/test/C/src/DoubleTrigger.lf
+++ b/test/C/src/DoubleTrigger.lf
@@ -12,17 +12,17 @@ main reactor DoubleTrigger {
   reaction(t1, t2) {=
     self->s++;
     if (self->s > 1) {
-        printf("FAILURE: Reaction got triggered twice.\n");
-        exit(1);
+      printf("FAILURE: Reaction got triggered twice.\n");
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (self->s == 1) {
-        printf("SUCCESS.\n");
+      printf("SUCCESS.\n");
     } else {
-        printf("FAILURE: Reaction was never triggered.\n");
-        exit(1);
+      printf("FAILURE: Reaction was never triggered.\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/FilePkgReader.lf b/test/C/src/FilePkgReader.lf
index 7fdd2d62d2..d8bf41d9d6 100644
--- a/test/C/src/FilePkgReader.lf
+++ b/test/C/src/FilePkgReader.lf
@@ -6,10 +6,10 @@ reactor Source {
 
   reaction(startup) -> out {=
     char* file_path =
-        LF_PACKAGE_DIRECTORY
-        LF_FILE_SEPARATOR "src"
-        LF_FILE_SEPARATOR "lib"
-        LF_FILE_SEPARATOR "FileReader.txt";
+      LF_PACKAGE_DIRECTORY
+      LF_FILE_SEPARATOR "src"
+      LF_FILE_SEPARATOR "lib"
+      LF_FILE_SEPARATOR "FileReader.txt";
 
     FILE* file = fopen(file_path, "rb");
     if (file == NULL) lf_print_error_and_exit("Error opening file at path %s.", file_path);
@@ -41,7 +41,7 @@ main reactor {
   reaction(s.out) {=
     printf("Received: %s\n", s.out->value);
     if (strcmp("Hello World", s.out->value) != 0) {
-        lf_print_error_and_exit("Expected 'Hello World'");
+      lf_print_error_and_exit("Expected 'Hello World'");
     }
   =}
 }
diff --git a/test/C/src/FileReader.lf b/test/C/src/FileReader.lf
index 4bd093eedf..e802baf115 100644
--- a/test/C/src/FileReader.lf
+++ b/test/C/src/FileReader.lf
@@ -6,9 +6,9 @@ reactor Source {
 
   reaction(startup) -> out {=
     char* file_path =
-        LF_SOURCE_DIRECTORY
-        LF_FILE_SEPARATOR "lib"
-        LF_FILE_SEPARATOR "FileReader.txt";
+      LF_SOURCE_DIRECTORY
+      LF_FILE_SEPARATOR "lib"
+      LF_FILE_SEPARATOR "FileReader.txt";
 
     FILE* file = fopen(file_path, "rb");
     if (file == NULL) lf_print_error_and_exit("Error opening file at path %s.", file_path);
@@ -40,7 +40,7 @@ main reactor {
   reaction(s.out) {=
     printf("Received: %s\n", s.out->value);
     if (strcmp("Hello World", s.out->value) != 0) {
-        lf_print_error_and_exit("Expected 'Hello World'");
+      lf_print_error_and_exit("Expected 'Hello World'");
     }
   =}
 }
diff --git a/test/C/src/FloatLiteral.lf b/test/C/src/FloatLiteral.lf
index 0179275083..52fca6be40 100644
--- a/test/C/src/FloatLiteral.lf
+++ b/test/C/src/FloatLiteral.lf
@@ -14,12 +14,12 @@ main reactor {
   reaction(startup) {=
     double F = - self->N * self->charge;
     if (fabs(F - self->expected) < fabs(self->minus_epsilon)) {
-        lf_print("The Faraday constant is roughly %f.", F);
+      lf_print("The Faraday constant is roughly %f.", F);
     } else {
-        lf_print_error_and_exit(
-            "ERROR: Expected %f but computed %f.",
-            self->expected, F
-        );
+      lf_print_error_and_exit(
+        "ERROR: Expected %f but computed %f.",
+        self->expected, F
+      );
     }
   =}
 }
diff --git a/test/C/src/Gain.lf b/test/C/src/Gain.lf
index 5df74e2e01..bc096cf77c 100644
--- a/test/C/src/Gain.lf
+++ b/test/C/src/Gain.lf
@@ -16,16 +16,16 @@ reactor Test {
     printf("Received %d.\n", x->value);
     self->received_value = true;
     if (x->value != 2) {
-        printf("ERROR: Expected 2!\n");
-        exit(1);
+      printf("ERROR: Expected 2!\n");
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (!self->received_value) {
-        printf("ERROR: No value received by Test reactor!\n");
+      printf("ERROR: No value received by Test reactor!\n");
     } else {
-        printf("Test passes.\n");
+      printf("Test passes.\n");
     }
   =}
 }
diff --git a/test/C/src/GetMicroStep.lf b/test/C/src/GetMicroStep.lf
index 65a60f7174..4f0fda5e9f 100644
--- a/test/C/src/GetMicroStep.lf
+++ b/test/C/src/GetMicroStep.lf
@@ -11,11 +11,11 @@ main reactor GetMicroStep {
   reaction(l) -> l {=
     microstep_t microstep = lf_tag().microstep;
     if (microstep != self->s) {
-        lf_print_error_and_exit("expected microstep %d, got %d instead.", self->s, microstep);
+      lf_print_error_and_exit("expected microstep %d, got %d instead.", self->s, microstep);
     }
     self->s += 1;
     if (self->s < 10) {
-        lf_schedule(l, 0);
+      lf_schedule(l, 0);
     }
   =}
 }
diff --git a/test/C/src/Hello.lf b/test/C/src/Hello.lf
index 283718c2ed..b63622c146 100644
--- a/test/C/src/Hello.lf
+++ b/test/C/src/Hello.lf
@@ -32,15 +32,15 @@ reactor Reschedule(period: time = 2 sec, message: string = "Hello C") {
     printf("***** action %d at time %lld\n", self->count, lf_time_logical());
     // Check the a_has_value variable.
     if (a->has_value) {
-        printf("FAILURE: Expected a_has_value to be false, but it was true.\n");
-        exit(2);
+      printf("FAILURE: Expected a_has_value to be false, but it was true.\n");
+      exit(2);
     }
     long long time = lf_time_logical();
     if (time - self->previous_time != 200000000ll) {
-        printf("FAILURE: Expected 200ms of logical time to elapse but got %lld nanoseconds.\n",
-            time - self->previous_time
-        );
-        exit(1);
+      printf("FAILURE: Expected 200ms of logical time to elapse but got %lld nanoseconds.\n",
+        time - self->previous_time
+      );
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/HelloWorld.lf b/test/C/src/HelloWorld.lf
index 470ebabb6b..d005153f9f 100644
--- a/test/C/src/HelloWorld.lf
+++ b/test/C/src/HelloWorld.lf
@@ -18,8 +18,8 @@ reactor HelloWorld2 {
   reaction(shutdown) {=
     printf("Shutdown invoked.\n");
     if (!self->success) {
-        fprintf(stderr, "ERROR: startup reaction not executed.\n");
-        exit(1);
+      fprintf(stderr, "ERROR: startup reaction not executed.\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/Hierarchy.lf b/test/C/src/Hierarchy.lf
index 71aa7f9269..47efcf6b65 100644
--- a/test/C/src/Hierarchy.lf
+++ b/test/C/src/Hierarchy.lf
@@ -24,8 +24,8 @@ reactor Print {
   reaction(in) {=
     printf("Received: %d.\n", in->value);
     if (in->value != 2) {
-        printf("Expected 2.\n");
-        exit(1);
+      printf("Expected 2.\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/Hierarchy2.lf b/test/C/src/Hierarchy2.lf
index daa7b832f8..7e361dc580 100644
--- a/test/C/src/Hierarchy2.lf
+++ b/test/C/src/Hierarchy2.lf
@@ -42,8 +42,8 @@ reactor Print {
   reaction(in) {=
     printf("Received: %d.\n", in->value);
     if (in->value != self->expected) {
-        printf("Expected %d.\n", self->expected);
-        exit(1);
+      printf("Expected %d.\n", self->expected);
+      exit(1);
     }
     self->expected++;
   =}
diff --git a/test/C/src/IdentifierLength.lf b/test/C/src/IdentifierLength.lf
index 6e4b34e976..79b2e3aaca 100644
--- a/test/C/src/IdentifierLength.lf
+++ b/test/C/src/IdentifierLength.lf
@@ -23,8 +23,8 @@ reactor Another_Really_Long_Name_For_A_Test_Class {
     (self->count)++;
     printf("Received %d\n", x->value);
     if (x->value != self->count) {
-        printf("FAILURE: Expected %d\n", self->count);
-        exit(1);
+      printf("FAILURE: Expected %d\n", self->count);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/ImportComposition.lf b/test/C/src/ImportComposition.lf
index c80bf87eab..41e493f8d9 100644
--- a/test/C/src/ImportComposition.lf
+++ b/test/C/src/ImportComposition.lf
@@ -14,19 +14,19 @@ main reactor ImportComposition {
     printf("Received %d at time %lld\n", a.y->value, receive_time);
     self->received = true;
     if (receive_time != 55000000LL) {
-        fprintf(stderr, "ERROR: Received time should have been 55,000,000.\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Received time should have been 55,000,000.\n");
+      exit(1);
     }
     if (a.y->value != 42 * 2 * 2) {
-        fprintf(stderr, "ERROR: Received value should have been %d.\n", 42 * 2 * 2);
-        exit(2);
+      fprintf(stderr, "ERROR: Received value should have been %d.\n", 42 * 2 * 2);
+      exit(2);
     }
   =}
 
   reaction(shutdown) {=
     if (!self->received) {
-        fprintf(stderr, "ERROR: Nothing received.\n");
-        exit(3);
+      fprintf(stderr, "ERROR: Nothing received.\n");
+      exit(3);
     }
   =}
 }
diff --git a/test/C/src/InheritanceAction.lf b/test/C/src/InheritanceAction.lf
index f6a87ef360..e2b5857ff7 100644
--- a/test/C/src/InheritanceAction.lf
+++ b/test/C/src/InheritanceAction.lf
@@ -22,14 +22,14 @@ reactor Test {
     (self->count)++;
     printf("Received %d\n", x->value);
     if (x->value != 42) {
-        fprintf(stderr, "FAILURE: Expected 42\n");
-        exit(1);
+      fprintf(stderr, "FAILURE: Expected 42\n");
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (self->count == 0) {
-        fprintf(stderr, "FAILURE: No data received.\n");
+      fprintf(stderr, "FAILURE: No data received.\n");
     }
   =}
 }
diff --git a/test/C/src/ManualDelayedReaction.lf b/test/C/src/ManualDelayedReaction.lf
index 3432f15ec2..24f5cc3d23 100644
--- a/test/C/src/ManualDelayedReaction.lf
+++ b/test/C/src/ManualDelayedReaction.lf
@@ -37,8 +37,8 @@ reactor Sink {
     interval_t physical = lf_time_physical();
     printf("Nanoseconds since start: %lld %lld %lld.\n", logical, physical, elapsed_logical);
     if (elapsed_logical < MSEC(100)) {
-        printf("Expected %lld but got %lld.\n", MSEC(100), elapsed_logical);
-        exit(1);
+      printf("Expected %lld but got %lld.\n", MSEC(100), elapsed_logical);
+      exit(1);
     }
   =} deadline(200 msec) {=  =}
 }
diff --git a/test/C/src/Methods.lf b/test/C/src/Methods.lf
index 45bb9fa4ba..2d69d5c77d 100644
--- a/test/C/src/Methods.lf
+++ b/test/C/src/Methods.lf
@@ -10,14 +10,14 @@ main reactor {
   reaction(startup) {=
     lf_print("Foo is initialized to %d", getFoo());
     if (getFoo() != 2) {
-        lf_print_error_and_exit("Expected 2!");
+      lf_print_error_and_exit("Expected 2!");
     }
 
     add(40);
     int a = getFoo();
     lf_print("2 + 40 = %d", a);
     if (a != 42) {
-        lf_print_error_and_exit("Expected 42!");
+      lf_print_error_and_exit("Expected 42!");
     }
   =}
 }
diff --git a/test/C/src/MethodsRecursive.lf b/test/C/src/MethodsRecursive.lf
index 8ba8a5627b..4e04a0a901 100644
--- a/test/C/src/MethodsRecursive.lf
+++ b/test/C/src/MethodsRecursive.lf
@@ -14,7 +14,7 @@ main reactor {
 
   reaction(startup) {=
     for (int n = 1; n < 10; n++) {
-        lf_print("%d-th Fibonacci number is %d", n, fib(n));
+      lf_print("%d-th Fibonacci number is %d", n, fib(n));
     }
   =}
 }
diff --git a/test/C/src/MethodsSameName.lf b/test/C/src/MethodsSameName.lf
index 349f62fc55..db07a5cd75 100644
--- a/test/C/src/MethodsSameName.lf
+++ b/test/C/src/MethodsSameName.lf
@@ -10,7 +10,7 @@ reactor Foo {
     add(40);
     lf_print("Foo: 2 + 40 = %d", self->foo);
     if (self->foo != 42) {
-        lf_print_error_and_exit("Expected 42!");
+      lf_print_error_and_exit("Expected 42!");
     }
   =}
 }
@@ -26,7 +26,7 @@ main reactor {
     add(40);
     lf_print("Main: 2 + 40 = %d", self->foo);
     if (self->foo != 42) {
-        lf_print_error_and_exit("Expected 42!");
+      lf_print_error_and_exit("Expected 42!");
     }
   =}
 }
diff --git a/test/C/src/Microsteps.lf b/test/C/src/Microsteps.lf
index 1e5cca7bf3..6a2915b53f 100644
--- a/test/C/src/Microsteps.lf
+++ b/test/C/src/Microsteps.lf
@@ -8,21 +8,21 @@ reactor Destination {
     interval_t elapsed = lf_time_logical_elapsed();
     printf("Time since start: %lld.\n", elapsed);
     if (elapsed != 0LL) {
-        printf("Expected elapsed time to be 0, but it was %lld.\n", elapsed);
-        exit(1);
+      printf("Expected elapsed time to be 0, but it was %lld.\n", elapsed);
+      exit(1);
     }
     int count = 0;
     if (x->is_present) {
-        printf("  x is present.\n");
-        count++;
+      printf("  x is present.\n");
+      count++;
     }
     if (y->is_present) {
-        printf("  y is present.\n");
-        count++;
+      printf("  y is present.\n");
+      count++;
     }
     if (count != 1) {
-        printf("Expected exactly one input to be present but got %d.\n", count);
-        exit(1);
+      printf("Expected exactly one input to be present but got %d.\n", count);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/MovingAverage.lf b/test/C/src/MovingAverage.lf
index 53e761f61b..79a3824b09 100644
--- a/test/C/src/MovingAverage.lf
+++ b/test/C/src/MovingAverage.lf
@@ -28,7 +28,7 @@ reactor MovingAverageImpl {
     // Calculate the output.
     double sum = in->value;
     for (int i = 0; i < 3; i++) {
-        sum += self->delay_line[i];
+      sum += self->delay_line[i];
     }
     lf_set(out, sum/4.0);
 
@@ -38,7 +38,7 @@ reactor MovingAverageImpl {
     // Update the index for the next input.
     self->index++;
     if (self->index >= 3) {
-        self->index = 0;
+      self->index = 0;
     }
   =}
 }
diff --git a/test/C/src/MultipleContained.lf b/test/C/src/MultipleContained.lf
index 384543e56f..1e98bff1fb 100644
--- a/test/C/src/MultipleContained.lf
+++ b/test/C/src/MultipleContained.lf
@@ -12,8 +12,8 @@ reactor Contained {
   reaction(in1) {=
     printf("in1 received %d.\n", in1->value);
     if (in1->value != 42) {
-        fprintf(stderr, "FAILED: Expected 42.\n");
-        exit(1);
+      fprintf(stderr, "FAILED: Expected 42.\n");
+      exit(1);
     }
     self->count++;
   =}
@@ -21,15 +21,15 @@ reactor Contained {
   reaction(in2) {=
     printf("in2 received %d.\n", in2->value);
     if (in2->value != 42) {
-        fprintf(stderr, "FAILED: Expected 42.\n");
-        exit(1);
+      fprintf(stderr, "FAILED: Expected 42.\n");
+      exit(1);
     }
     self->count++;
   =}
 
   reaction(shutdown) {=
     if (self->count != 2) {
-        lf_print_error_and_exit("FAILED: Expected two inputs!");
+      lf_print_error_and_exit("FAILED: Expected two inputs!");
     }
   =}
 }
diff --git a/test/C/src/MultipleOutputs.lf b/test/C/src/MultipleOutputs.lf
index 4682ce8eef..9581875c02 100644
--- a/test/C/src/MultipleOutputs.lf
+++ b/test/C/src/MultipleOutputs.lf
@@ -28,7 +28,7 @@ main reactor {
 
   reaction(shutdown) {=
     if (!self->triggered) {
-        lf_print_error_and_exit("Reaction never triggered.\n");
+      lf_print_error_and_exit("Reaction never triggered.\n");
     }
   =}
 }
diff --git a/test/C/src/NativeListsAndTimes.lf b/test/C/src/NativeListsAndTimes.lf
index 1bf5cfdd6f..02d871d28b 100644
--- a/test/C/src/NativeListsAndTimes.lf
+++ b/test/C/src/NativeListsAndTimes.lf
@@ -3,20 +3,20 @@ target C
 // This test passes if it is successfully compiled into valid target code.
 main reactor(
     x: int = 0,
-    y: time = 0,                  // Units are missing but not required
-    z = 1 msec,                   // Type is missing but not required
-    p: int[] = {1, 2, 3, 4},      // List of integers
+    y: time = 0,          // Units are missing but not required
+    z = 1 msec,           // Type is missing but not required
+    p: int[] = {1, 2, 3, 4},    // List of integers
     q: interval_t[] = {1 msec, 2 msec, 3 msec},  // list of time values
     // List of time values
     g: time[] = {1 msec, 2 msec}) {
   state s: time = y  // Reference to explicitly typed time parameter
   state t: time = z  // Reference to implicitly typed time parameter
-  state v: bool      // Uninitialized boolean state variable
-  state w: time      // Uninitialized time state variable
-  timer tick(0)      // Units missing but not required
+  state v: bool    // Uninitialized boolean state variable
+  state w: time    // Uninitialized time state variable
+  timer tick(0)    // Units missing but not required
   timer tock(1 sec)  // Implicit type time
-  timer toe(z)       // Implicit type time
-  state baz = p      // Implicit type int[]
+  timer toe(z)     // Implicit type time
+  state baz = p    // Implicit type int[]
   state period = z   // Implicit type time
 
   state empty_list: int[]
diff --git a/test/C/src/NestedTriggeredReactions.lf b/test/C/src/NestedTriggeredReactions.lf
index 730bc1db08..ca9ce7476c 100644
--- a/test/C/src/NestedTriggeredReactions.lf
+++ b/test/C/src/NestedTriggeredReactions.lf
@@ -13,7 +13,7 @@ reactor Container {
 
   reaction(shutdown) {=
     if (!self->triggered) {
-        lf_print_error_and_exit("The Container reaction was not triggered!");
+      lf_print_error_and_exit("The Container reaction was not triggered!");
     }
   =}
 }
@@ -27,7 +27,7 @@ reactor Contained {
 
   reaction(shutdown) {=
     if (!self->triggered) {
-        lf_print_error_and_exit("The Contained reaction was not triggered!");
+      lf_print_error_and_exit("The Contained reaction was not triggered!");
     }
   =}
 }
diff --git a/test/C/src/ParameterHierarchy.lf b/test/C/src/ParameterHierarchy.lf
index 16c136575b..10ebed6476 100644
--- a/test/C/src/ParameterHierarchy.lf
+++ b/test/C/src/ParameterHierarchy.lf
@@ -4,9 +4,9 @@ target C
 reactor Deep(p0: int = 0) {
   reaction(startup) {=
     if (self->p0 != 42) {
-        lf_print_error_and_exit("Parameter value is %d. Should have been 42.", self->p0);
+      lf_print_error_and_exit("Parameter value is %d. Should have been 42.", self->p0);
     } else {
-        lf_print("Success.");
+      lf_print("Success.");
     }
   =}
 }
diff --git a/test/C/src/PeriodicDesugared.lf b/test/C/src/PeriodicDesugared.lf
index c31b81e534..0a55f496df 100644
--- a/test/C/src/PeriodicDesugared.lf
+++ b/test/C/src/PeriodicDesugared.lf
@@ -9,10 +9,10 @@ main reactor(offset: time = 0, period: time = 500 msec) {
 
   reaction(startup) -> init, recur {=
     if (self->offset == 0) {
-        printf("Hello World!\n");
-        lf_schedule(recur, 0);
+      printf("Hello World!\n");
+      lf_schedule(recur, 0);
     } else {
-        lf_schedule(init, 0);
+      lf_schedule(init, 0);
     }
   =}
 
diff --git a/test/C/src/PhysicalConnection.lf b/test/C/src/PhysicalConnection.lf
index 3276b1e11c..af478e0425 100644
--- a/test/C/src/PhysicalConnection.lf
+++ b/test/C/src/PhysicalConnection.lf
@@ -14,8 +14,8 @@ reactor Destination {
     interval_t time = lf_time_logical_elapsed();
     printf("Received %d at logical time %lld.\n", in->value, time);
     if (time <= 0LL) {
-        fprintf(stderr, "ERROR: Logical time should have been greater than zero.\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Logical time should have been greater than zero.\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/PingPong.lf b/test/C/src/PingPong.lf
index c3e0a69357..c38bd36683 100644
--- a/test/C/src/PingPong.lf
+++ b/test/C/src/PingPong.lf
@@ -32,9 +32,9 @@ reactor Ping(count: int = 10) {
 
   reaction(receive) -> serve {=
     if (self->pingsLeft > 0) {
-        lf_schedule(serve, 0);
+      lf_schedule(serve, 0);
     } else {
-        lf_request_stop();
+      lf_request_stop();
     }
   =}
 }
@@ -51,10 +51,10 @@ reactor Pong(expected: int = 10) {
 
   reaction(shutdown) {=
     if (self->count != self->expected) {
-        fprintf(stderr, "ERROR: Pong expected to receive %d inputs, but it received %d.\n",
-            self->expected, self->count
-        );
-        exit(1);
+      fprintf(stderr, "ERROR: Pong expected to receive %d inputs, but it received %d.\n",
+        self->expected, self->count
+      );
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/Preamble.lf b/test/C/src/Preamble.lf
index 28fa5a7d5e..431d007edd 100644
--- a/test/C/src/Preamble.lf
+++ b/test/C/src/Preamble.lf
@@ -7,7 +7,7 @@ main reactor Preamble {
   preamble {=
     #include <stdlib.h>
     int add_42(int i) {
-        return i + 42;
+      return i + 42;
     }
   =}
   timer t
diff --git a/test/C/src/ReadOutputOfContainedReactor.lf b/test/C/src/ReadOutputOfContainedReactor.lf
index eb8dba11bf..0625d9ccf3 100644
--- a/test/C/src/ReadOutputOfContainedReactor.lf
+++ b/test/C/src/ReadOutputOfContainedReactor.lf
@@ -14,8 +14,8 @@ main reactor ReadOutputOfContainedReactor {
   reaction(startup) c.out {=
     printf("Startup reaction reading output of contained reactor: %d.\n", c.out->value);
     if (c.out->value != 42) {
-        fprintf(stderr, "Expected 42!\n");
-        exit(2);
+      fprintf(stderr, "Expected 42!\n");
+      exit(2);
     }
     self->count++;
   =}
@@ -23,8 +23,8 @@ main reactor ReadOutputOfContainedReactor {
   reaction(c.out) {=
     printf("Reading output of contained reactor: %d.\n", c.out->value);
     if (c.out->value != 42) {
-        fprintf(stderr, "Expected 42!\n");
-        exit(3);
+      fprintf(stderr, "Expected 42!\n");
+      exit(3);
     }
     self->count++;
   =}
@@ -32,18 +32,18 @@ main reactor ReadOutputOfContainedReactor {
   reaction(startup, c.out) {=
     printf("Alternate triggering reading output of contained reactor: %d.\n", c.out->value);
     if (c.out->value != 42) {
-        fprintf(stderr, "Expected 42!\n");
-        exit(4);
+      fprintf(stderr, "Expected 42!\n");
+      exit(4);
     }
     self->count++;
   =}
 
   reaction(shutdown) {=
     if (self->count != 3) {
-        printf("FAILURE: One of the reactions failed to trigger.\n");
-        exit(1);
+      printf("FAILURE: One of the reactions failed to trigger.\n");
+      exit(1);
     } else {
-        printf("Test passes.\n");
+      printf("Test passes.\n");
     }
   =}
 }
diff --git a/test/C/src/RequestStop.lf b/test/C/src/RequestStop.lf
index 07e6806f72..55dcaec13a 100644
--- a/test/C/src/RequestStop.lf
+++ b/test/C/src/RequestStop.lf
@@ -5,7 +5,7 @@ main reactor {
   reaction(shutdown) {=
     tag_t current_tag = lf_tag();
     lf_print("Shutdown invoked at tag (%lld, %d). Calling lf_request_stop(), which should have no effect.",
-        current_tag.time - lf_time_start(), current_tag.microstep
+      current_tag.time - lf_time_start(), current_tag.microstep
     );
     lf_request_stop();
   =}
diff --git a/test/C/src/Schedule.lf b/test/C/src/Schedule.lf
index a806170d74..09f9de5bd9 100644
--- a/test/C/src/Schedule.lf
+++ b/test/C/src/Schedule.lf
@@ -11,8 +11,8 @@ reactor Schedule2 {
     interval_t elapsed_time = lf_time_logical_elapsed();
     printf("Action triggered at logical time %lld nsec after start.\n", elapsed_time);
     if (elapsed_time != 200000000LL) {
-        printf("Expected action time to be 200 msec. It was %lld nsec.\n", elapsed_time);
-        exit(1);
+      printf("Expected action time to be 200 msec. It was %lld nsec.\n", elapsed_time);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/ScheduleLogicalAction.lf b/test/C/src/ScheduleLogicalAction.lf
index 4a301977a3..72835f8a96 100644
--- a/test/C/src/ScheduleLogicalAction.lf
+++ b/test/C/src/ScheduleLogicalAction.lf
@@ -29,8 +29,8 @@ reactor print {
     printf("Current logical time is: %lld\n", elapsed_time);
     printf("Current physical time is: %lld\n", lf_time_physical_elapsed());
     if (elapsed_time != self->expected_time) {
-        printf("ERROR: Expected logical time to be %lld.\n", self->expected_time);
-        exit(1);
+      printf("ERROR: Expected logical time to be %lld.\n", self->expected_time);
+      exit(1);
     }
     self->expected_time += MSEC(500);
   =}
diff --git a/test/C/src/ScheduleValue.lf b/test/C/src/ScheduleValue.lf
index 05532c145f..0f5ef59eed 100644
--- a/test/C/src/ScheduleValue.lf
+++ b/test/C/src/ScheduleValue.lf
@@ -26,8 +26,8 @@ main reactor ScheduleValue {
   reaction(a) {=
     printf("Received: %s\n", a->value);
     if (strcmp(a->value, "Hello") != 0) {
-        fprintf(stderr, "FAILURE: Should have received 'Hello'\n");
-        exit(1);
+      fprintf(stderr, "FAILURE: Should have received 'Hello'\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/SelfLoop.lf b/test/C/src/SelfLoop.lf
index cf200024ce..204a5e856c 100644
--- a/test/C/src/SelfLoop.lf
+++ b/test/C/src/SelfLoop.lf
@@ -17,8 +17,8 @@ reactor Self {
   reaction(x) -> a {=
     printf("x = %d\n", x->value);
     if (x->value != self->expected) {
-        fprintf(stderr, "Expected %d.\n", self->expected);
-        exit(1);
+      fprintf(stderr, "Expected %d.\n", self->expected);
+      exit(1);
     }
     self->expected++;
     lf_schedule_int(a, MSEC(100), x->value);
@@ -28,8 +28,8 @@ reactor Self {
 
   reaction(shutdown) {=
     if (self->expected <= 43) {
-        fprintf(stderr, "Received no data.\n");
-        exit(2);
+      fprintf(stderr, "Received no data.\n");
+      exit(2);
     }
   =}
 }
diff --git a/test/C/src/SendingInside.lf b/test/C/src/SendingInside.lf
index 5371e8892a..5b06489ad7 100644
--- a/test/C/src/SendingInside.lf
+++ b/test/C/src/SendingInside.lf
@@ -12,8 +12,8 @@ reactor Printer {
   reaction(x) {=
     printf("Inside reactor received: %d\n", x->value);
     if (x->value != self->count) {
-        printf("FAILURE: Expected %d.\n", self->count);
-        exit(1);
+      printf("FAILURE: Expected %d.\n", self->count);
+      exit(1);
     }
     self->count++;
   =}
diff --git a/test/C/src/SendingInside2.lf b/test/C/src/SendingInside2.lf
index e1b684ff74..ab15278044 100644
--- a/test/C/src/SendingInside2.lf
+++ b/test/C/src/SendingInside2.lf
@@ -6,8 +6,8 @@ reactor Printer {
   reaction(x) {=
     printf("Inside reactor received: %d\n", x->value);
     if (x->value != 1) {
-        fprintf(stderr, "ERROR: Expected 1.\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Expected 1.\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/SendsPointerTest.lf b/test/C/src/SendsPointerTest.lf
index 639798709f..f05bec4934 100644
--- a/test/C/src/SendsPointerTest.lf
+++ b/test/C/src/SendsPointerTest.lf
@@ -20,8 +20,8 @@ reactor Print(expected: int = 42) {
   reaction(in) {=
     printf("Received: %d\n", *in->value);
     if (*in->value != self->expected) {
-        printf("ERROR: Expected value to be %d.\n", self->expected);
-        exit(1);
+      printf("ERROR: Expected value to be %d.\n", self->expected);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/SetArray.lf b/test/C/src/SetArray.lf
index 8926144e62..f1f96c9e12 100644
--- a/test/C/src/SetArray.lf
+++ b/test/C/src/SetArray.lf
@@ -22,22 +22,22 @@ reactor Print(scale: int = 1) {
   input in: int[]
 
   reaction(in) {=
-    int count = 0;       // For testing.
+    int count = 0;     // For testing.
     bool failed = false; // For testing.
     printf("Received: [");
     for (int i = 0; i < in->length; i++) {
-        if (i > 0) printf(", ");
-        printf("%d", in->value[i]);
-        // For testing, check whether values match expectation.
-        if (in->value[i] != self->scale * count) {
-            failed = true;
-        }
-        count++;         // For testing.
+      if (i > 0) printf(", ");
+      printf("%d", in->value[i]);
+      // For testing, check whether values match expectation.
+      if (in->value[i] != self->scale * count) {
+        failed = true;
+      }
+      count++;     // For testing.
     }
     printf("]\n");
     if (failed) {
-        printf("ERROR: Value received by Print does not match expectation!\n");
-        exit(1);
+      printf("ERROR: Value received by Print does not match expectation!\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/SetToken.lf b/test/C/src/SetToken.lf
index ff5e63066b..6b589c6e57 100644
--- a/test/C/src/SetToken.lf
+++ b/test/C/src/SetToken.lf
@@ -17,8 +17,8 @@ reactor Print(expected: int = 42) {
   reaction(in) {=
     printf("Received %d\n", *(in->value));
     if (*(in->value) != 42) {
-        printf("ERROR: Expected value to be 42.\n");
-        exit(1);
+      printf("ERROR: Expected value to be 42.\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/SimpleDeadline.lf b/test/C/src/SimpleDeadline.lf
index 6ae30cfb45..8382b281fa 100644
--- a/test/C/src/SimpleDeadline.lf
+++ b/test/C/src/SimpleDeadline.lf
@@ -30,7 +30,7 @@ reactor Print {
 
   reaction(in) {=
     if (in) {
-        printf("Output successfully produced by deadline handler.\n");
+      printf("Output successfully produced by deadline handler.\n");
     }
   =}
 }
diff --git a/test/C/src/SlowingClock.lf b/test/C/src/SlowingClock.lf
index c7ba2266fc..36cb07c553 100644
--- a/test/C/src/SlowingClock.lf
+++ b/test/C/src/SlowingClock.lf
@@ -18,13 +18,13 @@ main reactor SlowingClock {
   reaction(a) -> a {=
     instant_t elapsed_logical_time = lf_time_logical_elapsed();
     printf("Logical time since start: \%lld nsec.\n",
-        elapsed_logical_time
+      elapsed_logical_time
     );
     if (elapsed_logical_time != self->expected_time) {
-        printf("ERROR: Expected time to be: \%lld nsec.\n",
-            self->expected_time
-        );
-        exit(1);
+      printf("ERROR: Expected time to be: \%lld nsec.\n",
+        self->expected_time
+      );
+      exit(1);
     }
     lf_schedule(a, self->interval);
     self->expected_time += MSEC(100) + self->interval;
@@ -33,11 +33,11 @@ main reactor SlowingClock {
 
   reaction(shutdown) {=
     if (self->expected_time != MSEC(1500)) {
-        printf("ERROR: Expected the next expected time to be: 1500000000 nsec.\n");
-        printf("It was: \%lld nsec.\n", self->expected_time);
-        exit(2);
+      printf("ERROR: Expected the next expected time to be: 1500000000 nsec.\n");
+      printf("It was: \%lld nsec.\n", self->expected_time);
+      exit(2);
     } else {
-        printf("Test passes.\n");
+      printf("Test passes.\n");
     }
   =}
 }
diff --git a/test/C/src/SlowingClockPhysical.lf b/test/C/src/SlowingClockPhysical.lf
index 9ec8d48ef9..9a2b6b4a49 100644
--- a/test/C/src/SlowingClockPhysical.lf
+++ b/test/C/src/SlowingClockPhysical.lf
@@ -21,13 +21,13 @@ main reactor SlowingClockPhysical {
   reaction(a) -> a {=
     instant_t elapsed_logical_time = lf_time_logical_elapsed();
     printf("Logical time since start: \%lld nsec.\n",
-        elapsed_logical_time
+      elapsed_logical_time
     );
     if (elapsed_logical_time < self->expected_time) {
-        printf("ERROR: Expected logical time to be at least: \%lld nsec.\n",
-            self->expected_time
-        );
-        exit(1);
+      printf("ERROR: Expected logical time to be at least: \%lld nsec.\n",
+        self->expected_time
+      );
+      exit(1);
     }
     self->interval += MSEC(100);
     self->expected_time = MSEC(100) + self->interval;
@@ -37,9 +37,9 @@ main reactor SlowingClockPhysical {
 
   reaction(shutdown) {=
     if (self->expected_time < MSEC(500)) {
-        printf("ERROR: Expected the next expected time to be at least: 500000000 nsec.\n");
-        printf("It was: \%lld nsec.\n", self->expected_time);
-        exit(2);
+      printf("ERROR: Expected the next expected time to be at least: 500000000 nsec.\n");
+      printf("It was: \%lld nsec.\n", self->expected_time);
+      exit(2);
     }
   =}
 }
diff --git a/test/C/src/StartupOutFromInside.lf b/test/C/src/StartupOutFromInside.lf
index 1e9a8a822a..6233e0968f 100644
--- a/test/C/src/StartupOutFromInside.lf
+++ b/test/C/src/StartupOutFromInside.lf
@@ -12,8 +12,8 @@ main reactor StartupOutFromInside {
   reaction(startup) bar.out {=
     printf("Output from bar: %d\n", bar.out->value);
     if (bar.out->value != 42) {
-        fprintf(stderr, "Expected 42!\n");
-        exit(1);
+      fprintf(stderr, "Expected 42!\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/Starvation.lf b/test/C/src/Starvation.lf
index da56c2d4f7..83647fd0fa 100644
--- a/test/C/src/Starvation.lf
+++ b/test/C/src/Starvation.lf
@@ -13,7 +13,7 @@ reactor SuperDenseSender(number_of_iterations: int = 10) {
 
   reaction(startup, loop) -> out {=
     if (self->iterator < self->number_of_iterations) {
-        lf_schedule(loop, 0);
+      lf_schedule(loop, 0);
     }
     self->iterator++;
     lf_set(out, 42);
@@ -22,14 +22,14 @@ reactor SuperDenseSender(number_of_iterations: int = 10) {
   reaction(shutdown) {=
     tag_t current_tag = lf_tag();
     if (current_tag.time == lf_time_start()
-        && current_tag.microstep == self->number_of_iterations + 1) {
-        printf("SUCCESS: Sender successfully detected starvation.\n");
+      && current_tag.microstep == self->number_of_iterations + 1) {
+      printf("SUCCESS: Sender successfully detected starvation.\n");
     } else {
-        fprintf(stderr, "ERROR: Failed to properly enforce starvation at sender. "
-                        "Shutting down at tag (%lld, %u).\n",
-                         current_tag.time - lf_time_start(),
-                         current_tag.microstep);
-        exit(1);
+      fprintf(stderr, "ERROR: Failed to properly enforce starvation at sender. "
+              "Shutting down at tag (%lld, %u).\n",
+               current_tag.time - lf_time_start(),
+               current_tag.microstep);
+      exit(1);
     }
   =}
 }
@@ -40,22 +40,22 @@ reactor SuperDenseReceiver(number_of_iterations: int = 10) {
   reaction(in) {=
     tag_t current_tag = lf_tag();
     printf("Received %d at tag (%lld, %u).\n",
-            in->value,
-            current_tag.time - lf_time_start(),
-            current_tag.microstep);
+        in->value,
+        current_tag.time - lf_time_start(),
+        current_tag.microstep);
   =}
 
   reaction(shutdown) {=
     tag_t current_tag = lf_tag();
     if (current_tag.time == lf_time_start()
-        && current_tag.microstep == self->number_of_iterations + 1) {
-        printf("SUCCESS: Receiver successfully detected starvation.\n");
+      && current_tag.microstep == self->number_of_iterations + 1) {
+      printf("SUCCESS: Receiver successfully detected starvation.\n");
     } else {
-        fprintf(stderr, "ERROR: Failed to properly enforce starvation at receiver. "
-                        "Shutting down at tag (%lld, %u).\n",
-                         current_tag.time - lf_time_start(),
-                         current_tag.microstep);
-        exit(1);
+      fprintf(stderr, "ERROR: Failed to properly enforce starvation at receiver. "
+              "Shutting down at tag (%lld, %u).\n",
+               current_tag.time - lf_time_start(),
+               current_tag.microstep);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/Stop.lf b/test/C/src/Stop.lf
index a9586ecee7..2dbdf217ba 100644
--- a/test/C/src/Stop.lf
+++ b/test/C/src/Stop.lf
@@ -16,19 +16,19 @@ reactor Consumer {
   reaction(in) {=
     tag_t current_tag = lf_tag();
     if (lf_tag_compare(current_tag,
-                     (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 9}) > 0) {
-        // The reaction should not have been called at tags larger than (10 msec, 9)
-        fprintf(stderr, "ERROR: Invoked reaction(in) at tag bigger than shutdown.\n");
-        exit(1);
+             (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 9}) > 0) {
+      // The reaction should not have been called at tags larger than (10 msec, 9)
+      fprintf(stderr, "ERROR: Invoked reaction(in) at tag bigger than shutdown.\n");
+      exit(1);
     } else if (lf_tag_compare(current_tag,
-                     (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 8}) == 0) {
-        // Call lf_request_stop() at relative tag (10 msec, 8)
-        printf("Requesting stop.\n");
-        lf_request_stop();
+             (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 8}) == 0) {
+      // Call lf_request_stop() at relative tag (10 msec, 8)
+      printf("Requesting stop.\n");
+      lf_request_stop();
     } else if (lf_tag_compare(current_tag,
-                     (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 9}) == 0) {
-        // Check that this reaction is indeed also triggered at (10 msec, 9)
-        self->reaction_invoked_correctly = true;
+             (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 9}) == 0) {
+      // Check that this reaction is indeed also triggered at (10 msec, 9)
+      self->reaction_invoked_correctly = true;
     }
   =}
 
@@ -37,19 +37,19 @@ reactor Consumer {
     printf("Shutdown invoked at tag (%lld, %u).\n", current_tag.time - lf_time_start(), current_tag.microstep);
     // Check to see if shutdown is called at relative tag (10 msec, 9)
     if (lf_tag_compare(current_tag,
-        (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 9}) == 0 &&
-        self->reaction_invoked_correctly == true) {
-        printf("SUCCESS: successfully enforced stop.\n");
+      (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 9}) == 0 &&
+      self->reaction_invoked_correctly == true) {
+      printf("SUCCESS: successfully enforced stop.\n");
     } else if(lf_tag_compare(current_tag,
-        (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 9}) > 0) {
-        fprintf(stderr,"ERROR: Shutdown invoked at tag (%llu, %d). Failed to enforce timeout.\n",
-                        current_tag.time - lf_time_start(), current_tag.microstep);
-        exit(1);
+      (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 9}) > 0) {
+      fprintf(stderr,"ERROR: Shutdown invoked at tag (%llu, %d). Failed to enforce timeout.\n",
+              current_tag.time - lf_time_start(), current_tag.microstep);
+      exit(1);
     } else if (self->reaction_invoked_correctly == false) {
-        // Check to see if reactions were called correctly
-        fprintf(stderr,"ERROR: Failed to invoke reaction(in) at tag (%llu, %d).\n",
-                        current_tag.time - lf_time_start(), current_tag.microstep);
-        exit(1);
+      // Check to see if reactions were called correctly
+      fprintf(stderr,"ERROR: Failed to invoke reaction(in) at tag (%llu, %d).\n",
+              current_tag.time - lf_time_start(), current_tag.microstep);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/StopZero.lf b/test/C/src/StopZero.lf
index ad22467a89..b135204a5a 100644
--- a/test/C/src/StopZero.lf
+++ b/test/C/src/StopZero.lf
@@ -14,23 +14,23 @@ reactor Sender {
 
   reaction(t) -> out, act {=
     printf("Sending 42 at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
     lf_set(out, 42);
     lf_schedule(act, 0);
     tag_t zero = (tag_t) { .time = lf_time_start(), .microstep = 0u };
     tag_t one = (tag_t) { .time = lf_time_start(), .microstep = 1u };
     if (lf_tag_compare(lf_tag(), zero) == 0) {
-        // Request stop at (0,0)
-        printf("Requesting stop at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
-        lf_request_stop();
+      // Request stop at (0,0)
+      printf("Requesting stop at (%lld, %u).\n",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
+      lf_request_stop();
     } else if (lf_tag_compare(lf_tag(), one) > 0) {
-        fprintf(stderr, "ERROR: Reaction called after shutdown at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
-        exit(1);
+      fprintf(stderr, "ERROR: Reaction called after shutdown at (%lld, %u).\n",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
+      exit(1);
     }
   =}
 
@@ -38,28 +38,28 @@ reactor Sender {
     // Reaction should be invoked at (0,1)
     tag_t one = (tag_t) { .time = lf_time_start(), .microstep = 1u };
     if (lf_tag_compare(lf_tag(), one) == 0) {
-        self->reaction_invoked_correctly = true;
+      self->reaction_invoked_correctly = true;
     }
   =}
 
   reaction(shutdown) {=
     if (lf_time_logical_elapsed() != USEC(0) ||
-        lf_tag().microstep != 1) {
-        fprintf(stderr, "ERROR: Sender failed to stop the program in time. "
-                "Stopping at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
-        exit(1);
+      lf_tag().microstep != 1) {
+      fprintf(stderr, "ERROR: Sender failed to stop the program in time. "
+          "Stopping at (%lld, %u).\n",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
+      exit(1);
     } else if (self->reaction_invoked_correctly == false) {
-        fprintf(stderr, "ERROR: Sender reaction(act) was not invoked. "
-                "Stopping at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
-        exit(1);
+      fprintf(stderr, "ERROR: Sender reaction(act) was not invoked. "
+          "Stopping at (%lld, %u).\n",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
+      exit(1);
     }
     printf("SUCCESS: Successfully stopped the program at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
   =}
 }
 
@@ -68,16 +68,16 @@ reactor Receiver {
 
   reaction(in) {=
     printf("Received %d at (%lld, %u).\n",
-                 in->value,
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+           in->value,
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
     tag_t zero = (tag_t) { .time = lf_time_start(), .microstep = 0u };
     if (lf_tag_compare(lf_tag(), zero) == 0) {
-        // Request stop at (0,0)
-        printf("Requesting stop at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
-        lf_request_stop();
+      // Request stop at (0,0)
+      printf("Requesting stop at (%lld, %u).\n",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
+      lf_request_stop();
     }
   =}
 
@@ -85,16 +85,16 @@ reactor Receiver {
     // Shutdown events must occur at (0, 1) on the
     // receiver.
     if (lf_time_logical_elapsed() != USEC(0) ||
-        lf_tag().microstep != 1) {
-        fprintf(stderr, "ERROR: Receiver failed to stop the program in time. "
-                "Stopping at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
-        exit(1);
+      lf_tag().microstep != 1) {
+      fprintf(stderr, "ERROR: Receiver failed to stop the program in time. "
+          "Stopping at (%lld, %u).\n",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
+      exit(1);
     }
     printf("SUCCESS: Successfully stopped the program at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
   =}
 }
 
diff --git a/test/C/src/Stride.lf b/test/C/src/Stride.lf
index c4721a9f0f..dde49e6ef1 100644
--- a/test/C/src/Stride.lf
+++ b/test/C/src/Stride.lf
@@ -23,7 +23,7 @@ reactor Display {
   reaction(x) {=
     printf("Received: %d.\n", x->value);
     if (x->value != self->expected) {
-        fprintf(stderr, "ERROR: Expected %d\n", self->expected);
+      fprintf(stderr, "ERROR: Expected %d\n", self->expected);
     }
     self->expected += 2;
   =}
diff --git a/test/C/src/StructAsState.lf b/test/C/src/StructAsState.lf
index c26429e1a7..16cb8ea86a 100644
--- a/test/C/src/StructAsState.lf
+++ b/test/C/src/StructAsState.lf
@@ -3,8 +3,8 @@ target C
 
 preamble {=
   typedef struct hello_t {
-      char* name;
-      int value;
+    char* name;
+    int value;
   } hello_t;
 =}
 
@@ -14,8 +14,8 @@ main reactor StructAsState {
   reaction(startup) {=
     printf("State s.name=\"%s\", value=%d.\n", self->s.name, self->s.value);
     if (self->s.value != 42) {
-        fprintf(stderr, "FAILED: Expected 42.\n");
-        exit(1);
+      fprintf(stderr, "FAILED: Expected 42.\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/StructAsType.lf b/test/C/src/StructAsType.lf
index bf7efbae41..f62ad18f24 100644
--- a/test/C/src/StructAsType.lf
+++ b/test/C/src/StructAsType.lf
@@ -30,8 +30,8 @@ reactor Print(expected: int = 42) {
   reaction(in) {=
     printf("Received: name = %s, value = %d\n", in->value.name, in->value.value);
     if (in->value.value != self->expected) {
-        printf("ERROR: Expected value to be %d.\n", self->expected);
-        exit(1);
+      printf("ERROR: Expected value to be %d.\n", self->expected);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/StructAsTypeDirect.lf b/test/C/src/StructAsTypeDirect.lf
index 4a7832ec68..d801455601 100644
--- a/test/C/src/StructAsTypeDirect.lf
+++ b/test/C/src/StructAsTypeDirect.lf
@@ -24,8 +24,8 @@ reactor Print(expected: int = 42) {
   reaction(in) {=
     printf("Received: name = %s, value = %d\n", in->value.name, in->value.value);
     if (in->value.value != self->expected) {
-        printf("ERROR: Expected value to be %d.\n", self->expected);
-        exit(1);
+      printf("ERROR: Expected value to be %d.\n", self->expected);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/StructParallel.lf b/test/C/src/StructParallel.lf
index 60c5cf3ce3..78f3543713 100644
--- a/test/C/src/StructParallel.lf
+++ b/test/C/src/StructParallel.lf
@@ -18,16 +18,16 @@ reactor Check(expected: int = 42) {
   reaction(in) {=
     printf("Received: name = %s, value = %d\n", in->value->name, in->value->value);
     if (in->value->value != self->expected) {
-        printf("ERROR: Expected value to be %d.\n", self->expected);
-        exit(1);
+      printf("ERROR: Expected value to be %d.\n", self->expected);
+      exit(1);
     }
     self->invoked = true;
   =}
 
   reaction(shutdown) {=
     if (self->invoked == false) {
-        fprintf(stderr, "ERROR: No data received.\n");
-        exit(2);
+      fprintf(stderr, "ERROR: No data received.\n");
+      exit(2);
     }
   =}
 }
diff --git a/test/C/src/StructPrint.lf b/test/C/src/StructPrint.lf
index 10bea74d49..dd3bd3b96f 100644
--- a/test/C/src/StructPrint.lf
+++ b/test/C/src/StructPrint.lf
@@ -27,8 +27,8 @@ reactor Check(expected: int = 42) {
   reaction(in) {=
     printf("Received: name = %s, value = %d\n", in->value->name, in->value->value);
     if (in->value->value != self->expected) {
-        printf("ERROR: Expected value to be %d.\n", self->expected);
-        exit(1);
+      printf("ERROR: Expected value to be %d.\n", self->expected);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/StructScale.lf b/test/C/src/StructScale.lf
index 038410a350..4a5dd2d79e 100644
--- a/test/C/src/StructScale.lf
+++ b/test/C/src/StructScale.lf
@@ -29,16 +29,16 @@ reactor TestInput(expected: int = 42) {
   reaction(in) {=
     printf("Received: name = %s, value = %d\n", in->value->name, in->value->value);
     if (in->value->value != self->expected) {
-        printf("ERROR: Expected value to be %d.\n", self->expected);
-        exit(1);
+      printf("ERROR: Expected value to be %d.\n", self->expected);
+      exit(1);
     }
     self->invoked = true;
   =}
 
   reaction(shutdown) {=
     if (self->invoked == false) {
-        fprintf(stderr, "ERROR: No data received.\n");
-        exit(2);
+      fprintf(stderr, "ERROR: No data received.\n");
+      exit(2);
     }
   =}
 }
diff --git a/test/C/src/SubclassesAndStartup.lf b/test/C/src/SubclassesAndStartup.lf
index 46e184e378..77fbc72946 100644
--- a/test/C/src/SubclassesAndStartup.lf
+++ b/test/C/src/SubclassesAndStartup.lf
@@ -10,8 +10,8 @@ reactor Super {
 
   reaction(shutdown) {=
     if (self->count == 0) {
-        fprintf(stderr, "No startup reaction was invoked!\n");
-        exit(3);
+      fprintf(stderr, "No startup reaction was invoked!\n");
+      exit(3);
     }
   =}
 }
@@ -20,8 +20,8 @@ reactor SubA(name: string = "SubA") extends Super {
   reaction(startup) {=
     printf("%s started\n", self->name);
     if (self->count == 0) {
-        fprintf(stderr, "Base class startup reaction was not invoked!\n");
-        exit(1);
+      fprintf(stderr, "Base class startup reaction was not invoked!\n");
+      exit(1);
     }
   =}
 }
@@ -30,8 +30,8 @@ reactor SubB(name: string = "SubB") extends Super {
   reaction(startup) {=
     printf("%s started\n", self->name);
     if (self->count == 0) {
-        fprintf(stderr, "Base class startup reaction was not invoked!\n");
-        exit(2);
+      fprintf(stderr, "Base class startup reaction was not invoked!\n");
+      exit(2);
     }
   =}
 }
diff --git a/test/C/src/TestForPreviousOutput.lf b/test/C/src/TestForPreviousOutput.lf
index 0151715df0..cd11767592 100644
--- a/test/C/src/TestForPreviousOutput.lf
+++ b/test/C/src/TestForPreviousOutput.lf
@@ -20,15 +20,15 @@ reactor Source {
     srand(time(0));
     // Randomly produce an output or not.
     if (rand() % 2) {
-        lf_set(out, 21);
+      lf_set(out, 21);
     }
   =}
 
   reaction(startup) -> out {=
     if (out->is_present) {
-        lf_set(out, 2 * out->value);
+      lf_set(out, 2 * out->value);
     } else {
-        lf_set(out, 42);
+      lf_set(out, 42);
     }
   =}
 }
@@ -39,8 +39,8 @@ reactor Sink {
   reaction(in) {=
     printf("Received %d.\n", in->value);
     if (in->value != 42) {
-        fprintf(stderr, "FAILED: Expected 42.\n");
-        exit(1);
+      fprintf(stderr, "FAILED: Expected 42.\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/TimeLimit.lf b/test/C/src/TimeLimit.lf
index 02f30d425f..4b1ea4f248 100644
--- a/test/C/src/TimeLimit.lf
+++ b/test/C/src/TimeLimit.lf
@@ -23,8 +23,8 @@ reactor Destination {
   reaction(x) {=
     // printf("%d\n", x->value);
     if (x->value != self->s) {
-        printf("Error: Expected %d and got %d.\n", self->s, x->value);
-        exit(1);
+      printf("Error: Expected %d and got %d.\n", self->s, x->value);
+      exit(1);
     }
     self->s++;
   =}
@@ -32,8 +32,8 @@ reactor Destination {
   reaction(shutdown) {=
     printf("**** shutdown reaction invoked.\n");
     if (self->s != 12) {
-        fprintf(stderr, "ERROR: Expected 12 but got %d.\n", self->s);
-        exit(1);
+      fprintf(stderr, "ERROR: Expected 12 but got %d.\n", self->s);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/Timeout.lf b/test/C/src/Timeout.lf
index e6198c4c13..00eaf1b9cd 100644
--- a/test/C/src/Timeout.lf
+++ b/test/C/src/Timeout.lf
@@ -16,13 +16,13 @@ reactor Consumer {
   reaction(in) {=
     tag_t current_tag = lf_tag();
     if (lf_tag_compare(current_tag,
-                     (tag_t) { .time = MSEC(11) + lf_time_start(), .microstep = 0}) > 0) {
-        fprintf(stderr,"ERROR: Tag (%lld, %d) received. Failed to enforce timeout.\n",
-                        current_tag.time, current_tag.microstep);
-        exit(1);
+             (tag_t) { .time = MSEC(11) + lf_time_start(), .microstep = 0}) > 0) {
+      fprintf(stderr,"ERROR: Tag (%lld, %d) received. Failed to enforce timeout.\n",
+              current_tag.time, current_tag.microstep);
+      exit(1);
     } else if (lf_tag_compare(current_tag,
-                     (tag_t) { .time = MSEC(11) + lf_time_start(), .microstep = 0}) == 0) {
-        self->success = true; // Successfully invoked the reaction at (timeout, 0)
+             (tag_t) { .time = MSEC(11) + lf_time_start(), .microstep = 0}) == 0) {
+      self->success = true; // Successfully invoked the reaction at (timeout, 0)
     }
   =}
 
@@ -30,13 +30,13 @@ reactor Consumer {
     tag_t current_tag = lf_tag();
     printf("Shutdown invoked at tag (%lld, %u).\n", current_tag.time - lf_time_start(), current_tag.microstep);
     if (lf_tag_compare(current_tag,
-        (tag_t) { .time = MSEC(11) + lf_time_start(), .microstep = 0}) == 0 &&
-        self->success == true) {
-        printf("SUCCESS: successfully enforced timeout.\n");
+      (tag_t) { .time = MSEC(11) + lf_time_start(), .microstep = 0}) == 0 &&
+      self->success == true) {
+      printf("SUCCESS: successfully enforced timeout.\n");
     } else {
-        fprintf(stderr,"ERROR: Shutdown invoked at tag (%llu, %d). Failed to enforce timeout.\n",
-                        current_tag.time, current_tag.microstep);
-        exit(1);
+      fprintf(stderr,"ERROR: Shutdown invoked at tag (%llu, %d). Failed to enforce timeout.\n",
+              current_tag.time, current_tag.microstep);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/TimeoutZero.lf b/test/C/src/TimeoutZero.lf
index 414a4460b0..a0ba757b30 100644
--- a/test/C/src/TimeoutZero.lf
+++ b/test/C/src/TimeoutZero.lf
@@ -16,13 +16,13 @@ reactor Consumer {
   reaction(in) {=
     tag_t current_tag = lf_tag();
     if (lf_tag_compare(current_tag,
-                     (tag_t) { .time = MSEC(0) + lf_time_start(), .microstep = 0}) > 0) {
-        fprintf(stderr,"ERROR: Tag (%lld, %d) received. Failed to enforce timeout.\n",
-                        current_tag.time, current_tag.microstep);
-        exit(1);
+             (tag_t) { .time = MSEC(0) + lf_time_start(), .microstep = 0}) > 0) {
+      fprintf(stderr,"ERROR: Tag (%lld, %d) received. Failed to enforce timeout.\n",
+              current_tag.time, current_tag.microstep);
+      exit(1);
     } else if (lf_tag_compare(current_tag,
-                     (tag_t) { .time = MSEC(0) + lf_time_start(), .microstep = 0}) == 0) {
-        self->success = true; // Successfully invoked the reaction at (timeout, 0)
+             (tag_t) { .time = MSEC(0) + lf_time_start(), .microstep = 0}) == 0) {
+      self->success = true; // Successfully invoked the reaction at (timeout, 0)
     }
   =}
 
@@ -30,13 +30,13 @@ reactor Consumer {
     tag_t current_tag = lf_tag();
     printf("Shutdown invoked at tag (%lld, %u).\n", current_tag.time - lf_time_start(), current_tag.microstep);
     if (lf_tag_compare(current_tag,
-        (tag_t) { .time = MSEC(0) + lf_time_start(), .microstep = 0}) == 0 &&
-        self->success == true) {
-        printf("SUCCESS: successfully enforced timeout.\n");
+      (tag_t) { .time = MSEC(0) + lf_time_start(), .microstep = 0}) == 0 &&
+      self->success == true) {
+      printf("SUCCESS: successfully enforced timeout.\n");
     } else {
-        fprintf(stderr,"ERROR: Shutdown invoked at tag (%llu, %d). Failed to enforce timeout.\n",
-                        current_tag.time, current_tag.microstep);
-        exit(1);
+      fprintf(stderr,"ERROR: Shutdown invoked at tag (%llu, %d). Failed to enforce timeout.\n",
+              current_tag.time, current_tag.microstep);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/ToReactionNested.lf b/test/C/src/ToReactionNested.lf
index 14be00164d..4a643d053c 100644
--- a/test/C/src/ToReactionNested.lf
+++ b/test/C/src/ToReactionNested.lf
@@ -19,18 +19,18 @@ main reactor {
 
   reaction(s.out) {=
     if (s.out->is_present) {
-        lf_print("Received %d.", s.out->value);
-        if (self->count != s.out->value) {
-            lf_print_error_and_exit("Expected %d.", self->count);
-        }
-        self->received = true;
+      lf_print("Received %d.", s.out->value);
+      if (self->count != s.out->value) {
+        lf_print_error_and_exit("Expected %d.", self->count);
+      }
+      self->received = true;
     }
     self->count++;
   =}
 
   reaction(shutdown) {=
     if (!self->received) {
-        lf_print_error_and_exit("No inputs present.");
+      lf_print_error_and_exit("No inputs present.");
     }
   =}
 }
diff --git a/test/C/src/TriggerDownstreamOnlyIfPresent2.lf b/test/C/src/TriggerDownstreamOnlyIfPresent2.lf
index 25eb13e564..c2ed6f1642 100644
--- a/test/C/src/TriggerDownstreamOnlyIfPresent2.lf
+++ b/test/C/src/TriggerDownstreamOnlyIfPresent2.lf
@@ -11,9 +11,9 @@ reactor Source {
 
   reaction(t) -> out {=
     if (self->count++ % 2 == 0) {
-        lf_set(out[0], self->count);
+      lf_set(out[0], self->count);
     } else {
-        lf_set(out[1], self->count);
+      lf_set(out[1], self->count);
     }
   =}
 }
@@ -23,8 +23,8 @@ reactor Destination {
 
   reaction(in) {=
     if (!in->is_present) {
-        fprintf(stderr, "Reaction to input of triggered even though all inputs are absent!\n");
-        exit(1);
+      fprintf(stderr, "Reaction to input of triggered even though all inputs are absent!\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/UnconnectedInput.lf b/test/C/src/UnconnectedInput.lf
index 88f7554149..71a141f158 100644
--- a/test/C/src/UnconnectedInput.lf
+++ b/test/C/src/UnconnectedInput.lf
@@ -32,8 +32,8 @@ reactor Print {
   reaction(in) {=
     printf("Received: %d.\n", in->value);
     if (in->value != self->expected) {
-        printf("ERROR: Expected %d.\n", self->expected);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->expected);
+      exit(1);
     }
     self->expected++;
   =}
diff --git a/test/C/src/Wcet.lf b/test/C/src/Wcet.lf
index 984f95244f..9e6f84be6a 100644
--- a/test/C/src/Wcet.lf
+++ b/test/C/src/Wcet.lf
@@ -20,9 +20,9 @@ reactor Work {
   reaction(in1, in2) -> out {=
     int ret;
     if (in1->value > 10) {
-        ret = in2->value * in1->value;
+      ret = in2->value * in1->value;
     } else {
-        ret = in2->value + in1->value;
+      ret = in2->value + in1->value;
     }
     lf_set(out, ret);
   =}
diff --git a/test/C/src/arduino/Fade.lf b/test/C/src/arduino/Fade.lf
index 5be1e79a79..2684ef2dd7 100644
--- a/test/C/src/arduino/Fade.lf
+++ b/test/C/src/arduino/Fade.lf
@@ -25,7 +25,7 @@ main reactor Fade {
     self->brightness += self->fadeAmount;
     // reverse the direction of the fading at the ends of the fade:
     if (self->brightness <= 0 || self->brightness >= 255) {
-        self->fadeAmount = -self->fadeAmount;
+      self->fadeAmount = -self->fadeAmount;
     }
   =}
 }
diff --git a/test/C/src/concurrent/AsyncCallback.lf b/test/C/src/concurrent/AsyncCallback.lf
index d43dbc2a90..b6f4d9c25c 100644
--- a/test/C/src/concurrent/AsyncCallback.lf
+++ b/test/C/src/concurrent/AsyncCallback.lf
@@ -24,20 +24,20 @@ preamble {=
 main reactor AsyncCallback {
   preamble {=
     void callback(void* a) {
-        // Schedule twice. If the action is not physical, these should
-        // get consolidated into a single action triggering. If it is,
-        // then they cause two separate triggerings with close but not
-        // equal time stamps. The minimum time between these is determined
-        // by the argument in the physical action definition.
-        lf_schedule(a, 0LL);
-        lf_schedule(a, 0LL);
+      // Schedule twice. If the action is not physical, these should
+      // get consolidated into a single action triggering. If it is,
+      // then they cause two separate triggerings with close but not
+      // equal time stamps. The minimum time between these is determined
+      // by the argument in the physical action definition.
+      lf_schedule(a, 0LL);
+      lf_schedule(a, 0LL);
     }
     // Simulate time passing before a callback occurs.
     void* take_time(void* a) {
-        instant_t sleep_time = 100000000;
-        lf_sleep(sleep_time);
-        callback(a);
-        return NULL;
+      instant_t sleep_time = 100000000;
+      lf_sleep(sleep_time);
+      callback(a);
+      return NULL;
     }
     lf_thread_t threadId;
   =}
@@ -57,16 +57,16 @@ main reactor AsyncCallback {
   reaction(a) {=
     instant_t elapsed_time = lf_time_logical_elapsed();
     printf("Asynchronous callback %d: Assigned logical time greater than start time by %lld nsec.\n",
-           self->i++, elapsed_time);
+         self->i++, elapsed_time);
     if (elapsed_time <= self->expected_time) {
-        printf("ERROR: Expected logical time to be larger than %lld.\n", self->expected_time);
-        exit(1);
+      printf("ERROR: Expected logical time to be larger than %lld.\n", self->expected_time);
+      exit(1);
     }
     if (self->toggle) {
-        self->toggle = false;
-        self->expected_time += 200000000LL;
+      self->toggle = false;
+      self->expected_time += 200000000LL;
     } else {
-        self->toggle = true;
+      self->toggle = true;
     }
   =}
 }
diff --git a/test/C/src/concurrent/AsyncCallbackDrop.lf b/test/C/src/concurrent/AsyncCallbackDrop.lf
index 245048d910..2281601e62 100644
--- a/test/C/src/concurrent/AsyncCallbackDrop.lf
+++ b/test/C/src/concurrent/AsyncCallbackDrop.lf
@@ -19,20 +19,20 @@ preamble {=
 main reactor {
   preamble {=
     void callback(void* a) {
-        // Schedule twice in rapid succession.
-        // The second value should be dropped because the
-        // timestamps will not be sufficiently separated.
-        // The minimum time between these is determined
-        // by the argument in the physical action definition.
-        lf_schedule_int(a, 0, 0);
-        lf_schedule_int(a, 0, 1);
+      // Schedule twice in rapid succession.
+      // The second value should be dropped because the
+      // timestamps will not be sufficiently separated.
+      // The minimum time between these is determined
+      // by the argument in the physical action definition.
+      lf_schedule_int(a, 0, 0);
+      lf_schedule_int(a, 0, 1);
     }
     // Simulate time passing before a callback occurs.
     void* take_time(void* a) {
-        instant_t sleep_time = 100000000;
-        lf_sleep(sleep_time);
-        callback(a);
-        return NULL;
+      instant_t sleep_time = 100000000;
+      lf_sleep(sleep_time);
+      callback(a);
+      return NULL;
     }
     lf_thread_t threadId;
   =}
@@ -53,18 +53,18 @@ main reactor {
     instant_t elapsed_time = lf_time_logical_elapsed();
     printf("Asynchronous callback %d: Assigned logical time greater than start time by %lld nsec.\n", self->i++, elapsed_time);
     if (elapsed_time <= self->expected_time) {
-        printf("ERROR: Expected logical time to be larger than %lld.\n", self->expected_time);
-        exit(1);
+      printf("ERROR: Expected logical time to be larger than %lld.\n", self->expected_time);
+      exit(1);
     }
     if (a->value != 0) {
-        printf("ERROR: Received: %d, expected 0 because the second event should have been dropped.\n", a->value);
-        exit(2);
+      printf("ERROR: Received: %d, expected 0 because the second event should have been dropped.\n", a->value);
+      exit(2);
     }
     if (self->toggle) {
-        self->toggle = false;
-        self->expected_time += 200000000LL;
+      self->toggle = false;
+      self->expected_time += 200000000LL;
     } else {
-        self->toggle = true;
+      self->toggle = true;
     }
   =}
 }
diff --git a/test/C/src/concurrent/AsyncCallbackReplace.lf b/test/C/src/concurrent/AsyncCallbackReplace.lf
index 2809012ac9..4581e38fb9 100644
--- a/test/C/src/concurrent/AsyncCallbackReplace.lf
+++ b/test/C/src/concurrent/AsyncCallbackReplace.lf
@@ -19,20 +19,20 @@ preamble {=
 main reactor {
   preamble {=
     void callback(void* a) {
-        // Schedule twice in rapid succession.
-        // The second value should be dropped because the
-        // timestamps will not be sufficiently separated.
-        // The minimum time between these is determined
-        // by the argument in the physical action definition.
-        lf_schedule_int(a, 0, 0);
-        lf_schedule_int(a, 0, 1);
+      // Schedule twice in rapid succession.
+      // The second value should be dropped because the
+      // timestamps will not be sufficiently separated.
+      // The minimum time between these is determined
+      // by the argument in the physical action definition.
+      lf_schedule_int(a, 0, 0);
+      lf_schedule_int(a, 0, 1);
     }
     // Simulate time passing before a callback occurs.
     void* take_time(void* a) {
-        instant_t sleep_time = 100000000;
-        lf_sleep(sleep_time);
-        callback(a);
-        return NULL;
+      instant_t sleep_time = 100000000;
+      lf_sleep(sleep_time);
+      callback(a);
+      return NULL;
     }
     lf_thread_t threadId;
   =}
@@ -53,18 +53,18 @@ main reactor {
     instant_t elapsed_time = lf_time_logical_elapsed();
     printf("Asynchronous callback %d: Assigned logical time greater than start time by %lld nsec.\n", self->i++, elapsed_time);
     if (elapsed_time <= self->expected_time) {
-        printf("ERROR: Expected logical time to be larger than %lld.\n", self->expected_time);
-        exit(1);
+      printf("ERROR: Expected logical time to be larger than %lld.\n", self->expected_time);
+      exit(1);
     }
     if (a->value != 1) {
-        printf("ERROR: Received: %d, expected 1 because the second event should have replaced the first.\n", a->value);
-        exit(2);
+      printf("ERROR: Received: %d, expected 1 because the second event should have replaced the first.\n", a->value);
+      exit(2);
     }
     if (self->toggle) {
-        self->toggle = false;
-        self->expected_time += 200000000LL;
+      self->toggle = false;
+      self->expected_time += 200000000LL;
     } else {
-        self->toggle = true;
+      self->toggle = true;
     }
   =}
 }
diff --git a/test/C/src/concurrent/CompositionThreaded.lf b/test/C/src/concurrent/CompositionThreaded.lf
index ed40610e62..f7f2e959f6 100644
--- a/test/C/src/concurrent/CompositionThreaded.lf
+++ b/test/C/src/concurrent/CompositionThreaded.lf
@@ -23,8 +23,8 @@ reactor Test {
     (self->count)++;
     printf("Received %d\n", x->value);
     if (x->value != self->count) {
-        printf("FAILURE: Expected %d\n", self->count);
-        exit(1);
+      printf("FAILURE: Expected %d\n", self->count);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/concurrent/DeadlineHandledAboveThreaded.lf b/test/C/src/concurrent/DeadlineHandledAboveThreaded.lf
index 175745baa5..ec8a4a3322 100644
--- a/test/C/src/concurrent/DeadlineHandledAboveThreaded.lf
+++ b/test/C/src/concurrent/DeadlineHandledAboveThreaded.lf
@@ -36,17 +36,17 @@ main reactor {
 
   reaction(d.deadline_violation) {=
     if (d.deadline_violation) {
-        printf("Output successfully produced by deadline miss handler.\n");
-        self->violation_detected = true;
+      printf("Output successfully produced by deadline miss handler.\n");
+      self->violation_detected = true;
     }
   =}
 
   reaction(shutdown) {=
     if (self->violation_detected) {
-        printf("SUCCESS. Test passes.\n");
+      printf("SUCCESS. Test passes.\n");
     } else {
-        printf("FAILURE. Container did not react to deadline violation.\n");
-        exit(2);
+      printf("FAILURE. Container did not react to deadline violation.\n");
+      exit(2);
     }
   =}
 }
diff --git a/test/C/src/concurrent/DeadlineThreaded.lf b/test/C/src/concurrent/DeadlineThreaded.lf
index 0639d1e709..ac90b9865d 100644
--- a/test/C/src/concurrent/DeadlineThreaded.lf
+++ b/test/C/src/concurrent/DeadlineThreaded.lf
@@ -21,9 +21,9 @@ reactor Source(period: time = 3000 msec) {
 
   reaction(t) -> y {=
     if (2 * (self->count / 2) != self->count) {
-        // The count variable is odd.
-        // Take time to cause a deadline violation.
-        lf_sleep(MSEC(1100));
+      // The count variable is odd.
+      // Take time to cause a deadline violation.
+      lf_sleep(MSEC(1100));
     }
     printf("Source sends: %d.\n", self->count);
     lf_set(y, self->count);
@@ -38,17 +38,17 @@ reactor Destination(timeout: time = 1 sec) {
   reaction(x) {=
     printf("Destination receives: %d\n", x->value);
     if (2 * (self->count / 2) != self->count) {
-        // The count variable is odd, so the deadline should have been violated.
-        printf("ERROR: Failed to detect deadline.\n");
-        exit(1);
+      // The count variable is odd, so the deadline should have been violated.
+      printf("ERROR: Failed to detect deadline.\n");
+      exit(1);
     }
     (self->count)++;
   =} deadline(timeout) {=
     printf("Destination deadline handler receives: %d\n", x->value);
     if (2 * (self->count / 2) == self->count) {
-        // The count variable is even, so the deadline should not have been violated.
-        printf("ERROR: Unexpected deadline violation.\n");
-        exit(2);
+      // The count variable is even, so the deadline should not have been violated.
+      printf("ERROR: Unexpected deadline violation.\n");
+      exit(2);
     }
     (self->count)++;
   =}
diff --git a/test/C/src/concurrent/DelayIntThreaded.lf b/test/C/src/concurrent/DelayIntThreaded.lf
index 57d3987386..d328954454 100644
--- a/test/C/src/concurrent/DelayIntThreaded.lf
+++ b/test/C/src/concurrent/DelayIntThreaded.lf
@@ -32,20 +32,20 @@ reactor Test {
     interval_t elapsed = current_time - self->start_time;
     printf("After %lld nsec of logical time.\n", elapsed);
     if (elapsed != 100000000LL) {
-        printf("ERROR: Expected elapsed time to be 100000000. It was %lld.\n", elapsed);
-        exit(1);
+      printf("ERROR: Expected elapsed time to be 100000000. It was %lld.\n", elapsed);
+      exit(1);
     }
     if (in->value != 42) {
-        printf("ERROR: Expected input value to be 42. It was %d.\n", in->value);
-        exit(2);
+      printf("ERROR: Expected input value to be 42. It was %d.\n", in->value);
+      exit(2);
     }
   =}
 
   reaction(shutdown) {=
     printf("Checking that communication occurred.\n");
     if (!self->received_value) {
-        printf("ERROR: No communication occurred!\n");
-        exit(3);
+      printf("ERROR: No communication occurred!\n");
+      exit(3);
     }
   =}
 }
diff --git a/test/C/src/concurrent/DeterminismThreaded.lf b/test/C/src/concurrent/DeterminismThreaded.lf
index a0df17b15c..813405f25f 100644
--- a/test/C/src/concurrent/DeterminismThreaded.lf
+++ b/test/C/src/concurrent/DeterminismThreaded.lf
@@ -14,15 +14,15 @@ reactor Destination {
   reaction(x, y) {=
     int sum = 0;
     if (x->is_present) {
-        sum += x->value;
+      sum += x->value;
     }
     if (y->is_present) {
-        sum += y->value;
+      sum += y->value;
     }
     printf("Received %d.\n", sum);
     if (sum != 2) {
-        printf("FAILURE: Expected 2.\n");
-        exit(4);
+      printf("FAILURE: Expected 2.\n");
+      exit(4);
     }
   =}
 }
diff --git a/test/C/src/concurrent/DoubleReactionThreaded.lf b/test/C/src/concurrent/DoubleReactionThreaded.lf
index 25eeb9f846..69f8ea85c2 100644
--- a/test/C/src/concurrent/DoubleReactionThreaded.lf
+++ b/test/C/src/concurrent/DoubleReactionThreaded.lf
@@ -24,15 +24,15 @@ reactor Destination {
   reaction(x, w) {=
     int sum = 0;
     if (x->is_present) {
-        sum += x->value;
+      sum += x->value;
     }
     if (w->is_present) {
-        sum += w->value;
+      sum += w->value;
     }
     printf("Sum of inputs is: %d\n", sum);
     if (sum != self->s) {
-        printf("FAILURE: Expected sum to be %d, but it was %d.\n", self->s, sum);
-        exit(1);
+      printf("FAILURE: Expected sum to be %d, but it was %d.\n", self->s, sum);
+      exit(1);
     }
     self->s += 2;
   =}
diff --git a/test/C/src/concurrent/GainThreaded.lf b/test/C/src/concurrent/GainThreaded.lf
index f1407793bd..688a36eabd 100644
--- a/test/C/src/concurrent/GainThreaded.lf
+++ b/test/C/src/concurrent/GainThreaded.lf
@@ -16,16 +16,16 @@ reactor Test {
     printf("Received %d.\n", x->value);
     self->received_value = true;
     if (x->value != 2) {
-        printf("ERROR: Expected 2!\n");
-        exit(1);
+      printf("ERROR: Expected 2!\n");
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (!self->received_value) {
-        printf("ERROR: No value received by Test reactor!\n");
+      printf("ERROR: No value received by Test reactor!\n");
     } else {
-        printf("Test passes.\n");
+      printf("Test passes.\n");
     }
   =}
 }
diff --git a/test/C/src/concurrent/HelloThreaded.lf b/test/C/src/concurrent/HelloThreaded.lf
index de8d1f0d72..a1630610a6 100644
--- a/test/C/src/concurrent/HelloThreaded.lf
+++ b/test/C/src/concurrent/HelloThreaded.lf
@@ -32,15 +32,15 @@ reactor Reschedule(period: time = 2 sec, message: string = "Hello C") {
     printf("***** action %d at time %lld\n", self->count, lf_time_logical());
     // Check the a_has_value variable.
     if (a->has_value) {
-        printf("FAILURE: Expected a->has_value to be false, but it was true.\n");
-        exit(2);
+      printf("FAILURE: Expected a->has_value to be false, but it was true.\n");
+      exit(2);
     }
     long long time = lf_time_logical();
     if (time - self->previous_time != 200000000ll) {
-        printf("FAILURE: Expected 200ms of logical time to elapse but got %lld nanoseconds.\n",
-            time - self->previous_time
-        );
-        exit(1);
+      printf("FAILURE: Expected 200ms of logical time to elapse but got %lld nanoseconds.\n",
+        time - self->previous_time
+      );
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/concurrent/PingPongThreaded.lf b/test/C/src/concurrent/PingPongThreaded.lf
index 4d6532acdd..69d7b512a2 100644
--- a/test/C/src/concurrent/PingPongThreaded.lf
+++ b/test/C/src/concurrent/PingPongThreaded.lf
@@ -31,9 +31,9 @@ reactor Ping(count: int = 10) {
 
   reaction(receive) -> serve {=
     if (self->pingsLeft > 0) {
-        lf_schedule(serve, 0);
+      lf_schedule(serve, 0);
     } else {
-        lf_request_stop();
+      lf_request_stop();
     }
   =}
 }
@@ -50,10 +50,10 @@ reactor Pong(expected: int = 10) {
 
   reaction(shutdown) {=
     if (self->count != self->expected) {
-        fprintf(stderr, "Pong expected to receive %d inputs, but it received %d.\n",
-            self->expected, self->count
-        );
-        exit(1);
+      fprintf(stderr, "Pong expected to receive %d inputs, but it received %d.\n",
+        self->expected, self->count
+      );
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/concurrent/ScheduleAt.lf b/test/C/src/concurrent/ScheduleAt.lf
index f830d8375f..9e3610aee7 100644
--- a/test/C/src/concurrent/ScheduleAt.lf
+++ b/test/C/src/concurrent/ScheduleAt.lf
@@ -56,9 +56,9 @@ reactor Scheduler {
 
   reaction(startup) -> act {=
     for (int i=0; i < 16; i++) {
-        _lf_schedule_at_tag(act->_base.trigger,
-            (tag_t) { .time = self->times[i] + lf_time_logical(), .microstep = self->microstep_delay_list[i]},
-            NULL);
+      _lf_schedule_at_tag(act->_base.trigger,
+        (tag_t) { .time = self->times[i] + lf_time_logical(), .microstep = self->microstep_delay_list[i]},
+        NULL);
     }
   =}
 
@@ -66,16 +66,16 @@ reactor Scheduler {
     microstep_t microstep = lf_tag().microstep;
     instant_t elapsed_time = lf_time_logical_elapsed();
     if (elapsed_time == self->action_hit_list_times[self->action_hit_list_index] &&
-        microstep == self->action_hit_list_microstep[self->action_hit_list_index]) {
-        self->action_hit_list_index++;
+      microstep == self->action_hit_list_microstep[self->action_hit_list_index]) {
+      self->action_hit_list_index++;
     }
     printf("Triggered at tag (%lld, %u).\n", elapsed_time, microstep);
   =}
 
   reaction(shutdown) {=
     if (self->action_hit_list_index != 9) {
-        fprintf(stderr, "ERROR: incorrect number of actions were correctly scheduled: %d.", self->action_hit_list_index);
-        exit(1);
+      fprintf(stderr, "ERROR: incorrect number of actions were correctly scheduled: %d.", self->action_hit_list_index);
+      exit(1);
     }
     printf("SUCCESS: successfully scheduled all the events.\n");
   =}
diff --git a/test/C/src/concurrent/ScheduleTwice.lf b/test/C/src/concurrent/ScheduleTwice.lf
index 06a1c2c1cb..747ecd067e 100644
--- a/test/C/src/concurrent/ScheduleTwice.lf
+++ b/test/C/src/concurrent/ScheduleTwice.lf
@@ -15,20 +15,20 @@ main reactor ScheduleTwice {
   reaction(a) {=
     printf("Received %d at tag(%lld, %u).\n", a->value, lf_time_logical_elapsed(), lf_tag().microstep);
     if (lf_tag().microstep == 0 && a->value != 42) {
-        fprintf(stderr, "ERROR: Expected 42 at microstep 0.\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Expected 42 at microstep 0.\n");
+      exit(1);
     }
     if (lf_tag().microstep == 1 && a->value != 84) {
-        fprintf(stderr, "ERROR: Expected 84 at microstep 1.\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Expected 84 at microstep 1.\n");
+      exit(1);
     }
     self->rc_count++;
   =}
 
   reaction(shutdown) {=
     if (self->rc_count < 2) {
-        fprintf(stderr, "Didn't see two events.\n");
-        exit(2);
+      fprintf(stderr, "Didn't see two events.\n");
+      exit(2);
     }
   =}
 }
diff --git a/test/C/src/concurrent/ScheduleTwiceThreaded.lf b/test/C/src/concurrent/ScheduleTwiceThreaded.lf
index d7e3d926f3..8365f28045 100644
--- a/test/C/src/concurrent/ScheduleTwiceThreaded.lf
+++ b/test/C/src/concurrent/ScheduleTwiceThreaded.lf
@@ -12,20 +12,20 @@ main reactor {
   reaction(a) {=
     printf("Received %d at tag(%lld, %u).\n", a->value, lf_time_logical_elapsed(), lf_tag().microstep);
     if (lf_tag().microstep == 0 && a->value != 42) {
-        fprintf(stderr, "ERROR: Expected 42 at microstep 0.\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Expected 42 at microstep 0.\n");
+      exit(1);
     }
     if (lf_tag().microstep == 1 && a->value != 84) {
-        fprintf(stderr, "ERROR: Expected 84 at microstep 1.\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Expected 84 at microstep 1.\n");
+      exit(1);
     }
     self->rc_count++;
   =}
 
   reaction(shutdown) {=
     if (self->rc_count < 2) {
-        fprintf(stderr, "Didn't see two events.\n");
-        exit(2);
+      fprintf(stderr, "Didn't see two events.\n");
+      exit(2);
     }
   =}
 }
diff --git a/test/C/src/concurrent/SendingInsideThreaded.lf b/test/C/src/concurrent/SendingInsideThreaded.lf
index e651f0fc69..0e0010e77f 100644
--- a/test/C/src/concurrent/SendingInsideThreaded.lf
+++ b/test/C/src/concurrent/SendingInsideThreaded.lf
@@ -12,8 +12,8 @@ reactor Printer {
   reaction(x) {=
     printf("Inside reactor received: %d\n", x->value);
     if (x->value != self->count) {
-        printf("FAILURE: Expected %d.\n", self->count);
-        exit(1);
+      printf("FAILURE: Expected %d.\n", self->count);
+      exit(1);
     }
     self->count++;
   =}
diff --git a/test/C/src/concurrent/StarvationThreaded.lf b/test/C/src/concurrent/StarvationThreaded.lf
index 5152b4daa0..a6d3206199 100644
--- a/test/C/src/concurrent/StarvationThreaded.lf
+++ b/test/C/src/concurrent/StarvationThreaded.lf
@@ -13,7 +13,7 @@ reactor SuperDenseSender(number_of_iterations: int = 10) {
 
   reaction(startup, loop) -> out {=
     if (self->iterator < self->number_of_iterations) {
-        lf_schedule(loop, 0);
+      lf_schedule(loop, 0);
     }
     self->iterator++;
     lf_set(out, 42);
@@ -22,14 +22,14 @@ reactor SuperDenseSender(number_of_iterations: int = 10) {
   reaction(shutdown) {=
     tag_t current_tag = lf_tag();
     if (current_tag.time == lf_time_start()
-        && current_tag.microstep == self->number_of_iterations + 1) {
-        printf("SUCCESS: Sender successfully detected starvation.\n");
+      && current_tag.microstep == self->number_of_iterations + 1) {
+      printf("SUCCESS: Sender successfully detected starvation.\n");
     } else {
-        fprintf(stderr, "ERROR: Failed to properly enforce starvation at sender. "
-                        "Shutting down at tag (%lld, %u).\n",
-                         current_tag.time - lf_time_start(),
-                         current_tag.microstep);
-        exit(1);
+      fprintf(stderr, "ERROR: Failed to properly enforce starvation at sender. "
+              "Shutting down at tag (%lld, %u).\n",
+               current_tag.time - lf_time_start(),
+               current_tag.microstep);
+      exit(1);
     }
   =}
 }
@@ -40,22 +40,22 @@ reactor SuperDenseReceiver(number_of_iterations: int = 10) {
   reaction(in) {=
     tag_t current_tag = lf_tag();
     printf("Received %d at tag (%lld, %u).\n",
-            in->value,
-            current_tag.time - lf_time_start(),
-            current_tag.microstep);
+        in->value,
+        current_tag.time - lf_time_start(),
+        current_tag.microstep);
   =}
 
   reaction(shutdown) {=
     tag_t current_tag = lf_tag();
     if (current_tag.time == lf_time_start()
-        && current_tag.microstep == self->number_of_iterations + 1) {
-        printf("SUCCESS: Receiver successfully detected starvation.\n");
+      && current_tag.microstep == self->number_of_iterations + 1) {
+      printf("SUCCESS: Receiver successfully detected starvation.\n");
     } else {
-        fprintf(stderr, "ERROR: Failed to properly enforce starvation at receiver. "
-                        "Shutting down at tag (%lld, %u).\n",
-                         current_tag.time - lf_time_start(),
-                         current_tag.microstep);
-        exit(1);
+      fprintf(stderr, "ERROR: Failed to properly enforce starvation at receiver. "
+              "Shutting down at tag (%lld, %u).\n",
+               current_tag.time - lf_time_start(),
+               current_tag.microstep);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/concurrent/StopThreaded.lf b/test/C/src/concurrent/StopThreaded.lf
index 3c00bff39f..f02e953111 100644
--- a/test/C/src/concurrent/StopThreaded.lf
+++ b/test/C/src/concurrent/StopThreaded.lf
@@ -18,22 +18,22 @@ reactor Consumer {
   reaction(in) {=
     tag_t current_tag = lf_tag();
     if (lf_tag_compare(current_tag,
-                     (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 9}) > 0) {
-        // The reaction should not have been called at tags larger than (10
-        // msec, 9)
-        char time[255];
-        lf_print_error_and_exit("Invoked reaction(in) at tag (%llu, %d) which is bigger than shutdown.",
-            current_tag.time - lf_time_start(), current_tag.microstep);
+             (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 9}) > 0) {
+      // The reaction should not have been called at tags larger than (10
+      // msec, 9)
+      char time[255];
+      lf_print_error_and_exit("Invoked reaction(in) at tag (%llu, %d) which is bigger than shutdown.",
+        current_tag.time - lf_time_start(), current_tag.microstep);
     } else if (lf_tag_compare(current_tag,
-                     (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 8}) == 0) {
-        // Call lf_request_stop() at relative tag (10 msec, 8)
-        lf_print("Requesting stop.");
-        lf_request_stop();
+             (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 8}) == 0) {
+      // Call lf_request_stop() at relative tag (10 msec, 8)
+      lf_print("Requesting stop.");
+      lf_request_stop();
     } else if (lf_tag_compare(current_tag,
-                     (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 9}) == 0) {
-        // Check that this reaction is indeed also triggered at (10 msec, 9)
-        // printf("Reaction invoked.\n");
-        self->reaction_invoked_correctly = true;
+             (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 9}) == 0) {
+      // Check that this reaction is indeed also triggered at (10 msec, 9)
+      // printf("Reaction invoked.\n");
+      self->reaction_invoked_correctly = true;
     }
   =}
 
@@ -42,17 +42,17 @@ reactor Consumer {
     lf_print("Shutdown invoked at tag (%lld, %u).", current_tag.time - lf_time_start(), current_tag.microstep);
     // Check to see if shutdown is called at relative tag (10 msec, 9)
     if (lf_tag_compare(current_tag,
-        (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 9}) == 0 &&
-        self->reaction_invoked_correctly == true) {
-        lf_print("SUCCESS: successfully enforced stop.");
+      (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 9}) == 0 &&
+      self->reaction_invoked_correctly == true) {
+      lf_print("SUCCESS: successfully enforced stop.");
     } else if(lf_tag_compare(current_tag,
-        (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 9}) > 0) {
-            lf_print_error_and_exit("Shutdown invoked at tag (%llu, %d). Failed to enforce timeout.",
-                        current_tag.time - lf_time_start(), current_tag.microstep);
+      (tag_t) { .time = MSEC(10) + lf_time_start(), .microstep = 9}) > 0) {
+        lf_print_error_and_exit("Shutdown invoked at tag (%llu, %d). Failed to enforce timeout.",
+              current_tag.time - lf_time_start(), current_tag.microstep);
     } else if (self->reaction_invoked_correctly == false) {
-        // Check to see if reactions were called correctly
-        lf_print_error_and_exit("Failed to invoke reaction(in) at tag (%llu, %d).",
-                        current_tag.time - lf_time_start(), current_tag.microstep);
+      // Check to see if reactions were called correctly
+      lf_print_error_and_exit("Failed to invoke reaction(in) at tag (%llu, %d).",
+              current_tag.time - lf_time_start(), current_tag.microstep);
     }
   =}
 }
diff --git a/test/C/src/concurrent/StopZeroThreaded.lf b/test/C/src/concurrent/StopZeroThreaded.lf
index 80713d15ac..4b1b29b4e7 100644
--- a/test/C/src/concurrent/StopZeroThreaded.lf
+++ b/test/C/src/concurrent/StopZeroThreaded.lf
@@ -13,23 +13,23 @@ reactor Sender {
 
   reaction(t) -> out, act {=
     printf("Sending 42 at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
     lf_set(out, 42);
     lf_schedule(act, 0);
     tag_t zero = (tag_t) { .time = lf_time_start(), .microstep = 0u };
     tag_t one = (tag_t) { .time = lf_time_start(), .microstep = 1u };
     if (lf_tag_compare(lf_tag(), zero) == 0) {
-        // Request stop at (0,0)
-        printf("Requesting stop at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
-        lf_request_stop();
+      // Request stop at (0,0)
+      printf("Requesting stop at (%lld, %u).\n",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
+      lf_request_stop();
     } else if (lf_tag_compare(lf_tag(), one) > 0) {
-        fprintf(stderr, "ERROR: Reaction called after shutdown at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
-        exit(1);
+      fprintf(stderr, "ERROR: Reaction called after shutdown at (%lld, %u).\n",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
+      exit(1);
     }
   =}
 
@@ -37,28 +37,28 @@ reactor Sender {
     // Reaction should be invoked at (0,1)
     tag_t one = (tag_t) { .time = lf_time_start(), .microstep = 1u };
     if (lf_tag_compare(lf_tag(), one) == 0) {
-        self->reaction_invoked_correctly = true;
+      self->reaction_invoked_correctly = true;
     }
   =}
 
   reaction(shutdown) {=
     if (lf_time_logical_elapsed() != USEC(0) ||
-        lf_tag().microstep != 1) {
-        fprintf(stderr, "ERROR: Sender failed to stop the program in time. "
-                "Stopping at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
-        exit(1);
+      lf_tag().microstep != 1) {
+      fprintf(stderr, "ERROR: Sender failed to stop the program in time. "
+          "Stopping at (%lld, %u).\n",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
+      exit(1);
     } else if (self->reaction_invoked_correctly == false) {
-        fprintf(stderr, "ERROR: Sender reaction(act) was not invoked. "
-                "Stopping at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
-        exit(1);
+      fprintf(stderr, "ERROR: Sender reaction(act) was not invoked. "
+          "Stopping at (%lld, %u).\n",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
+      exit(1);
     }
     printf("SUCCESS: Successfully stopped the program at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
   =}
 }
 
@@ -67,16 +67,16 @@ reactor Receiver {
 
   reaction(in) {=
     printf("Received %d at (%lld, %u).\n",
-                 in->value,
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+           in->value,
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
     tag_t zero = (tag_t) { .time = lf_time_start(), .microstep = 0u };
     if (lf_tag_compare(lf_tag(), zero) == 0) {
-        // Request stop at (0,0)
-        printf("Requesting stop at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
-        lf_request_stop();
+      // Request stop at (0,0)
+      printf("Requesting stop at (%lld, %u).\n",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
+      lf_request_stop();
     }
   =}
 
@@ -84,16 +84,16 @@ reactor Receiver {
     // Shutdown events must occur at (0, 1) on the
     // receiver.
     if (lf_time_logical_elapsed() != USEC(0) ||
-        lf_tag().microstep != 1) {
-        fprintf(stderr, "ERROR: Receiver failed to stop the program in time. "
-                "Stopping at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
-        exit(1);
+      lf_tag().microstep != 1) {
+      fprintf(stderr, "ERROR: Receiver failed to stop the program in time. "
+          "Stopping at (%lld, %u).\n",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
+      exit(1);
     }
     printf("SUCCESS: Successfully stopped the program at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
   =}
 }
 
diff --git a/test/C/src/concurrent/Threaded.lf b/test/C/src/concurrent/Threaded.lf
index 424c277053..88a9acd6b6 100644
--- a/test/C/src/concurrent/Threaded.lf
+++ b/test/C/src/concurrent/Threaded.lf
@@ -31,7 +31,7 @@ reactor TakeTime {
     // nanosleep(&sleep_time, &remaining_time);
     int offset = 0;
     for (int i = 0; i < 100000000; i++) {
-        offset++;
+      offset++;
     }
     lf_set(out, in->value + offset);
   =}
@@ -44,12 +44,12 @@ reactor Destination(width: int = 4) {
   reaction(in) {=
     int sum = 0;
     for (int i = 0; i < in_width; i++) {
-        sum += in[i]->value;
+      sum += in[i]->value;
     }
     printf("Sum of received: %d.\n", sum);
     if (sum != self->s) {
-        printf("ERROR: Expected %d.\n", self->s);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->s);
+      exit(1);
     }
     self->s += in_width;
   =}
diff --git a/test/C/src/concurrent/ThreadedMultiport.lf b/test/C/src/concurrent/ThreadedMultiport.lf
index c8b500dadd..6fce42f0e9 100644
--- a/test/C/src/concurrent/ThreadedMultiport.lf
+++ b/test/C/src/concurrent/ThreadedMultiport.lf
@@ -11,7 +11,7 @@ reactor Source(width: int = 4) {
 
   reaction(t) -> out {=
     for(int i = 0; i < out_width; i++) {
-        lf_set(out[i], self->s);
+      lf_set(out[i], self->s);
     }
     self->s++;
   =}
@@ -27,7 +27,7 @@ reactor Computation(iterations: int = 100000000) {
     // nanosleep(&sleep_time, &remaining_time);
     int offset = 0;
     for (int i = 0; i < self->iterations; i++) {
-        offset++;
+      offset++;
     }
     lf_set(out, in->value + offset);
   =}
@@ -41,20 +41,20 @@ reactor Destination(width: int = 4, iterations: int = 100000000) {
     int expected = self->iterations * self->width + self->s;
     int sum = 0;
     for (int i = 0; i < in_width; i++) {
-        if (in[i]->is_present) sum += in[i]->value;
+      if (in[i]->is_present) sum += in[i]->value;
     }
     printf("Sum of received: %d.\n", sum);
     if (sum != expected) {
-        printf("ERROR: Expected %d.\n", expected);
-        exit(1);
+      printf("ERROR: Expected %d.\n", expected);
+      exit(1);
     }
     self->s += self->width;
   =}
 
   reaction(shutdown) {=
     if (self->s == 0) {
-        fprintf(stderr, "ERROR: Destination received no input!\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Destination received no input!\n");
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/concurrent/ThreadedThreaded.lf b/test/C/src/concurrent/ThreadedThreaded.lf
index 10c869530b..0b011b3118 100644
--- a/test/C/src/concurrent/ThreadedThreaded.lf
+++ b/test/C/src/concurrent/ThreadedThreaded.lf
@@ -31,7 +31,7 @@ reactor TakeTime {
     // nanosleep(&sleep_time, &remaining_time);
     int offset = 0;
     for (int i = 0; i < 100000000; i++) {
-        offset++;
+      offset++;
     }
     lf_set(out, in->value + offset);
   =}
@@ -44,12 +44,12 @@ reactor Destination(width: int = 4) {
   reaction(in) {=
     int sum = 0;
     for (int i = 0; i < in_width; i++) {
-        sum += in[i]->value;
+      sum += in[i]->value;
     }
     printf("Sum of received: %d.\n", sum);
     if (sum != self->s) {
-        printf("ERROR: Expected %d.\n", self->s);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->s);
+      exit(1);
     }
     self->s += in_width;
   =}
diff --git a/test/C/src/concurrent/TimeLimitThreaded.lf b/test/C/src/concurrent/TimeLimitThreaded.lf
index eed307999a..8ada5f42f5 100644
--- a/test/C/src/concurrent/TimeLimitThreaded.lf
+++ b/test/C/src/concurrent/TimeLimitThreaded.lf
@@ -23,8 +23,8 @@ reactor Destination {
   reaction(x) {=
     // printf("%d\n", x->value);
     if (x->value != self->s) {
-        printf("Error: Expected %d and got %d.\n", self->s, x->value);
-        exit(1);
+      printf("Error: Expected %d and got %d.\n", self->s, x->value);
+      exit(1);
     }
     self->s++;
   =}
@@ -32,8 +32,8 @@ reactor Destination {
   reaction(shutdown) {=
     printf("**** shutdown reaction invoked.\n");
     if (self->s != 12) {
-        fprintf(stderr, "ERROR: Expected 12 but got %d.\n", self->s);
-        exit(1);
+      fprintf(stderr, "ERROR: Expected 12 but got %d.\n", self->s);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/concurrent/TimeoutThreaded.lf b/test/C/src/concurrent/TimeoutThreaded.lf
index fe733bef56..0a8fc63d2a 100644
--- a/test/C/src/concurrent/TimeoutThreaded.lf
+++ b/test/C/src/concurrent/TimeoutThreaded.lf
@@ -16,13 +16,13 @@ reactor Consumer {
   reaction(in) {=
     tag_t current_tag = lf_tag();
     if (lf_tag_compare(current_tag,
-                     (tag_t) { .time = MSEC(11) + lf_time_start(), .microstep = 0}) > 0) {
-        fprintf(stderr,"ERROR: Tag (%lld, %d) received. Failed to enforce timeout.\n",
-                        current_tag.time, current_tag.microstep);
-        exit(1);
+             (tag_t) { .time = MSEC(11) + lf_time_start(), .microstep = 0}) > 0) {
+      fprintf(stderr,"ERROR: Tag (%lld, %d) received. Failed to enforce timeout.\n",
+              current_tag.time, current_tag.microstep);
+      exit(1);
     } else if (lf_tag_compare(current_tag,
-                     (tag_t) { .time = MSEC(11) + lf_time_start(), .microstep = 0}) == 0) {
-        self->success = true; // Successfully invoked the reaction at (timeout, 0)
+             (tag_t) { .time = MSEC(11) + lf_time_start(), .microstep = 0}) == 0) {
+      self->success = true; // Successfully invoked the reaction at (timeout, 0)
     }
   =}
 
@@ -30,13 +30,13 @@ reactor Consumer {
     tag_t current_tag = lf_tag();
     printf("Shutdown invoked at tag (%lld, %u).\n", current_tag.time - lf_time_start(), current_tag.microstep);
     if (lf_tag_compare(current_tag,
-        (tag_t) { .time = MSEC(11) + lf_time_start(), .microstep = 0}) == 0 &&
-        self->success == true) {
-        printf("SUCCESS: successfully enforced timeout.\n");
+      (tag_t) { .time = MSEC(11) + lf_time_start(), .microstep = 0}) == 0 &&
+      self->success == true) {
+      printf("SUCCESS: successfully enforced timeout.\n");
     } else {
-        fprintf(stderr,"ERROR: Shutdown invoked at tag (%llu, %d). Failed to enforce timeout.\n",
-                        current_tag.time - lf_time_start(), current_tag.microstep);
-        exit(1);
+      fprintf(stderr,"ERROR: Shutdown invoked at tag (%llu, %d). Failed to enforce timeout.\n",
+              current_tag.time - lf_time_start(), current_tag.microstep);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/concurrent/TimeoutZeroThreaded.lf b/test/C/src/concurrent/TimeoutZeroThreaded.lf
index 5a33aa3c4c..301a144c84 100644
--- a/test/C/src/concurrent/TimeoutZeroThreaded.lf
+++ b/test/C/src/concurrent/TimeoutZeroThreaded.lf
@@ -17,13 +17,13 @@ reactor Consumer {
   reaction(in) {=
     tag_t current_tag = lf_tag();
     if (lf_tag_compare(current_tag,
-                     (tag_t) { .time = MSEC(0) + lf_time_start(), .microstep = 0}) > 0) {
-        fprintf(stderr,"ERROR: Tag (%lld, %d) received. Failed to enforce timeout.\n",
-                        current_tag.time - lf_time_start(), current_tag.microstep);
-        exit(1);
+             (tag_t) { .time = MSEC(0) + lf_time_start(), .microstep = 0}) > 0) {
+      fprintf(stderr,"ERROR: Tag (%lld, %d) received. Failed to enforce timeout.\n",
+              current_tag.time - lf_time_start(), current_tag.microstep);
+      exit(1);
     } else if (lf_tag_compare(current_tag,
-                     (tag_t) { .time = MSEC(0) + lf_time_start(), .microstep = 0}) == 0) {
-        self->success = true; // Successfully invoked the reaction at (timeout, 0)
+             (tag_t) { .time = MSEC(0) + lf_time_start(), .microstep = 0}) == 0) {
+      self->success = true; // Successfully invoked the reaction at (timeout, 0)
     }
   =}
 
@@ -31,13 +31,13 @@ reactor Consumer {
     tag_t current_tag = lf_tag();
     printf("Shutdown invoked at tag (%lld, %u).\n", current_tag.time - lf_time_start(), current_tag.microstep);
     if (lf_tag_compare(current_tag,
-        (tag_t) { .time = MSEC(0) + lf_time_start(), .microstep = 0}) == 0 &&
-        self->success == true) {
-        printf("SUCCESS: successfully enforced timeout.\n");
+      (tag_t) { .time = MSEC(0) + lf_time_start(), .microstep = 0}) == 0 &&
+      self->success == true) {
+      printf("SUCCESS: successfully enforced timeout.\n");
     } else {
-        fprintf(stderr,"ERROR: Shutdown invoked at tag (%llu, %d). Failed to enforce timeout.\n",
-                        current_tag.time - lf_time_start(), current_tag.microstep);
-        exit(1);
+      fprintf(stderr,"ERROR: Shutdown invoked at tag (%llu, %d). Failed to enforce timeout.\n",
+              current_tag.time - lf_time_start(), current_tag.microstep);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/concurrent/Tracing.lf b/test/C/src/concurrent/Tracing.lf
index 5ff0d68bbf..c5328515aa 100644
--- a/test/C/src/concurrent/Tracing.lf
+++ b/test/C/src/concurrent/Tracing.lf
@@ -35,8 +35,8 @@ reactor TakeTime(bank_index: int = 0) {
 
     // Register the user trace event.
     if (!register_user_trace_event(self->event)) {
-        fprintf(stderr, "ERROR: Failed to register trace event.\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Failed to register trace event.\n");
+      exit(1);
     }
   =}
 
@@ -46,7 +46,7 @@ reactor TakeTime(bank_index: int = 0) {
     // nanosleep(&sleep_time, &remaining_time);
     int offset = 0;
     for (int i = 0; i < 100000000; i++) {
-        offset++;
+      offset++;
     }
     tracepoint_user_event(self->event);
     lf_set(out, in->value + offset);
@@ -68,8 +68,8 @@ reactor Destination(width: int = 4) {
   reaction(startup) {=
     // Register the user value event.
     if (!register_user_trace_event("Number of Destination invocations")) {
-        fprintf(stderr, "ERROR: Failed to register trace event.\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Failed to register trace event.\n");
+      exit(1);
     }
   =}
 
@@ -78,12 +78,12 @@ reactor Destination(width: int = 4) {
     tracepoint_user_value("Number of Destination invocations", self->count);
     int sum = 0;
     for (int i = 0; i < in_width; i++) {
-        sum += in[i]->value;
+      sum += in[i]->value;
     }
     printf("Sum of received: %d.\n", sum);
     if (sum != self->s) {
-        printf("ERROR: Expected %d.\n", self->s);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->s);
+      exit(1);
     }
     self->s += in_width;
   =}
diff --git a/test/C/src/concurrent/Workers.lf b/test/C/src/concurrent/Workers.lf
index 90dbecb468..369b6927ee 100644
--- a/test/C/src/concurrent/Workers.lf
+++ b/test/C/src/concurrent/Workers.lf
@@ -5,9 +5,9 @@ target C {
 main reactor {
   reaction(startup) {=
     if (NUMBER_OF_WORKERS != 16) {
-        lf_print_error_and_exit("Expected to have 16 workers.");
+      lf_print_error_and_exit("Expected to have 16 workers.");
     } else {
-        lf_print("Using 16 workers.");
+      lf_print("Using 16 workers.");
     }
   =}
 }
diff --git a/test/C/src/concurrent/failing/Watchdog.lf b/test/C/src/concurrent/failing/Watchdog.lf
index 93e0d2c4df..e38d98b045 100644
--- a/test/C/src/concurrent/failing/Watchdog.lf
+++ b/test/C/src/concurrent/failing/Watchdog.lf
@@ -17,29 +17,29 @@ reactor Watcher(timeout: time = 1500 ms) {
   state count: int = 0
 
   watchdog poodle(timeout) {=
-    instant_t p = lf_time_physical_elapsed();
-    lf_print("******** Watchdog timed out at elapsed physical time: " PRINTF_TIME, p);
-    self->count++;
+  instant_t p = lf_time_physical_elapsed();
+  lf_print("******** Watchdog timed out at elapsed physical time: " PRINTF_TIME, p);
+  self->count++;
   =}
 
   reaction(t) -> poodle, d {=
-    lf_watchdog_start(poodle, 0);
-    lf_print("Watchdog started at physical time " PRINTF_TIME, lf_time_physical_elapsed());
-    lf_print("Will expire at " PRINTF_TIME, lf_time_logical_elapsed() + self->timeout);
-    lf_set(d, 42);
+  lf_watchdog_start(poodle, 0);
+  lf_print("Watchdog started at physical time " PRINTF_TIME, lf_time_physical_elapsed());
+  lf_print("Will expire at " PRINTF_TIME, lf_time_logical_elapsed() + self->timeout);
+  lf_set(d, 42);
   =}
 
   reaction(poodle) -> d {=
-    lf_print("Reaction poodle was called.");
-    lf_set(d, 1);
+  lf_print("Reaction poodle was called.");
+  lf_set(d, 1);
   =}
 
   reaction(shutdown) -> poodle {=
-    lf_watchdog_stop(poodle);
-    // Watchdog may expire in tests even without the sleep, but it should at least expire twice.
-    if (self->count < 2) {
-        lf_print_error_and_exit("Watchdog expired %d times. Expected at least 2.", self->count);
-    }
+  lf_watchdog_stop(poodle);
+  // Watchdog may expire in tests even without the sleep, but it should at least expire twice.
+  if (self->count < 2) {
+    lf_print_error_and_exit("Watchdog expired %d times. Expected at least 2.", self->count);
+  }
   =}
 }
 
@@ -50,17 +50,17 @@ main reactor {
   w = new Watcher()
 
   reaction(w.d) {=
-    lf_print("Watcher reactor produced an output. %d", self->count % 2);
-    self->count++;
-    if (self->count % 4 == 0) {
-        lf_print(">>>>>> Taking a long time to process that output!");
-        lf_sleep(MSEC(1600));
-    }
+  lf_print("Watcher reactor produced an output. %d", self->count % 2);
+  self->count++;
+  if (self->count % 4 == 0) {
+    lf_print(">>>>>> Taking a long time to process that output!");
+    lf_sleep(MSEC(1600));
+  }
   =}
 
   reaction(shutdown) {=
-    if (self->count < 12) {
-        lf_print_error_and_exit("Watchdog produced output %d times. Expected at least 12.", self->count);
-    }
+  if (self->count < 12) {
+    lf_print_error_and_exit("Watchdog produced output %d times. Expected at least 12.", self->count);
+  }
   =}
 }
diff --git a/test/C/src/federated/BroadcastFeedback.lf b/test/C/src/federated/BroadcastFeedback.lf
index b1fa201ed5..179d49edc7 100644
--- a/test/C/src/federated/BroadcastFeedback.lf
+++ b/test/C/src/federated/BroadcastFeedback.lf
@@ -13,14 +13,14 @@ reactor SenderAndReceiver {
 
   reaction(in) {=
     if (in[0]->is_present && in[1]->is_present && in[0]->value == 42 && in[1]->value == 42) {
-        lf_print("SUCCESS");
-        self->received = true;
+      lf_print("SUCCESS");
+      self->received = true;
     }
   =}
 
   reaction(shutdown) {=
     if (!self->received == true) {
-        lf_print_error_and_exit("Failed to receive broadcast");
+      lf_print_error_and_exit("Failed to receive broadcast");
     }
   =}
 }
diff --git a/test/C/src/federated/BroadcastFeedbackWithHierarchy.lf b/test/C/src/federated/BroadcastFeedbackWithHierarchy.lf
index fe269ce401..9896c1fdf8 100644
--- a/test/C/src/federated/BroadcastFeedbackWithHierarchy.lf
+++ b/test/C/src/federated/BroadcastFeedbackWithHierarchy.lf
@@ -20,14 +20,14 @@ reactor Receiver {
 
   reaction(in) {=
     if (in[0]->is_present && in[1]->is_present && in[0]->value == 42 && in[1]->value == 42) {
-        lf_print("SUCCESS");
-        self->received = true;
+      lf_print("SUCCESS");
+      self->received = true;
     }
   =}
 
   reaction(shutdown) {=
     if (!self->received == true) {
-        lf_print_error_and_exit("Failed to receive broadcast");
+      lf_print_error_and_exit("Failed to receive broadcast");
     }
   =}
 }
diff --git a/test/C/src/federated/CycleDetection.lf b/test/C/src/federated/CycleDetection.lf
index 5e6b3b868d..175d03fa02 100644
--- a/test/C/src/federated/CycleDetection.lf
+++ b/test/C/src/federated/CycleDetection.lf
@@ -16,10 +16,10 @@ reactor CAReplica {
 
   reaction(local_update, remote_update) {=
     if (local_update->is_present) {
-        self->balance += local_update->value;
+      self->balance += local_update->value;
     }
     if (remote_update->is_present) {
-        self->balance += remote_update->value;
+      self->balance += remote_update->value;
     }
   =}
 
@@ -34,7 +34,7 @@ reactor UserInput {
 
   reaction(balance) {=
     if (balance->value != 200) {
-        lf_print_error_and_exit("Did not receive the expected balance. Expected: 200. Got: %d.", balance->value);
+      lf_print_error_and_exit("Did not receive the expected balance. Expected: 200. Got: %d.", balance->value);
     }
     lf_print("Balance: %d", balance->value);
     lf_request_stop();
diff --git a/test/C/src/federated/DecentralizedP2PComm.lf b/test/C/src/federated/DecentralizedP2PComm.lf
index 7dd9f6942f..63163bd98b 100644
--- a/test/C/src/federated/DecentralizedP2PComm.lf
+++ b/test/C/src/federated/DecentralizedP2PComm.lf
@@ -17,25 +17,25 @@ reactor Platform(start: int = 0, expected_start: int = 0, stp_offset_param: time
   reaction(in) {=
     lf_print("Received %d.", in->value);
     if (in->value != self->expected_start++) {
-        lf_print_error_and_exit("Expected %d but got %d.",
-            self->expected_start - 1,
-            in->value
-        );
+      lf_print_error_and_exit("Expected %d but got %d.",
+        self->expected_start - 1,
+        in->value
+      );
     }
   =} STP(stp_offset_param) {=
     lf_print("Received %d late.", in->value);
     tag_t current_tag = lf_tag();
     self->expected_start++;
     lf_print_error("STP offset was violated by (%lld, %u).",
-        current_tag.time - in->intended_tag.time,
-        current_tag.microstep - in->intended_tag.microstep
+      current_tag.time - in->intended_tag.time,
+      current_tag.microstep - in->intended_tag.microstep
     );
   =}
 
   reaction(shutdown) {=
     lf_print("Shutdown invoked.");
     if (self->expected == self->expected_start) {
-        lf_print_error_and_exit("Did not receive anything.");
+      lf_print_error_and_exit("Did not receive anything.");
     }
   =}
 }
diff --git a/test/C/src/federated/DecentralizedP2PUnbalancedTimeout.lf b/test/C/src/federated/DecentralizedP2PUnbalancedTimeout.lf
index aa616ab16b..0ebed39189 100644
--- a/test/C/src/federated/DecentralizedP2PUnbalancedTimeout.lf
+++ b/test/C/src/federated/DecentralizedP2PUnbalancedTimeout.lf
@@ -32,9 +32,9 @@ reactor Destination {
     lf_print("Received %d", x->value);
     tag_t current_tag = lf_tag();
     if (x->value != self->s) {
-        lf_print_error_and_exit("At tag (%lld, %u) expected %d and got %d.",
-            current_tag.time - lf_time_start(), current_tag.microstep, self->s, x->value
-        );
+      lf_print_error_and_exit("At tag (%lld, %u) expected %d and got %d.",
+        current_tag.time - lf_time_start(), current_tag.microstep, self->s, x->value
+      );
     }
     self->s++;
   =}
diff --git a/test/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf b/test/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf
index b18fb1cee9..356222a266 100644
--- a/test/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf
+++ b/test/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf
@@ -32,7 +32,7 @@ reactor Destination {
   reaction(x) {=
     // printf("%d\n", x->value);
     if (x->value != self->s) {
-        lf_print_error_and_exit("Expected %d and got %d.", self->s, x->value);
+      lf_print_error_and_exit("Expected %d and got %d.", self->s, x->value);
     }
     self->s++;
   =}
diff --git a/test/C/src/federated/DistributedBank.lf b/test/C/src/federated/DistributedBank.lf
index 85bc8875b7..130ae95961 100644
--- a/test/C/src/federated/DistributedBank.lf
+++ b/test/C/src/federated/DistributedBank.lf
@@ -12,7 +12,7 @@ reactor Node {
 
   reaction(shutdown) {=
     if (self->count == 0) {
-        lf_print_error_and_exit("Timer reactions did not execute.");
+      lf_print_error_and_exit("Timer reactions did not execute.");
     }
   =}
 }
diff --git a/test/C/src/federated/DistributedBankToMultiport.lf b/test/C/src/federated/DistributedBankToMultiport.lf
index fdc1b67b84..d73b0959fd 100644
--- a/test/C/src/federated/DistributedBankToMultiport.lf
+++ b/test/C/src/federated/DistributedBankToMultiport.lf
@@ -11,17 +11,17 @@ reactor Destination {
 
   reaction(in) {=
     for (int i = 0; i < in_width; i++) {
-        lf_print("Received %d.", in[i]->value);
-        if (self->count != in[i]->value) {
-            lf_print_error_and_exit("Expected %d.", self->count);
-        }
+      lf_print("Received %d.", in[i]->value);
+      if (self->count != in[i]->value) {
+        lf_print_error_and_exit("Expected %d.", self->count);
+      }
     }
     self->count++;
   =}
 
   reaction(shutdown) {=
     if (self->count == 0) {
-        lf_print_error_and_exit("No data received.");
+      lf_print_error_and_exit("No data received.");
     }
   =}
 }
diff --git a/test/C/src/federated/DistributedCount.lf b/test/C/src/federated/DistributedCount.lf
index 9e1a1b2e93..d8be836430 100644
--- a/test/C/src/federated/DistributedCount.lf
+++ b/test/C/src/federated/DistributedCount.lf
@@ -19,17 +19,17 @@ reactor Print {
     interval_t elapsed_time = lf_time_logical_elapsed();
     lf_print("At time %lld, received %d", elapsed_time, in->value);
     if (in->value != self->c) {
-        lf_print_error_and_exit("Expected to receive %d.", self->c);
+      lf_print_error_and_exit("Expected to receive %d.", self->c);
     }
     if (elapsed_time != MSEC(200) + SEC(1) * (self->c - 1) ) {
-        lf_print_error_and_exit("Expected received time to be %lld.", MSEC(200) * self->c);
+      lf_print_error_and_exit("Expected received time to be %lld.", MSEC(200) * self->c);
     }
     self->c++;
   =}
 
   reaction(shutdown) {=
     if (self->c != 6) {
-        lf_print_error_and_exit("Expected to receive 5 items.");
+      lf_print_error_and_exit("Expected to receive 5 items.");
     }
   =}
 }
diff --git a/test/C/src/federated/DistributedCountDecentralized.lf b/test/C/src/federated/DistributedCountDecentralized.lf
index 0b99861269..78eb8f2435 100644
--- a/test/C/src/federated/DistributedCountDecentralized.lf
+++ b/test/C/src/federated/DistributedCountDecentralized.lf
@@ -18,27 +18,27 @@ reactor Print {
   reaction(in) {=
     interval_t elapsed_time = lf_time_logical_elapsed();
     printf("At tag (%lld, %u), received %d. "
-           "The original intended tag of the message was (%lld, %u).\n",
-            (long long int)elapsed_time,
-            lf_tag().microstep,
-            in->value,
-            (long long int)(in->intended_tag.time - lf_time_start()),
-            in->intended_tag.microstep);
+         "The original intended tag of the message was (%lld, %u).\n",
+        (long long int)elapsed_time,
+        lf_tag().microstep,
+        in->value,
+        (long long int)(in->intended_tag.time - lf_time_start()),
+        in->intended_tag.microstep);
     if (in->value != self->c) {
-        printf("Expected to receive %d.\n", self->c);
-        exit(1);
+      printf("Expected to receive %d.\n", self->c);
+      exit(1);
     }
     if (elapsed_time != MSEC(200) + SEC(1) * (self->c - 1)) {
-        printf("Expected received time to be %lld.\n", MSEC(200) * self->c);
-        exit(3);
+      printf("Expected received time to be %lld.\n", MSEC(200) * self->c);
+      exit(3);
     }
     self->c++;
   =}
 
   reaction(shutdown) {=
     if (self->c != 6) {
-        fprintf(stderr, "Expected to receive 5 items.\n");
-        exit(2);
+      fprintf(stderr, "Expected to receive 5 items.\n");
+      exit(2);
     }
     printf("SUCCESS: Successfully received 5 items.\n");
   =}
diff --git a/test/C/src/federated/DistributedCountDecentralizedLate.lf b/test/C/src/federated/DistributedCountDecentralizedLate.lf
index d08edbdb52..56d64004c6 100644
--- a/test/C/src/federated/DistributedCountDecentralizedLate.lf
+++ b/test/C/src/federated/DistributedCountDecentralizedLate.lf
@@ -24,22 +24,22 @@ reactor Print {
   reaction(in) {=
     tag_t current_tag = lf_tag();
     printf("At tag (%lld, %u) received %d. Intended tag is (%lld, %u).\n",
-        lf_time_logical_elapsed(),
-        lf_tag().microstep,
-        in->value,
-        in->intended_tag.time - lf_time_start(),
-        in->intended_tag.microstep);
+      lf_time_logical_elapsed(),
+      lf_tag().microstep,
+      in->value,
+      in->intended_tag.time - lf_time_start(),
+      in->intended_tag.microstep);
     if (lf_tag_compare((tag_t){.time=current_tag.time - lf_time_start(), .microstep=current_tag.microstep},
-                     (tag_t){.time=SEC(1) *  self->c, .microstep=0}) == 0) {
-        self->success++; // Message was on-time
+             (tag_t){.time=SEC(1) *  self->c, .microstep=0}) == 0) {
+      self->success++; // Message was on-time
     }
     self->c++;
   =} STP(0) {=
     tag_t current_tag = lf_tag();
     printf("At tag (%lld, %u), message has violated the STP offset by (%lld, %u).\n",
-            current_tag.time - lf_time_start(), current_tag.microstep,
-            current_tag.time - in->intended_tag.time,
-            current_tag.microstep - in->intended_tag.microstep);
+        current_tag.time - lf_time_start(), current_tag.microstep,
+        current_tag.time - in->intended_tag.time,
+        current_tag.microstep - in->intended_tag.microstep);
     self->success_stp_violation++;
     self->c++;
   =}
@@ -50,10 +50,10 @@ reactor Print {
 
   reaction(shutdown) {=
     if ((self->success +  self->success_stp_violation) != 5) {
-        fprintf(stderr, "Failed to detect STP violations in messages.\n");
-        exit(1);
+      fprintf(stderr, "Failed to detect STP violations in messages.\n");
+      exit(1);
     } else {
-        printf("Successfully detected STP violation (%d violations, %d on-time).\n", self->success_stp_violation, self->success);
+      printf("Successfully detected STP violation (%d violations, %d on-time).\n", self->success_stp_violation, self->success);
     }
   =}
 }
diff --git a/test/C/src/federated/DistributedCountDecentralizedLateHierarchy.lf b/test/C/src/federated/DistributedCountDecentralizedLateHierarchy.lf
index baf267ca74..25dec91f7d 100644
--- a/test/C/src/federated/DistributedCountDecentralizedLateHierarchy.lf
+++ b/test/C/src/federated/DistributedCountDecentralizedLateHierarchy.lf
@@ -19,26 +19,26 @@ reactor ImportantActuator {
   state success: int = 0
   state success_stp_violation: int = 0
   timer t(0, 10 msec)  // Force a timer to be invoke periodically
-  state c: int = 0     // to ensure logical time will advance in the absence of incoming messages.
+  state c: int = 0   // to ensure logical time will advance in the absence of incoming messages.
 
   reaction(in) {=
     tag_t current_tag = lf_tag();
     printf("At tag (%lld, %u) received %d. Intended tag is (%lld, %u).\n",
-        lf_time_logical_elapsed(),
-        lf_tag().microstep,
-        in->value,
-        in->intended_tag.time - lf_time_start(),
-        in->intended_tag.microstep);
+      lf_time_logical_elapsed(),
+      lf_tag().microstep,
+      in->value,
+      in->intended_tag.time - lf_time_start(),
+      in->intended_tag.microstep);
     if (lf_tag_compare((tag_t){.time=current_tag.time - lf_time_start(), .microstep=current_tag.microstep},
-                     (tag_t){.time=SEC(1) *  self->c, .microstep=0}) == 0) {
-        self->success++; // Message was on-time
+             (tag_t){.time=SEC(1) *  self->c, .microstep=0}) == 0) {
+      self->success++; // Message was on-time
     }
     self->c++;
   =} STP(0) {=
     tag_t current_tag = lf_tag();
     printf("Message violated STP offset by (%lld, %u).\n",
-            current_tag.time - in->intended_tag.time,
-            current_tag.microstep - in->intended_tag.microstep);
+        current_tag.time - in->intended_tag.time,
+        current_tag.microstep - in->intended_tag.microstep);
     self->success_stp_violation++;
     self->c++;
   =}
@@ -49,10 +49,10 @@ reactor ImportantActuator {
 
   reaction(shutdown) {=
     if ((self->success +  self->success_stp_violation) != 5) {
-        fprintf(stderr, "Failed to detect STP violations in messages.\n");
-        exit(1);
+      fprintf(stderr, "Failed to detect STP violations in messages.\n");
+      exit(1);
     } else {
-        printf("Successfully detected STP violations (%d violations, %d on-time).\n", self->success_stp_violation, self->success);
+      printf("Successfully detected STP violations (%d violations, %d on-time).\n", self->success_stp_violation, self->success);
     }
   =}
 }
@@ -63,18 +63,18 @@ reactor Print {
   reaction(in) {=
     tag_t current_tag = lf_tag();
     printf("At tag (%lld, %u) received %d. Intended tag is (%lld, %u).\n",
-           current_tag.time - lf_time_start(),
-           current_tag.microstep,
-           in->value,
-           in->intended_tag.time - lf_time_start(),
-           in->intended_tag.microstep);
+         current_tag.time - lf_time_start(),
+         current_tag.microstep,
+         in->value,
+         in->intended_tag.time - lf_time_start(),
+         in->intended_tag.microstep);
   =}
 }
 
 reactor Receiver {
   input in: int
   timer t(0, 10 msec)  // Force a timer to be invoke periodically
-  state c: int = 0     // to ensure logical time will advance in the absence of incoming messages.
+  state c: int = 0   // to ensure logical time will advance in the absence of incoming messages.
   p = new Print()
   a = new ImportantActuator()
   in -> p.in
diff --git a/test/C/src/federated/DistributedCountPhysical.lf b/test/C/src/federated/DistributedCountPhysical.lf
index 9baa1dd1cc..e678c3fee4 100644
--- a/test/C/src/federated/DistributedCountPhysical.lf
+++ b/test/C/src/federated/DistributedCountPhysical.lf
@@ -30,21 +30,21 @@ reactor Print {
     interval_t elapsed_time = lf_time_logical_elapsed();
     printf("At time %lld, received %d.\n", elapsed_time, in->value);
     if (in->value != self->c) {
-        fprintf(stderr, "ERROR: Expected to receive %d.\n", self->c);
-        exit(1);
+      fprintf(stderr, "ERROR: Expected to receive %d.\n", self->c);
+      exit(1);
     }
     if (!(elapsed_time > (SEC(1) * self->c) + MSEC(200))) {
-        fprintf(stderr, "ERROR: Expected received time to be strictly greater than %lld. "
-                        "Got %lld.\n", MSEC(200) * self->c, elapsed_time);
-        exit(3);
+      fprintf(stderr, "ERROR: Expected received time to be strictly greater than %lld. "
+              "Got %lld.\n", MSEC(200) * self->c, elapsed_time);
+      exit(3);
     }
     self->c++;
   =}
 
   reaction(shutdown) {=
     if (self->c != 1) {
-        fprintf(stderr, "ERROR: Expected to receive 1 item. Received %d.\n", self->c);
-        exit(2);
+      fprintf(stderr, "ERROR: Expected to receive 1 item. Received %d.\n", self->c);
+      exit(2);
     }
     printf("SUCCESS: Successfully received 1 item.\n");
   =}
diff --git a/test/C/src/federated/DistributedCountPhysicalAfterDelay.lf b/test/C/src/federated/DistributedCountPhysicalAfterDelay.lf
index f4c4d1cd48..d34f16a6d4 100644
--- a/test/C/src/federated/DistributedCountPhysicalAfterDelay.lf
+++ b/test/C/src/federated/DistributedCountPhysicalAfterDelay.lf
@@ -18,14 +18,14 @@ reactor Print {
     interval_t elapsed_time = lf_time_logical_elapsed();
     printf("At time " PRINTF_TIME ", received %d.\n", elapsed_time, in->value);
     if (in->value != self->c) {
-        fprintf(stderr, "ERROR: Expected to receive %d.\n", self->c);
-        exit(1);
+      fprintf(stderr, "ERROR: Expected to receive %d.\n", self->c);
+      exit(1);
     }
     if (!(elapsed_time > MSEC(600))) {
-        fprintf(stderr, "ERROR: Expected received time to be strictly greater than "
-            PRINTF_TIME ".\n", MSEC(600)
-        );
-        exit(3);
+      fprintf(stderr, "ERROR: Expected received time to be strictly greater than "
+        PRINTF_TIME ".\n", MSEC(600)
+      );
+      exit(3);
     }
     self->c++;
     lf_request_stop();
@@ -33,11 +33,11 @@ reactor Print {
 
   reaction(shutdown) {=
     if (self->c != 2) {
-        fprintf(
-            stderr, "ERROR: Expected to receive 1 item. Received %d.\n",
-            self->c - 1
-        );
-        exit(2);
+      fprintf(
+        stderr, "ERROR: Expected to receive 1 item. Received %d.\n",
+        self->c - 1
+      );
+      exit(2);
     }
     printf("SUCCESS: Successfully received 1 item.\n");
   =}
diff --git a/test/C/src/federated/DistributedCountPhysicalDecentralized.lf b/test/C/src/federated/DistributedCountPhysicalDecentralized.lf
index 581d0f9670..f9da77b2c7 100644
--- a/test/C/src/federated/DistributedCountPhysicalDecentralized.lf
+++ b/test/C/src/federated/DistributedCountPhysicalDecentralized.lf
@@ -30,21 +30,21 @@ reactor Print {
   reaction(in) {=
     interval_t elapsed_time = lf_time_logical_elapsed();
     printf("At time %lld, received %d.\n", elapsed_time, in->value);
-    if (in->value    != self->c) {
-        fprintf(stderr, "ERROR: Expected to receive %d.\n", self->c);
-        exit(1);
+    if (in->value  != self->c) {
+      fprintf(stderr, "ERROR: Expected to receive %d.\n", self->c);
+      exit(1);
     }
     if (!(elapsed_time > (SEC(1) * self->c) + MSEC(200))) {
-        fprintf(stderr, "ERROR: Expected received time to be strictly greater than %lld.\n", MSEC(200) * self->c);
-        exit(3);
+      fprintf(stderr, "ERROR: Expected received time to be strictly greater than %lld.\n", MSEC(200) * self->c);
+      exit(3);
     }
     self->c++;
   =}
 
   reaction(shutdown) {=
     if (self->c != 1) {
-        fprintf(stderr, "ERROR: Expected to receive 1 item. Received %d.\n", self->c);
-        exit(2);
+      fprintf(stderr, "ERROR: Expected to receive 1 item. Received %d.\n", self->c);
+      exit(2);
     }
     printf("SUCCESS: Successfully received 1 item.\n");
   =}
diff --git a/test/C/src/federated/DistributedDoublePort.lf b/test/C/src/federated/DistributedDoublePort.lf
index e478f8c596..5885d20a7e 100644
--- a/test/C/src/federated/DistributedDoublePort.lf
+++ b/test/C/src/federated/DistributedDoublePort.lf
@@ -31,7 +31,7 @@ reactor Print {
     interval_t elapsed_time = lf_time_logical_elapsed();
     lf_print("At tag (%lld, %u), received in = %d and in2 = %d.", elapsed_time, lf_tag().microstep, in->value, in2->value);
     if (in->is_present && in2->is_present) {
-        lf_print_error_and_exit("ERROR: invalid logical simultaneity.");
+      lf_print_error_and_exit("ERROR: invalid logical simultaneity.");
     }
   =}
 
diff --git a/test/C/src/federated/DistributedLoopedAction.lf b/test/C/src/federated/DistributedLoopedAction.lf
index db26c1b462..d4b54c569a 100644
--- a/test/C/src/federated/DistributedLoopedAction.lf
+++ b/test/C/src/federated/DistributedLoopedAction.lf
@@ -19,23 +19,23 @@ reactor Receiver(take_a_break_after: int = 10, break_interval: time = 400 msec)
   // but forces the logical time to advance Comment this line for a more sensible log output.
   reaction(in) {=
     printf("At tag (%lld, %u) received value %d.\n",
-        lf_time_logical_elapsed(),
-        lf_tag().microstep,
-        in->value);
+      lf_time_logical_elapsed(),
+      lf_tag().microstep,
+      in->value);
     self->total_received_messages++;
     if (in->value != self->received_messages++) {
-        fprintf(stderr,"ERROR: received messages out of order.\n");
-        // exit(1);
+      fprintf(stderr,"ERROR: received messages out of order.\n");
+      // exit(1);
     }
     if (lf_time_logical_elapsed() != self->breaks * self->break_interval) {
-        fprintf(stderr,"ERROR: received messages at an incorrect time: %lld.\n", lf_time_logical_elapsed());
-        // exit(2);
+      fprintf(stderr,"ERROR: received messages at an incorrect time: %lld.\n", lf_time_logical_elapsed());
+      // exit(2);
     }
 
     if (self->received_messages == self->take_a_break_after) {
-        // Sender is taking a break;
-        self->breaks++;
-        self->received_messages = 0;
+      // Sender is taking a break;
+      self->breaks++;
+      self->received_messages = 0;
     }
   =}
 
@@ -45,10 +45,10 @@ reactor Receiver(take_a_break_after: int = 10, break_interval: time = 400 msec)
 
   reaction(shutdown) {=
     if (self->breaks != 3 ||
-        (self->total_received_messages != ((SEC(1)/self->break_interval)+1) * self->take_a_break_after)
+      (self->total_received_messages != ((SEC(1)/self->break_interval)+1) * self->take_a_break_after)
     ) {
-        fprintf(stderr,"ERROR: test failed.\n");
-        exit(4);
+      fprintf(stderr,"ERROR: test failed.\n");
+      exit(4);
     }
     printf("SUCCESS: Successfully received all messages from the sender.\n");
   =}
diff --git a/test/C/src/federated/DistributedLoopedActionDecentralized.lf b/test/C/src/federated/DistributedLoopedActionDecentralized.lf
index ea9166fdc4..3a639914ea 100644
--- a/test/C/src/federated/DistributedLoopedActionDecentralized.lf
+++ b/test/C/src/federated/DistributedLoopedActionDecentralized.lf
@@ -27,48 +27,48 @@ reactor Receiver(take_a_break_after: int = 10, break_interval: time = 400 msec)
   reaction(in) {=
     tag_t current_tag = lf_tag();
     lf_print("At tag (%lld, %u) received value %d with STP violation (%lld, %u).",
-        current_tag.time - lf_time_start(),
-        current_tag.microstep,
-        in->value,
-        current_tag.time - in->intended_tag.time,
-        current_tag.microstep - in->intended_tag.microstep
+      current_tag.time - lf_time_start(),
+      current_tag.microstep,
+      in->value,
+      current_tag.time - in->intended_tag.time,
+      current_tag.microstep - in->intended_tag.microstep
     );
     self->total_received_messages++;
     if (in->value != lf_tag().microstep) {
-        lf_print_warning("Received incorrect value %d. Expected %d.", in->value, lf_tag().microstep);
-        // exit(1); // The receiver should tolerate this type of error
-                    // in this test because messages on the network can
-                    // arrive late. Note that with an accurate STP offset,
-                    // this type of error should be extremely rare.
+      lf_print_warning("Received incorrect value %d. Expected %d.", in->value, lf_tag().microstep);
+      // exit(1); // The receiver should tolerate this type of error
+            // in this test because messages on the network can
+            // arrive late. Note that with an accurate STP offset,
+            // this type of error should be extremely rare.
 
     }
     if (in->value != self->received_messages) {
-        lf_print_warning("Skipped expected value %d. Received value %d.", self->received_messages, in->value);
-        self->received_messages = in->value;
-        // exit(1); // The receiver should tolerate this type of error
-                    // in this test because multiple messages arriving
-                    // at a given tag (t, m) can overwrite each other.
-                    // Because messages arrive in order, only the last
-                    // value that is received on the port at a given tag
-                    // can be observed. Note that with an accurate STP
-                    // offset, this type of error should be extremely
-                    // rare.
-                    // FIXME: Messages should not be dropped or
-                    // overwritten.
+      lf_print_warning("Skipped expected value %d. Received value %d.", self->received_messages, in->value);
+      self->received_messages = in->value;
+      // exit(1); // The receiver should tolerate this type of error
+            // in this test because multiple messages arriving
+            // at a given tag (t, m) can overwrite each other.
+            // Because messages arrive in order, only the last
+            // value that is received on the port at a given tag
+            // can be observed. Note that with an accurate STP
+            // offset, this type of error should be extremely
+            // rare.
+            // FIXME: Messages should not be dropped or
+            // overwritten.
     }
     self->received_messages++;
     if (self->received_messages == self->take_a_break_after) {
-        // Sender is taking a break;
-        self->breaks++;
-        self->received_messages = 0;
+      // Sender is taking a break;
+      self->breaks++;
+      self->received_messages = 0;
     }
   =}
 
   reaction(shutdown) {=
     if (self->breaks != 3 ||
-        (self->total_received_messages != ((SEC(1)/self->break_interval)+1) * self->take_a_break_after)
+      (self->total_received_messages != ((SEC(1)/self->break_interval)+1) * self->take_a_break_after)
     ) {
-        lf_print_error_and_exit("Test failed. Breaks: %d, Messages: %d.", self->breaks, self->total_received_messages);
+      lf_print_error_and_exit("Test failed. Breaks: %d, Messages: %d.", self->breaks, self->total_received_messages);
     }
     lf_print("SUCCESS: Successfully received all messages from the sender. Breaks: %d, Messages: %d.", self->breaks, self->total_received_messages);
   =}
@@ -90,16 +90,16 @@ reactor STPReceiver(
     lf_print("Received %d late.", in->value);
     tag_t current_tag = lf_tag();
     lf_print("STP violation of (%lld, %u) perceived on the input.",
-           current_tag.time - in->intended_tag.time,
-           current_tag.microstep - in->intended_tag.microstep);
+         current_tag.time - in->intended_tag.time,
+         current_tag.microstep - in->intended_tag.microstep);
     lf_set(receiver.in, in->value);
     // Only update the STP offset once per
     // time step.
     if (current_tag.time != self->last_time_updated_stp) {
-        lf_print("Raising the STP offset by %lld.", MSEC(10));
-        self->stp_offset += MSEC(10);
-        lf_set_stp_offset(MSEC(10));
-        self->last_time_updated_stp = current_tag.time;
+      lf_print("Raising the STP offset by %lld.", MSEC(10));
+      self->stp_offset += MSEC(10);
+      lf_set_stp_offset(MSEC(10));
+      self->last_time_updated_stp = current_tag.time;
     }
   =}
 
diff --git a/test/C/src/federated/DistributedLoopedPhysicalAction.lf b/test/C/src/federated/DistributedLoopedPhysicalAction.lf
index ace74a219f..226dee1370 100644
--- a/test/C/src/federated/DistributedLoopedPhysicalAction.lf
+++ b/test/C/src/federated/DistributedLoopedPhysicalAction.lf
@@ -26,11 +26,11 @@ reactor Sender(take_a_break_after: int = 10, break_interval: time = 550 msec) {
     lf_set(out, self->sent_messages);
     self->sent_messages++;
     if (self->sent_messages < self->take_a_break_after) {
-        lf_schedule(act, 0);
+      lf_schedule(act, 0);
     } else {
-        // Take a break
-        self->sent_messages = 0;
-        lf_schedule(act, self->break_interval);
+      // Take a break
+      self->sent_messages = 0;
+      lf_schedule(act, self->break_interval);
     }
   =}
 }
@@ -46,18 +46,18 @@ reactor Receiver(take_a_break_after: int = 10, break_interval: time = 550 msec)
   reaction(in) {=
     tag_t current_tag = lf_tag();
     lf_print("At tag (%lld, %u) received %d.",
-           current_tag.time - lf_time_start(),
-           current_tag.microstep,
-           in->value);
+         current_tag.time - lf_time_start(),
+         current_tag.microstep,
+         in->value);
     self->total_received_messages++;
     if (in->value != self->received_messages++) {
-        lf_print_error_and_exit("Expected %d.", self->received_messages - 1);
+      lf_print_error_and_exit("Expected %d.", self->received_messages - 1);
     }
 
     if (self->received_messages == self->take_a_break_after) {
-        // Sender is taking a break;
-        self->breaks++;
-        self->received_messages = 0;
+      // Sender is taking a break;
+      self->breaks++;
+      self->received_messages = 0;
     }
   =}
 
@@ -67,9 +67,9 @@ reactor Receiver(take_a_break_after: int = 10, break_interval: time = 550 msec)
 
   reaction(shutdown) {=
     if (self->breaks != 2 ||
-        (self->total_received_messages != ((SEC(1)/self->break_interval)+1) * self->take_a_break_after)
+      (self->total_received_messages != ((SEC(1)/self->break_interval)+1) * self->take_a_break_after)
     ) {
-        lf_print_error_and_exit("Test failed. Breaks: %d, Messages: %d.", self->breaks, self->total_received_messages);
+      lf_print_error_and_exit("Test failed. Breaks: %d, Messages: %d.", self->breaks, self->total_received_messages);
     }
     lf_print("SUCCESS: Successfully received all messages from the sender.");
   =}
diff --git a/test/C/src/federated/DistributedMultiport.lf b/test/C/src/federated/DistributedMultiport.lf
index 7590710339..f17c7311c2 100644
--- a/test/C/src/federated/DistributedMultiport.lf
+++ b/test/C/src/federated/DistributedMultiport.lf
@@ -11,7 +11,7 @@ reactor Source {
 
   reaction(t) -> out {=
     for (int i = 0; i < out_width; i++) {
-        lf_set(out[i], self->count++);
+      lf_set(out[i], self->count++);
     }
   =}
 }
@@ -22,18 +22,18 @@ reactor Destination {
 
   reaction(in) {=
     for (int i = 0; i < in_width; i++) {
-        if (in[i]->is_present) {
-            lf_print("Received %d.", in[i]->value);
-            if (in[i]->value != self->count++) {
-                lf_print_error_and_exit("Expected %d.", self->count - 1);
-            }
+      if (in[i]->is_present) {
+        lf_print("Received %d.", in[i]->value);
+        if (in[i]->value != self->count++) {
+          lf_print_error_and_exit("Expected %d.", self->count - 1);
         }
+      }
     }
   =}
 
   reaction(shutdown) {=
     if (self->count == 0) {
-        lf_print_error_and_exit("No data received.");
+      lf_print_error_and_exit("No data received.");
     }
   =}
 }
diff --git a/test/C/src/federated/DistributedMultiportToBank.lf b/test/C/src/federated/DistributedMultiportToBank.lf
index c7a3b7dd5f..d8171de51e 100644
--- a/test/C/src/federated/DistributedMultiportToBank.lf
+++ b/test/C/src/federated/DistributedMultiportToBank.lf
@@ -10,7 +10,7 @@ reactor Source {
 
   reaction(t) -> out {=
     for (int i = 0; i < out_width; i++) {
-        lf_set(out[i], self->count);
+      lf_set(out[i], self->count);
     }
     self->count++;
   =}
@@ -23,13 +23,13 @@ reactor Destination {
   reaction(in) {=
     lf_print("Received %d.", in->value);
     if (self->count++ != in->value) {
-        lf_print_error_and_exit("Expected %d.", self->count - 1);
+      lf_print_error_and_exit("Expected %d.", self->count - 1);
     }
   =}
 
   reaction(shutdown) {=
     if (self->count == 0) {
-        lf_print_error_and_exit("No data received.");
+      lf_print_error_and_exit("No data received.");
     }
   =}
 }
diff --git a/test/C/src/federated/DistributedMultiportToken.lf b/test/C/src/federated/DistributedMultiportToken.lf
index 821f48d17a..61fd8caff9 100644
--- a/test/C/src/federated/DistributedMultiportToken.lf
+++ b/test/C/src/federated/DistributedMultiportToken.lf
@@ -12,17 +12,17 @@ reactor Source {
 
   reaction(t) -> out {=
     for (int i = 0; i < out_width; i++) {
-        // With NULL, 0 arguments, snprintf tells us how many bytes are needed.
-        // Add one for the null terminator.
-        int length = snprintf(NULL, 0, "Hello %d", self->count) + 1;
-        // Dynamically allocate memory for the output.
-        SET_NEW_ARRAY(out[i], length);
-        // Populate the output string and increment the count.
-        snprintf(out[i]->value, length, "Hello %d", self->count++);
-        lf_print("MessageGenerator: At time %lld, send message: %s.",
-            lf_time_logical_elapsed(),
-            out[i]->value
-        );
+      // With NULL, 0 arguments, snprintf tells us how many bytes are needed.
+      // Add one for the null terminator.
+      int length = snprintf(NULL, 0, "Hello %d", self->count) + 1;
+      // Dynamically allocate memory for the output.
+      SET_NEW_ARRAY(out[i], length);
+      // Populate the output string and increment the count.
+      snprintf(out[i]->value, length, "Hello %d", self->count++);
+      lf_print("MessageGenerator: At time %lld, send message: %s.",
+        lf_time_logical_elapsed(),
+        out[i]->value
+      );
     }
   =}
 }
@@ -32,9 +32,9 @@ reactor Destination {
 
   reaction(in) {=
     for (int i = 0; i < in_width; i++) {
-        if (in[i]->is_present) {
-            lf_print("Received %s.", in[i]->value);
-        }
+      if (in[i]->is_present) {
+        lf_print("Received %s.", in[i]->value);
+      }
     }
   =}
 }
diff --git a/test/C/src/federated/DistributedNetworkOrder.lf b/test/C/src/federated/DistributedNetworkOrder.lf
index 851c363d77..86e8ec1c09 100644
--- a/test/C/src/federated/DistributedNetworkOrder.lf
+++ b/test/C/src/federated/DistributedNetworkOrder.lf
@@ -29,12 +29,12 @@ reactor Sender {
   reaction(t) -> out {=
     int payload = 1;
     if (lf_time_logical_elapsed() == 0LL) {
-        send_timed_message(MSEC(10), MSG_TYPE_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
-                            (unsigned char*)&payload);
+      send_timed_message(MSEC(10), MSG_TYPE_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
+                (unsigned char*)&payload);
     } else if (lf_time_logical_elapsed() == MSEC(5)) {
-        payload = 2;
-        send_timed_message(MSEC(5), MSG_TYPE_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
-                            (unsigned char*)&payload);
+      payload = 2;
+      send_timed_message(MSEC(5), MSG_TYPE_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
+                (unsigned char*)&payload);
     }
   =}
 }
@@ -46,22 +46,22 @@ reactor Receiver {
   reaction(in) {=
     tag_t current_tag = lf_tag();
     if (current_tag.time == (lf_time_start() + MSEC(10))) {
-        if (current_tag.microstep == 0 && in->value == 1) {
-            self->success++;
-        } else if (current_tag.microstep == 1 && in->value == 2) {
-            self->success++;
-        }
+      if (current_tag.microstep == 0 && in->value == 1) {
+        self->success++;
+      } else if (current_tag.microstep == 1 && in->value == 2) {
+        self->success++;
+      }
     }
     printf("Received %d at tag (%lld, %u).\n",
-           in->value,
-           lf_time_logical_elapsed(),
-           lf_tag().microstep);
+         in->value,
+         lf_time_logical_elapsed(),
+         lf_tag().microstep);
   =}
 
   reaction(shutdown) {=
     if (self->success != 2) {
-        fprintf(stderr, "ERROR: Failed to receive messages.\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Failed to receive messages.\n");
+      exit(1);
     }
     printf("SUCCESS.\n");
   =}
diff --git a/test/C/src/federated/DistributedPhysicalActionUpstream.lf b/test/C/src/federated/DistributedPhysicalActionUpstream.lf
index e77744d91b..847e9547ed 100644
--- a/test/C/src/federated/DistributedPhysicalActionUpstream.lf
+++ b/test/C/src/federated/DistributedPhysicalActionUpstream.lf
@@ -22,16 +22,16 @@ reactor WithPhysicalAction {
   preamble {=
     int _counter = 1;
     void callback(void *a) {
-        lf_schedule_int(a, 0, _counter++);
+      lf_schedule_int(a, 0, _counter++);
     }
     // Simulate time passing before a callback occurs.
     void* take_time(void* a) {
-        while (_counter < 15) {
-            instant_t sleep_time = MSEC(10);
-            lf_sleep(sleep_time);
-            callback(a);
-        }
-        return NULL;
+      while (_counter < 15) {
+        instant_t sleep_time = MSEC(10);
+        lf_sleep(sleep_time);
+        callback(a);
+      }
+      return NULL;
     }
   =}
 
diff --git a/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf b/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf
index 5eed5390cf..180e05be47 100644
--- a/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf
+++ b/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf
@@ -22,16 +22,16 @@ reactor WithPhysicalAction {
   preamble {=
     int _counter = 1;
     void callback(void *a) {
-        lf_schedule_int(a, 0, _counter++);
+      lf_schedule_int(a, 0, _counter++);
     }
     // Simulate time passing before a callback occurs.
     void* take_time(void* a) {
-        while (_counter < 20) {
-            instant_t sleep_time = USEC(50);
-            lf_sleep(sleep_time);
-            callback(a);
-        }
-        return NULL;
+      while (_counter < 20) {
+        instant_t sleep_time = USEC(50);
+        lf_sleep(sleep_time);
+        callback(a);
+      }
+      return NULL;
     }
   =}
   output out: int
diff --git a/test/C/src/federated/DistributedStop.lf b/test/C/src/federated/DistributedStop.lf
index c25410b044..e4dca56917 100644
--- a/test/C/src/federated/DistributedStop.lf
+++ b/test/C/src/federated/DistributedStop.lf
@@ -13,51 +13,51 @@ reactor Sender {
 
   reaction(t, act) -> out, act {=
     lf_print("Sending 42 at (%lld, %u).",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
     lf_set(out, 42);
     if (lf_tag().microstep == 0) {
-        // Instead of having a separate reaction
-        // for 'act' like Stop.lf, we trigger the
-        // same reaction to test lf_request_stop() being
-        // called multiple times
-        lf_schedule(act, 0);
+      // Instead of having a separate reaction
+      // for 'act' like Stop.lf, we trigger the
+      // same reaction to test lf_request_stop() being
+      // called multiple times
+      lf_schedule(act, 0);
     }
     if (lf_time_logical_elapsed() == USEC(1)) {
-        // Call lf_request_stop() both at (1 usec, 0) and
-        // (1 usec, 1)
-        lf_print("Requesting stop at (%lld, %u).",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
-        lf_request_stop();
+      // Call lf_request_stop() both at (1 usec, 0) and
+      // (1 usec, 1)
+      lf_print("Requesting stop at (%lld, %u).",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
+      lf_request_stop();
     }
 
     tag_t _1usec1 = (tag_t) { .time = USEC(1) + lf_time_start(), .microstep = 1u };
     if (lf_tag_compare(lf_tag(), _1usec1) == 0) {
-        // The reaction was invoked at (1 usec, 1) as expected
-        self->reaction_invoked_correctly = true;
+      // The reaction was invoked at (1 usec, 1) as expected
+      self->reaction_invoked_correctly = true;
     } else if (lf_tag_compare(lf_tag(), _1usec1) > 0) {
-        // The reaction should not have been invoked at tags larger than (1 usec, 1)
-        lf_print_error_and_exit("ERROR: Invoked reaction(t, act) at tag bigger than shutdown.");
+      // The reaction should not have been invoked at tags larger than (1 usec, 1)
+      lf_print_error_and_exit("ERROR: Invoked reaction(t, act) at tag bigger than shutdown.");
     }
   =}
 
   reaction(shutdown) {=
     if (lf_time_logical_elapsed() != USEC(1) ||
-        lf_tag().microstep != 1) {
-        lf_print_error_and_exit("ERROR: Sender failed to stop the federation in time. "
-                "Stopping at (%lld, %u).",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+      lf_tag().microstep != 1) {
+      lf_print_error_and_exit("ERROR: Sender failed to stop the federation in time. "
+          "Stopping at (%lld, %u).",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
     } else if (self->reaction_invoked_correctly == false) {
-        lf_print_error_and_exit("ERROR: Sender reaction(t, act) was not invoked at (1 usec, 1). "
-                "Stopping at (%lld, %u).",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+      lf_print_error_and_exit("ERROR: Sender reaction(t, act) was not invoked at (1 usec, 1). "
+          "Stopping at (%lld, %u).",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
     }
     lf_print("SUCCESS: Successfully stopped the federation at (%lld, %u).",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
   =}
 }
 
@@ -69,22 +69,22 @@ reactor Receiver(
 
   reaction(in) {=
     lf_print("Received %d at (%lld, %u).",
-                 in->value,
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+           in->value,
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
     if (lf_time_logical_elapsed() == USEC(1)) {
-        lf_print("Requesting stop at (%lld, %u).",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
-        lf_request_stop();
-        // The receiver should receive a message at tag
-        // (1 usec, 1) and trigger this reaction
-        self->reaction_invoked_correctly = true;
+      lf_print("Requesting stop at (%lld, %u).",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
+      lf_request_stop();
+      // The receiver should receive a message at tag
+      // (1 usec, 1) and trigger this reaction
+      self->reaction_invoked_correctly = true;
     }
 
     tag_t _1usec1 = (tag_t) { .time = USEC(1) + lf_time_start(), .microstep = 1u };
     if (lf_tag_compare(lf_tag(), _1usec1) > 0) {
-        self->reaction_invoked_correctly = false;
+      self->reaction_invoked_correctly = false;
     }
   =}
 
@@ -93,20 +93,20 @@ reactor Receiver(
     // Therefore, the shutdown events must occur at (1000, 0) on the
     // receiver.
     if (lf_time_logical_elapsed() != USEC(1) ||
-        lf_tag().microstep != 1) {
-        lf_print_error_and_exit("Receiver failed to stop the federation at the right time. "
-                "Stopping at (%lld, %u).",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+      lf_tag().microstep != 1) {
+      lf_print_error_and_exit("Receiver failed to stop the federation at the right time. "
+          "Stopping at (%lld, %u).",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
     } else if (self->reaction_invoked_correctly == false) {
-        lf_print_error_and_exit("Receiver reaction(in) was not invoked the correct number of times. "
-                "Stopping at (%lld, %u).",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+      lf_print_error_and_exit("Receiver reaction(in) was not invoked the correct number of times. "
+          "Stopping at (%lld, %u).",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
     }
     lf_print("SUCCESS: Successfully stopped the federation at (%lld, %u).",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
   =}
 }
 
diff --git a/test/C/src/federated/DistributedStopZero.lf b/test/C/src/federated/DistributedStopZero.lf
index 2e0529ea1d..9b8dcdddfa 100644
--- a/test/C/src/federated/DistributedStopZero.lf
+++ b/test/C/src/federated/DistributedStopZero.lf
@@ -11,32 +11,32 @@ reactor Sender {
 
   reaction(t) -> out {=
     printf("Sending 42 at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
     lf_set(out, 42);
 
     tag_t zero = (tag_t) { .time = lf_time_start(), .microstep = 0u };
     if (lf_tag_compare(lf_tag(), zero) == 0) {
-        // Request stop at (0,0)
-        printf("Requesting stop at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
-        lf_request_stop();
+      // Request stop at (0,0)
+      printf("Requesting stop at (%lld, %u).\n",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
+      lf_request_stop();
     }
   =}
 
   reaction(shutdown) {=
     if (lf_time_logical_elapsed() != USEC(0) ||
-        lf_tag().microstep != 1) {
-        fprintf(stderr, "ERROR: Sender failed to stop the federation in time. "
-                "Stopping at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
-        exit(1);
+      lf_tag().microstep != 1) {
+      fprintf(stderr, "ERROR: Sender failed to stop the federation in time. "
+          "Stopping at (%lld, %u).\n",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
+      exit(1);
     }
     printf("SUCCESS: Successfully stopped the federation at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
   =}
 }
 
@@ -45,16 +45,16 @@ reactor Receiver {
 
   reaction(in) {=
     printf("Received %d at (%lld, %u).\n",
-                 in->value,
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+           in->value,
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
     tag_t zero = (tag_t) { .time = lf_time_start(), .microstep = 0u };
     if (lf_tag_compare(lf_tag(), zero) == 0) {
-        // Request stop at (0,0)
-        printf("Requesting stop at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
-        lf_request_stop();
+      // Request stop at (0,0)
+      printf("Requesting stop at (%lld, %u).\n",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
+      lf_request_stop();
     }
   =}
 
@@ -63,16 +63,16 @@ reactor Receiver {
     // Therefore, the shutdown events must occur at (0, 0) on the
     // receiver.
     if (lf_time_logical_elapsed() != USEC(0) ||
-        lf_tag().microstep != 1) {
-        fprintf(stderr, "ERROR: Receiver failed to stop the federation in time. "
-                "Stopping at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
-        exit(1);
+      lf_tag().microstep != 1) {
+      fprintf(stderr, "ERROR: Receiver failed to stop the federation in time. "
+          "Stopping at (%lld, %u).\n",
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
+      exit(1);
     }
     printf("SUCCESS: Successfully stopped the federation at (%lld, %u).\n",
-                 lf_time_logical_elapsed(),
-                 lf_tag().microstep);
+           lf_time_logical_elapsed(),
+           lf_tag().microstep);
   =}
 }
 
diff --git a/test/C/src/federated/DistributedToken.lf b/test/C/src/federated/DistributedToken.lf
index 14ce0b94e0..3d8662f27f 100644
--- a/test/C/src/federated/DistributedToken.lf
+++ b/test/C/src/federated/DistributedToken.lf
@@ -41,8 +41,8 @@ reactor MessageGenerator(root: string = "") {
     // Populate the output string and increment the count.
     snprintf(message->value, length, "%s %d", self->root, self->count++);
     printf("MessageGenerator: At time %lld, send message: %s\n",
-        lf_time_logical_elapsed(),
-        message->value
+      lf_time_logical_elapsed(),
+      message->value
     );
   =}
 }
@@ -58,37 +58,37 @@ reactor PrintMessage {
 
   reaction(message) {=
     printf("PrintMessage: At (elapsed) logical time %lld, receiver receives: %s\n",
-        lf_time_logical_elapsed(),
-        message->value
+      lf_time_logical_elapsed(),
+      message->value
     );
     // Check the trailing number only of the message.
     self->count++;
     int trailing_number = atoi(&message->value[12]);
     if (trailing_number != self->count) {
-        printf("ERROR: Expected message to be 'Hello World %d'.\n", self->count);
-        exit(1);
+      printf("ERROR: Expected message to be 'Hello World %d'.\n", self->count);
+      exit(1);
     }
   =} STP(0) {=
     printf("PrintMessage: At (elapsed) tag (%lld, %u), receiver receives: %s\n"
-        "Original intended tag was (%lld, %u).\n",
-        lf_time_logical_elapsed(),
-        lf_tag().microstep,
-        message->value,
-        message->intended_tag.time - lf_time_start(),
-        message->intended_tag.microstep);
+      "Original intended tag was (%lld, %u).\n",
+      lf_time_logical_elapsed(),
+      lf_tag().microstep,
+      message->value,
+      message->intended_tag.time - lf_time_start(),
+      message->intended_tag.microstep);
     // Check the trailing number only of the message.
     self->count++;
     int trailing_number = atoi(&message->value[12]);
     if (trailing_number != self->count) {
-        printf("ERROR: Expected message to be 'Hello World %d'.\n", self->count);
-        exit(1);
+      printf("ERROR: Expected message to be 'Hello World %d'.\n", self->count);
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (self->count == 0) {
-        printf("ERROR: No messages received.\n");
-        exit(2);
+      printf("ERROR: No messages received.\n");
+      exit(2);
     }
   =}
 }
diff --git a/test/C/src/federated/FederatedFilePkgReader.lf b/test/C/src/federated/FederatedFilePkgReader.lf
index e4396b7783..cf79291acf 100644
--- a/test/C/src/federated/FederatedFilePkgReader.lf
+++ b/test/C/src/federated/FederatedFilePkgReader.lf
@@ -8,10 +8,10 @@ reactor Source {
 
   reaction(startup) -> out {=
     char* file_path =
-        LF_PACKAGE_DIRECTORY
-        LF_FILE_SEPARATOR "src"
-        LF_FILE_SEPARATOR "lib"
-        LF_FILE_SEPARATOR "FileReader.txt";
+      LF_PACKAGE_DIRECTORY
+      LF_FILE_SEPARATOR "src"
+      LF_FILE_SEPARATOR "lib"
+      LF_FILE_SEPARATOR "FileReader.txt";
 
     FILE* file = fopen(file_path, "rb");
     if (file == NULL) lf_print_error_and_exit("Error opening file at path %s.", file_path);
@@ -45,7 +45,7 @@ reactor Check {
   reaction(in) {=
     printf("Received: %s\n", in->value);
     if (strcmp("Hello World", in->value) != 0) {
-        lf_print_error_and_exit("Expected 'Hello World'");
+      lf_print_error_and_exit("Expected 'Hello World'");
     }
   =}
 }
diff --git a/test/C/src/federated/FederatedFileReader.lf b/test/C/src/federated/FederatedFileReader.lf
index 9a2534195a..30efe2edfd 100644
--- a/test/C/src/federated/FederatedFileReader.lf
+++ b/test/C/src/federated/FederatedFileReader.lf
@@ -8,10 +8,10 @@ reactor Source {
 
   reaction(startup) -> out {=
     char* file_path =
-        LF_SOURCE_DIRECTORY
-        LF_FILE_SEPARATOR ".."
-        LF_FILE_SEPARATOR "lib"
-        LF_FILE_SEPARATOR "FileReader.txt";
+      LF_SOURCE_DIRECTORY
+      LF_FILE_SEPARATOR ".."
+      LF_FILE_SEPARATOR "lib"
+      LF_FILE_SEPARATOR "FileReader.txt";
 
     FILE* file = fopen(file_path, "rb");
     if (file == NULL) lf_print_error_and_exit("Error opening file at path %s.", file_path);
@@ -45,7 +45,7 @@ reactor Check {
   reaction(in) {=
     printf("Received: %s\n", in->value);
     if (strcmp("Hello World", in->value) != 0) {
-        lf_print_error_and_exit("Expected 'Hello World'");
+      lf_print_error_and_exit("Expected 'Hello World'");
     }
   =}
 }
diff --git a/test/C/src/federated/FeedbackDelay.lf b/test/C/src/federated/FeedbackDelay.lf
index abfe5f1d6c..ed458a9749 100644
--- a/test/C/src/federated/FeedbackDelay.lf
+++ b/test/C/src/federated/FeedbackDelay.lf
@@ -37,7 +37,7 @@ reactor Controller {
 
   reaction(sensor) -> control, request_for_planning {=
     if (!self->first) {
-        lf_set(control, self->latest_control);
+      lf_set(control, self->latest_control);
     }
     self->first = false;
     lf_set(request_for_planning, sensor->value);
diff --git a/test/C/src/federated/FeedbackDelaySimple.lf b/test/C/src/federated/FeedbackDelaySimple.lf
index 7f4756c49d..ece831bf11 100644
--- a/test/C/src/federated/FeedbackDelaySimple.lf
+++ b/test/C/src/federated/FeedbackDelaySimple.lf
@@ -11,11 +11,11 @@ reactor Loop {
   reaction(in) {=
     lf_print("Received %d.", in->value);
     if (in->value != self->count) {
-        lf_print_error_and_exit(
-            "Expected %d. Got %d.",
-            self->count,
-            in->value
-        );
+      lf_print_error_and_exit(
+        "Expected %d. Got %d.",
+        self->count,
+        in->value
+      );
     }
     self->count++;
   =}
@@ -24,10 +24,10 @@ reactor Loop {
 
   reaction(shutdown) {=
     if (self->count != 11) {
-        lf_print_error_and_exit(
-            "Expected 11 messages. Got %d.",
-            self->count
-        );
+      lf_print_error_and_exit(
+        "Expected 11 messages. Got %d.",
+        self->count
+      );
     }
   =}
 }
diff --git a/test/C/src/federated/HelloDistributed.lf b/test/C/src/federated/HelloDistributed.lf
index d2c4ea4c16..ba955f06d3 100644
--- a/test/C/src/federated/HelloDistributed.lf
+++ b/test/C/src/federated/HelloDistributed.lf
@@ -29,8 +29,8 @@ reactor Destination {
   reaction(in) {=
     lf_print("At logical time %lld, destination received: %s", lf_time_logical_elapsed(), in->value);
     if (strcmp(in->value, "Hello World!") != 0) {
-        fprintf(stderr, "ERROR: Expected to receive 'Hello World!'\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Expected to receive 'Hello World!'\n");
+      exit(1);
     }
     self->received = true;
   =}
@@ -38,15 +38,15 @@ reactor Destination {
   reaction(shutdown) {=
     lf_print("Shutdown invoked.");
     if (!self->received) {
-        lf_print_error_and_exit("Destination did not receive the message.");
+      lf_print_error_and_exit("Destination did not receive the message.");
     }
   =}
 }
 
 federated reactor HelloDistributed at localhost {
-  s = new Source()       // Reactor s is in federate Source
+  s = new Source()     // Reactor s is in federate Source
   d = new Destination()  // Reactor d is in federate Destination
-  s.out -> d.in          // This version preserves the timestamp.
+  s.out -> d.in      // This version preserves the timestamp.
 
   reaction(startup) {= lf_print("Printing something in top-level federated reactor."); =}
 }
diff --git a/test/C/src/federated/LoopDistributedCentralized.lf b/test/C/src/federated/LoopDistributedCentralized.lf
index 8f7cee63c3..343d77ab36 100644
--- a/test/C/src/federated/LoopDistributedCentralized.lf
+++ b/test/C/src/federated/LoopDistributedCentralized.lf
@@ -36,7 +36,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
   reaction(shutdown) {=
     lf_print("******* Shutdown invoked.");
     if (self->count != 5 * self->incr) {
-        lf_print_error_and_exit("Failed to receive all five expected inputs.");
+      lf_print_error_and_exit("Failed to receive all five expected inputs.");
     }
   =}
 }
diff --git a/test/C/src/federated/LoopDistributedCentralized2.lf b/test/C/src/federated/LoopDistributedCentralized2.lf
index b52030153c..45a8dddfe2 100644
--- a/test/C/src/federated/LoopDistributedCentralized2.lf
+++ b/test/C/src/federated/LoopDistributedCentralized2.lf
@@ -35,7 +35,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
   reaction(shutdown) {=
     lf_print("******* Shutdown invoked.");
     if (self->count != 5 * self->incr) {
-        lf_print_error_and_exit("Failed to receive all five expected inputs.");
+      lf_print_error_and_exit("Failed to receive all five expected inputs.");
     }
   =}
 }
@@ -63,7 +63,7 @@ reactor Looper2(incr: int = 1, delay: time = 0 msec) {
   reaction(shutdown) {=
     lf_print("******* Shutdown invoked.");
     if (self->count != 5 * self->incr) {
-        lf_print_error_and_exit("Failed to receive all five expected inputs.");
+      lf_print_error_and_exit("Failed to receive all five expected inputs.");
     }
   =}
 }
diff --git a/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf b/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf
index 52d1e698cc..2f0da4e3de 100644
--- a/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf
+++ b/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf
@@ -23,12 +23,12 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
     bool stop = false;
     // Thread to trigger an action once every second.
     void* ping(void* actionref) {
-        while(!stop) {
-            lf_print("Scheduling action.");
-            lf_schedule(actionref, 0);
-            sleep(1);
-        }
-        return NULL;
+      while(!stop) {
+        lf_print("Scheduling action.");
+        lf_schedule(actionref, 0);
+        sleep(1);
+      }
+      return NULL;
     }
   =}
   input in: int
@@ -60,7 +60,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
     // Stop the thread that is scheduling actions.
     stop = true;
     if (self->count != 5 * self->incr) {
-        lf_print_error_and_exit("Failed to receive all five expected inputs.");
+      lf_print_error_and_exit("Failed to receive all five expected inputs.");
     }
   =}
 }
diff --git a/test/C/src/federated/LoopDistributedCentralizedPrecedence.lf b/test/C/src/federated/LoopDistributedCentralizedPrecedence.lf
index a23c487981..51a10faac2 100644
--- a/test/C/src/federated/LoopDistributedCentralizedPrecedence.lf
+++ b/test/C/src/federated/LoopDistributedCentralizedPrecedence.lf
@@ -36,14 +36,14 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
 
   reaction(t) {=
     if (self->received_count != self->count) {
-        lf_print_error_and_exit("reaction(t) was invoked before reaction(in). Precedence order was not kept.");
+      lf_print_error_and_exit("reaction(t) was invoked before reaction(in). Precedence order was not kept.");
     }
   =}
 
   reaction(shutdown) {=
     lf_print("******* Shutdown invoked.");
     if (self->count != 6 * self->incr) {
-        lf_print_error_and_exit("Failed to receive all six expected inputs.");
+      lf_print_error_and_exit("Failed to receive all six expected inputs.");
     }
   =}
 }
diff --git a/test/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf b/test/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf
index e3a3f73a0f..9e8fb02059 100644
--- a/test/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf
+++ b/test/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf
@@ -26,7 +26,7 @@ reactor Contained(incr: int = 1) {
 
   reaction(t) {=
     if (self->received_count != self->count) {
-        lf_print_error_and_exit("reaction(t) was invoked before reaction(in). Precedence order was not kept.");
+      lf_print_error_and_exit("reaction(t) was invoked before reaction(in). Precedence order was not kept.");
     }
   =}
 }
@@ -56,7 +56,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
   reaction(shutdown) {=
     lf_print("******* Shutdown invoked.");
     if (self->count != 6 * self->incr) {
-        lf_print_error_and_exit("Failed to receive all six expected inputs.");
+      lf_print_error_and_exit("Failed to receive all six expected inputs.");
     }
   =}
 }
diff --git a/test/C/src/federated/LoopDistributedDecentralized.lf b/test/C/src/federated/LoopDistributedDecentralized.lf
index 7dc4197138..d5c430ef3e 100644
--- a/test/C/src/federated/LoopDistributedDecentralized.lf
+++ b/test/C/src/federated/LoopDistributedDecentralized.lf
@@ -19,12 +19,12 @@ reactor Looper(incr: int = 1, delay: time = 0 msec, stp_offset: time = 0) {
     bool stop = false;
     // Thread to trigger an action once every second.
     void* ping(void* actionref) {
-        while(!stop) {
-            lf_print("Scheduling action.");
-            lf_schedule(actionref, 0);
-            sleep(1);
-        }
-        return NULL;
+      while(!stop) {
+        lf_print("Scheduling action.");
+        lf_schedule(actionref, 0);
+        sleep(1);
+      }
+      return NULL;
     }
   =}
   input in: int
@@ -67,7 +67,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec, stp_offset: time = 0) {
     // Stop the thread that is scheduling actions.
     stop = true;
     if (self->count != 5 * self->incr) {
-        lf_print_error_and_exit("Failed to receive all five expected inputs.");
+      lf_print_error_and_exit("Failed to receive all five expected inputs.");
     }
   =}
 }
diff --git a/test/C/src/federated/LoopDistributedDouble.lf b/test/C/src/federated/LoopDistributedDouble.lf
index e8d3cd7bf8..45d3c207ac 100644
--- a/test/C/src/federated/LoopDistributedDouble.lf
+++ b/test/C/src/federated/LoopDistributedDouble.lf
@@ -23,12 +23,12 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
     bool stop = false;
     // Thread to trigger an action once every second.
     void* ping(void* actionref) {
-        while(!stop) {
-            lf_print("Scheduling action.");
-            lf_schedule(actionref, 0);
-            sleep(1);
-        }
-        return NULL;
+      while(!stop) {
+        lf_print("Scheduling action.");
+        lf_schedule(actionref, 0);
+        sleep(1);
+      }
+      return NULL;
     }
   =}
   input in: int
@@ -48,9 +48,9 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
 
   reaction(a) -> out, out2 {=
     if (self->count%2 == 0) {
-        lf_set(out, self->count);
+      lf_set(out, self->count);
     } else {
-        lf_set(out2, self->count);
+      lf_set(out2, self->count);
     }
     self->count += self->incr;
   =}
@@ -58,23 +58,23 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
   reaction(in) {=
     tag_t current_tag = lf_tag();
     lf_print("Received %d at logical time (%lld, %d).",
-        in->value,
-        current_tag.time - lf_time_start(), current_tag.microstep
+      in->value,
+      current_tag.time - lf_time_start(), current_tag.microstep
     );
   =}
 
   reaction(in2) {=
     tag_t current_tag = lf_tag();
     lf_print("Received %d on in2 at logical time (%lld, %d).",
-        in2->value,
-        current_tag.time - lf_time_start(), current_tag.microstep
+      in2->value,
+      current_tag.time - lf_time_start(), current_tag.microstep
     );
   =}
 
   reaction(t) {=
     tag_t current_tag = lf_tag();
     lf_print("Timer triggered at logical time (%lld, %d).",
-        current_tag.time - lf_time_start(), current_tag.microstep
+      current_tag.time - lf_time_start(), current_tag.microstep
     );
   =}
 
@@ -83,7 +83,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
     // Stop the thread that is scheduling actions.
     stop = true;
     if (self->count != 5 * self->incr) {
-        lf_print_error_and_exit("Failed to receive all five expected inputs.");
+      lf_print_error_and_exit("Failed to receive all five expected inputs.");
     }
   =}
 }
diff --git a/test/C/src/federated/PhysicalSTP.lf b/test/C/src/federated/PhysicalSTP.lf
index 130ca02996..efd9313e4e 100644
--- a/test/C/src/federated/PhysicalSTP.lf
+++ b/test/C/src/federated/PhysicalSTP.lf
@@ -14,14 +14,14 @@ reactor Print(STP_offset_param: time = 0) {
     interval_t elapsed_time = lf_time_logical_elapsed();
     lf_print("At time %lld, received %d", elapsed_time, in->value);
     if (in->value != self->c) {
-        lf_print_error_and_exit("Expected to receive %d.", self->c);
+      lf_print_error_and_exit("Expected to receive %d.", self->c);
     }
     instant_t STP_discrepency = lf_time_logical() + self->STP_offset_param - in->physical_time_of_arrival;
     if (STP_discrepency < 0) {
-        lf_print("The message has violated the STP offset by %lld in physical time.", -1 * STP_discrepency);
-        self->c++;
+      lf_print("The message has violated the STP offset by %lld in physical time.", -1 * STP_discrepency);
+      self->c++;
     } else {
-        lf_print_error_and_exit("Message arrived %lld early.", STP_discrepency);
+      lf_print_error_and_exit("Message arrived %lld early.", STP_discrepency);
     }
   =} STP(STP_offset_param) {=
     // This STP handler should never be invoked because the only source of event
@@ -31,7 +31,7 @@ reactor Print(STP_offset_param: time = 0) {
 
   reaction(shutdown) {=
     if (self->c != 3) {
-        lf_print_error_and_exit("Expected to receive 2 items but got %d.", self->c);
+      lf_print_error_and_exit("Expected to receive 2 items but got %d.", self->c);
     }
   =}
 }
diff --git a/test/C/src/federated/PingPongDistributedPhysical.lf b/test/C/src/federated/PingPongDistributedPhysical.lf
index c0f93051c3..c5cbc9d495 100644
--- a/test/C/src/federated/PingPongDistributedPhysical.lf
+++ b/test/C/src/federated/PingPongDistributedPhysical.lf
@@ -37,9 +37,9 @@ reactor Ping(count: int = 10) {
 
   reaction(receive) -> serve {=
     if (self->pingsLeft > 0) {
-        lf_schedule(serve, 0);
+      lf_schedule(serve, 0);
     } else {
-        lf_request_stop();
+      lf_request_stop();
     }
   =}
 }
@@ -54,16 +54,16 @@ reactor Pong(expected: int = 10) {
     printf("At logical time %lld, Pong received %d.\n", lf_time_logical_elapsed(), receive->value);
     lf_set(send, receive->value);
     if (self->count == self->expected) {
-        lf_request_stop();
+      lf_request_stop();
     }
   =}
 
   reaction(shutdown) {=
     if (self->count != self->expected) {
-        fprintf(stderr, "Pong expected to receive %d inputs, but it received %d.\n",
-            self->expected, self->count
-        );
-        exit(1);
+      fprintf(stderr, "Pong expected to receive %d inputs, but it received %d.\n",
+        self->expected, self->count
+      );
+      exit(1);
     }
     printf("Pong received %d pings.\n", self->count);
   =}
diff --git a/test/C/src/federated/STPParameter.lf b/test/C/src/federated/STPParameter.lf
index 97710dec50..f9d42b62f4 100644
--- a/test/C/src/federated/STPParameter.lf
+++ b/test/C/src/federated/STPParameter.lf
@@ -22,7 +22,7 @@ reactor PrintTimer(STP_offset: time = 1 sec, start: int = 1, stride: int = 1, nu
   reaction(in) {=
     lf_print("Received %d.", in->value);
     if (in->value != self->count) {
-        lf_print_error_and_exit("Expected %d.", self->count);
+      lf_print_error_and_exit("Expected %d.", self->count);
     }
     self->count += self->stride;
     self->inputs_received++;
@@ -31,16 +31,16 @@ reactor PrintTimer(STP_offset: time = 1 sec, start: int = 1, stride: int = 1, nu
   reaction(shutdown) {=
     lf_print("Shutdown invoked.");
     if (self->inputs_received != self->num_inputs) {
-        lf_print_error_and_exit("Expected to receive %d inputs, but got %d.",
-            self->num_inputs,
-            self->inputs_received
-        );
+      lf_print_error_and_exit("Expected to receive %d inputs, but got %d.",
+        self->num_inputs,
+        self->inputs_received
+      );
     }
   =}
 
   reaction(t) {=
     lf_print("Timer ticked at (%lld, %d).",
-        lf_time_logical_elapsed(), lf_tag().microstep
+      lf_time_logical_elapsed(), lf_tag().microstep
     );
   =}
 }
diff --git a/test/C/src/federated/TopLevelArtifacts.lf b/test/C/src/federated/TopLevelArtifacts.lf
index 8332821089..b2e486b31d 100644
--- a/test/C/src/federated/TopLevelArtifacts.lf
+++ b/test/C/src/federated/TopLevelArtifacts.lf
@@ -33,7 +33,7 @@ federated reactor {
 
   reaction(shutdown) {=
     if (self->successes != 3) {
-        lf_print_error_and_exit("Failed to properly execute top-level reactions");
+      lf_print_error_and_exit("Failed to properly execute top-level reactions");
     }
     lf_print("SUCCESS!");
   =}
diff --git a/test/C/src/federated/failing/ClockSync.lf b/test/C/src/federated/failing/ClockSync.lf
index 57aca058b8..057c7830a2 100644
--- a/test/C/src/federated/failing/ClockSync.lf
+++ b/test/C/src/federated/failing/ClockSync.lf
@@ -10,16 +10,16 @@ target C {
   timeout: 10 sec,
   clock-sync: on,  // Turn on runtime clock synchronization.
   clock-sync-options: {
-    local-federates-on: true,  // Forces all federates to perform clock sync.
-    // Collect useful statistics like average network delay and the standard deviation for the
-    // network delay over one clock synchronization cycle. Generates a warning if the standard
-    // deviation is higher than the clock sync guard. Artificially offsets clocks by multiples of
-    // 200 msec.
-    collect-stats: true,
-    test-offset: 200 msec,
-    period: 5 msec,  // Period with which runtime clock sync is performed.
-    trials: 10,  // Number of messages exchanged to perform clock sync.
-    attenuation: 10  // Attenuation applied to runtime clock sync adjustments.
+  local-federates-on: true,  // Forces all federates to perform clock sync.
+  // Collect useful statistics like average network delay and the standard deviation for the
+  // network delay over one clock synchronization cycle. Generates a warning if the standard
+  // deviation is higher than the clock sync guard. Artificially offsets clocks by multiples of
+  // 200 msec.
+  collect-stats: true,
+  test-offset: 200 msec,
+  period: 5 msec,  // Period with which runtime clock sync is performed.
+  trials: 10,  // Number of messages exchanged to perform clock sync.
+  attenuation: 10  // Attenuation applied to runtime clock sync adjustments.
   }
 }
 
@@ -37,20 +37,20 @@ reactor Printer {
   input in: int
 
   reaction(startup) {=
-    interval_t offset = _lf_time_physical_clock_offset + _lf_time_test_physical_clock_offset;
-    lf_print("Clock sync error at startup is %lld ns.", offset);
+  interval_t offset = _lf_time_physical_clock_offset + _lf_time_test_physical_clock_offset;
+  lf_print("Clock sync error at startup is %lld ns.", offset);
   =}
 
   reaction(in) {= lf_print("Received %d.", in->value); =}
 
   reaction(shutdown) {=
-    interval_t offset = _lf_time_physical_clock_offset + _lf_time_test_physical_clock_offset;
-    lf_print("Clock sync error at shutdown is %lld ns.", offset);
-    // Error out if the offset is bigger than 100 msec.
-    if (offset > MSEC(100)) {
-        lf_print_error("Offset exceeds test threshold of 100 msec.");
-        exit(1);
-    }
+  interval_t offset = _lf_time_physical_clock_offset + _lf_time_test_physical_clock_offset;
+  lf_print("Clock sync error at shutdown is %lld ns.", offset);
+  // Error out if the offset is bigger than 100 msec.
+  if (offset > MSEC(100)) {
+    lf_print_error("Offset exceeds test threshold of 100 msec.");
+    exit(1);
+  }
   =}
 }
 
diff --git a/test/C/src/federated/failing/DistributedDoublePortLooped.lf b/test/C/src/federated/failing/DistributedDoublePortLooped.lf
index 15b42ea92d..fbadc7b03f 100644
--- a/test/C/src/federated/failing/DistributedDoublePortLooped.lf
+++ b/test/C/src/federated/failing/DistributedDoublePortLooped.lf
@@ -53,12 +53,12 @@ reactor Print {
   timer t(0, 2 msec)
 
   reaction(in1, in2, in3, t) -> out {=
-    interval_t elapsed_time = lf_time_logical_elapsed();
-    lf_print("At tag (%lld, %u), received in = %d and in2 = %d.", elapsed_time, lf_tag().microstep, in1->value, in2->value);
-    if (in1->is_present && in2->is_present) {
-        lf_print_error_and_exit("ERROR: invalid logical simultaneity.");
-    }
-    lf_set(out, in1->value);
+  interval_t elapsed_time = lf_time_logical_elapsed();
+  lf_print("At tag (%lld, %u), received in = %d and in2 = %d.", elapsed_time, lf_tag().microstep, in1->value, in2->value);
+  if (in1->is_present && in2->is_present) {
+    lf_print_error_and_exit("ERROR: invalid logical simultaneity.");
+  }
+  lf_set(out, in1->value);
   =}
 }
 
diff --git a/test/C/src/federated/failing/DistributedDoublePortLooped2.lf b/test/C/src/federated/failing/DistributedDoublePortLooped2.lf
index 5910d73533..0d63e4fb7c 100644
--- a/test/C/src/federated/failing/DistributedDoublePortLooped2.lf
+++ b/test/C/src/federated/failing/DistributedDoublePortLooped2.lf
@@ -17,8 +17,8 @@ reactor Count {
   timer t(0, 1 msec)
 
   reaction(t) -> out {=
-    lf_print("Count sends %d.", self->count);
-    lf_set(out, self->count++);
+  lf_print("Count sends %d.", self->count);
+  lf_set(out, self->count++);
   =}
 
   reaction(in) {= lf_print("Count received %d.", in->value); =}
@@ -42,21 +42,21 @@ reactor Print {
   timer t(0, 2 msec)
 
   reaction(in, in2) -> out {=
-    interval_t elapsed_time = lf_time_logical_elapsed();
-    if (in->is_present) {
-        lf_print("At tag (%lld, %u), received in = %d.", elapsed_time, lf_tag().microstep, in->value);
-    }
-    if (in2->is_present) {
-        lf_print("At tag (%lld, %u), received in2 = %d.", elapsed_time, lf_tag().microstep, in2->value);
-    }
-    if (in->is_present && in2->is_present) {
-        lf_print_error_and_exit("ERROR: invalid logical simultaneity.");
-    }
-    lf_set(out, in->value);
+  interval_t elapsed_time = lf_time_logical_elapsed();
+  if (in->is_present) {
+    lf_print("At tag (%lld, %u), received in = %d.", elapsed_time, lf_tag().microstep, in->value);
+  }
+  if (in2->is_present) {
+    lf_print("At tag (%lld, %u), received in2 = %d.", elapsed_time, lf_tag().microstep, in2->value);
+  }
+  if (in->is_present && in2->is_present) {
+    lf_print_error_and_exit("ERROR: invalid logical simultaneity.");
+  }
+  lf_set(out, in->value);
   =}
 
   reaction(t) {=
-    // Do nothing
+  // Do nothing
   =}
 
   reaction(shutdown) {= lf_print("SUCCESS: messages were at least one microstep apart."); =}
diff --git a/test/C/src/federated/failing/DistributedNetworkOrderDecentralized.lf b/test/C/src/federated/failing/DistributedNetworkOrderDecentralized.lf
index 34f861dc4d..e73fa92f83 100644
--- a/test/C/src/federated/failing/DistributedNetworkOrderDecentralized.lf
+++ b/test/C/src/federated/failing/DistributedNetworkOrderDecentralized.lf
@@ -16,15 +16,15 @@ reactor Sender {
   timer t(0, 1 msec)
 
   reaction(t) {=
-    int payload = 1;
-    if (lf_time_logical_elapsed() == 0LL) {
-        send_timed_message(MSEC(10), MSG_TYPE_P2P_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
-                            (unsigned char*)&payload);
-    } else if (lf_time_logical_elapsed() == MSEC(5)) {
-        payload = 2;
-        send_timed_message(MSEC(5), MSG_TYPE_P2P_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
-                            (unsigned char*)&payload);
-    }
+  int payload = 1;
+  if (lf_time_logical_elapsed() == 0LL) {
+    send_timed_message(MSEC(10), MSG_TYPE_P2P_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
+              (unsigned char*)&payload);
+  } else if (lf_time_logical_elapsed() == MSEC(5)) {
+    payload = 2;
+    send_timed_message(MSEC(5), MSG_TYPE_P2P_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
+              (unsigned char*)&payload);
+  }
   =}
 }
 
@@ -33,28 +33,28 @@ reactor Receiver {
   state success: int = 0
 
   reaction(in) {=
-    tag_t current_tag = lf_tag();
-    if (current_tag.time == (lf_time_start() + MSEC(10))) {
-        if (current_tag.microstep == 0 && in->value == 1) {
-            self->success++;
-        } else if (current_tag.microstep == 1 && in->value == 2) {
-            self->success++;
-        }
+  tag_t current_tag = lf_tag();
+  if (current_tag.time == (lf_time_start() + MSEC(10))) {
+    if (current_tag.microstep == 0 && in->value == 1) {
+      self->success++;
+    } else if (current_tag.microstep == 1 && in->value == 2) {
+      self->success++;
     }
-    printf("Received %d at tag (%lld, %u) with intended tag (%lld, %u).\n",
-           in->value,
-           lf_time_logical_elapsed(),
-           lf_tag().microstep,
-           in->intended_tag.time - lf_time_start(),
-           in->intended_tag.microstep);
+  }
+  printf("Received %d at tag (%lld, %u) with intended tag (%lld, %u).\n",
+       in->value,
+       lf_time_logical_elapsed(),
+       lf_tag().microstep,
+       in->intended_tag.time - lf_time_start(),
+       in->intended_tag.microstep);
   =}
 
   reaction(shutdown) {=
-    if (self->success != 2) {
-        fprintf(stderr, "ERROR: Failed to receive messages.\n");
-        exit(1);
-    }
-    printf("SUCCESS.\n");
+  if (self->success != 2) {
+    fprintf(stderr, "ERROR: Failed to receive messages.\n");
+    exit(1);
+  }
+  printf("SUCCESS.\n");
   =}
 }
 
diff --git a/test/C/src/federated/failing/LoopDistributedDecentralizedPrecedence.lf b/test/C/src/federated/failing/LoopDistributedDecentralizedPrecedence.lf
index 0a19f9b962..82f394f2bc 100644
--- a/test/C/src/federated/failing/LoopDistributedDecentralizedPrecedence.lf
+++ b/test/C/src/federated/failing/LoopDistributedDecentralizedPrecedence.lf
@@ -19,41 +19,41 @@ reactor Looper(incr: int = 1, delay: time = 0 msec, stp_offset: time = 0) {
   timer t(0, 1 sec)
 
   reaction(t) -> out {=
-    lf_set(out, self->count);
-    self->count += self->incr;
+  lf_set(out, self->count);
+  self->count += self->incr;
   =}
 
   reaction(in) {=
-    instant_t time_lag = lf_time_physical() - lf_time_logical();
-    char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
-    lf_readable_time(time_buffer, time_lag);
-    lf_print("Received %d. Logical time is behind physical time by %s.", in->value, time_buffer);
-    self->received_count = self->count;
+  instant_t time_lag = lf_time_physical() - lf_time_logical();
+  char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
+  lf_readable_time(time_buffer, time_lag);
+  lf_print("Received %d. Logical time is behind physical time by %s.", in->value, time_buffer);
+  self->received_count = self->count;
   =} STP(stp_offset) {=
-    instant_t time_lag = lf_time_physical() - lf_time_logical();
-    char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
-    lf_readable_time(time_buffer, time_lag);
-    lf_print("STP offset was violated. Received %d. Logical time is behind physical time by %s.", in->value, time_buffer);
-    self->received_count = self->count;
+  instant_t time_lag = lf_time_physical() - lf_time_logical();
+  char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
+  lf_readable_time(time_buffer, time_lag);
+  lf_print("STP offset was violated. Received %d. Logical time is behind physical time by %s.", in->value, time_buffer);
+  self->received_count = self->count;
   =} deadline(10 msec) {=
-    instant_t time_lag = lf_time_physical() - lf_time_logical();
-    char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
-    lf_readable_time(time_buffer, time_lag);
-    lf_print("Deadline miss. Received %d. Logical time is behind physical time by %s.", in->value, time_buffer);
-    self->received_count = self->count;
+  instant_t time_lag = lf_time_physical() - lf_time_logical();
+  char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
+  lf_readable_time(time_buffer, time_lag);
+  lf_print("Deadline miss. Received %d. Logical time is behind physical time by %s.", in->value, time_buffer);
+  self->received_count = self->count;
   =}
 
   reaction(t) {=
-    if (self->received_count != self->count) {
-        lf_print_error_and_exit("reaction(t) was invoked before reaction(in). Precedence order was not kept.");
-    }
+  if (self->received_count != self->count) {
+    lf_print_error_and_exit("reaction(t) was invoked before reaction(in). Precedence order was not kept.");
+  }
   =}
 
   reaction(shutdown) {=
-    lf_print("******* Shutdown invoked.");
-    if (self->count != 5 * self->incr) {
-        lf_print_error_and_exit("Failed to receive all five expected inputs.");
-    }
+  lf_print("******* Shutdown invoked.");
+  if (self->count != 5 * self->incr) {
+    lf_print_error_and_exit("Failed to receive all five expected inputs.");
+  }
   =}
 }
 
diff --git a/test/C/src/federated/failing/LoopDistributedDecentralizedPrecedenceHierarchy.lf b/test/C/src/federated/failing/LoopDistributedDecentralizedPrecedenceHierarchy.lf
index 5db194a582..46b98b5ed8 100644
--- a/test/C/src/federated/failing/LoopDistributedDecentralizedPrecedenceHierarchy.lf
+++ b/test/C/src/federated/failing/LoopDistributedDecentralizedPrecedenceHierarchy.lf
@@ -23,32 +23,32 @@ reactor Looper(incr: int = 1, delay: time = 0 msec, stp_offset: time = 0) {
   in -> c.in
 
   reaction(t) -> out {=
-    lf_set(out, self->count);
-    self->count += self->incr;
+  lf_set(out, self->count);
+  self->count += self->incr;
   =}
 
   reaction(in) {=
-    instant_t time_lag = lf_time_physical() - lf_time_logical();
-    char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
-    lf_readable_time(time_buffer, time_lag);
-    lf_print("Received %d. Logical time is behind physical time by %s nsec.", in->value, time_buffer);
+  instant_t time_lag = lf_time_physical() - lf_time_logical();
+  char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
+  lf_readable_time(time_buffer, time_lag);
+  lf_print("Received %d. Logical time is behind physical time by %s nsec.", in->value, time_buffer);
   =} STP(stp_offset) {=
-    instant_t time_lag = lf_time_physical() - lf_time_logical();
-    char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
-    lf_readable_time(time_buffer, time_lag);
-    lf_print("STP offset was violated. Received %d. Logical time is behind physical time by %s nsec.", in->value, time_buffer);
+  instant_t time_lag = lf_time_physical() - lf_time_logical();
+  char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
+  lf_readable_time(time_buffer, time_lag);
+  lf_print("STP offset was violated. Received %d. Logical time is behind physical time by %s nsec.", in->value, time_buffer);
   =} deadline(10 msec) {=
-    instant_t time_lag = lf_time_physical() - lf_time_logical();
-    char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
-    lf_readable_time(time_buffer, time_lag);
-    lf_print("Deadline miss. Received %d. Logical time is behind physical time by %s nsec.", in->value, time_buffer);
+  instant_t time_lag = lf_time_physical() - lf_time_logical();
+  char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
+  lf_readable_time(time_buffer, time_lag);
+  lf_print("Deadline miss. Received %d. Logical time is behind physical time by %s nsec.", in->value, time_buffer);
   =}
 
   reaction(shutdown) {=
-    lf_print("******* Shutdown invoked.");
-    if (self->count != 5 * self->incr) {
-        lf_print_error_and_exit("Failed to receive all five expected inputs.");
-    }
+  lf_print("******* Shutdown invoked.");
+  if (self->count != 5 * self->incr) {
+    lf_print_error_and_exit("Failed to receive all five expected inputs.");
+  }
   =}
 }
 
diff --git a/test/C/src/federated/failing/SpuriousDependency.lf b/test/C/src/federated/failing/SpuriousDependency.lf
index a022c3abf4..b509a4acae 100644
--- a/test/C/src/federated/failing/SpuriousDependency.lf
+++ b/test/C/src/federated/failing/SpuriousDependency.lf
@@ -6,47 +6,47 @@
  * resolved the ambiguity in a way that does appear to result in deadlock.
  */
 target C {
-    timeout: 2 sec
+  timeout: 2 sec
 }
 
 reactor Passthrough {
-    input in: int
-    output out: int
+  input in: int
+  output out: int
 
-    reaction(in) -> out {=
-        lf_print("Hello from passthrough");
-        lf_set(out, in->value);
-    =}
+  reaction(in) -> out {=
+    lf_print("Hello from passthrough");
+    lf_set(out, in->value);
+  =}
 }
 
 reactor Twisty {
-    input in0: int
-    input in1: int
-    output out0: int
-    output out1: int
-    p0 = new Passthrough()
-    p1 = new Passthrough()
-    in0 -> p0.in
-    p0.out -> out0
-    in1 -> p1.in
-    p1.out -> out1
+  input in0: int
+  input in1: int
+  output out0: int
+  output out1: int
+  p0 = new Passthrough()
+  p1 = new Passthrough()
+  in0 -> p0.in
+  p0.out -> out0
+  in1 -> p1.in
+  p1.out -> out1
 }
 
 federated reactor {
-    t0 = new Twisty()
-    t1 = new Twisty()
-    t0.out1 -> t1.in0
-    t1.out1 -> t0.in0
-    state count: int = 0
+  t0 = new Twisty()
+  t1 = new Twisty()
+  t0.out1 -> t1.in0
+  t1.out1 -> t0.in0
+  state count: int = 0
 
-    reaction(startup) -> t0.in1 {= lf_set(t0.in1, 0); =}
+  reaction(startup) -> t0.in1 {= lf_set(t0.in1, 0); =}
 
-    reaction(t1.out0) {= self->count++; =}
+  reaction(t1.out0) {= self->count++; =}
 
-    reaction(shutdown) {=
-        lf_print("******* Shutdown invoked.");
-        if (self->count != 1) {
-            lf_print_error_and_exit("Failed to receive expected input.");
-        }
-    =}
+  reaction(shutdown) {=
+    lf_print("******* Shutdown invoked.");
+    if (self->count != 1) {
+      lf_print_error_and_exit("Failed to receive expected input.");
+    }
+  =}
 }
diff --git a/test/C/src/generics/TypeCheck.lf b/test/C/src/generics/TypeCheck.lf
index c24f75d29e..db3524798e 100644
--- a/test/C/src/generics/TypeCheck.lf
+++ b/test/C/src/generics/TypeCheck.lf
@@ -20,7 +20,7 @@ reactor TestCount<T>(start: int = 1, num_inputs: int = 1) {
   reaction(in) {=
     lf_print("Received %d.", in->value);
     if (in->value != self->count) {
-        lf_print_error_and_exit("Expected %d.", self->count);
+      lf_print_error_and_exit("Expected %d.", self->count);
     }
     self->count++;
     self->inputs_received++;
@@ -29,10 +29,10 @@ reactor TestCount<T>(start: int = 1, num_inputs: int = 1) {
   reaction(shutdown) {=
     lf_print("Shutdown invoked.");
     if (self->inputs_received != self->num_inputs) {
-        lf_print_error_and_exit("Expected to receive %d inputs, but got %d.",
-            self->num_inputs,
-            self->inputs_received
-        );
+      lf_print_error_and_exit("Expected to receive %d inputs, but got %d.",
+        self->num_inputs,
+        self->inputs_received
+      );
     }
   =}
 }
diff --git a/test/C/src/lib/ImportedAgain.lf b/test/C/src/lib/ImportedAgain.lf
index dbde5e9fb0..6870526b95 100644
--- a/test/C/src/lib/ImportedAgain.lf
+++ b/test/C/src/lib/ImportedAgain.lf
@@ -8,8 +8,8 @@ reactor ImportedAgain {
   reaction(x) {=
     printf("Received: %d.\n", x->value);
     if (x->value != 42) {
-        printf("ERROR: Expected input to be 42. Got: %d.\n", x->value);
-        exit(1);
+      printf("ERROR: Expected input to be 42. Got: %d.\n", x->value);
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/lib/LoopedActionSender.lf b/test/C/src/lib/LoopedActionSender.lf
index e4f52c75c3..cabe53607b 100644
--- a/test/C/src/lib/LoopedActionSender.lf
+++ b/test/C/src/lib/LoopedActionSender.lf
@@ -18,18 +18,18 @@ reactor Sender(take_a_break_after: int = 10, break_interval: time = 400 msec) {
   reaction(startup, act) -> act, out {=
     // Send a message on out
     /* printf("At tag (%lld, %u) sending value %d.\n",
-        lf_time_logical_elapsed(),
-        lf_tag().microstep,
-        self->sent_messages
+      lf_time_logical_elapsed(),
+      lf_tag().microstep,
+      self->sent_messages
     ); */
     lf_set(out, self->sent_messages);
     self->sent_messages++;
     if (self->sent_messages < self->take_a_break_after) {
-        lf_schedule(act, 0);
+      lf_schedule(act, 0);
     } else {
-        // Take a break
-        self->sent_messages=0;
-        lf_schedule(act, self->break_interval);
+      // Take a break
+      self->sent_messages=0;
+      lf_schedule(act, self->break_interval);
     }
   =}
 }
diff --git a/test/C/src/lib/Test.lf b/test/C/src/lib/Test.lf
index 6feab88015..69e4f79b2c 100644
--- a/test/C/src/lib/Test.lf
+++ b/test/C/src/lib/Test.lf
@@ -7,8 +7,8 @@ reactor TestDouble(expected: double[] = {1.0, 1.0, 1.0, 1.0}) {
   reaction(in) {=
     printf("Received: %f\n", in->value);
     if (in->value != self->expected[self->count]) {
-        printf("ERROR: Expected %f.\n", self->expected[self->count]);
-        exit(1);
+      printf("ERROR: Expected %f.\n", self->expected[self->count]);
+      exit(1);
     }
     self->count++;
   =}
diff --git a/test/C/src/lib/TestCount.lf b/test/C/src/lib/TestCount.lf
index 570cc7fe3e..e4fbb82b02 100644
--- a/test/C/src/lib/TestCount.lf
+++ b/test/C/src/lib/TestCount.lf
@@ -16,7 +16,7 @@ reactor TestCount(start: int = 1, stride: int = 1, num_inputs: int = 1) {
   reaction(in) {=
     lf_print("Received %d.", in->value);
     if (in->value != self->count) {
-        lf_print_error_and_exit("Expected %d.", self->count);
+      lf_print_error_and_exit("Expected %d.", self->count);
     }
     self->count += self->stride;
     self->inputs_received++;
@@ -25,10 +25,10 @@ reactor TestCount(start: int = 1, stride: int = 1, num_inputs: int = 1) {
   reaction(shutdown) {=
     lf_print("Shutdown invoked.");
     if (self->inputs_received != self->num_inputs) {
-        lf_print_error_and_exit("Expected to receive %d inputs, but got %d.",
-            self->num_inputs,
-            self->inputs_received
-        );
+      lf_print_error_and_exit("Expected to receive %d inputs, but got %d.",
+        self->num_inputs,
+        self->inputs_received
+      );
     }
   =}
 }
diff --git a/test/C/src/lib/TestCountMultiport.lf b/test/C/src/lib/TestCountMultiport.lf
index 69ec75adec..a0b0db294d 100644
--- a/test/C/src/lib/TestCountMultiport.lf
+++ b/test/C/src/lib/TestCountMultiport.lf
@@ -17,14 +17,14 @@ reactor TestCountMultiport(start: int = 1, stride: int = 1, num_inputs: int = 1,
 
   reaction(in) {=
     for (int i = 0; i < in_width; i++) {
-        if (!in[i]->is_present) {
-            lf_print_error_and_exit("No input on channel %d.", i);
-        }
-        lf_print("Received %d on channel %d.", in[i]->value, i);
-        if (in[i]->value != self->count) {
-            lf_print_error_and_exit("Expected %d.", self->count);
-        }
-        self->count += self->stride;
+      if (!in[i]->is_present) {
+        lf_print_error_and_exit("No input on channel %d.", i);
+      }
+      lf_print("Received %d on channel %d.", in[i]->value, i);
+      if (in[i]->value != self->count) {
+        lf_print_error_and_exit("Expected %d.", self->count);
+      }
+      self->count += self->stride;
     }
     self->inputs_received++;
   =}
@@ -32,10 +32,10 @@ reactor TestCountMultiport(start: int = 1, stride: int = 1, num_inputs: int = 1,
   reaction(shutdown) {=
     lf_print("Shutdown invoked.");
     if (self->inputs_received != self->num_inputs) {
-        lf_print_error_and_exit("Expected to receive %d inputs, but only got %d.",
-            self->num_inputs,
-            self->inputs_received
-        );
+      lf_print_error_and_exit("Expected to receive %d inputs, but only got %d.",
+        self->num_inputs,
+        self->inputs_received
+      );
     }
   =}
 }
diff --git a/test/C/src/modal_models/BanksCount3ModesComplex.lf b/test/C/src/modal_models/BanksCount3ModesComplex.lf
index 220f63c949..e548d28cef 100644
--- a/test/C/src/modal_models/BanksCount3ModesComplex.lf
+++ b/test/C/src/modal_models/BanksCount3ModesComplex.lf
@@ -50,30 +50,30 @@ main reactor {
   timer stepper(0, 250 msec)
   counters = new[2] MetaCounter()
   test = new TraceTesting(  // keep-format
-      events_size = 16,
-      trace_size = 429,
-      trace = {
-          0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-          250000000,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-          250000000,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-          250000000,1,1,1,1,1,1,1,1,0,3,0,3,0,3,0,3,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,
-          250000000,1,2,1,2,1,2,1,2,0,3,0,3,0,3,0,3,1,2,1,2,1,2,1,2,0,0,0,0,0,0,0,0,
-          250000000,1,3,1,3,1,3,1,3,1,1,1,1,1,1,1,1,0,2,0,2,0,2,0,2,0,0,0,0,0,0,0,0,
-          250000000,1,1,1,1,1,1,1,1,0,1,0,1,0,1,0,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,
-          250000000,1,2,1,2,1,2,1,2,0,1,0,1,0,1,0,1,1,2,1,2,1,2,1,2,0,0,0,0,0,0,0,0,
-          250000000,1,3,1,3,1,3,1,3,1,2,1,2,1,2,1,2,0,2,0,2,0,2,0,2,0,0,0,0,0,0,0,0,
-          250000000,1,1,1,1,1,1,1,1,0,2,0,2,0,2,0,2,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,
-          250000000,1,2,1,2,1,2,1,2,0,2,0,2,0,2,0,2,1,2,1,2,1,2,1,2,0,0,0,0,0,0,0,0,
-          250000000,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,0,2,0,2,0,2,0,2,0,0,0,0,0,0,0,0,
-          250000000,1,1,1,1,1,1,1,1,0,3,0,3,0,3,0,3,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0
-      }, training = false)
+    events_size = 16,
+    trace_size = 429,
+    trace = {
+      0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+      250000000,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+      250000000,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+      250000000,1,1,1,1,1,1,1,1,0,3,0,3,0,3,0,3,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,
+      250000000,1,2,1,2,1,2,1,2,0,3,0,3,0,3,0,3,1,2,1,2,1,2,1,2,0,0,0,0,0,0,0,0,
+      250000000,1,3,1,3,1,3,1,3,1,1,1,1,1,1,1,1,0,2,0,2,0,2,0,2,0,0,0,0,0,0,0,0,
+      250000000,1,1,1,1,1,1,1,1,0,1,0,1,0,1,0,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,
+      250000000,1,2,1,2,1,2,1,2,0,1,0,1,0,1,0,1,1,2,1,2,1,2,1,2,0,0,0,0,0,0,0,0,
+      250000000,1,3,1,3,1,3,1,3,1,2,1,2,1,2,1,2,0,2,0,2,0,2,0,2,0,0,0,0,0,0,0,0,
+      250000000,1,1,1,1,1,1,1,1,0,2,0,2,0,2,0,2,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,
+      250000000,1,2,1,2,1,2,1,2,0,2,0,2,0,2,0,2,1,2,1,2,1,2,1,2,0,0,0,0,0,0,0,0,
+      250000000,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,0,2,0,2,0,2,0,2,0,0,0,0,0,0,0,0,
+      250000000,1,1,1,1,1,1,1,1,0,3,0,3,0,3,0,3,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0
+    }, training = false)
 
   counters.always, counters.mode1, counters.mode2, counters.never -> test.events
 
   // Trigger
   reaction(stepper) -> counters.next {=
     for(int i = 0; i < 2; i++) {
-        lf_set(counters[i].next, true);
+      lf_set(counters[i].next, true);
     }
   =}
 }
diff --git a/test/C/src/modal_models/BanksCount3ModesSimple.lf b/test/C/src/modal_models/BanksCount3ModesSimple.lf
index e4f9ea6ec6..be676898ab 100644
--- a/test/C/src/modal_models/BanksCount3ModesSimple.lf
+++ b/test/C/src/modal_models/BanksCount3ModesSimple.lf
@@ -11,15 +11,15 @@ main reactor {
   timer stepper(0, 250 msec)
   counters = new[3] CounterCycle()
   test = new TraceTesting(events_size = 3, trace_size = 63, trace = {  // keep-format
-      0,1,1,1,1,1,1,
-      250000000,1,2,1,2,1,2,
-      250000000,1,3,1,3,1,3,
-      250000000,1,1,1,1,1,1,
-      250000000,1,2,1,2,1,2,
-      250000000,1,3,1,3,1,3,
-      250000000,1,1,1,1,1,1,
-      250000000,1,2,1,2,1,2,
-      250000000,1,3,1,3,1,3
+    0,1,1,1,1,1,1,
+    250000000,1,2,1,2,1,2,
+    250000000,1,3,1,3,1,3,
+    250000000,1,1,1,1,1,1,
+    250000000,1,2,1,2,1,2,
+    250000000,1,3,1,3,1,3,
+    250000000,1,1,1,1,1,1,
+    250000000,1,2,1,2,1,2,
+    250000000,1,3,1,3,1,3
   }, training = false)
 
   counters.count -> test.events
@@ -27,7 +27,7 @@ main reactor {
   // Trigger
   reaction(stepper) -> counters.next {=
     for(int i = 0; i < 3; i++) {
-        lf_set(counters[i].next, true);
+      lf_set(counters[i].next, true);
     }
   =}
 }
diff --git a/test/C/src/modal_models/BanksModalStateReset.lf b/test/C/src/modal_models/BanksModalStateReset.lf
index 90d7eaf932..83c4af89fb 100644
--- a/test/C/src/modal_models/BanksModalStateReset.lf
+++ b/test/C/src/modal_models/BanksModalStateReset.lf
@@ -14,25 +14,25 @@ main reactor {
   reset1 = new[2] ResetReaction()
   reset2 = new[2] AutoReset()
   test = new TraceTesting(events_size = 16, trace_size = 627, trace = {  // keep-format
-              0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,   0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,
-      250000000,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,   0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,
-      250000000,0,0,0,0,0,0,0,0,1,2,1,2,0,0,0,0,   0,0,0,0,0,0,0,0,1,2,1,2,0,0,0,0,
-      250000000,0,0,0,0,0,0,0,0,1,3,1,3,0,0,0,0,   0,0,0,0,0,0,0,0,1,3,1,3,0,0,0,0,
-      250000000,1,1,1,1,1,0,1,0,1,4,1,4,0,0,0,0,   1,1,1,1,1,0,1,0,1,4,1,4,0,0,0,0,
-              0,0,1,0,1,0,0,0,0,0,4,0,4,1,-2,1,-2, 0,1,0,1,0,0,0,0,0,4,0,4,1,-2,1,-2,
-      250000000,0,1,0,1,0,0,0,0,0,4,0,4,1,-1,1,-1, 0,1,0,1,0,0,0,0,0,4,0,4,1,-1,1,-1,
-      250000000,0,1,0,1,0,0,0,0,0,4,0,4,1,0,1,0,   0,1,0,1,0,0,0,0,0,4,0,4,1,0,1,0,
-      250000000,0,1,0,1,0,0,0,0,0,4,0,4,1,1,1,1,   0,1,0,1,0,0,0,0,0,4,0,4,1,1,1,1,
-      250000000,1,1,1,1,1,1,1,1,0,4,0,4,1,2,1,2,   1,1,1,1,1,1,1,1,0,4,0,4,1,2,1,2,
-      250000000,0,1,0,1,0,1,0,1,1,5,1,5,0,2,0,2,   0,1,0,1,0,1,0,1,1,5,1,5,0,2,0,2,
-      250000000,0,1,0,1,0,1,0,1,1,6,1,6,0,2,0,2,   0,1,0,1,0,1,0,1,1,6,1,6,0,2,0,2,
-      250000000,0,1,0,1,0,1,0,1,1,7,1,7,0,2,0,2,   0,1,0,1,0,1,0,1,1,7,1,7,0,2,0,2,
-      250000000,1,1,1,1,1,2,1,2,1,8,1,8,0,2,0,2,   1,1,1,1,1,2,1,2,1,8,1,8,0,2,0,2,
-              0,0,1,0,1,0,2,0,2,0,8,0,8,1,-2,1,-2, 0,1,0,1,0,2,0,2,0,8,0,8,1,-2,1,-2,
-      250000000,0,1,0,1,0,2,0,2,0,8,0,8,1,-1,1,-1, 0,1,0,1,0,2,0,2,0,8,0,8,1,-1,1,-1,
-      250000000,0,1,0,1,0,2,0,2,0,8,0,8,1,0,1,0,   0,1,0,1,0,2,0,2,0,8,0,8,1,0,1,0,
-      250000000,0,1,0,1,0,2,0,2,0,8,0,8,1,1,1,1,   0,1,0,1,0,2,0,2,0,8,0,8,1,1,1,1,
-      250000000,1,1,1,1,1,3,1,3,0,8,0,8,1,2,1,2,   1,1,1,1,1,3,1,3,0,8,0,8,1,2,1,2
+        0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,   0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,
+    250000000,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,   0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,
+    250000000,0,0,0,0,0,0,0,0,1,2,1,2,0,0,0,0,   0,0,0,0,0,0,0,0,1,2,1,2,0,0,0,0,
+    250000000,0,0,0,0,0,0,0,0,1,3,1,3,0,0,0,0,   0,0,0,0,0,0,0,0,1,3,1,3,0,0,0,0,
+    250000000,1,1,1,1,1,0,1,0,1,4,1,4,0,0,0,0,   1,1,1,1,1,0,1,0,1,4,1,4,0,0,0,0,
+        0,0,1,0,1,0,0,0,0,0,4,0,4,1,-2,1,-2, 0,1,0,1,0,0,0,0,0,4,0,4,1,-2,1,-2,
+    250000000,0,1,0,1,0,0,0,0,0,4,0,4,1,-1,1,-1, 0,1,0,1,0,0,0,0,0,4,0,4,1,-1,1,-1,
+    250000000,0,1,0,1,0,0,0,0,0,4,0,4,1,0,1,0,   0,1,0,1,0,0,0,0,0,4,0,4,1,0,1,0,
+    250000000,0,1,0,1,0,0,0,0,0,4,0,4,1,1,1,1,   0,1,0,1,0,0,0,0,0,4,0,4,1,1,1,1,
+    250000000,1,1,1,1,1,1,1,1,0,4,0,4,1,2,1,2,   1,1,1,1,1,1,1,1,0,4,0,4,1,2,1,2,
+    250000000,0,1,0,1,0,1,0,1,1,5,1,5,0,2,0,2,   0,1,0,1,0,1,0,1,1,5,1,5,0,2,0,2,
+    250000000,0,1,0,1,0,1,0,1,1,6,1,6,0,2,0,2,   0,1,0,1,0,1,0,1,1,6,1,6,0,2,0,2,
+    250000000,0,1,0,1,0,1,0,1,1,7,1,7,0,2,0,2,   0,1,0,1,0,1,0,1,1,7,1,7,0,2,0,2,
+    250000000,1,1,1,1,1,2,1,2,1,8,1,8,0,2,0,2,   1,1,1,1,1,2,1,2,1,8,1,8,0,2,0,2,
+        0,0,1,0,1,0,2,0,2,0,8,0,8,1,-2,1,-2, 0,1,0,1,0,2,0,2,0,8,0,8,1,-2,1,-2,
+    250000000,0,1,0,1,0,2,0,2,0,8,0,8,1,-1,1,-1, 0,1,0,1,0,2,0,2,0,8,0,8,1,-1,1,-1,
+    250000000,0,1,0,1,0,2,0,2,0,8,0,8,1,0,1,0,   0,1,0,1,0,2,0,2,0,8,0,8,1,0,1,0,
+    250000000,0,1,0,1,0,2,0,2,0,8,0,8,1,1,1,1,   0,1,0,1,0,2,0,2,0,8,0,8,1,1,1,1,
+    250000000,1,1,1,1,1,3,1,3,0,8,0,8,1,2,1,2,   1,1,1,1,1,3,1,3,0,8,0,8,1,2,1,2
   }, training = false)
 
   reset1.mode_switch,
@@ -47,13 +47,13 @@ main reactor {
   // Trigger mode change (separately because of #1278)
   reaction(stepper) -> reset1.next {=
     for(int i = 0; i < reset1_width; i++) {
-        lf_set(reset1[i].next, true);
+      lf_set(reset1[i].next, true);
     }
   =}
 
   reaction(stepper) -> reset2.next {=
     for(int i = 0; i < reset2_width; i++) {
-        lf_set(reset2[i].next, true);
+      lf_set(reset2[i].next, true);
     }
   =}
 }
diff --git a/test/C/src/modal_models/ConvertCaseTest.lf b/test/C/src/modal_models/ConvertCaseTest.lf
index 400c40e9ad..1303d7797e 100644
--- a/test/C/src/modal_models/ConvertCaseTest.lf
+++ b/test/C/src/modal_models/ConvertCaseTest.lf
@@ -52,12 +52,12 @@ reactor Converter {
     reaction(raw) -> converted, reset(Lower) {=
       char c = raw->value;
       if (c >= 'a' && c <= 'z') {
-          lf_set(converted, c - 32);
+        lf_set(converted, c - 32);
       } else {
-          lf_set(converted, c);
+        lf_set(converted, c);
       }
       if (c == ' ') {
-          lf_set_mode(Lower);
+        lf_set_mode(Lower);
       }
     =}
   }
@@ -66,12 +66,12 @@ reactor Converter {
     reaction(raw) -> converted, reset(Upper) {=
       char c = raw->value;
       if (c >= 'A' && c <= 'Z') {
-          lf_set(converted, c + 32);
+        lf_set(converted, c + 32);
       } else {
-          lf_set(converted, c);
+        lf_set(converted, c);
       }
       if (c == ' ') {
-          lf_set_mode(Upper);
+        lf_set_mode(Upper);
       }
     =}
   }
@@ -89,8 +89,8 @@ reactor InputFeeder(message: string = "") {
 
   reaction(t) -> character {=
     if (self->idx < strlen(self->message)) {
-        lf_set(character, *(self->message + self->idx));
-        self->idx++;
+      lf_set(character, *(self->message + self->idx));
+      self->idx++;
     }
   =}
 }
@@ -106,18 +106,18 @@ main reactor {
   feeder.character -> history_processor.character
 
   test = new TraceTesting(events_size = 2, trace_size = 60, trace = {  // keep-format
-      0,1,72,1,72,
-      250000000,1,69,1,69,
-      250000000,1,76,1,76,
-      250000000,1,95,1,95,
-      250000000,1,79,1,79,
-      250000000,1,32,1,32,
-      250000000,1,119,1,119,
-      250000000,1,95,1,95,
-      250000000,1,82,1,114,
-      250000000,1,76,1,108,
-      250000000,1,68,1,100,
-      250000000,1,95,1,95
+    0,1,72,1,72,
+    250000000,1,69,1,69,
+    250000000,1,76,1,76,
+    250000000,1,95,1,95,
+    250000000,1,79,1,79,
+    250000000,1,32,1,32,
+    250000000,1,119,1,119,
+    250000000,1,95,1,95,
+    250000000,1,82,1,114,
+    250000000,1,76,1,108,
+    250000000,1,68,1,100,
+    250000000,1,95,1,95
   }, training = false)
 
   reset_processor.converted, history_processor.converted -> test.events
@@ -128,7 +128,9 @@ main reactor {
     lf_set(history_processor.discard, true);
   =}
 
-  reaction(reset_processor.converted) {= printf("Reset: %c\n", reset_processor.converted->value); =}
+  reaction(reset_processor.converted) {=
+    printf("Reset: %c\n", reset_processor.converted->value);
+  =}
 
   reaction(history_processor.converted) {=
     printf("History: %c\n", history_processor.converted->value);
diff --git a/test/C/src/modal_models/Count3Modes.lf b/test/C/src/modal_models/Count3Modes.lf
index dc4063d865..3c2b419a00 100644
--- a/test/C/src/modal_models/Count3Modes.lf
+++ b/test/C/src/modal_models/Count3Modes.lf
@@ -43,17 +43,17 @@ main reactor {
     printf("%d\n", counter.count->value);
 
     if (!counter.count->is_present) {
-        printf("ERROR: Missing mode change.\n");
-        exit(1);
+      printf("ERROR: Missing mode change.\n");
+      exit(1);
     } else if (counter.count->value != self->expected_value) {
-        printf("ERROR: Wrong mode.\n");
-        exit(2);
+      printf("ERROR: Wrong mode.\n");
+      exit(2);
     }
 
     if (self->expected_value == 3) {
-        self->expected_value = 1;
+      self->expected_value = 1;
     } else {
-        self->expected_value++;
+      self->expected_value++;
     }
   =}
 }
diff --git a/test/C/src/modal_models/MixedReactions.lf b/test/C/src/modal_models/MixedReactions.lf
index 274cf77573..ed9ae422f3 100644
--- a/test/C/src/modal_models/MixedReactions.lf
+++ b/test/C/src/modal_models/MixedReactions.lf
@@ -34,13 +34,13 @@ main reactor {
     printf("%d\n", self->x);
     if (self->first) {
       if (self->x != 1234) {
-        printf("ERROR: Wrong reaction order.\n");
-        exit(1);
+      printf("ERROR: Wrong reaction order.\n");
+      exit(1);
       }
       self->first = false;
     } else if (self->x != 12341245) {
-        printf("ERROR: Wrong reaction order.\n");
-        exit(2);
+      printf("ERROR: Wrong reaction order.\n");
+      exit(2);
     }
   =}
 }
diff --git a/test/C/src/modal_models/ModalActions.lf b/test/C/src/modal_models/ModalActions.lf
index 449119d315..cf473cd125 100644
--- a/test/C/src/modal_models/ModalActions.lf
+++ b/test/C/src/modal_models/ModalActions.lf
@@ -66,21 +66,21 @@ main reactor {
 
   modal = new Modal()
   test = new TraceTesting(events_size = 5, trace_size = 165, trace = {  // keep-format
-      0,0,0,1,1,0,0,0,0,0,0,
-      500000000,0,0,0,1,1,1,0,0,0,0,
-      250000000,0,0,1,1,0,1,0,0,0,0,
-      250000000,1,1,0,1,0,1,0,0,0,0,
-      0,0,1,0,1,0,1,1,1,0,0,
-      500000000,0,1,0,1,0,1,0,1,1,1,
-      250000000,0,1,0,1,0,1,1,1,0,1,
-      250000000,1,1,0,1,0,1,0,1,0,1,
-      250000000,0,1,0,1,1,1,0,1,0,1,
-      250000000,0,1,1,1,0,1,0,1,0,1,
-      500000000,1,1,0,1,1,1,0,1,0,1,
-      0,0,1,0,1,0,1,1,1,0,1,
-      500000000,0,1,0,1,0,1,0,1,1,1,
-      250000000,0,1,0,1,0,1,1,1,0,1,
-      250000000,1,1,0,1,0,1,0,1,0,1
+    0,0,0,1,1,0,0,0,0,0,0,
+    500000000,0,0,0,1,1,1,0,0,0,0,
+    250000000,0,0,1,1,0,1,0,0,0,0,
+    250000000,1,1,0,1,0,1,0,0,0,0,
+    0,0,1,0,1,0,1,1,1,0,0,
+    500000000,0,1,0,1,0,1,0,1,1,1,
+    250000000,0,1,0,1,0,1,1,1,0,1,
+    250000000,1,1,0,1,0,1,0,1,0,1,
+    250000000,0,1,0,1,1,1,0,1,0,1,
+    250000000,0,1,1,1,0,1,0,1,0,1,
+    500000000,1,1,0,1,1,1,0,1,0,1,
+    0,0,1,0,1,0,1,1,1,0,1,
+    500000000,0,1,0,1,0,1,0,1,1,1,
+    250000000,0,1,0,1,0,1,1,1,0,1,
+    250000000,1,1,0,1,0,1,0,1,0,1
   }, training = false)
 
   modal.mode_switch,
diff --git a/test/C/src/modal_models/ModalAfter.lf b/test/C/src/modal_models/ModalAfter.lf
index 95661831aa..0b0c7251fc 100644
--- a/test/C/src/modal_models/ModalAfter.lf
+++ b/test/C/src/modal_models/ModalAfter.lf
@@ -71,21 +71,21 @@ main reactor {
 
   modal = new Modal()
   test = new TraceTesting(events_size = 5, trace_size = 165, trace = {  // keep-format
-      0,0,0,1,1,0,0,0,0,0,0,
-      500000000,0,0,0,1,1,1,0,0,0,0,
-      250000000,0,0,1,1,0,1,0,0,0,0,
-      250000000,1,1,0,1,0,1,0,0,0,0,
-      0,0,1,0,1,0,1,1,1,0,0,
-      500000000,0,1,0,1,0,1,0,1,1,1,
-      250000000,0,1,0,1,0,1,1,1,0,1,
-      250000000,1,1,0,1,0,1,0,1,0,1,
-      250000000,0,1,0,1,1,1,0,1,0,1,
-      250000000,0,1,1,1,0,1,0,1,0,1,
-      500000000,1,1,0,1,1,1,0,1,0,1,
-      0,0,1,0,1,0,1,1,1,0,1,
-      500000000,0,1,0,1,0,1,0,1,1,1,
-      250000000,0,1,0,1,0,1,1,1,0,1,
-      250000000,1,1,0,1,0,1,0,1,0,1
+    0,0,0,1,1,0,0,0,0,0,0,
+    500000000,0,0,0,1,1,1,0,0,0,0,
+    250000000,0,0,1,1,0,1,0,0,0,0,
+    250000000,1,1,0,1,0,1,0,0,0,0,
+    0,0,1,0,1,0,1,1,1,0,0,
+    500000000,0,1,0,1,0,1,0,1,1,1,
+    250000000,0,1,0,1,0,1,1,1,0,1,
+    250000000,1,1,0,1,0,1,0,1,0,1,
+    250000000,0,1,0,1,1,1,0,1,0,1,
+    250000000,0,1,1,1,0,1,0,1,0,1,
+    500000000,1,1,0,1,1,1,0,1,0,1,
+    0,0,1,0,1,0,1,1,1,0,1,
+    500000000,0,1,0,1,0,1,0,1,1,1,
+    250000000,0,1,0,1,0,1,1,1,0,1,
+    250000000,1,1,0,1,0,1,0,1,0,1
   }, training = false)
 
   modal.mode_switch, modal.produced1, modal.consumed1, modal.produced2, modal.consumed2
diff --git a/test/C/src/modal_models/ModalCycleBreaker.lf b/test/C/src/modal_models/ModalCycleBreaker.lf
index 4ac9f509a7..428555e165 100644
--- a/test/C/src/modal_models/ModalCycleBreaker.lf
+++ b/test/C/src/modal_models/ModalCycleBreaker.lf
@@ -34,8 +34,8 @@ reactor Modal {
 
     reaction(in1) -> reset(Two) {=
       if (in1->value % 5 == 4) {
-          lf_set_mode(Two);
-          printf("Switching to mode Two\n");
+        lf_set_mode(Two);
+        printf("Switching to mode Two\n");
       }
     =}
   }
@@ -54,15 +54,15 @@ main reactor {
   counter = new Counter(period = 100 msec)
   modal = new Modal()
   test = new TraceTesting(events_size = 1, trace_size = 27, trace = {  // keep-format
-      0,1,0,
-      100000000,1,1,
-      100000000,1,2,
-      100000000,1,3,
-      100000000,1,4,
-      200000000,1,6,
-      100000000,1,7,
-      100000000,1,8,
-      100000000,1,9
+    0,1,0,
+    100000000,1,1,
+    100000000,1,2,
+    100000000,1,3,
+    100000000,1,4,
+    200000000,1,6,
+    100000000,1,7,
+    100000000,1,8,
+    100000000,1,9
   }, training = false)
 
   counter.value -> modal.in1
diff --git a/test/C/src/modal_models/ModalNestedReactions.lf b/test/C/src/modal_models/ModalNestedReactions.lf
index be7d19fe7c..e796c3df31 100644
--- a/test/C/src/modal_models/ModalNestedReactions.lf
+++ b/test/C/src/modal_models/ModalNestedReactions.lf
@@ -51,14 +51,14 @@ main reactor {
     printf("%d\n", counter.count->value);
 
     if (!counter.count->is_present) {
-        printf("ERROR: Missing mode change.\n");
-        exit(1);
+      printf("ERROR: Missing mode change.\n");
+      exit(1);
     } else if (counter.only_in_two->is_present && counter.count->value != 2) {
-        printf("ERROR: Indirectly nested reaction was not properly deactivated.\n");
-        exit(2);
+      printf("ERROR: Indirectly nested reaction was not properly deactivated.\n");
+      exit(2);
     } else if (!counter.only_in_two->is_present && counter.count->value == 2) {
-        printf("ERROR: Missing output from indirectly nested reaction.\n");
-        exit(3);
+      printf("ERROR: Missing output from indirectly nested reaction.\n");
+      exit(3);
     }
   =}
 
diff --git a/test/C/src/modal_models/ModalStartupShutdown.lf b/test/C/src/modal_models/ModalStartupShutdown.lf
index 3de03e3ab5..d26a743ec7 100644
--- a/test/C/src/modal_models/ModalStartupShutdown.lf
+++ b/test/C/src/modal_models/ModalStartupShutdown.lf
@@ -112,17 +112,17 @@ main reactor {
 
   modal = new Modal()
   test = new TraceTesting(events_size = 11, trace_size = 253, trace = {  // keep-format
-      0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-      500000000,1,2,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-      0,0,2,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-      500000000,1,3,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-      500000000,1,4,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-      0,0,4,0,1,0,1,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,
-      500000000,1,4,0,1,0,1,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,
-      0,0,4,0,1,0,1,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,
-      500000000,1,4,0,1,0,1,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,
-      0,0,4,0,1,0,1,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,
-      500000000,1,4,0,1,0,1,1,1,1,1,0,1,0,1,1,1,0,0,0,0,0,0
+    0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    500000000,1,2,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,2,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    500000000,1,3,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    500000000,1,4,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,4,0,1,0,1,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,
+    500000000,1,4,0,1,0,1,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,
+    0,0,4,0,1,0,1,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,
+    500000000,1,4,0,1,0,1,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,
+    0,0,4,0,1,0,1,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,
+    500000000,1,4,0,1,0,1,1,1,1,1,0,1,0,1,1,1,0,0,0,0,0,0
   }, training = false)
 
   modal.mode_switch,
diff --git a/test/C/src/modal_models/ModalStateReset.lf b/test/C/src/modal_models/ModalStateReset.lf
index 46f94958cd..181a8b1189 100644
--- a/test/C/src/modal_models/ModalStateReset.lf
+++ b/test/C/src/modal_models/ModalStateReset.lf
@@ -61,25 +61,25 @@ main reactor {
 
   modal = new Modal()
   test = new TraceTesting(events_size = 4, trace_size = 171, trace = {  // keep-format
-      0,0,0,0,0,1,0,0,0,
-      250000000,0,0,0,0,1,1,0,0,
-      250000000,0,0,0,0,1,2,0,0,
-      250000000,0,0,0,0,1,3,0,0,
-      250000000,1,1,1,0,1,4,0,0,
-      0,0,1,0,0,0,4,1,-2,
-      250000000,0,1,0,0,0,4,1,-1,
-      250000000,0,1,0,0,0,4,1,0,
-      250000000,0,1,0,0,0,4,1,1,
-      250000000,1,1,1,1,0,4,1,2,
-      250000000,0,1,0,1,1,5,0,2,
-      250000000,0,1,0,1,1,6,0,2,
-      250000000,0,1,0,1,1,7,0,2,
-      250000000,1,1,1,2,1,8,0,2,
-      0,0,1,0,2,0,8,1,-2,
-      250000000,0,1,0,2,0,8,1,-1,
-      250000000,0,1,0,2,0,8,1,0,
-      250000000,0,1,0,2,0,8,1,1,
-      250000000,1,1,1,3,0,8,1,2
+    0,0,0,0,0,1,0,0,0,
+    250000000,0,0,0,0,1,1,0,0,
+    250000000,0,0,0,0,1,2,0,0,
+    250000000,0,0,0,0,1,3,0,0,
+    250000000,1,1,1,0,1,4,0,0,
+    0,0,1,0,0,0,4,1,-2,
+    250000000,0,1,0,0,0,4,1,-1,
+    250000000,0,1,0,0,0,4,1,0,
+    250000000,0,1,0,0,0,4,1,1,
+    250000000,1,1,1,1,0,4,1,2,
+    250000000,0,1,0,1,1,5,0,2,
+    250000000,0,1,0,1,1,6,0,2,
+    250000000,0,1,0,1,1,7,0,2,
+    250000000,1,1,1,2,1,8,0,2,
+    0,0,1,0,2,0,8,1,-2,
+    250000000,0,1,0,2,0,8,1,-1,
+    250000000,0,1,0,2,0,8,1,0,
+    250000000,0,1,0,2,0,8,1,1,
+    250000000,1,1,1,3,0,8,1,2
   }, training = false)
 
   modal.mode_switch, modal.count0, modal.count1, modal.count2 -> test.events
diff --git a/test/C/src/modal_models/ModalStateResetAuto.lf b/test/C/src/modal_models/ModalStateResetAuto.lf
index be13d7b58e..82832da72d 100644
--- a/test/C/src/modal_models/ModalStateResetAuto.lf
+++ b/test/C/src/modal_models/ModalStateResetAuto.lf
@@ -57,25 +57,25 @@ main reactor {
 
   modal = new Modal()
   test = new TraceTesting(events_size = 4, trace_size = 171, trace = {  // keep-format
-      0,0,0,0,0,1,0,0,0,
-      250000000,0,0,0,0,1,1,0,0,
-      250000000,0,0,0,0,1,2,0,0,
-      250000000,0,0,0,0,1,3,0,0,
-      250000000,1,1,1,0,1,4,0,0,
-      0,0,1,0,0,0,4,1,-2,
-      250000000,0,1,0,0,0,4,1,-1,
-      250000000,0,1,0,0,0,4,1,0,
-      250000000,0,1,0,0,0,4,1,1,
-      250000000,1,1,1,1,0,4,1,2,
-      250000000,0,1,0,1,1,5,0,2,
-      250000000,0,1,0,1,1,6,0,2,
-      250000000,0,1,0,1,1,7,0,2,
-      250000000,1,1,1,2,1,8,0,2,
-      0,0,1,0,2,0,8,1,-2,
-      250000000,0,1,0,2,0,8,1,-1,
-      250000000,0,1,0,2,0,8,1,0,
-      250000000,0,1,0,2,0,8,1,1,
-      250000000,1,1,1,3,0,8,1,2
+    0,0,0,0,0,1,0,0,0,
+    250000000,0,0,0,0,1,1,0,0,
+    250000000,0,0,0,0,1,2,0,0,
+    250000000,0,0,0,0,1,3,0,0,
+    250000000,1,1,1,0,1,4,0,0,
+    0,0,1,0,0,0,4,1,-2,
+    250000000,0,1,0,0,0,4,1,-1,
+    250000000,0,1,0,0,0,4,1,0,
+    250000000,0,1,0,0,0,4,1,1,
+    250000000,1,1,1,1,0,4,1,2,
+    250000000,0,1,0,1,1,5,0,2,
+    250000000,0,1,0,1,1,6,0,2,
+    250000000,0,1,0,1,1,7,0,2,
+    250000000,1,1,1,2,1,8,0,2,
+    0,0,1,0,2,0,8,1,-2,
+    250000000,0,1,0,2,0,8,1,-1,
+    250000000,0,1,0,2,0,8,1,0,
+    250000000,0,1,0,2,0,8,1,1,
+    250000000,1,1,1,3,0,8,1,2
   }, training = false)
 
   modal.mode_switch, modal.count0, modal.count1, modal.count2 -> test.events
diff --git a/test/C/src/modal_models/ModalTimers.lf b/test/C/src/modal_models/ModalTimers.lf
index 0ceaddd3a6..8e67b6aa75 100644
--- a/test/C/src/modal_models/ModalTimers.lf
+++ b/test/C/src/modal_models/ModalTimers.lf
@@ -47,17 +47,17 @@ main reactor {
 
   modal = new Modal()
   test = new TraceTesting(events_size = 3, trace_size = 77, trace = {  // keep-format
-      0,0,0,1,1,0,0,
-      750000000,0,0,1,1,0,0,
-      250000000,1,1,0,1,0,0,
-      0,0,1,0,1,1,1,
-      750000000,0,1,0,1,1,1,
-      250000000,1,1,0,1,0,1,
-      500000000,0,1,1,1,0,1,
-      500000000,1,1,0,1,0,1,
-      0,0,1,0,1,1,1,
-      750000000,0,1,0,1,1,1,
-      250000000,1,1,0,1,0,1
+    0,0,0,1,1,0,0,
+    750000000,0,0,1,1,0,0,
+    250000000,1,1,0,1,0,0,
+    0,0,1,0,1,1,1,
+    750000000,0,1,0,1,1,1,
+    250000000,1,1,0,1,0,1,
+    500000000,0,1,1,1,0,1,
+    500000000,1,1,0,1,0,1,
+    0,0,1,0,1,1,1,
+    750000000,0,1,0,1,1,1,
+    250000000,1,1,0,1,0,1
   }, training = false)
 
   modal.mode_switch, modal.timer1, modal.timer2 -> test.events
diff --git a/test/C/src/modal_models/MultipleOutputFeeder_2Connections.lf b/test/C/src/modal_models/MultipleOutputFeeder_2Connections.lf
index 198ba0fd37..637f546498 100644
--- a/test/C/src/modal_models/MultipleOutputFeeder_2Connections.lf
+++ b/test/C/src/modal_models/MultipleOutputFeeder_2Connections.lf
@@ -42,23 +42,23 @@ main reactor {
 
   modal = new Modal()
   test = new TraceTesting(events_size = 1, trace_size = 51, trace = {  // keep-format
-      0,1,0,
-      250000000,1,1,
-      250000000,1,2,
-      0,1,0,
-      100000000,1,1,
-      100000000,1,2,
-      100000000,1,3,
-      100000000,1,4,
-      100000000,1,5,
-      250000000,1,3,
-      250000000,1,4,
-      0,1,0,
-      100000000,1,1,
-      100000000,1,2,
-      100000000,1,3,
-      100000000,1,4,
-      100000000,1,5
+    0,1,0,
+    250000000,1,1,
+    250000000,1,2,
+    0,1,0,
+    100000000,1,1,
+    100000000,1,2,
+    100000000,1,3,
+    100000000,1,4,
+    100000000,1,5,
+    250000000,1,3,
+    250000000,1,4,
+    0,1,0,
+    100000000,1,1,
+    100000000,1,2,
+    100000000,1,3,
+    100000000,1,4,
+    100000000,1,5
   }, training = false)
 
   modal.count -> test.events
diff --git a/test/C/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf b/test/C/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf
index fe3c4dde17..1281b3f490 100644
--- a/test/C/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf
+++ b/test/C/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf
@@ -43,23 +43,23 @@ main reactor {
 
   modal = new Modal()
   test = new TraceTesting(events_size = 1, trace_size = 51, trace = {  // keep-format
-      0,1,0,
-      250000000,1,1,
-      250000000,1,2,
-      0,1,0,
-      100000000,1,10,
-      100000000,1,20,
-      100000000,1,30,
-      100000000,1,40,
-      100000000,1,50,
-      250000000,1,3,
-      250000000,1,4,
-      0,1,0,
-      100000000,1,10,
-      100000000,1,20,
-      100000000,1,30,
-      100000000,1,40,
-      100000000,1,50
+    0,1,0,
+    250000000,1,1,
+    250000000,1,2,
+    0,1,0,
+    100000000,1,10,
+    100000000,1,20,
+    100000000,1,30,
+    100000000,1,40,
+    100000000,1,50,
+    250000000,1,3,
+    250000000,1,4,
+    0,1,0,
+    100000000,1,10,
+    100000000,1,20,
+    100000000,1,30,
+    100000000,1,40,
+    100000000,1,50
   }, training = false)
 
   modal.count -> test.events
diff --git a/test/C/src/modal_models/util/TraceTesting.lf b/test/C/src/modal_models/util/TraceTesting.lf
index d8b9277843..86908ad2e5 100644
--- a/test/C/src/modal_models/util/TraceTesting.lf
+++ b/test/C/src/modal_models/util/TraceTesting.lf
@@ -20,43 +20,43 @@ reactor TraceTesting(
     int curr_reaction_delay = lf_time_logical() - self->last_reaction_time;
 
     if (self->training) {
-        // Save time
-        self->recorded_events = (int*) realloc(self->recorded_events, sizeof(int) * (self->recorded_events_next + 1 + 2 * self->events_size));
-        self->recorded_events[self->recorded_events_next++] = curr_reaction_delay;
+      // Save time
+      self->recorded_events = (int*) realloc(self->recorded_events, sizeof(int) * (self->recorded_events_next + 1 + 2 * self->events_size));
+      self->recorded_events[self->recorded_events_next++] = curr_reaction_delay;
     } else {
-        if (self->trace_idx >= self->trace_size) {
-            printf("ERROR: Trace Error: Current execution exceeds given trace.\n");
-            exit(1);
-        }
+      if (self->trace_idx >= self->trace_size) {
+        printf("ERROR: Trace Error: Current execution exceeds given trace.\n");
+        exit(1);
+      }
 
-        int trace_reaction_delay = self->trace[self->trace_idx++];
+      int trace_reaction_delay = self->trace[self->trace_idx++];
 
-        if (curr_reaction_delay != trace_reaction_delay) {
-            printf("ERROR: Trace Mismatch: Unexpected reaction timing. (delay: %d, expected: %d)\n", curr_reaction_delay, trace_reaction_delay);
-            exit(2);
-        }
+      if (curr_reaction_delay != trace_reaction_delay) {
+        printf("ERROR: Trace Mismatch: Unexpected reaction timing. (delay: %d, expected: %d)\n", curr_reaction_delay, trace_reaction_delay);
+        exit(2);
+      }
     }
 
     for (int i = 0; i < self->events_size; i++) {
-        int curr_present = events[i]->is_present;
-        int curr_value = events[i]->value;
+      int curr_present = events[i]->is_present;
+      int curr_value = events[i]->value;
 
-        if (self->training) {
-            // Save event
-            self->recorded_events[self->recorded_events_next++] = curr_present;
-            self->recorded_events[self->recorded_events_next++] = curr_value;
-        } else {
-            int trace_present = self->trace[self->trace_idx++];
-            int trace_value = self->trace[self->trace_idx++];
+      if (self->training) {
+        // Save event
+        self->recorded_events[self->recorded_events_next++] = curr_present;
+        self->recorded_events[self->recorded_events_next++] = curr_value;
+      } else {
+        int trace_present = self->trace[self->trace_idx++];
+        int trace_value = self->trace[self->trace_idx++];
 
-            if (trace_present != curr_present) {
-                printf("ERROR: Trace Mismatch: Unexpected event presence. (event: %d, presence: %d, expected: %d)\n", i, curr_present, trace_present);
-                exit(3);
-            } else if (curr_present && trace_value != curr_value) {
-                printf("ERROR: Trace Mismatch: Unexpected event value. (event: %d, presence: %d, expected: %d)\n", i, curr_value, trace_value);
-                exit(4);
-            }
+        if (trace_present != curr_present) {
+          printf("ERROR: Trace Mismatch: Unexpected event presence. (event: %d, presence: %d, expected: %d)\n", i, curr_present, trace_present);
+          exit(3);
+        } else if (curr_present && trace_value != curr_value) {
+          printf("ERROR: Trace Mismatch: Unexpected event value. (event: %d, presence: %d, expected: %d)\n", i, curr_value, trace_value);
+          exit(4);
         }
+      }
     }
 
     self->last_reaction_time = lf_time_logical();
@@ -64,16 +64,16 @@ reactor TraceTesting(
 
   reaction(shutdown) {=
     if (self->training) {
-        printf("Recorded event trace (%d): (", self->recorded_events_next);
-        for (int i = 0; i < self->recorded_events_next; i++) {
-            printf("%d", self->recorded_events[i]);
-            if (i < self->recorded_events_next - 1) {
-                printf(",");
-            }
+      printf("Recorded event trace (%d): (", self->recorded_events_next);
+      for (int i = 0; i < self->recorded_events_next; i++) {
+        printf("%d", self->recorded_events[i]);
+        if (i < self->recorded_events_next - 1) {
+          printf(",");
         }
-        printf(")\n");
+      }
+      printf(")\n");
 
-        free(self->recorded_events);
+      free(self->recorded_events);
     }
   =}
 }
diff --git a/test/C/src/multiport/BankIndexInitializer.lf b/test/C/src/multiport/BankIndexInitializer.lf
index 7b8012084c..434e59104a 100644
--- a/test/C/src/multiport/BankIndexInitializer.lf
+++ b/test/C/src/multiport/BankIndexInitializer.lf
@@ -17,19 +17,19 @@ reactor Sink(width: int = 4) {
 
   reaction(in) {=
     for (int idx = 0; idx < in_width; idx++) {
-        if (in[idx]->is_present) {
-            printf("Received on channel %d: %d\n", idx, in[idx]->value);
-            self->received = true;
-            if (in[idx]->value != 4 - idx) {
-                lf_print_error_and_exit("Expected %d.", 4 - idx);
-            }
+      if (in[idx]->is_present) {
+        printf("Received on channel %d: %d\n", idx, in[idx]->value);
+        self->received = true;
+        if (in[idx]->value != 4 - idx) {
+          lf_print_error_and_exit("Expected %d.", 4 - idx);
         }
+      }
     }
   =}
 
   reaction(shutdown) {=
     if (!self->received) {
-        lf_print_error_and_exit("Sink received no data.");
+      lf_print_error_and_exit("Sink received no data.");
     }
   =}
 }
diff --git a/test/C/src/multiport/BankMultiportToReaction.lf b/test/C/src/multiport/BankMultiportToReaction.lf
index c5923c7073..6998862887 100644
--- a/test/C/src/multiport/BankMultiportToReaction.lf
+++ b/test/C/src/multiport/BankMultiportToReaction.lf
@@ -20,22 +20,22 @@ main reactor {
 
   reaction(s.out) {=
     for (int i = 0; i < s_width; i++) {
-        for (int j = 0; j < s[0].out_width; j++) {
-            if (s[i].out[j]->is_present) {
-                lf_print("Received %d.", s[i].out[j]->value);
-                if (self->count != s[i].out[j]->value) {
-                    lf_print_error_and_exit("Expected %d.", self->count);
-                }
-                self->received = true;
-            }
+      for (int j = 0; j < s[0].out_width; j++) {
+        if (s[i].out[j]->is_present) {
+          lf_print("Received %d.", s[i].out[j]->value);
+          if (self->count != s[i].out[j]->value) {
+            lf_print_error_and_exit("Expected %d.", self->count);
+          }
+          self->received = true;
         }
+      }
     }
     self->count++;
   =}
 
   reaction(shutdown) {=
     if (!self->received) {
-        lf_print_error_and_exit("No inputs present.");
+      lf_print_error_and_exit("No inputs present.");
     }
   =}
 }
diff --git a/test/C/src/multiport/BankReactionsInContainer.lf b/test/C/src/multiport/BankReactionsInContainer.lf
index 71d566ac4b..88d3a71918 100644
--- a/test/C/src/multiport/BankReactionsInContainer.lf
+++ b/test/C/src/multiport/BankReactionsInContainer.lf
@@ -10,30 +10,30 @@ reactor R(bank_index: int = 0) {
 
   reaction(startup) -> out {=
     for (int i = 0; i < out_width; i++) {
-        int value = self->bank_index * 2 + i;
-        lf_set(out[i], value);
-        lf_print("Inner sending %d to bank %d channel %d.",
-            value, self->bank_index, i
-        );
+      int value = self->bank_index * 2 + i;
+      lf_set(out[i], value);
+      lf_print("Inner sending %d to bank %d channel %d.",
+        value, self->bank_index, i
+      );
     }
   =}
 
   reaction(in) {=
     for (int i = 0; i < in_width; i++) {
-        if (in[i]->is_present) {
-            lf_print("Inner received %d in bank %d, channel %d", in[i]->value, self->bank_index, i);
-            self->received = true;
-            if (in[i]->value != self->bank_index * 2 + i) {
-                lf_print_error_and_exit("Expected %d.", self->bank_index * 2 + i);
-            }
+      if (in[i]->is_present) {
+        lf_print("Inner received %d in bank %d, channel %d", in[i]->value, self->bank_index, i);
+        self->received = true;
+        if (in[i]->value != self->bank_index * 2 + i) {
+          lf_print_error_and_exit("Expected %d.", self->bank_index * 2 + i);
         }
+      }
     }
   =}
 
   reaction(shutdown) {=
     lf_print("Inner shutdown invoked.");
     if (!self->received) {
-        lf_print_error_and_exit("Received no input.");
+      lf_print_error_and_exit("Received no input.");
     }
   =}
 }
@@ -45,31 +45,31 @@ main reactor {
   reaction(startup) -> s.in {=
     int count = 0;
     for (int i = 0; i < s_width; i++) {
-        for (int j = 0; j < s[i].in_width; j++) {
-            lf_print("Sending %d to bank %d channel %d.", count, i, j);
-            lf_set(s[i].in[j], count++);
-        }
+      for (int j = 0; j < s[i].in_width; j++) {
+        lf_print("Sending %d to bank %d channel %d.", count, i, j);
+        lf_set(s[i].in[j], count++);
+      }
     }
   =}
 
   reaction(s.out) {=
     for (int j = 0; j < s_width; j++) {
-        for (int i = 0; i < s[j].out_width; i++) {
-            if (s[j].out[i]->is_present) {
-                lf_print("Outer received %d on bank %d channel %d.", s[j].out[i]->value, j, i);
-                self->received = true;
-                if (s[j].out[i]->value != j * 2 + i) {
-                    lf_print_error_and_exit("Expected %d.", j * 2 + i);
-                }
-            }
+      for (int i = 0; i < s[j].out_width; i++) {
+        if (s[j].out[i]->is_present) {
+          lf_print("Outer received %d on bank %d channel %d.", s[j].out[i]->value, j, i);
+          self->received = true;
+          if (s[j].out[i]->value != j * 2 + i) {
+            lf_print_error_and_exit("Expected %d.", j * 2 + i);
+          }
         }
+      }
     }
   =}
 
   reaction(shutdown) {=
     lf_print("Outer shutdown invoked.");
     if (!self->received) {
-        lf_print_error_and_exit("Received no input.");
+      lf_print_error_and_exit("Received no input.");
     }
   =}
 }
diff --git a/test/C/src/multiport/BankSelfBroadcast.lf b/test/C/src/multiport/BankSelfBroadcast.lf
index 52b7a678f2..f9a52af044 100644
--- a/test/C/src/multiport/BankSelfBroadcast.lf
+++ b/test/C/src/multiport/BankSelfBroadcast.lf
@@ -16,28 +16,28 @@ reactor A(bank_index: int = 0) {
 
   reaction(in) {=
     for (int i = 0; i < in_width; i++) {
-        if (in[i]->is_present) {
-            lf_print(
-                "Reactor %d received %d on channel %d.",
-                self->bank_index, in[i]->value, i
-            );
-            if (in[i]->value != i) {
-                lf_print_error_and_exit("Expected %d.", i);
-            }
-            self->received = true;
-        } else {
-            lf_print(
-                "Reactor %d channel %d is absent.",
-                self->bank_index, i
-            );
-            lf_print_error_and_exit("Expected %d.", i);
+      if (in[i]->is_present) {
+        lf_print(
+          "Reactor %d received %d on channel %d.",
+          self->bank_index, in[i]->value, i
+        );
+        if (in[i]->value != i) {
+          lf_print_error_and_exit("Expected %d.", i);
         }
+        self->received = true;
+      } else {
+        lf_print(
+          "Reactor %d channel %d is absent.",
+          self->bank_index, i
+        );
+        lf_print_error_and_exit("Expected %d.", i);
+      }
     }
   =}
 
   reaction(shutdown) {=
     if (!self->received) {
-        lf_print_error_and_exit("No inputs received.");
+      lf_print_error_and_exit("No inputs received.");
     }
   =}
 }
diff --git a/test/C/src/multiport/BankToBank.lf b/test/C/src/multiport/BankToBank.lf
index 0b2c2ff5b5..d6d7ae0aa7 100644
--- a/test/C/src/multiport/BankToBank.lf
+++ b/test/C/src/multiport/BankToBank.lf
@@ -22,16 +22,16 @@ reactor Destination(bank_index: int = 0) {
   reaction(in) {=
     printf("Destination %d received: %d.\n", self->bank_index, in->value);
     if (in->value != self->s) {
-        printf("ERROR: Expected %d.\n", self->s);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->s);
+      exit(1);
     }
     self->s += self->bank_index;
   =}
 
   reaction(shutdown) {=
     if (self->s == 0 && self->bank_index != 0) {
-        fprintf(stderr, "ERROR: Destination %d received no input!\n", self->bank_index);
-        exit(1);
+      fprintf(stderr, "ERROR: Destination %d received no input!\n", self->bank_index);
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/BankToBankMultiport.lf b/test/C/src/multiport/BankToBankMultiport.lf
index 01a13296cf..e0b288d673 100644
--- a/test/C/src/multiport/BankToBankMultiport.lf
+++ b/test/C/src/multiport/BankToBankMultiport.lf
@@ -11,7 +11,7 @@ reactor Source(width: int = 1) {
 
   reaction(t) -> out {=
     for(int i = 0; i < out_width; i++) {
-        lf_set(out[i], self->s++);
+      lf_set(out[i], self->s++);
     }
   =}
 }
@@ -23,20 +23,20 @@ reactor Destination(width: int = 1) {
   reaction(in) {=
     int sum = 0;
     for (int i = 0; i < in_width; i++) {
-        if (in[i]->is_present) sum += in[i]->value;
+      if (in[i]->is_present) sum += in[i]->value;
     }
     printf("Sum of received: %d.\n", sum);
     if (sum != self->s) {
-        printf("ERROR: Expected %d.\n", self->s);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->s);
+      exit(1);
     }
     self->s += 16;
   =}
 
   reaction(shutdown) {=
     if (self->s <= 6) {
-        fprintf(stderr, "ERROR: Destination received no input!\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Destination received no input!\n");
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/BankToBankMultiportAfter.lf b/test/C/src/multiport/BankToBankMultiportAfter.lf
index 2c787630ab..d8b3ff120d 100644
--- a/test/C/src/multiport/BankToBankMultiportAfter.lf
+++ b/test/C/src/multiport/BankToBankMultiportAfter.lf
@@ -11,7 +11,7 @@ reactor Source(width: int = 1) {
 
   reaction(t) -> out {=
     for(int i = 0; i < out_width; i++) {
-        lf_set(out[i], self->s++);
+      lf_set(out[i], self->s++);
     }
   =}
 }
@@ -23,20 +23,20 @@ reactor Destination(width: int = 1) {
   reaction(in) {=
     int sum = 0;
     for (int i = 0; i < in_width; i++) {
-        if (in[i]->is_present) sum += in[i]->value;
+      if (in[i]->is_present) sum += in[i]->value;
     }
     printf("Sum of received: %d.\n", sum);
     if (sum != self->s) {
-        printf("ERROR: Expected %d.\n", self->s);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->s);
+      exit(1);
     }
     self->s += 16;
   =}
 
   reaction(shutdown) {=
     if (self->s <= 6) {
-        fprintf(stderr, "ERROR: Destination received no input!\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Destination received no input!\n");
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/BankToMultiport.lf b/test/C/src/multiport/BankToMultiport.lf
index 7669e44cfd..4506cee0c1 100644
--- a/test/C/src/multiport/BankToMultiport.lf
+++ b/test/C/src/multiport/BankToMultiport.lf
@@ -13,21 +13,21 @@ reactor Sink(width: int = 4) {
 
   reaction(in) {=
     for (int i = 0; i < in_width; i++) {
-        if (in[i]->is_present) {
-            printf("Received on channel %d: %d\n", i, in[i]->value);
-            self->received = true;
-            if (in[i]->value != i) {
-                fprintf(stderr, "ERROR: expected %d\n", i);
-                exit(1);
-            }
+      if (in[i]->is_present) {
+        printf("Received on channel %d: %d\n", i, in[i]->value);
+        self->received = true;
+        if (in[i]->value != i) {
+          fprintf(stderr, "ERROR: expected %d\n", i);
+          exit(1);
         }
+      }
     }
   =}
 
   reaction(shutdown) {=
     if (!self->received) {
-        fprintf(stderr, "ERROR: Sink received no data\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Sink received no data\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/multiport/BankToReaction.lf b/test/C/src/multiport/BankToReaction.lf
index 59c3282a36..4a830eebbf 100644
--- a/test/C/src/multiport/BankToReaction.lf
+++ b/test/C/src/multiport/BankToReaction.lf
@@ -12,10 +12,10 @@ main reactor {
 
   reaction(s.out) {=
     for (int i = 0; i < s_width; i++) {
-        lf_print("Received %d.", s[i].out->value);
-        if (self->count != s[i].out->value) {
-            lf_print_error_and_exit("Expected %d.", self->count);
-        }
+      lf_print("Received %d.", s[i].out->value);
+      if (self->count != s[i].out->value) {
+        lf_print_error_and_exit("Expected %d.", self->count);
+      }
     }
     self->count++;
   =}
diff --git a/test/C/src/multiport/Broadcast.lf b/test/C/src/multiport/Broadcast.lf
index d2b4b34d48..27092a4366 100644
--- a/test/C/src/multiport/Broadcast.lf
+++ b/test/C/src/multiport/Broadcast.lf
@@ -16,16 +16,16 @@ reactor Destination(bank_index: int = 0) {
   reaction(in) {=
     printf("Destination %d received %d.\n", self->bank_index, in->value);
     if (in->value != 42) {
-        printf("ERROR: Expected 42.\n");
-        exit(1);
+      printf("ERROR: Expected 42.\n");
+      exit(1);
     }
     self->received = true;
   =}
 
   reaction(shutdown) {=
     if (!self->received) {
-        fprintf(stderr, "ERROR: Destination %d received no input!\n", self->bank_index);
-        exit(1);
+      fprintf(stderr, "ERROR: Destination %d received no input!\n", self->bank_index);
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/BroadcastAfter.lf b/test/C/src/multiport/BroadcastAfter.lf
index cb3c9306f6..48b5850b7c 100644
--- a/test/C/src/multiport/BroadcastAfter.lf
+++ b/test/C/src/multiport/BroadcastAfter.lf
@@ -16,20 +16,20 @@ reactor Destination(bank_index: int = 0) {
   reaction(in) {=
     printf("Destination %d received %d.\n", self->bank_index, in->value);
     if (in->value != 42) {
-        printf("ERROR: Expected 42.\n");
-        exit(1);
+      printf("ERROR: Expected 42.\n");
+      exit(1);
     }
     if (lf_time_logical_elapsed() != SEC(1)) {
-        printf("ERROR: Expected to receive input after one second.\n");
-        exit(2);
+      printf("ERROR: Expected to receive input after one second.\n");
+      exit(2);
     }
     self->received = true;
   =}
 
   reaction(shutdown) {=
     if (!self->received) {
-        fprintf(stderr, "ERROR: Destination %d received no input!\n", self->bank_index);
-        exit(3);
+      fprintf(stderr, "ERROR: Destination %d received no input!\n", self->bank_index);
+      exit(3);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/BroadcastMultipleAfter.lf b/test/C/src/multiport/BroadcastMultipleAfter.lf
index dc38164b9a..809c03448c 100644
--- a/test/C/src/multiport/BroadcastMultipleAfter.lf
+++ b/test/C/src/multiport/BroadcastMultipleAfter.lf
@@ -17,20 +17,20 @@ reactor Destination(bank_index: int = 0) {
     printf("Destination %d received %d.\n", self->bank_index, in->value);
     int expected = (self->bank_index % 3) + 1;
     if (in->value != expected) {
-        printf("ERROR: Expected %d.\n", expected);
-        exit(1);
+      printf("ERROR: Expected %d.\n", expected);
+      exit(1);
     }
     if (lf_time_logical_elapsed() != SEC(1)) {
-        printf("ERROR: Expected to receive input after one second.\n");
-        exit(2);
+      printf("ERROR: Expected to receive input after one second.\n");
+      exit(2);
     }
     self->received = true;
   =}
 
   reaction(shutdown) {=
     if (!self->received) {
-        fprintf(stderr, "ERROR: Destination %d received no input!\n", self->bank_index);
-        exit(3);
+      fprintf(stderr, "ERROR: Destination %d received no input!\n", self->bank_index);
+      exit(3);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/DualBanks.lf b/test/C/src/multiport/DualBanks.lf
index f674626dc8..571fd2399e 100644
--- a/test/C/src/multiport/DualBanks.lf
+++ b/test/C/src/multiport/DualBanks.lf
@@ -6,9 +6,9 @@ reactor Base(bank_index: int = 0) {
 
   reaction(shutdown) {=
     if(!self->received) {
-        lf_print_error_and_exit("Bank member %d received no input.",
-            self->bank_index
-        );
+      lf_print_error_and_exit("Bank member %d received no input.",
+        self->bank_index
+      );
     }
   =}
 }
@@ -33,10 +33,10 @@ main reactor {
 
   reaction(startup) -> hellos.I, worlds.I {=
     for(int i = 0; i < hellos_width; i++) {
-        lf_set(hellos[i].I, true);
+      lf_set(hellos[i].I, true);
     }
     for(int i = 0; i < worlds_width; i++) {
-        lf_set(worlds[i].I, true);
+      lf_set(worlds[i].I, true);
     }
   =}
 }
diff --git a/test/C/src/multiport/DualBanksMultiport.lf b/test/C/src/multiport/DualBanksMultiport.lf
index d1975b6789..078b394f1e 100644
--- a/test/C/src/multiport/DualBanksMultiport.lf
+++ b/test/C/src/multiport/DualBanksMultiport.lf
@@ -6,9 +6,9 @@ reactor Base(bank_index: int = 0) {
 
   reaction(shutdown) {=
     if(!self->received) {
-        lf_print_error_and_exit("Bank member %d did not receive all inputs.",
-            self->bank_index
-        );
+      lf_print_error_and_exit("Bank member %d did not receive all inputs.",
+        self->bank_index
+      );
     }
   =}
 }
@@ -16,8 +16,8 @@ reactor Base(bank_index: int = 0) {
 reactor Hello extends Base {
   reaction(I) {=
     if (I[0]->is_present && I[1]->is_present) {
-        printf("Hello %d\n", self->bank_index);
-        self->received = true;
+      printf("Hello %d\n", self->bank_index);
+      self->received = true;
     }
   =}
 }
@@ -25,8 +25,8 @@ reactor Hello extends Base {
 reactor World extends Base {
   reaction(I) {=
     if (I[0]->is_present && I[1]->is_present) {
-        printf("World %d\n", self->bank_index);
-        self->received = true;
+      printf("World %d\n", self->bank_index);
+      self->received = true;
     }
   =}
 }
@@ -37,12 +37,12 @@ main reactor {
 
   reaction(startup) -> hellos.I, worlds.I {=
     for(int i = 0; i < hellos_width; i++) {
-        lf_set(hellos[i].I[0], true);
-        lf_set(hellos[i].I[1], true);
+      lf_set(hellos[i].I[0], true);
+      lf_set(hellos[i].I[1], true);
     }
     for(int i = 0; i < worlds_width; i++) {
-        lf_set(worlds[i].I[0], true);
-        lf_set(worlds[i].I[1], true);
+      lf_set(worlds[i].I[0], true);
+      lf_set(worlds[i].I[1], true);
     }
   =}
 }
diff --git a/test/C/src/multiport/FullyConnected.lf b/test/C/src/multiport/FullyConnected.lf
index 34ba622398..3f39e2ae02 100644
--- a/test/C/src/multiport/FullyConnected.lf
+++ b/test/C/src/multiport/FullyConnected.lf
@@ -16,21 +16,21 @@ reactor Node(num_nodes: size_t = 4, bank_index: int = 0) {
     printf("Node %d received messages from ", self->bank_index);
     size_t count = 0;
     for (int i = 0; i < in_width; i++) {
-        if (in[i]->is_present) {
-            self->received = true;
-            count++;
-            printf("%d, ", in[i]->value);
-        }
+      if (in[i]->is_present) {
+        self->received = true;
+        count++;
+        printf("%d, ", in[i]->value);
+      }
     }
     printf("\n");
     if (count != self->num_nodes) {
-        lf_print_error_and_exit("Received fewer messages than expected!");
+      lf_print_error_and_exit("Received fewer messages than expected!");
     }
   =}
 
   reaction(shutdown) {=
     if (!self->received) {
-        lf_print_error_and_exit("Received no input!");
+      lf_print_error_and_exit("Received no input!");
     }
   =}
 }
diff --git a/test/C/src/multiport/FullyConnectedAddressable.lf b/test/C/src/multiport/FullyConnectedAddressable.lf
index f3ddb44e11..59e8adacb0 100644
--- a/test/C/src/multiport/FullyConnectedAddressable.lf
+++ b/test/C/src/multiport/FullyConnectedAddressable.lf
@@ -11,7 +11,7 @@ reactor Node(num_nodes: size_t = 4, bank_index: int = 0) {
   reaction(startup) -> out {=
     int outChannel = (self->bank_index + 1) % self->num_nodes;
     lf_print("Node %d sending %d out on channel %d.",
-        self->bank_index, self->bank_index, outChannel
+      self->bank_index, self->bank_index, outChannel
     );
     // broadcast my ID to everyone
     lf_set(out[outChannel], self->bank_index);
@@ -22,25 +22,25 @@ reactor Node(num_nodes: size_t = 4, bank_index: int = 0) {
     printf("Node %d received messages from ", self->bank_index);
     size_t count = 0;
     for (int i = 0; i < in_width; i++) {
-        if (in[i]->is_present) {
-            count++;
-            printf("%d, ", in[i]->value);
-            self->received = in[i]->value;
-        }
+      if (in[i]->is_present) {
+        count++;
+        printf("%d, ", in[i]->value);
+        self->received = in[i]->value;
+      }
     }
     printf("\n");
     int expected = self->bank_index == 0 ? self->num_nodes - 1 : self->bank_index - 1;
     if (count != 1) {
-        lf_print_error_and_exit("Received %d messages, but expecting only one!");
+      lf_print_error_and_exit("Received %d messages, but expecting only one!");
     }
     if (self->received != expected) {
-        lf_print_error_and_exit("Received %d, but expected %d!", self->received, expected);
+      lf_print_error_and_exit("Received %d, but expected %d!", self->received, expected);
     }
   =}
 
   reaction(shutdown) {=
     if (!self->triggered) {
-        lf_print_error_and_exit("Received no input!");
+      lf_print_error_and_exit("Received no input!");
     }
   =}
 }
diff --git a/test/C/src/multiport/MultiportFromBank.lf b/test/C/src/multiport/MultiportFromBank.lf
index 9c2c439950..3969da111d 100644
--- a/test/C/src/multiport/MultiportFromBank.lf
+++ b/test/C/src/multiport/MultiportFromBank.lf
@@ -17,19 +17,19 @@ reactor Destination(port_width: int = 3) {
 
   reaction(in) {=
     for (int i = 0; i < in_width; i++) {
-        printf("Destination channel %d received %d.\n", i, in[i]->value);
-        if (i != in[i]->value) {
-            printf("ERROR: Expected %d.\n", i);
-            exit(1);
-        }
+      printf("Destination channel %d received %d.\n", i, in[i]->value);
+      if (i != in[i]->value) {
+        printf("ERROR: Expected %d.\n", i);
+        exit(1);
+      }
     }
     self->received = true;
   =}
 
   reaction(shutdown) {=
     if (!self->received) {
-        fprintf(stderr, "ERROR: Destination received no input!\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Destination received no input!\n");
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/MultiportFromHierarchy.lf b/test/C/src/multiport/MultiportFromHierarchy.lf
index 9c817e371f..9d33986305 100644
--- a/test/C/src/multiport/MultiportFromHierarchy.lf
+++ b/test/C/src/multiport/MultiportFromHierarchy.lf
@@ -11,7 +11,7 @@ reactor Source(width: int = 3) {
 
   reaction(t) -> out {=
     for(int i = 0; i < out_width; i++) {
-        lf_set(out[i], self->s++);
+      lf_set(out[i], self->s++);
     }
   =}
 }
@@ -23,20 +23,20 @@ reactor Destination(width: int = 3) {
   reaction(in) {=
     int sum = 0;
     for (int i = 0; i < in_width; i++) {
-        if (in[i]->is_present) sum += in[i]->value;
+      if (in[i]->is_present) sum += in[i]->value;
     }
     printf("Sum of received: %d.\n", sum);
     if (sum != self->s) {
-        printf("ERROR: Expected %d.\n", self->s);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->s);
+      exit(1);
     }
     self->s += 16;
   =}
 
   reaction(shutdown) {=
     if (self->s <= 6) {
-        fprintf(stderr, "ERROR: Destination received no input!\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Destination received no input!\n");
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/MultiportFromReaction.lf b/test/C/src/multiport/MultiportFromReaction.lf
index c262a43e6e..f6813999de 100644
--- a/test/C/src/multiport/MultiportFromReaction.lf
+++ b/test/C/src/multiport/MultiportFromReaction.lf
@@ -11,20 +11,20 @@ reactor Destination(width: int = 1) {
   reaction(in) {=
     int sum = 0;
     for (int i = 0; i < in_width; i++) {
-        if (in[i]->is_present) sum += in[i]->value;
+      if (in[i]->is_present) sum += in[i]->value;
     }
     printf("Sum of received: %d.\n", sum);
     if (sum != self->s) {
-        printf("ERROR: Expected %d.\n", self->s);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->s);
+      exit(1);
     }
     self->s += 16;
   =}
 
   reaction(shutdown) {=
     if (self->s <= 6) {
-        fprintf(stderr, "ERROR: Destination received no input!\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Destination received no input!\n");
+      exit(1);
     }
     printf("Success.\n");
   =}
@@ -37,10 +37,10 @@ main reactor MultiportFromReaction(width: int = 4) {
 
   reaction(t) -> b.in {=
     for(int i = 0; i < b.in_width; i++) {
-        printf("Before lf_set, b.in[%d]->is_present has value %d\n", i, b.in[i]->is_present);
-        lf_set(b.in[i], self->s++);
-        printf("AFTER set, b.in[%d]->is_present has value %d\n", i, b.in[i]->is_present);
-        printf("AFTER set, b.in[%d]->value has value %d\n", i, b.in[i]->value);
+      printf("Before lf_set, b.in[%d]->is_present has value %d\n", i, b.in[i]->is_present);
+      lf_set(b.in[i], self->s++);
+      printf("AFTER set, b.in[%d]->is_present has value %d\n", i, b.in[i]->is_present);
+      printf("AFTER set, b.in[%d]->value has value %d\n", i, b.in[i]->value);
     }
   =}
 }
diff --git a/test/C/src/multiport/MultiportIn.lf b/test/C/src/multiport/MultiportIn.lf
index cba7094684..caea737d76 100644
--- a/test/C/src/multiport/MultiportIn.lf
+++ b/test/C/src/multiport/MultiportIn.lf
@@ -30,20 +30,20 @@ reactor Destination {
   reaction(in) {=
     int sum = 0;
     for (int i = 0; i < in_width; i++) {
-        sum += in[i]->value;
+      sum += in[i]->value;
     }
     printf("Sum of received: %d.\n", sum);
     if (sum != self->s) {
-        printf("ERROR: Expected %d.\n", self->s);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->s);
+      exit(1);
     }
     self->s += 4;
   =}
 
   reaction(shutdown) {=
     if (self->s == 0) {
-        fprintf(stderr, "ERROR: Destination received no input!\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Destination received no input!\n");
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/MultiportInParameterized.lf b/test/C/src/multiport/MultiportInParameterized.lf
index 46ac0ea796..fbf1b4b6f1 100644
--- a/test/C/src/multiport/MultiportInParameterized.lf
+++ b/test/C/src/multiport/MultiportInParameterized.lf
@@ -30,20 +30,20 @@ reactor Destination(width: int = 1) {
   reaction(in) {=
     int sum = 0;
     for (int i = 0; i < in_width; i++) {
-        sum += in[i]->value;
+      sum += in[i]->value;
     }
     printf("Sum of received: %d.\n", sum);
     if (sum != self->s) {
-        printf("ERROR: Expected %d.\n", self->s);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->s);
+      exit(1);
     }
     self->s += 4;
   =}
 
   reaction(shutdown) {=
     if (self->s == 0) {
-        fprintf(stderr, "ERROR: Destination received no input!\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Destination received no input!\n");
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/MultiportMutableInput.lf b/test/C/src/multiport/MultiportMutableInput.lf
index 96026cf445..a114bc40d3 100644
--- a/test/C/src/multiport/MultiportMutableInput.lf
+++ b/test/C/src/multiport/MultiportMutableInput.lf
@@ -18,11 +18,11 @@ reactor Print(scale: int = 1) {
   reaction(in) {=
     int expected = 42;
     for(int j = 0; j < 2; j++) {
-        lf_print("Received on channel %d: %d", j, in[j]->value);
-        if (in[j]->value != expected) {
-            lf_print_error_and_exit("ERROR: Expected %d!\n", expected);
-        }
-        expected *=2;
+      lf_print("Received on channel %d: %d", j, in[j]->value);
+      if (in[j]->value != expected) {
+        lf_print_error_and_exit("ERROR: Expected %d!\n", expected);
+      }
+      expected *=2;
     }
   =}
 }
@@ -33,9 +33,9 @@ reactor Scale(scale: int = 2) {
 
   reaction(in) -> out {=
     for(int j = 0; j < 2; j++) {
-        // Modify the input, allowed because mutable.
-        in[j]->value *= self->scale;
-        lf_set(out[j], in[j]->value);
+      // Modify the input, allowed because mutable.
+      in[j]->value *= self->scale;
+      lf_set(out[j], in[j]->value);
     }
   =}
 }
diff --git a/test/C/src/multiport/MultiportMutableInputArray.lf b/test/C/src/multiport/MultiportMutableInputArray.lf
index 07b344a7b1..4cd9569b8e 100644
--- a/test/C/src/multiport/MultiportMutableInputArray.lf
+++ b/test/C/src/multiport/MultiportMutableInputArray.lf
@@ -30,24 +30,24 @@ reactor Print(scale: int = 1) {
   input[2] in: int[]
 
   reaction(in) {=
-    int count = 0;       // For testing.
+    int count = 0;     // For testing.
     bool failed = false; // For testing.
     for(int j = 0; j < 2; j++) {
-        printf("Received on channel %d: [", j);
-        for (int i = 0; i < in[j]->length; i++) {
-            if (i > 0) printf(", ");
-            printf("%d", in[j]->value[i]);
-            // For testing, check whether values match expectation.
-            if (in[j]->value[i] != self->scale * count) {
-                failed = true;
-            }
-            count++;         // For testing.
+      printf("Received on channel %d: [", j);
+      for (int i = 0; i < in[j]->length; i++) {
+        if (i > 0) printf(", ");
+        printf("%d", in[j]->value[i]);
+        // For testing, check whether values match expectation.
+        if (in[j]->value[i] != self->scale * count) {
+          failed = true;
         }
-        printf("]\n");
+        count++;     // For testing.
+      }
+      printf("]\n");
     }
     if (failed) {
-        printf("ERROR: Value received by Print does not match expectation!\n");
-        exit(1);
+      printf("ERROR: Value received by Print does not match expectation!\n");
+      exit(1);
     }
   =}
 }
@@ -58,12 +58,12 @@ reactor Scale(scale: int = 2) {
 
   reaction(in) -> out {=
     for(int j = 0; j < in_width; j++) {
-        for(int i = 0; i < in[j]->length; i++) {
-            if (in[j]->is_present) {
-                in[j]->value[i] *= self->scale;
-            }
+      for(int i = 0; i < in[j]->length; i++) {
+        if (in[j]->is_present) {
+          in[j]->value[i] *= self->scale;
         }
-        lf_set_token(out[j], in[j]->token);
+      }
+      lf_set_token(out[j], in[j]->token);
     }
   =}
 }
diff --git a/test/C/src/multiport/MultiportOut.lf b/test/C/src/multiport/MultiportOut.lf
index bb756937e5..3049208b3d 100644
--- a/test/C/src/multiport/MultiportOut.lf
+++ b/test/C/src/multiport/MultiportOut.lf
@@ -11,7 +11,7 @@ reactor Source {
 
   reaction(t) -> out {=
     for(int i = 0; i < 4; i++) {
-        lf_set(out[i], self->s);
+      lf_set(out[i], self->s);
     }
     self->s++;
   =}
@@ -37,20 +37,20 @@ reactor Destination {
   reaction(in) {=
     int sum = 0;
     for (int i = 0; i < in_width; i++) {
-        if (in[i]->is_present) sum += in[i]->value;
+      if (in[i]->is_present) sum += in[i]->value;
     }
     printf("Sum of received: %d.\n", sum);
     if (sum != self->s) {
-        printf("ERROR: Expected %d.\n", self->s);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->s);
+      exit(1);
     }
     self->s += 4;
   =}
 
   reaction(shutdown) {=
     if (self->s == 0) {
-        fprintf(stderr, "ERROR: Destination received no input!\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Destination received no input!\n");
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/MultiportToBank.lf b/test/C/src/multiport/MultiportToBank.lf
index 0dc850c606..b048e5ca1c 100644
--- a/test/C/src/multiport/MultiportToBank.lf
+++ b/test/C/src/multiport/MultiportToBank.lf
@@ -6,11 +6,11 @@ target C {
 
 reactor Source(width: int = 2) {
   output[width] out: int  // Connected to a bank of Destination reactors
-  input dummy: int        // Not connected to anything
+  input dummy: int    // Not connected to anything
 
   reaction(startup) -> out {=
     for(int i = 0; i < out_width; i++) {
-        lf_set(out[i], i);
+      lf_set(out[i], i);
     }
   =}
 
@@ -20,7 +20,7 @@ reactor Source(width: int = 2) {
   // Contents of the reactions does not matter (either could be empty)
   out {=
     for(int i = 0; i < out_width; i++) {
-        lf_set(out[i], i);
+      lf_set(out[i], i);
     }
   =}
 }
@@ -32,16 +32,16 @@ reactor Destination(bank_index: int = 0) {
   reaction(in) {=
     printf("Destination %d received %d.\n", self->bank_index, in->value);
     if (self->bank_index != in->value) {
-        printf("ERROR: Expected %d.\n", self->bank_index);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->bank_index);
+      exit(1);
     }
     self->received = true;
   =}
 
   reaction(shutdown) {=
     if (!self->received) {
-        fprintf(stderr, "ERROR: Destination %d received no input!\n", self->bank_index);
-        exit(1);
+      fprintf(stderr, "ERROR: Destination %d received no input!\n", self->bank_index);
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/MultiportToBankAfter.lf b/test/C/src/multiport/MultiportToBankAfter.lf
index 9050661954..7bc4b87679 100644
--- a/test/C/src/multiport/MultiportToBankAfter.lf
+++ b/test/C/src/multiport/MultiportToBankAfter.lf
@@ -9,7 +9,7 @@ reactor Source(width: int = 2) {
 
   reaction(startup) -> out {=
     for(int i = 0; i < out_width; i++) {
-        lf_set(out[i], i);
+      lf_set(out[i], i);
     }
   =}
 }
@@ -21,20 +21,20 @@ reactor Destination(bank_index: int = 0) {
   reaction(in) {=
     printf("Destination %d received %d.\n", self->bank_index, in->value);
     if (self->bank_index != in->value) {
-        printf("ERROR: Expected %d.\n", self->bank_index);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->bank_index);
+      exit(1);
     }
     if (lf_time_logical_elapsed() != SEC(1)) {
-        printf("ERROR: Expected to receive input after one second.\n");
-        exit(2);
+      printf("ERROR: Expected to receive input after one second.\n");
+      exit(2);
     }
     self->received = true;
   =}
 
   reaction(shutdown) {=
     if (!self->received) {
-        fprintf(stderr, "ERROR: Destination %d received no input!\n", self->bank_index);
-        exit(3);
+      fprintf(stderr, "ERROR: Destination %d received no input!\n", self->bank_index);
+      exit(3);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/MultiportToBankDouble.lf b/test/C/src/multiport/MultiportToBankDouble.lf
index 0fd905379d..83882d9115 100644
--- a/test/C/src/multiport/MultiportToBankDouble.lf
+++ b/test/C/src/multiport/MultiportToBankDouble.lf
@@ -10,7 +10,7 @@ reactor Source {
 
   reaction(startup) -> out {=
     for(int i = 0; i < out_width; i++) {
-        lf_set(out[i], i);
+      lf_set(out[i], i);
     }
   =}
 
@@ -20,7 +20,7 @@ reactor Source {
   // Contents of the reactions does not matter (either could be empty)
   out {=
     for(int i = 0; i < out_width; i++) {
-        lf_set(out[i], i * 2);
+      lf_set(out[i], i * 2);
     }
   =}
 }
@@ -32,16 +32,16 @@ reactor Destination(bank_index: int = 0) {
   reaction(in) {=
     printf("Destination %d received %d.\n", self->bank_index, in->value);
     if (self->bank_index * 2 != in->value) {
-        printf("ERROR: Expected %d.\n", self->bank_index * 2);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->bank_index * 2);
+      exit(1);
     }
     self->received = true;
   =}
 
   reaction(shutdown) {=
     if (!self->received) {
-        fprintf(stderr, "ERROR: Destination %d received no input!\n", self->bank_index);
-        exit(1);
+      fprintf(stderr, "ERROR: Destination %d received no input!\n", self->bank_index);
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/MultiportToBankHierarchy.lf b/test/C/src/multiport/MultiportToBankHierarchy.lf
index eb388183c7..722e5d4349 100644
--- a/test/C/src/multiport/MultiportToBankHierarchy.lf
+++ b/test/C/src/multiport/MultiportToBankHierarchy.lf
@@ -10,7 +10,7 @@ reactor Source(width: int = 2) {
 
   reaction(startup) -> out {=
     for(int i = 0; i < out_width; i++) {
-        lf_set(out[i], i);
+      lf_set(out[i], i);
     }
   =}
 }
@@ -22,16 +22,16 @@ reactor Destination(bank_index: int = 0) {
   reaction(in) {=
     printf("Destination %d received %d.\n", self->bank_index, in->value);
     if (self->bank_index != in->value) {
-        printf("ERROR: Expected %d.\n", self->bank_index);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->bank_index);
+      exit(1);
     }
     self->received = true;
   =}
 
   reaction(shutdown) {=
     if (!self->received) {
-        fprintf(stderr, "ERROR: Destination %d received no input!\n", self->bank_index);
-        exit(1);
+      fprintf(stderr, "ERROR: Destination %d received no input!\n", self->bank_index);
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/MultiportToHierarchy.lf b/test/C/src/multiport/MultiportToHierarchy.lf
index d96c57d008..0a21f36aaa 100644
--- a/test/C/src/multiport/MultiportToHierarchy.lf
+++ b/test/C/src/multiport/MultiportToHierarchy.lf
@@ -12,7 +12,7 @@ reactor Source(width: int = 2) {
 
   reaction(t) -> out {=
     for(int i = 0; i < 4; i++) {
-        lf_set(out[i], self->s++);
+      lf_set(out[i], self->s++);
     }
   =}
 }
@@ -24,20 +24,20 @@ reactor Destination(width: int = 4) {
   reaction(in) {=
     int sum = 0;
     for (int i = 0; i < in_width; i++) {
-        if (in[i]->is_present) sum += in[i]->value;
+      if (in[i]->is_present) sum += in[i]->value;
     }
     printf("Sum of received: %d.\n", sum);
     if (sum != self->s) {
-        printf("ERROR: Expected %d.\n", self->s);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->s);
+      exit(1);
     }
     self->s += 16;
   =}
 
   reaction(shutdown) {=
     if (self->s <= 6) {
-        fprintf(stderr, "ERROR: Destination received no input!\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Destination received no input!\n");
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/MultiportToMultiport.lf b/test/C/src/multiport/MultiportToMultiport.lf
index 02594ce518..af437ab670 100644
--- a/test/C/src/multiport/MultiportToMultiport.lf
+++ b/test/C/src/multiport/MultiportToMultiport.lf
@@ -11,10 +11,10 @@ reactor Source(width: int = 1) {
 
   reaction(t) -> out {=
     for(int i = 0; i < out_width; i++) {
-        printf("Before lf_set, out[%d]->is_present has value %d\n", i, out[i]->is_present);
-        lf_set(out[i], self->s++);
-        printf("AFTER set, out[%d]->is_present has value %d\n", i, out[i]->is_present);
-        printf("AFTER set, out[%d]->value has value %d\n", i, out[i]->value);
+      printf("Before lf_set, out[%d]->is_present has value %d\n", i, out[i]->is_present);
+      lf_set(out[i], self->s++);
+      printf("AFTER set, out[%d]->is_present has value %d\n", i, out[i]->is_present);
+      printf("AFTER set, out[%d]->value has value %d\n", i, out[i]->value);
     }
   =}
 }
@@ -26,20 +26,20 @@ reactor Destination(width: int = 1) {
   reaction(in) {=
     int sum = 0;
     for (int i = 0; i < in_width; i++) {
-        if (in[i]->is_present) sum += in[i]->value;
+      if (in[i]->is_present) sum += in[i]->value;
     }
     printf("Sum of received: %d.\n", sum);
     if (sum != self->s) {
-        printf("ERROR: Expected %d.\n", self->s);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->s);
+      exit(1);
     }
     self->s += 16;
   =}
 
   reaction(shutdown) {=
     if (self->s <= 6) {
-        fprintf(stderr, "ERROR: Destination received no input!\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Destination received no input!\n");
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/MultiportToMultiport2.lf b/test/C/src/multiport/MultiportToMultiport2.lf
index 0390cdeacc..a63a95c048 100644
--- a/test/C/src/multiport/MultiportToMultiport2.lf
+++ b/test/C/src/multiport/MultiportToMultiport2.lf
@@ -6,7 +6,7 @@ reactor Source(width: int = 2) {
 
   reaction(startup) -> out {=
     for (int i = 0; i < out_width; i++) {
-        lf_set(out[i], i);
+      lf_set(out[i], i);
     }
   =}
 }
@@ -16,15 +16,15 @@ reactor Destination(width: int = 2) {
 
   reaction(in) {=
     for (int i = 0; i < in_width; i++) {
-        if (in[i]->is_present) {
-            printf("Received on channel %d: %d\n", i, in[i]->value);
-            // NOTE: For testing purposes, this assumes the specific
-            // widths instantiated below.
-            if (in[i]->value != i % 3) {
-                fprintf(stderr, "ERROR: expected %d!\n", i % 3);
-                exit(1);
-            }
+      if (in[i]->is_present) {
+        printf("Received on channel %d: %d\n", i, in[i]->value);
+        // NOTE: For testing purposes, this assumes the specific
+        // widths instantiated below.
+        if (in[i]->value != i % 3) {
+          fprintf(stderr, "ERROR: expected %d!\n", i % 3);
+          exit(1);
         }
+      }
     }
   =}
 }
diff --git a/test/C/src/multiport/MultiportToMultiport2After.lf b/test/C/src/multiport/MultiportToMultiport2After.lf
index aa1d7338b4..e570d65f10 100644
--- a/test/C/src/multiport/MultiportToMultiport2After.lf
+++ b/test/C/src/multiport/MultiportToMultiport2After.lf
@@ -6,7 +6,7 @@ reactor Source(width: int = 2) {
 
   reaction(startup) -> out {=
     for (int i = 0; i < out_width; i++) {
-        lf_set(out[i], i);
+      lf_set(out[i], i);
     }
   =}
 }
@@ -16,19 +16,19 @@ reactor Destination(width: int = 2) {
 
   reaction(in) {=
     for (int i = 0; i < in_width; i++) {
-        if (in[i]->is_present) {
-            printf("Received on channel %d: %d\n", i, in[i]->value);
-            // NOTE: For testing purposes, this assumes the specific
-            // widths instantiated below.
-            if (in[i]->value != i % 3) {
-                fprintf(stderr, "ERROR: expected %d!\n", i % 3);
-                exit(1);
-            }
+      if (in[i]->is_present) {
+        printf("Received on channel %d: %d\n", i, in[i]->value);
+        // NOTE: For testing purposes, this assumes the specific
+        // widths instantiated below.
+        if (in[i]->value != i % 3) {
+          fprintf(stderr, "ERROR: expected %d!\n", i % 3);
+          exit(1);
         }
+      }
     }
     if (lf_time_logical_elapsed() != SEC(1)) {
-        printf("ERROR: Expected to receive input after one second.\n");
-        exit(2);
+      printf("ERROR: Expected to receive input after one second.\n");
+      exit(2);
     }
   =}
 }
diff --git a/test/C/src/multiport/MultiportToMultiportArray.lf b/test/C/src/multiport/MultiportToMultiportArray.lf
index 203e4fb04f..31f0bf2944 100644
--- a/test/C/src/multiport/MultiportToMultiportArray.lf
+++ b/test/C/src/multiport/MultiportToMultiportArray.lf
@@ -11,13 +11,13 @@ reactor Source {
 
   reaction(t) -> out {=
     for(int i = 0; i < 2; i++) {
-        // Dynamically allocate an output array of length 3.
-        SET_NEW_ARRAY(out[i], 3);
+      // Dynamically allocate an output array of length 3.
+      SET_NEW_ARRAY(out[i], 3);
 
-        // Above allocates the array, which then must be populated.
-        out[i]->value[0] = self->s++;
-        out[i]->value[1] = self->s++;
-        out[i]->value[2] = self->s++;
+      // Above allocates the array, which then must be populated.
+      out[i]->value[0] = self->s++;
+      out[i]->value[1] = self->s++;
+      out[i]->value[2] = self->s++;
     }
   =}
 }
@@ -29,24 +29,24 @@ reactor Destination {
   reaction(in) {=
     int sum = 0;
     for (int i = 0; i < in_width; i++) {
-        if (in[i]->is_present) {
-            for (int j = 0; j < in[i]->length; j++) {
-                sum += in[i]->value[j];
-            }
+      if (in[i]->is_present) {
+        for (int j = 0; j < in[i]->length; j++) {
+          sum += in[i]->value[j];
         }
+      }
     }
     printf("Sum of received: %d.\n", sum);
     if (sum != self->s) {
-        printf("ERROR: Expected %d.\n", self->s);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->s);
+      exit(1);
     }
     self->s += 36;
   =}
 
   reaction(shutdown) {=
     if (self->s <= 15) {
-        fprintf(stderr, "ERROR: Destination received no input!\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Destination received no input!\n");
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/MultiportToMultiportParameter.lf b/test/C/src/multiport/MultiportToMultiportParameter.lf
index 792d71b1ee..2c73f21426 100644
--- a/test/C/src/multiport/MultiportToMultiportParameter.lf
+++ b/test/C/src/multiport/MultiportToMultiportParameter.lf
@@ -11,10 +11,10 @@ reactor Source(width: int = 1) {
 
   reaction(t) -> out {=
     for(int i = 0; i < out_width; i++) {
-        printf("Before lf_set, out[%d]->is_present has value %d\n", i, out[i]->is_present);
-        lf_set(out[i], self->s++);
-        printf("AFTER set, out[%d]->is_present has value %d\n", i, out[i]->is_present);
-        printf("AFTER set, out[%d]->value has value %d\n", i, out[i]->value);
+      printf("Before lf_set, out[%d]->is_present has value %d\n", i, out[i]->is_present);
+      lf_set(out[i], self->s++);
+      printf("AFTER set, out[%d]->is_present has value %d\n", i, out[i]->is_present);
+      printf("AFTER set, out[%d]->value has value %d\n", i, out[i]->value);
     }
   =}
 }
@@ -26,20 +26,20 @@ reactor Destination(width: int = 1) {
   reaction(in) {=
     int sum = 0;
     for (int i = 0; i < in_width; i++) {
-        if (in[i]->is_present) sum += in[i]->value;
+      if (in[i]->is_present) sum += in[i]->value;
     }
     printf("Sum of received: %d.\n", sum);
     if (sum != self->s) {
-        printf("ERROR: Expected %d.\n", self->s);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->s);
+      exit(1);
     }
     self->s += 16;
   =}
 
   reaction(shutdown) {=
     if (self->s <= 6) {
-        fprintf(stderr, "ERROR: Destination received no input!\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Destination received no input!\n");
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/MultiportToPort.lf b/test/C/src/multiport/MultiportToPort.lf
index 86a2a99d20..3121f03d7b 100644
--- a/test/C/src/multiport/MultiportToPort.lf
+++ b/test/C/src/multiport/MultiportToPort.lf
@@ -9,8 +9,8 @@ reactor Source {
 
   reaction(startup) -> out {=
     for(int i = 0; i < out_width; i++) {
-        printf("Source sending %d.\n", i);
-        lf_set(out[i], i);
+      printf("Source sending %d.\n", i);
+      lf_set(out[i], i);
     }
   =}
 }
@@ -23,15 +23,15 @@ reactor Destination(expected: int = 0) {
     printf("Received: %d.\n", in->value);
     self->received = true;
     if (in->value != self->expected) {
-        printf("ERROR: Expected %d.\n", self->expected);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->expected);
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (!self->received) {
-        fprintf(stderr, "ERROR: Destination received no input!\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Destination received no input!\n");
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/MultiportToReaction.lf b/test/C/src/multiport/MultiportToReaction.lf
index a32ecba25f..3d3560f478 100644
--- a/test/C/src/multiport/MultiportToReaction.lf
+++ b/test/C/src/multiport/MultiportToReaction.lf
@@ -12,7 +12,7 @@ reactor Source(width: int = 1) {
   reaction(t) -> out {=
     printf("Sending.\n");
     for(int i = 0; i < out_width; i++) {
-        lf_set(out[i], self->s++);
+      lf_set(out[i], self->s++);
     }
   =}
 }
@@ -24,20 +24,20 @@ main reactor MultiportToReaction {
   reaction(b.out) {=
     int sum = 0;
     for (int i = 0; i < b.out_width; i++) {
-        if (b.out[i]->is_present) sum += b.out[i]->value;
+      if (b.out[i]->is_present) sum += b.out[i]->value;
     }
     printf("Sum of received: %d.\n", sum);
     if (sum != self->s) {
-        printf("ERROR: Expected %d.\n", self->s);
-        exit(1);
+      printf("ERROR: Expected %d.\n", self->s);
+      exit(1);
     }
     self->s += 16;
   =}
 
   reaction(shutdown) {=
     if (self->s <= 6) {
-        fprintf(stderr, "ERROR: Destination received no input!\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Destination received no input!\n");
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/multiport/NestedBanks.lf b/test/C/src/multiport/NestedBanks.lf
index f4291e07a6..0254c1c59a 100644
--- a/test/C/src/multiport/NestedBanks.lf
+++ b/test/C/src/multiport/NestedBanks.lf
@@ -41,10 +41,10 @@ reactor D {
 
   reaction(u) {=
     for (int i = 0; i < u_width; i++) {
-        lf_print("d.u[%d] received %d.", i, u[i]->value);
-        if (u[i]->value != 6 + i) {
-            lf_print_error_and_exit("Expected %d but received %d.", 6 + i, u[i]->value);
-        }
+      lf_print("d.u[%d] received %d.", i, u[i]->value);
+      if (u[i]->value != 6 + i) {
+        lf_print_error_and_exit("Expected %d but received %d.", 6 + i, u[i]->value);
+      }
     }
   =}
 }
@@ -54,7 +54,7 @@ reactor E {
 
   reaction(t) {=
     for (int i = 0; i < t_width; i++) {
-        lf_print("e.t[%d] received %d.", i, t[i]->value);
+      lf_print("e.t[%d] received %d.", i, t[i]->value);
     }
   =}
 }
@@ -65,7 +65,7 @@ reactor F(c_bank_index: int = 0) {
   reaction(w) {=
     lf_print("c[%d].f.w received %d.", self->c_bank_index, w->value);
     if (w->value != self->c_bank_index * 2) {
-        lf_print_error_and_exit("Expected %d but received %d.", self->c_bank_index * 2, w->value);
+      lf_print_error_and_exit("Expected %d but received %d.", self->c_bank_index * 2, w->value);
     }
   =}
 }
@@ -76,7 +76,7 @@ reactor G(c_bank_index: int = 0) {
   reaction(s) {=
     lf_print("c[%d].g.s received %d.", self->c_bank_index, s->value);
     if (s->value != self->c_bank_index * 2 + 1) {
-        lf_print_error_and_exit("Expected %d but received %d.", self->c_bank_index * 2 + 1, s->value);
+      lf_print_error_and_exit("Expected %d but received %d.", self->c_bank_index * 2 + 1, s->value);
     }
   =}
 }
diff --git a/test/C/src/multiport/NestedInterleavedBanks.lf b/test/C/src/multiport/NestedInterleavedBanks.lf
index 84175c9ff8..889ea904d7 100644
--- a/test/C/src/multiport/NestedInterleavedBanks.lf
+++ b/test/C/src/multiport/NestedInterleavedBanks.lf
@@ -9,8 +9,8 @@ reactor A(bank_index: int = 0, outer_bank_index: int = 0) {
 
   reaction(startup) -> p {=
     for (int i = 0; i < p_width; i++) {
-        lf_set(p[i], self->outer_bank_index * 4 + self->bank_index * 2 + i + 1);
-        lf_print("A sending %d.", p[i]->value);
+      lf_set(p[i], self->outer_bank_index * 4 + self->bank_index * 2 + i + 1);
+      lf_print("A sending %d.", p[i]->value);
     }
   =}
 }
@@ -27,10 +27,10 @@ reactor C {
   reaction(i) {=
     int expected[] = {1, 3, 2, 4, 5, 7, 6, 8};
     for(int j = 0; j < i_width; j++) {
-        lf_print("C received %d.", i[j]->value);
-        if (i[j]->value != expected[j]) {
-            lf_print_error_and_exit("Expected %d.", expected[j]);
-        }
+      lf_print("C received %d.", i[j]->value);
+      if (i[j]->value != expected[j]) {
+        lf_print_error_and_exit("Expected %d.", expected[j]);
+      }
     }
   =}
 }
diff --git a/test/C/src/multiport/PipelineAfter.lf b/test/C/src/multiport/PipelineAfter.lf
index e3256c5cb8..bbcbaebc49 100644
--- a/test/C/src/multiport/PipelineAfter.lf
+++ b/test/C/src/multiport/PipelineAfter.lf
@@ -19,12 +19,12 @@ reactor Sink {
   reaction(in) {=
     printf("Received %d\n", in->value);
     if (in->value != 42) {
-        printf("ERROR: expected 42!\n");
-        exit(1);
+      printf("ERROR: expected 42!\n");
+      exit(1);
     }
     if (lf_time_logical_elapsed() != SEC(1)) {
-        printf("ERROR: Expected to receive input after one second.\n");
-        exit(2);
+      printf("ERROR: Expected to receive input after one second.\n");
+      exit(2);
     }
   =}
 }
diff --git a/test/C/src/multiport/ReactionToContainedBank.lf b/test/C/src/multiport/ReactionToContainedBank.lf
index 8503b2c6b2..e7ecfb29f6 100644
--- a/test/C/src/multiport/ReactionToContainedBank.lf
+++ b/test/C/src/multiport/ReactionToContainedBank.lf
@@ -14,7 +14,7 @@ main reactor ReactionToContainedBank(width: int = 2) {
 
   reaction(t) -> test.in {=
     for (int i = 0; i < self->width; i++) {
-        lf_set(test[i].in, self->count);
+      lf_set(test[i].in, self->count);
     }
     self->count++;
   =}
diff --git a/test/C/src/multiport/ReactionToContainedBank2.lf b/test/C/src/multiport/ReactionToContainedBank2.lf
index 00bf6325fd..d77112fd39 100644
--- a/test/C/src/multiport/ReactionToContainedBank2.lf
+++ b/test/C/src/multiport/ReactionToContainedBank2.lf
@@ -14,7 +14,7 @@ reactor ReactionToContainedBank(width: int = 2) {
 
   reaction(t) -> test.in {=
     for (int i = 0; i < self->width; i++) {
-        lf_set(test[i].in, self->count);
+      lf_set(test[i].in, self->count);
     }
     self->count++;
   =}
diff --git a/test/C/src/multiport/ReactionToContainedBankMultiport.lf b/test/C/src/multiport/ReactionToContainedBankMultiport.lf
index 77832f4b80..df269cd0f1 100644
--- a/test/C/src/multiport/ReactionToContainedBankMultiport.lf
+++ b/test/C/src/multiport/ReactionToContainedBankMultiport.lf
@@ -14,10 +14,10 @@ main reactor(width: int = 2) {
 
   reaction(t) -> test.in {=
     for (int i = 0; i < self->width; i++) {
-        for (int j = 0; j < self->width; j++) {
-            lf_set(test[j].in[i], self->count);
-        }
-        self->count++;
+      for (int j = 0; j < self->width; j++) {
+        lf_set(test[j].in[i], self->count);
+      }
+      self->count++;
     }
   =}
 }
diff --git a/test/C/src/multiport/ReactionsToNested.lf b/test/C/src/multiport/ReactionsToNested.lf
index 9260b9b53b..2b07e948de 100644
--- a/test/C/src/multiport/ReactionsToNested.lf
+++ b/test/C/src/multiport/ReactionsToNested.lf
@@ -11,13 +11,13 @@ reactor T(expected: int = 0) {
     lf_print("T received %d", z->value);
     self->received = true;
     if (z->value != self->expected) {
-        lf_print_error_and_exit("Expected %d", self->expected);
+      lf_print_error_and_exit("Expected %d", self->expected);
     }
   =}
 
   reaction(shutdown) {=
     if (!self->received) {
-        lf_print_error_and_exit("No input received");
+      lf_print_error_and_exit("No input received");
     }
   =}
 }
diff --git a/test/C/src/multiport/Sparse.lf b/test/C/src/multiport/Sparse.lf
index ef3fbba631..619afe92eb 100644
--- a/test/C/src/multiport/Sparse.lf
+++ b/test/C/src/multiport/Sparse.lf
@@ -11,7 +11,7 @@ reactor SparseSource(width: int = 20) {
   reaction(t) -> out {=
     int next_count = self->count + 1;
     if (next_count >= self->width) {
-        next_count = 0;
+      next_count = 0;
     }
     lf_set(out[next_count], next_count);
     lf_set(out[self->count], self->count);
@@ -29,16 +29,16 @@ reactor SparseSink(width: int = 20) {
     int previous = -1;
     int channel = lf_multiport_next(&i);
     while(channel >= 0) {
-        lf_print("Received %d on channel %d", in[channel]->value, channel);
-        // The value of the input should equal the channel number.
-        if (in[channel]->value != channel) {
-            lf_print_error_and_exit("Expected %d", channel);
-        }
-        if (channel <= previous) {
-            lf_print_error_and_exit("Input channels not read in order.");
-        }
-        previous = channel;
-        channel = lf_multiport_next(&i);
+      lf_print("Received %d on channel %d", in[channel]->value, channel);
+      // The value of the input should equal the channel number.
+      if (in[channel]->value != channel) {
+        lf_print_error_and_exit("Expected %d", channel);
+      }
+      if (channel <= previous) {
+        lf_print_error_and_exit("Input channels not read in order.");
+      }
+      previous = channel;
+      channel = lf_multiport_next(&i);
     }
   =}
 }
diff --git a/test/C/src/multiport/SparseFallback.lf b/test/C/src/multiport/SparseFallback.lf
index 3f5f0ebec4..e2ad9b1ecc 100644
--- a/test/C/src/multiport/SparseFallback.lf
+++ b/test/C/src/multiport/SparseFallback.lf
@@ -14,7 +14,7 @@ reactor SparseSource(width: int = 20) {
   reaction(t) -> out {=
     int next_count = self->count + 1;
     if (next_count >= self->width) {
-        next_count = 0;
+      next_count = 0;
     }
     lf_set(out[self->count], self->count);
     lf_set(out[next_count], next_count);
@@ -32,16 +32,16 @@ reactor SparseSink(width: int = 20) {
     int previous = -1;
     int channel = lf_multiport_next(&i);
     while(channel >= 0) {
-        lf_print("Received %d on channel %d", in[channel]->value, channel);
-        // The value of the input should equal the channel number.
-        if (in[channel]->value != channel) {
-            lf_print_error_and_exit("Expected %d", channel);
-        }
-        if (channel <= previous) {
-            lf_print_error_and_exit("Input channels not read in order.");
-        }
-        previous = channel;
-        channel = lf_multiport_next(&i);
+      lf_print("Received %d on channel %d", in[channel]->value, channel);
+      // The value of the input should equal the channel number.
+      if (in[channel]->value != channel) {
+        lf_print_error_and_exit("Expected %d", channel);
+      }
+      if (channel <= previous) {
+        lf_print_error_and_exit("Input channels not read in order.");
+      }
+      previous = channel;
+      channel = lf_multiport_next(&i);
     }
   =}
 }
diff --git a/test/C/src/multiport/TriggerDownstreamOnlyIfPresent.lf b/test/C/src/multiport/TriggerDownstreamOnlyIfPresent.lf
index 9acf39c95c..f1a0a3b81e 100644
--- a/test/C/src/multiport/TriggerDownstreamOnlyIfPresent.lf
+++ b/test/C/src/multiport/TriggerDownstreamOnlyIfPresent.lf
@@ -12,9 +12,9 @@ reactor Source {
 
   reaction(t) -> a, b {=
     if (self->count++ % 2 == 0) {
-        lf_set(a, self->count);
+      lf_set(a, self->count);
     } else {
-        lf_set(b, self->count);
+      lf_set(b, self->count);
     }
   =}
 }
@@ -25,15 +25,15 @@ reactor Destination {
 
   reaction(a) {=
     if (!a->is_present) {
-        fprintf(stderr, "Reaction to a triggered even though all inputs are absent!\n");
-        exit(1);
+      fprintf(stderr, "Reaction to a triggered even though all inputs are absent!\n");
+      exit(1);
     }
   =}
 
   reaction(b) {=
     if (!b->is_present) {
-        fprintf(stderr, "Reaction to b triggered even though all inputs are absent!\n");
-        exit(2);
+      fprintf(stderr, "Reaction to b triggered even though all inputs are absent!\n");
+      exit(2);
     }
   =}
 }
diff --git a/test/C/src/no_inlining/BankMultiportToReactionNoInlining.lf b/test/C/src/no_inlining/BankMultiportToReactionNoInlining.lf
index 4ed83a1700..e565451b7c 100644
--- a/test/C/src/no_inlining/BankMultiportToReactionNoInlining.lf
+++ b/test/C/src/no_inlining/BankMultiportToReactionNoInlining.lf
@@ -24,7 +24,7 @@ main reactor {
 
   reaction(shutdown) {=
     if (!self->received) {
-        lf_print_error_and_exit("No inputs present.");
+      lf_print_error_and_exit("No inputs present.");
     }
   =}
 }
diff --git a/test/C/src/no_inlining/MultiportToReactionNoInlining.lf b/test/C/src/no_inlining/MultiportToReactionNoInlining.lf
index b685abc5b2..0d881ffa58 100644
--- a/test/C/src/no_inlining/MultiportToReactionNoInlining.lf
+++ b/test/C/src/no_inlining/MultiportToReactionNoInlining.lf
@@ -14,7 +14,7 @@ reactor Source(width: int = 1) {
   reaction(t) -> out {=
     printf("Sending.\n");
     for(int i = 0; i < out_width; i++) {
-        lf_set(out[i], self->s++);
+      lf_set(out[i], self->s++);
     }
   =}
 }
@@ -27,8 +27,8 @@ main reactor {
 
   reaction(shutdown) {=
     if (self->s <= 6) {
-        fprintf(stderr, "ERROR: Destination received no input!\n");
-        exit(1);
+      fprintf(stderr, "ERROR: Destination received no input!\n");
+      exit(1);
     }
     printf("Success.\n");
   =}
diff --git a/test/C/src/serialization/PersonProtocolBuffers.lf b/test/C/src/serialization/PersonProtocolBuffers.lf
index ffc346db3d..193de9193a 100644
--- a/test/C/src/serialization/PersonProtocolBuffers.lf
+++ b/test/C/src/serialization/PersonProtocolBuffers.lf
@@ -24,8 +24,8 @@ target C {
 main reactor {
   reaction(startup) {=
     Person person = PERSON__INIT; // Macro to create the protocol buffer
-    uint8_t* buffer;              // Buffer to store the serialized data
-    unsigned len;                 // Length of the packed message
+    uint8_t* buffer;        // Buffer to store the serialized data
+    unsigned len;         // Length of the packed message
 
     person.name = "Lingua Franca";
     person.id = 1;
@@ -41,6 +41,6 @@ main reactor {
 
     // Extract and print the unpacked message.
     printf("Name: %s\n", unpacked->name);
-    free(buffer);                        // Free the allocated serialized buffer
+    free(buffer);            // Free the allocated serialized buffer
   =}
 }
diff --git a/test/C/src/serialization/ROSBuiltInSerialization.lf b/test/C/src/serialization/ROSBuiltInSerialization.lf
index 6054a50fa2..26dddca2fb 100644
--- a/test/C/src/serialization/ROSBuiltInSerialization.lf
+++ b/test/C/src/serialization/ROSBuiltInSerialization.lf
@@ -48,11 +48,11 @@ reactor Receiver {
   reaction(in) {=
     // Print the ROS2 message data
     lf_print(
-        "Serialized integer after deserialization: %d",
-        in->value.data
+      "Serialized integer after deserialization: %d",
+      in->value.data
     );
     if (in->value.data != self->count) {
-        lf_print_error_and_exit("Expected %d.", self->count);
+      lf_print_error_and_exit("Expected %d.", self->count);
     }
     self->count++;
   =}
diff --git a/test/C/src/serialization/ROSBuiltInSerializationSharedPtr.lf b/test/C/src/serialization/ROSBuiltInSerializationSharedPtr.lf
index e407f18bb9..2355d33f58 100644
--- a/test/C/src/serialization/ROSBuiltInSerializationSharedPtr.lf
+++ b/test/C/src/serialization/ROSBuiltInSerializationSharedPtr.lf
@@ -48,11 +48,11 @@ reactor Receiver {
   reaction(in) {=
     // Print the ROS2 message data
     lf_print(
-        "Serialized integer after deserialization: %d",
-        in->value->data
+      "Serialized integer after deserialization: %d",
+      in->value->data
     );
     if (in->value->data != self->count) {
-        lf_print_error_and_exit("Expected %d.", self->count);
+      lf_print_error_and_exit("Expected %d.", self->count);
     }
     self->count++;
   =}
diff --git a/test/C/src/target/HelloWorldCCPP.lf b/test/C/src/target/HelloWorldCCPP.lf
index 1b3a9b023f..cef02c9440 100644
--- a/test/C/src/target/HelloWorldCCPP.lf
+++ b/test/C/src/target/HelloWorldCCPP.lf
@@ -21,8 +21,8 @@ reactor HelloWorld {
   reaction(shutdown) {=
     printf("Shutdown invoked.\n");
     if (!self->success) {
-        fprintf(stderr, "ERROR: startup reaction not executed.\n");
-        exit(1);
+      fprintf(stderr, "ERROR: startup reaction not executed.\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/C/src/token/TokenContainedPrint.lf b/test/C/src/token/TokenContainedPrint.lf
index 586e7283a2..ef1eb7c94e 100644
--- a/test/C/src/token/TokenContainedPrint.lf
+++ b/test/C/src/token/TokenContainedPrint.lf
@@ -22,7 +22,7 @@ main reactor {
   reaction(t) -> p.in {=
     int_array_t* array =  int_array_constructor(3);
     for (size_t i = 0; i < array->length; i++) {
-        array->data[i] = self->count++;
+      array->data[i] = self->count++;
     }
     lf_set(p.in, array);
   =}
diff --git a/test/C/src/token/TokenContainedPrintBank.lf b/test/C/src/token/TokenContainedPrintBank.lf
index 69ae534b20..659f1d13a1 100644
--- a/test/C/src/token/TokenContainedPrintBank.lf
+++ b/test/C/src/token/TokenContainedPrintBank.lf
@@ -15,21 +15,21 @@ main reactor {
 
   reaction(startup) -> p.in {=
     for (int j = 0; j < p_width; j++) {
-        lf_set_destructor(p[j].in, int_array_destructor);
-        lf_set_copy_constructor(p[j].in, int_array_copy_constructor);
+      lf_set_destructor(p[j].in, int_array_destructor);
+      lf_set_copy_constructor(p[j].in, int_array_copy_constructor);
     }
   =}
 
   reaction(t) -> p.in {=
     int_array_t* array =  int_array_constructor(3);
     for (size_t i = 0; i < array->length; i++) {
-        array->data[i] = self->count++;
+      array->data[i] = self->count++;
     }
     // Sending the array to more than one destination, so we need
     // to wrap it in a token.
     lf_token_t* token = lf_new_token(p[0].in, array, 1);
     for (int j = 0; j < p_width; j++) {
-        lf_set_token(p[j].in, token);
+      lf_set_token(p[j].in, token);
     }
   =}
 }
diff --git a/test/C/src/token/TokenContainedSource.lf b/test/C/src/token/TokenContainedSource.lf
index 72fd079032..fb61376351 100644
--- a/test/C/src/token/TokenContainedSource.lf
+++ b/test/C/src/token/TokenContainedSource.lf
@@ -20,24 +20,24 @@ main reactor(scale: int = 1) {
     bool failed = false; // For testing.
     printf("Received: [");
     for (int i = 0; i < s.out->value->length; i++) {
-        if (i > 0) printf(", ");
-        printf("%d", s.out->value->data[i]);
-        // For testing, check whether values match expectation.
-        if (s.out->value->data[i] != self->scale * self->count) {
-            failed = true;
-        }
-        self->count++;
+      if (i > 0) printf(", ");
+      printf("%d", s.out->value->data[i]);
+      // For testing, check whether values match expectation.
+      if (s.out->value->data[i] != self->scale * self->count) {
+        failed = true;
+      }
+      self->count++;
     }
     printf("]\n");
     if (failed) {
-        printf("ERROR: Value received does not match expectation!\n");
-        exit(1);
+      printf("ERROR: Value received does not match expectation!\n");
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (!self->input_received) {
-        lf_print_error_and_exit("TokenPrint: No result received!");
+      lf_print_error_and_exit("TokenPrint: No result received!");
     }
   =}
 }
diff --git a/test/C/src/token/TokenContainedSourceBank.lf b/test/C/src/token/TokenContainedSourceBank.lf
index 0a0b4383c7..14085eef8d 100644
--- a/test/C/src/token/TokenContainedSourceBank.lf
+++ b/test/C/src/token/TokenContainedSourceBank.lf
@@ -19,28 +19,28 @@ main reactor(scale: int = 1) {
     self->input_received = true;
     bool failed = false; // For testing.
     for (int j = 0; j < s_width; j++) {
-        printf("Received from %d: [", j);
-        if (j > 0) self->count -= s[j].out->value->length;
-        for (int i = 0; i < s[j].out->value->length; i++) {
-            if (i > 0) printf(", ");
-            printf("%d", s[j].out->value->data[i]);
-            // For testing, check whether values match expectation.
-            if (s[j].out->value->data[i] != self->scale * self->count) {
-                failed = true;
-            }
-            self->count++;
+      printf("Received from %d: [", j);
+      if (j > 0) self->count -= s[j].out->value->length;
+      for (int i = 0; i < s[j].out->value->length; i++) {
+        if (i > 0) printf(", ");
+        printf("%d", s[j].out->value->data[i]);
+        // For testing, check whether values match expectation.
+        if (s[j].out->value->data[i] != self->scale * self->count) {
+          failed = true;
         }
-        printf("]\n");
+        self->count++;
+      }
+      printf("]\n");
     }
     if (failed) {
-        printf("ERROR: Value received does not match expectation!\n");
-        exit(1);
+      printf("ERROR: Value received does not match expectation!\n");
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (!self->input_received) {
-        lf_print_error_and_exit("TokenPrint: No result received!");
+      lf_print_error_and_exit("TokenPrint: No result received!");
     }
   =}
 }
diff --git a/test/C/src/token/lib/Token.lf b/test/C/src/token/lib/Token.lf
index f5f0bc5d27..3bfabd9b1c 100644
--- a/test/C/src/token/lib/Token.lf
+++ b/test/C/src/token/lib/Token.lf
@@ -30,7 +30,7 @@ reactor TokenSource {
   reaction(t) -> out {=
     int_array_t* array =  int_array_constructor(3);
     for (size_t i = 0; i < array->length; i++) {
-        array->data[i] = self->count++;
+      array->data[i] = self->count++;
     }
     lf_set(out, array);
   =}
@@ -51,24 +51,24 @@ reactor TokenPrint(scale: int = 1) {
     bool failed = false; // For testing.
     printf("TokenPrint received: [");
     for (int i = 0; i < in->value->length; i++) {
-        if (i > 0) printf(", ");
-        printf("%d", in->value->data[i]);
-        // For testing, check whether values match expectation.
-        if (in->value->data[i] != self->scale * self->count) {
-            failed = true;
-        }
-        self->count++;
+      if (i > 0) printf(", ");
+      printf("%d", in->value->data[i]);
+      // For testing, check whether values match expectation.
+      if (in->value->data[i] != self->scale * self->count) {
+        failed = true;
+      }
+      self->count++;
     }
     printf("]\n");
     if (failed) {
-        printf("ERROR: Value received by Print does not match expectation!\n");
-        exit(1);
+      printf("ERROR: Value received by Print does not match expectation!\n");
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (!self->input_received) {
-        lf_print_error_and_exit("TokenPrint: No input received!");
+      lf_print_error_and_exit("TokenPrint: No input received!");
     }
   =}
 }
@@ -83,7 +83,7 @@ reactor TokenScale(scale: int = 2) {
 
   reaction(in) -> out {=
     for (int i = 0; i < in->value->length; i++) {
-        in->value->data[i] *= self->scale;
+      in->value->data[i] *= self->scale;
     }
     lf_set_token(out, in->token);
   =}
diff --git a/test/C/src/zephyr/UserThreads.lf b/test/C/src/zephyr/UserThreads.lf
index 5c19ce6d75..36f6e5b27a 100644
--- a/test/C/src/zephyr/UserThreads.lf
+++ b/test/C/src/zephyr/UserThreads.lf
@@ -13,7 +13,7 @@ main reactor {
   preamble {=
     #include "platform.h"
     void func(void* arg) {
-        lf_print("Hello from user thread");
+      lf_print("Hello from user thread");
     }
 
     lf_thread_t thread_ids[4];
@@ -23,17 +23,17 @@ main reactor {
     int res;
 
     for (int i = 0; i < 3; i++) {
-        res = lf_thread_create(&thread_ids[i], &func, NULL);
-        if (res != 0) {
-            lf_print_error_and_exit("Could not create thread");
-        }
+      res = lf_thread_create(&thread_ids[i], &func, NULL);
+      if (res != 0) {
+        lf_print_error_and_exit("Could not create thread");
+      }
     }
 
     res = lf_thread_create(&thread_ids[3], &func, NULL);
     if (res == 0) {
-        lf_print_error_and_exit("Could create more threads than specified.");
+      lf_print_error_and_exit("Could create more threads than specified.");
     } else {
-        printf("SUCCESS: Created exactly three user threads.\n");
+      printf("SUCCESS: Created exactly three user threads.\n");
     }
   =}
 }
diff --git a/test/Cpp/src/ActionDelay.lf b/test/Cpp/src/ActionDelay.lf
index 03b6b8beb9..98cbd11790 100644
--- a/test/Cpp/src/ActionDelay.lf
+++ b/test/Cpp/src/ActionDelay.lf
@@ -32,10 +32,10 @@ reactor Sink {
     std::cout << "physical time: " << physical << '\n';
     std::cout << "elapsed logical time: " << elapsed_logical << '\n';
     if (elapsed_logical != 100ms) {
-        std::cerr << "ERROR: Expected 100 msecs but got " << elapsed_logical << '\n';
-        exit(1);
+      std::cerr << "ERROR: Expected 100 msecs but got " << elapsed_logical << '\n';
+      exit(1);
     } else {
-        std::cout << "SUCCESS. Elapsed logical time is 100 msec.\n";
+      std::cout << "SUCCESS. Elapsed logical time is 100 msec.\n";
     }
   =}
 }
diff --git a/test/Cpp/src/ActionIsPresent.lf b/test/Cpp/src/ActionIsPresent.lf
index 4a75c262c7..db87343fac 100644
--- a/test/Cpp/src/ActionIsPresent.lf
+++ b/test/Cpp/src/ActionIsPresent.lf
@@ -8,22 +8,22 @@ main reactor ActionIsPresent(offset: time = 1 nsec, period: time(500 msec)) {
 
   reaction(startup, a) -> a {=
     if (!a.is_present()) {
-        if (offset == zero) {
-            std::cout << "Hello World!" << '\n';
-            success = true;
-        } else {
-            a.schedule(offset);
-        }
-    } else {
-        std::cout << "Hello World 2!" << '\n';
+      if (offset == zero) {
+        std::cout << "Hello World!" << '\n';
         success = true;
+      } else {
+        a.schedule(offset);
+      }
+    } else {
+      std::cout << "Hello World 2!" << '\n';
+      success = true;
     }
   =}
 
   reaction(shutdown) {=
     if (!success) {
-        std::cerr << "Failed to print 'Hello World!'" << '\n';
-        exit(1);
+      std::cerr << "Failed to print 'Hello World!'" << '\n';
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/ActionValues.lf b/test/Cpp/src/ActionValues.lf
index 6e40e2d526..7c9b85aaff 100644
--- a/test/Cpp/src/ActionValues.lf
+++ b/test/Cpp/src/ActionValues.lf
@@ -7,7 +7,7 @@ main reactor ActionValues {
   logical action act(100 msec): int
 
   reaction(startup) -> act {=
-    act.schedule(100);        // scheduled in 100 ms
+    act.schedule(100);    // scheduled in 100 ms
     std::chrono::milliseconds delay(50);
     act.schedule(-100, delay); // scheduled in 150 ms, value is overwritten
   =}
@@ -20,28 +20,28 @@ main reactor ActionValues {
     std::cout << "]\n";
 
     if (elapsed == 100ms) {
-        if (*act.get() != 100) {
-            std::cerr << "ERROR: Expected action value to be 100\n";
-            exit(1);
-        }
-        r1done = true;
+      if (*act.get() != 100) {
+        std::cerr << "ERROR: Expected action value to be 100\n";
+        exit(1);
+      }
+      r1done = true;
     } else {
-        if (elapsed != 150ms) {
-            std::cerr << "ERROR: Unexpected reaction invocation at " << elapsed << '\n';
-            exit(1);
-        }
-        if (*act.get() != -100) {
-            std::cerr << "ERROR: Expected action value to be -100\n";
-            exit(1);
-        }
-        r2done = true;
+      if (elapsed != 150ms) {
+        std::cerr << "ERROR: Unexpected reaction invocation at " << elapsed << '\n';
+        exit(1);
+      }
+      if (*act.get() != -100) {
+        std::cerr << "ERROR: Expected action value to be -100\n";
+        exit(1);
+      }
+      r2done = true;
     }
   =}
 
   reaction(shutdown) {=
     if (!r1done || !r2done) {
-        std::cerr << "ERROR: Expected 2 reaction invocations\n";
-        exit(1);
+      std::cerr << "ERROR: Expected 2 reaction invocations\n";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/After.lf b/test/Cpp/src/After.lf
index 30405a258b..49ef7fbe6e 100644
--- a/test/Cpp/src/After.lf
+++ b/test/Cpp/src/After.lf
@@ -21,22 +21,22 @@ reactor print {
     auto elapsed_time = get_elapsed_logical_time();
     std::cout << "Result is " << *x.get() << '\n';
     if (*x.get() != 84) {
-        std::cerr << "ERROR: Expected result to be 84.\n";
-        exit(1);
+      std::cerr << "ERROR: Expected result to be 84.\n";
+      exit(1);
     }
     std::cout << "Current logical time is: " << elapsed_time << '\n';
     std::cout << "Current physical time is: " << get_elapsed_physical_time() << '\n';
     if (elapsed_time != expected_time) {
-        std::cerr << "ERROR: Expected logical time to be " << expected_time << '\n';
-        exit(2);
+      std::cerr << "ERROR: Expected logical time to be " << expected_time << '\n';
+      exit(2);
     }
     expected_time += 1s;
   =}
 
   reaction(shutdown) {=
     if (i == 0) {
-        std::cerr << "ERROR: Final reactor received no data.\n";
-        exit(3);
+      std::cerr << "ERROR: Final reactor received no data.\n";
+      exit(3);
     }
   =}
 }
diff --git a/test/Cpp/src/AfterOverlapped.lf b/test/Cpp/src/AfterOverlapped.lf
index 0ef3c57da5..c8f22bdf40 100644
--- a/test/Cpp/src/AfterOverlapped.lf
+++ b/test/Cpp/src/AfterOverlapped.lf
@@ -14,8 +14,8 @@ reactor Test {
     std::cout << "Received " << *c.get() << '\n';
     i++;
     if (*c.get() != i) {
-        std::cerr << "ERROR: Expected " << i << " but got " << *c.get() << '\n';
-        exit(1);
+      std::cerr << "ERROR: Expected " << i << " but got " << *c.get() << '\n';
+      exit(1);
     }
     auto elapsed_time = get_elapsed_logical_time();
 
@@ -23,15 +23,15 @@ reactor Test {
 
     auto expected = 2s + ((*c.get() - 1) * 1s);
     if (elapsed_time != expected) {
-        std::cerr << "ERROR: Expected logical time to be " << expected << '\n';
-        exit(1);
+      std::cerr << "ERROR: Expected logical time to be " << expected << '\n';
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (i == 0) {
-        std::cerr << "ERROR: Final reactor received no data.\n";
-        exit(3);
+      std::cerr << "ERROR: Final reactor received no data.\n";
+      exit(3);
     }
   =}
 }
diff --git a/test/Cpp/src/AfterZero.lf b/test/Cpp/src/AfterZero.lf
index a52ce7cedb..ce3c6dd5c7 100644
--- a/test/Cpp/src/AfterZero.lf
+++ b/test/Cpp/src/AfterZero.lf
@@ -21,27 +21,27 @@ reactor print {
     auto elapsed_time = get_elapsed_logical_time();
     std::cout << "Result is " << *x.get() << '\n';
     if (*x.get() != 84) {
-        std::cerr << "ERROR: Expected result to be 84.\n";
-        exit(1);
+      std::cerr << "ERROR: Expected result to be 84.\n";
+      exit(1);
     }
     std::cout << "Current logical time is: " << elapsed_time << '\n';
     std::cout << "Current microstep is: " << get_microstep() << '\n';
     std::cout << "Current physical time is: " << get_elapsed_physical_time() << '\n';
     if (elapsed_time != expected_time) {
-        std::cerr << "ERROR: Expected logical time to be " << expected_time << '\n';
-        exit(2);
+      std::cerr << "ERROR: Expected logical time to be " << expected_time << '\n';
+      exit(2);
     }
     if (get_microstep() != 1) {
-        std::cerr << "Expected microstrp to be 1\n";
-        exit(3);
+      std::cerr << "Expected microstrp to be 1\n";
+      exit(3);
     }
     expected_time += 1s;
   =}
 
   reaction(shutdown) {=
     if (i == 0) {
-        std::cerr << "ERROR: Final reactor received no data.\n";
-        exit(3);
+      std::cerr << "ERROR: Final reactor received no data.\n";
+      exit(3);
     }
   =}
 }
diff --git a/test/Cpp/src/Alignment.lf b/test/Cpp/src/Alignment.lf
index 674c29c34c..00f4ce0936 100644
--- a/test/Cpp/src/Alignment.lf
+++ b/test/Cpp/src/Alignment.lf
@@ -33,12 +33,12 @@ reactor Sieve {
   reaction(in) -> out {=
     // Reject out of bounds inputs
     if(*in.get() <= 0 || *in.get() > 10000) {
-        reactor::log::Warn() <<  "Sieve: Input value out of range: " << *in.get();
+      reactor::log::Warn() <<  "Sieve: Input value out of range: " << *in.get();
     }
     // Primes 1 and 2 are not on the list.
     if (*in.get() == 1 || *in.get() == 2) {
-        out.set(true);
-        return;
+      out.set(true);
+      return;
     }
     // If the input is greater than the last found prime, then
     // we have to expand the list of primes before checking to
@@ -46,20 +46,20 @@ reactor Sieve {
     int candidate = primes.back();
     reactor::log::Info() << "Sieve: Checking prime: " << candidate;
     while (*in.get() > primes.back()) {
-        candidate += 2;
-        bool prime = true;
-        for (auto i : primes) {
-            if(candidate % i == 0) {
-                // Candidate is not prime. Break and add 2 by starting the loop again
-                prime = false;
-                break;
-            }
-        }
-        // If the candidate is not divisible by any prime in the list, it is prime
-        if (prime) {
-            primes.push_back(candidate);
-            reactor::log::Info() << "Sieve: Found prime: " << candidate;
+      candidate += 2;
+      bool prime = true;
+      for (auto i : primes) {
+        if(candidate % i == 0) {
+          // Candidate is not prime. Break and add 2 by starting the loop again
+          prime = false;
+          break;
         }
+      }
+      // If the candidate is not divisible by any prime in the list, it is prime
+      if (prime) {
+        primes.push_back(candidate);
+        reactor::log::Info() << "Sieve: Found prime: " << candidate;
+      }
     }
 
     // We are now assured that the input is less than or
@@ -67,10 +67,10 @@ reactor Sieve {
     // See whether the input is an already found prime.
     // Search the primes from the end, where they are sparser.
     for (auto i = primes.rbegin(); i != primes.rend(); ++i) {
-        if(*i == *in.get()) {
-            out.set(true);
-            return;
-        }
+      if(*i == *in.get()) {
+        out.set(true);
+        return;
+      }
     }
   =}
 }
@@ -82,12 +82,12 @@ reactor Destination {
 
   reaction(ok, in) {=
     if (ok.is_present() && in.is_present()) {
-        reactor::log::Info() << "Destination: Input " << *in.get() << " is a prime at logical time ( "
-        << get_elapsed_logical_time() << " )";
+      reactor::log::Info() << "Destination: Input " << *in.get() << " is a prime at logical time ( "
+      << get_elapsed_logical_time() << " )";
     }
     if( get_logical_time() <=  last_invoked) {
-        reactor::log::Error() << "Invoked at logical time (" << get_logical_time() << ") "
-        << "but previously invoked at logical time (" << get_elapsed_logical_time() << ")";
+      reactor::log::Error() << "Invoked at logical time (" << get_logical_time() << ") "
+      << "but previously invoked at logical time (" << get_elapsed_logical_time() << ")";
     }
 
     last_invoked = get_logical_time();
diff --git a/test/Cpp/src/ArrayAsParameter.lf b/test/Cpp/src/ArrayAsParameter.lf
index d2bf3c5ef9..511e19da12 100644
--- a/test/Cpp/src/ArrayAsParameter.lf
+++ b/test/Cpp/src/ArrayAsParameter.lf
@@ -10,7 +10,7 @@ reactor Source(sequence: std::vector<int> = {0, 1, 2}) {
     out.set(sequence[count]);
     count++;
     if (count < sequence.size()) {
-        next.schedule();
+      next.schedule();
     }
   =}
 }
@@ -22,16 +22,16 @@ reactor Print {
   reaction(in) {=
     std::cout << "Received: " << *in.get() << '\n';
     if (*in.get() != count) {
-        std::cerr << "ERROR: Expected " << count << '\n';
-        exit(1);
+      std::cerr << "ERROR: Expected " << count << '\n';
+      exit(1);
     }
     count++;
   =}
 
   reaction(shutdown) {=
     if (count == 1) {
-        std::cerr << "ERROR: Final reactor received no data.\n";
-        exit(3);
+      std::cerr << "ERROR: Final reactor received no data.\n";
+      exit(3);
     }
   =}
 }
diff --git a/test/Cpp/src/ArrayAsType.lf b/test/Cpp/src/ArrayAsType.lf
index 0c7ba0f16b..8661b7bd87 100644
--- a/test/Cpp/src/ArrayAsType.lf
+++ b/test/Cpp/src/ArrayAsType.lf
@@ -25,21 +25,21 @@ reactor Print {
 
     std::cout << "Received: [";
     for (int i = 0; i < 3; i++) {
-        std::cout << result[i];
-        if (i < 2) {
-            std::cout << ", ";
-        }
-
-        // check whether values match expectation.
-        if (result[i] != expected) {
-            failed = true;
-        }
-        expected++;
+      std::cout << result[i];
+      if (i < 2) {
+        std::cout << ", ";
+      }
+
+      // check whether values match expectation.
+      if (result[i] != expected) {
+        failed = true;
+      }
+      expected++;
     }
     std::cout << "]\n";
     if (failed) {
-        printf("ERROR: Value received by Print does not match expectation!\n");
-        exit(1);
+      printf("ERROR: Value received by Print does not match expectation!\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/ArrayPrint.lf b/test/Cpp/src/ArrayPrint.lf
index c0cbcff6fc..2fe5f448ca 100644
--- a/test/Cpp/src/ArrayPrint.lf
+++ b/test/Cpp/src/ArrayPrint.lf
@@ -29,21 +29,21 @@ reactor Print(scale: int = 1) {
 
     std::cout << "Received: [";
     for (int i = 0; i < 3; i++) {
-        std::cout << result[i];
-        if (i < 2) {
-            std::cout << ", ";
-        }
-
-        // check whether values match expectation.
-        if (result[i] != expected * scale) {
-            failed = true;
-        }
-        expected++;
+      std::cout << result[i];
+      if (i < 2) {
+        std::cout << ", ";
+      }
+
+      // check whether values match expectation.
+      if (result[i] != expected * scale) {
+        failed = true;
+      }
+      expected++;
     }
     std::cout << "]\n";
     if (failed) {
-        printf("ERROR: Value received by Print does not match expectation!\n");
-        exit(1);
+      printf("ERROR: Value received by Print does not match expectation!\n");
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/ArrayScale.lf b/test/Cpp/src/ArrayScale.lf
index 0efb5933d1..9d0b3cf350 100644
--- a/test/Cpp/src/ArrayScale.lf
+++ b/test/Cpp/src/ArrayScale.lf
@@ -15,7 +15,7 @@ reactor Scale(scale: int = 2) {
     // NOTE: Ideally, no copy copy would be made here, as there is only
     // one recipient for the value, but this is not supported yet by the C++ runtime.
     for(int i = 0; i < array->size(); i++) {
-        (*array)[i] = (*array)[i] * scale;
+      (*array)[i] = (*array)[i] * scale;
     }
     out.set(std::move(array));
   =}
diff --git a/test/Cpp/src/CharLiteralInitializer.lf b/test/Cpp/src/CharLiteralInitializer.lf
index 3a104b2bb3..b845999268 100644
--- a/test/Cpp/src/CharLiteralInitializer.lf
+++ b/test/Cpp/src/CharLiteralInitializer.lf
@@ -6,8 +6,8 @@ main reactor CharLiteralInitializer {
 
   reaction(startup) {=
     if (c != 'x') {
-        std::cout << "FAILED: Expected 'x', got " << c << '\n';
-        exit(1);
+      std::cout << "FAILED: Expected 'x', got " << c << '\n';
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/Composition.lf b/test/Cpp/src/Composition.lf
index 79105666d5..35e62edfa8 100644
--- a/test/Cpp/src/Composition.lf
+++ b/test/Cpp/src/Composition.lf
@@ -24,15 +24,15 @@ reactor Test {
     auto value = *x.get();
     std::cout << "Received " << value << std::endl;
     if (value != count) {
-        std::cerr << "FAILURE: Expected " << count << std::endl;
-        exit(1);
+      std::cerr << "FAILURE: Expected " << count << std::endl;
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (count != 5) {
-        std::cerr << "ERROR: expected to receive 5 values but got " << count << '\n';
-        exit(1);
+      std::cerr << "ERROR: expected to receive 5 values but got " << count << '\n';
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/CompositionAfter.lf b/test/Cpp/src/CompositionAfter.lf
index 265cc3b249..230bbd1fb3 100644
--- a/test/Cpp/src/CompositionAfter.lf
+++ b/test/Cpp/src/CompositionAfter.lf
@@ -24,15 +24,15 @@ reactor Test {
     auto value = *x.get();
     std::cout << "Received " << value << std::endl;
     if (value != count) {
-        std::cerr << "FAILURE: Expected " << count << std::endl;
-        exit(1);
+      std::cerr << "FAILURE: Expected " << count << std::endl;
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (count != 3) {
-        std::cerr << "ERROR: expected to receive 3 values but got " << count << '\n';
-        exit(1);
+      std::cerr << "ERROR: expected to receive 3 values but got " << count << '\n';
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/CompositionGain.lf b/test/Cpp/src/CompositionGain.lf
index bd4804fcc6..db02a4ad55 100644
--- a/test/Cpp/src/CompositionGain.lf
+++ b/test/Cpp/src/CompositionGain.lf
@@ -27,8 +27,8 @@ main reactor CompositionGain {
   reaction(wrapper.y) {=
     reactor::log::Info() << "Received " << *wrapper.y.get();
     if (*wrapper.y.get() != 42*2) {
-        reactor::log::Error() << "Received value should have been " << 42 * 2;
-        exit(2);
+      reactor::log::Error() << "Received value should have been " << 42 * 2;
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/CountTest.lf b/test/Cpp/src/CountTest.lf
index d272ee39ca..1ee6fb5328 100644
--- a/test/Cpp/src/CountTest.lf
+++ b/test/Cpp/src/CountTest.lf
@@ -12,8 +12,8 @@ reactor Test {
   reaction(c) {=
     i++;
     if (*c.get() != i) {
-        std::cerr << "ERROR: Expected " << i << " but got " << *c.get() << std::endl;
-        exit(1);
+      std::cerr << "ERROR: Expected " << i << " but got " << *c.get() << std::endl;
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/Deadline.lf b/test/Cpp/src/Deadline.lf
index 90f0a70af6..e150d8eb85 100644
--- a/test/Cpp/src/Deadline.lf
+++ b/test/Cpp/src/Deadline.lf
@@ -14,9 +14,9 @@ reactor Source(period: time = 2 sec) {
 
   reaction(t) -> y {=
     if (count % 2 == 1) {
-        // The count variable is odd.
-        // Take time to cause a deadline violation.
-        std::this_thread::sleep_for(400ms);
+      // The count variable is odd.
+      // Take time to cause a deadline violation.
+      std::this_thread::sleep_for(400ms);
     }
     std::cout << "Source sends: " << count << std::endl;
     y.set(count);
@@ -31,21 +31,21 @@ reactor Destination(timeout: time = 1 sec) {
   reaction(x) {=
     std::cout << "Destination receives: " << *x.get() << std::endl;
     if (count % 2 == 1) {
-        // The count variable is odd, so the deadline should have been
-        // violated
-        std::cerr << "ERROR: Failed to detect deadline." << std::endl;
-        exit(1);
+      // The count variable is odd, so the deadline should have been
+      // violated
+      std::cerr << "ERROR: Failed to detect deadline." << std::endl;
+      exit(1);
     }
     count++;
   =} deadline(timeout) {=
     std::cout << "Destination deadline handler receives: "
-              << *x.get() << std::endl;
+          << *x.get() << std::endl;
     if (count % 2 == 0) {
-        // The count variable is even, so the deadline should not have
-        // been violated.
-        std::cerr << "ERROR: Deadline handler invoked without deadline "
-                  << "violation." << std::endl;
-        exit(2);
+      // The count variable is even, so the deadline should not have
+      // been violated.
+      std::cerr << "ERROR: Deadline handler invoked without deadline "
+            << "violation." << std::endl;
+      exit(2);
     }
     count++;
   =}
diff --git a/test/Cpp/src/DeadlineHandledAbove.lf b/test/Cpp/src/DeadlineHandledAbove.lf
index 17ed373ab0..ed7b0068b2 100644
--- a/test/Cpp/src/DeadlineHandledAbove.lf
+++ b/test/Cpp/src/DeadlineHandledAbove.lf
@@ -26,17 +26,17 @@ main reactor DeadlineHandledAbove {
 
   reaction(d.deadline_violation) {=
     if (*d.deadline_violation.get()) {
-        std::cout << "Output successfully produced by deadline miss handler." << std::endl;
-        violation_detected = true;
+      std::cout << "Output successfully produced by deadline miss handler." << std::endl;
+      violation_detected = true;
     }
   =}
 
   reaction(shutdown) {=
     if (violation_detected) {
-        std::cout << "SUCCESS. Test passes." << std::endl;
+      std::cout << "SUCCESS. Test passes." << std::endl;
     } else {
-        std::cerr << "ERROR. Container did not react to deadline violation." << std::endl;
-        exit(2);
+      std::cerr << "ERROR. Container did not react to deadline violation." << std::endl;
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/DelayInt.lf b/test/Cpp/src/DelayInt.lf
index d9c2e0afe7..757890db20 100644
--- a/test/Cpp/src/DelayInt.lf
+++ b/test/Cpp/src/DelayInt.lf
@@ -10,7 +10,7 @@ reactor Delay(delay: time = 100 msec) {
 
   reaction(d) -> out {=
     if (d.is_present()) {
-        out.set(d.get());
+      out.set(d.get());
     }
   =}
 }
@@ -32,14 +32,14 @@ reactor Test {
     auto elapsed = current_time - start_time;
     std::cout << "After " << elapsed << " of logical time." << std::endl;
     if (elapsed != 100ms) {
-        std::cerr << "ERROR: Expected elapsed time to be 100000000 nsecs. "
-                  << "It was " << elapsed << std::endl;
-        exit(1);
+      std::cerr << "ERROR: Expected elapsed time to be 100000000 nsecs. "
+            << "It was " << elapsed << std::endl;
+      exit(1);
     }
     if (*in.get() != 42) {
-        std::cerr << "ERROR: Expected input value to be 42. "
-                  << "It was " << *in.get() << std::endl;
-        exit(2);
+      std::cerr << "ERROR: Expected input value to be 42. "
+            << "It was " << *in.get() << std::endl;
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/DelayedAction.lf b/test/Cpp/src/DelayedAction.lf
index d8f908cc73..deb3745a97 100644
--- a/test/Cpp/src/DelayedAction.lf
+++ b/test/Cpp/src/DelayedAction.lf
@@ -17,9 +17,9 @@ main reactor DelayedAction {
     auto expected = count * 1s + 100ms;
     count++;
     if (elapsed != expected) {
-        std::cerr << "Expected " << expected << " but got "
-                  << elapsed << std::endl;
-        exit(1);
+      std::cerr << "Expected " << expected << " but got "
+            << elapsed << std::endl;
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/DelayedReaction.lf b/test/Cpp/src/DelayedReaction.lf
index c5e937a8e7..c975246d23 100644
--- a/test/Cpp/src/DelayedReaction.lf
+++ b/test/Cpp/src/DelayedReaction.lf
@@ -14,8 +14,8 @@ reactor Sink {
     auto elapsed = get_elapsed_logical_time();
     std::cout << "Nanoseconds since start: " << elapsed << '\n';
     if (elapsed != 100ms) {
-        std::cerr << "ERROR: Expected 100000000 nsecs.\n";
-        exit(1);
+      std::cerr << "ERROR: Expected 100000000 nsecs.\n";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/Determinism.lf b/test/Cpp/src/Determinism.lf
index 063a25519d..43577397e9 100644
--- a/test/Cpp/src/Determinism.lf
+++ b/test/Cpp/src/Determinism.lf
@@ -14,15 +14,15 @@ reactor Destination {
   reaction(x, y) {=
     int sum = 0;
     if (x.is_present()) {
-        sum += *x.get();
+      sum += *x.get();
     }
     if (y.is_present()) {
-        sum += *y.get();
+      sum += *y.get();
     }
     std::cout << "Received " << sum << std::endl;
     if (sum != 2) {
-        std::cerr << "FAILURE: Expected 2." << std::endl;
-        exit(4);
+      std::cerr << "FAILURE: Expected 2." << std::endl;
+      exit(4);
     }
   =}
 }
diff --git a/test/Cpp/src/DoubleInvocation.lf b/test/Cpp/src/DoubleInvocation.lf
index 52496dbd9c..bb741aeb21 100644
--- a/test/Cpp/src/DoubleInvocation.lf
+++ b/test/Cpp/src/DoubleInvocation.lf
@@ -33,11 +33,11 @@ reactor Print {
 
   reaction(position, velocity) {=
     if (position.is_present()) {
-        reactor::log::Info() << "Position: " << *position.get();
+      reactor::log::Info() << "Position: " << *position.get();
     }
     if (*position.get() == previous) {
-        reactor::log::Error() << "Multiple firings at the same logical time!";
-        exit(1);
+      reactor::log::Error() << "Multiple firings at the same logical time!";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/DoublePort.lf b/test/Cpp/src/DoublePort.lf
index 79a385873c..fed174dbe5 100644
--- a/test/Cpp/src/DoublePort.lf
+++ b/test/Cpp/src/DoublePort.lf
@@ -31,17 +31,17 @@ reactor Print {
 
   reaction(in, in2) {=
     if(in.is_present()){
-        reactor::log::Info() << "At tag (" << get_elapsed_logical_time() << ", " << environment()->logical_time().micro_step()
-        << "), received in = " << *in.get();
+      reactor::log::Info() << "At tag (" << get_elapsed_logical_time() << ", " << environment()->logical_time().micro_step()
+      << "), received in = " << *in.get();
     } else if (in2.is_present()){
-        reactor::log::Info() << "At tag (" << get_elapsed_logical_time() << ", " << environment()->logical_time().micro_step()
-        << "), received in2 = " << *in2.get();
+      reactor::log::Info() << "At tag (" << get_elapsed_logical_time() << ", " << environment()->logical_time().micro_step()
+      << "), received in2 = " << *in2.get();
     }
 
 
     if ( in.is_present() && in2.is_present()) {
-        reactor::log::Error() << "ERROR: invalid logical simultaneity.";
-        exit(1);
+      reactor::log::Error() << "ERROR: invalid logical simultaneity.";
+      exit(1);
     }
   =}
 
diff --git a/test/Cpp/src/DoubleReaction.lf b/test/Cpp/src/DoubleReaction.lf
index f8002be54d..6d783fefe7 100644
--- a/test/Cpp/src/DoubleReaction.lf
+++ b/test/Cpp/src/DoubleReaction.lf
@@ -24,16 +24,16 @@ reactor Destination {
   reaction(x, w) {=
     int sum = 0;
     if (x.is_present()) {
-        sum += *x.get();
+      sum += *x.get();
     }
     if (w.is_present()) {
-        sum += *w.get();
+      sum += *w.get();
     }
     std::cout << "Sum of inputs is: " << sum << std::endl;
     if (sum != s) {
-        std::cerr << "FAILURE: Expected sum to be " << s
-                  << "but it was " << sum << std::endl;
-        exit(1);
+      std::cerr << "FAILURE: Expected sum to be " << s
+            << "but it was " << sum << std::endl;
+      exit(1);
     }
     s += 2;
   =}
diff --git a/test/Cpp/src/DoubleTrigger.lf b/test/Cpp/src/DoubleTrigger.lf
index f55ffcfedd..d64d3e35c1 100644
--- a/test/Cpp/src/DoubleTrigger.lf
+++ b/test/Cpp/src/DoubleTrigger.lf
@@ -9,17 +9,17 @@ main reactor DoubleTrigger {
   reaction(t1, t2) {=
     s++;
     if (s > 1) {
-        std::cout << "FAILURE: Reaction got triggered twice." << std::endl;
-        exit(1);
+      std::cout << "FAILURE: Reaction got triggered twice." << std::endl;
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (s == 1) {
-        std::cout << "SUCCESS" << std::endl;
+      std::cout << "SUCCESS" << std::endl;
     } else {
-        std::cerr << "FAILURE: Reaction was never triggered." << std::endl;
-        exit(1);
+      std::cerr << "FAILURE: Reaction was never triggered." << std::endl;
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/FloatLiteral.lf b/test/Cpp/src/FloatLiteral.lf
index f66aacbb12..be70ce64c1 100644
--- a/test/Cpp/src/FloatLiteral.lf
+++ b/test/Cpp/src/FloatLiteral.lf
@@ -10,11 +10,11 @@ main reactor {
   reaction(startup) {=
     auto F = - N * charge;
     if (std::abs(F - expected) < std::abs(minus_epsilon)) {
-        std::cout << "The Faraday constant is roughly " << F << ".\n";
+      std::cout << "The Faraday constant is roughly " << F << ".\n";
     } else {
-        std::cerr << "ERROR: Expected " << expected
-            << " but computed " << F << ".\n";
-        exit(1);
+      std::cerr << "ERROR: Expected " << expected
+        << " but computed " << F << ".\n";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/Gain.lf b/test/Cpp/src/Gain.lf
index 1a5d6eeedd..6bc9794951 100644
--- a/test/Cpp/src/Gain.lf
+++ b/test/Cpp/src/Gain.lf
@@ -15,8 +15,8 @@ reactor Test {
     auto value = *x.get();
     std::cout << "Received " << value << std::endl;
     if (value != 2) {
-        std::cerr << "Expected 2!" << std::endl;
-        exit(1);
+      std::cerr << "Expected 2!" << std::endl;
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/GetMicroStep.lf b/test/Cpp/src/GetMicroStep.lf
index 5bec79df3c..5552d57ef9 100644
--- a/test/Cpp/src/GetMicroStep.lf
+++ b/test/Cpp/src/GetMicroStep.lf
@@ -11,18 +11,18 @@ main reactor GetMicroStep {
   reaction(l) -> l {=
     auto microstep = get_microstep();
     if (microstep != s) {
-        std::cerr << "Error: expected microstep " << s << ", got " << microstep << "instead\n";
-        exit(1);
+      std::cerr << "Error: expected microstep " << s << ", got " << microstep << "instead\n";
+      exit(1);
     }
     if (s++ < 10) {
-        l.schedule();
+      l.schedule();
     }
   =}
 
   reaction(shutdown) {=
     if (s != 11) {
-        std::cerr << "Error: unexpected state!\n";
-        exit(2);
+      std::cerr << "Error: unexpected state!\n";
+      exit(2);
     }
     std::cout << "Success!\n";
   =}
diff --git a/test/Cpp/src/Hello.lf b/test/Cpp/src/Hello.lf
index 419dc9610e..022b9a7383 100644
--- a/test/Cpp/src/Hello.lf
+++ b/test/Cpp/src/Hello.lf
@@ -25,12 +25,12 @@ reactor HelloCpp(period: time = 2 sec, message: {= std::string =} = "Hello C++")
     count++;
     auto time = get_logical_time();
     std::cout << "***** action " << count << " at time "
-               << time << std::endl;
+           << time << std::endl;
     auto diff = time - previous_time;
     if (diff != 200ms) {
-        std::cerr << "FAILURE: Expected 200 msecs of logical time to elapse "
-                  << "but got " << diff << std::endl;
-        exit(1);
+      std::cerr << "FAILURE: Expected 200 msecs of logical time to elapse "
+            << "but got " << diff << std::endl;
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/Hierarchy.lf b/test/Cpp/src/Hierarchy.lf
index d207a20c31..ba92775c1c 100644
--- a/test/Cpp/src/Hierarchy.lf
+++ b/test/Cpp/src/Hierarchy.lf
@@ -22,8 +22,8 @@ reactor Print {
     auto value = *in.get();
     std::cout << "Received: " << value << std::endl;
     if (value != 2) {
-        std::cerr << "Expected 2." << std::endl;
-        exit(1);
+      std::cerr << "Expected 2." << std::endl;
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/Hierarchy2.lf b/test/Cpp/src/Hierarchy2.lf
index 478c82db97..e21a966c54 100644
--- a/test/Cpp/src/Hierarchy2.lf
+++ b/test/Cpp/src/Hierarchy2.lf
@@ -43,8 +43,8 @@ reactor Print {
     auto value = *in.get();
     std::cout << "Received: " << value << std::endl;
     if (value != expected) {
-        std::cerr << "Expected " << expected << std::endl;
-        exit(1);
+      std::cerr << "Expected " << expected << std::endl;
+      exit(1);
     }
     expected++;
   =}
diff --git a/test/Cpp/src/ImportComposition.lf b/test/Cpp/src/ImportComposition.lf
index 88dfdff0a9..390f02bee3 100644
--- a/test/Cpp/src/ImportComposition.lf
+++ b/test/Cpp/src/ImportComposition.lf
@@ -24,19 +24,19 @@ main reactor ImportComposition {
     reactor::log::Info() << "Received " << *imp_comp.y.get() << " at time " << receive_time;
     received = true;
     if(receive_time != 55ms) {
-        reactor::log::Error() << "ERROR: Received time should have been: 55,000,000.";
-        exit(1);
+      reactor::log::Error() << "ERROR: Received time should have been: 55,000,000.";
+      exit(1);
     }
     if(*imp_comp.y.get() != 42*2*2) {
-        reactor::log::Error() << "ERROR: Received value should have been: " << 42*2*2 << ".";
-        exit(2);
+      reactor::log::Error() << "ERROR: Received value should have been: " << 42*2*2 << ".";
+      exit(2);
     }
   =}
 
   reaction(shutdown) {=
     if(!received){
-        reactor::log::Error() << "ERROR: Nothing received.";
-        exit(3);
+      reactor::log::Error() << "ERROR: Nothing received.";
+      exit(3);
     }
   =}
 }
diff --git a/test/Cpp/src/ManualDelayedReaction.lf b/test/Cpp/src/ManualDelayedReaction.lf
index f1917be62f..e7bb1190ba 100644
--- a/test/Cpp/src/ManualDelayedReaction.lf
+++ b/test/Cpp/src/ManualDelayedReaction.lf
@@ -27,8 +27,8 @@ reactor Sink {
     auto elapsed_logical = get_elapsed_logical_time();
     std::cout << "Elapsed logical time: " << elapsed_logical << '\n';
     if (elapsed_logical != 100ms) {
-        std::cerr << "ERROR: Expected 100 ms\n";
-        exit(1);
+      std::cerr << "ERROR: Expected 100 ms\n";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/Methods.lf b/test/Cpp/src/Methods.lf
index 6b60012640..c39b0dff4d 100644
--- a/test/Cpp/src/Methods.lf
+++ b/test/Cpp/src/Methods.lf
@@ -10,15 +10,15 @@ main reactor {
   reaction(startup) {=
     std::cout << "Foo is initialized to " << getFoo() << '\n';
     if (getFoo() != 2) {
-        std::cerr << "Error: expected 2!\n";
-        exit(1);
+      std::cerr << "Error: expected 2!\n";
+      exit(1);
     }
 
     add(40);
     std::cout << "2 + 40 = " << getFoo() << '\n';
     if (getFoo() != 42) {
-        std::cerr << "Error: expected 42!\n";
-        exit(2);
+      std::cerr << "Error: expected 42!\n";
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/Microsteps.lf b/test/Cpp/src/Microsteps.lf
index fedf9c145f..51a61e508a 100644
--- a/test/Cpp/src/Microsteps.lf
+++ b/test/Cpp/src/Microsteps.lf
@@ -8,23 +8,23 @@ reactor Destination {
     auto elapsed = get_elapsed_logical_time();
     std::cout << "Time since start: " << elapsed << std::endl;
     if (elapsed != reactor::Duration::zero()) {
-        std::cerr << "Expected elapsed time to be 0, but it was " <<
-                     elapsed << std::endl;
-        exit(1);
+      std::cerr << "Expected elapsed time to be 0, but it was " <<
+             elapsed << std::endl;
+      exit(1);
     }
     int count{0};
     if (x.is_present()) {
-        std::cout << "  x is present." << std::endl;
-        count++;
+      std::cout << "  x is present." << std::endl;
+      count++;
     }
     if (y.is_present()) {
-        std::cout << "  y is present." << std::endl;
-        count++;
+      std::cout << "  y is present." << std::endl;
+      count++;
     }
     if (count != 1) {
-        std::cerr << "Expected exactly one input to be present but got "
-                  << count << std::endl;
-        exit(1);
+      std::cerr << "Expected exactly one input to be present but got "
+            << count << std::endl;
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/MovingAverage.lf b/test/Cpp/src/MovingAverage.lf
index 817c80c920..795d4da681 100644
--- a/test/Cpp/src/MovingAverage.lf
+++ b/test/Cpp/src/MovingAverage.lf
@@ -27,7 +27,7 @@ reactor MovingAverageImpl {
     // Calculate the output.
     double sum = *in.get();
     for (int i = 0; i < 3; i++) {
-        sum += delay_line[i];
+      sum += delay_line[i];
     }
     out.set(sum/4.0);
 
@@ -37,7 +37,7 @@ reactor MovingAverageImpl {
     // Update the index for the next input.
     index++;
     if (index >= 3) {
-        index = 0;
+      index = 0;
     }
   =}
 }
@@ -50,16 +50,16 @@ reactor Print {
     std::cout << "Received: " << *in.get() << '\n';
     constexpr double expected[6] = {0.0, 0.25, 0.75, 1.5, 2.5, 3.5};
     if (*in.get() != expected[count]) {
-        std::cerr << "ERROR: Expected " << expected[count] << '\n';
-        exit(1);
+      std::cerr << "ERROR: Expected " << expected[count] << '\n';
+      exit(1);
     }
     count++;
   =}
 
   reaction(shutdown) {=
     if(count != 6) {
-        std::cerr << "ERROR: Expected 6 values but got " << count << '\n';
-        exit(2);
+      std::cerr << "ERROR: Expected 6 values but got " << count << '\n';
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/MultipleContained.lf b/test/Cpp/src/MultipleContained.lf
index bfe71c9b02..df168ca394 100644
--- a/test/Cpp/src/MultipleContained.lf
+++ b/test/Cpp/src/MultipleContained.lf
@@ -11,16 +11,16 @@ reactor Contained {
   reaction(in1) {=
     std::cout << "in1 received " << *in1.get() << '\n';
     if (*in1.get() != 42) {
-        std::cerr << "FAILED: Expected 42.\n";
-        exit(1);
+      std::cerr << "FAILED: Expected 42.\n";
+      exit(1);
     }
   =}
 
   reaction(in2) {=
     std::cout << "in2 received " << *in2.get() << '\n';
     if (*in2.get() != 42) {
-        std::cerr << "FAILED: Expected 42.\n";
-        exit(1);
+      std::cerr << "FAILED: Expected 42.\n";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/NativeListsAndTimes.lf b/test/Cpp/src/NativeListsAndTimes.lf
index b6e8550c50..649b6550fe 100644
--- a/test/Cpp/src/NativeListsAndTimes.lf
+++ b/test/Cpp/src/NativeListsAndTimes.lf
@@ -3,20 +3,20 @@ target Cpp
 // This test passes if it is successfully compiled into valid target code.
 reactor Foo(
     x: int = 0,
-    y: time = 0,                // Units are missing but not required
-    z = 1 msec,                 // Type is missing but not required
-    p: int[]{1, 2, 3, 4},       // List of integers
+    y: time = 0,        // Units are missing but not required
+    z = 1 msec,         // Type is missing but not required
+    p: int[]{1, 2, 3, 4},     // List of integers
     q: {= std::vector<reactor::Duration> =}{1 msec, 2 msec, 3 msec},
     g: time[]{1 msec, 2 msec},  // List of time values
     g2: int[] = {}) {
   state s: time = y  // Reference to explicitly typed time parameter
   state t: time = z  // Reference to implicitly typed time parameter
-  state v: bool      // Uninitialized boolean state variable
-  state w: time      // Uninitialized time state variable
-  timer tick(0)      // Units missing but not required
+  state v: bool    // Uninitialized boolean state variable
+  state w: time    // Uninitialized time state variable
+  timer tick(0)    // Units missing but not required
   timer tock(1 sec)  // Implicit type time
-  timer toe(z)       // Implicit type time
-  state baz = p      // Implicit type int[]
+  timer toe(z)     // Implicit type time
+  state baz = p    // Implicit type int[]
   state period = z   // Implicit type time
   state times: std::vector<std::vector<{= reactor::Duration =}>>{q, g}  // a list of lists
   state empty_list: int[] = {}
diff --git a/test/Cpp/src/NestedTriggeredReactions.lf b/test/Cpp/src/NestedTriggeredReactions.lf
index 22ea978545..7cd16fad2e 100644
--- a/test/Cpp/src/NestedTriggeredReactions.lf
+++ b/test/Cpp/src/NestedTriggeredReactions.lf
@@ -13,8 +13,8 @@ reactor Container {
 
   reaction(shutdown) {=
     if (!triggered) {
-        reactor::log::Error() << "The Container reaction was not triggered!";
-        exit(1);
+      reactor::log::Error() << "The Container reaction was not triggered!";
+      exit(1);
     }
   =}
 }
@@ -28,8 +28,8 @@ reactor Contained {
 
   reaction(shutdown) {=
     if (!triggered) {
-        reactor::log::Error() << "The Contained reaction was not triggered!";
-        exit(1);
+      reactor::log::Error() << "The Contained reaction was not triggered!";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/ParameterHierarchy.lf b/test/Cpp/src/ParameterHierarchy.lf
index 2b88513d64..e2d1432d10 100644
--- a/test/Cpp/src/ParameterHierarchy.lf
+++ b/test/Cpp/src/ParameterHierarchy.lf
@@ -10,10 +10,10 @@ target Cpp
 reactor Deep(p: int = 0) {
   reaction(startup) {=
     if(p != 42) {
-        reactor::log::Error() << "Parameter value is: " << p << ". Should have been 42.";
-        exit(1);
+      reactor::log::Error() << "Parameter value is: " << p << ". Should have been 42.";
+      exit(1);
     } else {
-        reactor::log::Info() << "Success.";
+      reactor::log::Info() << "Success.";
     }
   =}
 }
diff --git a/test/Cpp/src/ParameterizedState.lf b/test/Cpp/src/ParameterizedState.lf
index 5aa96c4ee0..72442afa38 100644
--- a/test/Cpp/src/ParameterizedState.lf
+++ b/test/Cpp/src/ParameterizedState.lf
@@ -6,7 +6,7 @@ reactor Foo(bar: int = 4) {
   reaction(startup) {=
     std::cout << "Baz: " << baz << std::endl;
     if (baz != 42) {
-        exit(1);
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/ParametersOutOfOrder.lf b/test/Cpp/src/ParametersOutOfOrder.lf
index f7cb0805dd..729a1fd2e5 100644
--- a/test/Cpp/src/ParametersOutOfOrder.lf
+++ b/test/Cpp/src/ParametersOutOfOrder.lf
@@ -5,8 +5,8 @@ target Cpp
 reactor Foo(a: int = 0, b: std::string = "", c: float = 0.0) {
   reaction(startup) {=
     if (a != 42 || b != "bar" || c < 3.1) {
-        reactor::log::Error() << "received an unexpected parameter!";
-        exit(1);
+      reactor::log::Error() << "received an unexpected parameter!";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/PeriodicDesugared.lf b/test/Cpp/src/PeriodicDesugared.lf
index 23d815b46d..1e5dad1b7d 100644
--- a/test/Cpp/src/PeriodicDesugared.lf
+++ b/test/Cpp/src/PeriodicDesugared.lf
@@ -20,8 +20,8 @@ main reactor(offset: time = 50 msec, period: time = 500 msec) {
     auto logical_time = get_elapsed_logical_time();
     std::cout << "Elapsed logical time: " << logical_time << '\n';
     if (logical_time != expected) {
-        std::cerr << "ERROR: expected " << expected << '\n';
-        exit(1);
+      std::cerr << "ERROR: expected " << expected << '\n';
+      exit(1);
     }
     expected += period;
     recur.schedule();
diff --git a/test/Cpp/src/PhysicalConnection.lf b/test/Cpp/src/PhysicalConnection.lf
index c42b827765..7957b5460f 100644
--- a/test/Cpp/src/PhysicalConnection.lf
+++ b/test/Cpp/src/PhysicalConnection.lf
@@ -16,8 +16,8 @@ reactor Destination {
     auto time = get_elapsed_logical_time();
     reactor::log::Info() << "Received " << *in.get() << " at logical time " << time;
     if (time == reactor::Duration::zero()) {
-        reactor::log::Error() << "Logical time should have been greater than zero.";
-        exit(1);
+      reactor::log::Error() << "Logical time should have been greater than zero.";
+      exit(1);
     }
 
     received = true;
@@ -25,8 +25,8 @@ reactor Destination {
 
   reaction(shutdown) {=
     if (!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(2);
+      reactor::log::Error() << "Nothing received.";
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/Pipeline.lf b/test/Cpp/src/Pipeline.lf
index 49cc4dd212..00e9e3f48e 100644
--- a/test/Cpp/src/Pipeline.lf
+++ b/test/Cpp/src/Pipeline.lf
@@ -11,16 +11,16 @@ reactor Print {
   reaction(in) {=
     std::cout << "Received: " << *in.get() << '\n';
     if (*in.get() != count) {
-        std::cerr << "ERROR: Expected " << count << '\n';
-        exit(1);
+      std::cerr << "ERROR: Expected " << count << '\n';
+      exit(1);
     }
     count++;
   =}
 
   reaction(shutdown) {=
     if (count == 1) {
-        std::cerr << "ERROR: Final reactor received no data.\n";
-        exit(3);
+      std::cerr << "ERROR: Final reactor received no data.\n";
+      exit(3);
     }
   =}
 }
diff --git a/test/Cpp/src/PreambleTest.lf b/test/Cpp/src/PreambleTest.lf
index 60a0128b29..b82e393a8e 100644
--- a/test/Cpp/src/PreambleTest.lf
+++ b/test/Cpp/src/PreambleTest.lf
@@ -5,8 +5,8 @@ main reactor {
   // in the generated header. This goes to Preamble/Preamble.hh.
   public preamble {=
     struct MyStruct {
-        int foo;
-        std::string bar;
+      int foo;
+      std::string bar;
     };
   =}
   // this is only used inside reactions and therefore goes to the generated source file This
@@ -15,7 +15,7 @@ main reactor {
   // This goes to Preamble/Preamble.cc
   private preamble {=
     int add_42(int i) {
-        return i + 42;
+      return i + 42;
     }
   =}
   logical action a: MyStruct
diff --git a/test/Cpp/src/ReadOutputOfContainedReactor.lf b/test/Cpp/src/ReadOutputOfContainedReactor.lf
index 4e0f17f46e..885fbad734 100644
--- a/test/Cpp/src/ReadOutputOfContainedReactor.lf
+++ b/test/Cpp/src/ReadOutputOfContainedReactor.lf
@@ -13,39 +13,39 @@ main reactor ReadOutputOfContainedReactor {
 
   reaction(startup) c.out {=
     std::cout << "Startup reaction reading output of contained "
-              << "reactor: " << *c.out.get() << std::endl;
+          << "reactor: " << *c.out.get() << std::endl;
     if (*c.out.get() != 42) {
-        std::cout << "FAILURE: expected 42" << std::endl;
-        exit(2);
+      std::cout << "FAILURE: expected 42" << std::endl;
+      exit(2);
     }
     count++;
   =}
 
   reaction(c.out) {=
     std::cout << "Reading output of contained reactor: " << *c.out.get()
-              << std::endl;
+          << std::endl;
     if (*c.out.get() != 42) {
-        std::cout << "FAILURE: expected 42" << std::endl;
-        exit(2);
+      std::cout << "FAILURE: expected 42" << std::endl;
+      exit(2);
     }
     count++;
   =}
 
   reaction(startup, c.out) {=
     std::cout << "Alternate triggering reading output of contained "
-              << "reactor: " << *c.out.get() << std::endl;
+          << "reactor: " << *c.out.get() << std::endl;
     if (*c.out.get() != 42) {
-        std::cout << "FAILURE: expected 42" << std::endl;
-        exit(2);
+      std::cout << "FAILURE: expected 42" << std::endl;
+      exit(2);
     }
     count++;
   =}
 
   reaction(shutdown) {=
     if (count != 3) {
-        std::cerr << "ERROR: One of the reactions failed to trigger."
-                  << std::endl;
-        exit(1);
+      std::cerr << "ERROR: One of the reactions failed to trigger."
+            << std::endl;
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/Schedule.lf b/test/Cpp/src/Schedule.lf
index 67de9fb876..c62b1bf701 100644
--- a/test/Cpp/src/Schedule.lf
+++ b/test/Cpp/src/Schedule.lf
@@ -10,11 +10,11 @@ reactor ScheduleTest {
   reaction(a) {=
     auto elapsed_time = get_elapsed_logical_time();
     std::cout << "Action triggered at logical time " << elapsed_time.count()
-              << " after start" << std::endl;
+          << " after start" << std::endl;
     if (elapsed_time != 200ms) {
-        std::cerr << "Expected action time to be 200 msec. It was "
-                  << elapsed_time.count() << "nsec!" << std::endl;
-        exit(1);
+      std::cerr << "Expected action time to be 200 msec. It was "
+            << elapsed_time.count() << "nsec!" << std::endl;
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/ScheduleLogicalAction.lf b/test/Cpp/src/ScheduleLogicalAction.lf
index a64eac9fe7..f8092b3f09 100644
--- a/test/Cpp/src/ScheduleLogicalAction.lf
+++ b/test/Cpp/src/ScheduleLogicalAction.lf
@@ -35,8 +35,8 @@ reactor print {
     reactor::log::Info() << "Current logical time is: " << elapsed_time;
     reactor::log::Info() << "Current physical time is: " << get_elapsed_physical_time().count();
     if(elapsed_time != expected_time) {
-        reactor::log::Error() << "ERROR: Expected logical time to be " << expected_time;
-        exit(1);
+      reactor::log::Error() << "ERROR: Expected logical time to be " << expected_time;
+      exit(1);
     }
     expected_time += 500ms;
   =}
diff --git a/test/Cpp/src/SelfLoop.lf b/test/Cpp/src/SelfLoop.lf
index 8d3188e937..0fd8fe4d6b 100644
--- a/test/Cpp/src/SelfLoop.lf
+++ b/test/Cpp/src/SelfLoop.lf
@@ -22,8 +22,8 @@ reactor Self {
   reaction(x) -> a {=
     reactor::log::Info() << "x = " << *x.get();
     if(*x.get() != expected){
-        reactor::log::Error() << "Expected " << expected;
-        exit(1);
+      reactor::log::Error() << "Expected " << expected;
+      exit(1);
     }
     expected++;
     a.schedule(x.get(), 100ms);
@@ -33,8 +33,8 @@ reactor Self {
 
   reaction(shutdown) {=
     if(expected <= 43) {
-        reactor::log::Error() << "Received no data.";
-        exit(2);
+      reactor::log::Error() << "Received no data.";
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/SendingInside.lf b/test/Cpp/src/SendingInside.lf
index 42d15f2f68..cd6aa38dd7 100644
--- a/test/Cpp/src/SendingInside.lf
+++ b/test/Cpp/src/SendingInside.lf
@@ -12,7 +12,7 @@ reactor Printer {
   reaction(x) {=
     std::cout << "Inside reactor received: " << *x.get() << std::endl;
     if (*x.get() != count) {
-        std::cerr << "FAILURE: Expected " << count << std::endl;
+      std::cerr << "FAILURE: Expected " << count << std::endl;
     exit(1);
     }
     count++;
@@ -26,6 +26,6 @@ main reactor SendingInside {
 
   reaction(t) -> p.x {=
     count++;
-        p.x.set(count);
+      p.x.set(count);
   =}
 }
diff --git a/test/Cpp/src/SendingInside2.lf b/test/Cpp/src/SendingInside2.lf
index 29b6da59aa..d2b62982b2 100644
--- a/test/Cpp/src/SendingInside2.lf
+++ b/test/Cpp/src/SendingInside2.lf
@@ -6,8 +6,8 @@ reactor Printer {
   reaction(x) {=
     std::cout << "Inside reactor received: " << *x.get() << std::endl;
     if (*x.get() != 1) {
-        std::cerr << "ERROR: Expected 1." << std::endl;
-        exit(1);
+      std::cerr << "ERROR: Expected 1." << std::endl;
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/SimpleDeadline.lf b/test/Cpp/src/SimpleDeadline.lf
index 57538f5e9f..91cfc197a7 100644
--- a/test/Cpp/src/SimpleDeadline.lf
+++ b/test/Cpp/src/SimpleDeadline.lf
@@ -23,8 +23,8 @@ reactor Print {
 
   reaction(in) {=
     if (*in.get()) {
-        std::cout << "Output successfully produced by deadline handler."
-                  << std::endl;
+      std::cout << "Output successfully produced by deadline handler."
+            << std::endl;
     }
   =}
 }
diff --git a/test/Cpp/src/SlowingClock.lf b/test/Cpp/src/SlowingClock.lf
index 19d475ffe3..913768dada 100644
--- a/test/Cpp/src/SlowingClock.lf
+++ b/test/Cpp/src/SlowingClock.lf
@@ -23,8 +23,8 @@ main reactor SlowingClock {
     auto elapsed_logical_time = get_elapsed_logical_time();
     reactor::log::Info() << "Logical time since start: " << elapsed_logical_time;
     if(elapsed_logical_time != expected_time) {
-        reactor::log::Error() << "Expected time to be: " << expected_time;
-        exit(1);
+      reactor::log::Error() << "Expected time to be: " << expected_time;
+      exit(1);
     }
     a.schedule(interval);
     expected_time += 100ms + interval;
@@ -33,10 +33,10 @@ main reactor SlowingClock {
 
   reaction(shutdown) {=
     if(expected_time != 1500ms){
-        reactor::log::Error() << "Expected the next expected time to be: 1500000000 nsec.";
-        reactor::log::Error() << "It was: " << expected_time;
+      reactor::log::Error() << "Expected the next expected time to be: 1500000000 nsec.";
+      reactor::log::Error() << "It was: " << expected_time;
     } else {
-        reactor::log::Info() << "Test passes.";
+      reactor::log::Info() << "Test passes.";
     }
   =}
 }
diff --git a/test/Cpp/src/SlowingClockPhysical.lf b/test/Cpp/src/SlowingClockPhysical.lf
index 2d5529f851..27e15bf7d1 100644
--- a/test/Cpp/src/SlowingClockPhysical.lf
+++ b/test/Cpp/src/SlowingClockPhysical.lf
@@ -26,8 +26,8 @@ main reactor SlowingClockPhysical {
     auto elapsed_logical_time{get_elapsed_logical_time()};
     reactor::log::Info() << "Logical time since start: " << elapsed_logical_time;
     if(elapsed_logical_time < expected_time){
-        reactor::log::Error() << "Expected logical time to be at least: " << expected_time;
-        exit(1);
+      reactor::log::Error() << "Expected logical time to be at least: " << expected_time;
+      exit(1);
     }
     interval += 100ms;
     expected_time = 100ms + interval;
@@ -37,9 +37,9 @@ main reactor SlowingClockPhysical {
 
   reaction(shutdown) {=
     if(expected_time < 500ms){
-        reactor::log::Error() << "Expected the next expected time to be at least: 500000000 nsec.";
-        reactor::log::Error() << "It was: " << expected_time;
-        exit(2);
+      reactor::log::Error() << "Expected the next expected time to be at least: 500000000 nsec.";
+      reactor::log::Error() << "It was: " << expected_time;
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/StartupOutFromInside.lf b/test/Cpp/src/StartupOutFromInside.lf
index b8b43b78b9..0d3502c8c5 100644
--- a/test/Cpp/src/StartupOutFromInside.lf
+++ b/test/Cpp/src/StartupOutFromInside.lf
@@ -17,8 +17,8 @@ main reactor StartupOutFromInside {
   reaction(startup) bar.out {=
     reactor::log::Info() << "Output from bar: " << *bar.out.get();
     if(*bar.out.get() != 42) {
-        reactor::log::Error() << "Expected 42!";
-        exit(1);
+      reactor::log::Error() << "Expected 42!";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/StructAsState.lf b/test/Cpp/src/StructAsState.lf
index f8171a2ec6..342d72d16f 100644
--- a/test/Cpp/src/StructAsState.lf
+++ b/test/Cpp/src/StructAsState.lf
@@ -11,8 +11,8 @@ main reactor StructAsState {
   reaction(startup) {=
     std::cout << "State s.name=" << s.name << ", s.value=" << s.value << '\n';
     if (s.value != 42 && s.name != "Earth") {
-        std::cerr << "ERROR: Expected 42 and Earth!\n";
-        exit(1);
+      std::cerr << "ERROR: Expected 42 and Earth!\n";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/StructPrint.lf b/test/Cpp/src/StructPrint.lf
index e59ef45dda..807dba8e85 100644
--- a/test/Cpp/src/StructPrint.lf
+++ b/test/Cpp/src/StructPrint.lf
@@ -26,8 +26,8 @@ reactor Print(expected_value: int = 42, expected_name: {= std::string =} = "Eart
     auto& s = *in.get();
     std::cout << "Received: name = " << s.name << ", value = " << s.value << '\n';
     if (s.value != expected_value || s.name != expected_name) {
-        std::cerr << "ERROR: Expected name = " << expected_name << ", value = " << expected_value << '\n';
-        exit(1);
+      std::cerr << "ERROR: Expected name = " << expected_name << ", value = " << expected_value << '\n';
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/TestForPreviousOutput.lf b/test/Cpp/src/TestForPreviousOutput.lf
index e181c4d791..6810574fa7 100644
--- a/test/Cpp/src/TestForPreviousOutput.lf
+++ b/test/Cpp/src/TestForPreviousOutput.lf
@@ -10,16 +10,16 @@ reactor Source {
     std::srand(std::time(nullptr));
     // Randomly produce an output or not.
     if (std::rand() % 2) {
-        out.set(21);
+      out.set(21);
     }
   =}
 
   reaction(startup) -> out {=
     if (out.is_present()) {
-        int previous_output = *out.get();
-        out.set(2 * previous_output);
+      int previous_output = *out.get();
+      out.set(2 * previous_output);
     } else {
-        out.set(42);
+      out.set(42);
     }
   =}
 }
@@ -30,8 +30,8 @@ reactor Sink {
   reaction(in) {=
     std::cout << "Received: " << *in.get() << '\n';
     if (*in.get() != 42) {
-        std::cerr << "FAILED: Expected 42.\n";
-        exit(1);
+      std::cerr << "FAILED: Expected 42.\n";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/TimeLimit.lf b/test/Cpp/src/TimeLimit.lf
index dc296e16cb..0249285e6b 100644
--- a/test/Cpp/src/TimeLimit.lf
+++ b/test/Cpp/src/TimeLimit.lf
@@ -23,8 +23,8 @@ reactor Destination {
   reaction(x) {=
     //std::cout << "Received " << *x.get() << '\n';
     if (*x.get() != s) {
-        std::cerr << "Error: Expected " << s << " and got " << *x.get() << '\n';
-        exit(1);
+      std::cerr << "Error: Expected " << s << " and got " << *x.get() << '\n';
+      exit(1);
     }
     s++;
   =}
@@ -32,8 +32,8 @@ reactor Destination {
   reaction(shutdown) {=
     std::cout << "**** shutdown reaction invoked.\n";
     if (s != 12) {
-        std::cerr << "ERROR: Expected 12 but got " << s << '\n';
-        exit(1);
+      std::cerr << "ERROR: Expected 12 but got " << s << '\n';
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/Timeout_Test.lf b/test/Cpp/src/Timeout_Test.lf
index 30934358e4..aac8a04934 100644
--- a/test/Cpp/src/Timeout_Test.lf
+++ b/test/Cpp/src/Timeout_Test.lf
@@ -18,20 +18,20 @@ reactor Consumer {
   reaction(in) {=
     auto current{get_elapsed_logical_time()};
     if(current > 11ms ){
-        reactor::log::Error() << "Received at: " << current.count() << ". Failed to enforce timeout.";
-        exit(1);
+      reactor::log::Error() << "Received at: " << current.count() << ". Failed to enforce timeout.";
+      exit(1);
     } else if(current == 11ms) {
-        success=true;
+      success=true;
     }
   =}
 
   reaction(shutdown) {=
     reactor::log::Info() << "Shutdown invoked at " << get_elapsed_logical_time();
     if((get_elapsed_logical_time() == 11ms ) && (success == true)){
-        reactor::log::Info() << "SUCCESS: successfully enforced timeout.";
+      reactor::log::Info() << "SUCCESS: successfully enforced timeout.";
     } else {
-        reactor::log::Error() << "Shutdown invoked at: " << get_elapsed_logical_time() << ". Failed to enforce timeout.";
-        exit(1);
+      reactor::log::Error() << "Shutdown invoked at: " << get_elapsed_logical_time() << ". Failed to enforce timeout.";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/TimerIsPresent.lf b/test/Cpp/src/TimerIsPresent.lf
index b87b22281e..9c7ffe77bd 100644
--- a/test/Cpp/src/TimerIsPresent.lf
+++ b/test/Cpp/src/TimerIsPresent.lf
@@ -8,47 +8,47 @@ main reactor {
 
   reaction(startup) t1, t2 {=
     if (!startup.is_present()) {
-        reactor::log::Error() << "Startup is not present.";
-        exit(1);
+      reactor::log::Error() << "Startup is not present.";
+      exit(1);
     }
 
     if (!t1.is_present()) {
-        reactor::log::Error() << "t1 is not present at startup.";
-        exit(1);
+      reactor::log::Error() << "t1 is not present at startup.";
+      exit(1);
     }
 
     if (t2.is_present()) {
-        reactor::log::Error() << "t2 is present at startup.";
-        exit(1);
+      reactor::log::Error() << "t2 is present at startup.";
+      exit(1);
     }
   =}
 
   reaction(t1, t2) {=
      if (t1.is_present() && t2.is_present()) {
-        reactor::log::Error() << "t1 and t2 are both present.";
-        exit(1);
+      reactor::log::Error() << "t1 and t2 are both present.";
+      exit(1);
     }
 
     if (!t1.is_present() && !t2.is_present()) {
-        reactor::log::Error() << "Neither t1 nor t2 are both present.";
-        exit(1);
+      reactor::log::Error() << "Neither t1 nor t2 are both present.";
+      exit(1);
     }
   =}
 
   reaction(shutdown) t1, t2 {=
     if (!shutdown.is_present()) {
-        reactor::log::Error() << "Shutdown is not present.";
-        exit(1);
+      reactor::log::Error() << "Shutdown is not present.";
+      exit(1);
     }
 
     if (!t1.is_present()) {
-            reactor::log::Error() << "t1 is not present at shutdown.";
-            exit(1);
-        }
-
-        if (t2.is_present()) {
-            reactor::log::Error() << "t2 is present at shutdown";
-            exit(1);
-        }
+        reactor::log::Error() << "t1 is not present at shutdown.";
+        exit(1);
+      }
+
+      if (t2.is_present()) {
+        reactor::log::Error() << "t2 is present at shutdown";
+        exit(1);
+      }
   =}
 }
diff --git a/test/Cpp/src/ToReactionNested.lf b/test/Cpp/src/ToReactionNested.lf
index 6a1997972a..c918e1cdd7 100644
--- a/test/Cpp/src/ToReactionNested.lf
+++ b/test/Cpp/src/ToReactionNested.lf
@@ -19,19 +19,19 @@ main reactor {
 
   reaction(s.out) {=
     if (s.out.is_present()){
-        reactor::log::Info() << "Received " << *s.out.get();
-        if(count != *s.out.get()){
-            reactor::log::Error() << "Expected " << count;
-        }
-        received = true;
+      reactor::log::Info() << "Received " << *s.out.get();
+      if(count != *s.out.get()){
+        reactor::log::Error() << "Expected " << count;
+      }
+      received = true;
     }
     count++;
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "No inputs present.";
-        exit(1);
+      reactor::log::Error() << "No inputs present.";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/TriggerDownstreamOnlyIfPresent2.lf b/test/Cpp/src/TriggerDownstreamOnlyIfPresent2.lf
index 8bac112717..bc50b34711 100644
--- a/test/Cpp/src/TriggerDownstreamOnlyIfPresent2.lf
+++ b/test/Cpp/src/TriggerDownstreamOnlyIfPresent2.lf
@@ -17,9 +17,9 @@ reactor Source {
 
   reaction(t) -> out {=
     if(count++ % 2 == 0) {
-        out[0].set(count);
+      out[0].set(count);
     } else {
-        out[1].set(count);
+      out[1].set(count);
     }
   =}
 }
@@ -29,8 +29,8 @@ reactor Destination {
 
   reaction(in) {=
     if(!in.is_present()){
-        reactor::log::Error() << "Reaction to input of triggered even though all inputs are absent!";
-        exit(1);
+      reactor::log::Error() << "Reaction to input of triggered even though all inputs are absent!";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/concurrent/AsyncCallback.lf b/test/Cpp/src/concurrent/AsyncCallback.lf
index fff5b229e0..b9d655ca75 100644
--- a/test/Cpp/src/concurrent/AsyncCallback.lf
+++ b/test/Cpp/src/concurrent/AsyncCallback.lf
@@ -20,43 +20,43 @@ main reactor AsyncCallback {
   reaction(t) -> a {=
     // make sure to join the old thread first
     if(thread.joinable()) {
-        thread.join();
+      thread.join();
     }
 
     // start new thread
     this->thread = std::thread([&] () {
-        // Simulate time passing before a callback occurs
-        std::this_thread::sleep_for(100ms);
-        // Schedule twice. If the action is not physical, these should
-        // get consolidated into a single action triggering. If it is,
-        // then they cause two separate triggerings with close but not
-        // equal time stamps.
-        a.schedule(0);
-        a.schedule(0);
+      // Simulate time passing before a callback occurs
+      std::this_thread::sleep_for(100ms);
+      // Schedule twice. If the action is not physical, these should
+      // get consolidated into a single action triggering. If it is,
+      // then they cause two separate triggerings with close but not
+      // equal time stamps.
+      a.schedule(0);
+      a.schedule(0);
     });
   =}
 
   reaction(a) {=
     auto elapsed_time = get_elapsed_logical_time();
     std::cout << "Asynchronous callback " << i++ << ": Assigned logical "
-              << "time greater than start time by " << elapsed_time << std::endl;
+          << "time greater than start time by " << elapsed_time << std::endl;
     if (elapsed_time <= expected_time) {
-        std::cerr << "ERROR: Expected logical time to be larger than "
-                  << expected_time << std::endl;
-        exit(1);
+      std::cerr << "ERROR: Expected logical time to be larger than "
+            << expected_time << std::endl;
+      exit(1);
     }
     if (toggle) {
-        toggle = false;
-        expected_time += 200ms;
+      toggle = false;
+      expected_time += 200ms;
     } else {
-        toggle = true;
+      toggle = true;
     }
   =}
 
   reaction(shutdown) {=
     // make sure to join the thread before shutting down
     if(thread.joinable()) {
-        thread.join();
+      thread.join();
     }
   =}
 }
diff --git a/test/Cpp/src/concurrent/AsyncCallback2.lf b/test/Cpp/src/concurrent/AsyncCallback2.lf
index d2f34ea4e6..905e9ad2e0 100644
--- a/test/Cpp/src/concurrent/AsyncCallback2.lf
+++ b/test/Cpp/src/concurrent/AsyncCallback2.lf
@@ -18,14 +18,14 @@ main reactor AsyncCallback2 {
   reaction(t) -> a {=
     // start new thread
     auto thread = std::thread([&] () {
-        // Simulate time passing before a callback occurs
-        std::this_thread::sleep_for(100ms);
-        // Schedule twice. If the action is not physical, these should
-        // get consolidated into a single action triggering. If it is,
-        // then they cause two separate triggerings with close but not
-        // equal time stamps.
-        a.schedule(0);
-        a.schedule(0);
+      // Simulate time passing before a callback occurs
+      std::this_thread::sleep_for(100ms);
+      // Schedule twice. If the action is not physical, these should
+      // get consolidated into a single action triggering. If it is,
+      // then they cause two separate triggerings with close but not
+      // equal time stamps.
+      a.schedule(0);
+      a.schedule(0);
     });
     thread.join();
   =}
@@ -33,10 +33,10 @@ main reactor AsyncCallback2 {
   reaction(a) {=
     auto elapsed_time = get_elapsed_logical_time();
     std::cout << "Asynchronous callback " << i++ << ": Assigned logical "
-              << "time greater than start time by " << elapsed_time << std::endl;
+          << "time greater than start time by " << elapsed_time << std::endl;
     if (elapsed_time != expected_time) {
-        std::cerr << "ERROR: Expected logical time to be " << expected_time << std::endl;
-        exit(1);
+      std::cerr << "ERROR: Expected logical time to be " << expected_time << std::endl;
+      exit(1);
     }
     expected_time += 200ms;
   =}
diff --git a/test/Cpp/src/concurrent/CompositionThreaded.lf b/test/Cpp/src/concurrent/CompositionThreaded.lf
index 01cb2b9b17..ba90950d21 100644
--- a/test/Cpp/src/concurrent/CompositionThreaded.lf
+++ b/test/Cpp/src/concurrent/CompositionThreaded.lf
@@ -24,15 +24,15 @@ reactor Test {
     auto value = *x.get();
     std::cout << "Received " << value << std::endl;
     if (value != count) {
-        std::cerr << "FAILURE: Expected " << count << std::endl;
-        exit(1);
+      std::cerr << "FAILURE: Expected " << count << std::endl;
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (count != 5) {
-        std::cerr << "ERROR: expected to receive 5 values but got " << count << '\n';
-        exit(1);
+      std::cerr << "ERROR: expected to receive 5 values but got " << count << '\n';
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/concurrent/DeadlineHandledAboveThreaded.lf b/test/Cpp/src/concurrent/DeadlineHandledAboveThreaded.lf
index 548a5d477b..273621bcc7 100644
--- a/test/Cpp/src/concurrent/DeadlineHandledAboveThreaded.lf
+++ b/test/Cpp/src/concurrent/DeadlineHandledAboveThreaded.lf
@@ -26,17 +26,17 @@ main reactor {
 
   reaction(d.deadline_violation) {=
     if (*d.deadline_violation.get()) {
-        std::cout << "Output successfully produced by deadline miss handler." << std::endl;
-        violation_detected = true;
+      std::cout << "Output successfully produced by deadline miss handler." << std::endl;
+      violation_detected = true;
     }
   =}
 
   reaction(shutdown) {=
     if (violation_detected) {
-        std::cout << "SUCCESS. Test passes." << std::endl;
+      std::cout << "SUCCESS. Test passes." << std::endl;
     } else {
-        std::cerr << "ERROR. Container did not react to deadline violation." << std::endl;
-        exit(2);
+      std::cerr << "ERROR. Container did not react to deadline violation." << std::endl;
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/concurrent/DeadlineThreaded.lf b/test/Cpp/src/concurrent/DeadlineThreaded.lf
index 3a202fd568..b55fcd76d4 100644
--- a/test/Cpp/src/concurrent/DeadlineThreaded.lf
+++ b/test/Cpp/src/concurrent/DeadlineThreaded.lf
@@ -14,9 +14,9 @@ reactor Source(period: time = 2 sec) {
 
   reaction(t) -> y {=
     if (count % 2 == 1) {
-        // The count variable is odd.
-        // Take time to cause a deadline violation.
-        std::this_thread::sleep_for(200ms);
+      // The count variable is odd.
+      // Take time to cause a deadline violation.
+      std::this_thread::sleep_for(200ms);
     }
     std::cout << "Source sends: " << count << std::endl;
     y.set(count);
@@ -31,21 +31,21 @@ reactor Destination(timeout: time = 1 sec) {
   reaction(x) {=
     std::cout << "Destination receives: " << *x.get() << std::endl;
     if (count % 2 == 1) {
-        // The count variable is odd, so the deadline should have been
-        // violated
-        std::cerr << "ERROR: Failed to detect deadline." << std::endl;
-        exit(1);
+      // The count variable is odd, so the deadline should have been
+      // violated
+      std::cerr << "ERROR: Failed to detect deadline." << std::endl;
+      exit(1);
     }
     count++;
   =} deadline(timeout) {=
     std::cout << "Destination deadline handler receives: "
-              << *x.get() << std::endl;
+          << *x.get() << std::endl;
     if (count % 2 == 0) {
-        // The count variable is even, so the deadline should not have
-        // been violated.
-        std::cerr << "ERROR: Deadline handler invoked without deadline "
-                  << "violation." << std::endl;
-        exit(2);
+      // The count variable is even, so the deadline should not have
+      // been violated.
+      std::cerr << "ERROR: Deadline handler invoked without deadline "
+            << "violation." << std::endl;
+      exit(2);
     }
     count++;
   =}
diff --git a/test/Cpp/src/concurrent/DelayIntThreaded.lf b/test/Cpp/src/concurrent/DelayIntThreaded.lf
index dc3c2746ee..33db1411de 100644
--- a/test/Cpp/src/concurrent/DelayIntThreaded.lf
+++ b/test/Cpp/src/concurrent/DelayIntThreaded.lf
@@ -10,7 +10,7 @@ reactor Delay(delay: time = 100 msec) {
 
   reaction(d) -> out {=
     if (d.is_present()) {
-        out.set(d.get());
+      out.set(d.get());
     }
   =}
 }
@@ -32,14 +32,14 @@ reactor Test {
     auto elapsed = current_time - start_time;
     std::cout << "After " << elapsed << " of logical time." << std::endl;
     if (elapsed != 100ms) {
-        std::cerr << "ERROR: Expected elapsed time to be 100000000 nsecs. "
-                  << "It was " << elapsed << std::endl;
-        exit(1);
+      std::cerr << "ERROR: Expected elapsed time to be 100000000 nsecs. "
+            << "It was " << elapsed << std::endl;
+      exit(1);
     }
     if (*in.get() != 42) {
-        std::cerr << "ERROR: Expected input value to be 42. "
-                  << "It was " << *in.get() << std::endl;
-        exit(2);
+      std::cerr << "ERROR: Expected input value to be 42. "
+            << "It was " << *in.get() << std::endl;
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/concurrent/DeterminismThreaded.lf b/test/Cpp/src/concurrent/DeterminismThreaded.lf
index b97d9fd1fe..c0de1858c1 100644
--- a/test/Cpp/src/concurrent/DeterminismThreaded.lf
+++ b/test/Cpp/src/concurrent/DeterminismThreaded.lf
@@ -14,15 +14,15 @@ reactor Destination {
   reaction(x, y) {=
     int sum = 0;
     if (x.is_present()) {
-        sum += *x.get();
+      sum += *x.get();
     }
     if (y.is_present()) {
-        sum += *y.get();
+      sum += *y.get();
     }
     std::cout << "Received " << sum << std::endl;
     if (sum != 2) {
-        std::cerr << "FAILURE: Expected 2." << std::endl;
-        exit(4);
+      std::cerr << "FAILURE: Expected 2." << std::endl;
+      exit(4);
     }
   =}
 }
diff --git a/test/Cpp/src/concurrent/DoubleReactionThreaded.lf b/test/Cpp/src/concurrent/DoubleReactionThreaded.lf
index 489782ed94..69dd20f049 100644
--- a/test/Cpp/src/concurrent/DoubleReactionThreaded.lf
+++ b/test/Cpp/src/concurrent/DoubleReactionThreaded.lf
@@ -24,16 +24,16 @@ reactor Destination {
   reaction(x, w) {=
     int sum = 0;
     if (x.is_present()) {
-        sum += *x.get();
+      sum += *x.get();
     }
     if (w.is_present()) {
-        sum += *w.get();
+      sum += *w.get();
     }
     std::cout << "Sum of inputs is: " << sum << std::endl;
     if (sum != s) {
-        std::cerr << "FAILURE: Expected sum to be " << s
-                  << "but it was " << sum << std::endl;
-        exit(1);
+      std::cerr << "FAILURE: Expected sum to be " << s
+            << "but it was " << sum << std::endl;
+      exit(1);
     }
     s += 2;
   =}
diff --git a/test/Cpp/src/concurrent/GainThreaded.lf b/test/Cpp/src/concurrent/GainThreaded.lf
index ca1a7cc676..112f97632b 100644
--- a/test/Cpp/src/concurrent/GainThreaded.lf
+++ b/test/Cpp/src/concurrent/GainThreaded.lf
@@ -15,8 +15,8 @@ reactor Test {
     auto value = *x.get();
     std::cout << "Received " << value << std::endl;
     if (value != 2) {
-        std::cerr << "Expected 2!" << std::endl;
-        exit(1);
+      std::cerr << "Expected 2!" << std::endl;
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/concurrent/HelloThreaded.lf b/test/Cpp/src/concurrent/HelloThreaded.lf
index 148cb71ac7..35e2261048 100644
--- a/test/Cpp/src/concurrent/HelloThreaded.lf
+++ b/test/Cpp/src/concurrent/HelloThreaded.lf
@@ -25,12 +25,12 @@ reactor HelloCpp(period: time = 2 sec, message: {= std::string =} = "Hello C++")
     count++;
     auto time = get_logical_time();
     std::cout << "***** action " << count << " at time "
-               << time << std::endl;
+           << time << std::endl;
     auto diff = time - previous_time;
     if (diff != 200ms) {
-        std::cerr << "FAILURE: Expected 200 msecs of logical time to elapse "
-                  << "but got " << diff << std::endl;
-        exit(1);
+      std::cerr << "FAILURE: Expected 200 msecs of logical time to elapse "
+            << "but got " << diff << std::endl;
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/concurrent/SendingInsideThreaded.lf b/test/Cpp/src/concurrent/SendingInsideThreaded.lf
index f4b4dd2560..7854d42a22 100644
--- a/test/Cpp/src/concurrent/SendingInsideThreaded.lf
+++ b/test/Cpp/src/concurrent/SendingInsideThreaded.lf
@@ -12,8 +12,8 @@ reactor Printer {
   reaction(x) {=
     std::cout << "Inside reactor received: " << *x.get() << std::endl;
     if (*x.get() != count) {
-        std::cerr << "FAILURE: Expected " << count << std::endl;
-        exit(1);
+      std::cerr << "FAILURE: Expected " << count << std::endl;
+      exit(1);
     }
     count++;
   =}
diff --git a/test/Cpp/src/concurrent/Threaded.lf b/test/Cpp/src/concurrent/Threaded.lf
index 382c3bfa7c..26a8a9e2cd 100644
--- a/test/Cpp/src/concurrent/Threaded.lf
+++ b/test/Cpp/src/concurrent/Threaded.lf
@@ -43,8 +43,8 @@ reactor Destination {
     int sum = *in1.get() + *in2.get() + *in3.get() + *in4.get();
     std::cout << "Sum of received: " << sum << '\n';
     if (sum != s) {
-        std::cerr << "ERROR: Expected " << s << '\n';
-        exit(1);
+      std::cerr << "ERROR: Expected " << s << '\n';
+      exit(1);
     }
     s += 4;
   =}
diff --git a/test/Cpp/src/concurrent/ThreadedThreaded.lf b/test/Cpp/src/concurrent/ThreadedThreaded.lf
index 8e51ef0ccb..5f5a3a7e71 100644
--- a/test/Cpp/src/concurrent/ThreadedThreaded.lf
+++ b/test/Cpp/src/concurrent/ThreadedThreaded.lf
@@ -39,12 +39,12 @@ reactor Destination {
   reaction(in) {=
     int sum = 0;
     for (std::size_t i = 0; i < in.size(); i++) {
-        if (in[i].is_present()) sum += *in[i].get();
+      if (in[i].is_present()) sum += *in[i].get();
     }
     std::cout << "Sum of received: " << sum << '\n';
     if (sum != s) {
-        std::cerr << "ERROR: Expected " << s << '\n';
-        exit(1);
+      std::cerr << "ERROR: Expected " << s << '\n';
+      exit(1);
     }
     s += 4;
   =}
diff --git a/test/Cpp/src/concurrent/TimeLimitThreaded.lf b/test/Cpp/src/concurrent/TimeLimitThreaded.lf
index eb2454efb0..ecff6ecfc9 100644
--- a/test/Cpp/src/concurrent/TimeLimitThreaded.lf
+++ b/test/Cpp/src/concurrent/TimeLimitThreaded.lf
@@ -24,8 +24,8 @@ reactor Destination {
   reaction(x) {=
     //std::cout << "Received " << *x.get() << '\n';
     if (*x.get() != s) {
-        std::cerr << "Error: Expected " << s << " and got " << *x.get() << '\n';
-        exit(1);
+      std::cerr << "Error: Expected " << s << " and got " << *x.get() << '\n';
+      exit(1);
     }
     s++;
   =}
@@ -33,8 +33,8 @@ reactor Destination {
   reaction(shutdown) {=
     std::cout << "**** shutdown reaction invoked.\n";
     if (s != 12) {
-        std::cerr << "ERROR: Expected 12 but got " << s << '\n';
-        exit(1);
+      std::cerr << "ERROR: Expected 12 but got " << s << '\n';
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/concurrent/Workers.lf b/test/Cpp/src/concurrent/Workers.lf
index 43b7d8a114..c896b10604 100644
--- a/test/Cpp/src/concurrent/Workers.lf
+++ b/test/Cpp/src/concurrent/Workers.lf
@@ -5,10 +5,10 @@ target Cpp {
 main reactor {
   reaction(startup) {=
     if (environment()->num_workers() != 16) {
-        std::cout << "Expected to have 16 workers.\n";
-        exit(1);
+      std::cout << "Expected to have 16 workers.\n";
+      exit(1);
     } else {
-        std::cout << "Using 16 workers.\n";
+      std::cout << "Using 16 workers.\n";
     }
   =}
 }
diff --git a/test/Cpp/src/enclave/EnclaveBroadcast.lf b/test/Cpp/src/enclave/EnclaveBroadcast.lf
index cc4a110f13..a54452b2ea 100644
--- a/test/Cpp/src/enclave/EnclaveBroadcast.lf
+++ b/test/Cpp/src/enclave/EnclaveBroadcast.lf
@@ -17,15 +17,15 @@ reactor Sink(bank_index: size_t = 0) {
     received = true;
     std::cout << "Received " << *in.get() << '\n';
     if (*in.get() != 42) {
-        std::cerr << "Error: expected " << 42 << "!\n";
-        exit(1);
+      std::cerr << "Error: expected " << 42 << "!\n";
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        std::cerr << "Error: Sink " << bank_index << " didn't receive anything.\n";
-        exit(2);
+      std::cerr << "Error: Sink " << bank_index << " didn't receive anything.\n";
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/enclave/EnclaveCommunication.lf b/test/Cpp/src/enclave/EnclaveCommunication.lf
index 17c8ee9242..9bf2af20cc 100644
--- a/test/Cpp/src/enclave/EnclaveCommunication.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunication.lf
@@ -21,15 +21,15 @@ reactor Sink {
     reactor::log::Info() << "Received " << value;
     auto expected = 100ms * value;
     if (get_elapsed_logical_time() != expected) {
-        reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
-        exit(1);
+      reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/enclave/EnclaveCommunication2.lf b/test/Cpp/src/enclave/EnclaveCommunication2.lf
index 9451f455e2..bb60949645 100644
--- a/test/Cpp/src/enclave/EnclaveCommunication2.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunication2.lf
@@ -21,15 +21,15 @@ reactor Sink {
     reactor::log::Info() << "Received " << value;
     auto expected = 100ms * value;
     if (get_elapsed_logical_time() != expected) {
-        reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
-        exit(1);
+      reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationDelayed.lf b/test/Cpp/src/enclave/EnclaveCommunicationDelayed.lf
index 36afcecd34..9adad03ebb 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationDelayed.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationDelayed.lf
@@ -21,15 +21,15 @@ reactor Sink {
     reactor::log::Info() << "Received " << value;
     auto expected = 100ms * value + 50ms;
     if (get_elapsed_logical_time() != expected) {
-        reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
-        exit(1);
+      reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationDelayed2.lf b/test/Cpp/src/enclave/EnclaveCommunicationDelayed2.lf
index 5c51a84850..6272a7aa00 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationDelayed2.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationDelayed2.lf
@@ -21,15 +21,15 @@ reactor Sink {
     reactor::log::Info() << "Received " << value;
     auto expected = 100ms * value + 50ms;
     if (get_elapsed_logical_time() != expected) {
-        reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
-        exit(1);
+      reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationDelayedLocalEvents.lf b/test/Cpp/src/enclave/EnclaveCommunicationDelayedLocalEvents.lf
index 5c2ea549ea..31939cf447 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationDelayedLocalEvents.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationDelayedLocalEvents.lf
@@ -22,15 +22,15 @@ reactor Sink {
     reactor::log::Info() << "Received " << value;
     auto expected = 100ms * value + 50ms;
     if (get_elapsed_logical_time() != expected) {
-        reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
-        exit(1);
+      reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationLocalEvents.lf b/test/Cpp/src/enclave/EnclaveCommunicationLocalEvents.lf
index a8a93dabbe..342a6e7eaf 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationLocalEvents.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationLocalEvents.lf
@@ -22,15 +22,15 @@ reactor Sink {
     reactor::log::Info() << "Received " << value;
     auto expected = 100ms * value;
     if (get_elapsed_logical_time() != expected) {
-        reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
-        exit(1);
+      reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBank.lf b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBank.lf
index a853b023a3..e315632425 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBank.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBank.lf
@@ -10,7 +10,7 @@ reactor Src {
 
   reaction(t) -> out {=
     for (auto& port : out) {
-        port.set(counter++);
+      port.set(counter++);
     }
   =}
 }
@@ -27,20 +27,20 @@ reactor Sink(bank_index: std::size_t = 0) {
     reactor::log::Info() << "Received " << value << " at " << get_elapsed_logical_time();
     auto expected = 100ms * iteration;
     if (value != iteration*4 + bank_index) {
-        reactor::log::Error() << "Expected to recive " << iteration*4 + bank_index;
-        exit(1);
+      reactor::log::Error() << "Expected to recive " << iteration*4 + bank_index;
+      exit(1);
     }
     iteration++;
     if (get_elapsed_logical_time() != expected) {
-        reactor::log::Error() << "Expected value at " << expected;
-        exit(1);
+      reactor::log::Error() << "Expected value at " << expected;
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankDelayed.lf b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankDelayed.lf
index 3b716ddbb7..4eda00fd38 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankDelayed.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankDelayed.lf
@@ -10,7 +10,7 @@ reactor Src {
 
   reaction(t) -> out {=
     for (auto& port : out) {
-        port.set(counter++);
+      port.set(counter++);
     }
   =}
 }
@@ -27,20 +27,20 @@ reactor Sink(bank_index: std::size_t = 0) {
     reactor::log::Info() << "Received " << value << " at " << get_elapsed_logical_time();
     auto expected = 100ms * iteration + 50ms;
     if (value != iteration*4 + bank_index) {
-        reactor::log::Error() << "Expected to recive " << iteration*4 + bank_index;
-        exit(1);
+      reactor::log::Error() << "Expected to recive " << iteration*4 + bank_index;
+      exit(1);
     }
     iteration++;
     if (get_elapsed_logical_time() != expected) {
-        reactor::log::Error() << "Expected value at " << expected;
-        exit(1);
+      reactor::log::Error() << "Expected value at " << expected;
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEach.lf b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEach.lf
index bf1dcc9a6d..1016beffce 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEach.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEach.lf
@@ -10,7 +10,7 @@ reactor Src {
 
   reaction(t) -> out {=
     for (auto& port : out) {
-        port.set(counter++);
+      port.set(counter++);
     }
   =}
 }
@@ -27,20 +27,20 @@ reactor Sink(bank_index: std::size_t = 0) {
     reactor::log::Info() << "Received " << value << " at " << get_elapsed_logical_time();
     auto expected = 100ms * iteration;
     if (value != iteration*4 + bank_index) {
-        reactor::log::Error() << "Expected to recive " << iteration*4 + bank_index;
-        exit(1);
+      reactor::log::Error() << "Expected to recive " << iteration*4 + bank_index;
+      exit(1);
     }
     iteration++;
     if (get_elapsed_logical_time() != expected) {
-        reactor::log::Error() << "Expected value at " << expected;
-        exit(1);
+      reactor::log::Error() << "Expected value at " << expected;
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEachDelayed.lf b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEachDelayed.lf
index 0da4f978d7..97ad53108a 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEachDelayed.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEachDelayed.lf
@@ -10,7 +10,7 @@ reactor Src {
 
   reaction(t) -> out {=
     for (auto& port : out) {
-        port.set(counter++);
+      port.set(counter++);
     }
   =}
 }
@@ -27,20 +27,20 @@ reactor Sink(bank_index: std::size_t = 0) {
     reactor::log::Info() << "Received " << value << " at " << get_elapsed_logical_time();
     auto expected = 100ms * iteration + 50ms;
     if (value != iteration*4 + bank_index) {
-        reactor::log::Error() << "Expected to recive " << iteration*4 + bank_index;
-        exit(1);
+      reactor::log::Error() << "Expected to recive " << iteration*4 + bank_index;
+      exit(1);
     }
     iteration++;
     if (get_elapsed_logical_time() != expected) {
-        reactor::log::Error() << "Expected value at " << expected;
-        exit(1);
+      reactor::log::Error() << "Expected value at " << expected;
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEachPhysical.lf b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEachPhysical.lf
index 87d498d3c8..e7b9ab3288 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEachPhysical.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEachPhysical.lf
@@ -10,7 +10,7 @@ reactor Src {
 
   reaction(t) -> out {=
     for (auto& port : out) {
-        port.set(counter++);
+      port.set(counter++);
     }
   =}
 }
@@ -27,20 +27,20 @@ reactor Sink(bank_index: std::size_t = 0) {
     reactor::log::Info() << "Received " << value << " at " << get_elapsed_logical_time();
     auto expected = 100ms * iteration;
     if (value != iteration*4 + bank_index) {
-        reactor::log::Error() << "Expected to recive " << iteration*4 + bank_index;
-        exit(1);
+      reactor::log::Error() << "Expected to recive " << iteration*4 + bank_index;
+      exit(1);
     }
     iteration++;
     if (get_elapsed_logical_time() < expected) {
-        reactor::log::Error() << "Expected value not before " << expected;
-        exit(1);
+      reactor::log::Error() << "Expected value not before " << expected;
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankPhysical.lf b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankPhysical.lf
index 84b933d475..ece73aab30 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankPhysical.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankPhysical.lf
@@ -10,7 +10,7 @@ reactor Src {
 
   reaction(t) -> out {=
     for (auto& port : out) {
-        port.set(counter++);
+      port.set(counter++);
     }
   =}
 }
@@ -27,20 +27,20 @@ reactor Sink(bank_index: std::size_t = 0) {
     reactor::log::Info() << "Received " << value << " at " << get_elapsed_logical_time();
     auto expected = 100ms * iteration;
     if (value != iteration*4 + bank_index) {
-        reactor::log::Error() << "Expected to recive " << iteration*4 + bank_index;
-        exit(1);
+      reactor::log::Error() << "Expected to recive " << iteration*4 + bank_index;
+      exit(1);
     }
     iteration++;
     if (get_elapsed_logical_time() < expected) {
-        reactor::log::Error() << "Expected value not before " << expected;
-        exit(1);
+      reactor::log::Error() << "Expected value not before " << expected;
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationPhysical.lf b/test/Cpp/src/enclave/EnclaveCommunicationPhysical.lf
index 19e49b0642..65a2b44825 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationPhysical.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationPhysical.lf
@@ -21,15 +21,15 @@ reactor Sink {
     reactor::log::Info() << "Received " << value << " at " << get_elapsed_logical_time();
     auto expected = 100ms * value;
     if (get_elapsed_logical_time() < expected) {
-        reactor::log::Error() << "Expecded value not before " << expected;
-        exit(1);
+      reactor::log::Error() << "Expecded value not before " << expected;
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationPhysicalLocalEvents.lf b/test/Cpp/src/enclave/EnclaveCommunicationPhysicalLocalEvents.lf
index e4467680db..c413345f16 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationPhysicalLocalEvents.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationPhysicalLocalEvents.lf
@@ -22,15 +22,15 @@ reactor Sink {
     reactor::log::Info() << "Received " << value << " at " << get_elapsed_logical_time();
     auto expected = 100ms * value;
     if (get_elapsed_logical_time() < expected) {
-        reactor::log::Error() << "Expecded value not before " << expected;
-        exit(1);
+      reactor::log::Error() << "Expecded value not before " << expected;
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 
diff --git a/test/Cpp/src/enclave/EnclaveCycle.lf b/test/Cpp/src/enclave/EnclaveCycle.lf
index 5643ba824c..15d68b99cc 100644
--- a/test/Cpp/src/enclave/EnclaveCycle.lf
+++ b/test/Cpp/src/enclave/EnclaveCycle.lf
@@ -18,15 +18,15 @@ reactor Ping {
     reactor::log::Info() << "Ping Received " << value;
     auto expected = 50ms + 100ms * value;
     if (get_elapsed_logical_time() != expected) {
-        reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
-        exit(1);
+      reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 }
@@ -42,16 +42,16 @@ reactor Pong {
     reactor::log::Info() << "Pong Received " << value;
     auto expected = 100ms * value;
     if (get_elapsed_logical_time() != expected) {
-        reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
-        exit(1);
+      reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
+      exit(1);
     }
     out.set(value);
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/enclave/EnclaveCycleTwoTimers.lf b/test/Cpp/src/enclave/EnclaveCycleTwoTimers.lf
index 5a0310573d..8c4ce316a3 100644
--- a/test/Cpp/src/enclave/EnclaveCycleTwoTimers.lf
+++ b/test/Cpp/src/enclave/EnclaveCycleTwoTimers.lf
@@ -18,15 +18,15 @@ reactor Ping {
     reactor::log::Info() << "Ping Received " << value;
     auto expected = 50ms + 100ms * value;
     if (get_elapsed_logical_time() != expected) {
-        reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
-        exit(1);
+      reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 }
@@ -46,15 +46,15 @@ reactor Pong {
     reactor::log::Info() << "Pong Received " << value;
     auto expected = 50ms + 100ms * value;
     if (get_elapsed_logical_time() != expected) {
-        reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
-        exit(1);
+      reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/enclave/EnclaveMultiportToPort.lf b/test/Cpp/src/enclave/EnclaveMultiportToPort.lf
index 32ecc3b9b8..f20ad09633 100644
--- a/test/Cpp/src/enclave/EnclaveMultiportToPort.lf
+++ b/test/Cpp/src/enclave/EnclaveMultiportToPort.lf
@@ -9,8 +9,8 @@ reactor Source {
 
   reaction(startup) -> out {=
     for(int i = 0; i < out.size(); i++) {
-        std::cout << "Source sending " << i << ".\n";
-        out[i].set(i);
+      std::cout << "Source sending " << i << ".\n";
+      out[i].set(i);
     }
   =}
 }
@@ -23,15 +23,15 @@ reactor Destination(expected: int = 0) {
     std::cout << "Received: " << *in.get() << ".\n";
     received = true;
     if (*in.get() != expected) {
-        std::cerr << "ERROR: Expected " << expected << ".\n";
-        exit(1);
+      std::cerr << "ERROR: Expected " << expected << ".\n";
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        std::cerr << "ERROR: Destination received no input!\n";
-        exit(1);
+      std::cerr << "ERROR: Destination received no input!\n";
+      exit(1);
     }
     std::cout << "Success.\n";
   =}
diff --git a/test/Cpp/src/enclave/EnclaveMultiportToPort2.lf b/test/Cpp/src/enclave/EnclaveMultiportToPort2.lf
index 8d65e1a811..7e40a09623 100644
--- a/test/Cpp/src/enclave/EnclaveMultiportToPort2.lf
+++ b/test/Cpp/src/enclave/EnclaveMultiportToPort2.lf
@@ -9,8 +9,8 @@ reactor Source {
 
   reaction(startup) -> out {=
     for(int i = 0; i < out.size(); i++) {
-        std::cout << "Source sending " << i << ".\n";
-        out[i].set(i);
+      std::cout << "Source sending " << i << ".\n";
+      out[i].set(i);
     }
   =}
 }
@@ -23,15 +23,15 @@ reactor Destination(expected: int = 0) {
     std::cout << "Received: " << *in.get() << ".\n";
     received = true;
     if (*in.get() != expected) {
-        std::cerr << "ERROR: Expected " << expected << ".\n";
-        exit(1);
+      std::cerr << "ERROR: Expected " << expected << ".\n";
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        std::cerr << "ERROR: Destination received no input!\n";
-        exit(1);
+      std::cerr << "ERROR: Destination received no input!\n";
+      exit(1);
     }
     std::cout << "Success.\n";
   =}
diff --git a/test/Cpp/src/enclave/EnclaveShutdown.lf b/test/Cpp/src/enclave/EnclaveShutdown.lf
index c0c0aa1c64..ab56d58b08 100644
--- a/test/Cpp/src/enclave/EnclaveShutdown.lf
+++ b/test/Cpp/src/enclave/EnclaveShutdown.lf
@@ -12,8 +12,8 @@ reactor Node(message: std::string = "Hello", period: time = 1 sec, stop: time =
     reactor::log::Info() << "Goodbye!";
 
     if (get_elapsed_logical_time() != stop || get_microstep() != 1) {
-        reactor::log::Error() << "Expected to shut down at [" << stop << ", 1]";
-        exit(1);
+      reactor::log::Error() << "Expected to shut down at [" << stop << ", 1]";
+      exit(1);
     }
   =}
 }
@@ -26,8 +26,8 @@ main reactor {
 
   reaction(shutdown) {=
     if (get_elapsed_logical_time() != 0s || get_microstep() != 1) {
-        reactor::log::Error() << "Expected to shut down at [0, 1]e";
-        exit(1);
+      reactor::log::Error() << "Expected to shut down at [0, 1]e";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/enclave/EnclaveSparseUpstreamEvents.lf b/test/Cpp/src/enclave/EnclaveSparseUpstreamEvents.lf
index 6f713a7d88..047910fd91 100644
--- a/test/Cpp/src/enclave/EnclaveSparseUpstreamEvents.lf
+++ b/test/Cpp/src/enclave/EnclaveSparseUpstreamEvents.lf
@@ -24,15 +24,15 @@ reactor Sink {
     reactor::log::Info() << "Received " << value;
     auto expected = 4s * value;
     if (get_elapsed_logical_time() != expected) {
-        reactor::log::Error() << "Expected value at " << expected << " but received it at " << get_elapsed_logical_time();
-        exit(1);
+      reactor::log::Error() << "Expected value at " << expected << " but received it at " << get_elapsed_logical_time();
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 
diff --git a/test/Cpp/src/enclave/EnclaveSparseUpstreamEventsDelayed.lf b/test/Cpp/src/enclave/EnclaveSparseUpstreamEventsDelayed.lf
index dd2e0d04d7..486655ddd6 100644
--- a/test/Cpp/src/enclave/EnclaveSparseUpstreamEventsDelayed.lf
+++ b/test/Cpp/src/enclave/EnclaveSparseUpstreamEventsDelayed.lf
@@ -24,15 +24,15 @@ reactor Sink {
     reactor::log::Info() << "Received " << value;
     auto expected = 2s + 4s * value;
     if (get_elapsed_logical_time() != expected) {
-        reactor::log::Error() << "Expected value at " << expected << " but received it at " << get_elapsed_logical_time();
-        exit(1);
+      reactor::log::Error() << "Expected value at " << expected << " but received it at " << get_elapsed_logical_time();
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 
diff --git a/test/Cpp/src/enclave/EnclaveSparseUpstreamEventsPhysical.lf b/test/Cpp/src/enclave/EnclaveSparseUpstreamEventsPhysical.lf
index 895e50d6c8..d2f0a78e3f 100644
--- a/test/Cpp/src/enclave/EnclaveSparseUpstreamEventsPhysical.lf
+++ b/test/Cpp/src/enclave/EnclaveSparseUpstreamEventsPhysical.lf
@@ -24,15 +24,15 @@ reactor Sink {
     reactor::log::Info() << "Received " << value;
     auto expected = 4s * value;
     if (get_elapsed_logical_time() < expected) {
-        reactor::log::Error() << "Expected value not before " << expected << " but received it at " << get_elapsed_logical_time();
-        exit(1);
+      reactor::log::Error() << "Expected value not before " << expected << " but received it at " << get_elapsed_logical_time();
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 
diff --git a/test/Cpp/src/enclave/EnclaveTimeout.lf b/test/Cpp/src/enclave/EnclaveTimeout.lf
index 1e9614baa5..b05e6b7b1e 100644
--- a/test/Cpp/src/enclave/EnclaveTimeout.lf
+++ b/test/Cpp/src/enclave/EnclaveTimeout.lf
@@ -11,8 +11,8 @@ reactor Node(message: std::string = "Hello", period: time = 1 sec) {
     reactor::log::Info() << "Goodbye!";
 
     if (get_elapsed_logical_time() != 1s || get_microstep() != 0) {
-        reactor::log::Error() << "Expected to shut down at [1s, 0]";
-        exit(1);
+      reactor::log::Error() << "Expected to shut down at [1s, 0]";
+      exit(1);
     }
   =}
 }
@@ -25,8 +25,8 @@ main reactor {
 
   reaction(shutdown) {=
     if (get_elapsed_logical_time() != 1s || get_microstep() != 0) {
-        reactor::log::Error() << "Expected to shut down at [1s, 0]e";
-        exit(1);
+      reactor::log::Error() << "Expected to shut down at [1s, 0]e";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/enclave/EnclaveUpstreamPhysicalAction.lf b/test/Cpp/src/enclave/EnclaveUpstreamPhysicalAction.lf
index a82755181f..16d0d55586 100644
--- a/test/Cpp/src/enclave/EnclaveUpstreamPhysicalAction.lf
+++ b/test/Cpp/src/enclave/EnclaveUpstreamPhysicalAction.lf
@@ -18,10 +18,10 @@ reactor Src {
   reaction(startup) -> a {=
     // start new thread
     this->thread = std::thread([&] () {
-        for (int i{0}; i < 3; i++) {
-            a.schedule(i);
-            std::this_thread::sleep_for(2s);
-        }
+      for (int i{0}; i < 3; i++) {
+        a.schedule(i);
+        std::this_thread::sleep_for(2s);
+      }
     });
   =}
 
@@ -30,7 +30,7 @@ reactor Src {
   reaction(shutdown) {=
     // make sure to join the thread before shutting down
     if(thread.joinable()) {
-        thread.join();
+      thread.join();
     }
   =}
 }
@@ -46,21 +46,21 @@ reactor Sink {
     reactor::log::Info() << "Received " << value;
     auto expected = 2s * value;
     if (get_elapsed_logical_time() < expected) {
-        reactor::log::Error() << "Expected value not before " << expected << " but received it at " << get_elapsed_logical_time();
-        exit(1);
+      reactor::log::Error() << "Expected value not before " << expected << " but received it at " << get_elapsed_logical_time();
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 
   reaction(t) {=
     reactor::log::Info() << "Tick - " << "logical time: " << get_elapsed_logical_time()
-                         << "; physical time: " << get_elapsed_physical_time();
+               << "; physical time: " << get_elapsed_physical_time();
   =} deadline(1 s) {=
     reactor::log::Error() << "Deadline violated.";
     exit(2);
diff --git a/test/Cpp/src/enclave/EnclaveUpstreamPhysicalActionDelayed.lf b/test/Cpp/src/enclave/EnclaveUpstreamPhysicalActionDelayed.lf
index afc391bca2..4e7b138c90 100644
--- a/test/Cpp/src/enclave/EnclaveUpstreamPhysicalActionDelayed.lf
+++ b/test/Cpp/src/enclave/EnclaveUpstreamPhysicalActionDelayed.lf
@@ -18,10 +18,10 @@ reactor Src {
   reaction(startup) -> a {=
     // start new thread
     this->thread = std::thread([&] () {
-        for (int i{0}; i < 3; i++) {
-            a.schedule(i);
-            std::this_thread::sleep_for(2s);
-        }
+      for (int i{0}; i < 3; i++) {
+        a.schedule(i);
+        std::this_thread::sleep_for(2s);
+      }
     });
   =}
 
@@ -30,7 +30,7 @@ reactor Src {
   reaction(shutdown) {=
     // make sure to join the thread before shutting down
     if(thread.joinable()) {
-        thread.join();
+      thread.join();
     }
   =}
 }
@@ -46,21 +46,21 @@ reactor Sink {
     reactor::log::Info() << "Received " << value;
     auto expected = 2s * value;
     if (get_elapsed_logical_time() < expected) {
-        reactor::log::Error() << "Expected value not before " << expected << " but received it at " << get_elapsed_logical_time();
-        exit(1);
+      reactor::log::Error() << "Expected value not before " << expected << " but received it at " << get_elapsed_logical_time();
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if(!received) {
-        reactor::log::Error() << "Nothing received.";
-        exit(1);
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
     }
   =}
 
   reaction(t) {=
     reactor::log::Info() << "Tick - " << "logical time: " << get_elapsed_logical_time()
-                         << "; physical time: " << get_elapsed_physical_time();
+               << "; physical time: " << get_elapsed_physical_time();
   =} deadline(1 s) {=
     reactor::log::Error() << "Deadline violated.";
     exit(2);
diff --git a/test/Cpp/src/lib/ImportedAgain.lf b/test/Cpp/src/lib/ImportedAgain.lf
index a5e0ba3ceb..36ae8054dc 100644
--- a/test/Cpp/src/lib/ImportedAgain.lf
+++ b/test/Cpp/src/lib/ImportedAgain.lf
@@ -8,10 +8,10 @@ reactor ImportedAgain {
   reaction(x) {=
     auto value = *x.get();
     if (value != 42) {
-        std::cerr << "ERROR: Expected input to be 42. Got: " << value << std::endl;
-        exit(1);
+      std::cerr << "ERROR: Expected input to be 42. Got: " << value << std::endl;
+      exit(1);
     } else {
-        std::cout << "Received " << value << std::endl;
+      std::cout << "Received " << value << std::endl;
     }
   =}
 }
diff --git a/test/Cpp/src/lib/LoopedActionSender.lf b/test/Cpp/src/lib/LoopedActionSender.lf
index 00dee5631d..252d385168 100644
--- a/test/Cpp/src/lib/LoopedActionSender.lf
+++ b/test/Cpp/src/lib/LoopedActionSender.lf
@@ -21,11 +21,11 @@ reactor Sender(take_a_break_after: int = 10, break_interval: time = 400 msec) {
     out.set(sent_messages);
     sent_messages++;
     if(sent_messages < take_a_break_after){
-        act.schedule(0ns);
+      act.schedule(0ns);
     } else {
-        // Take a break
-        sent_messages=0;
-        act.schedule(break_interval);
+      // Take a break
+      sent_messages=0;
+      act.schedule(break_interval);
     }
   =}
 }
diff --git a/test/Cpp/src/multiport/BankSelfBroadcast.lf b/test/Cpp/src/multiport/BankSelfBroadcast.lf
index 9fcf4c51d0..2961e3a55c 100644
--- a/test/Cpp/src/multiport/BankSelfBroadcast.lf
+++ b/test/Cpp/src/multiport/BankSelfBroadcast.lf
@@ -17,27 +17,27 @@ reactor A(bank_index: size_t = 0) {
 
   reaction(in) {=
     for (size_t i = 0; i < in.size(); i++) {
-        if (in[i].is_present()) {
-            std::cout << "Reactor " << bank_index << " received "
-                << *in[i].get() << " on channel " << i << '\n';
+      if (in[i].is_present()) {
+        std::cout << "Reactor " << bank_index << " received "
+          << *in[i].get() << " on channel " << i << '\n';
 
-            if (*in[i].get() != i) {
-                std::cerr << "ERROR: Expected " << i << '\n';
-                exit(1);
-            }
-            received = true;
-        } else {
-            std::cout << "Reactor " << bank_index << " channel " << i << " is absent.\n";
-            std::cerr << "ERROR: Expected " << i << '\n';
-            exit(1);
+        if (*in[i].get() != i) {
+          std::cerr << "ERROR: Expected " << i << '\n';
+          exit(1);
         }
+        received = true;
+      } else {
+        std::cout << "Reactor " << bank_index << " channel " << i << " is absent.\n";
+        std::cerr << "ERROR: Expected " << i << '\n';
+        exit(1);
+      }
     }
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        std::cerr << "ERROR: No inputs received.\n";
-        exit(2);
+      std::cerr << "ERROR: No inputs received.\n";
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/multiport/BankToBank.lf b/test/Cpp/src/multiport/BankToBank.lf
index d9fe3f437c..c0b59901bf 100644
--- a/test/Cpp/src/multiport/BankToBank.lf
+++ b/test/Cpp/src/multiport/BankToBank.lf
@@ -22,16 +22,16 @@ reactor Destination(bank_index: size_t = 0) {
   reaction(in) {=
     std::cout << "Destination " << bank_index << " received: " << *in.get() << "\n";
     if (*in.get() != s) {
-        std::cerr << "ERROR: Expected " << s << ".\n";
-        exit(1);
+      std::cerr << "ERROR: Expected " << s << ".\n";
+      exit(1);
     }
     s += bank_index;
   =}
 
   reaction(shutdown) {=
     if (s == 0 && bank_index != 0) {
-        std::cerr << "ERROR: Destination " << bank_index << " received no input!\n";
-        exit(1);
+      std::cerr << "ERROR: Destination " << bank_index << " received no input!\n";
+      exit(1);
     }
     std::cout << "Success.\n";
   =}
diff --git a/test/Cpp/src/multiport/BankToBankMultiport.lf b/test/Cpp/src/multiport/BankToBankMultiport.lf
index e8faa69a42..3df236c758 100644
--- a/test/Cpp/src/multiport/BankToBankMultiport.lf
+++ b/test/Cpp/src/multiport/BankToBankMultiport.lf
@@ -11,7 +11,7 @@ reactor Source(width: size_t = 1) {
 
   reaction(t) -> out {=
     for(size_t i = 0; i < out.size(); i++) {
-        out[i].set(s++);
+      out[i].set(s++);
     }
   =}
 }
@@ -24,21 +24,21 @@ reactor Destination(width: size_t = 1) {
     int sum = 0;
 
     for (auto i : in.present_indices_unsorted()) {
-        sum += *in[i].get();
+      sum += *in[i].get();
     }
 
     std::cout << "Sum of received: " << sum << ".\n";
     if (sum != s) {
-        std::cerr << "ERROR: Expected " << s << ".\n";
-        exit(1);
+      std::cerr << "ERROR: Expected " << s << ".\n";
+      exit(1);
     }
     s += 16;
   =}
 
   reaction(shutdown) {=
     if (s <= 6) {
-        std::cerr << "ERROR: Destination received no input!\n";
-        exit(1);
+      std::cerr << "ERROR: Destination received no input!\n";
+      exit(1);
     }
     std::cout << "Success.\n";
   =}
diff --git a/test/Cpp/src/multiport/BankToBankMultiportAfter.lf b/test/Cpp/src/multiport/BankToBankMultiportAfter.lf
index df4220ad10..64533fb414 100644
--- a/test/Cpp/src/multiport/BankToBankMultiportAfter.lf
+++ b/test/Cpp/src/multiport/BankToBankMultiportAfter.lf
@@ -11,7 +11,7 @@ reactor Source(width: size_t = 1) {
 
   reaction(t) -> out {=
     for(size_t i = 0; i < out.size(); i++) {
-        out[i].set(s++);
+      out[i].set(s++);
     }
   =}
 }
@@ -26,27 +26,27 @@ reactor Destination(width: size_t = 1) {
     auto lt = get_elapsed_logical_time();
     auto expected = iterations * 200ms;
     if (expected != lt) {
-        std::cerr << "ERROR: Expected logical time to be " << expected << " but got " << lt << '\n';
-        exit(1);
+      std::cerr << "ERROR: Expected logical time to be " << expected << " but got " << lt << '\n';
+      exit(1);
     }
 
     int sum = 0;
     for (auto i : in.present_indices_unsorted()) {
-        sum += *in[i].get();
+      sum += *in[i].get();
     }
 
     std::cout << "Sum of received: " << sum << '\n';
     if (sum != s) {
-        std::cerr << "ERROR: Expected " << s << '\n';
-        exit(1);
+      std::cerr << "ERROR: Expected " << s << '\n';
+      exit(1);
     }
     s += 16;
   =}
 
   reaction(shutdown) {=
     if (s <= 6) {
-        std::cerr << "ERROR: Destination received no input!\n";
-        exit(1);
+      std::cerr << "ERROR: Destination received no input!\n";
+      exit(1);
     }
     std::cout << "Success.\n";
   =}
diff --git a/test/Cpp/src/multiport/BankToMultiport.lf b/test/Cpp/src/multiport/BankToMultiport.lf
index af338a32a2..93b476c235 100644
--- a/test/Cpp/src/multiport/BankToMultiport.lf
+++ b/test/Cpp/src/multiport/BankToMultiport.lf
@@ -13,19 +13,19 @@ reactor Sink {
 
   reaction(in) {=
     for (unsigned i = 0; i < in.size(); i++) {
-        received = true;
-        std::cout << "Received " << *in[i].get() << '\n';
-        if (*in[i].get() != i) {
-            std::cerr << "Error: expected " << i << "!\n";
-            exit(1);
-        }
+      received = true;
+      std::cout << "Received " << *in[i].get() << '\n';
+      if (*in[i].get() != i) {
+        std::cerr << "Error: expected " << i << "!\n";
+        exit(1);
+      }
     }
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        std::cerr << "Error: received no input!\n";
-        exit(2);
+      std::cerr << "Error: received no input!\n";
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/multiport/Broadcast.lf b/test/Cpp/src/multiport/Broadcast.lf
index e6dcbf9607..0ae960053b 100644
--- a/test/Cpp/src/multiport/Broadcast.lf
+++ b/test/Cpp/src/multiport/Broadcast.lf
@@ -14,15 +14,15 @@ reactor Sink(bank_index: size_t = 0) {
     received = true;
     std::cout << "Received " << *in.get() << '\n';
     if (*in.get() != 42) {
-        std::cerr << "Error: expected " << 42 << "!\n";
-        exit(1);
+      std::cerr << "Error: expected " << 42 << "!\n";
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        std::cerr << "Error: Sink " << bank_index << " didn't receive anything.\n";
-        exit(2);
+      std::cerr << "Error: Sink " << bank_index << " didn't receive anything.\n";
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/multiport/BroadcastAfter.lf b/test/Cpp/src/multiport/BroadcastAfter.lf
index 73cccc1904..50b8d5bb59 100644
--- a/test/Cpp/src/multiport/BroadcastAfter.lf
+++ b/test/Cpp/src/multiport/BroadcastAfter.lf
@@ -15,20 +15,20 @@ reactor Sink(bank_index: size_t = 0) {
   reaction(in) {=
     std::cout << bank_index << " received " << *in.get() << '\n';
     if (*in.get() != 42) {
-        std::cerr << "Error: expected " << 42 << "!\n";
-        exit(1);
+      std::cerr << "Error: expected " << 42 << "!\n";
+      exit(1);
     }
     if (get_elapsed_logical_time() != 1s) {
-        std::cerr << "ERROR: Expected to receive input after one second.\n";
-        exit(2);
+      std::cerr << "ERROR: Expected to receive input after one second.\n";
+      exit(2);
     }
     received = true;
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        std::cerr << "ERROR: Destination " << bank_index << " received no input!\n";
-        exit(1);
+      std::cerr << "ERROR: Destination " << bank_index << " received no input!\n";
+      exit(1);
     }
     std::cout << "Success.\n";
   =}
diff --git a/test/Cpp/src/multiport/BroadcastMultipleAfter.lf b/test/Cpp/src/multiport/BroadcastMultipleAfter.lf
index 0e53939ac7..da2af4e9cf 100644
--- a/test/Cpp/src/multiport/BroadcastMultipleAfter.lf
+++ b/test/Cpp/src/multiport/BroadcastMultipleAfter.lf
@@ -16,20 +16,20 @@ reactor Sink(bank_index: size_t = 0) {
     std::cout << bank_index << " received " << *in.get() << '\n';
     auto expected = (bank_index % 3) + 1;
     if (*in.get() != expected) {
-        std::cerr << "Error: expected " << expected << "!\n";
-        exit(1);
+      std::cerr << "Error: expected " << expected << "!\n";
+      exit(1);
     }
     if (get_elapsed_logical_time() != 1s) {
-        std::cerr << "ERROR: Expected to receive input after one second.\n";
-        exit(2);
+      std::cerr << "ERROR: Expected to receive input after one second.\n";
+      exit(2);
     }
     received = true;
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        std::cerr << "ERROR: Destination " << bank_index << " received no input!\n";
-        exit(1);
+      std::cerr << "ERROR: Destination " << bank_index << " received no input!\n";
+      exit(1);
     }
     std::cout << "Success.\n";
   =}
diff --git a/test/Cpp/src/multiport/FullyConnected.lf b/test/Cpp/src/multiport/FullyConnected.lf
index 0d89d96258..116fef9b07 100644
--- a/test/Cpp/src/multiport/FullyConnected.lf
+++ b/test/Cpp/src/multiport/FullyConnected.lf
@@ -17,21 +17,21 @@ reactor Node(bank_index: size_t = 0, num_nodes: size_t = 4) {
     received = true;
     size_t count{0};
     for (auto i: in.present_indices_unsorted()) {
-        count++;
-        std::cout << *in[i].get() << ", ";
+      count++;
+      std::cout << *in[i].get() << ", ";
     }
 
     std::cout << '\n';
     if (count != num_nodes) {
-        std::cerr << "ERROR: received less messages than expected!";
-        exit(1);
+      std::cerr << "ERROR: received less messages than expected!";
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        std::cerr << "Error: received no input!\n";
-        exit(2);
+      std::cerr << "Error: received no input!\n";
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/multiport/FullyConnectedAddressable.lf b/test/Cpp/src/multiport/FullyConnectedAddressable.lf
index c52039e470..4c8f95aa5f 100644
--- a/test/Cpp/src/multiport/FullyConnectedAddressable.lf
+++ b/test/Cpp/src/multiport/FullyConnectedAddressable.lf
@@ -19,24 +19,24 @@ reactor Node(bank_index: size_t = 0, num_nodes: size_t = 4) {
     size_t count{0};
     size_t result{0};
     for (auto i : in.present_indices_unsorted()) {
-        count++;
-        result = *in[i].get();
-        std::cout << result << ", ";
+      count++;
+      result = *in[i].get();
+      std::cout << result << ", ";
     }
 
     std::cout << '\n';
 
     size_t expected = bank_index == 0 ? num_nodes - 1 : bank_index - 1;
     if (count != 1 || result != expected) {
-        std::cerr << "ERROR: received an unexpected message!\n";
-        exit(1);
+      std::cerr << "ERROR: received an unexpected message!\n";
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        std::cerr << "Error: received no input!\n";
-        exit(2);
+      std::cerr << "Error: received no input!\n";
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/multiport/IndexIntoMultiportInput.lf b/test/Cpp/src/multiport/IndexIntoMultiportInput.lf
index 8deaef2c2a..39baee6b6b 100644
--- a/test/Cpp/src/multiport/IndexIntoMultiportInput.lf
+++ b/test/Cpp/src/multiport/IndexIntoMultiportInput.lf
@@ -13,17 +13,17 @@ reactor ReactorWithMultiport {
   reaction(startup, in) {=
     bool error{false};
     for (size_t i{0}; i < in.size(); i++) {
-        if (in[i].is_present()) {
-            if (*in[i].get() != i) {
-                reactor::log::Error() << "received wrong input on port " << i;
-            }
-        } else {
-            error = true;
-            reactor::log::Error() << "input " << i << " is not present";
+      if (in[i].is_present()) {
+        if (*in[i].get() != i) {
+          reactor::log::Error() << "received wrong input on port " << i;
         }
+      } else {
+        error = true;
+        reactor::log::Error() << "input " << i << " is not present";
+      }
     }
     if (error) {
-        exit(1);
+      exit(1);
     }
     reactor::log::Info() << "success";
   =}
diff --git a/test/Cpp/src/multiport/IndexIntoMultiportOutput.lf b/test/Cpp/src/multiport/IndexIntoMultiportOutput.lf
index 70b89fa728..23e366958a 100644
--- a/test/Cpp/src/multiport/IndexIntoMultiportOutput.lf
+++ b/test/Cpp/src/multiport/IndexIntoMultiportOutput.lf
@@ -12,7 +12,7 @@ reactor ReactorWithMultiport(width: size_t = 3) {
 
   reaction(startup) -> out {=
     for (size_t i{0}; i < width; i++) {
-        out[i].set(i);
+      out[i].set(i);
     }
   =}
 }
@@ -40,32 +40,32 @@ main reactor IndexIntoMultiportOutput {
   reaction(splitter.out0) {=
     received0 = true;
     if (*splitter.out0.get() != 0) {
-        reactor::log::Error() << "expeced 0";
-        exit(1);
+      reactor::log::Error() << "expeced 0";
+      exit(1);
     }
   =}
 
   reaction(splitter.out1) {=
     received1 = true;
     if (*splitter.out1.get() != 1) {
-        reactor::log::Error() << "expeced 1";
-        exit(1);
+      reactor::log::Error() << "expeced 1";
+      exit(1);
     }
   =}
 
   reaction(splitter.out2) {=
     received2 = true;
     if (*splitter.out2.get() != 2) {
-        reactor::log::Error() << "expeced 2";
-        exit(1);
+      reactor::log::Error() << "expeced 2";
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (!received0 || !received1 || !received2) {
-        reactor::log::Error() << "missed a message";
+      reactor::log::Error() << "missed a message";
     } else {
-        reactor::log::Info() << "success";
+      reactor::log::Info() << "success";
     }
   =}
 }
diff --git a/test/Cpp/src/multiport/Multiport.lf b/test/Cpp/src/multiport/Multiport.lf
index 32bc20b810..7482216734 100644
--- a/test/Cpp/src/multiport/Multiport.lf
+++ b/test/Cpp/src/multiport/Multiport.lf
@@ -13,7 +13,7 @@ reactor Test {
 
   reaction(sink) -> source {=
     for (auto i: sink.present_indices_unsorted()) {
-        source[i].set();
+      source[i].set();
     }
   =}
 }
@@ -24,8 +24,8 @@ main reactor Multiport {
 
   reaction(startup) -> test.sink {=
     for (auto i = 0; i < 30; i++) {
-        auto semi_random_index = (i * 100) % 3000;
-        test.sink[semi_random_index].set();
+      auto semi_random_index = (i * 100) % 3000;
+      test.sink[semi_random_index].set();
     }
   =}
 
@@ -34,23 +34,23 @@ main reactor Multiport {
     std::vector<std::size_t> positions;
 
     for (auto i = 0; i < 30; i++) {
-        auto semi_random_index = (i * 100) % 3000;
-        positions.push_back(semi_random_index);
+      auto semi_random_index = (i * 100) % 3000;
+      positions.push_back(semi_random_index);
     }
 
     auto received_indices = test.source.present_indices_unsorted();
 
     if (positions.size() != received_indices.size()) {
-        std::cerr << "positions size:" << positions.size()
-                  << " indices size:" << received_indices.size() << std::endl;
-        throw std::runtime_error("not matching sizes");
+      std::cerr << "positions size:" << positions.size()
+            << " indices size:" << received_indices.size() << std::endl;
+      throw std::runtime_error("not matching sizes");
     }
 
     for (auto i = 0; i < positions.size(); i++) {
-        if (positions[i] != received_indices[i]) {
-            std::cerr << "mismatch detected:" << positions[i] << " and " << received_indices[i] << std::endl;
-            throw std::runtime_error("indices do not match");
-        }
+      if (positions[i] != received_indices[i]) {
+        std::cerr << "mismatch detected:" << positions[i] << " and " << received_indices[i] << std::endl;
+        throw std::runtime_error("indices do not match");
+      }
     }
 
     std::cout << "[SUCCESS] all indices match" << std::endl;
@@ -58,8 +58,8 @@ main reactor Multiport {
 
   reaction(shutdown) {=
     if (!received) {
-        std::cerr << "Error: received no input!\n";
-        exit(2);
+      std::cerr << "Error: received no input!\n";
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/multiport/MultiportFromBank.lf b/test/Cpp/src/multiport/MultiportFromBank.lf
index 6167eb2612..e3f6a23b30 100644
--- a/test/Cpp/src/multiport/MultiportFromBank.lf
+++ b/test/Cpp/src/multiport/MultiportFromBank.lf
@@ -17,19 +17,19 @@ reactor Destination(port_width: size_t = 2) {
 
   reaction(in) {=
     for (size_t i = 0; i < in.size(); i++) {
-        std::cout << "Destination channel " << i << " received " << *in[i].get() << ".\n";
-        if (i != *in[i].get()) {
-            std::cerr << "ERROR: Expected " << i << ".\n";
-            exit(1);
-        }
+      std::cout << "Destination channel " << i << " received " << *in[i].get() << ".\n";
+      if (i != *in[i].get()) {
+        std::cerr << "ERROR: Expected " << i << ".\n";
+        exit(1);
+      }
     }
     received = true;
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        std::cerr << "ERROR: Destination received no input!\n";
-        exit(1);
+      std::cerr << "ERROR: Destination received no input!\n";
+      exit(1);
     }
     std::cout << "Success.\n";
   =}
diff --git a/test/Cpp/src/multiport/MultiportFromBankHierarchy.lf b/test/Cpp/src/multiport/MultiportFromBankHierarchy.lf
index 3814b6c510..c6ffb52819 100644
--- a/test/Cpp/src/multiport/MultiportFromBankHierarchy.lf
+++ b/test/Cpp/src/multiport/MultiportFromBankHierarchy.lf
@@ -23,19 +23,19 @@ reactor Destination {
 
   reaction(in) {=
     for (size_t i = 0; i < in.size(); i++) {
-        std::cout << "Destination channel " << i << " received " << *in[i].get() << ".\n";
-        if (i != *in[i].get()) {
-            std::cerr << "ERROR: Expected " << i << ".\n";
-            exit(1);
-        }
+      std::cout << "Destination channel " << i << " received " << *in[i].get() << ".\n";
+      if (i != *in[i].get()) {
+        std::cerr << "ERROR: Expected " << i << ".\n";
+        exit(1);
+      }
     }
     received = true;
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        std::cerr << "ERROR: Destination received no input!\n";
-        exit(1);
+      std::cerr << "ERROR: Destination received no input!\n";
+      exit(1);
     }
     std::cout << "Success.\n";
   =}
diff --git a/test/Cpp/src/multiport/MultiportFromBankHierarchyAfter.lf b/test/Cpp/src/multiport/MultiportFromBankHierarchyAfter.lf
index d745d5ebd0..cb3eeaa0c4 100644
--- a/test/Cpp/src/multiport/MultiportFromBankHierarchyAfter.lf
+++ b/test/Cpp/src/multiport/MultiportFromBankHierarchyAfter.lf
@@ -23,24 +23,24 @@ reactor Destination {
 
   reaction(in) {=
     for (int i = 0; i < in.size(); i++) {
-        int value = *in[i].get();
-        std::cout << "Destination channel " << i << " received " << value << '\n';
-        if (i != value) {
-            std::cerr << "ERROR: Expected " << i << '\n';
-            exit(1);
-        }
+      int value = *in[i].get();
+      std::cout << "Destination channel " << i << " received " << value << '\n';
+      if (i != value) {
+        std::cerr << "ERROR: Expected " << i << '\n';
+        exit(1);
+      }
     }
     if (get_elapsed_logical_time() != 1s) {
-        std::cerr << "ERROR: Expected to receive input after one second.\n";
-        exit(2);
+      std::cerr << "ERROR: Expected to receive input after one second.\n";
+      exit(2);
     }
     received = true;
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        std::cerr << "ERROR: Destination received no input!\n";
-        exit(1);
+      std::cerr << "ERROR: Destination received no input!\n";
+      exit(1);
     }
     std::cout << "Success.\n";
   =}
diff --git a/test/Cpp/src/multiport/MultiportFromHierarchy.lf b/test/Cpp/src/multiport/MultiportFromHierarchy.lf
index 21726e1238..0615286dfc 100644
--- a/test/Cpp/src/multiport/MultiportFromHierarchy.lf
+++ b/test/Cpp/src/multiport/MultiportFromHierarchy.lf
@@ -11,7 +11,7 @@ reactor Source {
 
   reaction(t) -> out {=
     for(int i = 0; i < 4; i++) {
-        out[i].set(s++);
+      out[i].set(s++);
     }
   =}
 }
@@ -23,21 +23,21 @@ reactor Destination {
   reaction(in) {=
     int sum = 0;
     for (auto i : in.present_indices_unsorted()) {
-        sum += *in[i].get();
+      sum += *in[i].get();
     }
 
     std::cout << "Sum of received: " << sum << ".\n";
     if (sum != s) {
-        std::cerr << "ERROR: Expected " << s << ".\n";
-        exit(1);
+      std::cerr << "ERROR: Expected " << s << ".\n";
+      exit(1);
     }
     s += 16;
   =}
 
   reaction(shutdown) {=
     if (s <= 6) {
-        std::cerr << "ERROR: Destination received no input!\n";
-        exit(1);
+      std::cerr << "ERROR: Destination received no input!\n";
+      exit(1);
     }
     std::cout << "Success.\n";
   =}
diff --git a/test/Cpp/src/multiport/MultiportIn.lf b/test/Cpp/src/multiport/MultiportIn.lf
index 5e6750a886..6f4f63f74b 100644
--- a/test/Cpp/src/multiport/MultiportIn.lf
+++ b/test/Cpp/src/multiport/MultiportIn.lf
@@ -27,20 +27,20 @@ reactor Destination {
   reaction(in) {=
     int sum = 0;
     for (int i = 0; i < in.size(); i++) {
-        sum += *in[i].get();
+      sum += *in[i].get();
     }
     std::cout << "Sum of received: " << sum << ".\n";
     if (sum != s) {
-        std::cerr << "ERROR: Expected " << s << ".\n";
-        exit(1);
+      std::cerr << "ERROR: Expected " << s << ".\n";
+      exit(1);
     }
     s += 4;
   =}
 
   reaction(shutdown) {=
     if (s == 0) {
-        std::cerr << "ERROR: Destination received no input!\n";
-        exit(1);
+      std::cerr << "ERROR: Destination received no input!\n";
+      exit(1);
     }
     std::cout << "Success.\n";
   =}
diff --git a/test/Cpp/src/multiport/MultiportMultipleSet.lf b/test/Cpp/src/multiport/MultiportMultipleSet.lf
index 74ef376070..fb1a9d593f 100644
--- a/test/Cpp/src/multiport/MultiportMultipleSet.lf
+++ b/test/Cpp/src/multiport/MultiportMultipleSet.lf
@@ -11,9 +11,9 @@ reactor Producer {
 
   reaction(t) -> out {=
     for (int i{odd ? 1 : 0}; i < 10; i += 2) {
-        for (int j{0}; j < 10; j++) {
-            out[i].set(j);
-        }
+      for (int j{0}; j < 10; j++) {
+        out[i].set(j);
+      }
     }
 
     odd = !odd;
@@ -29,23 +29,23 @@ reactor Consumer {
     int last = -1;
 
     for (int i : in.present_indices_unsorted()) {
-        count++;
-        if (odd && i%2 == 0) {
-            reactor::log::Error() << "Expected values only on odd ports, but received one on port " << i;
-            exit(1);
-        }
-        if (!odd && i%2 == 1) {
-            reactor::log::Error() << "Expected values only on even ports, but received one on port " << i;
-            exit(2);
-        }
-        if (9 != *in[i].get()) {
-            reactor::log::Error() << "Expected 9 but got " << *in[i].get();
-            exit(3);
-        }
+      count++;
+      if (odd && i%2 == 0) {
+        reactor::log::Error() << "Expected values only on odd ports, but received one on port " << i;
+        exit(1);
+      }
+      if (!odd && i%2 == 1) {
+        reactor::log::Error() << "Expected values only on even ports, but received one on port " << i;
+        exit(2);
+      }
+      if (9 != *in[i].get()) {
+        reactor::log::Error() << "Expected 9 but got " << *in[i].get();
+        exit(3);
+      }
     }
     if (count != 5) {
-        reactor::log::Error() << "Expected count to be 5, but got  " << count;
-        exit(4);
+      reactor::log::Error() << "Expected count to be 5, but got  " << count;
+      exit(4);
     }
 
     odd = !odd;
diff --git a/test/Cpp/src/multiport/MultiportOut.lf b/test/Cpp/src/multiport/MultiportOut.lf
index 1e03e75fdb..ff23644d42 100644
--- a/test/Cpp/src/multiport/MultiportOut.lf
+++ b/test/Cpp/src/multiport/MultiportOut.lf
@@ -11,7 +11,7 @@ reactor Source {
 
   reaction(t) -> out {=
     for(int i = 0; i < 4; i++) {
-        out[i].set(s);
+      out[i].set(s);
     }
     s++;
   =}
@@ -37,20 +37,20 @@ reactor Destination {
   reaction(in) {=
     int sum = 0;
     for (auto i : in.present_indices_unsorted()) {
-        sum += *in[i].get();
+      sum += *in[i].get();
     }
     std::cout << "Sum of received: " << sum << ".\n";
     if (sum != s) {
-        std::cerr << "ERROR: Expected " << s << ".\n";
-        exit(1);
+      std::cerr << "ERROR: Expected " << s << ".\n";
+      exit(1);
     }
     s += 4;
   =}
 
   reaction(shutdown) {=
     if (s == 0) {
-        std::cerr << "ERROR: Destination received no input!\n";
-        exit(1);
+      std::cerr << "ERROR: Destination received no input!\n";
+      exit(1);
     }
     std::cout << "Success.\n";
   =}
diff --git a/test/Cpp/src/multiport/MultiportToBank.lf b/test/Cpp/src/multiport/MultiportToBank.lf
index adb7b73b34..77ae5247e1 100644
--- a/test/Cpp/src/multiport/MultiportToBank.lf
+++ b/test/Cpp/src/multiport/MultiportToBank.lf
@@ -5,7 +5,7 @@ reactor Source {
 
   reaction(startup) -> out {=
     for (unsigned i = 0 ; i < out.size(); i++) {
-        out[i].set(i);
+      out[i].set(i);
     }
   =}
 }
@@ -16,8 +16,8 @@ reactor Sink(bank_index: size_t = 0) {
   reaction(in) {=
     std::cout << "Received " << *in.get() << '\n';
     if (*in.get() != bank_index) {
-        std::cerr << "Error: expected " << bank_index << "!\n";
-        exit(1);
+      std::cerr << "Error: expected " << bank_index << "!\n";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/multiport/MultiportToBankAfter.lf b/test/Cpp/src/multiport/MultiportToBankAfter.lf
index 423d9ee433..ff4f83b388 100644
--- a/test/Cpp/src/multiport/MultiportToBankAfter.lf
+++ b/test/Cpp/src/multiport/MultiportToBankAfter.lf
@@ -5,7 +5,7 @@ reactor Source {
 
   reaction(startup) -> out {=
     for (unsigned i = 0 ; i < out.size(); i++) {
-        out[i].set(i);
+      out[i].set(i);
     }
   =}
 }
@@ -16,12 +16,12 @@ reactor Sink(bank_index: size_t = 0) {
   reaction(in) {=
     std::cout << "Received " << *in.get() << '\n';
     if (*in.get() != bank_index) {
-        std::cerr << "Error: expected " << bank_index << "!\n";
-        exit(1);
+      std::cerr << "Error: expected " << bank_index << "!\n";
+      exit(1);
     }
     if (get_elapsed_logical_time() != 1s) {
-        std::cerr << "ERROR: Expected to receive input after one second.\n";
-        exit(2);
+      std::cerr << "ERROR: Expected to receive input after one second.\n";
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/multiport/MultiportToBankHierarchy.lf b/test/Cpp/src/multiport/MultiportToBankHierarchy.lf
index e58531e70c..60bc731a3b 100644
--- a/test/Cpp/src/multiport/MultiportToBankHierarchy.lf
+++ b/test/Cpp/src/multiport/MultiportToBankHierarchy.lf
@@ -10,7 +10,7 @@ reactor Source {
 
   reaction(startup) -> out {=
     for(size_t i = 0; i < out.size(); i++) {
-        out[i].set(i);
+      out[i].set(i);
     }
   =}
 }
@@ -22,16 +22,16 @@ reactor Destination(bank_index: size_t = 0) {
   reaction(in) {=
     std::cout << "Destination " << bank_index << " received " << *in.get() << ".\n";
     if (bank_index != *in.get()) {
-        std::cerr << "ERROR: Expected " << bank_index << ".\n";
-        exit(1);
+      std::cerr << "ERROR: Expected " << bank_index << ".\n";
+      exit(1);
     }
     received = true;
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        std::cerr << "ERROR: Destination " << bank_index << " received no input!\n";
-        exit(1);
+      std::cerr << "ERROR: Destination " << bank_index << " received no input!\n";
+      exit(1);
     }
     std::cout << "Success.\n";
   =}
diff --git a/test/Cpp/src/multiport/MultiportToHierarchy.lf b/test/Cpp/src/multiport/MultiportToHierarchy.lf
index e737018a0c..3fc5fdc057 100644
--- a/test/Cpp/src/multiport/MultiportToHierarchy.lf
+++ b/test/Cpp/src/multiport/MultiportToHierarchy.lf
@@ -12,7 +12,7 @@ reactor Source(width: size_t = 4) {
 
   reaction(t) -> out {=
     for(size_t i = 0; i < 4; i++) {
-        out[i].set(s++);
+      out[i].set(s++);
     }
   =}
 }
@@ -24,21 +24,21 @@ reactor Destination(width: size_t = 4) {
   reaction(in) {=
     int sum = 0;
     for (auto i : in.present_indices_unsorted()) {
-        sum += *in[i].get();
+      sum += *in[i].get();
     }
 
     std::cout << "Sum of received: " << sum << ".\n";
     if (sum != s) {
-        std::cerr << "ERROR: Expected " << s << ".\n";
-        exit(1);
+      std::cerr << "ERROR: Expected " << s << ".\n";
+      exit(1);
     }
     s += 16;
   =}
 
   reaction(shutdown) {=
     if (s <= 6) {
-        std::cerr << "ERROR: Destination received no input!\n";
-        exit(1);
+      std::cerr << "ERROR: Destination received no input!\n";
+      exit(1);
     }
     std::cout << "Success.\n";
   =}
diff --git a/test/Cpp/src/multiport/MultiportToMultiport.lf b/test/Cpp/src/multiport/MultiportToMultiport.lf
index b018299508..3e89a847e0 100644
--- a/test/Cpp/src/multiport/MultiportToMultiport.lf
+++ b/test/Cpp/src/multiport/MultiportToMultiport.lf
@@ -5,7 +5,7 @@ reactor Source {
 
   reaction(startup) -> out {=
     for (unsigned i = 0; i < out.size(); i++) {
-        out[i].set(i);
+      out[i].set(i);
     }
   =}
 }
@@ -16,19 +16,19 @@ reactor Sink {
 
   reaction(in) {=
     for (unsigned i = 0; i < in.size(); i++) {
-        std::cout << "Received " << *in[i].get() << '\n';
-        received = true;
-        if (*in[i].get() != i) {
-            std::cerr << "Error: expected " << i << "!\n";
-            exit(1);
-        }
+      std::cout << "Received " << *in[i].get() << '\n';
+      received = true;
+      if (*in[i].get() != i) {
+        std::cerr << "Error: expected " << i << "!\n";
+        exit(1);
+      }
     }
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        std::cerr << "Error: No data received!\n";
-        exit(2);
+      std::cerr << "Error: No data received!\n";
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/multiport/MultiportToMultiport2.lf b/test/Cpp/src/multiport/MultiportToMultiport2.lf
index efc8de346d..607d345460 100644
--- a/test/Cpp/src/multiport/MultiportToMultiport2.lf
+++ b/test/Cpp/src/multiport/MultiportToMultiport2.lf
@@ -6,7 +6,7 @@ reactor Source(width: size_t = 2) {
 
   reaction(startup) -> out {=
     for (size_t i = 0; i < out.size(); i++) {
-        out[i].set(i);
+      out[i].set(i);
     }
   =}
 }
@@ -16,14 +16,14 @@ reactor Destination(width: size_t = 2) {
 
   reaction(in) {=
     for (auto i: in.present_indices_unsorted()) {
-        size_t value = *in[i].get();
-        std::cout << "Received on channel " << i << ": " << value << '\n';
-        // NOTE: For testing purposes, this assumes the specific
-        // widths instantiated below.
-        if (value != i % 3) {
-            std::cerr << "ERROR: expected " << i % 3 << '\n';
-            exit(1);
-        }
+      size_t value = *in[i].get();
+      std::cout << "Received on channel " << i << ": " << value << '\n';
+      // NOTE: For testing purposes, this assumes the specific
+      // widths instantiated below.
+      if (value != i % 3) {
+        std::cerr << "ERROR: expected " << i % 3 << '\n';
+        exit(1);
+      }
     }
   =}
 }
diff --git a/test/Cpp/src/multiport/MultiportToMultiport2After.lf b/test/Cpp/src/multiport/MultiportToMultiport2After.lf
index a5eca82c58..c339814cca 100644
--- a/test/Cpp/src/multiport/MultiportToMultiport2After.lf
+++ b/test/Cpp/src/multiport/MultiportToMultiport2After.lf
@@ -6,7 +6,7 @@ reactor Source(width: size_t = 2) {
 
   reaction(startup) -> out {=
     for (size_t i = 0; i < out.size(); i++) {
-        out[i].set(i);
+      out[i].set(i);
     }
   =}
 }
@@ -16,20 +16,20 @@ reactor Destination(width: size_t = 2) {
 
   reaction(in) {=
     for (size_t i = 0; i < in.size(); i++) {
-        if (in[i].is_present()) {
-            size_t value = *in[i].get();
-            std::cout << "Received on channel " << i << ": " << value << '\n';
-            // NOTE: For testing purposes, this assumes the specific
-            // widths instantiated below.
-            if (value != i % 3) {
-                std::cerr << "ERROR: expected " << i % 3 << '\n';
-                exit(1);
-            }
+      if (in[i].is_present()) {
+        size_t value = *in[i].get();
+        std::cout << "Received on channel " << i << ": " << value << '\n';
+        // NOTE: For testing purposes, this assumes the specific
+        // widths instantiated below.
+        if (value != i % 3) {
+          std::cerr << "ERROR: expected " << i % 3 << '\n';
+          exit(1);
         }
+      }
     }
     if (get_elapsed_logical_time() != 1s) {
-        std::cerr << "ERROR: Expected to receive input after one second.\n";
-        exit(2);
+      std::cerr << "ERROR: Expected to receive input after one second.\n";
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/multiport/MultiportToMultiportArray.lf b/test/Cpp/src/multiport/MultiportToMultiportArray.lf
index fce25b346b..3f95cd2c21 100644
--- a/test/Cpp/src/multiport/MultiportToMultiportArray.lf
+++ b/test/Cpp/src/multiport/MultiportToMultiportArray.lf
@@ -11,14 +11,14 @@ reactor Source {
 
   reaction(t) -> out {=
     for(int i = 0; i < 2; i++) {
-        // Dynamically allocate a new output array
-        auto a = reactor::make_mutable_value<std::array<int, 3>>();
-        // initialize it
-        (*a)[0] = s++;
-        (*a)[1] = s++;
-        (*a)[2] = s++;
-        // and send it
-        out[i].set(std::move(a));
+      // Dynamically allocate a new output array
+      auto a = reactor::make_mutable_value<std::array<int, 3>>();
+      // initialize it
+      (*a)[0] = s++;
+      (*a)[1] = s++;
+      (*a)[2] = s++;
+      // and send it
+      out[i].set(std::move(a));
     }
   =}
 }
@@ -30,23 +30,23 @@ reactor Destination {
   reaction(in) {=
     int sum = 0;
     for (auto i : in.present_indices_unsorted()) {
-        const auto& a = *in[i].get();
-        for (int j = 0; j < a.size(); j++) {
-            sum += a[j];
-        }
+      const auto& a = *in[i].get();
+      for (int j = 0; j < a.size(); j++) {
+        sum += a[j];
+      }
     }
     std::cout << "Sum of received: " << sum << '\n';
     if (sum != s) {
-        std::cerr << "ERROR: Expected " << s << '\n';
-        exit(1);
+      std::cerr << "ERROR: Expected " << s << '\n';
+      exit(1);
     }
     s += 36;
   =}
 
   reaction(shutdown) {=
     if (s <= 15) {
-        std::cerr << "ERROR: Destination received no input!\n";
-        exit(1);
+      std::cerr << "ERROR: Destination received no input!\n";
+      exit(1);
     }
     std::cout << "Success.\n";
   =}
diff --git a/test/Cpp/src/multiport/MultiportToMultiportPhysical.lf b/test/Cpp/src/multiport/MultiportToMultiportPhysical.lf
index 7418bee409..db8583f3fd 100644
--- a/test/Cpp/src/multiport/MultiportToMultiportPhysical.lf
+++ b/test/Cpp/src/multiport/MultiportToMultiportPhysical.lf
@@ -5,7 +5,7 @@ reactor Source {
 
   reaction(startup) -> out {=
     for (unsigned i = 0; i < out.size(); i++) {
-        out[i].set(i);
+      out[i].set(i);
     }
   =}
 }
@@ -17,22 +17,22 @@ reactor Sink {
   reaction(in) {=
     auto present_ports = in.present_indices_unsorted();
     if (present_ports.size() != 1) {
-        reactor::log::Error() << "Expected only one value, but got " << present_ports.size();
-        exit(1);
+      reactor::log::Error() << "Expected only one value, but got " << present_ports.size();
+      exit(1);
     }
     int idx = present_ports[0];
     std::cout << "Received " << *in[idx].get() << '\n';
     if (idx <= received) {
-        reactor::log::Error() << "Received index " << idx << " after " << received;
-        exit(2);
+      reactor::log::Error() << "Received index " << idx << " after " << received;
+      exit(2);
     }
     received = idx;
   =}
 
   reaction(shutdown) {=
     if (received != 3) {
-        std::cerr << "Error: No data received!\n";
-        exit(2);
+      std::cerr << "Error: No data received!\n";
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/multiport/MultiportToPort.lf b/test/Cpp/src/multiport/MultiportToPort.lf
index 3238d68ec4..31354d320c 100644
--- a/test/Cpp/src/multiport/MultiportToPort.lf
+++ b/test/Cpp/src/multiport/MultiportToPort.lf
@@ -9,8 +9,8 @@ reactor Source {
 
   reaction(startup) -> out {=
     for(int i = 0; i < out.size(); i++) {
-        std::cout << "Source sending " << i << ".\n";
-        out[i].set(i);
+      std::cout << "Source sending " << i << ".\n";
+      out[i].set(i);
     }
   =}
 }
@@ -23,15 +23,15 @@ reactor Destination(expected: int = 0) {
     std::cout << "Received: " << *in.get() << ".\n";
     received = true;
     if (*in.get() != expected) {
-        std::cerr << "ERROR: Expected " << expected << ".\n";
-        exit(1);
+      std::cerr << "ERROR: Expected " << expected << ".\n";
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        std::cerr << "ERROR: Destination received no input!\n";
-        exit(1);
+      std::cerr << "ERROR: Destination received no input!\n";
+      exit(1);
     }
     std::cout << "Success.\n";
   =}
diff --git a/test/Cpp/src/multiport/PipelineAfter.lf b/test/Cpp/src/multiport/PipelineAfter.lf
index b160ab8104..8fb6418e65 100644
--- a/test/Cpp/src/multiport/PipelineAfter.lf
+++ b/test/Cpp/src/multiport/PipelineAfter.lf
@@ -19,12 +19,12 @@ reactor Sink {
   reaction(in) {=
     std::cout << "Received " << *in.get() << '\n';
     if (*in.get() != 42) {
-        std::cerr << "Error: expected 42!\n";
-        exit(1);
+      std::cerr << "Error: expected 42!\n";
+      exit(1);
     }
     if (get_elapsed_logical_time() != 1s) {
-        std::cerr << "ERROR: Expected to receive input after 1 second.\n";
-        exit(2);
+      std::cerr << "ERROR: Expected to receive input after 1 second.\n";
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/multiport/ReadMultiportOutputOfContainedBank.lf b/test/Cpp/src/multiport/ReadMultiportOutputOfContainedBank.lf
index 329ac18ed7..b44b355ca7 100644
--- a/test/Cpp/src/multiport/ReadMultiportOutputOfContainedBank.lf
+++ b/test/Cpp/src/multiport/ReadMultiportOutputOfContainedBank.lf
@@ -6,7 +6,7 @@ reactor Contained(bank_index: size_t = 0) {
 
   reaction(startup) -> out {=
     for (size_t i = 0; i < 3; i++) {
-        out[i].set(bank_index * i);
+      out[i].set(bank_index * i);
     }
   =}
 }
@@ -17,53 +17,53 @@ main reactor {
 
   reaction(startup) c.out {=
     for (size_t i = 0; i < c.size(); i++) {
-        for (size_t j = 0; j < c[i].out.size(); j++) {
-            unsigned result = *c[i].out[j].get();
-            std::cout << "Startup reaction reading output of contained "
-                      << "reactor: " << result << std::endl;
-            if (result != i * j) {
-                std::cout << "FAILURE: expected " << i * j << std::endl;
-                exit(2);
-            }
+      for (size_t j = 0; j < c[i].out.size(); j++) {
+        unsigned result = *c[i].out[j].get();
+        std::cout << "Startup reaction reading output of contained "
+              << "reactor: " << result << std::endl;
+        if (result != i * j) {
+          std::cout << "FAILURE: expected " << i * j << std::endl;
+          exit(2);
         }
+      }
     }
     count++;
   =}
 
   reaction(c.out) {=
     for (size_t i = 0; i < c.size(); i++) {
-        for (size_t j = 0; j < c[i].out.size(); j++) {
-            unsigned result = *c[i].out[j].get();
-            std::cout << "Reading output of contained reactor: " << result << std::endl;
-            if (result != i * j) {
-                std::cout << "FAILURE: expected " << i * j << std::endl;
-                exit(2);
-            }
+      for (size_t j = 0; j < c[i].out.size(); j++) {
+        unsigned result = *c[i].out[j].get();
+        std::cout << "Reading output of contained reactor: " << result << std::endl;
+        if (result != i * j) {
+          std::cout << "FAILURE: expected " << i * j << std::endl;
+          exit(2);
         }
+      }
     }
     count++;
   =}
 
   reaction(startup, c.out) {=
     for (size_t i = 0; i < c.size(); i++) {
-        for (size_t j = 0; j < c[i].out.size(); j++) {
-            unsigned result = *c[i].out[j].get();
-            std::cout << "Alternate triggering reading output of contained "
-                  << "reactor: " << result << std::endl;
-            if (result != i * j) {
-                std::cout << "FAILURE: expected " << i * j << std::endl;
-                exit(2);
-            }
+      for (size_t j = 0; j < c[i].out.size(); j++) {
+        unsigned result = *c[i].out[j].get();
+        std::cout << "Alternate triggering reading output of contained "
+            << "reactor: " << result << std::endl;
+        if (result != i * j) {
+          std::cout << "FAILURE: expected " << i * j << std::endl;
+          exit(2);
         }
+      }
     }
     count++;
   =}
 
   reaction(shutdown) {=
     if (count != 3) {
-        std::cerr << "ERROR: One of the reactions failed to trigger."
-                  << std::endl;
-        exit(1);
+      std::cerr << "ERROR: One of the reactions failed to trigger."
+            << std::endl;
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/multiport/ReadOutputOfContainedBank.lf b/test/Cpp/src/multiport/ReadOutputOfContainedBank.lf
index b9a485ac7d..c0fb6d59ee 100644
--- a/test/Cpp/src/multiport/ReadOutputOfContainedBank.lf
+++ b/test/Cpp/src/multiport/ReadOutputOfContainedBank.lf
@@ -13,48 +13,48 @@ main reactor {
 
   reaction(startup) c.out {=
     for (size_t i = 0; i < c.size(); i++) {
-        unsigned result = *c[i].out.get();
-        std::cout << "Startup reaction reading output of contained "
-                  << "reactor: " << result << std::endl;
-        if (result != 42 * i) {
-            std::cout << "FAILURE: expected " << 42 * i << std::endl;
-            exit(2);
-        }
+      unsigned result = *c[i].out.get();
+      std::cout << "Startup reaction reading output of contained "
+            << "reactor: " << result << std::endl;
+      if (result != 42 * i) {
+        std::cout << "FAILURE: expected " << 42 * i << std::endl;
+        exit(2);
+      }
     }
     count++;
   =}
 
   reaction(c.out) {=
     for (size_t i = 0; i < c.size(); i++) {
-        unsigned result = *c[i].out.get();
-        std::cout << "Reading output of contained reactor: " << result
-              << std::endl;
-        if (result != 42 * i) {
-            std::cout << "FAILURE: expected " << 42 * i << std::endl;
-            exit(2);
-        }
+      unsigned result = *c[i].out.get();
+      std::cout << "Reading output of contained reactor: " << result
+          << std::endl;
+      if (result != 42 * i) {
+        std::cout << "FAILURE: expected " << 42 * i << std::endl;
+        exit(2);
+      }
     }
     count++;
   =}
 
   reaction(startup, c.out) {=
     for (size_t i = 0; i < c.size(); i++) {
-        unsigned result = *c[i].out.get();
-        std::cout << "Alternate triggering reading output of contained "
-                  << "reactor: " << result << std::endl;
-        if (result != 42 * i) {
-            std::cout << "FAILURE: expected " << 42 * i << std::endl;
-            exit(2);
-        }
+      unsigned result = *c[i].out.get();
+      std::cout << "Alternate triggering reading output of contained "
+            << "reactor: " << result << std::endl;
+      if (result != 42 * i) {
+        std::cout << "FAILURE: expected " << 42 * i << std::endl;
+        exit(2);
+      }
     }
     count++;
   =}
 
   reaction(shutdown) {=
     if (count != 3) {
-        std::cerr << "ERROR: One of the reactions failed to trigger."
-                  << std::endl;
-        exit(1);
+      std::cerr << "ERROR: One of the reactions failed to trigger."
+            << std::endl;
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/multiport/SparseMultiport.lf b/test/Cpp/src/multiport/SparseMultiport.lf
index f126ce385d..6113c3beb3 100644
--- a/test/Cpp/src/multiport/SparseMultiport.lf
+++ b/test/Cpp/src/multiport/SparseMultiport.lf
@@ -11,7 +11,7 @@ reactor Producer {
 
   reaction(t) -> out {=
     for (int i{odd ? 1 : 0}; i < 10; i += 2) {
-        out[i].set(i);
+      out[i].set(i);
     }
 
     odd = !odd;
@@ -25,17 +25,17 @@ reactor Consumer {
   reaction(in) {=
     reactor::log::Info() << "Received:";
     for (int i{0}; i < 10; i++) {
-        if (in[i].is_present()) {
-            if (odd && i%2 == 0) {
-                reactor::log::Error() << "Expected values only on odd ports, but received one on port " << i;
-                exit(1);
-            }
-            if (!odd && i%2 == 1) {
-                reactor::log::Error() << "Expected values only on even ports, but received one on port " << i;
-                exit(1);
-            }
-            reactor::log::Info() << "- " << i;
+      if (in[i].is_present()) {
+        if (odd && i%2 == 0) {
+          reactor::log::Error() << "Expected values only on odd ports, but received one on port " << i;
+          exit(1);
+        }
+        if (!odd && i%2 == 1) {
+          reactor::log::Error() << "Expected values only on even ports, but received one on port " << i;
+          exit(1);
         }
+        reactor::log::Info() << "- " << i;
+      }
     }
   =}
 
@@ -43,34 +43,34 @@ reactor Consumer {
     int count = 0;
     int last = -1;
     for (int i : in.present_indices_sorted()) {
-        count++;
-        if (odd && i%2 == 0) {
-            reactor::log::Error() << "Expected values only on odd ports, but received one on port " << i;
-            exit(1);
-        }
-        if (!odd && i%2 == 1) {
-            reactor::log::Error() << "Expected values only on even ports, but received one on port " << i;
-            exit(1);
-        }
-        if (i < last) {
-            reactor::log::Error() << "Received index out of order! " << i << " after " << last;
-            exit(1);
-        }
+      count++;
+      if (odd && i%2 == 0) {
+        reactor::log::Error() << "Expected values only on odd ports, but received one on port " << i;
+        exit(1);
+      }
+      if (!odd && i%2 == 1) {
+        reactor::log::Error() << "Expected values only on even ports, but received one on port " << i;
+        exit(1);
+      }
+      if (i < last) {
+        reactor::log::Error() << "Received index out of order! " << i << " after " << last;
+        exit(1);
+      }
     }
     for (int i : in.present_indices_unsorted()) {
-        count++;
-        if (odd && i%2 == 0) {
-            reactor::log::Error() << "Expected values only on odd ports, but received one on port " << i;
-            exit(1);
-        }
-        if (!odd && i%2 == 1) {
-            reactor::log::Error() << "Expected values only on even ports, but received one on port " << i;
-            exit(1);
-        }
+      count++;
+      if (odd && i%2 == 0) {
+        reactor::log::Error() << "Expected values only on odd ports, but received one on port " << i;
+        exit(1);
+      }
+      if (!odd && i%2 == 1) {
+        reactor::log::Error() << "Expected values only on even ports, but received one on port " << i;
+        exit(1);
+      }
     }
     if (count != 10) {
-        reactor::log::Error() << "Expected count to be 10, but got  " << count;
-        exit(1);
+      reactor::log::Error() << "Expected count to be 10, but got  " << count;
+      exit(1);
     }
 
     odd = !odd;
diff --git a/test/Cpp/src/multiport/WidthGivenByCode.lf b/test/Cpp/src/multiport/WidthGivenByCode.lf
index 123b0fe177..5e9ed80eb3 100644
--- a/test/Cpp/src/multiport/WidthGivenByCode.lf
+++ b/test/Cpp/src/multiport/WidthGivenByCode.lf
@@ -6,12 +6,12 @@ reactor Foo(a: size_t = 8, b: size_t = 2) {
 
   reaction(startup) in -> out {=
     if (in.size() != a*b) {
-        std::cerr << "ERROR: expected in to have a width of " << a*b << '\n';
-        exit(1);
+      std::cerr << "ERROR: expected in to have a width of " << a*b << '\n';
+      exit(1);
     }
     if (out.size() != a/b) {
-        std::cerr << "ERROR: expected out to have a width of " << a/b << '\n';
-        exit(2);
+      std::cerr << "ERROR: expected out to have a width of " << a/b << '\n';
+      exit(2);
     }
   =}
 }
@@ -24,14 +24,14 @@ main reactor {
 
   reaction(startup) foo_bank.out {=
     if (foo_bank.size() != 42) {
-        std::cerr << "ERROR: expected foo_bank to have a width of " << 42 << '\n';
-        exit(3);
+      std::cerr << "ERROR: expected foo_bank to have a width of " << 42 << '\n';
+      exit(3);
     }
     for (auto& foo : foo_bank) {
-        if (foo.out.size() != 4) {
-            std::cerr << "ERROR: expected foo_bank.out to have a width of " << 4 << '\n';
-            exit(4);
-        }
+      if (foo.out.size() != 4) {
+        std::cerr << "ERROR: expected foo_bank.out to have a width of " << 4 << '\n';
+        exit(4);
+      }
     }
   =}
 }
diff --git a/test/Cpp/src/multiport/WriteInputOfContainedBank.lf b/test/Cpp/src/multiport/WriteInputOfContainedBank.lf
index 87258ae953..ea170511a4 100644
--- a/test/Cpp/src/multiport/WriteInputOfContainedBank.lf
+++ b/test/Cpp/src/multiport/WriteInputOfContainedBank.lf
@@ -9,16 +9,16 @@ reactor Contained(bank_index: size_t = 0) {
     unsigned result = *in.get();
     std::cout << "Instance " << bank_index << " received " << result << '\n';
     if (result != bank_index * 42) {
-        std::cout << "FAILURE: expected " << 42 * bank_index << '\n';
-        exit(2);
+      std::cout << "FAILURE: expected " << 42 * bank_index << '\n';
+      exit(2);
     }
     count++;
   =}
 
   reaction(shutdown) {=
     if (count != 1) {
-        std::cerr << "ERROR: One of the reactions failed to trigger.\n";
-        exit(1);
+      std::cerr << "ERROR: One of the reactions failed to trigger.\n";
+      exit(1);
     }
   =}
 }
@@ -28,7 +28,7 @@ main reactor {
 
   reaction(startup) -> c.in {=
     for (size_t i = 0; i < c.size(); i++) {
-        c[i].in.set(i*42);
+      c[i].in.set(i*42);
     }
   =}
 }
diff --git a/test/Cpp/src/multiport/WriteMultiportInputOfContainedBank.lf b/test/Cpp/src/multiport/WriteMultiportInputOfContainedBank.lf
index 2bb7c12b9a..7dea69a28d 100644
--- a/test/Cpp/src/multiport/WriteMultiportInputOfContainedBank.lf
+++ b/test/Cpp/src/multiport/WriteMultiportInputOfContainedBank.lf
@@ -7,20 +7,20 @@ reactor Contained(bank_index: size_t = 0) {
 
   reaction(in) {=
     for (size_t i = 0; i < 3; i++) {
-        unsigned result = *in[i].get();
-        std::cout << "Instance " << bank_index << " received " << result << '\n';
-        if (result != bank_index * i) {
-            std::cout << "FAILURE: expected " << i * bank_index << '\n';
-            exit(2);
-        }
+      unsigned result = *in[i].get();
+      std::cout << "Instance " << bank_index << " received " << result << '\n';
+      if (result != bank_index * i) {
+        std::cout << "FAILURE: expected " << i * bank_index << '\n';
+        exit(2);
+      }
     }
     count++;
   =}
 
   reaction(shutdown) {=
     if (count != 1) {
-        std::cerr << "ERROR: One of the reactions failed to trigger.\n";
-        exit(1);
+      std::cerr << "ERROR: One of the reactions failed to trigger.\n";
+      exit(1);
     }
   =}
 }
@@ -30,9 +30,9 @@ main reactor {
 
   reaction(startup) -> c.in {=
     for (size_t i = 0; i < c.size(); i++) {
-        for (size_t j = 0; j < c[i].in.size(); j++) {
-            c[i].in[j].set(i*j);
-        }
+      for (size_t j = 0; j < c[i].in.size(); j++) {
+        c[i].in[j].set(i*j);
+      }
     }
   =}
 }
diff --git a/test/Cpp/src/properties/Fast.lf b/test/Cpp/src/properties/Fast.lf
index 97e40f05b8..a44d1fb7e5 100644
--- a/test/Cpp/src/properties/Fast.lf
+++ b/test/Cpp/src/properties/Fast.lf
@@ -12,17 +12,17 @@ main reactor {
   reaction(a) {=
     triggered = true;
     if (get_elapsed_physical_time() >= 2s) {
-        std::cout << "ERROR: needed more than 2s to process the reaction\n";
-        exit(1);
+      std::cout << "ERROR: needed more than 2s to process the reaction\n";
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (triggered) {
-        std::cout << "SUCCESS!\n";
+      std::cout << "SUCCESS!\n";
     } else {
-        std::cout << "ERROR: reaction was not invoked!\n";
-        exit(2);
+      std::cout << "ERROR: reaction was not invoked!\n";
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/properties/Timeout.lf b/test/Cpp/src/properties/Timeout.lf
index 3fd5982952..a278d6d712 100644
--- a/test/Cpp/src/properties/Timeout.lf
+++ b/test/Cpp/src/properties/Timeout.lf
@@ -10,22 +10,22 @@ main reactor {
   reaction(t) {=
     triggered = true;
     if (get_elapsed_logical_time() != 1s) {
-        std::cout << "ERROR: triggered reaction at an unexpected tag";
-        exit(1);
+      std::cout << "ERROR: triggered reaction at an unexpected tag";
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (get_elapsed_logical_time() != 1s || get_microstep() != 0) {
-        std::cout << "ERROR: shutdown invoked at an unexpected tag";
-        exit(2);
+      std::cout << "ERROR: shutdown invoked at an unexpected tag";
+      exit(2);
     }
 
     if (triggered) {
-        std::cout << "SUCCESS!\n";
+      std::cout << "SUCCESS!\n";
     } else {
-        std::cout << "ERROR: reaction was not invoked!\n";
-        exit(2);
+      std::cout << "ERROR: reaction was not invoked!\n";
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/properties/TimeoutZero.lf b/test/Cpp/src/properties/TimeoutZero.lf
index c49db95731..3aa45c7203 100644
--- a/test/Cpp/src/properties/TimeoutZero.lf
+++ b/test/Cpp/src/properties/TimeoutZero.lf
@@ -10,22 +10,22 @@ main reactor {
   reaction(t) {=
     triggered = true;
     if (get_elapsed_logical_time() != 0s) {
-        std::cout << "ERROR: triggered reaction at an unexpected tag";
-        exit(1);
+      std::cout << "ERROR: triggered reaction at an unexpected tag";
+      exit(1);
     }
   =}
 
   reaction(shutdown) {=
     if (get_elapsed_logical_time() != 0s || get_microstep() != 0) {
-        std::cout << "ERROR: shutdown invoked at an unexpected tag";
-        exit(2);
+      std::cout << "ERROR: shutdown invoked at an unexpected tag";
+      exit(2);
     }
 
     if (triggered) {
-        std::cout << "SUCCESS!\n";
+      std::cout << "SUCCESS!\n";
     } else {
-        std::cout << "ERROR: reaction was not invoked!\n";
-        exit(2);
+      std::cout << "ERROR: reaction was not invoked!\n";
+      exit(2);
     }
   =}
 }
diff --git a/test/Cpp/src/target/AfterVoid.lf b/test/Cpp/src/target/AfterVoid.lf
index dbb0041a3e..5b208b4008 100644
--- a/test/Cpp/src/target/AfterVoid.lf
+++ b/test/Cpp/src/target/AfterVoid.lf
@@ -22,16 +22,16 @@ reactor print {
     std::cout << "Current logical time is: " << elapsed_time << '\n';
     std::cout << "Current physical time is: " << get_elapsed_physical_time() << '\n';
     if (elapsed_time != expected_time) {
-        std::cerr << "ERROR: Expected logical time to be " << expected_time << '\n';
-        exit(2);
+      std::cerr << "ERROR: Expected logical time to be " << expected_time << '\n';
+      exit(2);
     }
     expected_time += 1s;
   =}
 
   reaction(shutdown) {=
     if (i == 0) {
-        std::cerr << "ERROR: Final reactor received no data.\n";
-        exit(3);
+      std::cerr << "ERROR: Final reactor received no data.\n";
+      exit(3);
     }
   =}
 }
diff --git a/test/Cpp/src/target/BraceAndParenInitialization.lf b/test/Cpp/src/target/BraceAndParenInitialization.lf
index d287addb07..59818d4bd0 100644
--- a/test/Cpp/src/target/BraceAndParenInitialization.lf
+++ b/test/Cpp/src/target/BraceAndParenInitialization.lf
@@ -12,13 +12,13 @@ reactor Foo(
   reaction(startup) {=
     std::cerr << "Hello!\n";
     if (param_list_1.size() != 4 || param_list_1[0] != 2 ||
-        param_list_2.size() != 2 || param_list_2[0] != 4 ||
-        param_list_3.size() != 3 || param_list_3[0] != 5 ||
-        param_list_4.size() != 2 || param_list_4[0] != 3 ||
-        state_list_1.size() != 6 || state_list_1[0] != 42 ||
-        state_list_2.size() != 2 || state_list_2[0] != 6) {
-        std::cerr << "Error!\n";
-        exit(1);
+      param_list_2.size() != 2 || param_list_2[0] != 4 ||
+      param_list_3.size() != 3 || param_list_3[0] != 5 ||
+      param_list_4.size() != 2 || param_list_4[0] != 3 ||
+      state_list_1.size() != 6 || state_list_1[0] != 42 ||
+      state_list_2.size() != 2 || state_list_2[0] != 6) {
+      std::cerr << "Error!\n";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/target/CliParserGenericArguments.lf b/test/Cpp/src/target/CliParserGenericArguments.lf
index d8922338b1..8028776e07 100644
--- a/test/Cpp/src/target/CliParserGenericArguments.lf
+++ b/test/Cpp/src/target/CliParserGenericArguments.lf
@@ -7,7 +7,7 @@ target Cpp
 
 public preamble {=
   using unsigned_long = unsigned long;
-  using long_long     = long long;
+  using long_long   = long long;
   using uns_long_long = unsigned long long;
   using long_double   = long double;
 
@@ -15,12 +15,12 @@ public preamble {=
   #include <sstream>
   using namespace std;
   class CustomClass {
-      public:
-          std::string name;
-          CustomClass(std::string new_name="John") : name{new_name}
-          {}
-          std::string get_name() const {return this->name;}
-          void set_name(std::string updated_name){this->name = updated_name;}
+    public:
+      std::string name;
+      CustomClass(std::string new_name="John") : name{new_name}
+      {}
+      std::string get_name() const {return this->name;}
+      void set_name(std::string updated_name){this->name = updated_name;}
   };
 
   ostream& operator<<(ostream& os, const CustomClass& cc);
@@ -31,14 +31,14 @@ public preamble {=
 private preamble {=
   stringstream& operator>>(stringstream& in, CustomClass& cc)
   {
-      cc.set_name(in.str());
-      return in;
+    cc.set_name(in.str());
+    return in;
   }
 
   ostream& operator<<(ostream& os, const CustomClass& cc)
   {
-      os << cc.get_name();
-      return os;
+    os << cc.get_name();
+    return os;
   }
 =}
 
diff --git a/test/Cpp/src/target/CombinedTypeNames.lf b/test/Cpp/src/target/CombinedTypeNames.lf
index 6902ef8550..f64116eb4a 100644
--- a/test/Cpp/src/target/CombinedTypeNames.lf
+++ b/test/Cpp/src/target/CombinedTypeNames.lf
@@ -8,9 +8,9 @@ reactor Foo(bar: {= unsigned int =} = 0, baz: {= const unsigned int* =} = {= nul
 
   reaction(startup) {=
     if (bar != 42 || s_bar != 42 || *baz != 42 || *s_baz != 42) {
-        reactor::log::Error() << "Unexpected value!";
-        exit(1);
-                }
+      reactor::log::Error() << "Unexpected value!";
+      exit(1);
+          }
   =}
 }
 
diff --git a/test/Cpp/src/target/InitializerSyntax.lf b/test/Cpp/src/target/InitializerSyntax.lf
index ce77868cd9..b9766dd542 100644
--- a/test/Cpp/src/target/InitializerSyntax.lf
+++ b/test/Cpp/src/target/InitializerSyntax.lf
@@ -3,30 +3,30 @@ target Cpp
 public preamble {=
   #include <initializer_list>
   struct TestType {
-      int x;
+    int x;
 
-      // constructor #1
-      TestType() : x(42) {}
-      // constructor #2
-      TestType(int x) : x(x) {}
-      // constructor #3
-      TestType(std::initializer_list<int> l) : x(l.size()) {}
-      // constructor #4
-      TestType(const TestType& t) : x(t.x + 10) { }
-      // constructor #5
-      TestType(TestType&& t) : x(t.x + 20)  { }
+    // constructor #1
+    TestType() : x(42) {}
+    // constructor #2
+    TestType(int x) : x(x) {}
+    // constructor #3
+    TestType(std::initializer_list<int> l) : x(l.size()) {}
+    // constructor #4
+    TestType(const TestType& t) : x(t.x + 10) { }
+    // constructor #5
+    TestType(TestType&& t) : x(t.x + 20)  { }
 
-      TestType& operator=(const TestType& t) {
-          std::cout << "assign\n";
-          this->x = t.x + 30;
-          return *this;
-      }
-      TestType& operator=(TestType&& t) {
-          this->x = t.x + 40;
-          return *this;
-      }
+    TestType& operator=(const TestType& t) {
+      std::cout << "assign\n";
+      this->x = t.x + 30;
+      return *this;
+    }
+    TestType& operator=(TestType&& t) {
+      this->x = t.x + 40;
+      return *this;
+    }
 
-      ~TestType() = default;
+    ~TestType() = default;
   };
 =}
 
@@ -45,17 +45,17 @@ reactor TestReactor(
     p_assign_init_empty: TestType = {},  // constructor #1
     // constructor #3
     p_assign_init_some: TestType = {4, 2, 1}) {
-  state s_default: TestType                 // constructor #1
-  state s_empty: TestType()                 // constructor #1
-  state s_value: TestType(24)               // constructor #2
-  state s_init_empty: TestType{}            // constructor #1
-  state s_init_empty2: TestType({})         // constructor #3
-  state s_init_some: TestType{3, 12, 40}    // constructor #3
+  state s_default: TestType         // constructor #1
+  state s_empty: TestType()         // constructor #1
+  state s_value: TestType(24)         // constructor #2
+  state s_init_empty: TestType{}      // constructor #1
+  state s_init_empty2: TestType({})     // constructor #3
+  state s_init_some: TestType{3, 12, 40}  // constructor #3
   state s_assign_init_empty: TestType = {}  // constructor #3
   state s_assign_init_some: TestType = {4, 3, 2, 1}  // constructor #3
-  state s_copy1: TestType(p_default)        // constructor #4
-  state s_copy2: TestType{p_default}        // constructor #4
-  state s_copy3: TestType = p_default       // constructor #4
+  state s_copy1: TestType(p_default)    // constructor #4
+  state s_copy2: TestType{p_default}    // constructor #4
+  state s_copy3: TestType = p_default     // constructor #4
 
   reaction(startup) {=
     reactor::validate(p_default.x == 62, "p_default should be default constructed and then moved");
diff --git a/test/Cpp/src/target/MultipleContainedGeneric.lf b/test/Cpp/src/target/MultipleContainedGeneric.lf
index 5a767dc3c1..da4e28081c 100644
--- a/test/Cpp/src/target/MultipleContainedGeneric.lf
+++ b/test/Cpp/src/target/MultipleContainedGeneric.lf
@@ -11,16 +11,16 @@ reactor Contained<T> {
   reaction(in1) {=
     std::cout << "in1 received " << *in1.get() << '\n';
     if (*in1.get() != 42) {
-        std::cerr << "FAILED: Expected 42.\n";
-        exit(1);
+      std::cerr << "FAILED: Expected 42.\n";
+      exit(1);
     }
   =}
 
   reaction(in2) {=
     std::cout << "in2 received " << *in2.get() << '\n';
     if (*in2.get() != 42) {
-        std::cerr << "FAILED: Expected 42.\n";
-        exit(1);
+      std::cerr << "FAILED: Expected 42.\n";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/target/PointerParameters.lf b/test/Cpp/src/target/PointerParameters.lf
index 2de286aaa4..007fb1a816 100644
--- a/test/Cpp/src/target/PointerParameters.lf
+++ b/test/Cpp/src/target/PointerParameters.lf
@@ -5,8 +5,8 @@ target Cpp
 reactor Foo(ptr: int* = {= nullptr =}) {
   reaction(startup) {=
     if (ptr == nullptr || *ptr != 42) {
-        reactor::log::Error() << "received an unexpected value!";
-        exit(1);
+      reactor::log::Error() << "received an unexpected value!";
+      exit(1);
     }
   =}
 }
diff --git a/test/Cpp/src/target/PreambleFile.lf b/test/Cpp/src/target/PreambleFile.lf
index 53f6ff49da..93678481cc 100644
--- a/test/Cpp/src/target/PreambleFile.lf
+++ b/test/Cpp/src/target/PreambleFile.lf
@@ -4,8 +4,8 @@ target Cpp
 // header. This goes to PreampleFile/preamble.hh.
 public preamble {=
   struct MyStruct {
-      int foo;
-      std::string bar;
+    int foo;
+    std::string bar;
   };
 
   int add_42(int i);
@@ -15,7 +15,7 @@ public preamble {=
 // be defined once, this needs to go to a source file. This goes to PreampleFile/preamble.cc.
 private preamble {=
   int add_42(int i) {
-      return i + 42;
+    return i + 42;
   }
 =}
 
@@ -33,7 +33,7 @@ reactor Print {
   // interface. This goes to PreambleFile/Print.cc
   private preamble {=
     void print(const MyStruct& x) {
-        std::cout << "Received " << x.foo << " and '" << x.bar << "'\n";
+      std::cout << "Received " << x.foo << " and '" << x.bar << "'\n";
     }
   =}
   input x: MyStruct
diff --git a/test/Python/src/ActionDelay.lf b/test/Python/src/ActionDelay.lf
index ba46edf9c4..0c063f6f1d 100644
--- a/test/Python/src/ActionDelay.lf
+++ b/test/Python/src/ActionDelay.lf
@@ -30,10 +30,10 @@ reactor Sink {
     physical = lf.time.physical()
     print("Logical, physical, and elapsed logical: ", logical, physical, elapsed_logical)
     if elapsed_logical != MSEC(100):
-        sys.stderr.write("FAILURE: Expected " + str(MSEC(100)) + " but got " + str(elapsed_logical) + ".\n")
-        exit(1)
+      sys.stderr.write("FAILURE: Expected " + str(MSEC(100)) + " but got " + str(elapsed_logical) + ".\n")
+      exit(1)
     else:
-        print("SUCCESS. Elapsed logical time is 100 msec.\n")
+      print("SUCCESS. Elapsed logical time is 100 msec.\n")
   =}
 }
 
diff --git a/test/Python/src/ActionIsPresent.lf b/test/Python/src/ActionIsPresent.lf
index 3bdd419700..b23328f1a8 100644
--- a/test/Python/src/ActionIsPresent.lf
+++ b/test/Python/src/ActionIsPresent.lf
@@ -9,21 +9,21 @@ main reactor ActionIsPresent(offset = 1 nsec, period = 500 msec) {
   reaction(startup, a) -> a {=
     # The is_present field should be initially False
     if a.is_present is not True:
-        if self.offset == 0:
-            print("Hello World!")
-            self.success = True
-        else:
-            a.schedule(self.offset)
-            self.first_time = False
+      if self.offset == 0:
+        print("Hello World!")
+        self.success = True
+      else:
+        a.schedule(self.offset)
+        self.first_time = False
     else:
-        print("Hello World 2!")
-        if self.first_time is not True:
-            self.success = True
+      print("Hello World 2!")
+      if self.first_time is not True:
+        self.success = True
   =}
 
   reaction(shutdown) {=
     if self.success is not True:
-        sys.stderr.write("Failed to print 'Hello World'\n")
-        exit(1)
+      sys.stderr.write("Failed to print 'Hello World'\n")
+      exit(1)
   =}
 }
diff --git a/test/Python/src/After.lf b/test/Python/src/After.lf
index d1f720ddfa..765f9ef990 100644
--- a/test/Python/src/After.lf
+++ b/test/Python/src/After.lf
@@ -21,21 +21,21 @@ reactor print {
     elapsed_time = lf.time.logical_elapsed()
     print("Result is " + str(x.value))
     if x.value != 84:
-        sys.stderr.write("ERROR: Expected result to be 84.\n")
-        exit(1)
+      sys.stderr.write("ERROR: Expected result to be 84.\n")
+      exit(1)
 
     print("Current logical time is: " + str(elapsed_time))
     print("Current physical time is: " + str(lf.time.physical_elapsed()))
     if elapsed_time != self.expected_time:
-        sys.stderr.write("ERROR: Expected logical time to be " + self.expected_time)
-        exit(2)
+      sys.stderr.write("ERROR: Expected logical time to be " + self.expected_time)
+      exit(2)
     self.expected_time += SEC(1)
   =}
 
   reaction(shutdown) {=
     if (self.received == 0):
-        sys.stderr.write("ERROR: Final reactor received no data.\n")
-        exit(3)
+      sys.stderr.write("ERROR: Final reactor received no data.\n")
+      exit(3)
   =}
 }
 
diff --git a/test/Python/src/AfterCycles.lf b/test/Python/src/AfterCycles.lf
index 38ee982c6e..4aa2ed0d39 100644
--- a/test/Python/src/AfterCycles.lf
+++ b/test/Python/src/AfterCycles.lf
@@ -29,12 +29,12 @@ main reactor AfterCycles {
     elapsed_time = lf.time.logical_elapsed()
     print("Received {:d} from worker 0 at time {:d}.".format(w0.out.value, elapsed_time))
     if elapsed_time != MSEC(10):
-        sys.stderr.write("Time should have been 10000000.\n")
-        exit(1)
+      sys.stderr.write("Time should have been 10000000.\n")
+      exit(1)
 
     if w0.out.value != 1:
-        sys.stderr.write("Value should have been 1.\n")
-        exit(4)
+      sys.stderr.write("Value should have been 1.\n")
+      exit(4)
   =}
 
   reaction(w1.out) {=
@@ -42,17 +42,17 @@ main reactor AfterCycles {
     elapsed_time = lf.time.logical_elapsed()
     print("Received {:d} from worker 1 at time {:d}.".format(w1.out.value, elapsed_time))
     if elapsed_time != MSEC(20):
-        sys.stderr.write("Time should have been 20000000.\n")
-        exit(3)
+      sys.stderr.write("Time should have been 20000000.\n")
+      exit(3)
 
     if w1.out.value != 1:
-        sys.stderr.write("Value should have been 1.\n")
-        exit(4)
+      sys.stderr.write("Value should have been 1.\n")
+      exit(4)
   =}
 
   reaction(shutdown) {=
     if self.count != 2:
-        sys.stderr.write("Top-level reactions should have been triggered but were not.\n")
-        exit(5)
+      sys.stderr.write("Top-level reactions should have been triggered but were not.\n")
+      exit(5)
   =}
 }
diff --git a/test/Python/src/AfterOverlapped.lf b/test/Python/src/AfterOverlapped.lf
index ec090046f4..f84a877e5c 100644
--- a/test/Python/src/AfterOverlapped.lf
+++ b/test/Python/src/AfterOverlapped.lf
@@ -16,21 +16,21 @@ reactor Test {
     print(f"Received {c.value}.")
     self.i += 1
     if c.value != self.i:
-        sys.stderr.write("ERROR: Expected {:d} but got {:d}\n.".format(self.i, c.value));
-        exit(1)
+      sys.stderr.write("ERROR: Expected {:d} but got {:d}\n.".format(self.i, c.value));
+      exit(1)
     elapsed_time = lf.time.logical_elapsed()
     print("Current logical time is: ", elapsed_time)
 
     expected_logical_time = SEC(2) + SEC(1)*(c.value - 1)
     if elapsed_time != expected_logical_time:
-        sys.stderr.write("ERROR: Expected logical time to be {:d} but got {:d}\n.".format(expected_logical_time, elapsed_time))
-        exit(1)
+      sys.stderr.write("ERROR: Expected logical time to be {:d} but got {:d}\n.".format(expected_logical_time, elapsed_time))
+      exit(1)
   =}
 
   reaction(shutdown) {=
     if self.received == 0:
-        sys.stderr.write("ERROR: Final reactor received no data.\n")
-        exit(3)
+      sys.stderr.write("ERROR: Final reactor received no data.\n")
+      exit(3)
   =}
 }
 
diff --git a/test/Python/src/ArrayAsParameter.lf b/test/Python/src/ArrayAsParameter.lf
index ad5fe3c15e..b794008a7c 100644
--- a/test/Python/src/ArrayAsParameter.lf
+++ b/test/Python/src/ArrayAsParameter.lf
@@ -10,7 +10,7 @@ reactor Source(sequence(0, 1, 2)) {
     out.set(self.sequence[self.count])
     self.count+=1
     if self.count < len(self.sequence):
-        next.schedule(0)
+      next.schedule(0)
   =}
 }
 
@@ -23,15 +23,15 @@ reactor Print {
     self.received+=1
     print("Received: {:d}\n".format(_in.value))
     if _in.value != self.count:
-        sys.stderr.write("ERROR: Expected {:d}.\n".format(self.count))
-        exit(1)
+      sys.stderr.write("ERROR: Expected {:d}.\n".format(self.count))
+      exit(1)
     self.count+=1
   =}
 
   reaction(shutdown) {=
     if self.received == 0:
-        sys.stderr.write("ERROR: Final reactor received no data.\n")
-        exit(3)
+      sys.stderr.write("ERROR: Final reactor received no data.\n")
+      exit(3)
   =}
 }
 
diff --git a/test/Python/src/ArrayAsType.lf b/test/Python/src/ArrayAsType.lf
index 2a12dc9db2..4a050785a3 100644
--- a/test/Python/src/ArrayAsType.lf
+++ b/test/Python/src/ArrayAsType.lf
@@ -18,8 +18,8 @@ reactor Print(scale=1) {
   reaction(_in) {=
     print("Received: [%s]" % ", ".join(map(str, _in.value)))
     if _in.value != (0, 2.8, "hello"):
-        sys.stderr.write("ERROR: Value received by Print does not match expectation!\n")
-        exit(1)
+      sys.stderr.write("ERROR: Value received by Print does not match expectation!\n")
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/ArrayFree.lf b/test/Python/src/ArrayFree.lf
index 6e41a52243..9c13409b82 100644
--- a/test/Python/src/ArrayFree.lf
+++ b/test/Python/src/ArrayFree.lf
@@ -12,7 +12,7 @@ reactor Free(scale=2) {
 
   reaction(_in) {=
     for i in range(len(_in.value)):
-        _in.value[i] *= self.scale
+      _in.value[i] *= self.scale
   =}
 }
 
diff --git a/test/Python/src/ArrayPrint.lf b/test/Python/src/ArrayPrint.lf
index 1dc8d68aee..e2df8f0db2 100644
--- a/test/Python/src/ArrayPrint.lf
+++ b/test/Python/src/ArrayPrint.lf
@@ -18,8 +18,8 @@ reactor Print(scale=1) {
   reaction(_in) {=
     print("Received: [%s]" % ", ".join(map(str, _in.value)))
     if _in.value != [x * self.scale for x in [0, 1, 2]]:
-        sys.stderr.write("ERROR: Value received by Print does not match expectation!\n")
-        exit(1)
+      sys.stderr.write("ERROR: Value received by Print does not match expectation!\n")
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/ArrayScale.lf b/test/Python/src/ArrayScale.lf
index 69e70d850d..5c5b76a979 100644
--- a/test/Python/src/ArrayScale.lf
+++ b/test/Python/src/ArrayScale.lf
@@ -11,7 +11,7 @@ reactor Scale(scale=2) {
 
   reaction(_in) -> out {=
     for i in range(len(_in.value)):
-        _in.value[i] *= self.scale
+      _in.value[i] *= self.scale
     out.set(_in.value)
   =}
 }
diff --git a/test/Python/src/CompareTags.lf b/test/Python/src/CompareTags.lf
index 462d57864e..38366d2742 100644
--- a/test/Python/src/CompareTags.lf
+++ b/test/Python/src/CompareTags.lf
@@ -13,8 +13,8 @@ main reactor CompareTags {
     tag1 = lf.tag()
     tag2 = lf.tag()
     if (lf.tag_compare(tag1, tag2) != 0 or not tag1 == tag2 or tag1 != tag2):
-        self.sys.stderr.write("Tags should be equal\n")
-        self.sys.exit(1)
+      self.sys.stderr.write("Tags should be equal\n")
+      self.sys.exit(1)
     l.schedule(0, tag1)
   =}
 
@@ -22,10 +22,10 @@ main reactor CompareTags {
     tag3 = lf.tag()
     tag1 = l.value
     if (lf.tag_compare(tag1, tag3) != -1 or not tag1 < tag3 or tag1 >= tag3):
-        self.sys.stderr.write("tag1 should be lesser than tag3\n")
-        self.sys.exit(1)
+      self.sys.stderr.write("tag1 should be lesser than tag3\n")
+      self.sys.exit(1)
     if (lf.tag_compare(tag3, tag1) != 1 or not tag3 > tag1 or tag3 <= tag1):
-        self.sys.stderr.write("tag3 should be greater than tag1\n")
-        self.sys.exit(1)
+      self.sys.stderr.write("tag3 should be greater than tag1\n")
+      self.sys.exit(1)
   =}
 }
diff --git a/test/Python/src/Composition.lf b/test/Python/src/Composition.lf
index d4b36c0a76..d0623cd1d8 100644
--- a/test/Python/src/Composition.lf
+++ b/test/Python/src/Composition.lf
@@ -25,13 +25,13 @@ reactor Test {
     self.count += 1
     print("Recieved " + str(x.value))
     if (x.value != self.count):
-        sys.stderr.write("FAILURE: Expected " + str(self.count) + "\n")
-        exit(1)
+      sys.stderr.write("FAILURE: Expected " + str(self.count) + "\n")
+      exit(1)
   =}
 
   reaction(shutdown) {=
     if(self.count == 0):
-        sys.stderr.write("FAILURE: No data received.\n")
+      sys.stderr.write("FAILURE: No data received.\n")
   =}
 }
 
diff --git a/test/Python/src/CompositionAfter.lf b/test/Python/src/CompositionAfter.lf
index 49b2f0012a..8a57038467 100644
--- a/test/Python/src/CompositionAfter.lf
+++ b/test/Python/src/CompositionAfter.lf
@@ -23,8 +23,8 @@ reactor Test {
     self.count += 1
     print("Received ", x.value)
     if x.value != self.count:
-        sys.stderr.write("FAILURE: Expected %d\n", self.count)
-        exit(1)
+      sys.stderr.write("FAILURE: Expected %d\n", self.count)
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/CompositionGain.lf b/test/Python/src/CompositionGain.lf
index e3630f3169..067d662bdf 100644
--- a/test/Python/src/CompositionGain.lf
+++ b/test/Python/src/CompositionGain.lf
@@ -27,7 +27,7 @@ main reactor {
   reaction(wrapper.y) {=
     print("Received " + str(wrapper_y.value))
     if (wrapper_y.value != 42 * 2):
-        sys.stderr.write("ERROR: Received value should have been ", str(42 * 2))
-        exit(2)
+      sys.stderr.write("ERROR: Received value should have been ", str(42 * 2))
+      exit(2)
   =}
 }
diff --git a/test/Python/src/CompositionInheritance.lf b/test/Python/src/CompositionInheritance.lf
index 8765192cc7..65abaf1059 100644
--- a/test/Python/src/CompositionInheritance.lf
+++ b/test/Python/src/CompositionInheritance.lf
@@ -35,13 +35,13 @@ reactor Test {
     self.count += 1
     print("Received ", x.value)
     if x.value != self.count:
-        sys.stderr.write("FAILURE: Expected %d\n", self.count)
-        exit(1)
+      sys.stderr.write("FAILURE: Expected %d\n", self.count)
+      exit(1)
   =}
 
   reaction(shutdown) {=
     if self.count == 0:
-        sys.stderr.write("FAILURE: No data received.\n")
+      sys.stderr.write("FAILURE: No data received.\n")
   =}
 }
 
diff --git a/test/Python/src/CountSelf.lf b/test/Python/src/CountSelf.lf
index 8fe1d4915b..c7d49f4c1b 100644
--- a/test/Python/src/CountSelf.lf
+++ b/test/Python/src/CountSelf.lf
@@ -26,8 +26,8 @@ reactor Test {
   reaction(_in) {=
     print("Received: {:d}".format(_in.value))
     if _in.value != self.count:
-        sys.stderr.write("ERROR: Expected {:d}.\n".format(self.count))
-        exit(1)
+      sys.stderr.write("ERROR: Expected {:d}.\n".format(self.count))
+      exit(1)
 
     self.count+=1
   =}
diff --git a/test/Python/src/CountTest.lf b/test/Python/src/CountTest.lf
index 6e178cbcb0..076b83f1c0 100644
--- a/test/Python/src/CountTest.lf
+++ b/test/Python/src/CountTest.lf
@@ -13,14 +13,14 @@ reactor Test {
     print("Received ", c.value)
     self.i +=1
     if c.value != self.i:
-        sys.stderr.write("ERROR: Expected {:d} but got {:d}\n.".format(self.i, c.value))
-        exit(1)
+      sys.stderr.write("ERROR: Expected {:d} but got {:d}\n.".format(self.i, c.value))
+      exit(1)
   =}
 
   reaction(shutdown) {=
     if self.i != 4:
-        sys.stderr.write("ERROR: Test should have reacted 4 times, but reacted {:d} times.\n".format(self.i))
-        exit(2)
+      sys.stderr.write("ERROR: Test should have reacted 4 times, but reacted {:d} times.\n".format(self.i))
+      exit(2)
   =}
 }
 
diff --git a/test/Python/src/Deadline.lf b/test/Python/src/Deadline.lf
index 1104c80e86..7dfde79a35 100644
--- a/test/Python/src/Deadline.lf
+++ b/test/Python/src/Deadline.lf
@@ -13,9 +13,9 @@ reactor Source(period = 3 sec) {
 
   reaction(t) -> y {=
     if self.count % 2 != 0:
-        # The count variable is odd.
-        # Take time to cause a deadline violation.
-        time.sleep(1.5)
+      # The count variable is odd.
+      # Take time to cause a deadline violation.
+      time.sleep(1.5)
 
     print("Source sends: ", self.count)
     y.set(self.count)
@@ -30,17 +30,17 @@ reactor Destination(timeout = 1 sec) {
   reaction(x) {=
     print("Destination receives: ", x.value)
     if self.count % 2 != 0:
-        # The count variable is odd, so the deadline should have been violated.
-        sys.stderr.write("ERROR: Failed to detect deadline.\n")
-        exit(1)
+      # The count variable is odd, so the deadline should have been violated.
+      sys.stderr.write("ERROR: Failed to detect deadline.\n")
+      exit(1)
 
     self.count += 1
   =} deadline(timeout) {=
     print("Destination deadline handler receives: ", x.value)
     if self.count % 2 == 0:
-        # The count variable is even, so the deadline should not have been violated.
-        sys.stderr.write("ERROR: Deadline miss handler invoked without deadline violation.\n")
-        exit(2)
+      # The count variable is even, so the deadline should not have been violated.
+      sys.stderr.write("ERROR: Deadline miss handler invoked without deadline violation.\n")
+      exit(2)
     self.count += 1
   =}
 }
diff --git a/test/Python/src/DeadlineHandledAbove.lf b/test/Python/src/DeadlineHandledAbove.lf
index 575b9df49e..80a5f847f6 100644
--- a/test/Python/src/DeadlineHandledAbove.lf
+++ b/test/Python/src/DeadlineHandledAbove.lf
@@ -28,15 +28,15 @@ main reactor DeadlineHandledAbove {
 
   reaction(d.deadline_violation) {=
     if d.deadline_violation.value is True:
-        print("Output successfully produced by deadline miss handler.")
-        self.violation_detected = True
+      print("Output successfully produced by deadline miss handler.")
+      self.violation_detected = True
   =}
 
   reaction(shutdown) {=
     if self.violation_detected is True:
-        print("SUCCESS. Test passes.")
+      print("SUCCESS. Test passes.")
     else:
-        sys.stderr.write("FAILURE. Container did not react to deadline violation.\n")
-        exit(2)
+      sys.stderr.write("FAILURE. Container did not react to deadline violation.\n")
+      exit(2)
   =}
 }
diff --git a/test/Python/src/DelayArray.lf b/test/Python/src/DelayArray.lf
index 858ebd166c..aa7e66cb6e 100644
--- a/test/Python/src/DelayArray.lf
+++ b/test/Python/src/DelayArray.lf
@@ -31,8 +31,8 @@ reactor Print(scale=1) {
   reaction(_in) {=
     print("Received: [%s]" % ", ".join(map(str, _in.value)))
     if _in.value != [x * self.scale for x in [0, 1, 2]]:
-        sys.stderr.write("ERROR: Value received by Print does not match expectation!\n")
-        exit(1)
+      sys.stderr.write("ERROR: Value received by Print does not match expectation!\n")
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/DelayArrayWithAfter.lf b/test/Python/src/DelayArrayWithAfter.lf
index 35aff98699..2437915978 100644
--- a/test/Python/src/DelayArrayWithAfter.lf
+++ b/test/Python/src/DelayArrayWithAfter.lf
@@ -29,19 +29,19 @@ reactor Print(scale=1) {
     print("At time {:d}, received list ".format(lf.time.logical_elapsed()), _in.value)
     print("Received: [%s]" % ", ".join(map(str, _in.value)))
     if _in.value != [(x * self.scale * self.iteration) for x in [1, 2, 3]]:
-        sys.stderr.write("ERROR: Value received by Print does not match expectation!\n")
-        exit(1)
+      sys.stderr.write("ERROR: Value received by Print does not match expectation!\n")
+      exit(1)
     if len(_in.value) != 3:
-        sys.stderr.write("ERROR: Received list length is not 3!\n")
-        exit(2)
+      sys.stderr.write("ERROR: Received list length is not 3!\n")
+      exit(2)
 
     self.iteration += 1
   =}
 
   reaction(shutdown) {=
     if self.inputs_received == 0:
-        sys.stderr.write("ERROR: Print reactor received no inputs.\n")
-        exit(3)
+      sys.stderr.write("ERROR: Print reactor received no inputs.\n")
+      exit(3)
   =}
 }
 
diff --git a/test/Python/src/DelayInt.lf b/test/Python/src/DelayInt.lf
index 52d78dd47e..0432a5c18a 100644
--- a/test/Python/src/DelayInt.lf
+++ b/test/Python/src/DelayInt.lf
@@ -8,7 +8,7 @@ reactor Delay(delay = 100 msec) {
 
   reaction(a) -> out {=
     if (a.value is not None) and a.is_present:
-        out.set(a.value)
+      out.set(a.value)
   =}
 
   reaction(_in) -> a {= a.schedule(self.delay, _in.value) =}
@@ -32,18 +32,18 @@ reactor Test {
     elapsed = current_time - self.start_time
     print("After {:d} nsec of logical time.\n".format(elapsed))
     if elapsed != 100000000:
-        sys.stderr.write("ERROR: Expected elapsed time to be 100000000. It was {:d}.\n".format(elapsed))
-        exit(1)
+      sys.stderr.write("ERROR: Expected elapsed time to be 100000000. It was {:d}.\n".format(elapsed))
+      exit(1)
     if _in.value != 42:
-        sys.stderr.write("ERROR: Expected input value to be 42. It was {:d}.\n".format(_in.value))
-        exit(2)
+      sys.stderr.write("ERROR: Expected input value to be 42. It was {:d}.\n".format(_in.value))
+      exit(2)
   =}
 
   reaction(shutdown) {=
     print("Checking that communication occurred.")
     if self.received_value is not True:
-        sys.stderr.write("ERROR: No communication occurred!\n")
-        exit(3)
+      sys.stderr.write("ERROR: No communication occurred!\n")
+      exit(3)
   =}
 }
 
diff --git a/test/Python/src/DelayString.lf b/test/Python/src/DelayString.lf
index e5462b60e8..1faf80e31f 100644
--- a/test/Python/src/DelayString.lf
+++ b/test/Python/src/DelayString.lf
@@ -21,11 +21,11 @@ reactor Test {
     elapsed = lf.time.logical_elapsed()
     print("After {:d} nsec of logical time.\n".format(elapsed))
     if elapsed != 100000000:
-        sys.stderr.write("ERROR: Expected elapsed time to be 100000000. It was {:d}.\n".format(elapsed))
-        exit(1)
+      sys.stderr.write("ERROR: Expected elapsed time to be 100000000. It was {:d}.\n".format(elapsed))
+      exit(1)
     if _in.value != "Hello":
-        sys.stderr.write("ERROR: Expected input value to be 'Hello'. It was '{:s}'.\n".format(_in.value))
-        exit(2)
+      sys.stderr.write("ERROR: Expected input value to be 'Hello'. It was '{:s}'.\n".format(_in.value))
+      exit(2)
   =}
 }
 
diff --git a/test/Python/src/DelayStruct.lf b/test/Python/src/DelayStruct.lf
index c71acc455a..dcf1a8be7c 100644
--- a/test/Python/src/DelayStruct.lf
+++ b/test/Python/src/DelayStruct.lf
@@ -32,8 +32,8 @@ reactor Print(expected=42) {
   reaction(_in) {=
     print("Received: name = {:s}, value = {:d}".format(_in.value.name, _in.value.value))
     if _in.value.value != self.expected:
-        sys.stderr.write("ERROR: Expected value to be {:d}.\n".format(self.expected))
-        exit(1)
+      sys.stderr.write("ERROR: Expected value to be {:d}.\n".format(self.expected))
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/DelayStructWithAfter.lf b/test/Python/src/DelayStructWithAfter.lf
index 9eed6f904c..c6f27a0775 100644
--- a/test/Python/src/DelayStructWithAfter.lf
+++ b/test/Python/src/DelayStructWithAfter.lf
@@ -18,8 +18,8 @@ reactor Print(expected=42) {
   reaction(_in) {=
     print("Received: name = {:s}, value = {:d}".format(_in.value.name, _in.value.value))
     if _in.value.value != self.expected:
-        sys.stderr.write("ERROR: Expected value to be {:d}.\n".format(self.expected))
-        exit(1)
+      sys.stderr.write("ERROR: Expected value to be {:d}.\n".format(self.expected))
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/DelayStructWithAfterOverlapped.lf b/test/Python/src/DelayStructWithAfterOverlapped.lf
index 1137efeb22..73fd60c504 100644
--- a/test/Python/src/DelayStructWithAfterOverlapped.lf
+++ b/test/Python/src/DelayStructWithAfterOverlapped.lf
@@ -27,14 +27,14 @@ reactor Print {
     self.s += 1
     print("Received: name = {:s}, value = {:d}".format(_in.value.name, _in.value.value))
     if _in.value.value != 42 * self.s:
-        sys.stderr.write("ERROR: Expected value to be {:d}.\n".format(42 * self.s))
-        exit(1)
+      sys.stderr.write("ERROR: Expected value to be {:d}.\n".format(42 * self.s))
+      exit(1)
   =}
 
   reaction(shutdown) {=
     if self.s == 0:
-        sys.stderr.write("ERROR: Print received no data.\n")
-        exit(2)
+      sys.stderr.write("ERROR: Print received no data.\n")
+      exit(2)
   =}
 }
 
diff --git a/test/Python/src/DelayedAction.lf b/test/Python/src/DelayedAction.lf
index 5bab6bc7c8..1a461eccff 100644
--- a/test/Python/src/DelayedAction.lf
+++ b/test/Python/src/DelayedAction.lf
@@ -18,7 +18,7 @@ main reactor DelayedAction {
     expected = self.count * 1000000000 + 100000000
     self.count += 1
     if elapsed != expected:
-        sys.stderr.write("Expected {:d} but got {:d}.\n".format(expected, elapsed))
-        exit(1)
+      sys.stderr.write("Expected {:d} but got {:d}.\n".format(expected, elapsed))
+      exit(1)
   =}
 }
diff --git a/test/Python/src/DelayedReaction.lf b/test/Python/src/DelayedReaction.lf
index c62b4a3857..2ebde05b5a 100644
--- a/test/Python/src/DelayedReaction.lf
+++ b/test/Python/src/DelayedReaction.lf
@@ -15,8 +15,8 @@ reactor Sink {
     elapsed = lf.time.logical_elapsed()
     print("Nanoseconds since start: ", elapsed)
     if elapsed != 100000000:
-        sys.stderr.write("ERROR: Expected 100000000 but.\n")
-        exit(1)
+      sys.stderr.write("ERROR: Expected 100000000 but.\n")
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/Determinism.lf b/test/Python/src/Determinism.lf
index fdfe446e3d..f200c141f5 100644
--- a/test/Python/src/Determinism.lf
+++ b/test/Python/src/Determinism.lf
@@ -14,13 +14,13 @@ reactor Destination {
   reaction(x, y) {=
     sm = 0
     if x.is_present:
-        sm += x.value
+      sm += x.value
     if y.is_present:
-        sm += y.value
+      sm += y.value
     print("Received ", sm);
     if sm != 2:
-        sys.stderr.write("FAILURE: Expected 2.\n")
-        exit(4)
+      sys.stderr.write("FAILURE: Expected 2.\n")
+      exit(4)
   =}
 }
 
diff --git a/test/Python/src/DoubleInvocation.lf b/test/Python/src/DoubleInvocation.lf
index 36327d815f..34ed1cf007 100644
--- a/test/Python/src/DoubleInvocation.lf
+++ b/test/Python/src/DoubleInvocation.lf
@@ -33,10 +33,10 @@ reactor Print {
 
   reaction(position, velocity) {=
     if position.is_present:
-        print("Position: ", position.value)
+      print("Position: ", position.value)
     if position.value == self.previous:
-        sys.stderr.write("ERROR: Multiple firings at the same logical time!\n")
-        exit(1)
+      sys.stderr.write("ERROR: Multiple firings at the same logical time!\n")
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/DoubleReaction.lf b/test/Python/src/DoubleReaction.lf
index b7897b77d4..c77e5b17e1 100644
--- a/test/Python/src/DoubleReaction.lf
+++ b/test/Python/src/DoubleReaction.lf
@@ -24,13 +24,13 @@ reactor Destination {
   reaction(x, w) {=
     sm = 0
     if x.is_present:
-        sm += x.value
+      sm += x.value
     if w.is_present:
-        sm += w.value
+      sm += w.value
     print("Sum of inputs is: ", sm)
     if sm != self.s:
-        sys.stderr.write("FAILURE: Expected sum to be {:d}, but it was {:d}.\n".format(self.s, sm));
-        exit(1)
+      sys.stderr.write("FAILURE: Expected sum to be {:d}, but it was {:d}.\n".format(self.s, sm));
+      exit(1)
     self.s += 2
   =}
 }
diff --git a/test/Python/src/FloatLiteral.lf b/test/Python/src/FloatLiteral.lf
index 2f029996f4..a7c86c3942 100644
--- a/test/Python/src/FloatLiteral.lf
+++ b/test/Python/src/FloatLiteral.lf
@@ -10,11 +10,11 @@ main reactor {
   reaction(startup) {=
     F = - self.N * self.charge
     if abs(F - self.expected) < abs(self.minus_epsilon):
-        print("The Faraday constant is roughly {}.".format(F))
+      print("The Faraday constant is roughly {}.".format(F))
     else:
-        sys.stderr.write("ERROR: Expected {} but got {}.".format(
-            self.expected, F
-        ))
-        exit(1)
+      sys.stderr.write("ERROR: Expected {} but got {}.".format(
+        self.expected, F
+      ))
+      exit(1)
   =}
 }
diff --git a/test/Python/src/Gain.lf b/test/Python/src/Gain.lf
index 09067e7688..34e9229748 100644
--- a/test/Python/src/Gain.lf
+++ b/test/Python/src/Gain.lf
@@ -16,15 +16,15 @@ reactor Test {
     print("Received " + str(x.value))
     self.received_value = True
     if x.value != 2:
-        sys.stderr.write("ERROR: Expected 2!")
-        exit(1)
+      sys.stderr.write("ERROR: Expected 2!")
+      exit(1)
   =}
 
   reaction(shutdown) {=
     if self.received_value is None:
-        sys.stderr.write("ERROR: No value received by Test reactor!")
+      sys.stderr.write("ERROR: No value received by Test reactor!")
     else:
-        sys.stderr.write("Test passes.")
+      sys.stderr.write("Test passes.")
   =}
 }
 
diff --git a/test/Python/src/GetMicroStep.lf b/test/Python/src/GetMicroStep.lf
index 345c953f95..b137b8cd94 100644
--- a/test/Python/src/GetMicroStep.lf
+++ b/test/Python/src/GetMicroStep.lf
@@ -14,10 +14,10 @@ main reactor GetMicroStep {
   reaction(l) -> l {=
     microstep = lf.tag().microstep
     if microstep != self.s:
-        self.sys.stderr.write(f"expected microstep {self.s}, got {microstep} instead\n")
-        self.sys.exit(1)
+      self.sys.stderr.write(f"expected microstep {self.s}, got {microstep} instead\n")
+      self.sys.exit(1)
     self.s += 1
     if self.s < 10:
-        l.schedule(0)
+      l.schedule(0)
   =}
 }
diff --git a/test/Python/src/Hello.lf b/test/Python/src/Hello.lf
index 9ed82e2003..41ed95d186 100644
--- a/test/Python/src/Hello.lf
+++ b/test/Python/src/Hello.lf
@@ -28,12 +28,12 @@ reactor Reschedule(period = 2 sec, message = "Hello Python") {
     print("***** action {:d} at time {:d}\n".format(self.count, lf.time.logical()))
     # Check if a.value is not None.
     if a.value is not None:
-        sys.stderr.write("FAILURE: Expected a.value to be None, but it exists.\n")
-        exit(2)
+      sys.stderr.write("FAILURE: Expected a.value to be None, but it exists.\n")
+      exit(2)
     tm = lf.time.logical()
     if (tm - self.previous_time) != 200000000:
-        sys.stderr.write("FAILURE: Expected 200ms of logical time to elapse but got {:d} nanoseconds.\n".format(tm - self.previous_time))
-        exit(1)
+      sys.stderr.write("FAILURE: Expected 200ms of logical time to elapse but got {:d} nanoseconds.\n".format(tm - self.previous_time))
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/HelloWorld.lf b/test/Python/src/HelloWorld.lf
index 486bea5990..20c3a4b6a7 100644
--- a/test/Python/src/HelloWorld.lf
+++ b/test/Python/src/HelloWorld.lf
@@ -13,8 +13,8 @@ reactor HelloWorld2 {
   reaction(shutdown) {=
     print("Shutdown invoked.")
     if not self.success:
-        sys.stderr.write("ERROR: startup reaction not executed.\n")
-        sys.exit(1)
+      sys.stderr.write("ERROR: startup reaction not executed.\n")
+      sys.exit(1)
   =}
 }
 
diff --git a/test/Python/src/Hierarchy.lf b/test/Python/src/Hierarchy.lf
index f8206f81db..4d92568592 100644
--- a/test/Python/src/Hierarchy.lf
+++ b/test/Python/src/Hierarchy.lf
@@ -24,8 +24,8 @@ reactor Print {
   reaction(_in) {=
     print("Received: ", _in.value)
     if _in.value != 2:
-        sys.stderr.write("Expected 2.\n")
-        exit(1)
+      sys.stderr.write("Expected 2.\n")
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/Hierarchy2.lf b/test/Python/src/Hierarchy2.lf
index cec5bf4c9f..2172396617 100644
--- a/test/Python/src/Hierarchy2.lf
+++ b/test/Python/src/Hierarchy2.lf
@@ -30,9 +30,9 @@ reactor Add {
   reaction(in1, in2) -> out {=
     result = 0
     if in1.is_present:
-        result += in1.value
+      result += in1.value
     if in2.is_present:
-        result += in2.value
+      result += in2.value
     out.set(result)
   =}
 }
@@ -44,8 +44,8 @@ reactor Print {
   reaction(_in) {=
     print("Received: ", _in.value)
     if _in.value != self.expected:
-        sys.stderr.write("Expected {:d}.\n".format(self.expected))
-        exit(1)
+      sys.stderr.write("Expected {:d}.\n".format(self.expected))
+      exit(1)
     self.expected+=1
   =}
 }
diff --git a/test/Python/src/IdentifierLength.lf b/test/Python/src/IdentifierLength.lf
index cb23bcd0fe..6eca0821e2 100644
--- a/test/Python/src/IdentifierLength.lf
+++ b/test/Python/src/IdentifierLength.lf
@@ -24,8 +24,8 @@ reactor Another_Really_Long_Name_For_A_Test_Class {
     self.count += 1
     print("Received ", x.value)
     if x.value != self.count:
-        sys.stderr.write("FAILURE: Expected {:d}.\n".format(self.count))
-        exit(1)
+      sys.stderr.write("FAILURE: Expected {:d}.\n".format(self.count))
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/ImportComposition.lf b/test/Python/src/ImportComposition.lf
index 5558db6163..cbdeeb5c6c 100644
--- a/test/Python/src/ImportComposition.lf
+++ b/test/Python/src/ImportComposition.lf
@@ -14,16 +14,16 @@ main reactor ImportComposition {
     print("Received {:d} at time {:d}".format(a.y.value, receive_time))
     self.received = True
     if receive_time != 55000000:
-        sys.stderr.write("ERROR: Received time should have been 55,000,000.\n")
-        exit(1)
+      sys.stderr.write("ERROR: Received time should have been 55,000,000.\n")
+      exit(1)
     if a.y.value != 42 * 2 * 2:
-        sys.stderr.write("ERROR: Received value should have been {:d}.\n".format(42 * 2 * 2))
-        exit(2)
+      sys.stderr.write("ERROR: Received value should have been {:d}.\n".format(42 * 2 * 2))
+      exit(2)
   =}
 
   reaction(shutdown) {=
     if self.received is not True:
-        sys.stderr.write("ERROR: Nothing received.\n");
-        exit(3)
+      sys.stderr.write("ERROR: Nothing received.\n");
+      exit(3)
   =}
 }
diff --git a/test/Python/src/ManualDelayedReaction.lf b/test/Python/src/ManualDelayedReaction.lf
index 645c58f6ea..a9863589ff 100644
--- a/test/Python/src/ManualDelayedReaction.lf
+++ b/test/Python/src/ManualDelayedReaction.lf
@@ -37,8 +37,8 @@ reactor Sink {
     physical = lf.time.physical()
     print("Nanoseconds since start: {:d} {:d} {:d}.\n".format(logical, physical, elapsed_logical))
     if elapsed_logical < MSEC(100):
-        sys.stderr.write("Expected {:d} but got {:d}.\n".format(MSEC(100), elapsed_logical))
-        exit(1)
+      sys.stderr.write("Expected {:d} but got {:d}.\n".format(MSEC(100), elapsed_logical))
+      exit(1)
   =} deadline(200 msec) {=  =}
 }
 
diff --git a/test/Python/src/Methods.lf b/test/Python/src/Methods.lf
index 54bdacc825..ad158e72b3 100644
--- a/test/Python/src/Methods.lf
+++ b/test/Python/src/Methods.lf
@@ -11,14 +11,14 @@ main reactor {
   reaction(startup) {=
     print(f"Foo is initialized to {self.getFoo()}")
     if self.getFoo() != 2:
-        sys.stderr.write("Expected 2!");
-        exit(1)
+      sys.stderr.write("Expected 2!");
+      exit(1)
 
     self.add(40)
     a = self.getFoo()
     print(f"2 + 40 = {a}")
     if a != 42:
-        sys.stderr.write("Expected 42!");
-        exit(1)
+      sys.stderr.write("Expected 42!");
+      exit(1)
   =}
 }
diff --git a/test/Python/src/MethodsRecursive.lf b/test/Python/src/MethodsRecursive.lf
index bc3cedb8cd..cc6a9ccb85 100644
--- a/test/Python/src/MethodsRecursive.lf
+++ b/test/Python/src/MethodsRecursive.lf
@@ -7,7 +7,7 @@ main reactor {
   # Return the n-th Fibonacci number.
   method fib(n) {=
     if n <= 1:
-        return 1
+      return 1
     return self.add(self.fib(n-1), self.fib(n-2))
   =}
 
@@ -15,6 +15,6 @@ main reactor {
 
   reaction(startup) {=
     for n in range(1, 10):
-        print(f"{n}-th Fibonacci number is {self.fib(n)}")
+      print(f"{n}-th Fibonacci number is {self.fib(n)}")
   =}
 }
diff --git a/test/Python/src/MethodsSameName.lf b/test/Python/src/MethodsSameName.lf
index aedf19bef0..e842912e84 100644
--- a/test/Python/src/MethodsSameName.lf
+++ b/test/Python/src/MethodsSameName.lf
@@ -10,8 +10,8 @@ reactor Foo {
     self.add(40)
     print(f"Foo: 2 + 40 = {self.foo}")
     if self.foo != 42:
-        sys.stderr.write("Expected 42!")
-        exit(1)
+      sys.stderr.write("Expected 42!")
+      exit(1)
   =}
 }
 
@@ -26,7 +26,7 @@ main reactor {
     self.add(40)
     print(f"Main: 2 + 40 = {self.foo}")
     if self.foo != 42:
-        sys.stderr.write("Expected 42!")
-        exit(1)
+      sys.stderr.write("Expected 42!")
+      exit(1)
   =}
 }
diff --git a/test/Python/src/Microsteps.lf b/test/Python/src/Microsteps.lf
index 3913cc9c4b..871ad321bc 100644
--- a/test/Python/src/Microsteps.lf
+++ b/test/Python/src/Microsteps.lf
@@ -8,18 +8,18 @@ reactor Destination {
     elapsed = lf.time.logical_elapsed()
     print("Time since start: ", elapsed)
     if elapsed != 0:
-        sys.stderr.write("Expected elapsed time to be 0, but it was {:d}.".format(elapsed))
-        exit(1)
+      sys.stderr.write("Expected elapsed time to be 0, but it was {:d}.".format(elapsed))
+      exit(1)
     count = 0
     if x.is_present:
-        print("x is present.")
-        count += 1
+      print("x is present.")
+      count += 1
     if y.is_present:
-        print("y is present.")
-        count += 1
+      print("y is present.")
+      count += 1
     if count != 1:
-        sys.stderr.write("Expected exactly one input to be present but got {:d}.".format(count))
-        exit(1)
+      sys.stderr.write("Expected exactly one input to be present but got {:d}.".format(count))
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/MovingAverage.lf b/test/Python/src/MovingAverage.lf
index efaff22c10..c4afbd4af0 100644
--- a/test/Python/src/MovingAverage.lf
+++ b/test/Python/src/MovingAverage.lf
@@ -37,7 +37,7 @@ reactor MovingAverageImpl {
     # Update the index for the next input.
     self.index +=1
     if self.index >= 3:
-        self.index = 0
+      self.index = 0
   =}
 }
 
diff --git a/test/Python/src/MultipleContained.lf b/test/Python/src/MultipleContained.lf
index 515962986f..8d0afa0a12 100644
--- a/test/Python/src/MultipleContained.lf
+++ b/test/Python/src/MultipleContained.lf
@@ -12,23 +12,23 @@ reactor Contained {
   reaction(in1) {=
     print("in1 received ", in1.value);
     if in1.value != 42:
-        sys.stderr.write("FAILED: Expected 42.\n")
-        exit(1)
+      sys.stderr.write("FAILED: Expected 42.\n")
+      exit(1)
     self.count += 1
   =}
 
   reaction(in2) {=
     print("in2 received ", in2.value)
     if in2.value != 42:
-        sys.stderr.write("FAILED: Expected 42.\n")
-        exit(1)
+      sys.stderr.write("FAILED: Expected 42.\n")
+      exit(1)
     self.count += 1
   =}
 
   reaction(shutdown) {=
     if self.count != 2:
-        sys.stderr.write("FAILED: Should have received two inputs.\n")
-        exit(1)
+      sys.stderr.write("FAILED: Should have received two inputs.\n")
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/NativeListsAndTimes.lf b/test/Python/src/NativeListsAndTimes.lf
index 8a5de9d148..0ed485119c 100644
--- a/test/Python/src/NativeListsAndTimes.lf
+++ b/test/Python/src/NativeListsAndTimes.lf
@@ -3,20 +3,20 @@ target Python
 # This test passes if it is successfully compiled into valid target code.
 main reactor(
     x=0,
-    y=0,               # Units are missing but not required
-    z = 1 msec,        # Type is missing but not required
-    p(1, 2, 3, 4),     # List of integers
+    y=0,         # Units are missing but not required
+    z = 1 msec,    # Type is missing but not required
+    p(1, 2, 3, 4),   # List of integers
     q(1 msec, 2 msec, 3 msec),  # list of time values
     # List of time values
     g(1 msec, 2 msec)) {
-  state s = y        # Reference to explicitly typed time parameter
-  state t = z        # Reference to implicitly typed time parameter
-  state v            # Uninitialized boolean state variable
-  state w            # Uninitialized time state variable
-  timer tick(0)      # Units missing but not required
+  state s = y    # Reference to explicitly typed time parameter
+  state t = z    # Reference to implicitly typed time parameter
+  state v      # Uninitialized boolean state variable
+  state w      # Uninitialized time state variable
+  timer tick(0)    # Units missing but not required
   timer tock(1 sec)  # Implicit type time
-  timer toe(z)       # Implicit type time
-  state baz = p      # Implicit type int[]
+  timer toe(z)     # Implicit type time
+  state baz = p    # Implicit type int[]
   state period = z   # Implicit type time
   state bar(1 msec, 2 msec, 3 msec)  # list of time values
   state notype(1, 2, 3, 4)
diff --git a/test/Python/src/PeriodicDesugared.lf b/test/Python/src/PeriodicDesugared.lf
index a0b2828cd3..3715a15c7e 100644
--- a/test/Python/src/PeriodicDesugared.lf
+++ b/test/Python/src/PeriodicDesugared.lf
@@ -9,10 +9,10 @@ main reactor(offset=0, period = 500 msec) {
 
   reaction(startup) -> init, recur {=
     if self.offset == 0:
-        print("Hello World!")
-        recur.schedule(0)
+      print("Hello World!")
+      recur.schedule(0)
     else:
-        init.schedule(0)
+      init.schedule(0)
   =}
 
   reaction(init, recur) -> recur {=
diff --git a/test/Python/src/PingPong.lf b/test/Python/src/PingPong.lf
index 7688ccf19e..329401e925 100644
--- a/test/Python/src/PingPong.lf
+++ b/test/Python/src/PingPong.lf
@@ -34,9 +34,9 @@ reactor Ping(count=10) {
 
   reaction(receive) -> serve {=
     if self.pingsLeft > 0:
-        serve.schedule(0)
+      serve.schedule(0)
     else:
-        request_stop()
+      request_stop()
   =}
 }
 
@@ -52,13 +52,13 @@ reactor Pong(expected=10) {
 
   reaction(shutdown) {=
     if self.count != self.expected:
-        sys.stderr.write(
-            "ERROR: Pong expected to receive {} inputs, but it received {}.\n".format(
-                self.expected,
-                self.count
-            )
+      sys.stderr.write(
+        "ERROR: Pong expected to receive {} inputs, but it received {}.\n".format(
+          self.expected,
+          self.count
         )
-        sys.exit(1)
+      )
+      sys.exit(1)
     print("Success.")
   =}
 }
diff --git a/test/Python/src/Pipeline.lf b/test/Python/src/Pipeline.lf
index fb72fd1026..eb9703e4cc 100644
--- a/test/Python/src/Pipeline.lf
+++ b/test/Python/src/Pipeline.lf
@@ -9,7 +9,7 @@ reactor TakeTime {
   reaction(_in) -> out {=
     offset = 0
     for i in range(10000):
-        offset+=1
+      offset+=1
 
     out.set(_in.value + offset)
   =}
@@ -24,15 +24,15 @@ reactor Print {
     self.received += 1
     print("Received: {:d} at logical time {:d}".format(_in.value, lf.time.logical_elapsed()))
     if _in.value != (self.count + 40000):
-        sys.stderr.write("ERROR: Expected {:d}.\n".format(self.count + 40000))
-        exit(1)
+      sys.stderr.write("ERROR: Expected {:d}.\n".format(self.count + 40000))
+      exit(1)
     self.count+=1
   =}
 
   reaction(shutdown) {=
     if self.received == 0:
-        sys.stderr.write("ERROR: Final reactor received no data.\n")
-        exit(3)
+      sys.stderr.write("ERROR: Final reactor received no data.\n")
+      exit(3)
   =}
 }
 
diff --git a/test/Python/src/Preamble.lf b/test/Python/src/Preamble.lf
index 6cbd9d9299..ab89a51e53 100644
--- a/test/Python/src/Preamble.lf
+++ b/test/Python/src/Preamble.lf
@@ -9,7 +9,7 @@ main reactor Preamble {
   preamble {=
     import platform
     def add_42(self, i):
-        return i + 42
+      return i + 42
   =}
   timer t
 
diff --git a/test/Python/src/ReadOutputOfContainedReactor.lf b/test/Python/src/ReadOutputOfContainedReactor.lf
index c67243b0d5..0a086c9514 100644
--- a/test/Python/src/ReadOutputOfContainedReactor.lf
+++ b/test/Python/src/ReadOutputOfContainedReactor.lf
@@ -14,32 +14,32 @@ main reactor ReadOutputOfContainedReactor {
   reaction(startup) c.out {=
     print("Startup reaction reading output of contained reactor: ", c.out.value)
     if c.out.value != 42:
-        sys.stderr.write("Expected 42!\n")
-        exit(2)
+      sys.stderr.write("Expected 42!\n")
+      exit(2)
     self.count += 1
   =}
 
   reaction(c.out) {=
     print("Reading output of contained reactor:", c.out.value)
     if c.out.value != 42:
-        sys.stderr.write("Expected 42!\n")
-        exit(3)
+      sys.stderr.write("Expected 42!\n")
+      exit(3)
     self.count += 1
   =}
 
   reaction(startup, c.out) {=
     print("Alternate triggering reading output of contained reactor: ", c.out.value)
     if c.out.value != 42:
-        sys.stderr.write("Expected 42!\n")
-        exit(4)
+      sys.stderr.write("Expected 42!\n")
+      exit(4)
     self.count += 1
   =}
 
   reaction(shutdown) {=
     if self.count != 3:
-        print("FAILURE: One of the reactions failed to trigger.\n")
-        exit(1)
+      print("FAILURE: One of the reactions failed to trigger.\n")
+      exit(1)
     else:
-        print("Test passes.")
+      print("Test passes.")
   =}
 }
diff --git a/test/Python/src/Schedule.lf b/test/Python/src/Schedule.lf
index b79a7298bd..5d42888c2e 100644
--- a/test/Python/src/Schedule.lf
+++ b/test/Python/src/Schedule.lf
@@ -11,8 +11,8 @@ reactor Schedule2 {
     elapsed_time = lf.time.logical_elapsed()
     print("Action triggered at logical time {:d} nsec after start.".format(elapsed_time))
     if elapsed_time != 200000000:
-        sys.stderr.write("Expected action time to be 200 msec. It was {:d} nsec.\n".format(elapsed_time))
-        exit(1)
+      sys.stderr.write("Expected action time to be 200 msec. It was {:d} nsec.\n".format(elapsed_time))
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/ScheduleLogicalAction.lf b/test/Python/src/ScheduleLogicalAction.lf
index c1328ee85e..37eeb8ab6d 100644
--- a/test/Python/src/ScheduleLogicalAction.lf
+++ b/test/Python/src/ScheduleLogicalAction.lf
@@ -29,8 +29,8 @@ reactor print {
     print("Current logical time is: ", elapsed_time)
     print("Current physical time is: ", lf.time.physical_elapsed())
     if elapsed_time != self.expected_time:
-        sys.stderr.write("ERROR: Expected logical time to be {:d}.\n".format(self.expected_time))
-        exit(1);
+      sys.stderr.write("ERROR: Expected logical time to be {:d}.\n".format(self.expected_time))
+      exit(1);
     self.expected_time += MSEC(500)
   =}
 }
diff --git a/test/Python/src/ScheduleValue.lf b/test/Python/src/ScheduleValue.lf
index 02fb0a3b1f..3f1794eec3 100644
--- a/test/Python/src/ScheduleValue.lf
+++ b/test/Python/src/ScheduleValue.lf
@@ -14,7 +14,7 @@ main reactor ScheduleValue {
   reaction(a) {=
     print("Received: ", a.value)
     if a.value != "Hello":
-        sys.stderr.write("FAILURE: Should have received 'Hello'\n")
-        exit(1)
+      sys.stderr.write("FAILURE: Should have received 'Hello'\n")
+      exit(1)
   =}
 }
diff --git a/test/Python/src/SelfLoop.lf b/test/Python/src/SelfLoop.lf
index f4fd756bb2..6362c77373 100644
--- a/test/Python/src/SelfLoop.lf
+++ b/test/Python/src/SelfLoop.lf
@@ -17,8 +17,8 @@ reactor Self {
   reaction(x) -> a {=
     print("x = ", x.value)
     if x.value != self.expected:
-        sys.stderr.write("Expected {:d}.\n".format(self.expected))
-        exit(1)
+      sys.stderr.write("Expected {:d}.\n".format(self.expected))
+      exit(1)
     self.expected += 1
     a.schedule(MSEC(100), x.value)
   =}
@@ -27,8 +27,8 @@ reactor Self {
 
   reaction(shutdown) {=
     if self.expected <= 43:
-        sys.stderr.write("Received no data.\n")
-        exit(2)
+      sys.stderr.write("Received no data.\n")
+      exit(2)
   =}
 }
 
diff --git a/test/Python/src/SendingInside.lf b/test/Python/src/SendingInside.lf
index 0edc80bf73..4854e2d040 100644
--- a/test/Python/src/SendingInside.lf
+++ b/test/Python/src/SendingInside.lf
@@ -12,8 +12,8 @@ reactor Printer {
   reaction(x) {=
     print("Inside reactor received: ", x.value)
     if x.value != self.count:
-        sys.stderr.write("FAILURE: Expected {:d}.\n".format(self.count))
-        exit(1)
+      sys.stderr.write("FAILURE: Expected {:d}.\n".format(self.count))
+      exit(1)
     self.count += 1
   =}
 }
diff --git a/test/Python/src/SendingInside2.lf b/test/Python/src/SendingInside2.lf
index cdf99e6a2d..8ceb1ba5cc 100644
--- a/test/Python/src/SendingInside2.lf
+++ b/test/Python/src/SendingInside2.lf
@@ -6,8 +6,8 @@ reactor Printer {
   reaction(x) {=
     print("Inside reactor received: ", x.value)
     if x.value != 1:
-        sys.stderr.write("ERROR: Expected 1.\n")
-        exit(1)
+      sys.stderr.write("ERROR: Expected 1.\n")
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/SetArray.lf b/test/Python/src/SetArray.lf
index d3a25da17e..931260ab9b 100644
--- a/test/Python/src/SetArray.lf
+++ b/test/Python/src/SetArray.lf
@@ -15,8 +15,8 @@ reactor Print(scale=1) {
   reaction(_in) {=
     print("Recieved ", _in.value)
     if _in.value != [self.scale*count for count in range(len(_in.value))]:
-        sys.stderr.write("ERROR: Value received by Print does not match expectation!\n")
-        exit(1)
+      sys.stderr.write("ERROR: Value received by Print does not match expectation!\n")
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/SimpleDeadline.lf b/test/Python/src/SimpleDeadline.lf
index 1a9d42f48d..2b6adbf942 100644
--- a/test/Python/src/SimpleDeadline.lf
+++ b/test/Python/src/SimpleDeadline.lf
@@ -20,7 +20,7 @@ reactor Print {
 
   reaction(_in) {=
     if _in.value is True:
-        print("Output successfully produced by deadline handler.")
+      print("Output successfully produced by deadline handler.")
   =}
 }
 
diff --git a/test/Python/src/SlowingClock.lf b/test/Python/src/SlowingClock.lf
index b53c59d713..8298135c62 100644
--- a/test/Python/src/SlowingClock.lf
+++ b/test/Python/src/SlowingClock.lf
@@ -19,8 +19,8 @@ main reactor SlowingClock {
     elapsed_logical_time = lf.time.logical_elapsed()
     print("Logical time since start: {:d} nsec.\n".format(elapsed_logical_time))
     if elapsed_logical_time != self.expected_time:
-        sys.stderr.write("ERROR: Expected time to be: {:d} nsec.\n".format(self.expected_time))
-        exit(1)
+      sys.stderr.write("ERROR: Expected time to be: {:d} nsec.\n".format(self.expected_time))
+      exit(1)
 
     a.schedule(self.interval)
     self.expected_time += MSEC(100) + self.interval
@@ -29,10 +29,10 @@ main reactor SlowingClock {
 
   reaction(shutdown) {=
     if self.expected_time != MSEC(1500):
-        sys.stderr.write("ERROR: Expected the next expected time to be: 1500000000 nsec.\n")
-        sys.stderr.write("It was: {:d} nsec.\n".format(self.expected_time))
-        exit(2)
+      sys.stderr.write("ERROR: Expected the next expected time to be: 1500000000 nsec.\n")
+      sys.stderr.write("It was: {:d} nsec.\n".format(self.expected_time))
+      exit(2)
     else:
-        print("Test passes.")
+      print("Test passes.")
   =}
 }
diff --git a/test/Python/src/SlowingClockPhysical.lf b/test/Python/src/SlowingClockPhysical.lf
index 39d75b4c6d..a105aca99d 100644
--- a/test/Python/src/SlowingClockPhysical.lf
+++ b/test/Python/src/SlowingClockPhysical.lf
@@ -24,8 +24,8 @@ main reactor SlowingClockPhysical {
     elapsed_logical_time = lf.time.logical_elapsed()
     print("Logical time since start: {:d} nsec.".format(elapsed_logical_time))
     if elapsed_logical_time < self.expected_time:
-        sys.stderr.write("ERROR: Expected logical time to be at least: {:d} nsec.\n".format(self.expected_time))
-        exit(1)
+      sys.stderr.write("ERROR: Expected logical time to be at least: {:d} nsec.\n".format(self.expected_time))
+      exit(1)
     self.interval += MSEC(100)
     self.expected_time = MSEC(100) + self.interval
     a.schedule(self.interval)
@@ -34,9 +34,9 @@ main reactor SlowingClockPhysical {
 
   reaction(shutdown) {=
     if self.expected_time < MSEC(500):
-        sys.stderr.write("ERROR: Expected the next expected time to be at least: 500000000 nsec.\n");
-        sys.stderr.write("It was: {:d} nsec.\n".format(self.expected_time))
-        exit(2)
+      sys.stderr.write("ERROR: Expected the next expected time to be at least: 500000000 nsec.\n");
+      sys.stderr.write("It was: {:d} nsec.\n".format(self.expected_time))
+      exit(2)
     print("Success")
   =}
 }
diff --git a/test/Python/src/StartupOutFromInside.lf b/test/Python/src/StartupOutFromInside.lf
index eff09b1a77..ce2025278f 100644
--- a/test/Python/src/StartupOutFromInside.lf
+++ b/test/Python/src/StartupOutFromInside.lf
@@ -12,7 +12,7 @@ main reactor StartupOutFromInside {
   reaction(startup) bar.out {=
     print("Output from bar: ", bar.out.value)
     if bar.out.value != 42:
-        sys.stderr.write("Expected 42!\n")
-        exit(1)
+      sys.stderr.write("Expected 42!\n")
+      exit(1)
   =}
 }
diff --git a/test/Python/src/Stride.lf b/test/Python/src/Stride.lf
index 7572ea17aa..6d845e7251 100644
--- a/test/Python/src/Stride.lf
+++ b/test/Python/src/Stride.lf
@@ -23,7 +23,7 @@ reactor Display {
   reaction(x) {=
     print("Received: ", x.value)
     if x.value != self.expected:
-        sys.stderr.write("ERROR: Expected {:d}.\n".format(self.expected))
+      sys.stderr.write("ERROR: Expected {:d}.\n".format(self.expected))
     self.expected += 2
   =}
 }
diff --git a/test/Python/src/StructAsState.lf b/test/Python/src/StructAsState.lf
index f7d725325d..0cc8e2d9b6 100644
--- a/test/Python/src/StructAsState.lf
+++ b/test/Python/src/StructAsState.lf
@@ -4,16 +4,16 @@ target Python
 main reactor StructAsState {
   preamble {=
     class hello:
-        def __init__(self, name, value):
-            self.name = name
-            self.value = value
+      def __init__(self, name, value):
+        self.name = name
+        self.value = value
   =}
   state s = {= self.hello("Earth", 42) =}
 
   reaction(startup) {=
     print("State s.name=\"{:s}\", value={:d}.".format(self.s.name, self.s.value))
     if self.s.value != 42:
-        sys.stderr.write("FAILED: Expected 42.\n")
-        exit(1)
+      sys.stderr.write("FAILED: Expected 42.\n")
+      exit(1)
   =}
 }
diff --git a/test/Python/src/StructAsType.lf b/test/Python/src/StructAsType.lf
index d64690aa87..e1b089df5b 100644
--- a/test/Python/src/StructAsType.lf
+++ b/test/Python/src/StructAsType.lf
@@ -20,8 +20,8 @@ reactor Print(expected=42) {
   reaction(_in) {=
     print("Received: name = {:s}, value = {:d}\n".format(_in.value.name, _in.value.value))
     if _in.value.value != self.expected:
-        sys.stderr.write("ERROR: Expected value to be {:d}.\n".format(self.expected))
-        exit(1)
+      sys.stderr.write("ERROR: Expected value to be {:d}.\n".format(self.expected))
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/StructAsTypeDirect.lf b/test/Python/src/StructAsTypeDirect.lf
index b668e5ba65..132ef78948 100644
--- a/test/Python/src/StructAsTypeDirect.lf
+++ b/test/Python/src/StructAsTypeDirect.lf
@@ -23,8 +23,8 @@ reactor Print(expected=42) {
   reaction(_in) {=
     print("Received: name = {:s}, value = {:d}".format(_in.value.name, _in.value.value))
     if _in.value.value != self.expected:
-        sys.stderr.write("ERROR: Expected value to be {:d}.\n".format(self.expected))
-        exit(1)
+      sys.stderr.write("ERROR: Expected value to be {:d}.\n".format(self.expected))
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/StructParallel.lf b/test/Python/src/StructParallel.lf
index 6721e4ae11..4e2024d99e 100644
--- a/test/Python/src/StructParallel.lf
+++ b/test/Python/src/StructParallel.lf
@@ -14,8 +14,8 @@ reactor Check(expected=42) {
   reaction(_in) {=
     print("Received: name = {:s}, value = {:d}".format(_in.value.name, _in.value.value))
     if _in.value.value != self.expected:
-        sys.stderr.write("ERROR: Expected value to be {:d}.\n".format(self.expected))
-        exit(1)
+      sys.stderr.write("ERROR: Expected value to be {:d}.\n".format(self.expected))
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/StructPrint.lf b/test/Python/src/StructPrint.lf
index 897ac6567c..968a3e9d27 100644
--- a/test/Python/src/StructPrint.lf
+++ b/test/Python/src/StructPrint.lf
@@ -19,8 +19,8 @@ reactor Check(expected=42) {
   reaction(_in) {=
     print("Received: name = {:s}, value = {:d}\n".format(_in.value.name, _in.value.value))
     if _in.value.value != self.expected:
-        sys.stderr.write("ERROR: Expected value to be {:d}.\n".format(self.expected))
-        exit(1)
+      sys.stderr.write("ERROR: Expected value to be {:d}.\n".format(self.expected))
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/StructScale.lf b/test/Python/src/StructScale.lf
index c0e2cca854..f2ec9162d4 100644
--- a/test/Python/src/StructScale.lf
+++ b/test/Python/src/StructScale.lf
@@ -19,8 +19,8 @@ reactor TestInput(expected=42) {
   reaction(_in) {=
     print("Received: name = {:s}, value = {:d}\n".format(_in.value.name, _in.value.value))
     if _in.value.value != self.expected:
-        sys.stderr.write("ERROR: Expected value to be {:d}.\n".format(self.expected))
-        exit(1)
+      sys.stderr.write("ERROR: Expected value to be {:d}.\n".format(self.expected))
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/SubclassesAndStartup.lf b/test/Python/src/SubclassesAndStartup.lf
index 5b53878e9d..67e9348363 100644
--- a/test/Python/src/SubclassesAndStartup.lf
+++ b/test/Python/src/SubclassesAndStartup.lf
@@ -10,8 +10,8 @@ reactor Super {
 
   reaction(shutdown) {=
     if self.count == 0:
-        sys.stderr.write("No startup reaction was invoked!\n")
-        exit(3)
+      sys.stderr.write("No startup reaction was invoked!\n")
+      exit(3)
   =}
 }
 
@@ -19,8 +19,8 @@ reactor SubA(name="SubA") extends Super {
   reaction(startup) {=
     print("{:s} started".format(self.name))
     if self.count == 0:
-        sys.stderr.write("Base class startup reaction was not invoked!\n")
-        exit(1)
+      sys.stderr.write("Base class startup reaction was not invoked!\n")
+      exit(1)
   =}
 }
 
@@ -28,8 +28,8 @@ reactor SubB(name="SubB") extends Super {
   reaction(startup) {=
     print("{:s} started".format(self.name))
     if self.count == 0:
-        sys.stderr.write("Base class startup reaction was not invoked!\n")
-        exit(2)
+      sys.stderr.write("Base class startup reaction was not invoked!\n")
+      exit(2)
   =}
 }
 
diff --git a/test/Python/src/TestForPreviousOutput.lf b/test/Python/src/TestForPreviousOutput.lf
index d2a0661768..7f10c13482 100644
--- a/test/Python/src/TestForPreviousOutput.lf
+++ b/test/Python/src/TestForPreviousOutput.lf
@@ -11,14 +11,14 @@ reactor Source {
     self.random.seed()
     # Randomly produce an output or not.
     if self.random.choice([0,1]) == 1:
-        out.set(21)
+      out.set(21)
   =}
 
   reaction(startup) -> out {=
     if out.is_present:
-        out.set(2 * out.value)
+      out.set(2 * out.value)
     else:
-        out.set(42)
+      out.set(42)
   =}
 }
 
@@ -28,8 +28,8 @@ reactor Sink {
   reaction(_in) {=
     print("Received ", _in.value)
     if _in.value != 42:
-        sys.stderr.write("FAILED: Expected 42.\n")
-        exit(1)
+      sys.stderr.write("FAILED: Expected 42.\n")
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/TimeLimit.lf b/test/Python/src/TimeLimit.lf
index 29f5a16a2d..64c5fa6a71 100644
--- a/test/Python/src/TimeLimit.lf
+++ b/test/Python/src/TimeLimit.lf
@@ -23,16 +23,16 @@ reactor Destination {
   reaction(x) {=
     # print(x.value)
     if x.value != self.s:
-        sys.stderr.write("ERROR: Expected {:d} and got {:d}.\n".format(self.s, x.value))
-        exit(1)
+      sys.stderr.write("ERROR: Expected {:d} and got {:d}.\n".format(self.s, x.value))
+      exit(1)
     self.s += 1
   =}
 
   reaction(shutdown) {=
     print("**** shutdown reaction invoked.")
     if self.s != 12:
-        sys.stderr.write("ERROR: Expected 12 but got {:d}.\n".format(self.s))
-        exit(1)
+      sys.stderr.write("ERROR: Expected 12 but got {:d}.\n".format(self.s))
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/Timers.lf b/test/Python/src/Timers.lf
index fb533ee3f6..88a10bb367 100644
--- a/test/Python/src/Timers.lf
+++ b/test/Python/src/Timers.lf
@@ -14,8 +14,8 @@ main reactor {
 
   reaction(shutdown) {=
     if self.counter != 1:
-        sys.stderr.write("Error: Expected {:d} and got {:d}.\n".format(1, self.counter))
-        exit(1)
+      sys.stderr.write("Error: Expected {:d} and got {:d}.\n".format(1, self.counter))
+      exit(1)
     print("SUCCESS.")
   =}
 }
diff --git a/test/Python/src/TriggerDownstreamOnlyIfPresent.lf b/test/Python/src/TriggerDownstreamOnlyIfPresent.lf
index 6f7fdcc8bf..153ad06834 100644
--- a/test/Python/src/TriggerDownstreamOnlyIfPresent.lf
+++ b/test/Python/src/TriggerDownstreamOnlyIfPresent.lf
@@ -12,9 +12,9 @@ reactor Source {
 
   reaction(t) -> a, b {=
     if (self.count % 2) == 0:
-        a.set(self.count)
+      a.set(self.count)
     else:
-        b.set(self.count)
+      b.set(self.count)
   =}
 }
 
@@ -24,14 +24,14 @@ reactor Destination {
 
   reaction(a) {=
     if a.is_present is not True:
-        sys.stderr.write("Reaction to a triggered even though all inputs are absent!\n")
-        exit(1)
+      sys.stderr.write("Reaction to a triggered even though all inputs are absent!\n")
+      exit(1)
   =}
 
   reaction(b) {=
     if b.is_present is not True:
-        sys.stderr.write("Reaction to b triggered even though all inputs are absent!\n")
-        exit(2)
+      sys.stderr.write("Reaction to b triggered even though all inputs are absent!\n")
+      exit(2)
   =}
 }
 
diff --git a/test/Python/src/TriggerDownstreamOnlyIfPresent2.lf b/test/Python/src/TriggerDownstreamOnlyIfPresent2.lf
index 2975045571..4bcba7d298 100644
--- a/test/Python/src/TriggerDownstreamOnlyIfPresent2.lf
+++ b/test/Python/src/TriggerDownstreamOnlyIfPresent2.lf
@@ -11,10 +11,10 @@ reactor Source {
 
   reaction(t) -> out {=
     if (self.count % 2) == 0:
-        self.count += 1
-        out[0].set(self.count)
+      self.count += 1
+      out[0].set(self.count)
     else:
-        out[1].set(self.count)
+      out[1].set(self.count)
   =}
 }
 
@@ -23,8 +23,8 @@ reactor Destination {
 
   reaction(_in) {=
     if _in.is_present is not True:
-        sys.stderr.write("Reaction to input of triggered even though all inputs are absent!\n")
-        exit(1)
+      sys.stderr.write("Reaction to input of triggered even though all inputs are absent!\n")
+      exit(1)
   =}
 
   reaction(shutdown) {= print("SUCCESS.") =}
diff --git a/test/Python/src/UnconnectedInput.lf b/test/Python/src/UnconnectedInput.lf
index f518731c20..c64a24f99a 100644
--- a/test/Python/src/UnconnectedInput.lf
+++ b/test/Python/src/UnconnectedInput.lf
@@ -23,9 +23,9 @@ reactor Add {
   reaction(in1, in2) -> out {=
     result = 0
     if in1.is_present:
-        result += in1.value
+      result += in1.value
     if in2.is_present:
-        result += in2.value
+      result += in2.value
     out.set(result)
   =}
 }
@@ -37,8 +37,8 @@ reactor Print {
   reaction(_in) {=
     print("Received: ", _in.value)
     if _in.value != self.expected:
-        sys.stderr.write("ERROR: Expected {:d}.\n".format(self.expected))
-        exit(1)
+      sys.stderr.write("ERROR: Expected {:d}.\n".format(self.expected))
+      exit(1)
 
     self.expected +=1
   =}
diff --git a/test/Python/src/Wcet.lf b/test/Python/src/Wcet.lf
index 57216ca078..d1a3e41e18 100644
--- a/test/Python/src/Wcet.lf
+++ b/test/Python/src/Wcet.lf
@@ -20,9 +20,9 @@ reactor Work {
   reaction(in1, in2) -> out {=
     ret = 0
     if in1.value > 10:
-        ret = in2.value * in1.value
+      ret = in2.value * in1.value
     else:
-        ret = in2.value + in1.value
+      ret = in2.value + in1.value
     out.set(ret)
   =}
 }
diff --git a/test/Python/src/concurrent/AsyncCallback.lf b/test/Python/src/concurrent/AsyncCallback.lf
index bc61fb8c53..bf3e4f5eaa 100644
--- a/test/Python/src/concurrent/AsyncCallback.lf
+++ b/test/Python/src/concurrent/AsyncCallback.lf
@@ -13,20 +13,20 @@ main reactor AsyncCallback {
     import threading
 
     def callback(self, a):
-        # Schedule twice. If the action is not physical, these should
-        # get consolidated into a single action triggering. If it is,
-        # then they cause two separate triggerings with close but not
-        # equal time stamps. The minimum time between these is determined
-        # by the argument in the physical action definition.
-        a.schedule(0)
-        a.schedule(0)
+      # Schedule twice. If the action is not physical, these should
+      # get consolidated into a single action triggering. If it is,
+      # then they cause two separate triggerings with close but not
+      # equal time stamps. The minimum time between these is determined
+      # by the argument in the physical action definition.
+      a.schedule(0)
+      a.schedule(0)
 
     # Simulate time passing before a callback occurs.
     def take_time(self, a):
-        # The best Python can offer short of directly using ctypes to call nanosleep
-        self.time.sleep(0.1)
-        self.callback(a)
-        return None
+      # The best Python can offer short of directly using ctypes to call nanosleep
+      self.time.sleep(0.1)
+      self.callback(a)
+      return None
   =}
   timer t(0, 200 msec)
   state threads = {= list() =}
@@ -48,12 +48,12 @@ main reactor AsyncCallback {
     print("Asynchronous callback {:d}: Assigned logical time greater than start time by {:d} nsec.".format(self.i, elapsed_time));
     self.i += 1
     if elapsed_time <= self.expected_time:
-        sys.stderr.write("ERROR: Expected logical time to be larger than {:d}.".format(self.expected_time));
-        exit(1)
+      sys.stderr.write("ERROR: Expected logical time to be larger than {:d}.".format(self.expected_time));
+      exit(1)
     if self.toggle:
-        self.toggle = False
-        self.expected_time += 200000000
+      self.toggle = False
+      self.expected_time += 200000000
     else:
-        self.toggle = True
+      self.toggle = True
   =}
 }
diff --git a/test/Python/src/concurrent/AsyncCallbackNoTimer.lf b/test/Python/src/concurrent/AsyncCallbackNoTimer.lf
index 971b4db6ce..1ebd230db0 100644
--- a/test/Python/src/concurrent/AsyncCallbackNoTimer.lf
+++ b/test/Python/src/concurrent/AsyncCallbackNoTimer.lf
@@ -18,20 +18,20 @@ main reactor {
     import threading
 
     def callback(self, a):
-        # Schedule twice. If the action is not physical, these should
-        # get consolidated into a single action triggering. If it is,
-        # then they cause two separate triggerings with close but not
-        # equal time stamps. The minimum time between these is determined
-        # by the argument in the physical action definition.
-        a.schedule(0)
-        a.schedule(0)
+      # Schedule twice. If the action is not physical, these should
+      # get consolidated into a single action triggering. If it is,
+      # then they cause two separate triggerings with close but not
+      # equal time stamps. The minimum time between these is determined
+      # by the argument in the physical action definition.
+      a.schedule(0)
+      a.schedule(0)
 
     # Simulate time passing before a callback occurs.
     def take_time(self, a):
-        # The best Python can offer short of directly using ctypes to call nanosleep
-        self.time.sleep(0.1)
-        self.callback(a)
-        return None
+      # The best Python can offer short of directly using ctypes to call nanosleep
+      self.time.sleep(0.1)
+      self.callback(a)
+      return None
   =}
 
   state threads = {= list() =}
@@ -53,12 +53,12 @@ main reactor {
     print("Asynchronous callback {:d}: Assigned logical time greater than start time by {:d} nsec.".format(self.i, elapsed_time));
     self.i += 1
     if elapsed_time <= self.expected_time:
-        sys.stderr.write("ERROR: Expected logical time to be larger than {:d}.".format(self.expected_time));
-        exit(1)
+      sys.stderr.write("ERROR: Expected logical time to be larger than {:d}.".format(self.expected_time));
+      exit(1)
     if self.toggle:
-        self.toggle = False
-        self.expected_time += 200000000
+      self.toggle = False
+      self.expected_time += 200000000
     else:
-        self.toggle = True
+      self.toggle = True
   =}
 }
diff --git a/test/Python/src/docker/FilesPropertyContainerized.lf b/test/Python/src/docker/FilesPropertyContainerized.lf
index f8cea564b3..afbf76f8a8 100644
--- a/test/Python/src/docker/FilesPropertyContainerized.lf
+++ b/test/Python/src/docker/FilesPropertyContainerized.lf
@@ -5,9 +5,9 @@ target Python {
 
 preamble {=
   try:
-      import hello
+    import hello
   except:
-      lf_request_stop()
+    lf_request_stop()
 =}
 
 main reactor {
@@ -24,9 +24,9 @@ main reactor {
 
   reaction(shutdown) {=
     if not self.passed:
-        print("Failed to import file listed in files target property")
-        exit(1)
+      print("Failed to import file listed in files target property")
+      exit(1)
     else:
-        print("PASSED")
+      print("PASSED")
   =}
 }
diff --git a/test/Python/src/federated/BroadcastFeedback.lf b/test/Python/src/federated/BroadcastFeedback.lf
index b33b13742b..facc896800 100644
--- a/test/Python/src/federated/BroadcastFeedback.lf
+++ b/test/Python/src/federated/BroadcastFeedback.lf
@@ -12,14 +12,14 @@ reactor SenderAndReceiver {
 
   reaction(inp) {=
     if inp[0].is_present and inp[1].is_present and inp[0].value == 42 and inp[1].value == 42:
-        print("SUCCESS")
-        self.received = True
+      print("SUCCESS")
+      self.received = True
   =}
 
   reaction(shutdown) {=
     if not self.received:
-        print("Failed to receive broadcast")
-        sys.exit(1)
+      print("Failed to receive broadcast")
+      sys.exit(1)
   =}
 }
 
diff --git a/test/Python/src/federated/BroadcastFeedbackWithHierarchy.lf b/test/Python/src/federated/BroadcastFeedbackWithHierarchy.lf
index 5f50210a22..c0cc71ab5b 100644
--- a/test/Python/src/federated/BroadcastFeedbackWithHierarchy.lf
+++ b/test/Python/src/federated/BroadcastFeedbackWithHierarchy.lf
@@ -21,14 +21,14 @@ reactor Receiver {
 
   reaction(in_) {=
     if in_[0].is_present and in_[1].is_present and in_[0].value == 42 and in_[1].value == 42:
-        print("SUCCESS")
-        self.received = True
+      print("SUCCESS")
+      self.received = True
   =}
 
   reaction(shutdown) {=
     if not self.received:
-        print("Failed to receive broadcast")
-        self.sys.exit(1)
+      print("Failed to receive broadcast")
+      self.sys.exit(1)
   =}
 }
 
diff --git a/test/Python/src/federated/CycleDetection.lf b/test/Python/src/federated/CycleDetection.lf
index 26db7bf390..c4eaac6904 100644
--- a/test/Python/src/federated/CycleDetection.lf
+++ b/test/Python/src/federated/CycleDetection.lf
@@ -16,9 +16,9 @@ reactor CAReplica {
 
   reaction(local_update, remote_update) {=
     if local_update.is_present:
-        self.balance += local_update.value
+      self.balance += local_update.value
     if remote_update.is_present:
-        self.balance += remote_update.value
+      self.balance += remote_update.value
   =}
 
   reaction(query) -> response {= response.set(self.balance) =}
@@ -33,8 +33,8 @@ reactor UserInput {
 
   reaction(balance) {=
     if balance.value != 200:
-        self.sys.stderr.write("Did not receive the expected balance. Expected: 200. Got: {}.\n".format(balance.value))
-        self.sys.exit(1)
+      self.sys.stderr.write("Did not receive the expected balance. Expected: 200. Got: {}.\n".format(balance.value))
+      self.sys.exit(1)
     print("Balance: {}".format(balance.value))
     request_stop()
   =}
diff --git a/test/Python/src/federated/DecentralizedP2PComm.lf b/test/Python/src/federated/DecentralizedP2PComm.lf
index 8319964aaa..5bc2cc61a2 100644
--- a/test/Python/src/federated/DecentralizedP2PComm.lf
+++ b/test/Python/src/federated/DecentralizedP2PComm.lf
@@ -21,8 +21,8 @@ reactor Platform(start=0, expected_start=0, stp_offset_param=0) {
   reaction(in_) {=
     print("Received {}.".format(in_.value))
     if in_.value != self.expected:
-        self.sys.stderr.write("Expected {} but got {}.\n".format(self.expected_start, in_.value))
-        self.sys.exit(1)
+      self.sys.stderr.write("Expected {} but got {}.\n".format(self.expected_start, in_.value))
+      self.sys.exit(1)
     self.expected += 1
   =} STP(stp_offset_param) {=
     print("Received {} late.".format(in_.value))
@@ -34,8 +34,8 @@ reactor Platform(start=0, expected_start=0, stp_offset_param=0) {
   reaction(shutdown) {=
     print("Shutdown invoked.")
     if self.expected == self.expected_start:
-        self.sys.stderr.write("Did not receive anything.\n")
-        self.sys.exit(1)
+      self.sys.stderr.write("Did not receive anything.\n")
+      self.sys.exit(1)
   =}
 }
 
diff --git a/test/Python/src/federated/DecentralizedP2PUnbalancedTimeout.lf b/test/Python/src/federated/DecentralizedP2PUnbalancedTimeout.lf
index 5560bcaf42..9b4883e730 100644
--- a/test/Python/src/federated/DecentralizedP2PUnbalancedTimeout.lf
+++ b/test/Python/src/federated/DecentralizedP2PUnbalancedTimeout.lf
@@ -37,9 +37,9 @@ reactor Destination {
     print("Received {}".format(x.value))
     current_tag = lf.tag()
     if x.value != self.s:
-        error_msg = "At tag ({}, {}) expected {} and got {}.".format(current_tag.time - self.startup_logical_time, current_tag.microstep, self.s, x.value)
-        self.sys.stderr.write(error_msg)
-        self.sys.exit(1)
+      error_msg = "At tag ({}, {}) expected {} and got {}.".format(current_tag.time - self.startup_logical_time, current_tag.microstep, self.s, x.value)
+      self.sys.stderr.write(error_msg)
+      self.sys.exit(1)
     self.s += 1
   =}
 
diff --git a/test/Python/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf b/test/Python/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf
index f23ff8ba8c..a47d362140 100644
--- a/test/Python/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf
+++ b/test/Python/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf
@@ -31,8 +31,8 @@ reactor Destination {
 
   reaction(x) {=
     if x.value != self.s:
-        self.sys.stderr.write("Expected {} and got {}.".format(self.s, x.value))
-        self.sys.exit(1)
+      self.sys.stderr.write("Expected {} and got {}.".format(self.s, x.value))
+      self.sys.exit(1)
     self.s += 1
   =}
 
diff --git a/test/Python/src/federated/DistributedBank.lf b/test/Python/src/federated/DistributedBank.lf
index 65115acafb..9fb4720d59 100644
--- a/test/Python/src/federated/DistributedBank.lf
+++ b/test/Python/src/federated/DistributedBank.lf
@@ -16,8 +16,8 @@ reactor Node {
 
   reaction(shutdown) {=
     if self.count == 0:
-        self.sys.stderr.write("Timer reactions did not execute.\n")
-        self.sys.exit(1)
+      self.sys.stderr.write("Timer reactions did not execute.\n")
+      self.sys.exit(1)
   =}
 }
 
diff --git a/test/Python/src/federated/DistributedBankToMultiport.lf b/test/Python/src/federated/DistributedBankToMultiport.lf
index 534e623d19..1171c1b1b4 100644
--- a/test/Python/src/federated/DistributedBankToMultiport.lf
+++ b/test/Python/src/federated/DistributedBankToMultiport.lf
@@ -12,17 +12,17 @@ reactor Destination {
 
   reaction(in_) {=
     for i in range(len(in_)):
-        print("Received {}.".format(in_[i].value))
-        if self.count != in_[i].value:
-            self.sys.stderr.write("Expected {}.\n".format(self.count))
-            self.sys.exit(1)
+      print("Received {}.".format(in_[i].value))
+      if self.count != in_[i].value:
+        self.sys.stderr.write("Expected {}.\n".format(self.count))
+        self.sys.exit(1)
     self.count += 1
   =}
 
   reaction(shutdown) {=
     if self.count == 0:
-        self.sys.stderr.write("No data received.\n")
-        self.sys.exit(1)
+      self.sys.stderr.write("No data received.\n")
+      self.sys.exit(1)
   =}
 }
 
diff --git a/test/Python/src/federated/DistributedCount.lf b/test/Python/src/federated/DistributedCount.lf
index 20c8beedc5..6b08b7e7fe 100644
--- a/test/Python/src/federated/DistributedCount.lf
+++ b/test/Python/src/federated/DistributedCount.lf
@@ -20,18 +20,18 @@ reactor Print {
     elapsed_time = lf.time.logical_elapsed()
     print("At time {}, received {}".format(elapsed_time, in_.value))
     if in_.value != self.c:
-        print("Expected to receive {}.".format(self.c))
-        self.sys.exit(1)
+      print("Expected to receive {}.".format(self.c))
+      self.sys.exit(1)
     if elapsed_time != MSEC(200) + SEC(1) * (self.c - 1):
-        print("Expected received time to be {}.".format(MSEC(200) * self.c))
-        self.sys.exit(1)
+      print("Expected received time to be {}.".format(MSEC(200) * self.c))
+      self.sys.exit(1)
     self.c += 1
   =}
 
   reaction(shutdown) {=
     if self.c != 6:
-        print("Expected to receive 5 items.")
-        self.sys.exit(1)
+      print("Expected to receive 5 items.")
+      self.sys.exit(1)
   =}
 }
 
diff --git a/test/Python/src/federated/DistributedCountDecentralized.lf b/test/Python/src/federated/DistributedCountDecentralized.lf
index 6b664335dd..62f2921282 100644
--- a/test/Python/src/federated/DistributedCountDecentralized.lf
+++ b/test/Python/src/federated/DistributedCountDecentralized.lf
@@ -19,20 +19,20 @@ reactor Print {
 
   reaction(in_) {=
     print(f"At tag ({lf.time.logical_elapsed()}, {lf.tag().microstep}), received {in_.value}. "
-          f"The original intended tag of the message was ({in_.intended_tag.time-lf.time.start()}, {in_.intended_tag.microstep}).")
+        f"The original intended tag of the message was ({in_.intended_tag.time-lf.time.start()}, {in_.intended_tag.microstep}).")
     if in_.value != self.c:
-        print("Expected to receive {}.".format(self.c))
-        self.sys.exit(1)
+      print("Expected to receive {}.".format(self.c))
+      self.sys.exit(1)
     if lf.time.logical_elapsed() != MSEC(200) + SEC(1) * (self.c - 1):
-        print("Expected received time to be {}.".format(MSEC(200) * self.c))
-        self.sys.exit(3)
+      print("Expected received time to be {}.".format(MSEC(200) * self.c))
+      self.sys.exit(3)
     self.c += 1
   =}
 
   reaction(shutdown) {=
     if self.c != 6:
-        self.sys.stderr.write("Expected to receive 5 items.\n")
-        self.sys.exit(2)
+      self.sys.stderr.write("Expected to receive 5 items.\n")
+      self.sys.exit(2)
     print("SUCCESS: Successfully received 5 items.")
   =}
 }
diff --git a/test/Python/src/federated/DistributedCountDecentralizedLate.lf b/test/Python/src/federated/DistributedCountDecentralizedLate.lf
index 30f67fc48b..4029dcee5b 100644
--- a/test/Python/src/federated/DistributedCountDecentralizedLate.lf
+++ b/test/Python/src/federated/DistributedCountDecentralizedLate.lf
@@ -14,32 +14,32 @@ import Count from "../lib/Count.lf"
 
 reactor Print {
   preamble {= import sys =}
-  input in_           # STP ()
+  input in_       # STP ()
   state success = 0   # STP(in, 30 msec);
   state success_stp_violation = 0
   timer t(0, 1 msec)  # Force a timer to be invoke periodically
-  state c = 0         # to ensure logical time will advance in the absence of incoming messages.
+  state c = 0     # to ensure logical time will advance in the absence of incoming messages.
 
   reaction(in_) {=
     current_tag = lf.tag()
     print("At tag ({}, {}) received {}. Intended tag is ({}, {}).".format(
-        lf.time.logical_elapsed(),
-        lf.tag().microstep,
-        in_.value,
-        in_.intended_tag.time - lf.time.start(),
-        in_.intended_tag.microstep
-        )
+      lf.time.logical_elapsed(),
+      lf.tag().microstep,
+      in_.value,
+      in_.intended_tag.time - lf.time.start(),
+      in_.intended_tag.microstep
+      )
     )
     if (lf.tag() == Tag(SEC(1), 0)):
-        self.success += 1 # Message was on-time
+      self.success += 1 # Message was on-time
     self.c += 1
   =} STP(0) {=
     current_tag = lf.tag()
     print("At tag ({}, {}), message has violated the STP offset by ({}, {}).".format(
-            current_tag.time - lf.time.start(), current_tag.microstep,
-            current_tag.time - in_.intended_tag.time,
-            current_tag.microstep - in_.intended_tag.microstep
-            )
+        current_tag.time - lf.time.start(), current_tag.microstep,
+        current_tag.time - in_.intended_tag.time,
+        current_tag.microstep - in_.intended_tag.microstep
+        )
     )
     self.success_stp_violation += 1
     self.c += 1
@@ -51,10 +51,10 @@ reactor Print {
 
   reaction(shutdown) {=
     if self.success + self.success_stp_violation != 5:
-        self.sys.stderr.write("Failed to detect STP violations in messages.\n")
-        self.sys.exit(1)
+      self.sys.stderr.write("Failed to detect STP violations in messages.\n")
+      self.sys.exit(1)
     else:
-        print("Successfully detected STP violation ({} violations, {} on-time).".format(self.success_stp_violation, self.success))
+      print("Successfully detected STP violation ({} violations, {} on-time).".format(self.success_stp_violation, self.success))
   =}
 }
 
diff --git a/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf b/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf
index a82d66675b..39c5747074 100644
--- a/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf
+++ b/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf
@@ -24,25 +24,25 @@ import Count from "../lib/Count.lf"
 
 reactor ImportantActuator {
   input inp
-  state success = 0    # Count messages that arrive without STP violation.
+  state success = 0  # Count messages that arrive without STP violation.
   state success_stp_violation = 0
   timer t(0, 10 usec)  # Force a timer to be invoked periodically
-  state c = 0          # to ensure logical time will advance in the absence of incoming messages.
+  state c = 0      # to ensure logical time will advance in the absence of incoming messages.
 
   reaction(inp) {=
     current_tag = lf.tag()
     print(f"ImportantActuator: At tag ({lf.tag().time}, {lf.tag().microstep}) received {inp.value}. "
-          f"Intended tag is ({inp.intended_tag.time - lf.time.start()}, {inp.intended_tag.microstep}).")
+        f"Intended tag is ({inp.intended_tag.time - lf.time.start()}, {inp.intended_tag.microstep}).")
     if lf.tag() == Tag((SEC(1) *  self.c) + + lf.time.start(), 0):
-        self.success += 1 # Message was on-time
+      self.success += 1 # Message was on-time
     else:
-        self.sys.stderr.write("Normal reaction was invoked, but current tag doesn't match expected tag.")
-        self.sys.exit(1)
+      self.sys.stderr.write("Normal reaction was invoked, but current tag doesn't match expected tag.")
+      self.sys.exit(1)
     self.c += 1
   =} STP(0) {=
     current_tag = lf.tag()
     print(f"ImportantActuator: At tag ({lf.time.logical_elapsed()}, {lf.tag().microstep}), message has violated the STP offset "
-          f"by ({lf.tag().time - inp.intended_tag.time}, {lf.tag().microstep - inp.intended_tag.microstep}).")
+        f"by ({lf.tag().time - inp.intended_tag.time}, {lf.tag().microstep - inp.intended_tag.microstep}).")
     self.success_stp_violation += 1
     self.c += 1
   =}
@@ -53,10 +53,10 @@ reactor ImportantActuator {
 
   reaction(shutdown) {=
     if (self.success +  self.success_stp_violation) != 2:
-        self.sys.stderr.write("Failed to detect STP violation in messages.")
-        self.sys.exit(1)
+      self.sys.stderr.write("Failed to detect STP violation in messages.")
+      self.sys.exit(1)
     else:
-        print(f"Successfully detected STP violations ({self.success_stp_violation} violations, {self.success} on-time).")
+      print(f"Successfully detected STP violations ({self.success_stp_violation} violations, {self.success} on-time).")
   =}
 }
 
@@ -66,14 +66,14 @@ reactor Print {
   reaction(inp) {=
     current_tag = lf.tag();
     print(f"Print reactor: at tag ({lf.time.logical_elapsed()}, lf.tag().microstep) received {inp.value}. "
-          f"Intended tag is ({inp.intended_tag.time - lf.time.start()}, {inp.intended_tag.microstep}).")
+        f"Intended tag is ({inp.intended_tag.time - lf.time.start()}, {inp.intended_tag.microstep}).")
   =}
 }
 
 reactor Receiver {
   input inp
   timer t(0, 10 msec)  # Force a timer to be invoke periodically
-  state c = 0          # to ensure logical time will advance in the absence of incoming messages.
+  state c = 0      # to ensure logical time will advance in the absence of incoming messages.
   p = new Print()
   a = new ImportantActuator()
 
diff --git a/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf b/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf
index b0159ceac2..fb60a67668 100644
--- a/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf
+++ b/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf
@@ -17,25 +17,25 @@ import Print from "DistributedCountDecentralizedLateDownstream.lf"
 
 reactor ImportantActuator {
   input inp
-  state success = 0    # Count messages that arrive without STP violation.
+  state success = 0  # Count messages that arrive without STP violation.
   state success_stp_violation = 0
   timer t(0, 10 usec)  # Force a timer to be invoked periodically
-  state c = 0          # to ensure logical time will advance in the absence of incoming messages.
+  state c = 0      # to ensure logical time will advance in the absence of incoming messages.
 
   reaction(inp) {=
     current_tag = lf.tag()
     print(f"ImportantActuator: At tag ({lf.tag().time}, {lf.tag().microstep}) received {inp.value}. "
-          f"Intended tag is ({inp.intended_tag.time - lf.time.start()}, {inp.intended_tag.microstep}).")
+        f"Intended tag is ({inp.intended_tag.time - lf.time.start()}, {inp.intended_tag.microstep}).")
     if lf.tag() == Tag((SEC(1) *  self.c) + + lf.time.start(), 0):
-        self.success += 1 # Message was on-time
+      self.success += 1 # Message was on-time
     else:
-        self.sys.stderr.write("Normal reaction was invoked, but current tag doesn't match expected tag.")
-        self.sys.exit(1)
+      self.sys.stderr.write("Normal reaction was invoked, but current tag doesn't match expected tag.")
+      self.sys.exit(1)
     self.c += 1
   =} STP(0) {=
     current_tag = lf.tag()
     print(f"ImportantActuator: At tag ({lf.time.logical_elapsed()}, {lf.tag().microstep}), message has violated the STP offset "
-          f"by ({lf.tag().time - inp.intended_tag.time}, {lf.tag().microstep - inp.intended_tag.microstep}).")
+        f"by ({lf.tag().time - inp.intended_tag.time}, {lf.tag().microstep - inp.intended_tag.microstep}).")
     self.success_stp_violation += 1
     self.c += 1
   =}
@@ -46,17 +46,17 @@ reactor ImportantActuator {
 
   reaction(shutdown) {=
     if (self.success +  self.success_stp_violation) != 5:
-        self.sys.stderr.write("Failed to detect STP violation in messages.")
-        self.sys.exit(1)
+      self.sys.stderr.write("Failed to detect STP violation in messages.")
+      self.sys.exit(1)
     else:
-        print(f"Successfully detected STP violations ({self.success_stp_violation} violations, {self.success} on-time).")
+      print(f"Successfully detected STP violations ({self.success_stp_violation} violations, {self.success} on-time).")
   =}
 }
 
 reactor Receiver {
   input inp
   timer t(0, 10 msec)  # Force a timer to be invoke periodically
-  state c = 0          # to ensure logical time will advance in the absence of incoming messages.
+  state c = 0      # to ensure logical time will advance in the absence of incoming messages.
   p = new Print()
   a = new ImportantActuator()
   inp -> p.inp
diff --git a/test/Python/src/federated/DistributedCountPhysical.lf b/test/Python/src/federated/DistributedCountPhysical.lf
index af59f4da8f..a55dcf06dd 100644
--- a/test/Python/src/federated/DistributedCountPhysical.lf
+++ b/test/Python/src/federated/DistributedCountPhysical.lf
@@ -31,18 +31,18 @@ reactor Print {
     elapsed_time = lf.time.logical_elapsed()
     print("At time {}, received {}.".format(elapsed_time, in_.value))
     if in_.value != self.c:
-        self.sys.stderr.write("ERROR: Expected to receive {}.\n".format(self.c))
-        self.sys.exit(1)
+      self.sys.stderr.write("ERROR: Expected to receive {}.\n".format(self.c))
+      self.sys.exit(1)
     if not (elapsed_time > (SEC(1) * self.c) + MSEC(200)):
-        self.sys.stderr.write("ERROR: Expected received time to be strictly greater than {}. Got {}.\n".format(MSEC(200) * self.c, elapsed_time))
-        self.sys.exit(3)
+      self.sys.stderr.write("ERROR: Expected received time to be strictly greater than {}. Got {}.\n".format(MSEC(200) * self.c, elapsed_time))
+      self.sys.exit(3)
     self.c += 1
   =}
 
   reaction(shutdown) {=
     if (self.c != 1):
-        self.sys.stderr.write("ERROR: Expected to receive 1 item. Received {}.\n".format(self.c))
-        self.sys.exit(2)
+      self.sys.stderr.write("ERROR: Expected to receive 1 item. Received {}.\n".format(self.c))
+      self.sys.exit(2)
     print("SUCCESS: Successfully received 1 item.");
   =}
 }
diff --git a/test/Python/src/federated/DistributedCountPhysicalAfterDelay.lf b/test/Python/src/federated/DistributedCountPhysicalAfterDelay.lf
index dd753fca44..f18f5dc997 100644
--- a/test/Python/src/federated/DistributedCountPhysicalAfterDelay.lf
+++ b/test/Python/src/federated/DistributedCountPhysicalAfterDelay.lf
@@ -31,18 +31,18 @@ reactor Print {
     elapsed_time = lf.time.logical_elapsed()
     print("At time {}, received {}.".format(elapsed_time, in_.value))
     if in_.value != self.c:
-        self.sys.stderr.write("ERROR: Expected to receive {}.\n".format(self.c))
-        self.sys.exit(1)
+      self.sys.stderr.write("ERROR: Expected to receive {}.\n".format(self.c))
+      self.sys.exit(1)
     if not (elapsed_time > (SEC(1) * self.c) + MSEC(200)):
-        self.sys.stderr.write("ERROR: Expected received time to be strictly greater than {}. Got {}.\n".format(MSEC(200) * self.c, elapsed_time))
-        self.sys.exit(3)
+      self.sys.stderr.write("ERROR: Expected received time to be strictly greater than {}. Got {}.\n".format(MSEC(200) * self.c, elapsed_time))
+      self.sys.exit(3)
     self.c += 1
   =}
 
   reaction(shutdown) {=
     if (self.c != 1):
-        self.sys.stderr.write("ERROR: Expected to receive 1 item. Received {}.\n".format(self.c))
-        self.sys.exit(2)
+      self.sys.stderr.write("ERROR: Expected to receive 1 item. Received {}.\n".format(self.c))
+      self.sys.exit(2)
     print("SUCCESS: Successfully received 1 item.");
   =}
 }
diff --git a/test/Python/src/federated/DistributedCountPhysicalDecentralized.lf b/test/Python/src/federated/DistributedCountPhysicalDecentralized.lf
index 49041a5c7a..71048dfa38 100644
--- a/test/Python/src/federated/DistributedCountPhysicalDecentralized.lf
+++ b/test/Python/src/federated/DistributedCountPhysicalDecentralized.lf
@@ -32,18 +32,18 @@ reactor Print {
     elapsed_time = lf.time.logical_elapsed()
     print("At time {}, received {}.".format(elapsed_time, in_.value))
     if in_.value != self.c:
-        self.sys.stderr.write("ERROR: Expected to receive {}.\n".format(self.c))
-        self.sys.exit(1)
+      self.sys.stderr.write("ERROR: Expected to receive {}.\n".format(self.c))
+      self.sys.exit(1)
     if not (elapsed_time > (SEC(1) * self.c) + MSEC(200)):
-        self.sys.stderr.write("ERROR: Expected received time to be strictly greater than {}.\n".format(MSEC(200) * self.c))
-        self.sys.exit(3)
+      self.sys.stderr.write("ERROR: Expected received time to be strictly greater than {}.\n".format(MSEC(200) * self.c))
+      self.sys.exit(3)
     self.c += 1
   =}
 
   reaction(shutdown) {=
     if self.c != 1:
-        self.sys.stderr.write("ERROR: Expected to receive 1 item. Received {}.\n".format(self.c))
-        self.sys.exit(2)
+      self.sys.stderr.write("ERROR: Expected to receive 1 item. Received {}.\n".format(self.c))
+      self.sys.exit(2)
     print("SUCCESS: Successfully received 1 item.")
   =}
 }
diff --git a/test/Python/src/federated/DistributedDoublePort.lf b/test/Python/src/federated/DistributedDoublePort.lf
index 3e0d25c4a0..3c09373ad1 100644
--- a/test/Python/src/federated/DistributedDoublePort.lf
+++ b/test/Python/src/federated/DistributedDoublePort.lf
@@ -35,8 +35,8 @@ reactor Print {
     current_tag = lf.tag()
     print("At tag ({}, {}), received in_ = {} and in2 = {}.".format(current_tag.time, current_tag.microstep, in_.value, in2.value))
     if in_.is_present and in2.is_present:
-        self.sys.stderr.write("ERROR: invalid logical simultaneity.")
-        self.sys.exit(1)
+      self.sys.stderr.write("ERROR: invalid logical simultaneity.")
+      self.sys.exit(1)
   =}
 
   reaction(shutdown) {= print("SUCCESS: messages were at least one microstep apart.") =}
diff --git a/test/Python/src/federated/DistributedLoopedAction.lf b/test/Python/src/federated/DistributedLoopedAction.lf
index f5c4a643a7..550284dfac 100644
--- a/test/Python/src/federated/DistributedLoopedAction.lf
+++ b/test/Python/src/federated/DistributedLoopedAction.lf
@@ -20,24 +20,24 @@ reactor Receiver(take_a_break_after=10, break_interval = 400 msec) {
   # but forces the logical time to advance Comment this line for a more sensible log output.
   reaction(in_) {=
     print("At tag ({}, {}) received value {}.".format(
-        lf.time.logical_elapsed(),
-        lf.tag().microstep,
-        in_.value
-        )
+      lf.time.logical_elapsed(),
+      lf.tag().microstep,
+      in_.value
+      )
     )
     self.total_received_messages += 1
     if in_.value != self.received_messages:
-        self.sys.stderr.write("ERROR: received messages out of order.\n")
-        # exit(1);
+      self.sys.stderr.write("ERROR: received messages out of order.\n")
+      # exit(1);
     self.received_messages += 1
     if lf.time.logical_elapsed() != self.breaks * self.break_interval:
-        self.sys.stderr.write("ERROR: received messages at an incorrect time: {}.\n".format(lf.time.logical_elapsed()))
-        # exit(2);
+      self.sys.stderr.write("ERROR: received messages at an incorrect time: {}.\n".format(lf.time.logical_elapsed()))
+      # exit(2);
 
     if self.received_messages == self.take_a_break_after:
-        # Sender is taking a break;
-        self.breaks += 1
-        self.received_messages = 0
+      # Sender is taking a break;
+      self.breaks += 1
+      self.received_messages = 0
   =}
 
   reaction(t) {=
@@ -47,8 +47,8 @@ reactor Receiver(take_a_break_after=10, break_interval = 400 msec) {
   reaction(shutdown) {=
     print(((SEC(1)/self.break_interval)+1) * self.take_a_break_after)
     if self.breaks != 3 or (self.total_received_messages != ((SEC(1)//self.break_interval)+1) * self.take_a_break_after):
-        self.sys.stderr.write("ERROR: test failed.\n")
-        exit(4)
+      self.sys.stderr.write("ERROR: test failed.\n")
+      exit(4)
     print("SUCCESS: Successfully received all messages from the sender.")
   =}
 }
diff --git a/test/Python/src/federated/DistributedLoopedPhysicalAction.lf b/test/Python/src/federated/DistributedLoopedPhysicalAction.lf
index c5afb5675f..51d73727dc 100644
--- a/test/Python/src/federated/DistributedLoopedPhysicalAction.lf
+++ b/test/Python/src/federated/DistributedLoopedPhysicalAction.lf
@@ -23,11 +23,11 @@ reactor Sender(take_a_break_after=10, break_interval = 550 msec) {
     out.set(self.sent_messages)
     self.sent_messages += 1
     if self.sent_messages < self.take_a_break_after:
-        act.schedule(0)
+      act.schedule(0)
     else:
-        # Take a break
-        self.sent_messages = 0
-        act.schedule(self.break_interval)
+      # Take a break
+      self.sent_messages = 0
+      act.schedule(self.break_interval)
   =}
 }
 
@@ -47,20 +47,20 @@ reactor Receiver(take_a_break_after=10, break_interval = 550 msec) {
   reaction(in_) {=
     current_tag = lf.tag()
     print("At tag ({}, {}) received {}".format(
-           current_tag.time - self.base_logical_time,
-           current_tag.microstep,
-           in_.value)
-           )
+         current_tag.time - self.base_logical_time,
+         current_tag.microstep,
+         in_.value)
+         )
     self.total_received_messages += 1
     if in_.value != self.received_messages:
-        self.sys.stderr.write("Expected {}.".format(self.received_messages - 1))
-        self.sys.exit(1)
+      self.sys.stderr.write("Expected {}.".format(self.received_messages - 1))
+      self.sys.exit(1)
     self.received_messages += 1
 
     if self.received_messages == self.take_a_break_after:
-        # Sender is taking a break;
-        self.breaks += 1
-        self.received_messages = 0
+      # Sender is taking a break;
+      self.breaks += 1
+      self.received_messages = 0
   =}
 
   reaction(t) {=
@@ -69,8 +69,8 @@ reactor Receiver(take_a_break_after=10, break_interval = 550 msec) {
 
   reaction(shutdown) {=
     if self.breaks != 2 or (self.total_received_messages != ((SEC(1)//self.break_interval)+1) * self.take_a_break_after):
-        self.sys.stderr.write("Test failed. Breaks: {}, Messages: {}.".format(self.breaks, self.total_received_messages))
-        self.sys.exit(1)
+      self.sys.stderr.write("Test failed. Breaks: {}, Messages: {}.".format(self.breaks, self.total_received_messages))
+      self.sys.exit(1)
     print("SUCCESS: Successfully received all messages from the sender.")
   =}
 }
diff --git a/test/Python/src/federated/DistributedMultiport.lf b/test/Python/src/federated/DistributedMultiport.lf
index bd1f24820d..6c67e0e90f 100644
--- a/test/Python/src/federated/DistributedMultiport.lf
+++ b/test/Python/src/federated/DistributedMultiport.lf
@@ -11,8 +11,8 @@ reactor Source {
 
   reaction(t) -> out {=
     for i in range(len(out)):
-        out[i].set(self.count)
-        self.count += 1
+      out[i].set(self.count)
+      self.count += 1
   =}
 }
 
@@ -23,18 +23,18 @@ reactor Destination {
 
   reaction(in_) {=
     for i in range(len(in_)):
-        if in_[i].is_present:
-            print("Received {}.".format(in_[i].value))
-            if in_[i].value != self.count:
-                self.sys.stderr.write("Expected {}.\n".format(self.count))
-                self.sys.exit(1)
-            self.count += 1
+      if in_[i].is_present:
+        print("Received {}.".format(in_[i].value))
+        if in_[i].value != self.count:
+          self.sys.stderr.write("Expected {}.\n".format(self.count))
+          self.sys.exit(1)
+        self.count += 1
   =}
 
   reaction(shutdown) {=
     if self.count == 0:
-        self.sys.stderr.write("No data received.")
-        self.sys.exit(1)
+      self.sys.stderr.write("No data received.")
+      self.sys.exit(1)
   =}
 }
 
diff --git a/test/Python/src/federated/DistributedMultiportToBank.lf b/test/Python/src/federated/DistributedMultiportToBank.lf
index b9b65686ef..c94e4ec49b 100644
--- a/test/Python/src/federated/DistributedMultiportToBank.lf
+++ b/test/Python/src/federated/DistributedMultiportToBank.lf
@@ -10,7 +10,7 @@ reactor Source {
 
   reaction(t) -> out {=
     for i in range(len(out)):
-        out[i].set(self.count)
+      out[i].set(self.count)
     self.count += 1
   =}
 }
@@ -23,15 +23,15 @@ reactor Destination {
   reaction(in_) {=
     print("Received {}.".format(in_.value))
     if self.count != in_.value:
-        self.sys.stderr.write("Expected {}.\n".format(self.count))
-        self.sys.exit(1)
+      self.sys.stderr.write("Expected {}.\n".format(self.count))
+      self.sys.exit(1)
     self.count += 1
   =}
 
   reaction(shutdown) {=
     if self.count == 0:
-        self.sys.stderr.write("No data received.")
-        self.sys.exit(1)
+      self.sys.stderr.write("No data received.")
+      self.sys.exit(1)
   =}
 }
 
diff --git a/test/Python/src/federated/DistributedMultiportToken.lf b/test/Python/src/federated/DistributedMultiportToken.lf
index bd380f22fe..800ac23e9c 100644
--- a/test/Python/src/federated/DistributedMultiportToken.lf
+++ b/test/Python/src/federated/DistributedMultiportToken.lf
@@ -12,13 +12,13 @@ reactor Source {
 
   reaction(t) -> out {=
     for i in range(len(out)):
-        self.count += 1
-        out[i].set("Hello {}".format(self.count))
-        print("MessageGenerator: At time {}, send message: {}.".format(
-            lf.time.logical_elapsed(),
-            out[i].value
-            )
+      self.count += 1
+      out[i].set("Hello {}".format(self.count))
+      print("MessageGenerator: At time {}, send message: {}.".format(
+        lf.time.logical_elapsed(),
+        out[i].value
         )
+      )
   =}
 }
 
@@ -27,8 +27,8 @@ reactor Destination {
 
   reaction(in_) {=
     for i in range(len(in_)):
-        if in_[i].is_present:
-            print("Received {}.".format(in_[i].value))
+      if in_[i].is_present:
+        print("Received {}.".format(in_[i].value))
   =}
 }
 
diff --git a/test/Python/src/federated/DistributedNoReact.lf b/test/Python/src/federated/DistributedNoReact.lf
index 39f51b609a..e28f5ae253 100644
--- a/test/Python/src/federated/DistributedNoReact.lf
+++ b/test/Python/src/federated/DistributedNoReact.lf
@@ -4,8 +4,8 @@ target Python {
 
 preamble {=
   class C:
-      def __init__(self):
-          pass
+    def __init__(self):
+      pass
 =}
 
 reactor A {
diff --git a/test/Python/src/federated/DistributedSendClass.lf b/test/Python/src/federated/DistributedSendClass.lf
index 4ff870ae06..9f77259b37 100644
--- a/test/Python/src/federated/DistributedSendClass.lf
+++ b/test/Python/src/federated/DistributedSendClass.lf
@@ -2,8 +2,8 @@ target Python
 
 preamble {=
   class C:
-      def __init__(self):
-          pass
+    def __init__(self):
+      pass
 =}
 
 reactor A {
diff --git a/test/Python/src/federated/DistributedStop.lf b/test/Python/src/federated/DistributedStop.lf
index af80638910..0171a2bbfb 100644
--- a/test/Python/src/federated/DistributedStop.lf
+++ b/test/Python/src/federated/DistributedStop.lf
@@ -16,47 +16,47 @@ reactor Sender {
   reaction(t, act) -> out, act {=
     tag = lf.tag()
     print("Sending 42 at ({}, {}).".format(
-                 lf.time.logical_elapsed(),
-                 tag.microstep))
+           lf.time.logical_elapsed(),
+           tag.microstep))
     out.set(42)
     if tag.microstep == 0:
-        # Instead of having a separate reaction
-        # for 'act' like Stop.lf, we trigger the
-        # same reaction to test request_stop() being
-        # called multiple times
-        act.schedule(0)
+      # Instead of having a separate reaction
+      # for 'act' like Stop.lf, we trigger the
+      # same reaction to test request_stop() being
+      # called multiple times
+      act.schedule(0)
     if lf.time.logical_elapsed() == USEC(1):
-        # Call request_stop() both at (1 usec, 0) and
-        # (1 usec, 1)
-        print("Requesting stop at ({}, {}).".format(
-                 lf.time.logical_elapsed(),
-                 lf.tag().microstep))
-        request_stop()
+      # Call request_stop() both at (1 usec, 0) and
+      # (1 usec, 1)
+      print("Requesting stop at ({}, {}).".format(
+           lf.time.logical_elapsed(),
+           lf.tag().microstep))
+      request_stop()
 
     _1usec1 = Tag(time=USEC(1) + lf.time.start(), microstep=1)
     if lf.tag_compare(lf.tag(), _1usec1) == 0:
-        # The reaction was invoked at (1 usec, 1) as expected
-        self.reaction_invoked_correctly = True
+      # The reaction was invoked at (1 usec, 1) as expected
+      self.reaction_invoked_correctly = True
     elif lf.tag_compare(lf.tag(), _1usec1) > 0:
-        # The reaction should not have been invoked at tags larger than (1 usec, 1)
-        sys.stderr.write("ERROR: Invoked reaction(t, act) at tag bigger than shutdown.\n")
-        sys.exit(1)
+      # The reaction should not have been invoked at tags larger than (1 usec, 1)
+      sys.stderr.write("ERROR: Invoked reaction(t, act) at tag bigger than shutdown.\n")
+      sys.exit(1)
   =}
 
   reaction(shutdown) {=
     if lf.time.logical_elapsed() != USEC(1) or lf.tag().microstep != 1:
-        sys.stderr.write("ERROR: Sender failed to stop the federation in time. Stopping at ({}, {}).\n".format(
-                 lf.time.logical_elapsed(),
-                 lf.tag().microstep))
-        sys.exit(1)
+      sys.stderr.write("ERROR: Sender failed to stop the federation in time. Stopping at ({}, {}).\n".format(
+           lf.time.logical_elapsed(),
+           lf.tag().microstep))
+      sys.exit(1)
     elif not self.reaction_invoked_correctly:
-        sys.stderr.write("ERROR: Sender reaction(t, act) was not invoked at (1 usec, 1). Stopping at ({}, {}).\n".format(
-                 lf.time.logical_elapsed(),
-                 lf.tag().microstep))
-        sys.exit(1)
+      sys.stderr.write("ERROR: Sender reaction(t, act) was not invoked at (1 usec, 1). Stopping at ({}, {}).\n".format(
+           lf.time.logical_elapsed(),
+           lf.tag().microstep))
+      sys.exit(1)
     print("SUCCESS: Successfully stopped the federation at ({}, {}).".format(
-                 lf.time.logical_elapsed(),
-                 lf.tag().microstep))
+           lf.time.logical_elapsed(),
+           lf.tag().microstep))
   =}
 }
 
@@ -69,21 +69,21 @@ reactor Receiver(
   reaction(in_) {=
     tag = lf.tag()
     print("Received {} at ({}, {}).".format(
-                 in_.value,
-                 lf.time.logical_elapsed(),
-                 lf.tag().microstep))
+           in_.value,
+           lf.time.logical_elapsed(),
+           lf.tag().microstep))
     if lf.time.logical_elapsed() == USEC(1):
-        print("Requesting stop at ({}, {}).".format(
-                 lf.time.logical_elapsed(),
-                 lf.tag().microstep))
-        request_stop()
-        # The receiver should receive a message at tag
-        # (1 usec, 1) and trigger this reaction
-        self.reaction_invoked_correctly = True
+      print("Requesting stop at ({}, {}).".format(
+           lf.time.logical_elapsed(),
+           lf.tag().microstep))
+      request_stop()
+      # The receiver should receive a message at tag
+      # (1 usec, 1) and trigger this reaction
+      self.reaction_invoked_correctly = True
 
     _1usec1 = Tag(time=USEC(1) + lf.time.start(), microstep=1)
     if lf.tag_compare(lf.tag(), _1usec1) > 0:
-        self.reaction_invoked_correctly = False
+      self.reaction_invoked_correctly = False
   =}
 
   reaction(shutdown) {=
@@ -91,18 +91,18 @@ reactor Receiver(
     # Therefore, the shutdown events must occur at (1000, 0) on the
     # receiver.
     if lf.time.logical_elapsed() != USEC(1) or lf.tag().microstep != 1:
-        sys.stderr.write("Error: Receiver failed to stop the federation at the right time. Stopping at ({}, {}).\n".format(
-                 lf.time.logical_elapsed(),
-                 lf.tag().microstep))
-        sys.exit(1)
+      sys.stderr.write("Error: Receiver failed to stop the federation at the right time. Stopping at ({}, {}).\n".format(
+           lf.time.logical_elapsed(),
+           lf.tag().microstep))
+      sys.exit(1)
     elif not self.reaction_invoked_correctly:
-        sys.stderr.write("Error: Receiver reaction(in) was not invoked the correct number of times. Stopping at ({}, {}).\n".format(
-                 lf.time.logical_elapsed(),
-                 lf.tag().microstep))
-        sys.exit(1)
+      sys.stderr.write("Error: Receiver reaction(in) was not invoked the correct number of times. Stopping at ({}, {}).\n".format(
+           lf.time.logical_elapsed(),
+           lf.tag().microstep))
+      sys.exit(1)
     print("SUCCESS: Successfully stopped the federation at ({}, {}).".format(
-                 lf.time.logical_elapsed(),
-                 lf.tag().microstep))
+           lf.time.logical_elapsed(),
+           lf.tag().microstep))
   =}
 }
 
diff --git a/test/Python/src/federated/DistributedStopZero.lf b/test/Python/src/federated/DistributedStopZero.lf
index 6f18e14c5f..d933b9ce68 100644
--- a/test/Python/src/federated/DistributedStopZero.lf
+++ b/test/Python/src/federated/DistributedStopZero.lf
@@ -18,28 +18,28 @@ reactor Sender {
   reaction(t) -> out {=
     tag = lf.tag()
     print("Sending 42 at ({}, {}).".format(
-                 tag.time,
-                 tag.microstep))
+           tag.time,
+           tag.microstep))
     out.set(42)
     zero = Tag(time=self.startup_logical_time, microstep=0)
     if lf.tag_compare(lf.tag(), zero) == 0:
-        # Request stop at (0,0)
-        print("Requesting stop at ({}, {}).".format(
-                 lf.time.logical_elapsed(),
-                 lf.tag().microstep))
-        request_stop()
+      # Request stop at (0,0)
+      print("Requesting stop at ({}, {}).".format(
+           lf.time.logical_elapsed(),
+           lf.tag().microstep))
+      request_stop()
   =}
 
   reaction(shutdown) {=
     tag = lf.tag()
     if tag.time != USEC(0) or tag.microstep != 1:
-        sys.stderr.write("ERROR: Sender failed to stop the federation in time. Stopping at ({}, {}).\n".format(
-                 tag.time,
-                 tag.microstep))
-        sys.exit(1)
+      sys.stderr.write("ERROR: Sender failed to stop the federation in time. Stopping at ({}, {}).\n".format(
+           tag.time,
+           tag.microstep))
+      sys.exit(1)
     print("SUCCESS: Successfully stopped the federation at ({}, {}).".format(
-                 tag.time,
-                 tag.microstep))
+           tag.time,
+           tag.microstep))
   =}
 }
 
@@ -52,16 +52,16 @@ reactor Receiver {
   reaction(in_) {=
     tag = lf.tag()
     print("Received {} at ({}, {}).\n".format(
-                 in_.value,
-                 tag.time,
-                 tag.microstep))
+           in_.value,
+           tag.time,
+           tag.microstep))
     zero = Tag(time=self.startup_logical_time, microstep=0)
     if lf.tag_compare(lf.tag(), zero) == 0:
-        # Request stop at (0,0)
-        print("Requesting stop at ({}, {}).".format(
-                 tag.time,
-                 tag.microstep))
-        request_stop()
+      # Request stop at (0,0)
+      print("Requesting stop at ({}, {}).".format(
+           tag.time,
+           tag.microstep))
+      request_stop()
   =}
 
   reaction(shutdown) {=
@@ -70,13 +70,13 @@ reactor Receiver {
     # receiver.
     tag = lf.tag()
     if tag.time != USEC(0) or tag.microstep != 1:
-        sys.stderr.write("ERROR: Receiver failed to stop the federation in time. Stopping at ({}, {}).\n".format(
-                 tag.time,
-                 tag.microstep))
-        sys.exit(1)
+      sys.stderr.write("ERROR: Receiver failed to stop the federation in time. Stopping at ({}, {}).\n".format(
+           tag.time,
+           tag.microstep))
+      sys.exit(1)
     print("SUCCESS: Successfully stopped the federation at ({}, {}).\n".format(
-                 tag.time,
-                 tag.microstep))
+           tag.time,
+           tag.microstep))
   =}
 }
 
diff --git a/test/Python/src/federated/HelloDistributed.lf b/test/Python/src/federated/HelloDistributed.lf
index 303af7b7bd..7bbfa49368 100644
--- a/test/Python/src/federated/HelloDistributed.lf
+++ b/test/Python/src/federated/HelloDistributed.lf
@@ -25,16 +25,16 @@ reactor Destination {
   reaction(_in) {=
     print(f"At logical time {lf.time.logical_elapsed()}, destination received {_in.value}")
     if _in.value != "Hello World!":
-        sys.stderr.write("ERROR: Expected to receive 'Hello World!'\n");
-        exit(1)
+      sys.stderr.write("ERROR: Expected to receive 'Hello World!'\n");
+      exit(1)
     self.received = True
   =}
 
   reaction(shutdown) {=
     print("Shutdown invoked.")
     if self.received is not True:
-        sys.stderr.write("ERROR: Destination did not receive the message.")
-        exit(1)
+      sys.stderr.write("ERROR: Destination did not receive the message.")
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf b/test/Python/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf
index b131a0600e..3d4564fc45 100644
--- a/test/Python/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf
+++ b/test/Python/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf
@@ -25,8 +25,8 @@ reactor Contained(incr=1) {
 
   reaction(t) {=
     if self.received_count != self.count:
-        self.sys.stderr.write("reaction(t) was invoked before reaction(in). Precedence order was not kept.")
-        self.sys.exit(1)
+      self.sys.stderr.write("reaction(t) was invoked before reaction(in). Precedence order was not kept.")
+      self.sys.exit(1)
   =}
 }
 
@@ -53,8 +53,8 @@ reactor Looper(incr=1, delay = 0 msec) {
   reaction(shutdown) {=
     print("******* Shutdown invoked.")
     if self.count != 6 * self.incr:
-        self.sys.stderr.write("Failed to receive all six expected inputs.")
-        self.sys.exit(1)
+      self.sys.stderr.write("Failed to receive all six expected inputs.")
+      self.sys.exit(1)
   =}
 }
 
diff --git a/test/Python/src/federated/PhysicalSTP.lf b/test/Python/src/federated/PhysicalSTP.lf
index 5d1909a38e..20d61df25b 100644
--- a/test/Python/src/federated/PhysicalSTP.lf
+++ b/test/Python/src/federated/PhysicalSTP.lf
@@ -16,15 +16,15 @@ reactor Print(STP_offset=0) {
     print("At time {}, received {}".format(elapsed_time, in_.value))
     print(f"Physical time of arrival: {in_.physical_time_of_arrival}")
     if in_.value != self.c:
-        self.sys.stderr.write("Expected to receive {}.\n".format(self.c))
-        self.sys.exit(1)
+      self.sys.stderr.write("Expected to receive {}.\n".format(self.c))
+      self.sys.exit(1)
     STP_discrepency = lf.time.logical() + self.STP_offset - in_.physical_time_of_arrival
     if STP_discrepency < 0:
-        print("The message has violated the STP offset by {} in physical time.".format(-1 * STP_discrepency))
-        self.c += 1
+      print("The message has violated the STP offset by {} in physical time.".format(-1 * STP_discrepency))
+      self.c += 1
     else:
-        self.sys.stderr.write("Message arrived {} early.\n".format(STP_discrepency))
-        self.sys.exit(1)
+      self.sys.stderr.write("Message arrived {} early.\n".format(STP_discrepency))
+      self.sys.exit(1)
   =} STP(STP_offset) {=
     # This STP handler should never be invoked because the only source of event
     # for Print is the Count reactor.
@@ -34,8 +34,8 @@ reactor Print(STP_offset=0) {
 
   reaction(shutdown) {=
     if self.c != 3:
-        self.sys.stderr.write("Expected to receive 2 items but got {}.\n".format(self.c))
-        self.sys.exit(1)
+      self.sys.stderr.write("Expected to receive 2 items but got {}.\n".format(self.c))
+      self.sys.exit(1)
   =}
 }
 
diff --git a/test/Python/src/federated/PingPongDistributed.lf b/test/Python/src/federated/PingPongDistributed.lf
index a96fa5f1ce..4bd0cde285 100644
--- a/test/Python/src/federated/PingPongDistributed.lf
+++ b/test/Python/src/federated/PingPongDistributed.lf
@@ -33,9 +33,9 @@ reactor Ping(count=10) {
 
   reaction(receive) -> serve {=
     if self.pingsLeft > 0:
-        serve.schedule(0)
+      serve.schedule(0)
     else:
-        request_stop()
+      request_stop()
   =}
 }
 
@@ -51,13 +51,13 @@ reactor Pong(expected=10) {
     print("At logical time {}, Pong received {}.\n".format(lf.time.logical_elapsed(), receive.value))
     send.set(receive.value)
     if self.count == self.expected:
-        request_stop()
+      request_stop()
   =}
 
   reaction(shutdown) {=
     if self.count != self.expected:
-        print("Pong expected to receive {} inputs, but it received {}.\n".format(self.expected, self.count), file=self.sys.stderr)
-        self.sys.exit(1)
+      print("Pong expected to receive {} inputs, but it received {}.\n".format(self.expected, self.count), file=self.sys.stderr)
+      self.sys.exit(1)
     print("Pong received {} pings.\n".format(self.count))
   =}
 }
diff --git a/test/Python/src/federated/failing/ClockSync.lf b/test/Python/src/federated/failing/ClockSync.lf
index d418c476c3..258e0b9853 100644
--- a/test/Python/src/federated/failing/ClockSync.lf
+++ b/test/Python/src/federated/failing/ClockSync.lf
@@ -8,66 +8,66 @@
 # reason for failing: clock-sync and clock-sync-options not supported in the
 # python target
 target Python {
-    coordination: decentralized,
-    timeout: 10 sec,
-    clock-sync: on,  # Turn on runtime clock synchronization.
-    clock-sync-options: {
-        # Forces all federates to perform clock sync.
-        local-federates-on: true,
-        # Collect useful statistics like average network delay
-        collect-stats: true,
-        # and the standard deviation for the network delay over one clock
-        # synchronization cycle. Generates a warning if the standard deviation
-        # is higher than the clock sync guard. Artificially offsets clocks by
-        # multiples of 200 msec.
-        test-offset: 200 msec,
-        # Period with which runtime clock sync is performed.
-        period: 5 msec,
-        # Number of messages exchanged to perform clock sync.
-        trials: 10,
-        # Attenuation applied to runtime clock sync adjustments.
-        attenuation: 10
-    }
+  coordination: decentralized,
+  timeout: 10 sec,
+  clock-sync: on,  # Turn on runtime clock synchronization.
+  clock-sync-options: {
+    # Forces all federates to perform clock sync.
+    local-federates-on: true,
+    # Collect useful statistics like average network delay
+    collect-stats: true,
+    # and the standard deviation for the network delay over one clock
+    # synchronization cycle. Generates a warning if the standard deviation
+    # is higher than the clock sync guard. Artificially offsets clocks by
+    # multiples of 200 msec.
+    test-offset: 200 msec,
+    # Period with which runtime clock sync is performed.
+    period: 5 msec,
+    # Number of messages exchanged to perform clock sync.
+    trials: 10,
+    # Attenuation applied to runtime clock sync adjustments.
+    attenuation: 10
+  }
 }
 
 /** Reactor that outputs periodically. */
 reactor Ticker(period(1600 msec)) {
-    output out
+  output out
 
-    timer tick(0, period)
+  timer tick(0, period)
 
-    reaction(tick) -> out {= SET(out, 42); =}
+  reaction(tick) -> out {= SET(out, 42); =}
 }
 
 /** Print a message when an input arrives. */
 reactor Printer {
-    input in_
+  input in_
 
-    reaction(startup) {=
-        interval_t offset = _lf_time_physical_clock_offset + _lf_time_test_physical_clock_offset;
-        lf_print("Clock sync error at startup is %lld ns.", offset);
-    =}
+  reaction(startup) {=
+    interval_t offset = _lf_time_physical_clock_offset + _lf_time_test_physical_clock_offset;
+    lf_print("Clock sync error at startup is %lld ns.", offset);
+  =}
 
-    reaction(in_) {= lf_print("Received %d.", in->value); =}
+  reaction(in_) {= lf_print("Received %d.", in->value); =}
 
-    reaction(shutdown) {=
-        interval_t offset = _lf_time_physical_clock_offset + _lf_time_test_physical_clock_offset;
-        lf_print("Clock sync error at shutdown is %lld ns.", offset);
-        // Error out if the offset is bigger than 100 msec.
-        if (offset > MSEC(100)) {
-            lf_error_print("Offset exceeds test threshold of 100 msec.");
-            exit(1);
-        }
-    =}
+  reaction(shutdown) {=
+    interval_t offset = _lf_time_physical_clock_offset + _lf_time_test_physical_clock_offset;
+    lf_print("Clock sync error at shutdown is %lld ns.", offset);
+    // Error out if the offset is bigger than 100 msec.
+    if (offset > MSEC(100)) {
+      lf_error_print("Offset exceeds test threshold of 100 msec.");
+      exit(1);
+    }
+  =}
 }
 
 reactor Federate {
-    source = new Ticker()
-    play = new Printer()
-    source.out -> play.in_
+  source = new Ticker()
+  play = new Printer()
+  source.out -> play.in_
 }
 
 federated reactor ClockSync {
-    fed1 = new Federate()
-    fed2 = new Federate()
+  fed1 = new Federate()
+  fed2 = new Federate()
 }
diff --git a/test/Python/src/federated/failing/DistributedLoopedActionDecentralized.lf b/test/Python/src/federated/failing/DistributedLoopedActionDecentralized.lf
index 687e5b146b..183225148f 100644
--- a/test/Python/src/federated/failing/DistributedLoopedActionDecentralized.lf
+++ b/test/Python/src/federated/failing/DistributedLoopedActionDecentralized.lf
@@ -15,53 +15,53 @@
  */
 # reason for failing: in_.intended_tag are not supported in python target
 target Python {
-    timeout: 1 sec,
-    coordination: decentralized
+  timeout: 1 sec,
+  coordination: decentralized
 }
 
 import Sender from "../lib/LoopedActionSender.lf"
 import Receiver from "DistributedLoopedAction.lf"
 
 reactor STPReceiver(
-    take_a_break_after(10),
-    break_interval(400 msec),
-    stp_offset(0)
+  take_a_break_after(10),
+  break_interval(400 msec),
+  stp_offset(0)
 ) {
-    input inp
-    state last_time_updated_stp(0)
-    receiver = new Receiver(take_a_break_after = 10, break_interval = 400 msec)
-    timer t(0, 1 msec)  # Force advancement of logical time
+  input inp
+  state last_time_updated_stp(0)
+  receiver = new Receiver(take_a_break_after = 10, break_interval = 400 msec)
+  timer t(0, 1 msec)  # Force advancement of logical time
 
-    reaction(inp) -> receiver.in_ {=
-        print(f"Received {inp.value}.")
-        receiver.in_.set(inp.value)
-    =} STP(stp_offset) {=
-        print(f"Received {inp.value} late.")
-        current_tag = lf.tag()
-        print(f"STP violation of "
-            f"({current_tag.time - inp.intended_tag.time}, "
-            f"{current_tag.microstep - inp.intended_tag.microstep}) "
-            "perceived on the input.")
-        receiver.inp.set(inp.value)
-        # Only update the STP offset once per
-        # time step.
-        if current_tag.time != self.last_time_updated_stp :
-            print(f"Raising the STP offset by {MSEC(10)}.")
-            lf_set_stp_offset(MSEC(10))
-            self.last_time_updated_stp = current_tag.time
-    =}
+  reaction(inp) -> receiver.in_ {=
+    print(f"Received {inp.value}.")
+    receiver.in_.set(inp.value)
+  =} STP(stp_offset) {=
+    print(f"Received {inp.value} late.")
+    current_tag = lf.tag()
+    print(f"STP violation of "
+      f"({current_tag.time - inp.intended_tag.time}, "
+      f"{current_tag.microstep - inp.intended_tag.microstep}) "
+      "perceived on the input.")
+    receiver.inp.set(inp.value)
+    # Only update the STP offset once per
+    # time step.
+    if current_tag.time != self.last_time_updated_stp :
+      print(f"Raising the STP offset by {MSEC(10)}.")
+      lf_set_stp_offset(MSEC(10))
+      self.last_time_updated_stp = current_tag.time
+  =}
 
-    reaction(t) {=
-        # Do nothing
-    =}
+  reaction(t) {=
+    # Do nothing
+  =}
 }
 
 federated reactor DistributedLoopedActionDecentralized {
-    sender = new Sender(take_a_break_after = 10, break_interval = 400 msec)
-    stpReceiver = new STPReceiver(
-        take_a_break_after = 10,
-        break_interval = 400 msec
-    )
+  sender = new Sender(take_a_break_after = 10, break_interval = 400 msec)
+  stpReceiver = new STPReceiver(
+    take_a_break_after = 10,
+    break_interval = 400 msec
+  )
 
-    sender.out -> stpReceiver.inp
+  sender.out -> stpReceiver.inp
 }
diff --git a/test/Python/src/federated/failing/DistributedNetworkOrder.lf b/test/Python/src/federated/failing/DistributedNetworkOrder.lf
index 7dbcb5b699..274f87948e 100644
--- a/test/Python/src/federated/failing/DistributedNetworkOrder.lf
+++ b/test/Python/src/federated/failing/DistributedNetworkOrder.lf
@@ -10,57 +10,57 @@
  */
 # reason for failing: send_timed_message() is not not supported in python target
 target Python {
-    timeout: 1 sec
+  timeout: 1 sec
 }
 
 reactor Sender {
-    output out
-    timer t(0, 1 msec)
+  output out
+  timer t(0, 1 msec)
 
-    reaction(t) {=
-        int payload = 1;
-        if (lf.time.logical_elapsed() == 0LL) {
-            send_timed_message(MSEC(10), MSG_TYPE_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
-                                (unsigned char*)&payload);
-        } else if (lf.time.logical_elapsed() == MSEC(5)) {
-            payload = 2;
-            send_timed_message(MSEC(5), MSG_TYPE_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
-                                (unsigned char*)&payload);
-        }
-    =}
+  reaction(t) {=
+    int payload = 1;
+    if (lf.time.logical_elapsed() == 0LL) {
+      send_timed_message(MSEC(10), MSG_TYPE_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
+                (unsigned char*)&payload);
+    } else if (lf.time.logical_elapsed() == MSEC(5)) {
+      payload = 2;
+      send_timed_message(MSEC(5), MSG_TYPE_TAGGED_MESSAGE, 0, 1, "federate 1", sizeof(int),
+                (unsigned char*)&payload);
+    }
+  =}
 }
 
 reactor Receiver {
-    input in_
-    state success(0)
+  input in_
+  state success(0)
 
-    reaction(in_) {=
-        tag_t current_tag = lf.tag();
-        if (current_tag.time == (start_time + MSEC(10))) {
-            if (current_tag.microstep == 0 && in_->value == 1) {
-                self->success++;
-            } else if (current_tag.microstep == 1 && in_->value == 2) {
-                self->success++;
-            }
-        }
-        printf("Received %d at tag (%lld, %u).\n",
-               in_->value,
-               current_tag.time,
-               current_tag.microstep);
-    =}
+  reaction(in_) {=
+    tag_t current_tag = lf.tag();
+    if (current_tag.time == (start_time + MSEC(10))) {
+      if (current_tag.microstep == 0 && in_->value == 1) {
+        self->success++;
+      } else if (current_tag.microstep == 1 && in_->value == 2) {
+        self->success++;
+      }
+    }
+    printf("Received %d at tag (%lld, %u).\n",
+         in_->value,
+         current_tag.time,
+         current_tag.microstep);
+  =}
 
-    reaction(shutdown) {=
-        if (self->success != 2) {
-            fprintf(stderr, "ERROR: Failed to receive messages.\n");
-            exit(1);
-        }
-        printf("SUCCESS.\n");
-    =}
+  reaction(shutdown) {=
+    if (self->success != 2) {
+      fprintf(stderr, "ERROR: Failed to receive messages.\n");
+      exit(1);
+    }
+    printf("SUCCESS.\n");
+  =}
 }
 
 federated reactor DistributedNetworkOrder {
-    sender = new Sender()
-    receiver = new Receiver()
+  sender = new Sender()
+  receiver = new Receiver()
 
-    sender.out -> receiver.in_
+  sender.out -> receiver.in_
 }
diff --git a/test/Python/src/federated/failing/LoopDistributedCentralized.lf b/test/Python/src/federated/failing/LoopDistributedCentralized.lf
index 6618107bf7..c6045238cf 100644
--- a/test/Python/src/federated/failing/LoopDistributedCentralized.lf
+++ b/test/Python/src/federated/failing/LoopDistributedCentralized.lf
@@ -7,65 +7,65 @@
 # reason for failing: lf_comma_separated_time() not supported in the python
 # target
 target Python {
-    coordination: centralized,
-    coordination-options: {
-        advance-message-interval: 100 msec
-    },
-    timeout: 5 sec
+  coordination: centralized,
+  coordination-options: {
+    advance-message-interval: 100 msec
+  },
+  timeout: 5 sec
 }
 
 preamble {=
-    #include <unistd.h> // Defines sleep()
-    bool stop = false;
-    // Thread to trigger an action once every second.
-    void* ping(void* actionref) {
-        while(!stop) {
-            lf_print("Scheduling action.");
-            schedule(actionref, 0);
-            sleep(1);
-        }
-         return NULL;
+  #include <unistd.h> // Defines sleep()
+  bool stop = false;
+  // Thread to trigger an action once every second.
+  void* ping(void* actionref) {
+    while(!stop) {
+      lf_print("Scheduling action.");
+      schedule(actionref, 0);
+      sleep(1);
     }
+     return NULL;
+  }
 =}
 
 reactor Looper(incr(1), delay(0 msec)) {
-    input in_
-    output out
-    physical action a(delay)
-    state count(0)
+  input in_
+  output out
+  physical action a(delay)
+  state count(0)
 
-    reaction(startup) -> a {=
-        // Start the thread that listens for Enter or Return.
-        lf_thread_t thread_id;
-        lf_print("Starting thread.");
-        lf_thread_create(&thread_id, &ping, a);
-    =}
+  reaction(startup) -> a {=
+    // Start the thread that listens for Enter or Return.
+    lf_thread_t thread_id;
+    lf_print("Starting thread.");
+    lf_thread_create(&thread_id, &ping, a);
+  =}
 
-    reaction(a) -> out {=
-        SET(out, self->count);
-        self->count += self->incr;
-    =}
+  reaction(a) -> out {=
+    SET(out, self->count);
+    self->count += self->incr;
+  =}
 
-    reaction(in_) {=
-        instant_t time_lag = lf.time.physical() - lf.time.logical();
-        char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
-        lf_comma_separated_time(time_buffer, time_lag);
-        lf_print("Received %d. Logical time is behind physical time by %s nsec.", in_->value, time_buffer);
-    =}
+  reaction(in_) {=
+    instant_t time_lag = lf.time.physical() - lf.time.logical();
+    char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
+    lf_comma_separated_time(time_buffer, time_lag);
+    lf_print("Received %d. Logical time is behind physical time by %s nsec.", in_->value, time_buffer);
+  =}
 
-    reaction(shutdown) {=
-        lf_print("******* Shutdown invoked.");
-        // Stop the thread that is scheduling actions.
-        stop = true;
-        if (self->count != 5 * self->incr) {
-            lf_print_error_and_exit("Failed to receive all five expected inputs.");
-        }
-    =}
+  reaction(shutdown) {=
+    lf_print("******* Shutdown invoked.");
+    // Stop the thread that is scheduling actions.
+    stop = true;
+    if (self->count != 5 * self->incr) {
+      lf_print_error_and_exit("Failed to receive all five expected inputs.");
+    }
+  =}
 }
 
 federated reactor LoopDistributedCentralized(delay(0)) {
-    left = new Looper()
-    right = new Looper(incr = -1)
-    left.out -> right.in_
-    right.out -> left.in_
+  left = new Looper()
+  right = new Looper(incr = -1)
+  left.out -> right.in_
+  right.out -> left.in_
 }
diff --git a/test/Python/src/federated/failing/LoopDistributedCentralizedPrecedence.lf b/test/Python/src/federated/failing/LoopDistributedCentralizedPrecedence.lf
index 12367332f4..009ff54981 100644
--- a/test/Python/src/federated/failing/LoopDistributedCentralizedPrecedence.lf
+++ b/test/Python/src/federated/failing/LoopDistributedCentralizedPrecedence.lf
@@ -8,51 +8,51 @@
 # reason for failing: lf_comma_separated_time() not supported in the python
 # target
 target Python {
-    flags: "-Wall",
-    coordination: centralized,
-    coordination-options: {
-        advance-message-interval: 100 msec
-    },
-    timeout: 5 sec
+  flags: "-Wall",
+  coordination: centralized,
+  coordination-options: {
+    advance-message-interval: 100 msec
+  },
+  timeout: 5 sec
 }
 
 reactor Looper(incr = 1, delay = 0 msec) {
-    input in_
-    output out
-    state count = 0
-    state received_count = 0
-    timer t(0, 1 sec)
+  input in_
+  output out
+  state count = 0
+  state received_count = 0
+  timer t(0, 1 sec)
 
-    reaction(t) -> out {=
-        SET(out, self->count);
-        self->count += self->incr;
-    =}
+  reaction(t) -> out {=
+    SET(out, self->count);
+    self->count += self->incr;
+  =}
 
-    reaction(in_) {=
-        instant_t time_lag = lf.time.physical() - lf.time.logical();
-        char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
-        lf_comma_separated_time(time_buffer, time_lag);
-        lf_print("Received %d. Logical time is behind physical time by %s nsec.", in_->value, time_buffer);
-        self->received_count = self->count;
-    =}
+  reaction(in_) {=
+    instant_t time_lag = lf.time.physical() - lf.time.logical();
+    char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
+    lf_comma_separated_time(time_buffer, time_lag);
+    lf_print("Received %d. Logical time is behind physical time by %s nsec.", in_->value, time_buffer);
+    self->received_count = self->count;
+  =}
 
-    reaction(t) {=
-        if (self->received_count != self->count) {
-            lf_print_error_and_exit("reaction(t) was invoked before reaction(in_). Precedence order was not kept.");
-        }
-    =}
+  reaction(t) {=
+    if (self->received_count != self->count) {
+      lf_print_error_and_exit("reaction(t) was invoked before reaction(in_). Precedence order was not kept.");
+    }
+  =}
 
-    reaction(shutdown) {=
-        lf_print("******* Shutdown invoked.");
-        if (self->count != 6 * self->incr) {
-            lf_print_error_and_exit("Failed to receive all six expected inputs.");
-        }
-    =}
+  reaction(shutdown) {=
+    lf_print("******* Shutdown invoked.");
+    if (self->count != 6 * self->incr) {
+      lf_print_error_and_exit("Failed to receive all six expected inputs.");
+    }
+  =}
 }
 
 federated reactor(delay = 0) {
-    left = new Looper()
-    right = new Looper(incr = -1)
-    left.out -> right.in_
-    right.out -> left.in_
+  left = new Looper()
+  right = new Looper(incr = -1)
+  left.out -> right.in_
+  right.out -> left.in_
 }
diff --git a/test/Python/src/federated/failing/LoopDistributedDecentralized.lf b/test/Python/src/federated/failing/LoopDistributedDecentralized.lf
index 529a7a11cf..801f2937b8 100644
--- a/test/Python/src/federated/failing/LoopDistributedDecentralized.lf
+++ b/test/Python/src/federated/failing/LoopDistributedDecentralized.lf
@@ -7,73 +7,73 @@
 # reason for failing: lf_comma_separated_time() not supported in the python
 # target
 target Python {
-    coordination: decentralized,
-    timeout: 5 sec
+  coordination: decentralized,
+  timeout: 5 sec
 }
 
 preamble {=
-    #include <unistd.h> // Defines sleep()
-    bool stop = false;
-    // Thread to trigger an action once every second.
-    void* ping(void* actionref) {
-        while(!stop) {
-            lf_print("Scheduling action.");
-            schedule(actionref, 0);
-            sleep(1);
-        }
-        return NULL;
+  #include <unistd.h> // Defines sleep()
+  bool stop = false;
+  // Thread to trigger an action once every second.
+  void* ping(void* actionref) {
+    while(!stop) {
+      lf_print("Scheduling action.");
+      schedule(actionref, 0);
+      sleep(1);
     }
+    return NULL;
+  }
 =}
 
 reactor Looper(incr(1), delay(0 msec), stp_offset(0)) {
-    input in_
-    output out
-    physical action a(stp_offset)
-    state count(0)
+  input in_
+  output out
+  physical action a(stp_offset)
+  state count(0)
 
-    reaction(startup) -> a {=
-        // Start the thread that listens for Enter or Return.
-        lf_thread_t thread_id;
-        lf_print("Starting thread.");
-        lf_thread_create(&thread_id, &ping, a);
-    =}
+  reaction(startup) -> a {=
+    // Start the thread that listens for Enter or Return.
+    lf_thread_t thread_id;
+    lf_print("Starting thread.");
+    lf_thread_create(&thread_id, &ping, a);
+  =}
 
-    reaction(a) -> out {=
-        lf_print("Setting out.");
-        SET(out, self->count);
-        self->count += self->incr;
-    =}
+  reaction(a) -> out {=
+    lf_print("Setting out.");
+    SET(out, self->count);
+    self->count += self->incr;
+  =}
 
-    reaction(in_) {=
-        instant_t time_lag = lf.time.physical() - lf.time.logical();
-        char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
-        lf_comma_separated_time(time_buffer, time_lag);
-        lf_print("Received %d. Logical time is behind physical time by %s nsec.", in_->value, time_buffer);
-    =} STP(stp_offset) {=
-        instant_t time_lag = lf.time.physical() - lf.time.logical();
-        char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
-        lf_comma_separated_time(time_buffer, time_lag);
-        lf_print("STP offset was violated. Received %d. Logical time is behind physical time by %s nsec.", in_->value, time_buffer);
-    =} deadline(10 msec) {=
-        instant_t time_lag = lf.time.physical() - lf.time.logical();
-        char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
-        lf_comma_separated_time(time_buffer, time_lag);
-        lf_print("Deadline miss. Received %d. Logical time is behind physical time by %s nsec.", in_->value, time_buffer);
-    =}
+  reaction(in_) {=
+    instant_t time_lag = lf.time.physical() - lf.time.logical();
+    char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
+    lf_comma_separated_time(time_buffer, time_lag);
+    lf_print("Received %d. Logical time is behind physical time by %s nsec.", in_->value, time_buffer);
+  =} STP(stp_offset) {=
+    instant_t time_lag = lf.time.physical() - lf.time.logical();
+    char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
+    lf_comma_separated_time(time_buffer, time_lag);
+    lf_print("STP offset was violated. Received %d. Logical time is behind physical time by %s nsec.", in_->value, time_buffer);
+  =} deadline(10 msec) {=
+    instant_t time_lag = lf.time.physical() - lf.time.logical();
+    char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
+    lf_comma_separated_time(time_buffer, time_lag);
+    lf_print("Deadline miss. Received %d. Logical time is behind physical time by %s nsec.", in_->value, time_buffer);
+  =}
 
-    reaction(shutdown) {=
-        lf_print("******* Shutdown invoked.");
-        // Stop the thread that is scheduling actions.
-        stop = true;
-        if (self->count != 5 * self->incr) {
-            lf_print_error_and_exit("Failed to receive all five expected inputs.");
-        }
-    =}
+  reaction(shutdown) {=
+    lf_print("******* Shutdown invoked.");
+    // Stop the thread that is scheduling actions.
+    stop = true;
+    if (self->count != 5 * self->incr) {
+      lf_print_error_and_exit("Failed to receive all five expected inputs.");
+    }
+  =}
 }
 
 federated reactor LoopDistributedDecentralized(delay(0)) {
-    left = new Looper(stp_offset = 900 usec)
-    right = new Looper(incr = -1, stp_offset = 2400 usec)
-    left.out -> right.in_
-    right.out -> left.in_
+  left = new Looper(stp_offset = 900 usec)
+  right = new Looper(incr = -1, stp_offset = 2400 usec)
+  left.out -> right.in_
+  right.out -> left.in_
 }
diff --git a/test/Python/src/federated/failing/LoopDistributedDouble.lf b/test/Python/src/federated/failing/LoopDistributedDouble.lf
index 4ccee4acd6..396f205255 100644
--- a/test/Python/src/federated/failing/LoopDistributedDouble.lf
+++ b/test/Python/src/federated/failing/LoopDistributedDouble.lf
@@ -6,84 +6,84 @@
  */
 # reason for failing: current tag struct not supported in the python target
 target Python {
-    coordination: centralized,
-    timeout: 5 sec
+  coordination: centralized,
+  timeout: 5 sec
 }
 
 preamble {=
-    #include <unistd.h> // Defines sleep()
-    stop = False
-    # Thread to trigger an action once every second.
-    void* ping(void* actionref) {
-        while(!stop) {
-            lf_print("Scheduling action.");
-            schedule(actionref, 0);
-            sleep(1);
-        }
-        return NULL;
+  #include <unistd.h> // Defines sleep()
+  stop = False
+  # Thread to trigger an action once every second.
+  void* ping(void* actionref) {
+    while(!stop) {
+      lf_print("Scheduling action.");
+      schedule(actionref, 0);
+      sleep(1);
     }
+    return NULL;
+  }
 =}
 
 reactor Looper(incr = 1, delay = 0 msec) {
-    input in_
-    input in2
-    output out
-    output out2
-    physical action a(delay)
-    state count = 0
-    timer t(0, 1 sec)
+  input in_
+  input in2
+  output out
+  output out2
+  physical action a(delay)
+  state count = 0
+  timer t(0, 1 sec)
 
-    reaction(startup) -> a {=
-        # Start the thread that listens for Enter or Return.
-        lf_thread_t thread_id;
-        lf_print("Starting thread.");
-        lf_thread_create(&thread_id, &ping, a);
-    =}
+  reaction(startup) -> a {=
+    # Start the thread that listens for Enter or Return.
+    lf_thread_t thread_id;
+    lf_print("Starting thread.");
+    lf_thread_create(&thread_id, &ping, a);
+  =}
 
-    reaction(a) -> out, out2 {=
-        if (self->count%2 == 0) {
-            SET(out, self->count);
-        } else {
-            SET(out2, self->count);
-        }
-        self->count += self->incr;
-    =}
+  reaction(a) -> out, out2 {=
+    if (self->count%2 == 0) {
+      SET(out, self->count);
+    } else {
+      SET(out2, self->count);
+    }
+    self->count += self->incr;
+  =}
 
-    reaction(in_) {=
-        lf_print("Received %d at logical time (%lld, %d).",
-            in->value,
-            current_tag.time - start_time, current_tag.microstep
-        );
-    =}
+  reaction(in_) {=
+    lf_print("Received %d at logical time (%lld, %d).",
+      in->value,
+      current_tag.time - start_time, current_tag.microstep
+    );
+  =}
 
-    reaction(in2) {=
-        lf_print("Received %d on in2 at logical time (%lld, %d).",
-            in2->value,
-            current_tag.time - start_time, current_tag.microstep
-        );
-    =}
+  reaction(in2) {=
+    lf_print("Received %d on in2 at logical time (%lld, %d).",
+      in2->value,
+      current_tag.time - start_time, current_tag.microstep
+    );
+  =}
 
-    reaction(t) {=
-        lf_print("Timer triggered at logical time (%lld, %d).",
-            current_tag.time - start_time, current_tag.microstep
-        );
-    =}
+  reaction(t) {=
+    lf_print("Timer triggered at logical time (%lld, %d).",
+      current_tag.time - start_time, current_tag.microstep
+    );
+  =}
 
-    reaction(shutdown) {=
-        lf_print("******* Shutdown invoked.");
-        // Stop the thread that is scheduling actions.
-        stop = true;
-        if (self->count != 5 * self->incr) {
-            lf_print_error_and_exit("Failed to receive all five expected inputs.");
-        }
-    =}
+  reaction(shutdown) {=
+    lf_print("******* Shutdown invoked.");
+    // Stop the thread that is scheduling actions.
+    stop = true;
+    if (self->count != 5 * self->incr) {
+      lf_print_error_and_exit("Failed to receive all five expected inputs.");
+    }
+  =}
 }
 
 federated reactor(delay = 0) {
-    left = new Looper()
-    right = new Looper(incr = -1)
-    left.out -> right.in_
-    right.out -> left.in_
-    right.out2 -> left.in2
-    left.out2 -> right.in2
+  left = new Looper()
+  right = new Looper(incr = -1)
+  left.out -> right.in_
+  right.out -> left.in_
+  right.out2 -> left.in2
+  left.out2 -> right.in2
 }
diff --git a/test/Python/src/federated/failing/TopLevelArtifacts.lf b/test/Python/src/federated/failing/TopLevelArtifacts.lf
index 1a13726c6c..07ba6e9c85 100644
--- a/test/Python/src/federated/failing/TopLevelArtifacts.lf
+++ b/test/Python/src/federated/failing/TopLevelArtifacts.lf
@@ -10,47 +10,47 @@
 // reason for failing: strange error during compile time. lfc seeems to treat this file as C target.
 
 target Python {
-    timeout: 1 msec
+  timeout: 1 msec
 };
 
 import Count from "../lib/Count.lf";
 import TestCount from "../lib/TestCount.lf";
 
 federated reactor {
-    preamble {=
-        import sys
-    =}
-    input in_;
-    output out;
-    state successes(0);
-    reaction (startup) {=
-        self.successes += 1;
-    =}
-    timer t(0, 1 sec);
-    reaction (t) -> act {=
-        self.successes += 1;
-        act.schedule(0);
-    =}
-    logical action act(0);
-    reaction (act) in_ -> out {=
-        self.successes += 1;
-        if in_.is_present:
-            self.sys.stderr.write("Input is present in the top-level reactor!\n");
-            self.sys.exit(1);
-        out.set(1);
-        if out.value != 1:
-            self.sys.stderr.write("Ouput has unexpected value {}!\n".format(out.value));
-            self.sys.exit(1);
-    =}
+  preamble {=
+    import sys
+  =}
+  input in_;
+  output out;
+  state successes(0);
+  reaction (startup) {=
+    self.successes += 1;
+  =}
+  timer t(0, 1 sec);
+  reaction (t) -> act {=
+    self.successes += 1;
+    act.schedule(0);
+  =}
+  logical action act(0);
+  reaction (act) in_ -> out {=
+    self.successes += 1;
+    if in_.is_present:
+      self.sys.stderr.write("Input is present in the top-level reactor!\n");
+      self.sys.exit(1);
+    out.set(1);
+    if out.value != 1:
+      self.sys.stderr.write("Ouput has unexpected value {}!\n".format(out.value));
+      self.sys.exit(1);
+  =}
 
-    c = new Count();
-    tc = new TestCount();
-    c.out -> tc.in_;
+  c = new Count();
+  tc = new TestCount();
+  c.out -> tc.in_;
 
-    reaction (shutdown) {=
-        if self->successes != 3:
-            self.sys.stderr.write("Failed to properly execute top-level reactions\n");
-            self.sys.exit(1);
-        print("SUCCESS!");
-    =}
+  reaction (shutdown) {=
+    if self->successes != 3:
+      self.sys.stderr.write("Failed to properly execute top-level reactions\n");
+      self.sys.exit(1);
+    print("SUCCESS!");
+  =}
 }
diff --git a/test/Python/src/lib/ImportedAgain.lf b/test/Python/src/lib/ImportedAgain.lf
index cabbf73f0a..3b5622e6aa 100644
--- a/test/Python/src/lib/ImportedAgain.lf
+++ b/test/Python/src/lib/ImportedAgain.lf
@@ -9,7 +9,7 @@ reactor ImportedAgain {
   reaction(x) {=
     print("Received: " + str(x.value))
     if (x.value != 42):
-        print("ERROR: Expected input to be 42. Got: " + x.value)
-        exit(1)
+      print("ERROR: Expected input to be 42. Got: " + x.value)
+      exit(1)
   =}
 }
diff --git a/test/Python/src/lib/LoopedActionSender.lf b/test/Python/src/lib/LoopedActionSender.lf
index 741e42b565..3056f3ed76 100644
--- a/test/Python/src/lib/LoopedActionSender.lf
+++ b/test/Python/src/lib/LoopedActionSender.lf
@@ -20,10 +20,10 @@ reactor Sender(take_a_break_after=10, break_interval = 400 msec) {
     out.set(self.sent_messages)
     self.sent_messages += 1
     if self.sent_messages < self.take_a_break_after:
-        act.schedule(0)
+      act.schedule(0)
     else:
-        # Take a break
-        self.sent_messages=0;
-        act.schedule(self.break_interval)
+      # Take a break
+      self.sent_messages=0;
+      act.schedule(self.break_interval)
   =}
 }
diff --git a/test/Python/src/lib/Test.lf b/test/Python/src/lib/Test.lf
index 6cbc45bfcb..6490d51338 100644
--- a/test/Python/src/lib/Test.lf
+++ b/test/Python/src/lib/Test.lf
@@ -7,8 +7,8 @@ reactor TestDouble(expected(1.0, 1.0, 1.0, 1.0)) {
   reaction(t_in) {=
     print("Received: ", t_in.value)
     if t_in.value != self.expected[self.count]:
-        sys.stderr.write("ERROR: Expected {:f}.\n".format(self.expected[self.count]))
-        exit(1)
+      sys.stderr.write("ERROR: Expected {:f}.\n".format(self.expected[self.count]))
+      exit(1)
     self.count += 1
   =}
 }
diff --git a/test/Python/src/lib/TestCount.lf b/test/Python/src/lib/TestCount.lf
index 1e527adc90..28dcf74ba0 100644
--- a/test/Python/src/lib/TestCount.lf
+++ b/test/Python/src/lib/TestCount.lf
@@ -17,8 +17,8 @@ reactor TestCount(start=1, stride=1, num_inputs=1) {
   reaction(in_) {=
     print("Received {}.".format(in_.value))
     if in_.value != self.count:
-        print("Expected {}.".format(self.count))
-        self.sys.exit(1)
+      print("Expected {}.".format(self.count))
+      self.sys.exit(1)
     self.count += self.stride;
     self.inputs_received += 1;
   =}
@@ -26,7 +26,7 @@ reactor TestCount(start=1, stride=1, num_inputs=1) {
   reaction(shutdown) {=
     print("Shutdown invoked.")
     if self.inputs_received != self.num_inputs:
-        print("Expected to receive {} inputs, but got {}.".format(self.num_inputs, self.inputs_received))
-        self.sys.exit(1)
+      print("Expected to receive {} inputs, but got {}.".format(self.num_inputs, self.inputs_received))
+      self.sys.exit(1)
   =}
 }
diff --git a/test/Python/src/lib/TestCountMultiport.lf b/test/Python/src/lib/TestCountMultiport.lf
index ffc997607a..0514bc2472 100644
--- a/test/Python/src/lib/TestCountMultiport.lf
+++ b/test/Python/src/lib/TestCountMultiport.lf
@@ -18,24 +18,24 @@ reactor TestCountMultiport(start=1, stride=1, num_inputs=1, width=2) {
 
   reaction(inp) {=
     for i in range(in_width):
-        if not inp[i].is_present:
-            print("No input on channel {}.".format(i))
-            self.sys.exit(1)
-        print("Received {} on channel {}.".format(inp[i].value, i))
-        if inp[i].value != self.count:
-            print("Expected {}.".format(self.count))
-            self.sys.exit(1)
-        self.count += self.stride
+      if not inp[i].is_present:
+        print("No input on channel {}.".format(i))
+        self.sys.exit(1)
+      print("Received {} on channel {}.".format(inp[i].value, i))
+      if inp[i].value != self.count:
+        print("Expected {}.".format(self.count))
+        self.sys.exit(1)
+      self.count += self.stride
     self.inputs_received += 1
   =}
 
   reaction(shutdown) {=
     print("Shutdown invoked.")
     if self.inputs_received != self.num_inputs:
-        print("Expected to receive {} inputs, but only got {}.".format(
-            self.num_inputs,
-            self.inputs_received
-        ))
-        self.sys.exit(1)
+      print("Expected to receive {} inputs, but only got {}.".format(
+        self.num_inputs,
+        self.inputs_received
+      ))
+      self.sys.exit(1)
   =}
 }
diff --git a/test/Python/src/modal_models/BanksCount3ModesComplex.lf b/test/Python/src/modal_models/BanksCount3ModesComplex.lf
index af97eec07b..757331dd7d 100644
--- a/test/Python/src/modal_models/BanksCount3ModesComplex.lf
+++ b/test/Python/src/modal_models/BanksCount3ModesComplex.lf
@@ -50,19 +50,19 @@ main reactor {
   timer stepper(0, 250 msec)
   counters = new[2] MetaCounter()
   test = new TraceTesting(events_size = 16, trace = (  // keep-format
-      0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-      250000000,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-      250000000,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-      250000000,1,1,1,1,1,1,1,1,0,3,0,3,0,3,0,3,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,
-      250000000,1,2,1,2,1,2,1,2,0,3,0,3,0,3,0,3,1,2,1,2,1,2,1,2,0,0,0,0,0,0,0,0,
-      250000000,1,3,1,3,1,3,1,3,1,1,1,1,1,1,1,1,0,2,0,2,0,2,0,2,0,0,0,0,0,0,0,0,
-      250000000,1,1,1,1,1,1,1,1,0,1,0,1,0,1,0,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,
-      250000000,1,2,1,2,1,2,1,2,0,1,0,1,0,1,0,1,1,2,1,2,1,2,1,2,0,0,0,0,0,0,0,0,
-      250000000,1,3,1,3,1,3,1,3,1,2,1,2,1,2,1,2,0,2,0,2,0,2,0,2,0,0,0,0,0,0,0,0,
-      250000000,1,1,1,1,1,1,1,1,0,2,0,2,0,2,0,2,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,
-      250000000,1,2,1,2,1,2,1,2,0,2,0,2,0,2,0,2,1,2,1,2,1,2,1,2,0,0,0,0,0,0,0,0,
-      250000000,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,0,2,0,2,0,2,0,2,0,0,0,0,0,0,0,0,
-      250000000,1,1,1,1,1,1,1,1,0,3,0,3,0,3,0,3,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0
+    0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    250000000,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    250000000,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    250000000,1,1,1,1,1,1,1,1,0,3,0,3,0,3,0,3,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,
+    250000000,1,2,1,2,1,2,1,2,0,3,0,3,0,3,0,3,1,2,1,2,1,2,1,2,0,0,0,0,0,0,0,0,
+    250000000,1,3,1,3,1,3,1,3,1,1,1,1,1,1,1,1,0,2,0,2,0,2,0,2,0,0,0,0,0,0,0,0,
+    250000000,1,1,1,1,1,1,1,1,0,1,0,1,0,1,0,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,
+    250000000,1,2,1,2,1,2,1,2,0,1,0,1,0,1,0,1,1,2,1,2,1,2,1,2,0,0,0,0,0,0,0,0,
+    250000000,1,3,1,3,1,3,1,3,1,2,1,2,1,2,1,2,0,2,0,2,0,2,0,2,0,0,0,0,0,0,0,0,
+    250000000,1,1,1,1,1,1,1,1,0,2,0,2,0,2,0,2,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,
+    250000000,1,2,1,2,1,2,1,2,0,2,0,2,0,2,0,2,1,2,1,2,1,2,1,2,0,0,0,0,0,0,0,0,
+    250000000,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,0,2,0,2,0,2,0,2,0,0,0,0,0,0,0,0,
+    250000000,1,1,1,1,1,1,1,1,0,3,0,3,0,3,0,3,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0
   ), training = False)
 
   counters.always, counters.mode1, counters.mode2, counters.never -> test.events
@@ -70,6 +70,6 @@ main reactor {
   # Trigger
   reaction(stepper) -> counters.next {=
     for i in range(len(counters)):
-        counters[i].next.set(True)
+      counters[i].next.set(True)
   =}
 }
diff --git a/test/Python/src/modal_models/BanksCount3ModesSimple.lf b/test/Python/src/modal_models/BanksCount3ModesSimple.lf
index 503a5b99eb..36c69879c0 100644
--- a/test/Python/src/modal_models/BanksCount3ModesSimple.lf
+++ b/test/Python/src/modal_models/BanksCount3ModesSimple.lf
@@ -11,15 +11,15 @@ main reactor {
   timer stepper(0, 250 msec)
   counters = new[3] CounterCycle()
   test = new TraceTesting(events_size = 3, trace = (  // keep-format
-      0,1,1,1,1,1,1,
-      250000000,1,2,1,2,1,2,
-      250000000,1,3,1,3,1,3,
-      250000000,1,1,1,1,1,1,
-      250000000,1,2,1,2,1,2,
-      250000000,1,3,1,3,1,3,
-      250000000,1,1,1,1,1,1,
-      250000000,1,2,1,2,1,2,
-      250000000,1,3,1,3,1,3
+    0,1,1,1,1,1,1,
+    250000000,1,2,1,2,1,2,
+    250000000,1,3,1,3,1,3,
+    250000000,1,1,1,1,1,1,
+    250000000,1,2,1,2,1,2,
+    250000000,1,3,1,3,1,3,
+    250000000,1,1,1,1,1,1,
+    250000000,1,2,1,2,1,2,
+    250000000,1,3,1,3,1,3
   ), training = False)
 
   counters.count -> test.events
@@ -27,6 +27,6 @@ main reactor {
   # Trigger
   reaction(stepper) -> counters.next {=
     for counter in counters:
-        counter.next.set(True)
+      counter.next.set(True)
   =}
 }
diff --git a/test/Python/src/modal_models/BanksModalStateReset.lf b/test/Python/src/modal_models/BanksModalStateReset.lf
index c81f8eea3e..a52b0fb2c6 100644
--- a/test/Python/src/modal_models/BanksModalStateReset.lf
+++ b/test/Python/src/modal_models/BanksModalStateReset.lf
@@ -14,25 +14,25 @@ main reactor {
   reset1 = new[2] ResetReaction()
   reset2 = new[2] AutoReset()
   test = new TraceTesting(events_size = 16, trace = (  // keep-format
-              0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,   0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,
-      250000000,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,   0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,
-      250000000,0,0,0,0,0,0,0,0,1,2,1,2,0,0,0,0,   0,0,0,0,0,0,0,0,1,2,1,2,0,0,0,0,
-      250000000,0,0,0,0,0,0,0,0,1,3,1,3,0,0,0,0,   0,0,0,0,0,0,0,0,1,3,1,3,0,0,0,0,
-      250000000,1,1,1,1,1,0,1,0,1,4,1,4,0,0,0,0,   1,1,1,1,1,0,1,0,1,4,1,4,0,0,0,0,
-              0,0,1,0,1,0,0,0,0,0,4,0,4,1,-2,1,-2, 0,1,0,1,0,0,0,0,0,4,0,4,1,-2,1,-2,
-      250000000,0,1,0,1,0,0,0,0,0,4,0,4,1,-1,1,-1, 0,1,0,1,0,0,0,0,0,4,0,4,1,-1,1,-1,
-      250000000,0,1,0,1,0,0,0,0,0,4,0,4,1,0,1,0,   0,1,0,1,0,0,0,0,0,4,0,4,1,0,1,0,
-      250000000,0,1,0,1,0,0,0,0,0,4,0,4,1,1,1,1,   0,1,0,1,0,0,0,0,0,4,0,4,1,1,1,1,
-      250000000,1,1,1,1,1,1,1,1,0,4,0,4,1,2,1,2,   1,1,1,1,1,1,1,1,0,4,0,4,1,2,1,2,
-      250000000,0,1,0,1,0,1,0,1,1,5,1,5,0,2,0,2,   0,1,0,1,0,1,0,1,1,5,1,5,0,2,0,2,
-      250000000,0,1,0,1,0,1,0,1,1,6,1,6,0,2,0,2,   0,1,0,1,0,1,0,1,1,6,1,6,0,2,0,2,
-      250000000,0,1,0,1,0,1,0,1,1,7,1,7,0,2,0,2,   0,1,0,1,0,1,0,1,1,7,1,7,0,2,0,2,
-      250000000,1,1,1,1,1,2,1,2,1,8,1,8,0,2,0,2,   1,1,1,1,1,2,1,2,1,8,1,8,0,2,0,2,
-              0,0,1,0,1,0,2,0,2,0,8,0,8,1,-2,1,-2, 0,1,0,1,0,2,0,2,0,8,0,8,1,-2,1,-2,
-      250000000,0,1,0,1,0,2,0,2,0,8,0,8,1,-1,1,-1, 0,1,0,1,0,2,0,2,0,8,0,8,1,-1,1,-1,
-      250000000,0,1,0,1,0,2,0,2,0,8,0,8,1,0,1,0,   0,1,0,1,0,2,0,2,0,8,0,8,1,0,1,0,
-      250000000,0,1,0,1,0,2,0,2,0,8,0,8,1,1,1,1,   0,1,0,1,0,2,0,2,0,8,0,8,1,1,1,1,
-      250000000,1,1,1,1,1,3,1,3,0,8,0,8,1,2,1,2,   1,1,1,1,1,3,1,3,0,8,0,8,1,2,1,2
+        0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,   0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,
+    250000000,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,   0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,
+    250000000,0,0,0,0,0,0,0,0,1,2,1,2,0,0,0,0,   0,0,0,0,0,0,0,0,1,2,1,2,0,0,0,0,
+    250000000,0,0,0,0,0,0,0,0,1,3,1,3,0,0,0,0,   0,0,0,0,0,0,0,0,1,3,1,3,0,0,0,0,
+    250000000,1,1,1,1,1,0,1,0,1,4,1,4,0,0,0,0,   1,1,1,1,1,0,1,0,1,4,1,4,0,0,0,0,
+        0,0,1,0,1,0,0,0,0,0,4,0,4,1,-2,1,-2, 0,1,0,1,0,0,0,0,0,4,0,4,1,-2,1,-2,
+    250000000,0,1,0,1,0,0,0,0,0,4,0,4,1,-1,1,-1, 0,1,0,1,0,0,0,0,0,4,0,4,1,-1,1,-1,
+    250000000,0,1,0,1,0,0,0,0,0,4,0,4,1,0,1,0,   0,1,0,1,0,0,0,0,0,4,0,4,1,0,1,0,
+    250000000,0,1,0,1,0,0,0,0,0,4,0,4,1,1,1,1,   0,1,0,1,0,0,0,0,0,4,0,4,1,1,1,1,
+    250000000,1,1,1,1,1,1,1,1,0,4,0,4,1,2,1,2,   1,1,1,1,1,1,1,1,0,4,0,4,1,2,1,2,
+    250000000,0,1,0,1,0,1,0,1,1,5,1,5,0,2,0,2,   0,1,0,1,0,1,0,1,1,5,1,5,0,2,0,2,
+    250000000,0,1,0,1,0,1,0,1,1,6,1,6,0,2,0,2,   0,1,0,1,0,1,0,1,1,6,1,6,0,2,0,2,
+    250000000,0,1,0,1,0,1,0,1,1,7,1,7,0,2,0,2,   0,1,0,1,0,1,0,1,1,7,1,7,0,2,0,2,
+    250000000,1,1,1,1,1,2,1,2,1,8,1,8,0,2,0,2,   1,1,1,1,1,2,1,2,1,8,1,8,0,2,0,2,
+        0,0,1,0,1,0,2,0,2,0,8,0,8,1,-2,1,-2, 0,1,0,1,0,2,0,2,0,8,0,8,1,-2,1,-2,
+    250000000,0,1,0,1,0,2,0,2,0,8,0,8,1,-1,1,-1, 0,1,0,1,0,2,0,2,0,8,0,8,1,-1,1,-1,
+    250000000,0,1,0,1,0,2,0,2,0,8,0,8,1,0,1,0,   0,1,0,1,0,2,0,2,0,8,0,8,1,0,1,0,
+    250000000,0,1,0,1,0,2,0,2,0,8,0,8,1,1,1,1,   0,1,0,1,0,2,0,2,0,8,0,8,1,1,1,1,
+    250000000,1,1,1,1,1,3,1,3,0,8,0,8,1,2,1,2,   1,1,1,1,1,3,1,3,0,8,0,8,1,2,1,2
   ), training = False)
 
   reset1.mode_switch,
@@ -47,11 +47,11 @@ main reactor {
   # Trigger mode change (separately because of #1278)
   reaction(stepper) -> reset1.next {=
     for i in range(len(reset1)):
-        reset1[i].next.set(True)
+      reset1[i].next.set(True)
   =}
 
   reaction(stepper) -> reset2.next {=
     for i in range(len(reset2)):
-        reset2[i].next.set(True)
+      reset2[i].next.set(True)
   =}
 }
diff --git a/test/Python/src/modal_models/ConvertCaseTest.lf b/test/Python/src/modal_models/ConvertCaseTest.lf
index c29c0703bf..f3f60af747 100644
--- a/test/Python/src/modal_models/ConvertCaseTest.lf
+++ b/test/Python/src/modal_models/ConvertCaseTest.lf
@@ -53,7 +53,7 @@ reactor Converter {
       character = raw.value.upper()
       converted.set(character)
       if character == ' ':
-          Lower.set()
+        Lower.set()
     =}
   }
 
@@ -62,7 +62,7 @@ reactor Converter {
       character = raw.value.lower()
       converted.set(character)
       if character == ' ':
-          Upper.set()
+        Upper.set()
     =}
   }
 }
@@ -75,8 +75,8 @@ reactor InputFeeder(message="") {
 
   reaction(t) -> character {=
     if self.idx < len(self.message):
-        character.set(self.message[self.idx])
-        self.idx += 1
+      character.set(self.message[self.idx])
+      self.idx += 1
   =}
 }
 
@@ -91,18 +91,18 @@ main reactor {
   feeder.character -> history_processor.character
 
   test = new TraceTesting(events_size = 2, trace = (  // keep-format
-      0, True, 'H', True, 'H',
-      250000000, True, 'E', True, 'E',
-      250000000, True, 'L', True, 'L',
-      250000000, True, '_', True, '_',
-      250000000, True, 'O', True, 'O',
-      250000000, True, ' ', True, ' ',
-      250000000, True, 'w', True, 'w',
-      250000000, True, '_', True, '_',
-      250000000, True, 'R', True, 'r',
-      250000000, True, 'L', True, 'l',
-      250000000, True, 'D', True, 'd',
-      250000000, True, '_', True, '_'
+    0, True, 'H', True, 'H',
+    250000000, True, 'E', True, 'E',
+    250000000, True, 'L', True, 'L',
+    250000000, True, '_', True, '_',
+    250000000, True, 'O', True, 'O',
+    250000000, True, ' ', True, ' ',
+    250000000, True, 'w', True, 'w',
+    250000000, True, '_', True, '_',
+    250000000, True, 'R', True, 'r',
+    250000000, True, 'L', True, 'l',
+    250000000, True, 'D', True, 'd',
+    250000000, True, '_', True, '_'
   ), training = False)
 
   reset_processor.converted, history_processor.converted -> test.events
@@ -115,5 +115,7 @@ main reactor {
 
   reaction(reset_processor.converted) {= print(f"Reset: {reset_processor.converted.value}") =}
 
-  reaction(history_processor.converted) {= print(f"History: {history_processor.converted.value}") =}
+  reaction(history_processor.converted) {=
+    print(f"History: {history_processor.converted.value}")
+  =}
 }
diff --git a/test/Python/src/modal_models/Count3Modes.lf b/test/Python/src/modal_models/Count3Modes.lf
index 5815c0bb99..8d67270300 100644
--- a/test/Python/src/modal_models/Count3Modes.lf
+++ b/test/Python/src/modal_models/Count3Modes.lf
@@ -43,15 +43,15 @@ main reactor {
     print(f"{counter.count.value}")
 
     if counter.count.is_present is not True:
-        sys.stderr.write("ERROR: Missing mode change.\n")
-        exit(1)
+      sys.stderr.write("ERROR: Missing mode change.\n")
+      exit(1)
     elif counter.count.value != self.expected_value:
-        sys.stderr.write("ERROR: Wrong mode.\n")
-        exit(2)
+      sys.stderr.write("ERROR: Wrong mode.\n")
+      exit(2)
 
     if self.expected_value == 3:
-        self.expected_value = 1
+      self.expected_value = 1
     else:
-        self.expected_value += 1
+      self.expected_value += 1
   =}
 }
diff --git a/test/Python/src/modal_models/ModalActions.lf b/test/Python/src/modal_models/ModalActions.lf
index 73f565c62a..5218a1428e 100644
--- a/test/Python/src/modal_models/ModalActions.lf
+++ b/test/Python/src/modal_models/ModalActions.lf
@@ -66,21 +66,21 @@ main reactor {
 
   modal = new Modal()
   test = new TraceTesting(events_size = 5, trace = (  // keep-format
-      0,0,0,1,1,0,0,0,0,0,0,
-      500000000,0,0,0,1,1,1,0,0,0,0,
-      250000000,0,0,1,1,0,1,0,0,0,0,
-      250000000,1,1,0,1,0,1,0,0,0,0,
-      0,0,1,0,1,0,1,1,1,0,0,
-      500000000,0,1,0,1,0,1,0,1,1,1,
-      250000000,0,1,0,1,0,1,1,1,0,1,
-      250000000,1,1,0,1,0,1,0,1,0,1,
-      250000000,0,1,0,1,1,1,0,1,0,1,
-      250000000,0,1,1,1,0,1,0,1,0,1,
-      500000000,1,1,0,1,1,1,0,1,0,1,
-      0,0,1,0,1,0,1,1,1,0,1,
-      500000000,0,1,0,1,0,1,0,1,1,1,
-      250000000,0,1,0,1,0,1,1,1,0,1,
-      250000000,1,1,0,1,0,1,0,1,0,1
+    0,0,0,1,1,0,0,0,0,0,0,
+    500000000,0,0,0,1,1,1,0,0,0,0,
+    250000000,0,0,1,1,0,1,0,0,0,0,
+    250000000,1,1,0,1,0,1,0,0,0,0,
+    0,0,1,0,1,0,1,1,1,0,0,
+    500000000,0,1,0,1,0,1,0,1,1,1,
+    250000000,0,1,0,1,0,1,1,1,0,1,
+    250000000,1,1,0,1,0,1,0,1,0,1,
+    250000000,0,1,0,1,1,1,0,1,0,1,
+    250000000,0,1,1,1,0,1,0,1,0,1,
+    500000000,1,1,0,1,1,1,0,1,0,1,
+    0,0,1,0,1,0,1,1,1,0,1,
+    500000000,0,1,0,1,0,1,0,1,1,1,
+    250000000,0,1,0,1,0,1,1,1,0,1,
+    250000000,1,1,0,1,0,1,0,1,0,1
   ), training = False)
 
   modal.mode_switch,
diff --git a/test/Python/src/modal_models/ModalAfter.lf b/test/Python/src/modal_models/ModalAfter.lf
index 88d8f414bb..f5e8141e00 100644
--- a/test/Python/src/modal_models/ModalAfter.lf
+++ b/test/Python/src/modal_models/ModalAfter.lf
@@ -71,21 +71,21 @@ main reactor {
 
   modal = new Modal()
   test = new TraceTesting(events_size = 5, trace = (  // keep-format
-      0,0,0,1,1,0,0,0,0,0,0,
-      500000000,0,0,0,1,1,1,0,0,0,0,
-      250000000,0,0,1,1,0,1,0,0,0,0,
-      250000000,1,1,0,1,0,1,0,0,0,0,
-      0,0,1,0,1,0,1,1,1,0,0,
-      500000000,0,1,0,1,0,1,0,1,1,1,
-      250000000,0,1,0,1,0,1,1,1,0,1,
-      250000000,1,1,0,1,0,1,0,1,0,1,
-      250000000,0,1,0,1,1,1,0,1,0,1,
-      250000000,0,1,1,1,0,1,0,1,0,1,
-      500000000,1,1,0,1,1,1,0,1,0,1,
-      0,0,1,0,1,0,1,1,1,0,1,
-      500000000,0,1,0,1,0,1,0,1,1,1,
-      250000000,0,1,0,1,0,1,1,1,0,1,
-      250000000,1,1,0,1,0,1,0,1,0,1
+    0,0,0,1,1,0,0,0,0,0,0,
+    500000000,0,0,0,1,1,1,0,0,0,0,
+    250000000,0,0,1,1,0,1,0,0,0,0,
+    250000000,1,1,0,1,0,1,0,0,0,0,
+    0,0,1,0,1,0,1,1,1,0,0,
+    500000000,0,1,0,1,0,1,0,1,1,1,
+    250000000,0,1,0,1,0,1,1,1,0,1,
+    250000000,1,1,0,1,0,1,0,1,0,1,
+    250000000,0,1,0,1,1,1,0,1,0,1,
+    250000000,0,1,1,1,0,1,0,1,0,1,
+    500000000,1,1,0,1,1,1,0,1,0,1,
+    0,0,1,0,1,0,1,1,1,0,1,
+    500000000,0,1,0,1,0,1,0,1,1,1,
+    250000000,0,1,0,1,0,1,1,1,0,1,
+    250000000,1,1,0,1,0,1,0,1,0,1
   ), training = False)
 
   modal.mode_switch, modal.produced1, modal.consumed1, modal.produced2, modal.consumed2
diff --git a/test/Python/src/modal_models/ModalCycleBreaker.lf b/test/Python/src/modal_models/ModalCycleBreaker.lf
index f790373131..2475366927 100644
--- a/test/Python/src/modal_models/ModalCycleBreaker.lf
+++ b/test/Python/src/modal_models/ModalCycleBreaker.lf
@@ -32,8 +32,8 @@ reactor Modal {
 
     reaction(in1) -> reset(Two) {=
       if in1.value % 5 == 4:
-          Two.set()
-          print("Switching to mode Two")
+        Two.set()
+        print("Switching to mode Two")
     =}
   }
 }
@@ -54,15 +54,15 @@ main reactor {
   counter = new Counter(period = 100 msec)
   modal = new Modal()
   test = new TraceTesting(events_size = 1, trace = (  // keep-format
-      0,1,0,
-      100000000,1,1,
-      100000000,1,2,
-      100000000,1,3,
-      100000000,1,4,
-      200000000,1,6,
-      100000000,1,7,
-      100000000,1,8,
-      100000000,1,9
+    0,1,0,
+    100000000,1,1,
+    100000000,1,2,
+    100000000,1,3,
+    100000000,1,4,
+    200000000,1,6,
+    100000000,1,7,
+    100000000,1,8,
+    100000000,1,9
   ), training = False)
 
   counter.value -> modal.in1
diff --git a/test/Python/src/modal_models/ModalNestedReactions.lf b/test/Python/src/modal_models/ModalNestedReactions.lf
index 82fbbd5275..5f30da93b8 100644
--- a/test/Python/src/modal_models/ModalNestedReactions.lf
+++ b/test/Python/src/modal_models/ModalNestedReactions.lf
@@ -51,14 +51,14 @@ main reactor {
     print(counter.count.value)
 
     if counter.count.is_present is not True:
-        sys.stderr.write("ERROR: Missing mode change.\n")
-        exit(1)
+      sys.stderr.write("ERROR: Missing mode change.\n")
+      exit(1)
     elif counter.only_in_two.is_present and (counter.count.value != 2):
-        sys.stderr.write("ERROR: Indirectly nested reaction was not properly deactivated.\n")
-        exit(2)
+      sys.stderr.write("ERROR: Indirectly nested reaction was not properly deactivated.\n")
+      exit(2)
     elif counter.only_in_two.is_present is not True and (counter.count.value == 2):
-        sys.stderr.write("ERROR: Missing output from indirectly nested reaction.\n")
-        exit(3)
+      sys.stderr.write("ERROR: Missing output from indirectly nested reaction.\n")
+      exit(3)
   =}
 
   reaction(counter.never) {=
diff --git a/test/Python/src/modal_models/ModalStartupShutdown.lf b/test/Python/src/modal_models/ModalStartupShutdown.lf
index e464f79c42..8dc7eb8dd1 100644
--- a/test/Python/src/modal_models/ModalStartupShutdown.lf
+++ b/test/Python/src/modal_models/ModalStartupShutdown.lf
@@ -112,17 +112,17 @@ main reactor {
 
   modal = new Modal()
   test = new TraceTesting(events_size = 11, trace = (  // keep-format
-      0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-      500000000,1,2,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-      0,0,2,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-      500000000,1,3,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-      500000000,1,4,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-      0,0,4,0,1,0,1,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,
-      500000000,1,4,0,1,0,1,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,
-      0,0,4,0,1,0,1,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,
-      500000000,1,4,0,1,0,1,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,
-      0,0,4,0,1,0,1,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,
-      500000000,1,4,0,1,0,1,1,1,1,1,0,1,0,1,1,1,0,0,0,0,0,0
+    0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    500000000,1,2,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,2,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    500000000,1,3,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    500000000,1,4,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,4,0,1,0,1,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,
+    500000000,1,4,0,1,0,1,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,
+    0,0,4,0,1,0,1,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,
+    500000000,1,4,0,1,0,1,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,
+    0,0,4,0,1,0,1,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,
+    500000000,1,4,0,1,0,1,1,1,1,1,0,1,0,1,1,1,0,0,0,0,0,0
   ), training = False)
 
   modal.mode_switch,
diff --git a/test/Python/src/modal_models/ModalStateReset.lf b/test/Python/src/modal_models/ModalStateReset.lf
index 76f94b259b..5de6b61e35 100644
--- a/test/Python/src/modal_models/ModalStateReset.lf
+++ b/test/Python/src/modal_models/ModalStateReset.lf
@@ -64,25 +64,25 @@ main reactor {
 
   modal = new Modal()
   test = new TraceTesting(events_size = 4, trace = (  // keep-format
-      0,0,0,0,0,1,0,0,0,
-      250000000,0,0,0,0,1,1,0,0,
-      250000000,0,0,0,0,1,2,0,0,
-      250000000,0,0,0,0,1,3,0,0,
-      250000000,1,1,1,0,1,4,0,0,
-      0,0,1,0,0,0,4,1,-2,
-      250000000,0,1,0,0,0,4,1,-1,
-      250000000,0,1,0,0,0,4,1,0,
-      250000000,0,1,0,0,0,4,1,1,
-      250000000,1,1,1,1,0,4,1,2,
-      250000000,0,1,0,1,1,5,0,2,
-      250000000,0,1,0,1,1,6,0,2,
-      250000000,0,1,0,1,1,7,0,2,
-      250000000,1,1,1,2,1,8,0,2,
-      0,0,1,0,2,0,8,1,-2,
-      250000000,0,1,0,2,0,8,1,-1,
-      250000000,0,1,0,2,0,8,1,0,
-      250000000,0,1,0,2,0,8,1,1,
-      250000000,1,1,1,3,0,8,1,2
+    0,0,0,0,0,1,0,0,0,
+    250000000,0,0,0,0,1,1,0,0,
+    250000000,0,0,0,0,1,2,0,0,
+    250000000,0,0,0,0,1,3,0,0,
+    250000000,1,1,1,0,1,4,0,0,
+    0,0,1,0,0,0,4,1,-2,
+    250000000,0,1,0,0,0,4,1,-1,
+    250000000,0,1,0,0,0,4,1,0,
+    250000000,0,1,0,0,0,4,1,1,
+    250000000,1,1,1,1,0,4,1,2,
+    250000000,0,1,0,1,1,5,0,2,
+    250000000,0,1,0,1,1,6,0,2,
+    250000000,0,1,0,1,1,7,0,2,
+    250000000,1,1,1,2,1,8,0,2,
+    0,0,1,0,2,0,8,1,-2,
+    250000000,0,1,0,2,0,8,1,-1,
+    250000000,0,1,0,2,0,8,1,0,
+    250000000,0,1,0,2,0,8,1,1,
+    250000000,1,1,1,3,0,8,1,2
   ), training = False)
 
   modal.mode_switch, modal.count0, modal.count1, modal.count2 -> test.events
diff --git a/test/Python/src/modal_models/ModalStateResetAuto.lf b/test/Python/src/modal_models/ModalStateResetAuto.lf
index ab09f7f325..492d02f234 100644
--- a/test/Python/src/modal_models/ModalStateResetAuto.lf
+++ b/test/Python/src/modal_models/ModalStateResetAuto.lf
@@ -60,25 +60,25 @@ main reactor {
 
   modal = new Modal()
   test = new TraceTesting(events_size = 4, trace = (  // keep-format
-      0,0,0,0,0,1,0,0,0,
-      250000000,0,0,0,0,1,1,0,0,
-      250000000,0,0,0,0,1,2,0,0,
-      250000000,0,0,0,0,1,3,0,0,
-      250000000,1,1,1,0,1,4,0,0,
-      0,0,1,0,0,0,4,1,-2,
-      250000000,0,1,0,0,0,4,1,-1,
-      250000000,0,1,0,0,0,4,1,0,
-      250000000,0,1,0,0,0,4,1,1,
-      250000000,1,1,1,1,0,4,1,2,
-      250000000,0,1,0,1,1,5,0,2,
-      250000000,0,1,0,1,1,6,0,2,
-      250000000,0,1,0,1,1,7,0,2,
-      250000000,1,1,1,2,1,8,0,2,
-      0,0,1,0,2,0,8,1,-2,
-      250000000,0,1,0,2,0,8,1,-1,
-      250000000,0,1,0,2,0,8,1,0,
-      250000000,0,1,0,2,0,8,1,1,
-      250000000,1,1,1,3,0,8,1,2
+    0,0,0,0,0,1,0,0,0,
+    250000000,0,0,0,0,1,1,0,0,
+    250000000,0,0,0,0,1,2,0,0,
+    250000000,0,0,0,0,1,3,0,0,
+    250000000,1,1,1,0,1,4,0,0,
+    0,0,1,0,0,0,4,1,-2,
+    250000000,0,1,0,0,0,4,1,-1,
+    250000000,0,1,0,0,0,4,1,0,
+    250000000,0,1,0,0,0,4,1,1,
+    250000000,1,1,1,1,0,4,1,2,
+    250000000,0,1,0,1,1,5,0,2,
+    250000000,0,1,0,1,1,6,0,2,
+    250000000,0,1,0,1,1,7,0,2,
+    250000000,1,1,1,2,1,8,0,2,
+    0,0,1,0,2,0,8,1,-2,
+    250000000,0,1,0,2,0,8,1,-1,
+    250000000,0,1,0,2,0,8,1,0,
+    250000000,0,1,0,2,0,8,1,1,
+    250000000,1,1,1,3,0,8,1,2
   ), training = False)
 
   modal.mode_switch, modal.count0, modal.count1, modal.count2 -> test.events
diff --git a/test/Python/src/modal_models/ModalTimers.lf b/test/Python/src/modal_models/ModalTimers.lf
index 9f92a876fb..f752e025d8 100644
--- a/test/Python/src/modal_models/ModalTimers.lf
+++ b/test/Python/src/modal_models/ModalTimers.lf
@@ -47,17 +47,17 @@ main reactor {
 
   modal = new Modal()
   test = new TraceTesting(events_size = 3, trace = (  // keep-format
-      0,0,0,1,1,0,0,
-      750000000,0,0,1,1,0,0,
-      250000000,1,1,0,1,0,0,
-      0,0,1,0,1,1,1,
-      750000000,0,1,0,1,1,1,
-      250000000,1,1,0,1,0,1,
-      500000000,0,1,1,1,0,1,
-      500000000,1,1,0,1,0,1,
-      0,0,1,0,1,1,1,
-      750000000,0,1,0,1,1,1,
-      250000000,1,1,0,1,0,1
+    0,0,0,1,1,0,0,
+    750000000,0,0,1,1,0,0,
+    250000000,1,1,0,1,0,0,
+    0,0,1,0,1,1,1,
+    750000000,0,1,0,1,1,1,
+    250000000,1,1,0,1,0,1,
+    500000000,0,1,1,1,0,1,
+    500000000,1,1,0,1,0,1,
+    0,0,1,0,1,1,1,
+    750000000,0,1,0,1,1,1,
+    250000000,1,1,0,1,0,1
   ), training = False)
 
   modal.mode_switch, modal.timer1, modal.timer2 -> test.events
diff --git a/test/Python/src/modal_models/MultipleOutputFeeder_2Connections.lf b/test/Python/src/modal_models/MultipleOutputFeeder_2Connections.lf
index 9eebec636f..6b38c0f136 100644
--- a/test/Python/src/modal_models/MultipleOutputFeeder_2Connections.lf
+++ b/test/Python/src/modal_models/MultipleOutputFeeder_2Connections.lf
@@ -45,28 +45,28 @@ main reactor {
 
   modal = new Modal()
   test = new TraceTesting(events_size = 1, trace = (  // keep-format
-      0,1,0,
-      250000000,1,1,
-      250000000,1,2,
-      0,1,0,
-      100000000,1,1,
-      100000000,1,2,
-      100000000,1,3,
-      100000000,1,4,
-      100000000,1,5,
-      250000000,1,3,
-      250000000,1,4,
-      0,1,0,
-      100000000,1,1,
-      100000000,1,2,
-      100000000,1,3,
-      100000000,1,4,
-      100000000,1,5
+    0,1,0,
+    250000000,1,1,
+    250000000,1,2,
+    0,1,0,
+    100000000,1,1,
+    100000000,1,2,
+    100000000,1,3,
+    100000000,1,4,
+    100000000,1,5,
+    250000000,1,3,
+    250000000,1,4,
+    0,1,0,
+    100000000,1,1,
+    100000000,1,2,
+    100000000,1,3,
+    100000000,1,4,
+    100000000,1,5
   ), training = False)
 
   modal.count -> test.events
 
   reaction(stepper) -> modal.next {= modal.next.set(True) =}  # Trigger mode change
 
-  reaction(modal.count) {= print(modal.count.value) =}        # Print
+  reaction(modal.count) {= print(modal.count.value) =}    # Print
 }
diff --git a/test/Python/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf b/test/Python/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf
index 1b1c0429a1..fc5c7e9a56 100644
--- a/test/Python/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf
+++ b/test/Python/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf
@@ -46,28 +46,28 @@ main reactor {
 
   modal = new Modal()
   test = new TraceTesting(events_size = 1, trace = (  // keep-format
-      0,1,0,
-      250000000,1,1,
-      250000000,1,2,
-      0,1,0,
-      100000000,1,10,
-      100000000,1,20,
-      100000000,1,30,
-      100000000,1,40,
-      100000000,1,50,
-      250000000,1,3,
-      250000000,1,4,
-      0,1,0,
-      100000000,1,10,
-      100000000,1,20,
-      100000000,1,30,
-      100000000,1,40,
-      100000000,1,50
+    0,1,0,
+    250000000,1,1,
+    250000000,1,2,
+    0,1,0,
+    100000000,1,10,
+    100000000,1,20,
+    100000000,1,30,
+    100000000,1,40,
+    100000000,1,50,
+    250000000,1,3,
+    250000000,1,4,
+    0,1,0,
+    100000000,1,10,
+    100000000,1,20,
+    100000000,1,30,
+    100000000,1,40,
+    100000000,1,50
   ), training = False)
 
   modal.count -> test.events
 
   reaction(stepper) -> modal.next {= modal.next.set(True) =}  # Trigger mode change
 
-  reaction(modal.count) {= print(modal.count.value) =}        # Print
+  reaction(modal.count) {= print(modal.count.value) =}    # Print
 }
diff --git a/test/Python/src/modal_models/util/TraceTesting.lf b/test/Python/src/modal_models/util/TraceTesting.lf
index 24a1f26063..833ffa0ca6 100644
--- a/test/Python/src/modal_models/util/TraceTesting.lf
+++ b/test/Python/src/modal_models/util/TraceTesting.lf
@@ -16,47 +16,47 @@ reactor TraceTesting(events_size=0, trace = {= [] =}, training=False) {
     curr_reaction_delay = lf.time.logical() - self.last_reaction_time
 
     if self.training:
-        # Save the time
-        self.recorded_events.append(curr_reaction_delay)
+      # Save the time
+      self.recorded_events.append(curr_reaction_delay)
     else:
-        if self.trace_idx >= len(self.trace):
-            sys.stderr.write("ERROR: Trace Error: Current execution exceeds given trace.\n")
-            exit(1)
+      if self.trace_idx >= len(self.trace):
+        sys.stderr.write("ERROR: Trace Error: Current execution exceeds given trace.\n")
+        exit(1)
 
-        trace_reaction_delay = self.trace[self.trace_idx]
-        self.trace_idx += 1
+      trace_reaction_delay = self.trace[self.trace_idx]
+      self.trace_idx += 1
 
-        if curr_reaction_delay != trace_reaction_delay:
-            sys.stderr.write(f"ERROR: Trace Mismatch: Unexpected reaction timing. (delay: {curr_reaction_delay}, expected: {trace_reaction_delay})\n")
-            exit(2)
+      if curr_reaction_delay != trace_reaction_delay:
+        sys.stderr.write(f"ERROR: Trace Mismatch: Unexpected reaction timing. (delay: {curr_reaction_delay}, expected: {trace_reaction_delay})\n")
+        exit(2)
 
     for i in range(self.events_size):
-        curr_present = events[i].is_present
-        curr_value = events[i].value
-
-        if self.training:
-            # Save the event
-            self.recorded_events.append(curr_present)
-            self.recorded_events.append(curr_value)
-        else:
-            trace_present = self.trace[self.trace_idx]
-            self.trace_idx += 1
-            trace_value = self.trace[self.trace_idx]
-            self.trace_idx += 1
-
-            if trace_present != curr_present:
-                sys.stderr.write(f"ERROR: Trace Mismatch: Unexpected event presence. (event: {i}, presence: {curr_present}, expected: {trace_present})\n")
-                exit(3)
-            elif curr_present and trace_value != curr_value:
-                sys.stderr.write(f"ERROR: Trace Mismatch: Unexpected event presence. (event: {i}, value: {curr_value}, expected: {trace_value})\n")
-                exit(4)
+      curr_present = events[i].is_present
+      curr_value = events[i].value
+
+      if self.training:
+        # Save the event
+        self.recorded_events.append(curr_present)
+        self.recorded_events.append(curr_value)
+      else:
+        trace_present = self.trace[self.trace_idx]
+        self.trace_idx += 1
+        trace_value = self.trace[self.trace_idx]
+        self.trace_idx += 1
+
+        if trace_present != curr_present:
+          sys.stderr.write(f"ERROR: Trace Mismatch: Unexpected event presence. (event: {i}, presence: {curr_present}, expected: {trace_present})\n")
+          exit(3)
+        elif curr_present and trace_value != curr_value:
+          sys.stderr.write(f"ERROR: Trace Mismatch: Unexpected event presence. (event: {i}, value: {curr_value}, expected: {trace_value})\n")
+          exit(4)
 
     self.last_reaction_time = lf.time.logical()
   =}
 
   reaction(shutdown) {=
     if self.training:
-        print(f"Recorded event trace ({self.recorded_events_next}):")
-        print(self.recorded_events)
+      print(f"Recorded event trace ({self.recorded_events_next}):")
+      print(self.recorded_events)
   =}
 }
diff --git a/test/Python/src/multiport/BankIndexInitializer.lf b/test/Python/src/multiport/BankIndexInitializer.lf
index caaf62efbf..babef36a7c 100644
--- a/test/Python/src/multiport/BankIndexInitializer.lf
+++ b/test/Python/src/multiport/BankIndexInitializer.lf
@@ -15,18 +15,18 @@ reactor Sink(width=4) {
 
   reaction(_in) {=
     for (idx, port) in enumerate(_in):
-        if port.is_present is True:
-            print("Received on channel {:d}: {:d}".format(idx, port.value))
-            self.received = True
-            if port.value != 4 - idx:
-                sys.stderr.write("ERROR: expected {:d}\n".format(4 - idx))
-                exit(1)
+      if port.is_present is True:
+        print("Received on channel {:d}: {:d}".format(idx, port.value))
+        self.received = True
+        if port.value != 4 - idx:
+          sys.stderr.write("ERROR: expected {:d}\n".format(4 - idx))
+          exit(1)
   =}
 
   reaction(shutdown) {=
     if self.received is False:
-        sys.stderr.write("ERROR: Sink received no data\n")
-        exit(1)
+      sys.stderr.write("ERROR: Sink received no data\n")
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/multiport/BankReactionsInContainer.lf b/test/Python/src/multiport/BankReactionsInContainer.lf
index 4894173d45..b270ef2629 100644
--- a/test/Python/src/multiport/BankReactionsInContainer.lf
+++ b/test/Python/src/multiport/BankReactionsInContainer.lf
@@ -10,26 +10,26 @@ reactor R(bank_index=0) {
 
   reaction(startup) -> out {=
     for (i, p) in enumerate(out):
-        value = self.bank_index * 2 + i
-        p.set(value)
-        print(f"Inner sending {value} to bank {self.bank_index} channel {i}.")
+      value = self.bank_index * 2 + i
+      p.set(value)
+      print(f"Inner sending {value} to bank {self.bank_index} channel {i}.")
   =}
 
   reaction(inp) {=
     for (i, p) in enumerate(inp):
-        if p.is_present:
-            print(f"Inner received {p.value} in bank {self.bank_index}, channel {i}")
-            self.received = True
-            if p.value != (self.bank_index * 2 + i):
-                sys.stderr.write(f"ERROR: Expected {self.bank_index * 2 + i}.\n")
-                exit(1)
+      if p.is_present:
+        print(f"Inner received {p.value} in bank {self.bank_index}, channel {i}")
+        self.received = True
+        if p.value != (self.bank_index * 2 + i):
+          sys.stderr.write(f"ERROR: Expected {self.bank_index * 2 + i}.\n")
+          exit(1)
   =}
 
   reaction(shutdown) {=
     print("Inner shutdown invoked.")
     if self.received is not True:
-        sys.stderr.write(f"ERROR: Received no input.")
-        exit(1)
+      sys.stderr.write(f"ERROR: Received no input.")
+      exit(1)
   =}
 }
 
@@ -40,27 +40,27 @@ main reactor {
   reaction(startup) -> s.inp {=
     count = 0
     for i in range(len(s)):
-        for (j, p) in enumerate(s[i].inp):
-            print(f"Sending {count} to bank {i} channel {j}.")
-            p.set(count)
-            count+=1
+      for (j, p) in enumerate(s[i].inp):
+        print(f"Sending {count} to bank {i} channel {j}.")
+        p.set(count)
+        count+=1
   =}
 
   reaction(s.out) {=
     for i in range(len(s)):
-        for (j, p) in enumerate(s[i].out):
-            if p.is_present:
-                print(f"Outer received {p.value} on bank {i} channel {j}.")
-                self.received = True
-                if p.value != i * 2 + j:
-                    sys.stderr.write(f"ERROR: Expected {i*2+j}.\n")
-                    exit(1)
+      for (j, p) in enumerate(s[i].out):
+        if p.is_present:
+          print(f"Outer received {p.value} on bank {i} channel {j}.")
+          self.received = True
+          if p.value != i * 2 + j:
+            sys.stderr.write(f"ERROR: Expected {i*2+j}.\n")
+            exit(1)
   =}
 
   reaction(shutdown) {=
     print("Outer shutdown invoked.")
     if self.received is not True:
-        sys.stderr.write(f"ERROR: Received no input.\n")
-        exit(1)
+      sys.stderr.write(f"ERROR: Received no input.\n")
+      exit(1)
   =}
 }
diff --git a/test/Python/src/multiport/BankToBank.lf b/test/Python/src/multiport/BankToBank.lf
index ac4632fd46..2d8d48147e 100644
--- a/test/Python/src/multiport/BankToBank.lf
+++ b/test/Python/src/multiport/BankToBank.lf
@@ -22,15 +22,15 @@ reactor Destination(bank_index=0) {
   reaction(_in) {=
     print("Destination " + str(self.bank_index) + " received: " + str(_in.value))
     if (_in.value != self.s):
-        sys.stderr.write("ERROR: Expected " + str(self.s))
-        exit(1)
+      sys.stderr.write("ERROR: Expected " + str(self.s))
+      exit(1)
     self.s += self.bank_index
   =}
 
   reaction(shutdown) {=
     if self.s == 0 and self.bank_index != 0:
-        sys.stderr.write("ERROR: Destination " + self.bank_index + " received no input!")
-        exit(1)
+      sys.stderr.write("ERROR: Destination " + self.bank_index + " received no input!")
+      exit(1)
     print("Success.")
   =}
 }
diff --git a/test/Python/src/multiport/BankToBankMultiport.lf b/test/Python/src/multiport/BankToBankMultiport.lf
index b1c7762871..fdeb1d71c5 100644
--- a/test/Python/src/multiport/BankToBankMultiport.lf
+++ b/test/Python/src/multiport/BankToBankMultiport.lf
@@ -11,8 +11,8 @@ reactor Source(width=1) {
 
   reaction(t) -> out {=
     for port in out:
-        port.set(self.s)
-        self.s += 1
+      port.set(self.s)
+      self.s += 1
   =}
 }
 
@@ -23,21 +23,21 @@ reactor Destination(width=1) {
   reaction(_in) {=
     sm = 0
     for port in _in:
-        if port.is_present:
-            sm += port.value
+      if port.is_present:
+        sm += port.value
 
     print("Sum of received: ", sm)
     if sm != self.s:
-        sys.stderr.write("ERROR: Expected {:d}.\n".format(self.s))
-        exit(1)
+      sys.stderr.write("ERROR: Expected {:d}.\n".format(self.s))
+      exit(1)
 
     self.s += 16
   =}
 
   reaction(shutdown) {=
     if self.s <= 6:
-        sys.stderr.write("ERROR: Destination received no input!\n")
-        exit(1)
+      sys.stderr.write("ERROR: Destination received no input!\n")
+      exit(1)
 
     print("Success.")
   =}
diff --git a/test/Python/src/multiport/BankToMultiport.lf b/test/Python/src/multiport/BankToMultiport.lf
index 574b562601..7be7e38e21 100644
--- a/test/Python/src/multiport/BankToMultiport.lf
+++ b/test/Python/src/multiport/BankToMultiport.lf
@@ -13,18 +13,18 @@ reactor Sink(width=4) {
 
   reaction(_in) {=
     for (idx, port) in enumerate(_in):
-        if port.is_present is True:
-            print("Received on channel {:d}: {:d}".format(idx, port.value))
-            self.received = True
-            if port.value != idx:
-                sys.stderr.write("ERROR: expected {:d}\n".format(idx))
-                exit(1)
+      if port.is_present is True:
+        print("Received on channel {:d}: {:d}".format(idx, port.value))
+        self.received = True
+        if port.value != idx:
+          sys.stderr.write("ERROR: expected {:d}\n".format(idx))
+          exit(1)
   =}
 
   reaction(shutdown) {=
     if self.received is False:
-        sys.stderr.write("ERROR: Sink received no data\n")
-        exit(1)
+      sys.stderr.write("ERROR: Sink received no data\n")
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/multiport/Broadcast.lf b/test/Python/src/multiport/Broadcast.lf
index 95a106ca0d..ad10435c7b 100644
--- a/test/Python/src/multiport/Broadcast.lf
+++ b/test/Python/src/multiport/Broadcast.lf
@@ -16,19 +16,19 @@ reactor Destination(bank_index=0, delay=0) {
   reaction(_in) {=
     print(f"Destination {self.bank_index} received {_in.value}.")
     if (_in.value != 42):
-        sys.stderr.write("ERROR: Expected 42.\n")
-        exit(1)
+      sys.stderr.write("ERROR: Expected 42.\n")
+      exit(1)
 
     if lf.time.logical_elapsed() != self.delay:
-        sys.stderr.write(f"ERROR: Expected to receive input after {self.delay/1000000000} second(s).\n")
-        exit(2)
+      sys.stderr.write(f"ERROR: Expected to receive input after {self.delay/1000000000} second(s).\n")
+      exit(2)
     self.received = True
   =}
 
   reaction(shutdown) {=
     if self.received is not True:
-        sys.stderr.write(f"ERROR: Destination {self.bank_index} received no input!\n")
-        exit(1)
+      sys.stderr.write(f"ERROR: Destination {self.bank_index} received no input!\n")
+      exit(1)
     print("Success.")
   =}
 }
diff --git a/test/Python/src/multiport/BroadcastMultipleAfter.lf b/test/Python/src/multiport/BroadcastMultipleAfter.lf
index e1e16dd194..3d02d21fed 100644
--- a/test/Python/src/multiport/BroadcastMultipleAfter.lf
+++ b/test/Python/src/multiport/BroadcastMultipleAfter.lf
@@ -13,19 +13,19 @@ reactor Destination(bank_index=0, delay=0) {
     print(f"Destination {self.bank_index} received {_in.value}.")
     expected = (self.bank_index % 3) + 1
     if (_in.value != expected):
-        sys.stderr.write("ERROR: Expected 42.\n")
-        exit(1)
+      sys.stderr.write("ERROR: Expected 42.\n")
+      exit(1)
 
     if lf.time.logical_elapsed() != self.delay:
-        sys.stderr.write(f"ERROR: Expected to receive input after {self.delay/1000000000} second(s).\n")
-        exit(2)
+      sys.stderr.write(f"ERROR: Expected to receive input after {self.delay/1000000000} second(s).\n")
+      exit(2)
     self.received = True
   =}
 
   reaction(shutdown) {=
     if self.received is not True:
-        sys.stderr.write(f"ERROR: Destination {self.bank_index} received no input!\n")
-        exit(1)
+      sys.stderr.write(f"ERROR: Destination {self.bank_index} received no input!\n")
+      exit(1)
     print("Success.")
   =}
 }
diff --git a/test/Python/src/multiport/MultiportFromBank.lf b/test/Python/src/multiport/MultiportFromBank.lf
index 51f0d943f4..447f10154a 100644
--- a/test/Python/src/multiport/MultiportFromBank.lf
+++ b/test/Python/src/multiport/MultiportFromBank.lf
@@ -17,18 +17,18 @@ reactor Destination {
 
   reaction(_in) {=
     for (idx, port) in enumerate(_in):
-        print("Destination channel " + str(idx) + " received " + str(port.value))
-        if idx != port.value:
-            sys.stderr.write("ERROR: Expected " + str(idx))
-            exit(1)
+      print("Destination channel " + str(idx) + " received " + str(port.value))
+      if idx != port.value:
+        sys.stderr.write("ERROR: Expected " + str(idx))
+        exit(1)
 
     self.received = True
   =}
 
   reaction(shutdown) {=
     if self.received is False:
-        sys.stderr.write("ERROR: Destination received no input!\n")
-        exit(1)
+      sys.stderr.write("ERROR: Destination received no input!\n")
+      exit(1)
 
     print("Success.")
   =}
diff --git a/test/Python/src/multiport/MultiportFromHierarchy.lf b/test/Python/src/multiport/MultiportFromHierarchy.lf
index 342ae198c3..01fcc4d080 100644
--- a/test/Python/src/multiport/MultiportFromHierarchy.lf
+++ b/test/Python/src/multiport/MultiportFromHierarchy.lf
@@ -11,8 +11,8 @@ reactor Source {
 
   reaction(t) -> out {=
     for port in out:
-        port.set(self.s)
-        self.s = self.s + 1
+      port.set(self.s)
+      self.s = self.s + 1
   =}
 }
 
@@ -23,19 +23,19 @@ reactor Destination {
   reaction(_in) {=
     sm = 0
     for port in _in:
-        if port.is_present:
-            sm += port.value
+      if port.is_present:
+        sm += port.value
     print("Sum of received: " + str(sm))
     if (sm != self.s):
-        sys.stderr.write("ERROR: Expected " + str(self.s) + ".\n")
-        exit(1)
+      sys.stderr.write("ERROR: Expected " + str(self.s) + ".\n")
+      exit(1)
     self.s += 16
   =}
 
   reaction(shutdown) {=
     if self.s <= 6:
-        sys.stderr.write("ERROR: Destination received no input!\n")
-        exit(1)
+      sys.stderr.write("ERROR: Destination received no input!\n")
+      exit(1)
     print("Success.")
   =}
 }
diff --git a/test/Python/src/multiport/MultiportFromReaction.lf b/test/Python/src/multiport/MultiportFromReaction.lf
index 7fc0e6c943..8e3c67161a 100644
--- a/test/Python/src/multiport/MultiportFromReaction.lf
+++ b/test/Python/src/multiport/MultiportFromReaction.lf
@@ -11,20 +11,20 @@ reactor Destination(width=1) {
   reaction(_in) {=
     sm = 0;
     for port in _in:
-        if port.is_present:
-            sm += port.value
+      if port.is_present:
+        sm += port.value
     print("Sum of received: ", sm)
     if sm != self.s:
-        sys.stderr.write("ERROR: Expected {:d}.\n".format(self.s))
-        exit(1)
+      sys.stderr.write("ERROR: Expected {:d}.\n".format(self.s))
+      exit(1)
 
     self.s += 16
   =}
 
   reaction(shutdown) {=
     if self.s <= 6:
-        sys.stderr.write("ERROR: Destination received no input!\n")
-        exit(1)
+      sys.stderr.write("ERROR: Destination received no input!\n")
+      exit(1)
     print("Success.")
   =}
 }
@@ -36,10 +36,10 @@ main reactor MultiportFromReaction {
 
   reaction(t) -> b._in {=
     for (idx, port) in enumerate(b._in):
-        print("Before SET, b.in[{:d}].is_present has value {:d}".format(idx, port.is_present))
-        port.set(self.s)
-        self.s += 1
-        print("AFTER set, b.in[{:d}].is_present has value {:d}".format(idx, port.is_present))
-        print("AFTER set, b.in[{:d}].value has value {:d}".format(idx, port.value))
+      print("Before SET, b.in[{:d}].is_present has value {:d}".format(idx, port.is_present))
+      port.set(self.s)
+      self.s += 1
+      print("AFTER set, b.in[{:d}].is_present has value {:d}".format(idx, port.is_present))
+      print("AFTER set, b.in[{:d}].value has value {:d}".format(idx, port.value))
   =}
 }
diff --git a/test/Python/src/multiport/MultiportIn.lf b/test/Python/src/multiport/MultiportIn.lf
index 9045be7792..e72b037bab 100644
--- a/test/Python/src/multiport/MultiportIn.lf
+++ b/test/Python/src/multiport/MultiportIn.lf
@@ -30,20 +30,20 @@ reactor Destination {
   reaction(_in) {=
     sum = 0
     for port in _in:
-        sum += port.value
+      sum += port.value
 
     print("Sum of received: " + str(sum))
     if sum != self.s:
-        sys.stderr.write("ERROR: Expected " + str(self.s))
-        exit(1)
+      sys.stderr.write("ERROR: Expected " + str(self.s))
+      exit(1)
 
     self.s += 4
   =}
 
   reaction(shutdown) {=
     if self.s == 0:
-        sys.stderr.write("ERROR: Destination received no input!")
-        exit(1)
+      sys.stderr.write("ERROR: Destination received no input!")
+      exit(1)
 
     print("Success.")
   =}
diff --git a/test/Python/src/multiport/MultiportInParameterized.lf b/test/Python/src/multiport/MultiportInParameterized.lf
index 62a6ec43b3..d9df047b5a 100644
--- a/test/Python/src/multiport/MultiportInParameterized.lf
+++ b/test/Python/src/multiport/MultiportInParameterized.lf
@@ -30,18 +30,18 @@ reactor Destination(width=1) {
   reaction(_in) {=
     sm = 0
     for port in _in:
-        sm += port.value
+      sm += port.value
     print("Sum of received: ", sm)
     if sm != self.s:
-        sys.stderr.write("ERROR: Expected {:d}.\n".format(self.s))
-        exit(1)
+      sys.stderr.write("ERROR: Expected {:d}.\n".format(self.s))
+      exit(1)
     self.s += 4
   =}
 
   reaction(shutdown) {=
     if self.s == 0:
-        sys.stderr.write("ERROR: Destination received no input!\n")
-        exit(1)
+      sys.stderr.write("ERROR: Destination received no input!\n")
+      exit(1)
     print("Success.");
   =}
 }
diff --git a/test/Python/src/multiport/MultiportMutableInput.lf b/test/Python/src/multiport/MultiportMutableInput.lf
index 20070fe7a4..8be7d7c757 100644
--- a/test/Python/src/multiport/MultiportMutableInput.lf
+++ b/test/Python/src/multiport/MultiportMutableInput.lf
@@ -18,11 +18,11 @@ reactor Print(scale=1) {
   reaction(_in) {=
     expected = 42
     for (idx, port) in enumerate(_in):
-        print("Received on channel {:d}: ".format(idx), port.value)
-        if port.value != expected:
-            sys.stderr.write("ERROR: Expected {:d}!\n".format(expected))
-            exit(1)
-        expected *= 2
+      print("Received on channel {:d}: ".format(idx), port.value)
+      if port.value != expected:
+        sys.stderr.write("ERROR: Expected {:d}!\n".format(expected))
+        exit(1)
+      expected *= 2
   =}
 }
 
@@ -32,9 +32,9 @@ reactor Scale(scale=2) {
 
   reaction(_in) -> out {=
     for (idx, port) in enumerate(_in):
-        # Modify the input, allowed because mutable.
-        port.value *= self.scale
-        out[idx].set(port.value)
+      # Modify the input, allowed because mutable.
+      port.value *= self.scale
+      out[idx].set(port.value)
   =}
 }
 
diff --git a/test/Python/src/multiport/MultiportMutableInputArray.lf b/test/Python/src/multiport/MultiportMutableInputArray.lf
index 67c1848fa1..5ad5b362de 100644
--- a/test/Python/src/multiport/MultiportMutableInputArray.lf
+++ b/test/Python/src/multiport/MultiportMutableInputArray.lf
@@ -18,10 +18,10 @@ reactor Print(scale=1) {
 
   reaction(_in) {=
     for (idx, port) in enumerate(_in):
-        print("Received on channel ", port.value)
-        if port.value != [(self.scale*i) for i in range(3*idx,(3*idx)+3)]:
-            sys.stderr.write("ERROR: Value received by Print does not match expectation!\n")
-            exit(1)
+      print("Received on channel ", port.value)
+      if port.value != [(self.scale*i) for i in range(3*idx,(3*idx)+3)]:
+        sys.stderr.write("ERROR: Value received by Print does not match expectation!\n")
+        exit(1)
   =}
 }
 
@@ -31,9 +31,9 @@ reactor Scale(scale=2) {
 
   reaction(_in) -> out {=
     for (idx, port) in enumerate(_in):
-        if port.is_present:
-            port.value = [value*self.scale for value in port.value]
-        out[idx].set(port.value)
+      if port.is_present:
+        port.value = [value*self.scale for value in port.value]
+      out[idx].set(port.value)
   =}
 }
 
diff --git a/test/Python/src/multiport/MultiportOut.lf b/test/Python/src/multiport/MultiportOut.lf
index 0e84fed165..b84f97989c 100644
--- a/test/Python/src/multiport/MultiportOut.lf
+++ b/test/Python/src/multiport/MultiportOut.lf
@@ -11,7 +11,7 @@ reactor Source {
 
   reaction(t) -> out {=
     for port in out:
-        port.set(self.s)
+      port.set(self.s)
 
     self.s+=1
   =}
@@ -31,21 +31,21 @@ reactor Destination {
   reaction(_in) {=
     sum = 0
     for port in _in:
-        if port.is_present:
-            sum += port.value
+      if port.is_present:
+        sum += port.value
 
     print("Sum of received: " + str(sum))
     if sum != self.s:
-        sys.stderr.write("ERROR: Expected " + str(self.s))
-        exit(1)
+      sys.stderr.write("ERROR: Expected " + str(self.s))
+      exit(1)
 
     self.s += 4
   =}
 
   reaction(shutdown) {=
     if self.s == 0:
-        sys.stderr.write("ERROR: Destination received no input!")
-        exit(1)
+      sys.stderr.write("ERROR: Destination received no input!")
+      exit(1)
 
     print("Success.")
   =}
diff --git a/test/Python/src/multiport/MultiportToBank.lf b/test/Python/src/multiport/MultiportToBank.lf
index ba9f2abe36..e61fdc92b3 100644
--- a/test/Python/src/multiport/MultiportToBank.lf
+++ b/test/Python/src/multiport/MultiportToBank.lf
@@ -9,7 +9,7 @@ reactor Source {
 
   reaction(startup) -> out {=
     for (idx, port) in enumerate(out):
-        port.set(idx)
+      port.set(idx)
   =}
 }
 
@@ -20,15 +20,15 @@ reactor Destination(bank_index=0) {
   reaction(_in) {=
     print("Destination " + str(self.bank_index) + " received " + str(_in.value))
     if self.bank_index != _in.value:
-        sys.stderr.write("ERROR: Expected " + str(self.bank_index))
-        exit(1)
+      sys.stderr.write("ERROR: Expected " + str(self.bank_index))
+      exit(1)
     self.received = True
   =}
 
   reaction(shutdown) {=
     if self.received is not True:
-        sys.stderr.write("ERROR: Destination " + str(self.bank_index) + " received no input!\n")
-        exit(1)
+      sys.stderr.write("ERROR: Destination " + str(self.bank_index) + " received no input!\n")
+      exit(1)
     print("Success.")
   =}
 }
diff --git a/test/Python/src/multiport/MultiportToBankAfter.lf b/test/Python/src/multiport/MultiportToBankAfter.lf
index 3f622bdc63..228770f522 100644
--- a/test/Python/src/multiport/MultiportToBankAfter.lf
+++ b/test/Python/src/multiport/MultiportToBankAfter.lf
@@ -13,18 +13,18 @@ reactor Destination(bank_index=0) {
   reaction(_in) {=
     print("Destination {:d} received {:d}.".format(self.bank_index, _in.value))
     if self.bank_index != _in.value:
-        sys.stderr.write("ERROR: Expected {:d}.\n".format(self.bank_index))
-        exit(1)
+      sys.stderr.write("ERROR: Expected {:d}.\n".format(self.bank_index))
+      exit(1)
     if lf.time.logical_elapsed() != SEC(1):
-        sys.stderr.write("ERROR: Expected to receive input after one second.\n")
-        exit(2)
+      sys.stderr.write("ERROR: Expected to receive input after one second.\n")
+      exit(2)
     self.received = True
   =}
 
   reaction(shutdown) {=
     if self.received is not True:
-        sys.stderr.write("ERROR: Destination {:d} received no input!\n".format(self.bank_index))
-        exit(3)
+      sys.stderr.write("ERROR: Destination {:d} received no input!\n".format(self.bank_index))
+      exit(3)
     print("Success.")
   =}
 }
diff --git a/test/Python/src/multiport/MultiportToBankHierarchy.lf b/test/Python/src/multiport/MultiportToBankHierarchy.lf
index 0c03395839..5e7152bbb2 100644
--- a/test/Python/src/multiport/MultiportToBankHierarchy.lf
+++ b/test/Python/src/multiport/MultiportToBankHierarchy.lf
@@ -14,15 +14,15 @@ reactor Destination(bank_index=0) {
   reaction(_in) {=
     print("Destination {:d} received {:d}.\n".format(self.bank_index, _in.value))
     if self.bank_index != _in.value:
-        sys.stderr.write("ERROR: Expected {:d}.\n".format(self.bank_index))
-        exit(1)
+      sys.stderr.write("ERROR: Expected {:d}.\n".format(self.bank_index))
+      exit(1)
     self.received = True
   =}
 
   reaction(shutdown) {=
     if self.received is not True:
-        sys.stderr.write("ERROR: Destination {:d} received no input!\n".format(self.bank_index))
-        exit(1)
+      sys.stderr.write("ERROR: Destination {:d} received no input!\n".format(self.bank_index))
+      exit(1)
     print("Success.")
   =}
 }
diff --git a/test/Python/src/multiport/MultiportToHierarchy.lf b/test/Python/src/multiport/MultiportToHierarchy.lf
index 19dd4bcd82..84b5f36f21 100644
--- a/test/Python/src/multiport/MultiportToHierarchy.lf
+++ b/test/Python/src/multiport/MultiportToHierarchy.lf
@@ -12,8 +12,8 @@ reactor Source {
 
   reaction(t) -> out {=
     for port in out:
-        port.set(self.s)
-        self.s += 1
+      port.set(self.s)
+      self.s += 1
   =}
 }
 
@@ -24,19 +24,19 @@ reactor Destination(width=4) {
   reaction(_in) {=
     sm = 0
     for port in _in:
-        if port.is_present:
-            sm += port.value
+      if port.is_present:
+        sm += port.value
     print("Sum of received: ", sm)
     if sm != self.s:
-        sys.stderr.write("ERROR: Expected {:d}.\n".format(self.s))
-        exit(1)
+      sys.stderr.write("ERROR: Expected {:d}.\n".format(self.s))
+      exit(1)
     self.s += 16
   =}
 
   reaction(shutdown) {=
     if self.s <= 6:
-        sys.stderr.write("ERROR: Destination received no input!\n")
-        exit(1)
+      sys.stderr.write("ERROR: Destination received no input!\n")
+      exit(1)
     print("Success.")
   =}
 }
diff --git a/test/Python/src/multiport/MultiportToMultiport.lf b/test/Python/src/multiport/MultiportToMultiport.lf
index dafa3ffb7d..19fdb3b43b 100644
--- a/test/Python/src/multiport/MultiportToMultiport.lf
+++ b/test/Python/src/multiport/MultiportToMultiport.lf
@@ -13,11 +13,11 @@ reactor Source(width=1) {
 
   reaction(t) -> out {=
     for i in range(len(out)):
-        print("Before SET, out[{:d}]->is_present has value %d".format(i), out[i].is_present)
-        out[i].set(self.s)
-        self.s += 1
-        print("AFTER set, out[{:d}]->is_present has value ".format(i), out[i].is_present)
-        print("AFTER set, out[{:d}]->value has value ".format(i), out[i].value)
+      print("Before SET, out[{:d}]->is_present has value %d".format(i), out[i].is_present)
+      out[i].set(self.s)
+      self.s += 1
+      print("AFTER set, out[{:d}]->is_present has value ".format(i), out[i].is_present)
+      print("AFTER set, out[{:d}]->value has value ".format(i), out[i].value)
   =}
 }
 
diff --git a/test/Python/src/multiport/MultiportToMultiport2.lf b/test/Python/src/multiport/MultiportToMultiport2.lf
index ba4e1d6d26..98b7c00817 100644
--- a/test/Python/src/multiport/MultiportToMultiport2.lf
+++ b/test/Python/src/multiport/MultiportToMultiport2.lf
@@ -6,7 +6,7 @@ reactor Source(width=2) {
 
   reaction(startup) -> out {=
     for (idx, port) in enumerate(out):
-        port.set(idx)
+      port.set(idx)
   =}
 }
 
@@ -15,13 +15,13 @@ reactor Destination(width=2) {
 
   reaction(_in) {=
     for (idx, port) in enumerate(_in):
-        if port.is_present:
-            print("Received on channel {:d}: ".format(idx), port.value)
-            # NOTE: For testing purposes, this assumes the specific
-            # widths instantiated below.
-            if port.value != idx % 3:
-                sys.stderr.write("ERROR: expected {:d}!\n".format(idx % 3))
-                exit(1)
+      if port.is_present:
+        print("Received on channel {:d}: ".format(idx), port.value)
+        # NOTE: For testing purposes, this assumes the specific
+        # widths instantiated below.
+        if port.value != idx % 3:
+          sys.stderr.write("ERROR: expected {:d}!\n".format(idx % 3))
+          exit(1)
   =}
 }
 
diff --git a/test/Python/src/multiport/MultiportToMultiport2After.lf b/test/Python/src/multiport/MultiportToMultiport2After.lf
index df0d40a668..f87d1f530b 100644
--- a/test/Python/src/multiport/MultiportToMultiport2After.lf
+++ b/test/Python/src/multiport/MultiportToMultiport2After.lf
@@ -8,16 +8,16 @@ reactor Destination(width=2) {
 
   reaction(_in) {=
     for (idx, port) in enumerate(_in):
-        if port.is_present:
-            print("Received on channel {:d}: ".format(idx), port.value)
-            # NOTE: For testing purposes, this assumes the specific
-            # widths instantiated below.
-            if port.value != idx % 3:
-                sys.stderr.write("ERROR: expected {:d}!\n".format(idx % 3))
-                exit(1)
+      if port.is_present:
+        print("Received on channel {:d}: ".format(idx), port.value)
+        # NOTE: For testing purposes, this assumes the specific
+        # widths instantiated below.
+        if port.value != idx % 3:
+          sys.stderr.write("ERROR: expected {:d}!\n".format(idx % 3))
+          exit(1)
     if lf.time.logical_elapsed() != SEC(1):
-        sys.stderr.write("ERROR: Expected to receive input after one second.\n")
-        exit(2)
+      sys.stderr.write("ERROR: Expected to receive input after one second.\n")
+      exit(2)
   =}
 }
 
diff --git a/test/Python/src/multiport/MultiportToMultiportArray.lf b/test/Python/src/multiport/MultiportToMultiportArray.lf
index 4be3c1b68d..9aca96d365 100644
--- a/test/Python/src/multiport/MultiportToMultiportArray.lf
+++ b/test/Python/src/multiport/MultiportToMultiportArray.lf
@@ -11,8 +11,8 @@ reactor Source {
 
   reaction(t) -> out {=
     for port in out:
-        port.set([self.s, self.s + 1, self.s + 2])
-        self.s += 3
+      port.set([self.s, self.s + 1, self.s + 2])
+      self.s += 3
   =}
 }
 
@@ -23,21 +23,21 @@ reactor Destination {
   reaction(_in) {=
     sm = 0
     for port in _in:
-        if port.is_present:
-            sm += sum(port.value)
+      if port.is_present:
+        sm += sum(port.value)
 
     print("Sum of received: ", sm);
     if sm != self.s:
-        sys.stderr.write("ERROR: Expected {:d}.\n".format(self.s))
-        exit(1)
+      sys.stderr.write("ERROR: Expected {:d}.\n".format(self.s))
+      exit(1)
 
     self.s += 36
   =}
 
   reaction(shutdown) {=
     if self.s <= 15:
-        sys.stderr.write("ERROR: Destination received no input!\n")
-        exit(1)
+      sys.stderr.write("ERROR: Destination received no input!\n")
+      exit(1)
     print("Success.")
   =}
 }
diff --git a/test/Python/src/multiport/MultiportToPort.lf b/test/Python/src/multiport/MultiportToPort.lf
index 7573d07cd2..db4cde639b 100644
--- a/test/Python/src/multiport/MultiportToPort.lf
+++ b/test/Python/src/multiport/MultiportToPort.lf
@@ -9,8 +9,8 @@ reactor Source {
 
   reaction(startup) -> out {=
     for (idx, port) in enumerate(out):
-        print("Source sending ", idx)
-        port.set(idx)
+      print("Source sending ", idx)
+      port.set(idx)
   =}
 }
 
@@ -22,14 +22,14 @@ reactor Destination(expected=0) {
     print("Received: ", _in.value)
     self.received = True
     if _in.value != self.expected:
-        sys.stderr.write("ERROR: Expected {:d}.\n".format(self.expected))
-        exit(1)
+      sys.stderr.write("ERROR: Expected {:d}.\n".format(self.expected))
+      exit(1)
   =}
 
   reaction(shutdown) {=
     if self.received is not True:
-        sys.stderr.write("ERROR: Destination received no input!\n")
-        exit(1)
+      sys.stderr.write("ERROR: Destination received no input!\n")
+      exit(1)
     print("Success.")
   =}
 }
diff --git a/test/Python/src/multiport/MultiportToReaction.lf b/test/Python/src/multiport/MultiportToReaction.lf
index 5c33074dfa..55f81e21b5 100644
--- a/test/Python/src/multiport/MultiportToReaction.lf
+++ b/test/Python/src/multiport/MultiportToReaction.lf
@@ -11,8 +11,8 @@ reactor Source(width=1) {
 
   reaction(t) -> out {=
     for port in out:
-        port.set(self.s)
-        self.s += 1
+      port.set(self.s)
+      self.s += 1
   =}
 }
 
@@ -23,19 +23,19 @@ main reactor {
   reaction(b.out) {=
     sm = 0
     for port in b.out:
-        if port.is_present:
-            sm += port.value
+      if port.is_present:
+        sm += port.value
     print("Sum of received: ", sm)
     if sm != self.s:
-        sys.stderr.write("ERROR: Expected {:d}.\n".format(self.s))
-        exit(1)
+      sys.stderr.write("ERROR: Expected {:d}.\n".format(self.s))
+      exit(1)
     self.s += 16
   =}
 
   reaction(shutdown) {=
     if self.s <= 6:
-        sys.stderr.write("ERROR: Destination received no input!\n")
-        exit(1)
+      sys.stderr.write("ERROR: Destination received no input!\n")
+      exit(1)
     print("Success.")
   =}
 }
diff --git a/test/Python/src/multiport/NestedBanks.lf b/test/Python/src/multiport/NestedBanks.lf
index a00cdb5cb9..3ed6ed9c4c 100644
--- a/test/Python/src/multiport/NestedBanks.lf
+++ b/test/Python/src/multiport/NestedBanks.lf
@@ -41,10 +41,10 @@ reactor D {
 
   reaction(u) {=
     for (i, p) in enumerate(u):
-        print(f"d.u[{i}] received {p.value}.")
-        if p.value != (6 + i):
-            sys.stderr.write(f"ERROR: Expected {6 + i} but received {p.value}.\n")
-            exit(1)
+      print(f"d.u[{i}] received {p.value}.")
+      if p.value != (6 + i):
+        sys.stderr.write(f"ERROR: Expected {6 + i} but received {p.value}.\n")
+        exit(1)
   =}
 }
 
@@ -53,7 +53,7 @@ reactor E {
 
   reaction(t) {=
     for (i, p) in enumerate(t):
-        print(f"e.t[{i}] received {p.value}.")
+      print(f"e.t[{i}] received {p.value}.")
   =}
 }
 
@@ -63,8 +63,8 @@ reactor F(c_bank_index=0) {
   reaction(w) {=
     print(f"c[{self.c_bank_index}].f.w received {w.value}.")
     if w.value != self.c_bank_index * 2:
-        sys.stderr.write(f"ERROR: Expected {self.c_bank_index * 2} but received {w.value}.\n")
-        exit(1)
+      sys.stderr.write(f"ERROR: Expected {self.c_bank_index * 2} but received {w.value}.\n")
+      exit(1)
   =}
 }
 
@@ -74,7 +74,7 @@ reactor G(c_bank_index=0) {
   reaction(s) {=
     print(f"c[{self.c_bank_index}].g.s received {s.value}.")
     if s.value != (self.c_bank_index * 2 + 1):
-        sys.stderr.write(f"ERROR: Expected {self.c_bank_index * 2 + 1} but received {s.value}.\n")
-        exit(1)
+      sys.stderr.write(f"ERROR: Expected {self.c_bank_index * 2 + 1} but received {s.value}.\n")
+      exit(1)
   =}
 }
diff --git a/test/Python/src/multiport/NestedInterleavedBanks.lf b/test/Python/src/multiport/NestedInterleavedBanks.lf
index 46f3a12cb7..3036069790 100644
--- a/test/Python/src/multiport/NestedInterleavedBanks.lf
+++ b/test/Python/src/multiport/NestedInterleavedBanks.lf
@@ -9,8 +9,8 @@ reactor A(bank_index=0, outer_bank_index=0) {
 
   reaction(startup) -> p {=
     for i, port in enumerate(p):
-        port.set(self.outer_bank_index * 4 + self.bank_index * 2 + i + 1)
-        print(f"A sending {port.value}.")
+      port.set(self.outer_bank_index * 4 + self.bank_index * 2 + i + 1)
+      print(f"A sending {port.value}.")
   =}
 }
 
@@ -26,10 +26,10 @@ reactor C {
   reaction(i) {=
     expected = [1, 3, 2, 4, 5, 7, 6, 8]
     for j, port in enumerate(i):
-        print(f"C received {port.value}.")
-        if port.value != expected[j]:
-            sys.stderr.write(f"ERROR: Expected {expected[j]}.\n")
-            exit(1)
+      print(f"C received {port.value}.")
+      if port.value != expected[j]:
+        sys.stderr.write(f"ERROR: Expected {expected[j]}.\n")
+        exit(1)
   =}
 }
 
diff --git a/test/Python/src/multiport/PipelineAfter.lf b/test/Python/src/multiport/PipelineAfter.lf
index 43048f04ca..307a4122cd 100644
--- a/test/Python/src/multiport/PipelineAfter.lf
+++ b/test/Python/src/multiport/PipelineAfter.lf
@@ -19,11 +19,11 @@ reactor Sink {
   reaction(inp) {=
     print(f"Received {inp.value}")
     if inp.value != 42:
-        sys.stderr.write("ERROR: expected 42!\n")
-        exit(1)
+      sys.stderr.write("ERROR: expected 42!\n")
+      exit(1)
     if lf.time.logical_elapsed() != SEC(1):
-        sys.stderr.write("ERROR: Expected to receive input after one second.\n")
-        exit(2)
+      sys.stderr.write("ERROR: Expected to receive input after one second.\n")
+      exit(2)
   =}
 }
 
diff --git a/test/Python/src/multiport/ReactionsToNested.lf b/test/Python/src/multiport/ReactionsToNested.lf
index 94edf095c4..b298a85a95 100644
--- a/test/Python/src/multiport/ReactionsToNested.lf
+++ b/test/Python/src/multiport/ReactionsToNested.lf
@@ -11,14 +11,14 @@ reactor T(expected=0) {
     print(f"T received {z.value}.")
     self.received = True
     if z.value != self.expected:
-        sys.stderr.write(f"ERROR: Expected {self.response}")
-        exit(1)
+      sys.stderr.write(f"ERROR: Expected {self.response}")
+      exit(1)
   =}
 
   reaction(shutdown) {=
     if self.received is not True:
-        sys.stderr.write(f"ERROR: No input received.")
-        exit(1)
+      sys.stderr.write(f"ERROR: No input received.")
+      exit(1)
   =}
 }
 
diff --git a/test/Python/src/target/AfterNoTypes.lf b/test/Python/src/target/AfterNoTypes.lf
index ef92444c34..c2be99ef2c 100644
--- a/test/Python/src/target/AfterNoTypes.lf
+++ b/test/Python/src/target/AfterNoTypes.lf
@@ -22,21 +22,21 @@ reactor Print {
     elapsed_time = lf.time.logical_elapsed()
     print("Result is " + str(x.value))
     if x.value != 84:
-        sys.stderr.write("ERROR: Expected result to be 84.\n")
-        exit(1)
+      sys.stderr.write("ERROR: Expected result to be 84.\n")
+      exit(1)
 
     print("Current logical time is: " + str(elapsed_time))
     print("Current physical time is: " + str(lf.time.physical_elapsed()))
     if elapsed_time != self.expected_time:
-        sys.stderr.write("ERROR: Expected logical time to be " + self.expected_time)
-        exit(2)
+      sys.stderr.write("ERROR: Expected logical time to be " + self.expected_time)
+      exit(2)
     self.expected_time += SEC(1)
   =}
 
   reaction(shutdown) {=
     if (self.received == 0):
-        sys.stderr.write("ERROR: Final reactor received no data.\n")
-        exit(3)
+      sys.stderr.write("ERROR: Final reactor received no data.\n")
+      exit(3)
   =}
 }
 
diff --git a/test/Rust/src/ActionImplicitDelay.lf b/test/Rust/src/ActionImplicitDelay.lf
index 46b4a4d767..5ae8557a57 100644
--- a/test/Rust/src/ActionImplicitDelay.lf
+++ b/test/Rust/src/ActionImplicitDelay.lf
@@ -11,9 +11,9 @@ main reactor ActionImplicitDelay {
     assert_tag_is!(ctx, T0 + (40 * self.count) ms);
     self.count += 1;
     if self.count <= 3 {
-        ctx.schedule(act, Asap);
+      ctx.schedule(act, Asap);
     } else {
-        println!("SUCCESS")
+      println!("SUCCESS")
     }
   =}
 }
diff --git a/test/Rust/src/ActionIsPresent.lf b/test/Rust/src/ActionIsPresent.lf
index a581fe7574..f78bd95214 100644
--- a/test/Rust/src/ActionIsPresent.lf
+++ b/test/Rust/src/ActionIsPresent.lf
@@ -8,17 +8,17 @@ main reactor ActionIsPresent {
 
   reaction(startup, a) -> a {=
     if !ctx.is_present(a) {
-        assert_tag_is!(ctx, T0);
-        assert!(!self.tried, "Already tried, is_present does not work properly.");
-        self.tried = true;
-        // was triggered by startup
-        println!("Startup reaction @ {}", ctx.get_tag());
-        ctx.schedule(a, after!(1 ns));
+      assert_tag_is!(ctx, T0);
+      assert!(!self.tried, "Already tried, is_present does not work properly.");
+      self.tried = true;
+      // was triggered by startup
+      println!("Startup reaction @ {}", ctx.get_tag());
+      ctx.schedule(a, after!(1 ns));
     } else {
-        assert_tag_is!(ctx, T0 + 1 ns);
-        // was triggered by schedule above
-        println!("Scheduled reaction @ {}", ctx.get_tag());
-        self.success = true;
+      assert_tag_is!(ctx, T0 + 1 ns);
+      // was triggered by schedule above
+      println!("Scheduled reaction @ {}", ctx.get_tag());
+      self.success = true;
     }
   =}
 
diff --git a/test/Rust/src/ActionIsPresentDouble.lf b/test/Rust/src/ActionIsPresentDouble.lf
index 4aec9776be..a33914a1e6 100644
--- a/test/Rust/src/ActionIsPresentDouble.lf
+++ b/test/Rust/src/ActionIsPresentDouble.lf
@@ -15,7 +15,7 @@ main reactor ActionIsPresentDouble {
     assert!(ctx.is_present(act0));
     assert!(ctx.is_present(act1));
     if ctx.get_tag() == tag!(T0 + 100 ms) {
-        println!("success");
+      println!("success");
     }
   =}
 }
diff --git a/test/Rust/src/ActionScheduleMicrostep.lf b/test/Rust/src/ActionScheduleMicrostep.lf
index db1210190f..2912cc60ea 100644
--- a/test/Rust/src/ActionScheduleMicrostep.lf
+++ b/test/Rust/src/ActionScheduleMicrostep.lf
@@ -15,9 +15,9 @@ main reactor ActionScheduleMicrostep {
     assert_tag_is!(ctx, (T0, self.count));
     self.count += 1;
     if self.count <= 3 {
-        ctx.schedule(act, Asap);
+      ctx.schedule(act, Asap);
     } else {
-        println!("SUCCESS")
+      println!("SUCCESS")
     }
   =}
 }
diff --git a/test/Rust/src/ActionValues.lf b/test/Rust/src/ActionValues.lf
index 8e8fb9f958..714e058195 100644
--- a/test/Rust/src/ActionValues.lf
+++ b/test/Rust/src/ActionValues.lf
@@ -16,12 +16,12 @@ main reactor ActionValues {
     println!("At {}, received {:?}", ctx.get_tag(), ctx.get(act));
 
     if ctx.get_tag() == tag!(T0 + 100 ms) {
-        assert_eq!(Some(100), ctx.get(act));
-        self.r1done = true;
+      assert_eq!(Some(100), ctx.get(act));
+      self.r1done = true;
     } else {
-        assert_tag_is!(ctx, T0 + 150 ms);
-        assert_eq!(Some(-100), ctx.get(act));
-        self.r2done = true;
+      assert_tag_is!(ctx, T0 + 150 ms);
+      assert_eq!(Some(-100), ctx.get(act));
+      self.r2done = true;
     }
   =}
 
diff --git a/test/Rust/src/ActionValuesCleanup.lf b/test/Rust/src/ActionValuesCleanup.lf
index 6ad9bd1b38..1db2759ad6 100644
--- a/test/Rust/src/ActionValuesCleanup.lf
+++ b/test/Rust/src/ActionValuesCleanup.lf
@@ -11,11 +11,11 @@ main reactor ActionValuesCleanup {
     #[derive(Clone, Debug)]
     struct FooDrop { }
     impl std::ops::Drop for FooDrop {
-        fn drop(&mut self) {
-            unsafe {
-                DROPPED.store(true, Ordering::SeqCst);
-            }
+      fn drop(&mut self) {
+        unsafe {
+          DROPPED.store(true, Ordering::SeqCst);
         }
+      }
     }
   =}
 
@@ -27,17 +27,17 @@ main reactor ActionValuesCleanup {
   reaction(act) -> act {=
     ctx.use_ref(act, |v| println!("{:?}", v));
     if self.count == 0 {
-        self.count = 1;
-        assert!(ctx.is_present(act));
-        assert!(ctx.use_ref(act, |v| v.is_some()));
-        ctx.schedule(act, Asap);
+      self.count = 1;
+      assert!(ctx.is_present(act));
+      assert!(ctx.use_ref(act, |v| v.is_some()));
+      ctx.schedule(act, Asap);
     } else if self.count == 1 {
-        assert!(ctx.is_present(act));
-        assert!(ctx.use_ref(act, |v| v.is_none()));
-        assert!(unsafe { DROPPED.load(Ordering::SeqCst) });
-        self.count = 2;
+      assert!(ctx.is_present(act));
+      assert!(ctx.use_ref(act, |v| v.is_none()));
+      assert!(unsafe { DROPPED.load(Ordering::SeqCst) });
+      self.count = 2;
     } else {
-        unreachable!();
+      unreachable!();
     }
   =}
 
diff --git a/test/Rust/src/CompositionWithPorts.lf b/test/Rust/src/CompositionWithPorts.lf
index 94fc2de449..802f8cac21 100644
--- a/test/Rust/src/CompositionWithPorts.lf
+++ b/test/Rust/src/CompositionWithPorts.lf
@@ -11,10 +11,10 @@ reactor Sink {
 
   reaction(inport) {=
     if let Some(value) = ctx.get(inport) {
-        println!("received {}", value);
-        assert_eq!(76600, value);
+      println!("received {}", value);
+      assert_eq!(76600, value);
     } else {
-        unreachable!();
+      unreachable!();
     }
   =}
 }
diff --git a/test/Rust/src/DependencyThroughChildPort.lf b/test/Rust/src/DependencyThroughChildPort.lf
index 851472503f..c8e8bf1592 100644
--- a/test/Rust/src/DependencyThroughChildPort.lf
+++ b/test/Rust/src/DependencyThroughChildPort.lf
@@ -9,18 +9,18 @@ reactor Destination {
   reaction(x, y) {=
     let tag = ctx.get_tag();
     println!(
-        "Time since start: {}, microstep: {}",
-        tag.offset_from_t0.as_nanos(),
-        tag.microstep,
+      "Time since start: {}, microstep: {}",
+      tag.offset_from_t0.as_nanos(),
+      tag.microstep,
     );
 
     if tag == tag!(T0) {
-        assert!(ctx.is_present(x));
-        assert_eq!(self.exec_count, 0);
+      assert!(ctx.is_present(x));
+      assert_eq!(self.exec_count, 0);
     } else {
-        assert_tag_is!(ctx, (T0, 1));
-        assert!(ctx.is_present(y));
-        assert_eq!(self.exec_count, 1);
+      assert_tag_is!(ctx, (T0, 1));
+      assert!(ctx.is_present(y));
+      assert_eq!(self.exec_count, 1);
     }
     self.exec_count += 1;
   =}
diff --git a/test/Rust/src/DependencyUseAccessible.lf b/test/Rust/src/DependencyUseAccessible.lf
index 6e288af8e8..0654d25f60 100644
--- a/test/Rust/src/DependencyUseAccessible.lf
+++ b/test/Rust/src/DependencyUseAccessible.lf
@@ -22,15 +22,15 @@ reactor Sink {
 
   reaction(clock) in1, in2 {=
     match ctx.get(clock) {
-        Some(0) | Some(2) => {
-          assert_eq!(None, ctx.get(in1));
-          assert_eq!(None, ctx.get(in2));
-        },
-        Some(1) => {
-          assert_eq!(Some(10), ctx.get(in1));
-          assert_eq!(None, ctx.get(in2));
-        },
-        c => panic!("No such signal expected {:?}", c)
+      Some(0) | Some(2) => {
+        assert_eq!(None, ctx.get(in1));
+        assert_eq!(None, ctx.get(in2));
+      },
+      Some(1) => {
+        assert_eq!(Some(10), ctx.get(in1));
+        assert_eq!(None, ctx.get(in2));
+      },
+      c => panic!("No such signal expected {:?}", c)
     }
   =}
 }
diff --git a/test/Rust/src/DependencyUseOnLogicalAction.lf b/test/Rust/src/DependencyUseOnLogicalAction.lf
index f1b244901e..49b7e86bb0 100644
--- a/test/Rust/src/DependencyUseOnLogicalAction.lf
+++ b/test/Rust/src/DependencyUseOnLogicalAction.lf
@@ -27,15 +27,15 @@ main reactor {
 
   reaction(clock) a, t {=
     match ctx.get(clock) {
-        Some(2) | Some(4) => {
-            assert!(ctx.is_present(t));   // t is there on even millis
-            assert!(!ctx.is_present(a)); //
-        },
-        Some(3) | Some(5) => {
-            assert!(!ctx.is_present(t));
-            assert!(ctx.is_present(a));
-        },
-        it => unreachable!("{:?}", it)
+      Some(2) | Some(4) => {
+        assert!(ctx.is_present(t));   // t is there on even millis
+        assert!(!ctx.is_present(a)); //
+      },
+      Some(3) | Some(5) => {
+        assert!(!ctx.is_present(t));
+        assert!(ctx.is_present(a));
+      },
+      it => unreachable!("{:?}", it)
     }
     self.tick += 1;
   =}
diff --git a/test/Rust/src/PhysicalActionKeepaliveIsSmart.lf b/test/Rust/src/PhysicalActionKeepaliveIsSmart.lf
index a10abd9a7a..96a8aa7b01 100644
--- a/test/Rust/src/PhysicalActionKeepaliveIsSmart.lf
+++ b/test/Rust/src/PhysicalActionKeepaliveIsSmart.lf
@@ -9,8 +9,8 @@ main reactor {
 
   reaction(startup) -> act {=
     std::thread::spawn(|| {
-        std::thread::sleep(delay!(1 sec));
-        // this is a regular thread which doesn't have a reference to the scheduler
+      std::thread::sleep(delay!(1 sec));
+      // this is a regular thread which doesn't have a reference to the scheduler
     });
   =}
 
diff --git a/test/Rust/src/PhysicalActionWakesSleepingScheduler.lf b/test/Rust/src/PhysicalActionWakesSleepingScheduler.lf
index de6a92c72f..d99732ca9c 100644
--- a/test/Rust/src/PhysicalActionWakesSleepingScheduler.lf
+++ b/test/Rust/src/PhysicalActionWakesSleepingScheduler.lf
@@ -13,8 +13,8 @@ main reactor {
   reaction(startup) -> act {=
     let act = act.clone();
     ctx.spawn_physical_thread(move |link| {
-        std::thread::sleep(delay!(20 msec));
-        link.schedule_physical(&act, Asap);
+      std::thread::sleep(delay!(20 msec));
+      link.schedule_physical(&act, Asap);
     });
   =}
 
diff --git a/test/Rust/src/PhysicalActionWithKeepalive.lf b/test/Rust/src/PhysicalActionWithKeepalive.lf
index a1abdd7743..f69318dfd5 100644
--- a/test/Rust/src/PhysicalActionWithKeepalive.lf
+++ b/test/Rust/src/PhysicalActionWithKeepalive.lf
@@ -8,8 +8,8 @@ main reactor {
   reaction(startup) -> act {=
     let act = act.clone();
     ctx.spawn_physical_thread(move |link| {
-        std::thread::sleep(Duration::from_millis(20));
-        link.schedule_physical_with_v(&act, Some(434), Asap);
+      std::thread::sleep(Duration::from_millis(20));
+      link.schedule_physical_with_v(&act, Some(434), Asap);
     });
   =}
 
diff --git a/test/Rust/src/PortRefCleanup.lf b/test/Rust/src/PortRefCleanup.lf
index 3704998794..1709ae1618 100644
--- a/test/Rust/src/PortRefCleanup.lf
+++ b/test/Rust/src/PortRefCleanup.lf
@@ -24,11 +24,11 @@ main reactor {
 
   reaction(boxr.out, t2) {=
     if self.reaction_num == 1 {
-        assert!(matches!(ctx.get(boxr__out), Some(150)));
+      assert!(matches!(ctx.get(boxr__out), Some(150)));
     } else {
-        assert_eq!(self.reaction_num, 2);
-        assert!(ctx.get(boxr__out).is_none(), "value should have been cleaned up");
-        self.done = true;
+      assert_eq!(self.reaction_num, 2);
+      assert!(ctx.get(boxr__out).is_none(), "value should have been cleaned up");
+      self.done = true;
     }
     self.reaction_num += 1;
   =}
diff --git a/test/Rust/src/PortValueCleanup.lf b/test/Rust/src/PortValueCleanup.lf
index 5200956cdc..ea0c9f50a0 100644
--- a/test/Rust/src/PortValueCleanup.lf
+++ b/test/Rust/src/PortValueCleanup.lf
@@ -16,11 +16,11 @@ reactor Sink {
 
   reaction(in, t2) {=
     if self.reaction_num == 0 {
-        assert!(matches!(ctx.get(r#in), Some(150)));
+      assert!(matches!(ctx.get(r#in), Some(150)));
     } else {
-        assert_eq!(self.reaction_num, 1);
-        assert!(ctx.get(r#in).is_none(), "value should have been cleaned up");
-        self.done = true;
+      assert_eq!(self.reaction_num, 1);
+      assert!(ctx.get(r#in).is_none(), "value should have been cleaned up");
+      self.done = true;
     }
     self.reaction_num += 1;
   =}
diff --git a/test/Rust/src/Preamble.lf b/test/Rust/src/Preamble.lf
index 68e2a2f709..3f195808d7 100644
--- a/test/Rust/src/Preamble.lf
+++ b/test/Rust/src/Preamble.lf
@@ -3,7 +3,7 @@ target Rust
 main reactor Preamble {
   preamble {=
     fn add_42(i: i32) -> i32 {
-        return i + 42;
+      return i + 42;
     }
   =}
 
diff --git a/test/Rust/src/SingleFileGeneration.lf b/test/Rust/src/SingleFileGeneration.lf
index a3cfdc89f8..c88a4bdcbd 100644
--- a/test/Rust/src/SingleFileGeneration.lf
+++ b/test/Rust/src/SingleFileGeneration.lf
@@ -14,10 +14,10 @@ reactor Sink {
 
   reaction(inport) {=
     if let Some(value) = ctx.get(inport) {
-        println!("received {}", value);
-        assert_eq!(76600, value);
+      println!("received {}", value);
+      assert_eq!(76600, value);
     } else {
-        unreachable!();
+      unreachable!();
     }
   =}
 }
diff --git a/test/Rust/src/Stop.lf b/test/Rust/src/Stop.lf
index b70a034c12..49a84a35c9 100644
--- a/test/Rust/src/Stop.lf
+++ b/test/Rust/src/Stop.lf
@@ -28,11 +28,11 @@ reactor Sender(take_a_break_after: u32 = 10, break_interval: time = 400 msec) {
     self.sent_messages += 1;
 
     if self.sent_messages < self.take_a_break_after {
-        ctx.schedule(act, Asap);
+      ctx.schedule(act, Asap);
     } else {
-        // Take a break
-        self.sent_messages = 0;
-        ctx.schedule(act, After(self.break_interval));
+      // Take a break
+      self.sent_messages = 0;
+      ctx.schedule(act, After(self.break_interval));
     }
   =}
 }
@@ -45,17 +45,17 @@ reactor Consumer {
     let current_tag = ctx.get_tag();
 
     if current_tag > tag!(T0 + 10 ms, 9) {
-        // The reaction should not have been called at tags larger than (10 msec, 9)
-        panic!("ERROR: Invoked reaction(in) at tag bigger than shutdown.");
+      // The reaction should not have been called at tags larger than (10 msec, 9)
+      panic!("ERROR: Invoked reaction(in) at tag bigger than shutdown.");
     } else if current_tag == tag!(T0 + 10 ms, 8) {
-        // Call request_stop() at relative tag (10 msec, 8)
-        println!("Requesting stop.");
-        ctx.request_stop(Asap);
-        return;
+      // Call request_stop() at relative tag (10 msec, 8)
+      println!("Requesting stop.");
+      ctx.request_stop(Asap);
+      return;
     } else if current_tag == tag!(T0 + 10 ms, 9) {
-        // Check that this reaction is indeed also triggered at (10 msec, 9)
-        self.reaction_invoked_correctly = true;
-        return;
+      // Check that this reaction is indeed also triggered at (10 msec, 9)
+      self.reaction_invoked_correctly = true;
+      return;
     }
     println!("Tag is {}.", current_tag);
   =}
@@ -67,12 +67,12 @@ reactor Consumer {
 
     // Check to see if shutdown is called at relative tag (10 msec, 9)
     if current_tag == tag!(T0 + 10 ms, 9) && self.reaction_invoked_correctly {
-        println!("SUCCESS: successfully enforced stop.");
+      println!("SUCCESS: successfully enforced stop.");
     } else if current_tag > tag!(T0 + 10 ms, 9) {
-        panic!("ERROR: Shutdown invoked at tag {}. Failed to enforce timeout at (T0 + 10ms, 9).", current_tag);
+      panic!("ERROR: Shutdown invoked at tag {}. Failed to enforce timeout at (T0 + 10ms, 9).", current_tag);
     } else if !self.reaction_invoked_correctly {
-        // Check to see if reactions were called correctly
-        panic!("ERROR: Failed to invoke reaction(in) at tag {}.", current_tag);
+      // Check to see if reactions were called correctly
+      panic!("ERROR: Failed to invoke reaction(in) at tag {}.", current_tag);
     }
   =}
 }
diff --git a/test/Rust/src/StopAsync.lf b/test/Rust/src/StopAsync.lf
index ca2be1c8a6..c212a9689e 100644
--- a/test/Rust/src/StopAsync.lf
+++ b/test/Rust/src/StopAsync.lf
@@ -3,8 +3,8 @@ target Rust
 main reactor {
   reaction(startup) {=
     ctx.spawn_physical_thread(|ctx| {
-        std::thread::sleep(delay!(140 msec));
-        ctx.request_stop(Asap);
+      std::thread::sleep(delay!(140 msec));
+      ctx.request_stop(Asap);
     });
   =}
 
diff --git a/test/Rust/src/StopTimeoutExact.lf b/test/Rust/src/StopTimeoutExact.lf
index 0261e8b0d9..e9c9cc0da0 100644
--- a/test/Rust/src/StopTimeoutExact.lf
+++ b/test/Rust/src/StopTimeoutExact.lf
@@ -13,7 +13,7 @@ main reactor StopTimeoutExact {
 
   reaction(t) {=
     if ctx.get_tag() == tag!(T0 + 50 ms) {
-        self.reacted_on_shutdown = true;
+      self.reacted_on_shutdown = true;
     }
   =}
 
diff --git a/test/Rust/src/StructAsState.lf b/test/Rust/src/StructAsState.lf
index 574d3ff59f..36828ddf60 100644
--- a/test/Rust/src/StructAsState.lf
+++ b/test/Rust/src/StructAsState.lf
@@ -5,8 +5,8 @@ target Rust
 main reactor StructAsState {
   preamble {=
     struct Hello {
-        name: String,
-        value: i32,
+      name: String,
+      value: i32,
     }
   =}
   /**
@@ -20,8 +20,8 @@ main reactor StructAsState {
   reaction(startup) {=
     println!("State s.name=\"{}\", s.value={}.", self.s.name, self.s.value);
     if self.s.value != 42 {
-        eprintln!("FAILED: Expected 42.");
-        std::process::exit(1);
+      eprintln!("FAILED: Expected 42.");
+      std::process::exit(1);
     }
   =}
 }
diff --git a/test/Rust/src/StructAsType.lf b/test/Rust/src/StructAsType.lf
index 38242be033..867651e8de 100644
--- a/test/Rust/src/StructAsType.lf
+++ b/test/Rust/src/StructAsType.lf
@@ -6,8 +6,8 @@ reactor Source {
 
   preamble {=
     pub struct Hello {
-        pub name: String,
-        pub value: i32,
+      pub name: String,
+      pub value: i32,
     }
   =}
 
@@ -25,10 +25,10 @@ reactor Print(expected: i32 = 42) {
 
   reaction(inp) {=
     ctx.use_ref_opt(inp, |hello| {
-        println!("Received: name=\"{}\", value={}.", hello.name, hello.value);
-        if hello.value != self.expected {
-            panic!("ERROR: Expected value to be {}.\n", self.expected);
-        }
+      println!("Received: name=\"{}\", value={}.", hello.name, hello.value);
+      if hello.value != self.expected {
+        panic!("ERROR: Expected value to be {}.\n", self.expected);
+      }
     });
   =}
 }
diff --git a/test/Rust/src/TimerIsPresent.lf b/test/Rust/src/TimerIsPresent.lf
index 18977c42cf..4e675181eb 100644
--- a/test/Rust/src/TimerIsPresent.lf
+++ b/test/Rust/src/TimerIsPresent.lf
@@ -14,32 +14,32 @@ main reactor {
   reaction(startup, a, b, c) {=
     match self.tick {
     0 => { // startup
-        assert_tag_is!(ctx, T0);
-        assert!(ctx.is_present(a));
-        assert!(!ctx.is_present(b));
-        assert!(!ctx.is_present(c));
+      assert_tag_is!(ctx, T0);
+      assert!(ctx.is_present(a));
+      assert!(!ctx.is_present(b));
+      assert!(!ctx.is_present(c));
     },
     1 => { // 1 msec
-        assert_tag_is!(ctx, T0 + 1 ms);
-        assert!(!ctx.is_present(a));
-        assert!(ctx.is_present(b));
-        assert!(ctx.is_present(c));
+      assert_tag_is!(ctx, T0 + 1 ms);
+      assert!(!ctx.is_present(a));
+      assert!(ctx.is_present(b));
+      assert!(ctx.is_present(c));
     },
     2 => { // 5 msec (a triggers)
-        assert_tag_is!(ctx, T0 + 5 ms);
-        assert!(ctx.is_present(a));
-        assert!(!ctx.is_present(b));
-        assert!(!ctx.is_present(c));
+      assert_tag_is!(ctx, T0 + 5 ms);
+      assert!(ctx.is_present(a));
+      assert!(!ctx.is_present(b));
+      assert!(!ctx.is_present(c));
     },
     3 => { // 6 msec (b triggers)
-        assert_tag_is!(ctx, T0 + 6 ms);
-        assert!(!ctx.is_present(a));
-        assert!(ctx.is_present(b));
-        assert!(!ctx.is_present(c));
-        self.success = true;
+      assert_tag_is!(ctx, T0 + 6 ms);
+      assert!(!ctx.is_present(a));
+      assert!(ctx.is_present(b));
+      assert!(!ctx.is_present(c));
+      self.success = true;
     },
     _ => {
-        unreachable!("unexpected reaction invocation");
+      unreachable!("unexpected reaction invocation");
     }
     }
     self.tick += 1;
diff --git a/test/Rust/src/concurrent/AsyncCallback.lf b/test/Rust/src/concurrent/AsyncCallback.lf
index 64ced0d2be..c6e42c3909 100644
--- a/test/Rust/src/concurrent/AsyncCallback.lf
+++ b/test/Rust/src/concurrent/AsyncCallback.lf
@@ -20,18 +20,18 @@ main reactor AsyncCallback(period: time = 10 msec) {
     let act = act.clone();
     let period = self.period;
     if let Some(old_thread) = self.thread.take() {
-        old_thread.join().ok();
+      old_thread.join().ok();
     }
     // start new thread
     let new_thread = ctx.spawn_physical_thread(move |ctx| {
-        // Simulate time passing before a callback occurs
-        thread::sleep(period);
-        // Schedule twice. If the action is not physical, these should
-        // get consolidated into a single action triggering. If it is,
-        // then they cause two separate triggerings with close but not
-        // equal time stamps.
-        ctx.schedule_physical(&act, Asap).ok();
-        ctx.schedule_physical(&act, Asap).ok();
+      // Simulate time passing before a callback occurs
+      thread::sleep(period);
+      // Schedule twice. If the action is not physical, these should
+      // get consolidated into a single action triggering. If it is,
+      // then they cause two separate triggerings with close but not
+      // equal time stamps.
+      ctx.schedule_physical(&act, Asap).ok();
+      ctx.schedule_physical(&act, Asap).ok();
     });
 
     self.thread.replace(new_thread);
@@ -41,19 +41,19 @@ main reactor AsyncCallback(period: time = 10 msec) {
     let elapsed_time = ctx.get_elapsed_logical_time();
     let i = self.i;
     println!("Asynchronous callback {}: Assigned logical time greater than start time by {} ms",
-             i, elapsed_time.as_millis());
+         i, elapsed_time.as_millis());
     assert!(elapsed_time > self.expected_time,"ERROR: Expected logical time to be larger than {} ms", self.expected_time.as_millis());
 
     self.i += 1;
     if self.toggle {
-        self.expected_time += self.period;
+      self.expected_time += self.period;
     }
     self.toggle = !self.toggle;
   =}
 
   reaction(shutdown) {=
     if let Some(thread) = self.thread.take() {
-        thread.join().ok();
+      thread.join().ok();
     }
     println!("success");
   =}
diff --git a/test/Rust/src/concurrent/Workers.lf b/test/Rust/src/concurrent/Workers.lf
index fd330a73cb..9f2afa1f43 100644
--- a/test/Rust/src/concurrent/Workers.lf
+++ b/test/Rust/src/concurrent/Workers.lf
@@ -5,9 +5,9 @@ target Rust {
 main reactor {
   reaction(startup) {=
     if (ctx.num_workers() != 16) {
-        panic!("Expected to have 16 workers.");
+      panic!("Expected to have 16 workers.");
     } else {
-        println!("Using 16 workers.");
+      println!("Using 16 workers.");
     }
   =}
 }
diff --git a/test/Rust/src/generics/CtorParamGeneric.lf b/test/Rust/src/generics/CtorParamGeneric.lf
index 405a78ce46..2104da5f54 100644
--- a/test/Rust/src/generics/CtorParamGeneric.lf
+++ b/test/Rust/src/generics/CtorParamGeneric.lf
@@ -8,8 +8,8 @@ reactor Generic<{= T: Default + Eq + Sync + std::fmt::Debug =}>(
 
   reaction(in) {=
     ctx.use_ref_opt(r#in, |i| {
-        assert_eq!(&self.v, i);
-        println!("success");
+      assert_eq!(&self.v, i);
+      println!("success");
     });
   =}
 }
diff --git a/test/Rust/src/generics/CtorParamGenericInst.lf b/test/Rust/src/generics/CtorParamGenericInst.lf
index 0ae15ad1f9..1471178a17 100644
--- a/test/Rust/src/generics/CtorParamGenericInst.lf
+++ b/test/Rust/src/generics/CtorParamGenericInst.lf
@@ -9,8 +9,8 @@ reactor Generic2<{= T: Default + Eq + Sync + std::fmt::Debug + Send + 'static =}
 
   reaction(in) {=
     ctx.use_ref_opt(r#in, |i| {
-        assert_eq!(&self.v, i);
-        println!("success");
+      assert_eq!(&self.v, i);
+      println!("success");
     });
   =}
 }
diff --git a/test/Rust/src/generics/GenericComplexType.lf b/test/Rust/src/generics/GenericComplexType.lf
index 34765ade72..d427f65b25 100644
--- a/test/Rust/src/generics/GenericComplexType.lf
+++ b/test/Rust/src/generics/GenericComplexType.lf
@@ -9,8 +9,8 @@ reactor R {
 
   reaction(in) {=
     ctx.use_ref(r#in, |a| {
-        assert_eq!(a, Some(&vec![delay!(20 ms)]));
-        println!("success");
+      assert_eq!(a, Some(&vec![delay!(20 ms)]));
+      println!("success");
     });
   =}
 }
diff --git a/test/Rust/src/lib/SomethingWithAPreamble.lf b/test/Rust/src/lib/SomethingWithAPreamble.lf
index af5caa871b..cb1cf7a2c6 100644
--- a/test/Rust/src/lib/SomethingWithAPreamble.lf
+++ b/test/Rust/src/lib/SomethingWithAPreamble.lf
@@ -6,7 +6,7 @@ reactor SomethingWithAPreamble {
   input a: u32
   preamble {=
     pub fn some_fun() -> u32 {
-        4
+      4
     }
   =}
 }
diff --git a/test/Rust/src/multiport/ConnectionToSelfMultiport.lf b/test/Rust/src/multiport/ConnectionToSelfMultiport.lf
index 685ef1ac08..3f400dab40 100644
--- a/test/Rust/src/multiport/ConnectionToSelfMultiport.lf
+++ b/test/Rust/src/multiport/ConnectionToSelfMultiport.lf
@@ -8,7 +8,7 @@ reactor Node(num_nodes: usize = 4) {
 
   reaction(startup) -> out {=
     for (i, out) in out.into_iter().enumerate() {
-        ctx.set(out, i)
+      ctx.set(out, i)
     }
   =}
 
diff --git a/test/Rust/src/multiport/FullyConnectedAddressable.lf b/test/Rust/src/multiport/FullyConnectedAddressable.lf
index 5eefab68fe..7163e7da55 100644
--- a/test/Rust/src/multiport/FullyConnectedAddressable.lf
+++ b/test/Rust/src/multiport/FullyConnectedAddressable.lf
@@ -22,23 +22,23 @@ reactor Node(bank_index: usize = 0, num_nodes: usize = 4) {
     let mut count = 0;
     let mut result = 0;
     for port in inpt {
-        if let Some(v) = ctx.get(port) {
-            count += 1;
-            result = v;
-            print!("{}, ", result);
-        }
+      if let Some(v) = ctx.get(port) {
+        count += 1;
+        result = v;
+        print!("{}, ", result);
+      }
     }
     print!("\n");
 
     let expected = if self.bank_index == 0 { self.num_nodes - 1 } else { self.bank_index - 1 };
     if count != 1 || result != expected {
-        panic!("ERROR: received an unexpected message!");
+      panic!("ERROR: received an unexpected message!");
     }
   =}
 
   reaction(shutdown) {=
     if !self.received {
-        panic!("Error: received no input!");
+      panic!("Error: received no input!");
     }
   =}
 }
diff --git a/test/Rust/src/multiport/MultiportFromBank.lf b/test/Rust/src/multiport/MultiportFromBank.lf
index 7c62a81298..cf66939562 100644
--- a/test/Rust/src/multiport/MultiportFromBank.lf
+++ b/test/Rust/src/multiport/MultiportFromBank.lf
@@ -15,7 +15,7 @@ reactor Destination(port_width: usize = 2) {
 
   reaction(in) {=
     for (i, port) in r#in.enumerate_set() {
-        assert_eq!(Some(i), ctx.get(port), "Failed for input in[{}]", i);
+      assert_eq!(Some(i), ctx.get(port), "Failed for input in[{}]", i);
     }
     println!("Success");
   =}
diff --git a/test/Rust/src/multiport/MultiportFromHierarchy.lf b/test/Rust/src/multiport/MultiportFromHierarchy.lf
index 6e9afc643f..3648b22999 100644
--- a/test/Rust/src/multiport/MultiportFromHierarchy.lf
+++ b/test/Rust/src/multiport/MultiportFromHierarchy.lf
@@ -10,8 +10,8 @@ reactor Source {
 
   reaction(t) -> out {=
     for chan in out {
-        ctx.set(chan, self.s);
-        self.s += 1;
+      ctx.set(chan, self.s);
+      self.s += 1;
     }
   =}
 }
diff --git a/test/Rust/src/multiport/MultiportOut.lf b/test/Rust/src/multiport/MultiportOut.lf
index 9a7ec7a7e5..baec45b5b6 100644
--- a/test/Rust/src/multiport/MultiportOut.lf
+++ b/test/Rust/src/multiport/MultiportOut.lf
@@ -10,7 +10,7 @@ reactor Source {
 
   reaction(t) -> out {=
     for i in 0..out.len() {
-        ctx.set(&mut out[i], self.s);
+      ctx.set(&mut out[i], self.s);
     }
     self.s += 1;
   =}
@@ -36,9 +36,9 @@ reactor Destination {
   reaction(in) {=
     let mut sum = 0;
     for channel in r#in {
-        if let Some(ci) = ctx.get(channel) {
-           sum += ci;
-        }
+      if let Some(ci) = ctx.get(channel) {
+         sum += ci;
+      }
     }
     println!("Sum of received: {}", sum);
     assert_eq!(sum, self.s);
diff --git a/test/Rust/src/multiport/MultiportToBank.lf b/test/Rust/src/multiport/MultiportToBank.lf
index 1f26de1be6..cd439496fa 100644
--- a/test/Rust/src/multiport/MultiportToBank.lf
+++ b/test/Rust/src/multiport/MultiportToBank.lf
@@ -6,7 +6,7 @@ reactor Source {
 
   reaction(startup) -> out {=
     for (i, out) in out.into_iter().enumerate() {
-        ctx.set(out, i)
+      ctx.set(out, i)
     }
   =}
 }
diff --git a/test/Rust/src/multiport/MultiportToBankHierarchy.lf b/test/Rust/src/multiport/MultiportToBankHierarchy.lf
index df56ede9b7..cecef15c20 100644
--- a/test/Rust/src/multiport/MultiportToBankHierarchy.lf
+++ b/test/Rust/src/multiport/MultiportToBankHierarchy.lf
@@ -8,7 +8,7 @@ reactor Source {
 
   reaction(startup) -> out {=
     for (i, out) in out.into_iter().enumerate() {
-        ctx.set(out, i)
+      ctx.set(out, i)
     }
   =}
 }
diff --git a/test/Rust/src/multiport/MultiportToMultiport.lf b/test/Rust/src/multiport/MultiportToMultiport.lf
index c517ff597a..cab65a205a 100644
--- a/test/Rust/src/multiport/MultiportToMultiport.lf
+++ b/test/Rust/src/multiport/MultiportToMultiport.lf
@@ -6,7 +6,7 @@ reactor Source {
 
   reaction(startup) -> out {=
     for (i, out) in out.into_iter().enumerate() {
-        ctx.set(out, i)
+      ctx.set(out, i)
     }
   =}
 }
@@ -16,7 +16,7 @@ reactor Sink {
 
   reaction(in) {=
     for (i, port) in r#in.iter().enumerate() {
-        assert_eq!(Some(i), ctx.get(port), "Failed for input in[{}]", i);
+      assert_eq!(Some(i), ctx.get(port), "Failed for input in[{}]", i);
     }
     println!("Success");
   =}
diff --git a/test/Rust/src/multiport/MultiportToMultiport2.lf b/test/Rust/src/multiport/MultiportToMultiport2.lf
index 63297bb808..bc2808a5f0 100644
--- a/test/Rust/src/multiport/MultiportToMultiport2.lf
+++ b/test/Rust/src/multiport/MultiportToMultiport2.lf
@@ -6,7 +6,7 @@ reactor Source(width: usize = 2) {
 
   reaction(startup) -> out {=
     for (i, out) in out.iter_mut().enumerate() {
-        ctx.set(out, i)
+      ctx.set(out, i)
     }
   =}
 }
@@ -16,9 +16,9 @@ reactor Destination(width: usize = 2) {
 
   reaction(in) {=
     for (i, v) in r#in.enumerate_values() {
-        // NOTE: For testing purposes, this assumes the specific
-        // widths instantiated below.
-        assert_eq!(v, i % 3, "Failed for input in[{}]", i);
+      // NOTE: For testing purposes, this assumes the specific
+      // widths instantiated below.
+      assert_eq!(v, i % 3, "Failed for input in[{}]", i);
     }
     println!("Success");
   =}
diff --git a/test/Rust/src/multiport/ReadOutputOfContainedBank.lf b/test/Rust/src/multiport/ReadOutputOfContainedBank.lf
index 3595fdba21..2d97ad74d7 100644
--- a/test/Rust/src/multiport/ReadOutputOfContainedBank.lf
+++ b/test/Rust/src/multiport/ReadOutputOfContainedBank.lf
@@ -15,27 +15,27 @@ main reactor {
 
   reaction(startup) c.out {=
     for (i, chan) in c__out.iter().enumerate() {
-        let result = ctx.get(chan).unwrap();
-        println!("Startup reaction reading output of contained reactor: {}", result);
-        assert_eq!(result, 42 * i);
+      let result = ctx.get(chan).unwrap();
+      println!("Startup reaction reading output of contained reactor: {}", result);
+      assert_eq!(result, 42 * i);
     }
     self.count += 1;
   =}
 
   reaction(c.out) {=
     for (i, chan) in c__out.iter().enumerate() {
-        let result = ctx.get(chan).unwrap();
-        println!("Reading output of contained reactor: {}", result);
-        assert_eq!(result, 42 * i);
+      let result = ctx.get(chan).unwrap();
+      println!("Reading output of contained reactor: {}", result);
+      assert_eq!(result, 42 * i);
     }
     self.count += 1;
   =}
 
   reaction(startup, c.out) {=
     for (i, chan) in c__out.iter().enumerate() {
-        let result = ctx.get(chan).unwrap();
-        println!("Alternate triggering reading output of contained reactor: {}", result);
-        assert_eq!(result, 42 * i);
+      let result = ctx.get(chan).unwrap();
+      println!("Alternate triggering reading output of contained reactor: {}", result);
+      assert_eq!(result, 42 * i);
     }
     self.count += 1;
   =}
diff --git a/test/Rust/src/multiport/WidthWithParameter.lf b/test/Rust/src/multiport/WidthWithParameter.lf
index 3824413055..572da15222 100644
--- a/test/Rust/src/multiport/WidthWithParameter.lf
+++ b/test/Rust/src/multiport/WidthWithParameter.lf
@@ -5,7 +5,7 @@ reactor Some(value: usize = 30) {
 
   reaction(startup) -> finished {=
     for p in finished {
-        ctx.set(p, ());
+      ctx.set(p, ());
     }
   =}
 }
diff --git a/test/Rust/src/multiport/WriteInputOfContainedBank.lf b/test/Rust/src/multiport/WriteInputOfContainedBank.lf
index 53fe188559..f44914bd5d 100644
--- a/test/Rust/src/multiport/WriteInputOfContainedBank.lf
+++ b/test/Rust/src/multiport/WriteInputOfContainedBank.lf
@@ -22,7 +22,7 @@ main reactor {
 
   reaction(startup) -> c.inpt {=
     for i in 0..c__inpt.len() {
-        ctx.set(&mut c__inpt[i], i * 42);
+      ctx.set(&mut c__inpt[i], i * 42);
     }
   =}
 }
diff --git a/test/TypeScript/src/ActionDelay.lf b/test/TypeScript/src/ActionDelay.lf
index abbd0ec3af..18949417d3 100644
--- a/test/TypeScript/src/ActionDelay.lf
+++ b/test/TypeScript/src/ActionDelay.lf
@@ -31,9 +31,9 @@ reactor Sink {
     console.log("Logical, physical, and elapsed logical: " + logical + physical + elapsed_logical);
     const oneHundredMsec = TimeValue.msec(100);
     if (!elapsed_logical.isEqualTo(oneHundredMsec)) {
-        util.requestErrorStop("Expected " + oneHundredMsec + " but got " + elapsed_logical);
+      util.requestErrorStop("Expected " + oneHundredMsec + " but got " + elapsed_logical);
     } else {
-        console.log("SUCCESS. Elapsed logical time is " + elapsed_logical);
+      console.log("SUCCESS. Elapsed logical time is " + elapsed_logical);
     }
   =}
 }
diff --git a/test/TypeScript/src/After.lf b/test/TypeScript/src/After.lf
index 466f28c969..30edbdb554 100644
--- a/test/TypeScript/src/After.lf
+++ b/test/TypeScript/src/After.lf
@@ -21,7 +21,7 @@ reactor Print {
     console.log("Current logical time is: " + elapsed_time);
     console.log("Current physical time is: " + util.getElapsedPhysicalTime());
     if (! elapsed_time.isEqualTo(expected_time)) {
-        util.requestErrorStop("ERROR: Expected logical time to be " + expected_time);
+      util.requestErrorStop("ERROR: Expected logical time to be " + expected_time);
     }
     expected_time = expected_time.add(TimeValue.sec(1));
   =}
diff --git a/test/TypeScript/src/ArrayAsParameter.lf b/test/TypeScript/src/ArrayAsParameter.lf
index 5e6d8d7f52..ef9ba9f414 100644
--- a/test/TypeScript/src/ArrayAsParameter.lf
+++ b/test/TypeScript/src/ArrayAsParameter.lf
@@ -10,7 +10,7 @@ reactor Source(sequence: {= Array<number> =} = {= [0, 1, 2] =}) {
     out = sequence[count];
     count++;
     if (count < sequence.length) {
-        actions.next.schedule(0, null);
+      actions.next.schedule(0, null);
     }
   =}
 }
@@ -22,7 +22,7 @@ reactor Print {
   reaction(x) {=
     console.log("Received: " + x + ".");
     if (x != count) {
-        util.requestErrorStop("ERROR: Expected " + count + ".");
+      util.requestErrorStop("ERROR: Expected " + count + ".");
     }
     count++;
   =}
diff --git a/test/TypeScript/src/ArrayAsType.lf b/test/TypeScript/src/ArrayAsType.lf
index fdeb482535..c26e3fe02e 100644
--- a/test/TypeScript/src/ArrayAsType.lf
+++ b/test/TypeScript/src/ArrayAsType.lf
@@ -19,24 +19,24 @@ reactor Print(scale: number = 1) {
   input x: {= Array<number> =}
 
   reaction(x) {=
-    let count = 0;       // For testing.
+    let count = 0;     // For testing.
     let failed = false; // For testing.
     let msg = "";
     x = x as Array<number>
     msg += "Received: [";
     for (let i = 0; i < 3; i++) {
-        if (i > 0)  msg += ", ";
-        msg += (x[i]);
-        // For testing, check whether values match expectation.
-        if ((x[i]) != scale * count) {
-            failed = true;
-        }
-        count++;         // For testing.
+      if (i > 0)  msg += ", ";
+      msg += (x[i]);
+      // For testing, check whether values match expectation.
+      if ((x[i]) != scale * count) {
+        failed = true;
+      }
+      count++;     // For testing.
     }
     msg += "]";
     console.log(msg);
     if (failed) {
-        util.requestErrorStop("ERROR: Value received by Print does not match expectation!");
+      util.requestErrorStop("ERROR: Value received by Print does not match expectation!");
     }
   =}
 }
diff --git a/test/TypeScript/src/ArrayPrint.lf b/test/TypeScript/src/ArrayPrint.lf
index f072536b91..3c94b00b34 100644
--- a/test/TypeScript/src/ArrayPrint.lf
+++ b/test/TypeScript/src/ArrayPrint.lf
@@ -19,24 +19,24 @@ reactor Print(scale: number = 1) {
   input x: {= Array<number> =}
 
   reaction(x) {=
-    let count = 0;       // For testing.
+    let count = 0;     // For testing.
     let failed = false; // For testing.
     let msg = "";
     x = x as Array<number>
     msg += "Received: [";
     for (let i = 0; i < 3; i++) {
-        if (i > 0)  msg += ", ";
-        msg += (x[i]);
-        // For testing, check whether values match expectation.
-        if ((x[i]) != scale * count) {
-            failed = true;
-        }
-        count++;         // For testing.
+      if (i > 0)  msg += ", ";
+      msg += (x[i]);
+      // For testing, check whether values match expectation.
+      if ((x[i]) != scale * count) {
+        failed = true;
+      }
+      count++;     // For testing.
     }
     msg += "]";
     console.log(msg);
     if (failed) {
-        util.requestErrorStop("ERROR: Value received by Print does not match expectation!");
+      util.requestErrorStop("ERROR: Value received by Print does not match expectation!");
     }
   =}
 }
diff --git a/test/TypeScript/src/ArrayScale.lf b/test/TypeScript/src/ArrayScale.lf
index 031d8af446..2ddfa951f3 100644
--- a/test/TypeScript/src/ArrayScale.lf
+++ b/test/TypeScript/src/ArrayScale.lf
@@ -12,7 +12,7 @@ reactor Scale(scale: number = 2) {
   reaction(x) -> out {=
     x = x as Array<number>;
     for(let i = 0; i < x.length; i++) {
-        x[i] = x[i] * scale;
+      x[i] = x[i] * scale;
     }
     out = x;
   =}
diff --git a/test/TypeScript/src/Composition.lf b/test/TypeScript/src/Composition.lf
index 8a5fc8083c..cb108990c4 100644
--- a/test/TypeScript/src/Composition.lf
+++ b/test/TypeScript/src/Composition.lf
@@ -22,7 +22,7 @@ reactor Test {
     count++;
     console.log("Received " + x);
     if (x != count) {
-        util.requestErrorStop("FAILURE: Expected " + count);
+      util.requestErrorStop("FAILURE: Expected " + count);
     }
   =}
 }
diff --git a/test/TypeScript/src/CompositionAfter.lf b/test/TypeScript/src/CompositionAfter.lf
index b03b8f61f3..7166d750ea 100644
--- a/test/TypeScript/src/CompositionAfter.lf
+++ b/test/TypeScript/src/CompositionAfter.lf
@@ -23,7 +23,7 @@ reactor Test {
     count++;
     console.log("Received " + x);
     if (x != count) {
-        util.requestErrorStop("FAILURE: Expected " + count);
+      util.requestErrorStop("FAILURE: Expected " + count);
     }
   =}
 }
diff --git a/test/TypeScript/src/CountTest.lf b/test/TypeScript/src/CountTest.lf
index 4953e25567..66a12cfdd1 100644
--- a/test/TypeScript/src/CountTest.lf
+++ b/test/TypeScript/src/CountTest.lf
@@ -12,7 +12,7 @@ reactor Test {
     console.log("Received " + c);
     i++;
     if (c != i) {
-        util.requestErrorStop("ERROR: Expected " + i + " but got " + c);
+      util.requestErrorStop("ERROR: Expected " + i + " but got " + c);
     }
   =}
 }
diff --git a/test/TypeScript/src/Deadline.lf b/test/TypeScript/src/Deadline.lf
index e6a6037090..df02bceff4 100644
--- a/test/TypeScript/src/Deadline.lf
+++ b/test/TypeScript/src/Deadline.lf
@@ -12,12 +12,12 @@ reactor Source(period: time = 2 sec) {
 
   reaction(t) -> y {=
     if (2 * Math.floor(count / 2) != count){
-        // The count variable is odd.
-        // Busy wait 0.2 seconds to cause a deadline violation.
-        let initialElapsedTime = util.getElapsedPhysicalTime();
-        console.log("****: " + initialElapsedTime);
-        while (util.getElapsedPhysicalTime().isEarlierThan(initialElapsedTime.add(TimeValue.msec(400))));
-        console.log("****: " + util.getElapsedPhysicalTime());
+      // The count variable is odd.
+      // Busy wait 0.2 seconds to cause a deadline violation.
+      let initialElapsedTime = util.getElapsedPhysicalTime();
+      console.log("****: " + initialElapsedTime);
+      while (util.getElapsedPhysicalTime().isEarlierThan(initialElapsedTime.add(TimeValue.msec(400))));
+      console.log("****: " + util.getElapsedPhysicalTime());
     }
     console.log("Source sends: " + count);
     y = count;
@@ -32,15 +32,15 @@ reactor Destination(timeout: time = 1 sec) {
   reaction(x) {=
     console.log("Destination receives: " + x);
     if (2 * Math.floor(count / 2) != count) {
-        // The count variable is odd, so the deadline should have been violated.
-        util.requestErrorStop("ERROR: Failed to detect deadline.")
+      // The count variable is odd, so the deadline should have been violated.
+      util.requestErrorStop("ERROR: Failed to detect deadline.")
     }
     count++;
   =} deadline(timeout) {=
     console.log("Destination deadline handler receives: " + x);
     if (2 * Math.floor(count / 2) == count) {
-        // The count variable is even, so the deadline should not have been violated.
-        util.requestErrorStop("ERROR: Deadline miss handler invoked without deadline violation.")
+      // The count variable is even, so the deadline should not have been violated.
+      util.requestErrorStop("ERROR: Deadline miss handler invoked without deadline violation.")
     }
     count++;
   =}
diff --git a/test/TypeScript/src/DeadlineHandledAbove.lf b/test/TypeScript/src/DeadlineHandledAbove.lf
index 8d4f18976a..94ab8eb3fd 100644
--- a/test/TypeScript/src/DeadlineHandledAbove.lf
+++ b/test/TypeScript/src/DeadlineHandledAbove.lf
@@ -29,16 +29,16 @@ main reactor DeadlineHandledAbove {
 
   reaction(d.deadline_violation) {=
     if (d.deadline_violation) {
-        console.log("Output successfully produced by deadline miss handler.");
-        violation_detected = true;
+      console.log("Output successfully produced by deadline miss handler.");
+      violation_detected = true;
     }
   =}
 
   reaction(shutdown) {=
     if ( violation_detected) {
-        console.log("SUCCESS. Test passes.");
+      console.log("SUCCESS. Test passes.");
     } else {
-        util.requestErrorStop("FAILURE. Container did not react to deadline violation.")
+      util.requestErrorStop("FAILURE. Container did not react to deadline violation.")
     }
   =}
 }
diff --git a/test/TypeScript/src/DelayInt.lf b/test/TypeScript/src/DelayInt.lf
index 845b6995f5..4cf2b5a8cc 100644
--- a/test/TypeScript/src/DelayInt.lf
+++ b/test/TypeScript/src/DelayInt.lf
@@ -11,7 +11,7 @@ reactor Delay(delay: time = 100 msec) {
 
   reaction(a) -> out {=
     if (a !== null){
-        out = a as number
+      out = a as number
     }
   =}
 }
@@ -34,17 +34,17 @@ reactor Test {
     let elapsed = current_time.subtract(start_time);
     console.log("After " + elapsed + " of logical time.");
     if (!elapsed.isEqualTo(TimeValue.msec(100))) {
-        util.requestErrorStop("ERROR: Expected elapsed time to be [0, 100000000]. It was " + elapsed)
+      util.requestErrorStop("ERROR: Expected elapsed time to be [0, 100000000]. It was " + elapsed)
     }
     if (x != 42) {
-        util.requestErrorStop("ERROR: Expected input value to be 42. It was " + x)
+      util.requestErrorStop("ERROR: Expected input value to be 42. It was " + x)
     }
   =}
 
   reaction(shutdown) {=
     console.log("Checking that communication occurred.");
     if (!received_value) {
-        util.requestErrorStop("ERROR: No communication occurred!")
+      util.requestErrorStop("ERROR: No communication occurred!")
     }
   =}
 }
diff --git a/test/TypeScript/src/DelayedAction.lf b/test/TypeScript/src/DelayedAction.lf
index 72c78396bf..1979003351 100644
--- a/test/TypeScript/src/DelayedAction.lf
+++ b/test/TypeScript/src/DelayedAction.lf
@@ -17,7 +17,7 @@ main reactor DelayedAction {
     let expected = TimeValue.sec(count).add(TimeValue.msec(100));
     count++;
     if (!elapsedLogical.isEqualTo(expected)) {
-        util.requestErrorStop("Failure: expected " + expected + " but got " + elapsedLogical);
+      util.requestErrorStop("Failure: expected " + expected + " but got " + elapsedLogical);
     }
   =}
 }
diff --git a/test/TypeScript/src/DelayedReaction.lf b/test/TypeScript/src/DelayedReaction.lf
index 1622b4069c..66a721069b 100644
--- a/test/TypeScript/src/DelayedReaction.lf
+++ b/test/TypeScript/src/DelayedReaction.lf
@@ -15,7 +15,7 @@ reactor Sink {
     let elapsed = util.getElapsedLogicalTime();
     console.log("Nanoseconds since start: " + elapsed);
     if (! elapsed.isEqualTo(TimeValue.msec(100))) {
-        util.requestErrorStop("ERROR: Expected 100 msecs but got" + elapsed)
+      util.requestErrorStop("ERROR: Expected 100 msecs but got" + elapsed)
     }
   =}
 }
diff --git a/test/TypeScript/src/Determinism.lf b/test/TypeScript/src/Determinism.lf
index d0fc8db2a5..5b9d6de201 100644
--- a/test/TypeScript/src/Determinism.lf
+++ b/test/TypeScript/src/Determinism.lf
@@ -14,14 +14,14 @@ reactor Destination {
   reaction(x, y) {=
     let sum = 0;
     if (x !== undefined) {
-        sum += x;
+      sum += x;
     }
     if (y !== undefined) {
-        sum += y;
+      sum += y;
     }
     console.log("Received " + sum);
     if (sum != 2) {
-        util.requestErrorStop("FAILURE: Expected 2.")
+      util.requestErrorStop("FAILURE: Expected 2.")
     }
   =}
 }
diff --git a/test/TypeScript/src/DoubleInvocation.lf b/test/TypeScript/src/DoubleInvocation.lf
index 4f5cd1f2e4..792babadb8 100644
--- a/test/TypeScript/src/DoubleInvocation.lf
+++ b/test/TypeScript/src/DoubleInvocation.lf
@@ -33,10 +33,10 @@ reactor Print {
 
   reaction(position, velocity) {=
     if (position) {
-        console.log("Position: " + position);
+      console.log("Position: " + position);
     }
     if (position && position == previous) {
-        util.requestErrorStop("ERROR: Multiple firings at the same logical time!")
+      util.requestErrorStop("ERROR: Multiple firings at the same logical time!")
     }
   =}
 }
diff --git a/test/TypeScript/src/DoubleReaction.lf b/test/TypeScript/src/DoubleReaction.lf
index 303cdb02cc..6d0ad9b5b7 100644
--- a/test/TypeScript/src/DoubleReaction.lf
+++ b/test/TypeScript/src/DoubleReaction.lf
@@ -24,14 +24,14 @@ reactor Destination {
   reaction(x, w) {=
     let sum = 0;
     if (x) {
-        sum += x;
+      sum += x;
     }
     if (w) {
-        sum += w;
+      sum += w;
     }
     console.log("Sum of inputs is: " + sum);
     if (sum != s) {
-        util.requestErrorStop("FAILURE: Expected sum to be " + s + ", but it was " + sum)
+      util.requestErrorStop("FAILURE: Expected sum to be " + s + ", but it was " + sum)
     }
     s += 2;
   =}
diff --git a/test/TypeScript/src/DoubleTrigger.lf b/test/TypeScript/src/DoubleTrigger.lf
index 1934f41773..961cfdd5fc 100644
--- a/test/TypeScript/src/DoubleTrigger.lf
+++ b/test/TypeScript/src/DoubleTrigger.lf
@@ -12,13 +12,13 @@ main reactor DoubleTrigger {
   reaction(t1, t2) {=
     s++;
     if (s > 1) {
-        util.requestErrorStop("FAILURE: Reaction got triggered twice.")
+      util.requestErrorStop("FAILURE: Reaction got triggered twice.")
     }
   =}
 
   reaction(shutdown) {=
     if (s != 1) {
-        util.reportError("FAILURE: Reaction was never triggered.");
+      util.reportError("FAILURE: Reaction was never triggered.");
     }
   =}
 }
diff --git a/test/TypeScript/src/FloatLiteral.lf b/test/TypeScript/src/FloatLiteral.lf
index a7c57397d4..26d58974af 100644
--- a/test/TypeScript/src/FloatLiteral.lf
+++ b/test/TypeScript/src/FloatLiteral.lf
@@ -10,9 +10,9 @@ main reactor {
   reaction(startup) {=
     const F: number = - N * charge;
     if (Math.abs(F - expected) < Math.abs(minus_epsilon)) {
-        console.log("The Faraday constant is roughly " + F + ".");
+      console.log("The Faraday constant is roughly " + F + ".");
     } else {
-        util.requestErrorStop("ERROR: Expected " + expected + " but got " + F + ".");
+      util.requestErrorStop("ERROR: Expected " + expected + " but got " + F + ".");
     }
   =}
 }
diff --git a/test/TypeScript/src/Gain.lf b/test/TypeScript/src/Gain.lf
index 5ebcf69799..bcb17bd4eb 100644
--- a/test/TypeScript/src/Gain.lf
+++ b/test/TypeScript/src/Gain.lf
@@ -16,15 +16,15 @@ reactor Test {
     console.log("Received " + x + ".");
     received_value = true;
     if ((x as number) != 2) {
-        util.requestErrorStop("ERROR: Expected 2!");
+      util.requestErrorStop("ERROR: Expected 2!");
     }
   =}
 
   reaction(shutdown) {=
     if (!received_value){
-        util.reportError("ERROR: No value received by Test reactor!");
+      util.reportError("ERROR: No value received by Test reactor!");
     } else {
-        console.log("Test passes");
+      console.log("Test passes");
     }
   =}
 }
diff --git a/test/TypeScript/src/Hello.lf b/test/TypeScript/src/Hello.lf
index ae0755366a..f8bed2cefe 100644
--- a/test/TypeScript/src/Hello.lf
+++ b/test/TypeScript/src/Hello.lf
@@ -26,12 +26,12 @@ reactor Reschedule(period: time = 2 sec, message: string = "Hello TypeScript") {
     console.log("***** action " + count + " at time " + util.getCurrentLogicalTime());
     // Check the a_has_value variable.
     if (a) {
-        util.requestErrorStop("FAILURE: Expected a to be null (not present), but it was non-null.");
+      util.requestErrorStop("FAILURE: Expected a to be null (not present), but it was non-null.");
     }
     let currentTime = util.getCurrentLogicalTime();
     if (! currentTime.subtract(previous_time).isEqualTo(TimeValue.msec(200))) {
-        util.requestErrorStop("FAILURE: Expected 200ms of logical time to elapse but got " +
-            currentTime.subtract(previous_time));
+      util.requestErrorStop("FAILURE: Expected 200ms of logical time to elapse but got " +
+        currentTime.subtract(previous_time));
     }
   =}
 }
diff --git a/test/TypeScript/src/Hierarchy.lf b/test/TypeScript/src/Hierarchy.lf
index 7a7b2d72ee..2672f90f84 100644
--- a/test/TypeScript/src/Hierarchy.lf
+++ b/test/TypeScript/src/Hierarchy.lf
@@ -28,7 +28,7 @@ reactor Print {
     x = x as number;
     console.log("Received: " + x);
     if (x != 2) {
-        util.requestErrorStop("Expected 2.")
+      util.requestErrorStop("Expected 2.")
     }
   =}
 }
diff --git a/test/TypeScript/src/Hierarchy2.lf b/test/TypeScript/src/Hierarchy2.lf
index 405c9015e8..017c507b73 100644
--- a/test/TypeScript/src/Hierarchy2.lf
+++ b/test/TypeScript/src/Hierarchy2.lf
@@ -42,7 +42,7 @@ reactor Print {
   reaction(x) {=
     x = x as number;
     if (x != expected) {
-        util.requestErrorStop("Expected " + expected);
+      util.requestErrorStop("Expected " + expected);
     }
     expected++;
   =}
diff --git a/test/TypeScript/src/Microsteps.lf b/test/TypeScript/src/Microsteps.lf
index a04b454a92..c5412a6b06 100644
--- a/test/TypeScript/src/Microsteps.lf
+++ b/test/TypeScript/src/Microsteps.lf
@@ -8,19 +8,19 @@ reactor Destination {
     let elapsed = util.getElapsedLogicalTime();
     console.log("Time since start: " + elapsed);
     if (! elapsed.isEqualTo(TimeValue.zero())) {
-        util.requestErrorStop("Expected elapsed time to be 0, but it was " + elapsed);
+      util.requestErrorStop("Expected elapsed time to be 0, but it was " + elapsed);
     }
     let count = 0;
     if (x) {
-        console.log("x is present.");
-        count++;
+      console.log("x is present.");
+      count++;
     }
     if (y) {
-        console.log("y is present.");
-        count++;
+      console.log("y is present.");
+      count++;
     }
     if (count != 1) {
-        util.requestErrorStop("Expected exactly one input to be present but got " + count)
+      util.requestErrorStop("Expected exactly one input to be present but got " + count)
     }
   =}
 }
diff --git a/test/TypeScript/src/MovingAverage.lf b/test/TypeScript/src/MovingAverage.lf
index 3ec84cb1a7..f99e436ab7 100644
--- a/test/TypeScript/src/MovingAverage.lf
+++ b/test/TypeScript/src/MovingAverage.lf
@@ -27,7 +27,7 @@ reactor MovingAverageImpl {
     // Calculate the output.
     let sum = x;
     for (let i = 0; i < 3; i++) {
-        sum += delay_line[i];
+      sum += delay_line[i];
     }
     out = sum/4.0;
 
@@ -37,7 +37,7 @@ reactor MovingAverageImpl {
     // Update the index for the next input.
     index++;
     if (index >= 3) {
-        index = 0;
+      index = 0;
     }
   =}
 }
@@ -51,7 +51,7 @@ reactor Print {
     console.log("Received: " + x);
     let expected = [0.0, 0.25, 0.75, 1.5, 2.5, 3.5];
     if (x != expected[count]) {
-        util.requestErrorStop("ERROR: Expected " + expected[count])
+      util.requestErrorStop("ERROR: Expected " + expected[count])
     }
     count++;
   =}
diff --git a/test/TypeScript/src/MultipleContained.lf b/test/TypeScript/src/MultipleContained.lf
index d381c2c697..a3ae63b2cf 100644
--- a/test/TypeScript/src/MultipleContained.lf
+++ b/test/TypeScript/src/MultipleContained.lf
@@ -12,7 +12,7 @@ reactor Contained {
     in1 = in1 as number;
     console.log("in1 received " + in1);
     if (in1 != 42) {
-        util.requestErrorStop("FAILED: Expected 42.")
+      util.requestErrorStop("FAILED: Expected 42.")
     }
   =}
 
@@ -20,7 +20,7 @@ reactor Contained {
     in2 = in2 as number;
     console.log("in2 received " + in2);
     if (in2 != 42) {
-        util.requestErrorStop("FAILED: Expected 42.")
+      util.requestErrorStop("FAILED: Expected 42.")
     }
   =}
 }
diff --git a/test/TypeScript/src/NativeListsAndTimes.lf b/test/TypeScript/src/NativeListsAndTimes.lf
index 95cf9e741d..72756b5fc2 100644
--- a/test/TypeScript/src/NativeListsAndTimes.lf
+++ b/test/TypeScript/src/NativeListsAndTimes.lf
@@ -3,8 +3,8 @@ target TypeScript
 // This test passes if it is successfully compiled into valid target code.
 main reactor(
     x: number = 0,
-    y: time = 0,               // Units are missing but not required
-    z = 1 msec,                // Type is missing but not required
+    y: time = 0,         // Units are missing but not required
+    z = 1 msec,        // Type is missing but not required
     p: number[](1, 2, 3, 4),   // List of integers
     q: TimeValue[](1 msec, 2 msec, 3 msec),  // list of time values
     // List of time values
@@ -12,11 +12,11 @@ main reactor(
   state s: time = y  // Reference to explicitly typed time parameter
   state t: time = z  // Reference to implicitly typed time parameter
   state v: boolean   // Uninitialized boolean state variable
-  state w: time      // Uninitialized time state variable
-  timer tick(0)      // Units missing but not required
+  state w: time    // Uninitialized time state variable
+  timer tick(0)    // Units missing but not required
   timer tock(1 sec)  // Implicit type time
-  timer toe(z)       // Implicit type time
-  state baz = p      // Implicit type int[]
+  timer toe(z)     // Implicit type time
+  state baz = p    // Implicit type int[]
   state period = z   // Implicit type time
 
   reaction(tick) {=
diff --git a/test/TypeScript/src/PeriodicDesugared.lf b/test/TypeScript/src/PeriodicDesugared.lf
index 82c86ca205..3704668a31 100644
--- a/test/TypeScript/src/PeriodicDesugared.lf
+++ b/test/TypeScript/src/PeriodicDesugared.lf
@@ -7,10 +7,10 @@ main reactor(offset: time = 0, period: time = 500 msec) {
 
   reaction(startup) -> init, recur {=
     if (offset.isZero()) {
-        console.log("Hello World!");
-        actions.recur.schedule(0, null);
+      console.log("Hello World!");
+      actions.recur.schedule(0, null);
     } else {
-        actions.init.schedule(0, null);
+      actions.init.schedule(0, null);
     }
   =}
 
@@ -18,7 +18,7 @@ main reactor(offset: time = 0, period: time = 500 msec) {
     console.log("Hello World!");
     actions.recur.schedule(0, null);
     if (count > 10) {
-        util.requestStop();
+      util.requestStop();
     }
     count++;
   =}
diff --git a/test/TypeScript/src/PhysicalConnection.lf b/test/TypeScript/src/PhysicalConnection.lf
index 6305801f18..495d7bc0e0 100644
--- a/test/TypeScript/src/PhysicalConnection.lf
+++ b/test/TypeScript/src/PhysicalConnection.lf
@@ -14,7 +14,7 @@ reactor Destination {
     let time = util.getElapsedLogicalTime();
     console.log("Received event at logical time: " +  time);
     if (time.isZero()) {
-        util.requestErrorStop("ERROR: Logical time should be greater than zero");
+      util.requestErrorStop("ERROR: Logical time should be greater than zero");
     }
   =}
 }
diff --git a/test/TypeScript/src/Preamble.lf b/test/TypeScript/src/Preamble.lf
index 51cd0a1868..967a47353b 100644
--- a/test/TypeScript/src/Preamble.lf
+++ b/test/TypeScript/src/Preamble.lf
@@ -5,7 +5,7 @@ target TypeScript {
 main reactor Preamble {
   preamble {=
     function add42( i:number) {
-        return i + 42;
+      return i + 42;
     }
   =}
   timer t
diff --git a/test/TypeScript/src/ReadOutputOfContainedReactor.lf b/test/TypeScript/src/ReadOutputOfContainedReactor.lf
index 0f4b7327f2..9009141181 100644
--- a/test/TypeScript/src/ReadOutputOfContainedReactor.lf
+++ b/test/TypeScript/src/ReadOutputOfContainedReactor.lf
@@ -14,7 +14,7 @@ main reactor ReadOutputOfContainedReactor {
   reaction(startup) c.out {=
     console.log("Startup reaction reading output of contained reactor: " + c.out);
     if (c.out != 42) {
-        util.requestErrorStop("FAILURE: expected 42.")
+      util.requestErrorStop("FAILURE: expected 42.")
     }
     count++;
   =}
@@ -22,7 +22,7 @@ main reactor ReadOutputOfContainedReactor {
   reaction(c.out) {=
     console.log("Reading output of contained reactor: " + c.out);
     if (c.out != 42) {
-        util.requestErrorStop("FAILURE: expected 42.")
+      util.requestErrorStop("FAILURE: expected 42.")
     }
     count++;
   =}
@@ -30,17 +30,17 @@ main reactor ReadOutputOfContainedReactor {
   reaction(startup, c.out) {=
     console.log("Alternate triggering reading output of contained reactor: " + c.out);
     if (c.out != 42) {
-        util.requestErrorStop("FAILURE: expected 42.")
+      util.requestErrorStop("FAILURE: expected 42.")
     }
     count++;
   =}
 
   reaction(shutdown) {=
     if (count != 3) {
-        console.log("Count is: " + count)
-        util.requestErrorStop("FAILURE: One of the reactions failed to trigger.")
+      console.log("Count is: " + count)
+      util.requestErrorStop("FAILURE: One of the reactions failed to trigger.")
     } else {
-        console.log("Test passes.");
+      console.log("Test passes.");
     }
   =}
 }
diff --git a/test/TypeScript/src/Schedule.lf b/test/TypeScript/src/Schedule.lf
index fa779cc5bd..a6b48a14fb 100644
--- a/test/TypeScript/src/Schedule.lf
+++ b/test/TypeScript/src/Schedule.lf
@@ -11,9 +11,9 @@ reactor ScheduleLogicalAction {
     let elapsedTime = util.getElapsedLogicalTime();
     console.log("Action triggered at logical time " + elapsedTime + " (sec, nsec) after start.");
     if (!elapsedTime.isEqualTo(TimeValue.msec(200))) {
-        util.requestErrorStop("Expected action time to be 200 msec. It was " + elapsedTime + " (sec, nsec).")
+      util.requestErrorStop("Expected action time to be 200 msec. It was " + elapsedTime + " (sec, nsec).")
     } else {
-        console.log("Success! Action time was " + elapsedTime);
+      console.log("Success! Action time was " + elapsedTime);
     }
   =}
 }
diff --git a/test/TypeScript/src/ScheduleLogicalAction.lf b/test/TypeScript/src/ScheduleLogicalAction.lf
index 149f84df88..b165588a1b 100644
--- a/test/TypeScript/src/ScheduleLogicalAction.lf
+++ b/test/TypeScript/src/ScheduleLogicalAction.lf
@@ -30,7 +30,7 @@ reactor print {
     console.log("Current logical time is: " + elapsed_time);
     console.log("Current physical time is: " + util.getElapsedPhysicalTime());
     if (! elapsed_time.isEqualTo(expected_time)) {
-        util.requestErrorStop("ERROR: Expected logical time to be " + expected_time);
+      util.requestErrorStop("ERROR: Expected logical time to be " + expected_time);
     }
     expected_time = expected_time.add(TimeValue.msec(500));
   =}
diff --git a/test/TypeScript/src/SendingInside.lf b/test/TypeScript/src/SendingInside.lf
index 9f22e94cc7..16278673a3 100644
--- a/test/TypeScript/src/SendingInside.lf
+++ b/test/TypeScript/src/SendingInside.lf
@@ -12,7 +12,7 @@ reactor Printer {
   reaction(x) {=
     console.log("Inside reactor received: " + x);
     if ((x as number) != count) {
-        util.requestErrorStop("FAILURE: Expected " + count)
+      util.requestErrorStop("FAILURE: Expected " + count)
     }
     count++;
   =}
diff --git a/test/TypeScript/src/SendingInside2.lf b/test/TypeScript/src/SendingInside2.lf
index a537191e4b..0271112da6 100644
--- a/test/TypeScript/src/SendingInside2.lf
+++ b/test/TypeScript/src/SendingInside2.lf
@@ -6,7 +6,7 @@ reactor Printer {
   reaction(x) {=
     console.log("Inside reactor received:" + x );
     if (x != 1) {
-        util.requestErrorStop("ERROR: Expected 1.");
+      util.requestErrorStop("ERROR: Expected 1.");
     }
   =}
 }
diff --git a/test/TypeScript/src/SendsPointerTest.lf b/test/TypeScript/src/SendsPointerTest.lf
index c7b4f2d4f8..2808d2a87b 100644
--- a/test/TypeScript/src/SendsPointerTest.lf
+++ b/test/TypeScript/src/SendsPointerTest.lf
@@ -19,7 +19,7 @@ reactor Print(expected: {= {value: number} =} = {= { value: 42 } =}) {
     x = x as {value: number};
     console.log("Received: " + JSON.stringify(x));
     if (x.value != expected.value) {
-        util.requestErrorStop("ERROR: Expected x.value to be " + expected.value);
+      util.requestErrorStop("ERROR: Expected x.value to be " + expected.value);
     }
   =}
 }
diff --git a/test/TypeScript/src/SimpleDeadline.lf b/test/TypeScript/src/SimpleDeadline.lf
index 56ffd3f64f..3d5fcab3d4 100644
--- a/test/TypeScript/src/SimpleDeadline.lf
+++ b/test/TypeScript/src/SimpleDeadline.lf
@@ -19,7 +19,7 @@ reactor Print {
 
   reaction(x) {=
     if (x) {
-        console.log("Output successfully produced by deadline handler.");
+      console.log("Output successfully produced by deadline handler.");
     }
   =}
 }
diff --git a/test/TypeScript/src/SlowingClock.lf b/test/TypeScript/src/SlowingClock.lf
index 47d41ce89f..522778f2d7 100644
--- a/test/TypeScript/src/SlowingClock.lf
+++ b/test/TypeScript/src/SlowingClock.lf
@@ -14,7 +14,7 @@ main reactor SlowingClock {
     let elapsed_logical_time : TimeValue = util.getElapsedLogicalTime();
     console.log("Logical time since start: " + elapsed_logical_time);
     if (!elapsed_logical_time.isEqualTo(expected_time)) {
-        util.requestErrorStop("ERROR: Expected time to be: " + expected_time)
+      util.requestErrorStop("ERROR: Expected time to be: " + expected_time)
     }
     actions.a.schedule(interval, null);
     expected_time = expected_time.add(TimeValue.msec(100))
@@ -24,7 +24,7 @@ main reactor SlowingClock {
 
   reaction(shutdown) {=
     if (!expected_time.isEqualTo(TimeValue.msec(5500))) {
-        util.requestErrorStop("ERROR: Expected the next expected time to be: " + TimeValue.msec(5500) + "It was: " + expected_time)
+      util.requestErrorStop("ERROR: Expected the next expected time to be: " + TimeValue.msec(5500) + "It was: " + expected_time)
     }
   =}
 }
diff --git a/test/TypeScript/src/SlowingClockPhysical.lf b/test/TypeScript/src/SlowingClockPhysical.lf
index e51d34601a..bbf120e8f4 100644
--- a/test/TypeScript/src/SlowingClockPhysical.lf
+++ b/test/TypeScript/src/SlowingClockPhysical.lf
@@ -24,7 +24,7 @@ main reactor SlowingClockPhysical {
     let elapsed_logical_time = util.getElapsedLogicalTime();
     console.log("Logical time since start: " + elapsed_logical_time);
     if (elapsed_logical_time.isEarlierThan(expected_time)) {
-        util.requestErrorStop("ERROR: Expected logical time to be: " + expected_time)
+      util.requestErrorStop("ERROR: Expected logical time to be: " + expected_time)
     }
     interval = interval.add(TimeValue.msec(100));
     expected_time = (TimeValue.msec(100)).add(interval);
@@ -33,7 +33,7 @@ main reactor SlowingClockPhysical {
 
   reaction(shutdown) {=
     if (expected_time.isEarlierThan(TimeValue.msec(500))) {
-        util.requestErrorStop("ERROR: Expected the next expected time to be at least: 500 msec. It was: " + expected_time)
+      util.requestErrorStop("ERROR: Expected the next expected time to be at least: 500 msec. It was: " + expected_time)
     }
   =}
 }
diff --git a/test/TypeScript/src/Stop.lf b/test/TypeScript/src/Stop.lf
index f23ee09c09..dcc727203a 100644
--- a/test/TypeScript/src/Stop.lf
+++ b/test/TypeScript/src/Stop.lf
@@ -18,15 +18,15 @@ reactor Consumer {
     const currentTag = util.getCurrentTag();
     const compareTag = util.getStartTag().getLaterTag(TimeValue.msec(10));
     if (compareTag.getMicroStepsLater(9).isSmallerThan(currentTag)) {
-        // The reaction should not have been called at tags larger than (10 msec, 9)
-        util.requestErrorStop(`ERROR: Invoked reaction(in) at tag bigger than shutdown.`);
+      // The reaction should not have been called at tags larger than (10 msec, 9)
+      util.requestErrorStop(`ERROR: Invoked reaction(in) at tag bigger than shutdown.`);
     } else if (currentTag.isSimultaneousWith(compareTag.getMicroStepsLater(8))) {
-        // Call util.requestStop() at relative tag (10 msec, 8)
-        console.log(`Requesting stop.`);
-        util.requestStop();
+      // Call util.requestStop() at relative tag (10 msec, 8)
+      console.log(`Requesting stop.`);
+      util.requestStop();
     } else if (currentTag.isSimultaneousWith(compareTag.getMicroStepsLater(9))) {
-        // Check that this reaction is indeed also triggered at (10 msec, 9)
-        reactionInvokedCorrectly = true;
+      // Check that this reaction is indeed also triggered at (10 msec, 9)
+      reactionInvokedCorrectly = true;
     }
   =}
 
@@ -35,18 +35,18 @@ reactor Consumer {
     const compareTag = util.getStartTag().getLaterTag(TimeValue.msec(10));
     // Check to see if shutdown is called at relative tag (10 msec, 9)
     if (currentTag.isSimultaneousWith(compareTag.getMicroStepsLater(9)) &&
-        reactionInvokedCorrectly === true) {
-        console.log(`SUCCESS: successfully enforced stop.`);
+      reactionInvokedCorrectly === true) {
+      console.log(`SUCCESS: successfully enforced stop.`);
     } else if(!currentTag.isSmallerThan(compareTag.getMicroStepsLater(9)) &&
-        !currentTag.isSimultaneousWith(compareTag.getMicroStepsLater(9))) {
-        util.requestErrorStop(`ERROR: Shutdown invoked at tag `
-            + `(${currentTag.time.subtract(util.getStartTime())}, `
-            + `${currentTag.microstep}). Failed to enforce timeout.`);
+      !currentTag.isSimultaneousWith(compareTag.getMicroStepsLater(9))) {
+      util.requestErrorStop(`ERROR: Shutdown invoked at tag `
+        + `(${currentTag.time.subtract(util.getStartTime())}, `
+        + `${currentTag.microstep}). Failed to enforce timeout.`);
     } else if (reactionInvokedCorrectly === false) {
-        // Check to see if reactions were called correctly
-        util.requestErrorStop(`ERROR: Failed to invoke reaction(in) at tag `
-            + `(${currentTag.time.subtract(util.getStartTime())}, `
-            + `${currentTag.microstep}). Failed to enforce timeout.`);
+      // Check to see if reactions were called correctly
+      util.requestErrorStop(`ERROR: Failed to invoke reaction(in) at tag `
+        + `(${currentTag.time.subtract(util.getStartTime())}, `
+        + `${currentTag.microstep}). Failed to enforce timeout.`);
     }
   =}
 }
diff --git a/test/TypeScript/src/StructAsState.lf b/test/TypeScript/src/StructAsState.lf
index df15d1abc0..fdac670b9a 100644
--- a/test/TypeScript/src/StructAsState.lf
+++ b/test/TypeScript/src/StructAsState.lf
@@ -4,8 +4,8 @@ target TypeScript
 main reactor StructAsState {
   preamble {=
     type hello_t = {
-        name: string ;
-        value: number;
+      name: string ;
+      value: number;
     }
   =}
   state s: hello_t = {= {name: "Earth", value: 42} =}
@@ -13,7 +13,7 @@ main reactor StructAsState {
   reaction(startup) {=
     console.log("State s.name=" + s.name + ", s.value=" + s.value);
     if (s.value != 42) {
-        util.requestErrorStop("FAILED: Expected 42.");
+      util.requestErrorStop("FAILED: Expected 42.");
     }
   =}
 }
diff --git a/test/TypeScript/src/StructAsType.lf b/test/TypeScript/src/StructAsType.lf
index bef058e295..56a6a40c9f 100644
--- a/test/TypeScript/src/StructAsType.lf
+++ b/test/TypeScript/src/StructAsType.lf
@@ -4,8 +4,8 @@ target TypeScript
 reactor Source {
   preamble {=
     type hello_t =  {
-        name: string ;
-        value: number;
+      name: string ;
+      value: number;
     }
   =}
   output out: hello_t
@@ -26,7 +26,7 @@ reactor Print(expected: number = 42) {
     x = x as hello_t;
     console.log("Received: name = " + x.name + ", value = " + x.value);
     if (x.value != expected) {
-        util.requestErrorStop("ERROR: Expected value to be " + expected)
+      util.requestErrorStop("ERROR: Expected value to be " + expected)
     }
   =}
 }
diff --git a/test/TypeScript/src/StructAsTypeDirect.lf b/test/TypeScript/src/StructAsTypeDirect.lf
index a2e6425172..0664444cd9 100644
--- a/test/TypeScript/src/StructAsTypeDirect.lf
+++ b/test/TypeScript/src/StructAsTypeDirect.lf
@@ -4,8 +4,8 @@ target TypeScript
 reactor Source {
   preamble {=
     type hello_t =  {
-        name: string ;
-        value: number;
+      name: string ;
+      value: number;
     }
   =}
   output out: hello_t
@@ -26,7 +26,7 @@ reactor Print(expected: number = 42) {
     x = x as hello_t;
     console.log("Received: name = " + x.name + ", value = " + x.value);
     if (x.value != expected) {
-        util.requestErrorStop("ERROR: Expected value to be " + expected)
+      util.requestErrorStop("ERROR: Expected value to be " + expected)
     }
   =}
 }
diff --git a/test/TypeScript/src/StructPrint.lf b/test/TypeScript/src/StructPrint.lf
index 9268100161..397e34a9a0 100644
--- a/test/TypeScript/src/StructPrint.lf
+++ b/test/TypeScript/src/StructPrint.lf
@@ -5,8 +5,8 @@ target TypeScript
 reactor Source {
   preamble {=
     type hello_t =  {
-        name: string ;
-        value: number;
+      name: string ;
+      value: number;
     }
   =}
   output out: hello_t
@@ -25,7 +25,7 @@ reactor Print(expected: number = 42) {
     x = x as hello_t;
     console.log("Received: name = " + x.name + ", value = " + x.value);
     if (x.value != expected) {
-        util.requestErrorStop("ERROR: Expected value to be " + expected)
+      util.requestErrorStop("ERROR: Expected value to be " + expected)
     }
   =}
 }
diff --git a/test/TypeScript/src/TestForPreviousOutput.lf b/test/TypeScript/src/TestForPreviousOutput.lf
index c088ac1d6d..1ce4057b42 100644
--- a/test/TypeScript/src/TestForPreviousOutput.lf
+++ b/test/TypeScript/src/TestForPreviousOutput.lf
@@ -9,16 +9,16 @@ reactor Source {
     // Note: Math.random can't be seeded
     // Randomly produce an output or not.
     if (Math.random() > 0.5) {
-        out = 21;
+      out = 21;
     }
   =}
 
   reaction(startup) -> out {=
     let previous_output = out;
     if (previous_output) {
-        out = 2 * previous_output;
+      out = 2 * previous_output;
     } else {
-        out = 42;
+      out = 42;
     }
   =}
 }
@@ -30,7 +30,7 @@ reactor Sink {
     x = x as number;
     console.log("Received " + x);
     if (x != 42) {
-        util.requestErrorStop("FAILED: Expected 42.")
+      util.requestErrorStop("FAILED: Expected 42.")
     }
   =}
 }
diff --git a/test/TypeScript/src/TimeLimit.lf b/test/TypeScript/src/TimeLimit.lf
index 8c8a039ad8..42ec3391ae 100644
--- a/test/TypeScript/src/TimeLimit.lf
+++ b/test/TypeScript/src/TimeLimit.lf
@@ -23,7 +23,7 @@ reactor Destination {
 
   reaction(x) {=
     if (x != s) {
-        util.requestErrorStop("Error: Expected " + s + " and got " + x + ".")
+      util.requestErrorStop("Error: Expected " + s + " and got " + x + ".")
     }
     s++;
   =}
diff --git a/test/TypeScript/src/Wcet.lf b/test/TypeScript/src/Wcet.lf
index a68e54c877..b715dfd9a4 100644
--- a/test/TypeScript/src/Wcet.lf
+++ b/test/TypeScript/src/Wcet.lf
@@ -20,9 +20,9 @@ reactor Work {
   reaction(in1, in2) -> out {=
     let ret:number;
     if ((in1 as number) > 10) {
-        ret = (in2 as number) * (in1 as number);
+      ret = (in2 as number) * (in1 as number);
     } else {
-        ret = (in2 as number) + (in1 as number);
+      ret = (in2 as number) + (in1 as number);
     }
     out = ret;
   =}
diff --git a/test/TypeScript/src/concurrent/AsyncCallback.lf b/test/TypeScript/src/concurrent/AsyncCallback.lf
index 82ed9e1872..841bebb31a 100644
--- a/test/TypeScript/src/concurrent/AsyncCallback.lf
+++ b/test/TypeScript/src/concurrent/AsyncCallback.lf
@@ -7,13 +7,13 @@ target TypeScript {
 main reactor AsyncCallback {
   preamble {=
     function callback(a : Sched<null>) {
-        // Schedule twice. If the action is not physical, these should
-        // get consolidated into a single action triggering. If it is,
-        // then they cause two separate triggerings with close but not
-        // equal time stamps. The minimum time between these is determined
-        // by the argument in the physical action definition.
-        a.schedule(0, null);
-        a.schedule(0, null);
+      // Schedule twice. If the action is not physical, these should
+      // get consolidated into a single action triggering. If it is,
+      // then they cause two separate triggerings with close but not
+      // equal time stamps. The minimum time between these is determined
+      // by the argument in the physical action definition.
+      a.schedule(0, null);
+      a.schedule(0, null);
     }
   =}
   timer t(0, 200 msec)
@@ -31,16 +31,16 @@ main reactor AsyncCallback {
   reaction(a) {=
     let elapsed_time = util.getElapsedLogicalTime();
     console.log("Asynchronous callback " + i
-        + ": Assigned logical time greater than start time by " + elapsed_time + " nsec."
+      + ": Assigned logical time greater than start time by " + elapsed_time + " nsec."
     );
     if (elapsed_time.isEarlierThan(expected_time)) {
-        util.requestErrorStop("ERROR: Expected logical time to be larger than " + expected_time + ".")
+      util.requestErrorStop("ERROR: Expected logical time to be larger than " + expected_time + ".")
     }
     if (toggle) {
-        toggle = false;
-        expected_time.add(TimeValue.msec(200));
+      toggle = false;
+      expected_time.add(TimeValue.msec(200));
     } else {
-        toggle = true;
+      toggle = true;
     }
   =}
 }
diff --git a/test/TypeScript/src/federated/DistributedCount.lf b/test/TypeScript/src/federated/DistributedCount.lf
index 4a17a25a41..49ccfafc09 100644
--- a/test/TypeScript/src/federated/DistributedCount.lf
+++ b/test/TypeScript/src/federated/DistributedCount.lf
@@ -19,17 +19,17 @@ reactor Print {
     const elapsedTime = util.getElapsedLogicalTime();
     console.log("At time " + elapsedTime + ", received " + inp);
     if (inp !== c) {
-        util.requestErrorStop("Expected to receive " + c + ".");
+      util.requestErrorStop("Expected to receive " + c + ".");
     }
     if (!elapsedTime.isEqualTo(TimeValue.msec(200).add(TimeValue.sec(c - 1)))) {
-        util.requestErrorStop("Expected received time to be " + TimeValue.msec(200).add(TimeValue.sec(c - 1)) + ".");
+      util.requestErrorStop("Expected received time to be " + TimeValue.msec(200).add(TimeValue.sec(c - 1)) + ".");
     }
     c++;
   =}
 
   reaction(shutdown) {=
     if (c != 6) {
-        util.reportError("Expected to receive 5 items.");
+      util.reportError("Expected to receive 5 items.");
     }
   =}
 }
diff --git a/test/TypeScript/src/federated/DistributedCountPhysical.lf b/test/TypeScript/src/federated/DistributedCountPhysical.lf
index 3b2ccbb022..596c5a6694 100644
--- a/test/TypeScript/src/federated/DistributedCountPhysical.lf
+++ b/test/TypeScript/src/federated/DistributedCountPhysical.lf
@@ -32,10 +32,10 @@ reactor Print {
     let elapsedTime = util.getElapsedLogicalTime();
     console.log(`At time ${elapsedTime}, received ${inp}.`);
     if (inp !== c) {
-        util.requestErrorStop(`ERROR: Expected to receive ${c}.`);
+      util.requestErrorStop(`ERROR: Expected to receive ${c}.`);
     }
     if (!(elapsedTime.isLaterThan(compareTime))) {
-        util.requestErrorStop(`ERROR: Expected time to be strictly greater than ${compareTime}. Got ${elapsedTime}.`);
+      util.requestErrorStop(`ERROR: Expected time to be strictly greater than ${compareTime}. Got ${elapsedTime}.`);
     }
     compareTime = compareTime.add(TimeValue.sec(1));
     c++;
@@ -43,7 +43,7 @@ reactor Print {
 
   reaction(shutdown) {=
     if (c !== 1) {
-        util.requestErrorStop(`ERROR: Expected to receive 1 item. Received ${c}.`);
+      util.requestErrorStop(`ERROR: Expected to receive 1 item. Received ${c}.`);
     }
     console.log("SUCCESS: Successfully received 1 item.");
   =}
diff --git a/test/TypeScript/src/federated/DistributedDoublePort.lf b/test/TypeScript/src/federated/DistributedDoublePort.lf
index 4a73da654c..a6bde59ed5 100644
--- a/test/TypeScript/src/federated/DistributedDoublePort.lf
+++ b/test/TypeScript/src/federated/DistributedDoublePort.lf
@@ -33,9 +33,9 @@ reactor Print {
   reaction(inp, inp2) {=
     const elapsedTime = util.getElapsedLogicalTime();
     console.log("At tag " + elapsedTime + ", microstep:" + util.getCurrentTag().microstep +
-        ", received inp = " + inp + " and inp2 = " + inp2 + ".");
+      ", received inp = " + inp + " and inp2 = " + inp2 + ".");
     if (inp !== undefined && inp2 !== undefined) {
-        util.requestErrorStop("ERROR: invalid logical simultaneity.");
+      util.requestErrorStop("ERROR: invalid logical simultaneity.");
     }
   =}
 
diff --git a/test/TypeScript/src/federated/DistributedLoopedAction.lf b/test/TypeScript/src/federated/DistributedLoopedAction.lf
index ad3de56c12..7a0a8b3513 100644
--- a/test/TypeScript/src/federated/DistributedLoopedAction.lf
+++ b/test/TypeScript/src/federated/DistributedLoopedAction.lf
@@ -22,16 +22,16 @@ reactor Receiver(takeBreakAfter: number = 10, breakInterval: time = 400 msec) {
     console.log("At tag (" + util.getElapsedLogicalTime() + ", " + util.getCurrentTag().microstep + ") received value " + inp);
     totalReceivedMessages++;
     if (inp != receivedMessages++) {
-        util.reportError("ERROR: received messages out of order.");
+      util.reportError("ERROR: received messages out of order.");
     }
     if (!util.getElapsedLogicalTime().isEqualTo(breakInterval.multiply(breaks))) {
-        util.reportError("ERROR: received messages at an incorrect time: " + util.getElapsedLogicalTime());
+      util.reportError("ERROR: received messages at an incorrect time: " + util.getElapsedLogicalTime());
     }
 
     if (receivedMessages == takeBreakAfter) {
-        // Sender is taking a break.
-        breaks++;
-        receivedMessages = 0;
+      // Sender is taking a break.
+      breaks++;
+      receivedMessages = 0;
     }
   =}
 
@@ -41,11 +41,11 @@ reactor Receiver(takeBreakAfter: number = 10, breakInterval: time = 400 msec) {
 
   reaction(shutdown) {=
     if (breaks != 3 ||
-        (totalReceivedMessages != (Math.floor(1000 / breakInterval.toMilliseconds())+1) * takeBreakAfter)
+      (totalReceivedMessages != (Math.floor(1000 / breakInterval.toMilliseconds())+1) * takeBreakAfter)
     ) {
-        util.requestErrorStop("ERROR: test failed. totalReceivedMessages: " + totalReceivedMessages + " and : " + ((1000 /breakInterval.toMilliseconds())+1) * takeBreakAfter);
+      util.requestErrorStop("ERROR: test failed. totalReceivedMessages: " + totalReceivedMessages + " and : " + ((1000 /breakInterval.toMilliseconds())+1) * takeBreakAfter);
     } else {
-        console.log("SUCCESS: Successfully received all messages from the sender.");
+      console.log("SUCCESS: Successfully received all messages from the sender.");
     }
   =}
 }
diff --git a/test/TypeScript/src/federated/DistributedLoopedPhysicalAction.lf b/test/TypeScript/src/federated/DistributedLoopedPhysicalAction.lf
index a5d63dc937..fec7fc0145 100644
--- a/test/TypeScript/src/federated/DistributedLoopedPhysicalAction.lf
+++ b/test/TypeScript/src/federated/DistributedLoopedPhysicalAction.lf
@@ -19,11 +19,11 @@ reactor Sender(takeBreakAfter: number = 10, breakInterval: time = 550 msec) {
     out = sentMessages;
     sentMessages++;
     if (sentMessages < takeBreakAfter) {
-        actions.act.schedule(0, null);
+      actions.act.schedule(0, null);
     } else {
-        // Take a break
-        sentMessages = 0;
-        actions.act.schedule(breakInterval, null);
+      // Take a break
+      sentMessages = 0;
+      actions.act.schedule(breakInterval, null);
     }
   =}
 }
@@ -40,13 +40,13 @@ reactor Receiver(takeBreakAfter: number = 10, breakInterval: time = 550 msec) {
     console.log("At tag (" + util.getElapsedLogicalTime() + ", " + util.getCurrentTag().microstep + ") received value " + inp);
     totalReceivedMessages++;
     if (inp != receivedMessages++) {
-        util.reportError("Expected " + (receivedMessages - 1) + ".");
+      util.reportError("Expected " + (receivedMessages - 1) + ".");
     }
 
     if (receivedMessages == takeBreakAfter) {
-        // Sender is taking a break;
-        breaks++;
-        receivedMessages = 0;
+      // Sender is taking a break;
+      breaks++;
+      receivedMessages = 0;
     }
   =}
 
@@ -56,11 +56,11 @@ reactor Receiver(takeBreakAfter: number = 10, breakInterval: time = 550 msec) {
 
   reaction(shutdown) {=
     if (breaks != 2 ||
-        (totalReceivedMessages != (Math.floor(1000 / breakInterval.toMilliseconds())+1) * takeBreakAfter)
+      (totalReceivedMessages != (Math.floor(1000 / breakInterval.toMilliseconds())+1) * takeBreakAfter)
     ) {
-        util.requestErrorStop("Test failed. Breaks: " + breaks + ", Messages: " + totalReceivedMessages + ".");
+      util.requestErrorStop("Test failed. Breaks: " + breaks + ", Messages: " + totalReceivedMessages + ".");
     } else {
-        console.log("SUCCESS: Successfully received all messages from the sender.");
+      console.log("SUCCESS: Successfully received all messages from the sender.");
     }
   =}
 }
diff --git a/test/TypeScript/src/federated/DistributedStop.lf b/test/TypeScript/src/federated/DistributedStop.lf
index a4708480bf..116111b7dd 100644
--- a/test/TypeScript/src/federated/DistributedStop.lf
+++ b/test/TypeScript/src/federated/DistributedStop.lf
@@ -14,44 +14,44 @@ reactor Sender {
 
   reaction(t, act) -> out, act {=
     console.log(`Sending 42 at (${util.getElapsedLogicalTime()}, `
-                + `${util.getCurrentTag().microstep}).`);
+          + `${util.getCurrentTag().microstep}).`);
     out = 42;
     if (util.getCurrentTag().microstep === 0) {
-        // Instead of having a separate reaction
-        // for 'act' like Stop.lf, we trigger the
-        // same reaction to test util.requestStop() being
-        // called multiple times
-        actions.act.schedule(0, null);
+      // Instead of having a separate reaction
+      // for 'act' like Stop.lf, we trigger the
+      // same reaction to test util.requestStop() being
+      // called multiple times
+      actions.act.schedule(0, null);
     }
     if (util.getElapsedLogicalTime().isEqualTo(TimeValue.usec(1))) {
-        // Call util.requestStop() both at (1 usec, 0) and
-        // (1 usec, 1)
-        console.log(`Requesting stop at (${util.getElapsedLogicalTime()}, `
-                    + `${util.getCurrentTag().microstep}).`);
-        util.requestStop();
+      // Call util.requestStop() both at (1 usec, 0) and
+      // (1 usec, 1)
+      console.log(`Requesting stop at (${util.getElapsedLogicalTime()}, `
+            + `${util.getCurrentTag().microstep}).`);
+      util.requestStop();
     }
 
     const oneUsec1 = util.getStartTag().getLaterTag(TimeValue.usec(1)).getMicroStepsLater(1);
     if (oneUsec1.isSimultaneousWith(util.getCurrentTag())) {
-        // The reaction was invoked at (1 usec, 1) as expected
-        reaction_invoked_correctly = true;
+      // The reaction was invoked at (1 usec, 1) as expected
+      reaction_invoked_correctly = true;
     } else if (oneUsec1.isSmallerThan(util.getCurrentTag())) {
-        // The reaction should not have been invoked at tags larger than (1 usec, 1)
-        util.requestErrorStop("ERROR: Invoked reaction(t, act) at tag bigger than shutdown.");
+      // The reaction should not have been invoked at tags larger than (1 usec, 1)
+      util.requestErrorStop("ERROR: Invoked reaction(t, act) at tag bigger than shutdown.");
     }
   =}
 
   reaction(shutdown) {=
     if (!util.getElapsedLogicalTime().isEqualTo(TimeValue.usec(1)) ||
-        util.getCurrentTag().microstep !== 1) {
-        util.requestErrorStop(`ERROR: Sender failed to stop the federation in time.`
-            + `Stopping at (${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`);
+      util.getCurrentTag().microstep !== 1) {
+      util.requestErrorStop(`ERROR: Sender failed to stop the federation in time.`
+        + `Stopping at (${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`);
     } else if (reaction_invoked_correctly === false) {
-        util.requestErrorStop("ERROR: Sender reaction(t, act) was not invoked at (1usec, 1)."
-            + `Stopping at (${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep})`);
+      util.requestErrorStop("ERROR: Sender reaction(t, act) was not invoked at (1usec, 1)."
+        + `Stopping at (${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep})`);
     } else {
-        console.log(`SUCCESS: Successfully stopped the federation at `
-            + `(${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`);
+      console.log(`SUCCESS: Successfully stopped the federation at `
+        + `(${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`);
     }
   =}
 }
@@ -66,17 +66,17 @@ reactor Receiver(
     console.log(`Received ${in1} at (${util.getElapsedLogicalTime()}, `
     + `${util.getCurrentTag().microstep}`);
     if (util.getElapsedLogicalTime().isEqualTo(TimeValue.usec(1))) {
-        console.log(`Requesting stop at (${util.getElapsedLogicalTime()}, `
-        + `${util.getCurrentTag().microstep}`);
-        util.requestStop();
-        // The receiver should receive a message at tag
-        // (1 usec, 1) and trigger this reaction
-        reaction_invoked_correctly = true;
+      console.log(`Requesting stop at (${util.getElapsedLogicalTime()}, `
+      + `${util.getCurrentTag().microstep}`);
+      util.requestStop();
+      // The receiver should receive a message at tag
+      // (1 usec, 1) and trigger this reaction
+      reaction_invoked_correctly = true;
     }
 
     const oneUsec1 = util.getStartTag().getLaterTag(TimeValue.usec(1)).getMicroStepsLater(1);
     if (oneUsec1.isSmallerThan(util.getCurrentTag())) {
-        reaction_invoked_correctly = false;
+      reaction_invoked_correctly = false;
     }
   =}
 
@@ -85,15 +85,15 @@ reactor Receiver(
     // Therefore, the shutdown events must occur at (1 usec, 0) on the
     // receiver.
     if (!util.getElapsedLogicalTime().isEqualTo(TimeValue.usec(1)) ||
-        util.getCurrentTag().microstep !== 1) {
-        util.requestErrorStop(`ERROR: Receiver failed to stop the federation at the right time. `
-        + `Stopping at (${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`);
+      util.getCurrentTag().microstep !== 1) {
+      util.requestErrorStop(`ERROR: Receiver failed to stop the federation at the right time. `
+      + `Stopping at (${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`);
     } else if (reaction_invoked_correctly === false) {
-        util.requestErrorStop("Receiver reaction(in) was not invoked the correct number of times. "
-        + `Stopping at (${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep})`);
+      util.requestErrorStop("Receiver reaction(in) was not invoked the correct number of times. "
+      + `Stopping at (${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep})`);
     }
     console.log(`SUCCESS: Successfully stopped the federation at `
-        + `(${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`);
+      + `(${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`);
   =}
 }
 
diff --git a/test/TypeScript/src/federated/DistributedStopZero.lf b/test/TypeScript/src/federated/DistributedStopZero.lf
index 846b98343c..f07fe91756 100644
--- a/test/TypeScript/src/federated/DistributedStopZero.lf
+++ b/test/TypeScript/src/federated/DistributedStopZero.lf
@@ -13,26 +13,26 @@ reactor Sender {
 
   reaction(t) -> out {=
     console.log(`Sending 42 at ${util.getElapsedLogicalTime()}, `
-        + `${util.getCurrentTag().microstep}).`);
+      + `${util.getCurrentTag().microstep}).`);
     out = 42;
 
     let zero = util.getStartTag();
     if (util.getCurrentTag().isSimultaneousWith(zero)) {
-        // Request stop at ((0 secs, 0 nsecs), 0)
-        console.log(`Requesting stop at ${util.getElapsedLogicalTime()}, `
-            + `${util.getCurrentTag().microstep}).`);
-        util.requestStop();
+      // Request stop at ((0 secs, 0 nsecs), 0)
+      console.log(`Requesting stop at ${util.getElapsedLogicalTime()}, `
+        + `${util.getCurrentTag().microstep}).`);
+      util.requestStop();
     }
   =}
 
   reaction(shutdown) {=
     if (!util.getElapsedLogicalTime().isEqualTo(TimeValue.usec(0))||
-        util.getCurrentTag().microstep !== 1) {
-        util.requestErrorStop(`ERROR: Sender failed to stop the federation in time. `
-            + `Stopping at (${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`);
+      util.getCurrentTag().microstep !== 1) {
+      util.requestErrorStop(`ERROR: Sender failed to stop the federation in time. `
+        + `Stopping at (${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`);
     }
     console.log(`SUCCESS: Successfully stopped the federation at `
-        + `(${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`);
+      + `(${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`);
   =}
 }
 
@@ -41,13 +41,13 @@ reactor Receiver {
 
   reaction(in1) {=
     console.log(`Received ${in1} at (${util.getElapsedLogicalTime()}, `
-        + `${util.getCurrentTag().microstep}).`);
+      + `${util.getCurrentTag().microstep}).`);
     let zero = util.getStartTag();
     if (util.getCurrentTag().isSimultaneousWith(zero)) {
-        // Request stop at ((0 secs, 0 nsecs), 0)
-        console.log(`Requesting stop at ${util.getElapsedLogicalTime()}, `
-            + `${util.getCurrentTag().microstep}).`);
-        util.requestStop();
+      // Request stop at ((0 secs, 0 nsecs), 0)
+      console.log(`Requesting stop at ${util.getElapsedLogicalTime()}, `
+        + `${util.getCurrentTag().microstep}).`);
+      util.requestStop();
     }
   =}
 
@@ -56,12 +56,12 @@ reactor Receiver {
     // Therefore, the shutdown events must occur at ((0 secs, 0 nsecs), 0) on the
     // receiver.
     if (!util.getElapsedLogicalTime().isEqualTo(TimeValue.usec(0)) ||
-        util.getCurrentTag().microstep !== 1) {
-        util.requestErrorStop(`ERROR: Receiver failed to stop the federation at the right time. `
-            + `Stopping at (${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`);
+      util.getCurrentTag().microstep !== 1) {
+      util.requestErrorStop(`ERROR: Receiver failed to stop the federation at the right time. `
+        + `Stopping at (${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`);
     }
     console.log(`SUCCESS: Successfully stopped the federation at `
-        + `(${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`);
+      + `(${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`);
   =}
 }
 
diff --git a/test/TypeScript/src/federated/HelloDistributed.lf b/test/TypeScript/src/federated/HelloDistributed.lf
index b9025ed25b..4ec0d020a2 100644
--- a/test/TypeScript/src/federated/HelloDistributed.lf
+++ b/test/TypeScript/src/federated/HelloDistributed.lf
@@ -26,7 +26,7 @@ reactor Destination {
   reaction(inp) {=
     console.log(`At logical time ${util.getElapsedLogicalTime()}, destination received: ` + inp);
     if (inp !== "Hello World!") {
-        util.requestErrorStop("ERROR: Expected to receive 'Hello World!'");
+      util.requestErrorStop("ERROR: Expected to receive 'Hello World!'");
     }
     received = true;
   =}
@@ -34,15 +34,15 @@ reactor Destination {
   reaction(shutdown) {=
     console.log("Shutdown invoked.");
     if (!received) {
-        util.reportError("Destination did not receive the message.");
+      util.reportError("Destination did not receive the message.");
     }
   =}
 }
 
 federated reactor HelloDistributed at localhost {
-  s = new Source()       // Reactor s is in federate Source
+  s = new Source()     // Reactor s is in federate Source
   d = new Destination()  // Reactor d is in federate Destination
-  s.out -> d.inp         // This version preserves the timestamp.
+  s.out -> d.inp     // This version preserves the timestamp.
 
   reaction(startup) {= console.log("Printing something in top-level federated reactor."); =}
 }
diff --git a/test/TypeScript/src/federated/TopLevelArtifacts.lf b/test/TypeScript/src/federated/TopLevelArtifacts.lf
index 02864511c0..b7d59ae4b4 100644
--- a/test/TypeScript/src/federated/TopLevelArtifacts.lf
+++ b/test/TypeScript/src/federated/TopLevelArtifacts.lf
@@ -34,7 +34,7 @@ federated reactor {
 
   reaction(shutdown) {=
     if (successes != 3) {
-        util.requestErrorStop(`Failed to properly execute top-level reactions`);
+      util.requestErrorStop(`Failed to properly execute top-level reactions`);
     }
     console.log(`SUCCESS!`);
   =}
diff --git a/test/TypeScript/src/federated/failing/DistributedCountPhysicalAfterDelay.lf b/test/TypeScript/src/federated/failing/DistributedCountPhysicalAfterDelay.lf
index 035050f348..0ea0befda7 100644
--- a/test/TypeScript/src/federated/failing/DistributedCountPhysicalAfterDelay.lf
+++ b/test/TypeScript/src/federated/failing/DistributedCountPhysicalAfterDelay.lf
@@ -19,25 +19,25 @@ reactor Print {
   state c: number = 1
 
   reaction(inp) {=
-    const elapsedTime = util.getElapsedLogicalTime();
-    console.log(`At time ${elapsedTime}, received ${inp}`);
-    if (inp !== c) {
-        util.requestErrorStop(`ERROR: Expected to receive ${c}.`);
-    }
-    if (!elapsedTime.isLaterThan(TimeValue.msec(600))) {
-        util.requestErrorStop(`ERROR: Expected received time to be strictly greater than ${TimeValue.msec(600)}`);
-    }
-    c++;
-    console.log(`c = ${c}`);
-    util.requestStop();
+  const elapsedTime = util.getElapsedLogicalTime();
+  console.log(`At time ${elapsedTime}, received ${inp}`);
+  if (inp !== c) {
+    util.requestErrorStop(`ERROR: Expected to receive ${c}.`);
+  }
+  if (!elapsedTime.isLaterThan(TimeValue.msec(600))) {
+    util.requestErrorStop(`ERROR: Expected received time to be strictly greater than ${TimeValue.msec(600)}`);
+  }
+  c++;
+  console.log(`c = ${c}`);
+  util.requestStop();
   =}
 
   reaction(shutdown) {=
-    if (c !== 2) {
-        util.requestErrorStop(`ERROR: Expected to receive 1 item. Received ${c - 1}.`);
-    } else {
-        console.log("SUCCESS: Successfully received 1 item.");
-    }
+  if (c !== 2) {
+    util.requestErrorStop(`ERROR: Expected to receive 1 item. Received ${c - 1}.`);
+  } else {
+    console.log("SUCCESS: Successfully received 1 item.");
+  }
   =}
 }
 
diff --git a/test/TypeScript/src/federated/failing/LoopDistributedCentralized.lf b/test/TypeScript/src/federated/failing/LoopDistributedCentralized.lf
index 74f903669f..aebc87d619 100644
--- a/test/TypeScript/src/federated/failing/LoopDistributedCentralized.lf
+++ b/test/TypeScript/src/federated/failing/LoopDistributedCentralized.lf
@@ -15,44 +15,44 @@ reactor Looper(incr: number = 1, delay: time = 0 msec) {
   state count: number = 0
 
   preamble {=
-    let stop = false;
-    // Function to trigger an action once every second.
-    function ping(act: any) {
-      if (!stop) {
-        console.log("Scheduling action.");
-        act.schedule(0, null);
-        setTimeout(ping, 1000, act);
-      }
+  let stop = false;
+  // Function to trigger an action once every second.
+  function ping(act: any) {
+    if (!stop) {
+    console.log("Scheduling action.");
+    act.schedule(0, null);
+    setTimeout(ping, 1000, act);
     }
+  }
   =}
 
   reaction(startup) -> a {=
-    // Start the ping function for triggering an action every second.
-    console.log("Starting ping function.");
-    ping(actions.a);
+  // Start the ping function for triggering an action every second.
+  console.log("Starting ping function.");
+  ping(actions.a);
   =}
 
   reaction(a) -> out {=
-    out = count;
-    count += incr;
+  out = count;
+  count += incr;
   =}
 
   reaction(inp) {=
-    let logical = util.getCurrentLogicalTime();
-    let physical = util.getCurrentPhysicalTime();
+  let logical = util.getCurrentLogicalTime();
+  let physical = util.getCurrentPhysicalTime();
 
-    let time_lag = physical.subtract(logical);
+  let time_lag = physical.subtract(logical);
 
-    console.log("Received " + inp + ". Logical time is behind physical time by " + time_lag + ".");
+  console.log("Received " + inp + ". Logical time is behind physical time by " + time_lag + ".");
   =}
 
   reaction(shutdown) {=
-    console.log("******* Shutdown invoked.");
-    // Stop the ping function that is scheduling actions.
-    stop = true;
-    if (count != 5 * incr) {
-        util.requestErrorStop("Failed to receive all five expected inputs.");
-    }
+  console.log("******* Shutdown invoked.");
+  // Stop the ping function that is scheduling actions.
+  stop = true;
+  if (count != 5 * incr) {
+    util.requestErrorStop("Failed to receive all five expected inputs.");
+  }
   =}
 }
 
diff --git a/test/TypeScript/src/federated/failing/LoopDistributedDouble.lf b/test/TypeScript/src/federated/failing/LoopDistributedDouble.lf
index 096496bb2e..081c070048 100644
--- a/test/TypeScript/src/federated/failing/LoopDistributedDouble.lf
+++ b/test/TypeScript/src/federated/failing/LoopDistributedDouble.lf
@@ -8,7 +8,7 @@ target TypeScript {
   timeout: 5 sec,
   keepAlive: true,
   coordination-options: {
-    advance-message-interval: 100 msec
+  advance-message-interval: 100 msec
   }
 }
 
@@ -22,51 +22,51 @@ reactor Looper(incr: number = 1, delay: time = 0 msec) {
   timer t(0, 1 sec)
 
   preamble {=
-    let stop = false;
-    // Function to trigger an action once every second.
-    function ping(act: any) {
-      if (!stop) {
-        console.log("Scheduling action.");
-        act.schedule(0, null);
-        setTimeout(ping, 1000, act);
-      }
+  let stop = false;
+  // Function to trigger an action once every second.
+  function ping(act: any) {
+    if (!stop) {
+    console.log("Scheduling action.");
+    act.schedule(0, null);
+    setTimeout(ping, 1000, act);
     }
+  }
   =}
 
   reaction(startup) -> a {=
-    // Start the ping function for triggering an action every second.
-    console.log("Starting ping function.");
-    ping(actions.a);
+  // Start the ping function for triggering an action every second.
+  console.log("Starting ping function.");
+  ping(actions.a);
   =}
 
   reaction(a) -> out, out2 {=
-    if (count % 2 == 0) {
-        out = count;
-    } else {
-        out2 = count;
-    }
-    count += incr;
+  if (count % 2 == 0) {
+    out = count;
+  } else {
+    out2 = count;
+  }
+  count += incr;
   =}
 
   reaction(inp) {=
-    console.log("Received " + inp + " on inp at logical time " + util.getElapsedLogicalTime() + ".");
+  console.log("Received " + inp + " on inp at logical time " + util.getElapsedLogicalTime() + ".");
   =}
 
   reaction(inp2) {=
-    console.log("Received " + inp2 + " on inp2 at logical time " + util.getElapsedLogicalTime() + ".");
+  console.log("Received " + inp2 + " on inp2 at logical time " + util.getElapsedLogicalTime() + ".");
   =}
 
   reaction(t) {=
-    console.log("Timer triggered at logical time " + util.getElapsedLogicalTime() + ".");
+  console.log("Timer triggered at logical time " + util.getElapsedLogicalTime() + ".");
   =}
 
   reaction(shutdown) {=
-    console.log("******* Shutdown invoked.");
-    // Stop the ping function that is scheduling actions.
-    stop = true;
-    if (count != 5 * incr) {
-        util.requestErrorStop("Failed to receive all five expected inputs.");
-    }
+  console.log("******* Shutdown invoked.");
+  // Stop the ping function that is scheduling actions.
+  stop = true;
+  if (count != 5 * incr) {
+    util.requestErrorStop("Failed to receive all five expected inputs.");
+  }
   =}
 }
 
diff --git a/test/TypeScript/src/federated/failing/PingPongDistributed.lf b/test/TypeScript/src/federated/failing/PingPongDistributed.lf
index 146251b382..42cceae73c 100644
--- a/test/TypeScript/src/federated/failing/PingPongDistributed.lf
+++ b/test/TypeScript/src/federated/failing/PingPongDistributed.lf
@@ -8,18 +8,18 @@ reactor Ping(count: number = 10) {
   logical action serve
 
   reaction(startup, serve) -> send {=
-    console.log(`At logical time ${util.getElapsedLogicalTime()}, Ping sending ${pingsLeft}`);
-    send = pingsLeft;
-    pingsLeft = pingsLeft - 1;
+  console.log(`At logical time ${util.getElapsedLogicalTime()}, Ping sending ${pingsLeft}`);
+  send = pingsLeft;
+  pingsLeft = pingsLeft - 1;
   =}
 
   reaction(receive) -> serve {=
-    if (pingsLeft > 0){
-        actions.serve.schedule(0, null);
-    }
-    else{
-        util.requestStop();
-    }
+  if (pingsLeft > 0){
+    actions.serve.schedule(0, null);
+  }
+  else{
+    util.requestStop();
+  }
   =}
 }
 
@@ -29,19 +29,19 @@ reactor Pong(expected: number = 10) {
   state count: number = 0
 
   reaction(receive) -> send {=
-    count += 1;
-    console.log(`At logical time ${util.getElapsedLogicalTime()}, Pong received ${receive}`)
-    send = receive;
-    if (count == expected){
-        util.requestStop();
-    }
+  count += 1;
+  console.log(`At logical time ${util.getElapsedLogicalTime()}, Pong received ${receive}`)
+  send = receive;
+  if (count == expected){
+    util.requestStop();
+  }
   =}
 
   reaction(shutdown) {=
-    if (count != expected){
-        util.requestErrorStop(`Pong expected to receive ${expected} inputs, but it received ${count}`);
-    }
-    console.log(`Pong received ${count} pings.`);
+  if (count != expected){
+    util.requestErrorStop(`Pong expected to receive ${expected} inputs, but it received ${count}`);
+  }
+  console.log(`Pong received ${count} pings.`);
   =}
 }
 
diff --git a/test/TypeScript/src/federated/failing/PingPongDistributedPhysical.lf b/test/TypeScript/src/federated/failing/PingPongDistributedPhysical.lf
index 53194b7fee..298a7298d4 100644
--- a/test/TypeScript/src/federated/failing/PingPongDistributedPhysical.lf
+++ b/test/TypeScript/src/federated/failing/PingPongDistributedPhysical.lf
@@ -32,16 +32,16 @@ reactor Ping(count: number = 10) {
   logical action serve
 
   reaction(startup, serve) -> send {=
-    console.log(`At logical time ${util.getElapsedLogicalTime()}, Ping sending ${pingsLeft}.`);
-    send = pingsLeft--;
+  console.log(`At logical time ${util.getElapsedLogicalTime()}, Ping sending ${pingsLeft}.`);
+  send = pingsLeft--;
   =}
 
   reaction(receive) -> serve {=
-    if (pingsLeft > 0) {
-        actions.serve.schedule(0, null);
-    } else {
-        util.requestStop();
-    }
+  if (pingsLeft > 0) {
+    actions.serve.schedule(0, null);
+  } else {
+    util.requestStop();
+  }
   =}
 }
 
@@ -51,19 +51,19 @@ reactor Pong(expected: number = 10) {
   state count: number = 0
 
   reaction(receive) -> send {=
-    count++;
-    console.log(`At logical time ${util.getElapsedLogicalTime()}, Pong receivedd ${receive}.`);
-    send = receive;
-    if (count === expected) {
-        util.requestStop();
-    }
+  count++;
+  console.log(`At logical time ${util.getElapsedLogicalTime()}, Pong receivedd ${receive}.`);
+  send = receive;
+  if (count === expected) {
+    util.requestStop();
+  }
   =}
 
   reaction(shutdown) {=
-    if (count !== expected) {
-        util.requestErrorStop(`Pong expected to received ${expected} inputs, but it received ${count}.`);
-    }
-    console.log(`Pong received ${count} pings.`);
+  if (count !== expected) {
+    util.requestErrorStop(`Pong expected to received ${expected} inputs, but it received ${count}.`);
+  }
+  console.log(`Pong received ${count} pings.`);
   =}
 }
 
diff --git a/test/TypeScript/src/lib/ImportedAgain.lf b/test/TypeScript/src/lib/ImportedAgain.lf
index e10ab4aa53..076ed1a2f1 100644
--- a/test/TypeScript/src/lib/ImportedAgain.lf
+++ b/test/TypeScript/src/lib/ImportedAgain.lf
@@ -10,7 +10,7 @@ reactor ImportedAgain {
   reaction(x) {=
     console.log("Received: " + x);
     if ((x as number) != 42) {
-        util.requestErrorStop("ERROR: Expected input to be 42. Got: " + x);
+      util.requestErrorStop("ERROR: Expected input to be 42. Got: " + x);
     }
   =}
 }
diff --git a/test/TypeScript/src/lib/LoopedActionSender.lf b/test/TypeScript/src/lib/LoopedActionSender.lf
index 6dcf02dd86..39ce28b348 100644
--- a/test/TypeScript/src/lib/LoopedActionSender.lf
+++ b/test/TypeScript/src/lib/LoopedActionSender.lf
@@ -21,11 +21,11 @@ reactor Sender(takeBreakAfter: number = 10, breakInterval: time = 400 msec) {
     out = sentMessages;
     sentMessages++;
     if (sentMessages < takeBreakAfter) {
-        actions.act.schedule(0, null);
+      actions.act.schedule(0, null);
     } else {
-        // Take a break
-        sentMessages = 0;
-        actions.act.schedule(breakInterval, null);
+      // Take a break
+      sentMessages = 0;
+      actions.act.schedule(breakInterval, null);
     }
   =}
 }
diff --git a/test/TypeScript/src/lib/TestCount.lf b/test/TypeScript/src/lib/TestCount.lf
index 92bf656ca8..84865da882 100644
--- a/test/TypeScript/src/lib/TestCount.lf
+++ b/test/TypeScript/src/lib/TestCount.lf
@@ -16,7 +16,7 @@ reactor TestCount(start: number = 1, stride: number = 1, numInputs: number = 1)
   reaction(inp) {=
     console.log("Received " + inp + ".");
     if (inp != count) {
-        util.requestErrorStop("Expected " + count + ".");
+      util.requestErrorStop("Expected " + count + ".");
     }
     count += stride;
     inputsReceived++;
@@ -25,7 +25,7 @@ reactor TestCount(start: number = 1, stride: number = 1, numInputs: number = 1)
   reaction(shutdown) {=
     console.log("Shutdown invoked.");
     if (inputsReceived != numInputs) {
-        util.requestErrorStop("ERROR: Expected to receive " + numInputs + " inputs, but got " + inputsReceived + ".");
+      util.requestErrorStop("ERROR: Expected to receive " + numInputs + " inputs, but got " + inputsReceived + ".");
     }
   =}
 }
diff --git a/test/TypeScript/src/multiport/BankMultiportToReaction.lf b/test/TypeScript/src/multiport/BankMultiportToReaction.lf
index 96ba348a1c..1dffed020c 100644
--- a/test/TypeScript/src/multiport/BankMultiportToReaction.lf
+++ b/test/TypeScript/src/multiport/BankMultiportToReaction.lf
@@ -19,22 +19,22 @@ main reactor {
 
   reaction(s.out) {=
     for (let i = 0; i < s.length; i++) {
-        for (let j = 0; j < s[0].out.length; j++) {
-            if (s[i].out[j] !== undefined) {
-                console.log("Received " + (s[i].out[j] as number) + ".");
-                if (count !== s[i].out[j]) {
-                    util.requestErrorStop("Expected " + count + ".");
-                }
-                received = true;
-            }
+      for (let j = 0; j < s[0].out.length; j++) {
+        if (s[i].out[j] !== undefined) {
+          console.log("Received " + (s[i].out[j] as number) + ".");
+          if (count !== s[i].out[j]) {
+            util.requestErrorStop("Expected " + count + ".");
+          }
+          received = true;
         }
+      }
     }
     count++;
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        util.reportError("No inputs present.");
+      util.reportError("No inputs present.");
     }
   =}
 }
diff --git a/test/TypeScript/src/multiport/BankReactionsInContainer.lf b/test/TypeScript/src/multiport/BankReactionsInContainer.lf
index d3e485e6d1..6004711a7b 100644
--- a/test/TypeScript/src/multiport/BankReactionsInContainer.lf
+++ b/test/TypeScript/src/multiport/BankReactionsInContainer.lf
@@ -10,29 +10,29 @@ reactor R {
 
   reaction(startup) -> out {=
     for (let i = 0; i < out.length; i++) {
-        let value = this.getBankIndex() * 2 + i;
-        out[i] = value;
-        console.log("Inner sending " + value + " to bank " +
-            this.getBankIndex() + " channel " + i + ".");
+      let value = this.getBankIndex() * 2 + i;
+      out[i] = value;
+      console.log("Inner sending " + value + " to bank " +
+        this.getBankIndex() + " channel " + i + ".");
     }
   =}
 
   reaction(inp) {=
     for (let i = 0; i < inp.length; i++) {
-        if (inp[i] !== undefined) {
-            console.log("Inner received " + inp[i] + " inp bank " + this.getBankIndex() + ", channel " + i);
-            received = true;
-            if (inp[i] != this.getBankIndex() * 2 + i) {
-                util.requestErrorStop("Expected " + this.getBankIndex() * 2 + i + ".");
-            }
+      if (inp[i] !== undefined) {
+        console.log("Inner received " + inp[i] + " inp bank " + this.getBankIndex() + ", channel " + i);
+        received = true;
+        if (inp[i] != this.getBankIndex() * 2 + i) {
+          util.requestErrorStop("Expected " + this.getBankIndex() * 2 + i + ".");
         }
+      }
     }
   =}
 
   reaction(shutdown) {=
     console.log("Inner shutdown invoked.");
     if (!received) {
-        util.reportError("Received no input.");
+      util.reportError("Received no input.");
     }
   =}
 }
@@ -44,31 +44,31 @@ main reactor {
   reaction(startup) -> s.inp {=
     let count = 0;
     for (let i = 0; i < s.length; i++) {
-        for (let j = 0; j < s[i].inp.length; j++) {
-            console.log("Sending " + count + " to bank " + i + " channel " + j + ".");
-            s[i].inp[j] = count++;
-        }
+      for (let j = 0; j < s[i].inp.length; j++) {
+        console.log("Sending " + count + " to bank " + i + " channel " + j + ".");
+        s[i].inp[j] = count++;
+      }
     }
   =}
 
   reaction(s.out) {=
     for (let j = 0; j < s.length; j++) {
-        for (let i = 0; i < s[j].out.length; i++) {
-            if (s[j].out[i] !== undefined) {
-                console.log("Outer received " + s[j].out[i] + " on bank " + j + " channel " + i + ".");
-                received = true;
-                if (s[j].out[i] != j * 2 + i) {
-                    util.requestErrorStop("Expected " + j * 2 + i + ".");
-                }
-            }
+      for (let i = 0; i < s[j].out.length; i++) {
+        if (s[j].out[i] !== undefined) {
+          console.log("Outer received " + s[j].out[i] + " on bank " + j + " channel " + i + ".");
+          received = true;
+          if (s[j].out[i] != j * 2 + i) {
+            util.requestErrorStop("Expected " + j * 2 + i + ".");
+          }
         }
+      }
     }
   =}
 
   reaction(shutdown) {=
     console.log("Outer shutdown invoked.");
     if (!received) {
-        util.reportError("Received no input.");
+      util.reportError("Received no input.");
     }
   =}
 }
diff --git a/test/TypeScript/src/multiport/BankSelfBroadcast.lf b/test/TypeScript/src/multiport/BankSelfBroadcast.lf
index f33164b18d..956de7d5a2 100644
--- a/test/TypeScript/src/multiport/BankSelfBroadcast.lf
+++ b/test/TypeScript/src/multiport/BankSelfBroadcast.lf
@@ -18,23 +18,23 @@ reactor A {
 
   reaction(inp) {=
     for (let i = 0; i < inp.length; i++) {
-        if (inp[i] !== undefined) {
-            console.log("Reactor " + this.getBankIndex() + " received " +
-                        inp[i] + " on channel " + i);
-            if (inp[i] != i) {
-                util.requestErrorStop("ERROR: Expected " + i);
-            }
-            received = true;
-        } else {
-            console.log("Reactor " + this.getBankIndex() + " channel " + i + " is absent.");
-            util.requestErrorStop("ERROR: Expected " + i);
+      if (inp[i] !== undefined) {
+        console.log("Reactor " + this.getBankIndex() + " received " +
+              inp[i] + " on channel " + i);
+        if (inp[i] != i) {
+          util.requestErrorStop("ERROR: Expected " + i);
         }
+        received = true;
+      } else {
+        console.log("Reactor " + this.getBankIndex() + " channel " + i + " is absent.");
+        util.requestErrorStop("ERROR: Expected " + i);
+      }
     }
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        util.requestErrorStop("ERROR: No inputs received.");
+      util.requestErrorStop("ERROR: No inputs received.");
     }
   =}
 }
diff --git a/test/TypeScript/src/multiport/BankToBank.lf b/test/TypeScript/src/multiport/BankToBank.lf
index cae7581aa1..4dd7c068ed 100644
--- a/test/TypeScript/src/multiport/BankToBank.lf
+++ b/test/TypeScript/src/multiport/BankToBank.lf
@@ -21,14 +21,14 @@ reactor Destination {
   reaction(inp) {=
     console.log("Destination " + this.getBankIndex() + " received: " + inp);
     if (inp != s) {
-        util.requestErrorStop("ERROR: Expected " + s + ".");
+      util.requestErrorStop("ERROR: Expected " + s + ".");
     }
     s += this.getBankIndex();
   =}
 
   reaction(shutdown) {=
     if (s == 0 && this.getBankIndex() != 0) {
-        util.requestErrorStop("ERROR: Destination " + this.getBankIndex() + " received no input!");
+      util.requestErrorStop("ERROR: Destination " + this.getBankIndex() + " received no input!");
     }
     console.log("Success.");
   =}
diff --git a/test/TypeScript/src/multiport/BankToBankMultiport.lf b/test/TypeScript/src/multiport/BankToBankMultiport.lf
index 1fe1bad44b..7c227564b5 100644
--- a/test/TypeScript/src/multiport/BankToBankMultiport.lf
+++ b/test/TypeScript/src/multiport/BankToBankMultiport.lf
@@ -10,7 +10,7 @@ reactor Source(width: number = 1) {
 
   reaction(t) -> out {=
     for(let i = 0; i < out.length; i++) {
-        out[i] = s++;
+      out[i] = s++;
     }
   =}
 }
@@ -22,19 +22,19 @@ reactor Destination(width: number = 1) {
   reaction(inp) {=
     let sum = 0;
     for (let i = 0; i < inp.length; i++) {
-        let val = inp[i];
-        if (val !== undefined) sum += val;
+      let val = inp[i];
+      if (val !== undefined) sum += val;
     }
     console.log("Sum of received: " + sum + ".");
     if (sum != s) {
-        util.requestErrorStop("ERROR: Expected " + s + ".");
+      util.requestErrorStop("ERROR: Expected " + s + ".");
     }
     s += 16;
   =}
 
   reaction(shutdown) {=
     if (s <= 6) {
-        util.reportError("ERROR: Destination received no input!");
+      util.reportError("ERROR: Destination received no input!");
     }
     console.log("Success.");
   =}
diff --git a/test/TypeScript/src/multiport/BankToBankMultiportAfter.lf b/test/TypeScript/src/multiport/BankToBankMultiportAfter.lf
index 358b7db46c..9df4638852 100644
--- a/test/TypeScript/src/multiport/BankToBankMultiportAfter.lf
+++ b/test/TypeScript/src/multiport/BankToBankMultiportAfter.lf
@@ -10,7 +10,7 @@ reactor Source(width: number = 1) {
 
   reaction(t) -> out {=
     for(let i = 0; i < out.length; i++) {
-        out[i] = s++;
+      out[i] = s++;
     }
   =}
 }
@@ -22,19 +22,19 @@ reactor Destination(width: number = 1) {
   reaction(inp) {=
     let sum = 0;
     for (let i = 0; i < inp.length; i++) {
-        let val = inp[i];
-        if (val !== undefined) sum += val;
+      let val = inp[i];
+      if (val !== undefined) sum += val;
     }
     console.log("Sum of received: " + sum + ".");
     if (sum != s) {
-        util.requestErrorStop("ERROR: Expected " + s + ".");
+      util.requestErrorStop("ERROR: Expected " + s + ".");
     }
     s += 16;
   =}
 
   reaction(shutdown) {=
     if (s <= 6) {
-        util.reportError("ERROR: Destination received no input!");
+      util.reportError("ERROR: Destination received no input!");
     }
     console.log("Success.");
   =}
diff --git a/test/TypeScript/src/multiport/BankToMultiport.lf b/test/TypeScript/src/multiport/BankToMultiport.lf
index 5794e34b38..b1ea107ca9 100644
--- a/test/TypeScript/src/multiport/BankToMultiport.lf
+++ b/test/TypeScript/src/multiport/BankToMultiport.lf
@@ -13,17 +13,17 @@ reactor Sink {
 
   reaction(inp) {=
     for (let i = 0; i < inp.length; i++) {
-        received = true;
-        console.log("Received " + inp[i]);
-        if (inp[i] != i) {
-            util.requestErrorStop("Error: expected " + i);
-        }
+      received = true;
+      console.log("Received " + inp[i]);
+      if (inp[i] != i) {
+        util.requestErrorStop("Error: expected " + i);
+      }
     }
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        util.requestErrorStop("Error: received no input!");
+      util.requestErrorStop("Error: received no input!");
     }
   =}
 }
diff --git a/test/TypeScript/src/multiport/BankToReaction.lf b/test/TypeScript/src/multiport/BankToReaction.lf
index 7eb2bbd0c6..2e46e45e24 100644
--- a/test/TypeScript/src/multiport/BankToReaction.lf
+++ b/test/TypeScript/src/multiport/BankToReaction.lf
@@ -11,10 +11,10 @@ main reactor {
 
   reaction(s.out) {=
     for (let i = 0; i < s.length; i++) {
-        console.log("Received " + s[i].out + ".");
-        if (count != s[i].out) {
-            util.requestErrorStop("Expected " + count + ".");
-        }
+      console.log("Received " + s[i].out + ".");
+      if (count != s[i].out) {
+        util.requestErrorStop("Expected " + count + ".");
+      }
     }
     count++;
   =}
diff --git a/test/TypeScript/src/multiport/Broadcast.lf b/test/TypeScript/src/multiport/Broadcast.lf
index c43b81f736..8ec6e21742 100644
--- a/test/TypeScript/src/multiport/Broadcast.lf
+++ b/test/TypeScript/src/multiport/Broadcast.lf
@@ -12,7 +12,7 @@ reactor Sink {
   reaction(inp) {=
     console.log("Received " + inp);
     if (inp != 42) {
-        util.requestErrorStop("Error: expected " + 42);
+      util.requestErrorStop("Error: expected " + 42);
     }
   =}
 }
diff --git a/test/TypeScript/src/multiport/BroadcastAfter.lf b/test/TypeScript/src/multiport/BroadcastAfter.lf
index 9fde4d610d..5d8165b983 100644
--- a/test/TypeScript/src/multiport/BroadcastAfter.lf
+++ b/test/TypeScript/src/multiport/BroadcastAfter.lf
@@ -15,18 +15,18 @@ reactor Destination {
   reaction(inp) {=
     console.log("Destination " +  this.getBankIndex() + " received " + inp + ".");
     if (inp != 42) {
-        util.requestErrorStop("ERROR: Expected 42.");
+      util.requestErrorStop("ERROR: Expected 42.");
     }
     let elapsedTime = util.getElapsedLogicalTime();
     if (!elapsedTime.isEqualTo(TimeValue.sec(1))) {
-        util.requestErrorStop("ERROR: Expected to receive input after one second.");
+      util.requestErrorStop("ERROR: Expected to receive input after one second.");
     }
     received = true;
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        util.reportError("ERROR: Destination " + this.getBankIndex() + " received no input!");
+      util.reportError("ERROR: Destination " + this.getBankIndex() + " received no input!");
     }
     console.log("Success.");
   =}
diff --git a/test/TypeScript/src/multiport/BroadcastMultipleAfter.lf b/test/TypeScript/src/multiport/BroadcastMultipleAfter.lf
index cb22488a8c..cd9bcd726a 100644
--- a/test/TypeScript/src/multiport/BroadcastMultipleAfter.lf
+++ b/test/TypeScript/src/multiport/BroadcastMultipleAfter.lf
@@ -16,18 +16,18 @@ reactor Destination {
     console.log("Destination " + this.getBankIndex() + " received " + inp + ".");
     let expected = (this.getBankIndex() % 3) + 1;
     if (inp != expected) {
-        util.requestErrorStop("ERROR: Expected " + expected + ".");
+      util.requestErrorStop("ERROR: Expected " + expected + ".");
     }
     let elapsedTime = util.getElapsedLogicalTime();
     if (!elapsedTime.isEqualTo(TimeValue.sec(1))) {
-        util.requestErrorStop("ERROR: Expected to receive input after one second.");
+      util.requestErrorStop("ERROR: Expected to receive input after one second.");
     }
     received = true;
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        util.requestErrorStop("ERROR: Destination " + this.getBankIndex() + " received no input!");
+      util.requestErrorStop("ERROR: Destination " + this.getBankIndex() + " received no input!");
     }
     console.log("Success.");
   =}
diff --git a/test/TypeScript/src/multiport/FullyConnected.lf b/test/TypeScript/src/multiport/FullyConnected.lf
index e9135b1e78..9db964a4d9 100644
--- a/test/TypeScript/src/multiport/FullyConnected.lf
+++ b/test/TypeScript/src/multiport/FullyConnected.lf
@@ -16,22 +16,22 @@ reactor Node(numNodes: number = 4) {
     console.log("Node " + this.getBankIndex() + " received messages from ");
     let count = 0;
     for (let i = 0; i < inp.length; i++) {
-        let val = inp[i]
-        if (val !== undefined) {
-            received = true;
-            count++;
-            console.log(val + ", ");
-        }
+      let val = inp[i]
+      if (val !== undefined) {
+        received = true;
+        count++;
+        console.log(val + ", ");
+      }
     }
     console.log("");
     if (count != numNodes) {
-        util.requestErrorStop("Received fewer messages than expected!");
+      util.requestErrorStop("Received fewer messages than expected!");
     }
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        util.reportError("Received no input!");
+      util.reportError("Received no input!");
     }
   =}
 }
diff --git a/test/TypeScript/src/multiport/MultiportFromBank.lf b/test/TypeScript/src/multiport/MultiportFromBank.lf
index 93f3d5c8f6..63708bfb76 100644
--- a/test/TypeScript/src/multiport/MultiportFromBank.lf
+++ b/test/TypeScript/src/multiport/MultiportFromBank.lf
@@ -16,17 +16,17 @@ reactor Destination(portWidth: number = 3) {
 
   reaction(inp) {=
     for (let i = 0; i < inp.length; i++) {
-        console.log("Destination channel " + i + " received " + inp[i]);
-        if (i != inp[i]) {
-            util.requestErrorStop("ERROR: Expected " + i);
-        }
+      console.log("Destination channel " + i + " received " + inp[i]);
+      if (i != inp[i]) {
+        util.requestErrorStop("ERROR: Expected " + i);
+      }
     }
     received = true;
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        util.requestErrorStop("ERROR: Destination received no input!");
+      util.requestErrorStop("ERROR: Destination received no input!");
     }
     console.log("Success.");
   =}
diff --git a/test/TypeScript/src/multiport/MultiportFromHierarchy.lf b/test/TypeScript/src/multiport/MultiportFromHierarchy.lf
index 765fc1a19f..f1d9e623de 100644
--- a/test/TypeScript/src/multiport/MultiportFromHierarchy.lf
+++ b/test/TypeScript/src/multiport/MultiportFromHierarchy.lf
@@ -10,7 +10,7 @@ reactor Source(width: number = 3) {
 
   reaction(t) -> out {=
     for(let i = 0; i < out.length; i++) {
-        out[i] = s++;
+      out[i] = s++;
     }
   =}
 }
@@ -22,19 +22,19 @@ reactor Destination(width: number = 3) {
   reaction(inp) {=
     let sum = 0;
     for (let i = 0; i < inp.length; i++) {
-        let val = inp[i]
-        if (val !== undefined) sum += val;
+      let val = inp[i]
+      if (val !== undefined) sum += val;
     }
     console.log("Sum of received: " + sum + ".");
     if (sum != s) {
-        util.requestErrorStop("ERROR: Expected " + s + ".");
+      util.requestErrorStop("ERROR: Expected " + s + ".");
     }
     s += 16;
   =}
 
   reaction(shutdown) {=
     if (s <= 6) {
-        util.reportError("ERROR: Destination received no input!");
+      util.reportError("ERROR: Destination received no input!");
     }
     console.log("Success.");
   =}
diff --git a/test/TypeScript/src/multiport/MultiportFromReaction.lf b/test/TypeScript/src/multiport/MultiportFromReaction.lf
index 6ecfe79cdc..6959047e29 100644
--- a/test/TypeScript/src/multiport/MultiportFromReaction.lf
+++ b/test/TypeScript/src/multiport/MultiportFromReaction.lf
@@ -10,19 +10,19 @@ reactor Destination(width: number = 1) {
   reaction(inp) {=
     let sum = 0;
     for (let i = 0; i < inp.length; i++) {
-        let val = inp[i]
-        if (val !== undefined) sum += val;
+      let val = inp[i]
+      if (val !== undefined) sum += val;
     }
     console.log("Sum of received: " + sum + ".");
     if (sum != s) {
-        util.requestErrorStop("ERROR: Expected " + s + ".");
+      util.requestErrorStop("ERROR: Expected " + s + ".");
     }
     s += 16;
   =}
 
   reaction(shutdown) {=
     if (s <= 6) {
-        util.reportError("ERROR: Destination received no input!");
+      util.reportError("ERROR: Destination received no input!");
     }
     console.log("Success.");
   =}
@@ -35,10 +35,10 @@ main reactor MultiportFromReaction(width: number = 4) {
 
   reaction(t) -> b.inp {=
     for (let i = 0; i < b.inp.length; i++) {
-        console.log("Before SET, b.inp[" + i + "] !== undefined has value " + b.inp[i] !== undefined);
-        b.inp[i] = s++;
-        console.log("AFTER set, b.inp[" + i + "] !== undefined has value " + b.inp[i] !== undefined);
-        console.log("AFTER set, b.inp[" + i + "] has value " + b.inp[i]);
+      console.log("Before SET, b.inp[" + i + "] !== undefined has value " + b.inp[i] !== undefined);
+      b.inp[i] = s++;
+      console.log("AFTER set, b.inp[" + i + "] !== undefined has value " + b.inp[i] !== undefined);
+      console.log("AFTER set, b.inp[" + i + "] has value " + b.inp[i]);
     }
   =}
 }
diff --git a/test/TypeScript/src/multiport/MultiportIn.lf b/test/TypeScript/src/multiport/MultiportIn.lf
index aac9e2e4d5..8e786a4fdd 100644
--- a/test/TypeScript/src/multiport/MultiportIn.lf
+++ b/test/TypeScript/src/multiport/MultiportIn.lf
@@ -26,23 +26,23 @@ reactor Destination {
   reaction(inp) {=
     let sum = 0;
     for (let i = 0; i < inp.length; i++) {
-        const val = inp[i];
-        if (val === undefined) {
-            util.requestErrorStop("ERROR: input at [" + i + "] is missing.");
-        } else {
-            sum += val;
-        }
+      const val = inp[i];
+      if (val === undefined) {
+        util.requestErrorStop("ERROR: input at [" + i + "] is missing.");
+      } else {
+        sum += val;
+      }
     }
     console.log("Sum of received: " + sum + ".");
     if (sum != s) {
-        util.requestErrorStop("ERROR: Expected " + s + ".");
+      util.requestErrorStop("ERROR: Expected " + s + ".");
     }
     s += 4;
   =}
 
   reaction(shutdown) {=
     if (s == 0) {
-        util.requestErrorStop("ERROR: Destination received no input!");
+      util.requestErrorStop("ERROR: Destination received no input!");
     }
     console.log("Success.");
   =}
diff --git a/test/TypeScript/src/multiport/MultiportInParameterized.lf b/test/TypeScript/src/multiport/MultiportInParameterized.lf
index e19c641b4d..1f60d19bf0 100644
--- a/test/TypeScript/src/multiport/MultiportInParameterized.lf
+++ b/test/TypeScript/src/multiport/MultiportInParameterized.lf
@@ -29,21 +29,21 @@ reactor Destination(width: number = 1) {
   reaction(inp) {=
     let sum = 0;
     for (let i = 0; i < inp.length; i++) {
-        let val = inp[i];
-        if (val !== undefined) {
-            sum += val;
-        }
+      let val = inp[i];
+      if (val !== undefined) {
+        sum += val;
+      }
     }
     console.log("Sum of received: " + sum + ".");
     if (sum != s) {
-        util.requestErrorStop("ERROR: Expected " + s + ".");
+      util.requestErrorStop("ERROR: Expected " + s + ".");
     }
     s += 4;
   =}
 
   reaction(shutdown) {=
     if (s == 0) {
-        util.reportError("ERROR: Destination received no input!");
+      util.reportError("ERROR: Destination received no input!");
     }
     console.log("Success.");
   =}
diff --git a/test/TypeScript/src/multiport/MultiportMutableInput.lf b/test/TypeScript/src/multiport/MultiportMutableInput.lf
index 08c3e15af2..226efc4c7b 100644
--- a/test/TypeScript/src/multiport/MultiportMutableInput.lf
+++ b/test/TypeScript/src/multiport/MultiportMutableInput.lf
@@ -18,11 +18,11 @@ reactor Print(scale: number = 1) {
   reaction(inp) {=
     let expected = 42;
     for (let j = 0; j < 2; j++) {
-        console.log("Received on channel " + j + ": " + inp[j]);
-        if (inp[j] != expected) {
-            util.requestErrorStop("ERROR: Expected " + expected + "!");
-        }
-        expected *=2;
+      console.log("Received on channel " + j + ": " + inp[j]);
+      if (inp[j] != expected) {
+        util.requestErrorStop("ERROR: Expected " + expected + "!");
+      }
+      expected *=2;
     }
   =}
 }
@@ -33,9 +33,9 @@ reactor Scale(scale: number = 2) {
 
   reaction(inp) -> out {=
     for (let j = 0; j < 2; j++) {
-        // Modify the input, allowed because mutable.
-        (inp[j] as number) *= scale;
-        out[j] = inp[j] as number;
+      // Modify the input, allowed because mutable.
+      (inp[j] as number) *= scale;
+      out[j] = inp[j] as number;
     }
   =}
 }
diff --git a/test/TypeScript/src/multiport/MultiportMutableInputArray.lf b/test/TypeScript/src/multiport/MultiportMutableInputArray.lf
index c21b71a0af..b097927288 100644
--- a/test/TypeScript/src/multiport/MultiportMutableInputArray.lf
+++ b/test/TypeScript/src/multiport/MultiportMutableInputArray.lf
@@ -30,27 +30,27 @@ reactor Print(scale: number = 1) {
   input[2] inp: {= Array<number> =}
 
   reaction(inp) {=
-    let count = 0;       // For testing.
+    let count = 0;     // For testing.
     let failed = false;  // For testing.
     for(let j = 0; j < 2; j++) {
-        let logString = "Received on channel " + j +  ": [";
-        if (inp[j] === undefined) {
-            continue;
+      let logString = "Received on channel " + j +  ": [";
+      if (inp[j] === undefined) {
+        continue;
+      }
+      for (let i = 0; i < (inp[j] as Array<number>).length; i++) {
+        if (i > 0) logString += ", ";
+        logString += (inp[j] as Array<number>)[i];
+        // For testing, check whether values match expectation.
+        if ((inp[j] as Array<number>)[i] != scale * count) {
+          failed = true;
         }
-        for (let i = 0; i < (inp[j] as Array<number>).length; i++) {
-            if (i > 0) logString += ", ";
-            logString += (inp[j] as Array<number>)[i];
-            // For testing, check whether values match expectation.
-            if ((inp[j] as Array<number>)[i] != scale * count) {
-                failed = true;
-            }
-            count++;         // For testing.
-        }
-        logString += "]";
-        console.log(logString);
+        count++;     // For testing.
+      }
+      logString += "]";
+      console.log(logString);
     }
     if (failed) {
-        util.requestErrorStop("ERROR: Value received by Print does not match expectation!");
+      util.requestErrorStop("ERROR: Value received by Print does not match expectation!");
     }
   =}
 }
@@ -61,13 +61,13 @@ reactor Scale(scale: number = 2) {
 
   reaction(inp) -> out {=
     for (let j = 0; j < inp.length; j++) {
-        if (inp[j] === undefined) {
-            continue;
-        }
-        for (let i = 0; i < (inp[j] as Array<number>).length; i++) {
-            (inp[j] as Array<number>)[i] *= scale;
-        }
-        out[j] = (inp[j] as Array<number>);
+      if (inp[j] === undefined) {
+        continue;
+      }
+      for (let i = 0; i < (inp[j] as Array<number>).length; i++) {
+        (inp[j] as Array<number>)[i] *= scale;
+      }
+      out[j] = (inp[j] as Array<number>);
     }
   =}
 }
diff --git a/test/TypeScript/src/multiport/MultiportOut.lf b/test/TypeScript/src/multiport/MultiportOut.lf
index e689c552fd..1bec85473b 100644
--- a/test/TypeScript/src/multiport/MultiportOut.lf
+++ b/test/TypeScript/src/multiport/MultiportOut.lf
@@ -10,7 +10,7 @@ reactor Source {
 
   reaction(t) -> out {=
     for(let i = 0; i < 4; i++) {
-        out[i] = s;
+      out[i] = s;
     }
     s++;
   =}
@@ -33,19 +33,19 @@ reactor Destination {
   reaction(inp) {=
     let sum = 0;
     for (let i = 0; i < inp.length; i++) {
-        const val = inp[i]
-        if (val !== undefined) sum += val;
+      const val = inp[i]
+      if (val !== undefined) sum += val;
     }
     console.log("Sum of received: " + sum + ".");
     if (sum != s) {
-        util.requestErrorStop("ERROR: Expected " + s + ".");
+      util.requestErrorStop("ERROR: Expected " + s + ".");
     }
     s += 4;
   =}
 
   reaction(shutdown) {=
     if (s == 0) {
-        util.requestErrorStop("ERROR: Destination received no input!");
+      util.requestErrorStop("ERROR: Destination received no input!");
     }
     console.log("Success.");
   =}
diff --git a/test/TypeScript/src/multiport/MultiportToBank.lf b/test/TypeScript/src/multiport/MultiportToBank.lf
index efc4fcca4d..1b210c6cba 100644
--- a/test/TypeScript/src/multiport/MultiportToBank.lf
+++ b/test/TypeScript/src/multiport/MultiportToBank.lf
@@ -5,7 +5,7 @@ reactor Source {
 
   reaction(startup) -> out {=
     for (let i = 0 ; i < out.length; i++) {
-        out[i] = i;
+      out[i] = i;
     }
   =}
 }
@@ -16,7 +16,7 @@ reactor Sink {
   reaction(inp) {=
     console.log("Received " + inp);
     if (inp != this.getBankIndex()) {
-        util.requestErrorStop("Error: expected " + this.getBankIndex());
+      util.requestErrorStop("Error: expected " + this.getBankIndex());
     }
   =}
 }
diff --git a/test/TypeScript/src/multiport/MultiportToBankAfter.lf b/test/TypeScript/src/multiport/MultiportToBankAfter.lf
index e03d0e049d..c9f62dfa7a 100644
--- a/test/TypeScript/src/multiport/MultiportToBankAfter.lf
+++ b/test/TypeScript/src/multiport/MultiportToBankAfter.lf
@@ -8,7 +8,7 @@ reactor Source(width: number = 2) {
 
   reaction(startup) -> out {=
     for (let i = 0; i < out.length; i++) {
-        out[i] = i;
+      out[i] = i;
     }
   =}
 }
@@ -20,19 +20,19 @@ reactor Destination {
   reaction(inp) {=
     console.log("Destination " + this.getBankIndex() + " received " + inp + ".");
     if (this.getBankIndex() != inp) {
-        util.requestErrorStop("ERROR: Expected " + this.getBankIndex() + ".");
+      util.requestErrorStop("ERROR: Expected " + this.getBankIndex() + ".");
     }
 
     let elapsedTime = util.getElapsedLogicalTime();
     if (!elapsedTime.isEqualTo(TimeValue.sec(1))) {
-        util.requestErrorStop("ERROR: Expected to receive input after one second.");
+      util.requestErrorStop("ERROR: Expected to receive input after one second.");
     }
     received = true;
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        util.reportError("ERROR: Destination " + this.getBankIndex() + " received no input!", );
+      util.reportError("ERROR: Destination " + this.getBankIndex() + " received no input!", );
     }
     console.log("Success.");
   =}
diff --git a/test/TypeScript/src/multiport/MultiportToBankDouble.lf b/test/TypeScript/src/multiport/MultiportToBankDouble.lf
index 966fdf3b32..cf110a5369 100644
--- a/test/TypeScript/src/multiport/MultiportToBankDouble.lf
+++ b/test/TypeScript/src/multiport/MultiportToBankDouble.lf
@@ -9,7 +9,7 @@ reactor Source {
 
   reaction(startup) -> out {=
     for (let i = 0; i < out.length; i++) {
-        out[i] = i;
+      out[i] = i;
     }
   =}
 
@@ -19,7 +19,7 @@ reactor Source {
   // Contents of the reactions does not matter (either could be empty)
   out {=
     for (let i = 0; i < out.length; i++) {
-        out[i] = i * 2;
+      out[i] = i * 2;
     }
   =}
 }
@@ -31,14 +31,14 @@ reactor Destination {
   reaction(inp) {=
     console.log("Destination " + this.getBankIndex() + " received " + inp + ".");
     if (this.getBankIndex() * 2 != inp) {
-        util.requestErrorStop("ERROR: Expected " + this.getBankIndex() * 2 + ".");
+      util.requestErrorStop("ERROR: Expected " + this.getBankIndex() * 2 + ".");
     }
     received = true;
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        util.reportError("ERROR: Destination " + this.getBankIndex() + " received no input!");
+      util.reportError("ERROR: Destination " + this.getBankIndex() + " received no input!");
     }
     console.log("Success.");
   =}
diff --git a/test/TypeScript/src/multiport/MultiportToBankHierarchy.lf b/test/TypeScript/src/multiport/MultiportToBankHierarchy.lf
index d98b662a5a..384e64e986 100644
--- a/test/TypeScript/src/multiport/MultiportToBankHierarchy.lf
+++ b/test/TypeScript/src/multiport/MultiportToBankHierarchy.lf
@@ -9,7 +9,7 @@ reactor Source {
 
   reaction(startup) -> out {=
     for(let i = 0; i < out.length; i++) {
-        out[i] = i;
+      out[i] = i;
     }
   =}
 }
@@ -21,14 +21,14 @@ reactor Destination {
   reaction(inp) {=
     console.log("Destination " + this.getBankIndex() + " received " + inp + ".");
     if (this.getBankIndex() != inp) {
-        util.requestErrorStop("ERROR: Expected " + this.getBankIndex() + ".");
+      util.requestErrorStop("ERROR: Expected " + this.getBankIndex() + ".");
     }
     received = true;
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        util.reportError("ERROR: Destination " + this.getBankIndex() + " received no input!");
+      util.reportError("ERROR: Destination " + this.getBankIndex() + " received no input!");
     }
     console.log("Success.");
   =}
diff --git a/test/TypeScript/src/multiport/MultiportToHierarchy.lf b/test/TypeScript/src/multiport/MultiportToHierarchy.lf
index 30e24b1b37..ed9440a91f 100644
--- a/test/TypeScript/src/multiport/MultiportToHierarchy.lf
+++ b/test/TypeScript/src/multiport/MultiportToHierarchy.lf
@@ -11,7 +11,7 @@ reactor Source(width: number = 4) {
 
   reaction(t) -> out {=
     for(let i = 0; i < 4; i++) {
-        out[i] = s++;
+      out[i] = s++;
     }
   =}
 }
@@ -23,19 +23,19 @@ reactor Destination(width: number = 4) {
   reaction(inp) {=
     let sum = 0;
     for (let i = 0; i < inp.length; i++) {
-        const val = inp[i]
-        if (val !== undefined) sum += val;
+      const val = inp[i]
+      if (val !== undefined) sum += val;
     }
     console.log("Sum of received: " + sum + ".");
     if (sum != s) {
-        util.requestErrorStop("ERROR: Expected " + s + ".");
+      util.requestErrorStop("ERROR: Expected " + s + ".");
     }
     s += 16;
   =}
 
   reaction(shutdown) {=
     if (s <= 6) {
-        util.requestErrorStop("ERROR: Destination received no input!");
+      util.requestErrorStop("ERROR: Destination received no input!");
     }
     console.log("Success.");
   =}
diff --git a/test/TypeScript/src/multiport/MultiportToMultiport.lf b/test/TypeScript/src/multiport/MultiportToMultiport.lf
index 73449b47c5..da9515ea94 100644
--- a/test/TypeScript/src/multiport/MultiportToMultiport.lf
+++ b/test/TypeScript/src/multiport/MultiportToMultiport.lf
@@ -5,7 +5,7 @@ reactor Source {
 
   reaction(startup) -> out {=
     for (let i = 0; i < out.length; i++) {
-        out[i] = i;
+      out[i] = i;
     }
   =}
 }
@@ -16,17 +16,17 @@ reactor Sink {
 
   reaction(inp) {=
     for (let i = 0; i < inp.length; i++) {
-        console.log("Received " + inp[i]);
-        received = true;
-        if (inp[i] != i) {
-            util.requestErrorStop("FAILURE: Expected " + i + "!");
-        }
+      console.log("Received " + inp[i]);
+      received = true;
+      if (inp[i] != i) {
+        util.requestErrorStop("FAILURE: Expected " + i + "!");
+      }
     }
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        util.requestErrorStop("ERROR: No data received!!");
+      util.requestErrorStop("ERROR: No data received!!");
     }
     console.log("Success.");
   =}
diff --git a/test/TypeScript/src/multiport/MultiportToMultiport2.lf b/test/TypeScript/src/multiport/MultiportToMultiport2.lf
index 2f167d26b0..5b6f88800b 100644
--- a/test/TypeScript/src/multiport/MultiportToMultiport2.lf
+++ b/test/TypeScript/src/multiport/MultiportToMultiport2.lf
@@ -6,7 +6,7 @@ reactor Source(width: number = 2) {
 
   reaction(startup) -> out {=
     for (let i = 0; i < out.length; i++) {
-        out[i] = i;
+      out[i] = i;
     }
   =}
 }
@@ -16,12 +16,12 @@ reactor Destination(width: number = 2) {
 
   reaction(inp) {=
     for (let i = 0; i < inp.length; i++) {
-        console.log("Received on channel " + i + ": " + inp[i]);
-        // NOTE: For testing purposes, this assumes the specific
-        // widths instantiated below.
-        if (inp[i] != i % 3) {
-            util.requestErrorStop("ERROR: expected " + i % 3);
-        }
+      console.log("Received on channel " + i + ": " + inp[i]);
+      // NOTE: For testing purposes, this assumes the specific
+      // widths instantiated below.
+      if (inp[i] != i % 3) {
+        util.requestErrorStop("ERROR: expected " + i % 3);
+      }
     }
   =}
 }
diff --git a/test/TypeScript/src/multiport/MultiportToMultiport2After.lf b/test/TypeScript/src/multiport/MultiportToMultiport2After.lf
index e5dda093d5..38eabbac3f 100644
--- a/test/TypeScript/src/multiport/MultiportToMultiport2After.lf
+++ b/test/TypeScript/src/multiport/MultiportToMultiport2After.lf
@@ -6,7 +6,7 @@ reactor Source(width: number = 2) {
 
   reaction(startup) -> out {=
     for (let i = 0; i < out.length; i++) {
-        out[i] = i;
+      out[i] = i;
     }
   =}
 }
@@ -16,19 +16,19 @@ reactor Destination(width: number = 2) {
 
   reaction(inp) {=
     for (let i = 0; i < inp.length; i++) {
-        if (inp[i] !== undefined) {
-            let value = inp[i];
-            console.log("Received on channel " + i + ": " + value);
-            // NOTE: For testing purposes, this assumes the specific
-            // widths instantiated below.
-            if (value != i % 3) {
-                util.requestErrorStop("ERROR: expected " + i % 3);
-            }
+      if (inp[i] !== undefined) {
+        let value = inp[i];
+        console.log("Received on channel " + i + ": " + value);
+        // NOTE: For testing purposes, this assumes the specific
+        // widths instantiated below.
+        if (value != i % 3) {
+          util.requestErrorStop("ERROR: expected " + i % 3);
         }
+      }
     }
     let elapsedTime = util.getElapsedLogicalTime();
     if (!elapsedTime.isEqualTo(TimeValue.msec(1000))) {
-        util.requestErrorStop("ERROR: Expected to receive input after one second.");
+      util.requestErrorStop("ERROR: Expected to receive input after one second.");
     }
   =}
 }
diff --git a/test/TypeScript/src/multiport/MultiportToMultiportArray.lf b/test/TypeScript/src/multiport/MultiportToMultiportArray.lf
index a8e51556f5..018d8dd587 100644
--- a/test/TypeScript/src/multiport/MultiportToMultiportArray.lf
+++ b/test/TypeScript/src/multiport/MultiportToMultiportArray.lf
@@ -10,14 +10,14 @@ reactor Source {
 
   reaction(t) -> out {=
     for(let i = 0; i < 2; i++) {
-        // Dynamically allocate a new output array
-        let a = new Array<number>(3);
-        // initialize it
-        a[0] = s++;
-        a[1] = s++;
-        a[2] = s++;
-        // and send it
-        out[i] = a;
+      // Dynamically allocate a new output array
+      let a = new Array<number>(3);
+      // initialize it
+      a[0] = s++;
+      a[1] = s++;
+      a[2] = s++;
+      // and send it
+      out[i] = a;
     }
   =}
 }
@@ -29,23 +29,23 @@ reactor Destination {
   reaction(inp) {=
     let sum = 0;
     for (let i = 0; i < inp.length; i++) {
-        const a = inp[i]
-        if (a !== undefined) {
-            for (let j = 0; j < a.length; j++) {
-                sum += a[j];
-            }
+      const a = inp[i]
+      if (a !== undefined) {
+        for (let j = 0; j < a.length; j++) {
+          sum += a[j];
         }
+      }
     }
     console.log("Sum of received: " + sum);
     if (sum != s) {
-        util.requestErrorStop("ERROR: Expected " + s);
+      util.requestErrorStop("ERROR: Expected " + s);
     }
     s += 36;
   =}
 
   reaction(shutdown) {=
     if (s <= 15) {
-        util.requestErrorStop("ERROR: Destination received no input!");
+      util.requestErrorStop("ERROR: Destination received no input!");
     }
     console.log("Success.");
   =}
diff --git a/test/TypeScript/src/multiport/MultiportToMultiportParameter.lf b/test/TypeScript/src/multiport/MultiportToMultiportParameter.lf
index 00a5c15718..6128888199 100644
--- a/test/TypeScript/src/multiport/MultiportToMultiportParameter.lf
+++ b/test/TypeScript/src/multiport/MultiportToMultiportParameter.lf
@@ -10,7 +10,7 @@ reactor Source(width: number = 1) {
 
   reaction(t) -> out {=
     for (let i = 0; i < out.length; i++) {
-        out[i] = s++;
+      out[i] = s++;
     }
   =}
 }
@@ -22,18 +22,18 @@ reactor Destination(width: number = 1) {
   reaction(inp) {=
     let sum = 0;
     for (let i = 0; i < inp.length; i++) {
-        if (inp[i] !== undefined) sum += (inp[i] as number);
+      if (inp[i] !== undefined) sum += (inp[i] as number);
     }
     console.log("Sum of received: " + sum + ".", );
     if (sum != s) {
-        util.requestErrorStop("ERROR: Expected " + s + ".");
+      util.requestErrorStop("ERROR: Expected " + s + ".");
     }
     s += 16;
   =}
 
   reaction(shutdown) {=
     if (s <= 6) {
-        util.reportError("ERROR: Destination received no input!");
+      util.reportError("ERROR: Destination received no input!");
     }
     console.log("Success.");
   =}
diff --git a/test/TypeScript/src/multiport/MultiportToPort.lf b/test/TypeScript/src/multiport/MultiportToPort.lf
index 30a870024b..4bf049fb21 100644
--- a/test/TypeScript/src/multiport/MultiportToPort.lf
+++ b/test/TypeScript/src/multiport/MultiportToPort.lf
@@ -8,8 +8,8 @@ reactor Source {
 
   reaction(startup) -> out {=
     for(let i = 0; i < out.length; i++) {
-        console.log("Source sending " + i);
-        out[i] = i;
+      console.log("Source sending " + i);
+      out[i] = i;
     }
   =}
 }
@@ -22,13 +22,13 @@ reactor Destination(expected: number = 0) {
     console.log("Received " + inp);
     received = true;
     if (inp != expected) {
-        util.requestErrorStop("FAILURE: Expected " + expected);
+      util.requestErrorStop("FAILURE: Expected " + expected);
     }
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        util.requestErrorStop("ERROR: Destination received no input!");
+      util.requestErrorStop("ERROR: Destination received no input!");
     }
     console.log("Success.");
   =}
diff --git a/test/TypeScript/src/multiport/MultiportToReaction.lf b/test/TypeScript/src/multiport/MultiportToReaction.lf
index 9ea9097ba5..e5ba5eda17 100644
--- a/test/TypeScript/src/multiport/MultiportToReaction.lf
+++ b/test/TypeScript/src/multiport/MultiportToReaction.lf
@@ -11,7 +11,7 @@ reactor Source(width: number = 1) {
   reaction(t) -> out {=
     console.log("Sending.");
     for (let i = 0; i < out.length; i++) {
-        out[i] = s++;
+      out[i] = s++;
     }
   =}
 }
@@ -23,19 +23,19 @@ main reactor MultiportToReaction {
   reaction(b.out) {=
     let sum = 0;
     for (let i = 0; i < b.out.length; i++) {
-        let val = b.out[i]
-        if (val !== undefined) sum += val;
+      let val = b.out[i]
+      if (val !== undefined) sum += val;
     }
     console.log("Sum of received: " + sum + ".");
     if (sum != s) {
-        util.requestErrorStop("ERROR: Expected " + s + ".");
+      util.requestErrorStop("ERROR: Expected " + s + ".");
     }
     s += 16;
   =}
 
   reaction(shutdown) {=
     if (s <= 6) {
-        util.reportError("ERROR: Destination received no input!");
+      util.reportError("ERROR: Destination received no input!");
     }
     console.log("Success.");
   =}
diff --git a/test/TypeScript/src/multiport/NestedBanks.lf b/test/TypeScript/src/multiport/NestedBanks.lf
index 2fc1a9f3e5..d84b5245e8 100644
--- a/test/TypeScript/src/multiport/NestedBanks.lf
+++ b/test/TypeScript/src/multiport/NestedBanks.lf
@@ -42,10 +42,10 @@ reactor D {
 
   reaction(u) {=
     for (let i = 0; i < u.length; i++) {
-        console.log("d.u[" + i + "] received " + u[i] + ".");
-        if (u[i] != 6 + i) {
-            util.requestErrorStop("Expected " + (6 + i) + " but received " + u[i] + ".");
-        }
+      console.log("d.u[" + i + "] received " + u[i] + ".");
+      if (u[i] != 6 + i) {
+        util.requestErrorStop("Expected " + (6 + i) + " but received " + u[i] + ".");
+      }
     }
   =}
 }
@@ -55,7 +55,7 @@ reactor E {
 
   reaction(t) {=
     for (let i = 0; i < t.length; i++) {
-        console.log("e.t[" + i + "] received " + t[i] + ".");
+      console.log("e.t[" + i + "] received " + t[i] + ".");
     }
   =}
 }
@@ -66,7 +66,7 @@ reactor F(cBankIndex: number = 0) {
   reaction(w) {=
     console.log("c[" + cBankIndex + "].f.w received " + w + ".");
     if (w != cBankIndex * 2) {
-        util.requestErrorStop("Expected " + cBankIndex * 2 + " but received " + w + ".");
+      util.requestErrorStop("Expected " + cBankIndex * 2 + " but received " + w + ".");
     }
   =}
 }
@@ -77,7 +77,7 @@ reactor G(cBankIndex: number = 0) {
   reaction(s) {=
     console.log("c[" + cBankIndex + "].g.s received " + s + ".");
     if (s != cBankIndex * 2 + 1) {
-        util.requestErrorStop("Expected " + (cBankIndex * 2 + 1) + " but received " + s + ".");
+      util.requestErrorStop("Expected " + (cBankIndex * 2 + 1) + " but received " + s + ".");
     }
   =}
 }
diff --git a/test/TypeScript/src/multiport/PipelineAfter.lf b/test/TypeScript/src/multiport/PipelineAfter.lf
index 5835193d9c..9db397c0e4 100644
--- a/test/TypeScript/src/multiport/PipelineAfter.lf
+++ b/test/TypeScript/src/multiport/PipelineAfter.lf
@@ -19,10 +19,10 @@ reactor Sink {
   reaction(inp) {=
     console.log("Received " + inp);
     if (inp != 42) {
-        util.requestErrorStop("ERROR: expected 42!");
+      util.requestErrorStop("ERROR: expected 42!");
     }
     if (!util.getElapsedLogicalTime().isEqualTo(TimeValue.sec(1))) {
-        util.requestErrorStop("ERROR: Expected to receive input after one second.");
+      util.requestErrorStop("ERROR: Expected to receive input after one second.");
     }
   =}
 }
diff --git a/test/TypeScript/src/multiport/ReactionToContainedBank.lf b/test/TypeScript/src/multiport/ReactionToContainedBank.lf
index 89fb884529..535e0e2fbc 100644
--- a/test/TypeScript/src/multiport/ReactionToContainedBank.lf
+++ b/test/TypeScript/src/multiport/ReactionToContainedBank.lf
@@ -13,7 +13,7 @@ main reactor ReactionToContainedBank(width: number = 2) {
 
   reaction(t) -> test.inp {=
     for (let i = 0; i < width; i++) {
-        (test[i].inp as number) = count;
+      (test[i].inp as number) = count;
     }
     count++;
   =}
diff --git a/test/TypeScript/src/multiport/ReactionsToNested.lf b/test/TypeScript/src/multiport/ReactionsToNested.lf
index 3b90660325..a6baf12135 100644
--- a/test/TypeScript/src/multiport/ReactionsToNested.lf
+++ b/test/TypeScript/src/multiport/ReactionsToNested.lf
@@ -11,13 +11,13 @@ reactor T(expected: number = 0) {
     console.log("T received " + z);
     received = true;
     if (z != expected) {
-        util.requestErrorStop("Expected " + expected);
+      util.requestErrorStop("Expected " + expected);
     }
   =}
 
   reaction(shutdown) {=
     if (!received) {
-        util.reportError("No input received");
+      util.reportError("No input received");
     }
   =}
 }
diff --git a/test/TypeScript/src/serialization/ProtoNoPacking.lf b/test/TypeScript/src/serialization/ProtoNoPacking.lf
index 8e35981c6c..d2cd1ed1cc 100644
--- a/test/TypeScript/src/serialization/ProtoNoPacking.lf
+++ b/test/TypeScript/src/serialization/ProtoNoPacking.lf
@@ -34,7 +34,7 @@ reactor SinkProto {
 
   reaction(x) {=
     if (x !== undefined) {
-        console.log(`Received: name=${x.getName()}, number=${x.getNumber()}.`)
+      console.log(`Received: name=${x.getName()}, number=${x.getNumber()}.`)
     }
   =}
 }

From 4d8d43173f01536af3bc9d6ac3194ce4c5cb99cd Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 20 Jun 2023 13:56:41 -0700
Subject: [PATCH 0442/1114] Format all LF files.

---
 test/C/src/NativeListsAndTimes.lf             | 16 +++++++--------
 ...tributedCountDecentralizedLateHierarchy.lf |  4 ++--
 test/C/src/federated/HelloDistributed.lf      |  4 ++--
 test/C/src/modal_models/ConvertCaseTest.lf    |  4 +---
 test/C/src/multiport/MultiportToBank.lf       |  2 +-
 test/Cpp/src/NativeListsAndTimes.lf           | 16 +++++++--------
 test/Cpp/src/target/InitializerSyntax.lf      | 18 ++++++++---------
 test/Python/src/NativeListsAndTimes.lf        | 20 +++++++++----------
 .../DistributedCountDecentralizedLate.lf      |  4 ++--
 ...ributedCountDecentralizedLateDownstream.lf |  6 +++---
 ...tributedCountDecentralizedLateHierarchy.lf |  6 +++---
 .../src/modal_models/ConvertCaseTest.lf       |  4 +---
 .../MultipleOutputFeeder_2Connections.lf      |  2 +-
 ...ultipleOutputFeeder_ReactionConnections.lf |  2 +-
 test/TypeScript/src/NativeListsAndTimes.lf    | 12 +++++------
 .../src/federated/HelloDistributed.lf         |  4 ++--
 16 files changed, 60 insertions(+), 64 deletions(-)

diff --git a/test/C/src/NativeListsAndTimes.lf b/test/C/src/NativeListsAndTimes.lf
index 02d871d28b..1bf5cfdd6f 100644
--- a/test/C/src/NativeListsAndTimes.lf
+++ b/test/C/src/NativeListsAndTimes.lf
@@ -3,20 +3,20 @@ target C
 // This test passes if it is successfully compiled into valid target code.
 main reactor(
     x: int = 0,
-    y: time = 0,          // Units are missing but not required
-    z = 1 msec,           // Type is missing but not required
-    p: int[] = {1, 2, 3, 4},    // List of integers
+    y: time = 0,                  // Units are missing but not required
+    z = 1 msec,                   // Type is missing but not required
+    p: int[] = {1, 2, 3, 4},      // List of integers
     q: interval_t[] = {1 msec, 2 msec, 3 msec},  // list of time values
     // List of time values
     g: time[] = {1 msec, 2 msec}) {
   state s: time = y  // Reference to explicitly typed time parameter
   state t: time = z  // Reference to implicitly typed time parameter
-  state v: bool    // Uninitialized boolean state variable
-  state w: time    // Uninitialized time state variable
-  timer tick(0)    // Units missing but not required
+  state v: bool      // Uninitialized boolean state variable
+  state w: time      // Uninitialized time state variable
+  timer tick(0)      // Units missing but not required
   timer tock(1 sec)  // Implicit type time
-  timer toe(z)     // Implicit type time
-  state baz = p    // Implicit type int[]
+  timer toe(z)       // Implicit type time
+  state baz = p      // Implicit type int[]
   state period = z   // Implicit type time
 
   state empty_list: int[]
diff --git a/test/C/src/federated/DistributedCountDecentralizedLateHierarchy.lf b/test/C/src/federated/DistributedCountDecentralizedLateHierarchy.lf
index 25dec91f7d..cd9f8097aa 100644
--- a/test/C/src/federated/DistributedCountDecentralizedLateHierarchy.lf
+++ b/test/C/src/federated/DistributedCountDecentralizedLateHierarchy.lf
@@ -19,7 +19,7 @@ reactor ImportantActuator {
   state success: int = 0
   state success_stp_violation: int = 0
   timer t(0, 10 msec)  // Force a timer to be invoke periodically
-  state c: int = 0   // to ensure logical time will advance in the absence of incoming messages.
+  state c: int = 0     // to ensure logical time will advance in the absence of incoming messages.
 
   reaction(in) {=
     tag_t current_tag = lf_tag();
@@ -74,7 +74,7 @@ reactor Print {
 reactor Receiver {
   input in: int
   timer t(0, 10 msec)  // Force a timer to be invoke periodically
-  state c: int = 0   // to ensure logical time will advance in the absence of incoming messages.
+  state c: int = 0     // to ensure logical time will advance in the absence of incoming messages.
   p = new Print()
   a = new ImportantActuator()
   in -> p.in
diff --git a/test/C/src/federated/HelloDistributed.lf b/test/C/src/federated/HelloDistributed.lf
index ba955f06d3..4b06399fa4 100644
--- a/test/C/src/federated/HelloDistributed.lf
+++ b/test/C/src/federated/HelloDistributed.lf
@@ -44,9 +44,9 @@ reactor Destination {
 }
 
 federated reactor HelloDistributed at localhost {
-  s = new Source()     // Reactor s is in federate Source
+  s = new Source()       // Reactor s is in federate Source
   d = new Destination()  // Reactor d is in federate Destination
-  s.out -> d.in      // This version preserves the timestamp.
+  s.out -> d.in          // This version preserves the timestamp.
 
   reaction(startup) {= lf_print("Printing something in top-level federated reactor."); =}
 }
diff --git a/test/C/src/modal_models/ConvertCaseTest.lf b/test/C/src/modal_models/ConvertCaseTest.lf
index 1303d7797e..09cb159f2d 100644
--- a/test/C/src/modal_models/ConvertCaseTest.lf
+++ b/test/C/src/modal_models/ConvertCaseTest.lf
@@ -128,9 +128,7 @@ main reactor {
     lf_set(history_processor.discard, true);
   =}
 
-  reaction(reset_processor.converted) {=
-    printf("Reset: %c\n", reset_processor.converted->value);
-  =}
+  reaction(reset_processor.converted) {= printf("Reset: %c\n", reset_processor.converted->value); =}
 
   reaction(history_processor.converted) {=
     printf("History: %c\n", history_processor.converted->value);
diff --git a/test/C/src/multiport/MultiportToBank.lf b/test/C/src/multiport/MultiportToBank.lf
index b048e5ca1c..90a11f5e00 100644
--- a/test/C/src/multiport/MultiportToBank.lf
+++ b/test/C/src/multiport/MultiportToBank.lf
@@ -6,7 +6,7 @@ target C {
 
 reactor Source(width: int = 2) {
   output[width] out: int  // Connected to a bank of Destination reactors
-  input dummy: int    // Not connected to anything
+  input dummy: int        // Not connected to anything
 
   reaction(startup) -> out {=
     for(int i = 0; i < out_width; i++) {
diff --git a/test/Cpp/src/NativeListsAndTimes.lf b/test/Cpp/src/NativeListsAndTimes.lf
index 649b6550fe..b6e8550c50 100644
--- a/test/Cpp/src/NativeListsAndTimes.lf
+++ b/test/Cpp/src/NativeListsAndTimes.lf
@@ -3,20 +3,20 @@ target Cpp
 // This test passes if it is successfully compiled into valid target code.
 reactor Foo(
     x: int = 0,
-    y: time = 0,        // Units are missing but not required
-    z = 1 msec,         // Type is missing but not required
-    p: int[]{1, 2, 3, 4},     // List of integers
+    y: time = 0,                // Units are missing but not required
+    z = 1 msec,                 // Type is missing but not required
+    p: int[]{1, 2, 3, 4},       // List of integers
     q: {= std::vector<reactor::Duration> =}{1 msec, 2 msec, 3 msec},
     g: time[]{1 msec, 2 msec},  // List of time values
     g2: int[] = {}) {
   state s: time = y  // Reference to explicitly typed time parameter
   state t: time = z  // Reference to implicitly typed time parameter
-  state v: bool    // Uninitialized boolean state variable
-  state w: time    // Uninitialized time state variable
-  timer tick(0)    // Units missing but not required
+  state v: bool      // Uninitialized boolean state variable
+  state w: time      // Uninitialized time state variable
+  timer tick(0)      // Units missing but not required
   timer tock(1 sec)  // Implicit type time
-  timer toe(z)     // Implicit type time
-  state baz = p    // Implicit type int[]
+  timer toe(z)       // Implicit type time
+  state baz = p      // Implicit type int[]
   state period = z   // Implicit type time
   state times: std::vector<std::vector<{= reactor::Duration =}>>{q, g}  // a list of lists
   state empty_list: int[] = {}
diff --git a/test/Cpp/src/target/InitializerSyntax.lf b/test/Cpp/src/target/InitializerSyntax.lf
index b9766dd542..fdc57d1f36 100644
--- a/test/Cpp/src/target/InitializerSyntax.lf
+++ b/test/Cpp/src/target/InitializerSyntax.lf
@@ -45,17 +45,17 @@ reactor TestReactor(
     p_assign_init_empty: TestType = {},  // constructor #1
     // constructor #3
     p_assign_init_some: TestType = {4, 2, 1}) {
-  state s_default: TestType         // constructor #1
-  state s_empty: TestType()         // constructor #1
-  state s_value: TestType(24)         // constructor #2
-  state s_init_empty: TestType{}      // constructor #1
-  state s_init_empty2: TestType({})     // constructor #3
-  state s_init_some: TestType{3, 12, 40}  // constructor #3
+  state s_default: TestType                 // constructor #1
+  state s_empty: TestType()                 // constructor #1
+  state s_value: TestType(24)               // constructor #2
+  state s_init_empty: TestType{}            // constructor #1
+  state s_init_empty2: TestType({})         // constructor #3
+  state s_init_some: TestType{3, 12, 40}    // constructor #3
   state s_assign_init_empty: TestType = {}  // constructor #3
   state s_assign_init_some: TestType = {4, 3, 2, 1}  // constructor #3
-  state s_copy1: TestType(p_default)    // constructor #4
-  state s_copy2: TestType{p_default}    // constructor #4
-  state s_copy3: TestType = p_default     // constructor #4
+  state s_copy1: TestType(p_default)        // constructor #4
+  state s_copy2: TestType{p_default}        // constructor #4
+  state s_copy3: TestType = p_default       // constructor #4
 
   reaction(startup) {=
     reactor::validate(p_default.x == 62, "p_default should be default constructed and then moved");
diff --git a/test/Python/src/NativeListsAndTimes.lf b/test/Python/src/NativeListsAndTimes.lf
index 0ed485119c..8a5de9d148 100644
--- a/test/Python/src/NativeListsAndTimes.lf
+++ b/test/Python/src/NativeListsAndTimes.lf
@@ -3,20 +3,20 @@ target Python
 # This test passes if it is successfully compiled into valid target code.
 main reactor(
     x=0,
-    y=0,         # Units are missing but not required
-    z = 1 msec,    # Type is missing but not required
-    p(1, 2, 3, 4),   # List of integers
+    y=0,               # Units are missing but not required
+    z = 1 msec,        # Type is missing but not required
+    p(1, 2, 3, 4),     # List of integers
     q(1 msec, 2 msec, 3 msec),  # list of time values
     # List of time values
     g(1 msec, 2 msec)) {
-  state s = y    # Reference to explicitly typed time parameter
-  state t = z    # Reference to implicitly typed time parameter
-  state v      # Uninitialized boolean state variable
-  state w      # Uninitialized time state variable
-  timer tick(0)    # Units missing but not required
+  state s = y        # Reference to explicitly typed time parameter
+  state t = z        # Reference to implicitly typed time parameter
+  state v            # Uninitialized boolean state variable
+  state w            # Uninitialized time state variable
+  timer tick(0)      # Units missing but not required
   timer tock(1 sec)  # Implicit type time
-  timer toe(z)     # Implicit type time
-  state baz = p    # Implicit type int[]
+  timer toe(z)       # Implicit type time
+  state baz = p      # Implicit type int[]
   state period = z   # Implicit type time
   state bar(1 msec, 2 msec, 3 msec)  # list of time values
   state notype(1, 2, 3, 4)
diff --git a/test/Python/src/federated/DistributedCountDecentralizedLate.lf b/test/Python/src/federated/DistributedCountDecentralizedLate.lf
index 4029dcee5b..1a0f47febd 100644
--- a/test/Python/src/federated/DistributedCountDecentralizedLate.lf
+++ b/test/Python/src/federated/DistributedCountDecentralizedLate.lf
@@ -14,11 +14,11 @@ import Count from "../lib/Count.lf"
 
 reactor Print {
   preamble {= import sys =}
-  input in_       # STP ()
+  input in_           # STP ()
   state success = 0   # STP(in, 30 msec);
   state success_stp_violation = 0
   timer t(0, 1 msec)  # Force a timer to be invoke periodically
-  state c = 0     # to ensure logical time will advance in the absence of incoming messages.
+  state c = 0         # to ensure logical time will advance in the absence of incoming messages.
 
   reaction(in_) {=
     current_tag = lf.tag()
diff --git a/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf b/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf
index 39c5747074..6c1ec4828e 100644
--- a/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf
+++ b/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf
@@ -24,10 +24,10 @@ import Count from "../lib/Count.lf"
 
 reactor ImportantActuator {
   input inp
-  state success = 0  # Count messages that arrive without STP violation.
+  state success = 0    # Count messages that arrive without STP violation.
   state success_stp_violation = 0
   timer t(0, 10 usec)  # Force a timer to be invoked periodically
-  state c = 0      # to ensure logical time will advance in the absence of incoming messages.
+  state c = 0          # to ensure logical time will advance in the absence of incoming messages.
 
   reaction(inp) {=
     current_tag = lf.tag()
@@ -73,7 +73,7 @@ reactor Print {
 reactor Receiver {
   input inp
   timer t(0, 10 msec)  # Force a timer to be invoke periodically
-  state c = 0      # to ensure logical time will advance in the absence of incoming messages.
+  state c = 0          # to ensure logical time will advance in the absence of incoming messages.
   p = new Print()
   a = new ImportantActuator()
 
diff --git a/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf b/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf
index fb60a67668..ab02b16187 100644
--- a/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf
+++ b/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf
@@ -17,10 +17,10 @@ import Print from "DistributedCountDecentralizedLateDownstream.lf"
 
 reactor ImportantActuator {
   input inp
-  state success = 0  # Count messages that arrive without STP violation.
+  state success = 0    # Count messages that arrive without STP violation.
   state success_stp_violation = 0
   timer t(0, 10 usec)  # Force a timer to be invoked periodically
-  state c = 0      # to ensure logical time will advance in the absence of incoming messages.
+  state c = 0          # to ensure logical time will advance in the absence of incoming messages.
 
   reaction(inp) {=
     current_tag = lf.tag()
@@ -56,7 +56,7 @@ reactor ImportantActuator {
 reactor Receiver {
   input inp
   timer t(0, 10 msec)  # Force a timer to be invoke periodically
-  state c = 0      # to ensure logical time will advance in the absence of incoming messages.
+  state c = 0          # to ensure logical time will advance in the absence of incoming messages.
   p = new Print()
   a = new ImportantActuator()
   inp -> p.inp
diff --git a/test/Python/src/modal_models/ConvertCaseTest.lf b/test/Python/src/modal_models/ConvertCaseTest.lf
index f3f60af747..f063da7e34 100644
--- a/test/Python/src/modal_models/ConvertCaseTest.lf
+++ b/test/Python/src/modal_models/ConvertCaseTest.lf
@@ -115,7 +115,5 @@ main reactor {
 
   reaction(reset_processor.converted) {= print(f"Reset: {reset_processor.converted.value}") =}
 
-  reaction(history_processor.converted) {=
-    print(f"History: {history_processor.converted.value}")
-  =}
+  reaction(history_processor.converted) {= print(f"History: {history_processor.converted.value}") =}
 }
diff --git a/test/Python/src/modal_models/MultipleOutputFeeder_2Connections.lf b/test/Python/src/modal_models/MultipleOutputFeeder_2Connections.lf
index 6b38c0f136..47e9c0b783 100644
--- a/test/Python/src/modal_models/MultipleOutputFeeder_2Connections.lf
+++ b/test/Python/src/modal_models/MultipleOutputFeeder_2Connections.lf
@@ -68,5 +68,5 @@ main reactor {
 
   reaction(stepper) -> modal.next {= modal.next.set(True) =}  # Trigger mode change
 
-  reaction(modal.count) {= print(modal.count.value) =}    # Print
+  reaction(modal.count) {= print(modal.count.value) =}        # Print
 }
diff --git a/test/Python/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf b/test/Python/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf
index fc5c7e9a56..5d77127f86 100644
--- a/test/Python/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf
+++ b/test/Python/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf
@@ -69,5 +69,5 @@ main reactor {
 
   reaction(stepper) -> modal.next {= modal.next.set(True) =}  # Trigger mode change
 
-  reaction(modal.count) {= print(modal.count.value) =}    # Print
+  reaction(modal.count) {= print(modal.count.value) =}        # Print
 }
diff --git a/test/TypeScript/src/NativeListsAndTimes.lf b/test/TypeScript/src/NativeListsAndTimes.lf
index 72756b5fc2..95cf9e741d 100644
--- a/test/TypeScript/src/NativeListsAndTimes.lf
+++ b/test/TypeScript/src/NativeListsAndTimes.lf
@@ -3,8 +3,8 @@ target TypeScript
 // This test passes if it is successfully compiled into valid target code.
 main reactor(
     x: number = 0,
-    y: time = 0,         // Units are missing but not required
-    z = 1 msec,        // Type is missing but not required
+    y: time = 0,               // Units are missing but not required
+    z = 1 msec,                // Type is missing but not required
     p: number[](1, 2, 3, 4),   // List of integers
     q: TimeValue[](1 msec, 2 msec, 3 msec),  // list of time values
     // List of time values
@@ -12,11 +12,11 @@ main reactor(
   state s: time = y  // Reference to explicitly typed time parameter
   state t: time = z  // Reference to implicitly typed time parameter
   state v: boolean   // Uninitialized boolean state variable
-  state w: time    // Uninitialized time state variable
-  timer tick(0)    // Units missing but not required
+  state w: time      // Uninitialized time state variable
+  timer tick(0)      // Units missing but not required
   timer tock(1 sec)  // Implicit type time
-  timer toe(z)     // Implicit type time
-  state baz = p    // Implicit type int[]
+  timer toe(z)       // Implicit type time
+  state baz = p      // Implicit type int[]
   state period = z   // Implicit type time
 
   reaction(tick) {=
diff --git a/test/TypeScript/src/federated/HelloDistributed.lf b/test/TypeScript/src/federated/HelloDistributed.lf
index 4ec0d020a2..4936cfae42 100644
--- a/test/TypeScript/src/federated/HelloDistributed.lf
+++ b/test/TypeScript/src/federated/HelloDistributed.lf
@@ -40,9 +40,9 @@ reactor Destination {
 }
 
 federated reactor HelloDistributed at localhost {
-  s = new Source()     // Reactor s is in federate Source
+  s = new Source()       // Reactor s is in federate Source
   d = new Destination()  // Reactor d is in federate Destination
-  s.out -> d.inp     // This version preserves the timestamp.
+  s.out -> d.inp         // This version preserves the timestamp.
 
   reaction(startup) {= console.log("Printing something in top-level federated reactor."); =}
 }

From 300fb84a9ff019091d1b59c96f2ee284676530c2 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 20 Jun 2023 15:16:25 -0700
Subject: [PATCH 0443/1114] Fix single-line comments.

---
 core/src/main/java/org/lflang/ast/FormattingUtil.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/FormattingUtil.java b/core/src/main/java/org/lflang/ast/FormattingUtil.java
index 0f28a8dca4..cb20df533f 100644
--- a/core/src/main/java/org/lflang/ast/FormattingUtil.java
+++ b/core/src/main/java/org/lflang/ast/FormattingUtil.java
@@ -127,12 +127,13 @@ static String lineWrapComments(List<String> comments, int width, String singleLi
   }
   /** Wrap lines. Do not merge lines that start with weird characters. */
   private static String lineWrapComment(String comment, int width, String singleLineCommentPrefix) {
-    if (!MULTILINE_COMMENT.matcher(comment).matches()) return comment;
+    comment =
+            comment
+                    .strip()
+                    .replaceAll("^/?((\\*|//|#)\\s*)+", "");
+    if (!MULTILINE_COMMENT.matcher(comment).matches()) return comment.isBlank() ? "" : singleLineCommentPrefix + " " + comment;
     width = Math.max(width, MINIMUM_COMMENT_WIDTH_IN_COLUMNS);
-    var stripped =
-        comment
-            .strip()
-            .replaceAll("^/?((\\*|//|#)\\s*)+", "")
+    var stripped = comment
             .replaceAll("\\s*\\*/$", "")
             .replaceAll("(?<=(\\r\\n|\\r|\\n))\\h*(\\*|//|#)\\h?(\\h*)", "$3");
     var preformatted = false;

From ff2f5e1d023f15937885a1fdddcf746853f798b0 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 20 Jun 2023 17:31:21 -0700
Subject: [PATCH 0444/1114] Try again to fix single-line comments.

---
 .../java/org/lflang/ast/FormattingUtil.java   | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/FormattingUtil.java b/core/src/main/java/org/lflang/ast/FormattingUtil.java
index cb20df533f..27b19dabb2 100644
--- a/core/src/main/java/org/lflang/ast/FormattingUtil.java
+++ b/core/src/main/java/org/lflang/ast/FormattingUtil.java
@@ -127,15 +127,20 @@ static String lineWrapComments(List<String> comments, int width, String singleLi
   }
   /** Wrap lines. Do not merge lines that start with weird characters. */
   private static String lineWrapComment(String comment, int width, String singleLineCommentPrefix) {
-    comment =
-            comment
-                    .strip()
-                    .replaceAll("^/?((\\*|//|#)\\s*)+", "");
-    if (!MULTILINE_COMMENT.matcher(comment).matches()) return comment.isBlank() ? "" : singleLineCommentPrefix + " " + comment;
+    var multiline = MULTILINE_COMMENT.matcher(comment).matches();
+    comment = comment.strip().replaceAll("(^|(?<=\n))\\h*(/\\*+|//|#)", "");
+    if (!multiline)
+      return comment.isBlank()
+          ? ""
+          : comment
+              .replaceAll("(^|(?<=\n))\s*(?=\\w)", " ")
+              .replaceAll("^|(?<=\n)", singleLineCommentPrefix);
     width = Math.max(width, MINIMUM_COMMENT_WIDTH_IN_COLUMNS);
-    var stripped = comment
+    var stripped =
+        comment
             .replaceAll("\\s*\\*/$", "")
-            .replaceAll("(?<=(\\r\\n|\\r|\\n))\\h*(\\*|//|#)\\h?(\\h*)", "$3");
+            .replaceAll("(?<=(\\r\\n|\\r|\\n))\\h*(\\*|//|#)\\h?(\\h*)", "$3")
+            .strip();
     var preformatted = false;
     StringBuilder result = new StringBuilder(stripped.length() * 2);
     for (var part : stripped.split("```")) {

From 0979e6485e5a7d915394705fd3fcd4c510efda3e Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 20 Jun 2023 23:29:55 -0700
Subject: [PATCH 0445/1114] Do not blindly process unparsed strings!

It is a little embarassing that I almost pushed code that did this to
master. Let us not do that.
---
 .../java/org/lflang/ast/MalleableString.java  | 39 +++++++++++--------
 core/src/main/java/org/lflang/ast/ToLf.java   | 23 +++++------
 .../lflang/tests/compiler/RoundTripTests.java |  2 +-
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/MalleableString.java b/core/src/main/java/org/lflang/ast/MalleableString.java
index a20727a94b..968d9e1fcb 100644
--- a/core/src/main/java/org/lflang/ast/MalleableString.java
+++ b/core/src/main/java/org/lflang/ast/MalleableString.java
@@ -10,6 +10,7 @@
 import java.util.function.BinaryOperator;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.function.ToLongFunction;
 import java.util.stream.Collector;
@@ -91,8 +92,13 @@ public static MalleableString anyOf(Object... possibilities) {
     return new Leaf(objectArrayToString(possibilities));
   }
 
-  /** Apply the given transformation to leaf strings of this. */
-  public abstract MalleableString transform(Function<String, String> transformation);
+  /**
+   * Apply the given constraint to leaf strings of this.
+   *
+   * <p>This is done on a best-effort basis in the sense that if no options satisfy the constraint,
+   * the constraint is not applied.
+   */
+  public abstract MalleableString constrain(Predicate<String> constraint);
 
   private static String[] objectArrayToString(Object[] objects) {
     String[] ret = new String[objects.length];
@@ -411,9 +417,9 @@ private boolean optimizeChildren(
     }
 
     @Override
-    public MalleableString transform(Function<String, String> transformation) {
+    public MalleableString constrain(Predicate<String> constraint) {
       for (var component : components) {
-        component.transform(transformation);
+        component.constrain(constraint);
       }
       return this;
     }
@@ -481,8 +487,8 @@ public RenderResult render(
     }
 
     @Override
-    public MalleableString transform(Function<String, String> transformation) {
-      nested.transform(transformation);
+    public MalleableString constrain(Predicate<String> constraint) {
+      nested.constrain(constraint);
       return this;
     }
   }
@@ -568,9 +574,9 @@ public RenderResult render(
     }
 
     @Override
-    public MalleableString transform(Function<String, String> transformation) {
+    public MalleableString constrain(Predicate<String> constraint) {
       for (var possibility : possibilities) {
-        possibility.transform(transformation);
+        possibility.constrain(constraint);
       }
       return this;
     }
@@ -578,24 +584,24 @@ public MalleableString transform(Function<String, String> transformation) {
 
   /** A {@code Leaf} can be represented by multiple possible {@code String}s. */
   private static final class Leaf extends MalleableStringWithAlternatives<String> {
-    private final String[] possibilities;
+    private List<String> possibilities;
 
     private Leaf(String[] possibilities) {
-      this.possibilities = possibilities;
+      this.possibilities = List.of(possibilities);
     }
 
     private Leaf(String possibility) {
-      this.possibilities = new String[] {possibility};
+      this.possibilities = List.of(possibility);
     }
 
     @Override
     protected List<String> getPossibilities() {
-      return Arrays.asList(possibilities);
+      return possibilities;
     }
 
     @Override
     public boolean isEmpty() {
-      return Arrays.stream(possibilities).allMatch(String::isEmpty);
+      return possibilities.stream().allMatch(String::isEmpty);
     }
 
     @Override
@@ -613,10 +619,9 @@ public RenderResult render(
     }
 
     @Override
-    public MalleableString transform(Function<String, String> transformation) {
-      for (int i = 0; i < possibilities.length; i++) {
-        possibilities[i] = transformation.apply(possibilities[i]);
-      }
+    public MalleableString constrain(Predicate<String> constraint) {
+      var newPossibilities = possibilities.stream().filter(constraint).toList();
+      if (!newPossibilities.isEmpty()) possibilities = newPossibilities;
       return this;
     }
   }
diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index cee00f254e..bb73b8e4f4 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -490,7 +490,7 @@ public MalleableString caseStateVar(StateVar object) {
     msb.append("state ").append(object.getName());
     msb.append(typeAnnotationFor(object.getType()));
     if (object.getInit() != null)
-      msb.append(doSwitch(object.getInit()).transform(ToLf::whitespaceInitializer));
+      msb.append(doSwitch(object.getInit()).constrain(it -> it.contains(" = ")));
 
     return msb.get();
   }
@@ -888,7 +888,7 @@ public MalleableString caseAssignment(Assignment object) {
     Builder msb = new Builder();
     msb.append(object.getLhs().getName());
     var rhs = doSwitch(object.getRhs());
-    msb.append(rhs.transform(conditionalWhitespaceInitializer(MalleableString.anyOf(""), rhs)));
+    msb.append(rhs.constrain(conditionalWhitespaceInitializer(MalleableString.anyOf(""), rhs)));
     return msb.get();
   }
 
@@ -906,15 +906,16 @@ public MalleableString caseInitializer(Initializer init) {
     if (init == null) {
       return MalleableString.anyOf("");
     }
+    var builder = new Builder().append("=", " = ");
     if (shouldOutputAsAssignment(init)) {
       Expression expr = ASTUtils.asSingleExpr(init);
       Objects.requireNonNull(expr);
-      return new Builder().append("=").append(doSwitch(expr)).get();
+      return builder.append(doSwitch(expr)).get();
     }
     if (ASTUtils.getTarget(init) == Target.C) {
       // This turns C array initializers into a braced expression.
       // C++ variants are not converted.
-      return new Builder().append("=").append(bracedListExpression(init.getExprs())).get();
+      return builder.append(bracedListExpression(init.getExprs())).get();
     }
     String prefix;
     String suffix;
@@ -942,7 +943,7 @@ public MalleableString caseParameter(Parameter object) {
     return builder
         .append(object.getName())
         .append(annotation)
-        .append(init.transform(conditionalWhitespaceInitializer(annotation, init)))
+        .append(init.constrain(conditionalWhitespaceInitializer(annotation, init)))
         .get();
   }
 
@@ -950,17 +951,11 @@ public MalleableString caseParameter(Parameter object) {
    * Ensure that equals signs are surrounded by spaces if neither the text before nor the text after
    * has spaces and is not a string.
    */
-  private static Function<String, String> conditionalWhitespaceInitializer(
+  private static Predicate<String> conditionalWhitespaceInitializer(
       MalleableString before, MalleableString after) {
     return it ->
-        before.isEmpty() && !(after.toString().contains(" ") || after.toString().startsWith("\""))
-            ? it
-            : whitespaceInitializer(it);
-  }
-
-  /** Ensure that equals signs are surrounded by spaces. */
-  private static String whitespaceInitializer(String s) {
-    return s.replaceAll("(?<! )=(?! )", " = ");
+        (before.isEmpty() && !(after.toString().contains(" ") || after.toString().startsWith("\"")))
+            != it.contains(" = ");
   }
 
   @Override
diff --git a/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java b/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
index 7df80e7e3c..9dc4957f2c 100644
--- a/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
@@ -64,7 +64,7 @@ private static void run(LfParsingHelper parser, Path file) {
     final String squishedTestCase = FormattingUtil.render(originalModel, smallLineLength);
     final Model resultingModel =
         parser.parseSourceAsIfInDirectory(file.getParent(), squishedTestCase);
-    LfParsingTestHelper.checkValid("file in " + file.getParent(), resultingModel);
+    LfParsingTestHelper.checkValid(file.toString(), resultingModel);
 
     assertThat(resultingModel.eResource().getErrors(), equalTo(emptyList()));
     Assertions.assertTrue(

From 15287b76c92530e3b766e493a9f0161ac491996f Mon Sep 17 00:00:00 2001
From: revol-xut <revol-xut@protonmail.com>
Date: Wed, 21 Jun 2023 11:11:15 +0200
Subject: [PATCH 0446/1114] fixing code generation

---
 .../generator/cpp/CppAssembleMethodGenerator.kt      |  8 ++++----
 .../lflang/generator/cpp/CppConnectionGenerator.kt   | 12 ++++++------
 .../org/lflang/generator/cpp/CppReactorGenerator.kt  |  5 -----
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
index 93f70ef548..460bdf8f9e 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
@@ -104,7 +104,7 @@ class CppAssembleMethodGenerator(private val reactor: Reactor) {
         get() = if (delay != null) "${delay.toCppTime()}" else "0s"
 
     private val Connection.properties: String
-        get() = "ConnectionProperties{$cppType, $cppDelay, nullptr}"
+        get() = "reactor::ConnectionProperties{$cppType, $cppDelay, nullptr}"
 
     private fun declareTrigger(reaction: Reaction, trigger: TriggerRef): String =
         if (trigger is VarRef && trigger.variable is Port) {
@@ -160,7 +160,7 @@ class CppAssembleMethodGenerator(private val reactor: Reactor) {
             val rightPort = c.rightPorts[0]
 
             """
-                left.environment()->draw_connection(${leftPort.name}, ${rightPort.name}, ${c.properties})
+                this->environment()->draw_connection(${leftPort.name}, ${rightPort.name}, ${c.properties});
             """.trimIndent()
         }
 
@@ -183,7 +183,7 @@ class CppAssembleMethodGenerator(private val reactor: Reactor) {
         // if the connection is an interleaved connection, than we change the order on the right side and iterate over ports before banks.
         return with(PrependOperator) {
             """
-                |// connection $idx
+                |// connection $idx REEEEEEEEE 
                 |std::vector<$portType> __lf_left_ports_$idx;
             ${" |"..c.leftPorts.joinWithLn { addAllPortsToVector(it, "__lf_left_ports_$idx") }}
                 |std::vector<$portType> __lf_right_ports_$idx;
@@ -199,7 +199,7 @@ class CppAssembleMethodGenerator(private val reactor: Reactor) {
     private fun Connection.getConnectionLambda(portType: String): String {
         return """
             [this](const BasePort& left, const BasePort& right, std::size_t idx) {
-                left.environment()->draw_connection(left, right, $properties)
+                left.environment()->draw_connection(left, right, $properties);
             }
         """.trimIndent()
     }
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionGenerator.kt
index a88cd20b3f..50d67ef097 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionGenerator.kt
@@ -28,14 +28,14 @@ class CppConnectionGenerator(private val reactor: Reactor) {
                 val leftPort = leftPorts.first()
                 return when {
                     isEnclaveConnection -> when {
-                        isPhysical    -> "ConnectionType::PhysicalEnclaved"
-                        delay != null -> "ConnectionType::DelayedEnclaved"
-                        else          -> "ConnectionType::Enclaved"
+                        isPhysical    -> "reactor::ConnectionType::PhysicalEnclaved"
+                        delay != null -> "reactor::ConnectionType::DelayedEnclaved"
+                        else          -> "reactor::ConnectionType::Enclaved"
                     }
 
-                    isPhysical          -> "ConnectionType::Physical"
-                    delay != null       -> "ConnectionType::Delayed"
-                    else                -> "ConnectionType::Normal"
+                    isPhysical          -> "reactor::ConnectionType::Physical"
+                    delay != null       -> "reactor::ConnectionType::Delayed"
+                    else                -> "reactor::ConnectionType::Normal"
                 }
             }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppReactorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppReactorGenerator.kt
index 78df4519f2..7408098047 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppReactorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppReactorGenerator.kt
@@ -56,7 +56,6 @@ class CppReactorGenerator(private val reactor: Reactor, fileConfig: CppFileConfi
     private val ports = CppPortGenerator(reactor)
     private val reactions = CppReactionGenerator(reactor, ports, instances)
     private val assemble = CppAssembleMethodGenerator(reactor)
-    private val connections = CppConnectionGenerator(reactor)
 
     private fun publicPreamble() =
         reactor.preambles.filter { it.isPublic }
@@ -122,9 +121,6 @@ class CppReactorGenerator(private val reactor: Reactor, fileConfig: CppFileConfi
         ${" |  "..outerConstructorSignature(false)};
             |
             |  void assemble() override;
-            | 
-            | private:
-        ${" |  "..connections.generateDeclarations()}
             |};
             |
         ${" |"..if (reactor.isGeneric) """#include "$implHeaderFile"""" else ""}
@@ -188,7 +184,6 @@ class CppReactorGenerator(private val reactor: Reactor, fileConfig: CppFileConfi
             ${" |  "..timers.generateInitializers()}
             ${" |  "..actions.generateInitializers()}
             ${" |  "..reactions.generateReactionViewInitializers()}
-            ${" |  "..connections.generateInitializers()}
                 |{
             ${" |  "..ports.generateConstructorInitializers()}
             ${" |  "..instances.generateConstructorInitializers()}

From 37fdbfeb58de11755232739acaef4916fd43037f Mon Sep 17 00:00:00 2001
From: revol-xut <revol-xut@protonmail.com>
Date: Wed, 21 Jun 2023 11:12:13 +0200
Subject: [PATCH 0447/1114] updating reactor-cpp

---
 core/src/main/resources/lib/cpp/reactor-cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/cpp/reactor-cpp b/core/src/main/resources/lib/cpp/reactor-cpp
index b607f1f640..f6551c8a12 160000
--- a/core/src/main/resources/lib/cpp/reactor-cpp
+++ b/core/src/main/resources/lib/cpp/reactor-cpp
@@ -1 +1 @@
-Subproject commit b607f1f64083ab531e7a676b29de75f076aa1cde
+Subproject commit f6551c8a12dd8870e8bf065b192ba8f2ada35ef2

From 684e937068eaba45f56ad26b032cbb36346cb667 Mon Sep 17 00:00:00 2001
From: revol-xut <revol-xut@protonmail.com>
Date: Wed, 21 Jun 2023 11:15:12 +0200
Subject: [PATCH 0448/1114] removing debug comment

---
 .../org/lflang/generator/cpp/CppAssembleMethodGenerator.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
index 460bdf8f9e..e28aa5206a 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
@@ -183,7 +183,7 @@ class CppAssembleMethodGenerator(private val reactor: Reactor) {
         // if the connection is an interleaved connection, than we change the order on the right side and iterate over ports before banks.
         return with(PrependOperator) {
             """
-                |// connection $idx REEEEEEEEE 
+                |// connection $idx
                 |std::vector<$portType> __lf_left_ports_$idx;
             ${" |"..c.leftPorts.joinWithLn { addAllPortsToVector(it, "__lf_left_ports_$idx") }}
                 |std::vector<$portType> __lf_right_ports_$idx;

From 7a48439fbab2c2943d550d64bb80ab8464d87515 Mon Sep 17 00:00:00 2001
From: Christian Menard <Christian.Menard@tu-dresden.de>
Date: Wed, 21 Jun 2023 12:31:47 +0200
Subject: [PATCH 0449/1114] Fix nightly build

---
 .github/workflows/build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7b0dd9ff6e..7d19127c9f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,11 +33,11 @@ jobs:
       - name: Build and package lf cli tools (nightly build)
         # We assume, that the nightly build only runs once on Ubuntu
         run: |
-          ./gradlew build -Pnightly -PtargetOS=Linux -PtargetPlatform=x86_64
-          ./gradlew assemble -Pnightly -PtargetOS=Linux -PtargetPlatform=aarch64
-          ./gradlew assemble -Pnightly -PtargetOS=MacOS -PtargetPlatform=x86_64
-          ./gradlew assemble -Pnightly -PtargetOS=MacOS -PtargetPlatform=aarch64
-          ./gradlew assemble -Pnightly -PtargetOS=Windows -PtargetPlatform=x86_64
+          ./gradlew build -Pnightly -PtargetOS=Linux -PtargetArch=x86_64
+          ./gradlew assemble -Pnightly -PtargetOS=Linux -PtargetArch=aarch64
+          ./gradlew assemble -Pnightly -PtargetOS=MacOS -PtargetArch=x86_64
+          ./gradlew assemble -Pnightly -PtargetOS=MacOS -PtargetArch=aarch64
+          ./gradlew assemble -Pnightly -PtargetOS=Windows -PtargetArch=x86_64
         shell: bash
         if: ${{ inputs.nightly == true }}
       - name: Build and package lf cli tools (regular build)

From b6040a5c5a62b8c34d26344cbab49faf289488c5 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 21 Jun 2023 12:47:33 +0200
Subject: [PATCH 0450/1114] make sure that distribution scripts are always up
 to date

---
 .../src/main/groovy/org.lflang.distribution-conventions.gradle  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle b/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle
index 58e1b07f37..f214bc51bd 100644
--- a/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle
@@ -18,6 +18,8 @@ tasks.withType(Jar) {
 }
 
 tasks.withType(CreateStartScripts) {
+    // Make sure to always run this task, because the platform configuration might have changed
+    outputs.upToDateWhen { false }
     doLast {
         if (platform.isWindows) {
             delete unixScript

From 97cd0f663cb06a111bf69475ef9f476d22b7c1f9 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 21 Jun 2023 12:57:34 +0200
Subject: [PATCH 0451/1114] use the same timestamp for all nightly build
 artifactsa

---
 .github/workflows/build.yml | 11 ++++++-----
 build.gradle                |  4 +---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7d19127c9f..d89b357149 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,11 +33,12 @@ jobs:
       - name: Build and package lf cli tools (nightly build)
         # We assume, that the nightly build only runs once on Ubuntu
         run: |
-          ./gradlew build -Pnightly -PtargetOS=Linux -PtargetArch=x86_64
-          ./gradlew assemble -Pnightly -PtargetOS=Linux -PtargetArch=aarch64
-          ./gradlew assemble -Pnightly -PtargetOS=MacOS -PtargetArch=x86_64
-          ./gradlew assemble -Pnightly -PtargetOS=MacOS -PtargetArch=aarch64
-          ./gradlew assemble -Pnightly -PtargetOS=Windows -PtargetArch=x86_64
+          export TIMESTAMP="$(date +'%Y%m%d%H%M%S')"
+          ./gradlew build -Pnightly=$TIMESTAMP -PtargetOS=Linux -PtargetArch=x86_64
+          ./gradlew assemble -Pnightly=$TIMESTAMP -PtargetOS=Linux -PtargetArch=aarch64
+          ./gradlew assemble -Pnightly=$TIMESTAMP -PtargetOS=MacOS -PtargetArch=x86_64
+          ./gradlew assemble -Pnightly=$TIMESTAMP -PtargetOS=MacOS -PtargetArch=aarch64
+          ./gradlew assemble -Pnightly=$TIMESTAMP -PtargetOS=Windows -PtargetArch=x86_64
         shell: bash
         if: ${{ inputs.nightly == true }}
       - name: Build and package lf cli tools (regular build)
diff --git a/build.gradle b/build.gradle
index 81b5ae81aa..95c1f8411a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,9 +36,7 @@ distributions {
     clitools {
         distributionBaseName = "lf-cli"
         if (project.hasProperty('nightly')) {
-          def date = new Date()
-          def formattedDate = date.format('yyyyMMddHHmmss')
-          distributionClassifier = 'nightly-' + formattedDate + '-' + platform.os + '-' + platform.arch
+          distributionClassifier = 'nightly-' + project.nightly + platform.os + '-' + platform.arch
         } else if (!platform.isNative) {
             distributionClassifier = platform.os + '-' + platform.arch
         }

From bfe8c767f4ac814796e4609cc991737ed6705131 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 21 Jun 2023 13:06:16 +0200
Subject: [PATCH 0452/1114] add hyphen

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 95c1f8411a..5abf2056b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,7 @@ distributions {
     clitools {
         distributionBaseName = "lf-cli"
         if (project.hasProperty('nightly')) {
-          distributionClassifier = 'nightly-' + project.nightly + platform.os + '-' + platform.arch
+          distributionClassifier = 'nightly-' + project.nightly + '-' + platform.os + '-' + platform.arch
         } else if (!platform.isNative) {
             distributionClassifier = platform.os + '-' + platform.arch
         }

From d5e7fdc409c199825f6e8c59d51222f5c86ae69c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Wed, 21 Jun 2023 13:29:48 +0200
Subject: [PATCH 0453/1114] Fix rust line numbers

---
 .../main/kotlin/org/lflang/generator/rust/RustValidator.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt
index 5ee732acd0..9b4f6de19b 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustValidator.kt
@@ -105,9 +105,9 @@ class RustValidator(
         @JsonProperty("expansion") val expansion: RustSpanExpansion?
     ) {
         val start: Position
-            get() = Position.fromZeroBased(lineStart, columnStart)
+            get() = Position.fromOneBased(lineStart, columnStart)
         val end: Position
-            get() = Position.fromZeroBased(lineEnd, columnEnd)
+            get() = Position.fromOneBased(lineEnd, columnEnd)
         val range: Range get() = Range(start, end)
     }
     private data class RustSpanExpansion(

From 4fa0c32f0152d95c4313e4e3b983642897e17700 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 22 Jun 2023 09:15:14 +0200
Subject: [PATCH 0454/1114] include lfd in the test coverage report

---
 .github/workflows/build.yml | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d89b357149..c708806193 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,37 +30,15 @@ jobs:
           fetch-depth: 0
       - name: Prepare build environment
         uses: ./.github/actions/prepare-build-env
-      - name: Build and package lf cli tools (nightly build)
-        # We assume, that the nightly build only runs once on Ubuntu
-        run: |
-          export TIMESTAMP="$(date +'%Y%m%d%H%M%S')"
-          ./gradlew build -Pnightly=$TIMESTAMP -PtargetOS=Linux -PtargetArch=x86_64
-          ./gradlew assemble -Pnightly=$TIMESTAMP -PtargetOS=Linux -PtargetArch=aarch64
-          ./gradlew assemble -Pnightly=$TIMESTAMP -PtargetOS=MacOS -PtargetArch=x86_64
-          ./gradlew assemble -Pnightly=$TIMESTAMP -PtargetOS=MacOS -PtargetArch=aarch64
-          ./gradlew assemble -Pnightly=$TIMESTAMP -PtargetOS=Windows -PtargetArch=x86_64
-        shell: bash
-        if: ${{ inputs.nightly == true }}
       - name: Build and package lf cli tools (regular build)
         run: ./gradlew build
         shell: bash
-        if: ${{ inputs.nightly != true }}
-      - name: Deploy nightly release
-        uses: marvinpinto/action-automatic-releases@latest
-        with:
-          repo_token: "${{ secrets.envPAT }}"
-          automatic_release_tag: 'nightly'
-          prerelease: true
-          title: "Lingua Franca Nightly"
-          files: |
-            build/distributions/*
-        if: ${{ inputs.nightly == true }}
       - name: Collect code coverage
         run: ./gradlew jacocoTestReport
         if: ${{ runner.os == 'Linux' }}
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/xml/jacoco,cli/lfc/build/reports/xml/jacoco,cli/lff/build/reports/xml/jacoco
+          files: core/build/reports/xml/jacoco,cli/lfc/build/reports/xml/jacoco,cli/lff/build/reports/xml/jacoco,cli/lfd/build/reports/xml/jacoco
           fail_ci_if_error: false
           verbose: true

From 1e28d32df10bffdfc8f1fc33473dcac336e5ab28 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 22 Jun 2023 09:16:00 +0200
Subject: [PATCH 0455/1114] separate build and nightly build workflows

---
 .github/workflows/build.yml         |  7 ------
 .github/workflows/nightly-build.yml | 34 ++++++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c708806193..f156cba902 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,17 +3,10 @@ name: Build toolchain
 on:
   workflow_call:
     inputs:
-      nightly:
-        required: false
-        type: boolean
-        default: false
       all-platforms:
         required: false
         default: false
         type: boolean
-    secrets:
-      envPAT:
-        required: false
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 9ffb82c581..44232bd948 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -7,9 +7,31 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
-    uses: ./.github/workflows/build.yml
-    with:
-      nightly: true
-    secrets:
-      envPAT: ${{ secrets.NIGHTLY_BUILD }}
+  nightly-build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out lingua-franca repository
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          fetch-depth: 0
+      - name: Prepare build environment
+        uses: ./.github/actions/prepare-build-env
+      - name: Build and package lf cli tools (nightly build)
+        shell: bash
+        run: |
+          export TIMESTAMP="$(date +'%Y%m%d%H%M%S')"
+          ./gradlew build -Pnightly=$TIMESTAMP -PtargetOS=Linux -PtargetArch=x86_64
+          ./gradlew assemble -Pnightly=$TIMESTAMP -PtargetOS=Linux -PtargetArch=aarch64
+          ./gradlew assemble -Pnightly=$TIMESTAMP -PtargetOS=MacOS -PtargetArch=x86_64
+          ./gradlew assemble -Pnightly=$TIMESTAMP -PtargetOS=MacOS -PtargetArch=aarch64
+          ./gradlew assemble -Pnightly=$TIMESTAMP -PtargetOS=Windows -PtargetArch=x86_64
+      - name: Deploy nightly release
+        uses: marvinpinto/action-automatic-releases@latest
+        with:
+          repo_token: "${{ secrets.NIGHTLY_BUILD }}"
+          automatic_release_tag: 'nightly'
+          prerelease: true
+          title: "Lingua Franca Nightly"
+          files: |
+            build/distributions/*

From be77b455770d7f669dfb96d3c234a486969fe6a7 Mon Sep 17 00:00:00 2001
From: "Shaokai (Jerry) Lin" <shaokai@berkeley.edu>
Date: Thu, 22 Jun 2023 16:22:34 +0800
Subject: [PATCH 0456/1114] Apply suggestions from @petervdonovan

Co-authored-by: Peter Donovan <33707478+petervdonovan@users.noreply.github.com>
---
 .github/workflows/only-c.yml                           |  1 -
 .../main/java/org/lflang/analyses/cast/AstUtils.java   | 10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/only-c.yml b/.github/workflows/only-c.yml
index bbbc48db3b..e3208bb3fe 100644
--- a/.github/workflows/only-c.yml
+++ b/.github/workflows/only-c.yml
@@ -44,5 +44,4 @@ jobs:
 
   # Run the Uclid-based LF Verifier tests.
   uclid:
-    if: ${{ inputs.all || github.event.pull_request.draft }}
     uses: ./.github/workflows/uclid-verifier-c-tests.yml
diff --git a/core/src/main/java/org/lflang/analyses/cast/AstUtils.java b/core/src/main/java/org/lflang/analyses/cast/AstUtils.java
index 1b87562cb4..bf6a6275d9 100644
--- a/core/src/main/java/org/lflang/analyses/cast/AstUtils.java
+++ b/core/src/main/java/org/lflang/analyses/cast/AstUtils.java
@@ -34,7 +34,7 @@ public static CAst.AstNode takeDisjunction(List<CAst.AstNode> conditions) {
     } else if (conditions.size() == 1) {
       return conditions.get(0);
     } else {
-      // Take the conjunction of all the conditions.
+      // Take the disjunction of all the conditions.
       CAst.LogicalOrNode top = new CAst.LogicalOrNode();
       CAst.LogicalOrNode cur = top;
       for (int i = 0; i < conditions.size() - 1; i++) {
@@ -50,9 +50,11 @@ public static CAst.AstNode takeDisjunction(List<CAst.AstNode> conditions) {
     }
   }
 
-  // A handy function for debugging ASTs.
-  // It prints the stack trace of the visitor functions
-  // and shows the text matched by the ANTLR rules.
+  /**
+   * A handy function for debugging ASTs.
+   * It prints the stack trace of the visitor functions
+   * and shows the text matched by the ANTLR rules.
+   */
   public static void printStackTraceAndMatchedText(ParserRuleContext ctx) {
     System.out.println("========== AST DEBUG ==========");
 

From d4ed4d5020ed159eefefcb736320c6bc06d8bd92 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 22 Jun 2023 16:24:29 +0800
Subject: [PATCH 0457/1114] Apply more suggestions from @petervdonovan

---
 .github/workflows/uclid-verifier-c-tests.yml                    | 2 +-
 .../java/org/lflang/analyses/cast/IfNormalFormAstVisitor.java   | 1 -
 .../src/main/java/org/lflang/analyses/statespace/StateInfo.java | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/uclid-verifier-c-tests.yml b/.github/workflows/uclid-verifier-c-tests.yml
index 9e21f3b9e5..e17e152408 100644
--- a/.github/workflows/uclid-verifier-c-tests.yml
+++ b/.github/workflows/uclid-verifier-c-tests.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Check out lf-verifier-benchmarks repository
         uses: actions/checkout@v3
         with:
-          repository: lsk567/lf-verifier-benchmarks
+          repository: lf-lang/lf-verifier-benchmarks
           ref: main
           path: lf-verifier-benchmarks
       - name: Check out Uclid5 repository
diff --git a/core/src/main/java/org/lflang/analyses/cast/IfNormalFormAstVisitor.java b/core/src/main/java/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
index 180fe1f45f..a8ad9e8284 100644
--- a/core/src/main/java/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
+++ b/core/src/main/java/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
@@ -27,7 +27,6 @@ public class IfNormalFormAstVisitor extends CBaseAstVisitor<Void> {
   @Override
   public Void visitStatementSequenceNode(
       CAst.StatementSequenceNode node, List<CAst.AstNode> conditions) {
-    // Create a new StatementSequenceNode.
     for (CAst.AstNode child : node.children) {
       visit(child, conditions);
     }
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateInfo.java b/core/src/main/java/org/lflang/analyses/statespace/StateInfo.java
index 8226d784d7..89c3bd19de 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/StateInfo.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateInfo.java
@@ -1,9 +1,9 @@
-/** A class that represents information in a step in a counterexample trace */
 package org.lflang.analyses.statespace;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
+/** A class that represents information in a step in a counterexample trace */
 public class StateInfo {
 
   public ArrayList<String> reactions = new ArrayList<>();

From 6d92a9e103d21f09a0fbf9673c667796416e0c84 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 22 Jun 2023 16:29:13 +0800
Subject: [PATCH 0458/1114] Apply spotless

---
 core/src/main/java/org/lflang/analyses/cast/AstUtils.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/cast/AstUtils.java b/core/src/main/java/org/lflang/analyses/cast/AstUtils.java
index bf6a6275d9..65f1c28852 100644
--- a/core/src/main/java/org/lflang/analyses/cast/AstUtils.java
+++ b/core/src/main/java/org/lflang/analyses/cast/AstUtils.java
@@ -51,9 +51,8 @@ public static CAst.AstNode takeDisjunction(List<CAst.AstNode> conditions) {
   }
 
   /**
-   * A handy function for debugging ASTs.
-   * It prints the stack trace of the visitor functions
-   * and shows the text matched by the ANTLR rules.
+   * A handy function for debugging ASTs. It prints the stack trace of the visitor functions and
+   * shows the text matched by the ANTLR rules.
    */
   public static void printStackTraceAndMatchedText(ParserRuleContext ctx) {
     System.out.println("========== AST DEBUG ==========");

From 02b2bc66670329f0d30da2b674f88f411791463e Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 22 Jun 2023 21:48:57 +0800
Subject: [PATCH 0459/1114] Apply spotless

---
 core/src/main/java/org/lflang/generator/LFGenerator.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/LFGenerator.java b/core/src/main/java/org/lflang/generator/LFGenerator.java
index db06945633..024ca94ff7 100644
--- a/core/src/main/java/org/lflang/generator/LFGenerator.java
+++ b/core/src/main/java/org/lflang/generator/LFGenerator.java
@@ -2,7 +2,6 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Injector;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;

From 77b5aa16df3a08ab6d20542f4ce775da0343e43b Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 22 Jun 2023 22:13:38 +0800
Subject: [PATCH 0460/1114] Relocate doc comments

---
 .../main/java/org/lflang/analyses/statespace/Event.java   | 2 +-
 .../java/org/lflang/analyses/statespace/EventQueue.java   | 2 +-
 .../org/lflang/analyses/statespace/StateSpaceDiagram.java | 3 +--
 .../lflang/analyses/statespace/StateSpaceExplorer.java    | 2 +-
 .../org/lflang/analyses/statespace/StateSpaceNode.java    | 2 +-
 .../src/main/java/org/lflang/analyses/statespace/Tag.java | 8 ++++----
 .../main/java/org/lflang/analyses/uclid/UclidRunner.java  | 2 +-
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/statespace/Event.java b/core/src/main/java/org/lflang/analyses/statespace/Event.java
index ce96c878aa..b04b9861a0 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/Event.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/Event.java
@@ -1,8 +1,8 @@
-/** A node in the state space diagram representing a step in the execution of an LF program. */
 package org.lflang.analyses.statespace;
 
 import org.lflang.generator.TriggerInstance;
 
+/** A node in the state space diagram representing a step in the execution of an LF program. */
 public class Event implements Comparable<Event> {
 
   public TriggerInstance trigger;
diff --git a/core/src/main/java/org/lflang/analyses/statespace/EventQueue.java b/core/src/main/java/org/lflang/analyses/statespace/EventQueue.java
index 67cc485f68..b04339d465 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/EventQueue.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/EventQueue.java
@@ -1,8 +1,8 @@
-/** An event queue implementation that sorts events by time tag order */
 package org.lflang.analyses.statespace;
 
 import java.util.PriorityQueue;
 
+/** An event queue implementation that sorts events by time tag order */
 public class EventQueue extends PriorityQueue<Event> {
 
   /**
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java
index 82d46f0e4a..d4583a90ca 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java
@@ -1,4 +1,3 @@
-/** A directed graph representing the state space of an LF program. */
 package org.lflang.analyses.statespace;
 
 import java.util.List;
@@ -9,7 +8,7 @@
 import org.lflang.generator.ReactionInstance;
 import org.lflang.graph.DirectedGraph;
 
-// FIXME: Use a linkedlist instead.
+/** A directed graph representing the state space of an LF program. */
 public class StateSpaceDiagram extends DirectedGraph<StateSpaceNode> {
 
   /** The first node of the state space diagram. */
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
index 8e05b95cc2..ff0087fad6 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
@@ -1,4 +1,3 @@
-/** Explores the state space of an LF program. */
 package org.lflang.analyses.statespace;
 
 import java.util.ArrayList;
@@ -20,6 +19,7 @@
 import org.lflang.lf.Time;
 import org.lflang.lf.Variable;
 
+/** Explores the state space of an LF program. */
 public class StateSpaceExplorer {
 
   // Instantiate an empty state space diagram.
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java
index a2f0918b02..42fb1b043e 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java
@@ -1,4 +1,3 @@
-/** A node in the state space diagram representing a step in the execution of an LF program. */
 package org.lflang.analyses.statespace;
 
 import java.util.ArrayList;
@@ -9,6 +8,7 @@
 import org.lflang.generator.ReactionInstance;
 import org.lflang.generator.TriggerInstance;
 
+/** A node in the state space diagram representing a step in the execution of an LF program. */
 public class StateSpaceNode {
 
   public int index; // Set in StateSpaceDiagram.java
diff --git a/core/src/main/java/org/lflang/analyses/statespace/Tag.java b/core/src/main/java/org/lflang/analyses/statespace/Tag.java
index 718db3e6ad..ddbd15abb8 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/Tag.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/Tag.java
@@ -1,11 +1,11 @@
-/**
- * Class representing a logical time tag, which is a pair that consists of a timestamp (type long)
- * and a microstep (type long).
- */
 package org.lflang.analyses.statespace;
 
 import org.lflang.TimeValue;
 
+/**
+ * Class representing a logical time tag, which is a pair that consists of a timestamp (type long)
+ * and a microstep (type long).
+ */
 public class Tag implements Comparable<Tag> {
 
   public long timestamp;
diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidRunner.java b/core/src/main/java/org/lflang/analyses/uclid/UclidRunner.java
index 4b34fd9cfa..b2fe3ecc71 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidRunner.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidRunner.java
@@ -1,4 +1,3 @@
-/** (EXPERIMENTAL) Runner for Uclid5 models. */
 package org.lflang.analyses.uclid;
 
 import java.io.IOException;
@@ -19,6 +18,7 @@
 import org.lflang.generator.GeneratorCommandFactory;
 import org.lflang.util.LFCommand;
 
+/** (EXPERIMENTAL) Runner for Uclid5 models. */
 public class UclidRunner {
 
   /** A list of paths to the generated files */

From baa5061c6297b989a6d26beb728cd368b20b36c0 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 22 Jun 2023 22:30:41 +0800
Subject: [PATCH 0461/1114] Remove some inconsistent comments

---
 .../org/lflang/analyses/cast/BuildAstParseTreeVisitor.java     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java b/core/src/main/java/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
index 97e1bd40be..fe9fbea1f1 100644
--- a/core/src/main/java/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
+++ b/core/src/main/java/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
@@ -261,13 +261,10 @@ public CAst.AstNode visitPostfixExpression(PostfixExpressionContext ctx) {
       }
       CAst.VariableNode varNode = (CAst.VariableNode) primaryExprNode;
       if (varNode.name.equals("self")) {
-        // return a state variable node.
         return new CAst.StateVarNode(ctx.Identifier().get(0).getText());
       } else if (ctx.Identifier().get(0).getText().equals("value")) {
-        // return a trigger present node.
         return new CAst.TriggerValueNode(varNode.name);
       } else if (ctx.Identifier().get(0).getText().equals("is_present")) {
-        // return a trigger value node.
         return new CAst.TriggerIsPresentNode(varNode.name);
       } else {
         // Generic pointer dereference, unanalyzable.

From 0312295975bdf7bd8741ff9bc5f86a73f8cfd542 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 22 Jun 2023 12:50:53 -0700
Subject: [PATCH 0462/1114] Correctly implement hashcode for types.

---
 .../org/lflang/generator/c/CGenerator.java    | 43 +++++++++++--------
 .../generator/c/TypeParameterizedReactor.java | 24 ++++++++++-
 2 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index dd5e6feb97..06ea0d066a 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -805,7 +805,18 @@ private void generateReactorDefinitions() throws IOException {
     // do not generate code for reactors that are not instantiated
   }
 
-  private record TypeParameterizedReactorWithDecl(TypeParameterizedReactor tpr, ReactorDecl decl) {}
+  private record TypeParameterizedReactorWithDecl(TypeParameterizedReactor tpr, ReactorDecl decl) {
+    @Override
+    public boolean equals(Object obj) {
+      // This is equivalence modulo decl
+      return obj == this || obj instanceof TypeParameterizedReactorWithDecl tprd && tprd.tpr.equals(this.tpr);
+    }
+
+    @Override
+    public int hashCode() {
+      return tpr.hashCode();
+    }
+  }
 
   /** Generate user-visible header files for all reactors instantiated. */
   private void generateHeaders() throws IOException {
@@ -826,23 +837,21 @@ private void generateHeaders() throws IOException {
                       it ->
                           new TypeParameterizedReactorWithDecl(
                               new TypeParameterizedReactor(it, rr), it.getReactorClass()))
-                  .collect(Collectors.toSet())
+                  .distinct()
                   .forEach(
-                      it -> {
-                        ASTUtils.allPorts(it.tpr.reactor())
-                            .forEach(
-                                p ->
-                                    builder.pr(
-                                        CPortGenerator.generateAuxiliaryStruct(
-                                            it.tpr,
-                                            p,
-                                            getTarget(),
-                                            messageReporter,
-                                            types,
-                                            new CodeBuilder(),
-                                            true,
-                                            it.decl())));
-                      });
+                      it -> ASTUtils.allPorts(it.tpr.reactor())
+                          .forEach(
+                              p ->
+                                  builder.pr(
+                                      CPortGenerator.generateAuxiliaryStruct(
+                                          it.tpr,
+                                          p,
+                                          getTarget(),
+                                          messageReporter,
+                                          types,
+                                          new CodeBuilder(),
+                                          true,
+                                          it.decl()))));
             }
           },
           this::generateTopLevelPreambles);
diff --git a/core/src/main/java/org/lflang/generator/c/TypeParameterizedReactor.java b/core/src/main/java/org/lflang/generator/c/TypeParameterizedReactor.java
index f514141241..1303e4f8d5 100644
--- a/core/src/main/java/org/lflang/generator/c/TypeParameterizedReactor.java
+++ b/core/src/main/java/org/lflang/generator/c/TypeParameterizedReactor.java
@@ -156,17 +156,37 @@ public String uniqueName() {
 
   @Override
   public int hashCode() {
-    return reactor.hashCode() * 31 + typeArgs.hashCode();
+    return reactor.hashCode() * 31 + typeArgs.entrySet().stream().mapToInt(it -> it.getKey().hashCode() ^ typeHash(it.getValue())).sum();
   }
 
   @Override
   public boolean equals(Object obj) {
     return obj instanceof TypeParameterizedReactor other
         && reactor.equals(other.reactor)
-        && typeArgs.equals(other.typeArgs);
+        && typeArgs.entrySet().stream().allMatch(it -> typeEquals(other.typeArgs.get(it.getKey()), it.getValue()));
   }
 
   public Reactor reactor() {
     return reactor;
   }
+
+  // We operate on the ECore model rather than an internal IR, so hashcode and equals are provided here instead of as methods.
+  private static int typeHash(Type t) {
+    var sum = t.getStars() == null ? 0 : t.getStars().stream().toList().hashCode();
+    sum = 31 * sum + (t.getCode() == null ? 0 : Objects.hashCode(t.getCode().getBody()));
+    sum = 31 * sum + Objects.hashCode(t.getId());
+    sum = 31 * sum + Objects.hashCode(t.getArraySpec());
+    sum = 2 * sum + (t.isTime() ? 1 : 0);
+    sum = 31 * sum + (t.getTypeArgs() == null ? 0 : t.getTypeArgs().stream().toList().hashCode());
+    return sum;
+  }
+
+  private static boolean typeEquals(Type t, Type tt) {
+    return t.getStars() == null ? tt.getStars() == null : t.getStars().stream().toList().equals(tt.getStars().stream().toList())
+            && t.getCode() == null ? tt.getCode() == null : Objects.equals(t.getCode().getBody(), tt.getCode().getBody())
+            && Objects.equals(t.getId(), tt.getId())
+            && Objects.equals(t.getArraySpec(), tt.getArraySpec())
+            && t.isTime() == tt.isTime()
+            && t.getTypeArgs() == null ? tt.getTypeArgs() == null : t.getTypeArgs().stream().toList().equals(tt.getTypeArgs().stream().toList());
+  }
 }

From 5b2a5a5ecc27847fd1950b62a0f6a7be1c0fbde9 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 22 Jun 2023 13:10:23 -0700
Subject: [PATCH 0463/1114] Fix another name collision.

---
 .../main/java/org/lflang/generator/c/CPortGenerator.java   | 7 ++++---
 .../lflang/generator/c/CReactorHeaderFileGenerator.java    | 2 +-
 .../org/lflang/generator/c/TypeParameterizedReactor.java   | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CPortGenerator.java b/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
index 6aafeaef5a..eafec3dce0 100644
--- a/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
@@ -75,14 +75,15 @@ public static String generateAuxiliaryStruct(
     code.unindent();
     var name =
         decl != null
-            ? localPortName(decl, port.getName())
+            ? localPortName(tpr, decl, port.getName())
             : variableStructType(port, tpr, userFacing);
     code.pr("} " + name + ";");
     return code.toString();
   }
 
-  public static String localPortName(ReactorDecl decl, String portName) {
-    return decl.getName().toLowerCase() + "_" + portName + "_t";
+  public static String localPortName(
+      TypeParameterizedReactor tpr, ReactorDecl decl, String portName) {
+    return decl.getName().toLowerCase() + tpr.argsString() + "_" + portName + "_t";
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java
index 02e5d41f02..f6f393528b 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java
@@ -208,7 +208,7 @@ String getType(boolean userFacing) {
       var typeName =
           container == null
               ? CGenerator.variableStructType(tv, r, userFacing)
-              : CPortGenerator.localPortName(container.getReactorClass(), getName());
+              : CPortGenerator.localPortName(new TypeParameterizedReactor(container, r), container.getReactorClass(), getName());
       var isMultiport =
           ASTUtils.isMultiport(
               ASTUtils.allPorts(r.reactor()).stream()
diff --git a/core/src/main/java/org/lflang/generator/c/TypeParameterizedReactor.java b/core/src/main/java/org/lflang/generator/c/TypeParameterizedReactor.java
index 1303e4f8d5..2d4a468777 100644
--- a/core/src/main/java/org/lflang/generator/c/TypeParameterizedReactor.java
+++ b/core/src/main/java/org/lflang/generator/c/TypeParameterizedReactor.java
@@ -106,6 +106,11 @@ public String getName() {
         + typeArgs.values().stream().map(ASTUtils::toOriginalText).collect(Collectors.joining("_"));
   }
 
+  /** Return a string representation of the type args of this. */
+  public String argsString() {
+    return typeArgs.values().stream().map(ASTUtils::toOriginalText).collect(Collectors.joining("_"));
+  }
+
   /** #define type names as concrete types. */
   public void doDefines(CodeBuilder b) {
     typeArgs.forEach(

From d2407d57a9264fac3847d0d45ace6fbc4427c8f0 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 22 Jun 2023 16:18:53 -0700
Subject: [PATCH 0464/1114] Pass DistributedCountPhysical.

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index c1dd61ee09..0412c1d6c6 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit c1dd61ee091bae697ad76530412fe0d2ed3e38ae
+Subproject commit 0412c1d6c6723f2a3f6044c4a0588a69f27f31c8

From b60502fca0182333530ebd32cae5ea7475b2c1f5 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 22 Jun 2023 16:21:51 -0700
Subject: [PATCH 0465/1114] Format.

---
 .../org/lflang/generator/c/CGenerator.java    | 30 +++++++++--------
 .../c/CReactorHeaderFileGenerator.java        |  5 ++-
 .../generator/c/TypeParameterizedReactor.java | 33 +++++++++++++------
 3 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 06ea0d066a..1099b4e7ca 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -809,7 +809,8 @@ private record TypeParameterizedReactorWithDecl(TypeParameterizedReactor tpr, Re
     @Override
     public boolean equals(Object obj) {
       // This is equivalence modulo decl
-      return obj == this || obj instanceof TypeParameterizedReactorWithDecl tprd && tprd.tpr.equals(this.tpr);
+      return obj == this
+          || obj instanceof TypeParameterizedReactorWithDecl tprd && tprd.tpr.equals(this.tpr);
     }
 
     @Override
@@ -839,19 +840,20 @@ private void generateHeaders() throws IOException {
                               new TypeParameterizedReactor(it, rr), it.getReactorClass()))
                   .distinct()
                   .forEach(
-                      it -> ASTUtils.allPorts(it.tpr.reactor())
-                          .forEach(
-                              p ->
-                                  builder.pr(
-                                      CPortGenerator.generateAuxiliaryStruct(
-                                          it.tpr,
-                                          p,
-                                          getTarget(),
-                                          messageReporter,
-                                          types,
-                                          new CodeBuilder(),
-                                          true,
-                                          it.decl()))));
+                      it ->
+                          ASTUtils.allPorts(it.tpr.reactor())
+                              .forEach(
+                                  p ->
+                                      builder.pr(
+                                          CPortGenerator.generateAuxiliaryStruct(
+                                              it.tpr,
+                                              p,
+                                              getTarget(),
+                                              messageReporter,
+                                              types,
+                                              new CodeBuilder(),
+                                              true,
+                                              it.decl()))));
             }
           },
           this::generateTopLevelPreambles);
diff --git a/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java
index f6f393528b..5deaa5fb7b 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java
@@ -208,7 +208,10 @@ String getType(boolean userFacing) {
       var typeName =
           container == null
               ? CGenerator.variableStructType(tv, r, userFacing)
-              : CPortGenerator.localPortName(new TypeParameterizedReactor(container, r), container.getReactorClass(), getName());
+              : CPortGenerator.localPortName(
+                  new TypeParameterizedReactor(container, r),
+                  container.getReactorClass(),
+                  getName());
       var isMultiport =
           ASTUtils.isMultiport(
               ASTUtils.allPorts(r.reactor()).stream()
diff --git a/core/src/main/java/org/lflang/generator/c/TypeParameterizedReactor.java b/core/src/main/java/org/lflang/generator/c/TypeParameterizedReactor.java
index 2d4a468777..1c5ae863c0 100644
--- a/core/src/main/java/org/lflang/generator/c/TypeParameterizedReactor.java
+++ b/core/src/main/java/org/lflang/generator/c/TypeParameterizedReactor.java
@@ -108,7 +108,9 @@ public String getName() {
 
   /** Return a string representation of the type args of this. */
   public String argsString() {
-    return typeArgs.values().stream().map(ASTUtils::toOriginalText).collect(Collectors.joining("_"));
+    return typeArgs.values().stream()
+        .map(ASTUtils::toOriginalText)
+        .collect(Collectors.joining("_"));
   }
 
   /** #define type names as concrete types. */
@@ -161,21 +163,26 @@ public String uniqueName() {
 
   @Override
   public int hashCode() {
-    return reactor.hashCode() * 31 + typeArgs.entrySet().stream().mapToInt(it -> it.getKey().hashCode() ^ typeHash(it.getValue())).sum();
+    return reactor.hashCode() * 31
+        + typeArgs.entrySet().stream()
+            .mapToInt(it -> it.getKey().hashCode() ^ typeHash(it.getValue()))
+            .sum();
   }
 
   @Override
   public boolean equals(Object obj) {
     return obj instanceof TypeParameterizedReactor other
         && reactor.equals(other.reactor)
-        && typeArgs.entrySet().stream().allMatch(it -> typeEquals(other.typeArgs.get(it.getKey()), it.getValue()));
+        && typeArgs.entrySet().stream()
+            .allMatch(it -> typeEquals(other.typeArgs.get(it.getKey()), it.getValue()));
   }
 
   public Reactor reactor() {
     return reactor;
   }
 
-  // We operate on the ECore model rather than an internal IR, so hashcode and equals are provided here instead of as methods.
+  // We operate on the ECore model rather than an internal IR, so hashcode and equals are provided
+  // here instead of as methods.
   private static int typeHash(Type t) {
     var sum = t.getStars() == null ? 0 : t.getStars().stream().toList().hashCode();
     sum = 31 * sum + (t.getCode() == null ? 0 : Objects.hashCode(t.getCode().getBody()));
@@ -187,11 +194,17 @@ private static int typeHash(Type t) {
   }
 
   private static boolean typeEquals(Type t, Type tt) {
-    return t.getStars() == null ? tt.getStars() == null : t.getStars().stream().toList().equals(tt.getStars().stream().toList())
-            && t.getCode() == null ? tt.getCode() == null : Objects.equals(t.getCode().getBody(), tt.getCode().getBody())
-            && Objects.equals(t.getId(), tt.getId())
-            && Objects.equals(t.getArraySpec(), tt.getArraySpec())
-            && t.isTime() == tt.isTime()
-            && t.getTypeArgs() == null ? tt.getTypeArgs() == null : t.getTypeArgs().stream().toList().equals(tt.getTypeArgs().stream().toList());
+    return t.getStars() == null
+        ? tt.getStars() == null
+        : t.getStars().stream().toList().equals(tt.getStars().stream().toList())
+                && t.getCode() == null
+            ? tt.getCode() == null
+            : Objects.equals(t.getCode().getBody(), tt.getCode().getBody())
+                    && Objects.equals(t.getId(), tt.getId())
+                    && Objects.equals(t.getArraySpec(), tt.getArraySpec())
+                    && t.isTime() == tt.isTime()
+                    && t.getTypeArgs() == null
+                ? tt.getTypeArgs() == null
+                : t.getTypeArgs().stream().toList().equals(tt.getTypeArgs().stream().toList());
   }
 }

From ae6614f979758ea734ed5e34cba77044bfdab1e5 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 22 Jun 2023 16:24:01 -0700
Subject: [PATCH 0466/1114] Format.

---
 .../java/org/lflang/federated/generator/FedGenerator.java | 1 -
 .../org/lflang/federated/generator/FedMainEmitter.java    | 8 ++++----
 .../org/lflang/federated/generator/FederateInstance.java  | 4 +---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 0ffa5e7b80..32101f4969 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -20,7 +20,6 @@
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index 3fb1b87fd4..53b8b7dc84 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -64,11 +64,11 @@ String generateMainReactor(
                     .map(renderer)
                     .collect(Collectors.joining("\n")),
                 federate.networkReceiverInstantiations.stream()
-                        .map(renderer)
-                        .collect(Collectors.joining("\n")),
+                    .map(renderer)
+                    .collect(Collectors.joining("\n")),
                 federate.networkHelperInstantiations.stream()
-                        .map(renderer)
-                        .collect(Collectors.joining("\n")),
+                    .map(renderer)
+                    .collect(Collectors.joining("\n")),
                 federate.networkConnections.stream()
                     .map(renderer)
                     .collect(Collectors.joining("\n")))
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index 7728ea536e..f7e81115c3 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -263,9 +263,7 @@ public Instantiation getInstantiation() {
    */
   public List<Instantiation> networkReceiverInstantiations = new ArrayList<>();
 
-  /**
-   * List of generated instantiations that serve as helpers for forming the network connections.
-   */
+  /** List of generated instantiations that serve as helpers for forming the network connections. */
   public List<Instantiation> networkHelperInstantiations = new ArrayList<>();
 
   /** Parsed target config of the federate. */

From 1499431d554b42c2de9594f20bc18d639d97d594 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 22 Jun 2023 20:04:51 -0700
Subject: [PATCH 0467/1114] Pass DistributedCountDecentralized locally.

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 0412c1d6c6..90888a96bd 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 0412c1d6c6723f2a3f6044c4a0588a69f27f31c8
+Subproject commit 90888a96bd9aaf726718890bd2c9774a2bd674f1

From df25bc0f55a039102e05f537b0d6411c9f5b4e03 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 23 Jun 2023 11:22:12 +0800
Subject: [PATCH 0468/1114] Throw exceptions instead of printf

---
 .../lflang/analyses/cast/BuildAstParseTreeVisitor.java    | 8 ++------
 .../lflang/analyses/cast/VariablePrecedenceVisitor.java   | 2 +-
 .../lflang/analyses/statespace/StateSpaceExplorer.java    | 4 +---
 .../main/java/org/lflang/analyses/uclid/MTLVisitor.java   | 2 +-
 .../java/org/lflang/analyses/uclid/UclidGenerator.java    | 6 +++---
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java b/core/src/main/java/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
index fe9fbea1f1..3b72539d14 100644
--- a/core/src/main/java/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
+++ b/core/src/main/java/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
@@ -255,9 +255,7 @@ public CAst.AstNode visitPostfixExpression(PostfixExpressionContext ctx) {
         && ctx.Arrow().size() == 1) {
       CAst.AstNode primaryExprNode = visitPrimaryExpression(ctx.primaryExpression());
       if (primaryExprNode instanceof CAst.LiteralNode) {
-        // Unreachable.
-        System.out.println("Unreachable!");
-        return new CAst.OpaqueNode(); // FIXME: Throw an exception instead.
+        throw new AssertionError("unreachable");
       }
       CAst.VariableNode varNode = (CAst.VariableNode) primaryExprNode;
       if (varNode.name.equals("self")) {
@@ -286,9 +284,7 @@ public CAst.AstNode visitPostfixExpression(PostfixExpressionContext ctx) {
       List<AssignmentExpressionContext> params =
           ctx.argumentExpressionList().get(0).assignmentExpression();
       if (primaryExprNode instanceof CAst.LiteralNode) {
-        // Unreachable.
-        System.out.println("Unreachable!");
-        return new CAst.OpaqueNode(); // FIXME: Throw an exception instead.
+        throw new AssertionError("unreachable");
       }
       CAst.VariableNode varNode = (CAst.VariableNode) primaryExprNode;
       if (varNode.name.equals("lf_set")) {
diff --git a/core/src/main/java/org/lflang/analyses/cast/VariablePrecedenceVisitor.java b/core/src/main/java/org/lflang/analyses/cast/VariablePrecedenceVisitor.java
index e6124bc516..944245d6ef 100644
--- a/core/src/main/java/org/lflang/analyses/cast/VariablePrecedenceVisitor.java
+++ b/core/src/main/java/org/lflang/analyses/cast/VariablePrecedenceVisitor.java
@@ -21,7 +21,7 @@ public Void visitAssignmentNode(AssignmentNode node) {
         }
       }
     } else {
-      System.out.println("Unreachable!"); // FIXME: Throw exception.
+      throw new AssertionError("unreachable");
     }
     return null;
   }
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
index ff0087fad6..b1b37e1333 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
@@ -4,7 +4,6 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
-import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.generator.ActionInstance;
@@ -281,8 +280,7 @@ else if (previousTag != null && currentTag.timestamp == previousTag.timestamp) {
         // Update the eventQ snapshot.
         currentNode.eventQ = new ArrayList<Event>(eventQ);
       } else {
-        // Unreachable
-        Exceptions.sneakyThrow(new Exception("Reached an unreachable part."));
+        throw new AssertionError("unreachable");
       }
 
       // Update the current tag for the next iteration.
diff --git a/core/src/main/java/org/lflang/analyses/uclid/MTLVisitor.java b/core/src/main/java/org/lflang/analyses/uclid/MTLVisitor.java
index b83c3849a6..b8f4981eea 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/MTLVisitor.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/MTLVisitor.java
@@ -22,7 +22,6 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
 
-/** (EXPERIMENTAL) Transpiler from an MTL specification to a Uclid axiom. */
 package org.lflang.analyses.uclid;
 
 import org.lflang.TimeUnit;
@@ -31,6 +30,7 @@
 import org.lflang.dsl.MTLParserBaseVisitor;
 import org.lflang.generator.CodeBuilder;
 
+/** (EXPERIMENTAL) Transpiler from an MTL specification to a Uclid axiom. */
 public class MTLVisitor extends MTLParserBaseVisitor<String> {
 
   ////////////////////////////////////////////
diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
index f8289fb2c9..6f52cf9a2e 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -22,7 +22,6 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
 
-/** (EXPERIMENTAL) Generator for Uclid5 models. */
 package org.lflang.analyses.uclid;
 
 import java.io.IOException;
@@ -80,6 +79,7 @@
 import org.lflang.lf.Time;
 import org.lflang.util.StringUtil;
 
+/** (EXPERIMENTAL) Generator for Uclid5 models. */
 public class UclidGenerator extends GeneratorBase {
 
   ////////////////////////////////////////////
@@ -1356,7 +1356,7 @@ protected void generateReactionAxioms() {
                   + " == "
                   + "false");
         } else {
-          System.out.println("Unreachable!");
+          throw new AssertionError("unreachable");
         }
         code.pr("))");
       }
@@ -1730,6 +1730,6 @@ public Target getTarget() {
 
   @Override
   public TargetTypes getTargetTypes() {
-    throw new UnsupportedOperationException("TODO: auto-generated method stub");
+    throw new UnsupportedOperationException("This method is not applicable for this generator since Uclid5 is not an LF target.");
   }
 }

From b1308b057a64d56288535bb66ee2bd3035c3a3fe Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 23 Jun 2023 11:30:39 +0800
Subject: [PATCH 0469/1114] Apply suggestions from @petervdonovan

---
 .../lflang/analyses/uclid/UclidGenerator.java | 28 ++++---------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
index 6f52cf9a2e..42285ac028 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -986,21 +986,7 @@ protected void generateTriggersAndReactions() {
 
     if (this.timerInstances.size() > 0) {
       code.pr(String.join("\n", "/**********", " * Timers *", " **********/"));
-      /**
-       * The timer axioms take the following form:
-       *
-       * <p>// An initial firing at {offset, 0} axiom( ((g(END)._1 >= 500000000) ==> ( finite_exists
-       * (j : integer) in indices :: (j > START && j <= END) && Timer_t_is_present(t(j)) &&
-       * tag_same(g(j), {500000000, 0}) )) && ((g(END)._1 < 500000000) ==> ( finite_forall (i :
-       * integer) in indices :: (i > START && i <= END) ==> (!isNULL(i)) )) ); // Schedule
-       * subsequent firings. axiom( finite_forall (i : integer) in indices :: (i >= START && i <=
-       * END) ==> ( Timer_t_is_present(t(i)) ==> ( ( finite_exists (j : integer) in indices :: (j >=
-       * START && j > i) && Timer_t_is_present(t(j)) && (g(j) == tag_schedule(g(i), 1000000000)) ) )
-       * ) ); // All firings must be evenly spaced out. axiom( finite_forall (i : integer) in
-       * indices :: (i >= START && i <= END) ==> ( Timer_t_is_present(t(i)) ==> ( // Timestamp must
-       * be offset + n * period ( exists (n : integer) :: ( n >= 0 && g(i)._1 == 500000000 + n *
-       * 1000000000 ) ) // Microstep must be 0 && ( g(i)._2 == 0 ) ) ) );
-       */
+
       for (var timer : this.timerInstances) {
         long offset = timer.getOffset().toNanoSeconds();
         long period = timer.getPeriod().toNanoSeconds();
@@ -1285,13 +1271,10 @@ protected void generateReactionAxioms() {
         // FIXME: A more systematic check is needed
         // to ensure that the generated Uclid file
         // is valid.
-        try {
-          if (resetCondition.contains("null")) {
-            throw new Exception("Null detected in a reset condition. Stop.");
-          }
-        } catch (Exception e) {
-          Exceptions.sneakyThrow(e);
+        if (resetCondition.contains("null")) {
+          throw new IllegalStateException("Null detected in a reset condition. Stop.");
         }
+
         code.pr("// Unused state variables and ports are reset by default.");
         code.pr("&& " + "(" + "(" + resetCondition + ")" + " ==> " + "(");
         if (key instanceof StateVariableInstance) {
@@ -1730,6 +1713,7 @@ public Target getTarget() {
 
   @Override
   public TargetTypes getTargetTypes() {
-    throw new UnsupportedOperationException("This method is not applicable for this generator since Uclid5 is not an LF target.");
+    throw new UnsupportedOperationException(
+        "This method is not applicable for this generator since Uclid5 is not an LF target.");
   }
 }

From 666bb863648cefdefae7c28d48b86613170457c1 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 22 Jun 2023 23:17:08 -0700
Subject: [PATCH 0470/1114] Add test case.

---
 test/C/src/generics/MultipleInstantiations.lf | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 test/C/src/generics/MultipleInstantiations.lf

diff --git a/test/C/src/generics/MultipleInstantiations.lf b/test/C/src/generics/MultipleInstantiations.lf
new file mode 100644
index 0000000000..5f9e7abc97
--- /dev/null
+++ b/test/C/src/generics/MultipleInstantiations.lf
@@ -0,0 +1,21 @@
+target C
+
+reactor R<T>(printf: string = "%s") {
+  input in: T
+
+  reaction(in) {=
+    printf("%s", "Received ");
+    printf(self->printf, in->value);
+    printf("%s", ".\n");
+  =}
+}
+
+main reactor {
+  r1 = new R<int>(printf="%d")
+  r2 = new R<int>(printf="%d")
+  r3 = new R<string>(printf="%s")
+
+  reaction(startup) -> r1.in, r2.in, r3.in {=
+    lf_set(r1.in, 1); lf_set(r2.in, 2); lf_set(r3.in, "test");
+  =}
+}

From a859a6654f4d9ce027c2aef374b43877762c06c4 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 23 Jun 2023 23:00:31 +0800
Subject: [PATCH 0471/1114] Do not check models by default, based on
 suggestions from @lhstrh

---
 cli/lfc/src/main/java/org/lflang/cli/Lfc.java | 10 ++--
 .../main/java/org/lflang/TargetConfig.java    |  8 ++--
 .../main/java/org/lflang/TargetProperty.java  |  8 ++--
 .../org/lflang/generator/LFGenerator.java     | 48 +++++++++++++------
 .../lflang/generator/LFGeneratorContext.java  |  2 +-
 5 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
index cde6fabde1..f2cc27c726 100644
--- a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
+++ b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
@@ -80,10 +80,10 @@ public class Lfc extends CliBase {
   private boolean noCompile;
 
   @Option(
-      names = {"--no-verify"},
+      names = {"--verify"},
       arity = "0",
-      description = "Do not run the generated verification models.")
-  private boolean noVerify;
+      description = "Run the generated verification models.")
+  private boolean verify;
 
   @Option(
       names = {"--print-statistics"},
@@ -256,8 +256,8 @@ public Properties getGeneratorArgs() {
       props.setProperty(BuildParm.NO_COMPILE.getKey(), "true");
     }
 
-    if (noVerify) {
-      props.setProperty(BuildParm.NO_VERIFY.getKey(), "true");
+    if (verify) {
+      props.setProperty(BuildParm.VERIFY.getKey(), "true");
     }
 
     if (targetCompiler != null) {
diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index 8a01b019cd..0ce15abfe8 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -82,8 +82,8 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
     if (cliArgs.containsKey("no-compile")) {
       this.noCompile = true;
     }
-    if (cliArgs.containsKey("no-verify")) {
-      this.noVerify = true;
+    if (cliArgs.containsKey("verify")) {
+      this.verify = true;
     }
     if (cliArgs.containsKey("docker")) {
       var arg = cliArgs.getProperty("docker");
@@ -235,8 +235,8 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
   /** If true, do not perform runtime validation. The default is false. */
   public boolean noRuntimeValidation = false;
 
-  /** If true, do not check the generated verification model. The default is false. */
-  public boolean noVerify = false;
+  /** If true, check the generated verification model. The default is false. */
+  public boolean verify = false;
 
   /**
    * Set the target platform config. This tells the build system what platform-specific support
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index cace618542..27fafee00d 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -411,13 +411,13 @@ public enum TargetProperty {
       }),
 
   /** Directive to not check the generated verification model. */
-  NO_VERIFY(
-      "no-verify",
+  VERIFY(
+      "verify",
       PrimitiveType.BOOLEAN,
       Arrays.asList(Target.C),
-      (config) -> ASTUtils.toElement(config.noVerify),
+      (config) -> ASTUtils.toElement(config.verify),
       (config, value, err) -> {
-        config.noVerify = ASTUtils.toBoolean(value);
+        config.verify = ASTUtils.toBoolean(value);
       }),
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/LFGenerator.java b/core/src/main/java/org/lflang/generator/LFGenerator.java
index 024ca94ff7..c0ec38cd9f 100644
--- a/core/src/main/java/org/lflang/generator/LFGenerator.java
+++ b/core/src/main/java/org/lflang/generator/LFGenerator.java
@@ -163,29 +163,47 @@ protected void cleanIfNeeded(LFGeneratorContext context) {
    */
   private void runVerifierIfPropertiesDetected(Resource resource, LFGeneratorContext lfContext) {
     Reactor main = ASTUtils.getMainReactor(resource);
+    final MessageReporter messageReporter = lfContext.getErrorReporter();
     List<Attribute> properties =
         AttributeUtils.getAttributes(main).stream()
             .filter(attr -> attr.getAttrName().equals("property"))
             .collect(Collectors.toList());
     if (properties.size() > 0) {
 
-      System.out.println(
-          "*** WARNING: @property is an experimental feature. Use it with caution. ***");
-
-      // Check if Uclid5 and Z3 are installed.
-      if (execInstalled("uclid", "--help", "uclid 0.9.5")
-          && execInstalled("z3", "--version", "Z3 version")) {
-        UclidGenerator uclidGenerator = new UclidGenerator(lfContext, properties);
-        // Generate uclid files.
-        uclidGenerator.doGenerate(resource, lfContext);
-        if (!uclidGenerator.targetConfig.noVerify) {
-          // Invoke the generated uclid files.
-          uclidGenerator.runner.run();
-        } else {
-          System.out.println("\"no-verify\" is set to true. Skip checking the verification model.");
+      // Provide a warning.
+      messageReporter
+          .nowhere()
+          .warning(
+              "Verification using \"@property\" and \"--verify\" is an experimental feature. Use"
+                  + " with caution.");
+
+      // Generate uclid files.
+      UclidGenerator uclidGenerator = new UclidGenerator(lfContext, properties);
+      uclidGenerator.doGenerate(resource, lfContext);
+
+      // Check the generated uclid files.
+      if (uclidGenerator.targetConfig.verify) {
+
+        // Check if Uclid5 and Z3 are installed.
+        if (!execInstalled("uclid", "--help", "uclid 0.9.5")
+            || !execInstalled("z3", "--version", "Z3 version")) {
+          messageReporter
+              .nowhere()
+              .error(
+                  "Fail to check the generated verification models because Uclid5 or Z3 is not"
+                      + " installed.");
         }
+
+        // Run the Uclid tool.
+        uclidGenerator.runner.run();
+
       } else {
-        System.out.println("*** WARNING: Uclid5 or Z3 is not installed. @property is skipped. ***");
+        messageReporter
+            .nowhere()
+            .warning(
+                "The \"verify\" target property is set to false. Skip checking the verification"
+                    + " model. To check the generated verification models, set the \"verify\""
+                    + " target property to true or pass \"--verify\" to the lfc command");
       }
     }
   }
diff --git a/core/src/main/java/org/lflang/generator/LFGeneratorContext.java b/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
index ffc984312a..4353e3c46e 100644
--- a/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
+++ b/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
@@ -28,7 +28,7 @@ enum BuildParm {
     LOGGING("The logging level to use by the generated binary"),
     LINT("Enable or disable linting of generated code."),
     NO_COMPILE("Do not invoke target compiler."),
-    NO_VERIFY("Do not check the generated verification model."),
+    VERIFY("Check the generated verification model."),
     OUTPUT_PATH("Specify the root output directory."),
     PRINT_STATISTICS("Instruct the runtime to collect and print statistics."),
     QUIET("Suppress output of the target compiler and other commands"),

From d75598cfdf409f61d36d8b025a83b4180c6323e6 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 24 Jun 2023 10:57:43 -0700
Subject: [PATCH 0472/1114] Make level the max of the levels depended on.

This is the same as the lub/sup and makes the method match the spec. It
is also a potential performance optimization because it exposes more
parallelism with less synchronization in the case of parallel paths with
different numbers of reactions.
However it does mean that the number of reactions in the current level
can change after we have already started executing the level. I think
that we already had that problem due to some details surrounding
federated execution, but I am not sure.
---
 .../main/java/org/lflang/generator/ReactionInstanceGraph.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
index a0dd1df962..f8f46dd5f0 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
@@ -304,7 +304,7 @@ protected void addNodesAndEdges(ReactorInstance reactor) {
    *
    * <p>This procedure is based on Kahn's algorithm for topological sorting. Rather than
    * establishing a total order, we establish a partial order. In this order, the level of each
-   * reaction is the least upper bound of the levels of the reactions it depends on.
+   * reaction is the maximum of the levels of the reactions it depends on.
    */
   private void assignLevels() {
     List<ReactionInstance.Runtime> start = new ArrayList<>(rootNodes());
@@ -327,7 +327,7 @@ private void assignLevels() {
         toRemove.add(effect);
 
         // Update level of downstream node.
-        effect.level = origin.level + 1;
+        effect.level = Math.max(effect.level, origin.level);
       }
       // Remove visited edges.
       for (Runtime effect : toRemove) {

From 4f9e205edd57839cea38755934fa4a85d6cc8dd8 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 24 Jun 2023 17:09:27 -0700
Subject: [PATCH 0473/1114] Revert "Make level the max of the levels depended
 on."

This reverts commit d75598cfdf409f61d36d8b025a83b4180c6323e6.

It seems like the reverted change is not compatible with our current scheduler
implementations, for the reason described in the commit message.
---
 .../main/java/org/lflang/generator/ReactionInstanceGraph.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
index f8f46dd5f0..a0dd1df962 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
@@ -304,7 +304,7 @@ protected void addNodesAndEdges(ReactorInstance reactor) {
    *
    * <p>This procedure is based on Kahn's algorithm for topological sorting. Rather than
    * establishing a total order, we establish a partial order. In this order, the level of each
-   * reaction is the maximum of the levels of the reactions it depends on.
+   * reaction is the least upper bound of the levels of the reactions it depends on.
    */
   private void assignLevels() {
     List<ReactionInstance.Runtime> start = new ArrayList<>(rootNodes());
@@ -327,7 +327,7 @@ private void assignLevels() {
         toRemove.add(effect);
 
         // Update level of downstream node.
-        effect.level = Math.max(effect.level, origin.level);
+        effect.level = origin.level + 1;
       }
       // Remove visited edges.
       for (Runtime effect : toRemove) {

From b4a76297b444c4a317bc0aec03a2025ee6fe4538 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 24 Jun 2023 17:10:50 -0700
Subject: [PATCH 0474/1114] Add TPO annotations.

This should correctly handle top-level banks and multiports, but I have
not checked.
---
 .../federated/generator/FedASTUtils.java      | 299 ++++++++++--------
 .../federated/generator/FedGenerator.java     |   3 +
 .../federated/generator/FedMainEmitter.java   |  14 +-
 .../federated/generator/FederateInstance.java |  10 +-
 .../org/lflang/generator/PortInstance.java    |  17 +
 .../lflang/generator/ReactionInstance.java    |  15 +-
 .../generator/ReactionInstanceGraph.java      | 125 +++++---
 .../org/lflang/generator/ReactorInstance.java |   9 +
 .../org/lflang/validation/AttributeSpec.java  |  11 +-
 9 files changed, 311 insertions(+), 192 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 3b491a04ce..f2635079a9 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -258,6 +258,8 @@ private static void addNetworkReceiverReactor(
     receiver.getOutputs().add(out);
     // networkReceiverReaction.setName("NetworkReceiverReaction_" + networkIDReceiver++);
 
+    addLevelAttribute(
+        networkInstance, connection.getDestinationPortInstance(), connection.getSrcChannel());
     networkInstance.setReactorClass(receiver);
     networkInstance.setName(
         ASTUtils.getUniqueIdentifier(top, "nr_" + connection.getDstFederate().name));
@@ -370,144 +372,172 @@ private static void addNetworkReceiverReactor(
     connection.dstFederate.networkActionToInstantiation.put(networkAction, networkInstance);
     // System.out.println(connection.getSourcePortInstance());
 
-    if (!connection.getDefinition().isPhysical()
-        &&
-        // Connections that are physical don't need control reactions
-        connection.getDefinition().getDelay()
-            == null // Connections that have delays don't need control reactions
-    ) {
-      // Add necessary dependency annotations to federate to ensure the level
-      // assigner has enough information to correctly assign levels without introducing deadlock
-      addRelativeDependencyAnnotation(connection, networkReceiverReaction, errorReporter);
-    }
+    //    if (!connection.getDefinition().isPhysical()
+    //        &&
+    //        // Connections that are physical don't need control reactions
+    //        connection.getDefinition().getDelay()
+    //            == null // Connections that have delays don't need control reactions
+    //    ) {
+    //      // Add necessary dependency annotations to federate to ensure the level
+    //      // assigner has enough information to correctly assign levels without introducing
+    // deadlock
+    //      addRelativeDependencyAnnotation(connection, networkReceiverReaction, errorReporter);
+    //    }
   }
 
-  /**
-   * Add a network control reaction for a given input port 'destination' to destination's parent
-   * reactor. This reaction will block for any valid logical time until it is known whether the
-   * trigger for the action corresponding to the given port is present or absent.
-   *
-   * @param connection FIXME
-   * @param coordination FIXME
-   * @param errorReporter
-   * @note Used in federated execution
-   */
-  private static void addNetworkInputControlReaction(
-      FedConnectionInstance connection,
-      CoordinationType coordination,
-      ErrorReporter errorReporter) {
-
-    LfFactory factory = LfFactory.eINSTANCE;
-    Reaction reaction = factory.createReaction();
-    VarRef destRef = factory.createVarRef();
-    int receivingPortID = connection.dstFederate.networkMessageActions.size();
-
-    // If the sender or receiver is in a bank of reactors, then we want
-    // these reactions to appear only in the federate whose bank ID matches.
-    setReactionBankIndex(reaction, connection.getDstBank());
-
-    // FIXME: do not create a new extension every time it is used
-    FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
-        .annotateReaction(reaction);
-
-    // Create a new action that will be used to trigger the
-    // input control reactions.
-    Action newTriggerForControlReactionInput = factory.createAction();
-    newTriggerForControlReactionInput.setOrigin(ActionOrigin.LOGICAL);
-
-    // Set the container and variable according to the network port
-    destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
-    destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
-
-    Reactor top = connection.getDestinationPortInstance().getParent().getParent().reactorDefinition;
-
-    newTriggerForControlReactionInput.setName(
-        ASTUtils.getUniqueIdentifier(top, "inputControlReactionTrigger"));
-
-    // Add the newly created Action to the action list of the federated reactor.
-    top.getActions().add(newTriggerForControlReactionInput);
-
-    // Create the trigger for the reaction
-    VarRef newTriggerForControlReaction = factory.createVarRef();
-    newTriggerForControlReaction.setVariable(newTriggerForControlReactionInput);
-
-    // Add the appropriate triggers to the list of triggers of the reaction
-    reaction.getTriggers().add(newTriggerForControlReaction);
-
-    // Add the destination port as an effect of the reaction
-    reaction.getEffects().add(destRef);
-
-    // Generate code for the network input control reaction
-    reaction.setCode(factory.createCode());
-
-    TimeValue maxSTP = findMaxSTP(connection, coordination);
-
-    reaction
-        .getCode()
-        .setBody(
-            FedTargetExtensionFactory.getExtension(connection.dstFederate.targetConfig.target)
-                .generateNetworkInputControlReactionBody(receivingPortID, maxSTP, coordination));
-
-    // Insert the reaction
-    top.getReactions().add(reaction);
-
-    // Add the trigger for this reaction to the list of triggers, used to actually
-    // trigger the reaction at the beginning of each logical time.
-    connection.dstFederate.networkInputControlReactionsTriggers.add(
-        newTriggerForControlReactionInput);
-
-    // Add the network input control reaction to the federate instance's list
-    // of network reactions
-    // connection.dstFederate.networkReactions.add(reaction);
-
-    // Add necessary dependencies to reaction to ensure that it executes correctly
-    // relative to other network input control reactions in the federate.
-    // addRelativeDependency(connection, reaction, errorReporter);
+  private static void addLevelAttribute(Instantiation instantiation, PortInstance p, int index) {
+    var a = LfFactory.eINSTANCE.createAttribute();
+    a.setAttrName("_tpoLevel");
+    var e = LfFactory.eINSTANCE.createAttrParm();
+    // If the port is an input, we can the port the maximum level possible without changing its
+    // ordering relative to a
+    // reaction. If it is an output, then either it does nothing or it sends to an input. The former
+    // case is fine;
+    // to handle the latter case, we decrement 1 to ensure that it precedes the level of the input
+    // that it sends to.
+    // This also does not change its ordering relative to any reaction that is upstream of the
+    // receiving port because
+    // our current level assignment algorithm increments the level between every reaction, so in the
+    // worst case this
+    // gives this port the same level as the sending reaction.
+    var ub = p.getLevelUpperBound(index);
+    e.setValue(String.valueOf(p.isInput() ? ub : ub - 1));
+    a.getAttrParms().add(e);
+    instantiation.getAttributes().add(a);
   }
 
-  /**
-   * Add necessary dependency information to the signature of {@code networkInputReaction} so that
-   * it can execute in the correct order relative to other network reactions in the federate.
-   *
-   * <p>In particular, we want to avoid a deadlock if multiple network input control reactions in
-   * federate are in a zero-delay cycle through other federates in the federation. To avoid the
-   * deadlock, we encode the zero-delay cycle inside the federate by adding an artificial dependency
-   * from the output port of this federate that is involved in the cycle to the signature of {@code
-   * networkInputReaction} as a source.
-   */
-  private static void addRelativeDependencyAnnotation(
-      FedConnectionInstance connection,
-      Reaction networkInputReaction,
-      ErrorReporter errorReporter) {
-    var upstreamOutputPortsInFederate =
-        findUpstreamPortsInFederate(
-            connection.dstFederate,
-            connection.getSourcePortInstance(),
-            new HashSet<>(),
-            new HashSet<>());
-
-    ModelInfo info = new ModelInfo();
-    for (var port : upstreamOutputPortsInFederate) {
-      // VarRef sourceRef = ASTUtils.factory.createVarRef();
-      connection.dstFederate.networkReactionDependencyPairs.add(
-          new Pair<PortInstance, PortInstance>(connection.getDestinationPortInstance(), port));
-
-      // sourceRef.setContainer(port.getParent().getDefinition());
-      // sourceRef.setVariable(port.getDefinition());
-      // networkInputReaction.getSources().add(sourceRef);
-
-      // // Remove the port if it introduces cycles
-      // info.update(
-      //        (Model)networkInputReaction.eContainer().eContainer(),
-      //         errorReporter
-      //         );
-      // if (!info.topologyCycles().isEmpty()) {
-      //         networkInputReaction.getSources().remove(sourceRef);
-      //     }
-    }
-    // System.out.println(connection.dstFederate.networkReactionDependencyPairs);
-
-  }
+  //  /**
+  //   * Add a network control reaction for a given input port 'destination' to destination's parent
+  //   * reactor. This reaction will block for any valid logical time until it is known whether the
+  //   * trigger for the action corresponding to the given port is present or absent.
+  //   *
+  //   * @param connection FIXME
+  //   * @param coordination FIXME
+  //   * @param errorReporter
+  //   * @note Used in federated execution
+  //   */
+  //  private static void addNetworkInputControlReaction(
+  //      FedConnectionInstance connection,
+  //      CoordinationType coordination,
+  //      ErrorReporter errorReporter) {
+  //
+  //    LfFactory factory = LfFactory.eINSTANCE;
+  //    Reaction reaction = factory.createReaction();
+  //    VarRef destRef = factory.createVarRef();
+  //    int receivingPortID = connection.dstFederate.networkMessageActions.size();
+  //
+  //    // If the sender or receiver is in a bank of reactors, then we want
+  //    // these reactions to appear only in the federate whose bank ID matches.
+  //    setReactionBankIndex(reaction, connection.getDstBank());
+  //
+  //    // FIXME: do not create a new extension every time it is used
+  //    FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
+  //        .annotateReaction(reaction);
+  //
+  //    // Create a new action that will be used to trigger the
+  //    // input control reactions.
+  //    Action newTriggerForControlReactionInput = factory.createAction();
+  //    newTriggerForControlReactionInput.setOrigin(ActionOrigin.LOGICAL);
+  //
+  //    // Set the container and variable according to the network port
+  //    destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
+  //    destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
+  //
+  //    Reactor top =
+  // connection.getDestinationPortInstance().getParent().getParent().reactorDefinition;
+  //
+  //    newTriggerForControlReactionInput.setName(
+  //        ASTUtils.getUniqueIdentifier(top, "inputControlReactionTrigger"));
+  //
+  //    // Add the newly created Action to the action list of the federated reactor.
+  //    top.getActions().add(newTriggerForControlReactionInput);
+  //
+  //    // Create the trigger for the reaction
+  //    VarRef newTriggerForControlReaction = factory.createVarRef();
+  //    newTriggerForControlReaction.setVariable(newTriggerForControlReactionInput);
+  //
+  //    // Add the appropriate triggers to the list of triggers of the reaction
+  //    reaction.getTriggers().add(newTriggerForControlReaction);
+  //
+  //    // Add the destination port as an effect of the reaction
+  //    reaction.getEffects().add(destRef);
+  //
+  //    // Generate code for the network input control reaction
+  //    reaction.setCode(factory.createCode());
+  //
+  //    TimeValue maxSTP = findMaxSTP(connection, coordination);
+  //
+  //    reaction
+  //        .getCode()
+  //        .setBody(
+  //            FedTargetExtensionFactory.getExtension(connection.dstFederate.targetConfig.target)
+  //                .generateNetworkInputControlReactionBody(receivingPortID, maxSTP,
+  // coordination));
+  //
+  //    // Insert the reaction
+  //    top.getReactions().add(reaction);
+  //
+  //    // Add the trigger for this reaction to the list of triggers, used to actually
+  //    // trigger the reaction at the beginning of each logical time.
+  //    connection.dstFederate.networkInputControlReactionsTriggers.add(
+  //        newTriggerForControlReactionInput);
+  //
+  //    // Add the network input control reaction to the federate instance's list
+  //    // of network reactions
+  //    // connection.dstFederate.networkReactions.add(reaction);
+  //
+  //    // Add necessary dependencies to reaction to ensure that it executes correctly
+  //    // relative to other network input control reactions in the federate.
+  //    // addRelativeDependency(connection, reaction, errorReporter);
+  //  }
+
+  //  /**
+  //   * Add necessary dependency information to the signature of {@code networkInputReaction} so
+  // that
+  //   * it can execute in the correct order relative to other network reactions in the federate.
+  //   *
+  //   * <p>In particular, we want to avoid a deadlock if multiple network input control reactions
+  // in
+  //   * federate are in a zero-delay cycle through other federates in the federation. To avoid the
+  //   * deadlock, we encode the zero-delay cycle inside the federate by adding an artificial
+  // dependency
+  //   * from the output port of this federate that is involved in the cycle to the signature of
+  // {@code
+  //   * networkInputReaction} as a source.
+  //   */
+  //  private static void addRelativeDependencyAnnotation(
+  //      FedConnectionInstance connection,
+  //      Reaction networkInputReaction,
+  //      ErrorReporter errorReporter) {
+  //    var upstreamOutputPortsInFederate =
+  //        findUpstreamPortsInFederate(
+  //            connection.dstFederate,
+  //            connection.getSourcePortInstance(),
+  //            new HashSet<>(),
+  //            new HashSet<>());
+  //
+  //    ModelInfo info = new ModelInfo();
+  //    for (var port : upstreamOutputPortsInFederate) {
+  //      // VarRef sourceRef = ASTUtils.factory.createVarRef();
+  //      connection.dstFederate.networkReactionDependencyPairs.add(
+  //          new Pair<PortInstance, PortInstance>(connection.getDestinationPortInstance(), port));
+  //
+  //      // sourceRef.setContainer(port.getParent().getDefinition());
+  //      // sourceRef.setVariable(port.getDefinition());
+  //      // networkInputReaction.getSources().add(sourceRef);
+  //
+  //      // // Remove the port if it introduces cycles
+  //      // info.update(
+  //      //        (Model)networkInputReaction.eContainer().eContainer(),
+  //      //         errorReporter
+  //      //         );
+  //      // if (!info.topologyCycles().isEmpty()) {
+  //      //         networkInputReaction.getSources().remove(sourceRef);
+  //      //     }
+  //    }
+  //    // System.out.println(connection.dstFederate.networkReactionDependencyPairs);
+  //
+  //  }
 
   /**
    * Go upstream from input port {@code port} until we reach one or more output ports that belong to
@@ -834,6 +864,7 @@ private static void addNetworkSenderReactor(
     networkInstance.setName(
         ASTUtils.getUniqueIdentifier(top, "ns_" + connection.getDstFederate().name));
     top.getInstantiations().add(networkInstance);
+    addLevelAttribute(networkInstance, connection.getSourcePortInstance(), connection.srcChannel);
 
     Connection senderToReaction = factory.createConnection();
 
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 32101f4969..410fd67a24 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -47,6 +47,7 @@
 import org.lflang.generator.LFGeneratorContext.BuildParm;
 import org.lflang.generator.MixedRadixInt;
 import org.lflang.generator.PortInstance;
+import org.lflang.generator.ReactionInstanceGraph;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.generator.RuntimeRange;
 import org.lflang.generator.SendRange;
@@ -487,6 +488,8 @@ private void replaceFederateConnectionsWithProxies(Reactor federation, Resource
     // that those contain.
     ReactorInstance mainInstance = new ReactorInstance(federation, errorReporter);
 
+    new ReactionInstanceGraph(mainInstance); // Constructor has side effects; its result is ignored
+
     insertIndexers(mainInstance, resource);
 
     for (ReactorInstance child : mainInstance.children) {
diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index 53b8b7dc84..97aba1b432 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -116,19 +116,19 @@ private CharSequence generateMainSignature(
             .map(Variable::getName)
             .collect(Collectors.joining(","));
 
-    List<String> vals = new ArrayList<>();
-    for (var pair : federate.networkReactionDependencyPairs) {
-      vals.add(getDependencyList(federate, pair));
-    }
+//    List<String> vals = new ArrayList<>();
+//    for (var pair : federate.networkReactionDependencyPairs) {
+//      vals.add(getDependencyList(federate, pair));
+//    }
 
-    String intraDependencies = String.join(";", vals);
+//    String intraDependencies = String.join(";", vals);
     return """
-        @_fed_config(network_message_actions="%s", dependencyPairs="%s")
+        @_fed_config(network_message_actions="%s")
         main reactor %s {
         """
         .formatted(
             networkMessageActionsListString,
-            intraDependencies,
+//            intraDependencies,
             paramList.equals("()") ? "" : paramList);
   }
 }
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index f7e81115c3..894ef9728d 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -231,11 +231,11 @@ public Instantiation getInstantiation() {
    */
   public List<Reactor> networkReactors = new ArrayList<>();
 
-  /**
-   * List of relative dependencies between network input and output reactions belonging to the same
-   * federate that have zero logical delay between them.
-   */
-  public List<Pair<PortInstance, PortInstance>> networkReactionDependencyPairs = new ArrayList<>();
+//  /**
+//   * List of relative dependencies between network input and output reactions belonging to the same
+//   * federate that have zero logical delay between them.
+//   */
+//  public List<Pair<PortInstance, PortInstance>> networkReactionDependencyPairs = new ArrayList<>();
 
   /**
    * Mapping from a port instance of a connection to its associated network reaction. We populate
diff --git a/core/src/main/java/org/lflang/generator/PortInstance.java b/core/src/main/java/org/lflang/generator/PortInstance.java
index 60a904ef5b..f3aa439b19 100644
--- a/core/src/main/java/org/lflang/generator/PortInstance.java
+++ b/core/src/main/java/org/lflang/generator/PortInstance.java
@@ -26,6 +26,7 @@
 package org.lflang.generator;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.PriorityQueue;
@@ -204,6 +205,18 @@ public String toString() {
     return "PortInstance " + getFullName();
   }
 
+  /**
+   * Record that the {@code index}th sub-port of this has a dependent reaction of level {@code
+   * level}.
+   */
+  public void hasDependentReactionWithLevel(int index, int level) {
+    levelUpperBounds.set(index, Math.min(levelUpperBounds.get(index), level));
+  }
+
+  public int getLevelUpperBound(int index) {
+    return levelUpperBounds.get(index);
+  }
+
   //////////////////////////////////////////////////////
   //// Protected fields.
 
@@ -437,4 +450,8 @@ private void setInitialWidth(ErrorReporter errorReporter) {
 
   /** Indicator that we are clearing the caches. */
   private boolean clearingCaches = false;
+
+  /** The levels of the sub-ports of this. */
+  private final List<Integer> levelUpperBounds =
+      new ArrayList<>(Collections.nCopies(width < 0 ? 1 : width, Integer.MAX_VALUE));
 }
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstance.java b/core/src/main/java/org/lflang/generator/ReactionInstance.java
index 5e8069728f..2feaf7367b 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstance.java
@@ -371,7 +371,7 @@ public String getName() {
    * contained by the top level (the top-level reactor need not be included because its index is
    * always {@code 0}).
    *
-   * <p>The size of the returned array is the product of the widths of all of the container {@link
+   * <p>The size of the returned array is the product of the widths of all the container {@link
    * ReactorInstance} objects. If none of these is a bank, then the size will be {@code 1}.
    *
    * <p>This method creates this array the first time it is called, but then holds on to it. The
@@ -385,8 +385,7 @@ public List<Runtime> getRuntimeInstances() {
     if (size < 0) size = 1;
     runtimeInstances = new ArrayList<>(size);
     for (int i = 0; i < size; i++) {
-      Runtime r = new Runtime();
-      r.id = i;
+      Runtime r = new Runtime(i);
       if (declaredDeadline != null) {
         r.deadline = declaredDeadline.maxDelay;
       }
@@ -498,6 +497,8 @@ public TimeValue assignLogicalExecutionTime() {
   ///////////////////////////////////////////////////////////
   //// Inner classes
 
+  public record SourcePort(PortInstance port, int index) {}
+
   /** Inner class representing a runtime instance of a reaction. */
   public class Runtime {
     public TimeValue deadline;
@@ -506,10 +507,12 @@ public class Runtime {
     // point to that upstream reaction.
     public Runtime dominating;
     /** ID ranging from 0 to parent.getTotalWidth() - 1. */
-    public int id;
+    public final int id;
 
     public int level;
 
+    public List<SourcePort> sourcePorts = new ArrayList<>();
+
     public ReactionInstance getReaction() {
       return ReactionInstance.this;
     }
@@ -527,9 +530,9 @@ public String toString() {
       return result;
     }
 
-    public Runtime() {
+    public Runtime(int id) {
       this.dominating = null;
-      this.id = 0;
+      this.id = id;
       this.level = 0;
       if (ReactionInstance.this.declaredDeadline != null) {
         this.deadline = ReactionInstance.this.declaredDeadline.maxDelay;
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
index a0dd1df962..9d1bc71a7f 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
@@ -100,43 +100,43 @@ public void rebuild() {
     }
   }
 
-  /**
-   * Adds manually a set of dependent network edges as needed to nudge the level assignment
-   * algorithm into creating a correct level assignment.
-   *
-   * @param main
-   */
-  private void addDependentNetworkEdges(ReactorInstance main) {
-    // FIXME: I do not think this belongs here because it pertains to federated execution. Also, it
-    // seems to relate to a design that we do not intend to use?
-    Attribute attribute =
-        AttributeUtils.findAttributeByName(main.definition.getReactorClass(), "_fed_config");
-    String actionsStr =
-        AttributeUtils.getAttributeParameter(attribute, AttributeSpec.DEPENDENCY_PAIRS);
-    if (actionsStr == null)
-      return; // No dependent network edges, the levels algorithm has enough information
-    List<String> dependencies = List.of(actionsStr.split(";", -1));
-    // Recursively add nodes and edges from contained reactors.
-    Map<String, ReactorInstance> m = new HashMap<>();
-    for (ReactorInstance child : main.children) {
-      m.put(child.getName(), child);
-    }
-    for (String dependency : dependencies) {
-      List<String> dep = List.of(dependency.split(",", 2));
-      ReactorInstance downStream = m.getOrDefault(dep.get(0), null);
-      ReactorInstance upStream = m.getOrDefault(dep.get(1), null);
-      if (downStream == null || upStream == null) {
-        System.out.println("Downstream or Upstream reaction pair is undefined. Continuing.");
-        continue;
-      }
-      ReactionInstance down = downStream.reactions.get(0);
-      Runtime downRuntime = down.getRuntimeInstances().get(0);
-      for (ReactionInstance up : upStream.reactions) {
-        Runtime upRuntime = up.getRuntimeInstances().get(0);
-        addEdge(downRuntime, upRuntime);
-      }
-    }
-  }
+//  /**
+//   * Adds manually a set of dependent network edges as needed to nudge the level assignment
+//   * algorithm into creating a correct level assignment.
+//   *
+//   * @param main
+//   */
+//  private void addDependentNetworkEdges(ReactorInstance main) {
+//    // FIXME: I do not think this belongs here because it pertains to federated execution. Also, it
+//    // seems to relate to a design that we do not intend to use?
+//    Attribute attribute =
+//        AttributeUtils.findAttributeByName(main.definition.getReactorClass(), "_fed_config");
+////    String actionsStr =
+////        AttributeUtils.getAttributeParameter(attribute, AttributeSpec.DEPENDENCY_PAIRS);
+////    if (actionsStr == null)
+////      return; // No dependent network edges, the levels algorithm has enough information
+////    List<String> dependencies = List.of(actionsStr.split(";", -1));
+//    // Recursively add nodes and edges from contained reactors.
+//    Map<String, ReactorInstance> m = new HashMap<>();
+//    for (ReactorInstance child : main.children) {
+//      m.put(child.getName(), child);
+//    }
+////    for (String dependency : dependencies) {
+////      List<String> dep = List.of(dependency.split(",", 2));
+////      ReactorInstance downStream = m.getOrDefault(dep.get(0), null);
+////      ReactorInstance upStream = m.getOrDefault(dep.get(1), null);
+////      if (downStream == null || upStream == null) {
+////        System.out.println("Downstream or Upstream reaction pair is undefined. Continuing.");
+////        continue;
+////      }
+////      ReactionInstance down = downStream.reactions.get(0);
+////      Runtime downRuntime = down.getRuntimeInstances().get(0);
+////      for (ReactionInstance up : upStream.reactions) {
+////        Runtime upRuntime = up.getRuntimeInstances().get(0);
+////        addEdge(downRuntime, upRuntime);
+////      }
+////    }
+//  }
   /** This function rebuilds the graph and propagates and assigns deadlines to all reactions. */
   public void rebuildAndAssignDeadlines() {
     this.clear();
@@ -283,6 +283,7 @@ protected void addNodesAndEdges(ReactorInstance reactor) {
     for (ReactorInstance child : reactor.children) {
       addNodesAndEdges(child);
     }
+    registerPortInstances(reactor);
   }
 
   ///////////////////////////////////////////////////////////
@@ -297,6 +298,46 @@ protected void addNodesAndEdges(ReactorInstance reactor) {
   ///////////////////////////////////////////////////////////
   //// Private methods
 
+  private void registerPortInstances(ReactorInstance reactor) {
+    var allPorts = new ArrayList<PortInstance>();
+    allPorts.addAll(reactor.inputs);
+    allPorts.addAll(reactor.outputs);
+    for (var port : allPorts) {
+      List<SendRange> eventualDestinations = port.eventualDestinations();
+      int srcDepth = (port.isInput()) ? 2 : 1;
+
+      for (SendRange sendRange : eventualDestinations) {
+        for (RuntimeRange<PortInstance> dstRange : sendRange.destinations) {
+
+          int dstDepth = (dstRange.instance.isOutput()) ? 2 : 1;
+          MixedRadixInt dstRangePosition = dstRange.startMR();
+          int dstRangeCount = 0;
+
+          MixedRadixInt sendRangePosition = sendRange.startMR();
+          int sendRangeCount = 0;
+
+          while (dstRangeCount++ < dstRange.width) {
+            int srcIndex = sendRangePosition.get(srcDepth);
+            int dstIndex = dstRangePosition.get(dstDepth);
+            for (ReactionInstance dstReaction : dstRange.instance.dependentReactions) {
+              List<Runtime> dstRuntimes = dstReaction.getRuntimeInstances();
+              Runtime dstRuntime = dstRuntimes.get(dstIndex);
+              dstRuntime.sourcePorts.add(new ReactionInstance.SourcePort(port, srcIndex));
+            }
+            dstRangePosition.increment();
+            sendRangePosition.increment();
+            sendRangeCount++;
+            if (sendRangeCount >= sendRange.width) {
+              // Reset to multicast.
+              sendRangeCount = 0;
+              sendRangePosition = sendRange.startMR();
+            }
+          }
+        }
+      }
+    }
+  }
+
   /**
    * Analyze the dependencies between reactions and assign each reaction instance a level. This
    * method removes nodes from this graph as it assigns levels. Any remaining nodes are part of
@@ -341,12 +382,22 @@ private void assignLevels() {
 
       // Remove visited origin.
       removeNode(origin);
+      assignPortLevel(origin);
 
       // Update numReactionsPerLevel info
       adjustNumReactionsPerLevel(origin.level, 1);
     }
   }
 
+  /**
+   * Update the level of the source ports of {@code current} to be at most that of {@code current}.
+   */
+  private void assignPortLevel(Runtime current) {
+    for (var sp : current.sourcePorts) {
+      sp.port().hasDependentReactionWithLevel(sp.index(), current.level);
+    }
+  }
+
   /**
    * This function assigns inferred deadlines to all the reactions in the graph. It is modeled after
    * {@code assignLevels} but it starts at the leaf nodes and uses Kahns algorithm to build a
diff --git a/core/src/main/java/org/lflang/generator/ReactorInstance.java b/core/src/main/java/org/lflang/generator/ReactorInstance.java
index 644de11be7..10b082bc01 100644
--- a/core/src/main/java/org/lflang/generator/ReactorInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactorInstance.java
@@ -172,6 +172,8 @@ public ReactorInstance(Reactor reactor, ReactorInstance parent, ErrorReporter re
 
   public TypeParameterizedReactor tpr;
 
+  public final Integer tpoLevel;
+
   //////////////////////////////////////////////////////
   //// Public methods.
 
@@ -791,6 +793,13 @@ public ReactorInstance(
       int desiredDepth,
       List<Reactor> reactors) {
     super(definition, parent);
+    this.tpoLevel =
+        definition.getAttributes().stream()
+            .filter(it -> it.getAttrName().equals("_tpoLevel"))
+            .map(it -> it.getAttrParms().stream().findAny().orElseThrow())
+            .map(it -> Integer.parseInt(it.getValue()))
+            .findFirst()
+            .orElse(null);
     this.reporter = reporter;
     this.reactorDeclaration = definition.getReactorClass();
     this.reactorDefinition = ASTUtils.toDefinition(reactorDeclaration);
diff --git a/core/src/main/java/org/lflang/validation/AttributeSpec.java b/core/src/main/java/org/lflang/validation/AttributeSpec.java
index 71ec56e53c..c0649057f8 100644
--- a/core/src/main/java/org/lflang/validation/AttributeSpec.java
+++ b/core/src/main/java/org/lflang/validation/AttributeSpec.java
@@ -49,7 +49,7 @@ public class AttributeSpec {
 
   public static final String VALUE_ATTR = "value";
   public static final String NETWORK_MESSAGE_ACTIONS = "network_message_actions";
-  public static final String DEPENDENCY_PAIRS = "dependencyPairs";
+//  public static final String DEPENDENCY_PAIRS = "dependencyPairs";
   public static final String EACH_ATTR = "each";
 
   /** A map from a string to a supported AttributeSpec */
@@ -220,8 +220,13 @@ enum AttrParamType {
         new AttributeSpec(
             List.of(
                 new AttrParamSpec(
-                    AttributeSpec.NETWORK_MESSAGE_ACTIONS, AttrParamType.STRING, false),
-                new AttrParamSpec(AttributeSpec.DEPENDENCY_PAIRS, AttrParamType.STRING, false))));
+                    AttributeSpec.NETWORK_MESSAGE_ACTIONS, AttrParamType.STRING, false)//,
+//                new AttrParamSpec(AttributeSpec.DEPENDENCY_PAIRS, AttrParamType.STRING, false)
+            )));
     ATTRIBUTE_SPECS_BY_NAME.put("_c_body", new AttributeSpec(null));
+    ATTRIBUTE_SPECS_BY_NAME.put(
+            "_tpoLevel",
+            new AttributeSpec(List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.INT, false)))
+    );
   }
 }

From f75d05afc3b1d88d6da069845a2a411b73bcff66 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 24 Jun 2023 17:52:15 -0700
Subject: [PATCH 0475/1114] Respect TPO levels.

This code is not tested. Bugs are expected.
---
 .../generator/ReactionInstanceGraph.java      | 123 ++++++++++++------
 1 file changed, 81 insertions(+), 42 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
index 9d1bc71a7f..4f448df30d 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
@@ -27,19 +27,16 @@
 package org.lflang.generator;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Map;
+import java.util.NavigableMap;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.stream.Collectors;
-import org.lflang.AttributeUtils;
 import org.lflang.generator.ReactionInstance.Runtime;
 import org.lflang.generator.c.CUtil;
 import org.lflang.graph.PrecedenceGraph;
-import org.lflang.lf.Attribute;
 import org.lflang.lf.Variable;
-import org.lflang.validation.AttributeSpec;
 
 /**
  * This class analyzes the dependencies between reaction runtime instances. For each
@@ -84,6 +81,7 @@ public ReactionInstanceGraph(ReactorInstance main) {
   public void rebuild() {
     this.clear();
     addNodesAndEdges(main);
+    addEdgesForTpoLevels(main);
 
     // FIXME: Use {@link TargetProperty#EXPORT_DEPENDENCY_GRAPH}.
     // System.out.println(toDOT());
@@ -100,43 +98,44 @@ public void rebuild() {
     }
   }
 
-//  /**
-//   * Adds manually a set of dependent network edges as needed to nudge the level assignment
-//   * algorithm into creating a correct level assignment.
-//   *
-//   * @param main
-//   */
-//  private void addDependentNetworkEdges(ReactorInstance main) {
-//    // FIXME: I do not think this belongs here because it pertains to federated execution. Also, it
-//    // seems to relate to a design that we do not intend to use?
-//    Attribute attribute =
-//        AttributeUtils.findAttributeByName(main.definition.getReactorClass(), "_fed_config");
-////    String actionsStr =
-////        AttributeUtils.getAttributeParameter(attribute, AttributeSpec.DEPENDENCY_PAIRS);
-////    if (actionsStr == null)
-////      return; // No dependent network edges, the levels algorithm has enough information
-////    List<String> dependencies = List.of(actionsStr.split(";", -1));
-//    // Recursively add nodes and edges from contained reactors.
-//    Map<String, ReactorInstance> m = new HashMap<>();
-//    for (ReactorInstance child : main.children) {
-//      m.put(child.getName(), child);
-//    }
-////    for (String dependency : dependencies) {
-////      List<String> dep = List.of(dependency.split(",", 2));
-////      ReactorInstance downStream = m.getOrDefault(dep.get(0), null);
-////      ReactorInstance upStream = m.getOrDefault(dep.get(1), null);
-////      if (downStream == null || upStream == null) {
-////        System.out.println("Downstream or Upstream reaction pair is undefined. Continuing.");
-////        continue;
-////      }
-////      ReactionInstance down = downStream.reactions.get(0);
-////      Runtime downRuntime = down.getRuntimeInstances().get(0);
-////      for (ReactionInstance up : upStream.reactions) {
-////        Runtime upRuntime = up.getRuntimeInstances().get(0);
-////        addEdge(downRuntime, upRuntime);
-////      }
-////    }
-//  }
+  //  /**
+  //   * Adds manually a set of dependent network edges as needed to nudge the level assignment
+  //   * algorithm into creating a correct level assignment.
+  //   *
+  //   * @param main
+  //   */
+  //  private void addDependentNetworkEdges(ReactorInstance main) {
+  //    // FIXME: I do not think this belongs here because it pertains to federated execution. Also,
+  // it
+  //    // seems to relate to a design that we do not intend to use?
+  //    Attribute attribute =
+  //        AttributeUtils.findAttributeByName(main.definition.getReactorClass(), "_fed_config");
+  ////    String actionsStr =
+  ////        AttributeUtils.getAttributeParameter(attribute, AttributeSpec.DEPENDENCY_PAIRS);
+  ////    if (actionsStr == null)
+  ////      return; // No dependent network edges, the levels algorithm has enough information
+  ////    List<String> dependencies = List.of(actionsStr.split(";", -1));
+  //    // Recursively add nodes and edges from contained reactors.
+  //    Map<String, ReactorInstance> m = new HashMap<>();
+  //    for (ReactorInstance child : main.children) {
+  //      m.put(child.getName(), child);
+  //    }
+  ////    for (String dependency : dependencies) {
+  ////      List<String> dep = List.of(dependency.split(",", 2));
+  ////      ReactorInstance downStream = m.getOrDefault(dep.get(0), null);
+  ////      ReactorInstance upStream = m.getOrDefault(dep.get(1), null);
+  ////      if (downStream == null || upStream == null) {
+  ////        System.out.println("Downstream or Upstream reaction pair is undefined. Continuing.");
+  ////        continue;
+  ////      }
+  ////      ReactionInstance down = downStream.reactions.get(0);
+  ////      Runtime downRuntime = down.getRuntimeInstances().get(0);
+  ////      for (ReactionInstance up : upStream.reactions) {
+  ////        Runtime upRuntime = up.getRuntimeInstances().get(0);
+  ////        addEdge(downRuntime, upRuntime);
+  ////      }
+  ////    }
+  //  }
   /** This function rebuilds the graph and propagates and assigns deadlines to all reactions. */
   public void rebuildAndAssignDeadlines() {
     this.clear();
@@ -286,6 +285,46 @@ protected void addNodesAndEdges(ReactorInstance reactor) {
     registerPortInstances(reactor);
   }
 
+  /** Add edges that encode the precedence relations induced by the TPO levels. */
+  private void addEdgesForTpoLevels(ReactorInstance main) {
+    var constrainedReactions = getConstrainedReactions(main);
+    for (var i : constrainedReactions.keySet()) {
+      var nextKey = constrainedReactions.higherKey(i);
+      if (nextKey == null) continue;
+      for (var r : constrainedReactions.get(i)) {
+        for (var rr : constrainedReactions.get(nextKey)) {
+          addEdge(r, rr);
+        }
+      }
+    }
+  }
+
+  /**
+   * Get those reactions contained directly or transitively by the children of {@code main} whose TPO levels are
+   * specified.
+   * @return A map from TPO levels to reactions that are constrained to have the TPO levels.
+   */
+  private NavigableMap<Integer, List<Runtime>> getConstrainedReactions(ReactorInstance main) {
+    NavigableMap<Integer, List<Runtime>> constrainedReactions = new TreeMap<>();
+    for (var child : main.children) {
+      if (child.tpoLevel != null) {
+        if (!constrainedReactions.containsKey(child.tpoLevel)) {
+          constrainedReactions.put(child.tpoLevel, new ArrayList<>());
+        }
+        getAllContainedReactions(constrainedReactions.get(child.tpoLevel), child);
+      }
+    }
+    return constrainedReactions;
+  }
+
+  /** Add all reactions contained directly or transitively by {@code r}. */
+  private void getAllContainedReactions(List<Runtime> runtimeReactions, ReactorInstance r) {
+    for (var reaction : r.reactions) {
+      runtimeReactions.addAll(reaction.getRuntimeInstances());
+    }
+    for (var child : r.children) getAllContainedReactions(runtimeReactions, child);
+  }
+
   ///////////////////////////////////////////////////////////
   //// Private fields
 

From a2624041a612e5a62a4659bcabd3604d9ebd637b Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 24 Jun 2023 19:39:47 -0700
Subject: [PATCH 0476/1114] Fix (?) IndexOutOfBoundsException.

This works for StarvationThreaded.
---
 core/src/main/java/org/lflang/generator/PortInstance.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/PortInstance.java b/core/src/main/java/org/lflang/generator/PortInstance.java
index f3aa439b19..45c706febe 100644
--- a/core/src/main/java/org/lflang/generator/PortInstance.java
+++ b/core/src/main/java/org/lflang/generator/PortInstance.java
@@ -453,5 +453,7 @@ private void setInitialWidth(ErrorReporter errorReporter) {
 
   /** The levels of the sub-ports of this. */
   private final List<Integer> levelUpperBounds =
-      new ArrayList<>(Collections.nCopies(width < 0 ? 1 : width, Integer.MAX_VALUE));
+      new ArrayList<>(
+          Collections.nCopies(
+              (width < 0 ? 1 : width) * (parent.width < 0 ? 1 : parent.width), Integer.MAX_VALUE));
 }

From 6e4b862e7a1c4c870be8e88dc363aab7a9a89e99 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 24 Jun 2023 19:52:09 -0700
Subject: [PATCH 0477/1114] Order of source and sink was reversed.

---
 .../main/java/org/lflang/generator/ReactionInstanceGraph.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
index 4f448df30d..aba5836f17 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
@@ -293,7 +293,7 @@ private void addEdgesForTpoLevels(ReactorInstance main) {
       if (nextKey == null) continue;
       for (var r : constrainedReactions.get(i)) {
         for (var rr : constrainedReactions.get(nextKey)) {
-          addEdge(r, rr);
+          addEdge(rr, r);
         }
       }
     }

From 8d14cb345e328e24499739d7d81834b11fe1e50f Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 24 Jun 2023 20:02:05 -0700
Subject: [PATCH 0478/1114] Add another little hack to get strict inequality.

---
 .../lflang/federated/generator/FedASTUtils.java | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index f2635079a9..f4d7c8462c 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -389,19 +389,12 @@ private static void addLevelAttribute(Instantiation instantiation, PortInstance
     var a = LfFactory.eINSTANCE.createAttribute();
     a.setAttrName("_tpoLevel");
     var e = LfFactory.eINSTANCE.createAttrParm();
-    // If the port is an input, we can the port the maximum level possible without changing its
-    // ordering relative to a
-    // reaction. If it is an output, then either it does nothing or it sends to an input. The former
-    // case is fine;
-    // to handle the latter case, we decrement 1 to ensure that it precedes the level of the input
-    // that it sends to.
-    // This also does not change its ordering relative to any reaction that is upstream of the
-    // receiving port because
-    // our current level assignment algorithm increments the level between every reaction, so in the
-    // worst case this
-    // gives this port the same level as the sending reaction.
+    // preserve relative orderings according to the downstream reaction, but also ensure that the
+    // output and the input
+    // that it is connected to, which both have the same downstream reaction, have the correct
+    // ordering wrt each other.
     var ub = p.getLevelUpperBound(index);
-    e.setValue(String.valueOf(p.isInput() ? ub : ub - 1));
+    e.setValue(String.valueOf(p.isInput() ? 2 * ub : 2 * ub - 1));
     a.getAttrParms().add(e);
     instantiation.getAttributes().add(a);
   }

From 48c019f9066eda1b121439371f88415bc2e5482f Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 24 Jun 2023 23:16:01 -0700
Subject: [PATCH 0479/1114] Do something bad to see if tests pass.

Do not worry, this is temporary!
---
 core/src/main/java/org/lflang/generator/PortInstance.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/PortInstance.java b/core/src/main/java/org/lflang/generator/PortInstance.java
index 45c706febe..d28b8720ad 100644
--- a/core/src/main/java/org/lflang/generator/PortInstance.java
+++ b/core/src/main/java/org/lflang/generator/PortInstance.java
@@ -210,7 +210,12 @@ public String toString() {
    * level}.
    */
   public void hasDependentReactionWithLevel(int index, int level) {
-    levelUpperBounds.set(index, Math.min(levelUpperBounds.get(index), level));
+    // FIXME: index is ignored. This is a real bug that will keep this from working properly in some
+    // cases! We should
+    //  fix it before merging into master. The precondition for fixing it is to compute the
+    // sendRange for the current
+    //  port or top-level port sending into the dependent reaction, not the earliest port possible.
+    levelUpperBounds.replaceAll(a -> Math.min(a, level));
   }
 
   public int getLevelUpperBound(int index) {

From 58dec3224e282a99ca9ff8f7ca53644be79c252b Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Mon, 26 Jun 2023 13:47:40 +0200
Subject: [PATCH 0480/1114] Bump reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index b238c88a00..95106eb4a6 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit b238c88a00f690a96e3b28a568f73ed89c4d13ae
+Subproject commit 95106eb4a6294f0e76ab60bcd38f931c6d9cdad0

From 6508f7506c53c0d3861ad7ef77a61b27d34f471b Mon Sep 17 00:00:00 2001
From: Abhi Gundrala <gundralaa@berkeley.edu>
Date: Mon, 26 Jun 2023 11:38:36 -0700
Subject: [PATCH 0481/1114] bump reactor-cpp

---
 core/src/main/resources/lib/cpp/reactor-cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/cpp/reactor-cpp b/core/src/main/resources/lib/cpp/reactor-cpp
index e3564782f0..b607f1f640 160000
--- a/core/src/main/resources/lib/cpp/reactor-cpp
+++ b/core/src/main/resources/lib/cpp/reactor-cpp
@@ -1 +1 @@
-Subproject commit e3564782f0e1a2bc427e5932a88ff8f87dacd50c
+Subproject commit b607f1f64083ab531e7a676b29de75f076aa1cde

From d59235a20e453f8e3a0363aa20a0302d1c0fc131 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 26 Jun 2023 13:41:14 -0700
Subject: [PATCH 0482/1114] Update submodule.

---
 .../java/org/lflang/federated/extensions/CExtension.java  | 8 ++++----
 core/src/main/resources/lib/c/reactor-c                   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 5a41efbbd0..0bbd9049de 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -548,16 +548,16 @@ protected String makePreamble(
     int numOfNetworkReactions = federate.networkReceiverReactions.size();
     code.pr(
         """
-        reaction_t* networkInputReactions[%1$s];
-        size_t numNetworkInputReactions = %1$s;
+        reaction_t* network_input_reactions[%1$s];
+        size_t num_network_input_reactions = %1$s;
         """
             .formatted(numOfNetworkReactions));
 
     int numOfNetworkSenderControlReactions = federate.networkSenderControlReactions.size();
     code.pr(
         """
-        reaction_t* portAbsentReaction[%1$s];
-        size_t numSenderReactions = %1$s;
+        reaction_t* port_absent_reaction[%1$s];
+        size_t num_sender_reactions = %1$s;
         """
             .formatted(numOfNetworkSenderControlReactions));
 
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 90888a96bd..d14c83ff43 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 90888a96bd9aaf726718890bd2c9774a2bd674f1
+Subproject commit d14c83ff43322b5c0905b693f3a4def75d3659a7

From 35778b54344df901609553306a2567b4c0038896 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 26 Jun 2023 21:07:56 -0700
Subject: [PATCH 0483/1114] Get BroadcastFeedback to pass locally.

---
 core/src/main/java/org/lflang/ast/ToLf.java   |   2 +-
 .../federated/extensions/CExtension.java      |   9 +-
 .../federated/extensions/CExtensionUtils.java |  60 +++++----
 .../federated/generator/FedASTUtils.java      | 116 +++++++++++++-----
 .../federated/generator/FederateInstance.java |   2 +
 .../generator/c/CReactionGenerator.java       |  25 ++--
 core/src/main/resources/lib/c/reactor-c       |   2 +-
 7 files changed, 135 insertions(+), 81 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 9505c57478..2dfe99c390 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -610,7 +610,7 @@ public MalleableString caseReaction(Reaction object) {
     } else {
       msb.append("reaction");
     }
-    msb.append(list(true, object.getTriggers()));
+    msb.append(list(false, object.getTriggers()));
     msb.append(list(", ", " ", "", true, false, object.getSources()));
     if (!object.getEffects().isEmpty()) {
       List<Mode> allModes = ASTUtils.allModes(ASTUtils.getEnclosingReactor(object));
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 0bbd9049de..8c93ae69fc 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -462,11 +462,10 @@ public String generateNetworkOutputControlReactionBody(
             "\n",
             "// If the output port has not been lf_set for the current logical time,",
             "// send an ABSENT message to the receiving federate            ",
-            "LF_PRINT_LOG(\"Contemplating whether to send port \"",
-            "          \"absent for port %d to federate %d.\", ",
-            "          " + receivingPortID + ", " + connection.getDstFederate().id + ");",
+            "LF_PRINT_LOG(\"Executing port absent reaction for port %d to federate %d at time %lld.\", ",
+            "          " + receivingPortID + ", " + connection.getDstFederate().id + ", (long long) lf_time_logical_elapsed());",
             "if (" + sendRef + " == NULL || !" + sendRef + "->is_present) {",
-            "    // The output port is NULL or it is not present.",
+            "LF_PRINT_LOG(\"The output port is NULL or it is not present.\");",
             "    send_port_absent_to_federate("
                 + additionalDelayString
                 + ", "
@@ -556,7 +555,7 @@ protected String makePreamble(
     int numOfNetworkSenderControlReactions = federate.networkSenderControlReactions.size();
     code.pr(
         """
-        reaction_t* port_absent_reaction[%1$s];
+        reaction_t* port_absent_reaction[%1$s] = { 0 };
         size_t num_sender_reactions = %1$s;
         """
             .formatted(numOfNetworkSenderControlReactions));
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 1f9fbc2454..1f72cb23a1 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -116,8 +116,6 @@ public static String initializeTriggersForNetworkActions(
    * if it isn't known.
    *
    * @param federate The federate.
-   * @param main The main reactor that contains the federate (used to lookup references).
-   * @return
    */
   public static String stpStructs(FederateInstance federate, ErrorReporter errorReporter) {
     CodeBuilder code = new CodeBuilder();
@@ -699,33 +697,33 @@ public static CharSequence upstreamPortReactions(
     return code.getCode();
   }
 
-  public static CharSequence downstreamControlPortReactions(
-      FederateInstance federate, ReactorInstance main) {
-    CodeBuilder code = new CodeBuilder();
-    if (!federate.networkSenderControlReactions.isEmpty()) {
-      // Create a static array of trigger_t pointers.
-      // networkMessageActions is a list of Actions, but we
-      // need a list of trigger struct names for ActionInstances.
-      // There should be exactly one ActionInstance in the
-      // main reactor for each Action.
-      var reactions = new LinkedList<String>();
-      for (int i = 0; i < federate.networkSenderControlReactions.size(); ++i) {
-        // Find the corresponding ActionInstance.
-        var reaction = federate.networkSenderControlReactions.get(i);
-        var reactor = main.lookupReactorInstance(federate.networkSenderInstantiations.get(i));
-        var reactionInstance = reactor.lookupReactionInstance(reaction);
-        reactions.add(CUtil.reactionRef(reactionInstance));
-      }
-      var tableCount = 0;
-      for (String react : reactions) {
-        code.pr(
-            "downstreamControlPortReactions["
-                + (tableCount++)
-                + "] = (reaction_t*)&"
-                + react
-                + "; \\");
-      }
-    }
-    return code.getCode();
-  }
+//  public static CharSequence downstreamControlPortReactions(
+//      FederateInstance federate, ReactorInstance main) {
+//    CodeBuilder code = new CodeBuilder();
+//    if (!federate.networkSenderControlReactions.isEmpty()) {
+//      // Create a static array of trigger_t pointers.
+//      // networkMessageActions is a list of Actions, but we
+//      // need a list of trigger struct names for ActionInstances.
+//      // There should be exactly one ActionInstance in the
+//      // main reactor for each Action.
+//      var reactions = new LinkedList<String>();
+//      for (int i = 0; i < federate.networkSenderControlReactions.size(); ++i) {
+//        // Find the corresponding ActionInstance.
+//        var reaction = federate.networkSenderControlReactions.get(i);
+//        var reactor = main.lookupReactorInstance(federate.networkSenderInstantiations.get(i));
+//        var reactionInstance = reactor.lookupReactionInstance(reaction);
+//        reactions.add(CUtil.reactionRef(reactionInstance));
+//      }
+//      var tableCount = 0;
+//      for (String react : reactions) {
+//        code.pr(
+//            "downstreamControlPortReactions["
+//                + (tableCount++)
+//                + "] = (reaction_t*)&"
+//                + react
+//                + "; \\");
+//      }
+//    }
+//    return code.getCode();
+//  }
 }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index f4d7c8462c..f0e604e12d 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -45,7 +45,6 @@
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
-import org.lflang.ModelInfo;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
@@ -55,6 +54,8 @@
 import org.lflang.generator.ReactionInstance;
 import org.lflang.lf.Action;
 import org.lflang.lf.ActionOrigin;
+import org.lflang.lf.Assignment;
+import org.lflang.lf.BuiltinTrigger;
 import org.lflang.lf.BuiltinTriggerRef;
 import org.lflang.lf.Connection;
 import org.lflang.lf.Expression;
@@ -69,7 +70,6 @@
 import org.lflang.lf.Type;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
-import org.lflang.util.Pair;
 
 /**
  * A helper class for AST transformations needed for federated execution.
@@ -748,7 +748,6 @@ public static <E> List<E> safe(List<E> list) {
     return list == null ? Collections.emptyList() : list;
   }
 
-  public static int networkIDSender = 0;
   public static int networkIDReceiver = 0;
 
   private static Map<FedConnectionInstance, Reactor> networkSenderReactors = new HashMap<>();
@@ -762,21 +761,43 @@ private static Reactor getNetworkSenderReactor(
     LfFactory factory = LfFactory.eINSTANCE;
     Type type = EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getType());
 
-    // Initialize Reactor and Reaction AST Nodes
-    Reactor sender = factory.createReactor();
-    Reaction networkSenderReaction = factory.createReaction();
-
     VarRef inRef = factory.createVarRef(); // in port to network reaction
     VarRef destRef = factory.createVarRef(); // destination fed
 
+    // Initialize Reactor and Reaction AST Nodes
+    Reactor sender = factory.createReactor();
+
     Input in = factory.createInput();
+    in.setName("msg");
+    in.setType(type);
+    in.setWidthSpec(
+            EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getWidthSpec()));
+    inRef.setVariable(in);
 
+    destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
+    destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
+
+    Reaction networkSenderReaction = getNetworkSenderReaction(inRef, destRef, connection, coordination, type, errorReporter);
+
+    var senderIndexParameter = LfFactory.eINSTANCE.createParameter();
+    var senderIndexParameterType = LfFactory.eINSTANCE.createType();
+    senderIndexParameter.setName("sender_index");
+    senderIndexParameterType.setId("int");
+    senderIndexParameter.setType(senderIndexParameterType);
+    var senderIndexParameterInit = LfFactory.eINSTANCE.createInitializer();
+    var senderIndexParameterInitExpr = LfFactory.eINSTANCE.createLiteral();
+    senderIndexParameterInitExpr.setLiteral("0");
+    senderIndexParameterInit.getExprs().add(senderIndexParameterInitExpr);
+    senderIndexParameter.setInit(senderIndexParameterInit);
+    sender.getParameters().add(senderIndexParameter);
+
+    sender.getReactions().add(getInitializationReaction());
     sender.getReactions().add(networkSenderReaction);
     sender.getInputs().add(in);
 
     EObject node = IteratorExtensions.findFirst(resource.getAllContents(), Model.class::isInstance);
     ((Model) node).getReactors().add(sender);
-    sender.setName("NetworkSender_" + networkIDSender++);
+    sender.setName("NetworkSender_" + connection.getSrcFederate().networkIdSender);
     // networkSenderReaction.setName("NetworkSenderReaction_" + networkIDSender++);
 
     // FIXME: do not create a new extension every time it is used
@@ -787,18 +808,25 @@ private static Reactor getNetworkSenderReactor(
     // these reactions to appear only in the federate whose bank ID matches.
     setReactionBankIndex(networkSenderReaction, connection.getSrcBank());
 
-    in.setName("msg");
-    in.setType(type);
-    in.setWidthSpec(
-        EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getWidthSpec()));
-    inRef.setVariable(in);
+    // Add the network sender reaction to the federate instance's list
+    // of network reactions
+    connection.srcFederate.networkSenderReactions.add(networkSenderReaction);
+    connection.srcFederate.networkReactors.add(sender);
 
-    destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
-    destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
+    networkSenderReactors.put(connection, sender);
+    return sender;
+  }
 
-    // Configure the sending reaction.
+  private static Reaction getNetworkSenderReaction(
+      VarRef inRef,
+      VarRef destRef,
+      FedConnectionInstance connection,
+      CoordinationType coordination,
+      Type type,
+      ErrorReporter errorReporter) {
+    var networkSenderReaction = LfFactory.eINSTANCE.createReaction();
     networkSenderReaction.getTriggers().add(inRef);
-    networkSenderReaction.setCode(factory.createCode());
+    networkSenderReaction.setCode(LfFactory.eINSTANCE.createCode());
     networkSenderReaction
         .getCode()
         .setBody(
@@ -810,14 +838,25 @@ private static Reactor getNetworkSenderReactor(
                     InferredType.fromAST(type),
                     coordination,
                     errorReporter));
+    return networkSenderReaction;
+  }
 
-    // Add the network sender reaction to the federate instance's list
-    // of network reactions
-    connection.srcFederate.networkSenderReactions.add(networkSenderReaction);
-    connection.srcFederate.networkReactors.add(sender);
-
-    networkSenderReactors.put(connection, sender);
-    return sender;
+  private static Reaction getInitializationReaction() {
+    var initializationReaction = LfFactory.eINSTANCE.createReaction();
+    var startup = LfFactory.eINSTANCE.createBuiltinTriggerRef();
+    startup.setType(BuiltinTrigger.STARTUP);
+    initializationReaction.getTriggers().add(startup);
+    var code = LfFactory.eINSTANCE.createCode();
+    code.setBody("""
+            extern reaction_t* port_absent_reaction[];
+            void enqueue_network_output_control_reactions();
+            LF_PRINT_DEBUG("Adding network output control reaction to table.");
+            port_absent_reaction[self->sender_index] = &self->_lf__reaction_2;
+            LF_PRINT_DEBUG("Added network output control reaction to table. Enqueueing it...");
+            enqueue_network_output_control_reactions();
+            """);
+    initializationReaction.setCode(code);
+    return initializationReaction;
   }
 
   /**
@@ -857,6 +896,7 @@ private static void addNetworkSenderReactor(
     networkInstance.setName(
         ASTUtils.getUniqueIdentifier(top, "ns_" + connection.getDstFederate().name));
     top.getInstantiations().add(networkInstance);
+    networkInstance.getParameters().add(getSenderIndex(connection.getSrcFederate().networkIdSender++));
     addLevelAttribute(networkInstance, connection.getSourcePortInstance(), connection.srcChannel);
 
     Connection senderToReaction = factory.createConnection();
@@ -888,6 +928,20 @@ private static void addNetworkSenderReactor(
         connection.getSourcePortInstance(), networkInstance);
   }
 
+  private static Assignment getSenderIndex(int networkIDSender) {
+    var senderIndex = LfFactory.eINSTANCE.createAssignment();
+    var senderIndexParameter = LfFactory.eINSTANCE.createParameter();
+    senderIndexParameter.setName("sender_index");
+    senderIndex.setLhs(senderIndexParameter);
+    var senderIndexInitializer = LfFactory.eINSTANCE.createInitializer();
+    senderIndexInitializer.setAssign(true);
+    var senderIndexInitializerExpression = LfFactory.eINSTANCE.createLiteral();
+    senderIndexInitializerExpression.setLiteral(String.valueOf(networkIDSender));
+    senderIndexInitializer.getExprs().add(senderIndexInitializerExpression);
+    senderIndex.setRhs(senderIndexInitializer);
+    return senderIndex;
+  }
+
   /**
    * Add a network control reaction for a given output port 'source' to source's parent reactor.
    * This reaction will send a port absent message if the status of the output port is absent.
@@ -933,10 +987,10 @@ private static void addNetworkOutputControlReaction(FedConnectionInstance connec
     // If no trigger with the name "outputControlReactionTrigger" is
     // already added to the reactor definition, we need to create it
     // for the first time. The trigger is a logical action.
-    Action newTriggerForControlReactionVariable = factory.createAction();
-    newTriggerForControlReactionVariable.setName("outputControlReactionTrigger");
-    newTriggerForControlReactionVariable.setOrigin(ActionOrigin.LOGICAL);
-    top.getActions().add(newTriggerForControlReactionVariable);
+    //    Action newTriggerForControlReactionVariable = factory.createAction();
+    //    newTriggerForControlReactionVariable.setName("outputControlReactionTrigger");
+    //    newTriggerForControlReactionVariable.setOrigin(ActionOrigin.LOGICAL);
+    //    top.getActions().add(newTriggerForControlReactionVariable);
 
     // // Now that the variable is created, store it in the federate instance
     // connection.srcFederate.networkOutputControlReactionsTrigger
@@ -951,9 +1005,9 @@ private static void addNetworkOutputControlReaction(FedConnectionInstance connec
     // }
 
     // Add the trigger for all output control reactions to the list of triggers
-    VarRef triggerRef = factory.createVarRef();
-    triggerRef.setVariable(newTriggerForControlReactionVariable);
-    reaction.getTriggers().add(triggerRef);
+    //    VarRef triggerRef = factory.createVarRef();
+    //    triggerRef.setVariable(newTriggerForControlReactionVariable);
+    //    reaction.getTriggers().add(triggerRef);
     // int val = networkIDSender-1;
     // reaction.setName("NetworkSenderControlReaction_" + val);
 
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index 894ef9728d..91b8166f79 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -136,6 +136,8 @@ public Instantiation getInstantiation() {
   /** A list of individual connections between federates */
   public Set<FedConnectionInstance> connections = new HashSet<>();
 
+  public int networkIdSender = 0;
+
   /**
    * Map from the federates that this federate receives messages from to the delays on connections
    * from that federate. The delay set may include null, meaning that there is a connection from the
diff --git a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
index 824dc97ee6..411b0c1632 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
@@ -136,18 +136,19 @@ public static String generateInitializationForReaction(
       for (Input input : tpr.reactor().getInputs()) {
         reactionInitialization.pr(generateInputVariablesInReaction(input, tpr, types));
       }
-    }
-    // Define argument for non-triggering inputs.
-    for (VarRef src : ASTUtils.convertToEmptyListIfNull(reaction.getSources())) {
-      if (src.getVariable() instanceof Port) {
-        generatePortVariablesInReaction(
-            reactionInitialization, fieldsForStructsForContainedReactors, src, tpr, types);
-      } else if (src.getVariable() instanceof Action) {
-        // It's a bit odd to read but not be triggered by an action, but
-        // OK, I guess we allow it.
-        reactionInitialization.pr(
-            generateActionVariablesInReaction((Action) src.getVariable(), tpr, types));
-        actionsAsTriggers.add((Action) src.getVariable());
+    } else {
+      // Define argument for non-triggering inputs.
+      for (VarRef src : ASTUtils.convertToEmptyListIfNull(reaction.getSources())) {
+        if (src.getVariable() instanceof Port) {
+          generatePortVariablesInReaction(
+                  reactionInitialization, fieldsForStructsForContainedReactors, src, tpr, types);
+        } else if (src.getVariable() instanceof Action) {
+          // It's a bit odd to read but not be triggered by an action, but
+          // OK, I guess we allow it.
+          reactionInitialization.pr(
+                  generateActionVariablesInReaction((Action) src.getVariable(), tpr, types));
+          actionsAsTriggers.add((Action) src.getVariable());
+        }
       }
     }
 
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index d14c83ff43..bef58d3a2b 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit d14c83ff43322b5c0905b693f3a4def75d3659a7
+Subproject commit bef58d3a2b9c05dfb733bc057480f66a033936e4

From ff001ddca6ee8ebc61b53639176891f825b7d0e8 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 26 Jun 2023 21:39:32 -0700
Subject: [PATCH 0484/1114] Another quick temporary hack.

Just to see how many tests pass.
---
 .../main/java/org/lflang/federated/generator/FedASTUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index f0e604e12d..0dedf9e47f 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -259,7 +259,7 @@ private static void addNetworkReceiverReactor(
     // networkReceiverReaction.setName("NetworkReceiverReaction_" + networkIDReceiver++);
 
     addLevelAttribute(
-        networkInstance, connection.getDestinationPortInstance(), connection.getSrcChannel());
+        networkInstance, connection.getDestinationPortInstance(), 0/*connection.getSrcChannel()*/);
     networkInstance.setReactorClass(receiver);
     networkInstance.setName(
         ASTUtils.getUniqueIdentifier(top, "nr_" + connection.getDstFederate().name));
@@ -897,7 +897,7 @@ private static void addNetworkSenderReactor(
         ASTUtils.getUniqueIdentifier(top, "ns_" + connection.getDstFederate().name));
     top.getInstantiations().add(networkInstance);
     networkInstance.getParameters().add(getSenderIndex(connection.getSrcFederate().networkIdSender++));
-    addLevelAttribute(networkInstance, connection.getSourcePortInstance(), connection.srcChannel);
+    addLevelAttribute(networkInstance, connection.getSourcePortInstance(), 0/*connection.srcChannel*/);
 
     Connection senderToReaction = factory.createConnection();
 

From d9b1a70017e0fee4fdfccbdf936de54699bb6f3e Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 27 Jun 2023 13:06:31 +0200
Subject: [PATCH 0485/1114] switch to the jacoco aggregation plugin

---
 build.gradle                                  |  2 +-
 .../groovy/org.lflang.test-conventions.gradle | 24 +------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5abf2056b2..4b7923a9fc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,7 +67,7 @@ tasks.register('targetTest') {
             throw new GradleException("Please set the \'target\' project property using -Ptarget=<...>. You may chose any of $targets")
         }
     }
-    finalizedBy('core:integrationTest')
+    finalizedBy('core:integrationTestCodeCoverageReport')
 }
 tasks.register('singleTest') {
     doLast {
diff --git a/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle b/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle
index b098edcc2d..30b49c98dd 100644
--- a/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'java-test-fixtures'
     id 'jacoco'
+    id 'jacoco-report-aggregation'
 }
 
 jacoco {
@@ -81,26 +82,3 @@ test {
         maxParallelForks = 1
     }
 }
-
-jacocoTestReport {
-    getExecutionData().setFrom(fileTree(buildDir).include("/jacoco/*.exec"))
-
-    reports {
-        xml.required = true
-        csv.required = false
-        html.outputLocation = file("${buildDir}/reports/html/jacoco")
-        xml.outputLocation = file("${buildDir}/reports/xml/jacoco")
-    }
-
-    afterEvaluate {
-        classDirectories.setFrom(files(classDirectories.files.collect {
-            fileTree(dir: it,
-                    exclude: ['**/org/lflang/services/**',
-                              '**/org/lflang/lf/**',
-                              '**/org/lflang/serializer/**',
-                              '**/org/lflang/parser/antlr/**'
-                    ]
-            )
-        }))
-    }
-}

From 21f93ca4bfe11b5ed008a727a48731656bd6fae5 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 27 Jun 2023 13:07:48 +0200
Subject: [PATCH 0486/1114] filter test reports in codecov configuration

---
 codecov.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/codecov.yml b/codecov.yml
index 14d5e24036..3504621f92 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -14,3 +14,9 @@ coverage:
     # do not run coverage on patch nor changes
     patch: no
     changes: no
+
+ignore: ['**/org/lflang/services/**',
+         '**/org/lflang/lf/**',
+         '**/org/lflang/ide/**',
+         '**/org/lflang/serializer/**',
+         '**/org/lflang/parser/antlr/**']

From 594eaabe608799057102ab214711335f3bae320b Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 27 Jun 2023 13:21:40 +0200
Subject: [PATCH 0487/1114] update coverage paths

---
 .github/workflows/build.yml               | 2 +-
 .github/workflows/c-arduino-tests.yml     | 2 +-
 .github/workflows/c-tests.yml             | 2 +-
 .github/workflows/c-zephyr-tests.yml      | 2 +-
 .github/workflows/cpp-ros2-tests.yml      | 2 +-
 .github/workflows/cpp-tests.yml           | 2 +-
 .github/workflows/lsp-tests.yml           | 2 +-
 .github/workflows/py-tests.yml            | 2 +-
 .github/workflows/rs-tests.yml            | 2 +-
 .github/workflows/serialization-tests.yml | 2 +-
 .github/workflows/ts-tests.yml            | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f156cba902..ec7d38836d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,6 +32,6 @@ jobs:
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/xml/jacoco,cli/lfc/build/reports/xml/jacoco,cli/lff/build/reports/xml/jacoco,cli/lfd/build/reports/xml/jacoco
+          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/base/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfc/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfd/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lff/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
diff --git a/.github/workflows/c-arduino-tests.yml b/.github/workflows/c-arduino-tests.yml
index 5b9e9a6213..d778bffe4c 100644
--- a/.github/workflows/c-arduino-tests.yml
+++ b/.github/workflows/c-arduino-tests.yml
@@ -69,7 +69,7 @@ jobs:
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/xml/jacoco
+          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ !inputs.runtime-ref && runner.os == 'Linux' && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml
index 956fb4c967..36d1563286 100644
--- a/.github/workflows/c-tests.yml
+++ b/.github/workflows/c-tests.yml
@@ -69,7 +69,7 @@ jobs:
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/xml/jacoco
+          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ !inputs.compiler-ref && runner.os == 'Linux' && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index ed12b4e64e..177fc28c73 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -59,7 +59,7 @@ jobs:
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/xml/jacoco
+          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ !inputs.runtime-ref }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/cpp-ros2-tests.yml b/.github/workflows/cpp-ros2-tests.yml
index 416499c832..b2eda4a769 100644
--- a/.github/workflows/cpp-ros2-tests.yml
+++ b/.github/workflows/cpp-ros2-tests.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/xml/jacoco
+          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ !inputs.runtime-ref }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/cpp-tests.yml b/.github/workflows/cpp-tests.yml
index ef59f3a794..825461e30f 100644
--- a/.github/workflows/cpp-tests.yml
+++ b/.github/workflows/cpp-tests.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/xml/jacoco
+          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ !inputs.runtime-ref && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/lsp-tests.yml b/.github/workflows/lsp-tests.yml
index 9d6e22e401..d5170f6f05 100644
--- a/.github/workflows/lsp-tests.yml
+++ b/.github/workflows/lsp-tests.yml
@@ -83,7 +83,7 @@ jobs:
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/xml/jacoco
+          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ runner.os == 'Linux' && inputs.all-platforms }}
diff --git a/.github/workflows/py-tests.yml b/.github/workflows/py-tests.yml
index 8412dfcc02..12b576a12f 100644
--- a/.github/workflows/py-tests.yml
+++ b/.github/workflows/py-tests.yml
@@ -69,7 +69,7 @@ jobs:
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/xml/jacoco
+          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ !inputs.compiler-ref && runner.os == 'Linux' && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/rs-tests.yml b/.github/workflows/rs-tests.yml
index 9f9c7d6a52..8ee706094e 100644
--- a/.github/workflows/rs-tests.yml
+++ b/.github/workflows/rs-tests.yml
@@ -70,7 +70,7 @@ jobs:
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/xml/jacoco
+          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ !inputs.compiler-ref && runner.os == 'Linux' && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/serialization-tests.yml b/.github/workflows/serialization-tests.yml
index a093ac871a..435bca7bef 100644
--- a/.github/workflows/serialization-tests.yml
+++ b/.github/workflows/serialization-tests.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/xml/jacoco
+          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ !inputs.runtime-ref }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/ts-tests.yml b/.github/workflows/ts-tests.yml
index 331075b401..7f8be07511 100644
--- a/.github/workflows/ts-tests.yml
+++ b/.github/workflows/ts-tests.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/xml/jacoco
+          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ runner.os == 'Linux' && inputs.all-platforms }}

From e5d21c153ed368b4ab9b9c1c159a82124c6bbe63 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 27 Jun 2023 13:37:45 +0200
Subject: [PATCH 0488/1114] update/fix CI workflows

---
 .github/workflows/build.yml               |  6 ++----
 .github/workflows/c-arduino-tests.yml     |  4 +---
 .github/workflows/c-tests.yml             |  4 +---
 .github/workflows/c-zephyr-tests.yml      | 10 ++++------
 .github/workflows/cpp-ros2-tests.yml      |  4 +---
 .github/workflows/cpp-tests.yml           |  4 +---
 .github/workflows/lsp-tests.yml           |  6 ++----
 .github/workflows/py-tests.yml            |  4 +---
 .github/workflows/rs-tests.yml            |  4 +---
 .github/workflows/serialization-tests.yml |  6 ++----
 .github/workflows/ts-tests.yml            |  4 +---
 11 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ec7d38836d..f43257cdcf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,14 +24,12 @@ jobs:
       - name: Prepare build environment
         uses: ./.github/actions/prepare-build-env
       - name: Build and package lf cli tools (regular build)
-        run: ./gradlew build
+        run: ./gradlew build testCodeCoverageReport
         shell: bash
-      - name: Collect code coverage
-        run: ./gradlew jacocoTestReport
-        if: ${{ runner.os == 'Linux' }}
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
           files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/base/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfc/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfd/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lff/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
+        if: ${{ runner.os == 'Linux' }}
diff --git a/.github/workflows/c-arduino-tests.yml b/.github/workflows/c-arduino-tests.yml
index d778bffe4c..04cd672714 100644
--- a/.github/workflows/c-arduino-tests.yml
+++ b/.github/workflows/c-arduino-tests.yml
@@ -64,12 +64,10 @@ jobs:
           arduino-cli core install arduino:mbed
       - name: Perform Arduino tests for C target with default scheduler
         run: ./gradlew targetTest -Ptarget=CArduino
-      - name: Collect code coverage
-        run: ./gradlew jacocoTestReport
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ !inputs.runtime-ref && runner.os == 'Linux' && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml
index 36d1563286..e0847f0cce 100644
--- a/.github/workflows/c-tests.yml
+++ b/.github/workflows/c-tests.yml
@@ -64,12 +64,10 @@ jobs:
       - name: Perform tests for CCpp target with default scheduler
         run: ./gradlew targetTest -Ptarget=CCpp
         if: ${{ inputs.use-cpp && !inputs.scheduler }}
-      - name: Collect code coverage
-        run: ./gradlew jacocoTestReport
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ !inputs.compiler-ref && runner.os == 'Linux' && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index 177fc28c73..1293070e1e 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -41,25 +41,23 @@ jobs:
         if: ${{ inputs.runtime-ref }}
       - name: Run Zephyr smoke tests
         run: |
-          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildZephyr*
+          ./gradlew core:integrationTestCodeCoverageReport --tests org.lflang.tests.runtime.CZephyrTest.buildZephyr*
           util/RunZephyrTests.sh test/C/src-gen
           rm -r test/C/src-gen
       - name: Run basic tests
         run: |
-          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildBasic*
+          ./gradlew core:integrationTestCodeCoverageReport --tests org.lflang.tests.runtime.CZephyrTest.buildBasic*
           util/RunZephyrTests.sh test/C/src-gen
           rm -r test/C/src-gen
       - name: Run concurrent tests
         run: |
-          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildConcurrent*
+          ./gradlew core:integrationTestCodeCoverageReport --tests org.lflang.tests.runtime.CZephyrTest.buildConcurrent*
           util/RunZephyrTests.sh test/C/src-gen
           rm -r test/C/src-gen
-      - name: Collect code coverage
-        run: ./gradlew jacocoTestReport
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ !inputs.runtime-ref }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/cpp-ros2-tests.yml b/.github/workflows/cpp-ros2-tests.yml
index b2eda4a769..8d585f9cce 100644
--- a/.github/workflows/cpp-ros2-tests.yml
+++ b/.github/workflows/cpp-ros2-tests.yml
@@ -36,12 +36,10 @@ jobs:
         run: |
           source /opt/ros/*/setup.bash
           ./gradlew targetTest -Ptarget=CppRos2
-      - name: Collect code coverage
-        run: ./gradlew jacocoTestReport
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ !inputs.runtime-ref }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/cpp-tests.yml b/.github/workflows/cpp-tests.yml
index 825461e30f..93cfcf8a91 100644
--- a/.github/workflows/cpp-tests.yml
+++ b/.github/workflows/cpp-tests.yml
@@ -49,12 +49,10 @@ jobs:
       - name: Run C++ tests;
         run: |
           ./gradlew targetTest -Ptarget=Cpp
-      - name: Collect code coverage
-        run: ./gradlew jacocoTestReport
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ !inputs.runtime-ref && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/lsp-tests.yml b/.github/workflows/lsp-tests.yml
index d5170f6f05..50608c389c 100644
--- a/.github/workflows/lsp-tests.yml
+++ b/.github/workflows/lsp-tests.yml
@@ -69,7 +69,7 @@ jobs:
         with:
           python-version: '3.10'
       - name: Run language server Python tests without PyLint
-        run: ./gradlew core:integrationTest --tests org.lflang.tests.lsp.LspTests.pythonValidationTestSyntaxOnly
+        run: ./gradlew core:testCodeCoverageReport --tests org.lflang.tests.lsp.LspTests.pythonValidationTestSyntaxOnly
       - name: Install pylint
         run: python3 -m pip install pylint
         if: ${{ runner.os != 'macOS' }}
@@ -77,9 +77,7 @@ jobs:
         run: brew install pylint
         if: ${{ runner.os == 'macOS' }}
       - name: Run language server tests
-        run: ./gradlew core:integrationTest --tests org.lflang.tests.lsp.LspTests.*ValidationTest
-      - name: Collect code coverage
-        run: ./gradlew jacocoTestReport
+        run: ./gradlew core:testCodeCoverageReport --tests org.lflang.tests.lsp.LspTests.*ValidationTest
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
diff --git a/.github/workflows/py-tests.yml b/.github/workflows/py-tests.yml
index 12b576a12f..20fa695124 100644
--- a/.github/workflows/py-tests.yml
+++ b/.github/workflows/py-tests.yml
@@ -64,12 +64,10 @@ jobs:
         if: ${{ inputs.reactor-c-py-ref }}
       - name: Run Python tests
         run: ./gradlew targetTest -Ptarget=Python
-      - name: Collect code coverage
-        run: ./gradlew jacocoTestReport
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ !inputs.compiler-ref && runner.os == 'Linux' && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/rs-tests.yml b/.github/workflows/rs-tests.yml
index 8ee706094e..e7ef160b06 100644
--- a/.github/workflows/rs-tests.yml
+++ b/.github/workflows/rs-tests.yml
@@ -65,12 +65,10 @@ jobs:
           components: clippy
       - name: Run Rust tests
         run: ./gradlew targetTest -Ptarget=Rust
-      - name: Collect code coverage
-        run: ./gradlew jacocoTestReport
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ !inputs.compiler-ref && runner.os == 'Linux' && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/serialization-tests.yml b/.github/workflows/serialization-tests.yml
index 435bca7bef..e9dc08cc12 100644
--- a/.github/workflows/serialization-tests.yml
+++ b/.github/workflows/serialization-tests.yml
@@ -34,13 +34,11 @@ jobs:
       - name: Run serialization tests;
         run: |
           source /opt/ros/*/setup.bash
-          ./gradlew core:integrationTest --tests org.lflang.tests.serialization.SerializationTest.*
-      - name: Collect code coverage
-        run: ./gradlew jacocoTestReport
+          ./gradlew core:integrationTestCodeCoverageReport --tests org.lflang.tests.serialization.SerializationTest.*
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ !inputs.runtime-ref }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/ts-tests.yml b/.github/workflows/ts-tests.yml
index 7f8be07511..d6fe11af4f 100644
--- a/.github/workflows/ts-tests.yml
+++ b/.github/workflows/ts-tests.yml
@@ -38,12 +38,10 @@ jobs:
       - name: Perform TypeScript tests
         run: |
           ./gradlew targetTest -Ptarget=TypeScript -Druntime="git://github.com/lf-lang/reactor-ts.git#master"
-      - name: Collect code coverage
-        run: ./gradlew jacocoTestReport
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ runner.os == 'Linux' && inputs.all-platforms }}

From 32b718a8467cf2a6497499ebe51978d2928f87cd Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 27 Jun 2023 14:08:24 +0200
Subject: [PATCH 0489/1114] fix gradle commands

---
 .github/workflows/c-zephyr-tests.yml      | 6 +++---
 .github/workflows/lsp-tests.yml           | 4 ++--
 .github/workflows/serialization-tests.yml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index 1293070e1e..71f6c2c902 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -41,17 +41,17 @@ jobs:
         if: ${{ inputs.runtime-ref }}
       - name: Run Zephyr smoke tests
         run: |
-          ./gradlew core:integrationTestCodeCoverageReport --tests org.lflang.tests.runtime.CZephyrTest.buildZephyr*
+          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildZephyr* core:integrationTestCodeCoverageReport
           util/RunZephyrTests.sh test/C/src-gen
           rm -r test/C/src-gen
       - name: Run basic tests
         run: |
-          ./gradlew core:integrationTestCodeCoverageReport --tests org.lflang.tests.runtime.CZephyrTest.buildBasic*
+          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildBasic* core:integrationTestCodeCoverageReport
           util/RunZephyrTests.sh test/C/src-gen
           rm -r test/C/src-gen
       - name: Run concurrent tests
         run: |
-          ./gradlew core:integrationTestCodeCoverageReport --tests org.lflang.tests.runtime.CZephyrTest.buildConcurrent*
+          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildConcurrent* core:integrationTestCodeCoverageReport
           util/RunZephyrTests.sh test/C/src-gen
           rm -r test/C/src-gen
       - name: Report to CodeCov
diff --git a/.github/workflows/lsp-tests.yml b/.github/workflows/lsp-tests.yml
index 50608c389c..e2f922ccd7 100644
--- a/.github/workflows/lsp-tests.yml
+++ b/.github/workflows/lsp-tests.yml
@@ -69,7 +69,7 @@ jobs:
         with:
           python-version: '3.10'
       - name: Run language server Python tests without PyLint
-        run: ./gradlew core:testCodeCoverageReport --tests org.lflang.tests.lsp.LspTests.pythonValidationTestSyntaxOnly
+        run: ./gradlew core:test --tests org.lflang.tests.lsp.LspTests.pythonValidationTestSyntaxOnly core:testCodeCoverageReport
       - name: Install pylint
         run: python3 -m pip install pylint
         if: ${{ runner.os != 'macOS' }}
@@ -77,7 +77,7 @@ jobs:
         run: brew install pylint
         if: ${{ runner.os == 'macOS' }}
       - name: Run language server tests
-        run: ./gradlew core:testCodeCoverageReport --tests org.lflang.tests.lsp.LspTests.*ValidationTest
+        run: ./gradlew core:test --tests org.lflang.tests.lsp.LspTests.*ValidationTest core:testCodeCoverageReport
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
diff --git a/.github/workflows/serialization-tests.yml b/.github/workflows/serialization-tests.yml
index e9dc08cc12..b6d6117b89 100644
--- a/.github/workflows/serialization-tests.yml
+++ b/.github/workflows/serialization-tests.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Run serialization tests;
         run: |
           source /opt/ros/*/setup.bash
-          ./gradlew core:integrationTestCodeCoverageReport --tests org.lflang.tests.serialization.SerializationTest.*
+          ./gradlew core:integrationTest --tests org.lflang.tests.serialization.SerializationTest.* core:integrationTestCodeCoverageReport
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:

From ad0a61e8d379873e9c3626da3f8cbd37f6e86faa Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 27 Jun 2023 14:16:03 +0200
Subject: [PATCH 0490/1114] fix lsp test

---
 .github/workflows/lsp-tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/lsp-tests.yml b/.github/workflows/lsp-tests.yml
index e2f922ccd7..b196b29e53 100644
--- a/.github/workflows/lsp-tests.yml
+++ b/.github/workflows/lsp-tests.yml
@@ -69,7 +69,7 @@ jobs:
         with:
           python-version: '3.10'
       - name: Run language server Python tests without PyLint
-        run: ./gradlew core:test --tests org.lflang.tests.lsp.LspTests.pythonValidationTestSyntaxOnly core:testCodeCoverageReport
+        run: ./gradlew core:integrationTest --tests org.lflang.tests.lsp.LspTests.pythonValidationTestSyntaxOnly core:integrationTestCodeCoverageReport
       - name: Install pylint
         run: python3 -m pip install pylint
         if: ${{ runner.os != 'macOS' }}
@@ -77,11 +77,11 @@ jobs:
         run: brew install pylint
         if: ${{ runner.os == 'macOS' }}
       - name: Run language server tests
-        run: ./gradlew core:test --tests org.lflang.tests.lsp.LspTests.*ValidationTest core:testCodeCoverageReport
+        run: ./gradlew core:integrationTest --tests org.lflang.tests.lsp.LspTests.*ValidationTest core:integrationTestCodeCoverageReport
       - name: Report to CodeCov
         uses: codecov/codecov-action@v3.1.1
         with:
-          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
           fail_ci_if_error: false
           verbose: true
         if: ${{ runner.os == 'Linux' && inputs.all-platforms }}

From 045d5c0c93262fd0d5e7402214561b6ea896048b Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 27 Jun 2023 18:13:01 +0200
Subject: [PATCH 0491/1114] retry codecov step

---
 .github/workflows/build.yml               | 12 +++++++----
 .github/workflows/c-arduino-tests.yml     | 12 +++++++----
 .github/workflows/c-tests.yml             | 12 +++++++----
 .github/workflows/c-zephyr-tests.yml      | 12 +++++++----
 .github/workflows/cpp-ros2-tests.yml      | 12 +++++++----
 .github/workflows/cpp-tests.yml           | 26 +++++++++++++++--------
 .github/workflows/lsp-tests.yml           | 12 +++++++----
 .github/workflows/py-tests.yml            | 12 +++++++----
 .github/workflows/rs-tests.yml            | 12 +++++++----
 .github/workflows/serialization-tests.yml | 12 +++++++----
 .github/workflows/ts-tests.yml            | 12 +++++++----
 11 files changed, 97 insertions(+), 49 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f43257cdcf..6b95e60924 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,9 +27,13 @@ jobs:
         run: ./gradlew build testCodeCoverageReport
         shell: bash
       - name: Report to CodeCov
-        uses: codecov/codecov-action@v3.1.1
+        uses: Wandalen/wretry.action@1.3.0
         with:
-          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/base/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfc/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfd/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lff/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
-          fail_ci_if_error: false
-          verbose: true
+          attempt_limit: 3
+          attempt_delay: 2000
+          action: uses: codecov/codecov-action@v3.1.4
+          with: |
+            files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/base/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfc/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfd/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lff/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
+            fail_ci_if_error: true
+            verbose: true
         if: ${{ runner.os == 'Linux' }}
diff --git a/.github/workflows/c-arduino-tests.yml b/.github/workflows/c-arduino-tests.yml
index 04cd672714..ced7ce680a 100644
--- a/.github/workflows/c-arduino-tests.yml
+++ b/.github/workflows/c-arduino-tests.yml
@@ -65,9 +65,13 @@ jobs:
       - name: Perform Arduino tests for C target with default scheduler
         run: ./gradlew targetTest -Ptarget=CArduino
       - name: Report to CodeCov
-        uses: codecov/codecov-action@v3.1.1
+        uses: Wandalen/wretry.action@1.3.0
         with:
-          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-          fail_ci_if_error: false
-          verbose: true
+          attempt_limit: 3
+          attempt_delay: 2000
+          action: uses: codecov/codecov-action@v3.1.4
+          with: |
+            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+            fail_ci_if_error: true
+            verbose: true
         if: ${{ !inputs.runtime-ref && runner.os == 'Linux' && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml
index e0847f0cce..2ffeed86f3 100644
--- a/.github/workflows/c-tests.yml
+++ b/.github/workflows/c-tests.yml
@@ -65,9 +65,13 @@ jobs:
         run: ./gradlew targetTest -Ptarget=CCpp
         if: ${{ inputs.use-cpp && !inputs.scheduler }}
       - name: Report to CodeCov
-        uses: codecov/codecov-action@v3.1.1
+        uses: Wandalen/wretry.action@1.3.0
         with:
-          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-          fail_ci_if_error: false
-          verbose: true
+          attempt_limit: 3
+          attempt_delay: 2000
+          action: uses: codecov/codecov-action@v3.1.4
+          with: |
+            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+            fail_ci_if_error: true
+            verbose: true
         if: ${{ !inputs.compiler-ref && runner.os == 'Linux' && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index 71f6c2c902..bf39b17576 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -55,9 +55,13 @@ jobs:
           util/RunZephyrTests.sh test/C/src-gen
           rm -r test/C/src-gen
       - name: Report to CodeCov
-        uses: codecov/codecov-action@v3.1.1
+        uses: Wandalen/wretry.action@1.3.0
         with:
-          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-          fail_ci_if_error: false
-          verbose: true
+          attempt_limit: 3
+          attempt_delay: 2000
+          action: uses: codecov/codecov-action@v3.1.4
+          with: |
+            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+            fail_ci_if_error: true
+            verbose: true
         if: ${{ !inputs.runtime-ref }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/cpp-ros2-tests.yml b/.github/workflows/cpp-ros2-tests.yml
index 8d585f9cce..a9255cd24d 100644
--- a/.github/workflows/cpp-ros2-tests.yml
+++ b/.github/workflows/cpp-ros2-tests.yml
@@ -37,9 +37,13 @@ jobs:
           source /opt/ros/*/setup.bash
           ./gradlew targetTest -Ptarget=CppRos2
       - name: Report to CodeCov
-        uses: codecov/codecov-action@v3.1.1
+        uses: Wandalen/wretry.action@1.3.0
         with:
-          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-          fail_ci_if_error: false
-          verbose: true
+          attempt_limit: 3
+          attempt_delay: 2000
+          action: uses: codecov/codecov-action@v3.1.4
+          with: |
+            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+            fail_ci_if_error: true
+            verbose: true
         if: ${{ !inputs.runtime-ref }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/cpp-tests.yml b/.github/workflows/cpp-tests.yml
index 93cfcf8a91..618200310f 100644
--- a/.github/workflows/cpp-tests.yml
+++ b/.github/workflows/cpp-tests.yml
@@ -50,11 +50,15 @@ jobs:
         run: |
           ./gradlew targetTest -Ptarget=Cpp
       - name: Report to CodeCov
-        uses: codecov/codecov-action@v3.1.1
+        uses: Wandalen/wretry.action@1.3.0
         with:
-          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-          fail_ci_if_error: false
-          verbose: true
+          attempt_limit: 3
+          attempt_delay: 2000
+          action: uses: codecov/codecov-action@v3.1.4
+          with: |
+            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+            fail_ci_if_error: true
+            verbose: true
         if: ${{ !inputs.runtime-ref && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
       - name: Collect reactor-cpp coverage data
         run: |
@@ -68,10 +72,14 @@ jobs:
           name: reactor-cpp.coverage
           path: reactor-cpp.coverage
         if: matrix.platform == 'ubuntu-latest'
-      - name: Report C++ coverage to CodeCov
-        uses: codecov/codecov-action@v3.1.1
+      - name: Report to CodeCov
+        uses: Wandalen/wretry.action@1.3.0
         with:
-          file: reactor-cpp.info
-          fail_ci_if_error: false
-          verbose: true
+          attempt_limit: 3
+          attempt_delay: 2000
+          action: uses: codecov/codecov-action@v3.1.4
+          with: |
+            file: reactor-cpp.info
+            fail_ci_if_error: true
+            verbose: true
         if: ${{ runner.os == 'Linux' && inputs.all-platforms }}
diff --git a/.github/workflows/lsp-tests.yml b/.github/workflows/lsp-tests.yml
index b196b29e53..b6a229e320 100644
--- a/.github/workflows/lsp-tests.yml
+++ b/.github/workflows/lsp-tests.yml
@@ -79,9 +79,13 @@ jobs:
       - name: Run language server tests
         run: ./gradlew core:integrationTest --tests org.lflang.tests.lsp.LspTests.*ValidationTest core:integrationTestCodeCoverageReport
       - name: Report to CodeCov
-        uses: codecov/codecov-action@v3.1.1
+        uses: Wandalen/wretry.action@1.3.0
         with:
-          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-          fail_ci_if_error: false
-          verbose: true
+          attempt_limit: 3
+          attempt_delay: 2000
+          action: uses: codecov/codecov-action@v3.1.4
+          with: |
+            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+            fail_ci_if_error: true
+            verbose: true
         if: ${{ runner.os == 'Linux' && inputs.all-platforms }}
diff --git a/.github/workflows/py-tests.yml b/.github/workflows/py-tests.yml
index 20fa695124..a68706f7c0 100644
--- a/.github/workflows/py-tests.yml
+++ b/.github/workflows/py-tests.yml
@@ -65,9 +65,13 @@ jobs:
       - name: Run Python tests
         run: ./gradlew targetTest -Ptarget=Python
       - name: Report to CodeCov
-        uses: codecov/codecov-action@v3.1.1
+        uses: Wandalen/wretry.action@1.3.0
         with:
-          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-          fail_ci_if_error: false
-          verbose: true
+          attempt_limit: 3
+          attempt_delay: 2000
+          action: uses: codecov/codecov-action@v3.1.4
+          with: |
+            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+            fail_ci_if_error: true
+            verbose: true
         if: ${{ !inputs.compiler-ref && runner.os == 'Linux' && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/rs-tests.yml b/.github/workflows/rs-tests.yml
index e7ef160b06..d5aa13b210 100644
--- a/.github/workflows/rs-tests.yml
+++ b/.github/workflows/rs-tests.yml
@@ -66,9 +66,13 @@ jobs:
       - name: Run Rust tests
         run: ./gradlew targetTest -Ptarget=Rust
       - name: Report to CodeCov
-        uses: codecov/codecov-action@v3.1.1
+        uses: Wandalen/wretry.action@1.3.0
         with:
-          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-          fail_ci_if_error: false
-          verbose: true
+          attempt_limit: 3
+          attempt_delay: 2000
+          action: uses: codecov/codecov-action@v3.1.4
+          with: |
+            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+            fail_ci_if_error: true
+            verbose: true
         if: ${{ !inputs.compiler-ref && runner.os == 'Linux' && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/serialization-tests.yml b/.github/workflows/serialization-tests.yml
index b6d6117b89..9f2bd51bd2 100644
--- a/.github/workflows/serialization-tests.yml
+++ b/.github/workflows/serialization-tests.yml
@@ -36,9 +36,13 @@ jobs:
           source /opt/ros/*/setup.bash
           ./gradlew core:integrationTest --tests org.lflang.tests.serialization.SerializationTest.* core:integrationTestCodeCoverageReport
       - name: Report to CodeCov
-        uses: codecov/codecov-action@v3.1.1
+        uses: Wandalen/wretry.action@1.3.0
         with:
-          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-          fail_ci_if_error: false
-          verbose: true
+          attempt_limit: 3
+          attempt_delay: 2000
+          action: uses: codecov/codecov-action@v3.1.4
+          with: |
+            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+            fail_ci_if_error: true
+            verbose: true
         if: ${{ !inputs.runtime-ref }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/ts-tests.yml b/.github/workflows/ts-tests.yml
index d6fe11af4f..d408c36325 100644
--- a/.github/workflows/ts-tests.yml
+++ b/.github/workflows/ts-tests.yml
@@ -39,9 +39,13 @@ jobs:
         run: |
           ./gradlew targetTest -Ptarget=TypeScript -Druntime="git://github.com/lf-lang/reactor-ts.git#master"
       - name: Report to CodeCov
-        uses: codecov/codecov-action@v3.1.1
+        uses: Wandalen/wretry.action@1.3.0
         with:
-          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-          fail_ci_if_error: false
-          verbose: true
+          attempt_limit: 3
+          attempt_delay: 2000
+          action: uses: codecov/codecov-action@v3.1.4
+          with: |
+            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+            fail_ci_if_error: true
+            verbose: true
         if: ${{ runner.os == 'Linux' && inputs.all-platforms }}

From dd0c75ecb3489eea2d0e57e5eb20ad9132e576dd Mon Sep 17 00:00:00 2001
From: ChadliaJerad <chadlia.jerad@gmail.com>
Date: Tue, 27 Jun 2023 09:43:29 -0700
Subject: [PATCH 0492/1114] fedsd utility does not require the rti trace file
 anymore.

---
 util/tracing/visualization/fedsd.py | 45 +++++++++++++++++++----------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/util/tracing/visualization/fedsd.py b/util/tracing/visualization/fedsd.py
index 2866f9cfdf..1ee3fd8707 100644
--- a/util/tracing/visualization/fedsd.py
+++ b/util/tracing/visualization/fedsd.py
@@ -73,6 +73,11 @@ def load_and_process_csv_file(csv_file) :
     # Remove all the lines that do not contain communication information
     # which boils up to having 'RTI' in the 'event' column
     df = df[df['event'].str.contains('Sending|Receiving|Scheduler advancing time ends') == True]
+
+    # Fix the parameters of the event 'Scheduler advancing time ends'
+    # We rely on the fact that the first row of the csv file cannot be the end of advancing time
+    id = df.iloc[-1]['self_id']
+    df['self_id'] = id
     df = df.astype({'self_id': 'int', 'partner_id': 'int'})
 
     # Add an inout column to set the arrow direction
@@ -86,11 +91,6 @@ def load_and_process_csv_file(csv_file) :
 if __name__ == '__main__':
     args = parser.parse_args()
 
-    # Check if the RTI trace file exists
-    if (not exists(args.rti)):
-        print('Error: No RTI csv trace file! Specify with -r argument.')
-        exit(1)
-    
     # The RTI and each of the federates have a fixed x coordinate. They will be
     # saved in a dict
     x_coor = {}
@@ -98,16 +98,22 @@ def load_and_process_csv_file(csv_file) :
     actors_names = {}
     padding = 50
     spacing = 200       # Spacing between federates
+
+    # Spot if a first .csv file have been entered (the RTI's trace file or if not, 
+    # a deferate's trace file)
+    first = True
     
     ############################################################################
-    #### RTI trace processing
+    #### RTI trace processing, if any
     ############################################################################
-    trace_df = load_and_process_csv_file(args.rti)
-    x_coor[-1] = padding * 2
-    actors.append(-1)
-    actors_names[-1] = "RTI"
-    # Temporary use
-    trace_df['x1'] = x_coor[-1]
+    if (exists(args.rti)):
+        trace_df = load_and_process_csv_file(args.rti)
+        x_coor[-1] = padding * 2
+        actors.append(-1)
+        actors_names[-1] = "RTI"
+        # Temporary use
+        trace_df['x1'] = x_coor[-1]
+        first = False
 
     ############################################################################
     #### Federates trace processing
@@ -125,11 +131,18 @@ def load_and_process_csv_file(csv_file) :
                 # Add to the list of sequence diagram actors and add the name
                 actors.append(fed_id)
                 actors_names[fed_id] = Path(fed_trace).stem
-                # Derive the x coordinate of the actor
-                x_coor[fed_id] = (padding * 2) + (spacing * (len(actors)-1))
-                fed_df['x1'] = x_coor[fed_id]
                 # Append into trace_df
-                trace_df = pd.concat([trace_df, fed_df])
+                if (first) :
+                    # Derive the x coordinate of the actor
+                    x_coor[fed_id] = (padding * 2)
+                    fed_df['x1'] = x_coor[fed_id]
+                    trace_df = fed_df
+                    first = False
+                else :
+                    # Derive the x coordinate of the actor
+                    x_coor[fed_id] = (padding * 2) + (spacing * (len(actors) - 1))
+                    fed_df['x1'] = x_coor[fed_id]
+                    trace_df = pd.concat([trace_df, fed_df])
                 fed_df = fed_df[0:0]
     
     # Sort all traces by physical time and then reset the index

From a6144053152f737cad35c35bc7e94166e955b18d Mon Sep 17 00:00:00 2001
From: ChadliaJerad <chadlia.jerad@gmail.com>
Date: Tue, 27 Jun 2023 09:48:45 -0700
Subject: [PATCH 0493/1114] Better handling of errors due to empty .lft files

---
 util/tracing/visualization/fedsd.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/util/tracing/visualization/fedsd.py b/util/tracing/visualization/fedsd.py
index 1ee3fd8707..610c0f1192 100644
--- a/util/tracing/visualization/fedsd.py
+++ b/util/tracing/visualization/fedsd.py
@@ -124,7 +124,12 @@ def load_and_process_csv_file(csv_file) :
             if (not exists(fed_trace)):
                 print('Warning: Trace file ' + fed_trace + ' does not exist! Will resume though')
                 continue
-            fed_df = load_and_process_csv_file(fed_trace)
+            try:
+                fed_df = load_and_process_csv_file(fed_trace)
+            except:
+                print('Warning: Problem processing trace file ' + fed_trace + '! The initial `.lft` file was probably empty.')
+                continue
+
             if (not fed_df.empty):
                 # Get the federate id number
                 fed_id = fed_df.iloc[-1]['self_id']

From 197bc328d8123b92b3eea4e2783b5bf3e4eeccc4 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 27 Jun 2023 19:03:30 +0200
Subject: [PATCH 0494/1114] fix ci yaml

---
 .github/workflows/build.yml               | 2 +-
 .github/workflows/c-arduino-tests.yml     | 2 +-
 .github/workflows/c-tests.yml             | 2 +-
 .github/workflows/c-zephyr-tests.yml      | 2 +-
 .github/workflows/cpp-ros2-tests.yml      | 2 +-
 .github/workflows/cpp-tests.yml           | 4 ++--
 .github/workflows/lsp-tests.yml           | 2 +-
 .github/workflows/py-tests.yml            | 2 +-
 .github/workflows/rs-tests.yml            | 2 +-
 .github/workflows/serialization-tests.yml | 2 +-
 .github/workflows/ts-tests.yml            | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6b95e60924..1be7894520 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
         with:
           attempt_limit: 3
           attempt_delay: 2000
-          action: uses: codecov/codecov-action@v3.1.4
+          action: codecov/codecov-action@v3.1.4
           with: |
             files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/base/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfc/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfd/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lff/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
             fail_ci_if_error: true
diff --git a/.github/workflows/c-arduino-tests.yml b/.github/workflows/c-arduino-tests.yml
index ced7ce680a..26bb850809 100644
--- a/.github/workflows/c-arduino-tests.yml
+++ b/.github/workflows/c-arduino-tests.yml
@@ -69,7 +69,7 @@ jobs:
         with:
           attempt_limit: 3
           attempt_delay: 2000
-          action: uses: codecov/codecov-action@v3.1.4
+          action: codecov/codecov-action@v3.1.4
           with: |
             files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
             fail_ci_if_error: true
diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml
index 2ffeed86f3..93fb5a0c27 100644
--- a/.github/workflows/c-tests.yml
+++ b/.github/workflows/c-tests.yml
@@ -69,7 +69,7 @@ jobs:
         with:
           attempt_limit: 3
           attempt_delay: 2000
-          action: uses: codecov/codecov-action@v3.1.4
+          action: codecov/codecov-action@v3.1.4
           with: |
             files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
             fail_ci_if_error: true
diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index bf39b17576..17217e30ad 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -59,7 +59,7 @@ jobs:
         with:
           attempt_limit: 3
           attempt_delay: 2000
-          action: uses: codecov/codecov-action@v3.1.4
+          action: codecov/codecov-action@v3.1.4
           with: |
             files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
             fail_ci_if_error: true
diff --git a/.github/workflows/cpp-ros2-tests.yml b/.github/workflows/cpp-ros2-tests.yml
index a9255cd24d..27e2161b61 100644
--- a/.github/workflows/cpp-ros2-tests.yml
+++ b/.github/workflows/cpp-ros2-tests.yml
@@ -41,7 +41,7 @@ jobs:
         with:
           attempt_limit: 3
           attempt_delay: 2000
-          action: uses: codecov/codecov-action@v3.1.4
+          action: codecov/codecov-action@v3.1.4
           with: |
             files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
             fail_ci_if_error: true
diff --git a/.github/workflows/cpp-tests.yml b/.github/workflows/cpp-tests.yml
index 618200310f..c2967099dd 100644
--- a/.github/workflows/cpp-tests.yml
+++ b/.github/workflows/cpp-tests.yml
@@ -54,7 +54,7 @@ jobs:
         with:
           attempt_limit: 3
           attempt_delay: 2000
-          action: uses: codecov/codecov-action@v3.1.4
+          action: codecov/codecov-action@v3.1.4
           with: |
             files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
             fail_ci_if_error: true
@@ -77,7 +77,7 @@ jobs:
         with:
           attempt_limit: 3
           attempt_delay: 2000
-          action: uses: codecov/codecov-action@v3.1.4
+          action: codecov/codecov-action@v3.1.4
           with: |
             file: reactor-cpp.info
             fail_ci_if_error: true
diff --git a/.github/workflows/lsp-tests.yml b/.github/workflows/lsp-tests.yml
index b6a229e320..0f1dd2d139 100644
--- a/.github/workflows/lsp-tests.yml
+++ b/.github/workflows/lsp-tests.yml
@@ -83,7 +83,7 @@ jobs:
         with:
           attempt_limit: 3
           attempt_delay: 2000
-          action: uses: codecov/codecov-action@v3.1.4
+          action: codecov/codecov-action@v3.1.4
           with: |
             files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
             fail_ci_if_error: true
diff --git a/.github/workflows/py-tests.yml b/.github/workflows/py-tests.yml
index a68706f7c0..f5acd5e3c3 100644
--- a/.github/workflows/py-tests.yml
+++ b/.github/workflows/py-tests.yml
@@ -69,7 +69,7 @@ jobs:
         with:
           attempt_limit: 3
           attempt_delay: 2000
-          action: uses: codecov/codecov-action@v3.1.4
+          action: codecov/codecov-action@v3.1.4
           with: |
             files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
             fail_ci_if_error: true
diff --git a/.github/workflows/rs-tests.yml b/.github/workflows/rs-tests.yml
index d5aa13b210..bb41232ee8 100644
--- a/.github/workflows/rs-tests.yml
+++ b/.github/workflows/rs-tests.yml
@@ -70,7 +70,7 @@ jobs:
         with:
           attempt_limit: 3
           attempt_delay: 2000
-          action: uses: codecov/codecov-action@v3.1.4
+          action: codecov/codecov-action@v3.1.4
           with: |
             files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
             fail_ci_if_error: true
diff --git a/.github/workflows/serialization-tests.yml b/.github/workflows/serialization-tests.yml
index 9f2bd51bd2..e92afd5934 100644
--- a/.github/workflows/serialization-tests.yml
+++ b/.github/workflows/serialization-tests.yml
@@ -40,7 +40,7 @@ jobs:
         with:
           attempt_limit: 3
           attempt_delay: 2000
-          action: uses: codecov/codecov-action@v3.1.4
+          action: codecov/codecov-action@v3.1.4
           with: |
             files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
             fail_ci_if_error: true
diff --git a/.github/workflows/ts-tests.yml b/.github/workflows/ts-tests.yml
index d408c36325..e3a47d39c7 100644
--- a/.github/workflows/ts-tests.yml
+++ b/.github/workflows/ts-tests.yml
@@ -43,7 +43,7 @@ jobs:
         with:
           attempt_limit: 3
           attempt_delay: 2000
-          action: uses: codecov/codecov-action@v3.1.4
+          action: codecov/codecov-action@v3.1.4
           with: |
             files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
             fail_ci_if_error: true

From c91964b89f017412835da180bf0a8a79ee69f8d8 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 27 Jun 2023 20:22:03 +0200
Subject: [PATCH 0495/1114] fix version

---
 .github/workflows/build.yml               | 2 +-
 .github/workflows/c-arduino-tests.yml     | 2 +-
 .github/workflows/c-tests.yml             | 2 +-
 .github/workflows/c-zephyr-tests.yml      | 2 +-
 .github/workflows/cpp-ros2-tests.yml      | 2 +-
 .github/workflows/cpp-tests.yml           | 4 ++--
 .github/workflows/lsp-tests.yml           | 2 +-
 .github/workflows/py-tests.yml            | 2 +-
 .github/workflows/rs-tests.yml            | 2 +-
 .github/workflows/serialization-tests.yml | 2 +-
 .github/workflows/ts-tests.yml            | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1be7894520..5b99ae5e71 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
         run: ./gradlew build testCodeCoverageReport
         shell: bash
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@1.3.0
+        uses: Wandalen/wretry.action@v1.3.0
         with:
           attempt_limit: 3
           attempt_delay: 2000
diff --git a/.github/workflows/c-arduino-tests.yml b/.github/workflows/c-arduino-tests.yml
index 26bb850809..5efe653693 100644
--- a/.github/workflows/c-arduino-tests.yml
+++ b/.github/workflows/c-arduino-tests.yml
@@ -65,7 +65,7 @@ jobs:
       - name: Perform Arduino tests for C target with default scheduler
         run: ./gradlew targetTest -Ptarget=CArduino
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@1.3.0
+        uses: Wandalen/wretry.action@v1.3.0
         with:
           attempt_limit: 3
           attempt_delay: 2000
diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml
index 93fb5a0c27..07d7394ee8 100644
--- a/.github/workflows/c-tests.yml
+++ b/.github/workflows/c-tests.yml
@@ -65,7 +65,7 @@ jobs:
         run: ./gradlew targetTest -Ptarget=CCpp
         if: ${{ inputs.use-cpp && !inputs.scheduler }}
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@1.3.0
+        uses: Wandalen/wretry.action@v1.3.0
         with:
           attempt_limit: 3
           attempt_delay: 2000
diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index 17217e30ad..e0f9dccf58 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -55,7 +55,7 @@ jobs:
           util/RunZephyrTests.sh test/C/src-gen
           rm -r test/C/src-gen
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@1.3.0
+        uses: Wandalen/wretry.action@v1.3.0
         with:
           attempt_limit: 3
           attempt_delay: 2000
diff --git a/.github/workflows/cpp-ros2-tests.yml b/.github/workflows/cpp-ros2-tests.yml
index 27e2161b61..7ee8d12688 100644
--- a/.github/workflows/cpp-ros2-tests.yml
+++ b/.github/workflows/cpp-ros2-tests.yml
@@ -37,7 +37,7 @@ jobs:
           source /opt/ros/*/setup.bash
           ./gradlew targetTest -Ptarget=CppRos2
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@1.3.0
+        uses: Wandalen/wretry.action@v1.3.0
         with:
           attempt_limit: 3
           attempt_delay: 2000
diff --git a/.github/workflows/cpp-tests.yml b/.github/workflows/cpp-tests.yml
index c2967099dd..dcf1c82d40 100644
--- a/.github/workflows/cpp-tests.yml
+++ b/.github/workflows/cpp-tests.yml
@@ -50,7 +50,7 @@ jobs:
         run: |
           ./gradlew targetTest -Ptarget=Cpp
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@1.3.0
+        uses: Wandalen/wretry.action@v1.3.0
         with:
           attempt_limit: 3
           attempt_delay: 2000
@@ -73,7 +73,7 @@ jobs:
           path: reactor-cpp.coverage
         if: matrix.platform == 'ubuntu-latest'
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@1.3.0
+        uses: Wandalen/wretry.action@v1.3.0
         with:
           attempt_limit: 3
           attempt_delay: 2000
diff --git a/.github/workflows/lsp-tests.yml b/.github/workflows/lsp-tests.yml
index 0f1dd2d139..88d9d95a32 100644
--- a/.github/workflows/lsp-tests.yml
+++ b/.github/workflows/lsp-tests.yml
@@ -79,7 +79,7 @@ jobs:
       - name: Run language server tests
         run: ./gradlew core:integrationTest --tests org.lflang.tests.lsp.LspTests.*ValidationTest core:integrationTestCodeCoverageReport
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@1.3.0
+        uses: Wandalen/wretry.action@v1.3.0
         with:
           attempt_limit: 3
           attempt_delay: 2000
diff --git a/.github/workflows/py-tests.yml b/.github/workflows/py-tests.yml
index f5acd5e3c3..04abc75f4f 100644
--- a/.github/workflows/py-tests.yml
+++ b/.github/workflows/py-tests.yml
@@ -65,7 +65,7 @@ jobs:
       - name: Run Python tests
         run: ./gradlew targetTest -Ptarget=Python
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@1.3.0
+        uses: Wandalen/wretry.action@v1.3.0
         with:
           attempt_limit: 3
           attempt_delay: 2000
diff --git a/.github/workflows/rs-tests.yml b/.github/workflows/rs-tests.yml
index bb41232ee8..566d8e01a0 100644
--- a/.github/workflows/rs-tests.yml
+++ b/.github/workflows/rs-tests.yml
@@ -66,7 +66,7 @@ jobs:
       - name: Run Rust tests
         run: ./gradlew targetTest -Ptarget=Rust
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@1.3.0
+        uses: Wandalen/wretry.action@v1.3.0
         with:
           attempt_limit: 3
           attempt_delay: 2000
diff --git a/.github/workflows/serialization-tests.yml b/.github/workflows/serialization-tests.yml
index e92afd5934..a20c8d5272 100644
--- a/.github/workflows/serialization-tests.yml
+++ b/.github/workflows/serialization-tests.yml
@@ -36,7 +36,7 @@ jobs:
           source /opt/ros/*/setup.bash
           ./gradlew core:integrationTest --tests org.lflang.tests.serialization.SerializationTest.* core:integrationTestCodeCoverageReport
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@1.3.0
+        uses: Wandalen/wretry.action@v1.3.0
         with:
           attempt_limit: 3
           attempt_delay: 2000
diff --git a/.github/workflows/ts-tests.yml b/.github/workflows/ts-tests.yml
index e3a47d39c7..c056a52ea1 100644
--- a/.github/workflows/ts-tests.yml
+++ b/.github/workflows/ts-tests.yml
@@ -39,7 +39,7 @@ jobs:
         run: |
           ./gradlew targetTest -Ptarget=TypeScript -Druntime="git://github.com/lf-lang/reactor-ts.git#master"
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@1.3.0
+        uses: Wandalen/wretry.action@v1.3.0
         with:
           attempt_limit: 3
           attempt_delay: 2000

From f8844e74ba7b75a271cbae8b850ac9e6b3f5648f Mon Sep 17 00:00:00 2001
From: ChadliaJerad <chadlia.jerad@gmail.com>
Date: Tue, 27 Jun 2023 12:03:04 -0700
Subject: [PATCH 0496/1114] Derive an RTI actor lifeline and its interactions,
 when no trace file is provided. Still WiP

---
 util/scripts/launch-fedsd.sh               |  3 +-
 util/tracing/visualization/fedsd.py        | 57 ++++++++++++----------
 util/tracing/visualization/fedsd_helper.py | 17 +++++--
 3 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/util/scripts/launch-fedsd.sh b/util/scripts/launch-fedsd.sh
index 609f9608af..600cc4d379 100755
--- a/util/scripts/launch-fedsd.sh
+++ b/util/scripts/launch-fedsd.sh
@@ -93,9 +93,8 @@ for each_lft_file in $lft_files_list
 # echo $csv_files_list
 
 # FIXME: Check that python3 is in the path.
-if [ $rti_csv_file == '' ]
+if [ ! -z $rti_csv_file ]
 then
-    # FIXME: Support the case where no rti file is given
     python3 "${base}/util/tracing/visualization/fedsd.py" "-f" $csv_files_list
 else
     echo Building the communication diagram for the following trace files: $lft_files_list in trace_svg.html
diff --git a/util/tracing/visualization/fedsd.py b/util/tracing/visualization/fedsd.py
index 610c0f1192..4d7b2b49ea 100644
--- a/util/tracing/visualization/fedsd.py
+++ b/util/tracing/visualization/fedsd.py
@@ -99,21 +99,12 @@ def load_and_process_csv_file(csv_file) :
     padding = 50
     spacing = 200       # Spacing between federates
 
-    # Spot if a first .csv file have been entered (the RTI's trace file or if not, 
-    # a deferate's trace file)
-    first = True
-    
-    ############################################################################
-    #### RTI trace processing, if any
-    ############################################################################
-    if (exists(args.rti)):
-        trace_df = load_and_process_csv_file(args.rti)
-        x_coor[-1] = padding * 2
-        actors.append(-1)
-        actors_names[-1] = "RTI"
-        # Temporary use
-        trace_df['x1'] = x_coor[-1]
-        first = False
+    # Set the RTI x coordinate
+    x_coor[-1] = padding * 2
+    actors.append(-1)
+    actors_names[-1] = "RTI"
+   
+    trace_df = pd.DataFrame()
 
     ############################################################################
     #### Federates trace processing
@@ -136,20 +127,32 @@ def load_and_process_csv_file(csv_file) :
                 # Add to the list of sequence diagram actors and add the name
                 actors.append(fed_id)
                 actors_names[fed_id] = Path(fed_trace).stem
-                # Append into trace_df
-                if (first) :
-                    # Derive the x coordinate of the actor
-                    x_coor[fed_id] = (padding * 2)
-                    fed_df['x1'] = x_coor[fed_id]
-                    trace_df = fed_df
-                    first = False
-                else :
-                    # Derive the x coordinate of the actor
-                    x_coor[fed_id] = (padding * 2) + (spacing * (len(actors) - 1))
-                    fed_df['x1'] = x_coor[fed_id]
-                    trace_df = pd.concat([trace_df, fed_df])
+                # Derive the x coordinate of the actor
+                x_coor[fed_id] = (padding * 2) + (spacing * (len(actors) - 1))
+                fed_df['x1'] = x_coor[fed_id]
+                trace_df = pd.concat([trace_df, fed_df])
                 fed_df = fed_df[0:0]
     
+        
+    ############################################################################
+    #### RTI trace processing, if any
+    ############################################################################
+    if (exists(args.rti)):
+        rti_df = load_and_process_csv_file(args.rti)
+    else:
+        # If there is no RTI, derive one.
+        # This is particularly useful for tracing enclaves
+        # FIXME: Currently, `fedsd` is used either for federates OR enclaves.
+        # As soon as there is a consensus on how to visualize federations where
+        # a federate has several enclves, the utility will be updated.
+        rti_df = trace_df[['event', 'self_id', 'partner_id', 'logical_time', 'microstep', 'physical_time', 'inout']].copy()
+        rti_df = rti_df[rti_df['event'].str.contains('AdvLT') == False]
+        rti_df.columns = ['event', 'partner_id', 'self_id', 'logical_time', 'microstep', 'physical_time', 'inout']
+        rti_df['inout'] = rti_df['inout'].apply(lambda e: 'in' if 'out' in e else 'out')
+    rti_df['x1'] = x_coor[-1]
+
+    trace_df = pd.concat([trace_df, rti_df])
+
     # Sort all traces by physical time and then reset the index
     trace_df = trace_df.sort_values(by=['physical_time'])
     trace_df = trace_df.reset_index(drop=True)
diff --git a/util/tracing/visualization/fedsd_helper.py b/util/tracing/visualization/fedsd_helper.py
index 804341f117..ac37bc0565 100644
--- a/util/tracing/visualization/fedsd_helper.py
+++ b/util/tracing/visualization/fedsd_helper.py
@@ -88,7 +88,11 @@ def svg_string_draw_arrow_head(x1, y1, x2, y2, type='') :
      * String: the svg string of the triangle
     '''
 
-    rotation = - math.ceil(math.atan((x2-x1)/(y2-y1)) * 180 / 3.14) - 90
+    if (y2 != y1):
+        rotation = - math.ceil(math.atan((x2-x1)/(y2-y1)) * 180 / 3.14) - 90
+    else:
+        rotation = - 90
+        
     style = ''
     if (type):
         style = ' class="'+type+'"'
@@ -125,11 +129,18 @@ def svg_string_draw_label(x1, y1, x2, y2, label) :
     # FIXME: Rotation value is not that accurate. 
     if (x2 < x1) :
         # Left-going arrow.
-        rotation = - math.ceil(math.atan((x2-x1)/(y2-y1)) * 180 / 3.14) - 90
+        if (y2 != y1):
+            rotation = - math.ceil(math.atan((x2-x1)/(y2-y1)) * 180 / 3.14) - 90
+        else:
+            rotation = 90
+
         str_line = '\t<text text-anchor="end" transform="translate('+str(x1-10)+', '+str(y1-5)+') rotate('+str(rotation)+')">'+label+'</text>\n'
     else :
         # Right-going arrow.
-        rotation = - math.ceil(math.atan((x1-x2)/(y1-y2)) * 180 / 3.14) + 90
+        if (y2 != y1):
+            rotation = - math.ceil(math.atan((x1-x2)/(y1-y2)) * 180 / 3.14) + 90
+        else:
+            rotation = - 90
         str_line = '\t<text transform="translate('+str(x1+10)+', '+str(y1-5)+') rotate('+str(rotation)+')" text-anchor="start">'+label+'</text>\n'
     #print('rot = '+str(rotation)+' x1='+str(x1)+' y1='+str(y1)+' x2='+str(x2)+' y2='+str(y2))
     return str_line

From 3a959a7ae4c17270eae5a32c6be32b9feb39aa0b Mon Sep 17 00:00:00 2001
From: ChadliaJerad <chadlia.jerad@gmail.com>
Date: Tue, 27 Jun 2023 15:53:11 -0700
Subject: [PATCH 0497/1114] Fix positions and rotations when an RTI is derived

---
 util/tracing/visualization/fedsd.py        | 16 +++++++++-------
 util/tracing/visualization/fedsd_helper.py |  9 ++++++---
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/util/tracing/visualization/fedsd.py b/util/tracing/visualization/fedsd.py
index 4d7b2b49ea..57e4af3b34 100644
--- a/util/tracing/visualization/fedsd.py
+++ b/util/tracing/visualization/fedsd.py
@@ -150,8 +150,10 @@ def load_and_process_csv_file(csv_file) :
         rti_df.columns = ['event', 'partner_id', 'self_id', 'logical_time', 'microstep', 'physical_time', 'inout']
         rti_df['inout'] = rti_df['inout'].apply(lambda e: 'in' if 'out' in e else 'out')
     rti_df['x1'] = x_coor[-1]
+    print('x1 coordinates is = ' + str(x_coor[-1]))
 
     trace_df = pd.concat([trace_df, rti_df])
+    trace_df.to_csv('all2.csv', index=True)
 
     # Sort all traces by physical time and then reset the index
     trace_df = trace_df.sort_values(by=['physical_time'])
@@ -231,18 +233,16 @@ def load_and_process_csv_file(csv_file) :
             if (matching_df.empty) :
                 # If no matching receiver, than set the arrow to 'dot',
                 # meaning that only a dot will be rendered
-                trace_df.loc[index, 'arrow'] = 'dot'
+                trace_df.at[index, 'arrow'] = 'dot'
             else:
                 # If there is one or more matching rows, then consider 
                 # the first one
+                matching_index = matching_df.index[0]
+                matching_row = matching_df.loc[matching_index]
                 if (inout == 'out'):
-                    matching_index = matching_df.index[0]
-                    matching_row = matching_df.loc[matching_index]
                     trace_df.at[index, 'x2'] = matching_row['x1']
                     trace_df.at[index, 'y2'] = matching_row['y1']
                 else:
-                    matching_index = matching_df.index[-1]
-                    matching_row = matching_df.loc[matching_index]
                     trace_df.at[index, 'x2'] = trace_df.at[index, 'x1'] 
                     trace_df.at[index, 'y2'] = trace_df.at[index, 'y1'] 
                     trace_df.at[index, 'x1'] = matching_row['x1']
@@ -250,7 +250,6 @@ def load_and_process_csv_file(csv_file) :
 
                 # Mark it, so not to consider it anymore
                 trace_df.at[matching_index, 'arrow'] = 'marked'
-
                 trace_df.at[index, 'arrow'] = 'arrow'
 
     ############################################################################
@@ -301,7 +300,10 @@ def load_and_process_csv_file(csv_file) :
             
             if (row['arrow'] == 'arrow'): 
                 f.write(fhlp.svg_string_draw_arrow(row['x1'], row['y1'], row['x2'], row['y2'], label, row['event']))
-                f.write(fhlp.svg_string_draw_side_label(row['x1'], row['y1'], physical_time, anchor))
+                if (row['inout'] in 'in'):
+                    f.write(fhlp.svg_string_draw_side_label(row['x2'], row['y2'], physical_time, anchor))
+                else:
+                    f.write(fhlp.svg_string_draw_side_label(row['x1'], row['y1'], physical_time, anchor))
             elif (row['arrow'] == 'dot'):
                 if (row['inout'] == 'in'):
                     label = "(in) from " + str(row['partner_id']) + ' ' + label
diff --git a/util/tracing/visualization/fedsd_helper.py b/util/tracing/visualization/fedsd_helper.py
index ac37bc0565..561429a184 100644
--- a/util/tracing/visualization/fedsd_helper.py
+++ b/util/tracing/visualization/fedsd_helper.py
@@ -91,7 +91,10 @@ def svg_string_draw_arrow_head(x1, y1, x2, y2, type='') :
     if (y2 != y1):
         rotation = - math.ceil(math.atan((x2-x1)/(y2-y1)) * 180 / 3.14) - 90
     else:
-        rotation = - 90
+        if (x1 > x2):
+            rotation = 0
+        else:
+            rotation = - 180
         
     style = ''
     if (type):
@@ -132,7 +135,7 @@ def svg_string_draw_label(x1, y1, x2, y2, label) :
         if (y2 != y1):
             rotation = - math.ceil(math.atan((x2-x1)/(y2-y1)) * 180 / 3.14) - 90
         else:
-            rotation = 90
+            rotation = 0
 
         str_line = '\t<text text-anchor="end" transform="translate('+str(x1-10)+', '+str(y1-5)+') rotate('+str(rotation)+')">'+label+'</text>\n'
     else :
@@ -140,7 +143,7 @@ def svg_string_draw_label(x1, y1, x2, y2, label) :
         if (y2 != y1):
             rotation = - math.ceil(math.atan((x1-x2)/(y1-y2)) * 180 / 3.14) + 90
         else:
-            rotation = - 90
+            rotation = 0
         str_line = '\t<text transform="translate('+str(x1+10)+', '+str(y1-5)+') rotate('+str(rotation)+')" text-anchor="start">'+label+'</text>\n'
     #print('rot = '+str(rotation)+' x1='+str(x1)+' y1='+str(y1)+' x2='+str(x2)+' y2='+str(y2))
     return str_line

From 9f928b61c05ab458a27cf2404400dcb54e13a09a Mon Sep 17 00:00:00 2001
From: ChadliaJerad <chadlia.jerad@gmail.com>
Date: Tue, 27 Jun 2023 16:01:44 -0700
Subject: [PATCH 0498/1114] Remove non useful print

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 util/tracing/visualization/fedsd.py     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 95106eb4a6..628e235172 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 95106eb4a6294f0e76ab60bcd38f931c6d9cdad0
+Subproject commit 628e2351723b01dcef7977d1999426e4935d0272
diff --git a/util/tracing/visualization/fedsd.py b/util/tracing/visualization/fedsd.py
index 57e4af3b34..10b6587b13 100644
--- a/util/tracing/visualization/fedsd.py
+++ b/util/tracing/visualization/fedsd.py
@@ -150,7 +150,6 @@ def load_and_process_csv_file(csv_file) :
         rti_df.columns = ['event', 'partner_id', 'self_id', 'logical_time', 'microstep', 'physical_time', 'inout']
         rti_df['inout'] = rti_df['inout'].apply(lambda e: 'in' if 'out' in e else 'out')
     rti_df['x1'] = x_coor[-1]
-    print('x1 coordinates is = ' + str(x_coor[-1]))
 
     trace_df = pd.concat([trace_df, rti_df])
     trace_df.to_csv('all2.csv', index=True)

From f85896aeefd21598c9e481ed6a61c8e01ed5aa09 Mon Sep 17 00:00:00 2001
From: ChadliaJerad <chadlia.jerad@gmail.com>
Date: Tue, 27 Jun 2023 16:02:58 -0700
Subject: [PATCH 0499/1114] Remove extra file

---
 util/tracing/visualization/fedsd.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/util/tracing/visualization/fedsd.py b/util/tracing/visualization/fedsd.py
index 10b6587b13..80bdb22451 100644
--- a/util/tracing/visualization/fedsd.py
+++ b/util/tracing/visualization/fedsd.py
@@ -152,7 +152,6 @@ def load_and_process_csv_file(csv_file) :
     rti_df['x1'] = x_coor[-1]
 
     trace_df = pd.concat([trace_df, rti_df])
-    trace_df.to_csv('all2.csv', index=True)
 
     # Sort all traces by physical time and then reset the index
     trace_df = trace_df.sort_values(by=['physical_time'])

From 826f7e01b1cd932dd29f4d7266ea9757aca07312 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 27 Jun 2023 20:34:19 -0700
Subject: [PATCH 0500/1114] Delete dead code; address warnings.

---
 .../federated/extensions/CExtension.java      | 258 +++++++++---------
 .../federated/extensions/CExtensionUtils.java | 247 ++---------------
 .../federated/generator/FedASTUtils.java      | 230 +---------------
 3 files changed, 151 insertions(+), 584 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 8c93ae69fc..f7889eacbb 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -97,8 +97,7 @@ public void initializeTargetConfig(
     federate.targetConfig.setByUser.add(TargetProperty.THREADING);
 
     // Include the fed setup file for this federate in the target property
-    String relPath = getPreamblePath(federate);
-    federate.targetConfig.fedSetupPreamble = relPath;
+    federate.targetConfig.fedSetupPreamble = getPreamblePath(federate);
     federate.targetConfig.setByUser.add(TargetProperty.FED_SETUP);
   }
 
@@ -115,10 +114,9 @@ protected void generateCMakeInclude(FederateInstance federate, FedFileConfig fil
    * @param action The action.
    * @param sendingPort The output port providing the data to send.
    * @param receivingPort The ID of the destination port.
-   * @param connection FIXME
-   * @param type FIXME
+   * @param connection The federated connection being lowered.
+   * @param type The type of the data conveyed by the port.
    * @param coordinationType The coordination type
-   * @param errorReporter
    */
   public String generateNetworkReceiverBody(
       Action action,
@@ -183,49 +181,42 @@ protected void deserialize(
     }
     var value = "";
     switch (connection.getSerializer()) {
-      case NATIVE:
-        {
-          // NOTE: Docs say that malloc'd char* is freed on conclusion of the time step.
-          // So passing it downstream should be OK.
-          value = action.getName() + "->value";
-          if (CUtil.isTokenType(type, types)) {
-            result.pr("lf_set_token(" + receiveRef + ", " + action.getName() + "->token);");
-          } else {
-            result.pr("lf_set(" + receiveRef + ", " + value + ");");
-          }
-          break;
+      case NATIVE -> {
+        // NOTE: Docs say that malloc'd char* is freed on conclusion of the time step.
+        // So passing it downstream should be OK.
+        value = action.getName() + "->value";
+        if (CUtil.isTokenType(type, types)) {
+          result.pr("lf_set_token(" + receiveRef + ", " + action.getName() + "->token);");
+        } else {
+          result.pr("lf_set(" + receiveRef + ", " + value + ");");
         }
-      case PROTO:
-        {
-          throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
-        }
-      case ROS2:
-        {
-          var portType = ASTUtils.getInferredType(((Port) receivingPort.getVariable()));
-          var portTypeStr = types.getTargetType(portType);
-          if (CUtil.isTokenType(portType, types)) {
-            throw new UnsupportedOperationException(
-                "Cannot handle ROS serialization when ports are pointers.");
-          } else if (CExtensionUtils.isSharedPtrType(portType, types)) {
-            var matcher = CExtensionUtils.sharedPointerVariable.matcher(portTypeStr);
-            if (matcher.find()) {
-              portTypeStr = matcher.group("type");
-            }
-          }
-          var ROSDeserializer = new FedROS2CPPSerialization();
-          value = FedROS2CPPSerialization.deserializedVarName;
-          result.pr(
-              ROSDeserializer.generateNetworkDeserializerCode(
-                  "self->_lf__" + action.getName(), portTypeStr));
-          if (CExtensionUtils.isSharedPtrType(portType, types)) {
-            result.pr(
-                "auto msg_shared_ptr = std::make_shared<" + portTypeStr + ">(" + value + ");");
-            result.pr("lf_set(" + receiveRef + ", msg_shared_ptr);");
-          } else {
-            result.pr("lf_set(" + receiveRef + ", std::move(" + value + "));");
+      }
+      case PROTO -> throw new UnsupportedOperationException(
+          "Protobuf serialization is not supported yet.");
+      case ROS2 -> {
+        var portType = ASTUtils.getInferredType(((Port) receivingPort.getVariable()));
+        var portTypeStr = types.getTargetType(portType);
+        if (CUtil.isTokenType(portType, types)) {
+          throw new UnsupportedOperationException(
+              "Cannot handle ROS serialization when ports are pointers.");
+        } else if (CExtensionUtils.isSharedPtrType(portType, types)) {
+          var matcher = CExtensionUtils.sharedPointerVariable.matcher(portTypeStr);
+          if (matcher.find()) {
+            portTypeStr = matcher.group("type");
           }
-          break;
         }
+        var ROSDeserializer = new FedROS2CPPSerialization();
+        value = FedROS2CPPSerialization.deserializedVarName;
+        result.pr(
+            ROSDeserializer.generateNetworkDeserializerCode(
+                "self->_lf__" + action.getName(), portTypeStr));
+        if (CExtensionUtils.isSharedPtrType(portType, types)) {
+          result.pr("auto msg_shared_ptr = std::make_shared<" + portTypeStr + ">(" + value + ");");
+          result.pr("lf_set(" + receiveRef + ", msg_shared_ptr);");
+        } else {
+          result.pr("lf_set(" + receiveRef + ", std::move(" + value + "));");
+        }
+      }
     }
   }
 
@@ -235,10 +226,9 @@ protected void deserialize(
    *
    * @param sendingPort The output port providing the data to send.
    * @param receivingPort The variable reference to the destination port.
-   * @param connection
-   * @param type
-   * @param coordinationType
-   * @param errorReporter FIXME
+   * @param connection The federated connection being lowered.
+   * @param type The type of the data conveyed by the connection.
+   * @param coordinationType Centralized or decentralized.
    */
   public String generateNetworkSenderBody(
       VarRef sendingPort,
@@ -327,15 +317,15 @@ public String generateNetworkSenderBody(
   }
 
   /**
-   * FIXME
+   * Generate code for serializing data and sending it over the given connection.
    *
-   * @param connection
-   * @param type
-   * @param sendRef
-   * @param result
-   * @param sendingFunction
-   * @param commonArgs
-   * @param errorReporter
+   * @param connection A federated connection.
+   * @param type The type of the data sent on the connection.
+   * @param sendRef C code representing a reference to the data to be sent.
+   * @param result An accumulator of the generated code.
+   * @param sendingFunction The name of the function that sends the serialized data.
+   * @param commonArgs Arguments passed to {@code sendingFunction} regardless of serialization
+   *     method.
    */
   protected void serializeAndSend(
       FedConnectionInstance connection,
@@ -349,67 +339,60 @@ protected void serializeAndSend(
     var lengthExpression = "";
     var pointerExpression = "";
     switch (connection.getSerializer()) {
-      case NATIVE:
-        {
-          // Handle native types.
-          if (CUtil.isTokenType(type, types)) {
-            // NOTE: Transporting token types this way is likely to only work if the sender and
-            // receiver
-            // both have the same endianness. Otherwise, you have to use protobufs or some other
-            // serialization scheme.
-            result.pr(
-                "size_t message_length = "
-                    + sendRef
-                    + "->token->length * "
-                    + sendRef
-                    + "->token->type->element_size;");
-            result.pr(
-                sendingFunction + "(" + commonArgs + ", (unsigned char*) " + sendRef + "->value);");
-          } else {
-            // string types need to be dealt with specially because they are hidden pointers.
-            // void type is odd, but it avoids generating non-standard expression sizeof(void),
-            // which some compilers reject.
-            lengthExpression = "sizeof(" + types.getTargetType(type) + ")";
-            pointerExpression = "(unsigned char*)&" + sendRef + "->value";
-            var targetType = types.getTargetType(type);
-            if (targetType.equals("string")) {
-              lengthExpression = "strlen(" + sendRef + "->value) + 1";
-              pointerExpression = "(unsigned char*) " + sendRef + "->value";
-            } else if (targetType.equals("void")) {
-              lengthExpression = "0";
-            }
-            result.pr("size_t message_length = " + lengthExpression + ";");
-            result.pr(sendingFunction + "(" + commonArgs + ", " + pointerExpression + ");");
-          }
-          break;
-        }
-      case PROTO:
-        {
-          throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
-        }
-      case ROS2:
-        {
-          var variableToSerialize = sendRef;
-          var typeStr = types.getTargetType(type);
-          if (CUtil.isTokenType(type, types)) {
-            throw new UnsupportedOperationException(
-                "Cannot handle ROS serialization when ports are pointers.");
-          } else if (CExtensionUtils.isSharedPtrType(type, types)) {
-            var matcher = CExtensionUtils.sharedPointerVariable.matcher(typeStr);
-            if (matcher.find()) {
-              typeStr = matcher.group("type");
-            }
-          }
-          var ROSSerializer = new FedROS2CPPSerialization();
-          lengthExpression = ROSSerializer.serializedBufferLength();
-          pointerExpression = ROSSerializer.seializedBufferVar();
+      case NATIVE -> {
+        // Handle native types.
+        if (CUtil.isTokenType(type, types)) {
+          // NOTE: Transporting token types this way is likely to only work if the sender and
+          // receiver
+          // both have the same endianness. Otherwise, you have to use protobufs or some other
+          // serialization scheme.
+          result.pr(
+              "size_t message_length = "
+                  + sendRef
+                  + "->token->length * "
+                  + sendRef
+                  + "->token->type->element_size;");
           result.pr(
-              ROSSerializer.generateNetworkSerializerCode(
-                  variableToSerialize, typeStr, CExtensionUtils.isSharedPtrType(type, types)));
+              sendingFunction + "(" + commonArgs + ", (unsigned char*) " + sendRef + "->value);");
+        } else {
+          // string types need to be dealt with specially because they are hidden pointers.
+          // void type is odd, but it avoids generating non-standard expression sizeof(void),
+          // which some compilers reject.
+          lengthExpression = "sizeof(" + types.getTargetType(type) + ")";
+          pointerExpression = "(unsigned char*)&" + sendRef + "->value";
+          var targetType = types.getTargetType(type);
+          if (targetType.equals("string")) {
+            lengthExpression = "strlen(" + sendRef + "->value) + 1";
+            pointerExpression = "(unsigned char*) " + sendRef + "->value";
+          } else if (targetType.equals("void")) {
+            lengthExpression = "0";
+          }
           result.pr("size_t message_length = " + lengthExpression + ";");
           result.pr(sendingFunction + "(" + commonArgs + ", " + pointerExpression + ");");
-          break;
         }
+      }
+      case PROTO -> throw new UnsupportedOperationException(
+          "Protobuf serialization is not supported yet.");
+      case ROS2 -> {
+        var typeStr = types.getTargetType(type);
+        if (CUtil.isTokenType(type, types)) {
+          throw new UnsupportedOperationException(
+              "Cannot handle ROS serialization when ports are pointers.");
+        } else if (CExtensionUtils.isSharedPtrType(type, types)) {
+          var matcher = CExtensionUtils.sharedPointerVariable.matcher(typeStr);
+          if (matcher.find()) {
+            typeStr = matcher.group("type");
+          }
+        }
+        var ROSSerializer = new FedROS2CPPSerialization();
+        lengthExpression = ROSSerializer.serializedBufferLength();
+        pointerExpression = ROSSerializer.seializedBufferVar();
+        result.pr(
+            ROSSerializer.generateNetworkSerializerCode(
+                sendRef, typeStr, CExtensionUtils.isSharedPtrType(type, types)));
+        result.pr("size_t message_length = " + lengthExpression + ";");
+        result.pr(sendingFunction + "(" + commonArgs + ", " + pointerExpression + ");");
+      }
     }
   }
 
@@ -442,8 +425,8 @@ public String generateNetworkInputControlReactionBody(
    * Generate code for the body of a reaction that sends a port status message for the given port if
    * it is absent.
    *
-   * @oaram srcOutputPort FIXME
-   * @param connection FIXME
+   * @param srcOutputPort A reference to the port that the sender reaction reads from.
+   * @param connection The federated connection being lowered.
    */
   public String generateNetworkOutputControlReactionBody(
       VarRef srcOutputPort, FedConnectionInstance connection) {
@@ -462,8 +445,13 @@ public String generateNetworkOutputControlReactionBody(
             "\n",
             "// If the output port has not been lf_set for the current logical time,",
             "// send an ABSENT message to the receiving federate            ",
-            "LF_PRINT_LOG(\"Executing port absent reaction for port %d to federate %d at time %lld.\", ",
-            "          " + receivingPortID + ", " + connection.getDstFederate().id + ", (long long) lf_time_logical_elapsed());",
+            "LF_PRINT_LOG(\"Executing port absent reaction for port %d to federate %d at time"
+                + " %lld.\", ",
+            "          "
+                + receivingPortID
+                + ", "
+                + connection.getDstFederate().id
+                + ", (long long) lf_time_logical_elapsed());",
             "if (" + sendRef + " == NULL || !" + sendRef + "->is_present) {",
             "LF_PRINT_LOG(\"The output port is NULL or it is not present.\");",
             "    send_port_absent_to_federate("
@@ -493,7 +481,7 @@ public String generatePreamble(
       ErrorReporter errorReporter)
       throws IOException {
     // Put the C preamble in a {@code include/_federate.name + _preamble.h} file
-    String cPreamble = makePreamble(federate, fileConfig, rtiConfig, errorReporter);
+    String cPreamble = makePreamble(federate, rtiConfig, errorReporter);
     String relPath = getPreamblePath(federate);
     Path fedPreamblePath = fileConfig.getSrcPath().resolve(relPath);
     Files.createDirectories(fedPreamblePath.getParent());
@@ -502,7 +490,11 @@ public String generatePreamble(
     }
     var includes = new CodeBuilder();
     if (federate.targetConfig.target != Target.Python) {
-      includes.pr("#ifdef __cplusplus\n" + "extern \"C\" {\n" + "#endif");
+      includes.pr(
+          """
+              #ifdef __cplusplus
+              extern "C" {
+              #endif""");
       includes.pr("#include \"core/federated/federate.h\"");
       includes.pr("#include \"core/federated/net_common.h\"");
       includes.pr("#include \"core/federated/net_util.h\"");
@@ -510,7 +502,10 @@ public String generatePreamble(
       includes.pr("#include \"core/threaded/reactor_threaded.h\"");
       includes.pr("#include \"core/utils/util.h\"");
       includes.pr("extern federate_instance_t _fed;");
-      includes.pr("#ifdef __cplusplus\n" + "}\n" + "#endif");
+      includes.pr("""
+              #ifdef __cplusplus
+              }
+              #endif""");
       includes.pr(generateSerializationIncludes(federate, fileConfig));
     }
 
@@ -519,10 +514,7 @@ public String generatePreamble(
 
   /** Generate the preamble to setup federated execution in C. */
   protected String makePreamble(
-      FederateInstance federate,
-      FedFileConfig fileConfig,
-      RtiConfig rtiConfig,
-      ErrorReporter errorReporter) {
+      FederateInstance federate, RtiConfig rtiConfig, ErrorReporter errorReporter) {
 
     var code = new CodeBuilder();
 
@@ -571,7 +563,7 @@ protected String makePreamble(
 
     code.pr(generateExecutablePreamble(federate, rtiConfig, errorReporter));
 
-    code.pr(generateSTAAInitialization(federate, rtiConfig, errorReporter));
+    code.pr(generateSTAAInitialization(federate));
 
     code.pr(generateInitializeTriggers(federate, errorReporter));
 
@@ -604,12 +596,8 @@ private String generateInitializeTriggers(
     var oldFederatedReactorName = federatedReactor.getName();
     federatedReactor.setName(federate.name);
     var main = new ReactorInstance(federatedReactor, errorReporter, -1);
-    code.pr(CExtensionUtils.initializeTriggersForNetworkActions(federate, main, errorReporter));
+    code.pr(CExtensionUtils.initializeTriggersForNetworkActions(federate, main));
     code.pr("staa_initialization(); \\");
-    // code.pr(CExtensionUtils.initializeTriggersForControlReactions(federate, main,
-    // errorReporter));
-    // code.pr(CExtensionUtils.networkInputReactions(federate, main));
-    // code.pr(CExtensionUtils.portAbsentReaction(federate, main));
     federatedReactor.setName(oldFederatedReactorName);
 
     return """
@@ -642,12 +630,10 @@ void _lf_executable_preamble() {
   }
 
   /** Generate code for an executed preamble. */
-  private String generateSTAAInitialization(
-      FederateInstance federate, RtiConfig rtiConfig, ErrorReporter errorReporter) {
+  private String generateSTAAInitialization(FederateInstance federate) {
     CodeBuilder code = new CodeBuilder();
     code.pr(
-        CExtensionUtils.surroundWithIfFederatedDecentralized(
-            CExtensionUtils.stpStructs(federate, errorReporter)));
+        CExtensionUtils.surroundWithIfFederatedDecentralized(CExtensionUtils.stpStructs(federate)));
 
     // code.pr(CExtensionUtils.allocateTriggersForFederate(federate));
 
@@ -662,7 +648,7 @@ void staa_initialization() {
   /**
    * Generate code to initialize the {@code federate}.
    *
-   * @param rtiConfig
+   * @param rtiConfig Information about the RTI's deployment.
    * @return The generated code
    */
   private String generateCodeToInitializeFederate(FederateInstance federate, RtiConfig rtiConfig) {
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 1f72cb23a1..3a010d48ea 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -4,11 +4,9 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.regex.Pattern;
-import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetConfig.ClockSyncOptions;
 import org.lflang.TargetProperty;
@@ -35,39 +33,6 @@ public class CExtensionUtils {
   static final Pattern sharedPointerVariable =
       Pattern.compile("^(/\\*.*?\\*/)?std::shared_ptr<(?<type>((/\\*.*?\\*/)?(\\S+))+)>$");
 
-  /**
-   * Generate C code that allocates sufficient memory for the following two critical data structures
-   * that support network control reactions:
-   *
-   * <ul>
-   *   <li>{@code triggers_for_network_input_control_reactions}: These are triggers that are used at
-   *       runtime to insert network input control reactions into the reaction queue.
-   *   <li>{@code trigger_for_network_output_control_reactions}: Triggers for network output control
-   *       reactions, which are unique per each output port. There could be multiple network output
-   *       control reactions for each network output port if it is connected to multiple downstream
-   *       federates.
-   * </ul>
-   *
-   * @param federate The top-level federate instance
-   * @return A string that allocates memory for the aforementioned three structures.
-   */
-  public static String allocateTriggersForFederate(FederateInstance federate) {
-
-    CodeBuilder builder = new CodeBuilder();
-    if (federate.networkInputControlReactionsTriggers.size() > 0) {
-      // Proliferate the network input control reaction trigger array
-      builder.pr(
-          """
-                // Initialize the array of pointers to network input port triggers
-                _fed.triggers_for_network_input_control_reactions_size = %s;
-                _fed.triggers_for_network_input_control_reactions = (trigger_t**)malloc(
-                    _fed.triggers_for_network_input_control_reactions_size * sizeof(trigger_t*));
-                """
-              .formatted(federate.networkInputControlReactionsTriggers.size()));
-    }
-    return builder.getCode();
-  }
-
   /**
    * Generate C code that initializes network actions.
    *
@@ -76,10 +41,9 @@ public static String allocateTriggersForFederate(FederateInstance federate) {
    *
    * @param federate The federate.
    * @param main The main reactor that contains the federate (used to lookup references).
-   * @return
    */
   public static String initializeTriggersForNetworkActions(
-      FederateInstance federate, ReactorInstance main, ErrorReporter errorReporter) {
+      FederateInstance federate, ReactorInstance main) {
     CodeBuilder code = new CodeBuilder();
     if (federate.networkMessageActions.size() > 0) {
       // Create a static array of trigger_t pointers.
@@ -117,13 +81,9 @@ public static String initializeTriggersForNetworkActions(
    *
    * @param federate The federate.
    */
-  public static String stpStructs(FederateInstance federate, ErrorReporter errorReporter) {
+  public static String stpStructs(FederateInstance federate) {
     CodeBuilder code = new CodeBuilder();
-    Collections.sort(
-        federate.stpOffsets,
-        (d1, d2) -> {
-          return (int) (d1.time - d2.time);
-        });
+    federate.stpOffsets.sort((d1, d2) -> (int) (d1.time - d2.time));
     if (!federate.stpOffsets.isEmpty()) {
       // Create a static array of trigger_t pointers.
       // networkMessageActions is a list of Actions, but we
@@ -165,90 +125,6 @@ public static String stpStructs(FederateInstance federate, ErrorReporter errorRe
     return code.getCode();
   }
 
-  /**
-   * Generate C code that initializes three critical structures that support network control
-   * reactions: - triggers_for_network_input_control_reactions: These are triggers that are used at
-   * runtime to insert network input control reactions into the reaction queue. There could be
-   * multiple network input control reactions for one network input at multiple levels in the
-   * hierarchy. - trigger_for_network_output_control_reactions: Triggers for network output control
-   * reactions, which are unique per each output port. There could be multiple network output
-   * control reactions for each network output port if it is connected to multiple downstream
-   * federates.
-   *
-   * @param instance The reactor instance that is at any level of the hierarchy within the federate.
-   * @param errorReporter The top-level federate
-   * @return A string that initializes the aforementioned three structures.
-   */
-  // public static String initializeTriggersForControlReactions(
-  //         FederateInstance instance,
-  //         ReactorInstance main,
-  //         ErrorReporter errorReporter
-  // ) {
-  //     CodeBuilder builder = new CodeBuilder();
-
-  //     if (federate.networkSenderControlReactions.size() > 0) {
-  //         // Create a static array of trigger_t pointers.
-  //         // networkMessageActions is a list of Actions, but we
-  //         // need a list of trigger struct names for ActionInstances.
-  //         // There should be exactly one ActionInstance in the
-  //         // main reactor for each Action.
-  //         var triggers = new LinkedList<String>();
-  //         for (int i = 0; i < federate.networkSenderControlReactions.size(); ++i) {
-  //             // Find the corresponding ActionInstance.
-  //             Action action = federate.networkMessageActions.get(i);
-  //             var reactor =
-  // main.lookupReactorInstance(federate.networkReceiverInstantiations.get(i));
-  //             var actionInstance = reactor.lookupActionInstance(action);
-  //             triggers.add(CUtil.actionRef(actionInstance, null));
-  //         }
-  //         var actionTableCount = 0;
-  //         for (String trigger : triggers) {
-  //             code.pr("_lf_action_table[" + (actionTableCount++) + "] = (lf_action_base_t*)&"
-  //                         + trigger + "; \\");
-  //         }
-  //     }
-
-  //     ReactorDecl reactorClass = instance.getDefinition().getReactorClass();
-  //     Reactor reactor = ASTUtils.toDefinition(reactorClass);
-  //     String nameOfSelfStruct = CUtil.reactorRef(instance);
-
-  //     // Initialize triggers for network input control reactions
-  //     for (Action trigger : errorReporter.networkInputControlReactionsTriggers) {
-  //         // Check if the trigger belongs to this reactor instance
-  //         if (ASTUtils.allReactions(reactor).stream().anyMatch(r -> {
-  //             return r.getTriggers().stream().anyMatch(t -> {
-  //                 if (t instanceof VarRef) {
-  //                     return ((VarRef) t).getVariable().equals(trigger);
-  //                 } else {
-  //                     return false;
-  //                 }
-  //             });
-  //         })) {
-  //             // Initialize the triggers_for_network_input_control_reactions for the input
-  //             builder.pr(
-  //                 String.join("\n",
-  //                     "/* Add trigger " + nameOfSelfStruct + "->_lf__"+trigger.getName()+" to the
-  // global list of network input ports. */ \\",
-  //
-  // "_fed.triggers_for_network_input_control_reactions["+errorReporter.networkInputControlReactionsTriggers.indexOf(trigger)+"]= \\",
-  //                     "    &"+nameOfSelfStruct+"->_lf__"+trigger.getName()+"; \\"
-  //                 )
-  //             );
-  //         }
-  //     }
-
-  //     nameOfSelfStruct = CUtil.reactorRef(instance);
-
-  //     // Initialize the trigger for network output control reactions if it doesn't exist.
-  //     if (errorReporter.networkOutputControlReactionsTrigger != null) {
-  //         builder.pr("_fed.trigger_for_network_output_control_reactions=&"
-  //                 + nameOfSelfStruct
-  //                 + "->_lf__outputControlReactionTrigger; \\");
-  //     }
-
-  //     return builder.getCode();
-  // }
-
   /**
    * Create a port status field variable for a network input port "input" in the self struct of a
    * reactor.
@@ -258,23 +134,19 @@ public static String stpStructs(FederateInstance federate, ErrorReporter errorRe
    */
   public static String createPortStatusFieldForInput(Input input) {
     StringBuilder builder = new StringBuilder();
-    // Check if the port is a multiport
+    // If it is not a multiport, then we could re-use the port trigger, and nothing needs to be done
     if (ASTUtils.isMultiport(input)) {
       // If it is a multiport, then create an auxiliary list of port
       // triggers for each channel of
       // the multiport to keep track of the status of each channel
       // individually
-      builder.append("trigger_t* _lf__" + input.getName() + "_network_port_status;\n");
-    } else {
-      // If it is not a multiport, then we could re-use the port trigger,
-      // and nothing needs to be
-      // done
+      builder.append("trigger_t* _lf__").append(input.getName()).append("_network_port_status;\n");
     }
     return builder.toString();
   }
 
   /**
-   * Given a connection 'delay' predicate, return a string that represents the interval_t value of
+   * Given a connection 'delay' expression, return a string that represents the interval_t value of
    * the additional delay that needs to be applied to the outgoing message.
    *
    * <p>The returned additional delay in absence of after on network connection (i.e., if delay is
@@ -285,8 +157,7 @@ public static String createPortStatusFieldForInput(Input input) {
    * to the network connection (that can be zero) either as a time value (e.g., 200 msec) or as a
    * literal (e.g., a parameter), that delay in nsec will be returned.
    *
-   * @param delay
-   * @return
+   * @param delay The delay associated with a connection.
    */
   public static String getNetworkDelayLiteral(Expression delay) {
     String additionalDelayString = "NEVER";
@@ -577,17 +448,6 @@ public static String generateFederateNeighborStructure(FederateInstance federate
     return code.toString();
   }
 
-  public static List<String> getFederatedFiles() {
-    return List.of(
-        "federated/net_util.c",
-        "federated/net_util.h",
-        "federated/net_common.h",
-        "federated/federate.c",
-        "federated/federate.h",
-        "federated/clock-sync.h",
-        "federated/clock-sync.c");
-  }
-
   /**
    * Surround {@code code} with blocks to ensure that code only executes if the program is
    * federated.
@@ -633,18 +493,13 @@ public static String generateSerializationIncludes(
     CodeBuilder code = new CodeBuilder();
     for (SupportedSerializers serializer : federate.enabledSerializers) {
       switch (serializer) {
-        case NATIVE:
-        case PROTO:
-          {
-            // No need to do anything at this point.
-            break;
-          }
-        case ROS2:
-          {
-            var ROSSerializer = new FedROS2CPPSerialization();
-            code.pr(ROSSerializer.generatePreambleForSupport().toString());
-            break;
-          }
+        case NATIVE, PROTO -> {
+          // No need to do anything at this point.
+        }
+        case ROS2 -> {
+          var ROSSerializer = new FedROS2CPPSerialization();
+          code.pr(ROSSerializer.generatePreambleForSupport().toString());
+        }
       }
     }
     return code.getCode();
@@ -655,75 +510,15 @@ public static String generateSerializationCMakeExtension(FederateInstance federa
     CodeBuilder code = new CodeBuilder();
     for (SupportedSerializers serializer : federate.enabledSerializers) {
       switch (serializer) {
-        case NATIVE:
-        case PROTO:
-          {
-            // No CMake code is needed for now
-            break;
-          }
-        case ROS2:
-          {
-            var ROSSerializer = new FedROS2CPPSerialization();
-            code.pr(ROSSerializer.generateCompilerExtensionForSupport());
-            break;
-          }
-      }
-    }
-    return code.getCode();
-  }
-
-  public static CharSequence upstreamPortReactions(
-      FederateInstance federate, ReactorInstance main) {
-    CodeBuilder code = new CodeBuilder();
-    if (!federate.networkMessageActions.isEmpty()) {
-      // Create a static array of trigger_t pointers.
-      // networkMessageActions is a list of Actions, but we
-      // need a list of trigger struct names for ActionInstances.
-      // There should be exactly one ActionInstance in the
-      // main reactor for each Action.
-      var reactions = new LinkedList<String>();
-      for (int i = 0; i < federate.networkMessageActions.size(); ++i) {
-        // Find the corresponding ActionInstance.
-        var reaction = federate.networkReceiverReactions.get(i);
-        var reactor = main.lookupReactorInstance(federate.networkReceiverInstantiations.get(i));
-        var reactionInstance = reactor.lookupReactionInstance(reaction);
-        reactions.add(CUtil.reactionRef(reactionInstance));
-      }
-      var tableCount = 0;
-      for (String react : reactions) {
-        code.pr("upstreamPortReactions[" + (tableCount++) + "] = (reaction_t*)&" + react + "; \\");
+        case NATIVE, PROTO -> {
+          // No CMake code is needed for now
+        }
+        case ROS2 -> {
+          var ROSSerializer = new FedROS2CPPSerialization();
+          code.pr(ROSSerializer.generateCompilerExtensionForSupport());
+        }
       }
     }
     return code.getCode();
   }
-
-//  public static CharSequence downstreamControlPortReactions(
-//      FederateInstance federate, ReactorInstance main) {
-//    CodeBuilder code = new CodeBuilder();
-//    if (!federate.networkSenderControlReactions.isEmpty()) {
-//      // Create a static array of trigger_t pointers.
-//      // networkMessageActions is a list of Actions, but we
-//      // need a list of trigger struct names for ActionInstances.
-//      // There should be exactly one ActionInstance in the
-//      // main reactor for each Action.
-//      var reactions = new LinkedList<String>();
-//      for (int i = 0; i < federate.networkSenderControlReactions.size(); ++i) {
-//        // Find the corresponding ActionInstance.
-//        var reaction = federate.networkSenderControlReactions.get(i);
-//        var reactor = main.lookupReactorInstance(federate.networkSenderInstantiations.get(i));
-//        var reactionInstance = reactor.lookupReactionInstance(reaction);
-//        reactions.add(CUtil.reactionRef(reactionInstance));
-//      }
-//      var tableCount = 0;
-//      for (String react : reactions) {
-//        code.pr(
-//            "downstreamControlPortReactions["
-//                + (tableCount++)
-//                + "] = (reaction_t*)&"
-//                + react
-//                + "; \\");
-//      }
-//    }
-//    return code.getCode();
-//  }
 }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 0dedf9e47f..58fb659cb1 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -128,7 +128,7 @@ public static Reactor findFederatedReactor(Resource resource) {
    * Replace the specified connection with communication between federates.
    *
    * @param connection Network connection between two federates.
-   * @param resource
+   * @param resource The resource from which the ECore model was derived.
    * @param coordination One of CoordinationType.DECENTRALIZED or CoordinationType.CENTRALIZED.
    * @param errorReporter Used to report errors encountered.
    */
@@ -138,24 +138,10 @@ public static void makeCommunication(
       CoordinationType coordination,
       ErrorReporter errorReporter) {
 
-    // Add the sender reactor.
     addNetworkSenderReactor(connection, coordination, resource, errorReporter);
 
-    // Next, generate control reactions
-    // if (
-    //     !connection.getDefinition().isPhysical() &&
-    //         // Connections that are physical don't need control reactions
-    //         connection.getDefinition().getDelay()
-    //             == null // Connections that have delays don't need control reactions
-    // ) {
-    // Add the network output control reaction to the parent
     FedASTUtils.addNetworkOutputControlReaction(connection);
 
-    // Add the network input control reaction to the parent
-    // FedASTUtils.addNetworkInputControlReaction(connection, coordination, errorReporter);
-    // }
-
-    // Add the network receiver reactor in the destinationFederate
     addNetworkReceiverReactor(connection, coordination, resource, errorReporter);
   }
 
@@ -222,10 +208,9 @@ public static Reactor addReactorDefinition(String name, Resource resource) {
    * sender in 'action->value'. This value is forwarded to 'destination' in the network receiver
    * reaction.
    *
-   * @param connection FIXME
+   * @param connection A description of the federated connection that is being replaced.
    * @param coordination One of CoordinationType.DECENTRALIZED or CoordinationType.CENTRALIZED.
-   * @param resource
-   * @note: Used in federated execution
+   * @param resource The resource from which the ECore model was derived.
    */
   private static void addNetworkReceiverReactor(
       FedConnectionInstance connection,
@@ -256,7 +241,6 @@ private static void addNetworkReceiverReactor(
 
     receiver.getReactions().add(networkReceiverReaction);
     receiver.getOutputs().add(out);
-    // networkReceiverReaction.setName("NetworkReceiverReaction_" + networkIDReceiver++);
 
     addLevelAttribute(
         networkInstance, connection.getDestinationPortInstance(), 0/*connection.getSrcChannel()*/);
@@ -370,21 +354,9 @@ private static void addNetworkReceiverReactor(
     connection.dstFederate.networkPortToInstantiation.put(
         connection.getDestinationPortInstance(), networkInstance);
     connection.dstFederate.networkActionToInstantiation.put(networkAction, networkInstance);
-    // System.out.println(connection.getSourcePortInstance());
-
-    //    if (!connection.getDefinition().isPhysical()
-    //        &&
-    //        // Connections that are physical don't need control reactions
-    //        connection.getDefinition().getDelay()
-    //            == null // Connections that have delays don't need control reactions
-    //    ) {
-    //      // Add necessary dependency annotations to federate to ensure the level
-    //      // assigner has enough information to correctly assign levels without introducing
-    // deadlock
-    //      addRelativeDependencyAnnotation(connection, networkReceiverReaction, errorReporter);
-    //    }
   }
 
+  /** Add a level annotation to the instantiation of a network reactor. */
   private static void addLevelAttribute(Instantiation instantiation, PortInstance p, int index) {
     var a = LfFactory.eINSTANCE.createAttribute();
     a.setAttrName("_tpoLevel");
@@ -399,139 +371,6 @@ private static void addLevelAttribute(Instantiation instantiation, PortInstance
     instantiation.getAttributes().add(a);
   }
 
-  //  /**
-  //   * Add a network control reaction for a given input port 'destination' to destination's parent
-  //   * reactor. This reaction will block for any valid logical time until it is known whether the
-  //   * trigger for the action corresponding to the given port is present or absent.
-  //   *
-  //   * @param connection FIXME
-  //   * @param coordination FIXME
-  //   * @param errorReporter
-  //   * @note Used in federated execution
-  //   */
-  //  private static void addNetworkInputControlReaction(
-  //      FedConnectionInstance connection,
-  //      CoordinationType coordination,
-  //      ErrorReporter errorReporter) {
-  //
-  //    LfFactory factory = LfFactory.eINSTANCE;
-  //    Reaction reaction = factory.createReaction();
-  //    VarRef destRef = factory.createVarRef();
-  //    int receivingPortID = connection.dstFederate.networkMessageActions.size();
-  //
-  //    // If the sender or receiver is in a bank of reactors, then we want
-  //    // these reactions to appear only in the federate whose bank ID matches.
-  //    setReactionBankIndex(reaction, connection.getDstBank());
-  //
-  //    // FIXME: do not create a new extension every time it is used
-  //    FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
-  //        .annotateReaction(reaction);
-  //
-  //    // Create a new action that will be used to trigger the
-  //    // input control reactions.
-  //    Action newTriggerForControlReactionInput = factory.createAction();
-  //    newTriggerForControlReactionInput.setOrigin(ActionOrigin.LOGICAL);
-  //
-  //    // Set the container and variable according to the network port
-  //    destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
-  //    destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
-  //
-  //    Reactor top =
-  // connection.getDestinationPortInstance().getParent().getParent().reactorDefinition;
-  //
-  //    newTriggerForControlReactionInput.setName(
-  //        ASTUtils.getUniqueIdentifier(top, "inputControlReactionTrigger"));
-  //
-  //    // Add the newly created Action to the action list of the federated reactor.
-  //    top.getActions().add(newTriggerForControlReactionInput);
-  //
-  //    // Create the trigger for the reaction
-  //    VarRef newTriggerForControlReaction = factory.createVarRef();
-  //    newTriggerForControlReaction.setVariable(newTriggerForControlReactionInput);
-  //
-  //    // Add the appropriate triggers to the list of triggers of the reaction
-  //    reaction.getTriggers().add(newTriggerForControlReaction);
-  //
-  //    // Add the destination port as an effect of the reaction
-  //    reaction.getEffects().add(destRef);
-  //
-  //    // Generate code for the network input control reaction
-  //    reaction.setCode(factory.createCode());
-  //
-  //    TimeValue maxSTP = findMaxSTP(connection, coordination);
-  //
-  //    reaction
-  //        .getCode()
-  //        .setBody(
-  //            FedTargetExtensionFactory.getExtension(connection.dstFederate.targetConfig.target)
-  //                .generateNetworkInputControlReactionBody(receivingPortID, maxSTP,
-  // coordination));
-  //
-  //    // Insert the reaction
-  //    top.getReactions().add(reaction);
-  //
-  //    // Add the trigger for this reaction to the list of triggers, used to actually
-  //    // trigger the reaction at the beginning of each logical time.
-  //    connection.dstFederate.networkInputControlReactionsTriggers.add(
-  //        newTriggerForControlReactionInput);
-  //
-  //    // Add the network input control reaction to the federate instance's list
-  //    // of network reactions
-  //    // connection.dstFederate.networkReactions.add(reaction);
-  //
-  //    // Add necessary dependencies to reaction to ensure that it executes correctly
-  //    // relative to other network input control reactions in the federate.
-  //    // addRelativeDependency(connection, reaction, errorReporter);
-  //  }
-
-  //  /**
-  //   * Add necessary dependency information to the signature of {@code networkInputReaction} so
-  // that
-  //   * it can execute in the correct order relative to other network reactions in the federate.
-  //   *
-  //   * <p>In particular, we want to avoid a deadlock if multiple network input control reactions
-  // in
-  //   * federate are in a zero-delay cycle through other federates in the federation. To avoid the
-  //   * deadlock, we encode the zero-delay cycle inside the federate by adding an artificial
-  // dependency
-  //   * from the output port of this federate that is involved in the cycle to the signature of
-  // {@code
-  //   * networkInputReaction} as a source.
-  //   */
-  //  private static void addRelativeDependencyAnnotation(
-  //      FedConnectionInstance connection,
-  //      Reaction networkInputReaction,
-  //      ErrorReporter errorReporter) {
-  //    var upstreamOutputPortsInFederate =
-  //        findUpstreamPortsInFederate(
-  //            connection.dstFederate,
-  //            connection.getSourcePortInstance(),
-  //            new HashSet<>(),
-  //            new HashSet<>());
-  //
-  //    ModelInfo info = new ModelInfo();
-  //    for (var port : upstreamOutputPortsInFederate) {
-  //      // VarRef sourceRef = ASTUtils.factory.createVarRef();
-  //      connection.dstFederate.networkReactionDependencyPairs.add(
-  //          new Pair<PortInstance, PortInstance>(connection.getDestinationPortInstance(), port));
-  //
-  //      // sourceRef.setContainer(port.getParent().getDefinition());
-  //      // sourceRef.setVariable(port.getDefinition());
-  //      // networkInputReaction.getSources().add(sourceRef);
-  //
-  //      // // Remove the port if it introduces cycles
-  //      // info.update(
-  //      //        (Model)networkInputReaction.eContainer().eContainer(),
-  //      //         errorReporter
-  //      //         );
-  //      // if (!info.topologyCycles().isEmpty()) {
-  //      //         networkInputReaction.getSources().remove(sourceRef);
-  //      //     }
-  //    }
-  //    // System.out.println(connection.dstFederate.networkReactionDependencyPairs);
-  //
-  //  }
-
   /**
    * Go upstream from input port {@code port} until we reach one or more output ports that belong to
    * the same federate.
@@ -561,9 +400,7 @@ else if (federate.contains(port.getParent())) {
       // Follow depends on reactions
       port.getDependsOnReactions()
           .forEach(
-              reaction -> {
-                followReactionUpstream(federate, visitedPorts, toReturn, reaction, reactionVisited);
-              });
+              reaction -> followReactionUpstream(federate, visitedPorts, toReturn, reaction, reactionVisited));
       // Follow depends on ports
       port.getDependsOnPorts()
           .forEach(
@@ -750,8 +587,7 @@ public static <E> List<E> safe(List<E> list) {
 
   public static int networkIDReceiver = 0;
 
-  private static Map<FedConnectionInstance, Reactor> networkSenderReactors = new HashMap<>();
-  private static Map<FederateInstance, Instantiation> networkSenderInstantiations = new HashMap<>();
+  private static final Map<FedConnectionInstance, Reactor> networkSenderReactors = new HashMap<>();  // FIXME: static mutable objects are bad
 
   private static Reactor getNetworkSenderReactor(
       FedConnectionInstance connection,
@@ -866,9 +702,7 @@ private static Reaction getInitializationReaction() {
    *
    * @param connection Network connection between two federates.
    * @param coordination One of CoordinationType.DECENTRALIZED or CoordinationType.CENTRALIZED.
-   * @param resource
-   * @param errorReporter FIXME
-   * @note Used in federated execution
+   * @param resource The resource from which the ECore model was derived.
    */
   private static void addNetworkSenderReactor(
       FedConnectionInstance connection,
@@ -946,8 +780,7 @@ private static Assignment getSenderIndex(int networkIDSender) {
    * Add a network control reaction for a given output port 'source' to source's parent reactor.
    * This reaction will send a port absent message if the status of the output port is absent.
    *
-   * @param connection FIXME
-   * @note Used in federated execution
+   * @param connection The federated connection being replaced.
    */
   private static void addNetworkOutputControlReaction(FedConnectionInstance connection) {
     LfFactory factory = LfFactory.eINSTANCE;
@@ -968,49 +801,6 @@ private static void addNetworkOutputControlReaction(FedConnectionInstance connec
     FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
         .annotateReaction(reaction);
 
-    // We use an action at the top-level to manually
-    // trigger output control reactions. That action is created once
-    // and recorded in the federate instance.
-    // Check whether the action already has been created.
-    // if (connection.srcFederate.networkOutputControlReactionsTrigger == null) {
-    //     // The port has not been created.
-    //     String triggerName = "outputControlReactionTrigger";
-
-    //     // Find the trigger definition in the reactor definition, which could have been
-    //     // generated for another federate instance if there are multiple instances
-    //     // of the same reactor that are each distinct federates.
-    //     Optional<Action> optTriggerInput
-    //         = top.getActions().stream().filter(
-    //         I -> I.getName().equals(triggerName)).findFirst();
-
-    // if (optTriggerInput.isEmpty()) {
-    // If no trigger with the name "outputControlReactionTrigger" is
-    // already added to the reactor definition, we need to create it
-    // for the first time. The trigger is a logical action.
-    //    Action newTriggerForControlReactionVariable = factory.createAction();
-    //    newTriggerForControlReactionVariable.setName("outputControlReactionTrigger");
-    //    newTriggerForControlReactionVariable.setOrigin(ActionOrigin.LOGICAL);
-    //    top.getActions().add(newTriggerForControlReactionVariable);
-
-    // // Now that the variable is created, store it in the federate instance
-    // connection.srcFederate.networkOutputControlReactionsTrigger
-    //         = newTriggerForControlReactionVariable;
-    // } else {
-    // If the "outputControlReactionTrigger" trigger is already
-    // there, we can re-use it for this new reaction since a single trigger
-    // will trigger
-    //     // all network output control reactions.
-    //     connection.srcFederate.networkOutputControlReactionsTrigger = optTriggerInput.get();
-    // }
-    // }
-
-    // Add the trigger for all output control reactions to the list of triggers
-    //    VarRef triggerRef = factory.createVarRef();
-    //    triggerRef.setVariable(newTriggerForControlReactionVariable);
-    //    reaction.getTriggers().add(triggerRef);
-    // int val = networkIDSender-1;
-    // reaction.setName("NetworkSenderControlReaction_" + val);
-
     // Generate the code
     reaction.setCode(factory.createCode());
 
@@ -1029,9 +819,5 @@ private static void addNetworkOutputControlReaction(FedConnectionInstance connec
     connection.srcFederate.networkSenderReactions.add(reaction);
     connection.srcFederate.networkSenderControlReactions.add(reaction);
 
-    // connection.srcFederate.networkPortToControlReaction.put(connection.getSourcePortInstance(),
-    // reaction);
-    // connection.srcFederate.networkOutputControlReactionsTriggers.add(newTriggerForControlReactionVariable);
-
   }
 }

From 4cf334b79c78af192fb2d1fb6eaee3e2b6240334 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 27 Jun 2023 20:57:28 -0700
Subject: [PATCH 0501/1114] Address warnings and format.

---
 .../federated/extensions/CExtension.java      |  2 +-
 .../federated/extensions/PythonExtension.java |  6 +--
 .../federated/generator/FedASTUtils.java      | 25 ++++++----
 .../federated/generator/FedMainEmitter.java   | 14 +++---
 .../federated/generator/FederateInstance.java | 47 +++----------------
 .../generator/ReactionInstanceGraph.java      |  5 +-
 .../generator/c/CReactionGenerator.java       |  4 +-
 .../org/lflang/validation/AttributeSpec.java  | 14 +++---
 8 files changed, 44 insertions(+), 73 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index f7889eacbb..3c3c671641 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -547,7 +547,7 @@ protected String makePreamble(
     int numOfNetworkSenderControlReactions = federate.networkSenderControlReactions.size();
     code.pr(
         """
-        reaction_t* port_absent_reaction[%1$s] = { 0 };
+        reaction_t* port_absent_reaction[%1$s];  // initialize to null pointers; see C99 6.7.8.10
         size_t num_sender_reactions = %1$s;
         """
             .formatted(numOfNetworkSenderControlReactions));
diff --git a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
index ee598d8e26..9cca139255 100644
--- a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
@@ -26,7 +26,6 @@
 
 package org.lflang.federated.extensions;
 
-import java.io.IOException;
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetProperty.CoordinationType;
@@ -51,8 +50,7 @@
 public class PythonExtension extends CExtension {
 
   @Override
-  protected void generateCMakeInclude(FederateInstance federate, FedFileConfig fileConfig)
-      throws IOException {}
+  protected void generateCMakeInclude(FederateInstance federate, FedFileConfig fileConfig) {}
 
   @Override
   protected String generateSerializationIncludes(
@@ -168,7 +166,7 @@ protected void serializeAndSend(
         }
       case PROTO:
         {
-          throw new UnsupportedOperationException("Protbuf serialization is not supported yet.");
+          throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
         }
       case ROS2:
         {
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 58fb659cb1..a3532e5cd1 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -243,7 +243,7 @@ private static void addNetworkReceiverReactor(
     receiver.getOutputs().add(out);
 
     addLevelAttribute(
-        networkInstance, connection.getDestinationPortInstance(), 0/*connection.getSrcChannel()*/);
+        networkInstance, connection.getDestinationPortInstance(), 0 /*connection.getSrcChannel()*/);
     networkInstance.setReactorClass(receiver);
     networkInstance.setName(
         ASTUtils.getUniqueIdentifier(top, "nr_" + connection.getDstFederate().name));
@@ -400,7 +400,9 @@ else if (federate.contains(port.getParent())) {
       // Follow depends on reactions
       port.getDependsOnReactions()
           .forEach(
-              reaction -> followReactionUpstream(federate, visitedPorts, toReturn, reaction, reactionVisited));
+              reaction ->
+                  followReactionUpstream(
+                      federate, visitedPorts, toReturn, reaction, reactionVisited));
       // Follow depends on ports
       port.getDependsOnPorts()
           .forEach(
@@ -587,7 +589,8 @@ public static <E> List<E> safe(List<E> list) {
 
   public static int networkIDReceiver = 0;
 
-  private static final Map<FedConnectionInstance, Reactor> networkSenderReactors = new HashMap<>();  // FIXME: static mutable objects are bad
+  private static final Map<FedConnectionInstance, Reactor> networkSenderReactors =
+      new HashMap<>(); // FIXME: static mutable objects are bad
 
   private static Reactor getNetworkSenderReactor(
       FedConnectionInstance connection,
@@ -607,13 +610,14 @@ private static Reactor getNetworkSenderReactor(
     in.setName("msg");
     in.setType(type);
     in.setWidthSpec(
-            EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getWidthSpec()));
+        EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getWidthSpec()));
     inRef.setVariable(in);
 
     destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
     destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
 
-    Reaction networkSenderReaction = getNetworkSenderReaction(inRef, destRef, connection, coordination, type, errorReporter);
+    Reaction networkSenderReaction =
+        getNetworkSenderReaction(inRef, destRef, connection, coordination, type, errorReporter);
 
     var senderIndexParameter = LfFactory.eINSTANCE.createParameter();
     var senderIndexParameterType = LfFactory.eINSTANCE.createType();
@@ -683,7 +687,8 @@ private static Reaction getInitializationReaction() {
     startup.setType(BuiltinTrigger.STARTUP);
     initializationReaction.getTriggers().add(startup);
     var code = LfFactory.eINSTANCE.createCode();
-    code.setBody("""
+    code.setBody(
+        """
             extern reaction_t* port_absent_reaction[];
             void enqueue_network_output_control_reactions();
             LF_PRINT_DEBUG("Adding network output control reaction to table.");
@@ -730,8 +735,11 @@ private static void addNetworkSenderReactor(
     networkInstance.setName(
         ASTUtils.getUniqueIdentifier(top, "ns_" + connection.getDstFederate().name));
     top.getInstantiations().add(networkInstance);
-    networkInstance.getParameters().add(getSenderIndex(connection.getSrcFederate().networkIdSender++));
-    addLevelAttribute(networkInstance, connection.getSourcePortInstance(), 0/*connection.srcChannel*/);
+    networkInstance
+        .getParameters()
+        .add(getSenderIndex(connection.getSrcFederate().networkIdSender++));
+    addLevelAttribute(
+        networkInstance, connection.getSourcePortInstance(), 0 /*connection.srcChannel*/);
 
     Connection senderToReaction = factory.createConnection();
 
@@ -818,6 +826,5 @@ private static void addNetworkOutputControlReaction(FedConnectionInstance connec
     // of network reactions
     connection.srcFederate.networkSenderReactions.add(reaction);
     connection.srcFederate.networkSenderControlReactions.add(reaction);
-
   }
 }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index 97aba1b432..6c097f790c 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -1,7 +1,5 @@
 package org.lflang.federated.generator;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import org.eclipse.emf.ecore.EObject;
@@ -116,19 +114,19 @@ private CharSequence generateMainSignature(
             .map(Variable::getName)
             .collect(Collectors.joining(","));
 
-//    List<String> vals = new ArrayList<>();
-//    for (var pair : federate.networkReactionDependencyPairs) {
-//      vals.add(getDependencyList(federate, pair));
-//    }
+    //    List<String> vals = new ArrayList<>();
+    //    for (var pair : federate.networkReactionDependencyPairs) {
+    //      vals.add(getDependencyList(federate, pair));
+    //    }
 
-//    String intraDependencies = String.join(";", vals);
+    //    String intraDependencies = String.join(";", vals);
     return """
         @_fed_config(network_message_actions="%s")
         main reactor %s {
         """
         .formatted(
             networkMessageActionsListString,
-//            intraDependencies,
+            //            intraDependencies,
             paramList.equals("()") ? "" : paramList);
   }
 }
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index 91b8166f79..520c73b1fa 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -66,7 +66,6 @@
 import org.lflang.lf.TriggerRef;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
-import org.lflang.util.Pair;
 
 /**
  * Instance of a federate, or marker that no federation has been defined (if isSingleton() returns
@@ -118,7 +117,7 @@ public FederateInstance(
    * The position within a bank of reactors for this federate. This is 0 if the instantiation is not
    * a bank of reactors.
    */
-  public int bankIndex = 0;
+  public int bankIndex;
 
   /** A list of outputs that can be triggered directly or indirectly by physical actions. */
   public Set<Expression> outputsConnectedToPhysicalActions = new LinkedHashSet<>();
@@ -162,7 +161,7 @@ public Instantiation getInstantiation() {
   public String user = null;
 
   /** The integer ID of this federate. */
-  public int id = 0;
+  public int id;
 
   /**
    * The name of this federate instance. This will be the instantiation name, possibly appended with
@@ -194,22 +193,6 @@ public Instantiation getInstantiation() {
    */
   public Set<FederateInstance> outboundP2PConnections = new LinkedHashSet<>();
 
-  /**
-   * A list of triggers for network input control reactions. This is used to trigger all the input
-   * network control reactions that might be nested in a hierarchy.
-   */
-  public List<Action> networkInputControlReactionsTriggers = new ArrayList<>();
-
-  /**
-   * The triggers that trigger the output control reactions of this federate.
-   *
-   * <p>The network output control reactions send a PORT_ABSENT message for a network output port,
-   * if it is absent at the current tag, to notify all downstream federates that no value will be
-   * present on the given network port, allowing input control reactions on those federates to stop
-   * blocking.
-   */
-  public List<Action> networkOutputControlReactionsTriggers = new ArrayList<>();
-
   /** Indicates whether the federate is remote or local */
   public boolean isRemote = false;
 
@@ -233,12 +216,6 @@ public Instantiation getInstantiation() {
    */
   public List<Reactor> networkReactors = new ArrayList<>();
 
-//  /**
-//   * List of relative dependencies between network input and output reactions belonging to the same
-//   * federate that have zero logical delay between them.
-//   */
-//  public List<Pair<PortInstance, PortInstance>> networkReactionDependencyPairs = new ArrayList<>();
-
   /**
    * Mapping from a port instance of a connection to its associated network reaction. We populate
    * this map as we process connections as a means of annotating intra-federate dependencies
@@ -357,7 +334,7 @@ private boolean contains(Import imp) {
    * @param param The parameter
    */
   private boolean contains(Parameter param) {
-    boolean returnValue = false;
+    boolean returnValue;
     // Check if param is referenced in this federate's instantiation
     returnValue =
         instantiation.getParameters().stream()
@@ -524,7 +501,7 @@ public boolean contains(ReactorInstance instance) {
    * @param federatedReactor The top-level federated reactor
    */
   private void indexExcludedTopLevelReactions(Reactor federatedReactor) {
-    boolean inFederate = false;
+    boolean inFederate;
     if (excludeReactions != null) {
       throw new IllegalStateException(
           "The index for excluded reactions at the top level is already built.");
@@ -541,11 +518,12 @@ private void indexExcludedTopLevelReactions(Reactor federatedReactor) {
             .filter(it -> !networkSenderReactions.contains(it))
             .collect(Collectors.toList());
     for (Reaction react : reactions) {
-      // Create a collection of all the VarRefs (i.e., triggers, sources, and effects) in the react
+      // Create a collection of all the VarRefs (i.e., triggers, sources, and effects) in the
+      // reaction
       // signature that are ports that reference federates.
       // We then later check that all these VarRefs reference this federate. If not, we will add
       // this
-      // react to the list of reactions that have to be excluded (note that mixing VarRefs from
+      // reaction to the list of reactions that have to be excluded (note that mixing VarRefs from
       // different federates is not allowed).
       List<VarRef> allVarRefsReferencingFederates = new ArrayList<>();
       // Add all the triggers that are outputs
@@ -614,17 +592,6 @@ public LinkedHashMap<Output, TimeValue> findOutputsConnectedToPhysicalActions(
     return physicalActionToOutputMinDelay;
   }
 
-  /**
-   * Return a list of federates that are upstream of this federate and have a zero-delay (direct)
-   * connection to this federate.
-   */
-  public List<FederateInstance> getZeroDelayImmediateUpstreamFederates() {
-    return this.dependsOn.entrySet().stream()
-        .filter(e -> e.getValue().contains(null))
-        .map(Map.Entry::getKey)
-        .toList();
-  }
-
   @Override
   public String toString() {
     return "Federate "
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
index aba5836f17..f81e7d776e 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
@@ -300,8 +300,9 @@ private void addEdgesForTpoLevels(ReactorInstance main) {
   }
 
   /**
-   * Get those reactions contained directly or transitively by the children of {@code main} whose TPO levels are
-   * specified.
+   * Get those reactions contained directly or transitively by the children of {@code main} whose
+   * TPO levels are specified.
+   *
    * @return A map from TPO levels to reactions that are constrained to have the TPO levels.
    */
   private NavigableMap<Integer, List<Runtime>> getConstrainedReactions(ReactorInstance main) {
diff --git a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
index 411b0c1632..7efc26712b 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
@@ -141,12 +141,12 @@ public static String generateInitializationForReaction(
       for (VarRef src : ASTUtils.convertToEmptyListIfNull(reaction.getSources())) {
         if (src.getVariable() instanceof Port) {
           generatePortVariablesInReaction(
-                  reactionInitialization, fieldsForStructsForContainedReactors, src, tpr, types);
+              reactionInitialization, fieldsForStructsForContainedReactors, src, tpr, types);
         } else if (src.getVariable() instanceof Action) {
           // It's a bit odd to read but not be triggered by an action, but
           // OK, I guess we allow it.
           reactionInitialization.pr(
-                  generateActionVariablesInReaction((Action) src.getVariable(), tpr, types));
+              generateActionVariablesInReaction((Action) src.getVariable(), tpr, types));
           actionsAsTriggers.add((Action) src.getVariable());
         }
       }
diff --git a/core/src/main/java/org/lflang/validation/AttributeSpec.java b/core/src/main/java/org/lflang/validation/AttributeSpec.java
index c0649057f8..8f060a6d2e 100644
--- a/core/src/main/java/org/lflang/validation/AttributeSpec.java
+++ b/core/src/main/java/org/lflang/validation/AttributeSpec.java
@@ -49,7 +49,7 @@ public class AttributeSpec {
 
   public static final String VALUE_ATTR = "value";
   public static final String NETWORK_MESSAGE_ACTIONS = "network_message_actions";
-//  public static final String DEPENDENCY_PAIRS = "dependencyPairs";
+  //  public static final String DEPENDENCY_PAIRS = "dependencyPairs";
   public static final String EACH_ATTR = "each";
 
   /** A map from a string to a supported AttributeSpec */
@@ -220,13 +220,13 @@ enum AttrParamType {
         new AttributeSpec(
             List.of(
                 new AttrParamSpec(
-                    AttributeSpec.NETWORK_MESSAGE_ACTIONS, AttrParamType.STRING, false)//,
-//                new AttrParamSpec(AttributeSpec.DEPENDENCY_PAIRS, AttrParamType.STRING, false)
-            )));
+                    AttributeSpec.NETWORK_MESSAGE_ACTIONS, AttrParamType.STRING, false) // ,
+                //                new AttrParamSpec(AttributeSpec.DEPENDENCY_PAIRS,
+                // AttrParamType.STRING, false)
+                )));
     ATTRIBUTE_SPECS_BY_NAME.put("_c_body", new AttributeSpec(null));
     ATTRIBUTE_SPECS_BY_NAME.put(
-            "_tpoLevel",
-            new AttributeSpec(List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.INT, false)))
-    );
+        "_tpoLevel",
+        new AttributeSpec(List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.INT, false))));
   }
 }

From d3d3f25c98036f7e7337b47f8d7f46038fbdaec9 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 27 Jun 2023 21:30:12 -0700
Subject: [PATCH 0502/1114] Minor cleanups.

---
 .../org/lflang/generator/PortInstance.java     | 18 +++++++-----------
 .../org/lflang/generator/ReactionInstance.java | 14 --------------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/PortInstance.java b/core/src/main/java/org/lflang/generator/PortInstance.java
index d28b8720ad..01c0c2ea98 100644
--- a/core/src/main/java/org/lflang/generator/PortInstance.java
+++ b/core/src/main/java/org/lflang/generator/PortInstance.java
@@ -27,7 +27,6 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.PriorityQueue;
 import org.lflang.ErrorReporter;
@@ -234,14 +233,14 @@ public int getLevelUpperBound(int index) {
    * checked by the validator). Each channel of this port will be broadcast to N recipients (or, if
    * there are no connections to zero recipients).
    */
-  List<SendRange> dependentPorts = new ArrayList<SendRange>();
+  List<SendRange> dependentPorts = new ArrayList<>();
 
   /**
    * Upstream ports that are connected directly to this port, if there are any. For an ordinary
    * port, this set will have size 0 or 1. For a multiport, it can have a larger size. This
    * initially has capacity 1 because that is by far the most common case.
    */
-  List<RuntimeRange<PortInstance>> dependsOnPorts = new ArrayList<RuntimeRange<PortInstance>>(1);
+  List<RuntimeRange<PortInstance>> dependsOnPorts = new ArrayList<>(1);
 
   /** Indicator of whether this is a multiport. */
   boolean isMultiport = false;
@@ -269,8 +268,8 @@ private static List<SendRange> eventualDestinations(RuntimeRange<PortInstance> s
     // a queue of ranges that may overlap, then we split those ranges
     // and consolidate their destinations.
 
-    List<SendRange> result = new ArrayList<SendRange>();
-    PriorityQueue<SendRange> queue = new PriorityQueue<SendRange>();
+    List<SendRange> result = new ArrayList<>();
+    PriorityQueue<SendRange> queue = new PriorityQueue<>();
     PortInstance srcPort = srcRange.instance;
 
     // Start with, if this port has dependent reactions, then add it to
@@ -290,10 +289,7 @@ private static List<SendRange> eventualDestinations(RuntimeRange<PortInstance> s
     }
 
     // Need to find send ranges that overlap with this srcRange.
-    Iterator<SendRange> sendRanges = srcPort.dependentPorts.iterator();
-    while (sendRanges.hasNext()) {
-
-      SendRange wSendRange = sendRanges.next();
+    for (SendRange wSendRange : srcPort.dependentPorts) {
 
       if (wSendRange.connection != null && wSendRange.connection.getDelay() != null) {
         continue;
@@ -359,7 +355,7 @@ private static List<SendRange> eventualDestinations(RuntimeRange<PortInstance> s
           // Ranges overlap. Can use a truncated candidate and make its
           // truncated version the new candidate.
           result.add(candidate.head(next.start));
-          candidate = (SendRange) candidate.tail(next.start);
+          candidate = candidate.tail(next.start);
         }
       }
     }
@@ -383,7 +379,7 @@ private static List<SendRange> eventualDestinations(RuntimeRange<PortInstance> s
   private List<RuntimeRange<PortInstance>> eventualSources(RuntimeRange<PortInstance> range) {
     if (eventualSourceRanges == null) {
       // Cached result has not been created.
-      eventualSourceRanges = new ArrayList<RuntimeRange<PortInstance>>();
+      eventualSourceRanges = new ArrayList<>();
 
       if (!dependsOnReactions.isEmpty()) {
         eventualSourceRanges.add(new RuntimeRange.Port(this));
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstance.java b/core/src/main/java/org/lflang/generator/ReactionInstance.java
index 2feaf7367b..67d5351d3f 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstance.java
@@ -394,20 +394,6 @@ public List<Runtime> getRuntimeInstances() {
     return runtimeInstances;
   }
 
-  /**
-   * Purge 'portInstance' from this reaction, removing it from the list of triggers, sources,
-   * effects, and reads. Note that this leaves the runtime instances intact, including their level
-   * information.
-   */
-  public void removePortInstance(PortInstance portInstance) {
-    this.triggers.remove(portInstance);
-    this.sources.remove(portInstance);
-    this.effects.remove(portInstance);
-    this.reads.remove(portInstance);
-    clearCaches(false);
-    portInstance.clearCaches();
-  }
-
   /** Return a descriptive string. */
   @Override
   public String toString() {

From f9b6eaefdb80e5942d40675b97840ba66ef70109 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 27 Jun 2023 21:30:24 -0700
Subject: [PATCH 0503/1114] Revert "Do something bad to see if tests pass."

This reverts commit 48c019f9066eda1b121439371f88415bc2e5482f.
---
 core/src/main/java/org/lflang/generator/PortInstance.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/PortInstance.java b/core/src/main/java/org/lflang/generator/PortInstance.java
index 01c0c2ea98..06a408f540 100644
--- a/core/src/main/java/org/lflang/generator/PortInstance.java
+++ b/core/src/main/java/org/lflang/generator/PortInstance.java
@@ -209,12 +209,7 @@ public String toString() {
    * level}.
    */
   public void hasDependentReactionWithLevel(int index, int level) {
-    // FIXME: index is ignored. This is a real bug that will keep this from working properly in some
-    // cases! We should
-    //  fix it before merging into master. The precondition for fixing it is to compute the
-    // sendRange for the current
-    //  port or top-level port sending into the dependent reaction, not the earliest port possible.
-    levelUpperBounds.replaceAll(a -> Math.min(a, level));
+    levelUpperBounds.set(index, Math.min(levelUpperBounds.get(index), level));
   }
 
   public int getLevelUpperBound(int index) {

From e9537d580c0a4b2b5d18b00888a78ad2745c481b Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 28 Jun 2023 09:40:56 +0200
Subject: [PATCH 0504/1114] use the codecov token and create custom action for
 code reuse

---
 .../actions/report-code-coverage/action.yml   | 19 +++++++++++++++
 .github/workflows/build.yml                   | 11 ++-------
 .github/workflows/c-arduino-tests.yml         | 12 +++-------
 .github/workflows/c-tests.yml                 | 12 +++-------
 .github/workflows/c-zephyr-tests.yml          | 12 +++-------
 .github/workflows/cpp-ros2-tests.yml          | 12 +++-------
 .github/workflows/cpp-tests.yml               | 24 +++++--------------
 .github/workflows/lsp-tests.yml               | 11 ++-------
 .github/workflows/py-tests.yml                | 12 +++-------
 .github/workflows/rs-tests.yml                | 12 +++-------
 .github/workflows/serialization-tests.yml     | 12 +++-------
 .github/workflows/ts-tests.yml                | 12 +++-------
 12 files changed, 53 insertions(+), 108 deletions(-)
 create mode 100644 .github/actions/report-code-coverage/action.yml

diff --git a/.github/actions/report-code-coverage/action.yml b/.github/actions/report-code-coverage/action.yml
new file mode 100644
index 0000000000..b2234f0221
--- /dev/null
+++ b/.github/actions/report-code-coverage/action.yml
@@ -0,0 +1,19 @@
+name: Report code coverage to CodeCov
+inputs:
+  files:
+    description: 'list of coverage files to send to CodeCov'
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - name: Report code coverage to CodeCov
+      uses: Wandalen/wretry.action@v1.3.0
+      with:
+        attempt_limit: 5
+        attempt_delay: 20000
+        action: codecov/codecov-action@v3.1.4
+        with: |
+          files: ${{ files }}
+          fail_ci_if_error: true
+          verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5b99ae5e71..e84f9fce42 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,13 +27,6 @@ jobs:
         run: ./gradlew build testCodeCoverageReport
         shell: bash
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@v1.3.0
+        uses: ./.github/actions/report-code-coverage
         with:
-          attempt_limit: 3
-          attempt_delay: 2000
-          action: codecov/codecov-action@v3.1.4
-          with: |
-            files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/base/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfc/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfd/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lff/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
-            fail_ci_if_error: true
-            verbose: true
-        if: ${{ runner.os == 'Linux' }}
+          files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/base/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfc/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfd/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lff/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
diff --git a/.github/workflows/c-arduino-tests.yml b/.github/workflows/c-arduino-tests.yml
index 5efe653693..d8fc2afdd5 100644
--- a/.github/workflows/c-arduino-tests.yml
+++ b/.github/workflows/c-arduino-tests.yml
@@ -65,13 +65,7 @@ jobs:
       - name: Perform Arduino tests for C target with default scheduler
         run: ./gradlew targetTest -Ptarget=CArduino
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@v1.3.0
+        uses: ./.github/actions/report-code-coverage
         with:
-          attempt_limit: 3
-          attempt_delay: 2000
-          action: codecov/codecov-action@v3.1.4
-          with: |
-            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-            fail_ci_if_error: true
-            verbose: true
-        if: ${{ !inputs.runtime-ref && runner.os == 'Linux' && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+        if: ${{ !inputs.compiler-ref }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml
index 07d7394ee8..df0b42a57b 100644
--- a/.github/workflows/c-tests.yml
+++ b/.github/workflows/c-tests.yml
@@ -65,13 +65,7 @@ jobs:
         run: ./gradlew targetTest -Ptarget=CCpp
         if: ${{ inputs.use-cpp && !inputs.scheduler }}
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@v1.3.0
+        uses: ./.github/actions/report-code-coverage
         with:
-          attempt_limit: 3
-          attempt_delay: 2000
-          action: codecov/codecov-action@v3.1.4
-          with: |
-            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-            fail_ci_if_error: true
-            verbose: true
-        if: ${{ !inputs.compiler-ref && runner.os == 'Linux' && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+        if: ${{ !inputs.compiler-ref }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index e0f9dccf58..5d393a0c41 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -55,13 +55,7 @@ jobs:
           util/RunZephyrTests.sh test/C/src-gen
           rm -r test/C/src-gen
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@v1.3.0
+        uses: ./.github/actions/report-code-coverage
         with:
-          attempt_limit: 3
-          attempt_delay: 2000
-          action: codecov/codecov-action@v3.1.4
-          with: |
-            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-            fail_ci_if_error: true
-            verbose: true
-        if: ${{ !inputs.runtime-ref }}  # i.e., if this is part of the main repo's CI
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+        if: ${{ !inputs.compiler-ref }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/cpp-ros2-tests.yml b/.github/workflows/cpp-ros2-tests.yml
index 7ee8d12688..7860f1eed6 100644
--- a/.github/workflows/cpp-ros2-tests.yml
+++ b/.github/workflows/cpp-ros2-tests.yml
@@ -37,13 +37,7 @@ jobs:
           source /opt/ros/*/setup.bash
           ./gradlew targetTest -Ptarget=CppRos2
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@v1.3.0
+        uses: ./.github/actions/report-code-coverage
         with:
-          attempt_limit: 3
-          attempt_delay: 2000
-          action: codecov/codecov-action@v3.1.4
-          with: |
-            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-            fail_ci_if_error: true
-            verbose: true
-        if: ${{ !inputs.runtime-ref }}  # i.e., if this is part of the main repo's CI
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+        if: ${{ !inputs.compiler-ref }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/cpp-tests.yml b/.github/workflows/cpp-tests.yml
index dcf1c82d40..80ab6e1779 100644
--- a/.github/workflows/cpp-tests.yml
+++ b/.github/workflows/cpp-tests.yml
@@ -50,16 +50,10 @@ jobs:
         run: |
           ./gradlew targetTest -Ptarget=Cpp
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@v1.3.0
+        uses: ./.github/actions/report-code-coverage
         with:
-          attempt_limit: 3
-          attempt_delay: 2000
-          action: codecov/codecov-action@v3.1.4
-          with: |
-            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-            fail_ci_if_error: true
-            verbose: true
-        if: ${{ !inputs.runtime-ref && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+        if: ${{ !inputs.compiler-ref }}  # i.e., if this is part of the main repo's CI
       - name: Collect reactor-cpp coverage data
         run: |
           lcov --capture --directory test/Cpp --output-file coverage.info
@@ -73,13 +67,7 @@ jobs:
           path: reactor-cpp.coverage
         if: matrix.platform == 'ubuntu-latest'
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@v1.3.0
+        uses: ./.github/actions/report-code-coverage
         with:
-          attempt_limit: 3
-          attempt_delay: 2000
-          action: codecov/codecov-action@v3.1.4
-          with: |
-            file: reactor-cpp.info
-            fail_ci_if_error: true
-            verbose: true
-        if: ${{ runner.os == 'Linux' && inputs.all-platforms }}
+          files: reactor-cpp.info
+        if: ${{ !inputs.compiler-ref }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/lsp-tests.yml b/.github/workflows/lsp-tests.yml
index 88d9d95a32..75c2fedb7d 100644
--- a/.github/workflows/lsp-tests.yml
+++ b/.github/workflows/lsp-tests.yml
@@ -79,13 +79,6 @@ jobs:
       - name: Run language server tests
         run: ./gradlew core:integrationTest --tests org.lflang.tests.lsp.LspTests.*ValidationTest core:integrationTestCodeCoverageReport
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@v1.3.0
+        uses: ./.github/actions/report-code-coverage
         with:
-          attempt_limit: 3
-          attempt_delay: 2000
-          action: codecov/codecov-action@v3.1.4
-          with: |
-            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-            fail_ci_if_error: true
-            verbose: true
-        if: ${{ runner.os == 'Linux' && inputs.all-platforms }}
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
diff --git a/.github/workflows/py-tests.yml b/.github/workflows/py-tests.yml
index 04abc75f4f..f238b73887 100644
--- a/.github/workflows/py-tests.yml
+++ b/.github/workflows/py-tests.yml
@@ -65,13 +65,7 @@ jobs:
       - name: Run Python tests
         run: ./gradlew targetTest -Ptarget=Python
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@v1.3.0
+        uses: ./.github/actions/report-code-coverage
         with:
-          attempt_limit: 3
-          attempt_delay: 2000
-          action: codecov/codecov-action@v3.1.4
-          with: |
-            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-            fail_ci_if_error: true
-            verbose: true
-        if: ${{ !inputs.compiler-ref && runner.os == 'Linux' && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+        if: ${{ !inputs.compiler-ref }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/rs-tests.yml b/.github/workflows/rs-tests.yml
index 566d8e01a0..7be1a4aad2 100644
--- a/.github/workflows/rs-tests.yml
+++ b/.github/workflows/rs-tests.yml
@@ -66,13 +66,7 @@ jobs:
       - name: Run Rust tests
         run: ./gradlew targetTest -Ptarget=Rust
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@v1.3.0
+        uses: ./.github/actions/report-code-coverage
         with:
-          attempt_limit: 3
-          attempt_delay: 2000
-          action: codecov/codecov-action@v3.1.4
-          with: |
-            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-            fail_ci_if_error: true
-            verbose: true
-        if: ${{ !inputs.compiler-ref && runner.os == 'Linux' && inputs.all-platforms }}  # i.e., if this is part of the main repo's CI
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+        if: ${{ !inputs.compiler-ref }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/serialization-tests.yml b/.github/workflows/serialization-tests.yml
index a20c8d5272..1fad0490f3 100644
--- a/.github/workflows/serialization-tests.yml
+++ b/.github/workflows/serialization-tests.yml
@@ -36,13 +36,7 @@ jobs:
           source /opt/ros/*/setup.bash
           ./gradlew core:integrationTest --tests org.lflang.tests.serialization.SerializationTest.* core:integrationTestCodeCoverageReport
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@v1.3.0
+        uses: ./.github/actions/report-code-coverage
         with:
-          attempt_limit: 3
-          attempt_delay: 2000
-          action: codecov/codecov-action@v3.1.4
-          with: |
-            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-            fail_ci_if_error: true
-            verbose: true
-        if: ${{ !inputs.runtime-ref }}  # i.e., if this is part of the main repo's CI
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+        if: ${{ !inputs.compiler-ref }}  # i.e., if this is part of the main repo's CI
diff --git a/.github/workflows/ts-tests.yml b/.github/workflows/ts-tests.yml
index c056a52ea1..d1b4b95e0d 100644
--- a/.github/workflows/ts-tests.yml
+++ b/.github/workflows/ts-tests.yml
@@ -39,13 +39,7 @@ jobs:
         run: |
           ./gradlew targetTest -Ptarget=TypeScript -Druntime="git://github.com/lf-lang/reactor-ts.git#master"
       - name: Report to CodeCov
-        uses: Wandalen/wretry.action@v1.3.0
+        uses: ./.github/actions/report-code-coverage
         with:
-          attempt_limit: 3
-          attempt_delay: 2000
-          action: codecov/codecov-action@v3.1.4
-          with: |
-            files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-            fail_ci_if_error: true
-            verbose: true
-        if: ${{ runner.os == 'Linux' && inputs.all-platforms }}
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+        if: ${{ !inputs.compiler-ref }}  # i.e., if this is part of the main repo's CI

From 5e3cfa96f61ba02b5a402edff389eba8559483c1 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Wed, 28 Jun 2023 11:02:33 +0200
Subject: [PATCH 0505/1114] Improve exception handling in  fedsd and use 
 trace_to_csv that is in the same bin directory as fedsd

---
 util/scripts/launch-fedsd.sh        | 2 +-
 util/tracing/visualization/fedsd.py | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/util/scripts/launch-fedsd.sh b/util/scripts/launch-fedsd.sh
index 600cc4d379..341e673324 100755
--- a/util/scripts/launch-fedsd.sh
+++ b/util/scripts/launch-fedsd.sh
@@ -75,7 +75,7 @@ rti_csv_file=''
 for each_lft_file in $lft_files_list
     do
         # Tranform to csv
-        trace_to_csv $each_lft_file
+        ${base}/bin/trace_to_csv $each_lft_file
         # Get the file name
         csv=${each_lft_file%.*}
         if [ $csv == 'rti' ]
diff --git a/util/tracing/visualization/fedsd.py b/util/tracing/visualization/fedsd.py
index 80bdb22451..6658c1ee6b 100644
--- a/util/tracing/visualization/fedsd.py
+++ b/util/tracing/visualization/fedsd.py
@@ -117,8 +117,8 @@ def load_and_process_csv_file(csv_file) :
                 continue
             try:
                 fed_df = load_and_process_csv_file(fed_trace)
-            except:
-                print('Warning: Problem processing trace file ' + fed_trace + '! The initial `.lft` file was probably empty.')
+            except Exception as e:
+                print(f"Warning: Problem processing trace file {fed_trace}: `{e}`")
                 continue
 
             if (not fed_df.empty):
@@ -149,6 +149,7 @@ def load_and_process_csv_file(csv_file) :
         rti_df = rti_df[rti_df['event'].str.contains('AdvLT') == False]
         rti_df.columns = ['event', 'partner_id', 'self_id', 'logical_time', 'microstep', 'physical_time', 'inout']
         rti_df['inout'] = rti_df['inout'].apply(lambda e: 'in' if 'out' in e else 'out')
+        print(rti_df)
     rti_df['x1'] = x_coor[-1]
 
     trace_df = pd.concat([trace_df, rti_df])

From 1cd2de78bbfd6bc89eb41db91b0072bc00e33cfe Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Wed, 28 Jun 2023 09:36:30 -0400
Subject: [PATCH 0506/1114] Added tests for lf_request_stop with enclaves and
 federates

---
 core/src/main/resources/lib/c/reactor-c       |  2 +-
 .../enclave/EnclaveFederatedRequestStop.lf    | 32 +++++++++++++++++++
 test/C/src/enclave/EnclaveRequestStop.lf      | 28 ++++++++++++++++
 3 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 test/C/src/enclave/EnclaveFederatedRequestStop.lf
 create mode 100644 test/C/src/enclave/EnclaveRequestStop.lf

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 95106eb4a6..328f7b104d 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 95106eb4a6294f0e76ab60bcd38f931c6d9cdad0
+Subproject commit 328f7b104dfbf5423b7535fb33e07bc4eada0367
diff --git a/test/C/src/enclave/EnclaveFederatedRequestStop.lf b/test/C/src/enclave/EnclaveFederatedRequestStop.lf
new file mode 100644
index 0000000000..6b276ff3c4
--- /dev/null
+++ b/test/C/src/enclave/EnclaveFederatedRequestStop.lf
@@ -0,0 +1,32 @@
+/**
+ * Test that enclaves within federates all stop at the time requested by the first enclave
+ * to request a stop.
+ */
+target C {
+    timeout: 1 sec
+}
+reactor Stop(stop_time:time = 5s) {
+    preamble {=
+        #include "platform.h" // Defines PRINTF_TIME
+    =}
+    timer t(stop_time)
+    reaction(t) {=
+        lf_request_stop();
+    =}
+    reaction(shutdown) {=
+        lf_print("Stopped at tag (" PRINTF_TIME ", %d)", lf_time_logical_elapsed(), lf_tag().microstep);
+        if (lf_time_logical_elapsed() != 50000000LL || lf_tag().microstep != 1) {
+            lf_print_error_and_exit("Expected stop tag to be (50ms, 1).");
+        }
+    =}
+}
+reactor Fed(least_stop_time:time = 5s) {
+    @enclave
+    s1 = new Stop()
+    @enclave
+    s2 = new Stop(stop_time = least_stop_time)
+}
+federated reactor {
+    f1 = new Fed()
+    f2 = new Fed(least_stop_time = 50 ms)
+}
\ No newline at end of file
diff --git a/test/C/src/enclave/EnclaveRequestStop.lf b/test/C/src/enclave/EnclaveRequestStop.lf
new file mode 100644
index 0000000000..2757945a54
--- /dev/null
+++ b/test/C/src/enclave/EnclaveRequestStop.lf
@@ -0,0 +1,28 @@
+/**
+ * Test that enclaves all stop at the time requested by the first enclave
+ * to request a stop.
+ */
+target C {
+    timeout: 1 sec
+}
+reactor Stop(stop_time:time = 5s) {
+    preamble {=
+        #include "platform.h" // Defines PRINTF_TIME
+    =}
+    timer t(stop_time)
+    reaction(t) {=
+        lf_request_stop();
+    =}
+    reaction(shutdown) {=
+        lf_print("Stopped at tag (" PRINTF_TIME ", %d)", lf_time_logical_elapsed(), lf_tag().microstep);
+        if (lf_time_logical_elapsed() != 50000000LL || lf_tag().microstep != 1) {
+            lf_print_error_and_exit("Expected stop tag to be (50ms, 1).");
+        }
+    =}
+}
+main reactor {
+    @enclave
+    s1 = new Stop()
+    @enclave
+    s2 = new Stop(stop_time = 50 ms)
+}
\ No newline at end of file

From 4d59c1760f4d0ac87fb2aca0ecb8bdd2b9d47da4 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Wed, 28 Jun 2023 09:52:26 -0400
Subject: [PATCH 0507/1114] Formatted new tests

---
 .../enclave/EnclaveFederatedRequestStop.lf    | 53 ++++++++++---------
 test/C/src/enclave/EnclaveRequestStop.lf      | 47 ++++++++--------
 2 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/test/C/src/enclave/EnclaveFederatedRequestStop.lf b/test/C/src/enclave/EnclaveFederatedRequestStop.lf
index 6b276ff3c4..cb92f4f20d 100644
--- a/test/C/src/enclave/EnclaveFederatedRequestStop.lf
+++ b/test/C/src/enclave/EnclaveFederatedRequestStop.lf
@@ -1,32 +1,35 @@
 /**
- * Test that enclaves within federates all stop at the time requested by the first enclave
- * to request a stop.
+ * Test that enclaves within federates all stop at the time requested by the first enclave to
+ * request a stop.
  */
 target C {
-    timeout: 1 sec
+  timeout: 1 sec
 }
-reactor Stop(stop_time:time = 5s) {
-    preamble {=
-        #include "platform.h" // Defines PRINTF_TIME
-    =}
-    timer t(stop_time)
-    reaction(t) {=
-        lf_request_stop();
-    =}
-    reaction(shutdown) {=
-        lf_print("Stopped at tag (" PRINTF_TIME ", %d)", lf_time_logical_elapsed(), lf_tag().microstep);
-        if (lf_time_logical_elapsed() != 50000000LL || lf_tag().microstep != 1) {
-            lf_print_error_and_exit("Expected stop tag to be (50ms, 1).");
-        }
-    =}
+
+reactor Stop(stop_time: time = 5 s) {
+  preamble {=
+    #include "platform.h" // Defines PRINTF_TIME
+  =}
+  timer t(stop_time)
+
+  reaction(t) {= lf_request_stop(); =}
+
+  reaction(shutdown) {=
+    lf_print("Stopped at tag (" PRINTF_TIME ", %d)", lf_time_logical_elapsed(), lf_tag().microstep);
+    if (lf_time_logical_elapsed() != 50000000LL || lf_tag().microstep != 1) {
+        lf_print_error_and_exit("Expected stop tag to be (50ms, 1).");
+    }
+  =}
 }
-reactor Fed(least_stop_time:time = 5s) {
-    @enclave
-    s1 = new Stop()
-    @enclave
-    s2 = new Stop(stop_time = least_stop_time)
+
+reactor Fed(least_stop_time: time = 5 s) {
+  @enclave
+  s1 = new Stop()
+  @enclave
+  s2 = new Stop(stop_time=least_stop_time)
 }
+
 federated reactor {
-    f1 = new Fed()
-    f2 = new Fed(least_stop_time = 50 ms)
-}
\ No newline at end of file
+  f1 = new Fed()
+  f2 = new Fed(least_stop_time = 50 ms)
+}
diff --git a/test/C/src/enclave/EnclaveRequestStop.lf b/test/C/src/enclave/EnclaveRequestStop.lf
index 2757945a54..781fb2811a 100644
--- a/test/C/src/enclave/EnclaveRequestStop.lf
+++ b/test/C/src/enclave/EnclaveRequestStop.lf
@@ -1,28 +1,27 @@
-/**
- * Test that enclaves all stop at the time requested by the first enclave
- * to request a stop.
- */
+/** Test that enclaves all stop at the time requested by the first enclave to request a stop. */
 target C {
-    timeout: 1 sec
+  timeout: 1 sec
 }
-reactor Stop(stop_time:time = 5s) {
-    preamble {=
-        #include "platform.h" // Defines PRINTF_TIME
-    =}
-    timer t(stop_time)
-    reaction(t) {=
-        lf_request_stop();
-    =}
-    reaction(shutdown) {=
-        lf_print("Stopped at tag (" PRINTF_TIME ", %d)", lf_time_logical_elapsed(), lf_tag().microstep);
-        if (lf_time_logical_elapsed() != 50000000LL || lf_tag().microstep != 1) {
-            lf_print_error_and_exit("Expected stop tag to be (50ms, 1).");
-        }
-    =}
+
+reactor Stop(stop_time: time = 5 s) {
+  preamble {=
+    #include "platform.h" // Defines PRINTF_TIME
+  =}
+  timer t(stop_time)
+
+  reaction(t) {= lf_request_stop(); =}
+
+  reaction(shutdown) {=
+    lf_print("Stopped at tag (" PRINTF_TIME ", %d)", lf_time_logical_elapsed(), lf_tag().microstep);
+    if (lf_time_logical_elapsed() != 50000000LL || lf_tag().microstep != 1) {
+        lf_print_error_and_exit("Expected stop tag to be (50ms, 1).");
+    }
+  =}
 }
+
 main reactor {
-    @enclave
-    s1 = new Stop()
-    @enclave
-    s2 = new Stop(stop_time = 50 ms)
-}
\ No newline at end of file
+  @enclave
+  s1 = new Stop()
+  @enclave
+  s2 = new Stop(stop_time = 50 ms)
+}

From 245d964d5c7566b089371c352e072195527af41e Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Wed, 28 Jun 2023 11:20:56 -0400
Subject: [PATCH 0508/1114] Align to updated reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 328f7b104d..8fdf5d5876 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 328f7b104dfbf5423b7535fb33e07bc4eada0367
+Subproject commit 8fdf5d5876cefcb791fc1077751a0360b0919193

From 28354817aa63abeb115f9e9b89e9c3339dea5891 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Wed, 28 Jun 2023 14:53:31 -0400
Subject: [PATCH 0509/1114] Moved into federated so test doesn't run under
 Windows

---
 test/C/src/{enclave => federated}/EnclaveFederatedRequestStop.lf | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/C/src/{enclave => federated}/EnclaveFederatedRequestStop.lf (100%)

diff --git a/test/C/src/enclave/EnclaveFederatedRequestStop.lf b/test/C/src/federated/EnclaveFederatedRequestStop.lf
similarity index 100%
rename from test/C/src/enclave/EnclaveFederatedRequestStop.lf
rename to test/C/src/federated/EnclaveFederatedRequestStop.lf

From cd93364b525fa333f7e7dee8c36a5d3593235962 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Wed, 28 Jun 2023 12:07:41 -0700
Subject: [PATCH 0510/1114] Revert "Another quick temporary hack."

This reverts commit ff001ddca6ee8ebc61b53639176891f825b7d0e8.
---
 .../org/lflang/federated/generator/FedASTUtils.java   | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index a3532e5cd1..77cfe77f7c 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -243,7 +243,7 @@ private static void addNetworkReceiverReactor(
     receiver.getOutputs().add(out);
 
     addLevelAttribute(
-        networkInstance, connection.getDestinationPortInstance(), 0 /*connection.getSrcChannel()*/);
+        networkInstance, connection.getDestinationPortInstance(), connection.getSrcChannel());
     networkInstance.setReactorClass(receiver);
     networkInstance.setName(
         ASTUtils.getUniqueIdentifier(top, "nr_" + connection.getDstFederate().name));
@@ -317,9 +317,6 @@ private static void addNetworkReceiverReactor(
     out.setType(type);
     outRef.setVariable(out);
 
-    // Add the output port at the receiver reactor as an effect
-    // networkReceiverReaction.getEffects().add(outRef);
-
     VarRef triggerRef = factory.createVarRef();
     // Establish references to the action.
     triggerRef.setVariable(networkAction);
@@ -342,9 +339,6 @@ private static void addNetworkReceiverReactor(
                     coordination,
                     errorReporter));
 
-    // Add the receiver reaction to the parent
-    // parent.getReactions().add(networkReceiverReaction);
-
     // Add the network receiver reaction to the federate instance's list
     // of network reactions
     connection.dstFederate.networkReceiverReactions.add(networkReceiverReaction);
@@ -738,8 +732,7 @@ private static void addNetworkSenderReactor(
     networkInstance
         .getParameters()
         .add(getSenderIndex(connection.getSrcFederate().networkIdSender++));
-    addLevelAttribute(
-        networkInstance, connection.getSourcePortInstance(), 0 /*connection.srcChannel*/);
+    addLevelAttribute(networkInstance, connection.getSourcePortInstance(), connection.srcChannel);
 
     Connection senderToReaction = factory.createConnection();
 

From 185b761b79d4a710d62a0af0d31d9f09ff161cc1 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Wed, 28 Jun 2023 15:08:11 -0400
Subject: [PATCH 0511/1114] Align to reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 8fdf5d5876..64fdaebd48 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 8fdf5d5876cefcb791fc1077751a0360b0919193
+Subproject commit 64fdaebd484d8cf62e22d54591b1b52550c4f494

From a3b40ff9f617b4394f9f67164271bc5d10722364 Mon Sep 17 00:00:00 2001
From: ChadliaJerad <chadlia.jerad@gmail.com>
Date: Wed, 28 Jun 2023 12:26:55 -0700
Subject: [PATCH 0512/1114] Fix the support of federate to federate
 communication when tracing enclaves

---
 util/tracing/visualization/fedsd.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/tracing/visualization/fedsd.py b/util/tracing/visualization/fedsd.py
index 6658c1ee6b..3480d5afb1 100644
--- a/util/tracing/visualization/fedsd.py
+++ b/util/tracing/visualization/fedsd.py
@@ -139,6 +139,7 @@ def load_and_process_csv_file(csv_file) :
     ############################################################################
     if (exists(args.rti)):
         rti_df = load_and_process_csv_file(args.rti)
+        rti_df['x1'] = x_coor[-1]
     else:
         # If there is no RTI, derive one.
         # This is particularly useful for tracing enclaves
@@ -149,8 +150,7 @@ def load_and_process_csv_file(csv_file) :
         rti_df = rti_df[rti_df['event'].str.contains('AdvLT') == False]
         rti_df.columns = ['event', 'partner_id', 'self_id', 'logical_time', 'microstep', 'physical_time', 'inout']
         rti_df['inout'] = rti_df['inout'].apply(lambda e: 'in' if 'out' in e else 'out')
-        print(rti_df)
-    rti_df['x1'] = x_coor[-1]
+        rti_df['x1'] = rti_df['self_id'].apply(lambda e: x_coor[int(e)])
 
     trace_df = pd.concat([trace_df, rti_df])
 

From 73837b86b89f179909f396a9a1f48a62b4835bd9 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Wed, 28 Jun 2023 13:42:36 -0700
Subject: [PATCH 0513/1114] First attempt to handle banks/multiports correctly

---
 .../federated/generator/FedASTUtils.java      | 26 ++++++++++++++++---
 .../org/lflang/generator/MixedRadixInt.java   | 26 ++++++++++++++++---
 .../org/lflang/generator/PortInstance.java    | 14 +++++-----
 .../lflang/generator/ReactionInstance.java    |  2 +-
 .../generator/ReactionInstanceGraph.java      |  5 ++--
 .../org/lflang/generator/ReactorInstance.java |  1 -
 .../org/lflang/generator/c/CGenerator.java    |  3 ++-
 7 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 77cfe77f7c..302d1bb298 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -50,8 +50,10 @@
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.extensions.FedTargetExtensionFactory;
 import org.lflang.federated.serialization.SupportedSerializers;
+import org.lflang.generator.MixedRadixInt;
 import org.lflang.generator.PortInstance;
 import org.lflang.generator.ReactionInstance;
+import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Action;
 import org.lflang.lf.ActionOrigin;
 import org.lflang.lf.Assignment;
@@ -243,7 +245,7 @@ private static void addNetworkReceiverReactor(
     receiver.getOutputs().add(out);
 
     addLevelAttribute(
-        networkInstance, connection.getDestinationPortInstance(), connection.getSrcChannel());
+        networkInstance, connection.getDestinationPortInstance(), getSrcIndex(connection, resource, errorReporter));
     networkInstance.setReactorClass(receiver);
     networkInstance.setName(
         ASTUtils.getUniqueIdentifier(top, "nr_" + connection.getDstFederate().name));
@@ -350,8 +352,26 @@ private static void addNetworkReceiverReactor(
     connection.dstFederate.networkActionToInstantiation.put(networkAction, networkInstance);
   }
 
+  private static MixedRadixInt getSrcIndex(FedConnectionInstance connection, Resource resource, ErrorReporter errorReporter) {
+    var main = new ReactorInstance(
+            findFederatedReactor(resource),
+            errorReporter, List.of());
+    var federateReactorInstance = new ReactorInstance(connection.srcFederate.instantiation, main, errorReporter, 1, List.of());
+    var widths = List.of(connection.srcRange.instance.getWidth(), federateReactorInstance.getWidth());
+    var digits = List.of(connection.getSrcChannel(), connection.getSrcBank());
+    return new MixedRadixInt(digits, widths, List.of(0, 1));
+  }
+
+  private static MixedRadixInt getDstIndex(FedConnectionInstance connection, Resource resource, ErrorReporter errorReporter) {
+    var main = new ReactorInstance(findFederatedReactor(resource), errorReporter, List.of());
+    var federateReactorInstance = new ReactorInstance(connection.dstFederate.instantiation, main, errorReporter, 1, List.of());
+    var widths = List.of(connection.dstRange.instance.getWidth(), federateReactorInstance.getWidth());
+    var digits = List.of(connection.getDstChannel(), connection.getDstBank());
+    return new MixedRadixInt(digits, widths, List.of(0, 1));
+  }
+
   /** Add a level annotation to the instantiation of a network reactor. */
-  private static void addLevelAttribute(Instantiation instantiation, PortInstance p, int index) {
+  private static void addLevelAttribute(Instantiation instantiation, PortInstance p, MixedRadixInt index) {
     var a = LfFactory.eINSTANCE.createAttribute();
     a.setAttrName("_tpoLevel");
     var e = LfFactory.eINSTANCE.createAttrParm();
@@ -732,7 +752,7 @@ private static void addNetworkSenderReactor(
     networkInstance
         .getParameters()
         .add(getSenderIndex(connection.getSrcFederate().networkIdSender++));
-    addLevelAttribute(networkInstance, connection.getSourcePortInstance(), connection.srcChannel);
+    addLevelAttribute(networkInstance, connection.getSourcePortInstance(), getDstIndex(connection, resource, errorReporter));
 
     Connection senderToReaction = factory.createConnection();
 
diff --git a/core/src/main/java/org/lflang/generator/MixedRadixInt.java b/core/src/main/java/org/lflang/generator/MixedRadixInt.java
index c75ebd5864..ab15082287 100644
--- a/core/src/main/java/org/lflang/generator/MixedRadixInt.java
+++ b/core/src/main/java/org/lflang/generator/MixedRadixInt.java
@@ -26,6 +26,8 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 
 package org.lflang.generator;
 
+import com.google.common.collect.ImmutableList;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -73,7 +75,7 @@ public MixedRadixInt(List<Integer> digits, List<Integer> radixes, List<Integer>
         || radixes.contains(0)) {
       throw new IllegalArgumentException("Invalid constructor arguments.");
     }
-    this.radixes = radixes;
+    this.radixes = ImmutableList.copyOf(radixes);
     if (digits != null) {
       this.digits = digits;
     } else {
@@ -247,10 +249,28 @@ public String toString() {
     return String.join(", ", pieces);
   }
 
+  @Override
+  public int hashCode() {
+    int sum = 0;
+    for (var radix : radixes) sum = sum * 31 + radix;
+    for (var digit : digits) sum = sum * 31 + digit;
+    for (var p : permutation) sum = sum * 31 + p;
+    return sum;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof MixedRadixInt mri && radixes.equals(mri.radixes) && digits.equals(mri.digits) && permutation.equals(mri.permutation);
+  }
+
+  public MixedRadixInt copy() {
+    return new MixedRadixInt(List.copyOf(digits), List.copyOf(radixes), List.copyOf(permutation));
+  }
+
   //////////////////////////////////////////////////////////
   //// Private variables
 
-  private List<Integer> radixes;
-  private List<Integer> digits;
+  private final ImmutableList<Integer> radixes;
+  private final List<Integer> digits;
   private List<Integer> permutation;
 }
diff --git a/core/src/main/java/org/lflang/generator/PortInstance.java b/core/src/main/java/org/lflang/generator/PortInstance.java
index 06a408f540..01f6e45bfb 100644
--- a/core/src/main/java/org/lflang/generator/PortInstance.java
+++ b/core/src/main/java/org/lflang/generator/PortInstance.java
@@ -27,7 +27,9 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.PriorityQueue;
 import org.lflang.ErrorReporter;
 import org.lflang.lf.Input;
@@ -208,11 +210,12 @@ public String toString() {
    * Record that the {@code index}th sub-port of this has a dependent reaction of level {@code
    * level}.
    */
-  public void hasDependentReactionWithLevel(int index, int level) {
-    levelUpperBounds.set(index, Math.min(levelUpperBounds.get(index), level));
+  public void hasDependentReactionWithLevel(MixedRadixInt index, int level) {
+    levelUpperBounds.put(
+        index, Math.min(levelUpperBounds.getOrDefault(index, Integer.MAX_VALUE), level));
   }
 
-  public int getLevelUpperBound(int index) {
+  public int getLevelUpperBound(MixedRadixInt index) {
     return levelUpperBounds.get(index);
   }
 
@@ -448,8 +451,5 @@ private void setInitialWidth(ErrorReporter errorReporter) {
   private boolean clearingCaches = false;
 
   /** The levels of the sub-ports of this. */
-  private final List<Integer> levelUpperBounds =
-      new ArrayList<>(
-          Collections.nCopies(
-              (width < 0 ? 1 : width) * (parent.width < 0 ? 1 : parent.width), Integer.MAX_VALUE));
+  private final Map<MixedRadixInt, Integer> levelUpperBounds = new HashMap<>();
 }
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstance.java b/core/src/main/java/org/lflang/generator/ReactionInstance.java
index 67d5351d3f..edaab12e80 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstance.java
@@ -497,7 +497,7 @@ public class Runtime {
 
     public int level;
 
-    public List<SourcePort> sourcePorts = new ArrayList<>();
+    public List<ReactionInstanceGraph.MriPortPair> sourcePorts = new ArrayList<>();
 
     public ReactionInstance getReaction() {
       return ReactionInstance.this;
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
index f81e7d776e..95a249bd33 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
@@ -338,6 +338,8 @@ private void getAllContainedReactions(List<Runtime> runtimeReactions, ReactorIns
   ///////////////////////////////////////////////////////////
   //// Private methods
 
+   public record MriPortPair(MixedRadixInt index, PortInstance port) {}
+
   private void registerPortInstances(ReactorInstance reactor) {
     var allPorts = new ArrayList<PortInstance>();
     allPorts.addAll(reactor.inputs);
@@ -357,12 +359,11 @@ private void registerPortInstances(ReactorInstance reactor) {
           int sendRangeCount = 0;
 
           while (dstRangeCount++ < dstRange.width) {
-            int srcIndex = sendRangePosition.get(srcDepth);
             int dstIndex = dstRangePosition.get(dstDepth);
             for (ReactionInstance dstReaction : dstRange.instance.dependentReactions) {
               List<Runtime> dstRuntimes = dstReaction.getRuntimeInstances();
               Runtime dstRuntime = dstRuntimes.get(dstIndex);
-              dstRuntime.sourcePorts.add(new ReactionInstance.SourcePort(port, srcIndex));
+              dstRuntime.sourcePorts.add(new MriPortPair(sendRangePosition.copy(), port));
             }
             dstRangePosition.increment();
             sendRangePosition.increment();
diff --git a/core/src/main/java/org/lflang/generator/ReactorInstance.java b/core/src/main/java/org/lflang/generator/ReactorInstance.java
index 10b082bc01..0b0a746ddb 100644
--- a/core/src/main/java/org/lflang/generator/ReactorInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactorInstance.java
@@ -90,7 +90,6 @@ public class ReactorInstance extends NamedInstance<Instantiation> {
    */
   public ReactorInstance(Reactor reactor, ErrorReporter reporter, List<Reactor> reactors) {
     this(ASTUtils.createInstantiation(reactor), null, reporter, -1, reactors);
-    assert !reactors.isEmpty();
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 7bed894341..a9eae3ec9f 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -601,7 +601,8 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     GeneratorUtils.refreshProject(resource, context.getMode());
   }
 
-  private void generateCodeFor(String lfModuleName) throws IOException {
+  private void
+  generateCodeFor(String lfModuleName) throws IOException {
     startTimeStepIsPresentCount = 0;
     code.pr(generateDirectives());
     code.pr(new CMainFunctionGenerator(targetConfig).generateCode());

From 68837875e83504393ee2e8b85ec328496baaac42 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Wed, 28 Jun 2023 14:40:09 -0700
Subject: [PATCH 0514/1114] Try again to get correct bank width.

---
 .../federated/generator/FedASTUtils.java       | 18 ++++++------------
 .../federated/generator/FedGenerator.java      |  3 ++-
 .../federated/generator/FederateInstance.java  |  8 ++++++++
 .../org/lflang/generator/ReactorInstance.java  |  1 +
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 302d1bb298..eb68cdf726 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -245,7 +245,7 @@ private static void addNetworkReceiverReactor(
     receiver.getOutputs().add(out);
 
     addLevelAttribute(
-        networkInstance, connection.getDestinationPortInstance(), getSrcIndex(connection, resource, errorReporter));
+        networkInstance, connection.getDestinationPortInstance(), getDstIndex(connection));
     networkInstance.setReactorClass(receiver);
     networkInstance.setName(
         ASTUtils.getUniqueIdentifier(top, "nr_" + connection.getDstFederate().name));
@@ -352,20 +352,14 @@ private static void addNetworkReceiverReactor(
     connection.dstFederate.networkActionToInstantiation.put(networkAction, networkInstance);
   }
 
-  private static MixedRadixInt getSrcIndex(FedConnectionInstance connection, Resource resource, ErrorReporter errorReporter) {
-    var main = new ReactorInstance(
-            findFederatedReactor(resource),
-            errorReporter, List.of());
-    var federateReactorInstance = new ReactorInstance(connection.srcFederate.instantiation, main, errorReporter, 1, List.of());
-    var widths = List.of(connection.srcRange.instance.getWidth(), federateReactorInstance.getWidth());
+  private static MixedRadixInt getSrcIndex(FedConnectionInstance connection) {
+    var widths = List.of(connection.srcRange.instance.getWidth(), connection.srcFederate.bankWidth);
     var digits = List.of(connection.getSrcChannel(), connection.getSrcBank());
     return new MixedRadixInt(digits, widths, List.of(0, 1));
   }
 
-  private static MixedRadixInt getDstIndex(FedConnectionInstance connection, Resource resource, ErrorReporter errorReporter) {
-    var main = new ReactorInstance(findFederatedReactor(resource), errorReporter, List.of());
-    var federateReactorInstance = new ReactorInstance(connection.dstFederate.instantiation, main, errorReporter, 1, List.of());
-    var widths = List.of(connection.dstRange.instance.getWidth(), federateReactorInstance.getWidth());
+  private static MixedRadixInt getDstIndex(FedConnectionInstance connection) {
+    var widths = List.of(connection.dstRange.instance.getWidth(), connection.dstFederate.bankWidth);
     var digits = List.of(connection.getDstChannel(), connection.getDstBank());
     return new MixedRadixInt(digits, widths, List.of(0, 1));
   }
@@ -752,7 +746,7 @@ private static void addNetworkSenderReactor(
     networkInstance
         .getParameters()
         .add(getSenderIndex(connection.getSrcFederate().networkIdSender++));
-    addLevelAttribute(networkInstance, connection.getSourcePortInstance(), getDstIndex(connection, resource, errorReporter));
+    addLevelAttribute(networkInstance, connection.getSourcePortInstance(), getSrcIndex(connection));
 
     Connection senderToReaction = factory.createConnection();
 
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 410fd67a24..75bb9f13e3 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -449,7 +449,8 @@ private List<FederateInstance> getFederateInstances(
       var resource = instantiation.getReactorClass().eResource();
       var federateTargetConfig = new FedTargetConfig(context, resource);
       FederateInstance federateInstance =
-          new FederateInstance(instantiation, federateID, i, federateTargetConfig, errorReporter);
+          new FederateInstance(
+              instantiation, federateID, i, bankWidth, federateTargetConfig, errorReporter);
       federates.add(federateInstance);
       federateInstances.add(federateInstance);
 
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index 520c73b1fa..0e0239283b 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -91,11 +91,13 @@ public FederateInstance(
       Instantiation instantiation,
       int id,
       int bankIndex,
+      int bankWidth,
       TargetConfig targetConfig,
       ErrorReporter errorReporter) {
     this.instantiation = instantiation;
     this.id = id;
     this.bankIndex = bankIndex;
+    this.bankWidth = bankWidth;
     this.errorReporter = errorReporter;
     this.targetConfig = targetConfig;
 
@@ -119,6 +121,12 @@ public FederateInstance(
    */
   public int bankIndex;
 
+  /**
+   * The width of the bank in which this federate was instantiated. This is 1 if the instantiation
+   * is not a bank of reactors.
+   */
+  public int bankWidth;
+
   /** A list of outputs that can be triggered directly or indirectly by physical actions. */
   public Set<Expression> outputsConnectedToPhysicalActions = new LinkedHashSet<>();
 
diff --git a/core/src/main/java/org/lflang/generator/ReactorInstance.java b/core/src/main/java/org/lflang/generator/ReactorInstance.java
index 0b0a746ddb..10b082bc01 100644
--- a/core/src/main/java/org/lflang/generator/ReactorInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactorInstance.java
@@ -90,6 +90,7 @@ public class ReactorInstance extends NamedInstance<Instantiation> {
    */
   public ReactorInstance(Reactor reactor, ErrorReporter reporter, List<Reactor> reactors) {
     this(ASTUtils.createInstantiation(reactor), null, reporter, -1, reactors);
+    assert !reactors.isEmpty();
   }
 
   /**

From cae1820decaed1f18c59098cc7b16593a431c159 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Wed, 28 Jun 2023 15:36:13 -0700
Subject: [PATCH 0515/1114] Fix NPE resulting from nonzero-delay connections.

---
 .../main/java/org/lflang/generator/PortInstance.java | 12 ++++++++----
 .../org/lflang/generator/ReactionInstanceGraph.java  |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/PortInstance.java b/core/src/main/java/org/lflang/generator/PortInstance.java
index 01f6e45bfb..f995342a7b 100644
--- a/core/src/main/java/org/lflang/generator/PortInstance.java
+++ b/core/src/main/java/org/lflang/generator/PortInstance.java
@@ -147,10 +147,14 @@ public List<SendRange> eventualDestinations() {
 
     // Construct the full range for this port.
     RuntimeRange<PortInstance> range = new RuntimeRange.Port(this);
-    eventualDestinationRanges = eventualDestinations(range);
+    eventualDestinationRanges = eventualDestinations(range, true);
     return eventualDestinationRanges;
   }
 
+  public List<SendRange> eventualDestinationsNonzeroDelayOk() {
+    return eventualDestinations(new RuntimeRange.Port(this), false);
+  }
+
   /**
    * Return a list of ranges of ports that send data to this port. If this port is directly written
    * to by one more more reactions, then it is its own eventual source and only this port will be
@@ -255,7 +259,7 @@ public int getLevelUpperBound(MixedRadixInt index) {
    *
    * @param srcRange The source range.
    */
-  private static List<SendRange> eventualDestinations(RuntimeRange<PortInstance> srcRange) {
+  private static List<SendRange> eventualDestinations(RuntimeRange<PortInstance> srcRange, boolean zeroDelayRequired) {
 
     // Getting the destinations is more complex than getting the sources
     // because of multicast, where there is more than one connection statement
@@ -289,7 +293,7 @@ private static List<SendRange> eventualDestinations(RuntimeRange<PortInstance> s
     // Need to find send ranges that overlap with this srcRange.
     for (SendRange wSendRange : srcPort.dependentPorts) {
 
-      if (wSendRange.connection != null && wSendRange.connection.getDelay() != null) {
+      if (zeroDelayRequired && wSendRange.connection != null && wSendRange.connection.getDelay() != null) {
         continue;
       }
 
@@ -300,7 +304,7 @@ private static List<SendRange> eventualDestinations(RuntimeRange<PortInstance> s
       }
       for (RuntimeRange<PortInstance> dstRange : wSendRange.destinations) {
         // Recursively get the send ranges of that destination port.
-        List<SendRange> dstSendRanges = eventualDestinations(dstRange);
+        List<SendRange> dstSendRanges = eventualDestinations(dstRange, zeroDelayRequired);
         int sendRangeStart = 0;
         for (SendRange dstSend : dstSendRanges) {
           queue.add(dstSend.newSendRange(wSendRange, sendRangeStart));
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
index 95a249bd33..8060d4d9ed 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
@@ -345,7 +345,7 @@ private void registerPortInstances(ReactorInstance reactor) {
     allPorts.addAll(reactor.inputs);
     allPorts.addAll(reactor.outputs);
     for (var port : allPorts) {
-      List<SendRange> eventualDestinations = port.eventualDestinations();
+      List<SendRange> eventualDestinations = port.eventualDestinationsNonzeroDelayOk();
       int srcDepth = (port.isInput()) ? 2 : 1;
 
       for (SendRange sendRange : eventualDestinations) {

From 262e6221a3b504d98dd51e8ccd54f0da3f631fca Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Wed, 28 Jun 2023 15:51:57 -0700
Subject: [PATCH 0516/1114] Revert "Fix NPE resulting from nonzero-delay
 connections."

This reverts commit cae1820decaed1f18c59098cc7b16593a431c159.
---
 .../main/java/org/lflang/generator/PortInstance.java | 12 ++++--------
 .../org/lflang/generator/ReactionInstanceGraph.java  |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/PortInstance.java b/core/src/main/java/org/lflang/generator/PortInstance.java
index f995342a7b..01f6e45bfb 100644
--- a/core/src/main/java/org/lflang/generator/PortInstance.java
+++ b/core/src/main/java/org/lflang/generator/PortInstance.java
@@ -147,14 +147,10 @@ public List<SendRange> eventualDestinations() {
 
     // Construct the full range for this port.
     RuntimeRange<PortInstance> range = new RuntimeRange.Port(this);
-    eventualDestinationRanges = eventualDestinations(range, true);
+    eventualDestinationRanges = eventualDestinations(range);
     return eventualDestinationRanges;
   }
 
-  public List<SendRange> eventualDestinationsNonzeroDelayOk() {
-    return eventualDestinations(new RuntimeRange.Port(this), false);
-  }
-
   /**
    * Return a list of ranges of ports that send data to this port. If this port is directly written
    * to by one more more reactions, then it is its own eventual source and only this port will be
@@ -259,7 +255,7 @@ public int getLevelUpperBound(MixedRadixInt index) {
    *
    * @param srcRange The source range.
    */
-  private static List<SendRange> eventualDestinations(RuntimeRange<PortInstance> srcRange, boolean zeroDelayRequired) {
+  private static List<SendRange> eventualDestinations(RuntimeRange<PortInstance> srcRange) {
 
     // Getting the destinations is more complex than getting the sources
     // because of multicast, where there is more than one connection statement
@@ -293,7 +289,7 @@ private static List<SendRange> eventualDestinations(RuntimeRange<PortInstance> s
     // Need to find send ranges that overlap with this srcRange.
     for (SendRange wSendRange : srcPort.dependentPorts) {
 
-      if (zeroDelayRequired && wSendRange.connection != null && wSendRange.connection.getDelay() != null) {
+      if (wSendRange.connection != null && wSendRange.connection.getDelay() != null) {
         continue;
       }
 
@@ -304,7 +300,7 @@ private static List<SendRange> eventualDestinations(RuntimeRange<PortInstance> s
       }
       for (RuntimeRange<PortInstance> dstRange : wSendRange.destinations) {
         // Recursively get the send ranges of that destination port.
-        List<SendRange> dstSendRanges = eventualDestinations(dstRange, zeroDelayRequired);
+        List<SendRange> dstSendRanges = eventualDestinations(dstRange);
         int sendRangeStart = 0;
         for (SendRange dstSend : dstSendRanges) {
           queue.add(dstSend.newSendRange(wSendRange, sendRangeStart));
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
index 8060d4d9ed..95a249bd33 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
@@ -345,7 +345,7 @@ private void registerPortInstances(ReactorInstance reactor) {
     allPorts.addAll(reactor.inputs);
     allPorts.addAll(reactor.outputs);
     for (var port : allPorts) {
-      List<SendRange> eventualDestinations = port.eventualDestinationsNonzeroDelayOk();
+      List<SendRange> eventualDestinations = port.eventualDestinations();
       int srcDepth = (port.isInput()) ? 2 : 1;
 
       for (SendRange sendRange : eventualDestinations) {

From 94680c2f8b2d5ca0c9f772c249eb033faa12bcb9 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Wed, 28 Jun 2023 16:03:51 -0700
Subject: [PATCH 0517/1114] Pass FeedbackDelaySimple.

---
 .../java/org/lflang/federated/generator/FedASTUtils.java  | 8 ++++----
 .../main/java/org/lflang/generator/ReactionInstance.java  | 2 --
 .../java/org/lflang/generator/ReactionInstanceGraph.java  | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index eb68cdf726..dcee6069f8 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -53,7 +53,6 @@
 import org.lflang.generator.MixedRadixInt;
 import org.lflang.generator.PortInstance;
 import org.lflang.generator.ReactionInstance;
-import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Action;
 import org.lflang.lf.ActionOrigin;
 import org.lflang.lf.Assignment;
@@ -245,7 +244,7 @@ private static void addNetworkReceiverReactor(
     receiver.getOutputs().add(out);
 
     addLevelAttribute(
-        networkInstance, connection.getDestinationPortInstance(), getDstIndex(connection));
+        networkInstance, connection.getDestinationPortInstance(), getDstIndex(connection), connection);
     networkInstance.setReactorClass(receiver);
     networkInstance.setName(
         ASTUtils.getUniqueIdentifier(top, "nr_" + connection.getDstFederate().name));
@@ -365,7 +364,8 @@ private static MixedRadixInt getDstIndex(FedConnectionInstance connection) {
   }
 
   /** Add a level annotation to the instantiation of a network reactor. */
-  private static void addLevelAttribute(Instantiation instantiation, PortInstance p, MixedRadixInt index) {
+  private static void addLevelAttribute(Instantiation instantiation, PortInstance p, MixedRadixInt index, FedConnectionInstance connection) {
+    if (connection.getDefinition().getDelay() != null) return;
     var a = LfFactory.eINSTANCE.createAttribute();
     a.setAttrName("_tpoLevel");
     var e = LfFactory.eINSTANCE.createAttrParm();
@@ -746,7 +746,7 @@ private static void addNetworkSenderReactor(
     networkInstance
         .getParameters()
         .add(getSenderIndex(connection.getSrcFederate().networkIdSender++));
-    addLevelAttribute(networkInstance, connection.getSourcePortInstance(), getSrcIndex(connection));
+    addLevelAttribute(networkInstance, connection.getSourcePortInstance(), getSrcIndex(connection), connection);
 
     Connection senderToReaction = factory.createConnection();
 
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstance.java b/core/src/main/java/org/lflang/generator/ReactionInstance.java
index edaab12e80..2ed89c8b75 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstance.java
@@ -1,5 +1,3 @@
-/** Representation of a runtime instance of a reaction. */
-
 /*************
  * Copyright (c) 2019-2022, The University of California at Berkeley.
  *
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
index 95a249bd33..bfeb70c914 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
@@ -346,7 +346,6 @@ private void registerPortInstances(ReactorInstance reactor) {
     allPorts.addAll(reactor.outputs);
     for (var port : allPorts) {
       List<SendRange> eventualDestinations = port.eventualDestinations();
-      int srcDepth = (port.isInput()) ? 2 : 1;
 
       for (SendRange sendRange : eventualDestinations) {
         for (RuntimeRange<PortInstance> dstRange : sendRange.destinations) {

From 8f339df391bf61d347fca58f188c922767d3eec9 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Wed, 28 Jun 2023 16:09:13 -0700
Subject: [PATCH 0518/1114] Pass SimpleFederated.

---
 core/src/main/java/org/lflang/generator/PortInstance.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/PortInstance.java b/core/src/main/java/org/lflang/generator/PortInstance.java
index 01f6e45bfb..8e8afc3a99 100644
--- a/core/src/main/java/org/lflang/generator/PortInstance.java
+++ b/core/src/main/java/org/lflang/generator/PortInstance.java
@@ -216,7 +216,9 @@ public void hasDependentReactionWithLevel(MixedRadixInt index, int level) {
   }
 
   public int getLevelUpperBound(MixedRadixInt index) {
-    return levelUpperBounds.get(index);
+    // It should be uncommon for Integer.MAX_VALUE to be used and using it can mask bugs.
+    // It makes sense when there is no downstream reaction.
+    return levelUpperBounds.getOrDefault(index, Integer.MAX_VALUE);
   }
 
   //////////////////////////////////////////////////////

From 04ede283d85c238b0ced156b986e490c6f25a025 Mon Sep 17 00:00:00 2001
From: revol-xut <revol-xut@protonmail.com>
Date: Wed, 28 Jun 2023 11:47:36 +0200
Subject: [PATCH 0519/1114] integrated with tests

---
 .../cpp/CppAssembleMethodGenerator.kt         |   6 +-
 core/src/main/resources/lib/cpp/lfutil.hh     |  82 +++++++------
 .../src/main/resources/lib/cpp/time_parser.hh | 112 +++++++++---------
 3 files changed, 104 insertions(+), 96 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
index e28aa5206a..c8ffec605b 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
@@ -160,7 +160,7 @@ class CppAssembleMethodGenerator(private val reactor: Reactor) {
             val rightPort = c.rightPorts[0]
 
             """
-                this->environment()->draw_connection(${leftPort.name}, ${rightPort.name}, ${c.properties});
+                this->environment()->draw_connection(&${leftPort.name}, &${rightPort.name}, ${c.properties});
             """.trimIndent()
         }
 
@@ -198,8 +198,8 @@ class CppAssembleMethodGenerator(private val reactor: Reactor) {
 
     private fun Connection.getConnectionLambda(portType: String): String {
         return """
-            [this](const BasePort& left, const BasePort& right, std::size_t idx) {
-                left.environment()->draw_connection(left, right, $properties);
+            [this]($portType left, $portType right) {
+                left->environment()->draw_connection(left, right, $properties);
             }
         """.trimIndent()
     }
diff --git a/core/src/main/resources/lib/cpp/lfutil.hh b/core/src/main/resources/lib/cpp/lfutil.hh
index 77116dcbe1..967f42b730 100644
--- a/core/src/main/resources/lib/cpp/lfutil.hh
+++ b/core/src/main/resources/lib/cpp/lfutil.hh
@@ -1,7 +1,8 @@
 /*
  * Copyright (c) 2020, TU Dresden.
 
- * Redistribution and use in source and binary forms, with or without modification,
+ * Redistribution and use in source and binary forms, with or without
+ modification,
  * are permitted provided that the following conditions are met:
 
  * 1. Redistributions of source code must retain the above copyright notice,
@@ -11,36 +12,43 @@
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ WAY OUT OF
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #pragma once
 
-#include <reactor-cpp/reactor-cpp.hh>
 #include <reactor-cpp/logging.hh>
+#include <reactor-cpp/reactor-cpp.hh>
 
 namespace lfutil {
 
-template<class T>
-void after_delay(reactor::Action<T>* action, const reactor::Port<T>* port) {
-  if constexpr(std::is_void<T>::value) {
+template <class T>
+void after_delay(reactor::Action<T> *action, const reactor::Port<T> *port) {
+  if constexpr (std::is_void<T>::value) {
     action->schedule();
   } else {
     action->schedule(std::move(port->get()));
   }
 }
 
-template<class T>
-void after_forward(const reactor::Action<T>* action, reactor::Port<T>* port) {
-  if constexpr(std::is_void<T>::value) {
+template <class T>
+void after_forward(const reactor::Action<T> *action, reactor::Port<T> *port) {
+  if constexpr (std::is_void<T>::value) {
     port->set();
   } else {
     port->set(std::move(action->get()));
@@ -48,28 +56,34 @@ void after_forward(const reactor::Action<T>* action, reactor::Port<T>* port) {
 }
 
 class LFScope {
- private:
-  reactor::Reactor* reactor;
- public:
-  LFScope(reactor::Reactor* reactor) : reactor(reactor) {}
+private:
+  reactor::Reactor *reactor;
 
-  reactor::TimePoint get_physical_time() const { return reactor->get_physical_time(); }
+public:
+  LFScope(reactor::Reactor *reactor) : reactor(reactor) {}
+
+  reactor::TimePoint get_physical_time() const {
+    return reactor->get_physical_time();
+  }
   reactor::Tag get_tag() const { return reactor->get_tag(); }
-  reactor::TimePoint get_logical_time() const { return reactor->get_logical_time(); }
+  reactor::TimePoint get_logical_time() const {
+    return reactor->get_logical_time();
+  }
   reactor::mstep_t get_microstep() const { return reactor->get_microstep(); }
-  reactor::Duration get_elapsed_logical_time() const { return reactor->get_elapsed_logical_time(); }
-  reactor::Duration get_elapsed_physical_time() const { return reactor->get_elapsed_physical_time(); }
-  reactor::Environment* environment() const { return reactor->environment(); }
+  reactor::Duration get_elapsed_logical_time() const {
+    return reactor->get_elapsed_logical_time();
+  }
+  reactor::Duration get_elapsed_physical_time() const {
+    return reactor->get_elapsed_physical_time();
+  }
+  reactor::Environment *environment() const { return reactor->environment(); }
   void request_stop() const { return environment()->sync_shutdown(); }
 };
 
-template<class PortPtr>
-void bind_multiple_ports(
-    std::vector<PortPtr>& left_ports,
-    std::vector<PortPtr>& right_ports,
-    bool repeat_left,
-    std::function<void(PortPtr, PortPtr, std::size_t)> connect)
-{
+template <class PortPtr>
+void bind_multiple_ports(std::vector<PortPtr> &left_ports,
+                         std::vector<PortPtr> &right_ports, bool repeat_left,
+                         std::function<void(PortPtr, PortPtr)> connect) {
   if (repeat_left) {
     auto l_size = left_ports.size();
     auto r_size = right_ports.size();
@@ -93,15 +107,13 @@ void bind_multiple_ports(
                          << "Not all ports will be connected!";
   }
 
-  std::size_t idx{0};
   while (left_it != left_ports.end() && right_it != right_ports.end()) {
     auto left = *left_it;
     auto right = *right_it;
-    connect(left, right, idx);
+    connect(left, right);
     left_it++;
     right_it++;
-    idx++;
   }
 }
 
-}
+} // namespace lfutil
diff --git a/core/src/main/resources/lib/cpp/time_parser.hh b/core/src/main/resources/lib/cpp/time_parser.hh
index b34b8029fd..58c067b796 100644
--- a/core/src/main/resources/lib/cpp/time_parser.hh
+++ b/core/src/main/resources/lib/cpp/time_parser.hh
@@ -1,7 +1,8 @@
 /*
  * Copyright (c) 2020, TU Dresden.
 
- * Redistribution and use in source and binary forms, with or without modification,
+ * Redistribution and use in source and binary forms, with or without
+ modification,
  * are permitted provided that the following conditions are met:
 
  * 1. Redistributions of source code must retain the above copyright notice,
@@ -11,14 +12,21 @@
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ WAY OUT OF
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
@@ -27,43 +35,36 @@
 #include "reactor-cpp/reactor-cpp.hh"
 #include <sstream>
 
-std::stringstream &operator>>(std::stringstream& in, reactor::Duration& dur);
+std::stringstream &operator>>(std::stringstream &in, reactor::Duration &dur);
 #include "CLI/cxxopts.hpp"
 
+#include <algorithm>
 #include <fstream>
 #include <iostream>
-#include <string>
 #include <regex>
-#include <algorithm>
+#include <string>
 
-bool iequals(const std::string& a, const std::string& b)
-{
-    return std::equal(a.begin(), a.end(),
-                      b.begin(), b.end(),
-                      [](char a, char b) {
-                          return tolower(a) == tolower(b);
-                      });
+bool iequals(const std::string &a, const std::string &b) {
+  return std::equal(a.begin(), a.end(), b.begin(), b.end(),
+                    [](char a, char b) { return tolower(a) == tolower(b); });
 }
 
-class argument_incorrect_type_with_reason : public cxxopts::OptionParseException
-{
- public:
-  explicit argument_incorrect_type_with_reason(
-    const std::string& arg,
-    const std::string& reason)
-  : cxxopts::OptionParseException(
-      "Argument " + cxxopts::LQUOTE + arg + cxxopts::RQUOTE + " failed to parse (" + reason + ")"
-    )
-  {}
+class argument_incorrect_type_with_reason
+    : public cxxopts::OptionParseException {
+public:
+  explicit argument_incorrect_type_with_reason(const std::string &arg,
+                                               const std::string &reason)
+      : cxxopts::OptionParseException("Argument " + cxxopts::LQUOTE + arg +
+                                      cxxopts::RQUOTE + " failed to parse (" +
+                                      reason + ")") {}
 };
 
-
-std::string validate_time_string(const std::string& time);
+std::string validate_time_string(const std::string &time);
 
 /**
  * converts a reactor::Duration to a string with ns as unit
  */
-std::string time_to_string(const reactor::Duration& dur) {
+std::string time_to_string(const reactor::Duration &dur) {
   if (dur == reactor::Duration::max()) {
     return "forever";
   }
@@ -73,14 +74,13 @@ std::string time_to_string(const reactor::Duration& dur) {
   return ss.str();
 }
 
-template<typename T>
-std::string any_to_string(const T val){
-    std::stringstream ss;
-    ss << val;
-    return ss.str();
+template <typename T> std::string any_to_string(const T val) {
+  std::stringstream ss;
+  ss << val;
+  return ss.str();
 }
 
-std::stringstream &operator>>(std::stringstream& in, reactor::Duration& dur) {
+std::stringstream &operator>>(std::stringstream &in, reactor::Duration &dur) {
   double value;
   std::string unit;
 
@@ -107,7 +107,7 @@ std::stringstream &operator>>(std::stringstream& in, reactor::Duration& dur) {
     }
   } else {
     in >> unit;
-    if (unit == "nsec" || unit == "nsecs" || unit == "ns" ) {
+    if (unit == "nsec" || unit == "nsecs" || unit == "ns") {
       std::chrono::duration<double, std::nano> tmp{value};
       dur = std::chrono::duration_cast<reactor::Duration>(tmp);
     } else if (unit == "usec" || unit == "usecs" || unit == "us") {
@@ -116,22 +116,22 @@ std::stringstream &operator>>(std::stringstream& in, reactor::Duration& dur) {
     } else if (unit == "msec" || unit == "msecs" || unit == "ms") {
       std::chrono::duration<double, std::milli> tmp{value};
       dur = std::chrono::duration_cast<reactor::Duration>(tmp);
-    } else if (unit == "sec" || unit == "secs" ||
-               unit == "second" || unit == "seconds" || unit == "s") {
+    } else if (unit == "sec" || unit == "secs" || unit == "second" ||
+               unit == "seconds" || unit == "s") {
       std::chrono::duration<double, std::ratio<1, 1>> tmp{value};
       dur = std::chrono::duration_cast<reactor::Duration>(tmp);
-    } else if (unit == "min" || unit == "mins" ||
-               unit == "minute" || unit == "minutes" || unit == "m") {
+    } else if (unit == "min" || unit == "mins" || unit == "minute" ||
+               unit == "minutes" || unit == "m") {
       std::chrono::duration<double, std::ratio<60, 1>> tmp{value};
       dur = std::chrono::duration_cast<reactor::Duration>(tmp);
     } else if (unit == "hour" || unit == "hours" || unit == "h") {
       std::chrono::duration<double, std::ratio<3600, 1>> tmp{value};
       dur = std::chrono::duration_cast<reactor::Duration>(tmp);
     } else if (unit == "day" || unit == "days" || unit == "d") {
-      std::chrono::duration<double, std::ratio<24*3600, 1>> tmp{value};
+      std::chrono::duration<double, std::ratio<24 * 3600, 1>> tmp{value};
       dur = std::chrono::duration_cast<reactor::Duration>(tmp);
     } else if (unit == "week" || unit == "weeks" || unit == "w") {
-      std::chrono::duration<double, std::ratio<7*24*3600, 1>> tmp{value};
+      std::chrono::duration<double, std::ratio<7 * 24 * 3600, 1>> tmp{value};
       dur = std::chrono::duration_cast<reactor::Duration>(tmp);
     } else {
       // mark as error
@@ -143,9 +143,9 @@ std::stringstream &operator>>(std::stringstream& in, reactor::Duration& dur) {
 }
 
 /**
-*   Tests for correct syntax in unit usage for time strings
-**/
-std::string validate_time_string(const std::string& time) {
+ *   Tests for correct syntax in unit usage for time strings
+ **/
+std::string validate_time_string(const std::string &time) {
   auto trimmed = std::regex_replace(time, std::regex("^ +| +$|( ) +"), "$1");
   if (trimmed.size() == 0) {
     return "The empty string is not a valid time!";
@@ -161,16 +161,14 @@ std::string validate_time_string(const std::string& time) {
       return "No unit given!";
     } else {
       auto unit = trimmed.substr(pos);
-      if (unit == "nsec" || unit == "nsecs" || unit == "ns" ||
-          unit == "usec" || unit == "usecs" || unit == "us" ||
-          unit == "msec" || unit == "msecs" || unit == "ms" ||
-          unit == "sec" || unit == "secs" ||
+      if (unit == "nsec" || unit == "nsecs" || unit == "ns" || unit == "usec" ||
+          unit == "usecs" || unit == "us" || unit == "msec" ||
+          unit == "msecs" || unit == "ms" || unit == "sec" || unit == "secs" ||
           unit == "second" || unit == "seconds" || unit == "s" ||
-          unit == "min" || unit == "mins" ||
-          unit == "minute" || unit == "minutes" || unit == "m" ||
-          unit == "hour" || unit == "hours" || unit == "h" ||
-          unit == "day" || unit == "days" || unit == "d" ||
-          unit == "week" || unit == "weeks" || unit == "w") {
+          unit == "min" || unit == "mins" || unit == "minute" ||
+          unit == "minutes" || unit == "m" || unit == "hour" ||
+          unit == "hours" || unit == "h" || unit == "day" || unit == "days" ||
+          unit == "d" || unit == "week" || unit == "weeks" || unit == "w") {
         return "";
       } else {
         std::stringstream ss;
@@ -181,5 +179,3 @@ std::string validate_time_string(const std::string& time) {
   }
   return "Unexpected error!";
 }
-
-

From 380577132f18c4371561f16d40d49afb0606176d Mon Sep 17 00:00:00 2001
From: revol-xut <revol-xut@protonmail.com>
Date: Thu, 29 Jun 2023 16:05:44 +0200
Subject: [PATCH 0520/1114] upgrading reactor-cpp

---
 core/src/main/resources/lib/cpp/reactor-cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/cpp/reactor-cpp b/core/src/main/resources/lib/cpp/reactor-cpp
index e3564782f0..909a32205f 160000
--- a/core/src/main/resources/lib/cpp/reactor-cpp
+++ b/core/src/main/resources/lib/cpp/reactor-cpp
@@ -1 +1 @@
-Subproject commit e3564782f0e1a2bc427e5932a88ff8f87dacd50c
+Subproject commit 909a32205f7048d77a0cd6894f78f6595d92be70

From 6ba3041b6de4b96e2adf48649d02881ceda0ddb6 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Thu, 29 Jun 2023 10:05:55 -0400
Subject: [PATCH 0521/1114] Align reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 64fdaebd48..eaf5d31dee 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 64fdaebd484d8cf62e22d54591b1b52550c4f494
+Subproject commit eaf5d31dee3a499c1b0fbec8846d2ea2c3e190ac

From 8e0d8fe9c95b3de8b3320e0bc111622a8285b715 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Thu, 29 Jun 2023 10:51:22 -0400
Subject: [PATCH 0522/1114] Align reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index eaf5d31dee..423623c8da 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit eaf5d31dee3a499c1b0fbec8846d2ea2c3e190ac
+Subproject commit 423623c8da934c5b21b2efc9b9caef12dd28d944

From ade0f724047f04d8e0f93e1c7f514950583f8392 Mon Sep 17 00:00:00 2001
From: revol-xut <revol-xut@protonmail.com>
Date: Thu, 29 Jun 2023 16:59:57 +0200
Subject: [PATCH 0523/1114] upgrading reactor-cpp

---
 core/src/main/resources/lib/cpp/reactor-cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/cpp/reactor-cpp b/core/src/main/resources/lib/cpp/reactor-cpp
index 909a32205f..4d1d18fca6 160000
--- a/core/src/main/resources/lib/cpp/reactor-cpp
+++ b/core/src/main/resources/lib/cpp/reactor-cpp
@@ -1 +1 @@
-Subproject commit 909a32205f7048d77a0cd6894f78f6595d92be70
+Subproject commit 4d1d18fca678fa89242944c560fb42bff6eb8652

From e3100227462372d8c1300bffc45820df37bc7906 Mon Sep 17 00:00:00 2001
From: Jacky Kwok <77720778+jackykwok2024@users.noreply.github.com>
Date: Wed, 28 Jun 2023 12:58:37 -0700
Subject: [PATCH 0524/1114] memory leak fix for federated execution

---
 .../federated/extensions/PythonExtension.java     | 15 ++++++++++++++-
 .../FedNativePythonSerialization.java             |  4 ++--
 .../lflang/generator/python/PythonGenerator.java  |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
index d467e981e0..8b7e806ae2 100644
--- a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
@@ -144,7 +144,18 @@ protected void deserialize(
           value = action.getName();
           FedNativePythonSerialization pickler = new FedNativePythonSerialization();
           result.pr(pickler.generateNetworkDeserializerCode(value, null));
-          result.pr("lf_set(" + receiveRef + ", " + FedSerialization.deserializedVarName + ");\n");
+          // changed
+          // result.pr("lf_set(" + receiveRef + ", "
+          //              + FedSerialization.deserializedVarName + ");\n");
+          // Use token to set ports
+          result.pr(
+              "lf_token_t* token = lf_new_token((void*)"
+                  + receiveRef
+                  + ", "
+                  + FedSerialization.deserializedVarName
+                  + ", 1);\n");
+          result.pr("lf_set_destructor(" + receiveRef + ", python_count_decrement);\n");
+          result.pr("lf_set_token(" + receiveRef + ", token);\n");
           break;
         }
       case PROTO:
@@ -179,6 +190,8 @@ protected void serializeAndSend(
           result.pr(pickler.generateNetworkSerializerCode(variableToSerialize, null));
           result.pr("size_t message_length = " + lengthExpression + ";");
           result.pr(sendingFunction + "(" + commonArgs + ", " + pointerExpression + ");\n");
+          // FIXED: Decrease the reference count of serialized_pyobject
+          result.pr("Py_XDECREF(serialized_pyobject);\n");
           break;
         }
       case PROTO:
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java
index 3947b1bd92..8ece7a6b83 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java
@@ -89,7 +89,6 @@ public StringBuilder generateNetworkSerializerCode(String varName, String origin
     serializerCode.append(
         "    lf_print_error_and_exit(\"Could not serialize " + serializedVarName + ".\");\n");
     serializerCode.append("}\n");
-
     return serializerCode;
   }
 
@@ -106,7 +105,8 @@ public StringBuilder generateNetworkDeserializerCode(String varName, String targ
             + varName
             + "->token->length);\n");
     // Deserialize using Pickle
-    deserializerCode.append("Py_XINCREF(message_byte_array);\n");
+    // FIXED: We should not manually increase the reference count for message_byte_array
+    // deserializerCode.append("Py_XINCREF(message_byte_array);\n");
     deserializerCode.append(
         "PyObject* "
             + deserializedVarName
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index f925acd9c5..b8b3a74282 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -574,7 +574,7 @@ private static String setUpMainTarget(
       boolean hasMain, String executableName, Stream<String> cSources) {
     return ("""
             set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-            add_compile_definitions(_LF_GARBAGE_COLLECTED)
+            add_compile_definitions(_PYTHON_TARGET_ENABLED)
             add_subdirectory(core)
             set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR})
             set(LF_MAIN_TARGET <pyModuleName>)

From d46d50727b9c3dcb03fdb91b9230a62274ce326e Mon Sep 17 00:00:00 2001
From: Jacky Kwok <77720778+jackykwok2024@users.noreply.github.com>
Date: Wed, 28 Jun 2023 13:06:35 -0700
Subject: [PATCH 0525/1114] added comments

---
 .../org/lflang/federated/extensions/PythonExtension.java   | 7 ++-----
 .../serialization/FedNativePythonSerialization.java        | 2 --
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
index 8b7e806ae2..ab01611bd9 100644
--- a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
@@ -144,10 +144,7 @@ protected void deserialize(
           value = action.getName();
           FedNativePythonSerialization pickler = new FedNativePythonSerialization();
           result.pr(pickler.generateNetworkDeserializerCode(value, null));
-          // changed
-          // result.pr("lf_set(" + receiveRef + ", "
-          //              + FedSerialization.deserializedVarName + ");\n");
-          // Use token to set ports
+          // Use token to set ports and destructor
           result.pr(
               "lf_token_t* token = lf_new_token((void*)"
                   + receiveRef
@@ -190,7 +187,7 @@ protected void serializeAndSend(
           result.pr(pickler.generateNetworkSerializerCode(variableToSerialize, null));
           result.pr("size_t message_length = " + lengthExpression + ";");
           result.pr(sendingFunction + "(" + commonArgs + ", " + pointerExpression + ");\n");
-          // FIXED: Decrease the reference count of serialized_pyobject
+          // Decrease the reference count for serialized_pyobject
           result.pr("Py_XDECREF(serialized_pyobject);\n");
           break;
         }
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java
index 8ece7a6b83..2680060ff3 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java
@@ -105,8 +105,6 @@ public StringBuilder generateNetworkDeserializerCode(String varName, String targ
             + varName
             + "->token->length);\n");
     // Deserialize using Pickle
-    // FIXED: We should not manually increase the reference count for message_byte_array
-    // deserializerCode.append("Py_XINCREF(message_byte_array);\n");
     deserializerCode.append(
         "PyObject* "
             + deserializedVarName

From bf357d42444041e424f0e629f835e111b9acea25 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 29 Jun 2023 12:02:25 -0700
Subject: [PATCH 0526/1114] Update submodule.

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 628e235172..28c6380981 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 628e2351723b01dcef7977d1999426e4935d0272
+Subproject commit 28c63809819747595f47801e30facdff624a4a77

From 56e762bce373d794e080a5cbbc452c255e9e23b9 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 29 Jun 2023 13:09:25 -0700
Subject: [PATCH 0527/1114] Pass DecentralizedP2PComm.

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index bef58d3a2b..9e68085774 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit bef58d3a2b9c05dfb733bc057480f66a033936e4
+Subproject commit 9e680857747bb9640692140e0d595e22a752f64f

From 589c61ccdbcedcbc5a92d7c3850508746f48ba66 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 29 Jun 2023 15:29:39 -0700
Subject: [PATCH 0528/1114] Update submodule.

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 9e68085774..779b97f0bb 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 9e680857747bb9640692140e0d595e22a752f64f
+Subproject commit 779b97f0bb032bdf1e21d9b39ba9654c3b537e35

From 587233dd81b9391bda8b2024a3d4b30122ed1366 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 29 Jun 2023 16:15:54 -0700
Subject: [PATCH 0529/1114] Format.

---
 .../lflang/federated/generator/FedASTUtils.java    | 14 +++++++++++---
 .../java/org/lflang/generator/PortInstance.java    |  1 -
 .../lflang/generator/ReactionInstanceGraph.java    |  2 +-
 .../java/org/lflang/generator/c/CGenerator.java    |  3 +--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index dcee6069f8..8f0579cb77 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -244,7 +244,10 @@ private static void addNetworkReceiverReactor(
     receiver.getOutputs().add(out);
 
     addLevelAttribute(
-        networkInstance, connection.getDestinationPortInstance(), getDstIndex(connection), connection);
+        networkInstance,
+        connection.getDestinationPortInstance(),
+        getDstIndex(connection),
+        connection);
     networkInstance.setReactorClass(receiver);
     networkInstance.setName(
         ASTUtils.getUniqueIdentifier(top, "nr_" + connection.getDstFederate().name));
@@ -364,7 +367,11 @@ private static MixedRadixInt getDstIndex(FedConnectionInstance connection) {
   }
 
   /** Add a level annotation to the instantiation of a network reactor. */
-  private static void addLevelAttribute(Instantiation instantiation, PortInstance p, MixedRadixInt index, FedConnectionInstance connection) {
+  private static void addLevelAttribute(
+      Instantiation instantiation,
+      PortInstance p,
+      MixedRadixInt index,
+      FedConnectionInstance connection) {
     if (connection.getDefinition().getDelay() != null) return;
     var a = LfFactory.eINSTANCE.createAttribute();
     a.setAttrName("_tpoLevel");
@@ -746,7 +753,8 @@ private static void addNetworkSenderReactor(
     networkInstance
         .getParameters()
         .add(getSenderIndex(connection.getSrcFederate().networkIdSender++));
-    addLevelAttribute(networkInstance, connection.getSourcePortInstance(), getSrcIndex(connection), connection);
+    addLevelAttribute(
+        networkInstance, connection.getSourcePortInstance(), getSrcIndex(connection), connection);
 
     Connection senderToReaction = factory.createConnection();
 
diff --git a/core/src/main/java/org/lflang/generator/PortInstance.java b/core/src/main/java/org/lflang/generator/PortInstance.java
index 8e8afc3a99..fffcd70d0f 100644
--- a/core/src/main/java/org/lflang/generator/PortInstance.java
+++ b/core/src/main/java/org/lflang/generator/PortInstance.java
@@ -26,7 +26,6 @@
 package org.lflang.generator;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
index bfeb70c914..de7c3b6567 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
@@ -338,7 +338,7 @@ private void getAllContainedReactions(List<Runtime> runtimeReactions, ReactorIns
   ///////////////////////////////////////////////////////////
   //// Private methods
 
-   public record MriPortPair(MixedRadixInt index, PortInstance port) {}
+  public record MriPortPair(MixedRadixInt index, PortInstance port) {}
 
   private void registerPortInstances(ReactorInstance reactor) {
     var allPorts = new ArrayList<PortInstance>();
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index a9eae3ec9f..7bed894341 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -601,8 +601,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     GeneratorUtils.refreshProject(resource, context.getMode());
   }
 
-  private void
-  generateCodeFor(String lfModuleName) throws IOException {
+  private void generateCodeFor(String lfModuleName) throws IOException {
     startTimeStepIsPresentCount = 0;
     code.pr(generateDirectives());
     code.pr(new CMainFunctionGenerator(targetConfig).generateCode());

From eba231f2ebdf64b1405dd0014d3518ae1b0d8a0d Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 29 Jun 2023 16:16:06 -0700
Subject: [PATCH 0530/1114] Make questionable change to MixedRadixInt.

This might not make sense. It should be revisited.
---
 .../org/lflang/generator/MixedRadixInt.java   | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/MixedRadixInt.java b/core/src/main/java/org/lflang/generator/MixedRadixInt.java
index ab15082287..aee756ec66 100644
--- a/core/src/main/java/org/lflang/generator/MixedRadixInt.java
+++ b/core/src/main/java/org/lflang/generator/MixedRadixInt.java
@@ -27,7 +27,6 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 package org.lflang.generator;
 
 import com.google.common.collect.ImmutableList;
-
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -71,20 +70,19 @@ public class MixedRadixInt {
   public MixedRadixInt(List<Integer> digits, List<Integer> radixes, List<Integer> permutation) {
     if (radixes == null
         || (digits != null && digits.size() > radixes.size())
-        || (permutation != null && permutation.size() != radixes.size())
-        || radixes.contains(0)) {
+        || (permutation != null && permutation.size() != radixes.size())) {
       throw new IllegalArgumentException("Invalid constructor arguments.");
     }
     this.radixes = ImmutableList.copyOf(radixes);
     if (digits != null) {
       this.digits = digits;
     } else {
-      this.digits = new ArrayList<Integer>(1);
+      this.digits = new ArrayList<>(1);
       this.digits.add(0);
     }
     if (permutation != null) {
       // Check the permutation matrix.
-      Set<Integer> indices = new HashSet<Integer>();
+      Set<Integer> indices = new HashSet<>();
       for (int p : permutation) {
         if (p < 0 || p >= radixes.size() || indices.contains(p)) {
           throw new IllegalArgumentException(
@@ -136,7 +134,7 @@ public List<Integer> getDigits() {
   public List<Integer> getPermutation() {
     if (permutation == null) {
       // Construct a default permutation.
-      permutation = new ArrayList<Integer>(radixes.size());
+      permutation = new ArrayList<>(radixes.size());
       for (int i = 0; i < radixes.size(); i++) {
         permutation.add(i);
       }
@@ -201,16 +199,18 @@ public int numDigits() {
    * @param v The ordinary integer value of this number.
    */
   public void set(int v) {
+    // it does not make sense to call set
     int temp = v;
     int count = 0;
     for (int radix : radixes) {
+      var digit = radix == 0 ? 0 : temp % radix;
       if (count >= digits.size()) {
-        digits.add(temp % radix);
+        digits.add(digit);
       } else {
-        digits.set(count, temp % radix);
+        digits.set(count, digit);
       }
       count++;
-      temp = temp / radix;
+      temp = temp == 0 ? temp : temp / radix;
     }
   }
 
@@ -226,8 +226,13 @@ public void setMagnitude(int v) {
     for (int i = 0; i < radixes.size(); i++) {
       int p = getPermutation().get(i);
       while (digits.size() < p + 1) digits.add(0);
-      digits.set(p, temp % radixes.get(p));
-      temp = temp / radixes.get(p);
+      var r = radixes.get(p);
+      if (r == 0 && v == 0) {
+        digits.set(p, 0); // zero does not make sense here, but we have to put something.
+      } else {
+        digits.set(p, temp % r);
+        temp = temp / r;
+      }
     }
   }
 
@@ -237,7 +242,7 @@ public void setMagnitude(int v) {
    */
   @Override
   public String toString() {
-    List<String> pieces = new LinkedList<String>();
+    List<String> pieces = new LinkedList<>();
     Iterator<Integer> radixIterator = radixes.iterator();
     for (int digit : digits) {
       if (!radixIterator.hasNext()) {
@@ -260,7 +265,10 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof MixedRadixInt mri && radixes.equals(mri.radixes) && digits.equals(mri.digits) && permutation.equals(mri.permutation);
+    return obj instanceof MixedRadixInt mri
+        && radixes.equals(mri.radixes)
+        && digits.equals(mri.digits)
+        && permutation.equals(mri.permutation);
   }
 
   public MixedRadixInt copy() {

From bb77945ab8033286dcd9bfed2bb800574c8456f8 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 29 Jun 2023 16:40:41 -0700
Subject: [PATCH 0531/1114] Pass DistributedCountDecentralized.

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 779b97f0bb..40d24c320e 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 779b97f0bb032bdf1e21d9b39ba9654c3b537e35
+Subproject commit 40d24c320eb53520372653a1cd7fa338fc7237e7

From ceb444f141ae7088da31a9c1582343611055e8d4 Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Fri, 30 Jun 2023 13:59:07 +0900
Subject: [PATCH 0532/1114] Make TS federated codes can be compiled

---
 .../java/org/lflang/federated/extensions/TSExtension.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 14df96afb5..68f91853cc 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -48,12 +48,11 @@ public String generateNetworkReceiverBody(
     return """
         // generateNetworkReceiverBody
         if (%1$s !== undefined) {
-            %2$s.%3$s = %1$s;
+            %2$s = %1$s;
         }
         """
         .formatted(
             action.getName(),
-            receivingPort.getContainer().getName(),
             receivingPort.getVariable().getName());
   }
 
@@ -66,12 +65,11 @@ public String generateNetworkSenderBody(
       CoordinationType coordinationType,
       ErrorReporter errorReporter) {
     return """
-        if (%1$s.%2$s !== undefined) {
-            this.util.sendRTITimedMessage(%1$s.%2$s, %3$s, %4$s, %5$s);
+        if (%1$s !== undefined) {
+            this.util.sendRTITimedMessage(%1$s, %2$s, %3$s, %4$s);
         }
         """
         .formatted(
-            sendingPort.getContainer().getName(),
             sendingPort.getVariable().getName(),
             connection.getDstFederate().id,
             connection.getDstFederate().networkMessageActions.size(),

From ec0198cf94e6346a6bbd02355dabc46164a25bff Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 30 Jun 2023 15:13:17 +0800
Subject: [PATCH 0533/1114] Factor out createMainInstantiation()

---
 .../lflang/analyses/uclid/UclidGenerator.java | 31 ++------------
 .../main/java/org/lflang/ast/ASTUtils.java    | 41 +++++++++++++++++++
 .../org/lflang/generator/c/CGenerator.java    | 37 ++---------------
 3 files changed, 47 insertions(+), 62 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
index 42285ac028..573ba7a3ea 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -156,16 +156,14 @@ public UclidGenerator(LFGeneratorContext context, List<Attribute> properties) {
   //// Public methods
   public void doGenerate(Resource resource, LFGeneratorContext context) {
 
-    // FIXME: How much of doGenerate() from GeneratorBase is needed?
+    // Reuse parts of doGenerate() from GeneratorBase.
     super.printInfo(context.getMode());
     ASTUtils.setMainName(context.getFileConfig().resource, context.getFileConfig().name);
-    // FIXME: Perform an analysis on the property and remove unrelevant components.
     super.createMainInstantiation();
 
-    ////////////////////////////////////////
-
     // Create the main reactor instance if there is a main reactor.
-    createMainReactorInstance();
+    this.main = ASTUtils.createMainReactorInstance(
+      mainDef, reactors, hasDeadlines, messageReporter, targetConfig);
 
     // Extract information from the named instances.
     populateDataStructures();
@@ -1492,29 +1490,6 @@ protected void generateControlBlock() {
   ////////////////////////////////////////////////////////////
   //// Private methods
 
-  /**
-   * If a main or federated reactor has been declared, create a ReactorInstance for this top level.
-   * This will also assign levels to reactions, then, if the program is federated, perform an AST
-   * transformation to disconnect connections between federates.
-   */
-  private void createMainReactorInstance() {
-    if (this.mainDef != null) {
-      if (this.main == null) {
-        // Recursively build instances. This is done once because
-        // it is the same for all federates.
-        this.main =
-            new ReactorInstance(ASTUtils.toDefinition(mainDef.getReactorClass()), messageReporter);
-        var reactionInstanceGraph = this.main.assignLevels();
-        if (reactionInstanceGraph.nodeCount() > 0) {
-          messageReporter
-              .nowhere()
-              .error("Main reactor has causality cycles. Skipping code generation.");
-          return;
-        }
-      }
-    }
-  }
-
   private void setupDirectories() {
     // Make sure the target directory exists.
     Path modelGenDir = context.getFileConfig().getModelGenPath();
diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 1ecf7606de..402b7ddf6b 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -58,7 +58,9 @@
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
 import org.lflang.InferredType;
+import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetConfig;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.generator.CodeMap;
@@ -585,6 +587,45 @@ public static <T extends EObject> List<T> collectElements(
     return result;
   }
 
+  /**
+   * If a main or federated reactor has been declared, create a ReactorInstance for this top level.
+   * This will also assign levels to reactions, then, if the program is federated, perform an AST
+   * transformation to disconnect connections between federates.
+   */
+  public static ReactorInstance createMainReactorInstance(
+    Instantiation mainDef,
+    List<Reactor> reactors,
+    boolean hasDeadlines,
+    MessageReporter messageReporter,
+    TargetConfig targetConfig
+  ) {
+    if (mainDef != null) {
+      // Recursively build instances.
+      ReactorInstance main =
+          new ReactorInstance(toDefinition(mainDef.getReactorClass()), messageReporter, reactors);
+      var reactionInstanceGraph = main.assignLevels();
+      if (reactionInstanceGraph.nodeCount() > 0) {
+        messageReporter
+            .nowhere()
+            .error("Main reactor has causality cycles. Skipping code generation.");
+        return null;
+      }
+      if (hasDeadlines) {
+        main.assignDeadlines();
+      }
+      // Inform the run-time of the breadth/parallelism of the reaction graph
+      var breadth = reactionInstanceGraph.getBreadth();
+      if (breadth == 0) {
+        messageReporter.nowhere().warning("The program has no reactions");
+      } else {
+        targetConfig.compileDefinitions.put(
+            "LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth()));
+      }
+      return main;
+    }
+    return null;
+  }
+
   /**
    * Adds the elements into the given list at a location matching to their textual position.
    *
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 1099b4e7ca..0929295f54 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -1957,7 +1957,9 @@ protected void setUpGeneralParameters() {
         "LOG_LEVEL", String.valueOf(targetConfig.logLevel.ordinal()));
     targetConfig.compileAdditionalSources.addAll(CCoreFilesUtils.getCTargetSrc());
     // Create the main reactor instance if there is a main reactor.
-    createMainReactorInstance();
+    // FIXME: is `hasDeadlines` here always false? That does not look right.
+    this.main = ASTUtils.createMainReactorInstance(
+      mainDef, reactors, hasDeadlines, messageReporter, targetConfig);
     if (hasModalReactors) {
       // So that each separate compile knows about modal reactors, do this:
       targetConfig.compileDefinitions.put("MODAL_REACTORS", "TRUE");
@@ -2104,39 +2106,6 @@ public Target getTarget() {
   ////////////////////////////////////////////////////////////
   //// Private methods
 
-  /**
-   * If a main or federated reactor has been declared, create a ReactorInstance for this top level.
-   * This will also assign levels to reactions, then, if the program is federated, perform an AST
-   * transformation to disconnect connections between federates.
-   */
-  private void createMainReactorInstance() {
-    if (this.mainDef != null) {
-      if (this.main == null) {
-        // Recursively build instances.
-        this.main =
-            new ReactorInstance(toDefinition(mainDef.getReactorClass()), messageReporter, reactors);
-        var reactionInstanceGraph = this.main.assignLevels();
-        if (reactionInstanceGraph.nodeCount() > 0) {
-          messageReporter
-              .nowhere()
-              .error("Main reactor has causality cycles. Skipping code generation.");
-          return;
-        }
-        if (hasDeadlines) {
-          this.main.assignDeadlines();
-        }
-        // Inform the run-time of the breadth/parallelism of the reaction graph
-        var breadth = reactionInstanceGraph.getBreadth();
-        if (breadth == 0) {
-          messageReporter.nowhere().warning("The program has no reactions");
-        } else {
-          targetConfig.compileDefinitions.put(
-              "LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth()));
-        }
-      }
-    }
-  }
-
   /**
    * Generate an array of self structs for the reactor and one for each of its children.
    *

From f7d94f59dafa9a9307aba279b024f4132e93e3df Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 30 Jun 2023 15:57:14 +0800
Subject: [PATCH 0534/1114] Factor generateTriggersAndReactions() into multiple
 smaller functions. Change tactic to an enum.

---
 .../org/lflang/analyses/uclid/MTLVisitor.java | 11 ++--
 .../lflang/analyses/uclid/UclidGenerator.java | 66 ++++++++++++++-----
 2 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/uclid/MTLVisitor.java b/core/src/main/java/org/lflang/analyses/uclid/MTLVisitor.java
index b8f4981eea..0a60b08d5c 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/MTLVisitor.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/MTLVisitor.java
@@ -26,6 +26,7 @@
 
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
+import org.lflang.analyses.uclid.UclidGenerator.Tactic;
 import org.lflang.dsl.MTLParser;
 import org.lflang.dsl.MTLParserBaseVisitor;
 import org.lflang.generator.CodeBuilder;
@@ -40,13 +41,13 @@ public class MTLVisitor extends MTLParserBaseVisitor<String> {
   protected CodeBuilder code = new CodeBuilder();
 
   /** Tactic to be used to prove the property. */
-  protected String tactic;
+  protected Tactic tactic;
 
   /** Time horizon (in nanoseconds) of the property */
   protected long horizon = 0;
 
   // Constructor
-  public MTLVisitor(String tactic) {
+  public MTLVisitor(Tactic tactic) {
     this.tactic = tactic;
   }
 
@@ -178,7 +179,7 @@ public String visitUntil(
     }
 
     String end;
-    if (this.tactic.equals("induction")) {
+    if (this.tactic == Tactic.INDUCTION) {
       end = "(" + prefixIdx + " + CT)";
     } else {
       end = "END";
@@ -286,7 +287,7 @@ public String visitGlobally(
       long horizon) {
 
     String end;
-    if (this.tactic.equals("induction")) {
+    if (this.tactic == Tactic.INDUCTION) {
       end = "(" + prefixIdx + " + CT)";
     } else {
       end = "END";
@@ -345,7 +346,7 @@ public String visitFinally(
       long horizon) {
 
     String end;
-    if (this.tactic.equals("induction")) {
+    if (this.tactic == Tactic.INDUCTION) {
       end = "(" + prefixIdx + " + CT)";
     } else {
       end = "END";
diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
index 573ba7a3ea..35e27269b9 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -84,44 +84,49 @@ public class UclidGenerator extends GeneratorBase {
 
   ////////////////////////////////////////////
   //// Public fields
-  // Data structures for storing info about the runtime instances.
+  /** Data structures for storing info about the runtime instances. */
   public List<ReactorInstance> reactorInstances = new ArrayList<ReactorInstance>();
   public List<ReactionInstance.Runtime> reactionInstances =
       new ArrayList<ReactionInstance.Runtime>();
 
-  // State variables in the system
+  /** State variables in the system */
   public List<StateVariableInstance> stateVariables = new ArrayList<StateVariableInstance>();
 
-  // Triggers in the system
+  /** Triggers in the system */
   public List<ActionInstance> actionInstances = new ArrayList<ActionInstance>();
   public List<PortInstance> inputInstances = new ArrayList<PortInstance>();
   public List<PortInstance> outputInstances = new ArrayList<PortInstance>();
   public List<PortInstance> portInstances = new ArrayList<PortInstance>();
   public List<TimerInstance> timerInstances = new ArrayList<TimerInstance>();
 
-  // Joint lists of the lists above.
+  /** Joint lists of the lists above. */
   public List<TriggerInstance> triggerInstances; // Triggers = ports + actions + timers
   public List<NamedInstance> namedInstances; // Named instances = triggers + state variables
 
-  // A list of paths to the uclid files generated
+  /** A list of paths to the uclid files generated */
   public List<Path> generatedFiles = new ArrayList<>();
   public Map<Path, String> expectations = new HashMap<>();
 
-  // The directory where the generated files are placed
+  /** The directory where the generated files are placed */
   public Path outputDir;
 
-  // A runner for the generated Uclid files
+  /** A runner for the generated Uclid files */
   public UclidRunner runner;
 
-  // If true, use logical time-based semantics;
-  // otherwise, use event-based semantics,
-  // as described in Sirjani et. al (2020).
+  /**
+   * If true, use logical time-based semantics;
+   * otherwise, use event-based semantics,
+   * as described in Sirjani et. al (2020).
+   * This is currently always false and serves
+   * as a placeholder for a future version that
+   * supports logical time-based semantics.
+   */
   public boolean logicalTimeBased = false;
 
   ////////////////////////////////////////////
   //// Protected fields
 
-  // A list of MTL properties represented in Attributes.
+  /** A list of MTL properties represented in Attributes. */
   protected List<Attribute> properties;
 
   /** The main place to put generated code. */
@@ -130,8 +135,19 @@ public class UclidGenerator extends GeneratorBase {
   /** Strings from the property attribute */
   protected String name;
 
-  protected String tactic;
-  protected String spec; // SMTL
+  /** 
+   * A tactic used to verify properties.
+   * Currently, only BMC (bounded model checking) is functional.
+   * FIXME: For a future version that supports multiple tactics,
+   * the tactics should be stored in a list.
+   */
+  enum Tactic { BMC, INDUCTION }
+  protected Tactic tactic;
+
+  /** Safety MTL property to be verified */
+  protected String spec;
+
+  /** A property's ground truth value, for debugging the verifier */
   protected String expect;
 
   /**
@@ -180,13 +196,14 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
                   .findFirst()
                   .get()
                   .getValue());
-      this.tactic =
+      String tacticStr =
           StringUtil.removeQuotes(
               prop.getAttrParms().stream()
                   .filter(attr -> attr.getName().equals("tactic"))
                   .findFirst()
                   .get()
                   .getValue());
+      if (tacticStr.equals("bmc")) this.tactic = Tactic.BMC;
       this.spec =
           StringUtil.removeQuotes(
               prop.getAttrParms().stream()
@@ -825,8 +842,16 @@ protected void generateReactorSemantics() {
     }
   }
 
-  /** Axioms for the trigger mechanism */
+  /** Axioms for all triggers */
   protected void generateTriggersAndReactions() {
+    generateConnectionAxioms();
+    generateActionAxioms();
+    generateTimerAxioms();
+    generateReactionTriggerAxioms();
+  }
+
+  /** Generate axiomatic semantics for connections */
+  protected void generateConnectionAxioms() {
     code.pr(String.join("\n", "/***************", " * Connections *", " ***************/"));
     // FIXME: Support banks and multiports. Figure out how to work with ranges.
     // Iterate over all the ports. Generate an axiom for each connection
@@ -923,7 +948,10 @@ protected void generateTriggersAndReactions() {
         }
       }
     }
+  }
 
+  /** Generate axiomatic semantics for actions */
+  protected void generateActionAxioms() {
     if (this.actionInstances.size() > 0) {
       code.pr(String.join("\n", "/***********", " * Actions *", " ***********/"));
       for (var action : this.actionInstances) {
@@ -981,7 +1009,10 @@ protected void generateTriggersAndReactions() {
                 "));"));
       }
     }
+  }
 
+  /** Generate axiomatic semantics for timers */
+  protected void generateTimerAxioms() {
     if (this.timerInstances.size() > 0) {
       code.pr(String.join("\n", "/**********", " * Timers *", " **********/"));
 
@@ -1051,7 +1082,10 @@ protected void generateTriggersAndReactions() {
                 ");"));
       }
     }
+  }
 
+  /** Axioms for encoding how reactions are triggered. */
+  protected void generateReactionTriggerAxioms() {
     code.pr(
         String.join(
             "\n",
@@ -1457,7 +1491,7 @@ protected void generateProperty() {
     code.pr(this.FOLSpec + ";");
     code.unindent();
 
-    if (this.tactic.equals("bmc")) {
+    if (this.tactic == Tactic.BMC) {
       code.pr(
           String.join(
               "\n",

From f422a2adeb04de351661b2917572ae42be00452a Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 30 Jun 2023 16:13:45 +0800
Subject: [PATCH 0535/1114] Separate public from private variables

---
 .../lflang/analyses/uclid/UclidGenerator.java | 79 +++++++++++--------
 1 file changed, 46 insertions(+), 33 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
index 35e27269b9..a9ac774dd9 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -84,20 +84,11 @@ public class UclidGenerator extends GeneratorBase {
 
   ////////////////////////////////////////////
   //// Public fields
-  /** Data structures for storing info about the runtime instances. */
-  public List<ReactorInstance> reactorInstances = new ArrayList<ReactorInstance>();
-  public List<ReactionInstance.Runtime> reactionInstances =
-      new ArrayList<ReactionInstance.Runtime>();
+  /** A list of reaction runtime instances. */
+  public List<ReactionInstance.Runtime> reactionInstances = new ArrayList<ReactionInstance.Runtime>();
 
-  /** State variables in the system */
-  public List<StateVariableInstance> stateVariables = new ArrayList<StateVariableInstance>();
-
-  /** Triggers in the system */
+  /** A list of action instances */
   public List<ActionInstance> actionInstances = new ArrayList<ActionInstance>();
-  public List<PortInstance> inputInstances = new ArrayList<PortInstance>();
-  public List<PortInstance> outputInstances = new ArrayList<PortInstance>();
-  public List<PortInstance> portInstances = new ArrayList<PortInstance>();
-  public List<TimerInstance> timerInstances = new ArrayList<TimerInstance>();
 
   /** Joint lists of the lists above. */
   public List<TriggerInstance> triggerInstances; // Triggers = ports + actions + timers
@@ -113,27 +104,37 @@ public class UclidGenerator extends GeneratorBase {
   /** A runner for the generated Uclid files */
   public UclidRunner runner;
 
-  /**
-   * If true, use logical time-based semantics;
-   * otherwise, use event-based semantics,
-   * as described in Sirjani et. al (2020).
-   * This is currently always false and serves
-   * as a placeholder for a future version that
-   * supports logical time-based semantics.
-   */
-  public boolean logicalTimeBased = false;
+  /** Completeness threshold */
+  public int CT = 0;
 
   ////////////////////////////////////////////
-  //// Protected fields
+  //// Private fields
+  /** A list of reactor runtime instances. */
+  private List<ReactorInstance> reactorInstances = new ArrayList<ReactorInstance>();
+
+  /** State variables in the system */
+  private List<StateVariableInstance> stateVariables = new ArrayList<StateVariableInstance>();
+
+  /** A list of input port instances */
+  private List<PortInstance> inputInstances = new ArrayList<PortInstance>();
+
+  /** A list of output port instances */
+  private List<PortInstance> outputInstances = new ArrayList<PortInstance>();
+
+  /** A list of input AND output port instances */
+  private List<PortInstance> portInstances = new ArrayList<PortInstance>();
+
+  /** A list of timer instances */
+  private List<TimerInstance> timerInstances = new ArrayList<TimerInstance>();
 
   /** A list of MTL properties represented in Attributes. */
-  protected List<Attribute> properties;
+  private List<Attribute> properties;
 
   /** The main place to put generated code. */
-  protected CodeBuilder code = new CodeBuilder();
+  private CodeBuilder code = new CodeBuilder();
 
   /** Strings from the property attribute */
-  protected String name;
+  private String name;
 
   /** 
    * A tactic used to verify properties.
@@ -142,26 +143,38 @@ public class UclidGenerator extends GeneratorBase {
    * the tactics should be stored in a list.
    */
   enum Tactic { BMC, INDUCTION }
-  protected Tactic tactic;
+  private Tactic tactic;
 
   /** Safety MTL property to be verified */
-  protected String spec;
+  private String spec;
 
   /** A property's ground truth value, for debugging the verifier */
-  protected String expect;
+  private String expect;
 
   /**
    * The horizon (the total time interval required for evaluating an MTL property, which is derived
    * from the MTL spec), the completeness threshold (CT) (the number of transitions required for
    * evaluating the FOL spec in the trace), and the transpiled FOL spec.
    */
-  protected long horizon = 0; // in nanoseconds
+  private long horizon = 0; // in nanoseconds
+
+  /** First-Order Logic formula matching the Safety MTL property */
+  private String FOLSpec = "";
 
-  protected String FOLSpec = "";
-  protected int CT = 0;
-  protected static final int CT_MAX_SUPPORTED = 100;
+  /** Maximum CT supported. This is a hardcoded value. */
+  private static final int CT_MAX_SUPPORTED = 100;
+
+  /**
+   * If true, use logical time-based semantics;
+   * otherwise, use event-based semantics,
+   * as described in Sirjani et. al (2020).
+   * This is currently always false and serves
+   * as a placeholder for a future version that
+   * supports logical time-based semantics.
+   */
+  private boolean logicalTimeBased = false;
 
-  // Constructor
+  /** Constructor */
   public UclidGenerator(LFGeneratorContext context, List<Attribute> properties) {
     super(context);
     this.properties = properties;

From 877ce36687f386ac80fb6e386a36e6722438cd3a Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 30 Jun 2023 16:25:58 +0800
Subject: [PATCH 0536/1114] Improve pattern matching and apply spotless

---
 .../org/lflang/analyses/uclid/MTLVisitor.java | 27 +++++++--------
 .../lflang/analyses/uclid/UclidGenerator.java | 34 +++++++++++--------
 .../main/java/org/lflang/ast/ASTUtils.java    | 11 +++---
 .../org/lflang/generator/c/CGenerator.java    |  5 +--
 4 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/uclid/MTLVisitor.java b/core/src/main/java/org/lflang/analyses/uclid/MTLVisitor.java
index 0a60b08d5c..1aef6fe554 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/MTLVisitor.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/MTLVisitor.java
@@ -147,23 +147,20 @@ public String _visitUnaryOp(
       long horizon) {
 
     // FIXME: Is there a more "antlr" way to do dispatch here?
-    if (ctx instanceof MTLParser.NoUnaryOpContext) {
-      return visitNoUnaryOp(
-          (MTLParser.NoUnaryOpContext) ctx, prefixIdx, QFIdx, prevPrefixIdx, horizon);
+    if (ctx instanceof MTLParser.NoUnaryOpContext _ctx) {
+      return visitNoUnaryOp(_ctx, prefixIdx, QFIdx, prevPrefixIdx, horizon);
     }
-    if (ctx instanceof MTLParser.NegationContext) {
-      return visitNegation(
-          (MTLParser.NegationContext) ctx, prefixIdx, QFIdx, prevPrefixIdx, horizon);
+    if (ctx instanceof MTLParser.NegationContext _ctx) {
+      return visitNegation(_ctx, prefixIdx, QFIdx, prevPrefixIdx, horizon);
     }
-    if (ctx instanceof MTLParser.NextContext) {
-      return visitNext((MTLParser.NextContext) ctx, prefixIdx, QFIdx, prevPrefixIdx, horizon);
+    if (ctx instanceof MTLParser.NextContext _ctx) {
+      return visitNext(_ctx, prefixIdx, QFIdx, prevPrefixIdx, horizon);
     }
-    if (ctx instanceof MTLParser.GloballyContext) {
-      return visitGlobally(
-          (MTLParser.GloballyContext) ctx, prefixIdx, QFIdx, prevPrefixIdx, horizon);
+    if (ctx instanceof MTLParser.GloballyContext _ctx) {
+      return visitGlobally(_ctx, prefixIdx, QFIdx, prevPrefixIdx, horizon);
     }
-    if (ctx instanceof MTLParser.FinallyContext) {
-      return visitFinally((MTLParser.FinallyContext) ctx, prefixIdx, QFIdx, prevPrefixIdx, horizon);
+    if (ctx instanceof MTLParser.FinallyContext _ctx) {
+      return visitFinally(_ctx, prefixIdx, QFIdx, prevPrefixIdx, horizon);
     }
 
     // FIXME: Throw an exception.
@@ -565,8 +562,8 @@ private long getNanoSecFromIntervalContext(MTLParser.IntervalContext ctx, boolea
    * Generate a time predicate from a range.
    *
    * @param ctx
-   * @param lowerBoundNanoSec
-   * @param upperBoundNanoSec
+   * @param lowerBoundNanoSec The lowerbound of the time interval (in nanoseconds) in an MTL formula
+   * @param upperBoundNanoSec The upperbound of the time interval (in nanoseconds) in an MTL formula
    * @return
    */
   private String generateTimePredicate(
diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
index a9ac774dd9..ac84b7dcc2 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -85,17 +85,20 @@ public class UclidGenerator extends GeneratorBase {
   ////////////////////////////////////////////
   //// Public fields
   /** A list of reaction runtime instances. */
-  public List<ReactionInstance.Runtime> reactionInstances = new ArrayList<ReactionInstance.Runtime>();
+  public List<ReactionInstance.Runtime> reactionInstances =
+      new ArrayList<ReactionInstance.Runtime>();
 
   /** A list of action instances */
   public List<ActionInstance> actionInstances = new ArrayList<ActionInstance>();
 
   /** Joint lists of the lists above. */
   public List<TriggerInstance> triggerInstances; // Triggers = ports + actions + timers
+
   public List<NamedInstance> namedInstances; // Named instances = triggers + state variables
 
   /** A list of paths to the uclid files generated */
   public List<Path> generatedFiles = new ArrayList<>();
+
   public Map<Path, String> expectations = new HashMap<>();
 
   /** The directory where the generated files are placed */
@@ -136,13 +139,16 @@ public class UclidGenerator extends GeneratorBase {
   /** Strings from the property attribute */
   private String name;
 
-  /** 
-   * A tactic used to verify properties.
-   * Currently, only BMC (bounded model checking) is functional.
-   * FIXME: For a future version that supports multiple tactics,
-   * the tactics should be stored in a list.
+  /**
+   * A tactic used to verify properties. Currently, only BMC (bounded model checking) is functional.
+   * FIXME: For a future version that supports multiple tactics, the tactics should be stored in a
+   * list.
    */
-  enum Tactic { BMC, INDUCTION }
+  enum Tactic {
+    BMC,
+    INDUCTION
+  }
+
   private Tactic tactic;
 
   /** Safety MTL property to be verified */
@@ -165,12 +171,9 @@ enum Tactic { BMC, INDUCTION }
   private static final int CT_MAX_SUPPORTED = 100;
 
   /**
-   * If true, use logical time-based semantics;
-   * otherwise, use event-based semantics,
-   * as described in Sirjani et. al (2020).
-   * This is currently always false and serves
-   * as a placeholder for a future version that
-   * supports logical time-based semantics.
+   * If true, use logical time-based semantics; otherwise, use event-based semantics, as described
+   * in Sirjani et. al (2020). This is currently always false and serves as a placeholder for a
+   * future version that supports logical time-based semantics.
    */
   private boolean logicalTimeBased = false;
 
@@ -191,8 +194,9 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     super.createMainInstantiation();
 
     // Create the main reactor instance if there is a main reactor.
-    this.main = ASTUtils.createMainReactorInstance(
-      mainDef, reactors, hasDeadlines, messageReporter, targetConfig);
+    this.main =
+        ASTUtils.createMainReactorInstance(
+            mainDef, reactors, hasDeadlines, messageReporter, targetConfig);
 
     // Extract information from the named instances.
     populateDataStructures();
diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 402b7ddf6b..7e686dd190 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -593,12 +593,11 @@ public static <T extends EObject> List<T> collectElements(
    * transformation to disconnect connections between federates.
    */
   public static ReactorInstance createMainReactorInstance(
-    Instantiation mainDef,
-    List<Reactor> reactors,
-    boolean hasDeadlines,
-    MessageReporter messageReporter,
-    TargetConfig targetConfig
-  ) {
+      Instantiation mainDef,
+      List<Reactor> reactors,
+      boolean hasDeadlines,
+      MessageReporter messageReporter,
+      TargetConfig targetConfig) {
     if (mainDef != null) {
       // Recursively build instances.
       ReactorInstance main =
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 0929295f54..adf6f341b8 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -1958,8 +1958,9 @@ protected void setUpGeneralParameters() {
     targetConfig.compileAdditionalSources.addAll(CCoreFilesUtils.getCTargetSrc());
     // Create the main reactor instance if there is a main reactor.
     // FIXME: is `hasDeadlines` here always false? That does not look right.
-    this.main = ASTUtils.createMainReactorInstance(
-      mainDef, reactors, hasDeadlines, messageReporter, targetConfig);
+    this.main =
+        ASTUtils.createMainReactorInstance(
+            mainDef, reactors, hasDeadlines, messageReporter, targetConfig);
     if (hasModalReactors) {
       // So that each separate compile knows about modal reactors, do this:
       targetConfig.compileDefinitions.put("MODAL_REACTORS", "TRUE");

From 5a1a24b0785ddd5270b918a3e31e8c6862795353 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Fri, 30 Jun 2023 06:39:34 -0400
Subject: [PATCH 0537/1114] Made test slightly more specific

---
 test/C/src/federated/CycleDetection.lf | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/test/C/src/federated/CycleDetection.lf b/test/C/src/federated/CycleDetection.lf
index 175d03fa02..32a5a8d1cb 100644
--- a/test/C/src/federated/CycleDetection.lf
+++ b/test/C/src/federated/CycleDetection.lf
@@ -37,10 +37,17 @@ reactor UserInput {
       lf_print_error_and_exit("Did not receive the expected balance. Expected: 200. Got: %d.", balance->value);
     }
     lf_print("Balance: %d", balance->value);
+    if (balance->value == 200) {
+      lf_print("Test passed!");
+    } else {
+      lf_print_error_and_exit("Expect balance of 200.");
+    }
     lf_request_stop();
   =}
 
-  reaction(shutdown) {= lf_print("Test passed!"); =}
+  reaction(shutdown) {=
+    lf_print("Shutdown reaction invoked.");
+ =}
 }
 
 federated reactor {

From 5d7a8cfed4a153c6e69fe8a07c5cd738bda1fd39 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Fri, 30 Jun 2023 06:39:44 -0400
Subject: [PATCH 0538/1114] Align reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 423623c8da..0b76e73f36 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 423623c8da934c5b21b2efc9b9caef12dd28d944
+Subproject commit 0b76e73f36afbb3fe0a0586d43506b027cdaeeeb

From 3d86befc024beb739de61fc3713968eb4378bb6a Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Fri, 30 Jun 2023 15:59:03 +0200
Subject: [PATCH 0539/1114] Run formatter

---
 test/C/src/federated/CycleDetection.lf | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/C/src/federated/CycleDetection.lf b/test/C/src/federated/CycleDetection.lf
index 32a5a8d1cb..6d7c818882 100644
--- a/test/C/src/federated/CycleDetection.lf
+++ b/test/C/src/federated/CycleDetection.lf
@@ -45,9 +45,7 @@ reactor UserInput {
     lf_request_stop();
   =}
 
-  reaction(shutdown) {=
-    lf_print("Shutdown reaction invoked.");
- =}
+  reaction(shutdown) {= lf_print("Shutdown reaction invoked."); =}
 }
 
 federated reactor {

From 20bef42d782af65d4636ceeda40c6e85b3fd9dc2 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 28 Jun 2023 10:03:03 +0200
Subject: [PATCH 0540/1114] fix var ref

---
 .github/actions/report-code-coverage/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/report-code-coverage/action.yml b/.github/actions/report-code-coverage/action.yml
index b2234f0221..adb89c845f 100644
--- a/.github/actions/report-code-coverage/action.yml
+++ b/.github/actions/report-code-coverage/action.yml
@@ -13,7 +13,7 @@ runs:
         attempt_delay: 20000
         action: codecov/codecov-action@v3.1.4
         with: |
-          files: ${{ files }}
+          files: ${{ inputs.files }}
           fail_ci_if_error: true
           verbose: true
           token: ${{ secrets.CODECOV_TOKEN }}

From 8e4cca7a0a2e153b1d830430fa7a8c0055f26b0b Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 28 Jun 2023 13:09:06 +0200
Subject: [PATCH 0541/1114] fix reactor-cpp report

---
 .github/workflows/cpp-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cpp-tests.yml b/.github/workflows/cpp-tests.yml
index 80ab6e1779..cd3ffb263e 100644
--- a/.github/workflows/cpp-tests.yml
+++ b/.github/workflows/cpp-tests.yml
@@ -53,7 +53,7 @@ jobs:
         uses: ./.github/actions/report-code-coverage
         with:
           files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-        if: ${{ !inputs.compiler-ref }}  # i.e., if this is part of the main repo's CI
+        if: ${{ runner.os == 'Linux' }}
       - name: Collect reactor-cpp coverage data
         run: |
           lcov --capture --directory test/Cpp --output-file coverage.info

From 9b8a74958034cfc6e0c4ff795748d350cc5431dd Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Fri, 30 Jun 2023 16:41:38 +0200
Subject: [PATCH 0542/1114] include the token

---
 .github/actions/report-code-coverage/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/report-code-coverage/action.yml b/.github/actions/report-code-coverage/action.yml
index adb89c845f..548fcbf771 100644
--- a/.github/actions/report-code-coverage/action.yml
+++ b/.github/actions/report-code-coverage/action.yml
@@ -16,4 +16,4 @@ runs:
           files: ${{ inputs.files }}
           fail_ci_if_error: true
           verbose: true
-          token: ${{ secrets.CODECOV_TOKEN }}
+          token: 18fd5ab8-d6ba-4f5d-b0f4-7c26340ab98c

From 2d45e0d20bef297ec5b5f21774a236de27c39640 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Fri, 30 Jun 2023 19:21:33 +0200
Subject: [PATCH 0543/1114] fix C++ coverage report

---
 .github/workflows/cpp-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cpp-tests.yml b/.github/workflows/cpp-tests.yml
index cd3ffb263e..1a4b903ea7 100644
--- a/.github/workflows/cpp-tests.yml
+++ b/.github/workflows/cpp-tests.yml
@@ -70,4 +70,4 @@ jobs:
         uses: ./.github/actions/report-code-coverage
         with:
           files: reactor-cpp.info
-        if: ${{ !inputs.compiler-ref }}  # i.e., if this is part of the main repo's CI
+        if: ${{ !inputs.compiler-ref && matrix.platform == 'ubuntu-latest' }}  # i.e., if this is part of the main repo's CI

From b81c35651e2c0e4bed8e5ca54b3cfaff97ae89c2 Mon Sep 17 00:00:00 2001
From: Tang Keke <axmmisaka@users.noreply.github.com>
Date: Fri, 30 Jun 2023 18:23:45 -0700
Subject: [PATCH 0544/1114] Accomodate reactor-ts/#172

---
 .../org/lflang/generator/ts/TSImportPreambleGenerator.kt      | 2 +-
 .../kotlin/org/lflang/generator/ts/TSReactionGenerator.kt     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt
index b39cb71664..cafe43b8e4 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt
@@ -63,7 +63,7 @@ class TSImportPreambleGenerator(
             import {Reaction as __Reaction} from '@lf-lang/reactor-ts'
             import {State as __State} from '@lf-lang/reactor-ts'
             import {TimeUnit, TimeValue, Tag as __Tag, Origin as __Origin} from '@lf-lang/reactor-ts'
-            import {Args as __Args, Variable as __Variable, Triggers as __Triggers, Read, Write, ReadWrite, MultiReadWrite, Sched} from '@lf-lang/reactor-ts'
+            import {Variable as __Variable, Tuple as __Tuple, Read, Write, ReadWrite, MultiReadWrite, Sched} from '@lf-lang/reactor-ts'
             import {Log} from '@lf-lang/reactor-ts'
             import {ProcessedCommandLineArgs as __ProcessedCommandLineArgs, CommandLineOptionDefs as __CommandLineOptionDefs, CommandLineUsageDefs as __CommandLineUsageDefs, CommandLineOptionSpec as __CommandLineOptionSpec, unitBasedTimeValueCLAType as __unitBasedTimeValueCLAType, booleanCLAType as __booleanCLAType} from '@lf-lang/reactor-ts'
             """
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
index ac2e7af402..a217321111 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
@@ -105,8 +105,8 @@ class TSReactionGenerator(
             """
             |
             |this.add${if (reaction.isMutation) "Mutation" else "Reaction"}(
-            |    new __Triggers($reactionTriggers),
-            |    new __Args($reactFuncArgs),
+            |    new __Tuple($reactionTriggers),
+            |    new __Tuple($reactFuncArgs),
             |    function ($reactSignature) {
             |        // =============== START react prologue
         ${" |        "..reactPrologue}

From 504301432b3cd1c4d1995726c5c415605d0803dc Mon Sep 17 00:00:00 2001
From: Tang Keke <axmmisaka@users.noreply.github.com>
Date: Sat, 1 Jul 2023 00:13:49 -0700
Subject: [PATCH 0545/1114] Accomodate reactor-ts/ed02479

---
 .../org/lflang/generator/ts/TSImportPreambleGenerator.kt      | 2 +-
 .../kotlin/org/lflang/generator/ts/TSReactionGenerator.kt     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt
index cafe43b8e4..c7f780f8ee 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt
@@ -63,7 +63,7 @@ class TSImportPreambleGenerator(
             import {Reaction as __Reaction} from '@lf-lang/reactor-ts'
             import {State as __State} from '@lf-lang/reactor-ts'
             import {TimeUnit, TimeValue, Tag as __Tag, Origin as __Origin} from '@lf-lang/reactor-ts'
-            import {Variable as __Variable, Tuple as __Tuple, Read, Write, ReadWrite, MultiReadWrite, Sched} from '@lf-lang/reactor-ts'
+            import {Variable as __Variable, Read, Write, ReadWrite, MultiReadWrite, Sched} from '@lf-lang/reactor-ts'
             import {Log} from '@lf-lang/reactor-ts'
             import {ProcessedCommandLineArgs as __ProcessedCommandLineArgs, CommandLineOptionDefs as __CommandLineOptionDefs, CommandLineUsageDefs as __CommandLineUsageDefs, CommandLineOptionSpec as __CommandLineOptionSpec, unitBasedTimeValueCLAType as __unitBasedTimeValueCLAType, booleanCLAType as __booleanCLAType} from '@lf-lang/reactor-ts'
             """
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
index a217321111..077a4c055d 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
@@ -105,8 +105,8 @@ class TSReactionGenerator(
             """
             |
             |this.add${if (reaction.isMutation) "Mutation" else "Reaction"}(
-            |    new __Tuple($reactionTriggers),
-            |    new __Tuple($reactFuncArgs),
+            |    [$reactionTriggers],
+            |    [$reactFuncArgs],
             |    function ($reactSignature) {
             |        // =============== START react prologue
         ${" |        "..reactPrologue}

From b1d35c0efd20048ae6406540feb2b88530465a5a Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sat, 1 Jul 2023 16:18:55 +0800
Subject: [PATCH 0546/1114] Use more getters and setters, and mark certain
 variables final

---
 .../org/lflang/analyses/statespace/Event.java | 18 +++++---
 .../statespace/StateSpaceDiagram.java         | 46 +++++++++----------
 .../statespace/StateSpaceExplorer.java        | 22 ++++-----
 .../analyses/statespace/StateSpaceNode.java   | 44 ++++++++++++++----
 .../org/lflang/analyses/statespace/Tag.java   |  6 +--
 .../lflang/analyses/uclid/UclidGenerator.java | 16 +++----
 6 files changed, 92 insertions(+), 60 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/statespace/Event.java b/core/src/main/java/org/lflang/analyses/statespace/Event.java
index b04b9861a0..8cffd89336 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/Event.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/Event.java
@@ -5,22 +5,18 @@
 /** A node in the state space diagram representing a step in the execution of an LF program. */
 public class Event implements Comparable<Event> {
 
-  public TriggerInstance trigger;
-  public Tag tag;
+  private TriggerInstance trigger;
+  private Tag tag;
 
   public Event(TriggerInstance trigger, Tag tag) {
     this.trigger = trigger;
     this.tag = tag;
   }
 
-  public TriggerInstance getTrigger() {
-    return this.trigger;
-  }
-
   @Override
   public int compareTo(Event e) {
     // Compare tags first.
-    int ret = this.tag.compareTo(e.tag);
+    int ret = this.tag.compareTo(e.getTag());
     // If tags match, compare trigger names.
     if (ret == 0) ret = this.trigger.getFullName().compareTo(e.trigger.getFullName());
     return ret;
@@ -41,4 +37,12 @@ public boolean equals(Object o) {
   public String toString() {
     return "(" + trigger.getFullName() + ", " + tag + ")";
   }
+
+  public Tag getTag() {
+      return tag;
+  }
+
+  public TriggerInstance getTrigger() {
+    return trigger;
+  }
 }
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java
index d4583a90ca..05cbfd0e31 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java
@@ -41,7 +41,7 @@ public class StateSpaceDiagram extends DirectedGraph<StateSpaceNode> {
   /** Before adding the node, assign it an index. */
   @Override
   public void addNode(StateSpaceNode node) {
-    node.index = this.nodeCount();
+    node.setIndex(this.nodeCount());
     super.addNode(node);
   }
 
@@ -64,32 +64,32 @@ public void display() {
       return;
     }
     while (node != this.tail) {
-      System.out.print("* State " + node.index + ": ");
+      System.out.print("* State " + node.getIndex() + ": ");
       node.display();
 
       // Store the tag of the prior step.
-      timestamp = node.tag.timestamp;
+      timestamp = node.getTag().timestamp;
 
       // Assume a unique next state.
       node = getDownstreamNode(node);
 
       // Compute time difference
       if (node != null) {
-        TimeValue tsDiff = TimeValue.fromNanoSeconds(node.tag.timestamp - timestamp);
+        TimeValue tsDiff = TimeValue.fromNanoSeconds(node.getTag().timestamp - timestamp);
         System.out.println("*     => Advance time by " + tsDiff);
       }
     }
 
     // Print tail node
-    System.out.print("* (Tail) state " + node.index + ": ");
+    System.out.print("* (Tail) state " + node.getIndex() + ": ");
     node.display();
 
     if (this.loopNode != null) {
       // Compute time difference
-      TimeValue tsDiff = TimeValue.fromNanoSeconds(loopNodeNext.tag.timestamp - tail.tag.timestamp);
+      TimeValue tsDiff = TimeValue.fromNanoSeconds(loopNodeNext.getTag().timestamp - tail.getTag().timestamp);
       System.out.println("*     => Advance time by " + tsDiff);
 
-      System.out.println("* Goes back to loop node: state " + this.loopNode.index);
+      System.out.println("* Goes back to loop node: state " + this.loopNode.getIndex());
       System.out.print("* Loop node reached 2nd time: ");
       this.loopNodeNext.display();
     }
@@ -123,39 +123,39 @@ public CodeBuilder generateDot() {
         for (StateSpaceNode n : this.nodes()) {
           dot.pr(
               "S"
-                  + n.index
+                  + n.getIndex()
                   + " ["
                   + "label = \" {"
                   + "S"
-                  + n.index
+                  + n.getIndex()
                   + " | "
-                  + n.reactionsInvoked.size()
+                  + n.getReactionsInvoked().size()
                   + " | "
-                  + n.eventQ.size()
+                  + n.getEventQ().size()
                   + "}"
                   + " | "
-                  + n.tag
+                  + n.getTag()
                   + "\""
                   + "]");
         }
       } else {
         for (StateSpaceNode n : this.nodes()) {
           List<String> reactions =
-              n.reactionsInvoked.stream()
+              n.getReactionsInvoked().stream()
                   .map(ReactionInstance::getFullName)
                   .collect(Collectors.toList());
           String reactionsStr = String.join("\\n", reactions);
-          List<String> events = n.eventQ.stream().map(Event::toString).collect(Collectors.toList());
+          List<String> events = n.getEventQ().stream().map(Event::toString).collect(Collectors.toList());
           String eventsStr = String.join("\\n", events);
           dot.pr(
               "S"
-                  + n.index
+                  + n.getIndex()
                   + " ["
                   + "label = \""
                   + "S"
-                  + n.index
+                  + n.getIndex()
                   + " | "
-                  + n.tag
+                  + n.getTag()
                   + " | "
                   + "Reactions invoked:\\n"
                   + reactionsStr
@@ -170,13 +170,13 @@ public CodeBuilder generateDot() {
       StateSpaceNode current = this.head;
       StateSpaceNode next = getDownstreamNode(this.head);
       while (current != null && next != null && current != this.tail) {
-        TimeValue tsDiff = TimeValue.fromNanoSeconds(next.tag.timestamp - current.tag.timestamp);
+        TimeValue tsDiff = TimeValue.fromNanoSeconds(next.getTag().timestamp - current.getTag().timestamp);
         dot.pr(
             "S"
-                + current.index
+                + current.getIndex()
                 + " -> "
                 + "S"
-                + next.index
+                + next.getIndex()
                 + " [label = "
                 + "\""
                 + "+"
@@ -189,14 +189,14 @@ public CodeBuilder generateDot() {
 
       if (loopNode != null) {
         TimeValue tsDiff =
-            TimeValue.fromNanoSeconds(loopNodeNext.tag.timestamp - tail.tag.timestamp);
+            TimeValue.fromNanoSeconds(loopNodeNext.getTag().timestamp - tail.getTag().timestamp);
         TimeValue period = TimeValue.fromNanoSeconds(loopPeriod);
         dot.pr(
             "S"
-                + current.index
+                + current.getIndex()
                 + " -> "
                 + "S"
-                + next.index
+                + next.getIndex()
                 + " [label = "
                 + "\""
                 + "+"
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
index b1b37e1333..9a82de5e04 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
@@ -87,7 +87,7 @@ public void explore(Tag horizon, boolean findLoop) {
     boolean stop = true;
     if (this.eventQ.size() > 0) {
       stop = false;
-      currentTag = (eventQ.peek()).tag;
+      currentTag = (eventQ.peek()).getTag();
     }
 
     // A list of reactions invoked at the current logical tag
@@ -100,7 +100,7 @@ public void explore(Tag horizon, boolean findLoop) {
       // Pop the events from the earliest tag off the event queue.
       ArrayList<Event> currentEvents = new ArrayList<Event>();
       // FIXME: Use stream methods here?
-      while (eventQ.size() > 0 && eventQ.peek().tag.compareTo(currentTag) == 0) {
+      while (eventQ.size() > 0 && eventQ.peek().getTag().compareTo(currentTag) == 0) {
         Event e = eventQ.poll();
         // System.out.println("DEBUG: Popped an event: " + e);
         currentEvents.add(e);
@@ -114,19 +114,19 @@ public void explore(Tag horizon, boolean findLoop) {
       // and we do not want to record duplicate reaction invocations.
       reactionsTemp = new HashSet<ReactionInstance>();
       for (Event e : currentEvents) {
-        Set<ReactionInstance> dependentReactions = e.trigger.getDependentReactions();
+        Set<ReactionInstance> dependentReactions = e.getTrigger().getDependentReactions();
         reactionsTemp.addAll(dependentReactions);
         // System.out.println("DEBUG: dependentReactions: " + dependentReactions);
         // System.out.println("DEBUG: ReactionTemp: " + reactionsTemp);
 
         // If the event is a timer firing, enqueue the next firing.
-        if (e.trigger instanceof TimerInstance) {
-          TimerInstance timer = (TimerInstance) e.trigger;
+        if (e.getTrigger() instanceof TimerInstance) {
+          TimerInstance timer = (TimerInstance) e.getTrigger();
           eventQ.add(
               new Event(
                   timer,
                   new Tag(
-                      e.tag.timestamp + timer.getPeriod().toNanoSeconds(),
+                      e.getTag().timestamp + timer.getPeriod().toNanoSeconds(),
                       0, // A time advancement resets microstep to 0.
                       false)));
         }
@@ -227,7 +227,7 @@ else if (previousTag != null && currentTag.timestamp > previousTag.timestamp) {
           // Loop period is the time difference between the 1st time
           // the node is reached and the 2nd time the node is reached.
           this.diagram.loopPeriod =
-              this.diagram.loopNodeNext.tag.timestamp - this.diagram.loopNode.tag.timestamp;
+              this.diagram.loopNodeNext.getTag().timestamp - this.diagram.loopNode.getTag().timestamp;
           this.diagram.addEdge(this.diagram.loopNode, this.diagram.tail);
           return; // Exit the while loop early.
         }
@@ -276,9 +276,9 @@ else if (previousTag != null && currentTag.timestamp == previousTag.timestamp) {
         // System.out.println("DEBUG: Case 3");
         // Add reactions explored in the current loop iteration
         // to the existing state space node.
-        currentNode.reactionsInvoked.addAll(reactionsTemp);
+        currentNode.getReactionsInvoked().addAll(reactionsTemp);
         // Update the eventQ snapshot.
-        currentNode.eventQ = new ArrayList<Event>(eventQ);
+        currentNode.setEventQ(new ArrayList<Event>(eventQ));
       } else {
         throw new AssertionError("unreachable");
       }
@@ -286,7 +286,7 @@ else if (previousTag != null && currentTag.timestamp == previousTag.timestamp) {
       // Update the current tag for the next iteration.
       if (eventQ.size() > 0) {
         previousTag = currentTag;
-        currentTag = eventQ.peek().tag;
+        currentTag = eventQ.peek().getTag();
       }
 
       // Stop if:
@@ -309,7 +309,7 @@ else if (previousTag != null && currentTag.timestamp == previousTag.timestamp) {
     // or (previousTag != null
     // && currentTag.compareTo(previousTag) > 0) is true and then
     // the simulation ends, leaving a new node dangling.
-    if (previousNode == null || previousNode.tag.timestamp < currentNode.tag.timestamp) {
+    if (previousNode == null || previousNode.getTag().timestamp < currentNode.getTag().timestamp) {
       this.diagram.addNode(currentNode);
       this.diagram.tail = currentNode; // Update the current tail.
       if (previousNode != null) {
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java
index 42fb1b043e..72b6acffde 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java
@@ -11,11 +11,11 @@
 /** A node in the state space diagram representing a step in the execution of an LF program. */
 public class StateSpaceNode {
 
-  public int index; // Set in StateSpaceDiagram.java
-  public Tag tag;
-  public TimeValue time; // Readable representation of tag.timestamp
-  public Set<ReactionInstance> reactionsInvoked;
-  public ArrayList<Event> eventQ;
+  private int index; // Set in StateSpaceDiagram.java
+  private Tag tag;
+  private TimeValue time; // Readable representation of tag.timestamp
+  private Set<ReactionInstance> reactionsInvoked;
+  private ArrayList<Event> eventQ;
 
   public StateSpaceNode(Tag tag, Set<ReactionInstance> reactionsInvoked, ArrayList<Event> eventQ) {
     this.tag = tag;
@@ -31,8 +31,8 @@ public StateSpaceNode(Tag tag, Set<ReactionInstance> reactionsInvoked, ArrayList
   private boolean equidistant(StateSpaceNode n1, StateSpaceNode n2) {
     if (n1.eventQ.size() != n2.eventQ.size()) return false;
     for (int i = 0; i < n1.eventQ.size(); i++) {
-      if (n1.eventQ.get(i).tag.timestamp - n1.tag.timestamp
-          != n2.eventQ.get(i).tag.timestamp - n2.tag.timestamp) {
+      if (n1.eventQ.get(i).getTag().timestamp - n1.getTag().timestamp
+          != n2.eventQ.get(i).getTag().timestamp - n2.getTag().timestamp) {
         return false;
       }
     }
@@ -89,11 +89,39 @@ public int hash() {
         this.eventQ.stream()
             .map(
                 e -> {
-                  return e.tag.timestamp - this.tag.timestamp;
+                  return e.getTag().timestamp - this.tag.timestamp;
                 })
             .collect(Collectors.toList());
     result = 31 * result + timeDiff.hashCode();
 
     return result;
   }
+
+  public int getIndex() {
+    return index;
+  }
+
+  public void setIndex(int i) {
+    index = i;
+  }
+
+  public Tag getTag() {
+    return tag;
+  }
+
+  public TimeValue getTime() {
+    return time;
+  }
+
+  public Set<ReactionInstance> getReactionsInvoked() {
+    return reactionsInvoked;
+  }
+
+  public ArrayList<Event> getEventQ() {
+    return eventQ;
+  }
+
+  public void setEventQ(ArrayList<Event> list) {
+    eventQ = list;
+  }
 }
diff --git a/core/src/main/java/org/lflang/analyses/statespace/Tag.java b/core/src/main/java/org/lflang/analyses/statespace/Tag.java
index ddbd15abb8..f62dde6c32 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/Tag.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/Tag.java
@@ -8,9 +8,9 @@
  */
 public class Tag implements Comparable<Tag> {
 
-  public long timestamp;
-  public long microstep;
-  public boolean forever; // Whether the tag is FOREVER into the future.
+  public final long timestamp;
+  public final long microstep;
+  public final boolean forever; // Whether the tag is FOREVER into the future.
 
   public Tag(long timestamp, long microstep, boolean forever) {
     this.timestamp = timestamp;
diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
index ac84b7dcc2..be0d3fd60e 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -1632,10 +1632,10 @@ private void computeCT() {
         // a linkedlist implementation. We can go straight
         // to the next node.
         StateSpaceNode node = diagram.head;
-        this.CT = diagram.head.reactionsInvoked.size();
+        this.CT = diagram.head.getReactionsInvoked().size();
         while (node != diagram.tail) {
           node = diagram.getDownstreamNode(node);
-          this.CT += node.reactionsInvoked.size();
+          this.CT += node.getReactionsInvoked().size();
         }
       }
     }
@@ -1643,7 +1643,7 @@ private void computeCT() {
     else {
       // Subtract the non-periodic logical time
       // interval from the total horizon.
-      long horizonRemained = Math.subtractExact(this.horizon, diagram.loopNode.tag.timestamp);
+      long horizonRemained = Math.subtractExact(this.horizon, diagram.loopNode.getTag().timestamp);
 
       // Check how many loop iteration is required
       // to check the remaining horizon.
@@ -1670,8 +1670,8 @@ else if (diagram.loopPeriod == 0 && horizonRemained == 0) {
 
         An overflow-safe version of the line above
         */
-        int t0 = Math.addExact(diagram.loopNode.index, 1);
-        int t1 = Math.subtractExact(diagram.tail.index, diagram.loopNode.index);
+        int t0 = Math.addExact(diagram.loopNode.getIndex(), 1);
+        int t1 = Math.subtractExact(diagram.tail.getIndex(), diagram.loopNode.getIndex());
         int t2 = Math.addExact(t1, 1);
         int t3 = Math.multiplyExact(t2, loopIterations);
         this.CT = Math.addExact(t0, t3);
@@ -1682,18 +1682,18 @@ else if (diagram.loopPeriod == 0 && horizonRemained == 0) {
         StateSpaceNode node = diagram.head;
         int numReactionInvocationsBeforeLoop = 0;
         while (node != diagram.loopNode) {
-          numReactionInvocationsBeforeLoop += node.reactionsInvoked.size();
+          numReactionInvocationsBeforeLoop += node.getReactionsInvoked().size();
           node = diagram.getDownstreamNode(node);
         }
         // Account for the loop node in numReactionInvocationsBeforeLoop.
-        numReactionInvocationsBeforeLoop += node.reactionsInvoked.size();
+        numReactionInvocationsBeforeLoop += node.getReactionsInvoked().size();
 
         // Count the events from the loop node until
         // loop node is reached again.
         int numReactionInvocationsInsideLoop = 0;
         do {
           node = diagram.getDownstreamNode(node);
-          numReactionInvocationsInsideLoop += node.reactionsInvoked.size();
+          numReactionInvocationsInsideLoop += node.getReactionsInvoked().size();
         } while (node != diagram.loopNode);
 
         /*

From 2e687e66b067d8aadbeb015954790434feeb05b9 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sat, 1 Jul 2023 17:50:34 +0800
Subject: [PATCH 0547/1114] Remove sneakyThrow and apply spotless

---
 .../org/lflang/analyses/statespace/Event.java    |  2 +-
 .../analyses/statespace/StateSpaceDiagram.java   |  9 ++++++---
 .../analyses/statespace/StateSpaceExplorer.java  |  3 ++-
 .../lflang/analyses/uclid/UclidGenerator.java    | 16 +++++++---------
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/statespace/Event.java b/core/src/main/java/org/lflang/analyses/statespace/Event.java
index 8cffd89336..917857341e 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/Event.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/Event.java
@@ -39,7 +39,7 @@ public String toString() {
   }
 
   public Tag getTag() {
-      return tag;
+    return tag;
   }
 
   public TriggerInstance getTrigger() {
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java
index 05cbfd0e31..75275a6ff3 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java
@@ -86,7 +86,8 @@ public void display() {
 
     if (this.loopNode != null) {
       // Compute time difference
-      TimeValue tsDiff = TimeValue.fromNanoSeconds(loopNodeNext.getTag().timestamp - tail.getTag().timestamp);
+      TimeValue tsDiff =
+          TimeValue.fromNanoSeconds(loopNodeNext.getTag().timestamp - tail.getTag().timestamp);
       System.out.println("*     => Advance time by " + tsDiff);
 
       System.out.println("* Goes back to loop node: state " + this.loopNode.getIndex());
@@ -145,7 +146,8 @@ public CodeBuilder generateDot() {
                   .map(ReactionInstance::getFullName)
                   .collect(Collectors.toList());
           String reactionsStr = String.join("\\n", reactions);
-          List<String> events = n.getEventQ().stream().map(Event::toString).collect(Collectors.toList());
+          List<String> events =
+              n.getEventQ().stream().map(Event::toString).collect(Collectors.toList());
           String eventsStr = String.join("\\n", events);
           dot.pr(
               "S"
@@ -170,7 +172,8 @@ public CodeBuilder generateDot() {
       StateSpaceNode current = this.head;
       StateSpaceNode next = getDownstreamNode(this.head);
       while (current != null && next != null && current != this.tail) {
-        TimeValue tsDiff = TimeValue.fromNanoSeconds(next.getTag().timestamp - current.getTag().timestamp);
+        TimeValue tsDiff =
+            TimeValue.fromNanoSeconds(next.getTag().timestamp - current.getTag().timestamp);
         dot.pr(
             "S"
                 + current.getIndex()
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
index 9a82de5e04..f827fa9ef6 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
@@ -227,7 +227,8 @@ else if (previousTag != null && currentTag.timestamp > previousTag.timestamp) {
           // Loop period is the time difference between the 1st time
           // the node is reached and the 2nd time the node is reached.
           this.diagram.loopPeriod =
-              this.diagram.loopNodeNext.getTag().timestamp - this.diagram.loopNode.getTag().timestamp;
+              this.diagram.loopNodeNext.getTag().timestamp
+                  - this.diagram.loopNode.getTag().timestamp;
           this.diagram.addEdge(this.diagram.loopNode, this.diagram.tail);
           return; // Exit the while loop early.
         }
diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
index be0d3fd60e..9db668d04d 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -37,7 +37,6 @@
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.lflang.Target;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
@@ -274,7 +273,7 @@ protected void generateUclidFile() {
       this.generatedFiles.add(file);
       if (this.expect != null) this.expectations.put(file, this.expect);
     } catch (IOException e) {
-      Exceptions.sneakyThrow(e);
+      throw new RuntimeException(e);
     }
   }
 
@@ -1548,7 +1547,7 @@ private void setupDirectories() {
     try {
       Files.createDirectories(outputDir);
     } catch (IOException e) {
-      Exceptions.sneakyThrow(e);
+      throw new RuntimeException(e);
     }
     System.out.println("The models will be located in: " + outputDir);
   }
@@ -1621,7 +1620,7 @@ private void computeCT() {
       String filename = file.toString();
       dot.writeToFile(filename);
     } catch (IOException e) {
-      Exceptions.sneakyThrow(e);
+      throw new RuntimeException(e);
     }
 
     //// Compute CT
@@ -1649,13 +1648,12 @@ private void computeCT() {
       // to check the remaining horizon.
       int loopIterations = 0;
       if (diagram.loopPeriod == 0 && horizonRemained != 0)
-        Exceptions.sneakyThrow(
-            new Exception(
-                "ERROR: Zeno behavior detected while the horizon is non-zero. The program has no"
-                    + " finite CT."));
+        throw new RuntimeException(
+            "ERROR: Zeno behavior detected while the horizon is non-zero. The program has no"
+                + " finite CT.");
       else if (diagram.loopPeriod == 0 && horizonRemained == 0) {
         // Handle this edge case.
-        Exceptions.sneakyThrow(new Exception("Unhandled case: both the horizon and period are 0!"));
+        throw new RuntimeException("Unhandled case: both the horizon and period are 0!");
       } else {
         loopIterations = (int) Math.ceil((double) horizonRemained / diagram.loopPeriod);
       }

From 7c74e08e3e8bb6f778b30e92d746e6577787da0a Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sat, 1 Jul 2023 18:32:54 +0800
Subject: [PATCH 0548/1114] Report warnings using messageReporter

---
 .../cast/BuildAstParseTreeVisitor.java        | 454 ++++++++++--------
 .../lflang/analyses/uclid/UclidGenerator.java |   4 +-
 2 files changed, 264 insertions(+), 194 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java b/core/src/main/java/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
index 3b72539d14..aa9fd1917d 100644
--- a/core/src/main/java/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
+++ b/core/src/main/java/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
@@ -3,11 +3,22 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import org.lflang.MessageReporter;
 import org.lflang.dsl.CBaseVisitor;
 import org.lflang.dsl.CParser.*;
 
+/** This visitor class builds an AST from the parse tree of a C program */
 public class BuildAstParseTreeVisitor extends CBaseVisitor<CAst.AstNode> {
 
+  /** Message reporter for reporting warnings and errors */
+  MessageReporter messageReporter;
+
+  /** Constructor */
+  public BuildAstParseTreeVisitor(MessageReporter messageReporter) {
+    super();
+    this.messageReporter = messageReporter;
+  }
+
   @Override
   public CAst.AstNode visitBlockItemList(BlockItemListContext ctx) {
     CAst.StatementSequenceNode stmtSeq = new CAst.StatementSequenceNode();
@@ -34,26 +45,30 @@ public CAst.AstNode visitDeclaration(DeclarationContext ctx) {
       // Cannot handle more than 1 specifiers, e.g. static const int.
       // We can augment the analytical capability later.
       if (declSpecList.size() > 1) {
-        System.out.println(
-            String.join(
-                " ",
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "the analyzer cannot handle more than 1 specifiers,",
-                "e.g. static const int.",
-                "Marking the declaration as opaque."));
+        messageReporter
+            .nowhere()
+            .warning(
+                String.join(
+                    " ",
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "the analyzer cannot handle more than 1 specifiers,",
+                    "e.g. static const int.",
+                    "Marking the declaration as opaque."));
         return new CAst.OpaqueNode();
       }
 
       // Check if the declaration specifier is a type specifier: e.g. int or long.
       DeclarationSpecifierContext declSpec = declSpecList.get(0);
       if (declSpec.typeSpecifier() == null) {
-        System.out.println(
-            String.join(
-                " ",
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "only type specifiers are supported.",
-                "e.g. \"static const int\" is not analyzable.",
-                "Marking the declaration as opaque."));
+        messageReporter
+            .nowhere()
+            .warning(
+                String.join(
+                    " ",
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "only type specifiers are supported.",
+                    "e.g. \"static const int\" is not analyzable.",
+                    "Marking the declaration as opaque."));
         return new CAst.OpaqueNode();
       }
 
@@ -68,13 +83,15 @@ public CAst.AstNode visitDeclaration(DeclarationContext ctx) {
       else if (declSpec.typeSpecifier().Bool() != null) type = CAst.VariableNode.Type.BOOLEAN;
       // Mark the declaration unanalyzable if the type is unsupported.
       else {
-        System.out.println(
-            String.join(
-                " ",
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "unsupported type detected at " + declSpec.typeSpecifier(),
-                "Only " + supportedTypes + " are supported.",
-                "Marking the declaration as opaque."));
+        messageReporter
+            .nowhere()
+            .warning(
+                String.join(
+                    " ",
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "unsupported type detected at " + declSpec.typeSpecifier(),
+                    "Only " + supportedTypes + " are supported.",
+                    "Marking the declaration as opaque."));
         return new CAst.OpaqueNode();
       }
 
@@ -84,46 +101,54 @@ public CAst.AstNode visitDeclaration(DeclarationContext ctx) {
       // Cannot handle more than 1 initDeclarator: e.g. x = 1, y = 2;
       // We can augment the analytical capability later.
       if (initDeclList.size() > 1) {
-        System.out.println(
-            String.join(
-                " ",
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "more than 1 declarators are detected on a single line,",
-                "e.g. \"int x = 1, y = 2;\" is not yet analyzable.",
-                "Marking the declaration as opaque."));
+        messageReporter
+            .nowhere()
+            .warning(
+                String.join(
+                    " ",
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "more than 1 declarators are detected on a single line,",
+                    "e.g. \"int x = 1, y = 2;\" is not yet analyzable.",
+                    "Marking the declaration as opaque."));
         return new CAst.OpaqueNode();
       }
 
       // Get the variable name from the declarator.
       DeclaratorContext decl = initDeclList.get(0).declarator();
       if (decl.pointer() != null) {
-        System.out.println(
-            String.join(
-                " ",
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "pointers are currently not supported,",
-                "e.g. \"int *x;\" is not yet analyzable.",
-                "Marking the declaration as opaque."));
+        messageReporter
+            .nowhere()
+            .warning(
+                String.join(
+                    " ",
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "pointers are currently not supported,",
+                    "e.g. \"int *x;\" is not yet analyzable.",
+                    "Marking the declaration as opaque."));
         return new CAst.OpaqueNode();
       }
       if (decl.gccDeclaratorExtension().size() > 0) {
-        System.out.println(
-            String.join(
-                " ",
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "GCC declarator extensions are currently not supported,",
-                "e.g. \"__asm\" and \"__attribute__\" are not yet analyzable.",
-                "Marking the declaration as opaque."));
+        messageReporter
+            .nowhere()
+            .warning(
+                String.join(
+                    " ",
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "GCC declarator extensions are currently not supported,",
+                    "e.g. \"__asm\" and \"__attribute__\" are not yet analyzable.",
+                    "Marking the declaration as opaque."));
         return new CAst.OpaqueNode();
       }
       DirectDeclaratorContext directDecl = decl.directDeclarator();
       if (directDecl.Identifier() == null) {
-        System.out.println(
-            String.join(
-                " ",
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "the variable identifier is missing.",
-                "Marking the declaration as opaque."));
+        messageReporter
+            .nowhere()
+            .warning(
+                String.join(
+                    " ",
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "the variable identifier is missing.",
+                    "Marking the declaration as opaque."));
         return new CAst.OpaqueNode();
       }
 
@@ -137,13 +162,15 @@ public CAst.AstNode visitDeclaration(DeclarationContext ctx) {
       // Make sure that there is an initializer.
       InitDeclaratorContext initDecl = initDeclList.get(0);
       if (initDecl.initializer() == null) {
-        System.out.println(
-            String.join(
-                " ",
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "the initializer is missing,",
-                "e.g. \"int x;\" is not yet analyzable.",
-                "Marking the declaration as opaque."));
+        messageReporter
+            .nowhere()
+            .warning(
+                String.join(
+                    " ",
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "the initializer is missing,",
+                    "e.g. \"int x;\" is not yet analyzable.",
+                    "Marking the declaration as opaque."));
         return new CAst.OpaqueNode();
 
         // FIXME: Use UninitCAst.VariableNode to perform special encoding.
@@ -153,12 +180,14 @@ public CAst.AstNode visitDeclaration(DeclarationContext ctx) {
       // Extract the primaryExpression from the initializer.
       if (initDecl.initializer().assignmentExpression() == null
           || initDecl.initializer().assignmentExpression().conditionalExpression() == null) {
-        System.out.println(
-            String.join(
-                " ",
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "assignmentExpression or conditionalExpression is missing.",
-                "Marking the declaration as opaque."));
+        messageReporter
+            .nowhere()
+            .warning(
+                String.join(
+                    " ",
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "assignmentExpression or conditionalExpression is missing.",
+                    "Marking the declaration as opaque."));
         return new CAst.OpaqueNode();
       }
 
@@ -206,12 +235,14 @@ public CAst.AstNode visitExpression(ExpressionContext ctx) {
     if (ctx.assignmentExpression().size() == 1) {
       return visitAssignmentExpression(ctx.assignmentExpression().get(0));
     }
-    System.out.println(
-        String.join(
-            " ",
-            "Warning (line " + ctx.getStart().getLine() + "):",
-            "only one assignmentExpression in an expression is currently supported.",
-            "Marking the statement as opaque."));
+    messageReporter
+        .nowhere()
+        .warning(
+            String.join(
+                " ",
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "only one assignmentExpression in an expression is currently supported.",
+                "Marking the statement as opaque."));
     return new CAst.OpaqueNode();
   }
 
@@ -224,12 +255,14 @@ public CAst.AstNode visitPrimaryExpression(PrimaryExpressionContext ctx) {
     } else if (ctx.expression() != null) {
       return visitExpression(ctx.expression());
     }
-    System.out.println(
-        String.join(
-            " ",
-            "Warning (line " + ctx.getStart().getLine() + "):",
-            "only identifier, constant, and expressions are supported in a primary expression.",
-            "Marking the declaration as opaque."));
+    messageReporter
+        .nowhere()
+        .warning(
+            String.join(
+                " ",
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "only identifier, constant, and expressions are supported in a primary expression.",
+                "Marking the declaration as opaque."));
     return new CAst.OpaqueNode();
   }
 
@@ -241,12 +274,14 @@ public CAst.AstNode visitPostfixExpression(PostfixExpressionContext ctx) {
         || ctx.MinusMinus().size() > 0
         || ctx.Dot().size() > 0
         || (ctx.LeftBracket().size() > 0 && ctx.RightBracket().size() > 0)) {
-      System.out.println(
-          String.join(
-              " ",
-              "Warning (line " + ctx.getStart().getLine() + "):",
-              "Postfix '++', '--', '.', '[]' are currently not supported.",
-              "Marking the statement as opaque."));
+      messageReporter
+          .nowhere()
+          .warning(
+              String.join(
+                  " ",
+                  "Warning (line " + ctx.getStart().getLine() + "):",
+                  "Postfix '++', '--', '.', '[]' are currently not supported.",
+                  "Marking the statement as opaque."));
       return new CAst.OpaqueNode();
     }
     // State variables on the self struct, ports and actions.
@@ -266,12 +301,14 @@ public CAst.AstNode visitPostfixExpression(PostfixExpressionContext ctx) {
         return new CAst.TriggerIsPresentNode(varNode.name);
       } else {
         // Generic pointer dereference, unanalyzable.
-        System.out.println(
-            String.join(
-                " ",
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "Generic pointer dereference is not supported in a postfix expression.",
-                "Marking the declaration as opaque."));
+        messageReporter
+            .nowhere()
+            .warning(
+                String.join(
+                    " ",
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "Generic pointer dereference is not supported in a postfix expression.",
+                    "Marking the declaration as opaque."));
         return new CAst.OpaqueNode();
       }
     }
@@ -290,12 +327,15 @@ public CAst.AstNode visitPostfixExpression(PostfixExpressionContext ctx) {
       if (varNode.name.equals("lf_set")) {
         // return a set port node.
         if (params.size() != 2) {
-          System.out.println(
-              String.join(
-                  " ",
-                  "Warning (line " + ctx.getStart().getLine() + "):",
-                  "lf_set must have 2 arguments. Detected " + ctx.argumentExpressionList().size(),
-                  "Marking the function call as opaque."));
+          messageReporter
+              .nowhere()
+              .warning(
+                  String.join(
+                      " ",
+                      "Warning (line " + ctx.getStart().getLine() + "):",
+                      "lf_set must have 2 arguments. Detected "
+                          + ctx.argumentExpressionList().size(),
+                      "Marking the function call as opaque."));
           return new CAst.OpaqueNode();
         }
         CAst.SetPortNode node = new CAst.SetPortNode();
@@ -305,13 +345,15 @@ public CAst.AstNode visitPostfixExpression(PostfixExpressionContext ctx) {
       } else if (varNode.name.equals("lf_schedule")) {
         // return a set port node.
         if (params.size() != 2) {
-          System.out.println(
-              String.join(
-                  " ",
-                  "Warning (line " + ctx.getStart().getLine() + "):",
-                  "lf_schedule must have two arguments. Detected "
-                      + ctx.argumentExpressionList().size(),
-                  "Marking the function call as opaque."));
+          messageReporter
+              .nowhere()
+              .warning(
+                  String.join(
+                      " ",
+                      "Warning (line " + ctx.getStart().getLine() + "):",
+                      "lf_schedule must have two arguments. Detected "
+                          + ctx.argumentExpressionList().size(),
+                      "Marking the function call as opaque."));
           return new CAst.OpaqueNode();
         }
         CAst.ScheduleActionNode node = new CAst.ScheduleActionNode();
@@ -322,13 +364,15 @@ public CAst.AstNode visitPostfixExpression(PostfixExpressionContext ctx) {
       } else if (varNode.name.equals("lf_schedule_int")) {
         // return a set port node.
         if (params.size() != 3) {
-          System.out.println(
-              String.join(
-                  " ",
-                  "Warning (line " + ctx.getStart().getLine() + "):",
-                  "lf_schedule_int must have three arguments. Detected "
-                      + ctx.argumentExpressionList().size(),
-                  "Marking the function call as opaque."));
+          messageReporter
+              .nowhere()
+              .warning(
+                  String.join(
+                      " ",
+                      "Warning (line " + ctx.getStart().getLine() + "):",
+                      "lf_schedule_int must have three arguments. Detected "
+                          + ctx.argumentExpressionList().size(),
+                      "Marking the function call as opaque."));
           return new CAst.OpaqueNode();
         }
         CAst.ScheduleActionIntNode node = new CAst.ScheduleActionIntNode();
@@ -338,13 +382,15 @@ public CAst.AstNode visitPostfixExpression(PostfixExpressionContext ctx) {
         return node;
       } else {
         // Generic pointer dereference, unanalyzable.
-        System.out.println(
-            String.join(
-                " ",
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "Generic pointer dereference and function calls are not supported in a postfix"
-                    + " expression.",
-                "Marking the declaration as opaque."));
+        messageReporter
+            .nowhere()
+            .warning(
+                String.join(
+                    " ",
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "Generic pointer dereference and function calls are not supported in a postfix"
+                        + " expression.",
+                    "Marking the declaration as opaque."));
         return new CAst.OpaqueNode();
       }
     }
@@ -352,13 +398,15 @@ public CAst.AstNode visitPostfixExpression(PostfixExpressionContext ctx) {
     if (ctx.primaryExpression() != null) {
       return visitPrimaryExpression(ctx.primaryExpression());
     }
-    System.out.println(
-        String.join(
-            " ",
-            "Warning (line " + ctx.getStart().getLine() + "):",
-            "only an identifier, constant, state variable, port, and action are supported in a"
-                + " primary expression.",
-            "Marking the declaration as opaque."));
+    messageReporter
+        .nowhere()
+        .warning(
+            String.join(
+                " ",
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "only an identifier, constant, state variable, port, and action are supported in a"
+                    + " primary expression.",
+                "Marking the declaration as opaque."));
     return new CAst.OpaqueNode();
   }
 
@@ -366,12 +414,14 @@ public CAst.AstNode visitPostfixExpression(PostfixExpressionContext ctx) {
   public CAst.AstNode visitUnaryExpression(UnaryExpressionContext ctx) {
     // Check for prefixes and mark them as opaque (unsupported for now).
     if (ctx.PlusPlus().size() > 0 || ctx.MinusMinus().size() > 0 || ctx.Sizeof().size() > 0) {
-      System.out.println(
-          String.join(
-              " ",
-              "Warning (line " + ctx.getStart().getLine() + "):",
-              "Prefix '++', '--', and 'sizeof' are currently not supported.",
-              "Marking the statement as opaque."));
+      messageReporter
+          .nowhere()
+          .warning(
+              String.join(
+                  " ",
+                  "Warning (line " + ctx.getStart().getLine() + "):",
+                  "Prefix '++', '--', and 'sizeof' are currently not supported.",
+                  "Marking the statement as opaque."));
       AstUtils.printStackTraceAndMatchedText(ctx);
       return new CAst.OpaqueNode();
     }
@@ -410,12 +460,14 @@ public CAst.AstNode visitUnaryExpression(UnaryExpressionContext ctx) {
     }
 
     // Mark all the remaining cases as opaque.
-    System.out.println(
-        String.join(
-            " ",
-            "Warning (line " + ctx.getStart().getLine() + "):",
-            "only postfixExpression and '!' in a unaryExpression is currently supported.",
-            "Marking the statement as opaque."));
+    messageReporter
+        .nowhere()
+        .warning(
+            String.join(
+                " ",
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "only postfixExpression and '!' in a unaryExpression is currently supported.",
+                "Marking the statement as opaque."));
     AstUtils.printStackTraceAndMatchedText(ctx);
     return new CAst.OpaqueNode();
   }
@@ -425,12 +477,14 @@ public CAst.AstNode visitCastExpression(CastExpressionContext ctx) {
     if (ctx.unaryExpression() != null) {
       return visitUnaryExpression(ctx.unaryExpression());
     }
-    System.out.println(
-        String.join(
-            " ",
-            "Warning (line " + ctx.getStart().getLine() + "):",
-            "only unaryExpression in a castExpression is currently supported.",
-            "Marking the statement as opaque."));
+    messageReporter
+        .nowhere()
+        .warning(
+            String.join(
+                " ",
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "only unaryExpression in a castExpression is currently supported.",
+                "Marking the statement as opaque."));
     return new CAst.OpaqueNode();
   }
 
@@ -443,12 +497,14 @@ public CAst.AstNode visitMultiplicativeExpression(MultiplicativeExpressionContex
       } else if (ctx.Div().size() > 0) {
         node = new CAst.DivisionNode();
       } else if (ctx.Mod().size() > 0) {
-        System.out.println(
-            String.join(
-                " ",
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "Mod expression '%' is currently unsupported.",
-                "Marking the expression as opaque."));
+        messageReporter
+            .nowhere()
+            .warning(
+                String.join(
+                    " ",
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "Mod expression '%' is currently unsupported.",
+                    "Marking the expression as opaque."));
         return new CAst.OpaqueNode();
       } else {
         node = new CAst.AstNodeBinary();
@@ -481,12 +537,14 @@ public CAst.AstNode visitAdditiveExpression(AdditiveExpressionContext ctx) {
   @Override
   public CAst.AstNode visitShiftExpression(ShiftExpressionContext ctx) {
     if (ctx.additiveExpression().size() > 1) {
-      System.out.println(
-          String.join(
-              " ",
-              "Warning (line " + ctx.getStart().getLine() + "):",
-              "Shift expression '<<' or '>>' is currently unsupported.",
-              "Marking the expression as opaque."));
+      messageReporter
+          .nowhere()
+          .warning(
+              String.join(
+                  " ",
+                  "Warning (line " + ctx.getStart().getLine() + "):",
+                  "Shift expression '<<' or '>>' is currently unsupported.",
+                  "Marking the expression as opaque."));
       return new CAst.OpaqueNode();
     }
     return visitAdditiveExpression(ctx.additiveExpression().get(0));
@@ -535,12 +593,14 @@ public CAst.AstNode visitEqualityExpression(EqualityExpressionContext ctx) {
   @Override
   public CAst.AstNode visitAndExpression(AndExpressionContext ctx) {
     if (ctx.equalityExpression().size() > 1) {
-      System.out.println(
-          String.join(
-              " ",
-              "Warning (line " + ctx.getStart().getLine() + "):",
-              "And expression '&' is currently unsupported.",
-              "Marking the expression as opaque."));
+      messageReporter
+          .nowhere()
+          .warning(
+              String.join(
+                  " ",
+                  "Warning (line " + ctx.getStart().getLine() + "):",
+                  "And expression '&' is currently unsupported.",
+                  "Marking the expression as opaque."));
       return new CAst.OpaqueNode();
     }
     return visitEqualityExpression(ctx.equalityExpression().get(0));
@@ -549,12 +609,14 @@ public CAst.AstNode visitAndExpression(AndExpressionContext ctx) {
   @Override
   public CAst.AstNode visitExclusiveOrExpression(ExclusiveOrExpressionContext ctx) {
     if (ctx.andExpression().size() > 1) {
-      System.out.println(
-          String.join(
-              " ",
-              "Warning (line " + ctx.getStart().getLine() + "):",
-              "Exclusive Or '^' is currently unsupported.",
-              "Marking the expression as opaque."));
+      messageReporter
+          .nowhere()
+          .warning(
+              String.join(
+                  " ",
+                  "Warning (line " + ctx.getStart().getLine() + "):",
+                  "Exclusive Or '^' is currently unsupported.",
+                  "Marking the expression as opaque."));
       return new CAst.OpaqueNode();
     }
     return visitAndExpression(ctx.andExpression().get(0));
@@ -563,12 +625,14 @@ public CAst.AstNode visitExclusiveOrExpression(ExclusiveOrExpressionContext ctx)
   @Override
   public CAst.AstNode visitInclusiveOrExpression(InclusiveOrExpressionContext ctx) {
     if (ctx.exclusiveOrExpression().size() > 1) {
-      System.out.println(
-          String.join(
-              " ",
-              "Warning (line " + ctx.getStart().getLine() + "):",
-              "Inclusive Or '|' is currently unsupported.",
-              "Marking the expression as opaque."));
+      messageReporter
+          .nowhere()
+          .warning(
+              String.join(
+                  " ",
+                  "Warning (line " + ctx.getStart().getLine() + "):",
+                  "Inclusive Or '|' is currently unsupported.",
+                  "Marking the expression as opaque."));
       return new CAst.OpaqueNode();
     }
     return visitExclusiveOrExpression(ctx.exclusiveOrExpression().get(0));
@@ -599,12 +663,14 @@ public CAst.AstNode visitLogicalOrExpression(LogicalOrExpressionContext ctx) {
   @Override
   public CAst.AstNode visitConditionalExpression(ConditionalExpressionContext ctx) {
     if (ctx.expression() != null) {
-      System.out.println(
-          String.join(
-              " ",
-              "Warning (line " + ctx.getStart().getLine() + "):",
-              "Currently do not support inline conditional expression.",
-              "Marking the expression as opaque."));
+      messageReporter
+          .nowhere()
+          .warning(
+              String.join(
+                  " ",
+                  "Warning (line " + ctx.getStart().getLine() + "):",
+                  "Currently do not support inline conditional expression.",
+                  "Marking the expression as opaque."));
       return new CAst.OpaqueNode();
     }
     return visitLogicalOrExpression(ctx.logicalOrExpression());
@@ -641,34 +707,40 @@ public CAst.AstNode visitAssignmentExpression(AssignmentExpressionContext ctx) {
         subnode.right = visitAssignmentExpression(ctx.assignmentExpression());
         assignmentNode.right = subnode;
       } else {
-        System.out.println(
-            String.join(
-                " ",
-                "Warning (line " + ctx.getStart().getLine() + "):",
-                "Only '=', '+=', '-=', '*=', '/=' assignment operators are supported.",
-                "Marking the expression as opaque."));
+        messageReporter
+            .nowhere()
+            .warning(
+                String.join(
+                    " ",
+                    "Warning (line " + ctx.getStart().getLine() + "):",
+                    "Only '=', '+=', '-=', '*=', '/=' assignment operators are supported.",
+                    "Marking the expression as opaque."));
         return new CAst.OpaqueNode();
       }
       return assignmentNode;
     }
-    System.out.println(
-        String.join(
-            " ",
-            "Warning (line " + ctx.getStart().getLine() + "):",
-            "DigitSequence in an assignmentExpression is currently not supported.",
-            "Marking the expression as opaque."));
+    messageReporter
+        .nowhere()
+        .warning(
+            String.join(
+                " ",
+                "Warning (line " + ctx.getStart().getLine() + "):",
+                "DigitSequence in an assignmentExpression is currently not supported.",
+                "Marking the expression as opaque."));
     return new CAst.OpaqueNode();
   }
 
   @Override
   public CAst.AstNode visitSelectionStatement(SelectionStatementContext ctx) {
     if (ctx.Switch() != null) {
-      System.out.println(
-          String.join(
-              " ",
-              "Warning (line " + ctx.getStart().getLine() + "):",
-              "Switch case statement is currently not supported.",
-              "Marking the expression as opaque."));
+      messageReporter
+          .nowhere()
+          .warning(
+              String.join(
+                  " ",
+                  "Warning (line " + ctx.getStart().getLine() + "):",
+                  "Switch case statement is currently not supported.",
+                  "Marking the expression as opaque."));
       return new CAst.OpaqueNode();
     }
     CAst.IfBlockNode ifBlockNode = new CAst.IfBlockNode();
diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
index 9db668d04d..d188d83ae4 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -1215,8 +1215,6 @@ protected void generateReactionAxioms() {
 
     for (ReactionInstance.Runtime reaction : this.reactionInstances) {
       String body = reaction.getReaction().getDefinition().getCode().getBody();
-      // System.out.println("DEBUG: Printing reaction body of " + reaction);
-      // System.out.println(body);
 
       // Generate a parse tree.
       CLexer lexer = new CLexer(CharStreams.fromString(body));
@@ -1225,7 +1223,7 @@ protected void generateReactionAxioms() {
       BlockItemListContext parseTree = parser.blockItemList();
 
       // Build an AST.
-      BuildAstParseTreeVisitor buildAstVisitor = new BuildAstParseTreeVisitor();
+      BuildAstParseTreeVisitor buildAstVisitor = new BuildAstParseTreeVisitor(messageReporter);
       CAst.AstNode ast = buildAstVisitor.visitBlockItemList(parseTree);
 
       // VariablePrecedenceVisitor

From 0256af655b7d50bb39800555a190ab9389889655 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sat, 1 Jul 2023 18:58:26 +0800
Subject: [PATCH 0549/1114] Apply more suggestions from @petervdonovan

---
 .../java/org/lflang/analyses/cast/CAst.java   |  7 ++-
 .../lflang/analyses/cast/CToUclidVisitor.java | 50 +++++++++----------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/cast/CAst.java b/core/src/main/java/org/lflang/analyses/cast/CAst.java
index ea04d45426..2126902da9 100644
--- a/core/src/main/java/org/lflang/analyses/cast/CAst.java
+++ b/core/src/main/java/org/lflang/analyses/cast/CAst.java
@@ -46,6 +46,7 @@ public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
     }
   }
 
+  /** An AST node class that can have a list of child nodes with arbitrary length */
   public static class AstNodeDynamic extends AstNode implements Visitable {
     public ArrayList<AstNode> children = new ArrayList<>();
 
@@ -391,7 +392,11 @@ public <T> T accept(AstVisitor<? extends T> visitor, List<AstNode> nodeList) {
     }
   }
 
-  /** Handle state variables appearing as self-><name> */
+  /**
+   * Handle state variables appearing as self-><name>. If the state variable appears on both sides
+   * of an assignment, such as `self-><name> = self-><name> + 1`, then `self-><name>` on the RHS is
+   * marked as a "previous state" with `prev` set to true.
+   */
   public static class StateVarNode extends AstNode implements Visitable {
     public String name;
     public boolean prev = false; // By default, this is not a previous state.
diff --git a/core/src/main/java/org/lflang/analyses/cast/CToUclidVisitor.java b/core/src/main/java/org/lflang/analyses/cast/CToUclidVisitor.java
index 231f0c5ae3..03b533861f 100644
--- a/core/src/main/java/org/lflang/analyses/cast/CToUclidVisitor.java
+++ b/core/src/main/java/org/lflang/analyses/cast/CToUclidVisitor.java
@@ -14,31 +14,35 @@
 
 public class CToUclidVisitor extends CBaseAstVisitor<String> {
 
-  // The Uclid generator instance
-  protected UclidGenerator generator;
+  /** The Uclid generator instance */
+  private UclidGenerator generator;
 
-  // The reaction instance for the generated axiom
-  protected ReactionInstance.Runtime reaction;
+  /** The reaction instance for the generated axiom */
+  private ReactionInstance.Runtime reaction;
 
-  // The reactor that contains the reaction
-  protected ReactorInstance reactor;
+  /** The reactor that contains the reaction */
+  private ReactorInstance reactor;
 
-  // A list of all the named instances
-  protected List<NamedInstance> instances = new ArrayList<NamedInstance>();
+  /** A list of all the named instances */
+  private List<NamedInstance> instances = new ArrayList<NamedInstance>();
 
-  // Quantified variable
-  protected String qv = "i";
-  protected String qv2 = "j";
+  /** Quantified variable */
+  private final String qv = "i";
 
-  // Unchanged variables and triggers
-  protected List<StateVariableInstance> unchangedStates;
-  protected List<TriggerInstance> unchangedTriggers;
+  private final String qv2 = "j";
+
+  /** Unchanged variables and triggers */
+  private List<StateVariableInstance> unchangedStates;
+
+  private List<TriggerInstance> unchangedTriggers;
 
   // FIXME: Make this more flexible and infer value from program.
-  // Default reset value
-  String defaultValue = "0";
-  String defaultPresence = "false";
+  /** Default reset value */
+  private final String defaultValue = "0";
+
+  private final String defaultPresence = "false";
 
+  /** Constructor */
   public CToUclidVisitor(UclidGenerator generator, ReactionInstance.Runtime reaction) {
     this.generator = generator;
     this.reaction = reaction;
@@ -347,8 +351,7 @@ public String visitStateVarNode(StateVarNode node) {
           + ")"
           + ")";
     }
-    // FIXME: Throw exception
-    return "";
+    throw new RuntimeException("Instance not found in CToUclidVisitor");
   }
 
   @Override
@@ -382,8 +385,7 @@ public String visitTriggerIsPresentNode(TriggerIsPresentNode node) {
           + ")"
           + ")";
     }
-    // FIXME: Throw exception
-    return "";
+    throw new RuntimeException("Instance not found in CToUclidVisitor");
   }
 
   @Override
@@ -393,8 +395,7 @@ public String visitTriggerValueNode(TriggerValueNode node) {
     if (instance != null) {
       return instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
     }
-    // FIXME: Throw exception
-    return "";
+    throw new RuntimeException("Instance not found in CToUclidVisitor");
   }
 
   @Override
@@ -403,8 +404,7 @@ public String visitVariableNode(VariableNode node) {
     if (instance != null) {
       return instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
     }
-    // FIXME: Throw exception
-    return "";
+    throw new RuntimeException("Instance not found in CToUclidVisitor");
   }
 
   /////////////////////////////

From 8df7ac2ad5b10ba5a222297d9097aefeb5c0b688 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 1 Jul 2023 14:01:21 -0700
Subject: [PATCH 0550/1114] Apply suggestions from code review

---
 .github/workflows/ts-tests.yml              | 2 +-
 core/src/main/resources/lib/ts/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ts-tests.yml b/.github/workflows/ts-tests.yml
index e8a8b91892..331075b401 100644
--- a/.github/workflows/ts-tests.yml
+++ b/.github/workflows/ts-tests.yml
@@ -37,7 +37,7 @@ jobs:
         if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }}
       - name: Perform TypeScript tests
         run: |
-          ./gradlew targetTest -Ptarget=TypeScript -Druntime="git://github.com/lf-lang/reactor-ts.git#axmmisaka/remove-present-replace-unknown"
+          ./gradlew targetTest -Ptarget=TypeScript -Druntime="git://github.com/lf-lang/reactor-ts.git#master"
       - name: Collect code coverage
         run: ./gradlew jacocoTestReport
       - name: Report to CodeCov
diff --git a/core/src/main/resources/lib/ts/package.json b/core/src/main/resources/lib/ts/package.json
index 02149379f6..fc063d791e 100644
--- a/core/src/main/resources/lib/ts/package.json
+++ b/core/src/main/resources/lib/ts/package.json
@@ -2,7 +2,7 @@
     "name": "LinguaFrancaDefault",
     "type": "commonjs",
     "dependencies": {
-        "@lf-lang/reactor-ts": "git://github.com/lf-lang/reactor-ts.git#axmmisaka/remove-present-replace-unknown",
+        "@lf-lang/reactor-ts": "git://github.com/lf-lang/reactor-ts.git#master",
         "command-line-args": "^5.1.1",
         "command-line-usage": "^6.1.3"
     },

From bfff10c65e2c8c327cf1b20cbb67d3cf7c6ade5b Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 1 Jul 2023 17:32:24 -0700
Subject: [PATCH 0551/1114] Rename `TimeValue.NEVER()` to `TimeValue.never()`

---
 .../java/org/lflang/federated/extensions/TSExtension.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 884b40fbb4..c32b9f8977 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -207,7 +207,7 @@ private List<String> getUpstreamConnectionDelays(FederateInstance federate) {
         if (delays != null) {
           for (Expression delay : delays) {
             if (delay == null) {
-              element += "TimeValue.NEVER()";
+              element += "TimeValue.never()";
             } else {
               element += "TimeValue.nsec(" + getNetworkDelayLiteral(delay) + ")";
             }
@@ -217,7 +217,7 @@ private List<String> getUpstreamConnectionDelays(FederateInstance federate) {
             }
           }
         } else {
-          element += "TimeValue.NEVER()";
+          element += "TimeValue.never()";
         }
         element += "]";
         candidates.add(element);

From 6df5d0887cfcf537942cace1f54ce9ad84c318d7 Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Sun, 2 Jul 2023 15:54:58 +0900
Subject: [PATCH 0552/1114] Merge branch 'present-unknown' into
 'ts-level-assignment' manually to sync with the master of reactor-ts

---
 core/src/main/java/org/lflang/Target.java                   | 1 -
 core/src/main/java/org/lflang/generator/TargetTypes.java    | 2 +-
 core/src/main/java/org/lflang/generator/ts/TSTypes.java     | 2 +-
 .../kotlin/org/lflang/generator/ts/TSDelayBodyGenerator.kt  | 6 +++---
 .../src/main/kotlin/org/lflang/generator/ts/TSExtensions.kt | 6 +++---
 .../org/lflang/generator/ts/TSImportPreambleGenerator.kt    | 2 +-
 .../kotlin/org/lflang/generator/ts/TSReactionGenerator.kt   | 4 ++--
 .../main/kotlin/org/lflang/generator/ts/TSTimerGenerator.kt | 2 --
 8 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/org/lflang/Target.java b/core/src/main/java/org/lflang/Target.java
index 8f08e89fcc..4a6012f7a8 100644
--- a/core/src/main/java/org/lflang/Target.java
+++ b/core/src/main/java/org/lflang/Target.java
@@ -268,7 +268,6 @@ public enum Target {
           // underscores)
           "TimeUnit",
           "TimeValue",
-          "Present",
           "Sched",
           "Read",
           "Write",
diff --git a/core/src/main/java/org/lflang/generator/TargetTypes.java b/core/src/main/java/org/lflang/generator/TargetTypes.java
index eda5cffd11..968a641ed3 100644
--- a/core/src/main/java/org/lflang/generator/TargetTypes.java
+++ b/core/src/main/java/org/lflang/generator/TargetTypes.java
@@ -60,7 +60,7 @@ default String getTargetBracedListExpr(BracedListExpression expr, InferredType t
         .collect(Collectors.joining(",", "{", "}"));
   }
 
-  /** Return an "undefined" type which is used as a default when a type cannot be inferred. */
+  /** Return an "unknown" type which is used as a default when a type cannot be inferred. */
   String getTargetUndefinedType();
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/ts/TSTypes.java b/core/src/main/java/org/lflang/generator/ts/TSTypes.java
index 0fe4fc8a5e..cca3736c66 100644
--- a/core/src/main/java/org/lflang/generator/ts/TSTypes.java
+++ b/core/src/main/java/org/lflang/generator/ts/TSTypes.java
@@ -40,7 +40,7 @@ public String getTargetTagType() {
 
   @Override
   public String getTargetUndefinedType() {
-    return "Present";
+    return "unknown";
   }
 
   public String getTargetTimeExpr(TimeValue value) {
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSDelayBodyGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSDelayBodyGenerator.kt
index e561696524..ecdcf762a2 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSDelayBodyGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSDelayBodyGenerator.kt
@@ -9,7 +9,7 @@ object TSDelayBodyGenerator : DelayBodyGenerator {
     /**
      * Return a TS type for the specified action.
      * If the type has not been specified, return
-     * "Present" which is the base type for Actions.
+     * `unknown`.
      * @param action The action
      * @return The TS type.
      */
@@ -17,7 +17,7 @@ object TSDelayBodyGenerator : DelayBodyGenerator {
         return if (action.type != null) {
             TSTypes.getInstance().getTargetType(action.type)
         } else {
-            "Present"
+            "unknown"
         }
     }
 
@@ -30,7 +30,7 @@ object TSDelayBodyGenerator : DelayBodyGenerator {
     }
 
     override fun generateDelayGeneric(): String {
-        return "T extends Present"
+        return "T"
     }
 
     override fun generateAfterDelaysWithVariableWidth() = false
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSExtensions.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSExtensions.kt
index a28e462921..6c304a5a8d 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSExtensions.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSExtensions.kt
@@ -35,11 +35,11 @@ fun WidthSpec.toTSCode(): String = terms.joinToString(" + ") {
 /**
  * Return a TS type for the specified port.
  * If the type has not been specified, return
- * "Present" which is the base type for ports.
+ * `unknown`.
  * @return The TS type.
  */
 val Port.tsPortType: String
-    get() = type?.let { TSTypes.getInstance().getTargetType(it) } ?: "Present"
+    get() = type?.let { TSTypes.getInstance().getTargetType(it) } ?: "unknown"
 
 /**
  * Return a TS type for the specified action.
@@ -48,7 +48,7 @@ val Port.tsPortType: String
  * @return The TS type.
  */
 val Action.tsActionType: String
-    get() = type?.let { TSTypes.getInstance().getTargetType(it) } ?: "Present"
+    get() = type?.let { TSTypes.getInstance().getTargetType(it) } ?: "unknown"
 
 fun Expression.toTsTime(): String = TSTypes.getInstance().getTargetTimeExpr(this)
 fun TimeValue.toTsTime(): String = TSTypes.getInstance().getTargetTimeExpr(this)
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt
index 6621794852..c7f780f8ee 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt
@@ -63,7 +63,7 @@ class TSImportPreambleGenerator(
             import {Reaction as __Reaction} from '@lf-lang/reactor-ts'
             import {State as __State} from '@lf-lang/reactor-ts'
             import {TimeUnit, TimeValue, Tag as __Tag, Origin as __Origin} from '@lf-lang/reactor-ts'
-            import {Args as __Args, Variable as __Variable, Triggers as __Triggers, Present, Read, Write, ReadWrite, MultiReadWrite, Sched} from '@lf-lang/reactor-ts'
+            import {Variable as __Variable, Read, Write, ReadWrite, MultiReadWrite, Sched} from '@lf-lang/reactor-ts'
             import {Log} from '@lf-lang/reactor-ts'
             import {ProcessedCommandLineArgs as __ProcessedCommandLineArgs, CommandLineOptionDefs as __CommandLineOptionDefs, CommandLineUsageDefs as __CommandLineUsageDefs, CommandLineOptionSpec as __CommandLineOptionSpec, unitBasedTimeValueCLAType as __unitBasedTimeValueCLAType, booleanCLAType as __booleanCLAType} from '@lf-lang/reactor-ts'
             """
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
index b82e1d20af..672d923d2b 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactionGenerator.kt
@@ -105,8 +105,8 @@ class TSReactionGenerator(
             """
             |
             |this.add${if (reaction.isMutation) "Mutation" else "Reaction"}(
-            |    new __Triggers($reactionTriggers),
-            |    new __Args($reactFuncArgs),
+            |    [$reactionTriggers],
+            |    [$reactFuncArgs],
             |    function ($reactSignature) {
             |        // =============== START react prologue
         ${" |        "..reactPrologue}
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSTimerGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSTimerGenerator.kt
index 2cb1f37894..411249d7ca 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSTimerGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSTimerGenerator.kt
@@ -1,8 +1,6 @@
 package org.lflang.generator.ts
 
-import org.lflang.generator.getTargetTimeExpr
 import org.lflang.generator.orZero
-import org.lflang.lf.Expression
 import org.lflang.lf.Timer
 import java.util.*
 

From 16650fe43ee13213abed47a828435530fec2d578 Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Sun, 2 Jul 2023 17:01:55 +0900
Subject: [PATCH 0553/1114] Add fixme for the initialization reaction of
 TS-targeted federates

---
 .../federated/generator/FedASTUtils.java      | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 8f0579cb77..9edc4cb115 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -45,6 +45,7 @@
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
+import org.lflang.Target;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
@@ -637,7 +638,11 @@ private static Reactor getNetworkSenderReactor(
     var senderIndexParameter = LfFactory.eINSTANCE.createParameter();
     var senderIndexParameterType = LfFactory.eINSTANCE.createType();
     senderIndexParameter.setName("sender_index");
-    senderIndexParameterType.setId("int");
+    if (connection.srcFederate.targetConfig.target != Target.TS) {
+      senderIndexParameterType.setId("int");
+    } else {
+      senderIndexParameterType.setId("Number");
+    }
     senderIndexParameter.setType(senderIndexParameterType);
     var senderIndexParameterInit = LfFactory.eINSTANCE.createInitializer();
     var senderIndexParameterInitExpr = LfFactory.eINSTANCE.createLiteral();
@@ -696,21 +701,28 @@ private static Reaction getNetworkSenderReaction(
     return networkSenderReaction;
   }
 
-  private static Reaction getInitializationReaction() {
+  private static Reaction getInitializationReaction(FedConnectionInstance connection) {
     var initializationReaction = LfFactory.eINSTANCE.createReaction();
     var startup = LfFactory.eINSTANCE.createBuiltinTriggerRef();
     startup.setType(BuiltinTrigger.STARTUP);
     initializationReaction.getTriggers().add(startup);
     var code = LfFactory.eINSTANCE.createCode();
-    code.setBody(
-        """
-            extern reaction_t* port_absent_reaction[];
-            void enqueue_network_output_control_reactions();
-            LF_PRINT_DEBUG("Adding network output control reaction to table.");
-            port_absent_reaction[self->sender_index] = &self->_lf__reaction_2;
-            LF_PRINT_DEBUG("Added network output control reaction to table. Enqueueing it...");
-            enqueue_network_output_control_reactions();
-            """);
+    if (connection.srcFederate.targetConfig.target != Target.TS) {
+      code.setBody(
+          """
+              extern reaction_t* port_absent_reaction[];
+              void enqueue_network_output_control_reactions();
+              LF_PRINT_DEBUG("Adding network output control reaction to table.");
+              port_absent_reaction[self->sender_index] = &self->_lf__reaction_2;
+              LF_PRINT_DEBUG("Added network output control reaction to table. Enqueueing it...");
+              enqueue_network_output_control_reactions();
+              """);
+    } else {
+      code.setBody(
+          """
+              // TODO: Figure out what to do for initialization reaction
+              """);
+    }
     initializationReaction.setCode(code);
     return initializationReaction;
   }

From f11a9c580e52e3f2cb10b5e01e61ab240c8ce123 Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Sun, 2 Jul 2023 17:11:25 +0900
Subject: [PATCH 0554/1114] Pass a parameter

---
 .../main/java/org/lflang/federated/generator/FedASTUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 9edc4cb115..94dc0b0e6a 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -651,7 +651,7 @@ private static Reactor getNetworkSenderReactor(
     senderIndexParameter.setInit(senderIndexParameterInit);
     sender.getParameters().add(senderIndexParameter);
 
-    sender.getReactions().add(getInitializationReaction());
+    sender.getReactions().add(getInitializationReaction(connection));
     sender.getReactions().add(networkSenderReaction);
     sender.getInputs().add(in);
 

From dd6e19564ad6b64bc068ae78b1d927c922234302 Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Mon, 3 Jul 2023 09:50:51 +0900
Subject: [PATCH 0555/1114] Register appropriate federate ports

---
 .../generator/ts/TSConstructorGenerator.kt    |  2 +-
 .../lflang/generator/ts/TSReactorGenerator.kt | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
index a1ec96c9ac..7c357d0c6e 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
@@ -92,7 +92,7 @@ class TSConstructorGenerator(
         actions: TSActionGenerator,
         ports: TSPortGenerator,
         isFederate: Boolean,
-        networkMessageActions: List<String>
+        networkMessageActions: MutableList<String>
     ): String {
         val connections = TSConnectionGenerator(reactor.connections, errorReporter)
         val reactions = TSReactionGenerator(errorReporter, reactor)
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
index 4d537f5a19..23448c9441 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
@@ -102,10 +102,23 @@ ${"             |"..preamble.code.toText()}
             }.trimMargin()
         }
 
-    private fun getNetworkMessagActions(reactor: Reactor): List<String> {
+    private fun getNetworkMessageActions(reactor: Reactor): MutableList<String> {
         val attribute = AttributeUtils.findAttributeByName(reactor, "_fed_config")
         val actionsStr = AttributeUtils.getAttributeParameter(attribute, AttributeSpec.NETWORK_MESSAGE_ACTIONS)
-        return actionsStr?.split(",")?.filter { it.isNotEmpty()} ?: emptyList()
+        var actionsList = actionsStr?.split(",")?.filter { it.isNotEmpty()} ?: emptyList()
+        actionsList = actionsList.toMutableList()
+
+        val childReactors = reactor.instantiations
+        var actionsListCount = 0
+        for (childReactor in childReactors) {
+            if (childReactor.reactorClass.name.take(15) == "NetworkReceiver") {
+                // FIXME: Assume that the order of childReactor and attribute list are identical.
+                // This assumption might bring some erros
+                actionsList[actionsListCount] = childReactor.name + "." + actionsList[actionsListCount]
+                actionsListCount++
+            }
+        }
+        return actionsList
     }
 
     fun generateReactor(reactor: Reactor): String {
@@ -116,7 +129,7 @@ ${"             |"..preamble.code.toText()}
         }
 
         val isFederate = AttributeUtils.isFederate(reactor)
-        val networkMessageActions = getNetworkMessagActions(reactor)
+        val networkMessageActions = getNetworkMessageActions(reactor)
 
         // NOTE: type parameters that are referenced in ports or actions must extend
         // Present in order for the program to type check.

From b00c74ab1ce39646ddce0f961f71fe8b560fcd99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Mon, 3 Jul 2023 16:51:09 +0200
Subject: [PATCH 0556/1114] Fix extra whitespace around info messages

---
 .../src/main/java/org/lflang/cli/CliBase.java |  6 ++---
 .../lflang/cli/StandaloneIssueAcceptor.java   | 12 ++++++---
 .../kotlin/org/lflang/cli/ReportingUtil.kt    | 27 +++++++++----------
 cli/lfc/src/main/java/org/lflang/cli/Lfc.java |  2 +-
 .../org/lflang/generator/GeneratorBase.java   |  4 +--
 5 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/cli/base/src/main/java/org/lflang/cli/CliBase.java b/cli/base/src/main/java/org/lflang/cli/CliBase.java
index 0b61fa767b..3e95afb334 100644
--- a/cli/base/src/main/java/org/lflang/cli/CliBase.java
+++ b/cli/base/src/main/java/org/lflang/cli/CliBase.java
@@ -263,19 +263,19 @@ public void validateResource(Resource resource) {
         try {
           path = FileUtil.toPath(uri);
         } catch (IllegalArgumentException e) {
-          reporter.printError("Unable to convert '" + uri + "' to path." + e);
+          reporter.printError("Unable to convert '" + uri + "' to path. " + e);
         }
       }
       issueCollector.accept(
           new LfIssue(
               issue.getMessage(),
               issue.getSeverity(),
+              path,
               issue.getLineNumber(),
               issue.getColumn(),
               issue.getLineNumberEnd(),
               issue.getColumnEnd(),
-              issue.getLength(),
-              path));
+              issue.getLength()));
     }
   }
 
diff --git a/cli/base/src/main/java/org/lflang/cli/StandaloneIssueAcceptor.java b/cli/base/src/main/java/org/lflang/cli/StandaloneIssueAcceptor.java
index d8fd14640a..399473f30a 100644
--- a/cli/base/src/main/java/org/lflang/cli/StandaloneIssueAcceptor.java
+++ b/cli/base/src/main/java/org/lflang/cli/StandaloneIssueAcceptor.java
@@ -13,13 +13,19 @@
 public class StandaloneIssueAcceptor implements ValidationMessageAcceptor {
 
   @Inject private IssueCollector collector;
+  @Inject private ReportingBackend backend;
 
   boolean getErrorsOccurred() {
     return collector.getErrorsOccurred();
   }
 
   void accept(LfIssue lfIssue) {
-    collector.accept(lfIssue);
+    if (lfIssue.getSeverity() == Severity.INFO) {
+      // print info statements instead of collecting them
+      backend.printIssue(lfIssue);
+    } else {
+      collector.accept(lfIssue);
+    }
   }
 
   void accept(
@@ -37,12 +43,12 @@ void accept(
         new LfIssue(
             message,
             severity,
+            getPath(diagnostic),
             diagnostic.getLine(),
             diagnostic.getColumn(),
             diagnostic.getLineEnd(),
             diagnostic.getColumnEnd(),
-            diagnostic.getLength(),
-            getPath(diagnostic));
+            diagnostic.getLength());
 
     accept(lfIssue);
   }
diff --git a/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt b/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt
index b8e94083cf..b7c4826bdf 100644
--- a/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt
+++ b/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt
@@ -128,12 +128,12 @@ class Io @JvmOverloads constructor(
 data class LfIssue(
     val message: String,
     val severity: Severity,
-    val line: Int?,
-    val column: Int?,
-    val endLine: Int?,
-    val endColumn: Int?,
-    val length: Int?,
-    val file: Path?
+    val file: Path? = null,
+    val line: Int? = null,
+    val column: Int? = null,
+    val endLine: Int? = null,
+    val endColumn: Int? = null,
+    val length: Int? = null,
 ) : Comparable<LfIssue> {
 
     constructor(
@@ -199,7 +199,7 @@ class IssueCollector {
  *
  * @author Clément Fournier
  */
-class ReportingBackend constructor(
+class ReportingBackend(
     /** Environment of the process, contains IO streams. */
     private val io: Io,
     /** Header for all messages. */
@@ -253,18 +253,18 @@ class ReportingBackend constructor(
 
     /** Print an error message to [Io.err]. */
     fun printError(message: String) {
-        io.err.println(header + colors.redAndBold("error: ") + message)
+        printIssue(LfIssue(message, Severity.ERROR))
         errorsOccurred = true
     }
 
     /** Print a warning message to [Io.err]. */
     fun printWarning(message: String) {
-        io.err.println(header + colors.yellowAndBold("warning: ") + message)
+        printIssue(LfIssue(message, Severity.WARNING))
     }
 
     /** Print an informational message to [Io.out]. */
     fun printInfo(message: String) {
-        io.out.println(header + colors.bold("info: ") + message)
+        printIssue(LfIssue(message, Severity.INFO))
     }
 
     /**
@@ -277,18 +277,17 @@ class ReportingBackend constructor(
 
         val header = severity.name.lowercase(Locale.ROOT)
 
-        var fullMessage: String = this.header + colors.severityColors(header, severity) + colors.bold(": " + issue.message) + System.lineSeparator()
+        var fullMessage: String = this.header + colors.severityColors(header, severity) + colors.bold(": " + issue.message)
         val snippet: String? = filePath?.let { formatIssue(issue, filePath) }
 
         if (snippet == null) {
             filePath?.let { io.wd.relativize(it) }?.let {
-                fullMessage += " --> " + it + ":" + issue.line + ":" + issue.column + " - "
+                fullMessage += "\n --> " + it + ":" + issue.line + ":" + issue.column + " - \n"
             }
         } else {
-            fullMessage += snippet
+            fullMessage += "\n" + snippet + "\n"
         }
         io.err.println(fullMessage)
-        io.err.println()
     }
 
     private fun formatIssue(issue: LfIssue, path: Path): String? {
diff --git a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
index 021fb1c9fa..dd2d6fe9d2 100644
--- a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
+++ b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
@@ -193,7 +193,7 @@ private void invokeGenerator(List<Path> files, Path root, Properties properties)
       // Print all other issues (not errors).
       issueCollector.getAllIssues().forEach(reporter::printIssue);
 
-      this.io.getOut().println("Code generation finished.");
+      messageReporter.nowhere().info("Code generation finished.");
     }
   }
 
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 76af5c5c25..4109ec96c9 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -664,10 +664,10 @@ public void printInfo(LFGeneratorContext.Mode mode) {
     messageReporter
         .nowhere()
         .info("Generating code for: " + context.getFileConfig().resource.getURI().toString());
-    messageReporter.nowhere().info("******** mode: " + mode);
+    messageReporter.nowhere().info("Generation mode: " + mode);
     messageReporter
         .nowhere()
-        .info("******** generated sources: " + context.getFileConfig().getSrcGenPath());
+        .info("Generating sources into: " + context.getFileConfig().getSrcGenPath());
   }
 
   /** Get the buffer type used for network messages */

From 54866e28eaa8895af37f64dd914555c28b7b6519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Mon, 3 Jul 2023 17:05:59 +0200
Subject: [PATCH 0557/1114] Fix test

---
 cli/lff/src/test/java/org/lflang/cli/LffCliTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java b/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
index 4941a81046..5f5f09d977 100644
--- a/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
+++ b/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
@@ -230,7 +230,7 @@ public void testFormatDirectoryVerbose(@TempDir Path tempDir) throws IOException
 
     result.checkOk();
 
-    result.checkStdOut(containsString("Formatted src" + File.separator + "File.lf"));
+    result.checkStdErr(containsString("Formatted src" + File.separator + "File.lf"));
     dirChecker(tempDir).checkContentsOf("src/File.lf", equalTo(FILE_AFTER_REFORMAT));
   }
 

From b4540bac32377df381c8861b596ca4d21b011ef3 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sat, 1 Jul 2023 19:09:05 +0800
Subject: [PATCH 0558/1114] Throw error when looking up named instances

---
 .../lflang/analyses/cast/CToUclidVisitor.java | 52 +++++++------------
 1 file changed, 20 insertions(+), 32 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/cast/CToUclidVisitor.java b/core/src/main/java/org/lflang/analyses/cast/CToUclidVisitor.java
index 03b533861f..634045a10e 100644
--- a/core/src/main/java/org/lflang/analyses/cast/CToUclidVisitor.java
+++ b/core/src/main/java/org/lflang/analyses/cast/CToUclidVisitor.java
@@ -341,17 +341,14 @@ public String visitSetPortNode(SetPortNode node) {
   @Override
   public String visitStateVarNode(StateVarNode node) {
     NamedInstance instance = getInstanceByName(node.name);
-    if (instance != null) {
-      return instance.getFullNameWithJoiner("_")
-          + "("
-          + "s"
-          + "("
-          + this.qv
-          + (node.prev ? "-1" : "")
-          + ")"
-          + ")";
-    }
-    throw new RuntimeException("Instance not found in CToUclidVisitor");
+    return instance.getFullNameWithJoiner("_")
+        + "("
+        + "s"
+        + "("
+        + this.qv
+        + (node.prev ? "-1" : "")
+        + ")"
+        + ")";
   }
 
   @Override
@@ -375,41 +372,33 @@ public String visitSubtractionNode(SubtractionNode node) {
   public String visitTriggerIsPresentNode(TriggerIsPresentNode node) {
     // Find the trigger instance by name.
     NamedInstance instance = getInstanceByName(node.name);
-    if (instance != null) {
-      return instance.getFullNameWithJoiner("_")
-          + "_is_present"
-          + "("
-          + "t"
-          + "("
-          + this.qv
-          + ")"
-          + ")";
-    }
-    throw new RuntimeException("Instance not found in CToUclidVisitor");
+    return instance.getFullNameWithJoiner("_")
+        + "_is_present"
+        + "("
+        + "t"
+        + "("
+        + this.qv
+        + ")"
+        + ")";
   }
 
   @Override
   public String visitTriggerValueNode(TriggerValueNode node) {
     // Find the trigger instance by name.
     NamedInstance instance = getInstanceByName(node.name);
-    if (instance != null) {
-      return instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
-    }
-    throw new RuntimeException("Instance not found in CToUclidVisitor");
+    return instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
   }
 
   @Override
   public String visitVariableNode(VariableNode node) {
     NamedInstance instance = getInstanceByName(node.name);
-    if (instance != null) {
-      return instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
-    }
-    throw new RuntimeException("Instance not found in CToUclidVisitor");
+    return instance.getFullNameWithJoiner("_") + "(" + "s" + "(" + this.qv + ")" + ")";
   }
 
   /////////////////////////////
   //// Private functions
 
+  /** Look up an instance by name. This function throws an error if an instance is not found. */
   private NamedInstance getInstanceByName(String name) {
     for (NamedInstance i : this.instances) {
       if (i instanceof ActionInstance) {
@@ -426,7 +415,6 @@ private NamedInstance getInstanceByName(String name) {
         }
       }
     }
-    System.out.println("Named instance" + "not found.");
-    return null;
+    throw new RuntimeException("NamedInstance not found!");
   }
 }

From 5043e30171866747b8cda09897e844341d96c841 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Tue, 4 Jul 2023 17:02:42 +0200
Subject: [PATCH 0559/1114] Handle the equals() issue

---
 .../org/lflang/analyses/statespace/Event.java |  9 ++-
 .../analyses/statespace/EventQueue.java       |  5 +-
 .../statespace/StateSpaceDiagram.java         |  4 +-
 .../statespace/StateSpaceExplorer.java        |  2 +-
 .../analyses/statespace/StateSpaceNode.java   | 67 +++++++++++++------
 5 files changed, 58 insertions(+), 29 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/statespace/Event.java b/core/src/main/java/org/lflang/analyses/statespace/Event.java
index 917857341e..d8613e5138 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/Event.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/Event.java
@@ -13,6 +13,10 @@ public Event(TriggerInstance trigger, Tag tag) {
     this.tag = tag;
   }
 
+  /**
+   * Compare two events first by tags and, if tags are equal, by trigger names in lexical order.
+   * This is useful for enforcing a unique order of events in a priority queue of Event instances.
+   */
   @Override
   public int compareTo(Event e) {
     // Compare tags first.
@@ -22,9 +26,8 @@ public int compareTo(Event e) {
     return ret;
   }
 
-  /** This equals() method does NOT compare tags, only compares triggers. */
-  @Override
-  public boolean equals(Object o) {
+  /** This method checks if two events have the same triggers. */
+  public boolean hasSameTriggers(Object o) {
     if (o == null) return false;
     if (o instanceof Event) {
       Event e = (Event) o;
diff --git a/core/src/main/java/org/lflang/analyses/statespace/EventQueue.java b/core/src/main/java/org/lflang/analyses/statespace/EventQueue.java
index b04339d465..7c04206da7 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/EventQueue.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/EventQueue.java
@@ -2,7 +2,10 @@
 
 import java.util.PriorityQueue;
 
-/** An event queue implementation that sorts events by time tag order */
+/**
+ * An event queue implementation that sorts events in the order of _time tags_ and _trigger names_
+ * based on the implementation of compareTo() in the Event class.
+ */
 public class EventQueue extends PriorityQueue<Event> {
 
   /**
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java
index 75275a6ff3..e2aa66737d 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceDiagram.java
@@ -132,7 +132,7 @@ public CodeBuilder generateDot() {
                   + " | "
                   + n.getReactionsInvoked().size()
                   + " | "
-                  + n.getEventQ().size()
+                  + n.getEventQcopy().size()
                   + "}"
                   + " | "
                   + n.getTag()
@@ -147,7 +147,7 @@ public CodeBuilder generateDot() {
                   .collect(Collectors.toList());
           String reactionsStr = String.join("\\n", reactions);
           List<String> events =
-              n.getEventQ().stream().map(Event::toString).collect(Collectors.toList());
+              n.getEventQcopy().stream().map(Event::toString).collect(Collectors.toList());
           String eventsStr = String.join("\\n", events);
           dot.pr(
               "S"
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
index f827fa9ef6..3d22bc7fbd 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
@@ -279,7 +279,7 @@ else if (previousTag != null && currentTag.timestamp == previousTag.timestamp) {
         // to the existing state space node.
         currentNode.getReactionsInvoked().addAll(reactionsTemp);
         // Update the eventQ snapshot.
-        currentNode.setEventQ(new ArrayList<Event>(eventQ));
+        currentNode.setEventQcopy(new ArrayList<Event>(eventQ));
       } else {
         throw new AssertionError("unreachable");
       }
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java
index 72b6acffde..af8d5f1e4e 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java
@@ -1,5 +1,6 @@
 package org.lflang.analyses.statespace;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -15,51 +16,73 @@ public class StateSpaceNode {
   private Tag tag;
   private TimeValue time; // Readable representation of tag.timestamp
   private Set<ReactionInstance> reactionsInvoked;
-  private ArrayList<Event> eventQ;
+  private ArrayList<Event> eventQcopy; // A snapshot of the eventQ represented as an ArrayList
 
-  public StateSpaceNode(Tag tag, Set<ReactionInstance> reactionsInvoked, ArrayList<Event> eventQ) {
+  public StateSpaceNode(
+      Tag tag, Set<ReactionInstance> reactionsInvoked, ArrayList<Event> eventQcopy) {
     this.tag = tag;
-    this.eventQ = eventQ;
+    this.eventQcopy = eventQcopy;
     this.reactionsInvoked = reactionsInvoked;
     this.time = TimeValue.fromNanoSeconds(tag.timestamp);
   }
 
   /**
-   * Assuming both eventQs have the same length, for each pair of events in eventQ1 and eventQ2,
-   * check if the time distances between the node's tag and the two events' tags are equal.
+   * Check if two state space nodes have the same time distance from their respective future events.
+   * Given eventQs from both nodes have the same length, check if the time distances between the two
+   * nodes' tags and the tags of a pair of events are equal, for all pairs of events (one from n1's
+   * eventQ and the other from n2's eventQ),.
    */
-  private boolean equidistant(StateSpaceNode n1, StateSpaceNode n2) {
-    if (n1.eventQ.size() != n2.eventQ.size()) return false;
-    for (int i = 0; i < n1.eventQ.size(); i++) {
-      if (n1.eventQ.get(i).getTag().timestamp - n1.getTag().timestamp
-          != n2.eventQ.get(i).getTag().timestamp - n2.getTag().timestamp) {
+  private boolean equidistantNodes(StateSpaceNode n1, StateSpaceNode n2) {
+    if (n1.eventQcopy.size() != n2.eventQcopy.size()) return false;
+    for (int i = 0; i < n1.eventQcopy.size(); i++) {
+      if (n1.eventQcopy.get(i).getTag().timestamp - n1.getTag().timestamp
+          != n2.eventQcopy.get(i).getTag().timestamp - n2.getTag().timestamp) {
         return false;
       }
     }
     return true;
   }
 
+  /**
+   * Check if two event queues are analogous, meaning that 1) the two event queues have the same
+   * size, and 2) each pair of events has the same triggers.
+   */
+  private boolean analogousEventQs(ArrayList<Event> q1, ArrayList<Event> q2) {
+    if (q1.size() != q2.size()) return false;
+    for (int i = 0; i < q1.size(); i++) {
+      if (!q1.get(i).hasSameTriggers(q2.get(i))) return false;
+    }
+    return true;
+  }
+
   /** Two methods for pretty printing */
   public void display() {
-    System.out.println("(" + this.time + ", " + reactionsInvoked + ", " + eventQ + ")");
+    System.out.println("(" + this.time + ", " + reactionsInvoked + ", " + eventQcopy + ")");
   }
 
   public String toString() {
-    return "(" + this.time + ", " + reactionsInvoked + ", " + eventQ + ")";
+    return "(" + this.time + ", " + reactionsInvoked + ", " + eventQcopy + ")";
   }
 
   /**
-   * This equals method does NOT compare tags, only compares reactionsInvoked, eventQ, and whether
-   * future events are equally distant.
+   * This equals method does NOT compare tags, only compares reactionsInvoked, eventQcopy, and
+   * whether future events are equally distant.
+   *
+   * <p>FIXME: Where is this used? This is not used!!!
    */
   @Override
   public boolean equals(Object o) {
+    try {
+      throw new IOException();
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
     if (o == null) return false;
     if (o instanceof StateSpaceNode) {
       StateSpaceNode node = (StateSpaceNode) o;
       if (this.reactionsInvoked.equals(node.reactionsInvoked)
-          && this.eventQ.equals(node.eventQ)
-          && equidistant(this, node)) return true;
+          && analogousEventQs(this.eventQcopy, node.eventQcopy)
+          && equidistantNodes(this, node)) return true;
     }
     return false;
   }
@@ -78,7 +101,7 @@ public int hash() {
 
     // Generate hash for the triggers in the queued events.
     List<String> eventNames =
-        this.eventQ.stream()
+        this.eventQcopy.stream()
             .map(Event::getTrigger)
             .map(TriggerInstance::getFullName)
             .collect(Collectors.toList());
@@ -86,7 +109,7 @@ public int hash() {
 
     // Generate hash for the time differences.
     List<Long> timeDiff =
-        this.eventQ.stream()
+        this.eventQcopy.stream()
             .map(
                 e -> {
                   return e.getTag().timestamp - this.tag.timestamp;
@@ -117,11 +140,11 @@ public Set<ReactionInstance> getReactionsInvoked() {
     return reactionsInvoked;
   }
 
-  public ArrayList<Event> getEventQ() {
-    return eventQ;
+  public ArrayList<Event> getEventQcopy() {
+    return eventQcopy;
   }
 
-  public void setEventQ(ArrayList<Event> list) {
-    eventQ = list;
+  public void setEventQcopy(ArrayList<Event> list) {
+    eventQcopy = list;
   }
 }

From 55583e15a9f77eb7ea72ac2f4df31bfb145b5cb1 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Tue, 4 Jul 2023 18:12:47 +0200
Subject: [PATCH 0560/1114] Prune unused code

---
 .../analyses/statespace/StateSpaceNode.java   | 65 +++----------------
 1 file changed, 8 insertions(+), 57 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java
index af8d5f1e4e..0061853157 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceNode.java
@@ -1,6 +1,5 @@
 package org.lflang.analyses.statespace;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -26,35 +25,6 @@ public StateSpaceNode(
     this.time = TimeValue.fromNanoSeconds(tag.timestamp);
   }
 
-  /**
-   * Check if two state space nodes have the same time distance from their respective future events.
-   * Given eventQs from both nodes have the same length, check if the time distances between the two
-   * nodes' tags and the tags of a pair of events are equal, for all pairs of events (one from n1's
-   * eventQ and the other from n2's eventQ),.
-   */
-  private boolean equidistantNodes(StateSpaceNode n1, StateSpaceNode n2) {
-    if (n1.eventQcopy.size() != n2.eventQcopy.size()) return false;
-    for (int i = 0; i < n1.eventQcopy.size(); i++) {
-      if (n1.eventQcopy.get(i).getTag().timestamp - n1.getTag().timestamp
-          != n2.eventQcopy.get(i).getTag().timestamp - n2.getTag().timestamp) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Check if two event queues are analogous, meaning that 1) the two event queues have the same
-   * size, and 2) each pair of events has the same triggers.
-   */
-  private boolean analogousEventQs(ArrayList<Event> q1, ArrayList<Event> q2) {
-    if (q1.size() != q2.size()) return false;
-    for (int i = 0; i < q1.size(); i++) {
-      if (!q1.get(i).hasSameTriggers(q2.get(i))) return false;
-    }
-    return true;
-  }
-
   /** Two methods for pretty printing */
   public void display() {
     System.out.println("(" + this.time + ", " + reactionsInvoked + ", " + eventQcopy + ")");
@@ -65,32 +35,12 @@ public String toString() {
   }
 
   /**
-   * This equals method does NOT compare tags, only compares reactionsInvoked, eventQcopy, and
-   * whether future events are equally distant.
-   *
-   * <p>FIXME: Where is this used? This is not used!!!
-   */
-  @Override
-  public boolean equals(Object o) {
-    try {
-      throw new IOException();
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
-    if (o == null) return false;
-    if (o instanceof StateSpaceNode) {
-      StateSpaceNode node = (StateSpaceNode) o;
-      if (this.reactionsInvoked.equals(node.reactionsInvoked)
-          && analogousEventQs(this.eventQcopy, node.eventQcopy)
-          && equidistantNodes(this, node)) return true;
-    }
-    return false;
-  }
-
-  /**
-   * Generate hash for the node. This hash function is used for checking the uniqueness of nodes. It
-   * is not meant to be used as a hashCode() because doing so interferes with node insertion in the
-   * state space diagram.
+   * Generate hash for the node. This hash function is used for checking whether two nodes are
+   * analogous, meaning that 1) they have the same reactions invoked at their tags, 2) the queued
+   * events have the same triggers, and 3) the time offsets between future events' tags of one node
+   * and its tag are the same as the time offsets between future events' tags of the other node and
+   * the other node's tag. The hash() method is not meant to replace the hashCode() method because
+   * doing so changes the way nodes are inserted in the state space diagram.
    */
   public int hash() {
     // Initial value
@@ -107,7 +57,8 @@ public int hash() {
             .collect(Collectors.toList());
     result = 31 * result + eventNames.hashCode();
 
-    // Generate hash for the time differences.
+    // Generate hash for a list of time differences between future events' tags and
+    // the current tag.
     List<Long> timeDiff =
         this.eventQcopy.stream()
             .map(

From 8b21944c26e6e9d9a61579527241e9ba180a0393 Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Wed, 5 Jul 2023 15:49:18 +0900
Subject: [PATCH 0561/1114] Rename `TimeValue.NEVER()` to `TimeValue.never()`

---
 .../java/org/lflang/federated/extensions/TSExtension.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 68f91853cc..84d6e76edb 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -205,7 +205,7 @@ private List<String> getUpstreamConnectionDelays(FederateInstance federate) {
         if (delays != null) {
           for (Expression delay : delays) {
             if (delay == null) {
-              element += "TimeValue.NEVER()";
+              element += "TimeValue.never()";
             } else {
               element += "TimeValue.nsec(" + getNetworkDelayLiteral(delay) + ")";
             }
@@ -215,7 +215,7 @@ private List<String> getUpstreamConnectionDelays(FederateInstance federate) {
             }
           }
         } else {
-          element += "TimeValue.NEVER()";
+          element += "TimeValue.never()";
         }
         element += "]";
         candidates.add(element);

From 3f8a1f69b4846780d7c2e966f11d37089b6606a4 Mon Sep 17 00:00:00 2001
From: revol-xut <revol-xut@protonmail.com>
Date: Wed, 5 Jul 2023 11:16:17 +0200
Subject: [PATCH 0562/1114] removing verbose null ptr check

---
 .../org/lflang/generator/cpp/CppAssembleMethodGenerator.kt      | 2 +-
 core/src/main/resources/lib/cpp/reactor-cpp                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
index c8ffec605b..bcce92a055 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
@@ -101,7 +101,7 @@ class CppAssembleMethodGenerator(private val reactor: Reactor) {
     }
 
     private val Connection.cppDelay: String 
-        get() = if (delay != null) "${delay.toCppTime()}" else "0s"
+        get() = delay?.toCppTime() ?: "0s"
 
     private val Connection.properties: String
         get() = "reactor::ConnectionProperties{$cppType, $cppDelay, nullptr}"
diff --git a/core/src/main/resources/lib/cpp/reactor-cpp b/core/src/main/resources/lib/cpp/reactor-cpp
index 4d1d18fca6..251299abc4 160000
--- a/core/src/main/resources/lib/cpp/reactor-cpp
+++ b/core/src/main/resources/lib/cpp/reactor-cpp
@@ -1 +1 @@
-Subproject commit 4d1d18fca678fa89242944c560fb42bff6eb8652
+Subproject commit 251299abc425aff74d05fa203a95691986ee0ef4

From 460f1c824e7b52f92897b855ea8c5b096ab2ae15 Mon Sep 17 00:00:00 2001
From: revol-xut <revol-xut@protonmail.com>
Date: Wed, 5 Jul 2023 12:49:23 +0200
Subject: [PATCH 0563/1114] updating reactor-cpp

---
 core/src/main/resources/lib/cpp/reactor-cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/cpp/reactor-cpp b/core/src/main/resources/lib/cpp/reactor-cpp
index 251299abc4..5775399706 160000
--- a/core/src/main/resources/lib/cpp/reactor-cpp
+++ b/core/src/main/resources/lib/cpp/reactor-cpp
@@ -1 +1 @@
-Subproject commit 251299abc425aff74d05fa203a95691986ee0ef4
+Subproject commit 5775399706b217a775a81aba9a2c024998a0ca64

From 9bb39cf217310b93e95f464e2601ddeca93c234a Mon Sep 17 00:00:00 2001
From: "Shaokai (Jerry) Lin" <shaokai@berkeley.edu>
Date: Wed, 5 Jul 2023 15:37:49 +0200
Subject: [PATCH 0564/1114] Apply suggestions from @lhstrh

Co-authored-by: Marten Lohstroh <marten@berkeley.edu>
---
 buildSrc/src/main/groovy/org.lflang.antlr-conventions.gradle    | 2 +-
 core/src/main/antlr/MTLLexer.g4                                 | 2 +-
 .../main/java/org/lflang/analyses/cast/AbstractAstVisitor.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/groovy/org.lflang.antlr-conventions.gradle b/buildSrc/src/main/groovy/org.lflang.antlr-conventions.gradle
index 291cba30ae..096e0636b3 100644
--- a/buildSrc/src/main/groovy/org.lflang.antlr-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.lflang.antlr-conventions.gradle
@@ -11,6 +11,6 @@ dependencies {
 }
 
 if (project.tasks.findByName('compileKotlin')) {
-    // make all kotlin compile tasks depent on the antl generation tasks
+    // make all kotlin compile tasks dependent on the antl generation tasks
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).each(it -> it.dependsOn(tasks.withType(AntlrTask)))
 }
diff --git a/core/src/main/antlr/MTLLexer.g4 b/core/src/main/antlr/MTLLexer.g4
index b8fe9c118d..5d0b803ff8 100644
--- a/core/src/main/antlr/MTLLexer.g4
+++ b/core/src/main/antlr/MTLLexer.g4
@@ -114,4 +114,4 @@ INTEGER
 
 ID
     : ([a-zA-Z0-9]|'_')+
-    ;
\ No newline at end of file
+    ;
diff --git a/core/src/main/java/org/lflang/analyses/cast/AbstractAstVisitor.java b/core/src/main/java/org/lflang/analyses/cast/AbstractAstVisitor.java
index c780a9c682..732dad8fc6 100644
--- a/core/src/main/java/org/lflang/analyses/cast/AbstractAstVisitor.java
+++ b/core/src/main/java/org/lflang/analyses/cast/AbstractAstVisitor.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-/** Modeled after AbstractParseTreeVisitor.class */
+/** Modeled after {@link AbstractParseTreeVisitor}. */
 public abstract class AbstractAstVisitor<T> implements AstVisitor<T> {
 
   @Override

From 9b5a6f8ed5b2d3a8837b2e29cd9298d3cb37dc47 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 5 Jul 2023 16:10:43 +0200
Subject: [PATCH 0565/1114] Apply suggestions from @lhstrh

---
 core/src/main/java/org/lflang/FileConfig.java |  2 +-
 .../{cast => c}/AbstractAstVisitor.java       |  2 +-
 .../lflang/analyses/{cast => c}/AstUtils.java |  2 +-
 .../analyses/{cast => c}/AstVisitor.java      |  2 +-
 .../{cast => c}/BuildAstParseTreeVisitor.java |  2 +-
 .../org/lflang/analyses/{cast => c}/CAst.java |  2 +-
 .../analyses/{cast => c}/CAstVisitor.java     |  2 +-
 .../analyses/{cast => c}/CBaseAstVisitor.java |  2 +-
 .../analyses/{cast => c}/CToUclidVisitor.java |  4 +--
 .../{cast => c}/IfNormalFormAstVisitor.java   |  2 +-
 .../VariablePrecedenceVisitor.java            |  5 ++--
 .../analyses/{cast => c}/Visitable.java       |  2 +-
 .../statespace/StateSpaceExplorer.java        | 25 ++++++-------------
 .../lflang/analyses/uclid/UclidGenerator.java | 12 ++++-----
 14 files changed, 28 insertions(+), 38 deletions(-)
 rename core/src/main/java/org/lflang/analyses/{cast => c}/AbstractAstVisitor.java (91%)
 rename core/src/main/java/org/lflang/analyses/{cast => c}/AstUtils.java (98%)
 rename core/src/main/java/org/lflang/analyses/{cast => c}/AstVisitor.java (95%)
 rename core/src/main/java/org/lflang/analyses/{cast => c}/BuildAstParseTreeVisitor.java (99%)
 rename core/src/main/java/org/lflang/analyses/{cast => c}/CAst.java (99%)
 rename core/src/main/java/org/lflang/analyses/{cast => c}/CAstVisitor.java (99%)
 rename core/src/main/java/org/lflang/analyses/{cast => c}/CBaseAstVisitor.java (99%)
 rename core/src/main/java/org/lflang/analyses/{cast => c}/CToUclidVisitor.java (99%)
 rename core/src/main/java/org/lflang/analyses/{cast => c}/IfNormalFormAstVisitor.java (99%)
 rename core/src/main/java/org/lflang/analyses/{cast => c}/VariablePrecedenceVisitor.java (90%)
 rename core/src/main/java/org/lflang/analyses/{cast => c}/Visitable.java (90%)

diff --git a/core/src/main/java/org/lflang/FileConfig.java b/core/src/main/java/org/lflang/FileConfig.java
index 9012e0963d..eb2d53c655 100644
--- a/core/src/main/java/org/lflang/FileConfig.java
+++ b/core/src/main/java/org/lflang/FileConfig.java
@@ -33,7 +33,7 @@ public abstract class FileConfig {
   public static final String DEFAULT_SRC_GEN_DIR = "src-gen";
 
   /** Default name of the directory to store generated verification models in. */
-  public static final String DEFAULT_MODEL_GEN_DIR = "model-gen";
+  public static final String DEFAULT_MODEL_GEN_DIR = "mod-gen";
 
   // Public fields.
 
diff --git a/core/src/main/java/org/lflang/analyses/cast/AbstractAstVisitor.java b/core/src/main/java/org/lflang/analyses/c/AbstractAstVisitor.java
similarity index 91%
rename from core/src/main/java/org/lflang/analyses/cast/AbstractAstVisitor.java
rename to core/src/main/java/org/lflang/analyses/c/AbstractAstVisitor.java
index 732dad8fc6..c279f962d6 100644
--- a/core/src/main/java/org/lflang/analyses/cast/AbstractAstVisitor.java
+++ b/core/src/main/java/org/lflang/analyses/c/AbstractAstVisitor.java
@@ -1,4 +1,4 @@
-package org.lflang.analyses.cast;
+package org.lflang.analyses.c;
 
 import java.util.List;
 
diff --git a/core/src/main/java/org/lflang/analyses/cast/AstUtils.java b/core/src/main/java/org/lflang/analyses/c/AstUtils.java
similarity index 98%
rename from core/src/main/java/org/lflang/analyses/cast/AstUtils.java
rename to core/src/main/java/org/lflang/analyses/c/AstUtils.java
index 65f1c28852..c3ac49b6fd 100644
--- a/core/src/main/java/org/lflang/analyses/cast/AstUtils.java
+++ b/core/src/main/java/org/lflang/analyses/c/AstUtils.java
@@ -1,4 +1,4 @@
-package org.lflang.analyses.cast;
+package org.lflang.analyses.c;
 
 import java.util.List;
 import org.antlr.v4.runtime.ParserRuleContext;
diff --git a/core/src/main/java/org/lflang/analyses/cast/AstVisitor.java b/core/src/main/java/org/lflang/analyses/c/AstVisitor.java
similarity index 95%
rename from core/src/main/java/org/lflang/analyses/cast/AstVisitor.java
rename to core/src/main/java/org/lflang/analyses/c/AstVisitor.java
index b19e5cbfc7..d25c9d0364 100644
--- a/core/src/main/java/org/lflang/analyses/cast/AstVisitor.java
+++ b/core/src/main/java/org/lflang/analyses/c/AstVisitor.java
@@ -1,4 +1,4 @@
-package org.lflang.analyses.cast;
+package org.lflang.analyses.c;
 
 import java.util.List;
 
diff --git a/core/src/main/java/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java b/core/src/main/java/org/lflang/analyses/c/BuildAstParseTreeVisitor.java
similarity index 99%
rename from core/src/main/java/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
rename to core/src/main/java/org/lflang/analyses/c/BuildAstParseTreeVisitor.java
index aa9fd1917d..e8923a2ce4 100644
--- a/core/src/main/java/org/lflang/analyses/cast/BuildAstParseTreeVisitor.java
+++ b/core/src/main/java/org/lflang/analyses/c/BuildAstParseTreeVisitor.java
@@ -1,4 +1,4 @@
-package org.lflang.analyses.cast;
+package org.lflang.analyses.c;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/core/src/main/java/org/lflang/analyses/cast/CAst.java b/core/src/main/java/org/lflang/analyses/c/CAst.java
similarity index 99%
rename from core/src/main/java/org/lflang/analyses/cast/CAst.java
rename to core/src/main/java/org/lflang/analyses/c/CAst.java
index 2126902da9..4bb391be00 100644
--- a/core/src/main/java/org/lflang/analyses/cast/CAst.java
+++ b/core/src/main/java/org/lflang/analyses/c/CAst.java
@@ -1,4 +1,4 @@
-package org.lflang.analyses.cast;
+package org.lflang.analyses.c;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/org/lflang/analyses/cast/CAstVisitor.java b/core/src/main/java/org/lflang/analyses/c/CAstVisitor.java
similarity index 99%
rename from core/src/main/java/org/lflang/analyses/cast/CAstVisitor.java
rename to core/src/main/java/org/lflang/analyses/c/CAstVisitor.java
index 034a93449c..d3c8f5c28d 100644
--- a/core/src/main/java/org/lflang/analyses/cast/CAstVisitor.java
+++ b/core/src/main/java/org/lflang/analyses/c/CAstVisitor.java
@@ -1,4 +1,4 @@
-package org.lflang.analyses.cast;
+package org.lflang.analyses.c;
 
 import java.util.List;
 
diff --git a/core/src/main/java/org/lflang/analyses/cast/CBaseAstVisitor.java b/core/src/main/java/org/lflang/analyses/c/CBaseAstVisitor.java
similarity index 99%
rename from core/src/main/java/org/lflang/analyses/cast/CBaseAstVisitor.java
rename to core/src/main/java/org/lflang/analyses/c/CBaseAstVisitor.java
index ce212c53a7..11c2df3ef6 100644
--- a/core/src/main/java/org/lflang/analyses/cast/CBaseAstVisitor.java
+++ b/core/src/main/java/org/lflang/analyses/c/CBaseAstVisitor.java
@@ -1,4 +1,4 @@
-package org.lflang.analyses.cast;
+package org.lflang.analyses.c;
 
 import java.util.List;
 
diff --git a/core/src/main/java/org/lflang/analyses/cast/CToUclidVisitor.java b/core/src/main/java/org/lflang/analyses/c/CToUclidVisitor.java
similarity index 99%
rename from core/src/main/java/org/lflang/analyses/cast/CToUclidVisitor.java
rename to core/src/main/java/org/lflang/analyses/c/CToUclidVisitor.java
index 634045a10e..0608387abb 100644
--- a/core/src/main/java/org/lflang/analyses/cast/CToUclidVisitor.java
+++ b/core/src/main/java/org/lflang/analyses/c/CToUclidVisitor.java
@@ -1,8 +1,8 @@
-package org.lflang.analyses.cast;
+package org.lflang.analyses.c;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.lflang.analyses.cast.CAst.*;
+import org.lflang.analyses.c.CAst.*;
 import org.lflang.analyses.uclid.UclidGenerator;
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.NamedInstance;
diff --git a/core/src/main/java/org/lflang/analyses/cast/IfNormalFormAstVisitor.java b/core/src/main/java/org/lflang/analyses/c/IfNormalFormAstVisitor.java
similarity index 99%
rename from core/src/main/java/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
rename to core/src/main/java/org/lflang/analyses/c/IfNormalFormAstVisitor.java
index a8ad9e8284..d51bec6aad 100644
--- a/core/src/main/java/org/lflang/analyses/cast/IfNormalFormAstVisitor.java
+++ b/core/src/main/java/org/lflang/analyses/c/IfNormalFormAstVisitor.java
@@ -1,4 +1,4 @@
-package org.lflang.analyses.cast;
+package org.lflang.analyses.c;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/org/lflang/analyses/cast/VariablePrecedenceVisitor.java b/core/src/main/java/org/lflang/analyses/c/VariablePrecedenceVisitor.java
similarity index 90%
rename from core/src/main/java/org/lflang/analyses/cast/VariablePrecedenceVisitor.java
rename to core/src/main/java/org/lflang/analyses/c/VariablePrecedenceVisitor.java
index 944245d6ef..9354e36269 100644
--- a/core/src/main/java/org/lflang/analyses/cast/VariablePrecedenceVisitor.java
+++ b/core/src/main/java/org/lflang/analyses/c/VariablePrecedenceVisitor.java
@@ -1,6 +1,6 @@
-package org.lflang.analyses.cast;
+package org.lflang.analyses.c;
 
-import org.lflang.analyses.cast.CAst.*;
+import org.lflang.analyses.c.CAst.*;
 
 /** This visitor marks certain variable node as "previous." */
 public class VariablePrecedenceVisitor extends CBaseAstVisitor<Void> {
@@ -9,7 +9,6 @@ public class VariablePrecedenceVisitor extends CBaseAstVisitor<Void> {
   // e.g., self->s = (self->s + 1) - (2 * 2).
   @Override
   public Void visitAssignmentNode(AssignmentNode node) {
-    // System.out.println("******* In assignment!!!");
     if (node.left instanceof StateVarNode) {
       if (node.right instanceof AstNodeBinary) {
         AstNodeBinary n = (AstNodeBinary) node.right;
diff --git a/core/src/main/java/org/lflang/analyses/cast/Visitable.java b/core/src/main/java/org/lflang/analyses/c/Visitable.java
similarity index 90%
rename from core/src/main/java/org/lflang/analyses/cast/Visitable.java
rename to core/src/main/java/org/lflang/analyses/c/Visitable.java
index 458d629bc2..cbdea446ca 100644
--- a/core/src/main/java/org/lflang/analyses/cast/Visitable.java
+++ b/core/src/main/java/org/lflang/analyses/c/Visitable.java
@@ -1,4 +1,4 @@
-package org.lflang.analyses.cast;
+package org.lflang.analyses.c;
 
 import java.util.List;
 
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
index 3d22bc7fbd..48f407914f 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
@@ -18,7 +18,10 @@
 import org.lflang.lf.Time;
 import org.lflang.lf.Variable;
 
-/** Explores the state space of an LF program. */
+/**
+ * (EXPERIMENTAL) Explores the state space of an LF program. Use with caution since this is
+ * experimental code.
+ */
 public class StateSpaceExplorer {
 
   // Instantiate an empty state space diagram.
@@ -69,7 +72,9 @@ public void addInitialEvents(ReactorInstance reactor) {
    * space during exploration. If a loop is found (i.e. a previously encountered state is reached
    * again) during exploration, the function returns early.
    *
-   * <p>TODOs: 1. Handle action with 0 min delay. 2. Check if zero-delay connection works.
+   * <p>TODOs: 1. Handle action with 0 minimum delay.
+   *
+   * <p>Note: This is experimental code which is to be refactored in a future PR. Use with caution.
    */
   public void explore(Tag horizon, boolean findLoop) {
     // Traverse the main reactor instance recursively to find
@@ -77,7 +82,6 @@ public void explore(Tag horizon, boolean findLoop) {
     // FIXME: It seems that we need to handle shutdown triggers
     // separately, because they could break the back loop.
     addInitialEvents(this.main);
-    // System.out.println("DEBUG: Event queue: " + this.eventQ);
 
     Tag previousTag = null; // Tag in the previous loop ITERATION
     Tag currentTag = null; // Tag in the current  loop ITERATION
@@ -102,10 +106,8 @@ public void explore(Tag horizon, boolean findLoop) {
       // FIXME: Use stream methods here?
       while (eventQ.size() > 0 && eventQ.peek().getTag().compareTo(currentTag) == 0) {
         Event e = eventQ.poll();
-        // System.out.println("DEBUG: Popped an event: " + e);
         currentEvents.add(e);
       }
-      // System.out.println("DEBUG: currentEvents: " + currentEvents);
 
       // Collect all the reactions invoked in this current LOOP ITERATION
       // triggered by the earliest events.
@@ -116,8 +118,6 @@ public void explore(Tag horizon, boolean findLoop) {
       for (Event e : currentEvents) {
         Set<ReactionInstance> dependentReactions = e.getTrigger().getDependentReactions();
         reactionsTemp.addAll(dependentReactions);
-        // System.out.println("DEBUG: dependentReactions: " + dependentReactions);
-        // System.out.println("DEBUG: ReactionTemp: " + reactionsTemp);
 
         // If the event is a timer firing, enqueue the next firing.
         if (e.getTrigger() instanceof TimerInstance) {
@@ -161,7 +161,6 @@ public void explore(Tag horizon, boolean findLoop) {
                 // Create and enqueue a new event.
                 Event e =
                     new Event(downstreamPort, new Tag(currentTag.timestamp + delay, 0, false));
-                // System.out.println("DEBUG: Added a port event: " + e);
                 eventQ.add(e);
               }
             }
@@ -175,7 +174,6 @@ public void explore(Tag horizon, boolean findLoop) {
             // Create and enqueue a new event.
             Event e =
                 new Event(effect, new Tag(currentTag.timestamp + min_delay, microstep, false));
-            // System.out.println("DEBUG: Added an action event: " + e);
             eventQ.add(e);
           }
         }
@@ -184,7 +182,6 @@ public void explore(Tag horizon, boolean findLoop) {
       // We are at the first iteration.
       // Initialize currentNode.
       if (previousTag == null) {
-        // System.out.println("DEBUG: Case 1");
         //// Now we are done with the node at the previous tag,
         //// work on the new node at the current timestamp.
         // Copy the reactions in reactionsTemp.
@@ -212,7 +209,6 @@ public void explore(Tag horizon, boolean findLoop) {
       // at the timestamp-level, so that we don't have to
       // worry about microsteps.
       else if (previousTag != null && currentTag.timestamp > previousTag.timestamp) {
-        // System.out.println("DEBUG: Case 2");
         // Whenever we finish a tag, check for loops fist.
         // If currentNode matches an existing node in uniqueNodes,
         // duplicate is set to the existing node.
@@ -274,14 +270,13 @@ else if (previousTag != null && currentTag.timestamp > previousTag.timestamp) {
       // Timestamp does not advance because we are processing
       // connections with zero delay.
       else if (previousTag != null && currentTag.timestamp == previousTag.timestamp) {
-        // System.out.println("DEBUG: Case 3");
         // Add reactions explored in the current loop iteration
         // to the existing state space node.
         currentNode.getReactionsInvoked().addAll(reactionsTemp);
         // Update the eventQ snapshot.
         currentNode.setEventQcopy(new ArrayList<Event>(eventQ));
       } else {
-        throw new AssertionError("unreachable");
+        throw new AssertionError("Unreachable");
       }
 
       // Update the current tag for the next iteration.
@@ -294,12 +289,8 @@ else if (previousTag != null && currentTag.timestamp == previousTag.timestamp) {
       // 1. the event queue is empty, or
       // 2. the horizon is reached.
       if (eventQ.size() == 0) {
-        // System.out.println("DEBUG: Stopping because eventQ is empty!");
         stop = true;
       } else if (currentTag.timestamp > horizon.timestamp) {
-        // System.out.println("DEBUG: Stopping because horizon is reached! Horizon: " + horizon +
-        // "Current Tag: " + currentTag);
-        // System.out.println("DEBUG: EventQ: " + eventQ);
         stop = true;
       }
     }
diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
index d188d83ae4..7421b8fd7b 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -40,12 +40,12 @@
 import org.lflang.Target;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
-import org.lflang.analyses.cast.AstUtils;
-import org.lflang.analyses.cast.BuildAstParseTreeVisitor;
-import org.lflang.analyses.cast.CAst;
-import org.lflang.analyses.cast.CToUclidVisitor;
-import org.lflang.analyses.cast.IfNormalFormAstVisitor;
-import org.lflang.analyses.cast.VariablePrecedenceVisitor;
+import org.lflang.analyses.c.AstUtils;
+import org.lflang.analyses.c.BuildAstParseTreeVisitor;
+import org.lflang.analyses.c.CAst;
+import org.lflang.analyses.c.CToUclidVisitor;
+import org.lflang.analyses.c.IfNormalFormAstVisitor;
+import org.lflang.analyses.c.VariablePrecedenceVisitor;
 import org.lflang.analyses.statespace.StateSpaceDiagram;
 import org.lflang.analyses.statespace.StateSpaceExplorer;
 import org.lflang.analyses.statespace.StateSpaceNode;

From eeedef705e81270a3f43502e451ade18aff1fd16 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 5 Jul 2023 16:12:21 +0200
Subject: [PATCH 0566/1114] Fix typo

---
 core/src/main/java/org/lflang/TargetProperty.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 27fafee00d..aa091af3cd 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -410,7 +410,7 @@ public enum TargetProperty {
         config.noRuntimeValidation = ASTUtils.toBoolean(value);
       }),
 
-  /** Directive to not check the generated verification model. */
+  /** Directive to check the generated verification model. */
   VERIFY(
       "verify",
       PrimitiveType.BOOLEAN,

From 6a1109ed4d902958acb1e9f60cdada77f93500c1 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 5 Jul 2023 16:59:40 +0200
Subject: [PATCH 0567/1114] Remove the unused global variable

---
 .../main/java/org/lflang/analyses/uclid/UclidGenerator.java | 3 +--
 core/src/main/java/org/lflang/ast/ASTUtils.java             | 4 ----
 core/src/main/java/org/lflang/generator/GeneratorBase.java  | 6 ------
 core/src/main/java/org/lflang/generator/c/CGenerator.java   | 4 +---
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
index 7421b8fd7b..17d71da304 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -194,8 +194,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
 
     // Create the main reactor instance if there is a main reactor.
     this.main =
-        ASTUtils.createMainReactorInstance(
-            mainDef, reactors, hasDeadlines, messageReporter, targetConfig);
+        ASTUtils.createMainReactorInstance(mainDef, reactors, messageReporter, targetConfig);
 
     // Extract information from the named instances.
     populateDataStructures();
diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 7e686dd190..1789c79ead 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -595,7 +595,6 @@ public static <T extends EObject> List<T> collectElements(
   public static ReactorInstance createMainReactorInstance(
       Instantiation mainDef,
       List<Reactor> reactors,
-      boolean hasDeadlines,
       MessageReporter messageReporter,
       TargetConfig targetConfig) {
     if (mainDef != null) {
@@ -609,9 +608,6 @@ public static ReactorInstance createMainReactorInstance(
             .error("Main reactor has causality cycles. Skipping code generation.");
         return null;
       }
-      if (hasDeadlines) {
-        main.assignDeadlines();
-      }
       // Inform the run-time of the breadth/parallelism of the reaction graph
       var breadth = reactionInstanceGraph.getBreadth();
       if (breadth == 0) {
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 1983b3a145..dde30f5580 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -144,12 +144,6 @@ public Instantiation getMainDef() {
   /** Indicates whether the current Lingua Franca program contains model reactors. */
   public boolean hasModalReactors = false;
 
-  /**
-   * Indicates whether the program has any deadlines and thus needs to propagate deadlines through
-   * the reaction instance graph
-   */
-  public boolean hasDeadlines = false;
-
   /** Indicates whether the program has any watchdogs. This is used to check for support. */
   public boolean hasWatchdogs = false;
 
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index adf6f341b8..5825d4043f 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -1957,10 +1957,8 @@ protected void setUpGeneralParameters() {
         "LOG_LEVEL", String.valueOf(targetConfig.logLevel.ordinal()));
     targetConfig.compileAdditionalSources.addAll(CCoreFilesUtils.getCTargetSrc());
     // Create the main reactor instance if there is a main reactor.
-    // FIXME: is `hasDeadlines` here always false? That does not look right.
     this.main =
-        ASTUtils.createMainReactorInstance(
-            mainDef, reactors, hasDeadlines, messageReporter, targetConfig);
+        ASTUtils.createMainReactorInstance(mainDef, reactors, messageReporter, targetConfig);
     if (hasModalReactors) {
       // So that each separate compile knows about modal reactors, do this:
       targetConfig.compileDefinitions.put("MODAL_REACTORS", "TRUE");

From ddb715b716967a74efe16dd065c515f00b6568ff Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 5 Jul 2023 11:06:19 -0700
Subject: [PATCH 0568/1114] Update org.lflang/src/lib/ts/package.json

---
 org.lflang/src/lib/ts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/lib/ts/package.json b/org.lflang/src/lib/ts/package.json
index cce1b96f9f..f619a1375f 100644
--- a/org.lflang/src/lib/ts/package.json
+++ b/org.lflang/src/lib/ts/package.json
@@ -2,7 +2,7 @@
     "name": "LinguaFrancaDefault",
     "type": "commonjs",
     "dependencies": {
-        "@lf-lang/reactor-ts": "^0.3.5",
+        "@lf-lang/reactor-ts": "^0.4.0",
         "command-line-args": "^5.1.1",
         "command-line-usage": "^6.1.3"
     },

From 6c499a820c2b885ea0ba7d13330f10a9bbeeee2c Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Wed, 5 Jul 2023 20:32:25 -0700
Subject: [PATCH 0569/1114] Update submodule to reactor-c/825fe82

This is expected to result in no segfaults but a leak.
---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 28c6380981..825fe825f8 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 28c63809819747595f47801e30facdff624a4a77
+Subproject commit 825fe825f857729b3c299a64c2aba176b4911dd7

From 2e80fd2a32805bb8bf8f1574b57c1d4a66aaa536 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Wed, 5 Jul 2023 20:58:22 -0700
Subject: [PATCH 0570/1114] Update submodule to rebased ref.

Due to failing enclave tests.
---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 825fe825f8..df0379be40 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 825fe825f857729b3c299a64c2aba176b4911dd7
+Subproject commit df0379be4048de8b2d4f43fd1bdb22d3252ceb62

From a194debad7678181ef86dc89720549a698ab0a86 Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Thu, 6 Jul 2023 18:26:01 +0200
Subject: [PATCH 0571/1114] Bumped eclipse related dependencies to latest
 releases

---
 gradle.properties | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 2164bf48ef..0485bd991a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,12 +9,12 @@ jacocoVersion=0.8.7
 jupiterVersion=5.8.2
 jUnitPlatformVersion=1.8.2
 kotlinJvmTarget=17
-lsp4jVersion=0.14.0
-mwe2LaunchVersion=2.12.2
+lsp4jVersion=0.21.0
+mwe2LaunchVersion=2.14.0
 openTest4jVersion=1.2.0
 picocliVersion=4.7.0
-resourcesVersion=3.16.0
-xtextVersion=2.28.0
+resourcesVersion=3.19.0
+xtextVersion=2.31.0
 klighdVersion=2.3.0.v20230606
 freehepVersion=2.4
 swtVersion=3.124.0
@@ -24,4 +24,4 @@ org.eclipse.xtext=xtextVersion
 org.eclipse.lsp4j=lsp4jVersion
 org.opentest4j=openTest4jVersion
 org.eclipse.core.resources=resourcesVersion
-org.junit.jupiter=jupiterVersion
\ No newline at end of file
+org.junit.jupiter=jupiterVersion

From c8f42c329d0718cba6dd7050cbbe01a18216a8a0 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 6 Jul 2023 11:14:13 -0700
Subject: [PATCH 0572/1114] Update Gradle Wrapper

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 58695 -> 62076 bytes
 gradle/wrapper/gradle-wrapper.properties |   3 +-
 gradlew                                  | 276 ++++++++++++++---------
 gradlew.bat                              |  38 ++--
 4 files changed, 186 insertions(+), 131 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f3d88b1c2faf2fc91d853cd5d4242b5547257070..c1962a79e29d3e0ab67b14947c167a862655af9b 100644
GIT binary patch
delta 42429
zcmaI7V{oQX(=8m^wrv{|+qP{xcbtixiETS~Y}?7in%Kr9XU_Z9dCz&OzWV;`-c`G=
zf2+IK)vJ4K68!TB98y^h90DV$05b^>9TX#p$>rZsK>oiE%%ly>|FS6%poAD0ARsU>
zARr(jAQ7i)Ues_PAcoi}L3Hc@fBY4~FGGfpqlXc(Sye3AoZ%*R1lZtVSlIZhbtp=t
z^pxeWWc|w+MzXV<C0a#m8#(M;_XSY*MG@{oF)kqJ??q4tn?gV2&X>H@XFso|8kcoP
zK;O~X&iCIJ|2bq~pPK*>u9zn{!-@mftrF3Zn4^2sj&AV*ISqAbXGlXp+1@dn<MSbA
zV7DrmVd=q&cN}s1>zyuSy_yO&>cy?E&npyW`vDhZd$sma$Zo}ff_Jm|2UbV729uMT
z3-k`tFR#}-Md6*&1I2E=@P0pxZmoe2^_qbX4URo<IH8Inm8MQ`FIt|Hv2D7nJ5o&I
zQK_RfspI6NDIhU=;8ro92<>I^Z%K5*es}bTb6+&{tqW#;KQ*R6#hx0S?wt)L_W^sL
zzb2Z%(by225Vf!{Gjd<S0jhr^oY7!098pS!Q91+c7hEshulmYYzTU!v?AP=Vr|O@3
z{9rL%@4xxTa;1<Z`9I=4U#>3%e)|>lm3#I5AaTtN)OCuwnAlGTR5*+z5Aj3%Y0sWW
zt);#a^A&J_36mY?=lj_7CCeq`6?)Q1twwrwe?BRgf-j&H$K*Gg$mo$PVAyh(?q736
zQqfhQNauJiM;}A1HWDV{E=m4VKqOqE$J#Lm7Vs?1K-s`#syoCulrDt9tvkvP;J)0T
z+nIA^;?=H{KxvZ-U>-0Eme?mRrQ%=ou*>*77mSBoW;mgDmn--^@-vgs&&(yXe5E*j
zLX6+CghKpBqx{nKPt<l(^>$S#Va<~ZUYvy1mh7moJc8s=B4_9E3fFo0JSuXThSm%c
zUoH#$C~#gCAB5lK<KtqiQdc;KC!~u>?5R>xkH6JX^*YB}0n83#2aHS3Hsw<nBxzS%
z=q=4;j!4LI7QcKXNDl~->!{$*1k4c198zBGx^I!OO((=lgcXM)meQFN(5$n9YXphY
zTE0l#7;w3tNQ2W1%>@ZJ+;Deh*+U~PxFB~e&`!m~My@Tz2Y2FW<s%1kr)$#o$+TU*
zmMuIcu{H6T03r`#I#6}wO|%&tm+7Gaf&%EVqtRf-kM@hJb4Li|iZsm4FWFZvf@$Y0
zikF;A6NQRXu7pIbPXj3*k1FNk82(DeZr;xvbSfS%IX^8YaXD?vYDI=>%Oxlwdt~6u
zcYGQ$qN^hU36`BP*6es<*zw{I5pr4daBW|O0)KpC1H3?~uJrj3#YC2Mu^r5^5V+$T
zG&w#|gjH{W5yXeo!@QKrfpmoI_Q8zbQn_}ow1H*&C$HflMz*h*finzQinES_oP#8`
zuZV%wdtP{f3BuMqQ75)Majb|g0!jnKoS(3O)m!Y(G=m`x<Jc;LiajU1uXuno^p~1(
zrPkdz;0+}KyVLFbHpnrdrBqcigw|Y!>N|M~9W0J$+;5#$jf;EHXIf~j6L2U4$|ziE
zoiEp6)43tr_O0@hCM=^oicM1YRlI|WPMkM;iBlfUF7AhhP?U05zI%}>Y86#gSlQ3F
ztO_j7=!zBbTo{@nLv;9IQK~hBWAS!*YH1@rfXx`1<hAm>QAyN@D*P@iU40ZK8BIgA
zffAJhKZp7JIK&|?UaAC-EFfGlLzCtr1*Kg6G|YlZG?d`y*i$O1t$w!cmU?1p&saS>
zl!F2T=2QvrI9j_fD(wJFB8;OEZms!hTK_6bn{g6zp&*LWlyOO|Moqk!Y7lLmA|;#w
z5Tc}0sA|cMf7}u)ux9-hpR&zC#65;Yr9`EZ*`u~(qX4vFB5xd=X6spYbDrxj;$C~P
z95RWHJ+0)j<H==7ezvbVe$`Y|pr$(cogATM8=C`pJR4wKx9W{_DZo~))?kN>@A-A9
z&Bn<uD+NsMF@d?v6pNWX9Q14|uC!(bH1x~Gc0ZL|acvNR?VDmf4xDdT2|E~z5HJzN
zIFbW_=6SPcY$|fht=K!%tC8Qo@WZt}?nTpTCmUYypEGQ7FRjd2mfGCLEEroNtulN|
zaaG{Xl8CxV1U7RIf8!ocdlTOCF<PI+gN!%}OgR(W$yz9(UeDhOJm7)H=Rhd|)MA)#
zW{4PKPOQ0``IwlipJElyuIkpyODC>VGaVZxfIixpo6RU?vURuH1>@rL#~M1#u?s*Z
zW)98h*UdpU*f#39(T=1=dd?-~^6##)CF|_s(5T-golZq7YLn$Ss`Qrm4z!~itelE@
zXhR+e{sSG@+(KWnK*jvz-Q;orpBXn*x%72ib{A|HIAv3@bHDhyy2BDKheXD`VK>FD
z&R_C$UMl9ccrWwUqEPaPheTGz(kC9m78c^&+(!PaIx4VD6;Z3bHb3w0pU`nyM_9h|
zvI<+YS>}Hxrb5*0)l2Qyoh?-gWz?|#kf(SQV91s_uzwJFuxW%uTbalJ=E{wD;LHCM
zm5;iQDKfv-JWz1+uFW8(C=t=+{Us06dby(WPLPy;F!xQ>s=HlLh-`qnXO<2^7P*vS
zhCp)WM%LIeN^4&O-b`(-ITO!pt_{vP2~h%x$V$TdLi&zp4l}&kLtQiM!od;tZS*;@
zLBWApeQ7))c0VOd??BQ3SxW0>=rl1k`9V&^zwZC0RN&x5E}p}`v)vLSy-&^+yB07g
zV-ns%wpc?wuvg?ktw}rALJ;SP6Vig$9uK(6=n+41S~V23nu5XWr4@);k5FKtTDU;T
zvB5z3G_|bEp?{CUGNf!C*QVi9H56$eR^isz*Jg#`z-U4-!GwhXG;nM1#?CbvE4Y-3
zg7*rzqBy}Rh{k@q)MSg3`$V!^XFZD(V>vsN91gYgz^-T~jI0M?uK$c_gxv-vf&zc$
z{SGl(hXen$htRgaVLhU-9+lk)-)_w9X!UwMNF)&56R(wj<BOy;)~cvYyuWmfBWMs6
zS@2*-L@78fwZobUP}!k?Vim8cb|$CHG3JOL7-W&ep#_H>b|%D_jJ+@OizV&FCG^Ll
z9KXVvR2nodaU3hf8KEtkHn1k~h)!xH+yJx5dtgjch{k#Qb=My3XiKz?qAiT{?oLj4
z4YGOyT1KdGm8c)grysTQlSeW_pDW(ixmS@-a<cv~KB>wdFlIU8IP=F8GqiW&uU8!n
zx!(g@)8rk__<?=AgdUbt<8q3<?(6qpzeMm1u08J9$jD`p&n4E$`dwVE#S2d^Uqats
zP^zU>1g43-MT9m3AL>6+R117RgfD^lWS&q=Q^so!+GN4O+r1A!|AHD`zTh^O%Z@%D
zu&b8>u|0hXK=ta5i+ipc&l*Y46);w2AzaZ{?z}DD1bnJCA{@(jVWs&fon2*6K5Z(4
zz~E7b8(s8#XZm&}@fz2g%Im458+5MddAsEtiV6Z6J7qyI0O@;eV6EKv1HD4s*{njU
zP+3E$v>6JSX9J|h9_e4{cNzhcGV3^-*n_KlhNw$ba%7l-e}@?vZAkSm+wNGLP}H)<
z9afFr=NF{6)YFuIq98jm6jM1|*CHTfPcZOE&o$ncuEGAq{x9D7KcsSVl*xtpAH8Hx
zfp!xlT@GfOia~>iQ;l(tVMmKmRRc!LKFG4UsX26j{2#uWV(Z5K-}JQE4Hp!ndB!ao
z?4Qy0Y=8j8NWtI2P5I-7oI;Wd-z?x~3i|IQ-{0t;Nm<y!ZN>>?fckfp2s=mmzr6PJ
z)ut~+FkBg+$J4;5Tt%{jN-xTs8UmxO40^0f1CzYhS88w}x<R=q;SZTVsMRkXDr@>#
zewP{RGV2(;s@jHw_MI~|o#WKY%g^o?`1N&<`GYu}f`d#`NvuAMYM5ep;Y33C+6BRR
z3p<MxmSBhgnMabs`%XC|Oo||ZcNE8VM$1-ceQF+%v>a#8U^kwbgC=*fydKuuN@<r_
zQbilnl%y34p_5RNWh-Q!aqi0Xy*Y?x6@7`eU5$_jD_G3J0Xr}_yV_}5Gk(FF43X@s
zJ6k&$LH7(<C^c^Z<au6HkCj;&&z|DHfRu*XjV+@c6<3@+!EC~FKf)1!jXZcPOJGz2
zX59m%aq!$7Hc}DUTOF!8M_C8v?du)1N;qIIB(z+`0vX3#o6_SLvm>f3(2tWHt^Qc7
z4-YWn>$tdBct0MyPvuEthNshwD}Fq;#la+YmvEmPJ6xza3z)16{9<s9=XA7)zEG&g
zIWRpngVA)07tvkyifv)5jDECXY(7KvIu-+fVEf+|XC77}r(_&tJexo@BU~wJ4Y6EG
zA9b`<o^}0(eVf;mIUdr`M<4z}n?y)Btr6r@Tk=yg)7TSC#Rk&}vKErH1PAJ?a<nRH
z;+dz79$(f*J`E$liWzS*;DmvX6V{%5lASkK^Zsp5nc2byfEm8v@artT@{g&yM$sTZ
z7D9biXT<!J;Tos%36au)D31}#g+X<f4)*FwrsogAWFzoQU9a0s<Eh7XA&_U+N#-jL
zO5fV~`@)pWN<@PH?|k;@+T3U0LY?(-gq%C`yi$_qQj6EpC49K>ASRsD^M0U`AGWTw
zJq90F3?3IWvs_V{d2I=~pZ*|bzpe^kmlSu%<KD8kw-`Gt^3TFNG*D;&{Vf&`ySLDj
z^qnvm{I-?F=3LaC_{k4CaTRIL0A9-aB8G?#@0p<~MDj;aqXb7YWlMt<OcQ2|?6{|^
zxCKW0ya>kdIajSdhBJi77HN)R@@nv3(Zu3aW|l5EbF~soo~`ISLMbEqf^~V_B>KRk
z=;G}D%vLy^yBLj(t*DPUT^vE6`~y#iLy46pzKr9%{}TCrUC`~?LKF`a>5i5Q1qqR!
zOA(WyrAw@zenv6xS<=^kN9zAXIMBm5KV|=?0-&veL`VxFnBF-knru}3mXrchVO~<j
zh~Y{_sm{;Rk0ubJFNT>yMTX-J{IxK)d9698<)}Y{s*An3xi51gck}D>=?XdscZ;RK
zZ1@LW@is-=84aGa>0mzv1ECsU87>=Uz2Qlbu4~u~i}t<wOqGnGheP!N-zqs1zNd%F
z8o(-#)ME)X9uQ;V&9M_uGo7gaSOqahJ9KXuFq59}mL->7Oj$p;&GsvPQOs-+aLj?z
z)V>y=C**&~pQn7DjMAp>?o(`%VtW-w5QR%Y8d>x~d*PqkXVk3a&-Aw}snDtAF{|%5
zeM(|R_pX%O_Q9+g0hY;*uA@yNf=Edm1;A&C<D2cuPRIDJK4c5+8mWCJ(bBl`=4bMS
ztHj`Upv0Nk$EJO%uIJxvO+okzHyz1&>~8(60J)`>mQ#5Rk<c7IwDG`UGCE*RC17Fq
z4|^ruG+Ag3UY+>@qS%;5M2Ge}dLwDKSJBW4;$?e@>GU};eZ*s$Ri2;<6n7Na4e*S>
z9_fVm?tiG1W>Rt``O;M{nnOGksTlV~j7Rl5@;l2>PygNDr`6YM>R0#lwt`<ic0nwd
z;4d3ru`^U<K?zlCjuk8OGtw&|8@w6Zl&c@?F-D2&R2oC5cnKsT{Q1Q(JwXG8WKwNk
zW&HO%P!P$3Z14Y|1(RE<<6{$*0ASRNwl@|SoYzH&W1t2b1yPKQg>DHgB7Y&Au#$LS
zN2436Q}PSC0Bx9ecK~%GRhF@mUX&J!c_8&At=UjsKF}(eHmEApT!&hmjw`Wk8JA4S
z(F!+$@$nj$8d1s|A#Au3#1)D&&#-k-#X*QykillfFy|n+>=x&S%y3uY<B01y@<{%p
zCi8S-bwDr!2{~SVhCDya6TADL6$zTYkK!*l2#5zf2#7!mNhw82+zviqMDs#*QxoMY
zo{=Y>0qqb9?e`+zGQ=$;xJ>_g7z9iQ26VZHsNG^V1BTW>I(yUB5#~EgK#Y4CVKQ6K
zr(OBYyp&D39|iQ~I?2+6{J(mUC)l+c_`CVH@b}vpHi(-y#UaCDxwUpGYZ!-=W<(ez
zF0MYJDef9iUCa#JSd}uMi&SisZ)^s{(Pb;$1)6vgryoj6Q4%Mcz$e}h;qUXBq#)lA
zOM11=vHFIp7oD$cHBM!#ZfjK*Kkv};O{Jzmds9h|c}7Ifw6oo!-d_(ysqUqsU%9_c
z6IX5d`G#;w*X`BiIz5aSHKfsIS2$XmN_8XFxx<r#rdV34gsXG_?+Qazo8gj`HYp+<
zW?7xBnkp9_xyy@rB*g}ZDkUOU%B}Fcxs5Cc%hMsXx}INA4$JcK3Aj+(trsy!4o$6s
znSM2a#btC=I*OR~Q!G;(iW8~ak4T$g1NFKVA_kFy@1C4e`O>b~*Psp$4x8%r@yH0s
zZOUm*?>tP|`h+3?oWfPln<}N8geeu{^#F38W5U6j6u(|8cGC>ZAp)_MUw#O#g{uu5
zlekHVLxg-wA%2i2tVPB+Cp_2e6iUODz|S88SVH@+>LRF{2&l|Lm;%FA2r+qiL>XO{
zSCt!->~q8(C3|3_5LL{$2U7gnjgxUzj=wMFIC?Unv9qWE<TC^^n$pY%RL16}-9oH0
zD17p({%4JK8w5tQ$|`6?oDq<7iCpn8*1(V82DuT_uRhF3Ly!(8t-PxA9i-EW(2kTo
zPhaz$Ghh1ypezEuphk%yaaxUSmSMfr68j^N>FGAFT;B+Bv!bK|=jY%&RY8^JszXFf
zEz7pNk4HN|!~LhR3JJ~)<Nz1+9j?9E%cf&ZcktqpZiC-3$0Hva-AQVeMw+$GWyr(+
zojhUcbs>{ic%N{$jNLc9_pgudn9gCD8ZyzIC6rcu1`M>3Y|X$|aYpE&&6X|&Kj9f!
zhA(peMsHK(uN#}2A%2cLEGv7W0DDl8^wBN~{4#dH;uy_FM01g@EL#M!bEC}@v-9IZ
z&9xZaD7rmzKz1YXo?r0Su$(h-pcn~xoOGYrDrWvW(tg1B2#-T3>!McPjadPX5aZui
zb_qb!Em)x-!dGX4Gb=Ay&!X=|2YO=AJ5dLO9$AJK>ts6XXdUT59r=`IC8NGqfsv;O
z;SVhUYp_fRgQi-`J*l*CB@UXo8wPjcFb8KTEw%LS?zpQoL2xrEN^tXx@<R#z!ZhLa
zI;q#+L6)uqp7;(r=y=}N{u6>Rf?ovB!{=;uJVsVKjg3JsHii;Gy~YuP52UgWK#KPx
zgo9<IIT*D<5b^wOs0BzXXY8W<**)@!$T=IFFVW=h|8AN7Phq=txJ8pop-<ESH2>AE
z(5r;3DuN-C?K3ZA9&NE%rlL|fmr@=4Xdyh`YucQ4i~@{&&tn_0+zq^5I+2~`ZYv;S
z)kY!b^1GdEx!v&Q{tdi4rVqli#m!isH5Or}6<D4kN9X4=;85XGVO6n^<}RTRr4lRB
z<};UW>kc;7K9|<&Cdz*d<J%JiM6$ibubs@2YN_TQnzMOR2SmhSy+~|6g<nkl$cuI?
zDB-vFp(d~M-lK)8zUmZhCAj_wfirX$;B1MEMkX+MA+$k%4(kHneqz+>Ro--?xj?WK
z7FfXHADLwpK5iS@E+izqXwFp4w(V9S5%e;;$OM(Iw=1zHNr=b6SuyVdfZp^0Mx+`~
z<+gVo<0XVE<}76$&=bUN^(#L-uDb6`5==gf<`H5Hc-?(iRuAw2S(XISV_(PGW}40^
z6>J7hHSY(d%ZqUASDqe8;Rtm)>){S2$XsIAUUcwN+N>hILLa+;XEZ;GpC-q25(s(^
z+osy_yA#1{M4fqPox($ab4(}6zQhsQEE6{(!48u}Y)OsB8A=oD{8RIViL!B;vdMfC
z|Dw2HhFY6k^An(=A3c~ctWUJO9u79WC^hXL`W1GHtPA2K-Tc!4SJ4ge@zgaK&tQ&^
z;8+p+2-K$Z;>iq+8%-4${$rOEPpBE=eJn@xIbDtgUWRl(#lJU(!+-PV4MI%Y^xq=X
z(*muemA=Tx@LQ*X3A7Vr@>DrYq1RWCFv$AdS23<lLa))+5$;|ZF-M_+sIyLq+mz=`
z5nXtBdatnmS%(D5;pO0<K|s7y_L8Lm7#djLJta#kl^7@?<`l8YbfksNNewiU=CPoZ
z^RTu##^Siq*JQM(>LXR>5IG|Q0i(EUxDe{%63zpt%MjpF`#CCOI)Z_B!nXw9P{>l<
z?Nz>VczpXQMmv5UyW2ZAJ0I5<UoXg3LXh(jF1S+-3X&Lo=?w;wv@NbhmwTjuS+Nl4
z+{oN%J`xiaFtI@<+%>cISU3tFPK;n3Q23$g$Dmlg_0KbD>4}O_YY4v#pq3;#QR*H3
zXL>t;`jF`}kDDlZ4_SUgE7(wAdWam2==f^P`{NEyAUFUm&wN2x_BAD}90J2`os*$?
ztrana-~(QT>qPmqd5XiMi@g%S8-EScGR)vtV9~#dCeuTi$DzwtTSz)1Ka8N(C)P~3
zZJ10CX#TO@PU5_6As&ExQ1{a+3Q}AEJ&HgCjn++nW`$BfVX+s!M;^tR>DmrSxQnld
zQq6yIa-GRR+)k!LvWe1?hv_Qq1rNOJPno@HxB23;?l*sBCOG3j$EFToTX%?K%QLw6
ziCw&wM|C7Pb7TM46Koh?Ekv#(QuAX;gy-q=_V0KKl`2zBeYt0wwt-zx)*~c52#qJI
zB|Of6`ulk!wXNX6qOctMOv2|Mw$j`N!Fm_vgI)Gzg>lxn0UBy6u+wCtuh)(aJUrX>
z@!^(Tg6~AX^ij19h0U@7&Cu>%p?}PkRCW6<4R4$&cypF<OWBx@Y1|mSl-s$XON$Wv
z_T>SJGWoO%NKK-H>}Yvuw>ka4g#YHy&u*U|TTJ8~3$)zNj}E~RX}S_Bih+af*p*%a
z1G5K$Yx4$|rq2qD83PA~9>5-&R<=zxe;YEn?D&cd#Az27fHJ}X(u*|;rvTw0X+V(y
zs$mE`rYl80*wve;3lViKh)o5V-&%k5RBNj}&X>bV`KxR?s;aM6HD=V8CN|}@)VO@O
zZ`Mo4CYt*WoGy0)A(;<?`hO#-twcs__u#U6sJktjY~rz^`HF7aY}kIHm1R>Bs5`?j
z)1Hn>LNb$=?O_fBC<w5$4KS`8hg@iWefk%YLu(CuhPXe!X#{I0ctFNi6-V$_P`Oh(
z;uAelCDiP}7^>a!?Ib#@4`lO{?eQSdc*8r<dq;*Y@8rsMLZumvRu#vew+Sf(VRXl!
z!|j+Ef5pE%fE{Qhholh1sJ;Fej0Cf7>{Pu)9ffcN4qm7N3LLV+^Qbx6L27Lzxg&lY
z%1;^?pFKLVb`~~6t{<Pb{n6#>fs9`3{ISj9DEO^f*p)HLGU6*;T<xO}Ox4WE)v;P}
zgK<ju0MALInYTOx>NVfIB5_6Xz3{`FF)4#0mrKl{D7sThip?g@5)Z~hZ^C)i&BlnU
z_R|f{KGzc-08G})?Aq+K{|l?HVT6(k$4InBXeDzodF&qNHQU07xy<`^tHu_!V+Y~L
zm*0j7qkQMdUAk*jb+M>7&PrsS4IyK68&)G*ob>UtW@4Bl0QPv8%hcSphfj&e0KDV}
z-ZDX8a-z&q_Pq%5Vx))?MbiyZ`1FpWUgbU`RQcf+K;Wu}4}N-*Jn?5OvJQD>bWM-`
z`l9!fNU0H%%Daks1l@IVOVxqo*~~J1Pv-AZZZ-PweuWmMff<-3X~GPeD{-InK=HJN
zZVo!dVhUfZ(!b@Xcw#y&CJ6i1hd3qHOE_c;km3x&$7ipUaWN#I2bif*zm#c_%zC{s
zIS*j405NOI^oC=M!_A9pu}JP<JJEueJJA7*cbb<DmF=bgv6eoh3-FuxM9e?uQSo9z
zVc}LP3r3}3LIX8li>FdBFM+We<*X<ALp*d#n{MTfOPw_)U>cO`qS1eHDdI|ZXl-E-
zf0`u@yWD>|Fks#k807r;<vqtQ(&{AW7DBWY0oa^qM{GeVG`}O$^)fNryYig#D@ebT
zIRu`QU^N`Wf<Z&GUNBUB;2!7aPJ5Yh5gYjj+1`<=v;M)=^p^<UM<l9Oj*_m=@7Kkj
znZ|&v$sHf2ns#@gl2V~irg*L0pNiQIbNFe!%hCqDkacKV3w^X=p+oW^)|&>&o7l8}
z3mB`o^THbShZHU!+u*6Y!`c*+S~6ykjkI#vzm=a~SlH$Xw%Z7PYXK_m3Dn)#SmTW)
zA7b}CtSl=k$2R$EmA{?)u9KS93J2cl>84xlJCGxg%$nr!BxoEEuagLck_wFp-6{Fn
z21IcW_c_adLL2@3KKMQWyz2TNlVVf41CZ39UX+LB?jTKonXc*VPucR?d833t_VLJY
znEK8j1+?qVAXnI)-QquB7)~w<lodyTm=KQCw52Vf1P<2rx+r{zF1D(t&wfZPANrX`
zDGS)C39*bKZ{t8}8e-hPhHtm$hW3>Bl)$+qKjADvoI&fb7^>e!5)bDn-*5W|%$o1L
z*(+L-G}{KTLElC$cPELT<o{VOs|7(1O29xs9-;ovf7|LVJ|H*EKxxSsW9-`se|r@Z
zm+oi1y!ZxuQ!osSZP6>*p*T7MmG@JBmd=tOrGwScD8AEUmp5sY=s`GfKeB~@lHQ*n
z%1{d#uh}KHz?0Ui{Jy?G@Qi`vcnmncMVc}lI$94^DJbrhjnw2x8F^|}vH2XvT~~9o
zc9>9R@V7K)LBNv1Q@9gatd(lkbrYk&+#^i0##rsIi@J&pOP{5-$tlHRQuA6{8TLnf
zVKAKo8ZSnhw-?xlH$#wcPEpg1N*5vUN$1jyb(ZZl)1f~pOBz;c>vn^!sYHZSpI%ty
z{Evh80&=TjN8s&58m;q!G4Xl&vTdYo-14jX!rfyk_kfj`gHW1H(bcKy-YG}9a1T*^
zphwznQg&FN6w!|wuOIF~&#Ql9$+ZYNi0Ryndy)B%cLb*gKy;+qG6m8(>jaIo<xJCW
z+sdQ7UNVu|$etUEn3lrs4uL3-8s%q>SxOA8ltWVXW$Nq*2qe`^?TDv57RE^AP=6YY
z_sE!Vfq>8j3M^Q+9!6A?dy2o5(>dM2VU5>UB=Q7iJSN3z>Fs?#d|9p-H`Pt(-q4+5
zh+2v^SW1<~J=`SYcMWX<>+e!Z$_A1nGO|$e5t^P;TXDXvqFW-h8z0f{2sO>@k+>3?
z%Oi#E3)RrAUhR1}#&ptAq~YW~`6H8HI&nl=O#wF8QBI6`qc0+x4g|F$3(iE?U`S3f
z!#=Zjyx@=60FvIA-o+!PmYYcDd@y|`4*UIg@|<M%bW;YSe>A2Sn=(Vwc$U=%=e>h*
z%pE?<@i=2>1%{LO6gAq-|Di9S)3uygdSMO3DlCGO2|jPI73TgY<DtpW^AG;W<PF>E
z29X|<Ly^NYcS7!vXezKdfi;9!(t)AMe(4HkZAdZY-FmpX2B9*Ljb-8g1aqVzm`T+?
zFb_ke>?c#F{MaK%QOt!U0lFLjDN?!gCreXHu*)45f6(?g(_%_s7Lq_p&^cufr+DQu
z0{VM!4y5holajhv<A@INs8}ioerS%QLSeGgx#F2-Xs9T=<dPbCWGOhVMW;Kk#bObv
z%&kDyb585GnjGi3?q{{G2xm}6{Crt-U3w!rMbiH$NIbQeYU}1lK&B4aAGlAkfU;Pr
zRB3`eTes$<FY_LyN4!VC$fa{i?Pw^u0`OyIGKrl}v{~^!Pa<LW>P{RIjXZg5a*f!A
zcGbxM!}}SQdNNN9QWU=0Op__Q0}zJh#qTfyGj52EYi^WE+MWS6_q<{mF`e>2dTB<N
zOT;lDlApvf&w<RHd$9>+8%o*dt7g4dTGI5qj4GUK3^pa5igVHugs>DIIior8fWVwZ
z7xW>zKOS3yA<+_qa@v*|@YCkU;a1U{azMjMjk_U)(4H;TE3To(JD!&d3B+Z7g$a>n
zZopt3oBUrn2aPQY9OS%*M|;2c;&i|H<D`Ot^13_Ss{wqaTQ;Yb={|YQj_fMAT)f$8
zjU|sIH=oXtOtURH-bTIe<1eCi0M~_qE%gZ=;wUZoW5@ED7~Wt(juS~{D!Ni03kF^h
zC`%4$we(MxS{d>#c*}-*7+ke37{L8p$gFCPML{Dg#X3*K_^%?I+`=b;`5l=!6c@w(
zhPiI(HgSpAOKciqq&G4Q=qb-zaU>ry;7>UWD_|^Yz7=$UgZjX0EQ`t$U}3VC^d6~F
zup)ag8Ff<NohV9hm@7c-V?9u>vQh>rT`G0P^Aroo1HSiK<99WT1yQAXH;Uw@jL{IU
zE}|^C;#{-rPgAHmn)`1v<17?b-3JQSVuP4dr~gDKLQ{%i*FS_-{Y$sp{{$Q-S1V>K
zR}*vl6ygF4$iA_P{MhEGf>5ykM`+1p=sQfoD|QD*3BYYmD)t6N{=Xs&F9Y>uWeQHI
zG~g=j(Ao|aMM8pMk%&<W6%b-w!^%pQQGoO5WW#)X>$|o^C`mj*eQP8Qfu`UOLOjXS
z#R$_PQz&C)Wogy>W@))83;=vVu|!%0-~?5sWUMBMs$`T>Sh{Zom6~WqMiik~kp4*q
z(wm-eZmr!0k&cG)iFx{D1OB8>^>nsk0U+bGjEtpUXU6XYRj~-?qSA57?sHvo^9K1s
zb?@xB#C$jIF4J;H%Luy<v+Ee?-ZZZ39{N!|H!CIe6vvHgCPNr;*o=Jg2-Wq8BDl77
zrvjDR&q3=u+B7@}s}H#GwyLAhoP1Dzi(H!vaVA!6F2GaUcYa>LIVtB(y@|F<0-#sP
z4F5hxa8nW@BI70}?RKu-{@j1+c)y;hXRs>v&%`WZ7$y+A7Vts%+pXI=#G;j#U-~Hf
z6|!{t8`%5j214VblsuhfE0~2`6+vHg^aoa`r~p@@WJJa<StzWAaTZssm$&%C)yw{V
zbOu~t6f2bEz#2>0KCRf9Xg4m~H{ec-yZy@6ebNJibHOj-arMFU(--HC1WuS|0c%M4
z*9?}>V#>)(+11KV$Mzs3tu8CPGjC=xobr65=)g|6xD-nnUCr2xS>PjL2oaqQzWK<h
ze0Jo|%%u<InFFEqJbA)o8@hh=3Wj*0^dHeSI8@)>^oZm@IBA7c6IJwZ48Wod{uNtc
zOR&TP^s@aYNR$)K2c*Lxij2u~QvQMq$X|ZR1g3W-gG<#wc~@B&hB7%KN%;1eL%sk`
znv@&PcQexigBDnA_vn704~W?dunSA|9YVD`JQX!}*Ot0o)j)$Jduc?B#?NYzbZJI&
z{O$*bd<%5ZejCBhdDjea27#1eLU|9CV#PVOAzDjxG+hzHNifOdKn&d{LH%Gw{z4_H
zH{|~eg|KfGm$ZMO;0^iT$-06XP&$Q0C#umBqFq=zuKELpmNfBSKd35WIq}qiCc6oE
znY_(-XB3>m&D`T1ERJ5R^-X2w->j#?pnF*O5ID_!6L51e9r*VAMIIzkb1H2j8Oel=
z2#MItr#?M#To~cgp|HB#P*C_!!e}?(-!fK)8zF>hJ-^aH81mR`&1*vjcrku=tb5R~
ztG;9nZlLxu9y+QbzFY;7b_HPk&fA0u*mTh786w}0nSa2I&AQMHTtO8vMs=*ceq(Gt
zju9MV%Z_(IdsYVeHEpo(L#OBWb*hGo*h!*t=F%=B4>z(9?zc_j=$y@9*tw6!RHadV
z5cQ8dlSQFi`UOh!Jl{(Jer&jtW6WqN4Xb$lmWylmLawpY{@?C+Sme&TCR3QSynvqm
z#BXd4u_}{xebly6qzi!Q5|YE%C+&{!%_Y9NtdqAxpN(MKvGqot=fiy>D7X!{oc6y^
zFllBUtAeS?!q;{*j(l!h@gt{tCovzB0XG|GGY>qOX?V}aJ_V>YYBNMER4<!moPR6L
zQ@Sv;V_r+mML7O8?_<|4@G1{ANi?j4V+t>|{z;a?K%Si;2n~=z8vB=&Gmm7<$GJ^G
z>P%7@QtsW60TH4;#?|gn5&_@}0q`0d86TXwDsI&CW6Nq3-qc=n+vpU_v(OdH>%3@`
zqSXBA;!$|JrGPo8SC9yAINmz5Eaam8C7K6PhC6w2YhK6SloUPqK-{FQLB@NYB)vf%
zN3|J(d!SgJEYYd^;<~w!NrU$ayB^2v_BBs+nAUiim0W(o%)$)<cy6C{ay+fMxxfZv
zlVrLVq=goIRvakyCps{a_P3U^@ZiZENz)Qg(KF|smJWkebSEs#3d%Z*Ocv)G=|AyW
zgD^?}`46u^2oMmq|57-ZtI+`lPK(AEfr_*k@NWJ<g_AK9m(WI)?c4!tvW4L=dpVY_
z^=){L8aW@k9Z$*c6z(1CgK*(~VhaJMDJpyl>6B;xN8UM~S)a{aK;Rdcb5MF5M->-a
zh2`C_B%%`IrFI268?)e<L_JKU?_rp+XGo!(_Lc9VU^mW-!IQ{iz$_rObKu7-wWtqY
z9>vV*G(2pFS)r)b6B()t+qa>tmWMxT1XG{A2RNszq%1<f8t!Y}66~lMX=JCEs#Z3g
z6FQvPUFnT$Nl|e^61Mc9ZjT?65bPMX>(L|G@q|j3i|n}XJ|zX^vUGLM0IDV!?}%lg
z2o2R2=XSYU*0fERcMbs8aWxVC$b^J>q&Jg$ZqX0!2;-=hKzE(;avA$U!0DoxOGub}
z`3qX1!EYcO4|pRGaDKs_k)B6|46hTS0U+dh)>D9=5qMT^X;50%v*aSW+VzZoKe;9$
zBVg$B6!o}sUdy7C8eor=;NV#@a<V`T)!8?q2M^F;d4&4`904Q^rLUKH0s3D@<3Y3Y
zadS)9TrW@1K{hq|%_(U{#VOlhWwNUg6t)>kdxt)KLoLb6bd*S76)w|UpohckfcWUU
zLsTcQFZIiuhZ#57lWk?GDxx~`smRpf%<Fh5jh4|<YQBqFzKh;rwZIy*L*hfOO@)%z
z87@uvZ2Gpw0kY@d2<#>R=zl_GGwnNg`yW*7{xu?n{|hRiwOX*X_(t&Dj$5bL&4;!5
zVE@mEaM643wGkQ!$Qf<Q?I7mAAq><Mq(dk`u8xnf`bx)lz{K>{#0;b;Nk7fhIN3%h
z4eB5s7N;y29>frtVsf_mI19QZmFQMQh)3nfYHf%IZEabbEhJ}<%DLTzs$F%PP;IZK
z(dLW4oK~#^rp`P6%dEU*a!k};vuoa$oE!fWJ-`XSm!Z(tqX`K6aV0^^q0;%C)zd2=
zCf?V-U|)>T(ZArZ{#E+qc9-MRU`W{Yj!I~?@DQDlm#1i7jc~|?1AEL_0Q<u^1UZ<h
z$Sl&_hf;5h#>M7fl~q%~aACPiOVAY~yslWzwa2s~$>f|>KQ8uGmdGM0$#7!LJT>0t
zHHd%8S^>@-;{d!q)`Z?{#Vkj6Uo8Qkh7qcUxqElcDl%bHo1GCe#1@52ur^#@tg5(V
z-W0#VCXrH^CBMX~rMRX-xrAv^NF~9CwFswLQ>;6qE*nKv%9l<T;WR-}pSnP&T4zbu
z%_er`8lh!b^(=2No2*l%RXMTIp-tP|!zPtNw~|}!nR}A<Ci@6!s8g|nZKDdPHDmOd
zG9|E5N}q?9ZEj^#Oer<gDO2Z{8nbY%JOAg5XHoFr(eWewLY3abP)Ee%6iugcD%>?m
z>wM*iPJsyvhjYIH*8mM}*wj*<#Zp2_00(w$ta!lrB6<8z{0|P41aVFs#*7vU6n48o
zR(1mT(a>Mnf1@CLp3fgW>>vP#Oi1mK<a$HTN0UD|EF~`vgMpP3lv{TpDbt)Vl6(mD
zm>A1YW~`15bDC0mwY2A|+i2Xy&(`uO9w7^><Gcgb42HWK(j8pTgEQt0>-JINGl7R$
zHA=VzzIG(GmX}>3iP@~qwA}LT>Bh^^Y1Oux%MLZwbp~xN7Ee_gQ%ry=^w)GJIDMju
z(^zOROqJ%9EzL$Ylydd`ju2E-z4Z|T86xt<3OjJZl8H*>wg~XMSsG6LbYA|sKt#yF
zT1>9cjw$km)#z300$y`Xj_?pn*zI)ap)$tHEyyEYHWWCCwpFP1%o$iW*i;KCokQHO
zgXxM&I=-US%|&B|c^m+njrd%*F%OOr$v6{(sXH)TJWGL6*sJPdYs*?vi&j+R>t0%o
zq=gR!vFc^GfPM#y;$$M9w9dgE?&4Zma9|_+0_t3EIX|?uhBpqG_lWDMN0kto3oKxx
zjfx$Y4<E7_eyPItl$r8%zKxwB7(E>`hqEGC4SJZj!+YA9-3*W&Uul9Oo}5&Ma8A+-
z0b9qlfUA!$bD2x1Od!c$IY@JQ%G@0)m4mTd8y;0dPpsb~KQd|#C9WmKMw7#EjdDO2
z6q%%>#;?||TQy-3ax7*jL_w{1E{7^AP8MXkvfmq)sml|Tr1pA_Rg5{^mtHv9fS#SC
z@R$9qd5JpdsuEC9(EkRmJ<JALz7y*<keNyT5CKMucfCMSKo*KO!W<8&d!}U6DOJVK
zhcoYqhRPHx4dosmFP=SP&1Q9}La8scY~QG#NH8IX?&!l(b~NM2-Srdg7qn>Z*0Mvy
zp~_S5v?Dwlsaq9ijiv<OAsrSWrTO4p(7OG;J5`KZ@(`c|H;<Gf+%3`?y=@~Kd=o<L
zeRF{|x%^q}l)~ICciDLmFt*YRCCp8*YO`1&lR^dIw^k;d2+Cd061R{nO=Hfb1G<N?
zghX;obx!Y8PQD&Js$gDpJDU|->c0p;ey6Z3lSNcAvyzK(odts8GqzbSdorE}%?Sj5
z;LOr%rUP_NYm%}Eid6IYOVu(fp|i54we8PqaM>Z2;Gm^~$%qzoHZ31(b80p7cvI8B
zC!;B1c%#F;h<<I9cNh|%#d0-rss0qO1SxkN8SAfIx7efFvfrDkdePXD3_IUE=>Aa?
zw`pyPw@6kCbv+sY_HEq29|XNLn#cv~3cXQ6bOi{R6iL7zJ6EhlvT52#Y!F8{OJs}?
zmmrk|oZzDUQpD^0Hw-gnQC(m^Pq+lH)QZ|{L{G2hb@qu!8R0HdPO3GY7NJk6h3^_?
zPwkGu6pKko^XC^f{yk)eCaQteIMRlUcgvrZmaGx2h8PWb(;9m*AJ#)5L}2pDMw2xM
z8Yke$m-2Bv*aj7WvpN>_{7Ir?AQAtVO3YC+;x*Zx`v~i;iL}eSob=zehFC9|5$6%t
zNLAl1)Nm7N`xGHV4S})h$fz4`paCYQ!n=m^D9Th(??o8fRqnaVFH)nFt`u3S2KFsS
zE^4p@9bWN2f0<b$F4F~ZtJI~6gPFpo5uyO9eZfWt4r13y*$^y87q0aMD^>Gitbp#B
z#|M}@Dc#Sw7SC=5oM&pqUDxl9be6zs_vkmX+&ES@Icj8jPPBFVMNL)!$)AKUF@rB}
zlGRzq<?|A49M}BIg`+_5`U&s||Kj|DO0$8)9=ZmDCDWxr+&c%eTGHLr4AR|X=t{r>
z2R#mvY4_-7U~7M(W7@P?j*3Q#6a9Onj$a9;p7_k_kDnv9Czf=nbR|0C8<NjT`B>T4
z$f|wH%Lp7^Z`nRoku!f>DM!3g#ro{V$?49j(jf--rMHN!9Th7a>Pt<)Wc1#%?X$E6
zP~tw?p$;9s&McOu5VwNxIenHB$BqDgSps!vPBF&YD7?QToT9@HL46rf&aL6YDit}_
zkDP3aBeNKw7bv%;Y`GMfzo(ZQhU8NMA}+N;Vwv^(ZmXUMwKOBgU(P)$4L3#+M<gNy
zNR<{VLM0hvJ|sfX5Penh*=b@@wl^Y^b!NGJ2d3u$$arvD`A2sBHHC%GK?wkGF^TxE
zd>Dw*{1Y;cR5Qwl2hoX%GeTA7K4hGlsl?+K6I@K%DaZ12?$BwlrTt7wTQs%zy(H^H
z*x}0#8{8-5qHcOT?KZ!fkX-sPOsw3RgNNLb9d+)XjkDP9vn|MlBzT{2Jg=?K2zKqC
z!Kw`faAo#FRAN0P%*!J+j3|I=_V$rlW}2EyeUl3dcatPFpPY8y`IU<6tp)G<cP-^p
zW$!u-BcwL>d!BQt#778NTPU1UBQ2vt-reQ0&y3>P7V#P^j8z`2sUdZq^2&x)k#N9q
z$mJ`fg|{iYh53ctWGv~{`bR*`e8|3~TXtt>SA}Yvt5saHZ6~CVCLRC|i@)Q~!*y;p
zPn;=s1$-T~u?3CGP|}Ocq+rwCD0!uwXJPT_klqXreYwz`N7p%ACS17yDf<?lQ}bXd
z)OcLj1=)TH_yfaa3Eoty|3)pGuA*18V0r)SpNZ)`n>a~6{#A$-p|>-g`d*m|o@^m+
zRcf*(VrvQ|LA%+ZnJR!-;oJ|bvPeZpRj>CX+%r1>smimi?Pylfz>!rO(i5vmTj-=1
zM@aehWfO{z_pZ6a58R>JgE-3<-Ca%wJmz*I2f)>BgPm05-=3nI=)CKF5fI+L*`wa&
z!&fnsUUC)etLXwf@3;xndnjV;E+Y949p*E!I#RdAksj3yu^WJ-R8QgY*T=k&+6s?=
zYqOTHQo|mNU)-6vTur~$e#iXbbFNdk$4?qn_**MFZp~#jP_dEISzZZoa}>5ZeA>eF
zJ3na&2|%#N(NatlgkN4!^{a=$13z+4PV*b<%bT_Ry}gRdDW_BHJ^;tYTkqt-vzPG)
zmtPK(5Qvrw^A;iidd~+==c6Xg>$b8P(sCet1DGN>R5oVtinnR!)3~buH)1EGCy}kD
z?~0;}+?`OK;awv!#Q<eyUjzZZvKi{f^X>6$V1ILb<G3X?FwXH|rOx`xUcYDD<}`dq
z`IDjviB!uOWE2#k`fB7h;y{%*2-Sl!GI0z)Z0dwBEGY!AeII>(44*etLFbh@w;j6B
zb*z%l-&X)_=1E?UZHB+R=;E>M${ZOW$Ya5+NLo6laG>VL(mQ$h@MsJMTSqn^9#gP&
zGMl{{Dw9T(-4uioC{g{!LA<N~OUF*>u*j{$x~cV)BWCqjF)_Jz?n-7s;dcV9pYo6M
z%95SXEkk)gF}>oq(67Xb$>QZ_A0!iBtSdpuyL$@HmXaZS*d2{5iAqYEdd3S0Qe4bq
z?3V&@)L)MU>aB;>-9k>tlb+<eCkj<^D$dP#O!aPBe=v?{QZz0{>}^N5OMmsr&Y4$I
zYoF7mAA9h-m3#~*bT%e7Np}LH-W=ue<(VW(^q8^%Dr*7$k~+w<Gyz-DD40qgDw8MS
zIFT_d;Ze$Q8a%|<4;^@*H72h5Axs>`{Htu3tE|_nha&d<DL{<xh&XS=U;A1m{>X8!
z&{@u4Gi(TDu@W)zKdN6Bs3g`YtcnfJQIkE^8M0B5kle>t*2%cZ>5xgO5^n#}+NW8~
zQ!?)X;CwLG#%~%8g!+-*VAiI}fg<sTWi<?CWzm17Sdv|RoP~+@9u(yVxf_1<K(h|w
zEzx9}%&B5!D;_$g+$s3OcMdlsw)iE9RpQm^Fu%;mJVxK55s~Fe;$F5I+CGzZ^8OKN
z6^L_cKGEDrofdk2-ZQb>;&}t_4ZUIGE+2OS(3})c_l+f=IjRIC2p$LfjPu8%A@bsR
zTCaOyG;_q>=W_;Js$evEA#nQJp7O~?#TyTxN*+@4FkZk2T$WjMAgX_C073#A_pPy{
zFjTEa>dF%hKD~u8eoO2-DTt9W7DhNP{~Me!cH!6A+V4Nm6$mHF4hL3tjW#~PIUyMX
zEFEMFHuhz;JWIR!4fcLdsWUmx)!e62x!q4Q5De<*Xg4p-00HffD3-A2llCZs>rD_)
z8g%A#R|6Z{)H}@AF~<{+Xx7-w4s1z4?obEH054KAGsJ+N^j@v|Jc$WvGU5Fh_&5Hb
z&?6CEHSNy45E_OjHuOA6W=_TTc_JS`1i9@At#ht1jW0)woww$YiBR~TR~)s3s)Yb4
zmb{o=rAo#WbK$uwn4x=5W=rl=f_{PnN6b5KNAP{O9nk4|dO6U44U_^#-^Ro?J@sR{
z=4lm)TREH~%oRE9VYB8+O?#}AILN}VXi6C>xe0SzQjzA4qgPinea&h^uuTs@xDaL?
zG|R?`2UxinPvmqbYo$}C@!n%pr2o#R8}fm`wJ54B#wK>6-Q5m2<F`K&(4SZ6FACGR
z<|Dg*-Dk+>@iTp~ST0wqEP%37N+N>tOngO7x(XABIj%t<Zcv)tSd?Ca11uqLH7{)%
zC)KxRY=_`&<@hFBYp!q_*F*<YLp%urGbU$f70%nTY%x)I*N%)#=}%`#oSZ3ne#0wm
z4QAM{|B4>7`zZ@o>G~5?XjBQ69Y9rVN%@S*`a(YKzdh;R6@%+0?DmJH_?B>VwI0{t
z=1}J|iChYYZ|n|y;ZE$}{NZ3IhK-1Mg6vZ}{m?=uI3H!oFp2QBaw`;|b?nj2<g|Bk
zFZVeZ{bYcn_$3#$A})CS&Jx&fy$Za!dL<1Uwhkm#yA!Z-1MWg}8!yzBU~H$34h0~<
zvvOX$(i#pYXb4ShP6(LXSbT;R=91U%V}7RU?5CXEvR@~~WiG~PMXfQ(elpy7Ge2B6
zihpe+cjqM^oecB%MH&H|r~ll^M~~sRR7|$vvwlKUp=~_h;92UyzECY844+ucLn~TW
zw7fg%h)c2NXZS*tqlqM#bcfd$H!00aUkA#8&c>wmPam0J3AtTOl4q38YiSYJqaXj4
zvKO?UyBX1qnCaAA3rWV_pAZK4+>zEO)fclcsz_;cP+y8D(ux6Whq6>XxQwcNH{d&!
zx<_z+uSeP(!!gjrVLQ3ZwbP#Rhh-Z*EC>F2eI~lQ;?@q^HDwKy`uj~E?o?WXv^xN(
zV2?g|s|SK<-Wa^Anyj1F{Z*1nkT`0f{~OzM3YgNAVMVGl!>Kf>B?z~~4VJ9_4s%^E
zpS}6{vc0u7`auE+C}(g1mb5+IhFr>O1=|f8+A}gb&(yf;k=!Vzs`VP`uO<>pm*jVS
zk>DX0L`h_YWdAwp-T(v&>!!Bq`pvgdi=baBH7|`cAC?)ab5)$bfpD#)>#}47rphzO
zfksUwPibTg7roS+(`+^cQpWi2DdEHkKe)fa!@nTgbo2q5sNV5)Z@u(KIxcQuue`#1
zzGxRtXo{b;C*g}1EOXf$XOWukrE}RL)yk*$hiRK*dez_31=Ly&Z*`$3RMc61P!kTM
zChQAEfYE2+Cac|dzdDuG1*mE@XvC{g%?6h28klJQ#=RQ-uE_0p1>6CUVw&HLIC8MR
z`wnN>!g2w)K7C3CnOHjPLCk$U(4<5Nb&kNM{QlI>8EDi%Fh=kjMIZNxL#!?avn1zR
zWUL9|g@I?d)j-sdL^920*X==igH(suEB!W?wp@E=>aJS*_Qoqyzi_#+H2eC45A8Os
z=AMWvPgkPZXL$R13%^`?c>eWkioZ|xeb%JM+1{`dDGy5j)z@m?9z=low*cgHh}#T4
z1qc3bI|ylZ>3?qru^!<zf6R6KyZ&2%$4B{p1uY9^4|f}TX7K;nKmy?Ye>~ebx?8w9
zn*5L7|BQ)tcVSuw{+lPq`6rZ7{r`QaYvZhDZ{y5lW^dx=7OpPmwIqr0Mb$(;qUjBz
zI#^tZM<j!hs7n$~0pNfXwYE|4&IqF_iHTz85wn;`8!b62%l?XbMRp%5ayN1Pt=4&y
zaDGO(0f9X&5|i1H(6Q@9Tnza7dq^4d@LCrn5CRr|h>o7G%j0w)3X09D5fnW4c$OSK
z<(uEeQvBDFQGen7L^q@PHaxsqx7TvNGu#KBn}Gqt8QlnJ4?w@QSXR&IZ&oxs50H>l
zongf}M4v+Fc=Hxxxn!P@X5g~DAoJ;86I<jd1r82b<ViDnrSi7YszofQ=BS6-4swg4
za-<@F<I*OH3m|A(^bkzGGYkc%3S&_)iPLQu9&vUCT6RB%2_K7$7uzapM#WY&qdQf@
zP)~m58nz8I0S?k`oF055mrOF5B%I6;p9Xa;cnqV+M=Vlz5~C_Av_FK?H0sO=SP{k_
z3uCzsYB}gp-moWK$SZ$ltD0@(KKc{>9)<O{HX}e+Pg>J%A5>QN@n)>#vL#c67uFQ-
zA@p~@bm#jsxg2MD?5gGF2}t(PvR<uI+$eAAiFdd93xH+iaM>IsyS4^)ab52-fWzBw
ztpV+4B7PBC+Na+2kCwE(ykSgeKLp^*{kDDm!mAZ2d;S~rzqmTb;7p=+(Z&;7Z*1GP
zHL-2mdMCCgwr$(ColI<JVw^eW)~$QLQ`LX_U)S#4d#z`6f3%7LX@+LY-M>j>UmFw1
zN)Cbm-RWu#HOJl6^KT`4tc;RNr>vzm<FxDfP|0FWmrH&~ejO=Rn+ex^b&buXEY&+P
zrO73VAmHDM#-+pS%!f=q>L@}Sl8SI!2s#uy*K1dmU4`T_X7oytZTbBUDK?Q!Vp%>P
zWHtyt*`x0HOBUq4f=JoB6scpc4fd;T0si};(Z}$IIRgT@S@ddBGRP*@>c9HG_)A3z
z1qzx4RS*Y@m+g5K!<9CEIHH#Fq-q$Nx1cy+`2l&cztBb^lO{hyJ|g#$J?6i`j(2w)
z4vkEep63xe?DpA|urDG7L^4>L;>>z3A^PXWJPiFQlsBv<Z2GN@7hIsUso0p$xrZ+u
zf8SnF;LQSTjdl^CJnDfz%&#>Lqb+<+N2zG%PB9%Z!yIExbDd#Md)e2AO)H|L1?3x^
zl7SRLalo)CMjz8GaEKML9nWL#A3Ba1sy|K?OK|VA2Gd8Lvht%BGEF7Qp!*;v9!MhF
zf=S!t$Vy<$CBCC}g~!BdJR7FNa}2}gA($6-g-?R?@Lur;>G9lRQ7R-%^scfB|LU$7
zfB!EhqqlCMyaN;j1dzlADh3qNnJ5fynIntWu0t>uRwIjti^^j_&WzxfFL553_XHCh
z4n>fndjS!Eb-EM-6T#A(+8WJral7t*cvyWV1j#WL>|?R7-gp1S+je2HIm%BcACPRZ
zVfn0^w_=?O?HT4(0Z}uuQO3D=C$#S29M8NM{vc*fxp2;sL&?v%5CRl>nZPzfV%0*A
z+$-d29kjGG%P2ohN=}Msn2+M~2r+S_Yd+((%5L!a>5Wd5BqpELXHP4TL}*s@a9TX0
z>VRps0AJYCxB>5T_53^CnzrtV@wZGgo(9b~DGbD?uQi$)31rI*nzLfV+TR4}hAyHD
z&32`nw>CoKADzU$Rj@$Y8SQg(XY0g-hV7u4A1u{z-N;C{ig|u}Bar97-#z$Q<-urc
zFP-HL#M%XrPmG$W^jX$PBQ628<gA-;CU%UmH9cG`pg=l&ILFkB>W7tI6ntNl3~{+O
z5n&HTt`YiTw3ey7yF@*zv!FN0H0%9lJA3d#of5LsWwYawVylu9&T+W121@T;LO1G<
z$M7trsXOd!6&{4EPK7k}`plel(ieLaEsi1jLccYfZgKw;YfLy(`oTbgfWX5h-S7jF
z6#l&c2$rCLG3q)RXd38Wh|+0H@cJaM!U39jWXMwU8|rzgF;sJTDO4N_8;Ik?(F*1Z
z=`bP=Pxg$nez(<v{XG!c>Q_3Q>Od6@jpuY}GMGCso9y&;pWN==&#T7gal!A;FYG?*
z4>HnUMbSxZR7M=(vZxG`X@gzxgqUPq^u*+((c%E0hNIdDdlzX6IY79`Om`Hap6-W}
ziqsAQ3F%%+Ff$-qGvSV4$6?gYmuPR0NOjLrjZUlnkjxR_N8*ibgL)4?(PiXFTVB~R
zZ5O&?H9eOFfHGifnfmiHgL}r2sTlAfQ(iYweQ{o)kf=B@Rq@tfZMEM?^2mFE^BP_(
zN1F>A)3H`KiSS9$rgNrs>Sx2>%#RaSV_k@~=HALMhF;rGHe%{X>?pJ^gVAHZk7zQn
zlJK8MvNYdMEP0^DinBhV9!Q`Vfp5Tao}oid0sor`*x<Vgv_^TWvf}bxbXrtMw~kF>
zy1Zg)OKPkCU7-~54+ULCVk52&xr>uD%`pO<Ew-naAD6H-edSNIDEH3B?lt+HbcSiX
zvSaK^CC$frg4!l_^i-oTSiRg?C!=D`aaw}iXr?pF50$OQ$7)<A<!cx>`gBOqB6}<p
zUh#C-9rCL6m*@uUv~|!~>{6=euw;zOwTMSUz#+l0RheQqBLcg1Q)EI5F<$;j`Hev7
z#-bCF&@(YtlEFO`i)=}T&Z7v`dU4DdMsc=6ni(r}6&-pQq=Y?UAJ444IsN#`N)PC2
z2>E{eEet8w(3;YvB-E;9DyqJCLmH}mQkWDl+}OZGO{hBJy_`UKTk03=T;xvImeKA)
zHvM6q>j3m%su%R!d2Wo8fHFI(@<8CMlfeKMY|oGeYLEIY0#v0V&4<bb$|uQVD{Rjo
zIOOgDDEl(p)6$>dK*C$n!CN@{Jo^n%EtO)?7<`FAqv<AC8n=t})32{eJLy`y<s^;W
zV#&-)jB0$xDO}kHbWWT~yP?<eH|J>$I+b@il>smCz2!iU<MyPT27LW8hgYCwRsF@2
zc20|~3cbBzPyM-Tg@pG6LxLoN!|E!1&4SSBSPI=<+1s`j)=CoWEr&;<Je11MN5I~O
zt9PwjNxu0KN4h#m^LZW5bC$BVkMS&y)%MTD`H1;wga-x(F6QKeyDT&nl=;5u7D;7J
zyX%;LURoC`JR5xHu|;LF!vgT5Zd>OHQ?%23HM*4}+ts+St>b(fU@aWY@1!=2Q$nV<
zOL<0s1r%UnezU|csD<DM@Pm_X8ul*8!s(YZFJpu<%T?|Jh$6B10TN6y>P_i?MGJs=
z=)1y`$@RVS-EamJhtJ;uLL*o|Z}Qx57jiqH&83!7?qZUOQ|A?6i-FOxc6e!zH-8M*
z3`X+n1YO&r=S+$4p#M$3%tSM~vgwV~kFPk=KJdjZc&tv>eRI09Lf83YT|%2`$Ds|O
zS&A}#8lR4$lSnDgP<M$5GD2BeA`TGGk>qnDxsns#VUDI{n!+3mNx^y1>|=O8B;-oV
z&CL=CdPVNB>635UxdQj#^+^-;Yv&Hmc8IpM5+VA(#B;?S<vXweUNDiFB?GUsWDoNX
zQw#&?35v5Ev857|TzAMpkEed&JM(&vW-apu5~j>wSUmf2pS?nn?+X0Jaa*X7O+L^d
zR1xm51Qe*Dx?^YzQVHh4m!Xazte#QI1&;R4MDHkBE^yxvm)KUIEs!VMZw5pYLcbTT
z_7;M^{|^pMqFn+cRYH$r|36=gXc9e{<)1&W_74mTgCylIi2{q&c2#iI(7)_CG7&Q6
zr9?&Y=fJeBp?~M8qc5zq2(hvKmZ1t)&n9n|Z_#siY7F>7@VhN%^qZ$FW$bbNM>6Ez
zOISZ`KK>T4y7N7w`n$q%;U|r^b3Sjm^xSlwTy9&;0)4^$(EpSFBc8SALYa+5LdMTb
zXTqF>N5#7cg@LfCLlb8B8cZntWF>5e?7n%Vkw~JcDMW%iuxXgb6`=rxRkkUXVB1#h
zBLY#4`M(wG6&C8YIeO1i%WBtVQ48rN&>C&il_j%)8G<IK1w9Yj)hgZRt%}i$zXfW~
z?WCe{wcftd&bWWK`L}3YMlB2>2Lv6sQ-BG3)^E^YwLl2&x<2GAN7|w0W=rl5Z4<L}
zpNHcHdD@5q9gZu=#m1rUW8=A6Ew|7dY5z&vwJ)P|Ky;w!L9pG*MHUzX-tfgE(6q2n
zS}mg|(cvxTO>Ek=qHAC-g<*$db*gIc^D?Gg#NJ!ma$!nFoXjx1`_w!<MK3JzP5fH*
z6DRwU4H(puq-z?DD)KrL-M*okg{qsKt(>N&@BBakqq?}Md36+el5ldA5%I^)b8;Hf
zy!1NdwZfqtvHmnKiJsH;JTY~^RG-FU$ir`OCm*m|*w$E-x&<|SNZ-%Wkz}C>f^$0J
z27bk5p9h`|rI0t-rv;BzX@o!sNE00w5}d()1a5Uz8}0NV&{=At=fs_9BIQjxiqvel
zKCZWi9_Y~eu2LhXviTbSQQ2a<1=w4^WD!3LRwxua-<qd7Jg{WX{Gn~)3`)erIOlt`
z$`7;d?0_eomPoW*($|jwuK!U;KY@DUW|-VAV0LDlqkYXeQZ2t*k?ZWYa8Np04EYS$
z1maRrc`35&r{!>=mzoGRzh<1&$cDvZZn{jR6;S`ic&Ite7ZHApZ!lI`?}+7MeO$0h
zgSZO`3_iu~_(CnPvV;%s$!C`Ovd<#(iTt8p><}?wX@p4uYzYyuHi42C+7i7;N&Jns
z3zK=$i2OvLf5B(|5S9X>5}Z;V%!e)B13TnpbSW&rxP@HKrzv(?q35x%Z|vH?*<;Om
z!tUW7<s5t*(P-A+k&ugrg-9O3o5c6N08Y&Ci4V*J#L()Irf#q}>%FH9-<fq^#BQ_m
zv)G}UASQHF>t^As`Bx3NqqtJC?g!XJ4ni|fM?J(Dm5PaX9NHx(mC~<TNzMW_Knw3T
zj(OD8tBtY@Wx_x3%y1=34vxx>3gtR;5$;{z%p{<6=E^kL`=U*;m4d__OXc<?Pmc)@
zgu~d;CDE(MP@34xD}nYUCc)xN6WY=u=-ilt=uxuNC*iu$V;0h7k$By!61OFEa{e0n
z`jN)Y6k^oMs@M~!7zh%<uJZ`<%1i8$6=JR|`buxtf45wcEW00;F=OqB@3!sFL`iUM
zc#D=!GAyOLNaw+d<ivWSR*y1M83@s(^S>DXb8{wPtu$8f?}OR@M-mYtFHp_SMMWIl
z|B2#}q7@g%xLCDHH6pFZE|H{Xjzm#ek;$*#K~X#4YFfej&fB4@z5WsD6@V|VWR53z
z1`qrN_@Ow8^aU#T60vt_w;{ct5Si`zoV9(D#ec$W@hsr|wKxl+P-yyxN}`Z0i(@X#
zBiWlG^7*zWQGn@|cm@Z15ZD&$0#yKuJS>TlrSTAAuR9bRD~p0olD6cuE`(HrE%nFb
z=n4&A!%f%Z^nSJ4nq`(r(Y4#T<}xCY-UT<OOtmOA)0Go%6QkG(ET<7~QgD_j?L1tL
zkvSO7UYg|*onBI5wMRE;Cs4D|id@N6-iQ%qR@vKxxk@CjTWhwv709jhuv&beQ*x^p
z7hvFqcZOlBR4p@b$cvx7b@6Neno$;*GR3J|yVPXSjyO23+Tp3;OYa=}=<*&kCR$bS
zacx^k28OG{b+pxWqot58gaY<jbG89L57Midj1IKj!8*oLDL_4}I8X_N%YMB`+p`p^
zb!V&%RSHG>kq3zO0=6Ef-$xdw#a`K(sX^h@?s1JWKhl<uF^2%~8}V|DVoeC(crdwB
z9Q8&KV$HTpPi<yDl&2eH7Y;Q0Y4B6F<+Bf5%sitGIIfw7HW2`b7Mq@sM=nC_To5a&
zO%$WjWPpb6T0-pD>zuh3=D7svP(>Lf!czN;B!gws<Y-I|AZ_Fl2mkVxDt#E4PP}T?
z;p87|#OayoElqQ-zYYGG1!NUiCy`A{co@~lk(?Ls+vf$B98NcgJ<Zc`9)=O;jB+aK
zmE-e#?3PczJd8K}rdu!Zwvql0Pz8(HODOxq?cmB6{$1LB*v>AAZ00JiP*N7tZ5&K*
z?p%1(!Q)5?2ZHa?SHU?9JPc9r%auRM1Z4Q<I;z8-k;5<WZb>?@M~yDilTbs*>(QJa
zu1fQYW=J$90Ny~g&EfJLq!*clOt6f8jd})25R5@7{GrbntZ2j~_#&s5bD>v}eBs4=
zgTj>7b2}ZLdY&U7x<{TrqQ@3>bEV`$a2xU;GD7Ih16o+WXhdIuN3{-=NcxLv?2kQ)
zlBI-6o_m_Xbw5+DY25sPDL4E%j|KUXE#fOe7+?B`;2qld0$%xo=5dQ9_Ynj81(P_g
z*jITvylIL-@<`t$ib|U4R3xPwyo6I;a`p|~bi(BJX#4#I9v8%gXU)VU4MjYxVQvX$
z`%j~86+=NNmBA^ot`ou$<|q?ksGB;Fr@A4o*uq}7LTC6KCPmjLEMa`={a@9OusYSZ
z?SCfNFKQ4F;{V<s;3vf`Ljk9?VSNAF1nZe{cA(%S1`siYGttOCL6aDQDWRf5oA%3r
zL8*3;agO(yQp{`_IaR~it5q(qRM#votQ1?Cfk_NA6f{@wFUae>KlQ9WY3+W!>D#>t
zp6skAGA}&8y*GbMwV(K&@Sbd@CcSLj<oYCpr`*rpmk0Zw<j0*p0|}-^n3*C1FlHX&
zGw}($BeNkdjXgm5$0M;-LmuFyOya@<b&1TiLHYYbV6kAr!9DKTn9-y1#f)mhWV|{w
zr;rEbg!5F7wDy;5ll@?4@8<Xf#s^(qO_A_Vyo}Qr=RS<NhDGgsD+WrbyZS_<yz;{^
z??{lk2cw4F)3GPifHk*sI=a-MG|Z||`4aHW1m2lHpKnq1X+l}i^-J#43AAS>^~k<3
z&@gUc_0RG-U+I!B_;hD0hw_)f8npMILS~;7NqJQTBz;%I^OcS$?({018(%QPadpu3
zDcAHEL)DpWkq0H1n<Db{;PGKSXu712T=<s;=|z4qB!d&+0FUjHeN=a<?lD36e_A%J
zihg#f9oZ4Qk>}RlL&6$R32mzNNSW#7r=sud?Fn3KtRs8CQ}LDE#!m<*dsKAE9>q@#
z29DO{5h!_y9Yv|dR^X|ut8&-e+dDbN4ftT}j21PA4oWmp7mXTAL|c7nn+U~)O*JR*
z?<tDi?4rlO10`ZKtLU*=5r|m4KsP!a<hSrx2F&Yza*~25T%4_~&9@huydNLe2-#Tt
znA>na@BF(FPe4$GkT!4VS(j5@M~xbr?!C5E6}BHbk;+7`xw+L)Qd;ffBkA&-GE)<?
z*{QRc$?Mb6+S=OE+zgeG`45akrL`>!H?^ge=hc@M1B=^jeDd6EScS}nRGZ2xUGy|u
zi0Znn_+K2MX<6Gv6Z(bwZ>8-LP7SXNRd0|0%{~QhW8o;(c1f9r()}HxgdE5SX?7e1
z^@e0qs(dWcx97UgzF9erE>5<D$AfF21pxGoY;$UIdnnQ7t2gNQd+`4LI{T4A!#`7(
z+iFSdKrX<-FW$(3&~{4H?PYvC4iYD{f?C+nAaigPlXdil+_Aq$ndw>b3I3wD1n{`{
zcYF8}O**?MEWr_^e%_Xi1PGDM2(B5T!cyM%suN(d^4|tC+K@JlZzOx$iuQ(yC0MCu
zRIJ@f1_I+?3~f&60e`GpdRQBoF{PMp`A7k)z|`X&{E9F%B3}rJ6z8WHG7Qz+i!V7H
zkLxw7$MnBR!~-iKpei?;AujhEA&hD-EFp{*)`H9dKiA4@(iVh(a%5T1!!YV7Eq;%)
zV|_5z(sf=(xhg+dpb6e5HGUtuFa)|0afPdL)(4J7Ur?b*S@%xk$s}COkJ&f#>s3Du
z1N)`yWSLB*wrRbAy~rTcOt=_k1-s$t{dImGN>5r4E)P2bCStbxj!uc@HfwAJM*P9x
zcWEektd?uZuuk2i0!%~|LOU%I$cUq1o$&pp0RZN|ikT<`Y+)?+EN@9fJHM9F=_uqA
z+K2+^VDx^~uBY3!=5vLjoEXC5v4rO&0(TI_-rNBt*?THe;IqW6{#G)5Gi}_cocUg&
zgd^_yOj$BkYjy}0_B70XeWwwj6sNV-`g^qKJ<5AOseO|NG-!S0VY$cH90H9dC~3YA
z>4Xdo)|Q^l@9?lze-C)ac+;(M&ZAAZ;P^Kr2E%#2Dcf+x)oI&!5(T!HhY_%*02yr%
zpU3x`%jhKSCYSTkk#I`fs5b1=L{ZW_6`=H&u%QFAtDArLPREZ)>key6G`<t^0!636
z+|4bTwBkYo!EDT-)JsCi_9NlNS|4fT%+0dm^>i|~evQ|d(Fl*9MTNO8o=RKoFKw+%
zVCq;i&}|aAL8KOB|6<#zx-jKp0!~v+dId@Lap3Ox&m&@L!gZ$7NIMi8UQ11#cifZK
z%l*l)+>N&!etSb^fJ@2p=TVWL`A9h@r_gxp>gGCv5!;^^5FO&JFh}i__+#x#>8G&w
ziDNLjYV*j%Uog+_st7;3wxzvVy=o%brfiG1@B-DNw3o^D#kN~@NAFuX0?ggpOe;B|
zI>FhUX|?*$dQ&{$9lBKb!o!)T9-2E<e~XrAoo~k3R$wywL?43_$d~>x_~8{JAnRf2
z%DJ64-{=Z0z;2pB%1%o14C`X;i?tiGMV433hW(Zkd4G6pfZQp$=fmC;*PD0u`SEK6
zNrd+iEXMj#^etfo>26T!8#s=)M8#S@pPODD56jBxdYsZ`fF0gjc31e3CULXigYy|G
z5F7(JxV*r~{)I|7_cHl`5z|W(I{FF|lY3ao_Ju>J`eGH6yH{)TLARU1mM#^RU7lxh
zPag7kGjH;hC$%*H5^nXl3Vj}iu3*VG5ymbsFw2}UV1gq!>llp{40JyMid0A(Dnw_D
zcruZhbdX5{guaE?ST0vz#06+VQ;|cyK=FCbY9BIJvcFjB9}o`b_cYu8TxE`lrZd;v
zwFaN~>A*9>Vc?-PY7E`dKxMrkb~#1j#T2EQx4^N(1+#LLwn~M5m=6gSNScHi%oQ2T
z*UpQ}dMv!Ke=#h60qJczc(i#}UVV&38vbr?XMV68yf>=!2nJH@)Q06hrp<>z_2<r<
z2TC<myg7~aDtMRl67~=vT!+JD;e40G2lz6^4hJfh3+9kumkGbXIVV`&qIUMR(NnN_
z=la*&J-@u;^v*aCy~5?&h*7PwP2A_-Ir*dcr!c@mr@_2x01sMU>^6a{vkX$%R1J|L
z9z!gh@|2BiR3EV;f`14_fc)F^%e3rYDBoOgj9#wZvEKcMSaaR%K4GHlyn%aP8O<H#
znV!yUTC=2QCZuhBO`0}hCS*B0Sf+1!h}|O}K7q$`=<aYMAA8|val?`lBt(lhKWqu_
zYk-5t?x))}K(hoK-YCtpVm92i@fwbSVqn2tCrORjYuUOT7TUD_y0~#hGoFIzZ>g%0
z3O$0UhQ1CuN=o|ZWrpb2Nz9S+Bj6E0C1&>^mxT97%DdV|rTcVT<!FffbVbn#wh<Pz
z=x42t5!eM5Ijb}OLgJo{MK9S(usveM<TkV!MUx{G(A!+Wa?&~bI^WVX?k`?;dSmw3
z6aQ;R=r8CXxe|+1vz47Hi#i&@Wl-=>5ot_Jp}$%ciCor9#d!;Kk45`pjXXu8Jki}H
zzSOqjaQG=vm+oZCR_*;465s+g8Rc~<ppBbeqv59+8Y%JuJb=W9uNYv1Wa_Cgevk-U
zlyhAYFzIDo#Y0TRjzN<Iri9;WfbpJ>d9bMyZb)9@A}xgSCjL5460|9+h07}9k#&;4
zt5Og<q_S-){IMTh;l7yo!{mN&CN<Qo+hRx`Ws5HB?8Aj(EB$Zuy+{tj!9JIMP)pFY
z?6>o267X3q@Zia>e7A;s^3bJ4YNzVC^pE%)P*VM4dO}g^X;8L{#gQJbPp$`TZ>hSC
zm&PEurok@8SSt&o!MPIouhJ=B`^*y%j)sH|+eY4l3Hm`7iAYN6RkDr7URr%0<Xo0-
zg)Mk<=xUL&i<!d~*`xDG3}rQ3S89>Q?f88yEdWdeWvHx@5j`T}xn&Lh;QSoTyM4VH
zsQL-<fhWv{0%WM-9(EsIs!5b7QcizmvdME8LoSx;_w^$)*KU-jihGj7TEQ$o-D)F_
zbObG-SMqbz?5UAZ7-M(&;CcLZmvg+5@I1|5gCLZyu&*4hszMl;OP@&W^PYTYj0|&N
z$@r8DNeup8Tc!ViIG})m9;V1$J2~V6Hrg$uPw7zbZ&(1g2!5l$-^5-9e$GtfN871%
zs?!L<g|J_<9x+C`NK^TTu(eiM(e$F}C-@I`{veq*+Ro}zL);Tw*}FJHr^zQ`))OYU
zpJ#WaKYov(imMrX^X?#S?nyYFlLuV<H1Ts8dBePqT%|eIzcWnU-MnJl$-0jMVsYFG
zGTz+`;LIvcMS*mNT@QN_s&9_TEBKbGsXD9uHJad+i&b(KphxlpE&O3n!0KoV*pAZ*
z2~j|r3%alMS|r1zvj|M!<3_9EBFhi66$vVee|a~MhRRQ$QF4|iYYvRGDkf{5;)y3w
zOZ=b9I0==NI2WyzPcF_72`IK6fZu;z!tDGUo4BB!K=c>-h_zV*pE&N112+Yv9Am<Y
zl9pdEY&xoH@HktE#%&LuP)0MzBQyrD<z&E}1`X1_Lg`_<>b>Sqn(Bg(rVI{caJRYj
zM4(_9W0ClyxVM~hTSSl8k6Se>em|{^W7_*rKHQ7SzJ{mkft`aj8z9Mv<e}OrOh^u1
zsk1Z9<L_o=sX{((e1g&ZON6lIfN%dO{z=dtifX4hWq3VEn>PAJ4Yl_y0gdr}<4w$1
zcpbL>OPgXk1Wa#*MmXT4EcY+cBaoCrXhv6QX?EOig|U-{b#Lv4ztPhxHos{19gZ*x
z539@g#1?5QkmjRdbAb=Y(^a?ah$tG-N>&bL%T&`mVvV%s9Y_gCV=fC>j0L{Y^m#pq
zjeq0wlFjF!hGr$S<?K}DubLn@P?f7&%ZiJ%GZL+>WGafO%Tr2<w5?^y%?B>F0QdCM
zi8mK7UMYy{!iImE`lxF?Q`USIP%<)qFw!PeCLNt)%i|V$bptW@WFC-`1nJciO!ss%
zWI<^P3C4TG>$c3loz8xHxxh(zUX)cY5IAd6l*`Of!|=GthA8e>os~5*2q48SM7^&3
zJ~7vMXTq<qe#VR0JA6pQR>6M2N*u!T$%nZM+jVIRy3kDyvl0%(TxlP*RJy^YzlPjv
zP@=iHZAVj8IssOdJraYe4*06MMb4g8KT*R}+;Qh48U$J=B`x~RK+u=FB>$d&u+FAY
zmreD#*FZn4rFv}lwGNy))yv6!Cem|EOCdj<@+otSPI>m$h+dc|EQVx#c)p;8m4Q2I
zt^2pcX0vAjPd<x`CL6zJe5_)F0kp8f_U`0{#gLL^J3#qmfn{b^LE%co=-sgDvz=ua
z>)ZC&gmV}2)5~*{rfMGH6TG}@9&u#6LW#pPikl4xb~qTFt_!9{Q_UN@VLoA8-w7%^
zK5b6==a9&@InJxo#W^4fekqb=%*(y6<vX~5xIeu|8<xL<EAgX0im&_+b;9XFP}4->
z3XvEs86a;$vOBT2=<T!7d1!IVJoHsw)Lw{^;jkrVx-0pxlFidV<1;ZLV=?6!i|57B
zqum?&=}l>F9!q!J#A9pU8zjxb4_9_SsnuUepSr@UPV{=Slcy5;(wuiR9qF?YW~c<N
zoP6R#%TeLjkiQRH(Ye(jkKoR5!_#~nQA-?*kAa|qou@i^njkfyr)E>I#G@X_aJ7A-
z0!7;17_{OqY73;yjr^#rlcW!Apsxp=hagC{xo%GUesMiW2pD(D-q}09fRRkx3Xlgx
zYGsNMB6hI&8mIChJIbeaAv+1_F5zntQiPIJav{U07flOJOtptYqQnGY(OQ|N4)r27
z5<v8~elAp1CkBXjLPe%%(XqI~1eCan7r)wU2Zpd5al}f3!WR9d9`}*CfLw(S+kx5k
zmouE=zWx^G^RvJ9HF(AJl4g1D^Hr`EM>(A!?U@Q8nOhF2)hfh)D<4fF3=lN9jV*{d
zBffu@;9~#V&$$zLqe>u`H|B$}&0Lg)dI58up40<NA?&(S*#O9!$jE9t4@n8G0pYpl
zN*!~N_+(+O0$G$Q&)|7~iI(1xxx9kS^TXeiY&8n!N_>(-RdH;jitC}?sPV{<N;MW{
zO}(*vMYVbh!8F|^WO6419tA$P7AV6m8@%9_TKI*rnl-%sLR{TGaqH)OK>+a8c7UMu
z1g^&07q^IzAXP5vtWQBO8(Jr*&6t_}`jW*S8i680Yp<vXghS)uT-=F%3nz!VYi<fw
zHBsVU!QJ<UkMd;*M&}|nUgSL~u{3!Akyj-pBy&>fRiUrOyZ{#z7CmGq=<;`&;8Qhd
zh5Xuw{DAeo7uq+QEk)7N`CY?f2%sqkYTs^upy*sZWGC$M$;}xd(}hUEE2Q~=q`man
z8)mu2<DL}Bx70TTK}aYqwFBNE{z43jP%k<&GC|lgmkJRG8M>sucy9~;D@;`|bEau^
z^n^ByeAA>EUHfGjkHkZQ<j)3vX!hFnHU?qy<|E-Bdk%L&)PxNgt*HqWvB3UZePJ2D
zWHD6fcLf!h9E!7D_${-?*@oAwFtWeG6CR3gf(1~O7X!x*@vU^Z)b&0YykwP~NmVW5
zM>)2_PbClulYZl7*(x=R($#v-epc33Px|UrGLrox(L%L-xq#D<PDt-<0gXJ3yLRwy
zYqPx8HN6nwazwn6Nu-ht5Fl-aeweF+p+DY}Cz{eDrp)N3D=4a5hgQen${3r}7vsXf
zL;TjanspHl<mqmag!-cSo5wm`b0Nk%(v)tS1@|YV`L%KKSJc-ghb?^%2}!Y-Rp=IK
z8&l!5)4T)u9^V@w_ZK4#Ix!^o-oQ(ktn3|B8!Uq$(r#rye!mTY8}!NlC2CpAfTT&n
zm4D*F`!b-hlj!QdyVSZXfTX|tXh|t6IE^=ye*d!8Nl2@JBsaFX|8K_9v6r5O{hzy#
z3YX--hLbcW1eKJx3JpwFKT|>1K>p@;H!{S-=qL3=B{$LvfQ%E{Pau*S0x6gz&Pbb@
z5lBriGG}F_%}9IixhbkTbm=*a;?^wFO!mD~`6^OPlzE;SxZan6S$gu>uD!Wlb@+O_
zc@_l0>+^71i&}(-0%RH8!Uqv!yfal9iiHF=!b+$u8Kot-bOCt{qR47Z<Ny{-{f3GC
zkQm@;%JV@{@C?g)T709OlQcP_a8m`WvN9n7O|awIP>vx;EU+bNmjUI8NE#SZRCVZ6
zuuBGu)tHmat``OA_)PTFbw;NZ{_;Q56aw!G!7kD$?Y#Ya&tTaYjB3&+UQ0~kI#(Lv
z=|6{FUWHLNhJd!ACI-x`+!_`F0WHL%(_}0)IW4BfGs}%yXA~5J&9%Ri4{biI7H!T@
z*R-T9=bn7G8`5sltTMk~Ksj4*OuXch>&RCL*G5}l0xWZrN`BknvDk4ZX39%@$o+Ie
z#SP^uMeDF((I=ANrU12@YmrVb_Q@f0eWvkmbyW#hS^$bs*TgkfS4EqL+WIXn<Rxwd
zT$3CL01OuNCS)d-w6?Po?AIVJl6vf?;4jt#FV4#^LZ_U!a=;`F9}-zp>@83&R5XhB
zl43iG((By>PZFhWy5WgKI!0s^ZLqmllUs66Nh#MR>hEtA>V8W9%Zso)T2Z$sm=_l1
zHXuyi$pLv;={~I}tBET2#M^K-=JWSZ_$u;~h2iaR_Sb6j(XzgjX>ok{80xA|trKxJ
zXR@Z!)wL6A@M^5m2HgUrN?8l{pboM<r3WY5%J(p!YFVz>yK43jy8iXQx~l)+Bi!us
zBitN-LlRoQKoi=$1h)$gTfhpe-a_`M-X@3E-T`Am9h_7QedePcxHma1j+|H4DX2Z8
zv$xx|dlhr5<U0Fm)E*e--hSzcwDy+yu5&tneBG;x4kmXnzFV0>KdN>WC*Q12*vAdM
zOjOTG0aZ^x25J<c3Fj@2CUW2}#?S)YHmw3;*SbfaWzcDU1~&JgB|<z6)5Juxh#zk7
zECLHrqyZjVxB;D5;~i%q{`O>oJ}NmTN50$@?~A{&x0#A0MQfr)bj_y^D*2+>w;lr5
z?Kw7kGS;1?W6h<XKql2|%*@u4o9V0;4iRQkAJN5&WM?N+%x07#r%GRn1a$WQ3b*+B
zPNz)j6x0VIoEOoVVE%nbk;xW;tdW+LeFHX}P7^<wUop<!>!|p*q@-F%LLU2D%(UQT
zYwO)T(mHRkpSeXOXWHt#D%uo#GB*t3X^rBLz+IbrE=wNbCC$kZ;=U8j1)jfo6O4gW
zSBE5zIM*$hBC2O>JYJ#a8&IN>EsJ+DtLBHU9KU>dg?qm9RqW$Ggb!sFJcN&ARsc_w
z@C}5fXNOcm>;u`!U>+AavFnm8$)bX|;30Thh);8msj?FwodC-L)14l9a>GDTHG*aj
zMb2gr_Mw%deD*5J_|Z^E@3RP;@xm|6*vnayMS52>VJ2oiOHHu@$9EErT@iYE9sBRV
z>L&Zi1LA#$3_3@Rc}DH{3jLucR3Q1h_~n?1h0;$}!iF00OA`D}O3~2_3h+;lI*UjI
zy1ds}B4Abs+M1N(FXs<7KcbuwWT=E8fNmd?GPW?($?3Ap!X|6z4Rb6Zb3iUrgh7M}
zN^0QcFba7)K38C&Fu@JxJ@(+gay~mc*|r)Nzry2m_(v2REIK4V&}2{$TfG>;3v7Y(
z*3^&D?6aKdLfEfeVfl`aphvIXQ+rI2siP{?(4h~A>es&!r_#R;65<{1jv%%fbz2)&
z_EYGS@IMh`y=m#9_rI}stfXsxQQ*f2<8NvcB78#QaN}q)iKKiiR@vL@Dm;n&rpBwK
z?=f5kwggMIy9Ky!sskSdI9wB`6tf#{2cMkX_b&d@&xhwxMi4knj(Bmc&~&^IEx`4p
ztAeC>>;sgu=3M=lAscwlStQn1jv;pW_3iVPv+qUwL8PRsQ53H|FY*NmJkTpi9ep2z
z;W<N{9u}`wy7JK!Bj|Mjj`X_2W^-Uit(-EDJvA&J8lWyqxxA<*XsKNfb0ONNLyw{f
zQ@kc$$g`2rD=jWj8B3|({ES25Ifz^1e6+b${m_@-<*c;J%T^s`w^<TwRP5R{C|qGd
z$eV-4Z<KZ!@Mu->Z+)=~1JWQW_d5=BKxffQ+OibME;<12o5MFdFS?T1%p8}coqCjw
z(&)1R3|i%J$%ux+VCqmHj|4HIa|IC9i10lAfrv(v$qZ3QYRV6r0raNxGj|zD&}gZS
z>qF2p=}ZZnMuuxcZd-HpLriWGf)q7>D&Uc@M|fuRIo*TtnWMi6frTw)u`u4b&W{_#
zit&h+>hbQDQ%VZgLMKTL<d$sU(Ya&xb@!a7xyk2z!&O~_8Erx?tok8Qkw#+_?<f;h
zNJh`t#O_In2o%8x6ANsy%CGtNQ=m=vm!Jy<u}qLOpvS@{0?t(-C{GH+l*WJ&Cj>=S
z7z=BPO!@h^9AD*QARy*mzvlyE!{Ky;((=r&BmVjx$IWY+@=xaDED`(1?-+zVOtly<
z^?}Lwt117VvoQ<`P_5))Lmo_CB68;5gqlDn6p#1tMGLfD-i^E17hdJkhzA)yx2E-N
zWA_ZMos-1KMQoMMpM-RQa}uB6|M@7MSix}#FaI;nFW5mqh?458Fq3A55P|>0(Ut{I
zrtc||ewY&X)gelenVLzWiix6<r9sGP!fTo(c99h(r8}8}4K=%!7g$!WXg9fCh*aY?
zu?HxN+f=T!SXXafTH8GPy=pgG_k6eCOiMrof1Sr|J@4qv@K1izJ;%=Wz86!5TPC#3
z%aV6#XFyrubT5s|^VB*4k$dlpQgwaR2|89~7U`yWtY)4T;I{UU)a@S@4!ZO+5O{JA
zioxtt#qoI@esgEK?pzid?~pXjCYLPAK6qAk*(DwGW$#kXKDhM=om}Z>49gQBjy1|=
z*dslUq0yQ*l)Kc1y$1(UtG*Y*$hhRsV4dOJE3+ecmPZaQh!sTu&wcB|O!Q-21_p!l
zclvqxyC!9$yrejK#7<=SebbTKw+1yl%V*AeS#tFco=+ATU%(f1kM=5y-*J!(Xk7$P
z_b%>Vy?5vdIi*|*!=63Q41AMjIDN|HUtTzYQr`9ntz}()Ym=?_cKWanl450>W^r-e
zFNoQK6xlxAk4`;66`q^>+tH&}7{=Y{XU`XXK>JVZHUkR(g~8nW`_fm|hC6|5!HZ%6
z`^2~(rpqU$`#}W$QYT?<{zHRt-k!bD1h)$yK>Z9xPcIgr(#hx{_hqp#!Tf7ps(Zv6
z()feyg6;BaU25-Coa{qzD#Hme65-u#lD>arZ{q0B2aOP5Zmrh~z)OHOldtq)wYy0N
zy)H9%_Qd)tlx=tERY$)A@U)NhBJSlQWZql!(CX&DE=!mI*?Q+;x=c&b=h3Z8YP}f)
z<*>W>`YtEo!j%IZEQ0W9{w#jZYCD1>65zQN&H9Ryxw7P7z3wS&;xan&biAC&!BOkb
zX(;+R(kurQr^kYFhp-k2a5RvYB*BD#US^K535V`>G<G3kv-E!XA?H21@dk%UuNT_-
zM1gE|Zn$s$<6oEf5K;W?Z3=s_DMhNPwuBM$6egXW*CfDlDSEl7OgR4UqnLZBXo3*Z
z;*>60ChnD!5iyR`<7&`%Kux@2PLfT3=oGgm+wvB086PM5hew)CAaP?)=VtV%4*1@$
z{b~xVkP;IH5boy*L#{N<VORfkr$e3|vYY9rk7>D?P^q|awtRAIj!mc^9aC!~AW*}6
z3D-iFE<~8W9Xc1&Pmu<y7G17wK|!~CI!(-pj5weUU`jB!$=8hejjnbKcMa*{p(O^~
z9_Yn@5Txt{Xw2ds$6SjaXcUkU-gSO-YwT3Jna0E=cbKnr>1FFnJJHl3#3=R5COI>L
zVjh$8+j6oyDw!^$RRf3}O!L^$#T-8;&C8}+p$hL2vO$r|Ra1m}L%PiiIt4R>rp^B0
zzz}Zh%V2gyh-kP>^PgSJM?_s1z!Ge&`JpFZeuiw|JWgH4KFUX`>3M6RAPCYGHXewp
z54a(y>tkAkQv}!n4{E@5ls33h2uZd<NN;okQ_#>lC1Sd5`^gC`_0EtGTd_H3{5q)s
zH+i%3Uqgpl0ISc&a=28AFu96xAtfBOAlO+y6I&ttEE{cUfO3_c0*Zvj!<*bdlFt+{
zKAj08J0`(0s(lb5-WV*np<We_Kai3%fxVt+P?O#eO_kD&_g0bZZ0M`-xMpg{L@j$p
zaOIT}xt0_4f@3wjIF?)=6*#a45po(6pqZOq*Q6KE^rJx9R7+1hZGj(K#B+@4C980F
z%1km8t*!HSeOi-UWqyRe3)WjuxNJ8tvW){|Yq}0|bo#nqlZjb%F>)-jZUg(0HCZ38
z8+Cxi79|#uqAm)69WOV}9z2F21(9|yw6lR9VGA!=`6Gz9KWavB`PG8w6BK9HXe6*(
zG`-9|P7D=xj@vbrT7PEDTym*Bom#!0+$2bXbq60#q8fYeQpxaE+jT_(YKjf0(t?4W
z&_?BFwXVsrlO&(U%}4-%pi`Ba=JXJsz7Ae5oJzwwRe*;QIoBhsTSANpt-^*L`Dnk&
ziqKBgL{*`*oy@6dj78uH^xG3MW`b&f+X-61RvkP!FfXvea!f#$Tr(Vj3cPE>aANNd
z=FK^cfTvLYqu8_}W(*!6CL#`mvVhh?O)At2Hw0{~BS%SnDTsijMYCYUWh<sS3oLKq
zL9MSDqQ6bT|2Uv~U>Ade0y6^H=qr+%3ay_J3?m4<qwi<3#$mdm%8dJU6+5&EW_-;@
zn^Km=O5tr-KtQP440XA%jpS}Z;i%GOS5@wo18GwR5>^WM_XkB~C01G><ybgP{U805
zI9x^JiBd9T@^;PKdB%06vI=-+?jU;=PscvFVyCc;UFxCwKZ&MzxqK-oytNDy^44a<
z^_r=k&lxklAjch~^ZC(^eX4pXta68#Qdy#KBH4(LB$8697YI~tvwC%gpehD4Ln(Aw
zU#ZL@o6SNQAq#XeF7;x-w(x8=tnVNi(amPf400>|6j(+z%KoVMJNL3bCI?eF8uW|s
zGo^%pN42*MVTT1BDE^6Fh|i>oF0=UyD1Ny(?4~#Yn>p}D?jVAqF!(QwZ|#%av4>Wu
z?^vM2E#b>ERbs43Vu;9f9MpHjH@rTpIP(kRhemL`2_wgg!zC;5G!?>KKScM#<Ev8m
zW}!@Yml7|sgrJjy^;F!Onp<?Q)Q>3(8ZoUL;FxP-%4#}mTEOJ<k?u9Z=(O%|EBKPT
z@Ikn>K^Xl$i1HmPM74JC1It>b8TzxfsEfn#Py4b{@-@O&>*+N@!m*M+nyPcE5fwTM
zhPj(@MB0mz|KuOw_b;$sdJ2XarD|d$PBAD^{y&U+8pS2Og2*?|g?V=uAF=&6_f!S0
z%{2-6^|u%On0HcbD-M<!@j3L`|L&^IuaHhs-$RkbGgc@SL<tDZx@2K14IM#1v+g(s
z&6kLnm}7Ot5gmvg3T1M^`6+2x9Sda)BRXk9*p#x=Bex7>XGAVL!p$HK9vQdghS!K7
zXujJBF2c7XHxr{0rJaLCsFtGTXo}E|sF7!B8s9({eXvq760pn2mrwm{$t|8swL9}F
zzVrIZ2?uD9>_ewOLkxZic~TAY8M`<4jw^hUxG^>)>~4j85aQf3%E4(N*cDGV_FRa#
z;%>m(mE;4b7xG%yH&jcW@snVDZn#>)Uw(Y?BEs9nx<}Sbvo|SUsg}6i(ARSr6H$n%
zG`zc1fgO2irwjMy@8WFuR%f*X8-Hu}+hhFwNZ8S>{8+iObhm0_+ltUkahVY^g!bGv
zdh3*9z5EFQRj?2E%I+5fx>;#LuCDzOoF|mZWBvp_I1>yXzZTX*V^V~EAR9?NH5kh$
z<J(kRIh`)t+rPMYkWoYiHT#%G2qJ^q0MdS6T^@byXqtjlNDo0B7(-OjRblpjq?6YX
zCL34xvgzX}1a2}?q5&E@RLn11Y!<c6kmK)GD+8UUe$}X9YZt4VSuShKFUYGgRmBa1
zi7ErX02^RV86n#3{VEXWJ2i%Dh%IF%v1*-Wd+b^togME#NT`PJCQ}*Mo5X3{t)dX@
zB0^`)z>ExHY5HTeHk_~6(tAmwW>wW9>WF!eOUukMygv37SI^<?irqW%s}sjGauCJJ
zYy-YbtuEq9Y;+>Ln*GIMrMh^cQI%F_n3{mB&E9%Cc9sa*h577OHcVZMG*k#zbavJG
z>^2vQP$yOO@HwT~c9!%7JL)j@NzPd69V_OR7tP+Hn?!H9{;qijxoTtz<I$$+q6M8U
zVo_I6jDJExSMo7fr+NF8p_g5qHM1a!j|-A|$Hu$$YLqEyaqTYS#ND+eukY3^l1zc_
zD)`ed)JmkzVP085Hs&l7Rf=$<MBJ1101T$ZAziad9^t$O=VW%yN)<kZoAm*#-_wF`
z$5a1Oa;6=BOs_w`Dkqx@3c1uQa?l&kGC3HJiy3|?^t|v(Q2VkB*YX<Xwx7G`Lr}>Q
zul8MY#gbd&^hN%mxF8sk$#IV4m$?K+`}~eD<91Nk>Te_OqC}A%VQa0UDV?mqTLm#G
zFN$l?dax^r<?JQH@@sbw#>NFBsU6OYb+~}`nef?7G4yltPVsZ0>?Ua6wNWZ{)$pJ~
z9d*%0lr47P{p*>xx`hr$@|1$_R_w-h>NnaIkvgbfG%KQQbH5{sSKdQQ0D}OekOO5+
zgDcVXQ`S266K8=KOUHJz&TNPKx`wZmY>`)?a@0BbFv${HxSyus-9b?ZSllubmpD~G
z9U6gF5%AOyK)D{lgo{H+FxhF~9!5r0YpKqOd)wv5zJh`7<l(6jI=HR}&up~q**Z28
zV;T38seX+Z+ju0`mDX~x_dNg>ZBxQZkPYfDPU6J=kmAR7zzL@aJ*?0+Gy01=jNP!Q
z0CDVgc5unUJ(H88qC)9!>+!D%CM1nm28?c_UObVJs3c8*5D_8Ti1cnI4L}Pia|l!&
zrVr?6f-PI?5TZl4FSMU#2`r|caYnHiPFtsBh}`VLF4p-d1BqWcT&V)mEhEE(%-QJ;
zAEg`P^U9|jwUJCE!40#oup1HAximq)_IsK%e1tK8^Y<BnvTYzkOAeIHh^BBV&`dgA
z6tfuVK2k<oR0#Tol-|HYpxF#XjnZ<COBE-vHvD|*zW=?&Dc!I;ktDL4COaM-h=CDy
z-{Is=A?<H5id?CI4v+(`q^+CXAfLa2(n8zT#Uaa;<|yV!-I)O78d`MI?9Zh>cQTn3
zOYyqM8_>8}iSl{cC6BYRd^{5=MT4K^dT`#r>k&a_#kQ1*Ttd-fWt5r5OAaOnG@hmp
zAjI}pq^4|P)4}J+TP9M&ZGq;iLe}jI=3K~$ux+Gdt0|C)x{1KQb;(;>;8<Fzk3DQe
zBU>aZrsu>L4fmS2&R1gS99A63ij*j4hlM_;`o<kd1~}VsH$TmNQ}^Cg9?zDZEy|=A
zx^DH!JoL|BiTI0hkQPZjF-@)un+UH!eY<mY4~JarU!l1tk&-GK$MmFTW8%NCy(VZ0
z3cKznM#psY|6&7=2o-sK39eNCrGaCUWvxiEp$OFH<SL3)%3^zdB{)Y>_$3gKDmx6I
zRdVjhs5lIyf_D$H1rp@@6CP1d$kK+6Thf1%937bH>MS$G)VdX9D_)3{j-K$yL1rHb
zq|Rz-F^hx@sy>oo-2ANPgb_ih7V)8oDfO;v!=dA(Sy2aS;TCD?$ox1%PIH_Gdqc&C
z3b|v8>yeY}+Yn3JllF!kkSn%&#OP{2wW@M5{xY8Wpz)hF&LR{tAds;C%N=HATs>Jo
zb){bt^eXK$uCl))+u=gUjX%jpp3|*pC4K}g&rpk#Pkq$ThfQG+GRrQaGD$nfjZpcl
zWKvx!=CKQu3=vpuG&Lk3%T~H@W^gemj7vGq%~L^KoSGSAt8@we5N`~#LTuqJwq(!`
zEq4u8;8))7ae15o|Ko;NUEFBJLxy_QB+5_#lD90be?DT#_*xz(Q=Ut6N^)xSYbFnx
zT?zeyp?@N(JlWWlVYuEp-rMqr`Are>RRO;%wO<;LK_%k~l3ftw6`o&~po%Lfr?B<_
zL0j7DUA<Ub-65srNZ$2Q(ZLvwlB+Wz=f{{{o+rN__~X`}d+j%hUp0%ZOfHaKJH<{s
zA?XkJ7WbQ`w^Y+4aSG%-7#D0mn;FYshIr(GI#4COkf!E1x8mO8_uvA7(?h?0Lf>y7
zE_M|G%>#G{Rkc-9mM%WDPmE~(oraY-`@rhcHk7D>m4GQ=zcQ%>D7%$vwwecHE_L`_
z8)<7+PMReA+%>qU-{F(A&hB&9U&xacsyZj4$H-)8ghpDtp8}NTYs@v0uur@bYk`<Y
zizHIXQT)W3@`5RfDM&7b4Ak!1y8o*D6QQvP)Ka|h?m(>cF!_wpY{aFt4^DqJT$X3L
zn|9^&gN}8IVsYn%=S}6HCFQC2X7<x*mjtQ*WA=s!?+(bi=JpmB52REE@f>jH^g^Su
z)N~2&fulh*TRSR>F*eZy+=mp=)4QlgkoR)J@^Z6=6>CJl`n?6<OXx!|uRrM?SvJ1|
zPqSL&hO3)=k6i25Y1opV-s_j)k+TwTs(74*VE#any0!3FfTfBNitp;3c7wNlVh`-=
zZ-{v;V7__MP<iiR&CVlXY|P42A8q~C$g1=eR;d^xt=1~-_%@VAZFIx-PWCq)y><wU
zhUjoRf<~}tQ70(yE@`O{4aV_hq#u+8f(Pk4an#}1t!3q;sK;+KneCo7{#X(?g9ajP
z_@F@C1hMY^w2Al1NU%#Bn35QKsfUgGLrgx!Lk@ON3U>YTwDix5#VNZozhLVy?#~V0
z{ejxE$EeodroBb0cHlk67R3yAO_5EdYHK+y6h~HxxHB7x)VtdCWk+1pCf>C9z-aR@
zI{mO;y2LgWb2;7O?u~L>k|7m-p8l9=Z+M=5$OL!DOkYfPq9gD`79}n^8ZtW!Z^?FD
z47^3t!W*y6uvR3cVaPcxpcR0GQBsd-_wzO#NWOy1NNq%An@J<<3o!=$-E&PfO(BD)
zB_0dQ=lEJ>xfY}4=uXLRr9BrOpgH^^_qzlT?y%*Cv~Y!-QD7A%d}-dCwgB^NL~Xyq
zd*8o;x@f)vb#<Q>aY2F>#Ljs~_Eo^5KhS8SYxv}M4Yy8>(_PPes%hcEr=dL<cC}i*
zak00y^+xnSa2_-#IumGlC-S%tY?e3FmL~(cA`}Ll#FH)}_R_u=MGitA@L4+?h{$rx
zaX96F7#@YP92QR~@T=zn#7ybRtIwBs>6v%P>qnVF;qD?~UXDLRvLINv{RZ>~aG<R3
zi{g#-H=VyH{%6P+?65)}?Wx0~$88Vh`URopMPCl>S?(h+k7Pts>WvDzQ}ysARpDFW
z(lh8(KBEIFACkKmWS3_e7&v}R;?)(=l$6f6Q`Bm^iwg-iAXa<N@6<uR?}`>R<0hbx
zogF(78`Sid$Zj((;X$!`Cn*0JpZ}0c?8GJ|>@DlZS)c{8)w@!XDN&u^QEF)g-Cxw;
zFODHU0L(K6(S7G_E+G-@H*&aNa?2pCc(yDZ;(zsZ6;M%he|uS^d+BcJl9ZCJ1(6Ox
zT3EUpSGo~hQeZ(+>6UJgP+AaHx&;KJ1?5|LUti;Y&NrMr!`%D)V(#8M2WIB?JUS}7
zby7O>-%-8np*huA^AS(PE4|5D^8#=0mfbq>pzbB^KM*-zD$_}R7*lm-%HHWdom%xY
zEH<LpcEArXJRNSY;X2uB(AJBH@%LmkP*g6`S$0w`Dk;vJ*!76XtmEadVNrzpBY6ni
zZ-BeL-}T2^H7g1{n^8E^!&(#|?MTBw<?Hl7dz-<#1Eta)XF7Q$o=$QJ*Dg>(Ee;Nl
zy_0>{3eV+k=}EPGGL?6~SE~lG`MG+{5J7N#jb#Wn@h(UeNeaS{esM61Fg`Cmc1!!Z
z82HU8*>apMMU~NTnb&PjvnFU5bjq|E6qFVcF!1urR^+B!e7(s^#PqjXPN!x2N@bY>
z{D!sedr&m~ZUqWkZ0iI0$E4=1bm|q|7wFza>aD;wX1W(8N13|v%}z%^Yc$c(a+F)K
zj(KbvPRA@7rfTJZB)Z}ON^W+eyU${zK*ckm8jyABRm;v7eGe|z*aV+FWL3;9BI@J?
zAxh3nN#t^zZEh3>-#uL+`Rqxe2nfw(mjQ5_e1r<f32068_d1wLPxG^$j8m1kQtc$|
z(K6TSyuTX>A+MFN*3-n1aF7}qwa$Lv8NDVbt@(!EG)D5IiT%8~K1gVeDFFQej>D3Q
z0q#Wd_`&!3V%z@gbYbbla@5jNH^6vO4to<_IqL{w)15l)zFQjuX1Tm8!IL~oI!#s+
znOJCJqJ1N#Kd%yhnhL@XWZDDUQac%|+bP=iqnhiO*dl9L=o8%ZhO7D<a5p`%ohb6d
z4+`Jlysu<&%%l4*f-|pPhvP{%zIg5;E*$XE|M7q~Z-?_;g%352m=}$k=x>t;yHsCy
z7mip!RdqCrT=#3;T_QF<Z-CbDS&uNqTBf1({=|Ofdpuhps;e$>yiG~U<kSRXdcyQ*
z>FB`Wx2g&yT7{((TVLEB<yc_%)LE|1d{Ag9Z`dpj^*r9#dT!BFUy!>Q+U=P|qf%D$
z+@Nq@l4RdT?W^h(D8mKS7+(C*5Jo@a)TJq>kLBb=I+#kf<QC+xCMdK}Wv|5gWo`%R
z9^O1i84Hk15*f;59hMka^WCJv2;8-O_MKj>my%Sg5k##Q9Bt3JNYyY4d_IC>5vEuR
zSQzqE9DKKKwT{ce$ChbTuBL=vX*4Wop=Qy_Tku6(kG4vCPt3hVUQztQuP=ikci<|;
z{7q8P<n2hi5sTTmXh-+ZNg+{ecY-k}ohoNx%N$F=$9EtOw-dsmvr*Y5#RMwn^D};?
zn6sWTnXALdEs=&{W$~cTL`^|q(#9pJ1_SvLfk;_W^+2mVX{yN3$d;wWDwiYt9p54n
zkl&Z(A^Gs_8^Zy;4QH{%wsgb(21|aVrg`w;Bgiw&B1!4co32vlzQTlvsBRS~aaO0p
z%jl8Zx|W1`cbsE)YDr5ed>bdBs14qEnN)WP$^6jru0wxGm(}=Js7f4O`!v#MUyTx?
zM9Bv|Lrc<428+7rZ{CaAKoJf(l;SAZTRQiChUi|y-thAjHt6Ws^0h51t#%0UA76Ny
z)_#BElh3A5mNR;}a+O~pSAUK$G#8b?9p5kX%RG}tGG6*|<7F+Rs8=&b)7;p2Q-N_>
zA7##Y(`3CRw$DKSwi;o?=ULIOY>%sGgKb@!2=xj?T^L1O3gqUMCe8zUzTw#Mx{Ro7
z7jQ&_QO4W3qQQOwLd=k$l;TVp_G-36kj&(>Nrqh~_q?u7NZN!txvwt=l&>bJ1gm7#
zGq<D$#vJr&S^vH+7un?$$phz_oI^<cxR)<BCr)DNn)rQ!jhVV<<SZqtr7vjvRo{c&
zX5@a-&^it&_A**rOFpp)CeMKlh3Mw?!Ak&g;5cK6lZFE6m5&!jFZ!}(N1XPMO5>cb
z->>v=t-CG)41f;)PZi3p@aQ)5GtCaa|MT3kCS0!s_?wu<7RWp;0d~hw6FN5K+s<`%
zuY`hdfkc)>mYtJ5q|FIYFh>Pz(s)0jeeVYSCE$))<{ViSXB3~H$HVovnKMBFP(QTF
zgmZ3fijj`aFcBDUq3K)x2E7?IUTc^|<>aEMWTIOopM2E}&#r23;{3Cx>h+ZCIISA3
zcIR=OGw~%Mj0Vr1iaDAkheO5J))H?$;wazWkK=mfCc4GqHDgI}t4_+e$htABU(9kJ
zKUd}DT;glv5MvRws$w+Z-jWxX&ZI6P;n)d&+6ynflH%!r??jB^J<?z?(^=09v^c*g
zGy0TgFdEgN`ca>B4CT?tGvRlKiJhg9(hYRuuBLAVO0Uf5umm{e=-!7w^W5ciLFmmn
zW^PLr5W{>;^|2A-{W|oRK%S@;Jf*MI))!b=I*}UE27%~Y<&vG8<<gyx_;p7{X{x=d
zpV{HzE`v~$j5bFx2~cj1ucSvG$;DdIch3o<_?d!9=`H4<_?j83b(EW4R86RqN{?6(
z3j;pwi9B&s5)qPqLB*jA9OKF7e^tiiEY(ZgKvvCj;UoE=uAk@07}G#`n1@!-dQ~f{
zh<mZBxCh8ov695{73!l&xh0O3vH-&>R6{ToLCch$t-DwbI6N2HYNsim3t6>ea02%h
zCckXA3R(?_xCisOd=BtfklKLzYz$wV7STV#T@;hXUZK!8CQ^PH`JP|b1Rv%V9tk3_
zA)?~jmV6cED;XzJx*r4WOrZ?v)s%=MEdTOFm~KkJgdmT40e9v8nK#9PMWk38b=PUv
znKT@81@x$63dZETfB1_3>wyr#NR+RBj|Zb9eIMWvMc0!L=V){fR%Pxy+-75XfW2fR
zVurQ!p6~(AlGh1Tz9$3doH2gr4lxntk$*RnQtSZC{~<?js44>0=q0JV+Sy4zcon@C
z-WWZzHjuv4^X22E<HN6|kNYQW&WkfS2aE-Tk#DCjzkGZmU@FLCR71A*tPFEg?2d$o
zv!!EOTS=Z>fB3U%bI!i}2M-BE<BE&ubivr+o5d7gZCG96OVHz++)QQmlZszWK~ONP
z5UsCABFNCr-W&lHp}U#d!Zx$K8zfc_hLcGOhZ=bYBL+QO#$3vZlU6&DoJn+eYbJ%|
z%XLYZy&lx-k0fH+d=ZK=u+^%n2iMU!)bClGs>+qVR751s_;_x55G4eza~lp{PO$@@
zM?kRI8IoWcHpUO*<<YRWpF2gA*VKMiUnLhhEXA=`>`>pSfnr>+esR<$$#qJ)Y2%U1
zJw95OAR-HCYHTe{D>TvVd!K7*4E$=!rZa$uus7ATdEIvNO6GG@Z#cqTfJY{W=F~Y_
zyeh?j6D}<~5zG*F8$4__Fi2X#E{<1FYNmH{id#{TcIMmjycC&Fn3UtAB{vMZQTT{8
zs<d%x(oI>+{h;J=+O6}VtsK7LgEBq$fn6k`8j<TX{T-iy!fm8?vIU$nC!Clo_L)e(
z)>l(4(Sno?>cc9QrLoxDvZJ!qR90xQ$Pc2zA_aIXKm=p2+l5=gvX@M;Zn;mQd26d8
z>|f<jfF2D?w|DTVrYD7&9XKM@Mfa)eAI18h(Oi8=9)SwnjXui?TUe1If+i;R)&k7D
zFT<jcs-VQ*xtI9PO2XPLOl4kom#YitK<d)QxC{Cx=WQdkF0&xt<U8OuZ5VQ1SBX0~
zq!{bhx9m_)>}oR>Z|Qp`7mF0zlOkf8yac<d?&Q=CG(;DNQ8}xgu@#wGHEeDaXk<Ct
zx+L#2ia=i)wiK!g53af1Qe!38d-t-;bnM6>LHsIr4sTuXwsRUHWxZwjq_=?!|54{&
zs$5TmH`ykfHlA;H(!{3}@?y_(J&A)LVjLS7(LQRsr$;U-0A6^z>N+vs&NG^Ofu}|7
zaoe9bwVPH$h=T1lxJkW7LFa)M8LnPO@cM#>JOLE4ow@uy`_bx2Oxz*(E%6Jh=Aw27
zc^o$b*MR4DM0!kl><qB06_<cjv5>pshWn!-RdLPLqA3u6$%BXQTB~lg+iy-c;D{U7
zkFh@PCr_$NC&ix$lUQ4@pKW}n-^7;!Nf?S>;6ht-yU&|0vD`>1Deh@Oo~cNa8!#r&
z6n_pK3vG4-0zbbn!T|}j`wRtA5IK8VD>qD!>E!!NYTC7AKLoF?<k{M`pfkc7qEmdo
z+zi~4$k3EPTnf?U955IYDPqVX`IB-#i%32ed~78Uw`hnvDd$aPMfbJ{laSw)8UC`%
zOrC*SbBZuCfq>1PQ1h!Oq4BaonQ)lsXuU2pRH5dCQ=BPF=;#dcGPfiGaTi@Ah#3)h
z>Uii?YHg+CiaH0D3Wl5G1x#-@9y6(|FszX>PsxAK%uRS2=Aa^e`)*U__U-u&v7799
z`b}_Y6{gptywtV>U&iKdoo6#-_4P~0W8Yv;2=lN;8-RUhhm+lWXE@O*Ms&2$)y8=O
zop!zOWF}AjUI}iO6;;<<<ONEtkH$7zd^$p><qWYB&?@wiD5UY{xg6QYY*D`O-B8Kj
zAoH)e;rqt(+2~i1(e_m~Z47&{4_^5(oBrOYsNkpFp8CqtZcOyKh%byW(}{a1R3oFN
z(($}%L5~v&h(!*YGgvTl2?WJ7&zxAspwj~200Nj)q#s+xQ}GKTZm}Km0erds=&*?{
zsMV8Wo7n-@>8z-aM!jPf7xS_VRq*{|J%N6z^ZKOi+u{w8m^RqEwe4Evb6&O1f!(si
z16Ek%m;>G42xhnHdkjzrPO)YO1Oilx3`GW%J&ru@1hY-UzI_Ml;R=tQYW3yNKv9#j
z6)3&6?h*~Ya5HZ8LT~jYc|xQF2&md2fho|FdmP+0F=o6ZCn8Es!#9<X6d%!{Ap5M#
zBp3F~g^}b6z_T6Q?;5mze?#YRkmHt|&FZAC{h>$0HjFlm5A=cg#&>qwF)L5=RGO{}
zlT7g?o&ITpC^664iHi`OOzgJhBz(4S=p64>?EZZbtLBLX0orfxypji}8j&F>A?{&b
z^K}h9q=qJ$>P*OxM2yHmW<i@i=OjcVvpEW~_fTR-$;$LyjXNk^(vtc>j>I=rZTc2g
z!-qe(_2EDt-x)k`1m(;*+qT@ct=VYVlb)G48d)%FM=?h`kt2*?14`m`)G)+#MF28T
zKI9H<2w6iukS(IUlMvb&Pb6mGlL>xoIKhpWEQa#j7xV<?6?m-GFl`s}&?m=c++fN&
zHtp5M>iGzd$emupo;ngooZhV(!DNwm&1pM0IO|{Vo`oTBjMs#%$vr^%pa<N2>G@Jv
zFVBXUK@s?!M`L=2JGj$xJ?$}{?c_ZYUPx2Zg1x@p;k{QPGz=@c5E`yRrR-LX?4UxU
z8@HgW-K9fbI<JIv&&PFnd3ALj?X73NfKGnm(RuOs41cM~extdZ`PpzKIjH_ap<PpR
zWOW}U*J%*3f%lvb`D@>I1D-B?BeShCQ{8j4w*C@@{LaTb;rEW0?3EZx4m-;l)*ti+
zMOoTpr!ywt6;agrbG3OsZBu(`S^HMUOEV7@nz5*1ll~wW6UMJ-o+7B~f0khLN+Yu|
z`q1BKejpW_O*vWaeD!@NA_P+)ia2dmCAP_iD;_=gX$kGufI0;g8Iv#)JS$y^-m&#~
zaH|EoFj1d{To|T;qRRMs@6}};<EMA71jQSlUg7!dH{-4-^K<~bdfo#HeB8T+RQZZp
zppxr0JsmXYauwJsLehF}+2(Cr-)=DVq9YbzmfuA%hs765L$y5x#v_*Y5{7u<V2f|k
z0Q7JoxhqWZB3B=(Alpi&Cb%p0LjmG^_~9^2U}84$2(`y$I^vP7N1?o=Cl6ei*&ws`
zGs-LvPn~Q_C)Vv|kC*8_G}_Lo8!`q*(BjR`Q}bZdWh+^-28P(g_24r@LM&l$kj!T3
zW+x?YR7VK6hb)UUa$lPBu#P~b3)N^jB(9QS+a&QKFp-GN8dW$WNah(`KPs=vW3&Nx
z*_3kz6f$da;YMi&4g!VskQ+vcQoQ~0(kh8)e(}#mgJk+76P3j}9waVR;Py)kl3SC~
zojz9g3hLoip%hM*W;h}UrE6KYoBH<+^Z)oqUmIrnA+P{|Qc_qMgdgf>PO?UNrBR(R
zg9|ekVIjn9vP`n^VT{otBwWL^5jLp75;D)YD+05&uBjOwcDF0*)psD+Qsp_RFPkL0
z@5uO~P>mp_taT6h{`f^<-CmI3&ag8&`0B%X!fD$=^TO#a?8@)R4ZwBaLdo~^V4Uzl
zVGcH5s#`?}13r7=J~njTuOQAKeBYk3Ld%u>K}il72I<>Q6v_%6esT=^=tJr6E$};$
zXN%u1{ZMrlD7rFy0|ob5!fjpfmYgJ|JF;I#?&H%f46I`Kd5eYl9GnqC=V`kFd?mZG
zBjtVhp6pr8=Sc=A^j*lG0ZKgMM4xaOhI8oqKeuJ`J?SK*vk8ShOk0w_MYrM>F@Rws
zS#FMZ_ttqgw)YY<?pG}|`fd(1`Zo}fGc2_14mNpTZMmU!Yx|r#jc%?CGYCP+4+}`i
zzy-wg%pHCf#*bb#_4ge{>}C#5lAI`K4(dRkMABzk%4~L>j0<zXhDhEwH~Hd;(0g}x
z5d4+z<xTD>sXNU<`CGmemqhA>&VknVR8H`U(ETqYxQL{Z)EeN!!Mm;BMDYn&nk51-
zFeF)6ZPRbhRpUwVy_l&gHm6QMX<L>y(l=Y4wY2W9Mbe-0Bm6XIgdu_w595&1Xg0<x
zyDKRo&&Lp_hQ<lQbuK=A8X-mIka~-UTlZGdAWt(hj%!<?GnJbT#uqG}3PYXQ_*EVi
zaNbb?AdcfLW!0KSQziX94)ui1smCH+O%cs+Yg1+ljnFIRH0lw_;O~r5CLL|q^4r?=
zDf92k);@X&Z^xBdRHRnc%7LNNJcygJxmFtRz^#uNQy%3Qz>_f91Q&@r#2Fqb@Cojq
znx{pX)ExZK{u~>X28O1$M2YWrPddM|V6eE5m3ngMvc_oZGVrbFSmzcv<N?QNYHxWm
zSlQ<V!D}%ojRxIJGq`7EmDp+;Lv|f2k`Ex1*-sCQ+^-s(1Ku;w*%fi`gO<mx*ud7N
zzK_*sDCcfBf4)q7W)hhm$LEv>na$5m*`E5q`>xsx3hv>^F<P;9%6o#V-Q~)_S}UC;
zgLSABxIdyr)>eG)F-?8hI?Ie?<i`#4Q2UkYO~<vA^R1F5(&h?ftEBhR8^h!fUHS>^
z^csz_84Qj_ZdJ(Lc86i`TYR(IjNtYH8B_D59B&oO&ky}>Nh_-=8@U*JzkWJG>@Yy7
zrk3BJ1ATeOIcS3xn^?IDB_~VYEVITM!+vDj_|deS{aB7v;=m8IYw%V50tj{1K2Qvd
zrg}86{#|ZL<mRy@t(r=MxT4zPQvvOp)kou(<NYsHhe{#JN3FWXTrUgN3|pB$_UQ&v
znpr^13Wh!51qI9Ln+9X?bfm4DIs%<d_7qwN!qC91usHuuzIiFrdV#15x^7&~1_wMT
zx_x6sGsK*2?`Re*EMci>&qp`W!K63!0;fAaR4fO)Eu6Ps)h0okd%7P~_&q0X5pb1=
zb;nXps;*k9u+HJJi5*%05&a5VoNr`I_Oh*RhjdwrWXk}zwNf~FW4q$Xnb^l$Y~kGo
zm26OGxn*Y10S?(E_)@L6!taDS?p`W2&vpkT88joN*$pvc?T+A?8=U|6MM#6};67=4
z_nzKmupnzJ5hYajfbG(#&rJ7{6smLJb1C0<NAD8Hmc?;XfH{|wDF8QssT#bnk*_RW
zR1_~DPajWVWY#=<6J#^YRN?(9$ml*|+YPFnr|HAzvDp!3^V!Y03*=IPu@o{mnBp3}
zr(rbZ^YTJp`TRcfElIwV$s6{Ymhef(tG?ykiMym{qLnw>;i}c^>s%GZ5q9UM119mL
z<Wxl*$$^swx>oZ~8bKk%{vs7M%{d{j4aF1&vtjw8uV|HqiHcTRaUz!=H<Q?o$s|GH
z)oP#zMM+NmBZW6|RZo<5wx|OIq{6oCRpmIPUL2z7zL}<wGOezku!`kN87HoO)em<E
ziECh}c#euFvI^_A;hYbz8{eE(2wGr$OQdeA?%mVnu`s)uCUk&UHf43+4WwtQaopc-
zee_y#EBSS}ms6X|bEAmC-2H$zVp%X~TjTV-S@1)rpv>^F&APOra;xk->}L&W-|61H
zxD$bGTuGT#J1bYh={fq95`G+L>~dU6J|@0pWTvuBExFBF+cs9ymNaDw_ad=q^RuH{
zA5xC<q#Z-vYTDDLU>KG)c9O$;_c(=8MPBeFRZMtE5mB0~s~wf_MB)?d2B#x0C`GEJ
zM3CMFA)GbGK|uEgO(eHn^am2TQ>#u~`^YY}MS-`J#R&y>WwMm!kOlBusaibNlM|Rd
zSj@rtrThJA4G(t+TeP|GJWnO$3TS9CM~7d15c-7W%Zp;>N`qI`;}&LhuwoYn6N%h6
zmvjRjTE2<86<^396btc{CeShDhsLLHaC@GR-3}<Tbg8QGc~Rp-<i~z1JT~hc>+m{j
zNY%TU=E<36^&K9slicC?YDl8(a%5Gda>K*MmFHs356^}4GXujMV-^`{7-6(Uj<Tph
z6%06tO@d>!x82FBU-6flo-emyr&<ZGO$n3438(cK@4OMG>8T5IlX_A5<_DeF_fQv-
z;W(nfZo9sk1Dd5zIuv~#C<0a(V9UOA9afV$<b4aw{O2K@d1{62Cqg&vQt59UttH+M
zGg7pozFpTED;ac7oT-@velsc-&ShuIx;9BtE=k1~F3!y~r5bggz2`nho(mzBh=gJJ
z16h+WAthD5shc;pa8vrNYwkiz0J{l9r@mUSj2=1#yRM}K4wK^>NrnwpR0b~DoyCj-
zrc&_^oPy=4x|{OMq$(UMyxw}Qg5_h(I!muJxele7s##-gD<4KlR@O_v)4IgJng&p)
z5j+`Eyyu{*ucP%jJgGXzh$p-ZZXL#vm0@S1V#O6)Lr3%iVJUj(*B1=6$oJ!Str1nw
zpkYdQ5@$-2tFECnr}}kl<xSa0vQV`bBOC3s!PIHg8&t+=RFL}W$HU#v=M32ul8(Ok
z7_pHqFL2!glNm!pXfDE-zcmR5uN{yL#%<GcFx^H;XQ8*{*wYC9u$0NUZcpL&K~9YV
zZHJ7KxQ}k9pa%O@>k}F>D7!d=tf&8-CiGH|8et^A9SY~F8a1~jSwsv--WR@E9*0y~
zs0~jnrp*tdA9vOyv}HcnITtDcrTH|ZiGoBAr+b&n*eZjm`mr1(wNU~~FdE7+O$=_7
zGcS@ibX=G&V%U+AD5@36lKQ=WE(2Z^vNr}Q6BiMw)0hTg)>Vl?^#-+G>C%E#R0*HU
zVGpyu<^Rkw-9m`tN^Y|?r_la}IHx|B*GbWI)`Z#5n=NY<z|#|J$H!1@AbU(1X7iD>
zl(oD$*5Xs%*F~MOT(C2Clc_s<hsN5Dl=f0;fYb{Io=@YSJ~1uzhFrm~fcL;CKoZnn
zq@76i`KP5=FspG!B+Wf9B@8~!{)6wH61F%_aZP*=!=GUO=NIJ(F7jW75u4LKY}f$6
z19AX>6Ba$e0!!y4=l<J0qL0^&4;e!c`C&$Wes1}}aX2ts4_4UxDzeHE$*)g{BnA6#
z%MZT9fjN3`!3Yrl^uo9h_*9Cxze!5l@L4%RkSu}MX9IiZK?!q2U;{mIVJ_a3ux}nz
z7(ctJ5zN3Vd}OoKe@)aMnSqtWFvbEJn8`<4WJP6mASKfGKU;pV66tkUCV~{%HHO3%
zl3h2{uYiyZtaHr39U5c<GYlGr@joZLc?M|*BmXUJNB(&&@zW=ApC3F;du?PNPDS$f
zC^dMQXTuKW$bbQi*BJb05KMX={pPRH#^7pa`G$1sg#!Rc{^8b{<=P~Ep7A&MzSBMk
zj4W2#L(;J-{Q>V~zlNXAbNvRFEW!a}Bkw=^5&-~Gf51JtuHg;~OuxZPq)?Xgk=~Dx
z@&$h;Gjr=2KDF?BGQWiD|MosDjD&N*#Ind>9n0vy$%6k-5{J1ik^w)8T_dD&2>)lK
ze@KTHA-UJ{ki#PON76eI*G3w7L_ggAmiV=zI5P2iWUcIv8ToU|58jeOnh5_-j9)U&
zf2Y18gEZiSslWW+#QxCI{TTwe&kvrEM;bB1_)7jx><>-VKTOz_u1!MA=>9sFU%IOQ
zXh{6D$`7_wMVc@nRaSA4({--v_o<C$0z(;M!uv;0;^zu+Sz!i(tdSkOFuJ)PHOKhF
zzuSn|!alFaA)5tOnSt04*!hUW&y|E+w;VroG5*;I0lTtu_J6F=Yn6<D;~>G;DjC1P
zcn<#y{!cUG?=|wbX2#E`$o2aFx%opugY<8w*Zlpk;0aP7rVFeJLW-n)r}>{r@QWE9
z0O0u<7P-$4CUE=L=m%H)kJ09uWCmJ!BdHDPV9t|xzs<ZqxsiW4L1yoRgsc7r{l#?(
z00{j;{<wk!TzlqyPxl-APgccW`264@=)W9`KQhaF&kWpn2J3u(8+mYnJeY=E=RVB9
z@blY5)|xW|=byuZr-YFhf@x-8Zq_wMb(-|IfWL~(0RX07@sRn&!LQ*XG8oA6bNt^-
z{;QotUNHU~L6rReO!lWKe>2&D{8r-jN0h$8e@*cIOWg1SGjOKky7}1$&~IL@pL!y%
z5qro*|K~L#y!#q1V~hve`SAOA{_!mCkHC=Le@%%03v4#S46J&4-P~+J`#&@1*FDO=
x&%1LBX+#72KJ)uI|GF&$0I>fNn&~|f&PjF;jD{RR06-M^!%PeS$S?dj`acM6?2`Zh

delta 38966
zcmY(pV{|1<)UBJOlXP}$qtmf%b!^+V?d*<i+qSi1+v(W0jr-p7-Eq!6zp6&n`ZsHg
z`P5qT<KV~0_zx%r=^v1=iQw=U@wjN<u!;WLIPu~d|84#|L4pJW1G9HBXZQj3f2vk7
z{^v3g5}W`D77Ppq=D#9Auw=4@lJ-PAdkNr!sAtk2eMw8}KK3vu)%ZX3v`Vi2D>4_v
z>Ek%!`+yI0JoaDpJ3n412kX%QFuE>G&P2}BOYP6oGy2;=Fpr2Xu=}>guukx+-R@Xf
zA|xMHD9jwo!cAv?tx8||9fIR>)HWRJ!mX%KKGPW!2ICTx<M7Gp;w4jFSueXhIDg<x
zGSfJrc>^W-z=)&WyW;jZtMVKLjW~&EA(rPA?8uIa)q?9hw`psx3*{g3a9l3`YBe8X
zfpLlBIqB^3Y0~kcQ*mAM=2Q2zYf6?SHG@-q%4BS=DwQvBRG5y}74ixZSQ{PkgEEu)
zbF@SgPr>DKr$FAvTgE{Wo8X&z$~qvw<tbyLaUy&YAMYAazT~l<!02Zu#3c;}y~20l
zgYC5tSyu1bwrn!O94cL%`%s6?ZXmlQFUE@&b0Zha^3%o1StAMBP3U|*n0xzLhYf;7
z|2}Z<?xp?6gOf<?--&2bfScbp-eBq(*G`uL8InV`J16)o{hSiZnerWAu355SL(uq&
z#wyqRL{ZdU?w7LH>84Pj*K>VTa>bz4kj?;ib?Ev^FM=1iqTW!S{r?j7f2(K-PFqO?
z1qMd?pRja^hVGb&e;o0F>&j^A*xv-st97(tOw{24^+J+hXbjD2b!yR+vru&4woPmF
zW5iW<Zl`92vsTyDUA)i!tzUpAvK8j$g;ci^VB-D*Pp71$5vX@^wQ>9LS(oFR|MQdS
zZ{dri7#JF}-T)K;OE@iwk<1wPdi+K(nUTa$O$<KOL}%EW`6v#EF#?K0#x&9CQ*{Ip
z3CStc1Uu;V|3p<{{@q4wjL$*lvl6c7Ln;VosJJp7S@;W)-cWMb5Byh1L69l5={Re9
zHdB*RdMZvpsf)6^9Lo#p7!CYal<E%ry6WaZWAgm(*5hW;KuW`<aqD4>spTQ>=o9x8
z*M@i%y3REEHLX72&S_^$OGE$V1J{JpIAYhNMMt_T>-z2!r*Ix^4g8Pr^E0~3m=t!_
z#<Xef7CX!lz6iTwh7)Ka_gf3Mc-{*elF47*^c2;ohNpIFW+yjo3mLK}_bI10sv`*6
z%}o##MvDuK?TLD6%6J+=?ILBmr~@(3+w_ucm>)P-wAxU>5RJgUQ>pMd?(>APr0yIP
zcDBViAc@LV<$+Sk?ntNP9=^irHX~FQC-(Y`W11MdbW=cU8MkzYrb2T>y8clMo<6XE
z%(Z$<A&Sls*7E()9O_}{zC(7F&O2JitU4n5I6yMoN_`@UG0y-j5LRxVV7y<A(-~u7
zPWl750*?m7sWd|0D>)oQ7!MuTpJtBLccDSAHI9_e&5k@b%hs74EA7@m!Q2xLJj_QI
zo=HiRj%<ag4qAtWPl80fYdq#6D+a^kf~BpJc+v1j7%wl(3*dphiZBMNL|sPr36RIw
z81NmZZ+0I)FHs?|9{)jwTCl_7BUeqW6`-`PqzVPp-;svW-?cs~@|tG}Q9UZ?hVAY%
zAkeACWsOvU2S3n;+TQgKxW4^ca)A+QvlA9TbVD*QOGC~0z+Vfrylc@wIJ~gT7Ske?
zPSKsWXpkq*$zB@1eLPdMpF0ZQS`t&Q^8ag0Hz^yxEz;m<Q97J?&aIlLk{hoQe48@9
z$U_2DI*@a#zPM4k_mUvhrf{+5iyJqcIwBv+tg>(DC_T0a=fu5Z@3C=?M%_rRUFlc&
z<eNWOE`+@?y)s#&t=HIty5ffK_}8*x(7D*MYV*6v>vjfIl$0ZPCwk6Mmg!!#4l1Uz
z;=4&`DT^;F^JHRx|EayK^KJ&XQ(eP1eNF_rMdvFsaL~3O26_l-`m|<DrE5vj^4?}k
zwOokf=OKB3?alloPa({%UC_?RiOTWcMX1w1Z9ouqfz~xb2XJG^gGs_KBpN~%l8TOB
zK$5=wyo%-TZ&?-o&T~iW)>*m!{^6fx&-xD2hads8`<+ChBtGq42HPGXXGE#$Vw(r_
zp8SScFZ`nRD)_pIq3$>KxA+B0EF$63_fT(%*fj35i1Wl0Kk=PeD*I-5s1c5N0}3Yz
z{(b7qQ$8tjW)R#AMSRH5_2Y~piGdfbRr=s?L?(;q5}Mm4K|t9k!umtU>BuAEmgX(J
z&j^LvOC2*iCEhYUhg4vEAWJrm$0-K{WghIyX5|HSsY)l0@JND~3PkEI0dHi3IeQ^N
zaY11sZgTBuI9nyTA`h44OMB)8uP2^9X!RQo9@o%M<s_;P)y97bKhIC_RtLW}p!Zbq
z({MiVbPHoYd;Z`)68Mf1b`)b+hM{09aAvENQ!ZJ>{V4@JF+orZ#UyV0>TslmHmBls
zI);W#ASwYvLc<2<g?xe>f#Do8+34n!KmB2{ckQkm{QduVq=nnw|IZe^3=Uqo5;fiB
zfSbyAs_5UFHtcW{&`J`NNiBa{*dV1U)S8N_ZT&4QD3cYCtGQDT*ljv5_RM~K;=S!C
z>%SGq%jx@^M!_tlKaHuq=do}X?gtX>k3<23_uEr%=BRdDWXO-V_>Ob#-?L-8JRfF`
zpTR(XpJfJbrTDZQgdzl~n90KvT{%tnfUJ79e;~|@j;g|)v8{R;#o$d4KxV%q{*joQ
z<?)j{VJGi_{F#1W!AG%(;MeM4@(YV^-A|l0%t*&bFueL03cj3zn9Z=yr20`z31LDC
z*9q{SQglZ4izB<$pG1ojT50?plFzrG^l8`hnj0L&UPO1H;c3NRC~W^B%CTh01FwX3
z%71y6VD}5_g}1RE+N$f6P0zpr6K1%JET_FiuVfszQ)bvqInx?x;IjwzU~9Si<l=Fv
zvZT-B252w@5lh|nT~7oG6fIGUGpdnq^0aU=_U$y2u(c9iD}CZiby12KWDl4N3z;bb
zQ>B=}g!lK&LM-N-sVw5K?6}ejf#WgEY3F^WgOtSRwb8f1TEl>`C0%<chRA@_!=$_%
zodGL4HQ!uX`6n6f+P-x?ZVrB@E=o*@b?0zVJk=HrR|}~e2W7|dO$2`|2lH$*o5a12
zaas@6yRo$dQx`tD9>}ITA}qQlquOBhChe6_L^$y|`KmVrkf9+26kMnyaIoO{Nc2Y{
zCcWW!Z&MRU(sVO~eSp8%wd~<EyaI3K-e`al#T*`Fx@)V`a)U^Z=aEW$FVG<;X}=de
zqlY0{A$P4D#Sxg2L}0ajYnz{HRow|cVij04YXSNQ@aUo5C>VXPVaif1Jv1;OEL4Z_
zS*Kgrp>ryw9<Eh5PHe9R##sLxrRvsY+)Kk>Ln*bTX&&R+)>eW}*V->JjGD-wJ$iNJ
z5^m4RBDUQsX>q+!VsV+X#r}C49Ad`B<nqZjk)O{-dK|LMxca;gHWv86D(w}$>|q5(
zyVMz_P+^awC8aI)5_5M(x(b_pkb3YA_UI8N<|8Vhk4AV>`Y{&`6h7;SrqL;JL*)|j
z&X~g88VQ@l!oH~Jc_n@-;tzg8Hmj&)13_dTOlgNDFfZc2!VfpG3jC3w?=k^JcEFI*
z$kubi1Rij>tOBJqwiVsB(dLm(24Xq=bJ07|9m$&z+yXriC5P;g`AiVXb!)l*iF*@h
z@h%HldG%N&5iL;y&5g|}8oi+&nHJLVX3^g0@QKZKgT7D@C8hzs802#?1l^G#$R)~v
z><SM&*}ylfu<53A8Ve9m+#d;9urg(srHtg21>+IRYO<CyWP9|BBKw5^=ffZ6qgaVc
z?f^I3Cj)h9%xHe>Sk<@z@6=RPN#@c-DMP9Pajlo@huRPILs1S9x>~@vl-GzcS@pZv
zF#<zOi8WD`(F}Elz^a9>i0Hd_s2Wji{?KiL5FCp0=__-N>Nm*c^_M(O#y7<O&1q`T
zstVW;U|=$kiPzpdKxJKfR6%sUMg`1P=^@oVt#?E1bEV{BKhZ!YOGa6lS=MrPCf|&H
z$YmS%F-D13^|#*$Y+qo&q}%BfwRzNv_c|8mYp&xQ9*+C-=N*c_BOZ2!xNw*@v}qbL
z#$)}uw59b4!xdXwjddaKn5Yi2Rhb^WabAa^-Ck314sf0Dz%eNmEO_-wKgun4#HZko
z-sc|?oJ(cHfx7g*zJ$<;6{oFKt#pM0TV~>HqGcbr>hUIZ+adXJ$$wkd0~m{~Nb&T9
z@4SA2Y7VMX;<hr&@Sss@YxU46Sti+o*2uj$5+38Th=Sp1?DF5zfxCK?NgRYK?6+}-
ztJxYJg;kyGKtyTy$W$<#s_ZfnYom#OUFLGiqL%|=&@4rc;S?e1B}&ys($DYpbVcFf
z>=8F7sNdvr?eMc>3E>EtCGR3wo>qG}!nfb_iNx+^7dl3MMhoz(Y1lV)yO$4ZQuvHA
z=k23maTOzVM{44~q}~h*b=t6vJeZ(gVizx7vC|b4fyHBoB}rK_q?`SE!NdY3gL<O!
z9(F>R8U^ac!axAFS6m*}ABtGD4DgcWcgF6y;Xf%~<(w-cY$vaSV4Q7|)~H+up$G2h
zOYI*_sJU4OC?#1*#)QP51nO^f-8o}iB0r!>y=9JxNSUzXr*kFH7z0=HAEdRS^BLH;
z)UO~J*&mACTbZyHt_EK`H^QXx7QMj#8SbWpm@WYS$CUmz-yaml?tLJFfq4*uff4`5
z_k=)tV;e(f=W0!Whsr<KuUJ-=Ys-fw#=i!=!^Vsn7HrsobT&4S5YR!StP&yyQMpAF
zmIkaOGax~OkzqICh3FF5jiILcMpnlRc0|rw80~P$jyQ7Nc{1I3R^3e(`;H>%dCoK7
zHEl-xaKu9G->c5+4d)rZFYnx!es?`zgkGSU=Xk8^3!A{(?JM<kcV39T`hY$5i>!dp
z3*F<L=+NUjx!*|a_RuxXO9Bz5-*&7(FVWjA{+9%Tz8WvEDx~(M9tvo*QwjaG7@PdU
zBA~W2^Z5eyB}DgKjQce{c<u*60#=9A;=JHJerOA9#rE9qU*95Gy^K&>y;GolUjRq`
z-7-LbEe-a()&st;g5Q*pRQB;+kOXo@fEh0g0$+IBDyZGXl-tZV0^>3EmAeRRKH><@
z_>fk}Y%17FmSH34wL}Dag{DSnMsG}%swFS7<?MrZg=o1P#Ub+Ls<f_FYBPCb%mRqg
zy-A0Dpx-nynwAoQzpI%|o2dkUTm#unqV<=@WlJ`yifUL6FolImHmt_Il-bjqGO6&A
zL9*jH>#~-trj1mxC9IkAMpBhjwpPZS#O~Na>(vgtSESE_7b@eD0K3)msMXW7P7Wr5
zSh9<`ZWANk(;}tKxuo+rMdV+n8?T#|?)~ANb13VwaT*-6&Sj;~8Z+g6HNY>4w$@Oa
z&C<(8H}A=q*jDik6IT9iWraox6!~_y4T2_P%aNq&fU{|T-}jC;dC~rnPDs=mNL=Ew
z%k%5a?QM+ktTpGq4K%7=klh+aJ~}w{Ej;n~_C)e)g-oTs+?MjPTw_mmT@q~2+uj$F
zq3OFevyvqR;ca<-R`D#=hrk0+`gPJpCkJk9M<--<w6sRu%HvSdR3OAm&LCxU)p^Wt
zcFw~=T_Ud)(g;2VXfTWbuPIUSF^9x!Bb<`O<z9(=VQ?@Z#h2l#Tb08OS8{NqVE?qJ
zv5wVcg$55pS$42ld>X%{)M+cNkgK_>eYk3)ZNCNSA=Fu`ApFU94wzQRhW&I>#vJXc
zI6nS{<EmuGnzNv)-H{44>uNWct`xbUllu=Rrc;jDZp1=|8%O(BbLP6$0u@EO_r{ni
zHJU&cA)YdZvSUHw)8InlXG}xanrxd})p~erCz>d1)*P=SB6Hts|9YYX&D12Bu$Z%Y
z>WQiIU^a>=4PBW`5l~l9xG#6Bi6_|&$8{v<z)3V|T^&<x;PzEi_=?pelh_@nVKa^(
zWJ5Mk`6-PhE(&&;4(9177#u@<NrQ>WiT`Tt7}kHIyiiOLVN$9zJ0ga5^5v)jpnFj)
zRShh<nJ!Q;L>d`E9V|BFIkeec#vq#GYbdXmxl9gBdvhF_0@_Itx^09*IyaSsF`PyX
zl~wa~iup~<O?v8)yl2ot)otxAY!sad&0U?zx~-0Bs5n;B?or3YnQbTzo-CO5ja3v7
z;JS4_LM*t&8sMz^krFiOn&%;hKOVBEowda1=osg4iRLealXd};!WJHBHRd$b0`%vg
zvtP>k@6Rrzfry-`Qw$gu-6GU*^{U}2OpfkOL8{lWr1N7a;%vm)0<ny?QZd0JH%+)(
zhQ!g0m?cb>yZGc#JgI+5*SjbBM8f9{cX<h$Z+ty|vM}y;DBCK-#wXo}Tr?f%fhaAs
zr6%?UWC7hXak?oR3`iOc+T3)jB;Is7{XBFZ`1~f4z|;#8*dy<HWs+bPt&Mt{M<WAj
zJ*B(n%H6+YhFliA$G3`bwY%JfW$^Y(mW>B-F4|5S9!)j6{ovAG#WM*c^Y#*h35CoC
zV|fiv4fw`dg|L1Jr&RxN*bZz{;Kv;M?jRx_Fr_q*CnMoy*UJ^=hS^Oo9EIgH?((vl
z4v4wPfPaaRw2dYlr9=MvrR*g%n?U}f!%+<^oWxUZbYzop$m1*+TO<1w%Ezl;|2a5&
zQl#9}=94>>7Zb7}VlggPk`*^ESzby9iqP~|PZk<aU=gb7@vw0R%D0&VEq)F4BN1?V
zH8B(^(yG83=MQR9;56*J@Eu0oIKWMjB+n;>0^g81f}hT9g2XhV#!eixZkvMNj1ZY*
zY^6n4ck^8Y4U3|6^B2hy=ER-z+N})b-AW3XqOrTHJX2((Hu^_y3djH$om8HK2}Nar
zvX{1nYZ}_6A+pjsl8t|l`r=AwAvWp{s$`B~8$GUVg9(~78F@2Cag!F5;lo3+8V^9c
zz;SFO{LOz}tz@xd>(VcG+Nr61l7bS7GtJqVQOyYA`-QgNw*TB_<hgiBv3-42=raqz
zIIOiOklqeF`^J21EB>a0`%<$KxKgBy+OlFqP;4kr^RXr8Wy~R49s@M<0|P_TGyk-7
zt~qTMuf>h%Qq?nrHc->WYTpG}X&_|U0?nO&SsiXU?P#R>W@nXRhpT8~HhyL$$Jrtj
zT62`Fag+!}<0<nz_DqQ?OVf`g24yoFAa7~6X>WqiS8m@J+z-6je#-I^jq7rq_`M2)
zu=)2yFNVNobrZe{(Z&W{o>1EwE)*#_AHLl}Rn?>Rta#<Qt1Hcn<5IOZ@85!Sfy^>m
z<DhT2Zr=~8ktqVXNsT!}-TqS3MapKkgh89K^Lz2zkKiQ^PczmGnNw?)`qguCmk-#i
zd-p}t=tzd~zTrD8v1T=C_x+)8?Z!W5W1lR4YTvTO=RvwNKhK_+TkGz&A)6nXiU`#(
z+O>SNr?ytgGG3kTQ_bE8kI1;nfwe1J!)V!O&D}*o4@wA*nxZV<dS1<AN=xSEtQa{0
zJrUPazOdS`DYOj2C4LBhHdL=*rPMQfLcNNTKHB@Pi8->@SOhJ{OAg`eJbxlluWp^1
zESlzHM+tIPv3!(7_to9rr+JGRg(r2SG1bJ!1H^YD`(FJ;#;2y=!aUp4fz|!CPHv=^
zlqRat^$eD=@@JKMi`wJQMp7@|EwZownwrKTJS@zJ;1*+wF%QVywbd{8mBAxeK-KoA
z@5Js074J>joDV84tlZ_Kwt61k+v(Mhs4uYeW)r%1=@`lHS#8nVLuDX{<gt&R<3CKF
zvNW1XHO33%bC&E|hCM|0f#zuD8jR0LfRk`$Ci>_2B8X+rE!7@5E6U^iw}9?)#~Gzv
zbyLo7r~^D{QVLsle^t{g24mG2xK<;AH)8Bi|6fLF2fT=R5P+&abV4c+#cK|=mph6A
z5p~wj#nuSFoC&_y_P)|wQ0(p{KGE?y80h9kb7_&5u9_vTQfm?om{A{K3@6jH2VpL&
zDaIRK`f&ZLvg!96OL2wJOj3hX_1<Y#1W_UEqxOWXEK8Y%l^;&BY&FBc0{R08-hP4B
zM|g^kg;6g=GNi)uzYYiQtX#Fb!WHJC5sli89JDze`yRdRLQB;_fNUl#yY2jy+R18D
zi{w<2E1}ZsTykR#P+c3Y3g)FY{|(y8+z??5-l`^FZB?n<wtVUR+Kl$9&*@^Zqxzyd
z>nbusJtgtw(}P0Qq)@w@W4YNxAyx3Rp8W8v!IP-b$zAd4GfN=vFr+~nmVasY=S`rN
zI)NXIz+|>Se|u<>ahCo#O=VT6{P*76#7qsM{XH8bv&PmgFmos(U$Y9oU@rux>J0G4
ztg*RkX@%%zhHNtW&jnjh-oSQtbf+YbA~2H&G=Y0d)i|JH-)i%$epyztrik_cJq0f$
zyk1G26Y7l6YF789S>*%3gJ?CabHvOHfoPq{yY&)&9IuFcia86x{j9Pq)AXN8RGk4~
zVWxgy<+euw*)onU$}HbVC(Y(@EA#~$k*Wn7olI4s=@=%vLZy@am*Lj}w(uAOx8T>b
z?eoHuc=UQhVmj{5L$r{Vb$iD1JRE=2vZ&PVTfe2t9>yB|80pg47LWM>@10ic7Dwh9
zHncVMn`aX8IWMsoWf<k59*yLKC#(?LRE&a4n&klt=#Z5!;P1Xm${!Yb1IIap)Mj|*
zaw8hGD}AxWKoU{A$J)&E!fm<z>oT*b%YWf_Sa|3>y+x+g>oacdwGnFT9uE5y>4d=K
z;1}oC)SX9K=k@@9Z2_No`xneQOaJsY;DfZnat_@uq7m22kw75YT(vTSLtiNCP%5m^
z2B0bdB%|LqSD>nhYv2Kyyl8?_6%~g*G+&M>+lG6&e`v$=n(ui2xMsQW`$5FWXu-(7
zm!HGMN<T)HVJ$p>kMKx$M8Z5Zm!5z@*@6ACga2OXHz)Olgu^*Gm)+nL`8KH1^FHeO
zu@7I+AH1w-gJU&rQ0dT?D6szGj0J4DHy?oqUUkp&MaJa!P9NcHc<XW)gzY%X14v~O
zoe<9f?9{Oc=%5@sKWqkzFEyVa$C-dYBqO{H-F!dugn`i5!&!HAG}n!P3vXN=HPCKs
z3nlPZJ@C^1UVc>Fru1HEx*$#&$Q#&0>&l9p`TCgE<;wCPDQk}U1a#0d7Rk>il-5T8
z4X_HJo>5Yd41LtW_1rLaOtGwAG%;i#HW{o&L1n~Ud+TLp)avMa?cp*X4Ku^aMk;6f
z<76S1f1q~<===k5@L^rl{cuBBPEIWW4;9b+NZX;*Kg55Nx_M{?pMT<raDxQpXD5cf
z^2d*Q=is47kze7VYaNc)7pL>*vjt;;N&8nfCoTl)ZNomQjHkX;bH*3j6eq9sI#C(e
zICX(CPZL&dvUru>gm1n<pR+S>xduOVdYz-D@45Amm?0|1ZXI><gV+m3RHu21s)nUs
zAXzy3u+1&yZxvohJ=zrK<xDu0*__Ie&!xF*KrW08EEmtP1iNM`lZw8@HHL1$Nt%j>
z*r|FiUMN&R#yDNA5xe?W>T5|tJDEd(`M=%XKzwg4yB$o3-8G%An}gGe>(Lz(>lVG5
zx(>n)rLr_=-@krgfDcAnp#S9)O2LkJB(<q@-y2;=hUY;3Q11NCZc)&yOTJPCv3;KC
zI?w3PKL<YZWA!o-jH9t$Dy<bDfro~+HI4O;0el`_f0V}?XtAXMEQd4MY=h+<3g&~|
z0X!U|bdeAr!Re?x24)j>@sKlLI{c{RQMM>uO$SGhcsIW+OugNyV`_UvhI%-D|MhgD
z!*%~EL9T5d_zQCvGg|V!#<f<knLz#dZYWQ!kA`l}pcT=c{`6F*mVI?HuKW1=kmV1q
zJ#G)YN)x`a?|ioQmY9{=uTBqw>E7?2{~3H<BwT~THf|(B|NL*+&lrHf`ahG;bYpgo
zQUDkj0wx$3_5YfgA!R}**6yGHvo(HtppRgD{mgDEUHYAmc4@(H{D(p@hzdH=j2Iy4
z@aqr6Z->8!O%gxdTaD~v6FB+g$cBp6!WYnZ2$bX+Fn)D$c0HdxYzd=|j0tp>E+j*p
zPCVzgXLHzpsULUY5PE*>(txRjL&4_c8?oe+3k@|M+}Ln!RPS(6Q<Jts0B2Nhc%f#V
z_o4hi3aHbS9w>SjBhnup<pJI*i&Dc{I&qN<%C}A+p*|YbNtdx&rCX~F8pG?v0qcVs
zEsW=VS6IF45xftNLRfzeDv!p9V2{WMD38j3)^ZJ6@T-v@u!Il$m(=|pp%LzTx_9TB
zP9CxNTjwL90`%o&gYO3)z)x!azep9M1{y;!gi5!JVi-OWeWn=aj-o@lZD%8)has^q
zw~A0iiMd3nk+}-Dl0Fr%xx?n@yuY~wXow}h@c9`+8OmOMcNgtVyhH@lR;<L-0w&K^
z*5@%T1sZBgeXrxEud*-2JKUe$T(41KMC49NA4}SD@GZ{jt2LYqfPuY>YAopuk40Vj
zv84$93S&<#Pg^N965iT~rSuaG=KAX1_A%VGf3+IQjf`n=8ad#Sg7Kc<UbLqCq$<M)
z6NYPC_R<U=&qnq_ROX}3Za+IP67Ol}%#ntbAf$hnu+6d>oPIhMo<<cTA>gPfhqCbP
zOuL=clSbc>z0feS0Da09O~gCw5Rhx9jWz#F{kH!{=WmrtV#aP8IfPK7hNMZ3b(t2Q
zfDS&yEZa#ZwiQ9VDTVW)kydNYN@#7xh6dnUWr*Iqyg@Ewwj!5Dld#j!2IU{?jI*P5
zIv3o5X^pg?2s4FVVDBFj&&Mz1w#Hs8D2dj&#9QmH#SCQ*15fAWu&jxaFImx=8h_g%
z!b_MQdx;Y7(K_kNrp)^-hn3hSenf&^kkFkZTU&FZacj6>yQg<fK0p6!qqb4$V8`{R
zM^&FmIVI~U3~njlPp?%8y)u^sORs!5niVh7rJ_g<*sZm;Mp_3r9bqARPm|ex+DsGP
z1>K?Armo`t11guZ@4v9KWM9~~(vEzU^R*E2wJQ@jIqCIrK&k~(#8`z_Xp=XeiV>@L
zPc~t&Z9L>?I(4f__{;o23S+;QVYWN_#C<9dA3%#=HXte9r9AmJD^e;nz;R3W*7Ksk
z97^tdg9F<j=e(Ly3TX3*)6Cmle~AgWwt6A#md{a!03MdkGYw#Bd;;-#5CnRW*gjwc
z)NaraV)sfX3vPuM%S)kgL=Xf9W-va41{iK>5SVyH2ax3~IsHqiUz$U<cUmEwc_+^j
z4mk;rciph26%Lc<^LuC>cCf$gHVJJci=!YLhZB5yQU{12&-l_>8`O$z<cfOI9BKrC
zgSn7Rzz^O6$*XCM{X@C_FU>xE)(;He!i_u525=`M1h|JgF_1k8XC41XwJ!y@yX~}X
z4Et5M>-eFb|BHAKT{OwEpJE(CF&`lMk}l7|DfqDHA$K85ajDTiN{6biVkMNU^%A4(
zDXRjIHE^!Xk;!l?+s=yzgfOBfAKQg}!4hx)s}+_hh?iey9VcXh3Tz}t9+FTh^s_4T
z72`rTN93>-wb7JCo6*$^!z?q(Fu+9@EseP6t5`YscQVrats~OP!!?cAS(G3#n8eYX
z$sBVgk%S;?y(x<)UunblneTK84|(L4r#v=z8yP&A#|BpTmWeQf@yHjFs3&PpxM!Au
zo<G8_bjmZsLaCU`O0}x|UHT=~(8^N=l0WY}Y<}4?abcw{wka8#Fi^U4-<ee3+N67~
zXYKV0@fobVUK%}VbW++DNVSZ>*<_2TP751Ct<Ea2Vx?V?iEZ)ByG2%E`#Uf}`qnw@
zT}k74{6a)`7ivYWqO#0Sv^oxk#(GQx&Kr1aFIYvICc3?Z^y)#mR?&FYU?$0n|25)N
zn|%=0v)rfZuU^fu)+75D?;LroTCxHaO&B+1Tak!^o~qu+U2-(&UNS%Eq@>mAfxnri
zesm<$QU5>>BBL=`EuP>>F~bpd)ZN0WLVx`iN`axvF!?rSTdZz1TrOAbDqA`SWS?L?
z7tK8F2E&Y@$~BUxPV=oPPct9TIPInnJtutCbG#PyIZMimsYSJadR*3c4MQK(C3D7-
zZS@dmN5{N}flIUH7VQdC*5ffh=Bad_Wu6)JF5D-;>CQRH+tpc*R<`7m`#Cjw?EbzQ
z5)x>#Gbeunzi~;pC2&wbLgT~&<b9Ho-H1sxIT{<jz-O;eVmIJ)?U^lNg1b)#5KtB?
zS*}lZcW22Y7wvT`E9swNJ!RJu9+Wd}*3U)q8(vPkmXjs!A4CR3nCEWjVKv7D{8Jxf
zl`jeP=mHSgti)y#f2Ts;5Qo9I2^nCSD=Q3nx^L<1`?zm`LhkuI?=5eD_n927F<nKh
zx9T^oAV+LvdM?^`PBqR!<R|Av9ccVsv={Agetc3aj!5q^6%0#taRp3GZisC;#KTT8
z#W@c6;#I5%(;Wfihh%**Q+>_6iqaXZSuf_a48cdvcCmy~$vc0=MJMyTc3uto=Vd70
zXdD^)8tlF(GqSQcEv5)yx=DI+-vxYtV9liE)6dTdaYl8yBQ|w<yuJ@Jwlek@BSHN-
zC-ea0osvHm*c`D&hWfJtQQ9H(7U+?HCepw+$HrEY-ufIp#D!UC6=NzhL!2XHu4Mx#
z?)ro+P;!jM)bW%Sb{m3uJ)yiX%hj-0mU$Gt0bEVqlH+FFIUzo<KU?lX?3I^W#$D}q
zAjwCD5Fj<o1=}>~{+A0r$v;9;6j1?Pza$;#7#4i!Z2rH3lu52XYhyxjM(!8)Amvam
zAs!=1`W#3JxFE=TUY|zAxTLD6=9#&j(099s{|qqViq|FaPbQ=s#SarG$qxOsEffBk
zGV5cxD1!xynf&)2=(@-xmCVpx)!V$<RAKay(*8}4N%k)WbWq{+0U@-)6_!G~O)I_&
zpK@<6nnzW~9H<>yUx8i2gJh?M7*jh(yHV(pz1Yc-XI94@$c9rjwbMd?WME~2e*T_<
zxc^j%K8L>&*EjsmsEzs~(<imQy|${}98x>PaYU87?2y<7h|z{UR<Xn$^%RNdgpg=X
zz&@u<01r$rTt|ie`B7mw4q0YMAV0^OlgBvF9=_(PFe3-8dA2p$yX3HKnYCLL!!xso
z-+W!9YJN-VH)UMWUMYX1Pv_%}QRNMv40{FZN`+oAE^fZO!%u<q7b@Dn0={K4^3?8t
z>vS|vxq>f1fc|v20i^J(T;<O-+3e^}@8C3xp#{wpYV=Yt6``4nq0AR?DN>tXW_Upv
zGd;%Jc1D|JKrLNU`i=BI)Q5PDlh~U*`~PD-E*tbcwf_QdA*f(rzY}*$2oiIzVgBPh
zPakx5jPI|85!yuXc?BUXi%cyWXNFzspaCHvCR@~B#6gfn*%yeJ#EmTH7qtFf3bxha
zUFXSOxf-IyD>g!N!|#8ryX@!Gs>S)viJp{2eeKOSRyS#>m~v;nrrkfc-n*aQWv4%n
z^FzU_`UQ>*f6&?`Y=GkMGBeRRVt`SYMP&H#DE(nUh0G>Jo=#EXt)Vx+uk<Hr7<P|}
zH}H>-5ODw?88HsM>8b2{2Q0n5!cJ2VYOPU%`h*9<6=1hn=B)!+Z>C}E*M77IS}mv@
z|9Ov2=0z>1yBc2+)P>Ik3e22CzS=)@ANRo8qBD-Gme}Fj0IB!C3wZ!xfJ896fy6!%
zVrcx6ctnPl6r?^X!`vGT3jhJ~-F;L!sh6NXLnuoch8l`X*t3Zory=BZdHZ!<BGD&m
zLC1Jd<LTrjrCIEom>Nl$t8WHtb99aW*h|u6rotcGTG19vWiXp3g}r!fD`hAY)(uy0
zB{tNILojjbmrRrzNqqITff@2rAG=0ue8OiH&F5b80Dmd@^!$ul2_%#>M<W<+VK1v8
zDgVRbrlw3PaW?pp^`gv<M$w&`j8z!8Yz3<no^vuHtCFQ=Z>W!IwJ1<`oiImpjf;^&
z<8xUce&{$N;)LGPvS*I&!#x#LlG_65ZAgZcC2N;eN@A5oiSWB55LL9iprnPfE#fM^
z8PRgi5RmI)DqpKZYQeSoT0|=2hB`)t|7rw}C0ID5EVb@#CxE+@u!=naSR!1uiS_9&
zx2#vmWHZ7|!6g|6@7I#zD{96tmUXN$33U@;fr)i_ftBaJ#EVBPAnQ{NuHi|UY_IJI
zb5qXeX+ggJAQX=VBDz;dri%8Ll4d2`fNAoWdP((L`cF7dyO4A^-_&86Zr*!6w3TyP
zW-i)hOU9XlnToU8u4kNzXpMze)dcZ5#U{5DW*isk*kq(d{b}5c!c~jNTP)`iR+H&3
z#o!HNf?9V>43J%^GJxZl8Hk2$G0F^3Yoc25haVePFE+pjc0#703%h7*aTsM(8$kRA
z@Ij5}|H!R1`piALf8?s(Fp^{V#AMFguVLMYLh1LXV)#JmC*QC^>5p(hZTE7J@fPf8
zd#LoaGEwdFz;;Jo10XXJDlREs`2GHf9fJMosMOp=BKwf&i%mbLcqtFcrF!A=%irPk
zE8kJ~km=h8zBC7H*L`jOmP@l-fS)pS>nHNuXo!u^qqyM#^r+wb{7~#md`S!t*k=&Y
zfk+D~Q=_pRtdN~3m&<HDAG4Cmvl=OoV+90tu(6q@(~&;b`t0=VUc=_}7xm6tUb~jc
zipyIl3$3cV1Z7_w95#~CSTYPp^(Hq4i0!;d%gpHjXB&$n$K4FM73R|QEZkYCbyBkL
z6RZ_;Qd9JFsPfsZtSk19YI;Kwl3ProvlMfE*mOvbN7&3$$4j5?{uFqoX3R!3I=rzP
ztdb|k4`-m7x(_R19t~nU(b`MytYs*f_O$t>o|m`a&+0gr+d(}hnI8)^IG-DgGtbAg
zNV|prN13cxD~eAFv?SG4eWukFcA1V8(i^QZHEjoMtl+p_S-G}UC$+g#iajHZ(?c(E
zjH$#6D>q74-M*meBjt`}Us>7W%^$6nL7vkYaK!axL5M<13Fgqdo{m&S3V#Ec=qb@B
zP01GJx7AU%Rl8c`S{-F~f8@8k*e3BTXPCPJEl#oBHE!GBmLVL>8PZmJ3A)P|BZ3Tv
zN@cYtN^CPaEibu3Z9o#)nQj`C>};TpQRCp=-CseJ&s5vb8V?P$QWHL5HQsKGk!j}q
zghFpByOkAV+cOv<1@R$^DyeQsR+-x_omt=<b>Pv?Oa^%_uk@+}U0w;_gyY`xQ$hcL
zUM;52WGe}=FVa+=Tu^u#eZ$}HIF}IxKU@=N+2jCf{JKR)XQJICAevHXyj?Ptg;Y7X
zQGQ4o>K7_Vg&wl?g}~9vQ`v*32U;g@FOE5mf>=ME8=pP9(mAm4Uy49o-A`;0-2v?J
zGu)A#O1Srtom#k`!^mZDKSz+O@IoJeV2UZbW>$fNNL7P$i)wSYl7D`7fVmH5oCx;G
zL#&bTb!(#-@R{Ce2ECmVifBULPYYcUiMMkoGpFgd|IL8Mj9KVRRrAHsVUKux#8HVU
zNXLX^@WP8EcknbHfW(abEuy<rzMvuWiGdRo?q``x(R9Zz@r8Et&c3iA;BTr6oDgT?
ztprSz%2?cnerhTjL8zNa($xMA7>2JQFMzM;nzGjLSph=N+!9|r7wN92HhMtNXl-mB
z!!|+o`?Ivk8K7r+x^(3oo0gGj6cvRe1qHgu%w$v*I5<Ew`%--Iq$lH#=FtawEsG1R
z*^JsHd0OGg@3f@+i9dk}f1ou1?k3Z8l{4_z(krBmv_#PT4z4VP>G#hf;J*{+g9<`A
z4lyaWri-p5uM63$Z<)!?;*NCv<n1uR=a3N!3;a!-@W6EK&g9Bb<M<t_7`PO4%@$PJ
ze3Fm!?#qft3K{`ylLX!E2VL_3HYotxrGU*?)NUe@Nj}LkKio?rfE_0A+%a+`1hJk#
zckh>5B;-><iJf7g_(m+>9=_KQ$qL1Ep+2ua_$~TVByjI<+h1*68KMB0w^T!pC*%Nm
zCAr50H-WL55j|We$$7trcw2BWSIl>|J;#TIn%=OsR3~eJTSBbo9Wc#{frSE8hF-x0
zCqjgp12D@U=mpPDb|mt^vZi_XSBNJ`7|9bqXt<+o2{$gG{v9aV6y#)NZ|Le!GS*MH
zpI^~1ih?BU0swB6`s8`~t73xRcDMmfoPm#}Qf9S#C?@iZWFc$Bsd^)ZtwbTaS7ZhS
ziDJo3E#O=F9Mw;MzKH(s1Q1j$+?CIN2_PJ3Fo^%6+W#+#TwkLl$`m01MMS$H(;E<q
z_Jz?3ut~z_ARmm(09yp(hUgtJP1$cmo&&+;sL|wlUb{r5J~Ni9!)gAetKQS=ImgfZ
z_A{2>AD_2yy|9Eh5{0A#LLvPH@JJ>dMTN8@ray41PBcszt@yW{hbF{y8R2aS?w&WC
zaF^jmFk(;p`Q0~47+OSu$TzsvqoOoAS4&k=Cp>!5YNxl<(D%t$K^v|dNI||uO7bt6
z^hgjWj5g@>6_MHqJ!YchRY?2-{FvPs%6HkU6@|9!Pi3PwDf{97rrv69w(oS++pShM
zs-3puJ$)2wbJLdtOKg?<>-0Fc4F#4K<nd<!xy+NUf?lkuWR1H(e_@RGasy65)tBjR
zk|*qh;60uY8?u9^Id*}VOy;&T(jFap7Fx_2_|&Sw5huL5-{9xIU>&i;I2Nh_>~GN7
z0)m0&w&mSg>CBcYxU$=r4L0w8=_JF#Guup!VE)OZjb{AU3O7Pk=3d4=sy!JU#I~Eb
zi8Cy^yqvnquM-Xd-hLY|lB+Ta+pC1=fgqjc!Ka+&5u<U&#|Tb>lv<#p&Hmn^of4?M
zL4P(X>6WIYxUW!(S=xzJItVktubMCjg+Km^$|e!9Lv83ws}t5t7&fF9P|)HGR@34Y
zy_1GZEJQUxn_VGgwt*G4(IPhgjWf&yUX~uj!j?Eiej+Xp<fp&S67yuxeuKT_aJfWl
zIsoWOxOrq>-eg4gEj-8*GrdGb!|x!fMti7DO2=O=N~+Hc5M-g7k%bPrGr0@Om~{|o
z*gFzFdxa&cqix$?dT4(Tgij1=lI7Ujx|OEslE*x?=NX}pSUsO6iXyL-0srrp3G44N
z(OrZN2KI+8ajS#^s0r{<Sy~dHXatSjtUwUMpZ|pv!t9TMEE0l2g$D;9|4{WLWf&W!
zy`92KD64J}b+pt~SPyWmj(}5Dl<cKk)B0DjRMA|mjdfYmtX8SUy8R8}U`Z!M0tf2*
zjdfjbdSA7hzvep6bb1~|{zO8ZllhvIKX!;=9Vo(~m#tw1k~GX6NU|vD{qUpSQG|_k
zL+SY_%l+ULI~tZ^nV#9_qMU*hkU!Y}Xo{qeOsu^z5kNSm64KARQ6a*5JN2ViYFm*n
zY#WqEx?#nkN;d20XZc{w5r6e0pSe@!no0S`H9whbwgtvLI`Zz(-EYd=)hmB|CxpY>
zHxgO&oslaKJQ(8F`^|Fr`$dVk>PDH6;r>=~o?+%lN^keST;_OeX)>((yCuKd&<3@o
znzVC7oi+)+l@CZwY?%tAx2r{zd$!Mwv$9i422#wZeLr>Om)%{!;1?$3cs(^){%8u|
zpwYQ5RqgkM;&{<WO%<~|qS`npb=|0P7@aY{!?f%N`c)*yhvl;0Q4)z4$4auy%+UFy
z#3ICV<xG)Nh%{F7+a-6)LRzW6*a)yi>Sn%Xfj<!E(oAunf0g9^_K9FU2JF7V0;PBD
z-^Y;G8ee!C3^FOb{d4*E;0_;!JlE(6I}~;!(Yw<mtD}Zx>G0|8m(N=@Y85vrk*sgq
z2+d)EwAC6d9=c0wEGcTsRl3UUCYx*Hs!QfodLTD0Wx1vFHMMHiD$z_SYZ(%BTdiK!
zI$rXRf+H`wtXW?lKq3dewbeXA$($-vVR_ToEN;J-Wo3SI(}|d6GFy0ZcZh~HEB*p*
z+AtT28oliF1U+5GDhT_x7<*{&y+|okC5t7n&LU|`jYw`#So_g5zplHjTQ7D*-AZvP
zp?Wb~c*qdzZ??N3B`z}-Q?}j>nU`-nxj3fxnHRacXO*Bit`0`T*;4qZ*``LNp%O20
z<-h)OHWJe7F~QbV{D9+O&MTXD-1+x&1YMTL;{3KT)@{W=t<F$kJYiXYFpF^gNkBQU
zWkI-JsXn}|fZsXC@=WnRY(!Yug0Ynwedi{bWF0jlTAG@7wWbzK$dpuCsG7=RX(dN7
z#Kpy2N;Q+A_Mr-?d_!cJ;x9<1c+?Kg##r^V9F>4uDr~f}?IvFQeO*W9P|!Ns(AK{l
ztj(yI3o`)1fsm&?nKG?VerU^hWG4qA?$)B_*fgz}iz1^M+upV5<uVGHd7nxdp#0In
zwVK~Asj@*YJuZ1Ji)ta2xmjw4F~c#tv6EwEhh1!Brx$FpwF`Y_Q#KwSE@^?3A$gZ<
z9@HX>sbOk<qoZlYg!@lm`P~Whj!erzwM`hd7V`{ySz2g~><#h5FI=7gG5~O1GCdsd
zer)>Nu$-`#Lx`>=a1(*}$2d~`t1-Wh7DhwWUaKZUtf;{VN>^cV7a0aqA3q${6Q=hZ
zL@>j(A`4DuiiYFuMOMI91c9PsP%~=1FAS2!qnQw#Hs@H(2&!0@o#+5qSG8y@$0M}$
zFjfmVKs9jMU|eOBWC#3oCmPr#iQxsCxfqmDkde+<_xeC`b7qc^M_QAKVf(j$3R<Tc
zFJ6I{{ze?^=@4495i)~hVV}L=A%v}C*}#0hZ53HM&GJP{n;{YhWr~#!!W}yu$w!Nw
zB+?w)xfvxf3q*<nyPoBcHDC7y$z1px5u<t<ryKXw(_FwDK^H9o7X{3bWS)gq@}xzb
zD}WKl5Md(034+xJPYl^>&ZnGaJUOFI>j1YJ+FQy1W9Sq_I!~}h`1$@<A)KPB5lU%q
zN_`vN6`r7%uw{-(66^}L>jxG^fq7`&t;Y!G#KT|l*bFi6H9(4geG@uWm5>=}Y2T02
zB;vjVqXueYo%w<~SOBo$jyX+L1Pz5R`=4%##uc<KBG%!BO3vhYPbY$8x6&>FtUgrJ
z@`%<NixbvD6U0c?5p7O1yT-KX?idCp%^TZ9M`DS5?)2h;$71pH(D#f_@)Eml2G0EC
zMZ8gq#IDayNs+?_nJz^!_7sX3Tx_<Y8A0+M+w&+WCe1+!bOZ#{CK&HF=bPW&HoPPi
zYWP%*u~*uv&CuVQrb3NG1x<$G#+k4gzcE!tE`8zBjIA5SSM-(w(xqnRovA;Qze?sw
z9?GP8N(IUuIQjDDp<ME%w)1VNT@^~DQty^lUeYSmG+m;luolRuZ7CMNx7A;Neh4SK
z-_ZxxCZ`gW`v3{_Ywr+z_^d`51mEEe-3rG!Zl@H8m4$<RrtXHwD1B7En6?AjX0oPW
zj2!;f_|R;Z+}U;O9`d}%nGhbsitKi(Yz+t~zS?z*A9{P%vObsl2wW?@f_o)eE=Z=7
z^-T&9bCL=0ldT{x?Dttr!WU?;H7l@|iLMKp?KnhBG6OR)t0Z!o1X(a`L<o`2Y&nw#
zF8gpSJDx1dn7o3tn_p$%D?zb5Dpv=e)I>YpX>vSO$YWjmE59+LeAoagesP`XeiDbF
zufG-|NUUk~7T^stmibQVV6%t}doRu2>c<5RbIU)lWyYt@i%$Sc+Ub1Q)-GDOHj6v|
zLIAIGA3zHNhf4{xxwXKlH8s9A&3}c0%8^YH0Aw44^r?lr!sSqZ6hOvQMz|P~oFnaf
zDWrB3HfF}9;K>}l_v#6)WP!7m6CpH$)F&GJP<{*Xa^M7>iKGI{FD+&$2;F73vBN$w
z5=?(z84?sM`IX`oRz=!0%`Irf>}06>{nt4adLV+7EtT?<!&>U&7<K*R9qbAumUgjT
z4<H#x&-BtZE`O5<D^Ps5@DVlMvtzCZ{cx~06q4U8-LLw}<)wUh{F+ML^Glwg-~1sY
z$RFrTnGvNGKBvFCBA_$22sc}94<_&HOd5ha!e&2>pR6zB;Xg4!-P7Nr_Nv<V0&}bs
z1Ekt<P+51T{tf}sMEOxnS$8E#rFv2KOm`}9h5^Xxwj|;o=~q?!lt+hsJ(o&uw5h*y
zzVq&g$dr#B<!L0*&{IZGccE!C6#o6bPztuKD=uw7U>}ZZ$ScYcp!#STzrJA^b*_JD
zqLkuI{+<LXzSL5GM}ODc3B2T{SvOY-0+Y87pH;rFdSW3K>%SCF`Mz4miNdhH2Z%~0
z*J~w|Ur8igzcGknPtW~TyDD1a({VVQrJ}y;U-r<F`Ag(gzLILyUV%P5u;&95-X&Dx
zn$LMka<bBpg;H6b7ew1swc68C?}?TVsXh?qzsVYX@E1Gf1i`l$Fuh*M3gb+1fmbRf
zPYHImjVRX5J--znq>FVGG^x50`?Bl=74Fzi&Fn8j(Pb{Z5ttj06o-fUZy-i0gLdLC
zrd@{Xb>4l7d6KgDjkI(BSU!5ut9;~1>zCTRj|XeoR}wTkO=A?QOZz3!xqW~dW&=nt
z3<g^>G_??SAz`}c-7av!VG;iZ08^mnyev2ec83klQ0P52di4T#toIYjljG>;=JV2(
ztPOiZvRa9809OI!PD3nB?tV=*TtCz55BXa8+M$wTR&Mt?%g1b580oyjrw%IJT?9RW
zZx2w4x4X?wzn|0VlklY|^-wICZvD?}o2DVo;mU~`qd)1+Dg8RwbBUW@fq)nzf=~A>
z9zt&Iemuep^ZF)WcE7JAtr^6d)`XObE?bFN+Ma)((z>c;I3+chad1ey<1`i{-(38%
zx!K)%J<{vk`QFlu&@C}eZEs(SlewY3>WZf2?U4s<7NcwU{Z_IN&p1gDAr|81q;>KV
zquq>bA7iNDONZ!I{~SLv&;&9^+a6AnvPChP<NViH%6YBnQ}MFGFHml>&~0%!H%@^i
z0@#J4c(?x`rf{BhJ7%<~;&F(rsW>{PPM5|jAAJn^E{o%=^Gs2b6)_qVf*c{u0ZU9Y
zC<^rN-OH`$o*?vsqspAxQ=hz$UlLk%xp<}D7&ggI-8#Wjz2u4*$f6S!I5p1kBk`5)
zaqGRQUL0%mQoRDAkv}As8mWl>5+bzgG7c|GBQcv#oq`5fGA2F*6qF)(zepXBtU>;_
zRP^nb%v9ey9;I5ZhL517bG=HEIP8c7HCNSIZN&?pMN>U7(T0FMvJUzqSYqw9U5H?}
zyhmdkqKC3fas&PsDDbPIHGS+~_p}5B3Di-8Jz-Zo-P5K=-cPYl`bjAk*GpF#4^EKR
z*#J|0LMeuLvK-n8KJ~BPNKhxd+_`Dp!L77!?1!ViP&v*Acl~Fr3!-X3Cfxu(Yzv0s
z>w-_ht?8dXIo>3Lvy*gJM87(+z=coC<&>W1dix7}i_kHzfh6{ZWBj;H|JHVyn+iuG
z-F~Y<TXGWo#37&K93NRQ>A+_RW|!{>s3C305g~8M5via(mppJXbor?pj1q4q@G2?T
zQ&tuTT`R&;)Nuoj8x)#vdiA$6&}p1^9)afG$j6{}U3B0a_Q%%W(zddqL?<4L!NMeW
zdm^q<p%EbmdSFNu8EZy~;N59T*2LxJyc2yv<teVjLH_H5?;CjAizWLfvYL~jE%9X$
zkznK8>^*k}p$eKM{N`T@hRv`gyDAXC`i9T`eBjt<GBzE~N$je$cbpzqRee#iuu|7~
zQ#f>1xSLtNhUXj_R~hxjWj3w-O6U1;^BU_XZ;cKm7tqc9d3}h0wFX`*ruMwZAbl_6
zeBu!b^wYlNRJfdHXX<h4?Z_`fA%$S{DlhyB&+^Y79OkaTm`VgnX4Z1I%vg7K0U`x%
zO8v>bhRKGgkOJGF6<OA_4De`V9S`#8QaaY)enyp`m{QENfxJXYIqT6P*(9(fHSWl@
zG6LgcaNyrmZJm!axLG<zCHCq(E*F|jF@8mE+hsTlj;Ns7-iq~8L~L_L&P_>o!5sXX
zwLlEJ8<++86T3856t}MbhpTstjx_AHwPV}1ZQHhObZm5zik)<lif!8++jctY*k*@c
zzO(l@XTSSLji;VbfA3Li-E&=QPH1JLhnN$iKk(dJ&_a|4r%)N%1#TD<>L&qVL?&TR
zsBv$>;d`P5w|<dS^ctVEh!=-Iq%#GxYJ7Zei5s!@0d+%wYakW-H(X>L{bov6?uNN~
zQC9I*abq-vL7K7|Sn)mjtOeIdlI+Xua}`$ni6&9vA8BFs+MSAE_At)!YbXmlkq^fO
zPeKA?fCC-{lA4rDo0N~6lxeuU$pLl|%D(w#WMwhnW(+J%(LInT6jV8Qql4wVG=im0
z&noqI1S>T_3SXgC97E&eZ@D-Jtkt<?s&sycLn?NC352}lIJ$<B&ZaE;#3m)09lO^&
zL!Yyj!;Jl~T77xxOk5Bzr$=s5CZAIuBV3x#RnhO@J)gPPmu}l~Oud(0F#M~0(8&AU
z$a)Yndp3&PuutzuH!=xbI1oce$$V^cx{sv^1#lEVgzzBH0vO%QNq53ZzdsI?Fiw4Z
zaHE&IZgM39K!s=c3MnZUZ{=AQxJhD9ORJ>Frs~!Mu?qEd5Vx#TBIS{19@~$6-MWA0
zX4#7M<(%i}mdc>y)B~6H0$l^KELAVLn9a_o_j;JN5kK1oFT6z7`E4mwgur3)knNfK
z?_B|r>8`g3Lj@AyU=!;P6oQbDB)WR@n6hne^=jEUDV`02cPvs8yJW5&<kYkk?L6gk
zi!YYxHrah!DY+oG>{_1hke|6F#~11#P!D>A!r|(F?fA#L+hXp{qFt3Piihcccf_PF
z`4E@h@oCSfy$F?o<wAp`F1s(tdg>X)HzNRcw6BUS4Vw#VW0Y!v&y`Ag>$1y9eOmo1
zRi@%j&^c<_M?Zt_z~pA|_|3q2GLb4PBs<X2>uR<Y&Fx#yZzG3#^OP?0zpvmVL~vw}
z^oGr-1iiU#deAvcCK9Wn*6wqq-E&mfrXHv@O|MnuT(HB49AFO6)myM{gngnfBs2gb
zFa+XKwsb4l!UC+@df0>wu*e+fB?Az0Lx@=eupNV-<Ej(ez$e@eET}Hnqt29E=tuZe
zX?>7YJp!iLMdlimsnM61wVI5Pg*p%=VoyDB=J`nxdE6X@y1BaDEP0VPx(_Jx)xM^>
z1t-RO;na~nb1mm08cCw}9LOgFixI%;f=L}oULF41tD4Y=({C|(3}3?nOt=L&!a^4u
zbdq-VD4EEWpkhxG6#JcgZXl;9`!+?X)S=Cr?Y+Oojwqt0B(E<tr`47i(KFF%uDjo{
z&R!41ym7dXG3cgoODyZaQG$keiReQrW)oTCuY_XhXb9cAy3~W(H&d8#-+MrGHA_}_
zt!;_j{F+&|CpsLX2-dG0SP9Q0eWeM*1DDJ7BQcmB$OT<NGR5Y-H%^^TkEHYUT@?o6
z4Q#U}v#!}<;WBa-VhupCuxOMhjm*LKfAh43Z`O7LMta)Qpg?tpP(`1JtG`kR#w+}<
z4-AFI17qoN^e;(!ro`r=m`uQ7HS)TQkorspqw7rQ4T@DCgW0HpJN03d>+l^~h%ez%
zu!?s@%#0WTu1EI~AMLg*RdimUemEMa6SYH1`j0I|@XM1Qh%~=0u6p#i9Dt&Ej~F+C
zjo5Oz;o{qY?odeXryn5yJRde(KJAt9>+wv;U!kpbN=P4=56+)WvylNNU0-vs52SaG
zqkkW0z5S(F^Cv}i;y(>u3En$w@!>}uI}konWW>xaIO``V_)<QRdWfotl)oUnm|xl!
zey)k5?Zh`Xc$rAQb!~`#wTb{Jx9$0a!S29i_F4@J67P5sRZql+)=B9!X%^y|D=q#S
zSg};kNr&p~_U5U1YH<U)u4I8aq;%?AH`!&ga`uUQ(kr5|zfOS%ysm^J5VilrU2a}0
zW8_r&mZv?8<wK(7tM6+3y`DQkj@HMNY6Oo9G!q-My4IX&-fR$%^GT{WqM)s^-~ZXl
z9}LcT>86gAef68U-u-Hupui@{f}Y$-Z4Q;wjVR{$;}z-pTlxe*D&&21Up$AYLz$`t
z7vnte<_l+8*D`D)ADXWyW=tWe@>gyH7Y?ZDSFF53Dr7Yy2jxubTW}{6;AvI!2ZGCv
z!Lwn*wBh*#>*rdQfkCQ*j!{*yn~?)Gg_9nAT@B_7jdKV%@pG>E0dV@WI754oFA2+^
zg<VMA;3pyPI<c&34+k|d&$?wCa-8AH3kdS~Lk5;MC?>U+6|d9%;Z>K=U``(#@?O8v
zh>7)f1S^!~ElR<0!Gj|FJ<~zB+X;T;)~?0Z#a<MTMALtB0ZrR|RsRzJm6NNZjspb&
zx&D^pdHxRox_v_l+!#av++tmOK@$JK1Rv&>Ou!PQp`!`zao8wvjFVk2jRusMp!(f_
zztgyQ>JL?t^h`}<WU#wgJzsttVv2xH>K3!)eDlQ)R)$lZIwsC`jVT5bRD;gH`<;A9
z_Wz26o0VzP$qpxMrz9#o;iS5KD1O*{WcSmKaQ3sPr6%(H*wF|D@a?B0um$ke-rZ!=
zSGX{rQfN00vsnG0)GM<n$r<A@yFn_FDK{I_XB1`JIMi7V>DX&gf$)mv&Ju&97Wn<A
z>=hAF-A*`s4l%%x!dU$%dw%ovS-)vXx-K6zXtBMfvJn2ghf+WDm^4HZ8QfX0c(+5x
zjON{#2$q#jjA%IourDXBfeyuAX6$lUXRA}9tS~>TchdqD?Z+6|g(&sfXaNmts1l(V
zK=Fl;x^vPu;pAx|j8|!GgQP3lD%xy^Kt6<Gsnx+TU>+Ft;B7_LJy*Ck>g}W`VzjFE
zk6H&gZ*Y;SVoIcLV-A0e<(7W^Q>o`G%-(cijW#xEwTv$vpWHCxzfg|<y8zpK?C#AC
z4FZw~3>@YH$m9747!|I;a(Sv`i&)6EW`ZbYr6;ekMfEirIxWGPNG(X@N@TJ&QFz+Q
z+b)Vdr`Fn@ifMPmU=?Gu6;HN(Dl+zN^RuVglVZQ*KVSXq_+D;J^E&=`yX4*hbB6m$
zau#0UXMs~3&@=$b(A}yWiDH}HJV7z%qMFJj)X(q(u;e{)kY-mYBis8ovIOj-UfM%L
zytM|XZ)9Qf%)(R!ut&-$1%A!SjO{itY+>B;<_a^L!Z6?56h<;fzL?<{CplvnBkj{y
zziSeG6G6t-r}$(>aQj&d0ras>5x0b}JHyZELp3Zt#3RTrH;kyv@H{N$2PtZLP4?=O
zyscJ%6R?BW+NvWB*#?GXH0PIrfqxHE4}b3V9tQpl|Gs$mv$r5-^%NX9Hl=ykkwi!9
z%i1CX;(J>iSW7G3W-r;Mot#tzcam$I{?py}M@2worwv_LQipxTkz~;n9#O1SG10sn
zooFZ(hhft!tj({uS{N7wTu8O^jCpsD720DBfSc@iibm_~fi{NveoHTI{VJ!KAe(vm
zaI!U>$Djrmmj*j$-P-x_comy%rp1YfeVuLVin_*S_pMG$%Yg4@*7yd!-aISjiXi`M
zt=6wz^1lR4?~WLtjHY^c7$`HeseDz=B!iH_k3&j}EMtg^`cd!DHGZc_t)wPQPcs+Y
z0Ayi(3nTZb1<7GO>L{}l+2@w}g*#_$-4=$D^3s;VAM0S@f|T;p{H0b-C5@e5R39de
zlSgOvodUEXB*brC1xijw%ZS24q?4SYSXd5}0LCi&m#_u%O3VEYzHZy9j>B-l{LXna
z8a}abvlH!L>_OBWbi)?)N%#zZvA$hH0GIq@;r2Y$4I&*lsxSr#>J<g$wBp#<C+H7@
zNRZ=nBqqH03~e7^G(cH5?j9Bw-CJe^HyiVo9M|?;X9VaiH$r!0DG<%Db-6Xh77(m$
zaiE&7zddEPFfRwWoP4Xk@((vaNmO?H1+tFnMjp4<>{PRh?C;VWv+u}DOXSWN;Ds@O
zdheO-h(#G&C@Vl^h}hyC6%)5^SDEcIb`|pB_r*kLM&?p9?v_@J!X=_sx=4!cG6aFW
zDkvBfekXjqqn)M4YM!`yxH_GL$6$P|dcPE>|6oIr(ReKTlY?tkXzyP|+>Mv2*xrVX
z4SS|nM@RS*hpQa6?E%6{^j_KpK#oT_ay&MN`p}N$dk8vb5I}9+H7q+y4O5Df{_JGc
zeIM%f(t(FPt+VpzQcyo8pd!!v*K<13s8kmGqlr3rw!2*&^Gf62tdw;C*=(tMWo5&&
z`^SgczLga|zYu}l*)(IIR#&IQ<<$NOvjEa_vp{d>;?5SCoNcu0xJqOPz=l?P$x<EN
zx%hF~NkU<}n`-lG@po5kl1p!bPobad7s%zt>%gXP*A;eToa+}nFFxcjRlCW>9YrS=
z-OGwtLu}h3@no}tN!PM<enV5UBOZ6VaR=&oF*j)9x3Q0#Hclg?*In<Rt1G|avkJrF
zA0`0VyP0a9OLEe3=&|NAV0~WxC%oTe<8mYRkk4X%?7IFNif#e-42|G+peMrL5FSKO
z;zCXQz2?uGT92fFC3ab)MWPlJyxIA)fK15DkXyXaRfFYUb2Re^2;_m}-su$U>H|Is
z3sWHKLVe`L;~i+=L+DQVH9-rC&4Dxp1d`BF2F2pJt-prQ7R}IX0Sa&FPC&}UqpVvA
z%u7y)##;--{`D7~!tl9_KCU6nPkICKQLf@;JU&}W?Rm`8Qd1HUaZEwZhg{gJ6QZ>u
z{Pm)9x$%*LIWDAHBnW6R&Iir2Z3Hq2bA)%5s{#;Wso=tdA*vCBStj4?^W3fCH3O1g
zd^ZdqUYRPse@VpE0Q@<Oi*08dl2*|V#6>U=u+k$4vZM>e*XhLYF<PLR%0p2mZw?RI
zF6H5aO^C(<ujWJ_a_Vr(N%QJV-R;ooWnKd%WbJ6^mcCx5D<!KV#&mgoRqpZ1@zPfv
zaX}2Y1lfv7EuC$w&3GhggPa7Xf=0uFDHmMvwNg?v+M`$PfH7&>Q`G^x&})G>;0Z<B
zPugAb<U4bVoPUBMq%iaMUqw13Z#fu+k__|f<`m54!;e;7GXVs@IxmE!Tw%nNDEJ-T
zp>A}IOMnJ`{!uWhozDdYX{ZVsXqV!eo7yhd@NUuVxq?zrS)}y3?uk3dos{RfHTvg+
zl&hICcxkr~0NuOGPiVsjfqm#mr)M9&@$?XkGW2zdvZHOcK??z0StRJ(TC$b;fJgx-
zA6yDy%e#iOZznWYa{Ukws1TjOMGNxC02)Wuarf?Y`Oe7_@BsiSYN9#c!`kg>mjnwz
zyE_?L9hnRK?#sDN6$P2B*Yac=Ih!Z`K4&pqwqS3yC>e3StE=7l!AuK}M_JShy2XPm
z*)2xN55&<Zt^I(q^PxqR^C&W=t&fK<%r==A?>R>G*S>`~Ul77C@c%+2jc#$9W~ZJY
z{s$vjDOiDA|J@1+f0x<+@{oJF#RJ3v9hA{UQAVu`9{%jh$>%}%fnnMr?-s+sk-^Gn
zDqxC3qU|IwW*^G@PU@_p3ZPS@pz65+e<_G%_kvHh%u1(XZ(_gC`?$P%oZT_*1<ePW
z<om|6{+favC7FmwhDgJDE9?qnK(Z;12~akb_a{Nk;^08X6MHKaq4PMT^#fEcBLPRL
zcF-$ND^M%!TaTPq8wic6$}ydaRq>o{w9nng{iGpcUX=l3^!M<OGpyj3Rc>gCg*0bz
z%>1?J)hs8>DPA~3M$O3exwX8tAGL0q_1(x_^Kj3O*Y_((&jflg77RS@eo%*c8+Lk%
zzlfXd&tpcFmF#E##J$I~z5&K<Jq45)BC{O-^uLw>t>rBLUDz5s;xQRsk*;KO(DCVg
z+HW4(P5i4o5<C4-_ru*?`!1G-pX|}o@FjAmskrEDf8FgQ;F+vaVo*|&;p{TL&8gS@
z<Vso-TR^^yH6LabCzhTl?5O&+$3J%Vcz3z?kDg(j=5y=$a!vPYmJ^@~%EBbQKV7V2
z_Z8Hs1*dq1?IGnKl!fV9pg;y#2B{2wLJ_U{*FQ~?(P46XuK0@&5UQKHq=7GOf>#?d
zDgRKc*XkSI-TMJ-u{<!TV`={2D#I!E2kz;-zA5`J+My}?cZ_BhrBIi<pESgh`k|oB
zK9Q!y`w0kEF)ZQ2BKZJk6oUx-6I`jbAu252O2l+wkuOgn1||sXy&$(+2OR7@%!{ic
zN4Hmu2Y3v@DW&`)C7uEtk0@A-`R=(9^febu3aStVI?<~EK};D1DB7Zt3s5m+aeQSu
zQ4U-SDOguy#KLhBxAKYyka4&KTFS9}1hzT|+6qx9%LK_KhDQ~UaoB`LGz!uX0qx-Q
z9|@rdjnSDcL?k|-Y&8(F6C|3HW8j=JYEbJU(^*6$kf3bnKdin${}XJGelJJH{9g1T
z_+}eu{!gE;zKjic2B06~e&sU$JJ{D@gR)0J9SKaZM}UB#FJ4RETM=)uk0h<(mA8Hq
zS)naM|BI11zu;a>?~s{r<vy2@j%AO>U4Z__{kr?j`e5<NXPdtm$V2lXdhMJ0{C06H
z*nM}6Z46Zp`IU4V87nRBtssiIO}Fm=7tB*8GO+RQzy%j@4YT`QQA_?JY}e#tDbu7!
zxUp>)nUKybqaFYB@g_#TK8_*&yDM87z!Hjl`;L+4m#(cGaf2{>?BmT9`s?Ohl?o86
zO^m#YE&xc1P!78xn9V!dWoHw@A2`+tf}i^If%MvkuinG<d89P*=MAl^f1PC?gl8-D
z3CJB+9%~1boACEc9MsXu?4yMkX|aUpLTcYUq8KI5)%WuA^2}|qa;$CbaI<mDu_xi2
zD7zyfAj!i#6RaxzxWr}T-_C7jB<JtZA9z<{&uVL__LrH&aEFbv1R;D&G9(IhH8b1!
zD~jymgUjmUyfc>Supyl!-i?+@c&Zdj0sRKuL5B(uOorp3w9eq&YD5%dHmxY~?dM{<
zjN0R^=*=JU=o?G;geOoMv_BSfSt_2oNM~g-75`-$*Y-<akFTgLud$h6%TD-WDkr$i
z#J1Jc>Qrqj-8M0M-*;l$NrxkIB{{Ta-t}gK)H7#A9kN5pBuI%}F_ZCvwb9qu)K#Mm
zsznvB!ntW)+B`)%&E|bg)VNh^a7TN(3r0nUkdxQkvJ_>+c)VS;Zf=42vo7=zQ}4CY
zagY=i&9Lg3LUQ#qIoC}PrJfqW)o(H<qn*S0ly`dJ8Q({)dLAqUK{q^9avm{0u-dT=
z8PVNM<j$&JE=5eUkVX>nj_qhnLVk4tY=HpK$mULJ{^K;1no&$D6-{@QD#kNmerw&J
z-!tB8@+CYr&7w=;ig?wb&bJspCmGU6OyKp)BB~l5IpLcEm3Crc5-xURYE>9XTQSY#
zIxRc&<!qI2vfn~;fwNiR(bYdD4@qVrkbzZfL#HtvFGv1loEXr?gi9FooXe)jI!*+<
zZJMY!RL5*rZ$b(CYqpt{y>dvc@48(pB`&<CYmIH581P@ioJKNhj4co|s1%e{(8SBY
z<XXt!YSY%yG$>A9ao+iuF|JopNMiA~v=<kWaW%rgPJeZJj=?!K$VF=1@NaN=bv7(r
zX&~%nQT(av$arET3fJ(%-zgX|Z1e%-C$z-LcI*5=(=*H=qr4fzp+(p2<?0nm;<C-+
zyo?OUth6RiQG~4mB=e_4U+?{7xWwbk<F6*dtQ$PnB<Qo#B#>x>i}Mf+E~2a5f1{wd
zq+Ld0tgCtfHBwC+mBkdckhLU$oz7LcB|my$ML+KzItZ0wR&8Xd*rP@ovBd-kTXH>;
zlBX5ZoWzIbu|6JKLO{P@E4)ympZRrA`qVEnSS$?4Zx)i3`4Rlc01g!3udDZ}xx_kr
zaDsn9^=jVo8+{N-SE!auX4-^fQW58c`IGBz#>>`~aeE2)|B`$c9VWh|#snNG;Ebx`
z0#t9c-xWu8G~dC$lI!bcV<Q0)zp~jbqQ+qTC!)NC%F1F{#g(OFtLtdFT|<&g!?X(y
zG*(uWe!i<6F9Ik1cz8@R%CeuUhBmH6bu@IV(N<o1oGiD3eXTr_NAVJyeHuzSY736t
z)tWwjhP8F_MP2TAo_+8Uj_ak@`I%rzPa5+aRaSY2^W2w57xfgL-30)qQc$vsxbOMO
zCh5InT11N98D-(N_{<InT;#SpU1*Tn<z2WMHrjT~io>vfz*1#o&i#W-pS_0h=eKYu
z1IH4^mD_QClzb`%X3=(tm?HcsEe{z^A+~zAaivU3QQbiXKY}S`quN;VKDP$iE1>o=
z3fW8i**snCSLAx}km?0kr#?(<40K@a{ECJXZ^-;4ohkx|wb=9-ZAy2p&eg(Y+4Rmf
z8B4t(%?3bT@(aFcHt$@ob1(KxHW|mTwAtxJ{5Frt@a37lm-R&UjcWSknNwbXImZHR
z>y4y2*x>xg0OkgRG+Steb=MqtUN&!P5CIWa=?3eBGS`Ab0~QYu$7)_#LlB!a`$zC2
zVo>fc<rIExJY}6o&hUE`1A`V*k=~e&2s;XSEKla#QR4DhW+FzH8oJ_x37=TW+o@Qf
zQmJ{9jz}LotoOVnLwt*o6c1K!YzL368<Fyeew~Tz1)8drs&Gh&8LrXDB0}nHp(#|{
z%sSk0wQP2c`-~QV*V-#Ff{b0~l7Ndp!Vbbb#;tXQSD$)j#aP5V&v_7P6w$>~e1pME
zn>pzdRUph7#e;AzNRq>m%x-1wYj|2m>?;HR1lbZ|gQj#N$`yIoANp!kNx=-8XxOo%
zHx1?KufWwXJjPe3vuWUyybDZ3n0(pk2n&hUg^X-9k9Z{@R6ecnOc+8<u^*^Px!9|f
zS>!%ZClL4D5V2I*IFcR@{~Rl-S><)2v1Tf8gmQ3iOmww|x?H?flNlsq%L#2Keute`
zxI>SZ7;$}s+hY<4<W4fGR)krovPm7k;+|&`DI*{9uPz@4-$NjS*u5#mweLZq#M<VF
zVT?F-ey#`TIOYtuPE4IqV!o<K!zHtQ&)kEvbUlbN-~cD>Y<W~<`i-tg8xiB+&krN|
z*7YF){LCV!`@a<-no}*7u@7qtmku;)N>ms~WKEMamEFjv6%Pzn$jRLGPpx?Bcvxba
zA&O*t#5HC~_g=<i+#(+`3p>moikP9>klN;^R>A<;8k?HBqoV>uFu#csSU?B6cdoXP
z?>;6b_j4!v_YU`Yc3<hlp&)smYT_TZI>8)np(bJlv14SEM3fSKvFj-Oo{H4Z(H}NI
zM0Ze=fhC7mw@|?06_D}5RNEknfQ&|pM9UHCF#vyRU&o6cE&;)`FG1v0#tM%{6Q_w}
znveld8y16yYFv`Eyppcxl5EEgRjD^uqNSG^P957|W3))%DugxpXy=nUBXS}Jovzry
zv?|pJ{Q9GljpnOIN9n?D8pML3pz7rv>E{y8z!P)mot|`xS}1&UYc8*vmRiWfSj*Iv
zNe1y`PQI;R4Vq{HS7|J%Gm>G#=#s<e%PuNvJJpscLEg!I!qvD7vicd<YP6d+DoEr=
zceZeFMz+fs{I&bP-3ym2W8jIuUBd~#Kja|5i@%h>X?S$h13J2C`td2nmP4@r>o+d*
z-)7^+2)N(hs&{dLi@U5%g9svE->>j{xJ`t}X%OE#`7P)vpx+O9OymFmQH3Q5_5J%T
z!5Py3+ta7OwE77=B~$^>3f42KsGwX&ViqtqL!#CPilxM0z=_J<?6ex5i>*^`NcutM
z4QTgCgvgn_m)&N>y39BRnd!IUpnYXePGvjw@ba_&4EX%K!|Wr`qTnE3kP+7qgC|2X
z!+9`+dFBb{y@H=Ehlpp5hbGuZ>q<{1*(Dt%kEezD^-qowq7VVFCA&2y=^CCrO`oV>
z6i4w;!>Bt+rKzZ!8W(IfH12D#tl^eq+Pb>_?gTHN&Daq0T*KOq?yF^LgBo0tQ`2lF
z09^D*YNmXQ%{B%iYF@;MwdGGbyPTC&;ILP!vS@oPNXkI%bd}OdkuhV#!Rf~FxFTo_
z6!3Ism`}oKs}liW#euaonT@8Ut%{nfJZK0tPk%fm<$(1@4^-R-tF9ExcE86eZOiqT
zjF?W{tc=1H3C=9YshMgKe)VKKuA^5Z&8bPQ+wN?)qJk!+O&t|>IrziHk0N9pCqd3M
zj8rSQbVo&#QiY3#i!dJJ6l?mAj?u7J%H+kfWr4bA3pE3FgOLN8T?KAUp_&NXgr@ds
z#nTp-Sz>w7d}<wjd<%J`#C%m1e(lkA!E0ocjYT10bT@>{7$2Ne={X`AdL{azcCrYx
z;k$s!20gPzL8Z%ya96g{AJP3y*ocQcZdf^)5Ur?(8QJ4BVPYm6a=LsP;-(MlmL2Am
z|6nvz%Ig8>V06dXW^511p0OIf;^XNN*7A}BlS^$%p--)9b-WR-3=VuPSl42T{&iZ-
z#52!7$pFgWOkC|>9;~}f`Gqk7CyWp0)&adX+Rc?A^6t!Y%88zC&2>fV*a-fi^f++W
zMOT8ChBjplx+iN4XX^xA_C$mf=Ol#d`)IWwE75>gq;Z^DAUFOaVK>Pphcbk4-y`hR
zjrCIJ4PtJ|=d}$#h%s_vDe2hLe7hHj?FY#Aqe^;f&!@QLVy>jtoDI5(J!*|T>?K1O
zh<-ykgafs-29-1XmV{`v<Kl!QXas5>;lL@WE%+KU1dl*K(7HZF7FkW-uGYf^kMFNQ
zGj=`7+LuK7cp)(B6*`+?W-U@z>Z`V$0h~U|%(8I@cEKh-S=W%GEJs)`$k5&(r6Cru
z+n#7rq}#P<RF7M>7}GzO17Op#Z4c1@c{?h>l_&znktzb3%SnW^A%f_g1Ea}CByLD4
zFclM|yiFUMt$DkzGA;{VP~Vw)5+o?+hmik9u+13Fx-KMvn`d6kOwD{+S$R3W-LJM0
zgIKw21jeg^+s1kTIcke+NTOuH)$83A&eKiDG`f6qVt$OHat*4C139axe3n~kqR(}d
zf7`Dum-qwnAj6jkrFlLL!xJ04pKsa3UB|1?1j-QTHy#!Bh4!<Ubd{33;JhXc_~ek|
zWC4@5EEd<@4-Wqh;;y~LDkjC&T*nXN!WAn$SX?Qr5<&^$uga?LJw5{#jUInLWJ!g8
zHZ0J8rs^|cbJ{JZ#g{Y2I<Zi+S63YT!NT<wKotd?q+6cYO-z?JpQt0^6OIv@4P(!b
zXdPdN{j(Nm*ozWgw)mVdX;62#y)8_1H!#-`8Xz1sw+<GX^DJE!G3543W<(gNY-6N<
z5|@4)7Rj1Tu4IWpX#CNhE6I&O$c=MkermVZa<d(Uq|NQUmK4oewr_>i#xl#|Qw?R2
z&NBm8XP+YK<vh8M6V?o$Z^ak9=z((yKp^Jhd<EE~+Yo=+bvU@3-XAWXg%BFwv3a#!
ziW>#8!95t1o+6e=i#%e;8qR&2pO-{5OBdU6SSz$bPcsCFnx$zVc5^(DiSp+a#ncR%
z;EyFb<e$b1D1ikP*T)8w%@K<o+h`f-?U@5&QpoVvVqnDWSUDQAk#ItIu-S+fk)q=_
zy(m^=j;tv(!VU9~K<Gj1=iD7Y-AGkrk7XBRdIIH1eOas5RhIU&i>Lf63$)g-7N(+#
ze>9It0kgHkjFEhvzriHsjA6n0EpXggNj8NR9$Ey*(b8gi93(b8SWlypEHH%*>Kuj<
zp*ueD`}N}2XLgswqhPRu#Rq5`Gq92W6?G6Bqlo?v45E+&xNc~me8$%tv^OsBmCE9i
z{Dmr$^^0<|%UZLQPcn+a$KHg>b_HTCmp7EeGc5Li{p!<C#!bgyoBIseCG^I?d6IE7
zTU9z>$=RL#eX-v3c3CD^^>LqP901M|5y7TpehYyp&lX-kmIx#@)s@0Z8*C4*A|Q^Q
zh8wL^>7)_|jCjQ3lWrcgQ|@yKC9wv2#COHgaPhzqc;UY0IK}$<g_|-st*0mqYqeGR
zN>$-ya8_xlPhWPKo_T3@)^6}F7;z~K{vL34TQL6cK-BKqDoo4zW09~@?U1vZjAGC6
z!*Z*qEVYUv>WERX#<8-M^hvRR;x8LQ%^5PIey`~oz@u!9hTDOSrcF`3ZME`8cP;Qw
zA@i8Gwm62Z4!_E!n36RE0(h#fyT%5sfG5J_!Aq#=oc_<AlQ~j-ec(Uov$h|lm6<6D
z^9_hiN$1H5|HQBB6>)+q4N;do){300f4@p3wcQ}u=-X^q`FeCYdDn+kiY<<+t{<Gj
z48XLs0^FqiF9HnW$p&Ze$LYUNthP4c1#(aat8tES_PRIC6JoRmS7@vy#E`sB6yUEg
zvxg&tO|y5~M-zmw%J%O3A+uhR_t_yS?OBK3Uo>t&^4J;v`F1#6rLUkj$y?<LUdZ(G
z#=>eCvr-^?)thPKac;TS3NJrc5oOzD#&Wt*01PR+)6)VQqHbS@IK&S~bm0%BJC2<F
zYD6S;y_ay9{)IOO$cPMXA%_~$VPSviyPQBK9J?My{W!l2MB-29|FkQUKFX_=riw2c
zs^3<ZJbP3fuPi-%^!;wAh*tfOuYD%&mz`sOghvO_AUJ?k{=nQa<=KH-oJ`jC(wBsW
z0i;3%-x{IVyP)Lla(VWik4)gx2-ZM$YAcb~kr%isRp_cmrIs-95ED!<1)LI{xoW?>
z4dyjJ^#%fdfAyBj6OPiEE%76&P7afys&?68N{B4EvUDkS>Ng`VR8u4glP1WNdZNAu
zJ%M(K@5{Q39L<knp;%$xFpY<w#y+sh0a|x!%TtqLcfqrr^giGT{5h(ACdiFrY)I}%
z?MXxA770JHdxJ2ePRNljT&F({QTIr@BfHYdZa4=&q*(vNp^;RU>)q3!O=l94w!jWy
zenMd^kuKKOa}sm|M^o7$PcxB+V2@Ev9mLU>iZ+yrH!Nv&UJmQ|8}uil)(i~zt%6sV
z+F**L2dKdoj~&s}lE&HokYjgD2<lDTPv8+NBPRi~&MLr?(JsvB+-v~9dJQw>I_6XI
zrhAL$ZRxW%7$vx8`f1h@2!FNu`{Yl1=(DYnWMq#?>Hs{6(tSI{>j6X364ES;dLoKM
zUKi9nq_qolVcyK1Ic?y#tC(8S7r}o;;QYT4F<q6O;<tW%{hfXz1vJGZ1e!=e162+w
z0VV2&-x@ZCpx0Z2N}JkbL^N5Xrj00;H*0BVxuQbm(y!vs=K{jBzn*DRj!}T&uf7=O
z^cNGqCt}>&{h2GM5J|f|@#C3I-sjDqO4h=FuN%}pDlYhXRa%oN2Hs81NkM#hs&4xt
zEA!zII?~<}KTHR7w#j8fu~t-fO4Gs;fZspAxgDUd^o370ZCh~sjc1tFQ8rc6JUu4b
z5k6V6qHuCRIhhB=Mxs_g9qI#e7?x^2tkU9hiK90e0wuP9Eo8^>Q}c=M!ln0wrM>Zs
z;o@V-T)|QbYO+W0R+O^9$b##+2m$OWdcdq=!sD(&%Q$DhX)zdJ@B|ku+t8^I&{+Ft
zhZ<!SV<YjTD}V|~eg3$kdyPLKr(7tzg3Dp^S3h})<5JxHN|uM%q48YkZR^=TGCZ7H
zeL$ua3hnI2;o3_5Ux!k<=8&MPv9bx7EZiS$R?!3)&g1=f2GHluuq8Vc1PW#oP;aj%
zfUkA8izt$TCCO-*n4&E*h0<#a0JY82yNLW^9*ci}7Av#GJA$GPj^wQ4+IyG_CcsTs
zXM|da*Uyy~ZPegWu-dDuLFItcDd_<+&F7i|L?M4FF*eM$!OA_=+{f|}BIELR+t@T=
zmj6?FQ$~7)J<0>751(XEPk#Y1s~uy7g6^~<9=l5!TkYM<9xj2wpvO^$ts)iQ;ogGz
z6@dKmEAX0)Af_cnd93E{8sgu6ZzK)XrJM=$ky=s&LCq3q$68PZgfo{N(syNk#$_0K
z+0cpICp3sUZd<#e^U4@j1ZR%>fcVc2%I`vLW)2DjgbEdS%}EU$IwSy0>zsO_f5%32
zb4?d7g32e-NxDd!B)JC#^K02jRyRx5V9_%nj3*!!vwK)A1mj<IMn=o1I*Yqt3#e89
z_1#4N3O|0~_U1Y3W(O8KfZ6^#NPFJi^m=}z1iarrwt?u~hQ<1BQWk-F$+t^O(Q+lD
zOYB>cGrJg}b)Cd^$ch2jf<a-!V<p!Zioo<=lA}%P!KfId@RC$xe*Rlb{X0=U;tWB~
zX0}FWj(@eE^=7#l3ypKz4?|=&_5`;X9O2_5F;L|9fnzLe6hvKbH~>_5O%DAg8p!i?
z#A{76x@#TMWnpJgEiNHo{5>;E9leS<M&}8GQkf=|S}7bD6Bhvbd$dI*gLni>Qxa*W
zXWX`}MH?~H3&yl4Pn0kWe25jw;%k_<1oa?M)MTtd2{ID|+HM}Ov*;~#V$9$WnK9>l
zpm~~vD{8i_jg59qT-7bbhUCi&mOM;bDbIMa>TZi%tVRNdz9nBd3sV;ICSLeW`nKue
z8&uBu0pUjUR~3N0_>7EOM1QaXBzn=6oM9Tl)Bd;)|EgA2$%INK`r49Lj*Y+9AULkj
z2(Frsc#C+f{xwuSUw3<O7*v$A<EiV8)Qce<r*H=PdDq+F8R1-omj5&lo6yrGBX1eE
z{-~I2*~f=jbqc;}rD>q*=n0!=Gyyw)h8!I*(AGG$53&Q|X(H74epXD$^G+B{63$(=
zh*r>u8}YE``J4i=FG=Vrx=2hTLa`wO-oB0vTrMn)j8g3lCnnj9^n7$@CgExaZJkLX
zp7m_`YmJ?pO{(slGkFOy45CuHE-=!ws;)dYR$5)6?w94^n1(Ik3T?FJf=l313pD#(
z4GRBCRigqTbM$f)(5nC7t%j5{A=hT9x!1iKs@3T4EmgqEduc4XYHDv3R%KRLCADSf
zsWbVkI&M~v$~L9l!d11&_gAek);DfxJob}%>8C0X&J%cywT8!q=BjY(w&Dqgomj!v
z(XNH4LK>cE)MMLWbj5R`ZKJdom$!8yjusf)-G>1bko5Yyf}K}<h+QrlW+YT0-)>7o
z+c3J~yfC_Aw&0Nd3PN7HQT*vxq+QL&n{4!4Lfu*^n|>z|Qn?}3|3VeYJ@Du?!0;PD
z`ohSQeK8PW)DnP0+O6*^v0g)m)GO1S21XuX1aeN7Gs1Ap6qiE&C|j*8M?9{qUR-vV
zZm|d8y$r+a<vZflOkWc$Iol$tS3`52^`>E`Q=E5}VqqYrfq|PD6?~7s)H^cVp#^kv
zmhP#05n!q*(bUV?&1|qV<|A#COR5tulJgVkaA)XhcNR-ioXYxMZJ+<K+je8>3Dok>
z>{-&Msv%#cpDNIvj8{k<TEYmnj@f1i{O$w<?#IklcA5HDCdwk?j<)}@RHJzfem2(h
z7ypE>r^2sNaLYhxicFl|J(C^E*rbA52t2y^87z^x?dj<+9-vphh#s|BBud&)<v=gk
zJoA?$i#_UR-3&w%6=>wp3Utk`eF-D4;TqfLS%_RO58lbB0&b=E(0oO7S$5lE{=Fw4
z(_>r74MjuQov9xaW>Ib*NTQ8uLH+SUThz@(7hg!>i%{|*jmj6?XmbHGFh4?`P^c)4
z5;a3@^3U{_G=2>{DX1Cq#1N52^eU@zR}fwUGIr#L4%zn5a%j`Qajcy)<KG+|_1zqu
zRkZ7&KdHXdE8G&#gzZdoSByymI)d{6*0G-re{twutCHuq)0d6$KG1fz>sa1sW?q@N
z!Y8I4v)}Fb(uPM=HG@5dY_3T6bk1~Dzo|@b>?9tM%-&ymE+`Ir;_lJE1mG+EPj%sa
z>)}>`j#Z}wV&jnTr+(mk;11m0f57Esayi1Aq*?PQe*xWCqIE}Awq}ilj^``@lvYju
z_S`gL#8rl|b4`Y=F<^`?ci~b3AKYP!TNY+y5=H({udjvTDh0d7l7W)<BSYpH*&J-3
z^efdnNvm>;YVIT+W4Tkrzyl6-rPS;?{2C!2a`6UzwoS!PL`EQwt%DouomEE0&rci)
zs5@mZ1o#YSZUnI&hcZW;=lcPGue)^yqO$CX-JGocs!P)_n3k)*y?})Vf#W5uMuI(_
zqi81-^c{5#K%d~AbZlf^z5IKu>MeYCQox|gEq?$S;IFpJz`b^|Ut`Q&Yu27Y^!~wb
zq6v+eS@a;}je2l97xe^4c$D~@1M1ajYE`D))LvCLv}iA$UNjAxHmF^|9|;B8brNaw
zIK_K$X;LI**fsiGFb5$mu0xAWER49=o_rgNYWQfWkxQfbn+jsDgjlrd=a=m$s#!$S
zp}+ZwSK4y{E|FiA&T~pT-BUemVzO5xh@ad;{Y|9*g#WYpQ4IAImVCEe58o9~;J<SR
zfp2Vl00-qo6^zj@FZ`_)OkBFiUkVcI;Ejlhq~)+P5jfPDCM^Bh*eg?+S6EK`g|~4|
z4~s8iXkkOx0U*N3x0|g~pz=_YNmtn$ZUM&)mwCOt0pRJwN%0V_d`V-}vUD^adeU&*
z%j>a8(JsmR>6UZZjI*v11Z_Cs#xHmBOor;U0N+h^+}JX)^u`}<tDJ`6zcb14hr<s%
zHW(cLXf>R1WEm{krLutcj*}-)M!T+}rF!KRBwa!$=$l7s=I|Y|7b9rvO(UxJ?BR3e
zWY_X$Z5r(_sQG&1+;8h8UyZp<dN9tzBuqA<YPHPq$JFL($aRbhJEj-QGPg^sHnw>A
z0kW_inDB-*m6JBq9CJt~EX5DK4yXq6$&pA_I!QW2-p&IiQ0e2>kW=_rcA&RhuL+M#
z0-MSC6o{humUE|ThFM2%O6#JYpJ?CoQU9r^rLhejxESC(XqHiOPmiYlNt!3;Vz0!7
z3Qy2V+kkS<W@Guq3XaKu(;g`gb!8$D50DK1_n8`L`bzO(nJ(x9j!Wg+7GipaGYE^9
zQ@{BEx$t4@v|b9QK9TFK@7{}9Q%WlkuE1<<adMeb{ER0k`vZ@{HnJRcew@WtSte!<
zKsWn@GL9WU)*=2QbV~F{^=@+j<R@~DY<5A@d>?_eY%nt|L(vXzY}ni|O64JZCm_<_
z?w+Fqxpk|5{tp4-u}lB)Txw{xHAWs=pUEe5VJ8la!nN320L=6Fs3q7Smm|v%tt>UI
z*qvo;#NVH$!LpF01p5&MdHk*ltp($r@wf(vs+h*es>%E3Uzdw1{BOY!Z)f|leJp(?
zqU!BfVnj)n95!o2YcmBFnS_|0TzvKmPF+d0`{Bm($=4YrnL)5aHawI#tdEfNrVwXu
zngf^%)EFc=FaJvp(}0i{0-kcJkrcb^wNoT>8B9<X(<*Ms{}G|>cBaLY#4I3zl%#XQ
z9|h`jF#?9VdC<lx=2+;wRyBNME5^(X!s1~efpi!O^fcv>=31hv{T|_=yBt}YwJ8i6
z7GtRds?1A}b(~Yd^Yw7bzn!Q5oDol<i7)-M{rx+G=mg2&EkEJJa<a9H9|8Hk|HkCs
zEu6T;a)oN6?CF{fXH}{9NEPB8LNY-JH=Tjb!V@3|HG@g~b-dM@_h|wNyGL(*pJ=$n
zV}on>M@VO_Y<pNAgIjmTiJ`jUXX}q7$}WF|L6x3|=-#6+sJ8R4Mrwx69*)m!(kV$p
zs!hz|RGz1Bb7B;Vc#5CB*oMv{(u)^maSe~@PH&iMlS=Y9N12py?yIM^73HK+$>EFX
zi*tZq>UfT3I{jVY`Z_B0<)*Nc2yQ_c)m=9V4OXzL^lg;^>8AB*`juN&>3l@T0o~<6
zdS$e{Hcv;&YwF?SfQp*nP6YFQx7;j;S(hnS<c@4uJijx%x@DrSTZp<Fsmb?A3(by-
zj-`s-O%{dK>FMb?Mk2wH?qu}NN8_t&7dt@Hc8RBJtvw4<Qo(GA6!8KI)S(}EMRK<H
zT_|b+DIUlmZlhc%%wpyOwP(Nk6DFy@EB3DPr|z6?bQ6OHS1`q-X{4WR^gOQKEcj*4
z5)A4wB*NQNjD@_0M&3*CScG^F&2ax6p}@R&E)CNj+AuB?`TqSyeq9{hSsp4?rO*$(
zb#93r(r#!=bv-t*jL~iK-w`jRPL;$PPV}6b<9($l=8J?K!{S?obw5*{;KYi4VbB@D
zta~ny^GH`I*;1VNaG@2Z$J3+!`<iE!jO3|dr*JJYj9L3%l2<zA-zne~k1yocNV#!b
zlLK!E*#DT199W5`13&rQ!QuP~nmh!&LH|dLUE#>HWEJpTPzG=~;gYNeA)$&I(=0uy
zI+RC(XQvPgLq!AirC*!o>fLR3h4h^<g#N-z0Tx9i6nI_yO}C@i1I2(dS5q^7_tR5X
zAFuZx)PcMLr;@@7IYZ6y9MNKoB`ihzcnpY5d>j~IH1Mox0}i|Vb-T6UKM`PwR&W|8
zH{QwH1g=)ATL3)nAAi8amFFV2`pTvY&pU6?1~q!N>bBH$tX1emmrZeWJpHXL%X&^j
zonA_hBNc+CyFG|H#GG)Ky(i;vVl^}BVa3njcf1CoM~lV^)a`g-?6epUG-n&^XItn*
zyJtQsWo|Pg648&8M$|!1Gtq_Jio!>Q>u&fCf2T9M(*c?Rj7Luq+FhilHtn+s(IH0-
z;m`=ovl?Dr0ha6dhl|xHmZV2GuGUfJC;P3J5~{TV!t%Q*@4TJ!4bJ|IYp@Q-zv;tS
zHp5xS#SjccMntee!~{540ufl5QxF(T5={>Pn`Qj9+8$!yzv?ai@{Qo&@EZ50hmRtZ
zxZPTfy#oe~w>CX5UXoA8><WJ(pVl5rzCF?$nG$rn?K6fKAORV>%IIhD5l8FLwv><@
zO0}k!7H%CSSd?a&6_vFMJk^+O(=ZuJIcXh2@?+%wK-t3TK~ITOOr83dTe%S1D~BVE
zvtXJ$_@)ONrHW)$;84AJvm=nVBaG$93?3*^r~z!07i~(Sijf#Hck-=(&?o<b8;HO8
z&qTBz%<H&}&~v?J4=4H8OZ`m4)D&ezLBky5gEo7u-UcPTP?mQ!Qp8kLSCTP-l2y(M
znb0hrzpCuWaH$iL6pLfa-=*liQ|>Ck*0Y(2#Mb!<<9FCL?K=p#B?cv`Nbwve!Xpil
zfI>1BYVBbaTvi&Vj?yROR_JJYqDB*7QipyR-%*YR!Ak4}##E2k|Jhnti@G!>f43Ii
zklz<;Mj(?A6p%?29}s2<k6A#cCsIA9W<g65nv5cYo<yao@I&T-D_K$3z;pa6^`)+F
zJS)wpOQbMrz6t<j?OCs-!K%5P^ASGEdhU7lu<G^u`Gwj?rse)%E)~Iqjp*}zhBc<f
z4-><Eek-ml)#n!sB^b0B@_$1zcVUK5Eqj;x2;!U@ExE1nfG38p-)n9(><0IE1M8SQ
zjQczl;n1Fa3G2K_4zo28J(pbc+w%=Kk|+NVq?SDxd-ozq>S5Zn?%zw-ABKC(GZ06)
zV1H6<`mbMP+<;Hc8X8wj<#QHBX3iYgMeIqW$2(_PLF-=4U{tz~#8jqGyfO71K9NPC
z5O@d3@I2i~14Py}1To^Ym4{peE>lMMztiW)8N96FG!bJ^+mGu@8k4hojZDTq;4=$)
z9k~rrTZ@s-0cMME4x{h1+rG~i_!@F`KN)*X9X4E>6|_5je8vKUl7lE2?7XMy*Ma7e
z5L(NK4BYkNZ$oE2sOW+yjr+wxsunm4z4ul+AG7f8fD#>PhVaDmCA0Li59K*Z7lt-m
zB8k~>$3GTz>^k{gWg(`4Mip>OVI?*RWIzV;tn_XWfHcx5N{wvB0o=j?J|T#sNhkyG
zZYV-nyg;B{Qy`+SC#bY1tkQn!1FxohUHzo!3>U2{M-X^Li}vFUd<pvkEQ+iE=s;H}
z5jT1YXaddcBT*)s<W#s9I`|!rM%;&{EE$^0uV^l|&>6OYI?lLB`V0LxW$Z4~@)TLb
z&x4ACASLQJ#V1Ut^J-t;m=WAxqq>w`VqBd1?+_000mmnHUy?wL2r<18pi3fWqX1U2
zA+t>>c>6(KpTEL<PcSs9P((yx&WK{8dGfV1E$HBZqKtRPuTt9l$cF3xJhCQ=0h$os
zN4EW2gk<}_B4pMHDj-FD$7w+Y<5P(i1KurgV~H0Nl^X|txf?f@3QbXA%qn<&aGPna
zp6PI9(^Kk;+SqS?2>J`;i)Q~fW7ZalXlC=Vbnku6b@s;R=lwl)Ab7Kbg=$lxIODHT
zt}|~l(^0XIgrB>z%)YW?9GRmKP57|}13zYgSG)f#{#GKJ{ROy{F2IKm2xCnw-g4MV
zl^My<bYauEYYL;GQpa2uyKAmuo1WZFdNQk+TUQT_dF2#b^KO~2p}H3HQ+PaT_(Z5=
zMlyq^kz*42$99RJt>AaF-^%jzB$$^G(<;aFPos-%!!wiM7L4c}BE;9DjbUVkQ59sr
zXuIc4*|L>g?g3n^+I7WA6C#4TP~LpE1>~=36KKcqc^m8H*K8S%d{*YA9sC01%D<2^
zO`b#CINf)AUzfP8SR4cuQL*kIs&47*uiEsn^dv6|>`n9P+otRV{`6iFAkJ)>O7Q3e
zT!#MH+pXo0j}Nv^kF@cw?A<;igKC=S)k1o0G&#WxbOwZwM=&-_UwsDN#u0*Z3A^#h
zQevzzQ-QQr1&+(9#7EKDqbDJ0<7Refj{8OYd&Ha8Q)o&QLCak04C6#WuiaNt@Wal^
zrrzw-SdBLCsiWVJqb&+;ET+9yhR<u_EH$6TNK^A|O!IB@4vcWo<s1<nP;AW_yUB8>
zPUq6L-^b(HU_@j-{NG50^Rx~kkWVTUHU-}pp4)Nrgt=){D(`=8si71JLSuc~*4op4
zD~$hrqM(5JvM>N!6NBNzPr1wtZr^Vw#q~x(6Z>88^HkQ>`a^Xg5L|h#)P_XlDIMP=
zDWciP4AfSh@4af&c$9b(bg&?k2#Da{7VtsqitPhvV^?Tv(~YL<A%cO3r1l`AqX8e=
zS@TmTxKZyaUdmpY9-1D@tINuDgg>890(I{+i1=<BetZJ7IeS+du<~qPLXen+=5J{~
z%iUht5x>fImH)jU3au9G!xQ?vs12GDlHVTt5%kadU5v6W6Rd_}Xve%zN{`}<FAo)&
zcX@y8srPa&zhFw{#v2yCQ5sL<RN@v`NxfQPcqD@L#;z2rjJo>`<XFa1nR_JvMeoIE
zNOP&gt>Xbul~d(IWEUUgR%b@ZDaTwV`w1`u*Z!7M0X>#v8mP+7(&^PXGAhS82=6UB
z;`MkHRcGdkB}UDBMddt}DpK%h7mE!>T`6xIG7i$<d?o3Y<x-3*mzmf#-8z_>4iGpq
zYsRzvs#EcLvn$38IJ3)Is~;!*N}j=b88mvaZ5shP((I6vXat8cXWkGK)mFH5<7&MO
z>Yj|N4Vqfz^SS}N`aZ`5hG&)~Ove*+y&Nj&xe**^je09DhXO6_T0p8GRpO}h2FqO&
z0ml)@eJw9av3VJFGOXxk=9sG!xRKx}8wH?8@c3k~OOp^9H~Fm!nR`@*A_YzT@5O&J
z*a`q1;YLBUE!+m|RS0tz_LXE9Dh0(Aw^29c`c_evKbEgxqN?IFM8_*nKMbq4^a>e0
z9AMe4W=A+}v0_`SX5fbRqDrqEmh7Zi7UV$Xr(12NrZQJ8%qKuS_(NFP&36=o-(#bu
zH(9pygITLqtE-H++FKfGO@~)FJ<eBZbT$AqFx6)WMrhSnN}&VGtW8^+n%z|C`C5tp
zf>l-Z*GmLtaf=qp@q-PE$L-)+q=Tcba2O2|e|PkK;vz}?sd50l*OoNDT)u2Dv0JNl
zgpH^q+|UXmE3LVBmrUm6!$Fev;tKW5sEO}{n0RGf@f-1Rv7F+-BxF5by;BirXS4?_
zMD;)x$j~&%B<QP6xIHk$v}Vcyu9nui&9iXz%U~eGstOtVZ(dCpiUat8xf0TmNo9Uv
z9j#3j)ot=|5Z0;oc=k@Vtq?IaoQg=42W<%N#k@>rk+SrjE$QQP>tyNrNm81#_iE9|
zPW*#vYq!-VPYF^=_!!5@d+g*ju?_$t1;G%K%vg>?73@b!iaGnj#c_O(rx`>#So19f
zQw(=Y`fFD*N2oKbBA|z+cvhP2TKiPs$*CMvSk|bam;vMs44mEi3`V^U=WmtzA8Qwb
zd_&{lv|^FYU^GV9xH9Rslpzqm!|EJi^`_tL@Es94qj0y9a>k8wgp^v#3WEV~*hpxo
zvk=)-?4sf9Y}Qx^&}tkP^A=Un2ztpp!bJARK2QtF#kEy2pbpfiy91F{BFAes)yuK}
zUt3oK57qa@$3!Gs7)(USK1h=6N$8iI$d)DRL}Bdf7|X~`k7OGu*?!p-G6>nXNS2a)
zkjRW^5&izJ`K9>vpZUzZ_s%`vbI-l+o_9Z=ch0$2z_T4^-0j`gd*(gOZD}fGcL{A<
zYGd7-KJNR^1)AMuWj8aDFKF*r*?v|}Pm=4)FtHr`5D}w(g+ARKf859PY_`bkqxsWF
zw1%Uw4gqhw6%qU)VOpYj*j44J#(Fg(T=(3WsXjW{ZC?UTdZS^crJzeagHmQ(1OFio
z%i(_b(h#M1EVk7#76!Q~wF)(~y5A_j>P2bMPy(E1oivLj4X4|$HA_cl78$nIl+>5#
z9P5uz<rIHxGVF6>Icxxrp{A4&Ho}>qS8gVobLAUYD?BtxFQT?E@AV6Mos}+4^->F~
zfibiil&g1SaPK$Ha-xg!)Hh3JmC}nQN*>P)&U~*k_`&qB3x8zi+`+$!4N-IxF&1<a
zp`7#+k2I#5S1%M|#QP7mE7Zmdiesx|kkf&+disj2D-5@rtEKXEUe|?t6=G{F(S1py
z@h;v4wF)xhH!qs{a4;tq@?J$r9TE6Oq>Db(da|H$C@I40uxQkTR0Huc=hgFLC66Y&
zW?IAv*p-x8-uk?bBrU=zHHkDanqva7a}OEXT8dApHS%5&z3+Aum1?QuS3UBo(!A|P
zZKQFW^p(1Y#c>`v2Q9mnUDXk6@o+RM-Y{T$x|$}^!nmDg^{ENC52*#Jfmc>ob3*tE
z2MP#!laxugu6DC|6+0nX17ANTAo^|MU|S_`O^>gcY2CBDn0WS6{oYr5Py3gKy^Jzr
zqgND4aaq&v%f?O!_zJ~)l}lH?b@hfOn#pO;j3;uaH41&UziY@IOBKj^O8Nv^G=?4@
zjy`E$V<{QR8#r&J)+qVe8I^;PB~W80a@ufE7d3AEnT2%j9PX}L@|+a(Uvn*8JHywR
zKBwP2HkinvPMW>eX4Ba!+SXoYmn|3w+fg>5L<%rfJW}FtJT%@A?t85m?|`(+v{JMS
z2-5Hnw&J4e=(Tat^AKBmeQO+T{;>K>1?nR|cKgD^^Q)CMCzy3usVyvGA0Y9n>l(ME
z#n0#{9*Gl(@x?M9Ym*jrx(xrqRysOgfK?PtM6OGxG8i=H+g?H>XtXG`i4R`n<A~88
zEKRV9Sa^P3yiNR=Vg(!4G>cU9sq$%wbaCS;o7L9Qc@MQuV(Nl-T&;q>q8CbgmRnK+
z+wzACQSa|m8mi%vgx(GF+C>X|zReqr4N@N9G<+UyHPjmI``P!2&B!P^n~pj{kEoF&
zt%x|bVb60@*-2%B3TD0Ne~PPoAZQ~k=kBDyCM|VnbHIJmMP<GRy7p2lCV*p-8I$a(
zDtFMu3UQY53~sJ%IHUC7651oCbf~$ldO-9+mt1b%#szQFX-eaJ#qT@nRWj=;gE<_!
zUockX@?;iR)WaA?!W?vk2_HS+3jzb@mD1$HNZ^*HEnB6{0X-}gA#vg&-eTs5eJBH;
z6s5T%l7muUskJHLoUa1E&wj8ui&IZhJj6WAh<agtv$6e6%|o?pJ1aCk&|)I`)&1K6
zqs%@Lw2P-%&OE(KOjESD+T;@Fb;d~dNuygYSG$7zdzLV8Qp>0x4u7o%EWh#?sn5)}
zn6`VEYg6=QFz9W=$Lu%4A*BI6TVW<xW?4&zoO?76IM93<0o!+Ki<K+iYM0~S`qnir
zx#dOf-Rx)hSECukwBLoIx1IB(j{e1MgHcaEZ5KHtS#wpj2YIt%k!`FFpAJ`Ct#I}o
z#U{NjIH~mhRT>oLB#qU*F2q-Lj^F>inTzsG6LtnPRpm(~ucJu;$i)7O*5B$Q*GEy(
zlgx(&R6@LqguYv{15xiNr+lh9&d(<wh^1F0(3Qo=K7H#Je52fX8$A)yutVR{k$dde
zrz;VdD9^1!j1-;ktd9yl75H!t;s2)PEh%BXEt#M=8QMyxvpBA}=JGBBUR65X!7@@(
zdGe;Fq4_HuNmY@`Lh8MN!f|J~R)b(m0URkM9b{i6JEr~d>IvBsg!oH9{`Ya!PG_09
z+`Ho$0ZK)bYYSl`ElcQXT$6S3ONpG19-{IUY@zHzMa5|kxHdJg(}FJBH@=hVT;tu0
zgPSQgE9cgZ<jrtqtonX+If9a#MU7MVb#KkwP=-uNclx)?;=@b&x$hoeT$t5Opv&a;
zow@nx3aKubQ6%M2<O=MDmDyKS=LX`M-XW5iwitq9&XrFy^yn(Oox60Zry^?S^Vbep
zMc9KE6SB_Nl-vBal1C>P8|qe&^BcU@?vQqhIOnB~&V@=^xln_6La^}k;T9I+hHbS?
z4Zc((GOVfPuDP4Tvp2C7^@NJhn({*SIiCmjc;+%;?<3lSQ9K0)8qOkRb@?2gY0UzG
zQWYcY#LZb&W=mak*k5d_#?LIu%h>^!pfe6fL}FkiY%ieOgu2dIrBrPv02$NfRjmG=
zB%jC1N!&8@0&<=YD+%*$o;F-l4N=MeD6AWZL7XVw6sbDUsNCC`Ti-5XrtGAtrGO`N
zmcBw<>dVC!SMmt3UN$!!iAAYfPR7!{(tET?z1>ha5#NFiRY6J^H|tz~T0Ce0TuCXg
zG}$@6FeLij&<8fUoX+R1nTKOGd*ycnx1#WURvD2mal5p%s*&+!)R5MZcO%Jtt`okl
zjt-K#Wn*sYw_*x}44OYFYTGbttFtVZGl+R8zuBa@cHqezbmJcU$~FF%HY|2Gq`BMK
z6ypz*M#o~T(Q|xwt?tj|^f?cxItE4gZMyxcyF{GRu6bP)ktb-orU^zku=rdQx<3>t
zQ3qx3(Ye)S^_*bvJ>;MQL2je7r}pyXbJ=+{OA+)lnRR$6pfVRAhvoD{-Mu6FiKoqZ
znb6AUuJWe-BpeL)<Wh<=7|GJ;qYF%ZI_7oMH#3Zygl6)Jwv!6Ekf3<|ai967=aiz;
z<(MlX?|4x`OT;bYc)?hY9MAH+*~(n!-<2Zi!Cb5DiRm6J^ZbfoIVWWcy1#u9k?Cu*
z>+-583~3*n%Q6cMvlAXoDww%W|1Hrb0V~y3<rJq9#+;CFA6J6Cs#!Q_i;(Yi-exXX
z;KC-hR-+L$nB_wWInRw4xcX+|&eN9kexyV7d~(WtQF8hFlhdq2T+$I@rF`~Dw-khD
zb=i+xkvfB`P`{P-#3k#^BjN(YQ6@#!gu9qDKjIgQSI1GOcdJjDJ#LJ#*Tp4=EBE#{
zV_h2JzD*f#*e2Yo7&^!sSLSuHP=nV<U9x||cRL(ii7~~s7(sVtgcfvWi~8)XTWilI
zF5)qZjmb{=8`(O2Lb)&G`aXUc)uP)FRx&bu3a1uFY)Z3i5fS3LxLl=|18{Gw(TrTb
z{swYsn3#oK9H)ItqRKyJQ1y+`jxU{IhU$$#-GIA7OZj#&k7s5NqYbx5%^g3*rgUQ6
zGz86d#w0(qjxlyAHUyEsc4s(1RNQx%d7CQ=w5tTopeJ|b1sp}%Oqnhfn%-fp%sOwv
z#C+P~lGX8n<Vve}F4s}m*5yF%XDOjm^jTZ(Y>}(2^BBVY=AMqv2e%`gc%I8mM2ZfJ
zRY>wr-EN>ZpSh&#2lc0DU|d`f-Aa$6@oq&wGCU);8YFrYu_{=U{2<$8-uRhGFcZCu
zReRJmBv<cH>NT?x{EH|Vw))3kyI_%v{<x0U3zm;xoN!)llRtX8j1M{R_4LDA&UKCM
z;Wtub!|~&D7pvikQ@v;L)6tjdthzf5mr^?X4xN0d1sA9)=W)54qq^V}@$NAIN6C85
zqeI%?^0tq=!L9#^TO?B8Iy$oCdTr#eIk5@WOj_0{Q2dE1QYE5Utdg$ml0t}x0x4qx
zJ4z71^Onu(_-Fh17Nm~xiv-H83UqsPXx<tcI7RJiSf4Y;9yiH&l3o%elNgvCmWFsL
zlQ-VOMfBilJ%2I2-ttyjba)2sh`p6NdP57}uHO%^lVts}&6tu3NMh@Y*X~Tj%9_gi
z7m_~u0cMMjD>Vq2C0%7k8QbDgeUme5XPtVM^t!$T1{gVv(sTH8J=XPUcxYRiYSUzE
zj`71ox2CD+Wk$Z-h+U##V^(9Fv*%kd(5@zWX@BsL@5*eW<#On=6F^A&Mnra?=dT8H
zc(T4;US_E@!UeZac7!;nWWY~xaw^7lTVu-H3B{Glu9wO(Prfb6yxvf-qH0Ceiu{PB
z^=5Z7crc;<EupFPOPxEUwV3tnix8E`S)7~Epf8PN6G41O?|GGPv{O?n^W+mPl4SKi
zJFGb4@}t|DL;k5&dBLOSD^lbBMn@rf%`Y{6Mkw4#`gmtUq3b?6r(yjIrC-9eYOJFi
zv=0T%e)36c*>>vGKbL~0V$q&NrRP;fxU-ih^*x*oZpIgMdUl78nHkKd8^3>i?(O>&
zJxqw}4GDbbUrKH-RVf*5IAc#yNs4!Ej;w47*^0V7-n<{2sP-~h$Fn5Lw=EvMQ;0Nq
zwN4RnR1`6$)g&)yoPX}Q-8(|j#cKnBCNe25{!LhQB_eP8EdQh+PnG^ZN=ly(x!ltm
z#H!4qO0UMNNcAW?C7@O3zuxu_JnKzsH)#7-)T%V0eEs5E(I~^3Zr(+cx>Tp4b#ebF
z=Z@(bi3I*a$5376xFYLkfvn(ahNq=Z6tI0Et$kr!bS!l&W6-TT`x#tZu{o<+VZ6t6
zvETl?-geqyPu)+gE!kh2uKM1wUFq%omNU$PjD8HIq*Vy4$Y#el@hH~m*<QE(a@<Fe
z%9ChO6soyiD<IKf%9pkMg6}Jh!C@E8BYL()rX5a}>^bi2Rf!cj1Iqo%&5cT#vl6yV
zz>dTxCGKo|c5Pf!M^#hS4s4}KwTpk;y6b!9O4<56v0A}{{#}^^`q(=Y77;5FVdr1}
zeHE=G9SxXr!*0)i06Zu-z5J1Y!-yQBIPp96W@k+0J`D8fvw*)Ji9b##TYFaraXVKe
zP<xpB2;u)E{=gUn_A~0ta2`4U<^@qeSr5<x6m&4adWsiJ^1)20g8x6R$ELV`p3zS8
z|2$Kh7TdElL8`#Z{5o)@CinpeL=uRcJ^`HbU<GvCXn^A@2L*rYi=;sO%|iu&{AhwW
zsK)Lm55s=|$Zdszu%n>A_g_`QR`{XuG-UGRDh-h3Lj(I+^edz^z-Iod95Ay2gSsF3
z#fbJ5MEsZ0<e;%W2l(1o8+`41dbd{an1`WZ_yuGNg8u=W2c2%)44{jH8v^0o2ShRb
z1hRr%vT_>^(0!nVmhk+Nb{t^))szVU4!D5D*~iJnaUTRhOw|W|Xr2(6z?gaTkDB*w
zf4Z+`XVIUaAG@KlgOV85_@P%$lZhACV0-#|-?m!&WT?uJ*&A?-e^k6@2aNyRq*0}x
zAR2(U#<8cK-#ZgPAjkLBgFE*VLJfS+KM3d(f8>u%K7#}9L|SO5F}aYoneGoI_O1Q3
zPa?t;1j+va__Y8Pc(Vle0T|6e03W@CovW><=kDOLBJo3GY{}K%CGqcR%Dz=L_Q}a`
z1ZGGwdsz3aTd<Ec6$!F(0p_n5{?K!Oj^1xn9)^elGxo&5?xCQA)9n`IVe~x#r5PzQ
z879oQONTH)R#nqIArLo|ljOf<FA18x<Zk;O&G17zJ%Pa)IS_exmLF>5175&^zh*^2
zf)_}j3<PF`xqu}W_FuzP3kC;PW@(`rLFA$k7~`*^zuETcv=vNdm;_&G?N&(Q+RJb*
z0%YLll-k$nzs#1LF*q~F1{I6^!3J>6AK%lhKN6nqgSILNu5%*&tGz#Lb>J46{V6Z=
zAKgmMIsu<P-iQB<a@xh^VOnCzppp}ue}Jm@Mx^f|z+)bUBMAgu`~&bik{AL}+6U;m
z4dfEk_q5`_VOP7{d6<oKvO<yzynBKK$YCv33vAGjS-{MK2#~YDwMW>G0E2q4ONzl5
zF4<j4WJSN^fb1%J1d*c+Bo^7AG!Mvv+!opQ2qMQDfP$WY58?fNOZAY<E}{IVE&g`%
z{<qZ>g+D<*9KTF|Jf6wUHo$fX1|=4g+nl+?zDHHEZ{^t%8}vd6x%Au8i9M?B^Q-J@
zb4WSJ&Ih_!4*nW_Uhnv!V=Vx$rSLCOCrBc6gCssc-~RVFRd9j>3d^+6L;Zl}@_En}
z7?FDi?%M&NY+3cx?<woQQ|zuLd6@FSeG~5XH0QrY%JpM{-TmZYphNrEbY_mRQh~P-
R0yzVImqEvoCddGR{15x#rrZDk

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e4e2b69d51..2c3425d49e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 2fe81a7d95..aeb74cbb43 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,78 +17,110 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -105,79 +137,109 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 24467a141f..6689b85bee 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,10 +25,14 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +55,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,38 +65,26 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

From b5f5081f1616686cbe122af9cd042be3380ff2ce Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Thu, 6 Jul 2023 19:38:28 -0700
Subject: [PATCH 0573/1114] no warnings [temp]

---
 .../org/lflang/generator/c/CCmakeGenerator.java     |  6 ++++++
 core/src/main/resources/lib/c/reactor-c             |  2 +-
 test/C/src/pico/BareThread.lf                       | 13 +++++++++++++
 test/C/src/pico/FreeRTOSThread.lf                   | 12 ++++++++++++
 test/C/src/pico/HelloPico.lf                        |  2 +-
 test/C/src/pico/Timer.lf                            | 11 +++++++++++
 6 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 test/C/src/pico/BareThread.lf
 create mode 100644 test/C/src/pico/FreeRTOSThread.lf
 create mode 100644 test/C/src/pico/Timer.lf

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index dd91294506..8141baf153 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -163,6 +163,7 @@ CodeBuilder generateCMakeCode(
             + " gcc\")");
     cMakeCode.pr("  endif()");
     cMakeCode.pr("endif()");
+    cMakeCode.pr("set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -w\")");
 
     cMakeCode.pr("# Require C11");
     cMakeCode.pr("set(CMAKE_C_STANDARD 11)");
@@ -449,6 +450,11 @@ private static String setUpMainTargetPico(
     code.unindent();
     code.pr(")");
     code.newLine();
+    code.pr("# Set pico-sdk default build configurations");
+    code.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 0)");
+    code.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 1)");
+    code.pr("pico_add_extra_outputs(${LF_MAIN_TARGET})");
+
     return code.toString();
   }
 
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 628e235172..2973e98f89 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 628e2351723b01dcef7977d1999426e4935d0272
+Subproject commit 2973e98f897efd774e42a3970f6d5423a868ba3f
diff --git a/test/C/src/pico/BareThread.lf b/test/C/src/pico/BareThread.lf
new file mode 100644
index 0000000000..1bde45fb9b
--- /dev/null
+++ b/test/C/src/pico/BareThread.lf
@@ -0,0 +1,13 @@
+target C {
+    platform: {
+        name: "Pico",
+        threading: "BareIron"
+    }
+    threading: true,
+}
+
+// check that only 2 threads can be created max
+main reactor {
+    timer t(0, 1 sec);
+
+}
diff --git a/test/C/src/pico/FreeRTOSThread.lf b/test/C/src/pico/FreeRTOSThread.lf
new file mode 100644
index 0000000000..244b01ac7f
--- /dev/null
+++ b/test/C/src/pico/FreeRTOSThread.lf
@@ -0,0 +1,12 @@
+target C {
+    platform: {
+        name: "Pico",
+        thread-lib: "FreeRTOS"
+    },
+    threading: true,
+    workers: 4
+}
+
+// test creation of thread tasks using FreeRTOS support
+main reactor {=
+=}
diff --git a/test/C/src/pico/HelloPico.lf b/test/C/src/pico/HelloPico.lf
index ef25cdeba8..ba57fe7039 100644
--- a/test/C/src/pico/HelloPico.lf
+++ b/test/C/src/pico/HelloPico.lf
@@ -6,4 +6,4 @@ main reactor {
     reaction(startup) {=
         printf("Hello World!\n");
     =}
-}
\ No newline at end of file
+}
diff --git a/test/C/src/pico/Timer.lf b/test/C/src/pico/Timer.lf
new file mode 100644
index 0000000000..591d5d90e5
--- /dev/null
+++ b/test/C/src/pico/Timer.lf
@@ -0,0 +1,11 @@
+target C {
+    platform: "Pico"
+    timeout: 1 sec,
+}
+
+main reactor {
+    timer t1(0, 100 msec);
+    reaction(t1) {=
+        printf("Logical Time: %d. \n", lf_time_logical());
+    =}
+}

From 672e637a48dbfab4f7a6d27342e1f4117af52100 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 6 Jul 2023 19:48:59 -0700
Subject: [PATCH 0574/1114] Fix inheritance problem exposed in examples

---
 .../main/java/org/lflang/ast/ASTUtils.java    |  1 +
 .../federated/generator/FederateInstance.java | 20 ++++++++++++++-----
 .../federated/InheritanceFederatedImport.lf   | 15 ++++++++++++++
 3 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 test/C/src/federated/InheritanceFederatedImport.lf

diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index e5d0da81ac..6e466fef57 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -98,6 +98,7 @@
 import org.lflang.lf.Watchdog;
 import org.lflang.lf.WidthSpec;
 import org.lflang.lf.WidthTerm;
+import org.lflang.lf.impl.ReactorDeclImpl;
 import org.lflang.util.StringUtil;
 
 /**
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index 22e70a6c73..e17fcdd37b 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -73,7 +73,7 @@
  * @author Edward A. Lee
  * @author Soroush Bateni
  */
-public class FederateInstance { // why does this not extend ReactorInstance?
+public class FederateInstance {
 
   /**
    * Construct a new instance with the specified instantiation of of a top-level reactor. The
@@ -258,15 +258,25 @@ private boolean contains(Instantiation instantiation, ReactorDecl reactor) {
       return true;
     }
 
-    boolean instantiationsCheck = false;
-    // For a federate, we don't need to look inside imported reactors.
     if (instantiation.getReactorClass() instanceof Reactor reactorDef) {
+      // Check whether the reactor is instantiated
       for (Instantiation child : reactorDef.getInstantiations()) {
-        instantiationsCheck |= contains(child, reactor);
+        if (contains(child, reactor)) {
+          return true;
+        }
+      }
+      // Check whether the reactor is a parent
+      for (var parent : reactorDef.getSuperClasses()) {
+        if (reactor instanceof Reactor r) {
+          return r.equals(parent);
+        }
+        if (reactor instanceof ImportedReactor i) {
+          return i.getReactorClass().equals(parent);
+        }
       }
     }
 
-    return instantiationsCheck;
+    return false;
   }
 
   /**
diff --git a/test/C/src/federated/InheritanceFederatedImport.lf b/test/C/src/federated/InheritanceFederatedImport.lf
new file mode 100644
index 0000000000..41adc90247
--- /dev/null
+++ b/test/C/src/federated/InheritanceFederatedImport.lf
@@ -0,0 +1,15 @@
+target C {
+  timeout: 10 secs
+}
+
+import HelloWorld2 from "../HelloWorld.lf"
+
+reactor Print extends HelloWorld2 {
+  reaction(startup) {=
+    printf("Foo\n");
+  =}
+}
+
+federated reactor {
+  print = new Print()
+}

From 134c8768a2138a41a7a0d35111c7e3fefa1706e8 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 6 Jul 2023 19:57:03 -0700
Subject: [PATCH 0575/1114] Apply formatter

---
 core/src/main/java/org/lflang/ast/ASTUtils.java    | 1 -
 test/C/src/federated/InheritanceFederatedImport.lf | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 6e466fef57..e5d0da81ac 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -98,7 +98,6 @@
 import org.lflang.lf.Watchdog;
 import org.lflang.lf.WidthSpec;
 import org.lflang.lf.WidthTerm;
-import org.lflang.lf.impl.ReactorDeclImpl;
 import org.lflang.util.StringUtil;
 
 /**
diff --git a/test/C/src/federated/InheritanceFederatedImport.lf b/test/C/src/federated/InheritanceFederatedImport.lf
index 41adc90247..787c56b4bf 100644
--- a/test/C/src/federated/InheritanceFederatedImport.lf
+++ b/test/C/src/federated/InheritanceFederatedImport.lf
@@ -5,9 +5,7 @@ target C {
 import HelloWorld2 from "../HelloWorld.lf"
 
 reactor Print extends HelloWorld2 {
-  reaction(startup) {=
-    printf("Foo\n");
-  =}
+  reaction(startup) {= printf("Foo\n"); =}
 }
 
 federated reactor {

From 918b5fbc5c04894a95cebae0a3324a7c5a3182cf Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 7 Jul 2023 01:25:13 -0700
Subject: [PATCH 0576/1114] Fix #1733

---
 .../federated/generator/FederateInstance.java | 21 ++++++++++++++-----
 test/C/src/federated/InheritanceFederated.lf  | 16 ++++++++++++++
 2 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 test/C/src/federated/InheritanceFederated.lf

diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index e17fcdd37b..8ec3334504 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -259,23 +259,34 @@ private boolean contains(Instantiation instantiation, ReactorDecl reactor) {
     }
 
     if (instantiation.getReactorClass() instanceof Reactor reactorDef) {
-      // Check whether the reactor is instantiated
+      // Check if the reactor is instantiated
       for (Instantiation child : reactorDef.getInstantiations()) {
         if (contains(child, reactor)) {
           return true;
         }
       }
-      // Check whether the reactor is a parent
+      // Check if the reactor is a super class
       for (var parent : reactorDef.getSuperClasses()) {
         if (reactor instanceof Reactor r) {
-          return r.equals(parent);
+          if (r.equals(parent)) {
+            return true;
+          }
+          // Check if there are instantiations of the reactor a super class
+          if (parent instanceof Reactor p) {
+            for (var inst : p.getInstantiations()) {
+              if (contains(inst, reactor)) {
+                return true;
+              }
+            }
+          }
         }
         if (reactor instanceof ImportedReactor i) {
-          return i.getReactorClass().equals(parent);
+          if (i.getReactorClass().equals(parent)) {
+            return true;
+          }
         }
       }
     }
-
     return false;
   }
 
diff --git a/test/C/src/federated/InheritanceFederated.lf b/test/C/src/federated/InheritanceFederated.lf
new file mode 100644
index 0000000000..ea38674f91
--- /dev/null
+++ b/test/C/src/federated/InheritanceFederated.lf
@@ -0,0 +1,16 @@
+target C
+
+reactor A {
+  reaction(startup) {= printf("Hello\n"); =}
+}
+
+reactor B {
+  a = new A()
+}
+
+reactor C extends B {
+}
+
+federated reactor {
+  c = new C()
+}

From bcfe566863bcb7664663709a6ed377f922093fe3 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 7 Jul 2023 01:26:44 -0700
Subject: [PATCH 0577/1114] Fix typo

---
 .../java/org/lflang/federated/generator/FederateInstance.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index 8ec3334504..fd6a59bbb6 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -271,7 +271,7 @@ private boolean contains(Instantiation instantiation, ReactorDecl reactor) {
           if (r.equals(parent)) {
             return true;
           }
-          // Check if there are instantiations of the reactor a super class
+          // Check if there are instantiations of the reactor in a super class
           if (parent instanceof Reactor p) {
             for (var inst : p.getInstantiations()) {
               if (contains(inst, reactor)) {

From 8dc6d854512025b66ab0e212a20bacd90059fd64 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 7 Jul 2023 09:17:05 -0700
Subject: [PATCH 0578/1114] Timeouts to let new tests terminate

---
 test/C/src/federated/InheritanceFederated.lf       | 4 +++-
 test/C/src/federated/InheritanceFederatedImport.lf | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/C/src/federated/InheritanceFederated.lf b/test/C/src/federated/InheritanceFederated.lf
index ea38674f91..7b5b0ca644 100644
--- a/test/C/src/federated/InheritanceFederated.lf
+++ b/test/C/src/federated/InheritanceFederated.lf
@@ -1,4 +1,6 @@
-target C
+target C {
+  timeout: 1 ms
+}
 
 reactor A {
   reaction(startup) {= printf("Hello\n"); =}
diff --git a/test/C/src/federated/InheritanceFederatedImport.lf b/test/C/src/federated/InheritanceFederatedImport.lf
index 787c56b4bf..f06356debd 100644
--- a/test/C/src/federated/InheritanceFederatedImport.lf
+++ b/test/C/src/federated/InheritanceFederatedImport.lf
@@ -1,5 +1,5 @@
 target C {
-  timeout: 10 secs
+  timeout: 1 ms
 }
 
 import HelloWorld2 from "../HelloWorld.lf"

From a2801f25feeade7b6bf0dbdc29ca2bfcffea4e9c Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 7 Jul 2023 22:51:15 -0700
Subject: [PATCH 0579/1114] Use Java's typesystem properly instead of relying
 on reflection and find out statically that an overload for Method was missing

---
 .../federated/generator/FedASTUtils.java      |   2 +-
 .../federated/generator/FedImportEmitter.java |   4 +-
 .../federated/generator/FedMainEmitter.java   |  12 +--
 .../generator/FedReactorEmitter.java          |   2 +-
 .../federated/generator/FederateInstance.java | 102 ++++++++----------
 5 files changed, 52 insertions(+), 70 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 71b809baf6..1c791c42ae 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -441,7 +441,7 @@ private static Set<PortInstance> findUpstreamPortsInFederate(
       Set<ReactionInstance> reactionVisited) {
     Set<PortInstance> toReturn = new HashSet<>();
     if (port == null) return toReturn;
-    else if (federate.contains(port.getParent())) {
+    else if (federate.references(port.getParent())) {
       // Reached the requested federate
       toReturn.add(port);
       visitedPorts.add(port);
diff --git a/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java
index 2e21534fc4..bde700dbcf 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java
@@ -23,7 +23,7 @@ public class FedImportEmitter {
   String generateImports(FederateInstance federate, FedFileConfig fileConfig) {
     var imports =
         ((Model) federate.instantiation.eContainer().eContainer())
-            .getImports().stream().filter(federate::contains).toList();
+            .getImports().stream().filter(federate::references).toList();
 
     // Transform the URIs
     imports.stream()
@@ -46,7 +46,7 @@ String generateImports(FederateInstance federate, FedFileConfig fileConfig) {
                   var new_import = EcoreUtil.copy(i);
                   new_import
                       .getReactorClasses()
-                      .removeIf(importedReactor -> !federate.contains(importedReactor));
+                      .removeIf(importedReactor -> !federate.references(importedReactor));
                   return new_import;
                 })
             .map(FormattingUtil.renderer(federate.targetConfig.target))
diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index 4d262d1bb4..d0638ccf38 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -37,23 +37,23 @@ String generateMainReactor(
                 "\n",
                 renderer.apply(federate.instantiation),
                 ASTUtils.allStateVars(originalMainReactor).stream()
-                    .filter(federate::contains)
+                    .filter(federate::references)
                     .map(renderer)
                     .collect(Collectors.joining("\n")),
                 ASTUtils.allActions(originalMainReactor).stream()
-                    .filter(federate::contains)
+                    .filter(federate::references)
                     .map(renderer)
                     .collect(Collectors.joining("\n")),
                 ASTUtils.allTimers(originalMainReactor).stream()
-                    .filter(federate::contains)
+                    .filter(federate::references)
                     .map(renderer)
                     .collect(Collectors.joining("\n")),
                 ASTUtils.allMethods(originalMainReactor).stream()
-                    .filter(federate::contains)
+                    .filter(federate::references)
                     .map(renderer)
                     .collect(Collectors.joining("\n")),
                 ASTUtils.allReactions(originalMainReactor).stream()
-                    .filter(federate::contains)
+                    .filter(federate::references)
                     .map(renderer)
                     .collect(Collectors.joining("\n")))
             .indent(4)
@@ -72,7 +72,7 @@ private CharSequence generateMainSignature(
       FederateInstance federate, Reactor originalMainReactor, Function<EObject, String> renderer) {
     var paramList =
         ASTUtils.allParameters(originalMainReactor).stream()
-            .filter(federate::contains)
+            .filter(federate::references)
             .map(renderer)
             .collect(Collectors.joining(",", "(", ")"));
     // Empty "()" is currently not allowed by the syntax
diff --git a/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java
index f00d590f12..bb33f6e624 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java
@@ -15,7 +15,7 @@ public FedReactorEmitter() {}
   String generateReactorDefinitions(FederateInstance federate) {
     return ((Model) federate.instantiation.eContainer().eContainer())
         .getReactors().stream()
-            .filter(federate::contains)
+            .filter(federate::references)
             .map(FormattingUtil.renderer(federate.targetConfig.target))
             .collect(Collectors.joining("\n"));
   }
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index fd6a59bbb6..f9cf4bd3ad 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -35,7 +35,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.eclipse.emf.ecore.EObject;
 import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.TimeValue;
@@ -53,6 +52,7 @@
 import org.lflang.lf.ImportedReactor;
 import org.lflang.lf.Input;
 import org.lflang.lf.Instantiation;
+import org.lflang.lf.Method;
 import org.lflang.lf.Output;
 import org.lflang.lf.Parameter;
 import org.lflang.lf.ParameterReference;
@@ -115,10 +115,7 @@ public FederateInstance(
    * The position within a bank of reactors for this federate. This is 0 if the instantiation is not
    * a bank of reactors.
    */
-  public int bankIndex = 0;
-
-  /** A list of outputs that can be triggered directly or indirectly by physical actions. */
-  public Set<Expression> outputsConnectedToPhysicalActions = new LinkedHashSet<>();
+  public int bankIndex;
 
   /** The host, if specified using the 'at' keyword. */
   public String host = "localhost";
@@ -140,9 +137,6 @@ public Instantiation getInstantiation() {
    */
   public Map<FederateInstance, Set<Expression>> dependsOn = new LinkedHashMap<>();
 
-  /** The directory, if specified using the 'at' keyword. */
-  public String dir = null;
-
   /** The port, if specified using the 'at' keyword. */
   public int port = 0;
 
@@ -157,7 +151,7 @@ public Instantiation getInstantiation() {
   public String user = null;
 
   /** The integer ID of this federate. */
-  public int id = 0;
+  public int id;
 
   /**
    * The name of this federate instance. This will be the instantiation name, possibly appended with
@@ -220,67 +214,54 @@ public Instantiation getInstantiation() {
   /** Keep a unique list of enabled serializers */
   public HashSet<SupportedSerializers> enabledSerializers = new HashSet<>();
 
-  /**
-   * Return true if the specified EObject should be included in the code generated for this
-   * federate.
-   *
-   * @param object An {@code EObject}
-   * @return True if this federate contains the EObject.
-   */
-  public boolean contains(EObject object) {
-    if (object instanceof Action) {
-      return contains((Action) object);
-    } else if (object instanceof Reaction) {
-      return contains((Reaction) object);
-    } else if (object instanceof Timer) {
-      return contains((Timer) object);
-    } else if (object instanceof ReactorDecl) {
-      return contains(this.instantiation, (ReactorDecl) object);
-    } else if (object instanceof Import) {
-      return contains((Import) object);
-    } else if (object instanceof Parameter) {
-      return contains((Parameter) object);
-    } else if (object instanceof StateVar) {
-      return true; // FIXME: Should we disallow state vars at the top level?
-    }
-    throw new UnsupportedOperationException(
-        "EObject class " + object.eClass().getName() + " not supported.");
+  public boolean references(Method method) {
+    // FIXME
+    return true;
+  }
+
+  public boolean references(StateVar var) {
+    return true;
+  }
+
+  public boolean references(ReactorDecl declaration) {
+    return references(this.instantiation, declaration);
   }
 
   /**
-   * Return true if the specified reactor belongs to this federate.
+   * Return {@code true} if the class declaration of the given {@code instantiation} references the
+   * {@code reactor}, either directly or indirectly (e.g., via a superclass or a type parameter).
    *
-   * @param instantiation The instantiation to look inside
-   * @param reactor The reactor declaration to find
+   * @param instantiation The instantiation the class of which may refer to the reactor declaration.
+   * @param declaration The potentially referenced reactor declaration.
    */
-  private boolean contains(Instantiation instantiation, ReactorDecl reactor) {
-    if (instantiation.getReactorClass().equals(ASTUtils.toDefinition(reactor))) {
+  private boolean references(Instantiation instantiation, ReactorDecl declaration) {
+    if (instantiation.getReactorClass().equals(ASTUtils.toDefinition(declaration))) {
       return true;
     }
 
     if (instantiation.getReactorClass() instanceof Reactor reactorDef) {
       // Check if the reactor is instantiated
       for (Instantiation child : reactorDef.getInstantiations()) {
-        if (contains(child, reactor)) {
+        if (references(child, declaration)) {
           return true;
         }
       }
       // Check if the reactor is a super class
       for (var parent : reactorDef.getSuperClasses()) {
-        if (reactor instanceof Reactor r) {
+        if (declaration instanceof Reactor r) {
           if (r.equals(parent)) {
             return true;
           }
           // Check if there are instantiations of the reactor in a super class
           if (parent instanceof Reactor p) {
             for (var inst : p.getInstantiations()) {
-              if (contains(inst, reactor)) {
+              if (references(inst, declaration)) {
                 return true;
               }
             }
           }
         }
-        if (reactor instanceof ImportedReactor i) {
+        if (declaration instanceof ImportedReactor i) {
           if (i.getReactorClass().equals(parent)) {
             return true;
           }
@@ -291,13 +272,13 @@ private boolean contains(Instantiation instantiation, ReactorDecl reactor) {
   }
 
   /**
-   * Return true if the specified import should be included in the code generated for this federate.
+   * Return {@code true} if this instance references the given import.
    *
-   * @param imp The import
+   * @param imp The import that may be referenced.
    */
-  private boolean contains(Import imp) {
+  public boolean references(Import imp) {
     for (ImportedReactor reactor : imp.getReactorClasses()) {
-      if (contains(reactor)) {
+      if (this.references(reactor)) {
         return true;
       }
     }
@@ -305,12 +286,11 @@ private boolean contains(Import imp) {
   }
 
   /**
-   * Return true if the specified parameter should be included in the code generated for this
-   * federate.
+   * Return {@code true} if this instance references the given parameter.
    *
    * @param param The parameter
    */
-  private boolean contains(Parameter param) {
+  public boolean references(Parameter param) {
     boolean returnValue = false;
     // Check if param is referenced in this federate's instantiation
     returnValue =
@@ -327,27 +307,29 @@ private boolean contains(Parameter param) {
     var topLevelUserDefinedReactions =
         ((Reactor) instantiation.eContainer())
             .getReactions().stream()
-                .filter(r -> !networkReactions.contains(r) && contains(r))
+                .filter(r -> !networkReactions.contains(r) && references(r))
                 .collect(Collectors.toCollection(ArrayList::new));
     returnValue |= !topLevelUserDefinedReactions.isEmpty();
     return returnValue;
   }
 
   /**
-   * Return true if the specified action should be included in the code generated for this federate.
-   * This means that either the action is used as a trigger, a source, or an effect in a top-level
-   * reaction that belongs to this federate. This returns true if the program is not federated.
+   * Return {@code true} if this instance references the given action.
+   *
+   * <p>This means that either the action is used as a trigger, a source, or an effect in a
+   * top-level reaction that belongs to this federate. This returns true if the program is not
+   * federated.
    *
    * @param action The action
    * @return True if this federate contains the action.
    */
-  private boolean contains(Action action) {
+  public boolean references(Action action) {
     Reactor reactor = ASTUtils.getEnclosingReactor(action);
 
     // If the action is used as a trigger, a source, or an effect for a top-level reaction
     // that belongs to this federate, then generate it.
     for (Reaction react : ASTUtils.allReactions(reactor)) {
-      if (contains(react)) {
+      if (references(react)) {
         // Look in triggers
         for (TriggerRef trigger : convertToEmptyListIfNull(react.getTriggers())) {
           if (trigger instanceof VarRef triggerAsVarRef) {
@@ -385,7 +367,7 @@ private boolean contains(Action action) {
    *
    * @param reaction The reaction.
    */
-  private boolean contains(Reaction reaction) {
+  public boolean references(Reaction reaction) {
     Reactor reactor = ASTUtils.getEnclosingReactor(reaction);
 
     assert reactor != null;
@@ -419,13 +401,13 @@ private boolean contains(Reaction reaction) {
    *
    * @return True if this federate contains the action in the specified reactor
    */
-  private boolean contains(Timer timer) {
+  public boolean references(Timer timer) {
     Reactor reactor = ASTUtils.getEnclosingReactor(timer);
 
     // If the action is used as a trigger, a source, or an effect for a top-level reaction
     // that belongs to this federate, then generate it.
     for (Reaction r : ASTUtils.allReactions(reactor)) {
-      if (contains(r)) {
+      if (references(r)) {
         // Look in triggers
         for (TriggerRef trigger : convertToEmptyListIfNull(r.getTriggers())) {
           if (trigger instanceof VarRef triggerAsVarRef) {
@@ -452,7 +434,7 @@ private boolean contains(Timer timer) {
    * @param instance The reactor instance.
    * @return True if this federate contains the reactor instance
    */
-  public boolean contains(ReactorInstance instance) {
+  public boolean references(ReactorInstance instance) {
     if (instance.getParent() == null) {
       return true; // Top-level reactor
     }

From 266c1155f5d199057bad445394c476601482b123 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 7 Jul 2023 23:39:17 -0700
Subject: [PATCH 0580/1114] Cleanups

---
 .../federated/generator/FedASTUtils.java      |   2 +-
 .../federated/generator/FedImportEmitter.java |   4 +-
 .../federated/generator/FedMainEmitter.java   |  10 +-
 .../generator/FedReactorEmitter.java          |   2 +-
 .../federated/generator/FederateInstance.java | 121 ++++++++----------
 5 files changed, 58 insertions(+), 81 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 1c791c42ae..57786fcb5b 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -441,7 +441,7 @@ private static Set<PortInstance> findUpstreamPortsInFederate(
       Set<ReactionInstance> reactionVisited) {
     Set<PortInstance> toReturn = new HashSet<>();
     if (port == null) return toReturn;
-    else if (federate.references(port.getParent())) {
+    else if (federate.inherits(port.getParent())) {
       // Reached the requested federate
       toReturn.add(port);
       visitedPorts.add(port);
diff --git a/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java
index bde700dbcf..ba2e88925c 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java
@@ -23,7 +23,7 @@ public class FedImportEmitter {
   String generateImports(FederateInstance federate, FedFileConfig fileConfig) {
     var imports =
         ((Model) federate.instantiation.eContainer().eContainer())
-            .getImports().stream().filter(federate::references).toList();
+            .getImports().stream().filter(federate::inherits).toList();
 
     // Transform the URIs
     imports.stream()
@@ -46,7 +46,7 @@ String generateImports(FederateInstance federate, FedFileConfig fileConfig) {
                   var new_import = EcoreUtil.copy(i);
                   new_import
                       .getReactorClasses()
-                      .removeIf(importedReactor -> !federate.references(importedReactor));
+                      .removeIf(importedReactor -> !federate.inherits(importedReactor));
                   return new_import;
                 })
             .map(FormattingUtil.renderer(federate.targetConfig.target))
diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index d0638ccf38..fbabaab74c 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -37,23 +37,21 @@ String generateMainReactor(
                 "\n",
                 renderer.apply(federate.instantiation),
                 ASTUtils.allStateVars(originalMainReactor).stream()
-                    .filter(federate::references)
                     .map(renderer)
                     .collect(Collectors.joining("\n")),
                 ASTUtils.allActions(originalMainReactor).stream()
-                    .filter(federate::references)
+                    .filter(federate::inherits)
                     .map(renderer)
                     .collect(Collectors.joining("\n")),
                 ASTUtils.allTimers(originalMainReactor).stream()
-                    .filter(federate::references)
+                    .filter(federate::inherits)
                     .map(renderer)
                     .collect(Collectors.joining("\n")),
                 ASTUtils.allMethods(originalMainReactor).stream()
-                    .filter(federate::references)
                     .map(renderer)
                     .collect(Collectors.joining("\n")),
                 ASTUtils.allReactions(originalMainReactor).stream()
-                    .filter(federate::references)
+                    .filter(federate::inherits)
                     .map(renderer)
                     .collect(Collectors.joining("\n")))
             .indent(4)
@@ -72,7 +70,7 @@ private CharSequence generateMainSignature(
       FederateInstance federate, Reactor originalMainReactor, Function<EObject, String> renderer) {
     var paramList =
         ASTUtils.allParameters(originalMainReactor).stream()
-            .filter(federate::references)
+            .filter(federate::inherits)
             .map(renderer)
             .collect(Collectors.joining(",", "(", ")"));
     // Empty "()" is currently not allowed by the syntax
diff --git a/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java
index bb33f6e624..552074f5a3 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java
@@ -15,7 +15,7 @@ public FedReactorEmitter() {}
   String generateReactorDefinitions(FederateInstance federate) {
     return ((Model) federate.instantiation.eContainer().eContainer())
         .getReactors().stream()
-            .filter(federate::references)
+            .filter(federate::inherits)
             .map(FormattingUtil.renderer(federate.targetConfig.target))
             .collect(Collectors.joining("\n"));
   }
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index f9cf4bd3ad..b92c5e2ee1 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -52,23 +52,20 @@
 import org.lflang.lf.ImportedReactor;
 import org.lflang.lf.Input;
 import org.lflang.lf.Instantiation;
-import org.lflang.lf.Method;
 import org.lflang.lf.Output;
 import org.lflang.lf.Parameter;
 import org.lflang.lf.ParameterReference;
 import org.lflang.lf.Reaction;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.ReactorDecl;
-import org.lflang.lf.StateVar;
 import org.lflang.lf.Timer;
 import org.lflang.lf.TriggerRef;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
 
 /**
- * Instance of a federate, or marker that no federation has been defined (if isSingleton() returns
- * true) FIXME: this comment makes no sense. Every top-level reactor (contained directly by the main
- * reactor) is a federate, so there will be one instance of this class for each top-level reactor.
+ * Class that represents an instance of a federate, i.e., a reactor that is instantiated at the top
+ * level of a federated reactor.
  *
  * @author Edward A. Lee
  * @author Soroush Bateni
@@ -76,14 +73,12 @@
 public class FederateInstance {
 
   /**
-   * Construct a new instance with the specified instantiation of of a top-level reactor. The
-   * federate will be given the specified integer ID.
+   * Construct a new federate instance on the basis of an instantiation in the federated reactor.
    *
-   * @param instantiation The instantiation of a top-level reactor, or null if no federation has
-   *     been defined.
-   * @param id The federate ID.
-   * @param bankIndex If instantiation.widthSpec !== null, this gives the bank position.
-   * @param messageReporter The error reporter
+   * @param instantiation The AST node of the instantiation.
+   * @param id An identifier.
+   * @param bankIndex If {@code instantiation.widthSpec !== null}, this gives the bank position.
+   * @param messageReporter An object for reporting messages to the user.
    */
   public FederateInstance(
       Instantiation instantiation,
@@ -97,20 +92,15 @@ public FederateInstance(
     this.messageReporter = messageReporter;
     this.targetConfig = targetConfig;
 
-    if (instantiation != null) {
-      // If the instantiation is in a bank, then we have to append
-      // the bank index to the name.
-      if (instantiation.getWidthSpec() != null) {
-        this.name = "federate__" + instantiation.getName() + "__" + bankIndex;
-      } else {
-        this.name = "federate__" + instantiation.getName();
-      }
+    // If the instantiation is in a bank, then we have to append
+    // the bank index to the name.
+    if (instantiation.getWidthSpec() != null) {
+      this.name = "federate__" + instantiation.getName() + "__" + bankIndex;
+    } else {
+      this.name = "federate__" + instantiation.getName();
     }
   }
 
-  /////////////////////////////////////////////
-  //// Public Fields
-
   /**
    * The position within a bank of reactors for this federate. This is 0 if the instantiation is not
    * a bank of reactors.
@@ -141,9 +131,9 @@ public Instantiation getInstantiation() {
   public int port = 0;
 
   /**
-   * Map from the federates that this federate sends messages to to the delays on connections to
-   * that federate. The delay set may may include null, meaning that there is a connection from the
-   * federate instance that has no delay.
+   * Map from the federates that this federate sends messages to the delays on connections to that
+   * federate. The delay set may include null, meaning that there is a connection from the federate
+   * instance that has no delay.
    */
   public Map<FederateInstance, Set<Expression>> sendsTo = new LinkedHashMap<>();
 
@@ -158,7 +148,7 @@ public Instantiation getInstantiation() {
    * "__n", where n is the bank position of this instance if the instantiation is of a bank of
    * reactors.
    */
-  public String name = "Unnamed";
+  public String name;
 
   /**
    * List of networkMessage actions. Each of these handles a message received from another federate
@@ -214,16 +204,18 @@ public Instantiation getInstantiation() {
   /** Keep a unique list of enabled serializers */
   public HashSet<SupportedSerializers> enabledSerializers = new HashSet<>();
 
-  public boolean references(Method method) {
-    // FIXME
-    return true;
-  }
+  /** Cached result of analysis of which reactions to exclude from main. */
+  private Set<Reaction> excludeReactions = null;
 
-  public boolean references(StateVar var) {
-    return true;
-  }
+  /** An error reporter */
+  private final MessageReporter messageReporter;
 
-  public boolean references(ReactorDecl declaration) {
+  /**
+   * Return {@code true} if federate instance inherits the given reactor declaration.
+   *
+   * @param declaration The reactor declaration to inherit.
+   */
+  public boolean inherits(ReactorDecl declaration) {
     return references(this.instantiation, declaration);
   }
 
@@ -272,13 +264,13 @@ private boolean references(Instantiation instantiation, ReactorDecl declaration)
   }
 
   /**
-   * Return {@code true} if this instance references the given import.
+   * Return {@code true} if this federate inherits the given import.
    *
-   * @param imp The import that may be referenced.
+   * @param imp The import to inherit.
    */
-  public boolean references(Import imp) {
+  public boolean inherits(Import imp) {
     for (ImportedReactor reactor : imp.getReactorClasses()) {
-      if (this.references(reactor)) {
+      if (this.inherits(reactor)) {
         return true;
       }
     }
@@ -286,14 +278,13 @@ public boolean references(Import imp) {
   }
 
   /**
-   * Return {@code true} if this instance references the given parameter.
+   * Return {@code true} if this federate inherits the given parameter.
    *
-   * @param param The parameter
+   * @param param The parameter to inherit.
    */
-  public boolean references(Parameter param) {
-    boolean returnValue = false;
+  public boolean inherits(Parameter param) {
     // Check if param is referenced in this federate's instantiation
-    returnValue =
+    var returnValue =
         instantiation.getParameters().stream()
             .anyMatch(
                 assignment ->
@@ -307,29 +298,28 @@ public boolean references(Parameter param) {
     var topLevelUserDefinedReactions =
         ((Reactor) instantiation.eContainer())
             .getReactions().stream()
-                .filter(r -> !networkReactions.contains(r) && references(r))
+                .filter(r -> !networkReactions.contains(r) && inherits(r))
                 .collect(Collectors.toCollection(ArrayList::new));
     returnValue |= !topLevelUserDefinedReactions.isEmpty();
     return returnValue;
   }
 
   /**
-   * Return {@code true} if this instance references the given action.
+   * Return {@code true} if this federate inherits the given action.
    *
    * <p>This means that either the action is used as a trigger, a source, or an effect in a
    * top-level reaction that belongs to this federate. This returns true if the program is not
    * federated.
    *
-   * @param action The action
-   * @return True if this federate contains the action.
+   * @param action The action to inherit.
    */
-  public boolean references(Action action) {
+  public boolean inherits(Action action) {
     Reactor reactor = ASTUtils.getEnclosingReactor(action);
 
     // If the action is used as a trigger, a source, or an effect for a top-level reaction
     // that belongs to this federate, then generate it.
     for (Reaction react : ASTUtils.allReactions(reactor)) {
-      if (references(react)) {
+      if (inherits(react)) {
         // Look in triggers
         for (TriggerRef trigger : convertToEmptyListIfNull(react.getTriggers())) {
           if (trigger instanceof VarRef triggerAsVarRef) {
@@ -365,9 +355,9 @@ public boolean references(Action action) {
    * other federates. It should only be called on reactions that are either at the top level or
    * within this federate. For this reason, for any reaction not at the top level, it returns true.
    *
-   * @param reaction The reaction.
+   * @param reaction The reaction to inherit.
    */
-  public boolean references(Reaction reaction) {
+  public boolean inherits(Reaction reaction) {
     Reactor reactor = ASTUtils.getEnclosingReactor(reaction);
 
     assert reactor != null;
@@ -395,19 +385,18 @@ public boolean references(Reaction reaction) {
   }
 
   /**
-   * Return true if the specified timer should be included in the code generated for the federate.
-   * This means that the timer is used as a trigger in a top-level reaction that belongs to this
-   * federate. This also returns true if the program is not federated.
+   * Return {@code true} if this federate inherits the given timer.
    *
-   * @return True if this federate contains the action in the specified reactor
+   * <p>This means that the timer is used as a trigger in a top-level reaction that is inherited by
+   * this federate.
    */
-  public boolean references(Timer timer) {
+  public boolean inherits(Timer timer) {
     Reactor reactor = ASTUtils.getEnclosingReactor(timer);
 
     // If the action is used as a trigger, a source, or an effect for a top-level reaction
     // that belongs to this federate, then generate it.
     for (Reaction r : ASTUtils.allReactions(reactor)) {
-      if (references(r)) {
+      if (inherits(r)) {
         // Look in triggers
         for (TriggerRef trigger : convertToEmptyListIfNull(r.getTriggers())) {
           if (trigger instanceof VarRef triggerAsVarRef) {
@@ -418,7 +407,6 @@ public boolean references(Timer timer) {
         }
       }
     }
-
     return false;
   }
 
@@ -426,7 +414,7 @@ public boolean references(Timer timer) {
    * Return true if the specified reactor instance or any parent reactor instance is contained by
    * this federate. If the specified instance is the top-level reactor, return true (the top-level
    * reactor belongs to all federates). If this federate instance is a singleton, then return true
-   * if the instance is non null.
+   * if the instance is non-null.
    *
    * <p>NOTE: If the instance is bank within the top level, then this returns true even though only
    * one of the bank members is in the federate.
@@ -434,7 +422,7 @@ public boolean references(Timer timer) {
    * @param instance The reactor instance.
    * @return True if this federate contains the reactor instance
    */
-  public boolean references(ReactorInstance instance) {
+  public boolean inherits(ReactorInstance instance) {
     if (instance.getParent() == null) {
       return true; // Top-level reactor
     }
@@ -456,7 +444,7 @@ public boolean references(ReactorInstance instance) {
    * @param federatedReactor The top-level federated reactor
    */
   private void indexExcludedTopLevelReactions(Reactor federatedReactor) {
-    boolean inFederate = false;
+    boolean inFederate;
     if (excludeReactions != null) {
       throw new IllegalStateException(
           "The index for excluded reactions at the top level is already built.");
@@ -564,15 +552,6 @@ public String toString() {
         + ((instantiation != null) ? instantiation.getName() : "no name");
   }
 
-  /////////////////////////////////////////////
-  //// Private Fields
-
-  /** Cached result of analysis of which reactions to exclude from main. */
-  private Set<Reaction> excludeReactions = null;
-
-  /** An error reporter */
-  private final MessageReporter messageReporter;
-
   /**
    * Find the nearest (shortest) path to a physical action trigger from this 'reaction' in terms of
    * minimum delay.

From 0766b7a829c5404cdb758366020feb21f495163e Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 7 Jul 2023 23:47:06 -0700
Subject: [PATCH 0581/1114] Add comments

---
 test/C/src/federated/InheritanceFederated.lf       | 3 +++
 test/C/src/federated/InheritanceFederatedImport.lf | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/test/C/src/federated/InheritanceFederated.lf b/test/C/src/federated/InheritanceFederated.lf
index 7b5b0ca644..70f429dbc8 100644
--- a/test/C/src/federated/InheritanceFederated.lf
+++ b/test/C/src/federated/InheritanceFederated.lf
@@ -1,3 +1,6 @@
+// Test for inheritance in a federated program.
+// Compilation without errors is success.
+// Based on https://github.com/lf-lang/lingua-franca/issues/1733.
 target C {
   timeout: 1 ms
 }
diff --git a/test/C/src/federated/InheritanceFederatedImport.lf b/test/C/src/federated/InheritanceFederatedImport.lf
index f06356debd..0918e6809b 100644
--- a/test/C/src/federated/InheritanceFederatedImport.lf
+++ b/test/C/src/federated/InheritanceFederatedImport.lf
@@ -1,3 +1,5 @@
+// Test for inheritance in a federated program where the superclass is imported from a different file.
+// Compilation without errors is success.
 target C {
   timeout: 1 ms
 }

From 3fb7fe75bced857f057ca4fc7947f45dd0733b0f Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Sat, 8 Jul 2023 11:06:17 +0200
Subject: [PATCH 0582/1114] Readded line at eof

---
 gradle.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gradle.properties b/gradle.properties
index 0485bd991a..7dbf2e0d4f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,3 +25,4 @@ org.eclipse.lsp4j=lsp4jVersion
 org.opentest4j=openTest4jVersion
 org.eclipse.core.resources=resourcesVersion
 org.junit.jupiter=jupiterVersion
+

From 202c15c673cc309acee26259559634cf2da4f5e8 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sat, 8 Jul 2023 12:20:05 +0200
Subject: [PATCH 0583/1114] Fix get macro, SendToDownstream, and Correspondence
 axioms

---
 .../org/lflang/analyses/uclid/UclidGenerator.java     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
index 17d71da304..f3a0c7d230 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -512,7 +512,7 @@ protected void generateTraceDefinition() {
     }
     code.pr("// Helper macro that returns an element based on index.");
     code.pr("define get(tr : trace_t, i : step_t) : event_t =");
-    code.pr("if (i >= START || i <= END_TRACE) then tr[i] else");
+    code.pr("if (i >= START && i <= END_TRACE) then tr[i] else");
     code.pr(
         "{ "
             + initialReactions
@@ -916,7 +916,7 @@ protected void generateConnectionAxioms() {
                       + " will be present.",
                   "// with the same value after some fixed delay of " + delay + " nanoseconds.",
                   "(" + source.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> ((",
-                  "    finite_exists (j : integer) in indices :: j > i && j <= END",
+                  "    finite_exists (j : integer) in indices :: j > i && j <= END_TRACE",
                   "    && " + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(j))",
                   "    && "
                       + destination.getFullNameWithJoiner("_")
@@ -940,6 +940,11 @@ protected void generateConnectionAxioms() {
                   "&& (" + destination.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
                   "    finite_exists (j : integer) in indices :: j >= START && j < i",
                   "    && " + source.getFullNameWithJoiner("_") + "_is_present" + "(t(j))",
+                  "    && "
+                      + source.getFullNameWithJoiner("_")
+                      + "(s(j)) == "
+                      + destination.getFullNameWithJoiner("_")
+                      + "(s(i))",
                   connection.isPhysical() ? "" : "    && g(i) == tag_delay(g(j), " + delay + ")",
                   ")) // Closes the one-to-one relationship.",
                   "));"));
@@ -951,7 +956,7 @@ protected void generateConnectionAxioms() {
                   "// If "
                       + destination.getFullNameWithJoiner("_")
                       + " is not present, then its value resets to 0.",
-                  "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END &&"
+                  "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END_TRACE &&"
                       + " !isNULL(i)) ==> (",
                   "    (!"
                       + destination.getFullNameWithJoiner("_")

From 55435bdc6421a577ace3e3414ba3fb2926bb8857 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sat, 8 Jul 2023 13:01:52 +0200
Subject: [PATCH 0584/1114] Use END_TRACE in a few more places since it is the
 default

---
 .../java/org/lflang/analyses/uclid/UclidGenerator.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
index f3a0c7d230..8292a8f7ce 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -831,9 +831,9 @@ protected void generateReactorSemantics() {
           String.join(
               "\n",
               "// the same event can only trigger once in a logical instant",
-              "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END) ==>"
+              "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END_TRACE) ==>"
                   + " (finite_forall (j : integer) in indices ::",
-              "    (j >= START && j <= END) ==> ((rxn(i) == rxn(j) && i != j)",
+              "    (j >= START && j <= END_TRACE) ==> ((rxn(i) == rxn(j) && i != j)",
               "        ==> !tag_same(g(i), g(j)))));",
               ""));
 
@@ -844,7 +844,7 @@ protected void generateReactorSemantics() {
           String.join(
               "\n",
               "// Only one reaction gets triggered at a time.",
-              "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END) ==> (",
+              "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END_TRACE) ==> (",
               "    isNULL(i)"));
       code.indent();
       for (int i = 0; i < this.reactionInstances.size(); i++) {
@@ -1009,7 +1009,7 @@ protected void generateActionAxioms() {
             String.join(
                 "\n",
                 "// " + comment,
-                "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END) ==> ("
+                "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END_TRACE) ==> ("
                     + " false",
                 triggerStr,
                 "));"));
@@ -1021,7 +1021,7 @@ protected void generateActionAxioms() {
                 "// If "
                     + action.getFullNameWithJoiner("_")
                     + "  is not present, then its value resets to 0.",
-                "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END &&"
+                "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END_TRACE &&"
                     + " !isNULL(i)) ==> (",
                 "    (!" + action.getFullNameWithJoiner("_") + "_is_present" + "(t(i)) ==> (",
                 "        " + action.getFullNameWithJoiner("_") + "(s(i)) == 0",

From 65a0c87da3f7630b7a56bd0beaf2047334b2fbaa Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Sat, 8 Jul 2023 15:02:04 +0200
Subject: [PATCH 0585/1114] always link the math lib

---
 .../java/org/lflang/generator/c/CCmakeGenerator.java     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 7b6cb006c2..eec3456d7d 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -215,6 +215,12 @@ CodeBuilder generateCMakeCode(
               Stream.concat(additionalSources.stream(), sources.stream())));
     }
 
+    // Ensure that the math library is linked
+    cMakeCode.pr("find_library(MATH_LIBRARY m)");
+    cMakeCode.pr("if(MATH_LIBRARY)");
+    cMakeCode.pr("  target_link_libraries(${LF_MAIN_TARGET} PUBLIC ${MATH_LIBRARY})");
+    cMakeCode.pr("endif()");
+
     cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE core)");
 
     cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC .)");
@@ -285,9 +291,6 @@ CodeBuilder generateCMakeCode(
     // We can detect a few common libraries and use the proper target_link_libraries to find them
     for (String compilerFlag : targetConfig.compilerFlags) {
       switch (compilerFlag.trim()) {
-        case "-lm":
-          cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE m)");
-          break;
         case "-lprotobuf-c":
           cMakeCode.pr("include(FindPackageHandleStandardArgs)");
           cMakeCode.pr("FIND_PATH( PROTOBUF_INCLUDE_DIR protobuf-c/protobuf-c.h)");

From 3e431f560e6260f32068781de491c5de9b3ce09b Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Sat, 8 Jul 2023 15:04:36 +0200
Subject: [PATCH 0586/1114] add math test

---
 test/C/src/target/Math.lf | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 test/C/src/target/Math.lf

diff --git a/test/C/src/target/Math.lf b/test/C/src/target/Math.lf
new file mode 100644
index 0000000000..68a4a13b6f
--- /dev/null
+++ b/test/C/src/target/Math.lf
@@ -0,0 +1,10 @@
+/** Test that math functions are linked. */
+target C
+
+preamble {=
+  #include <math.h>
+=}
+
+main reactor {
+  reaction(startup) {= lf_print("Maximum of 42.0 and 75 is %.2f", fmax(4.20, 75)); =}
+}

From 739a1bf98ec89a1d1ce69d753b663a093f649c8d Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Sat, 8 Jul 2023 15:05:01 +0200
Subject: [PATCH 0587/1114] stop special casing protobuf

---
 .../main/java/org/lflang/TargetConfig.java    |  3 --
 .../lflang/generator/c/CCmakeGenerator.java   | 32 ++++++++++---------
 .../org/lflang/generator/c/CGenerator.java    |  4 ---
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index a61df711e9..86ac029131 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -184,9 +184,6 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
    */
   public Map<String, String> compileDefinitions = new HashMap<>();
 
-  /** Additional libraries to add to the compile command using the "-l" command-line option. */
-  public List<String> compileLibraries = new ArrayList<>();
-
   /** Flags to pass to the compiler, unless a build command has been specified. */
   public List<String> compilerFlags = new ArrayList<>();
 
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index eec3456d7d..ae3e96e65d 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -287,25 +287,27 @@ CodeBuilder generateCMakeCode(
       cMakeCode.newLine();
     }
 
+    // link protobuf
+    if (!targetConfig.protoFiles.isEmpty()) {
+      cMakeCode.pr("include(FindPackageHandleStandardArgs)");
+      cMakeCode.pr("FIND_PATH( PROTOBUF_INCLUDE_DIR protobuf-c/protobuf-c.h)");
+      cMakeCode.pr(
+          """
+                         find_library(PROTOBUF_LIBRARY\s
+                         NAMES libprotobuf-c.a libprotobuf-c.so libprotobuf-c.dylib protobuf-c.lib protobuf-c.dll
+                         )""");
+      cMakeCode.pr(
+          "find_package_handle_standard_args(libprotobuf-c DEFAULT_MSG PROTOBUF_INCLUDE_DIR"
+              + " PROTOBUF_LIBRARY)");
+      cMakeCode.pr(
+          "target_include_directories( ${LF_MAIN_TARGET} PUBLIC ${PROTOBUF_INCLUDE_DIR} )");
+      cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE ${PROTOBUF_LIBRARY})");
+    }
+
     // Set the compiler flags
     // We can detect a few common libraries and use the proper target_link_libraries to find them
     for (String compilerFlag : targetConfig.compilerFlags) {
       switch (compilerFlag.trim()) {
-        case "-lprotobuf-c":
-          cMakeCode.pr("include(FindPackageHandleStandardArgs)");
-          cMakeCode.pr("FIND_PATH( PROTOBUF_INCLUDE_DIR protobuf-c/protobuf-c.h)");
-          cMakeCode.pr(
-              """
-                         find_library(PROTOBUF_LIBRARY\s
-                         NAMES libprotobuf-c.a libprotobuf-c.so libprotobuf-c.dylib protobuf-c.lib protobuf-c.dll
-                         )""");
-          cMakeCode.pr(
-              "find_package_handle_standard_args(libprotobuf-c DEFAULT_MSG PROTOBUF_INCLUDE_DIR"
-                  + " PROTOBUF_LIBRARY)");
-          cMakeCode.pr(
-              "target_include_directories( ${LF_MAIN_TARGET} PUBLIC ${PROTOBUF_INCLUDE_DIR} )");
-          cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE ${PROTOBUF_LIBRARY})");
-          break;
         case "-O2":
           if (Objects.equals(targetConfig.compiler, "gcc") || CppMode) {
             // Workaround for the pre-added -O2 option in the CGenerator.
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 1099b4e7ca..c493744a4c 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -1642,10 +1642,6 @@ public void processProtoFile(String filename) {
       var nameSansProto = filename.substring(0, filename.length() - 6);
       targetConfig.compileAdditionalSources.add(
           fileConfig.getSrcGenPath().resolve(nameSansProto + ".pb-c.c").toString());
-
-      targetConfig.compileLibraries.add("-l");
-      targetConfig.compileLibraries.add("protobuf-c");
-      targetConfig.compilerFlags.add("-lprotobuf-c");
     } else {
       messageReporter.nowhere().error("protoc-c returns error code " + returnCode);
     }

From c84b218e5d23da16ee04289e5df0bab081154ae0 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Sat, 8 Jul 2023 15:06:17 +0200
Subject: [PATCH 0588/1114] stop special casing -O2

---
 .../lflang/generator/c/CCmakeGenerator.java   | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index ae3e96e65d..c9c2c9e943 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -29,7 +29,6 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Stream;
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
@@ -302,29 +301,19 @@ CodeBuilder generateCMakeCode(
       cMakeCode.pr(
           "target_include_directories( ${LF_MAIN_TARGET} PUBLIC ${PROTOBUF_INCLUDE_DIR} )");
       cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE ${PROTOBUF_LIBRARY})");
+      cMakeCode.newLine();
     }
 
     // Set the compiler flags
     // We can detect a few common libraries and use the proper target_link_libraries to find them
     for (String compilerFlag : targetConfig.compilerFlags) {
-      switch (compilerFlag.trim()) {
-        case "-O2":
-          if (Objects.equals(targetConfig.compiler, "gcc") || CppMode) {
-            // Workaround for the pre-added -O2 option in the CGenerator.
-            // This flag is specific to gcc/g++ and the clang compiler
-            cMakeCode.pr("add_compile_options(-O2)");
-            cMakeCode.pr("add_link_options(-O2)");
-            break;
-          }
-        default:
-          messageReporter
-              .nowhere()
-              .warning(
-                  "Using the flags target property with cmake is dangerous.\n"
-                      + " Use cmake-include instead.");
-          cMakeCode.pr("add_compile_options( " + compilerFlag + " )");
-          cMakeCode.pr("add_link_options( " + compilerFlag + ")");
-      }
+      messageReporter
+          .nowhere()
+          .warning(
+              "Using the flags target property with cmake is dangerous.\n"
+                  + " Use cmake-include instead.");
+      cMakeCode.pr("add_compile_options( " + compilerFlag + " )");
+      cMakeCode.pr("add_link_options( " + compilerFlag + ")");
     }
     cMakeCode.newLine();
 

From abbff38bc1945551d609f982647ae7a6ba7f8b20 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Sat, 8 Jul 2023 15:23:19 +0200
Subject: [PATCH 0589/1114] bugfix

---
 core/src/main/java/org/lflang/generator/c/CCompiler.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index 844b2f6682..0933d95594 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -402,7 +402,6 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
           fileConfig.getOutPath().relativize(fileConfig.getSrcGenPath().resolve(Paths.get(file)));
       compileArgs.add(FileUtil.toUnixString(relativePath));
     }
-    compileArgs.addAll(targetConfig.compileLibraries);
 
     // Add compile definitions
     targetConfig.compileDefinitions.forEach(

From 13f84de1a77c035bc243a8bf3b660aaa66d267a6 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 8 Jul 2023 13:36:19 -0700
Subject: [PATCH 0590/1114] Clean up terminology

---
 .../main/java/org/lflang/ast/ASTUtils.java    | 10 +++
 .../federated/generator/FedASTUtils.java      |  2 +-
 .../federated/generator/FedImportEmitter.java |  4 +-
 .../federated/generator/FedMainEmitter.java   |  8 +-
 .../generator/FedReactorEmitter.java          |  2 +-
 .../federated/generator/FederateInstance.java | 89 ++++++++-----------
 6 files changed, 54 insertions(+), 61 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index e5d0da81ac..3484dbfe18 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -63,6 +63,7 @@
 import org.lflang.TimeValue;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.InvalidSourceException;
+import org.lflang.generator.NamedInstance;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Action;
 import org.lflang.lf.Assignment;
@@ -1662,6 +1663,15 @@ public static boolean isInCode(INode node) {
         && pri.getName().equals("Body");
   }
 
+  /**
+   * Return {@code true} if the given instance is top-level, i.e., its parent is {@code null}.
+   *
+   * @param instance The instance to check.
+   */
+  public static boolean isTopLevel(NamedInstance instance) {
+    return instance.getParent() == null;
+  }
+
   /** Return true if the given node starts on the same line as the given other node. */
   public static Predicate<INode> sameLine(ICompositeNode compNode) {
     return other -> {
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 57786fcb5b..3b6ec8a2bb 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -441,7 +441,7 @@ private static Set<PortInstance> findUpstreamPortsInFederate(
       Set<ReactionInstance> reactionVisited) {
     Set<PortInstance> toReturn = new HashSet<>();
     if (port == null) return toReturn;
-    else if (federate.inherits(port.getParent())) {
+    else if (ASTUtils.isTopLevel(port.getParent()) || federate.includes(port.getParent())) {
       // Reached the requested federate
       toReturn.add(port);
       visitedPorts.add(port);
diff --git a/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java
index ba2e88925c..bde700dbcf 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java
@@ -23,7 +23,7 @@ public class FedImportEmitter {
   String generateImports(FederateInstance federate, FedFileConfig fileConfig) {
     var imports =
         ((Model) federate.instantiation.eContainer().eContainer())
-            .getImports().stream().filter(federate::inherits).toList();
+            .getImports().stream().filter(federate::references).toList();
 
     // Transform the URIs
     imports.stream()
@@ -46,7 +46,7 @@ String generateImports(FederateInstance federate, FedFileConfig fileConfig) {
                   var new_import = EcoreUtil.copy(i);
                   new_import
                       .getReactorClasses()
-                      .removeIf(importedReactor -> !federate.inherits(importedReactor));
+                      .removeIf(importedReactor -> !federate.references(importedReactor));
                   return new_import;
                 })
             .map(FormattingUtil.renderer(federate.targetConfig.target))
diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index fbabaab74c..74c398303b 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -40,18 +40,18 @@ String generateMainReactor(
                     .map(renderer)
                     .collect(Collectors.joining("\n")),
                 ASTUtils.allActions(originalMainReactor).stream()
-                    .filter(federate::inherits)
+                    .filter(federate::includes)
                     .map(renderer)
                     .collect(Collectors.joining("\n")),
                 ASTUtils.allTimers(originalMainReactor).stream()
-                    .filter(federate::inherits)
+                    .filter(federate::includes)
                     .map(renderer)
                     .collect(Collectors.joining("\n")),
                 ASTUtils.allMethods(originalMainReactor).stream()
                     .map(renderer)
                     .collect(Collectors.joining("\n")),
                 ASTUtils.allReactions(originalMainReactor).stream()
-                    .filter(federate::inherits)
+                    .filter(federate::includes)
                     .map(renderer)
                     .collect(Collectors.joining("\n")))
             .indent(4)
@@ -70,7 +70,7 @@ private CharSequence generateMainSignature(
       FederateInstance federate, Reactor originalMainReactor, Function<EObject, String> renderer) {
     var paramList =
         ASTUtils.allParameters(originalMainReactor).stream()
-            .filter(federate::inherits)
+            .filter(federate::references)
             .map(renderer)
             .collect(Collectors.joining(",", "(", ")"));
     // Empty "()" is currently not allowed by the syntax
diff --git a/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java
index 552074f5a3..bb33f6e624 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java
@@ -15,7 +15,7 @@ public FedReactorEmitter() {}
   String generateReactorDefinitions(FederateInstance federate) {
     return ((Model) federate.instantiation.eContainer().eContainer())
         .getReactors().stream()
-            .filter(federate::inherits)
+            .filter(federate::references)
             .map(FormattingUtil.renderer(federate.targetConfig.target))
             .collect(Collectors.joining("\n"));
   }
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index b92c5e2ee1..2626a4898f 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -211,11 +211,12 @@ public Instantiation getInstantiation() {
   private final MessageReporter messageReporter;
 
   /**
-   * Return {@code true} if federate instance inherits the given reactor declaration.
+   * Return {@code true} if the class declaration of the given {@code instantiation} references the
+   * {@code reactor}, either directly or indirectly (e.g., via a superclass or a type parameter).
    *
-   * @param declaration The reactor declaration to inherit.
+   * @param declaration The reactor declaration to check if it is referenced.
    */
-  public boolean inherits(ReactorDecl declaration) {
+  public boolean references(ReactorDecl declaration) {
     return references(this.instantiation, declaration);
   }
 
@@ -224,7 +225,7 @@ public boolean inherits(ReactorDecl declaration) {
    * {@code reactor}, either directly or indirectly (e.g., via a superclass or a type parameter).
    *
    * @param instantiation The instantiation the class of which may refer to the reactor declaration.
-   * @param declaration The potentially referenced reactor declaration.
+   * @param declaration The reactor declaration to check if it is referenced.
    */
   private boolean references(Instantiation instantiation, ReactorDecl declaration) {
     if (instantiation.getReactorClass().equals(ASTUtils.toDefinition(declaration))) {
@@ -264,13 +265,13 @@ private boolean references(Instantiation instantiation, ReactorDecl declaration)
   }
 
   /**
-   * Return {@code true} if this federate inherits the given import.
+   * Return {@code true} if this federate references the given import.
    *
-   * @param imp The import to inherit.
+   * @param imp The import to check if it is referenced.
    */
-  public boolean inherits(Import imp) {
+  public boolean references(Import imp) {
     for (ImportedReactor reactor : imp.getReactorClasses()) {
-      if (this.inherits(reactor)) {
+      if (this.references(reactor)) {
         return true;
       }
     }
@@ -278,11 +279,11 @@ public boolean inherits(Import imp) {
   }
 
   /**
-   * Return {@code true} if this federate inherits the given parameter.
+   * Return {@code true} if this federate references the given parameter.
    *
-   * @param param The parameter to inherit.
+   * @param param The parameter to check if it is referenced.
    */
-  public boolean inherits(Parameter param) {
+  public boolean references(Parameter param) {
     // Check if param is referenced in this federate's instantiation
     var returnValue =
         instantiation.getParameters().stream()
@@ -298,28 +299,27 @@ public boolean inherits(Parameter param) {
     var topLevelUserDefinedReactions =
         ((Reactor) instantiation.eContainer())
             .getReactions().stream()
-                .filter(r -> !networkReactions.contains(r) && inherits(r))
+                .filter(r -> !networkReactions.contains(r) && includes(r))
                 .collect(Collectors.toCollection(ArrayList::new));
     returnValue |= !topLevelUserDefinedReactions.isEmpty();
     return returnValue;
   }
 
   /**
-   * Return {@code true} if this federate inherits the given action.
+   * Return {@code true} if this federate includes the given action from the top-level of the
+   * federation, which is necessary when the federate adopts a reaction that uses the given action.
    *
-   * <p>This means that either the action is used as a trigger, a source, or an effect in a
-   * top-level reaction that belongs to this federate. This returns true if the program is not
-   * federated.
+   * <p>Specifically, this means that either the action is used as a trigger, a source, or an effect
+   * in a top-level reaction that is adopted by this federate.
    *
-   * @param action The action to inherit.
+   * @param action The action to check if it is to be included.
    */
-  public boolean inherits(Action action) {
+  public boolean includes(Action action) {
     Reactor reactor = ASTUtils.getEnclosingReactor(action);
-
     // If the action is used as a trigger, a source, or an effect for a top-level reaction
     // that belongs to this federate, then generate it.
     for (Reaction react : ASTUtils.allReactions(reactor)) {
-      if (inherits(react)) {
+      if (includes(react)) {
         // Look in triggers
         for (TriggerRef trigger : convertToEmptyListIfNull(react.getTriggers())) {
           if (trigger instanceof VarRef triggerAsVarRef) {
@@ -347,7 +347,7 @@ public boolean inherits(Action action) {
   }
 
   /**
-   * Return true if the specified reaction should be included in the code generated for this
+   * Return {@code true} if the specified reaction should be included in the code generated for this
    * federate at the top-level. This means that if the reaction is triggered by or sends data to a
    * port of a contained reactor, then that reaction is in the federate. Otherwise, return false.
    *
@@ -355,9 +355,9 @@ public boolean inherits(Action action) {
    * other federates. It should only be called on reactions that are either at the top level or
    * within this federate. For this reason, for any reaction not at the top level, it returns true.
    *
-   * @param reaction The reaction to inherit.
+   * @param reaction The reaction to check if it is to be included.
    */
-  public boolean inherits(Reaction reaction) {
+  public boolean includes(Reaction reaction) {
     Reactor reactor = ASTUtils.getEnclosingReactor(reaction);
 
     assert reactor != null;
@@ -385,18 +385,19 @@ public boolean inherits(Reaction reaction) {
   }
 
   /**
-   * Return {@code true} if this federate inherits the given timer.
+   * Return {@code true} if this federate includes the given timer from the top-level of the
+   * federation, which is necessary when the federate adopts a reaction that uses the given timer.
    *
-   * <p>This means that the timer is used as a trigger in a top-level reaction that is inherited by
-   * this federate.
+   * <p>Specifically, this means that either the timer is used as a trigger in a top-level reaction
+   * that is included by this federate.
+   *
+   * @param timer The action to check if it is to be included.
    */
-  public boolean inherits(Timer timer) {
+  public boolean includes(Timer timer) {
     Reactor reactor = ASTUtils.getEnclosingReactor(timer);
 
-    // If the action is used as a trigger, a source, or an effect for a top-level reaction
-    // that belongs to this federate, then generate it.
     for (Reaction r : ASTUtils.allReactions(reactor)) {
-      if (inherits(r)) {
+      if (includes(r)) {
         // Look in triggers
         for (TriggerRef trigger : convertToEmptyListIfNull(r.getTriggers())) {
           if (trigger instanceof VarRef triggerAsVarRef) {
@@ -411,21 +412,14 @@ public boolean inherits(Timer timer) {
   }
 
   /**
-   * Return true if the specified reactor instance or any parent reactor instance is contained by
-   * this federate. If the specified instance is the top-level reactor, return true (the top-level
-   * reactor belongs to all federates). If this federate instance is a singleton, then return true
-   * if the instance is non-null.
+   * Return {@code true} if this federate instance includes the given instance.
    *
-   * <p>NOTE: If the instance is bank within the top level, then this returns true even though only
-   * one of the bank members is in the federate.
+   * <p>NOTE: If the instance is bank within the top level, then this returns {@code true} even
+   * though only one of the bank members is included in the federate.
    *
-   * @param instance The reactor instance.
-   * @return True if this federate contains the reactor instance
+   * @param instance The reactor instance to check if it is to be included.
    */
-  public boolean inherits(ReactorInstance instance) {
-    if (instance.getParent() == null) {
-      return true; // Top-level reactor
-    }
+  public boolean includes(ReactorInstance instance) {
     // Start with this instance, then check its parents.
     ReactorInstance i = instance;
     while (i != null) {
@@ -533,17 +527,6 @@ public LinkedHashMap<Output, TimeValue> findOutputsConnectedToPhysicalActions(
     return physicalActionToOutputMinDelay;
   }
 
-  /**
-   * Return a list of federates that are upstream of this federate and have a zero-delay (direct)
-   * connection to this federate.
-   */
-  public List<FederateInstance> getZeroDelayImmediateUpstreamFederates() {
-    return this.dependsOn.entrySet().stream()
-        .filter(e -> e.getValue().contains(null))
-        .map(Map.Entry::getKey)
-        .toList();
-  }
-
   @Override
   public String toString() {
     return "Federate "

From 91f95ab1c2f8abccbd91922cfa99655b1a6350f1 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 8 Jul 2023 16:05:36 -0700
Subject: [PATCH 0591/1114] Use 'include' instead of 'adopt' in comments.

---
 .../org/lflang/federated/generator/FederateInstance.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index 2626a4898f..dfefff5ae0 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -307,10 +307,11 @@ public boolean references(Parameter param) {
 
   /**
    * Return {@code true} if this federate includes the given action from the top-level of the
-   * federation, which is necessary when the federate adopts a reaction that uses the given action.
+   * federation, which is necessary when the federate includes a reaction that references the given
+   * action.
    *
    * <p>Specifically, this means that either the action is used as a trigger, a source, or an effect
-   * in a top-level reaction that is adopted by this federate.
+   * in a top-level reaction that is included by this federate.
    *
    * @param action The action to check if it is to be included.
    */
@@ -386,7 +387,7 @@ public boolean includes(Reaction reaction) {
 
   /**
    * Return {@code true} if this federate includes the given timer from the top-level of the
-   * federation, which is necessary when the federate adopts a reaction that uses the given timer.
+   * federation, which is necessary when the federate includes a reaction that uses the given timer.
    *
    * <p>Specifically, this means that either the timer is used as a trigger in a top-level reaction
    * that is included by this federate.

From 4537b1841982c089c351dc5334f378a55df099c9 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 9 Jul 2023 11:03:27 -0700
Subject: [PATCH 0592/1114] Updated comments in response to review of #1891

---
 .../federated/generator/FederateInstance.java | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index dfefff5ae0..ad407f4b53 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -212,9 +212,10 @@ public Instantiation getInstantiation() {
 
   /**
    * Return {@code true} if the class declaration of the given {@code instantiation} references the
-   * {@code reactor}, either directly or indirectly (e.g., via a superclass or a type parameter).
+   * {@code declaration} of a reactor class, either directly or indirectly (i.e, via a superclass
+   * or a contained instantiation of the reactor class).
    *
-   * @param declaration The reactor declaration to check if it is referenced.
+   * @param declaration The reactor declaration to check whether it is referenced.
    */
   public boolean references(ReactorDecl declaration) {
     return references(this.instantiation, declaration);
@@ -222,10 +223,15 @@ public boolean references(ReactorDecl declaration) {
 
   /**
    * Return {@code true} if the class declaration of the given {@code instantiation} references the
-   * {@code reactor}, either directly or indirectly (e.g., via a superclass or a type parameter).
+   * {@code declaration} of a reactor class, either directly or indirectly (i.e, via a superclass
+   * or a contained instantiation of the reactor class).
+   *
+   * <p>An instantiation references the declaration of a reactor class if it is an instance of
+   * that reactor class either directly or through inheritance, if its reactor class
+   * instantiates the reactor class (or any contained instantiation does).</p>
    *
    * @param instantiation The instantiation the class of which may refer to the reactor declaration.
-   * @param declaration The reactor declaration to check if it is referenced.
+   * @param declaration The reactor declaration to check whether it is referenced.
    */
   private boolean references(Instantiation instantiation, ReactorDecl declaration) {
     if (instantiation.getReactorClass().equals(ASTUtils.toDefinition(declaration))) {
@@ -267,7 +273,7 @@ private boolean references(Instantiation instantiation, ReactorDecl declaration)
   /**
    * Return {@code true} if this federate references the given import.
    *
-   * @param imp The import to check if it is referenced.
+   * @param imp The import to check whether it is referenced.
    */
   public boolean references(Import imp) {
     for (ImportedReactor reactor : imp.getReactorClasses()) {
@@ -281,7 +287,7 @@ public boolean references(Import imp) {
   /**
    * Return {@code true} if this federate references the given parameter.
    *
-   * @param param The parameter to check if it is referenced.
+   * @param param The parameter to check whether it is referenced.
    */
   public boolean references(Parameter param) {
     // Check if param is referenced in this federate's instantiation
@@ -306,14 +312,10 @@ public boolean references(Parameter param) {
   }
 
   /**
-   * Return {@code true} if this federate includes the given action from the top-level of the
-   * federation, which is necessary when the federate includes a reaction that references the given
-   * action.
-   *
-   * <p>Specifically, this means that either the action is used as a trigger, a source, or an effect
-   * in a top-level reaction that is included by this federate.
+   * Return {@code true} if this federate includes a top-level reaction that references the given
+   * action as a trigger, a source, or an effect.
    *
-   * @param action The action to check if it is to be included.
+   * @param action The action to check whether it is to be included.
    */
   public boolean includes(Action action) {
     Reactor reactor = ASTUtils.getEnclosingReactor(action);
@@ -356,7 +358,7 @@ public boolean includes(Action action) {
    * other federates. It should only be called on reactions that are either at the top level or
    * within this federate. For this reason, for any reaction not at the top level, it returns true.
    *
-   * @param reaction The reaction to check if it is to be included.
+   * @param reaction The reaction to check whether it is to be included.
    */
   public boolean includes(Reaction reaction) {
     Reactor reactor = ASTUtils.getEnclosingReactor(reaction);
@@ -386,13 +388,10 @@ public boolean includes(Reaction reaction) {
   }
 
   /**
-   * Return {@code true} if this federate includes the given timer from the top-level of the
-   * federation, which is necessary when the federate includes a reaction that uses the given timer.
-   *
-   * <p>Specifically, this means that either the timer is used as a trigger in a top-level reaction
-   * that is included by this federate.
+   * Return {@code true} if this federate includes a top-level reaction that references the given
+   * timer as a trigger, a source, or an effect.
    *
-   * @param timer The action to check if it is to be included.
+   * @param timer The action to check whether it is to be included.
    */
   public boolean includes(Timer timer) {
     Reactor reactor = ASTUtils.getEnclosingReactor(timer);
@@ -415,10 +414,10 @@ public boolean includes(Timer timer) {
   /**
    * Return {@code true} if this federate instance includes the given instance.
    *
-   * <p>NOTE: If the instance is bank within the top level, then this returns {@code true} even
+   * <p>NOTE: If the instance is a bank within the top level, then this returns {@code true} even
    * though only one of the bank members is included in the federate.
    *
-   * @param instance The reactor instance to check if it is to be included.
+   * @param instance The reactor instance to check whether it is to be included.
    */
   public boolean includes(ReactorInstance instance) {
     // Start with this instance, then check its parents.

From 52ac6a2f1cf503fd171c4301e56dc612ed367148 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 9 Jul 2023 11:21:21 -0700
Subject: [PATCH 0593/1114] Delete REQUIREMENTS.md

---
 REQUIREMENTS.md | 57 -------------------------------------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 REQUIREMENTS.md

diff --git a/REQUIREMENTS.md b/REQUIREMENTS.md
deleted file mode 100644
index ddeff25a77..0000000000
--- a/REQUIREMENTS.md
+++ /dev/null
@@ -1,57 +0,0 @@
-This document includes information about supported operating systems and external dependencies that are expected to be manually installed by the user.
-
-
-## Core Development Requirements
-
-### **Supported Operating Systems**
-|         |    OS Version     | C  | C++ | Python | TypeScript |
-|---------|-------------------|----|-----|--------|------------|
-| Ubuntu  | >= 20.04          | Y  | Y   | Y      | Y          |
-| MacOS   | >= 10.15 Catalina | Y  | Y   | Y      | Y          |
-| Windows | >= 10 1903        | Y  | Y   | Y      | Y          |
-
-### **Dependencies**
-- Java >= 11
-
-In order to develop the core Lingua Franca, the only basic requirement is to have Java >= 11 installed. You should be able to download and run the provided Eclipse development project (see [Downloading and Building](https://github.com/icyphy/lingua-franca/wiki/Downloading-and-Building)). This will get you as far as modifying the under-the-hood code of Lingua Franca, and contributing to the ongoing open-source effort. Please see [Contribution]().
-
-## Target Language Development Requirements
-With Java (>= 11), you should also be able to use the provided Eclipse IDE products located at [Releases](). The Eclipse IDE product will give you the ability to write a Lingua Franca program in any of the supported target languages (see [Language-Specification](https://github.com/icyphy/lingua-franca/wiki/Language-Specification)), generate synthesized diagrams for your program (see [Diagrams - installed out of the box](https://github.com/icyphy/lingua-franca/wiki/Diagrams)), and to generate standalone program codes in the specified target language (but no binaries). Any particular plugin or additional dependencies are managed by the Eclipse IDE product itself.
-
-However, to compile the generated code and to create a binary (which is done by default), each target language in Lingua Franca has an additional set of requirements, which are listed in this section. We also include a list of tested operating systems in the format of a compact table below.
-
-**Note:** Compiling the generated code is generally automatically done in the Eclipse IDE or while using the `lfc` command line tool. This default behavior can be disabled, however, using the [no-compile](https://github.com/icyphy/lingua-franca/wiki/target-specification#no-compile) target property in your Lingua Franca program or by using the `-n` argument for the `lfc` command line tool (see [Command Line Tools](https://github.com/icyphy/lingua-franca/wiki/Command-Line-Tools)).
-
-
-### Supported Operating Systems
-|         |    OS Version     | C             | C++ | Python | TypeScript |
-|---------|-------------------|---------------|-----|--------|------------|
-| Ubuntu  | >= 20.04          | Y             | Y   | Y      | Y          |
-| MacOS   | >= 10.15 Catalina | Y             | Y   | Y      | Y          |
-| Windows | >= 10 1903        | Y             | Y   | Y      | N          |
-
-
-### Dependencies
-
-**C:**
-- A C compiler (e.g., gcc >= 7, clang, or MSVC >= 14.20)
-- CMAKE >= 3.13 (follow https://cmake.org/install/ for installation instructions)
-- **Windows Only:** Visual Studio >= 2019 and Windows SDK >= 10.0.18362.0
-- **Programs using Protocol Buffers:** protoc-c 1.3.3 - see https://github.com/icyphy/lingua-franca/wiki/Protobufs.
-
-**C++:**
-- g++ >= 7 or MSVC >= 14.20 - 1920 (Visual Studio 2019)
-- CMAKE >= 3.16 (follow https://cmake.org/install/ for installation instructions)
-- **Windows Only:** Visual Studio >= 2019 and Windows SDK >= 10.0.18362.0
-
-**Python:**
-- A C compiler (e.g., gcc >= 7, clang, or MSVC >= 14.20)
-- Python >= 3.6
-- pip >= 20.0.2
-- setuptools >= 45.2.0-1
-- **Windows Only:** Visual Studio >= 2019 and Windows SDK >= 10.0.18362.0
-- **Programs using Protocol Buffers:** protoc >= 3.6.1
-
-**TypeScript:**
-- pnpm >= 6 or npm >= 6.14.4
-- **Programs using Protocol Buffers:** protoc >= 3.6.1 (for using protobuf and data serialization - see https://github.com/icyphy/lingua-franca/wiki/Protobufs)

From 74b4ef8429037f5ec7e9d988530d8da63e8010bc Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 9 Jul 2023 11:36:29 -0700
Subject: [PATCH 0594/1114] Apply formatter

---
 .../federated/generator/FederateInstance.java      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index ad407f4b53..a1995cb274 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -212,8 +212,8 @@ public Instantiation getInstantiation() {
 
   /**
    * Return {@code true} if the class declaration of the given {@code instantiation} references the
-   * {@code declaration} of a reactor class, either directly or indirectly (i.e, via a superclass
-   * or a contained instantiation of the reactor class).
+   * {@code declaration} of a reactor class, either directly or indirectly (i.e, via a superclass or
+   * a contained instantiation of the reactor class).
    *
    * @param declaration The reactor declaration to check whether it is referenced.
    */
@@ -223,12 +223,12 @@ public boolean references(ReactorDecl declaration) {
 
   /**
    * Return {@code true} if the class declaration of the given {@code instantiation} references the
-   * {@code declaration} of a reactor class, either directly or indirectly (i.e, via a superclass
-   * or a contained instantiation of the reactor class).
+   * {@code declaration} of a reactor class, either directly or indirectly (i.e, via a superclass or
+   * a contained instantiation of the reactor class).
    *
-   * <p>An instantiation references the declaration of a reactor class if it is an instance of
-   * that reactor class either directly or through inheritance, if its reactor class
-   * instantiates the reactor class (or any contained instantiation does).</p>
+   * <p>An instantiation references the declaration of a reactor class if it is an instance of that
+   * reactor class either directly or through inheritance, if its reactor class instantiates the
+   * reactor class (or any contained instantiation does).
    *
    * @param instantiation The instantiation the class of which may refer to the reactor declaration.
    * @param declaration The reactor declaration to check whether it is referenced.

From a9d44ffb231276c854c79db2f20d3ac4831e853c Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 10 Jul 2023 10:40:30 +0200
Subject: [PATCH 0595/1114] Rename workflow

---
 .github/workflows/only-c.yml                                  | 4 ++--
 ...d-verifier-c-tests.yml => uclid-verifier-c-benchmarks.yml} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename .github/workflows/{uclid-verifier-c-tests.yml => uclid-verifier-c-benchmarks.yml} (100%)

diff --git a/.github/workflows/only-c.yml b/.github/workflows/only-c.yml
index e3208bb3fe..1ae37cb18e 100644
--- a/.github/workflows/only-c.yml
+++ b/.github/workflows/only-c.yml
@@ -42,6 +42,6 @@ jobs:
       use-cpp: true
       all-platforms: ${{ !github.event.pull_request.draft  }}
 
-  # Run the Uclid-based LF Verifier tests.
+  # Run the Uclid-based LF Verifier benchmarks.
   uclid:
-    uses: ./.github/workflows/uclid-verifier-c-tests.yml
+    uses: ./.github/workflows/uclid-verifier-c-benchmarks.yml
diff --git a/.github/workflows/uclid-verifier-c-tests.yml b/.github/workflows/uclid-verifier-c-benchmarks.yml
similarity index 100%
rename from .github/workflows/uclid-verifier-c-tests.yml
rename to .github/workflows/uclid-verifier-c-benchmarks.yml

From 233a741b4bd677ac9fff5b2af17ee72b044312cd Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Mon, 10 Jul 2023 13:53:17 +0200
Subject: [PATCH 0596/1114] Apply spotless

---
 .../java/org/lflang/analyses/uclid/UclidGenerator.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
index 8292a8f7ce..2a07c3cba0 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -844,7 +844,8 @@ protected void generateReactorSemantics() {
           String.join(
               "\n",
               "// Only one reaction gets triggered at a time.",
-              "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END_TRACE) ==> (",
+              "axiom(finite_forall (i : integer) in indices :: (i >= START && i <= END_TRACE) ==>"
+                  + " (",
               "    isNULL(i)"));
       code.indent();
       for (int i = 0; i < this.reactionInstances.size(); i++) {
@@ -1009,8 +1010,8 @@ protected void generateActionAxioms() {
             String.join(
                 "\n",
                 "// " + comment,
-                "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END_TRACE) ==> ("
-                    + " false",
+                "axiom(finite_forall (i : integer) in indices :: (i > START && i <= END_TRACE) ==>"
+                    + " ( false",
                 triggerStr,
                 "));"));
 

From f7862683c3d02fcec1f6e0123e5035910533fe2f Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 10 Jul 2023 12:55:04 -0700
Subject: [PATCH 0597/1114] Update submodule.

Do not decrement the reference count twice.
In my most recent meeting with @jackykwok2024 I believe we determined
that although there are multiple memory leaks, the most severe one is
fixed in the commit being referenced here, and that in any case the
other commit in reactor-c is not less leaky than the one referenced
here. Besides, I have found that in at least one test program a segfault
is fixed by using the commit referenced here (d28a9f5).
---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index df0379be40..d28a9f555f 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit df0379be4048de8b2d4f43fd1bdb22d3252ceb62
+Subproject commit d28a9f555f238ff05e1ce622e313f1801c32a6a7

From 4072f8978cbf7fe8ebca2236f23f0db31862dd93 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 10 Jul 2023 14:40:09 -0700
Subject: [PATCH 0598/1114] Try to fix segfaults with after delays.

This seems to work on DelayArrayWithAfter.
---
 .../lflang/generator/python/PythonDelayBodyGenerator.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/python/PythonDelayBodyGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonDelayBodyGenerator.java
index 6171f3ca40..38cf6b72e2 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonDelayBodyGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonDelayBodyGenerator.java
@@ -35,6 +35,7 @@ public String generateDelayBody(Action action, VarRef port) {
           "    lf_schedule_token(" + action.getName() + ", 0, " + ref + "->token);",
           "}");
     } else {
+      var value = "self->_lf_" + ref + "->value";
       return String.join(
           "\n",
           "// Create a token.",
@@ -44,9 +45,10 @@ public String generateDelayBody(Action action, VarRef port) {
           "#endif",
           "lf_token_t* t = _lf_new_token((token_type_t*)"
               + action.getName()
-              + ", self->_lf_"
-              + ref
-              + "->value, 1);",
+              + ", "
+              + value
+              + ", 1);",
+          "Py_INCREF(" + value + ");",
           "#if NUMBER_OF_WORKERS > 0",
           "lf_mutex_unlock(&mutex);",
           "#endif",

From 6d1a7638d3a4febbfa14f2df4a411dc37efe8c1c Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 10 Jul 2023 17:24:47 -0700
Subject: [PATCH 0599/1114] Update submodule.

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index d28a9f555f..294fbb2ad7 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit d28a9f555f238ff05e1ce622e313f1801c32a6a7
+Subproject commit 294fbb2ad72648bbae204ce9c62ce5d2b1c9e12d

From b19e92eb0ce29dad34b504a088cc9662f5e4610f Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 6 Jul 2023 11:55:54 -0700
Subject: [PATCH 0600/1114] Only let zero-delay connections affect MLAA.

---
 .../main/java/org/lflang/ast/ASTUtils.java    | 16 ++++++++
 .../federated/extensions/CExtension.java      |  4 +-
 .../federated/extensions/CExtensionUtils.java | 37 +++++++------------
 .../federated/generator/FedASTUtils.java      |  3 +-
 .../federated/generator/FederateInstance.java |  6 +++
 core/src/main/resources/lib/c/reactor-c       |  2 +-
 6 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 60b5538372..9904920209 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -1392,6 +1392,22 @@ public static Integer initialValueInt(Parameter parameter, List<Instantiation> i
     return result;
   }
 
+  public static Long getDelay(Expression delay) {
+    Long ret = null;
+    if (delay != null) {
+      TimeValue tv;
+      if (delay instanceof ParameterReference) {
+        // The parameter has to be parameter of the main reactor.
+        // And that value has to be a Time.
+        tv = ASTUtils.getDefaultAsTimeValue(((ParameterReference) delay).getParameter());
+      } else {
+        tv = ASTUtils.getLiteralTimeValue(delay);
+      }
+      ret = tv == null ? null : tv.toNanoSeconds();
+    }
+    return ret;
+  }
+
   /**
    * Given the width specification of port or instantiation and an (optional) list of nested
    * instantiations, return the width if it can be determined and -1 if not. It will not be able to
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 3c3c671641..5aad1f90da 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -533,8 +533,10 @@ protected String makePreamble(
         """
         lf_action_base_t* _lf_action_table[%1$s];
         size_t _lf_action_table_size = %1$s;
+        lf_action_base_t* _lf_zero_delay_action_table[%2$s];
+        size_t _lf_zero_delay_action_table_size = %2$s;
         """
-            .formatted(numOfNetworkActions));
+            .formatted(numOfNetworkActions, federate.zeroDelayNetworkMessageActions.size()));
 
     int numOfNetworkReactions = federate.networkReceiverReactions.size();
     code.pr(
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 3a010d48ea..6ffda6497f 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -11,7 +11,6 @@
 import org.lflang.TargetConfig.ClockSyncOptions;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.ClockSyncMode;
-import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
@@ -46,27 +45,28 @@ public static String initializeTriggersForNetworkActions(
       FederateInstance federate, ReactorInstance main) {
     CodeBuilder code = new CodeBuilder();
     if (federate.networkMessageActions.size() > 0) {
-      // Create a static array of trigger_t pointers.
-      // networkMessageActions is a list of Actions, but we
-      // need a list of trigger struct names for ActionInstances.
-      // There should be exactly one ActionInstance in the
-      // main reactor for each Action.
-      var triggers = new LinkedList<String>();
+      var actionTableCount = 0;
+      var zeroDelayActionTableCount = 0;
       for (int i = 0; i < federate.networkMessageActions.size(); ++i) {
         // Find the corresponding ActionInstance.
         Action action = federate.networkMessageActions.get(i);
         var reactor = main.lookupReactorInstance(federate.networkReceiverInstantiations.get(i));
         var actionInstance = reactor.lookupActionInstance(action);
-        triggers.add(CUtil.actionRef(actionInstance, null));
-      }
-      var actionTableCount = 0;
-      for (String trigger : triggers) {
+        var trigger = CUtil.actionRef(actionInstance, null);
         code.pr(
             "_lf_action_table["
                 + (actionTableCount++)
                 + "] = (lf_action_base_t*)&"
                 + trigger
                 + "; \\");
+        if (federate.zeroDelayNetworkMessageActions.contains(action)) {
+          code.pr(
+            "_lf_zero_delay_action_table["
+                    + (zeroDelayActionTableCount++)
+                    + "] = (lf_action_base_t*)&"
+                    + trigger
+                    + "; \\");
+        }
       }
     }
     return code.getCode();
@@ -160,19 +160,8 @@ public static String createPortStatusFieldForInput(Input input) {
    * @param delay The delay associated with a connection.
    */
   public static String getNetworkDelayLiteral(Expression delay) {
-    String additionalDelayString = "NEVER";
-    if (delay != null) {
-      TimeValue tv;
-      if (delay instanceof ParameterReference) {
-        // The parameter has to be parameter of the main reactor.
-        // And that value has to be a Time.
-        tv = ASTUtils.getDefaultAsTimeValue(((ParameterReference) delay).getParameter());
-      } else {
-        tv = ASTUtils.getLiteralTimeValue(delay);
-      }
-      additionalDelayString = Long.toString(tv.toNanoSeconds());
-    }
-    return additionalDelayString;
+    var d = ASTUtils.getDelay(delay);
+    return d == null ? "NEVER" : Long.toString(d);
   }
 
   static boolean isSharedPtrType(InferredType type, CTypes types) {
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 8f0579cb77..099d770fb1 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -261,6 +261,7 @@ private static void addNetworkReceiverReactor(
 
     // Keep track of this action in the destination federate.
     connection.dstFederate.networkMessageActions.add(networkAction);
+    if (connection.getDefinition().getDelay() == null) connection.dstFederate.zeroDelayNetworkMessageActions.add(networkAction);
 
     TimeValue maxSTP = findMaxSTP(connection, coordination);
 
@@ -703,7 +704,7 @@ private static Reaction getInitializationReaction() {
     initializationReaction.getTriggers().add(startup);
     var code = LfFactory.eINSTANCE.createCode();
     code.setBody(
-        """
+            """
             extern reaction_t* port_absent_reaction[];
             void enqueue_network_output_control_reactions();
             LF_PRINT_DEBUG("Adding network output control reaction to table.");
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index 0e0239283b..0f7069ed96 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -185,6 +185,12 @@ public Instantiation getInstantiation() {
    */
   public List<Action> networkMessageActions = new ArrayList<>();
 
+  /**
+   * List of networkMessage actions corresponding to zero-delay connections. This should be a subset
+   * of the networkMessageActions.
+   */
+  public List<Action> zeroDelayNetworkMessageActions = new ArrayList<>();
+
   /**
    * A set of federates with which this federate has an inbound connection There will only be one
    * physical connection even if federate A has defined multiple physical connections to federate B.
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 40d24c320e..a97238470f 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 40d24c320eb53520372653a1cd7fa338fc7237e7
+Subproject commit a97238470fcf559d34794856abd36e96b8344e94

From 1d14809c0aaad077550c515719ffb334d5ee6831 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 10 Jul 2023 18:29:03 -0700
Subject: [PATCH 0601/1114] Simple cleanups in the federated package.

There is also a change to ensure that the reactors in the generated LF
code correspond to distinct reactor classes. If I am not mistaken this
fixes a scalability issue.
---
 .../federated/extensions/CExtension.java      |  27 +----
 .../federated/extensions/CExtensionUtils.java |  14 +--
 .../extensions/FedTargetExtension.java        |  38 ++-----
 .../extensions/FedTargetExtensionFactory.java |  17 +--
 .../federated/extensions/PythonExtension.java |  60 ++++------
 .../federated/extensions/TSExtension.java     |  14 +--
 .../generator/FedConnectionInstance.java      |   8 --
 .../federated/generator/FedEmitter.java       |   6 +-
 .../federated/generator/FedGenerator.java     |  17 ++-
 .../federated/generator/FedImportEmitter.java |   2 +-
 .../federated/generator/FedMainEmitter.java   |  29 +----
 .../generator/FedReactorEmitter.java          |   6 +-
 .../federated/generator/FederateInstance.java |   3 -
 .../federated/launcher/CBuildConfig.java      |   2 +-
 .../launcher/FedLauncherGenerator.java        |  88 +++++++--------
 .../FedNativePythonSerialization.java         |  28 ++---
 .../FedROS2CPPSerialization.java              | 104 +++++++++---------
 17 files changed, 170 insertions(+), 293 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 5aad1f90da..57872c13a0 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -396,31 +396,6 @@ protected void serializeAndSend(
     }
   }
 
-  /**
-   * Generate code for the body of a reaction that decides whether the trigger for the given port is
-   * going to be present or absent for the current logical time. This reaction is put just before
-   * the first reaction that is triggered by the network input port "port" or has it in its sources.
-   * If there are only connections to contained reactors, in the top-level reactor.
-   *
-   * @param receivingPortID The port to generate the control reaction for
-   * @param maxSTP The maximum value of STP is assigned to reactions (if any) that have port as
-   *     their trigger or source
-   */
-  public String generateNetworkInputControlReactionBody(
-      int receivingPortID, TimeValue maxSTP, CoordinationType coordination) {
-    // Store the code
-    var result = new CodeBuilder();
-    result.pr("interval_t max_STP = 0LL;");
-
-    // Find the maximum STP for decentralized coordination
-    if (coordination == CoordinationType.DECENTRALIZED) {
-      result.pr("max_STP = " + CTypes.getInstance().getTargetTimeExpr(maxSTP) + ";");
-    }
-    result.pr("// Wait until the port status is known");
-    result.pr("wait_until_port_status_known(" + receivingPortID + ", max_STP);");
-    return result.toString();
-  }
-
   /**
    * Generate code for the body of a reaction that sends a port status message for the given port if
    * it is absent.
@@ -577,7 +552,7 @@ protected String makePreamble(
   /** Generate preamble code needed for enabled serializers of the federate. */
   protected String generateSerializationIncludes(
       FederateInstance federate, FedFileConfig fileConfig) {
-    return CExtensionUtils.generateSerializationIncludes(federate, fileConfig);
+    return CExtensionUtils.generateSerializationIncludes(federate);
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 6ffda6497f..c7f887f0c8 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -4,7 +4,6 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.regex.Pattern;
 import org.lflang.InferredType;
@@ -61,11 +60,11 @@ public static String initializeTriggersForNetworkActions(
                 + "; \\");
         if (federate.zeroDelayNetworkMessageActions.contains(action)) {
           code.pr(
-            "_lf_zero_delay_action_table["
-                    + (zeroDelayActionTableCount++)
-                    + "] = (lf_action_base_t*)&"
-                    + trigger
-                    + "; \\");
+              "_lf_zero_delay_action_table["
+                  + (zeroDelayActionTableCount++)
+                  + "] = (lf_action_base_t*)&"
+                  + trigger
+                  + "; \\");
         }
       }
     }
@@ -477,8 +476,7 @@ public static String surroundWithIfFederatedDecentralized(String code) {
   }
 
   /** Generate preamble code needed for enabled serializers of the federate. */
-  public static String generateSerializationIncludes(
-      FederateInstance federate, FedFileConfig fileConfig) {
+  public static String generateSerializationIncludes(FederateInstance federate) {
     CodeBuilder code = new CodeBuilder();
     for (SupportedSerializers serializer : federate.enabledSerializers) {
       switch (serializer) {
diff --git a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
index 17ac198781..8957dfe0f4 100644
--- a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
@@ -41,10 +41,9 @@ void initializeTargetConfig(
    * @param action The action.
    * @param sendingPort The output port providing the data to send.
    * @param receivingPort The ID of the destination port.
-   * @param connection FIXME
-   * @param type FIXME
+   * @param connection The federated connection being lowered.
+   * @param type The type of the data being sent over the connection.
    * @param coordinationType The coordination type
-   * @param errorReporter
    */
   String generateNetworkReceiverBody(
       Action action,
@@ -61,10 +60,9 @@ String generateNetworkReceiverBody(
    *
    * @param sendingPort The output port providing the data to send.
    * @param receivingPort The variable reference to the destination port.
-   * @param connection
-   * @param type
-   * @param coordinationType
-   * @param errorReporter FIXME
+   * @param connection The federated connection being lowered.
+   * @param type The type of the data being sent over the connection.
+   * @param coordinationType Whether the federated program is centralized or decentralized.
    */
   String generateNetworkSenderBody(
       VarRef sendingPort,
@@ -74,26 +72,12 @@ String generateNetworkSenderBody(
       CoordinationType coordinationType,
       ErrorReporter errorReporter);
 
-  /**
-   * Generate code for the body of a reaction that decides whether the trigger for the given port is
-   * going to be present or absent for the current logical time. This reaction is put just before
-   * the first reaction that is triggered by the network input port "port" or has it in its sources.
-   * If there are only connections to contained reactors, in the top-level reactor.
-   *
-   * @param receivingPortID The port to generate the control reaction for
-   * @param maxSTP The maximum value of STP is assigned to reactions (if any) that have port as
-   *     their trigger or source
-   * @param coordination FIXME
-   */
-  String generateNetworkInputControlReactionBody(
-      int receivingPortID, TimeValue maxSTP, CoordinationType coordination);
-
   /**
    * Generate code for the body of a reaction that sends a port status message for the given port if
    * it is absent.
    *
-   * @oaram srcOutputPort FIXME
-   * @param connection FIXME
+   * @param srcOutputPort A reference to the output port of the federate instance.
+   * @param connection The federated connection being lowered.
    */
   String generateNetworkOutputControlReactionBody(
       VarRef srcOutputPort, FedConnectionInstance connection);
@@ -109,12 +93,10 @@ default void annotateReaction(Reaction reaction) {}
   String getNetworkBufferType();
 
   /**
-   * Add necessary preamble to the source to set up federated execution.
+   * Add preamble to the source to set up federated execution.
    *
-   * @param federate
-   * @param rtiConfig
-   * @param errorReporter
-   * @return
+   * @param federate The federate to which the generated setup code will correspond.
+   * @param rtiConfig The settings of the RTI.
    */
   String generatePreamble(
       FederateInstance federate,
diff --git a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtensionFactory.java b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtensionFactory.java
index ca16d1d445..612aa02f7c 100644
--- a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtensionFactory.java
+++ b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtensionFactory.java
@@ -11,16 +11,11 @@ public class FedTargetExtensionFactory {
 
   /** Given a target, return the appropriate extension. */
   public static FedTargetExtension getExtension(Target target) {
-    switch (target) {
-      case CCPP:
-      case C:
-        return new CExtension();
-      case Python:
-        return new PythonExtension();
-      case TS:
-        return new TSExtension();
-      default:
-        throw new RuntimeException("Target not supported");
-    }
+    return switch (target) {
+      case CCPP, C -> new CExtension();
+      case Python -> new PythonExtension();
+      case TS -> new TSExtension();
+      default -> throw new RuntimeException("Target not supported");
+    };
   }
 }
diff --git a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
index 9cca139255..b119716c8d 100644
--- a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
@@ -120,24 +120,16 @@ protected void deserialize(
       String receiveRef,
       CodeBuilder result,
       ErrorReporter errorReporter) {
-    String value = "";
+    String value;
     switch (connection.getSerializer()) {
-      case NATIVE:
-        {
-          value = action.getName();
-          FedNativePythonSerialization pickler = new FedNativePythonSerialization();
-          result.pr(pickler.generateNetworkDeserializerCode(value, null));
-          result.pr("lf_set(" + receiveRef + ", " + FedSerialization.deserializedVarName + ");\n");
-          break;
-        }
-      case PROTO:
-        {
-          throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
-        }
-      case ROS2:
-        {
-          throw new UnsupportedOperationException("ROS2 serialization is not supported yet.");
-        }
+      case NATIVE -> {
+        value = action.getName();
+        FedNativePythonSerialization pickler = new FedNativePythonSerialization();
+        result.pr(pickler.generateNetworkDeserializerCode(value, null));
+        result.pr("lf_set(" + receiveRef + ", " + FedSerialization.deserializedVarName + ");\n");
+      }
+      case PROTO -> throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
+      case ROS2 -> throw new UnsupportedOperationException("ROS2 serialization is not supported yet.");
     }
   }
 
@@ -150,28 +142,20 @@ protected void serializeAndSend(
       String sendingFunction,
       String commonArgs,
       ErrorReporter errorReporter) {
-    String lengthExpression = "";
-    String pointerExpression = "";
+    String lengthExpression;
+    String pointerExpression;
     switch (connection.getSerializer()) {
-      case NATIVE:
-        {
-          var variableToSerialize = sendRef + "->value";
-          FedNativePythonSerialization pickler = new FedNativePythonSerialization();
-          lengthExpression = pickler.serializedBufferLength();
-          pointerExpression = pickler.seializedBufferVar();
-          result.pr(pickler.generateNetworkSerializerCode(variableToSerialize, null));
-          result.pr("size_t message_length = " + lengthExpression + ";");
-          result.pr(sendingFunction + "(" + commonArgs + ", " + pointerExpression + ");\n");
-          break;
-        }
-      case PROTO:
-        {
-          throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
-        }
-      case ROS2:
-        {
-          throw new UnsupportedOperationException("ROS2 serialization is not supported yet.");
-        }
+      case NATIVE -> {
+        var variableToSerialize = sendRef + "->value";
+        FedNativePythonSerialization pickler = new FedNativePythonSerialization();
+        lengthExpression = pickler.serializedBufferLength();
+        pointerExpression = pickler.seializedBufferVar();
+        result.pr(pickler.generateNetworkSerializerCode(variableToSerialize, null));
+        result.pr("size_t message_length = " + lengthExpression + ";");
+        result.pr(sendingFunction + "(" + commonArgs + ", " + pointerExpression + ");\n");
+      }
+      case PROTO -> throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
+      case ROS2 -> throw new UnsupportedOperationException("ROS2 serialization is not supported yet.");
     }
   }
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 14df96afb5..396c83863d 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -33,8 +33,7 @@ public void initializeTargetConfig(
       FederateInstance federate,
       FedFileConfig fileConfig,
       ErrorReporter errorReporter,
-      RtiConfig rtiConfig)
-      throws IOException {}
+      RtiConfig rtiConfig) {}
 
   @Override
   public String generateNetworkReceiverBody(
@@ -83,12 +82,6 @@ private String getNetworkDelayLiteral(Expression e) {
     return cLiteral.equals("NEVER") ? "0" : cLiteral;
   }
 
-  @Override
-  public String generateNetworkInputControlReactionBody(
-      int receivingPortID, TimeValue maxSTP, CoordinationType coordination) {
-    return "// TODO(hokeun): Figure out what to do for generateNetworkInputControlReactionBody";
-  }
-
   @Override
   public String generateNetworkOutputControlReactionBody(
       VarRef srcOutputPort, FedConnectionInstance connection) {
@@ -100,11 +93,6 @@ public String getNetworkBufferType() {
     return "";
   }
 
-  /**
-   * Add necessary preamble to the source to set up federated execution.
-   *
-   * @return
-   */
   @Override
   public String generatePreamble(
       FederateInstance federate,
diff --git a/core/src/main/java/org/lflang/federated/generator/FedConnectionInstance.java b/core/src/main/java/org/lflang/federated/generator/FedConnectionInstance.java
index d08aa5f850..50bfd277af 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedConnectionInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedConnectionInstance.java
@@ -58,14 +58,6 @@ public FedConnectionInstance(
     this.dstFederate.connections.add(this);
   }
 
-  public SendRange getSrcRange() {
-    return srcRange;
-  }
-
-  public RuntimeRange<PortInstance> getDstRange() {
-    return dstRange;
-  }
-
   public int getSrcChannel() {
     return srcChannel;
   }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
index bdf912d0c8..03c2bb638b 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
@@ -30,11 +30,7 @@ public FedEmitter(
     this.rtiConfig = rtiConfig;
   }
 
-  /**
-   * Generate a .lf file for federate {@code federate}.
-   *
-   * @throws IOException
-   */
+  /** Generate a .lf file for federate {@code federate}. */
   Map<Path, CodeMap> generateFederate(
       LFGeneratorContext context, FederateInstance federate, int numOfFederates)
       throws IOException {
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 75bb9f13e3..56981aad1f 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -98,8 +98,6 @@ public class FedGenerator {
   /**
    * Create a new generator and initialize a file configuration, target configuration, and error
    * reporter.
-   *
-   * @param context
    */
   public FedGenerator(LFGeneratorContext context) {
     this.fileConfig = (FedFileConfig) context.getFileConfig();
@@ -114,7 +112,6 @@ public FedGenerator(LFGeneratorContext context) {
    * @param resource The resource that has the federated main reactor in it
    * @param context The context in which to carry out the code generation.
    * @return False if no errors have occurred, true otherwise.
-   * @throws IOException
    */
   public boolean doGenerate(Resource resource, LFGeneratorContext context) throws IOException {
     if (!federatedExecutionIsSupported(resource)) return true;
@@ -332,7 +329,9 @@ public TargetConfig getTargetConfig() {
 
     // Wait for all compile threads to finish (NOTE: Can block forever)
     try {
-      compileThreadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
+      if (!compileThreadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS)) {
+        context.getErrorReporter().reportError("Timed out while compiling.");
+      }
     } catch (Exception e) {
       context.getErrorReporter().reportError("Failure during code generation: " + e.getMessage());
       e.printStackTrace();
@@ -362,7 +361,7 @@ private void setFederationRTIProperties(LFGeneratorContext context) {
     String rtiAddr = context.getArgs().getProperty("rti");
     Pattern pattern =
         Pattern.compile(
-            "([a-zA-Z0-9]+@)?([a-zA-Z0-9]+\\.?[a-z]{2,}|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+):?([0-9]+)?");
+            "([a-zA-Z\\d]+@)?([a-zA-Z\\d]+\\.?[a-z]{2,}|\\d+\\.\\d+\\.\\d+\\.\\d+):?(\\d+)?");
     Matcher matcher = pattern.matcher(rtiAddr);
 
     if (!matcher.find()) {
@@ -478,7 +477,7 @@ private List<FederateInstance> getFederateInstances(
    * data.
    *
    * @param federation Reactor class of the federation.
-   * @param resource
+   * @param resource The file system resource from which the original program is derived.
    */
   private void replaceFederateConnectionsWithProxies(Reactor federation, Resource resource) {
     // Each connection in the AST may represent more than one connection between
@@ -575,7 +574,7 @@ private static VarRef varRefOf(Instantiation container, String name) {
    * Replace the connections from the specified output port.
    *
    * @param output The output port instance.
-   * @param resource
+   * @param resource The file system resource from which the original program is derived.
    */
   private void replaceConnectionFromOutputPort(PortInstance output, Resource resource) {
     // Iterate through ranges of the output port
@@ -599,7 +598,7 @@ private void replaceConnectionFromOutputPort(PortInstance output, Resource resou
    *
    * @param srcRange A range of an output port that sources data for this connection.
    * @param dstRange A range of input ports that receive the data.
-   * @param resource
+   * @param resource The file system resource from which the original program is derived.
    */
   private void replaceOneToManyConnection(
       SendRange srcRange, RuntimeRange<PortInstance> dstRange, Resource resource) {
@@ -650,7 +649,7 @@ private void replaceOneToManyConnection(
    * Replace a one-to-one federated connection with proxies.
    *
    * @param connection A connection between two federates.
-   * @param resource
+   * @param resource The file system resource from which the original program is derived.
    */
   private void replaceFedConnection(FedConnectionInstance connection, Resource resource) {
     if (!connection.getDefinition().isPhysical()
diff --git a/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java
index baf13d6a0a..be7c203a0f 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java
@@ -17,7 +17,7 @@
  */
 public class FedImportEmitter {
 
-  private static Set<Import> visitedImports = new HashSet<>();
+  private static final Set<Import> visitedImports = new HashSet<>();
 
   /** Generate import statements for {@code federate}. */
   String generateImports(FederateInstance federate, FedFileConfig fileConfig) {
diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index 6c097f790c..a9999fad7c 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -6,10 +6,8 @@
 import org.lflang.ErrorReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.ast.FormattingUtils;
-import org.lflang.generator.PortInstance;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.Variable;
-import org.lflang.util.Pair;
 
 /** Helper class to generate a main reactor */
 public class FedMainEmitter {
@@ -17,7 +15,6 @@ public class FedMainEmitter {
   /**
    * Generate a main reactor for {@code federate}.
    *
-   * @param federate
    * @param originalMainReactor The original main reactor.
    * @param errorReporter Used to report errors.
    * @return The main reactor.
@@ -27,7 +24,7 @@ String generateMainReactor(
     // FIXME: Handle modes at the top-level
     if (!ASTUtils.allModes(originalMainReactor).isEmpty()) {
       errorReporter.reportError(
-          ASTUtils.allModes(originalMainReactor).stream().findFirst().get(),
+          ASTUtils.allModes(originalMainReactor).stream().findFirst().orElseThrow(),
           "Modes at the top level are not supported under federated execution.");
     }
     var renderer = FormattingUtils.renderer(federate.targetConfig.target);
@@ -75,24 +72,6 @@ String generateMainReactor(
         "}");
   }
 
-  private static String getDependencyList(
-      FederateInstance federate, Pair<PortInstance, PortInstance> p) {
-    // StringBuilder lst = new StringBuilder();
-    var inputPort = p.getFirst();
-    var outputPort = p.getSecond();
-    var inputPortInstance = federate.networkPortToInstantiation.getOrDefault(inputPort, null);
-    var outputPortInstance = federate.networkPortToInstantiation.getOrDefault(outputPort, null);
-    // var outputPortControlReaction = federate.networkPortToInstantiation.getOrDefault(outputPort,
-    // null);
-    if (inputPortInstance == null) return "";
-    // System.out.println("IP: " + inputPortReaction.getCode());
-    if (outputPortInstance != null) {
-      // System.out.println("OP: " + outputPortReaction.toString());
-      return inputPortInstance.getName() + "," + outputPortInstance.getName();
-    }
-    return "";
-  }
-
   /**
    * Generate the signature of the main reactor.
    *
@@ -114,12 +93,6 @@ private CharSequence generateMainSignature(
             .map(Variable::getName)
             .collect(Collectors.joining(","));
 
-    //    List<String> vals = new ArrayList<>();
-    //    for (var pair : federate.networkReactionDependencyPairs) {
-    //      vals.add(getDependencyList(federate, pair));
-    //    }
-
-    //    String intraDependencies = String.join(";", vals);
     return """
         @_fed_config(network_message_actions="%s")
         main reactor %s {
diff --git a/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java
index 69a6342486..8865f5709e 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java
@@ -8,13 +8,11 @@ public class FedReactorEmitter {
 
   public FedReactorEmitter() {}
 
-  /**
-   * @param federate
-   * @return
-   */
+  /** Return textual representations of all reactor classes belonging to {@code federate}. */
   String generateReactorDefinitions(FederateInstance federate) {
     return ((Model) federate.instantiation.eContainer().eContainer())
         .getReactors().stream()
+            .distinct()
             .filter(federate::contains)
             .map(FormattingUtils.renderer(federate.targetConfig.target))
             .collect(Collectors.joining("\n"));
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index 0f7069ed96..16ddccd75d 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -127,9 +127,6 @@ public FederateInstance(
    */
   public int bankWidth;
 
-  /** A list of outputs that can be triggered directly or indirectly by physical actions. */
-  public Set<Expression> outputsConnectedToPhysicalActions = new LinkedHashSet<>();
-
   /** The host, if specified using the 'at' keyword. */
   public String host = "localhost";
 
diff --git a/core/src/main/java/org/lflang/federated/launcher/CBuildConfig.java b/core/src/main/java/org/lflang/federated/launcher/CBuildConfig.java
index d77ea3988c..f012403f6c 100644
--- a/core/src/main/java/org/lflang/federated/launcher/CBuildConfig.java
+++ b/core/src/main/java/org/lflang/federated/launcher/CBuildConfig.java
@@ -48,7 +48,7 @@ public CBuildConfig(
   @Override
   public String compileCommand() {
 
-    String commandToReturn = "";
+    String commandToReturn;
     // FIXME: Hack to add platform support only for linux systems.
     // We need to fix the CMake build command for remote federates.
     String linuxPlatformSupport =
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index c06ced57f3..ba5b4479c7 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -110,7 +110,7 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
     // var outPath = binGenPath
     StringBuilder shCode = new StringBuilder();
     StringBuilder distCode = new StringBuilder();
-    shCode.append(getSetupCode() + "\n");
+    shCode.append(getSetupCode()).append("\n");
     String distHeader = getDistHeader();
     String host = rtiConfig.getHost();
     String target = host;
@@ -120,18 +120,18 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
       target = user + "@" + host;
     }
 
-    shCode.append("#### Host is " + host);
+    shCode.append("#### Host is ").append(host);
 
     // Launch the RTI in the foreground.
     if (host.equals("localhost") || host.equals("0.0.0.0")) {
       // FIXME: the paths below will not work on Windows
-      shCode.append(getLaunchCode(getRtiCommand(federates, false)) + "\n");
+      shCode.append(getLaunchCode(getRtiCommand(federates, false))).append("\n");
     } else {
       // Start the RTI on the remote machine.
       // FIXME: Should $FEDERATION_ID be used to ensure unique directories, executables, on the
       // remote host?
       // Copy the source code onto the remote machine and compile it there.
-      if (distCode.length() == 0) distCode.append(distHeader + "\n");
+      if (distCode.length() == 0) distCode.append(distHeader).append("\n");
 
       String logFileName = String.format("log/%s_RTI.log", fileConfig.name);
 
@@ -149,8 +149,7 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
       // The sleep at the end prevents screen from exiting before outgoing messages from
       // the federate have had time to go out to the RTI through the socket.
 
-      shCode.append(
-          getRemoteLaunchCode(host, target, logFileName, getRtiCommand(federates, true)) + "\n");
+      shCode.append(getRemoteLaunchCode(host, target, logFileName, getRtiCommand(federates, true))).append("\n");
     }
 
     // Index used for storing pids of federates
@@ -160,32 +159,28 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
       if (federate.isRemote) {
         Path fedRelSrcGenPath =
             fileConfig.getOutPath().relativize(fileConfig.getSrcGenPath()).resolve(federate.name);
-        if (distCode.length() == 0) distCode.append(distHeader + "\n");
+        if (distCode.length() == 0) distCode.append(distHeader).append("\n");
         String logFileName = String.format("log/%s_%s.log", fileConfig.name, federate.name);
         String compileCommand = buildConfig.compileCommand();
         // FIXME: Should $FEDERATION_ID be used to ensure unique directories, executables, on the
         // remote host?
-        distCode.append(
-            getDistCode(
-                    rtiConfig.getDirectory(),
-                    federate,
-                    fedRelSrcGenPath,
-                    logFileName,
-                    fileConfig.getSrcGenPath(),
-                    compileCommand)
-                + "\n");
+        distCode.append(getDistCode(
+                rtiConfig.getDirectory(),
+                federate,
+                fedRelSrcGenPath,
+                logFileName,
+                fileConfig.getSrcGenPath(),
+                compileCommand)).append("\n");
         String executeCommand = buildConfig.remoteExecuteCommand();
-        shCode.append(
-            getFedRemoteLaunchCode(
-                    federate,
-                    rtiConfig.getDirectory(),
-                    logFileName,
-                    executeCommand,
-                    federateIndex++)
-                + "\n");
+        shCode.append(getFedRemoteLaunchCode(
+                federate,
+                rtiConfig.getDirectory(),
+                logFileName,
+                executeCommand,
+                federateIndex++)).append("\n");
       } else {
         String executeCommand = buildConfig.localExecuteCommand();
-        shCode.append(getFedLocalLaunchCode(federate, executeCommand, federateIndex++) + "\n");
+        shCode.append(getFedLocalLaunchCode(federate, executeCommand, federateIndex++)).append("\n");
       }
     }
     if (host.equals("localhost") || host.equals("0.0.0.0")) {
@@ -195,19 +190,17 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
       shCode.append("fg %1" + "\n");
     }
     // Wait for launched processes to finish
-    shCode.append(
-        String.join(
-                "\n",
-                "echo \"RTI has exited. Wait for federates to exit.\"",
-                "# Wait for launched processes to finish.",
-                "# The errors are handled separately via trap.",
-                "for pid in \"${pids[@]}\"",
-                "do",
-                "    wait $pid || exit $?",
-                "done",
-                "echo \"All done.\"",
-                "EXITED_SUCCESSFULLY=true")
-            + "\n");
+    shCode.append(String.join(
+            "\n",
+            "echo \"RTI has exited. Wait for federates to exit.\"",
+            "# Wait for launched processes to finish.",
+            "# The errors are handled separately via trap.",
+            "for pid in \"${pids[@]}\"",
+            "do",
+            "    wait $pid || exit $?",
+            "done",
+            "echo \"All done.\"",
+            "EXITED_SUCCESSFULLY=true")).append("\n");
 
     // Create bin directory for the script.
     if (!Files.exists(fileConfig.binPath)) {
@@ -225,7 +218,7 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
     // Delete file previously produced, if any.
     File file = fileConfig.binPath.resolve(fileConfig.name).toFile();
     if (file.exists()) {
-      file.delete();
+      if (!file.delete()) errorReporter.reportError("Failed to delete existing federated launch script \"" + file + "\"");
     }
 
     FileOutputStream fOut = null;
@@ -234,11 +227,13 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
     } catch (FileNotFoundException e) {
       errorReporter.reportError("Unable to find file: " + file);
     }
-    try {
-      fOut.write(shCode.toString().getBytes());
-      fOut.close();
-    } catch (IOException e) {
-      errorReporter.reportError("Unable to write to file: " + file);
+    if (fOut != null) {
+      try {
+        fOut.write(shCode.toString().getBytes());
+        fOut.close();
+      } catch (IOException e) {
+        errorReporter.reportError("Unable to write to file: " + file);
+      }
     }
 
     if (!file.setExecutable(true, false)) {
@@ -249,7 +244,7 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
     // Delete the file even if it does not get generated.
     file = fileConfig.binPath.resolve(fileConfig.name + "_distribute.sh").toFile();
     if (file.exists()) {
-      file.delete();
+      if (!file.delete()) errorReporter.reportError("Failed to delete existing federated distributor script \"" + file + "\"");
     }
     if (distCode.length() > 0) {
       try {
@@ -498,8 +493,7 @@ private String getFedLocalLaunchCode(
    *
    * @param federate The federate to which the build configuration applies.
    * @param fileConfig The file configuration of the federation to which the federate belongs.
-   * @param errorReporter An error reporter to report problems.
-   * @return
+   * @param errorReporter An error reporter to report problems
    */
   private BuildConfig getBuildConfig(
       FederateInstance federate, FedFileConfig fileConfig, ErrorReporter errorReporter) {
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java
index 3947b1bd92..3f34673900 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java
@@ -64,10 +64,11 @@ public StringBuilder generateNetworkSerializerCode(String varName, String origin
         "if (global_pickler == NULL) lf_print_error_and_exit(\"The pickle module is not"
             + " loaded.\");\n");
     // Define the serialized PyObject
-    serializerCode.append(
-        "PyObject* serialized_pyobject = PyObject_CallMethod(global_pickler, \"dumps\", \"O\", "
-            + varName
-            + ");\n");
+    serializerCode
+        .append(
+            "PyObject* serialized_pyobject = PyObject_CallMethod(global_pickler, \"dumps\", \"O\", ")
+        .append(varName)
+        .append(");\n");
 
     // Error check
     serializerCode.append("if (serialized_pyobject == NULL) {\n");
@@ -98,13 +99,12 @@ public StringBuilder generateNetworkDeserializerCode(String varName, String targ
     StringBuilder deserializerCode = new StringBuilder();
 
     // Convert the network message to a Python ByteArray
-    deserializerCode.append(
-        "PyObject* message_byte_array = "
-            + "PyBytes_FromStringAndSize((char*)"
-            + varName
-            + "->token->value, "
-            + varName
-            + "->token->length);\n");
+    deserializerCode
+        .append("PyObject* message_byte_array = " + "PyBytes_FromStringAndSize((char*)")
+        .append(varName)
+        .append("->token->value, ")
+        .append(varName)
+        .append("->token->length);\n");
     // Deserialize using Pickle
     deserializerCode.append("Py_XINCREF(message_byte_array);\n");
     deserializerCode.append(
@@ -118,7 +118,7 @@ public StringBuilder generateNetworkDeserializerCode(String varName, String targ
         "    lf_print_error_and_exit(\"Could not deserialize " + deserializedVarName + ".\");\n");
     deserializerCode.append("}\n");
 
-    // Decrment the reference count
+    // Decrement the reference count
     deserializerCode.append("Py_XDECREF(message_byte_array);\n");
 
     return deserializerCode;
@@ -126,11 +126,11 @@ public StringBuilder generateNetworkDeserializerCode(String varName, String targ
 
   @Override
   public StringBuilder generatePreambleForSupport() {
-    return new StringBuilder("");
+    return new StringBuilder();
   }
 
   @Override
   public StringBuilder generateCompilerExtensionForSupport() {
-    return new StringBuilder("");
+    return new StringBuilder();
   }
 }
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
index 1384d11517..4bec959a70 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
@@ -90,14 +90,14 @@ public StringBuilder generateNetworkSerializerCode(String varName, String origin
     serializerCode.append("rclcpp::SerializedMessage " + serializedVarName + "(0u);\n");
     // Use the port type verbatim here, which can result
     // in compile error if it is not a valid ROS type
-    serializerCode.append("using MessageT = " + originalType + ";\n");
+    serializerCode.append("using MessageT = ").append(originalType).append(";\n");
     serializerCode.append("static rclcpp::Serialization<MessageT> _lf_serializer;\n");
-    serializerCode.append(
-        "_lf_serializer.serialize_message(&"
-            + varName
-            + "->value , &"
-            + serializedVarName
-            + ");\n");
+    serializerCode
+        .append("_lf_serializer.serialize_message(&")
+        .append(varName)
+        .append("->value , &")
+        .append(serializedVarName)
+        .append(");\n");
 
     return serializerCode;
   }
@@ -115,22 +115,22 @@ public StringBuilder generateNetworkSerializerCode(
     serializerCode.append("rclcpp::SerializedMessage " + serializedVarName + "(0u);\n");
     // Use the port type verbatim here, which can result
     // in compile error if it is not a valid ROS type
-    serializerCode.append("using MessageT = " + originalType + ";\n");
+    serializerCode.append("using MessageT = ").append(originalType).append(";\n");
     serializerCode.append("static rclcpp::Serialization<MessageT> _lf_serializer;\n");
     if (isSharedPtrType) {
-      serializerCode.append(
-          "_lf_serializer.serialize_message("
-              + varName
-              + "->value.get() , &"
-              + serializedVarName
-              + ");\n");
+      serializerCode
+          .append("_lf_serializer.serialize_message(")
+          .append(varName)
+          .append("->value.get() , &")
+          .append(serializedVarName)
+          .append(");\n");
     } else {
-      serializerCode.append(
-          "_lf_serializer.serialize_message(&"
-              + varName
-              + "->value , &"
-              + serializedVarName
-              + ");\n");
+      serializerCode
+          .append("_lf_serializer.serialize_message(&")
+          .append(varName)
+          .append("->value , &")
+          .append(serializedVarName)
+          .append(");\n");
     }
 
     return serializerCode;
@@ -149,25 +149,28 @@ public StringBuilder generateNetworkSerializerCode(
   public StringBuilder generateNetworkDeserializerCode(String varName, String targetType) {
     StringBuilder deserializerCode = new StringBuilder();
 
-    deserializerCode.append(
-        "auto message = std::make_unique<rcl_serialized_message_t>( rcl_serialized_message_t{\n"
-            + "    .buffer = (uint8_t*)"
-            + varName
-            + ".tmplt.token->value,\n"
-            + "    .buffer_length = "
-            + varName
-            + ".tmplt.token->length,\n"
-            + "    .buffer_capacity = "
-            + varName
-            + ".tmplt.token->length,\n"
-            + "    .allocator = rcl_get_default_allocator()\n"
-            + "});\n");
+    deserializerCode
+        .append(
+            "auto message = std::make_unique<rcl_serialized_message_t>( rcl_serialized_message_t{\n"
+                + "    .buffer = (uint8_t*)")
+        .append(varName)
+        .append(".tmplt.token->value,\n")
+        .append("    .buffer_length = ")
+        .append(varName)
+        .append(".tmplt.token->length,\n")
+        .append("    .buffer_capacity = ")
+        .append(varName)
+        .append(".tmplt.token->length,\n")
+        .append("    .allocator = rcl_get_default_allocator()\n")
+        .append("});\n");
     deserializerCode.append(
         "auto msg = std::make_unique<rclcpp::SerializedMessage>(std::move(*message.get()));\n");
-    deserializerCode.append(varName + ".tmplt.token->value = NULL; // Manually move the data\n");
+    deserializerCode
+        .append(varName)
+        .append(".tmplt.token->value = NULL; // Manually move the data\n");
     // Use the port type verbatim here, which can result
     // in compile error if it is not a valid ROS type
-    deserializerCode.append("using MessageT = " + targetType + ";\n");
+    deserializerCode.append("using MessageT = ").append(targetType).append(";\n");
     deserializerCode.append(
         "MessageT "
             + deserializedVarName
@@ -189,10 +192,12 @@ public StringBuilder generatePreambleForSupport() {
     StringBuilder preamble = new StringBuilder();
 
     preamble.append(
-        "#include \"rcutils/allocator.h\"\n"
-            + "#include \"rclcpp/rclcpp.hpp\"\n"
-            + "#include \"rclcpp/serialization.hpp\"\n"
-            + "#include \"rclcpp/serialized_message.hpp\"\n");
+        """
+                    #include "rcutils/allocator.h"
+                    #include "rclcpp/rclcpp.hpp"
+                    #include "rclcpp/serialization.hpp"
+                    #include "rclcpp/serialized_message.hpp"
+                    """);
 
     return preamble;
   }
@@ -206,16 +211,17 @@ public StringBuilder generateCompilerExtensionForSupport() {
     StringBuilder cMakeExtension = new StringBuilder();
 
     cMakeExtension.append(
-        "enable_language(CXX)\n"
-            + "set(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -Wno-write-strings -O2\")\n"
-            + "\n"
-            + "find_package(ament_cmake REQUIRED)\n"
-            + "find_package(rclcpp REQUIRED)\n"
-            + "find_package(rclcpp_components REQUIRED)\n"
-            + "find_package(rcutils)\n"
-            + "find_package(rmw REQUIRED)\n"
-            + "\n"
-            + "ament_target_dependencies( ${LF_MAIN_TARGET} rclcpp rmw)");
+        """
+                    enable_language(CXX)
+                    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings -O2")
+
+                    find_package(ament_cmake REQUIRED)
+                    find_package(rclcpp REQUIRED)
+                    find_package(rclcpp_components REQUIRED)
+                    find_package(rcutils)
+                    find_package(rmw REQUIRED)
+
+                    ament_target_dependencies( ${LF_MAIN_TARGET} rclcpp rmw)""");
 
     return cMakeExtension;
   }

From a96f44b78d663bce815910dfc8bb9d6bab951b72 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 8 Jul 2023 17:12:02 -0700
Subject: [PATCH 0602/1114] determine reporting based on `github.repository`
 instead of `inputs.compiler-ref`

---
 .github/workflows/c-arduino-tests.yml | 3 ++-
 .github/workflows/c-tests.yml         | 2 +-
 .github/workflows/c-zephyr-tests.yml  | 2 +-
 .github/workflows/cpp-ros2-tests.yml  | 2 +-
 .github/workflows/cpp-tests.yml       | 2 +-
 .github/workflows/lsp-tests.yml       | 1 +
 .github/workflows/py-tests.yml        | 2 +-
 .github/workflows/rs-tests.yml        | 2 +-
 8 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/c-arduino-tests.yml b/.github/workflows/c-arduino-tests.yml
index d8fc2afdd5..5dcc223fd5 100644
--- a/.github/workflows/c-arduino-tests.yml
+++ b/.github/workflows/c-arduino-tests.yml
@@ -66,6 +66,7 @@ jobs:
         run: ./gradlew targetTest -Ptarget=CArduino
       - name: Report to CodeCov
         uses: ./.github/actions/report-code-coverage
+
         with:
           files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-        if: ${{ !inputs.compiler-ref }}  # i.e., if this is part of the main repo's CI
+        if: ${{ github.repository == 'lf-lang/lingua-franca' }}
diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml
index df0b42a57b..60acaec10a 100644
--- a/.github/workflows/c-tests.yml
+++ b/.github/workflows/c-tests.yml
@@ -68,4 +68,4 @@ jobs:
         uses: ./.github/actions/report-code-coverage
         with:
           files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-        if: ${{ !inputs.compiler-ref }}  # i.e., if this is part of the main repo's CI
+        if: ${{ github.repository == 'lf-lang/lingua-franca' }}
diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index 5d393a0c41..0375c408a8 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -58,4 +58,4 @@ jobs:
         uses: ./.github/actions/report-code-coverage
         with:
           files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-        if: ${{ !inputs.compiler-ref }}  # i.e., if this is part of the main repo's CI
+        if: ${{ github.repository == 'lf-lang/lingua-franca' }}
diff --git a/.github/workflows/cpp-ros2-tests.yml b/.github/workflows/cpp-ros2-tests.yml
index 7860f1eed6..a3a2e2c9aa 100644
--- a/.github/workflows/cpp-ros2-tests.yml
+++ b/.github/workflows/cpp-ros2-tests.yml
@@ -40,4 +40,4 @@ jobs:
         uses: ./.github/actions/report-code-coverage
         with:
           files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-        if: ${{ !inputs.compiler-ref }}  # i.e., if this is part of the main repo's CI
+        if: ${{ github.repository == 'lf-lang/lingua-franca' }}
diff --git a/.github/workflows/cpp-tests.yml b/.github/workflows/cpp-tests.yml
index 1a4b903ea7..37b6f1785a 100644
--- a/.github/workflows/cpp-tests.yml
+++ b/.github/workflows/cpp-tests.yml
@@ -70,4 +70,4 @@ jobs:
         uses: ./.github/actions/report-code-coverage
         with:
           files: reactor-cpp.info
-        if: ${{ !inputs.compiler-ref && matrix.platform == 'ubuntu-latest' }}  # i.e., if this is part of the main repo's CI
+        if: ${{ github.repository == 'lf-lang/lingua-franca' && matrix.platform == 'ubuntu-latest' }}
diff --git a/.github/workflows/lsp-tests.yml b/.github/workflows/lsp-tests.yml
index 75c2fedb7d..5acd262925 100644
--- a/.github/workflows/lsp-tests.yml
+++ b/.github/workflows/lsp-tests.yml
@@ -82,3 +82,4 @@ jobs:
         uses: ./.github/actions/report-code-coverage
         with:
           files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+        if: ${{ github.repository == 'lf-lang/lingua-franca' }}
diff --git a/.github/workflows/py-tests.yml b/.github/workflows/py-tests.yml
index f238b73887..191e2e1929 100644
--- a/.github/workflows/py-tests.yml
+++ b/.github/workflows/py-tests.yml
@@ -68,4 +68,4 @@ jobs:
         uses: ./.github/actions/report-code-coverage
         with:
           files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-        if: ${{ !inputs.compiler-ref }}  # i.e., if this is part of the main repo's CI
+        if: ${{ github.repository == 'lf-lang/lingua-franca' }}
diff --git a/.github/workflows/rs-tests.yml b/.github/workflows/rs-tests.yml
index 7be1a4aad2..dbb47a37d1 100644
--- a/.github/workflows/rs-tests.yml
+++ b/.github/workflows/rs-tests.yml
@@ -69,4 +69,4 @@ jobs:
         uses: ./.github/actions/report-code-coverage
         with:
           files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-        if: ${{ !inputs.compiler-ref }}  # i.e., if this is part of the main repo's CI
+        if: ${{ github.repository == 'lf-lang/lingua-franca' }}

From dd9b40ed5b68a9b7f663e9143b2d6ab8f9e4bb12 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 11 Jul 2023 10:07:42 +0200
Subject: [PATCH 0603/1114] replace the wretry action by replicating steps

---
 .../actions/report-code-coverage/action.yml   | 45 ++++++++++++++-----
 .github/workflows/c-arduino-tests.yml         |  1 -
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/.github/actions/report-code-coverage/action.yml b/.github/actions/report-code-coverage/action.yml
index 548fcbf771..02fdf44c91 100644
--- a/.github/actions/report-code-coverage/action.yml
+++ b/.github/actions/report-code-coverage/action.yml
@@ -6,14 +6,39 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Report code coverage to CodeCov
-      uses: Wandalen/wretry.action@v1.3.0
+    - name: Report code coverage to CodeCov (1st try)
+      id: codecov1
+      uses: codecov/codecov-action@v3.1.4
       with:
-        attempt_limit: 5
-        attempt_delay: 20000
-        action: codecov/codecov-action@v3.1.4
-        with: |
-          files: ${{ inputs.files }}
-          fail_ci_if_error: true
-          verbose: true
-          token: 18fd5ab8-d6ba-4f5d-b0f4-7c26340ab98c
+        files: ${{ inputs.files }}
+        fail_ci_if_error: true
+        verbose: true
+        token: 18fd5ab8-d6ba-4f5d-b0f4-7c26340ab98c
+      continue-on-error: true
+    - name: Wait 20 seconds
+      run: sleep 20
+      shell: bash
+      if: steps.codecov1.outcome == 'failure'
+    - name: Report code coverage to CodeCov (2nd try)
+      id: codecov2
+      uses: codecov/codecov-action@v3.1.4
+      with:
+        files: ${{ inputs.files }}
+        fail_ci_if_error: true
+        verbose: true
+        token: 18fd5ab8-d6ba-4f5d-b0f4-7c26340ab98c
+      continue-on-error: true
+      if: steps.codecov1.outcome == 'failure'
+    - name: Wait 20 seconds
+      run: sleep 20
+      shell: bash
+      if: steps.codecov2.outcome == 'failure'
+    - name: Report code coverage to CodeCov (3rd try)
+      id: codecov3
+      uses: codecov/codecov-action@v3.1.4
+      with:
+        files: ${{ inputs.files }}
+        fail_ci_if_error: true
+        verbose: true
+        token: 18fd5ab8-d6ba-4f5d-b0f4-7c26340ab98c
+      if: steps.codecov2.outcome == 'failure'
diff --git a/.github/workflows/c-arduino-tests.yml b/.github/workflows/c-arduino-tests.yml
index 5dcc223fd5..1edda056e4 100644
--- a/.github/workflows/c-arduino-tests.yml
+++ b/.github/workflows/c-arduino-tests.yml
@@ -66,7 +66,6 @@ jobs:
         run: ./gradlew targetTest -Ptarget=CArduino
       - name: Report to CodeCov
         uses: ./.github/actions/report-code-coverage
-
         with:
           files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
         if: ${{ github.repository == 'lf-lang/lingua-franca' }}

From 4c9b4b8883357246f971612da19cffcaf6e1338c Mon Sep 17 00:00:00 2001
From: Christian Menard <Christian.Menard@tu-dresden.de>
Date: Tue, 11 Jul 2023 15:27:57 +0200
Subject: [PATCH 0604/1114] Update check that was missed

---
 .github/workflows/cpp-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cpp-tests.yml b/.github/workflows/cpp-tests.yml
index 37b6f1785a..99037863f7 100644
--- a/.github/workflows/cpp-tests.yml
+++ b/.github/workflows/cpp-tests.yml
@@ -53,7 +53,7 @@ jobs:
         uses: ./.github/actions/report-code-coverage
         with:
           files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-        if: ${{ runner.os == 'Linux' }}
+        if: ${{ github.repository == 'lf-lang/lingua-franca' }}
       - name: Collect reactor-cpp coverage data
         run: |
           lcov --capture --directory test/Cpp --output-file coverage.info

From 0ebaf08de9d2adcffaca4aa78b88c6946a513918 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Tue, 11 Jul 2023 11:21:35 -0400
Subject: [PATCH 0605/1114] Do not include set.h except in the context of a
 reaction

---
 core/src/main/java/org/lflang/generator/c/CGenerator.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index c493744a4c..e3955d63df 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -986,7 +986,6 @@ protected void generateReactorClassHeaders(
     }
     header.pr("#include \"include/core/reactor.h\"");
     src.pr("#include \"include/api/api.h\"");
-    src.pr("#include \"include/api/set.h\"");
     generateIncludes(tpr);
     if (CCppMode) {
       src.pr("}");

From af16ebabc534d44f6f2aca9d35032ddbc92a3404 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Tue, 11 Jul 2023 11:22:12 -0400
Subject: [PATCH 0606/1114] Do not include set.h except in the context of a
 reaction

---
 .../java/org/lflang/generator/c/CReactorHeaderFileGenerator.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java
index 5deaa5fb7b..ced74cb160 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java
@@ -81,7 +81,6 @@ private static void appendPoundIncludes(CodeBuilder builder) {
             extern "C" {
             #endif
             #include "../include/api/api.h"
-            #include "../include/api/set.h"
             #include "../include/core/reactor.h"
             #ifdef __cplusplus
             }

From 95c266403338bbb536bedbbede43c1b5c602e7e1 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Tue, 11 Jul 2023 11:22:36 -0400
Subject: [PATCH 0607/1114] Align to enclave-fixes branch of reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 0b76e73f36..ef3f708375 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 0b76e73f36afbb3fe0a0586d43506b027cdaeeeb
+Subproject commit ef3f708375d842dae6497e873b09e1ae6371bf65

From 34325ec6297986a393bfad0cec9b3b156fecc067 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Tue, 11 Jul 2023 14:14:31 -0400
Subject: [PATCH 0608/1114] Align to updated reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index ef3f708375..78767eb842 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit ef3f708375d842dae6497e873b09e1ae6371bf65
+Subproject commit 78767eb8421fba0a858ff6d7bf435c58a459ff62

From e6f81b4355c71df4b7a01cf532cf0c2fe7aafade Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Tue, 11 Jul 2023 11:26:58 -0700
Subject: [PATCH 0609/1114] change to rp2040 target

---
 core/src/main/java/org/lflang/TargetProperty.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 17d29410a6..3c43ac4665 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -1726,10 +1726,10 @@ public enum Platform {
     AUTO,
     ARDUINO,
     NRF52("Nrf52"),
+    RP2040("Rp2040"),
     LINUX("Linux"),
     MAC("Darwin"),
     ZEPHYR("Zephyr"),
-    PICO("Pico"),
     WINDOWS("Windows");
 
     String cMakeName;

From 46087251b5883370d929ce79dc0f31047bf52356 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 11 Jul 2023 11:29:08 -0700
Subject: [PATCH 0610/1114] Reduce name collisions in fed-gen reaction bodies.

Also format.
---
 .../federated/extensions/CExtension.java      | 10 +--
 .../extensions/FedTargetExtension.java        |  1 -
 .../federated/extensions/PythonExtension.java | 12 ++-
 .../federated/extensions/TSExtension.java     |  1 -
 .../federated/generator/FedASTUtils.java      |  5 +-
 .../launcher/FedLauncherGenerator.java        | 73 ++++++++++++-------
 .../FedNativePythonSerialization.java         |  3 +-
 .../FedROS2CPPSerialization.java              |  8 +-
 8 files changed, 68 insertions(+), 45 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 57872c13a0..94f09792b1 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -296,7 +296,7 @@ public String generateNetworkSenderBody(
             receivingPortID + "",
             connection.getDstFederate().id + "",
             next_destination_name,
-            "message_length");
+            "_lf_message_length");
     if (connection.getDefinition().isPhysical()) {
       // Messages going on a physical connection do not
       // carry a timestamp or require the delay;
@@ -309,7 +309,7 @@ public String generateNetworkSenderBody(
               + connection.getDstFederate().id
               + ", "
               + next_destination_name
-              + ", message_length";
+              + ", _lf_message_length";
     }
 
     serializeAndSend(connection, type, sendRef, result, sendingFunction, commonArgs, errorReporter);
@@ -347,7 +347,7 @@ protected void serializeAndSend(
           // both have the same endianness. Otherwise, you have to use protobufs or some other
           // serialization scheme.
           result.pr(
-              "size_t message_length = "
+              "size_t _lf_message_length = "
                   + sendRef
                   + "->token->length * "
                   + sendRef
@@ -367,7 +367,7 @@ protected void serializeAndSend(
           } else if (targetType.equals("void")) {
             lengthExpression = "0";
           }
-          result.pr("size_t message_length = " + lengthExpression + ";");
+          result.pr("size_t _lf_message_length = " + lengthExpression + ";");
           result.pr(sendingFunction + "(" + commonArgs + ", " + pointerExpression + ");");
         }
       }
@@ -390,7 +390,7 @@ protected void serializeAndSend(
         result.pr(
             ROSSerializer.generateNetworkSerializerCode(
                 sendRef, typeStr, CExtensionUtils.isSharedPtrType(type, types)));
-        result.pr("size_t message_length = " + lengthExpression + ";");
+        result.pr("size_t _lf_message_length = " + lengthExpression + ";");
         result.pr(sendingFunction + "(" + commonArgs + ", " + pointerExpression + ");");
       }
     }
diff --git a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
index 8957dfe0f4..8cbaf4e0f5 100644
--- a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
@@ -4,7 +4,6 @@
 import org.lflang.ErrorReporter;
 import org.lflang.InferredType;
 import org.lflang.TargetProperty.CoordinationType;
-import org.lflang.TimeValue;
 import org.lflang.federated.generator.FedConnectionInstance;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
diff --git a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
index b119716c8d..0706dc78c9 100644
--- a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
@@ -128,8 +128,10 @@ protected void deserialize(
         result.pr(pickler.generateNetworkDeserializerCode(value, null));
         result.pr("lf_set(" + receiveRef + ", " + FedSerialization.deserializedVarName + ");\n");
       }
-      case PROTO -> throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
-      case ROS2 -> throw new UnsupportedOperationException("ROS2 serialization is not supported yet.");
+      case PROTO -> throw new UnsupportedOperationException(
+          "Protobuf serialization is not supported yet.");
+      case ROS2 -> throw new UnsupportedOperationException(
+          "ROS2 serialization is not supported yet.");
     }
   }
 
@@ -154,8 +156,10 @@ protected void serializeAndSend(
         result.pr("size_t message_length = " + lengthExpression + ";");
         result.pr(sendingFunction + "(" + commonArgs + ", " + pointerExpression + ");\n");
       }
-      case PROTO -> throw new UnsupportedOperationException("Protobuf serialization is not supported yet.");
-      case ROS2 -> throw new UnsupportedOperationException("ROS2 serialization is not supported yet.");
+      case PROTO -> throw new UnsupportedOperationException(
+          "Protobuf serialization is not supported yet.");
+      case ROS2 -> throw new UnsupportedOperationException(
+          "ROS2 serialization is not supported yet.");
     }
   }
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 396c83863d..f59f986f14 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -2,7 +2,6 @@
 
 import static org.lflang.util.StringUtil.addDoubleQuotes;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 099d770fb1..10e5152387 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -261,7 +261,8 @@ private static void addNetworkReceiverReactor(
 
     // Keep track of this action in the destination federate.
     connection.dstFederate.networkMessageActions.add(networkAction);
-    if (connection.getDefinition().getDelay() == null) connection.dstFederate.zeroDelayNetworkMessageActions.add(networkAction);
+    if (connection.getDefinition().getDelay() == null)
+      connection.dstFederate.zeroDelayNetworkMessageActions.add(networkAction);
 
     TimeValue maxSTP = findMaxSTP(connection, coordination);
 
@@ -704,7 +705,7 @@ private static Reaction getInitializationReaction() {
     initializationReaction.getTriggers().add(startup);
     var code = LfFactory.eINSTANCE.createCode();
     code.setBody(
-            """
+        """
             extern reaction_t* port_absent_reaction[];
             void enqueue_network_output_control_reactions();
             LF_PRINT_DEBUG("Adding network output control reaction to table.");
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index ba5b4479c7..2f56257255 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -149,7 +149,9 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
       // The sleep at the end prevents screen from exiting before outgoing messages from
       // the federate have had time to go out to the RTI through the socket.
 
-      shCode.append(getRemoteLaunchCode(host, target, logFileName, getRtiCommand(federates, true))).append("\n");
+      shCode
+          .append(getRemoteLaunchCode(host, target, logFileName, getRtiCommand(federates, true)))
+          .append("\n");
     }
 
     // Index used for storing pids of federates
@@ -164,23 +166,31 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
         String compileCommand = buildConfig.compileCommand();
         // FIXME: Should $FEDERATION_ID be used to ensure unique directories, executables, on the
         // remote host?
-        distCode.append(getDistCode(
-                rtiConfig.getDirectory(),
-                federate,
-                fedRelSrcGenPath,
-                logFileName,
-                fileConfig.getSrcGenPath(),
-                compileCommand)).append("\n");
+        distCode
+            .append(
+                getDistCode(
+                    rtiConfig.getDirectory(),
+                    federate,
+                    fedRelSrcGenPath,
+                    logFileName,
+                    fileConfig.getSrcGenPath(),
+                    compileCommand))
+            .append("\n");
         String executeCommand = buildConfig.remoteExecuteCommand();
-        shCode.append(getFedRemoteLaunchCode(
-                federate,
-                rtiConfig.getDirectory(),
-                logFileName,
-                executeCommand,
-                federateIndex++)).append("\n");
+        shCode
+            .append(
+                getFedRemoteLaunchCode(
+                    federate,
+                    rtiConfig.getDirectory(),
+                    logFileName,
+                    executeCommand,
+                    federateIndex++))
+            .append("\n");
       } else {
         String executeCommand = buildConfig.localExecuteCommand();
-        shCode.append(getFedLocalLaunchCode(federate, executeCommand, federateIndex++)).append("\n");
+        shCode
+            .append(getFedLocalLaunchCode(federate, executeCommand, federateIndex++))
+            .append("\n");
       }
     }
     if (host.equals("localhost") || host.equals("0.0.0.0")) {
@@ -190,17 +200,20 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
       shCode.append("fg %1" + "\n");
     }
     // Wait for launched processes to finish
-    shCode.append(String.join(
-            "\n",
-            "echo \"RTI has exited. Wait for federates to exit.\"",
-            "# Wait for launched processes to finish.",
-            "# The errors are handled separately via trap.",
-            "for pid in \"${pids[@]}\"",
-            "do",
-            "    wait $pid || exit $?",
-            "done",
-            "echo \"All done.\"",
-            "EXITED_SUCCESSFULLY=true")).append("\n");
+    shCode
+        .append(
+            String.join(
+                "\n",
+                "echo \"RTI has exited. Wait for federates to exit.\"",
+                "# Wait for launched processes to finish.",
+                "# The errors are handled separately via trap.",
+                "for pid in \"${pids[@]}\"",
+                "do",
+                "    wait $pid || exit $?",
+                "done",
+                "echo \"All done.\"",
+                "EXITED_SUCCESSFULLY=true"))
+        .append("\n");
 
     // Create bin directory for the script.
     if (!Files.exists(fileConfig.binPath)) {
@@ -218,7 +231,9 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
     // Delete file previously produced, if any.
     File file = fileConfig.binPath.resolve(fileConfig.name).toFile();
     if (file.exists()) {
-      if (!file.delete()) errorReporter.reportError("Failed to delete existing federated launch script \"" + file + "\"");
+      if (!file.delete())
+        errorReporter.reportError(
+            "Failed to delete existing federated launch script \"" + file + "\"");
     }
 
     FileOutputStream fOut = null;
@@ -244,7 +259,9 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
     // Delete the file even if it does not get generated.
     file = fileConfig.binPath.resolve(fileConfig.name + "_distribute.sh").toFile();
     if (file.exists()) {
-      if (!file.delete()) errorReporter.reportError("Failed to delete existing federated distributor script \"" + file + "\"");
+      if (!file.delete())
+        errorReporter.reportError(
+            "Failed to delete existing federated distributor script \"" + file + "\"");
     }
     if (distCode.length() > 0) {
       try {
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java
index 3f34673900..98f78d9115 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java
@@ -66,7 +66,8 @@ public StringBuilder generateNetworkSerializerCode(String varName, String origin
     // Define the serialized PyObject
     serializerCode
         .append(
-            "PyObject* serialized_pyobject = PyObject_CallMethod(global_pickler, \"dumps\", \"O\", ")
+            "PyObject* serialized_pyobject = PyObject_CallMethod(global_pickler, \"dumps\", \"O\","
+                + " ")
         .append(varName)
         .append(");\n");
 
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
index 4bec959a70..44d2616a1b 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
@@ -151,7 +151,8 @@ public StringBuilder generateNetworkDeserializerCode(String varName, String targ
 
     deserializerCode
         .append(
-            "auto message = std::make_unique<rcl_serialized_message_t>( rcl_serialized_message_t{\n"
+            "auto _lf_message = std::make_unique<rcl_serialized_message_t>("
+                + " rcl_serialized_message_t{\n"
                 + "    .buffer = (uint8_t*)")
         .append(varName)
         .append(".tmplt.token->value,\n")
@@ -164,7 +165,8 @@ public StringBuilder generateNetworkDeserializerCode(String varName, String targ
         .append("    .allocator = rcl_get_default_allocator()\n")
         .append("});\n");
     deserializerCode.append(
-        "auto msg = std::make_unique<rclcpp::SerializedMessage>(std::move(*message.get()));\n");
+        "auto _lf_msg ="
+            + " std::make_unique<rclcpp::SerializedMessage>(std::move(*_lf_message.get()));\n");
     deserializerCode
         .append(varName)
         .append(".tmplt.token->value = NULL; // Manually move the data\n");
@@ -176,7 +178,7 @@ public StringBuilder generateNetworkDeserializerCode(String varName, String targ
             + deserializedVarName
             + " = MessageT();\n"
             + "auto _lf_serializer = rclcpp::Serialization<MessageT>();\n"
-            + "_lf_serializer.deserialize_message(msg.get(), &"
+            + "_lf_serializer.deserialize_message(_lf_msg.get(), &"
             + deserializedVarName
             + ");\n");
 

From 80edc9219152eef9e6afdf565af8a2e4da5256fc Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Tue, 11 Jul 2023 12:07:11 -0700
Subject: [PATCH 0611/1114] remove resources and refactor

---
 .../pico/pico_extras_import_optional.cmake    |  59 --
 .../resources/lib/platform/pico/pico_setup.sh | 549 ------------------
 .../lib/platform/{pico => rp2040}/launch.json |   0
 .../{pico => rp2040}/pico_sdk_import.cmake    |   0
 4 files changed, 608 deletions(-)
 delete mode 100644 core/src/main/resources/lib/platform/pico/pico_extras_import_optional.cmake
 delete mode 100755 core/src/main/resources/lib/platform/pico/pico_setup.sh
 rename core/src/main/resources/lib/platform/{pico => rp2040}/launch.json (100%)
 rename core/src/main/resources/lib/platform/{pico => rp2040}/pico_sdk_import.cmake (100%)

diff --git a/core/src/main/resources/lib/platform/pico/pico_extras_import_optional.cmake b/core/src/main/resources/lib/platform/pico/pico_extras_import_optional.cmake
deleted file mode 100644
index 692e14ad9d..0000000000
--- a/core/src/main/resources/lib/platform/pico/pico_extras_import_optional.cmake
+++ /dev/null
@@ -1,59 +0,0 @@
-# This is a copy of <PICO_EXTRAS_PATH>/external/pico_extras_import.cmake
-
-# This can be dropped into an external project to help locate pico-extras
-# It should be include()ed prior to project()
-
-if (DEFINED ENV{PICO_EXTRAS_PATH} AND (NOT PICO_EXTRAS_PATH))
-    set(PICO_EXTRAS_PATH $ENV{PICO_EXTRAS_PATH})
-    message("Using PICO_EXTRAS_PATH from environment ('${PICO_EXTRAS_PATH}')")
-endif ()
-
-if (DEFINED ENV{PICO_EXTRAS_FETCH_FROM_GIT} AND (NOT PICO_EXTRAS_FETCH_FROM_GIT))
-    set(PICO_EXTRAS_FETCH_FROM_GIT $ENV{PICO_EXTRAS_FETCH_FROM_GIT})
-    message("Using PICO_EXTRAS_FETCH_FROM_GIT from environment ('${PICO_EXTRAS_FETCH_FROM_GIT}')")
-endif ()
-
-if (DEFINED ENV{PICO_EXTRAS_FETCH_FROM_GIT_PATH} AND (NOT PICO_EXTRAS_FETCH_FROM_GIT_PATH))
-    set(PICO_EXTRAS_FETCH_FROM_GIT_PATH $ENV{PICO_EXTRAS_FETCH_FROM_GIT_PATH})
-    message("Using PICO_EXTRAS_FETCH_FROM_GIT_PATH from environment ('${PICO_EXTRAS_FETCH_FROM_GIT_PATH}')")
-endif ()
-
-if (NOT PICO_EXTRAS_PATH)
-    if (PICO_EXTRAS_FETCH_FROM_GIT)
-        include(FetchContent)
-        set(FETCHCONTENT_BASE_DIR_SAVE ${FETCHCONTENT_BASE_DIR})
-        if (PICO_EXTRAS_FETCH_FROM_GIT_PATH)
-            get_filename_component(FETCHCONTENT_BASE_DIR "${PICO_EXTRAS_FETCH_FROM_GIT_PATH}" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}")
-        endif ()
-        FetchContent_Declare(
-                pico_extras
-                GIT_REPOSITORY https://github.com/raspberrypi/pico-extras
-                GIT_TAG master
-        )
-        if (NOT pico_extras)
-            message("Downloading Raspberry Pi Pico Extras")
-            FetchContent_Populate(pico_extras)
-            set(PICO_EXTRAS_PATH ${pico_extras_SOURCE_DIR})
-        endif ()
-        set(FETCHCONTENT_BASE_DIR ${FETCHCONTENT_BASE_DIR_SAVE})
-    else ()
-        if (PICO_SDK_PATH AND EXISTS "${PICO_SDK_PATH}/../pico-extras")
-            set(PICO_EXTRAS_PATH ${PICO_SDK_PATH}/../pico-extras)
-            message("Defaulting PICO_EXTRAS_PATH as sibling of PICO_SDK_PATH: ${PICO_EXTRAS_PATH}")
-        endif()
-    endif ()
-endif ()
-
-if (PICO_EXTRAS_PATH)
-    set(PICO_EXTRAS_PATH "${PICO_EXTRAS_PATH}" CACHE PATH "Path to the PICO EXTRAS")
-    set(PICO_EXTRAS_FETCH_FROM_GIT "${PICO_EXTRAS_FETCH_FROM_GIT}" CACHE BOOL "Set to ON to fetch copy of PICO EXTRAS from git if not otherwise locatable")
-    set(PICO_EXTRAS_FETCH_FROM_GIT_PATH "${PICO_EXTRAS_FETCH_FROM_GIT_PATH}" CACHE FILEPATH "location to download EXTRAS")
-
-    get_filename_component(PICO_EXTRAS_PATH "${PICO_EXTRAS_PATH}" REALPATH BASE_DIR "${CMAKE_BINARY_DIR}")
-    if (NOT EXISTS ${PICO_EXTRAS_PATH})
-        message(FATAL_ERROR "Directory '${PICO_EXTRAS_PATH}' not found")
-    endif ()
-
-    set(PICO_EXTRAS_PATH ${PICO_EXTRAS_PATH} CACHE PATH "Path to the PICO EXTRAS" FORCE)
-    add_subdirectory(${PICO_EXTRAS_PATH} pico_extras)
-endif()
\ No newline at end of file
diff --git a/core/src/main/resources/lib/platform/pico/pico_setup.sh b/core/src/main/resources/lib/platform/pico/pico_setup.sh
deleted file mode 100755
index 853a08c185..0000000000
--- a/core/src/main/resources/lib/platform/pico/pico_setup.sh
+++ /dev/null
@@ -1,549 +0,0 @@
-#!/usr/bin/env bash
-
-# Phase 0: Preflight check
-# Verify baseline dependencies
-
-# Phase 1: Setup dev environment
-# Install the software packages from APT or Homebrew
-# Create a directory called pico
-# Download the pico-sdk repository and submodules
-# Define env variables: PICO_SDK_PATH
-# On Raspberry Pi only: configure the UART for use with Raspberry Pi Pico
-
-# Phase 2: Setting up tutorial repos
-# Download pico-examples, pico-extras, pico-playground repositories, and submodules
-# Build the blink and hello_world examples
-
-# Phase 3: Recommended tools
-# Download and build picotool (see Appendix B), and copy it to /usr/local/bin.
-# Download and build picoprobe (see Appendix A) and OpenOCD
-# Download and install Visual Studio Code and required extensions
-
-
-# Exit on error
-set -e
-
-# Trying to use a non-existent variable is an error
-set -u
-
-# if printenv DEBUG >& /dev/null; then
-    # Show all commands
-    set -x
-
-    env
-# fi
-
-# Number of cores when running make
-JNUM=4
-
-# Where will the output go?
-if printenv TARGET_DIR; then
-    echo "Using target dir from \$TARGET_DIR: ${TARGET_DIR}"
-else
-    TARGET_DIR="$(pwd)/pico"
-    echo "Using target dir: ${TARGET_DIR}"
-fi
-
-linux() {
-    # Returns true iff this is running on Linux
-    uname | grep -q "^Linux$"
-    return ${?}
-}
-
-raspbian() {
-    # Returns true iff this is running on Raspbian or close derivative such as Raspberry Pi OS, but not necessarily on a Raspberry Pi computer
-    grep -q '^NAME="Raspbian GNU/Linux"$' /etc/os-release
-    return ${?}
-}
-
-debian() {
-    # Returns true iff this is running on Debian
-    grep -q '^NAME="Debian GNU/Linux"$' /etc/os-release
-    return ${?}
-}
-
-ubuntu() {
-    # Returns true iff this is running on Ubuntu
-    grep -q '^NAME="Ubuntu"$' /etc/os-release
-    return ${?}
-}
-
-mac() {
-    # Returns true iff this is running on macOS and presumably Apple hardware
-    uname | grep -q "^Darwin$"
-    return ${?}
-}
-
-raspberry_pi() {
-    # Returns true iff this is running on a Raspberry Pi computer, regardless of the OS
-    if [ -f /proc/cpuinfo ]; then
-        grep -q "^Model\s*: Raspberry Pi" /proc/cpuinfo
-        return ${?}
-    fi
-    return 1
-}
-
-sudo_wrapper() {
-    # Some platforms have different needs for invoking sudo. This wrapper encapsulates that complexity.
-    # The output of this function should be a string on stdout, which will be used as a command. Example:
-    #   `$(sudo_wrapper) whoami`
-    # The above may equate to:
-    #   `sudo -i whoami`
-
-    if [ "${USER}" = root ]; then
-        # if we're already root, don't sudo at all. Relevant to some Docker images that don't have sudo but already run as root.
-        return
-    fi
-
-    # EC2 AMIs tend to have the user password unset, so you can't sudo without -i. It will cd /root, so you have to be
-    # careful with relative paths in the command.
-    echo sudo -i
-}
-
-phase_0() {
-    # Preflight check
-    # Checks the baseline dependencies. If you don't have these, this script won't work.
-    echo "Entering phase 0: Preflight check"
-    
-    if mac; then
-        echo "Running on macOS"
-        if which brew >> /dev/null; then
-            echo "Found brew"
-            brew update
-        else
-            echo -e 'This script requires Homebrew, the missing package manager for macOS. See https://docs.brew.sh/Installation. For quick install, run:\n/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"'
-            echo "Stopping."
-            exit 1
-        fi
-    else
-        if linux; then
-            echo "Running on Linux"
-        else
-            echo "Platform $(uname) not recognized. Use at your own risk. Continuing as though this were Linux."
-        fi
-
-        if which apt >> /dev/null; then
-            echo "Found apt"
-            $(sudo_wrapper) apt update
-        else
-            echo 'This script requires apt, the default package manager for Debian and Debian-derived distros such as Ubuntu and Raspberry Pi OS.'
-            echo "Stopping."
-            exit 1
-        fi
-    fi
-}
-
-fail() {
-    # Outputs a failure message and exits with the error code output by the previous call.
-    # All args are echoed as a failure message.
-
-    R="${?}"
-    echo "Validation failed! :'-("
-    if [ ${*} ]; then
-        echo "${*}"
-    fi
-    exit ${R}
-}
-
-validate_git_repo() {
-    # tests that the given relative path exists and is a git repo
-    git -C ${TARGET_DIR}/${1} status >& /dev/null || fail
-}
-
-validate_toolchain_linux() {
-    # test that the expected packages are installed
-    dpkg-query -s git cmake gcc-arm-none-eabi build-essential gdb-multiarch automake autoconf build-essential texinfo libtool libftdi-dev libusb-1.0-0-dev >& /dev/null || fail
-}
-
-install_dev_env_deps_linux() {
-    # Install development environment dependencies for Linux
-
-    # Avoid a certain dependency by installing ssh-client without recommends. See
-    # https://github.com/raspberrypi/pico-setup/pull/20#discussion_r608793993 for details.
-    $(sudo_wrapper) apt install -y --no-install-recommends ssh-client
-
-    DEPS="autoconf automake build-essential cmake gcc-arm-none-eabi gdb-multiarch git libftdi-dev libtool libusb-1.0-0-dev minicom pkg-config python3 texinfo"
-    if debian || ubuntu; then
-        DEPS="${DEPS} libstdc++-arm-none-eabi-newlib"
-    fi
-    $(sudo_wrapper) apt install -y ${DEPS}
-}
-
-brew_install_idempotent() {
-    # For some reason, brew install is not idempotent. This function succeeds even when the package is already installed.
-    brew list ${*} || brew install ${*}
-    return ${?}
-}
-
-validate_toolchain_mac() {
-    # test that the expected packages are installed
-    brew list git cmake pkg-config libtool automake libusb wget pkg-config gcc texinfo arm-none-eabi-gcc >& /dev/null 
-}
-
-install_dev_env_deps_mac() {
-    # Install development environment dependencies for mac
-
-    brew_install_idempotent ArmMbed/homebrew-formulae/arm-none-eabi-gcc automake cmake git libtool libusb gcc minicom pkg-config texinfo wget
-}
-
-create_TARGET_DIR() {
-    # Creates ./pico directory if necessary
-
-    mkdir -p "${TARGET_DIR}"
-}
-
-clone_raspberrypi_repo() {
-    # Clones the given repo name from GitHub and inits any submodules
-    # $1 should be the full name of the repo, ex: pico-sdk
-    # $2 should be the branch name. Defaults to master.
-    # all other args are passed to git clone
-    REPO_NAME="${1}"
-    if shift && [ ${#} -gt 0 ]; then
-        BRANCH="${1}"
-        # Can't just say `shift` because `set -e` will think it's an error and terminate the script.
-        shift || true
-    else
-        BRANCH=master
-    fi
-
-    REPO_URL="https://github.com/raspberrypi/${REPO_NAME}.git"
-    REPO_DIR="${TARGET_DIR}/${REPO_NAME}"
-
-    if [ -d "${REPO_DIR}" ]; then
-        echo "${REPO_DIR} already exists. Updating."
-        git -C "${REPO_DIR}" pull --ff-only
-    else
-        echo "Cloning ${REPO_URL}"
-        if [ ${#} -gt 0 ]; then
-            git -C "${TARGET_DIR}" clone -b "${BRANCH}" "${REPO_URL}" ${*}
-        else
-            git -C "${TARGET_DIR}" clone -b "${BRANCH}" "${REPO_URL}"
-        fi
-
-        # Any submodules
-        git -C "${REPO_DIR}" submodule update --init
-    fi
-}
-
-warn_for_bashrc() {
-    # Earlier versions of this script set environment variables in .bashrc. The location has moved to .profile or
-    # .zprofile. If the user has a .bashrc defining any pico dev env variables, they could conflict with the settings
-    # in the other files. This function raises a warning for the user.
-
-    REGEX="^\s*export\s+\"?PICO_SDK_PATH="
-    if grep -q "${REGEX}" ~/.bashrc; then
-        echo "Your ~/.bashrc file contains the following line, which may conflict with this script's settings. We recommend removing it to prevent possible issues."
-        echo -n "    "; grep "${REGEX}" ~/.bashrc
-    fi
-}
-
-set_env() {
-    # Permanently sets an environment variable by adding it to the current user's profile script
-    # The form of the arguments should be `FOO foo`, which sets the environment variable `FOO=foo`
-    NAME="${1}"
-    VALUE="${2}"
-    EXPR="${NAME}=${VALUE}"
-
-    # detect appropriate file for setting env vars
-    if echo "${SHELL}" | grep -q zsh; then
-        # zsh detected
-        FILE=~/.zprofile
-    else
-        # sh, bash and others
-        FILE=~/.profile
-    fi
-
-    # ensure that appends go to a new line
-    if [ -f "${FILE}" ]; then
-        if ! ( tail -n 1 "${FILE}" | grep -q "^$" ); then
-            # FILE exists but has no trailing newline. Adding newline.
-            echo >> "${FILE}"
-        fi
-    fi
-
-    # set for now
-    export "${EXPR}"
-
-    # set for later
-    REGEX="^\s*export\s+\"?${NAME}="
-    if grep -q "${REGEX}" "${FILE}"; then
-        # Warn the user
-        echo "Your ${FILE} already contains the following environment variable definition(s):"
-        grep "${REGEX}" "${FILE}"
-        echo "This script would normally set the following line. We're adding it, but commented out, so that you can choose which you want."
-        echo "export \"${EXPR}\""
-        # Write to file
-        echo "# pico_setup.sh commented out the following line because it conflicts with another line in this file. You should choose one or the other." >> "${FILE}"
-        echo "# export \"${EXPR}\"" >> "${FILE}"
-    else
-        echo "Setting env variable ${EXPR} in ${FILE}"
-        echo "export \"${EXPR}\"" >> "${FILE}"
-    fi
-}
-
-validate_pico_sdk() {
-    validate_git_repo pico-sdk
-
-    # test that the SDK env var is set and correct
-    test "${PICO_SDK_PATH}" = "${TARGET_DIR}/pico-sdk" || fail
-}
-
-setup_sdk() {
-    # Download the SDK
-    clone_raspberrypi_repo pico-sdk
-
-    # Set env var PICO_SDK_PATH
-    set_env PICO_SDK_PATH "${TARGET_DIR}/pico-sdk"
-}
-
-validate_uart() {
-    # test that the UART is configured. Only works on Raspberry Pi OS on Raspberry Pi hardware.
-    dpkg-query -s minicom  >& /dev/null || fail
-    grep -q "enable_uart=1" /boot/config.txt || fail
-    # note that the test for console=serial0 tests for the absence of a string
-    grep -q "console=serial0" /boot/cmdline.txt && fail
-}
-
-enable_uart() {
-    # Enable UART
-    echo "Disabling Linux serial console (UART) so we can use it for pico"
-    $(sudo_wrapper) raspi-config nonint do_serial 2
-    echo "You must run sudo reboot to finish UART setup"
-}
-
-phase_1() {
-    # Setup minimum dev environment
-    echo "Entering phase 1: Setup minimum dev environment"
-
-    if mac; then
-        install_dev_env_deps_mac
-        validate_toolchain_mac
-    else
-        install_dev_env_deps_linux
-        validate_toolchain_linux
-    fi
-
-    create_TARGET_DIR
-    setup_sdk
-    validate_pico_sdk
-
-    if raspberry_pi && which raspi-config >> /dev/null; then
-        enable_uart
-        validate_uart
-    else
-        echo "Not configuring UART, because either this is not a Raspberry Pi computer, or raspi-config is not available."
-    fi
-}
-
-build_examples() {
-    # Build a couple of examples
-    echo "Building selected examples"
-    
-    # Save the working directory
-    pushd "${TARGET_DIR}/pico-examples" >> /dev/null
-
-    mkdir -p build
-    cd build
-    cmake ../ -DCMAKE_BUILD_TYPE=Debug
-
-    for EXAMPLE in blink hello_world; do
-        echo "Building $EXAMPLE"
-        cd "$EXAMPLE"
-        make -j${JNUM}
-        cd ..
-    done
-
-    # Restore the working directory
-    popd >> /dev/null
-}
-
-validate_pico_extras() {
-    validate_git_repo pico-extras
-}
-
-validate_pico_examples() {
-    validate_git_repo pico-examples
-
-    # test that blink is built
-    test -f ${TARGET_DIR}/pico-examples/build/blink/blink.uf2 || fail
-
-    # test that hello_serial is built
-    test -f ${TARGET_DIR}/pico-examples/build/hello_world/serial/hello_serial.uf2 || fail
-
-    # test that hello_usb is built
-    test -f ${TARGET_DIR}/pico-examples/build/hello_world/usb/hello_usb.uf2 || fail
-}
-
-validate_pico_playground() {
-    validate_git_repo pico-playground
-}
-
-phase_2() {
-    # Setup tutorial repos
-    echo "Entering phase 2: Setting up tutorial repos"
-
-    for REPO_NAME in pico-examples pico-extras pico-playground; do
-        clone_raspberrypi_repo "${REPO_NAME}"
-    done
-
-    build_examples
-
-    validate_pico_examples
-    validate_pico_extras
-    validate_pico_playground
-}
-
-validate_picotool() {
-    validate_git_repo picotool
-
-    # test that the binary is built
-    test -x ${TARGET_DIR}/picotool/build/picotool || fail
-
-    # test that picotool is installed in the expected location
-    test -x /usr/local/bin/picotool || fail
-}
-
-setup_picotool() {
-    # Downloads, builds, and installs picotool
-    echo "Setting up picotool"
-
-    # Save the working directory
-    pushd "${TARGET_DIR}" >> /dev/null
-
-    clone_raspberrypi_repo picotool
-    cd "${TARGET_DIR}/picotool"
-    mkdir -p build
-    cd build
-    cmake ../
-    make -j${JNUM}
-
-    echo "Installing picotool to /usr/local/bin/picotool"
-    $(sudo_wrapper) cp "${TARGET_DIR}/picotool/build/picotool" /usr/local/bin/
-
-    # Restore the working directory
-    popd >> /dev/null
-}
-
-validate_openocd() {
-    validate_git_repo openocd
-
-    # test that the binary is built
-    test -x ${TARGET_DIR}/openocd/src/openocd || fail
-}
-
-setup_openocd() {
-    # Download, build, and install OpenOCD for picoprobe and bit-banging without picoprobe
-    echo "Setting up OpenOCD"
-
-    # Save the working directory
-    pushd "${TARGET_DIR}" >> /dev/null
-
-    clone_raspberrypi_repo openocd picoprobe --depth=1
-    cd "${TARGET_DIR}/openocd"
-    ./bootstrap
-    OPTS="--enable-ftdi --enable-bcm2835gpio  --enable-picoprobe"
-    if linux; then
-        # sysfsgpio is only available on linux
-        OPTS="${OPTS} --enable-sysfsgpio"
-    fi
-    ./configure ${OPTS}
-    make -j${JNUM}
-    $(sudo_wrapper) make -C "${TARGET_DIR}/openocd" install
-
-    # Restore the working directory
-    popd >> /dev/null
-}
-
-validate_picoprobe() {
-    validate_git_repo picoprobe || fail
-
-    # test that the binary is built
-    test -f ${TARGET_DIR}/picoprobe/build/picoprobe.uf2 || fail
-}
-
-setup_picoprobe() {
-    # Download and build picoprobe. Requires that OpenOCD is already setup
-    echo "Setting up picoprobe"
-
-    # Save the working directory
-    pushd "${TARGET_DIR}" >> /dev/null
-
-    clone_raspberrypi_repo picoprobe
-    cd "${TARGET_DIR}/picoprobe"
-    mkdir -p build
-    cd build
-    cmake ..
-    make -j${JNUM}
-
-    # Restore the working directory
-    popd >> /dev/null
-}
-
-validate_vscode_linux() {
-    dpkg-query -s code  >& /dev/null || fail
-}
-
-install_vscode_linux() {
-    # Install Visual Studio Code
-
-    # VS Code is specially added to Raspberry Pi OS repos, but might not be present on Debian/Ubuntu. So we check first.
-    if ! apt-cache show code >& /dev/null; then
-        echo "It appears that your APT repos do not offer Visual Studio Code. Skipping."
-        return
-    fi
-
-    echo "Installing Visual Studio Code"
-
-    $(sudo_wrapper) apt install -y code
-
-    # Get extensions
-    code --install-extension marus25.cortex-debug
-    code --install-extension ms-vscode.cmake-tools
-    code --install-extension ms-vscode.cpptools
-}
-
-validate_vscode_mac() {
-    echo "Not yet implemented: testing Visual Studio Code on macOS"
-}
-
-install_vscode_mac() {
-    echo "Not yet implemented: installing Visual Studio Code on macOS"
-}
-
-phase_3() {
-    # Setup recommended tools
-    echo "Setting up recommended tools"
-
-    setup_picotool
-    validate_picotool
-
-    setup_openocd
-    validate_openocd
-
-    setup_picoprobe
-    validate_picoprobe
-
-    # Install Visual Studio Code
-    if mac; then
-        install_vscode_mac
-        validate_vscode_mac
-    else
-        if dpkg-query -s xserver-xorg >& /dev/null; then
-            install_vscode_linux
-            validate_vscode_linux
-        else
-            echo "Not installing Visual Studio Code because it looks like XWindows is not installed."
-        fi
-    fi
-}
-
-main() {
-    phase_0
-    phase_1
-    phase_2
-    phase_3
-
-    echo "Congratulations, installation is complete. :D"
-}
-
-main
diff --git a/core/src/main/resources/lib/platform/pico/launch.json b/core/src/main/resources/lib/platform/rp2040/launch.json
similarity index 100%
rename from core/src/main/resources/lib/platform/pico/launch.json
rename to core/src/main/resources/lib/platform/rp2040/launch.json
diff --git a/core/src/main/resources/lib/platform/pico/pico_sdk_import.cmake b/core/src/main/resources/lib/platform/rp2040/pico_sdk_import.cmake
similarity index 100%
rename from core/src/main/resources/lib/platform/pico/pico_sdk_import.cmake
rename to core/src/main/resources/lib/platform/rp2040/pico_sdk_import.cmake

From 23051f10a3de81b8ccb563e6f36ded0c2c5f43ee Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Tue, 11 Jul 2023 12:27:38 -0700
Subject: [PATCH 0612/1114] generator changes: pico->rp2040

---
 .../lflang/generator/c/CCmakeGenerator.java   | 100 +++++++++---------
 .../org/lflang/generator/c/CGenerator.java    |  13 ++-
 .../generator/c/CMainFunctionGenerator.java   |   2 +-
 3 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 8141baf153..228dbc7ee5 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -117,34 +117,35 @@ CodeBuilder generateCMakeCode(
 
     cMakeCode.pr("cmake_minimum_required(VERSION " + MIN_CMAKE_VERSION + ")");
 
-    if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
-      cMakeCode.pr("# Set default configuration file. To add custom configurations,");
-      cMakeCode.pr("# pass -- -DOVERLAY_CONFIG=my_config.prj to either cmake or west");
-      cMakeCode.pr("set(CONF_FILE prj_lf.conf)");
-      if (targetConfig.platformOptions.board != null) {
-        cMakeCode.pr("# Selecting board specified in target property");
-        cMakeCode.pr("set(BOARD " + targetConfig.platformOptions.board + ")");
-      } else {
-        cMakeCode.pr("# Selecting default board");
-        cMakeCode.pr("set(BOARD qemu_cortex_m3)");
-      }
-      cMakeCode.pr("# We recommend Zephyr v3.3.0 but we are compatible with older versions also");
-      cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} 3.3.0)");
-      cMakeCode.newLine();
-    } else if (targetConfig.platformOptions.platform == Platform.PICO) {
-      cMakeCode.pr("message(\"Run ./pico_setup.sh for unix systems in a chosen directory.\")");
-      cMakeCode.pr("message(\"The script will download all required dependencies in /pico.\")");
-      cMakeCode.newLine();
-      // include cmake before project
-      cMakeCode.pr("include(pico_sdk_import.cmake)");
-      cMakeCode.pr("include(pico_extras_import_optional.cmake)");
-      cMakeCode.pr("project(" + executableName + " LANGUAGES C CXX ASM)");
-      cMakeCode.newLine();
-    } else {
-      cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
-      cMakeCode.newLine();
+    // Setup the project header for different platforms
+    switch (targetConfig.platformOptions.platform) {
+      case ZEPHYR:
+          cMakeCode.pr("# Set default configuration file. To add custom configurations,");
+          cMakeCode.pr("# pass -- -DOVERLAY_CONFIG=my_config.prj to either cmake or west");
+          cMakeCode.pr("set(CONF_FILE prj_lf.conf)");
+          if (targetConfig.platformOptions.board != null) {
+            cMakeCode.pr("# Selecting board specified in target property");
+            cMakeCode.pr("set(BOARD " + targetConfig.platformOptions.board + ")");
+          } else {
+            cMakeCode.pr("# Selecting default board");
+            cMakeCode.pr("set(BOARD qemu_cortex_m3)");
+          }
+          cMakeCode.pr("# We recommend Zephyr v3.3.0 but we are compatible with older versions also");
+          cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} 3.3.0)");
+          cMakeCode.newLine();
+          cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
+          cMakeCode.newLine();
+          break;
+      case RP2040:
+          cMakeCode.pr("include(pico_sdk_import.cmake)");
+          cMakeCode.pr("project(" + executableName + " LANGUAGES C CXX ASM)");
+          cMakeCode.newLine();
+      default:
+          cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
+          cMakeCode.newLine();
     }
 
+
     // The Test build type is the Debug type plus coverage generation
     cMakeCode.pr("if(CMAKE_BUILD_TYPE STREQUAL \"Test\")");
     cMakeCode.pr("  set(CMAKE_BUILD_TYPE \"Debug\")");
@@ -211,26 +212,30 @@ CodeBuilder generateCMakeCode(
     }
     cMakeCode.newLine();
 
-    if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
-      cMakeCode.pr(
-          setUpMainTargetZephyr(
-              hasMain,
-              executableName,
-              Stream.concat(additionalSources.stream(), sources.stream())));
-    } else if (targetConfig.platformOptions.platform == Platform.PICO) {
-      cMakeCode.pr(
-          setUpMainTargetPico(
-              hasMain,
-              executableName,
-              Stream.concat(additionalSources.stream(), sources.stream())));
-    } else {
-      cMakeCode.pr(
-          setUpMainTarget.getCmakeCode(
-              hasMain,
-              executableName,
-              Stream.concat(additionalSources.stream(), sources.stream())));
+    // Setup main target for different platforms
+    switch (targetConfig.platformOptions.platform) {
+      case ZEPHYR: 
+          cMakeCode.pr(
+              setUpMainTargetZephyr(
+                  hasMain,
+                  executableName,
+                  Stream.concat(additionalSources.stream(), sources.stream())));
+          break; 
+      case RP2040:
+          cMakeCode.pr(
+              setUpMainTargetRp2040(
+                  hasMain,
+                  executableName,
+                  Stream.concat(additionalSources.stream(), sources.stream())));
+          break; 
+      default:
+          cMakeCode.pr(
+              setUpMainTarget.getCmakeCode(
+                  hasMain,
+                  executableName,
+                  Stream.concat(additionalSources.stream(), sources.stream())));
     }
-
+    
     cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE core)");
 
     cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC .)");
@@ -258,8 +263,7 @@ CodeBuilder generateCMakeCode(
     }
 
     if (targetConfig.threading || targetConfig.tracing != null) {
-      // dont include thread library for pico platform
-      if (targetConfig.platformOptions.platform != Platform.PICO) {
+      if (targetConfig.platformOptions.platform != Platform.RP2040) {
         // If threaded computation is requested, add the threads option.
         cMakeCode.pr("# Find threads and link to it");
         cMakeCode.pr("find_package(Threads REQUIRED)");
@@ -422,7 +426,7 @@ private static String setUpMainTargetZephyr(
     return code.toString();
   }
 
-  private static String setUpMainTargetPico(
+  private static String setUpMainTargetRp2040(
       boolean hasMain, String executableName, Stream<String> cSources) {
     var code = new CodeBuilder();
     // FIXME: remove this and move to lingo build
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index e80dd0baf1..e966d4613c 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -931,16 +931,15 @@ protected void copyTargetFiles() throws IOException {
           "/lib/platform/zephyr/Kconfig", fileConfig.getSrcGenPath(), true);
     }
 
-    if (targetConfig.platformOptions.platform == Platform.PICO) {
+    // For the pico src-gen, copy over vscode configurations for debugging
+    if (targetConfig.platformOptions.platform == Platform.RP2040) {
       Path vscodePath = Path.of(fileConfig.getSrcGenPath() + File.separator + ".vscode");
+      // If pico-sdk-path not defined, this can be used to pull the sdk into src-gen
       FileUtil.copyFileFromClassPath(
-          "/lib/platform/pico/pico_setup.sh", fileConfig.getSrcGenPath(), true);
+          "/lib/platform/rp2040/pico_sdk_import.cmake", fileConfig.getSrcGenPath(), true);
+      // VS Code configurations
       FileUtil.copyFileFromClassPath(
-          "/lib/platform/pico/pico_sdk_import.cmake", fileConfig.getSrcGenPath(), true);
-      FileUtil.copyFileFromClassPath(
-          "/lib/platform/pico/pico_extras_import_optional.cmake", fileConfig.getSrcGenPath(), true);
-      FileUtil.copyFileFromClassPath(
-          "/lib/platform/pico/launch.json", vscodePath, true);
+          "/lib/platform/rp2040/launch.json", vscodePath, true);
     }
   }
 
diff --git a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
index 3e9dcd5fe2..3ffea7e332 100644
--- a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
@@ -62,7 +62,7 @@ private String generateMainFunction() {
           "   int res = lf_reactor_c_main(0, NULL);",
           "   exit(res);",
           "}");
-    } else if (targetConfig.platformOptions.platform == Platform.PICO) {
+    } else if (targetConfig.platformOptions.platform == Platform.RP2040) {
       // Pico platform cannont use command line args. 
       return String.join(
           "\n",

From 485b4c61eda7844ace6c4bd3c6510c5a2482f106 Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Tue, 11 Jul 2023 12:28:37 -0700
Subject: [PATCH 0613/1114] test refactor

---
 test/C/src/pico/BareThread.lf     | 13 -------------
 test/C/src/pico/FreeRTOSThread.lf | 12 ------------
 test/C/src/pico/HelloPico.lf      |  9 ---------
 test/C/src/pico/Timer.lf          | 11 -----------
 test/C/src/rp2040/HelloPico.lf    |  7 +++++++
 test/C/src/rp2040/Thread.lf       | 13 +++++++++++++
 test/C/src/rp2040/Timer.lf        |  9 +++++++++
 7 files changed, 29 insertions(+), 45 deletions(-)
 delete mode 100644 test/C/src/pico/BareThread.lf
 delete mode 100644 test/C/src/pico/FreeRTOSThread.lf
 delete mode 100644 test/C/src/pico/HelloPico.lf
 delete mode 100644 test/C/src/pico/Timer.lf
 create mode 100644 test/C/src/rp2040/HelloPico.lf
 create mode 100644 test/C/src/rp2040/Thread.lf
 create mode 100644 test/C/src/rp2040/Timer.lf

diff --git a/test/C/src/pico/BareThread.lf b/test/C/src/pico/BareThread.lf
deleted file mode 100644
index 1bde45fb9b..0000000000
--- a/test/C/src/pico/BareThread.lf
+++ /dev/null
@@ -1,13 +0,0 @@
-target C {
-    platform: {
-        name: "Pico",
-        threading: "BareIron"
-    }
-    threading: true,
-}
-
-// check that only 2 threads can be created max
-main reactor {
-    timer t(0, 1 sec);
-
-}
diff --git a/test/C/src/pico/FreeRTOSThread.lf b/test/C/src/pico/FreeRTOSThread.lf
deleted file mode 100644
index 244b01ac7f..0000000000
--- a/test/C/src/pico/FreeRTOSThread.lf
+++ /dev/null
@@ -1,12 +0,0 @@
-target C {
-    platform: {
-        name: "Pico",
-        thread-lib: "FreeRTOS"
-    },
-    threading: true,
-    workers: 4
-}
-
-// test creation of thread tasks using FreeRTOS support
-main reactor {=
-=}
diff --git a/test/C/src/pico/HelloPico.lf b/test/C/src/pico/HelloPico.lf
deleted file mode 100644
index ba57fe7039..0000000000
--- a/test/C/src/pico/HelloPico.lf
+++ /dev/null
@@ -1,9 +0,0 @@
-target C {
-    platform: "Pico"
-}
-
-main reactor {
-    reaction(startup) {=
-        printf("Hello World!\n");
-    =}
-}
diff --git a/test/C/src/pico/Timer.lf b/test/C/src/pico/Timer.lf
deleted file mode 100644
index 591d5d90e5..0000000000
--- a/test/C/src/pico/Timer.lf
+++ /dev/null
@@ -1,11 +0,0 @@
-target C {
-    platform: "Pico"
-    timeout: 1 sec,
-}
-
-main reactor {
-    timer t1(0, 100 msec);
-    reaction(t1) {=
-        printf("Logical Time: %d. \n", lf_time_logical());
-    =}
-}
diff --git a/test/C/src/rp2040/HelloPico.lf b/test/C/src/rp2040/HelloPico.lf
new file mode 100644
index 0000000000..bf4a7c7c29
--- /dev/null
+++ b/test/C/src/rp2040/HelloPico.lf
@@ -0,0 +1,7 @@
+target C {
+  platform: "Rp2040"
+}
+
+main reactor {
+  reaction(startup) {= printf("Hello World!\n"); =}
+}
diff --git a/test/C/src/rp2040/Thread.lf b/test/C/src/rp2040/Thread.lf
new file mode 100644
index 0000000000..2cb0494d1d
--- /dev/null
+++ b/test/C/src/rp2040/Thread.lf
@@ -0,0 +1,13 @@
+target C {
+  platform: {
+    name: "Rp2040"
+  },
+  threading: true,
+  workers: 3
+}
+
+main reactor {
+  timer t(0, 1 sec)
+
+  reaction(t) {= prinf("Hello, World!"); =}
+}
diff --git a/test/C/src/rp2040/Timer.lf b/test/C/src/rp2040/Timer.lf
new file mode 100644
index 0000000000..5aefd01f49
--- /dev/null
+++ b/test/C/src/rp2040/Timer.lf
@@ -0,0 +1,9 @@
+target C {
+  platform: "Rp2040"
+}
+
+main reactor {
+  timer t1(0, 100 msec)
+
+  reaction(t1) {= printf("Logical Time: %d. \n", lf_time_logical()); =}
+}

From df040aae4c6a2302555f86d7c1463b79b4236528 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Tue, 11 Jul 2023 17:35:11 -0400
Subject: [PATCH 0614/1114] Align reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 78767eb842..ac3f64993d 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 78767eb8421fba0a858ff6d7bf435c58a459ff62
+Subproject commit ac3f64993d40d8db2ee5e3af3fb10cbb8035b7c1

From 73b8d8293d8dccb98b3d49248ab6ed766854b8c4 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 11 Jul 2023 14:49:58 -0700
Subject: [PATCH 0615/1114] Fix compilation errors from merge.

---
 .../lflang/federated/extensions/CExtension.java   |  2 +-
 .../lflang/federated/generator/FedASTUtils.java   | 15 ++++++++-------
 .../lflang/federated/generator/FedGenerator.java  |  4 ++--
 .../federated/generator/FedMainEmitter.java       |  6 +++---
 .../federated/generator/FedReactorEmitter.java    |  2 +-
 .../federated/generator/FederateInstance.java     |  5 ++++-
 .../federated/launcher/FedLauncherGenerator.java  | 12 +++++++-----
 .../org/lflang/generator/ReactorInstance.java     |  1 -
 core/src/main/resources/lib/c/reactor-c           |  2 +-
 9 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index f61ae51854..7370ad64fb 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -639,7 +639,7 @@ private String generateCodeToInitializeFederate(FederateInstance federate, RtiCo
             "\n",
             "// Initialize the socket mutex",
             "lf_mutex_init(&outbound_socket_mutex);",
-            "lf_cond_init(&port_status_changed, &mutex);",
+            "lf_cond_init(&port_status_changed, &env->mutex);",
             CExtensionUtils.surroundWithIfFederatedDecentralized(
                 "lf_cond_init(&logical_time_changed, &env->mutex);")));
 
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 6a1b8bc082..607993112a 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -44,6 +44,7 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.lflang.InferredType;
+import org.lflang.MessageReporter;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
@@ -633,7 +634,7 @@ private static Reactor getNetworkSenderReactor(
     destRef.setVariable(connection.getDestinationPortInstance().getDefinition());
 
     Reaction networkSenderReaction =
-        getNetworkSenderReaction(inRef, destRef, connection, coordination, type, errorReporter);
+        getNetworkSenderReaction(inRef, destRef, connection, coordination, type, messageReporter);
 
     var senderIndexParameter = LfFactory.eINSTANCE.createParameter();
     var senderIndexParameterType = LfFactory.eINSTANCE.createType();
@@ -679,7 +680,7 @@ private static Reaction getNetworkSenderReaction(
       FedConnectionInstance connection,
       CoordinationType coordination,
       Type type,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     var networkSenderReaction = LfFactory.eINSTANCE.createReaction();
     networkSenderReaction.getTriggers().add(inRef);
     networkSenderReaction.setCode(LfFactory.eINSTANCE.createCode());
@@ -693,7 +694,7 @@ private static Reaction getNetworkSenderReaction(
                     connection,
                     InferredType.fromAST(type),
                     coordination,
-                    errorReporter));
+                    messageReporter));
     return networkSenderReaction;
   }
 
@@ -706,11 +707,11 @@ private static Reaction getInitializationReaction() {
     code.setBody(
         """
             extern reaction_t* port_absent_reaction[];
-            void enqueue_network_output_control_reactions();
+            void enqueue_network_output_control_reactions(environment_t*);
             LF_PRINT_DEBUG("Adding network output control reaction to table.");
             port_absent_reaction[self->sender_index] = &self->_lf__reaction_2;
             LF_PRINT_DEBUG("Added network output control reaction to table. Enqueueing it...");
-            enqueue_network_output_control_reactions();
+            enqueue_network_output_control_reactions(self->base.environment);
             """);
     initializationReaction.setCode(code);
     return initializationReaction;
@@ -729,11 +730,11 @@ private static void addNetworkSenderReactor(
       FedConnectionInstance connection,
       CoordinationType coordination,
       Resource resource,
-      ErrorReporter errorReporter) {
+      MessageReporter messageReporter) {
     LfFactory factory = LfFactory.eINSTANCE;
     // Assume all the types are the same, so just use the first on the right.
 
-    Reactor sender = getNetworkSenderReactor(connection, coordination, resource, errorReporter);
+    Reactor sender = getNetworkSenderReactor(connection, coordination, resource, messageReporter);
 
     Instantiation networkInstance = factory.createInstantiation();
 
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 93ae31869e..ea1d960e0a 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -57,8 +57,8 @@
 import org.lflang.lf.Instantiation;
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.Reactor;
-import org.lflang.lf.VarRef;
 import org.lflang.lf.TargetDecl;
+import org.lflang.lf.VarRef;
 import org.lflang.util.Averager;
 
 public class FedGenerator {
@@ -339,7 +339,7 @@ public TargetConfig getTargetConfig() {
     // Wait for all compile threads to finish (NOTE: Can block forever)
     try {
       if (!compileThreadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS)) {
-        context.getErrorReporter().reportError("Timed out while compiling.");
+        context.getErrorReporter().nowhere().error("Timed out while compiling.");
       }
     } catch (Exception e) {
       context
diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index 6198573d17..51e16c2450 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -23,9 +23,9 @@ String generateMainReactor(
       FederateInstance federate, Reactor originalMainReactor, MessageReporter messageReporter) {
     // FIXME: Handle modes at the top-level
     if (!ASTUtils.allModes(originalMainReactor).isEmpty()) {
-      messageReporter.reportError(
-          ASTUtils.allModes(originalMainReactor).stream().findFirst().orElseThrow(),
-          "Modes at the top level are not supported under federated execution.");
+      messageReporter
+          .at(ASTUtils.allModes(originalMainReactor).stream().findFirst().orElseThrow())
+          .error("Modes at the top level are not supported under federated execution.");
     }
     var renderer = FormattingUtil.renderer(federate.targetConfig.target);
 
diff --git a/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java
index 2147e48bb3..366a18c2fe 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedReactorEmitter.java
@@ -14,7 +14,7 @@ String generateReactorDefinitions(FederateInstance federate) {
         .getReactors().stream()
             .distinct()
             .filter(federate::references)
-            .map(FormattingUtils.renderer(federate.targetConfig.target))
+            .map(FormattingUtil.renderer(federate.targetConfig.target))
             .collect(Collectors.joining("\n"));
   }
 }
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index 458abab7ed..88bb6a0051 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -249,6 +249,9 @@ public Instantiation getInstantiation() {
   /** Keep a unique list of enabled serializers */
   public HashSet<SupportedSerializers> enabledSerializers = new HashSet<>();
 
+  /** Cached result of analysis of which reactions to exclude from main. */
+  private Set<Reaction> excludeReactions = null;
+
   /** Keep a unique list of enabled serializers */
   public List<TimeValue> stpOffsets = new ArrayList<>();
 
@@ -292,7 +295,7 @@ private boolean references(Instantiation instantiation, ReactorDecl declaration)
     }
 
     boolean instantiationsCheck = false;
-    if (networkReactors.contains(ASTUtils.toDefinition(reactor))) {
+    if (networkReactors.contains(ASTUtils.toDefinition(declaration))) {
       return true;
     }
     // For a federate, we don't need to look inside imported reactors.
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index ba8012eea0..6f2347d85c 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -233,8 +233,9 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
     File file = fileConfig.binPath.resolve(fileConfig.name).toFile();
     if (file.exists()) {
       if (!file.delete())
-        errorReporter.reportError(
-            "Failed to delete existing federated launch script \"" + file + "\"");
+        messageReporter
+            .nowhere()
+            .error("Failed to delete existing federated launch script \"" + file + "\"");
     }
 
     FileOutputStream fOut = null;
@@ -248,7 +249,7 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
         fOut.write(shCode.toString().getBytes());
         fOut.close();
       } catch (IOException e) {
-        messageReporter.reportError("Unable to write to file: " + file);
+        messageReporter.nowhere().error("Unable to write to file: " + file);
       }
     }
 
@@ -261,8 +262,9 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
     file = fileConfig.binPath.resolve(fileConfig.name + "_distribute.sh").toFile();
     if (file.exists()) {
       if (!file.delete())
-        errorReporter.reportError(
-            "Failed to delete existing federated distributor script \"" + file + "\"");
+        messageReporter
+            .nowhere()
+            .error("Failed to delete existing federated distributor script \"" + file + "\"");
     }
     if (distCode.length() > 0) {
       try {
diff --git a/core/src/main/java/org/lflang/generator/ReactorInstance.java b/core/src/main/java/org/lflang/generator/ReactorInstance.java
index 4b664aa531..53ca96a667 100644
--- a/core/src/main/java/org/lflang/generator/ReactorInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactorInstance.java
@@ -36,7 +36,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import org.lflang.AttributeUtils;
 import org.lflang.MessageReporter;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index f85dc17368..afd9bf9445 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit f85dc17368625ed99a28147138db0b1e7fbcc3de
+Subproject commit afd9bf9445c26b511ea00611f67483901ddd6302

From 583b0d9231b945709ce9a9ded3554f39d7537630 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 11 Jul 2023 15:23:07 -0700
Subject: [PATCH 0616/1114] Minor cleanup in ReactorInstanceGraph.

---
 .../generator/ReactionInstanceGraph.java      | 65 ++-----------------
 1 file changed, 7 insertions(+), 58 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
index 2a86483d69..5e5c50a598 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
@@ -1,5 +1,3 @@
-/** A graph that represents causality cycles formed by reaction instances. */
-
 /*************
  * Copyright (c) 2021, The University of California at Berkeley.
  *
@@ -88,52 +86,9 @@ public void rebuild() {
     // Assign a level to each reaction.
     // If there are cycles present in the graph, it will be detected here.
     assignLevels();
-    if (nodeCount() != 0) {
-      // The graph has cycles.
-      // main.reporter.reportError("Reactions form a cycle! " + toString());
-      // Do not throw an exception so that cycle visualization can proceed.
-      // throw new InvalidSourceException("Reactions form a cycle!");
-    }
+    // Do not throw an exception when nodeCount != 0 so that cycle visualization can proceed.
   }
 
-  //  /**
-  //   * Adds manually a set of dependent network edges as needed to nudge the level assignment
-  //   * algorithm into creating a correct level assignment.
-  //   *
-  //   * @param main
-  //   */
-  //  private void addDependentNetworkEdges(ReactorInstance main) {
-  //    // FIXME: I do not think this belongs here because it pertains to federated execution. Also,
-  // it
-  //    // seems to relate to a design that we do not intend to use?
-  //    Attribute attribute =
-  //        AttributeUtils.findAttributeByName(main.definition.getReactorClass(), "_fed_config");
-  ////    String actionsStr =
-  ////        AttributeUtils.getAttributeParameter(attribute, AttributeSpec.DEPENDENCY_PAIRS);
-  ////    if (actionsStr == null)
-  ////      return; // No dependent network edges, the levels algorithm has enough information
-  ////    List<String> dependencies = List.of(actionsStr.split(";", -1));
-  //    // Recursively add nodes and edges from contained reactors.
-  //    Map<String, ReactorInstance> m = new HashMap<>();
-  //    for (ReactorInstance child : main.children) {
-  //      m.put(child.getName(), child);
-  //    }
-  ////    for (String dependency : dependencies) {
-  ////      List<String> dep = List.of(dependency.split(",", 2));
-  ////      ReactorInstance downStream = m.getOrDefault(dep.get(0), null);
-  ////      ReactorInstance upStream = m.getOrDefault(dep.get(1), null);
-  ////      if (downStream == null || upStream == null) {
-  ////        System.out.println("Downstream or Upstream reaction pair is undefined. Continuing.");
-  ////        continue;
-  ////      }
-  ////      ReactionInstance down = downStream.reactions.get(0);
-  ////      Runtime downRuntime = down.getRuntimeInstances().get(0);
-  ////      for (ReactionInstance up : upStream.reactions) {
-  ////        Runtime upRuntime = up.getRuntimeInstances().get(0);
-  ////        addEdge(downRuntime, upRuntime);
-  ////      }
-  ////    }
-  //  }
   /** This function rebuilds the graph and propagates and assigns deadlines to all reactions. */
   public void rebuildAndAssignDeadlines() {
     this.clear();
@@ -331,7 +286,7 @@ private void getAllContainedReactions(List<Runtime> runtimeReactions, ReactorIns
    * Number of reactions per level, represented as a list of integers where the indices are the
    * levels.
    */
-  private List<Integer> numReactionsPerLevel = new ArrayList<>(List.of(0));
+  private final List<Integer> numReactionsPerLevel = new ArrayList<>(List.of(0));
 
   ///////////////////////////////////////////////////////////
   //// Private methods
@@ -423,7 +378,7 @@ private void assignLevels() {
       assignPortLevel(origin);
 
       // Update numReactionsPerLevel info
-      adjustNumReactionsPerLevel(origin.level, 1);
+      incrementNumReactionsPerLevel(origin.level);
     }
   }
 
@@ -481,16 +436,15 @@ private void assignInferredDeadlines() {
    * If there is no previously recorded number for this level, then
    * create one with index <code>level</code> and value <code>valueToAdd</code>.
    * @param level The level.
-   * @param valueToAdd The value to add to the number of levels.
    */
-  private void adjustNumReactionsPerLevel(int level, int valueToAdd) {
+  private void incrementNumReactionsPerLevel(int level) {
     if (numReactionsPerLevel.size() > level) {
-      numReactionsPerLevel.set(level, numReactionsPerLevel.get(level) + valueToAdd);
+      numReactionsPerLevel.set(level, numReactionsPerLevel.get(level) + 1);
     } else {
       while (numReactionsPerLevel.size() < level) {
         numReactionsPerLevel.add(0);
       }
-      numReactionsPerLevel.add(valueToAdd);
+      numReactionsPerLevel.add(1);
     }
   }
 
@@ -538,12 +492,7 @@ public String toDOT() {
               CUtil.getName(downstreamNode.getReaction().getParent().tpr)
                   + "."
                   + downstreamNode.getReaction().getName();
-          edges.append(
-              "    node_"
-                  + labelHashCode
-                  + " -> node_"
-                  + (downstreamLabel.hashCode() & 0xfffffff)
-                  + ";\n");
+          edges.append("    node_").append(labelHashCode).append(" -> node_").append(downstreamLabel.hashCode() & 0xfffffff).append(";\n");
         }
       }
       // Close the subgraph

From f8a21d6cd4b279c26288a6692feca02607033fb1 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 11 Jul 2023 16:20:21 -0700
Subject: [PATCH 0617/1114] Fix more compiler errors.

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index afd9bf9445..fe7270a916 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit afd9bf9445c26b511ea00611f67483901ddd6302
+Subproject commit fe7270a9167494733d7b3d7567b35af5fef30af6

From f8b29f444e20746cf76d244e81736725e60635da Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 11 Jul 2023 16:23:18 -0700
Subject: [PATCH 0618/1114] Remove networkMessageActions param of fed_config.

---
 .../org/lflang/federated/generator/FedMainEmitter.java | 10 +---------
 .../main/java/org/lflang/validation/AttributeSpec.java | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index 51e16c2450..7419728fec 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -84,20 +84,12 @@ private CharSequence generateMainSignature(
             .filter(federate::references)
             .map(renderer)
             .collect(Collectors.joining(",", "(", ")"));
-    // Empty "()" is currently not allowed by the syntax
-
-    var networkMessageActionsListString =
-        federate.networkMessageActions.stream()
-            .map(Variable::getName)
-            .collect(Collectors.joining(","));
 
     return """
-        @_fed_config(network_message_actions="%s")
+        @_fed_config()
         main reactor %s {
         """
         .formatted(
-            networkMessageActionsListString,
-            //            intraDependencies,
             paramList.equals("()") ? "" : paramList);
   }
 }
diff --git a/core/src/main/java/org/lflang/validation/AttributeSpec.java b/core/src/main/java/org/lflang/validation/AttributeSpec.java
index 4534fc0c13..b89d766c6f 100644
--- a/core/src/main/java/org/lflang/validation/AttributeSpec.java
+++ b/core/src/main/java/org/lflang/validation/AttributeSpec.java
@@ -219,15 +219,7 @@ enum AttrParamType {
         "enclave",
         new AttributeSpec(List.of(new AttrParamSpec(EACH_ATTR, AttrParamType.BOOLEAN, true))));
 
-    ATTRIBUTE_SPECS_BY_NAME.put(
-        "_fed_config",
-        new AttributeSpec(
-            List.of(
-                new AttrParamSpec(
-                    AttributeSpec.NETWORK_MESSAGE_ACTIONS, AttrParamType.STRING, false) // ,
-                //                new AttrParamSpec(AttributeSpec.DEPENDENCY_PAIRS,
-                // AttrParamType.STRING, false)
-                )));
+    ATTRIBUTE_SPECS_BY_NAME.put("_fed_config", new AttributeSpec(List.of()));
     ATTRIBUTE_SPECS_BY_NAME.put("_c_body", new AttributeSpec(null));
     ATTRIBUTE_SPECS_BY_NAME.put(
         "_tpoLevel",

From 709a705f5c9a99de3fb888eba68be8dfa7b16dee Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 11 Jul 2023 16:41:22 -0700
Subject: [PATCH 0619/1114] Get a smoke test to pass for Python federated.

---
 .../org/lflang/federated/extensions/PythonExtension.java   | 4 ++--
 .../java/org/lflang/federated/generator/FedASTUtils.java   | 5 ++++-
 .../org/lflang/federated/generator/FedMainEmitter.java     | 4 +---
 .../java/org/lflang/generator/ReactionInstanceGraph.java   | 7 ++++++-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
index f39b71f5ba..fa50ae9c63 100644
--- a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
@@ -167,13 +167,13 @@ protected void serializeAndSend(
         lengthExpression = pickler.serializedBufferLength();
         pointerExpression = pickler.seializedBufferVar();
         result.pr(pickler.generateNetworkSerializerCode(variableToSerialize, null));
-        result.pr("size_t message_length = " + lengthExpression + ";");
+        result.pr("size_t _lf_message_length = " + lengthExpression + ";");
         result.pr(sendingFunction + "(" + commonArgs + ", " + pointerExpression + ");\n");
         // Decrease the reference count for serialized_pyobject
         result.pr("Py_XDECREF(serialized_pyobject);\n");
       }
       case PROTO -> throw new UnsupportedOperationException(
-          "Protbuf serialization is not supported yet.");
+          "Protobuf serialization is not supported yet.");
       case ROS2 -> throw new UnsupportedOperationException(
           "ROS2 serialization is not supported yet.");
     }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 607993112a..f5cccc8038 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -165,7 +165,7 @@ private static Action createNetworkAction(FedConnectionInstance connection) {
 
     Action action = factory.createAction();
     // Name the newly created action; set its delay and type.
-    action.setName("networkMessage_" + networkMessageActionID++);
+    action.setName("networkMessage");
     if (connection.serializer == SupportedSerializers.NATIVE) {
       action.setType(EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getType()));
     } else {
@@ -702,6 +702,9 @@ private static Reaction getInitializationReaction() {
     var initializationReaction = LfFactory.eINSTANCE.createReaction();
     var startup = LfFactory.eINSTANCE.createBuiltinTriggerRef();
     startup.setType(BuiltinTrigger.STARTUP);
+    var a = LfFactory.eINSTANCE.createAttribute();
+    a.setAttrName("_c_body");
+    initializationReaction.getAttributes().add(a);
     initializationReaction.getTriggers().add(startup);
     var code = LfFactory.eINSTANCE.createCode();
     code.setBody(
diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index 7419728fec..7c78a10df7 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -7,7 +7,6 @@
 import org.lflang.ast.ASTUtils;
 import org.lflang.ast.FormattingUtil;
 import org.lflang.lf.Reactor;
-import org.lflang.lf.Variable;
 
 /** Helper class to generate a main reactor */
 public class FedMainEmitter {
@@ -89,7 +88,6 @@ private CharSequence generateMainSignature(
         @_fed_config()
         main reactor %s {
         """
-        .formatted(
-            paramList.equals("()") ? "" : paramList);
+        .formatted(paramList.equals("()") ? "" : paramList);
   }
 }
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
index 5e5c50a598..3c91b03537 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
@@ -492,7 +492,12 @@ public String toDOT() {
               CUtil.getName(downstreamNode.getReaction().getParent().tpr)
                   + "."
                   + downstreamNode.getReaction().getName();
-          edges.append("    node_").append(labelHashCode).append(" -> node_").append(downstreamLabel.hashCode() & 0xfffffff).append(";\n");
+          edges
+              .append("    node_")
+              .append(labelHashCode)
+              .append(" -> node_")
+              .append(downstreamLabel.hashCode() & 0xfffffff)
+              .append(";\n");
         }
       }
       // Close the subgraph

From 74baa0b863e3b1c7de00f0e0b1fc7d1a6f960ebd Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Wed, 12 Jul 2023 10:18:22 +0900
Subject: [PATCH 0620/1114] Resolve conflicts

---
 .../federated/generator/FedASTUtils.java      | 27 +++++--------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 107cb4c593..c13cb96406 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -44,11 +44,8 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.lflang.InferredType;
-<<<<<<< HEAD
 import org.lflang.Target;
-=======
 import org.lflang.MessageReporter;
->>>>>>> level-assignment
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
@@ -715,25 +712,8 @@ private static Reaction getInitializationReaction(FedConnectionInstance connecti
     initializationReaction.getAttributes().add(a);
     initializationReaction.getTriggers().add(startup);
     var code = LfFactory.eINSTANCE.createCode();
-<<<<<<< HEAD
     if (connection.srcFederate.targetConfig.target != Target.TS) {
       code.setBody(
-          """
-              extern reaction_t* port_absent_reaction[];
-              void enqueue_network_output_control_reactions();
-              LF_PRINT_DEBUG("Adding network output control reaction to table.");
-              port_absent_reaction[self->sender_index] = &self->_lf__reaction_2;
-              LF_PRINT_DEBUG("Added network output control reaction to table. Enqueueing it...");
-              enqueue_network_output_control_reactions();
-              """);
-    } else {
-      code.setBody(
-          """
-              // TODO: Figure out what to do for initialization reaction
-              """);
-    }
-=======
-    code.setBody(
         """
             extern reaction_t* port_absent_reaction[];
             void enqueue_network_output_control_reactions(environment_t*);
@@ -742,7 +722,12 @@ private static Reaction getInitializationReaction(FedConnectionInstance connecti
             LF_PRINT_DEBUG("Added network output control reaction to table. Enqueueing it...");
             enqueue_network_output_control_reactions(self->base.environment);
             """);
->>>>>>> level-assignment
+    } else {
+      code.setBody(
+          """
+              // TODO: Figure out what to do for initialization reaction
+              """);
+    }
     initializationReaction.setCode(code);
     return initializationReaction;
   }

From 50ef79a16698eceb04681fe970b21b8d53791bf3 Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Tue, 11 Jul 2023 19:38:05 -0700
Subject: [PATCH 0621/1114] formatter and update reactor-c threads

---
 .../lflang/generator/c/CCmakeGenerator.java   | 86 +++++++++----------
 .../org/lflang/generator/c/CGenerator.java    |  3 +-
 .../generator/c/CMainFunctionGenerator.java   |  8 +-
 core/src/main/resources/lib/c/reactor-c       |  2 +-
 test/C/src/rp2040/Timer.lf                    |  1 -
 5 files changed, 45 insertions(+), 55 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 228dbc7ee5..6c4f97c462 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -120,32 +120,31 @@ CodeBuilder generateCMakeCode(
     // Setup the project header for different platforms
     switch (targetConfig.platformOptions.platform) {
       case ZEPHYR:
-          cMakeCode.pr("# Set default configuration file. To add custom configurations,");
-          cMakeCode.pr("# pass -- -DOVERLAY_CONFIG=my_config.prj to either cmake or west");
-          cMakeCode.pr("set(CONF_FILE prj_lf.conf)");
-          if (targetConfig.platformOptions.board != null) {
-            cMakeCode.pr("# Selecting board specified in target property");
-            cMakeCode.pr("set(BOARD " + targetConfig.platformOptions.board + ")");
-          } else {
-            cMakeCode.pr("# Selecting default board");
-            cMakeCode.pr("set(BOARD qemu_cortex_m3)");
-          }
-          cMakeCode.pr("# We recommend Zephyr v3.3.0 but we are compatible with older versions also");
-          cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} 3.3.0)");
-          cMakeCode.newLine();
-          cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
-          cMakeCode.newLine();
-          break;
+        cMakeCode.pr("# Set default configuration file. To add custom configurations,");
+        cMakeCode.pr("# pass -- -DOVERLAY_CONFIG=my_config.prj to either cmake or west");
+        cMakeCode.pr("set(CONF_FILE prj_lf.conf)");
+        if (targetConfig.platformOptions.board != null) {
+          cMakeCode.pr("# Selecting board specified in target property");
+          cMakeCode.pr("set(BOARD " + targetConfig.platformOptions.board + ")");
+        } else {
+          cMakeCode.pr("# Selecting default board");
+          cMakeCode.pr("set(BOARD qemu_cortex_m3)");
+        }
+        cMakeCode.pr("# We recommend Zephyr v3.3.0 but we are compatible with older versions also");
+        cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} 3.3.0)");
+        cMakeCode.newLine();
+        cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
+        cMakeCode.newLine();
+        break;
       case RP2040:
-          cMakeCode.pr("include(pico_sdk_import.cmake)");
-          cMakeCode.pr("project(" + executableName + " LANGUAGES C CXX ASM)");
-          cMakeCode.newLine();
+        cMakeCode.pr("include(pico_sdk_import.cmake)");
+        cMakeCode.pr("project(" + executableName + " LANGUAGES C CXX ASM)");
+        cMakeCode.newLine();
       default:
-          cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
-          cMakeCode.newLine();
+        cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
+        cMakeCode.newLine();
     }
 
-
     // The Test build type is the Debug type plus coverage generation
     cMakeCode.pr("if(CMAKE_BUILD_TYPE STREQUAL \"Test\")");
     cMakeCode.pr("  set(CMAKE_BUILD_TYPE \"Debug\")");
@@ -214,28 +213,28 @@ CodeBuilder generateCMakeCode(
 
     // Setup main target for different platforms
     switch (targetConfig.platformOptions.platform) {
-      case ZEPHYR: 
-          cMakeCode.pr(
-              setUpMainTargetZephyr(
-                  hasMain,
-                  executableName,
-                  Stream.concat(additionalSources.stream(), sources.stream())));
-          break; 
+      case ZEPHYR:
+        cMakeCode.pr(
+            setUpMainTargetZephyr(
+                hasMain,
+                executableName,
+                Stream.concat(additionalSources.stream(), sources.stream())));
+        break;
       case RP2040:
-          cMakeCode.pr(
-              setUpMainTargetRp2040(
-                  hasMain,
-                  executableName,
-                  Stream.concat(additionalSources.stream(), sources.stream())));
-          break; 
+        cMakeCode.pr(
+            setUpMainTargetRp2040(
+                hasMain,
+                executableName,
+                Stream.concat(additionalSources.stream(), sources.stream())));
+        break;
       default:
-          cMakeCode.pr(
-              setUpMainTarget.getCmakeCode(
-                  hasMain,
-                  executableName,
-                  Stream.concat(additionalSources.stream(), sources.stream())));
+        cMakeCode.pr(
+            setUpMainTarget.getCmakeCode(
+                hasMain,
+                executableName,
+                Stream.concat(additionalSources.stream(), sources.stream())));
     }
-    
+
     cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE core)");
 
     cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC .)");
@@ -431,7 +430,7 @@ private static String setUpMainTargetRp2040(
     var code = new CodeBuilder();
     // FIXME: remove this and move to lingo build
     code.pr("add_compile_options(-Wall -Wextra -DLF_UNTHREADED)");
-    // initialize sdk  
+    // initialize sdk
     code.pr("pico_sdk_init()");
     code.newLine();
     code.pr("add_subdirectory(core)");
@@ -461,7 +460,4 @@ private static String setUpMainTargetRp2040(
 
     return code.toString();
   }
-
 }
-
-
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index e966d4613c..f34a57beed 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -938,8 +938,7 @@ protected void copyTargetFiles() throws IOException {
       FileUtil.copyFileFromClassPath(
           "/lib/platform/rp2040/pico_sdk_import.cmake", fileConfig.getSrcGenPath(), true);
       // VS Code configurations
-      FileUtil.copyFileFromClassPath(
-          "/lib/platform/rp2040/launch.json", vscodePath, true);
+      FileUtil.copyFileFromClassPath("/lib/platform/rp2040/launch.json", vscodePath, true);
     }
   }
 
diff --git a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
index 3ffea7e332..5d11e27e05 100644
--- a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
@@ -63,12 +63,8 @@ private String generateMainFunction() {
           "   exit(res);",
           "}");
     } else if (targetConfig.platformOptions.platform == Platform.RP2040) {
-      // Pico platform cannont use command line args. 
-      return String.join(
-          "\n",
-          "int main(void) {",
-          "   return lf_reactor_c_main(0, NULL);",
-          "}");
+      // Pico platform cannont use command line args.
+      return String.join("\n", "int main(void) {", "   return lf_reactor_c_main(0, NULL);", "}");
     } else {
       return String.join(
           "\n",
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index d43d241808..2207668f6a 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit d43d241808ffd54364280acded943b74393b9843
+Subproject commit 2207668f6a703b9ea22e3c81668579b36cdd18db
diff --git a/test/C/src/rp2040/Timer.lf b/test/C/src/rp2040/Timer.lf
index 5aefd01f49..ef437a46f3 100644
--- a/test/C/src/rp2040/Timer.lf
+++ b/test/C/src/rp2040/Timer.lf
@@ -4,6 +4,5 @@ target C {
 
 main reactor {
   timer t1(0, 100 msec)
-
   reaction(t1) {= printf("Logical Time: %d. \n", lf_time_logical()); =}
 }

From 97e2897a880233869fe487f3181e60a1fe008208 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 12 Jul 2023 14:30:39 +0200
Subject: [PATCH 0622/1114] Add verifier tests for CI

---
 test/C/src/verifier/ADASModel.lf    | 86 +++++++++++++++++++++++++++++
 test/C/src/verifier/AircraftDoor.lf | 43 +++++++++++++++
 test/C/src/verifier/Alarm.lf        | 35 ++++++++++++
 test/C/src/verifier/CoopSchedule.lf | 35 ++++++++++++
 test/C/src/verifier/Election2.lf    | 69 +++++++++++++++++++++++
 test/C/src/verifier/PingPong.lf     | 67 ++++++++++++++++++++++
 test/C/src/verifier/ProcessMsg.lf   | 39 +++++++++++++
 test/C/src/verifier/ProcessSync.lf  | 17 ++++++
 test/C/src/verifier/Ring.lf         | 48 ++++++++++++++++
 test/C/src/verifier/SafeSend.lf     | 61 ++++++++++++++++++++
 test/C/src/verifier/Thermostat.lf   | 66 ++++++++++++++++++++++
 test/C/src/verifier/TrainDoor.lf    | 35 ++++++++++++
 test/C/src/verifier/UnsafeSend.lf   | 61 ++++++++++++++++++++
 13 files changed, 662 insertions(+)
 create mode 100644 test/C/src/verifier/ADASModel.lf
 create mode 100644 test/C/src/verifier/AircraftDoor.lf
 create mode 100644 test/C/src/verifier/Alarm.lf
 create mode 100644 test/C/src/verifier/CoopSchedule.lf
 create mode 100644 test/C/src/verifier/Election2.lf
 create mode 100644 test/C/src/verifier/PingPong.lf
 create mode 100644 test/C/src/verifier/ProcessMsg.lf
 create mode 100644 test/C/src/verifier/ProcessSync.lf
 create mode 100644 test/C/src/verifier/Ring.lf
 create mode 100644 test/C/src/verifier/SafeSend.lf
 create mode 100644 test/C/src/verifier/Thermostat.lf
 create mode 100644 test/C/src/verifier/TrainDoor.lf
 create mode 100644 test/C/src/verifier/UnsafeSend.lf

diff --git a/test/C/src/verifier/ADASModel.lf b/test/C/src/verifier/ADASModel.lf
new file mode 100644
index 0000000000..38426fac26
--- /dev/null
+++ b/test/C/src/verifier/ADASModel.lf
@@ -0,0 +1,86 @@
+target C;
+
+preamble {=
+    typedef int c_frame_t;
+    typedef int l_frame_t;
+=}
+
+reactor Camera {
+    output out  :{=c_frame_t=};
+    state  frame:{=c_frame_t=};
+    timer  t(0, 17 msec); // 60 fps
+    reaction(t) -> out {=
+        // Capture a frame.
+        self->frame = 1;
+        lf_set(out, self->frame);
+    =}
+}
+
+reactor LiDAR {
+    output out  :{=l_frame_t=};
+    state  frame:{=l_frame_t=};
+    timer  t(0, 34 msec); // 30 fps
+    reaction(t) -> out {=
+        // Capture a frame.
+        self->frame = 2;
+        lf_set(out, self->frame);
+    =}
+}
+
+reactor Pedal {
+    output out:int;
+    physical action a;
+    reaction(a) -> out {=
+        lf_set(out, 1); =}
+}
+
+reactor Brakes {
+    input inADAS:int;
+    input inPedal:int;
+    state brakesApplied:int(0);
+    reaction(inADAS, inPedal) {=
+        // Actuate brakes.
+        self->brakesApplied = 1;
+    =} deadline(10 msec) {= =}
+}
+
+reactor ADASProcessor {
+    input in1:{=l_frame_t=};
+    input in2:{=c_frame_t=};
+    output out1:int;
+    output out2:int;
+    logical action a(50 msec);
+    state requestStop:int;
+    reaction(in1,in2) -> a {=
+        // ... Detect danger
+		// and request stop.
+        lf_schedule(a, 0);
+        self->requestStop = 1;
+    =}
+    reaction(a) -> out1, out2 {=
+        if (self->requestStop == 1)
+            lf_set(out1, 1);
+    =} deadline(20 msec) {= =}
+}
+
+reactor Dashboard {
+    input in:int;
+    state received:int;
+    reaction(in) {=
+        self->received = 1; =}
+}
+
+@property(name="responsive", tactic="bmc", spec="G[0, 10 ms]((ADASModel_l_reaction_0 && (F[0](ADASModel_p_requestStop == 1))) ==> (F[0, 55 ms]( ADASModel_b_brakesApplied == 1 )))", expect=true)
+main reactor ADASModel {
+    c = new Camera();
+    l = new LiDAR();
+    p = new ADASProcessor();
+    b = new Brakes();
+    d = new Dashboard();
+    // p = new Pedal();
+    l.out -> p.in1; 
+    c.out -> p.in2;
+    p.out2 -> d.in;
+    p.out1 -> b.inADAS after 5 msec;
+    // p.out -> b.inPedal;
+}
diff --git a/test/C/src/verifier/AircraftDoor.lf b/test/C/src/verifier/AircraftDoor.lf
new file mode 100644
index 0000000000..c9fc6d3511
--- /dev/null
+++ b/test/C/src/verifier/AircraftDoor.lf
@@ -0,0 +1,43 @@
+target C;
+
+reactor Controller {
+    output out:int;
+    reaction(startup) -> out {=        
+        lf_set(out, 1);
+    =}
+}
+
+reactor Vision {
+    
+    input in:int;
+    output out:int;
+    state ramp:int(0);
+    
+    reaction(in) -> out {=
+        if (self->ramp == 1) {
+            lf_set(out, 0); // 0 = Do not open.
+        } else {
+            lf_set(out, 1); // 1 = Open.
+        }
+    =}
+}
+
+reactor Door {
+    input in:int;
+    state doorOpen:int;
+    reaction(in) {=
+        if (in->value == 1)
+            self->doorOpen = 1; // Open
+        else if (in->value == 0)
+            self->doorOpen = 0; // Closed
+    =}
+}
+
+@property(name="vision_works", tactic="bmc", spec="((AircraftDoor_vision_ramp == 0) ==> (G[0 sec](AircraftDoor_door_reaction_0 ==> (AircraftDoor_door_doorOpen == 1))))", expect=true)
+main reactor AircraftDoor {
+    controller	= new Controller();
+    vision		= new Vision();
+    door		= new Door();
+    controller.out -> vision.in;
+    vision.out -> door.in;
+}
\ No newline at end of file
diff --git a/test/C/src/verifier/Alarm.lf b/test/C/src/verifier/Alarm.lf
new file mode 100644
index 0000000000..3aeb3ef264
--- /dev/null
+++ b/test/C/src/verifier/Alarm.lf
@@ -0,0 +1,35 @@
+target C;
+
+reactor Controller {
+    
+    output out:int;
+    output out2:int;
+    state fault:int;
+
+    logical action turnOff(1 sec):int;
+
+    @label("Computation")
+    reaction(startup) -> out, out2, turnOff {=
+        // ... Operation
+        self->fault = 1; // Fault occurs
+
+        // Fault handling
+        if (self->fault == 1) {
+            lf_schedule(turnOff, 0); // Wrong action value. Should be 1.
+            lf_set(out, 5);
+            lf_set(out2, 10);
+        }
+    =}
+
+    @label("Stop")
+    reaction(turnOff) {=
+        // Trigger the alarm and reset fault.
+        if (turnOff->value == 1)
+            self->fault = 0;
+    =}
+}
+
+@property(name="machine_stops_within_1_sec", tactic="bmc", spec="G[0, 1 sec]((Alarm_c_reaction_0) ==> F(0, 1 sec](Alarm_c_reaction_1)))", expect=true)
+main reactor {
+   c =  new Controller();
+}
diff --git a/test/C/src/verifier/CoopSchedule.lf b/test/C/src/verifier/CoopSchedule.lf
new file mode 100644
index 0000000000..6cf88f3266
--- /dev/null
+++ b/test/C/src/verifier/CoopSchedule.lf
@@ -0,0 +1,35 @@
+target C
+
+reactor Trigger {
+    output out:int
+    timer t(0,1 usec)
+
+    reaction(t) -> out {= 
+        lf_set(out, 1);
+    =}
+}
+
+reactor Task {
+    input cnt:int;
+    state counter:int(0);
+
+    reaction(cnt) {=
+        self->counter += 2; // Should be 1.
+    =}
+}
+
+@property(name="upperbound", tactic="bmc", spec="G[0, 1 usec]((CoopSchedule_task1_counter + CoopSchedule_task2_counter + CoopSchedule_task3_counter + CoopSchedule_task4_counter + CoopSchedule_task5_counter) < 15)", expect=false)
+main reactor {
+    trigger = new Trigger()
+    // TODO: Put these reactors in a bank.
+    task1 = new Task()
+    task2 = new Task()
+    task3 = new Task()
+    task4 = new Task()
+    task5 = new Task()
+    trigger.out -> task1.cnt
+    trigger.out -> task2.cnt
+    trigger.out -> task3.cnt
+    trigger.out -> task4.cnt
+    trigger.out -> task5.cnt
+}
\ No newline at end of file
diff --git a/test/C/src/verifier/Election2.lf b/test/C/src/verifier/Election2.lf
new file mode 100644
index 0000000000..37540325de
--- /dev/null
+++ b/test/C/src/verifier/Election2.lf
@@ -0,0 +1,69 @@
+target C
+
+reactor Node0 {
+    input in:int
+    output out:int
+    state id:int
+    state elected:int(0)
+        
+    reaction(startup) -> out {=
+        self->id = 0;
+        lf_set(out, self->id);
+    =}
+    reaction(in) -> out {=
+        if (in->value > self->id) {
+            lf_set(out, in->value);
+        } else if (in->value == self->id) {
+            self->elected = 1;
+        }
+    =}
+}
+
+reactor Node1 {
+    input in:int
+    output out:int
+    state id:int
+    state elected:int(0)
+        
+    reaction(startup) -> out {=
+        self->id = 1;
+        lf_set(out, self->id);
+    =}
+    reaction(in) -> out {=
+        if (in->value > self->id) {
+            lf_set(out, in->value);
+        } else if (in->value == self->id) {
+            self->elected = 1;
+        }
+    =}
+}
+
+reactor Node2 {
+    input in:int
+    output out:int
+    state id:int
+    state elected:int(0)
+        
+    reaction(startup) -> out {=
+        self->id = 2;
+        lf_set(out, self->id);
+    =}
+    reaction(in) -> out {=
+        if (in->value > self->id) {
+            lf_set(out, in->value);
+        } else if (in->value == self->id) {
+            self->elected = 1;
+        }
+    =}
+}
+
+// This property being checked does not hold. A valid property is F[0, 30 msec]((Election2_i0_elected + Election2_i1_elected + Election2_i2_elected) == 1)
+@property(name="exactly_one_elected", tactic="bmc", spec="F[0, 20 msec]((Election2_i0_elected + Election2_i1_elected + Election2_i2_elected) == 1)", expect=false)
+main reactor {
+    i0 = new Node0()
+    i1 = new Node1()
+    i2 = new Node2()
+    i0.out -> i1.in after 10 msec
+    i1.out -> i2.in after 10 msec
+    i2.out -> i0.in after 10 msec
+}
\ No newline at end of file
diff --git a/test/C/src/verifier/PingPong.lf b/test/C/src/verifier/PingPong.lf
new file mode 100644
index 0000000000..23e5936cb7
--- /dev/null
+++ b/test/C/src/verifier/PingPong.lf
@@ -0,0 +1,67 @@
+/**
+ * Basic benchmark from the Savina benchmark suite that is intended to measure
+ * message-passing overhead. This is based on
+ * https://www.scala-lang.org/old/node/54 See
+ * https://shamsimam.github.io/papers/2014-agere-savina.pdf.
+ *
+ * Ping introduces a microstep delay using a logical action to break the
+ * causality loop.
+ *
+ * To get a sense, some (informal) results for 1,000,000 ping-pongs on my Mac:
+ *
+ * - Unthreaded: 97 msec
+ * - Threaded: 265 msec
+ *
+ * There is no parallelism in this application, so it does not benefit from
+ * being being threaded, just some additional overhead.
+ *
+ * These measurements are total execution time, including startup and shutdown.
+ * These are about an order of magnitude faster than anything reported in the
+ * paper.
+ */
+target C {
+    fast: true
+}
+
+reactor Ping {
+    input receive: int
+    output send: int
+    state pingsLeft: int(10)
+    logical action serve(1 nsec)
+
+    reaction(startup) -> serve {=
+        self->pingsLeft = 10;
+        lf_schedule(serve, 0);
+    =}
+
+    reaction(serve) -> send {=
+        lf_set(send, self->pingsLeft);
+        self->pingsLeft -= 1;
+    =}
+
+    reaction(receive) -> serve {=
+        if (self->pingsLeft > 0) {
+            lf_schedule(serve, 0);
+        }
+    =}
+}
+
+reactor Pong {
+    input receive: int
+    output send: int
+    state count: int(0)
+    state expected: int(10)
+
+    reaction(receive) -> send {=
+        self->count += 1;
+        lf_set(send, receive->value);
+    =}
+}
+
+@property(name="no_two_consecutive_pings", tactic="bmc", spec="G[0, 4 nsec](PingPong_ping_reaction_1 ==> X(!PingPong_ping_reaction_1))", expect=false)
+main reactor PingPong {
+    ping = new Ping()
+    pong = new Pong()
+    ping.send -> pong.receive
+    pong.send -> ping.receive
+}
\ No newline at end of file
diff --git a/test/C/src/verifier/ProcessMsg.lf b/test/C/src/verifier/ProcessMsg.lf
new file mode 100644
index 0000000000..b936b8909a
--- /dev/null
+++ b/test/C/src/verifier/ProcessMsg.lf
@@ -0,0 +1,39 @@
+target C
+
+reactor Task {
+    input in:int
+    output out:int
+
+    state messageSent:int
+    state counter:int(0)
+    state panic:int(0)
+
+    timer t(0, 1 nsec)
+
+    logical action updateMessage
+
+    reaction(startup) {=
+        self->messageSent = 0;
+    =}
+    reaction(t) -> out {=
+        lf_set(out, self->messageSent);
+    =}
+    reaction(in) -> updateMessage {=
+        /* Check for invalid message.  */
+        if (in->value != self->messageSent) {
+            self->panic = 1;
+        }
+        lf_schedule(updateMessage, 0);
+        self->counter += 1;
+    =}
+    reaction(updateMessage) {=
+        /* Increment the last word of the 16-byte message.  */
+        self->messageSent += 1;
+    =}
+}
+
+@property(name="panic_free", tactic="bmc", spec="G[5 nsec](ProcessMsg_task_panic != 1)", expect=true)
+main reactor {
+    task = new Task()
+    task.out -> task.in
+}
\ No newline at end of file
diff --git a/test/C/src/verifier/ProcessSync.lf b/test/C/src/verifier/ProcessSync.lf
new file mode 100644
index 0000000000..20bc498b46
--- /dev/null
+++ b/test/C/src/verifier/ProcessSync.lf
@@ -0,0 +1,17 @@
+target C
+
+reactor Task {
+    /* Define the counters used in the demo application...  */
+    state tm_synchronization_processing_counter:int(0)
+    timer t(0,1 nsec)
+
+    reaction(t) {=
+        /* Increment the counter.  */
+        self->tm_synchronization_processing_counter += 1;
+    =}
+}
+
+@property(name="correctness", tactic="bmc", spec="G[2 nsec](ProcessSync_task_tm_synchronization_processing_counter == 3)", expect=true)
+main reactor {
+    task = new Task()
+}
\ No newline at end of file
diff --git a/test/C/src/verifier/Ring.lf b/test/C/src/verifier/Ring.lf
new file mode 100644
index 0000000000..d2a3e6db32
--- /dev/null
+++ b/test/C/src/verifier/Ring.lf
@@ -0,0 +1,48 @@
+/**
+ * There seems to be some problem with infinite feedback loops.
+ */
+target C
+
+reactor Source {
+    input in:int
+    output out:int
+    logical action start(1 nsec)
+    state received:int
+    reaction(startup) -> start {=
+        self->received = 0;
+        lf_schedule(start, 0);
+    =}
+    reaction(start) -> out {=
+        lf_set(out, self->received);
+    =}
+    /* Uncomment the following to debug feedback loops. */
+    // reaction(in) -> start {=
+    reaction(in) {=
+        self->received = in->value;
+        // lf_schedule(start, 0);
+    =}
+}
+
+reactor Node {
+    input in:int
+    output out:int
+    reaction(in) -> out {=
+        lf_set(out, in->value + 1);
+    =}
+}
+
+@property(name="full_circle", tactic="bmc", spec="F[0, 10 nsec](Ring_s_reaction_2)", expect=true)
+main reactor {
+    s = new Source()
+    n1 = new Node()
+    n2 = new Node()
+    n3 = new Node()
+    n4 = new Node()
+    n5 = new Node()
+    s.out -> n1.in after 1 nsec
+    n1.out -> n2.in after 1 nsec
+    n2.out -> n3.in after 1 nsec
+    n3.out -> n4.in after 1 nsec
+    n4.out -> n5.in after 1 nsec
+    n5.out -> s.in after 1 nsec
+}
diff --git a/test/C/src/verifier/SafeSend.lf b/test/C/src/verifier/SafeSend.lf
new file mode 100644
index 0000000000..cf1dde7bb1
--- /dev/null
+++ b/test/C/src/verifier/SafeSend.lf
@@ -0,0 +1,61 @@
+/**
+ * (Original) Description:
+ * This example illustrates the "Verify Absence-of-Errors" mode.
+ * The server expects a tuple `{REQUEST,PID-OF-SENDER}`
+ * but the main sends to it an atom instead of its pid, then
+ * generating an exception when the server tries to send back
+ * a response to what he assumes to be a pid.
+ *
+ * The verification step discovers a *genuine* counter-example.
+ * To inspect the error trace run bfc on the generated model
+ * and look at the trace alongside the dot model of the ACS.
+ */
+
+target C;
+
+reactor Client {
+    input in:int;
+    output out:int;
+    state req:int(0);
+
+    reaction(startup) -> out {=
+        // Sends a query
+        self->req = 1; // 1 is valid. 0 is invalid.
+        lf_set(out, self->req);
+    =}
+
+    reaction(in) {=
+        // Should not be invoked.
+        self->req = 0;
+    =}
+}
+
+reactor Server {
+    
+    input in:int;
+    output out:int;
+    state error:int;
+    logical action err;
+
+    reaction(in) -> out, err {=
+        if (in->value == 0) {
+            lf_schedule(err, 0);
+        }
+        else {
+            lf_set(out, in->value);
+        }
+    =}
+
+    // Error handling logic.
+    reaction(err) {=
+        self->error = 1;
+    =}
+}
+
+@property(name="success", tactic="bmc", spec="(F[0, 1 sec](SafeSend_c_reaction_1))", expect=true)
+main reactor {
+    c = new Client();
+    s = new Server();
+    c.out -> s.in after 1 nsec;
+    s.out -> c.in;
+}
diff --git a/test/C/src/verifier/Thermostat.lf b/test/C/src/verifier/Thermostat.lf
new file mode 100644
index 0000000000..4141201902
--- /dev/null
+++ b/test/C/src/verifier/Thermostat.lf
@@ -0,0 +1,66 @@
+/**
+ * A thermostat model based on
+ * Lee & Seshia Chapter 3, Example 3.5.
+ */
+target C
+
+reactor Environment {
+    input heatOn:int
+    output temperature:int
+    timer t(1 nsec, 10 sec)
+    state _heatOn:int
+    state _temperature:int
+    reaction(startup) {=
+        self->_temperature = 19;
+    =}
+    reaction(t) -> temperature {=
+        if (self->_heatOn == 0) {
+            self->_temperature -= 1;
+        } 
+        else {
+            self->_temperature += 1;
+        }
+        lf_set(temperature, self->_temperature);
+    =}
+    reaction(heatOn) {=
+        self->_heatOn = heatOn->value;
+    =}
+}
+
+reactor _Thermostat {
+    input temperature:int
+    output heatOn:int // 0 = OFF, 1 = ON
+    state _mode:int // 0 = COOLING, 1 = HEATING
+    logical action changeMode;
+    reaction(startup) {=
+        self->_mode = 0;
+    =}
+    reaction(temperature) -> heatOn, changeMode {=
+        if (self->_mode == 0) {
+            if (temperature->value <= 18) {
+                lf_set(heatOn, 1);
+                lf_schedule(changeMode, 0);
+            }
+        }
+        else if (self->_mode == 0) {
+            if (temperature->value >= 22) {
+                lf_set(heatOn, 0);
+                lf_schedule(changeMode, 0);
+            }
+        }
+    =}
+    reaction(changeMode) {=
+        if (self->_mode == 0)
+            self->_mode = 1;
+        else
+            self->_mode = 0;
+    =}
+}
+
+@property(name="correctness", tactic="bmc", spec="G[0, 20 sec](((Thermostat_t_temperature <= 18) ==> F[0](Thermostat_t__mode == 1))  &&  ((Thermostat_t_temperature >= 22) ==> F[0](Thermostat_t__mode == 0)))", expect=true)
+main reactor {
+    e = new Environment()
+    t = new _Thermostat()
+    e.temperature -> t.temperature
+    t.heatOn -> e.heatOn
+}
\ No newline at end of file
diff --git a/test/C/src/verifier/TrainDoor.lf b/test/C/src/verifier/TrainDoor.lf
new file mode 100644
index 0000000000..88d3950aba
--- /dev/null
+++ b/test/C/src/verifier/TrainDoor.lf
@@ -0,0 +1,35 @@
+target C;
+
+reactor Controller {
+    output out1:int;
+    output out2:int;
+    reaction(startup) -> out1, out2 {=
+        lf_set(out1, 1);
+        lf_set(out2, 2);
+    =}
+}
+
+reactor Train {
+    input in:int;
+    state received:int;
+    reaction(in) {=
+        self->received = in->value;
+    =}
+}
+
+reactor Door {
+    input in:int;
+    state received:int;
+    reaction(in) {=
+        self->received = in->value;
+    =}
+}
+
+@property(name="train_does_not_move_until_door_closes", tactic="bmc", spec="(!TrainDoor_t_reaction_0)U[0, 1 sec](TrainDoor_d_reaction_0)", expect=false)
+main reactor {
+    c = new Controller();
+    t = new Train();
+    d = new Door();
+    c.out1 -> t.in after 1 sec;
+    c.out2 -> d.in after 1 sec;
+}
diff --git a/test/C/src/verifier/UnsafeSend.lf b/test/C/src/verifier/UnsafeSend.lf
new file mode 100644
index 0000000000..7d03892069
--- /dev/null
+++ b/test/C/src/verifier/UnsafeSend.lf
@@ -0,0 +1,61 @@
+/**
+ * (Original) Description:
+ * This example illustrates the "Verify Absence-of-Errors" mode.
+ * The server expects a tuple `{REQUEST,PID-OF-SENDER}`
+ * but the main sends to it an atom instead of its pid, then
+ * generating an exception when the server tries to send back
+ * a response to what he assumes to be a pid.
+ *
+ * The verification step discovers a *genuine* counter-example.
+ * To inspect the error trace run bfc on the generated model
+ * and look at the trace alongside the dot model of the ACS.
+ */
+
+target C;
+
+reactor Client {
+    input in:int;
+    output out:int;
+    state req:int(0);
+
+    reaction(startup) -> out {=
+        // Sends a query
+        self->req = 0; // 1 is valid. 0 is invalid.
+        lf_set(out, self->req);
+    =}
+
+    reaction(in) {=
+        // Should not be invoked.
+        self->req = 0;
+    =}
+}
+
+reactor Server {
+    
+    input in:int;
+    output out:int;
+    state error:int;
+    logical action err(1 nsec);
+
+    reaction(in) -> out, err {=
+        if (in->value == 0) {
+            lf_schedule(err, 0);
+        }
+        else {
+            lf_set(out, in->value);
+        }
+    =}
+
+    // Error handling logic.
+    reaction(err) {=
+        self->error = 1;
+    =}
+}
+
+@property(name="success", tactic="bmc", spec="(F[0, 5 nsec](UnsafeSend_c_reaction_1))", expect=false)
+main reactor {
+    c = new Client();
+    s = new Server();
+    c.out -> s.in after 2 nsec;
+    s.out -> c.in after 2 nsec;
+}

From e588226f08b95480b2a9f45e1fa5a683afa99bc4 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 12 Jul 2023 14:33:51 +0200
Subject: [PATCH 0623/1114] Apply spotless

---
 test/C/src/verifier/ADASModel.lf    | 131 +++++++++++++------------
 test/C/src/verifier/AircraftDoor.lf |  67 +++++++------
 test/C/src/verifier/Alarm.lf        |  53 +++++-----
 test/C/src/verifier/CoopSchedule.lf |  49 +++++-----
 test/C/src/verifier/Election2.lf    | 145 +++++++++++++++-------------
 test/C/src/verifier/PingPong.lf     |  85 ++++++++--------
 test/C/src/verifier/ProcessMsg.lf   |  69 ++++++-------
 test/C/src/verifier/ProcessSync.lf  |  24 +++--
 test/C/src/verifier/Ring.lf         |  78 +++++++--------
 test/C/src/verifier/SafeSend.lf     |  94 +++++++++---------
 test/C/src/verifier/Thermostat.lf   | 111 ++++++++++-----------
 test/C/src/verifier/TrainDoor.lf    |  49 +++++-----
 test/C/src/verifier/UnsafeSend.lf   |  94 +++++++++---------
 13 files changed, 538 insertions(+), 511 deletions(-)

diff --git a/test/C/src/verifier/ADASModel.lf b/test/C/src/verifier/ADASModel.lf
index 38426fac26..41f8e27ace 100644
--- a/test/C/src/verifier/ADASModel.lf
+++ b/test/C/src/verifier/ADASModel.lf
@@ -1,86 +1,93 @@
-target C;
+target C
 
 preamble {=
-    typedef int c_frame_t;
-    typedef int l_frame_t;
+  typedef int c_frame_t;
+  typedef int l_frame_t;
 =}
 
 reactor Camera {
-    output out  :{=c_frame_t=};
-    state  frame:{=c_frame_t=};
-    timer  t(0, 17 msec); // 60 fps
-    reaction(t) -> out {=
-        // Capture a frame.
-        self->frame = 1;
-        lf_set(out, self->frame);
-    =}
+  output out: {= c_frame_t =}
+  state frame: {= c_frame_t =}
+  timer t(0, 17 msec)  // 60 fps
+
+  reaction(t) -> out {=
+    // Capture a frame.
+    self->frame = 1;
+    lf_set(out, self->frame);
+  =}
 }
 
 reactor LiDAR {
-    output out  :{=l_frame_t=};
-    state  frame:{=l_frame_t=};
-    timer  t(0, 34 msec); // 30 fps
-    reaction(t) -> out {=
-        // Capture a frame.
-        self->frame = 2;
-        lf_set(out, self->frame);
-    =}
+  output out: {= l_frame_t =}
+  state frame: {= l_frame_t =}
+  timer t(0, 34 msec)  // 30 fps
+
+  reaction(t) -> out {=
+    // Capture a frame.
+    self->frame = 2;
+    lf_set(out, self->frame);
+  =}
 }
 
 reactor Pedal {
-    output out:int;
-    physical action a;
-    reaction(a) -> out {=
-        lf_set(out, 1); =}
+  output out: int
+  physical action a
+
+  reaction(a) -> out {= lf_set(out, 1); =}
 }
 
 reactor Brakes {
-    input inADAS:int;
-    input inPedal:int;
-    state brakesApplied:int(0);
-    reaction(inADAS, inPedal) {=
-        // Actuate brakes.
-        self->brakesApplied = 1;
-    =} deadline(10 msec) {= =}
+  input inADAS: int
+  input inPedal: int
+  state brakesApplied: int = 0
+
+  reaction(inADAS, inPedal) {=
+    // Actuate brakes.
+    self->brakesApplied = 1;
+  =} deadline(10 msec) {=  =}
 }
 
 reactor ADASProcessor {
-    input in1:{=l_frame_t=};
-    input in2:{=c_frame_t=};
-    output out1:int;
-    output out2:int;
-    logical action a(50 msec);
-    state requestStop:int;
-    reaction(in1,in2) -> a {=
-        // ... Detect danger
-		// and request stop.
-        lf_schedule(a, 0);
-        self->requestStop = 1;
-    =}
-    reaction(a) -> out1, out2 {=
-        if (self->requestStop == 1)
-            lf_set(out1, 1);
-    =} deadline(20 msec) {= =}
+  input in1: {= l_frame_t =}
+  input in2: {= c_frame_t =}
+  output out1: int
+  output out2: int
+  logical action a(50 msec)
+  state requestStop: int
+
+  reaction(in1, in2) -> a {=
+          // ... Detect danger
+    // and request stop.
+          lf_schedule(a, 0);
+          self->requestStop = 1;
+  =}
+
+  reaction(a) -> out1, out2 {=
+    if (self->requestStop == 1)
+        lf_set(out1, 1);
+  =} deadline(20 msec) {=  =}
 }
 
 reactor Dashboard {
-    input in:int;
-    state received:int;
-    reaction(in) {=
-        self->received = 1; =}
+  input in: int
+  state received: int
+
+  reaction(in) {= self->received = 1; =}
 }
 
-@property(name="responsive", tactic="bmc", spec="G[0, 10 ms]((ADASModel_l_reaction_0 && (F[0](ADASModel_p_requestStop == 1))) ==> (F[0, 55 ms]( ADASModel_b_brakesApplied == 1 )))", expect=true)
+@property(
+    name = "responsive",
+    tactic = "bmc",
+    spec = "G[0, 10 ms]((ADASModel_l_reaction_0 && (F[0](ADASModel_p_requestStop == 1))) ==> (F[0, 55 ms]( ADASModel_b_brakesApplied == 1 )))",
+    expect = true)
 main reactor ADASModel {
-    c = new Camera();
-    l = new LiDAR();
-    p = new ADASProcessor();
-    b = new Brakes();
-    d = new Dashboard();
-    // p = new Pedal();
-    l.out -> p.in1; 
-    c.out -> p.in2;
-    p.out2 -> d.in;
-    p.out1 -> b.inADAS after 5 msec;
-    // p.out -> b.inPedal;
+  c = new Camera()
+  l = new LiDAR()
+  p = new ADASProcessor()
+  b = new Brakes()
+  d = new Dashboard()
+  l.out -> p.in1                   // p = new Pedal();
+  c.out -> p.in2
+  p.out2 -> d.in
+  p.out1 -> b.inADAS after 5 msec  // p.out -> b.inPedal;
 }
diff --git a/test/C/src/verifier/AircraftDoor.lf b/test/C/src/verifier/AircraftDoor.lf
index c9fc6d3511..ab6390ffbe 100644
--- a/test/C/src/verifier/AircraftDoor.lf
+++ b/test/C/src/verifier/AircraftDoor.lf
@@ -1,43 +1,46 @@
-target C;
+target C
 
 reactor Controller {
-    output out:int;
-    reaction(startup) -> out {=        
-        lf_set(out, 1);
-    =}
+  output out: int
+
+  reaction(startup) -> out {= lf_set(out, 1); =}
 }
 
 reactor Vision {
-    
-    input in:int;
-    output out:int;
-    state ramp:int(0);
-    
-    reaction(in) -> out {=
-        if (self->ramp == 1) {
-            lf_set(out, 0); // 0 = Do not open.
-        } else {
-            lf_set(out, 1); // 1 = Open.
-        }
-    =}
+  input in: int
+  output out: int
+  state ramp: int = 0
+
+  reaction(in) -> out {=
+    if (self->ramp == 1) {
+        lf_set(out, 0); // 0 = Do not open.
+    } else {
+        lf_set(out, 1); // 1 = Open.
+    }
+  =}
 }
 
 reactor Door {
-    input in:int;
-    state doorOpen:int;
-    reaction(in) {=
-        if (in->value == 1)
-            self->doorOpen = 1; // Open
-        else if (in->value == 0)
-            self->doorOpen = 0; // Closed
-    =}
+  input in: int
+  state doorOpen: int
+
+  reaction(in) {=
+    if (in->value == 1)
+        self->doorOpen = 1; // Open
+    else if (in->value == 0)
+        self->doorOpen = 0; // Closed
+  =}
 }
 
-@property(name="vision_works", tactic="bmc", spec="((AircraftDoor_vision_ramp == 0) ==> (G[0 sec](AircraftDoor_door_reaction_0 ==> (AircraftDoor_door_doorOpen == 1))))", expect=true)
+@property(
+    name = "vision_works",
+    tactic = "bmc",
+    spec = "((AircraftDoor_vision_ramp == 0) ==> (G[0 sec](AircraftDoor_door_reaction_0 ==> (AircraftDoor_door_doorOpen == 1))))",
+    expect = true)
 main reactor AircraftDoor {
-    controller	= new Controller();
-    vision		= new Vision();
-    door		= new Door();
-    controller.out -> vision.in;
-    vision.out -> door.in;
-}
\ No newline at end of file
+  controller = new Controller()
+  vision = new Vision()
+  door = new Door()
+  controller.out -> vision.in
+  vision.out -> door.in
+}
diff --git a/test/C/src/verifier/Alarm.lf b/test/C/src/verifier/Alarm.lf
index 3aeb3ef264..6449f8d626 100644
--- a/test/C/src/verifier/Alarm.lf
+++ b/test/C/src/verifier/Alarm.lf
@@ -1,35 +1,38 @@
-target C;
+target C
 
 reactor Controller {
-    
-    output out:int;
-    output out2:int;
-    state fault:int;
+  output out: int
+  output out2: int
+  state fault: int
 
-    logical action turnOff(1 sec):int;
+  logical action turnOff(1 sec): int
 
-    @label("Computation")
-    reaction(startup) -> out, out2, turnOff {=
-        // ... Operation
-        self->fault = 1; // Fault occurs
+  @label("Computation")
+  reaction(startup) -> out, out2, turnOff {=
+    // ... Operation
+    self->fault = 1; // Fault occurs
 
-        // Fault handling
-        if (self->fault == 1) {
-            lf_schedule(turnOff, 0); // Wrong action value. Should be 1.
-            lf_set(out, 5);
-            lf_set(out2, 10);
-        }
-    =}
+    // Fault handling
+    if (self->fault == 1) {
+        lf_schedule(turnOff, 0); // Wrong action value. Should be 1.
+        lf_set(out, 5);
+        lf_set(out2, 10);
+    }
+  =}
 
-    @label("Stop")
-    reaction(turnOff) {=
-        // Trigger the alarm and reset fault.
-        if (turnOff->value == 1)
-            self->fault = 0;
-    =}
+  @label("Stop")
+  reaction(turnOff) {=
+    // Trigger the alarm and reset fault.
+    if (turnOff->value == 1)
+        self->fault = 0;
+  =}
 }
 
-@property(name="machine_stops_within_1_sec", tactic="bmc", spec="G[0, 1 sec]((Alarm_c_reaction_0) ==> F(0, 1 sec](Alarm_c_reaction_1)))", expect=true)
+@property(
+    name = "machine_stops_within_1_sec",
+    tactic = "bmc",
+    spec = "G[0, 1 sec]((Alarm_c_reaction_0) ==> F(0, 1 sec](Alarm_c_reaction_1)))",
+    expect = true)
 main reactor {
-   c =  new Controller();
+  c = new Controller()
 }
diff --git a/test/C/src/verifier/CoopSchedule.lf b/test/C/src/verifier/CoopSchedule.lf
index 6cf88f3266..c755ef7559 100644
--- a/test/C/src/verifier/CoopSchedule.lf
+++ b/test/C/src/verifier/CoopSchedule.lf
@@ -1,35 +1,36 @@
 target C
 
 reactor Trigger {
-    output out:int
-    timer t(0,1 usec)
+  output out: int
+  timer t(0, 1 usec)
 
-    reaction(t) -> out {= 
-        lf_set(out, 1);
-    =}
+  reaction(t) -> out {= lf_set(out, 1); =}
 }
 
 reactor Task {
-    input cnt:int;
-    state counter:int(0);
+  input cnt: int
+  state counter: int = 0
 
-    reaction(cnt) {=
-        self->counter += 2; // Should be 1.
-    =}
+  reaction(cnt) {=
+    self->counter += 2; // Should be 1.
+  =}
 }
 
-@property(name="upperbound", tactic="bmc", spec="G[0, 1 usec]((CoopSchedule_task1_counter + CoopSchedule_task2_counter + CoopSchedule_task3_counter + CoopSchedule_task4_counter + CoopSchedule_task5_counter) < 15)", expect=false)
+@property(
+    name = "upperbound",
+    tactic = "bmc",
+    spec = "G[0, 1 usec]((CoopSchedule_task1_counter + CoopSchedule_task2_counter + CoopSchedule_task3_counter + CoopSchedule_task4_counter + CoopSchedule_task5_counter) < 15)",
+    expect = false)
 main reactor {
-    trigger = new Trigger()
-    // TODO: Put these reactors in a bank.
-    task1 = new Task()
-    task2 = new Task()
-    task3 = new Task()
-    task4 = new Task()
-    task5 = new Task()
-    trigger.out -> task1.cnt
-    trigger.out -> task2.cnt
-    trigger.out -> task3.cnt
-    trigger.out -> task4.cnt
-    trigger.out -> task5.cnt
-}
\ No newline at end of file
+  trigger = new Trigger()
+  task1 = new Task()  // TODO: Put these reactors in a bank.
+  task2 = new Task()
+  task3 = new Task()
+  task4 = new Task()
+  task5 = new Task()
+  trigger.out -> task1.cnt
+  trigger.out -> task2.cnt
+  trigger.out -> task3.cnt
+  trigger.out -> task4.cnt
+  trigger.out -> task5.cnt
+}
diff --git a/test/C/src/verifier/Election2.lf b/test/C/src/verifier/Election2.lf
index 37540325de..a94ac19429 100644
--- a/test/C/src/verifier/Election2.lf
+++ b/test/C/src/verifier/Election2.lf
@@ -1,69 +1,76 @@
-target C
-
-reactor Node0 {
-    input in:int
-    output out:int
-    state id:int
-    state elected:int(0)
-        
-    reaction(startup) -> out {=
-        self->id = 0;
-        lf_set(out, self->id);
-    =}
-    reaction(in) -> out {=
-        if (in->value > self->id) {
-            lf_set(out, in->value);
-        } else if (in->value == self->id) {
-            self->elected = 1;
-        }
-    =}
-}
-
-reactor Node1 {
-    input in:int
-    output out:int
-    state id:int
-    state elected:int(0)
-        
-    reaction(startup) -> out {=
-        self->id = 1;
-        lf_set(out, self->id);
-    =}
-    reaction(in) -> out {=
-        if (in->value > self->id) {
-            lf_set(out, in->value);
-        } else if (in->value == self->id) {
-            self->elected = 1;
-        }
-    =}
-}
-
-reactor Node2 {
-    input in:int
-    output out:int
-    state id:int
-    state elected:int(0)
-        
-    reaction(startup) -> out {=
-        self->id = 2;
-        lf_set(out, self->id);
-    =}
-    reaction(in) -> out {=
-        if (in->value > self->id) {
-            lf_set(out, in->value);
-        } else if (in->value == self->id) {
-            self->elected = 1;
-        }
-    =}
-}
-
-// This property being checked does not hold. A valid property is F[0, 30 msec]((Election2_i0_elected + Election2_i1_elected + Election2_i2_elected) == 1)
-@property(name="exactly_one_elected", tactic="bmc", spec="F[0, 20 msec]((Election2_i0_elected + Election2_i1_elected + Election2_i2_elected) == 1)", expect=false)
-main reactor {
-    i0 = new Node0()
-    i1 = new Node1()
-    i2 = new Node2()
-    i0.out -> i1.in after 10 msec
-    i1.out -> i2.in after 10 msec
-    i2.out -> i0.in after 10 msec
-}
\ No newline at end of file
+target C
+
+reactor Node0 {
+  input in: int
+  output out: int
+  state id: int
+  state elected: int = 0
+
+  reaction(startup) -> out {=
+    self->id = 0;
+    lf_set(out, self->id);
+  =}
+
+  reaction(in) -> out {=
+    if (in->value > self->id) {
+        lf_set(out, in->value);
+    } else if (in->value == self->id) {
+        self->elected = 1;
+    }
+  =}
+}
+
+reactor Node1 {
+  input in: int
+  output out: int
+  state id: int
+  state elected: int = 0
+
+  reaction(startup) -> out {=
+    self->id = 1;
+    lf_set(out, self->id);
+  =}
+
+  reaction(in) -> out {=
+    if (in->value > self->id) {
+        lf_set(out, in->value);
+    } else if (in->value == self->id) {
+        self->elected = 1;
+    }
+  =}
+}
+
+reactor Node2 {
+  input in: int
+  output out: int
+  state id: int
+  state elected: int = 0
+
+  reaction(startup) -> out {=
+    self->id = 2;
+    lf_set(out, self->id);
+  =}
+
+  reaction(in) -> out {=
+    if (in->value > self->id) {
+        lf_set(out, in->value);
+    } else if (in->value == self->id) {
+        self->elected = 1;
+    }
+  =}
+}
+
+// This property being checked does not hold. A valid property is F[0, 30 msec]((Election2_i0_elected + Election2_i1_elected + Election2_i2_elected) == 1)
+@property(
+    name = "exactly_one_elected",
+    tactic = "bmc",
+    spec = "F[0, 20 msec]((Election2_i0_elected + Election2_i1_elected + Election2_i2_elected) == 1)",
+    expect = false)
+main reactor {
+  i0 = new Node0()
+  i1 = new Node1()
+  i2 = new Node2()
+  i0.out -> i1.in after 10 msec
+  i1.out -> i2.in after 10 msec
+  i2.out -> i0.in after 10 msec
+}
diff --git a/test/C/src/verifier/PingPong.lf b/test/C/src/verifier/PingPong.lf
index 23e5936cb7..c8f45b400b 100644
--- a/test/C/src/verifier/PingPong.lf
+++ b/test/C/src/verifier/PingPong.lf
@@ -1,67 +1,68 @@
 /**
- * Basic benchmark from the Savina benchmark suite that is intended to measure
- * message-passing overhead. This is based on
- * https://www.scala-lang.org/old/node/54 See
+ * Basic benchmark from the Savina benchmark suite that is intended to measure message-passing
+ * overhead. This is based on https://www.scala-lang.org/old/node/54 See
  * https://shamsimam.github.io/papers/2014-agere-savina.pdf.
  *
- * Ping introduces a microstep delay using a logical action to break the
- * causality loop.
+ * Ping introduces a microstep delay using a logical action to break the causality loop.
  *
  * To get a sense, some (informal) results for 1,000,000 ping-pongs on my Mac:
  *
  * - Unthreaded: 97 msec
  * - Threaded: 265 msec
  *
- * There is no parallelism in this application, so it does not benefit from
- * being being threaded, just some additional overhead.
+ * There is no parallelism in this application, so it does not benefit from being being threaded,
+ * just some additional overhead.
  *
- * These measurements are total execution time, including startup and shutdown.
- * These are about an order of magnitude faster than anything reported in the
- * paper.
+ * These measurements are total execution time, including startup and shutdown. These are about an
+ * order of magnitude faster than anything reported in the paper.
  */
 target C {
-    fast: true
+  fast: true
 }
 
 reactor Ping {
-    input receive: int
-    output send: int
-    state pingsLeft: int(10)
-    logical action serve(1 nsec)
+  input receive: int
+  output send: int
+  state pingsLeft: int = 10
+  logical action serve(1 nsec)
 
-    reaction(startup) -> serve {=
-        self->pingsLeft = 10;
-        lf_schedule(serve, 0);
-    =}
+  reaction(startup) -> serve {=
+    self->pingsLeft = 10;
+    lf_schedule(serve, 0);
+  =}
 
-    reaction(serve) -> send {=
-        lf_set(send, self->pingsLeft);
-        self->pingsLeft -= 1;
-    =}
+  reaction(serve) -> send {=
+    lf_set(send, self->pingsLeft);
+    self->pingsLeft -= 1;
+  =}
 
-    reaction(receive) -> serve {=
-        if (self->pingsLeft > 0) {
-            lf_schedule(serve, 0);
-        }
-    =}
+  reaction(receive) -> serve {=
+    if (self->pingsLeft > 0) {
+        lf_schedule(serve, 0);
+    }
+  =}
 }
 
 reactor Pong {
-    input receive: int
-    output send: int
-    state count: int(0)
-    state expected: int(10)
+  input receive: int
+  output send: int
+  state count: int = 0
+  state expected: int = 10
 
-    reaction(receive) -> send {=
-        self->count += 1;
-        lf_set(send, receive->value);
-    =}
+  reaction(receive) -> send {=
+    self->count += 1;
+    lf_set(send, receive->value);
+  =}
 }
 
-@property(name="no_two_consecutive_pings", tactic="bmc", spec="G[0, 4 nsec](PingPong_ping_reaction_1 ==> X(!PingPong_ping_reaction_1))", expect=false)
+@property(
+    name = "no_two_consecutive_pings",
+    tactic = "bmc",
+    spec = "G[0, 4 nsec](PingPong_ping_reaction_1 ==> X(!PingPong_ping_reaction_1))",
+    expect = false)
 main reactor PingPong {
-    ping = new Ping()
-    pong = new Pong()
-    ping.send -> pong.receive
-    pong.send -> ping.receive
-}
\ No newline at end of file
+  ping = new Ping()
+  pong = new Pong()
+  ping.send -> pong.receive
+  pong.send -> ping.receive
+}
diff --git a/test/C/src/verifier/ProcessMsg.lf b/test/C/src/verifier/ProcessMsg.lf
index b936b8909a..ce9a2090d7 100644
--- a/test/C/src/verifier/ProcessMsg.lf
+++ b/test/C/src/verifier/ProcessMsg.lf
@@ -1,39 +1,42 @@
 target C
 
 reactor Task {
-    input in:int
-    output out:int
-
-    state messageSent:int
-    state counter:int(0)
-    state panic:int(0)
-
-    timer t(0, 1 nsec)
-
-    logical action updateMessage
-
-    reaction(startup) {=
-        self->messageSent = 0;
-    =}
-    reaction(t) -> out {=
-        lf_set(out, self->messageSent);
-    =}
-    reaction(in) -> updateMessage {=
-        /* Check for invalid message.  */
-        if (in->value != self->messageSent) {
-            self->panic = 1;
-        }
-        lf_schedule(updateMessage, 0);
-        self->counter += 1;
-    =}
-    reaction(updateMessage) {=
-        /* Increment the last word of the 16-byte message.  */
-        self->messageSent += 1;
-    =}
+  input in: int
+  output out: int
+
+  state messageSent: int
+  state counter: int = 0
+  state panic: int = 0
+
+  timer t(0, 1 nsec)
+
+  logical action updateMessage
+
+  reaction(startup) {= self->messageSent = 0; =}
+
+  reaction(t) -> out {= lf_set(out, self->messageSent); =}
+
+  reaction(in) -> updateMessage {=
+    /* Check for invalid message.  */
+    if (in->value != self->messageSent) {
+        self->panic = 1;
+    }
+    lf_schedule(updateMessage, 0);
+    self->counter += 1;
+  =}
+
+  reaction(updateMessage) {=
+    /* Increment the last word of the 16-byte message.  */
+    self->messageSent += 1;
+  =}
 }
 
-@property(name="panic_free", tactic="bmc", spec="G[5 nsec](ProcessMsg_task_panic != 1)", expect=true)
+@property(
+    name = "panic_free",
+    tactic = "bmc",
+    spec = "G[5 nsec](ProcessMsg_task_panic != 1)",
+    expect = true)
 main reactor {
-    task = new Task()
-    task.out -> task.in
-}
\ No newline at end of file
+  task = new Task()
+  task.out -> task.in
+}
diff --git a/test/C/src/verifier/ProcessSync.lf b/test/C/src/verifier/ProcessSync.lf
index 20bc498b46..cc045810ea 100644
--- a/test/C/src/verifier/ProcessSync.lf
+++ b/test/C/src/verifier/ProcessSync.lf
@@ -1,17 +1,21 @@
 target C
 
 reactor Task {
-    /* Define the counters used in the demo application...  */
-    state tm_synchronization_processing_counter:int(0)
-    timer t(0,1 nsec)
+  /** Define the counters used in the demo application... */
+  state tm_synchronization_processing_counter: int = 0
+  timer t(0, 1 nsec)
 
-    reaction(t) {=
-        /* Increment the counter.  */
-        self->tm_synchronization_processing_counter += 1;
-    =}
+  reaction(t) {=
+    /* Increment the counter.  */
+    self->tm_synchronization_processing_counter += 1;
+  =}
 }
 
-@property(name="correctness", tactic="bmc", spec="G[2 nsec](ProcessSync_task_tm_synchronization_processing_counter == 3)", expect=true)
+@property(
+    name = "correctness",
+    tactic = "bmc",
+    spec = "G[2 nsec](ProcessSync_task_tm_synchronization_processing_counter == 3)",
+    expect = true)
 main reactor {
-    task = new Task()
-}
\ No newline at end of file
+  task = new Task()
+}
diff --git a/test/C/src/verifier/Ring.lf b/test/C/src/verifier/Ring.lf
index d2a3e6db32..eb289e1f24 100644
--- a/test/C/src/verifier/Ring.lf
+++ b/test/C/src/verifier/Ring.lf
@@ -1,48 +1,50 @@
-/**
- * There seems to be some problem with infinite feedback loops.
- */
+/** There seems to be some problem with infinite feedback loops. */
 target C
 
 reactor Source {
-    input in:int
-    output out:int
-    logical action start(1 nsec)
-    state received:int
-    reaction(startup) -> start {=
-        self->received = 0;
-        lf_schedule(start, 0);
-    =}
-    reaction(start) -> out {=
-        lf_set(out, self->received);
-    =}
-    /* Uncomment the following to debug feedback loops. */
-    // reaction(in) -> start {=
-    reaction(in) {=
-        self->received = in->value;
-        // lf_schedule(start, 0);
-    =}
+  input in: int
+  output out: int
+  logical action start(1 nsec)
+  state received: int
+
+  reaction(startup) -> start {=
+    self->received = 0;
+    lf_schedule(start, 0);
+  =}
+
+  reaction(start) -> out {= lf_set(out, self->received); =}
+
+  /** Uncomment the following to debug feedback loops. */
+  // reaction(in) -> start {=
+  reaction(in) {=
+    self->received = in->value;
+    // lf_schedule(start, 0);
+  =}
 }
 
 reactor Node {
-    input in:int
-    output out:int
-    reaction(in) -> out {=
-        lf_set(out, in->value + 1);
-    =}
+  input in: int
+  output out: int
+
+  reaction(in) -> out {= lf_set(out, in->value + 1); =}
 }
 
-@property(name="full_circle", tactic="bmc", spec="F[0, 10 nsec](Ring_s_reaction_2)", expect=true)
+@property(
+    name = "full_circle",
+    tactic = "bmc",
+    spec = "F[0, 10 nsec](Ring_s_reaction_2)",
+    expect = true)
 main reactor {
-    s = new Source()
-    n1 = new Node()
-    n2 = new Node()
-    n3 = new Node()
-    n4 = new Node()
-    n5 = new Node()
-    s.out -> n1.in after 1 nsec
-    n1.out -> n2.in after 1 nsec
-    n2.out -> n3.in after 1 nsec
-    n3.out -> n4.in after 1 nsec
-    n4.out -> n5.in after 1 nsec
-    n5.out -> s.in after 1 nsec
+  s = new Source()
+  n1 = new Node()
+  n2 = new Node()
+  n3 = new Node()
+  n4 = new Node()
+  n5 = new Node()
+  s.out -> n1.in after 1 nsec
+  n1.out -> n2.in after 1 nsec
+  n2.out -> n3.in after 1 nsec
+  n3.out -> n4.in after 1 nsec
+  n4.out -> n5.in after 1 nsec
+  n5.out -> s.in after 1 nsec
 }
diff --git a/test/C/src/verifier/SafeSend.lf b/test/C/src/verifier/SafeSend.lf
index cf1dde7bb1..da21ef589f 100644
--- a/test/C/src/verifier/SafeSend.lf
+++ b/test/C/src/verifier/SafeSend.lf
@@ -1,61 +1,57 @@
 /**
- * (Original) Description:
- * This example illustrates the "Verify Absence-of-Errors" mode.
- * The server expects a tuple `{REQUEST,PID-OF-SENDER}`
- * but the main sends to it an atom instead of its pid, then
- * generating an exception when the server tries to send back
- * a response to what he assumes to be a pid.
+ * (Original) Description: This example illustrates the "Verify Absence-of-Errors" mode. The server
+ * expects a tuple `{REQUEST,PID-OF-SENDER}` but the main sends to it an atom instead of its pid,
+ * then generating an exception when the server tries to send back a response to what he assumes to
+ * be a pid.
  *
- * The verification step discovers a *genuine* counter-example.
- * To inspect the error trace run bfc on the generated model
- * and look at the trace alongside the dot model of the ACS.
+ * The verification step discovers a *genuine* counter-example. To inspect the error trace run bfc
+ * on the generated model and look at the trace alongside the dot model of the ACS.
  */
-
-target C;
+target C
 
 reactor Client {
-    input in:int;
-    output out:int;
-    state req:int(0);
-
-    reaction(startup) -> out {=
-        // Sends a query
-        self->req = 1; // 1 is valid. 0 is invalid.
-        lf_set(out, self->req);
-    =}
-
-    reaction(in) {=
-        // Should not be invoked.
-        self->req = 0;
-    =}
+  input in: int
+  output out: int
+  state req: int = 0
+
+  reaction(startup) -> out {=
+    // Sends a query
+    self->req = 1; // 1 is valid. 0 is invalid.
+    lf_set(out, self->req);
+  =}
+
+  reaction(in) {=
+    // Should not be invoked.
+    self->req = 0;
+  =}
 }
 
 reactor Server {
-    
-    input in:int;
-    output out:int;
-    state error:int;
-    logical action err;
-
-    reaction(in) -> out, err {=
-        if (in->value == 0) {
-            lf_schedule(err, 0);
-        }
-        else {
-            lf_set(out, in->value);
-        }
-    =}
-
-    // Error handling logic.
-    reaction(err) {=
-        self->error = 1;
-    =}
+  input in: int
+  output out: int
+  state error: int
+  logical action err
+
+  reaction(in) -> out, err {=
+    if (in->value == 0) {
+        lf_schedule(err, 0);
+    }
+    else {
+        lf_set(out, in->value);
+    }
+  =}
+
+  reaction(err) {= self->error = 1; =}  // Error handling logic.
 }
 
-@property(name="success", tactic="bmc", spec="(F[0, 1 sec](SafeSend_c_reaction_1))", expect=true)
+@property(
+    name = "success",
+    tactic = "bmc",
+    spec = "(F[0, 1 sec](SafeSend_c_reaction_1))",
+    expect = true)
 main reactor {
-    c = new Client();
-    s = new Server();
-    c.out -> s.in after 1 nsec;
-    s.out -> c.in;
+  c = new Client()
+  s = new Server()
+  c.out -> s.in after 1 nsec
+  s.out -> c.in
 }
diff --git a/test/C/src/verifier/Thermostat.lf b/test/C/src/verifier/Thermostat.lf
index 4141201902..0b583d307d 100644
--- a/test/C/src/verifier/Thermostat.lf
+++ b/test/C/src/verifier/Thermostat.lf
@@ -1,66 +1,67 @@
-/**
- * A thermostat model based on
- * Lee & Seshia Chapter 3, Example 3.5.
- */
+/** A thermostat model based on Lee & Seshia Chapter 3, Example 3.5. */
 target C
 
 reactor Environment {
-    input heatOn:int
-    output temperature:int
-    timer t(1 nsec, 10 sec)
-    state _heatOn:int
-    state _temperature:int
-    reaction(startup) {=
-        self->_temperature = 19;
-    =}
-    reaction(t) -> temperature {=
-        if (self->_heatOn == 0) {
-            self->_temperature -= 1;
-        } 
-        else {
-            self->_temperature += 1;
-        }
-        lf_set(temperature, self->_temperature);
-    =}
-    reaction(heatOn) {=
-        self->_heatOn = heatOn->value;
-    =}
+  input heatOn: int
+  output temperature: int
+  timer t(1 nsec, 10 sec)
+  state _heatOn: int
+  state _temperature: int
+
+  reaction(startup) {= self->_temperature = 19; =}
+
+  reaction(t) -> temperature {=
+    if (self->_heatOn == 0) {
+        self->_temperature -= 1;
+    }
+    else {
+        self->_temperature += 1;
+    }
+    lf_set(temperature, self->_temperature);
+  =}
+
+  reaction(heatOn) {= self->_heatOn = heatOn->value; =}
 }
 
 reactor _Thermostat {
-    input temperature:int
-    output heatOn:int // 0 = OFF, 1 = ON
-    state _mode:int // 0 = COOLING, 1 = HEATING
-    logical action changeMode;
-    reaction(startup) {=
-        self->_mode = 0;
-    =}
-    reaction(temperature) -> heatOn, changeMode {=
-        if (self->_mode == 0) {
-            if (temperature->value <= 18) {
-                lf_set(heatOn, 1);
-                lf_schedule(changeMode, 0);
-            }
+  input temperature: int
+  output heatOn: int  // 0 = OFF, 1 = ON
+  state _mode: int    // 0 = COOLING, 1 = HEATING
+  logical action changeMode
+
+  reaction(startup) {= self->_mode = 0; =}
+
+  reaction(temperature) -> heatOn, changeMode {=
+    if (self->_mode == 0) {
+        if (temperature->value <= 18) {
+            lf_set(heatOn, 1);
+            lf_schedule(changeMode, 0);
         }
-        else if (self->_mode == 0) {
-            if (temperature->value >= 22) {
-                lf_set(heatOn, 0);
-                lf_schedule(changeMode, 0);
-            }
+    }
+    else if (self->_mode == 0) {
+        if (temperature->value >= 22) {
+            lf_set(heatOn, 0);
+            lf_schedule(changeMode, 0);
         }
-    =}
-    reaction(changeMode) {=
-        if (self->_mode == 0)
-            self->_mode = 1;
-        else
-            self->_mode = 0;
-    =}
+    }
+  =}
+
+  reaction(changeMode) {=
+    if (self->_mode == 0)
+        self->_mode = 1;
+    else
+        self->_mode = 0;
+  =}
 }
 
-@property(name="correctness", tactic="bmc", spec="G[0, 20 sec](((Thermostat_t_temperature <= 18) ==> F[0](Thermostat_t__mode == 1))  &&  ((Thermostat_t_temperature >= 22) ==> F[0](Thermostat_t__mode == 0)))", expect=true)
+@property(
+    name = "correctness",
+    tactic = "bmc",
+    spec = "G[0, 20 sec](((Thermostat_t_temperature <= 18) ==> F[0](Thermostat_t__mode == 1))  &&  ((Thermostat_t_temperature >= 22) ==> F[0](Thermostat_t__mode == 0)))",
+    expect = true)
 main reactor {
-    e = new Environment()
-    t = new _Thermostat()
-    e.temperature -> t.temperature
-    t.heatOn -> e.heatOn
-}
\ No newline at end of file
+  e = new Environment()
+  t = new _Thermostat()
+  e.temperature -> t.temperature
+  t.heatOn -> e.heatOn
+}
diff --git a/test/C/src/verifier/TrainDoor.lf b/test/C/src/verifier/TrainDoor.lf
index 88d3950aba..d39f473bea 100644
--- a/test/C/src/verifier/TrainDoor.lf
+++ b/test/C/src/verifier/TrainDoor.lf
@@ -1,35 +1,38 @@
-target C;
+target C
 
 reactor Controller {
-    output out1:int;
-    output out2:int;
-    reaction(startup) -> out1, out2 {=
-        lf_set(out1, 1);
-        lf_set(out2, 2);
-    =}
+  output out1: int
+  output out2: int
+
+  reaction(startup) -> out1, out2 {=
+    lf_set(out1, 1);
+    lf_set(out2, 2);
+  =}
 }
 
 reactor Train {
-    input in:int;
-    state received:int;
-    reaction(in) {=
-        self->received = in->value;
-    =}
+  input in: int
+  state received: int
+
+  reaction(in) {= self->received = in->value; =}
 }
 
 reactor Door {
-    input in:int;
-    state received:int;
-    reaction(in) {=
-        self->received = in->value;
-    =}
+  input in: int
+  state received: int
+
+  reaction(in) {= self->received = in->value; =}
 }
 
-@property(name="train_does_not_move_until_door_closes", tactic="bmc", spec="(!TrainDoor_t_reaction_0)U[0, 1 sec](TrainDoor_d_reaction_0)", expect=false)
+@property(
+    name = "train_does_not_move_until_door_closes",
+    tactic = "bmc",
+    spec = "(!TrainDoor_t_reaction_0)U[0, 1 sec](TrainDoor_d_reaction_0)",
+    expect = false)
 main reactor {
-    c = new Controller();
-    t = new Train();
-    d = new Door();
-    c.out1 -> t.in after 1 sec;
-    c.out2 -> d.in after 1 sec;
+  c = new Controller()
+  t = new Train()
+  d = new Door()
+  c.out1 -> t.in after 1 sec
+  c.out2 -> d.in after 1 sec
 }
diff --git a/test/C/src/verifier/UnsafeSend.lf b/test/C/src/verifier/UnsafeSend.lf
index 7d03892069..73c3585885 100644
--- a/test/C/src/verifier/UnsafeSend.lf
+++ b/test/C/src/verifier/UnsafeSend.lf
@@ -1,61 +1,57 @@
 /**
- * (Original) Description:
- * This example illustrates the "Verify Absence-of-Errors" mode.
- * The server expects a tuple `{REQUEST,PID-OF-SENDER}`
- * but the main sends to it an atom instead of its pid, then
- * generating an exception when the server tries to send back
- * a response to what he assumes to be a pid.
+ * (Original) Description: This example illustrates the "Verify Absence-of-Errors" mode. The server
+ * expects a tuple `{REQUEST,PID-OF-SENDER}` but the main sends to it an atom instead of its pid,
+ * then generating an exception when the server tries to send back a response to what he assumes to
+ * be a pid.
  *
- * The verification step discovers a *genuine* counter-example.
- * To inspect the error trace run bfc on the generated model
- * and look at the trace alongside the dot model of the ACS.
+ * The verification step discovers a *genuine* counter-example. To inspect the error trace run bfc
+ * on the generated model and look at the trace alongside the dot model of the ACS.
  */
-
-target C;
+target C
 
 reactor Client {
-    input in:int;
-    output out:int;
-    state req:int(0);
-
-    reaction(startup) -> out {=
-        // Sends a query
-        self->req = 0; // 1 is valid. 0 is invalid.
-        lf_set(out, self->req);
-    =}
-
-    reaction(in) {=
-        // Should not be invoked.
-        self->req = 0;
-    =}
+  input in: int
+  output out: int
+  state req: int = 0
+
+  reaction(startup) -> out {=
+    // Sends a query
+    self->req = 0; // 1 is valid. 0 is invalid.
+    lf_set(out, self->req);
+  =}
+
+  reaction(in) {=
+    // Should not be invoked.
+    self->req = 0;
+  =}
 }
 
 reactor Server {
-    
-    input in:int;
-    output out:int;
-    state error:int;
-    logical action err(1 nsec);
-
-    reaction(in) -> out, err {=
-        if (in->value == 0) {
-            lf_schedule(err, 0);
-        }
-        else {
-            lf_set(out, in->value);
-        }
-    =}
-
-    // Error handling logic.
-    reaction(err) {=
-        self->error = 1;
-    =}
+  input in: int
+  output out: int
+  state error: int
+  logical action err(1 nsec)
+
+  reaction(in) -> out, err {=
+    if (in->value == 0) {
+        lf_schedule(err, 0);
+    }
+    else {
+        lf_set(out, in->value);
+    }
+  =}
+
+  reaction(err) {= self->error = 1; =}  // Error handling logic.
 }
 
-@property(name="success", tactic="bmc", spec="(F[0, 5 nsec](UnsafeSend_c_reaction_1))", expect=false)
+@property(
+    name = "success",
+    tactic = "bmc",
+    spec = "(F[0, 5 nsec](UnsafeSend_c_reaction_1))",
+    expect = false)
 main reactor {
-    c = new Client();
-    s = new Server();
-    c.out -> s.in after 2 nsec;
-    s.out -> c.in after 2 nsec;
+  c = new Client()
+  s = new Server()
+  c.out -> s.in after 2 nsec
+  s.out -> c.in after 2 nsec
 }

From 197c323d9db72e20615461a34d4477107f7b9f6d Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 12 Jul 2023 16:55:37 +0200
Subject: [PATCH 0624/1114] rename ping pong test to make the name unique

---
 test/C/src/verifier/{PingPong.lf => PingPongVerifier.lf} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename test/C/src/verifier/{PingPong.lf => PingPongVerifier.lf} (92%)

diff --git a/test/C/src/verifier/PingPong.lf b/test/C/src/verifier/PingPongVerifier.lf
similarity index 92%
rename from test/C/src/verifier/PingPong.lf
rename to test/C/src/verifier/PingPongVerifier.lf
index c8f45b400b..b69f99aa3a 100644
--- a/test/C/src/verifier/PingPong.lf
+++ b/test/C/src/verifier/PingPongVerifier.lf
@@ -58,9 +58,9 @@ reactor Pong {
 @property(
     name = "no_two_consecutive_pings",
     tactic = "bmc",
-    spec = "G[0, 4 nsec](PingPong_ping_reaction_1 ==> X(!PingPong_ping_reaction_1))",
+    spec = "G[0, 4 nsec](PingPongVerifier_ping_reaction_1 ==> X(!PingPongVerifier_ping_reaction_1))",
     expect = false)
-main reactor PingPong {
+main reactor PingPongVerifier {
   ping = new Ping()
   pong = new Pong()
   ping.send -> pong.receive

From 00c04f78b14628fb100327695a51fd4bfaa80478 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 12 Jul 2023 16:56:13 +0200
Subject: [PATCH 0625/1114] add the verifier test category

---
 core/src/testFixtures/java/org/lflang/tests/TestRegistry.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
index 53dda29121..27e1d26d3f 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
@@ -334,6 +334,7 @@ public enum TestCategory {
     ARDUINO(false, "", TestLevel.BUILD),
     ZEPHYR_THREADED(false, "zephyr" + File.separator + "threaded", TestLevel.BUILD),
     ZEPHYR_UNTHREADED(false, "zephyr" + File.separator + "unthreaded", TestLevel.BUILD),
+    VERIFIER(false, "verifier", TestLevel.EXECUTION),
     TARGET(false, "", TestLevel.EXECUTION);
 
     /** Whether we should compare coverage against other targets. */

From 4b83bcf8a32fbaa11c74a3299df9595176897c1e Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 12 Jul 2023 17:09:05 +0200
Subject: [PATCH 0626/1114] add verifier test class

---
 .../lflang/tests/runtime/CVerifierTest.java   | 30 +++++++++++++++++++
 .../java/org/lflang/tests/TestBase.java       |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
new file mode 100644
index 0000000000..ac8dbc6e9c
--- /dev/null
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
@@ -0,0 +1,30 @@
+package org.lflang.tests.runtime;
+
+import java.util.List;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
+import org.lflang.Target;
+import org.lflang.tests.TestBase;
+import org.lflang.tests.TestRegistry;
+
+public class CVerifierTest extends TestBase {
+  protected CVerifierTest() {
+    super(Target.C);
+  }
+
+  @Test
+  public void runVerifierTests() {
+    Assumptions.assumeTrue(isLinux(), "Verifier tests only run on Linux");
+
+    super.runTestsFor(
+        List.of(Target.C),
+        Message.DESC_VERIFIER,
+        TestRegistry.TestCategory.VERIFIER::equals,
+        test -> {
+          test.getContext().getTargetConfig().verify = true;
+          return true;
+        },
+        TestLevel.EXECUTION,
+        false);
+  }
+}
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index b1b52b0c2e..92eeba5734 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -156,6 +156,7 @@ public static class Message {
     public static final String DESC_SCHED_SWAPPING = "Running with non-default runtime scheduler ";
     public static final String DESC_ROS2 = "Running tests using ROS2.";
     public static final String DESC_MODAL = "Run modal reactor tests.";
+    public static final String DESC_VERIFIER = "Run verifier tests.";
 
     /* Missing dependency messages */
     public static final String MISSING_DOCKER =

From 4db440452a955bd73f502f2712f71301f794787d Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 12 Jul 2023 17:32:42 +0200
Subject: [PATCH 0627/1114] exclude the verifier tests from zephyr and
 multithreaded

---
 .../integrationTest/java/org/lflang/tests/runtime/CCppTest.java  | 1 +
 core/src/testFixtures/java/org/lflang/tests/Configurators.java   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java
index 3142058c23..6324098963 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java
@@ -46,6 +46,7 @@ private static boolean isExcludedFromCCpp(TestCategory category) {
     excluded |= category == TestCategory.ZEPHYR_THREADED;
     excluded |= category == TestCategory.ARDUINO;
     excluded |= category == TestCategory.NO_INLINING;
+    excluded |= category == TestCategory.VERIFIER;
     return !excluded;
   }
 }
diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index 4fd80816e1..4191687278 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -113,6 +113,7 @@ public static boolean compatibleWithThreadingOff(TestCategory category) {
             || category == TestCategory.DOCKER_FEDERATED
             || category == TestCategory.DOCKER
             || category == TestCategory.ARDUINO
+            || category == TestCategory.VERIFIER
             || category == TestCategory.ZEPHYR_UNTHREADED
             || category == TestCategory.ZEPHYR_THREADED;
 

From c9f80aa7cc1c4d2a9d12cb090d212685d219ba84 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 12 Jul 2023 17:33:15 +0200
Subject: [PATCH 0628/1114] update CI

---
 ...ier-c-benchmarks.yml => c-verifier-tests.yml} | 16 +++++++---------
 .github/workflows/only-c.yml                     |  4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)
 rename .github/workflows/{uclid-verifier-c-benchmarks.yml => c-verifier-tests.yml} (80%)

diff --git a/.github/workflows/uclid-verifier-c-benchmarks.yml b/.github/workflows/c-verifier-tests.yml
similarity index 80%
rename from .github/workflows/uclid-verifier-c-benchmarks.yml
rename to .github/workflows/c-verifier-tests.yml
index e17e152408..a2a7e13821 100644
--- a/.github/workflows/uclid-verifier-c-benchmarks.yml
+++ b/.github/workflows/c-verifier-tests.yml
@@ -21,12 +21,6 @@ jobs:
           path: lingua-franca
           submodules: true
           fetch-depth: 0
-      - name: Check out lf-verifier-benchmarks repository
-        uses: actions/checkout@v3
-        with:
-          repository: lf-lang/lf-verifier-benchmarks
-          ref: main
-          path: lf-verifier-benchmarks
       - name: Check out Uclid5 repository
         uses: actions/checkout@v3
         with:
@@ -64,6 +58,10 @@ jobs:
           unzip uclid-0.9.5.zip
           ./uclid-0.9.5/bin/uclid --help
           echo "$(pwd)/uclid-0.9.5/bin" >> $GITHUB_PATH
-      - name: Run the test script
-        working-directory: lf-verifier-benchmarks/
-        run: ./scripts/test-lf-verifier
+      - name: Run verifier tests
+        run: ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CVerifierTest.* core:integrationTestCodeCoverageReport
+      - name: Report to CodeCov
+        uses: ./.github/actions/report-code-coverage
+        with:
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+        if: ${{ github.repository == 'lf-lang/lingua-franca' }}
diff --git a/.github/workflows/only-c.yml b/.github/workflows/only-c.yml
index 1ae37cb18e..ae9016465c 100644
--- a/.github/workflows/only-c.yml
+++ b/.github/workflows/only-c.yml
@@ -43,5 +43,5 @@ jobs:
       all-platforms: ${{ !github.event.pull_request.draft  }}
 
   # Run the Uclid-based LF Verifier benchmarks.
-  uclid:
-    uses: ./.github/workflows/uclid-verifier-c-benchmarks.yml
+  verifier:
+    uses: ./.github/workflows/c-verifier-tests.yml

From 2747157c116ed87994856026315db84f7080b2af Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 12 Jul 2023 18:04:33 +0200
Subject: [PATCH 0629/1114] ensure correct directory

---
 .github/workflows/c-verifier-tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/c-verifier-tests.yml b/.github/workflows/c-verifier-tests.yml
index a2a7e13821..59883532da 100644
--- a/.github/workflows/c-verifier-tests.yml
+++ b/.github/workflows/c-verifier-tests.yml
@@ -58,6 +58,7 @@ jobs:
           unzip uclid-0.9.5.zip
           ./uclid-0.9.5/bin/uclid --help
           echo "$(pwd)/uclid-0.9.5/bin" >> $GITHUB_PATH
+          cd ..
       - name: Run verifier tests
         run: ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CVerifierTest.* core:integrationTestCodeCoverageReport
       - name: Report to CodeCov

From d07e029c8814b9b5b4329d7881b40e0b3f5130ff Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai@berkeley.edu>
Date: Wed, 12 Jul 2023 09:20:11 -0700
Subject: [PATCH 0630/1114] Output error message when dependencies are not
 installed.

---
 core/src/main/java/org/lflang/generator/LFGenerator.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/LFGenerator.java b/core/src/main/java/org/lflang/generator/LFGenerator.java
index c0ec38cd9f..9ee47427f8 100644
--- a/core/src/main/java/org/lflang/generator/LFGenerator.java
+++ b/core/src/main/java/org/lflang/generator/LFGenerator.java
@@ -192,11 +192,11 @@ private void runVerifierIfPropertiesDetected(Resource resource, LFGeneratorConte
               .error(
                   "Fail to check the generated verification models because Uclid5 or Z3 is not"
                       + " installed.");
+        } else {
+          // Run the Uclid tool.
+          uclidGenerator.runner.run();
         }
 
-        // Run the Uclid tool.
-        uclidGenerator.runner.run();
-
       } else {
         messageReporter
             .nowhere()

From 06a8944de01ad41cdd86578bba22204fab58bc1b Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 12 Jul 2023 18:29:49 +0200
Subject: [PATCH 0631/1114] actually ensure correct directory

---
 .github/workflows/c-verifier-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-verifier-tests.yml b/.github/workflows/c-verifier-tests.yml
index 59883532da..9d9161e4af 100644
--- a/.github/workflows/c-verifier-tests.yml
+++ b/.github/workflows/c-verifier-tests.yml
@@ -58,7 +58,7 @@ jobs:
           unzip uclid-0.9.5.zip
           ./uclid-0.9.5/bin/uclid --help
           echo "$(pwd)/uclid-0.9.5/bin" >> $GITHUB_PATH
-          cd ..
+          cd ../..
       - name: Run verifier tests
         run: ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CVerifierTest.* core:integrationTestCodeCoverageReport
       - name: Report to CodeCov

From b99931b88d8f4786861d9a56d1c5fa00d9a5f101 Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Wed, 12 Jul 2023 10:51:30 -0700
Subject: [PATCH 0632/1114] [refactor] break in switch

---
 core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java | 1 +
 core/src/main/resources/lib/c/reactor-c                        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 6c4f97c462..7c6b68908f 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -140,6 +140,7 @@ CodeBuilder generateCMakeCode(
         cMakeCode.pr("include(pico_sdk_import.cmake)");
         cMakeCode.pr("project(" + executableName + " LANGUAGES C CXX ASM)");
         cMakeCode.newLine();
+        break;
       default:
         cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
         cMakeCode.newLine();
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 2207668f6a..3daba0d3c6 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 2207668f6a703b9ea22e3c81668579b36cdd18db
+Subproject commit 3daba0d3c697e75f811485786f82562416764889

From 4696ee02ca3e93e411a5a98001f9248e58fd456b Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 13 Jul 2023 10:03:54 +0200
Subject: [PATCH 0633/1114] bring workflow up to standard and add debug info

---
 .github/workflows/c-verifier-tests.yml | 39 +++++++++++++++-----------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/c-verifier-tests.yml b/.github/workflows/c-verifier-tests.yml
index 9d9161e4af..8e2ec09915 100644
--- a/.github/workflows/c-verifier-tests.yml
+++ b/.github/workflows/c-verifier-tests.yml
@@ -3,10 +3,13 @@ name: Uclid5-based Verifier Tests
 on:
   # Trigger this workflow also on workflow_call events.
   workflow_call:
-
-env:
-  ACTIONS_STEP_DEBUG: TRUE
-  ACTIONS_RUNNER_DEBUG: TRUE
+    inputs:
+      compiler-ref:
+        required: false
+        type: string
+      runtime-ref:
+        required: false
+        type: string
 
 jobs:
   run:
@@ -18,26 +21,25 @@ jobs:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3
         with:
-          path: lingua-franca
+          repository: lf-lang/lingua-franca
           submodules: true
+          ref: ${{ inputs.compiler-ref }}
           fetch-depth: 0
+      - name: Prepare build environment
+        uses: ./.github/actions/prepare-build-env
+      - name: Check out specific ref of reactor-c
+        uses: actions/checkout@v3
+        with:
+          repository: lf-lang/reactor-c
+          path: core/src/main/resources/lib/c/reactor-c
+          ref: ${{ inputs.runtime-ref }}
+        if: ${{ inputs.runtime-ref }}
       - name: Check out Uclid5 repository
         uses: actions/checkout@v3
         with:
           repository: uclid-org/uclid
           ref: 4fd5e566c5f87b052f92e9b23723a85e1c4d8c1c
           path: uclid
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: 17
-      - name: Install Lingua Franca
-        working-directory: lingua-franca/
-        run: |
-          ./gradlew assemble
-          ./bin/lfc --version
-          echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: Download Z3
         working-directory: uclid/
         if: steps.cache-z3.outputs.cache-hit != 'true'
@@ -60,7 +62,10 @@ jobs:
           echo "$(pwd)/uclid-0.9.5/bin" >> $GITHUB_PATH
           cd ../..
       - name: Run verifier tests
-        run: ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CVerifierTest.* core:integrationTestCodeCoverageReport
+        run: |
+          echo "$pwd"
+          ls -la
+          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CVerifierTest.* core:integrationTestCodeCoverageReport
       - name: Report to CodeCov
         uses: ./.github/actions/report-code-coverage
         with:

From ad4daeb1584df0aee700368fe4abca82e4948bf7 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Thu, 13 Jul 2023 17:32:16 +0200
Subject: [PATCH 0634/1114] Fix the assertion error.

---
 core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
index 2a07c3cba0..c563356edf 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -191,6 +191,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     super.printInfo(context.getMode());
     ASTUtils.setMainName(context.getFileConfig().resource, context.getFileConfig().name);
     super.createMainInstantiation();
+    super.setReactorsAndInstantiationGraph(context.getMode());
 
     // Create the main reactor instance if there is a main reactor.
     this.main =

From 67f37e3898d4ba3a23a979930f6f0f24cb58e77b Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 13 Jul 2023 11:35:40 -0700
Subject: [PATCH 0635/1114] Update submodule.

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index fe7270a916..e01d85a242 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit fe7270a9167494733d7b3d7567b35af5fef30af6
+Subproject commit e01d85a242f91d672f8cf660ea8a2a1df9e050d4

From 2e7cfb06f7a658e29a646ef54f9ae5926702be39 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 14 Jul 2023 11:10:17 +0200
Subject: [PATCH 0636/1114] Adjust platform and test level

---
 .../java/org/lflang/tests/runtime/CVerifierTest.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
index ac8dbc6e9c..d9bde8b3ed 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
@@ -14,7 +14,7 @@ protected CVerifierTest() {
 
   @Test
   public void runVerifierTests() {
-    Assumptions.assumeTrue(isLinux(), "Verifier tests only run on Linux");
+    Assumptions.assumeTrue(isLinux() || isMac(), "Verifier tests only run on Linux or macOS");
 
     super.runTestsFor(
         List.of(Target.C),
@@ -24,7 +24,7 @@ public void runVerifierTests() {
           test.getContext().getTargetConfig().verify = true;
           return true;
         },
-        TestLevel.EXECUTION,
+        TestLevel.BUILD,
         false);
   }
 }

From 5df0f52fa3b5d0cd30027ffbf2e23691f345ed9e Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Fri, 14 Jul 2023 11:24:57 +0200
Subject: [PATCH 0637/1114] Fix typos

---
 test/README.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/test/README.md b/test/README.md
index 6725982dd0..2d494954d9 100644
--- a/test/README.md
+++ b/test/README.md
@@ -8,13 +8,19 @@ The simplest way to run integration tests for a specific target is the `targetTe
 ```
 ./gradlew targetTest -Ptarget=Rust
 ```
-You can specify any valid target. If you run the task without specifying the target property `./gradlew tagetTest` it will produce an error message and list all available targets.
+You can specify any valid target. If you run the task without specifying the target property `./gradlew targetTest` it will produce an error message and list all available targets.
 
 The `targetTest` task is essentially a convenient shortcut for the following:
 ```
-./gradew core:integrationTest --test org.lflang.tests.runtime.<target>Test.*
+./gradlew core:integrationTest --tests org.lflang.tests.runtime.<target>Test.*
 ```
 If you prefer have more control over which tests are executed, you can also use this more verbose version.
+On Zsh (Z shell), which is the default shell for macOS, make sure to add
+quotes if `*` is used to prevent Zsh from matching the test name against the
+filesystem and returning a `zsh: no matches found` error.
+```
+./gradlew core:integrationTest --tests "org.lflang.tests.runtime.<target>Test.*"
+```
 
 It is also possible to run a subset of the tests. For example, the C tests are organized into the following categories:
 

From d1a80e5af65dcdcddca1a9724c25cbf9b591a700 Mon Sep 17 00:00:00 2001
From: "Shaokai (Jerry) Lin" <shaokai@berkeley.edu>
Date: Fri, 14 Jul 2023 11:27:47 +0200
Subject: [PATCH 0638/1114] Add a line break

---
 test/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/README.md b/test/README.md
index 2d494954d9..be5833ae43 100644
--- a/test/README.md
+++ b/test/README.md
@@ -15,6 +15,7 @@ The `targetTest` task is essentially a convenient shortcut for the following:
 ./gradlew core:integrationTest --tests org.lflang.tests.runtime.<target>Test.*
 ```
 If you prefer have more control over which tests are executed, you can also use this more verbose version.
+
 On Zsh (Z shell), which is the default shell for macOS, make sure to add
 quotes if `*` is used to prevent Zsh from matching the test name against the
 filesystem and returning a `zsh: no matches found` error.

From 0a1c42109c6cff278eb0adc2fcc31aeb3555c01c Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 14 Jul 2023 15:20:02 -0700
Subject: [PATCH 0639/1114] Update test/README.md

---
 test/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/README.md b/test/README.md
index be5833ae43..2292f25320 100644
--- a/test/README.md
+++ b/test/README.md
@@ -8,7 +8,7 @@ The simplest way to run integration tests for a specific target is the `targetTe
 ```
 ./gradlew targetTest -Ptarget=Rust
 ```
-You can specify any valid target. If you run the task without specifying the target property `./gradlew targetTest` it will produce an error message and list all available targets.
+You can specify any valid target. If you run the task without specifying the target property, `./gradlew targetTest` will produce an error message and list all available targets.
 
 The `targetTest` task is essentially a convenient shortcut for the following:
 ```

From cdb04131368ba8fc2090cc54650d688c9c71696b Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 14 Jul 2023 17:05:19 -0700
Subject: [PATCH 0640/1114] Mark SpuriousDependency as passing.

It was necessary to make a modification to SpuriousDependency in order
for it to pass because the original version had top-level reactions and
state variables. We do not currently have a good way to get top-level
reactions and state variables to work properly. The problem is that is
we simply put the reactions where we think they "belong" and replicate
the state variables, then the values of the state variables will not be
the same across different federates. This is a can of worms that is
outside the scope of this PR to fix.
---
 .../{failing => }/SpuriousDependency.lf       | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)
 rename test/C/src/federated/{failing => }/SpuriousDependency.lf (74%)

diff --git a/test/C/src/federated/failing/SpuriousDependency.lf b/test/C/src/federated/SpuriousDependency.lf
similarity index 74%
rename from test/C/src/federated/failing/SpuriousDependency.lf
rename to test/C/src/federated/SpuriousDependency.lf
index b509a4acae..6eda57264b 100644
--- a/test/C/src/federated/failing/SpuriousDependency.lf
+++ b/test/C/src/federated/SpuriousDependency.lf
@@ -6,15 +6,15 @@
  * resolved the ambiguity in a way that does appear to result in deadlock.
  */
 target C {
-  timeout: 2 sec
+  timeout: 1 sec
 }
 
-reactor Passthrough {
+reactor Passthrough(id: int = 0) {
   input in: int
   output out: int
 
   reaction(in) -> out {=
-    lf_print("Hello from passthrough");
+    lf_print("Hello from passthrough %d", self->id);
     lf_set(out, in->value);
   =}
 }
@@ -24,24 +24,22 @@ reactor Twisty {
   input in1: int
   output out0: int
   output out1: int
-  p0 = new Passthrough()
-  p1 = new Passthrough()
+  p0 = new Passthrough(id=0)
+  p1 = new Passthrough(id = 1)
   in0 -> p0.in
   p0.out -> out0
   in1 -> p1.in
   p1.out -> out1
 }
 
-federated reactor {
-  t0 = new Twisty()
-  t1 = new Twisty()
-  t0.out1 -> t1.in0
-  t1.out1 -> t0.in0
-  state count: int = 0
+reactor Check {
+  input in: int
 
-  reaction(startup) -> t0.in1 {= lf_set(t0.in1, 0); =}
+  state count: int = 0
 
-  reaction(t1.out0) {= self->count++; =}
+  reaction (in) {=
+    lf_print("count is now %d", ++self->count);
+  =}
 
   reaction(shutdown) {=
     lf_print("******* Shutdown invoked.");
@@ -50,3 +48,16 @@ federated reactor {
     }
   =}
 }
+
+federated reactor {
+  t0 = new Twisty()
+  t1 = new Twisty()
+  check = new Check()
+  t0.out1 -> t1.in0
+  t1.out1 -> t0.in0
+  state count: int = 0
+
+  reaction(startup) -> t0.in1 {= lf_set(t0.in1, 0); =}
+
+  t1.out0 -> check.in
+}

From 5a0bad3e1beb72d666113665c5975c146a7718bb Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 14 Jul 2023 23:19:24 -0700
Subject: [PATCH 0641/1114] Update reactor-c.

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index e01d85a242..0a77ffafff 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit e01d85a242f91d672f8cf660ea8a2a1df9e050d4
+Subproject commit 0a77ffaffff754bbe6a4635b1cda6ae712d2a236

From 2a039c85f4ffb8e62c4c44c7c0385825c5a11022 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 14 Jul 2023 23:31:02 -0700
Subject: [PATCH 0642/1114] Format.

---
 test/C/src/federated/SpuriousDependency.lf | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/test/C/src/federated/SpuriousDependency.lf b/test/C/src/federated/SpuriousDependency.lf
index 6eda57264b..f7a8a36858 100644
--- a/test/C/src/federated/SpuriousDependency.lf
+++ b/test/C/src/federated/SpuriousDependency.lf
@@ -1,9 +1,8 @@
 /**
- * This checks that a federated program does not deadlock when it is ambiguous,
- * given the structure of a federate, whether it is permissible to require
- * certain network sender/receiver reactions to precede others in the execution
- * of a given tag. The version of LFC that was in the master branch on 4/15/2023
- * resolved the ambiguity in a way that does appear to result in deadlock.
+ * This checks that a federated program does not deadlock when it is ambiguous, given the structure
+ * of a federate, whether it is permissible to require certain network sender/receiver reactions to
+ * precede others in the execution of a given tag. The version of LFC that was in the master branch
+ * on 4/15/2023 resolved the ambiguity in a way that does appear to result in deadlock.
  */
 target C {
   timeout: 1 sec
@@ -25,7 +24,7 @@ reactor Twisty {
   output out0: int
   output out1: int
   p0 = new Passthrough(id=0)
-  p1 = new Passthrough(id = 1)
+  p1 = new Passthrough(id=1)
   in0 -> p0.in
   p0.out -> out0
   in1 -> p1.in
@@ -37,9 +36,7 @@ reactor Check {
 
   state count: int = 0
 
-  reaction (in) {=
-    lf_print("count is now %d", ++self->count);
-  =}
+  reaction(in) {= lf_print("count is now %d", ++self->count); =}
 
   reaction(shutdown) {=
     lf_print("******* Shutdown invoked.");
@@ -57,7 +54,7 @@ federated reactor {
   t1.out1 -> t0.in0
   state count: int = 0
 
-  reaction(startup) -> t0.in1 {= lf_set(t0.in1, 0); =}
-
   t1.out0 -> check.in
+
+  reaction(startup) -> t0.in1 {= lf_set(t0.in1, 0); =}
 }

From 2843752a27dfceb36f3da4dedfb29877c45d092f Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 14 Jul 2023 23:48:47 -0700
Subject: [PATCH 0643/1114] Move C-specific code to CExtension.

---
 .../federated/extensions/CExtension.java      | 12 +++++++++++
 .../extensions/FedTargetExtension.java        |  3 +++
 .../federated/extensions/TSExtension.java     |  5 +++++
 .../federated/generator/FedASTUtils.java      | 21 +++++++------------
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 7370ad64fb..3cf1e67d39 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -220,6 +220,18 @@ protected void deserialize(
     }
   }
 
+  @Override
+  public String outputInitializationBody() {
+    return """
+    extern reaction_t* port_absent_reaction[];
+    void enqueue_network_output_control_reactions(environment_t*);
+    LF_PRINT_DEBUG("Adding network output control reaction to table.");
+    port_absent_reaction[self->sender_index] = &self->_lf__reaction_2;
+    LF_PRINT_DEBUG("Added network output control reaction to table. Enqueueing it...");
+    enqueue_network_output_control_reactions(self->base.environment);
+    """;
+  }
+
   /**
    * Generate code for the body of a reaction that handles an output that is to be sent over the
    * network.
diff --git a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
index c228fbb92b..a22c7d37a7 100644
--- a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
@@ -53,6 +53,9 @@ String generateNetworkReceiverBody(
       CoordinationType coordinationType,
       MessageReporter messageReporter);
 
+  /** Generate code for initializing a network output reactor from its startup reaction. */
+  String outputInitializationBody();
+
   /**
    * Generate code for the body of a reaction that handles an output that is to be sent over the
    * network.
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 1f50448151..05641105d9 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -55,6 +55,11 @@ public String generateNetworkReceiverBody(
             receivingPort.getVariable().getName());
   }
 
+  @Override
+  public String outputInitializationBody() {
+    return ""; // TODO
+  }
+
   @Override
   public String generateNetworkSenderBody(
       VarRef sendingPort,
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index f5cccc8038..c5223dffc2 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -45,6 +45,7 @@
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
+import org.lflang.Target;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
@@ -146,8 +147,6 @@ public static void makeCommunication(
     addNetworkReceiverReactor(connection, coordination, resource, messageReporter);
   }
 
-  public static int networkMessageActionID = 0;
-
   /**
    * Create a "network action" in the reactor that contains the given connection and return it.
    *
@@ -648,7 +647,9 @@ private static Reactor getNetworkSenderReactor(
     senderIndexParameter.setInit(senderIndexParameterInit);
     sender.getParameters().add(senderIndexParameter);
 
-    sender.getReactions().add(getInitializationReaction());
+    sender
+        .getReactions()
+        .add(getInitializationReaction(connection.srcFederate.targetConfig.target));
     sender.getReactions().add(networkSenderReaction);
     sender.getInputs().add(in);
 
@@ -698,24 +699,16 @@ private static Reaction getNetworkSenderReaction(
     return networkSenderReaction;
   }
 
-  private static Reaction getInitializationReaction() {
+  private static Reaction getInitializationReaction(Target target) {
     var initializationReaction = LfFactory.eINSTANCE.createReaction();
     var startup = LfFactory.eINSTANCE.createBuiltinTriggerRef();
     startup.setType(BuiltinTrigger.STARTUP);
     var a = LfFactory.eINSTANCE.createAttribute();
-    a.setAttrName("_c_body");
+    if (target == Target.C) a.setAttrName("_c_body");
     initializationReaction.getAttributes().add(a);
     initializationReaction.getTriggers().add(startup);
     var code = LfFactory.eINSTANCE.createCode();
-    code.setBody(
-        """
-            extern reaction_t* port_absent_reaction[];
-            void enqueue_network_output_control_reactions(environment_t*);
-            LF_PRINT_DEBUG("Adding network output control reaction to table.");
-            port_absent_reaction[self->sender_index] = &self->_lf__reaction_2;
-            LF_PRINT_DEBUG("Added network output control reaction to table. Enqueueing it...");
-            enqueue_network_output_control_reactions(self->base.environment);
-            """);
+    code.setBody(FedTargetExtensionFactory.getExtension(target).outputInitializationBody());
     initializationReaction.setCode(code);
     return initializationReaction;
   }

From b9501fb01c1f33a2d5b202d83a86ec3f02cd05ea Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Sat, 15 Jul 2023 17:37:58 +0900
Subject: [PATCH 0644/1114] Remove the part using networkMessageActions param
 of fed_config

---
 .../lflang/generator/ts/TSActionGenerator.kt  | 16 +++----
 .../generator/ts/TSConstructorGenerator.kt    | 11 +++--
 .../lflang/generator/ts/TSReactorGenerator.kt | 42 +++++++++----------
 3 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt
index e5dda9ee3d..ec81ba898b 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt
@@ -10,7 +10,7 @@ import java.util.*
  */
 class TSActionGenerator(
     private val actions: List<Action>,
-    private val networkMessageActions: List<String>
+    // private val networkMessageActions: List<String>
 ) {
 
     fun generateClassProperties(): String {
@@ -45,13 +45,15 @@ class TSActionGenerator(
                         ", " + action.minDelay.toTsTime()
                     }
                 }
-                if (action.name in networkMessageActions) {
-                    actionInstantiations.add(
-                        "this.${action.name} = new __FederatePortAction<${action.tsActionType}>($actionArgs);")
-                } else {
-                    actionInstantiations.add(
+                // if (action.name in networkMessageActions) {
+                //     actionInstantiations.add(
+                //         "this.${action.name} = new __FederatePortAction<${action.tsActionType}>($actionArgs);")
+                // } else {
+                //     actionInstantiations.add(
+                //         "this.${action.name} = new __Action<${action.tsActionType}>($actionArgs);")
+                // }
+                actionInstantiations.add(
                         "this.${action.name} = new __Action<${action.tsActionType}>($actionArgs);")
-                }
             }
         }
         return actionInstantiations.joinToString("\n")
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
index befb08cc82..b6624d797f 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
@@ -70,10 +70,10 @@ class TSConstructorGenerator(
 
     // If the app is federated, register its
     // networkMessageActions with the RTIClient
-    private fun generateFederatePortActionRegistrations(networkMessageActions: List<String>): String =
-        networkMessageActions.withIndex().joinWithLn { (fedPortID, actionName) ->
-            "this.registerFederatePortAction($fedPortID, this.$actionName);"
-        }
+    // private fun generateFederatePortActionRegistrations(networkMessageActions: List<String>): String =
+    //     networkMessageActions.withIndex().joinWithLn { (fedPortID, actionName) ->
+    //         "this.registerFederatePortAction($fedPortID, this.$actionName);"
+    //     }
 
     // Generate code for setting target configurations.
     private fun generateTargetConfigurations(targetConfig: TargetConfig): String {
@@ -92,7 +92,7 @@ class TSConstructorGenerator(
         actions: TSActionGenerator,
         ports: TSPortGenerator,
         isFederate: Boolean,
-        networkMessageActions: MutableList<String>
+        // networkMessageActions: MutableList<String>
     ): String {
         val connections = TSConnectionGenerator(reactor.connections, messageReporter)
         val reactions = TSReactionGenerator(messageReporter, reactor)
@@ -111,7 +111,6 @@ class TSConstructorGenerator(
             ${" |    "..actions.generateInstantiations()}
             ${" |    "..ports.generateInstantiations()}
             ${" |    "..connections.generateInstantiations()}
-            ${" |    "..if (reactor.isMain && isFederate) generateFederatePortActionRegistrations(networkMessageActions) else ""}
             ${" |    "..reactions.generateAllReactions()}
                 |}
             """.trimMargin()
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
index 33f87374d3..e3be95f91c 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
@@ -90,24 +90,24 @@ ${"             |"..preamble.code.toText()}
             }.trimMargin()
         }
 
-    private fun getNetworkMessageActions(reactor: Reactor): MutableList<String> {
-        val attribute = AttributeUtils.findAttributeByName(reactor, "_fed_config")
-        val actionsStr = AttributeUtils.getAttributeParameter(attribute, AttributeSpec.NETWORK_MESSAGE_ACTIONS)
-        var actionsList = actionsStr?.split(",")?.filter { it.isNotEmpty()} ?: emptyList()
-        actionsList = actionsList.toMutableList()
-
-        val childReactors = reactor.instantiations
-        var actionsListCount = 0
-        for (childReactor in childReactors) {
-            if (childReactor.reactorClass.name.take(15) == "NetworkReceiver") {
-                // FIXME: Assume that the order of childReactor and attribute list are identical.
-                // This assumption might bring some erros
-                actionsList[actionsListCount] = childReactor.name + "." + actionsList[actionsListCount]
-                actionsListCount++
-            }
-        }
-        return actionsList
-    }
+    // private fun getNetworkMessageActions(reactor: Reactor): MutableList<String> {
+    //     val attribute = AttributeUtils.findAttributeByName(reactor, "_fed_config")
+    //     val actionsStr = AttributeUtils.getAttributeParameter(attribute, AttributeSpec.NETWORK_MESSAGE_ACTIONS)
+    //     var actionsList = actionsStr?.split(",")?.filter { it.isNotEmpty()} ?: emptyList()
+    //     actionsList = actionsList.toMutableList()
+
+    //     val childReactors = reactor.instantiations
+    //     var actionsListCount = 0
+    //     for (childReactor in childReactors) {
+    //         if (childReactor.reactorClass.name.take(15) == "NetworkReceiver") {
+    //             // FIXME: Assume that the order of childReactor and attribute list are identical.
+    //             // This assumption might bring some erros
+    //             actionsList[actionsListCount] = childReactor.name + "." + actionsList[actionsListCount]
+    //             actionsListCount++
+    //         }
+    //     }
+    //     return actionsList
+    // }
 
     fun generateReactor(reactor: Reactor): String {
         var reactorName = reactor.name
@@ -117,7 +117,7 @@ ${"             |"..preamble.code.toText()}
         }
 
         val isFederate = AttributeUtils.isFederate(reactor)
-        val networkMessageActions = getNetworkMessageActions(reactor)
+        // val networkMessageActions = getNetworkMessageActions(reactor)
 
         // NOTE: type parameters that are referenced in ports or actions must extend
         // Present in order for the program to type check.
@@ -135,7 +135,7 @@ ${"             |"..preamble.code.toText()}
         val timerGenerator = TSTimerGenerator(reactor.timers)
         val parameterGenerator = TSParameterGenerator(reactor.parameters)
         val stateGenerator = TSStateGenerator(reactor.stateVars)
-        val actionGenerator = TSActionGenerator(reactor.actions, networkMessageActions)
+        val actionGenerator = TSActionGenerator(reactor.actions)
         val portGenerator = TSPortGenerator(reactor.inputs, reactor.outputs)
 
         val constructorGenerator = TSConstructorGenerator(messageReporter, reactor)
@@ -152,7 +152,7 @@ ${"             |"..preamble.code.toText()}
             ${" |    "..actionGenerator.generateClassProperties()}
             ${" |    "..portGenerator.generateClassProperties()}
             ${" |    "..constructorGenerator.generateConstructor(targetConfig, instanceGenerator, timerGenerator, parameterGenerator,
-                stateGenerator, actionGenerator, portGenerator, isFederate, networkMessageActions)}
+                stateGenerator, actionGenerator, portGenerator, isFederate)}
                 |}
                 |// =============== END reactor class ${reactor.name}
                 |

From eae0439e516e18fc91368e18a8ca4b799ecd87a6 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 15 Jul 2023 17:11:46 -0700
Subject: [PATCH 0645/1114] Bugfix in adding @_c_body.

---
 .../java/org/lflang/federated/generator/FedASTUtils.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index c5223dffc2..3f76df5d39 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -703,9 +703,11 @@ private static Reaction getInitializationReaction(Target target) {
     var initializationReaction = LfFactory.eINSTANCE.createReaction();
     var startup = LfFactory.eINSTANCE.createBuiltinTriggerRef();
     startup.setType(BuiltinTrigger.STARTUP);
-    var a = LfFactory.eINSTANCE.createAttribute();
-    if (target == Target.C) a.setAttrName("_c_body");
-    initializationReaction.getAttributes().add(a);
+    if (target == Target.Python) {
+      var a = LfFactory.eINSTANCE.createAttribute();
+      a.setAttrName("_c_body");
+      initializationReaction.getAttributes().add(a);
+    }
     initializationReaction.getTriggers().add(startup);
     var code = LfFactory.eINSTANCE.createCode();
     code.setBody(FedTargetExtensionFactory.getExtension(target).outputInitializationBody());

From a2a38312ee65d9c3d56b067927973b5d59200618 Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <78055940+byeong-gil@users.noreply.github.com>
Date: Sun, 16 Jul 2023 09:58:32 +0900
Subject: [PATCH 0646/1114] Update package.json

---
 core/src/main/resources/lib/ts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/ts/package.json b/core/src/main/resources/lib/ts/package.json
index f619a1375f..4a28012180 100644
--- a/core/src/main/resources/lib/ts/package.json
+++ b/core/src/main/resources/lib/ts/package.json
@@ -2,7 +2,7 @@
     "name": "LinguaFrancaDefault",
     "type": "commonjs",
     "dependencies": {
-        "@lf-lang/reactor-ts": "^0.4.0",
+        "@lf-lang/reactor-ts": "git://github.com/lf-lang/reactor-ts.git#ts-level-assignment",
         "command-line-args": "^5.1.1",
         "command-line-usage": "^6.1.3"
     },

From c44cfad8681c51a85f8f0f2376c333b8469e5a83 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 15 Jul 2023 18:21:24 -0700
Subject: [PATCH 0647/1114] Pass BroadcastFeedback with Python.

---
 .../federated/extensions/CExtension.java      |  8 +++--
 .../federated/generator/FedASTUtils.java      | 35 ++++++-------------
 .../org/lflang/validation/LFValidator.java    |  1 -
 3 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 3cf1e67d39..3ef2d5de90 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -226,7 +226,7 @@ public String outputInitializationBody() {
     extern reaction_t* port_absent_reaction[];
     void enqueue_network_output_control_reactions(environment_t*);
     LF_PRINT_DEBUG("Adding network output control reaction to table.");
-    port_absent_reaction[self->sender_index] = &self->_lf__reaction_2;
+    port_absent_reaction[SENDERINDEXPARAMETER] = &self->_lf__reaction_2;
     LF_PRINT_DEBUG("Added network output control reaction to table. Enqueueing it...");
     enqueue_network_output_control_reactions(self->base.environment);
     """;
@@ -273,7 +273,11 @@ public String generateNetworkSenderBody(
     // channel or bank index of sendRef is present
     // ex. if a.out[i] is present, the entire output a.out is triggered.
     if (connection.getSrcBank() != -1 || connection.getSrcChannel() != -1) {
-      result.pr("if (!" + sendRef + "->is_present) return;");
+      result.pr("if (!" + sendRef + "->is_present) {");
+      if (connection.getSrcFederate().targetConfig.target == Target.Python)
+        result.pr("PyGILState_Release(gstate);");
+      result.pr("return;");
+      result.pr("}");
     }
 
     // If the connection is physical and the receiving federate is remote, send it directly on a
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 3f76df5d39..8cf82c2ecf 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -56,7 +56,6 @@
 import org.lflang.generator.ReactionInstance;
 import org.lflang.lf.Action;
 import org.lflang.lf.ActionOrigin;
-import org.lflang.lf.Assignment;
 import org.lflang.lf.BuiltinTrigger;
 import org.lflang.lf.BuiltinTriggerRef;
 import org.lflang.lf.Connection;
@@ -635,17 +634,9 @@ private static Reactor getNetworkSenderReactor(
     Reaction networkSenderReaction =
         getNetworkSenderReaction(inRef, destRef, connection, coordination, type, messageReporter);
 
-    var senderIndexParameter = LfFactory.eINSTANCE.createParameter();
-    var senderIndexParameterType = LfFactory.eINSTANCE.createType();
-    senderIndexParameter.setName("sender_index");
-    senderIndexParameterType.setId("int");
-    senderIndexParameter.setType(senderIndexParameterType);
-    var senderIndexParameterInit = LfFactory.eINSTANCE.createInitializer();
-    var senderIndexParameterInitExpr = LfFactory.eINSTANCE.createLiteral();
-    senderIndexParameterInitExpr.setLiteral("0");
-    senderIndexParameterInit.getExprs().add(senderIndexParameterInitExpr);
-    senderIndexParameter.setInit(senderIndexParameterInit);
-    sender.getParameters().add(senderIndexParameter);
+    var tp = LfFactory.eINSTANCE.createTypeParm();
+    tp.setLiteral("SENDERINDEXPARAMETER");
+    sender.getTypeParms().add(tp);
 
     sender
         .getReactions()
@@ -751,7 +742,7 @@ private static void addNetworkSenderReactor(
         ASTUtils.getUniqueIdentifier(top, "ns_" + connection.getDstFederate().name));
     top.getInstantiations().add(networkInstance);
     networkInstance
-        .getParameters()
+        .getTypeArgs()
         .add(getSenderIndex(connection.getSrcFederate().networkIdSender++));
     addLevelAttribute(
         networkInstance, connection.getSourcePortInstance(), getSrcIndex(connection), connection);
@@ -785,18 +776,12 @@ private static void addNetworkSenderReactor(
         connection.getSourcePortInstance(), networkInstance);
   }
 
-  private static Assignment getSenderIndex(int networkIDSender) {
-    var senderIndex = LfFactory.eINSTANCE.createAssignment();
-    var senderIndexParameter = LfFactory.eINSTANCE.createParameter();
-    senderIndexParameter.setName("sender_index");
-    senderIndex.setLhs(senderIndexParameter);
-    var senderIndexInitializer = LfFactory.eINSTANCE.createInitializer();
-    senderIndexInitializer.setAssign(true);
-    var senderIndexInitializerExpression = LfFactory.eINSTANCE.createLiteral();
-    senderIndexInitializerExpression.setLiteral(String.valueOf(networkIDSender));
-    senderIndexInitializer.getExprs().add(senderIndexInitializerExpression);
-    senderIndex.setRhs(senderIndexInitializer);
-    return senderIndex;
+  private static Type getSenderIndex(int networkIDSender) {
+    var senderIndexParameter = LfFactory.eINSTANCE.createType();
+    var c = LfFactory.eINSTANCE.createCode();
+    c.setBody(String.valueOf(networkIDSender));
+    senderIndexParameter.setCode(c);
+    return senderIndexParameter;
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index a602d54076..0a4062df84 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -1253,7 +1253,6 @@ public void checkTimer(Timer timer) {
 
   @Check(CheckType.FAST)
   public void checkType(Type type) {
-    // FIXME: disallow the use of generics in C
     if (this.target == Target.Python) {
       if (type != null) {
         error("Types are not allowed in the Python target", Literals.TYPE__ID);

From 0463c1c4c63a06b8409d00310b16c4111039a26c Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 15 Jul 2023 19:05:09 -0700
Subject: [PATCH 0648/1114] Try to make compatible with TypeScript.

---
 .../federated/extensions/CExtension.java      | 19 +++++++++++
 .../extensions/FedTargetExtension.java        |  8 +++++
 .../federated/extensions/TSExtension.java     | 33 +++++++++++++++++++
 .../federated/generator/FedASTUtils.java      | 25 +++++---------
 4 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 3ef2d5de90..2d0fcc304a 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -52,8 +52,11 @@
 import org.lflang.generator.c.CTypes;
 import org.lflang.generator.c.CUtil;
 import org.lflang.lf.Action;
+import org.lflang.lf.Instantiation;
+import org.lflang.lf.LfFactory;
 import org.lflang.lf.Output;
 import org.lflang.lf.Port;
+import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
 
 /**
@@ -232,6 +235,22 @@ public String outputInitializationBody() {
     """;
   }
 
+  @Override
+  public void addSenderIndexParameter(Reactor sender) {
+    var tp = LfFactory.eINSTANCE.createTypeParm();
+    tp.setLiteral("SENDERINDEXPARAMETER");
+    sender.getTypeParms().add(tp);
+  }
+
+  @Override
+  public void supplySenderIndexParameter(Instantiation inst, int idx) {
+    var senderIndexParameter = LfFactory.eINSTANCE.createType();
+    var c = LfFactory.eINSTANCE.createCode();
+    c.setBody(String.valueOf(idx));
+    senderIndexParameter.setCode(c);
+    inst.getTypeArgs().add(senderIndexParameter);
+  }
+
   /**
    * Generate code for the body of a reaction that handles an output that is to be sent over the
    * network.
diff --git a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
index a22c7d37a7..c185c8ed3a 100644
--- a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
@@ -10,7 +10,9 @@
 import org.lflang.federated.launcher.RtiConfig;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.lf.Action;
+import org.lflang.lf.Instantiation;
 import org.lflang.lf.Reaction;
+import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
 
 public interface FedTargetExtension {
@@ -56,6 +58,12 @@ String generateNetworkReceiverBody(
   /** Generate code for initializing a network output reactor from its startup reaction. */
   String outputInitializationBody();
 
+  /** Generate code for the parameter that specifies the sender index. */
+  void addSenderIndexParameter(Reactor sender);
+
+  /** Generate code for the sender index argument of {@code instantiation}. */
+  void supplySenderIndexParameter(Instantiation inst, int idx);
+
   /**
    * Generate code for the body of a reaction that handles an output that is to be sent over the
    * network.
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 05641105d9..46e773a286 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -20,7 +20,10 @@
 import org.lflang.generator.ts.TSTypes;
 import org.lflang.lf.Action;
 import org.lflang.lf.Expression;
+import org.lflang.lf.Instantiation;
+import org.lflang.lf.LfFactory;
 import org.lflang.lf.Output;
+import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
 
@@ -60,6 +63,36 @@ public String outputInitializationBody() {
     return ""; // TODO
   }
 
+  @Override
+  public void addSenderIndexParameter(Reactor sender) {
+    var senderIndexParameter = LfFactory.eINSTANCE.createParameter();
+    var senderIndexParameterType = LfFactory.eINSTANCE.createType();
+    senderIndexParameter.setName("sender_index");
+    senderIndexParameterType.setId("Number");
+    senderIndexParameter.setType(senderIndexParameterType);
+    var senderIndexParameterInit = LfFactory.eINSTANCE.createInitializer();
+    var senderIndexParameterInitExpr = LfFactory.eINSTANCE.createLiteral();
+    senderIndexParameterInitExpr.setLiteral("0");
+    senderIndexParameterInit.getExprs().add(senderIndexParameterInitExpr);
+    senderIndexParameter.setInit(senderIndexParameterInit);
+    sender.getParameters().add(senderIndexParameter);
+  }
+
+  @Override
+  public void supplySenderIndexParameter(Instantiation inst, int idx) {
+    var senderIndex = LfFactory.eINSTANCE.createAssignment();
+    var senderIndexParameter = LfFactory.eINSTANCE.createParameter();
+    senderIndexParameter.setName("sender_index");
+    senderIndex.setLhs(senderIndexParameter);
+    var senderIndexInitializer = LfFactory.eINSTANCE.createInitializer();
+    senderIndexInitializer.setAssign(true);
+    var senderIndexInitializerExpression = LfFactory.eINSTANCE.createLiteral();
+    senderIndexInitializerExpression.setLiteral(String.valueOf(idx));
+    senderIndexInitializer.getExprs().add(senderIndexInitializerExpression);
+    senderIndex.setRhs(senderIndexInitializer);
+    inst.getParameters().add(senderIndex);
+  }
+
   @Override
   public String generateNetworkSenderBody(
       VarRef sendingPort,
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 8cf82c2ecf..0d0a873274 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -612,6 +612,8 @@ private static Reactor getNetworkSenderReactor(
       CoordinationType coordination,
       Resource resource,
       MessageReporter messageReporter) {
+    var extension =
+        FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target);
     LfFactory factory = LfFactory.eINSTANCE;
     Type type = EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getType());
 
@@ -634,9 +636,7 @@ private static Reactor getNetworkSenderReactor(
     Reaction networkSenderReaction =
         getNetworkSenderReaction(inRef, destRef, connection, coordination, type, messageReporter);
 
-    var tp = LfFactory.eINSTANCE.createTypeParm();
-    tp.setLiteral("SENDERINDEXPARAMETER");
-    sender.getTypeParms().add(tp);
+    extension.addSenderIndexParameter(sender);
 
     sender
         .getReactions()
@@ -650,8 +650,7 @@ private static Reactor getNetworkSenderReactor(
     // networkSenderReaction.setName("NetworkSenderReaction_" + networkIDSender++);
 
     // FIXME: do not create a new extension every time it is used
-    FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
-        .annotateReaction(networkSenderReaction);
+    extension.annotateReaction(networkSenderReaction);
 
     // If the sender or receiver is in a bank of reactors, then we want
     // these reactions to appear only in the federate whose bank ID matches.
@@ -721,6 +720,8 @@ private static void addNetworkSenderReactor(
       Resource resource,
       MessageReporter messageReporter) {
     LfFactory factory = LfFactory.eINSTANCE;
+    var extension =
+        FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target);
     // Assume all the types are the same, so just use the first on the right.
 
     Reactor sender = getNetworkSenderReactor(connection, coordination, resource, messageReporter);
@@ -741,9 +742,9 @@ private static void addNetworkSenderReactor(
     networkInstance.setName(
         ASTUtils.getUniqueIdentifier(top, "ns_" + connection.getDstFederate().name));
     top.getInstantiations().add(networkInstance);
-    networkInstance
-        .getTypeArgs()
-        .add(getSenderIndex(connection.getSrcFederate().networkIdSender++));
+
+    extension.supplySenderIndexParameter(
+        networkInstance, connection.getSrcFederate().networkIdSender++);
     addLevelAttribute(
         networkInstance, connection.getSourcePortInstance(), getSrcIndex(connection), connection);
 
@@ -776,14 +777,6 @@ private static void addNetworkSenderReactor(
         connection.getSourcePortInstance(), networkInstance);
   }
 
-  private static Type getSenderIndex(int networkIDSender) {
-    var senderIndexParameter = LfFactory.eINSTANCE.createType();
-    var c = LfFactory.eINSTANCE.createCode();
-    c.setBody(String.valueOf(networkIDSender));
-    senderIndexParameter.setCode(c);
-    return senderIndexParameter;
-  }
-
   /**
    * Add a network control reaction for a given output port 'source' to source's parent reactor.
    * This reaction will send a port absent message if the status of the output port is absent.

From d2b5d0a054e1fc0d0f192c9249388a447df92545 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 15 Jul 2023 19:40:53 -0700
Subject: [PATCH 0649/1114] Attempt to address OutOfMemoryError in tests.

---
 core/src/testFixtures/java/org/lflang/tests/LFTest.java   | 8 +++++---
 .../DistributedCountDecentralizedLateHierarchy.lf         | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/LFTest.java b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
index 64e7b36dc3..9430f80bd5 100644
--- a/core/src/testFixtures/java/org/lflang/tests/LFTest.java
+++ b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
@@ -257,10 +257,12 @@ private Thread recordStream(StringBuffer builder, InputStream inputStream) {
               int len;
               char[] buf = new char[1024];
               while ((len = reader.read(buf)) > 0) {
-                builder.append(buf, 0, len);
-                if (Runtime.getRuntime().freeMemory() < Runtime.getRuntime().totalMemory() / 3) {
-                  builder.delete(0, builder.length() / 2);
+                if (Runtime.getRuntime().freeMemory() < Runtime.getRuntime().totalMemory() / 2) {
+                  Runtime.getRuntime().gc();
+                  if (Runtime.getRuntime().freeMemory() < Runtime.getRuntime().totalMemory() / 2)
+                    builder.delete(0, builder.length() / 2);
                 }
+                builder.append(buf, 0, len);
               }
             } catch (IOException e) {
               throw new RuntimeIOException(e);
diff --git a/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf b/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf
index ab02b16187..646cdff5c8 100644
--- a/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf
+++ b/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf
@@ -19,7 +19,7 @@ reactor ImportantActuator {
   input inp
   state success = 0    # Count messages that arrive without STP violation.
   state success_stp_violation = 0
-  timer t(0, 10 usec)  # Force a timer to be invoked periodically
+  timer t(0, 10 msec)  # Force a timer to be invoked periodically
   state c = 0          # to ensure logical time will advance in the absence of incoming messages.
 
   reaction(inp) {=

From a54fe61851f7c3f90d71ff10a8b8349c524bae7a Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 15 Jul 2023 22:46:15 -0700
Subject: [PATCH 0650/1114] Add JavaDoc etc.

---
 .../main/java/org/lflang/ast/ASTUtils.java    |  4 ++++
 .../federated/generator/FedASTUtils.java      | 15 ++++++++++++-
 .../federated/generator/FederateInstance.java |  6 ++++++
 .../org/lflang/generator/PortInstance.java    |  1 +
 .../lflang/generator/ReactionInstance.java    |  1 +
 .../generator/ReactionInstanceGraph.java      |  6 ++++++
 .../org/lflang/generator/ReactorInstance.java |  4 ++++
 core/src/main/java/org/lflang/util/Pair.java  | 21 ++-----------------
 .../org/lflang/validation/AttributeSpec.java  |  1 -
 test/C/src/federated/SpuriousDependency.lf    |  3 +--
 10 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 036fbd4dc9..4868fded46 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -1372,6 +1372,10 @@ public static Integer initialValueInt(Parameter parameter, List<Instantiation> i
     return result;
   }
 
+  /**
+   * Return the delay (in nanoseconds) denoted by {@code delay}, or {@code null} if the delay cannot
+   * be determined.
+   */
   public static Long getDelay(Expression delay) {
     Long ret = null;
     if (delay != null) {
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 0d0a873274..0d16ddcd60 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -604,9 +604,19 @@ public static <E> List<E> safe(List<E> list) {
 
   public static int networkIDReceiver = 0;
 
+  /** The network sender reactors created for each connection. */
   private static final Map<FedConnectionInstance, Reactor> networkSenderReactors =
       new HashMap<>(); // FIXME: static mutable objects are bad
 
+  /**
+   * Generate and return the EObject representing the reactor definition of a network sender.
+   *
+   * @param connection The connection the communication over which is handled by an instance of the
+   *     reactor to be returned.
+   * @param coordination Centralized or decentralized.
+   * @param resource The resource of the ECore model to which the new reactor definition should be
+   *     added.
+   */
   private static Reactor getNetworkSenderReactor(
       FedConnectionInstance connection,
       CoordinationType coordination,
@@ -647,7 +657,6 @@ private static Reactor getNetworkSenderReactor(
     EObject node = IteratorExtensions.findFirst(resource.getAllContents(), Model.class::isInstance);
     ((Model) node).getReactors().add(sender);
     sender.setName("NetworkSender_" + connection.getSrcFederate().networkIdSender);
-    // networkSenderReaction.setName("NetworkSenderReaction_" + networkIDSender++);
 
     // FIXME: do not create a new extension every time it is used
     extension.annotateReaction(networkSenderReaction);
@@ -665,6 +674,7 @@ private static Reactor getNetworkSenderReactor(
     return sender;
   }
 
+  /** Return the reaction that sends messages when its corresponding port is present. */
   private static Reaction getNetworkSenderReaction(
       VarRef inRef,
       VarRef destRef,
@@ -689,6 +699,9 @@ private static Reaction getNetworkSenderReaction(
     return networkSenderReaction;
   }
 
+  /**
+   * Return the reaction that initializes the containing network sender reactor on {@code startup}.
+   */
   private static Reaction getInitializationReaction(Target target) {
     var initializationReaction = LfFactory.eINSTANCE.createReaction();
     var startup = LfFactory.eINSTANCE.createBuiltinTriggerRef();
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index 88bb6a0051..56df7ae6a1 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -130,6 +130,7 @@ public Instantiation getInstantiation() {
   /** A list of individual connections between federates */
   public Set<FedConnectionInstance> connections = new HashSet<>();
 
+  /** The counter used to assign IDs to network senders. */
   public int networkIdSender = 0;
 
   /**
@@ -220,6 +221,10 @@ public Instantiation getInstantiation() {
    */
   public Map<PortInstance, Instantiation> networkPortToInstantiation = new HashMap<>();
 
+  /**
+   * The mapping from network multiports of the federate to indexer reactors that split the
+   * multiport into individual ports.
+   */
   public Map<PortInstance, Instantiation> networkPortToIndexer = new HashMap<>();
 
   /**
@@ -255,6 +260,7 @@ public Instantiation getInstantiation() {
   /** Keep a unique list of enabled serializers */
   public List<TimeValue> stpOffsets = new ArrayList<>();
 
+  /** The STP offsets that have been recorded in {@code stpOffsets thus far. */
   public Set<Long> currentSTPOffsets = new HashSet<>();
 
   /** Keep a map of STP values to a list of network actions */
diff --git a/core/src/main/java/org/lflang/generator/PortInstance.java b/core/src/main/java/org/lflang/generator/PortInstance.java
index 016bda4556..3a227fb84c 100644
--- a/core/src/main/java/org/lflang/generator/PortInstance.java
+++ b/core/src/main/java/org/lflang/generator/PortInstance.java
@@ -214,6 +214,7 @@ public void hasDependentReactionWithLevel(MixedRadixInt index, int level) {
         index, Math.min(levelUpperBounds.getOrDefault(index, Integer.MAX_VALUE), level));
   }
 
+  /** Return the minimum of the levels of the reactions that are downstream of this port. */
   public int getLevelUpperBound(MixedRadixInt index) {
     // It should be uncommon for Integer.MAX_VALUE to be used and using it can mask bugs.
     // It makes sense when there is no downstream reaction.
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstance.java b/core/src/main/java/org/lflang/generator/ReactionInstance.java
index 2ed89c8b75..f0a7513796 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstance.java
@@ -495,6 +495,7 @@ public class Runtime {
 
     public int level;
 
+    /** The ports that directly or transitively send to this reaction. */
     public List<ReactionInstanceGraph.MriPortPair> sourcePorts = new ArrayList<>();
 
     public ReactionInstance getReaction() {
diff --git a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
index 3c91b03537..9dd7548d6c 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
@@ -291,8 +291,14 @@ private void getAllContainedReactions(List<Runtime> runtimeReactions, ReactorIns
   ///////////////////////////////////////////////////////////
   //// Private methods
 
+  /** A port and an index of a reaction relative to the port. */
   public record MriPortPair(MixedRadixInt index, PortInstance port) {}
 
+  /**
+   * For each port in {@code reactor}, add that port to its downstream reactions, together with the
+   * {@code MixedRadixInt} that is the index of the downstream reaction relative to the port and the
+   * intervening ports.
+   */
   private void registerPortInstances(ReactorInstance reactor) {
     var allPorts = new ArrayList<PortInstance>();
     allPorts.addAll(reactor.inputs);
diff --git a/core/src/main/java/org/lflang/generator/ReactorInstance.java b/core/src/main/java/org/lflang/generator/ReactorInstance.java
index 53ca96a667..cf571fbb64 100644
--- a/core/src/main/java/org/lflang/generator/ReactorInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactorInstance.java
@@ -175,6 +175,10 @@ public ReactorInstance(Reactor reactor, ReactorInstance parent, MessageReporter
   public EnclaveInfo enclaveInfo = null;
   public TypeParameterizedReactor tpr;
 
+  /**
+   * The TPO level with which {@code this} was annotated, or {@code null} if there is no TPO
+   * annotation.
+   */
   public final Integer tpoLevel;
 
   //////////////////////////////////////////////////////
diff --git a/core/src/main/java/org/lflang/util/Pair.java b/core/src/main/java/org/lflang/util/Pair.java
index a1fb07ac7b..bae17a76d3 100644
--- a/core/src/main/java/org/lflang/util/Pair.java
+++ b/core/src/main/java/org/lflang/util/Pair.java
@@ -1,21 +1,4 @@
 package org.lflang.util;
 
-public class Pair<F, S> {
-  private final F first;
-  private final S second;
-
-  public Pair(F first, S second) {
-    this.first = first;
-    this.second = second;
-  }
-
-  public F getFirst() {
-    return first;
-  }
-
-  public S getSecond() {
-    return second;
-  }
-}
-
-// TimeValue maxSTP = findMaxSTP(connection, coordination);
+/** A pair whose first element has type {@code F} and whose second element has type {@code S}. */
+public record Pair<F, S>(F first, S second) {}
diff --git a/core/src/main/java/org/lflang/validation/AttributeSpec.java b/core/src/main/java/org/lflang/validation/AttributeSpec.java
index b89d766c6f..aab6faca9a 100644
--- a/core/src/main/java/org/lflang/validation/AttributeSpec.java
+++ b/core/src/main/java/org/lflang/validation/AttributeSpec.java
@@ -49,7 +49,6 @@ public class AttributeSpec {
 
   public static final String VALUE_ATTR = "value";
   public static final String NETWORK_MESSAGE_ACTIONS = "network_message_actions";
-  //  public static final String DEPENDENCY_PAIRS = "dependencyPairs";
   public static final String EACH_ATTR = "each";
 
   /** A map from a string to a supported AttributeSpec */
diff --git a/test/C/src/federated/SpuriousDependency.lf b/test/C/src/federated/SpuriousDependency.lf
index f7a8a36858..cf0deb6380 100644
--- a/test/C/src/federated/SpuriousDependency.lf
+++ b/test/C/src/federated/SpuriousDependency.lf
@@ -1,8 +1,7 @@
 /**
  * This checks that a federated program does not deadlock when it is ambiguous, given the structure
  * of a federate, whether it is permissible to require certain network sender/receiver reactions to
- * precede others in the execution of a given tag. The version of LFC that was in the master branch
- * on 4/15/2023 resolved the ambiguity in a way that does appear to result in deadlock.
+ * precede others in the execution of a given tag.
  */
 target C {
   timeout: 1 sec

From bcdafebd440565a91bd69bcff45ecf71fba9fa55 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Sun, 16 Jul 2023 07:10:21 -0400
Subject: [PATCH 0651/1114] Reduce volume of DEBUG output and changed printf to
 lf_print

---
 .../federated/DistributedCountDecentralizedLate.lf    | 11 +++++------
 .../DistributedCountDecentralizedLateHierarchy.lf     | 10 +++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/test/C/src/federated/DistributedCountDecentralizedLate.lf b/test/C/src/federated/DistributedCountDecentralizedLate.lf
index 56d64004c6..02eb582b0e 100644
--- a/test/C/src/federated/DistributedCountDecentralizedLate.lf
+++ b/test/C/src/federated/DistributedCountDecentralizedLate.lf
@@ -18,12 +18,12 @@ reactor Print {
   state success_stp_violation: int = 0
   // Force a timer to be invoke periodically to ensure logical time will advance in the absence of
   // incoming messages.
-  timer t(0, 10 msec)
+  timer t(0, 100 msec)
   state c: int = 0
 
   reaction(in) {=
     tag_t current_tag = lf_tag();
-    printf("At tag (%lld, %u) received %d. Intended tag is (%lld, %u).\n",
+    lf_print("At tag (%lld, %u) received %d. Intended tag is (%lld, %u).",
       lf_time_logical_elapsed(),
       lf_tag().microstep,
       in->value,
@@ -36,7 +36,7 @@ reactor Print {
     self->c++;
   =} STP(0) {=
     tag_t current_tag = lf_tag();
-    printf("At tag (%lld, %u), message has violated the STP offset by (%lld, %u).\n",
+    lf_print("At tag (%lld, %u), message has violated the STP offset by (%lld, %u).",
         current_tag.time - lf_time_start(), current_tag.microstep,
         current_tag.time - in->intended_tag.time,
         current_tag.microstep - in->intended_tag.microstep);
@@ -50,10 +50,9 @@ reactor Print {
 
   reaction(shutdown) {=
     if ((self->success +  self->success_stp_violation) != 5) {
-      fprintf(stderr, "Failed to detect STP violations in messages.\n");
-      exit(1);
+      lf_print_error_and_exit("Failed to detect STP violations in messages.");
     } else {
-      printf("Successfully detected STP violation (%d violations, %d on-time).\n", self->success_stp_violation, self->success);
+      lf_print("Successfully detected STP violation (%d violations, %d on-time).", self->success_stp_violation, self->success);
     }
   =}
 }
diff --git a/test/C/src/federated/DistributedCountDecentralizedLateHierarchy.lf b/test/C/src/federated/DistributedCountDecentralizedLateHierarchy.lf
index cd9f8097aa..cfbd27de15 100644
--- a/test/C/src/federated/DistributedCountDecentralizedLateHierarchy.lf
+++ b/test/C/src/federated/DistributedCountDecentralizedLateHierarchy.lf
@@ -18,12 +18,12 @@ reactor ImportantActuator {
   input in: int
   state success: int = 0
   state success_stp_violation: int = 0
-  timer t(0, 10 msec)  // Force a timer to be invoke periodically
+  timer t(0, 100 msec)  // Force a timer to be invoke periodically
   state c: int = 0     // to ensure logical time will advance in the absence of incoming messages.
 
   reaction(in) {=
     tag_t current_tag = lf_tag();
-    printf("At tag (%lld, %u) received %d. Intended tag is (%lld, %u).\n",
+    lf_print("At tag (%lld, %u) ImportantActuator received %d. Intended tag is (%lld, %u).",
       lf_time_logical_elapsed(),
       lf_tag().microstep,
       in->value,
@@ -36,7 +36,7 @@ reactor ImportantActuator {
     self->c++;
   =} STP(0) {=
     tag_t current_tag = lf_tag();
-    printf("Message violated STP offset by (%lld, %u).\n",
+    lf_print("Message violated STP offset by (%lld, %u).",
         current_tag.time - in->intended_tag.time,
         current_tag.microstep - in->intended_tag.microstep);
     self->success_stp_violation++;
@@ -62,7 +62,7 @@ reactor Print {
 
   reaction(in) {=
     tag_t current_tag = lf_tag();
-    printf("At tag (%lld, %u) received %d. Intended tag is (%lld, %u).\n",
+    lf_print("At tag (%lld, %u) Print received %d. Intended tag is (%lld, %u).",
          current_tag.time - lf_time_start(),
          current_tag.microstep,
          in->value,
@@ -73,7 +73,7 @@ reactor Print {
 
 reactor Receiver {
   input in: int
-  timer t(0, 10 msec)  // Force a timer to be invoke periodically
+  timer t(0, 100 msec)  // Force a timer to be invoke periodically
   state c: int = 0     // to ensure logical time will advance in the absence of incoming messages.
   p = new Print()
   a = new ImportantActuator()

From 64e7629cedd2ea7343af4182837d0ea266a33d9f Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Sun, 16 Jul 2023 07:37:05 -0400
Subject: [PATCH 0652/1114] Reduce DEBUG output volume

---
 .../Python/src/federated/DistributedCountDecentralizedLate.lf | 2 +-
 .../federated/DistributedCountDecentralizedLateDownstream.lf  | 2 +-
 .../federated/DistributedCountDecentralizedLateHierarchy.lf   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/Python/src/federated/DistributedCountDecentralizedLate.lf b/test/Python/src/federated/DistributedCountDecentralizedLate.lf
index 1a0f47febd..87583d9277 100644
--- a/test/Python/src/federated/DistributedCountDecentralizedLate.lf
+++ b/test/Python/src/federated/DistributedCountDecentralizedLate.lf
@@ -17,7 +17,7 @@ reactor Print {
   input in_           # STP ()
   state success = 0   # STP(in, 30 msec);
   state success_stp_violation = 0
-  timer t(0, 1 msec)  # Force a timer to be invoke periodically
+  timer t(0, 100 msec)  # Force a timer to be invoke periodically
   state c = 0         # to ensure logical time will advance in the absence of incoming messages.
 
   reaction(in_) {=
diff --git a/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf b/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf
index 6c1ec4828e..dca44c16f7 100644
--- a/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf
+++ b/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf
@@ -72,7 +72,7 @@ reactor Print {
 
 reactor Receiver {
   input inp
-  timer t(0, 10 msec)  # Force a timer to be invoke periodically
+  timer t(0, 100 msec)  # Force a timer to be invoke periodically
   state c = 0          # to ensure logical time will advance in the absence of incoming messages.
   p = new Print()
   a = new ImportantActuator()
diff --git a/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf b/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf
index ab02b16187..c681805ca8 100644
--- a/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf
+++ b/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf
@@ -19,7 +19,7 @@ reactor ImportantActuator {
   input inp
   state success = 0    # Count messages that arrive without STP violation.
   state success_stp_violation = 0
-  timer t(0, 10 usec)  # Force a timer to be invoked periodically
+  timer t(0, 100 msec)  # Force a timer to be invoked periodically
   state c = 0          # to ensure logical time will advance in the absence of incoming messages.
 
   reaction(inp) {=
@@ -55,7 +55,7 @@ reactor ImportantActuator {
 
 reactor Receiver {
   input inp
-  timer t(0, 10 msec)  # Force a timer to be invoke periodically
+  timer t(0, 100 msec)  # Force a timer to be invoke periodically
   state c = 0          # to ensure logical time will advance in the absence of incoming messages.
   p = new Print()
   a = new ImportantActuator()

From 570915fb6d3809a95db7e360c577e8f782999d6c Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Sun, 16 Jul 2023 11:47:50 -0400
Subject: [PATCH 0653/1114] Format

---
 .../federated/DistributedCountDecentralizedLateHierarchy.lf   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/C/src/federated/DistributedCountDecentralizedLateHierarchy.lf b/test/C/src/federated/DistributedCountDecentralizedLateHierarchy.lf
index cfbd27de15..fd6f719af2 100644
--- a/test/C/src/federated/DistributedCountDecentralizedLateHierarchy.lf
+++ b/test/C/src/federated/DistributedCountDecentralizedLateHierarchy.lf
@@ -19,7 +19,7 @@ reactor ImportantActuator {
   state success: int = 0
   state success_stp_violation: int = 0
   timer t(0, 100 msec)  // Force a timer to be invoke periodically
-  state c: int = 0     // to ensure logical time will advance in the absence of incoming messages.
+  state c: int = 0      // to ensure logical time will advance in the absence of incoming messages.
 
   reaction(in) {=
     tag_t current_tag = lf_tag();
@@ -74,7 +74,7 @@ reactor Print {
 reactor Receiver {
   input in: int
   timer t(0, 100 msec)  // Force a timer to be invoke periodically
-  state c: int = 0     // to ensure logical time will advance in the absence of incoming messages.
+  state c: int = 0      // to ensure logical time will advance in the absence of incoming messages.
   p = new Print()
   a = new ImportantActuator()
   in -> p.in

From bee3771de8fd989fc984fc92db5d278247d26292 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Sun, 16 Jul 2023 11:49:15 -0400
Subject: [PATCH 0654/1114] Format

---
 .../src/federated/DistributedCountDecentralizedLate.lf      | 6 +++---
 .../DistributedCountDecentralizedLateDownstream.lf          | 2 +-
 .../federated/DistributedCountDecentralizedLateHierarchy.lf | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/Python/src/federated/DistributedCountDecentralizedLate.lf b/test/Python/src/federated/DistributedCountDecentralizedLate.lf
index 87583d9277..f58d5fd93e 100644
--- a/test/Python/src/federated/DistributedCountDecentralizedLate.lf
+++ b/test/Python/src/federated/DistributedCountDecentralizedLate.lf
@@ -14,11 +14,11 @@ import Count from "../lib/Count.lf"
 
 reactor Print {
   preamble {= import sys =}
-  input in_           # STP ()
-  state success = 0   # STP(in, 30 msec);
+  input in_             # STP ()
+  state success = 0     # STP(in, 30 msec);
   state success_stp_violation = 0
   timer t(0, 100 msec)  # Force a timer to be invoke periodically
-  state c = 0         # to ensure logical time will advance in the absence of incoming messages.
+  state c = 0           # to ensure logical time will advance in the absence of incoming messages.
 
   reaction(in_) {=
     current_tag = lf.tag()
diff --git a/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf b/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf
index dca44c16f7..983c5c0940 100644
--- a/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf
+++ b/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf
@@ -73,7 +73,7 @@ reactor Print {
 reactor Receiver {
   input inp
   timer t(0, 100 msec)  # Force a timer to be invoke periodically
-  state c = 0          # to ensure logical time will advance in the absence of incoming messages.
+  state c = 0           # to ensure logical time will advance in the absence of incoming messages.
   p = new Print()
   a = new ImportantActuator()
 
diff --git a/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf b/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf
index c681805ca8..0603de1a1e 100644
--- a/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf
+++ b/test/Python/src/federated/DistributedCountDecentralizedLateHierarchy.lf
@@ -17,10 +17,10 @@ import Print from "DistributedCountDecentralizedLateDownstream.lf"
 
 reactor ImportantActuator {
   input inp
-  state success = 0    # Count messages that arrive without STP violation.
+  state success = 0     # Count messages that arrive without STP violation.
   state success_stp_violation = 0
   timer t(0, 100 msec)  # Force a timer to be invoked periodically
-  state c = 0          # to ensure logical time will advance in the absence of incoming messages.
+  state c = 0           # to ensure logical time will advance in the absence of incoming messages.
 
   reaction(inp) {=
     current_tag = lf.tag()
@@ -56,7 +56,7 @@ reactor ImportantActuator {
 reactor Receiver {
   input inp
   timer t(0, 100 msec)  # Force a timer to be invoke periodically
-  state c = 0          # to ensure logical time will advance in the absence of incoming messages.
+  state c = 0           # to ensure logical time will advance in the absence of incoming messages.
   p = new Print()
   a = new ImportantActuator()
   inp -> p.inp

From ae0e4eb839acc9bb68d90ecf0c39d4843a69c0c7 Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Sun, 16 Jul 2023 23:25:38 -0500
Subject: [PATCH 0655/1114] [refactor] add reactor-c changes

---
 core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java | 3 +--
 core/src/main/resources/lib/c/reactor-c                        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 7c6b68908f..5eabc818a0 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -429,8 +429,6 @@ private static String setUpMainTargetZephyr(
   private static String setUpMainTargetRp2040(
       boolean hasMain, String executableName, Stream<String> cSources) {
     var code = new CodeBuilder();
-    // FIXME: remove this and move to lingo build
-    code.pr("add_compile_options(-Wall -Wextra -DLF_UNTHREADED)");
     // initialize sdk
     code.pr("pico_sdk_init()");
     code.newLine();
@@ -458,6 +456,7 @@ private static String setUpMainTargetRp2040(
     code.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 0)");
     code.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 1)");
     code.pr("pico_add_extra_outputs(${LF_MAIN_TARGET})");
+    code.newLine();
 
     return code.toString();
   }
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 3daba0d3c6..7433c9414d 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 3daba0d3c697e75f811485786f82562416764889
+Subproject commit 7433c9414d4c72a6ee2c8cf3942cd2d4c58c0295

From c41feed94587f2ddf71eaf70589e9d3096b06fa5 Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Sun, 16 Jul 2023 23:30:13 -0500
Subject: [PATCH 0656/1114] [threads] cond_var changes

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 7433c9414d..bc458330d5 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 7433c9414d4c72a6ee2c8cf3942cd2d4c58c0295
+Subproject commit bc458330d5c6e9821569e2812095160bf159da74

From c014196d3643600c3121b67d3fb936affff11a65 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Mon, 17 Jul 2023 03:16:56 -0400
Subject: [PATCH 0657/1114] Aligned with pico-support branch of reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index bc458330d5..bd704bece4 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit bc458330d5c6e9821569e2812095160bf159da74
+Subproject commit bd704bece43c10c1a17d985250968b04d7feed7e

From 1074f8403892445c7cb067dc7a7aca14e0769a9f Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Mon, 17 Jul 2023 02:27:44 -0500
Subject: [PATCH 0658/1114] [threaded] compilation check from threaded

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index bc458330d5..bd704bece4 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit bc458330d5c6e9821569e2812095160bf159da74
+Subproject commit bd704bece43c10c1a17d985250968b04d7feed7e

From f71a01721fe3fe71ec72949e1168cdd1b7204027 Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Tue, 18 Jul 2023 11:18:32 +0900
Subject: [PATCH 0659/1114] Add the test SpuriousDependency.lf for TypeScript
 federated execution

---
 .../federated/failing/SpuriousDependency.lf   | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 test/TypeScript/src/federated/failing/SpuriousDependency.lf

diff --git a/test/TypeScript/src/federated/failing/SpuriousDependency.lf b/test/TypeScript/src/federated/failing/SpuriousDependency.lf
new file mode 100644
index 0000000000..dc16319a70
--- /dev/null
+++ b/test/TypeScript/src/federated/failing/SpuriousDependency.lf
@@ -0,0 +1,66 @@
+/**
+ * This checks that a federated program does not deadlock when it is ambiguous, given the structure
+ * of a federate, whether it is permissible to require certain network sender/receiver reactions to
+ * precede others inp the execution of a given tag. The version of LFC that was inp the master branch
+ * on 4/15/2023 resolved the ambiguity inp a way that does appear to result inp deadlock.
+ */
+target TypeScript {
+  timeout: 1 sec
+}
+
+reactor Passthrough(id: number = 0) {
+  input inp: number
+  output out: number
+
+  reaction(inp) -> out {=
+    //lf_print("Hello from passthrough %d", self->id);
+    console.log("Hello from passthrough " + id);
+    //lf_set(out, inp->value);
+    out = inp;
+  =}
+}
+
+reactor Twisty {
+  input in0: number
+  input in1: number
+  output out0: number
+  output out1: number
+  p0 = new Passthrough(id=0)
+  p1 = new Passthrough(id=1)
+  in0 -> p0.inp
+  p0.out -> out0
+  in1 -> p1.inp
+  p1.out -> out1
+}
+
+reactor Check {
+  input inp: number
+
+  state count: number = 0
+
+  reaction(inp) {= console.log("count is now " + ++count); =}
+
+  reaction(shutdown) {=
+    // lf_print("******* Shutdown invoked.");
+    console.log("******* Shutdown invoked.");
+    // if (self->count != 1) {
+    //   lf_print_error_and_exit("Failed to receive expected input.");
+    // }
+    if (count != 1) {
+      util.reportError("Failed to receieve expected input.");
+    }
+  =}
+}
+
+federated reactor {
+  t0 = new Twisty()
+  t1 = new Twisty()
+  check = new Check()
+  t0.out1 -> t1.in0
+  t1.out1 -> t0.in0
+  state count: number = 0
+
+  t1.out0 -> check.inp
+
+  reaction(startup) -> t0.in1 {= t0.in1 = 0; =}
+}

From 81b130a50ff0bdbefc7de12f0f7539353d88ac80 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 18 Jul 2023 10:11:33 -0700
Subject: [PATCH 0660/1114] Improve error message.

---
 test/Python/src/federated/DistributedCountDecentralizedLate.lf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Python/src/federated/DistributedCountDecentralizedLate.lf b/test/Python/src/federated/DistributedCountDecentralizedLate.lf
index 1a0f47febd..1807f906e5 100644
--- a/test/Python/src/federated/DistributedCountDecentralizedLate.lf
+++ b/test/Python/src/federated/DistributedCountDecentralizedLate.lf
@@ -51,7 +51,7 @@ reactor Print {
 
   reaction(shutdown) {=
     if self.success + self.success_stp_violation != 5:
-      self.sys.stderr.write("Failed to detect STP violations in messages.\n")
+      self.sys.stderr.write(f"FATAL ERROR: Failed to detect STP violations in messages. Expected 4 STP violations but got {self.success_stp_violation}.\n")
       self.sys.exit(1)
     else:
       print("Successfully detected STP violation ({} violations, {} on-time).".format(self.success_stp_violation, self.success))

From aa18d29ba11a08e9a1861274745808970efebaa3 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 18 Jul 2023 11:00:36 -0700
Subject: [PATCH 0661/1114] Don't try to invoke STP handler of input reactions

---
 .../federated/extensions/CExtension.java      |  5 +++++
 .../extensions/FedTargetExtension.java        |  7 +++++--
 .../federated/extensions/TSExtension.java     |  5 +++++
 .../federated/generator/FedASTUtils.java      | 21 +++++++++----------
 core/src/main/resources/lib/c/reactor-c       |  2 +-
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 2d0fcc304a..3541ff0813 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -235,6 +235,11 @@ public String outputInitializationBody() {
     """;
   }
 
+  @Override
+  public String inputInitializationBody() {
+    return "self->_lf__reaction_1.is_an_input_reaction = true;\n";
+  }
+
   @Override
   public void addSenderIndexParameter(Reactor sender) {
     var tp = LfFactory.eINSTANCE.createTypeParm();
diff --git a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
index c185c8ed3a..b3d816f23a 100644
--- a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
@@ -20,8 +20,8 @@ public interface FedTargetExtension {
   /**
    * Perform necessary actions to initialize the target config.
    *
-   * @param context
-   * @param numOfFederates
+   * @param context The context of the original code generation process.
+   * @param numOfFederates The number of federates in the program.
    * @param federate The federate instance.
    * @param fileConfig An instance of {@code FedFileConfig}.
    * @param messageReporter Used to report errors.
@@ -58,6 +58,9 @@ String generateNetworkReceiverBody(
   /** Generate code for initializing a network output reactor from its startup reaction. */
   String outputInitializationBody();
 
+  /** Generate code for initializing a network input reactor from its startup reaction. */
+  String inputInitializationBody();
+
   /** Generate code for the parameter that specifies the sender index. */
   void addSenderIndexParameter(Reactor sender);
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 46e773a286..75930c7180 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -63,6 +63,11 @@ public String outputInitializationBody() {
     return ""; // TODO
   }
 
+  @Override
+  public String inputInitializationBody() {
+    return "";
+  }
+
   @Override
   public void addSenderIndexParameter(Reactor sender) {
     var senderIndexParameter = LfFactory.eINSTANCE.createParameter();
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 0d16ddcd60..70fe164012 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -45,10 +45,10 @@
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
+import org.lflang.federated.extensions.FedTargetExtension;
 import org.lflang.federated.extensions.FedTargetExtensionFactory;
 import org.lflang.federated.serialization.SupportedSerializers;
 import org.lflang.generator.MixedRadixInt;
@@ -217,6 +217,8 @@ private static void addNetworkReceiverReactor(
       Resource resource,
       MessageReporter messageReporter) {
     LfFactory factory = LfFactory.eINSTANCE;
+    var extension =
+        FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target);
     Type type = EcoreUtil.copy(connection.getDestinationPortInstance().getDefinition().getType());
 
     VarRef sourceRef = factory.createVarRef(); // source fed
@@ -238,6 +240,8 @@ private static void addNetworkReceiverReactor(
             .getParent()
             .reactorDefinition; // Top-level reactor.
 
+    receiver.getReactions().add(getInitializationReaction(extension, extension.inputInitializationBody()));
+
     receiver.getReactions().add(networkReceiverReaction);
     receiver.getOutputs().add(out);
 
@@ -288,8 +292,7 @@ private static void addNetworkReceiverReactor(
     setReactionBankIndex(networkReceiverReaction, connection.getDstBank());
 
     // FIXME: do not create a new extension every time it is used
-    FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
-        .annotateReaction(networkReceiverReaction);
+    extension.annotateReaction(networkReceiverReaction);
 
     // The connection is 'physical' if it uses the ~> notation.
     if (connection.getDefinition().isPhysical()) {
@@ -650,7 +653,7 @@ private static Reactor getNetworkSenderReactor(
 
     sender
         .getReactions()
-        .add(getInitializationReaction(connection.srcFederate.targetConfig.target));
+        .add(getInitializationReaction(extension, extension.outputInitializationBody()));
     sender.getReactions().add(networkSenderReaction);
     sender.getInputs().add(in);
 
@@ -702,18 +705,14 @@ private static Reaction getNetworkSenderReaction(
   /**
    * Return the reaction that initializes the containing network sender reactor on {@code startup}.
    */
-  private static Reaction getInitializationReaction(Target target) {
+  private static Reaction getInitializationReaction(FedTargetExtension extension, String body) {
     var initializationReaction = LfFactory.eINSTANCE.createReaction();
     var startup = LfFactory.eINSTANCE.createBuiltinTriggerRef();
     startup.setType(BuiltinTrigger.STARTUP);
-    if (target == Target.Python) {
-      var a = LfFactory.eINSTANCE.createAttribute();
-      a.setAttrName("_c_body");
-      initializationReaction.getAttributes().add(a);
-    }
+    extension.annotateReaction(initializationReaction);
     initializationReaction.getTriggers().add(startup);
     var code = LfFactory.eINSTANCE.createCode();
-    code.setBody(FedTargetExtensionFactory.getExtension(target).outputInitializationBody());
+    code.setBody(body);
     initializationReaction.setCode(code);
     return initializationReaction;
   }
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 0a77ffafff..793f350161 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 0a77ffaffff754bbe6a4635b1cda6ae712d2a236
+Subproject commit 793f35016127702889fd12690530fa39856b4d75

From caf9d776e83b05e747ae243cfceaf6aa70f0a432 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 18 Jul 2023 12:32:03 -0700
Subject: [PATCH 0662/1114] Reduce volume of test output in
 DistributedCountDecentralizedLateDownstream

---
 .../federated/DistributedCountDecentralizedLateDownstream.lf    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf b/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf
index 983c5c0940..4a8aa0af0e 100644
--- a/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf
+++ b/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf
@@ -26,7 +26,7 @@ reactor ImportantActuator {
   input inp
   state success = 0    # Count messages that arrive without STP violation.
   state success_stp_violation = 0
-  timer t(0, 10 usec)  # Force a timer to be invoked periodically
+  timer t(0, 100 msec)  # Force a timer to be invoked periodically
   state c = 0          # to ensure logical time will advance in the absence of incoming messages.
 
   reaction(inp) {=

From 259da76a739b559027b90024d946b4a004579e6a Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 18 Jul 2023 12:55:07 -0700
Subject: [PATCH 0663/1114] Bugfix in DistributedStopZero.

---
 test/Python/src/federated/DistributedStopZero.lf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/Python/src/federated/DistributedStopZero.lf b/test/Python/src/federated/DistributedStopZero.lf
index d933b9ce68..845f099698 100644
--- a/test/Python/src/federated/DistributedStopZero.lf
+++ b/test/Python/src/federated/DistributedStopZero.lf
@@ -32,7 +32,7 @@ reactor Sender {
 
   reaction(shutdown) {=
     tag = lf.tag()
-    if tag.time != USEC(0) or tag.microstep != 1:
+    if tag.time != self.startup_logical_time or tag.microstep != 1:
       sys.stderr.write("ERROR: Sender failed to stop the federation in time. Stopping at ({}, {}).\n".format(
            tag.time,
            tag.microstep))
@@ -69,7 +69,7 @@ reactor Receiver {
     # Therefore, the shutdown events must occur at (1000, 0) on the
     # receiver.
     tag = lf.tag()
-    if tag.time != USEC(0) or tag.microstep != 1:
+    if tag.time != self.startup_logical_time or tag.microstep != 1:
       sys.stderr.write("ERROR: Receiver failed to stop the federation in time. Stopping at ({}, {}).\n".format(
            tag.time,
            tag.microstep))

From 9516d24d696641978612bb4b4b556d5a4b9ddd56 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 18 Jul 2023 13:36:07 -0700
Subject: [PATCH 0664/1114] Fix mistake in DistributedCountDecentralizedLate.lf

This is another instance of confusing absolute time and elapsed time.
Apparently it is non-reproducible whether the first iteration is an STP
violation or not? Locally it is always an STP violation for me, but
apparently it is different in CI.
---
 .../main/java/org/lflang/federated/generator/FedASTUtils.java | 4 +++-
 .../Python/src/federated/DistributedCountDecentralizedLate.lf | 4 ++--
 .../federated/DistributedCountDecentralizedLateDownstream.lf  | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 70fe164012..7da95b6c60 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -240,7 +240,9 @@ private static void addNetworkReceiverReactor(
             .getParent()
             .reactorDefinition; // Top-level reactor.
 
-    receiver.getReactions().add(getInitializationReaction(extension, extension.inputInitializationBody()));
+    receiver
+        .getReactions()
+        .add(getInitializationReaction(extension, extension.inputInitializationBody()));
 
     receiver.getReactions().add(networkReceiverReaction);
     receiver.getOutputs().add(out);
diff --git a/test/Python/src/federated/DistributedCountDecentralizedLate.lf b/test/Python/src/federated/DistributedCountDecentralizedLate.lf
index d2175121fc..fe52eec1b7 100644
--- a/test/Python/src/federated/DistributedCountDecentralizedLate.lf
+++ b/test/Python/src/federated/DistributedCountDecentralizedLate.lf
@@ -30,7 +30,7 @@ reactor Print {
       in_.intended_tag.microstep
       )
     )
-    if (lf.tag() == Tag(SEC(1), 0)):
+    if (lf.tag() == Tag(lf.time.start() + SEC(1), 0)):
       self.success += 1 # Message was on-time
     self.c += 1
   =} STP(0) {=
@@ -51,7 +51,7 @@ reactor Print {
 
   reaction(shutdown) {=
     if self.success + self.success_stp_violation != 5:
-      self.sys.stderr.write(f"FATAL ERROR: Failed to detect STP violations in messages. Expected 4 STP violations but got {self.success_stp_violation}.\n")
+      print(f"FATAL ERROR: Failed to detect STP violations in messages. Expected at most 1 initial success and 4 or 5 STP violations depending on whether the first was a success, but got {self.success} initial successes and {self.success_stp_violation} STP violations.\n")
       self.sys.exit(1)
     else:
       print("Successfully detected STP violation ({} violations, {} on-time).".format(self.success_stp_violation, self.success))
diff --git a/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf b/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf
index 4a8aa0af0e..3ba50bc770 100644
--- a/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf
+++ b/test/Python/src/federated/DistributedCountDecentralizedLateDownstream.lf
@@ -24,10 +24,10 @@ import Count from "../lib/Count.lf"
 
 reactor ImportantActuator {
   input inp
-  state success = 0    # Count messages that arrive without STP violation.
+  state success = 0     # Count messages that arrive without STP violation.
   state success_stp_violation = 0
   timer t(0, 100 msec)  # Force a timer to be invoked periodically
-  state c = 0          # to ensure logical time will advance in the absence of incoming messages.
+  state c = 0           # to ensure logical time will advance in the absence of incoming messages.
 
   reaction(inp) {=
     current_tag = lf.tag()

From d87763fd013bd6d31f73b34941d8d274c8978d35 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 18 Jul 2023 13:53:12 -0700
Subject: [PATCH 0665/1114] Update
 core/src/main/java/org/lflang/generator/LFGenerator.java

---
 core/src/main/java/org/lflang/generator/LFGenerator.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/LFGenerator.java b/core/src/main/java/org/lflang/generator/LFGenerator.java
index 9ee47427f8..0b1c0d7418 100644
--- a/core/src/main/java/org/lflang/generator/LFGenerator.java
+++ b/core/src/main/java/org/lflang/generator/LFGenerator.java
@@ -144,7 +144,6 @@ public boolean errorsOccurred() {
   /**
    * Check if a clean was requested from the standalone compiler and perform the clean step.
    *
-   * <p>FIXME: the signature can be reduced to only take context.
    */
   protected void cleanIfNeeded(LFGeneratorContext context) {
     if (context.getArgs().containsKey("clean")) {

From dab235fe57c00601a36f7df083b4b96c539c56a6 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 18 Jul 2023 14:27:08 -0700
Subject: [PATCH 0666/1114] Try to reduce volume of output.

This is an attempt to address timeouts in CI.
---
 test/Python/src/federated/DistributedLoopedAction.lf         | 2 +-
 test/Python/src/federated/DistributedLoopedPhysicalAction.lf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/Python/src/federated/DistributedLoopedAction.lf b/test/Python/src/federated/DistributedLoopedAction.lf
index 550284dfac..81394d62d0 100644
--- a/test/Python/src/federated/DistributedLoopedAction.lf
+++ b/test/Python/src/federated/DistributedLoopedAction.lf
@@ -15,7 +15,7 @@ reactor Receiver(take_a_break_after=10, break_interval = 400 msec) {
   state received_messages = 0
   state total_received_messages = 0
   state breaks = 0
-  timer t(0, 1 msec)  # This will impact the performance
+  timer t(0, 50 msec)  # This will impact the performance
 
   # but forces the logical time to advance Comment this line for a more sensible log output.
   reaction(in_) {=
diff --git a/test/Python/src/federated/DistributedLoopedPhysicalAction.lf b/test/Python/src/federated/DistributedLoopedPhysicalAction.lf
index 51d73727dc..fa88bb3700 100644
--- a/test/Python/src/federated/DistributedLoopedPhysicalAction.lf
+++ b/test/Python/src/federated/DistributedLoopedPhysicalAction.lf
@@ -38,7 +38,7 @@ reactor Receiver(take_a_break_after=10, break_interval = 550 msec) {
   state total_received_messages = 0
   state breaks = 0
   # This will impact the performance
-  timer t(0, 1 msec)
+  timer t(0, 50 msec)
   # but forces the logical time to advance Comment this line for a more sensible log output.
   state base_logical_time
 

From b7ba921efbe6e38409fda1d6a090465b94e7fa65 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 18 Jul 2023 16:51:42 -0700
Subject: [PATCH 0667/1114] Address failing LSP tests.

---
 .../java/org/lflang/federated/extensions/TSExtension.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 75930c7180..45f58bc3b4 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -107,12 +107,12 @@ public String generateNetworkSenderBody(
       CoordinationType coordinationType,
       MessageReporter messageReporter) {
     return """
-        if (%1$s.%2$s !== undefined) {
-            this.util.sendRTITimedMessage(%1$s.%2$s, %3$s, %4$s, %5$s);
+        if (%1$s%2$s !== undefined) {
+            this.util.sendRTITimedMessage(%1$s%2$s, %3$s, %4$s, %5$s);
         }
         """
         .formatted(
-            sendingPort.getContainer().getName(),
+            sendingPort.getContainer() == null ? "" : sendingPort.getContainer().getName() + ".",
             sendingPort.getVariable().getName(),
             connection.getDstFederate().id,
             connection.getDstFederate().networkMessageActions.size(),

From 96991e0d813f630e2532cfd196fdff963b0800cf Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 18 Jul 2023 17:27:11 -0700
Subject: [PATCH 0668/1114] Another fix for the LSP tests.

---
 .../java/org/lflang/federated/extensions/TSExtension.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 45f58bc3b4..9887d7b0b5 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -49,12 +49,12 @@ public String generateNetworkReceiverBody(
     return """
         // generateNetworkReceiverBody
         if (%1$s !== undefined) {
-            %2$s.%3$s = %1$s;
+            %2$s%3$s = %1$s;
         }
         """
         .formatted(
             action.getName(),
-            receivingPort.getContainer().getName(),
+            receivingPort.getContainer() == null ? "" : receivingPort.getContainer().getName() + ".",
             receivingPort.getVariable().getName());
   }
 

From e0e83d422821b07813ec390f42281054acebfbc5 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 18 Jul 2023 17:43:28 -0700
Subject: [PATCH 0669/1114] Format.

---
 .../java/org/lflang/federated/extensions/TSExtension.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 9887d7b0b5..80d3933ce0 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -54,7 +54,9 @@ public String generateNetworkReceiverBody(
         """
         .formatted(
             action.getName(),
-            receivingPort.getContainer() == null ? "" : receivingPort.getContainer().getName() + ".",
+            receivingPort.getContainer() == null
+                ? ""
+                : receivingPort.getContainer().getName() + ".",
             receivingPort.getVariable().getName());
   }
 

From 35f08874e70b6aad9398c93990c6455d6d7e0312 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Wed, 19 Jul 2023 11:15:57 +0200
Subject: [PATCH 0670/1114] Apply spotless

---
 core/src/main/java/org/lflang/generator/LFGenerator.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/LFGenerator.java b/core/src/main/java/org/lflang/generator/LFGenerator.java
index 0b1c0d7418..410051f835 100644
--- a/core/src/main/java/org/lflang/generator/LFGenerator.java
+++ b/core/src/main/java/org/lflang/generator/LFGenerator.java
@@ -141,10 +141,7 @@ public boolean errorsOccurred() {
     return generatorErrorsOccurred;
   }
 
-  /**
-   * Check if a clean was requested from the standalone compiler and perform the clean step.
-   *
-   */
+  /** Check if a clean was requested from the standalone compiler and perform the clean step. */
   protected void cleanIfNeeded(LFGeneratorContext context) {
     if (context.getArgs().containsKey("clean")) {
       try {

From 054d4663c596cbe588383c174ef52b995ad6d89f Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 20 Jul 2023 13:11:53 -0700
Subject: [PATCH 0671/1114] Disable Python gc.

---
 .../federated/extensions/CExtension.java      | 59 ++++++++++---------
 .../federated/extensions/PythonExtension.java | 18 ++++++
 2 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 3541ff0813..2da5ee1821 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -487,18 +487,13 @@ public String getNetworkBufferType() {
     return "uint8_t*";
   }
 
-  /**
-   * Add preamble to a separate file to set up federated execution. Return an empty string since no
-   * code generated needs to go in the source.
-   */
-  @Override
-  public String generatePreamble(
+  /** Put the C preamble in a {@code include/_federate.name + _preamble.h} file. */
+  protected final void writePreambleFile(
       FederateInstance federate,
       FedFileConfig fileConfig,
       RtiConfig rtiConfig,
       MessageReporter messageReporter)
       throws IOException {
-    // Put the C preamble in a {@code include/_federate.name + _preamble.h} file
     String cPreamble = makePreamble(federate, rtiConfig, messageReporter);
     String relPath = getPreamblePath(federate);
     Path fedPreamblePath = fileConfig.getSrcPath().resolve(relPath);
@@ -506,27 +501,37 @@ public String generatePreamble(
     try (var writer = Files.newBufferedWriter(fedPreamblePath)) {
       writer.write(cPreamble);
     }
-    var includes = new CodeBuilder();
-    if (federate.targetConfig.target != Target.Python) {
-      includes.pr(
-          """
-              #ifdef __cplusplus
-              extern "C" {
-              #endif""");
-      includes.pr("#include \"core/federated/federate.h\"");
-      includes.pr("#include \"core/federated/net_common.h\"");
-      includes.pr("#include \"core/federated/net_util.h\"");
-      includes.pr("#include \"core/federated/clock-sync.h\"");
-      includes.pr("#include \"core/threaded/reactor_threaded.h\"");
-      includes.pr("#include \"core/utils/util.h\"");
-      includes.pr("extern federate_instance_t _fed;");
-      includes.pr("""
-              #ifdef __cplusplus
-              }
-              #endif""");
-      includes.pr(generateSerializationIncludes(federate, fileConfig));
-    }
+  }
 
+  /**
+   * Add preamble to a separate file to set up federated execution. Return an empty string since no
+   * code generated needs to go in the source.
+   */
+  @Override
+  public String generatePreamble(
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      RtiConfig rtiConfig,
+      MessageReporter messageReporter)
+      throws IOException {
+    writePreambleFile(federate, fileConfig, rtiConfig, messageReporter);
+    var includes = new CodeBuilder();
+    includes.pr("""
+            #ifdef __cplusplus
+            extern "C" {
+            #endif""");
+    includes.pr("#include \"core/federated/federate.h\"");
+    includes.pr("#include \"core/federated/net_common.h\"");
+    includes.pr("#include \"core/federated/net_util.h\"");
+    includes.pr("#include \"core/federated/clock-sync.h\"");
+    includes.pr("#include \"core/threaded/reactor_threaded.h\"");
+    includes.pr("#include \"core/utils/util.h\"");
+    includes.pr("extern federate_instance_t _fed;");
+    includes.pr("""
+            #ifdef __cplusplus
+            }
+            #endif""");
+    includes.pr(generateSerializationIncludes(federate, fileConfig));
     return includes.toString();
   }
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
index fa50ae9c63..9b85a0358c 100644
--- a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
@@ -26,6 +26,7 @@
 
 package org.lflang.federated.extensions;
 
+import java.io.IOException;
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
 import org.lflang.TargetProperty.CoordinationType;
@@ -33,6 +34,7 @@
 import org.lflang.federated.generator.FedConnectionInstance;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
+import org.lflang.federated.launcher.RtiConfig;
 import org.lflang.federated.serialization.FedNativePythonSerialization;
 import org.lflang.federated.serialization.FedSerialization;
 import org.lflang.federated.serialization.SupportedSerializers;
@@ -183,4 +185,20 @@ protected void serializeAndSend(
   public void annotateReaction(Reaction reaction) {
     ASTUtils.addReactionAttribute(reaction, "_c_body");
   }
+
+  @Override
+  public String generatePreamble(
+      FederateInstance federate,
+      FedFileConfig fileConfig,
+      RtiConfig rtiConfig,
+      MessageReporter messageReporter)
+      throws IOException {
+    writePreambleFile(federate, fileConfig, rtiConfig, messageReporter);
+    return """
+      import gc
+      import atexit
+      gc.disable()
+      atexit.register(os._exit, 0)
+      """;
+  }
 }

From 88e673f4fea9952d0d5c12e5dabb9b79c256baed Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 20 Jul 2023 21:18:16 -0700
Subject: [PATCH 0672/1114] Test clock synchronization.

---
 core/src/main/resources/lib/c/reactor-c               | 2 +-
 test/C/src/federated/DistributedCountDecentralized.lf | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index ac3f64993d..907ba0e86a 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit ac3f64993d40d8db2ee5e3af3fb10cbb8035b7c1
+Subproject commit 907ba0e86a3cf7956e96257ab51c2d89c3c71069
diff --git a/test/C/src/federated/DistributedCountDecentralized.lf b/test/C/src/federated/DistributedCountDecentralized.lf
index 78eb8f2435..1a45795fad 100644
--- a/test/C/src/federated/DistributedCountDecentralized.lf
+++ b/test/C/src/federated/DistributedCountDecentralized.lf
@@ -6,7 +6,11 @@
  */
 target C {
   timeout: 5 sec,
-  coordination: decentralized
+  coordination: decentralized,
+  clock-sync: on,
+  clock-sync-options: {
+    local-federates-on: true,
+  },
 }
 
 import Count from "../lib/Count.lf"

From f88d452633f4e09f7506005fa2205cfd8164ad47 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 20 Jul 2023 21:41:40 -0700
Subject: [PATCH 0673/1114] Apply formatter

---
 test/C/src/federated/DistributedCountDecentralized.lf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/C/src/federated/DistributedCountDecentralized.lf b/test/C/src/federated/DistributedCountDecentralized.lf
index 1a45795fad..b06f56fb9b 100644
--- a/test/C/src/federated/DistributedCountDecentralized.lf
+++ b/test/C/src/federated/DistributedCountDecentralized.lf
@@ -9,8 +9,8 @@ target C {
   coordination: decentralized,
   clock-sync: on,
   clock-sync-options: {
-    local-federates-on: true,
-  },
+    local-federates-on: true
+  }
 }
 
 import Count from "../lib/Count.lf"

From 890a1e89523a511b17f662eeed257335c85a29e0 Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Fri, 21 Jul 2023 12:26:03 -0500
Subject: [PATCH 0674/1114] [feature] add board property with usb/uart switch

---
 .../main/java/org/lflang/TargetConfig.java    |  5 ++++
 .../lflang/generator/c/CCmakeGenerator.java   | 29 ++++++++++++++++---
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index 86ac029131..6fb0dac8ae 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -384,6 +384,11 @@ public static class PlatformOptions {
      * The string value used to determine what type of embedded board we work with and can be used
      * to simplify the build process. For example, when we want to flash to an Arduino Nano 33 BLE
      * board, we can use the string arduino:mbed_nano:nano33ble
+     * TODO: move to lingo
+     * Can also be used to specify uart output setting on rp2040 boards
+     * where arduino_nano_rp2040_connect:uart
+     * or arduino_nano_rp2040_connect:usb (usb)
+     * fully specifies the board and uart output
      */
     public String board = null;
 
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index dfd31a494c..4e942386f7 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -139,6 +139,11 @@ CodeBuilder generateCMakeCode(
         cMakeCode.pr("include(pico_sdk_import.cmake)");
         cMakeCode.pr("project(" + executableName + " LANGUAGES C CXX ASM)");
         cMakeCode.newLine();
+        // board type for rp2040 based boards
+        if (targetConfig.platformOptions.board != null) {
+            String[] bProps = targetConfig.platformOptions.board.split(":");
+            cMakeCode.pr("set(PICO_BOARD \"" + bProps[0] + "\")");
+        }
         break;
       default:
         cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
@@ -163,6 +168,7 @@ CodeBuilder generateCMakeCode(
             + " gcc\")");
     cMakeCode.pr("  endif()");
     cMakeCode.pr("endif()");
+    // remove warnings for making building easier
     cMakeCode.pr("set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -w\")");
 
     cMakeCode.pr("# Require C11");
@@ -251,6 +257,25 @@ CodeBuilder generateCMakeCode(
     cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/modal_models)");
     cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/utils)");
 
+    
+    // post target definition board configurations  
+    if (targetConfig.platformOptions.board != null) {
+        switch(targetConfig.platformOptions.platform) {
+            case RP2040:
+                String[] bProps = targetConfig.platformOptions.board.split(":");
+                cMakeCode.pr("# Set pico-sdk default build configurations");
+                // uart ouput option provided
+                if (bProps.length > 1 && bProps[1].equals("uart")) {
+                    cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 0)");
+                    cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 1)"); 
+                } else if (bProps.length > 1 && bProps[1].equals("usb")) {
+                    cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 1)");
+                    cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 0)"); 
+                }
+                break;
+        }
+    }
+
     if (targetConfig.auth) {
       // If security is requested, add the auth option.
       var osName = System.getProperty("os.name").toLowerCase();
@@ -446,12 +471,8 @@ private static String setUpMainTargetRp2040(
     code.unindent();
     code.pr(")");
     code.newLine();
-    code.pr("# Set pico-sdk default build configurations");
-    code.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 0)");
-    code.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 1)");
     code.pr("pico_add_extra_outputs(${LF_MAIN_TARGET})");
     code.newLine();
-
     return code.toString();
   }
 }

From 9103508c24e2bf3029bccd4c9b5506f40d9e3bf6 Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Fri, 21 Jul 2023 13:33:58 -0500
Subject: [PATCH 0675/1114] [refactor] remove tests, set to basic reactor-c
 branch

---
 core/src/main/resources/lib/c/reactor-c |  2 +-
 test/C/src/rp2040/HelloPico.lf          |  7 -------
 test/C/src/rp2040/Thread.lf             | 13 -------------
 test/C/src/rp2040/Timer.lf              |  8 --------
 4 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 test/C/src/rp2040/HelloPico.lf
 delete mode 100644 test/C/src/rp2040/Thread.lf
 delete mode 100644 test/C/src/rp2040/Timer.lf

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index ffc5b07355..13f00e8b7e 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit ffc5b073556f5dea7e9d4f107a6fa5ce5272c692
+Subproject commit 13f00e8b7e4caa9f6172a64a6a2473d97096e392
diff --git a/test/C/src/rp2040/HelloPico.lf b/test/C/src/rp2040/HelloPico.lf
deleted file mode 100644
index bf4a7c7c29..0000000000
--- a/test/C/src/rp2040/HelloPico.lf
+++ /dev/null
@@ -1,7 +0,0 @@
-target C {
-  platform: "Rp2040"
-}
-
-main reactor {
-  reaction(startup) {= printf("Hello World!\n"); =}
-}
diff --git a/test/C/src/rp2040/Thread.lf b/test/C/src/rp2040/Thread.lf
deleted file mode 100644
index 2cb0494d1d..0000000000
--- a/test/C/src/rp2040/Thread.lf
+++ /dev/null
@@ -1,13 +0,0 @@
-target C {
-  platform: {
-    name: "Rp2040"
-  },
-  threading: true,
-  workers: 3
-}
-
-main reactor {
-  timer t(0, 1 sec)
-
-  reaction(t) {= prinf("Hello, World!"); =}
-}
diff --git a/test/C/src/rp2040/Timer.lf b/test/C/src/rp2040/Timer.lf
deleted file mode 100644
index ef437a46f3..0000000000
--- a/test/C/src/rp2040/Timer.lf
+++ /dev/null
@@ -1,8 +0,0 @@
-target C {
-  platform: "Rp2040"
-}
-
-main reactor {
-  timer t1(0, 100 msec)
-  reaction(t1) {= printf("Logical Time: %d. \n", lf_time_logical()); =}
-}

From bb70407b93e3ebd75c659435b950e8c98947500c Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Fri, 21 Jul 2023 13:38:06 -0500
Subject: [PATCH 0676/1114] [format] apply formatter

---
 .../main/java/org/lflang/TargetConfig.java    |  9 ++---
 .../lflang/generator/c/CCmakeGenerator.java   | 35 +++++++++----------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index 6fb0dac8ae..a8c9d6599e 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -383,12 +383,9 @@ public static class PlatformOptions {
     /**
      * The string value used to determine what type of embedded board we work with and can be used
      * to simplify the build process. For example, when we want to flash to an Arduino Nano 33 BLE
-     * board, we can use the string arduino:mbed_nano:nano33ble
-     * TODO: move to lingo
-     * Can also be used to specify uart output setting on rp2040 boards
-     * where arduino_nano_rp2040_connect:uart
-     * or arduino_nano_rp2040_connect:usb (usb)
-     * fully specifies the board and uart output
+     * board, we can use the string arduino:mbed_nano:nano33ble TODO: move to lingo Can also be used
+     * to specify uart output setting on rp2040 boards where arduino_nano_rp2040_connect:uart or
+     * arduino_nano_rp2040_connect:usb (usb) fully specifies the board and uart output
      */
     public String board = null;
 
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 4e942386f7..28970b768c 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -141,8 +141,8 @@ CodeBuilder generateCMakeCode(
         cMakeCode.newLine();
         // board type for rp2040 based boards
         if (targetConfig.platformOptions.board != null) {
-            String[] bProps = targetConfig.platformOptions.board.split(":");
-            cMakeCode.pr("set(PICO_BOARD \"" + bProps[0] + "\")");
+          String[] bProps = targetConfig.platformOptions.board.split(":");
+          cMakeCode.pr("set(PICO_BOARD \"" + bProps[0] + "\")");
         }
         break;
       default:
@@ -257,23 +257,22 @@ CodeBuilder generateCMakeCode(
     cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/modal_models)");
     cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/utils)");
 
-    
-    // post target definition board configurations  
+    // post target definition board configurations
     if (targetConfig.platformOptions.board != null) {
-        switch(targetConfig.platformOptions.platform) {
-            case RP2040:
-                String[] bProps = targetConfig.platformOptions.board.split(":");
-                cMakeCode.pr("# Set pico-sdk default build configurations");
-                // uart ouput option provided
-                if (bProps.length > 1 && bProps[1].equals("uart")) {
-                    cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 0)");
-                    cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 1)"); 
-                } else if (bProps.length > 1 && bProps[1].equals("usb")) {
-                    cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 1)");
-                    cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 0)"); 
-                }
-                break;
-        }
+      switch (targetConfig.platformOptions.platform) {
+        case RP2040:
+          String[] bProps = targetConfig.platformOptions.board.split(":");
+          cMakeCode.pr("# Set pico-sdk default build configurations");
+          // uart ouput option provided
+          if (bProps.length > 1 && bProps[1].equals("uart")) {
+            cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 0)");
+            cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 1)");
+          } else if (bProps.length > 1 && bProps[1].equals("usb")) {
+            cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 1)");
+            cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 0)");
+          }
+          break;
+      }
     }
 
     if (targetConfig.auth) {

From 49a2003bdba95e08bb25716b925e5dbff0c00fcd Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Fri, 21 Jul 2023 15:49:19 -0500
Subject: [PATCH 0677/1114] default board stdio

---
 core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 28970b768c..3bbf89918f 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -270,6 +270,9 @@ CodeBuilder generateCMakeCode(
           } else if (bProps.length > 1 && bProps[1].equals("usb")) {
             cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 1)");
             cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 0)");
+          } else {
+            cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 1)");
+            cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 1)");
           }
           break;
       }

From b77d48cede6ee6180c2d5973dffb1ca221020166 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 21 Jul 2023 22:51:59 -0700
Subject: [PATCH 0678/1114] Fix deadlock in StopAtShutdown for Python.

See commit message in reactor-c for details.
---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 793f350161..74b4eec482 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 793f35016127702889fd12690530fa39856b4d75
+Subproject commit 74b4eec482a519740f2120df7397f7155b38857d

From 07cb011aee9fa41fbc7938a22d1abae21ceaa33f Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Sat, 22 Jul 2023 18:35:47 -0500
Subject: [PATCH 0679/1114] resolve comments

---
 .../main/java/org/lflang/TargetConfig.java    |  5 ++--
 .../org/lflang/generator/CodeBuilder.java     |  6 +++--
 .../lflang/generator/c/CCmakeGenerator.java   | 24 +++++++++++++++----
 .../org/lflang/generator/c/CGenerator.java    |  4 ++--
 core/src/main/resources/lib/c/reactor-c       |  2 +-
 5 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index a8c9d6599e..7d3f4c18eb 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -383,8 +383,9 @@ public static class PlatformOptions {
     /**
      * The string value used to determine what type of embedded board we work with and can be used
      * to simplify the build process. For example, when we want to flash to an Arduino Nano 33 BLE
-     * board, we can use the string arduino:mbed_nano:nano33ble TODO: move to lingo Can also be used
-     * to specify uart output setting on rp2040 boards where arduino_nano_rp2040_connect:uart or
+     * board, we can use the string arduino:mbed_nano:nano33ble 
+     * Can also be used to specify uart output setting on 
+     * rp2040 boards where arduino_nano_rp2040_connect:uart or
      * arduino_nano_rp2040_connect:usb (usb) fully specifies the board and uart output
      */
     public String board = null;
diff --git a/core/src/main/java/org/lflang/generator/CodeBuilder.java b/core/src/main/java/org/lflang/generator/CodeBuilder.java
index 43ccde35c6..6231bf2b55 100644
--- a/core/src/main/java/org/lflang/generator/CodeBuilder.java
+++ b/core/src/main/java/org/lflang/generator/CodeBuilder.java
@@ -68,9 +68,9 @@ public int length() {
 
   /** Add a new line. */
   public void newLine() {
-    this.pr("\n");
+    this.pr("");
   }
-
+  
   /**
    * Append the specified text plus a final newline.
    *
@@ -84,6 +84,8 @@ public void pr(String format, Object... args) {
 
   /** Append the given text to the code buffer at the current indentation level. */
   public void pr(CharSequence text) {
+    // append newline on empty input string
+    if (text.toString().equals("")) code.append("\n");
     for (String line : (Iterable<? extends String>) () -> text.toString().lines().iterator()) {
       code.append(indentation).append(line).append("\n");
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 3bbf89918f..42b9258db2 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -141,8 +141,19 @@ CodeBuilder generateCMakeCode(
         cMakeCode.newLine();
         // board type for rp2040 based boards
         if (targetConfig.platformOptions.board != null) {
-          String[] bProps = targetConfig.platformOptions.board.split(":");
-          cMakeCode.pr("set(PICO_BOARD \"" + bProps[0] + "\")");
+          // board syntax <board_name> : <stdio_dir>
+          // ignore whitespace
+          String[] bProps = targetConfig.platformOptions.board.
+              trim().
+              split(":");
+          for (int i = 0; i < bProps.length; i++) {
+              bProps[i] = bProps[i].trim();
+          }
+          if (bProps.length < 1 || bProps[0].equals("")) {
+            cMakeCode.pr("set(PICO_BOARD pico)");
+          } else {
+            cMakeCode.pr("set(PICO_BOARD \"" + bProps[0] + "\")");
+          }
         }
         break;
       default:
@@ -261,8 +272,12 @@ CodeBuilder generateCMakeCode(
     if (targetConfig.platformOptions.board != null) {
       switch (targetConfig.platformOptions.platform) {
         case RP2040:
-          String[] bProps = targetConfig.platformOptions.board.split(":");
-          cMakeCode.pr("# Set pico-sdk default build configurations");
+          String[] bProps = targetConfig.platformOptions.board.
+              trim().
+              split(":");
+          for (int i = 0; i < bProps.length; i++) {
+              bProps[i] = bProps[i].trim();
+          }
           // uart ouput option provided
           if (bProps.length > 1 && bProps[1].equals("uart")) {
             cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 0)");
@@ -271,6 +286,7 @@ CodeBuilder generateCMakeCode(
             cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 1)");
             cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 0)");
           } else {
+            cMakeCode.pr("# Enable both usb and uart stdio");
             cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 1)");
             cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 1)");
           }
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index ce238b6246..d34e5b05af 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -520,7 +520,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
               .map(key -> "\"-D" + key + "=" + targetConfig.compileDefinitions.get(key) + "\"")
               .collect(Collectors.joining(",\n"));
       String settings = "{\n" + "\"cmake.configureArgs\": [\n" + compileDefs + "\n]\n}\n";
-      Path vscodePath = Path.of(fileConfig.getSrcGenPath() + File.separator + ".vscode");
+      Path vscodePath = fileConfig.getSrcGenPath().resolve(".vscode");
       if (!Files.exists(vscodePath)) Files.createDirectory(vscodePath);
       FileUtil.writeToFile(
           settings,
@@ -933,7 +933,7 @@ protected void copyTargetFiles() throws IOException {
 
     // For the pico src-gen, copy over vscode configurations for debugging
     if (targetConfig.platformOptions.platform == Platform.RP2040) {
-      Path vscodePath = Path.of(fileConfig.getSrcGenPath() + File.separator + ".vscode");
+      Path vscodePath = fileConfig.getSrcGenPath().resolve(".vscode");
       // If pico-sdk-path not defined, this can be used to pull the sdk into src-gen
       FileUtil.copyFileFromClassPath(
           "/lib/platform/rp2040/pico_sdk_import.cmake", fileConfig.getSrcGenPath(), true);
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 13f00e8b7e..e27c747186 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 13f00e8b7e4caa9f6172a64a6a2473d97096e392
+Subproject commit e27c7471869b4d721d8c7e79dda69ccc4b51c189

From 53481669aa9a0adcd27fb449cb19ffb157562cc7 Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Sat, 22 Jul 2023 18:49:39 -0500
Subject: [PATCH 0680/1114] cmake warnings and format

---
 .../src/main/java/org/lflang/TargetConfig.java |  5 ++---
 .../java/org/lflang/generator/CodeBuilder.java |  2 +-
 .../lflang/generator/c/CCmakeGenerator.java    | 18 +++++++-----------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index 7d3f4c18eb..5772e7e169 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -383,9 +383,8 @@ public static class PlatformOptions {
     /**
      * The string value used to determine what type of embedded board we work with and can be used
      * to simplify the build process. For example, when we want to flash to an Arduino Nano 33 BLE
-     * board, we can use the string arduino:mbed_nano:nano33ble 
-     * Can also be used to specify uart output setting on 
-     * rp2040 boards where arduino_nano_rp2040_connect:uart or
+     * board, we can use the string arduino:mbed_nano:nano33ble Can also be used to specify uart
+     * output setting on rp2040 boards where arduino_nano_rp2040_connect:uart or
      * arduino_nano_rp2040_connect:usb (usb) fully specifies the board and uart output
      */
     public String board = null;
diff --git a/core/src/main/java/org/lflang/generator/CodeBuilder.java b/core/src/main/java/org/lflang/generator/CodeBuilder.java
index 6231bf2b55..c868d2026e 100644
--- a/core/src/main/java/org/lflang/generator/CodeBuilder.java
+++ b/core/src/main/java/org/lflang/generator/CodeBuilder.java
@@ -70,7 +70,7 @@ public int length() {
   public void newLine() {
     this.pr("");
   }
-  
+
   /**
    * Append the specified text plus a final newline.
    *
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 42b9258db2..d1d03a5181 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -141,13 +141,11 @@ CodeBuilder generateCMakeCode(
         cMakeCode.newLine();
         // board type for rp2040 based boards
         if (targetConfig.platformOptions.board != null) {
-          // board syntax <board_name> : <stdio_dir>
+          // board syntax <board_name> : <stdio_opt>
           // ignore whitespace
-          String[] bProps = targetConfig.platformOptions.board.
-              trim().
-              split(":");
+          String[] bProps = targetConfig.platformOptions.board.trim().split(":");
           for (int i = 0; i < bProps.length; i++) {
-              bProps[i] = bProps[i].trim();
+            bProps[i] = bProps[i].trim();
           }
           if (bProps.length < 1 || bProps[0].equals("")) {
             cMakeCode.pr("set(PICO_BOARD pico)");
@@ -155,6 +153,8 @@ CodeBuilder generateCMakeCode(
             cMakeCode.pr("set(PICO_BOARD \"" + bProps[0] + "\")");
           }
         }
+        // remove warnings for rp2040 only to make debug easier
+        cMakeCode.pr("set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -w\")");
         break;
       default:
         cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
@@ -179,8 +179,6 @@ CodeBuilder generateCMakeCode(
             + " gcc\")");
     cMakeCode.pr("  endif()");
     cMakeCode.pr("endif()");
-    // remove warnings for making building easier
-    cMakeCode.pr("set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -w\")");
 
     cMakeCode.pr("# Require C11");
     cMakeCode.pr("set(CMAKE_C_STANDARD 11)");
@@ -272,11 +270,9 @@ CodeBuilder generateCMakeCode(
     if (targetConfig.platformOptions.board != null) {
       switch (targetConfig.platformOptions.platform) {
         case RP2040:
-          String[] bProps = targetConfig.platformOptions.board.
-              trim().
-              split(":");
+          String[] bProps = targetConfig.platformOptions.board.trim().split(":");
           for (int i = 0; i < bProps.length; i++) {
-              bProps[i] = bProps[i].trim();
+            bProps[i] = bProps[i].trim();
           }
           // uart ouput option provided
           if (bProps.length > 1 && bProps[1].equals("uart")) {

From 928db8e672b0c71c3e1f52fd76636fa00ff342b1 Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Sat, 22 Jul 2023 18:53:22 -0500
Subject: [PATCH 0681/1114] [submodule] merge main

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index e27c747186..e15597ebb2 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit e27c7471869b4d721d8c7e79dda69ccc4b51c189
+Subproject commit e15597ebb2749dff1fba72af12ec6ad56eb99b7e

From c6c947f91486f54e2b3500b4bcbe28b516620577 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 22 Jul 2023 17:25:55 -0700
Subject: [PATCH 0682/1114] "Fix" some test failures.

We use tests that have nondeterministic behavior wrt the model of a
machine that has nondeterministic execution times. These changes may
make the nondeterminism less likely to be a problem.
---
 core/src/main/resources/lib/c/reactor-c                   | 2 +-
 .../federated/LoopDistributedCentralizedPhysicalAction.lf | 6 +++---
 test/C/src/federated/LoopDistributedDouble.lf             | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 74b4eec482..6a0ab07d91 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 74b4eec482a519740f2120df7397f7155b38857d
+Subproject commit 6a0ab07d9180d0911e40275e4dde2fa839a1fcdb
diff --git a/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf b/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf
index 2f0da4e3de..7c31b0c55b 100644
--- a/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf
+++ b/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf
@@ -9,7 +9,7 @@ target C {
   coordination-options: {
     advance-message-interval: 100 msec
   },
-  timeout: 5 sec
+  timeout: 6 sec
 }
 
 preamble {=
@@ -26,7 +26,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
       while(!stop) {
         lf_print("Scheduling action.");
         lf_schedule(actionref, 0);
-        sleep(1);
+        sleep(2);
       }
       return NULL;
     }
@@ -59,7 +59,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
     lf_print("******* Shutdown invoked.");
     // Stop the thread that is scheduling actions.
     stop = true;
-    if (self->count != 5 * self->incr) {
+    if (self->count != 3 * self->incr) {
       lf_print_error_and_exit("Failed to receive all five expected inputs.");
     }
   =}
diff --git a/test/C/src/federated/LoopDistributedDouble.lf b/test/C/src/federated/LoopDistributedDouble.lf
index 45d3c207ac..a2b19f92f8 100644
--- a/test/C/src/federated/LoopDistributedDouble.lf
+++ b/test/C/src/federated/LoopDistributedDouble.lf
@@ -9,7 +9,7 @@ target C {
   coordination-options: {
     advance-message-interval: 100 msec
   },
-  timeout: 5 sec
+  timeout: 6 sec
 }
 
 preamble {=
@@ -26,7 +26,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
       while(!stop) {
         lf_print("Scheduling action.");
         lf_schedule(actionref, 0);
-        sleep(1);
+        sleep(2);
       }
       return NULL;
     }
@@ -37,7 +37,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
   output out2: int
   physical action a(delay)
   state count: int = 0
-  timer t(0, 1 sec)
+  timer t(0, 2 sec)
 
   reaction(startup) -> a {=
     // Start the thread that listens for Enter or Return.
@@ -82,7 +82,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
     lf_print("******* Shutdown invoked.");
     // Stop the thread that is scheduling actions.
     stop = true;
-    if (self->count != 5 * self->incr) {
+    if (self->count != 3 * self->incr) {
       lf_print_error_and_exit("Failed to receive all five expected inputs.");
     }
   =}

From 1062ce14a5b21138b25b845f6277e8709b80964b Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Mon, 24 Jul 2023 11:21:52 +0900
Subject: [PATCH 0683/1114] Use the class 'NetworkReactor' for network sender
 and receiver reactors

---
 .../org/lflang/generator/ts/TSActionGenerator.kt      | 11 +++++++++--
 .../org/lflang/generator/ts/TSConstructorGenerator.kt |  9 ++++++++-
 .../lflang/generator/ts/TSImportPreambleGenerator.kt  |  2 +-
 .../org/lflang/generator/ts/TSInstanceGenerator.kt    | 11 +++++++++++
 .../org/lflang/generator/ts/TSReactorGenerator.kt     |  7 ++++++-
 5 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt
index ec81ba898b..227404e12f 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt
@@ -52,8 +52,15 @@ class TSActionGenerator(
                 //     actionInstantiations.add(
                 //         "this.${action.name} = new __Action<${action.tsActionType}>($actionArgs);")
                 // }
-                actionInstantiations.add(
-                        "this.${action.name} = new __Action<${action.tsActionType}>($actionArgs);")
+                if (action.name.take(7) == "network") {
+                    actionInstantiations.add(
+                            "this.${action.name} = new __FederatePortAction<${action.tsActionType}>($actionArgs);")
+                    actionInstantiations.add(
+                            "this.registerNetworkInputAction<${action.tsActionType}>(this.${action.name})")
+                } else {
+                    actionInstantiations.add(
+                            "this.${action.name} = new __Action<${action.tsActionType}>($actionArgs);")
+                }
             }
         }
         return actionInstantiations.joinToString("\n")
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
index b6624d797f..4ebbaa7d47 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
@@ -34,6 +34,9 @@ class TSConstructorGenerator(
             arguments.add("federationID: string = 'Unidentified Federation'")
         } else {
             arguments.add("parent: __Reactor")
+            if (reactor.name.take(15) == "NetworkReceiver") {
+                arguments.add("portID: number")
+            }
         }
 
         // For TS, parameters are arguments of the class constructor.
@@ -65,7 +68,11 @@ class TSConstructorGenerator(
                 "super(timeout, keepAlive, fast, success, fail);"
             }
         } else {
-            "super(parent);"
+            if (reactor.name.take(15) == "NetworkReceiver") {
+                "super(parent, portID);"
+            } else {
+                "super(parent);"
+            }
         }
 
     // If the app is federated, register its
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt
index c7f780f8ee..d71d39a2e8 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt
@@ -57,7 +57,7 @@ class TSImportPreambleGenerator(
             import {Parameter as __Parameter, Timer as __Timer, Reactor as __Reactor, App as __App} from '@lf-lang/reactor-ts'
             import {Action as __Action, Startup as __Startup, FederatePortAction as __FederatePortAction} from '@lf-lang/reactor-ts'
             import {Bank as __Bank} from '@lf-lang/reactor-ts'
-            import {FederatedApp as __FederatedApp, FederateConfig as __FederateConfig} from '@lf-lang/reactor-ts'
+            import {NetworkReactor as __NetworkReactor, FederatedApp as __FederatedApp, FederateConfig as __FederateConfig} from '@lf-lang/reactor-ts'
             import {InPort as __InPort, OutPort as __OutPort, Port as __Port, WritablePort as __WritablePort, WritableMultiPort as __WritableMultiPort} from '@lf-lang/reactor-ts'
             import {InMultiPort as __InMultiPort, OutMultiPort as __OutMultiPort} from '@lf-lang/reactor-ts'
             import {Reaction as __Reaction} from '@lf-lang/reactor-ts'
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
index 97e753f99b..1bf8ac006f 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
@@ -48,6 +48,9 @@ class TSInstanceGenerator(
         for (childReactor in childReactors) {
             val childReactorArguments = StringJoiner(", ")
             childReactorArguments.add("this")
+            if (childReactor.reactorClass.name.take(15) == "NetworkReceiver") {
+                childReactorArguments.add(childReactor.reactorClass.name.takeLast(1))
+            }
 
             for (parameter in childReactor.reactorClass.toDefinition().parameters) {
                 childReactorArguments.add(TSTypes.getInstance().getTargetInitializer(parameter, childReactor))
@@ -64,6 +67,14 @@ class TSInstanceGenerator(
                 childReactorInstantiations.add(
                     "this.${childReactor.name} = " +
                             "new ${childReactor.reactorClass.name}($childReactorArguments)")
+                if (childReactor.reactorClass.name.take(15) == "NetworkReceiver") {
+                    childReactorInstantiations.add(
+                        "this.registerNetworkReciever(this.${childReactor.name})")
+                }
+                if (childReactor.reactorClass.name.take(13) == "NetworkSender") {
+                    childReactorInstantiations.add(
+                        "this.registerNetworkSender(this.${childReactor.name})")
+                }
             }
         }
         return childReactorInstantiations.joinToString("\n")
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
index e3be95f91c..54cc76b915 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
@@ -117,6 +117,7 @@ ${"             |"..preamble.code.toText()}
         }
 
         val isFederate = AttributeUtils.isFederate(reactor)
+        val isNetworkReactor = reactorName.take(7) == "Network"
         // val networkMessageActions = getNetworkMessageActions(reactor)
 
         // NOTE: type parameters that are referenced in ports or actions must extend
@@ -128,7 +129,11 @@ ${"             |"..preamble.code.toText()}
                 "class $reactorName extends __App {"
             }
         } else {
-            "export class $reactorName extends __Reactor {"
+            if (isNetworkReactor) {
+                "export class $reactorName extends __NetworkReactor {"    
+            } else {
+                "export class $reactorName extends __Reactor {"
+            }
         }
 
         val instanceGenerator = TSInstanceGenerator(reactor)

From 9632a8f0616ed3de05b3773d6b852697a0b42a5e Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Mon, 24 Jul 2023 15:33:12 +0900
Subject: [PATCH 0684/1114] Instantiate network receivers with a proper portID

---
 .../kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
index 1bf8ac006f..2df5dfa80f 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
@@ -45,11 +45,14 @@ class TSInstanceGenerator(
 
     fun generateInstantiations(): String {
         val childReactorInstantiations = LinkedList<String>()
+        var portID = 0
         for (childReactor in childReactors) {
             val childReactorArguments = StringJoiner(", ")
             childReactorArguments.add("this")
             if (childReactor.reactorClass.name.take(15) == "NetworkReceiver") {
-                childReactorArguments.add(childReactor.reactorClass.name.takeLast(1))
+                // Assume that network receiver reactors are sorted by portID
+                childReactorArguments.add(portID.toString())
+                portID++
             }
 
             for (parameter in childReactor.reactorClass.toDefinition().parameters) {

From 307902578e4d18175b81f336d4296f306a10f70d Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Mon, 24 Jul 2023 17:34:55 +0900
Subject: [PATCH 0685/1114] Fill the port absent reactor body

---
 .../federated/extensions/TSExtension.java     | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 80d3933ce0..32f9bd7f56 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -123,13 +123,30 @@ public String generateNetworkSenderBody(
 
   private String getNetworkDelayLiteral(Expression e) {
     var cLiteral = CExtensionUtils.getNetworkDelayLiteral(e);
-    return cLiteral.equals("NEVER") ? "0" : cLiteral;
+    return cLiteral.equals("NEVER") ? "TimeValue.never()" : cLiteral;
   }
 
   @Override
   public String generateNetworkOutputControlReactionBody(
       VarRef srcOutputPort, FedConnectionInstance connection) {
-    return "// TODO(hokeun): Figure out what to do for generateNetworkOutputControlReactionBody";
+      // The ID of the receiving port (rightPort) is the position
+    // of the networkAction (see below) in this list.
+    int receivingPortID = connection.getDstFederate().networkMessageActions.size();
+    var additionalDelayString = getNetworkDelayLiteral(connection.getDefinition().getDelay());
+    return """
+      // If the output port has not been set for the current logical time,
+      // send an ABSENT message to the receiving federate
+      if (%1$s%2$s === undefined) {
+        this.util.sendRTIPortAbsent(%3$s, %4$d, %5$d);
+      }
+        """
+          .formatted(
+            srcOutputPort.getContainer() == null ? "" : srcOutputPort.getContainer().getName() + ".",
+            srcOutputPort.getVariable().getName(),
+            additionalDelayString,
+            connection.getDstFederate().id,
+            receivingPortID
+          );
   }
 
   @Override

From 6a9c6bf2b499e18b208b574f5d6e686281ba086f Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Mon, 24 Jul 2023 17:49:47 +0900
Subject: [PATCH 0686/1114] Minor fixes

---
 .../federated/extensions/TSExtension.java     | 23 ++++++++++---------
 .../federated/generator/FedASTUtils.java      |  1 -
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 32f9bd7f56..332eeaeee9 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -129,24 +129,25 @@ private String getNetworkDelayLiteral(Expression e) {
   @Override
   public String generateNetworkOutputControlReactionBody(
       VarRef srcOutputPort, FedConnectionInstance connection) {
-      // The ID of the receiving port (rightPort) is the position
+    // The ID of the receiving port (rightPort) is the position
     // of the networkAction (see below) in this list.
     int receivingPortID = connection.getDstFederate().networkMessageActions.size();
     var additionalDelayString = getNetworkDelayLiteral(connection.getDefinition().getDelay());
     return """
-      // If the output port has not been set for the current logical time,
-      // send an ABSENT message to the receiving federate
-      if (%1$s%2$s === undefined) {
-        this.util.sendRTIPortAbsent(%3$s, %4$d, %5$d);
-      }
-        """
-          .formatted(
-            srcOutputPort.getContainer() == null ? "" : srcOutputPort.getContainer().getName() + ".",
+        // If the output port has not been set for the current logical time,
+        // send an ABSENT message to the receiving federate
+        if (%1$s%2$s === undefined) {
+          this.util.sendRTIPortAbsent(%3$s, %4$d, %5$d);
+        }
+      """
+        .formatted(
+            srcOutputPort.getContainer() == null
+                ? ""
+                : srcOutputPort.getContainer().getName() + ".",
             srcOutputPort.getVariable().getName(),
             additionalDelayString,
             connection.getDstFederate().id,
-            receivingPortID
-          );
+            receivingPortID);
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 81497f2776..7da95b6c60 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -44,7 +44,6 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.lflang.InferredType;
-import org.lflang.Target;
 import org.lflang.MessageReporter;
 import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;

From bf56d36098cc437f2b2d5f2c6c1351c3c0e6f77a Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Mon, 24 Jul 2023 19:22:45 +0900
Subject: [PATCH 0687/1114] Use a proper foramt of TimeValue

---
 .../java/org/lflang/federated/extensions/TSExtension.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 332eeaeee9..956823a1bf 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -123,7 +123,7 @@ public String generateNetworkSenderBody(
 
   private String getNetworkDelayLiteral(Expression e) {
     var cLiteral = CExtensionUtils.getNetworkDelayLiteral(e);
-    return cLiteral.equals("NEVER") ? "TimeValue.never()" : cLiteral;
+    return cLiteral.equals("NEVER") ? "TimeValue.never()" : "TimeValue.nsec(" + cLiteral + ")";
   }
 
   @Override
@@ -259,7 +259,7 @@ private List<String> getUpstreamConnectionDelays(FederateInstance federate) {
             if (delay == null) {
               element += "TimeValue.never()";
             } else {
-              element += "TimeValue.nsec(" + getNetworkDelayLiteral(delay) + ")";
+              element += getNetworkDelayLiteral(delay);
             }
             cnt++;
             if (cnt != delays.size()) {

From e69890732601bda43aad74d96c9e1dc04dce7958 Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Mon, 24 Jul 2023 12:45:49 -0700
Subject: [PATCH 0688/1114] [cmake] add defaults for null board

---
 .../lflang/generator/c/CCmakeGenerator.java   | 20 +++++++++----------
 core/src/main/resources/lib/c/reactor-c       |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index d1d03a5181..63262147e7 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -267,27 +267,27 @@ CodeBuilder generateCMakeCode(
     cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/utils)");
 
     // post target definition board configurations
-    if (targetConfig.platformOptions.board != null) {
-      switch (targetConfig.platformOptions.platform) {
-        case RP2040:
+    switch (targetConfig.platformOptions.platform) {
+      case RP2040:
+        if (targetConfig.platformOptions.board != null) {
           String[] bProps = targetConfig.platformOptions.board.trim().split(":");
           for (int i = 0; i < bProps.length; i++) {
             bProps[i] = bProps[i].trim();
           }
-          // uart ouput option provided
           if (bProps.length > 1 && bProps[1].equals("uart")) {
             cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 0)");
             cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 1)");
           } else if (bProps.length > 1 && bProps[1].equals("usb")) {
             cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 1)");
             cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 0)");
-          } else {
-            cMakeCode.pr("# Enable both usb and uart stdio");
-            cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 1)");
-            cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 1)");
           }
-          break;
-      }
+        } else {
+          // default
+          cMakeCode.pr("# Enable both usb and uart stdio");
+          cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 1)");
+          cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 1)");
+        }
+        break;
     }
 
     if (targetConfig.auth) {
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index e15597ebb2..77ce2c42c9 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit e15597ebb2749dff1fba72af12ec6ad56eb99b7e
+Subproject commit 77ce2c42c900f1aeaeadaddec5efd53ceca69bae

From bba51a2a5562f07ffafb88ee456869459c1b63c0 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 24 Jul 2023 12:58:59 -0700
Subject: [PATCH 0689/1114] Revert ""Fix" some test failures."

This reverts commit c6c947f91486f54e2b3500b4bcbe28b516620577.
---
 core/src/main/resources/lib/c/reactor-c                   | 2 +-
 .../federated/LoopDistributedCentralizedPhysicalAction.lf | 6 +++---
 test/C/src/federated/LoopDistributedDouble.lf             | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 6a0ab07d91..74b4eec482 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 6a0ab07d9180d0911e40275e4dde2fa839a1fcdb
+Subproject commit 74b4eec482a519740f2120df7397f7155b38857d
diff --git a/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf b/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf
index 7c31b0c55b..2f0da4e3de 100644
--- a/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf
+++ b/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf
@@ -9,7 +9,7 @@ target C {
   coordination-options: {
     advance-message-interval: 100 msec
   },
-  timeout: 6 sec
+  timeout: 5 sec
 }
 
 preamble {=
@@ -26,7 +26,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
       while(!stop) {
         lf_print("Scheduling action.");
         lf_schedule(actionref, 0);
-        sleep(2);
+        sleep(1);
       }
       return NULL;
     }
@@ -59,7 +59,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
     lf_print("******* Shutdown invoked.");
     // Stop the thread that is scheduling actions.
     stop = true;
-    if (self->count != 3 * self->incr) {
+    if (self->count != 5 * self->incr) {
       lf_print_error_and_exit("Failed to receive all five expected inputs.");
     }
   =}
diff --git a/test/C/src/federated/LoopDistributedDouble.lf b/test/C/src/federated/LoopDistributedDouble.lf
index a2b19f92f8..45d3c207ac 100644
--- a/test/C/src/federated/LoopDistributedDouble.lf
+++ b/test/C/src/federated/LoopDistributedDouble.lf
@@ -9,7 +9,7 @@ target C {
   coordination-options: {
     advance-message-interval: 100 msec
   },
-  timeout: 6 sec
+  timeout: 5 sec
 }
 
 preamble {=
@@ -26,7 +26,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
       while(!stop) {
         lf_print("Scheduling action.");
         lf_schedule(actionref, 0);
-        sleep(2);
+        sleep(1);
       }
       return NULL;
     }
@@ -37,7 +37,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
   output out2: int
   physical action a(delay)
   state count: int = 0
-  timer t(0, 2 sec)
+  timer t(0, 1 sec)
 
   reaction(startup) -> a {=
     // Start the thread that listens for Enter or Return.
@@ -82,7 +82,7 @@ reactor Looper(incr: int = 1, delay: time = 0 msec) {
     lf_print("******* Shutdown invoked.");
     // Stop the thread that is scheduling actions.
     stop = true;
-    if (self->count != 3 * self->incr) {
+    if (self->count != 5 * self->incr) {
       lf_print_error_and_exit("Failed to receive all five expected inputs.");
     }
   =}

From d49ef82f16df4d1f798cf4d9ae99f743fabbcae0 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 24 Jul 2023 13:41:51 -0700
Subject: [PATCH 0690/1114] Try again to work around the test failures.

I noticed that the test that fails most often had an out of memory error
in CI at one point. Usually the problem was something else --
undetermined because the debug output was being truncated. However this
is an indication that the debug output is excessive. We have spent a lot
of time struggling with excessive debug output in CI and so I am
resorting to this most radical solution of allowing to disable it for
specific tests.
---
 .../java/org/lflang/tests/runtime/PythonTest.java          | 5 +++--
 .../org/lflang/tests/serialization/SerializationTest.java  | 5 +++--
 core/src/testFixtures/java/org/lflang/tests/TestBase.java  | 7 ++++---
 .../federated/LoopDistributedCentralizedPhysicalAction.lf  | 3 ++-
 test/C/src/federated/LoopDistributedDouble.lf              | 3 ++-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
index e1ffbd57b8..5b72c406d9 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
@@ -29,6 +29,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.lflang.Target;
+import org.lflang.TargetConfig;
 import org.lflang.tests.RuntimeTest;
 
 /**
@@ -47,8 +48,8 @@ public PythonTest() {
   }
 
   @Override
-  protected void addExtraLfcArgs(Properties args) {
-    super.addExtraLfcArgs(args);
+  protected void addExtraLfcArgs(Properties args, TargetConfig targetConfig) {
+    super.addExtraLfcArgs(args, targetConfig);
     if (System.getProperty("os.name").startsWith("Windows")) {
       // Use the RelWithDebInfo build type on Windows as the Debug/Test build type produces linker
       // Errors in CI
diff --git a/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java b/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
index 26f3ec37af..8f92c63437 100644
--- a/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
@@ -4,6 +4,7 @@
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.lflang.Target;
+import org.lflang.TargetConfig;
 import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry.TestCategory;
@@ -15,8 +16,8 @@ protected SerializationTest() {
   }
 
   @Override
-  protected void addExtraLfcArgs(Properties args) {
-    super.addExtraLfcArgs(args);
+  protected void addExtraLfcArgs(Properties args, TargetConfig targetConfig) {
+    super.addExtraLfcArgs(args, targetConfig);
     // Use the Debug build type as coverage generation does not work for the serialization tests
     args.setProperty("build-type", "Debug");
   }
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index b1b52b0c2e..9911314a01 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -40,6 +40,7 @@
 import org.lflang.LFRuntimeModule;
 import org.lflang.LFStandaloneSetup;
 import org.lflang.Target;
+import org.lflang.TargetConfig;
 import org.lflang.generator.GeneratorResult;
 import org.lflang.generator.LFGenerator;
 import org.lflang.generator.LFGeneratorContext;
@@ -386,7 +387,6 @@ private void configure(LFTest test, Configurator configurator, TestLevel level)
       throws IOException, TestError {
     var props = new Properties();
     props.setProperty("hierarchical-bin", "true");
-    addExtraLfcArgs(props);
 
     var sysProps = System.getProperties();
     // Set the external-runtime-path property if it was specified.
@@ -426,6 +426,7 @@ private void configure(LFTest test, Configurator configurator, TestLevel level)
             r,
             fileAccess,
             fileConfig -> new DefaultMessageReporter());
+    addExtraLfcArgs(props, context.getTargetConfig());
 
     test.configure(context);
 
@@ -469,9 +470,9 @@ private void validate(LFTest test) throws TestError {
   }
 
   /** Override to add some LFC arguments to all runs of this test class. */
-  protected void addExtraLfcArgs(Properties args) {
+  protected void addExtraLfcArgs(Properties args, TargetConfig targetConfig) {
     args.setProperty("build-type", "Test");
-    args.setProperty("logging", "Debug");
+    if (targetConfig.logLevel == null) args.setProperty("logging", "Debug");
   }
 
   /**
diff --git a/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf b/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf
index 2f0da4e3de..0d5f6b7591 100644
--- a/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf
+++ b/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf
@@ -9,7 +9,8 @@ target C {
   coordination-options: {
     advance-message-interval: 100 msec
   },
-  timeout: 5 sec
+  timeout: 5 sec,
+  logging: log
 }
 
 preamble {=
diff --git a/test/C/src/federated/LoopDistributedDouble.lf b/test/C/src/federated/LoopDistributedDouble.lf
index 45d3c207ac..187db3df6f 100644
--- a/test/C/src/federated/LoopDistributedDouble.lf
+++ b/test/C/src/federated/LoopDistributedDouble.lf
@@ -9,7 +9,8 @@ target C {
   coordination-options: {
     advance-message-interval: 100 msec
   },
-  timeout: 5 sec
+  timeout: 5 sec,
+  logging: log
 }
 
 preamble {=

From e6c4b63c48181e8c8df35065a9961eaad3878e3d Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Mon, 24 Jul 2023 15:55:32 -0700
Subject: [PATCH 0691/1114] exception for null target property string

---
 core/src/main/java/org/lflang/TargetProperty.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 3c43ac4665..19e9175434 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -455,6 +455,13 @@ public enum TargetProperty {
           config.platformOptions = new PlatformOptions();
           config.platformOptions.platform =
               (Platform) UnionType.PLATFORM_UNION.forName(ASTUtils.elementToSingleString(value));
+          if (config.platformOptions.platform == null) {
+            String s =
+              "Unidentified Platform Type, LF supports the following platform types: "
+                + Arrays.asList(Platform.values()).toString();
+            err.at(value).error(s);
+            throw new AssertionError(s);
+          }
         } else {
           config.platformOptions = new PlatformOptions();
           for (KeyValuePair entry : value.getKeyvalue().getPairs()) {

From e057e0a6f3a0a31843f415251e93d91126791fa6 Mon Sep 17 00:00:00 2001
From: Abhinav Gundrala <gundralaa@berkeley.edu>
Date: Mon, 24 Jul 2023 16:07:15 -0700
Subject: [PATCH 0692/1114] [format] spotless apply

---
 core/src/main/java/org/lflang/TargetProperty.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 19e9175434..16cb142640 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -457,8 +457,8 @@ public enum TargetProperty {
               (Platform) UnionType.PLATFORM_UNION.forName(ASTUtils.elementToSingleString(value));
           if (config.platformOptions.platform == null) {
             String s =
-              "Unidentified Platform Type, LF supports the following platform types: "
-                + Arrays.asList(Platform.values()).toString();
+                "Unidentified Platform Type, LF supports the following platform types: "
+                    + Arrays.asList(Platform.values()).toString();
             err.at(value).error(s);
             throw new AssertionError(s);
           }

From 2fa5bbe24c8a9777b9ea342b8cc63cf589facb6b Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Tue, 25 Jul 2023 10:25:33 +0900
Subject: [PATCH 0693/1114] Add the generic type of `NetworkReactor`

---
 .../main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt   | 2 +-
 .../main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt | 3 ++-
 .../main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt  | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt
index 227404e12f..896fd51ee8 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt
@@ -56,7 +56,7 @@ class TSActionGenerator(
                     actionInstantiations.add(
                             "this.${action.name} = new __FederatePortAction<${action.tsActionType}>($actionArgs);")
                     actionInstantiations.add(
-                            "this.registerNetworkInputAction<${action.tsActionType}>(this.${action.name})")
+                            "this.registerNetworkInputAction(this.${action.name})")
                 } else {
                     actionInstantiations.add(
                             "this.${action.name} = new __Action<${action.tsActionType}>($actionArgs);")
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
index 2df5dfa80f..632febf920 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
@@ -72,7 +72,8 @@ class TSInstanceGenerator(
                             "new ${childReactor.reactorClass.name}($childReactorArguments)")
                 if (childReactor.reactorClass.name.take(15) == "NetworkReceiver") {
                     childReactorInstantiations.add(
-                        "this.registerNetworkReciever(this.${childReactor.name})")
+                        "this.registerNetworkReceiver(\n"
+                        + "\tthis.${childReactor.name} as __NetworkReactor<unknown>\n)")
                 }
                 if (childReactor.reactorClass.name.take(13) == "NetworkSender") {
                     childReactorInstantiations.add(
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
index 54cc76b915..4e81a1f967 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
@@ -130,7 +130,8 @@ ${"             |"..preamble.code.toText()}
             }
         } else {
             if (isNetworkReactor) {
-                "export class $reactorName extends __NetworkReactor {"    
+                val networkInputType = if (reactor.actions.size == 0) "unknown" else reactor.actions[0].tsActionType
+                "export class $reactorName extends __NetworkReactor<$networkInputType> {"    
             } else {
                 "export class $reactorName extends __Reactor {"
             }

From 7cf28194e285ab54d33000ba4db691a30e4d78a8 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 24 Jul 2023 16:23:10 -0700
Subject: [PATCH 0694/1114] Try again to work around the test failures.

---
 core/src/main/resources/lib/c/reactor-c                         | 2 +-
 .../C/src/federated/LoopDistributedCentralizedPhysicalAction.lf | 2 +-
 test/C/src/federated/LoopDistributedDouble.lf                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 74b4eec482..6a0ab07d91 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 74b4eec482a519740f2120df7397f7155b38857d
+Subproject commit 6a0ab07d9180d0911e40275e4dde2fa839a1fcdb
diff --git a/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf b/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf
index 0d5f6b7591..ac783f07cc 100644
--- a/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf
+++ b/test/C/src/federated/LoopDistributedCentralizedPhysicalAction.lf
@@ -10,7 +10,7 @@ target C {
     advance-message-interval: 100 msec
   },
   timeout: 5 sec,
-  logging: log
+  logging: warn
 }
 
 preamble {=
diff --git a/test/C/src/federated/LoopDistributedDouble.lf b/test/C/src/federated/LoopDistributedDouble.lf
index 187db3df6f..94c19bebbc 100644
--- a/test/C/src/federated/LoopDistributedDouble.lf
+++ b/test/C/src/federated/LoopDistributedDouble.lf
@@ -10,7 +10,7 @@ target C {
     advance-message-interval: 100 msec
   },
   timeout: 5 sec,
-  logging: log
+  logging: warn
 }
 
 preamble {=

From 45d316916d95a2554dc4c16a6f173f6d28a3bd46 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 24 Jul 2023 17:49:52 -0700
Subject: [PATCH 0695/1114] Fix STP violation that was reported on master.

Thanks to Jacky Kwok for finding this.
---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 6a0ab07d91..9428f3d380 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 6a0ab07d9180d0911e40275e4dde2fa839a1fcdb
+Subproject commit 9428f3d380d7fe9044eb4664e49201ce013bafef

From 9acb408821453057fa1dedd652cce0c8ddf5fa9e Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Tue, 25 Jul 2023 15:20:44 +0900
Subject: [PATCH 0696/1114] Clean up commented-out code

---
 .../lflang/generator/ts/TSActionGenerator.kt  |  7 -------
 .../generator/ts/TSConstructorGenerator.kt    | 10 +---------
 .../lflang/generator/ts/TSReactorGenerator.kt | 20 -------------------
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt
index 896fd51ee8..1ec5e9847a 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt
@@ -45,13 +45,6 @@ class TSActionGenerator(
                         ", " + action.minDelay.toTsTime()
                     }
                 }
-                // if (action.name in networkMessageActions) {
-                //     actionInstantiations.add(
-                //         "this.${action.name} = new __FederatePortAction<${action.tsActionType}>($actionArgs);")
-                // } else {
-                //     actionInstantiations.add(
-                //         "this.${action.name} = new __Action<${action.tsActionType}>($actionArgs);")
-                // }
                 if (action.name.take(7) == "network") {
                     actionInstantiations.add(
                             "this.${action.name} = new __FederatePortAction<${action.tsActionType}>($actionArgs);")
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
index 4ebbaa7d47..d044fc8910 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
@@ -75,13 +75,6 @@ class TSConstructorGenerator(
             }
         }
 
-    // If the app is federated, register its
-    // networkMessageActions with the RTIClient
-    // private fun generateFederatePortActionRegistrations(networkMessageActions: List<String>): String =
-    //     networkMessageActions.withIndex().joinWithLn { (fedPortID, actionName) ->
-    //         "this.registerFederatePortAction($fedPortID, this.$actionName);"
-    //     }
-
     // Generate code for setting target configurations.
     private fun generateTargetConfigurations(targetConfig: TargetConfig): String {
         val interval = targetConfig.coordinationOptions.advance_message_interval
@@ -98,8 +91,7 @@ class TSConstructorGenerator(
         states: TSStateGenerator,
         actions: TSActionGenerator,
         ports: TSPortGenerator,
-        isFederate: Boolean,
-        // networkMessageActions: MutableList<String>
+        isFederate: Boolean
     ): String {
         val connections = TSConnectionGenerator(reactor.connections, messageReporter)
         val reactions = TSReactionGenerator(messageReporter, reactor)
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
index 4e81a1f967..67f5f8ba6c 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
@@ -90,25 +90,6 @@ ${"             |"..preamble.code.toText()}
             }.trimMargin()
         }
 
-    // private fun getNetworkMessageActions(reactor: Reactor): MutableList<String> {
-    //     val attribute = AttributeUtils.findAttributeByName(reactor, "_fed_config")
-    //     val actionsStr = AttributeUtils.getAttributeParameter(attribute, AttributeSpec.NETWORK_MESSAGE_ACTIONS)
-    //     var actionsList = actionsStr?.split(",")?.filter { it.isNotEmpty()} ?: emptyList()
-    //     actionsList = actionsList.toMutableList()
-
-    //     val childReactors = reactor.instantiations
-    //     var actionsListCount = 0
-    //     for (childReactor in childReactors) {
-    //         if (childReactor.reactorClass.name.take(15) == "NetworkReceiver") {
-    //             // FIXME: Assume that the order of childReactor and attribute list are identical.
-    //             // This assumption might bring some erros
-    //             actionsList[actionsListCount] = childReactor.name + "." + actionsList[actionsListCount]
-    //             actionsListCount++
-    //         }
-    //     }
-    //     return actionsList
-    // }
-
     fun generateReactor(reactor: Reactor): String {
         var reactorName = reactor.name
         if (!reactor.typeParms.isEmpty()) {
@@ -118,7 +99,6 @@ ${"             |"..preamble.code.toText()}
 
         val isFederate = AttributeUtils.isFederate(reactor)
         val isNetworkReactor = reactorName.take(7) == "Network"
-        // val networkMessageActions = getNetworkMessageActions(reactor)
 
         // NOTE: type parameters that are referenced in ports or actions must extend
         // Present in order for the program to type check.

From c770be9f93b9485920744d691526f527ab55c00c Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <78055940+byeong-gil@users.noreply.github.com>
Date: Tue, 25 Jul 2023 15:23:47 +0900
Subject: [PATCH 0697/1114] Update TSActionGenerator.kt

---
 .../main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt
index 1ec5e9847a..5009f88a71 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt
@@ -9,8 +9,7 @@ import java.util.*
  * Generator for actions in TypeScript target.
  */
 class TSActionGenerator(
-    private val actions: List<Action>,
-    // private val networkMessageActions: List<String>
+    private val actions: List<Action>
 ) {
 
     fun generateClassProperties(): String {

From c31aa8f3302fc5995b61e1d7917858756e826057 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 25 Jul 2023 10:35:29 +0200
Subject: [PATCH 0698/1114] install executable script for python programs

---
 .../generator/python/PythonGenerator.java     | 32 ++++++++----
 .../generator/python/PythonInfoGenerator.java | 52 -------------------
 2 files changed, 22 insertions(+), 62 deletions(-)
 delete mode 100644 core/src/main/java/org/lflang/generator/python/PythonInfoGenerator.java

diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index b8b3a74282..70a00db411 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -37,6 +37,7 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.lflang.AttributeUtils;
+import org.lflang.FileConfig;
 import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
@@ -100,8 +101,7 @@ public PythonGenerator(LFGeneratorContext context) {
                 "lib/python_time.c",
                 "lib/pythontarget.c"),
             PythonGenerator::setUpMainTarget,
-            "install(TARGETS)" // No-op
-            ));
+            generateCmakeInstall(context.getFileConfig())));
   }
 
   private PythonGenerator(
@@ -396,15 +396,10 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         codeMaps.putAll(codeMapsForFederate);
         copyTargetFiles();
         new PythonValidator(fileConfig, messageReporter, codeMaps, protoNames).doValidate(context);
-        if (targetConfig.noCompile) {
-          messageReporter.nowhere().info(PythonInfoGenerator.generateSetupInfo(fileConfig));
-        }
       } catch (Exception e) {
         //noinspection ConstantConditions
         throw Exceptions.sneakyThrow(e);
       }
-
-      messageReporter.nowhere().info(PythonInfoGenerator.generateRunInfo(fileConfig, lfModuleName));
     }
 
     if (messageReporter.getErrorsOccurred()) {
@@ -578,7 +573,7 @@ private static String setUpMainTarget(
             add_subdirectory(core)
             set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR})
             set(LF_MAIN_TARGET <pyModuleName>)
-            find_package(Python 3.7.0...<3.11.0 COMPONENTS Interpreter Development)
+            find_package(Python 3.7.0...<3.12.0 REQUIRED COMPONENTS Interpreter Development)
             Python_add_library(
                 ${LF_MAIN_TARGET}
                 MODULE
@@ -598,11 +593,28 @@ private static String setUpMainTarget(
             target_link_libraries(${LF_MAIN_TARGET} PRIVATE ${Python_LIBRARIES})
             target_compile_definitions(${LF_MAIN_TARGET} PUBLIC MODULE_NAME=<pyModuleName>)
             """)
-        .replace("<pyModuleName>", generatePythonModuleName(executableName))
-        .replace("executableName", executableName);
+        .replace("<pyModuleName>", generatePythonModuleName(executableName));
     // The use of fileConfig.name will break federated execution, but that's fine
   }
 
+  private static String generateCmakeInstall(FileConfig fileConfig) {
+    return """
+             file(GENERATE OUTPUT <fileName> CONTENT
+               "#!/bin/sh\n\\
+               ${Python_EXECUTABLE} <pyMainName>"
+             )
+             install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/<fileName> DESTINATION ${CMAKE_INSTALL_BINDIR})
+           """
+        .replace("<fileName>", fileConfig.name)
+        .replace(
+            "<pyMainName>",
+            fileConfig
+                .getSrcGenPath()
+                .resolve(fileConfig.name + ".py")
+                .toAbsolutePath()
+                .toString());
+  }
+
   /**
    * Generate a ({@code key}, {@code val}) tuple pair for the {@code define_macros} field of the
    * Extension class constructor from setuptools.
diff --git a/core/src/main/java/org/lflang/generator/python/PythonInfoGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonInfoGenerator.java
deleted file mode 100644
index 01cadbcc5c..0000000000
--- a/core/src/main/java/org/lflang/generator/python/PythonInfoGenerator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.lflang.generator.python;
-
-import java.io.File;
-import org.lflang.FileConfig;
-
-public class PythonInfoGenerator {
-  /**
-   * Print information about necessary steps to install the supporting Python C extension for the
-   * generated program.
-   *
-   * @note Only needed if no-compile is set to true
-   */
-  public static String generateSetupInfo(FileConfig fileConfig) {
-    return String.join(
-        "\n",
-        "",
-        "#####################################",
-        "To compile and install the generated code, do:",
-        "    ",
-        "    cd " + fileConfig.getSrcGenPath() + File.separator,
-        "    python3 -m pip install --force-reinstall .",
-        "");
-  }
-
-  /** Print information on how to execute the generated program. */
-  public static String generateRunInfo(FileConfig fileConfig, String lfModuleName) {
-    return String.join(
-        "\n",
-        "",
-        "#####################################",
-        "To run the generated program, use:",
-        "    ",
-        "    python3 " + fileConfig.getSrcGenPath() + File.separator + lfModuleName + ".py",
-        "",
-        "#####################################",
-        "");
-  }
-
-  /** Print information on how to execute the generated federation. */
-  public static String generateFedRunInfo(FileConfig fileConfig) {
-    return String.join(
-        "\n",
-        "",
-        "#####################################",
-        "To run the generated program, run:",
-        "    ",
-        "    bash " + fileConfig.binPath + "/" + fileConfig.name,
-        "",
-        "#####################################",
-        "");
-  }
-}

From e1b7e0a36f13fd67af14d9d56e1b6d221e3c90d2 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 25 Jul 2023 10:39:48 +0200
Subject: [PATCH 0699/1114] also install batch script on Windows

---
 .../generator/python/PythonGenerator.java     | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index 70a00db411..fcd86ed2a1 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -599,12 +599,21 @@ private static String setUpMainTarget(
 
   private static String generateCmakeInstall(FileConfig fileConfig) {
     return """
-             file(GENERATE OUTPUT <fileName> CONTENT
-               "#!/bin/sh\n\\
-               ${Python_EXECUTABLE} <pyMainName>"
-             )
-             install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/<fileName> DESTINATION ${CMAKE_INSTALL_BINDIR})
-           """
+              if(WIN32)
+                file(GENERATE OUTPUT <fileName>.bat CONTENT
+                  "@echo off\n\\
+                  ${Python_EXECUTABLE} <pyMainName>\n\\
+                  pause"
+                )
+                install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/<fileName>.bat DESTINATION ${CMAKE_INSTALL_BINDIR})
+              else()
+                file(GENERATE OUTPUT <fileName> CONTENT
+                  "#!/bin/sh\n\\
+                  ${Python_EXECUTABLE} <pyMainName>"
+                )
+                install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/<fileName> DESTINATION ${CMAKE_INSTALL_BINDIR})
+              endif()
+            """
         .replace("<fileName>", fileConfig.name)
         .replace(
             "<pyMainName>",

From df0635b8ca29ab6c5a7a3adffb22641f152ea40d Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Tue, 25 Jul 2023 18:15:10 +0900
Subject: [PATCH 0700/1114] Add an attribute named `_NetworkReactor` to
 classify network reaceiver and sender reactors

The attribute has a parameter either `Receiver` or `Sender`. If the
action is in a network receiver, it is `FederatePortAction`.
---
 .../federated/generator/FedASTUtils.java       | 17 +++++++++++++++++
 .../org/lflang/validation/AttributeSpec.java   |  4 +++-
 .../lflang/generator/ts/TSActionGenerator.kt   |  4 ++--
 .../generator/ts/TSConstructorGenerator.kt     | 17 +++++++++--------
 .../lflang/generator/ts/TSInstanceGenerator.kt | 14 +++++++++++---
 .../lflang/generator/ts/TSReactorGenerator.kt  | 18 ++++++++++++------
 6 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 7da95b6c60..7e1df41b58 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -240,6 +240,14 @@ private static void addNetworkReceiverReactor(
             .getParent()
             .reactorDefinition; // Top-level reactor.
 
+    // Add the attribute "_NetworkReactor" for the network receiver.
+    var a = factory.createAttribute();
+    a.setAttrName("_NetworkReactor");
+    var e = factory.createAttrParm();
+    e.setValue("Receiver");
+    a.getAttrParms().add(e);
+    receiver.getAttributes().add(a);
+
     receiver
         .getReactions()
         .add(getInitializationReaction(extension, extension.inputInitializationBody()));
@@ -638,6 +646,14 @@ private static Reactor getNetworkSenderReactor(
     // Initialize Reactor and Reaction AST Nodes
     Reactor sender = factory.createReactor();
 
+    // Add the attribute "_NetworkReactor" for the network sender.
+    var a = factory.createAttribute();
+    a.setAttrName("_NetworkReactor");
+    var e = factory.createAttrParm();
+    e.setValue("Sender");
+    a.getAttrParms().add(e);
+    sender.getAttributes().add(a);
+
     Input in = factory.createInput();
     in.setName("msg");
     in.setType(type);
@@ -676,6 +692,7 @@ private static Reactor getNetworkSenderReactor(
     connection.srcFederate.networkReactors.add(sender);
 
     networkSenderReactors.put(connection, sender);
+
     return sender;
   }
 
diff --git a/core/src/main/java/org/lflang/validation/AttributeSpec.java b/core/src/main/java/org/lflang/validation/AttributeSpec.java
index aab6faca9a..a5db6aca65 100644
--- a/core/src/main/java/org/lflang/validation/AttributeSpec.java
+++ b/core/src/main/java/org/lflang/validation/AttributeSpec.java
@@ -48,7 +48,6 @@ public class AttributeSpec {
   private final Map<String, AttrParamSpec> paramSpecByName;
 
   public static final String VALUE_ATTR = "value";
-  public static final String NETWORK_MESSAGE_ACTIONS = "network_message_actions";
   public static final String EACH_ATTR = "each";
 
   /** A map from a string to a supported AttributeSpec */
@@ -223,5 +222,8 @@ enum AttrParamType {
     ATTRIBUTE_SPECS_BY_NAME.put(
         "_tpoLevel",
         new AttributeSpec(List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.INT, false))));
+    ATTRIBUTE_SPECS_BY_NAME.put(
+        "_NetworkReactor",
+        new AttributeSpec(List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))));
   }
 }
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt
index 5009f88a71..5220ddcda7 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSActionGenerator.kt
@@ -26,7 +26,7 @@ class TSActionGenerator(
         return stateClassProperties.joinToString("\n")
     }
 
-    fun generateInstantiations(): String {
+    fun generateInstantiations(isFederatePortAction: Boolean): String {
         val actionInstantiations = LinkedList<String>()
         for (action in actions) {
             // Shutdown actions are handled internally by the
@@ -44,7 +44,7 @@ class TSActionGenerator(
                         ", " + action.minDelay.toTsTime()
                     }
                 }
-                if (action.name.take(7) == "network") {
+                if (isFederatePortAction) {
                     actionInstantiations.add(
                             "this.${action.name} = new __FederatePortAction<${action.tsActionType}>($actionArgs);")
                     actionInstantiations.add(
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
index d044fc8910..e079e8db77 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
@@ -25,7 +25,7 @@ class TSConstructorGenerator(
     private fun initializeParameter(p: Parameter): String =
         "${p.name}: ${TSTypes.getInstance().getTargetType(p)} = ${TSTypes.getInstance().getTargetInitializer(p)}"
 
-    private fun generateConstructorArguments(reactor: Reactor): String {
+    private fun generateConstructorArguments(reactor: Reactor, isNetworkReceiver: Boolean): String {
         val arguments = StringJoiner(", \n")
         if (reactor.isMain || reactor.isFederated) {
             arguments.add("timeout: TimeValue | undefined = undefined")
@@ -34,7 +34,7 @@ class TSConstructorGenerator(
             arguments.add("federationID: string = 'Unidentified Federation'")
         } else {
             arguments.add("parent: __Reactor")
-            if (reactor.name.take(15) == "NetworkReceiver") {
+            if (isNetworkReceiver) {
                 arguments.add("portID: number")
             }
         }
@@ -52,7 +52,7 @@ class TSConstructorGenerator(
         return arguments.toString()
     }
 
-    private fun generateSuperConstructorCall(reactor: Reactor, isFederate: Boolean): String =
+    private fun generateSuperConstructorCall(reactor: Reactor, isFederate: Boolean, isNetworkReceiver: Boolean): String =
         if (reactor.isMain) {
             if (isFederate) {
                 """
@@ -68,7 +68,7 @@ class TSConstructorGenerator(
                 "super(timeout, keepAlive, fast, success, fail);"
             }
         } else {
-            if (reactor.name.take(15) == "NetworkReceiver") {
+            if (isNetworkReceiver) {
                 "super(parent, portID);"
             } else {
                 "super(parent);"
@@ -91,7 +91,8 @@ class TSConstructorGenerator(
         states: TSStateGenerator,
         actions: TSActionGenerator,
         ports: TSPortGenerator,
-        isFederate: Boolean
+        isFederate: Boolean,
+        isNetworkReceiver: Boolean
     ): String {
         val connections = TSConnectionGenerator(reactor.connections, messageReporter)
         val reactions = TSReactionGenerator(messageReporter, reactor)
@@ -99,15 +100,15 @@ class TSConstructorGenerator(
         return with(PrependOperator) {
             """
                 |constructor (
-            ${" |    "..generateConstructorArguments(reactor)}
+            ${" |    "..generateConstructorArguments(reactor, isNetworkReceiver)}
                 |) {
-            ${" |    "..generateSuperConstructorCall(reactor, isFederate)}
+            ${" |    "..generateSuperConstructorCall(reactor, isFederate, isNetworkReceiver)}
             ${" |    "..generateTargetConfigurations(targetConfig)}
             ${" |    "..instances.generateInstantiations()}
             ${" |    "..timers.generateInstantiations()}
             ${" |    "..parameters.generateInstantiations()}
             ${" |    "..states.generateInstantiations()}
-            ${" |    "..actions.generateInstantiations()}
+            ${" |    "..actions.generateInstantiations(isNetworkReceiver)}
             ${" |    "..ports.generateInstantiations()}
             ${" |    "..connections.generateInstantiations()}
             ${" |    "..reactions.generateAllReactions()}
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
index 632febf920..1eb5d1a285 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
@@ -1,5 +1,6 @@
 package org.lflang.generator.ts
 
+import org.lflang.AttributeUtils
 import org.lflang.generator.getTargetInitializer
 import org.lflang.isBank
 import org.lflang.joinWithLn
@@ -47,9 +48,16 @@ class TSInstanceGenerator(
         val childReactorInstantiations = LinkedList<String>()
         var portID = 0
         for (childReactor in childReactors) {
+            var isNetworkSender = false
+            var isNetworkReceiver = false
+            val networkReactorAttribute = AttributeUtils.findAttributeByName(childReactor.reactorClass, "_NetworkReactor")
+            if (networkReactorAttribute != null) {
+                isNetworkSender = networkReactorAttribute.getAttrParms().get(0).getName() == "Sender"
+                isNetworkReceiver = networkReactorAttribute.getAttrParms().get(0).getName() == "Receiver"
+            }
             val childReactorArguments = StringJoiner(", ")
             childReactorArguments.add("this")
-            if (childReactor.reactorClass.name.take(15) == "NetworkReceiver") {
+            if (isNetworkReceiver) {
                 // Assume that network receiver reactors are sorted by portID
                 childReactorArguments.add(portID.toString())
                 portID++
@@ -70,12 +78,12 @@ class TSInstanceGenerator(
                 childReactorInstantiations.add(
                     "this.${childReactor.name} = " +
                             "new ${childReactor.reactorClass.name}($childReactorArguments)")
-                if (childReactor.reactorClass.name.take(15) == "NetworkReceiver") {
+                if (isNetworkReceiver) {
                     childReactorInstantiations.add(
                         "this.registerNetworkReceiver(\n"
                         + "\tthis.${childReactor.name} as __NetworkReactor<unknown>\n)")
                 }
-                if (childReactor.reactorClass.name.take(13) == "NetworkSender") {
+                if (isNetworkSender) {
                     childReactorInstantiations.add(
                         "this.registerNetworkSender(this.${childReactor.name})")
                 }
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
index 67f5f8ba6c..71d86c2ca5 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
@@ -3,7 +3,6 @@ package org.lflang.generator.ts
 import org.lflang.*
 import org.lflang.generator.PrependOperator
 import org.lflang.lf.*
-import org.lflang.validation.AttributeSpec
 import java.util.*
 
 /**
@@ -98,7 +97,13 @@ ${"             |"..preamble.code.toText()}
         }
 
         val isFederate = AttributeUtils.isFederate(reactor)
-        val isNetworkReactor = reactorName.take(7) == "Network"
+        val networkReactorAttribute = AttributeUtils.findAttributeByName(reactor, "_NetworkReactor")
+        var isNetworkSender = false
+        var isNetworkReceiver = false
+        if (networkReactorAttribute != null) {
+            isNetworkSender = networkReactorAttribute.getAttrParms().get(0).getName() == "Sender"
+            isNetworkReceiver = networkReactorAttribute.getAttrParms().get(0).getName() == "Receiver"
+        }
 
         // NOTE: type parameters that are referenced in ports or actions must extend
         // Present in order for the program to type check.
@@ -109,9 +114,10 @@ ${"             |"..preamble.code.toText()}
                 "class $reactorName extends __App {"
             }
         } else {
-            if (isNetworkReactor) {
-                val networkInputType = if (reactor.actions.size == 0) "unknown" else reactor.actions[0].tsActionType
-                "export class $reactorName extends __NetworkReactor<$networkInputType> {"    
+            if (isNetworkSender) {
+                "export class $reactorName extends __NetworkReactor<unknown> {"
+            } else if (isNetworkReceiver) {
+                "export class $reactorName extends __NetworkReactor<${reactor.actions[0].tsActionType}> {"
             } else {
                 "export class $reactorName extends __Reactor {"
             }
@@ -138,7 +144,7 @@ ${"             |"..preamble.code.toText()}
             ${" |    "..actionGenerator.generateClassProperties()}
             ${" |    "..portGenerator.generateClassProperties()}
             ${" |    "..constructorGenerator.generateConstructor(targetConfig, instanceGenerator, timerGenerator, parameterGenerator,
-                stateGenerator, actionGenerator, portGenerator, isFederate)}
+                stateGenerator, actionGenerator, portGenerator, isFederate, isNetworkReceiver)}
                 |}
                 |// =============== END reactor class ${reactor.name}
                 |

From da74101e35ed14c595ef965c757c30b5b21788bd Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 25 Jul 2023 10:59:28 +0200
Subject: [PATCH 0701/1114] fix escapes

---
 .../org/lflang/generator/python/PythonGenerator.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index fcd86ed2a1..60a687691a 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -601,15 +601,14 @@ private static String generateCmakeInstall(FileConfig fileConfig) {
     return """
               if(WIN32)
                 file(GENERATE OUTPUT <fileName>.bat CONTENT
-                  "@echo off\n\\
-                  ${Python_EXECUTABLE} <pyMainName>\n\\
-                  pause"
+                  "@echo off\n\
+                  ${Python_EXECUTABLE} <pyMainName>"
                 )
                 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/<fileName>.bat DESTINATION ${CMAKE_INSTALL_BINDIR})
               else()
                 file(GENERATE OUTPUT <fileName> CONTENT
-                  "#!/bin/sh\n\\
-                  ${Python_EXECUTABLE} <pyMainName>"
+                    "#!/bin/sh\\n\\
+                    ${Python_EXECUTABLE} <pyMainName>"
                 )
                 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/<fileName> DESTINATION ${CMAKE_INSTALL_BINDIR})
               endif()
@@ -621,7 +620,8 @@ private static String generateCmakeInstall(FileConfig fileConfig) {
                 .getSrcGenPath()
                 .resolve(fileConfig.name + ".py")
                 .toAbsolutePath()
-                .toString());
+                .toString()
+                .replace("\\", "\\\\"));
   }
 
   /**

From 83853af76e6624ac49cd05dd64df8f149f0926a0 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 25 Jul 2023 11:26:06 +0200
Subject: [PATCH 0702/1114] require Python 3.10

---
 .../main/java/org/lflang/generator/python/PythonGenerator.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index 60a687691a..34241798f6 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -573,7 +573,7 @@ private static String setUpMainTarget(
             add_subdirectory(core)
             set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR})
             set(LF_MAIN_TARGET <pyModuleName>)
-            find_package(Python 3.7.0...<3.12.0 REQUIRED COMPONENTS Interpreter Development)
+            find_package(Python 3.10.0...<3.11.0 REQUIRED COMPONENTS Interpreter Development)
             Python_add_library(
                 ${LF_MAIN_TARGET}
                 MODULE

From f3b7df445fb0dc0c5b99377a8f9851e678a48853 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 25 Jul 2023 12:46:41 +0200
Subject: [PATCH 0703/1114] use the script in bin for testing

---
 .../lflang/generator/python/PyFileConfig.java    | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/python/PyFileConfig.java b/core/src/main/java/org/lflang/generator/python/PyFileConfig.java
index 7c67b92493..3927b6d02e 100644
--- a/core/src/main/java/org/lflang/generator/python/PyFileConfig.java
+++ b/core/src/main/java/org/lflang/generator/python/PyFileConfig.java
@@ -2,10 +2,9 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.List;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.c.CFileConfig;
-import org.lflang.util.LFCommand;
 
 public class PyFileConfig extends CFileConfig {
   public PyFileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchicalBin)
@@ -13,19 +12,8 @@ public PyFileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchi
     super(resource, srcGenBasePath, useHierarchicalBin);
   }
 
-  @Override
-  public LFCommand getCommand() {
-    return LFCommand.get(
-        "python3", List.of(srcPkgPath.relativize(getExecutable()).toString()), true, srcPkgPath);
-  }
-
-  @Override
-  public Path getExecutable() {
-    return srcGenPath.resolve(name + getExecutableExtension());
-  }
-
   @Override
   protected String getExecutableExtension() {
-    return ".py";
+    return GeneratorUtils.isHostWindows() ? ".bat" : "";
   }
 }

From e132dda561d3b0f19a5014456d18347cb6492575 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 25 Jul 2023 12:47:14 +0200
Subject: [PATCH 0704/1114] fix regex to also work on Windows

---
 .../integrationTest/java/org/lflang/tests/RunSingleTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/integrationTest/java/org/lflang/tests/RunSingleTest.java b/core/src/integrationTest/java/org/lflang/tests/RunSingleTest.java
index 424568109a..29e62e835b 100644
--- a/core/src/integrationTest/java/org/lflang/tests/RunSingleTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/RunSingleTest.java
@@ -49,7 +49,7 @@
 public class RunSingleTest {
 
   private static final Pattern TEST_FILE_PATTERN =
-      Pattern.compile("(test/(\\w+))/src/([^/]++/)*(\\w+.lf)");
+      Pattern.compile("(test\\W(\\w+))\\Wsrc\\W(\\w++\\W)*(\\w+.lf)");
 
   @Test
   public void runSingleTest() throws FileNotFoundException {

From 4e64dbe3601d618a0dcc19f9785c3155fc43e25e Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 25 Jul 2023 12:59:14 +0200
Subject: [PATCH 0705/1114] also use bin scripts in federated launch script

---
 .../federated/launcher/PyBuildConfig.java     | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/launcher/PyBuildConfig.java b/core/src/main/java/org/lflang/federated/launcher/PyBuildConfig.java
index 09f7fac34f..98f1c16ad6 100644
--- a/core/src/main/java/org/lflang/federated/launcher/PyBuildConfig.java
+++ b/core/src/main/java/org/lflang/federated/launcher/PyBuildConfig.java
@@ -12,26 +12,12 @@ public PyBuildConfig(
   }
 
   @Override
-  public String localExecuteCommand() {
-    return "python3 "
-        + fileConfig.getSrcGenPath()
-        + "/"
-        + federate.name
-        + "/"
-        + federate.name
-        + ".py -i $FEDERATION_ID";
+  public String remoteExecuteCommand() {
+    return "bin/" + fileConfig.name + "_" + federate.name + " -i '$FEDERATION_ID'";
   }
 
   @Override
-  public String remoteExecuteCommand() {
-    return "python3 src-gen/"
-        + fileConfig.name
-        + "/"
-        + federate.name
-        + "/"
-        + fileConfig.name
-        + "_"
-        + federate.name
-        + " -i '$FEDERATION_ID'";
+  public String localExecuteCommand() {
+    return fileConfig.getFedBinPath().resolve(federate.name) + " -i $FEDERATION_ID";
   }
 }

From c226c66252ee5b09f5a02d950bf28d02f21d4dc2 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 25 Jul 2023 15:58:46 +0200
Subject: [PATCH 0706/1114] forward all arguments to the Python script

---
 .../generator/python/PythonGenerator.java       | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index 34241798f6..16615bb59e 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -598,30 +598,27 @@ private static String setUpMainTarget(
   }
 
   private static String generateCmakeInstall(FileConfig fileConfig) {
+    final var pyMainPath =
+        fileConfig.getSrcGenPath().resolve(fileConfig.name + ".py").toAbsolutePath();
+    // need to replace '\' with '\\' on Windwos for proper escaping in cmake
+    final var pyMainName = pyMainPath.toString().replace("\\", "\\\\");
     return """
               if(WIN32)
                 file(GENERATE OUTPUT <fileName>.bat CONTENT
                   "@echo off\n\
-                  ${Python_EXECUTABLE} <pyMainName>"
+                  ${Python_EXECUTABLE} <pyMainName> %*"
                 )
                 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/<fileName>.bat DESTINATION ${CMAKE_INSTALL_BINDIR})
               else()
                 file(GENERATE OUTPUT <fileName> CONTENT
                     "#!/bin/sh\\n\\
-                    ${Python_EXECUTABLE} <pyMainName>"
+                    ${Python_EXECUTABLE} <pyMainName> \\\"$@\\\""
                 )
                 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/<fileName> DESTINATION ${CMAKE_INSTALL_BINDIR})
               endif()
             """
         .replace("<fileName>", fileConfig.name)
-        .replace(
-            "<pyMainName>",
-            fileConfig
-                .getSrcGenPath()
-                .resolve(fileConfig.name + ".py")
-                .toAbsolutePath()
-                .toString()
-                .replace("\\", "\\\\"));
+        .replace("<pyMainName>", pyMainName);
   }
 
   /**

From 794dba0f559ec67d56a62d102161cf34b4374ab2 Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Tue, 25 Jul 2023 19:17:36 +0200
Subject: [PATCH 0707/1114] Fix error when there is no main reactor

---
 core/src/main/java/org/lflang/ast/ASTUtils.java          | 6 +++---
 core/src/main/java/org/lflang/generator/LFGenerator.java | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 93c689b810..f89922f59b 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -35,6 +35,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
@@ -154,14 +155,13 @@ public static List<Reactor> getAllReactors(Resource resource) {
    * @param resource the resource to extract reactors from
    * @return An iterable over all reactors found in the resource
    */
-  public static Reactor getMainReactor(Resource resource) {
+  public static Optional<Reactor> getMainReactor(Resource resource) {
     return StreamSupport.stream(
             IteratorExtensions.toIterable(resource.getAllContents()).spliterator(), false)
         .filter(Reactor.class::isInstance)
         .map(Reactor.class::cast)
         .filter(it -> it.isMain())
-        .findFirst()
-        .get();
+        .findFirst();
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/LFGenerator.java b/core/src/main/java/org/lflang/generator/LFGenerator.java
index 410051f835..84a13f6fc8 100644
--- a/core/src/main/java/org/lflang/generator/LFGenerator.java
+++ b/core/src/main/java/org/lflang/generator/LFGenerator.java
@@ -8,6 +8,7 @@
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.AbstractGenerator;
@@ -158,7 +159,9 @@ protected void cleanIfNeeded(LFGeneratorContext context) {
    * connections, etc.).
    */
   private void runVerifierIfPropertiesDetected(Resource resource, LFGeneratorContext lfContext) {
-    Reactor main = ASTUtils.getMainReactor(resource);
+    Optional<Reactor> mainOpt = ASTUtils.getMainReactor(resource);
+    if (mainOpt.isEmpty()) return;
+    Reactor main = mainOpt.get();
     final MessageReporter messageReporter = lfContext.getErrorReporter();
     List<Attribute> properties =
         AttributeUtils.getAttributes(main).stream()

From 2b41ad2c108eeedce07622366952c3cd1db1e5cc Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 25 Jul 2023 11:16:57 -0700
Subject: [PATCH 0708/1114] Rename output control -> port absent.

---
 .../org/lflang/federated/extensions/CExtension.java | 13 ++++---------
 .../federated/extensions/FedTargetExtension.java    |  2 +-
 .../federated/extensions/PythonExtension.java       |  2 +-
 .../lflang/federated/extensions/TSExtension.java    |  2 +-
 .../org/lflang/federated/generator/FedASTUtils.java |  8 ++++----
 .../federated/generator/FederateInstance.java       |  2 +-
 .../serialization/FedNativePythonSerialization.java |  2 +-
 .../serialization/FedROS2CPPSerialization.java      |  2 +-
 .../federated/serialization/FedSerialization.java   |  2 +-
 core/src/main/resources/lib/c/reactor-c             |  2 +-
 10 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 2da5ee1821..f2048a6ab7 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -428,7 +428,7 @@ protected void serializeAndSend(
         }
         var ROSSerializer = new FedROS2CPPSerialization();
         lengthExpression = ROSSerializer.serializedBufferLength();
-        pointerExpression = ROSSerializer.seializedBufferVar();
+        pointerExpression = ROSSerializer.serializedBufferVar();
         result.pr(
             ROSSerializer.generateNetworkSerializerCode(
                 sendRef, typeStr, CExtensionUtils.isSharedPtrType(type, types)));
@@ -445,7 +445,7 @@ protected void serializeAndSend(
    * @param srcOutputPort A reference to the port that the sender reaction reads from.
    * @param connection The federated connection being lowered.
    */
-  public String generateNetworkOutputControlReactionBody(
+  public String generatePortAbsentReactionBody(
       VarRef srcOutputPort, FedConnectionInstance connection) {
     // Store the code
     var result = new CodeBuilder();
@@ -569,13 +569,13 @@ protected String makePreamble(
         """
             .formatted(numOfNetworkReactions));
 
-    int numOfNetworkSenderControlReactions = federate.networkSenderControlReactions.size();
+    int numOfPortAbsentReactions = federate.portAbsentReactions.size();
     code.pr(
         """
         reaction_t* port_absent_reaction[%1$s];  // initialize to null pointers; see C99 6.7.8.10
         size_t num_sender_reactions = %1$s;
         """
-            .formatted(numOfNetworkSenderControlReactions));
+            .formatted(numOfPortAbsentReactions));
 
     int numOfSTAAOffsets = federate.stpOffsets.size();
     code.pr(
@@ -643,9 +643,6 @@ private String generateExecutablePreamble(
     code.pr(generateCodeForPhysicalActions(federate, messageReporter));
 
     code.pr(generateCodeToInitializeFederate(federate, rtiConfig));
-
-    // code.pr(CExtensionUtils.allocateTriggersForFederate(federate));
-
     return """
             void _lf_executable_preamble(environment_t* env) {
             %s
@@ -660,8 +657,6 @@ private String generateSTAAInitialization(FederateInstance federate) {
     code.pr(
         CExtensionUtils.surroundWithIfFederatedDecentralized(CExtensionUtils.stpStructs(federate)));
 
-    // code.pr(CExtensionUtils.allocateTriggersForFederate(federate));
-
     return """
             void staa_initialization() {
             %s
diff --git a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
index b3d816f23a..6ac077f2ca 100644
--- a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
@@ -92,7 +92,7 @@ String generateNetworkSenderBody(
    * @param srcOutputPort A reference to the output port of the federate instance.
    * @param connection The federated connection being lowered.
    */
-  String generateNetworkOutputControlReactionBody(
+  String generatePortAbsentReactionBody(
       VarRef srcOutputPort, FedConnectionInstance connection);
 
   /** Optionally apply additional annotations to the reaction. */
diff --git a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
index 9b85a0358c..3d84d78562 100644
--- a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
@@ -167,7 +167,7 @@ protected void serializeAndSend(
         var variableToSerialize = sendRef + "->value";
         FedNativePythonSerialization pickler = new FedNativePythonSerialization();
         lengthExpression = pickler.serializedBufferLength();
-        pointerExpression = pickler.seializedBufferVar();
+        pointerExpression = pickler.serializedBufferVar();
         result.pr(pickler.generateNetworkSerializerCode(variableToSerialize, null));
         result.pr("size_t _lf_message_length = " + lengthExpression + ";");
         result.pr(sendingFunction + "(" + commonArgs + ", " + pointerExpression + ");\n");
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 956823a1bf..b572dc8a0b 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -127,7 +127,7 @@ private String getNetworkDelayLiteral(Expression e) {
   }
 
   @Override
-  public String generateNetworkOutputControlReactionBody(
+  public String generatePortAbsentReactionBody(
       VarRef srcOutputPort, FedConnectionInstance connection) {
     // The ID of the receiving port (rightPort) is the position
     // of the networkAction (see below) in this list.
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 7e1df41b58..d38237c71b 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -141,7 +141,7 @@ public static void makeCommunication(
 
     addNetworkSenderReactor(connection, coordination, resource, messageReporter);
 
-    FedASTUtils.addNetworkOutputControlReaction(connection);
+    FedASTUtils.addPortAbsentReaction(connection);
 
     addNetworkReceiverReactor(connection, coordination, resource, messageReporter);
   }
@@ -814,7 +814,7 @@ private static void addNetworkSenderReactor(
    *
    * @param connection The federated connection being replaced.
    */
-  private static void addNetworkOutputControlReaction(FedConnectionInstance connection) {
+  private static void addPortAbsentReaction(FedConnectionInstance connection) {
     LfFactory factory = LfFactory.eINSTANCE;
     Reaction reaction = factory.createReaction();
     Reactor top = networkSenderReactors.getOrDefault(connection, null);
@@ -840,7 +840,7 @@ private static void addNetworkOutputControlReaction(FedConnectionInstance connec
         .getCode()
         .setBody(
             FedTargetExtensionFactory.getExtension(connection.srcFederate.targetConfig.target)
-                .generateNetworkOutputControlReactionBody(newPortRef, connection));
+                .generatePortAbsentReactionBody(newPortRef, connection));
 
     // Insert the newly generated reaction after the generated sender and
     // receiver top-level reactions.
@@ -849,6 +849,6 @@ private static void addNetworkOutputControlReaction(FedConnectionInstance connec
     // Add the network output control reaction to the federate instance's list
     // of network reactions
     connection.srcFederate.networkSenderReactions.add(reaction);
-    connection.srcFederate.networkSenderControlReactions.add(reaction);
+    connection.srcFederate.portAbsentReactions.add(reaction);
   }
 }
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index 56df7ae6a1..1b3f9f5669 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -207,7 +207,7 @@ public Instantiation getInstantiation() {
    * List of generated network control reactions (network sender) that belong to this federate
    * instance.
    */
-  public List<Reaction> networkSenderControlReactions = new ArrayList<>();
+  public List<Reaction> portAbsentReactions = new ArrayList<>();
 
   /**
    * List of generated network reactors (network input and outputs) that belong to this federate
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java
index 7eae1450e0..7e6b7b2869 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java
@@ -51,7 +51,7 @@ public String serializedBufferLength() {
   }
 
   @Override
-  public String seializedBufferVar() {
+  public String serializedBufferVar() {
     return serializedVarName + ".buf";
   }
 
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
index 1bf6bde698..4807f42fbc 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
@@ -74,7 +74,7 @@ public String serializedBufferLength() {
    * @return Expression in target language that is the buffer variable itself.
    */
   @Override
-  public String seializedBufferVar() {
+  public String serializedBufferVar() {
     return serializedVarName + ".get_rcl_serialized_message().buffer";
   }
 
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedSerialization.java
index fab7201c21..7f3dc1b935 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedSerialization.java
@@ -32,7 +32,7 @@ public interface FedSerialization {
   /**
    * @return Expression in target language that is the buffer variable itself.
    */
-  public String seializedBufferVar();
+  public String serializedBufferVar();
 
   /**
    * Generate code in target language that serializes 'varName'. This code will convert the data in
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 9428f3d380..d16b3b72b1 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 9428f3d380d7fe9044eb4664e49201ce013bafef
+Subproject commit d16b3b72b17a8cfba33e51ab25b2631f43fa1495

From eeb7d34e271987dab70303f8137aa295c0088f37 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 25 Jul 2023 12:02:07 -0700
Subject: [PATCH 0709/1114] Update submodule.

---
 .../org/lflang/federated/extensions/FedTargetExtension.java    | 3 +--
 core/src/main/resources/lib/c/reactor-c                        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
index 6ac077f2ca..f3a9c48d51 100644
--- a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
@@ -92,8 +92,7 @@ String generateNetworkSenderBody(
    * @param srcOutputPort A reference to the output port of the federate instance.
    * @param connection The federated connection being lowered.
    */
-  String generatePortAbsentReactionBody(
-      VarRef srcOutputPort, FedConnectionInstance connection);
+  String generatePortAbsentReactionBody(VarRef srcOutputPort, FedConnectionInstance connection);
 
   /** Optionally apply additional annotations to the reaction. */
   default void annotateReaction(Reaction reaction) {}
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index d16b3b72b1..bd530d52e1 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit d16b3b72b17a8cfba33e51ab25b2631f43fa1495
+Subproject commit bd530d52e1af14e2c1a22726e60006b7fa568c74

From 34dc7ac40c83b8023a34c63868e40300053ad211 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 25 Jul 2023 12:16:00 -0700
Subject: [PATCH 0710/1114] Remove WORKERS_NEEDED_FOR_FEDERATE.

The ability to do this is the initial motivation for this PR.
---
 .../federated/extensions/CExtensionUtils.java     | 15 ---------------
 core/src/main/resources/lib/c/reactor-c           |  2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 5cefbbe339..0903d2d90d 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -183,27 +183,12 @@ public static void handleCompileDefinitions(
     federate.targetConfig.compileDefinitions.put(
         "NUMBER_OF_FEDERATES", String.valueOf(numOfFederates));
     federate.targetConfig.compileDefinitions.put("EXECUTABLE_PREAMBLE", "");
-    federate.targetConfig.compileDefinitions.put(
-        "WORKERS_NEEDED_FOR_FEDERATE", String.valueOf(minThreadsToHandleInputPorts(federate)));
 
     handleAdvanceMessageInterval(federate);
 
     initializeClockSynchronization(federate, rtiConfig, messageReporter);
   }
 
-  /**
-   * The number of threads needs to be at least one larger than the input ports to allow the
-   * federate to wait on all input ports while allowing an additional worker thread to process
-   * incoming messages.
-   *
-   * @return The minimum number of threads needed.
-   */
-  public static int minThreadsToHandleInputPorts(FederateInstance federate) {
-    int nthreads = 1;
-    nthreads = Math.max(nthreads, federate.networkMessageActions.size() + 1);
-    return nthreads;
-  }
-
   private static void handleAdvanceMessageInterval(FederateInstance federate) {
     var advanceMessageInterval = federate.targetConfig.coordinationOptions.advance_message_interval;
     federate.targetConfig.setByUser.remove(TargetProperty.COORDINATION_OPTIONS);
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index bd530d52e1..cfc545b85c 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit bd530d52e1af14e2c1a22726e60006b7fa568c74
+Subproject commit cfc545b85c2301e21bd083dccbcffd29833becd2

From b493d4193f8a4510fe8589d6d9efde2393f1d2bb Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 25 Jul 2023 13:20:57 -0700
Subject: [PATCH 0711/1114] Patch lingering terminology mismatch.

---
 .../lflang/federated/extensions/CExtension.java   | 15 ++++-----------
 .../java/org/lflang/tests/TestBase.java           |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index f2048a6ab7..3829c72617 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -60,14 +60,7 @@
 import org.lflang.lf.VarRef;
 
 /**
- * An extension class to the CGenerator that enables certain federated functionalities. Currently,
- * this class offers the following features:
- *
- * <ul>
- *   <li>Allocating and initializing C structures for federated communication
- *   <li>Creating status field for network input ports that help the receiver logic in federate.c
- *       communicate the status of a network input port with network input control reactions.
- * </ul>
+ * An extension class to the CGenerator that enables certain federated functionalities.
  *
  * @author {Soroush Bateni <soroush@berkeley.edu>}
  * @author {Hou Seng Wong <housengw@berkeley.edu>}
@@ -227,11 +220,11 @@ protected void deserialize(
   public String outputInitializationBody() {
     return """
     extern reaction_t* port_absent_reaction[];
-    void enqueue_network_output_control_reactions(environment_t*);
-    LF_PRINT_DEBUG("Adding network output control reaction to table.");
+    void enqueue_port_absent_reactions(environment_t*);
+    LF_PRINT_DEBUG("Adding network port absent reaction to table.");
     port_absent_reaction[SENDERINDEXPARAMETER] = &self->_lf__reaction_2;
     LF_PRINT_DEBUG("Added network output control reaction to table. Enqueueing it...");
-    enqueue_network_output_control_reactions(self->base.environment);
+    enqueue_port_absent_reactions(self->base.environment);
     """;
   }
 
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index 23d1a83341..401c7e93d5 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -74,7 +74,7 @@ public abstract class TestBase extends LfInjectedTestBase {
   private static final PrintStream err = System.err;
 
   /** Execution timeout enforced for all tests. */
-  private static final long MAX_EXECUTION_TIME_SECONDS = 180;
+  private static final long MAX_EXECUTION_TIME_SECONDS = 20;
 
   /** Content separator used in test output, 78 characters wide. */
   public static final String THIN_LINE =

From c284f60ba40c316b98b2ae904e58229254f91b3b Mon Sep 17 00:00:00 2001
From: revol-xut <revol-xut@protonmail.com>
Date: Wed, 26 Jul 2023 13:18:21 +0200
Subject: [PATCH 0712/1114] implementing new draw_connection interface

---
 .gitmodules                                            |  1 -
 .../lflang/generator/cpp/CppAssembleMethodGenerator.kt | 10 ++++++++--
 core/src/main/resources/lib/cpp/reactor-cpp            |  2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 036edd9440..09e6ea5240 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,7 +4,6 @@
 [submodule "org.lflang/src/lib/cpp/reactor-cpp"]
 	path = core/src/main/resources/lib/cpp/reactor-cpp
     url = https://github.com/lf-lang/reactor-cpp.git
-    branch = "connection-optimization"
 [submodule "org.lflang/src/lib/rs/reactor-rs"]
 	path = core/src/main/resources/lib/rs/reactor-rs
 	url = https://github.com/lf-lang/reactor-rs
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
index bcce92a055..1d73946cf7 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
@@ -101,7 +101,14 @@ class CppAssembleMethodGenerator(private val reactor: Reactor) {
     }
 
     private val Connection.cppDelay: String 
-        get() = delay?.toCppTime() ?: "0s"
+        get() {
+            val d = delay;
+            return if (d is ParameterReference) {
+                "__lf_inner.${d.parameter.name}"
+            } else {
+                d.toCppTime() 
+            }
+        }
 
     private val Connection.properties: String
         get() = "reactor::ConnectionProperties{$cppType, $cppDelay, nullptr}"
@@ -188,7 +195,6 @@ class CppAssembleMethodGenerator(private val reactor: Reactor) {
             ${" |"..c.leftPorts.joinWithLn { addAllPortsToVector(it, "__lf_left_ports_$idx") }}
                 |std::vector<$portType> __lf_right_ports_$idx;
             ${" |"..c.rightPorts.joinWithLn { addAllPortsToVector(it, "__lf_right_ports_$idx") }}
-            ${" |"..if (c.requiresConnectionClass) "${c.name}.reserve(std::max(__lf_left_ports_$idx.size(), __lf_right_ports_$idx.size()));" else ""}
                 |lfutil::bind_multiple_ports<$portType>(__lf_left_ports_$idx, __lf_right_ports_$idx, ${c.isIterated},
             ${" |"..c.getConnectionLambda(portType)}
                 |);
diff --git a/core/src/main/resources/lib/cpp/reactor-cpp b/core/src/main/resources/lib/cpp/reactor-cpp
index 5775399706..3c6d8ec833 160000
--- a/core/src/main/resources/lib/cpp/reactor-cpp
+++ b/core/src/main/resources/lib/cpp/reactor-cpp
@@ -1 +1 @@
-Subproject commit 5775399706b217a775a81aba9a2c024998a0ca64
+Subproject commit 3c6d8ec833bb3319b8f979f43bcc1416d2635d85

From 0cb3792237cf20c9885dc158d2050fa4b05f3670 Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Wed, 26 Jul 2023 21:50:11 +0900
Subject: [PATCH 0713/1114] Using `NetworkReceiver` and `NetworkSender` classes
 instead of the common class `NetworkReactor`

Those two classes have no common method or variable. However, it does
when we want to apply the TPO level concept to reactor-ts. The common
parent class `NetworkReactor` will be added for that in future work.
---
 .../org/lflang/generator/ts/TSImportPreambleGenerator.kt      | 2 +-
 .../kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt     | 2 +-
 .../main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt
index d71d39a2e8..fcf22b486c 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSImportPreambleGenerator.kt
@@ -57,7 +57,7 @@ class TSImportPreambleGenerator(
             import {Parameter as __Parameter, Timer as __Timer, Reactor as __Reactor, App as __App} from '@lf-lang/reactor-ts'
             import {Action as __Action, Startup as __Startup, FederatePortAction as __FederatePortAction} from '@lf-lang/reactor-ts'
             import {Bank as __Bank} from '@lf-lang/reactor-ts'
-            import {NetworkReactor as __NetworkReactor, FederatedApp as __FederatedApp, FederateConfig as __FederateConfig} from '@lf-lang/reactor-ts'
+            import {NetworkSender as __NetworkSender, NetworkReceiver as __NetworkReceiver, FederatedApp as __FederatedApp, FederateConfig as __FederateConfig} from '@lf-lang/reactor-ts'
             import {InPort as __InPort, OutPort as __OutPort, Port as __Port, WritablePort as __WritablePort, WritableMultiPort as __WritableMultiPort} from '@lf-lang/reactor-ts'
             import {InMultiPort as __InMultiPort, OutMultiPort as __OutMultiPort} from '@lf-lang/reactor-ts'
             import {Reaction as __Reaction} from '@lf-lang/reactor-ts'
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
index 1eb5d1a285..8d04f93dd5 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
@@ -81,7 +81,7 @@ class TSInstanceGenerator(
                 if (isNetworkReceiver) {
                     childReactorInstantiations.add(
                         "this.registerNetworkReceiver(\n"
-                        + "\tthis.${childReactor.name} as __NetworkReactor<unknown>\n)")
+                        + "\tthis.${childReactor.name} as __NetworkReceiver<unknown>\n)")
                 }
                 if (isNetworkSender) {
                     childReactorInstantiations.add(
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
index 71d86c2ca5..e84f012480 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
@@ -115,9 +115,9 @@ ${"             |"..preamble.code.toText()}
             }
         } else {
             if (isNetworkSender) {
-                "export class $reactorName extends __NetworkReactor<unknown> {"
+                "export class $reactorName extends __NetworkSender {"
             } else if (isNetworkReceiver) {
-                "export class $reactorName extends __NetworkReactor<${reactor.actions[0].tsActionType}> {"
+                "export class $reactorName extends __NetworkReceiver<${reactor.actions[0].tsActionType}> {"
             } else {
                 "export class $reactorName extends __Reactor {"
             }

From 3f99fc3426c7a37c4b09e67c6848dda726ab2609 Mon Sep 17 00:00:00 2001
From: revol-xut <revol-xut@protonmail.com>
Date: Wed, 26 Jul 2023 15:09:45 +0200
Subject: [PATCH 0714/1114] clang-format for c++ files

---
 core/src/main/resources/lib/cpp/.clang-format |  8 ++++
 core/src/main/resources/lib/cpp/lfutil.hh     | 32 +++++---------
 .../src/main/resources/lib/cpp/time_parser.hh | 43 ++++++++-----------
 3 files changed, 36 insertions(+), 47 deletions(-)
 create mode 100644 core/src/main/resources/lib/cpp/.clang-format

diff --git a/core/src/main/resources/lib/cpp/.clang-format b/core/src/main/resources/lib/cpp/.clang-format
new file mode 100644
index 0000000000..ac94ae098b
--- /dev/null
+++ b/core/src/main/resources/lib/cpp/.clang-format
@@ -0,0 +1,8 @@
+---
+BasedOnStyle: LLVM
+Language: Cpp
+IndentWidth: 2
+BreakConstructorInitializersBeforeComma: 'true'
+AllowShortFunctionsOnASingleLine: All
+PointerAlignment: Left
+ColumnLimit: 120
\ No newline at end of file
diff --git a/core/src/main/resources/lib/cpp/lfutil.hh b/core/src/main/resources/lib/cpp/lfutil.hh
index 967f42b730..959d4218df 100644
--- a/core/src/main/resources/lib/cpp/lfutil.hh
+++ b/core/src/main/resources/lib/cpp/lfutil.hh
@@ -37,8 +37,7 @@
 
 namespace lfutil {
 
-template <class T>
-void after_delay(reactor::Action<T> *action, const reactor::Port<T> *port) {
+template <class T> void after_delay(reactor::Action<T>* action, const reactor::Port<T>* port) {
   if constexpr (std::is_void<T>::value) {
     action->schedule();
   } else {
@@ -46,8 +45,7 @@ void after_delay(reactor::Action<T> *action, const reactor::Port<T> *port) {
   }
 }
 
-template <class T>
-void after_forward(const reactor::Action<T> *action, reactor::Port<T> *port) {
+template <class T> void after_forward(const reactor::Action<T>* action, reactor::Port<T>* port) {
   if constexpr (std::is_void<T>::value) {
     port->set();
   } else {
@@ -57,32 +55,24 @@ void after_forward(const reactor::Action<T> *action, reactor::Port<T> *port) {
 
 class LFScope {
 private:
-  reactor::Reactor *reactor;
+  reactor::Reactor* reactor;
 
 public:
-  LFScope(reactor::Reactor *reactor) : reactor(reactor) {}
+  LFScope(reactor::Reactor* reactor)
+      : reactor(reactor) {}
 
-  reactor::TimePoint get_physical_time() const {
-    return reactor->get_physical_time();
-  }
+  reactor::TimePoint get_physical_time() const { return reactor->get_physical_time(); }
   reactor::Tag get_tag() const { return reactor->get_tag(); }
-  reactor::TimePoint get_logical_time() const {
-    return reactor->get_logical_time();
-  }
+  reactor::TimePoint get_logical_time() const { return reactor->get_logical_time(); }
   reactor::mstep_t get_microstep() const { return reactor->get_microstep(); }
-  reactor::Duration get_elapsed_logical_time() const {
-    return reactor->get_elapsed_logical_time();
-  }
-  reactor::Duration get_elapsed_physical_time() const {
-    return reactor->get_elapsed_physical_time();
-  }
-  reactor::Environment *environment() const { return reactor->environment(); }
+  reactor::Duration get_elapsed_logical_time() const { return reactor->get_elapsed_logical_time(); }
+  reactor::Duration get_elapsed_physical_time() const { return reactor->get_elapsed_physical_time(); }
+  reactor::Environment* environment() const { return reactor->environment(); }
   void request_stop() const { return environment()->sync_shutdown(); }
 };
 
 template <class PortPtr>
-void bind_multiple_ports(std::vector<PortPtr> &left_ports,
-                         std::vector<PortPtr> &right_ports, bool repeat_left,
+void bind_multiple_ports(std::vector<PortPtr>& left_ports, std::vector<PortPtr>& right_ports, bool repeat_left,
                          std::function<void(PortPtr, PortPtr)> connect) {
   if (repeat_left) {
     auto l_size = left_ports.size();
diff --git a/core/src/main/resources/lib/cpp/time_parser.hh b/core/src/main/resources/lib/cpp/time_parser.hh
index 58c067b796..999e33ca84 100644
--- a/core/src/main/resources/lib/cpp/time_parser.hh
+++ b/core/src/main/resources/lib/cpp/time_parser.hh
@@ -35,7 +35,7 @@
 #include "reactor-cpp/reactor-cpp.hh"
 #include <sstream>
 
-std::stringstream &operator>>(std::stringstream &in, reactor::Duration &dur);
+std::stringstream& operator>>(std::stringstream& in, reactor::Duration& dur);
 #include "CLI/cxxopts.hpp"
 
 #include <algorithm>
@@ -44,27 +44,23 @@ std::stringstream &operator>>(std::stringstream &in, reactor::Duration &dur);
 #include <regex>
 #include <string>
 
-bool iequals(const std::string &a, const std::string &b) {
-  return std::equal(a.begin(), a.end(), b.begin(), b.end(),
-                    [](char a, char b) { return tolower(a) == tolower(b); });
+bool iequals(const std::string& a, const std::string& b) {
+  return std::equal(a.begin(), a.end(), b.begin(), b.end(), [](char a, char b) { return tolower(a) == tolower(b); });
 }
 
-class argument_incorrect_type_with_reason
-    : public cxxopts::OptionParseException {
+class argument_incorrect_type_with_reason : public cxxopts::OptionParseException {
 public:
-  explicit argument_incorrect_type_with_reason(const std::string &arg,
-                                               const std::string &reason)
-      : cxxopts::OptionParseException("Argument " + cxxopts::LQUOTE + arg +
-                                      cxxopts::RQUOTE + " failed to parse (" +
+  explicit argument_incorrect_type_with_reason(const std::string& arg, const std::string& reason)
+      : cxxopts::OptionParseException("Argument " + cxxopts::LQUOTE + arg + cxxopts::RQUOTE + " failed to parse (" +
                                       reason + ")") {}
 };
 
-std::string validate_time_string(const std::string &time);
+std::string validate_time_string(const std::string& time);
 
 /**
  * converts a reactor::Duration to a string with ns as unit
  */
-std::string time_to_string(const reactor::Duration &dur) {
+std::string time_to_string(const reactor::Duration& dur) {
   if (dur == reactor::Duration::max()) {
     return "forever";
   }
@@ -80,7 +76,7 @@ template <typename T> std::string any_to_string(const T val) {
   return ss.str();
 }
 
-std::stringstream &operator>>(std::stringstream &in, reactor::Duration &dur) {
+std::stringstream& operator>>(std::stringstream& in, reactor::Duration& dur) {
   double value;
   std::string unit;
 
@@ -116,12 +112,10 @@ std::stringstream &operator>>(std::stringstream &in, reactor::Duration &dur) {
     } else if (unit == "msec" || unit == "msecs" || unit == "ms") {
       std::chrono::duration<double, std::milli> tmp{value};
       dur = std::chrono::duration_cast<reactor::Duration>(tmp);
-    } else if (unit == "sec" || unit == "secs" || unit == "second" ||
-               unit == "seconds" || unit == "s") {
+    } else if (unit == "sec" || unit == "secs" || unit == "second" || unit == "seconds" || unit == "s") {
       std::chrono::duration<double, std::ratio<1, 1>> tmp{value};
       dur = std::chrono::duration_cast<reactor::Duration>(tmp);
-    } else if (unit == "min" || unit == "mins" || unit == "minute" ||
-               unit == "minutes" || unit == "m") {
+    } else if (unit == "min" || unit == "mins" || unit == "minute" || unit == "minutes" || unit == "m") {
       std::chrono::duration<double, std::ratio<60, 1>> tmp{value};
       dur = std::chrono::duration_cast<reactor::Duration>(tmp);
     } else if (unit == "hour" || unit == "hours" || unit == "h") {
@@ -145,7 +139,7 @@ std::stringstream &operator>>(std::stringstream &in, reactor::Duration &dur) {
 /**
  *   Tests for correct syntax in unit usage for time strings
  **/
-std::string validate_time_string(const std::string &time) {
+std::string validate_time_string(const std::string& time) {
   auto trimmed = std::regex_replace(time, std::regex("^ +| +$|( ) +"), "$1");
   if (trimmed.size() == 0) {
     return "The empty string is not a valid time!";
@@ -161,14 +155,11 @@ std::string validate_time_string(const std::string &time) {
       return "No unit given!";
     } else {
       auto unit = trimmed.substr(pos);
-      if (unit == "nsec" || unit == "nsecs" || unit == "ns" || unit == "usec" ||
-          unit == "usecs" || unit == "us" || unit == "msec" ||
-          unit == "msecs" || unit == "ms" || unit == "sec" || unit == "secs" ||
-          unit == "second" || unit == "seconds" || unit == "s" ||
-          unit == "min" || unit == "mins" || unit == "minute" ||
-          unit == "minutes" || unit == "m" || unit == "hour" ||
-          unit == "hours" || unit == "h" || unit == "day" || unit == "days" ||
-          unit == "d" || unit == "week" || unit == "weeks" || unit == "w") {
+      if (unit == "nsec" || unit == "nsecs" || unit == "ns" || unit == "usec" || unit == "usecs" || unit == "us" ||
+          unit == "msec" || unit == "msecs" || unit == "ms" || unit == "sec" || unit == "secs" || unit == "second" ||
+          unit == "seconds" || unit == "s" || unit == "min" || unit == "mins" || unit == "minute" ||
+          unit == "minutes" || unit == "m" || unit == "hour" || unit == "hours" || unit == "h" || unit == "day" ||
+          unit == "days" || unit == "d" || unit == "week" || unit == "weeks" || unit == "w") {
         return "";
       } else {
         std::stringstream ss;

From 92b74e36fe58d3e7dbb41e42ab9cf40a8c0ede48 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 26 Jul 2023 15:10:23 +0200
Subject: [PATCH 0715/1114] cleaup unused code

---
 .../cpp/CppAssembleMethodGenerator.kt         |  5 +---
 .../generator/cpp/CppConnectionGenerator.kt   | 30 -------------------
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
index 1d73946cf7..7239bd8879 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
@@ -165,10 +165,7 @@ class CppAssembleMethodGenerator(private val reactor: Reactor) {
         } else {
             val leftPort = c.leftPorts[0]
             val rightPort = c.rightPorts[0]
-
-            """
-                this->environment()->draw_connection(&${leftPort.name}, &${rightPort.name}, ${c.properties});
-            """.trimIndent()
+            "this->environment()->draw_connection(&${leftPort.name}, &${rightPort.name}, ${c.properties});"
         }
 
     /**
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionGenerator.kt
index 50d67ef097..48ed28e0b0 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionGenerator.kt
@@ -48,36 +48,6 @@ class CppConnectionGenerator(private val reactor: Reactor) {
                 }
                 return false
             }
-
-        val Connection.requiresConnectionClass: Boolean get() = isPhysical || delay != null || isEnclaveConnection;
-    }
-
-    fun generateDeclarations() =
-        reactor.connections.mapNotNull { generateDecleration(it) }
-            .joinToString("\n", "// connections \n", postfix = "\n")
-
-    fun generateInitializers() =
-        reactor.connections.mapNotNull { generateConstructorInitializer(it) }.joinLn()
-
-    private fun generateDecleration(connection: Connection): String? =
-        with(connection) {
-            if (requiresConnectionClass) {
-                if (hasMultipleConnections) {
-                    "std::vector<std::unique_ptr<${connection.cppType}>> ${connection.name};"
-                } else {
-                    "${connection.cppType} ${connection.name};"
-                }
-            } else null
-        }
-
-    private fun generateConstructorInitializer(connection: Connection): String? = with(connection) {
-        if (requiresConnectionClass && !hasMultipleConnections) {
-            when {
-                isEnclaveConnection && delay == null -> """, $name{"$name", ${rightPorts[0].container.name}->__lf_env.get()}"""
-                isEnclaveConnection && delay != null -> """, $name{"$name", ${rightPorts[0].container.name}->__lf_env.get(), ${delay.toCppTime()}}"""
-                else                                 -> """, $name{"$name", this, ${delay.toCppTime()}}"""
-            }
-        } else null
     }
 
 }

From 529438ff3a12b35ea186face1eca9dc954fe5608 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 26 Jul 2023 15:15:28 +0200
Subject: [PATCH 0716/1114] remove connection generator class

---
 .../cpp/CppAssembleMethodGenerator.kt         |  4 --
 .../generator/cpp/CppConnectionExtensions.kt  | 41 ++++++++++++++
 .../generator/cpp/CppConnectionGenerator.kt   | 53 -------------------
 3 files changed, 41 insertions(+), 57 deletions(-)
 create mode 100644 core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionExtensions.kt
 delete mode 100644 core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionGenerator.kt

diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
index 7239bd8879..1a12f6424a 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt
@@ -26,10 +26,6 @@ package org.lflang.generator.cpp
 
 import org.lflang.*
 import org.lflang.generator.PrependOperator
-import org.lflang.generator.cpp.CppConnectionGenerator.Companion.cppType
-import org.lflang.generator.cpp.CppConnectionGenerator.Companion.isEnclaveConnection
-import org.lflang.generator.cpp.CppConnectionGenerator.Companion.name
-import org.lflang.generator.cpp.CppConnectionGenerator.Companion.requiresConnectionClass
 import org.lflang.generator.cpp.CppInstanceGenerator.Companion.isEnclave
 import org.lflang.generator.cpp.CppPortGenerator.Companion.dataType
 import org.lflang.lf.Action
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionExtensions.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionExtensions.kt
new file mode 100644
index 0000000000..e0615afbe9
--- /dev/null
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionExtensions.kt
@@ -0,0 +1,41 @@
+package org.lflang.generator.cpp
+
+import org.lflang.generator.cpp.CppInstanceGenerator.Companion.isEnclave
+import org.lflang.lf.Connection
+import org.lflang.lf.Reactor
+
+
+val Connection.name: String
+    get() =
+        "connection_" + leftPorts.joinToString("__") {
+            if (it.container == null) {
+                it.variable.name
+            } else {
+                it.container.name + "_" + it.variable.name
+            }
+        }
+
+val Connection.cppType: String
+    get() {
+        return when {
+            isEnclaveConnection -> when {
+                isPhysical -> "reactor::ConnectionType::PhysicalEnclaved"
+                delay != null -> "reactor::ConnectionType::DelayedEnclaved"
+                else -> "reactor::ConnectionType::Enclaved"
+            }
+
+            isPhysical -> "reactor::ConnectionType::Physical"
+            delay != null -> "reactor::ConnectionType::Delayed"
+            else -> "reactor::ConnectionType::Normal"
+        }
+    }
+
+val Connection.isEnclaveConnection: Boolean
+    get() {
+        for (port in leftPorts + rightPorts) {
+            if (port.container?.isEnclave == true) {
+                return true
+            }
+        }
+        return false
+    }
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionGenerator.kt
deleted file mode 100644
index 48ed28e0b0..0000000000
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppConnectionGenerator.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.lflang.generator.cpp
-
-import org.lflang.*
-import org.lflang.generator.cpp.CppConnectionGenerator.Companion.cppType
-import org.lflang.generator.cpp.CppConnectionGenerator.Companion.isEnclaveConnection
-import org.lflang.generator.cpp.CppInstanceGenerator.Companion.isEnclave
-import org.lflang.generator.cpp.CppPortGenerator.Companion.dataType
-import org.lflang.lf.Connection
-import org.lflang.lf.Port
-import org.lflang.lf.Reactor
-import org.lflang.lf.VarRef
-
-class CppConnectionGenerator(private val reactor: Reactor) {
-
-    companion object {
-        val Connection.name: String
-            get() =
-                "connection_" + leftPorts.joinToString("__") {
-                    if (it.container == null) {
-                        it.variable.name
-                    } else {
-                        it.container.name + "_" + it.variable.name
-                    }
-                }
-
-        val Connection.cppType: String
-            get() {
-                val leftPort = leftPorts.first()
-                return when {
-                    isEnclaveConnection -> when {
-                        isPhysical    -> "reactor::ConnectionType::PhysicalEnclaved"
-                        delay != null -> "reactor::ConnectionType::DelayedEnclaved"
-                        else          -> "reactor::ConnectionType::Enclaved"
-                    }
-
-                    isPhysical          -> "reactor::ConnectionType::Physical"
-                    delay != null       -> "reactor::ConnectionType::Delayed"
-                    else                -> "reactor::ConnectionType::Normal"
-                }
-            }
-
-        val Connection.isEnclaveConnection: Boolean
-            get() {
-                for (port in leftPorts + rightPorts) {
-                    if (port.container?.isEnclave == true) {
-                        return true
-                    }
-                }
-                return false
-            }
-    }
-
-}

From 155c6ea62775881fe984b940f5ebce9876008894 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 26 Jul 2023 15:22:41 +0200
Subject: [PATCH 0717/1114] update reacor-cpp

---
 core/src/main/resources/lib/cpp/reactor-cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/cpp/reactor-cpp b/core/src/main/resources/lib/cpp/reactor-cpp
index 3c6d8ec833..4d8423d736 160000
--- a/core/src/main/resources/lib/cpp/reactor-cpp
+++ b/core/src/main/resources/lib/cpp/reactor-cpp
@@ -1 +1 @@
-Subproject commit 3c6d8ec833bb3319b8f979f43bcc1416d2635d85
+Subproject commit 4d8423d73681cc734c3017595996bf3c39d0dc6a

From 57ed5bae5e077c7c476b799034f54affbdbdc63e Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 26 Jul 2023 15:26:55 +0200
Subject: [PATCH 0718/1114] fix file headers

---
 core/src/main/resources/lib/cpp/lfutil.hh     | 32 +++++++------------
 .../src/main/resources/lib/cpp/time_parser.hh | 32 +++++++------------
 2 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/core/src/main/resources/lib/cpp/lfutil.hh b/core/src/main/resources/lib/cpp/lfutil.hh
index 959d4218df..ef7880f301 100644
--- a/core/src/main/resources/lib/cpp/lfutil.hh
+++ b/core/src/main/resources/lib/cpp/lfutil.hh
@@ -1,32 +1,24 @@
 /*
  * Copyright (c) 2020, TU Dresden.
-
- * Redistribution and use in source and binary forms, with or without
- modification,
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
-
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
-
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
-
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- EVENT SHALL
- * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL,
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- WAY OUT OF
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
diff --git a/core/src/main/resources/lib/cpp/time_parser.hh b/core/src/main/resources/lib/cpp/time_parser.hh
index 999e33ca84..3693715f34 100644
--- a/core/src/main/resources/lib/cpp/time_parser.hh
+++ b/core/src/main/resources/lib/cpp/time_parser.hh
@@ -1,32 +1,24 @@
 /*
  * Copyright (c) 2020, TU Dresden.
-
- * Redistribution and use in source and binary forms, with or without
- modification,
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
-
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
-
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
-
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- EVENT SHALL
- * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL,
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- WAY OUT OF
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 

From d19cd05aeb71a352a6240571a6d827fd954f23e0 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 26 Jul 2023 15:28:30 +0200
Subject: [PATCH 0719/1114] undo change in .gitmodules

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 09e6ea5240..9cd89ffe1a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/lf-lang/reactor-c.git
 [submodule "org.lflang/src/lib/cpp/reactor-cpp"]
 	path = core/src/main/resources/lib/cpp/reactor-cpp
-    url = https://github.com/lf-lang/reactor-cpp.git
+	url = https://github.com/lf-lang/reactor-cpp
 [submodule "org.lflang/src/lib/rs/reactor-rs"]
 	path = core/src/main/resources/lib/rs/reactor-rs
 	url = https://github.com/lf-lang/reactor-rs

From e381113c93db3938cc60d619259f483f669b4793 Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Thu, 27 Jul 2023 13:17:31 +0900
Subject: [PATCH 0720/1114] Register network receiver classes with a portID

In reactor-ts, from now on, network receivers are stored in a map
consists of portID and network receivers. Thus, portID should be passed
when network receivers are registered to the map.
---
 .../generator/ts/TSConstructorGenerator.kt      | 17 +++++------------
 .../lflang/generator/ts/TSInstanceGenerator.kt  |  7 ++-----
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
index e079e8db77..b8c01a0ee7 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
@@ -25,7 +25,7 @@ class TSConstructorGenerator(
     private fun initializeParameter(p: Parameter): String =
         "${p.name}: ${TSTypes.getInstance().getTargetType(p)} = ${TSTypes.getInstance().getTargetInitializer(p)}"
 
-    private fun generateConstructorArguments(reactor: Reactor, isNetworkReceiver: Boolean): String {
+    private fun generateConstructorArguments(reactor: Reactor): String {
         val arguments = StringJoiner(", \n")
         if (reactor.isMain || reactor.isFederated) {
             arguments.add("timeout: TimeValue | undefined = undefined")
@@ -34,9 +34,6 @@ class TSConstructorGenerator(
             arguments.add("federationID: string = 'Unidentified Federation'")
         } else {
             arguments.add("parent: __Reactor")
-            if (isNetworkReceiver) {
-                arguments.add("portID: number")
-            }
         }
 
         // For TS, parameters are arguments of the class constructor.
@@ -52,7 +49,7 @@ class TSConstructorGenerator(
         return arguments.toString()
     }
 
-    private fun generateSuperConstructorCall(reactor: Reactor, isFederate: Boolean, isNetworkReceiver: Boolean): String =
+    private fun generateSuperConstructorCall(reactor: Reactor, isFederate: Boolean): String =
         if (reactor.isMain) {
             if (isFederate) {
                 """
@@ -68,11 +65,7 @@ class TSConstructorGenerator(
                 "super(timeout, keepAlive, fast, success, fail);"
             }
         } else {
-            if (isNetworkReceiver) {
-                "super(parent, portID);"
-            } else {
-                "super(parent);"
-            }
+            "super(parent);"
         }
 
     // Generate code for setting target configurations.
@@ -100,9 +93,9 @@ class TSConstructorGenerator(
         return with(PrependOperator) {
             """
                 |constructor (
-            ${" |    "..generateConstructorArguments(reactor, isNetworkReceiver)}
+            ${" |    "..generateConstructorArguments(reactor)}
                 |) {
-            ${" |    "..generateSuperConstructorCall(reactor, isFederate, isNetworkReceiver)}
+            ${" |    "..generateSuperConstructorCall(reactor, isFederate)}
             ${" |    "..generateTargetConfigurations(targetConfig)}
             ${" |    "..instances.generateInstantiations()}
             ${" |    "..timers.generateInstantiations()}
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
index 8d04f93dd5..6cb6aea34f 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
@@ -57,11 +57,6 @@ class TSInstanceGenerator(
             }
             val childReactorArguments = StringJoiner(", ")
             childReactorArguments.add("this")
-            if (isNetworkReceiver) {
-                // Assume that network receiver reactors are sorted by portID
-                childReactorArguments.add(portID.toString())
-                portID++
-            }
 
             for (parameter in childReactor.reactorClass.toDefinition().parameters) {
                 childReactorArguments.add(TSTypes.getInstance().getTargetInitializer(parameter, childReactor))
@@ -79,8 +74,10 @@ class TSInstanceGenerator(
                     "this.${childReactor.name} = " +
                             "new ${childReactor.reactorClass.name}($childReactorArguments)")
                 if (isNetworkReceiver) {
+                    // Assume that network receiver reactors are sorted by portID
                     childReactorInstantiations.add(
                         "this.registerNetworkReceiver(\n"
+                        + "\t${portID},\n"
                         + "\tthis.${childReactor.name} as __NetworkReceiver<unknown>\n)")
                 }
                 if (isNetworkSender) {

From ea2bf26b25d39e2c697d529bf50aee3f23ab4f8a Mon Sep 17 00:00:00 2001
From: Abhi Gundrala <gundralaa@berkeley.edu>
Date: Wed, 26 Jul 2023 23:51:48 -0700
Subject: [PATCH 0721/1114] update reactor-c

---
 core/src/main/resources/lib/c/reactor-c     | 2 +-
 core/src/main/resources/lib/cpp/reactor-cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 2207668f6a..586a98f887 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 2207668f6a703b9ea22e3c81668579b36cdd18db
+Subproject commit 586a98f887824955e3bb19869de279c026a48846
diff --git a/core/src/main/resources/lib/cpp/reactor-cpp b/core/src/main/resources/lib/cpp/reactor-cpp
index e3564782f0..b607f1f640 160000
--- a/core/src/main/resources/lib/cpp/reactor-cpp
+++ b/core/src/main/resources/lib/cpp/reactor-cpp
@@ -1 +1 @@
-Subproject commit e3564782f0e1a2bc427e5932a88ff8f87dacd50c
+Subproject commit b607f1f64083ab531e7a676b29de75f076aa1cde

From 0c970056e56b2be9edbab05c41d881c0dcb7497a Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Thu, 27 Jul 2023 16:27:34 +0900
Subject: [PATCH 0722/1114] Use `undefined` to represent 'no delay' in
 TypeScript

---
 .../java/org/lflang/federated/extensions/TSExtension.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index b572dc8a0b..e62d1c29d1 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -123,7 +123,7 @@ public String generateNetworkSenderBody(
 
   private String getNetworkDelayLiteral(Expression e) {
     var cLiteral = CExtensionUtils.getNetworkDelayLiteral(e);
-    return cLiteral.equals("NEVER") ? "TimeValue.never()" : "TimeValue.nsec(" + cLiteral + ")";
+    return cLiteral.equals("NEVER") ? "undefined" : "TimeValue.nsec(" + cLiteral + ")";
   }
 
   @Override
@@ -137,7 +137,7 @@ public String generatePortAbsentReactionBody(
         // If the output port has not been set for the current logical time,
         // send an ABSENT message to the receiving federate
         if (%1$s%2$s === undefined) {
-          this.util.sendRTIPortAbsent(%3$s, %4$d, %5$d);
+          this.util.sendRTIPortAbsent(%3$d, %4$d, %5$s);
         }
       """
         .formatted(
@@ -145,9 +145,9 @@ public String generatePortAbsentReactionBody(
                 ? ""
                 : srcOutputPort.getContainer().getName() + ".",
             srcOutputPort.getVariable().getName(),
-            additionalDelayString,
             connection.getDstFederate().id,
-            receivingPortID);
+            receivingPortID,
+            additionalDelayString);
   }
 
   @Override

From bb42523ba54381bcbf8e02051b7a12d28f93cf06 Mon Sep 17 00:00:00 2001
From: revol-xut <revol-xut@protonmail.com>
Date: Wed, 26 Jul 2023 16:29:23 +0200
Subject: [PATCH 0723/1114] update reactor-cpp

updating reactor-cpp

updating reactor-cpp

update reactor-cpp
---
 core/src/main/resources/lib/cpp/reactor-cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/cpp/reactor-cpp b/core/src/main/resources/lib/cpp/reactor-cpp
index 4d8423d736..521f1d852b 160000
--- a/core/src/main/resources/lib/cpp/reactor-cpp
+++ b/core/src/main/resources/lib/cpp/reactor-cpp
@@ -1 +1 @@
-Subproject commit 4d8423d73681cc734c3017595996bf3c39d0dc6a
+Subproject commit 521f1d852b6b3dc5850d3dcfc669ea812296db94

From 9b800f077158064fd13b11b467cf4a5c2533bd84 Mon Sep 17 00:00:00 2001
From: Abhi Gundrala <gundralaa@berkeley.edu>
Date: Thu, 27 Jul 2023 08:36:13 -0700
Subject: [PATCH 0724/1114] [submodule] update reactor-c to main

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 907ba0e86a..586a98f887 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 907ba0e86a3cf7956e96257ab51c2d89c3c71069
+Subproject commit 586a98f887824955e3bb19869de279c026a48846

From 2791e065d9f09f79e18d374e47e6445e4b5f594b Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 27 Jul 2023 18:27:14 -0700
Subject: [PATCH 0725/1114] Fix vscode-lingua-franca#133.

---
 core/src/main/java/org/lflang/ast/ToLf.java | 38 +++++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 3cb9b375f5..929dbf6d54 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
@@ -117,14 +116,19 @@ public MalleableString doSwitch(EObject eObject) {
     Predicate<INode> doesNotBelongToPrevious =
         doesNotBelongToAncestor.and(
             previous == null ? n -> true : ASTUtils.sameLine(previous).negate());
-    Stream<String> precedingComments =
-        ASTUtils.getPrecedingComments(node, doesNotBelongToPrevious).map(String::strip);
-    Collection<String> allComments = new ArrayList<>();
-    precedingComments.forEachOrdered(allComments::add);
-    getContainedComments(node).stream()
-        .filter(doesNotBelongToAncestor)
-        .map(INode::getText)
-        .forEachOrdered(allComments::add);
+    var allComments = new ArrayList<String>();
+    if (eObject.eContents().isEmpty() && !(eObject instanceof Code)) {
+      getContainedComments(node).stream()
+          .filter(doesNotBelongToAncestor)
+          .filter(doesNotBelongToPrevious)
+          .map(INode::getText)
+          .forEach(allComments::add);
+    } else {
+      Stream<String> precedingComments =
+          ASTUtils.getPrecedingComments(node, doesNotBelongToPrevious).map(String::strip);
+      precedingComments.forEachOrdered(allComments::add);
+      getContainedCodeComments(node).stream().map(INode::getText).forEach(allComments::add);
+    }
     allComments.addAll(followingComments);
     if (allComments.stream().anyMatch(s -> KEEP_FORMAT_COMMENT.matcher(s).matches())) {
       return MalleableString.anyOf(StringUtil.trimCodeBlock(node.getText(), 0))
@@ -140,7 +144,7 @@ static Set<INode> getAncestorComments(INode node) {
     for (ICompositeNode ancestor = node.getParent();
         ancestor != null;
         ancestor = ancestor.getParent()) {
-      ancestorComments.addAll(getContainedComments(ancestor));
+      ancestorComments.addAll(getContainedCodeComments(ancestor));
       ASTUtils.getPrecedingCommentNodes(ancestor, u -> true).forEachOrdered(ancestorComments::add);
     }
     return ancestorComments;
@@ -192,7 +196,7 @@ private static Stream<String> getFollowingComments(
    * Return comments contained by {@code node} that logically belong to this node (and not to any of
    * its children).
    */
-  private static List<INode> getContainedComments(INode node) {
+  private static List<INode> getContainedCodeComments(INode node) {
     ArrayList<INode> ret = new ArrayList<>();
     boolean inSemanticallyInsignificantLeadingRubbish = true;
     for (INode child : node.getAsTreeIterable()) {
@@ -212,6 +216,18 @@ private static List<INode> getContainedComments(INode node) {
     return ret;
   }
 
+  /**
+   * Return all comments that are part of {@code node}, regardless of where they appear relative to
+   * the main content of the node.
+   */
+  private static List<INode> getContainedComments(INode node) {
+    var ret = new ArrayList<INode>();
+    for (INode child : node.getAsTreeIterable()) {
+      if (ASTUtils.isComment(child)) ret.add(child);
+    }
+    return ret;
+  }
+
   @Override
   public MalleableString caseCodeExpr(CodeExpr object) {
     return caseCode(object.getCode());

From 42c1f53c5f6c3fbfd1df5b84497fb0a1b38c893b Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Fri, 28 Jul 2023 13:27:01 +0900
Subject: [PATCH 0726/1114] Update package.json

---
 core/src/main/resources/lib/ts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/ts/package.json b/core/src/main/resources/lib/ts/package.json
index 4a28012180..4797fd56ed 100644
--- a/core/src/main/resources/lib/ts/package.json
+++ b/core/src/main/resources/lib/ts/package.json
@@ -2,7 +2,7 @@
     "name": "LinguaFrancaDefault",
     "type": "commonjs",
     "dependencies": {
-        "@lf-lang/reactor-ts": "git://github.com/lf-lang/reactor-ts.git#ts-level-assignment",
+        "@lf-lang/reactor-ts": "git://github.com/lf-lang/reactor-ts.git#ts-cyclic-dependencies",
         "command-line-args": "^5.1.1",
         "command-line-usage": "^6.1.3"
     },

From 5fe79f3f78efafb1a40506591d09fe7b36359271 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 28 Jul 2023 15:04:04 -0700
Subject: [PATCH 0727/1114] Add `extends` keyword to tokens allowed in reaction
 bodies

---
 core/src/main/java/org/lflang/LinguaFranca.xtext | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/lflang/LinguaFranca.xtext b/core/src/main/java/org/lflang/LinguaFranca.xtext
index e414ff6b0e..b00456ce07 100644
--- a/core/src/main/java/org/lflang/LinguaFranca.xtext
+++ b/core/src/main/java/org/lflang/LinguaFranca.xtext
@@ -513,6 +513,7 @@ Token:
     'startup' | 'shutdown' | 'after' | 'deadline' | 'mutation' | 'preamble' |
     'new' | 'federated' | 'at' | 'as' | 'from' | 'widthof' | 'const' | 'method' |
     'interleaved' | 'mode' | 'initial' | 'reset' | 'history' | 'watchdog' |
+    'extends' |
 
     // Other terminals
     NEGINT | TRUE | FALSE |

From 5f7ca6edbcb71a7d2d050f0d4dea546506919e7a Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <78055940+byeong-gil@users.noreply.github.com>
Date: Sat, 29 Jul 2023 14:19:09 +0900
Subject: [PATCH 0728/1114] Update package.json

---
 core/src/main/resources/lib/ts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/ts/package.json b/core/src/main/resources/lib/ts/package.json
index 4a28012180..fc063d791e 100644
--- a/core/src/main/resources/lib/ts/package.json
+++ b/core/src/main/resources/lib/ts/package.json
@@ -2,7 +2,7 @@
     "name": "LinguaFrancaDefault",
     "type": "commonjs",
     "dependencies": {
-        "@lf-lang/reactor-ts": "git://github.com/lf-lang/reactor-ts.git#ts-level-assignment",
+        "@lf-lang/reactor-ts": "git://github.com/lf-lang/reactor-ts.git#master",
         "command-line-args": "^5.1.1",
         "command-line-usage": "^6.1.3"
     },

From 050729ab02bd63ba7ebd57857a19d172e58b8a63 Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Sat, 29 Jul 2023 16:49:14 +0900
Subject: [PATCH 0729/1114] Pass the TPO level info to network reactors

---
 .../federated/generator/FedASTUtils.java      | 13 +++++++------
 .../org/lflang/validation/AttributeSpec.java  |  2 +-
 .../generator/ts/TSConstructorGenerator.kt    | 19 ++++++++++++++-----
 .../generator/ts/TSInstanceGenerator.kt       | 15 ++++++++-------
 .../lflang/generator/ts/TSReactorGenerator.kt | 13 +++++--------
 5 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index d38237c71b..5b4492942d 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -43,6 +43,7 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
+import org.lflang.AttributeUtils;
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
 import org.lflang.TargetProperty.CoordinationType;
@@ -240,11 +241,11 @@ private static void addNetworkReceiverReactor(
             .getParent()
             .reactorDefinition; // Top-level reactor.
 
-    // Add the attribute "_NetworkReactor" for the network receiver.
+    // Add the attribute "_networkReactor" for the network receiver.
     var a = factory.createAttribute();
-    a.setAttrName("_NetworkReactor");
+    a.setAttrName("_networkReactor");
     var e = factory.createAttrParm();
-    e.setValue("Receiver");
+    e.setValue("\"receiver\"");
     a.getAttrParms().add(e);
     receiver.getAttributes().add(a);
 
@@ -646,11 +647,11 @@ private static Reactor getNetworkSenderReactor(
     // Initialize Reactor and Reaction AST Nodes
     Reactor sender = factory.createReactor();
 
-    // Add the attribute "_NetworkReactor" for the network sender.
+    // Add the attribute "_networkReactor" for the network sender.
     var a = factory.createAttribute();
-    a.setAttrName("_NetworkReactor");
+    a.setAttrName("_networkReactor");
     var e = factory.createAttrParm();
-    e.setValue("Sender");
+    e.setValue("\"sender\"");
     a.getAttrParms().add(e);
     sender.getAttributes().add(a);
 
diff --git a/core/src/main/java/org/lflang/validation/AttributeSpec.java b/core/src/main/java/org/lflang/validation/AttributeSpec.java
index 9e69a28f1f..57405d2983 100644
--- a/core/src/main/java/org/lflang/validation/AttributeSpec.java
+++ b/core/src/main/java/org/lflang/validation/AttributeSpec.java
@@ -233,7 +233,7 @@ enum AttrParamType {
         "_tpoLevel",
         new AttributeSpec(List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.INT, false))));
     ATTRIBUTE_SPECS_BY_NAME.put(
-        "_NetworkReactor",
+        "_networkReactor",
         new AttributeSpec(List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))));
   }
 }
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
index b8c01a0ee7..0644319f4d 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
@@ -25,7 +25,7 @@ class TSConstructorGenerator(
     private fun initializeParameter(p: Parameter): String =
         "${p.name}: ${TSTypes.getInstance().getTargetType(p)} = ${TSTypes.getInstance().getTargetInitializer(p)}"
 
-    private fun generateConstructorArguments(reactor: Reactor): String {
+    private fun generateConstructorArguments(reactor: Reactor, isNetworkReactor: Boolean): String {
         val arguments = StringJoiner(", \n")
         if (reactor.isMain || reactor.isFederated) {
             arguments.add("timeout: TimeValue | undefined = undefined")
@@ -46,10 +46,14 @@ class TSConstructorGenerator(
             arguments.add("fail?: () => void")
         }
 
+        if (isNetworkReactor) {
+            arguments.add("tpoLevel: number")
+        }
+
         return arguments.toString()
     }
 
-    private fun generateSuperConstructorCall(reactor: Reactor, isFederate: Boolean): String =
+    private fun generateSuperConstructorCall(reactor: Reactor, isFederate: Boolean, isNetworkReactor: Boolean): String =
         if (reactor.isMain) {
             if (isFederate) {
                 """
@@ -65,7 +69,11 @@ class TSConstructorGenerator(
                 "super(timeout, keepAlive, fast, success, fail);"
             }
         } else {
-            "super(parent);"
+            if (isNetworkReactor) {
+                "super(parent, tpoLevel)"
+            } else {
+                "super(parent);"
+            }
         }
 
     // Generate code for setting target configurations.
@@ -85,6 +93,7 @@ class TSConstructorGenerator(
         actions: TSActionGenerator,
         ports: TSPortGenerator,
         isFederate: Boolean,
+        isNetworkReactor: Boolean,
         isNetworkReceiver: Boolean
     ): String {
         val connections = TSConnectionGenerator(reactor.connections, messageReporter)
@@ -93,9 +102,9 @@ class TSConstructorGenerator(
         return with(PrependOperator) {
             """
                 |constructor (
-            ${" |    "..generateConstructorArguments(reactor)}
+            ${" |    "..generateConstructorArguments(reactor, isNetworkReactor)}
                 |) {
-            ${" |    "..generateSuperConstructorCall(reactor, isFederate)}
+            ${" |    "..generateSuperConstructorCall(reactor, isFederate, isNetworkReactor)}
             ${" |    "..generateTargetConfigurations(targetConfig)}
             ${" |    "..instances.generateInstantiations()}
             ${" |    "..timers.generateInstantiations()}
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
index 6cb6aea34f..2911503159 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
@@ -48,19 +48,20 @@ class TSInstanceGenerator(
         val childReactorInstantiations = LinkedList<String>()
         var portID = 0
         for (childReactor in childReactors) {
-            var isNetworkSender = false
-            var isNetworkReceiver = false
-            val networkReactorAttribute = AttributeUtils.findAttributeByName(childReactor.reactorClass, "_NetworkReactor")
-            if (networkReactorAttribute != null) {
-                isNetworkSender = networkReactorAttribute.getAttrParms().get(0).getName() == "Sender"
-                isNetworkReceiver = networkReactorAttribute.getAttrParms().get(0).getName() == "Receiver"
-            }
+            var tpoLevel = AttributeUtils.getFirstArgumentValue(AttributeUtils.findAttributeByName(childReactor, "_tpoLevel"));
+            val networkReactorAttributeValue = AttributeUtils.getFirstArgumentValue(AttributeUtils.findAttributeByName(childReactor.reactorClass, "_networkReactor"))
+            var isNetworkReceiver = networkReactorAttributeValue == "receiver"
+            var isNetworkSender = networkReactorAttributeValue == "sender"
+
             val childReactorArguments = StringJoiner(", ")
             childReactorArguments.add("this")
 
             for (parameter in childReactor.reactorClass.toDefinition().parameters) {
                 childReactorArguments.add(TSTypes.getInstance().getTargetInitializer(parameter, childReactor))
             }
+            if (tpoLevel != null) {
+                childReactorArguments.add(tpoLevel.toString());
+            }
             if (childReactor.isBank) {
                 childReactorInstantiations.add(
                     "this.${childReactor.name} = " +
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
index e84f012480..73da56bf4c 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
@@ -97,13 +97,10 @@ ${"             |"..preamble.code.toText()}
         }
 
         val isFederate = AttributeUtils.isFederate(reactor)
-        val networkReactorAttribute = AttributeUtils.findAttributeByName(reactor, "_NetworkReactor")
-        var isNetworkSender = false
-        var isNetworkReceiver = false
-        if (networkReactorAttribute != null) {
-            isNetworkSender = networkReactorAttribute.getAttrParms().get(0).getName() == "Sender"
-            isNetworkReceiver = networkReactorAttribute.getAttrParms().get(0).getName() == "Receiver"
-        }
+        val networkReactorAttributeValue = AttributeUtils.getFirstArgumentValue(AttributeUtils.findAttributeByName(reactor, "_networkReactor"))
+        var isNetworkReactor = networkReactorAttributeValue != null
+        var isNetworkReceiver = networkReactorAttributeValue == "receiver"
+        var isNetworkSender = networkReactorAttributeValue == "sender"
 
         // NOTE: type parameters that are referenced in ports or actions must extend
         // Present in order for the program to type check.
@@ -144,7 +141,7 @@ ${"             |"..preamble.code.toText()}
             ${" |    "..actionGenerator.generateClassProperties()}
             ${" |    "..portGenerator.generateClassProperties()}
             ${" |    "..constructorGenerator.generateConstructor(targetConfig, instanceGenerator, timerGenerator, parameterGenerator,
-                stateGenerator, actionGenerator, portGenerator, isFederate, isNetworkReceiver)}
+                stateGenerator, actionGenerator, portGenerator, isFederate, isNetworkReactor, isNetworkReceiver)}
                 |}
                 |// =============== END reactor class ${reactor.name}
                 |

From 3b6a39f72ac9d360133ae20e991bb48d2426d3be Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <78055940+byeong-gil@users.noreply.github.com>
Date: Sat, 29 Jul 2023 16:50:34 +0900
Subject: [PATCH 0730/1114] Update FedASTUtils.java

---
 .../main/java/org/lflang/federated/generator/FedASTUtils.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 5b4492942d..dda752ff93 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -43,7 +43,6 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-import org.lflang.AttributeUtils;
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
 import org.lflang.TargetProperty.CoordinationType;

From d1669459824f9b8eca2a8399155ad0525f93e3cd Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Sun, 30 Jul 2023 08:17:06 -0400
Subject: [PATCH 0731/1114] Attempt to deal with comment in #1831

---
 core/src/main/java/org/lflang/TargetConfig.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index 8eb12b6096..12096f9d6c 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -388,10 +388,9 @@ public static class PlatformOptions {
 
     /**
      * The string value used to determine what type of embedded board we work with and can be used
-     * to simplify the build process. For example, when we want to flash to an Arduino Nano 33 BLE
-     * board, we can use the string arduino:mbed_nano:nano33ble Can also be used to specify uart
-     * output setting on rp2040 boards where arduino_nano_rp2040_connect:uart or
-     * arduino_nano_rp2040_connect:usb (usb) fully specifies the board and uart output
+     * to simplify the build process. This string has the form "board_name[:option]*" (zero or more
+     * options separated by colons). For example, "pico:usb" specifies a Raspberry Pi Pico where
+     * stdin and stdout go through a USB serial port.
      */
     public String board = null;
 

From 6cec307b5b0246c498d2c3a548ea8025f4b07003 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 30 Jul 2023 06:45:57 -0700
Subject: [PATCH 0732/1114] Update
 core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java

Co-authored-by: Edward A. Lee <eal@eecs.berkeley.edu>
---
 .../java/org/lflang/generator/c/CMainFunctionGenerator.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
index 5d11e27e05..5f0657c322 100644
--- a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
@@ -63,7 +63,7 @@ private String generateMainFunction() {
           "   exit(res);",
           "}");
     } else if (targetConfig.platformOptions.platform == Platform.RP2040) {
-      // Pico platform cannont use command line args.
+      // Pico platform cannot use command line args.
       return String.join("\n", "int main(void) {", "   return lf_reactor_c_main(0, NULL);", "}");
     } else {
       return String.join(

From 75ebf6d1b0c45b32568097b9020f10c8bb92639f Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Sun, 30 Jul 2023 07:32:28 -0400
Subject: [PATCH 0733/1114] Attempt to find pico-sdk path relative to package
 root

---
 .../org/lflang/generator/c/CCmakeGenerator.java | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 63262147e7..19df4d44e7 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -25,6 +25,7 @@
 
 package org.lflang.generator.c;
 
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -136,6 +137,22 @@ CodeBuilder generateCMakeCode(
         cMakeCode.newLine();
         break;
       case RP2040:
+        // Attempt to set PICO_SDK_PATH if it is not already set.
+        if (System.getenv("PICO_SDK_PATH") == null) {
+          Path picoSDKPath = fileConfig.getOutPath().resolve("pico-sdk");
+          if (Files.isDirectory(picoSDKPath)) {
+            messageReporter.nowhere().info("pico-sdk library found at "
+              + picoSDKPath.toString()
+              + ". You can override this by setting PICO_SDK_PATH.");
+            cMakeCode.pr("# Define the root of the pico-sdk library.");
+            cMakeCode.pr("set(PICO_SDK_PATH " + fileConfig.getOutPath() + "/pico-sdk)");
+          } else {
+            messageReporter.nowhere().warning(
+                    "No PICO_SDK_PATH environment variable and no pico-sdk directory "
+                    + "at the package root directory. Pico SDK will not be found."
+            );
+          }
+        }
         cMakeCode.pr("include(pico_sdk_import.cmake)");
         cMakeCode.pr("project(" + executableName + " LANGUAGES C CXX ASM)");
         cMakeCode.newLine();

From 45fb5cbdbc662408e2b44b75ddb02692393a2a3f Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Sun, 30 Jul 2023 13:19:22 -0400
Subject: [PATCH 0734/1114] Align reactor-c to main

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 586a98f887..ccf230f3d1 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 586a98f887824955e3bb19869de279c026a48846
+Subproject commit ccf230f3d1027ee39987066b9e1f3211560e9f6e

From 6ded11576c52cc62eecedba059d9cb9d77eb44b5 Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Mon, 31 Jul 2023 14:27:03 +0900
Subject: [PATCH 0735/1114] Handle network reactions without a TPO level

---
 .../kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
index 0644319f4d..fc8b942a2f 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
@@ -47,7 +47,7 @@ class TSConstructorGenerator(
         }
 
         if (isNetworkReactor) {
-            arguments.add("tpoLevel: number")
+            arguments.add("tpoLevel?: number")
         }
 
         return arguments.toString()

From 1027c0f365ed90f5f36ecd62f1584cab2b06deea Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 31 Jul 2023 02:32:53 -0700
Subject: [PATCH 0736/1114] Use package published on npm

---
 core/src/main/resources/lib/ts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/ts/package.json b/core/src/main/resources/lib/ts/package.json
index fc063d791e..1ed0dd7c54 100644
--- a/core/src/main/resources/lib/ts/package.json
+++ b/core/src/main/resources/lib/ts/package.json
@@ -2,7 +2,7 @@
     "name": "LinguaFrancaDefault",
     "type": "commonjs",
     "dependencies": {
-        "@lf-lang/reactor-ts": "git://github.com/lf-lang/reactor-ts.git#master",
+        "@lf-lang/reactor-ts": "^0.5.0",
         "command-line-args": "^5.1.1",
         "command-line-usage": "^6.1.3"
     },

From bb83f62ebc74e2fc3050136450ef7df89e15f89c Mon Sep 17 00:00:00 2001
From: Abhi Gundrala <gundralaa@berkeley.edu>
Date: Mon, 31 Jul 2023 09:18:25 -0700
Subject: [PATCH 0737/1114] [format] apply spotless

---
 .../org/lflang/generator/c/CCmakeGenerator.java  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 19df4d44e7..5f40318ca1 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -141,16 +141,20 @@ CodeBuilder generateCMakeCode(
         if (System.getenv("PICO_SDK_PATH") == null) {
           Path picoSDKPath = fileConfig.getOutPath().resolve("pico-sdk");
           if (Files.isDirectory(picoSDKPath)) {
-            messageReporter.nowhere().info("pico-sdk library found at "
-              + picoSDKPath.toString()
-              + ". You can override this by setting PICO_SDK_PATH.");
+            messageReporter
+                .nowhere()
+                .info(
+                    "pico-sdk library found at "
+                        + picoSDKPath.toString()
+                        + ". You can override this by setting PICO_SDK_PATH.");
             cMakeCode.pr("# Define the root of the pico-sdk library.");
             cMakeCode.pr("set(PICO_SDK_PATH " + fileConfig.getOutPath() + "/pico-sdk)");
           } else {
-            messageReporter.nowhere().warning(
+            messageReporter
+                .nowhere()
+                .warning(
                     "No PICO_SDK_PATH environment variable and no pico-sdk directory "
-                    + "at the package root directory. Pico SDK will not be found."
-            );
+                        + "at the package root directory. Pico SDK will not be found.");
           }
         }
         cMakeCode.pr("include(pico_sdk_import.cmake)");

From d04d038a58f46852224c6d56522b847531f9fead Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 31 Jul 2023 09:25:58 -0700
Subject: [PATCH 0738/1114] Fix whitespace-related bug.

---
 .../main/java/org/lflang/federated/extensions/CExtension.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 3829c72617..1ad0f306fd 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -614,7 +614,8 @@ private String generateInitializeTriggers(
     var oldFederatedReactorName = federatedReactor.getName();
     federatedReactor.setName(federate.name);
     var main = new ReactorInstance(federatedReactor, messageReporter, -1);
-    code.pr(CExtensionUtils.initializeTriggersForNetworkActions(federate, main));
+    var initializeTriggersForNetworkActions = CExtensionUtils.initializeTriggersForNetworkActions(federate, main);
+    if (!initializeTriggersForNetworkActions.isBlank()) code.pr(initializeTriggersForNetworkActions);
     code.pr("staa_initialization(); \\");
     federatedReactor.setName(oldFederatedReactorName);
 

From 246c143c2aca8e8f730282e6f375766ec853a0a9 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 31 Jul 2023 09:46:36 -0700
Subject: [PATCH 0739/1114] Apply formatter

---
 .../java/org/lflang/federated/extensions/CExtension.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 1ad0f306fd..d6493f96c0 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -614,8 +614,10 @@ private String generateInitializeTriggers(
     var oldFederatedReactorName = federatedReactor.getName();
     federatedReactor.setName(federate.name);
     var main = new ReactorInstance(federatedReactor, messageReporter, -1);
-    var initializeTriggersForNetworkActions = CExtensionUtils.initializeTriggersForNetworkActions(federate, main);
-    if (!initializeTriggersForNetworkActions.isBlank()) code.pr(initializeTriggersForNetworkActions);
+    var initializeTriggersForNetworkActions =
+        CExtensionUtils.initializeTriggersForNetworkActions(federate, main);
+    if (!initializeTriggersForNetworkActions.isBlank())
+      code.pr(initializeTriggersForNetworkActions);
     code.pr("staa_initialization(); \\");
     federatedReactor.setName(oldFederatedReactorName);
 

From ef92075fb1b4e69f4b39d71033ba393ff0b9823e Mon Sep 17 00:00:00 2001
From: Abhi Gundrala <gundralaa@berkeley.edu>
Date: Mon, 31 Jul 2023 10:24:57 -0700
Subject: [PATCH 0740/1114] [refactor] resolve cmake comments

---
 .../federated/extensions/CExtension.java      |  6 ++-
 .../lflang/generator/c/CCmakeGenerator.java   | 49 +++++++++----------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 1ad0f306fd..d6493f96c0 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -614,8 +614,10 @@ private String generateInitializeTriggers(
     var oldFederatedReactorName = federatedReactor.getName();
     federatedReactor.setName(federate.name);
     var main = new ReactorInstance(federatedReactor, messageReporter, -1);
-    var initializeTriggersForNetworkActions = CExtensionUtils.initializeTriggersForNetworkActions(federate, main);
-    if (!initializeTriggersForNetworkActions.isBlank()) code.pr(initializeTriggersForNetworkActions);
+    var initializeTriggersForNetworkActions =
+        CExtensionUtils.initializeTriggersForNetworkActions(federate, main);
+    if (!initializeTriggersForNetworkActions.isBlank())
+      code.pr(initializeTriggersForNetworkActions);
     code.pr("staa_initialization(); \\");
     federatedReactor.setName(oldFederatedReactorName);
 
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 5f40318ca1..38dda90dbd 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -112,6 +112,20 @@ CodeBuilder generateCMakeCode(
               .relativize(fileConfig.getSrcGenPath().resolve(Paths.get(file)));
       additionalSources.add(FileUtil.toUnixString(relativePath));
     }
+    // Parse board option of the platform target property
+    // Specified as a series of colon spaced options
+    // Board syntax
+    //  rp2040 <board_name> : <stdio_opt>
+    //  arduino
+    String[] boardProperties = null;
+    if (targetConfig.platformOptions.board != null) {
+      boardProperties = targetConfig.platformOptions.board.trim().split(":");
+      // Ignore whitespace
+      for (int i = 0; i < boardProperties.length; i++) {
+        boardProperties[i] = boardProperties[i].trim();
+      }
+    }
+
     additionalSources.addAll(this.additionalSources);
     cMakeCode.newLine();
 
@@ -162,16 +176,10 @@ CodeBuilder generateCMakeCode(
         cMakeCode.newLine();
         // board type for rp2040 based boards
         if (targetConfig.platformOptions.board != null) {
-          // board syntax <board_name> : <stdio_opt>
-          // ignore whitespace
-          String[] bProps = targetConfig.platformOptions.board.trim().split(":");
-          for (int i = 0; i < bProps.length; i++) {
-            bProps[i] = bProps[i].trim();
-          }
-          if (bProps.length < 1 || bProps[0].equals("")) {
+          if (boardProperties.length < 1 || boardProperties[0].equals("")) {
             cMakeCode.pr("set(PICO_BOARD pico)");
           } else {
-            cMakeCode.pr("set(PICO_BOARD \"" + bProps[0] + "\")");
+            cMakeCode.pr("set(PICO_BOARD \"" + boardProperties[0] + "\")");
           }
         }
         // remove warnings for rp2040 only to make debug easier
@@ -290,24 +298,15 @@ CodeBuilder generateCMakeCode(
     // post target definition board configurations
     switch (targetConfig.platformOptions.platform) {
       case RP2040:
-        if (targetConfig.platformOptions.board != null) {
-          String[] bProps = targetConfig.platformOptions.board.trim().split(":");
-          for (int i = 0; i < bProps.length; i++) {
-            bProps[i] = bProps[i].trim();
-          }
-          if (bProps.length > 1 && bProps[1].equals("uart")) {
-            cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 0)");
-            cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 1)");
-          } else if (bProps.length > 1 && bProps[1].equals("usb")) {
-            cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 1)");
-            cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 0)");
-          }
-        } else {
-          // default
-          cMakeCode.pr("# Enable both usb and uart stdio");
-          cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} 1)");
-          cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} 1)");
+        // set stdio output
+        boolean usb = true;
+        boolean uart = true;
+        if (targetConfig.platformOptions.board != null && boardProperties.length > 1) {
+          uart = !boardProperties[1].equals("usb");
+          usb = !boardProperties[1].equals("uart");
         }
+        cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET}" + (usb ? 1 : 0) + ")");
+        cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET}" + (uart ? 0 : 0) + ")");
         break;
     }
 

From 0eae94eb80d38c7672666730d1e66a13d0f95f78 Mon Sep 17 00:00:00 2001
From: Abhi Gundrala <gundralaa@berkeley.edu>
Date: Mon, 31 Jul 2023 12:01:01 -0700
Subject: [PATCH 0741/1114] [refactor] whitespace

---
 .../main/java/org/lflang/generator/c/CCmakeGenerator.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 38dda90dbd..381dadcce5 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -117,7 +117,7 @@ CodeBuilder generateCMakeCode(
     // Board syntax
     //  rp2040 <board_name> : <stdio_opt>
     //  arduino
-    String[] boardProperties = null;
+    String[] boardProperties = {};
     if (targetConfig.platformOptions.board != null) {
       boardProperties = targetConfig.platformOptions.board.trim().split(":");
       // Ignore whitespace
@@ -305,8 +305,8 @@ CodeBuilder generateCMakeCode(
           uart = !boardProperties[1].equals("usb");
           usb = !boardProperties[1].equals("uart");
         }
-        cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET}" + (usb ? 1 : 0) + ")");
-        cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET}" + (uart ? 0 : 0) + ")");
+        cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} " + (usb ? 1 : 0) + ")");
+        cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} " + (uart ? 1 : 0) + ")");
         break;
     }
 

From 0c0171c9b53e40481e68ec8042b5c204168e95d1 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 31 Jul 2023 11:43:26 -0700
Subject: [PATCH 0742/1114] Fix comment duplication bug.

The change on line 130 (filter out ancestor comments) is the relevant
one. This is just a matter of accidentally deleting one tiny bit of code
that was in master.
---
 core/src/main/java/org/lflang/ast/ToLf.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 929dbf6d54..9646bea79c 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -125,9 +125,13 @@ public MalleableString doSwitch(EObject eObject) {
           .forEach(allComments::add);
     } else {
       Stream<String> precedingComments =
-          ASTUtils.getPrecedingComments(node, doesNotBelongToPrevious).map(String::strip);
+          ASTUtils.getPrecedingComments(node, doesNotBelongToPrevious.and(doesNotBelongToAncestor))
+              .map(String::strip);
       precedingComments.forEachOrdered(allComments::add);
-      getContainedCodeComments(node).stream().map(INode::getText).forEach(allComments::add);
+      getContainedCodeComments(node).stream()
+          .filter(doesNotBelongToAncestor)
+          .map(INode::getText)
+          .forEach(allComments::add);
     }
     allComments.addAll(followingComments);
     if (allComments.stream().anyMatch(s -> KEEP_FORMAT_COMMENT.matcher(s).matches())) {
@@ -146,6 +150,7 @@ static Set<INode> getAncestorComments(INode node) {
         ancestor = ancestor.getParent()) {
       ancestorComments.addAll(getContainedCodeComments(ancestor));
       ASTUtils.getPrecedingCommentNodes(ancestor, u -> true).forEachOrdered(ancestorComments::add);
+      ancestorComments.addAll(getContainedCodeComments(ancestor));
     }
     return ancestorComments;
   }

From 6c3916d6aa79fe56b0a40c7a70b2f8df22a29f1f Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Wed, 2 Aug 2023 09:58:53 +0900
Subject: [PATCH 0743/1114] Restore failing TS tests for testing

---
 .../src/federated/{failing => }/LoopDistributedCentralized.lf     | 0
 .../src/federated/{failing => }/LoopDistributedDouble.lf          | 0
 .../TypeScript/src/federated/{failing => }/PingPongDistributed.lf | 0
 .../src/federated/{failing => }/PingPongDistributedPhysical.lf    | 0
 test/TypeScript/src/federated/{failing => }/SimpleFederated.lf    | 0
 test/TypeScript/src/federated/{failing => }/SpuriousDependency.lf | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename test/TypeScript/src/federated/{failing => }/LoopDistributedCentralized.lf (100%)
 rename test/TypeScript/src/federated/{failing => }/LoopDistributedDouble.lf (100%)
 rename test/TypeScript/src/federated/{failing => }/PingPongDistributed.lf (100%)
 rename test/TypeScript/src/federated/{failing => }/PingPongDistributedPhysical.lf (100%)
 rename test/TypeScript/src/federated/{failing => }/SimpleFederated.lf (100%)
 rename test/TypeScript/src/federated/{failing => }/SpuriousDependency.lf (100%)

diff --git a/test/TypeScript/src/federated/failing/LoopDistributedCentralized.lf b/test/TypeScript/src/federated/LoopDistributedCentralized.lf
similarity index 100%
rename from test/TypeScript/src/federated/failing/LoopDistributedCentralized.lf
rename to test/TypeScript/src/federated/LoopDistributedCentralized.lf
diff --git a/test/TypeScript/src/federated/failing/LoopDistributedDouble.lf b/test/TypeScript/src/federated/LoopDistributedDouble.lf
similarity index 100%
rename from test/TypeScript/src/federated/failing/LoopDistributedDouble.lf
rename to test/TypeScript/src/federated/LoopDistributedDouble.lf
diff --git a/test/TypeScript/src/federated/failing/PingPongDistributed.lf b/test/TypeScript/src/federated/PingPongDistributed.lf
similarity index 100%
rename from test/TypeScript/src/federated/failing/PingPongDistributed.lf
rename to test/TypeScript/src/federated/PingPongDistributed.lf
diff --git a/test/TypeScript/src/federated/failing/PingPongDistributedPhysical.lf b/test/TypeScript/src/federated/PingPongDistributedPhysical.lf
similarity index 100%
rename from test/TypeScript/src/federated/failing/PingPongDistributedPhysical.lf
rename to test/TypeScript/src/federated/PingPongDistributedPhysical.lf
diff --git a/test/TypeScript/src/federated/failing/SimpleFederated.lf b/test/TypeScript/src/federated/SimpleFederated.lf
similarity index 100%
rename from test/TypeScript/src/federated/failing/SimpleFederated.lf
rename to test/TypeScript/src/federated/SimpleFederated.lf
diff --git a/test/TypeScript/src/federated/failing/SpuriousDependency.lf b/test/TypeScript/src/federated/SpuriousDependency.lf
similarity index 100%
rename from test/TypeScript/src/federated/failing/SpuriousDependency.lf
rename to test/TypeScript/src/federated/SpuriousDependency.lf

From 9e18ee58bf1dcbac83037b9bc83cc1b4b32a7ef1 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 2 Aug 2023 23:59:27 +0200
Subject: [PATCH 0744/1114] Look for Pico SDK in package root, not output path

---
 .../src/main/java/org/lflang/generator/c/CCmakeGenerator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 381dadcce5..790e00e9f8 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -153,7 +153,7 @@ CodeBuilder generateCMakeCode(
       case RP2040:
         // Attempt to set PICO_SDK_PATH if it is not already set.
         if (System.getenv("PICO_SDK_PATH") == null) {
-          Path picoSDKPath = fileConfig.getOutPath().resolve("pico-sdk");
+          Path picoSDKPath = fileConfig.srcPkgPath.resolve("pico-sdk");
           if (Files.isDirectory(picoSDKPath)) {
             messageReporter
                 .nowhere()
@@ -162,7 +162,7 @@ CodeBuilder generateCMakeCode(
                         + picoSDKPath.toString()
                         + ". You can override this by setting PICO_SDK_PATH.");
             cMakeCode.pr("# Define the root of the pico-sdk library.");
-            cMakeCode.pr("set(PICO_SDK_PATH " + fileConfig.getOutPath() + "/pico-sdk)");
+            cMakeCode.pr("set(PICO_SDK_PATH " + picoSDKPath + ")");
           } else {
             messageReporter
                 .nowhere()

From c813b2472f15a4806313ff4dfb39c909be869075 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 3 Aug 2023 15:33:29 +0200
Subject: [PATCH 0745/1114] Do checks in validator. This could be done more
 elegantly but requires refactoring.

---
 .../main/java/org/lflang/TargetProperty.java  | 35 ++++++----
 .../lflang/generator/c/CCmakeGenerator.java   | 10 ++-
 .../org/lflang/validation/LFValidator.java    | 64 +++++++++++++------
 3 files changed, 71 insertions(+), 38 deletions(-)

diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index e9664e98e8..7df857d02f 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -512,6 +512,10 @@ public enum TargetProperty {
             }
           }
         }
+        // If the platform does not support threading, disable it.
+        if (!config.platformOptions.platform.isMultiThreaded()) {
+            config.threading = false;
+        }
       }),
 
   /** Directive to instruct the runtime to collect and print execution statistics. */
@@ -1481,8 +1485,8 @@ public interface TargetPropertyType {
      * @param v A reference to the validator to report errors to.
      */
     public static void produceError(String name, String description, LFValidator v) {
-      v.getTargetPropertyErrors()
-          .add("Target property '" + name + "' is required to be " + description + ".");
+
+      v.reportTargetPropertyError("Target property '" + name + "' is required to be " + description + ".");
     }
   }
 
@@ -1742,21 +1746,22 @@ public String toString() {
   public enum Platform {
     AUTO,
     ARDUINO,
-    NRF52("Nrf52"),
-    RP2040("Rp2040"),
-    LINUX("Linux"),
-    MAC("Darwin"),
-    ZEPHYR("Zephyr"),
-    WINDOWS("Windows");
+    NRF52("Nrf52", true),
+    RP2040("Rp2040", false),
+    LINUX("Linux", true),
+    MAC("Darwin", true),
+    ZEPHYR("Zephyr", true),
+    WINDOWS("Windows", true);
 
     String cMakeName;
 
-    Platform() {
-      this.cMakeName = this.toString();
-    }
+    private boolean multiThreaded = true;
 
-    Platform(String cMakeName) {
-      this.cMakeName = cMakeName;
+    Platform() { this.cMakeName = this.toString(); }
+
+    Platform(String cMakeName, boolean isMultiThreaded) {
+        this.cMakeName = cMakeName;
+        this.multiThreaded = isMultiThreaded;
     }
 
     /** Return the name in lower case. */
@@ -1769,6 +1774,10 @@ public String toString() {
     public String getcMakeName() {
       return this.cMakeName;
     }
+
+    public boolean isMultiThreaded() {
+        return this.multiThreaded;
+    }
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 790e00e9f8..810fde6350 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -326,16 +326,14 @@ CodeBuilder generateCMakeCode(
       cMakeCode.newLine();
     }
 
-    if (targetConfig.threading || targetConfig.tracing != null) {
-      if (targetConfig.platformOptions.platform != Platform.RP2040) {
-        // If threaded computation is requested, add the threads option.
+    if (targetConfig.threading) {
+      // If threaded computation is requested, add the threads option.
         cMakeCode.pr("# Find threads and link to it");
         cMakeCode.pr("find_package(Threads REQUIRED)");
         cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE Threads::Threads)");
         cMakeCode.newLine();
-      }
-      // If the LF program itself is threaded or if tracing is enabled, we need to define
-      // NUMBER_OF_WORKERS so that platform-specific C files will contain the appropriate functions
+      // If the LF program itself is threaded, we need to define NUMBER_OF_WORKERS so that
+      // platform-specific C files will contain the appropriate functions
       cMakeCode.pr("# Set the number of workers to enable threading/tracing");
       cMakeCode.pr(
           "target_compile_definitions(${LF_MAIN_TARGET} PUBLIC NUMBER_OF_WORKERS="
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 0a4062df84..487082c85c 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -60,6 +60,8 @@
 import org.lflang.ModelInfo;
 import org.lflang.Target;
 import org.lflang.TargetProperty;
+import org.lflang.TargetProperty.Platform;
+import org.lflang.TargetProperty.TargetPropertyType;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.serialization.SupportedSerializers;
@@ -119,7 +121,7 @@
 /**
  * Custom validation checks for Lingua Franca programs.
  *
- * <p>Also see: https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#validation
+ * <p>Also see: <a href="https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#validation">...</a>
  *
  * @author Edward A. Lee
  * @author Marten Lohstroh
@@ -130,19 +132,11 @@
  */
 public class LFValidator extends BaseLFValidator {
 
-  //////////////////////////////////////////////////////////////
-  //// Public check methods.
-
-  // These methods are automatically invoked on AST nodes matching
-  // the types of their arguments.
-  // CheckType.FAST ensures that these checks run whenever a file is modified.
-  // Alternatives are CheckType.NORMAL (when saving) and
-  // CheckType.EXPENSIVE (only when right-click, validate).
-  // FIXME: What is the default when nothing is specified?
-
-  // These methods are listed in alphabetical order, and, although
-  // it is isn't strictly required, follow a naming convention
-  // checkClass, where Class is the AST class, where possible.
+  // The methods annotated with @Check are automatically invoked on AST nodes matching the types of
+  // their arguments. CheckType.FAST ensures that these checks run whenever a file is modified;
+  // when CheckType.NORMAL is used, the check is run upon saving.
+  // NOTE: please list methods in alphabetical order, and follow a naming convention checkClass,
+  // where Class is the AST class.
 
   @Check(CheckType.FAST)
   public void checkAction(Action action) {
@@ -565,10 +559,12 @@ public void checkKeyValuePair(KeyValuePair param) {
               Literals.KEY_VALUE_PAIR__NAME);
         }
 
-        // Report problem with the assigned value.
+        // Run checks on the property. After running the check, errors/warnings
+        // are retrievable from the targetPropertyErrors collection.
         prop.type.check(param.getValue(), param.getName(), this);
       }
 
+      // Retrieve the errors that resulted from the check.
       for (String it : targetPropertyErrors) {
         error(it, Literals.KEY_VALUE_PAIR__VALUE);
       }
@@ -1117,13 +1113,14 @@ public void checkTargetDecl(TargetDecl target) throws IOException {
    *
    * @param targetProperties The target properties defined in the current Lingua Franca program.
    */
-  @Check(CheckType.EXPENSIVE)
+  @Check(CheckType.NORMAL)
   public void checkTargetProperties(KeyValuePairs targetProperties) {
     validateFastTargetProperty(targetProperties);
     validateClockSyncTargetProperties(targetProperties);
     validateSchedulerTargetProperties(targetProperties);
     validateRos2TargetProperties(targetProperties);
     validateKeepalive(targetProperties);
+    validateThreading(targetProperties);
   }
 
   private KeyValuePair getKeyValuePair(KeyValuePairs targetProperties, TargetProperty property) {
@@ -1232,6 +1229,35 @@ private void validateKeepalive(KeyValuePairs targetProperties) {
     }
   }
 
+  private void validateThreading(KeyValuePairs targetProperties) {
+    var threadingP = getKeyValuePair(targetProperties, TargetProperty.THREADING);
+    var tracingP = getKeyValuePair(targetProperties, TargetProperty.TRACING);
+    var platformP = getKeyValuePair(targetProperties, TargetProperty.PLATFORM);
+    if (threadingP != null) {
+      if (tracingP != null) {
+        if (!ASTUtils.toBoolean(threadingP.getValue()) && !tracingP.getValue().toString().equalsIgnoreCase("false")) {
+          error("Cannot disable treading support because tracing is enabled", threadingP, Literals.KEY_VALUE_PAIR__NAME);
+          error("Cannot enable tracing because threading support is disabled", tracingP, Literals.KEY_VALUE_PAIR__NAME);
+        }
+      }
+      if (platformP != null && ASTUtils.toBoolean(threadingP.getValue())) {
+        var lit = ASTUtils.elementToSingleString(platformP.getValue());
+        var dic = platformP.getValue().getKeyvalue();
+        if (lit != null && lit.equalsIgnoreCase(Platform.RP2040.toString())) {
+          error("Platform " + Platform.RP2040 + " does not support threading", platformP, Literals.KEY_VALUE_PAIR__VALUE);
+        }
+        if (dic != null) {
+          var rp = dic.getPairs().stream().filter(
+              kv -> kv.getName().equalsIgnoreCase("name") &&
+                  ASTUtils.elementToSingleString(kv.getValue()).equalsIgnoreCase(Platform.RP2040.toString())).findFirst();
+          if (rp.isPresent()) {
+            error("Platform " + Platform.RP2040 + " does not support threading", rp.get(), Literals.KEY_VALUE_PAIR__VALUE);
+          }
+        }
+      }
+    }
+  }
+
   private void validateRos2TargetProperties(KeyValuePairs targetProperties) {
     KeyValuePair ros2 = getKeyValuePair(targetProperties, TargetProperty.ROS2);
     KeyValuePair ros2Dependencies =
@@ -1656,9 +1682,9 @@ public ValidationMessageAcceptor getMessageAcceptor() {
     return messageAcceptor == null ? this : messageAcceptor;
   }
 
-  /** Return a list of error messages for the target declaration. */
-  public List<String> getTargetPropertyErrors() {
-    return this.targetPropertyErrors;
+  /** Report an error on the value of a target property */
+  public void reportTargetPropertyError(String message) {
+    this.targetPropertyErrors.add(message);
   }
 
   //////////////////////////////////////////////////////////////

From b018184e6ab300ea482d2995e7599ec868e9698e Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 3 Aug 2023 15:40:06 +0200
Subject: [PATCH 0746/1114] Apply formatter

---
 .../main/java/org/lflang/TargetProperty.java  | 15 +++++---
 .../lflang/generator/c/CCmakeGenerator.java   |  8 ++--
 .../org/lflang/validation/LFValidator.java    | 38 ++++++++++++++-----
 3 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 7df857d02f..d494e1d760 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -514,7 +514,7 @@ public enum TargetProperty {
         }
         // If the platform does not support threading, disable it.
         if (!config.platformOptions.platform.isMultiThreaded()) {
-            config.threading = false;
+          config.threading = false;
         }
       }),
 
@@ -1486,7 +1486,8 @@ public interface TargetPropertyType {
      */
     public static void produceError(String name, String description, LFValidator v) {
 
-      v.reportTargetPropertyError("Target property '" + name + "' is required to be " + description + ".");
+      v.reportTargetPropertyError(
+          "Target property '" + name + "' is required to be " + description + ".");
     }
   }
 
@@ -1757,11 +1758,13 @@ public enum Platform {
 
     private boolean multiThreaded = true;
 
-    Platform() { this.cMakeName = this.toString(); }
+    Platform() {
+      this.cMakeName = this.toString();
+    }
 
     Platform(String cMakeName, boolean isMultiThreaded) {
-        this.cMakeName = cMakeName;
-        this.multiThreaded = isMultiThreaded;
+      this.cMakeName = cMakeName;
+      this.multiThreaded = isMultiThreaded;
     }
 
     /** Return the name in lower case. */
@@ -1776,7 +1779,7 @@ public String getcMakeName() {
     }
 
     public boolean isMultiThreaded() {
-        return this.multiThreaded;
+      return this.multiThreaded;
     }
   }
 
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 810fde6350..0ee24fc39a 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -328,10 +328,10 @@ CodeBuilder generateCMakeCode(
 
     if (targetConfig.threading) {
       // If threaded computation is requested, add the threads option.
-        cMakeCode.pr("# Find threads and link to it");
-        cMakeCode.pr("find_package(Threads REQUIRED)");
-        cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE Threads::Threads)");
-        cMakeCode.newLine();
+      cMakeCode.pr("# Find threads and link to it");
+      cMakeCode.pr("find_package(Threads REQUIRED)");
+      cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE Threads::Threads)");
+      cMakeCode.newLine();
       // If the LF program itself is threaded, we need to define NUMBER_OF_WORKERS so that
       // platform-specific C files will contain the appropriate functions
       cMakeCode.pr("# Set the number of workers to enable threading/tracing");
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 487082c85c..7dcf00d107 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -61,7 +61,6 @@
 import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.Platform;
-import org.lflang.TargetProperty.TargetPropertyType;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.serialization.SupportedSerializers;
@@ -121,7 +120,8 @@
 /**
  * Custom validation checks for Lingua Franca programs.
  *
- * <p>Also see: <a href="https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#validation">...</a>
+ * <p>Also see: <a
+ * href="https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#validation">...</a>
  *
  * @author Edward A. Lee
  * @author Marten Lohstroh
@@ -1235,23 +1235,41 @@ private void validateThreading(KeyValuePairs targetProperties) {
     var platformP = getKeyValuePair(targetProperties, TargetProperty.PLATFORM);
     if (threadingP != null) {
       if (tracingP != null) {
-        if (!ASTUtils.toBoolean(threadingP.getValue()) && !tracingP.getValue().toString().equalsIgnoreCase("false")) {
-          error("Cannot disable treading support because tracing is enabled", threadingP, Literals.KEY_VALUE_PAIR__NAME);
-          error("Cannot enable tracing because threading support is disabled", tracingP, Literals.KEY_VALUE_PAIR__NAME);
+        if (!ASTUtils.toBoolean(threadingP.getValue())
+            && !tracingP.getValue().toString().equalsIgnoreCase("false")) {
+          error(
+              "Cannot disable treading support because tracing is enabled",
+              threadingP,
+              Literals.KEY_VALUE_PAIR__NAME);
+          error(
+              "Cannot enable tracing because threading support is disabled",
+              tracingP,
+              Literals.KEY_VALUE_PAIR__NAME);
         }
       }
       if (platformP != null && ASTUtils.toBoolean(threadingP.getValue())) {
         var lit = ASTUtils.elementToSingleString(platformP.getValue());
         var dic = platformP.getValue().getKeyvalue();
         if (lit != null && lit.equalsIgnoreCase(Platform.RP2040.toString())) {
-          error("Platform " + Platform.RP2040 + " does not support threading", platformP, Literals.KEY_VALUE_PAIR__VALUE);
+          error(
+              "Platform " + Platform.RP2040 + " does not support threading",
+              platformP,
+              Literals.KEY_VALUE_PAIR__VALUE);
         }
         if (dic != null) {
-          var rp = dic.getPairs().stream().filter(
-              kv -> kv.getName().equalsIgnoreCase("name") &&
-                  ASTUtils.elementToSingleString(kv.getValue()).equalsIgnoreCase(Platform.RP2040.toString())).findFirst();
+          var rp =
+              dic.getPairs().stream()
+                  .filter(
+                      kv ->
+                          kv.getName().equalsIgnoreCase("name")
+                              && ASTUtils.elementToSingleString(kv.getValue())
+                                  .equalsIgnoreCase(Platform.RP2040.toString()))
+                  .findFirst();
           if (rp.isPresent()) {
-            error("Platform " + Platform.RP2040 + " does not support threading", rp.get(), Literals.KEY_VALUE_PAIR__VALUE);
+            error(
+                "Platform " + Platform.RP2040 + " does not support threading",
+                rp.get(),
+                Literals.KEY_VALUE_PAIR__VALUE);
           }
         }
       }

From 71c4fe2a802b9d90f1933908cd70fd54635c8c22 Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Fri, 4 Aug 2023 10:56:39 +0900
Subject: [PATCH 0747/1114] Apply spotless

---
 .../DistributedCountPhysicalAfterDelay.lf     | 34 +++++------
 .../federated/LoopDistributedCentralized.lf   | 48 ++++++++--------
 .../src/federated/LoopDistributedDouble.lf    | 56 +++++++++----------
 .../src/federated/PingPongDistributed.lf      | 42 +++++++-------
 .../federated/PingPongDistributedPhysical.lf  | 38 ++++++-------
 .../src/federated/SpuriousDependency.lf       |  9 +--
 6 files changed, 110 insertions(+), 117 deletions(-)
 rename test/TypeScript/src/federated/{failing => }/DistributedCountPhysicalAfterDelay.lf (50%)

diff --git a/test/TypeScript/src/federated/failing/DistributedCountPhysicalAfterDelay.lf b/test/TypeScript/src/federated/DistributedCountPhysicalAfterDelay.lf
similarity index 50%
rename from test/TypeScript/src/federated/failing/DistributedCountPhysicalAfterDelay.lf
rename to test/TypeScript/src/federated/DistributedCountPhysicalAfterDelay.lf
index 0ea0befda7..c6ab1190de 100644
--- a/test/TypeScript/src/federated/failing/DistributedCountPhysicalAfterDelay.lf
+++ b/test/TypeScript/src/federated/DistributedCountPhysicalAfterDelay.lf
@@ -19,30 +19,30 @@ reactor Print {
   state c: number = 1
 
   reaction(inp) {=
-  const elapsedTime = util.getElapsedLogicalTime();
-  console.log(`At time ${elapsedTime}, received ${inp}`);
-  if (inp !== c) {
-    util.requestErrorStop(`ERROR: Expected to receive ${c}.`);
-  }
-  if (!elapsedTime.isLaterThan(TimeValue.msec(600))) {
-    util.requestErrorStop(`ERROR: Expected received time to be strictly greater than ${TimeValue.msec(600)}`);
-  }
-  c++;
-  console.log(`c = ${c}`);
-  util.requestStop();
+    const elapsedTime = util.getElapsedLogicalTime();
+    console.log(`At time ${elapsedTime}, received ${inp}`);
+    if (inp !== c) {
+      util.requestErrorStop(`ERROR: Expected to receive ${c}.`);
+    }
+    if (!elapsedTime.isLaterThan(TimeValue.msec(600))) {
+      util.requestErrorStop(`ERROR: Expected received time to be strictly greater than ${TimeValue.msec(600)}`);
+    }
+    c++;
+    console.log(`c = ${c}`);
+    util.requestStop();
   =}
 
   reaction(shutdown) {=
-  if (c !== 2) {
-    util.requestErrorStop(`ERROR: Expected to receive 1 item. Received ${c - 1}.`);
-  } else {
-    console.log("SUCCESS: Successfully received 1 item.");
-  }
+    if (c !== 2) {
+      util.requestErrorStop(`ERROR: Expected to receive 1 item. Received ${c - 1}.`);
+    } else {
+      console.log("SUCCESS: Successfully received 1 item.");
+    }
   =}
 }
 
 federated reactor at localhost {
-  c = new Count(offset = 200 msec, period = 0)
+  c = new Count(offset = 200 msec, period=0)
   p = new Print()
   c.out ~> p.inp after 400 msec  // Indicating a 'physical' connection with a 400 msec after delay.
 }
diff --git a/test/TypeScript/src/federated/LoopDistributedCentralized.lf b/test/TypeScript/src/federated/LoopDistributedCentralized.lf
index aebc87d619..15dafae904 100644
--- a/test/TypeScript/src/federated/LoopDistributedCentralized.lf
+++ b/test/TypeScript/src/federated/LoopDistributedCentralized.lf
@@ -15,50 +15,50 @@ reactor Looper(incr: number = 1, delay: time = 0 msec) {
   state count: number = 0
 
   preamble {=
-  let stop = false;
-  // Function to trigger an action once every second.
-  function ping(act: any) {
-    if (!stop) {
-    console.log("Scheduling action.");
-    act.schedule(0, null);
-    setTimeout(ping, 1000, act);
+    let stop = false;
+    // Function to trigger an action once every second.
+    function ping(act: any) {
+      if (!stop) {
+      console.log("Scheduling action.");
+      act.schedule(0, null);
+      setTimeout(ping, 1000, act);
+      }
     }
-  }
   =}
 
   reaction(startup) -> a {=
-  // Start the ping function for triggering an action every second.
-  console.log("Starting ping function.");
-  ping(actions.a);
+    // Start the ping function for triggering an action every second.
+    console.log("Starting ping function.");
+    ping(actions.a);
   =}
 
   reaction(a) -> out {=
-  out = count;
-  count += incr;
+    out = count;
+    count += incr;
   =}
 
   reaction(inp) {=
-  let logical = util.getCurrentLogicalTime();
-  let physical = util.getCurrentPhysicalTime();
+    let logical = util.getCurrentLogicalTime();
+    let physical = util.getCurrentPhysicalTime();
 
-  let time_lag = physical.subtract(logical);
+    let time_lag = physical.subtract(logical);
 
-  console.log("Received " + inp + ". Logical time is behind physical time by " + time_lag + ".");
+    console.log("Received " + inp + ". Logical time is behind physical time by " + time_lag + ".");
   =}
 
   reaction(shutdown) {=
-  console.log("******* Shutdown invoked.");
-  // Stop the ping function that is scheduling actions.
-  stop = true;
-  if (count != 5 * incr) {
-    util.requestErrorStop("Failed to receive all five expected inputs.");
-  }
+    console.log("******* Shutdown invoked.");
+    // Stop the ping function that is scheduling actions.
+    stop = true;
+    if (count != 5 * incr) {
+      util.requestErrorStop("Failed to receive all five expected inputs.");
+    }
   =}
 }
 
 federated reactor LoopDistributedCentralized(delay: time = 0) {
   left = new Looper()
-  right = new Looper(incr = -1)
+  right = new Looper(incr=-1)
   left.out -> right.inp
   right.out -> left.inp
 }
diff --git a/test/TypeScript/src/federated/LoopDistributedDouble.lf b/test/TypeScript/src/federated/LoopDistributedDouble.lf
index 081c070048..f6b5b39d50 100644
--- a/test/TypeScript/src/federated/LoopDistributedDouble.lf
+++ b/test/TypeScript/src/federated/LoopDistributedDouble.lf
@@ -8,7 +8,7 @@ target TypeScript {
   timeout: 5 sec,
   keepAlive: true,
   coordination-options: {
-  advance-message-interval: 100 msec
+    advance-message-interval: 100 msec
   }
 }
 
@@ -22,57 +22,57 @@ reactor Looper(incr: number = 1, delay: time = 0 msec) {
   timer t(0, 1 sec)
 
   preamble {=
-  let stop = false;
-  // Function to trigger an action once every second.
-  function ping(act: any) {
-    if (!stop) {
-    console.log("Scheduling action.");
-    act.schedule(0, null);
-    setTimeout(ping, 1000, act);
+    let stop = false;
+    // Function to trigger an action once every second.
+    function ping(act: any) {
+      if (!stop) {
+      console.log("Scheduling action.");
+      act.schedule(0, null);
+      setTimeout(ping, 1000, act);
+      }
     }
-  }
   =}
 
   reaction(startup) -> a {=
-  // Start the ping function for triggering an action every second.
-  console.log("Starting ping function.");
-  ping(actions.a);
+    // Start the ping function for triggering an action every second.
+    console.log("Starting ping function.");
+    ping(actions.a);
   =}
 
   reaction(a) -> out, out2 {=
-  if (count % 2 == 0) {
-    out = count;
-  } else {
-    out2 = count;
-  }
-  count += incr;
+    if (count % 2 == 0) {
+      out = count;
+    } else {
+      out2 = count;
+    }
+    count += incr;
   =}
 
   reaction(inp) {=
-  console.log("Received " + inp + " on inp at logical time " + util.getElapsedLogicalTime() + ".");
+    console.log("Received " + inp + " on inp at logical time " + util.getElapsedLogicalTime() + ".");
   =}
 
   reaction(inp2) {=
-  console.log("Received " + inp2 + " on inp2 at logical time " + util.getElapsedLogicalTime() + ".");
+    console.log("Received " + inp2 + " on inp2 at logical time " + util.getElapsedLogicalTime() + ".");
   =}
 
   reaction(t) {=
-  console.log("Timer triggered at logical time " + util.getElapsedLogicalTime() + ".");
+    console.log("Timer triggered at logical time " + util.getElapsedLogicalTime() + ".");
   =}
 
   reaction(shutdown) {=
-  console.log("******* Shutdown invoked.");
-  // Stop the ping function that is scheduling actions.
-  stop = true;
-  if (count != 5 * incr) {
-    util.requestErrorStop("Failed to receive all five expected inputs.");
-  }
+    console.log("******* Shutdown invoked.");
+    // Stop the ping function that is scheduling actions.
+    stop = true;
+    if (count != 5 * incr) {
+      util.requestErrorStop("Failed to receive all five expected inputs.");
+    }
   =}
 }
 
 federated reactor(delay: time = 0) {
   left = new Looper()
-  right = new Looper(incr = -1)
+  right = new Looper(incr=-1)
   left.out -> right.inp
   right.out -> left.inp
   right.out2 -> left.inp2
diff --git a/test/TypeScript/src/federated/PingPongDistributed.lf b/test/TypeScript/src/federated/PingPongDistributed.lf
index 42cceae73c..e189bd44e0 100644
--- a/test/TypeScript/src/federated/PingPongDistributed.lf
+++ b/test/TypeScript/src/federated/PingPongDistributed.lf
@@ -8,18 +8,18 @@ reactor Ping(count: number = 10) {
   logical action serve
 
   reaction(startup, serve) -> send {=
-  console.log(`At logical time ${util.getElapsedLogicalTime()}, Ping sending ${pingsLeft}`);
-  send = pingsLeft;
-  pingsLeft = pingsLeft - 1;
+    console.log(`At logical time ${util.getElapsedLogicalTime()}, Ping sending ${pingsLeft}`);
+    send = pingsLeft;
+    pingsLeft = pingsLeft - 1;
   =}
 
   reaction(receive) -> serve {=
-  if (pingsLeft > 0){
-    actions.serve.schedule(0, null);
-  }
-  else{
-    util.requestStop();
-  }
+    if (pingsLeft > 0){
+      actions.serve.schedule(0, null);
+    }
+    else{
+      util.requestStop();
+    }
   =}
 }
 
@@ -29,25 +29,25 @@ reactor Pong(expected: number = 10) {
   state count: number = 0
 
   reaction(receive) -> send {=
-  count += 1;
-  console.log(`At logical time ${util.getElapsedLogicalTime()}, Pong received ${receive}`)
-  send = receive;
-  if (count == expected){
-    util.requestStop();
-  }
+    count += 1;
+    console.log(`At logical time ${util.getElapsedLogicalTime()}, Pong received ${receive}`)
+    send = receive;
+    if (count == expected){
+      util.requestStop();
+    }
   =}
 
   reaction(shutdown) {=
-  if (count != expected){
-    util.requestErrorStop(`Pong expected to receive ${expected} inputs, but it received ${count}`);
-  }
-  console.log(`Pong received ${count} pings.`);
+    if (count != expected){
+      util.requestErrorStop(`Pong expected to receive ${expected} inputs, but it received ${count}`);
+    }
+    console.log(`Pong received ${count} pings.`);
   =}
 }
 
 federated reactor PingPongDistributed(count: number = 10) {
-  ping = new Ping(count = count)
-  pong = new Pong(expected = count)
+  ping = new Ping(count=count)
+  pong = new Pong(expected=count)
   ping.send -> pong.receive
   pong.send -> ping.receive
 }
diff --git a/test/TypeScript/src/federated/PingPongDistributedPhysical.lf b/test/TypeScript/src/federated/PingPongDistributedPhysical.lf
index 298a7298d4..ef773e2446 100644
--- a/test/TypeScript/src/federated/PingPongDistributedPhysical.lf
+++ b/test/TypeScript/src/federated/PingPongDistributedPhysical.lf
@@ -32,16 +32,16 @@ reactor Ping(count: number = 10) {
   logical action serve
 
   reaction(startup, serve) -> send {=
-  console.log(`At logical time ${util.getElapsedLogicalTime()}, Ping sending ${pingsLeft}.`);
-  send = pingsLeft--;
+    console.log(`At logical time ${util.getElapsedLogicalTime()}, Ping sending ${pingsLeft}.`);
+    send = pingsLeft--;
   =}
 
   reaction(receive) -> serve {=
-  if (pingsLeft > 0) {
-    actions.serve.schedule(0, null);
-  } else {
-    util.requestStop();
-  }
+    if (pingsLeft > 0) {
+      actions.serve.schedule(0, null);
+    } else {
+      util.requestStop();
+    }
   =}
 }
 
@@ -51,25 +51,25 @@ reactor Pong(expected: number = 10) {
   state count: number = 0
 
   reaction(receive) -> send {=
-  count++;
-  console.log(`At logical time ${util.getElapsedLogicalTime()}, Pong receivedd ${receive}.`);
-  send = receive;
-  if (count === expected) {
-    util.requestStop();
-  }
+    count++;
+    console.log(`At logical time ${util.getElapsedLogicalTime()}, Pong receivedd ${receive}.`);
+    send = receive;
+    if (count === expected) {
+      util.requestStop();
+    }
   =}
 
   reaction(shutdown) {=
-  if (count !== expected) {
-    util.requestErrorStop(`Pong expected to received ${expected} inputs, but it received ${count}.`);
-  }
-  console.log(`Pong received ${count} pings.`);
+    if (count !== expected) {
+      util.requestErrorStop(`Pong expected to received ${expected} inputs, but it received ${count}.`);
+    }
+    console.log(`Pong received ${count} pings.`);
   =}
 }
 
 federated reactor(count: number = 10) {
-  ping = new Ping(count = count)
-  pong = new Pong(expected = count)
+  ping = new Ping(count=count)
+  pong = new Pong(expected=count)
   ping.send ~> pong.receive
   pong.send ~> ping.receive
 }
diff --git a/test/TypeScript/src/federated/SpuriousDependency.lf b/test/TypeScript/src/federated/SpuriousDependency.lf
index dc16319a70..39da8f0ea5 100644
--- a/test/TypeScript/src/federated/SpuriousDependency.lf
+++ b/test/TypeScript/src/federated/SpuriousDependency.lf
@@ -1,8 +1,7 @@
 /**
  * This checks that a federated program does not deadlock when it is ambiguous, given the structure
  * of a federate, whether it is permissible to require certain network sender/receiver reactions to
- * precede others inp the execution of a given tag. The version of LFC that was inp the master branch
- * on 4/15/2023 resolved the ambiguity inp a way that does appear to result inp deadlock.
+ * precede others in the execution of a given tag.
  */
 target TypeScript {
   timeout: 1 sec
@@ -13,9 +12,7 @@ reactor Passthrough(id: number = 0) {
   output out: number
 
   reaction(inp) -> out {=
-    //lf_print("Hello from passthrough %d", self->id);
     console.log("Hello from passthrough " + id);
-    //lf_set(out, inp->value);
     out = inp;
   =}
 }
@@ -41,11 +38,7 @@ reactor Check {
   reaction(inp) {= console.log("count is now " + ++count); =}
 
   reaction(shutdown) {=
-    // lf_print("******* Shutdown invoked.");
     console.log("******* Shutdown invoked.");
-    // if (self->count != 1) {
-    //   lf_print_error_and_exit("Failed to receive expected input.");
-    // }
     if (count != 1) {
       util.reportError("Failed to receieve expected input.");
     }

From 021166557349e38776a91bcfc53a57d7d961b361 Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Fri, 4 Aug 2023 11:19:24 +0900
Subject: [PATCH 0748/1114] Increment the port ID to match messages properly

---
 .../kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt    | 2 +-
 .../src/federated/DistributedCountPhysicalAfterDelay.lf      | 5 +----
 test/TypeScript/src/federated/LoopDistributedDouble.lf       | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
index 2911503159..3e01cdccbd 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSInstanceGenerator.kt
@@ -78,7 +78,7 @@ class TSInstanceGenerator(
                     // Assume that network receiver reactors are sorted by portID
                     childReactorInstantiations.add(
                         "this.registerNetworkReceiver(\n"
-                        + "\t${portID},\n"
+                        + "\t${portID++},\n"
                         + "\tthis.${childReactor.name} as __NetworkReceiver<unknown>\n)")
                 }
                 if (isNetworkSender) {
diff --git a/test/TypeScript/src/federated/DistributedCountPhysicalAfterDelay.lf b/test/TypeScript/src/federated/DistributedCountPhysicalAfterDelay.lf
index c6ab1190de..107cd847cb 100644
--- a/test/TypeScript/src/federated/DistributedCountPhysicalAfterDelay.lf
+++ b/test/TypeScript/src/federated/DistributedCountPhysicalAfterDelay.lf
@@ -7,10 +7,7 @@
  * @author Soroush Bateni
  * @author Byeong-gil Jun
  */
-target TypeScript {
-  logging: debug,
-  keepalive: true
-}
+target TypeScript
 
 import Count from "../lib/Count.lf"
 
diff --git a/test/TypeScript/src/federated/LoopDistributedDouble.lf b/test/TypeScript/src/federated/LoopDistributedDouble.lf
index f6b5b39d50..0facc3c6dc 100644
--- a/test/TypeScript/src/federated/LoopDistributedDouble.lf
+++ b/test/TypeScript/src/federated/LoopDistributedDouble.lf
@@ -6,7 +6,6 @@
  */
 target TypeScript {
   timeout: 5 sec,
-  keepAlive: true,
   coordination-options: {
     advance-message-interval: 100 msec
   }

From e5ed19d75d5b1ff538e0583058472c338450d4d9 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 4 Aug 2023 11:11:24 -0700
Subject: [PATCH 0749/1114] Fix IllegalArgumentException in diagram synthesis.

This is a runtime type error -- this is my bad, as such things should not
happen in well written Java code. This commit modifies FormattingUtil
to make it slightly more type-safe. It also changes the diagram
synthesis to bypass the regular formatting logic -- the formatting logic
seems more heavyweight than necessary since in diagrams we should not
usually have to worry about how to represent comments and where to break
lines (comment representation is the reason why the target was needed by
the FormattingUtil.render function).
---
 cli/lff/src/main/java/org/lflang/cli/Lff.java               | 3 ++-
 core/src/main/java/org/lflang/ast/FormattingUtil.java       | 4 ++--
 .../org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java | 6 +++---
 core/src/main/java/org/lflang/formatting2/LFFormatter.java  | 3 ++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/cli/lff/src/main/java/org/lflang/cli/Lff.java b/cli/lff/src/main/java/org/lflang/cli/Lff.java
index fa534b15d0..cabf5f1515 100644
--- a/cli/lff/src/main/java/org/lflang/cli/Lff.java
+++ b/cli/lff/src/main/java/org/lflang/cli/Lff.java
@@ -12,6 +12,7 @@
 import org.lflang.ast.FormattingUtil;
 import org.lflang.ast.IsEqual;
 import org.lflang.ast.LfParsingHelper;
+import org.lflang.lf.Model;
 import org.lflang.util.FileUtil;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
@@ -175,7 +176,7 @@ private void formatSingleFile(Path path, Path inputRoot, Path outputRoot) {
     }
 
     final String formattedFileContents =
-        FormattingUtil.render(resource.getContents().get(0), lineLength);
+        FormattingUtil.render((Model) resource.getContents().get(0), lineLength);
     if (!new IsEqual(resource.getContents().get(0))
         .doSwitch(
             new LfParsingHelper()
diff --git a/core/src/main/java/org/lflang/ast/FormattingUtil.java b/core/src/main/java/org/lflang/ast/FormattingUtil.java
index 27b19dabb2..19754b5f10 100644
--- a/core/src/main/java/org/lflang/ast/FormattingUtil.java
+++ b/core/src/main/java/org/lflang/ast/FormattingUtil.java
@@ -42,7 +42,7 @@ public class FormattingUtil {
   static final long BADNESS_PER_NEWLINE = 1;
 
   /** Return a String representation of {@code object}, with lines wrapped at {@code lineLength}. */
-  public static String render(EObject object, int lineLength) {
+  public static String render(Model object, int lineLength) {
     return render(object, lineLength, inferTarget(object), false);
   }
 
@@ -89,7 +89,7 @@ private static Target inferTarget(EObject object) {
   }
 
   /** Return a String representation of {@code object} using a reasonable default line length. */
-  public static String render(EObject object) {
+  public static String render(Model object) {
     return render(object, DEFAULT_LINE_LENGTH);
   }
 
diff --git a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index 272b483607..7aaa6482b9 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -98,7 +98,7 @@
 import org.lflang.AttributeUtils;
 import org.lflang.InferredType;
 import org.lflang.ast.ASTUtils;
-import org.lflang.ast.FormattingUtil;
+import org.lflang.ast.ToLf;
 import org.lflang.diagram.synthesis.action.CollapseAllReactorsAction;
 import org.lflang.diagram.synthesis.action.ExpandAllReactorsAction;
 import org.lflang.diagram.synthesis.action.FilterCycleAction;
@@ -1481,7 +1481,7 @@ private String createParameterLabel(ParameterInstance param) {
     if (param.getOverride() != null) {
       b.append(" = ");
       var init = param.getActualValue();
-      b.append(FormattingUtil.render(init));
+      b.append(ToLf.instance.doSwitch(init));
     }
     return b.toString();
   }
@@ -1512,7 +1512,7 @@ private String createStateVariableLabel(StateVar variable) {
       b.append(":").append(t.toOriginalText());
     }
     if (variable.getInit() != null) {
-      b.append(FormattingUtil.render(variable.getInit()));
+      b.append(ToLf.instance.doSwitch(variable.getInit()));
     }
     return b.toString();
   }
diff --git a/core/src/main/java/org/lflang/formatting2/LFFormatter.java b/core/src/main/java/org/lflang/formatting2/LFFormatter.java
index e2ea020af1..fb95140fa1 100644
--- a/core/src/main/java/org/lflang/formatting2/LFFormatter.java
+++ b/core/src/main/java/org/lflang/formatting2/LFFormatter.java
@@ -17,6 +17,7 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.lflang.ast.FormattingUtil;
+import org.lflang.lf.Model;
 
 public class LFFormatter implements IFormatter2 {
 
@@ -40,6 +41,6 @@ public List<ITextReplacement> format(FormatterRequest request) {
             request.getTextRegionAccess(),
             documentRegion.getOffset(),
             documentRegion.getLength(),
-            FormattingUtil.render(documentContents.get(0))));
+            FormattingUtil.render((Model) documentContents.get(0))));
   }
 }

From 736abe7cf79d1142c815cca9f7e70e2664b3ef69 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 8 Aug 2023 18:08:15 +0200
Subject: [PATCH 0750/1114] support named reactions

---
 core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt | 2 +-
 .../kotlin/org/lflang/generator/cpp/CppReactionGenerator.kt    | 3 +--
 .../kotlin/org/lflang/generator/cpp/CppReactorGenerator.kt     | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt
index 9c37bcd8ab..e9e3f9fd8a 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt
@@ -47,7 +47,7 @@ import org.lflang.lf.WidthSpec
 
 /** Get the "name" a reaction is represented with in target code.*/
 val Reaction.codeName
-    get(): String = "r$indexInContainer"
+    get(): String = name ?: "r$indexInContainer"
 
 /* **********************************************************************************************
  * C++ specific extensions shared across classes
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppReactionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppReactionGenerator.kt
index 7d4dbdb13f..1b894378f3 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppReactionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppReactionGenerator.kt
@@ -45,8 +45,7 @@ import org.lflang.toText
 /** A C++ code generator for reactions and their function bodies */
 class CppReactionGenerator(
     private val reactor: Reactor,
-    private val portGenerator: CppPortGenerator,
-    private val instanceGenerator: CppInstanceGenerator
+    private val portGenerator: CppPortGenerator
 ) {
 
     private val reactionsWithDeadlines = reactor.reactions.filter { it.deadline != null }
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppReactorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppReactorGenerator.kt
index af65a4a790..a7d8f0e4ae 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppReactorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppReactorGenerator.kt
@@ -54,7 +54,7 @@ class CppReactorGenerator(private val reactor: Reactor, fileConfig: CppFileConfi
     private val timers = CppTimerGenerator(reactor)
     private val actions = CppActionGenerator(reactor, messageReporter)
     private val ports = CppPortGenerator(reactor)
-    private val reactions = CppReactionGenerator(reactor, ports, instances)
+    private val reactions = CppReactionGenerator(reactor, ports)
     private val assemble = CppAssembleMethodGenerator(reactor)
 
     private fun publicPreamble() =

From 250e3abe330ae69131ece423dbb24363b5f7b73f Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 8 Aug 2023 18:44:02 +0200
Subject: [PATCH 0751/1114] enable bodyless reactions in C++

---
 core/src/main/java/org/lflang/Target.java                  | 2 +-
 .../org/lflang/generator/cpp/CppReactionGenerator.kt       | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/Target.java b/core/src/main/java/org/lflang/Target.java
index f95f991875..096788484e 100644
--- a/core/src/main/java/org/lflang/Target.java
+++ b/core/src/main/java/org/lflang/Target.java
@@ -494,7 +494,7 @@ public boolean supportsParameterizedWidths() {
    * this target.
    */
   public boolean supportsReactionDeclarations() {
-    if (this.equals(Target.C)) return true;
+    if (this.equals(Target.C) || this.equals(Target.CPP)) return true;
     else return false;
   }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppReactionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppReactionGenerator.kt
index 1b894378f3..489dd8c2ae 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppReactionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppReactionGenerator.kt
@@ -148,8 +148,9 @@ class CppReactionGenerator(
         }
     }
 
-    private fun generateBodyDefinition(reaction: Reaction): String {
-        return with(PrependOperator) {
+    private fun generateBodyDefinition(reaction: Reaction): String? {
+        return if (reaction.code == null) null
+        else with(PrependOperator) {
             """
                 |// reaction ${reaction.label}
                 |${reactor.templateLine}
@@ -252,7 +253,7 @@ class CppReactionGenerator(
 
     /** Get all definitions of reaction bodies. */
     fun generateBodyDefinitions() =
-        reactor.reactions.joinToString(separator = "\n", postfix = "\n") { generateBodyDefinition(it) }
+        reactor.reactions.mapNotNull { generateBodyDefinition(it) }.joinToString(separator = "\n", postfix = "\n")
 
     /** Get all declarations of deadline handlers. */
     fun generateDeadlineHandlerDeclarations(): String =

From fac6624f84448fc6021684eab3fa8b08c4585cea Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 8 Aug 2023 18:44:15 +0200
Subject: [PATCH 0752/1114] add testcase

---
 test/Cpp/src/HelloBodylessWorld.lf      | 7 +++++++
 test/Cpp/src/hello_bodyless_world.cc    | 5 +++++
 test/Cpp/src/hello_bodyless_world.cmake | 3 +++
 3 files changed, 15 insertions(+)
 create mode 100644 test/Cpp/src/HelloBodylessWorld.lf
 create mode 100644 test/Cpp/src/hello_bodyless_world.cc
 create mode 100644 test/Cpp/src/hello_bodyless_world.cmake

diff --git a/test/Cpp/src/HelloBodylessWorld.lf b/test/Cpp/src/HelloBodylessWorld.lf
new file mode 100644
index 0000000000..3825e1077f
--- /dev/null
+++ b/test/Cpp/src/HelloBodylessWorld.lf
@@ -0,0 +1,7 @@
+target Cpp {
+  cmake-include: hello_bodyless_world.cmake
+}
+
+main reactor {
+  reaction hello(startup)
+}
diff --git a/test/Cpp/src/hello_bodyless_world.cc b/test/Cpp/src/hello_bodyless_world.cc
new file mode 100644
index 0000000000..782aeefc53
--- /dev/null
+++ b/test/Cpp/src/hello_bodyless_world.cc
@@ -0,0 +1,5 @@
+#include "HelloBodylessWorld/HelloBodylessWorld.hh"
+
+void HelloBodylessWorld::Inner::hello_body([[maybe_unused]] const reactor::StartupTrigger& startup) {
+  std::cout << "Hello World." << std::endl;
+}
diff --git a/test/Cpp/src/hello_bodyless_world.cmake b/test/Cpp/src/hello_bodyless_world.cmake
new file mode 100644
index 0000000000..09e0a5cf3f
--- /dev/null
+++ b/test/Cpp/src/hello_bodyless_world.cmake
@@ -0,0 +1,3 @@
+target_sources(${LF_MAIN_TARGET} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/hello_bodyless_world.cc)
+
+

From 6f7e8140f9f55cfd461dc7b743163181488f1439 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 8 Aug 2023 18:57:06 +0200
Subject: [PATCH 0753/1114] also base the reaction name (string) on the name in
 LF code

---
 core/src/main/kotlin/org/lflang/ast/AstExtensions.kt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/ast/AstExtensions.kt b/core/src/main/kotlin/org/lflang/ast/AstExtensions.kt
index 26678a2273..1f4f99a2c4 100644
--- a/core/src/main/kotlin/org/lflang/ast/AstExtensions.kt
+++ b/core/src/main/kotlin/org/lflang/ast/AstExtensions.kt
@@ -263,10 +263,11 @@ val Resource.model: Model get() = this.allContents.asSequence().filterIsInstance
 
 /** Get a label representing the receiving reaction.
  *
- * If the reaction is annotated with a label, then the label is returned. Otherwise, a reaction name
- * is generated based on its priority.
+ * If the reaction is named, then the name is returned.
+ * If it is not named but annotated with a label, then the label is returned.
+ * Otherwise, a reaction name is generated based on its priority.
  */
-val Reaction.label get(): String = AttributeUtils.getLabel(this) ?: "reaction_$priority"
+val Reaction.label get(): String = name ?: AttributeUtils.getLabel(this) ?: "reaction_$priority"
 
 /** Get the priority of a receiving reaction */
 val Reaction.priority

From bf01321831341136e4ae033ef63df7e4abf88d23 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 8 Aug 2023 11:28:22 -0700
Subject: [PATCH 0754/1114] Update submodule.

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index ccf230f3d1..809c454db0 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit ccf230f3d1027ee39987066b9e1f3211560e9f6e
+Subproject commit 809c454db07c1b5e03a789a4863137107b817da6

From c24d4c09a0e98c398b46944c782a7973d5a5d454 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 11 Aug 2023 12:04:19 -0700
Subject: [PATCH 0755/1114] Record execution times.

This is in response to a timeout. I would like to get an idea of the
range of normal variability in the execution times of these tests in GH
actions. If a test fails with a timeout but finishes quickly when
re-run, then that is an indication that the timeout might be a real
deadlock.
---
 .../java/org/lflang/tests/LFTest.java          | 18 +++++++++++++++++-
 .../java/org/lflang/tests/TestBase.java        | 16 ++++++++++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/LFTest.java b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
index 9430f80bd5..ee67dcbb96 100644
--- a/core/src/testFixtures/java/org/lflang/tests/LFTest.java
+++ b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
@@ -47,6 +47,8 @@ public class LFTest implements Comparable<LFTest> {
   /** The target of the test program. */
   private final Target target;
 
+  private long executionTimeNanoseconds;
+
   /**
    * Create a new test.
    *
@@ -143,7 +145,10 @@ public void reportErrors() {
     if (this.hasFailed()) {
       System.out.println(
           "+---------------------------------------------------------------------------+");
-      System.out.println("Failed: " + this);
+      System.out.println(
+          "Failed: "
+              + this
+              + String.format(" in %.2f seconds\n", getExecutionTimeNanoseconds() / 1.0e9));
       System.out.println(
           "-----------------------------------------------------------------------------");
       System.out.println("Reason: " + this.result.message);
@@ -295,4 +300,15 @@ public Thread recordStdOut(Process process) {
   public Thread recordStdErr(Process process) {
     return execLog.recordStdErr(process);
   }
+
+  /** Record the execution time of this test in nanoseconds. */
+  public void setExecutionTimeNanoseconds(long time) {
+    assert executionTimeNanoseconds == 0; // it should only be set once
+    executionTimeNanoseconds = time;
+  }
+
+  /** Return the execution time of this test in nanoseconds. */
+  public long getExecutionTimeNanoseconds() {
+    return executionTimeNanoseconds;
+  }
 }
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index 401c7e93d5..5e345e5e8e 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -358,14 +358,20 @@ protected static void printTestHeader(Target target, String description) {
    * @param tests The tests to inspect the results of.
    */
   private static void checkAndReportFailures(Set<LFTest> tests) {
-    var passed = tests.stream().filter(it -> it.hasPassed()).collect(Collectors.toList());
+    var passed = tests.stream().filter(LFTest::hasPassed).toList();
     var s = new StringBuffer();
     s.append(THIN_LINE);
-    s.append("Passing: " + passed.size() + "/" + tests.size() + "\n");
+    s.append("Passing: ").append(passed.size()).append("/").append(tests.size()).append("\n");
     s.append(THIN_LINE);
-    passed.forEach(test -> s.append("Passed: ").append(test).append("\n"));
+    passed.forEach(
+        test ->
+            s.append("Passed: ")
+                .append(test)
+                .append(
+                    String.format(
+                        " in %.2f seconds\n", test.getExecutionTimeNanoseconds() / 1.0e9)));
     s.append(THIN_LINE);
-    System.out.print(s.toString());
+    System.out.print(s);
 
     for (var test : tests) {
       test.reportErrors();
@@ -516,7 +522,9 @@ private void execute(LFTest test) throws TestError {
 
       stderr.start();
       stdout.start();
+      long t0 = System.nanoTime();
       var timeout = !p.waitFor(MAX_EXECUTION_TIME_SECONDS, TimeUnit.SECONDS);
+      test.setExecutionTimeNanoseconds(System.nanoTime() - t0);
       stdout.interrupt();
       stderr.interrupt();
       if (timeout) {

From 9f8d959a29d364d4cdfab8f5f4dd53c430895ada Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 14 Aug 2023 11:52:52 -0700
Subject: [PATCH 0756/1114] Revert accidental change to the test timeout.

---
 core/src/testFixtures/java/org/lflang/tests/TestBase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index 5e345e5e8e..9fb8b93dc0 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -74,7 +74,7 @@ public abstract class TestBase extends LfInjectedTestBase {
   private static final PrintStream err = System.err;
 
   /** Execution timeout enforced for all tests. */
-  private static final long MAX_EXECUTION_TIME_SECONDS = 20;
+  private static final long MAX_EXECUTION_TIME_SECONDS = 300;
 
   /** Content separator used in test output, 78 characters wide. */
   public static final String THIN_LINE =

From 5ad4321114c2878c2a767eb940da8fb642929244 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Tue, 15 Aug 2023 18:12:53 +0200
Subject: [PATCH 0757/1114] Remove tracing related utils

---
 util/tracing/.gitignore                    |   2 -
 util/tracing/README.md                     |  26 --
 util/tracing/influxdb.h                    | 447 --------------------
 util/tracing/makefile                      |  35 --
 util/tracing/trace_to_chrome.c             | 452 ---------------------
 util/tracing/trace_to_csv.c                | 436 --------------------
 util/tracing/trace_to_influxdb.c           | 281 -------------
 util/tracing/trace_util.c                  | 295 --------------
 util/tracing/trace_util.h                  | 134 ------
 util/tracing/visualization/.gitignore      |   1 -
 util/tracing/visualization/README.md       |  35 --
 util/tracing/visualization/fedsd.py        | 331 ---------------
 util/tracing/visualization/fedsd_helper.py | 255 ------------
 13 files changed, 2730 deletions(-)
 delete mode 100644 util/tracing/.gitignore
 delete mode 100644 util/tracing/README.md
 delete mode 100644 util/tracing/influxdb.h
 delete mode 100644 util/tracing/makefile
 delete mode 100644 util/tracing/trace_to_chrome.c
 delete mode 100644 util/tracing/trace_to_csv.c
 delete mode 100644 util/tracing/trace_to_influxdb.c
 delete mode 100644 util/tracing/trace_util.c
 delete mode 100644 util/tracing/trace_util.h
 delete mode 100644 util/tracing/visualization/.gitignore
 delete mode 100644 util/tracing/visualization/README.md
 delete mode 100644 util/tracing/visualization/fedsd.py
 delete mode 100644 util/tracing/visualization/fedsd_helper.py

diff --git a/util/tracing/.gitignore b/util/tracing/.gitignore
deleted file mode 100644
index 5fe4f5283d..0000000000
--- a/util/tracing/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.o
-trace_to_csv
diff --git a/util/tracing/README.md b/util/tracing/README.md
deleted file mode 100644
index 2e6f0cee4a..0000000000
--- a/util/tracing/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-## util/tracing
-
-This directory contains the source code for utilities that are standalone executables
-for post-processing tracing data created by the tracing function in Lingua Franca.
-
-Utilities for visualizing the data are contained in the [visualization](visualization/README.md)
-directory.
-
-* trace\_to\_csv: Creates a comma-separated values text file from a binary trace file.
-  The resulting file is suitable for analyzing in spreadsheet programs such as Excel.
-
-* trace\_to\_chrome: Creates a JSON file suitable for importing into Chrome's trace
-  visualizer. Point Chrome to chrome://tracing/ and load the resulting file.
-
-* trace\_to\_influxdb: A preliminary implementation that takes a binary trace file
-  and uploads its data into [InfluxDB](https://en.wikipedia.org/wiki/InfluxDB).
-
-* fedsd: A utility that converts trace files from a federate into sequence diagrams
-  showing the interactions between federates and the RTI.
-
-## Installing
-
-```
-    make install
-```
-This puts the executables in lingua-franca/bin.
diff --git a/util/tracing/influxdb.h b/util/tracing/influxdb.h
deleted file mode 100644
index 5d423d6332..0000000000
--- a/util/tracing/influxdb.h
+++ /dev/null
@@ -1,447 +0,0 @@
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/uio.h>
-#include <netdb.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <curl/curl.h>
-
-/*
-  Usage:
-    send_udp/post_http(c,
-            INFLUX_MEAS("foo"),
-            INFLUX_TAG("k", "v"), INFLUX_TAG("k2", "v2"),
-            INFLUX_F_STR("s", "string"), INFLUX_F_FLT("f", 28.39, 2),
-
-            INFLUX_MEAS("bar"),
-            INFLUX_F_INT("i", 1048576), INFLUX_F_BOL("b", 1),
-            INFLUX_TS(1512722735522840439),
-
-            INFLUX_END);
-
-  **NOTICE**: For best performance you should sort tags by key before sending them to the database.
-              The sort should match the results from the [Go bytes.Compare function](https://golang.org/pkg/bytes/#Compare).
- */
-
-#define INFLUX_MEAS(m)        IF_TYPE_MEAS, (m)
-#define INFLUX_TAG(k, v)      IF_TYPE_TAG, (k), (v)
-#define INFLUX_F_STR(k, v)    IF_TYPE_FIELD_STRING, (k), (v)
-#define INFLUX_F_FLT(k, v, p) IF_TYPE_FIELD_FLOAT, (k), (double)(v), (int)(p)
-#define INFLUX_F_INT(k, v)    IF_TYPE_FIELD_INTEGER, (k), (long long)(v)
-#define INFLUX_F_BOL(k, v)    IF_TYPE_FIELD_BOOLEAN, (k), ((v) ? 1 : 0)
-#define INFLUX_TS(ts)         IF_TYPE_TIMESTAMP, (long long)(ts)
-#define INFLUX_END            IF_TYPE_ARG_END
-
-typedef struct _influx_client_t
-{
-    char* host;
-    int   port;
-    char* db;  // http only
-    char* usr; // http only [optional for auth]
-    char* pwd; // http only [optional for auth]
-    char* token; // http only
-} influx_client_t;
-
-typedef struct _influx_v2_client_t
-{
-    char* host;
-    int   port;
-    char* org;  
-    char* bucket;
-    char* precision;
-    char* usr; // http only [optional for auth]
-    char* pwd; // http only [optional for auth]
-    char* token; // http only
-} influx_v2_client_t;
-
-int format_line(char **buf, int *len, size_t used, ...);
-int post_http(influx_client_t* c, ...);
-int send_udp(influx_client_t* c, ...);
-int post_curl(influx_v2_client_t* c, ...);
-
-#define IF_TYPE_ARG_END       0
-#define IF_TYPE_MEAS          1
-#define IF_TYPE_TAG           2
-#define IF_TYPE_FIELD_STRING  3
-#define IF_TYPE_FIELD_FLOAT   4
-#define IF_TYPE_FIELD_INTEGER 5
-#define IF_TYPE_FIELD_BOOLEAN 6
-#define IF_TYPE_TIMESTAMP     7
-
-int _escaped_append(char** dest, size_t* len, size_t* used, const char* src, const char* escape_seq);
-int _begin_line(char **buf);
-int _format_line(char** buf, va_list ap);
-int _format_line2(char** buf, va_list ap, size_t *, size_t);
-int post_http_send_line(influx_client_t *c, char *buf, int len);
-int send_udp_line(influx_client_t* c, char *line, int len);
-
-int post_http_send_line(influx_client_t *c, char *buf, int len)
-{
-    int sock = -1   , ret_code = 0, content_length = 0;
-    struct sockaddr_in addr;
-    struct iovec iv[2];
-    char ch;
-
-    iv[1].iov_base = buf;
-    iv[1].iov_len = len;
-
-    if(!(iv[0].iov_base = (char*)malloc(len = 0x800))) {
-        free(iv[1].iov_base);
-        return -2;
-    }
-
-    for(;;) {
-        iv[0].iov_len = snprintf((char*)iv[0].iov_base, len, 
-            "POST /write?db=%s&u=%s&p=%s HTTP/1.1\r\n"
-            "Host: %s\r\n"
-            "Accept: application/json\r\n"
-            "Content-type: text/plain\r\n"
-            "Authorization: Token %s\r\n"
-            "Content-Length: %zd\r\n"
-            "\r\n", // Final blank line is needed.
-            c->db, c->usr ? c->usr : "", c->pwd ? c->pwd : "", c->host, c->token ? c->token : "", iv[1].iov_len);
-        if((int)iv[0].iov_len >= len && !(iv[0].iov_base = (char*)realloc(iv[0].iov_base, len *= 2))) {
-            free(iv[1].iov_base);
-            free(iv[0].iov_base);
-            return -3;
-        }
-        else
-            break;
-    }
-
-	fprintf(stderr, "influxdb-c::post_http: iv[0] = '%s'\n", (char *)iv[0].iov_base);
-	fprintf(stderr, "influxdb-c::post_http: iv[1] = '%s'\n", (char *)iv[1].iov_base);
-
-    addr.sin_family = AF_INET;
-    addr.sin_port = htons(c->port);
-    // EAL: Rather than just an IP address, allow a hostname, like "localhost"
-    struct hostent* resolved_host = gethostbyname(c->host);
-    if (!resolved_host) {
-        free(iv[1].iov_base);
-        free(iv[0].iov_base);
-        return -4;
-    }
-    memcpy(&addr.sin_addr, resolved_host->h_addr_list[0], resolved_host->h_length);
-    /*
-    if((addr.sin_addr.s_addr = inet_addr(resolved_host->h_addr)) == INADDR_NONE) {
-        free(iv[1].iov_base);
-        free(iv[0].iov_base);
-        return -4;
-    }
-    */
-
-    if((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-        free(iv[1].iov_base);
-        free(iv[0].iov_base);
-        return -5;
-    }
-
-    if(connect(sock, (struct sockaddr*)(&addr), sizeof(addr)) < 0) {
-        ret_code = -6;
-        goto END;
-    }
-
-    if(writev(sock, iv, 2) < (int)(iv[0].iov_len + iv[1].iov_len)) {
-        ret_code = -7;
-        goto END;
-    }
-    iv[0].iov_len = len;
-
-#define _GET_NEXT_CHAR() (ch = (len >= (int)iv[0].iov_len && \
-    (iv[0].iov_len = recv(sock, iv[0].iov_base, iv[0].iov_len, len = 0)) == (size_t)(-1) ? \
-     0 : *((char*)iv[0].iov_base + len++)))
-#define _LOOP_NEXT(statement) for(;;) { if(!(_GET_NEXT_CHAR())) { ret_code = -8; goto END; } statement }
-#define _UNTIL(c) _LOOP_NEXT( if(ch == c) break; )
-#define _GET_NUMBER(n) _LOOP_NEXT( if(ch >= '0' && ch <= '9') n = n * 10 + (ch - '0'); else break; )
-#define _(c) if((_GET_NEXT_CHAR()) != c) break;
-
-    _UNTIL(' ')_GET_NUMBER(ret_code)
-    for(;;) {
-        _UNTIL('\n')
-        switch(_GET_NEXT_CHAR()) {
-            case 'C':_('o')_('n')_('t')_('e')_('n')_('t')_('-')
-                _('L')_('e')_('n')_('g')_('t')_('h')_(':')_(' ')
-                _GET_NUMBER(content_length)
-                break;
-            case '\r':_('\n')
-                while(content_length-- > 0 && _GET_NEXT_CHAR());// printf("%c", ch);
-                goto END;
-        }
-        if(!ch) {
-            ret_code = -10;
-            goto END;
-        }
-    }
-    ret_code = -11;
-END:
-    close(sock);
-    free(iv[0].iov_base);
-    free(iv[1].iov_base);
-    return ret_code / 100 == 2 ? 0 : ret_code;
-}
-#undef _GET_NEXT_CHAR
-#undef _LOOP_NEXT
-#undef _UNTIL
-#undef _GET_NUMBER
-#undef _
-
-int post_http(influx_client_t* c, ...)
-{
-    va_list ap;
-    char *line = NULL;
-    int ret_code = 0, len = 0;
-
-    va_start(ap, c);
-    len = _format_line((char**)&line, ap);
-    va_end(ap);
-    if(len < 0)
-        return -1;
-
-    ret_code = post_http_send_line(c, line, len);
-
-    return ret_code;
-}
-
-int send_udp_line(influx_client_t* c, char *line, int len)
-{
-    int sock = -1, ret = 0;
-    struct sockaddr_in addr;
-
-    addr.sin_family = AF_INET;
-    addr.sin_port = htons(c->port);
-    if((addr.sin_addr.s_addr = inet_addr(c->host)) == INADDR_NONE) {
-        ret = -2;
-        goto END;
-    }
-
-    if((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-        ret = -3;
-        goto END;
-    }
-
-    if(sendto(sock, line, len, 0, (struct sockaddr *)&addr, sizeof(addr)) < len)
-        ret = -4;
-
-END:
-    if (sock >= 0) {
-        close(sock);
-    }
-    return ret;
-}
-
-int send_udp(influx_client_t* c, ...)
-{
-    int ret = 0, len;
-    va_list ap;
-    char* line = NULL;
-
-    va_start(ap, c);
-    len = _format_line(&line, ap);
-    va_end(ap);
-    if(len < 0)
-        return -1;
-
-    ret = send_udp_line(c, line, len);
-
-    free(line);
-    return ret;
-}
-
-int post_curl(influx_v2_client_t* c, ...)
-{
-    va_list ap;
-    char *data = NULL;
-    int len = 0;
-    va_start(ap, c);
-    len = _format_line((char**)&data, ap);
-    va_end(ap);
-
-    CURL *curl;
-
-    /* In windows, this will init the winsock stuff */ 
-    curl_global_init(CURL_GLOBAL_ALL);
-    CURLcode res;
-
-    /* get a curl handle */ 
-    curl = curl_easy_init();
-    if(!curl) {
-        return CURLE_FAILED_INIT;
-    }
-
-    char* url_string = (char*)malloc(len);
-    snprintf(url_string, len, 
-            "http://%s:%d/api/v2/write?org=%s&bucket=%s&precision=%s",
-            c->host ? c->host: "localhost", c->port ? c->port : 8086, c->org, c->bucket, c->precision ? c->precision : "ns");
-
-    curl_easy_setopt(curl, CURLOPT_URL, url_string);   
-    free(url_string);
-            
-    char* token_string = (char*)malloc(120*sizeof(char));
-    sprintf(token_string, "Authorization: Token %s", c->token);
-
-    struct curl_slist *list = NULL;
-    list = curl_slist_append(list, token_string);
-    curl_easy_setopt(curl, CURLOPT_HTTPHEADER, list);
-    free(token_string);
-    
-    curl_easy_setopt(curl, CURLOPT_POSTFIELDS, data);
-    curl_easy_setopt(curl, CURLOPT_USERAGENT, "libcurl-agent/1.0");
-
-    /* Perform the request, res will get the return code */ 
-    res = curl_easy_perform(curl);
-    /* Check for errors */ 
-    if(res != CURLE_OK){
-        fprintf(stderr, "curl_easy_perform() failed: %s\n",
-                curl_easy_strerror(res));   
-    }
-        
-    free(data);
-    curl_easy_cleanup(curl);
-    curl_global_cleanup();
-    return res;
-}
-
-int format_line(char **buf, int *len, size_t used, ...)
-{
-    va_list ap;
-    va_start(ap, used);
-    used = _format_line2(buf, ap, (size_t *)len, used);
-    va_end(ap);
-    if(*len < 0)
-        return -1;
-    else
-	return used;
-}
-
-int _begin_line(char **buf)
-{
-    int len = 0x100;
-    if(!(*buf = (char*)malloc(len)))
-        return -1;
-    return len;
-}
-
-int _format_line(char** buf, va_list ap)
-{
-	size_t len = 0;
-	*buf = NULL;
-	return _format_line2(buf, ap, &len, 0);
-}
-
-int _format_line2(char** buf, va_list ap, size_t *_len, size_t used)
-{
-#define _APPEND(fmter...) \
-    for(;;) {\
-        if((written = snprintf(*buf + used, len - used, ##fmter)) < 0)\
-            goto FAIL;\
-        if(used + written >= len && !(*buf = (char*)realloc(*buf, len *= 2)))\
-            return -1;\
-        else {\
-            used += written;\
-            break;\
-        }\
-    }
-
-    size_t len = *_len;
-    int written = 0, type = 0, last_type = 0;
-    unsigned long long i = 0;
-    double d = 0.0;
-
-    if (*buf == NULL) {
-	    len = _begin_line(buf);
-	    used = 0;
-    }
-
-    type = va_arg(ap, int);
-    while(type != IF_TYPE_ARG_END) {
-        if(type >= IF_TYPE_TAG && type <= IF_TYPE_FIELD_BOOLEAN) {
-            if(last_type < IF_TYPE_MEAS || last_type > (type == IF_TYPE_TAG ? IF_TYPE_TAG : IF_TYPE_FIELD_BOOLEAN))
-                goto FAIL;
-            _APPEND("%c", (last_type <= IF_TYPE_TAG && type > IF_TYPE_TAG) ? ' ' : ',');
-            if(_escaped_append(buf, &len, &used, va_arg(ap, char*), ",= "))
-                return -2;
-            _APPEND("=");
-        }
-        switch(type) {
-            case IF_TYPE_MEAS:
-                if(last_type)
-                    _APPEND("\n");
-                if(last_type && last_type <= IF_TYPE_TAG)
-                    goto FAIL;
-                if(_escaped_append(buf, &len, &used, va_arg(ap, char*), ", "))
-                    return -3;
-                break;
-            case IF_TYPE_TAG:
-                if(_escaped_append(buf, &len, &used, va_arg(ap, char*), ",= "))
-                    return -4;
-                break;
-            case IF_TYPE_FIELD_STRING:
-                _APPEND("\"");
-                if(_escaped_append(buf, &len, &used, va_arg(ap, char*), "\""))
-                    return -5;
-                _APPEND("\"");
-                break;
-            case IF_TYPE_FIELD_FLOAT:
-                d = va_arg(ap, double);
-                i = va_arg(ap, int);
-                _APPEND("%.*lf", (int)i, d);
-                break;
-            case IF_TYPE_FIELD_INTEGER:
-                i = va_arg(ap, long long);
-                _APPEND("%lldi", i);
-                break;
-            case IF_TYPE_FIELD_BOOLEAN:
-                i = va_arg(ap, int);
-                _APPEND("%c", i ? 't' : 'f');
-                break;
-            case IF_TYPE_TIMESTAMP:
-                if(last_type < IF_TYPE_FIELD_STRING || last_type > IF_TYPE_FIELD_BOOLEAN)
-                    goto FAIL;
-                i = va_arg(ap, long long);
-                _APPEND(" %lld", i);
-                break;
-            default:
-                goto FAIL;
-        }
-        last_type = type;
-        type = va_arg(ap, int);
-    }
-    _APPEND("\n");
-    if(last_type <= IF_TYPE_TAG)
-        goto FAIL;
-    *_len = len;
-    return used;
-FAIL:
-    free(*buf);
-    *buf = NULL;
-    return -1;
-}
-#undef _APPEND
-
-int _escaped_append(char** dest, size_t* len, size_t* used, const char* src, const char* escape_seq)
-{
-    size_t i = 0;
-
-    for(;;) {
-        if((i = strcspn(src, escape_seq)) > 0) {
-            if(*used + i > *len && !(*dest = (char*)realloc(*dest, (*len) *= 2)))
-                return -1;
-            strncpy(*dest + *used, src, i);
-            *used += i;
-            src += i;
-        }
-        if(*src) {
-            if(*used + 2 > *len && !(*dest = (char*)realloc(*dest, (*len) *= 2)))
-                return -2;
-            (*dest)[(*used)++] = '\\';
-            (*dest)[(*used)++] = *src++;
-        }
-        else
-            return 0;
-    }
-    return 0;
-}
diff --git a/util/tracing/makefile b/util/tracing/makefile
deleted file mode 100644
index f414f05ef3..0000000000
--- a/util/tracing/makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Makefile for utilities that convert Lingua Franca trace files
-# into other formats.
-# @author: Edward A. Lee
-
-CC=gcc
-CFLAGS=-I../../core/src/main/resources/lib/c/reactor-c/include/core/ \
-		-I../../core/src/main/resources/lib/c/reactor-c/include/core/modal_models \
-		-I../../core/src/main/resources/lib/c/reactor-c/include/core/platform \
-		-I../../core/src/main/resources/lib/c/reactor-c/include/core/utils \
-		-DLF_UNTHREADED=1 \
-		-Wall
-DEPS=
-LIBS=-lcurl
-
-%.o: %.c $(DEPS)
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-trace_to_csv: trace_to_csv.o trace_util.o
-	$(CC) -o trace_to_csv trace_to_csv.o trace_util.o
-	
-trace_to_chrome: trace_to_chrome.o trace_util.o
-	$(CC) -o trace_to_chrome trace_to_chrome.o trace_util.o
-
-trace_to_influxdb: trace_to_influxdb.o trace_util.o
-	$(CC) -o trace_to_influxdb trace_to_influxdb.o trace_util.o $(LIBS)
-
-install: trace_to_csv trace_to_chrome trace_to_influxdb
-	mv trace_to_csv ../../bin
-	mv trace_to_chrome ../../bin
-	mv trace_to_influxdb ../../bin
-	ln -f -s ../util/scripts/launch-fedsd.sh ../../bin/fedsd
-	chmod +x ../../bin/fedsd
-	
-clean:
-	rm -f *.o
diff --git a/util/tracing/trace_to_chrome.c b/util/tracing/trace_to_chrome.c
deleted file mode 100644
index 8e0c29dba8..0000000000
--- a/util/tracing/trace_to_chrome.c
+++ /dev/null
@@ -1,452 +0,0 @@
-/**
- * @file
- * @author Edward A. Lee
- *
- * @section LICENSE
-Copyright (c) 2020, The University of California at Berkeley
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- * @section DESCRIPTION
- * Standalone program to convert a Lingua Franca trace file to a JSON file suitable
- * for viewing in Chrome's event visualizer. To visualize the resulting file,
- * point your chrome browser to chrome://tracing/ and the load the .json file.
- */
-#define LF_TRACE
-#include <stdio.h>
-#include <string.h>
-#include "reactor.h"
-#include "trace.h"
-#include "trace_util.h"
-
-#define PID_FOR_USER_EVENT 1000000 // Assumes no more than a million reactors.
-#define PID_FOR_WORKER_WAIT 0  // Use 1000001 to show in separate trace.
-#define PID_FOR_WORKER_ADVANCING_TIME 0 // Use 1000002 to show in separate trace.
-#define PID_FOR_UNKNOWN_EVENT 2000000
-
-/** Maximum thread ID seen. */
-int max_thread_id = 0;
-
-/** File containing the trace binary data. */
-FILE* trace_file = NULL;
-
-/** File for writing the output data. */
-FILE* output_file = NULL;
-
-/**
- * Print a usage message.
- */
-void usage() {
-    printf("\nUsage: trace_to_chrome [options] trace_file (with or without .lft extension)\n");
-    printf("Options: \n");
-    printf("  -p, --physical\n");
-    printf("   Use only physical time, not logical time, for all horizontal axes.\n");
-    printf("\n");
-}
-
-/** Maximum reaction number encountered. */
-int max_reaction_number = 0;
-
-/** Indicator to plot vs. physical time only. */
-bool physical_time_only = false;
-
-/**
- * Read a trace in the specified file and write it to the specified json file.
- * @param trace_file An open trace file.
- * @param output_file An open output .json file.
- * @return The number of records read or 0 upon seeing an EOF.
- */
-size_t read_and_write_trace(FILE* trace_file, FILE* output_file) {
-    int trace_length = read_trace(trace_file);
-    if (trace_length == 0) return 0;
-    // Write each line.
-    for (int i = 0; i < trace_length; i++) {
-        char* reaction_name = "\"UNKNOWN\"";
-
-        // Ignore federated trace events.
-        if (trace[i].event_type > federated) continue;
-
-        if (trace[i].dst_id >= 0) {
-            reaction_name = (char*)malloc(4);
-            snprintf(reaction_name, 4, "%d", trace[i].dst_id);
-        }
-        // printf("DEBUG: Reactor's self struct pointer: %p\n", trace[i].pointer);
-        int reactor_index;
-        char* reactor_name = get_object_description(trace[i].pointer, &reactor_index);
-        if (reactor_name == NULL) {
-            if (trace[i].event_type == worker_wait_starts || trace[i].event_type == worker_wait_ends) {
-                reactor_name = "WAIT";
-            } else if (trace[i].event_type == scheduler_advancing_time_starts
-                    || trace[i].event_type == scheduler_advancing_time_starts) {
-                reactor_name = "ADVANCE TIME";
-            } else {
-                reactor_name = "NO REACTOR";
-            }
-        }
-        // Default name is the reactor name.
-        char* name = reactor_name;
-
-        int trigger_index;
-        char* trigger_name = get_trigger_name(trace[i].trigger, &trigger_index);
-        if (trigger_name == NULL) {
-            trigger_name = "NONE";
-        }
-        // By default, the timestamp used in the trace is the elapsed
-        // physical time in microseconds.  But for schedule_called events,
-        // it will instead be the logical time at which the action or timer
-        // is to be scheduled.
-        interval_t elapsed_physical_time = (trace[i].physical_time - start_time)/1000;
-        interval_t timestamp = elapsed_physical_time;
-        interval_t elapsed_logical_time = (trace[i].logical_time - start_time)/1000;
-
-        if (elapsed_physical_time < 0) {
-            fprintf(stderr, "WARNING: Negative elapsed physical time %lld. Skipping trace entry.\n", elapsed_physical_time);
-            continue;
-        }
-        if (elapsed_logical_time < 0) {
-            fprintf(stderr, "WARNING: Negative elapsed logical time %lld. Skipping trace entry.\n", elapsed_logical_time);
-            continue;
-        }
-
-        // Default thread id is the worker number.
-        int thread_id = trace[i].src_id;
-
-        char* args;
-        asprintf(&args, "{"
-                        "\"reaction\": %s,"          // reaction number.
-                        "\"logical time\": %lld,"    // logical time.
-                        "\"physical time\": %lld,"   // physical time.
-                        "\"microstep\": %d"          // microstep.
-                    "}",
-                reaction_name,
-                elapsed_logical_time,
-                elapsed_physical_time,
-                trace[i].microstep
-        );
-        char* phase;
-        int pid;
-        switch(trace[i].event_type) {
-            case reaction_starts:
-                phase = "B";
-                pid = 0; // Process 0 will be named "Execution"
-                break;
-            case reaction_ends:
-                phase = "E";
-                pid = 0; // Process 0 will be named "Execution"
-                break;
-            case schedule_called:
-                phase = "i";
-                pid = reactor_index + 1; // One pid per reactor.
-                if (!physical_time_only) {
-                    timestamp = elapsed_logical_time + trace[i].extra_delay/1000;
-                }
-                thread_id = trigger_index;
-                name = trigger_name;
-                break;
-            case user_event:
-                pid = PID_FOR_USER_EVENT;
-                phase= "i";
-                if (!physical_time_only) {
-                    timestamp = elapsed_logical_time;
-                }
-                thread_id = reactor_index;
-                break;
-            case user_value:
-                pid = PID_FOR_USER_EVENT;
-                phase= "C";
-                if (!physical_time_only) {
-                    timestamp = elapsed_logical_time;
-                }
-                thread_id = reactor_index;
-                free(args);
-                asprintf(&args, "{\"value\": %lld}", trace[i].extra_delay);
-                break;
-            case worker_wait_starts:
-                pid = PID_FOR_WORKER_WAIT;
-                phase = "B";
-                break;
-            case worker_wait_ends:
-                pid = PID_FOR_WORKER_WAIT;
-                phase = "E";
-                break;
-            case scheduler_advancing_time_starts:
-                pid = PID_FOR_WORKER_ADVANCING_TIME;
-                phase = "B";
-                break;
-            case scheduler_advancing_time_ends:
-                pid = PID_FOR_WORKER_ADVANCING_TIME;
-                phase = "E";
-                break;
-            default:
-                fprintf(stderr, "WARNING: Unrecognized event type %d: %s\n",
-                        trace[i].event_type, trace_event_names[trace[i].event_type]);
-                pid = PID_FOR_UNKNOWN_EVENT;
-                phase = "i";
-        }
-        fprintf(output_file, "{"
-                    "\"name\": \"%s\", "   // name is the reactor or trigger name.
-                    "\"cat\": \"%s\", "    // category is the type of event.
-                    "\"ph\": \"%s\", "     // phase is "B" (begin), "E" (end), or "X" (complete).
-                    "\"tid\": %d, "        // thread ID.
-                    "\"pid\": %d, "        // process ID is required.
-                    "\"ts\": %lld, "       // timestamp in microseconds
-                    "\"args\": %s"         // additional arguments from above.
-                    "},\n",
-                name,
-                trace_event_names[trace[i].event_type],
-                phase,
-                thread_id,
-                pid,
-                timestamp,
-                args
-        );
-        free(args);
-
-        if (trace[i].src_id > max_thread_id) {
-            max_thread_id = trace[i].src_id;
-        }
-        // If the event is reaction_starts and physical_time_only is not set,
-        // then also generate an instantaneous
-        // event to be shown in the reactor's section, along with timers and actions.
-        if (trace[i].event_type == reaction_starts && !physical_time_only) {
-            phase = "i";
-            pid = reactor_index + 1;
-            reaction_name = (char*)malloc(4);
-            char name[13];
-            snprintf(name, 13, "reaction %d", trace[i].dst_id);
-
-            // NOTE: If the reactor has more than 1024 timers and actions, then
-            // there will be a collision of thread IDs here.
-            thread_id = 1024 + trace[i].dst_id;
-            if (trace[i].dst_id > max_reaction_number) {
-                max_reaction_number = trace[i].dst_id;
-            }
-
-            fprintf(output_file, "{"
-                    "\"name\": \"%s\", "   // name is the reactor or trigger name.
-                    "\"cat\": \"%s\", "    // category is the type of event.
-                    "\"ph\": \"%s\", "     // phase is "B" (begin), "E" (end), or "X" (complete).
-                    "\"tid\": %d, "        // thread ID.
-                    "\"pid\": %d, "        // process ID is required.
-                    "\"ts\": %lld, "       // timestamp in microseconds
-                    "\"args\": {"
-                        "\"microstep\": %d, "       // microstep.
-                        "\"physical time\": %lld"   // physical time.
-                    "}},\n",
-                name,
-                "Reaction",
-                phase,
-                thread_id,
-                pid,
-                elapsed_logical_time,
-                trace[i].microstep,
-                elapsed_physical_time
-            );
-        }
-    }
-    return trace_length;
-}
-
-/**
- * Write metadata events, which provide names in the renderer.
- * @param output_file An open output .json file.
- */
-void write_metadata_events(FILE* output_file) {
-    // Thread 0 is the main thread.
-    fprintf(output_file, "{"
-            "\"name\": \"thread_name\", "
-            "\"ph\": \"M\", "      // mark as metadata.
-            "\"pid\": 0, "
-            "\"tid\": 0, "
-            "\"args\": {"
-                "\"name\": \"Main thread\""
-                    "}},\n"
-        );
-
-    // Name the worker threads.
-    for (int i = 1; i <= max_thread_id; i++) {
-        fprintf(output_file, "{"
-                    "\"name\": \"thread_name\", "
-                    "\"ph\": \"M\", "      // mark as metadata.
-                    "\"pid\": 0, "
-                    "\"tid\": %d, "
-                    "\"args\": {"
-                        "\"name\": \"Worker %d\""
-                    "}},\n",
-                i, i
-        );
-        fprintf(output_file, "{"
-                    "\"name\": \"thread_name\", "
-                    "\"ph\": \"M\", "      // mark as metadata.
-                    "\"pid\": %d, "
-                    "\"tid\": %d, "
-                    "\"args\": {"
-                        "\"name\": \"Worker %d\""
-                    "}},\n",
-                PID_FOR_WORKER_WAIT, i, i
-        );
-        fprintf(output_file, "{"
-                    "\"name\": \"thread_name\", "
-                    "\"ph\": \"M\", "      // mark as metadata.
-                    "\"pid\": %d, "
-                    "\"tid\": %d, "
-                    "\"args\": {"
-                        "\"name\": \"Worker %d\""
-                    "}},\n",
-                PID_FOR_WORKER_ADVANCING_TIME, i, i
-        );
-    }
-
-    // Name reactions for each reactor.
-    for (int reactor_index = 1; reactor_index <= object_table_size; reactor_index++) {
-        for (int reaction_number = 0; reaction_number <= max_reaction_number; reaction_number++) {
-            fprintf(output_file, "{"
-                    "\"name\": \"thread_name\", "
-                    "\"ph\": \"M\", "      // mark as metadata.
-                    "\"pid\": %d, "
-                    "\"tid\": %d, "
-                    "\"args\": {"
-                        "\"name\": \"Reaction %d\""
-                    "}},\n",
-                reactor_index, reaction_number + 1024, reaction_number
-            );
-        }
-    }
-
-    // Write the reactor names for the logical timelines.
-    for (int i = 0; i < object_table_size; i++) {
-        if (object_table[i].type == trace_trigger) {
-            // We need the reactor index (not the name) to set the pid.
-            int reactor_index;
-            get_object_description(object_table[i].pointer, &reactor_index);
-            fprintf(output_file, "{"
-                    "\"name\": \"thread_name\", "   // metadata for thread name.
-                    "\"ph\": \"M\", "       // mark as metadata.
-                    "\"pid\": %d, "         // the "process" to identify by reactor.
-                    "\"tid\": %d,"          // The "thread" to label with action or timer name.
-                    "\"args\": {"
-                        "\"name\": \"Trigger %s\""
-                    "}},\n",
-                reactor_index + 1, // Offset of 1 prevents collision with Execution.
-                i,
-                object_table[i].description);
-        } else if (object_table[i].type == trace_reactor) {
-            fprintf(output_file, "{"
-                    "\"name\": \"process_name\", "   // metadata for process name.
-                    "\"ph\": \"M\", "      // mark as metadata.
-                    "\"pid\": %d, "         // the "process" to label as reactor.
-                    "\"args\": {"
-                        "\"name\": \"Reactor %s reactions, actions, and timers in logical time\""
-                    "}},\n",
-                i + 1,  // Offset of 1 prevents collision with Execution.
-                object_table[i].description);
-        } else if (object_table[i].type == trace_user) {
-            fprintf(output_file, "{"
-                    "\"name\": \"thread_name\", "   // metadata for thread name.
-                    "\"ph\": \"M\", "      // mark as metadata.
-                    "\"pid\": %d, "         // the "process" to label as reactor.
-                    "\"tid\": %d,"          // The "thread" to label with action or timer name.
-                    "\"args\": {"
-                        "\"name\": \"%s\""
-                    "}},\n",
-                PID_FOR_USER_EVENT,
-                i, // This is the index in the object table.
-                object_table[i].description);
-        }
-    }
-    // Name the "process" for "Execution"
-    fprintf(output_file, "{"
-                    "\"name\": \"process_name\", "   // metadata for process name.
-                    "\"ph\": \"M\", "      // mark as metadata.
-                    "\"pid\": 0, "         // the "process" to label "Execution".
-                    "\"args\": {"
-                        "\"name\": \"Execution of %s\""
-                    "}},\n",
-                top_level);
-    // Name the "process" for "Worker Waiting" if the PID is not the main execution one.
-    if (PID_FOR_WORKER_WAIT > 0) {
-        fprintf(output_file, "{"
-                    "\"name\": \"process_name\", "   // metadata for process name.
-                    "\"ph\": \"M\", "      // mark as metadata.
-                    "\"pid\": %d, "        // the "process" to label "Workers waiting for reaction queue".
-                    "\"args\": {"
-                        "\"name\": \"Workers waiting for reaction queue\""
-                    "}},\n",
-                PID_FOR_WORKER_WAIT);
-    }
-    // Name the "process" for "Worker advancing time" if the PID is not the main execution one.
-    if (PID_FOR_WORKER_ADVANCING_TIME > 0) {
-        fprintf(output_file, "{"
-                    "\"name\": \"process_name\", "   // metadata for process name.
-                    "\"ph\": \"M\", "      // mark as metadata.
-                    "\"pid\": %d, "        // the "process" to label "Workers waiting for reaction queue".
-                    "\"args\": {"
-                        "\"name\": \"Workers advancing time\""
-                    "}},\n",
-                PID_FOR_WORKER_ADVANCING_TIME);
-    }
-    // Name the "process" for "User Events"
-    // Last metadata entry lacks a comma.
-    fprintf(output_file, "{"
-                    "\"name\": \"process_name\", "   // metadata for process name.
-                    "\"ph\": \"M\", "      // mark as metadata.
-                    "\"pid\": %d, "        // the "process" to label "User events".
-                    "\"args\": {"
-                        "\"name\": \"User events in %s, shown in physical time:\""
-                    "}}\n",
-                PID_FOR_USER_EVENT, top_level);
-}
-
-int main(int argc, char* argv[]) {
-    char* filename = NULL;
-    for (int i = 1; i < argc; i++) {
-        if (strncmp(argv[i], "-p", 2) == 0 || strncmp(argv[i], "--physical", 10) == 0) {
-            physical_time_only = true;
-        } else if (argv[i][0] == '-') {
-            usage();
-            return(1);
-        } else {
-           filename = argv[i];
-        }
-    }
-    if (filename == NULL) {
-        usage();
-        exit(0);
-    }
-
-    // Open the trace file.
-    trace_file = open_file(filename, "r");
-
-    // Construct the name of the csv output file and open it.
-    char* root = root_name(filename);
-    char json_filename[strlen(root) + 6];
-    strcpy(json_filename, root);
-    strcat(json_filename, ".json");
-    output_file = open_file(json_filename, "w");
-
-    if (read_header(trace_file) >= 0) {
-        // Write the opening bracket into the json file.
-        fprintf(output_file, "{ \"traceEvents\": [\n");
-        while (read_and_write_trace(trace_file, output_file) != 0) {};
-        write_metadata_events(output_file);
-        fprintf(output_file, "]}\n");
-   }
-}
diff --git a/util/tracing/trace_to_csv.c b/util/tracing/trace_to_csv.c
deleted file mode 100644
index 1abf08c082..0000000000
--- a/util/tracing/trace_to_csv.c
+++ /dev/null
@@ -1,436 +0,0 @@
-/**
- * @file
- * @author Edward A. Lee
- *
- * @section LICENSE
-Copyright (c) 2020, The University of California at Berkeley
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- * @section DESCRIPTION
- * Standalone program to convert a Lingua Franca trace file to a comma-separated values
- * text file.
- */
-#define LF_TRACE
-#include <stdio.h>
-#include <string.h>
-#include "reactor.h"
-#include "trace.h"
-#include "trace_util.h"
-
-#define MAX_NUM_REACTIONS 64  // Maximum number of reactions reported in summary stats.
-#define MAX_NUM_WORKERS 64
-
-/** File containing the trace binary data. */
-FILE* trace_file = NULL;
-
-/** File for writing the output data. */
-FILE* output_file = NULL;
-
-/** File for writing summary statistics. */
-FILE* summary_file = NULL;
-
-/** Size of the stats table is object_table_size plus twice MAX_NUM_WORKERS. */
-int table_size;
-
-/**
- * Print a usage message.
- */
-void usage() {
-    printf("\nUsage: trace_to_csv [options] trace_file_root (without .lft extension)\n\n");
-    /* No options yet:
-    printf("\nOptions: \n\n");
-    printf("  -f, --fast [true | false]\n");
-    printf("   Whether to wait for physical time to match logical time.\n\n");
-    printf("\n\n");
-    */
-}
-
-/**
- * Struct for collecting summary statistics for reaction invocations.
- */
-typedef struct reaction_stats_t {
-    int occurrences;
-    instant_t latest_start_time;
-    interval_t total_exec_time;
-    interval_t max_exec_time;
-    interval_t min_exec_time;
-} reaction_stats_t;
-
-/**
- * Struct for collecting summary statistics.
- */
-typedef struct summary_stats_t {
-    trace_event_t event_type; // Use reaction_ends for reactions.
-    const char* description;  // Description in the reaction table (e.g. reactor name).
-    int occurrences;          // Number of occurrences of this description.
-    int num_reactions_seen;
-    reaction_stats_t reactions[MAX_NUM_REACTIONS];
-} summary_stats_t;
-
-/**
- * Sumary stats array. This array has the same size as the
- * object table. Pointer in the array will be void if there
- * are no stats for the object table item.
- */
-summary_stats_t** summary_stats;
-
-/** Largest timestamp seen. */
-instant_t latest_time = 0LL;
-
-/**
- * Read a trace in the specified file and write it to the specified CSV file.
- * @return The number of records read or 0 upon seeing an EOF.
- */
-size_t read_and_write_trace() {
-    int trace_length = read_trace();
-    if (trace_length == 0) return 0;
-    // Write each line.
-    for (int i = 0; i < trace_length; i++) {
-        // printf("DEBUG: reactor self struct pointer: %p\n", trace[i].pointer);
-        int object_instance = -1;
-        char* reactor_name = get_object_description(trace[i].pointer, &object_instance);
-        if (reactor_name == NULL) {
-            reactor_name = "NO REACTOR";
-        }
-        int trigger_instance = -1;
-        char* trigger_name = get_trigger_name(trace[i].trigger, &trigger_instance);
-        if (trigger_name == NULL) {
-            trigger_name = "NO TRIGGER";
-        }
-        fprintf(output_file, "%s, %s, %d, %d, %lld, %d, %lld, %s, %lld\n",
-                trace_event_names[trace[i].event_type],
-                reactor_name,
-                trace[i].src_id,
-                trace[i].dst_id,
-                trace[i].logical_time - start_time,
-                trace[i].microstep,
-                trace[i].physical_time - start_time,
-                trigger_name,
-                trace[i].extra_delay
-        );
-        // Update summary statistics.
-        if (trace[i].physical_time > latest_time) {
-            latest_time = trace[i].physical_time;
-        }
-        if (object_instance >= 0 && summary_stats[NUM_EVENT_TYPES + object_instance] == NULL) {
-            summary_stats[NUM_EVENT_TYPES + object_instance] = (summary_stats_t*)calloc(1, sizeof(summary_stats_t));
-        }
-        if (trigger_instance >= 0 && summary_stats[NUM_EVENT_TYPES + trigger_instance] == NULL) {
-            summary_stats[NUM_EVENT_TYPES + trigger_instance] = (summary_stats_t*)calloc(1, sizeof(summary_stats_t));
-        }
-
-        summary_stats_t* stats = NULL;
-        interval_t exec_time;
-        reaction_stats_t* rstats;
-        int index;
-
-        // Count of event type.
-        if (summary_stats[trace[i].event_type] == NULL) {
-            summary_stats[trace[i].event_type] = (summary_stats_t*)calloc(1, sizeof(summary_stats_t));
-        }
-        summary_stats[trace[i].event_type]->event_type = trace[i].event_type;
-        summary_stats[trace[i].event_type]->description = trace_event_names[trace[i].event_type];
-        summary_stats[trace[i].event_type]->occurrences++;
-
-        switch(trace[i].event_type) {
-            case reaction_starts:
-            case reaction_ends:
-                // This code relies on the mutual exclusion of reactions in a reactor
-                // and the ordering of reaction_starts and reaction_ends events.
-                if (trace[i].dst_id >= MAX_NUM_REACTIONS) {
-                    fprintf(stderr, "WARNING: Too many reactions. Not all will be shown in summary file.\n");
-                    continue;
-                }
-                stats = summary_stats[NUM_EVENT_TYPES + object_instance];
-                stats->description = reactor_name;
-                if (trace[i].dst_id >= stats->num_reactions_seen) {
-                    stats->num_reactions_seen = trace[i].dst_id + 1;
-                }
-                rstats = &stats->reactions[trace[i].dst_id];
-                if (trace[i].event_type == reaction_starts) {
-                    rstats->latest_start_time = trace[i].physical_time;
-                } else {
-                    rstats->occurrences++;
-                    exec_time = trace[i].physical_time - rstats->latest_start_time;
-                    rstats->latest_start_time = 0LL;
-                    rstats->total_exec_time += exec_time;
-                    if (exec_time > rstats->max_exec_time) {
-                        rstats->max_exec_time = exec_time;
-                    }
-                    if (exec_time < rstats->min_exec_time || rstats->min_exec_time == 0LL) {
-                        rstats->min_exec_time = exec_time;
-                    }
-                }
-                break;
-            case schedule_called:
-                if (trigger_instance < 0) {
-                    // No trigger. Do not report.
-                    continue;
-                }
-                stats = summary_stats[NUM_EVENT_TYPES + trigger_instance];
-                stats->description = trigger_name;
-                break;
-            case user_event:
-                // Although these are not exec times and not reactions,
-                // commandeer the first entry in the reactions array to track values.
-                stats = summary_stats[NUM_EVENT_TYPES + object_instance];
-                stats->description = reactor_name;
-                break;
-            case user_value:
-                // Although these are not exec times and not reactions,
-                // commandeer the first entry in the reactions array to track values.
-                stats = summary_stats[NUM_EVENT_TYPES + object_instance];
-                stats->description = reactor_name;
-                rstats = &stats->reactions[0];
-                rstats->occurrences++;
-                // User values are stored in the "extra_delay" field, which is an interval_t.
-                interval_t value = trace[i].extra_delay;
-                rstats->total_exec_time += value;
-                if (value > rstats->max_exec_time) {
-                    rstats->max_exec_time = value;
-                }
-                if (value < rstats->min_exec_time || rstats->min_exec_time == 0LL) {
-                     rstats->min_exec_time = value;
-                }
-                break;
-            case worker_wait_starts:
-            case worker_wait_ends:
-            case scheduler_advancing_time_starts:
-            case scheduler_advancing_time_ends:
-                // Use the reactions array to store data.
-                // There will be two entries per worker, one for waits on the
-                // reaction queue and one for waits while advancing time.
-                index = trace[i].src_id * 2;
-                // Even numbered indices are used for waits on reaction queue.
-                // Odd numbered indices for waits for time advancement.
-                if (trace[i].event_type == scheduler_advancing_time_starts
-                        || trace[i].event_type == scheduler_advancing_time_ends) {
-                    index++;
-                }
-                if (object_table_size + index >= table_size) {
-                    fprintf(stderr, "WARNING: Too many workers. Not all will be shown in summary file.\n");
-                    continue;
-                }
-                stats = summary_stats[NUM_EVENT_TYPES + object_table_size + index];
-                if (stats == NULL) {
-                    stats = (summary_stats_t*)calloc(1, sizeof(summary_stats_t));
-                    summary_stats[NUM_EVENT_TYPES + object_table_size + index] = stats;
-                }
-                // num_reactions_seen here will be used to store the number of
-                // entries in the reactions array, which is twice the number of workers.
-                if (index >= stats->num_reactions_seen) {
-                    stats->num_reactions_seen = index;
-                }
-                rstats = &stats->reactions[index];
-                if (trace[i].event_type == worker_wait_starts
-                        || trace[i].event_type == scheduler_advancing_time_starts
-                ) {
-                    rstats->latest_start_time = trace[i].physical_time;
-                } else {
-                    rstats->occurrences++;
-                    exec_time = trace[i].physical_time - rstats->latest_start_time;
-                    rstats->latest_start_time = 0LL;
-                    rstats->total_exec_time += exec_time;
-                    if (exec_time > rstats->max_exec_time) {
-                        rstats->max_exec_time = exec_time;
-                    }
-                    if (exec_time < rstats->min_exec_time || rstats->min_exec_time == 0LL) {
-                        rstats->min_exec_time = exec_time;
-                    }
-                }
-                break;
-            default:
-                // No special summary statistics for the rest.
-                break;
-        }
-        // Common stats across event types.
-        if (stats != NULL) {
-            stats->occurrences++;
-            stats->event_type = trace[i].event_type;
-        }
-    }
-    return trace_length;
-}
-
-/**
- * Write the summary file.
- */
-void write_summary_file() {
-    // Overall stats.
-    fprintf(summary_file, "Start time:, %lld\n", start_time);
-    fprintf(summary_file, "End time:, %lld\n", latest_time);
-    fprintf(summary_file, "Total time:, %lld\n", latest_time - start_time);
-
-    fprintf(summary_file, "\nTotal Event Occurrences\n");
-    for (int i = 0; i < NUM_EVENT_TYPES; i++) {
-        summary_stats_t* stats = summary_stats[i];
-        if (stats != NULL) {
-            fprintf(summary_file, "%s, %d\n",
-                stats->description,
-                stats->occurrences
-            );
-        }
-    }
-
-    // First pass looks for reaction invocations.
-    // First print a header.
-    fprintf(summary_file, "\nReaction Executions\n");
-    fprintf(summary_file, "Reactor, Reaction, Occurrences, Total Time, Pct Total Time, Avg Time, Max Time, Min Time\n");
-    for (int i = NUM_EVENT_TYPES; i < table_size; i++) {
-        summary_stats_t* stats = summary_stats[i];
-        if (stats != NULL && stats->num_reactions_seen > 0) {
-            for (int j = 0; j < stats->num_reactions_seen; j++) {
-                reaction_stats_t* rstats = &stats->reactions[j];
-                if (rstats->occurrences > 0) {
-                    fprintf(summary_file, "%s, %d, %d, %lld, %f, %lld, %lld, %lld\n",
-                            stats->description,
-                            j, // Reaction number.
-                            rstats->occurrences,
-                            rstats->total_exec_time,
-                            rstats->total_exec_time * 100.0 / (latest_time - start_time),
-                            rstats->total_exec_time / rstats->occurrences,
-                            rstats->max_exec_time,
-                            rstats->min_exec_time
-                    );
-                }
-            }
-        }
-    }
-
-    // Next pass looks for calls to schedule.
-    bool first = true;
-    for (int i = NUM_EVENT_TYPES; i < table_size; i++) {
-        summary_stats_t* stats = summary_stats[i];
-        if (stats != NULL && stats->event_type == schedule_called && stats->occurrences > 0) {
-            if (first) {
-                first = false;
-                fprintf(summary_file, "\nSchedule calls\n");
-                fprintf(summary_file, "Trigger, Occurrences\n");
-            }
-            fprintf(summary_file, "%s, %d\n", stats->description, stats->occurrences);
-        }
-    }
-
-    // Next pass looks for user-defined events.
-    first = true;
-    for (int i = NUM_EVENT_TYPES; i < table_size; i++) {
-        summary_stats_t* stats = summary_stats[i];
-        if (stats != NULL
-                && (stats->event_type == user_event || stats->event_type == user_value)
-                && stats->occurrences > 0) {
-            if (first) {
-                first = false;
-                fprintf(summary_file, "\nUser events\n");
-                fprintf(summary_file, "Description, Occurrences, Total Value, Avg Value, Max Value, Min Value\n");
-            }
-            fprintf(summary_file, "%s, %d", stats->description, stats->occurrences);
-            if (stats->event_type == user_value && stats->reactions[0].occurrences > 0) {
-                // This assumes that the first "reactions" entry has been comandeered for this data.
-                fprintf(summary_file, ", %lld, %lld, %lld, %lld\n",
-                        stats->reactions[0].total_exec_time,
-                        stats->reactions[0].total_exec_time / stats->reactions[0].occurrences,
-                        stats->reactions[0].max_exec_time,
-                        stats->reactions[0].min_exec_time
-                );
-            } else {
-                fprintf(summary_file, "\n");
-            }
-        }
-    }
-
-    // Next pass looks for wait events.
-    first = true;
-    for (int i = NUM_EVENT_TYPES; i < table_size; i++) {
-        summary_stats_t* stats = summary_stats[i];
-        if (stats != NULL && (
-                stats->event_type == worker_wait_ends
-                || stats->event_type == scheduler_advancing_time_ends)
-        ) {
-            if (first) {
-                first = false;
-                fprintf(summary_file, "\nWorkers Waiting\n");
-                fprintf(summary_file, "Worker, Waiting On, Occurrences, Total Time, Pct Total Time, Avg Time, Max Time, Min Time\n");
-            }
-            char* waitee = "reaction queue";
-            if (stats->event_type == scheduler_advancing_time_ends
-                    || stats->event_type == scheduler_advancing_time_starts) {
-                waitee = "advancing time";
-            }
-            for (int j = 0; j <= stats->num_reactions_seen; j++) {
-                reaction_stats_t* rstats = &stats->reactions[j];
-                if (rstats->occurrences > 0) {
-                    fprintf(summary_file, "%d, %s, %d, %lld, %f, %lld, %lld, %lld\n",
-                            j / 2,
-                            waitee,
-                            rstats->occurrences,
-                            rstats->total_exec_time,
-                            rstats->total_exec_time * 100.0 / (latest_time - start_time),
-                            rstats->total_exec_time / rstats->occurrences,
-                            rstats->max_exec_time,
-                            rstats->min_exec_time
-                    );
-                }
-            }
-        }
-    }
-}
-
-int main(int argc, char* argv[]) {
-    if (argc != 2) {
-        usage();
-        exit(0);
-    }
-    // Open the trace file.
-    trace_file = open_file(argv[1], "r");
-    if (trace_file == NULL) exit(1);
-
-    // Construct the name of the csv output file and open it.
-    char* root = root_name(argv[1]);
-    char csv_filename[strlen(root) + 5];
-    strcpy(csv_filename, root);
-    strcat(csv_filename, ".csv");
-    output_file = open_file(csv_filename, "w");
-    if (output_file == NULL) exit(1);
-
-    // Construct the name of the summary output file and open it.
-    char summary_filename[strlen(root) + 13];
-    strcpy(summary_filename, root);
-    strcat(summary_filename, "_summary.csv");
-    summary_file = open_file(summary_filename, "w");
-    if (summary_file == NULL) exit(1);
-
-    free(root);
-
-    if (read_header() >= 0) {
-        // Allocate an array for summary statistics.
-        table_size = NUM_EVENT_TYPES + object_table_size + (MAX_NUM_WORKERS * 2);
-        summary_stats = (summary_stats_t**)calloc(table_size, sizeof(summary_stats_t*));
-
-        // Write a header line into the CSV file.
-        fprintf(output_file, "Event, Reactor, Source, Destination, Elapsed Logical Time, Microstep, Elapsed Physical Time, Trigger, Extra Delay\n");
-        while (read_and_write_trace() != 0) {};
-
-        write_summary_file();
-
-        // File closing is handled by termination function.
-    }
-}
diff --git a/util/tracing/trace_to_influxdb.c b/util/tracing/trace_to_influxdb.c
deleted file mode 100644
index aa50911e5e..0000000000
--- a/util/tracing/trace_to_influxdb.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/**
- * @file
- * @author Edward A. Lee
- * @author Ravi Akella
- *
- * @section LICENSE
-Copyright (c) 2021, The University of California at Berkeley
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- * @section DESCRIPTION
- *
- * Standalone program to send a Lingua Franca trace file to InfluxDB.
- * InfluxDB is a database server to which data can be posted using HTTP
- * or sent as a UDP datagram.
- *
- * ## Compiling this Program
- *
- * To compile this program, simply do this in this source directory:
- * ```
- *    make install
- * ```
- * This will place an executable program `trace_to_influxdb` in the directory `lingua-franca/bin`.
- * I find it convenient to have this directory in my `PATH` (this is also where the
- * `lfc` command-line Lingua Franca compiler is located).
- *
- * ## Setting up InfluxDB
- *
- * To set up InfluxDB, see:
- *
- * [https://docs.influxdata.com/influxdb/v2.0/get-started/](https://docs.influxdata.com/influxdb/v2.0/get-started/)
- *
- * If you have previously installed InfluxDB and you want a fresh start, do this:
- * ```shell
- *     rm -rf ~/.influxdbv2/
- *     ps aux | grep nflux
- * ```
- * The second command will report any InfluxDB processes that are running. Kill them with
- * ```shell
- *     kill -9 PID
- * ```
- * where 'PID' is replaced with whatever process ID(s) are reported by the `ps` command above.
- *
- * To start an InfluxDB server on localhost with port 8087:
- * ```shell
- *    influxd --http-bind-address :8087 --reporting-disabled
- * ```
- * The 'reporting-disabled' option simply disables notifications to the InfluxDB mother ship.
- *
- * You then need to set up at least one user, organization, and bucket. You can do this by pointing your browser to
- * ```
- *     http://localhost:8087
- * ```
- * The browser will walk you through the process of creating a user, password, organization, and initial bucket. E.g.:
- * ```
- *     User: eal superSecretPassword
- *     Organization: iCyPhy
- *     Bucket: test
- * ```
- * The UI in the browser will then give you the options Quick Start or Advanced, either of which you can select.
- * If you select "Data" on the left, you can browse Buckets to verify that your test bucket was created.
- *
- * ## Uploading Trace Data to InfluxDB
- *
- * First, generate a trace file by setting a target parameter in a Lingua Franca program:
- * ```
- *     target C {
- *         tracing: true
- *     };
- * ```
- * Then, when you run this program, a binary file with extension `.lft` will be created.
- *
- * In your browser, in the InfluxDB UI, select Data on the left, then select the Tokens tab.
- * Select a token and copy the token string to clipboard. It will looks something like this:
- * ```
- *     N1mK4b7z29YuWrWG_rBRJF3owaXjPA6gBVOgGG3eStS_zbESHTYJgfJWHB2JA_y3-BMYlMPVa05ccLVA1S770A==
- * ```
- * Then, invoke the conversion program as follows:
- * ```shell
- *     trace_to_influxdb Filename.lft \
- *         --token N1mK4b7z29YuWrWG_rBRJF3owaXjPA6gBVOgGG3eStS_zbESHTYJgfJWHB2JA_y3-BMYlMPVa05ccLVA1S770A==
- * ```
- * where 'Filename' and the token are replaced with your values.
- * This will upload the trace data to InfluxDB.
- *
- * You can also specify the following command-line options:
- * * -h, --host: The host name running InfluxDB. If not given, this defaults to "localhost".
- * * -p, --port: The port for accessing InfluxDB. This defaults to 8086. If you used 8087, as shown above, then you have to give this option.
- *
- * The data can then be viewed in the InfluxDB browser, or you can configure an external
- * tool such as Grafana to visualize it (see https://grafana.com/docs/grafana/latest/datasources/influxdb/).
- */
-#define LF_TRACE
-#include <stdio.h>
-#include "reactor.h"
-#include "trace.h"
-#include "trace_util.h"
-#include "influxdb.h"
-
-#define MAX_NUM_REACTIONS 64  // Maximum number of reactions reported in summary stats.
-#define MAX_NUM_WORKERS 64
-
-/** File containing the trace binary data. */
-FILE* trace_file = NULL;
-
-/** Struct identifying the influx client. */
-influx_client_t influx_client;
-influx_v2_client_t influx_v2_client;
-/**
- * Print a usage message.
- */
-void usage() {
-    printf("\nUsage: trace_to_influxdb [options] trace_file [options]\n\n");
-    printf("\nOptions: \n\n");
-    printf("   -t, --token TOKEN\n");
-    printf("   The token for access to InfluxDB (required argument).\n\n");
-    printf("   -h, --host HOSTNAME\n");
-    printf("   The host name for access to InfluxDB (default is 'localhost').\n\n");
-    printf("   -p, --port PORT\n");
-    printf("   The port for access to InfluxDB (default is 8086).\n\n");
-    printf("   -o, --ort ORGANIZATION\n");
-    printf("   The organization for access to InfluxDB (default is 'iCyPhy').\n\n");
-    printf("   -b, --bucket BUCKET\n");
-    printf("   The bucket into which to put the data (default is 'test').\n\n");
-    printf("\n\n");
-}
-
-/** Largest timestamp seen. */
-instant_t latest_time = 0LL;
-
-/**
- * Read a trace in the specified file and write it to the specified CSV file.
- * @return The number of records read or 0 upon seeing an EOF.
- */
-size_t read_and_write_trace() {
-    int trace_length = read_trace();
-    if (trace_length == 0) return 0;
-    // Write each line.
-    for (int i = 0; i < trace_length; i++) {
-
-        // Ignore federated traces.
-        if (trace[i].event_type > federated) continue;
-
-        char* reaction_name = "none";
-        if (trace[i].dst_id >= 0) {
-            reaction_name = (char*)malloc(4);
-            snprintf(reaction_name, 4, "%d", trace[i].dst_id);
-        }
-        // printf("DEBUG: reactor self struct pointer: %p\n", trace[i].pointer);
-        int object_instance = -1;
-        char* reactor_name = get_object_description(trace[i].pointer, &object_instance);
-        if (reactor_name == NULL) {
-            reactor_name = "NO REACTOR";
-        }
-        int trigger_instance = -1;
-        char* trigger_name = get_trigger_name(trace[i].trigger, &trigger_instance);
-        if (trigger_name == NULL) {
-            trigger_name = "NO TRIGGER";
-        }
-        // FIXME: Treating physical time as the timestamp.
-        // Do we want this to optionally be logical time?
-        // FIXME: What is the difference between a TAG and F_STR (presumably, Field String)?
-        // Presumably, the HTTP post is formatted as a "line protocol" command. See:
-        // https://docs.influxdata.com/influxdb/v2.0/reference/syntax/line-protocol/
-        int response_code = post_curl(&influx_v2_client,
-            INFLUX_MEAS(trace_event_names[trace[i].event_type]),
-            INFLUX_TAG("Reactor", reactor_name),
-            INFLUX_TAG("Reaction", reaction_name),
-            INFLUX_F_INT("Worker", trace[i].src_id),
-            INFLUX_F_INT("Logical Time", trace[i].logical_time),
-            INFLUX_F_INT("Microstep", trace[i].microstep),
-            INFLUX_F_STR("Trigger Name", trigger_name),
-            INFLUX_F_INT("Extra Delay", trace[i].extra_delay),
-            INFLUX_TS(trace[i].physical_time),
-            INFLUX_END
-        );
-        if (response_code != 0) {
-            fprintf(stderr, "****** response code: %d\n", response_code);
-            return 0;
-        }
-    }
-    return trace_length;
-}
-
-int main(int argc, char* argv[]) {
-    if (argc < 2) {
-        usage();
-        exit(0);
-    }
-    // Defaults.
-    influx_v2_client.token = NULL;
-    influx_v2_client.host = "localhost";
-    influx_v2_client.port = 8086;
-    influx_v2_client.org = "iCyPhy";
-    influx_v2_client.bucket = "test";
-
-    char* filename = NULL;
-
-    for (int i = 1; i < argc; i++) {
-        if (strcmp("-t", argv[i]) == 0 || strcmp("--token", argv[i]) == 0) {
-            if (i++ == argc - 1) {
-                usage();
-                fprintf(stderr, "No token specified.\n");
-                exit(1);
-            }
-            influx_v2_client.token = argv[i];
-        } else if (strcmp("-h", argv[i]) == 0 || strcmp("--host", argv[i]) == 0) {
-            if (i++ == argc - 1) {
-                usage();
-                fprintf(stderr, "No host specified.\n");
-                exit(1);
-            }
-            influx_v2_client.host = argv[i];
-        } else if (strcmp("-p", argv[i]) == 0 || strcmp("--port", argv[i]) == 0) {
-            if (i++ == argc - 1) {
-                usage();
-                fprintf(stderr, "No port specified.\n");
-                exit(1);
-            }
-            influx_v2_client.port = atoi(argv[i]);
-            if (influx_v2_client.port == 0) {
-                fprintf(stderr, "Invalid port: %s.\n", argv[i]);
-            }
-        } else if (strcmp("-o", argv[i]) == 0 || strcmp("--org", argv[i]) == 0) {
-            if (i++ == argc - 1) {
-                usage();
-                fprintf(stderr, "No organization specified.\n");
-                exit(1);
-            }
-            influx_v2_client.org = argv[i];
-        } else if (strcmp("-b", argv[i]) == 0 || strcmp("--bucket", argv[i]) == 0) {
-            if (i++ == argc - 1) {
-                usage();
-                fprintf(stderr, "No bucket specified.\n");
-                exit(1);
-            }
-            influx_v2_client.bucket = argv[i];
-        } else {
-            // Must be the filename.
-            filename = argv[i];
-        }
-    }
-    if (influx_v2_client.token == NULL) {
-        fprintf(stderr, "No token specified.\n");
-        exit(1);
-    }
-    if (filename == NULL) {
-        fprintf(stderr, "No trace file specified.\n");
-        exit(1);
-    }
-
-    // Open the trace file.
-    trace_file = open_file(filename, "r");
-
-    if (read_header() >= 0) {
-        size_t num_records = 0, result;
-        while ((result = read_and_write_trace()) != 0) {
-            num_records = result;
-        };
-        printf("***** %zu records written to InfluxDB.\n", num_records);
-        // File closing is handled by termination function.
-    }
-}
diff --git a/util/tracing/trace_util.c b/util/tracing/trace_util.c
deleted file mode 100644
index 551ec94473..0000000000
--- a/util/tracing/trace_util.c
+++ /dev/null
@@ -1,295 +0,0 @@
-/**
- * @file
- * @author Edward A. Lee
- *
- * @section LICENSE
-Copyright (c) 2020, The University of California at Berkeley
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- * @section DESCRIPTION
- * Standalone program to convert a Lingua Franca trace file to a comma-separated values
- * text file.
- */
-#define LF_TRACE
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include "reactor.h"
-#include "trace.h"
-#include "trace_util.h"
-
-/** Buffer for reading object descriptions. Size limit is BUFFER_SIZE bytes. */
-char buffer[BUFFER_SIZE];
-
-/** Buffer for reading trace records. */
-trace_record_t trace[TRACE_BUFFER_CAPACITY];
-
-/** The start time read from the trace file. */
-instant_t start_time;
-
-/** Name of the top-level reactor (first entry in symbol table). */
-char* top_level = NULL;
-
-/** Table of pointers to the self struct of a reactor. */
-// FIXME: Replace with hash table implementation.
-object_description_t* object_table;
-int object_table_size = 0;
-
-typedef struct open_file_t open_file_t;
-typedef struct open_file_t {
-    FILE* file;
-    open_file_t* next;
-} open_file_t;
-open_file_t* _open_files = NULL;
-
-/**
- * Function to be invoked upon exiting.
- */
-void termination() {
-    // Free memory in object description table.
-    for (int i = 0; i < object_table_size; i++) {
-        free(object_table[i].description);
-    }
-    while (_open_files != NULL) {
-        fclose(_open_files->file);
-        open_file_t* tmp = _open_files->next;
-        free(_open_files);
-        _open_files = tmp;
-    }
-    printf("Done!\n");
-}
-
-const char PATH_SEPARATOR =
-#ifdef _WIN32
-                            '\\';
-#else
-                            '/';
-#endif
-
-char* root_name(const char* path) {
-    if (path == NULL) return NULL;
-
-    // Remove any path.
-    char* last_separator = strrchr(path, PATH_SEPARATOR);
-    if (last_separator != NULL) path = last_separator + 1;
-
-    // Allocate and copy name without extension.
-    char* last_period = strrchr(path, '.');
-    size_t length = (last_period == NULL) ?
-        strlen(path) : last_period - path;
-    char* result = (char*)malloc(length + 1);
-    if (result == NULL) return NULL;
-    strncpy(result, path, length);
-    result[length] = '\0';
-
-    return result;
-}
-
-FILE* open_file(const char* path, const char* mode) {
-    FILE* result = fopen(path, mode);
-    if (result == NULL) {
-        fprintf(stderr, "No file named %s.\n", path);
-        usage();
-        exit(2);
-    }
-    open_file_t* record = (open_file_t*)malloc(sizeof(open_file_t));
-    if (record == NULL) {
-        fprintf(stderr, "Out of memory.\n");
-        exit(3);
-    }
-    record->file = result;
-    record->next = _open_files;
-    _open_files = record;
-    return result;
-}
-
-/**
- * Get the description of the object pointed to by the specified pointer.
- * For example, this can be the name of a reactor (pointer points to
- * the self struct) or a user-define string.
- * If there is no such pointer in the symbol table, return NULL.
- * If the index argument is non-null, then put the index
- * of the entry in the table into the int pointed to
- * or -1 if none was found.
- * @param pointer The pointer to to an object, e.g. a self struct.
- * @param index An optional pointer into which to write the index.
- */
-char* get_object_description(void* pointer, int* index) {
-    // FIXME: Replace with a hash table implementation.
-    for (int i = 0; i < object_table_size; i++) {
-        if (object_table[i].pointer == pointer) {
-            if (index != NULL) {
-                *index = i;
-            }
-            return object_table[i].description;
-        }
-    }
-    if (index != NULL) {
-        *index = 0;
-    }
-    return NULL;
-}
-
-/**
- * Get the trigger name for the specified pointer.
- * If there is no such trigger, return NULL.
- * If the index argument is non-null, then put the index
- * of the trigger in the table into the int pointed to
- * or -1 if none was found.
- * @param reactor The pointer to a self struct.
- * @param index An optional pointer into which to write the index.
- */
-char* get_trigger_name(void* trigger, int* index) {
-    // FIXME: Replace with a hash table implementation.
-    for (int i = 0; i < object_table_size; i++) {
-        if (object_table[i].trigger == trigger && object_table[i].type == trace_trigger) {
-            if (index != NULL) {
-                *index = i;
-            }
-            return object_table[i].description;
-        }
-    }
-    if (index != NULL) {
-        *index = 0;
-    }
-    return NULL;
-}
-
-/**
- * Print the object to description table.
- */
-void print_table() {
-    printf("------- objects traced:\n");
-    for (int i = 0; i < object_table_size; i++) {
-        char* type;
-        if (object_table[i].type == trace_reactor) {
-            type = "reactor";
-        } else if (object_table[i].type == trace_trigger) {
-            type = "trigger";
-        } else if (object_table[i].type == trace_user) {
-            type = "user-defined";
-        } else {
-            type = "unknown type";
-        }
-        printf("pointer = %p, trigger = %p, type = %s: %s\n",
-            object_table[i].pointer,
-            object_table[i].trigger,
-            type,
-            object_table[i].description);
-    }
-    printf("-------\n");
-}
-
-/**
- * Read header information.
- * @return The number of objects in the object table or -1 for failure.
- */
-size_t read_header() {
-    // Read the start time.
-    int items_read = fread(&start_time, sizeof(instant_t), 1, trace_file);
-    if (items_read != 1) _LF_TRACE_FAILURE(trace_file);
-
-    printf("Start time is %lld.\n", start_time);
-
-    // Read the table mapping pointers to descriptions.
-    // First read its length.
-    items_read = fread(&object_table_size, sizeof(int), 1, trace_file);
-    if (items_read != 1) _LF_TRACE_FAILURE(trace_file);
-
-    printf("There are %d objects traced.\n", object_table_size);
-
-    object_table = calloc(object_table_size, sizeof(trace_record_t));
-    if (object_table == NULL) {
-        fprintf(stderr, "ERROR: Memory allocation failure %d.\n", errno);
-        return -1;
-    }
-
-    // Next, read each table entry.
-    for (int i = 0; i < object_table_size; i++) {
-        void* reactor;
-        items_read = fread(&reactor, sizeof(void*), 1, trace_file);
-        if (items_read != 1) _LF_TRACE_FAILURE(trace_file);
-        object_table[i].pointer = reactor;
-
-        void* trigger;
-        items_read = fread(&trigger, sizeof(trigger_t*), 1, trace_file);
-        if (items_read != 1) _LF_TRACE_FAILURE(trace_file);
-        object_table[i].trigger = trigger;
-
-        // Next, read the type.
-        _lf_trace_object_t trace_type;
-        items_read = fread(&trace_type, sizeof(_lf_trace_object_t), 1, trace_file);
-        if (items_read != 1) _LF_TRACE_FAILURE(trace_file);
-        object_table[i].type = trace_type;
-
-        // Next, read the string description into the buffer.
-        int description_length = 0;
-        char character;
-        items_read = fread(&character, sizeof(char), 1, trace_file);
-        if (items_read != 1) _LF_TRACE_FAILURE(trace_file);
-        while(character != 0 && description_length < BUFFER_SIZE - 1) {
-            buffer[description_length++] = character;
-            items_read = fread(&character, sizeof(char), 1, trace_file);
-            if (items_read != 1) _LF_TRACE_FAILURE(trace_file);
-        }
-        // Terminate with null.
-        buffer[description_length++] = 0;
-
-        // Allocate memory to store the description.
-        object_table[i].description = malloc(description_length);
-        strcpy(object_table[i].description, buffer);
-
-        if (top_level == NULL) {
-            top_level = object_table[i].description;
-        }
-    }
-    print_table();
-    return object_table_size;
-}
-
-/**
- * Read the trace from the specified file and put it in the trace global
- * variable. Return the length of the trace.
- * @return The number of trace record read or 0 upon seeing an EOF.
- */
-int read_trace() {
-    // Read first the int giving the length of the trace.
-    int trace_length;
-    int items_read = fread(&trace_length, sizeof(int), 1, trace_file);
-    if (items_read != 1) {
-        if (feof(trace_file)) return 0;
-        fprintf(stderr, "Failed to read trace length.\n");
-        exit(3);
-    }
-    if (trace_length > TRACE_BUFFER_CAPACITY) {
-        fprintf(stderr, "ERROR: Trace length %d exceeds capacity. File is garbled.\n", trace_length);
-        exit(4);
-    }
-    // printf("DEBUG: Trace of length %d being converted.\n", trace_length);
-
-    items_read = fread(&trace, sizeof(trace_record_t), trace_length, trace_file);
-    if (items_read != trace_length) {
-        fprintf(stderr, "Failed to read trace of length %d.\n", trace_length);
-        exit(5);
-    }
-    return trace_length;
-}
diff --git a/util/tracing/trace_util.h b/util/tracing/trace_util.h
deleted file mode 100644
index dab1f5e989..0000000000
--- a/util/tracing/trace_util.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * @file
- * @author Edward A. Lee
- *
- * @section LICENSE
-Copyright (c) 2020, The University of California at Berkeley
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- * @section DESCRIPTION
- * Header file for common utilities used in converting Lingua Franca trace files
- * into other formats.
- */
-#define LF_TRACE
-#include "reactor.h"
-#include "trace.h"
-
-/** Macro to use when access to trace file fails. */
-#define _LF_TRACE_FAILURE(trace_file) \
-    do { \
-        fprintf(stderr, "ERROR: Access to trace file failed.\n"); \
-        fclose(trace_file); \
-        trace_file = NULL; \
-        exit(1); \
-    } while(0)
-
-/** Buffer for reading object descriptions. Size limit is BUFFER_SIZE bytes. */
-#define BUFFER_SIZE 1024
-
-/** Buffer for reading trace records. */
-extern trace_record_t trace[];
-
-/** File containing the trace binary data. */
-extern FILE* trace_file;
-
-/** File for writing the output data. */
-extern FILE* output_file;
-
-/** File for writing summary statistics. */
-extern FILE* summary_file;
-
-/**
- * Print a usage message.
- */
-void usage();
-
-/** The start time read from the trace file. */
-extern instant_t start_time;
-
-/** Table of pointers to a description of the object. */
-extern object_description_t* object_table;
-extern int object_table_size;
-
-/** Name of the top-level reactor (first entry in symbol table). */
-extern char* top_level;
-
-/**
- * @brief Return the root file name from the given path.
- * Given a path to a file, this function returns a dynamically
- * allocated string (which you must free) that points to the root
- * filename without the preceding path and without the file extension.
- * @param path The path including the full filename. 
- * @return The root name of the file or NULL for failure.
- */
-char* root_name(const char* path);
-
-/**
- * @brief Open the specified file for reading or writing.
- * This function records the file for closing at termination.
- * @param path The path to the file.
- * @param mode "r" for reading and "w" for writing.
- * @return A pointer to the open file or NULL for failure.
- */
-FILE* open_file(const char* path, const char* mode);
-
-/**
- * Get the description of the object pointed to by the specified pointer.
- * For example, this can be the name of a reactor (pointer points to
- * the self struct) or a user-defined string.
- * If there is no such pointer in the symbol table, return NULL.
- * If the index argument is non-null, then put the index
- * of the entry in the table into the int pointed to
- * or -1 if none was found.
- * @param pointer The pointer to to an object, e.g. a self struct.
- * @param index An optional pointer into which to write the index.
- */
-char* get_object_description(void* reactor, int* index);
-
-/**
- * Get the trigger name for the specified pointer.
- * If there is no such trigger, return NULL.
- * If the index argument is non-null, then put the index
- * of the trigger in the table into the int pointed to
- * or -1 if none was found.
- * @param reactor The pointer to a self struct.
- * @param index An optional pointer into which to write the index.
- */
-char* get_trigger_name(void* trigger, int* index);
-
-/**
- * Print the object to description table.
- */
-void print_table();
-
-/**
- * Read header information.
- * @return The number of objects in the object table or -1 for failure.
- */
-size_t read_header();
-
-/**
- * Read the trace from the specified file and put it in the trace global
- * variable. Return the length of the trace.
- * @return The number of trace record read or 0 upon seeing an EOF.
- */
-int read_trace();
diff --git a/util/tracing/visualization/.gitignore b/util/tracing/visualization/.gitignore
deleted file mode 100644
index ba0430d26c..0000000000
--- a/util/tracing/visualization/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-__pycache__/
\ No newline at end of file
diff --git a/util/tracing/visualization/README.md b/util/tracing/visualization/README.md
deleted file mode 100644
index 4437540a6a..0000000000
--- a/util/tracing/visualization/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Trace sequence diagram visualizer
-
-`fedsd` is a utility that reports the interactions (exchanged messages)
-between federates and the RTI in a sequence-diagram-like format.
-
-To use `fedsd`, you need to first obtain an execution trace. To do this, enable the tracing mechanism in your Lingua Franca program by setting the `tracing` target property to `true` and then compile and run the program.
-
-This utility starts by transforming each `.lft` file into a `.csv` file, by
-internally running `trace_to_csv`. It then aggregates the data from all `.csv`
-files to do the matching and draw the sequence diagram.
-
-# Installing
-
-To build `fedsd`, change directory to `./util/tracing` relative to the root of the `lingua-franca` repository  and run `make install`.
-
-# Running
-
-In case the federation is launched using the `bash` script under `bin`, an `.lft` trace
-file will be generated for each of the federates, in addition to `rti.lft`. The latter
-contains the RTI trace.
-
-If, however, the federation is launched manually, then running the `RTI` command should be passed the `-t` flag in order to make sure that it, too, has tracing enabled:
-```
-$ RTI -n <number_of_federates> -t
-```
-
-It is most convenient to launch the RTI and all federates from the same working directory so that they will all write their trace file to that directory.
-
-Once the federation stopped executing, run `fedsd` on all generated `.lft` files:
-```
-$ fedsd *.lft
-```
-
-The output is an html file named `trace_svg.html` (in the current directory) that contains the sequence of interactions
-between the federates and the RTI.
diff --git a/util/tracing/visualization/fedsd.py b/util/tracing/visualization/fedsd.py
deleted file mode 100644
index 3480d5afb1..0000000000
--- a/util/tracing/visualization/fedsd.py
+++ /dev/null
@@ -1,331 +0,0 @@
-'''
-Define arrows:
-    (x1, y1) ==> (x2, y2), when unique result (this arrow will be tilted)
-    (x1, y1) --> (x2, y2), when a possible result (could be not tilted)?
-If not arrow, then triangle with text 
-
-In the dataframe, each row will be marked with one op these values:
-    - 'arrow': draw a non-dashed arrow
-    - 'dot': draw a dot only
-    - 'marked': marked, not to be drawn
-    - 'pending': pending
-    - 'adv': for reporting logical time advancing, draw a simple dash
-'''
-
-# Styles to determine appearance:
-css_style = ' <style> \
-    line { \
-        stroke: black; \
-        stroke-width: 2; \
-    } \
-    .ABS {stroke: #d9dd1f; fill: #d9dd1f; } \
-    .LTC { stroke: #073b4c; fill: #073b4c;} \
-    .T_MSG { stroke: #ef476f; fill: #ef476f} \
-    .NET { stroke: #118ab2; fill: #118ab2} \
-    .PTAG { stroke: #06d6a0; fill: #06d6a0} \
-    .TAG { stroke: #08a578; fill: #08a578} \
-    .TIMESTAMP { stroke: grey; fill: grey } \
-    .FED_ID {stroke: #80DD99; fill: #80DD99 } \
-    .ADV {stroke-linecap="round" ; stroke: "red" ; fill: "red"} \
-    text { \
-        font-size: smaller; \
-        font-family: sans-serif; \
-    } \
-    text.time {fill: #074936; } \
-</style> \
-'
-
-#!/usr/bin/env python3
-import argparse         # For arguments parsing
-import pandas as pd     # For csv manipulation
-from os.path import exists
-from pathlib import Path
-import math
-import fedsd_helper as fhlp
-
-# Define the arguments to pass in the command line
-parser = argparse.ArgumentParser(description='Set of the csv trace files to render.')
-parser.add_argument('-r','--rti', type=str, default="rti.csv",
-                    help='RTI csv trace file.')
-parser.add_argument('-f','--federates', nargs='+', action='append',
-                    help='List of the federates csv trace files.')
-
-# Events matching at the sender and receiver ends depend on whether they are tagged
-# (the elapsed logical time and microstep have to be the same) or not. 
-# Set of tagged events (messages)
-non_tagged_messages = {'FED_ID', 'ACK', 'REJECT', 'ADR_RQ', 'ADR_AD', 'MSG', 'P2P_MSG'}
-
-def load_and_process_csv_file(csv_file) :
-    '''
-    Loads and processes the csv entries, based on the type of the actor (if RTI
-    or federate).
-
-    Args:
-     * csv_file: String file name
-    Returns:
-     * The processed dataframe.
-    '''
-    # Load tracepoints, rename the columns and clean non useful data
-    df = pd.read_csv(csv_file)
-    df.columns = ['event', 'reactor', 'self_id', 'partner_id', 'logical_time', 'microstep', 'physical_time', 't', 'ed']
-    df = df.drop(columns=['reactor', 't', 'ed'])
-
-    # Remove all the lines that do not contain communication information
-    # which boils up to having 'RTI' in the 'event' column
-    df = df[df['event'].str.contains('Sending|Receiving|Scheduler advancing time ends') == True]
-
-    # Fix the parameters of the event 'Scheduler advancing time ends'
-    # We rely on the fact that the first row of the csv file cannot be the end of advancing time
-    id = df.iloc[-1]['self_id']
-    df['self_id'] = id
-    df = df.astype({'self_id': 'int', 'partner_id': 'int'})
-
-    # Add an inout column to set the arrow direction
-    df['inout'] = df['event'].apply(lambda e: 'in' if 'Receiving' in e else 'out')
-
-    # Prune event names
-    df['event'] = df['event'].apply(lambda e: fhlp.prune_event_name[e])
-    return df
-
-
-if __name__ == '__main__':
-    args = parser.parse_args()
-
-    # The RTI and each of the federates have a fixed x coordinate. They will be
-    # saved in a dict
-    x_coor = {}
-    actors = []
-    actors_names = {}
-    padding = 50
-    spacing = 200       # Spacing between federates
-
-    # Set the RTI x coordinate
-    x_coor[-1] = padding * 2
-    actors.append(-1)
-    actors_names[-1] = "RTI"
-   
-    trace_df = pd.DataFrame()
-
-    ############################################################################
-    #### Federates trace processing
-    ############################################################################
-    # Loop over the given list of federates trace files 
-    if (args.federates) :
-        for fed_trace in args.federates[0]:
-            if (not exists(fed_trace)):
-                print('Warning: Trace file ' + fed_trace + ' does not exist! Will resume though')
-                continue
-            try:
-                fed_df = load_and_process_csv_file(fed_trace)
-            except Exception as e:
-                print(f"Warning: Problem processing trace file {fed_trace}: `{e}`")
-                continue
-
-            if (not fed_df.empty):
-                # Get the federate id number
-                fed_id = fed_df.iloc[-1]['self_id']
-                # Add to the list of sequence diagram actors and add the name
-                actors.append(fed_id)
-                actors_names[fed_id] = Path(fed_trace).stem
-                # Derive the x coordinate of the actor
-                x_coor[fed_id] = (padding * 2) + (spacing * (len(actors) - 1))
-                fed_df['x1'] = x_coor[fed_id]
-                trace_df = pd.concat([trace_df, fed_df])
-                fed_df = fed_df[0:0]
-    
-        
-    ############################################################################
-    #### RTI trace processing, if any
-    ############################################################################
-    if (exists(args.rti)):
-        rti_df = load_and_process_csv_file(args.rti)
-        rti_df['x1'] = x_coor[-1]
-    else:
-        # If there is no RTI, derive one.
-        # This is particularly useful for tracing enclaves
-        # FIXME: Currently, `fedsd` is used either for federates OR enclaves.
-        # As soon as there is a consensus on how to visualize federations where
-        # a federate has several enclves, the utility will be updated.
-        rti_df = trace_df[['event', 'self_id', 'partner_id', 'logical_time', 'microstep', 'physical_time', 'inout']].copy()
-        rti_df = rti_df[rti_df['event'].str.contains('AdvLT') == False]
-        rti_df.columns = ['event', 'partner_id', 'self_id', 'logical_time', 'microstep', 'physical_time', 'inout']
-        rti_df['inout'] = rti_df['inout'].apply(lambda e: 'in' if 'out' in e else 'out')
-        rti_df['x1'] = rti_df['self_id'].apply(lambda e: x_coor[int(e)])
-
-    trace_df = pd.concat([trace_df, rti_df])
-
-    # Sort all traces by physical time and then reset the index
-    trace_df = trace_df.sort_values(by=['physical_time'])
-    trace_df = trace_df.reset_index(drop=True)
-
-    # Add the Y column and initialize it with the padding value 
-    trace_df['y1'] = math.ceil(padding * 3 / 2) # Or set a small shift
-
-    ############################################################################
-    #### Compute the 'y1' coordinates
-    ############################################################################
-    ppt = 0     # Previous physical time
-    cpt = 0     # Current physical time
-    py = 0      # Previous y
-    min = 15    # Minimum spacing between events when time has not advanced.
-    scale = 1   # Will probably be set manually
-    first_pass = True
-    for index, row in trace_df.iterrows():
-        if (not first_pass) :
-            cpt = row['physical_time']
-            # print('cpt = '+str(cpt)+' and ppt = '+str(ppt))
-            # From the email:
-            # Y = T_previous + min + log10(1 + (T - T_previous)*scale)
-            # But rather think it should be:
-            if (cpt != ppt) :
-                py = math.ceil(py + min + (1 + math.log10(cpt - ppt) * scale))
-            trace_df.at[index, 'y1'] = py
-
-        ppt = row['physical_time']
-        py = trace_df.at[index, 'y1']
-        first_pass = False
-
-    ############################################################################
-    #### Derive arrows that match sided communications
-    ############################################################################
-    # Intialize all rows as pending to be matched
-    trace_df['arrow'] = 'pending'
-    trace_df['x2'] = -1
-    trace_df['y2'] = -1
-
-    # Iterate and check possible sides
-    for index in trace_df.index:
-        # If the tracepoint is pending, proceed to look for a match
-        if (trace_df.at[index,'arrow'] == 'pending') :
-            # Look for a match only if it is not about advancing time
-            if (trace_df.at[index,'event'] == 'AdvLT') :
-                trace_df.at[index,'arrow'] = 'adv'
-                continue
-            self_id = trace_df.at[index,'self_id']
-            partner_id = trace_df.at[index,'partner_id']
-            event =  trace_df.at[index,'event']
-            logical_time = trace_df.at[index, 'logical_time']
-            microstep = trace_df.at[index, 'microstep']
-            inout = trace_df.at[index, 'inout']
-
-            # Match tracepoints
-            # Depends on whether the event is tagged or not
-            if (trace_df.at[index,'event'] not in non_tagged_messages):
-                matching_df = trace_df[\
-                    (trace_df['inout'] != inout) & \
-                    (trace_df['self_id'] == partner_id) & \
-                    (trace_df['partner_id'] == self_id) & \
-                    (trace_df['arrow'] == 'pending') & \
-                    (trace_df['event'] == event) & \
-                    (trace_df['logical_time'] == logical_time) & \
-                    (trace_df['microstep'] == microstep) \
-                ]
-            else :
-                matching_df = trace_df[\
-                    (trace_df['inout'] != inout) & \
-                    (trace_df['self_id'] == partner_id) & \
-                    (trace_df['partner_id'] == self_id) & \
-                    (trace_df['arrow'] == 'pending') & \
-                    (trace_df['event'] == event)
-                ]
-
-            if (matching_df.empty) :
-                # If no matching receiver, than set the arrow to 'dot',
-                # meaning that only a dot will be rendered
-                trace_df.at[index, 'arrow'] = 'dot'
-            else:
-                # If there is one or more matching rows, then consider 
-                # the first one
-                matching_index = matching_df.index[0]
-                matching_row = matching_df.loc[matching_index]
-                if (inout == 'out'):
-                    trace_df.at[index, 'x2'] = matching_row['x1']
-                    trace_df.at[index, 'y2'] = matching_row['y1']
-                else:
-                    trace_df.at[index, 'x2'] = trace_df.at[index, 'x1'] 
-                    trace_df.at[index, 'y2'] = trace_df.at[index, 'y1'] 
-                    trace_df.at[index, 'x1'] = matching_row['x1']
-                    trace_df.at[index, 'y1'] = matching_row['y1']
-
-                # Mark it, so not to consider it anymore
-                trace_df.at[matching_index, 'arrow'] = 'marked'
-                trace_df.at[index, 'arrow'] = 'arrow'
-
-    ############################################################################
-    #### Write to svg file
-    ############################################################################
-    svg_width = padding * 2 + (len(actors) - 1) * spacing + padding * 2 + 200
-    svg_height = padding + trace_df.iloc[-1]['y1']
-
-    with open('trace_svg.html', 'w', encoding='utf-8') as f:
-        # Print header
-        f.write('<!DOCTYPE html>\n')
-        f.write('<html>\n')
-        f.write('<body>\n\n')
-        
-        f.write('<svg width="'+str(svg_width)+'" height="'+str(svg_height)+'">\n')
-
-        f.write(css_style)
-        
-        # Print the circles and the names
-        for key in x_coor:
-            title = actors_names[key]
-            if (key == -1):
-                f.write(fhlp.svg_string_comment('RTI Actor and line'))
-                center = 15
-            else:
-                f.write(fhlp.svg_string_comment('Federate '+str(key)+': ' + title + ' Actor and line'))
-                center = 5
-            f.write(fhlp.svg_string_draw_line(x_coor[key], math.ceil(padding/2), x_coor[key], svg_height, False))
-            f.write('\t<circle cx="'+str(x_coor[key])+'" cy="'+str(math.ceil(padding/2))+'" r="20" stroke="black" stroke-width="2" fill="white"/>\n')
-            f.write('\t<text x="'+str(x_coor[key]-center)+'" y="'+str(math.ceil(padding/2)+5)+'" fill="black">'+title+'</text>\n')
-
-        # Now, we need to iterate over the traces to draw the lines
-        f.write(fhlp.svg_string_comment('Draw interactions'))
-        for index, row in trace_df.iterrows():
-            # For time labels, display them on the left for the RTI, right for everthing else.
-            anchor = 'start'
-            if (row['self_id'] < 0):
-                anchor = 'end'
-
-            # formatted physical time.
-            # FIXME: Using microseconds is hardwired here.
-            physical_time = f'{int(row["physical_time"]/1000):,}'
-
-            if (row['event'] in {'FED_ID', 'ACK', 'REJECT', 'ADR_RQ', 'ADR_AD', 'MSG', 'P2P_MSG'}):
-                label = row['event']
-            else:
-                label = row['event'] + '(' + f'{int(row["logical_time"]):,}' + ', ' + str(row['microstep']) + ')'
-            
-            if (row['arrow'] == 'arrow'): 
-                f.write(fhlp.svg_string_draw_arrow(row['x1'], row['y1'], row['x2'], row['y2'], label, row['event']))
-                if (row['inout'] in 'in'):
-                    f.write(fhlp.svg_string_draw_side_label(row['x2'], row['y2'], physical_time, anchor))
-                else:
-                    f.write(fhlp.svg_string_draw_side_label(row['x1'], row['y1'], physical_time, anchor))
-            elif (row['arrow'] == 'dot'):
-                if (row['inout'] == 'in'):
-                    label = "(in) from " + str(row['partner_id']) + ' ' + label
-                else :
-                    label = "(out) to " + str(row['partner_id']) + ' ' + label
-                
-                if (anchor == 'end'):
-                    f.write(fhlp.svg_string_draw_side_label(row['x1'], row['y1'], physical_time, anchor))
-                    f.write(fhlp.svg_string_draw_dot(row['x1'], row['y1'], label))
-                else:
-                    f.write(fhlp.svg_string_draw_dot_with_time(row['x1'], row['y1'], physical_time, label))
-
-            elif (row['arrow'] == 'marked'):
-                f.write(fhlp.svg_string_draw_side_label(row['x1'], row['y1'], physical_time, anchor))
-
-            elif (row['arrow'] == 'adv'):
-                f.write(fhlp.svg_string_draw_adv(row['x1'], row['y1'], label))
-
-        f.write('\n</svg>\n\n')
-
-        # Print footer
-        f.write('</body>\n')
-        f.write('</html>\n')
-
-    # Write to a csv file, just to double check
-    trace_df.to_csv('all.csv', index=True)
\ No newline at end of file
diff --git a/util/tracing/visualization/fedsd_helper.py b/util/tracing/visualization/fedsd_helper.py
deleted file mode 100644
index 561429a184..0000000000
--- a/util/tracing/visualization/fedsd_helper.py
+++ /dev/null
@@ -1,255 +0,0 @@
-import math
-
-# Disctionary for pruning event names. Usefule for tracepoint matching and
-# communication rendering
-prune_event_name = {
-    "Sending ACK": "ACK",
-    "Sending TIMESTAMP": "TIMESTAMP",
-    "Sending NET": "NET",
-    "Sending LTC": "LTC",
-    "Sending STOP_REQ": "STOP_REQ",
-    "Sending STOP_REQ_REP": "STOP_REQ_REP",
-    "Sending STOP_GRN": "STOP_GRN",
-    "Sending FED_ID": "FED_ID",
-    "Sending PTAG": "PTAG",
-    "Sending TAG": "TAG",
-    "Sending REJECT": "REJECT",
-    "Sending RESIGN": "RESIGN",
-    "Sending PORT_ABS": "ABS",
-    "Sending CLOSE_RQ": "CLOSE_RQ",
-    "Sending TAGGED_MSG": "T_MSG",
-    "Sending P2P_TAGGED_MSG": "P2P_T_MSG",
-    "Sending MSG": "MSG",
-    "Sending P2P_MSG": "P2P_MSG",
-    "Sending ADR_AD": "ADR_AD",
-    "Sending ADR_QR": "ADR_QR",
-    "Receiving ACK": "ACK",
-    "Receiving TIMESTAMP": "TIMESTAMP",
-    "Receiving NET": "NET",
-    "Receiving LTC": "LTC",
-    "Receiving STOP_REQ": "STOP_REQ",
-    "Receiving STOP_REQ_REP": "STOP_REQ_REP",
-    "Receiving STOP_GRN": "STOP_GRN",
-    "Receiving FED_ID": "FED_ID",
-    "Receiving PTAG": "PTAG",
-    "Receiving TAG": "TAG",
-    "Receiving REJECT": "REJECT",
-    "Receiving RESIGN": "RESIGN",
-    "Receiving PORT_ABS": "ABS",
-    "Receiving CLOSE_RQ": "CLOSE_RQ",
-    "Receiving TAGGED_MSG": "T_MSG",
-    "Receiving P2P_TAGGED_MSG": "P2P_T_MSG",
-    "Receiving MSG": "MSG",
-    "Receiving P2P_MSG": "P2P_MSG",
-    "Receiving ADR_AD": "ADR_AD",
-    "Receiving ADR_QR": "ADR_QR",
-    "Receiving UNIDENTIFIED": "UNIDENTIFIED",
-    "Scheduler advancing time ends": "AdvLT"
-}
-
-prune_event_name.setdefault(" ", "UNIDENTIFIED")
-
-################################################################################
-### Routines to write to csv file
-################################################################################
-
-def svg_string_draw_line(x1, y1, x2, y2, type=''):
-    '''
-    Constructs the svg html string to draw a line from (x1, y1) to (x2, y2).
-
-    Args:
-     * x1: Int X coordinate of the source point
-     * y1: Int Y coordinate of the source point
-     * x2: Int X coordinate of the sink point
-     * y2: Int Y coordinate of the sink point
-     * type: The type of the message (for styling)
-    Returns:
-     * String: the svg string of the line©
-    '''
-    str_line = '\t<line x1="'+str(x1)+'" y1="'+str(y1)+'" x2="'+str(x2)+'" y2="'+str(y2)+'"'
-    if (type):
-            str_line = str_line + ' class="' + type + '"'
- 
-    str_line = str_line +  '/>\n'
-    return str_line
-
-
-def svg_string_draw_arrow_head(x1, y1, x2, y2, type='') :
-    '''
-    Constructs the svg html string to draw the arrow end
-
-    Args:
-     * x1: Int X coordinate of the source point
-     * y1: Int Y coordinate of the source point
-     * x2: Int X coordinate of the sink point
-     * y2: Int Y coordinate of the sink point
-     * type: The type (for styling)
-    Returns:
-     * String: the svg string of the triangle
-    '''
-
-    if (y2 != y1):
-        rotation = - math.ceil(math.atan((x2-x1)/(y2-y1)) * 180 / 3.14) - 90
-    else:
-        if (x1 > x2):
-            rotation = 0
-        else:
-            rotation = - 180
-        
-    style = ''
-    if (type):
-        style = ' class="'+type+'"'
-    
-    str_line = ''
-    if (x1 > x2) :
-        str_line = '\t<path d="M'+str(x2)+' '+str(y2)+' L'+str(x2+10)+' '+str(y2+5)+' L'+str(x2+10)+' '+str(y2-5)+' Z"' \
-             + ' transform="rotate('+str(rotation)+')" transform-origin="'+str(x2)+' '+str(y2)+'"' \
-             + style \
-             + '/>\n'
-    else :
-        str_line = '\t<path d="M'+str(x2)+' '+str(y2)+' L'+str(x2-10)+' '+str(y2+5)+' L'+str(x2-10)+' '+str(y2-5)+' Z"' \
-             + ' transform="rotate('+str( 180 + rotation)+')" transform-origin="'+str(x2)+' '+str(y2)+'"' \
-             + style \
-             + '/>\n'
-
-    return str_line
-
-
-def svg_string_draw_label(x1, y1, x2, y2, label) :
-    '''
-    Computes the rotation angle of the text and then constructs the svg string. 
-
-    Args:
-     * x1: Int X coordinate of the source point
-     * y1: Int Y coordinate of the source point
-     * x2: Int X coordinate of the sink point
-     * y2: Int Y coordinate of the sink point
-     * label: The label to draw
-    Returns:
-     * String: the svg string of the text
-    '''
-    # FIXME: Need further improvement, based of the position of the arrows
-    # FIXME: Rotation value is not that accurate. 
-    if (x2 < x1) :
-        # Left-going arrow.
-        if (y2 != y1):
-            rotation = - math.ceil(math.atan((x2-x1)/(y2-y1)) * 180 / 3.14) - 90
-        else:
-            rotation = 0
-
-        str_line = '\t<text text-anchor="end" transform="translate('+str(x1-10)+', '+str(y1-5)+') rotate('+str(rotation)+')">'+label+'</text>\n'
-    else :
-        # Right-going arrow.
-        if (y2 != y1):
-            rotation = - math.ceil(math.atan((x1-x2)/(y1-y2)) * 180 / 3.14) + 90
-        else:
-            rotation = 0
-        str_line = '\t<text transform="translate('+str(x1+10)+', '+str(y1-5)+') rotate('+str(rotation)+')" text-anchor="start">'+label+'</text>\n'
-    #print('rot = '+str(rotation)+' x1='+str(x1)+' y1='+str(y1)+' x2='+str(x2)+' y2='+str(y2))
-    return str_line
-
-
-def svg_string_draw_arrow(x1, y1, x2, y2, label, type=''):
-    '''
-    Constructs the svg html string to draw the arrow from (x1, y1) to (x2, y2). 
-    The arrow end is constructed, together with the label
-
-    Args:
-     * x1: Int X coordinate of the source point
-     * y1: Int Y coordinate of the source point
-     * x2: Int X coordinate of the sink point
-     * y2: Int Y coordinate of the sink point
-     * label: String Label to draw on top of the arrow
-     * type: The type of the message
-    Returns:
-     * String: the svg string of the arrow
-    '''
-    str_line1 = svg_string_draw_line(x1, y1, x2, y2, type)
-    str_line2 = svg_string_draw_arrow_head(x1, y1, x2, y2, type)
-    str_line3 = svg_string_draw_label(x1, y1, x2, y2, label)
-    return str_line1 + str_line2 + str_line3
-
-def svg_string_draw_side_label(x, y, label, anchor="start") :
-    '''
-    Put a label to the right of the x, y point,
-    unless x is small, in which case put it to the left.
-
-    Args:
-     * x: Int X coordinate of the source point
-     * y: Int Y coordinate of the source point
-     * label: Label to put by the point.
-     * anchor: One of "start", "middle", or "end" to specify the text-anchor.
-    Returns:
-     * String: the svg string of the text
-    '''
-    offset = 5
-    if (anchor == 'end'):
-        offset = -5
-    elif (anchor == 'middle'):
-        offset = 0
-    str_line = '\t<text text-anchor="'+anchor+'"' \
-    +' class="time"' \
-    +' transform="translate('+str(x+offset)+', '+str(y+5)+')">'+label+'</text>\n'
-
-    return str_line
-
-def svg_string_comment(comment):
-    '''
-    Constructs the svg html string to write a comment into an svg file.
-
-    Args:
-     * comment: String Comment to add
-    Returns:
-     * String: the svg string of the comment
-    '''
-    str_line = '\n\t<!-- ' + comment + ' -->\n'
-    return str_line
-
-
-def svg_string_draw_dot(x, y, label) :
-    '''
-    Constructs the svg html string to draw at a dot.
-
-    Args:
-     * x: Int X coordinate of the dot
-     * y: Int Y coordinate of the dot
-     * label: String to draw 
-    Returns:
-     * String: the svg string of the triangle
-    '''
-    str_line = ''
-    str_line = '\t<circle cx="'+str(x)+'" cy="'+str(y)+'" r="3" stroke="black" stroke-width="1" fill="black"/>\n'
-    str_line = str_line + '\t<text x="'+str(x+5)+'", y="'+str(y+5)+'" fill="blue">'+label+'</text>\n'
-    return str_line
-
-def svg_string_draw_dot_with_time(x, y, time, label) :
-    '''
-    Constructs the svg html string to draw at a dot with a prefixed physical time.
-
-    Args:
-     * x: Int X coordinate of the dot
-     * y: Int Y coordinate of the dot
-     * time: The time
-     * label: String to draw 
-    Returns:
-     * String: the svg string of the triangle
-    '''
-    str_line = ''
-    str_line = '\t<circle cx="'+str(x)+'" cy="'+str(y)+'" r="3" stroke="black" stroke-width="1" fill="black"/>\n'
-    str_line = str_line + '\t<text x="'+str(x+5)+'", y="'+str(y+5)+'"> <tspan class="time">'+time+':</tspan> <tspan fill="blue">'+label+'</tspan></text>\n'
-    return str_line
-
-def svg_string_draw_adv(x, y, label) :
-    '''
-    Constructs the svg html string to draw at a dash, meaning that logical time is advancing there.
-
-    Args:
-     * x: Int X coordinate of the dash
-     * y: Int Y coordinate of the dash
-     * label: String to draw 
-    Returns:
-     * String: the svg string of the triangle
-    '''
-    str_line1 = svg_string_draw_line(x-5, y, x+5, y, "ADV")
-    str_line2 = svg_string_draw_side_label(x, y, label)
-    return str_line1 + str_line2
\ No newline at end of file

From 793cebb6e42ba983355b2993d834e8322da18114 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Tue, 15 Aug 2023 18:49:44 +0200
Subject: [PATCH 0758/1114] Move zphyr run script and fedsd from util

---
 .../scripts/run-zephyr-tests.sh               |   0
 .github/workflows/c-zephyr-tests.yml          |   6 +-
 util/scripts/launch-fedsd.sh                  | 102 ------------------
 3 files changed, 3 insertions(+), 105 deletions(-)
 rename util/RunZephyrTests.sh => .github/scripts/run-zephyr-tests.sh (100%)
 delete mode 100755 util/scripts/launch-fedsd.sh

diff --git a/util/RunZephyrTests.sh b/.github/scripts/run-zephyr-tests.sh
similarity index 100%
rename from util/RunZephyrTests.sh
rename to .github/scripts/run-zephyr-tests.sh
diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index 0375c408a8..49c073d03b 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -42,17 +42,17 @@ jobs:
       - name: Run Zephyr smoke tests
         run: |
           ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildZephyr* core:integrationTestCodeCoverageReport
-          util/RunZephyrTests.sh test/C/src-gen
+          ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
           rm -r test/C/src-gen
       - name: Run basic tests
         run: |
           ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildBasic* core:integrationTestCodeCoverageReport
-          util/RunZephyrTests.sh test/C/src-gen
+          ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
           rm -r test/C/src-gen
       - name: Run concurrent tests
         run: |
           ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildConcurrent* core:integrationTestCodeCoverageReport
-          util/RunZephyrTests.sh test/C/src-gen
+          ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
           rm -r test/C/src-gen
       - name: Report to CodeCov
         uses: ./.github/actions/report-code-coverage
diff --git a/util/scripts/launch-fedsd.sh b/util/scripts/launch-fedsd.sh
deleted file mode 100755
index 341e673324..0000000000
--- a/util/scripts/launch-fedsd.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/bash
-
-#============================================================================
-# Description:      Visualize federated trace data for RTI-federate interactions.
-# Authors:          Chadlia Jerad
-#                   Edward A. Lee
-# Usage:            Usage: fedsd -r [rti.csv] -f [fed.csv ...]
-#============================================================================
-
-#============================================================================
-# Preamble
-#============================================================================
-
-# Copied from build.sh    FIXME: How to avoid copying
-
-# Find the directory in which this script resides in a way that is compatible
-# with MacOS, which has a `readlink` implementation that does not support the
-# necessary `-f` flag to canonicalize by following every symlink in every
-# component of the given name recursively.
-# This solution, adapted from an example written by Geoff Nixon, is POSIX-
-# compliant and robust to symbolic links. If a chain of more than 1000 links
-# is encountered, we return.
-find_dir() (
-  start_dir=$PWD
-  cd "$(dirname "$1")"
-  link=$(readlink "$(basename "$1")")
-  count=0
-  while [ "${link}" ]; do
-    if [[ "${count}" -lt 1000 ]]; then
-        cd "$(dirname "${link}")"
-        link=$(readlink "$(basename "$1")")
-        ((count++))
-    else
-        return
-    fi
-  done
-  real_path="$PWD/$(basename "$1")"
-  cd "${start_dir}"
-  echo `dirname "${real_path}"`
-)
-
-# Report fatal error and exit.
-function fatal_error() {
-    1>&2 echo -e "\e[1mfedsd: \e[31mfatal error: \e[0m$1"
-    exit 1
-}
-
-abs_path="$(find_dir "$0")"
-
-if [[ "${abs_path}" ]]; then
-    base=`dirname $(dirname ${abs_path})`
-else
-    fatal_error "Unable to determine absolute path to $0."
-fi
-
-# Get the lft files
-lft_files_list=$@
-
-if [ -z "$lft_files_list" ]
-then
-    echo "Usage: fedsd [lft files]"
-    exit 1
-fi
-
-# Initialize variables
-csv_files_list=''
-extension='.csv'
-rti_csv_file=''
-
-# Iterate over the lft file list to:
-#  - First, transform into csv
-#  - Second, construct the csv fiel name
-#  - Then construct the csv file list
-# The csv file list does include the rti, it is put in a separate variable
-for each_lft_file in $lft_files_list
-    do
-        # Tranform to csv
-        ${base}/bin/trace_to_csv $each_lft_file
-        # Get the file name
-        csv=${each_lft_file%.*}
-        if [ $csv == 'rti' ]
-        then
-            # Set the rti csv file
-            rti_csv_file='rti.csv'
-        else
-            # Construct the csv file name and add it to the list
-            csv_files_list="$csv$extension $csv_files_list"
-        fi
-    done
-
-# echo $lft_files_list
-# echo $rti_csv_file
-# echo $csv_files_list
-
-# FIXME: Check that python3 is in the path.
-if [ ! -z $rti_csv_file ]
-then
-    python3 "${base}/util/tracing/visualization/fedsd.py" "-f" $csv_files_list
-else
-    echo Building the communication diagram for the following trace files: $lft_files_list in trace_svg.html
-    python3 "${base}/util/tracing/visualization/fedsd.py" "-r" "$rti_csv_file" "-f" $csv_files_list
-fi

From f5a58d7d417cc19018fc52bf14769d3c680f48f3 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Tue, 15 Aug 2023 18:49:59 +0200
Subject: [PATCH 0759/1114] Bump reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 809c454db0..24b21d3451 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 809c454db07c1b5e03a789a4863137107b817da6
+Subproject commit 24b21d3451677a0229d0a068c8764537166179b8

From 3891436dbe002ed49fdb3efa4bfee063bbee256f Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <78055940+byeong-gil@users.noreply.github.com>
Date: Wed, 16 Aug 2023 10:58:00 +0900
Subject: [PATCH 0760/1114] Update package.json

---
 core/src/main/resources/lib/ts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/ts/package.json b/core/src/main/resources/lib/ts/package.json
index 4797fd56ed..fc063d791e 100644
--- a/core/src/main/resources/lib/ts/package.json
+++ b/core/src/main/resources/lib/ts/package.json
@@ -2,7 +2,7 @@
     "name": "LinguaFrancaDefault",
     "type": "commonjs",
     "dependencies": {
-        "@lf-lang/reactor-ts": "git://github.com/lf-lang/reactor-ts.git#ts-cyclic-dependencies",
+        "@lf-lang/reactor-ts": "git://github.com/lf-lang/reactor-ts.git#master",
         "command-line-args": "^5.1.1",
         "command-line-usage": "^6.1.3"
     },

From 9e898ec3ced32771fd55550278c52ce07c4214d4 Mon Sep 17 00:00:00 2001
From: Soeren Domroes <sdo@informatik.uni-kiel.de>
Date: Wed, 16 Aug 2023 16:26:05 +0200
Subject: [PATCH 0761/1114] First prototype @layout annotation.

---
 .../main/java/org/lflang/AttributeUtils.java  | 47 +++++++++++++++++++
 .../synthesis/LinguaFrancaSynthesis.java      | 26 +++++++++-
 .../org/lflang/validation/AttributeSpec.java  |  5 ++
 3 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/AttributeUtils.java b/core/src/main/java/org/lflang/AttributeUtils.java
index f611e92cd7..c10258abe8 100644
--- a/core/src/main/java/org/lflang/AttributeUtils.java
+++ b/core/src/main/java/org/lflang/AttributeUtils.java
@@ -27,8 +27,11 @@
 
 import static org.lflang.ast.ASTUtils.factory;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.nodemodel.ICompositeNode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
@@ -101,6 +104,24 @@ public static Attribute findAttributeByName(EObject node, String name) {
         .orElse(null);
   }
 
+  /**
+   * Return the attributes with the given name.
+   *
+   * @throws IllegalArgumentException If the node cannot have attributes
+   */
+  public static List<Attribute> findAttributesByName(EObject node, String name) {
+    List<Attribute> attrs = getAttributes(node);
+    if (!attrs.isEmpty()) {
+      System.out.println("Fun");
+    }
+    return attrs.stream()
+        .filter(
+            it ->
+                it.getAttrName()
+                    .equalsIgnoreCase(name)) // case-insensitive search (more user-friendly)
+        .toList();
+  }
+
   /**
    * Return the first argument specified for the attribute.
    *
@@ -133,6 +154,24 @@ public static String getAttributeValue(EObject node, String attrName) {
     return value;
   }
 
+  /**
+   * Search for an attribute with the given name on the given AST node and return its first argument
+   * as a String.
+   *
+   * <p>This should only be used on attributes that are expected to have a single argument.
+   *
+   * <p>Returns null if the attribute is not found or if it does not have any arguments.
+   */
+  public static Map<String, String> getAttributeValues(EObject node, String attrName) {
+    final List<Attribute> attrs = findAttributesByName(node, attrName);
+    HashMap<String, String> layoutOptions = new HashMap<>();
+    for (Attribute attribute : attrs) {
+      layoutOptions.put(StringUtil.removeQuotes(attribute.getAttrParms().get(0).getValue()),
+          StringUtil.removeQuotes(attribute.getAttrParms().get(1).getValue()));
+    }
+    return layoutOptions;
+  }
+
   /**
    * Retrieve a specific annotation in a comment associated with the given model element in the AST.
    *
@@ -241,6 +280,14 @@ public static String getPortSide(EObject node) {
     return getAttributeValue(node, "side");
   }
 
+  /**
+   * Return the {@code layout} annotation for the given element or null if there is
+   * no such annotation.
+   */
+  public static Map<String, String> getLayoutOption(EObject node) {
+    return getAttributeValues(node, "layout");
+  }
+
   /**
    * Return the {@code @enclave} attribute annotated on the given node.
    *
diff --git a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index 272b483607..0d0b5b93ad 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -32,6 +32,7 @@
 import de.cau.cs.kieler.klighd.DisplayedActionData;
 import de.cau.cs.kieler.klighd.Klighd;
 import de.cau.cs.kieler.klighd.SynthesisOption;
+import de.cau.cs.kieler.klighd.kgraph.EMapPropertyHolder;
 import de.cau.cs.kieler.klighd.kgraph.KEdge;
 import de.cau.cs.kieler.klighd.kgraph.KLabel;
 import de.cau.cs.kieler.klighd.kgraph.KNode;
@@ -68,12 +69,16 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import javax.inject.Inject;
+
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.elk.alg.layered.options.LayerConstraint;
 import org.eclipse.elk.alg.layered.options.LayeredOptions;
 import org.eclipse.elk.alg.layered.options.NodePlacementStrategy;
+import org.eclipse.elk.core.data.LayoutMetaDataService;
+import org.eclipse.elk.core.data.LayoutOptionData;
 import org.eclipse.elk.core.math.ElkMargin;
 import org.eclipse.elk.core.math.ElkPadding;
 import org.eclipse.elk.core.math.KVector;
@@ -159,6 +164,9 @@ public class LinguaFrancaSynthesis extends AbstractDiagramSynthesis<Model> {
 
   // -------------------------------------------------------------------------
 
+  /** Service class for accessing layout options by name */
+  private static final LayoutMetaDataService LAYOUT_OPTIONS_SERVICE = LayoutMetaDataService.getInstance();
+
   public static final String ID = "org.lflang.diagram.synthesis.LinguaFrancaSynthesis";
 
   // -- INTERNAL --
@@ -732,7 +740,7 @@ private Collection<KNode> createReactorNode(
         nodes.add(errNode);
       }
     }
-
+    setAnnotatedLayoutOptions(reactor, node);
     return nodes;
   }
 
@@ -1722,4 +1730,20 @@ private Iterable<KNode> createUserComments(EObject element, KNode targetNode) {
     }
     return List.of();
   }
+
+  /**
+   * Searches the "@layout" annotations and applies them to the corresponding element.
+   *
+   * @param kgraphElement The view model element to apply the layout options to, e.g. a KNode.
+   * @param modelElement The model element that has the annotations, e.g. a reactor.
+   */
+  private void setAnnotatedLayoutOptions(EObject modelElement, EMapPropertyHolder kgraphElement) {
+    Map<String, String> options = AttributeUtils.getLayoutOption(modelElement);
+    for (String key : options.keySet()) {
+      LayoutOptionData data = LAYOUT_OPTIONS_SERVICE.getOptionDataBySuffix(key);
+      if (data != null) {
+        kgraphElement.setProperty(data, data.parseValue(options.get(key)));
+      }
+    }
+  }
 }
diff --git a/core/src/main/java/org/lflang/validation/AttributeSpec.java b/core/src/main/java/org/lflang/validation/AttributeSpec.java
index 90e7f9cf6d..1df9a0c6ef 100644
--- a/core/src/main/java/org/lflang/validation/AttributeSpec.java
+++ b/core/src/main/java/org/lflang/validation/AttributeSpec.java
@@ -213,6 +213,11 @@ enum AttrParamType {
     ATTRIBUTE_SPECS_BY_NAME.put(
         "side",
         new AttributeSpec(List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))));
+    // @layout("string", "any") e.g. @layout("port.side", "WEST")
+    ATTRIBUTE_SPECS_BY_NAME.put(
+        "layout",
+        new AttributeSpec(List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false),
+            new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))));
     // @enclave(each=boolean)
     ATTRIBUTE_SPECS_BY_NAME.put(
         "enclave",

From 6de9d85b425e050e26bc4005c9aaaa09334f27e5 Mon Sep 17 00:00:00 2001
From: Soeren Domroes <sdo@informatik.uni-kiel.de>
Date: Wed, 16 Aug 2023 17:18:25 +0200
Subject: [PATCH 0762/1114] Added annotation for all annotatable elements.

---
 .../lflang/diagram/synthesis/LinguaFrancaSynthesis.java  | 9 +++++++--
 .../main/java/org/lflang/validation/AttributeSpec.java   | 5 +++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index 0d0b5b93ad..d10597f44a 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -491,6 +491,7 @@ private Collection<KNode> createReactorNode(
       Iterables.addAll(nodes, createUserComments(reactor, node));
       configureReactorNodeLayout(node, true);
       _layoutPostProcessing.configureMainReactor(node);
+      setAnnotatedLayoutOptions(reactor, node);
     } else {
       ReactorInstance instance = reactorInstance;
 
@@ -731,6 +732,7 @@ private Collection<KNode> createReactorNode(
       }
       configureReactorNodeLayout(node, false);
       _layoutPostProcessing.configureReactor(node);
+      setAnnotatedLayoutOptions(reactor, node);
     }
 
     // Find and annotate cycles
@@ -740,7 +742,6 @@ private Collection<KNode> createReactorNode(
         nodes.add(errNode);
       }
     }
-    setAnnotatedLayoutOptions(reactor, node);
     return nodes;
   }
 
@@ -1043,6 +1044,7 @@ private Collection<KNode> transformReactorNetwork(
       timerNodes.put(timer, node);
       _linguaFrancaShapeExtensions.addTimerFigure(node, timer);
       _layoutPostProcessing.configureTimer(node);
+      setAnnotatedLayoutOptions(timer.getDefinition(), node);
     }
 
     // Create reactions
@@ -1057,6 +1059,7 @@ private Collection<KNode> transformReactorNetwork(
 
       setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FIXED_SIDE);
       _layoutPostProcessing.configureReaction(node);
+      setAnnotatedLayoutOptions(reaction.getDefinition(), node);
       setLayoutOption(
           node,
           LayeredOptions.POSITION,
@@ -1210,6 +1213,7 @@ private Collection<KNode> transformReactorNetwork(
       Iterables.addAll(nodes, createUserComments(action.getDefinition(), node));
       setLayoutOption(node, CoreOptions.PORT_CONSTRAINTS, PortConstraints.FIXED_SIDE);
       _layoutPostProcessing.configureAction(node);
+      setAnnotatedLayoutOptions(action.getDefinition(), node);
       Pair<KPort, KPort> ports =
           _linguaFrancaShapeExtensions.addActionFigureAndPorts(
               node, action.isPhysical() ? "P" : "L");
@@ -1666,6 +1670,7 @@ private KPort addIOPort(
       }
     }
     associateWith(_kLabelExtensions.addOutsidePortLabel(port, label, 8), lfPort.getDefinition());
+    setAnnotatedLayoutOptions(lfPort.getDefinition(), port);
     return port;
   }
 
@@ -1737,7 +1742,7 @@ private Iterable<KNode> createUserComments(EObject element, KNode targetNode) {
    * @param kgraphElement The view model element to apply the layout options to, e.g. a KNode.
    * @param modelElement The model element that has the annotations, e.g. a reactor.
    */
-  private void setAnnotatedLayoutOptions(EObject modelElement, EMapPropertyHolder kgraphElement) {
+  public void setAnnotatedLayoutOptions(EObject modelElement, EMapPropertyHolder kgraphElement) {
     Map<String, String> options = AttributeUtils.getLayoutOption(modelElement);
     for (String key : options.keySet()) {
       LayoutOptionData data = LAYOUT_OPTIONS_SERVICE.getOptionDataBySuffix(key);
diff --git a/core/src/main/java/org/lflang/validation/AttributeSpec.java b/core/src/main/java/org/lflang/validation/AttributeSpec.java
index 1df9a0c6ef..6d1da3e0a3 100644
--- a/core/src/main/java/org/lflang/validation/AttributeSpec.java
+++ b/core/src/main/java/org/lflang/validation/AttributeSpec.java
@@ -50,6 +50,7 @@ public class AttributeSpec {
   public static final String VALUE_ATTR = "value";
   public static final String NETWORK_MESSAGE_ACTIONS = "network_message_actions";
   public static final String EACH_ATTR = "each";
+  public static final String OPTION_ATTR = "option";
 
   /** A map from a string to a supported AttributeSpec */
   public static final Map<String, AttributeSpec> ATTRIBUTE_SPECS_BY_NAME = new HashMap<>();
@@ -213,10 +214,10 @@ enum AttrParamType {
     ATTRIBUTE_SPECS_BY_NAME.put(
         "side",
         new AttributeSpec(List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))));
-    // @layout("string", "any") e.g. @layout("port.side", "WEST")
+    // @layout(option="string", value="any") e.g. @layout(option="port.side", value="WEST")
     ATTRIBUTE_SPECS_BY_NAME.put(
         "layout",
-        new AttributeSpec(List.of(new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false),
+        new AttributeSpec(List.of(new AttrParamSpec(OPTION_ATTR, AttrParamType.STRING, false),
             new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))));
     // @enclave(each=boolean)
     ATTRIBUTE_SPECS_BY_NAME.put(

From 6ddb1c7c2e0efc32f3ea4ce2a926fe6b7a4dc350 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Wed, 16 Aug 2023 17:32:00 +0200
Subject: [PATCH 0763/1114] Move CI testing of trace tools to reactor-c

---
 .github/workflows/all-misc.yml                |  8 ------
 .github/workflows/build-trace-tools.yml       | 26 -------------------
 .../non-target-specific-extended.yml          |  7 -----
 core/src/main/resources/lib/c/reactor-c       |  2 +-
 4 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 .github/workflows/build-trace-tools.yml

diff --git a/.github/workflows/all-misc.yml b/.github/workflows/all-misc.yml
index 0cbdd2a21d..90ff0eebfd 100644
--- a/.github/workflows/all-misc.yml
+++ b/.github/workflows/all-misc.yml
@@ -30,14 +30,6 @@ jobs:
       all-platforms: ${{ !github.event.pull_request.draft }}
     if: ${{ needs.check-diff.outputs.run_build == 'true' }}
 
-  # Build the tools used for processing execution traces
-  tracing:
-    needs: check-diff
-    if: ${{ needs.check-diff.outputs.run_tracing == 'true' }}
-    uses: ./.github/workflows/build-trace-tools.yml
-    with:
-      all-platforms: ${{ !github.event.pull_request.draft }}
-
   # Run tests for the standalone compiler.
   cli:
     if: ${{ needs.check-diff.outputs.run_misc == 'true' }}
diff --git a/.github/workflows/build-trace-tools.yml b/.github/workflows/build-trace-tools.yml
deleted file mode 100644
index d451b3786c..0000000000
--- a/.github/workflows/build-trace-tools.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Build trace tools
-
-on:
-  workflow_call:
-    inputs:
-      all-platforms:
-        required: false
-        default: true
-        type: boolean
-
-jobs:
-  build-trace-tools:
-    strategy:
-      matrix:
-        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-latest"]') }}
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - name: Check out lingua-franca repository
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          submodules: recursive
-      - name: Run make
-        working-directory: ./util/tracing
-        run: make
-        shell: bash
diff --git a/.github/workflows/non-target-specific-extended.yml b/.github/workflows/non-target-specific-extended.yml
index 465681d18d..216e667364 100644
--- a/.github/workflows/non-target-specific-extended.yml
+++ b/.github/workflows/non-target-specific-extended.yml
@@ -24,13 +24,6 @@ jobs:
     with:
       all-platforms: ${{ !github.event.pull_request.draft }}
 
-  # Build the tools used for processing execution traces
-  tracing:
-    if: ${{ inputs.all || github.event.pull_request.draft }}
-    uses: ./.github/workflows/build-trace-tools.yml
-    with:
-      all-platforms: ${{ !github.event.pull_request.draft  }}
-
   # Run tests for the standalone compiler.
   cli:
     if: ${{ inputs.all || github.event.pull_request.draft }}
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 24b21d3451..4e47b354bc 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 24b21d3451677a0229d0a068c8764537166179b8
+Subproject commit 4e47b354bce833034faaad0567a65d5b60e60ccc

From b2e9b91759a51dc79c8dda76c9361150ef09bef7 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 17 Aug 2023 13:50:39 -0700
Subject: [PATCH 0764/1114] Closes #1942.

---
 .../org/lflang/federated/generator/FedASTUtils.java   | 11 +++++++++--
 .../org/lflang/federated/generator/FedGenerator.java  |  6 +++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index d38237c71b..5dfcc74368 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -657,8 +657,15 @@ private static Reactor getNetworkSenderReactor(
     Input in = factory.createInput();
     in.setName("msg");
     in.setType(type);
-    in.setWidthSpec(
-        EcoreUtil.copy(connection.getSourcePortInstance().getDefinition().getWidthSpec()));
+    var width =
+        ASTUtils.width(
+            connection.getSourcePortInstance().getDefinition().getWidthSpec(),
+            List.of(connection.getSrcFederate().instantiation));
+    var widthSpec = factory.createWidthSpec();
+    var widthTerm = factory.createWidthTerm();
+    widthTerm.setWidth(width);
+    widthSpec.getTerms().add(widthTerm);
+    in.setWidthSpec(widthSpec);
     inRef.setVariable(in);
 
     destRef.setContainer(connection.getDestinationPortInstance().getParent().getDefinition());
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index ea1d960e0a..f885daabdf 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -553,7 +553,11 @@ private Reactor indexer(ReactorInstance reactorInstance, PortInstance input, Res
         FedASTUtils.addReactorDefinition(
             "_" + reactorInstance.getName() + input.getName(), resource);
     var output = LfFactory.eINSTANCE.createOutput();
-    output.setWidthSpec(EcoreUtil.copy(input.getDefinition().getWidthSpec()));
+    var widthSpec = LfFactory.eINSTANCE.createWidthSpec();
+    var widthTerm = LfFactory.eINSTANCE.createWidthTerm();
+    widthTerm.setWidth(input.getWidth());
+    widthSpec.getTerms().add(widthTerm);
+    output.setWidthSpec(widthSpec);
     output.setType(EcoreUtil.copy(input.getDefinition().getType()));
     output.setName("port");
     indexer.getOutputs().add(output);

From 6eba8bb56a5faf5a419ac768a28f2289dda41302 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 17 Aug 2023 14:56:44 -0700
Subject: [PATCH 0765/1114] Fix after delays' access to user's declarations.

---
 .../ast/DelayedConnectionTransformation.java      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/DelayedConnectionTransformation.java b/core/src/main/java/org/lflang/ast/DelayedConnectionTransformation.java
index 882019ac44..4576be6ff5 100644
--- a/core/src/main/java/org/lflang/ast/DelayedConnectionTransformation.java
+++ b/core/src/main/java/org/lflang/ast/DelayedConnectionTransformation.java
@@ -102,7 +102,11 @@ private void insertGeneratedDelays(List<Reactor> reactors) {
           EObject parent = connection.eContainer();
           // Assume all the types are the same, so just use the first on the right.
           Type type = ((Port) connection.getRightPorts().get(0).getVariable()).getType();
-          Reactor delayClass = getDelayClass(type, connection.isPhysical());
+          var resource =
+              connection.getLeftPorts().size() > 0
+                  ? connection.getLeftPorts().get(0).getContainer().getReactorClass().eResource()
+                  : mainResource;
+          Reactor delayClass = getDelayClass(resource, type, connection.isPhysical());
           String generic = targetTypes.supportsGenerics() ? targetTypes.getTargetType(type) : null;
 
           Instantiation delayInstance =
@@ -274,7 +278,7 @@ private static Instantiation getDelayInstance(
    * @param type The type the delay class must be compatible with.
    * @param isPhysical Is this delay reactor using a physical action.
    */
-  private Reactor getDelayClass(Type type, boolean isPhysical) {
+  private Reactor getDelayClass(Resource resource, Type type, boolean isPhysical) {
     String className;
     if (targetTypes.supportsGenerics()) {
       className = DelayBodyGenerator.GEN_DELAY_CLASS_NAME;
@@ -381,7 +385,7 @@ private Reactor getDelayClass(Type type, boolean isPhysical) {
     delayClass.getInputs().add(input);
     delayClass.getOutputs().add(output);
     delayClass.getParameters().add(delayParameter);
-    addDelayClass(delayClass);
+    addDelayClass(resource, delayClass);
     return delayClass;
   }
 
@@ -389,12 +393,11 @@ private Reactor getDelayClass(Type type, boolean isPhysical) {
    * Store the given reactor in the collection of generated delay classes and insert it in the AST
    * under the top-level reactor's node.
    */
-  private void addDelayClass(Reactor generatedDelay) {
+  private void addDelayClass(Resource resource, Reactor generatedDelay) {
     // Record this class, so it can be reused.
     delayClasses.add(generatedDelay);
     // And hook it into the AST.
-    EObject node =
-        IteratorExtensions.findFirst(mainResource.getAllContents(), Model.class::isInstance);
+    EObject node = IteratorExtensions.findFirst(resource.getAllContents(), Model.class::isInstance);
     ((Model) node).getReactors().add(generatedDelay);
   }
 

From e7f5284c5e26c67b398db14fa8ead0d755a3ac97 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 17 Aug 2023 15:23:39 -0700
Subject: [PATCH 0766/1114] Fix unused multiports bug (#1957).

---
 .../org/lflang/generator/c/CTriggerObjectsGenerator.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 4d1124a3b9..77e7eee22e 100644
--- a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -785,10 +785,13 @@ private static String deferredOutputNumDestinations(ReactorInstance reactor) {
       if (output.eventualDestinations().size() == 0) {
         // Dangling output. Still set the source reactor
         code.pr(
-            CUtil.portRef(output)
+            "for (int index486184027c8990b = 0; index486184027c8990b < "
+                + output.getWidth()
+                + "; index486184027c8990b++) { "
+                + CUtil.portRef(output, false, true, null, null, "index486184027c8990b")
                 + "._base.source_reactor = (self_base_t*)"
                 + CUtil.reactorRef(reactor)
-                + ";");
+                + "; }");
       }
     }
     return code.toString();

From a95f66a547557c15db0f4d4d81dbe1cc054e5854 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 17 Aug 2023 15:28:28 -0700
Subject: [PATCH 0767/1114] Fix NPE.

---
 .../java/org/lflang/ast/DelayedConnectionTransformation.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/lflang/ast/DelayedConnectionTransformation.java b/core/src/main/java/org/lflang/ast/DelayedConnectionTransformation.java
index 4576be6ff5..dba3fdeaf7 100644
--- a/core/src/main/java/org/lflang/ast/DelayedConnectionTransformation.java
+++ b/core/src/main/java/org/lflang/ast/DelayedConnectionTransformation.java
@@ -104,6 +104,7 @@ private void insertGeneratedDelays(List<Reactor> reactors) {
           Type type = ((Port) connection.getRightPorts().get(0).getVariable()).getType();
           var resource =
               connection.getLeftPorts().size() > 0
+                      && connection.getLeftPorts().get(0).getContainer() != null
                   ? connection.getLeftPorts().get(0).getContainer().getReactorClass().eResource()
                   : mainResource;
           Reactor delayClass = getDelayClass(resource, type, connection.isPhysical());

From 9f04e2464ee9e9ab6ceea14526ddbcc2229ee119 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 17 Aug 2023 15:40:11 -0700
Subject: [PATCH 0768/1114] Add test.

---
 test/C/src/GenDelayTest.lf | 13 +++++++++++++
 test/C/src/lib/GenDelay.lf | 19 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 test/C/src/GenDelayTest.lf
 create mode 100644 test/C/src/lib/GenDelay.lf

diff --git a/test/C/src/GenDelayTest.lf b/test/C/src/GenDelayTest.lf
new file mode 100644
index 0000000000..ecd7f095ab
--- /dev/null
+++ b/test/C/src/GenDelayTest.lf
@@ -0,0 +1,13 @@
+/**
+ * Test that types used in delayed connections do not need to be in scope for
+ * the parent reactor in order to compile.
+ */
+
+target C
+import Source, Sink from "lib/GenDelay.lf"
+
+main reactor {
+  source = new Source()
+  sink = new Sink()
+  source.out -> sink.in after 10 ms
+}
diff --git a/test/C/src/lib/GenDelay.lf b/test/C/src/lib/GenDelay.lf
new file mode 100644
index 0000000000..dfe7195de4
--- /dev/null
+++ b/test/C/src/lib/GenDelay.lf
@@ -0,0 +1,19 @@
+target C
+
+preamble {=
+  typedef int message_t;
+=}
+
+reactor Source {
+  output out: message_t
+  reaction(startup) -> out {=
+    lf_set(out, 42);
+  =}
+}
+
+reactor Sink {
+  input in: message_t
+  reaction(in) {=
+    lf_print("Received %d at time %lld", in->value, lf_time_logical_elapsed());
+  =}
+}

From 49fae5a9cca4da41d173743fb50452694188ab52 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Thu, 17 Aug 2023 15:42:26 -0700
Subject: [PATCH 0769/1114] Make test more comprehensive.

---
 test/C/src/federated/DistributedMultiport.lf | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/C/src/federated/DistributedMultiport.lf b/test/C/src/federated/DistributedMultiport.lf
index fcd570d890..018a286360 100644
--- a/test/C/src/federated/DistributedMultiport.lf
+++ b/test/C/src/federated/DistributedMultiport.lf
@@ -4,8 +4,8 @@ target C {
   coordination: centralized
 }
 
-reactor Source {
-  output[4] out: int
+reactor Source(width: int = 2) {
+  output[width] out: int
   timer t(0, 100 msec)
   state count: int = 0
 
@@ -16,8 +16,8 @@ reactor Source {
   =}
 }
 
-reactor Destination {
-  input[4] in: int
+reactor Destination(width: int = 3) {
+  input[width] in: int
   state count: int = 0
 
   reaction(in) {=
@@ -39,7 +39,7 @@ reactor Destination {
 }
 
 federated reactor DistributedMultiport {
-  s = new Source()
-  d = new Destination()
+  s = new Source(width = 4)
+  d = new Destination(width = 4)
   s.out -> d.in
 }

From 71e419a1ab716f0eb7310fbb8fc0d5048e8ae56a Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 18 Aug 2023 15:38:36 -0700
Subject: [PATCH 0770/1114] Format tests.

---
 test/C/src/GenDelayTest.lf |  6 +++---
 test/C/src/lib/GenDelay.lf | 14 +++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/test/C/src/GenDelayTest.lf b/test/C/src/GenDelayTest.lf
index ecd7f095ab..6572aef829 100644
--- a/test/C/src/GenDelayTest.lf
+++ b/test/C/src/GenDelayTest.lf
@@ -1,9 +1,9 @@
 /**
- * Test that types used in delayed connections do not need to be in scope for
- * the parent reactor in order to compile.
+ * Test that types used in delayed connections do not need to be in scope for the parent reactor in
+ * order to compile.
  */
-
 target C
+
 import Source, Sink from "lib/GenDelay.lf"
 
 main reactor {
diff --git a/test/C/src/lib/GenDelay.lf b/test/C/src/lib/GenDelay.lf
index dfe7195de4..a9d607db75 100644
--- a/test/C/src/lib/GenDelay.lf
+++ b/test/C/src/lib/GenDelay.lf
@@ -1,19 +1,15 @@
 target C
 
-preamble {=
-  typedef int message_t;
-=}
+preamble {= typedef int message_t; =}
 
 reactor Source {
   output out: message_t
-  reaction(startup) -> out {=
-    lf_set(out, 42);
-  =}
+
+  reaction(startup) -> out {= lf_set(out, 42); =}
 }
 
 reactor Sink {
   input in: message_t
-  reaction(in) {=
-    lf_print("Received %d at time %lld", in->value, lf_time_logical_elapsed());
-  =}
+
+  reaction(in) {= lf_print("Received %d at time %lld", in->value, lf_time_logical_elapsed()); =}
 }

From 9e8fc2d8ced0c212fe05a345a80905dd64268926 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 18 Aug 2023 15:40:50 -0700
Subject: [PATCH 0771/1114] Format.

---
 test/C/src/federated/DistributedMultiport.lf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/C/src/federated/DistributedMultiport.lf b/test/C/src/federated/DistributedMultiport.lf
index 018a286360..0d786e8357 100644
--- a/test/C/src/federated/DistributedMultiport.lf
+++ b/test/C/src/federated/DistributedMultiport.lf
@@ -39,7 +39,7 @@ reactor Destination(width: int = 3) {
 }
 
 federated reactor DistributedMultiport {
-  s = new Source(width = 4)
-  d = new Destination(width = 4)
+  s = new Source(width=4)
+  d = new Destination(width=4)
   s.out -> d.in
 }

From d357aae6fdcb311387d63c3a70bd58008726874f Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 18 Aug 2023 18:18:48 -0700
Subject: [PATCH 0772/1114] Address width mismatch warning.

---
 .../src/docker/federated/DistributedMultiportContainerized.lf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/C/src/docker/federated/DistributedMultiportContainerized.lf b/test/C/src/docker/federated/DistributedMultiportContainerized.lf
index ec27e0dea3..6250c105c4 100644
--- a/test/C/src/docker/federated/DistributedMultiportContainerized.lf
+++ b/test/C/src/docker/federated/DistributedMultiportContainerized.lf
@@ -8,7 +8,7 @@ target C {
 import Source, Destination from "../../federated/DistributedMultiport.lf"
 
 federated reactor DistributedMultiportContainerized at rti {
-  s = new Source()
-  d = new Destination()
+  s = new Source(width=4)
+  d = new Destination(width=4)
   s.out -> d.in
 }

From 432ac5e19ebb27d1d98e86b9ddda1604d4f1241b Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 22 Aug 2023 15:13:13 -0700
Subject: [PATCH 0773/1114] Apply suggestions from code review

---
 core/src/main/resources/lib/ts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/ts/package.json b/core/src/main/resources/lib/ts/package.json
index fc063d791e..04978d7322 100644
--- a/core/src/main/resources/lib/ts/package.json
+++ b/core/src/main/resources/lib/ts/package.json
@@ -2,7 +2,7 @@
     "name": "LinguaFrancaDefault",
     "type": "commonjs",
     "dependencies": {
-        "@lf-lang/reactor-ts": "git://github.com/lf-lang/reactor-ts.git#master",
+        "@lf-lang/reactor-ts": "^0.6.0",
         "command-line-args": "^5.1.1",
         "command-line-usage": "^6.1.3"
     },

From b28c61959a4053ba44b7cd06f3a5ed37cbbc3627 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 22 Aug 2023 20:32:32 -0700
Subject: [PATCH 0774/1114] Bugfix for TypeScript.

---
 .../java/org/lflang/federated/extensions/TSExtension.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index e62d1c29d1..f0000b7435 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -109,8 +109,8 @@ public String generateNetworkSenderBody(
       CoordinationType coordinationType,
       MessageReporter messageReporter) {
     return """
-        if (%1$s%2$s !== undefined) {
-            this.util.sendRTITimedMessage(%1$s%2$s, %3$s, %4$s, %5$s);
+        if (%1$s%2$s[sender_index as number] !== undefined) {
+            this.util.sendRTITimedMessage(%1$s%2$s[sender_index as number], %3$s, %4$s, %5$s);
         }
         """
         .formatted(

From 24ed790df18681b1da39c33dcd23772ada1bba8f Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Tue, 22 Aug 2023 20:50:43 -0700
Subject: [PATCH 0775/1114] Generate one federate per federate.

Fixes #1961.
---
 .../java/org/lflang/federated/generator/FedMainEmitter.java  | 5 ++++-
 test/C/src/federated/DistributedBank.lf                      | 5 ++++-
 test/TypeScript/src/federated/DistributedCount.lf            | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index 7c78a10df7..f6e8f6e9c8 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -3,6 +3,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.ast.FormattingUtil;
@@ -27,13 +28,15 @@ String generateMainReactor(
           .error("Modes at the top level are not supported under federated execution.");
     }
     var renderer = FormattingUtil.renderer(federate.targetConfig.target);
+    var instantiation = EcoreUtil.copy(federate.instantiation);
+    instantiation.setWidthSpec(null);
 
     return String.join(
         "\n",
         generateMainSignature(federate, originalMainReactor, renderer),
         String.join(
                 "\n",
-                renderer.apply(federate.instantiation),
+                renderer.apply(instantiation),
                 ASTUtils.allStateVars(originalMainReactor).stream()
                     .map(renderer)
                     .collect(Collectors.joining("\n")),
diff --git a/test/C/src/federated/DistributedBank.lf b/test/C/src/federated/DistributedBank.lf
index 130ae95961..bb23df81d6 100644
--- a/test/C/src/federated/DistributedBank.lf
+++ b/test/C/src/federated/DistributedBank.lf
@@ -4,13 +4,16 @@ target C {
   coordination: centralized
 }
 
-reactor Node {
+reactor Node(bank_index: int = 0) {
   timer t(0, 100 msec)
   state count: int = 0
 
   reaction(t) {= lf_print("Hello world %d.", self->count++); =}
 
   reaction(shutdown) {=
+    if (self->bank_index) {
+      lf_print_error_and_exit("The only bank index should be zero because there should be only one bank member per federate.");
+    }
     if (self->count == 0) {
       lf_print_error_and_exit("Timer reactions did not execute.");
     }
diff --git a/test/TypeScript/src/federated/DistributedCount.lf b/test/TypeScript/src/federated/DistributedCount.lf
index 49ccfafc09..d57e96d024 100644
--- a/test/TypeScript/src/federated/DistributedCount.lf
+++ b/test/TypeScript/src/federated/DistributedCount.lf
@@ -19,7 +19,7 @@ reactor Print {
     const elapsedTime = util.getElapsedLogicalTime();
     console.log("At time " + elapsedTime + ", received " + inp);
     if (inp !== c) {
-      util.requestErrorStop("Expected to receive " + c + ".");
+      util.requestErrorStop("Expected to receive " + JSON.stringify(c) + " but received " + JSON.stringify(inp) + ".");
     }
     if (!elapsedTime.isEqualTo(TimeValue.msec(200).add(TimeValue.sec(c - 1)))) {
       util.requestErrorStop("Expected received time to be " + TimeValue.msec(200).add(TimeValue.sec(c - 1)) + ".");

From 8baa059bebb9469e2f8d89bed77b3fa943806e5e Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Wed, 23 Aug 2023 18:22:27 +0200
Subject: [PATCH 0776/1114] Fixed compilation error in code for reset state
 variables with time type

Fixes #1938
---
 .../lflang/generator/c/CStateGenerator.java   |  3 +-
 .../ResetStateVariableOfTypeTime.lf           | 45 +++++++++++++++++++
 ...esetStateVariableWithParameterizedValue.lf | 45 +++++++++++++++++++
 3 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 test/C/src/modal_models/ResetStateVariableOfTypeTime.lf
 create mode 100644 test/C/src/modal_models/ResetStateVariableWithParameterizedValue.lf

diff --git a/core/src/main/java/org/lflang/generator/c/CStateGenerator.java b/core/src/main/java/org/lflang/generator/c/CStateGenerator.java
index 225320bfe7..c8686173b6 100644
--- a/core/src/main/java/org/lflang/generator/c/CStateGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CStateGenerator.java
@@ -88,8 +88,7 @@ private static String generateModalReset(
             + "]";
     var type = types.getTargetType(instance.tpr.resolveType(ASTUtils.getInferredType(stateVar)));
 
-    if (ASTUtils.isOfTimeType(stateVar)
-        || ASTUtils.isParameterized(stateVar) && !stateVar.getInit().getExprs().isEmpty()) {
+    if (ASTUtils.isParameterized(stateVar) && !stateVar.getInit().getExprs().isEmpty()) {
       return CModesGenerator.generateStateResetStructure(
           instance, modeRef, selfRef, stateVar.getName(), initExpr, type);
     } else {
diff --git a/test/C/src/modal_models/ResetStateVariableOfTypeTime.lf b/test/C/src/modal_models/ResetStateVariableOfTypeTime.lf
new file mode 100644
index 0000000000..72e2075d2c
--- /dev/null
+++ b/test/C/src/modal_models/ResetStateVariableOfTypeTime.lf
@@ -0,0 +1,45 @@
+/** 
+ * Modal Reactor Test. 
+ * Tests state variable with type time.
+ * https://github.com/lf-lang/lingua-franca/issues/1938
+ * Model by Edward Lee.
+ */
+target C {
+    timeout: 3s,
+    fast: true
+}
+
+reactor C {
+  input trigger:bool
+  reset state t:time = 0s
+  
+  reaction(trigger) {=
+    lf_print("t = %ld", self->t);
+    if (self->t != SEC(0)) {
+        lf_print("Error: Missing reset");
+    }
+    
+    self->t = lf_time_logical();
+  =}
+}
+
+main reactor {
+  timer t(0, 1s)
+  
+  initial mode A {
+    c = new C()
+    
+    reaction(t) -> reset(B), c.trigger {=
+      lf_print("In A");
+      lf_set(c.trigger, true);
+      lf_set_mode(B);
+    =}
+  }
+  
+  mode B {
+    reaction(t) -> reset(A) {=
+      lf_print("In B");
+      lf_set_mode(A);
+    =}
+  }
+}
\ No newline at end of file
diff --git a/test/C/src/modal_models/ResetStateVariableWithParameterizedValue.lf b/test/C/src/modal_models/ResetStateVariableWithParameterizedValue.lf
new file mode 100644
index 0000000000..f7daaa8950
--- /dev/null
+++ b/test/C/src/modal_models/ResetStateVariableWithParameterizedValue.lf
@@ -0,0 +1,45 @@
+/** 
+ * Modal Reactor Test. 
+ * Tests state variable initialized via parameter.
+ * https://github.com/lf-lang/lingua-franca/issues/1938
+ * Model by Edward Lee.
+ */
+target C {
+    timeout: 3s,
+    fast: true
+}
+
+reactor C (init:int = 0) {
+  input trigger:bool
+  reset state i:int = init
+  
+  reaction(trigger) {=
+    lf_print("i = %d", self->i);
+    if (self->i != -1) {
+        lf_print("Error: Missing reset");
+    }
+    
+    self->i += 10;
+  =}
+}
+
+main reactor {
+  timer t(0, 1s)
+  
+  initial mode A {
+    c = new C(init = -1)
+    
+    reaction(t) -> reset(B), c.trigger {=
+      lf_print("In A");
+      lf_set(c.trigger, true);
+      lf_set_mode(B);
+    =}
+  }
+  
+  mode B {
+    reaction(t) -> reset(A) {=
+      lf_print("In B");
+      lf_set_mode(A);
+    =}
+  }
+}
\ No newline at end of file

From abda76c8353aeb14300ea13c0bed52581cd10c9e Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Thu, 24 Aug 2023 09:29:16 +0200
Subject: [PATCH 0777/1114] Applied LF formatter

---
 .../ResetStateVariableOfTypeTime.lf           | 27 +++++++---------
 ...esetStateVariableWithParameterizedValue.lf | 31 +++++++++----------
 2 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/test/C/src/modal_models/ResetStateVariableOfTypeTime.lf b/test/C/src/modal_models/ResetStateVariableOfTypeTime.lf
index 72e2075d2c..f7d25c97d6 100644
--- a/test/C/src/modal_models/ResetStateVariableOfTypeTime.lf
+++ b/test/C/src/modal_models/ResetStateVariableOfTypeTime.lf
@@ -1,45 +1,42 @@
-/** 
- * Modal Reactor Test. 
- * Tests state variable with type time.
+/**
+ * Modal Reactor Test. Tests state variable with type time. Model by Edward Lee.
  * https://github.com/lf-lang/lingua-franca/issues/1938
- * Model by Edward Lee.
  */
 target C {
-    timeout: 3s,
-    fast: true
+  timeout: 3 s,
+  fast: true
 }
 
 reactor C {
-  input trigger:bool
-  reset state t:time = 0s
-  
+  input trigger: bool
+  reset state t: time = 0 s
+
   reaction(trigger) {=
     lf_print("t = %ld", self->t);
     if (self->t != SEC(0)) {
         lf_print("Error: Missing reset");
     }
-    
+
     self->t = lf_time_logical();
   =}
 }
 
 main reactor {
-  timer t(0, 1s)
-  
+  timer t(0, 1 s)
+
   initial mode A {
     c = new C()
-    
     reaction(t) -> reset(B), c.trigger {=
       lf_print("In A");
       lf_set(c.trigger, true);
       lf_set_mode(B);
     =}
   }
-  
+
   mode B {
     reaction(t) -> reset(A) {=
       lf_print("In B");
       lf_set_mode(A);
     =}
   }
-}
\ No newline at end of file
+}
diff --git a/test/C/src/modal_models/ResetStateVariableWithParameterizedValue.lf b/test/C/src/modal_models/ResetStateVariableWithParameterizedValue.lf
index f7daaa8950..3e0096e5e0 100644
--- a/test/C/src/modal_models/ResetStateVariableWithParameterizedValue.lf
+++ b/test/C/src/modal_models/ResetStateVariableWithParameterizedValue.lf
@@ -1,45 +1,42 @@
-/** 
- * Modal Reactor Test. 
- * Tests state variable initialized via parameter.
+/**
+ * Modal Reactor Test. Tests state variable initialized via parameter. Model by Edward Lee.
  * https://github.com/lf-lang/lingua-franca/issues/1938
- * Model by Edward Lee.
  */
 target C {
-    timeout: 3s,
-    fast: true
+  timeout: 3 s,
+  fast: true
 }
 
-reactor C (init:int = 0) {
-  input trigger:bool
-  reset state i:int = init
-  
+reactor C(init: int = 0) {
+  input trigger: bool
+  reset state i: int = init
+
   reaction(trigger) {=
     lf_print("i = %d", self->i);
     if (self->i != -1) {
         lf_print("Error: Missing reset");
     }
-    
+
     self->i += 10;
   =}
 }
 
 main reactor {
-  timer t(0, 1s)
-  
+  timer t(0, 1 s)
+
   initial mode A {
-    c = new C(init = -1)
-    
+    c = new C(init=-1)
     reaction(t) -> reset(B), c.trigger {=
       lf_print("In A");
       lf_set(c.trigger, true);
       lf_set_mode(B);
     =}
   }
-  
+
   mode B {
     reaction(t) -> reset(A) {=
       lf_print("In B");
       lf_set_mode(A);
     =}
   }
-}
\ No newline at end of file
+}

From 7e7554e644e904f8208bb7ef2cc51effe45d1d9a Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Thu, 24 Aug 2023 09:31:33 +0200
Subject: [PATCH 0778/1114] Added newline

---
 test/C/src/modal_models/ResetStateVariableOfTypeTime.lf          | 1 +
 .../src/modal_models/ResetStateVariableWithParameterizedValue.lf | 1 +
 2 files changed, 2 insertions(+)

diff --git a/test/C/src/modal_models/ResetStateVariableOfTypeTime.lf b/test/C/src/modal_models/ResetStateVariableOfTypeTime.lf
index f7d25c97d6..0b5f40df23 100644
--- a/test/C/src/modal_models/ResetStateVariableOfTypeTime.lf
+++ b/test/C/src/modal_models/ResetStateVariableOfTypeTime.lf
@@ -40,3 +40,4 @@ main reactor {
     =}
   }
 }
+
diff --git a/test/C/src/modal_models/ResetStateVariableWithParameterizedValue.lf b/test/C/src/modal_models/ResetStateVariableWithParameterizedValue.lf
index 3e0096e5e0..e3081a4d0a 100644
--- a/test/C/src/modal_models/ResetStateVariableWithParameterizedValue.lf
+++ b/test/C/src/modal_models/ResetStateVariableWithParameterizedValue.lf
@@ -40,3 +40,4 @@ main reactor {
     =}
   }
 }
+

From 9ec756ddae63de7b43c0444e929d8379183de5b0 Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Thu, 24 Aug 2023 11:09:30 +0200
Subject: [PATCH 0779/1114] Revert "Added newline"

This reverts commit 7e7554e644e904f8208bb7ef2cc51effe45d1d9a.
---
 test/C/src/modal_models/ResetStateVariableOfTypeTime.lf          | 1 -
 .../src/modal_models/ResetStateVariableWithParameterizedValue.lf | 1 -
 2 files changed, 2 deletions(-)

diff --git a/test/C/src/modal_models/ResetStateVariableOfTypeTime.lf b/test/C/src/modal_models/ResetStateVariableOfTypeTime.lf
index 0b5f40df23..f7d25c97d6 100644
--- a/test/C/src/modal_models/ResetStateVariableOfTypeTime.lf
+++ b/test/C/src/modal_models/ResetStateVariableOfTypeTime.lf
@@ -40,4 +40,3 @@ main reactor {
     =}
   }
 }
-
diff --git a/test/C/src/modal_models/ResetStateVariableWithParameterizedValue.lf b/test/C/src/modal_models/ResetStateVariableWithParameterizedValue.lf
index e3081a4d0a..3e0096e5e0 100644
--- a/test/C/src/modal_models/ResetStateVariableWithParameterizedValue.lf
+++ b/test/C/src/modal_models/ResetStateVariableWithParameterizedValue.lf
@@ -40,4 +40,3 @@ main reactor {
     =}
   }
 }
-

From b33ce99267ba4c845789b5a0691708a3253d29ab Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Thu, 24 Aug 2023 19:47:06 +0900
Subject: [PATCH 0780/1114] Index 0 should be used to check the output's status

---
 .../java/org/lflang/federated/extensions/TSExtension.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index f0000b7435..9ef81c6a23 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -109,8 +109,8 @@ public String generateNetworkSenderBody(
       CoordinationType coordinationType,
       MessageReporter messageReporter) {
     return """
-        if (%1$s%2$s[sender_index as number] !== undefined) {
-            this.util.sendRTITimedMessage(%1$s%2$s[sender_index as number], %3$s, %4$s, %5$s);
+        if (%1$s%2$s[0] !== undefined) {
+            this.util.sendRTITimedMessage(%1$s%2$s[0], %3$s, %4$s, %5$s);
         }
         """
         .formatted(
@@ -136,7 +136,7 @@ public String generatePortAbsentReactionBody(
     return """
         // If the output port has not been set for the current logical time,
         // send an ABSENT message to the receiving federate
-        if (%1$s%2$s === undefined) {
+        if (%1$s%2$s[0] === undefined) {
           this.util.sendRTIPortAbsent(%3$d, %4$d, %5$s);
         }
       """

From 294b32f85239b9b0b1579a50452443c8bfed28e7 Mon Sep 17 00:00:00 2001
From: Soeren Domroes <sdo@informatik.uni-kiel.de>
Date: Mon, 28 Aug 2023 08:21:48 +0200
Subject: [PATCH 0781/1114] Ran spotlessJavaApply.

---
 core/src/main/java/org/lflang/AttributeUtils.java         | 8 ++++----
 .../lflang/diagram/synthesis/LinguaFrancaSynthesis.java   | 5 ++---
 .../main/java/org/lflang/validation/AttributeSpec.java    | 6 ++++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/lflang/AttributeUtils.java b/core/src/main/java/org/lflang/AttributeUtils.java
index c10258abe8..ee9666f0b8 100644
--- a/core/src/main/java/org/lflang/AttributeUtils.java
+++ b/core/src/main/java/org/lflang/AttributeUtils.java
@@ -31,7 +31,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.nodemodel.ICompositeNode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
@@ -166,7 +165,8 @@ public static Map<String, String> getAttributeValues(EObject node, String attrNa
     final List<Attribute> attrs = findAttributesByName(node, attrName);
     HashMap<String, String> layoutOptions = new HashMap<>();
     for (Attribute attribute : attrs) {
-      layoutOptions.put(StringUtil.removeQuotes(attribute.getAttrParms().get(0).getValue()),
+      layoutOptions.put(
+          StringUtil.removeQuotes(attribute.getAttrParms().get(0).getValue()),
           StringUtil.removeQuotes(attribute.getAttrParms().get(1).getValue()));
     }
     return layoutOptions;
@@ -281,8 +281,8 @@ public static String getPortSide(EObject node) {
   }
 
   /**
-   * Return the {@code layout} annotation for the given element or null if there is
-   * no such annotation.
+   * Return the {@code layout} annotation for the given element or null if there is no such
+   * annotation.
    */
   public static Map<String, String> getLayoutOption(EObject node) {
     return getAttributeValues(node, "layout");
diff --git a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index d10597f44a..a0f73dbabf 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -69,9 +69,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import javax.inject.Inject;
-
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.elk.alg.layered.options.LayerConstraint;
@@ -165,7 +163,8 @@ public class LinguaFrancaSynthesis extends AbstractDiagramSynthesis<Model> {
   // -------------------------------------------------------------------------
 
   /** Service class for accessing layout options by name */
-  private static final LayoutMetaDataService LAYOUT_OPTIONS_SERVICE = LayoutMetaDataService.getInstance();
+  private static final LayoutMetaDataService LAYOUT_OPTIONS_SERVICE =
+      LayoutMetaDataService.getInstance();
 
   public static final String ID = "org.lflang.diagram.synthesis.LinguaFrancaSynthesis";
 
diff --git a/core/src/main/java/org/lflang/validation/AttributeSpec.java b/core/src/main/java/org/lflang/validation/AttributeSpec.java
index 6d1da3e0a3..5b9d6dc51b 100644
--- a/core/src/main/java/org/lflang/validation/AttributeSpec.java
+++ b/core/src/main/java/org/lflang/validation/AttributeSpec.java
@@ -217,8 +217,10 @@ enum AttrParamType {
     // @layout(option="string", value="any") e.g. @layout(option="port.side", value="WEST")
     ATTRIBUTE_SPECS_BY_NAME.put(
         "layout",
-        new AttributeSpec(List.of(new AttrParamSpec(OPTION_ATTR, AttrParamType.STRING, false),
-            new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))));
+        new AttributeSpec(
+            List.of(
+                new AttrParamSpec(OPTION_ATTR, AttrParamType.STRING, false),
+                new AttrParamSpec(VALUE_ATTR, AttrParamType.STRING, false))));
     // @enclave(each=boolean)
     ATTRIBUTE_SPECS_BY_NAME.put(
         "enclave",

From b1f5cf617033a6bbd71f2638a8ee105edc089d11 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 28 Aug 2023 12:10:20 +0200
Subject: [PATCH 0782/1114] avoid the _body postfix for reaction functions

---
 .../org/lflang/generator/cpp/CppExtensions.kt |  2 +-
 .../generator/cpp/CppReactionGenerator.kt     | 24 ++++++++++---------
 test/Cpp/src/hello_bodyless_world.cc          |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt
index e9e3f9fd8a..45a39eb68a 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt
@@ -47,7 +47,7 @@ import org.lflang.lf.WidthSpec
 
 /** Get the "name" a reaction is represented with in target code.*/
 val Reaction.codeName
-    get(): String = name ?: "r$indexInContainer"
+    get(): String = name ?: "reaction_$priority"
 
 /* **********************************************************************************************
  * C++ specific extensions shared across classes
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppReactionGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppReactionGenerator.kt
index 489dd8c2ae..e0dc0c143d 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppReactionGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppReactionGenerator.kt
@@ -102,7 +102,7 @@ class CppReactionGenerator(
                     allUncontainedSources.map { it.name } +
                     allUncontainedEffects.map { it.name } +
                     allReferencedContainers.map { getViewInstanceName(it) }
-            val body = "void ${codeName}_body() { __lf_inner.${codeName}_body(${parameters.joinToString(", ")}); }"
+            val body = "void ${codeName}_body() { __lf_inner.${codeName}(${parameters.joinToString(", ")}); }"
             val deadlineHandler =
                 "void ${codeName}_deadline_handler() { __lf_inner.${codeName}_deadline_handler(${parameters.joinToString(", ")}); }"
 
@@ -120,28 +120,30 @@ class CppReactionGenerator(
         }
     }
 
-    private fun generateFunctionDeclaration(reaction: Reaction, postfix: String): String {
+    private fun generateFunctionDeclaration(reaction: Reaction, postfix: String?): String {
         val params = reaction.getBodyParameters()
+        val reactionName = reaction.codeName + if(postfix != null) "_$postfix" else ""
         return when (params.size) {
-            0    -> "void ${reaction.codeName}_$postfix();"
-            1    -> "void ${reaction.codeName}_$postfix(${params[0]});"
+            0    -> "void $reactionName();"
+            1    -> "void $reactionName(${params[0]});"
             else -> with(PrependOperator) {
                 """
-                    |void ${reaction.codeName}_$postfix(
+                    |void $reactionName(
                 ${" |  "..params.joinToString(",\n")}); 
                 """.trimMargin()
             }
         }
     }
 
-    private fun getFunctionDefinitionSignature(reaction: Reaction, postfix: String): String {
+    private fun getFunctionDefinitionSignature(reaction: Reaction, postfix: String?): String {
         val params = reaction.getBodyParameters()
+        val reactionName = "${reactor.templateName}::Inner::${reaction.codeName}" + if(postfix != null) "_$postfix" else ""
         return when (params.size) {
-            0    -> "void ${reactor.templateName}::Inner::${reaction.codeName}_$postfix()"
-            1    -> "void ${reactor.templateName}::Inner::${reaction.codeName}_$postfix(${params[0]})"
+            0    -> "void $reactionName()"
+            1    -> "void $reactionName(${params[0]})"
             else -> with(PrependOperator) {
                 """
-                    |void ${reactor.templateName}::Inner::${reaction.codeName}_$postfix(
+                    |void $reactionName(
                 ${" |  "..params.joinToString(",\n")}) 
                 """.trimMargin()
             }
@@ -154,7 +156,7 @@ class CppReactionGenerator(
             """
                 |// reaction ${reaction.label}
                 |${reactor.templateLine}
-            ${" |"..getFunctionDefinitionSignature(reaction, "body")} {
+            ${" |"..getFunctionDefinitionSignature(reaction, null)} {
             ${" |  "..reaction.code.toText()}
                 |}
                 |
@@ -248,7 +250,7 @@ class CppReactionGenerator(
     /** Get all declarations of reaction bodies. */
     fun generateBodyDeclarations() =
         reactor.reactions.joinToString("\n", "// reaction bodies\n", "\n") {
-            generateFunctionDeclaration(it, "body")
+            generateFunctionDeclaration(it, null)
         }
 
     /** Get all definitions of reaction bodies. */
diff --git a/test/Cpp/src/hello_bodyless_world.cc b/test/Cpp/src/hello_bodyless_world.cc
index 782aeefc53..278c8dbe5d 100644
--- a/test/Cpp/src/hello_bodyless_world.cc
+++ b/test/Cpp/src/hello_bodyless_world.cc
@@ -1,5 +1,5 @@
 #include "HelloBodylessWorld/HelloBodylessWorld.hh"
 
-void HelloBodylessWorld::Inner::hello_body([[maybe_unused]] const reactor::StartupTrigger& startup) {
+void HelloBodylessWorld::Inner::hello([[maybe_unused]] const reactor::StartupTrigger& startup) {
   std::cout << "Hello World." << std::endl;
 }

From 62968d444596ba1a36745e116ada63618d868010 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 28 Aug 2023 13:01:29 -0700
Subject: [PATCH 0783/1114] Simplify build environment setup and make caching
 more robust

---
 .github/actions/prepare-build-env/action.yml | 38 +++-----------------
 1 file changed, 5 insertions(+), 33 deletions(-)

diff --git a/.github/actions/prepare-build-env/action.yml b/.github/actions/prepare-build-env/action.yml
index 2d0c82c78f..71ca8a50ee 100644
--- a/.github/actions/prepare-build-env/action.yml
+++ b/.github/actions/prepare-build-env/action.yml
@@ -1,5 +1,5 @@
-name: Prepare build environment (Linux only)
-description: Set up Java, Maven, Gradle, etc.
+name: Set up build environment
+description: Set up Java and Gradle (including caching).
 runs:
   using: "composite"
   steps:
@@ -8,35 +8,7 @@ runs:
         echo "$JAVA_HOME_17_X64/bin" >> $GITHUB_PATH
         echo "org.gradle.java.home=${JAVA_HOME_17_X64//\\/\/}" >> gradle.properties
         echo "JAVA_HOME=$JAVA_HOME_17_X64" >> $GITHUB_ENV
+        echo "$GRADLE_USER_HOME"
       shell: bash
-    - name: Check settings
-      run: |
-        echo $(which java)
-        cat gradle.properties
-        echo $JAVA_HOME
-      shell: bash
-    - name: Create hash of Gradle configuration (macOS only)
-      run: |
-        echo "gradle-hash"="$(find . -type f \( -name "gradle.properties" -o -name "gradle-wrapper.properties" \) -exec cat {} + | shasum -a 256 | cut -d ' ' -f 1)" >> $GITHUB_ENV
-      if: ${{ runner.os == 'macOS' }}
-      shell: bash
-    - name: Create hash of Gradle configuration (Linux and Windows only)
-      run: |
-        echo "gradle-hash"="$(find . -type f \( -name "gradle.properties" -o -name "gradle-wrapper.properties" \) -exec cat {} + | sha256sum | cut -d ' ' -f 1)" >> $GITHUB_ENV
-      if: ${{ runner.os == 'Windows' || runner.os == 'Linux' }}
-      shell: bash
-    - name: Cache
-      uses: actions/cache@v3
-      with:
-        path: |
-          ~/.gradle/caches
-          ~/.gradle/wrapper
-        key: gradle-${{ runner.os }}-${{ env.gradle-hash }}
-        # restore-keys: |
-        #   ${{ runner.os }}-gradle-
-    - name: Bring down Gradle daemon (Windows)
-      uses: webiny/action-post-run@3.0.0
-      id: post-run-command
-      with:
-        run: ./gradlew --stop
-      if: ${{ runner.os == 'Windows' }}
+    - name: Gradle Build Action
+      uses: gradle/gradle-build-action@v2.8.0

From aca30ce98de3e6ac0fd316582a197938e8283238 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 28 Aug 2023 13:03:39 -0700
Subject: [PATCH 0784/1114] More standard way of setting up Java

---
 .github/actions/prepare-build-env/action.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/actions/prepare-build-env/action.yml b/.github/actions/prepare-build-env/action.yml
index 71ca8a50ee..71013d2fbe 100644
--- a/.github/actions/prepare-build-env/action.yml
+++ b/.github/actions/prepare-build-env/action.yml
@@ -3,12 +3,9 @@ description: Set up Java and Gradle (including caching).
 runs:
   using: "composite"
   steps:
-    - name: Set up Java 17
-      run: |
-        echo "$JAVA_HOME_17_X64/bin" >> $GITHUB_PATH
-        echo "org.gradle.java.home=${JAVA_HOME_17_X64//\\/\/}" >> gradle.properties
-        echo "JAVA_HOME=$JAVA_HOME_17_X64" >> $GITHUB_ENV
-        echo "$GRADLE_USER_HOME"
-      shell: bash
+    - uses: actions/setup-java@v3
+      with:
+        distribution: temurin
+        java-version: 17
     - name: Gradle Build Action
       uses: gradle/gradle-build-action@v2.8.0

From ccdd8b966030f1acae9483f214d0810fb4054dd4 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 28 Aug 2023 22:44:52 -0700
Subject: [PATCH 0785/1114] Update .github/actions/prepare-build-env/action.yml

---
 .github/actions/prepare-build-env/action.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/actions/prepare-build-env/action.yml b/.github/actions/prepare-build-env/action.yml
index 71013d2fbe..167e00bf62 100644
--- a/.github/actions/prepare-build-env/action.yml
+++ b/.github/actions/prepare-build-env/action.yml
@@ -9,3 +9,5 @@ runs:
         java-version: 17
     - name: Gradle Build Action
       uses: gradle/gradle-build-action@v2.8.0
+      with:
+        - cache-read-only: false

From 2a76fe862b2ccd003620c4a32699876d268778e2 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 28 Aug 2023 22:49:05 -0700
Subject: [PATCH 0786/1114] Update action.yml

---
 .github/actions/prepare-build-env/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/prepare-build-env/action.yml b/.github/actions/prepare-build-env/action.yml
index 167e00bf62..682be37dbb 100644
--- a/.github/actions/prepare-build-env/action.yml
+++ b/.github/actions/prepare-build-env/action.yml
@@ -10,4 +10,4 @@ runs:
     - name: Gradle Build Action
       uses: gradle/gradle-build-action@v2.8.0
       with:
-        - cache-read-only: false
+        cache-read-only: false

From d99f0a7f5c4f07defcb2dfff834677291ba335e4 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 29 Aug 2023 12:54:22 -0700
Subject: [PATCH 0787/1114] Build Epoch in CI

---
 .github/workflows/build.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e84f9fce42..7c8be826e0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,3 +30,9 @@ jobs:
         uses: ./.github/actions/report-code-coverage
         with:
           files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/base/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfc/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfd/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lff/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
+
+  build-epoch:
+    uses: lf-lang/epoch/.github/workflows/build.yml@main
+    with:
+      lingua-franca-ref: ${{ github.head_ref || github.ref_name }}
+      upload-artifacts: false

From 58972c0d7c93243a0b1dca593673d7f401484dcf Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 29 Aug 2023 13:32:50 -0700
Subject: [PATCH 0788/1114] Rename job

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7c8be826e0..6d7edf2145 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
         with:
           files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/base/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfc/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfd/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lff/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
 
-  build-epoch:
+  epoch:
     uses: lf-lang/epoch/.github/workflows/build.yml@main
     with:
       lingua-franca-ref: ${{ github.head_ref || github.ref_name }}

From 2583b77f414c119b1aa7eb9300fcea7b49661359 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 29 Aug 2023 14:30:18 -0700
Subject: [PATCH 0789/1114] Add actions for setting up francabot

---
 .github/actions/setup-francabot/action.yml | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 .github/actions/setup-francabot/action.yml

diff --git a/.github/actions/setup-francabot/action.yml b/.github/actions/setup-francabot/action.yml
new file mode 100644
index 0000000000..7f2e2b86ab
--- /dev/null
+++ b/.github/actions/setup-francabot/action.yml
@@ -0,0 +1,34 @@
+name: Load global configuration settings for francabot
+description: Set up author information and GPG signature
+author: Marten Lohstroh <marten@berkeley.edu>
+
+inputs:
+  gpg-key:
+    description: 'francabot GPG key'
+    required: true
+  gpg-passphrase:
+    description: 'francabot GPG passphrase'
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Set environment variables
+      run: |
+        echo "username=lingua-franca[bot]" >> "$GITHUB_ENV"
+        echo "email=97201490+francabot@users.noreply.github.com" >> "$GITHUB_ENV"
+        echo "user-and-email=lingua-franca[bot] <97201490+francabot@users.noreply.github.com>" >> "$GITHUB_ENV"
+      shell: bash
+    - name: Configure git username and email
+      run: |
+        git config --global user.name '${{ env.username }}'
+        git config --global user.email '${{ env.email }}'
+      shell: bash
+    - name: Import GPG key
+      uses: crazy-max/ghaction-import-gpg@v5
+      with:
+        gpg_private_key: ${{ inputs.gpg-key }}
+        passphrase: ${{ inputs.gpg-passphrase }}
+        git_config_global: true
+        git_user_signingkey: true
+        git_commit_gpgsign: true

From 18b5547394059304ed10329278ba4c3e5fb25b43 Mon Sep 17 00:00:00 2001
From: "lingua-franca[bot]" <97201490+francabot@users.noreply.github.com>
Date: Wed, 30 Aug 2023 05:22:39 +0000
Subject: [PATCH 0790/1114] Update CHANGELOG.md

---
 CHANGELOG.md | 236 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 236 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fd8bbdb56..947b70314b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,240 @@
 # Changelog
+ 
+## [v0.5.0](https://github.com/lf-lang/lingua-franca/tree/v0.5.0) (2023-08-30)
+
+**Highlights**
+
+This release introduces new syntax for initializers, includes a renovation of the C backend to let it generate more modular code, and brings new features like a watchdog construct, support for generics in C, support for SMT-solver-based formal verification using UCLID-5, and bare-iron support for the Raspberry Pi Pico platform.
+
+**🚀 New Features**
+
+- Types allowed in reactor type args [\#1639](https://github.com/lf-lang/lingua-franca/pull/1639) ([@oowekyala](https://github.com/oowekyala))
+- Tracing of federate interactions [\#1632](https://github.com/lf-lang/lingua-franca/pull/1632) ([@edwardalee](https://github.com/edwardalee))
+- Equals initializer syntax [\#1580](https://github.com/lf-lang/lingua-franca/pull/1580) ([@oowekyala](https://github.com/oowekyala))
+- `--json` and `--json-file` CLI args add to `lfc` [\#1686](https://github.com/lf-lang/lingua-franca/pull/1686) ([@patilatharva](https://github.com/patilatharva))
+- Generated structs exposed in header files, reactions linkable from separate source files, and updated C target preamble visibility [\#1599](https://github.com/lf-lang/lingua-franca/pull/1599) ([@petervdonovan](https://github.com/petervdonovan))
+- Preprocessor definition for `LF_PACKAGE_DIRECTORY` [\#1720](https://github.com/lf-lang/lingua-franca/pull/1720) ([@edwardalee](https://github.com/edwardalee))
+- Mechanism for printing execution statistics [\#1743](https://github.com/lf-lang/lingua-franca/pull/1743) ([@cmnrd](https://github.com/cmnrd))
+- Watchdog support for the C target [\#1730](https://github.com/lf-lang/lingua-franca/pull/1730) ([@Benichiwa](https://github.com/Benichiwa))
+- Automatically generated .vscode/settings.json file [\#1759](https://github.com/lf-lang/lingua-franca/pull/1759) ([@edwardalee](https://github.com/edwardalee))
+- C Generics [\#1681](https://github.com/lf-lang/lingua-franca/pull/1681) ([@mkhubaibumer](https://github.com/mkhubaibumer))
+- `USER_THREADS` specifiable in platform options [\#1721](https://github.com/lf-lang/lingua-franca/pull/1721) ([@siljesu](https://github.com/siljesu))
+- Generic params allowed as generic arguments in C target [\#1804](https://github.com/lf-lang/lingua-franca/pull/1804) ([@petervdonovan](https://github.com/petervdonovan))
+- New `--check` flag for `lff` [\#1822](https://github.com/lf-lang/lingua-franca/pull/1822) ([@cmnrd](https://github.com/cmnrd))
+- Environments in the C target [\#1772](https://github.com/lf-lang/lingua-franca/pull/1772) ([@erlingrj](https://github.com/erlingrj))
+- `lfd` binary for generating diagrams from the command line [\#1713](https://github.com/lf-lang/lingua-franca/pull/1713) ([@cmnrd](https://github.com/cmnrd))
+- `fedsd` utility updated to make the RTI optional and support enclaves visualization  [\#1870](https://github.com/lf-lang/lingua-franca/pull/1870) ([@ChadliaJerad](https://github.com/ChadliaJerad))
+- C math lib always linked for C target [\#1894](https://github.com/lf-lang/lingua-franca/pull/1894) ([@cmnrd](https://github.com/cmnrd))
+- Critical sections enabled outside of the context of a reactor [\#1901](https://github.com/lf-lang/lingua-franca/pull/1901) ([@edwardalee](https://github.com/edwardalee))
+- Uclid5-based LF Verifier [\#1271](https://github.com/lf-lang/lingua-franca/pull/1271) ([@lsk567](https://github.com/lsk567))
+- Python launch scripts [\#1914](https://github.com/lf-lang/lingua-franca/pull/1914) ([@cmnrd](https://github.com/cmnrd))
+- Raspberry Pi Pico target support [\#1831](https://github.com/lf-lang/lingua-franca/pull/1831) ([@gundralaa](https://github.com/gundralaa))
+- Handling cyclic dependencies for TypeScript federated execution [\#1925](https://github.com/lf-lang/lingua-franca/pull/1925) ([@byeong-gil](https://github.com/byeong-gil))
+
+**✨ Enhancements**
+
+- Keeplive natively inferred in the C++ runtime [\#1630](https://github.com/lf-lang/lingua-franca/pull/1630) ([@cmnrd](https://github.com/cmnrd))
+- File access [\#1715](https://github.com/lf-lang/lingua-franca/pull/1715) ([@edwardalee](https://github.com/edwardalee))
+- Faster building of TypeScript [\#1611](https://github.com/lf-lang/lingua-franca/pull/1611) ([@lhstrh](https://github.com/lhstrh))
+- Revised mechanism for handling the `files` target property [\#1700](https://github.com/lf-lang/lingua-franca/pull/1700) ([@lhstrh](https://github.com/lhstrh))
+- Validator rules to check if target supports federation or inheritance [\#1726](https://github.com/lf-lang/lingua-franca/pull/1726) ([@cmnrd](https://github.com/cmnrd))
+- Optimized Gradle configuration for faster building [\#1774](https://github.com/lf-lang/lingua-franca/pull/1774) ([@axmmisaka](https://github.com/axmmisaka))
+- Adjustable port sides for reactors [\#1807](https://github.com/lf-lang/lingua-franca/pull/1807) ([@a-sr](https://github.com/a-sr))
+- No more space inserted after `interleaved` keyword by formatter [\#1846](https://github.com/lf-lang/lingua-franca/pull/1846) ([@cmnrd](https://github.com/cmnrd))
+- More natural syntax for reaction declarations [\#1853](https://github.com/lf-lang/lingua-franca/pull/1853) ([@lhstrh](https://github.com/lhstrh))
+- Fix for extra whitespace around info messages [\#1879](https://github.com/lf-lang/lingua-franca/pull/1879) ([@oowekyala](https://github.com/oowekyala))
+- TypeScript runtime bumped to `v0.5.0` [\#1927](https://github.com/lf-lang/lingua-franca/pull/1927) ([@byeong-gil](https://github.com/byeong-gil))
+- Support for named and bodyless reactions in C++ [\#1933](https://github.com/lf-lang/lingua-franca/pull/1933) ([@cmnrd](https://github.com/cmnrd))
+- Added @layout annotation to add arbitrary layout options an elements [\#1951](https://github.com/lf-lang/lingua-franca/pull/1951) ([@soerendomroes](https://github.com/soerendomroes))
+
+**🔧 Fixes**
+
+- Physical connections implemented as AST transformation  [\#1596](https://github.com/lf-lang/lingua-franca/pull/1596) ([@erlingrj](https://github.com/erlingrj))
+- Fix for passing of command line options from lfc to the generator [\#1631](https://github.com/lf-lang/lingua-franca/pull/1631) ([@cmnrd](https://github.com/cmnrd))
+- Fix for validation of target properties [\#1629](https://github.com/lf-lang/lingua-franca/pull/1629) ([@cmnrd](https://github.com/cmnrd))
+- Fix in validation so that warnings are not reported as errors [\#1643](https://github.com/lf-lang/lingua-franca/pull/1643) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix for NPE in lfc error reporting [\#1655](https://github.com/lf-lang/lingua-franca/pull/1655) ([@cmnrd](https://github.com/cmnrd))
+- Upstream connection delays now properly handled in the TypeScript federates [\#1607](https://github.com/lf-lang/lingua-franca/pull/1607) ([@byeong-gil](https://github.com/byeong-gil))
+- Fix for authenticated federation [\#1698](https://github.com/lf-lang/lingua-franca/pull/1698) ([@Jakio815](https://github.com/Jakio815))
+- Bugfixes in handling of `files` target property [\#1725](https://github.com/lf-lang/lingua-franca/pull/1725) ([@lhstrh](https://github.com/lhstrh))
+- Preambles properly inherited from superclasses [\#1732](https://github.com/lf-lang/lingua-franca/pull/1732) ([@edwardalee](https://github.com/edwardalee))
+- Reactor classes in the same file with the same name, up to case differences, are prohibited [\#1741](https://github.com/lf-lang/lingua-franca/pull/1741) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix for ROS serialization [\#1755](https://github.com/lf-lang/lingua-franca/pull/1755) ([@petervdonovan](https://github.com/petervdonovan))
+- Improved line adjustment logic for federated programs [\#1760](https://github.com/lf-lang/lingua-franca/pull/1760) ([@petervdonovan](https://github.com/petervdonovan))
+- Fixed race condition in C++ enclave coordination [\#1778](https://github.com/lf-lang/lingua-franca/pull/1778) ([@cmnrd](https://github.com/cmnrd))
+- Fix for error reporting bug [\#1787](https://github.com/lf-lang/lingua-franca/pull/1787) ([@lhstrh](https://github.com/lhstrh))
+- Fix warnings reported on CliBase. [\#1793](https://github.com/lf-lang/lingua-franca/pull/1793) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix to allow CLI args to be passed to federates [\#1798](https://github.com/lf-lang/lingua-franca/pull/1798) ([@petervdonovan](https://github.com/petervdonovan))
+- Multiple fixes for federated programs with TypeScript target [\#1752](https://github.com/lf-lang/lingua-franca/pull/1752) ([@byeong-gil](https://github.com/byeong-gil))
+- Fix for race condition in `uniqueName` [\#1815](https://github.com/lf-lang/lingua-franca/pull/1815) ([@petervdonovan](https://github.com/petervdonovan))
+- Fedsd compatibility with pandas 2.0 [\#1836](https://github.com/lf-lang/lingua-franca/pull/1836) ([@ChadliaJerad](https://github.com/ChadliaJerad))
+- Formatter fixes [\#1840](https://github.com/lf-lang/lingua-franca/pull/1840) ([@petervdonovan](https://github.com/petervdonovan))
+- Adjustments for running the LF compiler in Epoch [\#1844](https://github.com/lf-lang/lingua-franca/pull/1844) ([@a-sr](https://github.com/a-sr))
+- More formatter fixes [\#1850](https://github.com/lf-lang/lingua-franca/pull/1850) ([@petervdonovan](https://github.com/petervdonovan))
+- More formatter fixes [\#1851](https://github.com/lf-lang/lingua-franca/pull/1851) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix for naming collision when generic reactor is instantiated with different parameters [\#1864](https://github.com/lf-lang/lingua-franca/pull/1864) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix for inheritance problem exposed in examples [\#1891](https://github.com/lf-lang/lingua-franca/pull/1891) ([@lhstrh](https://github.com/lhstrh))
+- Fix verifier error when there is no main reactor [\#1916](https://github.com/lf-lang/lingua-franca/pull/1916) ([@lsk567](https://github.com/lsk567))
+- No more use of unordered reactions in federated programs; fix for deadlocks in some federated programs [\#1684](https://github.com/lf-lang/lingua-franca/pull/1684) ([@arengarajan99](https://github.com/arengarajan99))
+- Keyword `extends` added to tokens allowed in reaction bodies [\#1926](https://github.com/lf-lang/lingua-franca/pull/1926) ([@lhstrh](https://github.com/lhstrh))
+- Fix for edge case in which comments are dropped [\#1924](https://github.com/lf-lang/lingua-franca/pull/1924) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix for IllegalArgumentException in diagram synthesis [\#1932](https://github.com/lf-lang/lingua-franca/pull/1932) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix for STP violation [\#1935](https://github.com/lf-lang/lingua-franca/pull/1935) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix for after delays that use user-provided declarations [\#1959](https://github.com/lf-lang/lingua-franca/pull/1959) ([@petervdonovan](https://github.com/petervdonovan))
+- Bugfix for when top-level multiport width in federation depends on parameter [\#1956](https://github.com/lf-lang/lingua-franca/pull/1956) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix compilation error in code for reset state variables with time type [\#1964](https://github.com/lf-lang/lingua-franca/pull/1964) ([@a-sr](https://github.com/a-sr))
+
+**🚧 Maintenance and Refactoring**
+
+- Migration of Epoch into separate repository [\#1482](https://github.com/lf-lang/lingua-franca/pull/1482) ([@a-sr](https://github.com/a-sr))
+- Improved CLI argument handling using `picocli` [\#1534](https://github.com/lf-lang/lingua-franca/pull/1534) ([@patilatharva](https://github.com/patilatharva))
+- Compile definitions no longer hardcoded in generated CMakeLists.txt [\#1622](https://github.com/lf-lang/lingua-franca/pull/1622) ([@petervdonovan](https://github.com/petervdonovan))
+- Remove unchecked compilation warnings [\#1638](https://github.com/lf-lang/lingua-franca/pull/1638) ([@oowekyala](https://github.com/oowekyala))
+- Refactoring of part of the federated package [\#1663](https://github.com/lf-lang/lingua-franca/pull/1663) ([@lhstrh](https://github.com/lhstrh))
+- Removal of the use of non-API global variables in tests [\#1696](https://github.com/lf-lang/lingua-franca/pull/1696) ([@edwardalee](https://github.com/edwardalee))
+- Gradle bumped to version 8 [\#1691](https://github.com/lf-lang/lingua-franca/pull/1691) ([@lhstrh](https://github.com/lhstrh))
+- Removal of deprecated `build-lfc` script and `buildLfc` Gradle task [\#1714](https://github.com/lf-lang/lingua-franca/pull/1714) ([@cmnrd](https://github.com/cmnrd))
+- Delete unnecessary complexity from `build-lf-cli` [\#1745](https://github.com/lf-lang/lingua-franca/pull/1745) ([@petervdonovan](https://github.com/petervdonovan))
+- C files for Python support retrieved from reactor-c repo [\#1757](https://github.com/lf-lang/lingua-franca/pull/1757) ([@lhstrh](https://github.com/lhstrh))
+- Google autoformatter applied to all files [\#1766](https://github.com/lf-lang/lingua-franca/pull/1766) ([@lhstrh](https://github.com/lhstrh))
+- Struct refactoring for actions and ports [\#1756](https://github.com/lf-lang/lingua-franca/pull/1756) ([@edwardalee](https://github.com/edwardalee))
+- Redesign of the repository layout and gradle configuration [\#1779](https://github.com/lf-lang/lingua-franca/pull/1779) ([@cmnrd](https://github.com/cmnrd))
+- Removal of odd mechanism for loading target generators dynamically [\#1813](https://github.com/lf-lang/lingua-franca/pull/1813) ([@cmnrd](https://github.com/cmnrd))
+- Default line length set to 100 for LF files [\#1389](https://github.com/lf-lang/lingua-franca/pull/1389) ([@petervdonovan](https://github.com/petervdonovan))
+- KlighD bumped to `2.3.0` and now retrieved from Maven Central [\#1823](https://github.com/lf-lang/lingua-franca/pull/1823) ([@cmnrd](https://github.com/cmnrd))
+- Refactor error reporter [\#1527](https://github.com/lf-lang/lingua-franca/pull/1527) ([@oowekyala](https://github.com/oowekyala))
+- Unknown port types handled with `unknown` instead of `Present` [\#1857](https://github.com/lf-lang/lingua-franca/pull/1857) ([@lhstrh](https://github.com/lhstrh))
+- TS code generator adjusted to appease `eslint` [\#1878](https://github.com/lf-lang/lingua-franca/pull/1878) ([@lhstrh](https://github.com/lhstrh))
+- Minor fixes for the README in the test directory [\#1903](https://github.com/lf-lang/lingua-franca/pull/1903) ([@lsk567](https://github.com/lsk567))
+- Declarative Port Graph in C++ Runtime [\#1848](https://github.com/lf-lang/lingua-franca/pull/1848) ([@revol-xut](https://github.com/revol-xut))
+- No more use of unordered reactions in federated programs; fix for deadlocks in some federated programs [\#1684](https://github.com/lf-lang/lingua-franca/pull/1684) ([@arengarajan99](https://github.com/arengarajan99))
+- Tracing utils and Zephyr run scripts moved from `util` folder [\#1948](https://github.com/lf-lang/lingua-franca/pull/1948) ([@erlingrj](https://github.com/erlingrj))
+
+**📖 Documentation**
+
+- Documentation about LSP tests in `README.md` [\#1587](https://github.com/lf-lang/lingua-franca/pull/1587) ([@petervdonovan](https://github.com/petervdonovan))
+
+**🧪 Tests**
+
+- TypeScript tests for federates with physical connections [\#1623](https://github.com/lf-lang/lingua-franca/pull/1623) ([@byeong-gil](https://github.com/byeong-gil))
+- Zephyr tests pinned to particular version of docker image [\#1648](https://github.com/lf-lang/lingua-franca/pull/1648) ([@erlingrj](https://github.com/erlingrj))
+- Test for the support of delayed physical connections in the TypeScript target [\#1676](https://github.com/lf-lang/lingua-franca/pull/1676) ([@byeong-gil](https://github.com/byeong-gil))
+- Test for parsing CLI arguments in `lfc` [\#1668](https://github.com/lf-lang/lingua-franca/pull/1668) ([@patilatharva](https://github.com/patilatharva))
+- Zephyr regression tests executed on QEMU [\#1678](https://github.com/lf-lang/lingua-franca/pull/1678) ([@erlingrj](https://github.com/erlingrj))
+- CodeCov reporting for CLI tests [\#1688](https://github.com/lf-lang/lingua-franca/pull/1688) ([@lhstrh](https://github.com/lhstrh))
+- Test to help ensure that level-based scheduling does not cause deadlock [\#1703](https://github.com/lf-lang/lingua-franca/pull/1703) ([@edwardalee](https://github.com/edwardalee))
+- Flaky tests adjusted [\#1764](https://github.com/lf-lang/lingua-franca/pull/1764) ([@edwardalee](https://github.com/edwardalee))
+- Spurious dependency example [\#1707](https://github.com/lf-lang/lingua-franca/pull/1707) ([@petervdonovan](https://github.com/petervdonovan))
+- Added test of documented STP_offset parameter [\#1786](https://github.com/lf-lang/lingua-franca/pull/1786) ([@edwardalee](https://github.com/edwardalee))
+- `SimpleFederatedAuthenticated.lf` test passing [\#1776](https://github.com/lf-lang/lingua-franca/pull/1776) ([@Jakio815](https://github.com/Jakio815))
+- CI updates [\#1814](https://github.com/lf-lang/lingua-franca/pull/1814) ([@petervdonovan](https://github.com/petervdonovan))
+- Parallel execution of round trip tests [\#1845](https://github.com/lf-lang/lingua-franca/pull/1845) ([@oowekyala](https://github.com/oowekyala))
+- Tests for `lf_request_stop` with enclaves and federates [\#1871](https://github.com/lf-lang/lingua-franca/pull/1871) ([@edwardalee](https://github.com/edwardalee))
+- Fixed code coverage aggregation and reporting [\#1868](https://github.com/lf-lang/lingua-franca/pull/1868) ([@cmnrd](https://github.com/cmnrd))
+- New job for building `epoch` in CI [\#1974](https://github.com/lf-lang/lingua-franca/pull/1974) ([@lhstrh](https://github.com/lhstrh))
+
+**⬆️ Updated Dependencies**
+
+- Update to Zephyr v3.3.0 and SDK v0.16.1 [\#1825](https://github.com/lf-lang/lingua-franca/pull/1825) ([@erlingrj](https://github.com/erlingrj))
+- Reactor-ts bumped to v0.4.0 [\#1749](https://github.com/lf-lang/lingua-franca/pull/1749) ([@lhstrh](https://github.com/lhstrh))
+- Gradle Wrapper bumped to `8.1.1` [\#1890](https://github.com/lf-lang/lingua-franca/pull/1890) ([@lhstrh](https://github.com/lhstrh))
+- Eclipse-related dependencies bumped to latest releases [\#1889](https://github.com/lf-lang/lingua-franca/pull/1889) ([@a-sr](https://github.com/a-sr))
+- TypeScript runtime bumped to `v0.5.0` [\#1927](https://github.com/lf-lang/lingua-franca/pull/1927) ([@byeong-gil](https://github.com/byeong-gil))
+
+
+### Submodule [lf-lang/reactor-c](http://github.com/lf-lang/reactor-c)
+
+**🚀 New Features**
+
+- New tracepoint for deadline misses [\#169](https://github.com/lf-lang/reactor-c/pull/169) ([@erlingrj](https://github.com/erlingrj))
+- Compile definitions for federated programs [\#179](https://github.com/lf-lang/reactor-c/pull/179) ([@petervdonovan](https://github.com/petervdonovan))
+- Tracing federate interactions [\#178](https://github.com/lf-lang/reactor-c/pull/178) ([@edwardalee](https://github.com/edwardalee))
+- CMake definition to find `FEDERATED_AUTHENTICATED` [\#196](https://github.com/lf-lang/reactor-c/pull/196) ([@Jakio815](https://github.com/Jakio815))
+- Memory reporting [\#201](https://github.com/lf-lang/reactor-c/pull/201) ([@edwardalee](https://github.com/edwardalee))
+- Added `LF_PACKAGE_DIRECTORY` [\#204](https://github.com/lf-lang/reactor-c/pull/204) ([@edwardalee](https://github.com/edwardalee))
+- Runtime support for watchdogs [\#177](https://github.com/lf-lang/reactor-c/pull/177) ([@Benichiwa](https://github.com/Benichiwa))
+- Environments [\#212](https://github.com/lf-lang/reactor-c/pull/212) ([@erlingrj](https://github.com/erlingrj))
+- Enclave request stop [\#244](https://github.com/lf-lang/reactor-c/pull/244) ([@edwardalee](https://github.com/edwardalee))
+- Critical sections enabled outside of the context of a reactor [\#249](https://github.com/lf-lang/reactor-c/pull/249) ([@edwardalee](https://github.com/edwardalee))
+- Rp2040 Target Support [\#253](https://github.com/lf-lang/reactor-c/pull/253) ([@gundralaa](https://github.com/gundralaa))
+- Platform support for Raspberry Pi Pico [\#233](https://github.com/lf-lang/reactor-c/pull/233) ([@gundralaa](https://github.com/gundralaa))
+
+**✨ Enhancements**
+
+- Removal of unnecessary TAG messages [\#175](https://github.com/lf-lang/reactor-c/pull/175) ([@byeong-gil](https://github.com/byeong-gil))
+- Cleaner namespace [\#189](https://github.com/lf-lang/reactor-c/pull/189) ([@petervdonovan](https://github.com/petervdonovan))
+- File access and doc fixes [\#198](https://github.com/lf-lang/reactor-c/pull/198) ([@edwardalee](https://github.com/edwardalee))
+- Improvements of support for watchdogs [\#209](https://github.com/lf-lang/reactor-c/pull/209) ([@edwardalee](https://github.com/edwardalee))
+- Switch to more general thread creation in Zephyr support [\#194](https://github.com/lf-lang/reactor-c/pull/194) ([@siljesu](https://github.com/siljesu))
+- Minor improvements to Zephyr platform [\#187](https://github.com/lf-lang/reactor-c/pull/187) ([@erlingrj](https://github.com/erlingrj))
+- Output error when trying to use --auth (-a) for RTI built without -DAUTH=ON [\#222](https://github.com/lf-lang/reactor-c/pull/222) ([@hokeun](https://github.com/hokeun))
+- Change nanosleep to lf_sleep in federate and RTI code [\#219](https://github.com/lf-lang/reactor-c/pull/219) ([@siljesu](https://github.com/siljesu))
+- RTI exit while saving the trace file [\#228](https://github.com/lf-lang/reactor-c/pull/228) ([@ChadliaJerad](https://github.com/ChadliaJerad))
+- Less namespace pollution [\#240](https://github.com/lf-lang/reactor-c/pull/240) ([@erlingrj](https://github.com/erlingrj))
+- Enclaves tuning [\#243](https://github.com/lf-lang/reactor-c/pull/243) ([@edwardalee](https://github.com/edwardalee))
+- If clock sync is on, link math [\#252](https://github.com/lf-lang/reactor-c/pull/252) ([@petervdonovan](https://github.com/petervdonovan))
+- No more use of unordered reactions in federated programs [\#191](https://github.com/lf-lang/reactor-c/pull/191) ([@arengarajan99](https://github.com/arengarajan99))
+
+**🔧 Fixes**
+
+- Fix for definition of `LF_TIME_BUFFER_LENGTH` [\#197](https://github.com/lf-lang/reactor-c/pull/197) ([@edwardalee](https://github.com/edwardalee))
+- Scheduler leak fix [\#200](https://github.com/lf-lang/reactor-c/pull/200) ([@edwardalee](https://github.com/edwardalee))
+- Fix for Arduino to avoid duplicate definition of `timespec` [\#195](https://github.com/lf-lang/reactor-c/pull/195) ([@arengarajan99](https://github.com/arengarajan99))
+- Suppression of "no symbols" warnings emitted by ranlib [\#214](https://github.com/lf-lang/reactor-c/pull/214) ([@petervdonovan](https://github.com/petervdonovan))
+- Segfault fix [\#218](https://github.com/lf-lang/reactor-c/pull/218) ([@petervdonovan](https://github.com/petervdonovan))
+- Zephyr fixes on thread creation and deletion [\#223](https://github.com/lf-lang/reactor-c/pull/223) ([@erlingrj](https://github.com/erlingrj))
+- Minor fix of the federate id in the tracepoint [\#245](https://github.com/lf-lang/reactor-c/pull/245) ([@ChadliaJerad](https://github.com/ChadliaJerad))
+- Fix protocol of HMAC authentication to start from federate. [\#231](https://github.com/lf-lang/reactor-c/pull/231) ([@Jakio815](https://github.com/Jakio815))
+- Use of correct federate ID in tracing of absent messages [\#248](https://github.com/lf-lang/reactor-c/pull/248) ([@ChadliaJerad](https://github.com/ChadliaJerad))
+- Memory leak in Python target fixed [\#246](https://github.com/lf-lang/reactor-c/pull/246) ([@jackykwok2024](https://github.com/jackykwok2024))
+- Fix for fatal error raised during shutdown when decrementing a tag barrier that is zero [\#251](https://github.com/lf-lang/reactor-c/pull/251) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix for STP violation [\#257](https://github.com/lf-lang/reactor-c/pull/257) ([@petervdonovan](https://github.com/petervdonovan))
+
+**🚧 Maintenance and Refactoring**
+
+- Functions of rti.c moved to rti_lib.c to enable reuse [\#172](https://github.com/lf-lang/reactor-c/pull/172) ([@Jakio815](https://github.com/Jakio815))
+- Code in `rti.c` made available as library [\#174](https://github.com/lf-lang/reactor-c/pull/174) ([@Jakio815](https://github.com/Jakio815))
+- Documentation and code cleanup [\#193](https://github.com/lf-lang/reactor-c/pull/193) ([@edwardalee](https://github.com/edwardalee))
+- Platform abstraction layer for the RTI [\#213](https://github.com/lf-lang/reactor-c/pull/213) ([@siljesu](https://github.com/siljesu))
+- C files from reactor-c-py moved back into the reactor-c repo [\#217](https://github.com/lf-lang/reactor-c/pull/217) ([@lhstrh](https://github.com/lhstrh))
+- Struct refactoring for actions and ports [\#216](https://github.com/lf-lang/reactor-c/pull/216) ([@edwardalee](https://github.com/edwardalee))
+- Refactoring of the RTI implementation [\#224](https://github.com/lf-lang/reactor-c/pull/224) ([@ChadliaJerad](https://github.com/ChadliaJerad))
+- `_lf_count_token_allocations` made `extern` instead of `static` [\#236](https://github.com/lf-lang/reactor-c/pull/236) ([@erlingrj](https://github.com/erlingrj))
+- Refactoring of obsolete `gethostbyname()` in `connect_to_rti()` [\#220](https://github.com/lf-lang/reactor-c/pull/220) ([@siljesu](https://github.com/siljesu))
+- No more use of unordered reactions in federated programs [\#191](https://github.com/lf-lang/reactor-c/pull/191) ([@arengarajan99](https://github.com/arengarajan99))
+- Fewer warnings [\#258](https://github.com/lf-lang/reactor-c/pull/258) ([@edwardalee](https://github.com/edwardalee))
+
+**📖 Documentation**
+
+- Documentation and code cleanup [\#193](https://github.com/lf-lang/reactor-c/pull/193) ([@edwardalee](https://github.com/edwardalee))
+
+
+### Submodule [lf-lang/reactor-cpp](http://github.com/lf-lang/reactor-cpp)
+
+**🚀 New Features**
+
+- Enclave connections and enclave coordination [\#44](https://github.com/lf-lang/reactor-cpp/pull/44) ([@cmnrd](https://github.com/cmnrd))
+- Simple mechanism for collecting statistics during execution [\#47](https://github.com/lf-lang/reactor-cpp/pull/47) ([@cmnrd](https://github.com/cmnrd))
+- Port graph [\#51](https://github.com/lf-lang/reactor-cpp/pull/51) ([@revol-xut](https://github.com/revol-xut))
+
+**✨ Enhancements**
+
+- Keep track of input actions in the environment [\#42](https://github.com/lf-lang/reactor-cpp/pull/42) ([@cmnrd](https://github.com/cmnrd))
+- Factored event queue into its own class and fixed race condition between multiple starting enclaves [\#45](https://github.com/lf-lang/reactor-cpp/pull/45) ([@cmnrd](https://github.com/cmnrd))
+
+**🔧 Fixes**
+
+- Fix race condition in time barriers [\#49](https://github.com/lf-lang/reactor-cpp/pull/49) ([@cmnrd](https://github.com/cmnrd))
+- Fix validate method and fix incorrect phase checks [\#50](https://github.com/lf-lang/reactor-cpp/pull/50) ([@cmnrd](https://github.com/cmnrd))
+
+
+### Submodule [lf-lang/reactor-rs](http://github.com/lf-lang/reactor-rs)
+
+- Use Cargo workspaces to directly include vecmap dependency [\#40](https://github.com/lf-lang/reactor-rs/pull/40) ([@jhaye](https://github.com/jhaye))
+- Fixes for current Clippy version [\#45](https://github.com/lf-lang/reactor-rs/pull/45) ([@jhaye](https://github.com/jhaye))
+- chore: Bump dependencies to avoid vulnerability in smallvec [\#44](https://github.com/lf-lang/reactor-rs/pull/44) ([@oowekyala](https://github.com/oowekyala))
+- Fix use of multiport as reaction source [\#43](https://github.com/lf-lang/reactor-rs/pull/43) ([@oowekyala](https://github.com/oowekyala))
+
 
 ## [v0.4.0](https://github.com/lf-lang/lingua-franca/tree/v0.4.0) (2023-03-01)
 

From 313e0b2f34fe2e66a1f61a9ca003aa090e641eb2 Mon Sep 17 00:00:00 2001
From: "lingua-franca[bot]" <97201490+francabot@users.noreply.github.com>
Date: Wed, 30 Aug 2023 05:24:55 +0000
Subject: [PATCH 0791/1114] Bump version to 0.5.0

---
 CHANGELOG.md                                                | 2 +-
 core/src/main/resources/org/lflang/StringsBundle.properties | 2 +-
 gradle.properties                                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 947b70314b..5dd1e426ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 # Changelog
- 
+
 ## [v0.5.0](https://github.com/lf-lang/lingua-franca/tree/v0.5.0) (2023-08-30)
 
 **Highlights**
diff --git a/core/src/main/resources/org/lflang/StringsBundle.properties b/core/src/main/resources/org/lflang/StringsBundle.properties
index 29b191399c..b58621d407 100644
--- a/core/src/main/resources/org/lflang/StringsBundle.properties
+++ b/core/src/main/resources/org/lflang/StringsBundle.properties
@@ -1 +1 @@
-VERSION = 0.4.1-SNAPSHOT
+VERSION = 0.5.0
diff --git a/gradle.properties b/gradle.properties
index fd082fc31f..ce77106367 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 [header]
 group=org.lflang
-version=0.4.1-SNAPSHOT
+version=0.5.0
 
 [versions]
 antlrVersion=4.7.2

From 15b514408c912f71910abae3036845e679bb2637 Mon Sep 17 00:00:00 2001
From: revol-xut <revol-xut@protonmail.com>
Date: Thu, 31 Aug 2023 13:13:10 +0200
Subject: [PATCH 0792/1114] fixing using int for iterators

---
 test/Cpp/src/ArrayScale.lf                                | 2 +-
 test/Cpp/src/enclave/EnclaveMultiportToPort.lf            | 2 +-
 test/Cpp/src/enclave/EnclaveMultiportToPort2.lf           | 2 +-
 test/Cpp/src/multiport/MultiportFromBankHierarchyAfter.lf | 2 +-
 test/Cpp/src/multiport/MultiportFromHierarchy.lf          | 2 +-
 test/Cpp/src/multiport/MultiportIn.lf                     | 2 +-
 test/Cpp/src/multiport/MultiportToMultiportArray.lf       | 2 +-
 test/Cpp/src/multiport/MultiportToPort.lf                 | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/Cpp/src/ArrayScale.lf b/test/Cpp/src/ArrayScale.lf
index 9d0b3cf350..751a36c5a2 100644
--- a/test/Cpp/src/ArrayScale.lf
+++ b/test/Cpp/src/ArrayScale.lf
@@ -14,7 +14,7 @@ reactor Scale(scale: int = 2) {
     auto array = in.get().get_mutable_copy();
     // NOTE: Ideally, no copy copy would be made here, as there is only
     // one recipient for the value, but this is not supported yet by the C++ runtime.
-    for(int i = 0; i < array->size(); i++) {
+    for(auto i = 0; i < array->size(); i++) {
       (*array)[i] = (*array)[i] * scale;
     }
     out.set(std::move(array));
diff --git a/test/Cpp/src/enclave/EnclaveMultiportToPort.lf b/test/Cpp/src/enclave/EnclaveMultiportToPort.lf
index f20ad09633..53f5e8bfdb 100644
--- a/test/Cpp/src/enclave/EnclaveMultiportToPort.lf
+++ b/test/Cpp/src/enclave/EnclaveMultiportToPort.lf
@@ -8,7 +8,7 @@ reactor Source {
   output[2] out: int
 
   reaction(startup) -> out {=
-    for(int i = 0; i < out.size(); i++) {
+    for(auto i = 0; i < out.size(); i++) {
       std::cout << "Source sending " << i << ".\n";
       out[i].set(i);
     }
diff --git a/test/Cpp/src/enclave/EnclaveMultiportToPort2.lf b/test/Cpp/src/enclave/EnclaveMultiportToPort2.lf
index 7e40a09623..257374001d 100644
--- a/test/Cpp/src/enclave/EnclaveMultiportToPort2.lf
+++ b/test/Cpp/src/enclave/EnclaveMultiportToPort2.lf
@@ -8,7 +8,7 @@ reactor Source {
   output[2] out: int
 
   reaction(startup) -> out {=
-    for(int i = 0; i < out.size(); i++) {
+    for(auto i = 0; i < out.size(); i++) {
       std::cout << "Source sending " << i << ".\n";
       out[i].set(i);
     }
diff --git a/test/Cpp/src/multiport/MultiportFromBankHierarchyAfter.lf b/test/Cpp/src/multiport/MultiportFromBankHierarchyAfter.lf
index cb3eeaa0c4..bbd25fa5ce 100644
--- a/test/Cpp/src/multiport/MultiportFromBankHierarchyAfter.lf
+++ b/test/Cpp/src/multiport/MultiportFromBankHierarchyAfter.lf
@@ -22,7 +22,7 @@ reactor Destination {
   state received: bool = false
 
   reaction(in) {=
-    for (int i = 0; i < in.size(); i++) {
+    for (auto i = 0; i < in.size(); i++) {
       int value = *in[i].get();
       std::cout << "Destination channel " << i << " received " << value << '\n';
       if (i != value) {
diff --git a/test/Cpp/src/multiport/MultiportFromHierarchy.lf b/test/Cpp/src/multiport/MultiportFromHierarchy.lf
index 0615286dfc..1531af59a6 100644
--- a/test/Cpp/src/multiport/MultiportFromHierarchy.lf
+++ b/test/Cpp/src/multiport/MultiportFromHierarchy.lf
@@ -10,7 +10,7 @@ reactor Source {
   state s: int = 0
 
   reaction(t) -> out {=
-    for(int i = 0; i < 4; i++) {
+    for(auto i = 0; i < 4; i++) {
       out[i].set(s++);
     }
   =}
diff --git a/test/Cpp/src/multiport/MultiportIn.lf b/test/Cpp/src/multiport/MultiportIn.lf
index 6f4f63f74b..862549a7a0 100644
--- a/test/Cpp/src/multiport/MultiportIn.lf
+++ b/test/Cpp/src/multiport/MultiportIn.lf
@@ -26,7 +26,7 @@ reactor Destination {
 
   reaction(in) {=
     int sum = 0;
-    for (int i = 0; i < in.size(); i++) {
+    for (auto i = 0; i < in.size(); i++) {
       sum += *in[i].get();
     }
     std::cout << "Sum of received: " << sum << ".\n";
diff --git a/test/Cpp/src/multiport/MultiportToMultiportArray.lf b/test/Cpp/src/multiport/MultiportToMultiportArray.lf
index 3f95cd2c21..9ab9b4fba9 100644
--- a/test/Cpp/src/multiport/MultiportToMultiportArray.lf
+++ b/test/Cpp/src/multiport/MultiportToMultiportArray.lf
@@ -31,7 +31,7 @@ reactor Destination {
     int sum = 0;
     for (auto i : in.present_indices_unsorted()) {
       const auto& a = *in[i].get();
-      for (int j = 0; j < a.size(); j++) {
+      for (auto j = 0; j < a.size(); j++) {
         sum += a[j];
       }
     }
diff --git a/test/Cpp/src/multiport/MultiportToPort.lf b/test/Cpp/src/multiport/MultiportToPort.lf
index 31354d320c..5d32c6ee45 100644
--- a/test/Cpp/src/multiport/MultiportToPort.lf
+++ b/test/Cpp/src/multiport/MultiportToPort.lf
@@ -8,7 +8,7 @@ reactor Source {
   output[2] out: int
 
   reaction(startup) -> out {=
-    for(int i = 0; i < out.size(); i++) {
+    for(auto i = 0; i < out.size(); i++) {
       std::cout << "Source sending " << i << ".\n";
       out[i].set(i);
     }

From 4e1ca21a497a3ba6892e569f8523e7a9ab231526 Mon Sep 17 00:00:00 2001
From: i love smoked beef brisket <axmmisaka@users.noreply.github.com>
Date: Thu, 31 Aug 2023 21:44:24 -0700
Subject: [PATCH 0793/1114] Do not use gradlew to run dev version of lf cli
 tools

---
 util/scripts/launch.ps1 | 8 ++------
 util/scripts/launch.sh  | 7 ++-----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/util/scripts/launch.ps1 b/util/scripts/launch.ps1
index dda258cc44..bb14204f5c 100644
--- a/util/scripts/launch.ps1
+++ b/util/scripts/launch.ps1
@@ -29,9 +29,5 @@ $base="$PSScriptRoot\..\..\"
 $gradlew="${base}/gradlew.bat"
 
 # invoke script
-if ($args.Length -eq 0) {
-    & "${gradlew}" -p "${base}" "cli:${tool}:run"
-} else {
-    $argsString = $args -join " "
-    & "${gradlew}" -p "${base}" "cli:${tool}:run" --args="${argsString}"
-}
\ No newline at end of file
+& "${gradlew}" assemble
+& "${base}/build/install/lf-cli/bin/${tool}" @args
\ No newline at end of file
diff --git a/util/scripts/launch.sh b/util/scripts/launch.sh
index 36a342bd25..22a272f81f 100755
--- a/util/scripts/launch.sh
+++ b/util/scripts/launch.sh
@@ -72,8 +72,5 @@ fi
 gradlew="${base}/gradlew"
 
 # Launch the tool.
-if [ $# -eq 0 ]; then
-    "${gradlew}" -p "${base}" "cli:${tool}:run"
-else
-    "${gradlew}" -p "${base}" "cli:${tool}:run" --args="$*"
-fi
+"${gradlew}" assemble
+"${base}/build/install/lf-cli/bin/${tool}" "$@"
\ No newline at end of file

From d56eceaa81527f1080d76b7631ad785a55ad9e7b Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 31 Aug 2023 22:26:04 -0700
Subject: [PATCH 0794/1114] WIP towards refactoring target properties

---
 cli/lfc/src/main/java/org/lflang/cli/Lfc.java |    2 +-
 .../lflang/tests/runtime/CSchedulerTest.java  |    2 +-
 .../main/java/org/lflang/TargetConfig.java    |   14 +-
 .../main/java/org/lflang/TargetProperty.java  | 2322 ++++++-----------
 .../java/org/lflang/TargetPropertyConfig.java |   26 +
 .../federated/extensions/CExtension.java      |    2 +-
 .../extensions/FedTargetExtension.java        |    2 +-
 .../federated/extensions/PythonExtension.java |    2 +-
 .../federated/extensions/TSExtension.java     |    2 +-
 .../federated/generator/FedASTUtils.java      |    2 +-
 .../federated/generator/FedGenerator.java     |    2 +-
 .../launcher/FedLauncherGenerator.java        |    4 +-
 .../lflang/generator/c/CCmakeGenerator.java   |    2 +-
 .../org/lflang/generator/c/CCompiler.java     |    6 +-
 .../org/lflang/generator/c/CGenerator.java    |    5 +-
 .../generator/c/CMainFunctionGenerator.java   |    2 +-
 .../generator/c/CPreambleGenerator.java       |    2 +-
 .../generator/c/CTriggerObjectsGenerator.java |    2 +-
 .../generator/rust/CargoDependencySpec.java   |    2 +-
 .../generator/rust/RustTargetConfig.java      |    2 +-
 .../org/lflang/target/AuthConfigurator.java   |   33 +
 .../lflang/target/ClockSyncConfigurator.java  |  115 +
 .../org/lflang/target/CoordinationConfig.java |   83 +
 .../java/org/lflang/target/DockerConfig.java  |   66 +
 .../org/lflang/target/FastConfigurator.java   |   64 +
 .../lflang/target/KeepaliveConfigurator.java  |   42 +
 .../lflang/target/LoggingConfigurator.java    |   23 +
 .../lflang/target/PlatformConfigurator.java   |  142 +
 .../target/Ros2DependenciesConfigurator.java  |   41 +
 .../lflang/target/SchedulerConfigurator.java  |  121 +
 .../lflang/target/TracingConfigurator.java    |  131 +
 .../lflang/target/property/BuildConfig.java   |   32 +
 .../target/property/type/ArrayType.java       |   61 +
 .../target/property/type/DictionaryType.java  |   95 +
 .../target/property/type/PrimitiveType.java   |  114 +
 .../property/type/StringDictionaryType.java   |   35 +
 .../property/type/TargetPropertyType.java     |   48 +
 .../target/property/type/UnionType.java       |  137 +
 .../org/lflang/validation/LFValidator.java    |  184 +-
 .../lflang/validation/ValidationReporter.java |   10 +
 .../compiler/LinguaFrancaValidationTest.java  |   12 +-
 .../java/org/lflang/tests/Configurators.java  |    4 +-
 42 files changed, 2262 insertions(+), 1736 deletions(-)
 create mode 100644 core/src/main/java/org/lflang/TargetPropertyConfig.java
 create mode 100644 core/src/main/java/org/lflang/target/AuthConfigurator.java
 create mode 100644 core/src/main/java/org/lflang/target/ClockSyncConfigurator.java
 create mode 100644 core/src/main/java/org/lflang/target/CoordinationConfig.java
 create mode 100644 core/src/main/java/org/lflang/target/DockerConfig.java
 create mode 100644 core/src/main/java/org/lflang/target/FastConfigurator.java
 create mode 100644 core/src/main/java/org/lflang/target/KeepaliveConfigurator.java
 create mode 100644 core/src/main/java/org/lflang/target/LoggingConfigurator.java
 create mode 100644 core/src/main/java/org/lflang/target/PlatformConfigurator.java
 create mode 100644 core/src/main/java/org/lflang/target/Ros2DependenciesConfigurator.java
 create mode 100644 core/src/main/java/org/lflang/target/SchedulerConfigurator.java
 create mode 100644 core/src/main/java/org/lflang/target/TracingConfigurator.java
 create mode 100644 core/src/main/java/org/lflang/target/property/BuildConfig.java
 create mode 100644 core/src/main/java/org/lflang/target/property/type/ArrayType.java
 create mode 100644 core/src/main/java/org/lflang/target/property/type/DictionaryType.java
 create mode 100644 core/src/main/java/org/lflang/target/property/type/PrimitiveType.java
 create mode 100644 core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java
 create mode 100644 core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java
 create mode 100644 core/src/main/java/org/lflang/target/property/type/UnionType.java
 create mode 100644 core/src/main/java/org/lflang/validation/ValidationReporter.java

diff --git a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
index f8a51d367f..eb30503aca 100644
--- a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
+++ b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
@@ -10,7 +10,7 @@
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
 import org.eclipse.xtext.util.CancelIndicator;
 import org.lflang.FileConfig;
-import org.lflang.TargetProperty.UnionType;
+import org.lflang.target.property.type.UnionType;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.LFGeneratorContext.BuildParm;
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
index fd2345723f..c064560ead 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
@@ -3,7 +3,7 @@
 import java.util.EnumSet;
 import org.junit.jupiter.api.Test;
 import org.lflang.Target;
-import org.lflang.TargetProperty.SchedulerOption;
+import org.lflang.target.SchedulerConfigurator.SchedulerOption;
 import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry.TestCategory;
diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index 12096f9d6c..2e7ee40005 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -32,17 +32,17 @@
 import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
-import org.lflang.TargetProperty.BuildType;
-import org.lflang.TargetProperty.ClockSyncMode;
-import org.lflang.TargetProperty.CoordinationType;
-import org.lflang.TargetProperty.LogLevel;
-import org.lflang.TargetProperty.Platform;
-import org.lflang.TargetProperty.SchedulerOption;
-import org.lflang.TargetProperty.UnionType;
 import org.lflang.generator.LFGeneratorContext.BuildParm;
 import org.lflang.generator.rust.RustTargetConfig;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.TargetDecl;
+import org.lflang.target.property.BuildConfig.BuildType;
+import org.lflang.target.ClockSyncConfigurator.ClockSyncMode;
+import org.lflang.target.CoordinationConfig.CoordinationType;
+import org.lflang.target.LoggingConfigurator.LogLevel;
+import org.lflang.target.PlatformConfigurator.Platform;
+import org.lflang.target.SchedulerConfigurator.SchedulerOption;
+import org.lflang.target.property.type.UnionType;
 
 /**
  * A class for keeping the current target configuration.
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index d494e1d760..5246f72e51 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -25,18 +25,14 @@
 
 package org.lflang;
 
-import com.google.common.collect.ImmutableList;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
+
 import org.lflang.TargetConfig.DockerOptions;
 import org.lflang.TargetConfig.PlatformOptions;
-import org.lflang.TargetConfig.TracingOptions;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.InvalidLfSourceException;
 import org.lflang.generator.rust.CargoDependencySpec;
@@ -46,10 +42,30 @@
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
+import org.lflang.lf.Model;
 import org.lflang.lf.TargetDecl;
+import org.lflang.target.property.BuildConfig.BuildType;
+import org.lflang.target.ClockSyncConfigurator;
+import org.lflang.target.ClockSyncConfigurator.ClockSyncOption;
+import org.lflang.target.CoordinationConfig.CoordinationOption;
+import org.lflang.target.CoordinationConfig.CoordinationType;
+import org.lflang.target.DockerConfig.DockerOption;
+import org.lflang.target.FastConfigurator;
+import org.lflang.target.KeepaliveConfigurator;
+import org.lflang.target.LoggingConfigurator.LogLevel;
+import org.lflang.target.PlatformConfigurator.Platform;
+import org.lflang.target.PlatformConfigurator.PlatformOption;
+import org.lflang.target.SchedulerConfigurator;
+import org.lflang.target.property.type.ArrayType;
+import org.lflang.target.property.type.DictionaryType;
+import org.lflang.target.property.type.StringDictionaryType;
+import org.lflang.target.property.type.TargetPropertyType;
+import org.lflang.target.property.type.PrimitiveType;
+import org.lflang.target.TracingConfigurator;
+import org.lflang.target.property.type.UnionType;
 import org.lflang.util.FileUtil;
 import org.lflang.util.StringUtil;
-import org.lflang.validation.LFValidator;
+import org.lflang.validation.ValidationReporter;
 
 /**
  * A target properties along with a type and a list of supporting targets that supports it, as well
@@ -59,776 +75,730 @@
  */
 public enum TargetProperty {
   /** Directive to allow including OpenSSL libraries and process HMAC authentication. */
-  AUTH(
-      "auth",
-      PrimitiveType.BOOLEAN,
-      Arrays.asList(Target.C, Target.CCPP),
-      (config) -> ASTUtils.toElement(config.auth),
-      (config, value, err) -> {
-        config.auth = ASTUtils.toBoolean(value);
-      }),
-  /** Directive to let the generator use the custom build command. */
-  BUILD(
-      "build",
-      UnionType.STRING_OR_STRING_ARRAY,
-      Arrays.asList(Target.C, Target.CCPP),
-      (config) -> ASTUtils.toElement(config.buildCommands),
-      (config, value, err) -> {
-        config.buildCommands = ASTUtils.elementToListOfStrings(value);
-      }),
-
-  /**
-   * Directive to specify the target build type such as 'Release' or 'Debug'. This is also used in
-   * the Rust target to select a Cargo profile.
-   */
-  BUILD_TYPE(
-      "build-type",
-      UnionType.BUILD_TYPE_UNION,
-      Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Rust),
-      (config) -> ASTUtils.toElement(config.cmakeBuildType.toString()),
-      (config, value, err) -> {
-        config.cmakeBuildType =
-            (BuildType) UnionType.BUILD_TYPE_UNION.forName(ASTUtils.elementToSingleString(value));
-        // set it there too, because the default is different.
-        config.rust.setBuildType(config.cmakeBuildType);
-      }),
-
-  /** Directive to let the federate execution handle clock synchronization in software. */
-  CLOCK_SYNC(
-      "clock-sync",
-      UnionType.CLOCK_SYNC_UNION,
-      Arrays.asList(Target.C, Target.CCPP, Target.Python),
-      (config) -> ASTUtils.toElement(config.clockSync.toString()),
-      (config, value, err) -> {
-        config.clockSync =
-            (ClockSyncMode)
-                UnionType.CLOCK_SYNC_UNION.forName(ASTUtils.elementToSingleString(value));
-      }),
-  /** Key-value pairs giving options for clock synchronization. */
-  CLOCK_SYNC_OPTIONS(
-      "clock-sync-options",
-      DictionaryType.CLOCK_SYNC_OPTION_DICT,
-      Arrays.asList(Target.C, Target.CCPP, Target.Python),
-      (config) -> {
-        Element e = LfFactory.eINSTANCE.createElement();
-        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-        for (ClockSyncOption opt : ClockSyncOption.values()) {
-          KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-          pair.setName(opt.toString());
-          switch (opt) {
-            case ATTENUATION:
-              pair.setValue(ASTUtils.toElement(config.clockSyncOptions.attenuation));
-              break;
-            case COLLECT_STATS:
-              pair.setValue(ASTUtils.toElement(config.clockSyncOptions.collectStats));
-              break;
-            case LOCAL_FEDERATES_ON:
-              pair.setValue(ASTUtils.toElement(config.clockSyncOptions.localFederatesOn));
-              break;
-            case PERIOD:
-              if (config.clockSyncOptions.period == null) continue; // don't set if null
-              pair.setValue(ASTUtils.toElement(config.clockSyncOptions.period));
-              break;
-            case TEST_OFFSET:
-              if (config.clockSyncOptions.testOffset == null) continue; // don't set if null
-              pair.setValue(ASTUtils.toElement(config.clockSyncOptions.testOffset));
-              break;
-            case TRIALS:
-              pair.setValue(ASTUtils.toElement(config.clockSyncOptions.trials));
-              break;
-          }
-          kvp.getPairs().add(pair);
-        }
-        e.setKeyvalue(kvp);
-        // kvp will never be empty
-        return e;
-      },
-      (config, value, err) -> {
-        for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-          ClockSyncOption option =
-              (ClockSyncOption) DictionaryType.CLOCK_SYNC_OPTION_DICT.forName(entry.getName());
-          switch (option) {
-            case ATTENUATION:
-              config.clockSyncOptions.attenuation = ASTUtils.toInteger(entry.getValue());
-              break;
-            case COLLECT_STATS:
-              config.clockSyncOptions.collectStats = ASTUtils.toBoolean(entry.getValue());
-              break;
-            case LOCAL_FEDERATES_ON:
-              config.clockSyncOptions.localFederatesOn = ASTUtils.toBoolean(entry.getValue());
-              break;
-            case PERIOD:
-              config.clockSyncOptions.period = ASTUtils.toTimeValue(entry.getValue());
-              break;
-            case TEST_OFFSET:
-              config.clockSyncOptions.testOffset = ASTUtils.toTimeValue(entry.getValue());
-              break;
-            case TRIALS:
-              config.clockSyncOptions.trials = ASTUtils.toInteger(entry.getValue());
-              break;
-            default:
-              break;
-          }
-        }
-      }),
-
-  /**
-   * Directive to specify a cmake to be included by the generated build systems.
-   *
-   * <p>This gives full control over the C/C++ build as any cmake parameters can be adjusted in the
-   * included file.
-   */
-  CMAKE_INCLUDE(
-      "cmake-include",
-      UnionType.FILE_OR_FILE_ARRAY,
-      Arrays.asList(Target.CPP, Target.C, Target.CCPP),
-      (config) -> ASTUtils.toElement(config.cmakeIncludes),
-      (config, value, err) -> {
-        config.cmakeIncludes = ASTUtils.elementToListOfStrings(value);
-      },
-      // FIXME: This merging of lists is potentially dangerous since
-      // the incoming list of cmake-includes can belong to a .lf file that is
-      // located in a different location, and keeping just filename
-      // strings like this without absolute paths is incorrect.
-      (config, value, err) -> {
-        config.cmakeIncludes.addAll(ASTUtils.elementToListOfStrings(value));
-      }),
-  /** Directive to specify the target compiler. */
-  COMPILER(
-      "compiler",
-      PrimitiveType.STRING,
-      Target.ALL,
-      (config) -> ASTUtils.toElement(config.compiler),
-      (config, value, err) -> {
-        config.compiler = ASTUtils.elementToSingleString(value);
-      }),
-
-  /** Directive to specify compile-time definitions. */
-  COMPILE_DEFINITIONS(
-      "compile-definitions",
-      StringDictionaryType.COMPILE_DEFINITION,
-      Arrays.asList(Target.C, Target.CCPP, Target.Python),
-      (config) -> ASTUtils.toElement(config.compileDefinitions),
-      (config, value, err) -> {
-        config.compileDefinitions = ASTUtils.elementToStringMaps(value);
-      }),
-
-  /**
-   * Directive to generate a Dockerfile. This is either a boolean, true or false, or a dictionary of
-   * options.
-   */
-  DOCKER(
-      "docker",
-      UnionType.DOCKER_UNION,
-      Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS),
-      (config) -> {
-        if (config.dockerOptions == null) {
-          return null;
-        } else if (config.dockerOptions.equals(new DockerOptions())) {
-          // default configuration
-          return ASTUtils.toElement(true);
-        } else {
-          Element e = LfFactory.eINSTANCE.createElement();
-          KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-          for (DockerOption opt : DockerOption.values()) {
-            KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-            pair.setName(opt.toString());
-            switch (opt) {
-              case FROM:
-                if (config.dockerOptions.from == null) continue;
-                pair.setValue(ASTUtils.toElement(config.dockerOptions.from));
-                break;
-            }
-            kvp.getPairs().add(pair);
-          }
-          e.setKeyvalue(kvp);
-          if (kvp.getPairs().isEmpty()) return null;
-          return e;
-        }
-      },
-      (config, value, err) -> setDockerProperty(config, value),
-      (config, value, err) -> setDockerProperty(config, value)),
-
-  /** Directive for specifying a path to an external runtime to be used for the compiled binary. */
-  EXTERNAL_RUNTIME_PATH(
-      "external-runtime-path",
-      PrimitiveType.STRING,
-      List.of(Target.CPP),
-      (config) -> ASTUtils.toElement(config.externalRuntimePath),
-      (config, value, err) -> {
-        config.externalRuntimePath = ASTUtils.elementToSingleString(value);
-      }),
-
-  /**
-   * Directive to let the execution engine allow logical time to elapse faster than physical time.
-   */
-  FAST(
-      "fast",
-      PrimitiveType.BOOLEAN,
-      Target.ALL,
-      (config) -> ASTUtils.toElement(config.fastMode),
-      (config, value, err) -> {
-        config.fastMode = ASTUtils.toBoolean(value);
-      }),
-
-  /**
-   * Directive to stage particular files on the class path to be processed by the code generator.
-   */
-  FILES(
-      "files",
-      UnionType.FILE_OR_FILE_ARRAY,
-      List.of(Target.C, Target.CCPP, Target.Python),
-      (config) -> ASTUtils.toElement(config.files),
-      (config, value, err) -> {
-        config.files = ASTUtils.elementToListOfStrings(value);
-      },
-      (config, value, err) -> {
-        config.files.addAll(ASTUtils.elementToListOfStrings(value));
-      }),
-
-  /** Flags to be passed on to the target compiler. */
-  FLAGS(
-      "flags",
-      UnionType.STRING_OR_STRING_ARRAY,
-      Arrays.asList(Target.C, Target.CCPP),
-      (config) -> ASTUtils.toElement(config.compilerFlags),
-      (config, value, err) -> {
-        config.compilerFlags = ASTUtils.elementToListOfStrings(value);
-      }),
-
-  /** Directive to specify the coordination mode */
-  COORDINATION(
-      "coordination",
-      UnionType.COORDINATION_UNION,
-      Arrays.asList(Target.C, Target.CCPP, Target.Python),
-      (config) -> ASTUtils.toElement(config.coordination.toString()),
-      (config, value, err) -> {
-        config.coordination =
-            (CoordinationType)
-                UnionType.COORDINATION_UNION.forName(ASTUtils.elementToSingleString(value));
-      },
-      (config, value, err) -> {
-        config.coordination =
-            (CoordinationType)
-                UnionType.COORDINATION_UNION.forName(ASTUtils.elementToSingleString(value));
-      }),
-
-  /** Key-value pairs giving options for clock synchronization. */
-  COORDINATION_OPTIONS(
-      "coordination-options",
-      DictionaryType.COORDINATION_OPTION_DICT,
-      Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS),
-      (config) -> {
-        Element e = LfFactory.eINSTANCE.createElement();
-        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-        for (CoordinationOption opt : CoordinationOption.values()) {
-          KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-          pair.setName(opt.toString());
-          switch (opt) {
-            case ADVANCE_MESSAGE_INTERVAL:
-              if (config.coordinationOptions.advance_message_interval == null) continue;
-              pair.setValue(
-                  ASTUtils.toElement(config.coordinationOptions.advance_message_interval));
-              break;
-          }
-          kvp.getPairs().add(pair);
-        }
-        e.setKeyvalue(kvp);
-        if (kvp.getPairs().isEmpty()) return null;
-        return e;
-      },
-      (config, value, err) -> {
-        for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-          CoordinationOption option =
-              (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT.forName(entry.getName());
-          switch (option) {
-            case ADVANCE_MESSAGE_INTERVAL:
-              config.coordinationOptions.advance_message_interval =
-                  ASTUtils.toTimeValue(entry.getValue());
-              break;
-            default:
-              break;
-          }
-        }
-      },
-      (config, value, err) -> {
-        for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-          CoordinationOption option =
-              (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT.forName(entry.getName());
-          switch (option) {
-            case ADVANCE_MESSAGE_INTERVAL:
-              config.coordinationOptions.advance_message_interval =
-                  ASTUtils.toTimeValue(entry.getValue());
-              break;
-            default:
-              break;
-          }
-        }
-      }),
-
-  /**
-   * Directive to let the execution engine remain active also if there are no more events in the
-   * event queue.
-   */
-  KEEPALIVE(
-      "keepalive",
-      PrimitiveType.BOOLEAN,
-      Target.ALL,
-      (config) -> ASTUtils.toElement(config.keepalive),
-      (config, value, err) -> {
-        config.keepalive = ASTUtils.toBoolean(value);
-      }),
-
-  /** Directive to specify the grain at which to report log messages during execution. */
-  LOGGING(
-      "logging",
-      UnionType.LOGGING_UNION,
-      Target.ALL,
-      (config) -> ASTUtils.toElement(config.logLevel.toString()),
-      (config, value, err) -> {
-        config.logLevel =
-            (LogLevel) UnionType.LOGGING_UNION.forName(ASTUtils.elementToSingleString(value));
-      }),
-
-  /** Directive to not invoke the target compiler. */
-  NO_COMPILE(
-      "no-compile",
-      PrimitiveType.BOOLEAN,
-      Arrays.asList(Target.C, Target.CPP, Target.CCPP, Target.Python),
-      (config) -> ASTUtils.toElement(config.noCompile),
-      (config, value, err) -> {
-        config.noCompile = ASTUtils.toBoolean(value);
-      }),
-
-  /** Directive to disable validation of reactor rules at runtime. */
-  NO_RUNTIME_VALIDATION(
-      "no-runtime-validation",
-      PrimitiveType.BOOLEAN,
-      Arrays.asList(Target.CPP),
-      (config) -> ASTUtils.toElement(config.noRuntimeValidation),
-      (config, value, err) -> {
-        config.noRuntimeValidation = ASTUtils.toBoolean(value);
-      }),
-
-  /** Directive to check the generated verification model. */
-  VERIFY(
-      "verify",
-      PrimitiveType.BOOLEAN,
-      Arrays.asList(Target.C),
-      (config) -> ASTUtils.toElement(config.verify),
-      (config, value, err) -> {
-        config.verify = ASTUtils.toBoolean(value);
-      }),
-
-  /**
-   * Directive to specify the platform for cross code generation. This is either a string of the
-   * platform or a dictionary of options that includes the string name.
-   */
-  PLATFORM(
-      "platform",
-      UnionType.PLATFORM_STRING_OR_DICTIONARY,
-      Target.ALL,
-      (config) -> {
-        Element e = LfFactory.eINSTANCE.createElement();
-        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-        for (PlatformOption opt : PlatformOption.values()) {
-          KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-          pair.setName(opt.toString());
-          switch (opt) {
-            case NAME:
-              pair.setValue(ASTUtils.toElement(config.platformOptions.platform.toString()));
-              break;
-            case BAUDRATE:
-              pair.setValue(ASTUtils.toElement(config.platformOptions.baudRate));
-              break;
-            case BOARD:
-              pair.setValue(ASTUtils.toElement(config.platformOptions.board));
-              break;
-            case FLASH:
-              pair.setValue(ASTUtils.toElement(config.platformOptions.flash));
-              break;
-            case PORT:
-              pair.setValue(ASTUtils.toElement(config.platformOptions.port));
-              break;
-            case USER_THREADS:
-              pair.setValue(ASTUtils.toElement(config.platformOptions.userThreads));
-              break;
-          }
-          kvp.getPairs().add(pair);
-        }
-        e.setKeyvalue(kvp);
-        if (kvp.getPairs().isEmpty()) return null;
-        return e;
-      },
-      (config, value, err) -> {
-        if (value.getLiteral() != null) {
-          config.platformOptions = new PlatformOptions();
-          config.platformOptions.platform =
-              (Platform) UnionType.PLATFORM_UNION.forName(ASTUtils.elementToSingleString(value));
-          if (config.platformOptions.platform == null) {
-            String s =
-                "Unidentified Platform Type, LF supports the following platform types: "
-                    + Arrays.asList(Platform.values()).toString();
-            err.at(value).error(s);
-            throw new AssertionError(s);
-          }
-        } else {
-          config.platformOptions = new PlatformOptions();
-          for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-            PlatformOption option =
-                (PlatformOption) DictionaryType.PLATFORM_DICT.forName(entry.getName());
-            switch (option) {
-              case NAME:
-                Platform p =
-                    (Platform)
-                        UnionType.PLATFORM_UNION.forName(
-                            ASTUtils.elementToSingleString(entry.getValue()));
-                if (p == null) {
-                  String s =
-                      "Unidentified Platform Type, LF supports the following platform types: "
-                          + Arrays.asList(Platform.values()).toString();
-                  err.at(entry).error(s);
-                  throw new AssertionError(s);
-                }
-                config.platformOptions.platform = p;
-                break;
-              case BAUDRATE:
-                config.platformOptions.baudRate = ASTUtils.toInteger(entry.getValue());
-                break;
-              case BOARD:
-                config.platformOptions.board = ASTUtils.elementToSingleString(entry.getValue());
-                break;
-              case FLASH:
-                config.platformOptions.flash = ASTUtils.toBoolean(entry.getValue());
-                break;
-              case PORT:
-                config.platformOptions.port = ASTUtils.elementToSingleString(entry.getValue());
-                break;
-              case USER_THREADS:
-                config.platformOptions.userThreads = ASTUtils.toInteger(entry.getValue());
-                break;
-              default:
-                break;
-            }
-          }
-        }
-        // If the platform does not support threading, disable it.
-        if (!config.platformOptions.platform.isMultiThreaded()) {
-          config.threading = false;
-        }
-      }),
-
-  /** Directive to instruct the runtime to collect and print execution statistics. */
-  PRINT_STATISTICS(
-      "print-statistics",
-      PrimitiveType.BOOLEAN,
-      Arrays.asList(Target.CPP),
-      (config) -> ASTUtils.toElement(config.printStatistics),
-      (config, value, err) -> {
-        config.printStatistics = ASTUtils.toBoolean(value);
-      }),
-
-  /**
-   * Directive for specifying .proto files that need to be compiled and their code included in the
-   * sources.
-   */
-  PROTOBUFS(
-      "protobufs",
-      UnionType.FILE_OR_FILE_ARRAY,
-      Arrays.asList(Target.C, Target.CCPP, Target.TS, Target.Python),
-      (config) -> ASTUtils.toElement(config.protoFiles),
-      (config, value, err) -> {
-        config.protoFiles = ASTUtils.elementToListOfStrings(value);
-      }),
-
-  /** Directive to specify that ROS2 specific code is generated, */
-  ROS2(
-      "ros2",
-      PrimitiveType.BOOLEAN,
-      List.of(Target.CPP),
-      (config) -> ASTUtils.toElement(config.ros2),
-      (config, value, err) -> {
-        config.ros2 = ASTUtils.toBoolean(value);
-      }),
-
-  /** Directive to specify additional ROS2 packages that this LF program depends on. */
-  ROS2_DEPENDENCIES(
-      "ros2-dependencies",
-      ArrayType.STRING_ARRAY,
-      List.of(Target.CPP),
-      (config) -> ASTUtils.toElement(config.ros2Dependencies),
-      (config, value, err) -> {
-        config.ros2Dependencies = ASTUtils.elementToListOfStrings(value);
-      }),
-
-  /** Directive for specifying a specific version of the reactor runtime library. */
-  RUNTIME_VERSION(
-      "runtime-version",
-      PrimitiveType.STRING,
-      Arrays.asList(Target.CPP),
-      (config) -> ASTUtils.toElement(config.runtimeVersion),
-      (config, value, err) -> {
-        config.runtimeVersion = ASTUtils.elementToSingleString(value);
-      }),
-
-  /** Directive for specifying a specific runtime scheduler, if supported. */
-  SCHEDULER(
-      "scheduler",
-      UnionType.SCHEDULER_UNION,
-      Arrays.asList(Target.C, Target.CCPP, Target.Python),
-      (config) -> ASTUtils.toElement(config.schedulerType.toString()),
-      (config, value, err) -> {
-        config.schedulerType =
-            (SchedulerOption)
-                UnionType.SCHEDULER_UNION.forName(ASTUtils.elementToSingleString(value));
-      }),
-
-  /** Directive to specify that all code is generated in a single file. */
-  SINGLE_FILE_PROJECT(
-      "single-file-project",
-      PrimitiveType.BOOLEAN,
-      List.of(Target.Rust),
-      (config) -> ASTUtils.toElement(config.singleFileProject),
-      (config, value, err) -> {
-        config.singleFileProject = ASTUtils.toBoolean(value);
-      }),
-
-  /** Directive to indicate whether the runtime should use multi-threading. */
-  THREADING(
-      "threading",
-      PrimitiveType.BOOLEAN,
-      List.of(Target.C, Target.CCPP, Target.Python),
-      (config) -> ASTUtils.toElement(config.threading),
-      (config, value, err) -> {
-        config.threading = ASTUtils.toBoolean(value);
-      }),
-
-  /** Directive to specify the number of worker threads used by the runtime. */
-  WORKERS(
-      "workers",
-      PrimitiveType.NON_NEGATIVE_INTEGER,
-      List.of(Target.C, Target.CCPP, Target.Python, Target.CPP, Target.Rust),
-      (config) -> ASTUtils.toElement(config.workers),
-      (config, value, err) -> {
-        config.workers = ASTUtils.toInteger(value);
-      }),
-
-  /** Directive to specify the execution timeout. */
-  TIMEOUT(
-      "timeout",
-      PrimitiveType.TIME_VALUE,
-      Target.ALL,
-      (config) -> ASTUtils.toElement(config.timeout),
-      (config, value, err) -> {
-        config.timeout = ASTUtils.toTimeValue(value);
-      },
-      (config, value, err) -> {
-        config.timeout = ASTUtils.toTimeValue(value);
-      }),
-
-  /** Directive to enable tracing. */
-  TRACING(
-      "tracing",
-      UnionType.TRACING_UNION,
-      Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Python),
-      (config) -> {
-        if (config.tracing == null) {
-          return null;
-        } else if (config.tracing.equals(new TracingOptions())) {
-          // default values
-          return ASTUtils.toElement(true);
-        } else {
-          Element e = LfFactory.eINSTANCE.createElement();
-          KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-          for (TracingOption opt : TracingOption.values()) {
-            KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-            pair.setName(opt.toString());
-            switch (opt) {
-              case TRACE_FILE_NAME:
-                if (config.tracing.traceFileName == null) continue;
-                pair.setValue(ASTUtils.toElement(config.tracing.traceFileName));
-            }
-            kvp.getPairs().add(pair);
-          }
-          e.setKeyvalue(kvp);
-          if (kvp.getPairs().isEmpty()) return null;
-          return e;
-        }
-      },
-      (config, value, err) -> {
-        if (value.getLiteral() != null) {
-          if (ASTUtils.toBoolean(value)) {
-            config.tracing = new TracingOptions();
-          } else {
-            config.tracing = null;
-          }
-        } else {
-          config.tracing = new TracingOptions();
-          for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-            TracingOption option =
-                (TracingOption) DictionaryType.TRACING_DICT.forName(entry.getName());
-            switch (option) {
-              case TRACE_FILE_NAME:
-                config.tracing.traceFileName = ASTUtils.elementToSingleString(entry.getValue());
-                break;
-              default:
-                break;
-            }
-          }
-        }
-      }),
-
-  /**
-   * Directive to let the runtime export its internal dependency graph.
-   *
-   * <p>This is a debugging feature and currently only used for C++ and Rust programs.
-   */
-  EXPORT_DEPENDENCY_GRAPH(
-      "export-dependency-graph",
-      PrimitiveType.BOOLEAN,
-      List.of(Target.CPP, Target.Rust),
-      (config) -> ASTUtils.toElement(config.exportDependencyGraph),
-      (config, value, err) -> {
-        config.exportDependencyGraph = ASTUtils.toBoolean(value);
-      }),
-
-  /**
-   * Directive to let the runtime export the program structure to a yaml file.
-   *
-   * <p>This is a debugging feature and currently only used for C++ programs.
-   */
-  EXPORT_TO_YAML(
-      "export-to-yaml",
-      PrimitiveType.BOOLEAN,
-      List.of(Target.CPP),
-      (config) -> ASTUtils.toElement(config.exportToYaml),
-      (config, value, err) -> {
-        config.exportToYaml = ASTUtils.toBoolean(value);
-      }),
-
-  /**
-   * List of module files to link into the crate as top-level. For instance, a {@code target Rust {
-   * rust-modules: [ "foo.rs" ] }} will cause the file to be copied into the generated project, and
-   * the generated {@code main.rs} will include it with a {@code mod foo;}. If one of the paths is a
-   * directory, it must contain a {@code mod.rs} file, and all its contents are copied.
-   */
-  RUST_INCLUDE(
-      "rust-include",
-      UnionType.FILE_OR_FILE_ARRAY,
-      List.of(Target.Rust),
-      (config) -> {
-        // do not check paths here, and simply copy the absolute path over
-        List<Path> paths = config.rust.getRustTopLevelModules();
-        if (paths.isEmpty()) return null;
-        else if (paths.size() == 1) {
-          return ASTUtils.toElement(paths.get(0).toString());
-        } else {
-          Element e = LfFactory.eINSTANCE.createElement();
-          Array arr = LfFactory.eINSTANCE.createArray();
-          for (Path p : paths) {
-            arr.getElements().add(ASTUtils.toElement(p.toString()));
-          }
-          e.setArray(arr);
-          return e;
-        }
-      },
-      (config, value, err) -> {
-        Path referencePath;
-        try {
-          referencePath = FileUtil.toPath(value.eResource().getURI()).toAbsolutePath();
-        } catch (IllegalArgumentException e) {
-          err.at(value).error("Invalid path? " + e.getMessage());
-          throw e;
-        }
-
-        // we'll resolve relative paths to check that the files
-        // are as expected.
-
-        if (value.getLiteral() != null) {
-          Path resolved = referencePath.resolveSibling(StringUtil.removeQuotes(value.getLiteral()));
-
-          config.rust.addAndCheckTopLevelModule(resolved, value, err);
-        } else if (value.getArray() != null) {
-          for (Element element : value.getArray().getElements()) {
-            String literal = StringUtil.removeQuotes(element.getLiteral());
-            Path resolved = referencePath.resolveSibling(literal);
-            config.rust.addAndCheckTopLevelModule(resolved, element, err);
-          }
-        }
-      }),
-
-  /** Directive for specifying Cargo features of the generated program to enable. */
-  CARGO_FEATURES(
-      "cargo-features",
-      ArrayType.STRING_ARRAY,
-      List.of(Target.Rust),
-      (config) -> ASTUtils.toElement(config.rust.getCargoFeatures()),
-      (config, value, err) -> {
-        config.rust.setCargoFeatures(ASTUtils.elementToListOfStrings(value));
-      }),
-
-  /**
-   * Dependency specifications for Cargo. This property looks like this:
-   *
-   * <pre>{@code
-   * cargo-dependencies: {
-   *    // Name-of-the-crate: "version"
-   *    rand: "0.8",
-   *    // Equivalent to using an explicit map:
-   *    rand: {
-   *      version: "0.8"
-   *    },
-   *    // The map allows specifying more details
-   *    rand: {
-   *      // A path to a local unpublished crate.
-   *      // Note 'path' is mutually exclusive with 'version'.
-   *      path: "/home/me/Git/local-rand-clone"
-   *    },
-   *    rand: {
-   *      version: "0.8",
-   *      // you can specify cargo features
-   *      features: ["some-cargo-feature",]
-   *    }
-   * }
-   * }</pre>
-   */
-  CARGO_DEPENDENCIES(
-      "cargo-dependencies",
-      CargoDependenciesPropertyType.INSTANCE,
-      List.of(Target.Rust),
-      (config) -> {
-        var deps = config.rust.getCargoDependencies();
-        if (deps.size() == 0) return null;
-        else {
-          Element e = LfFactory.eINSTANCE.createElement();
-          KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-          for (var ent : deps.entrySet()) {
-            KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-            pair.setName(ent.getKey());
-            pair.setValue(CargoDependencySpec.extractSpec(ent.getValue()));
-            kvp.getPairs().add(pair);
-          }
-          e.setKeyvalue(kvp);
-          return e;
-        }
-      },
-      (config, value, err) -> {
-        config.rust.setCargoDependencies(CargoDependencySpec.parseAll(value));
-      }),
-
-  /**
-   * Directs the C or Python target to include the associated C file used for setting up federated
-   * execution before processing the first tag.
-   */
-  FED_SETUP(
-      "_fed_setup",
-      PrimitiveType.FILE,
-      Arrays.asList(Target.C, Target.CCPP, Target.Python),
-      (config) -> ASTUtils.toElement(config.fedSetupPreamble),
-      (config, value, err) ->
-          config.fedSetupPreamble = StringUtil.removeQuotes(ASTUtils.elementToSingleString(value)));
-
-  /** Update {@code config}.dockerOptions based on value. */
+      AUTH(
+          "auth",
+          PrimitiveType.BOOLEAN,
+          Arrays.asList(Target.C, Target.CCPP),
+          (config) -> ASTUtils.toElement(config.auth),
+          (config, value, err) -> {
+              config.auth = ASTUtils.toBoolean(value);
+          }),
+      /** Directive to let the generator use the custom build command. */
+      BUILD(
+          "build",
+          UnionType.STRING_OR_STRING_ARRAY,
+          Arrays.asList(Target.C, Target.CCPP),
+          (config) -> ASTUtils.toElement(config.buildCommands),
+          (config, value, err) -> {
+              config.buildCommands = ASTUtils.elementToListOfStrings(value);
+          }),
+
+      /**
+       * Directive to specify the target build type such as 'Release' or 'Debug'. This is also used in
+       * the Rust target to select a Cargo profile.
+       */
+      BUILD_TYPE(
+          "build-type",
+          UnionType.BUILD_TYPE_UNION,
+          Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Rust),
+          (config) -> ASTUtils.toElement(config.cmakeBuildType.toString()),
+          (config, value, err) -> {
+              config.cmakeBuildType =
+                  (BuildType) UnionType.BUILD_TYPE_UNION.forName(ASTUtils.elementToSingleString(value));
+              // set it there too, because the default is different.
+              config.rust.setBuildType(config.cmakeBuildType);
+          }),
+
+      /** Directive to let the federate execution handle clock synchronization in software. */
+      CLOCK_SYNC(
+          "clock-sync",
+          UnionType.CLOCK_SYNC_UNION,
+          Arrays.asList(Target.C, Target.CCPP, Target.Python),
+          new ClockSyncConfigurator()),
+      /** Key-value pairs giving options for clock synchronization. */
+      CLOCK_SYNC_OPTIONS(
+          "clock-sync-options",
+          DictionaryType.CLOCK_SYNC_OPTION_DICT,
+          Arrays.asList(Target.C, Target.CCPP, Target.Python),
+          (config) -> {
+              Element e = LfFactory.eINSTANCE.createElement();
+              KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+              for (ClockSyncOption opt : ClockSyncOption.values()) {
+                  KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+                  pair.setName(opt.toString());
+                  switch (opt) {
+                  case ATTENUATION:
+                      pair.setValue(ASTUtils.toElement(config.clockSyncOptions.attenuation));
+                      break;
+                  case COLLECT_STATS:
+                      pair.setValue(ASTUtils.toElement(config.clockSyncOptions.collectStats));
+                      break;
+                  case LOCAL_FEDERATES_ON:
+                      pair.setValue(ASTUtils.toElement(config.clockSyncOptions.localFederatesOn));
+                      break;
+                  case PERIOD:
+                      if (config.clockSyncOptions.period == null) {
+                          continue; // don't set if null
+                      }
+                      pair.setValue(ASTUtils.toElement(config.clockSyncOptions.period));
+                      break;
+                  case TEST_OFFSET:
+                      if (config.clockSyncOptions.testOffset == null) {
+                          continue; // don't set if null
+                      }
+                      pair.setValue(ASTUtils.toElement(config.clockSyncOptions.testOffset));
+                      break;
+                  case TRIALS:
+                      pair.setValue(ASTUtils.toElement(config.clockSyncOptions.trials));
+                      break;
+                  }
+                  kvp.getPairs().add(pair);
+              }
+              e.setKeyvalue(kvp);
+              // kvp will never be empty
+              return e;
+          },
+          (config, value, err) -> {
+              for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+                  ClockSyncOption option =
+                      (ClockSyncOption) DictionaryType.CLOCK_SYNC_OPTION_DICT.forName(entry.getName());
+                  switch (option) {
+                  case ATTENUATION:
+                      config.clockSyncOptions.attenuation = ASTUtils.toInteger(entry.getValue());
+                      break;
+                  case COLLECT_STATS:
+                      config.clockSyncOptions.collectStats = ASTUtils.toBoolean(entry.getValue());
+                      break;
+                  case LOCAL_FEDERATES_ON:
+                      config.clockSyncOptions.localFederatesOn = ASTUtils.toBoolean(entry.getValue());
+                      break;
+                  case PERIOD:
+                      config.clockSyncOptions.period = ASTUtils.toTimeValue(entry.getValue());
+                      break;
+                  case TEST_OFFSET:
+                      config.clockSyncOptions.testOffset = ASTUtils.toTimeValue(entry.getValue());
+                      break;
+                  case TRIALS:
+                      config.clockSyncOptions.trials = ASTUtils.toInteger(entry.getValue());
+                      break;
+                  default:
+                      break;
+                  }
+              }
+          }),
+
+      /**
+       * Directive to specify a cmake to be included by the generated build systems.
+       *
+       * <p>This gives full control over the C/C++ build as any cmake parameters can be adjusted in the
+       * included file.
+       */
+      CMAKE_INCLUDE(
+          "cmake-include",
+          UnionType.FILE_OR_FILE_ARRAY,
+          Arrays.asList(Target.CPP, Target.C, Target.CCPP),
+          (config) -> ASTUtils.toElement(config.cmakeIncludes),
+          (config, value, err) -> {
+              config.cmakeIncludes = ASTUtils.elementToListOfStrings(value);
+          },
+          // FIXME: This merging of lists is potentially dangerous since
+          // the incoming list of cmake-includes can belong to a .lf file that is
+          // located in a different location, and keeping just filename
+          // strings like this without absolute paths is incorrect.
+          (config, value, err) -> {
+              config.cmakeIncludes.addAll(ASTUtils.elementToListOfStrings(value));
+          }),
+      /** Directive to specify the target compiler. */
+      COMPILER(
+          "compiler",
+          PrimitiveType.STRING,
+          Target.ALL,
+          (config) -> ASTUtils.toElement(config.compiler),
+          (config, value, err) -> {
+              config.compiler = ASTUtils.elementToSingleString(value);
+          }),
+
+      /** Directive to specify compile-time definitions. */
+      COMPILE_DEFINITIONS(
+          "compile-definitions",
+          StringDictionaryType.COMPILE_DEFINITION,
+          Arrays.asList(Target.C, Target.CCPP, Target.Python),
+          (config) -> ASTUtils.toElement(config.compileDefinitions),
+          (config, value, err) -> {
+              config.compileDefinitions = ASTUtils.elementToStringMaps(value);
+          }),
+
+      /**
+       * Directive to generate a Dockerfile. This is either a boolean, true or false, or a dictionary of
+       * options.
+       */
+      DOCKER(
+          "docker",
+          UnionType.DOCKER_UNION,
+          Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS),
+          (config) -> {
+              if (config.dockerOptions == null) {
+                  return null;
+              } else if (config.dockerOptions.equals(new DockerOptions())) {
+                  // default configuration
+                  return ASTUtils.toElement(true);
+              } else {
+                  Element e = LfFactory.eINSTANCE.createElement();
+                  KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+                  for (DockerOption opt : DockerOption.values()) {
+                      KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+                      pair.setName(opt.toString());
+                      switch (opt) {
+                      case FROM:
+                          if (config.dockerOptions.from == null) {
+                              continue;
+                          }
+                          pair.setValue(ASTUtils.toElement(config.dockerOptions.from));
+                          break;
+                      }
+                      kvp.getPairs().add(pair);
+                  }
+                  e.setKeyvalue(kvp);
+                  if (kvp.getPairs().isEmpty()) {
+                      return null;
+                  }
+                  return e;
+              }
+          },
+          (config, value, err) -> setDockerProperty(config, value),
+          (config, value, err) -> setDockerProperty(config, value)),
+
+      /** Directive for specifying a path to an external runtime to be used for the compiled binary. */
+      EXTERNAL_RUNTIME_PATH(
+          "external-runtime-path",
+          PrimitiveType.STRING,
+          List.of(Target.CPP),
+          (config) -> ASTUtils.toElement(config.externalRuntimePath),
+          (config, value, err) -> {
+              config.externalRuntimePath = ASTUtils.elementToSingleString(value);
+          }),
+
+      /**
+       * Directive to let the execution engine allow logical time to elapse faster than physical time.
+       */
+      FAST(
+          "fast",
+          PrimitiveType.BOOLEAN,
+          Target.ALL,
+          new FastConfigurator()),
+      /**
+       * Directive to stage particular files on the class path to be processed by the code generator.
+       */
+      FILES(
+          "files",
+          UnionType.FILE_OR_FILE_ARRAY,
+          List.of(Target.C, Target.CCPP, Target.Python),
+          (config) -> ASTUtils.toElement(config.files),
+          (config, value, err) -> {
+              config.files = ASTUtils.elementToListOfStrings(value);
+          },
+          (config, value, err) -> {
+              config.files.addAll(ASTUtils.elementToListOfStrings(value));
+          }),
+
+      /** Flags to be passed on to the target compiler. */
+      FLAGS(
+          "flags",
+          UnionType.STRING_OR_STRING_ARRAY,
+          Arrays.asList(Target.C, Target.CCPP),
+          (config) -> ASTUtils.toElement(config.compilerFlags),
+          (config, value, err) -> {
+              config.compilerFlags = ASTUtils.elementToListOfStrings(value);
+          }),
+
+      /** Directive to specify the coordination mode */
+      COORDINATION(
+          "coordination",
+          UnionType.COORDINATION_UNION,
+          Arrays.asList(Target.C, Target.CCPP, Target.Python),
+          (config) -> ASTUtils.toElement(config.coordination.toString()),
+          (config, value, err) -> {
+              config.coordination =
+                  (CoordinationType)
+                      UnionType.COORDINATION_UNION.forName(ASTUtils.elementToSingleString(value));
+          },
+          (config, value, err) -> {
+              config.coordination =
+                  (CoordinationType)
+                      UnionType.COORDINATION_UNION.forName(ASTUtils.elementToSingleString(value));
+          }),
+
+      /** Key-value pairs giving options for clock synchronization. */
+      COORDINATION_OPTIONS(
+          "coordination-options",
+          DictionaryType.COORDINATION_OPTION_DICT,
+          Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS),
+          (config) -> {
+              Element e = LfFactory.eINSTANCE.createElement();
+              KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+              for (CoordinationOption opt : CoordinationOption.values()) {
+                  KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+                  pair.setName(opt.toString());
+                  switch (opt) {
+                  case ADVANCE_MESSAGE_INTERVAL:
+                      if (config.coordinationOptions.advance_message_interval == null) {
+                          continue;
+                      }
+                      pair.setValue(
+                          ASTUtils.toElement(config.coordinationOptions.advance_message_interval));
+                      break;
+                  }
+                  kvp.getPairs().add(pair);
+              }
+              e.setKeyvalue(kvp);
+              if (kvp.getPairs().isEmpty()) {
+                  return null;
+              }
+              return e;
+          },
+          (config, value, err) -> {
+              for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+                  CoordinationOption option =
+                      (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT.forName(entry.getName());
+                  switch (option) {
+                  case ADVANCE_MESSAGE_INTERVAL:
+                      config.coordinationOptions.advance_message_interval =
+                          ASTUtils.toTimeValue(entry.getValue());
+                      break;
+                  default:
+                      break;
+                  }
+              }
+          },
+          (config, value, err) -> {
+              for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+                  CoordinationOption option =
+                      (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT.forName(entry.getName());
+                  switch (option) {
+                  case ADVANCE_MESSAGE_INTERVAL:
+                      config.coordinationOptions.advance_message_interval =
+                          ASTUtils.toTimeValue(entry.getValue());
+                      break;
+                  default:
+                      break;
+                  }
+              }
+          }),
+
+      /**
+       * Directive to let the execution engine remain active also if there are no more events in the
+       * event queue.
+       */
+      KEEPALIVE(
+          "keepalive",
+          PrimitiveType.BOOLEAN,
+          Target.ALL,
+          new KeepaliveConfigurator()),
+
+      /** Directive to specify the grain at which to report log messages during execution. */
+      LOGGING(
+          "logging",
+          UnionType.LOGGING_UNION,
+          Target.ALL,
+          (config) -> ASTUtils.toElement(config.logLevel.toString()),
+          (config, value, err) -> {
+              config.logLevel =
+                  (LogLevel) UnionType.LOGGING_UNION.forName(ASTUtils.elementToSingleString(value));
+          }),
+
+      /** Directive to not invoke the target compiler. */
+      NO_COMPILE(
+          "no-compile",
+          PrimitiveType.BOOLEAN,
+          Arrays.asList(Target.C, Target.CPP, Target.CCPP, Target.Python),
+          (config) -> ASTUtils.toElement(config.noCompile),
+          (config, value, err) -> {
+              config.noCompile = ASTUtils.toBoolean(value);
+          }),
+
+      /** Directive to disable validation of reactor rules at runtime. */
+      NO_RUNTIME_VALIDATION(
+          "no-runtime-validation",
+          PrimitiveType.BOOLEAN,
+          Arrays.asList(Target.CPP),
+          (config) -> ASTUtils.toElement(config.noRuntimeValidation),
+          (config, value, err) -> {
+              config.noRuntimeValidation = ASTUtils.toBoolean(value);
+          }),
+
+      /** Directive to check the generated verification model. */
+      VERIFY(
+          "verify",
+          PrimitiveType.BOOLEAN,
+          Arrays.asList(Target.C),
+          (config) -> ASTUtils.toElement(config.verify),
+          (config, value, err) -> {
+              config.verify = ASTUtils.toBoolean(value);
+          }),
+
+      /**
+       * Directive to specify the platform for cross code generation. This is either a string of the
+       * platform or a dictionary of options that includes the string name.
+       */
+      PLATFORM(
+          "platform",
+          UnionType.PLATFORM_STRING_OR_DICTIONARY,
+          Target.ALL,
+          (config) -> {
+              Element e = LfFactory.eINSTANCE.createElement();
+              KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+              for (PlatformOption opt : PlatformOption.values()) {
+                  KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+                  pair.setName(opt.toString());
+                  switch (opt) {
+                  case NAME:
+                      pair.setValue(ASTUtils.toElement(config.platformOptions.platform.toString()));
+                      break;
+                  case BAUDRATE:
+                      pair.setValue(ASTUtils.toElement(config.platformOptions.baudRate));
+                      break;
+                  case BOARD:
+                      pair.setValue(ASTUtils.toElement(config.platformOptions.board));
+                      break;
+                  case FLASH:
+                      pair.setValue(ASTUtils.toElement(config.platformOptions.flash));
+                      break;
+                  case PORT:
+                      pair.setValue(ASTUtils.toElement(config.platformOptions.port));
+                      break;
+                  case USER_THREADS:
+                      pair.setValue(ASTUtils.toElement(config.platformOptions.userThreads));
+                      break;
+                  }
+                  kvp.getPairs().add(pair);
+              }
+              e.setKeyvalue(kvp);
+              if (kvp.getPairs().isEmpty()) {
+                  return null;
+              }
+              return e;
+          },
+          (config, value, err) -> {
+              if (value.getLiteral() != null) {
+                  config.platformOptions = new PlatformOptions();
+                  config.platformOptions.platform =
+                      (Platform) UnionType.PLATFORM_UNION.forName(ASTUtils.elementToSingleString(value));
+                  if (config.platformOptions.platform == null) {
+                      String s =
+                          "Unidentified Platform Type, LF supports the following platform types: "
+                              + Arrays.asList(Platform.values()).toString();
+                      err.at(value).error(s);
+                      throw new AssertionError(s);
+                  }
+              } else {
+                  config.platformOptions = new PlatformOptions();
+                  for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+                      PlatformOption option =
+                          (PlatformOption) DictionaryType.PLATFORM_DICT.forName(entry.getName());
+                      switch (option) {
+                      case NAME:
+                          Platform p =
+                              (Platform)
+                                  UnionType.PLATFORM_UNION.forName(
+                                      ASTUtils.elementToSingleString(entry.getValue()));
+                          if (p == null) {
+                              String s =
+                                  "Unidentified Platform Type, LF supports the following platform types: "
+                                      + Arrays.asList(Platform.values()).toString();
+                              err.at(entry).error(s);
+                              throw new AssertionError(s);
+                          }
+                          config.platformOptions.platform = p;
+                          break;
+                      case BAUDRATE:
+                          config.platformOptions.baudRate = ASTUtils.toInteger(entry.getValue());
+                          break;
+                      case BOARD:
+                          config.platformOptions.board = ASTUtils.elementToSingleString(entry.getValue());
+                          break;
+                      case FLASH:
+                          config.platformOptions.flash = ASTUtils.toBoolean(entry.getValue());
+                          break;
+                      case PORT:
+                          config.platformOptions.port = ASTUtils.elementToSingleString(entry.getValue());
+                          break;
+                      case USER_THREADS:
+                          config.platformOptions.userThreads = ASTUtils.toInteger(entry.getValue());
+                          break;
+                      default:
+                          break;
+                      }
+                  }
+              }
+              // If the platform does not support threading, disable it.
+              if (!config.platformOptions.platform.isMultiThreaded()) {
+                  config.threading = false;
+              }
+          }),
+
+      /** Directive to instruct the runtime to collect and print execution statistics. */
+      PRINT_STATISTICS(
+          "print-statistics",
+          PrimitiveType.BOOLEAN,
+          Arrays.asList(Target.CPP),
+          (config) -> ASTUtils.toElement(config.printStatistics),
+          (config, value, err) -> {
+              config.printStatistics = ASTUtils.toBoolean(value);
+          }),
+
+      /**
+       * Directive for specifying .proto files that need to be compiled and their code included in the
+       * sources.
+       */
+      PROTOBUFS(
+          "protobufs",
+          UnionType.FILE_OR_FILE_ARRAY,
+          Arrays.asList(Target.C, Target.CCPP, Target.TS, Target.Python),
+          (config) -> ASTUtils.toElement(config.protoFiles),
+          (config, value, err) -> {
+              config.protoFiles = ASTUtils.elementToListOfStrings(value);
+          }),
+
+      /** Directive to specify that ROS2 specific code is generated, */
+      ROS2(
+          "ros2",
+          PrimitiveType.BOOLEAN,
+          List.of(Target.CPP),
+          (config) -> ASTUtils.toElement(config.ros2),
+          (config, value, err) -> {
+              config.ros2 = ASTUtils.toBoolean(value);
+          }),
+
+      /** Directive to specify additional ROS2 packages that this LF program depends on. */
+      ROS2_DEPENDENCIES(
+          "ros2-dependencies",
+          ArrayType.STRING_ARRAY,
+          List.of(Target.CPP),
+          (config) -> ASTUtils.toElement(config.ros2Dependencies),
+          (config, value, err) -> {
+              config.ros2Dependencies = ASTUtils.elementToListOfStrings(value);
+          }),
+
+      /** Directive for specifying a specific version of the reactor runtime library. */
+      RUNTIME_VERSION(
+          "runtime-version",
+          PrimitiveType.STRING,
+          Arrays.asList(Target.CPP),
+          (config) -> ASTUtils.toElement(config.runtimeVersion),
+          (config, value, err) -> {
+              config.runtimeVersion = ASTUtils.elementToSingleString(value);
+          }),
+
+      /** Directive for specifying a specific runtime scheduler, if supported. */
+      SCHEDULER(
+          "scheduler",
+          UnionType.SCHEDULER_UNION,
+          Arrays.asList(Target.C, Target.CCPP, Target.Python),
+          new SchedulerConfigurator()
+          ),
+      /** Directive to specify that all code is generated in a single file. */
+      SINGLE_FILE_PROJECT(
+          "single-file-project",
+          PrimitiveType.BOOLEAN,
+          List.of(Target.Rust),
+          (config) -> ASTUtils.toElement(config.singleFileProject),
+          (config, value, err) -> {
+              config.singleFileProject = ASTUtils.toBoolean(value);
+          }),
+
+      /** Directive to indicate whether the runtime should use multi-threading. */
+      THREADING(
+          "threading",
+          PrimitiveType.BOOLEAN,
+          List.of(Target.C, Target.CCPP, Target.Python),
+          (config) -> ASTUtils.toElement(config.threading),
+          (config, value, err) -> {
+              config.threading = ASTUtils.toBoolean(value);
+          }),
+
+      /** Directive to specify the number of worker threads used by the runtime. */
+      WORKERS(
+          "workers",
+          PrimitiveType.NON_NEGATIVE_INTEGER,
+          List.of(Target.C, Target.CCPP, Target.Python, Target.CPP, Target.Rust),
+          (config) -> ASTUtils.toElement(config.workers),
+          (config, value, err) -> {
+              config.workers = ASTUtils.toInteger(value);
+          }),
+
+      /** Directive to specify the execution timeout. */
+      TIMEOUT(
+          "timeout",
+          PrimitiveType.TIME_VALUE,
+          Target.ALL,
+          (config) -> ASTUtils.toElement(config.timeout),
+          (config, value, err) -> {
+              config.timeout = ASTUtils.toTimeValue(value);
+          },
+          (config, value, err) -> {
+              config.timeout = ASTUtils.toTimeValue(value);
+          }),
+
+      /** Directive to enable tracing. */
+      TRACING(
+          "tracing",
+          UnionType.TRACING_UNION,
+          Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Python),
+          new TracingConfigurator()),
+
+      /**
+       * Directive to let the runtime export its internal dependency graph.
+       *
+       * <p>This is a debugging feature and currently only used for C++ and Rust programs.
+       */
+      EXPORT_DEPENDENCY_GRAPH(
+          "export-dependency-graph",
+          PrimitiveType.BOOLEAN,
+          List.of(Target.CPP, Target.Rust),
+          (config) -> ASTUtils.toElement(config.exportDependencyGraph),
+          (config, value, err) -> {
+              config.exportDependencyGraph = ASTUtils.toBoolean(value);
+          }),
+
+      /**
+       * Directive to let the runtime export the program structure to a yaml file.
+       *
+       * <p>This is a debugging feature and currently only used for C++ programs.
+       */
+      EXPORT_TO_YAML(
+          "export-to-yaml",
+          PrimitiveType.BOOLEAN,
+          List.of(Target.CPP),
+          (config) -> ASTUtils.toElement(config.exportToYaml),
+          (config, value, err) -> {
+              config.exportToYaml = ASTUtils.toBoolean(value);
+          }),
+
+      /**
+       * List of module files to link into the crate as top-level. For instance, a {@code target Rust {
+       * rust-modules: [ "foo.rs" ] }} will cause the file to be copied into the generated project, and
+       * the generated {@code main.rs} will include it with a {@code mod foo;}. If one of the paths is a
+       * directory, it must contain a {@code mod.rs} file, and all its contents are copied.
+       */
+      RUST_INCLUDE(
+          "rust-include",
+          UnionType.FILE_OR_FILE_ARRAY,
+          List.of(Target.Rust),
+          (config) -> {
+              // do not check paths here, and simply copy the absolute path over
+              List<Path> paths = config.rust.getRustTopLevelModules();
+              if (paths.isEmpty()) {
+                  return null;
+              } else if (paths.size() == 1) {
+                  return ASTUtils.toElement(paths.get(0).toString());
+              } else {
+                  Element e = LfFactory.eINSTANCE.createElement();
+                  Array arr = LfFactory.eINSTANCE.createArray();
+                  for (Path p : paths) {
+                      arr.getElements().add(ASTUtils.toElement(p.toString()));
+                  }
+                  e.setArray(arr);
+                  return e;
+              }
+          },
+          (config, value, err) -> {
+              Path referencePath;
+              try {
+                  referencePath = FileUtil.toPath(value.eResource().getURI()).toAbsolutePath();
+              } catch (IllegalArgumentException e) {
+                  err.at(value).error("Invalid path? " + e.getMessage());
+                  throw e;
+              }
+
+              // we'll resolve relative paths to check that the files
+              // are as expected.
+
+              if (value.getLiteral() != null) {
+                  Path resolved = referencePath.resolveSibling(StringUtil.removeQuotes(value.getLiteral()));
+
+                  config.rust.addAndCheckTopLevelModule(resolved, value, err);
+              } else if (value.getArray() != null) {
+                  for (Element element : value.getArray().getElements()) {
+                      String literal = StringUtil.removeQuotes(element.getLiteral());
+                      Path resolved = referencePath.resolveSibling(literal);
+                      config.rust.addAndCheckTopLevelModule(resolved, element, err);
+                  }
+              }
+          }),
+
+      /** Directive for specifying Cargo features of the generated program to enable. */
+      CARGO_FEATURES(
+          "cargo-features",
+          ArrayType.STRING_ARRAY,
+          List.of(Target.Rust),
+          (config) -> ASTUtils.toElement(config.rust.getCargoFeatures()),
+          (config, value, err) -> {
+              config.rust.setCargoFeatures(ASTUtils.elementToListOfStrings(value));
+          }),
+
+      /**
+       * Dependency specifications for Cargo. This property looks like this:
+       *
+       * <pre>{@code
+       * cargo-dependencies: {
+       *    // Name-of-the-crate: "version"
+       *    rand: "0.8",
+       *    // Equivalent to using an explicit map:
+       *    rand: {
+       *      version: "0.8"
+       *    },
+       *    // The map allows specifying more details
+       *    rand: {
+       *      // A path to a local unpublished crate.
+       *      // Note 'path' is mutually exclusive with 'version'.
+       *      path: "/home/me/Git/local-rand-clone"
+       *    },
+       *    rand: {
+       *      version: "0.8",
+       *      // you can specify cargo features
+       *      features: ["some-cargo-feature",]
+       *    }
+       * }
+       * }</pre>
+       */
+      CARGO_DEPENDENCIES(
+          "cargo-dependencies",
+          CargoDependenciesPropertyType.INSTANCE,
+          List.of(Target.Rust),
+          (config) -> {
+              var deps = config.rust.getCargoDependencies();
+              if (deps.size() == 0) {
+                  return null;
+              } else {
+                  Element e = LfFactory.eINSTANCE.createElement();
+                  KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+                  for (var ent : deps.entrySet()) {
+                      KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+                      pair.setName(ent.getKey());
+                      pair.setValue(CargoDependencySpec.extractSpec(ent.getValue()));
+                      kvp.getPairs().add(pair);
+                  }
+                  e.setKeyvalue(kvp);
+                  return e;
+              }
+          },
+          (config, value, err) -> {
+              config.rust.setCargoDependencies(CargoDependencySpec.parseAll(value));
+          }),
+
+      /**
+       * Directs the C or Python target to include the associated C file used for setting up federated
+       * execution before processing the first tag.
+       */
+      FED_SETUP(
+          "_fed_setup",
+          PrimitiveType.FILE,
+          Arrays.asList(Target.C, Target.CCPP, Target.Python),
+          (config) -> ASTUtils.toElement(config.fedSetupPreamble),
+          (config, value, err) ->
+              config.fedSetupPreamble = StringUtil.removeQuotes(ASTUtils.elementToSingleString(value)));
+
+    /** Update {@code config}.dockerOptions based on value. */
   private static void setDockerProperty(TargetConfig config, Element value) {
     if (value.getLiteral() != null) {
       if (ASTUtils.toBoolean(value)) {
@@ -869,12 +839,21 @@ private static void setDockerProperty(TargetConfig config, Element value) {
    */
   public final PropertyParser setter;
 
-  /**
+  private final PropertyValidator validator;
+
+
+    /**
    * Function that given a configuration object and an Element AST node sets the configuration. It
    * is assumed that validation already occurred, so this code should be straightforward.
    */
   public final PropertyParser updater;
 
+
+  @FunctionalInterface
+  private interface  PropertyValidator {
+      void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter);
+  }
+
   @FunctionalInterface
   private interface PropertyParser {
 
@@ -917,6 +896,18 @@ private interface PropertyGetter {
     this.getter = getter;
     this.setter = setter;
     this.updater = setter; // (Re)set by default
+      this.validator = (pair, ast, config, validator) -> {};
+  }
+
+  TargetProperty(String description, TargetPropertyType type, List<Target> supportedBy,
+      TargetPropertyConfig configurator) {
+      this.description = description;
+      this.type = type;
+      this.supportedBy = supportedBy;
+      this.setter = configurator::parseIntoTargetConfig;
+      this.getter = configurator::getPropertyElement;
+      this.updater = configurator::parseIntoTargetConfig;
+      this.validator = configurator::validate;
   }
 
   /**
@@ -942,6 +933,7 @@ private interface PropertyGetter {
     this.getter = getter;
     this.setter = setter;
     this.updater = updater;
+      this.validator = (pair, ast, config, validator) -> {};
   }
 
   /**
@@ -1012,6 +1004,23 @@ public static TargetDecl extractTargetDecl(Target target, TargetConfig config) {
     return decl;
   }
 
+    public static KeyValuePair getKeyValuePair(KeyValuePairs targetProperties, TargetProperty property) {
+        List<KeyValuePair> properties =
+            targetProperties.getPairs().stream()
+                .filter(pair -> pair.getName().equals(property.description))
+                .toList();
+        assert (properties.size() <= 1);
+        return properties.size() > 0 ? properties.get(0) : null;
+    }
+
+    public static KeyValuePair getKeyValuePair(Model ast, TargetProperty property) {
+      return getKeyValuePair(ast.getTarget().getConfig(), property);
+    }
+
+    public void validate(KeyValuePairs pairs, Model ast, TargetConfig config, ValidationReporter reporter) {
+      this.validator.validate(getKeyValuePair(pairs, this), ast, config, reporter);
+    }
+
   /**
    * Update the given configuration using the given target properties.
    *
@@ -1096,768 +1105,9 @@ public String toString() {
     return this.description;
   }
 
-  // Inner classes for the various supported types.
-
-  /** Dictionary type that allows for keys that will be interpreted as strings and string values. */
-  public enum StringDictionaryType implements TargetPropertyType {
-    COMPILE_DEFINITION();
-
-    @Override
-    public boolean validate(Element e) {
-      if (e.getKeyvalue() != null) {
-        return true;
-      }
-      return false;
-    }
-
-    @Override
-    public void check(Element e, String name, LFValidator v) {
-      KeyValuePairs kv = e.getKeyvalue();
-      if (kv == null) {
-        TargetPropertyType.produceError(name, this.toString(), v);
-      } else {
-        for (KeyValuePair pair : kv.getPairs()) {
-          String key = pair.getName();
-          Element val = pair.getValue();
-
-          // Make sure the type is string
-          PrimitiveType.STRING.check(val, name + "." + key, v);
-        }
-      }
-    }
-  }
-
   /** Interface for dictionary elements. It associates an entry with a type. */
   public interface DictionaryElement {
 
     TargetPropertyType getType();
   }
-
-  /**
-   * A dictionary type with a predefined set of possible keys and assignable types.
-   *
-   * @author Marten Lohstroh
-   */
-  public enum DictionaryType implements TargetPropertyType {
-    CLOCK_SYNC_OPTION_DICT(Arrays.asList(ClockSyncOption.values())),
-    DOCKER_DICT(Arrays.asList(DockerOption.values())),
-    PLATFORM_DICT(Arrays.asList(PlatformOption.values())),
-    COORDINATION_OPTION_DICT(Arrays.asList(CoordinationOption.values())),
-    TRACING_DICT(Arrays.asList(TracingOption.values()));
-
-    /** The keys and assignable types that are allowed in this dictionary. */
-    public List<DictionaryElement> options;
-
-    /**
-     * A dictionary type restricted to sets of predefined keys and types of values.
-     *
-     * @param options The dictionary elements allowed by this type.
-     */
-    private DictionaryType(List<DictionaryElement> options) {
-      this.options = options;
-    }
-
-    /**
-     * Return the dictionary element of which the key matches the given string.
-     *
-     * @param name The string to match against.
-     * @return The matching dictionary element (or null if there is none).
-     */
-    public DictionaryElement forName(String name) {
-      return Target.match(name, options);
-    }
-
-    /** Recursively check that the passed in element conforms to the rules of this dictionary. */
-    @Override
-    public void check(Element e, String name, LFValidator v) {
-      KeyValuePairs kv = e.getKeyvalue();
-      if (kv == null) {
-        TargetPropertyType.produceError(name, this.toString(), v);
-      } else {
-        for (KeyValuePair pair : kv.getPairs()) {
-          String key = pair.getName();
-          Element val = pair.getValue();
-          Optional<DictionaryElement> match =
-              this.options.stream()
-                  .filter(element -> key.equalsIgnoreCase(element.toString()))
-                  .findAny();
-          if (match.isPresent()) {
-            // Make sure the type is correct, too.
-            TargetPropertyType type = match.get().getType();
-            type.check(val, name + "." + key, v);
-          } else {
-            // No match found; report error.
-            TargetPropertyType.produceError(name, this.toString(), v);
-          }
-        }
-      }
-    }
-
-    /** Return true if the given element represents a dictionary, false otherwise. */
-    @Override
-    public boolean validate(Element e) {
-      if (e.getKeyvalue() != null) {
-        return true;
-      }
-      return false;
-    }
-
-    /** Return a human-readable description of this type. */
-    @Override
-    public String toString() {
-      return "a dictionary with one or more of the following keys: "
-          + options.stream().map(option -> option.toString()).collect(Collectors.joining(", "));
-    }
-  }
-  /**
-   * A type that can assume one of several types.
-   *
-   * @author Marten Lohstroh
-   */
-  public enum UnionType implements TargetPropertyType {
-    STRING_OR_STRING_ARRAY(Arrays.asList(PrimitiveType.STRING, ArrayType.STRING_ARRAY), null),
-    PLATFORM_STRING_OR_DICTIONARY(
-        Arrays.asList(PrimitiveType.STRING, DictionaryType.PLATFORM_DICT), null),
-    FILE_OR_FILE_ARRAY(Arrays.asList(PrimitiveType.FILE, ArrayType.FILE_ARRAY), null),
-    BUILD_TYPE_UNION(Arrays.asList(BuildType.values()), null),
-    COORDINATION_UNION(Arrays.asList(CoordinationType.values()), CoordinationType.CENTRALIZED),
-    SCHEDULER_UNION(Arrays.asList(SchedulerOption.values()), SchedulerOption.getDefault()),
-    LOGGING_UNION(Arrays.asList(LogLevel.values()), LogLevel.INFO),
-    PLATFORM_UNION(Arrays.asList(Platform.values()), Platform.AUTO),
-    CLOCK_SYNC_UNION(Arrays.asList(ClockSyncMode.values()), ClockSyncMode.INIT),
-    DOCKER_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.DOCKER_DICT), null),
-    TRACING_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.TRACING_DICT), null);
-
-    /** The constituents of this type union. */
-    public final List<Enum<?>> options;
-
-    /** The default type, if there is one. */
-    private final Enum<?> defaultOption;
-
-    /**
-     * Private constructor for creating unions types.
-     *
-     * @param options The types that that are part of the union.
-     * @param defaultOption The default type.
-     */
-    private UnionType(List<Enum<?>> options, Enum<?> defaultOption) {
-      this.options = options;
-      this.defaultOption = defaultOption;
-    }
-
-    /**
-     * Return the type among those in this type union that matches the given name.
-     *
-     * @param name The string to match against.
-     * @return The matching dictionary element (or null if there is none).
-     */
-    public Enum<?> forName(String name) {
-      return Target.match(name, options);
-    }
-
-    /** Recursively check that the passed in element conforms to the rules of this union. */
-    @Override
-    public void check(Element e, String name, LFValidator v) {
-      Optional<Enum<?>> match = this.match(e);
-      if (match.isPresent()) {
-        // Go deeper if the element is an array or dictionary.
-        Enum<?> type = match.get();
-        if (type instanceof DictionaryType) {
-          ((DictionaryType) type).check(e, name, v);
-        } else if (type instanceof ArrayType) {
-          ((ArrayType) type).check(e, name, v);
-        } else if (type instanceof PrimitiveType) {
-          ((PrimitiveType) type).check(e, name, v);
-        } else if (!(type instanceof Enum<?>)) {
-          throw new RuntimeException("Encountered an unknown type.");
-        }
-      } else {
-        // No match found; report error.
-        TargetPropertyType.produceError(name, this.toString(), v);
-      }
-    }
-
-    /**
-     * Internal method for matching a given element against the allowable types.
-     *
-     * @param e AST node that represents the value of a target property.
-     * @return The matching type wrapped in an Optional object.
-     */
-    private Optional<Enum<?>> match(Element e) {
-      return this.options.stream()
-          .filter(
-              option -> {
-                if (option instanceof TargetPropertyType) {
-                  return ((TargetPropertyType) option).validate(e);
-                } else {
-                  return ASTUtils.elementToSingleString(e).equalsIgnoreCase(option.toString());
-                }
-              })
-          .findAny();
-    }
-
-    /**
-     * Return true if this union has an option that matches the given element.
-     *
-     * @param e The element to match against this type.
-     */
-    @Override
-    public boolean validate(Element e) {
-      if (this.match(e).isPresent()) {
-        return true;
-      }
-      return false;
-    }
-
-    /**
-     * Return a human-readable description of this type. If three is a default option, then indicate
-     * it.
-     */
-    @Override
-    public String toString() {
-      return "one of the following: "
-          + options.stream()
-              .map(
-                  option -> {
-                    if (option == this.defaultOption) {
-                      return option.toString() + " (default)";
-                    } else {
-                      return option.toString();
-                    }
-                  })
-              .collect(Collectors.joining(", "));
-    }
-  }
-
-  /**
-   * An array type of which the elements confirm to a given type.
-   *
-   * @author Marten Lohstroh
-   */
-  public enum ArrayType implements TargetPropertyType {
-    STRING_ARRAY(PrimitiveType.STRING),
-    FILE_ARRAY(PrimitiveType.FILE);
-
-    /** Type parameter of this array type. */
-    public TargetPropertyType type;
-
-    /**
-     * Private constructor to create a new array type.
-     *
-     * @param type The type of elements in the array.
-     */
-    private ArrayType(TargetPropertyType type) {
-      this.type = type;
-    }
-
-    /**
-     * Check that the passed in element represents an array and ensure that its elements are all of
-     * the correct type.
-     */
-    @Override
-    public void check(Element e, String name, LFValidator v) {
-      Array array = e.getArray();
-      if (array == null) {
-        TargetPropertyType.produceError(name, this.toString(), v);
-      } else {
-        List<Element> elements = array.getElements();
-        for (int i = 0; i < elements.size(); i++) {
-          this.type.check(elements.get(i), name + "[" + i + "]", v);
-        }
-      }
-    }
-
-    /** Return true of the given element is an array. */
-    @Override
-    public boolean validate(Element e) {
-      if (e.getArray() != null) {
-        return true;
-      }
-      return false;
-    }
-
-    /** Return a human-readable description of this type. */
-    @Override
-    public String toString() {
-      return "an array of which each element is " + this.type.toString();
-    }
-  }
-
-  /**
-   * Enumeration of Cmake build types. These are also mapped to Cargo profiles for the Rust target
-   * (see {@link org.lflang.generator.rust.RustTargetConfig})
-   *
-   * @author Christian Menard
-   */
-  public enum BuildType {
-    RELEASE("Release"),
-    DEBUG("Debug"),
-    TEST("Test"),
-    REL_WITH_DEB_INFO("RelWithDebInfo"),
-    MIN_SIZE_REL("MinSizeRel");
-
-    /** Alias used in toString method. */
-    private final String alias;
-
-    /** Private constructor for Cmake build types. */
-    BuildType(String alias) {
-      this.alias = alias;
-    }
-
-    /** Return the alias. */
-    @Override
-    public String toString() {
-      return this.alias;
-    }
-  }
-
-  /**
-   * Enumeration of coordination types.
-   *
-   * @author Marten Lohstroh
-   */
-  public enum CoordinationType {
-    CENTRALIZED,
-    DECENTRALIZED;
-
-    /** Return the name in lower case. */
-    @Override
-    public String toString() {
-      return this.name().toLowerCase();
-    }
-  }
-
-  /**
-   * Enumeration of clock synchronization modes.
-   *
-   * <ul>
-   *   <li>OFF: The clock synchronization is universally off.
-   *   <li>STARTUP: Clock synchronization occurs at startup only.
-   *   <li>ON: Clock synchronization occurs at startup and at runtime.
-   * </ul>
-   *
-   * @author Edward A. Lee
-   */
-  public enum ClockSyncMode {
-    OFF,
-    INIT,
-    ON; // TODO Discuss initial in now a mode keyword (same as startup) and cannot be used as target
-    // property value, thus changed it to init
-    // FIXME I could not test if this change breaks anything
-
-    /** Return the name in lower case. */
-    @Override
-    public String toString() {
-      return this.name().toLowerCase();
-    }
-  }
-
-  /**
-   * An interface for types associated with target properties.
-   *
-   * @author Marten Lohstroh
-   */
-  public interface TargetPropertyType {
-
-    /**
-     * Return true if the the given Element is a valid instance of this type.
-     *
-     * @param e The Element to validate.
-     * @return True if the element conforms to this type, false otherwise.
-     */
-    public boolean validate(Element e);
-
-    /**
-     * Check (recursively) the given Element against its associated type(s) and add found problems
-     * to the given list of errors.
-     *
-     * @param e The Element to type check.
-     * @param name The name of the target property.
-     * @param v A reference to the validator to report errors to.
-     */
-    public void check(Element e, String name, LFValidator v);
-
-    /**
-     * Helper function to produce an error during type checking.
-     *
-     * @param name The description of the target property.
-     * @param description The description of the type.
-     * @param v A reference to the validator to report errors to.
-     */
-    public static void produceError(String name, String description, LFValidator v) {
-
-      v.reportTargetPropertyError(
-          "Target property '" + name + "' is required to be " + description + ".");
-    }
-  }
-
-  /**
-   * Primitive types for target properties, each with a description used in error messages and
-   * predicate used for validating values.
-   *
-   * @author Marten Lohstroh
-   */
-  public enum PrimitiveType implements TargetPropertyType {
-    BOOLEAN(
-        "'true' or 'false'",
-        v ->
-            ASTUtils.elementToSingleString(v).equalsIgnoreCase("true")
-                || ASTUtils.elementToSingleString(v).equalsIgnoreCase("false")),
-    INTEGER(
-        "an integer",
-        v -> {
-          try {
-            Integer.parseInt(ASTUtils.elementToSingleString(v));
-          } catch (NumberFormatException e) {
-            return false;
-          }
-          return true;
-        }),
-    NON_NEGATIVE_INTEGER(
-        "a non-negative integer",
-        v -> {
-          try {
-            int result = Integer.parseInt(ASTUtils.elementToSingleString(v));
-            if (result < 0) return false;
-          } catch (NumberFormatException e) {
-            return false;
-          }
-          return true;
-        }),
-    TIME_VALUE(
-        "a time value with units",
-        v ->
-            v.getKeyvalue() == null
-                && v.getArray() == null
-                && v.getLiteral() == null
-                && v.getId() == null
-                && (v.getTime() == 0 || v.getUnit() != null)),
-    STRING(
-        "a string",
-        v -> v.getLiteral() != null && !isCharLiteral(v.getLiteral()) || v.getId() != null),
-    FILE("a path to a file", STRING.validator);
-
-    /** A description of this type, featured in error messages. */
-    private final String description;
-
-    /** A predicate for determining whether a given Element conforms to this type. */
-    public final Predicate<Element> validator;
-
-    /**
-     * Private constructor to create a new primitive type.
-     *
-     * @param description A textual description of the type that should start with "a/an".
-     * @param validator A predicate that returns true if a given Element conforms to this type.
-     */
-    private PrimitiveType(String description, Predicate<Element> validator) {
-      this.description = description;
-      this.validator = validator;
-    }
-
-    /** Return true if the the given Element is a valid instance of this type. */
-    public boolean validate(Element e) {
-      return this.validator.test(e);
-    }
-
-    /**
-     * Check (recursively) the given Element against its associated type(s) and add found problems
-     * to the given list of errors.
-     *
-     * @param e The element to type check.
-     * @param name The name of the target property.
-     * @param v The LFValidator to append errors to.
-     */
-    public void check(Element e, String name, LFValidator v) {
-      if (!this.validate(e)) {
-        TargetPropertyType.produceError(name, this.description, v);
-      }
-      // If this is a file, perform an additional check to make sure
-      // the file actually exists.
-      // FIXME: premature because we first need a mechanism for looking up files!
-      // Looking in the same directory is too restrictive. Disabling this check for now.
-      /*
-      if (this == FILE) {
-          String file = ASTUtils.toSingleString(e);
-
-          if (!FileConfig.fileExists(file, FileConfig.toPath(e.eResource().getURI()).toFile().getParent())) {
-              v.targetPropertyWarnings
-                      .add("Could not find file: '" + file + "'.");
-          }
-      }
-      */
-    }
-
-    /** Return a textual description of this type. */
-    @Override
-    public String toString() {
-      return this.description;
-    }
-
-    private static boolean isCharLiteral(String s) {
-      return s.length() > 2 && '\'' == s.charAt(0) && '\'' == s.charAt(s.length() - 1);
-    }
-  }
-
-  /**
-   * Clock synchronization options.
-   *
-   * @author Marten Lohstroh
-   */
-  public enum ClockSyncOption implements DictionaryElement {
-    ATTENUATION("attenuation", PrimitiveType.NON_NEGATIVE_INTEGER),
-    LOCAL_FEDERATES_ON("local-federates-on", PrimitiveType.BOOLEAN),
-    PERIOD("period", PrimitiveType.TIME_VALUE),
-    TEST_OFFSET("test-offset", PrimitiveType.TIME_VALUE),
-    TRIALS("trials", PrimitiveType.NON_NEGATIVE_INTEGER),
-    COLLECT_STATS("collect-stats", PrimitiveType.BOOLEAN);
-
-    public final PrimitiveType type;
-
-    private final String description;
-
-    private ClockSyncOption(String alias, PrimitiveType type) {
-      this.description = alias;
-      this.type = type;
-    }
-
-    /** Return the description of this dictionary element. */
-    @Override
-    public String toString() {
-      return this.description;
-    }
-
-    /** Return the type associated with this dictionary element. */
-    public TargetPropertyType getType() {
-      return this.type;
-    }
-  }
-
-  /**
-   * Docker options.
-   *
-   * @author Edward A. Lee
-   */
-  public enum DockerOption implements DictionaryElement {
-    FROM("FROM", PrimitiveType.STRING);
-
-    public final PrimitiveType type;
-
-    private final String description;
-
-    private DockerOption(String alias, PrimitiveType type) {
-      this.description = alias;
-      this.type = type;
-    }
-
-    /** Return the description of this dictionary element. */
-    @Override
-    public String toString() {
-      return this.description;
-    }
-
-    /** Return the type associated with this dictionary element. */
-    public TargetPropertyType getType() {
-      return this.type;
-    }
-  }
-
-  /**
-   * Platform options.
-   *
-   * @author Anirudh Rengarajan
-   */
-  public enum PlatformOption implements DictionaryElement {
-    NAME("name", PrimitiveType.STRING),
-    BAUDRATE("baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER),
-    BOARD("board", PrimitiveType.STRING),
-    FLASH("flash", PrimitiveType.BOOLEAN),
-    PORT("port", PrimitiveType.STRING),
-    USER_THREADS("user-threads", PrimitiveType.NON_NEGATIVE_INTEGER);
-
-    public final PrimitiveType type;
-
-    private final String description;
-
-    private PlatformOption(String alias, PrimitiveType type) {
-      this.description = alias;
-      this.type = type;
-    }
-
-    /** Return the description of this dictionary element. */
-    @Override
-    public String toString() {
-      return this.description;
-    }
-
-    /** Return the type associated with this dictionary element. */
-    public TargetPropertyType getType() {
-      return this.type;
-    }
-  }
-
-  /**
-   * Coordination options.
-   *
-   * @author Edward A. Lee
-   */
-  public enum CoordinationOption implements DictionaryElement {
-    ADVANCE_MESSAGE_INTERVAL("advance-message-interval", PrimitiveType.TIME_VALUE);
-
-    public final PrimitiveType type;
-
-    private final String description;
-
-    private CoordinationOption(String alias, PrimitiveType type) {
-      this.description = alias;
-      this.type = type;
-    }
-
-    /** Return the description of this dictionary element. */
-    @Override
-    public String toString() {
-      return this.description;
-    }
-
-    /** Return the type associated with this dictionary element. */
-    public TargetPropertyType getType() {
-      return this.type;
-    }
-  }
-
-  /**
-   * Log levels in descending order of severity.
-   *
-   * @author Marten Lohstroh
-   */
-  public enum LogLevel {
-    ERROR,
-    WARN,
-    INFO,
-    LOG,
-    DEBUG;
-
-    /** Return the name in lower case. */
-    @Override
-    public String toString() {
-      return this.name().toLowerCase();
-    }
-  }
-
-  /** Enumeration of supported platforms */
-  public enum Platform {
-    AUTO,
-    ARDUINO,
-    NRF52("Nrf52", true),
-    RP2040("Rp2040", false),
-    LINUX("Linux", true),
-    MAC("Darwin", true),
-    ZEPHYR("Zephyr", true),
-    WINDOWS("Windows", true);
-
-    String cMakeName;
-
-    private boolean multiThreaded = true;
-
-    Platform() {
-      this.cMakeName = this.toString();
-    }
-
-    Platform(String cMakeName, boolean isMultiThreaded) {
-      this.cMakeName = cMakeName;
-      this.multiThreaded = isMultiThreaded;
-    }
-
-    /** Return the name in lower case. */
-    @Override
-    public String toString() {
-      return this.name().toLowerCase();
-    }
-
-    /** Get the CMake name for the platform. */
-    public String getcMakeName() {
-      return this.cMakeName;
-    }
-
-    public boolean isMultiThreaded() {
-      return this.multiThreaded;
-    }
-  }
-
-  /**
-   * Supported schedulers.
-   *
-   * @author Soroush Bateni
-   */
-  public enum SchedulerOption {
-    NP(false), // Non-preemptive
-    ADAPTIVE(
-        false,
-        List.of(
-            Path.of("scheduler_adaptive.c"),
-            Path.of("worker_assignments.h"),
-            Path.of("worker_states.h"),
-            Path.of("data_collection.h"))),
-    GEDF_NP(true), // Global EDF non-preemptive
-    GEDF_NP_CI(true); // Global EDF non-preemptive with chain ID
-    // PEDF_NP(true);    // Partitioned EDF non-preemptive (FIXME: To be re-added in a future PR)
-
-    /** Indicate whether or not the scheduler prioritizes reactions by deadline. */
-    private final boolean prioritizesDeadline;
-
-    /** Relative paths to files required by this scheduler. */
-    private final List<Path> relativePaths;
-
-    SchedulerOption(boolean prioritizesDeadline) {
-      this(prioritizesDeadline, null);
-    }
-
-    SchedulerOption(boolean prioritizesDeadline, List<Path> relativePaths) {
-      this.prioritizesDeadline = prioritizesDeadline;
-      this.relativePaths = relativePaths;
-    }
-
-    /** Return true if the scheduler prioritizes reactions by deadline. */
-    public boolean prioritizesDeadline() {
-      return this.prioritizesDeadline;
-    }
-
-    public List<Path> getRelativePaths() {
-      return relativePaths != null
-          ? ImmutableList.copyOf(relativePaths)
-          : List.of(Path.of("scheduler_" + this + ".c"));
-    }
-
-    public static SchedulerOption getDefault() {
-      return NP;
-    }
-  }
-
-  /**
-   * Tracing options.
-   *
-   * @author Edward A. Lee
-   */
-  public enum TracingOption implements DictionaryElement {
-    TRACE_FILE_NAME("trace-file-name", PrimitiveType.STRING);
-
-    public final PrimitiveType type;
-
-    private final String description;
-
-    private TracingOption(String alias, PrimitiveType type) {
-      this.description = alias;
-      this.type = type;
-    }
-
-    /** Return the description of this dictionary element. */
-    @Override
-    public String toString() {
-      return this.description;
-    }
-
-    /** Return the type associated with this dictionary element. */
-    public TargetPropertyType getType() {
-      return this.type;
-    }
-  }
 }
diff --git a/core/src/main/java/org/lflang/TargetPropertyConfig.java b/core/src/main/java/org/lflang/TargetPropertyConfig.java
new file mode 100644
index 0000000000..1e784da0a5
--- /dev/null
+++ b/core/src/main/java/org/lflang/TargetPropertyConfig.java
@@ -0,0 +1,26 @@
+package org.lflang;
+
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.Model;
+import org.lflang.validation.ValidationReporter;
+
+public interface TargetPropertyConfig<T> {
+
+  /**
+   * Parse the given element into the given target config. May use the error reporter to report
+   * format errors.
+   */
+  void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err);
+
+  T parse(Element value);
+
+  // FIXME: config may not be needed.
+  void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter);
+
+  /**
+   * Read this property from the target config and build an element which represents it for the AST.
+   * May return null if the given value of this property is the same as the default.
+   */
+  Element getPropertyElement(TargetConfig config);
+}
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index d6493f96c0..206798a14c 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -37,7 +37,6 @@
 import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetProperty;
-import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedASTUtils;
@@ -58,6 +57,7 @@
 import org.lflang.lf.Port;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
+import org.lflang.target.CoordinationConfig.CoordinationType;
 
 /**
  * An extension class to the CGenerator that enables certain federated functionalities.
diff --git a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
index f3a9c48d51..61a6583026 100644
--- a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.federated.generator.FedConnectionInstance;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
@@ -14,6 +13,7 @@
 import org.lflang.lf.Reaction;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
+import org.lflang.target.CoordinationConfig.CoordinationType;
 
 public interface FedTargetExtension {
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
index 3d84d78562..0b5007f5bc 100644
--- a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
@@ -29,7 +29,6 @@
 import java.io.IOException;
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedConnectionInstance;
 import org.lflang.federated.generator.FedFileConfig;
@@ -43,6 +42,7 @@
 import org.lflang.lf.Action;
 import org.lflang.lf.Reaction;
 import org.lflang.lf.VarRef;
+import org.lflang.target.CoordinationConfig.CoordinationType;
 
 /**
  * An extension class to the PythonGenerator that enables certain federated functionalities.
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 9ef81c6a23..a3ac049a37 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -7,7 +7,6 @@
 import java.util.stream.Collectors;
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedASTUtils;
@@ -26,6 +25,7 @@
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
+import org.lflang.target.CoordinationConfig.CoordinationType;
 
 public class TSExtension implements FedTargetExtension {
   @Override
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index e145248cb5..6414db1e9c 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -45,7 +45,6 @@
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.extensions.FedTargetExtension;
@@ -71,6 +70,7 @@
 import org.lflang.lf.Type;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
+import org.lflang.target.CoordinationConfig.CoordinationType;
 
 /**
  * A helper class for AST transformations needed for federated execution.
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index f885daabdf..05a500710c 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -32,7 +32,6 @@
 import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
-import org.lflang.TargetProperty.CoordinationType;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.launcher.FedLauncherGenerator;
 import org.lflang.federated.launcher.RtiConfig;
@@ -59,6 +58,7 @@
 import org.lflang.lf.Reactor;
 import org.lflang.lf.TargetDecl;
 import org.lflang.lf.VarRef;
+import org.lflang.target.CoordinationConfig.CoordinationType;
 import org.lflang.util.Averager;
 
 public class FedGenerator {
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index 6f2347d85c..bff26e5c2f 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -7,7 +7,7 @@
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * 2. Redistributions in binary formimport org.lflang.TargetProperty.ClockSyncMode; must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
  *
@@ -35,9 +35,9 @@
 import java.util.List;
 import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
-import org.lflang.TargetProperty.ClockSyncMode;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
+import org.lflang.target.ClockSyncConfigurator.ClockSyncMode;
 
 /**
  * Utility class that can be used to create a launcher for federated LF programs.
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 0ee24fc39a..e7b7ecb5a5 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -34,8 +34,8 @@
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
-import org.lflang.TargetProperty.Platform;
 import org.lflang.generator.CodeBuilder;
+import org.lflang.target.PlatformConfigurator.Platform;
 import org.lflang.util.FileUtil;
 
 /**
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index 0933d95594..0df21fc413 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -36,12 +36,12 @@
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
-import org.lflang.TargetProperty;
-import org.lflang.TargetProperty.Platform;
 import org.lflang.generator.GeneratorBase;
 import org.lflang.generator.GeneratorCommandFactory;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGeneratorContext;
+import org.lflang.target.property.BuildConfig;
+import org.lflang.target.PlatformConfigurator.Platform;
 import org.lflang.util.FileUtil;
 import org.lflang.util.LFCommand;
 
@@ -261,7 +261,7 @@ private static List<String> cmakeOptions(TargetConfig targetConfig, FileConfig f
   }
 
   /** Return the cmake config name correspnding to a given build type. */
-  private String buildTypeToCmakeConfig(TargetProperty.BuildType type) {
+  private String buildTypeToCmakeConfig(BuildConfig.BuildType type) {
     if (type == null) {
       return "Release";
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index f6faa499a2..335a971247 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -54,7 +54,6 @@
 import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
-import org.lflang.TargetProperty.Platform;
 import org.lflang.TargetProperty.PlatformOption;
 import org.lflang.ast.ASTUtils;
 import org.lflang.ast.DelayedConnectionTransformation;
@@ -89,6 +88,8 @@
 import org.lflang.lf.ReactorDecl;
 import org.lflang.lf.StateVar;
 import org.lflang.lf.Variable;
+import org.lflang.target.PlatformConfigurator.Platform;
+import org.lflang.target.SchedulerConfigurator.SchedulerOption;
 import org.lflang.util.ArduinoUtil;
 import org.lflang.util.FileUtil;
 
@@ -698,7 +699,7 @@ private void pickScheduler() {
       // Check if a deadline is assigned to any reaction
       if (hasDeadlines(reactors)) {
         if (!targetConfig.setByUser.contains(TargetProperty.SCHEDULER)) {
-          targetConfig.schedulerType = TargetProperty.SchedulerOption.GEDF_NP;
+          targetConfig.schedulerType = SchedulerOption.GEDF_NP;
         }
       }
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
index 5f0657c322..99f3df0f0b 100644
--- a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
@@ -3,8 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.lflang.TargetConfig;
-import org.lflang.TargetProperty.Platform;
 import org.lflang.generator.CodeBuilder;
+import org.lflang.target.PlatformConfigurator.Platform;
 import org.lflang.util.StringUtil;
 
 public class CMainFunctionGenerator {
diff --git a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
index 30095ec598..dc48f5d40b 100644
--- a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
@@ -4,8 +4,8 @@
 
 import java.nio.file.Path;
 import org.lflang.TargetConfig;
-import org.lflang.TargetProperty.Platform;
 import org.lflang.generator.CodeBuilder;
+import org.lflang.target.PlatformConfigurator.Platform;
 import org.lflang.util.StringUtil;
 
 /**
diff --git a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 77e7eee22e..25ab8b59b9 100644
--- a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -15,7 +15,6 @@
 import java.util.stream.Collectors;
 import org.lflang.AttributeUtils;
 import org.lflang.TargetConfig;
-import org.lflang.TargetProperty.LogLevel;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.extensions.CExtensionUtils;
 import org.lflang.generator.CodeBuilder;
@@ -24,6 +23,7 @@
 import org.lflang.generator.ReactorInstance;
 import org.lflang.generator.RuntimeRange;
 import org.lflang.generator.SendRange;
+import org.lflang.target.LoggingConfigurator.LogLevel;
 
 /**
  * Generate code for the "_lf_initialize_trigger_objects" function
diff --git a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
index cd160f53c1..c1e6fad3f3 100644
--- a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
+++ b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
@@ -34,7 +34,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.lflang.MessageReporter;
 import org.lflang.TargetProperty;
-import org.lflang.TargetProperty.TargetPropertyType;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.InvalidLfSourceException;
 import org.lflang.lf.Array;
@@ -42,6 +41,7 @@
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
+import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.util.StringUtil;
 import org.lflang.validation.LFValidator;
 
diff --git a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
index 7c164c1957..83ef50589b 100644
--- a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
+++ b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
@@ -32,7 +32,7 @@
 import java.util.Map;
 import org.eclipse.emf.ecore.EObject;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty.BuildType;
+import org.lflang.target.property.BuildConfig.BuildType;
 
 /**
  * Rust-specific part of a {@link org.lflang.TargetConfig}.
diff --git a/core/src/main/java/org/lflang/target/AuthConfigurator.java b/core/src/main/java/org/lflang/target/AuthConfigurator.java
new file mode 100644
index 0000000000..7a1aec6372
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/AuthConfigurator.java
@@ -0,0 +1,33 @@
+package org.lflang.target;
+
+import org.lflang.MessageReporter;
+import org.lflang.TargetConfig;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.Model;
+import org.lflang.validation.LFValidator.ValidationReporter;
+
+public class AuthConfigurator implements TargetPropertyConfig<Boolean> {
+
+    @Override
+    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
+        config.auth = this.parse(value);
+    }
+
+    @Override
+    public Boolean parse(Element value) {
+        return ASTUtils.toBoolean(value);
+    }
+
+    @Override
+    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+
+    }
+
+    @Override
+    public Element getPropertyElement(TargetConfig config) {
+        return ASTUtils.toElement(config.auth);
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/ClockSyncConfigurator.java b/core/src/main/java/org/lflang/target/ClockSyncConfigurator.java
new file mode 100644
index 0000000000..4508aa809b
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/ClockSyncConfigurator.java
@@ -0,0 +1,115 @@
+package org.lflang.target;
+
+import org.lflang.MessageReporter;
+import org.lflang.TargetConfig;
+import org.lflang.TargetProperty.DictionaryElement;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.LfPackage.Literals;
+import org.lflang.lf.Model;
+import org.lflang.lf.Reactor;
+import org.lflang.target.ClockSyncConfigurator.ClockSyncMode;
+import org.lflang.target.property.type.TargetPropertyType;
+import org.lflang.target.property.type.PrimitiveType;
+import org.lflang.target.property.type.UnionType;
+import org.lflang.validation.LFValidator.ValidationReporter;
+
+public class ClockSyncConfigurator implements TargetPropertyConfig<ClockSyncMode> {
+
+    @Override
+    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
+        config.clockSync = this.parse(value);
+
+    }
+
+    @Override
+    public ClockSyncMode parse(Element value) {
+        return (ClockSyncMode)
+            UnionType.CLOCK_SYNC_UNION.forName(ASTUtils.elementToSingleString(value));
+    }
+
+
+    @Override
+    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+        if (pair != null) {
+            boolean federatedExists = false;
+            for (Reactor reactor : ast.getReactors()) {
+                if (reactor.isFederated()) {
+                    federatedExists = true;
+                }
+            }
+            if (!federatedExists) {
+                reporter.warning(
+                    "The clock-sync target property is incompatible with non-federated programs.",
+                    pair,
+                    Literals.KEY_VALUE_PAIR__NAME);
+            }
+        }
+    }
+
+    @Override
+    public Element getPropertyElement(TargetConfig config) {
+        return ASTUtils.toElement(config.clockSync.toString());
+    }
+
+    /**
+     * Clock synchronization options.
+     *
+     * @author Marten Lohstroh
+     */
+    public enum ClockSyncOption implements DictionaryElement {
+        ATTENUATION("attenuation", PrimitiveType.NON_NEGATIVE_INTEGER),
+        LOCAL_FEDERATES_ON("local-federates-on", PrimitiveType.BOOLEAN),
+        PERIOD("period", PrimitiveType.TIME_VALUE),
+        TEST_OFFSET("test-offset", PrimitiveType.TIME_VALUE),
+        TRIALS("trials", PrimitiveType.NON_NEGATIVE_INTEGER),
+        COLLECT_STATS("collect-stats", PrimitiveType.BOOLEAN);
+
+        public final PrimitiveType type;
+
+        private final String description;
+
+        private ClockSyncOption(String alias, PrimitiveType type) {
+            this.description = alias;
+            this.type = type;
+        }
+
+        /** Return the description of this dictionary element. */
+        @Override
+        public String toString() {
+            return this.description;
+        }
+
+        /** Return the type associated with this dictionary element. */
+        public TargetPropertyType getType() {
+            return this.type;
+        }
+    }
+
+    /**
+     * Enumeration of clock synchronization modes.
+     *
+     * <ul>
+     *   <li>OFF: The clock synchronization is universally off.
+     *   <li>STARTUP: Clock synchronization occurs at startup only.
+     *   <li>ON: Clock synchronization occurs at startup and at runtime.
+     * </ul>
+     *
+     * @author Edward A. Lee
+     */
+    public enum ClockSyncMode {
+        OFF,
+        INIT,
+        ON; // TODO Discuss initial in now a mode keyword (same as startup) and cannot be used as target
+        // property value, thus changed it to init
+        // FIXME I could not test if this change breaks anything
+
+        /** Return the name in lower case. */
+        @Override
+        public String toString() {
+            return this.name().toLowerCase();
+        }
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/CoordinationConfig.java b/core/src/main/java/org/lflang/target/CoordinationConfig.java
new file mode 100644
index 0000000000..08ed4204a7
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/CoordinationConfig.java
@@ -0,0 +1,83 @@
+package org.lflang.target;
+
+import org.lflang.MessageReporter;
+import org.lflang.TargetConfig;
+import org.lflang.TargetProperty.DictionaryElement;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.Model;
+import org.lflang.target.CoordinationConfig.CoordinationOption;
+import org.lflang.target.property.type.TargetPropertyType;
+import org.lflang.target.property.type.PrimitiveType;
+import org.lflang.validation.LFValidator.ValidationReporter;
+
+public class CoordinationConfig implements TargetPropertyConfig<CoordinationOption> {
+
+    @Override
+    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
+
+    }
+
+    @Override
+    public CoordinationOption parse(Element value) {
+        return null;
+    }
+
+    @Override
+    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+
+    }
+
+    @Override
+    public Element getPropertyElement(TargetConfig config) {
+        return null;
+    }
+
+    /**
+     * Coordination options.
+     *
+     * @author Edward A. Lee
+     */
+    public enum CoordinationOption implements DictionaryElement {
+        ADVANCE_MESSAGE_INTERVAL("advance-message-interval", PrimitiveType.TIME_VALUE);
+
+        public final PrimitiveType type;
+
+        private final String description;
+
+        private CoordinationOption(String alias, PrimitiveType type) {
+            this.description = alias;
+            this.type = type;
+        }
+
+        /** Return the description of this dictionary element. */
+        @Override
+        public String toString() {
+            return this.description;
+        }
+
+        /** Return the type associated with this dictionary element. */
+        public TargetPropertyType getType() {
+            return this.type;
+        }
+    }
+
+    /**
+     * Enumeration of coordination types.
+     *
+     * @author Marten Lohstroh
+     */
+    public enum CoordinationType {
+        CENTRALIZED,
+        DECENTRALIZED;
+
+        /** Return the name in lower case. */
+        @Override
+        public String toString() {
+            return this.name().toLowerCase();
+        }
+    }
+
+
+}
diff --git a/core/src/main/java/org/lflang/target/DockerConfig.java b/core/src/main/java/org/lflang/target/DockerConfig.java
new file mode 100644
index 0000000000..3853ceb1c7
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/DockerConfig.java
@@ -0,0 +1,66 @@
+package org.lflang.target;
+
+import org.lflang.MessageReporter;
+import org.lflang.TargetConfig;
+import org.lflang.TargetProperty.DictionaryElement;
+import org.lflang.target.property.type.PrimitiveType;
+import org.lflang.target.property.type.TargetPropertyType;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.Model;
+import org.lflang.target.DockerConfig.DockerOption;
+import org.lflang.target.property.type.TargetPropertyType;
+import org.lflang.validation.LFValidator.ValidationReporter;
+
+public class DockerConfig implements TargetPropertyConfig<DockerOption> {
+
+    @Override
+    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
+
+    }
+
+    @Override
+    public DockerOption parse(Element value) {
+        return null;
+    }
+
+    @Override
+    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+
+    }
+
+    @Override
+    public Element getPropertyElement(TargetConfig config) {
+        return null;
+    }
+
+    /**
+     * Docker options.
+     *
+     * @author Edward A. Lee
+     */
+    public enum DockerOption implements DictionaryElement {
+        FROM("FROM", PrimitiveType.STRING);
+
+        public final PrimitiveType type;
+
+        private final String description;
+
+        private DockerOption(String alias, PrimitiveType type) {
+            this.description = alias;
+            this.type = type;
+        }
+
+        /** Return the description of this dictionary element. */
+        @Override
+        public String toString() {
+            return this.description;
+        }
+
+        /** Return the type associated with this dictionary element. */
+        public TargetPropertyType getType() {
+            return this.type;
+        }
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/FastConfigurator.java b/core/src/main/java/org/lflang/target/FastConfigurator.java
new file mode 100644
index 0000000000..d9e4696167
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/FastConfigurator.java
@@ -0,0 +1,64 @@
+package org.lflang.target;
+
+import org.lflang.MessageReporter;
+import org.lflang.TargetConfig;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Action;
+import org.lflang.lf.ActionOrigin;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.LfPackage.Literals;
+import org.lflang.lf.Model;
+import org.lflang.lf.Reactor;
+import org.lflang.validation.LFValidator.ValidationReporter;
+
+public class FastConfigurator implements TargetPropertyConfig<Boolean> {
+
+    @Override
+    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
+        config.fastMode = this.parse(value);
+    }
+
+    @Override
+    public Boolean parse(Element value) {
+        return ASTUtils.toBoolean(value);
+    }
+
+    @Override
+    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+        if (pair != null) {
+            // Check for federated
+            for (Reactor reactor : ast.getReactors()) {
+                // Check to see if the program has a federated reactor
+                if (reactor.isFederated()) {
+                    reporter.error(
+                        "The fast target property is incompatible with federated programs.",
+                        pair,
+                        Literals.KEY_VALUE_PAIR__NAME);
+                    break;
+                }
+            }
+
+            // Check for physical actions
+            for (Reactor reactor : ast.getReactors()) {
+                // Check to see if the program has a physical action in a reactor
+                for (Action action : reactor.getActions()) {
+                    if (action.getOrigin().equals(ActionOrigin.PHYSICAL)) {
+                        reporter.error(
+                            "The fast target property is incompatible with physical actions.",
+                            pair,
+                            Literals.KEY_VALUE_PAIR__NAME);
+                        break;
+                    }
+                }
+            }
+        }
+
+    }
+
+    @Override
+    public Element getPropertyElement(TargetConfig config) {
+        return ASTUtils.toElement(config.fastMode);
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/KeepaliveConfigurator.java b/core/src/main/java/org/lflang/target/KeepaliveConfigurator.java
new file mode 100644
index 0000000000..9753084e16
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/KeepaliveConfigurator.java
@@ -0,0 +1,42 @@
+package org.lflang.target;
+
+import org.lflang.MessageReporter;
+import org.lflang.Target;
+import org.lflang.TargetConfig;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.LfPackage.Literals;
+import org.lflang.lf.Model;
+import org.lflang.validation.LFValidator.ValidationReporter;
+
+public class KeepaliveConfigurator implements TargetPropertyConfig<Boolean> {
+
+    @Override
+    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
+        config.keepalive = this.parse(value);
+    }
+
+    @Override
+    public Boolean parse(Element value) {
+        return ASTUtils.toBoolean(value);
+    }
+
+
+    @Override
+    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+        if (pair != null && config.target == Target.CPP) {
+            reporter.warning(
+                "The keepalive property is inferred automatically by the C++ "
+                    + "runtime and the value given here is ignored",
+                pair,
+                Literals.KEY_VALUE_PAIR__NAME);
+        }
+    }
+
+    @Override
+    public Element getPropertyElement(TargetConfig config) {
+        return ASTUtils.toElement(config.keepalive);
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/LoggingConfigurator.java b/core/src/main/java/org/lflang/target/LoggingConfigurator.java
new file mode 100644
index 0000000000..5f0b537fd8
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/LoggingConfigurator.java
@@ -0,0 +1,23 @@
+package org.lflang.target;
+
+public class LoggingConfigurator {
+
+    /**
+     * Log levels in descending order of severity.
+     *
+     * @author Marten Lohstroh
+     */
+    public enum LogLevel {
+        ERROR,
+        WARN,
+        INFO,
+        LOG,
+        DEBUG;
+
+        /** Return the name in lower case. */
+        @Override
+        public String toString() {
+            return this.name().toLowerCase();
+        }
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/PlatformConfigurator.java b/core/src/main/java/org/lflang/target/PlatformConfigurator.java
new file mode 100644
index 0000000000..542323efe1
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/PlatformConfigurator.java
@@ -0,0 +1,142 @@
+package org.lflang.target;
+
+import org.lflang.MessageReporter;
+import org.lflang.TargetConfig;
+import org.lflang.TargetProperty;
+import org.lflang.TargetProperty.DictionaryElement;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.LfPackage.Literals;
+import org.lflang.target.property.type.PrimitiveType;
+import org.lflang.target.property.type.TargetPropertyType;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.Model;
+import org.lflang.target.PlatformConfigurator.PlatformOption;
+import org.lflang.validation.LFValidator.ValidationReporter;
+
+public class PlatformConfigurator implements TargetPropertyConfig<PlatformOption> {
+
+    @Override
+    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
+
+    }
+
+    @Override
+    public PlatformOption parse(Element value) {
+        return null;
+    }
+
+    @Override
+    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+        var threading = TargetProperty.getKeyValuePair(ast, TargetProperty.THREADING);
+        if (threading != null) {
+            if (pair != null && ASTUtils.toBoolean(threading.getValue())) {
+                var lit = ASTUtils.elementToSingleString(pair.getValue());
+                var dic = pair.getValue().getKeyvalue();
+                if (lit != null && lit.equalsIgnoreCase(Platform.RP2040.toString())) {
+                    reporter.error(
+                        "Platform " + Platform.RP2040 + " does not support threading",
+                        pair,
+                        Literals.KEY_VALUE_PAIR__VALUE);
+                }
+                if (dic != null) {
+                    var rp =
+                        dic.getPairs().stream()
+                            .filter(
+                                kv ->
+                                    kv.getName().equalsIgnoreCase("name")
+                                        && ASTUtils.elementToSingleString(kv.getValue())
+                                        .equalsIgnoreCase(Platform.RP2040.toString()))
+                            .findFirst();
+                    if (rp.isPresent()) {
+                        reporter.error(
+                            "Platform " + Platform.RP2040 + " does not support threading",
+                            rp.get(),
+                            Literals.KEY_VALUE_PAIR__VALUE);
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public Element getPropertyElement(TargetConfig config) {
+        return null;
+    }
+
+    /** Enumeration of supported platforms */
+    public enum Platform {
+        AUTO,
+        ARDUINO,
+        NRF52("Nrf52", true),
+        RP2040("Rp2040", false),
+        LINUX("Linux", true),
+        MAC("Darwin", true),
+        ZEPHYR("Zephyr", true),
+        WINDOWS("Windows", true);
+
+        String cMakeName;
+
+        private boolean multiThreaded = true;
+
+        Platform() {
+            this.cMakeName = this.toString();
+        }
+
+        Platform(String cMakeName, boolean isMultiThreaded) {
+            this.cMakeName = cMakeName;
+            this.multiThreaded = isMultiThreaded;
+        }
+
+        /** Return the name in lower case. */
+        @Override
+        public String toString() {
+            return this.name().toLowerCase();
+        }
+
+        /** Get the CMake name for the platform. */
+        public String getcMakeName() {
+            return this.cMakeName;
+        }
+
+        public boolean isMultiThreaded() {
+            return this.multiThreaded;
+        }
+    }
+
+    /**
+     * Platform options.
+     *
+     * @author Anirudh Rengarajan
+     */
+    public enum PlatformOption implements DictionaryElement {
+        NAME("name", PrimitiveType.STRING),
+        BAUDRATE("baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER),
+        BOARD("board", PrimitiveType.STRING),
+        FLASH("flash", PrimitiveType.BOOLEAN),
+        PORT("port", PrimitiveType.STRING),
+        USER_THREADS("user-threads", PrimitiveType.NON_NEGATIVE_INTEGER);
+
+        public final PrimitiveType type;
+
+        private final String description;
+
+        private PlatformOption(String alias, PrimitiveType type) {
+            this.description = alias;
+            this.type = type;
+        }
+
+        /** Return the description of this dictionary element. */
+        @Override
+        public String toString() {
+            return this.description;
+        }
+
+        /** Return the type associated with this dictionary element. */
+        public TargetPropertyType getType() {
+            return this.type;
+        }
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/Ros2DependenciesConfigurator.java b/core/src/main/java/org/lflang/target/Ros2DependenciesConfigurator.java
new file mode 100644
index 0000000000..f1c6ac9eae
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/Ros2DependenciesConfigurator.java
@@ -0,0 +1,41 @@
+package org.lflang.target;
+
+import org.lflang.MessageReporter;
+import org.lflang.TargetConfig;
+import org.lflang.TargetProperty;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.LfPackage.Literals;
+import org.lflang.lf.Model;
+import org.lflang.validation.LFValidator.ValidationReporter;
+
+public class Ros2DependenciesConfigurator implements TargetPropertyConfig<Boolean> {
+
+    @Override
+    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
+
+    }
+
+    @Override
+    public Boolean parse(Element value) {
+        return null;
+    }
+
+    @Override
+    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+        var ros2enabled = TargetProperty.getKeyValuePair(ast, TargetProperty.ROS2);
+        if (pair != null && (ros2enabled == null || !ASTUtils.toBoolean(ros2enabled.getValue()))) {
+            reporter.warning(
+                "Ignoring ros2-dependencies as ros2 compilation is disabled",
+                pair,
+                Literals.KEY_VALUE_PAIR__NAME);
+        }
+    }
+
+    @Override
+    public Element getPropertyElement(TargetConfig config) {
+        return null;
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/SchedulerConfigurator.java b/core/src/main/java/org/lflang/target/SchedulerConfigurator.java
new file mode 100644
index 0000000000..5bedf0494a
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/SchedulerConfigurator.java
@@ -0,0 +1,121 @@
+package org.lflang.target;
+
+import java.nio.file.Path;
+import java.util.List;
+
+import org.lflang.MessageReporter;
+import org.lflang.TargetConfig;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.LfPackage.Literals;
+import org.lflang.lf.Model;
+import org.lflang.target.SchedulerConfigurator.SchedulerOption;
+import org.lflang.target.property.type.UnionType;
+import org.lflang.validation.LFValidator.ValidationReporter;
+
+import com.google.common.collect.ImmutableList;
+
+public class SchedulerConfigurator implements TargetPropertyConfig<SchedulerOption> {
+
+    @Override
+    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
+                config.schedulerType = this.parse(value);
+
+    }
+
+    @Override
+    public SchedulerOption parse(Element value) {
+        return (SchedulerOption)
+            UnionType.SCHEDULER_UNION.forName(ASTUtils.elementToSingleString(value));
+    }
+
+    @Override
+    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+        if (pair != null) {
+            String schedulerName = ASTUtils.elementToSingleString(pair.getValue());
+            try {
+                if (!SchedulerOption.valueOf(schedulerName).prioritizesDeadline()) {
+                    // Check if a deadline is assigned to any reaction
+                    // Filter reactors that contain at least one reaction that
+                    // has a deadline handler.
+                    if (ast.getReactors().stream()
+                        .anyMatch(
+                            // Filter reactors that contain at least one reaction that
+                            // has a deadline handler.
+                            reactor ->
+                                ASTUtils.allReactions(reactor).stream()
+                                    .anyMatch(reaction -> reaction.getDeadline() != null))) {
+                        reporter.warning(
+                            "This program contains deadlines, but the chosen "
+                                + schedulerName
+                                + " scheduler does not prioritize reaction execution "
+                                + "based on deadlines. This might result in a sub-optimal "
+                                + "scheduling.",
+                            pair,
+                            Literals.KEY_VALUE_PAIR__VALUE);
+                    }
+                }
+            } catch (IllegalArgumentException e) {
+                // the given scheduler is invalid, but this is already checked by
+                // checkTargetProperties
+            }
+        }
+
+    }
+
+    @Override
+    public Element getPropertyElement(TargetConfig config) {
+        return ASTUtils.toElement(config.schedulerType.toString());
+    }
+
+    /**
+     * Supported schedulers.
+     *
+     * @author Soroush Bateni
+     */
+    public enum SchedulerOption {
+        NP(false), // Non-preemptive
+        ADAPTIVE(
+            false,
+            List.of(
+                Path.of("scheduler_adaptive.c"),
+                Path.of("worker_assignments.h"),
+                Path.of("worker_states.h"),
+                Path.of("data_collection.h"))),
+        GEDF_NP(true), // Global EDF non-preemptive
+        GEDF_NP_CI(true); // Global EDF non-preemptive with chain ID
+        // PEDF_NP(true);    // Partitioned EDF non-preemptive (FIXME: To be re-added in a future PR)
+
+        /** Indicate whether or not the scheduler prioritizes reactions by deadline. */
+        private final boolean prioritizesDeadline;
+
+        /** Relative paths to files required by this scheduler. */
+        private final List<Path> relativePaths;
+
+        SchedulerOption(boolean prioritizesDeadline) {
+            this(prioritizesDeadline, null);
+        }
+
+        SchedulerOption(boolean prioritizesDeadline, List<Path> relativePaths) {
+            this.prioritizesDeadline = prioritizesDeadline;
+            this.relativePaths = relativePaths;
+        }
+
+        /** Return true if the scheduler prioritizes reactions by deadline. */
+        public boolean prioritizesDeadline() {
+            return this.prioritizesDeadline;
+        }
+
+        public List<Path> getRelativePaths() {
+            return relativePaths != null
+                ? ImmutableList.copyOf(relativePaths)
+                : List.of(Path.of("scheduler_" + this + ".c"));
+        }
+
+        public static SchedulerOption getDefault() {
+            return NP;
+        }
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/TracingConfigurator.java b/core/src/main/java/org/lflang/target/TracingConfigurator.java
new file mode 100644
index 0000000000..ef47b9ad5d
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/TracingConfigurator.java
@@ -0,0 +1,131 @@
+package org.lflang.target;
+
+import org.lflang.MessageReporter;
+import org.lflang.TargetConfig;
+import org.lflang.TargetConfig.TracingOptions;
+import org.lflang.TargetProperty;
+import org.lflang.TargetProperty.DictionaryElement;
+import org.lflang.target.property.type.DictionaryType;
+import org.lflang.target.property.type.PrimitiveType;
+import org.lflang.target.property.type.TargetPropertyType;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.KeyValuePairs;
+import org.lflang.lf.LfFactory;
+import org.lflang.lf.LfPackage.Literals;
+import org.lflang.lf.Model;
+import org.lflang.validation.LFValidator.ValidationReporter;
+
+public class TracingConfigurator implements TargetPropertyConfig<TracingOptions> {
+
+    @Override
+    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
+        config.tracing = parse(value);
+    }
+
+    @Override
+    public TracingOptions parse(Element value) {
+        var options = new TracingOptions();
+        if (value.getLiteral() != null) {
+            if (ASTUtils.toBoolean(value)) {
+                return options;
+            } else {
+                return null;
+            }
+        } else {
+            for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+                TracingOption option =
+                    (TracingOption) DictionaryType.TRACING_DICT.forName(entry.getName());
+                switch (option) {
+                case TRACE_FILE_NAME:
+                    options.traceFileName = ASTUtils.elementToSingleString(entry.getValue());
+                    break;
+                default:
+                    break;
+                }
+            }
+            return options;
+        }
+    }
+
+    @Override
+    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+        if (pair != null && this.parse(pair.getValue()) != null) {
+            // If tracing is anything but "false" and threading is off, error.
+            var threading = TargetProperty.getKeyValuePair(ast, TargetProperty.THREADING);
+            if (threading != null) {
+                if (!ASTUtils.toBoolean(threading.getValue())) {
+                    reporter.error(
+                        "Cannot enable tracing because threading support is disabled",
+                        pair,
+                        Literals.KEY_VALUE_PAIR__NAME);
+                    reporter.error(
+                        "Cannot disable treading support because tracing is enabled",
+                        threading,
+                        Literals.KEY_VALUE_PAIR__NAME);
+                }
+            }
+        }
+    }
+
+    @Override
+    public Element getPropertyElement(TargetConfig config) {
+        if (config.tracing == null) {
+            return null;
+        } else if (config.tracing.equals(new TracingOptions())) {
+            // default values
+            return ASTUtils.toElement(true);
+        } else {
+            Element e = LfFactory.eINSTANCE.createElement();
+            KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+            for (TracingOption opt : TracingOption.values()) {
+                KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+                pair.setName(opt.toString());
+                switch (opt) {
+                case TRACE_FILE_NAME:
+                    if (config.tracing.traceFileName == null) {
+                        continue;
+                    }
+                    pair.setValue(ASTUtils.toElement(config.tracing.traceFileName));
+                }
+                kvp.getPairs().add(pair);
+            }
+            e.setKeyvalue(kvp);
+            if (kvp.getPairs().isEmpty()) {
+                return null;
+            }
+            return e;
+        }
+    }
+
+    /**
+     * Tracing options.
+     *
+     * @author Edward A. Lee
+     */
+    public enum TracingOption implements DictionaryElement {
+        TRACE_FILE_NAME("trace-file-name", PrimitiveType.STRING);
+
+        public final PrimitiveType type;
+
+        private final String description;
+
+        private TracingOption(String alias, PrimitiveType type) {
+            this.description = alias;
+            this.type = type;
+        }
+
+        /** Return the description of this dictionary element. */
+        @Override
+        public String toString() {
+            return this.description;
+        }
+
+        /** Return the type associated with this dictionary element. */
+        public TargetPropertyType getType() {
+            return this.type;
+        }
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/property/BuildConfig.java b/core/src/main/java/org/lflang/target/property/BuildConfig.java
new file mode 100644
index 0000000000..e9af8402c9
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/BuildConfig.java
@@ -0,0 +1,32 @@
+package org.lflang.target.property;
+
+public class BuildConfig {
+
+    /**
+     * Enumeration of Cmake build types. These are also mapped to Cargo profiles for the Rust target
+     * (see {@link org.lflang.generator.rust.RustTargetConfig})
+     *
+     * @author Christian Menard
+     */
+    public enum BuildType {
+        RELEASE("Release"),
+        DEBUG("Debug"),
+        TEST("Test"),
+        REL_WITH_DEB_INFO("RelWithDebInfo"),
+        MIN_SIZE_REL("MinSizeRel");
+
+        /** Alias used in toString method. */
+        private final String alias;
+
+        /** Private constructor for Cmake build types. */
+        BuildType(String alias) {
+            this.alias = alias;
+        }
+
+        /** Return the alias. */
+        @Override
+        public String toString() {
+            return this.alias;
+        }
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/property/type/ArrayType.java b/core/src/main/java/org/lflang/target/property/type/ArrayType.java
new file mode 100644
index 0000000000..8b6621535a
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/type/ArrayType.java
@@ -0,0 +1,61 @@
+package org.lflang.target.property.type;
+
+import java.util.List;
+
+import org.lflang.lf.Array;
+import org.lflang.lf.Element;
+import org.lflang.validation.LFValidator;
+
+/**
+ * An array type of which the elements confirm to a given type.
+ *
+ * @author Marten Lohstroh
+ */
+public enum ArrayType implements TargetPropertyType {
+    STRING_ARRAY(PrimitiveType.STRING),
+    FILE_ARRAY(PrimitiveType.FILE);
+
+    /** Type parameter of this array type. */
+    public TargetPropertyType type;
+
+    /**
+     * Private constructor to create a new array type.
+     *
+     * @param type The type of elements in the array.
+     */
+    private ArrayType(TargetPropertyType type) {
+        this.type = type;
+    }
+
+    /**
+     * Check that the passed in element represents an array and ensure that its elements are all of
+     * the correct type.
+     */
+    @Override
+    public void check(Element e, String name, LFValidator v) {
+        Array array = e.getArray();
+        if (array == null) {
+            TargetPropertyType.produceError(name, this.toString(), v);
+        } else {
+            List<Element> elements = array.getElements();
+            for (int i = 0; i < elements.size(); i++) {
+                this.type.check(elements.get(i), name + "[" + i + "]", v);
+            }
+        }
+    }
+
+    /** Return true of the given element is an array. */
+    @Override
+    public boolean validate(Element e) {
+        if (e.getArray() != null) {
+            return true;
+        }
+        return false;
+    }
+
+    /** Return a human-readable description of this type. */
+    @Override
+    public String toString() {
+        return "an array of which each element is " + this.type.toString();
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/lflang/target/property/type/DictionaryType.java b/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
new file mode 100644
index 0000000000..e26d2ba122
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
@@ -0,0 +1,95 @@
+package org.lflang.target.property.type;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.lflang.Target;
+import org.lflang.TargetProperty.DictionaryElement;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.KeyValuePairs;
+import org.lflang.target.ClockSyncConfigurator.ClockSyncOption;
+import org.lflang.target.CoordinationConfig.CoordinationOption;
+import org.lflang.target.DockerConfig.DockerOption;
+import org.lflang.target.PlatformConfigurator.PlatformOption;
+import org.lflang.target.TracingConfigurator.TracingOption;
+import org.lflang.validation.LFValidator;
+
+/**
+ * A dictionary type with a predefined set of possible keys and assignable types.
+ *
+ * @author Marten Lohstroh
+ */
+public enum DictionaryType implements TargetPropertyType {
+    CLOCK_SYNC_OPTION_DICT(Arrays.asList(ClockSyncOption.values())),
+    DOCKER_DICT(Arrays.asList(DockerOption.values())),
+    PLATFORM_DICT(Arrays.asList(PlatformOption.values())),
+    COORDINATION_OPTION_DICT(Arrays.asList(CoordinationOption.values())),
+    TRACING_DICT(Arrays.asList(TracingOption.values()));
+
+    /** The keys and assignable types that are allowed in this dictionary. */
+    public List<DictionaryElement> options;
+
+    /**
+     * A dictionary type restricted to sets of predefined keys and types of values.
+     *
+     * @param options The dictionary elements allowed by this type.
+     */
+    private DictionaryType(List<DictionaryElement> options) {
+        this.options = options;
+    }
+
+    /**
+     * Return the dictionary element of which the key matches the given string.
+     *
+     * @param name The string to match against.
+     * @return The matching dictionary element (or null if there is none).
+     */
+    public DictionaryElement forName(String name) {
+        return Target.match(name, options);
+    }
+
+    /** Recursively check that the passed in element conforms to the rules of this dictionary. */
+    @Override
+    public void check(Element e, String name, LFValidator v) {
+        KeyValuePairs kv = e.getKeyvalue();
+        if (kv == null) {
+            TargetPropertyType.produceError(name, this.toString(), v);
+        } else {
+            for (KeyValuePair pair : kv.getPairs()) {
+                String key = pair.getName();
+                Element val = pair.getValue();
+                Optional<DictionaryElement> match =
+                    this.options.stream()
+                        .filter(element -> key.equalsIgnoreCase(element.toString()))
+                        .findAny();
+                if (match.isPresent()) {
+                    // Make sure the type is correct, too.
+                    TargetPropertyType type = match.get().getType();
+                    type.check(val, name + "." + key, v);
+                } else {
+                    // No match found; report error.
+                    TargetPropertyType.produceError(name, this.toString(), v);
+                }
+            }
+        }
+    }
+
+    /** Return true if the given element represents a dictionary, false otherwise. */
+    @Override
+    public boolean validate(Element e) {
+        if (e.getKeyvalue() != null) {
+            return true;
+        }
+        return false;
+    }
+
+    /** Return a human-readable description of this type. */
+    @Override
+    public String toString() {
+        return "a dictionary with one or more of the following keys: "
+            + options.stream().map(option -> option.toString()).collect(Collectors.joining(", "));
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/lflang/target/property/type/PrimitiveType.java b/core/src/main/java/org/lflang/target/property/type/PrimitiveType.java
new file mode 100644
index 0000000000..0e3a6a5be3
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/type/PrimitiveType.java
@@ -0,0 +1,114 @@
+package org.lflang.target.property.type;
+
+import java.util.function.Predicate;
+
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.validation.LFValidator;
+
+/**
+ * Primitive types for target properties, each with a description used in error messages and
+ * predicate used for validating values.
+ *
+ * @author Marten Lohstroh
+ */
+public enum PrimitiveType implements TargetPropertyType {
+    BOOLEAN(
+        "'true' or 'false'",
+        v ->
+            ASTUtils.elementToSingleString(v).equalsIgnoreCase("true")
+                || ASTUtils.elementToSingleString(v).equalsIgnoreCase("false")),
+    INTEGER(
+        "an integer",
+        v -> {
+            try {
+                Integer.parseInt(ASTUtils.elementToSingleString(v));
+            } catch (NumberFormatException e) {
+                return false;
+            }
+            return true;
+        }),
+    NON_NEGATIVE_INTEGER(
+        "a non-negative integer",
+        v -> {
+            try {
+                int result = Integer.parseInt(ASTUtils.elementToSingleString(v));
+                if (result < 0) return false;
+            } catch (NumberFormatException e) {
+                return false;
+            }
+            return true;
+        }),
+    TIME_VALUE(
+        "a time value with units",
+        v ->
+            v.getKeyvalue() == null
+                && v.getArray() == null
+                && v.getLiteral() == null
+                && v.getId() == null
+                && (v.getTime() == 0 || v.getUnit() != null)),
+    STRING(
+        "a string",
+        v -> v.getLiteral() != null && !isCharLiteral(v.getLiteral()) || v.getId() != null),
+    FILE("a path to a file", STRING.validator);
+
+    /** A description of this type, featured in error messages. */
+    private final String description;
+
+    /** A predicate for determining whether a given Element conforms to this type. */
+    public final Predicate<Element> validator;
+
+    /**
+     * Private constructor to create a new primitive type.
+     *
+     * @param description A textual description of the type that should start with "a/an".
+     * @param validator A predicate that returns true if a given Element conforms to this type.
+     */
+    private PrimitiveType(String description, Predicate<Element> validator) {
+        this.description = description;
+        this.validator = validator;
+    }
+
+    /** Return true if the the given Element is a valid instance of this type. */
+    public boolean validate(Element e) {
+        return this.validator.test(e);
+    }
+
+    /**
+     * Check (recursively) the given Element against its associated type(s) and add found problems
+     * to the given list of errors.
+     *
+     * @param e The element to type check.
+     * @param name The name of the target property.
+     * @param v The LFValidator to append errors to.
+     */
+    public void check(Element e, String name, LFValidator v) {
+        if (!this.validate(e)) {
+            TargetPropertyType.produceError(name, this.description, v);
+        }
+        // If this is a file, perform an additional check to make sure
+        // the file actually exists.
+        // FIXME: premature because we first need a mechanism for looking up files!
+        // Looking in the same directory is too restrictive. Disabling this check for now.
+      /*
+      if (this == FILE) {
+          String file = ASTUtils.toSingleString(e);
+
+          if (!FileConfig.fileExists(file, FileConfig.toPath(e.eResource().getURI()).toFile().getParent())) {
+              v.targetPropertyWarnings
+                      .add("Could not find file: '" + file + "'.");
+          }
+      }
+      */
+    }
+
+    /** Return a textual description of this type. */
+    @Override
+    public String toString() {
+        return this.description;
+    }
+
+    private static boolean isCharLiteral(String s) {
+        return s.length() > 2 && '\'' == s.charAt(0) && '\'' == s.charAt(s.length() - 1);
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java b/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java
new file mode 100644
index 0000000000..cec3a7f9df
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java
@@ -0,0 +1,35 @@
+package org.lflang.target.property.type;
+
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.KeyValuePairs;
+import org.lflang.validation.LFValidator;
+
+/** Dictionary type that allows for keys that will be interpreted as strings and string values. */
+public enum StringDictionaryType implements TargetPropertyType {
+    COMPILE_DEFINITION();
+
+    @Override
+    public boolean validate(Element e) {
+        if (e.getKeyvalue() != null) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void check(Element e, String name, LFValidator v) {
+        KeyValuePairs kv = e.getKeyvalue();
+        if (kv == null) {
+            TargetPropertyType.produceError(name, this.toString(), v);
+        } else {
+            for (KeyValuePair pair : kv.getPairs()) {
+                String key = pair.getName();
+                Element val = pair.getValue();
+
+                // Make sure the type is string
+                PrimitiveType.STRING.check(val, name + "." + key, v);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java b/core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java
new file mode 100644
index 0000000000..390d4aa1e7
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java
@@ -0,0 +1,48 @@
+package org.lflang.target.property.type;
+
+import java.util.function.Predicate;
+
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.validation.LFValidator;
+
+/**
+ * An interface for types associated with target properties.
+ *
+ * @author Marten Lohstroh
+ */
+public interface TargetPropertyType {
+
+    /**
+     * Return true if the the given Element is a valid instance of this type.
+     *
+     * @param e The Element to validate.
+     * @return True if the element conforms to this type, false otherwise.
+     */
+    public boolean validate(Element e);
+
+    /**
+     * Check (recursively) the given Element against its associated type(s) and add found problems
+     * to the given list of errors.
+     *
+     * @param e The Element to type check.
+     * @param name The name of the target property.
+     * @param v A reference to the validator to report errors to.
+     */
+    public void check(Element e, String name, LFValidator v);
+
+    /**
+     * Helper function to produce an error during type checking.
+     *
+     * @param name The description of the target property.
+     * @param description The description of the type.
+     * @param v A reference to the validator to report errors to.
+     */
+    public static void produceError(String name, String description, LFValidator v) {
+
+        v.reportTargetPropertyError(
+            "Target property '" + name + "' is required to be " + description + ".");
+    }
+}
+
+
diff --git a/core/src/main/java/org/lflang/target/property/type/UnionType.java b/core/src/main/java/org/lflang/target/property/type/UnionType.java
new file mode 100644
index 0000000000..51ef4debb4
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/type/UnionType.java
@@ -0,0 +1,137 @@
+package org.lflang.target.property.type;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.lflang.Target;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.target.ClockSyncConfigurator.ClockSyncMode;
+import org.lflang.target.CoordinationConfig.CoordinationType;
+import org.lflang.target.LoggingConfigurator.LogLevel;
+import org.lflang.target.PlatformConfigurator.Platform;
+import org.lflang.target.SchedulerConfigurator.SchedulerOption;
+import org.lflang.target.property.BuildConfig.BuildType;
+import org.lflang.validation.LFValidator;
+
+/**
+ * A type that can assume one of several types.
+ *
+ * @author Marten Lohstroh
+ */
+public enum UnionType implements TargetPropertyType {
+    STRING_OR_STRING_ARRAY(Arrays.asList(PrimitiveType.STRING, ArrayType.STRING_ARRAY), null),
+    PLATFORM_STRING_OR_DICTIONARY(
+        Arrays.asList(PrimitiveType.STRING, DictionaryType.PLATFORM_DICT), null),
+    FILE_OR_FILE_ARRAY(Arrays.asList(PrimitiveType.FILE, ArrayType.FILE_ARRAY), null),
+    BUILD_TYPE_UNION(Arrays.asList(BuildType.values()), null),
+    COORDINATION_UNION(Arrays.asList(CoordinationType.values()), CoordinationType.CENTRALIZED),
+    SCHEDULER_UNION(Arrays.asList(SchedulerOption.values()), SchedulerOption.getDefault()),
+    LOGGING_UNION(Arrays.asList(LogLevel.values()), LogLevel.INFO),
+    PLATFORM_UNION(Arrays.asList(Platform.values()), Platform.AUTO),
+    CLOCK_SYNC_UNION(Arrays.asList(ClockSyncMode.values()), ClockSyncMode.INIT),
+    DOCKER_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.DOCKER_DICT), null),
+    TRACING_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.TRACING_DICT), null);
+
+    /** The constituents of this type union. */
+    public final List<Enum<?>> options;
+
+    /** The default type, if there is one. */
+    private final Enum<?> defaultOption;
+
+    /**
+     * Private constructor for creating unions types.
+     *
+     * @param options The types that that are part of the union.
+     * @param defaultOption The default type.
+     */
+    private UnionType(List<Enum<?>> options, Enum<?> defaultOption) {
+        this.options = options;
+        this.defaultOption = defaultOption;
+    }
+
+    /**
+     * Return the type among those in this type union that matches the given name.
+     *
+     * @param name The string to match against.
+     * @return The matching dictionary element (or null if there is none).
+     */
+    public Enum<?> forName(String name) {
+        return Target.match(name, options);
+    }
+
+    /** Recursively check that the passed in element conforms to the rules of this union. */
+    @Override
+    public void check(Element e, String name, LFValidator v) {
+        Optional<Enum<?>> match = this.match(e);
+        if (match.isPresent()) {
+            // Go deeper if the element is an array or dictionary.
+            Enum<?> type = match.get();
+            if (type instanceof DictionaryType) {
+                ((DictionaryType) type).check(e, name, v);
+            } else if (type instanceof ArrayType) {
+                ((ArrayType) type).check(e, name, v);
+            } else if (type instanceof PrimitiveType) {
+                ((PrimitiveType) type).check(e, name, v);
+            } else if (!(type instanceof Enum<?>)) {
+                throw new RuntimeException("Encountered an unknown type.");
+            }
+        } else {
+            // No match found; report error.
+            TargetPropertyType.produceError(name, this.toString(), v);
+        }
+    }
+
+    /**
+     * Internal method for matching a given element against the allowable types.
+     *
+     * @param e AST node that represents the value of a target property.
+     * @return The matching type wrapped in an Optional object.
+     */
+    private Optional<Enum<?>> match(Element e) {
+        return this.options.stream()
+            .filter(
+                option -> {
+                    if (option instanceof TargetPropertyType) {
+                        return ((TargetPropertyType) option).validate(e);
+                    } else {
+                        return ASTUtils.elementToSingleString(e).equalsIgnoreCase(option.toString());
+                    }
+                })
+            .findAny();
+    }
+
+    /**
+     * Return true if this union has an option that matches the given element.
+     *
+     * @param e The element to match against this type.
+     */
+    @Override
+    public boolean validate(Element e) {
+        if (this.match(e).isPresent()) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Return a human-readable description of this type. If three is a default option, then indicate
+     * it.
+     */
+    @Override
+    public String toString() {
+        return "one of the following: "
+            + options.stream()
+            .map(
+                option -> {
+                    if (option == this.defaultOption) {
+                        return option.toString() + " (default)";
+                    } else {
+                        return option.toString();
+                    }
+                })
+            .collect(Collectors.joining(", "));
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 7dcf00d107..dddb837917 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -59,8 +59,8 @@
 import org.lflang.InferredType;
 import org.lflang.ModelInfo;
 import org.lflang.Target;
+import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
-import org.lflang.TargetProperty.Platform;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.serialization.SupportedSerializers;
@@ -132,6 +132,8 @@
  */
 public class LFValidator extends BaseLFValidator {
 
+  private TargetConfig targetConfig;
+
   // The methods annotated with @Check are automatically invoked on AST nodes matching the types of
   // their arguments. CheckType.FAST ensures that these checks run whenever a file is modified;
   // when CheckType.NORMAL is used, the check is run upon saving.
@@ -1100,12 +1102,14 @@ public void checkTargetDecl(TargetDecl target) throws IOException {
     if (targetOpt.isEmpty()) {
       error("Unrecognized target: " + target.getName(), Literals.TARGET_DECL__NAME);
     } else {
-      this.target = targetOpt.get();
+      this.target = targetOpt.get(); // FIXME: remove
+      this.targetConfig = new TargetConfig(target);
     }
     String lfFileName = FileUtil.nameWithoutExtension(target.eResource());
     if (Character.isDigit(lfFileName.charAt(0))) {
       errorReporter.nowhere().error("LF file names must not start with a number");
     }
+
   }
 
   /**
@@ -1115,12 +1119,20 @@ public void checkTargetDecl(TargetDecl target) throws IOException {
    */
   @Check(CheckType.NORMAL)
   public void checkTargetProperties(KeyValuePairs targetProperties) {
-    validateFastTargetProperty(targetProperties);
-    validateClockSyncTargetProperties(targetProperties);
-    validateSchedulerTargetProperties(targetProperties);
-    validateRos2TargetProperties(targetProperties);
-    validateKeepalive(targetProperties);
-    validateThreading(targetProperties);
+    Arrays.stream(TargetProperty.values()).forEach(p -> {
+      p.validate(targetProperties, this.info.model, this.targetConfig,
+          new ValidationReporter() {
+            @Override
+            public void error(String message, EObject source, EStructuralFeature feature) {
+              error(message, source, feature);
+            }
+
+            @Override
+            public void warning(String message, EObject source, EStructuralFeature feature) {
+              warning(message, source, feature);
+            }
+          });
+    });
   }
 
   private KeyValuePair getKeyValuePair(KeyValuePairs targetProperties, TargetProperty property) {
@@ -1132,162 +1144,6 @@ private KeyValuePair getKeyValuePair(KeyValuePairs targetProperties, TargetPrope
     return properties.size() > 0 ? properties.get(0) : null;
   }
 
-  private void validateFastTargetProperty(KeyValuePairs targetProperties) {
-    KeyValuePair fastTargetProperty = getKeyValuePair(targetProperties, TargetProperty.FAST);
-
-    if (fastTargetProperty != null) {
-      // Check for federated
-      for (Reactor reactor : info.model.getReactors()) {
-        // Check to see if the program has a federated reactor
-        if (reactor.isFederated()) {
-          error(
-              "The fast target property is incompatible with federated programs.",
-              fastTargetProperty,
-              Literals.KEY_VALUE_PAIR__NAME);
-          break;
-        }
-      }
-
-      // Check for physical actions
-      for (Reactor reactor : info.model.getReactors()) {
-        // Check to see if the program has a physical action in a reactor
-        for (Action action : reactor.getActions()) {
-          if (action.getOrigin().equals(ActionOrigin.PHYSICAL)) {
-            error(
-                "The fast target property is incompatible with physical actions.",
-                fastTargetProperty,
-                Literals.KEY_VALUE_PAIR__NAME);
-            break;
-          }
-        }
-      }
-    }
-  }
-
-  private void validateClockSyncTargetProperties(KeyValuePairs targetProperties) {
-    KeyValuePair clockSyncTargetProperty =
-        getKeyValuePair(targetProperties, TargetProperty.CLOCK_SYNC);
-
-    if (clockSyncTargetProperty != null) {
-      boolean federatedExists = false;
-      for (Reactor reactor : info.model.getReactors()) {
-        if (reactor.isFederated()) {
-          federatedExists = true;
-        }
-      }
-      if (!federatedExists) {
-        warning(
-            "The clock-sync target property is incompatible with non-federated programs.",
-            clockSyncTargetProperty,
-            Literals.KEY_VALUE_PAIR__NAME);
-      }
-    }
-  }
-
-  private void validateSchedulerTargetProperties(KeyValuePairs targetProperties) {
-    KeyValuePair schedulerTargetProperty =
-        getKeyValuePair(targetProperties, TargetProperty.SCHEDULER);
-    if (schedulerTargetProperty != null) {
-      String schedulerName = ASTUtils.elementToSingleString(schedulerTargetProperty.getValue());
-      try {
-        if (!TargetProperty.SchedulerOption.valueOf(schedulerName).prioritizesDeadline()) {
-          // Check if a deadline is assigned to any reaction
-          // Filter reactors that contain at least one reaction that
-          // has a deadline handler.
-          if (info.model.getReactors().stream()
-              .anyMatch(
-                  // Filter reactors that contain at least one reaction that
-                  // has a deadline handler.
-                  reactor ->
-                      ASTUtils.allReactions(reactor).stream()
-                          .anyMatch(reaction -> reaction.getDeadline() != null))) {
-            warning(
-                "This program contains deadlines, but the chosen "
-                    + schedulerName
-                    + " scheduler does not prioritize reaction execution "
-                    + "based on deadlines. This might result in a sub-optimal "
-                    + "scheduling.",
-                schedulerTargetProperty,
-                Literals.KEY_VALUE_PAIR__VALUE);
-          }
-        }
-      } catch (IllegalArgumentException e) {
-        // the given scheduler is invalid, but this is already checked by
-        // checkTargetProperties
-      }
-    }
-  }
-
-  private void validateKeepalive(KeyValuePairs targetProperties) {
-    KeyValuePair keepalive = getKeyValuePair(targetProperties, TargetProperty.KEEPALIVE);
-    if (keepalive != null && target == Target.CPP) {
-      warning(
-          "The keepalive property is inferred automatically by the C++ "
-              + "runtime and the value given here is ignored",
-          keepalive,
-          Literals.KEY_VALUE_PAIR__NAME);
-    }
-  }
-
-  private void validateThreading(KeyValuePairs targetProperties) {
-    var threadingP = getKeyValuePair(targetProperties, TargetProperty.THREADING);
-    var tracingP = getKeyValuePair(targetProperties, TargetProperty.TRACING);
-    var platformP = getKeyValuePair(targetProperties, TargetProperty.PLATFORM);
-    if (threadingP != null) {
-      if (tracingP != null) {
-        if (!ASTUtils.toBoolean(threadingP.getValue())
-            && !tracingP.getValue().toString().equalsIgnoreCase("false")) {
-          error(
-              "Cannot disable treading support because tracing is enabled",
-              threadingP,
-              Literals.KEY_VALUE_PAIR__NAME);
-          error(
-              "Cannot enable tracing because threading support is disabled",
-              tracingP,
-              Literals.KEY_VALUE_PAIR__NAME);
-        }
-      }
-      if (platformP != null && ASTUtils.toBoolean(threadingP.getValue())) {
-        var lit = ASTUtils.elementToSingleString(platformP.getValue());
-        var dic = platformP.getValue().getKeyvalue();
-        if (lit != null && lit.equalsIgnoreCase(Platform.RP2040.toString())) {
-          error(
-              "Platform " + Platform.RP2040 + " does not support threading",
-              platformP,
-              Literals.KEY_VALUE_PAIR__VALUE);
-        }
-        if (dic != null) {
-          var rp =
-              dic.getPairs().stream()
-                  .filter(
-                      kv ->
-                          kv.getName().equalsIgnoreCase("name")
-                              && ASTUtils.elementToSingleString(kv.getValue())
-                                  .equalsIgnoreCase(Platform.RP2040.toString()))
-                  .findFirst();
-          if (rp.isPresent()) {
-            error(
-                "Platform " + Platform.RP2040 + " does not support threading",
-                rp.get(),
-                Literals.KEY_VALUE_PAIR__VALUE);
-          }
-        }
-      }
-    }
-  }
-
-  private void validateRos2TargetProperties(KeyValuePairs targetProperties) {
-    KeyValuePair ros2 = getKeyValuePair(targetProperties, TargetProperty.ROS2);
-    KeyValuePair ros2Dependencies =
-        getKeyValuePair(targetProperties, TargetProperty.ROS2_DEPENDENCIES);
-    if (ros2Dependencies != null && (ros2 == null || !ASTUtils.toBoolean(ros2.getValue()))) {
-      warning(
-          "Ignoring ros2-dependencies as ros2 compilation is disabled",
-          ros2Dependencies,
-          Literals.KEY_VALUE_PAIR__NAME);
-    }
-  }
-
   @Check(CheckType.FAST)
   public void checkTimer(Timer timer) {
     checkName(timer.getName(), Literals.VARIABLE__NAME);
diff --git a/core/src/main/java/org/lflang/validation/ValidationReporter.java b/core/src/main/java/org/lflang/validation/ValidationReporter.java
new file mode 100644
index 0000000000..ddd25754e3
--- /dev/null
+++ b/core/src/main/java/org/lflang/validation/ValidationReporter.java
@@ -0,0 +1,10 @@
+package org.lflang.validation;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+public interface ValidationReporter {
+    void error(String message, EObject source, EStructuralFeature feature);
+
+    void warning(String message, EObject source, EStructuralFeature feature);
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 347bf8c78d..628d8cef4b 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -46,17 +46,17 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.lflang.Target;
 import org.lflang.TargetProperty;
-import org.lflang.TargetProperty.ArrayType;
+import org.lflang.target.property.type.ArrayType;
 import org.lflang.TargetProperty.DictionaryElement;
-import org.lflang.TargetProperty.DictionaryType;
-import org.lflang.TargetProperty.PrimitiveType;
-import org.lflang.TargetProperty.StringDictionaryType;
-import org.lflang.TargetProperty.TargetPropertyType;
-import org.lflang.TargetProperty.UnionType;
 import org.lflang.TimeValue;
 import org.lflang.lf.LfPackage;
 import org.lflang.lf.Model;
 import org.lflang.lf.Visibility;
+import org.lflang.target.property.type.DictionaryType;
+import org.lflang.target.property.type.StringDictionaryType;
+import org.lflang.target.property.type.TargetPropertyType;
+import org.lflang.target.property.type.PrimitiveType;
+import org.lflang.target.property.type.UnionType;
 import org.lflang.tests.LFInjectorProvider;
 import org.lflang.util.StringUtil;
 
diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index 4191687278..12e83dadac 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -25,8 +25,8 @@
 package org.lflang.tests;
 
 import org.lflang.TargetProperty;
-import org.lflang.TargetProperty.LogLevel;
-import org.lflang.TargetProperty.Platform;
+import org.lflang.target.LoggingConfigurator.LogLevel;
+import org.lflang.target.PlatformConfigurator.Platform;
 import org.lflang.tests.TestRegistry.TestCategory;
 
 /**

From 3edc610040b396e0b44c95605b22fdd4479fb3dc Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 31 Aug 2023 23:05:29 -0700
Subject: [PATCH 0795/1114] Update reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 4e47b354bc..09b75edfdb 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 4e47b354bce833034faaad0567a65d5b60e60ccc
+Subproject commit 09b75edfdbfcd0206a89199fcb65b1678398a0c7

From 4997ead45327df2148038ef9168842032be2a1f3 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 31 Aug 2023 23:59:28 -0700
Subject: [PATCH 0796/1114] Let the context be equal to the directory of the
 container

---
 core/src/main/java/org/lflang/generator/DockerGenerator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/DockerGenerator.java b/core/src/main/java/org/lflang/generator/DockerGenerator.java
index d7d842d15e..4148eb42d1 100644
--- a/core/src/main/java/org/lflang/generator/DockerGenerator.java
+++ b/core/src/main/java/org/lflang/generator/DockerGenerator.java
@@ -38,7 +38,7 @@ public DockerData generateDockerData() {
     var dockerFilePath = context.getFileConfig().getSrcGenPath().resolve("Dockerfile");
     var dockerFileContent = generateDockerFileContent();
 
-    return new DockerData(name.replace("_", ""), dockerFilePath, dockerFileContent, context);
+    return new DockerData(name, dockerFilePath, dockerFileContent, context);
   }
 
   public static DockerGenerator dockerGeneratorFactory(LFGeneratorContext context) {

From 18abbab2db12cecafc0439814fba2cf2ffa424a1 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Fri, 1 Sep 2023 10:54:08 -0400
Subject: [PATCH 0797/1114] Test lf_set_array

---
 test/C/src/ArraySet.lf | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 test/C/src/ArraySet.lf

diff --git a/test/C/src/ArraySet.lf b/test/C/src/ArraySet.lf
new file mode 100644
index 0000000000..c35bbb9750
--- /dev/null
+++ b/test/C/src/ArraySet.lf
@@ -0,0 +1,38 @@
+target C
+
+reactor Source {
+  output out: int[]
+
+  reaction(startup) -> out {=
+    // Dynamically allocate an output array of length 3.
+    int* array = (int*)malloc(3 * sizeof(int));
+    // Populate the array.
+    array[0] = 0;
+    array[1] = 1;
+    array[2] = 2;
+    // Set the output, specifying the array length.
+    lf_set_array(out, array, 3);
+  =}
+}
+
+reactor Print {
+  input in: int[]
+
+  reaction(in) {=
+    printf("Received: [");
+    for (int i = 0; i < in->length; i++) {
+      if (i > 0) printf(", ");
+      printf("%d", in->value[i]);
+      if (in->value[i] != i) {
+        lf_print_error_and_exit("Expected %d.", i);
+      }
+    }
+    printf("]\n");
+  =}
+}
+
+main reactor {
+  s = new Source()
+  p = new Print()
+  s.out -> p.in
+}

From 8119a55a6c06fdf4470e8acae8838c2b66b58d4e Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Fri, 1 Sep 2023 11:24:41 -0400
Subject: [PATCH 0798/1114] Added test of persistent input to match docs

---
 test/C/src/PersistentInputs.lf | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 test/C/src/PersistentInputs.lf

diff --git a/test/C/src/PersistentInputs.lf b/test/C/src/PersistentInputs.lf
new file mode 100644
index 0000000000..55aa74540d
--- /dev/null
+++ b/test/C/src/PersistentInputs.lf
@@ -0,0 +1,33 @@
+target C {
+  timeout: 400 ms,
+  fast: true
+}
+reactor Source {
+  output out: int
+  timer t(100 ms, 200 ms)
+  state count: int = 1
+  reaction(t) -> out {=
+    lf_set(out, self->count++);
+  =}
+}
+reactor Sink {
+  input in: int
+  timer t(0, 100 ms)
+  // For testing, emulate the count variable of Source.
+  state count: int = 0
+  timer t2(100 ms, 200 ms)
+  reaction(t2) {=
+    self->count++;
+  =}
+  reaction(t) in {=
+    printf("Value of the input is %d at time %lld\n", in->value, lf_time_logical_elapsed());
+    if (in->value != self->count) {
+      lf_print_error_and_exit("Expected %d.", self->count);
+    }
+  =}
+}
+main reactor {
+  source = new Source()
+  sink = new Sink()
+  source.out -> sink.in
+}
\ No newline at end of file

From 5ee6fec21557ccc2303a2d458091085ca5370f4d Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Fri, 1 Sep 2023 12:32:37 -0400
Subject: [PATCH 0799/1114] Formated

---
 test/C/src/PersistentInputs.lf | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/test/C/src/PersistentInputs.lf b/test/C/src/PersistentInputs.lf
index 55aa74540d..8ff14e41b2 100644
--- a/test/C/src/PersistentInputs.lf
+++ b/test/C/src/PersistentInputs.lf
@@ -2,23 +2,23 @@ target C {
   timeout: 400 ms,
   fast: true
 }
+
 reactor Source {
   output out: int
   timer t(100 ms, 200 ms)
   state count: int = 1
-  reaction(t) -> out {=
-    lf_set(out, self->count++);
-  =}
+
+  reaction(t) -> out {= lf_set(out, self->count++); =}
 }
+
 reactor Sink {
   input in: int
   timer t(0, 100 ms)
-  // For testing, emulate the count variable of Source.
-  state count: int = 0
+  state count: int = 0  // For testing, emulate the count variable of Source.
   timer t2(100 ms, 200 ms)
-  reaction(t2) {=
-    self->count++;
-  =}
+
+  reaction(t2) {= self->count++; =}
+
   reaction(t) in {=
     printf("Value of the input is %d at time %lld\n", in->value, lf_time_logical_elapsed());
     if (in->value != self->count) {
@@ -26,8 +26,9 @@ reactor Sink {
     }
   =}
 }
+
 main reactor {
   source = new Source()
   sink = new Sink()
   source.out -> sink.in
-}
\ No newline at end of file
+}

From 3912e812bf0ce896cb822458d3938566b619356a Mon Sep 17 00:00:00 2001
From: "lingua-franca[bot]" <97201490+francabot@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:58:58 +0000
Subject: [PATCH 0800/1114] Bump version to 0.5.1-SNAPSHOT

---
 core/src/main/resources/org/lflang/StringsBundle.properties | 2 +-
 gradle.properties                                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/resources/org/lflang/StringsBundle.properties b/core/src/main/resources/org/lflang/StringsBundle.properties
index 29b191399c..dc4f99684f 100644
--- a/core/src/main/resources/org/lflang/StringsBundle.properties
+++ b/core/src/main/resources/org/lflang/StringsBundle.properties
@@ -1 +1 @@
-VERSION = 0.4.1-SNAPSHOT
+VERSION = 0.5.1-SNAPSHOT
diff --git a/gradle.properties b/gradle.properties
index fd082fc31f..245b5cb0ba 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 [header]
 group=org.lflang
-version=0.4.1-SNAPSHOT
+version=0.5.1-SNAPSHOT
 
 [versions]
 antlrVersion=4.7.2

From e9657310fb6a6d41ae018d7a39283204037b2d81 Mon Sep 17 00:00:00 2001
From: "lingua-franca[bot]" <97201490+francabot@users.noreply.github.com>
Date: Fri, 1 Sep 2023 18:32:58 -0700
Subject: [PATCH 0801/1114] Update CHANGELOG.md

---
 CHANGELOG.md | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 240 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fd8bbdb56..c469ed6334 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,244 @@
 # Changelog
+ 
+## [v0.5.0](https://github.com/lf-lang/lingua-franca/tree/v0.5.0) (2023-09-01)
+
+**Highlights**
+
+This release introduces new syntax for initializers, includes a renovation of the C backend to let it generate more modular code, and brings new features like a watchdog construct, support for generics in C, support for SMT-solver-based formal verification using UCLID-5, and bare-iron support for the Raspberry Pi Pico platform.
+
+**🚀 New Features**
+
+- Types allowed in reactor type args [\#1639](https://github.com/lf-lang/lingua-franca/pull/1639) ([@oowekyala](https://github.com/oowekyala))
+- Equals initializer syntax [\#1580](https://github.com/lf-lang/lingua-franca/pull/1580) ([@oowekyala](https://github.com/oowekyala))
+- `--json` and `--json-file` CLI args add to `lfc` [\#1686](https://github.com/lf-lang/lingua-franca/pull/1686) ([@patilatharva](https://github.com/patilatharva))
+- Generated structs exposed in header files, reactions linkable from separate source files, and updated C target preamble visibility [\#1599](https://github.com/lf-lang/lingua-franca/pull/1599) ([@petervdonovan](https://github.com/petervdonovan))
+- Preprocessor definition for `LF_PACKAGE_DIRECTORY` [\#1720](https://github.com/lf-lang/lingua-franca/pull/1720) ([@edwardalee](https://github.com/edwardalee))
+- Enclave connections and enclave coordination in the C++ target [\#1665](https://github.com/lf-lang/lingua-franca/pull/1665) ([@cmnrd](https://github.com/cmnrd))
+- Mechanism for printing execution statistics [\#1743](https://github.com/lf-lang/lingua-franca/pull/1743) ([@cmnrd](https://github.com/cmnrd))
+- Watchdog support for the C target [\#1730](https://github.com/lf-lang/lingua-franca/pull/1730) ([@Benichiwa](https://github.com/Benichiwa))
+- Automatically generated .vscode/settings.json file [\#1759](https://github.com/lf-lang/lingua-franca/pull/1759) ([@edwardalee](https://github.com/edwardalee))
+- C Generics [\#1681](https://github.com/lf-lang/lingua-franca/pull/1681) ([@mkhubaibumer](https://github.com/mkhubaibumer))
+- Generic params allowed as generic arguments in C target [\#1804](https://github.com/lf-lang/lingua-franca/pull/1804) ([@petervdonovan](https://github.com/petervdonovan))
+- New `--check` flag for `lff` [\#1822](https://github.com/lf-lang/lingua-franca/pull/1822) ([@cmnrd](https://github.com/cmnrd))
+- Environments in the C target [\#1772](https://github.com/lf-lang/lingua-franca/pull/1772) ([@erlingrj](https://github.com/erlingrj))
+- `lfd` binary for generating diagrams from the command line [\#1713](https://github.com/lf-lang/lingua-franca/pull/1713) ([@cmnrd](https://github.com/cmnrd))
+- `fedsd` utility updated to make the RTI optional and support enclaves visualization  [\#1870](https://github.com/lf-lang/lingua-franca/pull/1870) ([@ChadliaJerad](https://github.com/ChadliaJerad))
+- C math lib always linked for C target [\#1894](https://github.com/lf-lang/lingua-franca/pull/1894) ([@cmnrd](https://github.com/cmnrd))
+- Critical sections enabled outside of the context of a reactor [\#1901](https://github.com/lf-lang/lingua-franca/pull/1901) ([@edwardalee](https://github.com/edwardalee))
+- Uclid5-based LF Verifier [\#1271](https://github.com/lf-lang/lingua-franca/pull/1271) ([@lsk567](https://github.com/lsk567))
+- Python launch scripts [\#1914](https://github.com/lf-lang/lingua-franca/pull/1914) ([@cmnrd](https://github.com/cmnrd))
+- Raspberry Pi Pico target support [\#1831](https://github.com/lf-lang/lingua-franca/pull/1831) ([@gundralaa](https://github.com/gundralaa))
+- Handling cyclic dependencies for TypeScript federated execution [\#1925](https://github.com/lf-lang/lingua-franca/pull/1925) ([@byeong-gil](https://github.com/byeong-gil))
+
+**✨ Enhancements**
+
+- Keeplive natively inferred in the C++ runtime [\#1630](https://github.com/lf-lang/lingua-franca/pull/1630) ([@cmnrd](https://github.com/cmnrd))
+- File access [\#1715](https://github.com/lf-lang/lingua-franca/pull/1715) ([@edwardalee](https://github.com/edwardalee))
+- Validator rules to check if target supports federation or inheritance [\#1726](https://github.com/lf-lang/lingua-franca/pull/1726) ([@cmnrd](https://github.com/cmnrd))
+- No more space inserted after `interleaved` keyword by formatter [\#1846](https://github.com/lf-lang/lingua-franca/pull/1846) ([@cmnrd](https://github.com/cmnrd))
+- More natural syntax for reaction declarations [\#1853](https://github.com/lf-lang/lingua-franca/pull/1853) ([@lhstrh](https://github.com/lhstrh))
+- Fix for extra whitespace around info messages [\#1879](https://github.com/lf-lang/lingua-franca/pull/1879) ([@oowekyala](https://github.com/oowekyala))
+- TypeScript runtime bumped to `v0.5.0` [\#1927](https://github.com/lf-lang/lingua-franca/pull/1927) ([@byeong-gil](https://github.com/byeong-gil))
+- Support for named and bodyless reactions in C++ [\#1933](https://github.com/lf-lang/lingua-franca/pull/1933) ([@cmnrd](https://github.com/cmnrd))
+- Added @layout annotation to add arbitrary layout options an elements [\#1951](https://github.com/lf-lang/lingua-franca/pull/1951) ([@soerendomroes](https://github.com/soerendomroes))
+
+**🔧 Fixes**
+
+- Physical connections implemented as AST transformation  [\#1596](https://github.com/lf-lang/lingua-franca/pull/1596) ([@erlingrj](https://github.com/erlingrj))
+- Fix for language server "Build and Run" command [\#1619](https://github.com/lf-lang/lingua-franca/pull/1619) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix for passing of command line options from lfc to the generator [\#1631](https://github.com/lf-lang/lingua-franca/pull/1631) ([@cmnrd](https://github.com/cmnrd))
+- Fix for validation of target properties [\#1629](https://github.com/lf-lang/lingua-franca/pull/1629) ([@cmnrd](https://github.com/cmnrd))
+- Fix in validation so that warnings are not reported as errors [\#1643](https://github.com/lf-lang/lingua-franca/pull/1643) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix for NPE in lfc error reporting [\#1655](https://github.com/lf-lang/lingua-franca/pull/1655) ([@cmnrd](https://github.com/cmnrd))
+- Upstream connection delays now properly handled in the TypeScript federates [\#1607](https://github.com/lf-lang/lingua-franca/pull/1607) ([@byeong-gil](https://github.com/byeong-gil))
+- Fix for authenticated federation [\#1698](https://github.com/lf-lang/lingua-franca/pull/1698) ([@Jakio815](https://github.com/Jakio815))
+- Bugfixes in handling of `files` target property [\#1725](https://github.com/lf-lang/lingua-franca/pull/1725) ([@lhstrh](https://github.com/lhstrh))
+- Preambles properly inherited from superclasses [\#1732](https://github.com/lf-lang/lingua-franca/pull/1732) ([@edwardalee](https://github.com/edwardalee))
+- Clean `Correspondence` tags out of generated C code [\#1737](https://github.com/lf-lang/lingua-franca/pull/1737) ([@petervdonovan](https://github.com/petervdonovan))
+- Reactor classes in the same file with the same name, up to case differences, are prohibited [\#1741](https://github.com/lf-lang/lingua-franca/pull/1741) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix for ROS serialization [\#1755](https://github.com/lf-lang/lingua-franca/pull/1755) ([@petervdonovan](https://github.com/petervdonovan))
+- Improved line adjustment logic for federated programs [\#1760](https://github.com/lf-lang/lingua-franca/pull/1760) ([@petervdonovan](https://github.com/petervdonovan))
+- Multiple fixes for federated programs with TypeScript target [\#1752](https://github.com/lf-lang/lingua-franca/pull/1752) ([@byeong-gil](https://github.com/byeong-gil))
+- Fix for race condition in `uniqueName` [\#1815](https://github.com/lf-lang/lingua-franca/pull/1815) ([@petervdonovan](https://github.com/petervdonovan))
+- Bugfix in integration tests and fixed ROS2 tests  [\#1841](https://github.com/lf-lang/lingua-franca/pull/1841) ([@cmnrd](https://github.com/cmnrd))
+- Formatter fixes [\#1840](https://github.com/lf-lang/lingua-franca/pull/1840) ([@petervdonovan](https://github.com/petervdonovan))
+- Adjustments for running the LF compiler in Epoch [\#1844](https://github.com/lf-lang/lingua-franca/pull/1844) ([@a-sr](https://github.com/a-sr))
+- More formatter fixes [\#1850](https://github.com/lf-lang/lingua-franca/pull/1850) ([@petervdonovan](https://github.com/petervdonovan))
+- More formatter fixes [\#1851](https://github.com/lf-lang/lingua-franca/pull/1851) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix for naming collision when generic reactor is instantiated with different parameters [\#1864](https://github.com/lf-lang/lingua-franca/pull/1864) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix for inheritance problem exposed in examples [\#1891](https://github.com/lf-lang/lingua-franca/pull/1891) ([@lhstrh](https://github.com/lhstrh))
+- Fix verifier error when there is no main reactor [\#1916](https://github.com/lf-lang/lingua-franca/pull/1916) ([@lsk567](https://github.com/lsk567))
+- No more use of unordered reactions in federated programs; fix for deadlocks in some federated programs [\#1684](https://github.com/lf-lang/lingua-franca/pull/1684) ([@arengarajan99](https://github.com/arengarajan99))
+- Keyword `extends` added to tokens allowed in reaction bodies [\#1926](https://github.com/lf-lang/lingua-franca/pull/1926) ([@lhstrh](https://github.com/lhstrh))
+- Fix for edge case in which comments are dropped [\#1924](https://github.com/lf-lang/lingua-franca/pull/1924) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix for IllegalArgumentException in diagram synthesis [\#1932](https://github.com/lf-lang/lingua-franca/pull/1932) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix for STP violation [\#1935](https://github.com/lf-lang/lingua-franca/pull/1935) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix for after delays that use user-provided declarations [\#1959](https://github.com/lf-lang/lingua-franca/pull/1959) ([@petervdonovan](https://github.com/petervdonovan))
+- Bugfix for when top-level multiport width in federation depends on parameter [\#1956](https://github.com/lf-lang/lingua-franca/pull/1956) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix compilation error in code for reset state variables with time type [\#1964](https://github.com/lf-lang/lingua-franca/pull/1964) ([@a-sr](https://github.com/a-sr))
+- Fixed path issue in generated `docker-compose.yml` for federations [\#1983](https://github.com/lf-lang/lingua-franca/pull/1983) ([@lhstrh](https://github.com/lhstrh))
+
+**🚧 Maintenance and Refactoring**
+
+- Migration of Epoch into separate repository [\#1482](https://github.com/lf-lang/lingua-franca/pull/1482) ([@a-sr](https://github.com/a-sr))
+- Improved CLI argument handling using `picocli` [\#1534](https://github.com/lf-lang/lingua-franca/pull/1534) ([@patilatharva](https://github.com/patilatharva))
+- Compile definitions no longer hardcoded in generated CMakeLists.txt [\#1622](https://github.com/lf-lang/lingua-franca/pull/1622) ([@petervdonovan](https://github.com/petervdonovan))
+- Remove unchecked compilation warnings [\#1638](https://github.com/lf-lang/lingua-franca/pull/1638) ([@oowekyala](https://github.com/oowekyala))
+- Refactoring of part of the federated package [\#1663](https://github.com/lf-lang/lingua-franca/pull/1663) ([@lhstrh](https://github.com/lhstrh))
+- Removal of the use of non-API global variables in tests [\#1696](https://github.com/lf-lang/lingua-franca/pull/1696) ([@edwardalee](https://github.com/edwardalee))
+- Gradle bumped to version 8 [\#1691](https://github.com/lf-lang/lingua-franca/pull/1691) ([@lhstrh](https://github.com/lhstrh))
+- Removal of deprecated `build-lfc` script and `buildLfc` Gradle task [\#1714](https://github.com/lf-lang/lingua-franca/pull/1714) ([@cmnrd](https://github.com/cmnrd))
+- Delete unnecessary complexity from `build-lf-cli` [\#1745](https://github.com/lf-lang/lingua-franca/pull/1745) ([@petervdonovan](https://github.com/petervdonovan))
+- C files for Python support retrieved from reactor-c repo [\#1757](https://github.com/lf-lang/lingua-franca/pull/1757) ([@lhstrh](https://github.com/lhstrh))
+- Google autoformatter applied to all files [\#1766](https://github.com/lf-lang/lingua-franca/pull/1766) ([@lhstrh](https://github.com/lhstrh))
+- Redesign of the repository layout and gradle configuration [\#1779](https://github.com/lf-lang/lingua-franca/pull/1779) ([@cmnrd](https://github.com/cmnrd))
+- Removal of odd mechanism for loading target generators dynamically [\#1813](https://github.com/lf-lang/lingua-franca/pull/1813) ([@cmnrd](https://github.com/cmnrd))
+- Default line length set to 100 for LF files [\#1389](https://github.com/lf-lang/lingua-franca/pull/1389) ([@petervdonovan](https://github.com/petervdonovan))
+- KlighD bumped to `2.3.0` and now retrieved from Maven Central [\#1823](https://github.com/lf-lang/lingua-franca/pull/1823) ([@cmnrd](https://github.com/cmnrd))
+- Refactor error reporter [\#1527](https://github.com/lf-lang/lingua-franca/pull/1527) ([@oowekyala](https://github.com/oowekyala))
+- Unknown port types handled with `unknown` instead of `Present` [\#1857](https://github.com/lf-lang/lingua-franca/pull/1857) ([@lhstrh](https://github.com/lhstrh))
+- TS code generator adjusted to appease `eslint` [\#1878](https://github.com/lf-lang/lingua-franca/pull/1878) ([@lhstrh](https://github.com/lhstrh))
+- Minor fixes for the README in the test directory [\#1903](https://github.com/lf-lang/lingua-franca/pull/1903) ([@lsk567](https://github.com/lsk567))
+- Declarative Port Graph in C++ Runtime [\#1848](https://github.com/lf-lang/lingua-franca/pull/1848) ([@revol-xut](https://github.com/revol-xut))
+- No more use of unordered reactions in federated programs; fix for deadlocks in some federated programs [\#1684](https://github.com/lf-lang/lingua-franca/pull/1684) ([@arengarajan99](https://github.com/arengarajan99))
+- Tracing utils and Zephyr run scripts moved from `util` folder [\#1948](https://github.com/lf-lang/lingua-franca/pull/1948) ([@erlingrj](https://github.com/erlingrj))
+
+**📖 Documentation**
+
+- Documentation about LSP tests in `README.md` [\#1587](https://github.com/lf-lang/lingua-franca/pull/1587) ([@petervdonovan](https://github.com/petervdonovan))
+- Updated README for the federate trace visualizer [\#1735](https://github.com/lf-lang/lingua-franca/pull/1735) ([@ChadliaJerad](https://github.com/ChadliaJerad))
+
+**🧪 Tests**
+
+- TypeScript tests for federates with physical connections [\#1623](https://github.com/lf-lang/lingua-franca/pull/1623) ([@byeong-gil](https://github.com/byeong-gil))
+- Zephyr tests pinned to particular version of docker image [\#1648](https://github.com/lf-lang/lingua-franca/pull/1648) ([@erlingrj](https://github.com/erlingrj))
+- Test for the support of delayed physical connections in the TypeScript target [\#1676](https://github.com/lf-lang/lingua-franca/pull/1676) ([@byeong-gil](https://github.com/byeong-gil))
+- Test for parsing CLI arguments in `lfc` [\#1668](https://github.com/lf-lang/lingua-franca/pull/1668) ([@patilatharva](https://github.com/patilatharva))
+- Zephyr regression tests executed on QEMU [\#1678](https://github.com/lf-lang/lingua-franca/pull/1678) ([@erlingrj](https://github.com/erlingrj))
+- CodeCov reporting for CLI tests [\#1688](https://github.com/lf-lang/lingua-franca/pull/1688) ([@lhstrh](https://github.com/lhstrh))
+- Test to help ensure that level-based scheduling does not cause deadlock [\#1703](https://github.com/lf-lang/lingua-franca/pull/1703) ([@edwardalee](https://github.com/edwardalee))
+- Flaky tests adjusted [\#1764](https://github.com/lf-lang/lingua-franca/pull/1764) ([@edwardalee](https://github.com/edwardalee))
+- `SimpleFederatedAuthenticated.lf` test passing [\#1776](https://github.com/lf-lang/lingua-franca/pull/1776) ([@Jakio815](https://github.com/Jakio815))
+- CI updates [\#1814](https://github.com/lf-lang/lingua-franca/pull/1814) ([@petervdonovan](https://github.com/petervdonovan))
+- Parallel execution of round trip tests [\#1845](https://github.com/lf-lang/lingua-franca/pull/1845) ([@oowekyala](https://github.com/oowekyala))
+- Tests for `lf_request_stop` with enclaves and federates [\#1871](https://github.com/lf-lang/lingua-franca/pull/1871) ([@edwardalee](https://github.com/edwardalee))
+- Fixed code coverage aggregation and reporting [\#1868](https://github.com/lf-lang/lingua-franca/pull/1868) ([@cmnrd](https://github.com/cmnrd))
+- New job for building `epoch` in CI [\#1974](https://github.com/lf-lang/lingua-franca/pull/1974) ([@lhstrh](https://github.com/lhstrh))
+
+**⬆️ Updated Dependencies**
+
+- Update to Zephyr v3.3.0 and SDK v0.16.1 [\#1825](https://github.com/lf-lang/lingua-franca/pull/1825) ([@erlingrj](https://github.com/erlingrj))
+- Reactor-ts bumped to v0.4.0 [\#1749](https://github.com/lf-lang/lingua-franca/pull/1749) ([@lhstrh](https://github.com/lhstrh))
+- Gradle Wrapper bumped to `8.1.1` [\#1890](https://github.com/lf-lang/lingua-franca/pull/1890) ([@lhstrh](https://github.com/lhstrh))
+- Eclipse-related dependencies bumped to latest releases [\#1889](https://github.com/lf-lang/lingua-franca/pull/1889) ([@a-sr](https://github.com/a-sr))
+- TypeScript runtime bumped to `v0.5.0` [\#1927](https://github.com/lf-lang/lingua-franca/pull/1927) ([@byeong-gil](https://github.com/byeong-gil))
+
+
+### Submodule [lf-lang/reactor-c](http://github.com/lf-lang/reactor-c)
+
+**🚀 New Features**
+
+- New tracepoint for deadline misses [\#169](https://github.com/lf-lang/reactor-c/pull/169) ([@erlingrj](https://github.com/erlingrj))
+- Compile definitions for federated programs [\#179](https://github.com/lf-lang/reactor-c/pull/179) ([@petervdonovan](https://github.com/petervdonovan))
+- Tracing federate interactions [\#178](https://github.com/lf-lang/reactor-c/pull/178) ([@edwardalee](https://github.com/edwardalee))
+- CMake definition to find `FEDERATED_AUTHENTICATED` [\#196](https://github.com/lf-lang/reactor-c/pull/196) ([@Jakio815](https://github.com/Jakio815))
+- Memory reporting [\#201](https://github.com/lf-lang/reactor-c/pull/201) ([@edwardalee](https://github.com/edwardalee))
+- Added `LF_PACKAGE_DIRECTORY` [\#204](https://github.com/lf-lang/reactor-c/pull/204) ([@edwardalee](https://github.com/edwardalee))
+- Runtime support for watchdogs [\#177](https://github.com/lf-lang/reactor-c/pull/177) ([@Benichiwa](https://github.com/Benichiwa))
+- Environments [\#212](https://github.com/lf-lang/reactor-c/pull/212) ([@erlingrj](https://github.com/erlingrj))
+- Enclave request stop [\#244](https://github.com/lf-lang/reactor-c/pull/244) ([@edwardalee](https://github.com/edwardalee))
+- Critical sections enabled outside of the context of a reactor [\#249](https://github.com/lf-lang/reactor-c/pull/249) ([@edwardalee](https://github.com/edwardalee))
+- Rp2040 Target Support [\#253](https://github.com/lf-lang/reactor-c/pull/253) ([@gundralaa](https://github.com/gundralaa))
+- Platform support for Raspberry Pi Pico [\#233](https://github.com/lf-lang/reactor-c/pull/233) ([@gundralaa](https://github.com/gundralaa))
+
+**✨ Enhancements**
+
+- Removal of unnecessary TAG messages [\#175](https://github.com/lf-lang/reactor-c/pull/175) ([@byeong-gil](https://github.com/byeong-gil))
+- Cleaner namespace [\#189](https://github.com/lf-lang/reactor-c/pull/189) ([@petervdonovan](https://github.com/petervdonovan))
+- File access and doc fixes [\#198](https://github.com/lf-lang/reactor-c/pull/198) ([@edwardalee](https://github.com/edwardalee))
+- Improvements of support for watchdogs [\#209](https://github.com/lf-lang/reactor-c/pull/209) ([@edwardalee](https://github.com/edwardalee))
+- Switch to more general thread creation in Zephyr support [\#194](https://github.com/lf-lang/reactor-c/pull/194) ([@siljesu](https://github.com/siljesu))
+- Minor improvements to Zephyr platform [\#187](https://github.com/lf-lang/reactor-c/pull/187) ([@erlingrj](https://github.com/erlingrj))
+- Output error when trying to use --auth (-a) for RTI built without -DAUTH=ON [\#222](https://github.com/lf-lang/reactor-c/pull/222) ([@hokeun](https://github.com/hokeun))
+- Change nanosleep to lf_sleep in federate and RTI code [\#219](https://github.com/lf-lang/reactor-c/pull/219) ([@siljesu](https://github.com/siljesu))
+- [C-Generics] Helper Macros [\#190](https://github.com/lf-lang/reactor-c/pull/190) ([@mkhubaibumer](https://github.com/mkhubaibumer))
+- RTI exit while saving the trace file [\#228](https://github.com/lf-lang/reactor-c/pull/228) ([@ChadliaJerad](https://github.com/ChadliaJerad))
+- Less namespace pollution [\#240](https://github.com/lf-lang/reactor-c/pull/240) ([@erlingrj](https://github.com/erlingrj))
+- Enclaves tuning [\#243](https://github.com/lf-lang/reactor-c/pull/243) ([@edwardalee](https://github.com/edwardalee))
+- If clock sync is on, link math [\#252](https://github.com/lf-lang/reactor-c/pull/252) ([@petervdonovan](https://github.com/petervdonovan))
+- No more use of unordered reactions in federated programs [\#191](https://github.com/lf-lang/reactor-c/pull/191) ([@arengarajan99](https://github.com/arengarajan99))
+
+**🔧 Fixes**
+
+- Fix for definition of `LF_TIME_BUFFER_LENGTH` [\#197](https://github.com/lf-lang/reactor-c/pull/197) ([@edwardalee](https://github.com/edwardalee))
+- Scheduler leak fix [\#200](https://github.com/lf-lang/reactor-c/pull/200) ([@edwardalee](https://github.com/edwardalee))
+- Fix for Arduino to avoid duplicate definition of `timespec` [\#195](https://github.com/lf-lang/reactor-c/pull/195) ([@arengarajan99](https://github.com/arengarajan99))
+- Suppression of "no symbols" warnings emitted by ranlib [\#214](https://github.com/lf-lang/reactor-c/pull/214) ([@petervdonovan](https://github.com/petervdonovan))
+- Segfault fix [\#218](https://github.com/lf-lang/reactor-c/pull/218) ([@petervdonovan](https://github.com/petervdonovan))
+- Zephyr fixes on thread creation and deletion [\#223](https://github.com/lf-lang/reactor-c/pull/223) ([@erlingrj](https://github.com/erlingrj))
+- Minor fix of the federate id in the tracepoint [\#245](https://github.com/lf-lang/reactor-c/pull/245) ([@ChadliaJerad](https://github.com/ChadliaJerad))
+- Fix protocol of HMAC authentication to start from federate. [\#231](https://github.com/lf-lang/reactor-c/pull/231) ([@Jakio815](https://github.com/Jakio815))
+- Use of correct federate ID in tracing of absent messages [\#248](https://github.com/lf-lang/reactor-c/pull/248) ([@ChadliaJerad](https://github.com/ChadliaJerad))
+- Memory leak in Python target fixed [\#246](https://github.com/lf-lang/reactor-c/pull/246) ([@jackykwok2024](https://github.com/jackykwok2024))
+- Fix for fatal error raised during shutdown when decrementing a tag barrier that is zero [\#251](https://github.com/lf-lang/reactor-c/pull/251) ([@petervdonovan](https://github.com/petervdonovan))
+- Fix for STP violation [\#257](https://github.com/lf-lang/reactor-c/pull/257) ([@petervdonovan](https://github.com/petervdonovan))
+- Updated Makefile and docs for fedsd utility [\#262](https://github.com/lf-lang/reactor-c/pull/262) ([@ChadliaJerad](https://github.com/ChadliaJerad))
+
+**🚧 Maintenance and Refactoring**
+
+- Functions of rti.c moved to rti_lib.c to enable reuse [\#172](https://github.com/lf-lang/reactor-c/pull/172) ([@Jakio815](https://github.com/Jakio815))
+- Code in `rti.c` made available as library [\#174](https://github.com/lf-lang/reactor-c/pull/174) ([@Jakio815](https://github.com/Jakio815))
+- Documentation and code cleanup [\#193](https://github.com/lf-lang/reactor-c/pull/193) ([@edwardalee](https://github.com/edwardalee))
+- Platform abstraction layer for the RTI [\#213](https://github.com/lf-lang/reactor-c/pull/213) ([@siljesu](https://github.com/siljesu))
+- C files from reactor-c-py moved back into the reactor-c repo [\#217](https://github.com/lf-lang/reactor-c/pull/217) ([@lhstrh](https://github.com/lhstrh))
+- Struct refactoring for actions and ports [\#216](https://github.com/lf-lang/reactor-c/pull/216) ([@edwardalee](https://github.com/edwardalee))
+- Refactoring of the RTI implementation [\#224](https://github.com/lf-lang/reactor-c/pull/224) ([@ChadliaJerad](https://github.com/ChadliaJerad))
+- `_lf_count_token_allocations` made `extern` instead of `static` [\#236](https://github.com/lf-lang/reactor-c/pull/236) ([@erlingrj](https://github.com/erlingrj))
+- Refactoring of obsolete `gethostbyname()` in `connect_to_rti()` [\#220](https://github.com/lf-lang/reactor-c/pull/220) ([@siljesu](https://github.com/siljesu))
+- No more use of unordered reactions in federated programs [\#191](https://github.com/lf-lang/reactor-c/pull/191) ([@arengarajan99](https://github.com/arengarajan99))
+- Fewer warnings [\#258](https://github.com/lf-lang/reactor-c/pull/258) ([@edwardalee](https://github.com/edwardalee))
+- Tracing utils moved into reactor-c [\#259](https://github.com/lf-lang/reactor-c/pull/259) ([@erlingrj](https://github.com/erlingrj))
+
+**📖 Documentation**
+
+- Documentation and code cleanup [\#193](https://github.com/lf-lang/reactor-c/pull/193) ([@edwardalee](https://github.com/edwardalee))
+
+
+### Submodule [lf-lang/reactor-cpp](http://github.com/lf-lang/reactor-cpp)
+
+**🚀 New Features**
+
+- Enclave connections and enclave coordination [\#44](https://github.com/lf-lang/reactor-cpp/pull/44) ([@cmnrd](https://github.com/cmnrd))
+- Simple mechanism for collecting statistics during execution [\#47](https://github.com/lf-lang/reactor-cpp/pull/47) ([@cmnrd](https://github.com/cmnrd))
+- Port graph [\#51](https://github.com/lf-lang/reactor-cpp/pull/51) ([@revol-xut](https://github.com/revol-xut))
+
+**✨ Enhancements**
+
+- Keep track of input actions in the environment [\#42](https://github.com/lf-lang/reactor-cpp/pull/42) ([@cmnrd](https://github.com/cmnrd))
+- Factored event queue into its own class and fixed race condition between multiple starting enclaves [\#45](https://github.com/lf-lang/reactor-cpp/pull/45) ([@cmnrd](https://github.com/cmnrd))
+
+**🔧 Fixes**
+
+- Fix race condition in time barriers [\#49](https://github.com/lf-lang/reactor-cpp/pull/49) ([@cmnrd](https://github.com/cmnrd))
+- Fix validate method and fix incorrect phase checks [\#50](https://github.com/lf-lang/reactor-cpp/pull/50) ([@cmnrd](https://github.com/cmnrd))
+
+
+### Submodule [lf-lang/reactor-rs](http://github.com/lf-lang/reactor-rs)
+
+**🔧 Fixes**
+
+- Fix use of multiport as reaction source [\#43](https://github.com/lf-lang/reactor-rs/pull/43) ([@oowekyala](https://github.com/oowekyala))
+
+**🚧 Maintenance and Refactoring**
+
+- Use Cargo workspaces to directly include vecmap dependency [\#40](https://github.com/lf-lang/reactor-rs/pull/40) ([@jhaye](https://github.com/jhaye))
+- Fixes for current Clippy version [\#45](https://github.com/lf-lang/reactor-rs/pull/45) ([@jhaye](https://github.com/jhaye))
+
+**⬆️ Updated Dependencies**
+
+- Dependencies bumped to avoid vulnerability in smallvec [\#44](https://github.com/lf-lang/reactor-rs/pull/44) ([@oowekyala](https://github.com/oowekyala))
+
+
 
 ## [v0.4.0](https://github.com/lf-lang/lingua-franca/tree/v0.4.0) (2023-03-01)
 

From 5d6d8843b4aadb4826872c4b009805a179450720 Mon Sep 17 00:00:00 2001
From: "lingua-franca[bot]" <97201490+francabot@users.noreply.github.com>
Date: Fri, 1 Sep 2023 18:35:07 -0700
Subject: [PATCH 0802/1114] Bump version to 0.5.0

---
 CHANGELOG.md                                                | 2 +-
 core/src/main/resources/org/lflang/StringsBundle.properties | 2 +-
 gradle.properties                                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c469ed6334..f916e8496d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 # Changelog
- 
+
 ## [v0.5.0](https://github.com/lf-lang/lingua-franca/tree/v0.5.0) (2023-09-01)
 
 **Highlights**
diff --git a/core/src/main/resources/org/lflang/StringsBundle.properties b/core/src/main/resources/org/lflang/StringsBundle.properties
index 29b191399c..b58621d407 100644
--- a/core/src/main/resources/org/lflang/StringsBundle.properties
+++ b/core/src/main/resources/org/lflang/StringsBundle.properties
@@ -1 +1 @@
-VERSION = 0.4.1-SNAPSHOT
+VERSION = 0.5.0
diff --git a/gradle.properties b/gradle.properties
index fd082fc31f..ce77106367 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 [header]
 group=org.lflang
-version=0.4.1-SNAPSHOT
+version=0.5.0
 
 [versions]
 antlrVersion=4.7.2

From fbaa670090e3704f38883047fc1a4c2cf06f12ba Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 1 Sep 2023 21:00:09 -0700
Subject: [PATCH 0803/1114] Do not squeeze reaction bodies onto one line.

This adds state, but it is a private non-static member and the formatter
is not parallelized, so it should be OK. The technique employed here is
I think the most reasonable way to account for context-sensitive
formatting rules.
---
 core/src/main/java/org/lflang/ast/ToLf.java   | 17 ++++++++++
 test/C/src/ActionDelay.lf                     |  8 +++--
 test/C/src/ActionWithNoReaction.lf            |  4 ++-
 test/C/src/After.lf                           |  8 +++--
 test/C/src/AfterCycles.lf                     |  8 +++--
 test/C/src/AfterZero.lf                       |  8 +++--
 test/C/src/Alignment.lf                       |  4 ++-
 test/C/src/CompositionGain.lf                 |  4 ++-
 test/C/src/DanglingOutput.lf                  |  4 ++-
 test/C/src/DeadlineAnytime.lf                 |  8 +++--
 test/C/src/DeadlineInherited.lf               | 12 +++++--
 test/C/src/DeadlinePriority.lf                | 12 +++++--
 test/C/src/DeadlineWithAfterDelay.lf          |  8 +++--
 test/C/src/DeadlineWithBanks.lf               |  8 +++--
 test/C/src/DeadlineZero.lf                    |  8 +++--
 test/C/src/DelayArray.lf                      |  8 +++--
 test/C/src/DelayInt.lf                        |  8 +++--
 test/C/src/DelayString.lf                     |  8 +++--
 test/C/src/DelayedAction.lf                   |  4 ++-
 test/C/src/DelayedReaction.lf                 |  4 ++-
 test/C/src/Determinism.lf                     |  8 +++--
 test/C/src/DoublePort.lf                      | 12 +++++--
 test/C/src/Gain.lf                            |  8 +++--
 test/C/src/GetMicroStep.lf                    |  4 ++-
 test/C/src/Hierarchy.lf                       |  4 ++-
 test/C/src/Hierarchy2.lf                      |  4 ++-
 test/C/src/Import.lf                          |  4 ++-
 test/C/src/ImportComposition.lf               |  4 ++-
 test/C/src/ImportRenamed.lf                   |  4 ++-
 test/C/src/InheritanceAction.lf               |  8 +++--
 test/C/src/ManualDelayedReaction.lf           |  9 ++++--
 test/C/src/Methods.lf                         |  8 +++--
 test/C/src/MethodsRecursive.lf                |  4 ++-
 test/C/src/MethodsSameName.lf                 |  8 +++--
 test/C/src/Microsteps.lf                      |  4 ++-
 test/C/src/Minimal.lf                         |  4 ++-
 test/C/src/MultipleContained.lf               |  4 ++-
 test/C/src/NestedTriggeredReactions.lf        | 12 +++++--
 test/C/src/ParameterizedState.lf              |  4 ++-
 test/C/src/PhysicalConnection.lf              |  4 ++-
 test/C/src/PingPong.lf                        |  4 ++-
 test/C/src/PreambleInherited.lf               |  4 ++-
 test/C/src/ReadOutputOfContainedReactor.lf    |  4 ++-
 test/C/src/RepeatedInheritance.lf             |  4 ++-
 test/C/src/Schedule.lf                        |  8 +++--
 test/C/src/ScheduleLogicalAction.lf           |  8 +++--
 test/C/src/SelfLoop.lf                        |  4 ++-
 test/C/src/SendingInside2.lf                  |  4 ++-
 test/C/src/SendsPointerTest.lf                |  4 ++-
 test/C/src/SetToken.lf                        |  8 +++--
 test/C/src/SlowingClock.lf                    |  4 ++-
 test/C/src/StartupOutFromInside.lf            |  4 ++-
 test/C/src/TimeLimit.lf                       |  4 ++-
 test/C/src/TimeState.lf                       |  4 ++-
 test/C/src/UnconnectedInput.lf                |  4 ++-
 test/C/src/Wcet.lf                            |  4 ++-
 test/C/src/arduino/Blink.lf                   | 12 +++++--
 test/C/src/arduino/BlinkAttemptThreading.lf   | 12 +++++--
 test/C/src/arduino/BlinkMBED.lf               | 12 +++++--
 test/C/src/arduino/DigitalReadSerial.lf       |  4 ++-
 test/C/src/arduino/Fade.lf                    |  4 ++-
 test/C/src/arduino/ReadAnalogVoltage.lf       |  4 ++-
 test/C/src/concurrent/DelayIntThreaded.lf     |  8 +++--
 test/C/src/concurrent/DeterminismThreaded.lf  |  8 +++--
 test/C/src/concurrent/GainThreaded.lf         |  8 +++--
 test/C/src/concurrent/ImportThreaded.lf       |  4 ++-
 test/C/src/concurrent/MinimalThreaded.lf      |  4 ++-
 test/C/src/concurrent/PingPongThreaded.lf     |  4 ++-
 test/C/src/concurrent/TimeLimitThreaded.lf    |  4 ++-
 test/C/src/enclave/EnclaveRequestStop.lf      |  4 ++-
 test/C/src/federated/BroadcastFeedback.lf     |  4 ++-
 .../BroadcastFeedbackWithHierarchy.lf         |  4 ++-
 test/C/src/federated/CycleDetection.lf        | 12 +++++--
 test/C/src/federated/DecentralizedP2PComm.lf  |  4 ++-
 .../DecentralizedP2PUnbalancedTimeout.lf      |  4 ++-
 ...centralizedP2PUnbalancedTimeoutPhysical.lf |  4 ++-
 test/C/src/federated/DistributedBank.lf       |  4 ++-
 test/C/src/federated/DistributedDoublePort.lf | 12 +++++--
 .../DistributedPhysicalActionUpstream.lf      |  4 ++-
 .../DistributedPhysicalActionUpstreamLong.lf  |  4 ++-
 .../federated/EnclaveFederatedRequestStop.lf  |  4 ++-
 test/C/src/federated/FeedbackDelay.lf         |  8 +++--
 test/C/src/federated/FeedbackDelaySimple.lf   |  4 ++-
 test/C/src/federated/HelloDistributed.lf      |  8 +++--
 test/C/src/federated/InheritanceFederated.lf  |  4 ++-
 .../federated/InheritanceFederatedImport.lf   |  4 ++-
 test/C/src/federated/LevelPattern.lf          | 12 +++++--
 ...stributedCentralizedPrecedenceHierarchy.lf |  8 +++--
 test/C/src/federated/SpuriousDependency.lf    |  8 +++--
 test/C/src/federated/StopAtShutdown.lf        | 20 +++++++++---
 test/C/src/federated/TopLevelArtifacts.lf     |  8 +++--
 test/C/src/generics/ParameterAsArgument.lf    |  4 ++-
 test/C/src/generics/TypeCheck.lf              |  4 ++-
 test/C/src/lib/Count.lf                       |  4 ++-
 test/C/src/lib/FileLevelPreamble.lf           |  4 ++-
 test/C/src/lib/GenDelay.lf                    | 12 +++++--
 test/C/src/lib/Imported.lf                    |  4 ++-
 test/C/src/lib/ImportedComposition.lf         |  4 ++-
 test/C/src/lib/InternalDelay.lf               |  8 +++--
 test/C/src/lib/PassThrough.lf                 |  4 ++-
 .../modal_models/BanksCount3ModesComplex.lf   |  8 +++--
 test/C/src/modal_models/ConvertCaseTest.lf    | 28 ++++++++++++----
 test/C/src/modal_models/Count3Modes.lf        |  5 ++-
 test/C/src/modal_models/MixedReactions.lf     | 16 +++++++---
 test/C/src/modal_models/ModalActions.lf       |  5 ++-
 test/C/src/modal_models/ModalAfter.lf         |  5 ++-
 test/C/src/modal_models/ModalCycleBreaker.lf  | 13 ++++++--
 .../src/modal_models/ModalNestedReactions.lf  | 13 ++++++--
 .../src/modal_models/ModalStartupShutdown.lf  |  5 ++-
 test/C/src/modal_models/ModalStateReset.lf    | 13 ++++++--
 .../C/src/modal_models/ModalStateResetAuto.lf |  5 ++-
 test/C/src/modal_models/ModalTimers.lf        |  5 ++-
 .../MultipleOutputFeeder_2Connections.lf      | 22 ++++++++++---
 ...ultipleOutputFeeder_ReactionConnections.lf | 26 +++++++++++----
 test/C/src/modal_models/util/TraceTesting.lf  |  4 ++-
 test/C/src/multiport/BankGangedConnections.lf |  4 ++-
 test/C/src/multiport/BankIndexInitializer.lf  | 12 +++++--
 test/C/src/multiport/BankSelfBroadcast.lf     |  4 ++-
 test/C/src/multiport/BankToMultiport.lf       |  4 ++-
 test/C/src/multiport/Broadcast.lf             |  4 ++-
 test/C/src/multiport/BroadcastAfter.lf        |  4 ++-
 .../C/src/multiport/BroadcastMultipleAfter.lf |  4 ++-
 test/C/src/multiport/MultiportFromBank.lf     |  4 ++-
 test/C/src/multiport/MultiportIn.lf           |  4 ++-
 .../src/multiport/MultiportInParameterized.lf |  4 ++-
 test/C/src/multiport/PipelineAfter.lf         |  8 +++--
 test/C/src/multiport/ReactionsToNested.lf     |  8 +++--
 test/C/src/no_inlining/Count.lf               |  4 ++-
 test/C/src/no_inlining/CountHierarchy.lf      |  8 +++--
 test/C/src/target/FederatedFiles.lf           |  4 ++-
 test/C/src/target/Math.lf                     |  4 ++-
 test/C/src/target/Platform.lf                 |  4 ++-
 test/C/src/token/lib/Token.lf                 |  8 +++--
 test/C/src/verifier/ADASModel.lf              | 32 ++++++++++++++-----
 test/C/src/verifier/AircraftDoor.lf           |  4 ++-
 test/C/src/verifier/CoopSchedule.lf           |  4 ++-
 test/C/src/verifier/ProcessMsg.lf             |  8 +++--
 test/C/src/verifier/Ring.lf                   |  8 +++--
 test/C/src/verifier/SafeSend.lf               |  5 ++-
 test/C/src/verifier/Thermostat.lf             | 12 +++++--
 test/C/src/verifier/TrainDoor.lf              |  8 +++--
 test/C/src/verifier/UnsafeSend.lf             |  5 ++-
 test/C/src/zephyr/unthreaded/HelloZephyr.lf   |  4 ++-
 test/C/src/zephyr/unthreaded/Timer.lf         |  4 ++-
 test/Cpp/src/ActionDelay.lf                   |  8 +++--
 test/Cpp/src/ActionWithNoReaction.lf          |  4 ++-
 test/Cpp/src/After.lf                         |  4 ++-
 test/Cpp/src/AfterZero.lf                     |  4 ++-
 test/Cpp/src/Alignment.lf                     |  4 ++-
 test/Cpp/src/CompositionGain.lf               |  4 ++-
 test/Cpp/src/DanglingOutput.lf                |  4 ++-
 test/Cpp/src/DelayInt.lf                      | 12 +++++--
 test/Cpp/src/DelayedAction.lf                 |  4 ++-
 test/Cpp/src/DelayedReaction.lf               |  4 ++-
 test/Cpp/src/Determinism.lf                   |  8 +++--
 test/Cpp/src/DoublePort.lf                    |  4 ++-
 test/Cpp/src/Gain.lf                          |  8 +++--
 test/Cpp/src/GetMicroStep.lf                  |  8 +++--
 test/Cpp/src/Hello.lf                         |  8 +++--
 test/Cpp/src/HelloWorld.lf                    |  4 ++-
 test/Cpp/src/Hierarchy.lf                     |  8 +++--
 test/Cpp/src/Hierarchy2.lf                    |  4 ++-
 test/Cpp/src/Import.lf                        |  4 ++-
 test/Cpp/src/ImportComposition.lf             |  4 ++-
 test/Cpp/src/ImportRenamed.lf                 |  4 ++-
 test/Cpp/src/ManualDelayedReaction.lf         | 13 ++++++--
 test/Cpp/src/Methods.lf                       |  8 +++--
 test/Cpp/src/Microsteps.lf                    |  4 ++-
 test/Cpp/src/Minimal.lf                       |  4 ++-
 test/Cpp/src/MultipleContained.lf             |  4 ++-
 test/Cpp/src/NativeListsAndTimes.lf           |  9 ++++--
 test/Cpp/src/NestedTriggeredReactions.lf      | 12 +++++--
 test/Cpp/src/PeriodicDesugared.lf             |  4 ++-
 test/Cpp/src/PhysicalConnection.lf            |  4 ++-
 test/Cpp/src/Pipeline.lf                      |  4 ++-
 test/Cpp/src/PreambleTest.lf                  |  4 ++-
 test/Cpp/src/ReadOutputOfContainedReactor.lf  |  4 ++-
 test/Cpp/src/Schedule.lf                      |  8 +++--
 test/Cpp/src/ScheduleLogicalAction.lf         |  8 +++--
 test/Cpp/src/SelfLoop.lf                      |  4 ++-
 test/Cpp/src/SendingInside2.lf                |  4 ++-
 test/Cpp/src/SlowingClock.lf                  |  4 ++-
 test/Cpp/src/StartupOutFromInside.lf          |  4 ++-
 test/Cpp/src/Stride.lf                        |  4 ++-
 test/Cpp/src/StructPrint.lf                   |  4 ++-
 test/Cpp/src/TimeLimit.lf                     |  4 ++-
 test/Cpp/src/TimeState.lf                     |  4 ++-
 test/Cpp/src/concurrent/AsyncCallback.lf      |  4 ++-
 test/Cpp/src/concurrent/DelayIntThreaded.lf   | 12 +++++--
 .../Cpp/src/concurrent/DeterminismThreaded.lf |  8 +++--
 test/Cpp/src/concurrent/GainThreaded.lf       |  8 +++--
 test/Cpp/src/concurrent/HelloThreaded.lf      | 12 +++++--
 test/Cpp/src/concurrent/ImportThreaded.lf     |  4 ++-
 test/Cpp/src/concurrent/MinimalThreaded.lf    |  4 ++-
 test/Cpp/src/concurrent/TimeLimitThreaded.lf  |  4 ++-
 test/Cpp/src/enclave/EnclaveBankEach.lf       |  8 +++--
 test/Cpp/src/enclave/EnclaveBroadcast.lf      |  4 ++-
 test/Cpp/src/enclave/EnclaveCommunication.lf  |  4 ++-
 test/Cpp/src/enclave/EnclaveCommunication2.lf |  4 ++-
 .../enclave/EnclaveCommunicationDelayed.lf    |  4 ++-
 .../enclave/EnclaveCommunicationDelayed2.lf   |  4 ++-
 .../EnclaveCommunicationDelayedLocalEvents.lf |  8 +++--
 .../EnclaveCommunicationLocalEvents.lf        |  8 +++--
 .../EnclaveCommunicationMultiportToBank.lf    |  4 ++-
 ...laveCommunicationMultiportToBankDelayed.lf |  4 ++-
 ...EnclaveCommunicationMultiportToBankEach.lf |  4 ++-
 ...CommunicationMultiportToBankEachDelayed.lf |  4 ++-
 ...ommunicationMultiportToBankEachPhysical.lf |  4 ++-
 ...aveCommunicationMultiportToBankPhysical.lf |  4 ++-
 .../enclave/EnclaveCommunicationPhysical.lf   |  4 ++-
 ...EnclaveCommunicationPhysicalLocalEvents.lf |  8 +++--
 test/Cpp/src/enclave/EnclaveCycle.lf          |  4 ++-
 test/Cpp/src/enclave/EnclaveCycleTwoTimers.lf |  8 +++--
 test/Cpp/src/enclave/EnclaveHelloWorld.lf     |  4 ++-
 test/Cpp/src/enclave/EnclaveShutdown.lf       |  8 +++--
 .../enclave/EnclaveSparseUpstreamEvents.lf    |  8 +++--
 .../EnclaveSparseUpstreamEventsDelayed.lf     |  8 +++--
 .../EnclaveSparseUpstreamEventsPhysical.lf    |  8 +++--
 test/Cpp/src/enclave/EnclaveTimeout.lf        |  4 ++-
 .../enclave/EnclaveUpstreamPhysicalAction.lf  |  4 ++-
 .../EnclaveUpstreamPhysicalActionDelayed.lf   |  4 ++-
 test/Cpp/src/enclave/FastAndSlow.lf           |  4 ++-
 test/Cpp/src/lib/Imported.lf                  |  4 ++-
 test/Cpp/src/lib/ImportedComposition.lf       |  4 ++-
 test/Cpp/src/multiport/BankSelfBroadcast.lf   |  4 ++-
 test/Cpp/src/multiport/BankToMultiport.lf     |  4 ++-
 test/Cpp/src/multiport/Broadcast.lf           |  4 ++-
 test/Cpp/src/multiport/BroadcastAfter.lf      |  4 ++-
 .../src/multiport/BroadcastMultipleAfter.lf   |  4 ++-
 .../src/multiport/IndexIntoMultiportInput.lf  | 12 +++++--
 test/Cpp/src/multiport/MultiportFromBank.lf   |  4 ++-
 .../multiport/MultiportFromBankHierarchy.lf   |  4 ++-
 .../MultiportFromBankHierarchyAfter.lf        |  4 ++-
 test/Cpp/src/multiport/MultiportIn.lf         |  8 +++--
 test/Cpp/src/multiport/PipelineAfter.lf       |  8 +++--
 .../multiport/ReadOutputOfContainedBank.lf    |  4 ++-
 test/Cpp/src/multiport/WidthGivenByCode.lf    | 12 +++++--
 test/Cpp/src/properties/Fast.lf               |  4 ++-
 test/Cpp/src/target/AfterVoid.lf              |  4 ++-
 .../src/target/CliParserGenericArguments.lf   | 24 ++++++++++----
 test/Cpp/src/target/CombinedTypeNames.lf      | 18 ++++++++---
 test/Cpp/src/target/GenericAfter.lf           | 12 +++++--
 test/Cpp/src/target/GenericDelay.lf           | 12 +++++--
 .../src/target/MultipleContainedGeneric.lf    |  4 ++-
 test/Cpp/src/target/PointerParameters.lf      |  4 ++-
 test/Python/src/ActionDelay.lf                |  8 +++--
 test/Python/src/ActionWithNoReaction.lf       |  4 ++-
 test/Python/src/After.lf                      |  8 +++--
 test/Python/src/AfterCycles.lf                |  8 +++--
 test/Python/src/CompareTags.lf                |  4 ++-
 test/Python/src/CompositionGain.lf            |  4 ++-
 test/Python/src/DanglingOutput.lf             |  4 ++-
 test/Python/src/Deadline.lf                   |  4 ++-
 test/Python/src/DeadlineHandledAbove.lf       |  4 ++-
 test/Python/src/DelayArray.lf                 |  4 ++-
 test/Python/src/DelayInt.lf                   |  8 +++--
 test/Python/src/DelayString.lf                | 12 +++++--
 test/Python/src/DelayStruct.lf                | 12 +++++--
 test/Python/src/DelayStructWithAfter.lf       |  8 +++--
 .../src/DelayStructWithAfterOverlapped.lf     |  4 ++-
 test/Python/src/DelayedAction.lf              |  4 ++-
 test/Python/src/DelayedReaction.lf            |  4 ++-
 test/Python/src/Determinism.lf                |  8 +++--
 test/Python/src/Gain.lf                       |  8 +++--
 test/Python/src/GetMicroStep.lf               |  8 +++--
 test/Python/src/Hierarchy.lf                  |  4 ++-
 test/Python/src/Hierarchy2.lf                 |  4 ++-
 test/Python/src/Import.lf                     |  4 ++-
 test/Python/src/ImportComposition.lf          |  4 ++-
 test/Python/src/ImportRenamed.lf              |  4 ++-
 test/Python/src/ManualDelayedReaction.lf      |  9 ++++--
 test/Python/src/Methods.lf                    |  8 +++--
 test/Python/src/MethodsRecursive.lf           |  4 ++-
 test/Python/src/MethodsSameName.lf            |  8 +++--
 test/Python/src/Microsteps.lf                 |  4 ++-
 test/Python/src/Minimal.lf                    |  4 ++-
 test/Python/src/MultipleContained.lf          |  4 ++-
 test/Python/src/ParameterizedState.lf         |  4 ++-
 .../src/ReadOutputOfContainedReactor.lf       |  4 ++-
 test/Python/src/Schedule.lf                   |  8 +++--
 test/Python/src/ScheduleLogicalAction.lf      |  8 +++--
 test/Python/src/SelfLoop.lf                   |  4 ++-
 test/Python/src/SendingInside2.lf             |  4 ++-
 test/Python/src/SetArray.lf                   |  4 ++-
 test/Python/src/SimpleDeadline.lf             |  4 ++-
 test/Python/src/SlowingClock.lf               |  4 ++-
 test/Python/src/StartupOutFromInside.lf       |  4 ++-
 test/Python/src/StructAsType.lf               |  4 ++-
 test/Python/src/StructAsTypeDirect.lf         |  4 ++-
 test/Python/src/StructParallel.lf             |  4 ++-
 test/Python/src/StructPrint.lf                |  8 +++--
 test/Python/src/StructScale.lf                |  8 +++--
 test/Python/src/TestForPreviousOutput.lf      |  4 ++-
 test/Python/src/TimeLimit.lf                  |  4 ++-
 test/Python/src/TimeState.lf                  |  4 ++-
 test/Python/src/Timers.lf                     |  8 +++--
 .../src/TriggerDownstreamOnlyIfPresent2.lf    |  4 ++-
 test/Python/src/Wcet.lf                       |  4 ++-
 .../src/docker/FilesPropertyContainerized.lf  |  4 ++-
 .../Python/src/federated/BroadcastFeedback.lf |  4 ++-
 .../BroadcastFeedbackWithHierarchy.lf         |  8 +++--
 test/Python/src/federated/CycleDetection.lf   | 16 +++++++---
 .../src/federated/DecentralizedP2PComm.lf     |  4 ++-
 .../DecentralizedP2PUnbalancedTimeout.lf      | 12 +++++--
 ...centralizedP2PUnbalancedTimeoutPhysical.lf |  8 +++--
 test/Python/src/federated/DistributedBank.lf  |  4 ++-
 .../federated/DistributedBankToMultiport.lf   |  4 ++-
 test/Python/src/federated/DistributedCount.lf |  4 ++-
 .../DistributedCountDecentralized.lf          |  4 ++-
 .../DistributedCountDecentralizedLate.lf      |  4 ++-
 .../src/federated/DistributedCountPhysical.lf |  4 ++-
 .../DistributedCountPhysicalAfterDelay.lf     |  4 ++-
 .../DistributedCountPhysicalDecentralized.lf  |  4 ++-
 .../src/federated/DistributedDoublePort.lf    | 12 +++++--
 .../src/federated/DistributedLoopedAction.lf  |  4 ++-
 .../DistributedLoopedPhysicalAction.lf        |  8 +++--
 .../src/federated/DistributedMultiport.lf     |  4 ++-
 .../federated/DistributedMultiportToBank.lf   |  4 ++-
 .../src/federated/DistributedNoReact.lf       |  4 ++-
 .../src/federated/DistributedSendClass.lf     |  8 +++--
 test/Python/src/federated/DistributedStop.lf  |  4 ++-
 .../src/federated/DistributedStopZero.lf      | 12 +++++--
 .../src/federated/DistributedStructAsType.lf  |  4 ++-
 .../DistributedStructAsTypeDirect.lf          |  4 ++-
 .../federated/DistributedStructParallel.lf    |  4 ++-
 .../src/federated/DistributedStructPrint.lf   |  4 ++-
 .../src/federated/DistributedStructScale.lf   |  4 ++-
 test/Python/src/federated/HelloDistributed.lf |  4 ++-
 ...stributedCentralizedPrecedenceHierarchy.lf |  8 +++--
 test/Python/src/federated/PhysicalSTP.lf      |  4 ++-
 .../src/federated/PingPongDistributed.lf      |  4 ++-
 test/Python/src/federated/StopAtShutdown.lf   | 20 +++++++++---
 test/Python/src/lib/Imported.lf               |  4 ++-
 test/Python/src/lib/ImportedComposition.lf    |  4 ++-
 test/Python/src/lib/InternalDelay.lf          |  8 +++--
 test/Python/src/lib/TestCount.lf              |  4 ++-
 test/Python/src/lib/TestCountMultiport.lf     |  4 ++-
 .../modal_models/BanksCount3ModesComplex.lf   |  8 +++--
 .../src/modal_models/ConvertCaseTest.lf       | 32 ++++++++++++++-----
 test/Python/src/modal_models/Count3Modes.lf   |  5 ++-
 test/Python/src/modal_models/ModalActions.lf  |  5 ++-
 test/Python/src/modal_models/ModalAfter.lf    |  5 ++-
 .../src/modal_models/ModalCycleBreaker.lf     |  9 ++++--
 .../src/modal_models/ModalNestedReactions.lf  | 13 ++++++--
 .../src/modal_models/ModalStartupShutdown.lf  |  5 ++-
 .../src/modal_models/ModalStateReset.lf       | 13 ++++++--
 .../src/modal_models/ModalStateResetAuto.lf   |  5 ++-
 test/Python/src/modal_models/ModalTimers.lf   |  5 ++-
 .../MultipleOutputFeeder_2Connections.lf      | 18 ++++++++---
 ...ultipleOutputFeeder_ReactionConnections.lf | 22 ++++++++++---
 .../src/modal_models/util/TraceTesting.lf     |  4 ++-
 .../src/multiport/BankIndexInitializer.lf     |  8 +++--
 test/Python/src/multiport/BankToMultiport.lf  |  4 ++-
 test/Python/src/multiport/Broadcast.lf        |  4 ++-
 .../Python/src/multiport/MultiportFromBank.lf |  4 ++-
 .../multiport/MultiportFromBankHierarchy.lf   |  4 ++-
 test/Python/src/multiport/MultiportIn.lf      |  4 ++-
 .../src/multiport/MultiportInParameterized.lf |  4 ++-
 test/Python/src/multiport/MultiportOut.lf     |  4 ++-
 test/Python/src/multiport/PipelineAfter.lf    |  8 +++--
 .../Python/src/multiport/ReactionsToNested.lf |  8 +++--
 test/Python/src/target/AfterNoTypes.lf        |  8 +++--
 test/Rust/src/ActionImplicitDelay.lf          |  4 ++-
 test/Rust/src/ActionValuesCleanup.lf          |  4 ++-
 .../src/CompositionInitializationOrder.lf     | 12 +++++--
 test/Rust/src/CompositionWithPorts.lf         |  4 ++-
 test/Rust/src/DependencyOnChildPort.lf        |  8 +++--
 test/Rust/src/DependencyThroughChildPort.lf   |  4 ++-
 test/Rust/src/DependencyUseAccessible.lf      | 13 ++++++--
 test/Rust/src/DependencyUseNonTrigger.lf      | 12 +++++--
 test/Rust/src/Import.lf                       |  4 ++-
 test/Rust/src/ImportPreambleItem.lf           |  4 ++-
 test/Rust/src/MainReactorParam.lf             |  4 ++-
 test/Rust/src/Minimal.lf                      |  4 ++-
 test/Rust/src/MovingAverage.lf                |  8 +++--
 test/Rust/src/NativeListsAndTimes.lf          |  5 ++-
 test/Rust/src/PortConnectionInSelfOutSelf.lf  |  4 ++-
 .../Rust/src/PortConnectionOutChildOutSelf.lf |  8 +++--
 test/Rust/src/PortValueCleanup.lf             |  4 ++-
 test/Rust/src/Preamble.lf                     |  4 ++-
 test/Rust/src/ReactionLabels.lf               |  5 ++-
 test/Rust/src/SingleFileGeneration.lf         |  4 ++-
 test/Rust/src/StopNoEvent.lf                  |  4 ++-
 test/Rust/src/StructAsType.lf                 |  4 ++-
 test/Rust/src/TimeState.lf                    |  4 ++-
 test/Rust/src/Timers.lf                       |  8 +++--
 test/Rust/src/concurrent/AsyncCallback.lf     |  4 ++-
 test/Rust/src/generics/CtorParamGeneric.lf    |  9 ++++--
 .../Rust/src/generics/CtorParamGenericInst.lf | 14 +++++---
 test/Rust/src/generics/GenericComplexType.lf  |  4 ++-
 test/Rust/src/generics/GenericReactor.lf      | 12 +++++--
 test/Rust/src/lib/Imported.lf                 |  4 ++-
 .../src/multiport/ConnectionToSelfBank.lf     |  4 ++-
 test/Rust/src/multiport/CycledLhs_SelfLoop.lf |  8 +++--
 test/Rust/src/multiport/CycledLhs_Single.lf   |  8 +++--
 test/Rust/src/multiport/FullyConnected.lf     |  4 ++-
 test/Rust/src/multiport/MultiportFromBank.lf  |  4 ++-
 .../multiport/ReadOutputOfContainedBank.lf    |  4 ++-
 test/Rust/src/multiport/WidthWithParameter.lf |  4 ++-
 .../multiport/WriteInputOfContainedBank.lf    |  4 ++-
 .../src/target/CargoDependencyOnRuntime.lf    |  4 ++-
 test/Rust/src/target/CliFeature.lf            |  4 ++-
 test/TypeScript/src/ActionDelay.lf            |  8 +++--
 test/TypeScript/src/ActionWithNoReaction.lf   |  4 ++-
 test/TypeScript/src/After.lf                  |  8 +++--
 test/TypeScript/src/ArrayAsParameter.lf       |  4 ++-
 test/TypeScript/src/ArrayAsType.lf            |  8 +++--
 test/TypeScript/src/ArrayPrint.lf             |  8 +++--
 test/TypeScript/src/ArrayScale.lf             |  8 +++--
 test/TypeScript/src/DanglingOutput.lf         |  4 ++-
 test/TypeScript/src/DelayInt.lf               |  8 +++--
 test/TypeScript/src/DelayedAction.lf          |  4 ++-
 test/TypeScript/src/DelayedReaction.lf        |  4 ++-
 test/TypeScript/src/Determinism.lf            |  8 +++--
 test/TypeScript/src/Gain.lf                   |  8 +++--
 test/TypeScript/src/HelloWorld.lf             |  4 ++-
 test/TypeScript/src/Hierarchy2.lf             |  4 ++-
 test/TypeScript/src/Import.lf                 |  4 ++-
 test/TypeScript/src/Microsteps.lf             |  4 ++-
 test/TypeScript/src/Minimal.lf                |  4 ++-
 test/TypeScript/src/MovingAverage.lf          |  4 ++-
 test/TypeScript/src/MultipleContained.lf      |  4 ++-
 test/TypeScript/src/ParameterizedState.lf     |  4 ++-
 test/TypeScript/src/PhysicalConnection.lf     |  4 ++-
 .../src/ReadOutputOfContainedReactor.lf       |  4 ++-
 test/TypeScript/src/Schedule.lf               |  8 +++--
 test/TypeScript/src/ScheduleLogicalAction.lf  |  8 +++--
 test/TypeScript/src/SendingInside2.lf         |  4 ++-
 test/TypeScript/src/SendsPointerTest.lf       | 12 +++++--
 test/TypeScript/src/SlowingClock.lf           |  4 ++-
 test/TypeScript/src/Stride.lf                 |  4 ++-
 test/TypeScript/src/TimeLimit.lf              |  4 ++-
 test/TypeScript/src/TimeState.lf              |  4 ++-
 test/TypeScript/src/Wcet.lf                   |  4 ++-
 .../src/federated/DistributedDoublePort.lf    | 12 +++++--
 .../src/federated/HelloDistributed.lf         |  8 +++--
 .../src/federated/SpuriousDependency.lf       |  8 +++--
 .../src/federated/StopAtShutdown.lf           | 20 +++++++++---
 .../src/federated/TopLevelArtifacts.lf        |  8 +++--
 test/TypeScript/src/lib/Count.lf              |  4 ++-
 test/TypeScript/src/lib/Imported.lf           |  4 ++-
 test/TypeScript/src/lib/InternalDelay.lf      |  8 +++--
 .../src/multiport/BankSelfBroadcast.lf        |  4 ++-
 .../src/multiport/BankToMultiport.lf          |  4 ++-
 test/TypeScript/src/multiport/Broadcast.lf    |  4 ++-
 .../src/multiport/BroadcastAfter.lf           |  4 ++-
 .../src/multiport/BroadcastMultipleAfter.lf   |  4 ++-
 .../src/multiport/MultiportFromBank.lf        |  4 ++-
 test/TypeScript/src/multiport/MultiportIn.lf  |  8 +++--
 .../src/multiport/MultiportInParameterized.lf |  4 ++-
 .../multiport/MultiportMutableInputArray.lf   | 16 +++++++---
 .../multiport/MultiportToMultiportArray.lf    |  8 +++--
 .../TypeScript/src/multiport/PipelineAfter.lf |  8 +++--
 .../src/multiport/ReactionsToNested.lf        |  8 +++--
 454 files changed, 2181 insertions(+), 712 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 9646bea79c..50ffb442ea 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -1,5 +1,6 @@
 package org.lflang.ast;
 
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -91,6 +92,12 @@ public class ToLf extends LfSwitch<MalleableString> {
   /// public instance initialized when loading the class
   public static final ToLf instance = new ToLf();
 
+  /**
+   * The eObjects in the syntax tree on the path from the root up to and including the current
+   * eObject.
+   */
+  private final ArrayDeque<EObject> callStack = new ArrayDeque<>();
+
   // private constructor
   private ToLf() {
     super();
@@ -104,6 +111,13 @@ public MalleableString caseArraySpec(ArraySpec spec) {
 
   @Override
   public MalleableString doSwitch(EObject eObject) {
+    callStack.push(eObject);
+    var ret = doSwitchHelper(eObject);
+    callStack.pop();
+    return ret;
+  }
+
+  private MalleableString doSwitchHelper(EObject eObject) {
     ICompositeNode node = NodeModelUtils.findActualNodeFor(eObject);
     if (node == null) return super.doSwitch(eObject);
     var ancestorComments = getAncestorComments(node);
@@ -257,6 +271,9 @@ public MalleableString caseCode(Code code) {
     if (content.lines().count() > 1 || content.contains("#") || content.contains("//")) {
       return multilineRepresentation;
     }
+    if (callStack.stream().anyMatch(it -> it instanceof Code) && !content.isBlank()) {
+      return MalleableString.anyOf(multilineRepresentation);
+    }
     return MalleableString.anyOf(singleLineRepresentation, multilineRepresentation);
   }
 
diff --git a/test/C/src/ActionDelay.lf b/test/C/src/ActionDelay.lf
index 90847eb9d5..d1f94cb3e5 100644
--- a/test/C/src/ActionDelay.lf
+++ b/test/C/src/ActionDelay.lf
@@ -12,13 +12,17 @@ reactor GeneratedDelay {
     lf_schedule(act, MSEC(0));
   =}
 
-  reaction(act) -> y_out {= lf_set(y_out, self->y_state); =}
+  reaction(act) -> y_out {=
+    lf_set(y_out, self->y_state);
+  =}
 }
 
 reactor Source {
   output out: int
 
-  reaction(startup) -> out {= lf_set(out, 1); =}
+  reaction(startup) -> out {=
+    lf_set(out, 1);
+  =}
 }
 
 reactor Sink {
diff --git a/test/C/src/ActionWithNoReaction.lf b/test/C/src/ActionWithNoReaction.lf
index 0143d67cce..e1f19c7ffe 100644
--- a/test/C/src/ActionWithNoReaction.lf
+++ b/test/C/src/ActionWithNoReaction.lf
@@ -33,5 +33,7 @@ main reactor ActionWithNoReaction {
   timer t(0, 1 sec)
   f.y -> p.x after 10 msec
 
-  reaction(t) -> f.x {= lf_set(f.x, 42); =}
+  reaction(t) -> f.x {=
+    lf_set(f.x, 42);
+  =}
 }
diff --git a/test/C/src/After.lf b/test/C/src/After.lf
index f21c6b7f76..60816c7f78 100644
--- a/test/C/src/After.lf
+++ b/test/C/src/After.lf
@@ -8,7 +8,9 @@ reactor foo {
   input x: int
   output y: int
 
-  reaction(x) -> y {= lf_set(y, 2*x->value); =}
+  reaction(x) -> y {=
+    lf_set(y, 2*x->value);
+  =}
 }
 
 reactor print {
@@ -47,5 +49,7 @@ main reactor After {
   timer t(0, 1 sec)
   f.y -> p.x after 10 msec
 
-  reaction(t) -> f.x {= lf_set(f.x, 42); =}
+  reaction(t) -> f.x {=
+    lf_set(f.x, 42);
+  =}
 }
diff --git a/test/C/src/AfterCycles.lf b/test/C/src/AfterCycles.lf
index cc2eab638e..3e75f8fded 100644
--- a/test/C/src/AfterCycles.lf
+++ b/test/C/src/AfterCycles.lf
@@ -5,14 +5,18 @@ target C
 reactor Source {
   output out: unsigned
 
-  reaction(startup) -> out {= lf_set(out, 1); =}
+  reaction(startup) -> out {=
+    lf_set(out, 1);
+  =}
 }
 
 reactor Work {
   input in: unsigned
   output out: unsigned
 
-  reaction(in) -> out {= lf_set(out, in->value); =}
+  reaction(in) -> out {=
+    lf_set(out, in->value);
+  =}
 }
 
 main reactor AfterCycles {
diff --git a/test/C/src/AfterZero.lf b/test/C/src/AfterZero.lf
index 10fc9d7a8b..ce6cedbe90 100644
--- a/test/C/src/AfterZero.lf
+++ b/test/C/src/AfterZero.lf
@@ -8,7 +8,9 @@ reactor foo {
   input x: int
   output y: int
 
-  reaction(x) -> y {= SET(y, 2*x->value); =}
+  reaction(x) -> y {=
+    SET(y, 2*x->value);
+  =}
 }
 
 reactor print {
@@ -52,5 +54,7 @@ main reactor {
   timer t(0, 1 sec)
   f.y -> p.x after 0
 
-  reaction(t) -> f.x {= SET(f.x, 42); =}
+  reaction(t) -> f.x {=
+    SET(f.x, 42);
+  =}
 }
diff --git a/test/C/src/Alignment.lf b/test/C/src/Alignment.lf
index c1cba1b948..5884126d58 100644
--- a/test/C/src/Alignment.lf
+++ b/test/C/src/Alignment.lf
@@ -9,7 +9,9 @@ reactor Source {
   state count: int = 1
   timer t(0, 100 msec)
 
-  reaction(t) -> out {= lf_set(out, self->count++); =}
+  reaction(t) -> out {=
+    lf_set(out, self->count++);
+  =}
 }
 
 reactor Sieve {
diff --git a/test/C/src/CompositionGain.lf b/test/C/src/CompositionGain.lf
index a34c95c10c..43220614f4 100644
--- a/test/C/src/CompositionGain.lf
+++ b/test/C/src/CompositionGain.lf
@@ -22,7 +22,9 @@ reactor Wrapper {
 main reactor CompositionGain {
   wrapper = new Wrapper()
 
-  reaction(startup) -> wrapper.x {= lf_set(wrapper.x, 42); =}
+  reaction(startup) -> wrapper.x {=
+    lf_set(wrapper.x, 42);
+  =}
 
   reaction(wrapper.y) {=
     printf("Received %d\n", wrapper.y->value);
diff --git a/test/C/src/DanglingOutput.lf b/test/C/src/DanglingOutput.lf
index 8c39ad5612..2167d3556f 100644
--- a/test/C/src/DanglingOutput.lf
+++ b/test/C/src/DanglingOutput.lf
@@ -6,7 +6,9 @@ reactor Source {
   output out: int
   timer t
 
-  reaction(t) -> out {= lf_set(out, 1); =}
+  reaction(t) -> out {=
+    lf_set(out, 1);
+  =}
 }
 
 reactor Gain {
diff --git a/test/C/src/DeadlineAnytime.lf b/test/C/src/DeadlineAnytime.lf
index 5ba39e36e0..fcb84e7a4e 100644
--- a/test/C/src/DeadlineAnytime.lf
+++ b/test/C/src/DeadlineAnytime.lf
@@ -8,9 +8,13 @@ reactor A {
   reaction(startup) -> a {=
     self->i = 0;
     while (!lf_check_deadline(self, true));
-  =} deadline(10 msec) {= lf_schedule(a, 0); =}
+  =} deadline(10 msec) {=
+    lf_schedule(a, 0);
+  =}
 
-  reaction(a) {= self->i = 42; =}
+  reaction(a) {=
+    self->i = 42;
+  =}
 
   reaction(shutdown) {=
     if (self->i == 42) {
diff --git a/test/C/src/DeadlineInherited.lf b/test/C/src/DeadlineInherited.lf
index 5c99bd56a6..785087b18b 100644
--- a/test/C/src/DeadlineInherited.lf
+++ b/test/C/src/DeadlineInherited.lf
@@ -4,13 +4,19 @@ target C {
   threading: false
 }
 
-preamble {= extern int global_cnt; =}
+preamble {=
+  extern int global_cnt;
+=}
 
 reactor NoDeadline {
-  preamble {= int global_cnt = 0; =}
+  preamble {=
+    int global_cnt = 0;
+  =}
   timer t(0 msec, 100 msec)
 
-  reaction(t) {= global_cnt++; =}
+  reaction(t) {=
+    global_cnt++;
+  =}
 }
 
 reactor WithDeadline {
diff --git a/test/C/src/DeadlinePriority.lf b/test/C/src/DeadlinePriority.lf
index 58761975ac..95db38a259 100644
--- a/test/C/src/DeadlinePriority.lf
+++ b/test/C/src/DeadlinePriority.lf
@@ -4,13 +4,19 @@ target C {
   threading: false
 }
 
-preamble {= extern int global_cnt; =}
+preamble {=
+  extern int global_cnt;
+=}
 
 reactor NoDeadline {
-  preamble {= int global_cnt = 0; =}
+  preamble {=
+    int global_cnt = 0;
+  =}
   timer t(0 msec, 100 msec)
 
-  reaction(t) {= global_cnt++; =}
+  reaction(t) {=
+    global_cnt++;
+  =}
 }
 
 reactor WithDeadline {
diff --git a/test/C/src/DeadlineWithAfterDelay.lf b/test/C/src/DeadlineWithAfterDelay.lf
index 9478d8e00f..12bd80425b 100644
--- a/test/C/src/DeadlineWithAfterDelay.lf
+++ b/test/C/src/DeadlineWithAfterDelay.lf
@@ -4,10 +4,14 @@ target C {
   threading: false
 }
 
-preamble {= extern int global_cnt; =}
+preamble {=
+  extern int global_cnt;
+=}
 
 reactor Source {
-  preamble {= int global_cnt = 0; =}
+  preamble {=
+    int global_cnt = 0;
+  =}
 
   output out: int
   timer t(0 msec, 100 msec)
diff --git a/test/C/src/DeadlineWithBanks.lf b/test/C/src/DeadlineWithBanks.lf
index 471d22682e..7d8c06b8fd 100644
--- a/test/C/src/DeadlineWithBanks.lf
+++ b/test/C/src/DeadlineWithBanks.lf
@@ -8,10 +8,14 @@ target C {
   build-type: Debug
 }
 
-preamble {= extern volatile int global_cnt; =}
+preamble {=
+  extern volatile int global_cnt;
+=}
 
 reactor Bank(bank_index: int = 0) {
-  preamble {= volatile int global_cnt = 0; =}
+  preamble {=
+    volatile int global_cnt = 0;
+  =}
 
   timer t(0, 100 msec)
   output out: int
diff --git a/test/C/src/DeadlineZero.lf b/test/C/src/DeadlineZero.lf
index 26f556a800..e4408d3917 100644
--- a/test/C/src/DeadlineZero.lf
+++ b/test/C/src/DeadlineZero.lf
@@ -10,14 +10,18 @@ reactor Detector {
   reaction(trigger) {=
     printf("ERROR: failed to detect zero-duration deadline at iteration %d.\n", self->cnt);
     exit(1);
-  =} deadline(0 msec) {= self->cnt++; =}
+  =} deadline(0 msec) {=
+    self->cnt++;
+  =}
 }
 
 reactor Generator {
   output pulse: int
   timer t(0, 100 msec)
 
-  reaction(t) -> pulse {= lf_set(pulse, 0); =}
+  reaction(t) -> pulse {=
+    lf_set(pulse, 0);
+  =}
 }
 
 main reactor {
diff --git a/test/C/src/DelayArray.lf b/test/C/src/DelayArray.lf
index 6f4bd6a754..7e024b1133 100644
--- a/test/C/src/DelayArray.lf
+++ b/test/C/src/DelayArray.lf
@@ -8,9 +8,13 @@ reactor DelayPointer(delay: time = 100 msec) {
   output out: int[]
   logical action a: int[]
 
-  reaction(in) -> a {= lf_schedule_token(a, self->delay, in->token); =}
+  reaction(in) -> a {=
+    lf_schedule_token(a, self->delay, in->token);
+  =}
 
-  reaction(a) -> out {= lf_set_token(out, a->token); =}
+  reaction(a) -> out {=
+    lf_set_token(out, a->token);
+  =}
 }
 
 reactor Source {
diff --git a/test/C/src/DelayInt.lf b/test/C/src/DelayInt.lf
index 58e74b2b8a..f3e1501414 100644
--- a/test/C/src/DelayInt.lf
+++ b/test/C/src/DelayInt.lf
@@ -6,7 +6,9 @@ reactor Delay(delay: time = 100 msec) {
   output out: int
   logical action a: int
 
-  reaction(a) -> out {= if (a->has_value && a->is_present) lf_set(out, a->value); =}
+  reaction(a) -> out {=
+    if (a->has_value && a->is_present) lf_set(out, a->value);
+  =}
 
   reaction(in) -> a {=
     // Use specialized form of schedule for integer payloads.
@@ -55,5 +57,7 @@ main reactor DelayInt {
   t = new Test()
   d.out -> t.in
 
-  reaction(startup) -> d.in {= lf_set(d.in, 42); =}
+  reaction(startup) -> d.in {=
+    lf_set(d.in, 42);
+  =}
 }
diff --git a/test/C/src/DelayString.lf b/test/C/src/DelayString.lf
index f49cd270de..052e304ac3 100644
--- a/test/C/src/DelayString.lf
+++ b/test/C/src/DelayString.lf
@@ -16,7 +16,9 @@ reactor DelayString2(delay: time = 100 msec) {
   output out: string
   logical action a: string
 
-  reaction(a) -> out {= lf_set(out, a->value); =}
+  reaction(a) -> out {=
+    lf_set(out, a->value);
+  =}
 
   reaction(in) -> a {=
     // The following copies the char*, not the string.
@@ -48,5 +50,7 @@ main reactor {
   t = new Test()
   d.out -> t.in
 
-  reaction(startup) -> d.in {= lf_set(d.in, "Hello"); =}
+  reaction(startup) -> d.in {=
+    lf_set(d.in, "Hello");
+  =}
 }
diff --git a/test/C/src/DelayedAction.lf b/test/C/src/DelayedAction.lf
index 529f92badf..3b3b3a9f7a 100644
--- a/test/C/src/DelayedAction.lf
+++ b/test/C/src/DelayedAction.lf
@@ -8,7 +8,9 @@ main reactor DelayedAction {
   logical action a
   state count: int = 0
 
-  reaction(t) -> a {= lf_schedule(a, MSEC(100)); =}
+  reaction(t) -> a {=
+    lf_schedule(a, MSEC(100));
+  =}
 
   reaction(a) {=
     interval_t elapsed = lf_time_logical_elapsed();
diff --git a/test/C/src/DelayedReaction.lf b/test/C/src/DelayedReaction.lf
index 41cb9f3052..2b9bf0a275 100644
--- a/test/C/src/DelayedReaction.lf
+++ b/test/C/src/DelayedReaction.lf
@@ -5,7 +5,9 @@ reactor Source {
   output out: int
   timer t
 
-  reaction(t) -> out {= lf_set(out, 1); =}
+  reaction(t) -> out {=
+    lf_set(out, 1);
+  =}
 }
 
 reactor Sink {
diff --git a/test/C/src/Determinism.lf b/test/C/src/Determinism.lf
index 6ccc7dde34..c6e66c521c 100644
--- a/test/C/src/Determinism.lf
+++ b/test/C/src/Determinism.lf
@@ -4,7 +4,9 @@ reactor Source {
   output y: int
   timer t
 
-  reaction(t) -> y {= lf_set(y, 1); =}
+  reaction(t) -> y {=
+    lf_set(y, 1);
+  =}
 }
 
 reactor Destination {
@@ -31,7 +33,9 @@ reactor Pass {
   input x: int
   output y: int
 
-  reaction(x) -> y {= lf_set(y, x->value); =}
+  reaction(x) -> y {=
+    lf_set(y, x->value);
+  =}
 }
 
 main reactor Determinism {
diff --git a/test/C/src/DoublePort.lf b/test/C/src/DoublePort.lf
index 046a4f951f..b17bf6d71b 100644
--- a/test/C/src/DoublePort.lf
+++ b/test/C/src/DoublePort.lf
@@ -17,9 +17,13 @@ reactor CountMicrostep {
   logical action act: int
   timer t(0, 1 sec)
 
-  reaction(t) -> act {= lf_schedule_int(act, 0, self->count++); =}
+  reaction(t) -> act {=
+    lf_schedule_int(act, 0, self->count++);
+  =}
 
-  reaction(act) -> out {= lf_set(out, act->value); =}
+  reaction(act) -> out {=
+    lf_set(out, act->value);
+  =}
 }
 
 reactor Print {
@@ -35,7 +39,9 @@ reactor Print {
     }
   =}
 
-  reaction(shutdown) {= printf("SUCCESS: messages were at least one microstep apart.\n"); =}
+  reaction(shutdown) {=
+    printf("SUCCESS: messages were at least one microstep apart.\n");
+  =}
 }
 
 main reactor DoublePort {
diff --git a/test/C/src/Gain.lf b/test/C/src/Gain.lf
index bc096cf77c..d2ea2e4893 100644
--- a/test/C/src/Gain.lf
+++ b/test/C/src/Gain.lf
@@ -5,7 +5,9 @@ reactor Scale(scale: int = 2) {
   input x: int
   output y: int
 
-  reaction(x) -> y {= lf_set(y, x->value * self->scale); =}
+  reaction(x) -> y {=
+    lf_set(y, x->value * self->scale);
+  =}
 }
 
 reactor Test {
@@ -35,5 +37,7 @@ main reactor Gain {
   d = new Test()
   g.y -> d.x
 
-  reaction(startup) -> g.x {= lf_set(g.x, 1); =}
+  reaction(startup) -> g.x {=
+    lf_set(g.x, 1);
+  =}
 }
diff --git a/test/C/src/GetMicroStep.lf b/test/C/src/GetMicroStep.lf
index 4f0fda5e9f..eb5e3d0a49 100644
--- a/test/C/src/GetMicroStep.lf
+++ b/test/C/src/GetMicroStep.lf
@@ -6,7 +6,9 @@ main reactor GetMicroStep {
 
   logical action l
 
-  reaction(startup) -> l {= lf_schedule(l, 0); =}
+  reaction(startup) -> l {=
+    lf_schedule(l, 0);
+  =}
 
   reaction(l) -> l {=
     microstep_t microstep = lf_tag().microstep;
diff --git a/test/C/src/Hierarchy.lf b/test/C/src/Hierarchy.lf
index 47efcf6b65..8049f6b755 100644
--- a/test/C/src/Hierarchy.lf
+++ b/test/C/src/Hierarchy.lf
@@ -5,7 +5,9 @@ reactor Source {
   output out: int
   timer t
 
-  reaction(t) -> out {= lf_set(out, 1); =}
+  reaction(t) -> out {=
+    lf_set(out, 1);
+  =}
 }
 
 reactor Gain {
diff --git a/test/C/src/Hierarchy2.lf b/test/C/src/Hierarchy2.lf
index 7e361dc580..bb565c72ae 100644
--- a/test/C/src/Hierarchy2.lf
+++ b/test/C/src/Hierarchy2.lf
@@ -8,7 +8,9 @@ reactor Source {
   output out: int
   timer t(0, 1 sec)
 
-  reaction(t) -> out {= lf_set(out, 1); =}
+  reaction(t) -> out {=
+    lf_set(out, 1);
+  =}
 }
 
 reactor Count {
diff --git a/test/C/src/Import.lf b/test/C/src/Import.lf
index 812f14edaa..afcd6e585b 100644
--- a/test/C/src/Import.lf
+++ b/test/C/src/Import.lf
@@ -7,5 +7,7 @@ main reactor Import {
   timer t
   a = new Imported()
 
-  reaction(t) -> a.x {= lf_set(a.x, 42); =}
+  reaction(t) -> a.x {=
+    lf_set(a.x, 42);
+  =}
 }
diff --git a/test/C/src/ImportComposition.lf b/test/C/src/ImportComposition.lf
index 41e493f8d9..654a1d9283 100644
--- a/test/C/src/ImportComposition.lf
+++ b/test/C/src/ImportComposition.lf
@@ -7,7 +7,9 @@ main reactor ImportComposition {
   a = new ImportedComposition()
   state received: bool = false
 
-  reaction(startup) -> a.x {= lf_set(a.x, 42); =}
+  reaction(startup) -> a.x {=
+    lf_set(a.x, 42);
+  =}
 
   reaction(a.y) {=
     interval_t receive_time = lf_time_logical_elapsed();
diff --git a/test/C/src/ImportRenamed.lf b/test/C/src/ImportRenamed.lf
index 6ddee69dfa..8158f74da7 100644
--- a/test/C/src/ImportRenamed.lf
+++ b/test/C/src/ImportRenamed.lf
@@ -11,5 +11,7 @@ main reactor {
   b = new Y()
   c = new Z()
 
-  reaction(t) -> a.x {= lf_set(a.x, 42); =}
+  reaction(t) -> a.x {=
+    lf_set(a.x, 42);
+  =}
 }
diff --git a/test/C/src/InheritanceAction.lf b/test/C/src/InheritanceAction.lf
index e2b5857ff7..7e60ea23c3 100644
--- a/test/C/src/InheritanceAction.lf
+++ b/test/C/src/InheritanceAction.lf
@@ -7,11 +7,15 @@ reactor Source {
   logical action foo: int
   output y: int
 
-  reaction(foo) -> y {= lf_set(y, foo->value); =}
+  reaction(foo) -> y {=
+    lf_set(y, foo->value);
+  =}
 }
 
 reactor SourceExtended extends Source {
-  reaction(startup) -> foo {= lf_schedule_int(foo, 0, 42); =}
+  reaction(startup) -> foo {=
+    lf_schedule_int(foo, 0, 42);
+  =}
 }
 
 reactor Test {
diff --git a/test/C/src/ManualDelayedReaction.lf b/test/C/src/ManualDelayedReaction.lf
index 24f5cc3d23..c81dabb590 100644
--- a/test/C/src/ManualDelayedReaction.lf
+++ b/test/C/src/ManualDelayedReaction.lf
@@ -18,14 +18,19 @@ reactor GeneratedDelay {
     lf_schedule(act, MSEC(100));
   =}
 
-  reaction(act) -> y_out {= lf_set(y_out, self->y_state); =}
+  reaction(act) -> y_out {=
+    lf_set(y_out, self->y_state);
+  =}
 }
 
 reactor Source {
   output out: int
   timer t
 
-  reaction(t) -> out {= lf_set(out, 1); =}  // reaction(t) -> out after 100 msec
+  // reaction(t) -> out after 100 msec
+  reaction(t) -> out {=
+    lf_set(out, 1);
+  =}
 }
 
 reactor Sink {
diff --git a/test/C/src/Methods.lf b/test/C/src/Methods.lf
index 2d69d5c77d..6409cb1a27 100644
--- a/test/C/src/Methods.lf
+++ b/test/C/src/Methods.lf
@@ -3,9 +3,13 @@ target C
 main reactor {
   state foo: int = 2
 
-  method getFoo(): int {= return self->foo; =}
+  method getFoo(): int {=
+    return self->foo;
+  =}
 
-  method add(x: int) {= self->foo += x; =}
+  method add(x: int) {=
+    self->foo += x;
+  =}
 
   reaction(startup) {=
     lf_print("Foo is initialized to %d", getFoo());
diff --git a/test/C/src/MethodsRecursive.lf b/test/C/src/MethodsRecursive.lf
index 4e04a0a901..09761cc279 100644
--- a/test/C/src/MethodsRecursive.lf
+++ b/test/C/src/MethodsRecursive.lf
@@ -10,7 +10,9 @@ main reactor {
     return add(fib(n-1), fib(n-2));
   =}
 
-  method add(x: int, y: int): int {= return x + y; =}
+  method add(x: int, y: int): int {=
+    return x + y;
+  =}
 
   reaction(startup) {=
     for (int n = 1; n < 10; n++) {
diff --git a/test/C/src/MethodsSameName.lf b/test/C/src/MethodsSameName.lf
index db07a5cd75..e4683d8f7f 100644
--- a/test/C/src/MethodsSameName.lf
+++ b/test/C/src/MethodsSameName.lf
@@ -4,7 +4,9 @@ target C
 reactor Foo {
   state foo: int = 2
 
-  method add(x: int) {= self->foo += x; =}
+  method add(x: int) {=
+    self->foo += x;
+  =}
 
   reaction(startup) {=
     add(40);
@@ -20,7 +22,9 @@ main reactor {
 
   a = new Foo()
 
-  method add(x: int) {= self->foo += x; =}
+  method add(x: int) {=
+    self->foo += x;
+  =}
 
   reaction(startup) {=
     add(40);
diff --git a/test/C/src/Microsteps.lf b/test/C/src/Microsteps.lf
index 6a2915b53f..12515731e3 100644
--- a/test/C/src/Microsteps.lf
+++ b/test/C/src/Microsteps.lf
@@ -37,5 +37,7 @@ main reactor Microsteps {
     lf_schedule(repeat, 0);
   =}
 
-  reaction(repeat) -> d.y {= lf_set(d.y, 1); =}
+  reaction(repeat) -> d.y {=
+    lf_set(d.y, 1);
+  =}
 }
diff --git a/test/C/src/Minimal.lf b/test/C/src/Minimal.lf
index b2534ab993..4b38e6a61e 100644
--- a/test/C/src/Minimal.lf
+++ b/test/C/src/Minimal.lf
@@ -2,5 +2,7 @@
 target C
 
 main reactor Minimal {
-  reaction(startup) {= printf("Hello World.\n"); =}
+  reaction(startup) {=
+    printf("Hello World.\n");
+  =}
 }
diff --git a/test/C/src/MultipleContained.lf b/test/C/src/MultipleContained.lf
index 1e98bff1fb..6354101b93 100644
--- a/test/C/src/MultipleContained.lf
+++ b/test/C/src/MultipleContained.lf
@@ -7,7 +7,9 @@ reactor Contained {
   input in2: int
   state count: int = 0
 
-  reaction(startup) -> trigger {= lf_set(trigger, 42); =}
+  reaction(startup) -> trigger {=
+    lf_set(trigger, 42);
+  =}
 
   reaction(in1) {=
     printf("in1 received %d.\n", in1->value);
diff --git a/test/C/src/NestedTriggeredReactions.lf b/test/C/src/NestedTriggeredReactions.lf
index ca9ce7476c..59364c2b22 100644
--- a/test/C/src/NestedTriggeredReactions.lf
+++ b/test/C/src/NestedTriggeredReactions.lf
@@ -9,7 +9,9 @@ reactor Container {
 
   in -> contained.in
 
-  reaction(in) {= self->triggered = true; =}
+  reaction(in) {=
+    self->triggered = true;
+  =}
 
   reaction(shutdown) {=
     if (!self->triggered) {
@@ -23,7 +25,9 @@ reactor Contained {
 
   state triggered: bool = false
 
-  reaction(in) {= self->triggered = true; =}
+  reaction(in) {=
+    self->triggered = true;
+  =}
 
   reaction(shutdown) {=
     if (!self->triggered) {
@@ -35,5 +39,7 @@ reactor Contained {
 main reactor {
   container = new Container()
 
-  reaction(startup) -> container.in {= lf_set(container.in, true); =}
+  reaction(startup) -> container.in {=
+    lf_set(container.in, true);
+  =}
 }
diff --git a/test/C/src/ParameterizedState.lf b/test/C/src/ParameterizedState.lf
index 5b601a740b..78ace1c297 100644
--- a/test/C/src/ParameterizedState.lf
+++ b/test/C/src/ParameterizedState.lf
@@ -3,7 +3,9 @@ target C
 reactor Foo(bar: int = 42) {
   state baz = bar
 
-  reaction(startup) {= printf("Baz: %d\n", self->baz); =}
+  reaction(startup) {=
+    printf("Baz: %d\n", self->baz);
+  =}
 }
 
 main reactor {
diff --git a/test/C/src/PhysicalConnection.lf b/test/C/src/PhysicalConnection.lf
index af478e0425..4a7959a947 100644
--- a/test/C/src/PhysicalConnection.lf
+++ b/test/C/src/PhysicalConnection.lf
@@ -4,7 +4,9 @@ target C
 reactor Source {
   output out: int
 
-  reaction(startup) -> out {= lf_set(out, 42); =}
+  reaction(startup) -> out {=
+    lf_set(out, 42);
+  =}
 }
 
 reactor Destination {
diff --git a/test/C/src/PingPong.lf b/test/C/src/PingPong.lf
index c38bd36683..404fd9c798 100644
--- a/test/C/src/PingPong.lf
+++ b/test/C/src/PingPong.lf
@@ -28,7 +28,9 @@ reactor Ping(count: int = 10) {
   state pingsLeft: int = count
   logical action serve
 
-  reaction(startup, serve) -> send {= lf_set(send, self->pingsLeft--); =}
+  reaction(startup, serve) -> send {=
+    lf_set(send, self->pingsLeft--);
+  =}
 
   reaction(receive) -> serve {=
     if (self->pingsLeft > 0) {
diff --git a/test/C/src/PreambleInherited.lf b/test/C/src/PreambleInherited.lf
index 83f4a59d44..771185bdbc 100644
--- a/test/C/src/PreambleInherited.lf
+++ b/test/C/src/PreambleInherited.lf
@@ -6,7 +6,9 @@ reactor A {
     #define FOO 2
   =}
 
-  reaction(startup) {= printf("FOO: %d\n", FOO); =}
+  reaction(startup) {=
+    printf("FOO: %d\n", FOO);
+  =}
 }
 
 reactor B extends A {
diff --git a/test/C/src/ReadOutputOfContainedReactor.lf b/test/C/src/ReadOutputOfContainedReactor.lf
index 0625d9ccf3..4ae3ae44f9 100644
--- a/test/C/src/ReadOutputOfContainedReactor.lf
+++ b/test/C/src/ReadOutputOfContainedReactor.lf
@@ -4,7 +4,9 @@ target C
 reactor Contained {
   output out: int
 
-  reaction(startup) -> out {= lf_set(out, 42); =}
+  reaction(startup) -> out {=
+    lf_set(out, 42);
+  =}
 }
 
 main reactor ReadOutputOfContainedReactor {
diff --git a/test/C/src/RepeatedInheritance.lf b/test/C/src/RepeatedInheritance.lf
index 7de84864cd..b6ff4cbc34 100644
--- a/test/C/src/RepeatedInheritance.lf
+++ b/test/C/src/RepeatedInheritance.lf
@@ -27,7 +27,9 @@ reactor A extends B, C {
   input a: int
   output out: int
 
-  reaction(a, b, c, d) -> out {= lf_set(out, a->value + b->value + c->value + d->value); =}
+  reaction(a, b, c, d) -> out {=
+    lf_set(out, a->value + b->value + c->value + d->value);
+  =}
 }
 
 main reactor {
diff --git a/test/C/src/Schedule.lf b/test/C/src/Schedule.lf
index 09f9de5bd9..e0d1db3fcc 100644
--- a/test/C/src/Schedule.lf
+++ b/test/C/src/Schedule.lf
@@ -5,7 +5,9 @@ reactor Schedule2 {
   input x: int
   logical action a
 
-  reaction(x) -> a {= lf_schedule(a, MSEC(200)); =}
+  reaction(x) -> a {=
+    lf_schedule(a, MSEC(200));
+  =}
 
   reaction(a) {=
     interval_t elapsed_time = lf_time_logical_elapsed();
@@ -21,5 +23,7 @@ main reactor {
   a = new Schedule2()
   timer t
 
-  reaction(t) -> a.x {= lf_set(a.x, 1); =}
+  reaction(t) -> a.x {=
+    lf_set(a.x, 1);
+  =}
 }
diff --git a/test/C/src/ScheduleLogicalAction.lf b/test/C/src/ScheduleLogicalAction.lf
index 72835f8a96..9b85f443b7 100644
--- a/test/C/src/ScheduleLogicalAction.lf
+++ b/test/C/src/ScheduleLogicalAction.lf
@@ -16,7 +16,9 @@ reactor foo {
     lf_schedule(a, MSEC(500));
   =}
 
-  reaction(a) -> y {= lf_set(y, -42); =}
+  reaction(a) -> y {=
+    lf_set(y, -42);
+  =}
 }
 
 reactor print {
@@ -42,5 +44,7 @@ main reactor {
   timer t(0, 1 sec)
   f.y -> p.x
 
-  reaction(t) -> f.x {= lf_set(f.x, 42); =}
+  reaction(t) -> f.x {=
+    lf_set(f.x, 42);
+  =}
 }
diff --git a/test/C/src/SelfLoop.lf b/test/C/src/SelfLoop.lf
index 204a5e856c..f6671dc225 100644
--- a/test/C/src/SelfLoop.lf
+++ b/test/C/src/SelfLoop.lf
@@ -24,7 +24,9 @@ reactor Self {
     lf_schedule_int(a, MSEC(100), x->value);
   =}
 
-  reaction(startup) -> a {= lf_schedule_int(a, 0, 42); =}
+  reaction(startup) -> a {=
+    lf_schedule_int(a, 0, 42);
+  =}
 
   reaction(shutdown) {=
     if (self->expected <= 43) {
diff --git a/test/C/src/SendingInside2.lf b/test/C/src/SendingInside2.lf
index ab15278044..ea016a6307 100644
--- a/test/C/src/SendingInside2.lf
+++ b/test/C/src/SendingInside2.lf
@@ -16,5 +16,7 @@ main reactor SendingInside2 {
   timer t
   p = new Printer()
 
-  reaction(t) -> p.x {= lf_set(p.x, 1); =}
+  reaction(t) -> p.x {=
+    lf_set(p.x, 1);
+  =}
 }
diff --git a/test/C/src/SendsPointerTest.lf b/test/C/src/SendsPointerTest.lf
index f05bec4934..d4478e75ed 100644
--- a/test/C/src/SendsPointerTest.lf
+++ b/test/C/src/SendsPointerTest.lf
@@ -2,7 +2,9 @@
 // ensures that the struct is freed.
 target C
 
-preamble {= typedef int* int_pointer; =}
+preamble {=
+  typedef int* int_pointer;
+=}
 
 reactor SendsPointer {
   output out: int_pointer
diff --git a/test/C/src/SetToken.lf b/test/C/src/SetToken.lf
index 6b589c6e57..6dc7badada 100644
--- a/test/C/src/SetToken.lf
+++ b/test/C/src/SetToken.lf
@@ -5,9 +5,13 @@ reactor Source {
   output out: int*
   logical action a: int
 
-  reaction(startup) -> a {= lf_schedule_int(a, MSEC(200), 42); =}
+  reaction(startup) -> a {=
+    lf_schedule_int(a, MSEC(200), 42);
+  =}
 
-  reaction(a) -> out {= lf_set_token(out, a->token); =}
+  reaction(a) -> out {=
+    lf_set_token(out, a->token);
+  =}
 }
 
 // expected parameter is for testing.
diff --git a/test/C/src/SlowingClock.lf b/test/C/src/SlowingClock.lf
index 36cb07c553..24d832149f 100644
--- a/test/C/src/SlowingClock.lf
+++ b/test/C/src/SlowingClock.lf
@@ -13,7 +13,9 @@ main reactor SlowingClock {
   state interval: time = 100 msec
   state expected_time: time = 100 msec
 
-  reaction(startup) -> a {= lf_schedule(a, 0); =}
+  reaction(startup) -> a {=
+    lf_schedule(a, 0);
+  =}
 
   reaction(a) -> a {=
     instant_t elapsed_logical_time = lf_time_logical_elapsed();
diff --git a/test/C/src/StartupOutFromInside.lf b/test/C/src/StartupOutFromInside.lf
index 6233e0968f..b23ac76a55 100644
--- a/test/C/src/StartupOutFromInside.lf
+++ b/test/C/src/StartupOutFromInside.lf
@@ -3,7 +3,9 @@ target C
 reactor Bar {
   output out: int
 
-  reaction(startup) -> out {= lf_set(out, 42); =}
+  reaction(startup) -> out {=
+    lf_set(out, 42);
+  =}
 }
 
 main reactor StartupOutFromInside {
diff --git a/test/C/src/TimeLimit.lf b/test/C/src/TimeLimit.lf
index 4b1ea4f248..340cfff7f2 100644
--- a/test/C/src/TimeLimit.lf
+++ b/test/C/src/TimeLimit.lf
@@ -44,5 +44,7 @@ main reactor TimeLimit(period: time = 1 sec) {
   d = new Destination()
   c.y -> d.x
 
-  reaction(stop) {= lf_request_stop(); =}
+  reaction(stop) {=
+    lf_request_stop();
+  =}
 }
diff --git a/test/C/src/TimeState.lf b/test/C/src/TimeState.lf
index d3aaf2029a..18447e4769 100644
--- a/test/C/src/TimeState.lf
+++ b/test/C/src/TimeState.lf
@@ -3,7 +3,9 @@ target C
 reactor Foo(bar: int = 42) {
   state baz: time = 500 msec
 
-  reaction(startup) {= printf("Baz: %lld\n", self->baz); =}
+  reaction(startup) {=
+    printf("Baz: %lld\n", self->baz);
+  =}
 }
 
 main reactor {
diff --git a/test/C/src/UnconnectedInput.lf b/test/C/src/UnconnectedInput.lf
index 71a141f158..87ea298959 100644
--- a/test/C/src/UnconnectedInput.lf
+++ b/test/C/src/UnconnectedInput.lf
@@ -9,7 +9,9 @@ reactor Source {
   timer t(0, 1 sec)
   state s: int = 1
 
-  reaction(t) -> out {= lf_set(out, self->s++); =}
+  reaction(t) -> out {=
+    lf_set(out, self->s++);
+  =}
 }
 
 reactor Add {
diff --git a/test/C/src/Wcet.lf b/test/C/src/Wcet.lf
index 9e6f84be6a..d1aa88ae1b 100644
--- a/test/C/src/Wcet.lf
+++ b/test/C/src/Wcet.lf
@@ -31,7 +31,9 @@ reactor Work {
 reactor Print {
   input in: int
 
-  reaction(in) {= printf("Received: %d\n", in->value); =}
+  reaction(in) {=
+    printf("Received: %d\n", in->value);
+  =}
 }
 
 main reactor Wcet {
diff --git a/test/C/src/arduino/Blink.lf b/test/C/src/arduino/Blink.lf
index 2612e72a62..8fa855c03a 100644
--- a/test/C/src/arduino/Blink.lf
+++ b/test/C/src/arduino/Blink.lf
@@ -13,9 +13,15 @@ main reactor Blink {
   timer t1(0, 1 sec)
   timer t2(500 msec, 1 sec)
 
-  reaction(startup) {= pinMode(LED_BUILTIN, OUTPUT); =}
+  reaction(startup) {=
+    pinMode(LED_BUILTIN, OUTPUT);
+  =}
 
-  reaction(t1) {= digitalWrite(LED_BUILTIN, HIGH); =}
+  reaction(t1) {=
+    digitalWrite(LED_BUILTIN, HIGH);
+  =}
 
-  reaction(t2) {= digitalWrite(LED_BUILTIN, LOW); =}
+  reaction(t2) {=
+    digitalWrite(LED_BUILTIN, LOW);
+  =}
 }
diff --git a/test/C/src/arduino/BlinkAttemptThreading.lf b/test/C/src/arduino/BlinkAttemptThreading.lf
index 4c4dac927c..fb08214d26 100644
--- a/test/C/src/arduino/BlinkAttemptThreading.lf
+++ b/test/C/src/arduino/BlinkAttemptThreading.lf
@@ -15,9 +15,15 @@ main reactor BlinkAttemptThreading {
   timer t1(0, 1 sec)
   timer t2(500 msec, 1 sec)
 
-  reaction(startup) {= pinMode(LED_BUILTIN, OUTPUT); =}
+  reaction(startup) {=
+    pinMode(LED_BUILTIN, OUTPUT);
+  =}
 
-  reaction(t1) {= digitalWrite(LED_BUILTIN, HIGH); =}
+  reaction(t1) {=
+    digitalWrite(LED_BUILTIN, HIGH);
+  =}
 
-  reaction(t2) {= digitalWrite(LED_BUILTIN, LOW); =}
+  reaction(t2) {=
+    digitalWrite(LED_BUILTIN, LOW);
+  =}
 }
diff --git a/test/C/src/arduino/BlinkMBED.lf b/test/C/src/arduino/BlinkMBED.lf
index 3b2c84427e..2d7e4e329c 100644
--- a/test/C/src/arduino/BlinkMBED.lf
+++ b/test/C/src/arduino/BlinkMBED.lf
@@ -13,9 +13,15 @@ main reactor BlinkMBED {
   timer t1(0, 1 sec)
   timer t2(500 msec, 1 sec)
 
-  reaction(startup) {= pinMode(LED_BUILTIN, OUTPUT); =}
+  reaction(startup) {=
+    pinMode(LED_BUILTIN, OUTPUT);
+  =}
 
-  reaction(t1) {= digitalWrite(LED_BUILTIN, HIGH); =}
+  reaction(t1) {=
+    digitalWrite(LED_BUILTIN, HIGH);
+  =}
 
-  reaction(t2) {= digitalWrite(LED_BUILTIN, LOW); =}
+  reaction(t2) {=
+    digitalWrite(LED_BUILTIN, LOW);
+  =}
 }
diff --git a/test/C/src/arduino/DigitalReadSerial.lf b/test/C/src/arduino/DigitalReadSerial.lf
index e521585a5d..54a9af1e85 100644
--- a/test/C/src/arduino/DigitalReadSerial.lf
+++ b/test/C/src/arduino/DigitalReadSerial.lf
@@ -10,7 +10,9 @@ main reactor DigitalReadSerial {
   timer t1(0, 1 msec)
   state pushButton: int = 2
 
-  reaction(startup) {= pinMode(self->pushButton, INPUT); =}
+  reaction(startup) {=
+    pinMode(self->pushButton, INPUT);
+  =}
 
   reaction(t1) {=
     int buttonState = digitalRead(self->pushButton);
diff --git a/test/C/src/arduino/Fade.lf b/test/C/src/arduino/Fade.lf
index 2684ef2dd7..4c74a3dca1 100644
--- a/test/C/src/arduino/Fade.lf
+++ b/test/C/src/arduino/Fade.lf
@@ -17,7 +17,9 @@ main reactor Fade {
   state brightness: int = 9
   state fadeAmount: int = 5
 
-  reaction(startup) {= pinMode(self->led, OUTPUT); =}
+  reaction(startup) {=
+    pinMode(self->led, OUTPUT);
+  =}
 
   reaction(t1) {=
     analogWrite(self->led, self->brightness);
diff --git a/test/C/src/arduino/ReadAnalogVoltage.lf b/test/C/src/arduino/ReadAnalogVoltage.lf
index 4dbffbbb83..0f48633939 100644
--- a/test/C/src/arduino/ReadAnalogVoltage.lf
+++ b/test/C/src/arduino/ReadAnalogVoltage.lf
@@ -14,7 +14,9 @@ target C {
 main reactor ReadAnalogVoltage {
   logical action a
 
-  reaction(startup) -> a {= lf_schedule(a, 0); =}
+  reaction(startup) -> a {=
+    lf_schedule(a, 0);
+  =}
 
   reaction(a) -> a {=
     int sensorValue = analogRead(A0);
diff --git a/test/C/src/concurrent/DelayIntThreaded.lf b/test/C/src/concurrent/DelayIntThreaded.lf
index d328954454..a75b82ab6e 100644
--- a/test/C/src/concurrent/DelayIntThreaded.lf
+++ b/test/C/src/concurrent/DelayIntThreaded.lf
@@ -6,7 +6,9 @@ reactor Delay(delay: time = 100 msec) {
   output out: int
   logical action a: int
 
-  reaction(a) -> out {= lf_set(out, a->value); =}
+  reaction(a) -> out {=
+    lf_set(out, a->value);
+  =}
 
   reaction(in) -> a {=
     // Use specialized form of schedule for integer payloads.
@@ -55,5 +57,7 @@ main reactor {
   t = new Test()
   d.out -> t.in
 
-  reaction(startup) -> d.in {= lf_set(d.in, 42); =}
+  reaction(startup) -> d.in {=
+    lf_set(d.in, 42);
+  =}
 }
diff --git a/test/C/src/concurrent/DeterminismThreaded.lf b/test/C/src/concurrent/DeterminismThreaded.lf
index 813405f25f..2f73e3beaf 100644
--- a/test/C/src/concurrent/DeterminismThreaded.lf
+++ b/test/C/src/concurrent/DeterminismThreaded.lf
@@ -4,7 +4,9 @@ reactor Source {
   output y: int
   timer t
 
-  reaction(t) -> y {= lf_set(y, 1); =}
+  reaction(t) -> y {=
+    lf_set(y, 1);
+  =}
 }
 
 reactor Destination {
@@ -31,7 +33,9 @@ reactor Pass {
   input x: int
   output y: int
 
-  reaction(x) -> y {= lf_set(y, x->value); =}
+  reaction(x) -> y {=
+    lf_set(y, x->value);
+  =}
 }
 
 main reactor {
diff --git a/test/C/src/concurrent/GainThreaded.lf b/test/C/src/concurrent/GainThreaded.lf
index 688a36eabd..d501f9c108 100644
--- a/test/C/src/concurrent/GainThreaded.lf
+++ b/test/C/src/concurrent/GainThreaded.lf
@@ -5,7 +5,9 @@ reactor Scale(scale: int = 2) {
   input x: int
   output y: int
 
-  reaction(x) -> y {= lf_set(y, x->value * self->scale); =}
+  reaction(x) -> y {=
+    lf_set(y, x->value * self->scale);
+  =}
 }
 
 reactor Test {
@@ -35,5 +37,7 @@ main reactor {
   d = new Test()
   g.y -> d.x
 
-  reaction(startup) -> g.x {= lf_set(g.x, 1); =}
+  reaction(startup) -> g.x {=
+    lf_set(g.x, 1);
+  =}
 }
diff --git a/test/C/src/concurrent/ImportThreaded.lf b/test/C/src/concurrent/ImportThreaded.lf
index a40fd11fb7..cb4a0cad6b 100644
--- a/test/C/src/concurrent/ImportThreaded.lf
+++ b/test/C/src/concurrent/ImportThreaded.lf
@@ -7,5 +7,7 @@ main reactor ImportThreaded {
   timer t
   a = new Imported()
 
-  reaction(t) -> a.x {= lf_set(a.x, 42); =}
+  reaction(t) -> a.x {=
+    lf_set(a.x, 42);
+  =}
 }
diff --git a/test/C/src/concurrent/MinimalThreaded.lf b/test/C/src/concurrent/MinimalThreaded.lf
index dacafdcb73..8782c28ff6 100644
--- a/test/C/src/concurrent/MinimalThreaded.lf
+++ b/test/C/src/concurrent/MinimalThreaded.lf
@@ -4,5 +4,7 @@ target C
 main reactor MinimalThreaded {
   timer t
 
-  reaction(t) {= printf("Hello World.\n"); =}
+  reaction(t) {=
+    printf("Hello World.\n");
+  =}
 }
diff --git a/test/C/src/concurrent/PingPongThreaded.lf b/test/C/src/concurrent/PingPongThreaded.lf
index 69d7b512a2..59de2bb7bc 100644
--- a/test/C/src/concurrent/PingPongThreaded.lf
+++ b/test/C/src/concurrent/PingPongThreaded.lf
@@ -27,7 +27,9 @@ reactor Ping(count: int = 10) {
   state pingsLeft: int = count
   logical action serve
 
-  reaction(startup, serve) -> send {= lf_set(send, self->pingsLeft--); =}
+  reaction(startup, serve) -> send {=
+    lf_set(send, self->pingsLeft--);
+  =}
 
   reaction(receive) -> serve {=
     if (self->pingsLeft > 0) {
diff --git a/test/C/src/concurrent/TimeLimitThreaded.lf b/test/C/src/concurrent/TimeLimitThreaded.lf
index 8ada5f42f5..f2b7be9559 100644
--- a/test/C/src/concurrent/TimeLimitThreaded.lf
+++ b/test/C/src/concurrent/TimeLimitThreaded.lf
@@ -44,5 +44,7 @@ main reactor(period: time = 1 sec) {
   d = new Destination()
   c.y -> d.x
 
-  reaction(stop) {= lf_request_stop(); =}
+  reaction(stop) {=
+    lf_request_stop();
+  =}
 }
diff --git a/test/C/src/enclave/EnclaveRequestStop.lf b/test/C/src/enclave/EnclaveRequestStop.lf
index 781fb2811a..aea05a874d 100644
--- a/test/C/src/enclave/EnclaveRequestStop.lf
+++ b/test/C/src/enclave/EnclaveRequestStop.lf
@@ -9,7 +9,9 @@ reactor Stop(stop_time: time = 5 s) {
   =}
   timer t(stop_time)
 
-  reaction(t) {= lf_request_stop(); =}
+  reaction(t) {=
+    lf_request_stop();
+  =}
 
   reaction(shutdown) {=
     lf_print("Stopped at tag (" PRINTF_TIME ", %d)", lf_time_logical_elapsed(), lf_tag().microstep);
diff --git a/test/C/src/federated/BroadcastFeedback.lf b/test/C/src/federated/BroadcastFeedback.lf
index 179d49edc7..66a93c275b 100644
--- a/test/C/src/federated/BroadcastFeedback.lf
+++ b/test/C/src/federated/BroadcastFeedback.lf
@@ -9,7 +9,9 @@ reactor SenderAndReceiver {
   input[2] in: int
   state received: bool = false
 
-  reaction(startup) -> out {= lf_set(out, 42); =}
+  reaction(startup) -> out {=
+    lf_set(out, 42);
+  =}
 
   reaction(in) {=
     if (in[0]->is_present && in[1]->is_present && in[0]->value == 42 && in[1]->value == 42) {
diff --git a/test/C/src/federated/BroadcastFeedbackWithHierarchy.lf b/test/C/src/federated/BroadcastFeedbackWithHierarchy.lf
index 9896c1fdf8..114e42cfd7 100644
--- a/test/C/src/federated/BroadcastFeedbackWithHierarchy.lf
+++ b/test/C/src/federated/BroadcastFeedbackWithHierarchy.lf
@@ -11,7 +11,9 @@ reactor SenderAndReceiver {
   r = new Receiver()
   in -> r.in
 
-  reaction(startup) -> out {= lf_set(out, 42); =}
+  reaction(startup) -> out {=
+    lf_set(out, 42);
+  =}
 }
 
 reactor Receiver {
diff --git a/test/C/src/federated/CycleDetection.lf b/test/C/src/federated/CycleDetection.lf
index 6d7c818882..8128147bfe 100644
--- a/test/C/src/federated/CycleDetection.lf
+++ b/test/C/src/federated/CycleDetection.lf
@@ -23,14 +23,18 @@ reactor CAReplica {
     }
   =}
 
-  reaction(query) -> response {= lf_set(response, self->balance); =}
+  reaction(query) -> response {=
+    lf_set(response, self->balance);
+  =}
 }
 
 reactor UserInput {
   input balance: int
   output deposit: int
 
-  reaction(startup) -> deposit {= lf_set(deposit, 100); =}
+  reaction(startup) -> deposit {=
+    lf_set(deposit, 100);
+  =}
 
   reaction(balance) {=
     if (balance->value != 200) {
@@ -45,7 +49,9 @@ reactor UserInput {
     lf_request_stop();
   =}
 
-  reaction(shutdown) {= lf_print("Shutdown reaction invoked."); =}
+  reaction(shutdown) {=
+    lf_print("Shutdown reaction invoked.");
+  =}
 }
 
 federated reactor {
diff --git a/test/C/src/federated/DecentralizedP2PComm.lf b/test/C/src/federated/DecentralizedP2PComm.lf
index 63163bd98b..4cf42ce5e8 100644
--- a/test/C/src/federated/DecentralizedP2PComm.lf
+++ b/test/C/src/federated/DecentralizedP2PComm.lf
@@ -12,7 +12,9 @@ reactor Platform(start: int = 0, expected_start: int = 0, stp_offset_param: time
   state count: int = start
   state expected: int = expected_start
 
-  reaction(t) -> out {= lf_set(out, self->count++); =}
+  reaction(t) -> out {=
+    lf_set(out, self->count++);
+  =}
 
   reaction(in) {=
     lf_print("Received %d.", in->value);
diff --git a/test/C/src/federated/DecentralizedP2PUnbalancedTimeout.lf b/test/C/src/federated/DecentralizedP2PUnbalancedTimeout.lf
index 0ebed39189..6c45870898 100644
--- a/test/C/src/federated/DecentralizedP2PUnbalancedTimeout.lf
+++ b/test/C/src/federated/DecentralizedP2PUnbalancedTimeout.lf
@@ -21,7 +21,9 @@ reactor Clock(offset: time = 0, period: time = 1 sec) {
     lf_set(y, self->count);
   =}
 
-  reaction(shutdown) {= lf_print("SUCCESS: the source exited successfully."); =}
+  reaction(shutdown) {=
+    lf_print("SUCCESS: the source exited successfully.");
+  =}
 }
 
 reactor Destination {
diff --git a/test/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf b/test/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf
index 356222a266..ce7f42a1f5 100644
--- a/test/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf
+++ b/test/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf
@@ -22,7 +22,9 @@ reactor Clock(offset: time = 0, period: time = 1 sec) {
     lf_set(y, self->count);
   =}
 
-  reaction(shutdown) {= lf_print("SUCCESS: the source exited successfully."); =}
+  reaction(shutdown) {=
+    lf_print("SUCCESS: the source exited successfully.");
+  =}
 }
 
 reactor Destination {
diff --git a/test/C/src/federated/DistributedBank.lf b/test/C/src/federated/DistributedBank.lf
index bb23df81d6..f934bd7361 100644
--- a/test/C/src/federated/DistributedBank.lf
+++ b/test/C/src/federated/DistributedBank.lf
@@ -8,7 +8,9 @@ reactor Node(bank_index: int = 0) {
   timer t(0, 100 msec)
   state count: int = 0
 
-  reaction(t) {= lf_print("Hello world %d.", self->count++); =}
+  reaction(t) {=
+    lf_print("Hello world %d.", self->count++);
+  =}
 
   reaction(shutdown) {=
     if (self->bank_index) {
diff --git a/test/C/src/federated/DistributedDoublePort.lf b/test/C/src/federated/DistributedDoublePort.lf
index 5885d20a7e..ced1663dba 100644
--- a/test/C/src/federated/DistributedDoublePort.lf
+++ b/test/C/src/federated/DistributedDoublePort.lf
@@ -18,9 +18,13 @@ reactor CountMicrostep {
   logical action act: int
   timer t(0, 1 sec)
 
-  reaction(t) -> act {= lf_schedule_int(act, 0, self->count++); =}
+  reaction(t) -> act {=
+    lf_schedule_int(act, 0, self->count++);
+  =}
 
-  reaction(act) -> out {= lf_set(out, act->value); =}
+  reaction(act) -> out {=
+    lf_set(out, act->value);
+  =}
 }
 
 reactor Print {
@@ -35,7 +39,9 @@ reactor Print {
     }
   =}
 
-  reaction(shutdown) {= lf_print("SUCCESS: messages were at least one microstep apart."); =}
+  reaction(shutdown) {=
+    lf_print("SUCCESS: messages were at least one microstep apart.");
+  =}
 }
 
 federated reactor DistributedDoublePort {
diff --git a/test/C/src/federated/DistributedPhysicalActionUpstream.lf b/test/C/src/federated/DistributedPhysicalActionUpstream.lf
index 847e9547ed..3a85c9b3d1 100644
--- a/test/C/src/federated/DistributedPhysicalActionUpstream.lf
+++ b/test/C/src/federated/DistributedPhysicalActionUpstream.lf
@@ -44,7 +44,9 @@ reactor WithPhysicalAction {
     lf_thread_create(&self->thread_id, &take_time, act);
   =}
 
-  reaction(act) -> out {= lf_set(out, act->value); =}
+  reaction(act) -> out {=
+    lf_set(out, act->value);
+  =}
 }
 
 federated reactor {
diff --git a/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf b/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf
index 180e05be47..99154b1ad2 100644
--- a/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf
+++ b/test/C/src/federated/DistributedPhysicalActionUpstreamLong.lf
@@ -43,7 +43,9 @@ reactor WithPhysicalAction {
     lf_thread_create(&self->thread_id, &take_time, act);
   =}
 
-  reaction(act) -> out {= lf_set(out, act->value); =}
+  reaction(act) -> out {=
+    lf_set(out, act->value);
+  =}
 }
 
 federated reactor {
diff --git a/test/C/src/federated/EnclaveFederatedRequestStop.lf b/test/C/src/federated/EnclaveFederatedRequestStop.lf
index cb92f4f20d..1a3a590308 100644
--- a/test/C/src/federated/EnclaveFederatedRequestStop.lf
+++ b/test/C/src/federated/EnclaveFederatedRequestStop.lf
@@ -12,7 +12,9 @@ reactor Stop(stop_time: time = 5 s) {
   =}
   timer t(stop_time)
 
-  reaction(t) {= lf_request_stop(); =}
+  reaction(t) {=
+    lf_request_stop();
+  =}
 
   reaction(shutdown) {=
     lf_print("Stopped at tag (" PRINTF_TIME ", %d)", lf_time_logical_elapsed(), lf_tag().microstep);
diff --git a/test/C/src/federated/FeedbackDelay.lf b/test/C/src/federated/FeedbackDelay.lf
index ed458a9749..8bec54dc9f 100644
--- a/test/C/src/federated/FeedbackDelay.lf
+++ b/test/C/src/federated/FeedbackDelay.lf
@@ -20,7 +20,9 @@ reactor PhysicalPlant {
     instant_t control_time = lf_time_physical();
     lf_print("Latency %lld.", control_time - self->previous_sensor_time);
     lf_print("Logical time: %lld.", lf_time_logical_elapsed());
-  =} STP(33 msec) {= lf_print_warning("STP violation."); =}
+  =} STP(33 msec) {=
+    lf_print_warning("STP violation.");
+  =}
 }
 
 reactor Controller {
@@ -33,7 +35,9 @@ reactor Controller {
   output request_for_planning: double
   input planning: double
 
-  reaction(planning) {= self->latest_control = planning->value; =}
+  reaction(planning) {=
+    self->latest_control = planning->value;
+  =}
 
   reaction(sensor) -> control, request_for_planning {=
     if (!self->first) {
diff --git a/test/C/src/federated/FeedbackDelaySimple.lf b/test/C/src/federated/FeedbackDelaySimple.lf
index ece831bf11..655fbe0762 100644
--- a/test/C/src/federated/FeedbackDelaySimple.lf
+++ b/test/C/src/federated/FeedbackDelaySimple.lf
@@ -20,7 +20,9 @@ reactor Loop {
     self->count++;
   =}
 
-  reaction(t) -> out {= lf_set(out, self->count); =}
+  reaction(t) -> out {=
+    lf_set(out, self->count);
+  =}
 
   reaction(shutdown) {=
     if (self->count != 11) {
diff --git a/test/C/src/federated/HelloDistributed.lf b/test/C/src/federated/HelloDistributed.lf
index 4b06399fa4..8fa47c22c9 100644
--- a/test/C/src/federated/HelloDistributed.lf
+++ b/test/C/src/federated/HelloDistributed.lf
@@ -24,7 +24,9 @@ reactor Destination {
   input in: string
   state received: bool = false
 
-  reaction(startup) {= lf_print("Destination started."); =}
+  reaction(startup) {=
+    lf_print("Destination started.");
+  =}
 
   reaction(in) {=
     lf_print("At logical time %lld, destination received: %s", lf_time_logical_elapsed(), in->value);
@@ -48,5 +50,7 @@ federated reactor HelloDistributed at localhost {
   d = new Destination()  // Reactor d is in federate Destination
   s.out -> d.in          // This version preserves the timestamp.
 
-  reaction(startup) {= lf_print("Printing something in top-level federated reactor."); =}
+  reaction(startup) {=
+    lf_print("Printing something in top-level federated reactor.");
+  =}
 }
diff --git a/test/C/src/federated/InheritanceFederated.lf b/test/C/src/federated/InheritanceFederated.lf
index 70f429dbc8..90098b29bb 100644
--- a/test/C/src/federated/InheritanceFederated.lf
+++ b/test/C/src/federated/InheritanceFederated.lf
@@ -6,7 +6,9 @@ target C {
 }
 
 reactor A {
-  reaction(startup) {= printf("Hello\n"); =}
+  reaction(startup) {=
+    printf("Hello\n");
+  =}
 }
 
 reactor B {
diff --git a/test/C/src/federated/InheritanceFederatedImport.lf b/test/C/src/federated/InheritanceFederatedImport.lf
index 0918e6809b..37da485956 100644
--- a/test/C/src/federated/InheritanceFederatedImport.lf
+++ b/test/C/src/federated/InheritanceFederatedImport.lf
@@ -7,7 +7,9 @@ target C {
 import HelloWorld2 from "../HelloWorld.lf"
 
 reactor Print extends HelloWorld2 {
-  reaction(startup) {= printf("Foo\n"); =}
+  reaction(startup) {=
+    printf("Foo\n");
+  =}
 }
 
 federated reactor {
diff --git a/test/C/src/federated/LevelPattern.lf b/test/C/src/federated/LevelPattern.lf
index da47325ba1..1721861b14 100644
--- a/test/C/src/federated/LevelPattern.lf
+++ b/test/C/src/federated/LevelPattern.lf
@@ -15,7 +15,9 @@ reactor Through {
   input in: int
   output out: int
 
-  reaction(in) -> out {= lf_set(out, in->value); =}
+  reaction(in) -> out {=
+    lf_set(out, in->value);
+  =}
 }
 
 reactor A {
@@ -30,9 +32,13 @@ reactor A {
   i2 = new Through()
   i2.out -> out2
 
-  reaction(in1) -> i1.in {= lf_set(i1.in, in1->value); =}
+  reaction(in1) -> i1.in {=
+    lf_set(i1.in, in1->value);
+  =}
 
-  reaction(in2) -> i2.in {= lf_set(i2.in, in2->value); =}
+  reaction(in2) -> i2.in {=
+    lf_set(i2.in, in2->value);
+  =}
 }
 
 federated reactor {
diff --git a/test/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf b/test/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf
index 9e8fb02059..82adfca699 100644
--- a/test/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf
+++ b/test/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf
@@ -20,9 +20,13 @@ reactor Contained(incr: int = 1) {
   state count: int = 0
   state received_count: int = 0
 
-  reaction(t) {= self->count += self->incr; =}
+  reaction(t) {=
+    self->count += self->incr;
+  =}
 
-  reaction(in) {= self->received_count = self->count; =}
+  reaction(in) {=
+    self->received_count = self->count;
+  =}
 
   reaction(t) {=
     if (self->received_count != self->count) {
diff --git a/test/C/src/federated/SpuriousDependency.lf b/test/C/src/federated/SpuriousDependency.lf
index cf0deb6380..b810d5288f 100644
--- a/test/C/src/federated/SpuriousDependency.lf
+++ b/test/C/src/federated/SpuriousDependency.lf
@@ -35,7 +35,9 @@ reactor Check {
 
   state count: int = 0
 
-  reaction(in) {= lf_print("count is now %d", ++self->count); =}
+  reaction(in) {=
+    lf_print("count is now %d", ++self->count);
+  =}
 
   reaction(shutdown) {=
     lf_print("******* Shutdown invoked.");
@@ -55,5 +57,7 @@ federated reactor {
 
   t1.out0 -> check.in
 
-  reaction(startup) -> t0.in1 {= lf_set(t0.in1, 0); =}
+  reaction(startup) -> t0.in1 {=
+    lf_set(t0.in1, 0);
+  =}
 }
diff --git a/test/C/src/federated/StopAtShutdown.lf b/test/C/src/federated/StopAtShutdown.lf
index 2ac97d6805..2fad7db3d0 100644
--- a/test/C/src/federated/StopAtShutdown.lf
+++ b/test/C/src/federated/StopAtShutdown.lf
@@ -12,20 +12,30 @@ target C {
 reactor A {
   input in: int
 
-  reaction(startup) {= lf_print("Hello World!"); =}
+  reaction(startup) {=
+    lf_print("Hello World!");
+  =}
 
-  reaction(in) {= lf_print("Got it"); =}
+  reaction(in) {=
+    lf_print("Got it");
+  =}
 
-  reaction(shutdown) {= lf_request_stop(); =}
+  reaction(shutdown) {=
+    lf_request_stop();
+  =}
 }
 
 reactor B {
   output out: int
   timer t(1 sec)
 
-  reaction(t) -> out {= lf_set(out, 1); =}
+  reaction(t) -> out {=
+    lf_set(out, 1);
+  =}
 
-  reaction(shutdown) {= lf_request_stop(); =}
+  reaction(shutdown) {=
+    lf_request_stop();
+  =}
 }
 
 federated reactor {
diff --git a/test/C/src/federated/TopLevelArtifacts.lf b/test/C/src/federated/TopLevelArtifacts.lf
index b2e486b31d..d73ea35967 100644
--- a/test/C/src/federated/TopLevelArtifacts.lf
+++ b/test/C/src/federated/TopLevelArtifacts.lf
@@ -22,14 +22,18 @@ federated reactor {
   tc = new TestCount()
   c.out -> tc.in
 
-  reaction(startup) {= self->successes++; =}
+  reaction(startup) {=
+    self->successes++;
+  =}
 
   reaction(t) -> act {=
     self->successes++;
     lf_schedule(act, 0);
   =}
 
-  reaction(act) {= self->successes++; =}
+  reaction(act) {=
+    self->successes++;
+  =}
 
   reaction(shutdown) {=
     if (self->successes != 3) {
diff --git a/test/C/src/generics/ParameterAsArgument.lf b/test/C/src/generics/ParameterAsArgument.lf
index f6d460279e..47b3c3c903 100644
--- a/test/C/src/generics/ParameterAsArgument.lf
+++ b/test/C/src/generics/ParameterAsArgument.lf
@@ -23,5 +23,7 @@ reactor Super<T1, T2, T3, In, Out> {
 main reactor {
   cc = new Super<long, double, char, int, float>()
 
-  reaction(startup) -> cc.in {= lf_set(cc.in, 42); =}
+  reaction(startup) -> cc.in {=
+    lf_set(cc.in, 42);
+  =}
 }
diff --git a/test/C/src/generics/TypeCheck.lf b/test/C/src/generics/TypeCheck.lf
index db3524798e..d04e2dfa87 100644
--- a/test/C/src/generics/TypeCheck.lf
+++ b/test/C/src/generics/TypeCheck.lf
@@ -9,7 +9,9 @@ reactor Count(offset: time = 0, period: time = 1 sec) {
   output out: int
   timer t(offset, period)
 
-  reaction(t) -> out {= lf_set(out, self->count++); =}
+  reaction(t) -> out {=
+    lf_set(out, self->count++);
+  =}
 }
 
 reactor TestCount<T>(start: int = 1, num_inputs: int = 1) {
diff --git a/test/C/src/lib/Count.lf b/test/C/src/lib/Count.lf
index 5b8d7b5844..ee3953b021 100644
--- a/test/C/src/lib/Count.lf
+++ b/test/C/src/lib/Count.lf
@@ -5,5 +5,7 @@ reactor Count(offset: time = 0, period: time = 1 sec) {
   output out: int
   timer t(offset, period)
 
-  reaction(t) -> out {= lf_set(out, self->count++); =}
+  reaction(t) -> out {=
+    lf_set(out, self->count++);
+  =}
 }
diff --git a/test/C/src/lib/FileLevelPreamble.lf b/test/C/src/lib/FileLevelPreamble.lf
index f11186979d..11067d5e63 100644
--- a/test/C/src/lib/FileLevelPreamble.lf
+++ b/test/C/src/lib/FileLevelPreamble.lf
@@ -6,5 +6,7 @@ preamble {=
 =}
 
 reactor FileLevelPreamble {
-  reaction(startup) {= printf("FOO: %d\n", FOO); =}
+  reaction(startup) {=
+    printf("FOO: %d\n", FOO);
+  =}
 }
diff --git a/test/C/src/lib/GenDelay.lf b/test/C/src/lib/GenDelay.lf
index a9d607db75..8f21c3de1b 100644
--- a/test/C/src/lib/GenDelay.lf
+++ b/test/C/src/lib/GenDelay.lf
@@ -1,15 +1,21 @@
 target C
 
-preamble {= typedef int message_t; =}
+preamble {=
+  typedef int message_t;
+=}
 
 reactor Source {
   output out: message_t
 
-  reaction(startup) -> out {= lf_set(out, 42); =}
+  reaction(startup) -> out {=
+    lf_set(out, 42);
+  =}
 }
 
 reactor Sink {
   input in: message_t
 
-  reaction(in) {= lf_print("Received %d at time %lld", in->value, lf_time_logical_elapsed()); =}
+  reaction(in) {=
+    lf_print("Received %d at time %lld", in->value, lf_time_logical_elapsed());
+  =}
 }
diff --git a/test/C/src/lib/Imported.lf b/test/C/src/lib/Imported.lf
index 30e17cd94e..85d0a2b493 100644
--- a/test/C/src/lib/Imported.lf
+++ b/test/C/src/lib/Imported.lf
@@ -8,5 +8,7 @@ reactor Imported {
   input x: int
   a = new ImportedAgain()
 
-  reaction(x) -> a.x {= lf_set(a.x, x->value); =}
+  reaction(x) -> a.x {=
+    lf_set(a.x, x->value);
+  =}
 }
diff --git a/test/C/src/lib/ImportedComposition.lf b/test/C/src/lib/ImportedComposition.lf
index d434f4eb6a..e5524f3d22 100644
--- a/test/C/src/lib/ImportedComposition.lf
+++ b/test/C/src/lib/ImportedComposition.lf
@@ -6,7 +6,9 @@ reactor Gain {
   input x: int
   output y: int
 
-  reaction(x) -> y {= lf_set(y, x->value * 2); =}
+  reaction(x) -> y {=
+    lf_set(y, x->value * 2);
+  =}
 }
 
 reactor ImportedComposition {
diff --git a/test/C/src/lib/InternalDelay.lf b/test/C/src/lib/InternalDelay.lf
index 33ccf9e230..fb7124a4ec 100644
--- a/test/C/src/lib/InternalDelay.lf
+++ b/test/C/src/lib/InternalDelay.lf
@@ -5,7 +5,11 @@ reactor InternalDelay(delay: time = 10 msec) {
   output out: int
   logical action d: int
 
-  reaction(in) -> d {= lf_schedule_int(d, self->delay, in->value); =}
+  reaction(in) -> d {=
+    lf_schedule_int(d, self->delay, in->value);
+  =}
 
-  reaction(d) -> out {= lf_set(out, d->value); =}
+  reaction(d) -> out {=
+    lf_set(out, d->value);
+  =}
 }
diff --git a/test/C/src/lib/PassThrough.lf b/test/C/src/lib/PassThrough.lf
index 90d9138c09..389905489a 100644
--- a/test/C/src/lib/PassThrough.lf
+++ b/test/C/src/lib/PassThrough.lf
@@ -5,5 +5,7 @@ reactor PassThrough {
   input in: int
   output out: int
 
-  reaction(in) -> out {= lf_set(out, in->value); =}
+  reaction(in) -> out {=
+    lf_set(out, in->value);
+  =}
 }
diff --git a/test/C/src/modal_models/BanksCount3ModesComplex.lf b/test/C/src/modal_models/BanksCount3ModesComplex.lf
index e548d28cef..48774e0b80 100644
--- a/test/C/src/modal_models/BanksCount3ModesComplex.lf
+++ b/test/C/src/modal_models/BanksCount3ModesComplex.lf
@@ -25,7 +25,9 @@ reactor MetaCounter {
     mode1_counters.count -> mode1
 
     timer t1(500 msec, 250 msec)
-    reaction(t1) -> reset(Two) {= lf_set_mode(Two); =}
+    reaction(t1) -> reset(Two) {=
+      lf_set_mode(Two);
+    =}
   }
 
   mode Two {
@@ -35,7 +37,9 @@ reactor MetaCounter {
     mode2_counters.count -> mode2
 
     timer t2(500 msec, 250 msec)
-    reaction(t2) -> history(One) {= lf_set_mode(One); =}
+    reaction(t2) -> history(One) {=
+      lf_set_mode(One);
+    =}
   }
 
   mode Three {
diff --git a/test/C/src/modal_models/ConvertCaseTest.lf b/test/C/src/modal_models/ConvertCaseTest.lf
index 09cb159f2d..eeab275996 100644
--- a/test/C/src/modal_models/ConvertCaseTest.lf
+++ b/test/C/src/modal_models/ConvertCaseTest.lf
@@ -15,13 +15,19 @@ reactor ResetProcessor {
     converter = new Converter()
     character -> converter.raw
     converter.converted -> converted
-    reaction(discard) -> reset(Discarding) {= lf_set_mode(Discarding); =}
+    reaction(discard) -> reset(Discarding) {=
+      lf_set_mode(Discarding);
+    =}
   }
 
   mode Discarding {
-    reaction(character) -> converted {= lf_set(converted, '_'); =}
+    reaction(character) -> converted {=
+      lf_set(converted, '_');
+    =}
 
-    reaction(character) -> reset(Converting) {= lf_set_mode(Converting); =}
+    reaction(character) -> reset(Converting) {=
+      lf_set_mode(Converting);
+    =}
   }
 }
 
@@ -34,13 +40,19 @@ reactor HistoryProcessor {
     converter = new Converter()
     character -> converter.raw
     converter.converted -> converted
-    reaction(discard) -> reset(Discarding) {= lf_set_mode(Discarding); =}
+    reaction(discard) -> reset(Discarding) {=
+      lf_set_mode(Discarding);
+    =}
   }
 
   mode Discarding {
-    reaction(character) -> converted {= lf_set(converted, '_'); =}
+    reaction(character) -> converted {=
+      lf_set(converted, '_');
+    =}
 
-    reaction(character) -> history(Converting) {= lf_set_mode(Converting); =}
+    reaction(character) -> history(Converting) {=
+      lf_set_mode(Converting);
+    =}
   }
 }
 
@@ -128,7 +140,9 @@ main reactor {
     lf_set(history_processor.discard, true);
   =}
 
-  reaction(reset_processor.converted) {= printf("Reset: %c\n", reset_processor.converted->value); =}
+  reaction(reset_processor.converted) {=
+    printf("Reset: %c\n", reset_processor.converted->value);
+  =}
 
   reaction(history_processor.converted) {=
     printf("History: %c\n", history_processor.converted->value);
diff --git a/test/C/src/modal_models/Count3Modes.lf b/test/C/src/modal_models/Count3Modes.lf
index 3c2b419a00..232482e009 100644
--- a/test/C/src/modal_models/Count3Modes.lf
+++ b/test/C/src/modal_models/Count3Modes.lf
@@ -36,7 +36,10 @@ main reactor {
 
   state expected_value: int = 1
 
-  reaction(stepper) -> counter.next {= lf_set(counter.next, true); =}  // Trigger
+  // Trigger
+  reaction(stepper) -> counter.next {=
+    lf_set(counter.next, true);
+  =}
 
   // Check
   reaction(stepper) counter.count {=
diff --git a/test/C/src/modal_models/MixedReactions.lf b/test/C/src/modal_models/MixedReactions.lf
index ed9ae422f3..a67d470b91 100644
--- a/test/C/src/modal_models/MixedReactions.lf
+++ b/test/C/src/modal_models/MixedReactions.lf
@@ -13,9 +13,13 @@ main reactor {
 
   timer t(0, 100 msec)
 
-  reaction(t) {= self->x = self->x * 10 + 1; =}
+  reaction(t) {=
+    self->x = self->x * 10 + 1;
+  =}
 
-  reaction(t) {= self->x = self->x * 10 + 2; =}
+  reaction(t) {=
+    self->x = self->x * 10 + 2;
+  =}
 
   initial mode A {
     reaction(t) -> reset(B) {=
@@ -24,10 +28,14 @@ main reactor {
     =}
   }
 
-  reaction(t) {= self->x = self->x * 10 + 4; =}
+  reaction(t) {=
+    self->x = self->x * 10 + 4;
+  =}
 
   mode B {
-    reaction(t) {= self->x = self->x * 10 + 5; =}
+    reaction(t) {=
+      self->x = self->x * 10 + 5;
+    =}
   }
 
   reaction(t) {=
diff --git a/test/C/src/modal_models/ModalActions.lf b/test/C/src/modal_models/ModalActions.lf
index cf473cd125..3cebd07b30 100644
--- a/test/C/src/modal_models/ModalActions.lf
+++ b/test/C/src/modal_models/ModalActions.lf
@@ -89,5 +89,8 @@ main reactor {
   modal.action2_sched,
   modal.action2_exec -> test.events
 
-  reaction(stepper) -> modal.next {= lf_set(modal.next, true); =}  // Trigger mode change
+  // Trigger mode change
+  reaction(stepper) -> modal.next {=
+    lf_set(modal.next, true);
+  =}
 }
diff --git a/test/C/src/modal_models/ModalAfter.lf b/test/C/src/modal_models/ModalAfter.lf
index 0b0c7251fc..fb2b36d71e 100644
--- a/test/C/src/modal_models/ModalAfter.lf
+++ b/test/C/src/modal_models/ModalAfter.lf
@@ -91,5 +91,8 @@ main reactor {
   modal.mode_switch, modal.produced1, modal.consumed1, modal.produced2, modal.consumed2
     -> test.events
 
-  reaction(stepper) -> modal.next {= lf_set(modal.next, true); =}  // Trigger mode change
+  // Trigger mode change
+  reaction(stepper) -> modal.next {=
+    lf_set(modal.next, true);
+  =}
 }
diff --git a/test/C/src/modal_models/ModalCycleBreaker.lf b/test/C/src/modal_models/ModalCycleBreaker.lf
index 428555e165..0f90275bee 100644
--- a/test/C/src/modal_models/ModalCycleBreaker.lf
+++ b/test/C/src/modal_models/ModalCycleBreaker.lf
@@ -30,7 +30,9 @@ reactor Modal {
   }
 
   initial mode One {
-    reaction(in1) -> out {= lf_set(out, in1->value); =}
+    reaction(in1) -> out {=
+      lf_set(out, in1->value);
+    =}
 
     reaction(in1) -> reset(Two) {=
       if (in1->value % 5 == 4) {
@@ -47,7 +49,9 @@ reactor Counter(period: time = 1 sec) {
   timer t(0, period)
   state curval: int = 0
 
-  reaction(t) -> value {= lf_set(value, self->curval++); =}
+  reaction(t) -> value {=
+    lf_set(value, self->curval++);
+  =}
 }
 
 main reactor {
@@ -70,5 +74,8 @@ main reactor {
 
   modal.out -> test.events
 
-  reaction(modal.out) {= printf("%d\n", modal.out->value); =}  // Print
+  // Print
+  reaction(modal.out) {=
+    printf("%d\n", modal.out->value);
+  =}
 }
diff --git a/test/C/src/modal_models/ModalNestedReactions.lf b/test/C/src/modal_models/ModalNestedReactions.lf
index e796c3df31..88bb61c8bb 100644
--- a/test/C/src/modal_models/ModalNestedReactions.lf
+++ b/test/C/src/modal_models/ModalNestedReactions.lf
@@ -29,7 +29,9 @@ reactor CounterCycle {
   }
 
   mode Three {
-    reaction(next) -> never {= lf_set(never, true); =}
+    reaction(next) -> never {=
+      lf_set(never, true);
+    =}
   }
 }
 
@@ -37,14 +39,19 @@ reactor Forward {
   input in: bool
   output out: bool
 
-  reaction(in) -> out {= lf_set(out, in->value); =}
+  reaction(in) -> out {=
+    lf_set(out, in->value);
+  =}
 }
 
 main reactor {
   timer stepper(0, 250 msec)
   counter = new CounterCycle()
 
-  reaction(stepper) -> counter.next {= lf_set(counter.next, true); =}  // Trigger
+  // Trigger
+  reaction(stepper) -> counter.next {=
+    lf_set(counter.next, true);
+  =}
 
   // Check
   reaction(stepper) counter.count, counter.only_in_two {=
diff --git a/test/C/src/modal_models/ModalStartupShutdown.lf b/test/C/src/modal_models/ModalStartupShutdown.lf
index d26a743ec7..2c0e974c67 100644
--- a/test/C/src/modal_models/ModalStartupShutdown.lf
+++ b/test/C/src/modal_models/ModalStartupShutdown.lf
@@ -137,5 +137,8 @@ main reactor {
   modal.reset5,
   modal.shutdown5 -> test.events
 
-  reaction(stepper) -> modal.next {= lf_set(modal.next, true); =}  // Trigger mode change
+  // Trigger mode change
+  reaction(stepper) -> modal.next {=
+    lf_set(modal.next, true);
+  =}
 }
diff --git a/test/C/src/modal_models/ModalStateReset.lf b/test/C/src/modal_models/ModalStateReset.lf
index 181a8b1189..c8cf41d351 100644
--- a/test/C/src/modal_models/ModalStateReset.lf
+++ b/test/C/src/modal_models/ModalStateReset.lf
@@ -24,7 +24,9 @@ reactor Modal {
   initial mode One {
     state counter1: int = 0
     timer T1(0 msec, 250 msec)
-    reaction(reset) {= self->counter1 = 0; =}
+    reaction(reset) {=
+      self->counter1 = 0;
+    =}
 
     reaction(T1) -> count1 {=
       printf("Counter1: %d\n", self->counter1);
@@ -41,7 +43,9 @@ reactor Modal {
   mode Two {
     state counter2: int = -2
     timer T2(0 msec, 250 msec)
-    reaction(reset) {= self->counter2 = -2; =}
+    reaction(reset) {=
+      self->counter2 = -2;
+    =}
 
     reaction(T2) -> count2 {=
       printf("Counter2: %d\n", self->counter2);
@@ -84,5 +88,8 @@ main reactor {
 
   modal.mode_switch, modal.count0, modal.count1, modal.count2 -> test.events
 
-  reaction(stepper) -> modal.next {= lf_set(modal.next, true); =}  // Trigger mode change
+  // Trigger mode change
+  reaction(stepper) -> modal.next {=
+    lf_set(modal.next, true);
+  =}
 }
diff --git a/test/C/src/modal_models/ModalStateResetAuto.lf b/test/C/src/modal_models/ModalStateResetAuto.lf
index 82832da72d..3fd6ec739d 100644
--- a/test/C/src/modal_models/ModalStateResetAuto.lf
+++ b/test/C/src/modal_models/ModalStateResetAuto.lf
@@ -80,5 +80,8 @@ main reactor {
 
   modal.mode_switch, modal.count0, modal.count1, modal.count2 -> test.events
 
-  reaction(stepper) -> modal.next {= lf_set(modal.next, true); =}  // Trigger mode change
+  // Trigger mode change
+  reaction(stepper) -> modal.next {=
+    lf_set(modal.next, true);
+  =}
 }
diff --git a/test/C/src/modal_models/ModalTimers.lf b/test/C/src/modal_models/ModalTimers.lf
index 8e67b6aa75..89287c0819 100644
--- a/test/C/src/modal_models/ModalTimers.lf
+++ b/test/C/src/modal_models/ModalTimers.lf
@@ -62,5 +62,8 @@ main reactor {
 
   modal.mode_switch, modal.timer1, modal.timer2 -> test.events
 
-  reaction(stepper) -> modal.next {= lf_set(modal.next, true); =}  // Trigger mode change
+  // Trigger mode change
+  reaction(stepper) -> modal.next {=
+    lf_set(modal.next, true);
+  =}
 }
diff --git a/test/C/src/modal_models/MultipleOutputFeeder_2Connections.lf b/test/C/src/modal_models/MultipleOutputFeeder_2Connections.lf
index 637f546498..b84184619b 100644
--- a/test/C/src/modal_models/MultipleOutputFeeder_2Connections.lf
+++ b/test/C/src/modal_models/MultipleOutputFeeder_2Connections.lf
@@ -18,13 +18,17 @@ reactor Modal {
   initial mode One {
     counter1 = new Counter(period = 250 msec)
     counter1.value -> count
-    reaction(next) -> reset(Two) {= lf_set_mode(Two); =}
+    reaction(next) -> reset(Two) {=
+      lf_set_mode(Two);
+    =}
   }
 
   mode Two {
     counter2 = new Counter(period = 100 msec)
     counter2.value -> count
-    reaction(next) -> history(One) {= lf_set_mode(One); =}
+    reaction(next) -> history(One) {=
+      lf_set_mode(One);
+    =}
   }
 }
 
@@ -34,7 +38,9 @@ reactor Counter(period: time = 1 sec) {
   timer t(0, period)
   reset state curval: int = 0
 
-  reaction(t) -> value {= lf_set(value, self->curval++); =}
+  reaction(t) -> value {=
+    lf_set(value, self->curval++);
+  =}
 }
 
 main reactor {
@@ -63,7 +69,13 @@ main reactor {
 
   modal.count -> test.events
 
-  reaction(stepper) -> modal.next {= lf_set(modal.next, true); =}  // Trigger mode change
+  // Trigger mode change
+  reaction(stepper) -> modal.next {=
+    lf_set(modal.next, true);
+  =}
 
-  reaction(modal.count) {= printf("%d\n", modal.count->value); =}  // Print
+  // Print
+  reaction(modal.count) {=
+    printf("%d\n", modal.count->value);
+  =}
 }
diff --git a/test/C/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf b/test/C/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf
index 1281b3f490..90615541f4 100644
--- a/test/C/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf
+++ b/test/C/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf
@@ -18,14 +18,20 @@ reactor Modal {
   initial mode One {
     counter1 = new Counter(period = 250 msec)
     counter1.value -> count
-    reaction(next) -> reset(Two) {= lf_set_mode(Two); =}
+    reaction(next) -> reset(Two) {=
+      lf_set_mode(Two);
+    =}
   }
 
   mode Two {
     counter2 = new Counter(period = 100 msec)
-    reaction(counter2.value) -> count {= lf_set(count, counter2.value->value * 10); =}
+    reaction(counter2.value) -> count {=
+      lf_set(count, counter2.value->value * 10);
+    =}
 
-    reaction(next) -> history(One) {= lf_set_mode(One); =}
+    reaction(next) -> history(One) {=
+      lf_set_mode(One);
+    =}
   }
 }
 
@@ -35,7 +41,9 @@ reactor Counter(period: time = 1 sec) {
   timer t(0, period)
   reset state curval: int = 0
 
-  reaction(t) -> value {= lf_set(value, self->curval++); =}
+  reaction(t) -> value {=
+    lf_set(value, self->curval++);
+  =}
 }
 
 main reactor {
@@ -64,7 +72,13 @@ main reactor {
 
   modal.count -> test.events
 
-  reaction(stepper) -> modal.next {= lf_set(modal.next, true); =}  // Trigger mode change
+  // Trigger mode change
+  reaction(stepper) -> modal.next {=
+    lf_set(modal.next, true);
+  =}
 
-  reaction(modal.count) {= printf("%d\n", modal.count->value); =}  // Print
+  // Print
+  reaction(modal.count) {=
+    printf("%d\n", modal.count->value);
+  =}
 }
diff --git a/test/C/src/modal_models/util/TraceTesting.lf b/test/C/src/modal_models/util/TraceTesting.lf
index 86908ad2e5..f317c3579d 100644
--- a/test/C/src/modal_models/util/TraceTesting.lf
+++ b/test/C/src/modal_models/util/TraceTesting.lf
@@ -13,7 +13,9 @@ reactor TraceTesting(
   state recorded_events: int* = 0
   state recorded_events_next: int = 0
 
-  reaction(startup) {= self->last_reaction_time = lf_time_logical(); =}
+  reaction(startup) {=
+    self->last_reaction_time = lf_time_logical();
+  =}
 
   reaction(events) {=
     // Time passed since last reaction
diff --git a/test/C/src/multiport/BankGangedConnections.lf b/test/C/src/multiport/BankGangedConnections.lf
index 231014c55e..e2e20c78ad 100644
--- a/test/C/src/multiport/BankGangedConnections.lf
+++ b/test/C/src/multiport/BankGangedConnections.lf
@@ -9,7 +9,9 @@ reactor Through {
   input in: int
   output out: int
 
-  reaction(in) -> out {= lf_set(out, in->value); =}
+  reaction(in) -> out {=
+    lf_set(out, in->value);
+  =}
 }
 
 reactor Bank {
diff --git a/test/C/src/multiport/BankIndexInitializer.lf b/test/C/src/multiport/BankIndexInitializer.lf
index 434e59104a..ef8c181e90 100644
--- a/test/C/src/multiport/BankIndexInitializer.lf
+++ b/test/C/src/multiport/BankIndexInitializer.lf
@@ -1,14 +1,20 @@
 // Test bank of reactors to multiport input with id parameter in the bank.
 target C
 
-preamble {= extern int table[4]; =}
+preamble {=
+  extern int table[4];
+=}
 
 reactor Source(bank_index: int = 0, value: int = 0) {
-  preamble {= int table[] = {4, 3, 2, 1}; =}
+  preamble {=
+    int table[] = {4, 3, 2, 1};
+  =}
 
   output out: int
 
-  reaction(startup) -> out {= lf_set(out, self->value); =}
+  reaction(startup) -> out {=
+    lf_set(out, self->value);
+  =}
 }
 
 reactor Sink(width: int = 4) {
diff --git a/test/C/src/multiport/BankSelfBroadcast.lf b/test/C/src/multiport/BankSelfBroadcast.lf
index f9a52af044..07c4492f4e 100644
--- a/test/C/src/multiport/BankSelfBroadcast.lf
+++ b/test/C/src/multiport/BankSelfBroadcast.lf
@@ -12,7 +12,9 @@ reactor A(bank_index: int = 0) {
   output out: int
   state received: bool = false
 
-  reaction(startup) -> out {= lf_set(out, self->bank_index); =}
+  reaction(startup) -> out {=
+    lf_set(out, self->bank_index);
+  =}
 
   reaction(in) {=
     for (int i = 0; i < in_width; i++) {
diff --git a/test/C/src/multiport/BankToMultiport.lf b/test/C/src/multiport/BankToMultiport.lf
index 4506cee0c1..c6be3c0adc 100644
--- a/test/C/src/multiport/BankToMultiport.lf
+++ b/test/C/src/multiport/BankToMultiport.lf
@@ -4,7 +4,9 @@ target C
 reactor Source(bank_index: int = 0) {
   output out: int
 
-  reaction(startup) -> out {= lf_set(out, self->bank_index); =}
+  reaction(startup) -> out {=
+    lf_set(out, self->bank_index);
+  =}
 }
 
 reactor Sink(width: int = 4) {
diff --git a/test/C/src/multiport/Broadcast.lf b/test/C/src/multiport/Broadcast.lf
index 27092a4366..3750ec347d 100644
--- a/test/C/src/multiport/Broadcast.lf
+++ b/test/C/src/multiport/Broadcast.lf
@@ -6,7 +6,9 @@ target C {
 reactor Source {
   output out: int
 
-  reaction(startup) -> out {= lf_set(out, 42); =}
+  reaction(startup) -> out {=
+    lf_set(out, 42);
+  =}
 }
 
 reactor Destination(bank_index: int = 0) {
diff --git a/test/C/src/multiport/BroadcastAfter.lf b/test/C/src/multiport/BroadcastAfter.lf
index 48b5850b7c..b7e4114046 100644
--- a/test/C/src/multiport/BroadcastAfter.lf
+++ b/test/C/src/multiport/BroadcastAfter.lf
@@ -6,7 +6,9 @@ target C {
 reactor Source {
   output out: int
 
-  reaction(startup) -> out {= lf_set(out, 42); =}
+  reaction(startup) -> out {=
+    lf_set(out, 42);
+  =}
 }
 
 reactor Destination(bank_index: int = 0) {
diff --git a/test/C/src/multiport/BroadcastMultipleAfter.lf b/test/C/src/multiport/BroadcastMultipleAfter.lf
index 809c03448c..3f32a51263 100644
--- a/test/C/src/multiport/BroadcastMultipleAfter.lf
+++ b/test/C/src/multiport/BroadcastMultipleAfter.lf
@@ -6,7 +6,9 @@ target C {
 reactor Source(value: int = 42) {
   output out: int
 
-  reaction(startup) -> out {= lf_set(out, self->value); =}
+  reaction(startup) -> out {=
+    lf_set(out, self->value);
+  =}
 }
 
 reactor Destination(bank_index: int = 0) {
diff --git a/test/C/src/multiport/MultiportFromBank.lf b/test/C/src/multiport/MultiportFromBank.lf
index 3969da111d..77482f6730 100644
--- a/test/C/src/multiport/MultiportFromBank.lf
+++ b/test/C/src/multiport/MultiportFromBank.lf
@@ -8,7 +8,9 @@ target C {
 reactor Source(check_override: int = 0, bank_index: int = 0) {
   output out: int
 
-  reaction(startup) -> out {= lf_set(out, self->bank_index * self->check_override); =}
+  reaction(startup) -> out {=
+    lf_set(out, self->bank_index * self->check_override);
+  =}
 }
 
 reactor Destination(port_width: int = 3) {
diff --git a/test/C/src/multiport/MultiportIn.lf b/test/C/src/multiport/MultiportIn.lf
index caea737d76..53e18b52ef 100644
--- a/test/C/src/multiport/MultiportIn.lf
+++ b/test/C/src/multiport/MultiportIn.lf
@@ -20,7 +20,9 @@ reactor Computation {
   input in: int
   output out: int
 
-  reaction(in) -> out {= lf_set(out, in->value); =}
+  reaction(in) -> out {=
+    lf_set(out, in->value);
+  =}
 }
 
 reactor Destination {
diff --git a/test/C/src/multiport/MultiportInParameterized.lf b/test/C/src/multiport/MultiportInParameterized.lf
index fbf1b4b6f1..172d0f15ec 100644
--- a/test/C/src/multiport/MultiportInParameterized.lf
+++ b/test/C/src/multiport/MultiportInParameterized.lf
@@ -20,7 +20,9 @@ reactor Computation {
   input in: int
   output out: int
 
-  reaction(in) -> out {= lf_set(out, in->value); =}
+  reaction(in) -> out {=
+    lf_set(out, in->value);
+  =}
 }
 
 reactor Destination(width: int = 1) {
diff --git a/test/C/src/multiport/PipelineAfter.lf b/test/C/src/multiport/PipelineAfter.lf
index bbcbaebc49..2f5e2a7c0c 100644
--- a/test/C/src/multiport/PipelineAfter.lf
+++ b/test/C/src/multiport/PipelineAfter.lf
@@ -3,14 +3,18 @@ target C
 reactor Source {
   output out: unsigned
 
-  reaction(startup) -> out {= lf_set(out, 40); =}
+  reaction(startup) -> out {=
+    lf_set(out, 40);
+  =}
 }
 
 reactor Compute {
   input in: unsigned
   output out: unsigned
 
-  reaction(in) -> out {= lf_set(out, in->value + 2); =}
+  reaction(in) -> out {=
+    lf_set(out, in->value + 2);
+  =}
 }
 
 reactor Sink {
diff --git a/test/C/src/multiport/ReactionsToNested.lf b/test/C/src/multiport/ReactionsToNested.lf
index 2b07e948de..276c91fce3 100644
--- a/test/C/src/multiport/ReactionsToNested.lf
+++ b/test/C/src/multiport/ReactionsToNested.lf
@@ -32,7 +32,11 @@ reactor D {
 main reactor {
   d = new D()
 
-  reaction(startup) -> d.y {= lf_set(d.y[0], 42); =}
+  reaction(startup) -> d.y {=
+    lf_set(d.y[0], 42);
+  =}
 
-  reaction(startup) -> d.y {= lf_set(d.y[1], 43); =}
+  reaction(startup) -> d.y {=
+    lf_set(d.y[1], 43);
+  =}
 }
diff --git a/test/C/src/no_inlining/Count.lf b/test/C/src/no_inlining/Count.lf
index 49ceb04482..86155385c3 100644
--- a/test/C/src/no_inlining/Count.lf
+++ b/test/C/src/no_inlining/Count.lf
@@ -12,5 +12,7 @@ main reactor Count {
 
   reaction check_done(t)
 
-  reaction(shutdown) {= printf("%s", "shutting down\n"); =}
+  reaction(shutdown) {=
+    printf("%s", "shutting down\n");
+  =}
 }
diff --git a/test/C/src/no_inlining/CountHierarchy.lf b/test/C/src/no_inlining/CountHierarchy.lf
index 42d7eb2bd7..5ac6726001 100644
--- a/test/C/src/no_inlining/CountHierarchy.lf
+++ b/test/C/src/no_inlining/CountHierarchy.lf
@@ -7,7 +7,9 @@ reactor Timer(m: time = 0, n: time = 0) {
   output out: int
   timer t(m, n)
 
-  reaction(t) -> out {= lf_set(out, 0); =}
+  reaction(t) -> out {=
+    lf_set(out, 0);
+  =}
 }
 
 main reactor {
@@ -19,5 +21,7 @@ main reactor {
 
   reaction check_done(t.out)
 
-  reaction(shutdown) {= printf("%s", "shutting down\n"); =}
+  reaction(shutdown) {=
+    printf("%s", "shutting down\n");
+  =}
 }
diff --git a/test/C/src/target/FederatedFiles.lf b/test/C/src/target/FederatedFiles.lf
index 9fb4440a02..ef606bff05 100644
--- a/test/C/src/target/FederatedFiles.lf
+++ b/test/C/src/target/FederatedFiles.lf
@@ -6,7 +6,9 @@ target C {
 }
 
 reactor Foo {
-  reaction(startup) {= lf_print("Hello World"); =}
+  reaction(startup) {=
+    lf_print("Hello World");
+  =}
 }
 
 federated reactor {
diff --git a/test/C/src/target/Math.lf b/test/C/src/target/Math.lf
index 68a4a13b6f..4185a19f6a 100644
--- a/test/C/src/target/Math.lf
+++ b/test/C/src/target/Math.lf
@@ -6,5 +6,7 @@ preamble {=
 =}
 
 main reactor {
-  reaction(startup) {= lf_print("Maximum of 42.0 and 75 is %.2f", fmax(4.20, 75)); =}
+  reaction(startup) {=
+    lf_print("Maximum of 42.0 and 75 is %.2f", fmax(4.20, 75));
+  =}
 }
diff --git a/test/C/src/target/Platform.lf b/test/C/src/target/Platform.lf
index 00895a749f..68a444c9f0 100644
--- a/test/C/src/target/Platform.lf
+++ b/test/C/src/target/Platform.lf
@@ -4,5 +4,7 @@ target C {
 }
 
 main reactor {
-  reaction(startup) {= lf_print("Hello, Mac!"); =}
+  reaction(startup) {=
+    lf_print("Hello, Mac!");
+  =}
 }
diff --git a/test/C/src/token/lib/Token.lf b/test/C/src/token/lib/Token.lf
index 3bfabd9b1c..3ef7003836 100644
--- a/test/C/src/token/lib/Token.lf
+++ b/test/C/src/token/lib/Token.lf
@@ -95,7 +95,11 @@ reactor TokenDelay {
   output out: int_array_t*
   logical action a: int_array_t*
 
-  reaction(a) -> out {= lf_set_token(out, a->token); =}
+  reaction(a) -> out {=
+    lf_set_token(out, a->token);
+  =}
 
-  reaction(in) -> a {= lf_schedule_token(a, MSEC(1), in->token); =}
+  reaction(in) -> a {=
+    lf_schedule_token(a, MSEC(1), in->token);
+  =}
 }
diff --git a/test/C/src/verifier/ADASModel.lf b/test/C/src/verifier/ADASModel.lf
index 41f8e27ace..b127c1d1a8 100644
--- a/test/C/src/verifier/ADASModel.lf
+++ b/test/C/src/verifier/ADASModel.lf
@@ -6,8 +6,12 @@ preamble {=
 =}
 
 reactor Camera {
-  output out: {= c_frame_t =}
-  state frame: {= c_frame_t =}
+  output out: {=
+    c_frame_t
+  =}
+  state frame: {=
+    c_frame_t
+  =}
   timer t(0, 17 msec)  // 60 fps
 
   reaction(t) -> out {=
@@ -18,8 +22,12 @@ reactor Camera {
 }
 
 reactor LiDAR {
-  output out: {= l_frame_t =}
-  state frame: {= l_frame_t =}
+  output out: {=
+    l_frame_t
+  =}
+  state frame: {=
+    l_frame_t
+  =}
   timer t(0, 34 msec)  // 30 fps
 
   reaction(t) -> out {=
@@ -33,7 +41,9 @@ reactor Pedal {
   output out: int
   physical action a
 
-  reaction(a) -> out {= lf_set(out, 1); =}
+  reaction(a) -> out {=
+    lf_set(out, 1);
+  =}
 }
 
 reactor Brakes {
@@ -48,8 +58,12 @@ reactor Brakes {
 }
 
 reactor ADASProcessor {
-  input in1: {= l_frame_t =}
-  input in2: {= c_frame_t =}
+  input in1: {=
+    l_frame_t
+  =}
+  input in2: {=
+    c_frame_t
+  =}
   output out1: int
   output out2: int
   logical action a(50 msec)
@@ -72,7 +86,9 @@ reactor Dashboard {
   input in: int
   state received: int
 
-  reaction(in) {= self->received = 1; =}
+  reaction(in) {=
+    self->received = 1;
+  =}
 }
 
 @property(
diff --git a/test/C/src/verifier/AircraftDoor.lf b/test/C/src/verifier/AircraftDoor.lf
index ab6390ffbe..168bcca437 100644
--- a/test/C/src/verifier/AircraftDoor.lf
+++ b/test/C/src/verifier/AircraftDoor.lf
@@ -3,7 +3,9 @@ target C
 reactor Controller {
   output out: int
 
-  reaction(startup) -> out {= lf_set(out, 1); =}
+  reaction(startup) -> out {=
+    lf_set(out, 1);
+  =}
 }
 
 reactor Vision {
diff --git a/test/C/src/verifier/CoopSchedule.lf b/test/C/src/verifier/CoopSchedule.lf
index c755ef7559..8634143158 100644
--- a/test/C/src/verifier/CoopSchedule.lf
+++ b/test/C/src/verifier/CoopSchedule.lf
@@ -4,7 +4,9 @@ reactor Trigger {
   output out: int
   timer t(0, 1 usec)
 
-  reaction(t) -> out {= lf_set(out, 1); =}
+  reaction(t) -> out {=
+    lf_set(out, 1);
+  =}
 }
 
 reactor Task {
diff --git a/test/C/src/verifier/ProcessMsg.lf b/test/C/src/verifier/ProcessMsg.lf
index ce9a2090d7..22b06d2276 100644
--- a/test/C/src/verifier/ProcessMsg.lf
+++ b/test/C/src/verifier/ProcessMsg.lf
@@ -12,9 +12,13 @@ reactor Task {
 
   logical action updateMessage
 
-  reaction(startup) {= self->messageSent = 0; =}
+  reaction(startup) {=
+    self->messageSent = 0;
+  =}
 
-  reaction(t) -> out {= lf_set(out, self->messageSent); =}
+  reaction(t) -> out {=
+    lf_set(out, self->messageSent);
+  =}
 
   reaction(in) -> updateMessage {=
     /* Check for invalid message.  */
diff --git a/test/C/src/verifier/Ring.lf b/test/C/src/verifier/Ring.lf
index eb289e1f24..ac0c03907f 100644
--- a/test/C/src/verifier/Ring.lf
+++ b/test/C/src/verifier/Ring.lf
@@ -12,7 +12,9 @@ reactor Source {
     lf_schedule(start, 0);
   =}
 
-  reaction(start) -> out {= lf_set(out, self->received); =}
+  reaction(start) -> out {=
+    lf_set(out, self->received);
+  =}
 
   /** Uncomment the following to debug feedback loops. */
   // reaction(in) -> start {=
@@ -26,7 +28,9 @@ reactor Node {
   input in: int
   output out: int
 
-  reaction(in) -> out {= lf_set(out, in->value + 1); =}
+  reaction(in) -> out {=
+    lf_set(out, in->value + 1);
+  =}
 }
 
 @property(
diff --git a/test/C/src/verifier/SafeSend.lf b/test/C/src/verifier/SafeSend.lf
index da21ef589f..29b77dd43c 100644
--- a/test/C/src/verifier/SafeSend.lf
+++ b/test/C/src/verifier/SafeSend.lf
@@ -41,7 +41,10 @@ reactor Server {
     }
   =}
 
-  reaction(err) {= self->error = 1; =}  // Error handling logic.
+  // Error handling logic.
+  reaction(err) {=
+    self->error = 1;
+  =}
 }
 
 @property(
diff --git a/test/C/src/verifier/Thermostat.lf b/test/C/src/verifier/Thermostat.lf
index 0b583d307d..17c08f256f 100644
--- a/test/C/src/verifier/Thermostat.lf
+++ b/test/C/src/verifier/Thermostat.lf
@@ -8,7 +8,9 @@ reactor Environment {
   state _heatOn: int
   state _temperature: int
 
-  reaction(startup) {= self->_temperature = 19; =}
+  reaction(startup) {=
+    self->_temperature = 19;
+  =}
 
   reaction(t) -> temperature {=
     if (self->_heatOn == 0) {
@@ -20,7 +22,9 @@ reactor Environment {
     lf_set(temperature, self->_temperature);
   =}
 
-  reaction(heatOn) {= self->_heatOn = heatOn->value; =}
+  reaction(heatOn) {=
+    self->_heatOn = heatOn->value;
+  =}
 }
 
 reactor _Thermostat {
@@ -29,7 +33,9 @@ reactor _Thermostat {
   state _mode: int    // 0 = COOLING, 1 = HEATING
   logical action changeMode
 
-  reaction(startup) {= self->_mode = 0; =}
+  reaction(startup) {=
+    self->_mode = 0;
+  =}
 
   reaction(temperature) -> heatOn, changeMode {=
     if (self->_mode == 0) {
diff --git a/test/C/src/verifier/TrainDoor.lf b/test/C/src/verifier/TrainDoor.lf
index d39f473bea..176f83cbf9 100644
--- a/test/C/src/verifier/TrainDoor.lf
+++ b/test/C/src/verifier/TrainDoor.lf
@@ -14,14 +14,18 @@ reactor Train {
   input in: int
   state received: int
 
-  reaction(in) {= self->received = in->value; =}
+  reaction(in) {=
+    self->received = in->value;
+  =}
 }
 
 reactor Door {
   input in: int
   state received: int
 
-  reaction(in) {= self->received = in->value; =}
+  reaction(in) {=
+    self->received = in->value;
+  =}
 }
 
 @property(
diff --git a/test/C/src/verifier/UnsafeSend.lf b/test/C/src/verifier/UnsafeSend.lf
index 73c3585885..2033888ae4 100644
--- a/test/C/src/verifier/UnsafeSend.lf
+++ b/test/C/src/verifier/UnsafeSend.lf
@@ -41,7 +41,10 @@ reactor Server {
     }
   =}
 
-  reaction(err) {= self->error = 1; =}  // Error handling logic.
+  // Error handling logic.
+  reaction(err) {=
+    self->error = 1;
+  =}
 }
 
 @property(
diff --git a/test/C/src/zephyr/unthreaded/HelloZephyr.lf b/test/C/src/zephyr/unthreaded/HelloZephyr.lf
index aae4f62252..9d73982db6 100644
--- a/test/C/src/zephyr/unthreaded/HelloZephyr.lf
+++ b/test/C/src/zephyr/unthreaded/HelloZephyr.lf
@@ -3,5 +3,7 @@ target C {
 }
 
 main reactor {
-  reaction(startup) {= printf("Hello World!\n"); =}
+  reaction(startup) {=
+    printf("Hello World!\n");
+  =}
 }
diff --git a/test/C/src/zephyr/unthreaded/Timer.lf b/test/C/src/zephyr/unthreaded/Timer.lf
index 17ca51b842..2d5a22d775 100644
--- a/test/C/src/zephyr/unthreaded/Timer.lf
+++ b/test/C/src/zephyr/unthreaded/Timer.lf
@@ -7,5 +7,7 @@ target C {
 main reactor {
   timer t(0, 1 sec)
 
-  reaction(t) {= printf("Hello\n"); =}
+  reaction(t) {=
+    printf("Hello\n");
+  =}
 }
diff --git a/test/Cpp/src/ActionDelay.lf b/test/Cpp/src/ActionDelay.lf
index 98cbd11790..b953d8f522 100644
--- a/test/Cpp/src/ActionDelay.lf
+++ b/test/Cpp/src/ActionDelay.lf
@@ -12,13 +12,17 @@ reactor GeneratedDelay {
     act.schedule();
   =}
 
-  reaction(act) -> y_out {= y_out.set(y_state); =}
+  reaction(act) -> y_out {=
+    y_out.set(y_state);
+  =}
 }
 
 reactor Source {
   output out: int
 
-  reaction(startup) -> out {= out.set(1); =}
+  reaction(startup) -> out {=
+    out.set(1);
+  =}
 }
 
 reactor Sink {
diff --git a/test/Cpp/src/ActionWithNoReaction.lf b/test/Cpp/src/ActionWithNoReaction.lf
index 78f1011544..3dd6e3f236 100644
--- a/test/Cpp/src/ActionWithNoReaction.lf
+++ b/test/Cpp/src/ActionWithNoReaction.lf
@@ -32,5 +32,7 @@ main reactor {
   timer t(0, 1 sec)
   f.y -> p.x
 
-  reaction(t) -> f.x {= f.x.set(42); =}
+  reaction(t) -> f.x {=
+    f.x.set(42);
+  =}
 }
diff --git a/test/Cpp/src/After.lf b/test/Cpp/src/After.lf
index 49ef7fbe6e..4308ed156d 100644
--- a/test/Cpp/src/After.lf
+++ b/test/Cpp/src/After.lf
@@ -8,7 +8,9 @@ reactor foo {
   input x: int
   output y: int
 
-  reaction(x) -> y {= y.set(2*(*x.get())); =}
+  reaction(x) -> y {=
+    y.set(2*(*x.get()));
+  =}
 }
 
 reactor print {
diff --git a/test/Cpp/src/AfterZero.lf b/test/Cpp/src/AfterZero.lf
index ce3c6dd5c7..f80ffe01bf 100644
--- a/test/Cpp/src/AfterZero.lf
+++ b/test/Cpp/src/AfterZero.lf
@@ -8,7 +8,9 @@ reactor foo {
   input x: int
   output y: int
 
-  reaction(x) -> y {= y.set(2*(*x.get())); =}
+  reaction(x) -> y {=
+    y.set(2*(*x.get()));
+  =}
 }
 
 reactor print {
diff --git a/test/Cpp/src/Alignment.lf b/test/Cpp/src/Alignment.lf
index 00f4ce0936..7eaa596379 100644
--- a/test/Cpp/src/Alignment.lf
+++ b/test/Cpp/src/Alignment.lf
@@ -78,7 +78,9 @@ reactor Sieve {
 reactor Destination {
   input ok: bool
   input in: int
-  state last_invoked: {= reactor::TimePoint =}
+  state last_invoked: {=
+    reactor::TimePoint
+  =}
 
   reaction(ok, in) {=
     if (ok.is_present() && in.is_present()) {
diff --git a/test/Cpp/src/CompositionGain.lf b/test/Cpp/src/CompositionGain.lf
index db02a4ad55..fc8182bab1 100644
--- a/test/Cpp/src/CompositionGain.lf
+++ b/test/Cpp/src/CompositionGain.lf
@@ -22,7 +22,9 @@ reactor Wrapper {
 main reactor CompositionGain {
   wrapper = new Wrapper()
 
-  reaction(startup) -> wrapper.x {= wrapper.x.set(42); =}
+  reaction(startup) -> wrapper.x {=
+    wrapper.x.set(42);
+  =}
 
   reaction(wrapper.y) {=
     reactor::log::Info() << "Received " << *wrapper.y.get();
diff --git a/test/Cpp/src/DanglingOutput.lf b/test/Cpp/src/DanglingOutput.lf
index 537eff1cde..fe392b0a90 100644
--- a/test/Cpp/src/DanglingOutput.lf
+++ b/test/Cpp/src/DanglingOutput.lf
@@ -6,7 +6,9 @@ reactor Source {
   output out: int
   timer t
 
-  reaction(t) -> out {= out.set(1); =}
+  reaction(t) -> out {=
+    out.set(1);
+  =}
 }
 
 reactor Gain {
diff --git a/test/Cpp/src/DelayInt.lf b/test/Cpp/src/DelayInt.lf
index 757890db20..5111e26ee6 100644
--- a/test/Cpp/src/DelayInt.lf
+++ b/test/Cpp/src/DelayInt.lf
@@ -6,7 +6,9 @@ reactor Delay(delay: time = 100 msec) {
   output out: int
   logical action d: int
 
-  reaction(in) -> d {= d.schedule(in.get(), delay); =}
+  reaction(in) -> d {=
+    d.schedule(in.get(), delay);
+  =}
 
   reaction(d) -> out {=
     if (d.is_present()) {
@@ -17,7 +19,9 @@ reactor Delay(delay: time = 100 msec) {
 
 reactor Test {
   input in: int
-  state start_time: {= reactor::TimePoint =}
+  state start_time: {=
+    reactor::TimePoint
+  =}
   timer start
 
   reaction(start) {=
@@ -50,5 +54,7 @@ main reactor DelayInt {
   test = new Test()
   d.out -> test.in
 
-  reaction(t) -> d.in {= d.in.set(42); =}
+  reaction(t) -> d.in {=
+    d.in.set(42);
+  =}
 }
diff --git a/test/Cpp/src/DelayedAction.lf b/test/Cpp/src/DelayedAction.lf
index deb3745a97..3ee931d484 100644
--- a/test/Cpp/src/DelayedAction.lf
+++ b/test/Cpp/src/DelayedAction.lf
@@ -8,7 +8,9 @@ main reactor DelayedAction {
   logical action a: void
   state count: int = 0
 
-  reaction(t) -> a {= a.schedule(100ms); =}
+  reaction(t) -> a {=
+    a.schedule(100ms);
+  =}
 
   reaction(a) {=
     auto elapsed = get_elapsed_logical_time();
diff --git a/test/Cpp/src/DelayedReaction.lf b/test/Cpp/src/DelayedReaction.lf
index c975246d23..df7214a9eb 100644
--- a/test/Cpp/src/DelayedReaction.lf
+++ b/test/Cpp/src/DelayedReaction.lf
@@ -4,7 +4,9 @@ target Cpp
 reactor Source {
   output out: void
 
-  reaction(startup) -> out {= out.set(); =}
+  reaction(startup) -> out {=
+    out.set();
+  =}
 }
 
 reactor Sink {
diff --git a/test/Cpp/src/Determinism.lf b/test/Cpp/src/Determinism.lf
index 43577397e9..1cb77d70a3 100644
--- a/test/Cpp/src/Determinism.lf
+++ b/test/Cpp/src/Determinism.lf
@@ -4,7 +4,9 @@ reactor Source {
   output y: int
   timer t
 
-  reaction(t) -> y {= y.set(1); =}
+  reaction(t) -> y {=
+    y.set(1);
+  =}
 }
 
 reactor Destination {
@@ -31,7 +33,9 @@ reactor Pass {
   input x: int
   output y: int
 
-  reaction(x) -> y {= y.set(x.get()); =}
+  reaction(x) -> y {=
+    y.set(x.get());
+  =}
 }
 
 main reactor Determinism {
diff --git a/test/Cpp/src/DoublePort.lf b/test/Cpp/src/DoublePort.lf
index fed174dbe5..73eecfa24e 100644
--- a/test/Cpp/src/DoublePort.lf
+++ b/test/Cpp/src/DoublePort.lf
@@ -22,7 +22,9 @@ reactor CountMicrostep {
     count++;
   =}
 
-  reaction(act) -> out {= out.set(act.get()); =}
+  reaction(act) -> out {=
+    out.set(act.get());
+  =}
 }
 
 reactor Print {
diff --git a/test/Cpp/src/Gain.lf b/test/Cpp/src/Gain.lf
index 6bc9794951..ea38301191 100644
--- a/test/Cpp/src/Gain.lf
+++ b/test/Cpp/src/Gain.lf
@@ -5,7 +5,9 @@ reactor Scale(scale: int = 2) {
   input x: int
   output y: int
 
-  reaction(x) -> y {= y.set(*x.get() * scale); =}
+  reaction(x) -> y {=
+    y.set(*x.get() * scale);
+  =}
 }
 
 reactor Test {
@@ -27,5 +29,7 @@ main reactor Gain {
   g.y -> t.x
   timer tim
 
-  reaction(tim) -> g.x {= g.x.set(1); =}
+  reaction(tim) -> g.x {=
+    g.x.set(1);
+  =}
 }
diff --git a/test/Cpp/src/GetMicroStep.lf b/test/Cpp/src/GetMicroStep.lf
index 5552d57ef9..bc541db26a 100644
--- a/test/Cpp/src/GetMicroStep.lf
+++ b/test/Cpp/src/GetMicroStep.lf
@@ -2,11 +2,15 @@
 target Cpp
 
 main reactor GetMicroStep {
-  state s: {= reactor::mstep_t =} = 1
+  state s: {=
+    reactor::mstep_t
+  =} = 1
 
   logical action l
 
-  reaction(startup) -> l {= l.schedule(reactor::Duration::zero()); =}
+  reaction(startup) -> l {=
+    l.schedule(reactor::Duration::zero());
+  =}
 
   reaction(l) -> l {=
     auto microstep = get_microstep();
diff --git a/test/Cpp/src/Hello.lf b/test/Cpp/src/Hello.lf
index 022b9a7383..483d15b166 100644
--- a/test/Cpp/src/Hello.lf
+++ b/test/Cpp/src/Hello.lf
@@ -7,9 +7,13 @@ target Cpp {
   fast: true
 }
 
-reactor HelloCpp(period: time = 2 sec, message: {= std::string =} = "Hello C++") {
+reactor HelloCpp(period: time = 2 sec, message: {=
+  std::string
+=} = "Hello C++") {
   state count: int = 0
-  state previous_time: {= reactor::TimePoint =}
+  state previous_time: {=
+    reactor::TimePoint
+  =}
   timer t(1 sec, period)
   logical action a: void
 
diff --git a/test/Cpp/src/HelloWorld.lf b/test/Cpp/src/HelloWorld.lf
index 071cc5c968..b0a5ec1109 100644
--- a/test/Cpp/src/HelloWorld.lf
+++ b/test/Cpp/src/HelloWorld.lf
@@ -3,7 +3,9 @@ target Cpp
 reactor HelloWorld2 {
   timer t
 
-  reaction(t) {= std::cout << "Hello World." << std::endl; =}
+  reaction(t) {=
+    std::cout << "Hello World." << std::endl;
+  =}
 }
 
 main reactor {
diff --git a/test/Cpp/src/Hierarchy.lf b/test/Cpp/src/Hierarchy.lf
index ba92775c1c..090962b379 100644
--- a/test/Cpp/src/Hierarchy.lf
+++ b/test/Cpp/src/Hierarchy.lf
@@ -5,14 +5,18 @@ reactor Source {
   output out: int
   timer t
 
-  reaction(t) -> out {= out.set(1); =}
+  reaction(t) -> out {=
+    out.set(1);
+  =}
 }
 
 reactor Gain {
   input in: int
   output out: int
 
-  reaction(in) -> out {= out.set((*in.get()) * 2); =}
+  reaction(in) -> out {=
+    out.set((*in.get()) * 2);
+  =}
 }
 
 reactor Print {
diff --git a/test/Cpp/src/Hierarchy2.lf b/test/Cpp/src/Hierarchy2.lf
index e21a966c54..e94929486a 100644
--- a/test/Cpp/src/Hierarchy2.lf
+++ b/test/Cpp/src/Hierarchy2.lf
@@ -8,7 +8,9 @@ reactor Source {
   output out: int
   timer t(0, 1 sec)
 
-  reaction(t) -> out {= out.set(1); =}
+  reaction(t) -> out {=
+    out.set(1);
+  =}
 }
 
 reactor Count {
diff --git a/test/Cpp/src/Import.lf b/test/Cpp/src/Import.lf
index c77f8382c5..046af870d4 100644
--- a/test/Cpp/src/Import.lf
+++ b/test/Cpp/src/Import.lf
@@ -7,5 +7,7 @@ main reactor Import {
   timer t
   a = new Imported()
 
-  reaction(t) -> a.x {= a.x.set(42); =}
+  reaction(t) -> a.x {=
+    a.x.set(42);
+  =}
 }
diff --git a/test/Cpp/src/ImportComposition.lf b/test/Cpp/src/ImportComposition.lf
index 390f02bee3..8d8f13ae9b 100644
--- a/test/Cpp/src/ImportComposition.lf
+++ b/test/Cpp/src/ImportComposition.lf
@@ -17,7 +17,9 @@ main reactor ImportComposition {
   imp_comp = new ImportedComposition()
   state received: bool = false
 
-  reaction(startup) -> imp_comp.x {= imp_comp.x.set(42); =}
+  reaction(startup) -> imp_comp.x {=
+    imp_comp.x.set(42);
+  =}
 
   reaction(imp_comp.y) {=
     auto receive_time = get_elapsed_logical_time();
diff --git a/test/Cpp/src/ImportRenamed.lf b/test/Cpp/src/ImportRenamed.lf
index 4ec5dc132e..0f6f447e7e 100644
--- a/test/Cpp/src/ImportRenamed.lf
+++ b/test/Cpp/src/ImportRenamed.lf
@@ -17,5 +17,7 @@ main reactor {
   b = new Y()
   c = new Z()
 
-  reaction(t) -> a.x {= a.x.set(42); =}
+  reaction(t) -> a.x {=
+    a.x.set(42);
+  =}
 }
diff --git a/test/Cpp/src/ManualDelayedReaction.lf b/test/Cpp/src/ManualDelayedReaction.lf
index e7bb1190ba..2f01d4c753 100644
--- a/test/Cpp/src/ManualDelayedReaction.lf
+++ b/test/Cpp/src/ManualDelayedReaction.lf
@@ -8,16 +8,23 @@ reactor GeneratedDelay {
 
   logical action act(100 msec): int
 
-  reaction(y_in) -> act {= act.schedule(y_in.get()); =}
+  reaction(y_in) -> act {=
+    act.schedule(y_in.get());
+  =}
 
-  reaction(act) -> y_out {= y_out.set(act.get()); =}
+  reaction(act) -> y_out {=
+    y_out.set(act.get());
+  =}
 }
 
 reactor Source {
   output out: int
   timer t
 
-  reaction(t) -> out {= out.set(1); =}  // reaction(t) -> out after 100 msec {=
+  // reaction(t) -> out after 100 msec {=
+  reaction(t) -> out {=
+    out.set(1);
+  =}
 }
 
 reactor Sink {
diff --git a/test/Cpp/src/Methods.lf b/test/Cpp/src/Methods.lf
index c39b0dff4d..79720b555a 100644
--- a/test/Cpp/src/Methods.lf
+++ b/test/Cpp/src/Methods.lf
@@ -3,9 +3,13 @@ target Cpp
 main reactor {
   state foo: int = 2
 
-  const method getFoo(): int {= return foo; =}
+  const method getFoo(): int {=
+    return foo;
+  =}
 
-  method add(x: int) {= foo += x; =}
+  method add(x: int) {=
+    foo += x;
+  =}
 
   reaction(startup) {=
     std::cout << "Foo is initialized to " << getFoo() << '\n';
diff --git a/test/Cpp/src/Microsteps.lf b/test/Cpp/src/Microsteps.lf
index 51a61e508a..43a5f374aa 100644
--- a/test/Cpp/src/Microsteps.lf
+++ b/test/Cpp/src/Microsteps.lf
@@ -39,5 +39,7 @@ main reactor Microsteps {
     repeat.schedule();
   =}
 
-  reaction(repeat) -> d.y {= d.y.set(1); =}
+  reaction(repeat) -> d.y {=
+    d.y.set(1);
+  =}
 }
diff --git a/test/Cpp/src/Minimal.lf b/test/Cpp/src/Minimal.lf
index d49bea2620..2706976fe8 100644
--- a/test/Cpp/src/Minimal.lf
+++ b/test/Cpp/src/Minimal.lf
@@ -2,5 +2,7 @@
 target Cpp
 
 main reactor Minimal {
-  reaction(startup) {= std::cout << "Hello World!\n"; =}
+  reaction(startup) {=
+    std::cout << "Hello World!\n";
+  =}
 }
diff --git a/test/Cpp/src/MultipleContained.lf b/test/Cpp/src/MultipleContained.lf
index df168ca394..ecc38ae22b 100644
--- a/test/Cpp/src/MultipleContained.lf
+++ b/test/Cpp/src/MultipleContained.lf
@@ -6,7 +6,9 @@ reactor Contained {
   input in1: int
   input in2: int
 
-  reaction(startup) -> trigger {= trigger.set(42); =}
+  reaction(startup) -> trigger {=
+    trigger.set(42);
+  =}
 
   reaction(in1) {=
     std::cout << "in1 received " << *in1.get() << '\n';
diff --git a/test/Cpp/src/NativeListsAndTimes.lf b/test/Cpp/src/NativeListsAndTimes.lf
index b6e8550c50..b786edc7a5 100644
--- a/test/Cpp/src/NativeListsAndTimes.lf
+++ b/test/Cpp/src/NativeListsAndTimes.lf
@@ -6,7 +6,9 @@ reactor Foo(
     y: time = 0,                // Units are missing but not required
     z = 1 msec,                 // Type is missing but not required
     p: int[]{1, 2, 3, 4},       // List of integers
-    q: {= std::vector<reactor::Duration> =}{1 msec, 2 msec, 3 msec},
+    q: {=
+      std::vector<reactor::Duration>
+    =}{1 msec, 2 msec, 3 msec},
     g: time[]{1 msec, 2 msec},  // List of time values
     g2: int[] = {}) {
   state s: time = y  // Reference to explicitly typed time parameter
@@ -18,7 +20,10 @@ reactor Foo(
   timer toe(z)       // Implicit type time
   state baz = p      // Implicit type int[]
   state period = z   // Implicit type time
-  state times: std::vector<std::vector<{= reactor::Duration =}>>{q, g}  // a list of lists
+  // a list of lists
+  state times: std::vector<std::vector<{=
+    reactor::Duration
+  =}>>{q, g}
   state empty_list: int[] = {}
 
   reaction(tick) {=
diff --git a/test/Cpp/src/NestedTriggeredReactions.lf b/test/Cpp/src/NestedTriggeredReactions.lf
index 7cd16fad2e..5b95df380d 100644
--- a/test/Cpp/src/NestedTriggeredReactions.lf
+++ b/test/Cpp/src/NestedTriggeredReactions.lf
@@ -9,7 +9,9 @@ reactor Container {
 
   in -> contained.in
 
-  reaction(in) {= triggered = true; =}
+  reaction(in) {=
+    triggered = true;
+  =}
 
   reaction(shutdown) {=
     if (!triggered) {
@@ -24,7 +26,9 @@ reactor Contained {
 
   state triggered: bool = false
 
-  reaction(in) {= triggered = true; =}
+  reaction(in) {=
+    triggered = true;
+  =}
 
   reaction(shutdown) {=
     if (!triggered) {
@@ -37,5 +41,7 @@ reactor Contained {
 main reactor {
   container = new Container()
 
-  reaction(startup) -> container.in {= container.in.set(); =}
+  reaction(startup) -> container.in {=
+    container.in.set();
+  =}
 }
diff --git a/test/Cpp/src/PeriodicDesugared.lf b/test/Cpp/src/PeriodicDesugared.lf
index 1e5dad1b7d..868c14bad1 100644
--- a/test/Cpp/src/PeriodicDesugared.lf
+++ b/test/Cpp/src/PeriodicDesugared.lf
@@ -13,7 +13,9 @@ main reactor(offset: time = 50 msec, period: time = 500 msec) {
     init.schedule();
   =}
 
-  reaction(init) -> recur {= recur.schedule(); =}
+  reaction(init) -> recur {=
+    recur.schedule();
+  =}
 
   reaction(init, recur) -> recur {=
     std::cout << "Periodic trigger!\n";
diff --git a/test/Cpp/src/PhysicalConnection.lf b/test/Cpp/src/PhysicalConnection.lf
index 7957b5460f..6e28e8e3da 100644
--- a/test/Cpp/src/PhysicalConnection.lf
+++ b/test/Cpp/src/PhysicalConnection.lf
@@ -4,7 +4,9 @@ target Cpp
 reactor Source {
   output out: int
 
-  reaction(startup) -> out {= out.set(42); =}
+  reaction(startup) -> out {=
+    out.set(42);
+  =}
 }
 
 reactor Destination {
diff --git a/test/Cpp/src/Pipeline.lf b/test/Cpp/src/Pipeline.lf
index 00e9e3f48e..b4adbfd826 100644
--- a/test/Cpp/src/Pipeline.lf
+++ b/test/Cpp/src/Pipeline.lf
@@ -40,5 +40,7 @@ main reactor Pipeline {
   c3.out -> c4.in after 200 msec
   c4.out -> p.in
 
-  reaction(t) -> c1.in {= c1.in.set(count++); =}
+  reaction(t) -> c1.in {=
+    c1.in.set(count++);
+  =}
 }
diff --git a/test/Cpp/src/PreambleTest.lf b/test/Cpp/src/PreambleTest.lf
index b82e393a8e..9039a1ef1b 100644
--- a/test/Cpp/src/PreambleTest.lf
+++ b/test/Cpp/src/PreambleTest.lf
@@ -20,7 +20,9 @@ main reactor {
   =}
   logical action a: MyStruct
 
-  reaction(startup) -> a {= a.schedule({add_42(42), "baz"}); =}
+  reaction(startup) -> a {=
+    a.schedule({add_42(42), "baz"});
+  =}
 
   reaction(a) {=
     auto& value = *a.get();
diff --git a/test/Cpp/src/ReadOutputOfContainedReactor.lf b/test/Cpp/src/ReadOutputOfContainedReactor.lf
index 885fbad734..ee542683ba 100644
--- a/test/Cpp/src/ReadOutputOfContainedReactor.lf
+++ b/test/Cpp/src/ReadOutputOfContainedReactor.lf
@@ -4,7 +4,9 @@ target Cpp
 reactor Contained {
   output out: int
 
-  reaction(startup) -> out {= out.set(42); =}
+  reaction(startup) -> out {=
+    out.set(42);
+  =}
 }
 
 main reactor ReadOutputOfContainedReactor {
diff --git a/test/Cpp/src/Schedule.lf b/test/Cpp/src/Schedule.lf
index c62b1bf701..320cf02baf 100644
--- a/test/Cpp/src/Schedule.lf
+++ b/test/Cpp/src/Schedule.lf
@@ -5,7 +5,9 @@ reactor ScheduleTest {
   input x: int
   logical action a: void
 
-  reaction(x) -> a {= a.schedule(200ms); =}
+  reaction(x) -> a {=
+    a.schedule(200ms);
+  =}
 
   reaction(a) {=
     auto elapsed_time = get_elapsed_logical_time();
@@ -23,5 +25,7 @@ main reactor Schedule {
   a = new ScheduleTest()
   timer t
 
-  reaction(t) -> a.x {= a.x.set(1); =}
+  reaction(t) -> a.x {=
+    a.x.set(1);
+  =}
 }
diff --git a/test/Cpp/src/ScheduleLogicalAction.lf b/test/Cpp/src/ScheduleLogicalAction.lf
index f8092b3f09..b47a199b79 100644
--- a/test/Cpp/src/ScheduleLogicalAction.lf
+++ b/test/Cpp/src/ScheduleLogicalAction.lf
@@ -22,7 +22,9 @@ reactor foo {
     a.schedule(500ms);
   =}
 
-  reaction(a) -> y {= y.set(-42); =}
+  reaction(a) -> y {=
+    y.set(-42);
+  =}
 }
 
 reactor print {
@@ -48,5 +50,7 @@ main reactor {
   timer t(0, 1 sec)
   f.y -> p.x
 
-  reaction(t) -> f.x {= f.x.set(42); =}
+  reaction(t) -> f.x {=
+    f.x.set(42);
+  =}
 }
diff --git a/test/Cpp/src/SelfLoop.lf b/test/Cpp/src/SelfLoop.lf
index 0fd8fe4d6b..48c180a156 100644
--- a/test/Cpp/src/SelfLoop.lf
+++ b/test/Cpp/src/SelfLoop.lf
@@ -29,7 +29,9 @@ reactor Self {
     a.schedule(x.get(), 100ms);
   =}
 
-  reaction(startup) -> a {= a.schedule(42, 0ns); =}
+  reaction(startup) -> a {=
+    a.schedule(42, 0ns);
+  =}
 
   reaction(shutdown) {=
     if(expected <= 43) {
diff --git a/test/Cpp/src/SendingInside2.lf b/test/Cpp/src/SendingInside2.lf
index d2b62982b2..a083443b94 100644
--- a/test/Cpp/src/SendingInside2.lf
+++ b/test/Cpp/src/SendingInside2.lf
@@ -16,5 +16,7 @@ main reactor SendingInside2 {
   timer t
   p = new Printer()
 
-  reaction(t) -> p.x {= p.x.set(1); =}
+  reaction(t) -> p.x {=
+    p.x.set(1);
+  =}
 }
diff --git a/test/Cpp/src/SlowingClock.lf b/test/Cpp/src/SlowingClock.lf
index 913768dada..cb79c80b75 100644
--- a/test/Cpp/src/SlowingClock.lf
+++ b/test/Cpp/src/SlowingClock.lf
@@ -17,7 +17,9 @@ main reactor SlowingClock {
   state interval: time = 100 msec
   state expected_time: time = 100 msec
 
-  reaction(startup) -> a {= a.schedule(0ns); =}
+  reaction(startup) -> a {=
+    a.schedule(0ns);
+  =}
 
   reaction(a) -> a {=
     auto elapsed_logical_time = get_elapsed_logical_time();
diff --git a/test/Cpp/src/StartupOutFromInside.lf b/test/Cpp/src/StartupOutFromInside.lf
index 0d3502c8c5..d36441934b 100644
--- a/test/Cpp/src/StartupOutFromInside.lf
+++ b/test/Cpp/src/StartupOutFromInside.lf
@@ -8,7 +8,9 @@ target Cpp
 reactor Bar {
   output out: int
 
-  reaction(startup) -> out {= out.set(42); =}
+  reaction(startup) -> out {=
+    out.set(42);
+  =}
 }
 
 main reactor StartupOutFromInside {
diff --git a/test/Cpp/src/Stride.lf b/test/Cpp/src/Stride.lf
index 85b6c1ef0d..9ebb61c91f 100644
--- a/test/Cpp/src/Stride.lf
+++ b/test/Cpp/src/Stride.lf
@@ -19,7 +19,9 @@ reactor Count(stride: int = 1) {
 reactor Display {
   input x: int
 
-  reaction(x) {= std::cout << "Received " << *x.get() << std::endl; =}
+  reaction(x) {=
+    std::cout << "Received " << *x.get() << std::endl;
+  =}
 }
 
 main reactor Stride {
diff --git a/test/Cpp/src/StructPrint.lf b/test/Cpp/src/StructPrint.lf
index 807dba8e85..6e0fba1199 100644
--- a/test/Cpp/src/StructPrint.lf
+++ b/test/Cpp/src/StructPrint.lf
@@ -18,7 +18,9 @@ reactor Source {
   =}
 }
 
-reactor Print(expected_value: int = 42, expected_name: {= std::string =} = "Earth") {
+reactor Print(expected_value: int = 42, expected_name: {=
+  std::string
+=} = "Earth") {
   input in: Hello
 
   reaction(in) {=
diff --git a/test/Cpp/src/TimeLimit.lf b/test/Cpp/src/TimeLimit.lf
index 0249285e6b..1d11882740 100644
--- a/test/Cpp/src/TimeLimit.lf
+++ b/test/Cpp/src/TimeLimit.lf
@@ -44,5 +44,7 @@ main reactor TimeLimit(period: time = 1 sec) {
   d = new Destination()
   c.y -> d.x
 
-  reaction(stop) {= environment()->sync_shutdown(); =}
+  reaction(stop) {=
+    environment()->sync_shutdown();
+  =}
 }
diff --git a/test/Cpp/src/TimeState.lf b/test/Cpp/src/TimeState.lf
index 01f28e7f85..c08f081ba7 100644
--- a/test/Cpp/src/TimeState.lf
+++ b/test/Cpp/src/TimeState.lf
@@ -3,7 +3,9 @@ target Cpp
 reactor Foo(bar: time = 42 msec) {
   state baz = bar
 
-  reaction(startup) {= std::cout << "Baz: " << baz << std::endl; =}
+  reaction(startup) {=
+    std::cout << "Baz: " << baz << std::endl;
+  =}
 }
 
 main reactor {
diff --git a/test/Cpp/src/concurrent/AsyncCallback.lf b/test/Cpp/src/concurrent/AsyncCallback.lf
index b9d655ca75..07eb85ca3a 100644
--- a/test/Cpp/src/concurrent/AsyncCallback.lf
+++ b/test/Cpp/src/concurrent/AsyncCallback.lf
@@ -10,7 +10,9 @@ main reactor AsyncCallback {
   =}
 
   timer t(0, 200 msec)
-  state thread: {= std::thread =}
+  state thread: {=
+    std::thread
+  =}
   state expected_time: time = 100 msec
   state toggle: bool = false
 
diff --git a/test/Cpp/src/concurrent/DelayIntThreaded.lf b/test/Cpp/src/concurrent/DelayIntThreaded.lf
index 33db1411de..e090af0b89 100644
--- a/test/Cpp/src/concurrent/DelayIntThreaded.lf
+++ b/test/Cpp/src/concurrent/DelayIntThreaded.lf
@@ -6,7 +6,9 @@ reactor Delay(delay: time = 100 msec) {
   output out: int
   logical action d: int
 
-  reaction(in) -> d {= d.schedule(in.get(), delay); =}
+  reaction(in) -> d {=
+    d.schedule(in.get(), delay);
+  =}
 
   reaction(d) -> out {=
     if (d.is_present()) {
@@ -17,7 +19,9 @@ reactor Delay(delay: time = 100 msec) {
 
 reactor Test {
   input in: int
-  state start_time: {= reactor::TimePoint =}
+  state start_time: {=
+    reactor::TimePoint
+  =}
   timer start
 
   reaction(start) {=
@@ -50,5 +54,7 @@ main reactor {
   test = new Test()
   d.out -> test.in
 
-  reaction(t) -> d.in {= d.in.set(42); =}
+  reaction(t) -> d.in {=
+    d.in.set(42);
+  =}
 }
diff --git a/test/Cpp/src/concurrent/DeterminismThreaded.lf b/test/Cpp/src/concurrent/DeterminismThreaded.lf
index c0de1858c1..4fc1e5ba5b 100644
--- a/test/Cpp/src/concurrent/DeterminismThreaded.lf
+++ b/test/Cpp/src/concurrent/DeterminismThreaded.lf
@@ -4,7 +4,9 @@ reactor Source {
   output y: int
   timer t
 
-  reaction(t) -> y {= y.set(1); =}
+  reaction(t) -> y {=
+    y.set(1);
+  =}
 }
 
 reactor Destination {
@@ -31,7 +33,9 @@ reactor Pass {
   input x: int
   output y: int
 
-  reaction(x) -> y {= y.set(x.get()); =}
+  reaction(x) -> y {=
+    y.set(x.get());
+  =}
 }
 
 main reactor {
diff --git a/test/Cpp/src/concurrent/GainThreaded.lf b/test/Cpp/src/concurrent/GainThreaded.lf
index 112f97632b..379a441ff1 100644
--- a/test/Cpp/src/concurrent/GainThreaded.lf
+++ b/test/Cpp/src/concurrent/GainThreaded.lf
@@ -5,7 +5,9 @@ reactor Scale(scale: int = 2) {
   input x: int
   output y: int
 
-  reaction(x) -> y {= y.set(*x.get() * scale); =}
+  reaction(x) -> y {=
+    y.set(*x.get() * scale);
+  =}
 }
 
 reactor Test {
@@ -27,5 +29,7 @@ main reactor {
   g.y -> t.x
   timer tim
 
-  reaction(tim) -> g.x {= g.x.set(1); =}
+  reaction(tim) -> g.x {=
+    g.x.set(1);
+  =}
 }
diff --git a/test/Cpp/src/concurrent/HelloThreaded.lf b/test/Cpp/src/concurrent/HelloThreaded.lf
index 35e2261048..ca08070d87 100644
--- a/test/Cpp/src/concurrent/HelloThreaded.lf
+++ b/test/Cpp/src/concurrent/HelloThreaded.lf
@@ -7,9 +7,13 @@ target Cpp {
   fast: true
 }
 
-reactor HelloCpp(period: time = 2 sec, message: {= std::string =} = "Hello C++") {
+reactor HelloCpp(period: time = 2 sec, message: {=
+  std::string
+=} = "Hello C++") {
   state count: int = 0
-  state previous_time: {= reactor::TimePoint =}
+  state previous_time: {=
+    reactor::TimePoint
+  =}
   timer t(1 sec, period)
   logical action a: void
 
@@ -35,7 +39,9 @@ reactor HelloCpp(period: time = 2 sec, message: {= std::string =} = "Hello C++")
   =}
 }
 
-reactor Inside(period: time = 1 sec, message: {= std::string =} = "Composite default message.") {
+reactor Inside(period: time = 1 sec, message: {=
+  std::string
+=} = "Composite default message.") {
   third_instance = new HelloCpp(period=period, message=message)
 }
 
diff --git a/test/Cpp/src/concurrent/ImportThreaded.lf b/test/Cpp/src/concurrent/ImportThreaded.lf
index 791291fc10..73dac5911c 100644
--- a/test/Cpp/src/concurrent/ImportThreaded.lf
+++ b/test/Cpp/src/concurrent/ImportThreaded.lf
@@ -7,5 +7,7 @@ main reactor {
   timer t
   a = new Imported()
 
-  reaction(t) -> a.x {= a.x.set(42); =}
+  reaction(t) -> a.x {=
+    a.x.set(42);
+  =}
 }
diff --git a/test/Cpp/src/concurrent/MinimalThreaded.lf b/test/Cpp/src/concurrent/MinimalThreaded.lf
index a0184d5261..421eb45d57 100644
--- a/test/Cpp/src/concurrent/MinimalThreaded.lf
+++ b/test/Cpp/src/concurrent/MinimalThreaded.lf
@@ -2,5 +2,7 @@
 target Cpp
 
 main reactor {
-  reaction(startup) {= std::cout << "Hello World!\n"; =}
+  reaction(startup) {=
+    std::cout << "Hello World!\n";
+  =}
 }
diff --git a/test/Cpp/src/concurrent/TimeLimitThreaded.lf b/test/Cpp/src/concurrent/TimeLimitThreaded.lf
index ecff6ecfc9..6d561cca38 100644
--- a/test/Cpp/src/concurrent/TimeLimitThreaded.lf
+++ b/test/Cpp/src/concurrent/TimeLimitThreaded.lf
@@ -45,5 +45,7 @@ main reactor(period: time = 1 sec) {
   d = new Destination()
   c.y -> d.x
 
-  reaction(stop) {= environment()->sync_shutdown(); =}
+  reaction(stop) {=
+    environment()->sync_shutdown();
+  =}
 }
diff --git a/test/Cpp/src/enclave/EnclaveBankEach.lf b/test/Cpp/src/enclave/EnclaveBankEach.lf
index d1b94748ba..c220a082c5 100644
--- a/test/Cpp/src/enclave/EnclaveBankEach.lf
+++ b/test/Cpp/src/enclave/EnclaveBankEach.lf
@@ -6,8 +6,12 @@ target Cpp {
 reactor Node(
     bank_index: size_t = 0,
     id: std::string = {= "node" + std::to_string(bank_index) =},
-    period: {= reactor::Duration =} = {= 100ms * (bank_index+1) =},
-    duration: {= reactor::Duration =} = {= 50ms + 100ms * bank_index =}) {
+    period: {=
+      reactor::Duration
+    =} = {= 100ms * (bank_index+1) =},
+    duration: {=
+      reactor::Duration
+    =} = {= 50ms + 100ms * bank_index =}) {
   logical action a: void
 
   reaction(startup, a) -> a {=
diff --git a/test/Cpp/src/enclave/EnclaveBroadcast.lf b/test/Cpp/src/enclave/EnclaveBroadcast.lf
index a54452b2ea..389179429e 100644
--- a/test/Cpp/src/enclave/EnclaveBroadcast.lf
+++ b/test/Cpp/src/enclave/EnclaveBroadcast.lf
@@ -5,7 +5,9 @@ target Cpp {
 reactor Source {
   output out: unsigned
 
-  reaction(startup) -> out {= out.set(42); =}
+  reaction(startup) -> out {=
+    out.set(42);
+  =}
 }
 
 reactor Sink(bank_index: size_t = 0) {
diff --git a/test/Cpp/src/enclave/EnclaveCommunication.lf b/test/Cpp/src/enclave/EnclaveCommunication.lf
index 9bf2af20cc..338be8a66c 100644
--- a/test/Cpp/src/enclave/EnclaveCommunication.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunication.lf
@@ -8,7 +8,9 @@ reactor Src {
   output out: int
   state counter: int = 0
 
-  reaction(t) -> out {= out.set(counter++); =}
+  reaction(t) -> out {=
+    out.set(counter++);
+  =}
 }
 
 reactor Sink {
diff --git a/test/Cpp/src/enclave/EnclaveCommunication2.lf b/test/Cpp/src/enclave/EnclaveCommunication2.lf
index bb60949645..dae4722da8 100644
--- a/test/Cpp/src/enclave/EnclaveCommunication2.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunication2.lf
@@ -8,7 +8,9 @@ reactor Src {
   output out: int
   state counter: int = 0
 
-  reaction(t) -> out {= out.set(counter++); =}
+  reaction(t) -> out {=
+    out.set(counter++);
+  =}
 }
 
 reactor Sink {
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationDelayed.lf b/test/Cpp/src/enclave/EnclaveCommunicationDelayed.lf
index 9adad03ebb..d9cea724bf 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationDelayed.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationDelayed.lf
@@ -8,7 +8,9 @@ reactor Src {
   output out: int
   state counter: int = 0
 
-  reaction(t) -> out {= out.set(counter++); =}
+  reaction(t) -> out {=
+    out.set(counter++);
+  =}
 }
 
 reactor Sink {
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationDelayed2.lf b/test/Cpp/src/enclave/EnclaveCommunicationDelayed2.lf
index 6272a7aa00..89467ae0a5 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationDelayed2.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationDelayed2.lf
@@ -8,7 +8,9 @@ reactor Src {
   output out: int
   state counter: int = 0
 
-  reaction(t) -> out {= out.set(counter++); =}
+  reaction(t) -> out {=
+    out.set(counter++);
+  =}
 }
 
 reactor Sink {
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationDelayedLocalEvents.lf b/test/Cpp/src/enclave/EnclaveCommunicationDelayedLocalEvents.lf
index 31939cf447..ae2b28da08 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationDelayedLocalEvents.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationDelayedLocalEvents.lf
@@ -8,7 +8,9 @@ reactor Src {
   output out: int
   state counter: int = 0
 
-  reaction(t) -> out {= out.set(counter++); =}
+  reaction(t) -> out {=
+    out.set(counter++);
+  =}
 }
 
 reactor Sink {
@@ -34,7 +36,9 @@ reactor Sink {
     }
   =}
 
-  reaction(t) {= reactor::log::Info() << "Tick"; =}
+  reaction(t) {=
+    reactor::log::Info() << "Tick";
+  =}
 }
 
 main reactor {
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationLocalEvents.lf b/test/Cpp/src/enclave/EnclaveCommunicationLocalEvents.lf
index 342a6e7eaf..ac830a86c0 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationLocalEvents.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationLocalEvents.lf
@@ -8,7 +8,9 @@ reactor Src {
   output out: int
   state counter: int = 0
 
-  reaction(t) -> out {= out.set(counter++); =}
+  reaction(t) -> out {=
+    out.set(counter++);
+  =}
 }
 
 reactor Sink {
@@ -34,7 +36,9 @@ reactor Sink {
     }
   =}
 
-  reaction(t) {= reactor::log::Info() << "Tick"; =}
+  reaction(t) {=
+    reactor::log::Info() << "Tick";
+  =}
 }
 
 main reactor {
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBank.lf b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBank.lf
index e315632425..134a53b9ef 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBank.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBank.lf
@@ -44,7 +44,9 @@ reactor Sink(bank_index: std::size_t = 0) {
     }
   =}
 
-  reaction(t) {= reactor::log::Info() << "Tick"; =}
+  reaction(t) {=
+    reactor::log::Info() << "Tick";
+  =}
 }
 
 main reactor {
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankDelayed.lf b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankDelayed.lf
index 4eda00fd38..60776a4db0 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankDelayed.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankDelayed.lf
@@ -44,7 +44,9 @@ reactor Sink(bank_index: std::size_t = 0) {
     }
   =}
 
-  reaction(t) {= reactor::log::Info() << "Tick"; =}
+  reaction(t) {=
+    reactor::log::Info() << "Tick";
+  =}
 }
 
 main reactor {
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEach.lf b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEach.lf
index 1016beffce..4acce71e86 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEach.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEach.lf
@@ -44,7 +44,9 @@ reactor Sink(bank_index: std::size_t = 0) {
     }
   =}
 
-  reaction(t) {= reactor::log::Info() << "Tick"; =}
+  reaction(t) {=
+    reactor::log::Info() << "Tick";
+  =}
 }
 
 main reactor {
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEachDelayed.lf b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEachDelayed.lf
index 97ad53108a..4eb175dc6c 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEachDelayed.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEachDelayed.lf
@@ -44,7 +44,9 @@ reactor Sink(bank_index: std::size_t = 0) {
     }
   =}
 
-  reaction(t) {= reactor::log::Info() << "Tick"; =}
+  reaction(t) {=
+    reactor::log::Info() << "Tick";
+  =}
 }
 
 main reactor {
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEachPhysical.lf b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEachPhysical.lf
index e7b9ab3288..3a8e7d2dfd 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEachPhysical.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankEachPhysical.lf
@@ -44,7 +44,9 @@ reactor Sink(bank_index: std::size_t = 0) {
     }
   =}
 
-  reaction(t) {= reactor::log::Info() << "Tick"; =}
+  reaction(t) {=
+    reactor::log::Info() << "Tick";
+  =}
 }
 
 main reactor {
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankPhysical.lf b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankPhysical.lf
index ece73aab30..257ce163f4 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankPhysical.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationMultiportToBankPhysical.lf
@@ -44,7 +44,9 @@ reactor Sink(bank_index: std::size_t = 0) {
     }
   =}
 
-  reaction(t) {= reactor::log::Info() << "Tick"; =}
+  reaction(t) {=
+    reactor::log::Info() << "Tick";
+  =}
 }
 
 main reactor {
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationPhysical.lf b/test/Cpp/src/enclave/EnclaveCommunicationPhysical.lf
index 65a2b44825..9abb687b07 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationPhysical.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationPhysical.lf
@@ -8,7 +8,9 @@ reactor Src {
   output out: int
   state counter: int = 0
 
-  reaction(t) -> out {= out.set(counter++); =}
+  reaction(t) -> out {=
+    out.set(counter++);
+  =}
 }
 
 reactor Sink {
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationPhysicalLocalEvents.lf b/test/Cpp/src/enclave/EnclaveCommunicationPhysicalLocalEvents.lf
index c413345f16..1bdb3e8323 100644
--- a/test/Cpp/src/enclave/EnclaveCommunicationPhysicalLocalEvents.lf
+++ b/test/Cpp/src/enclave/EnclaveCommunicationPhysicalLocalEvents.lf
@@ -8,7 +8,9 @@ reactor Src {
   output out: int
   state counter: int = 0
 
-  reaction(t) -> out {= out.set(counter++); =}
+  reaction(t) -> out {=
+    out.set(counter++);
+  =}
 }
 
 reactor Sink {
@@ -34,7 +36,9 @@ reactor Sink {
     }
   =}
 
-  reaction(t) {= reactor::log::Info() << "Tick"; =}
+  reaction(t) {=
+    reactor::log::Info() << "Tick";
+  =}
 }
 
 main reactor {
diff --git a/test/Cpp/src/enclave/EnclaveCycle.lf b/test/Cpp/src/enclave/EnclaveCycle.lf
index 15d68b99cc..960866e59f 100644
--- a/test/Cpp/src/enclave/EnclaveCycle.lf
+++ b/test/Cpp/src/enclave/EnclaveCycle.lf
@@ -10,7 +10,9 @@ reactor Ping {
   state counter: int = 0
   state received: bool = false
 
-  reaction(t) -> out {= out.set(counter++); =}
+  reaction(t) -> out {=
+    out.set(counter++);
+  =}
 
   reaction(in) {=
     received = true;
diff --git a/test/Cpp/src/enclave/EnclaveCycleTwoTimers.lf b/test/Cpp/src/enclave/EnclaveCycleTwoTimers.lf
index 8c4ce316a3..5ba4ea4916 100644
--- a/test/Cpp/src/enclave/EnclaveCycleTwoTimers.lf
+++ b/test/Cpp/src/enclave/EnclaveCycleTwoTimers.lf
@@ -10,7 +10,9 @@ reactor Ping {
   state counter: int = 0
   state received: bool = false
 
-  reaction(t) -> out {= out.set(counter++); =}
+  reaction(t) -> out {=
+    out.set(counter++);
+  =}
 
   reaction(in) {=
     received = true;
@@ -38,7 +40,9 @@ reactor Pong {
   state counter: int = 0
   state received: bool = false
 
-  reaction(t) -> out {= out.set(counter++); =}
+  reaction(t) -> out {=
+    out.set(counter++);
+  =}
 
   reaction(in) {=
     received = true;
diff --git a/test/Cpp/src/enclave/EnclaveHelloWorld.lf b/test/Cpp/src/enclave/EnclaveHelloWorld.lf
index 21b7374a09..e33c56ed93 100644
--- a/test/Cpp/src/enclave/EnclaveHelloWorld.lf
+++ b/test/Cpp/src/enclave/EnclaveHelloWorld.lf
@@ -1,7 +1,9 @@
 target Cpp
 
 reactor Hello(msg: std::string = "World") {
-  reaction(startup) {= reactor::log::Info() << "Hello " << msg << '!'; =}
+  reaction(startup) {=
+    reactor::log::Info() << "Hello " << msg << '!';
+  =}
 }
 
 main reactor(msg1: std::string = "World", msg2: std::string = "Enclave") {
diff --git a/test/Cpp/src/enclave/EnclaveShutdown.lf b/test/Cpp/src/enclave/EnclaveShutdown.lf
index ab56d58b08..a949cc88be 100644
--- a/test/Cpp/src/enclave/EnclaveShutdown.lf
+++ b/test/Cpp/src/enclave/EnclaveShutdown.lf
@@ -4,9 +4,13 @@ reactor Node(message: std::string = "Hello", period: time = 1 sec, stop: time =
   timer t(0, period)
   timer s(stop)
 
-  reaction(t) {= reactor::log::Info() << message; =}
+  reaction(t) {=
+    reactor::log::Info() << message;
+  =}
 
-  reaction(s) {= request_stop(); =}
+  reaction(s) {=
+    request_stop();
+  =}
 
   reaction(shutdown) {=
     reactor::log::Info() << "Goodbye!";
diff --git a/test/Cpp/src/enclave/EnclaveSparseUpstreamEvents.lf b/test/Cpp/src/enclave/EnclaveSparseUpstreamEvents.lf
index 047910fd91..33d0c8e0e6 100644
--- a/test/Cpp/src/enclave/EnclaveSparseUpstreamEvents.lf
+++ b/test/Cpp/src/enclave/EnclaveSparseUpstreamEvents.lf
@@ -10,7 +10,9 @@ reactor Src {
   output out: int
   state counter: int = 0
 
-  reaction(t) -> out {= out.set(counter++); =}
+  reaction(t) -> out {=
+    out.set(counter++);
+  =}
 }
 
 reactor Sink {
@@ -36,7 +38,9 @@ reactor Sink {
     }
   =}
 
-  reaction(t) {= reactor::log::Info() << "Tick"; =} deadline(2 s) {=
+  reaction(t) {=
+    reactor::log::Info() << "Tick";
+  =} deadline(2 s) {=
     reactor::log::Error() << "Deadline violated.";
     exit(2);
   =}
diff --git a/test/Cpp/src/enclave/EnclaveSparseUpstreamEventsDelayed.lf b/test/Cpp/src/enclave/EnclaveSparseUpstreamEventsDelayed.lf
index 486655ddd6..1a02db98a5 100644
--- a/test/Cpp/src/enclave/EnclaveSparseUpstreamEventsDelayed.lf
+++ b/test/Cpp/src/enclave/EnclaveSparseUpstreamEventsDelayed.lf
@@ -10,7 +10,9 @@ reactor Src {
   output out: int
   state counter: int = 0
 
-  reaction(t) -> out {= out.set(counter++); =}
+  reaction(t) -> out {=
+    out.set(counter++);
+  =}
 }
 
 reactor Sink {
@@ -36,7 +38,9 @@ reactor Sink {
     }
   =}
 
-  reaction(t) {= reactor::log::Info() << "Tick"; =} deadline(2 s) {=
+  reaction(t) {=
+    reactor::log::Info() << "Tick";
+  =} deadline(2 s) {=
     reactor::log::Error() << "Deadline violated.";
     exit(2);
   =}
diff --git a/test/Cpp/src/enclave/EnclaveSparseUpstreamEventsPhysical.lf b/test/Cpp/src/enclave/EnclaveSparseUpstreamEventsPhysical.lf
index d2f0a78e3f..b73152954b 100644
--- a/test/Cpp/src/enclave/EnclaveSparseUpstreamEventsPhysical.lf
+++ b/test/Cpp/src/enclave/EnclaveSparseUpstreamEventsPhysical.lf
@@ -10,7 +10,9 @@ reactor Src {
   output out: int
   state counter: int = 0
 
-  reaction(t) -> out {= out.set(counter++); =}
+  reaction(t) -> out {=
+    out.set(counter++);
+  =}
 }
 
 reactor Sink {
@@ -36,7 +38,9 @@ reactor Sink {
     }
   =}
 
-  reaction(t) {= reactor::log::Info() << "Tick"; =} deadline(2 s) {=
+  reaction(t) {=
+    reactor::log::Info() << "Tick";
+  =} deadline(2 s) {=
     reactor::log::Error() << "Deadline violated.";
     exit(2);
   =}
diff --git a/test/Cpp/src/enclave/EnclaveTimeout.lf b/test/Cpp/src/enclave/EnclaveTimeout.lf
index b05e6b7b1e..2ba4a59464 100644
--- a/test/Cpp/src/enclave/EnclaveTimeout.lf
+++ b/test/Cpp/src/enclave/EnclaveTimeout.lf
@@ -5,7 +5,9 @@ target Cpp {
 reactor Node(message: std::string = "Hello", period: time = 1 sec) {
   timer t(0, period)
 
-  reaction(t) {= reactor::log::Info() << message; =}
+  reaction(t) {=
+    reactor::log::Info() << message;
+  =}
 
   reaction(shutdown) {=
     reactor::log::Info() << "Goodbye!";
diff --git a/test/Cpp/src/enclave/EnclaveUpstreamPhysicalAction.lf b/test/Cpp/src/enclave/EnclaveUpstreamPhysicalAction.lf
index 16d0d55586..0097a1e4ae 100644
--- a/test/Cpp/src/enclave/EnclaveUpstreamPhysicalAction.lf
+++ b/test/Cpp/src/enclave/EnclaveUpstreamPhysicalAction.lf
@@ -25,7 +25,9 @@ reactor Src {
     });
   =}
 
-  reaction(a) -> out {= out.set(a.get()); =}
+  reaction(a) -> out {=
+    out.set(a.get());
+  =}
 
   reaction(shutdown) {=
     // make sure to join the thread before shutting down
diff --git a/test/Cpp/src/enclave/EnclaveUpstreamPhysicalActionDelayed.lf b/test/Cpp/src/enclave/EnclaveUpstreamPhysicalActionDelayed.lf
index 4e7b138c90..936e692a71 100644
--- a/test/Cpp/src/enclave/EnclaveUpstreamPhysicalActionDelayed.lf
+++ b/test/Cpp/src/enclave/EnclaveUpstreamPhysicalActionDelayed.lf
@@ -25,7 +25,9 @@ reactor Src {
     });
   =}
 
-  reaction(a) -> out {= out.set(a.get()); =}
+  reaction(a) -> out {=
+    out.set(a.get());
+  =}
 
   reaction(shutdown) {=
     // make sure to join the thread before shutting down
diff --git a/test/Cpp/src/enclave/FastAndSlow.lf b/test/Cpp/src/enclave/FastAndSlow.lf
index 3d421223e6..554f07073b 100644
--- a/test/Cpp/src/enclave/FastAndSlow.lf
+++ b/test/Cpp/src/enclave/FastAndSlow.lf
@@ -20,7 +20,9 @@ reactor Slow {
 reactor Fast {
   timer t(0 msec, 100 msec)
 
-  reaction(t) {= reactor::log::Info() << "Fast reaction executes"; =} deadline(200 msec) {=
+  reaction(t) {=
+    reactor::log::Info() << "Fast reaction executes";
+  =} deadline(200 msec) {=
     reactor::log::Error() << "Fast deadline was violated!";
     exit(2);
   =}
diff --git a/test/Cpp/src/lib/Imported.lf b/test/Cpp/src/lib/Imported.lf
index abf2464b96..f1ce5ae3aa 100644
--- a/test/Cpp/src/lib/Imported.lf
+++ b/test/Cpp/src/lib/Imported.lf
@@ -8,5 +8,7 @@ reactor Imported {
   input x: int
   a = new ImportedAgain()
 
-  reaction(x) -> a.x {= a.x.set(x.get()); =}
+  reaction(x) -> a.x {=
+    a.x.set(x.get());
+  =}
 }
diff --git a/test/Cpp/src/lib/ImportedComposition.lf b/test/Cpp/src/lib/ImportedComposition.lf
index cc3ccba591..eec583e8a6 100644
--- a/test/Cpp/src/lib/ImportedComposition.lf
+++ b/test/Cpp/src/lib/ImportedComposition.lf
@@ -12,7 +12,9 @@ reactor Gain {
   input x: int
   output y: int
 
-  reaction(x) -> y {= y.set(*x.get() * 2); =}
+  reaction(x) -> y {=
+    y.set(*x.get() * 2);
+  =}
 }
 
 reactor ImportedComposition {
diff --git a/test/Cpp/src/multiport/BankSelfBroadcast.lf b/test/Cpp/src/multiport/BankSelfBroadcast.lf
index 2961e3a55c..a7f81fcff9 100644
--- a/test/Cpp/src/multiport/BankSelfBroadcast.lf
+++ b/test/Cpp/src/multiport/BankSelfBroadcast.lf
@@ -13,7 +13,9 @@ reactor A(bank_index: size_t = 0) {
   output out: size_t
   state received: bool = false
 
-  reaction(startup) -> out {= out.set(bank_index); =}
+  reaction(startup) -> out {=
+    out.set(bank_index);
+  =}
 
   reaction(in) {=
     for (size_t i = 0; i < in.size(); i++) {
diff --git a/test/Cpp/src/multiport/BankToMultiport.lf b/test/Cpp/src/multiport/BankToMultiport.lf
index 93b476c235..bf283164de 100644
--- a/test/Cpp/src/multiport/BankToMultiport.lf
+++ b/test/Cpp/src/multiport/BankToMultiport.lf
@@ -4,7 +4,9 @@ target Cpp
 reactor Source(bank_index: size_t = 0) {
   output out: unsigned
 
-  reaction(startup) -> out {= out.set(bank_index); =}
+  reaction(startup) -> out {=
+    out.set(bank_index);
+  =}
 }
 
 reactor Sink {
diff --git a/test/Cpp/src/multiport/Broadcast.lf b/test/Cpp/src/multiport/Broadcast.lf
index 0ae960053b..2289cbb596 100644
--- a/test/Cpp/src/multiport/Broadcast.lf
+++ b/test/Cpp/src/multiport/Broadcast.lf
@@ -3,7 +3,9 @@ target Cpp
 reactor Source {
   output out: unsigned
 
-  reaction(startup) -> out {= out.set(42); =}
+  reaction(startup) -> out {=
+    out.set(42);
+  =}
 }
 
 reactor Sink(bank_index: size_t = 0) {
diff --git a/test/Cpp/src/multiport/BroadcastAfter.lf b/test/Cpp/src/multiport/BroadcastAfter.lf
index 50b8d5bb59..bdf5274229 100644
--- a/test/Cpp/src/multiport/BroadcastAfter.lf
+++ b/test/Cpp/src/multiport/BroadcastAfter.lf
@@ -5,7 +5,9 @@ target Cpp {
 reactor Source {
   output out: unsigned
 
-  reaction(startup) -> out {= out.set(42); =}
+  reaction(startup) -> out {=
+    out.set(42);
+  =}
 }
 
 reactor Sink(bank_index: size_t = 0) {
diff --git a/test/Cpp/src/multiport/BroadcastMultipleAfter.lf b/test/Cpp/src/multiport/BroadcastMultipleAfter.lf
index da2af4e9cf..6d37fedc72 100644
--- a/test/Cpp/src/multiport/BroadcastMultipleAfter.lf
+++ b/test/Cpp/src/multiport/BroadcastMultipleAfter.lf
@@ -5,7 +5,9 @@ target Cpp {
 reactor Source(value: unsigned = 42) {
   output out: unsigned
 
-  reaction(startup) -> out {= out.set(value); =}
+  reaction(startup) -> out {=
+    out.set(value);
+  =}
 }
 
 reactor Sink(bank_index: size_t = 0) {
diff --git a/test/Cpp/src/multiport/IndexIntoMultiportInput.lf b/test/Cpp/src/multiport/IndexIntoMultiportInput.lf
index 39baee6b6b..a167edf8df 100644
--- a/test/Cpp/src/multiport/IndexIntoMultiportInput.lf
+++ b/test/Cpp/src/multiport/IndexIntoMultiportInput.lf
@@ -45,9 +45,15 @@ main reactor IndexIntoMultiportInput {
 
   splitter.out -> receiver.in
 
-  reaction(startup) -> splitter.in0 {= splitter.in0.set(0); =}
+  reaction(startup) -> splitter.in0 {=
+    splitter.in0.set(0);
+  =}
 
-  reaction(startup) -> splitter.in1 {= splitter.in1.set(1); =}
+  reaction(startup) -> splitter.in1 {=
+    splitter.in1.set(1);
+  =}
 
-  reaction(startup) -> splitter.in2 {= splitter.in2.set(2); =}
+  reaction(startup) -> splitter.in2 {=
+    splitter.in2.set(2);
+  =}
 }
diff --git a/test/Cpp/src/multiport/MultiportFromBank.lf b/test/Cpp/src/multiport/MultiportFromBank.lf
index e3f6a23b30..6d952ccbbf 100644
--- a/test/Cpp/src/multiport/MultiportFromBank.lf
+++ b/test/Cpp/src/multiport/MultiportFromBank.lf
@@ -8,7 +8,9 @@ target Cpp {
 reactor Source(bank_index: size_t = 0) {
   output out: unsigned
 
-  reaction(startup) -> out {= out.set(bank_index); =}
+  reaction(startup) -> out {=
+    out.set(bank_index);
+  =}
 }
 
 reactor Destination(port_width: size_t = 2) {
diff --git a/test/Cpp/src/multiport/MultiportFromBankHierarchy.lf b/test/Cpp/src/multiport/MultiportFromBankHierarchy.lf
index c6ffb52819..bd4a5ab263 100644
--- a/test/Cpp/src/multiport/MultiportFromBankHierarchy.lf
+++ b/test/Cpp/src/multiport/MultiportFromBankHierarchy.lf
@@ -8,7 +8,9 @@ target Cpp {
 reactor Source(bank_index: size_t = 0) {
   output out: unsigned
 
-  reaction(startup) -> out {= out.set(bank_index); =}
+  reaction(startup) -> out {=
+    out.set(bank_index);
+  =}
 }
 
 reactor Container {
diff --git a/test/Cpp/src/multiport/MultiportFromBankHierarchyAfter.lf b/test/Cpp/src/multiport/MultiportFromBankHierarchyAfter.lf
index cb3eeaa0c4..e3d76d4e51 100644
--- a/test/Cpp/src/multiport/MultiportFromBankHierarchyAfter.lf
+++ b/test/Cpp/src/multiport/MultiportFromBankHierarchyAfter.lf
@@ -8,7 +8,9 @@ target Cpp {
 reactor Source(bank_index: size_t = 0) {
   output out: int
 
-  reaction(startup) -> out {= out.set(bank_index); =}
+  reaction(startup) -> out {=
+    out.set(bank_index);
+  =}
 }
 
 reactor Container {
diff --git a/test/Cpp/src/multiport/MultiportIn.lf b/test/Cpp/src/multiport/MultiportIn.lf
index 6f4f63f74b..8b01ff6712 100644
--- a/test/Cpp/src/multiport/MultiportIn.lf
+++ b/test/Cpp/src/multiport/MultiportIn.lf
@@ -10,14 +10,18 @@ reactor Source {
   output out: int
   state s: int = 0
 
-  reaction(t) -> out {= out.set(s++); =}
+  reaction(t) -> out {=
+    out.set(s++);
+  =}
 }
 
 reactor Computation {
   input in: int
   output out: int
 
-  reaction(in) -> out {= out.set(*in.get()); =}
+  reaction(in) -> out {=
+    out.set(*in.get());
+  =}
 }
 
 reactor Destination {
diff --git a/test/Cpp/src/multiport/PipelineAfter.lf b/test/Cpp/src/multiport/PipelineAfter.lf
index 8fb6418e65..e164210de2 100644
--- a/test/Cpp/src/multiport/PipelineAfter.lf
+++ b/test/Cpp/src/multiport/PipelineAfter.lf
@@ -3,14 +3,18 @@ target Cpp
 reactor Source {
   output out: unsigned
 
-  reaction(startup) -> out {= out.set(40); =}
+  reaction(startup) -> out {=
+    out.set(40);
+  =}
 }
 
 reactor Compute {
   input in: unsigned
   output out: unsigned
 
-  reaction(in) -> out {= out.set(*in.get() + 2); =}
+  reaction(in) -> out {=
+    out.set(*in.get() + 2);
+  =}
 }
 
 reactor Sink {
diff --git a/test/Cpp/src/multiport/ReadOutputOfContainedBank.lf b/test/Cpp/src/multiport/ReadOutputOfContainedBank.lf
index c0fb6d59ee..02293cc44e 100644
--- a/test/Cpp/src/multiport/ReadOutputOfContainedBank.lf
+++ b/test/Cpp/src/multiport/ReadOutputOfContainedBank.lf
@@ -4,7 +4,9 @@ target Cpp
 reactor Contained(bank_index: size_t = 0) {
   output out: unsigned
 
-  reaction(startup) -> out {= out.set(42 * bank_index); =}
+  reaction(startup) -> out {=
+    out.set(42 * bank_index);
+  =}
 }
 
 main reactor {
diff --git a/test/Cpp/src/multiport/WidthGivenByCode.lf b/test/Cpp/src/multiport/WidthGivenByCode.lf
index 5e9ed80eb3..3580a9696c 100644
--- a/test/Cpp/src/multiport/WidthGivenByCode.lf
+++ b/test/Cpp/src/multiport/WidthGivenByCode.lf
@@ -1,8 +1,12 @@
 target Cpp
 
 reactor Foo(a: size_t = 8, b: size_t = 2) {
-  input[{= a*b =}] in: size_t
-  output[{= a/b =}] out: size_t
+  input[{=
+    a*b
+  =}] in: size_t
+  output[{=
+    a/b
+  =}] out: size_t
 
   reaction(startup) in -> out {=
     if (in.size() != a*b) {
@@ -20,7 +24,9 @@ main reactor {
   foo1 = new Foo()
   foo2 = new Foo(a=10, b=3)
   foo3 = new Foo(a=9, b=9)
-  foo_bank = new[{= 42 =}] Foo()
+  foo_bank = new[{=
+    42
+  =}] Foo()
 
   reaction(startup) foo_bank.out {=
     if (foo_bank.size() != 42) {
diff --git a/test/Cpp/src/properties/Fast.lf b/test/Cpp/src/properties/Fast.lf
index a44d1fb7e5..0f7e5e8e15 100644
--- a/test/Cpp/src/properties/Fast.lf
+++ b/test/Cpp/src/properties/Fast.lf
@@ -7,7 +7,9 @@ main reactor {
 
   state triggered: bool = false
 
-  reaction(startup) -> a {= a.schedule(2s); =}
+  reaction(startup) -> a {=
+    a.schedule(2s);
+  =}
 
   reaction(a) {=
     triggered = true;
diff --git a/test/Cpp/src/target/AfterVoid.lf b/test/Cpp/src/target/AfterVoid.lf
index 5b208b4008..cacc98e892 100644
--- a/test/Cpp/src/target/AfterVoid.lf
+++ b/test/Cpp/src/target/AfterVoid.lf
@@ -8,7 +8,9 @@ reactor foo {
   timer t(0, 1 sec)
   output y: void
 
-  reaction(t) -> y {= y.set(); =}
+  reaction(t) -> y {=
+    y.set();
+  =}
 }
 
 reactor print {
diff --git a/test/Cpp/src/target/CliParserGenericArguments.lf b/test/Cpp/src/target/CliParserGenericArguments.lf
index 8028776e07..42c8bd6c2a 100644
--- a/test/Cpp/src/target/CliParserGenericArguments.lf
+++ b/test/Cpp/src/target/CliParserGenericArguments.lf
@@ -47,15 +47,27 @@ main reactor CliParserGenericArguments(
     signed_value: signed = -10,
     unsigned_value: unsigned = 11,
     long_value: long = -100,
-    unsigned_long_value: {= unsigned_long =} = 42,
-    long_long_value: {= long_long =} = -42,
-    ull_value: {= uns_long_long =} = 42,
+    unsigned_long_value: {=
+      unsigned_long
+    =} = 42,
+    long_long_value: {=
+      long_long
+    =} = -42,
+    ull_value: {=
+      uns_long_long
+    =} = 42,
     bool_value: bool = false,
     char_value: char = 'T',
     double_value: double = 4.2,
-    long_double_value: {= long_double =} = 4.2,
+    long_double_value: {=
+      long_double
+    =} = 4.2,
     float_value: float = 10.5,
     string_value: string = "This is a testvalue",
-    custom_class_value: {= CustomClass =}("Peter")) {
-  reaction(startup) {= std::cout << "Hello World!\n"; =}
+    custom_class_value: {=
+      CustomClass
+    =}("Peter")) {
+  reaction(startup) {=
+    std::cout << "Hello World!\n";
+  =}
 }
diff --git a/test/Cpp/src/target/CombinedTypeNames.lf b/test/Cpp/src/target/CombinedTypeNames.lf
index f64116eb4a..5caa22f70a 100644
--- a/test/Cpp/src/target/CombinedTypeNames.lf
+++ b/test/Cpp/src/target/CombinedTypeNames.lf
@@ -2,9 +2,17 @@
 // int`) can be used correctly in LF code.
 target Cpp
 
-reactor Foo(bar: {= unsigned int =} = 0, baz: {= const unsigned int* =} = {= nullptr =}) {
-  state s_bar: {= unsigned int =} = bar
-  state s_baz: {= const unsigned int* =} = baz
+reactor Foo(bar: {=
+  unsigned int
+=} = 0, baz: {=
+  const unsigned int*
+=} = {= nullptr =}) {
+  state s_bar: {=
+    unsigned int
+  =} = bar
+  state s_baz: {=
+    const unsigned int*
+  =} = baz
 
   reaction(startup) {=
     if (bar != 42 || s_bar != 42 || *baz != 42 || *s_baz != 42) {
@@ -14,6 +22,8 @@ reactor Foo(bar: {= unsigned int =} = 0, baz: {= const unsigned int* =} = {= nul
   =}
 }
 
-main reactor(bar: {= unsigned int =} = 42) {
+main reactor(bar: {=
+  unsigned int
+=} = 42) {
   foo = new Foo(bar=bar, baz = {= &bar =})
 }
diff --git a/test/Cpp/src/target/GenericAfter.lf b/test/Cpp/src/target/GenericAfter.lf
index 3de5c1dba8..9957ea6e16 100644
--- a/test/Cpp/src/target/GenericAfter.lf
+++ b/test/Cpp/src/target/GenericAfter.lf
@@ -7,9 +7,13 @@ reactor Delay<T>(delay: time(0)) {
   input in: T
   logical action a(delay): T
 
-  reaction(a) -> out {= out.set(a.get()); =}
+  reaction(a) -> out {=
+    out.set(a.get());
+  =}
 
-  reaction(in) -> a {= a.schedule(in.get()); =}
+  reaction(in) -> a {=
+    a.schedule(in.get());
+  =}
 }
 
 main reactor {
@@ -17,5 +21,7 @@ main reactor {
   test = new Test()
   d.out -> test.in after 50 msec
 
-  reaction(startup) -> d.in {= d.in.set(42); =}
+  reaction(startup) -> d.in {=
+    d.in.set(42);
+  =}
 }
diff --git a/test/Cpp/src/target/GenericDelay.lf b/test/Cpp/src/target/GenericDelay.lf
index 5134f8cde6..0c7a63b8ab 100644
--- a/test/Cpp/src/target/GenericDelay.lf
+++ b/test/Cpp/src/target/GenericDelay.lf
@@ -7,9 +7,13 @@ reactor Delay<T>(delay: time = 0) {
   input in: T
   logical action a(delay): T
 
-  reaction(a) -> out {= out.set(a.get()); =}
+  reaction(a) -> out {=
+    out.set(a.get());
+  =}
 
-  reaction(in) -> a {= a.schedule(in.get()); =}
+  reaction(in) -> a {=
+    a.schedule(in.get());
+  =}
 }
 
 main reactor {
@@ -17,5 +21,7 @@ main reactor {
   test = new Test()
   d.out -> test.in
 
-  reaction(startup) -> d.in {= d.in.set(42); =}
+  reaction(startup) -> d.in {=
+    d.in.set(42);
+  =}
 }
diff --git a/test/Cpp/src/target/MultipleContainedGeneric.lf b/test/Cpp/src/target/MultipleContainedGeneric.lf
index da4e28081c..8a7ad42cd3 100644
--- a/test/Cpp/src/target/MultipleContainedGeneric.lf
+++ b/test/Cpp/src/target/MultipleContainedGeneric.lf
@@ -6,7 +6,9 @@ reactor Contained<T> {
   input in1: T
   input in2: T
 
-  reaction(startup) -> trigger {= trigger.set(42); =}
+  reaction(startup) -> trigger {=
+    trigger.set(42);
+  =}
 
   reaction(in1) {=
     std::cout << "in1 received " << *in1.get() << '\n';
diff --git a/test/Cpp/src/target/PointerParameters.lf b/test/Cpp/src/target/PointerParameters.lf
index 007fb1a816..fcd7454d52 100644
--- a/test/Cpp/src/target/PointerParameters.lf
+++ b/test/Cpp/src/target/PointerParameters.lf
@@ -12,7 +12,9 @@ reactor Foo(ptr: int* = {= nullptr =}) {
 }
 
 main reactor {
-  private preamble {= int a{42}; =}
+  private preamble {=
+    int a{42};
+  =}
 
   foo = new Foo(ptr = {= &a =})
 }
diff --git a/test/Python/src/ActionDelay.lf b/test/Python/src/ActionDelay.lf
index 0c063f6f1d..93d8ceea81 100644
--- a/test/Python/src/ActionDelay.lf
+++ b/test/Python/src/ActionDelay.lf
@@ -12,13 +12,17 @@ reactor GeneratedDelay {
     act.schedule(MSEC(0))
   =}
 
-  reaction(act) -> y_out {= y_out.set(self.y_state) =}
+  reaction(act) -> y_out {=
+    y_out.set(self.y_state)
+  =}
 }
 
 reactor Source {
   output out
 
-  reaction(startup) -> out {= out.set(1) =}
+  reaction(startup) -> out {=
+    out.set(1)
+  =}
 }
 
 reactor Sink {
diff --git a/test/Python/src/ActionWithNoReaction.lf b/test/Python/src/ActionWithNoReaction.lf
index 5e9456356d..d4ebf49fa7 100644
--- a/test/Python/src/ActionWithNoReaction.lf
+++ b/test/Python/src/ActionWithNoReaction.lf
@@ -33,5 +33,7 @@ main reactor {
   timer t(0, 1 sec)
   f.y -> p.x after 10 msec
 
-  reaction(t) -> f.x {= f.x.set(42) =}
+  reaction(t) -> f.x {=
+    f.x.set(42)
+  =}
 }
diff --git a/test/Python/src/After.lf b/test/Python/src/After.lf
index 765f9ef990..3fba861dbf 100644
--- a/test/Python/src/After.lf
+++ b/test/Python/src/After.lf
@@ -8,7 +8,9 @@ reactor foo {
   input x
   output y
 
-  reaction(x) -> y {= y.set(2*x.value) =}
+  reaction(x) -> y {=
+    y.set(2*x.value)
+  =}
 }
 
 reactor print {
@@ -45,5 +47,7 @@ main reactor {
   timer t(0, 1 sec)
   f.y -> p.x after 10 msec
 
-  reaction(t) -> f.x {= f.x.set(42) =}
+  reaction(t) -> f.x {=
+    f.x.set(42)
+  =}
 }
diff --git a/test/Python/src/AfterCycles.lf b/test/Python/src/AfterCycles.lf
index 4aa2ed0d39..8e1c72032d 100644
--- a/test/Python/src/AfterCycles.lf
+++ b/test/Python/src/AfterCycles.lf
@@ -5,14 +5,18 @@ target Python
 reactor Source {
   output out
 
-  reaction(startup) -> out {= out.set(1) =}
+  reaction(startup) -> out {=
+    out.set(1)
+  =}
 }
 
 reactor Work {
   input _in
   output out
 
-  reaction(_in) -> out {= out.set(_in.value) =}
+  reaction(_in) -> out {=
+    out.set(_in.value)
+  =}
 }
 
 main reactor AfterCycles {
diff --git a/test/Python/src/CompareTags.lf b/test/Python/src/CompareTags.lf
index 38366d2742..2283b68722 100644
--- a/test/Python/src/CompareTags.lf
+++ b/test/Python/src/CompareTags.lf
@@ -5,7 +5,9 @@ target Python {
 }
 
 main reactor CompareTags {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   timer t(0, 1 msec)
   logical action l
 
diff --git a/test/Python/src/CompositionGain.lf b/test/Python/src/CompositionGain.lf
index 067d662bdf..540cffc258 100644
--- a/test/Python/src/CompositionGain.lf
+++ b/test/Python/src/CompositionGain.lf
@@ -22,7 +22,9 @@ reactor Wrapper {
 main reactor {
   wrapper = new Wrapper()
 
-  reaction(startup) -> wrapper.x {= wrapper_x.set(42) =}
+  reaction(startup) -> wrapper.x {=
+    wrapper_x.set(42)
+  =}
 
   reaction(wrapper.y) {=
     print("Received " + str(wrapper_y.value))
diff --git a/test/Python/src/DanglingOutput.lf b/test/Python/src/DanglingOutput.lf
index f6fe938765..97011c7f90 100644
--- a/test/Python/src/DanglingOutput.lf
+++ b/test/Python/src/DanglingOutput.lf
@@ -6,7 +6,9 @@ reactor Source {
   output out
   timer t
 
-  reaction(t) -> out {= out.set(1); =}
+  reaction(t) -> out {=
+    out.set(1);
+  =}
 }
 
 reactor Gain {
diff --git a/test/Python/src/Deadline.lf b/test/Python/src/Deadline.lf
index 7dfde79a35..7e1772e622 100644
--- a/test/Python/src/Deadline.lf
+++ b/test/Python/src/Deadline.lf
@@ -4,7 +4,9 @@ target Python {
   timeout: 6 sec
 }
 
-preamble {= import time =}
+preamble {=
+  import time
+=}
 
 reactor Source(period = 3 sec) {
   output y
diff --git a/test/Python/src/DeadlineHandledAbove.lf b/test/Python/src/DeadlineHandledAbove.lf
index 80a5f847f6..08f97eb25c 100644
--- a/test/Python/src/DeadlineHandledAbove.lf
+++ b/test/Python/src/DeadlineHandledAbove.lf
@@ -2,7 +2,9 @@
 # output.
 target Python
 
-preamble {= import time =}
+preamble {=
+  import time
+=}
 
 reactor Deadline(threshold = 100 msec) {
   input x
diff --git a/test/Python/src/DelayArray.lf b/test/Python/src/DelayArray.lf
index aa7e66cb6e..a4adeb717b 100644
--- a/test/Python/src/DelayArray.lf
+++ b/test/Python/src/DelayArray.lf
@@ -12,7 +12,9 @@ reactor DelayPointer(delay = 100 msec) {
     a.schedule(self.delay, _in.value);
   =}
 
-  reaction(a) -> out {= out.set(a.value); =}
+  reaction(a) -> out {=
+    out.set(a.value);
+  =}
 }
 
 reactor Source {
diff --git a/test/Python/src/DelayInt.lf b/test/Python/src/DelayInt.lf
index 0432a5c18a..c58e2eef6f 100644
--- a/test/Python/src/DelayInt.lf
+++ b/test/Python/src/DelayInt.lf
@@ -11,7 +11,9 @@ reactor Delay(delay = 100 msec) {
       out.set(a.value)
   =}
 
-  reaction(_in) -> a {= a.schedule(self.delay, _in.value) =}
+  reaction(_in) -> a {=
+    a.schedule(self.delay, _in.value)
+  =}
 }
 
 reactor Test {
@@ -52,5 +54,7 @@ main reactor DelayInt {
   t = new Test()
   d.out -> t._in
 
-  reaction(startup) -> d._in {= d._in.set(42) =}
+  reaction(startup) -> d._in {=
+    d._in.set(42)
+  =}
 }
diff --git a/test/Python/src/DelayString.lf b/test/Python/src/DelayString.lf
index 1faf80e31f..0873220fcf 100644
--- a/test/Python/src/DelayString.lf
+++ b/test/Python/src/DelayString.lf
@@ -6,9 +6,13 @@ reactor DelayString2(delay = 100 msec) {
   output out
   logical action a
 
-  reaction(a) -> out {= out.set(a.value) =}
+  reaction(a) -> out {=
+    out.set(a.value)
+  =}
 
-  reaction(_in) -> a {= a.schedule(self.delay, _in.value) =}
+  reaction(_in) -> a {=
+    a.schedule(self.delay, _in.value)
+  =}
 }
 
 reactor Test {
@@ -34,5 +38,7 @@ main reactor {
   t = new Test()
   d.out -> t._in
 
-  reaction(startup) -> d._in {= d._in.set("Hello") =}
+  reaction(startup) -> d._in {=
+    d._in.set("Hello")
+  =}
 }
diff --git a/test/Python/src/DelayStruct.lf b/test/Python/src/DelayStruct.lf
index dcf1a8be7c..7a3ae51ba8 100644
--- a/test/Python/src/DelayStruct.lf
+++ b/test/Python/src/DelayStruct.lf
@@ -3,14 +3,18 @@ target Python {
   files: ["include/hello.py"]
 }
 
-preamble {= import hello =}
+preamble {=
+  import hello
+=}
 
 reactor DelayPointer(delay = 100 msec) {
   input _in
   output out
   logical action a
 
-  reaction(a) -> out {= out.set(a.value); =}
+  reaction(a) -> out {=
+    out.set(a.value);
+  =}
 
   reaction(_in) -> a {=
     # Schedule the actual token from the input rather than
@@ -22,7 +26,9 @@ reactor DelayPointer(delay = 100 msec) {
 reactor Source {
   output out
 
-  reaction(startup) -> out {= out.set(hello.hello("Earth", 42)) =}
+  reaction(startup) -> out {=
+    out.set(hello.hello("Earth", 42))
+  =}
 }
 
 # expected parameter is for testing.
diff --git a/test/Python/src/DelayStructWithAfter.lf b/test/Python/src/DelayStructWithAfter.lf
index c6f27a0775..feb2c471f2 100644
--- a/test/Python/src/DelayStructWithAfter.lf
+++ b/test/Python/src/DelayStructWithAfter.lf
@@ -3,12 +3,16 @@ target Python {
   files: include/hello.py
 }
 
-preamble {= import hello =}
+preamble {=
+  import hello
+=}
 
 reactor Source {
   output out
 
-  reaction(startup) -> out {= out.set(hello.hello("Earth", 42)) =}
+  reaction(startup) -> out {=
+    out.set(hello.hello("Earth", 42))
+  =}
 }
 
 # expected parameter is for testing.
diff --git a/test/Python/src/DelayStructWithAfterOverlapped.lf b/test/Python/src/DelayStructWithAfterOverlapped.lf
index 73fd60c504..e11572dbc6 100644
--- a/test/Python/src/DelayStructWithAfterOverlapped.lf
+++ b/test/Python/src/DelayStructWithAfterOverlapped.lf
@@ -5,7 +5,9 @@ target Python {
   files: ["include/hello.py"]
 }
 
-preamble {= import hello =}
+preamble {=
+  import hello
+=}
 
 reactor Source {
   output out
diff --git a/test/Python/src/DelayedAction.lf b/test/Python/src/DelayedAction.lf
index 1a461eccff..d95ceb6a99 100644
--- a/test/Python/src/DelayedAction.lf
+++ b/test/Python/src/DelayedAction.lf
@@ -8,7 +8,9 @@ main reactor DelayedAction {
   logical action a
   state count = 0
 
-  reaction(t) -> a {= a.schedule(MSEC(100)) =}
+  reaction(t) -> a {=
+    a.schedule(MSEC(100))
+  =}
 
   reaction(a) {=
     elapsed = lf.time.logical_elapsed()
diff --git a/test/Python/src/DelayedReaction.lf b/test/Python/src/DelayedReaction.lf
index 2ebde05b5a..d4af80394c 100644
--- a/test/Python/src/DelayedReaction.lf
+++ b/test/Python/src/DelayedReaction.lf
@@ -5,7 +5,9 @@ reactor Source {
   output out
   timer t
 
-  reaction(t) -> out {= out.set(1) =}
+  reaction(t) -> out {=
+    out.set(1)
+  =}
 }
 
 reactor Sink {
diff --git a/test/Python/src/Determinism.lf b/test/Python/src/Determinism.lf
index f200c141f5..17b0f3922d 100644
--- a/test/Python/src/Determinism.lf
+++ b/test/Python/src/Determinism.lf
@@ -4,7 +4,9 @@ reactor Source {
   output y
   timer t
 
-  reaction(t) -> y {= y.set(1) =}
+  reaction(t) -> y {=
+    y.set(1)
+  =}
 }
 
 reactor Destination {
@@ -28,7 +30,9 @@ reactor Pass {
   input x
   output y
 
-  reaction(x) -> y {= y.set(x.value) =}
+  reaction(x) -> y {=
+    y.set(x.value)
+  =}
 }
 
 main reactor Determinism {
diff --git a/test/Python/src/Gain.lf b/test/Python/src/Gain.lf
index 34e9229748..baab5d1cb1 100644
--- a/test/Python/src/Gain.lf
+++ b/test/Python/src/Gain.lf
@@ -5,7 +5,9 @@ reactor Scale(scale=2) {
   input x
   output y
 
-  reaction(x) -> y {= y.set(x.value * self.scale) =}
+  reaction(x) -> y {=
+    y.set(x.value * self.scale)
+  =}
 }
 
 reactor Test {
@@ -33,5 +35,7 @@ main reactor Gain {
   d = new Test()
   g.y -> d.x
 
-  reaction(startup) -> g.x {= g.x.set(1) =}
+  reaction(startup) -> g.x {=
+    g.x.set(1)
+  =}
 }
diff --git a/test/Python/src/GetMicroStep.lf b/test/Python/src/GetMicroStep.lf
index b137b8cd94..c82c3f6399 100644
--- a/test/Python/src/GetMicroStep.lf
+++ b/test/Python/src/GetMicroStep.lf
@@ -4,12 +4,16 @@ target Python {
 }
 
 main reactor GetMicroStep {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   state s = 1
 
   logical action l  # timer t(0, 1 msec);
 
-  reaction(startup) -> l {= l.schedule(0); =}
+  reaction(startup) -> l {=
+    l.schedule(0);
+  =}
 
   reaction(l) -> l {=
     microstep = lf.tag().microstep
diff --git a/test/Python/src/Hierarchy.lf b/test/Python/src/Hierarchy.lf
index 4d92568592..4686842131 100644
--- a/test/Python/src/Hierarchy.lf
+++ b/test/Python/src/Hierarchy.lf
@@ -5,7 +5,9 @@ reactor Source {
   output out
   timer t
 
-  reaction(t) -> out {= out.set(1) =}
+  reaction(t) -> out {=
+    out.set(1)
+  =}
 }
 
 reactor Gain {
diff --git a/test/Python/src/Hierarchy2.lf b/test/Python/src/Hierarchy2.lf
index 2172396617..49ed0d54dd 100644
--- a/test/Python/src/Hierarchy2.lf
+++ b/test/Python/src/Hierarchy2.lf
@@ -8,7 +8,9 @@ reactor Source {
   output out
   timer t(0, 1 sec)
 
-  reaction(t) -> out {= out.set(1) =}
+  reaction(t) -> out {=
+    out.set(1)
+  =}
 }
 
 reactor Count {
diff --git a/test/Python/src/Import.lf b/test/Python/src/Import.lf
index fc225f1cb0..990453efa5 100644
--- a/test/Python/src/Import.lf
+++ b/test/Python/src/Import.lf
@@ -7,5 +7,7 @@ main reactor Import {
   timer t
   a = new Imported()
 
-  reaction(t) -> a.x {= a.x.set(42) =}
+  reaction(t) -> a.x {=
+    a.x.set(42)
+  =}
 }
diff --git a/test/Python/src/ImportComposition.lf b/test/Python/src/ImportComposition.lf
index cbdeeb5c6c..15149283e8 100644
--- a/test/Python/src/ImportComposition.lf
+++ b/test/Python/src/ImportComposition.lf
@@ -7,7 +7,9 @@ main reactor ImportComposition {
   a = new ImportedComposition()
   state received = False
 
-  reaction(startup) -> a.x {= a.x.set(42) =}
+  reaction(startup) -> a.x {=
+    a.x.set(42)
+  =}
 
   reaction(a.y) {=
     receive_time = lf.time.logical_elapsed()
diff --git a/test/Python/src/ImportRenamed.lf b/test/Python/src/ImportRenamed.lf
index 0d7433028f..d032dd8fcb 100644
--- a/test/Python/src/ImportRenamed.lf
+++ b/test/Python/src/ImportRenamed.lf
@@ -11,5 +11,7 @@ main reactor {
   b = new Y()
   c = new Z()
 
-  reaction(t) -> a.x {= a.x.set(42) =}
+  reaction(t) -> a.x {=
+    a.x.set(42)
+  =}
 }
diff --git a/test/Python/src/ManualDelayedReaction.lf b/test/Python/src/ManualDelayedReaction.lf
index a9863589ff..79d3398a08 100644
--- a/test/Python/src/ManualDelayedReaction.lf
+++ b/test/Python/src/ManualDelayedReaction.lf
@@ -18,14 +18,19 @@ reactor GeneratedDelay {
     act.schedule(MSEC(100))
   =}
 
-  reaction(act) -> y_out {= y_out.set(self.y_state) =}
+  reaction(act) -> y_out {=
+    y_out.set(self.y_state)
+  =}
 }
 
 reactor Source {
   output out
   timer t
 
-  reaction(t) -> out {= out.set(1) =}  # reaction(t) -> out after 100 msec
+  # reaction(t) -> out after 100 msec
+  reaction(t) -> out {=
+    out.set(1)
+  =}
 }
 
 reactor Sink {
diff --git a/test/Python/src/Methods.lf b/test/Python/src/Methods.lf
index ad158e72b3..3d678b7ed1 100644
--- a/test/Python/src/Methods.lf
+++ b/test/Python/src/Methods.lf
@@ -4,9 +4,13 @@ target Python
 main reactor {
   state foo = 2
 
-  method getFoo() {= return self.foo =}
+  method getFoo() {=
+    return self.foo
+  =}
 
-  method add(x) {= self.foo += x =}
+  method add(x) {=
+    self.foo += x
+  =}
 
   reaction(startup) {=
     print(f"Foo is initialized to {self.getFoo()}")
diff --git a/test/Python/src/MethodsRecursive.lf b/test/Python/src/MethodsRecursive.lf
index cc6a9ccb85..59686a522c 100644
--- a/test/Python/src/MethodsRecursive.lf
+++ b/test/Python/src/MethodsRecursive.lf
@@ -11,7 +11,9 @@ main reactor {
     return self.add(self.fib(n-1), self.fib(n-2))
   =}
 
-  method add(x, y) {= return x + y =}
+  method add(x, y) {=
+    return x + y
+  =}
 
   reaction(startup) {=
     for n in range(1, 10):
diff --git a/test/Python/src/MethodsSameName.lf b/test/Python/src/MethodsSameName.lf
index e842912e84..c3c0178eac 100644
--- a/test/Python/src/MethodsSameName.lf
+++ b/test/Python/src/MethodsSameName.lf
@@ -4,7 +4,9 @@ target Python
 reactor Foo {
   state foo = 2
 
-  method add(x) {= self.foo += x =}
+  method add(x) {=
+    self.foo += x
+  =}
 
   reaction(startup) {=
     self.add(40)
@@ -20,7 +22,9 @@ main reactor {
 
   a = new Foo()
 
-  method add(x) {= self.foo += x =}
+  method add(x) {=
+    self.foo += x
+  =}
 
   reaction(startup) {=
     self.add(40)
diff --git a/test/Python/src/Microsteps.lf b/test/Python/src/Microsteps.lf
index 871ad321bc..bcb8003cd8 100644
--- a/test/Python/src/Microsteps.lf
+++ b/test/Python/src/Microsteps.lf
@@ -33,5 +33,7 @@ main reactor Microsteps {
     repeat.schedule(0)
   =}
 
-  reaction(repeat) -> d.y {= d.y.set(1) =}
+  reaction(repeat) -> d.y {=
+    d.y.set(1)
+  =}
 }
diff --git a/test/Python/src/Minimal.lf b/test/Python/src/Minimal.lf
index c0f3f9f6fa..3cc2aeaf8f 100644
--- a/test/Python/src/Minimal.lf
+++ b/test/Python/src/Minimal.lf
@@ -2,5 +2,7 @@
 target Python
 
 main reactor Minimal {
-  reaction(startup) {= print("Hello World.") =}
+  reaction(startup) {=
+    print("Hello World.")
+  =}
 }
diff --git a/test/Python/src/MultipleContained.lf b/test/Python/src/MultipleContained.lf
index 8d0afa0a12..c15339e4ae 100644
--- a/test/Python/src/MultipleContained.lf
+++ b/test/Python/src/MultipleContained.lf
@@ -7,7 +7,9 @@ reactor Contained {
   input in1
   input in2
 
-  reaction(startup) -> trigger {= trigger.set(42) =}
+  reaction(startup) -> trigger {=
+    trigger.set(42)
+  =}
 
   reaction(in1) {=
     print("in1 received ", in1.value);
diff --git a/test/Python/src/ParameterizedState.lf b/test/Python/src/ParameterizedState.lf
index 2553cfcfd2..75f1a4fd15 100644
--- a/test/Python/src/ParameterizedState.lf
+++ b/test/Python/src/ParameterizedState.lf
@@ -3,7 +3,9 @@ target Python
 reactor Foo(bar=42) {
   state baz = bar
 
-  reaction(startup) {= print("Baz: ", self.baz) =}
+  reaction(startup) {=
+    print("Baz: ", self.baz)
+  =}
 }
 
 main reactor {
diff --git a/test/Python/src/ReadOutputOfContainedReactor.lf b/test/Python/src/ReadOutputOfContainedReactor.lf
index 0a086c9514..02a70b34f1 100644
--- a/test/Python/src/ReadOutputOfContainedReactor.lf
+++ b/test/Python/src/ReadOutputOfContainedReactor.lf
@@ -4,7 +4,9 @@ target Python
 reactor Contained {
   output out
 
-  reaction(startup) -> out {= out.set(42) =}
+  reaction(startup) -> out {=
+    out.set(42)
+  =}
 }
 
 main reactor ReadOutputOfContainedReactor {
diff --git a/test/Python/src/Schedule.lf b/test/Python/src/Schedule.lf
index 5d42888c2e..3738b63e92 100644
--- a/test/Python/src/Schedule.lf
+++ b/test/Python/src/Schedule.lf
@@ -5,7 +5,9 @@ reactor Schedule2 {
   input x
   logical action a
 
-  reaction(x) -> a {= a.schedule(MSEC(200)) =}
+  reaction(x) -> a {=
+    a.schedule(MSEC(200))
+  =}
 
   reaction(a) {=
     elapsed_time = lf.time.logical_elapsed()
@@ -20,5 +22,7 @@ main reactor {
   a = new Schedule2()
   timer t
 
-  reaction(t) -> a.x {= a.x.set(1) =}
+  reaction(t) -> a.x {=
+    a.x.set(1)
+  =}
 }
diff --git a/test/Python/src/ScheduleLogicalAction.lf b/test/Python/src/ScheduleLogicalAction.lf
index 37eeb8ab6d..31b2151da7 100644
--- a/test/Python/src/ScheduleLogicalAction.lf
+++ b/test/Python/src/ScheduleLogicalAction.lf
@@ -16,7 +16,9 @@ reactor foo {
     a.schedule(MSEC(500))
   =}
 
-  reaction(a) -> y {= y.set(-42) =}
+  reaction(a) -> y {=
+    y.set(-42)
+  =}
 }
 
 reactor print {
@@ -41,5 +43,7 @@ main reactor {
   timer t(0, 1 sec)
   f.y -> p.x
 
-  reaction(t) -> f.x {= f.x.set(42) =}
+  reaction(t) -> f.x {=
+    f.x.set(42)
+  =}
 }
diff --git a/test/Python/src/SelfLoop.lf b/test/Python/src/SelfLoop.lf
index 6362c77373..5d79493ec5 100644
--- a/test/Python/src/SelfLoop.lf
+++ b/test/Python/src/SelfLoop.lf
@@ -23,7 +23,9 @@ reactor Self {
     a.schedule(MSEC(100), x.value)
   =}
 
-  reaction(startup) -> a {= a.schedule(0, 42) =}
+  reaction(startup) -> a {=
+    a.schedule(0, 42)
+  =}
 
   reaction(shutdown) {=
     if self.expected <= 43:
diff --git a/test/Python/src/SendingInside2.lf b/test/Python/src/SendingInside2.lf
index 8ceb1ba5cc..3ddb25102c 100644
--- a/test/Python/src/SendingInside2.lf
+++ b/test/Python/src/SendingInside2.lf
@@ -15,5 +15,7 @@ main reactor SendingInside2 {
   timer t
   p = new Printer()
 
-  reaction(t) -> p.x {= p.x.set(1) =}
+  reaction(t) -> p.x {=
+    p.x.set(1)
+  =}
 }
diff --git a/test/Python/src/SetArray.lf b/test/Python/src/SetArray.lf
index 931260ab9b..73f80cf380 100644
--- a/test/Python/src/SetArray.lf
+++ b/test/Python/src/SetArray.lf
@@ -5,7 +5,9 @@ target Python
 reactor Source {
   output out
 
-  reaction(startup) -> out {= out.set([0,1,2]) =}
+  reaction(startup) -> out {=
+    out.set([0,1,2])
+  =}
 }
 
 # The scale parameter is just for testing.
diff --git a/test/Python/src/SimpleDeadline.lf b/test/Python/src/SimpleDeadline.lf
index 2b6adbf942..c405774390 100644
--- a/test/Python/src/SimpleDeadline.lf
+++ b/test/Python/src/SimpleDeadline.lf
@@ -29,7 +29,9 @@ main reactor SimpleDeadline {
   d = new Deadline(threshold = 10 msec)
   p = new Print()
   d.deadlineViolation -> p._in
-  preamble {= import time =}
+  preamble {=
+    import time
+  =}
 
   reaction(start) -> d.x {=
     self.time.sleep(0.02)
diff --git a/test/Python/src/SlowingClock.lf b/test/Python/src/SlowingClock.lf
index 8298135c62..7d156b9be5 100644
--- a/test/Python/src/SlowingClock.lf
+++ b/test/Python/src/SlowingClock.lf
@@ -13,7 +13,9 @@ main reactor SlowingClock {
   state interval = 100 msec
   state expected_time = 100 msec
 
-  reaction(startup) -> a {= a.schedule(0) =}
+  reaction(startup) -> a {=
+    a.schedule(0)
+  =}
 
   reaction(a) -> a {=
     elapsed_logical_time = lf.time.logical_elapsed()
diff --git a/test/Python/src/StartupOutFromInside.lf b/test/Python/src/StartupOutFromInside.lf
index ce2025278f..c20a48773e 100644
--- a/test/Python/src/StartupOutFromInside.lf
+++ b/test/Python/src/StartupOutFromInside.lf
@@ -3,7 +3,9 @@ target Python
 reactor Bar {
   output out
 
-  reaction(startup) -> out {= out.set(42) =}
+  reaction(startup) -> out {=
+    out.set(42)
+  =}
 }
 
 main reactor StartupOutFromInside {
diff --git a/test/Python/src/StructAsType.lf b/test/Python/src/StructAsType.lf
index e1b089df5b..e20c3e4f8e 100644
--- a/test/Python/src/StructAsType.lf
+++ b/test/Python/src/StructAsType.lf
@@ -2,7 +2,9 @@ target Python {
   files: include/hello.py
 }
 
-preamble {= import hello =}
+preamble {=
+  import hello
+=}
 
 reactor Source {
   output out
diff --git a/test/Python/src/StructAsTypeDirect.lf b/test/Python/src/StructAsTypeDirect.lf
index 132ef78948..c60241c914 100644
--- a/test/Python/src/StructAsTypeDirect.lf
+++ b/test/Python/src/StructAsTypeDirect.lf
@@ -2,7 +2,9 @@ target Python {
   files: include/hello.py
 }
 
-preamble {= import hello =}
+preamble {=
+  import hello
+=}
 
 reactor Source {
   output out
diff --git a/test/Python/src/StructParallel.lf b/test/Python/src/StructParallel.lf
index 4e2024d99e..46514a2154 100644
--- a/test/Python/src/StructParallel.lf
+++ b/test/Python/src/StructParallel.lf
@@ -6,7 +6,9 @@ target Python {
 
 import Source from "StructScale.lf"
 
-preamble {= import hello =}
+preamble {=
+  import hello
+=}
 
 reactor Check(expected=42) {
   input _in
diff --git a/test/Python/src/StructPrint.lf b/test/Python/src/StructPrint.lf
index 968a3e9d27..ebd6c82122 100644
--- a/test/Python/src/StructPrint.lf
+++ b/test/Python/src/StructPrint.lf
@@ -4,12 +4,16 @@ target Python {
   files: ["include/hello.py"]
 }
 
-preamble {= import hello =}
+preamble {=
+  import hello
+=}
 
 reactor Print {
   output out
 
-  reaction(startup) -> out {= out.set(hello.hello("Earth", 42)) =}
+  reaction(startup) -> out {=
+    out.set(hello.hello("Earth", 42))
+  =}
 }
 
 # expected parameter is for testing.
diff --git a/test/Python/src/StructScale.lf b/test/Python/src/StructScale.lf
index f2ec9162d4..d5400e3750 100644
--- a/test/Python/src/StructScale.lf
+++ b/test/Python/src/StructScale.lf
@@ -4,12 +4,16 @@ target Python {
   files: ["include/hello.py"]
 }
 
-preamble {= import hello =}
+preamble {=
+  import hello
+=}
 
 reactor Source {
   output out
 
-  reaction(startup) -> out {= out.set(hello.hello("Earth", 42)) =}
+  reaction(startup) -> out {=
+    out.set(hello.hello("Earth", 42))
+  =}
 }
 
 # expected parameter is for testing.
diff --git a/test/Python/src/TestForPreviousOutput.lf b/test/Python/src/TestForPreviousOutput.lf
index 7f10c13482..eaa0593a58 100644
--- a/test/Python/src/TestForPreviousOutput.lf
+++ b/test/Python/src/TestForPreviousOutput.lf
@@ -4,7 +4,9 @@ target Python
 
 reactor Source {
   output out
-  preamble {= import random =}
+  preamble {=
+    import random
+  =}
 
   reaction(startup) -> out {=
     # Set a seed for random number generation based on the current time.
diff --git a/test/Python/src/TimeLimit.lf b/test/Python/src/TimeLimit.lf
index 64c5fa6a71..4f3f1b0306 100644
--- a/test/Python/src/TimeLimit.lf
+++ b/test/Python/src/TimeLimit.lf
@@ -42,5 +42,7 @@ main reactor TimeLimit(period = 1 sec) {
   d = new Destination()
   c.y -> d.x
 
-  reaction(stop) {= request_stop() =}
+  reaction(stop) {=
+    request_stop()
+  =}
 }
diff --git a/test/Python/src/TimeState.lf b/test/Python/src/TimeState.lf
index ab6d435633..86e9946f17 100644
--- a/test/Python/src/TimeState.lf
+++ b/test/Python/src/TimeState.lf
@@ -3,7 +3,9 @@ target Python
 reactor Foo(bar=42) {
   state baz = 500 msec
 
-  reaction(startup) {= print("Baz: ", self.baz) =}
+  reaction(startup) {=
+    print("Baz: ", self.baz)
+  =}
 }
 
 main reactor {
diff --git a/test/Python/src/Timers.lf b/test/Python/src/Timers.lf
index 88a10bb367..1ba75599ab 100644
--- a/test/Python/src/Timers.lf
+++ b/test/Python/src/Timers.lf
@@ -8,9 +8,13 @@ main reactor {
   timer t2(0, 2 sec)
   state counter = 0
 
-  reaction(t2) {= self.counter += 2 =}
+  reaction(t2) {=
+    self.counter += 2
+  =}
 
-  reaction(t) {= self.counter -= 1 =}
+  reaction(t) {=
+    self.counter -= 1
+  =}
 
   reaction(shutdown) {=
     if self.counter != 1:
diff --git a/test/Python/src/TriggerDownstreamOnlyIfPresent2.lf b/test/Python/src/TriggerDownstreamOnlyIfPresent2.lf
index 4bcba7d298..2fddd52aa2 100644
--- a/test/Python/src/TriggerDownstreamOnlyIfPresent2.lf
+++ b/test/Python/src/TriggerDownstreamOnlyIfPresent2.lf
@@ -27,7 +27,9 @@ reactor Destination {
       exit(1)
   =}
 
-  reaction(shutdown) {= print("SUCCESS.") =}
+  reaction(shutdown) {=
+    print("SUCCESS.")
+  =}
 }
 
 main reactor TriggerDownstreamOnlyIfPresent2 {
diff --git a/test/Python/src/Wcet.lf b/test/Python/src/Wcet.lf
index d1a3e41e18..4d6637ce13 100644
--- a/test/Python/src/Wcet.lf
+++ b/test/Python/src/Wcet.lf
@@ -30,7 +30,9 @@ reactor Work {
 reactor Print {
   input p_in
 
-  reaction(p_in) {= print("Received: ", p_in.value) =}
+  reaction(p_in) {=
+    print("Received: ", p_in.value)
+  =}
 }
 
 main reactor Wcet {
diff --git a/test/Python/src/docker/FilesPropertyContainerized.lf b/test/Python/src/docker/FilesPropertyContainerized.lf
index afbf76f8a8..139f1b682a 100644
--- a/test/Python/src/docker/FilesPropertyContainerized.lf
+++ b/test/Python/src/docker/FilesPropertyContainerized.lf
@@ -20,7 +20,9 @@ main reactor {
   state passed = False
   timer t(1 msec)
 
-  reaction(t) {= self.passed = True =}
+  reaction(t) {=
+    self.passed = True
+  =}
 
   reaction(shutdown) {=
     if not self.passed:
diff --git a/test/Python/src/federated/BroadcastFeedback.lf b/test/Python/src/federated/BroadcastFeedback.lf
index facc896800..dc5c88ccf6 100644
--- a/test/Python/src/federated/BroadcastFeedback.lf
+++ b/test/Python/src/federated/BroadcastFeedback.lf
@@ -8,7 +8,9 @@ reactor SenderAndReceiver {
   input[2] inp
   state received = False
 
-  reaction(startup) -> out {= out.set(42) =}
+  reaction(startup) -> out {=
+    out.set(42)
+  =}
 
   reaction(inp) {=
     if inp[0].is_present and inp[1].is_present and inp[0].value == 42 and inp[1].value == 42:
diff --git a/test/Python/src/federated/BroadcastFeedbackWithHierarchy.lf b/test/Python/src/federated/BroadcastFeedbackWithHierarchy.lf
index c0cc71ab5b..8c6339170a 100644
--- a/test/Python/src/federated/BroadcastFeedbackWithHierarchy.lf
+++ b/test/Python/src/federated/BroadcastFeedbackWithHierarchy.lf
@@ -11,11 +11,15 @@ reactor SenderAndReceiver {
   r = new Receiver()
   in_ -> r.in_
 
-  reaction(startup) -> out {= out.set(42) =}
+  reaction(startup) -> out {=
+    out.set(42)
+  =}
 }
 
 reactor Receiver {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   input[2] in_
   state received = False
 
diff --git a/test/Python/src/federated/CycleDetection.lf b/test/Python/src/federated/CycleDetection.lf
index c4eaac6904..cf6dd7f661 100644
--- a/test/Python/src/federated/CycleDetection.lf
+++ b/test/Python/src/federated/CycleDetection.lf
@@ -21,15 +21,21 @@ reactor CAReplica {
       self.balance += remote_update.value
   =}
 
-  reaction(query) -> response {= response.set(self.balance) =}
+  reaction(query) -> response {=
+    response.set(self.balance)
+  =}
 }
 
 reactor UserInput {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   input balance
   output deposit
 
-  reaction(startup) -> deposit {= deposit.set(100) =}
+  reaction(startup) -> deposit {=
+    deposit.set(100)
+  =}
 
   reaction(balance) {=
     if balance.value != 200:
@@ -39,7 +45,9 @@ reactor UserInput {
     request_stop()
   =}
 
-  reaction(shutdown) {= print("Test passed!") =}
+  reaction(shutdown) {=
+    print("Test passed!")
+  =}
 }
 
 federated reactor {
diff --git a/test/Python/src/federated/DecentralizedP2PComm.lf b/test/Python/src/federated/DecentralizedP2PComm.lf
index 5bc2cc61a2..b3804c23b4 100644
--- a/test/Python/src/federated/DecentralizedP2PComm.lf
+++ b/test/Python/src/federated/DecentralizedP2PComm.lf
@@ -6,7 +6,9 @@ target Python {
 }
 
 reactor Platform(start=0, expected_start=0, stp_offset_param=0) {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   input in_
   output out
   timer t(0, 100 msec)
diff --git a/test/Python/src/federated/DecentralizedP2PUnbalancedTimeout.lf b/test/Python/src/federated/DecentralizedP2PUnbalancedTimeout.lf
index 9b4883e730..088c71c086 100644
--- a/test/Python/src/federated/DecentralizedP2PUnbalancedTimeout.lf
+++ b/test/Python/src/federated/DecentralizedP2PUnbalancedTimeout.lf
@@ -22,16 +22,22 @@ reactor Clock(offset=0, period = 1 sec) {
     y.set(self.count)
   =}
 
-  reaction(shutdown) {= print("SUCCESS: the source exited successfully.") =}
+  reaction(shutdown) {=
+    print("SUCCESS: the source exited successfully.")
+  =}
 }
 
 reactor Destination {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   input x
   state s = 1
   state startup_logical_time
 
-  reaction(startup) {= self.startup_logical_time = lf.time.logical() =}
+  reaction(startup) {=
+    self.startup_logical_time = lf.time.logical()
+  =}
 
   reaction(x) {=
     print("Received {}".format(x.value))
diff --git a/test/Python/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf b/test/Python/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf
index a47d362140..86c2dffdd4 100644
--- a/test/Python/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf
+++ b/test/Python/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.lf
@@ -21,11 +21,15 @@ reactor Clock(offset=0, period = 1 sec) {
     y.set(self.count)
   =}
 
-  reaction(shutdown) {= print("SUCCESS: the source exited successfully.") =}
+  reaction(shutdown) {=
+    print("SUCCESS: the source exited successfully.")
+  =}
 }
 
 reactor Destination {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   input x
   state s = 1
 
diff --git a/test/Python/src/federated/DistributedBank.lf b/test/Python/src/federated/DistributedBank.lf
index 9fb4720d59..3dfd8d7c32 100644
--- a/test/Python/src/federated/DistributedBank.lf
+++ b/test/Python/src/federated/DistributedBank.lf
@@ -5,7 +5,9 @@ target Python {
 }
 
 reactor Node {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   timer t(0, 100 msec)
   state count = 0
 
diff --git a/test/Python/src/federated/DistributedBankToMultiport.lf b/test/Python/src/federated/DistributedBankToMultiport.lf
index 1171c1b1b4..9f65f2f065 100644
--- a/test/Python/src/federated/DistributedBankToMultiport.lf
+++ b/test/Python/src/federated/DistributedBankToMultiport.lf
@@ -6,7 +6,9 @@ target Python {
 import Count from "../lib/Count.lf"
 
 reactor Destination {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   input[2] in_
   state count = 1
 
diff --git a/test/Python/src/federated/DistributedCount.lf b/test/Python/src/federated/DistributedCount.lf
index 6b08b7e7fe..7a9bedf97c 100644
--- a/test/Python/src/federated/DistributedCount.lf
+++ b/test/Python/src/federated/DistributedCount.lf
@@ -12,7 +12,9 @@ target Python {
 import Count from "../lib/Count.lf"
 
 reactor Print {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   input in_
   state c = 1
 
diff --git a/test/Python/src/federated/DistributedCountDecentralized.lf b/test/Python/src/federated/DistributedCountDecentralized.lf
index 62f2921282..7c95336e1c 100644
--- a/test/Python/src/federated/DistributedCountDecentralized.lf
+++ b/test/Python/src/federated/DistributedCountDecentralized.lf
@@ -13,7 +13,9 @@ target Python {
 import Count from "../lib/Count.lf"
 
 reactor Print {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   input in_
   state c = 1
 
diff --git a/test/Python/src/federated/DistributedCountDecentralizedLate.lf b/test/Python/src/federated/DistributedCountDecentralizedLate.lf
index fe52eec1b7..c03c38600f 100644
--- a/test/Python/src/federated/DistributedCountDecentralizedLate.lf
+++ b/test/Python/src/federated/DistributedCountDecentralizedLate.lf
@@ -13,7 +13,9 @@ target Python {
 import Count from "../lib/Count.lf"
 
 reactor Print {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   input in_             # STP ()
   state success = 0     # STP(in, 30 msec);
   state success_stp_violation = 0
diff --git a/test/Python/src/federated/DistributedCountPhysical.lf b/test/Python/src/federated/DistributedCountPhysical.lf
index a55dcf06dd..acfb512897 100644
--- a/test/Python/src/federated/DistributedCountPhysical.lf
+++ b/test/Python/src/federated/DistributedCountPhysical.lf
@@ -23,7 +23,9 @@ reactor Count {
 }
 
 reactor Print {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   input in_
   state c = 0
 
diff --git a/test/Python/src/federated/DistributedCountPhysicalAfterDelay.lf b/test/Python/src/federated/DistributedCountPhysicalAfterDelay.lf
index f18f5dc997..7c3c17ec35 100644
--- a/test/Python/src/federated/DistributedCountPhysicalAfterDelay.lf
+++ b/test/Python/src/federated/DistributedCountPhysicalAfterDelay.lf
@@ -23,7 +23,9 @@ reactor Count {
 }
 
 reactor Print {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   input in_
   state c = 0
 
diff --git a/test/Python/src/federated/DistributedCountPhysicalDecentralized.lf b/test/Python/src/federated/DistributedCountPhysicalDecentralized.lf
index 71048dfa38..5eafa49e5d 100644
--- a/test/Python/src/federated/DistributedCountPhysicalDecentralized.lf
+++ b/test/Python/src/federated/DistributedCountPhysicalDecentralized.lf
@@ -24,7 +24,9 @@ reactor Count {
 }
 
 reactor Print {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   input in_
   state c = 0
 
diff --git a/test/Python/src/federated/DistributedDoublePort.lf b/test/Python/src/federated/DistributedDoublePort.lf
index 3c09373ad1..a90ec7b40f 100644
--- a/test/Python/src/federated/DistributedDoublePort.lf
+++ b/test/Python/src/federated/DistributedDoublePort.lf
@@ -23,11 +23,15 @@ reactor CountMicrostep {
     self.count += 1
   =}
 
-  reaction(act) -> out {= out.set(act.value) =}
+  reaction(act) -> out {=
+    out.set(act.value)
+  =}
 }
 
 reactor Print {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   input in_
   input in2
 
@@ -39,7 +43,9 @@ reactor Print {
       self.sys.exit(1)
   =}
 
-  reaction(shutdown) {= print("SUCCESS: messages were at least one microstep apart.") =}
+  reaction(shutdown) {=
+    print("SUCCESS: messages were at least one microstep apart.")
+  =}
 }
 
 federated reactor DistributedDoublePort {
diff --git a/test/Python/src/federated/DistributedLoopedAction.lf b/test/Python/src/federated/DistributedLoopedAction.lf
index 81394d62d0..37551a36d8 100644
--- a/test/Python/src/federated/DistributedLoopedAction.lf
+++ b/test/Python/src/federated/DistributedLoopedAction.lf
@@ -10,7 +10,9 @@ target Python {
 import Sender from "../lib/LoopedActionSender.lf"
 
 reactor Receiver(take_a_break_after=10, break_interval = 400 msec) {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   input in_
   state received_messages = 0
   state total_received_messages = 0
diff --git a/test/Python/src/federated/DistributedLoopedPhysicalAction.lf b/test/Python/src/federated/DistributedLoopedPhysicalAction.lf
index fa88bb3700..79a3be24ec 100644
--- a/test/Python/src/federated/DistributedLoopedPhysicalAction.lf
+++ b/test/Python/src/federated/DistributedLoopedPhysicalAction.lf
@@ -32,7 +32,9 @@ reactor Sender(take_a_break_after=10, break_interval = 550 msec) {
 }
 
 reactor Receiver(take_a_break_after=10, break_interval = 550 msec) {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   input in_
   state received_messages = 0
   state total_received_messages = 0
@@ -42,7 +44,9 @@ reactor Receiver(take_a_break_after=10, break_interval = 550 msec) {
   # but forces the logical time to advance Comment this line for a more sensible log output.
   state base_logical_time
 
-  reaction(startup) {= self.base_logical_time = lf.time.logical() =}
+  reaction(startup) {=
+    self.base_logical_time = lf.time.logical()
+  =}
 
   reaction(in_) {=
     current_tag = lf.tag()
diff --git a/test/Python/src/federated/DistributedMultiport.lf b/test/Python/src/federated/DistributedMultiport.lf
index 6c67e0e90f..952021df01 100644
--- a/test/Python/src/federated/DistributedMultiport.lf
+++ b/test/Python/src/federated/DistributedMultiport.lf
@@ -17,7 +17,9 @@ reactor Source {
 }
 
 reactor Destination {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   input[4] in_
   state count = 0
 
diff --git a/test/Python/src/federated/DistributedMultiportToBank.lf b/test/Python/src/federated/DistributedMultiportToBank.lf
index c94e4ec49b..93e1daf076 100644
--- a/test/Python/src/federated/DistributedMultiportToBank.lf
+++ b/test/Python/src/federated/DistributedMultiportToBank.lf
@@ -16,7 +16,9 @@ reactor Source {
 }
 
 reactor Destination {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   input in_
   state count = 0
 
diff --git a/test/Python/src/federated/DistributedNoReact.lf b/test/Python/src/federated/DistributedNoReact.lf
index e28f5ae253..afbcd3aeed 100644
--- a/test/Python/src/federated/DistributedNoReact.lf
+++ b/test/Python/src/federated/DistributedNoReact.lf
@@ -15,7 +15,9 @@ reactor A {
 reactor B {
   output o
 
-  reaction(startup) -> o {= o.set(C()) =}
+  reaction(startup) -> o {=
+    o.set(C())
+  =}
 }
 
 federated reactor {
diff --git a/test/Python/src/federated/DistributedSendClass.lf b/test/Python/src/federated/DistributedSendClass.lf
index 9f77259b37..6cdb4e013d 100644
--- a/test/Python/src/federated/DistributedSendClass.lf
+++ b/test/Python/src/federated/DistributedSendClass.lf
@@ -9,13 +9,17 @@ preamble {=
 reactor A {
   input o
 
-  reaction(o) {= request_stop() =}
+  reaction(o) {=
+    request_stop()
+  =}
 }
 
 reactor B {
   output o
 
-  reaction(startup) -> o {= o.set(C()) =}
+  reaction(startup) -> o {=
+    o.set(C())
+  =}
 }
 
 federated reactor {
diff --git a/test/Python/src/federated/DistributedStop.lf b/test/Python/src/federated/DistributedStop.lf
index 0171a2bbfb..6aea789049 100644
--- a/test/Python/src/federated/DistributedStop.lf
+++ b/test/Python/src/federated/DistributedStop.lf
@@ -5,7 +5,9 @@
  */
 target Python
 
-preamble {= import sys =}
+preamble {=
+  import sys
+=}
 
 reactor Sender {
   output out
diff --git a/test/Python/src/federated/DistributedStopZero.lf b/test/Python/src/federated/DistributedStopZero.lf
index 845f099698..ad4820eb03 100644
--- a/test/Python/src/federated/DistributedStopZero.lf
+++ b/test/Python/src/federated/DistributedStopZero.lf
@@ -6,14 +6,18 @@
 # reason for failing: lf_tag().microstep and lf.tag_compare() are not not supported in python target
 target Python
 
-preamble {= import sys =}
+preamble {=
+  import sys
+=}
 
 reactor Sender {
   output out
   timer t(0, 1 usec)
   state startup_logical_time
 
-  reaction(startup) {= self.startup_logical_time = lf.time.logical() =}
+  reaction(startup) {=
+    self.startup_logical_time = lf.time.logical()
+  =}
 
   reaction(t) -> out {=
     tag = lf.tag()
@@ -47,7 +51,9 @@ reactor Receiver {
   input in_
   state startup_logical_time
 
-  reaction(startup) {= self.startup_logical_time = lf.time.logical() =}
+  reaction(startup) {=
+    self.startup_logical_time = lf.time.logical()
+  =}
 
   reaction(in_) {=
     tag = lf.tag()
diff --git a/test/Python/src/federated/DistributedStructAsType.lf b/test/Python/src/federated/DistributedStructAsType.lf
index 36a3151289..b3a83cc600 100644
--- a/test/Python/src/federated/DistributedStructAsType.lf
+++ b/test/Python/src/federated/DistributedStructAsType.lf
@@ -5,7 +5,9 @@ target Python {
 
 import Source, Print from "../StructAsType.lf"
 
-preamble {= import hello =}
+preamble {=
+  import hello
+=}
 
 federated reactor {
   s = new Source()
diff --git a/test/Python/src/federated/DistributedStructAsTypeDirect.lf b/test/Python/src/federated/DistributedStructAsTypeDirect.lf
index b74ba275b5..7463672366 100644
--- a/test/Python/src/federated/DistributedStructAsTypeDirect.lf
+++ b/test/Python/src/federated/DistributedStructAsTypeDirect.lf
@@ -5,7 +5,9 @@ target Python {
 
 import Source, Print from "../StructAsTypeDirect.lf"
 
-preamble {= import hello =}
+preamble {=
+  import hello
+=}
 
 federated reactor {
   s = new Source()
diff --git a/test/Python/src/federated/DistributedStructParallel.lf b/test/Python/src/federated/DistributedStructParallel.lf
index e20bb21030..9577231955 100644
--- a/test/Python/src/federated/DistributedStructParallel.lf
+++ b/test/Python/src/federated/DistributedStructParallel.lf
@@ -8,7 +8,9 @@ target Python {
 import Source from "../StructScale.lf"
 import Check, Print from "../StructParallel.lf"
 
-preamble {= import hello =}
+preamble {=
+  import hello
+=}
 
 federated reactor {
   s = new Source()
diff --git a/test/Python/src/federated/DistributedStructPrint.lf b/test/Python/src/federated/DistributedStructPrint.lf
index 829b298b28..d3dbfe398b 100644
--- a/test/Python/src/federated/DistributedStructPrint.lf
+++ b/test/Python/src/federated/DistributedStructPrint.lf
@@ -7,7 +7,9 @@ target Python {
 
 import Print, Check from "../StructPrint.lf"
 
-preamble {= import hello =}
+preamble {=
+  import hello
+=}
 
 federated reactor {
   s = new Print()
diff --git a/test/Python/src/federated/DistributedStructScale.lf b/test/Python/src/federated/DistributedStructScale.lf
index 1551035c29..34a4977d05 100644
--- a/test/Python/src/federated/DistributedStructScale.lf
+++ b/test/Python/src/federated/DistributedStructScale.lf
@@ -7,7 +7,9 @@ target Python {
 
 import Source, TestInput, Print from "../StructScale.lf"
 
-preamble {= import hello =}
+preamble {=
+  import hello
+=}
 
 federated reactor {
   s = new Source()
diff --git a/test/Python/src/federated/HelloDistributed.lf b/test/Python/src/federated/HelloDistributed.lf
index 7bbfa49368..300af9c78a 100644
--- a/test/Python/src/federated/HelloDistributed.lf
+++ b/test/Python/src/federated/HelloDistributed.lf
@@ -20,7 +20,9 @@ reactor Destination {
   input _in
   state received = False
 
-  reaction(startup) {= print("Destination started.") =}
+  reaction(startup) {=
+    print("Destination started.")
+  =}
 
   reaction(_in) {=
     print(f"At logical time {lf.time.logical_elapsed()}, destination received {_in.value}")
diff --git a/test/Python/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf b/test/Python/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf
index 3d4564fc45..1d996147a7 100644
--- a/test/Python/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf
+++ b/test/Python/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.lf
@@ -19,9 +19,13 @@ reactor Contained(incr=1) {
   state count = 0
   state received_count = 0
 
-  reaction(t) {= self.count += self.incr =}
+  reaction(t) {=
+    self.count += self.incr
+  =}
 
-  reaction(inp) {= self.received_count = self.count =}
+  reaction(inp) {=
+    self.received_count = self.count
+  =}
 
   reaction(t) {=
     if self.received_count != self.count:
diff --git a/test/Python/src/federated/PhysicalSTP.lf b/test/Python/src/federated/PhysicalSTP.lf
index 20d61df25b..e00fda3f36 100644
--- a/test/Python/src/federated/PhysicalSTP.lf
+++ b/test/Python/src/federated/PhysicalSTP.lf
@@ -7,7 +7,9 @@ target Python {
 import Count from "../lib/Count.lf"
 
 reactor Print(STP_offset=0) {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   input in_
   state c = 1
 
diff --git a/test/Python/src/federated/PingPongDistributed.lf b/test/Python/src/federated/PingPongDistributed.lf
index 4bd0cde285..a2c334ab57 100644
--- a/test/Python/src/federated/PingPongDistributed.lf
+++ b/test/Python/src/federated/PingPongDistributed.lf
@@ -40,7 +40,9 @@ reactor Ping(count=10) {
 }
 
 reactor Pong(expected=10) {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
 
   input receive
   output send
diff --git a/test/Python/src/federated/StopAtShutdown.lf b/test/Python/src/federated/StopAtShutdown.lf
index 55708d038e..f5a784185d 100644
--- a/test/Python/src/federated/StopAtShutdown.lf
+++ b/test/Python/src/federated/StopAtShutdown.lf
@@ -12,20 +12,30 @@ target Python {
 reactor A {
   input in_
 
-  reaction(startup) {= print("Hello World!") =}
+  reaction(startup) {=
+    print("Hello World!")
+  =}
 
-  reaction(in_) {= print("Got it") =}
+  reaction(in_) {=
+    print("Got it")
+  =}
 
-  reaction(shutdown) {= request_stop() =}
+  reaction(shutdown) {=
+    request_stop()
+  =}
 }
 
 reactor B {
   output out
   timer t(1 sec)
 
-  reaction(t) -> out {= out.set(1) =}
+  reaction(t) -> out {=
+    out.set(1)
+  =}
 
-  reaction(shutdown) {= request_stop() =}
+  reaction(shutdown) {=
+    request_stop()
+  =}
 }
 
 federated reactor {
diff --git a/test/Python/src/lib/Imported.lf b/test/Python/src/lib/Imported.lf
index e23b300991..e98af204a3 100644
--- a/test/Python/src/lib/Imported.lf
+++ b/test/Python/src/lib/Imported.lf
@@ -8,5 +8,7 @@ reactor Imported {
   input x
   a = new ImportedAgain()
 
-  reaction(x) -> a.x {= a.x.set(x.value) =}
+  reaction(x) -> a.x {=
+    a.x.set(x.value)
+  =}
 }
diff --git a/test/Python/src/lib/ImportedComposition.lf b/test/Python/src/lib/ImportedComposition.lf
index 5eeb39420f..9d55449db1 100644
--- a/test/Python/src/lib/ImportedComposition.lf
+++ b/test/Python/src/lib/ImportedComposition.lf
@@ -6,7 +6,9 @@ reactor Gain {
   input x
   output y
 
-  reaction(x) -> y {= y.set(x.value * 2) =}
+  reaction(x) -> y {=
+    y.set(x.value * 2)
+  =}
 }
 
 reactor ImportedComposition {
diff --git a/test/Python/src/lib/InternalDelay.lf b/test/Python/src/lib/InternalDelay.lf
index 964ec6b5a3..0438e1d877 100644
--- a/test/Python/src/lib/InternalDelay.lf
+++ b/test/Python/src/lib/InternalDelay.lf
@@ -5,7 +5,11 @@ reactor InternalDelay(delay = 10 msec) {
   output out
   logical action d
 
-  reaction(in_) -> d {= d.schedule(self.delay, in_.value) =}
+  reaction(in_) -> d {=
+    d.schedule(self.delay, in_.value)
+  =}
 
-  reaction(d) -> out {= out.set(d.value) =}
+  reaction(d) -> out {=
+    out.set(d.value)
+  =}
 }
diff --git a/test/Python/src/lib/TestCount.lf b/test/Python/src/lib/TestCount.lf
index 28dcf74ba0..75d9c96d9e 100644
--- a/test/Python/src/lib/TestCount.lf
+++ b/test/Python/src/lib/TestCount.lf
@@ -9,7 +9,9 @@
 target Python
 
 reactor TestCount(start=1, stride=1, num_inputs=1) {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   state count = start
   state inputs_received = 0
   input in_
diff --git a/test/Python/src/lib/TestCountMultiport.lf b/test/Python/src/lib/TestCountMultiport.lf
index 0514bc2472..38bedbdbfd 100644
--- a/test/Python/src/lib/TestCountMultiport.lf
+++ b/test/Python/src/lib/TestCountMultiport.lf
@@ -11,7 +11,9 @@
 target Python
 
 reactor TestCountMultiport(start=1, stride=1, num_inputs=1, width=2) {
-  preamble {= import sys =}
+  preamble {=
+    import sys
+  =}
   state count = start
   state inputs_received = 0
   input[width] inp
diff --git a/test/Python/src/modal_models/BanksCount3ModesComplex.lf b/test/Python/src/modal_models/BanksCount3ModesComplex.lf
index 757331dd7d..3ea6d112ee 100644
--- a/test/Python/src/modal_models/BanksCount3ModesComplex.lf
+++ b/test/Python/src/modal_models/BanksCount3ModesComplex.lf
@@ -25,7 +25,9 @@ reactor MetaCounter {
     mode1_counters.count -> mode1
 
     timer t1(500 msec, 250 msec)
-    reaction(t1) -> reset(Two) {= Two.set() =}
+    reaction(t1) -> reset(Two) {=
+      Two.set()
+    =}
   }
 
   mode Two {
@@ -35,7 +37,9 @@ reactor MetaCounter {
     mode2_counters.count -> mode2
 
     timer t2(500 msec, 250 msec)
-    reaction(t2) -> history(One) {= One.set() =}
+    reaction(t2) -> history(One) {=
+      One.set()
+    =}
   }
 
   mode Three {
diff --git a/test/Python/src/modal_models/ConvertCaseTest.lf b/test/Python/src/modal_models/ConvertCaseTest.lf
index f063da7e34..70eec263f5 100644
--- a/test/Python/src/modal_models/ConvertCaseTest.lf
+++ b/test/Python/src/modal_models/ConvertCaseTest.lf
@@ -15,13 +15,19 @@ reactor ResetProcessor {
     converter = new Converter()
     character -> converter.raw
     converter.converted -> converted
-    reaction(discard) -> reset(Discarding) {= Discarding.set() =}
+    reaction(discard) -> reset(Discarding) {=
+      Discarding.set()
+    =}
   }
 
   mode Discarding {
-    reaction(character) -> converted {= converted.set('_') =}
+    reaction(character) -> converted {=
+      converted.set('_')
+    =}
 
-    reaction(character) -> reset(Converting) {= Converting.set() =}
+    reaction(character) -> reset(Converting) {=
+      Converting.set()
+    =}
   }
 }
 
@@ -34,13 +40,19 @@ reactor HistoryProcessor {
     converter = new Converter()
     character -> converter.raw
     converter.converted -> converted
-    reaction(discard) -> reset(Discarding) {= Discarding.set() =}
+    reaction(discard) -> reset(Discarding) {=
+      Discarding.set()
+    =}
   }
 
   mode Discarding {
-    reaction(character) -> converted {= converted.set('_') =}
+    reaction(character) -> converted {=
+      converted.set('_')
+    =}
 
-    reaction(character) -> history(Converting) {= Converting.set() =}
+    reaction(character) -> history(Converting) {=
+      Converting.set()
+    =}
   }
 }
 
@@ -113,7 +125,11 @@ main reactor {
     history_processor.discard.set(True)
   =}
 
-  reaction(reset_processor.converted) {= print(f"Reset: {reset_processor.converted.value}") =}
+  reaction(reset_processor.converted) {=
+    print(f"Reset: {reset_processor.converted.value}")
+  =}
 
-  reaction(history_processor.converted) {= print(f"History: {history_processor.converted.value}") =}
+  reaction(history_processor.converted) {=
+    print(f"History: {history_processor.converted.value}")
+  =}
 }
diff --git a/test/Python/src/modal_models/Count3Modes.lf b/test/Python/src/modal_models/Count3Modes.lf
index 8d67270300..6f19128ca3 100644
--- a/test/Python/src/modal_models/Count3Modes.lf
+++ b/test/Python/src/modal_models/Count3Modes.lf
@@ -36,7 +36,10 @@ main reactor {
 
   state expected_value = 1
 
-  reaction(stepper) -> counter.next {= counter.next.set(True) =}  # Trigger
+  # Trigger
+  reaction(stepper) -> counter.next {=
+    counter.next.set(True)
+  =}
 
   # Check
   reaction(stepper) counter.count {=
diff --git a/test/Python/src/modal_models/ModalActions.lf b/test/Python/src/modal_models/ModalActions.lf
index 5218a1428e..5938061a51 100644
--- a/test/Python/src/modal_models/ModalActions.lf
+++ b/test/Python/src/modal_models/ModalActions.lf
@@ -89,5 +89,8 @@ main reactor {
   modal.action2_sched,
   modal.action2_exec -> test.events
 
-  reaction(stepper) -> modal.next {= modal.next.set(True) =}  # Trigger mode change
+  # Trigger mode change
+  reaction(stepper) -> modal.next {=
+    modal.next.set(True)
+  =}
 }
diff --git a/test/Python/src/modal_models/ModalAfter.lf b/test/Python/src/modal_models/ModalAfter.lf
index f5e8141e00..a437052dcc 100644
--- a/test/Python/src/modal_models/ModalAfter.lf
+++ b/test/Python/src/modal_models/ModalAfter.lf
@@ -91,5 +91,8 @@ main reactor {
   modal.mode_switch, modal.produced1, modal.consumed1, modal.produced2, modal.consumed2
     -> test.events
 
-  reaction(stepper) -> modal.next {= modal.next.set(True) =}  # Trigger mode change
+  # Trigger mode change
+  reaction(stepper) -> modal.next {=
+    modal.next.set(True)
+  =}
 }
diff --git a/test/Python/src/modal_models/ModalCycleBreaker.lf b/test/Python/src/modal_models/ModalCycleBreaker.lf
index 2475366927..61ce4c60d7 100644
--- a/test/Python/src/modal_models/ModalCycleBreaker.lf
+++ b/test/Python/src/modal_models/ModalCycleBreaker.lf
@@ -28,7 +28,9 @@ reactor Modal {
   }
 
   initial mode One {
-    reaction(in1) -> out {= out.set(in1.value) =}
+    reaction(in1) -> out {=
+      out.set(in1.value)
+    =}
 
     reaction(in1) -> reset(Two) {=
       if in1.value % 5 == 4:
@@ -70,5 +72,8 @@ main reactor {
 
   modal.out -> test.events
 
-  reaction(modal.out) {= print(modal.out.value) =}  # Print
+  # Print
+  reaction(modal.out) {=
+    print(modal.out.value)
+  =}
 }
diff --git a/test/Python/src/modal_models/ModalNestedReactions.lf b/test/Python/src/modal_models/ModalNestedReactions.lf
index 5f30da93b8..a3b89c997a 100644
--- a/test/Python/src/modal_models/ModalNestedReactions.lf
+++ b/test/Python/src/modal_models/ModalNestedReactions.lf
@@ -29,7 +29,9 @@ reactor CounterCycle {
   }
 
   mode Three {
-    reaction(next) -> never {= never.set(True) =}
+    reaction(next) -> never {=
+      never.set(True)
+    =}
   }
 }
 
@@ -37,14 +39,19 @@ reactor Forward {
   input inp
   output out
 
-  reaction(inp) -> out {= out.set(inp.value) =}
+  reaction(inp) -> out {=
+    out.set(inp.value)
+  =}
 }
 
 main reactor {
   timer stepper(0, 250 msec)
   counter = new CounterCycle()
 
-  reaction(stepper) -> counter.next {= counter.next.set(True) =}  # Trigger
+  # Trigger
+  reaction(stepper) -> counter.next {=
+    counter.next.set(True)
+  =}
 
   # Check
   reaction(stepper) counter.count, counter.only_in_two {=
diff --git a/test/Python/src/modal_models/ModalStartupShutdown.lf b/test/Python/src/modal_models/ModalStartupShutdown.lf
index 8dc7eb8dd1..cd77eb2b1f 100644
--- a/test/Python/src/modal_models/ModalStartupShutdown.lf
+++ b/test/Python/src/modal_models/ModalStartupShutdown.lf
@@ -137,5 +137,8 @@ main reactor {
   modal.reset5,
   modal.shutdown5 -> test.events
 
-  reaction(stepper) -> modal.next {= modal.next.set(True) =}  # Trigger mode change
+  # Trigger mode change
+  reaction(stepper) -> modal.next {=
+    modal.next.set(True)
+  =}
 }
diff --git a/test/Python/src/modal_models/ModalStateReset.lf b/test/Python/src/modal_models/ModalStateReset.lf
index 5de6b61e35..7ae20ad095 100644
--- a/test/Python/src/modal_models/ModalStateReset.lf
+++ b/test/Python/src/modal_models/ModalStateReset.lf
@@ -25,7 +25,9 @@ reactor Modal {
   initial mode One {
     state counter1 = 0
     timer T1(0 msec, 250 msec)
-    reaction(reset) {= self.counter1 = 0 =}
+    reaction(reset) {=
+      self.counter1 = 0
+    =}
 
     reaction(T1) -> count1 {=
       print(f"Counter1: {self.counter1}")
@@ -43,7 +45,9 @@ reactor Modal {
   mode Two {
     state counter2 = -2
     timer T2(0 msec, 250 msec)
-    reaction(reset) {= self.counter2 = -2 =}
+    reaction(reset) {=
+      self.counter2 = -2
+    =}
 
     reaction(T2) -> count2 {=
       print(f"Counter2: {self.counter2}")
@@ -87,5 +91,8 @@ main reactor {
 
   modal.mode_switch, modal.count0, modal.count1, modal.count2 -> test.events
 
-  reaction(stepper) -> modal.next {= modal.next.set(True) =}  # Trigger mode change
+  # Trigger mode change
+  reaction(stepper) -> modal.next {=
+    modal.next.set(True)
+  =}
 }
diff --git a/test/Python/src/modal_models/ModalStateResetAuto.lf b/test/Python/src/modal_models/ModalStateResetAuto.lf
index 492d02f234..947fc4e924 100644
--- a/test/Python/src/modal_models/ModalStateResetAuto.lf
+++ b/test/Python/src/modal_models/ModalStateResetAuto.lf
@@ -83,5 +83,8 @@ main reactor {
 
   modal.mode_switch, modal.count0, modal.count1, modal.count2 -> test.events
 
-  reaction(stepper) -> modal.next {= modal.next.set(True) =}  # Trigger mode change
+  # Trigger mode change
+  reaction(stepper) -> modal.next {=
+    modal.next.set(True)
+  =}
 }
diff --git a/test/Python/src/modal_models/ModalTimers.lf b/test/Python/src/modal_models/ModalTimers.lf
index f752e025d8..7d2d6c5707 100644
--- a/test/Python/src/modal_models/ModalTimers.lf
+++ b/test/Python/src/modal_models/ModalTimers.lf
@@ -62,5 +62,8 @@ main reactor {
 
   modal.mode_switch, modal.timer1, modal.timer2 -> test.events
 
-  reaction(stepper) -> modal.next {= modal.next.set(True) =}  # Trigger mode change
+  # Trigger mode change
+  reaction(stepper) -> modal.next {=
+    modal.next.set(True)
+  =}
 }
diff --git a/test/Python/src/modal_models/MultipleOutputFeeder_2Connections.lf b/test/Python/src/modal_models/MultipleOutputFeeder_2Connections.lf
index 47e9c0b783..573d35f432 100644
--- a/test/Python/src/modal_models/MultipleOutputFeeder_2Connections.lf
+++ b/test/Python/src/modal_models/MultipleOutputFeeder_2Connections.lf
@@ -18,13 +18,17 @@ reactor Modal {
   initial mode One {
     counter1 = new Counter(period = 250 msec)
     counter1.value -> count
-    reaction(next) -> reset(Two) {= Two.set() =}
+    reaction(next) -> reset(Two) {=
+      Two.set()
+    =}
   }
 
   mode Two {
     counter2 = new Counter(period = 100 msec)
     counter2.value -> count
-    reaction(next) -> history(One) {= One.set() =}
+    reaction(next) -> history(One) {=
+      One.set()
+    =}
   }
 }
 
@@ -66,7 +70,13 @@ main reactor {
 
   modal.count -> test.events
 
-  reaction(stepper) -> modal.next {= modal.next.set(True) =}  # Trigger mode change
+  # Trigger mode change
+  reaction(stepper) -> modal.next {=
+    modal.next.set(True)
+  =}
 
-  reaction(modal.count) {= print(modal.count.value) =}        # Print
+  # Print
+  reaction(modal.count) {=
+    print(modal.count.value)
+  =}
 }
diff --git a/test/Python/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf b/test/Python/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf
index 5d77127f86..213db4693b 100644
--- a/test/Python/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf
+++ b/test/Python/src/modal_models/MultipleOutputFeeder_ReactionConnections.lf
@@ -18,14 +18,20 @@ reactor Modal {
   initial mode One {
     counter1 = new Counter(period = 250 msec)
     counter1.value -> count
-    reaction(next) -> reset(Two) {= Two.set() =}
+    reaction(next) -> reset(Two) {=
+      Two.set()
+    =}
   }
 
   mode Two {
     counter2 = new Counter(period = 100 msec)
-    reaction(counter2.value) -> count {= count.set(counter2.value.value * 10) =}
+    reaction(counter2.value) -> count {=
+      count.set(counter2.value.value * 10)
+    =}
 
-    reaction(next) -> history(One) {= One.set() =}
+    reaction(next) -> history(One) {=
+      One.set()
+    =}
   }
 }
 
@@ -67,7 +73,13 @@ main reactor {
 
   modal.count -> test.events
 
-  reaction(stepper) -> modal.next {= modal.next.set(True) =}  # Trigger mode change
+  # Trigger mode change
+  reaction(stepper) -> modal.next {=
+    modal.next.set(True)
+  =}
 
-  reaction(modal.count) {= print(modal.count.value) =}        # Print
+  # Print
+  reaction(modal.count) {=
+    print(modal.count.value)
+  =}
 }
diff --git a/test/Python/src/modal_models/util/TraceTesting.lf b/test/Python/src/modal_models/util/TraceTesting.lf
index 833ffa0ca6..0d5053b844 100644
--- a/test/Python/src/modal_models/util/TraceTesting.lf
+++ b/test/Python/src/modal_models/util/TraceTesting.lf
@@ -9,7 +9,9 @@ reactor TraceTesting(events_size=0, trace = {= [] =}, training=False) {
   state recorded_events = {= [] =}
   state recorded_events_next = 0
 
-  reaction(startup) {= self.last_reaction_time = lf.time.logical() =}
+  reaction(startup) {=
+    self.last_reaction_time = lf.time.logical()
+  =}
 
   reaction(events) {=
     # Time passed since last reaction
diff --git a/test/Python/src/multiport/BankIndexInitializer.lf b/test/Python/src/multiport/BankIndexInitializer.lf
index babef36a7c..2e02c9f498 100644
--- a/test/Python/src/multiport/BankIndexInitializer.lf
+++ b/test/Python/src/multiport/BankIndexInitializer.lf
@@ -1,12 +1,16 @@
 # Test bank of reactors to multiport input with id parameter in the bank.
 target Python
 
-preamble {= table = [4, 3, 2, 1] =}
+preamble {=
+  table = [4, 3, 2, 1]
+=}
 
 reactor Source(bank_index=0, value=0) {
   output out
 
-  reaction(startup) -> out {= out.set(self.value) =}
+  reaction(startup) -> out {=
+    out.set(self.value)
+  =}
 }
 
 reactor Sink(width=4) {
diff --git a/test/Python/src/multiport/BankToMultiport.lf b/test/Python/src/multiport/BankToMultiport.lf
index 7be7e38e21..bd276a2aa8 100644
--- a/test/Python/src/multiport/BankToMultiport.lf
+++ b/test/Python/src/multiport/BankToMultiport.lf
@@ -4,7 +4,9 @@ target Python
 reactor Source(bank_index=0) {
   output out
 
-  reaction(startup) -> out {= out.set(self.bank_index) =}
+  reaction(startup) -> out {=
+    out.set(self.bank_index)
+  =}
 }
 
 reactor Sink(width=4) {
diff --git a/test/Python/src/multiport/Broadcast.lf b/test/Python/src/multiport/Broadcast.lf
index ad10435c7b..f54f8f4730 100644
--- a/test/Python/src/multiport/Broadcast.lf
+++ b/test/Python/src/multiport/Broadcast.lf
@@ -6,7 +6,9 @@ target Python {
 reactor Source(value=42) {
   output out
 
-  reaction(startup) -> out {= out.set(self.value) =}
+  reaction(startup) -> out {=
+    out.set(self.value)
+  =}
 }
 
 reactor Destination(bank_index=0, delay=0) {
diff --git a/test/Python/src/multiport/MultiportFromBank.lf b/test/Python/src/multiport/MultiportFromBank.lf
index 447f10154a..d41d247fc7 100644
--- a/test/Python/src/multiport/MultiportFromBank.lf
+++ b/test/Python/src/multiport/MultiportFromBank.lf
@@ -8,7 +8,9 @@ target Python {
 reactor Source(check_override=0, bank_index=0) {
   output out
 
-  reaction(startup) -> out {= out.set(self.bank_index * self.check_override) =}
+  reaction(startup) -> out {=
+    out.set(self.bank_index * self.check_override)
+  =}
 }
 
 reactor Destination {
diff --git a/test/Python/src/multiport/MultiportFromBankHierarchy.lf b/test/Python/src/multiport/MultiportFromBankHierarchy.lf
index 253de78c1a..20a66f2e1f 100644
--- a/test/Python/src/multiport/MultiportFromBankHierarchy.lf
+++ b/test/Python/src/multiport/MultiportFromBankHierarchy.lf
@@ -10,7 +10,9 @@ import Destination from "MultiportFromBank.lf"
 reactor Source(bank_index=0) {
   output out
 
-  reaction(startup) -> out {= out.set(self.bank_index) =}
+  reaction(startup) -> out {=
+    out.set(self.bank_index)
+  =}
 }
 
 reactor Container {
diff --git a/test/Python/src/multiport/MultiportIn.lf b/test/Python/src/multiport/MultiportIn.lf
index e72b037bab..3fd77500ff 100644
--- a/test/Python/src/multiport/MultiportIn.lf
+++ b/test/Python/src/multiport/MultiportIn.lf
@@ -20,7 +20,9 @@ reactor Computation {
   input _in
   output out
 
-  reaction(_in) -> out {= out.set(_in.value) =}
+  reaction(_in) -> out {=
+    out.set(_in.value)
+  =}
 }
 
 reactor Destination {
diff --git a/test/Python/src/multiport/MultiportInParameterized.lf b/test/Python/src/multiport/MultiportInParameterized.lf
index d9df047b5a..ece6b51b2a 100644
--- a/test/Python/src/multiport/MultiportInParameterized.lf
+++ b/test/Python/src/multiport/MultiportInParameterized.lf
@@ -20,7 +20,9 @@ reactor Computation {
   input _in
   output out
 
-  reaction(_in) -> out {= out.set(_in.value) =}
+  reaction(_in) -> out {=
+    out.set(_in.value)
+  =}
 }
 
 reactor Destination(width=1) {
diff --git a/test/Python/src/multiport/MultiportOut.lf b/test/Python/src/multiport/MultiportOut.lf
index b84f97989c..29a5816e90 100644
--- a/test/Python/src/multiport/MultiportOut.lf
+++ b/test/Python/src/multiport/MultiportOut.lf
@@ -21,7 +21,9 @@ reactor Computation {
   input _in
   output out
 
-  reaction(_in) -> out {= out.set(_in.value) =}
+  reaction(_in) -> out {=
+    out.set(_in.value)
+  =}
 }
 
 reactor Destination {
diff --git a/test/Python/src/multiport/PipelineAfter.lf b/test/Python/src/multiport/PipelineAfter.lf
index 307a4122cd..b16d20b7a4 100644
--- a/test/Python/src/multiport/PipelineAfter.lf
+++ b/test/Python/src/multiport/PipelineAfter.lf
@@ -3,14 +3,18 @@ target Python
 reactor Source {
   output out
 
-  reaction(startup) -> out {= out.set(40) =}
+  reaction(startup) -> out {=
+    out.set(40)
+  =}
 }
 
 reactor Compute {
   input inp
   output out
 
-  reaction(inp) -> out {= out.set(inp.value + 2) =}
+  reaction(inp) -> out {=
+    out.set(inp.value + 2)
+  =}
 }
 
 reactor Sink {
diff --git a/test/Python/src/multiport/ReactionsToNested.lf b/test/Python/src/multiport/ReactionsToNested.lf
index b298a85a95..f02fc91bc4 100644
--- a/test/Python/src/multiport/ReactionsToNested.lf
+++ b/test/Python/src/multiport/ReactionsToNested.lf
@@ -32,7 +32,11 @@ reactor D {
 main reactor {
   d = new D()
 
-  reaction(startup) -> d.y {= d.y[0].set(42) =}
+  reaction(startup) -> d.y {=
+    d.y[0].set(42)
+  =}
 
-  reaction(startup) -> d.y {= d.y[1].set(43) =}
+  reaction(startup) -> d.y {=
+    d.y[1].set(43)
+  =}
 }
diff --git a/test/Python/src/target/AfterNoTypes.lf b/test/Python/src/target/AfterNoTypes.lf
index c2be99ef2c..8a00ea94c7 100644
--- a/test/Python/src/target/AfterNoTypes.lf
+++ b/test/Python/src/target/AfterNoTypes.lf
@@ -9,7 +9,9 @@ reactor Foo {
   input x
   output y
 
-  reaction(x) -> y {= y.set(2*x.value); =}
+  reaction(x) -> y {=
+    y.set(2*x.value);
+  =}
 }
 
 reactor Print {
@@ -46,5 +48,7 @@ main reactor {
   timer t(0, 1 sec)
   f.y -> p.x after 10 msec
 
-  reaction(t) -> f.x {= f.x.set(42) =}
+  reaction(t) -> f.x {=
+    f.x.set(42)
+  =}
 }
diff --git a/test/Rust/src/ActionImplicitDelay.lf b/test/Rust/src/ActionImplicitDelay.lf
index 5ae8557a57..ea33042ea1 100644
--- a/test/Rust/src/ActionImplicitDelay.lf
+++ b/test/Rust/src/ActionImplicitDelay.lf
@@ -5,7 +5,9 @@ main reactor ActionImplicitDelay {
   logical action act(40 msec)
   state count: u64 = 1
 
-  reaction(startup) -> act {= ctx.schedule(act, Asap); =}
+  reaction(startup) -> act {=
+    ctx.schedule(act, Asap);
+  =}
 
   reaction(act) -> act {=
     assert_tag_is!(ctx, T0 + (40 * self.count) ms);
diff --git a/test/Rust/src/ActionValuesCleanup.lf b/test/Rust/src/ActionValuesCleanup.lf
index 1db2759ad6..407424b218 100644
--- a/test/Rust/src/ActionValuesCleanup.lf
+++ b/test/Rust/src/ActionValuesCleanup.lf
@@ -22,7 +22,9 @@ main reactor ActionValuesCleanup {
   logical action act: FooDrop
   state count: u32 = 0
 
-  reaction(startup) -> act {= ctx.schedule_with_v(act, Some(FooDrop { }), Asap) =}
+  reaction(startup) -> act {=
+    ctx.schedule_with_v(act, Some(FooDrop { }), Asap)
+  =}
 
   reaction(act) -> act {=
     ctx.use_ref(act, |v| println!("{:?}", v));
diff --git a/test/Rust/src/CompositionInitializationOrder.lf b/test/Rust/src/CompositionInitializationOrder.lf
index 5bb11f7d9c..1d1106dc58 100644
--- a/test/Rust/src/CompositionInitializationOrder.lf
+++ b/test/Rust/src/CompositionInitializationOrder.lf
@@ -5,13 +5,19 @@ main reactor CompositionInitializationOrder {
   c1 = new Component1()
   c2 = new Component2()
 
-  reaction(startup) {= println!("parent woke up"); =}
+  reaction(startup) {=
+    println!("parent woke up");
+  =}
 }
 
 reactor Component2 {
-  reaction(startup) {= println!("c2 woke up"); =}
+  reaction(startup) {=
+    println!("c2 woke up");
+  =}
 }
 
 reactor Component1 {
-  reaction(startup) {= println!("c1 woke up"); =}
+  reaction(startup) {=
+    println!("c1 woke up");
+  =}
 }
diff --git a/test/Rust/src/CompositionWithPorts.lf b/test/Rust/src/CompositionWithPorts.lf
index 802f8cac21..17715fa5d9 100644
--- a/test/Rust/src/CompositionWithPorts.lf
+++ b/test/Rust/src/CompositionWithPorts.lf
@@ -3,7 +3,9 @@ target Rust
 reactor Source {
   output out: i32
 
-  reaction(startup) -> out {= ctx.set(out, 76600) =}
+  reaction(startup) -> out {=
+    ctx.set(out, 76600)
+  =}
 }
 
 reactor Sink {
diff --git a/test/Rust/src/DependencyOnChildPort.lf b/test/Rust/src/DependencyOnChildPort.lf
index 2758af8604..0e6dbbda68 100644
--- a/test/Rust/src/DependencyOnChildPort.lf
+++ b/test/Rust/src/DependencyOnChildPort.lf
@@ -16,9 +16,13 @@ main reactor {
 
   box0.out -> box1.inp
 
-  reaction(startup) -> box0.inp {= ctx.set(box0__inp, 444); =}
+  reaction(startup) -> box0.inp {=
+    ctx.set(box0__inp, 444);
+  =}
 
-  reaction(box1.out) {= assert!(ctx.get_elapsed_logical_time().is_zero()); self.done = true; =}
+  reaction(box1.out) {=
+    assert!(ctx.get_elapsed_logical_time().is_zero()); self.done = true;
+  =}
 
   reaction(shutdown) {=
     assert!(self.done, "reaction was not executed");
diff --git a/test/Rust/src/DependencyThroughChildPort.lf b/test/Rust/src/DependencyThroughChildPort.lf
index c8e8bf1592..48b6314363 100644
--- a/test/Rust/src/DependencyThroughChildPort.lf
+++ b/test/Rust/src/DependencyThroughChildPort.lf
@@ -40,5 +40,7 @@ main reactor {
     ctx.schedule(repeat, Asap);
   =}
 
-  reaction(repeat) -> d.y {= ctx.set(d__y, 1); =}
+  reaction(repeat) -> d.y {=
+    ctx.set(d__y, 1);
+  =}
 }
diff --git a/test/Rust/src/DependencyUseAccessible.lf b/test/Rust/src/DependencyUseAccessible.lf
index 0654d25f60..9a5866d6bf 100644
--- a/test/Rust/src/DependencyUseAccessible.lf
+++ b/test/Rust/src/DependencyUseAccessible.lf
@@ -8,11 +8,18 @@ reactor Source {
   timer t1(35 msec)
   timer t2(70 msec)
 
-  reaction(startup) -> clock {= ctx.set(clock, 0); =}
+  reaction(startup) -> clock {=
+    ctx.set(clock, 0);
+  =}
 
-  reaction(t1) -> clock, o1 {= ctx.set(clock, 1); ctx.set(o1, 10) =}
+  reaction(t1) -> clock, o1 {=
+    ctx.set(clock, 1); ctx.set(o1, 10)
+  =}
 
-  reaction(t2) -> clock, o2 {= ctx.set(clock, 2); =}  // has a dependency but doesn't use it
+  // has a dependency but doesn't use it
+  reaction(t2) -> clock, o2 {=
+    ctx.set(clock, 2);
+  =}
 }
 
 reactor Sink {
diff --git a/test/Rust/src/DependencyUseNonTrigger.lf b/test/Rust/src/DependencyUseNonTrigger.lf
index 656ad1f768..11da73eb54 100644
--- a/test/Rust/src/DependencyUseNonTrigger.lf
+++ b/test/Rust/src/DependencyUseNonTrigger.lf
@@ -4,16 +4,22 @@ target Rust
 reactor Source {
   output clock: u32
 
-  reaction(startup) -> clock {= ctx.set(clock, 0); =}
+  reaction(startup) -> clock {=
+    ctx.set(clock, 0);
+  =}
 }
 
 reactor Sink {
   input clock: u32
   input bogus: u32
 
-  reaction(bogus) clock {= panic!("Should not be executed") =}
+  reaction(bogus) clock {=
+    panic!("Should not be executed")
+  =}
 
-  reaction(shutdown) {= println!("Success") =}
+  reaction(shutdown) {=
+    println!("Success")
+  =}
 }
 
 main reactor {
diff --git a/test/Rust/src/Import.lf b/test/Rust/src/Import.lf
index c14618ba6e..f2c5549abc 100644
--- a/test/Rust/src/Import.lf
+++ b/test/Rust/src/Import.lf
@@ -7,5 +7,7 @@ main reactor Import {
   timer t
   a = new Imported()
 
-  reaction(t) -> a.x {= ctx.set(a__x, 42); =}
+  reaction(t) -> a.x {=
+    ctx.set(a__x, 42);
+  =}
 }
diff --git a/test/Rust/src/ImportPreambleItem.lf b/test/Rust/src/ImportPreambleItem.lf
index 922ea74b1a..dbbe1706e6 100644
--- a/test/Rust/src/ImportPreambleItem.lf
+++ b/test/Rust/src/ImportPreambleItem.lf
@@ -6,5 +6,7 @@ import SomethingWithAPreamble from "lib/SomethingWithAPreamble.lf"
 main reactor {
   r = new SomethingWithAPreamble()
 
-  reaction(startup) -> r.a {= ctx.set(r__a, super::something_with_a_preamble::some_fun()); =}
+  reaction(startup) -> r.a {=
+    ctx.set(r__a, super::something_with_a_preamble::some_fun());
+  =}
 }
diff --git a/test/Rust/src/MainReactorParam.lf b/test/Rust/src/MainReactorParam.lf
index 2081466a37..90c10f4ea2 100644
--- a/test/Rust/src/MainReactorParam.lf
+++ b/test/Rust/src/MainReactorParam.lf
@@ -4,5 +4,7 @@ main reactor(one: u64 = 1152921504606846976, two: u64 = {= 1 << 60 =}) {
   state one = one
   state two = two
 
-  reaction(startup) {= assert_eq!(self.one, self.two); =}
+  reaction(startup) {=
+    assert_eq!(self.one, self.two);
+  =}
 }
diff --git a/test/Rust/src/Minimal.lf b/test/Rust/src/Minimal.lf
index 02fd0d3eb3..754d7bb1f8 100644
--- a/test/Rust/src/Minimal.lf
+++ b/test/Rust/src/Minimal.lf
@@ -2,5 +2,7 @@
 target Rust
 
 main reactor Minimal {
-  reaction(startup) {= println!("Hello World."); =}
+  reaction(startup) {=
+    println!("Hello World.");
+  =}
 }
diff --git a/test/Rust/src/MovingAverage.lf b/test/Rust/src/MovingAverage.lf
index 22d10cabe0..0c5957b21c 100644
--- a/test/Rust/src/MovingAverage.lf
+++ b/test/Rust/src/MovingAverage.lf
@@ -17,7 +17,9 @@ reactor Source {
 }
 
 reactor MovingAverageImpl {
-  state delay_line: {= [f64 ; 4] =} = {= [ 0.0 ; 4 ] =}
+  state delay_line: {=
+    [f64 ; 4]
+  =} = {= [ 0.0 ; 4 ] =}
   state index: usize = 0
   input in_: f64
   output out: f64
@@ -40,7 +42,9 @@ reactor Print {
   input in_: f64
   state count: usize = 0
 
-  preamble {= const EXPECTED: [ f64 ; 6 ] = [0.0, 0.25, 0.75, 1.5, 2.5, 3.5]; =}
+  preamble {=
+    const EXPECTED: [ f64 ; 6 ] = [0.0, 0.25, 0.75, 1.5, 2.5, 3.5];
+  =}
 
   reaction(in_) {=
     let in_ = ctx.get(in_).unwrap();
diff --git a/test/Rust/src/NativeListsAndTimes.lf b/test/Rust/src/NativeListsAndTimes.lf
index 5401d6d1b9..d96e0649ba 100644
--- a/test/Rust/src/NativeListsAndTimes.lf
+++ b/test/Rust/src/NativeListsAndTimes.lf
@@ -30,7 +30,10 @@ reactor Foo(
   // state baz(p); // Implicit type i32[] fixme this interplays badly with syntax for array init
   // Implicit type time
   state period = z
-  state times: Vec<Vec<{= Duration =}>>(q, g)  // a list of lists
+  // a list of lists
+  state times: Vec<Vec<{=
+    Duration
+  =}>>(q, g)
 
   /**
    * reactor Foo (p: i32[](1, 2)) { state baz(p); // Implicit type i32[] state baz({=p=}); //
diff --git a/test/Rust/src/PortConnectionInSelfOutSelf.lf b/test/Rust/src/PortConnectionInSelfOutSelf.lf
index d398e89f0f..578255d43f 100644
--- a/test/Rust/src/PortConnectionInSelfOutSelf.lf
+++ b/test/Rust/src/PortConnectionInSelfOutSelf.lf
@@ -26,7 +26,9 @@ reactor Sink {
     self.done = true;
   =}
 
-  reaction(shutdown) {= assert!(self.done, "reaction was not executed") =}
+  reaction(shutdown) {=
+    assert!(self.done, "reaction was not executed")
+  =}
 }
 
 main reactor {
diff --git a/test/Rust/src/PortConnectionOutChildOutSelf.lf b/test/Rust/src/PortConnectionOutChildOutSelf.lf
index 6935eb4256..0aef3570f4 100644
--- a/test/Rust/src/PortConnectionOutChildOutSelf.lf
+++ b/test/Rust/src/PortConnectionOutChildOutSelf.lf
@@ -27,7 +27,9 @@ reactor Sink {
     self.done = true;
   =}
 
-  reaction(shutdown) {= assert!(self.done, "reaction was not executed") =}
+  reaction(shutdown) {=
+    assert!(self.done, "reaction was not executed")
+  =}
 }
 
 main reactor {
@@ -41,5 +43,7 @@ main reactor {
     self.done = true;
   =}
 
-  reaction(shutdown) {= assert!(self.done, "reaction was not executed") =}
+  reaction(shutdown) {=
+    assert!(self.done, "reaction was not executed")
+  =}
 }
diff --git a/test/Rust/src/PortValueCleanup.lf b/test/Rust/src/PortValueCleanup.lf
index ea0c9f50a0..13c35ac80c 100644
--- a/test/Rust/src/PortValueCleanup.lf
+++ b/test/Rust/src/PortValueCleanup.lf
@@ -4,7 +4,9 @@ target Rust
 reactor Source {
   output out: u32
 
-  reaction(startup) -> out {= ctx.set(out, 150); =}
+  reaction(startup) -> out {=
+    ctx.set(out, 150);
+  =}
 }
 
 reactor Sink {
diff --git a/test/Rust/src/Preamble.lf b/test/Rust/src/Preamble.lf
index 3f195808d7..01fc117db3 100644
--- a/test/Rust/src/Preamble.lf
+++ b/test/Rust/src/Preamble.lf
@@ -7,5 +7,7 @@ main reactor Preamble {
     }
   =}
 
-  reaction(startup) {= println!("42 plus 42 is {}.\n", add_42(42)); =}
+  reaction(startup) {=
+    println!("42 plus 42 is {}.\n", add_42(42));
+  =}
 }
diff --git a/test/Rust/src/ReactionLabels.lf b/test/Rust/src/ReactionLabels.lf
index 41c7ec57dd..0b3937bf6a 100644
--- a/test/Rust/src/ReactionLabels.lf
+++ b/test/Rust/src/ReactionLabels.lf
@@ -5,5 +5,8 @@ target Rust
 main reactor {
   timer t(0)
 
-  reaction(t) {= println!("success"); =}  // @label foo
+  // @label foo
+  reaction(t) {=
+    println!("success");
+  =}
 }
diff --git a/test/Rust/src/SingleFileGeneration.lf b/test/Rust/src/SingleFileGeneration.lf
index c88a4bdcbd..1fb32780a4 100644
--- a/test/Rust/src/SingleFileGeneration.lf
+++ b/test/Rust/src/SingleFileGeneration.lf
@@ -6,7 +6,9 @@ target Rust {
 reactor Source {
   output out: i32
 
-  reaction(startup) -> out {= ctx.set(out, 76600) =}
+  reaction(startup) -> out {=
+    ctx.set(out, 76600)
+  =}
 }
 
 reactor Sink {
diff --git a/test/Rust/src/StopNoEvent.lf b/test/Rust/src/StopNoEvent.lf
index 9dc96d3533..3c93d5d205 100644
--- a/test/Rust/src/StopNoEvent.lf
+++ b/test/Rust/src/StopNoEvent.lf
@@ -2,5 +2,7 @@
 target Rust
 
 main reactor StopNoEvent {
-  reaction(shutdown) {= println!("success"); =}
+  reaction(shutdown) {=
+    println!("success");
+  =}
 }
diff --git a/test/Rust/src/StructAsType.lf b/test/Rust/src/StructAsType.lf
index 867651e8de..893a1ed8a8 100644
--- a/test/Rust/src/StructAsType.lf
+++ b/test/Rust/src/StructAsType.lf
@@ -20,7 +20,9 @@ reactor Source {
 
 // expected parameter is for testing.
 reactor Print(expected: i32 = 42) {
-  input inp: {= super::source::Hello =}
+  input inp: {=
+    super::source::Hello
+  =}
   state expected: i32 = expected
 
   reaction(inp) {=
diff --git a/test/Rust/src/TimeState.lf b/test/Rust/src/TimeState.lf
index 3de9934e28..d6195c8d10 100644
--- a/test/Rust/src/TimeState.lf
+++ b/test/Rust/src/TimeState.lf
@@ -3,7 +3,9 @@ target Rust
 reactor Foo {
   state baz: time = 500 msec
 
-  reaction(startup) {= assert_eq!(500, self.baz.as_millis()); =}
+  reaction(startup) {=
+    assert_eq!(500, self.baz.as_millis());
+  =}
 }
 
 main reactor TimeState {
diff --git a/test/Rust/src/Timers.lf b/test/Rust/src/Timers.lf
index 16b359966c..05ba51003c 100644
--- a/test/Rust/src/Timers.lf
+++ b/test/Rust/src/Timers.lf
@@ -8,9 +8,13 @@ main reactor Timers {
   timer t2(0, 2 sec)
   state counter: i32 = 0
 
-  reaction(t2) {= self.counter += 2; =}
+  reaction(t2) {=
+    self.counter += 2;
+  =}
 
-  reaction(t) {= self.counter -= 1; =}
+  reaction(t) {=
+    self.counter -= 1;
+  =}
 
   reaction(shutdown) {=
     assert_eq!(1, self.counter);
diff --git a/test/Rust/src/concurrent/AsyncCallback.lf b/test/Rust/src/concurrent/AsyncCallback.lf
index c6e42c3909..33bc8b9254 100644
--- a/test/Rust/src/concurrent/AsyncCallback.lf
+++ b/test/Rust/src/concurrent/AsyncCallback.lf
@@ -5,7 +5,9 @@ target Rust {
 }
 
 main reactor AsyncCallback(period: time = 10 msec) {
-  preamble {= use std::thread; =}
+  preamble {=
+    use std::thread;
+  =}
 
   timer t(0, period)
   state thread: Option<thread::JoinHandle<unit>>
diff --git a/test/Rust/src/generics/CtorParamGeneric.lf b/test/Rust/src/generics/CtorParamGeneric.lf
index 2104da5f54..fe9d2a4d90 100644
--- a/test/Rust/src/generics/CtorParamGeneric.lf
+++ b/test/Rust/src/generics/CtorParamGeneric.lf
@@ -1,8 +1,9 @@
 // tests that ctor parameters may refer to type parameters.
 target Rust
 
-reactor Generic<{= T: Default + Eq + Sync + std::fmt::Debug =}>(
-    value: T = {= Default::default() =}) {
+reactor Generic<{=
+  T: Default + Eq + Sync + std::fmt::Debug
+=}>(value: T = {= Default::default() =}) {
   input in: T
   state v: T = value
 
@@ -17,5 +18,7 @@ reactor Generic<{= T: Default + Eq + Sync + std::fmt::Debug =}>(
 main reactor {
   p = new Generic<u32>(value=23)
 
-  reaction(startup) -> p.in {= ctx.set(p__in, 23); =}
+  reaction(startup) -> p.in {=
+    ctx.set(p__in, 23);
+  =}
 }
diff --git a/test/Rust/src/generics/CtorParamGenericInst.lf b/test/Rust/src/generics/CtorParamGenericInst.lf
index 1471178a17..de02ca156e 100644
--- a/test/Rust/src/generics/CtorParamGenericInst.lf
+++ b/test/Rust/src/generics/CtorParamGenericInst.lf
@@ -2,8 +2,9 @@
 // argument list of a further child instance.
 target Rust
 
-reactor Generic2<{= T: Default + Eq + Sync + std::fmt::Debug + Send + 'static =}>(
-    value: T = {= Default::default() =}) {
+reactor Generic2<{=
+  T: Default + Eq + Sync + std::fmt::Debug + Send + 'static
+=}>(value: T = {= Default::default() =}) {
   input in: T
   state v: T = value
 
@@ -15,8 +16,9 @@ reactor Generic2<{= T: Default + Eq + Sync + std::fmt::Debug + Send + 'static =}
   =}
 }
 
-reactor Generic<{= T: Default + Eq + Sync + std::fmt::Debug + Copy + Send + 'static =}>(
-    value: T = {= Default::default() =}) {
+reactor Generic<{=
+  T: Default + Eq + Sync + std::fmt::Debug + Copy + Send + 'static
+=}>(value: T = {= Default::default() =}) {
   input in: T
 
   inner = new Generic2<T>(value=value)
@@ -27,5 +29,7 @@ reactor Generic<{= T: Default + Eq + Sync + std::fmt::Debug + Copy + Send + 'sta
 main reactor {
   p = new Generic<u32>(value=23)
 
-  reaction(startup) -> p.in {= ctx.set(p__in, 23); =}
+  reaction(startup) -> p.in {=
+    ctx.set(p__in, 23);
+  =}
 }
diff --git a/test/Rust/src/generics/GenericComplexType.lf b/test/Rust/src/generics/GenericComplexType.lf
index d427f65b25..6e534117c3 100644
--- a/test/Rust/src/generics/GenericComplexType.lf
+++ b/test/Rust/src/generics/GenericComplexType.lf
@@ -18,5 +18,7 @@ reactor R {
 main reactor {
   p = new R()
 
-  reaction(startup) -> p.in {= ctx.set(p__in, vec![delay!(20 ms)]); =}
+  reaction(startup) -> p.in {=
+    ctx.set(p__in, vec![delay!(20 ms)]);
+  =}
 }
diff --git a/test/Rust/src/generics/GenericReactor.lf b/test/Rust/src/generics/GenericReactor.lf
index eaff12a4c9..251fefcc69 100644
--- a/test/Rust/src/generics/GenericReactor.lf
+++ b/test/Rust/src/generics/GenericReactor.lf
@@ -1,7 +1,9 @@
 // Tests a port connection between (input of self -> input of child)
 target Rust
 
-reactor Box<{= T: Sync =}> {
+reactor Box<{=
+  T: Sync
+=}> {
   input inp: T
   output out: T
 
@@ -16,9 +18,13 @@ main reactor {
 
   box0.out -> box1.inp
 
-  reaction(startup) -> box0.inp {= ctx.set(box0__inp, 444); =}
+  reaction(startup) -> box0.inp {=
+    ctx.set(box0__inp, 444);
+  =}
 
-  reaction(box1.out) {= assert!(ctx.get_elapsed_logical_time().is_zero()); self.done = true; =}
+  reaction(box1.out) {=
+    assert!(ctx.get_elapsed_logical_time().is_zero()); self.done = true;
+  =}
 
   reaction(shutdown) {=
     assert!(self.done, "reaction was not executed");
diff --git a/test/Rust/src/lib/Imported.lf b/test/Rust/src/lib/Imported.lf
index b72cfdf533..bf42bce770 100644
--- a/test/Rust/src/lib/Imported.lf
+++ b/test/Rust/src/lib/Imported.lf
@@ -8,5 +8,7 @@ reactor Imported {
   input x: u32
   a = new ImportedAgain()
 
-  reaction(x) -> a.x {= ctx.set(a__x, ctx.get(x).unwrap()); =}
+  reaction(x) -> a.x {=
+    ctx.set(a__x, ctx.get(x).unwrap());
+  =}
 }
diff --git a/test/Rust/src/multiport/ConnectionToSelfBank.lf b/test/Rust/src/multiport/ConnectionToSelfBank.lf
index c396bcb5e6..d4b883de8c 100644
--- a/test/Rust/src/multiport/ConnectionToSelfBank.lf
+++ b/test/Rust/src/multiport/ConnectionToSelfBank.lf
@@ -6,7 +6,9 @@ reactor Node(bank_index: usize = 0, num_nodes: usize = 4) {
   state bank_index = bank_index
   state num_nodes = num_nodes
 
-  reaction(startup) -> out {= ctx.set(out, self.bank_index); =}
+  reaction(startup) -> out {=
+    ctx.set(out, self.bank_index);
+  =}
 
   reaction(in) {=
     let count = r#in.iterate_set().count();
diff --git a/test/Rust/src/multiport/CycledLhs_SelfLoop.lf b/test/Rust/src/multiport/CycledLhs_SelfLoop.lf
index efa3e13c4e..7d41b8ea3e 100644
--- a/test/Rust/src/multiport/CycledLhs_SelfLoop.lf
+++ b/test/Rust/src/multiport/CycledLhs_SelfLoop.lf
@@ -10,9 +10,13 @@ reactor Test {
   logical action act: u32
   state last: u32 = 1
 
-  reaction(startup) -> act {= ctx.schedule_with_v(act, Some(1), after!(1 us)); =}
+  reaction(startup) -> act {=
+    ctx.schedule_with_v(act, Some(1), after!(1 us));
+  =}
 
-  reaction(act) -> out {= ctx.set_opt(out, ctx.get(act)); =}
+  reaction(act) -> out {=
+    ctx.set_opt(out, ctx.get(act));
+  =}
 
   reaction(in) -> act {=
     let sum: u32 = r#in.iterate_values().sum();
diff --git a/test/Rust/src/multiport/CycledLhs_Single.lf b/test/Rust/src/multiport/CycledLhs_Single.lf
index 32c406b692..4d8931e9d7 100644
--- a/test/Rust/src/multiport/CycledLhs_Single.lf
+++ b/test/Rust/src/multiport/CycledLhs_Single.lf
@@ -7,10 +7,14 @@ target Rust {
 reactor Test {
   output[2] out: u32
   input[4] in: u32
-  logical action act: {= (u32, u32) =}
+  logical action act: {=
+    (u32, u32)
+  =}
   state last: u32 = 1
 
-  reaction(startup) -> act {= ctx.schedule_with_v(act, Some((0, 1)), after!(1 us)); =}
+  reaction(startup) -> act {=
+    ctx.schedule_with_v(act, Some((0, 1)), after!(1 us));
+  =}
 
   reaction(act) -> out {=
     let (a, b) = ctx.get(act).unwrap();
diff --git a/test/Rust/src/multiport/FullyConnected.lf b/test/Rust/src/multiport/FullyConnected.lf
index e83a0cac3d..50fea84f18 100644
--- a/test/Rust/src/multiport/FullyConnected.lf
+++ b/test/Rust/src/multiport/FullyConnected.lf
@@ -5,7 +5,9 @@ reactor Left(bank_index: usize = 0) {
   output out: usize
   state bank_index = bank_index
 
-  reaction(startup) -> out {= ctx.set(out, self.bank_index); =}
+  reaction(startup) -> out {=
+    ctx.set(out, self.bank_index);
+  =}
 }
 
 reactor Right(bank_index: usize = 0, num_nodes: usize = 4) {
diff --git a/test/Rust/src/multiport/MultiportFromBank.lf b/test/Rust/src/multiport/MultiportFromBank.lf
index cf66939562..3e0afdaedd 100644
--- a/test/Rust/src/multiport/MultiportFromBank.lf
+++ b/test/Rust/src/multiport/MultiportFromBank.lf
@@ -7,7 +7,9 @@ reactor Source(bank_index: usize = 0) {
   output out: usize
   state bank_index = bank_index
 
-  reaction(startup) -> out {= ctx.set(out, self.bank_index); =}
+  reaction(startup) -> out {=
+    ctx.set(out, self.bank_index);
+  =}
 }
 
 reactor Destination(port_width: usize = 2) {
diff --git a/test/Rust/src/multiport/ReadOutputOfContainedBank.lf b/test/Rust/src/multiport/ReadOutputOfContainedBank.lf
index 2d97ad74d7..4b47f97d3f 100644
--- a/test/Rust/src/multiport/ReadOutputOfContainedBank.lf
+++ b/test/Rust/src/multiport/ReadOutputOfContainedBank.lf
@@ -6,7 +6,9 @@ reactor Contained(bank_index: usize = 0) {
 
   output out: usize
 
-  reaction(startup) -> out {= ctx.set(out, 42 * self.bank_index); =}
+  reaction(startup) -> out {=
+    ctx.set(out, 42 * self.bank_index);
+  =}
 }
 
 main reactor {
diff --git a/test/Rust/src/multiport/WidthWithParameter.lf b/test/Rust/src/multiport/WidthWithParameter.lf
index 572da15222..4152e585fc 100644
--- a/test/Rust/src/multiport/WidthWithParameter.lf
+++ b/test/Rust/src/multiport/WidthWithParameter.lf
@@ -13,5 +13,7 @@ reactor Some(value: usize = 30) {
 main reactor {
   some = new Some(value=20)
 
-  reaction(some.finished) {= println!("success"); =}
+  reaction(some.finished) {=
+    println!("success");
+  =}
 }
diff --git a/test/Rust/src/multiport/WriteInputOfContainedBank.lf b/test/Rust/src/multiport/WriteInputOfContainedBank.lf
index f44914bd5d..01a96e02bc 100644
--- a/test/Rust/src/multiport/WriteInputOfContainedBank.lf
+++ b/test/Rust/src/multiport/WriteInputOfContainedBank.lf
@@ -14,7 +14,9 @@ reactor Contained(bank_index: usize = 0) {
     self.count += 1;
   =}
 
-  reaction(shutdown) {= assert_eq!(self.count, 1, "One of the reactions failed to trigger"); =}
+  reaction(shutdown) {=
+    assert_eq!(self.count, 1, "One of the reactions failed to trigger");
+  =}
 }
 
 main reactor {
diff --git a/test/Rust/src/target/CargoDependencyOnRuntime.lf b/test/Rust/src/target/CargoDependencyOnRuntime.lf
index 26aa2c5eb3..946ba7ab04 100644
--- a/test/Rust/src/target/CargoDependencyOnRuntime.lf
+++ b/test/Rust/src/target/CargoDependencyOnRuntime.lf
@@ -8,5 +8,7 @@ target Rust {
 }
 
 main reactor {
-  reaction(startup) {= println!("success") =}
+  reaction(startup) {=
+    println!("success")
+  =}
 }
diff --git a/test/Rust/src/target/CliFeature.lf b/test/Rust/src/target/CliFeature.lf
index a28f8d2e3d..d54f09c9cf 100644
--- a/test/Rust/src/target/CliFeature.lf
+++ b/test/Rust/src/target/CliFeature.lf
@@ -5,5 +5,7 @@ target Rust {
 
 // todo allow test framework to pass CLI arguments.
 main reactor CliFeature(size: u32 = 4, t: time = 4 sec) {
-  reaction(startup) {= println!("success"); =}
+  reaction(startup) {=
+    println!("success");
+  =}
 }
diff --git a/test/TypeScript/src/ActionDelay.lf b/test/TypeScript/src/ActionDelay.lf
index 18949417d3..f2c723b601 100644
--- a/test/TypeScript/src/ActionDelay.lf
+++ b/test/TypeScript/src/ActionDelay.lf
@@ -12,13 +12,17 @@ reactor GeneratedDelay {
     actions.act.schedule(0, null);
   =}
 
-  reaction(act) -> y_out {= y_out = y_state; =}
+  reaction(act) -> y_out {=
+    y_out = y_state;
+  =}
 }
 
 reactor Source {
   output out: number
 
-  reaction(startup) -> out {= out = 1; =}
+  reaction(startup) -> out {=
+    out = 1;
+  =}
 }
 
 reactor Sink {
diff --git a/test/TypeScript/src/ActionWithNoReaction.lf b/test/TypeScript/src/ActionWithNoReaction.lf
index 14d6aa8801..c8055713db 100644
--- a/test/TypeScript/src/ActionWithNoReaction.lf
+++ b/test/TypeScript/src/ActionWithNoReaction.lf
@@ -32,5 +32,7 @@ main reactor {
   timer t(0, 1 sec)
   f.y -> p.x after 10 msec
 
-  reaction(t) -> f.x {= f.x = 42; =}
+  reaction(t) -> f.x {=
+    f.x = 42;
+  =}
 }
diff --git a/test/TypeScript/src/After.lf b/test/TypeScript/src/After.lf
index 30edbdb554..f65ab6bbb3 100644
--- a/test/TypeScript/src/After.lf
+++ b/test/TypeScript/src/After.lf
@@ -8,7 +8,9 @@ reactor Foo {
   input x: number
   output y: number
 
-  reaction(x) -> y {= y = 2 * (x as number); =}
+  reaction(x) -> y {=
+    y = 2 * (x as number);
+  =}
 }
 
 reactor Print {
@@ -33,5 +35,7 @@ main reactor {
   timer t(0, 1 sec)
   f.y -> p.x after 10 msec
 
-  reaction(t) -> f.x {= f.x = 42; =}
+  reaction(t) -> f.x {=
+    f.x = 42;
+  =}
 }
diff --git a/test/TypeScript/src/ArrayAsParameter.lf b/test/TypeScript/src/ArrayAsParameter.lf
index ef9ba9f414..150213d47c 100644
--- a/test/TypeScript/src/ArrayAsParameter.lf
+++ b/test/TypeScript/src/ArrayAsParameter.lf
@@ -1,7 +1,9 @@
 // Source has an array as a parameter, the elements of which it passes to Print.
 target TypeScript
 
-reactor Source(sequence: {= Array<number> =} = {= [0, 1, 2] =}) {
+reactor Source(sequence: {=
+  Array<number>
+=} = {= [0, 1, 2] =}) {
   output out: number
   state count: number = 0
   logical action next
diff --git a/test/TypeScript/src/ArrayAsType.lf b/test/TypeScript/src/ArrayAsType.lf
index c26e3fe02e..f40d6d91e0 100644
--- a/test/TypeScript/src/ArrayAsType.lf
+++ b/test/TypeScript/src/ArrayAsType.lf
@@ -3,7 +3,9 @@
 target TypeScript
 
 reactor Source {
-  output out: {= Array<number> =}
+  output out: {=
+    Array<number>
+  =}
 
   reaction(startup) -> out {=
     let toSend = [];
@@ -16,7 +18,9 @@ reactor Source {
 
 // The scale parameter is just for testing.
 reactor Print(scale: number = 1) {
-  input x: {= Array<number> =}
+  input x: {=
+    Array<number>
+  =}
 
   reaction(x) {=
     let count = 0;     // For testing.
diff --git a/test/TypeScript/src/ArrayPrint.lf b/test/TypeScript/src/ArrayPrint.lf
index 3c94b00b34..7967efb290 100644
--- a/test/TypeScript/src/ArrayPrint.lf
+++ b/test/TypeScript/src/ArrayPrint.lf
@@ -3,7 +3,9 @@
 target TypeScript
 
 reactor Source {
-  output out: {= Array<number> =}
+  output out: {=
+    Array<number>
+  =}
 
   reaction(startup) -> out {=
     let toSend = new Array<number>();
@@ -16,7 +18,9 @@ reactor Source {
 
 // The scale parameter is just for testing.
 reactor Print(scale: number = 1) {
-  input x: {= Array<number> =}
+  input x: {=
+    Array<number>
+  =}
 
   reaction(x) {=
     let count = 0;     // For testing.
diff --git a/test/TypeScript/src/ArrayScale.lf b/test/TypeScript/src/ArrayScale.lf
index 2ddfa951f3..45c982f493 100644
--- a/test/TypeScript/src/ArrayScale.lf
+++ b/test/TypeScript/src/ArrayScale.lf
@@ -6,8 +6,12 @@ target TypeScript
 import Source, Print from "ArrayPrint.lf"
 
 reactor Scale(scale: number = 2) {
-  mutable input x: {= Array<number> =}
-  output out: {= Array<number> =}
+  mutable input x: {=
+    Array<number>
+  =}
+  output out: {=
+    Array<number>
+  =}
 
   reaction(x) -> out {=
     x = x as Array<number>;
diff --git a/test/TypeScript/src/DanglingOutput.lf b/test/TypeScript/src/DanglingOutput.lf
index 8c9f884dd0..a55312ca40 100644
--- a/test/TypeScript/src/DanglingOutput.lf
+++ b/test/TypeScript/src/DanglingOutput.lf
@@ -6,7 +6,9 @@ reactor Source {
   output out: number
   timer t
 
-  reaction(t) -> out {= out = 1; =}
+  reaction(t) -> out {=
+    out = 1;
+  =}
 }
 
 reactor Gain {
diff --git a/test/TypeScript/src/DelayInt.lf b/test/TypeScript/src/DelayInt.lf
index 4cf2b5a8cc..1ff1df7871 100644
--- a/test/TypeScript/src/DelayInt.lf
+++ b/test/TypeScript/src/DelayInt.lf
@@ -7,7 +7,9 @@ reactor Delay(delay: time = 100 msec) {
   output out: number
   logical action a: number
 
-  reaction(x) -> a {= actions.a.schedule( delay, x as number); =}
+  reaction(x) -> a {=
+    actions.a.schedule( delay, x as number);
+  =}
 
   reaction(a) -> out {=
     if (a !== null){
@@ -54,5 +56,7 @@ main reactor DelayInt {
   t = new Test()
   d.out -> t.x
 
-  reaction(startup) -> d.x {= d.x = 42; =}
+  reaction(startup) -> d.x {=
+    d.x = 42;
+  =}
 }
diff --git a/test/TypeScript/src/DelayedAction.lf b/test/TypeScript/src/DelayedAction.lf
index 1979003351..de433faf58 100644
--- a/test/TypeScript/src/DelayedAction.lf
+++ b/test/TypeScript/src/DelayedAction.lf
@@ -7,7 +7,9 @@ main reactor DelayedAction {
   logical action a
   state count: number = 0
 
-  reaction(t) -> a {= actions.a.schedule(TimeValue.msec(100), null); =}
+  reaction(t) -> a {=
+    actions.a.schedule(TimeValue.msec(100), null);
+  =}
 
   reaction(a) {=
     let elapsedLogical = util.getElapsedLogicalTime();
diff --git a/test/TypeScript/src/DelayedReaction.lf b/test/TypeScript/src/DelayedReaction.lf
index 66a721069b..9a1e31585e 100644
--- a/test/TypeScript/src/DelayedReaction.lf
+++ b/test/TypeScript/src/DelayedReaction.lf
@@ -5,7 +5,9 @@ reactor Source {
   output out: number
   timer t
 
-  reaction(t) -> out {= out = 1; =}
+  reaction(t) -> out {=
+    out = 1;
+  =}
 }
 
 reactor Sink {
diff --git a/test/TypeScript/src/Determinism.lf b/test/TypeScript/src/Determinism.lf
index 5b9d6de201..ed110b0334 100644
--- a/test/TypeScript/src/Determinism.lf
+++ b/test/TypeScript/src/Determinism.lf
@@ -4,7 +4,9 @@ reactor Source {
   output y: number
   timer t
 
-  reaction(t) -> y {= y = 1; =}
+  reaction(t) -> y {=
+    y = 1;
+  =}
 }
 
 reactor Destination {
@@ -30,7 +32,9 @@ reactor Pass {
   input x: number
   output y: number
 
-  reaction(x) -> y {= y = x as number; =}
+  reaction(x) -> y {=
+    y = x as number;
+  =}
 }
 
 main reactor Determinism {
diff --git a/test/TypeScript/src/Gain.lf b/test/TypeScript/src/Gain.lf
index bcb17bd4eb..c7b77cd31e 100644
--- a/test/TypeScript/src/Gain.lf
+++ b/test/TypeScript/src/Gain.lf
@@ -5,7 +5,9 @@ reactor Scale(scale: number = 2) {
   input x: number
   output y: number
 
-  reaction(x) -> y {= y = (x as number) * scale; =}
+  reaction(x) -> y {=
+    y = (x as number) * scale;
+  =}
 }
 
 reactor Test {
@@ -34,5 +36,7 @@ main reactor Gain {
   d = new Test()
   g.y -> d.x
 
-  reaction(startup) -> g.x {= g.x = 1; =}
+  reaction(startup) -> g.x {=
+    g.x = 1;
+  =}
 }
diff --git a/test/TypeScript/src/HelloWorld.lf b/test/TypeScript/src/HelloWorld.lf
index 2fe705929b..2862c01297 100644
--- a/test/TypeScript/src/HelloWorld.lf
+++ b/test/TypeScript/src/HelloWorld.lf
@@ -3,7 +3,9 @@ target TypeScript
 reactor HelloWorldInside {
   timer t
 
-  reaction(t) {= console.log("Hello World."); =}
+  reaction(t) {=
+    console.log("Hello World.");
+  =}
 }
 
 main reactor HelloWorld {
diff --git a/test/TypeScript/src/Hierarchy2.lf b/test/TypeScript/src/Hierarchy2.lf
index 017c507b73..b401baf186 100644
--- a/test/TypeScript/src/Hierarchy2.lf
+++ b/test/TypeScript/src/Hierarchy2.lf
@@ -8,7 +8,9 @@ reactor Source {
   output out: number
   timer t(0, 1 sec)
 
-  reaction(t) -> out {= out = 1; =}
+  reaction(t) -> out {=
+    out = 1;
+  =}
 }
 
 reactor Count {
diff --git a/test/TypeScript/src/Import.lf b/test/TypeScript/src/Import.lf
index aecf259f71..4fc1e28e93 100644
--- a/test/TypeScript/src/Import.lf
+++ b/test/TypeScript/src/Import.lf
@@ -9,5 +9,7 @@ main reactor Import {
   timer t
   a = new Imported()
 
-  reaction(t) -> a.x {= a.x = 42; =}
+  reaction(t) -> a.x {=
+    a.x = 42;
+  =}
 }
diff --git a/test/TypeScript/src/Microsteps.lf b/test/TypeScript/src/Microsteps.lf
index c5412a6b06..96ce4da40d 100644
--- a/test/TypeScript/src/Microsteps.lf
+++ b/test/TypeScript/src/Microsteps.lf
@@ -35,5 +35,7 @@ main reactor Microsteps {
     actions.repeat.schedule(0, null);
   =}
 
-  reaction(repeat) -> d.y {= d.y = 1; =}
+  reaction(repeat) -> d.y {=
+    d.y = 1;
+  =}
 }
diff --git a/test/TypeScript/src/Minimal.lf b/test/TypeScript/src/Minimal.lf
index 54a1aa7ae9..b0f75adccc 100644
--- a/test/TypeScript/src/Minimal.lf
+++ b/test/TypeScript/src/Minimal.lf
@@ -4,5 +4,7 @@ target TypeScript
 main reactor Minimal {
   timer t
 
-  reaction(t) {= console.log("Hello World."); =}
+  reaction(t) {=
+    console.log("Hello World.");
+  =}
 }
diff --git a/test/TypeScript/src/MovingAverage.lf b/test/TypeScript/src/MovingAverage.lf
index f99e436ab7..38ddde1504 100644
--- a/test/TypeScript/src/MovingAverage.lf
+++ b/test/TypeScript/src/MovingAverage.lf
@@ -17,7 +17,9 @@ reactor Source {
 }
 
 reactor MovingAverageImpl {
-  state delay_line: {= Array<number> =} = {= [0.0, 0.0, 0.0] =}
+  state delay_line: {=
+    Array<number>
+  =} = {= [0.0, 0.0, 0.0] =}
   state index: number = 0
   input x: number
   output out: number
diff --git a/test/TypeScript/src/MultipleContained.lf b/test/TypeScript/src/MultipleContained.lf
index a3ae63b2cf..cabacf59ea 100644
--- a/test/TypeScript/src/MultipleContained.lf
+++ b/test/TypeScript/src/MultipleContained.lf
@@ -6,7 +6,9 @@ reactor Contained {
   input in1: number
   input in2: number
 
-  reaction(startup) -> trigger {= trigger = 42; =}
+  reaction(startup) -> trigger {=
+    trigger = 42;
+  =}
 
   reaction(in1) {=
     in1 = in1 as number;
diff --git a/test/TypeScript/src/ParameterizedState.lf b/test/TypeScript/src/ParameterizedState.lf
index 2904b30106..f7ef0dd4d2 100644
--- a/test/TypeScript/src/ParameterizedState.lf
+++ b/test/TypeScript/src/ParameterizedState.lf
@@ -3,7 +3,9 @@ target TypeScript
 reactor Foo(bar: number = 42) {
   state baz = bar
 
-  reaction(startup) {= console.log("Baz: " + baz); =}
+  reaction(startup) {=
+    console.log("Baz: " + baz);
+  =}
 }
 
 main reactor {
diff --git a/test/TypeScript/src/PhysicalConnection.lf b/test/TypeScript/src/PhysicalConnection.lf
index 495d7bc0e0..8767075ce7 100644
--- a/test/TypeScript/src/PhysicalConnection.lf
+++ b/test/TypeScript/src/PhysicalConnection.lf
@@ -4,7 +4,9 @@ target TypeScript
 reactor Source {
   output y: number
 
-  reaction(startup) -> y {= y = 42 =}
+  reaction(startup) -> y {=
+    y = 42
+  =}
 }
 
 reactor Destination {
diff --git a/test/TypeScript/src/ReadOutputOfContainedReactor.lf b/test/TypeScript/src/ReadOutputOfContainedReactor.lf
index 9009141181..11c8ebd2e4 100644
--- a/test/TypeScript/src/ReadOutputOfContainedReactor.lf
+++ b/test/TypeScript/src/ReadOutputOfContainedReactor.lf
@@ -4,7 +4,9 @@ target TypeScript
 reactor Contained {
   output out: number
 
-  reaction(startup) -> out {= out = 42; =}
+  reaction(startup) -> out {=
+    out = 42;
+  =}
 }
 
 main reactor ReadOutputOfContainedReactor {
diff --git a/test/TypeScript/src/Schedule.lf b/test/TypeScript/src/Schedule.lf
index a6b48a14fb..cd4f7e85e7 100644
--- a/test/TypeScript/src/Schedule.lf
+++ b/test/TypeScript/src/Schedule.lf
@@ -5,7 +5,9 @@ reactor ScheduleLogicalAction {
   input x: number
   logical action a
 
-  reaction(x) -> a {= actions.a.schedule(TimeValue.msec(200), null) =}
+  reaction(x) -> a {=
+    actions.a.schedule(TimeValue.msec(200), null)
+  =}
 
   reaction(a) {=
     let elapsedTime = util.getElapsedLogicalTime();
@@ -22,5 +24,7 @@ main reactor {
   a = new ScheduleLogicalAction()
   timer t
 
-  reaction(t) -> a.x {= a.x = 1; =}
+  reaction(t) -> a.x {=
+    a.x = 1;
+  =}
 }
diff --git a/test/TypeScript/src/ScheduleLogicalAction.lf b/test/TypeScript/src/ScheduleLogicalAction.lf
index b165588a1b..5340847280 100644
--- a/test/TypeScript/src/ScheduleLogicalAction.lf
+++ b/test/TypeScript/src/ScheduleLogicalAction.lf
@@ -17,7 +17,9 @@ reactor foo {
     actions.a.schedule(TimeValue.msec(500), null);
   =}
 
-  reaction(a) -> y {= y = -42; =}
+  reaction(a) -> y {=
+    y = -42;
+  =}
 }
 
 reactor print {
@@ -42,5 +44,7 @@ main reactor {
   timer t(0, 1 sec)
   f.y -> p.x
 
-  reaction(t) -> f.x {= f.x = 42; =}
+  reaction(t) -> f.x {=
+    f.x = 42;
+  =}
 }
diff --git a/test/TypeScript/src/SendingInside2.lf b/test/TypeScript/src/SendingInside2.lf
index 0271112da6..e1e8f9dadc 100644
--- a/test/TypeScript/src/SendingInside2.lf
+++ b/test/TypeScript/src/SendingInside2.lf
@@ -15,5 +15,7 @@ main reactor SendingInside2 {
   timer t
   p = new Printer()
 
-  reaction(t) -> p.x {= p.x = 1; =}
+  reaction(t) -> p.x {=
+    p.x = 1;
+  =}
 }
diff --git a/test/TypeScript/src/SendsPointerTest.lf b/test/TypeScript/src/SendsPointerTest.lf
index 2808d2a87b..68cf14b4cd 100644
--- a/test/TypeScript/src/SendsPointerTest.lf
+++ b/test/TypeScript/src/SendsPointerTest.lf
@@ -3,7 +3,9 @@
 target TypeScript
 
 reactor SendsPointer {
-  output out: {= {value: number} =}
+  output out: {=
+    {value: number}
+  =}
 
   reaction(startup) -> out {=
     let my_object = { value: 42 };
@@ -12,8 +14,12 @@ reactor SendsPointer {
 }
 
 // expected parameter is for testing.
-reactor Print(expected: {= {value: number} =} = {= { value: 42 } =}) {
-  input x: {= {value: number} =}
+reactor Print(expected: {=
+  {value: number}
+=} = {= { value: 42 } =}) {
+  input x: {=
+    {value: number}
+  =}
 
   reaction(x) {=
     x = x as {value: number};
diff --git a/test/TypeScript/src/SlowingClock.lf b/test/TypeScript/src/SlowingClock.lf
index 522778f2d7..0d0fb70a1e 100644
--- a/test/TypeScript/src/SlowingClock.lf
+++ b/test/TypeScript/src/SlowingClock.lf
@@ -8,7 +8,9 @@ main reactor SlowingClock {
   state interval: time = 100 msec
   state expected_time: time = 100 msec
 
-  reaction(startup) -> a {= actions.a.schedule(0, null); =}
+  reaction(startup) -> a {=
+    actions.a.schedule(0, null);
+  =}
 
   reaction(a) -> a {=
     let elapsed_logical_time : TimeValue = util.getElapsedLogicalTime();
diff --git a/test/TypeScript/src/Stride.lf b/test/TypeScript/src/Stride.lf
index a8413a6aee..03b14b71e2 100644
--- a/test/TypeScript/src/Stride.lf
+++ b/test/TypeScript/src/Stride.lf
@@ -19,7 +19,9 @@ reactor Count(stride: number = 1) {
 reactor Display {
   input x: number
 
-  reaction(x) {= console.log("Received: " + x); =}
+  reaction(x) {=
+    console.log("Received: " + x);
+  =}
 }
 
 main reactor Stride {
diff --git a/test/TypeScript/src/TimeLimit.lf b/test/TypeScript/src/TimeLimit.lf
index 42ec3391ae..0b6985d985 100644
--- a/test/TypeScript/src/TimeLimit.lf
+++ b/test/TypeScript/src/TimeLimit.lf
@@ -37,5 +37,7 @@ main reactor TimeLimit(period: time = 1 msec) {
   d = new Destination()
   c.y -> d.x
 
-  reaction(stop) {= util.requestStop() =}
+  reaction(stop) {=
+    util.requestStop()
+  =}
 }
diff --git a/test/TypeScript/src/TimeState.lf b/test/TypeScript/src/TimeState.lf
index f71374fd59..1566c891bd 100644
--- a/test/TypeScript/src/TimeState.lf
+++ b/test/TypeScript/src/TimeState.lf
@@ -3,7 +3,9 @@ target TypeScript
 reactor Foo(bar: number = 42) {
   state baz: time = 500 msec
 
-  reaction(startup) {= console.log("Baz: " + baz); =}
+  reaction(startup) {=
+    console.log("Baz: " + baz);
+  =}
 }
 
 main reactor {
diff --git a/test/TypeScript/src/Wcet.lf b/test/TypeScript/src/Wcet.lf
index b715dfd9a4..6c517a9d78 100644
--- a/test/TypeScript/src/Wcet.lf
+++ b/test/TypeScript/src/Wcet.lf
@@ -31,7 +31,9 @@ reactor Work {
 reactor Print {
   input x: number
 
-  reaction(x) {= console.log("Received: " + x); =}
+  reaction(x) {=
+    console.log("Received: " + x);
+  =}
 }
 
 main reactor Wcet {
diff --git a/test/TypeScript/src/federated/DistributedDoublePort.lf b/test/TypeScript/src/federated/DistributedDoublePort.lf
index a6bde59ed5..90365e1c50 100644
--- a/test/TypeScript/src/federated/DistributedDoublePort.lf
+++ b/test/TypeScript/src/federated/DistributedDoublePort.lf
@@ -21,9 +21,13 @@ reactor CountMicrostep {
   logical action act: number
   timer t(0, 1 sec)
 
-  reaction(t) -> act {= actions.act.schedule(0, count++); =}
+  reaction(t) -> act {=
+    actions.act.schedule(0, count++);
+  =}
 
-  reaction(act) -> out {= out = act; =}
+  reaction(act) -> out {=
+    out = act;
+  =}
 }
 
 reactor Print {
@@ -39,7 +43,9 @@ reactor Print {
     }
   =}
 
-  reaction(shutdown) {= console.log("SUCCESS: messages were at least one microstep apart."); =}
+  reaction(shutdown) {=
+    console.log("SUCCESS: messages were at least one microstep apart.");
+  =}
 }
 
 federated reactor DistributedDoublePort {
diff --git a/test/TypeScript/src/federated/HelloDistributed.lf b/test/TypeScript/src/federated/HelloDistributed.lf
index 4936cfae42..84b8b895b2 100644
--- a/test/TypeScript/src/federated/HelloDistributed.lf
+++ b/test/TypeScript/src/federated/HelloDistributed.lf
@@ -21,7 +21,9 @@ reactor Destination {
   input inp: string
   state received: boolean = false
 
-  reaction(startup) {= console.log("Destination started."); =}
+  reaction(startup) {=
+    console.log("Destination started.");
+  =}
 
   reaction(inp) {=
     console.log(`At logical time ${util.getElapsedLogicalTime()}, destination received: ` + inp);
@@ -44,5 +46,7 @@ federated reactor HelloDistributed at localhost {
   d = new Destination()  // Reactor d is in federate Destination
   s.out -> d.inp         // This version preserves the timestamp.
 
-  reaction(startup) {= console.log("Printing something in top-level federated reactor."); =}
+  reaction(startup) {=
+    console.log("Printing something in top-level federated reactor.");
+  =}
 }
diff --git a/test/TypeScript/src/federated/SpuriousDependency.lf b/test/TypeScript/src/federated/SpuriousDependency.lf
index 39da8f0ea5..15e2b527c7 100644
--- a/test/TypeScript/src/federated/SpuriousDependency.lf
+++ b/test/TypeScript/src/federated/SpuriousDependency.lf
@@ -35,7 +35,9 @@ reactor Check {
 
   state count: number = 0
 
-  reaction(inp) {= console.log("count is now " + ++count); =}
+  reaction(inp) {=
+    console.log("count is now " + ++count);
+  =}
 
   reaction(shutdown) {=
     console.log("******* Shutdown invoked.");
@@ -55,5 +57,7 @@ federated reactor {
 
   t1.out0 -> check.inp
 
-  reaction(startup) -> t0.in1 {= t0.in1 = 0; =}
+  reaction(startup) -> t0.in1 {=
+    t0.in1 = 0;
+  =}
 }
diff --git a/test/TypeScript/src/federated/StopAtShutdown.lf b/test/TypeScript/src/federated/StopAtShutdown.lf
index 200e773e82..c8550147b6 100644
--- a/test/TypeScript/src/federated/StopAtShutdown.lf
+++ b/test/TypeScript/src/federated/StopAtShutdown.lf
@@ -10,20 +10,30 @@ target TypeScript {
 reactor A {
   input inp: number
 
-  reaction(startup) {= console.log("Hello World!"); =}
+  reaction(startup) {=
+    console.log("Hello World!");
+  =}
 
-  reaction(inp) {= console.log("Got it"); =}
+  reaction(inp) {=
+    console.log("Got it");
+  =}
 
-  reaction(shutdown) {= util.requestStop(); =}
+  reaction(shutdown) {=
+    util.requestStop();
+  =}
 }
 
 reactor B {
   output out: number
   timer t(1 sec)
 
-  reaction(t) -> out {= out = 1; =}
+  reaction(t) -> out {=
+    out = 1;
+  =}
 
-  reaction(shutdown) {= util.requestStop(); =}
+  reaction(shutdown) {=
+    util.requestStop();
+  =}
 }
 
 federated reactor {
diff --git a/test/TypeScript/src/federated/TopLevelArtifacts.lf b/test/TypeScript/src/federated/TopLevelArtifacts.lf
index b7d59ae4b4..df1edae247 100644
--- a/test/TypeScript/src/federated/TopLevelArtifacts.lf
+++ b/test/TypeScript/src/federated/TopLevelArtifacts.lf
@@ -23,14 +23,18 @@ federated reactor {
   tc = new TestCount()
   c.out -> tc.inp
 
-  reaction(startup) {= successes++; =}
+  reaction(startup) {=
+    successes++;
+  =}
 
   reaction(t) -> act {=
     successes++;
     actions.act.schedule(0, null);
   =}
 
-  reaction(act) {= successes++; =}
+  reaction(act) {=
+    successes++;
+  =}
 
   reaction(shutdown) {=
     if (successes != 3) {
diff --git a/test/TypeScript/src/lib/Count.lf b/test/TypeScript/src/lib/Count.lf
index 88326db3f1..de9cf6b98a 100644
--- a/test/TypeScript/src/lib/Count.lf
+++ b/test/TypeScript/src/lib/Count.lf
@@ -5,5 +5,7 @@ reactor Count(offset: time = 0, period: time = 1 sec) {
   timer t(offset, period)
   state count: number = 1
 
-  reaction(t) -> out {= out = count++; =}
+  reaction(t) -> out {=
+    out = count++;
+  =}
 }
diff --git a/test/TypeScript/src/lib/Imported.lf b/test/TypeScript/src/lib/Imported.lf
index 9b8506f39b..cb6072a7c2 100644
--- a/test/TypeScript/src/lib/Imported.lf
+++ b/test/TypeScript/src/lib/Imported.lf
@@ -10,5 +10,7 @@ reactor Imported {
   input x: number
   a = new ImportedAgain()
 
-  reaction(x) -> a.x {= a.x = (x as number); =}
+  reaction(x) -> a.x {=
+    a.x = (x as number);
+  =}
 }
diff --git a/test/TypeScript/src/lib/InternalDelay.lf b/test/TypeScript/src/lib/InternalDelay.lf
index 7b734baf31..5ee717b2bc 100644
--- a/test/TypeScript/src/lib/InternalDelay.lf
+++ b/test/TypeScript/src/lib/InternalDelay.lf
@@ -6,7 +6,11 @@ reactor InternalDelay(delay: TimeValue = 10 msec) {
   output out: number
   logical action d: number
 
-  reaction(inp) -> d {= actions.d.schedule(delay, inp as number); =}
+  reaction(inp) -> d {=
+    actions.d.schedule(delay, inp as number);
+  =}
 
-  reaction(d) -> out {= out = d; =}
+  reaction(d) -> out {=
+    out = d;
+  =}
 }
diff --git a/test/TypeScript/src/multiport/BankSelfBroadcast.lf b/test/TypeScript/src/multiport/BankSelfBroadcast.lf
index 956de7d5a2..3e97b88952 100644
--- a/test/TypeScript/src/multiport/BankSelfBroadcast.lf
+++ b/test/TypeScript/src/multiport/BankSelfBroadcast.lf
@@ -14,7 +14,9 @@ reactor A {
   output out: number
   state received: boolean = false
 
-  reaction(startup) -> out {= out = this.getBankIndex(); =}
+  reaction(startup) -> out {=
+    out = this.getBankIndex();
+  =}
 
   reaction(inp) {=
     for (let i = 0; i < inp.length; i++) {
diff --git a/test/TypeScript/src/multiport/BankToMultiport.lf b/test/TypeScript/src/multiport/BankToMultiport.lf
index b1ea107ca9..044c5b24b5 100644
--- a/test/TypeScript/src/multiport/BankToMultiport.lf
+++ b/test/TypeScript/src/multiport/BankToMultiport.lf
@@ -4,7 +4,9 @@ target TypeScript
 reactor Source {
   output out: number
 
-  reaction(startup) -> out {= out = this.getBankIndex(); =}
+  reaction(startup) -> out {=
+    out = this.getBankIndex();
+  =}
 }
 
 reactor Sink {
diff --git a/test/TypeScript/src/multiport/Broadcast.lf b/test/TypeScript/src/multiport/Broadcast.lf
index 8ec6e21742..54f52694dd 100644
--- a/test/TypeScript/src/multiport/Broadcast.lf
+++ b/test/TypeScript/src/multiport/Broadcast.lf
@@ -3,7 +3,9 @@ target TypeScript
 reactor Source {
   output out: number
 
-  reaction(startup) -> out {= out = 42; =}
+  reaction(startup) -> out {=
+    out = 42;
+  =}
 }
 
 reactor Sink {
diff --git a/test/TypeScript/src/multiport/BroadcastAfter.lf b/test/TypeScript/src/multiport/BroadcastAfter.lf
index 5d8165b983..ac394fdf0d 100644
--- a/test/TypeScript/src/multiport/BroadcastAfter.lf
+++ b/test/TypeScript/src/multiport/BroadcastAfter.lf
@@ -5,7 +5,9 @@ target TypeScript {
 reactor Source {
   output out: number
 
-  reaction(startup) -> out {= out = 42; =}
+  reaction(startup) -> out {=
+    out = 42;
+  =}
 }
 
 reactor Destination {
diff --git a/test/TypeScript/src/multiport/BroadcastMultipleAfter.lf b/test/TypeScript/src/multiport/BroadcastMultipleAfter.lf
index cd9bcd726a..f3f1fc2270 100644
--- a/test/TypeScript/src/multiport/BroadcastMultipleAfter.lf
+++ b/test/TypeScript/src/multiport/BroadcastMultipleAfter.lf
@@ -5,7 +5,9 @@ target TypeScript {
 reactor Source(value: number = 42) {
   output out: number
 
-  reaction(startup) -> out {= out = value; =}
+  reaction(startup) -> out {=
+    out = value;
+  =}
 }
 
 reactor Destination {
diff --git a/test/TypeScript/src/multiport/MultiportFromBank.lf b/test/TypeScript/src/multiport/MultiportFromBank.lf
index 63708bfb76..f1629755ee 100644
--- a/test/TypeScript/src/multiport/MultiportFromBank.lf
+++ b/test/TypeScript/src/multiport/MultiportFromBank.lf
@@ -7,7 +7,9 @@ target TypeScript {
 reactor Source {
   output out: number
 
-  reaction(startup) -> out {= out = this.getBankIndex(); =}
+  reaction(startup) -> out {=
+    out = this.getBankIndex();
+  =}
 }
 
 reactor Destination(portWidth: number = 3) {
diff --git a/test/TypeScript/src/multiport/MultiportIn.lf b/test/TypeScript/src/multiport/MultiportIn.lf
index 8e786a4fdd..1ea4501a3a 100644
--- a/test/TypeScript/src/multiport/MultiportIn.lf
+++ b/test/TypeScript/src/multiport/MultiportIn.lf
@@ -9,14 +9,18 @@ reactor Source {
   output out: number
   state s: number = 0
 
-  reaction(t) -> out {= out = s++; =}
+  reaction(t) -> out {=
+    out = s++;
+  =}
 }
 
 reactor Computation {
   input inp: number
   output out: number
 
-  reaction(inp) -> out {= out = inp; =}
+  reaction(inp) -> out {=
+    out = inp;
+  =}
 }
 
 reactor Destination {
diff --git a/test/TypeScript/src/multiport/MultiportInParameterized.lf b/test/TypeScript/src/multiport/MultiportInParameterized.lf
index 1f60d19bf0..31662b9de1 100644
--- a/test/TypeScript/src/multiport/MultiportInParameterized.lf
+++ b/test/TypeScript/src/multiport/MultiportInParameterized.lf
@@ -19,7 +19,9 @@ reactor Computation {
   input inp: number
   output out: number
 
-  reaction(inp) -> out {= out = inp; =}
+  reaction(inp) -> out {=
+    out = inp;
+  =}
 }
 
 reactor Destination(width: number = 1) {
diff --git a/test/TypeScript/src/multiport/MultiportMutableInputArray.lf b/test/TypeScript/src/multiport/MultiportMutableInputArray.lf
index b097927288..440f939733 100644
--- a/test/TypeScript/src/multiport/MultiportMutableInputArray.lf
+++ b/test/TypeScript/src/multiport/MultiportMutableInputArray.lf
@@ -4,7 +4,9 @@
 target TypeScript
 
 reactor Source {
-  output[2] out: {= Array<number> =}
+  output[2] out: {=
+    Array<number>
+  =}
 
   reaction(startup) -> out {=
     // Dynamically allocate an output array of length 3.
@@ -27,7 +29,9 @@ reactor Source {
 
 // The scale parameter is just for testing.
 reactor Print(scale: number = 1) {
-  input[2] inp: {= Array<number> =}
+  input[2] inp: {=
+    Array<number>
+  =}
 
   reaction(inp) {=
     let count = 0;     // For testing.
@@ -56,8 +60,12 @@ reactor Print(scale: number = 1) {
 }
 
 reactor Scale(scale: number = 2) {
-  mutable input[2] inp: {= Array<number> =}
-  output[2] out: {= Array<number> =}
+  mutable input[2] inp: {=
+    Array<number>
+  =}
+  output[2] out: {=
+    Array<number>
+  =}
 
   reaction(inp) -> out {=
     for (let j = 0; j < inp.length; j++) {
diff --git a/test/TypeScript/src/multiport/MultiportToMultiportArray.lf b/test/TypeScript/src/multiport/MultiportToMultiportArray.lf
index 018d8dd587..eb108317e6 100644
--- a/test/TypeScript/src/multiport/MultiportToMultiportArray.lf
+++ b/test/TypeScript/src/multiport/MultiportToMultiportArray.lf
@@ -5,7 +5,9 @@ target TypeScript {
 
 reactor Source {
   timer t(0, 200 msec)
-  output[2] out: {= Array<number> =}
+  output[2] out: {=
+    Array<number>
+  =}
   state s: number = 0
 
   reaction(t) -> out {=
@@ -24,7 +26,9 @@ reactor Source {
 
 reactor Destination {
   state s: number = 15
-  input[2] inp: {= Array<number> =}
+  input[2] inp: {=
+    Array<number>
+  =}
 
   reaction(inp) {=
     let sum = 0;
diff --git a/test/TypeScript/src/multiport/PipelineAfter.lf b/test/TypeScript/src/multiport/PipelineAfter.lf
index 9db397c0e4..cf46072bb2 100644
--- a/test/TypeScript/src/multiport/PipelineAfter.lf
+++ b/test/TypeScript/src/multiport/PipelineAfter.lf
@@ -3,14 +3,18 @@ target TypeScript
 reactor Source {
   output out: number
 
-  reaction(startup) -> out {= out = 40; =}
+  reaction(startup) -> out {=
+    out = 40;
+  =}
 }
 
 reactor Compute {
   input inp: number
   output out: number
 
-  reaction(inp) -> out {= out = (inp as number) + 2; =}
+  reaction(inp) -> out {=
+    out = (inp as number) + 2;
+  =}
 }
 
 reactor Sink {
diff --git a/test/TypeScript/src/multiport/ReactionsToNested.lf b/test/TypeScript/src/multiport/ReactionsToNested.lf
index a6baf12135..c1ce7c104d 100644
--- a/test/TypeScript/src/multiport/ReactionsToNested.lf
+++ b/test/TypeScript/src/multiport/ReactionsToNested.lf
@@ -32,7 +32,11 @@ reactor D {
 main reactor {
   d = new D()
 
-  reaction(startup) -> d.y {= d.y[0] = 42; =}
+  reaction(startup) -> d.y {=
+    d.y[0] = 42;
+  =}
 
-  reaction(startup) -> d.y {= d.y[1] = 43; =}
+  reaction(startup) -> d.y {=
+    d.y[1] = 43;
+  =}
 }

From f3a3c1eac8e1afc0da12369516189e62f35ea9cf Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 1 Sep 2023 21:18:56 -0700
Subject: [PATCH 0804/1114] Do not make ToLf a singleton.

The comment about thread-safety in the previous commit message was
incorrect because I forget that we were using the singleton pattern on
ToLf. To my knowledge there was no good reason for us to do that.
---
 .../main/java/org/lflang/ast/FormattingUtil.java |  2 +-
 core/src/main/java/org/lflang/ast/ToLf.java      |  8 --------
 core/src/main/java/org/lflang/ast/ToText.java    | 16 ++++++++--------
 .../diagram/synthesis/LinguaFrancaSynthesis.java |  4 ++--
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/FormattingUtil.java b/core/src/main/java/org/lflang/ast/FormattingUtil.java
index 19754b5f10..232d05b190 100644
--- a/core/src/main/java/org/lflang/ast/FormattingUtil.java
+++ b/core/src/main/java/org/lflang/ast/FormattingUtil.java
@@ -56,7 +56,7 @@ public static Function<EObject, String> renderer(Target target) {
    * with the assumption that the target language is {@code target}.
    */
   public static String render(EObject object, int lineLength, Target target, boolean codeMapTags) {
-    MalleableString ms = ToLf.instance.doSwitch(object);
+    MalleableString ms = new ToLf().doSwitch(object);
     String singleLineCommentPrefix = target.getSingleLineCommentPrefix();
     ms.findBestRepresentation(
         () -> ms.render(INDENTATION, singleLineCommentPrefix, codeMapTags, null),
diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 50ffb442ea..b70c6f735b 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -89,20 +89,12 @@ public class ToLf extends LfSwitch<MalleableString> {
   private static final Pattern KEEP_FORMAT_COMMENT =
       Pattern.compile("\\s*(//|#)\\s*keep-format\\s*");
 
-  /// public instance initialized when loading the class
-  public static final ToLf instance = new ToLf();
-
   /**
    * The eObjects in the syntax tree on the path from the root up to and including the current
    * eObject.
    */
   private final ArrayDeque<EObject> callStack = new ArrayDeque<>();
 
-  // private constructor
-  private ToLf() {
-    super();
-  }
-
   @Override
   public MalleableString caseArraySpec(ArraySpec spec) {
     if (spec.isOfVariableLength()) return MalleableString.anyOf("[]");
diff --git a/core/src/main/java/org/lflang/ast/ToText.java b/core/src/main/java/org/lflang/ast/ToText.java
index c677f0730b..6845fde4e7 100644
--- a/core/src/main/java/org/lflang/ast/ToText.java
+++ b/core/src/main/java/org/lflang/ast/ToText.java
@@ -34,7 +34,7 @@ private ToText() {
 
   @Override
   public String caseArraySpec(ArraySpec spec) {
-    return ToLf.instance.doSwitch(spec).toString();
+    return new ToLf().doSwitch(spec).toString();
   }
 
   @Override
@@ -77,27 +77,27 @@ public String caseCode(Code code) {
 
   @Override
   public String caseBracedListExpression(BracedListExpression object) {
-    return ToLf.instance.caseBracedListExpression(object).toString();
+    return new ToLf().caseBracedListExpression(object).toString();
   }
 
   @Override
   public String caseHost(Host host) {
-    return ToLf.instance.caseHost(host).toString();
+    return new ToLf().caseHost(host).toString();
   }
 
   @Override
   public String caseLiteral(Literal l) {
-    return ToLf.instance.caseLiteral(l).toString();
+    return new ToLf().caseLiteral(l).toString();
   }
 
   @Override
   public String caseParameterReference(ParameterReference p) {
-    return ToLf.instance.caseParameterReference(p).toString();
+    return new ToLf().caseParameterReference(p).toString();
   }
 
   @Override
   public String caseTime(Time t) {
-    return ToLf.instance.caseTime(t).toString();
+    return new ToLf().caseTime(t).toString();
   }
 
   @Override
@@ -105,13 +105,13 @@ public String caseType(Type type) {
     if (type.getCode() != null) {
       return caseCode(type.getCode());
     }
-    return ToLf.instance.caseType(type).toString();
+    return new ToLf().caseType(type).toString();
   }
 
   @Override
   public String caseTypeParm(TypeParm t) {
     if (t.getCode() != null) return doSwitch(t.getCode());
-    return ToLf.instance.caseTypeParm(t).toString();
+    return new ToLf().caseTypeParm(t).toString();
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index 6496bb5dcc..b51822c9a5 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -1492,7 +1492,7 @@ private String createParameterLabel(ParameterInstance param) {
     if (param.getOverride() != null) {
       b.append(" = ");
       var init = param.getActualValue();
-      b.append(ToLf.instance.doSwitch(init));
+      b.append(new ToLf().doSwitch(init));
     }
     return b.toString();
   }
@@ -1523,7 +1523,7 @@ private String createStateVariableLabel(StateVar variable) {
       b.append(":").append(t.toOriginalText());
     }
     if (variable.getInit() != null) {
-      b.append(ToLf.instance.doSwitch(variable.getInit()));
+      b.append(new ToLf().doSwitch(variable.getInit()));
     }
     return b.toString();
   }

From 69ebb0f188b60092bf7de579d0f4977faa81e47b Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 1 Sep 2023 22:40:28 -0700
Subject: [PATCH 0805/1114] Update formatter expect test.

---
 cli/lff/src/test/java/org/lflang/cli/LffCliTest.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java b/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
index 5f5f09d977..6b66c7107e 100644
--- a/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
+++ b/cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
@@ -83,7 +83,9 @@ public class LffCliTest {
 
                     /** moo */
                     // this is a humbug reaction
-                    reaction(a) -> humbug {= /* it reacts like this*/ react react =}
+                    reaction(a) -> humbug {=
+                      /* it reacts like this*/ react react
+                    =}
                   }
                   """),
           List.of(

From 3531fce531a579ecc04a75d5c2d5161170f7a6a1 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 2 Sep 2023 11:54:59 -0700
Subject: [PATCH 0806/1114] Delete preamble that does nothing.

This preamble was not even appearing in the generated code, which causes
LSP test to fail.
---
 test/Python/src/federated/DistributedStructParallel.lf | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/Python/src/federated/DistributedStructParallel.lf b/test/Python/src/federated/DistributedStructParallel.lf
index 9577231955..9a27ec6e8e 100644
--- a/test/Python/src/federated/DistributedStructParallel.lf
+++ b/test/Python/src/federated/DistributedStructParallel.lf
@@ -8,10 +8,6 @@ target Python {
 import Source from "../StructScale.lf"
 import Check, Print from "../StructParallel.lf"
 
-preamble {=
-  import hello
-=}
-
 federated reactor {
   s = new Source()
   c1 = new Print()

From 62af2e173ec829ac1189d0103430ba4f48f6359e Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 2 Sep 2023 12:09:29 -0700
Subject: [PATCH 0807/1114] Update condition for forcing code to be multiline.

Reactions, preambles, and methods typically consist of multiple
statements appearing on distinct lines, and if they consist of only a
single statement, they commonly evolve into multiple statements.
Therefore these three constructs should all use multiline code blocks.
---
 core/src/main/java/org/lflang/ast/ToLf.java   |  2 +-
 test/C/src/verifier/ADASModel.lf              | 24 +++++--------------
 test/Cpp/src/Alignment.lf                     |  4 +---
 test/Cpp/src/DelayInt.lf                      |  4 +---
 test/Cpp/src/GetMicroStep.lf                  |  4 +---
 test/Cpp/src/Hello.lf                         |  8 ++-----
 test/Cpp/src/NativeListsAndTimes.lf           |  9 ++-----
 test/Cpp/src/StructPrint.lf                   |  4 +---
 test/Cpp/src/concurrent/AsyncCallback.lf      |  4 +---
 test/Cpp/src/concurrent/DelayIntThreaded.lf   |  4 +---
 test/Cpp/src/concurrent/HelloThreaded.lf      | 12 +++-------
 test/Cpp/src/enclave/EnclaveBankEach.lf       |  8 ++-----
 test/Cpp/src/multiport/WidthGivenByCode.lf    | 12 +++-------
 .../src/target/CliParserGenericArguments.lf   | 20 ++++------------
 test/Cpp/src/target/CombinedTypeNames.lf      | 18 ++++----------
 test/Rust/src/MovingAverage.lf                |  4 +---
 test/Rust/src/NativeListsAndTimes.lf          |  5 +---
 test/Rust/src/StructAsType.lf                 |  4 +---
 test/Rust/src/generics/CtorParamGeneric.lf    |  5 ++--
 .../Rust/src/generics/CtorParamGenericInst.lf | 10 ++++----
 test/Rust/src/generics/GenericReactor.lf      |  4 +---
 test/Rust/src/multiport/CycledLhs_Single.lf   |  4 +---
 test/TypeScript/src/ArrayAsParameter.lf       |  4 +---
 test/TypeScript/src/ArrayAsType.lf            |  8 ++-----
 test/TypeScript/src/ArrayPrint.lf             |  8 ++-----
 test/TypeScript/src/ArrayScale.lf             |  8 ++-----
 test/TypeScript/src/MovingAverage.lf          |  4 +---
 test/TypeScript/src/SendsPointerTest.lf       | 12 +++-------
 .../multiport/MultiportMutableInputArray.lf   | 16 ++++---------
 .../multiport/MultiportToMultiportArray.lf    |  8 ++-----
 30 files changed, 62 insertions(+), 179 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index b70c6f735b..0ebc942b26 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -263,7 +263,7 @@ public MalleableString caseCode(Code code) {
     if (content.lines().count() > 1 || content.contains("#") || content.contains("//")) {
       return multilineRepresentation;
     }
-    if (callStack.stream().anyMatch(it -> it instanceof Code) && !content.isBlank()) {
+    if (callStack.stream().anyMatch(it -> it instanceof Reaction || it instanceof Preamble || it instanceof Method) && !content.isBlank()) {
       return MalleableString.anyOf(multilineRepresentation);
     }
     return MalleableString.anyOf(singleLineRepresentation, multilineRepresentation);
diff --git a/test/C/src/verifier/ADASModel.lf b/test/C/src/verifier/ADASModel.lf
index b127c1d1a8..e0e960a894 100644
--- a/test/C/src/verifier/ADASModel.lf
+++ b/test/C/src/verifier/ADASModel.lf
@@ -6,12 +6,8 @@ preamble {=
 =}
 
 reactor Camera {
-  output out: {=
-    c_frame_t
-  =}
-  state frame: {=
-    c_frame_t
-  =}
+  output out: {= c_frame_t =}
+  state frame: {= c_frame_t =}
   timer t(0, 17 msec)  // 60 fps
 
   reaction(t) -> out {=
@@ -22,12 +18,8 @@ reactor Camera {
 }
 
 reactor LiDAR {
-  output out: {=
-    l_frame_t
-  =}
-  state frame: {=
-    l_frame_t
-  =}
+  output out: {= l_frame_t =}
+  state frame: {= l_frame_t =}
   timer t(0, 34 msec)  // 30 fps
 
   reaction(t) -> out {=
@@ -58,12 +50,8 @@ reactor Brakes {
 }
 
 reactor ADASProcessor {
-  input in1: {=
-    l_frame_t
-  =}
-  input in2: {=
-    c_frame_t
-  =}
+  input in1: {= l_frame_t =}
+  input in2: {= c_frame_t =}
   output out1: int
   output out2: int
   logical action a(50 msec)
diff --git a/test/Cpp/src/Alignment.lf b/test/Cpp/src/Alignment.lf
index 7eaa596379..00f4ce0936 100644
--- a/test/Cpp/src/Alignment.lf
+++ b/test/Cpp/src/Alignment.lf
@@ -78,9 +78,7 @@ reactor Sieve {
 reactor Destination {
   input ok: bool
   input in: int
-  state last_invoked: {=
-    reactor::TimePoint
-  =}
+  state last_invoked: {= reactor::TimePoint =}
 
   reaction(ok, in) {=
     if (ok.is_present() && in.is_present()) {
diff --git a/test/Cpp/src/DelayInt.lf b/test/Cpp/src/DelayInt.lf
index 5111e26ee6..1b02dcba61 100644
--- a/test/Cpp/src/DelayInt.lf
+++ b/test/Cpp/src/DelayInt.lf
@@ -19,9 +19,7 @@ reactor Delay(delay: time = 100 msec) {
 
 reactor Test {
   input in: int
-  state start_time: {=
-    reactor::TimePoint
-  =}
+  state start_time: {= reactor::TimePoint =}
   timer start
 
   reaction(start) {=
diff --git a/test/Cpp/src/GetMicroStep.lf b/test/Cpp/src/GetMicroStep.lf
index bc541db26a..d09ebcdb32 100644
--- a/test/Cpp/src/GetMicroStep.lf
+++ b/test/Cpp/src/GetMicroStep.lf
@@ -2,9 +2,7 @@
 target Cpp
 
 main reactor GetMicroStep {
-  state s: {=
-    reactor::mstep_t
-  =} = 1
+  state s: {= reactor::mstep_t =} = 1
 
   logical action l
 
diff --git a/test/Cpp/src/Hello.lf b/test/Cpp/src/Hello.lf
index 483d15b166..022b9a7383 100644
--- a/test/Cpp/src/Hello.lf
+++ b/test/Cpp/src/Hello.lf
@@ -7,13 +7,9 @@ target Cpp {
   fast: true
 }
 
-reactor HelloCpp(period: time = 2 sec, message: {=
-  std::string
-=} = "Hello C++") {
+reactor HelloCpp(period: time = 2 sec, message: {= std::string =} = "Hello C++") {
   state count: int = 0
-  state previous_time: {=
-    reactor::TimePoint
-  =}
+  state previous_time: {= reactor::TimePoint =}
   timer t(1 sec, period)
   logical action a: void
 
diff --git a/test/Cpp/src/NativeListsAndTimes.lf b/test/Cpp/src/NativeListsAndTimes.lf
index b786edc7a5..b6e8550c50 100644
--- a/test/Cpp/src/NativeListsAndTimes.lf
+++ b/test/Cpp/src/NativeListsAndTimes.lf
@@ -6,9 +6,7 @@ reactor Foo(
     y: time = 0,                // Units are missing but not required
     z = 1 msec,                 // Type is missing but not required
     p: int[]{1, 2, 3, 4},       // List of integers
-    q: {=
-      std::vector<reactor::Duration>
-    =}{1 msec, 2 msec, 3 msec},
+    q: {= std::vector<reactor::Duration> =}{1 msec, 2 msec, 3 msec},
     g: time[]{1 msec, 2 msec},  // List of time values
     g2: int[] = {}) {
   state s: time = y  // Reference to explicitly typed time parameter
@@ -20,10 +18,7 @@ reactor Foo(
   timer toe(z)       // Implicit type time
   state baz = p      // Implicit type int[]
   state period = z   // Implicit type time
-  // a list of lists
-  state times: std::vector<std::vector<{=
-    reactor::Duration
-  =}>>{q, g}
+  state times: std::vector<std::vector<{= reactor::Duration =}>>{q, g}  // a list of lists
   state empty_list: int[] = {}
 
   reaction(tick) {=
diff --git a/test/Cpp/src/StructPrint.lf b/test/Cpp/src/StructPrint.lf
index 6e0fba1199..807dba8e85 100644
--- a/test/Cpp/src/StructPrint.lf
+++ b/test/Cpp/src/StructPrint.lf
@@ -18,9 +18,7 @@ reactor Source {
   =}
 }
 
-reactor Print(expected_value: int = 42, expected_name: {=
-  std::string
-=} = "Earth") {
+reactor Print(expected_value: int = 42, expected_name: {= std::string =} = "Earth") {
   input in: Hello
 
   reaction(in) {=
diff --git a/test/Cpp/src/concurrent/AsyncCallback.lf b/test/Cpp/src/concurrent/AsyncCallback.lf
index 07eb85ca3a..b9d655ca75 100644
--- a/test/Cpp/src/concurrent/AsyncCallback.lf
+++ b/test/Cpp/src/concurrent/AsyncCallback.lf
@@ -10,9 +10,7 @@ main reactor AsyncCallback {
   =}
 
   timer t(0, 200 msec)
-  state thread: {=
-    std::thread
-  =}
+  state thread: {= std::thread =}
   state expected_time: time = 100 msec
   state toggle: bool = false
 
diff --git a/test/Cpp/src/concurrent/DelayIntThreaded.lf b/test/Cpp/src/concurrent/DelayIntThreaded.lf
index e090af0b89..5a181e6770 100644
--- a/test/Cpp/src/concurrent/DelayIntThreaded.lf
+++ b/test/Cpp/src/concurrent/DelayIntThreaded.lf
@@ -19,9 +19,7 @@ reactor Delay(delay: time = 100 msec) {
 
 reactor Test {
   input in: int
-  state start_time: {=
-    reactor::TimePoint
-  =}
+  state start_time: {= reactor::TimePoint =}
   timer start
 
   reaction(start) {=
diff --git a/test/Cpp/src/concurrent/HelloThreaded.lf b/test/Cpp/src/concurrent/HelloThreaded.lf
index ca08070d87..35e2261048 100644
--- a/test/Cpp/src/concurrent/HelloThreaded.lf
+++ b/test/Cpp/src/concurrent/HelloThreaded.lf
@@ -7,13 +7,9 @@ target Cpp {
   fast: true
 }
 
-reactor HelloCpp(period: time = 2 sec, message: {=
-  std::string
-=} = "Hello C++") {
+reactor HelloCpp(period: time = 2 sec, message: {= std::string =} = "Hello C++") {
   state count: int = 0
-  state previous_time: {=
-    reactor::TimePoint
-  =}
+  state previous_time: {= reactor::TimePoint =}
   timer t(1 sec, period)
   logical action a: void
 
@@ -39,9 +35,7 @@ reactor HelloCpp(period: time = 2 sec, message: {=
   =}
 }
 
-reactor Inside(period: time = 1 sec, message: {=
-  std::string
-=} = "Composite default message.") {
+reactor Inside(period: time = 1 sec, message: {= std::string =} = "Composite default message.") {
   third_instance = new HelloCpp(period=period, message=message)
 }
 
diff --git a/test/Cpp/src/enclave/EnclaveBankEach.lf b/test/Cpp/src/enclave/EnclaveBankEach.lf
index c220a082c5..d1b94748ba 100644
--- a/test/Cpp/src/enclave/EnclaveBankEach.lf
+++ b/test/Cpp/src/enclave/EnclaveBankEach.lf
@@ -6,12 +6,8 @@ target Cpp {
 reactor Node(
     bank_index: size_t = 0,
     id: std::string = {= "node" + std::to_string(bank_index) =},
-    period: {=
-      reactor::Duration
-    =} = {= 100ms * (bank_index+1) =},
-    duration: {=
-      reactor::Duration
-    =} = {= 50ms + 100ms * bank_index =}) {
+    period: {= reactor::Duration =} = {= 100ms * (bank_index+1) =},
+    duration: {= reactor::Duration =} = {= 50ms + 100ms * bank_index =}) {
   logical action a: void
 
   reaction(startup, a) -> a {=
diff --git a/test/Cpp/src/multiport/WidthGivenByCode.lf b/test/Cpp/src/multiport/WidthGivenByCode.lf
index 3580a9696c..5e9ed80eb3 100644
--- a/test/Cpp/src/multiport/WidthGivenByCode.lf
+++ b/test/Cpp/src/multiport/WidthGivenByCode.lf
@@ -1,12 +1,8 @@
 target Cpp
 
 reactor Foo(a: size_t = 8, b: size_t = 2) {
-  input[{=
-    a*b
-  =}] in: size_t
-  output[{=
-    a/b
-  =}] out: size_t
+  input[{= a*b =}] in: size_t
+  output[{= a/b =}] out: size_t
 
   reaction(startup) in -> out {=
     if (in.size() != a*b) {
@@ -24,9 +20,7 @@ main reactor {
   foo1 = new Foo()
   foo2 = new Foo(a=10, b=3)
   foo3 = new Foo(a=9, b=9)
-  foo_bank = new[{=
-    42
-  =}] Foo()
+  foo_bank = new[{= 42 =}] Foo()
 
   reaction(startup) foo_bank.out {=
     if (foo_bank.size() != 42) {
diff --git a/test/Cpp/src/target/CliParserGenericArguments.lf b/test/Cpp/src/target/CliParserGenericArguments.lf
index 42c8bd6c2a..fc1862b411 100644
--- a/test/Cpp/src/target/CliParserGenericArguments.lf
+++ b/test/Cpp/src/target/CliParserGenericArguments.lf
@@ -47,26 +47,16 @@ main reactor CliParserGenericArguments(
     signed_value: signed = -10,
     unsigned_value: unsigned = 11,
     long_value: long = -100,
-    unsigned_long_value: {=
-      unsigned_long
-    =} = 42,
-    long_long_value: {=
-      long_long
-    =} = -42,
-    ull_value: {=
-      uns_long_long
-    =} = 42,
+    unsigned_long_value: {= unsigned_long =} = 42,
+    long_long_value: {= long_long =} = -42,
+    ull_value: {= uns_long_long =} = 42,
     bool_value: bool = false,
     char_value: char = 'T',
     double_value: double = 4.2,
-    long_double_value: {=
-      long_double
-    =} = 4.2,
+    long_double_value: {= long_double =} = 4.2,
     float_value: float = 10.5,
     string_value: string = "This is a testvalue",
-    custom_class_value: {=
-      CustomClass
-    =}("Peter")) {
+    custom_class_value: {= CustomClass =}("Peter")) {
   reaction(startup) {=
     std::cout << "Hello World!\n";
   =}
diff --git a/test/Cpp/src/target/CombinedTypeNames.lf b/test/Cpp/src/target/CombinedTypeNames.lf
index 5caa22f70a..f64116eb4a 100644
--- a/test/Cpp/src/target/CombinedTypeNames.lf
+++ b/test/Cpp/src/target/CombinedTypeNames.lf
@@ -2,17 +2,9 @@
 // int`) can be used correctly in LF code.
 target Cpp
 
-reactor Foo(bar: {=
-  unsigned int
-=} = 0, baz: {=
-  const unsigned int*
-=} = {= nullptr =}) {
-  state s_bar: {=
-    unsigned int
-  =} = bar
-  state s_baz: {=
-    const unsigned int*
-  =} = baz
+reactor Foo(bar: {= unsigned int =} = 0, baz: {= const unsigned int* =} = {= nullptr =}) {
+  state s_bar: {= unsigned int =} = bar
+  state s_baz: {= const unsigned int* =} = baz
 
   reaction(startup) {=
     if (bar != 42 || s_bar != 42 || *baz != 42 || *s_baz != 42) {
@@ -22,8 +14,6 @@ reactor Foo(bar: {=
   =}
 }
 
-main reactor(bar: {=
-  unsigned int
-=} = 42) {
+main reactor(bar: {= unsigned int =} = 42) {
   foo = new Foo(bar=bar, baz = {= &bar =})
 }
diff --git a/test/Rust/src/MovingAverage.lf b/test/Rust/src/MovingAverage.lf
index 0c5957b21c..69f973cede 100644
--- a/test/Rust/src/MovingAverage.lf
+++ b/test/Rust/src/MovingAverage.lf
@@ -17,9 +17,7 @@ reactor Source {
 }
 
 reactor MovingAverageImpl {
-  state delay_line: {=
-    [f64 ; 4]
-  =} = {= [ 0.0 ; 4 ] =}
+  state delay_line: {= [f64 ; 4] =} = {= [ 0.0 ; 4 ] =}
   state index: usize = 0
   input in_: f64
   output out: f64
diff --git a/test/Rust/src/NativeListsAndTimes.lf b/test/Rust/src/NativeListsAndTimes.lf
index d96e0649ba..5401d6d1b9 100644
--- a/test/Rust/src/NativeListsAndTimes.lf
+++ b/test/Rust/src/NativeListsAndTimes.lf
@@ -30,10 +30,7 @@ reactor Foo(
   // state baz(p); // Implicit type i32[] fixme this interplays badly with syntax for array init
   // Implicit type time
   state period = z
-  // a list of lists
-  state times: Vec<Vec<{=
-    Duration
-  =}>>(q, g)
+  state times: Vec<Vec<{= Duration =}>>(q, g)  // a list of lists
 
   /**
    * reactor Foo (p: i32[](1, 2)) { state baz(p); // Implicit type i32[] state baz({=p=}); //
diff --git a/test/Rust/src/StructAsType.lf b/test/Rust/src/StructAsType.lf
index 893a1ed8a8..867651e8de 100644
--- a/test/Rust/src/StructAsType.lf
+++ b/test/Rust/src/StructAsType.lf
@@ -20,9 +20,7 @@ reactor Source {
 
 // expected parameter is for testing.
 reactor Print(expected: i32 = 42) {
-  input inp: {=
-    super::source::Hello
-  =}
+  input inp: {= super::source::Hello =}
   state expected: i32 = expected
 
   reaction(inp) {=
diff --git a/test/Rust/src/generics/CtorParamGeneric.lf b/test/Rust/src/generics/CtorParamGeneric.lf
index fe9d2a4d90..e5a6db3f0e 100644
--- a/test/Rust/src/generics/CtorParamGeneric.lf
+++ b/test/Rust/src/generics/CtorParamGeneric.lf
@@ -1,9 +1,8 @@
 // tests that ctor parameters may refer to type parameters.
 target Rust
 
-reactor Generic<{=
-  T: Default + Eq + Sync + std::fmt::Debug
-=}>(value: T = {= Default::default() =}) {
+reactor Generic<{= T: Default + Eq + Sync + std::fmt::Debug =}>(
+    value: T = {= Default::default() =}) {
   input in: T
   state v: T = value
 
diff --git a/test/Rust/src/generics/CtorParamGenericInst.lf b/test/Rust/src/generics/CtorParamGenericInst.lf
index de02ca156e..c76e0e1dcb 100644
--- a/test/Rust/src/generics/CtorParamGenericInst.lf
+++ b/test/Rust/src/generics/CtorParamGenericInst.lf
@@ -2,9 +2,8 @@
 // argument list of a further child instance.
 target Rust
 
-reactor Generic2<{=
-  T: Default + Eq + Sync + std::fmt::Debug + Send + 'static
-=}>(value: T = {= Default::default() =}) {
+reactor Generic2<{= T: Default + Eq + Sync + std::fmt::Debug + Send + 'static =}>(
+    value: T = {= Default::default() =}) {
   input in: T
   state v: T = value
 
@@ -16,9 +15,8 @@ reactor Generic2<{=
   =}
 }
 
-reactor Generic<{=
-  T: Default + Eq + Sync + std::fmt::Debug + Copy + Send + 'static
-=}>(value: T = {= Default::default() =}) {
+reactor Generic<{= T: Default + Eq + Sync + std::fmt::Debug + Copy + Send + 'static =}>(
+    value: T = {= Default::default() =}) {
   input in: T
 
   inner = new Generic2<T>(value=value)
diff --git a/test/Rust/src/generics/GenericReactor.lf b/test/Rust/src/generics/GenericReactor.lf
index 251fefcc69..b87119bb86 100644
--- a/test/Rust/src/generics/GenericReactor.lf
+++ b/test/Rust/src/generics/GenericReactor.lf
@@ -1,9 +1,7 @@
 // Tests a port connection between (input of self -> input of child)
 target Rust
 
-reactor Box<{=
-  T: Sync
-=}> {
+reactor Box<{= T: Sync =}> {
   input inp: T
   output out: T
 
diff --git a/test/Rust/src/multiport/CycledLhs_Single.lf b/test/Rust/src/multiport/CycledLhs_Single.lf
index 4d8931e9d7..2ab73f49ad 100644
--- a/test/Rust/src/multiport/CycledLhs_Single.lf
+++ b/test/Rust/src/multiport/CycledLhs_Single.lf
@@ -7,9 +7,7 @@ target Rust {
 reactor Test {
   output[2] out: u32
   input[4] in: u32
-  logical action act: {=
-    (u32, u32)
-  =}
+  logical action act: {= (u32, u32) =}
   state last: u32 = 1
 
   reaction(startup) -> act {=
diff --git a/test/TypeScript/src/ArrayAsParameter.lf b/test/TypeScript/src/ArrayAsParameter.lf
index 150213d47c..ef9ba9f414 100644
--- a/test/TypeScript/src/ArrayAsParameter.lf
+++ b/test/TypeScript/src/ArrayAsParameter.lf
@@ -1,9 +1,7 @@
 // Source has an array as a parameter, the elements of which it passes to Print.
 target TypeScript
 
-reactor Source(sequence: {=
-  Array<number>
-=} = {= [0, 1, 2] =}) {
+reactor Source(sequence: {= Array<number> =} = {= [0, 1, 2] =}) {
   output out: number
   state count: number = 0
   logical action next
diff --git a/test/TypeScript/src/ArrayAsType.lf b/test/TypeScript/src/ArrayAsType.lf
index f40d6d91e0..c26e3fe02e 100644
--- a/test/TypeScript/src/ArrayAsType.lf
+++ b/test/TypeScript/src/ArrayAsType.lf
@@ -3,9 +3,7 @@
 target TypeScript
 
 reactor Source {
-  output out: {=
-    Array<number>
-  =}
+  output out: {= Array<number> =}
 
   reaction(startup) -> out {=
     let toSend = [];
@@ -18,9 +16,7 @@ reactor Source {
 
 // The scale parameter is just for testing.
 reactor Print(scale: number = 1) {
-  input x: {=
-    Array<number>
-  =}
+  input x: {= Array<number> =}
 
   reaction(x) {=
     let count = 0;     // For testing.
diff --git a/test/TypeScript/src/ArrayPrint.lf b/test/TypeScript/src/ArrayPrint.lf
index 7967efb290..3c94b00b34 100644
--- a/test/TypeScript/src/ArrayPrint.lf
+++ b/test/TypeScript/src/ArrayPrint.lf
@@ -3,9 +3,7 @@
 target TypeScript
 
 reactor Source {
-  output out: {=
-    Array<number>
-  =}
+  output out: {= Array<number> =}
 
   reaction(startup) -> out {=
     let toSend = new Array<number>();
@@ -18,9 +16,7 @@ reactor Source {
 
 // The scale parameter is just for testing.
 reactor Print(scale: number = 1) {
-  input x: {=
-    Array<number>
-  =}
+  input x: {= Array<number> =}
 
   reaction(x) {=
     let count = 0;     // For testing.
diff --git a/test/TypeScript/src/ArrayScale.lf b/test/TypeScript/src/ArrayScale.lf
index 45c982f493..2ddfa951f3 100644
--- a/test/TypeScript/src/ArrayScale.lf
+++ b/test/TypeScript/src/ArrayScale.lf
@@ -6,12 +6,8 @@ target TypeScript
 import Source, Print from "ArrayPrint.lf"
 
 reactor Scale(scale: number = 2) {
-  mutable input x: {=
-    Array<number>
-  =}
-  output out: {=
-    Array<number>
-  =}
+  mutable input x: {= Array<number> =}
+  output out: {= Array<number> =}
 
   reaction(x) -> out {=
     x = x as Array<number>;
diff --git a/test/TypeScript/src/MovingAverage.lf b/test/TypeScript/src/MovingAverage.lf
index 38ddde1504..f99e436ab7 100644
--- a/test/TypeScript/src/MovingAverage.lf
+++ b/test/TypeScript/src/MovingAverage.lf
@@ -17,9 +17,7 @@ reactor Source {
 }
 
 reactor MovingAverageImpl {
-  state delay_line: {=
-    Array<number>
-  =} = {= [0.0, 0.0, 0.0] =}
+  state delay_line: {= Array<number> =} = {= [0.0, 0.0, 0.0] =}
   state index: number = 0
   input x: number
   output out: number
diff --git a/test/TypeScript/src/SendsPointerTest.lf b/test/TypeScript/src/SendsPointerTest.lf
index 68cf14b4cd..2808d2a87b 100644
--- a/test/TypeScript/src/SendsPointerTest.lf
+++ b/test/TypeScript/src/SendsPointerTest.lf
@@ -3,9 +3,7 @@
 target TypeScript
 
 reactor SendsPointer {
-  output out: {=
-    {value: number}
-  =}
+  output out: {= {value: number} =}
 
   reaction(startup) -> out {=
     let my_object = { value: 42 };
@@ -14,12 +12,8 @@ reactor SendsPointer {
 }
 
 // expected parameter is for testing.
-reactor Print(expected: {=
-  {value: number}
-=} = {= { value: 42 } =}) {
-  input x: {=
-    {value: number}
-  =}
+reactor Print(expected: {= {value: number} =} = {= { value: 42 } =}) {
+  input x: {= {value: number} =}
 
   reaction(x) {=
     x = x as {value: number};
diff --git a/test/TypeScript/src/multiport/MultiportMutableInputArray.lf b/test/TypeScript/src/multiport/MultiportMutableInputArray.lf
index 440f939733..b097927288 100644
--- a/test/TypeScript/src/multiport/MultiportMutableInputArray.lf
+++ b/test/TypeScript/src/multiport/MultiportMutableInputArray.lf
@@ -4,9 +4,7 @@
 target TypeScript
 
 reactor Source {
-  output[2] out: {=
-    Array<number>
-  =}
+  output[2] out: {= Array<number> =}
 
   reaction(startup) -> out {=
     // Dynamically allocate an output array of length 3.
@@ -29,9 +27,7 @@ reactor Source {
 
 // The scale parameter is just for testing.
 reactor Print(scale: number = 1) {
-  input[2] inp: {=
-    Array<number>
-  =}
+  input[2] inp: {= Array<number> =}
 
   reaction(inp) {=
     let count = 0;     // For testing.
@@ -60,12 +56,8 @@ reactor Print(scale: number = 1) {
 }
 
 reactor Scale(scale: number = 2) {
-  mutable input[2] inp: {=
-    Array<number>
-  =}
-  output[2] out: {=
-    Array<number>
-  =}
+  mutable input[2] inp: {= Array<number> =}
+  output[2] out: {= Array<number> =}
 
   reaction(inp) -> out {=
     for (let j = 0; j < inp.length; j++) {
diff --git a/test/TypeScript/src/multiport/MultiportToMultiportArray.lf b/test/TypeScript/src/multiport/MultiportToMultiportArray.lf
index eb108317e6..018d8dd587 100644
--- a/test/TypeScript/src/multiport/MultiportToMultiportArray.lf
+++ b/test/TypeScript/src/multiport/MultiportToMultiportArray.lf
@@ -5,9 +5,7 @@ target TypeScript {
 
 reactor Source {
   timer t(0, 200 msec)
-  output[2] out: {=
-    Array<number>
-  =}
+  output[2] out: {= Array<number> =}
   state s: number = 0
 
   reaction(t) -> out {=
@@ -26,9 +24,7 @@ reactor Source {
 
 reactor Destination {
   state s: number = 15
-  input[2] inp: {=
-    Array<number>
-  =}
+  input[2] inp: {= Array<number> =}
 
   reaction(inp) {=
     let sum = 0;

From 1cf93687e1a92f5a220345d20e7ff06da5b884f1 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 2 Sep 2023 22:27:26 -0700
Subject: [PATCH 0808/1114] Format.

---
 core/src/main/java/org/lflang/ast/ToLf.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 0ebc942b26..740dcb074d 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -263,7 +263,10 @@ public MalleableString caseCode(Code code) {
     if (content.lines().count() > 1 || content.contains("#") || content.contains("//")) {
       return multilineRepresentation;
     }
-    if (callStack.stream().anyMatch(it -> it instanceof Reaction || it instanceof Preamble || it instanceof Method) && !content.isBlank()) {
+    if (callStack.stream()
+            .anyMatch(
+                it -> it instanceof Reaction || it instanceof Preamble || it instanceof Method)
+        && !content.isBlank()) {
       return MalleableString.anyOf(multilineRepresentation);
     }
     return MalleableString.anyOf(singleLineRepresentation, multilineRepresentation);

From 4b92a340c5b8f647926e607d8cd7e388be598100 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 2 Sep 2023 22:45:09 -0700
Subject: [PATCH 0809/1114] Delete another unused preamble.

---
 test/Python/src/federated/DistributedStructAsType.lf       | 4 ----
 test/Python/src/federated/DistributedStructAsTypeDirect.lf | 4 ----
 test/Python/src/federated/DistributedStructPrint.lf        | 4 ----
 test/Python/src/federated/DistributedStructScale.lf        | 4 ----
 4 files changed, 16 deletions(-)

diff --git a/test/Python/src/federated/DistributedStructAsType.lf b/test/Python/src/federated/DistributedStructAsType.lf
index b3a83cc600..8179a295a7 100644
--- a/test/Python/src/federated/DistributedStructAsType.lf
+++ b/test/Python/src/federated/DistributedStructAsType.lf
@@ -5,10 +5,6 @@ target Python {
 
 import Source, Print from "../StructAsType.lf"
 
-preamble {=
-  import hello
-=}
-
 federated reactor {
   s = new Source()
   p = new Print()
diff --git a/test/Python/src/federated/DistributedStructAsTypeDirect.lf b/test/Python/src/federated/DistributedStructAsTypeDirect.lf
index 7463672366..80eac47772 100644
--- a/test/Python/src/federated/DistributedStructAsTypeDirect.lf
+++ b/test/Python/src/federated/DistributedStructAsTypeDirect.lf
@@ -5,10 +5,6 @@ target Python {
 
 import Source, Print from "../StructAsTypeDirect.lf"
 
-preamble {=
-  import hello
-=}
-
 federated reactor {
   s = new Source()
   p = new Print()
diff --git a/test/Python/src/federated/DistributedStructPrint.lf b/test/Python/src/federated/DistributedStructPrint.lf
index d3dbfe398b..b447fc61cd 100644
--- a/test/Python/src/federated/DistributedStructPrint.lf
+++ b/test/Python/src/federated/DistributedStructPrint.lf
@@ -7,10 +7,6 @@ target Python {
 
 import Print, Check from "../StructPrint.lf"
 
-preamble {=
-  import hello
-=}
-
 federated reactor {
   s = new Print()
   p = new Check()
diff --git a/test/Python/src/federated/DistributedStructScale.lf b/test/Python/src/federated/DistributedStructScale.lf
index 34a4977d05..0e7d614448 100644
--- a/test/Python/src/federated/DistributedStructScale.lf
+++ b/test/Python/src/federated/DistributedStructScale.lf
@@ -7,10 +7,6 @@ target Python {
 
 import Source, TestInput, Print from "../StructScale.lf"
 
-preamble {=
-  import hello
-=}
-
 federated reactor {
   s = new Source()
   c = new Print()

From ba2fa9c5b5d3366022b6dfb3f66e406c27ff0d5b Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sun, 3 Sep 2023 10:52:08 -0700
Subject: [PATCH 0810/1114] Format.

---
 test/C/src/PersistentInputs.lf | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/C/src/PersistentInputs.lf b/test/C/src/PersistentInputs.lf
index 8ff14e41b2..822810fd90 100644
--- a/test/C/src/PersistentInputs.lf
+++ b/test/C/src/PersistentInputs.lf
@@ -8,7 +8,9 @@ reactor Source {
   timer t(100 ms, 200 ms)
   state count: int = 1
 
-  reaction(t) -> out {= lf_set(out, self->count++); =}
+  reaction(t) -> out {=
+    lf_set(out, self->count++);
+  =}
 }
 
 reactor Sink {
@@ -17,7 +19,9 @@ reactor Sink {
   state count: int = 0  // For testing, emulate the count variable of Source.
   timer t2(100 ms, 200 ms)
 
-  reaction(t2) {= self->count++; =}
+  reaction(t2) {=
+    self->count++;
+  =}
 
   reaction(t) in {=
     printf("Value of the input is %d at time %lld\n", in->value, lf_time_logical_elapsed());

From 14fac8c050168f8c9e175024e602f1e67aad52b7 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Fri, 1 Sep 2023 22:31:46 -0700
Subject: [PATCH 0811/1114] Set the bank index of top-level federates.

Fixes #1962.
---
 .../java/org/lflang/ast/FormattingUtil.java   |  4 ++-
 core/src/main/java/org/lflang/ast/ToLf.java   | 21 +++++++++++--
 .../federated/generator/FedMainEmitter.java   | 13 ++++++++
 .../generator/c/CParameterGenerator.java      |  2 +-
 test/C/src/federated/BankIndex.lf             | 30 +++++++++++++++++++
 5 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 test/C/src/federated/BankIndex.lf

diff --git a/core/src/main/java/org/lflang/ast/FormattingUtil.java b/core/src/main/java/org/lflang/ast/FormattingUtil.java
index 232d05b190..113bcb27c8 100644
--- a/core/src/main/java/org/lflang/ast/FormattingUtil.java
+++ b/core/src/main/java/org/lflang/ast/FormattingUtil.java
@@ -56,7 +56,9 @@ public static Function<EObject, String> renderer(Target target) {
    * with the assumption that the target language is {@code target}.
    */
   public static String render(EObject object, int lineLength, Target target, boolean codeMapTags) {
-    MalleableString ms = new ToLf().doSwitch(object);
+    var toLf = new ToLf();
+    toLf.setTarget(target);
+    MalleableString ms = toLf.doSwitch(object);
     String singleLineCommentPrefix = target.getSingleLineCommentPrefix();
     ms.findBestRepresentation(
         () -> ms.render(INDENTATION, singleLineCommentPrefix, codeMapTags, null),
diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 740dcb074d..b91ea5499c 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -95,6 +95,23 @@ public class ToLf extends LfSwitch<MalleableString> {
    */
   private final ArrayDeque<EObject> callStack = new ArrayDeque<>();
 
+  /** The target language. This is only needed when the complete program is not available. */
+  private Target optionalTarget;
+
+  /** Return the target language of the LF being generated. */
+  private Target getTarget() {
+    if (callStack.getFirst() instanceof Model model) return ASTUtils.getTarget(model);
+    else return optionalTarget;
+  }
+
+  /**
+   * Set the target language of the LF being generated. This has no effect unless the target spec is
+   * unavailable.
+   */
+  public void setTarget(Target target) {
+    optionalTarget = target;
+  }
+
   @Override
   public MalleableString caseArraySpec(ArraySpec spec) {
     if (spec.isOfVariableLength()) return MalleableString.anyOf("[]");
@@ -931,7 +948,7 @@ public MalleableString caseAssignment(Assignment object) {
    */
   private boolean shouldOutputAsAssignment(Initializer init) {
     return init.isAssign()
-        || init.getExprs().size() == 1 && ASTUtils.getTarget(init).mandatesEqualsInitializers();
+        || init.getExprs().size() == 1 && getTarget().mandatesEqualsInitializers();
   }
 
   @Override
@@ -945,7 +962,7 @@ public MalleableString caseInitializer(Initializer init) {
       Objects.requireNonNull(expr);
       return builder.append(doSwitch(expr)).get();
     }
-    if (ASTUtils.getTarget(init) == Target.C) {
+    if (getTarget() == Target.C) {
       // This turns C array initializers into a braced expression.
       // C++ variants are not converted.
       return builder.append(bracedListExpression(init.getExprs())).get();
diff --git a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
index f6e8f6e9c8..9d4817c20d 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
@@ -7,6 +7,7 @@
 import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.ast.FormattingUtil;
+import org.lflang.lf.LfFactory;
 import org.lflang.lf.Reactor;
 
 /** Helper class to generate a main reactor */
@@ -30,6 +31,18 @@ String generateMainReactor(
     var renderer = FormattingUtil.renderer(federate.targetConfig.target);
     var instantiation = EcoreUtil.copy(federate.instantiation);
     instantiation.setWidthSpec(null);
+    if (federate.bankWidth > 1) {
+      var assignment = LfFactory.eINSTANCE.createAssignment();
+      var parameter = LfFactory.eINSTANCE.createParameter();
+      parameter.setName("bank_index");
+      assignment.setLhs(parameter);
+      var initializer = LfFactory.eINSTANCE.createInitializer();
+      var expression = LfFactory.eINSTANCE.createLiteral();
+      expression.setLiteral(String.valueOf(federate.bankIndex));
+      initializer.getExprs().add(expression);
+      assignment.setRhs(initializer);
+      instantiation.getParameters().add(assignment);
+    }
 
     return String.join(
         "\n",
diff --git a/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java b/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java
index caaa375056..21a4803a5f 100644
--- a/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java
@@ -21,7 +21,7 @@ public class CParameterGenerator {
    */
   public static String getInitializer(ParameterInstance p) {
     // Handle the bank_index parameter.
-    if (p.getName().equals("bank_index")) {
+    if (p.getName().equals("bank_index") && p.getOverride() == null) {
       return CUtil.bankIndex(p.getParent());
     }
 
diff --git a/test/C/src/federated/BankIndex.lf b/test/C/src/federated/BankIndex.lf
new file mode 100644
index 0000000000..ff7341608f
--- /dev/null
+++ b/test/C/src/federated/BankIndex.lf
@@ -0,0 +1,30 @@
+target C
+
+reactor Node(bank_index: int = 0, num_nodes: int = 3) {
+  input[num_nodes] in: int
+  output out: int
+
+  reaction(startup) -> out {=
+    lf_set(out, self->bank_index);
+  =}
+}
+
+reactor Check(num_nodes: int = 3) {
+  input[num_nodes] in: int
+
+  reaction(in) {=
+    for (int i = 0; i < self->num_nodes; i++) {
+      if (in[i]->value != i) {
+        lf_print_error_and_exit("Expected %d, not %d.", i, in[i]->value);
+      }
+    }
+    lf_print("Success.");
+    lf_request_stop();
+  =}
+}
+
+federated reactor {
+  b = new[4] Node(num_nodes=4)
+  c = new Check(num_nodes=4)
+  b.out -> c.in
+}

From 7e8d3f3022871dabfc99a0b9b1b62000afc39f1f Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Sat, 2 Sep 2023 22:22:44 -0700
Subject: [PATCH 0812/1114] Remove check that bank index is zero.

---
 test/C/src/federated/DistributedBank.lf | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test/C/src/federated/DistributedBank.lf b/test/C/src/federated/DistributedBank.lf
index f934bd7361..65a6f871c2 100644
--- a/test/C/src/federated/DistributedBank.lf
+++ b/test/C/src/federated/DistributedBank.lf
@@ -13,9 +13,6 @@ reactor Node(bank_index: int = 0) {
   =}
 
   reaction(shutdown) {=
-    if (self->bank_index) {
-      lf_print_error_and_exit("The only bank index should be zero because there should be only one bank member per federate.");
-    }
     if (self->count == 0) {
       lf_print_error_and_exit("Timer reactions did not execute.");
     }

From 02a8557b41ac5539303bfad6f2078616eb7428ed Mon Sep 17 00:00:00 2001
From: i love smoked beef brisket <axmmisaka@users.noreply.github.com>
Date: Tue, 5 Sep 2023 19:50:12 -0700
Subject: [PATCH 0813/1114] Optimise gradle per @lhstrh suggestions, add
 --quiet flag

---
 util/scripts/launch.ps1 | 2 +-
 util/scripts/launch.sh  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/util/scripts/launch.ps1 b/util/scripts/launch.ps1
index bb14204f5c..40cd25ba55 100644
--- a/util/scripts/launch.ps1
+++ b/util/scripts/launch.ps1
@@ -29,5 +29,5 @@ $base="$PSScriptRoot\..\..\"
 $gradlew="${base}/gradlew.bat"
 
 # invoke script
-& "${gradlew}" assemble
+& "${gradlew}" --quiet assemble ":cli:${tool}:assemble"
 & "${base}/build/install/lf-cli/bin/${tool}" @args
\ No newline at end of file
diff --git a/util/scripts/launch.sh b/util/scripts/launch.sh
index 22a272f81f..5233cb55fb 100755
--- a/util/scripts/launch.sh
+++ b/util/scripts/launch.sh
@@ -18,6 +18,8 @@
 # This solution, adapted from an example written by Geoff Nixon, is POSIX-
 # compliant and robust to symbolic links. If a chain of more than 1000 links
 # is encountered, we return.
+set -euo pipefail
+
 find_dir() (
   start_dir=$PWD
   cd "$(dirname "$1")"
@@ -72,5 +74,5 @@ fi
 gradlew="${base}/gradlew"
 
 # Launch the tool.
-"${gradlew}" assemble
+"${gradlew}" --quiet assemble ":cli:${tool}:assemble"
 "${base}/build/install/lf-cli/bin/${tool}" "$@"
\ No newline at end of file

From 4012718f9bfa137186ee05a5ec036e9fb57f4848 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 6 Sep 2023 17:02:54 -0700
Subject: [PATCH 0814/1114] Update latest-release workflow

---
 .github/actions/latest-release/action.yml | 26 +++++++++++++++++
 .github/workflows/latest-release.yml      | 34 ++++++-----------------
 2 files changed, 34 insertions(+), 26 deletions(-)
 create mode 100644 .github/actions/latest-release/action.yml

diff --git a/.github/actions/latest-release/action.yml b/.github/actions/latest-release/action.yml
new file mode 100644
index 0000000000..e283e8ed01
--- /dev/null
+++ b/.github/actions/latest-release/action.yml
@@ -0,0 +1,26 @@
+name: Latest release
+description: Report the latest release of the current repo
+runs:
+  using: "composite"
+  steps:
+    - name: Install semver-tool
+      run: |
+        wget -O /usr/local/bin/semver https://raw.githubusercontent.com/fsaintjacques/semver-tool/master/src/semver
+        chmod +x /usr/local/bin/semver
+        semver --version
+    - name: Fetch all tags
+      run: git fetch --all --tags
+    - name: Fetch latest-release script
+      run: |
+        wget https://raw.githubusercontent.com/lf-lang/lingua-franca/master/.github/scripts/latest-release.sh
+        chmod +x latest-release.sh
+    - name: Find the latest release
+      id: find
+      run: |
+        export tag=$(./latest-release.sh)
+        echo  "ref=${tag}" >> $GITHUB_OUTPUT
+        shopt -s extglob
+        export ver="${tag##v}"
+        echo  "ver=${ver}" >> $GITHUB_OUTPUT
+        echo "Latest release tag: ${tag}"
+        echo "Without a leading 'v': ${ver}"
diff --git a/.github/workflows/latest-release.yml b/.github/workflows/latest-release.yml
index d327f8f722..900df0f843 100644
--- a/.github/workflows/latest-release.yml
+++ b/.github/workflows/latest-release.yml
@@ -10,10 +10,10 @@ on:
     outputs:
       ref:
         description: "The tag of the latest release"
-        value: ${{ jobs.run.outputs.ref }}
+        value: ${{ jobs.get-latest-release.outputs.ref }}
       ver:
         description: "The semver of the latest release (without a leading 'v')"
-        value: ${{ jobs.run.outputs.ver }}
+        value: ${{ jobs.get-latest-release.outputs.ver }}
   # Also allow trigging the workflow manually.
   workflow_dispatch:
 
@@ -21,31 +21,13 @@ jobs:
   get-latest-release:
     runs-on: ubuntu-latest
     outputs:
-      ref: ${{ steps.find.outputs.ref }}
-      ver: ${{ steps.find.outputs.ver }}
+      ref: ${{ steps.semver.outputs.ref }}
+      ver: ${{ steps.semver.outputs.ver }}
     steps:
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: lf-lang/${{ inputs.repo }}
-      - name: Install semver-tool
-        run: |
-          wget -O /usr/local/bin/semver https://raw.githubusercontent.com/fsaintjacques/semver-tool/master/src/semver
-          chmod +x /usr/local/bin/semver
-          semver --version
-      - name: Fetch all tags
-        run: git fetch --all --tags
-      - name: Fetch latest-release script
-        run: |
-          wget https://raw.githubusercontent.com/lf-lang/lingua-franca/master/.github/scripts/latest-release.sh
-          chmod +x latest-release.sh
-      - name: Find the latest release
-        id: find
-        run: |
-          export tag=$(./latest-release.sh)
-          echo  "{ref}={${tag}}" >> $GITHUB_OUTPUT
-          shopt -s extglob
-          export ver="${tag##v}"
-          echo  "{ver}={${ver}}" >> $GITHUB_OUTPUT
-          echo "Latest release tag: ${tag}"
-          echo "Without a leading 'v': ${ver}"
+      - id: semver
+        uses: ./.github/actions/latest-release@master
+        
\ No newline at end of file

From fa9e2e5e13e85d2d74072a25665a8d689deab153 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 6 Sep 2023 17:05:13 -0700
Subject: [PATCH 0815/1114] Get input from user with invoked manually

---
 .github/workflows/latest-release.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/latest-release.yml b/.github/workflows/latest-release.yml
index 900df0f843..7882968990 100644
--- a/.github/workflows/latest-release.yml
+++ b/.github/workflows/latest-release.yml
@@ -16,6 +16,11 @@ on:
         value: ${{ jobs.get-latest-release.outputs.ver }}
   # Also allow trigging the workflow manually.
   workflow_dispatch:
+    inputs:
+      repo:
+        type: string
+        description: Repo to find the latest release of
+        default: lingua-franca
 
 jobs:
   get-latest-release:
@@ -27,7 +32,7 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v3
         with:
-          repository: lf-lang/${{ inputs.repo }}
+          repository: lf-lang/${{ github.event.inputs.repo || inputs.repo }}
       - id: semver
         uses: ./.github/actions/latest-release@master
         
\ No newline at end of file

From 35f74a6297ac4b966633137f54e8061b2fb851a3 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 6 Sep 2023 17:36:16 -0700
Subject: [PATCH 0816/1114] Add option to specify different repo owner

---
 .github/actions/latest-release/action.yml |  4 ++++
 .github/workflows/latest-release.yml      | 15 +++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.github/actions/latest-release/action.yml b/.github/actions/latest-release/action.yml
index e283e8ed01..98c51bb900 100644
--- a/.github/actions/latest-release/action.yml
+++ b/.github/actions/latest-release/action.yml
@@ -8,12 +8,15 @@ runs:
         wget -O /usr/local/bin/semver https://raw.githubusercontent.com/fsaintjacques/semver-tool/master/src/semver
         chmod +x /usr/local/bin/semver
         semver --version
+      shell: bash
     - name: Fetch all tags
       run: git fetch --all --tags
+      shell: bash
     - name: Fetch latest-release script
       run: |
         wget https://raw.githubusercontent.com/lf-lang/lingua-franca/master/.github/scripts/latest-release.sh
         chmod +x latest-release.sh
+      shell: bash
     - name: Find the latest release
       id: find
       run: |
@@ -24,3 +27,4 @@ runs:
         echo  "ver=${ver}" >> $GITHUB_OUTPUT
         echo "Latest release tag: ${tag}"
         echo "Without a leading 'v': ${ver}"
+      shell: bash
diff --git a/.github/workflows/latest-release.yml b/.github/workflows/latest-release.yml
index 7882968990..cdd65f59f1 100644
--- a/.github/workflows/latest-release.yml
+++ b/.github/workflows/latest-release.yml
@@ -3,6 +3,10 @@ name: Latest release
 on:
   workflow_call:
     inputs:
+      owner:
+        type: string
+        description: Owner of the repo
+        default: lf-lang
       repo:
         type: string
         description: Repo to find the latest release of
@@ -14,9 +18,13 @@ on:
       ver:
         description: "The semver of the latest release (without a leading 'v')"
         value: ${{ jobs.get-latest-release.outputs.ver }}
-  # Also allow trigging the workflow manually.
+
   workflow_dispatch:
     inputs:
+      owner:
+        type: string
+        description: Owner of the repo
+        default: lf-lang
       repo:
         type: string
         description: Repo to find the latest release of
@@ -32,7 +40,6 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v3
         with:
-          repository: lf-lang/${{ github.event.inputs.repo || inputs.repo }}
+          repository: ${{ github.event.inputs.owner || inputs.owner }}/${{ github.event.inputs.repo || inputs.repo }}
       - id: semver
-        uses: ./.github/actions/latest-release@master
-        
\ No newline at end of file
+        uses: lf-lang/lingua-franca/.github/actions/latest-release@ci-stuff

From 963baefc4876fdcd3c906fa13fe1402947826ac8 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 6 Sep 2023 18:05:14 -0700
Subject: [PATCH 0817/1114] Rename executables in bin

---
 bin/{lfc => lfc-dev}         | 0
 bin/{lfc.ps1 => lfc-dev.ps1} | 0
 bin/{lfd => lfd-dev}         | 0
 bin/{lfd.ps1 => lfd-dev.ps1} | 0
 bin/{lff => lff-dev}         | 0
 bin/{lff.ps1 => lff-dev.ps1} | 0
 util/scripts/launch.sh       | 7 +++----
 7 files changed, 3 insertions(+), 4 deletions(-)
 rename bin/{lfc => lfc-dev} (100%)
 rename bin/{lfc.ps1 => lfc-dev.ps1} (100%)
 rename bin/{lfd => lfd-dev} (100%)
 rename bin/{lfd.ps1 => lfd-dev.ps1} (100%)
 rename bin/{lff => lff-dev} (100%)
 rename bin/{lff.ps1 => lff-dev.ps1} (100%)

diff --git a/bin/lfc b/bin/lfc-dev
similarity index 100%
rename from bin/lfc
rename to bin/lfc-dev
diff --git a/bin/lfc.ps1 b/bin/lfc-dev.ps1
similarity index 100%
rename from bin/lfc.ps1
rename to bin/lfc-dev.ps1
diff --git a/bin/lfd b/bin/lfd-dev
similarity index 100%
rename from bin/lfd
rename to bin/lfd-dev
diff --git a/bin/lfd.ps1 b/bin/lfd-dev.ps1
similarity index 100%
rename from bin/lfd.ps1
rename to bin/lfd-dev.ps1
diff --git a/bin/lff b/bin/lff-dev
similarity index 100%
rename from bin/lff
rename to bin/lff-dev
diff --git a/bin/lff.ps1 b/bin/lff-dev.ps1
similarity index 100%
rename from bin/lff.ps1
rename to bin/lff-dev.ps1
diff --git a/util/scripts/launch.sh b/util/scripts/launch.sh
index 5233cb55fb..b5e0f8c03e 100755
--- a/util/scripts/launch.sh
+++ b/util/scripts/launch.sh
@@ -54,12 +54,11 @@ else
 fi
 #============================================================================
 
-
-if [[ "$0" == *lfc ]]; then
+if [[ "${0%%-dev}" == *lfc ]]; then
   tool="lfc"
-elif [[ "$0" == *lff ]]; then
+elif [[ "${0%%-dev}" == *lff ]]; then
   tool="lff"
-elif [[ "$0" == *lfd ]]; then
+elif [[ "${0%%-dev}" == *lfd ]]; then
     tool="lfd"
 else
   known_commands="[lfc, lff, lfd]"

From 805c149cf8b1d531a885b7e80c024fa13d37223b Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 6 Sep 2023 18:15:17 -0700
Subject: [PATCH 0818/1114] Add trailing newline

---
 util/scripts/launch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/scripts/launch.sh b/util/scripts/launch.sh
index b5e0f8c03e..5e52051c60 100755
--- a/util/scripts/launch.sh
+++ b/util/scripts/launch.sh
@@ -74,4 +74,4 @@ gradlew="${base}/gradlew"
 
 # Launch the tool.
 "${gradlew}" --quiet assemble ":cli:${tool}:assemble"
-"${base}/build/install/lf-cli/bin/${tool}" "$@"
\ No newline at end of file
+"${base}/build/install/lf-cli/bin/${tool}" "$@"

From 313db97f79e18edced156060f968cb48f87014fd Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 6 Sep 2023 18:35:55 -0700
Subject: [PATCH 0819/1114] Update CLI tests

---
 .github/scripts/test-lfc.sh |  6 +++---
 .github/scripts/test-lfd.sh |  6 +++---
 .github/scripts/test-lff.sh | 16 ++++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/scripts/test-lfc.sh b/.github/scripts/test-lfc.sh
index fe9b6e3757..bc43342e44 100755
--- a/.github/scripts/test-lfc.sh
+++ b/.github/scripts/test-lfc.sh
@@ -14,7 +14,7 @@ function test_with_links() {
     foo/bar/baz/link-${1} --help
 }
 
-bin/lfc test/C/src/Minimal.lf
+bin/lfc-dev test/C/src/Minimal.lf
 
-# Ensure that lfc is robust to symbolic links.
-test_with_links "lfc"
+# Ensure that lfc can be invoked via symbolic links.
+test_with_links "lfc-dev"
diff --git a/.github/scripts/test-lfd.sh b/.github/scripts/test-lfd.sh
index 041daf7029..0f04fcc5b1 100755
--- a/.github/scripts/test-lfd.sh
+++ b/.github/scripts/test-lfd.sh
@@ -14,7 +14,7 @@ function test_with_links() {
     foo/bar/baz/link-${1} --help
 }
 
-bin/lfd test/C/src/Minimal.lf
+bin/lfd-dev test/C/src/Minimal.lf
 
-# Ensure that lfd is robust to symbolic links.
-test_with_links "lfd"
+# Ensure that lfd can be invoked via symbolic links.
+test_with_links "lfd-dev"
diff --git a/.github/scripts/test-lff.sh b/.github/scripts/test-lff.sh
index d98578a39b..273c26b429 100755
--- a/.github/scripts/test-lff.sh
+++ b/.github/scripts/test-lff.sh
@@ -15,14 +15,14 @@ function test_with_links() {
 }
 
 # just a couple of smoke tests
-bin/lff --help
-bin/lff --version
+bin/lff-dev --help
+bin/lff-dev --version
 
-bin/lff -d test/C/src/Minimal.lf
-bin/lff --dry-run test/Cpp/src/Minimal.lf
+bin/lff-dev -d test/C/src/Minimal.lf
+bin/lff-dev --dry-run test/Cpp/src/Minimal.lf
 
-bin/lff -d test/C/src/Minimal.lf
-bin/lff --dry-run test/Cpp/src/Minimal.lf
+bin/lff-dev -d test/C/src/Minimal.lf
+bin/lff-dev --dry-run test/Cpp/src/Minimal.lf
 
-# Ensure that lff is robust to symbolic links.
-test_with_links "lff"
+# Ensure that lff can be invoked via symbolic links.
+test_with_links "lff-dev"

From 6b49fa464a44f4cbc7a7edfd6764a525df40452e Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 6 Sep 2023 20:09:56 -0700
Subject: [PATCH 0820/1114] Fix more filenames

---
 .github/workflows/cli-tests.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cli-tests.yml b/.github/workflows/cli-tests.yml
index 2b718a774d..5312aef33c 100644
--- a/.github/workflows/cli-tests.yml
+++ b/.github/workflows/cli-tests.yml
@@ -44,24 +44,24 @@ jobs:
         if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }}
       - name: Test lfc PowerShell script (Windows only)
         run: |
-          bin/lfc.ps1 --version
-          bin/lfc.ps1 test/C/src/Minimal.lf
+          bin/lfc-dev.ps1 --version
+          bin/lfc-dev.ps1 test/C/src/Minimal.lf
           ./gradlew assemble
           ./build/install/lf-cli/bin/lfc.bat --version
           ./build/install/lf-cli/bin/lfc.bat test/C/src/Minimal.lf
         if: ${{ runner.os == 'Windows' }}
       - name: Test lff PowerShell script (Windows only)
         run: |
-          bin/lff.ps1 --version
-          bin/lff.ps1 test/C/src/Minimal.lf
+          bin/lff-dev-dev.ps1 --version
+          bin/lff-dev-dev.ps1 test/C/src/Minimal.lf
           ./gradlew assemble
           ./build/install/lf-cli/bin/lff.bat --version
           ./build/install/lf-cli/bin/lff.bat test/C/src/Minimal.lf
         if: ${{ runner.os == 'Windows' }}
       - name: Test lfd PowerShell script (Windows only)
         run: |
-          bin/lfd.ps1 --version
-          bin/lfd.ps1 test/C/src/Minimal.lf
+          bin/lfd-dev.ps1 --version
+          bin/lfd-dev.ps1 test/C/src/Minimal.lf
           ./gradlew assemble
           ./build/install/lf-cli/bin/lfd.bat --version
           ./build/install/lf-cli/bin/lfd.bat test/C/src/Minimal.lf

From d310df13bdd7fb7da9d18712669a5a083139dec4 Mon Sep 17 00:00:00 2001
From: i love smoked beef brisket <axmmisaka@users.noreply.github.com>
Date: Wed, 6 Sep 2023 20:42:00 -0700
Subject: [PATCH 0821/1114] Strip out '-dev', and add trailing space

---
 util/scripts/launch.ps1 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/util/scripts/launch.ps1 b/util/scripts/launch.ps1
index 40cd25ba55..9100c75434 100644
--- a/util/scripts/launch.ps1
+++ b/util/scripts/launch.ps1
@@ -13,7 +13,8 @@ $invokerName = [System.IO.Path]::GetFileNameWithoutExtension("$(Split-Path -Path
 $mainClassTable = @{"lfc" = "org.lflang.cli.Lfc"; "lff" = "org.lflang.cli.Lff"; "lfd" = "org.lflang.cli.Lfd"}
 $tool = $null
 foreach ($k in $mainClassTable.Keys) {
-    if ($invokerName.EndsWith($k)) {
+    # This replacement is not ideal, but it is kinda analogous to its counterpart in launch.sh.
+    if ($invokerName.Contains(($k -replace "-dev", ""))) {
         $tool = $k
         break
     }
@@ -30,4 +31,4 @@ $gradlew="${base}/gradlew.bat"
 
 # invoke script
 & "${gradlew}" --quiet assemble ":cli:${tool}:assemble"
-& "${base}/build/install/lf-cli/bin/${tool}" @args
\ No newline at end of file
+& "${base}/build/install/lf-cli/bin/${tool}" @args

From 3f42c83a51b037abaabc49c91d568dd50c39040b Mon Sep 17 00:00:00 2001
From: i love smoked beef brisket <axmmisaka@users.noreply.github.com>
Date: Wed, 6 Sep 2023 20:53:18 -0700
Subject: [PATCH 0822/1114] Fix broken script names

---
 .github/workflows/cli-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cli-tests.yml b/.github/workflows/cli-tests.yml
index 5312aef33c..edcc31b6f8 100644
--- a/.github/workflows/cli-tests.yml
+++ b/.github/workflows/cli-tests.yml
@@ -52,8 +52,8 @@ jobs:
         if: ${{ runner.os == 'Windows' }}
       - name: Test lff PowerShell script (Windows only)
         run: |
-          bin/lff-dev-dev.ps1 --version
-          bin/lff-dev-dev.ps1 test/C/src/Minimal.lf
+          bin/lff-dev.ps1 --version
+          bin/lff-dev.ps1 test/C/src/Minimal.lf
           ./gradlew assemble
           ./build/install/lf-cli/bin/lff.bat --version
           ./build/install/lf-cli/bin/lff.bat test/C/src/Minimal.lf

From cfa80a298adaa50fe4ab9b49b76ca8d428d1c6dc Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 6 Sep 2023 22:02:48 -0700
Subject: [PATCH 0823/1114] Set outputs accordingly

---
 .github/actions/latest-release/action.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/actions/latest-release/action.yml b/.github/actions/latest-release/action.yml
index 98c51bb900..8d78884008 100644
--- a/.github/actions/latest-release/action.yml
+++ b/.github/actions/latest-release/action.yml
@@ -1,5 +1,14 @@
 name: Latest release
 description: Report the latest release of the current repo
+outputs:
+  outputs:
+  ref:
+    value: ${{ steps.find.outputs.ref }}
+    description: The latest semver tag
+  ver:
+    value: ${{ steps.find.outputs.ver }}
+    description: The semver corresponding to the latest semver tag
+
 runs:
   using: "composite"
   steps:

From c99a0f9a88bb21828eb3b1264be79756d9d9baaa Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 6 Sep 2023 22:14:27 -0700
Subject: [PATCH 0824/1114] Yaml is not a programming language

---
 .github/actions/latest-release/action.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/actions/latest-release/action.yml b/.github/actions/latest-release/action.yml
index 8d78884008..910da91c03 100644
--- a/.github/actions/latest-release/action.yml
+++ b/.github/actions/latest-release/action.yml
@@ -1,7 +1,6 @@
 name: Latest release
 description: Report the latest release of the current repo
 outputs:
-  outputs:
   ref:
     value: ${{ steps.find.outputs.ref }}
     description: The latest semver tag

From b14e8378e4b9ea42c0d5093e9e3b94aa42aca977 Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Thu, 7 Sep 2023 20:49:26 +0900
Subject: [PATCH 0825/1114] Use "rti" as the hostname of the RTI when it comes
 to a dockerized federation

---
 .../java/org/lflang/federated/generator/FedGenerator.java | 8 ++++++++
 .../src/docker/federated/DistributedCountContainerized.lf | 2 +-
 .../federated/DistributedDoublePortContainerized.lf       | 2 +-
 .../docker/federated/DistributedMultiportContainerized.lf | 2 +-
 .../DistributedStopDecentralizedContainerized.lf          | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index f885daabdf..8c7f190e4a 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -416,6 +416,14 @@ private void analyzeFederates(Reactor federation, LFGeneratorContext context) {
         && !federation.getHost().getAddr().equals("localhost")) {
       rtiConfig.setHost(federation.getHost().getAddr());
     }
+    // If the federation is dockerized, use "rti" as the hostname.
+    // FIXME: Do we have to check the condition rtiConfig.getHost().equals("localhost")? 
+    // In other words, do we have to preserve the user-specified IP address of the RTI 
+    // when the program is dockerized? 
+    if (rtiConfig.getHost().equals("localhost") 
+        && targetConfig.dockerOptions != null) {
+      rtiConfig.setHost("rti");
+    }
 
     // Since federates are always within the main (federated) reactor,
     // create a list containing just that one containing instantiation.
diff --git a/test/C/src/docker/federated/DistributedCountContainerized.lf b/test/C/src/docker/federated/DistributedCountContainerized.lf
index d7f5fc2cdb..0c9ae24594 100644
--- a/test/C/src/docker/federated/DistributedCountContainerized.lf
+++ b/test/C/src/docker/federated/DistributedCountContainerized.lf
@@ -14,7 +14,7 @@ target C {
 import Count from "../../lib/Count.lf"
 import Print from "../../federated/DistributedCount.lf"
 
-federated reactor DistributedCountContainerized(offset: time = 200 msec) at rti {
+federated reactor DistributedCountContainerized(offset: time = 200 msec) {
   c = new Count()
   p = new Print()
   c.out -> p.in after offset
diff --git a/test/C/src/docker/federated/DistributedDoublePortContainerized.lf b/test/C/src/docker/federated/DistributedDoublePortContainerized.lf
index c9273862c5..adad1f72b1 100644
--- a/test/C/src/docker/federated/DistributedDoublePortContainerized.lf
+++ b/test/C/src/docker/federated/DistributedDoublePortContainerized.lf
@@ -15,7 +15,7 @@ import Count from "../../lib/Count.lf"
 import CountMicrostep from "../../federated/DistributedDoublePort.lf"
 import Print from "../../federated/DistributedDoublePort.lf"
 
-federated reactor DistributedDoublePortContainerized at rti {
+federated reactor DistributedDoublePortContainerized {
   c = new Count()
   cm = new CountMicrostep()
   p = new Print()
diff --git a/test/C/src/docker/federated/DistributedMultiportContainerized.lf b/test/C/src/docker/federated/DistributedMultiportContainerized.lf
index 6250c105c4..026b6f4f17 100644
--- a/test/C/src/docker/federated/DistributedMultiportContainerized.lf
+++ b/test/C/src/docker/federated/DistributedMultiportContainerized.lf
@@ -7,7 +7,7 @@ target C {
 
 import Source, Destination from "../../federated/DistributedMultiport.lf"
 
-federated reactor DistributedMultiportContainerized at rti {
+federated reactor DistributedMultiportContainerized {
   s = new Source(width=4)
   d = new Destination(width=4)
   s.out -> d.in
diff --git a/test/C/src/docker/federated/DistributedStopDecentralizedContainerized.lf b/test/C/src/docker/federated/DistributedStopDecentralizedContainerized.lf
index 5480a6f06c..0c29c1aec9 100644
--- a/test/C/src/docker/federated/DistributedStopDecentralizedContainerized.lf
+++ b/test/C/src/docker/federated/DistributedStopDecentralizedContainerized.lf
@@ -10,7 +10,7 @@ target C {
 
 import Sender, Receiver from "../../federated/DistributedStop.lf"
 
-federated reactor DistributedStopDecentralizedContainerized at rti {
+federated reactor DistributedStopDecentralizedContainerized {
   sender = new Sender()
   receiver = new Receiver()
   sender.out -> receiver.in

From 73e660cfc54ed06274e916ebaa1b61a19f438301 Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <junbg@hanyang.ac.kr>
Date: Thu, 7 Sep 2023 21:00:03 +0900
Subject: [PATCH 0826/1114] Formatting comments

---
 .../org/lflang/federated/generator/FedGenerator.java     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 8c7f190e4a..ed9969202c 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -417,11 +417,10 @@ private void analyzeFederates(Reactor federation, LFGeneratorContext context) {
       rtiConfig.setHost(federation.getHost().getAddr());
     }
     // If the federation is dockerized, use "rti" as the hostname.
-    // FIXME: Do we have to check the condition rtiConfig.getHost().equals("localhost")? 
-    // In other words, do we have to preserve the user-specified IP address of the RTI 
-    // when the program is dockerized? 
-    if (rtiConfig.getHost().equals("localhost") 
-        && targetConfig.dockerOptions != null) {
+    // FIXME: Do we have to check the condition rtiConfig.getHost().equals("localhost")?
+    // In other words, do we have to preserve the user-specified IP address of the RTI
+    // when the program is dockerized?
+    if (rtiConfig.getHost().equals("localhost") && targetConfig.dockerOptions != null) {
       rtiConfig.setHost("rti");
     }
 

From af12fb4c8b4b55b5cfcd7c53cd9684f6ec3be2a4 Mon Sep 17 00:00:00 2001
From: Byeong-gil Jun <78055940+byeong-gil@users.noreply.github.com>
Date: Fri, 8 Sep 2023 08:26:44 +0900
Subject: [PATCH 0827/1114] Update FedGenerator.java

---
 .../main/java/org/lflang/federated/generator/FedGenerator.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index ed9969202c..8aca1fec8f 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -417,9 +417,6 @@ private void analyzeFederates(Reactor federation, LFGeneratorContext context) {
       rtiConfig.setHost(federation.getHost().getAddr());
     }
     // If the federation is dockerized, use "rti" as the hostname.
-    // FIXME: Do we have to check the condition rtiConfig.getHost().equals("localhost")?
-    // In other words, do we have to preserve the user-specified IP address of the RTI
-    // when the program is dockerized?
     if (rtiConfig.getHost().equals("localhost") && targetConfig.dockerOptions != null) {
       rtiConfig.setHost("rti");
     }

From c3e2d1c9ce656546d262085175da9b4e70a26df0 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 8 Sep 2023 00:06:07 -0700
Subject: [PATCH 0828/1114] Update latest-release.yml

---
 .github/workflows/latest-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/latest-release.yml b/.github/workflows/latest-release.yml
index cdd65f59f1..1169ff30ee 100644
--- a/.github/workflows/latest-release.yml
+++ b/.github/workflows/latest-release.yml
@@ -42,4 +42,4 @@ jobs:
         with:
           repository: ${{ github.event.inputs.owner || inputs.owner }}/${{ github.event.inputs.repo || inputs.repo }}
       - id: semver
-        uses: lf-lang/lingua-franca/.github/actions/latest-release@ci-stuff
+        uses: lf-lang/lingua-franca/.github/actions/latest-release@master

From 98ece714c8854a4fd64dd3d2aa24fc99e4bcea34 Mon Sep 17 00:00:00 2001
From: Omer Majeed <omer.majeed@magnition.io>
Date: Thu, 17 Aug 2023 18:15:57 +0500
Subject: [PATCH 0829/1114] unconnected multi-port, and bank reactor bug

---
 .../org/lflang/generator/c/CTriggerObjectsGenerator.java   | 7 +++++++
 core/src/main/resources/lib/c/reactor-c                    | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 77e7eee22e..8072e514c7 100644
--- a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -783,6 +783,9 @@ private static String deferredOutputNumDestinations(ReactorInstance reactor) {
       }
 
       if (output.eventualDestinations().size() == 0) {
+        // Iteration for unconnected case when
+        // output port is a multiport
+        code.startChannelIteration(output);
         // Dangling output. Still set the source reactor
         code.pr(
             "for (int index486184027c8990b = 0; index486184027c8990b < "
@@ -814,6 +817,9 @@ private static String deferredInitializeNonNested(
       CTypes types) {
     var code = new CodeBuilder();
     code.pr("// **** Start non-nested deferred initialize for " + reactor.getFullName());
+    // Initialization within a for loop iterating
+    // over bank members of reactor
+    code.startScopedBlock(reactor);
     // Initialize the num_destinations fields of port structs on the self struct.
     // This needs to be outside the above scoped block because it performs
     // its own iteration over ranges.
@@ -830,6 +836,7 @@ private static String deferredInitializeNonNested(
     for (ReactorInstance child : reactor.children) {
       code.pr(deferredInitializeNonNested(child, main, child.reactions, types));
     }
+    code.endScopedBlock();
     code.pr("// **** End of non-nested deferred initialize for " + reactor.getFullName());
     return code.toString();
   }
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 09b75edfdb..809c454db0 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 09b75edfdbfcd0206a89199fcb65b1678398a0c7
+Subproject commit 809c454db07c1b5e03a789a4863137107b817da6

From 8057121c751344a0ab446346a2c78627740005e8 Mon Sep 17 00:00:00 2001
From: Omer Majeed <omer.majeed@magnition.io>
Date: Fri, 18 Aug 2023 01:52:39 +0500
Subject: [PATCH 0830/1114] test file to test multi-port, multi-bank bug

---
 test/C/src/MultiPort_MultiBankTest.lf | 113 ++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 test/C/src/MultiPort_MultiBankTest.lf

diff --git a/test/C/src/MultiPort_MultiBankTest.lf b/test/C/src/MultiPort_MultiBankTest.lf
new file mode 100644
index 0000000000..39f5aa3031
--- /dev/null
+++ b/test/C/src/MultiPort_MultiBankTest.lf
@@ -0,0 +1,113 @@
+target C {
+    keepalive: true,
+    workers: 1
+};
+
+preamble {=
+    #define P_FILE  FILE *
+=}
+
+reactor adder<entry_T> (bank_index:int(0), n_ports:int(1), log_file:FILE*({=stderr=})) {
+    input[n_ports] add_request:entry_T;
+    output[n_ports] add_response:entry_T;
+
+    input[n_ports] result_request:entry_T;
+    output[n_ports] result_response:entry_T;
+
+    state sum:entry_T(0);
+
+    reaction (startup) {=
+        fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
+                                    "adder_%d ports:%d "
+                                    "startup\n",
+                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                                    self->bank_index, self->n_ports
+        );
+    =}
+
+    reaction (add_request) -> add_response {=
+        for (int i = 0; i < add_request_width; ++i) {
+            if (add_request[i]->is_present) {
+                int req = add_request[i]->value;
+                fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
+                                            "adder_%d port:%d "
+                                            "received add request:%d\n",
+                                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                                            self->bank_index, i, req
+                );
+                self->sum += req;
+                lf_set (add_response[i], self->sum);
+            }
+        }
+    =}
+
+    reaction (result_request) -> result_response {=
+        for (int i = 0; i < result_request_width; ++i) {
+            if (result_request[i]->is_present) {
+                int req = result_request[i]->value;
+                fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
+                                            "adder_%d port:%d "
+                                            "received query request:%d\n",
+                                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                                            self->bank_index, i, req
+                );
+                self->sum += req;
+                lf_set (result_response[i], self->sum);
+            }
+        }
+    =}
+}
+
+reactor testing_adder (bank_index:int(0), iterations:uint32_t(20), log_file:FILE*({=stderr=})) {
+    output add_req:int;
+    output result_req:int;
+    
+    input add_resp:int;
+    input result_resp:int;
+
+    state seed:uint32_t(0);
+    state request_counter:uint32_t(0);
+    state response_counter:uint32_t(0);
+
+    timer t(0, 2 sec);
+
+    reaction (startup) {=
+        fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
+                                    "testing_adder_%d startup\n",
+                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                                    self->bank_index
+        );
+    =}
+
+    reaction (t) -> add_req {=
+        int number = rand_r(&self->seed) % 100;
+        fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
+                                    "testing_adder_%d sending add request[%u] number:%d\n",
+                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                                    self->bank_index, self->request_counter, number
+        );
+        lf_set (add_req, number);
+        ++self->request_counter;
+    =}
+
+    reaction (add_resp) {=
+        int rsp = add_resp->value;
+        fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
+                                    "testing_adder_%d response[%u] sum:%d\n",
+                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                                    self->bank_index, self->response_counter, rsp);
+
+        ++self->response_counter;
+        if (self->response_counter == self->iterations) {
+            lf_request_stop();
+        }
+    =}
+}
+
+main reactor MultiPort_MultiBankTest {
+    test = new [2] testing_adder(iterations = 20);
+    a = new [2] adder<int> ();
+
+    test.add_req -> a.add_request;
+    a.add_response -> test.add_resp;
+}
\ No newline at end of file

From 04b9fc3d4e06a7a8687ca493e35ce159596af6f1 Mon Sep 17 00:00:00 2001
From: Omer Majeed <omer.majeed@magnition.io>
Date: Fri, 18 Aug 2023 01:58:55 +0500
Subject: [PATCH 0831/1114] removed unnecessary preamble

---
 test/C/src/MultiPort_MultiBankTest.lf | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/C/src/MultiPort_MultiBankTest.lf b/test/C/src/MultiPort_MultiBankTest.lf
index 39f5aa3031..558d3ae1da 100644
--- a/test/C/src/MultiPort_MultiBankTest.lf
+++ b/test/C/src/MultiPort_MultiBankTest.lf
@@ -3,10 +3,6 @@ target C {
     workers: 1
 };
 
-preamble {=
-    #define P_FILE  FILE *
-=}
-
 reactor adder<entry_T> (bank_index:int(0), n_ports:int(1), log_file:FILE*({=stderr=})) {
     input[n_ports] add_request:entry_T;
     output[n_ports] add_response:entry_T;

From 8b4c5ce609d2dcfdd2b645455b033d73511dfb0e Mon Sep 17 00:00:00 2001
From: Omer Majeed <omer.majeed@magnition.io>
Date: Wed, 23 Aug 2023 23:43:39 +0500
Subject: [PATCH 0832/1114] added multi-port and multi-bank tests for
 unconnected output port

---
 ...iBankToMultiPort_UnconnectedOutput_Test.lf | 86 ++++++++++++++++++
 .../C/src/MultiBank_UnconnectedOutput_Test.lf | 82 +++++++++++++++++
 ...t_MultiBankTest_UnconnectedOutput_Test.lf} |  2 +-
 .../C/src/MultiPort_UnconnectedOutput_Test.lf | 91 +++++++++++++++++++
 4 files changed, 260 insertions(+), 1 deletion(-)
 create mode 100644 test/C/src/MultiBankToMultiPort_UnconnectedOutput_Test.lf
 create mode 100644 test/C/src/MultiBank_UnconnectedOutput_Test.lf
 rename test/C/src/{MultiPort_MultiBankTest.lf => MultiPort_MultiBankTest_UnconnectedOutput_Test.lf} (98%)
 create mode 100644 test/C/src/MultiPort_UnconnectedOutput_Test.lf

diff --git a/test/C/src/MultiBankToMultiPort_UnconnectedOutput_Test.lf b/test/C/src/MultiBankToMultiPort_UnconnectedOutput_Test.lf
new file mode 100644
index 0000000000..b3c9ccf679
--- /dev/null
+++ b/test/C/src/MultiBankToMultiPort_UnconnectedOutput_Test.lf
@@ -0,0 +1,86 @@
+target C {
+    keepalive: true,
+    workers: 1
+};
+
+reactor echo<entry_T> (n_ports:int(1)) {
+    input[n_ports] request:entry_T;
+    output[n_ports] response:entry_T;
+
+    output[n_ports] unconnected:entry_T; 
+
+    reaction (startup) {=
+        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                            "echo ports:%d"
+                            "startup\n",
+                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                            self->n_ports
+        );
+    =}
+
+    reaction (request) -> response {=
+        for (int i = 0; i < request_width; ++i) {
+            if (request[i]->is_present) {
+                int req = request[i]->value;
+                fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                                    "echo port:%d "
+                                    "received echo request:%d\n",
+                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                                    i, req
+                );
+                lf_set (response[i], req + i);
+            }
+        }
+    =}
+}
+
+reactor testing_echo (bank_index:int(0), iterations:uint32_t(20), log_file:FILE*({=stderr=})) {
+    output req:int;
+    input resp:int;
+
+    state seed:uint32_t(0);
+    state request_counter:uint32_t(0);
+    state response_counter:uint32_t(0);
+
+    timer t(0, 2 sec);
+
+    reaction (startup) {=
+        fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
+                                    "testing_echo_%d startup\n",
+                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                                    self->bank_index
+        );
+    =}
+
+    reaction (t) -> req {=
+        int number = rand_r(&self->seed);
+        fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
+                                    "testing_echo_%d sending echo request[%u] number:%d\n",
+                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                                    self->bank_index, self->request_counter, number
+        );
+        lf_set (req, number + self->bank_index);
+        ++self->request_counter;
+    =}
+
+    reaction (resp) {=
+        int rsp = resp->value;
+        fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
+                                    "testing_echo_%d echo response[%u] number:%d\n",
+                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                                    self->bank_index, self->response_counter, rsp);
+
+        ++self->response_counter;
+        if (self->response_counter == self->iterations) {
+            lf_request_stop();
+        }
+    =}
+}
+
+main reactor MultiBankToMultiPort_UnconnectedOutput_Test {
+    test = new [2] testing_echo(iterations = 20);
+    e = new echo<int> (n_ports = 2);
+
+    test.req -> e.request;
+    e.response -> test.resp;
+}
\ No newline at end of file
diff --git a/test/C/src/MultiBank_UnconnectedOutput_Test.lf b/test/C/src/MultiBank_UnconnectedOutput_Test.lf
new file mode 100644
index 0000000000..6170299514
--- /dev/null
+++ b/test/C/src/MultiBank_UnconnectedOutput_Test.lf
@@ -0,0 +1,82 @@
+target C {
+    keepalive: true,
+    workers: 1
+};
+
+reactor echo<entry_T> (bank_index:int(0)) {
+    input request:entry_T;
+    output response:entry_T;
+
+    output unconnected:entry_T;
+
+    reaction (startup) {=
+        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                            "echo_%d "
+                            "startup\n",
+                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                            self->bank_index
+        );
+    =}
+
+    reaction (request) -> response {=
+        int req = request->value;
+        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                            "echo_%d "
+                            "received echo request:%d\n",
+                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                            self->bank_index, req
+        );
+        lf_set (response, req + self->bank_index);
+    =}
+}
+
+reactor testing_echo (bank_index:int(0), iterations:uint32_t(20)) {
+    output req:int;
+    input resp:int;
+
+    state seed:uint32_t(0);
+    state request_counter:uint32_t(0);
+    state response_counter:uint32_t(0);
+
+    timer t(0, 2 sec);
+
+    reaction (startup) {=
+        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                            "testing_echo_%d startup\n",
+                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                            self->bank_index
+        );
+    =}
+
+    reaction (t) -> req {=
+        int number = rand_r(&self->seed);
+        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                            "testing_echo_%d sending echo request[%u] number:%d\n",
+                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                            self->bank_index, self->request_counter, number
+        );
+        lf_set (req, number + self->bank_index);
+        ++self->request_counter;
+    =}
+
+    reaction (resp) {=
+        int rsp = resp->value;
+        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                            "testing_echo_%d echo response[%u] number:%d\n",
+                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                            self->bank_index, self->response_counter, rsp);
+
+        ++self->response_counter;
+        if (self->response_counter == self->iterations) {
+            lf_request_stop();
+        }
+    =}
+}
+
+main reactor MultiBank_UnconnectedOutput_Test {
+    test = new [2] testing_echo(iterations = 20);
+    e = new [2] echo<int> ();
+
+    test.req -> e.request;
+    e.response -> test.resp;
+}
\ No newline at end of file
diff --git a/test/C/src/MultiPort_MultiBankTest.lf b/test/C/src/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf
similarity index 98%
rename from test/C/src/MultiPort_MultiBankTest.lf
rename to test/C/src/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf
index 558d3ae1da..74813d23af 100644
--- a/test/C/src/MultiPort_MultiBankTest.lf
+++ b/test/C/src/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf
@@ -100,7 +100,7 @@ reactor testing_adder (bank_index:int(0), iterations:uint32_t(20), log_file:FILE
     =}
 }
 
-main reactor MultiPort_MultiBankTest {
+main reactor MultiPort_MultiBankTest_UnconnectedOutput_Test {
     test = new [2] testing_adder(iterations = 20);
     a = new [2] adder<int> ();
 
diff --git a/test/C/src/MultiPort_UnconnectedOutput_Test.lf b/test/C/src/MultiPort_UnconnectedOutput_Test.lf
new file mode 100644
index 0000000000..a189ba29a8
--- /dev/null
+++ b/test/C/src/MultiPort_UnconnectedOutput_Test.lf
@@ -0,0 +1,91 @@
+target C {
+    keepalive: true,
+    workers: 1
+};
+
+reactor echo<entry_T> (n_ports:int(1)) {
+    input[n_ports] request:entry_T;
+    output[n_ports] response:entry_T;
+
+    output[n_ports] unconnected:entry_T; 
+
+    reaction (startup) {=
+        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                            "echo ports:%d"
+                            "startup\n",
+                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                            self->n_ports
+        );
+    =}
+
+    reaction (request) -> response {=
+        for (int i = 0; i < request_width; ++i) {
+            if (request[i]->is_present) {
+                int req = request[i]->value;
+                fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                                    "echo port:%d "
+                                    "received echo request:%d\n",
+                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                                    i, req
+                );
+                lf_set (response[i], req + i);
+            }
+        }
+    =}
+}
+
+reactor testing_echo (n_ports:int(1), iterations:uint32_t(20), log_file:FILE*({=stderr=})) {
+    output[n_ports] req:int;
+    input[n_ports] resp:int;
+
+    state seed:uint32_t(0);
+    state request_counter:uint32_t(0);
+    state response_counter:uint32_t(0);
+
+    timer t(0, 2 sec);
+
+    reaction (startup) {=
+        fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
+                                    "testing_echo ports:%d startup\n",
+                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                                    self->n_ports
+        );
+    =}
+
+    reaction (t) -> req {=
+        int number = rand_r(&self->seed);
+        for (int i = 0; i < req_width; ++i) {
+            fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
+                                        "testing_echo port:%d sending echo request[%u] number:%d\n",
+                                        lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                                        i, self->request_counter, number + i
+            );
+            lf_set (req[i], number + i);
+        }
+        ++self->request_counter;
+        if (self->request_counter == self->iterations) {
+            lf_request_stop();
+        }
+    =}
+
+    reaction (resp) {=
+        for (int i = 0; i < resp_width; ++i) {
+            if (resp[i]->is_present) {
+                int rsp = resp[i]->value;
+                fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
+                                            "testing_echo port:%d echo response[%u] new_number:%d\n",
+                                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                                            i, self->response_counter, rsp);
+            }
+        }
+        ++self->response_counter;
+    =}
+}
+
+main reactor MultiPort_UnconnectedOutput_Test {
+    test = new testing_echo(n_ports = 2, iterations = 20);
+    e = new echo<int> (n_ports = 2);
+
+    test.req -> e.request;
+    e.response -> test.resp;
+}
\ No newline at end of file

From 5e6b7234f93d5073d76268e9f80365fb4ac43dfb Mon Sep 17 00:00:00 2001
From: Omer Majeed <omer.majeed@magnition.io>
Date: Thu, 7 Sep 2023 21:01:20 +0500
Subject: [PATCH 0833/1114] keep the master changes for this multi-port fix

---
 .../java/org/lflang/generator/c/CTriggerObjectsGenerator.java  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 8072e514c7..98aec56d80 100644
--- a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -783,9 +783,6 @@ private static String deferredOutputNumDestinations(ReactorInstance reactor) {
       }
 
       if (output.eventualDestinations().size() == 0) {
-        // Iteration for unconnected case when
-        // output port is a multiport
-        code.startChannelIteration(output);
         // Dangling output. Still set the source reactor
         code.pr(
             "for (int index486184027c8990b = 0; index486184027c8990b < "

From 9b9d734cdbcc1ca41af12db1c6c5e5a97f9b719f Mon Sep 17 00:00:00 2001
From: Omer Majeed <omer.majeed@magnition.io>
Date: Thu, 7 Sep 2023 21:58:01 +0500
Subject: [PATCH 0834/1114] test case fixes for PR to go into master

---
 ...iBankToMultiPort_UnconnectedOutput_Test.lf | 86 ------------------
 .../C/src/MultiBank_UnconnectedOutput_Test.lf | 33 ++-----
 ...rt_MultiBankTest_UnconnectedOutput_Test.lf | 82 +++++------------
 .../C/src/MultiPort_UnconnectedOutput_Test.lf | 91 -------------------
 4 files changed, 32 insertions(+), 260 deletions(-)
 delete mode 100644 test/C/src/MultiBankToMultiPort_UnconnectedOutput_Test.lf
 delete mode 100644 test/C/src/MultiPort_UnconnectedOutput_Test.lf

diff --git a/test/C/src/MultiBankToMultiPort_UnconnectedOutput_Test.lf b/test/C/src/MultiBankToMultiPort_UnconnectedOutput_Test.lf
deleted file mode 100644
index b3c9ccf679..0000000000
--- a/test/C/src/MultiBankToMultiPort_UnconnectedOutput_Test.lf
+++ /dev/null
@@ -1,86 +0,0 @@
-target C {
-    keepalive: true,
-    workers: 1
-};
-
-reactor echo<entry_T> (n_ports:int(1)) {
-    input[n_ports] request:entry_T;
-    output[n_ports] response:entry_T;
-
-    output[n_ports] unconnected:entry_T; 
-
-    reaction (startup) {=
-        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                            "echo ports:%d"
-                            "startup\n",
-                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                            self->n_ports
-        );
-    =}
-
-    reaction (request) -> response {=
-        for (int i = 0; i < request_width; ++i) {
-            if (request[i]->is_present) {
-                int req = request[i]->value;
-                fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                                    "echo port:%d "
-                                    "received echo request:%d\n",
-                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                                    i, req
-                );
-                lf_set (response[i], req + i);
-            }
-        }
-    =}
-}
-
-reactor testing_echo (bank_index:int(0), iterations:uint32_t(20), log_file:FILE*({=stderr=})) {
-    output req:int;
-    input resp:int;
-
-    state seed:uint32_t(0);
-    state request_counter:uint32_t(0);
-    state response_counter:uint32_t(0);
-
-    timer t(0, 2 sec);
-
-    reaction (startup) {=
-        fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
-                                    "testing_echo_%d startup\n",
-                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                                    self->bank_index
-        );
-    =}
-
-    reaction (t) -> req {=
-        int number = rand_r(&self->seed);
-        fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
-                                    "testing_echo_%d sending echo request[%u] number:%d\n",
-                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                                    self->bank_index, self->request_counter, number
-        );
-        lf_set (req, number + self->bank_index);
-        ++self->request_counter;
-    =}
-
-    reaction (resp) {=
-        int rsp = resp->value;
-        fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
-                                    "testing_echo_%d echo response[%u] number:%d\n",
-                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                                    self->bank_index, self->response_counter, rsp);
-
-        ++self->response_counter;
-        if (self->response_counter == self->iterations) {
-            lf_request_stop();
-        }
-    =}
-}
-
-main reactor MultiBankToMultiPort_UnconnectedOutput_Test {
-    test = new [2] testing_echo(iterations = 20);
-    e = new echo<int> (n_ports = 2);
-
-    test.req -> e.request;
-    e.response -> test.resp;
-}
\ No newline at end of file
diff --git a/test/C/src/MultiBank_UnconnectedOutput_Test.lf b/test/C/src/MultiBank_UnconnectedOutput_Test.lf
index 6170299514..e10d4fe3c9 100644
--- a/test/C/src/MultiBank_UnconnectedOutput_Test.lf
+++ b/test/C/src/MultiBank_UnconnectedOutput_Test.lf
@@ -1,5 +1,4 @@
 target C {
-    keepalive: true,
     workers: 1
 };
 
@@ -30,51 +29,35 @@ reactor echo<entry_T> (bank_index:int(0)) {
     =}
 }
 
-reactor testing_echo (bank_index:int(0), iterations:uint32_t(20)) {
+reactor testing_echo (bank_index:int(0)) {
     output req:int;
     input resp:int;
 
     state seed:uint32_t(0);
-    state request_counter:uint32_t(0);
-    state response_counter:uint32_t(0);
 
-    timer t(0, 2 sec);
-
-    reaction (startup) {=
-        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                            "testing_echo_%d startup\n",
-                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                            self->bank_index
-        );
-    =}
-
-    reaction (t) -> req {=
+    reaction (startup) -> req {=
         int number = rand_r(&self->seed);
         fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                            "testing_echo_%d sending echo request[%u] number:%d\n",
+                            "testing_echo_%d sending echo request number:%d\n",
                             lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                            self->bank_index, self->request_counter, number
+                            self->bank_index, number
         );
         lf_set (req, number + self->bank_index);
-        ++self->request_counter;
     =}
 
     reaction (resp) {=
         int rsp = resp->value;
         fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                            "testing_echo_%d echo response[%u] number:%d\n",
+                            "testing_echo_%d echo response number:%d\n",
                             lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                            self->bank_index, self->response_counter, rsp);
+                            self->bank_index, rsp);
 
-        ++self->response_counter;
-        if (self->response_counter == self->iterations) {
-            lf_request_stop();
-        }
+        lf_request_stop();
     =}
 }
 
 main reactor MultiBank_UnconnectedOutput_Test {
-    test = new [2] testing_echo(iterations = 20);
+    test = new [2] testing_echo();
     e = new [2] echo<int> ();
 
     test.req -> e.request;
diff --git a/test/C/src/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf b/test/C/src/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf
index 74813d23af..8ebb1da8ce 100644
--- a/test/C/src/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf
+++ b/test/C/src/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf
@@ -1,23 +1,21 @@
 target C {
-    keepalive: true,
     workers: 1
 };
 
-reactor adder<entry_T> (bank_index:int(0), n_ports:int(1), log_file:FILE*({=stderr=})) {
+reactor adder<entry_T> (bank_index:int(0), n_ports:int(1)) {
     input[n_ports] add_request:entry_T;
     output[n_ports] add_response:entry_T;
 
-    input[n_ports] result_request:entry_T;
-    output[n_ports] result_response:entry_T;
+    output[n_ports] unconnected:entry_T;
 
     state sum:entry_T(0);
 
     reaction (startup) {=
-        fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
-                                    "adder_%d ports:%d "
-                                    "startup\n",
-                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                                    self->bank_index, self->n_ports
+        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                            "adder_%d ports:%d "
+                            "startup\n",
+                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                            self->bank_index, self->n_ports
         );
     =}
 
@@ -25,36 +23,20 @@ reactor adder<entry_T> (bank_index:int(0), n_ports:int(1), log_file:FILE*({=stde
         for (int i = 0; i < add_request_width; ++i) {
             if (add_request[i]->is_present) {
                 int req = add_request[i]->value;
-                fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
-                                            "adder_%d port:%d "
-                                            "received add request:%d\n",
-                                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                                            self->bank_index, i, req
+                fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                                    "adder_%d port:%d "
+                                    "received add request:%d\n",
+                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                                    self->bank_index, i, req
                 );
                 self->sum += req;
                 lf_set (add_response[i], self->sum);
             }
         }
     =}
-
-    reaction (result_request) -> result_response {=
-        for (int i = 0; i < result_request_width; ++i) {
-            if (result_request[i]->is_present) {
-                int req = result_request[i]->value;
-                fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
-                                            "adder_%d port:%d "
-                                            "received query request:%d\n",
-                                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                                            self->bank_index, i, req
-                );
-                self->sum += req;
-                lf_set (result_response[i], self->sum);
-            }
-        }
-    =}
 }
 
-reactor testing_adder (bank_index:int(0), iterations:uint32_t(20), log_file:FILE*({=stderr=})) {
+reactor testing_adder (bank_index:int(0)) {
     output add_req:int;
     output result_req:int;
     
@@ -62,46 +44,30 @@ reactor testing_adder (bank_index:int(0), iterations:uint32_t(20), log_file:FILE
     input result_resp:int;
 
     state seed:uint32_t(0);
-    state request_counter:uint32_t(0);
-    state response_counter:uint32_t(0);
-
-    timer t(0, 2 sec);
 
-    reaction (startup) {=
-        fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
-                                    "testing_adder_%d startup\n",
-                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                                    self->bank_index
-        );
-    =}
-
-    reaction (t) -> add_req {=
+    reaction (startup) -> add_req {=
         int number = rand_r(&self->seed) % 100;
-        fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
-                                    "testing_adder_%d sending add request[%u] number:%d\n",
-                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                                    self->bank_index, self->request_counter, number
+        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                            "testing_adder_%d sending add request number:%d\n",
+                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                            self->bank_index, number
         );
         lf_set (add_req, number);
-        ++self->request_counter;
     =}
 
     reaction (add_resp) {=
         int rsp = add_resp->value;
-        fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
-                                    "testing_adder_%d response[%u] sum:%d\n",
-                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                                    self->bank_index, self->response_counter, rsp);
+        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                            "testing_adder_%d response sum:%d\n",
+                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                            self->bank_index, rsp);
 
-        ++self->response_counter;
-        if (self->response_counter == self->iterations) {
-            lf_request_stop();
-        }
+        lf_request_stop();
     =}
 }
 
 main reactor MultiPort_MultiBankTest_UnconnectedOutput_Test {
-    test = new [2] testing_adder(iterations = 20);
+    test = new [2] testing_adder();
     a = new [2] adder<int> ();
 
     test.add_req -> a.add_request;
diff --git a/test/C/src/MultiPort_UnconnectedOutput_Test.lf b/test/C/src/MultiPort_UnconnectedOutput_Test.lf
deleted file mode 100644
index a189ba29a8..0000000000
--- a/test/C/src/MultiPort_UnconnectedOutput_Test.lf
+++ /dev/null
@@ -1,91 +0,0 @@
-target C {
-    keepalive: true,
-    workers: 1
-};
-
-reactor echo<entry_T> (n_ports:int(1)) {
-    input[n_ports] request:entry_T;
-    output[n_ports] response:entry_T;
-
-    output[n_ports] unconnected:entry_T; 
-
-    reaction (startup) {=
-        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                            "echo ports:%d"
-                            "startup\n",
-                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                            self->n_ports
-        );
-    =}
-
-    reaction (request) -> response {=
-        for (int i = 0; i < request_width; ++i) {
-            if (request[i]->is_present) {
-                int req = request[i]->value;
-                fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                                    "echo port:%d "
-                                    "received echo request:%d\n",
-                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                                    i, req
-                );
-                lf_set (response[i], req + i);
-            }
-        }
-    =}
-}
-
-reactor testing_echo (n_ports:int(1), iterations:uint32_t(20), log_file:FILE*({=stderr=})) {
-    output[n_ports] req:int;
-    input[n_ports] resp:int;
-
-    state seed:uint32_t(0);
-    state request_counter:uint32_t(0);
-    state response_counter:uint32_t(0);
-
-    timer t(0, 2 sec);
-
-    reaction (startup) {=
-        fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
-                                    "testing_echo ports:%d startup\n",
-                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                                    self->n_ports
-        );
-    =}
-
-    reaction (t) -> req {=
-        int number = rand_r(&self->seed);
-        for (int i = 0; i < req_width; ++i) {
-            fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
-                                        "testing_echo port:%d sending echo request[%u] number:%d\n",
-                                        lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                                        i, self->request_counter, number + i
-            );
-            lf_set (req[i], number + i);
-        }
-        ++self->request_counter;
-        if (self->request_counter == self->iterations) {
-            lf_request_stop();
-        }
-    =}
-
-    reaction (resp) {=
-        for (int i = 0; i < resp_width; ++i) {
-            if (resp[i]->is_present) {
-                int rsp = resp[i]->value;
-                fprintf (self->log_file,    "(%lld, %u) physical_time:%lld "
-                                            "testing_echo port:%d echo response[%u] new_number:%d\n",
-                                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                                            i, self->response_counter, rsp);
-            }
-        }
-        ++self->response_counter;
-    =}
-}
-
-main reactor MultiPort_UnconnectedOutput_Test {
-    test = new testing_echo(n_ports = 2, iterations = 20);
-    e = new echo<int> (n_ports = 2);
-
-    test.req -> e.request;
-    e.response -> test.resp;
-}
\ No newline at end of file

From c839b28829be3b025d16a6fc34433eb22648da80 Mon Sep 17 00:00:00 2001
From: Omer Majeed <omer.majeed@magnition.io>
Date: Fri, 8 Sep 2023 15:17:47 +0500
Subject: [PATCH 0835/1114] merge master branch run time changes

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 809c454db0..09b75edfdb 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 809c454db07c1b5e03a789a4863137107b817da6
+Subproject commit 09b75edfdbfcd0206a89199fcb65b1678398a0c7

From 84db8f28ea627fb1fdf8b46170299dc4ec3d277e Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Fri, 8 Sep 2023 12:30:18 +0200
Subject: [PATCH 0836/1114] Removed util directory and dev scripts can be
 executed from anywhere

---
 bin/lfc-dev             | 62 ++++++++++++++++++++++++++++++++-
 bin/lfc-dev.ps1         | 20 +++++++----
 bin/lfd-dev             | 62 ++++++++++++++++++++++++++++++++-
 bin/lfd-dev.ps1         | 20 +++++++----
 bin/lff-dev             | 62 ++++++++++++++++++++++++++++++++-
 bin/lff-dev.ps1         | 20 +++++++----
 util/README.md          |  4 ---
 util/scripts/launch.ps1 | 34 ------------------
 util/scripts/launch.sh  | 77 -----------------------------------------
 9 files changed, 222 insertions(+), 139 deletions(-)
 mode change 120000 => 100755 bin/lfc-dev
 mode change 120000 => 100755 bin/lfd-dev
 mode change 120000 => 100755 bin/lff-dev
 delete mode 100644 util/README.md
 delete mode 100644 util/scripts/launch.ps1
 delete mode 100755 util/scripts/launch.sh

diff --git a/bin/lfc-dev b/bin/lfc-dev
deleted file mode 120000
index 1a3eb8bc0d..0000000000
--- a/bin/lfc-dev
+++ /dev/null
@@ -1 +0,0 @@
-../util/scripts/launch.sh
\ No newline at end of file
diff --git a/bin/lfc-dev b/bin/lfc-dev
new file mode 100755
index 0000000000..76a9642549
--- /dev/null
+++ b/bin/lfc-dev
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+#============================================================================
+# Description:      Build and run the Lingua Franca compiler (lfc).
+# Authors:          Marten Lohstroh
+#                   Christian Menard
+# Usage:            Usage: lfc-dev [options] files...
+#============================================================================
+
+#============================================================================
+# Preamble
+#============================================================================
+
+# Find the directory in which this script resides in a way that is compatible
+# with MacOS, which has a `readlink` implementation that does not support the
+# necessary `-f` flag to canonicalize by following every symlink in every
+# component of the given name recursively.
+# This solution, adapted from an example written by Geoff Nixon, is POSIX-
+# compliant and robust to symbolic links. If a chain of more than 1000 links
+# is encountered, we return.
+set -euo pipefail
+
+find_dir() (
+  start_dir=$PWD
+  cd "$(dirname "$1")"
+  link=$(readlink "$(basename "$1")")
+  count=0
+  while [ "${link}" ]; do
+    if [[ "${count}" -lt 1000 ]]; then
+        cd "$(dirname "${link}")"
+        link=$(readlink "$(basename "$1")")
+        ((count++))
+    else
+        return
+    fi
+  done
+  real_path="$PWD/$(basename "$1")"
+  cd "${start_dir}"
+  echo `dirname "${real_path}"`
+)
+
+# Report fatal error and exit.
+function fatal_error() {
+    1>&2 echo -e "\e[31mfatal error: \e[0m$1"
+    exit 1
+}
+
+abs_path="$(find_dir "$0")"
+
+if [[ "${abs_path}" ]]; then
+    base=`dirname ${abs_path}`
+else
+    fatal_error "Unable to determine absolute path to $0."
+fi
+#============================================================================
+
+gradlew="${base}/gradlew"
+
+# Launch the tool.
+"${gradlew}" --quiet -p "${base}" assemble ":cli:lfc:assemble"
+"${base}/build/install/lf-cli/bin/lfc" "$@"
diff --git a/bin/lfc-dev.ps1 b/bin/lfc-dev.ps1
index 90e6f9876a..56ecf3ac62 100644
--- a/bin/lfc-dev.ps1
+++ b/bin/lfc-dev.ps1
@@ -1,9 +1,15 @@
-#==========================================================
-# Description: 	    Run the lfc compiler.
+#============================================================================
+# Description:      Build and run the Lingua Franca compiler (lfc).
 # Authors:          Ruomu Xu
-# Usage:            Usage: lfc [options] files...
-#==========================================================
+#                   Christian Menard
+# Usage:            Usage: lfc-dev [options] files...
+#============================================================================
 
-$launchScript="$PSScriptRoot\..\util\scripts\launch.ps1"
-# PS requires spattling: https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_Splatting?view=powershell-7.2
-. $launchScript @args
+
+# This script is in $base\bin
+$base="$PSScriptRoot\..\"
+$gradlew="${base}/gradlew.bat"
+
+# invoke script
+& "${gradlew}" --quiet -p "${base}" assemble ":cli:lfc:assemble"
+& "${base}/build/install/lf-cli/bin/lfc" @args
diff --git a/bin/lfd-dev b/bin/lfd-dev
deleted file mode 120000
index 1a3eb8bc0d..0000000000
--- a/bin/lfd-dev
+++ /dev/null
@@ -1 +0,0 @@
-../util/scripts/launch.sh
\ No newline at end of file
diff --git a/bin/lfd-dev b/bin/lfd-dev
new file mode 100755
index 0000000000..c154379ac4
--- /dev/null
+++ b/bin/lfd-dev
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+#============================================================================
+# Description:      Build and run the Lingua Franca diagram generator (lfd).
+# Authors:          Marten Lohstroh
+#                   Christian Menard
+# Usage:            Usage: lfd-dev [options] files...
+#============================================================================
+
+#============================================================================
+# Preamble
+#============================================================================
+
+# Find the directory in which this script resides in a way that is compatible
+# with MacOS, which has a `readlink` implementation that does not support the
+# necessary `-f` flag to canonicalize by following every symlink in every
+# component of the given name recursively.
+# This solution, adapted from an example written by Geoff Nixon, is POSIX-
+# compliant and robust to symbolic links. If a chain of more than 1000 links
+# is encountered, we return.
+set -euo pipefail
+
+find_dir() (
+  start_dir=$PWD
+  cd "$(dirname "$1")"
+  link=$(readlink "$(basename "$1")")
+  count=0
+  while [ "${link}" ]; do
+    if [[ "${count}" -lt 1000 ]]; then
+        cd "$(dirname "${link}")"
+        link=$(readlink "$(basename "$1")")
+        ((count++))
+    else
+        return
+    fi
+  done
+  real_path="$PWD/$(basename "$1")"
+  cd "${start_dir}"
+  echo `dirname "${real_path}"`
+)
+
+# Report fatal error and exit.
+function fatal_error() {
+    1>&2 echo -e "\e[31mfatal error: \e[0m$1"
+    exit 1
+}
+
+abs_path="$(find_dir "$0")"
+
+if [[ "${abs_path}" ]]; then
+    base=`dirname ${abs_path}`
+else
+    fatal_error "Unable to determine absolute path to $0."
+fi
+#============================================================================
+
+gradlew="${base}/gradlew"
+
+# Launch the tool.
+"${gradlew}" --quiet -p "${base}" assemble ":cli:lfd:assemble"
+"${base}/build/install/lf-cli/bin/lfd" "$@"
diff --git a/bin/lfd-dev.ps1 b/bin/lfd-dev.ps1
index 54ce9397f4..47d53f0731 100644
--- a/bin/lfd-dev.ps1
+++ b/bin/lfd-dev.ps1
@@ -1,9 +1,15 @@
-#==========================================================
-# Description: 	    Run the lff compiler.
+#============================================================================
+# Description:      Build and run the Lingua Franca diagram generator (lfd).
 # Authors:          Ruomu Xu
-# Usage:            Usage: lff [options] files...
-#==========================================================
+#                   Christian Menard
+# Usage:            Usage: lfd-dev [options] files...
+#============================================================================
 
-$launchScript="$PSScriptRoot\..\util\scripts\launch.ps1"
-# PS requires spattling: https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_Splatting?view=powershell-7.2
-. $launchScript @args
+
+# This script is in $base\bin
+$base="$PSScriptRoot\..\"
+$gradlew="${base}/gradlew.bat"
+
+# invoke script
+& "${gradlew}" --quiet -p "${base}" assemble ":cli:lfd:assemble"
+& "${base}/build/install/lf-cli/bin/lfd" @args
diff --git a/bin/lff-dev b/bin/lff-dev
deleted file mode 120000
index 1a3eb8bc0d..0000000000
--- a/bin/lff-dev
+++ /dev/null
@@ -1 +0,0 @@
-../util/scripts/launch.sh
\ No newline at end of file
diff --git a/bin/lff-dev b/bin/lff-dev
new file mode 100755
index 0000000000..3a656a8a96
--- /dev/null
+++ b/bin/lff-dev
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+#============================================================================
+# Description:      Build and run the Lingua Franca code formatter (lff).
+# Authors:          Marten Lohstroh
+#                   Christian Menard
+# Usage:            Usage: lff-dev [options] files...
+#============================================================================
+
+#============================================================================
+# Preamble
+#============================================================================
+
+# Find the directory in which this script resides in a way that is compatible
+# with MacOS, which has a `readlink` implementation that does not support the
+# necessary `-f` flag to canonicalize by following every symlink in every
+# component of the given name recursively.
+# This solution, adapted from an example written by Geoff Nixon, is POSIX-
+# compliant and robust to symbolic links. If a chain of more than 1000 links
+# is encountered, we return.
+set -euo pipefail
+
+find_dir() (
+  start_dir=$PWD
+  cd "$(dirname "$1")"
+  link=$(readlink "$(basename "$1")")
+  count=0
+  while [ "${link}" ]; do
+    if [[ "${count}" -lt 1000 ]]; then
+        cd "$(dirname "${link}")"
+        link=$(readlink "$(basename "$1")")
+        ((count++))
+    else
+        return
+    fi
+  done
+  real_path="$PWD/$(basename "$1")"
+  cd "${start_dir}"
+  echo `dirname "${real_path}"`
+)
+
+# Report fatal error and exit.
+function fatal_error() {
+    1>&2 echo -e "\e[31mfatal error: \e[0m$1"
+    exit 1
+}
+
+abs_path="$(find_dir "$0")"
+
+if [[ "${abs_path}" ]]; then
+    base=`dirname ${abs_path}`
+else
+    fatal_error "Unable to determine absolute path to $0."
+fi
+#============================================================================
+
+gradlew="${base}/gradlew"
+
+# Launch the tool.
+"${gradlew}" --quiet -p "${base}" assemble ":cli:lff:assemble"
+"${base}/build/install/lf-cli/bin/lff" "$@"
diff --git a/bin/lff-dev.ps1 b/bin/lff-dev.ps1
index 54ce9397f4..32b7b2171f 100644
--- a/bin/lff-dev.ps1
+++ b/bin/lff-dev.ps1
@@ -1,9 +1,15 @@
-#==========================================================
-# Description: 	    Run the lff compiler.
+#============================================================================
+# Description:      Build and run the Lingua Franca code formatter (lff).
 # Authors:          Ruomu Xu
-# Usage:            Usage: lff [options] files...
-#==========================================================
+#                   Christian Menard
+# Usage:            Usage: lff-dev [options] files...
+#============================================================================
 
-$launchScript="$PSScriptRoot\..\util\scripts\launch.ps1"
-# PS requires spattling: https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_Splatting?view=powershell-7.2
-. $launchScript @args
+
+# This script is in $base\bin
+$base="$PSScriptRoot\..\"
+$gradlew="${base}/gradlew.bat"
+
+# invoke script
+& "${gradlew}" --quiet -p "${base}" assemble ":cli:lff:assemble"
+& "${base}/build/install/lf-cli/bin/lff" @args
diff --git a/util/README.md b/util/README.md
deleted file mode 100644
index fd95c322f0..0000000000
--- a/util/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## util
-
-This directory is intended for collecting utility programs associated with Lingua Franca
-but that run and install independently of the main tool chain.
diff --git a/util/scripts/launch.ps1 b/util/scripts/launch.ps1
deleted file mode 100644
index 9100c75434..0000000000
--- a/util/scripts/launch.ps1
+++ /dev/null
@@ -1,34 +0,0 @@
-#==========================================================
-# Description: 	    Launch lfc or lff depending on the invoking script.
-# Authors:          Christian Menard, Peter Donovan, Ruomu Xu
-# Usage:            Usage: launch args...
-#                   with invoker with name same as the programme to be invoked.
-#==========================================================
-
-# If the invoker is Z:\nkamihara\lf\bin\lfc.ps1, $invokerName will strip out "lfc.ps1" and then get "lfc".
-# See https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_automatic_variables?view=powershell-7.2#myinvocation
-$invokerPath = $MyInvocation.PSCommandPath
-$invokerName = [System.IO.Path]::GetFileNameWithoutExtension("$(Split-Path -Path $invokerPath -Leaf -Resolve)")
-
-$mainClassTable = @{"lfc" = "org.lflang.cli.Lfc"; "lff" = "org.lflang.cli.Lff"; "lfd" = "org.lflang.cli.Lfd"}
-$tool = $null
-foreach ($k in $mainClassTable.Keys) {
-    # This replacement is not ideal, but it is kinda analogous to its counterpart in launch.sh.
-    if ($invokerName.Contains(($k -replace "-dev", ""))) {
-        $tool = $k
-        break
-    }
-}
-if ($null -eq $tool) {
-    throw ("$invokerName is not a known lf command. Known commands are [$($mainClassTable.Keys)]. " +
-          "In case you use a symbolic or hard link to one of the Lingua Franca " +
-          "command line tools, make sure that the link's name ends with one of [$($mainClassTable.Keys)]")
-}
-
-# This script is in $base\util\scripts
-$base="$PSScriptRoot\..\..\"
-$gradlew="${base}/gradlew.bat"
-
-# invoke script
-& "${gradlew}" --quiet assemble ":cli:${tool}:assemble"
-& "${base}/build/install/lf-cli/bin/${tool}" @args
diff --git a/util/scripts/launch.sh b/util/scripts/launch.sh
deleted file mode 100755
index 5e52051c60..0000000000
--- a/util/scripts/launch.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-#============================================================================
-# Description:      Run the Lingua Franca compiler.
-# Authors:          Marten Lohstroh
-#                   Christian Menard
-# Usage:            Usage: lfc [options] files...
-#============================================================================
-
-#============================================================================
-# Preamble
-#============================================================================
-
-# Find the directory in which this script resides in a way that is compatible
-# with MacOS, which has a `readlink` implementation that does not support the
-# necessary `-f` flag to canonicalize by following every symlink in every
-# component of the given name recursively.
-# This solution, adapted from an example written by Geoff Nixon, is POSIX-
-# compliant and robust to symbolic links. If a chain of more than 1000 links
-# is encountered, we return.
-set -euo pipefail
-
-find_dir() (
-  start_dir=$PWD
-  cd "$(dirname "$1")"
-  link=$(readlink "$(basename "$1")")
-  count=0
-  while [ "${link}" ]; do
-    if [[ "${count}" -lt 1000 ]]; then
-        cd "$(dirname "${link}")"
-        link=$(readlink "$(basename "$1")")
-        ((count++))
-    else
-        return
-    fi
-  done
-  real_path="$PWD/$(basename "$1")"
-  cd "${start_dir}"
-  echo `dirname "${real_path}"`
-)
-
-# Report fatal error and exit.
-function fatal_error() {
-    1>&2 echo -e "\e[1mlfc: \e[31mfatal error: \e[0m$1"
-    exit 1
-}
-
-abs_path="$(find_dir "$0")"
-
-if [[ "${abs_path}" ]]; then
-    base=`dirname $(dirname ${abs_path})`
-else
-    fatal_error "Unable to determine absolute path to $0."
-fi
-#============================================================================
-
-if [[ "${0%%-dev}" == *lfc ]]; then
-  tool="lfc"
-elif [[ "${0%%-dev}" == *lff ]]; then
-  tool="lff"
-elif [[ "${0%%-dev}" == *lfd ]]; then
-    tool="lfd"
-else
-  known_commands="[lfc, lff, lfd]"
-  echo \
-  "ERROR: $0 is not a known lf command! Known commands are ${known_commands}.
-       In case you use a symbolic or hard link to one of the Lingua Franca
-       command line tools, make sure that the link's name ends with one of
-       ${known_commands}."
-  exit 2
-fi
-
-gradlew="${base}/gradlew"
-
-# Launch the tool.
-"${gradlew}" --quiet assemble ":cli:${tool}:assemble"
-"${base}/build/install/lf-cli/bin/${tool}" "$@"

From 1b3f505d480762b19d7a80c73d8eb5099630669f Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Fri, 8 Sep 2023 13:30:30 +0200
Subject: [PATCH 0837/1114] fix bug in readlink logic

---
 bin/lfc-dev | 16 +++++++---------
 bin/lfd-dev | 16 +++++++---------
 bin/lff-dev | 16 +++++++---------
 3 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/bin/lfc-dev b/bin/lfc-dev
index 76a9642549..2664248947 100755
--- a/bin/lfc-dev
+++ b/bin/lfc-dev
@@ -20,7 +20,7 @@
 # is encountered, we return.
 set -euo pipefail
 
-find_dir() (
+find_base_dir() (
   start_dir=$PWD
   cd "$(dirname "$1")"
   link=$(readlink "$(basename "$1")")
@@ -28,15 +28,15 @@ find_dir() (
   while [ "${link}" ]; do
     if [[ "${count}" -lt 1000 ]]; then
         cd "$(dirname "${link}")"
-        link=$(readlink "$(basename "$1")")
+        link=$(readlink "$(basename "${link}")")
         ((count++))
     else
         return
     fi
   done
-  real_path="$PWD/$(basename "$1")"
+  real_path="${PWD}"
   cd "${start_dir}"
-  echo `dirname "${real_path}"`
+  echo "$(dirname "${real_path}")"
 )
 
 # Report fatal error and exit.
@@ -45,12 +45,10 @@ function fatal_error() {
     exit 1
 }
 
-abs_path="$(find_dir "$0")"
+base="$(find_base_dir "$0")"
 
-if [[ "${abs_path}" ]]; then
-    base=`dirname ${abs_path}`
-else
-    fatal_error "Unable to determine absolute path to $0."
+if [[ -z "${base}" ]]; then
+    fatal_error "Unable to determine base path of $0."
 fi
 #============================================================================
 
diff --git a/bin/lfd-dev b/bin/lfd-dev
index c154379ac4..ddb1e0e69c 100755
--- a/bin/lfd-dev
+++ b/bin/lfd-dev
@@ -20,7 +20,7 @@
 # is encountered, we return.
 set -euo pipefail
 
-find_dir() (
+find_base_dir() (
   start_dir=$PWD
   cd "$(dirname "$1")"
   link=$(readlink "$(basename "$1")")
@@ -28,15 +28,15 @@ find_dir() (
   while [ "${link}" ]; do
     if [[ "${count}" -lt 1000 ]]; then
         cd "$(dirname "${link}")"
-        link=$(readlink "$(basename "$1")")
+        link=$(readlink "$(basename "${link}")")
         ((count++))
     else
         return
     fi
   done
-  real_path="$PWD/$(basename "$1")"
+  real_path="${PWD}"
   cd "${start_dir}"
-  echo `dirname "${real_path}"`
+  echo "$(dirname "${real_path}")"
 )
 
 # Report fatal error and exit.
@@ -45,12 +45,10 @@ function fatal_error() {
     exit 1
 }
 
-abs_path="$(find_dir "$0")"
+base="$(find_base_dir "$0")"
 
-if [[ "${abs_path}" ]]; then
-    base=`dirname ${abs_path}`
-else
-    fatal_error "Unable to determine absolute path to $0."
+if [[ -z "${base}" ]]; then
+    fatal_error "Unable to determine base path of $0."
 fi
 #============================================================================
 
diff --git a/bin/lff-dev b/bin/lff-dev
index 3a656a8a96..c0dc83c647 100755
--- a/bin/lff-dev
+++ b/bin/lff-dev
@@ -20,7 +20,7 @@
 # is encountered, we return.
 set -euo pipefail
 
-find_dir() (
+find_base_dir() (
   start_dir=$PWD
   cd "$(dirname "$1")"
   link=$(readlink "$(basename "$1")")
@@ -28,15 +28,15 @@ find_dir() (
   while [ "${link}" ]; do
     if [[ "${count}" -lt 1000 ]]; then
         cd "$(dirname "${link}")"
-        link=$(readlink "$(basename "$1")")
+        link=$(readlink "$(basename "${link}")")
         ((count++))
     else
         return
     fi
   done
-  real_path="$PWD/$(basename "$1")"
+  real_path="${PWD}"
   cd "${start_dir}"
-  echo `dirname "${real_path}"`
+  echo "$(dirname "${real_path}")"
 )
 
 # Report fatal error and exit.
@@ -45,12 +45,10 @@ function fatal_error() {
     exit 1
 }
 
-abs_path="$(find_dir "$0")"
+base="$(find_base_dir "$0")"
 
-if [[ "${abs_path}" ]]; then
-    base=`dirname ${abs_path}`
-else
-    fatal_error "Unable to determine absolute path to $0."
+if [[ -z "${base}" ]]; then
+    fatal_error "Unable to determine base path of $0."
 fi
 #============================================================================
 

From d234236fe238e4f5d5e81175f11d18fd08d214c3 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Fri, 8 Sep 2023 14:58:47 +0200
Subject: [PATCH 0838/1114] test invocation of lf*-dev scripts from another
 directory

---
 .github/scripts/test-lfc.sh | 5 +++++
 .github/scripts/test-lfd.sh | 5 +++++
 .github/scripts/test-lff.sh | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/.github/scripts/test-lfc.sh b/.github/scripts/test-lfc.sh
index bc43342e44..27f4807da3 100755
--- a/.github/scripts/test-lfc.sh
+++ b/.github/scripts/test-lfc.sh
@@ -18,3 +18,8 @@ bin/lfc-dev test/C/src/Minimal.lf
 
 # Ensure that lfc can be invoked via symbolic links.
 test_with_links "lfc-dev"
+
+# Ensure that lfc can be invoked from outside the root directory.
+cd bin
+./lfc-dev --help
+cd ..
diff --git a/.github/scripts/test-lfd.sh b/.github/scripts/test-lfd.sh
index 0f04fcc5b1..2ad7ce1108 100755
--- a/.github/scripts/test-lfd.sh
+++ b/.github/scripts/test-lfd.sh
@@ -18,3 +18,8 @@ bin/lfd-dev test/C/src/Minimal.lf
 
 # Ensure that lfd can be invoked via symbolic links.
 test_with_links "lfd-dev"
+
+# Ensure that lfd can be invoked from outside the root directory.
+cd bin
+./lfd-dev --help
+cd ..
diff --git a/.github/scripts/test-lff.sh b/.github/scripts/test-lff.sh
index 273c26b429..11a3d36ceb 100755
--- a/.github/scripts/test-lff.sh
+++ b/.github/scripts/test-lff.sh
@@ -26,3 +26,8 @@ bin/lff-dev --dry-run test/Cpp/src/Minimal.lf
 
 # Ensure that lff can be invoked via symbolic links.
 test_with_links "lff-dev"
+
+# Ensure that lfc can be invoked from outside the root directory.
+cd bin
+./lff-dev --help
+cd ..

From 90405223e4c1d21cf693eb702dafaaf0ffc73325 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 10 Sep 2023 23:11:37 -0700
Subject: [PATCH 0839/1114] Apply formatter

---
 .../C/src/MultiBank_UnconnectedOutput_Test.lf | 100 +++++++--------
 ...rt_MultiBankTest_UnconnectedOutput_Test.lf | 116 +++++++++---------
 2 files changed, 108 insertions(+), 108 deletions(-)

diff --git a/test/C/src/MultiBank_UnconnectedOutput_Test.lf b/test/C/src/MultiBank_UnconnectedOutput_Test.lf
index e10d4fe3c9..2aedcd2a3c 100644
--- a/test/C/src/MultiBank_UnconnectedOutput_Test.lf
+++ b/test/C/src/MultiBank_UnconnectedOutput_Test.lf
@@ -1,65 +1,65 @@
 target C {
-    workers: 1
-};
+  workers: 1
+}
 
-reactor echo<entry_T> (bank_index:int(0)) {
-    input request:entry_T;
-    output response:entry_T;
+reactor echo<entry_T>(bank_index: int = 0) {
+  input request: entry_T
+  output response: entry_T
 
-    output unconnected:entry_T;
+  output unconnected: entry_T
 
-    reaction (startup) {=
-        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                            "echo_%d "
-                            "startup\n",
-                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                            self->bank_index
-        );
-    =}
+  reaction(startup) {=
+    fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                        "echo_%d "
+                        "startup\n",
+                        lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                        self->bank_index
+    );
+  =}
 
-    reaction (request) -> response {=
-        int req = request->value;
-        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                            "echo_%d "
-                            "received echo request:%d\n",
-                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                            self->bank_index, req
-        );
-        lf_set (response, req + self->bank_index);
-    =}
+  reaction(request) -> response {=
+    int req = request->value;
+    fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                        "echo_%d "
+                        "received echo request:%d\n",
+                        lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                        self->bank_index, req
+    );
+    lf_set (response, req + self->bank_index);
+  =}
 }
 
-reactor testing_echo (bank_index:int(0)) {
-    output req:int;
-    input resp:int;
+reactor testing_echo(bank_index: int = 0) {
+  output req: int
+  input resp: int
 
-    state seed:uint32_t(0);
+  state seed: uint32_t = 0
 
-    reaction (startup) -> req {=
-        int number = rand_r(&self->seed);
-        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                            "testing_echo_%d sending echo request number:%d\n",
-                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                            self->bank_index, number
-        );
-        lf_set (req, number + self->bank_index);
-    =}
+  reaction(startup) -> req {=
+    int number = rand_r(&self->seed);
+    fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                        "testing_echo_%d sending echo request number:%d\n",
+                        lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                        self->bank_index, number
+    );
+    lf_set (req, number + self->bank_index);
+  =}
 
-    reaction (resp) {=
-        int rsp = resp->value;
-        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                            "testing_echo_%d echo response number:%d\n",
-                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                            self->bank_index, rsp);
+  reaction(resp) {=
+    int rsp = resp->value;
+    fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                        "testing_echo_%d echo response number:%d\n",
+                        lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                        self->bank_index, rsp);
 
-        lf_request_stop();
-    =}
+    lf_request_stop();
+  =}
 }
 
 main reactor MultiBank_UnconnectedOutput_Test {
-    test = new [2] testing_echo();
-    e = new [2] echo<int> ();
+  test = new[2] testing_echo()
+  e = new[2] echo<int>()
 
-    test.req -> e.request;
-    e.response -> test.resp;
-}
\ No newline at end of file
+  test.req -> e.request
+  e.response -> test.resp
+}
diff --git a/test/C/src/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf b/test/C/src/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf
index 8ebb1da8ce..23936ec16e 100644
--- a/test/C/src/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf
+++ b/test/C/src/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf
@@ -1,75 +1,75 @@
 target C {
-    workers: 1
-};
+  workers: 1
+}
 
-reactor adder<entry_T> (bank_index:int(0), n_ports:int(1)) {
-    input[n_ports] add_request:entry_T;
-    output[n_ports] add_response:entry_T;
+reactor adder<entry_T>(bank_index: int = 0, n_ports: int = 1) {
+  input[n_ports] add_request: entry_T
+  output[n_ports] add_response: entry_T
 
-    output[n_ports] unconnected:entry_T;
+  output[n_ports] unconnected: entry_T
 
-    state sum:entry_T(0);
+  state sum: entry_T = 0
 
-    reaction (startup) {=
-        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                            "adder_%d ports:%d "
-                            "startup\n",
-                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                            self->bank_index, self->n_ports
-        );
-    =}
+  reaction(startup) {=
+    fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                        "adder_%d ports:%d "
+                        "startup\n",
+                        lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                        self->bank_index, self->n_ports
+    );
+  =}
 
-    reaction (add_request) -> add_response {=
-        for (int i = 0; i < add_request_width; ++i) {
-            if (add_request[i]->is_present) {
-                int req = add_request[i]->value;
-                fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                                    "adder_%d port:%d "
-                                    "received add request:%d\n",
-                                    lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                                    self->bank_index, i, req
-                );
-                self->sum += req;
-                lf_set (add_response[i], self->sum);
-            }
+  reaction(add_request) -> add_response {=
+    for (int i = 0; i < add_request_width; ++i) {
+        if (add_request[i]->is_present) {
+            int req = add_request[i]->value;
+            fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                                "adder_%d port:%d "
+                                "received add request:%d\n",
+                                lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                                self->bank_index, i, req
+            );
+            self->sum += req;
+            lf_set (add_response[i], self->sum);
         }
-    =}
+    }
+  =}
 }
 
-reactor testing_adder (bank_index:int(0)) {
-    output add_req:int;
-    output result_req:int;
-    
-    input add_resp:int;
-    input result_resp:int;
+reactor testing_adder(bank_index: int = 0) {
+  output add_req: int
+  output result_req: int
+
+  input add_resp: int
+  input result_resp: int
 
-    state seed:uint32_t(0);
+  state seed: uint32_t = 0
 
-    reaction (startup) -> add_req {=
-        int number = rand_r(&self->seed) % 100;
-        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                            "testing_adder_%d sending add request number:%d\n",
-                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                            self->bank_index, number
-        );
-        lf_set (add_req, number);
-    =}
+  reaction(startup) -> add_req {=
+    int number = rand_r(&self->seed) % 100;
+    fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                        "testing_adder_%d sending add request number:%d\n",
+                        lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                        self->bank_index, number
+    );
+    lf_set (add_req, number);
+  =}
 
-    reaction (add_resp) {=
-        int rsp = add_resp->value;
-        fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                            "testing_adder_%d response sum:%d\n",
-                            lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                            self->bank_index, rsp);
+  reaction(add_resp) {=
+    int rsp = add_resp->value;
+    fprintf (stderr,    "(%lld, %u) physical_time:%lld "
+                        "testing_adder_%d response sum:%d\n",
+                        lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
+                        self->bank_index, rsp);
 
-        lf_request_stop();
-    =}
+    lf_request_stop();
+  =}
 }
 
 main reactor MultiPort_MultiBankTest_UnconnectedOutput_Test {
-    test = new [2] testing_adder();
-    a = new [2] adder<int> ();
+  test = new[2] testing_adder()
+  a = new[2] adder<int>()
 
-    test.add_req -> a.add_request;
-    a.add_response -> test.add_resp;
-}
\ No newline at end of file
+  test.add_req -> a.add_request
+  a.add_response -> test.add_resp
+}

From 331a242537cdc4eb06aa2874fec6bbb25ee17426 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 11 Sep 2023 13:28:56 -0700
Subject: [PATCH 0840/1114] Simplify unconnected output test

---
 ...rt_MultiBankTest_UnconnectedOutput_Test.lf | 59 ++++++-------------
 1 file changed, 18 insertions(+), 41 deletions(-)

diff --git a/test/C/src/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf b/test/C/src/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf
index 23936ec16e..ed1864b906 100644
--- a/test/C/src/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf
+++ b/test/C/src/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf
@@ -2,74 +2,51 @@ target C {
   workers: 1
 }
 
-reactor adder<entry_T>(bank_index: int = 0, n_ports: int = 1) {
+reactor adder<entry_T>(n_ports: int = 1) {
   input[n_ports] add_request: entry_T
-  output[n_ports] add_response: entry_T
+  output add_response: entry_T
 
   output[n_ports] unconnected: entry_T
 
   state sum: entry_T = 0
 
-  reaction(startup) {=
-    fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                        "adder_%d ports:%d "
-                        "startup\n",
-                        lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                        self->bank_index, self->n_ports
-    );
-  =}
-
   reaction(add_request) -> add_response {=
     for (int i = 0; i < add_request_width; ++i) {
         if (add_request[i]->is_present) {
-            int req = add_request[i]->value;
-            fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                                "adder_%d port:%d "
-                                "received add request:%d\n",
-                                lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                                self->bank_index, i, req
-            );
-            self->sum += req;
-            lf_set (add_response[i], self->sum);
+            self->sum += add_request[i]->value;
         }
     }
+    lf_set (add_response, self->sum);
+    self->sum = 0;
   =}
 }
 
-reactor testing_adder(bank_index: int = 0) {
+reactor testing_adder(bank_index: int = 0, bank_width: int = 1) {
   output add_req: int
   output result_req: int
 
   input add_resp: int
-  input result_resp: int
-
-  state seed: uint32_t = 0
+  input unconnected: int
 
   reaction(startup) -> add_req {=
-    int number = rand_r(&self->seed) % 100;
-    fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                        "testing_adder_%d sending add request number:%d\n",
-                        lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                        self->bank_index, number
-    );
-    lf_set (add_req, number);
+    lf_set (add_req, 42);
   =}
 
   reaction(add_resp) {=
-    int rsp = add_resp->value;
-    fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                        "testing_adder_%d response sum:%d\n",
-                        lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                        self->bank_index, rsp);
-
-    lf_request_stop();
+    int sum = self->bank_width * 42;
+    int received = add_resp->value;
+    printf("Bank index: %d, received: %d\n", self->bank_index, received);
+    if (received != sum) {
+      printf("Wrong value. Should have been %d.\n", sum);
+      exit(1);
+    }
   =}
 }
 
 main reactor MultiPort_MultiBankTest_UnconnectedOutput_Test {
-  test = new[2] testing_adder()
-  a = new[2] adder<int>()
+  test = new[2] testing_adder(bank_width=2)
+  a = new adder<int>(n_ports=2)
 
   test.add_req -> a.add_request
-  a.add_response -> test.add_resp
+  (a.add_response)+ -> test.add_resp
 }

From ee0be68e2a033fa236045ed651b5714db0555f26 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 11 Sep 2023 13:35:31 -0700
Subject: [PATCH 0841/1114] Move test into multiport directory

---
 .../MultiPort_MultiBankTest_UnconnectedOutput_Test.lf             | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/C/src/{ => multiport}/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf (100%)

diff --git a/test/C/src/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf b/test/C/src/multiport/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf
similarity index 100%
rename from test/C/src/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf
rename to test/C/src/multiport/MultiPort_MultiBankTest_UnconnectedOutput_Test.lf

From 0c9d040a1ade5cd6838cde8970f96cc3ddccac5c Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 11 Sep 2023 13:56:20 -0700
Subject: [PATCH 0842/1114] Simplify and move second example

---
 .../C/src/MultiBank_UnconnectedOutput_Test.lf | 65 -------------------
 .../MultiBank_UnconnectedOutput_Test.lf       | 44 +++++++++++++
 2 files changed, 44 insertions(+), 65 deletions(-)
 delete mode 100644 test/C/src/MultiBank_UnconnectedOutput_Test.lf
 create mode 100644 test/C/src/multiport/MultiBank_UnconnectedOutput_Test.lf

diff --git a/test/C/src/MultiBank_UnconnectedOutput_Test.lf b/test/C/src/MultiBank_UnconnectedOutput_Test.lf
deleted file mode 100644
index 2aedcd2a3c..0000000000
--- a/test/C/src/MultiBank_UnconnectedOutput_Test.lf
+++ /dev/null
@@ -1,65 +0,0 @@
-target C {
-  workers: 1
-}
-
-reactor echo<entry_T>(bank_index: int = 0) {
-  input request: entry_T
-  output response: entry_T
-
-  output unconnected: entry_T
-
-  reaction(startup) {=
-    fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                        "echo_%d "
-                        "startup\n",
-                        lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                        self->bank_index
-    );
-  =}
-
-  reaction(request) -> response {=
-    int req = request->value;
-    fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                        "echo_%d "
-                        "received echo request:%d\n",
-                        lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                        self->bank_index, req
-    );
-    lf_set (response, req + self->bank_index);
-  =}
-}
-
-reactor testing_echo(bank_index: int = 0) {
-  output req: int
-  input resp: int
-
-  state seed: uint32_t = 0
-
-  reaction(startup) -> req {=
-    int number = rand_r(&self->seed);
-    fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                        "testing_echo_%d sending echo request number:%d\n",
-                        lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                        self->bank_index, number
-    );
-    lf_set (req, number + self->bank_index);
-  =}
-
-  reaction(resp) {=
-    int rsp = resp->value;
-    fprintf (stderr,    "(%lld, %u) physical_time:%lld "
-                        "testing_echo_%d echo response number:%d\n",
-                        lf_time_logical_elapsed(), lf_tag().microstep, lf_time_physical_elapsed(),
-                        self->bank_index, rsp);
-
-    lf_request_stop();
-  =}
-}
-
-main reactor MultiBank_UnconnectedOutput_Test {
-  test = new[2] testing_echo()
-  e = new[2] echo<int>()
-
-  test.req -> e.request
-  e.response -> test.resp
-}
diff --git a/test/C/src/multiport/MultiBank_UnconnectedOutput_Test.lf b/test/C/src/multiport/MultiBank_UnconnectedOutput_Test.lf
new file mode 100644
index 0000000000..20e79de508
--- /dev/null
+++ b/test/C/src/multiport/MultiBank_UnconnectedOutput_Test.lf
@@ -0,0 +1,44 @@
+target C {
+  workers: 1
+}
+
+reactor echo<entry_T>(bank_index: int = 0) {
+  input request: entry_T
+  output response: entry_T
+
+  output unconnected: entry_T
+
+  reaction(request) -> response {=
+    int req = request->value;
+    lf_set (response, request->value);
+  =}
+}
+
+reactor testing_echo(bank_index: int = 0) {
+  output req: int
+  input resp: int
+
+  state seed: uint32_t = 0
+
+  reaction(startup) -> req {=
+    lf_set (req, 42 + self->bank_index);
+  =}
+
+  reaction(resp) {=
+    int sum = self->bank_index + 42;
+    int received = resp->value;
+    printf("Bank index: %d, received: %d\n", self->bank_index, received);
+    if (received != sum) {
+      printf("Wrong value. Should have been %d.\n", sum);
+      exit(1);
+    }
+  =}
+}
+
+main reactor MultiBank_UnconnectedOutput_Test {
+  test = new[2] testing_echo()
+  e = new[2] echo<int>()
+
+  test.req -> e.request
+  e.response -> test.resp
+}

From f6d845e1900cb6f957919370db018b194293185b Mon Sep 17 00:00:00 2001
From: "lingua-franca[bot]" <97201490+francabot@users.noreply.github.com>
Date: Tue, 12 Sep 2023 21:35:44 -0700
Subject: [PATCH 0843/1114] Update CHANGELOG.md

---
 CHANGELOG.md | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5dd1e426ca..9c14254321 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,47 @@
 # Changelog
+ 
+## [v0.5.1](https://github.com/lf-lang/lingua-franca/tree/v0.5.1) (2023-09-12)
+
+**Highlights**
+
+This release addresses several issues in the C code generator and fixes Docker support for federations.
+
+**✨ Enhancements**
+
+- Avoid squeezing reaction, method, or preamble bodies onto a single line [\#1984](https://github.com/lf-lang/lingua-franca/pull/1984) (@petervdonovan)
+
+**🔧 Fixes**
+
+- Fix for setting federates' bank index [\#1989](https://github.com/lf-lang/lingua-franca/pull/1989) (@petervdonovan)
+- Default hostname for RTI in dockerized federation changed from "localhost" to "rti" [\#1993](https://github.com/lf-lang/lingua-franca/pull/1993) (@byeong-gil)
+- Fix for unconnected multiport and bank reactor bug [\#1953](https://github.com/lf-lang/lingua-franca/pull/1953) (@OmerMajNition)
+
+**🚧 Maintenance and Refactoring**
+
+- Gradlew not longer used to run dev version of lf cli tools [\#1988](https://github.com/lf-lang/lingua-franca/pull/1988) (@axmmisaka)
+- More robust dev scripts and removed util directory [\#1995](https://github.com/lf-lang/lingua-franca/pull/1995) (@cmnrd)
+
+**🧪 Tests**
+
+- Tests for `lf_set_array` and persistent inputs [\#1987](https://github.com/lf-lang/lingua-franca/pull/1987) (@edwardalee)
+- Minor fixes for C++ tests [\#1979](https://github.com/lf-lang/lingua-franca/pull/1979) (@revol-xut)
+
+
+### Submodule [lf-lang/reactor-c](http://github.com/lf-lang/reactor-c)
+
+- No Changes
+
+
+### Submodule [lf-lang/reactor-cpp](http://github.com/lf-lang/reactor-cpp)
+
+- No Changes
+
+
+### Submodule [lf-lang/reactor-rs](http://github.com/lf-lang/reactor-rs)
+
+- No Changes
+
+
 
 ## [v0.5.0](https://github.com/lf-lang/lingua-franca/tree/v0.5.0) (2023-08-30)
 

From 2f47d64b8ee29a0b0463b918bf31e9624435934f Mon Sep 17 00:00:00 2001
From: "lingua-franca[bot]" <97201490+francabot@users.noreply.github.com>
Date: Tue, 12 Sep 2023 21:38:06 -0700
Subject: [PATCH 0844/1114] Bump version to 0.5.1

---
 CHANGELOG.md                                                | 2 +-
 core/src/main/resources/org/lflang/StringsBundle.properties | 2 +-
 gradle.properties                                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c14254321..2a0b9d9b58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 # Changelog
- 
+
 ## [v0.5.1](https://github.com/lf-lang/lingua-franca/tree/v0.5.1) (2023-09-12)
 
 **Highlights**
diff --git a/core/src/main/resources/org/lflang/StringsBundle.properties b/core/src/main/resources/org/lflang/StringsBundle.properties
index dc4f99684f..75eb042e79 100644
--- a/core/src/main/resources/org/lflang/StringsBundle.properties
+++ b/core/src/main/resources/org/lflang/StringsBundle.properties
@@ -1 +1 @@
-VERSION = 0.5.1-SNAPSHOT
+VERSION = 0.5.1
diff --git a/gradle.properties b/gradle.properties
index 245b5cb0ba..4b08da69cb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 [header]
 group=org.lflang
-version=0.5.1-SNAPSHOT
+version=0.5.1
 
 [versions]
 antlrVersion=4.7.2

From d1d1e03cb8db5de7eb399ba6a3353dce0f62d4cb Mon Sep 17 00:00:00 2001
From: "lingua-franca[bot]" <97201490+francabot@users.noreply.github.com>
Date: Tue, 12 Sep 2023 21:43:44 -0700
Subject: [PATCH 0845/1114] Bump version to 0.5.2-SNAPSHOT

---
 core/src/main/resources/org/lflang/StringsBundle.properties | 2 +-
 gradle.properties                                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/resources/org/lflang/StringsBundle.properties b/core/src/main/resources/org/lflang/StringsBundle.properties
index 75eb042e79..a84b5b44f1 100644
--- a/core/src/main/resources/org/lflang/StringsBundle.properties
+++ b/core/src/main/resources/org/lflang/StringsBundle.properties
@@ -1 +1 @@
-VERSION = 0.5.1
+VERSION = 0.5.2-SNAPSHOT
diff --git a/gradle.properties b/gradle.properties
index 4b08da69cb..4b062644e0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 [header]
 group=org.lflang
-version=0.5.1
+version=0.5.2-SNAPSHOT
 
 [versions]
 antlrVersion=4.7.2

From ddf67f33ad09ae1813b108d4ce00003239e5ffd7 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 12 Sep 2023 23:14:52 -0700
Subject: [PATCH 0846/1114] Updated reactor-c submodule

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 09b75edfdb..9760f233d4 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 09b75edfdbfcd0206a89199fcb65b1678398a0c7
+Subproject commit 9760f233d4b1d2653e61c7feb7e3e1379d6e8344

From c68a5b2fd7cffe17d2a896513a5dd266880e226c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Wed, 13 Sep 2023 15:44:10 +0200
Subject: [PATCH 0847/1114] Add bracket list expression

---
 .../main/java/org/lflang/LinguaFranca.xtext   |  8 ++++++++
 core/src/main/java/org/lflang/Target.java     |  5 +++++
 .../src/main/java/org/lflang/ast/IsEqual.java |  8 ++++++++
 core/src/main/java/org/lflang/ast/ToLf.java   | 10 ++++++++++
 core/src/main/java/org/lflang/ast/ToText.java |  6 ++++++
 .../lflang/generator/LfExpressionVisitor.java | 19 +++++++++++++++++++
 .../org/lflang/generator/TargetTypes.java     | 11 +++++++++++
 .../org/lflang/validation/LFValidator.java    | 10 ++++++++++
 8 files changed, 77 insertions(+)

diff --git a/core/src/main/java/org/lflang/LinguaFranca.xtext b/core/src/main/java/org/lflang/LinguaFranca.xtext
index b00456ce07..593b06317e 100644
--- a/core/src/main/java/org/lflang/LinguaFranca.xtext
+++ b/core/src/main/java/org/lflang/LinguaFranca.xtext
@@ -320,6 +320,7 @@ Expression:
     | ParameterReference
     | {CodeExpr} code=Code
     | BracedListExpression
+    | BracketListExpression
 ;
 
 // A list of expressions within braces.
@@ -328,6 +329,13 @@ BracedListExpression:
      '{' {BracedListExpression} (items+=Expression (',' items+=Expression)*)? ','? '}'
 ;
 
+// A list of expressions within square brackets.
+// In Python and TS, this is a list literal. In Rust this could be an array but Rust
+// array expressions are relatively rare so probably not worth supporting.
+BracketListExpression:
+     '[' {BracketListExpression} (items+=Expression (',' items+=Expression)*)? ','? ']'
+;
+
 ParameterReference:
     parameter=[Parameter]
 ;
diff --git a/core/src/main/java/org/lflang/Target.java b/core/src/main/java/org/lflang/Target.java
index 096788484e..8dc820f826 100644
--- a/core/src/main/java/org/lflang/Target.java
+++ b/core/src/main/java/org/lflang/Target.java
@@ -524,6 +524,11 @@ public boolean allowsBracedListExpressions() {
     return this == C || this == CCPP || this == CPP;
   }
 
+  /** Allow expressions of the form {@code [a, b, c]}. */
+  public boolean allowsBracketListExpressions() {
+    return this == Python || this == TS || this == Rust;
+  }
+
   /** Return a string that demarcates the beginning of a single-line comment. */
   public String getSingleLineCommentPrefix() {
     return this.equals(Target.Python) ? "#" : "//";
diff --git a/core/src/main/java/org/lflang/ast/IsEqual.java b/core/src/main/java/org/lflang/ast/IsEqual.java
index af06923d35..9ac2a0a389 100644
--- a/core/src/main/java/org/lflang/ast/IsEqual.java
+++ b/core/src/main/java/org/lflang/ast/IsEqual.java
@@ -16,6 +16,7 @@
 import org.lflang.lf.AttrParm;
 import org.lflang.lf.Attribute;
 import org.lflang.lf.BracedListExpression;
+import org.lflang.lf.BracketListExpression;
 import org.lflang.lf.BuiltinTriggerRef;
 import org.lflang.lf.Code;
 import org.lflang.lf.CodeExpr;
@@ -465,6 +466,13 @@ public Boolean caseBracedListExpression(BracedListExpression object) {
         .conclusion;
   }
 
+  @Override
+  public Boolean caseBracketListExpression(BracketListExpression object) {
+    return new ComparisonMachine<>(object, BracketListExpression.class)
+        .listsEquivalent(BracketListExpression::getItems)
+        .conclusion;
+  }
+
   @Override
   public Boolean caseParameterReference(ParameterReference object) {
     return new ComparisonMachine<>(object, ParameterReference.class)
diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index b91ea5499c..149b9211a3 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -30,6 +30,7 @@
 import org.lflang.lf.AttrParm;
 import org.lflang.lf.Attribute;
 import org.lflang.lf.BracedListExpression;
+import org.lflang.lf.BracketListExpression;
 import org.lflang.lf.BuiltinTriggerRef;
 import org.lflang.lf.Code;
 import org.lflang.lf.CodeExpr;
@@ -873,6 +874,15 @@ public MalleableString caseBracedListExpression(BracedListExpression object) {
     return bracedListExpression(object.getItems());
   }
 
+
+  @Override
+  public MalleableString caseBracketListExpression(BracketListExpression object) {
+    if (object.getItems().isEmpty()) {
+      return MalleableString.anyOf("[]");
+    }
+    return list(", ", "[", "]", false, false, true, object.getItems());
+  }
+
   /**
    * Represent a braced list expression. Do not invoke on expressions that may have comments
    * attached.
diff --git a/core/src/main/java/org/lflang/ast/ToText.java b/core/src/main/java/org/lflang/ast/ToText.java
index 6845fde4e7..515eb29fe5 100644
--- a/core/src/main/java/org/lflang/ast/ToText.java
+++ b/core/src/main/java/org/lflang/ast/ToText.java
@@ -6,6 +6,7 @@
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.lflang.lf.ArraySpec;
 import org.lflang.lf.BracedListExpression;
+import org.lflang.lf.BracketListExpression;
 import org.lflang.lf.Code;
 import org.lflang.lf.CodeExpr;
 import org.lflang.lf.Host;
@@ -80,6 +81,11 @@ public String caseBracedListExpression(BracedListExpression object) {
     return new ToLf().caseBracedListExpression(object).toString();
   }
 
+  @Override
+  public String caseBracketListExpression(BracketListExpression object) {
+    return new ToLf().caseBracketListExpression(object).toString();
+  }
+
   @Override
   public String caseHost(Host host) {
     return new ToLf().caseHost(host).toString();
diff --git a/core/src/main/java/org/lflang/generator/LfExpressionVisitor.java b/core/src/main/java/org/lflang/generator/LfExpressionVisitor.java
index 15f0e8ddad..e5b669b6f2 100644
--- a/core/src/main/java/org/lflang/generator/LfExpressionVisitor.java
+++ b/core/src/main/java/org/lflang/generator/LfExpressionVisitor.java
@@ -25,6 +25,7 @@
 package org.lflang.generator;
 
 import org.lflang.lf.BracedListExpression;
+import org.lflang.lf.BracketListExpression;
 import org.lflang.lf.Code;
 import org.lflang.lf.CodeExpr;
 import org.lflang.lf.Expression;
@@ -43,6 +44,7 @@ public interface LfExpressionVisitor<P, R> {
   R visitLiteral(Literal expr, P param);
 
   R visitBracedListExpr(BracedListExpression expr, P param);
+  R visitBracketListExpr(BracketListExpression expr, P param);
 
   R visitTimeLiteral(Time expr, P param);
 
@@ -66,6 +68,8 @@ static <P, R> R dispatch(
       return visitor.visitLiteral((Literal) e, arg);
     } else if (e instanceof BracedListExpression) {
       return visitor.visitBracedListExpr((BracedListExpression) e, arg);
+    } else if (e instanceof BracketListExpression) {
+      return visitor.visitBracketListExpr((BracketListExpression) e, arg);
     } else if (e instanceof Time) {
       return visitor.visitTimeLiteral((Time) e, arg);
     } else if (e instanceof CodeExpr) {
@@ -106,6 +110,11 @@ public R visitCodeExpr(CodeExpr expr, P param) {
     public R visitParameterRef(ParameterReference expr, P param) {
       return visitExpression(expr, param);
     }
+
+    @Override
+    public R visitBracketListExpr(BracketListExpression expr, P param) {
+      return visitExpression(expr, param);
+    }
   }
 
   /**
@@ -147,6 +156,16 @@ public Expression visitParameterRef(ParameterReference expr, P param) {
       return clone;
     }
 
+    @Override
+    public Expression visitBracketListExpr(BracketListExpression expr, P param) {
+      BracketListExpression clone = LfFactory.eINSTANCE.createBracketListExpression();
+      for (Expression item : expr.getItems()) {
+        clone.getItems().add(dispatch(item, param, this));
+      }
+      return clone;
+
+    }
+
     @Override
     public Expression visitCodeExpr(CodeExpr expr, P param) {
       CodeExpr codeExpr = LfFactory.eINSTANCE.createCodeExpr();
diff --git a/core/src/main/java/org/lflang/generator/TargetTypes.java b/core/src/main/java/org/lflang/generator/TargetTypes.java
index 968a641ed3..65552edc59 100644
--- a/core/src/main/java/org/lflang/generator/TargetTypes.java
+++ b/core/src/main/java/org/lflang/generator/TargetTypes.java
@@ -8,6 +8,7 @@
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Action;
 import org.lflang.lf.BracedListExpression;
+import org.lflang.lf.BracketListExpression;
 import org.lflang.lf.CodeExpr;
 import org.lflang.lf.Expression;
 import org.lflang.lf.Initializer;
@@ -60,6 +61,14 @@ default String getTargetBracedListExpr(BracedListExpression expr, InferredType t
         .collect(Collectors.joining(",", "{", "}"));
   }
 
+  /** Translate the bracket list expression into target language syntax. */
+  default String getTargetBracketListExpr(BracketListExpression expr, InferredType typeOrNull) {
+    InferredType t = typeOrNull == null ? InferredType.undefined() : typeOrNull;
+    return expr.getItems().stream()
+        .map(e -> getTargetExpr(e, t))
+        .collect(Collectors.joining(", ", "[", "]"));
+  }
+
   /** Return an "unknown" type which is used as a default when a type cannot be inferred. */
   String getTargetUndefinedType();
 
@@ -224,6 +233,8 @@ default String getTargetExpr(Expression expr, InferredType type) {
       return ASTUtils.toText(((CodeExpr) expr).getCode());
     } else if (expr instanceof BracedListExpression) {
       return getTargetBracedListExpr((BracedListExpression) expr, type);
+    } else if (expr instanceof BracketListExpression) {
+      return getTargetBracketListExpr((BracketListExpression) expr, type);
     } else {
       throw new IllegalStateException("Invalid value " + expr);
     }
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 7dcf00d107..755d28a42b 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -72,6 +72,7 @@
 import org.lflang.lf.Assignment;
 import org.lflang.lf.Attribute;
 import org.lflang.lf.BracedListExpression;
+import org.lflang.lf.BracketListExpression;
 import org.lflang.lf.BuiltinTrigger;
 import org.lflang.lf.BuiltinTriggerRef;
 import org.lflang.lf.Connection;
@@ -193,6 +194,15 @@ public void checkBracedExpression(BracedListExpression expr) {
     }
   }
 
+  @Check(CheckType.FAST)
+  public void checkBracketExpression(BracketListExpression expr) {
+    if (!target.allowsBracketListExpressions()) {
+      var message =
+          "Bracketed expression lists are not a valid expression for the " + target + " target.";
+      error(message, Literals.BRACKET_LIST_EXPRESSION.eContainmentFeature());
+    }
+  }
+
   @Check(CheckType.FAST)
   public void checkAssignment(Assignment assignment) {
 

From 2bb8212be4411485d2c0891636ff71acdf898a2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Wed, 13 Sep 2023 15:46:41 +0200
Subject: [PATCH 0848/1114] Update tests

---
 .../src/modal_models/util/TraceTesting.lf     |  4 +--
 test/Rust/src/ArrayAsParameter.lf             | 36 +++++++++++++++++++
 test/TypeScript/src/ArrayAsParameter.lf       |  4 +--
 test/TypeScript/src/MovingAverage.lf          |  2 +-
 4 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 test/Rust/src/ArrayAsParameter.lf

diff --git a/test/Python/src/modal_models/util/TraceTesting.lf b/test/Python/src/modal_models/util/TraceTesting.lf
index 0d5053b844..4bad50cd26 100644
--- a/test/Python/src/modal_models/util/TraceTesting.lf
+++ b/test/Python/src/modal_models/util/TraceTesting.lf
@@ -1,12 +1,12 @@
 /** Utility reactor to record and test execution traces. */
 target Python
 
-reactor TraceTesting(events_size=0, trace = {= [] =}, training=False) {
+reactor TraceTesting(events_size=0, trace = [], training=False) {
   input[events_size] events
 
   state last_reaction_time = 0
   state trace_idx = 0
-  state recorded_events = {= [] =}
+  state recorded_events = []
   state recorded_events_next = 0
 
   reaction(startup) {=
diff --git a/test/Rust/src/ArrayAsParameter.lf b/test/Rust/src/ArrayAsParameter.lf
new file mode 100644
index 0000000000..2692512273
--- /dev/null
+++ b/test/Rust/src/ArrayAsParameter.lf
@@ -0,0 +1,36 @@
+// Source has an array as a parameter, the elements of which it passes to Print.
+target Rust
+
+reactor Source(sequence: {= [i32; 3] =} = [0, 1, 2]) {
+  output out: i32
+  state count: usize = 0
+  state seq = sequence
+  logical action next
+
+  reaction(startup, next) -> out, next {=
+    ctx.set(out, self.seq[self.count]);
+    self.count += 1;
+    if self.count < self.seq.len() {
+      ctx.schedule(next, Asap);
+    }
+  =}
+}
+
+reactor Print {
+  input x: i32
+  state count: usize = 0
+
+  reaction(x) {=
+    let expected = [2, 3, 4];
+    let x = ctx.get(x).unwrap();
+    println!("Received: {}.", x);
+    assert_eq!(x, expected[self.count]);
+    self.count += 1;
+  =}
+}
+
+main reactor ArrayAsParameter {
+  s = new Source(sequence = [2, 3, 4])
+  p = new Print()
+  s.out -> p.x
+}
diff --git a/test/TypeScript/src/ArrayAsParameter.lf b/test/TypeScript/src/ArrayAsParameter.lf
index ef9ba9f414..10ef7a5c32 100644
--- a/test/TypeScript/src/ArrayAsParameter.lf
+++ b/test/TypeScript/src/ArrayAsParameter.lf
@@ -1,7 +1,7 @@
 // Source has an array as a parameter, the elements of which it passes to Print.
 target TypeScript
 
-reactor Source(sequence: {= Array<number> =} = {= [0, 1, 2] =}) {
+reactor Source(sequence: Array<number> = [0, 1, 2]) {
   output out: number
   state count: number = 0
   logical action next
@@ -29,7 +29,7 @@ reactor Print {
 }
 
 main reactor ArrayAsParameter {
-  s = new Source(sequence = {= [1, 2, 3, 4] =})
+  s = new Source(sequence = [1, 2, 3, 4])
   p = new Print()
   s.out -> p.x
 }
diff --git a/test/TypeScript/src/MovingAverage.lf b/test/TypeScript/src/MovingAverage.lf
index f99e436ab7..dfe550f612 100644
--- a/test/TypeScript/src/MovingAverage.lf
+++ b/test/TypeScript/src/MovingAverage.lf
@@ -17,7 +17,7 @@ reactor Source {
 }
 
 reactor MovingAverageImpl {
-  state delay_line: {= Array<number> =} = {= [0.0, 0.0, 0.0] =}
+  state delay_line: Array<number> = [0.0, 0.0, 0.0]
   state index: number = 0
   input x: number
   output out: number

From aac3c487e6bd335c5de97dd0fd51946bf4479871 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 13 Sep 2023 15:58:16 +0200
Subject: [PATCH 0849/1114] Enable the spotbugs plugin

---
 buildSrc/build.gradle                         |  2 ++
 buildSrc/gradle.properties                    |  3 ++-
 .../groovy/org.lflang.java-conventions.gradle |  9 +++++++++
 config/spotbugs/exclude.xml                   | 20 +++++++++++++++++++
 gradle.properties                             |  1 +
 5 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 config/spotbugs/exclude.xml

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index db34ac5c23..7c2d942ef8 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -13,6 +13,8 @@ dependencies {
     // https://mvnrepository.com/artifact/com.diffplug.spotless/spotless-lib-extra
     implementation group: 'com.diffplug.spotless', name: 'spotless-lib-extra', version: spotlessLibVersion
 
+    implementation group: 'com.github.spotbugs.snom', name: 'spotbugs-gradle-plugin', version: spotbugsPluginVersion
+
     implementation "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     implementation "com.diffplug.spotless:spotless-plugin-gradle:$spotlessVersion"
 
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index 217c42b57c..a8cd2581d4 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -2,4 +2,5 @@
 spotlessVersion=6.11.0
 spotlessLibVersion=2.30.0
 kotlinVersion=1.6.21
-shadowJarVersion=7.1.2
\ No newline at end of file
+shadowJarVersion=7.1.2
+spotbugsPluginVersion=5.1.3
\ No newline at end of file
diff --git a/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle b/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle
index 9fc4fa50f9..d5697d312c 100644
--- a/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle
@@ -2,6 +2,7 @@ plugins {
     id 'java'
     id 'com.diffplug.spotless'
     id 'org.lflang.platform'
+    id 'com.github.spotbugs'
 }
 
 repositories {
@@ -19,6 +20,14 @@ spotless {
     }
 }
 
+spotbugs {
+    toolVersion = spotbugsToolVersion
+    excludeFilter.set(
+        rootProject.file('config/spotbugs/exclude.xml')
+    )
+}
+
+
 configurations.all {
     resolutionStrategy {
         dependencySubstitution {
diff --git a/config/spotbugs/exclude.xml b/config/spotbugs/exclude.xml
new file mode 100644
index 0000000000..fdd333f455
--- /dev/null
+++ b/config/spotbugs/exclude.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FindBugsFilter>
+    <Match>
+        <Or>
+            <Package name="org.lflang.dsl*"/>
+            <Package name="org.lflang.parser.antlr"/>
+            <Package name="~org.lflang.parser.antlr\..*"/>
+            <Package name="org.lflang.lf"/>
+            <Package name="~org.lflang.lf\..*"/>
+            <Package name="org.lflang.services"/>
+            <Package name="~org.lflang.services\..*"/>
+            <Package name="org.lflang.serializer"/>
+            <Package name="~org.lflang.serializer\..*"/>
+            <Package name="org.lflang.ide.contentassist"/>
+            <Package name="~org.lflang.ide.contentassist\..*"/>
+            <Class name="org.lflang.ide.AbstractLFIdeModule"/>
+            <Class name="org.lflang.tests.LFInjectorProvider"/>
+        </Or>
+    </Match>
+</FindBugsFilter>
diff --git a/gradle.properties b/gradle.properties
index 4b062644e0..636741363c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,6 +21,7 @@ xtextVersion=2.31.0
 klighdVersion=2.3.0.v20230606
 freehepVersion=2.4
 swtVersion=3.124.0
+spotbugsToolVersion=4.7.3
 
 [manifestPropertyNames]
 org.eclipse.xtext=xtextVersion

From 82dd4d64fd50038f0a414a333e3e8632dd4de8c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier@tu-dresden.de>
Date: Wed, 13 Sep 2023 16:32:57 +0200
Subject: [PATCH 0850/1114] Format

---
 test/Python/src/modal_models/util/TraceTesting.lf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Python/src/modal_models/util/TraceTesting.lf b/test/Python/src/modal_models/util/TraceTesting.lf
index 4bad50cd26..027b1ccb19 100644
--- a/test/Python/src/modal_models/util/TraceTesting.lf
+++ b/test/Python/src/modal_models/util/TraceTesting.lf
@@ -1,7 +1,7 @@
 /** Utility reactor to record and test execution traces. */
 target Python
 
-reactor TraceTesting(events_size=0, trace = [], training=False) {
+reactor TraceTesting(events_size=0, trace=[], training=False) {
   input[events_size] events
 
   state last_reaction_time = 0

From 9ea0a85beaf7446319133560fd02b088b1bc0d91 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 14 Sep 2023 14:56:32 +0200
Subject: [PATCH 0851/1114] treat spotbugs issues as warnings, not errors

---
 buildSrc/src/main/groovy/org.lflang.java-conventions.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle b/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle
index d5697d312c..8730fcf7b7 100644
--- a/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle
@@ -25,6 +25,7 @@ spotbugs {
     excludeFilter.set(
         rootProject.file('config/spotbugs/exclude.xml')
     )
+    ignoreFailures = true
 }
 
 

From 1662f32c72a4c3869fda52493bf08003ca890ad4 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 14 Sep 2023 09:54:51 +0200
Subject: [PATCH 0852/1114] fix spotbugs warnings in integration tests

---
 .../org/lflang/tests/lsp/ErrorInserter.java   | 23 ++++++++++++-------
 .../java/org/lflang/tests/lsp/LspTests.java   |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/core/src/integrationTest/java/org/lflang/tests/lsp/ErrorInserter.java b/core/src/integrationTest/java/org/lflang/tests/lsp/ErrorInserter.java
index a1948821eb..13b10156e2 100644
--- a/core/src/integrationTest/java/org/lflang/tests/lsp/ErrorInserter.java
+++ b/core/src/integrationTest/java/org/lflang/tests/lsp/ErrorInserter.java
@@ -4,14 +4,11 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Random;
+import java.nio.file.Paths;
+import java.util.*;
 import java.util.function.BiFunction;
 import java.util.function.BiPredicate;
 import java.util.function.Function;
@@ -125,7 +122,7 @@ public void write() throws IOException {
       if (!src.toFile().renameTo(swapFile(src).toFile())) {
         throw new IOException("Failed to create a swap file.");
       }
-      try (PrintWriter writer = new PrintWriter(src.toFile())) {
+      try (PrintWriter writer = new PrintWriter(src.toFile(), StandardCharsets.UTF_8)) {
         lines.forEach(writer::println);
       }
     }
@@ -233,7 +230,13 @@ private void alter(BiFunction<ListIterator<String>, String, Boolean> alterer) {
 
     /** Return the swap file associated with {@code f}. */
     private static Path swapFile(Path p) {
-      return p.getParent().resolve("." + p.getFileName() + ".swp");
+      final var parent = p.getParent();
+      final var swpName = "." + p.getFileName() + ".swp";
+      if (parent == null) {
+        return Paths.get(swpName);
+      } else {
+        return parent.resolve(swpName);
+      }
     }
   }
 
@@ -265,6 +268,10 @@ public boolean hasNext() {
 
         @Override
         public T next() {
+          if (!hasNext()) {
+            throw new NoSuchElementException();
+          }
+
           T ret = current.item;
           current = current.previous;
           return ret;
diff --git a/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java b/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java
index 9270d9ea82..964963bd0e 100644
--- a/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java
+++ b/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java
@@ -91,7 +91,7 @@ void typescriptValidationTest() throws IOException {
    */
   private void targetLanguageValidationTest(Target target, ErrorInserter.Builder builder)
       throws IOException {
-    long seed = new Random().nextLong();
+    long seed = System.nanoTime();
     System.out.printf(
         "Running validation tests for %s with random seed %d.%n", target.getDisplayName(), seed);
     Random random = new Random(seed);

From 083f288fec12c08395439d5b8c3bab2fdce1e777 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 14 Sep 2023 10:45:06 +0200
Subject: [PATCH 0853/1114] make TestError immutable

---
 .../java/org/lflang/tests/LFTest.java          |  4 ++--
 .../java/org/lflang/tests/TestError.java       | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/LFTest.java b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
index ee67dcbb96..702f8cf4af 100644
--- a/core/src/testFixtures/java/org/lflang/tests/LFTest.java
+++ b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
@@ -165,9 +165,9 @@ public void handleTestError(TestError e) {
     if (e.getMessage() != null) {
       issues.append(e.getMessage());
     }
-    if (e.getException() != null) {
+    if (e.causeIsException()) {
       issues.append(System.lineSeparator());
-      issues.append(TestBase.stackTraceToString(e.getException()));
+      issues.append(e.getOriginalStackTrace());
     }
   }
 
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestError.java b/core/src/testFixtures/java/org/lflang/tests/TestError.java
index efb7d50048..fa22da447e 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestError.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestError.java
@@ -5,12 +5,14 @@
 /// Indicates an error during test execution
 public class TestError extends Exception {
 
-  private Throwable exception;
-  private Result result;
+  private final String stackTrace;
+  private final Result result;
 
   public TestError(String errorMessage, Result result, Throwable exception) {
     super(errorMessage);
-    this.exception = exception;
+    assert result != null;
+
+    this.stackTrace = exception == null ? null : TestBase.stackTraceToString(exception);
     this.result = result;
   }
 
@@ -26,7 +28,13 @@ public Result getResult() {
     return result;
   }
 
-  public Throwable getException() {
-    return exception;
+  /// Return true, if the TestError instance was created based on an exception.
+  public boolean causeIsException() {
+    return stackTrace != null;
+  }
+
+  /// Retrieve the stack trace of the exception that caused the test error.
+  public String getOriginalStackTrace() {
+    return stackTrace;
   }
 }

From 9ce13531e7bee266fa499e80f8cb8c0f6877c814 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 14 Sep 2023 10:55:13 +0200
Subject: [PATCH 0854/1114] fix spotbugs warnings in cli test fixtures

---
 .../java/org/lflang/cli/CliToolTestFixture.java   | 15 ++++++++++-----
 .../java/org/lflang/cli/TestUtils.java            |  5 ++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/cli/base/src/testFixtures/java/org/lflang/cli/CliToolTestFixture.java b/cli/base/src/testFixtures/java/org/lflang/cli/CliToolTestFixture.java
index eab8f1aa9c..0950ad0098 100644
--- a/cli/base/src/testFixtures/java/org/lflang/cli/CliToolTestFixture.java
+++ b/cli/base/src/testFixtures/java/org/lflang/cli/CliToolTestFixture.java
@@ -31,6 +31,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import org.hamcrest.Matcher;
 import org.opentest4j.AssertionFailedError;
@@ -66,7 +67,11 @@ public ExecutionResult run(Path wd, String... args) {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     ByteArrayOutputStream err = new ByteArrayOutputStream();
 
-    Io testIo = new Io(new PrintStream(err), new PrintStream(out), wd);
+    Io testIo =
+        new Io(
+            new PrintStream(err, false, StandardCharsets.UTF_8),
+            new PrintStream(out, false, StandardCharsets.UTF_8),
+            wd);
     int exitCode = testIo.fakeSystemExit(io -> runCliProgram(io, args));
 
     return new ExecutionResult(out, err, exitCode);
@@ -82,11 +87,11 @@ public ExecutionResult run(Path wd, String... args) {
   record ExecutionResult(ByteArrayOutputStream out, ByteArrayOutputStream err, int exitCode) {
 
     public String getOut() {
-      return out.toString();
+      return out.toString(StandardCharsets.UTF_8);
     }
 
     public String getErr() {
-      return err.toString();
+      return err.toString(StandardCharsets.UTF_8);
     }
 
     public void checkOk() {
@@ -117,9 +122,9 @@ public void verify(ThrowingConsumer<ExecutionResult> actions) {
         System.out.println("TEST FAILED");
         System.out.println("> Return code: " + exitCode);
         System.out.println("> Standard output -------------------------");
-        System.err.println(out.toString());
+        System.err.println(out.toString(StandardCharsets.UTF_8));
         System.out.println("> Standard error --------------------------");
-        System.err.println(err.toString());
+        System.err.println(err.toString(StandardCharsets.UTF_8));
         System.out.println("> -----------------------------------------");
 
         if (e instanceof Exception) {
diff --git a/cli/base/src/testFixtures/java/org/lflang/cli/TestUtils.java b/cli/base/src/testFixtures/java/org/lflang/cli/TestUtils.java
index 442742768f..aa471a9ca8 100644
--- a/cli/base/src/testFixtures/java/org/lflang/cli/TestUtils.java
+++ b/cli/base/src/testFixtures/java/org/lflang/cli/TestUtils.java
@@ -111,7 +111,10 @@ public TempDirBuilder file(String relativePath, String contents) throws IOExcept
         throw new IllegalArgumentException("Should be a relative path: " + relativePath);
       }
       Path filePath = curDir.resolve(relPath);
-      Files.createDirectories(filePath.getParent());
+      final var parent = filePath.getParent();
+      if (parent != null) {
+        Files.createDirectories(parent);
+      }
       Files.writeString(filePath, contents);
       return this;
     }

From 468a4a5a1c17917661e45b5f4376ed0dfd0c11d0 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 14 Sep 2023 13:49:48 +0200
Subject: [PATCH 0855/1114] simplifications

---
 core/src/main/java/org/lflang/Target.java | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/org/lflang/Target.java b/core/src/main/java/org/lflang/Target.java
index 096788484e..8ab6af2891 100644
--- a/core/src/main/java/org/lflang/Target.java
+++ b/core/src/main/java/org/lflang/Target.java
@@ -469,16 +469,10 @@ public boolean supportsInheritance() {
 
   /** Return true if the target supports multiports and banks of reactors. */
   public boolean supportsMultiports() {
-    switch (this) {
-      case C:
-      case CCPP:
-      case CPP:
-      case Python:
-      case Rust:
-      case TS:
-        return true;
-    }
-    return false;
+    return switch (this) {
+      case C, CCPP, CPP, Python, Rust, TS -> true;
+      default -> false;
+    };
   }
 
   /**
@@ -494,14 +488,11 @@ public boolean supportsParameterizedWidths() {
    * this target.
    */
   public boolean supportsReactionDeclarations() {
-    if (this.equals(Target.C) || this.equals(Target.CPP)) return true;
-    else return false;
+    return this.equals(Target.C) || this.equals(Target.CPP);
   }
 
   /**
    * Return true if this code for this target should be built using Docker if Docker is used.
-   *
-   * @return
    */
   public boolean buildsUsingDocker() {
     return switch (this) {

From 352925e2b479db7e83bf217eb26b37c4fbc6dd11 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 14 Sep 2023 14:23:57 +0200
Subject: [PATCH 0856/1114] clean up Target.java

---
 core/src/main/java/org/lflang/Target.java | 42 ++++-------------------
 1 file changed, 6 insertions(+), 36 deletions(-)

diff --git a/core/src/main/java/org/lflang/Target.java b/core/src/main/java/org/lflang/Target.java
index 8ab6af2891..c7aadda74f 100644
--- a/core/src/main/java/org/lflang/Target.java
+++ b/core/src/main/java/org/lflang/Target.java
@@ -24,17 +24,15 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import javax.annotation.concurrent.Immutable;
 import org.lflang.lf.TargetDecl;
 
 /**
- * Enumeration of targets and their associated properties. These classes are written in Java, not
- * Xtend, because the enum implementation in Xtend more primitive. It is safer to use enums rather
- * than string values since it allows faulty references to be caught at compile time. Switch
- * statements that take as input an enum but do not have cases for all members of the enum are also
- * reported by Xtend with a warning message.
+ * Enumeration of targets and their associated properties.
  *
  * @author Marten Lohstroh
  */
+@Immutable
 public enum Target {
   C(
       "C",
@@ -90,8 +88,6 @@ public enum Target {
   CPP(
       "Cpp",
       true,
-      "cpp",
-      "Cpp",
       Arrays.asList(
           // List via: https://en.cppreference.com/w/cpp/keyword
           "alignas", // (since C++11)
@@ -194,8 +190,6 @@ public enum Target {
   TS(
       "TypeScript",
       false,
-      "ts",
-      "TS",
       Arrays.asList(
           // List via: https://github.com/Microsoft/TypeScript/issues/2536
           // Reserved words
@@ -352,8 +346,6 @@ public enum Target {
   Rust(
       "Rust",
       true,
-      "rust",
-      "Rust",
       // In our Rust implementation, the only reserved keywords
       // are those that are a valid expression. Others may be escaped
       // with the syntax r#keyword.
@@ -362,17 +354,11 @@ public enum Target {
   /** String representation of this target. */
   private final String displayName;
 
-  /** Name of package containing Kotlin classes for the target language. */
-  public final String packageName;
-
-  /** Prefix of names of Kotlin classes for the target language. */
-  public final String classNamePrefix;
-
   /** Whether or not this target requires types. */
   public final boolean requiresTypes;
 
   /** Reserved words in the target language. */
-  public final Set<String> keywords;
+  private final Set<String> keywords;
 
   /** An unmodifiable list of all known targets. */
   public static final List<Target> ALL = List.of(Target.values());
@@ -382,26 +368,12 @@ public enum Target {
    *
    * @param displayName String representation of this target.
    * @param requiresTypes Types Whether this target requires type annotations or not.
-   * @param packageName Name of package containing Kotlin classes for the target language.
-   * @param classNamePrefix Prefix of names of Kotlin classes for the target language.
    * @param keywords List of reserved strings in the target language.
    */
-  Target(
-      String displayName,
-      boolean requiresTypes,
-      String packageName,
-      String classNamePrefix,
-      Collection<String> keywords) {
+  Target(String displayName, boolean requiresTypes, Collection<String> keywords) {
     this.displayName = displayName;
     this.requiresTypes = requiresTypes;
     this.keywords = Collections.unmodifiableSet(new LinkedHashSet<>(keywords));
-    this.packageName = packageName;
-    this.classNamePrefix = classNamePrefix;
-  }
-
-  /** Private constructor for targets without packageName and classNamePrefix. */
-  Target(String displayName, boolean requiresTypes, Collection<String> keywords) {
-    this(displayName, requiresTypes, "N/A", "N/A", keywords); // FIXME: prefix
   }
 
   /**
@@ -491,9 +463,7 @@ public boolean supportsReactionDeclarations() {
     return this.equals(Target.C) || this.equals(Target.CPP);
   }
 
-  /**
-   * Return true if this code for this target should be built using Docker if Docker is used.
-   */
+  /** Return true if this code for this target should be built using Docker if Docker is used. */
   public boolean buildsUsingDocker() {
     return switch (this) {
       case TS -> false;

From 2616fa05647d57f405dd4465b20df20cbdec11c8 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 14 Sep 2023 14:29:30 +0200
Subject: [PATCH 0857/1114] fix spotbugs warnings in TestBase

---
 .../java/org/lflang/tests/LFTest.java         | 38 ++++++++++---------
 .../java/org/lflang/tests/TestBase.java       | 29 +-------------
 2 files changed, 23 insertions(+), 44 deletions(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/LFTest.java b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
index 702f8cf4af..fb2198d8be 100644
--- a/core/src/testFixtures/java/org/lflang/tests/LFTest.java
+++ b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
@@ -1,11 +1,7 @@
 package org.lflang.tests;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.Reader;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import org.eclipse.xtext.util.RuntimeIOException;
@@ -67,11 +63,6 @@ public LFTest(LFTest test) {
     this(test.target, test.srcPath);
   }
 
-  /** Stream object for capturing standard and error output. */
-  public OutputStream getOutputStream() {
-    return compilationLog;
-  }
-
   public FileConfig getFileConfig() {
     return context.getFileConfig();
   }
@@ -84,6 +75,20 @@ public Path getSrcPath() {
     return srcPath;
   }
 
+  /** Redirect outputs for recording. */
+  public void redirectOutputs() {
+    System.setOut(new PrintStream(compilationLog, false, StandardCharsets.UTF_8));
+    System.setErr(new PrintStream(compilationLog, false, StandardCharsets.UTF_8));
+  }
+
+  /** End output redirection. */
+  public void restoreOutputs() {
+    System.out.flush();
+    System.err.flush();
+    System.setOut(System.out);
+    System.setErr(System.err);
+  }
+
   /**
    * Comparison implementation to allow for tests to be sorted (e.g., when added to a tree set)
    * based on their path (relative to the root of the test directory).
@@ -148,12 +153,12 @@ public void reportErrors() {
       System.out.println(
           "Failed: "
               + this
-              + String.format(" in %.2f seconds\n", getExecutionTimeNanoseconds() / 1.0e9));
+              + String.format(" in %.2f seconds%n", getExecutionTimeNanoseconds() / 1.0e9));
       System.out.println(
           "-----------------------------------------------------------------------------");
       System.out.println("Reason: " + this.result.message);
       printIfNotEmpty("Reported issues", this.issues.toString());
-      printIfNotEmpty("Compilation output", this.compilationLog.toString());
+      printIfNotEmpty("Compilation output", this.compilationLog.toString(StandardCharsets.UTF_8));
       printIfNotEmpty("Execution output", this.execLog.toString());
       System.out.println(
           "+---------------------------------------------------------------------------+");
@@ -258,14 +263,13 @@ public Thread recordStdErr(Process process) {
     private Thread recordStream(StringBuffer builder, InputStream inputStream) {
       return new Thread(
           () -> {
-            try (Reader reader = new InputStreamReader(inputStream)) {
+            try (Reader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8)) {
               int len;
               char[] buf = new char[1024];
               while ((len = reader.read(buf)) > 0) {
                 if (Runtime.getRuntime().freeMemory() < Runtime.getRuntime().totalMemory() / 2) {
-                  Runtime.getRuntime().gc();
-                  if (Runtime.getRuntime().freeMemory() < Runtime.getRuntime().totalMemory() / 2)
-                    builder.delete(0, builder.length() / 2);
+                  builder.delete(0, builder.length() / 2);
+                  builder.insert(0, "[earlier messages were removed to free up memory]%n");
                 }
                 builder.append(buf, 0, len);
               }
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index 9fb8b93dc0..0c78c8b005 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -9,7 +9,6 @@
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
-import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.reflect.Constructor;
@@ -67,12 +66,6 @@ public abstract class TestBase extends LfInjectedTestBase {
 
   @Inject TestRegistry testRegistry;
 
-  /** Reference to System.out. */
-  private static final PrintStream out = System.out;
-
-  /** Reference to System.err. */
-  private static final PrintStream err = System.err;
-
   /** Execution timeout enforced for all tests. */
   private static final long MAX_EXECUTION_TIME_SECONDS = 300;
 
@@ -283,24 +276,6 @@ protected static boolean isLinux() {
     return OS.contains("linux");
   }
 
-  /** End output redirection. */
-  private static void restoreOutputs() {
-    System.out.flush();
-    System.err.flush();
-    System.setOut(out);
-    System.setErr(err);
-  }
-
-  /**
-   * Redirect outputs to the given tests for recording.
-   *
-   * @param test The test to redirect outputs to.
-   */
-  private static void redirectOutputs(LFTest test) {
-    System.setOut(new PrintStream(test.getOutputStream()));
-    System.setErr(new PrintStream(test.getOutputStream()));
-  }
-
   /**
    * Run a test, print results on stderr.
    *
@@ -694,7 +669,7 @@ private void validateAndRun(Set<LFTest> tests, Configurator configurator, TestLe
 
     for (var test : tests) {
       try {
-        redirectOutputs(test);
+        test.redirectOutputs();
         configure(test, configurator, level);
         validate(test);
         if (level.compareTo(TestLevel.CODE_GEN) >= 0) {
@@ -710,7 +685,7 @@ private void validateAndRun(Set<LFTest> tests, Configurator configurator, TestLe
         test.handleTestError(
             new TestError("Unknown exception during test execution", Result.TEST_EXCEPTION, e));
       } finally {
-        restoreOutputs();
+        test.restoreOutputs();
       }
       done++;
       while (Math.floor(done * x) >= marks && marks < 78) {

From f14d6c93f31f27e6e00228dab5ebda6f9804205e Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 14 Sep 2023 14:44:46 +0200
Subject: [PATCH 0858/1114] clean up LFTest

---
 .../java/org/lflang/tests/RunSingleTest.java  |  2 +-
 .../java/org/lflang/tests/LFTest.java         | 19 ++-----------------
 .../java/org/lflang/tests/TestRegistry.java   |  5 ++---
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/core/src/integrationTest/java/org/lflang/tests/RunSingleTest.java b/core/src/integrationTest/java/org/lflang/tests/RunSingleTest.java
index 29e62e835b..fe813823bd 100644
--- a/core/src/integrationTest/java/org/lflang/tests/RunSingleTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/RunSingleTest.java
@@ -70,7 +70,7 @@ public void runSingleTest() throws FileNotFoundException {
 
     Class<? extends TestBase> testClass = getTestInstance(target);
 
-    LFTest testCase = new LFTest(target, path.toAbsolutePath());
+    LFTest testCase = new LFTest(path.toAbsolutePath());
 
     TestBase.runSingleTestAndPrintResults(testCase, testClass, TestBase.pathToLevel(path));
   }
diff --git a/core/src/testFixtures/java/org/lflang/tests/LFTest.java b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
index fb2198d8be..e99fee4b54 100644
--- a/core/src/testFixtures/java/org/lflang/tests/LFTest.java
+++ b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
@@ -6,7 +6,6 @@
 import java.nio.file.Paths;
 import org.eclipse.xtext.util.RuntimeIOException;
 import org.lflang.FileConfig;
-import org.lflang.Target;
 import org.lflang.generator.LFGeneratorContext;
 
 /**
@@ -40,29 +39,19 @@ public class LFTest implements Comparable<LFTest> {
   /** String builder for collecting issues encountered during test execution. */
   private final StringBuilder issues = new StringBuilder();
 
-  /** The target of the test program. */
-  private final Target target;
-
   private long executionTimeNanoseconds;
 
   /**
    * Create a new test.
    *
-   * @param target The target of the test program.
    * @param srcFile The path to the file of the test program.
    */
-  public LFTest(Target target, Path srcFile) {
-    this.target = target;
+  public LFTest(Path srcFile) {
     this.srcPath = srcFile;
     this.name = FileConfig.findPackageRoot(srcFile, s -> {}).relativize(srcFile).toString();
     this.relativePath = Paths.get(name);
   }
 
-  /** Copy constructor */
-  public LFTest(LFTest test) {
-    this(test.target, test.srcPath);
-  }
-
   public FileConfig getFileConfig() {
     return context.getFileConfig();
   }
@@ -141,11 +130,7 @@ public boolean hasPassed() {
     return result == Result.TEST_PASS;
   }
 
-  /**
-   * Compile a string that contains all collected errors and return it.
-   *
-   * @return A string that contains all collected errors.
-   */
+  /** Compile a string that contains all collected errors and return it. */
   public void reportErrors() {
     if (this.hasFailed()) {
       System.out.println(
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
index 17b9984652..e5bb3334cc 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
@@ -116,7 +116,7 @@ public Set<LFTest> getRegisteredTests(Target target, TestCategory category, bool
     if (copy) {
       Set<LFTest> copies = new TreeSet<>();
       for (LFTest test : registered.getTests(target, category)) {
-        copies.add(new LFTest(test));
+        copies.add(new LFTest(test.getSrcPath()));
       }
       return copies;
     } else {
@@ -237,8 +237,7 @@ public FileVisitResult visitFile(Path path, BasicFileAttributes attr) {
       if (attr.isRegularFile() && path.toString().endsWith(".lf")) {
         // Try to parse the file.
         Resource r = rs.getResource(URI.createFileURI(path.toFile().getAbsolutePath()), true);
-        // FIXME: issue warning if target doesn't match!
-        LFTest test = new LFTest(target, path);
+        LFTest test = new LFTest(path);
 
         Iterator<Reactor> reactors = IteratorExtensions.filter(r.getAllContents(), Reactor.class);
 

From b09b8b10269f35f5fa2ae8bad826758c453ae257 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 14 Sep 2023 17:22:38 +0200
Subject: [PATCH 0859/1114] fix warnings in TestRegistry

---
 .../java/org/lflang/tests/TestRegistry.java            | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
index e5bb3334cc..80c20baafd 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
@@ -17,10 +17,12 @@
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
 import java.util.TreeSet;
+
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -42,9 +44,8 @@ public class TestRegistry {
    * List of directories that should be skipped when indexing test files. Any test file that has a
    * directory in its path that matches an entry in this array will not be discovered.
    */
-  public static final String[] IGNORED_DIRECTORIES = {
-    "failing", "knownfailed", "failed", "fed-gen"
-  };
+  public static final List<String> IGNORED_DIRECTORIES =
+      List.of("failing", "knownfailed", "failed", "fed-gen");
 
   /** Path to the root of the repository. */
   public static final Path LF_REPO_PATH = Paths.get("").toAbsolutePath();
@@ -204,7 +205,8 @@ public TestDirVisitor(ResourceSet rs, Target target, Path srcBasePath) {
     @Override
     public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
       for (String ignored : IGNORED_DIRECTORIES) {
-        if (dir.getFileName().toString().equalsIgnoreCase(ignored)) {
+        final var name = dir.getFileName();
+        if (name != null && name.toString().equalsIgnoreCase(ignored)) {
           return SKIP_SUBTREE;
         }
       }

From 06ee3261e9bdaeeb4d5ea8939d6368cbe99a2d79 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 14 Sep 2023 17:50:54 +0200
Subject: [PATCH 0860/1114] fix spotbugs and idea warnings in TestBase

---
 .../java/org/lflang/tests/TestBase.java       | 57 +++++++------------
 1 file changed, 19 insertions(+), 38 deletions(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index 0c78c8b005..a589beb882 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -88,8 +88,6 @@ public abstract class TestBase extends LfInjectedTestBase {
    * @author Marten Lohstroh
    */
   public enum TestLevel {
-    VALIDATION,
-    CODE_GEN,
     BUILD,
     EXECUTION
   }
@@ -100,10 +98,11 @@ public enum TestLevel {
    * @author Anirudh Rengarajan
    */
   public static TestLevel pathToLevel(Path path) {
-    while (path.getParent() != null) {
-      String name = path.getFileName().toString();
+    path = path.getParent();
+    while (path != null) {
+      final var name = path.getFileName();
       for (var category : TestCategory.values()) {
-        if (category.name().equalsIgnoreCase(name)) {
+        if (name != null && name.toString().equalsIgnoreCase(category.name())) {
           return category.level;
         }
       }
@@ -127,13 +126,11 @@ public static class Message {
     public static final String NO_ENCLAVE_SUPPORT = "Targeet does not support the enclave feature.";
     public static final String NO_DOCKER_SUPPORT = "Target does not support the 'docker' property.";
     public static final String NO_DOCKER_TEST_SUPPORT = "Docker tests are only supported on Linux.";
-    public static final String NO_GENERICS_SUPPORT = "Target does not support generic types.";
 
     /* Descriptions of collections of tests. */
     public static final String DESC_SERIALIZATION = "Run serialization tests.";
     public static final String DESC_BASIC = "Run basic tests.";
     public static final String DESC_GENERICS = "Run generics tests.";
-    public static final String DESC_TYPE_PARMS = "Run tests for reactors with type parameters.";
     public static final String DESC_MULTIPORT = "Run multiport tests.";
     public static final String DESC_AS_FEDERATED = "Run non-federated tests in federated mode.";
     public static final String DESC_FEDERATED = "Run federated tests.";
@@ -151,11 +148,6 @@ public static class Message {
     public static final String DESC_ROS2 = "Running tests using ROS2.";
     public static final String DESC_MODAL = "Run modal reactor tests.";
     public static final String DESC_VERIFIER = "Run verifier tests.";
-
-    /* Missing dependency messages */
-    public static final String MISSING_DOCKER =
-        "Executable 'docker' not found or 'docker' daemon thread not running";
-    public static final String MISSING_ARDUINO_CLI = "Executable 'arduino-cli' not found";
   }
 
   /** Constructor for test classes that test a single target. */
@@ -336,7 +328,7 @@ private static void checkAndReportFailures(Set<LFTest> tests) {
     var passed = tests.stream().filter(LFTest::hasPassed).toList();
     var s = new StringBuffer();
     s.append(THIN_LINE);
-    s.append("Passing: ").append(passed.size()).append("/").append(tests.size()).append("\n");
+    s.append("Passing: ").append(passed.size()).append("/").append(tests.size()).append("%n");
     s.append(THIN_LINE);
     passed.forEach(
         test ->
@@ -344,7 +336,7 @@ private static void checkAndReportFailures(Set<LFTest> tests) {
                 .append(test)
                 .append(
                     String.format(
-                        " in %.2f seconds\n", test.getExecutionTimeNanoseconds() / 1.0e9)));
+                        " in %.2f seconds%n", test.getExecutionTimeNanoseconds() / 1.0e9)));
     s.append(THIN_LINE);
     System.out.print(s);
 
@@ -357,16 +349,14 @@ private static void checkAndReportFailures(Set<LFTest> tests) {
   }
 
   /**
-   * Configure a test by applying the given configurator and return a generator context. Also, if
-   * the given level is less than {@code TestLevel.BUILD}, add a {@code no-compile} flag to the
-   * generator context. If the configurator was not applied successfully, throw an AssertionError.
+   * Configure a test by applying the given configurator and return a generator context.
+   * If the configurator was not applied successfully, throw an AssertionError.
    *
    * @param test the test to configure.
    * @param configurator The configurator to apply to the test.
-   * @param level The level of testing in which the generator context will be used.
    */
-  private void configure(LFTest test, Configurator configurator, TestLevel level)
-      throws IOException, TestError {
+  private void configure(LFTest test, Configurator configurator)
+      throws TestError {
     var props = new Properties();
     props.setProperty("hierarchical-bin", "true");
 
@@ -412,11 +402,6 @@ private void configure(LFTest test, Configurator configurator, TestLevel level)
 
     test.configure(context);
 
-    // Set the no-compile flag the test is not supposed to reach the build stage.
-    if (level.compareTo(TestLevel.BUILD) < 0) {
-      context.getArgs().setProperty("no-compile", "");
-    }
-
     // Reload in case target properties have changed.
     context.loadTargetConfig();
     // Update the test by applying the configuration. E.g., to carry out an AST transformation.
@@ -462,9 +447,9 @@ protected void addExtraLfcArgs(Properties args, TargetConfig targetConfig) {
    *
    * @param test The test to generate code for.
    */
-  private GeneratorResult generateCode(LFTest test) throws TestError {
+  private void generateCode(LFTest test) throws TestError {
     if (test.getFileConfig().resource == null) {
-      return GeneratorResult.NOTHING;
+      test.getContext().finish(GeneratorResult.NOTHING);
     }
     try {
       generator.doGenerate(test.getFileConfig().resource, fileAccess, test.getContext());
@@ -474,8 +459,6 @@ private GeneratorResult generateCode(LFTest test) throws TestError {
     if (generator.errorsOccurred()) {
       throw new TestError("Code generation unsuccessful.", Result.CODE_GEN_FAIL);
     }
-
-    return test.getContext().getResult();
   }
 
   /**
@@ -507,13 +490,13 @@ private void execute(LFTest test) throws TestError {
         throw new TestError(Result.TEST_TIMEOUT);
       } else {
         if (stdoutException.get() != null || stderrException.get() != null) {
-          StringBuffer sb = new StringBuffer();
+          StringBuilder sb = new StringBuilder();
           if (stdoutException.get() != null) {
-            sb.append("Error during stdout handling:" + System.lineSeparator());
+            sb.append("Error during stdout handling:%n");
             sb.append(stackTraceToString(stdoutException.get()));
           }
           if (stderrException.get() != null) {
-            sb.append("Error during stderr handling:" + System.lineSeparator());
+            sb.append("Error during stderr handling:%n");
             sb.append(stackTraceToString(stderrException.get()));
           }
           throw new TestError(sb.toString(), Result.TEST_EXCEPTION);
@@ -551,7 +534,7 @@ public static String stackTraceToString(Throwable t) {
   }
 
   /** Bash script that is used to execute docker tests. */
-  private static String DOCKER_RUN_SCRIPT =
+  private static final String DOCKER_RUN_SCRIPT =
       """
             #!/bin/bash
 
@@ -584,7 +567,7 @@ public static String stackTraceToString(Throwable t) {
    *
    * <p>If the script does not yet exist, it is created.
    */
-  private Path getDockerRunScript() throws TestError {
+  private static synchronized Path getDockerRunScript() throws TestError {
     if (dockerRunScript != null) {
       return dockerRunScript;
     }
@@ -670,11 +653,9 @@ private void validateAndRun(Set<LFTest> tests, Configurator configurator, TestLe
     for (var test : tests) {
       try {
         test.redirectOutputs();
-        configure(test, configurator, level);
+        configure(test, configurator);
         validate(test);
-        if (level.compareTo(TestLevel.CODE_GEN) >= 0) {
-          generateCode(test);
-        }
+        generateCode(test);
         if (level == TestLevel.EXECUTION) {
           execute(test);
         }

From 89c13d2ae8f28ca56254cd688f0cc0cb2c6f3d67 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 14 Sep 2023 18:00:42 +0200
Subject: [PATCH 0861/1114] fix spotbugs warnings in issue reporting

---
 .../src/test/kotlin/org/lflang/cli/LfcIssueReportingTest.kt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cli/lfc/src/test/kotlin/org/lflang/cli/LfcIssueReportingTest.kt b/cli/lfc/src/test/kotlin/org/lflang/cli/LfcIssueReportingTest.kt
index c2839673be..21cdaf3043 100644
--- a/cli/lfc/src/test/kotlin/org/lflang/cli/LfcIssueReportingTest.kt
+++ b/cli/lfc/src/test/kotlin/org/lflang/cli/LfcIssueReportingTest.kt
@@ -38,7 +38,9 @@ import java.nio.file.Paths
 
 class SpyPrintStream {
     private val baout = ByteArrayOutputStream()
-    val ps = PrintStream(baout)
+    private val ps = PrintStream(baout, false, StandardCharsets.UTF_8)
+
+    fun getSpiedErrIo(): Io = Io(err = ps)
 
     override fun toString(): String = baout.toString(StandardCharsets.UTF_8)
 }
@@ -111,7 +113,7 @@ class LfcIssueReportingTest {
 
         val stderr = SpyPrintStream()
 
-        val io = Io(err = stderr.ps)
+        val io = stderr.getSpiedErrIo()
         val backend = ReportingBackend(io, AnsiColors(useColors).bold("lfc: "), AnsiColors(useColors), 2)
         val injector = LFStandaloneSetup(LFRuntimeModule(), LFStandaloneModule(backend, io))
             .createInjectorAndDoEMFRegistration()

From eddd59360dafe5a023a445b0c21e137dc07321fc Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 14 Sep 2023 18:10:05 +0200
Subject: [PATCH 0862/1114] formatting

---
 core/src/testFixtures/java/org/lflang/tests/TestBase.java  | 7 +++----
 .../testFixtures/java/org/lflang/tests/TestRegistry.java   | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index a589beb882..ee0d72ff02 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -349,14 +349,13 @@ private static void checkAndReportFailures(Set<LFTest> tests) {
   }
 
   /**
-   * Configure a test by applying the given configurator and return a generator context.
-   * If the configurator was not applied successfully, throw an AssertionError.
+   * Configure a test by applying the given configurator and return a generator context. If the
+   * configurator was not applied successfully, throw an AssertionError.
    *
    * @param test the test to configure.
    * @param configurator The configurator to apply to the test.
    */
-  private void configure(LFTest test, Configurator configurator)
-      throws TestError {
+  private void configure(LFTest test, Configurator configurator) throws TestError {
     var props = new Properties();
     props.setProperty("hierarchical-bin", "true");
 
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
index 80c20baafd..14b12647ad 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
@@ -22,7 +22,6 @@
 import java.util.Set;
 import java.util.Stack;
 import java.util.TreeSet;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;

From 5fb671c3f470da9ee667df9575814f7eb10ec55f Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Thu, 14 Sep 2023 20:23:47 +0200
Subject: [PATCH 0863/1114] Update nrf52 handling of the zephyr counter drivers

---
 .../lib/platform/zephyr/boards/nrf52dk_nrf52832.overlay        | 3 +++
 .../lib/platform/zephyr/boards/nrf52dk_nrf52832_lf.conf        | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/nrf52dk_nrf52832.overlay
 delete mode 100644 core/src/main/resources/lib/platform/zephyr/boards/nrf52dk_nrf52832_lf.conf

diff --git a/core/src/main/resources/lib/platform/zephyr/boards/nrf52dk_nrf52832.overlay b/core/src/main/resources/lib/platform/zephyr/boards/nrf52dk_nrf52832.overlay
new file mode 100644
index 0000000000..30472cd1fb
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/nrf52dk_nrf52832.overlay
@@ -0,0 +1,3 @@
+&timer1 {
+	status = "okay";
+};
\ No newline at end of file
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/nrf52dk_nrf52832_lf.conf b/core/src/main/resources/lib/platform/zephyr/boards/nrf52dk_nrf52832_lf.conf
deleted file mode 100644
index 8bc7cfdbc5..0000000000
--- a/core/src/main/resources/lib/platform/zephyr/boards/nrf52dk_nrf52832_lf.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_COUNTER_TIMER1=y

From e9f3bade4f8e5c9e72b6e8ddd7f329ece28ab081 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 14 Sep 2023 17:03:29 -0700
Subject: [PATCH 0864/1114] Build epoch against fork

---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6d7edf2145..25c12ebf0e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,7 +32,8 @@ jobs:
           files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/base/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfc/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfd/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lff/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
 
   epoch:
-    uses: lf-lang/epoch/.github/workflows/build.yml@main
+    uses: lf-lang/epoch/.github/workflows/build.yml@build-against-fork
     with:
       lingua-franca-ref: ${{ github.head_ref || github.ref_name }}
+      lingua-franca-repo: ${{ github.repository }}
       upload-artifacts: false

From 91b219b4fa42a2e51c3f384157cf80328467d363 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 14 Sep 2023 18:24:29 -0700
Subject: [PATCH 0865/1114] Pass in URL instead of repo name

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 25c12ebf0e..32e34c9ffb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,5 +35,5 @@ jobs:
     uses: lf-lang/epoch/.github/workflows/build.yml@build-against-fork
     with:
       lingua-franca-ref: ${{ github.head_ref || github.ref_name }}
-      lingua-franca-repo: ${{ github.repository }}
+      lingua-franca-repo: ${{ github.event.pull_request.head.repo.full_name }}
       upload-artifacts: false

From 63ddf066a7821fbd2272d02aca7ad0661f85b601 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 14 Sep 2023 19:24:44 -0700
Subject: [PATCH 0866/1114] Apply formatter

---
 core/src/main/java/org/lflang/ast/ToLf.java                     | 1 -
 .../src/main/java/org/lflang/generator/LfExpressionVisitor.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index 149b9211a3..dd8096a5e3 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -874,7 +874,6 @@ public MalleableString caseBracedListExpression(BracedListExpression object) {
     return bracedListExpression(object.getItems());
   }
 
-
   @Override
   public MalleableString caseBracketListExpression(BracketListExpression object) {
     if (object.getItems().isEmpty()) {
diff --git a/core/src/main/java/org/lflang/generator/LfExpressionVisitor.java b/core/src/main/java/org/lflang/generator/LfExpressionVisitor.java
index e5b669b6f2..c50f805209 100644
--- a/core/src/main/java/org/lflang/generator/LfExpressionVisitor.java
+++ b/core/src/main/java/org/lflang/generator/LfExpressionVisitor.java
@@ -44,6 +44,7 @@ public interface LfExpressionVisitor<P, R> {
   R visitLiteral(Literal expr, P param);
 
   R visitBracedListExpr(BracedListExpression expr, P param);
+
   R visitBracketListExpr(BracketListExpression expr, P param);
 
   R visitTimeLiteral(Time expr, P param);
@@ -163,7 +164,6 @@ public Expression visitBracketListExpr(BracketListExpression expr, P param) {
         clone.getItems().add(dispatch(item, param, this));
       }
       return clone;
-
     }
 
     @Override

From da30b7925e7358e622755a2e0516191f42b12894 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 14 Sep 2023 22:04:35 -0700
Subject: [PATCH 0867/1114] Update .github/workflows/build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 32e34c9ffb..da1990ca3f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,7 +32,7 @@ jobs:
           files: core/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/base/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfc/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lfd/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml,cli/lff/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
 
   epoch:
-    uses: lf-lang/epoch/.github/workflows/build.yml@build-against-fork
+    uses: lf-lang/epoch/.github/workflows/build.yml@main
     with:
       lingua-franca-ref: ${{ github.head_ref || github.ref_name }}
       lingua-franca-repo: ${{ github.event.pull_request.head.repo.full_name }}

From c69a519847ae761a13f7d0e64922f88a8bd74fe2 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Fri, 15 Sep 2023 09:58:18 +0200
Subject: [PATCH 0868/1114] Add board-specific tests to the Zephyr regressions
 tests. We just make sure that HelloWorld programs compile for different
 boards.

---
 .gitmodules                                        |  2 +-
 .../java/org/lflang/tests/runtime/CZephyrTest.java | 12 ++++++++++++
 .../lib/platform/zephyr/boards/arduino_due.overlay |  4 ++++
 .../platform/zephyr/boards/bl5340_dvk_cpuapp.conf  |  5 +++++
 .../zephyr/boards/bl5340_dvk_cpuapp.overlay        | 12 ++++++++++++
 .../platform/zephyr/boards/esp32c3_devkitm.overlay |  3 +++
 .../platform/zephyr/boards/esp32s2_saola.overlay   |  3 +++
 .../platform/zephyr/boards/esp32s3_devkitm.overlay |  3 +++
 .../platform/zephyr/boards/gd32e103v_eval.overlay  | 10 ++++++++++
 .../platform/zephyr/boards/gd32e507v_start.overlay | 10 ++++++++++
 .../platform/zephyr/boards/gd32e507z_eval.overlay  | 10 ++++++++++
 .../platform/zephyr/boards/gd32f350r_eval.overlay  | 10 ++++++++++
 .../platform/zephyr/boards/gd32f403z_eval.overlay  | 10 ++++++++++
 .../platform/zephyr/boards/gd32f407v_start.overlay | 10 ++++++++++
 .../platform/zephyr/boards/gd32f450i_eval.overlay  | 10 ++++++++++
 .../platform/zephyr/boards/gd32f450v_start.overlay | 10 ++++++++++
 .../platform/zephyr/boards/gd32f450z_eval.overlay  | 10 ++++++++++
 .../platform/zephyr/boards/gd32f470i_eval.overlay  | 10 ++++++++++
 .../zephyr/boards/nrf51dk_nrf51422.overlay         |  3 +++
 .../zephyr/boards/nrf52840dk_nrf52840.overlay      |  3 +++
 .../zephyr/boards/nrf9160dk_nrf9160.overlay        |  3 +++
 .../zephyr/boards/s32z270dc2_rtu0_r52.overlay      | 10 ++++++++++
 .../zephyr/boards/s32z270dc2_rtu1_r52.overlay      | 10 ++++++++++
 .../lib/platform/zephyr/boards/sam4e_xpro.overlay  |  4 ++++
 .../platform/zephyr/boards/sam4s_xplained.overlay  |  4 ++++
 .../zephyr/boards/sam_e70_xplained.overlay         |  4 ++++
 .../zephyr/boards/sam_e70b_xplained.overlay        |  4 ++++
 .../platform/zephyr/boards/sam_v71_xult.overlay    |  4 ++++
 .../platform/zephyr/boards/sam_v71b_xult.overlay   |  4 ++++
 .../zephyr/boards/stm32h735g_disco.overlay         |  6 ++++++
 .../platform/zephyr/boards/stm32l562e_dk_ns.conf   |  7 +++++++
 .../java/org/lflang/tests/TestRegistry.java        |  1 +
 test/C/src/zephyr/boards/ArduinoDue.lf             | 14 ++++++++++++++
 test/C/src/zephyr/boards/ESP32.lf                  | 14 ++++++++++++++
 test/C/src/zephyr/boards/GD32.lf                   | 14 ++++++++++++++
 test/C/src/zephyr/boards/NRF52.lf                  | 14 ++++++++++++++
 test/C/src/zephyr/boards/NXPIMXRT1170.lf           | 14 ++++++++++++++
 test/C/src/zephyr/boards/NXPS32.lf                 | 14 ++++++++++++++
 test/C/src/zephyr/boards/SAM.lf                    | 14 ++++++++++++++
 test/C/src/zephyr/boards/STM32.lf                  | 12 ++++++++++++
 40 files changed, 320 insertions(+), 1 deletion(-)
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/arduino_due.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/bl5340_dvk_cpuapp.conf
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/bl5340_dvk_cpuapp.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/esp32c3_devkitm.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/esp32s2_saola.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/esp32s3_devkitm.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/gd32e103v_eval.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/gd32e507v_start.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/gd32e507z_eval.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/gd32f350r_eval.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/gd32f403z_eval.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/gd32f407v_start.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/gd32f450i_eval.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/gd32f450v_start.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/gd32f450z_eval.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/gd32f470i_eval.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/nrf51dk_nrf51422.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/nrf52840dk_nrf52840.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/nrf9160dk_nrf9160.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/s32z270dc2_rtu0_r52.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/s32z270dc2_rtu1_r52.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/sam4e_xpro.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/sam4s_xplained.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/sam_e70_xplained.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/sam_e70b_xplained.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/sam_v71_xult.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/sam_v71b_xult.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/stm32h735g_disco.overlay
 create mode 100644 core/src/main/resources/lib/platform/zephyr/boards/stm32l562e_dk_ns.conf
 create mode 100644 test/C/src/zephyr/boards/ArduinoDue.lf
 create mode 100644 test/C/src/zephyr/boards/ESP32.lf
 create mode 100644 test/C/src/zephyr/boards/GD32.lf
 create mode 100644 test/C/src/zephyr/boards/NRF52.lf
 create mode 100644 test/C/src/zephyr/boards/NXPIMXRT1170.lf
 create mode 100644 test/C/src/zephyr/boards/NXPS32.lf
 create mode 100644 test/C/src/zephyr/boards/SAM.lf
 create mode 100644 test/C/src/zephyr/boards/STM32.lf

diff --git a/.gitmodules b/.gitmodules
index 9cd89ffe1a..1eaef285c7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "org.lflang/src/lib/c/reactor-c"]
 	path = core/src/main/resources/lib/c/reactor-c
-	url = https://github.com/lf-lang/reactor-c.git
+	url = git@github.com:lf-lang/reactor-c.git
 [submodule "org.lflang/src/lib/cpp/reactor-cpp"]
 	path = core/src/main/resources/lib/cpp/reactor-cpp
 	url = https://github.com/lf-lang/reactor-cpp
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java
index 145f4b1d53..6ab2490abe 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java
@@ -55,6 +55,18 @@ public void buildZephyrUnthreadedTests() {
         false);
   }
 
+  @Test
+  public void buildZephyrBoardTests() {
+    Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
+    super.runTestsFor(
+        List.of(Target.C),
+        Message.DESC_ZEPHYR,
+        TestCategory.ZEPHYR_BOARDS::equals,
+        Configurators::noChanges,
+        TestLevel.BUILD,
+        false);
+  }
+
   @Test
   public void buildZephyrThreadedTests() {
     Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/arduino_due.overlay b/core/src/main/resources/lib/platform/zephyr/boards/arduino_due.overlay
new file mode 100644
index 0000000000..12087adfaa
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/arduino_due.overlay
@@ -0,0 +1,4 @@
+&tc0 {
+        clk = <4>;
+        status = "okay";
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/bl5340_dvk_cpuapp.conf b/core/src/main/resources/lib/platform/zephyr/boards/bl5340_dvk_cpuapp.conf
new file mode 100644
index 0000000000..c9e4c07698
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/bl5340_dvk_cpuapp.conf
@@ -0,0 +1,5 @@
+# Enable RTC
+CONFIG_I2C=y
+CONFIG_COUNTER=y
+CONFIG_COUNTER_MICROCHIP_MCP7940N=y
+CONFIG_COUNTER_INIT_PRIORITY=65
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/bl5340_dvk_cpuapp.overlay b/core/src/main/resources/lib/platform/zephyr/boards/bl5340_dvk_cpuapp.overlay
new file mode 100644
index 0000000000..7869ff34ea
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/bl5340_dvk_cpuapp.overlay
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2021 Laird Connectivity
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&i2c1 {
+	/* Connect MCP7940N MFP pin TP9 to P0.04 */
+	extrtc0: mcp7940n@6f {
+		int-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
+	};
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/esp32c3_devkitm.overlay b/core/src/main/resources/lib/platform/zephyr/boards/esp32c3_devkitm.overlay
new file mode 100644
index 0000000000..241947b064
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/esp32c3_devkitm.overlay
@@ -0,0 +1,3 @@
+&timer0 {
+	status = "okay";
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/esp32s2_saola.overlay b/core/src/main/resources/lib/platform/zephyr/boards/esp32s2_saola.overlay
new file mode 100644
index 0000000000..241947b064
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/esp32s2_saola.overlay
@@ -0,0 +1,3 @@
+&timer0 {
+	status = "okay";
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/esp32s3_devkitm.overlay b/core/src/main/resources/lib/platform/zephyr/boards/esp32s3_devkitm.overlay
new file mode 100644
index 0000000000..241947b064
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/esp32s3_devkitm.overlay
@@ -0,0 +1,3 @@
+&timer0 {
+	status = "okay";
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/gd32e103v_eval.overlay b/core/src/main/resources/lib/platform/zephyr/boards/gd32e103v_eval.overlay
new file mode 100644
index 0000000000..abebc86c8e
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/gd32e103v_eval.overlay
@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com>
+ */
+
+&timer0 {
+	status = "okay";
+	prescaler = <29999>;
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/gd32e507v_start.overlay b/core/src/main/resources/lib/platform/zephyr/boards/gd32e507v_start.overlay
new file mode 100644
index 0000000000..9e20c4e607
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/gd32e507v_start.overlay
@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com>
+ */
+
+&timer0 {
+	status = "okay";
+	prescaler = <44999>;
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/gd32e507z_eval.overlay b/core/src/main/resources/lib/platform/zephyr/boards/gd32e507z_eval.overlay
new file mode 100644
index 0000000000..9e20c4e607
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/gd32e507z_eval.overlay
@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com>
+ */
+
+&timer0 {
+	status = "okay";
+	prescaler = <44999>;
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/gd32f350r_eval.overlay b/core/src/main/resources/lib/platform/zephyr/boards/gd32f350r_eval.overlay
new file mode 100644
index 0000000000..7b0464653b
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/gd32f350r_eval.overlay
@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com>
+ */
+
+&timer0 {
+	status = "okay";
+	prescaler = <26999>;
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/gd32f403z_eval.overlay b/core/src/main/resources/lib/platform/zephyr/boards/gd32f403z_eval.overlay
new file mode 100644
index 0000000000..06918e09dd
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/gd32f403z_eval.overlay
@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com>
+ */
+
+&timer0 {
+	status = "okay";
+	prescaler = <41999>;
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/gd32f407v_start.overlay b/core/src/main/resources/lib/platform/zephyr/boards/gd32f407v_start.overlay
new file mode 100644
index 0000000000..06918e09dd
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/gd32f407v_start.overlay
@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com>
+ */
+
+&timer0 {
+	status = "okay";
+	prescaler = <41999>;
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/gd32f450i_eval.overlay b/core/src/main/resources/lib/platform/zephyr/boards/gd32f450i_eval.overlay
new file mode 100644
index 0000000000..ac50bfbe62
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/gd32f450i_eval.overlay
@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com>
+ */
+
+&timer0 {
+	status = "okay";
+	prescaler = <49999>;
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/gd32f450v_start.overlay b/core/src/main/resources/lib/platform/zephyr/boards/gd32f450v_start.overlay
new file mode 100644
index 0000000000..ac50bfbe62
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/gd32f450v_start.overlay
@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com>
+ */
+
+&timer0 {
+	status = "okay";
+	prescaler = <49999>;
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/gd32f450z_eval.overlay b/core/src/main/resources/lib/platform/zephyr/boards/gd32f450z_eval.overlay
new file mode 100644
index 0000000000..ac50bfbe62
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/gd32f450z_eval.overlay
@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com>
+ */
+
+&timer0 {
+	status = "okay";
+	prescaler = <49999>;
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/gd32f470i_eval.overlay b/core/src/main/resources/lib/platform/zephyr/boards/gd32f470i_eval.overlay
new file mode 100644
index 0000000000..9ed334331f
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/gd32f470i_eval.overlay
@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@gmail.com>
+ */
+
+&timer0 {
+	status = "okay";
+	prescaler = <59999>;
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/nrf51dk_nrf51422.overlay b/core/src/main/resources/lib/platform/zephyr/boards/nrf51dk_nrf51422.overlay
new file mode 100644
index 0000000000..0c88903dc5
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/nrf51dk_nrf51422.overlay
@@ -0,0 +1,3 @@
+&timer1 {
+	status = "okay";
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/nrf52840dk_nrf52840.overlay b/core/src/main/resources/lib/platform/zephyr/boards/nrf52840dk_nrf52840.overlay
new file mode 100644
index 0000000000..5e37ad9fff
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/nrf52840dk_nrf52840.overlay
@@ -0,0 +1,3 @@
+&rtc0 {
+	status = "okay";
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/nrf9160dk_nrf9160.overlay b/core/src/main/resources/lib/platform/zephyr/boards/nrf9160dk_nrf9160.overlay
new file mode 100644
index 0000000000..5e37ad9fff
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/nrf9160dk_nrf9160.overlay
@@ -0,0 +1,3 @@
+&rtc0 {
+	status = "okay";
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/s32z270dc2_rtu0_r52.overlay b/core/src/main/resources/lib/platform/zephyr/boards/s32z270dc2_rtu0_r52.overlay
new file mode 100644
index 0000000000..e0f2025d37
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/s32z270dc2_rtu0_r52.overlay
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2022 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&stm0 {
+	prescaler = <1>;
+	status = "okay";
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/s32z270dc2_rtu1_r52.overlay b/core/src/main/resources/lib/platform/zephyr/boards/s32z270dc2_rtu1_r52.overlay
new file mode 100644
index 0000000000..e0f2025d37
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/s32z270dc2_rtu1_r52.overlay
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2022 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&stm0 {
+	prescaler = <1>;
+	status = "okay";
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/sam4e_xpro.overlay b/core/src/main/resources/lib/platform/zephyr/boards/sam4e_xpro.overlay
new file mode 100644
index 0000000000..12087adfaa
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/sam4e_xpro.overlay
@@ -0,0 +1,4 @@
+&tc0 {
+        clk = <4>;
+        status = "okay";
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/sam4s_xplained.overlay b/core/src/main/resources/lib/platform/zephyr/boards/sam4s_xplained.overlay
new file mode 100644
index 0000000000..12087adfaa
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/sam4s_xplained.overlay
@@ -0,0 +1,4 @@
+&tc0 {
+        clk = <4>;
+        status = "okay";
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/sam_e70_xplained.overlay b/core/src/main/resources/lib/platform/zephyr/boards/sam_e70_xplained.overlay
new file mode 100644
index 0000000000..12087adfaa
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/sam_e70_xplained.overlay
@@ -0,0 +1,4 @@
+&tc0 {
+        clk = <4>;
+        status = "okay";
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/sam_e70b_xplained.overlay b/core/src/main/resources/lib/platform/zephyr/boards/sam_e70b_xplained.overlay
new file mode 100644
index 0000000000..12087adfaa
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/sam_e70b_xplained.overlay
@@ -0,0 +1,4 @@
+&tc0 {
+        clk = <4>;
+        status = "okay";
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/sam_v71_xult.overlay b/core/src/main/resources/lib/platform/zephyr/boards/sam_v71_xult.overlay
new file mode 100644
index 0000000000..12087adfaa
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/sam_v71_xult.overlay
@@ -0,0 +1,4 @@
+&tc0 {
+        clk = <4>;
+        status = "okay";
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/sam_v71b_xult.overlay b/core/src/main/resources/lib/platform/zephyr/boards/sam_v71b_xult.overlay
new file mode 100644
index 0000000000..12087adfaa
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/sam_v71b_xult.overlay
@@ -0,0 +1,4 @@
+&tc0 {
+        clk = <4>;
+        status = "okay";
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/stm32h735g_disco.overlay b/core/src/main/resources/lib/platform/zephyr/boards/stm32h735g_disco.overlay
new file mode 100644
index 0000000000..00a10669ba
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/stm32h735g_disco.overlay
@@ -0,0 +1,6 @@
+&timers2 {
+	st,prescaler = <83>;
+	counter {
+		status = "okay";
+	};
+};
diff --git a/core/src/main/resources/lib/platform/zephyr/boards/stm32l562e_dk_ns.conf b/core/src/main/resources/lib/platform/zephyr/boards/stm32l562e_dk_ns.conf
new file mode 100644
index 0000000000..52d11aac39
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/boards/stm32l562e_dk_ns.conf
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2022 O.S.Systems
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+CONFIG_BUILD_WITH_TFM=y
+CONFIG_TFM_PROFILE_TYPE_MEDIUM=y
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
index 17b9984652..1ffa93905b 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
@@ -334,6 +334,7 @@ public enum TestCategory {
     ARDUINO(false, "", TestLevel.BUILD),
     ZEPHYR_THREADED(false, "zephyr" + File.separator + "threaded", TestLevel.BUILD),
     ZEPHYR_UNTHREADED(false, "zephyr" + File.separator + "unthreaded", TestLevel.BUILD),
+    ZEPHYR_BOARDS(false, "zephyr" + File.separator + "boards", TestLevel.BUILD),
     VERIFIER(false, "verifier", TestLevel.EXECUTION),
     TARGET(false, "", TestLevel.EXECUTION);
 
diff --git a/test/C/src/zephyr/boards/ArduinoDue.lf b/test/C/src/zephyr/boards/ArduinoDue.lf
new file mode 100644
index 0000000000..8bc1358c10
--- /dev/null
+++ b/test/C/src/zephyr/boards/ArduinoDue.lf
@@ -0,0 +1,14 @@
+target C {
+  platform: {
+    name: Zephyr,
+    board: arduino_due
+  }
+}
+
+main reactor {
+  timer t(0, 1 sec)
+
+  reaction(t) {=
+    printf("Hello\n");
+  =}
+}
diff --git a/test/C/src/zephyr/boards/ESP32.lf b/test/C/src/zephyr/boards/ESP32.lf
new file mode 100644
index 0000000000..4e1a6936c3
--- /dev/null
+++ b/test/C/src/zephyr/boards/ESP32.lf
@@ -0,0 +1,14 @@
+target C {
+  platform: {
+    name: Zephyr,
+    board: esp32
+  }
+}
+
+main reactor {
+  timer t(0, 1 sec)
+
+  reaction(t) {=
+    printf("Hello\n");
+  =}
+}
diff --git a/test/C/src/zephyr/boards/GD32.lf b/test/C/src/zephyr/boards/GD32.lf
new file mode 100644
index 0000000000..2cee0ef537
--- /dev/null
+++ b/test/C/src/zephyr/boards/GD32.lf
@@ -0,0 +1,14 @@
+target C {
+  platform: {
+    name: Zephyr,
+    board: gd32f403z_eval
+  }
+}
+
+main reactor {
+  timer t(0, 1 sec)
+
+  reaction(t) {=
+    printf("Hello\n");
+  =}
+}
diff --git a/test/C/src/zephyr/boards/NRF52.lf b/test/C/src/zephyr/boards/NRF52.lf
new file mode 100644
index 0000000000..4d2a4fa551
--- /dev/null
+++ b/test/C/src/zephyr/boards/NRF52.lf
@@ -0,0 +1,14 @@
+target C {
+  platform: {
+    name: Zephyr,
+    board: nrf52dk_nrf52832
+  }
+}
+
+main reactor {
+  timer t(0, 1 sec)
+
+  reaction(t) {=
+    printf("Hello\n");
+  =}
+}
diff --git a/test/C/src/zephyr/boards/NXPIMXRT1170.lf b/test/C/src/zephyr/boards/NXPIMXRT1170.lf
new file mode 100644
index 0000000000..f3f36a22bb
--- /dev/null
+++ b/test/C/src/zephyr/boards/NXPIMXRT1170.lf
@@ -0,0 +1,14 @@
+target C {
+  platform: {
+    name: Zephyr,
+    board: mimxrt1170_evk_cm7
+  }
+}
+
+main reactor {
+  timer t(0, 1 sec)
+
+  reaction(t) {=
+    printf("Hello\n");
+  =}
+}
diff --git a/test/C/src/zephyr/boards/NXPS32.lf b/test/C/src/zephyr/boards/NXPS32.lf
new file mode 100644
index 0000000000..64bb94f46d
--- /dev/null
+++ b/test/C/src/zephyr/boards/NXPS32.lf
@@ -0,0 +1,14 @@
+target C {
+  platform: {
+    name: Zephyr,
+    board: s32z270dc2_rtu0_r52
+  }
+}
+
+main reactor {
+  timer t(0, 1 sec)
+
+  reaction(t) {=
+    printf("Hello\n");
+  =}
+}
diff --git a/test/C/src/zephyr/boards/SAM.lf b/test/C/src/zephyr/boards/SAM.lf
new file mode 100644
index 0000000000..32641481d0
--- /dev/null
+++ b/test/C/src/zephyr/boards/SAM.lf
@@ -0,0 +1,14 @@
+target C {
+  platform: {
+    name: Zephyr,
+    board: sam4s_xplained
+  }
+}
+
+main reactor {
+  timer t(0, 1 sec)
+
+  reaction(t) {=
+    printf("Hello\n");
+  =}
+}
diff --git a/test/C/src/zephyr/boards/STM32.lf b/test/C/src/zephyr/boards/STM32.lf
new file mode 100644
index 0000000000..c849ea0f30
--- /dev/null
+++ b/test/C/src/zephyr/boards/STM32.lf
@@ -0,0 +1,12 @@
+target C {
+  platform: "Zephyr",
+  board: stm32f4_disco
+}
+
+main reactor {
+  timer t(0, 1 sec)
+
+  reaction(t) {=
+    printf("Hello\n");
+  =}
+}

From ff7f93f2dd09daa23779e3658116142f00c9e26d Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Fri, 15 Sep 2023 09:58:38 +0200
Subject: [PATCH 0869/1114] Add a small README to explain Zephr board files in
 our source tree

---
 core/src/main/resources/lib/platform/zephyr/README.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 core/src/main/resources/lib/platform/zephyr/README.md

diff --git a/core/src/main/resources/lib/platform/zephyr/README.md b/core/src/main/resources/lib/platform/zephyr/README.md
new file mode 100644
index 0000000000..a0d92819ec
--- /dev/null
+++ b/core/src/main/resources/lib/platform/zephyr/README.md
@@ -0,0 +1,3 @@
+# Zephyr platform files
+These are files needed to compile LF programs for the Zephyr target. 
+All of the files in the `boards` directory are for enabling a Timer peripheral for different devices so that we can use a Counter device for time-keeping. These device tree config overlays are copied from the `alarm` example found in the zephyr source tree under `samples/drivers/counter/alarm`.
\ No newline at end of file

From e841d6453f295e919325df0dae4abc67fd9f2d28 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Fri, 15 Sep 2023 09:59:04 +0200
Subject: [PATCH 0870/1114] Do not generate CMake code for linking with Threads
 library when we are targeting Zephyr

---
 .../org/lflang/generator/c/CCmakeGenerator.java    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 0ee24fc39a..ea1db3713e 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -326,25 +326,23 @@ CodeBuilder generateCMakeCode(
       cMakeCode.newLine();
     }
 
-    if (targetConfig.threading) {
+    if (targetConfig.threading && targetConfig.platformOptions.platform != Platform.ZEPHYR) {
       // If threaded computation is requested, add the threads option.
       cMakeCode.pr("# Find threads and link to it");
       cMakeCode.pr("find_package(Threads REQUIRED)");
       cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE Threads::Threads)");
       cMakeCode.newLine();
-      // If the LF program itself is threaded, we need to define NUMBER_OF_WORKERS so that
-      // platform-specific C files will contain the appropriate functions
+    }
+
+    // Add additional flags so runtime can distinguish between multi-threaded and single-threaded
+    // mode
+    if (targetConfig.threading) {
       cMakeCode.pr("# Set the number of workers to enable threading/tracing");
       cMakeCode.pr(
           "target_compile_definitions(${LF_MAIN_TARGET} PUBLIC NUMBER_OF_WORKERS="
               + targetConfig.workers
               + ")");
       cMakeCode.newLine();
-    }
-
-    // Add additional flags so runtime can distinguish between multi-threaded and single-threaded
-    // mode
-    if (targetConfig.threading) {
       cMakeCode.pr("# Set flag to indicate a multi-threaded runtime");
       cMakeCode.pr("target_compile_definitions( ${LF_MAIN_TARGET} PUBLIC LF_THREADED=1)");
     } else {

From 75646f90fa1082e2e719208ea6833fddfa096106 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Fri, 15 Sep 2023 10:04:31 +0200
Subject: [PATCH 0871/1114] Spotless

---
 core/src/main/resources/lib/platform/zephyr/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/resources/lib/platform/zephyr/README.md b/core/src/main/resources/lib/platform/zephyr/README.md
index a0d92819ec..f74132f2a9 100644
--- a/core/src/main/resources/lib/platform/zephyr/README.md
+++ b/core/src/main/resources/lib/platform/zephyr/README.md
@@ -1,3 +1,3 @@
 # Zephyr platform files
-These are files needed to compile LF programs for the Zephyr target. 
-All of the files in the `boards` directory are for enabling a Timer peripheral for different devices so that we can use a Counter device for time-keeping. These device tree config overlays are copied from the `alarm` example found in the zephyr source tree under `samples/drivers/counter/alarm`.
\ No newline at end of file
+These are files needed to compile LF programs for the Zephyr target.
+All of the files in the `boards` directory are for enabling a Timer peripheral for different devices so that we can use a Counter device for time-keeping. These device tree config overlays are copied from the `alarm` example found in the zephyr source tree under `samples/drivers/counter/alarm`.

From b0adb56350526c6210906befcb47c55bb2396d23 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Fri, 15 Sep 2023 10:04:50 +0200
Subject: [PATCH 0872/1114] Bump reactor-c to include cmake fix

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 9760f233d4..7e031ec140 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 9760f233d4b1d2653e61c7feb7e3e1379d6e8344
+Subproject commit 7e031ec1400fbebc1f90a7ce41fa10ffa40549d2

From 7b2c92b7a8d7c5e013d2652592ed2f62ae894764 Mon Sep 17 00:00:00 2001
From: erling <erling.jellum@gmail.com>
Date: Fri, 15 Sep 2023 10:09:56 +0200
Subject: [PATCH 0873/1114] Update .gitmodules

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 1eaef285c7..9cd89ffe1a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "org.lflang/src/lib/c/reactor-c"]
 	path = core/src/main/resources/lib/c/reactor-c
-	url = git@github.com:lf-lang/reactor-c.git
+	url = https://github.com/lf-lang/reactor-c.git
 [submodule "org.lflang/src/lib/cpp/reactor-cpp"]
 	path = core/src/main/resources/lib/cpp/reactor-cpp
 	url = https://github.com/lf-lang/reactor-cpp

From 600c44db5ba7e4718d77a1ddff2c8306564fcd87 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Fri, 15 Sep 2023 11:19:00 +0200
Subject: [PATCH 0874/1114] avoid using a dead dependency (jsr305)

---
 core/build.gradle                         | 4 ++++
 core/src/main/java/org/lflang/Target.java | 2 +-
 gradle.properties                         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 23b412b6a8..142c347e03 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -44,6 +44,10 @@ dependencies {
     testImplementation "org.opentest4j:opentest4j:$openTest4jVersion"
     testImplementation "org.eclipse.xtext:org.eclipse.xtext.testing:$xtextVersion"
     testImplementation "org.eclipse.xtext:org.eclipse.xtext.xbase.testing:$xtextVersion"
+
+    // For spotbugs annotations
+    compileOnly "com.github.spotbugs:spotbugs-annotations:$spotbugsToolVersion"
+    compileOnly "net.jcip:jcip-annotations:$jcipVersion"
 }
 
 configurations {
diff --git a/core/src/main/java/org/lflang/Target.java b/core/src/main/java/org/lflang/Target.java
index c7aadda74f..5e9f72fea1 100644
--- a/core/src/main/java/org/lflang/Target.java
+++ b/core/src/main/java/org/lflang/Target.java
@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import javax.annotation.concurrent.Immutable;
+import net.jcip.annotations.Immutable;
 import org.lflang.lf.TargetDecl;
 
 /**
diff --git a/gradle.properties b/gradle.properties
index 636741363c..edfd349707 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,6 @@ jacocoVersion=0.8.7
 jsonVersion=20200518
 jupiterVersion=5.8.2
 jUnitPlatformVersion=1.8.2
-klighdVersion=2.3.0.v20230606
 kotlinJvmTarget=17
 lsp4jVersion=0.21.0
 mwe2LaunchVersion=2.14.0
@@ -22,6 +21,7 @@ klighdVersion=2.3.0.v20230606
 freehepVersion=2.4
 swtVersion=3.124.0
 spotbugsToolVersion=4.7.3
+jcipVersion=1.0
 
 [manifestPropertyNames]
 org.eclipse.xtext=xtextVersion

From 092d9ffc22bbcc7779bf28071801e6d71d324b4a Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 16 Sep 2023 01:14:39 -0700
Subject: [PATCH 0875/1114] More work in progress

---
 .../lflang/tests/runtime/CSchedulerTest.java  |   2 +-
 .../main/java/org/lflang/TargetConfig.java    | 211 ++--------
 .../main/java/org/lflang/TargetProperty.java  | 363 +++---------------
 .../java/org/lflang/TargetPropertyConfig.java |  49 ++-
 .../federated/extensions/CExtension.java      |  26 +-
 .../federated/extensions/CExtensionUtils.java |  20 +-
 .../extensions/FedTargetExtension.java        |  10 +-
 .../federated/extensions/PythonExtension.java |  10 +-
 .../federated/extensions/TSExtension.java     |  10 +-
 .../federated/generator/FedASTUtils.java      |  20 +-
 .../federated/generator/FedGenerator.java     |   8 +-
 .../launcher/FedLauncherGenerator.java        |  16 +-
 .../org/lflang/generator/GeneratorUtils.java  |   4 +-
 .../lflang/generator/c/CCmakeGenerator.java   |  32 +-
 .../org/lflang/generator/c/CCompiler.java     |  18 +-
 .../lflang/generator/c/CDockerGenerator.java  |   8 +-
 .../c/CEnvironmentFunctionGenerator.java      |   9 +-
 .../org/lflang/generator/c/CGenerator.java    |  50 +--
 .../generator/c/CMainFunctionGenerator.java   |  14 +-
 .../generator/c/CPreambleGenerator.java       |   8 +-
 .../java/org/lflang/generator/c/CUtil.java    |   2 +-
 .../generator/rust/RustTargetConfig.java      |  12 +-
 .../java/org/lflang/target/AuthConfig.java    |  24 ++
 .../org/lflang/target/AuthConfigurator.java   |  33 --
 .../lflang/target/ClockSyncConfigurator.java  | 115 ------
 .../lflang/target/ClockSyncModeConfig.java    |  83 ++++
 .../org/lflang/target/CoordinationConfig.java |  83 ----
 .../lflang/target/CoordinationModeConfig.java |  49 +++
 .../target/CoordinationOptionsConfig.java     | 118 ++++++
 .../java/org/lflang/target/DockerConfig.java  | 114 +++++-
 ...tConfigurator.java => FastModeConfig.java} |  14 +-
 ...Configurator.java => KeepaliveConfig.java} |  26 +-
 .../org/lflang/target/PlatformConfig.java     | 253 ++++++++++++
 .../lflang/target/PlatformConfigurator.java   | 142 -------
 ...rator.java => Ros2DependenciesConfig.java} |  20 +-
 ...Configurator.java => SchedulerConfig.java} |  42 +-
 ...ngConfigurator.java => TracingConfig.java} |  63 ++-
 .../target/property/BuildCommandsConfig.java  |  27 ++
 .../target/property/BuildTypeConfig.java      |  38 ++
 .../property/ClockSyncOptionsConfig.java      | 157 ++++++++
 .../target/property/type/DictionaryType.java  |   8 +-
 .../target/property/type/UnionType.java       |  10 +-
 .../java/org/lflang/util/ArduinoUtil.java     |  14 +-
 .../org/lflang/generator/cpp/CppExtensions.kt |  17 +-
 .../generator/cpp/CppPlatformGenerator.kt     |   2 +-
 .../generator/cpp/CppRos2PackageGenerator.kt  |   2 +-
 .../cpp/CppStandaloneCmakeGenerator.kt        |   2 +-
 .../generator/cpp/CppStandaloneGenerator.kt   |  10 +-
 .../generator/rust/RustCargoTomlEmitter.kt    |   2 +-
 .../lflang/generator/rust/RustGenerator.kt    |   6 +-
 .../org/lflang/generator/rust/RustModel.kt    |   4 +-
 .../generator/ts/TSConstructorGenerator.kt    |   3 +-
 .../java/org/lflang/tests/Configurators.java  |  14 +-
 53 files changed, 1285 insertions(+), 1112 deletions(-)
 create mode 100644 core/src/main/java/org/lflang/target/AuthConfig.java
 delete mode 100644 core/src/main/java/org/lflang/target/AuthConfigurator.java
 delete mode 100644 core/src/main/java/org/lflang/target/ClockSyncConfigurator.java
 create mode 100644 core/src/main/java/org/lflang/target/ClockSyncModeConfig.java
 delete mode 100644 core/src/main/java/org/lflang/target/CoordinationConfig.java
 create mode 100644 core/src/main/java/org/lflang/target/CoordinationModeConfig.java
 create mode 100644 core/src/main/java/org/lflang/target/CoordinationOptionsConfig.java
 rename core/src/main/java/org/lflang/target/{FastConfigurator.java => FastModeConfig.java} (80%)
 rename core/src/main/java/org/lflang/target/{KeepaliveConfigurator.java => KeepaliveConfig.java} (58%)
 create mode 100644 core/src/main/java/org/lflang/target/PlatformConfig.java
 delete mode 100644 core/src/main/java/org/lflang/target/PlatformConfigurator.java
 rename core/src/main/java/org/lflang/target/{Ros2DependenciesConfigurator.java => Ros2DependenciesConfig.java} (69%)
 rename core/src/main/java/org/lflang/target/{SchedulerConfigurator.java => SchedulerConfig.java} (79%)
 rename core/src/main/java/org/lflang/target/{TracingConfigurator.java => TracingConfig.java} (72%)
 create mode 100644 core/src/main/java/org/lflang/target/property/BuildCommandsConfig.java
 create mode 100644 core/src/main/java/org/lflang/target/property/BuildTypeConfig.java
 create mode 100644 core/src/main/java/org/lflang/target/property/ClockSyncOptionsConfig.java

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
index c064560ead..f6032227f8 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
@@ -3,7 +3,7 @@
 import java.util.EnumSet;
 import org.junit.jupiter.api.Test;
 import org.lflang.Target;
-import org.lflang.target.SchedulerConfigurator.SchedulerOption;
+import org.lflang.target.SchedulerConfig.SchedulerOption;
 import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry.TestCategory;
diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index 2e7ee40005..ffd2c426b3 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -29,20 +29,28 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
 import org.lflang.generator.LFGeneratorContext.BuildParm;
 import org.lflang.generator.rust.RustTargetConfig;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.TargetDecl;
-import org.lflang.target.property.BuildConfig.BuildType;
-import org.lflang.target.ClockSyncConfigurator.ClockSyncMode;
-import org.lflang.target.CoordinationConfig.CoordinationType;
+import org.lflang.target.AuthConfig;
+import org.lflang.target.ClockSyncModeConfig;
+import org.lflang.target.CoordinationModeConfig;
+import org.lflang.target.CoordinationOptionsConfig;
+import org.lflang.target.DockerConfig;
+import org.lflang.target.FastModeConfig;
+import org.lflang.target.KeepaliveConfig;
+import org.lflang.target.PlatformConfig;
+import org.lflang.target.SchedulerConfig;
+import org.lflang.target.TracingConfig;
+import org.lflang.target.TracingConfig.TracingOptions;
+import org.lflang.target.property.BuildCommandsConfig;
 import org.lflang.target.LoggingConfigurator.LogLevel;
-import org.lflang.target.PlatformConfigurator.Platform;
-import org.lflang.target.SchedulerConfigurator.SchedulerOption;
-import org.lflang.target.property.type.UnionType;
+import org.lflang.target.SchedulerConfig.SchedulerOption;
+import org.lflang.target.property.ClockSyncOptionsConfig;
+import org.lflang.target.property.BuildTypeConfig;
 
 /**
  * A class for keeping the current target configuration.
@@ -79,26 +87,18 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
       List<KeyValuePair> pairs = target.getConfig().getPairs();
       TargetProperty.set(this, pairs != null ? pairs : List.of(), messageReporter);
     }
+
+    if (cliArgs != null) {
+      TargetProperty.override(this, cliArgs, messageReporter);
+    }
+
     if (cliArgs.containsKey("no-compile")) {
       this.noCompile = true;
     }
     if (cliArgs.containsKey("verify")) {
       this.verify = true;
     }
-    if (cliArgs.containsKey("docker")) {
-      var arg = cliArgs.getProperty("docker");
-      if (Boolean.parseBoolean(arg)) {
-        this.dockerOptions = new DockerOptions();
-      } else {
-        this.dockerOptions = null;
-      }
-      // FIXME: this is pretty ad-hoc and does not account for more complex overrides yet.
-    }
-    if (cliArgs.containsKey("build-type")) {
-      this.cmakeBuildType =
-          (BuildType) UnionType.BUILD_TYPE_UNION.forName(cliArgs.getProperty("build-type"));
-      this.setByUser.add(TargetProperty.BUILD_TYPE);
-    }
+
     if (cliArgs.containsKey("logging")) {
       this.logLevel = LogLevel.valueOf(cliArgs.getProperty("logging").toUpperCase());
       this.setByUser.add(TargetProperty.LOGGING);
@@ -116,13 +116,10 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
       this.setByUser.add(TargetProperty.COMPILER);
     }
     if (cliArgs.containsKey("tracing")) {
-      this.tracing = new TracingOptions();
+      this.tracing.override(new TracingOptions());
       this.setByUser.add(TargetProperty.TRACING);
     }
-    if (cliArgs.containsKey("scheduler")) {
-      this.schedulerType = SchedulerOption.valueOf(cliArgs.getProperty("scheduler"));
-      this.setByUser.add(TargetProperty.SCHEDULER);
-    }
+
     if (cliArgs.containsKey("target-flags")) {
       this.compilerFlags.clear();
       if (!cliArgs.getProperty("target-flags").isEmpty()) {
@@ -138,11 +135,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
       this.externalRuntimePath = cliArgs.getProperty("external-runtime-path");
       this.setByUser.add(TargetProperty.EXTERNAL_RUNTIME_PATH);
     }
-    if (cliArgs.containsKey(TargetProperty.KEEPALIVE.description)) {
-      this.keepalive =
-          Boolean.parseBoolean(cliArgs.getProperty(TargetProperty.KEEPALIVE.description));
-      this.setByUser.add(TargetProperty.KEEPALIVE);
-    }
+
     if (cliArgs.containsKey(BuildParm.PRINT_STATISTICS.getKey())) {
       this.printStatistics = true;
       this.setByUser.add(TargetProperty.PRINT_STATISTICS);
@@ -157,18 +150,18 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
    * designated compiler. A common usage of this target property is to set the command to build on
    * the basis of a Makefile.
    */
-  public List<String> buildCommands = new ArrayList<>();
+  public BuildCommandsConfig buildCommands = new BuildCommandsConfig();
 
   /**
    * The mode of clock synchronization to be used in federated programs. The default is 'initial'.
    */
-  public ClockSyncMode clockSync = ClockSyncMode.INIT;
+  public final ClockSyncModeConfig clockSync = new ClockSyncModeConfig();
 
   /** Clock sync options. */
-  public ClockSyncOptions clockSyncOptions = new ClockSyncOptions();
+  public final ClockSyncOptionsConfig clockSyncOptions = new ClockSyncOptionsConfig();
 
   /** Parameter passed to cmake. The default is 'Release'. */
-  public BuildType cmakeBuildType = BuildType.RELEASE;
+  public BuildTypeConfig buildType = new BuildTypeConfig();
 
   /** Optional additional extensions to include in the generated CMakeLists.txt. */
   public List<String> cmakeIncludes = new ArrayList<>();
@@ -194,13 +187,13 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
    * The type of coordination used during the execution of a federated program. The default is
    * 'centralized'.
    */
-  public CoordinationType coordination = CoordinationType.CENTRALIZED;
+  public CoordinationModeConfig coordination = new CoordinationModeConfig();
 
   /** Docker options. */
-  public DockerOptions dockerOptions = null;
+  public DockerConfig dockerOptions = new DockerConfig();
 
   /** Coordination options. */
-  public CoordinationOptions coordinationOptions = new CoordinationOptions();
+  public CoordinationOptionsConfig coordinationOptions = new CoordinationOptionsConfig();
 
   /** Link to an external runtime library instead of the default one. */
   public String externalRuntimePath = null;
@@ -209,7 +202,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
    * If true, configure the execution environment such that it does not wait for physical time to
    * match logical time. The default is false.
    */
-  public boolean fastMode = false;
+  public FastModeConfig fastMode = new FastModeConfig();
 
   /** List of files to be copied to src-gen. */
   public List<String> files = new ArrayList<>();
@@ -218,7 +211,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
    * If true, configure the execution environment to keep executing if there are no more events on
    * the event queue. The default is false.
    */
-  public boolean keepalive = false;
+  public KeepaliveConfig keepalive = new KeepaliveConfig();
 
   /** The level of logging during execution. The default is INFO. */
   public LogLevel logLevel = LogLevel.INFO;
@@ -242,7 +235,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
    * <p>This is now a wrapped class to account for overloaded definitions of defining platform
    * (either a string or dictionary of values)
    */
-  public PlatformOptions platformOptions = new PlatformOptions();
+  public PlatformConfig platformOptions = new PlatformConfig();
 
   /** If true, instruct the runtime to collect and print execution statistics. */
   public boolean printStatistics = false;
@@ -263,7 +256,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
   public boolean singleFileProject = false;
 
   /** What runtime scheduler to use. */
-  public SchedulerOption schedulerType = SchedulerOption.getDefault();
+  public SchedulerConfig schedulerType = new SchedulerConfig();
 
   /**
    * The number of worker threads to deploy. The default is zero, which indicates that the runtime
@@ -272,7 +265,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
   public int workers = 0;
 
   /** Indicate whether HMAC authentication is used. */
-  public boolean auth = false;
+  public AuthConfig auth = new AuthConfig();
 
   /** Indicate whether the runtime should use multithreaded execution. */
   public boolean threading = true;
@@ -281,7 +274,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
   public TimeValue timeout;
 
   /** If non-null, configure the runtime environment to perform tracing. The default is null. */
-  public TracingOptions tracing = null;
+  public TracingConfig tracing = new TracingConfig();
 
   /**
    * If true, the resulting binary will output a graph visualizing all reaction dependencies.
@@ -307,137 +300,9 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
   /** Path to a C file used by the Python target to setup federated execution. */
   public String fedSetupPreamble = null; // FIXME: https://issue.lf-lang.org/1558
 
-  /** Settings related to clock synchronization. */
-  public static class ClockSyncOptions {
-
-    /**
-     * Dampen the adjustments to the clock synchronization offset by this rate. The default is 10.
-     */
-    public int attenuation = 10;
-
-    /**
-     * Whether to collect statistics while performing clock synchronization. This setting is only
-     * considered when clock synchronization has been activated. The default is true.
-     */
-    public boolean collectStats = true;
-
-    /** Enable clock synchronization for federates on the same machine. Default is false. */
-    public boolean localFederatesOn = false;
-
-    /**
-     * Interval at which clock synchronization is initiated by the RTI (will be passed to it as an
-     * argument on the command-line). The default is 5 milliseconds.
-     */
-    public TimeValue period = new TimeValue(5, TimeUnit.MILLI);
-
-    /**
-     * Indicate the number of exchanges to be had per each clock synchronization round. See
-     * /lib/core/federated/clock-sync.h for more details. The default is 10.
-     */
-    public int trials = 10;
-
-    /**
-     * Used to create an artificial clock synchronization error for the purpose of testing. The
-     * default is null.
-     */
-    public TimeValue testOffset;
-  }
 
-  /** Settings related to coordination of federated execution. */
-  public static class CoordinationOptions {
-
-    /**
-     * For centralized coordination, if a federate has a physical action that can trigger an output,
-     * directly or indirectly, then it will send NET (next event tag) messages to the RTI
-     * periodically as its physical clock advances. This option sets the amount of time to wait
-     * between sending such messages. Increasing this value results in downstream federates that lag
-     * further behind physical time (if the "after" delays are insufficient). The default is null,
-     * which means it is up the implementation to choose an interval.
-     */
-    public TimeValue advance_message_interval = null;
-  }
 
-  /** Settings related to Docker options. */
-  public static class DockerOptions {
-    /**
-     * The base image and tag from which to build the Docker image. The default is "alpine:latest".
-     */
-    public String from = "alpine:latest";
-
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) {
-        return true;
-      }
-      if (o == null || getClass() != o.getClass()) {
-        return false;
-      }
-      DockerOptions that = (DockerOptions) o;
-      return from.equals(that.from);
-    }
-  }
 
-  /** Settings related to Platform Options. */
-  public static class PlatformOptions {
-
-    /**
-     * The base platform we build our LF Files on. Should be set to AUTO by default unless
-     * developing for specific OS/Embedded Platform
-     */
-    public Platform platform = Platform.AUTO;
-
-    /**
-     * The string value used to determine what type of embedded board we work with and can be used
-     * to simplify the build process. This string has the form "board_name[:option]*" (zero or more
-     * options separated by colons). For example, "pico:usb" specifies a Raspberry Pi Pico where
-     * stdin and stdout go through a USB serial port.
-     */
-    public String board = null;
-
-    /**
-     * The string value used to determine the port on which to flash the compiled program (i.e.
-     * /dev/cu.usbmodem21301)
-     */
-    public String port = null;
-
-    /**
-     * The baud rate used as a parameter to certain embedded platforms. 9600 is a standard rate
-     * amongst systems like Arduino, so it's the default value.
-     */
-    public int baudRate = 9600;
-
-    /**
-     * The boolean statement used to determine whether we should automatically attempt to flash once
-     * we compile. This may require the use of board and port values depending on the infrastructure
-     * you use to flash the boards.
-     */
-    public boolean flash = false;
-
-    /**
-     * The int value is used to determine the number of needed threads for the user application in
-     * Zephyr.
-     */
-    public int userThreads = 0;
-  }
 
-  /** Settings related to tracing options. */
-  public static class TracingOptions {
-    /**
-     * The name to use as the root of the trace file produced. This defaults to the name of the .lf
-     * file.
-     */
-    public String traceFileName = null;
-
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) {
-        return true;
-      }
-      if (o == null || getClass() != o.getClass()) {
-        return false;
-      }
-      TracingOptions that = (TracingOptions) o;
-      return Objects.equals(traceFileName, that.traceFileName); // traceFileName may be null
-    }
-  }
+
 }
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 5246f72e51..ff459ce747 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -30,9 +30,8 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Properties;
 
-import org.lflang.TargetConfig.DockerOptions;
-import org.lflang.TargetConfig.PlatformOptions;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.InvalidLfSourceException;
 import org.lflang.generator.rust.CargoDependencySpec;
@@ -44,24 +43,12 @@
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.Model;
 import org.lflang.lf.TargetDecl;
-import org.lflang.target.property.BuildConfig.BuildType;
-import org.lflang.target.ClockSyncConfigurator;
-import org.lflang.target.ClockSyncConfigurator.ClockSyncOption;
-import org.lflang.target.CoordinationConfig.CoordinationOption;
-import org.lflang.target.CoordinationConfig.CoordinationType;
-import org.lflang.target.DockerConfig.DockerOption;
-import org.lflang.target.FastConfigurator;
-import org.lflang.target.KeepaliveConfigurator;
 import org.lflang.target.LoggingConfigurator.LogLevel;
-import org.lflang.target.PlatformConfigurator.Platform;
-import org.lflang.target.PlatformConfigurator.PlatformOption;
-import org.lflang.target.SchedulerConfigurator;
 import org.lflang.target.property.type.ArrayType;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.StringDictionaryType;
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.target.property.type.PrimitiveType;
-import org.lflang.target.TracingConfigurator;
 import org.lflang.target.property.type.UnionType;
 import org.lflang.util.FileUtil;
 import org.lflang.util.StringUtil;
@@ -79,19 +66,14 @@ public enum TargetProperty {
           "auth",
           PrimitiveType.BOOLEAN,
           Arrays.asList(Target.C, Target.CCPP),
-          (config) -> ASTUtils.toElement(config.auth),
-          (config, value, err) -> {
-              config.auth = ASTUtils.toBoolean(value);
-          }),
+          (TargetConfig config) -> config.auth),
+
       /** Directive to let the generator use the custom build command. */
       BUILD(
           "build",
           UnionType.STRING_OR_STRING_ARRAY,
           Arrays.asList(Target.C, Target.CCPP),
-          (config) -> ASTUtils.toElement(config.buildCommands),
-          (config, value, err) -> {
-              config.buildCommands = ASTUtils.elementToListOfStrings(value);
-          }),
+          (TargetConfig config) -> config.buildCommands),
 
       /**
        * Directive to specify the target build type such as 'Release' or 'Debug'. This is also used in
@@ -101,91 +83,20 @@ public enum TargetProperty {
           "build-type",
           UnionType.BUILD_TYPE_UNION,
           Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Rust),
-          (config) -> ASTUtils.toElement(config.cmakeBuildType.toString()),
-          (config, value, err) -> {
-              config.cmakeBuildType =
-                  (BuildType) UnionType.BUILD_TYPE_UNION.forName(ASTUtils.elementToSingleString(value));
-              // set it there too, because the default is different.
-              config.rust.setBuildType(config.cmakeBuildType);
-          }),
+          (TargetConfig config) -> config.buildType),
 
       /** Directive to let the federate execution handle clock synchronization in software. */
       CLOCK_SYNC(
           "clock-sync",
           UnionType.CLOCK_SYNC_UNION,
           Arrays.asList(Target.C, Target.CCPP, Target.Python),
-          new ClockSyncConfigurator()),
+          (TargetConfig config) -> config.clockSync),
       /** Key-value pairs giving options for clock synchronization. */
       CLOCK_SYNC_OPTIONS(
           "clock-sync-options",
           DictionaryType.CLOCK_SYNC_OPTION_DICT,
           Arrays.asList(Target.C, Target.CCPP, Target.Python),
-          (config) -> {
-              Element e = LfFactory.eINSTANCE.createElement();
-              KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-              for (ClockSyncOption opt : ClockSyncOption.values()) {
-                  KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                  pair.setName(opt.toString());
-                  switch (opt) {
-                  case ATTENUATION:
-                      pair.setValue(ASTUtils.toElement(config.clockSyncOptions.attenuation));
-                      break;
-                  case COLLECT_STATS:
-                      pair.setValue(ASTUtils.toElement(config.clockSyncOptions.collectStats));
-                      break;
-                  case LOCAL_FEDERATES_ON:
-                      pair.setValue(ASTUtils.toElement(config.clockSyncOptions.localFederatesOn));
-                      break;
-                  case PERIOD:
-                      if (config.clockSyncOptions.period == null) {
-                          continue; // don't set if null
-                      }
-                      pair.setValue(ASTUtils.toElement(config.clockSyncOptions.period));
-                      break;
-                  case TEST_OFFSET:
-                      if (config.clockSyncOptions.testOffset == null) {
-                          continue; // don't set if null
-                      }
-                      pair.setValue(ASTUtils.toElement(config.clockSyncOptions.testOffset));
-                      break;
-                  case TRIALS:
-                      pair.setValue(ASTUtils.toElement(config.clockSyncOptions.trials));
-                      break;
-                  }
-                  kvp.getPairs().add(pair);
-              }
-              e.setKeyvalue(kvp);
-              // kvp will never be empty
-              return e;
-          },
-          (config, value, err) -> {
-              for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                  ClockSyncOption option =
-                      (ClockSyncOption) DictionaryType.CLOCK_SYNC_OPTION_DICT.forName(entry.getName());
-                  switch (option) {
-                  case ATTENUATION:
-                      config.clockSyncOptions.attenuation = ASTUtils.toInteger(entry.getValue());
-                      break;
-                  case COLLECT_STATS:
-                      config.clockSyncOptions.collectStats = ASTUtils.toBoolean(entry.getValue());
-                      break;
-                  case LOCAL_FEDERATES_ON:
-                      config.clockSyncOptions.localFederatesOn = ASTUtils.toBoolean(entry.getValue());
-                      break;
-                  case PERIOD:
-                      config.clockSyncOptions.period = ASTUtils.toTimeValue(entry.getValue());
-                      break;
-                  case TEST_OFFSET:
-                      config.clockSyncOptions.testOffset = ASTUtils.toTimeValue(entry.getValue());
-                      break;
-                  case TRIALS:
-                      config.clockSyncOptions.trials = ASTUtils.toInteger(entry.getValue());
-                      break;
-                  default:
-                      break;
-                  }
-              }
-          }),
+          (TargetConfig config) -> config.clockSyncOptions),
 
       /**
        * Directive to specify a cmake to be included by the generated build systems.
@@ -236,37 +147,7 @@ public enum TargetProperty {
           "docker",
           UnionType.DOCKER_UNION,
           Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS),
-          (config) -> {
-              if (config.dockerOptions == null) {
-                  return null;
-              } else if (config.dockerOptions.equals(new DockerOptions())) {
-                  // default configuration
-                  return ASTUtils.toElement(true);
-              } else {
-                  Element e = LfFactory.eINSTANCE.createElement();
-                  KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                  for (DockerOption opt : DockerOption.values()) {
-                      KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                      pair.setName(opt.toString());
-                      switch (opt) {
-                      case FROM:
-                          if (config.dockerOptions.from == null) {
-                              continue;
-                          }
-                          pair.setValue(ASTUtils.toElement(config.dockerOptions.from));
-                          break;
-                      }
-                      kvp.getPairs().add(pair);
-                  }
-                  e.setKeyvalue(kvp);
-                  if (kvp.getPairs().isEmpty()) {
-                      return null;
-                  }
-                  return e;
-              }
-          },
-          (config, value, err) -> setDockerProperty(config, value),
-          (config, value, err) -> setDockerProperty(config, value)),
+          (TargetConfig config) -> config.dockerOptions),
 
       /** Directive for specifying a path to an external runtime to be used for the compiled binary. */
       EXTERNAL_RUNTIME_PATH(
@@ -285,7 +166,7 @@ public enum TargetProperty {
           "fast",
           PrimitiveType.BOOLEAN,
           Target.ALL,
-          new FastConfigurator()),
+          (TargetConfig config) -> config.fastMode),
       /**
        * Directive to stage particular files on the class path to be processed by the code generator.
        */
@@ -316,74 +197,13 @@ public enum TargetProperty {
           "coordination",
           UnionType.COORDINATION_UNION,
           Arrays.asList(Target.C, Target.CCPP, Target.Python),
-          (config) -> ASTUtils.toElement(config.coordination.toString()),
-          (config, value, err) -> {
-              config.coordination =
-                  (CoordinationType)
-                      UnionType.COORDINATION_UNION.forName(ASTUtils.elementToSingleString(value));
-          },
-          (config, value, err) -> {
-              config.coordination =
-                  (CoordinationType)
-                      UnionType.COORDINATION_UNION.forName(ASTUtils.elementToSingleString(value));
-          }),
-
+          (TargetConfig config) -> config.coordination),
       /** Key-value pairs giving options for clock synchronization. */
       COORDINATION_OPTIONS(
           "coordination-options",
           DictionaryType.COORDINATION_OPTION_DICT,
           Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS),
-          (config) -> {
-              Element e = LfFactory.eINSTANCE.createElement();
-              KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-              for (CoordinationOption opt : CoordinationOption.values()) {
-                  KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                  pair.setName(opt.toString());
-                  switch (opt) {
-                  case ADVANCE_MESSAGE_INTERVAL:
-                      if (config.coordinationOptions.advance_message_interval == null) {
-                          continue;
-                      }
-                      pair.setValue(
-                          ASTUtils.toElement(config.coordinationOptions.advance_message_interval));
-                      break;
-                  }
-                  kvp.getPairs().add(pair);
-              }
-              e.setKeyvalue(kvp);
-              if (kvp.getPairs().isEmpty()) {
-                  return null;
-              }
-              return e;
-          },
-          (config, value, err) -> {
-              for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                  CoordinationOption option =
-                      (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT.forName(entry.getName());
-                  switch (option) {
-                  case ADVANCE_MESSAGE_INTERVAL:
-                      config.coordinationOptions.advance_message_interval =
-                          ASTUtils.toTimeValue(entry.getValue());
-                      break;
-                  default:
-                      break;
-                  }
-              }
-          },
-          (config, value, err) -> {
-              for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                  CoordinationOption option =
-                      (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT.forName(entry.getName());
-                  switch (option) {
-                  case ADVANCE_MESSAGE_INTERVAL:
-                      config.coordinationOptions.advance_message_interval =
-                          ASTUtils.toTimeValue(entry.getValue());
-                      break;
-                  default:
-                      break;
-                  }
-              }
-          }),
+          (TargetConfig config) -> config.coordinationOptions),
 
       /**
        * Directive to let the execution engine remain active also if there are no more events in the
@@ -393,7 +213,7 @@ public enum TargetProperty {
           "keepalive",
           PrimitiveType.BOOLEAN,
           Target.ALL,
-          new KeepaliveConfigurator()),
+          (TargetConfig config) -> config.keepalive),
 
       /** Directive to specify the grain at which to report log messages during execution. */
       LOGGING(
@@ -444,97 +264,7 @@ public enum TargetProperty {
           "platform",
           UnionType.PLATFORM_STRING_OR_DICTIONARY,
           Target.ALL,
-          (config) -> {
-              Element e = LfFactory.eINSTANCE.createElement();
-              KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-              for (PlatformOption opt : PlatformOption.values()) {
-                  KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                  pair.setName(opt.toString());
-                  switch (opt) {
-                  case NAME:
-                      pair.setValue(ASTUtils.toElement(config.platformOptions.platform.toString()));
-                      break;
-                  case BAUDRATE:
-                      pair.setValue(ASTUtils.toElement(config.platformOptions.baudRate));
-                      break;
-                  case BOARD:
-                      pair.setValue(ASTUtils.toElement(config.platformOptions.board));
-                      break;
-                  case FLASH:
-                      pair.setValue(ASTUtils.toElement(config.platformOptions.flash));
-                      break;
-                  case PORT:
-                      pair.setValue(ASTUtils.toElement(config.platformOptions.port));
-                      break;
-                  case USER_THREADS:
-                      pair.setValue(ASTUtils.toElement(config.platformOptions.userThreads));
-                      break;
-                  }
-                  kvp.getPairs().add(pair);
-              }
-              e.setKeyvalue(kvp);
-              if (kvp.getPairs().isEmpty()) {
-                  return null;
-              }
-              return e;
-          },
-          (config, value, err) -> {
-              if (value.getLiteral() != null) {
-                  config.platformOptions = new PlatformOptions();
-                  config.platformOptions.platform =
-                      (Platform) UnionType.PLATFORM_UNION.forName(ASTUtils.elementToSingleString(value));
-                  if (config.platformOptions.platform == null) {
-                      String s =
-                          "Unidentified Platform Type, LF supports the following platform types: "
-                              + Arrays.asList(Platform.values()).toString();
-                      err.at(value).error(s);
-                      throw new AssertionError(s);
-                  }
-              } else {
-                  config.platformOptions = new PlatformOptions();
-                  for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                      PlatformOption option =
-                          (PlatformOption) DictionaryType.PLATFORM_DICT.forName(entry.getName());
-                      switch (option) {
-                      case NAME:
-                          Platform p =
-                              (Platform)
-                                  UnionType.PLATFORM_UNION.forName(
-                                      ASTUtils.elementToSingleString(entry.getValue()));
-                          if (p == null) {
-                              String s =
-                                  "Unidentified Platform Type, LF supports the following platform types: "
-                                      + Arrays.asList(Platform.values()).toString();
-                              err.at(entry).error(s);
-                              throw new AssertionError(s);
-                          }
-                          config.platformOptions.platform = p;
-                          break;
-                      case BAUDRATE:
-                          config.platformOptions.baudRate = ASTUtils.toInteger(entry.getValue());
-                          break;
-                      case BOARD:
-                          config.platformOptions.board = ASTUtils.elementToSingleString(entry.getValue());
-                          break;
-                      case FLASH:
-                          config.platformOptions.flash = ASTUtils.toBoolean(entry.getValue());
-                          break;
-                      case PORT:
-                          config.platformOptions.port = ASTUtils.elementToSingleString(entry.getValue());
-                          break;
-                      case USER_THREADS:
-                          config.platformOptions.userThreads = ASTUtils.toInteger(entry.getValue());
-                          break;
-                      default:
-                          break;
-                      }
-                  }
-              }
-              // If the platform does not support threading, disable it.
-              if (!config.platformOptions.platform.isMultiThreaded()) {
-                  config.threading = false;
-              }
-          }),
+          (TargetConfig config) -> config.platformOptions),
 
       /** Directive to instruct the runtime to collect and print execution statistics. */
       PRINT_STATISTICS(
@@ -594,7 +324,7 @@ public enum TargetProperty {
           "scheduler",
           UnionType.SCHEDULER_UNION,
           Arrays.asList(Target.C, Target.CCPP, Target.Python),
-          new SchedulerConfigurator()
+          (TargetConfig config) -> config.schedulerType
           ),
       /** Directive to specify that all code is generated in a single file. */
       SINGLE_FILE_PROJECT(
@@ -644,7 +374,7 @@ public enum TargetProperty {
           "tracing",
           UnionType.TRACING_UNION,
           Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Python),
-          new TracingConfigurator()),
+          (TargetConfig config) -> config.tracing),
 
       /**
        * Directive to let the runtime export its internal dependency graph.
@@ -798,28 +528,6 @@ public enum TargetProperty {
           (config, value, err) ->
               config.fedSetupPreamble = StringUtil.removeQuotes(ASTUtils.elementToSingleString(value)));
 
-    /** Update {@code config}.dockerOptions based on value. */
-  private static void setDockerProperty(TargetConfig config, Element value) {
-    if (value.getLiteral() != null) {
-      if (ASTUtils.toBoolean(value)) {
-        config.dockerOptions = new DockerOptions();
-      } else {
-        config.dockerOptions = null;
-      }
-    } else {
-      config.dockerOptions = new DockerOptions();
-      for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-        DockerOption option = (DockerOption) DictionaryType.DOCKER_DICT.forName(entry.getName());
-        switch (option) {
-          case FROM:
-            config.dockerOptions.from = ASTUtils.elementToSingleString(entry.getValue());
-            break;
-          default:
-            break;
-        }
-      }
-    }
-  }
 
   /** String representation of this target property. */
   public final String description;
@@ -849,6 +557,11 @@ private static void setDockerProperty(TargetConfig config, Element value) {
   public final PropertyParser updater;
 
 
+  @FunctionalInterface
+  private interface ConfigGetter<T> {
+      TargetPropertyConfig<T> get(TargetConfig config);
+  }
+
   @FunctionalInterface
   private interface  PropertyValidator {
       void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter);
@@ -900,14 +613,24 @@ private interface PropertyGetter {
   }
 
   TargetProperty(String description, TargetPropertyType type, List<Target> supportedBy,
-      TargetPropertyConfig configurator) {
+      ConfigGetter g) {
       this.description = description;
       this.type = type;
       this.supportedBy = supportedBy;
-      this.setter = configurator::parseIntoTargetConfig;
-      this.getter = configurator::getPropertyElement;
-      this.updater = configurator::parseIntoTargetConfig;
-      this.validator = configurator::validate;
+      this.setter = (TargetConfig config, Element element, MessageReporter err) -> {
+          g.get(config).set(element, err);
+      };
+      this.updater = (TargetConfig config, Element element, MessageReporter err) -> {
+          g.get(config).set(element, err);
+      };
+
+      this.getter = (TargetConfig config) -> {
+          return g.get(config).export();
+      };
+
+      this.validator = (KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) -> {
+          g.get(config).validate(pair, ast, config, reporter);
+      };
   }
 
   /**
@@ -945,6 +668,22 @@ public String getDisplayName() {
     return description;
   }
 
+  public static void override(TargetConfig config, Properties properties, MessageReporter err) {
+      properties.keySet().forEach(
+          key -> {
+              TargetProperty p = forName(key.toString());
+              if (p != null) {
+                  // Mark the specified target property as set by the user
+                  config.setByUser.add(p);
+                  try {
+                      // FIXME: p.setter.parseIntoTargetConfig(config, properties.get(key), err);
+                  } catch (InvalidLfSourceException e) {
+                      err.at(e.getNode()).error(e.getProblem());
+                  }
+              }
+          });
+  }
+
   /**
    * Set the given configuration using the given target properties.
    *
diff --git a/core/src/main/java/org/lflang/TargetPropertyConfig.java b/core/src/main/java/org/lflang/TargetPropertyConfig.java
index 1e784da0a5..d6dcccd523 100644
--- a/core/src/main/java/org/lflang/TargetPropertyConfig.java
+++ b/core/src/main/java/org/lflang/TargetPropertyConfig.java
@@ -1,26 +1,65 @@
 package org.lflang;
 
+import java.util.Properties;
+
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.Model;
 import org.lflang.validation.ValidationReporter;
 
-public interface TargetPropertyConfig<T> {
+public abstract class TargetPropertyConfig<T> { //implements TargetPropertyConfigurator<T> {
+
+  protected T value = initialize();
+
+  protected boolean setByUser;
+
+  public void override(T value) { // FIXME: do all overrides imply setByUser?
+    this.value = value;
+  }
+
+  public abstract T initialize();
 
   /**
    * Parse the given element into the given target config. May use the error reporter to report
    * format errors.
    */
-  void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err);
+  public void set(Element value, MessageReporter err) {
+    var parsed = this.parse(value); // FIXME pass in error reporter. Maybe also rename to load?
+    if (parsed != null) {
+      this.setByUser = true;
+      this.value = parsed;
+    }
+  }
+
+  public void update(Element value, MessageReporter err) {
+    this.set(value, err);
+  }
+
+  public void update(Properties cliArgs) {
+    this.setByUser = true;
+  }
+
+  /**
+   * Return the current configuration.
+   */
+  public T get() {
+    return value;
+  }
 
-  T parse(Element value);
+  protected abstract T parse(Element value);
 
   // FIXME: config may not be needed.
-  void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter);
+  public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+
+  }
 
   /**
    * Read this property from the target config and build an element which represents it for the AST.
    * May return null if the given value of this property is the same as the default.
    */
-  Element getPropertyElement(TargetConfig config);
+  public abstract Element export();
+
+  public boolean isSetByUser() {
+    return setByUser;
+  }
 }
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 206798a14c..3deefb3757 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -57,7 +57,7 @@
 import org.lflang.lf.Port;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
-import org.lflang.target.CoordinationConfig.CoordinationType;
+import org.lflang.target.CoordinationModeConfig.CoordinationMode;
 
 /**
  * An extension class to the CGenerator that enables certain federated functionalities.
@@ -82,7 +82,7 @@ public void initializeTargetConfig(
 
     generateCMakeInclude(federate, fileConfig);
 
-    federate.targetConfig.keepalive = true;
+    federate.targetConfig.keepalive.override(true);
     federate.targetConfig.setByUser.add(TargetProperty.KEEPALIVE);
 
     // If there are federates, copy the required files for that.
@@ -112,7 +112,7 @@ protected void generateCMakeInclude(FederateInstance federate, FedFileConfig fil
    * @param receivingPort The ID of the destination port.
    * @param connection The federated connection being lowered.
    * @param type The type of the data conveyed by the port.
-   * @param coordinationType The coordination type
+   * @param coordinationMode The coordination type
    */
   public String generateNetworkReceiverBody(
       Action action,
@@ -120,7 +120,7 @@ public String generateNetworkReceiverBody(
       VarRef receivingPort,
       FedConnectionInstance connection,
       InferredType type,
-      CoordinationType coordinationType,
+      CoordinationMode coordinationMode,
       MessageReporter messageReporter) {
     var receiveRef =
         CUtil.portRefInReaction(receivingPort, connection.getDstBank(), connection.getDstChannel());
@@ -131,7 +131,7 @@ public String generateNetworkReceiverBody(
             + "->physical_time_of_arrival = self->_lf__"
             + action.getName()
             + ".physical_time_of_arrival;");
-    if (coordinationType == CoordinationType.DECENTRALIZED
+    if (coordinationMode == CoordinationMode.DECENTRALIZED
         && !connection.getDefinition().isPhysical()) {
       // Transfer the intended tag.
       result.pr(
@@ -257,14 +257,14 @@ public void supplySenderIndexParameter(Instantiation inst, int idx) {
    * @param receivingPort The variable reference to the destination port.
    * @param connection The federated connection being lowered.
    * @param type The type of the data conveyed by the connection.
-   * @param coordinationType Centralized or decentralized.
+   * @param coordinationMode Centralized or decentralized.
    */
   public String generateNetworkSenderBody(
       VarRef sendingPort,
       VarRef receivingPort,
       FedConnectionInstance connection,
       InferredType type,
-      CoordinationType coordinationType,
+      CoordinationMode coordinationMode,
       MessageReporter messageReporter) {
     var sendRef =
         CUtil.portRefInReaction(sendingPort, connection.getSrcBank(), connection.getSrcChannel());
@@ -311,7 +311,7 @@ public String generateNetworkSenderBody(
 
     if (connection.getDefinition().isPhysical()) {
       messageType = "MSG_TYPE_P2P_MESSAGE";
-    } else if (coordinationType == CoordinationType.DECENTRALIZED) {
+    } else if (coordinationMode == CoordinationMode.DECENTRALIZED) {
       messageType = "MSG_TYPE_P2P_TAGGED_MESSAGE";
     } else {
       // Logical connection
@@ -680,7 +680,7 @@ private String generateCodeToInitializeFederate(FederateInstance federate, RtiCo
                 "lf_cond_init(&logical_time_changed, &env->mutex);")));
 
     // Find the STA (A.K.A. the global STP offset) for this federate.
-    if (federate.targetConfig.coordination == CoordinationType.DECENTRALIZED) {
+    if (federate.targetConfig.coordination.get() == CoordinationMode.DECENTRALIZED) {
       var reactor = ASTUtils.toDefinition(federate.instantiation.getReactorClass());
       var stpParam =
           reactor.getParameters().stream()
@@ -740,12 +740,12 @@ private String generateCodeToInitializeFederate(FederateInstance federate, RtiCo
     }
 
     // If a test clock offset has been specified, insert code to set it here.
-    if (federate.targetConfig.clockSyncOptions.testOffset != null) {
+    if (federate.targetConfig.clockSyncOptions.get().testOffset != null) {
       code.pr(
           "lf_set_physical_clock_offset((1 + "
               + federate.id
               + ") * "
-              + federate.targetConfig.clockSyncOptions.testOffset.toNanoSeconds()
+              + federate.targetConfig.clockSyncOptions.get().testOffset.toNanoSeconds()
               + "LL);");
     }
 
@@ -800,7 +800,7 @@ private String generateCodeToInitializeFederate(FederateInstance federate, RtiCo
   private String generateCodeForPhysicalActions(
       FederateInstance federate, MessageReporter messageReporter) {
     CodeBuilder code = new CodeBuilder();
-    if (federate.targetConfig.coordination.equals(CoordinationType.CENTRALIZED)) {
+    if (federate.targetConfig.coordination.equals(CoordinationMode.CENTRALIZED)) {
       // If this program uses centralized coordination then check
       // for outputs that depend on physical actions so that null messages can be
       // sent to the RTI.
@@ -823,7 +823,7 @@ private String generateCodeForPhysicalActions(
       }
       if (minDelay != TimeValue.MAX_VALUE) {
         // Unless silenced, issue a warning.
-        if (federate.targetConfig.coordinationOptions.advance_message_interval == null) {
+        if (federate.targetConfig.coordinationOptions.get().advanceMessageInterval == null) {
           String message =
               String.join(
                   "\n",
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 0903d2d90d..2b622d3b46 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -8,9 +8,7 @@
 import java.util.regex.Pattern;
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
-import org.lflang.TargetConfig.ClockSyncOptions;
 import org.lflang.TargetProperty;
-import org.lflang.TargetProperty.ClockSyncMode;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
@@ -25,6 +23,8 @@
 import org.lflang.lf.Expression;
 import org.lflang.lf.Input;
 import org.lflang.lf.ParameterReference;
+import org.lflang.target.ClockSyncModeConfig.ClockSyncMode;
+import org.lflang.target.property.ClockSyncOptionsConfig.ClockSyncOptions;
 
 public class CExtensionUtils {
 
@@ -177,7 +177,7 @@ public static void handleCompileDefinitions(
     federate.targetConfig.compileDefinitions.put("FEDERATED", "");
     federate.targetConfig.compileDefinitions.put(
         "FEDERATED_" + federate.targetConfig.coordination.toString().toUpperCase(), "");
-    if (federate.targetConfig.auth) {
+    if (federate.targetConfig.auth.get()) {
       federate.targetConfig.compileDefinitions.put("FEDERATED_AUTHENTICATED", "");
     }
     federate.targetConfig.compileDefinitions.put(
@@ -190,7 +190,7 @@ public static void handleCompileDefinitions(
   }
 
   private static void handleAdvanceMessageInterval(FederateInstance federate) {
-    var advanceMessageInterval = federate.targetConfig.coordinationOptions.advance_message_interval;
+    var advanceMessageInterval = federate.targetConfig.coordinationOptions.get().advanceMessageInterval;
     federate.targetConfig.setByUser.remove(TargetProperty.COORDINATION_OPTIONS);
     if (advanceMessageInterval != null) {
       federate.targetConfig.compileDefinitions.put(
@@ -199,9 +199,9 @@ private static void handleAdvanceMessageInterval(FederateInstance federate) {
   }
 
   static boolean clockSyncIsOn(FederateInstance federate, RtiConfig rtiConfig) {
-    return federate.targetConfig.clockSync != ClockSyncMode.OFF
+    return federate.targetConfig.clockSync.get() != ClockSyncMode.OFF
         && (!rtiConfig.getHost().equals(federate.host)
-            || federate.targetConfig.clockSyncOptions.localFederatesOn);
+            || federate.targetConfig.clockSyncOptions.get().localFederatesOn);
   }
 
   /**
@@ -219,8 +219,8 @@ public static void initializeClockSynchronization(
       messageReporter
           .nowhere()
           .info("Initial clock synchronization is enabled for federate " + federate.id);
-      if (federate.targetConfig.clockSync == ClockSyncMode.ON) {
-        if (federate.targetConfig.clockSyncOptions.collectStats) {
+      if (federate.targetConfig.clockSync.get() == ClockSyncMode.ON) {
+        if (federate.targetConfig.clockSyncOptions.get().collectStats) {
           messageReporter
               .nowhere()
               .info("Will collect clock sync statistics for federate " + federate.id);
@@ -251,8 +251,8 @@ public static void initializeClockSynchronization(
    */
   public static void addClockSyncCompileDefinitions(FederateInstance federate) {
 
-    ClockSyncMode mode = federate.targetConfig.clockSync;
-    ClockSyncOptions options = federate.targetConfig.clockSyncOptions;
+    ClockSyncMode mode = federate.targetConfig.clockSync.get();
+    ClockSyncOptions options = federate.targetConfig.clockSyncOptions.get();
 
     federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_INITIAL", "");
     federate.targetConfig.compileDefinitions.put(
diff --git a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
index 61a6583026..9c2c4168f9 100644
--- a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
@@ -13,7 +13,7 @@
 import org.lflang.lf.Reaction;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
-import org.lflang.target.CoordinationConfig.CoordinationType;
+import org.lflang.target.CoordinationModeConfig.CoordinationMode;
 
 public interface FedTargetExtension {
 
@@ -44,7 +44,7 @@ void initializeTargetConfig(
    * @param receivingPort The ID of the destination port.
    * @param connection The federated connection being lowered.
    * @param type The type of the data being sent over the connection.
-   * @param coordinationType The coordination type
+   * @param coordinationMode The coordination type
    */
   String generateNetworkReceiverBody(
       Action action,
@@ -52,7 +52,7 @@ String generateNetworkReceiverBody(
       VarRef receivingPort,
       FedConnectionInstance connection,
       InferredType type,
-      CoordinationType coordinationType,
+      CoordinationMode coordinationMode,
       MessageReporter messageReporter);
 
   /** Generate code for initializing a network output reactor from its startup reaction. */
@@ -75,14 +75,14 @@ String generateNetworkReceiverBody(
    * @param receivingPort The variable reference to the destination port.
    * @param connection The federated connection being lowered.
    * @param type The type of the data being sent over the connection.
-   * @param coordinationType Whether the federated program is centralized or decentralized.
+   * @param coordinationMode Whether the federated program is centralized or decentralized.
    */
   String generateNetworkSenderBody(
       VarRef sendingPort,
       VarRef receivingPort,
       FedConnectionInstance connection,
       InferredType type,
-      CoordinationType coordinationType,
+      CoordinationMode coordinationMode,
       MessageReporter messageReporter);
 
   /**
diff --git a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
index 0b5007f5bc..abf51be552 100644
--- a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
@@ -42,7 +42,7 @@
 import org.lflang.lf.Action;
 import org.lflang.lf.Reaction;
 import org.lflang.lf.VarRef;
-import org.lflang.target.CoordinationConfig.CoordinationType;
+import org.lflang.target.CoordinationModeConfig.CoordinationMode;
 
 /**
  * An extension class to the PythonGenerator that enables certain federated functionalities.
@@ -84,13 +84,13 @@ public String generateNetworkSenderBody(
       VarRef receivingPort,
       FedConnectionInstance connection,
       InferredType type,
-      CoordinationType coordinationType,
+      CoordinationMode coordinationMode,
       MessageReporter messageReporter) {
     var result = new CodeBuilder();
     result.pr(PyUtil.generateGILAcquireCode() + "\n");
     result.pr(
         super.generateNetworkSenderBody(
-            sendingPort, receivingPort, connection, type, coordinationType, messageReporter));
+            sendingPort, receivingPort, connection, type, coordinationMode, messageReporter));
     result.pr(PyUtil.generateGILReleaseCode() + "\n");
     return result.getCode();
   }
@@ -102,7 +102,7 @@ public String generateNetworkReceiverBody(
       VarRef receivingPort,
       FedConnectionInstance connection,
       InferredType type,
-      CoordinationType coordinationType,
+      CoordinationMode coordinationMode,
       MessageReporter messageReporter) {
     var result = new CodeBuilder();
     result.pr(PyUtil.generateGILAcquireCode() + "\n");
@@ -113,7 +113,7 @@ public String generateNetworkReceiverBody(
             receivingPort,
             connection,
             type,
-            coordinationType,
+            coordinationMode,
             messageReporter));
     result.pr(PyUtil.generateGILReleaseCode() + "\n");
     return result.getCode();
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index a3ac049a37..d10932265b 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -25,7 +25,7 @@
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
-import org.lflang.target.CoordinationConfig.CoordinationType;
+import org.lflang.target.CoordinationModeConfig.CoordinationMode;
 
 public class TSExtension implements FedTargetExtension {
   @Override
@@ -44,7 +44,7 @@ public String generateNetworkReceiverBody(
       VarRef receivingPort,
       FedConnectionInstance connection,
       InferredType type,
-      CoordinationType coordinationType,
+      CoordinationMode coordinationMode,
       MessageReporter messageReporter) {
     return """
         // generateNetworkReceiverBody
@@ -106,7 +106,7 @@ public String generateNetworkSenderBody(
       VarRef receivingPort,
       FedConnectionInstance connection,
       InferredType type,
-      CoordinationType coordinationType,
+      CoordinationMode coordinationMode,
       MessageReporter messageReporter) {
     return """
         if (%1$s%2$s[0] !== undefined) {
@@ -200,7 +200,7 @@ public String generatePreamble(
 
   private TimeValue getMinOutputDelay(
       FederateInstance federate, FedFileConfig fileConfig, MessageReporter messageReporter) {
-    if (federate.targetConfig.coordination.equals(CoordinationType.CENTRALIZED)) {
+    if (federate.targetConfig.coordination.equals(CoordinationMode.CENTRALIZED)) {
       // If this program uses centralized coordination then check
       // for outputs that depend on physical actions so that null messages can be
       // sent to the RTI.
@@ -223,7 +223,7 @@ private TimeValue getMinOutputDelay(
       }
       if (minOutputDelay != TimeValue.MAX_VALUE) {
         // Unless silenced, issue a warning.
-        if (federate.targetConfig.coordinationOptions.advance_message_interval == null) {
+        if (federate.targetConfig.coordinationOptions.get().advanceMessageInterval == null) {
           String message =
               String.join(
                   "\n",
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 6414db1e9c..210365b261 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -70,7 +70,7 @@
 import org.lflang.lf.Type;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
-import org.lflang.target.CoordinationConfig.CoordinationType;
+import org.lflang.target.CoordinationModeConfig.CoordinationMode;
 
 /**
  * A helper class for AST transformations needed for federated execution.
@@ -136,7 +136,7 @@ public static Reactor findFederatedReactor(Resource resource) {
   public static void makeCommunication(
       FedConnectionInstance connection,
       Resource resource,
-      CoordinationType coordination,
+      CoordinationMode coordination,
       MessageReporter messageReporter) {
 
     addNetworkSenderReactor(connection, coordination, resource, messageReporter);
@@ -213,7 +213,7 @@ public static Reactor addReactorDefinition(String name, Resource resource) {
    */
   private static void addNetworkReceiverReactor(
       FedConnectionInstance connection,
-      CoordinationType coordination,
+      CoordinationMode coordination,
       Resource resource,
       MessageReporter messageReporter) {
     LfFactory factory = LfFactory.eINSTANCE;
@@ -311,7 +311,7 @@ private static void addNetworkReceiverReactor(
       // If the connection is logical but coordination
       // is decentralized, we would need
       // to make P2P connections
-      if (coordination == CoordinationType.DECENTRALIZED) {
+      if (coordination == CoordinationMode.DECENTRALIZED) {
         connection.dstFederate.inboundP2PConnections.add(connection.srcFederate);
       }
     }
@@ -500,7 +500,7 @@ private static void followReactionUpstream(
    * @return The maximum STP as a TimeValue
    */
   private static TimeValue findMaxSTP(
-      FedConnectionInstance connection, CoordinationType coordination) {
+      FedConnectionInstance connection, CoordinationMode coordination) {
     Variable port = connection.getDestinationPortInstance().getDefinition();
     FederateInstance instance = connection.dstFederate;
     Reactor reactor = connection.getDestinationPortInstance().getParent().reactorDefinition;
@@ -540,7 +540,7 @@ private static TimeValue findMaxSTP(
             .collect(Collectors.toList());
 
     // Find a list of STP offsets (if any exists)
-    if (coordination == CoordinationType.DECENTRALIZED) {
+    if (coordination == CoordinationMode.DECENTRALIZED) {
       for (Reaction r : safe(reactionsWithPort)) {
         // If STP offset is determined, add it
         // If not, assume it is zero
@@ -632,7 +632,7 @@ public static <E> List<E> safe(List<E> list) {
    */
   private static Reactor getNetworkSenderReactor(
       FedConnectionInstance connection,
-      CoordinationType coordination,
+      CoordinationMode coordination,
       Resource resource,
       MessageReporter messageReporter) {
     var extension =
@@ -708,7 +708,7 @@ private static Reaction getNetworkSenderReaction(
       VarRef inRef,
       VarRef destRef,
       FedConnectionInstance connection,
-      CoordinationType coordination,
+      CoordinationMode coordination,
       Type type,
       MessageReporter messageReporter) {
     var networkSenderReaction = LfFactory.eINSTANCE.createReaction();
@@ -754,7 +754,7 @@ private static Reaction getInitializationReaction(FedTargetExtension extension,
    */
   private static void addNetworkSenderReactor(
       FedConnectionInstance connection,
-      CoordinationType coordination,
+      CoordinationMode coordination,
       Resource resource,
       MessageReporter messageReporter) {
     LfFactory factory = LfFactory.eINSTANCE;
@@ -804,7 +804,7 @@ private static void addNetworkSenderReactor(
       // If the connection is logical but coordination
       // is decentralized, we would need
       // to make P2P connections
-      if (coordination == CoordinationType.DECENTRALIZED) {
+      if (coordination == CoordinationMode.DECENTRALIZED) {
         connection.srcFederate.outboundP2PConnections.add(connection.dstFederate);
       }
     }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 05a500710c..0feee8144f 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -58,7 +58,7 @@
 import org.lflang.lf.Reactor;
 import org.lflang.lf.TargetDecl;
 import org.lflang.lf.VarRef;
-import org.lflang.target.CoordinationConfig.CoordinationType;
+import org.lflang.target.CoordinationModeConfig.CoordinationMode;
 import org.lflang.util.Averager;
 
 public class FedGenerator {
@@ -121,7 +121,7 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
     // In a federated execution, we need keepalive to be true,
     // otherwise a federate could exit simply because it hasn't received
     // any messages.
-    targetConfig.keepalive = true;
+    targetConfig.keepalive.override(true);
 
     // Process command-line arguments
     processCLIArguments(context);
@@ -669,7 +669,7 @@ private void replaceOneToManyConnection(
    */
   private void replaceFedConnection(FedConnectionInstance connection, Resource resource) {
     if (!connection.getDefinition().isPhysical()
-        && targetConfig.coordination != CoordinationType.DECENTRALIZED) {
+        && targetConfig.coordination.get() != CoordinationMode.DECENTRALIZED) {
       // Map the delays on connections between federates.
       Set<Expression> dependsOnDelays =
           connection.dstFederate.dependsOn.computeIfAbsent(
@@ -693,6 +693,6 @@ private void replaceFedConnection(FedConnectionInstance connection, Resource res
       }
     }
 
-    FedASTUtils.makeCommunication(connection, resource, targetConfig.coordination, messageReporter);
+    FedASTUtils.makeCommunication(connection, resource, targetConfig.coordination.get(), messageReporter);
   }
 }
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index bff26e5c2f..7532ff1c66 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -37,7 +37,7 @@
 import org.lflang.TargetConfig;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
-import org.lflang.target.ClockSyncConfigurator.ClockSyncMode;
+import org.lflang.target.ClockSyncModeConfig.ClockSyncMode;
 
 /**
  * Utility class that can be used to create a launcher for federated LF programs.
@@ -334,7 +334,7 @@ private String getRtiCommand(List<FederateInstance> federates, boolean isRemote)
     } else {
       commands.add("RTI -i ${FEDERATION_ID} \\");
     }
-    if (targetConfig.auth) {
+    if (targetConfig.auth.get()) {
       commands.add("                        -a \\");
     }
     if (targetConfig.tracing != null) {
@@ -343,13 +343,13 @@ private String getRtiCommand(List<FederateInstance> federates, boolean isRemote)
     commands.addAll(
         List.of(
             "                        -n " + federates.size() + " \\",
-            "                        -c " + targetConfig.clockSync.toString() + " \\"));
-    if (targetConfig.clockSync.equals(ClockSyncMode.ON)) {
-      commands.add("period " + targetConfig.clockSyncOptions.period.toNanoSeconds() + " \\");
+            "                        -c " + targetConfig.clockSync.get().toString() + " \\"));
+    if (targetConfig.clockSync.get().equals(ClockSyncMode.ON)) {
+      commands.add("period " + targetConfig.clockSyncOptions.get().period.toNanoSeconds() + " \\");
     }
-    if (targetConfig.clockSync.equals(ClockSyncMode.ON)
-        || targetConfig.clockSync.equals(ClockSyncMode.INIT)) {
-      commands.add("exchanges-per-interval " + targetConfig.clockSyncOptions.trials + " \\");
+    if (targetConfig.clockSync.get().equals(ClockSyncMode.ON)
+        || targetConfig.clockSync.get().equals(ClockSyncMode.INIT)) {
+      commands.add("exchanges-per-interval " + targetConfig.clockSyncOptions.get().trials + " \\");
     }
     commands.add("&");
     return String.join("\n", commands);
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index 09cf940fb3..469ba28b46 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -58,9 +58,9 @@ public static void accommodatePhysicalActionsIfPresent(
             &&
             // Check if the user has explicitly set keepalive to false
             !targetConfig.setByUser.contains(TargetProperty.KEEPALIVE)
-            && !targetConfig.keepalive) {
+            && !targetConfig.keepalive.get()) {
           // If not, set it to true
-          targetConfig.keepalive = true;
+          targetConfig.keepalive.override(true);
           String message =
               String.format(
                   "Setting %s to true because of the physical action %s.",
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index e7b7ecb5a5..6af1b1fc57 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -35,7 +35,7 @@
 import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.generator.CodeBuilder;
-import org.lflang.target.PlatformConfigurator.Platform;
+import org.lflang.target.PlatformConfig.Platform;
 import org.lflang.util.FileUtil;
 
 /**
@@ -118,8 +118,8 @@ CodeBuilder generateCMakeCode(
     //  rp2040 <board_name> : <stdio_opt>
     //  arduino
     String[] boardProperties = {};
-    if (targetConfig.platformOptions.board != null) {
-      boardProperties = targetConfig.platformOptions.board.trim().split(":");
+    if (targetConfig.platformOptions.get().board != null) {
+      boardProperties = targetConfig.platformOptions.get().board.trim().split(":");
       // Ignore whitespace
       for (int i = 0; i < boardProperties.length; i++) {
         boardProperties[i] = boardProperties[i].trim();
@@ -132,14 +132,14 @@ CodeBuilder generateCMakeCode(
     cMakeCode.pr("cmake_minimum_required(VERSION " + MIN_CMAKE_VERSION + ")");
 
     // Setup the project header for different platforms
-    switch (targetConfig.platformOptions.platform) {
+    switch (targetConfig.platformOptions.get().platform) {
       case ZEPHYR:
         cMakeCode.pr("# Set default configuration file. To add custom configurations,");
         cMakeCode.pr("# pass -- -DOVERLAY_CONFIG=my_config.prj to either cmake or west");
         cMakeCode.pr("set(CONF_FILE prj_lf.conf)");
-        if (targetConfig.platformOptions.board != null) {
+        if (targetConfig.platformOptions.get().board != null) {
           cMakeCode.pr("# Selecting board specified in target property");
-          cMakeCode.pr("set(BOARD " + targetConfig.platformOptions.board + ")");
+          cMakeCode.pr("set(BOARD " + targetConfig.platformOptions.get().board + ")");
         } else {
           cMakeCode.pr("# Selecting default board");
           cMakeCode.pr("set(BOARD qemu_cortex_m3)");
@@ -175,7 +175,7 @@ CodeBuilder generateCMakeCode(
         cMakeCode.pr("project(" + executableName + " LANGUAGES C CXX ASM)");
         cMakeCode.newLine();
         // board type for rp2040 based boards
-        if (targetConfig.platformOptions.board != null) {
+        if (targetConfig.platformOptions.get().board != null) {
           if (boardProperties.length < 1 || boardProperties[0].equals("")) {
             cMakeCode.pr("set(PICO_BOARD pico)");
           } else {
@@ -231,7 +231,7 @@ CodeBuilder generateCMakeCode(
     }
 
     // Set the build type
-    cMakeCode.pr("set(DEFAULT_BUILD_TYPE " + targetConfig.cmakeBuildType + ")\n");
+    cMakeCode.pr("set(DEFAULT_BUILD_TYPE " + targetConfig.buildType + ")\n");
     cMakeCode.pr("if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)\n");
     cMakeCode.pr(
         "    set(CMAKE_BUILD_TYPE ${DEFAULT_BUILD_TYPE} CACHE STRING \"Choose the type of build.\""
@@ -249,14 +249,14 @@ CodeBuilder generateCMakeCode(
       cMakeCode.newLine();
     }
 
-    if (targetConfig.platformOptions.platform != Platform.AUTO) {
+    if (targetConfig.platformOptions.get().platform != Platform.AUTO) {
       cMakeCode.pr(
-          "set(CMAKE_SYSTEM_NAME " + targetConfig.platformOptions.platform.getcMakeName() + ")");
+          "set(CMAKE_SYSTEM_NAME " + targetConfig.platformOptions.get().platform.getcMakeName() + ")");
     }
     cMakeCode.newLine();
 
     // Setup main target for different platforms
-    switch (targetConfig.platformOptions.platform) {
+    switch (targetConfig.platformOptions.get().platform) {
       case ZEPHYR:
         cMakeCode.pr(
             setUpMainTargetZephyr(
@@ -296,12 +296,12 @@ CodeBuilder generateCMakeCode(
     cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/utils)");
 
     // post target definition board configurations
-    switch (targetConfig.platformOptions.platform) {
+    switch (targetConfig.platformOptions.get().platform) {
       case RP2040:
         // set stdio output
         boolean usb = true;
         boolean uart = true;
-        if (targetConfig.platformOptions.board != null && boardProperties.length > 1) {
+        if (targetConfig.platformOptions.get().board != null && boardProperties.length > 1) {
           uart = !boardProperties[1].equals("usb");
           usb = !boardProperties[1].equals("uart");
         }
@@ -310,12 +310,12 @@ CodeBuilder generateCMakeCode(
         break;
     }
 
-    if (targetConfig.auth) {
+    if (targetConfig.auth.get()) {
       // If security is requested, add the auth option.
       var osName = System.getProperty("os.name").toLowerCase();
       // if platform target was set, use given platform instead
-      if (targetConfig.platformOptions.platform != Platform.AUTO) {
-        osName = targetConfig.platformOptions.platform.toString();
+      if (targetConfig.platformOptions.get().platform != Platform.AUTO) {
+        osName = targetConfig.platformOptions.get().platform.toString();
       }
       if (osName.contains("mac")) {
         cMakeCode.pr("set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)");
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index 0df21fc413..f35b698c51 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -41,7 +41,7 @@
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.target.property.BuildConfig;
-import org.lflang.target.PlatformConfigurator.Platform;
+import org.lflang.target.PlatformConfig.Platform;
 import org.lflang.util.FileUtil;
 import org.lflang.util.LFCommand;
 
@@ -179,8 +179,8 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
                     + " finished with no errors.");
       }
 
-      if (targetConfig.platformOptions.platform == Platform.ZEPHYR
-          && targetConfig.platformOptions.flash) {
+      if (targetConfig.platformOptions.get().platform == Platform.ZEPHYR
+          && targetConfig.platformOptions.get().flash) {
         messageReporter.nowhere().info("Invoking flash command for Zephyr");
         LFCommand flash = buildWestFlashCommand();
         int flashRet = flash.run();
@@ -237,8 +237,8 @@ private static List<String> cmakeOptions(TargetConfig targetConfig, FileConfig f
     arguments.addAll(
         List.of(
             "-DCMAKE_BUILD_TYPE="
-                + ((targetConfig.cmakeBuildType != null)
-                    ? targetConfig.cmakeBuildType.toString()
+                + ((targetConfig.buildType != null)
+                    ? targetConfig.buildType.toString()
                     : "Release"),
             "-DCMAKE_INSTALL_PREFIX=" + FileUtil.toUnixString(fileConfig.getOutPath()),
             "-DCMAKE_INSTALL_BINDIR="
@@ -260,7 +260,7 @@ private static List<String> cmakeOptions(TargetConfig targetConfig, FileConfig f
     return arguments;
   }
 
-  /** Return the cmake config name correspnding to a given build type. */
+  /** Return the cmake config name corresponding to a given build type. */
   private String buildTypeToCmakeConfig(BuildConfig.BuildType type) {
     if (type == null) {
       return "Release";
@@ -295,7 +295,7 @@ public LFCommand buildCmakeCommand() {
                 "--parallel",
                 cores,
                 "--config",
-                buildTypeToCmakeConfig(targetConfig.cmakeBuildType)),
+                buildTypeToCmakeConfig(targetConfig.buildType.get())),
             buildPath);
     if (command == null) {
       messageReporter
@@ -316,7 +316,7 @@ public LFCommand buildCmakeCommand() {
   public LFCommand buildWestFlashCommand() {
     // Set the build directory to be "build"
     Path buildPath = fileConfig.getSrcGenPath().resolve("build");
-    String board = targetConfig.platformOptions.board;
+    String board = targetConfig.platformOptions.get().board;
     LFCommand cmd;
     if (board == null || board.startsWith("qemu") || board.equals("native_posix")) {
       cmd = commandFactory.createCommand("west", List.of("build", "-t", "run"), buildPath);
@@ -445,7 +445,7 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
    *     .cpp files instead of .c files and uses a C++ compiler to compiler the code.
    */
   static String getTargetFileName(String fileName, boolean cppMode, TargetConfig targetConfig) {
-    if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
+    if (targetConfig.platformOptions.get().platform == Platform.ARDUINO) {
       return fileName + ".ino";
     }
     if (cppMode) {
diff --git a/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java b/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
index f52e23a949..f6dc1bf200 100644
--- a/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
@@ -30,13 +30,13 @@ protected String generateDockerFileContent() {
     var lfModuleName = context.getFileConfig().name;
     var config = context.getTargetConfig();
     var compileCommand =
-        IterableExtensions.isNullOrEmpty(config.buildCommands)
+        IterableExtensions.isNullOrEmpty(config.buildCommands.get())
             ? generateDefaultCompileCommand()
-            : StringUtil.joinObjects(config.buildCommands, " ");
+            : StringUtil.joinObjects(config.buildCommands.get(), " ");
     var compiler = config.target == Target.CCPP ? "g++" : "gcc";
     var baseImage = DEFAULT_BASE_IMAGE;
-    if (config.dockerOptions != null && config.dockerOptions.from != null) {
-      baseImage = config.dockerOptions.from;
+    if (config.dockerOptions != null && config.dockerOptions.get().from != null) {
+      baseImage = config.dockerOptions.get().from;
     }
     return String.join(
         "\n",
diff --git a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
index 71134fb806..90a09b3dc1 100644
--- a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -89,13 +89,14 @@ private String generateCreateEnvironments() {
 
       // Figure out the name of the trace file
       String traceFileName = "NULL";
-      if (targetConfig.tracing != null) {
-        if (targetConfig.tracing.traceFileName != null) {
+      var tracing = targetConfig.tracing.get();
+      if (tracing.isEnabled()) {
+        if (tracing.traceFileName != null) {
           if (enclave.isMainOrFederated()) {
-            traceFileName = "\"" + targetConfig.tracing.traceFileName + ".lft\"";
+            traceFileName = "\"" + tracing.traceFileName + ".lft\"";
           } else {
             traceFileName =
-                "\"" + targetConfig.tracing.traceFileName + enclave.getName() + ".lft\"";
+                "\"" + tracing.traceFileName + enclave.getName() + ".lft\"";
           }
         } else {
           if (enclave.isMainOrFederated()) {
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 335a971247..f4b1b9043f 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -54,7 +54,7 @@
 import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
-import org.lflang.TargetProperty.PlatformOption;
+import org.lflang.target.PlatformConfig.PlatformOption;
 import org.lflang.ast.ASTUtils;
 import org.lflang.ast.DelayedConnectionTransformation;
 import org.lflang.federated.extensions.CExtensionUtils;
@@ -88,8 +88,8 @@
 import org.lflang.lf.ReactorDecl;
 import org.lflang.lf.StateVar;
 import org.lflang.lf.Variable;
-import org.lflang.target.PlatformConfigurator.Platform;
-import org.lflang.target.SchedulerConfigurator.SchedulerOption;
+import org.lflang.target.PlatformConfig.Platform;
+import org.lflang.target.SchedulerConfig.SchedulerOption;
 import org.lflang.util.ArduinoUtil;
 import org.lflang.util.FileUtil;
 
@@ -432,7 +432,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     }
 
     // If cmake is requested, generate the CMakeLists.txt
-    if (targetConfig.platformOptions.platform != Platform.ARDUINO) {
+    if (targetConfig.platformOptions.get().platform != Platform.ARDUINO) {
       var cmakeFile = fileConfig.getSrcGenPath() + File.separator + "CMakeLists.txt";
       var sources =
           allTypeParameterizedReactors()
@@ -539,7 +539,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     // clean it up after, removing the #line directives after errors have been reported.
     if (!targetConfig.noCompile
         && targetConfig.dockerOptions == null
-        && IterableExtensions.isNullOrEmpty(targetConfig.buildCommands)
+        && IterableExtensions.isNullOrEmpty(targetConfig.buildCommands.get())
         // This code is unreachable in LSP_FAST mode, so that check is omitted.
         && context.getMode() != LFGeneratorContext.Mode.LSP_MEDIUM) {
       // FIXME: Currently, a lack of main is treated as a request to not produce
@@ -582,7 +582,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     // If a build directive has been given, invoke it now.
     // Note that the code does not get cleaned in this case.
     if (!targetConfig.noCompile) {
-      if (!IterableExtensions.isNullOrEmpty(targetConfig.buildCommands)) {
+      if (!IterableExtensions.isNullOrEmpty(targetConfig.buildCommands.get())) {
         CUtil.runBuildCommand(
             fileConfig,
             targetConfig,
@@ -654,7 +654,7 @@ private void generateCodeFor(String lfModuleName) throws IOException {
       // is set to decentralized) or, if there are
       // downstream federates, will notify the RTI
       // that the specified logical time is complete.
-      if (CCppMode || targetConfig.platformOptions.platform == Platform.ARDUINO)
+      if (CCppMode || targetConfig.platformOptions.get().platform == Platform.ARDUINO)
         code.pr("extern \"C\"");
       code.pr(
           String.join(
@@ -695,11 +695,11 @@ protected String getConflictingConnectionsInModalReactorsBody(String source, Str
   private void pickScheduler() {
     // Don't use a scheduler that does not prioritize reactions based on deadlines
     // if the program contains a deadline (handler). Use the GEDF_NP scheduler instead.
-    if (!targetConfig.schedulerType.prioritizesDeadline()) {
+    if (!targetConfig.schedulerType.get().prioritizesDeadline()) {
       // Check if a deadline is assigned to any reaction
       if (hasDeadlines(reactors)) {
         if (!targetConfig.setByUser.contains(TargetProperty.SCHEDULER)) {
-          targetConfig.schedulerType = SchedulerOption.GEDF_NP;
+          targetConfig.schedulerType.override(SchedulerOption.GEDF_NP);
         }
       }
     }
@@ -899,8 +899,8 @@ private void generateReactorChildren(
   private void pickCompilePlatform() {
     var osName = System.getProperty("os.name").toLowerCase();
     // if platform target was set, use given platform instead
-    if (targetConfig.platformOptions.platform != Platform.AUTO) {
-      osName = targetConfig.platformOptions.platform.toString();
+    if (targetConfig.platformOptions.get().platform != Platform.AUTO) {
+      osName = targetConfig.platformOptions.get().platform.toString();
     } else if (Stream.of("mac", "darwin", "win", "nux").noneMatch(osName::contains)) {
       messageReporter.nowhere().error("Platform " + osName + " is not supported");
     }
@@ -911,7 +911,7 @@ protected void copyTargetFiles() throws IOException {
     // Copy the core lib
     String coreLib = LFGeneratorContext.BuildParm.EXTERNAL_RUNTIME_PATH.getValue(context);
     Path dest = fileConfig.getSrcGenPath();
-    if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
+    if (targetConfig.platformOptions.get().platform == Platform.ARDUINO) {
       dest = dest.resolve("src");
     }
     if (coreLib != null) {
@@ -922,7 +922,7 @@ protected void copyTargetFiles() throws IOException {
     }
 
     // For the Zephyr target, copy default config and board files.
-    if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
+    if (targetConfig.platformOptions.get().platform == Platform.ZEPHYR) {
       FileUtil.copyFromClassPath(
           "/lib/platform/zephyr/boards", fileConfig.getSrcGenPath(), false, false);
       FileUtil.copyFileFromClassPath(
@@ -933,7 +933,7 @@ protected void copyTargetFiles() throws IOException {
     }
 
     // For the pico src-gen, copy over vscode configurations for debugging
-    if (targetConfig.platformOptions.platform == Platform.RP2040) {
+    if (targetConfig.platformOptions.get().platform == Platform.RP2040) {
       Path vscodePath = fileConfig.getSrcGenPath().resolve(".vscode");
       // If pico-sdk-path not defined, this can be used to pull the sdk into src-gen
       FileUtil.copyFileFromClassPath(
@@ -980,7 +980,7 @@ private void generateReactorClass(TypeParameterizedReactor tpr) throws IOExcepti
         fileConfig.getSrcGenPath().resolve(headerName),
         true);
     var extension =
-        targetConfig.platformOptions.platform == Platform.ARDUINO
+        targetConfig.platformOptions.get().platform == Platform.ARDUINO
             ? ".ino"
             : CCppMode ? ".cpp" : ".c";
     FileUtil.writeToFile(
@@ -1970,9 +1970,9 @@ protected void setUpGeneralParameters() {
       targetConfig.compileDefinitions.put("MODAL_REACTORS", "TRUE");
     }
     if (targetConfig.threading
-        && targetConfig.platformOptions.platform == Platform.ARDUINO
-        && (targetConfig.platformOptions.board == null
-            || !targetConfig.platformOptions.board.contains("mbed"))) {
+        && targetConfig.platformOptions.get().platform == Platform.ARDUINO
+        && (targetConfig.platformOptions.get().board == null
+            || !targetConfig.platformOptions.get().board.contains("mbed"))) {
       // non-MBED boards should not use threading
       messageReporter
           .nowhere()
@@ -1982,9 +1982,9 @@ protected void setUpGeneralParameters() {
       targetConfig.threading = false;
     }
 
-    if (targetConfig.platformOptions.platform == Platform.ARDUINO
+    if (targetConfig.platformOptions.get().platform == Platform.ARDUINO
         && !targetConfig.noCompile
-        && targetConfig.platformOptions.board == null) {
+        && targetConfig.platformOptions.get().board == null) {
       messageReporter
           .nowhere()
           .info(
@@ -1995,13 +1995,13 @@ protected void setUpGeneralParameters() {
       targetConfig.noCompile = true;
     }
 
-    if (targetConfig.platformOptions.platform == Platform.ZEPHYR
+    if (targetConfig.platformOptions.get().platform == Platform.ZEPHYR
         && targetConfig.threading
-        && targetConfig.platformOptions.userThreads >= 0) {
+        && targetConfig.platformOptions.get().userThreads >= 0) {
       targetConfig.compileDefinitions.put(
           PlatformOption.USER_THREADS.name(),
-          String.valueOf(targetConfig.platformOptions.userThreads));
-    } else if (targetConfig.platformOptions.userThreads > 0) {
+          String.valueOf(targetConfig.platformOptions.get().userThreads));
+    } else if (targetConfig.platformOptions.get().userThreads > 0) {
       messageReporter
           .nowhere()
           .warning(
@@ -2012,7 +2012,7 @@ protected void setUpGeneralParameters() {
     if (targetConfig.threading) { // FIXME: This logic is duplicated in CMake
       pickScheduler();
       // FIXME: this and pickScheduler should be combined.
-      targetConfig.compileDefinitions.put("SCHEDULER", targetConfig.schedulerType.name());
+      targetConfig.compileDefinitions.put("SCHEDULER", targetConfig.schedulerType.get().name());
       targetConfig.compileDefinitions.put(
           "NUMBER_OF_WORKERS", String.valueOf(targetConfig.workers));
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
index 99f3df0f0b..9dd130471c 100644
--- a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import org.lflang.TargetConfig;
 import org.lflang.generator.CodeBuilder;
-import org.lflang.target.PlatformConfigurator.Platform;
+import org.lflang.target.PlatformConfig.Platform;
 import org.lflang.util.StringUtil;
 
 public class CMainFunctionGenerator {
@@ -33,7 +33,7 @@ public String generateCode() {
 
   /** Generate the {@code main} function. */
   private String generateMainFunction() {
-    if (targetConfig.platformOptions.platform == Platform.ARDUINO) {
+    if (targetConfig.platformOptions.get().platform == Platform.ARDUINO) {
       /**
        * By default, we must have a serial begin line prior to calling lf_reactor_c_main due to
        * internal debugging messages requiring a print buffer. For the future, we can check whether
@@ -48,12 +48,12 @@ private String generateMainFunction() {
           "}\n",
           "// Arduino setup() and loop() functions",
           "void setup() {",
-          "\tSerial.begin(" + targetConfig.platformOptions.baudRate + ");",
+          "\tSerial.begin(" + targetConfig.platformOptions.get().baudRate + ");",
           "\tlf_register_print_function(&_lf_arduino_print_message_function, LOG_LEVEL);",
           "\tlf_reactor_c_main(0, NULL);",
           "}\n",
           "void loop() {}");
-    } else if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
+    } else if (targetConfig.platformOptions.get().platform == Platform.ZEPHYR) {
       // The Zephyr "runtime" does not terminate when main returns.
       //  Rather, {@code exit} should be called explicitly.
       return String.join(
@@ -62,7 +62,7 @@ private String generateMainFunction() {
           "   int res = lf_reactor_c_main(0, NULL);",
           "   exit(res);",
           "}");
-    } else if (targetConfig.platformOptions.platform == Platform.RP2040) {
+    } else if (targetConfig.platformOptions.get().platform == Platform.RP2040) {
       // Pico platform cannot use command line args.
       return String.join("\n", "int main(void) {", "   return lf_reactor_c_main(0, NULL);", "}");
     } else {
@@ -97,11 +97,11 @@ private String generateSetDefaultCliOption() {
 
   /** Parse the target parameters and set flags to the runCommand accordingly. */
   private void parseTargetParameters() {
-    if (targetConfig.fastMode) {
+    if (targetConfig.fastMode.get()) {
       runCommand.add("-f");
       runCommand.add("true");
     }
-    if (targetConfig.keepalive) {
+    if (targetConfig.keepalive.get()) {
       runCommand.add("-k");
       runCommand.add("true");
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
index dc48f5d40b..da3794d44e 100644
--- a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
@@ -5,7 +5,7 @@
 import java.nio.file.Path;
 import org.lflang.TargetConfig;
 import org.lflang.generator.CodeBuilder;
-import org.lflang.target.PlatformConfigurator.Platform;
+import org.lflang.target.PlatformConfig.Platform;
 import org.lflang.util.StringUtil;
 
 /**
@@ -28,7 +28,7 @@ public class CPreambleGenerator {
   public static String generateIncludeStatements(TargetConfig targetConfig, boolean cppMode) {
     var tracing = targetConfig.tracing;
     CodeBuilder code = new CodeBuilder();
-    if (cppMode || targetConfig.platformOptions.platform == Platform.ARDUINO) {
+    if (cppMode || targetConfig.platformOptions.get().platform == Platform.ARDUINO) {
       code.pr("extern \"C\" {");
     }
     code.pr("#include <limits.h>");
@@ -53,7 +53,7 @@ public static String generateIncludeStatements(TargetConfig targetConfig, boolea
       code.pr("#include \"include/core/federated/federate.h\"");
       code.pr("#include \"include/core/federated/net_common.h\"");
     }
-    if (cppMode || targetConfig.platformOptions.platform == Platform.ARDUINO) {
+    if (cppMode || targetConfig.platformOptions.get().platform == Platform.ARDUINO) {
       code.pr("}");
     }
     return code.toString();
@@ -63,7 +63,7 @@ public static String generateDefineDirectives(
       TargetConfig targetConfig, Path srcGenPath, boolean hasModalReactors) {
     int logLevel = targetConfig.logLevel.ordinal();
     var coordinationType = targetConfig.coordination;
-    var tracing = targetConfig.tracing;
+    var tracing = targetConfig.tracing.get();
     CodeBuilder code = new CodeBuilder();
     // TODO: Get rid of all of these
     code.pr("#define LOG_LEVEL " + logLevel);
diff --git a/core/src/main/java/org/lflang/generator/c/CUtil.java b/core/src/main/java/org/lflang/generator/c/CUtil.java
index aa53e9edc0..a92ef82c93 100644
--- a/core/src/main/java/org/lflang/generator/c/CUtil.java
+++ b/core/src/main/java/org/lflang/generator/c/CUtil.java
@@ -614,7 +614,7 @@ public static void runBuildCommand(
       ReportCommandErrors reportCommandErrors,
       LFGeneratorContext.Mode mode) {
     List<LFCommand> commands =
-        getCommands(targetConfig.buildCommands, commandFactory, fileConfig.srcPath);
+        getCommands(targetConfig.buildCommands.get(), commandFactory, fileConfig.srcPath);
     // If the build command could not be found, abort.
     // An error has already been reported in createCommand.
     if (commands.stream().anyMatch(Objects::isNull)) return;
diff --git a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
index 83ef50589b..dc9a766ba8 100644
--- a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
+++ b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
@@ -33,6 +33,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.lflang.MessageReporter;
 import org.lflang.target.property.BuildConfig.BuildType;
+import org.lflang.target.property.BuildTypeConfig;
 
 /**
  * Rust-specific part of a {@link org.lflang.TargetConfig}.
@@ -95,12 +96,13 @@ public List<Path> getRustTopLevelModules() {
   }
 
   /** The build type to use. Corresponds to a Cargo profile. */
-  public BuildType getBuildType() {
+  public BuildType getBuildType(BuildTypeConfig cmakeBuildType) {
+    // FIXME: this is because Rust uses a different default.
+    // Can we just use the same?
+    if (cmakeBuildType.isSetByUser()) {
+      return cmakeBuildType.get();
+    }
     return profile;
   }
 
-  /** Set a build profile chosen based on a cmake profile. */
-  public void setBuildType(BuildType profile) {
-    this.profile = profile;
-  }
 }
diff --git a/core/src/main/java/org/lflang/target/AuthConfig.java b/core/src/main/java/org/lflang/target/AuthConfig.java
new file mode 100644
index 0000000000..2c97897f7b
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/AuthConfig.java
@@ -0,0 +1,24 @@
+package org.lflang.target;
+
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+
+public class AuthConfig extends TargetPropertyConfig<Boolean> {
+
+    @Override
+    public Boolean initialize() {
+        return false;
+    }
+
+    @Override
+    public Boolean parse(Element value) {
+        return ASTUtils.toBoolean(value);
+    }
+
+    @Override
+    public Element export() {
+        return ASTUtils.toElement(this.value.toString());
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/AuthConfigurator.java b/core/src/main/java/org/lflang/target/AuthConfigurator.java
deleted file mode 100644
index 7a1aec6372..0000000000
--- a/core/src/main/java/org/lflang/target/AuthConfigurator.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.lflang.target;
-
-import org.lflang.MessageReporter;
-import org.lflang.TargetConfig;
-import org.lflang.TargetPropertyConfig;
-import org.lflang.ast.ASTUtils;
-import org.lflang.lf.Element;
-import org.lflang.lf.KeyValuePair;
-import org.lflang.lf.Model;
-import org.lflang.validation.LFValidator.ValidationReporter;
-
-public class AuthConfigurator implements TargetPropertyConfig<Boolean> {
-
-    @Override
-    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
-        config.auth = this.parse(value);
-    }
-
-    @Override
-    public Boolean parse(Element value) {
-        return ASTUtils.toBoolean(value);
-    }
-
-    @Override
-    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
-
-    }
-
-    @Override
-    public Element getPropertyElement(TargetConfig config) {
-        return ASTUtils.toElement(config.auth);
-    }
-}
diff --git a/core/src/main/java/org/lflang/target/ClockSyncConfigurator.java b/core/src/main/java/org/lflang/target/ClockSyncConfigurator.java
deleted file mode 100644
index 4508aa809b..0000000000
--- a/core/src/main/java/org/lflang/target/ClockSyncConfigurator.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.lflang.target;
-
-import org.lflang.MessageReporter;
-import org.lflang.TargetConfig;
-import org.lflang.TargetProperty.DictionaryElement;
-import org.lflang.TargetPropertyConfig;
-import org.lflang.ast.ASTUtils;
-import org.lflang.lf.Element;
-import org.lflang.lf.KeyValuePair;
-import org.lflang.lf.LfPackage.Literals;
-import org.lflang.lf.Model;
-import org.lflang.lf.Reactor;
-import org.lflang.target.ClockSyncConfigurator.ClockSyncMode;
-import org.lflang.target.property.type.TargetPropertyType;
-import org.lflang.target.property.type.PrimitiveType;
-import org.lflang.target.property.type.UnionType;
-import org.lflang.validation.LFValidator.ValidationReporter;
-
-public class ClockSyncConfigurator implements TargetPropertyConfig<ClockSyncMode> {
-
-    @Override
-    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
-        config.clockSync = this.parse(value);
-
-    }
-
-    @Override
-    public ClockSyncMode parse(Element value) {
-        return (ClockSyncMode)
-            UnionType.CLOCK_SYNC_UNION.forName(ASTUtils.elementToSingleString(value));
-    }
-
-
-    @Override
-    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
-        if (pair != null) {
-            boolean federatedExists = false;
-            for (Reactor reactor : ast.getReactors()) {
-                if (reactor.isFederated()) {
-                    federatedExists = true;
-                }
-            }
-            if (!federatedExists) {
-                reporter.warning(
-                    "The clock-sync target property is incompatible with non-federated programs.",
-                    pair,
-                    Literals.KEY_VALUE_PAIR__NAME);
-            }
-        }
-    }
-
-    @Override
-    public Element getPropertyElement(TargetConfig config) {
-        return ASTUtils.toElement(config.clockSync.toString());
-    }
-
-    /**
-     * Clock synchronization options.
-     *
-     * @author Marten Lohstroh
-     */
-    public enum ClockSyncOption implements DictionaryElement {
-        ATTENUATION("attenuation", PrimitiveType.NON_NEGATIVE_INTEGER),
-        LOCAL_FEDERATES_ON("local-federates-on", PrimitiveType.BOOLEAN),
-        PERIOD("period", PrimitiveType.TIME_VALUE),
-        TEST_OFFSET("test-offset", PrimitiveType.TIME_VALUE),
-        TRIALS("trials", PrimitiveType.NON_NEGATIVE_INTEGER),
-        COLLECT_STATS("collect-stats", PrimitiveType.BOOLEAN);
-
-        public final PrimitiveType type;
-
-        private final String description;
-
-        private ClockSyncOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
-
-        /** Return the description of this dictionary element. */
-        @Override
-        public String toString() {
-            return this.description;
-        }
-
-        /** Return the type associated with this dictionary element. */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
-    }
-
-    /**
-     * Enumeration of clock synchronization modes.
-     *
-     * <ul>
-     *   <li>OFF: The clock synchronization is universally off.
-     *   <li>STARTUP: Clock synchronization occurs at startup only.
-     *   <li>ON: Clock synchronization occurs at startup and at runtime.
-     * </ul>
-     *
-     * @author Edward A. Lee
-     */
-    public enum ClockSyncMode {
-        OFF,
-        INIT,
-        ON; // TODO Discuss initial in now a mode keyword (same as startup) and cannot be used as target
-        // property value, thus changed it to init
-        // FIXME I could not test if this change breaks anything
-
-        /** Return the name in lower case. */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
-    }
-}
diff --git a/core/src/main/java/org/lflang/target/ClockSyncModeConfig.java b/core/src/main/java/org/lflang/target/ClockSyncModeConfig.java
new file mode 100644
index 0000000000..f0372002db
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/ClockSyncModeConfig.java
@@ -0,0 +1,83 @@
+package org.lflang.target;
+
+
+import org.lflang.TargetConfig;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.LfPackage.Literals;
+import org.lflang.lf.Model;
+import org.lflang.lf.Reactor;
+import org.lflang.target.ClockSyncModeConfig.ClockSyncMode;
+import org.lflang.target.property.type.UnionType;
+import org.lflang.validation.ValidationReporter;
+
+public class ClockSyncModeConfig extends TargetPropertyConfig<ClockSyncMode> {
+
+
+    @Override
+    public ClockSyncMode initialize() {
+        return ClockSyncMode.INIT;
+    }
+
+    @Override
+    public ClockSyncMode parse(Element value) {
+
+        UnionType.CLOCK_SYNC_UNION.validate(value);
+        var mode = (ClockSyncMode)
+            UnionType.CLOCK_SYNC_UNION.forName(ASTUtils.elementToSingleString(value));
+        if (mode != null) {
+            return mode;
+        } else {
+            return ClockSyncMode.INIT;
+        }
+    }
+
+    @Override
+    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+        if (pair != null) {
+            boolean federatedExists = false;
+            for (Reactor reactor : ast.getReactors()) {
+                if (reactor.isFederated()) {
+                    federatedExists = true;
+                }
+            }
+            if (!federatedExists) {
+                reporter.warning(
+                    "The clock-sync target property is incompatible with non-federated programs.",
+                    pair,
+                    Literals.KEY_VALUE_PAIR__NAME);
+            }
+        }
+    }
+
+    @Override
+    public Element export() {
+        return ASTUtils.toElement(this.value.toString());
+    }
+
+
+
+    /**
+     * Enumeration of clock synchronization modes.
+     *
+     * <ul>
+     *   <li>OFF: The clock synchronization is universally off.
+     *   <li>STARTUP: Clock synchronization occurs at startup only.
+     *   <li>ON: Clock synchronization occurs at startup and at runtime.
+     * </ul>
+     *
+     * @author Edward A. Lee
+     */
+    public enum ClockSyncMode {
+        OFF,
+        INIT,
+        ON;
+        /** Return the name in lower case. */
+        @Override
+        public String toString() {
+            return this.name().toLowerCase();
+        }
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/CoordinationConfig.java b/core/src/main/java/org/lflang/target/CoordinationConfig.java
deleted file mode 100644
index 08ed4204a7..0000000000
--- a/core/src/main/java/org/lflang/target/CoordinationConfig.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.lflang.target;
-
-import org.lflang.MessageReporter;
-import org.lflang.TargetConfig;
-import org.lflang.TargetProperty.DictionaryElement;
-import org.lflang.TargetPropertyConfig;
-import org.lflang.lf.Element;
-import org.lflang.lf.KeyValuePair;
-import org.lflang.lf.Model;
-import org.lflang.target.CoordinationConfig.CoordinationOption;
-import org.lflang.target.property.type.TargetPropertyType;
-import org.lflang.target.property.type.PrimitiveType;
-import org.lflang.validation.LFValidator.ValidationReporter;
-
-public class CoordinationConfig implements TargetPropertyConfig<CoordinationOption> {
-
-    @Override
-    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
-
-    }
-
-    @Override
-    public CoordinationOption parse(Element value) {
-        return null;
-    }
-
-    @Override
-    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
-
-    }
-
-    @Override
-    public Element getPropertyElement(TargetConfig config) {
-        return null;
-    }
-
-    /**
-     * Coordination options.
-     *
-     * @author Edward A. Lee
-     */
-    public enum CoordinationOption implements DictionaryElement {
-        ADVANCE_MESSAGE_INTERVAL("advance-message-interval", PrimitiveType.TIME_VALUE);
-
-        public final PrimitiveType type;
-
-        private final String description;
-
-        private CoordinationOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
-
-        /** Return the description of this dictionary element. */
-        @Override
-        public String toString() {
-            return this.description;
-        }
-
-        /** Return the type associated with this dictionary element. */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
-    }
-
-    /**
-     * Enumeration of coordination types.
-     *
-     * @author Marten Lohstroh
-     */
-    public enum CoordinationType {
-        CENTRALIZED,
-        DECENTRALIZED;
-
-        /** Return the name in lower case. */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
-    }
-
-
-}
diff --git a/core/src/main/java/org/lflang/target/CoordinationModeConfig.java b/core/src/main/java/org/lflang/target/CoordinationModeConfig.java
new file mode 100644
index 0000000000..b541b4a164
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/CoordinationModeConfig.java
@@ -0,0 +1,49 @@
+package org.lflang.target;
+
+import org.lflang.TargetConfig;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.Model;
+import org.lflang.target.CoordinationModeConfig.CoordinationMode;
+import org.lflang.target.property.type.UnionType;
+import org.lflang.validation.ValidationReporter;
+
+public class CoordinationModeConfig extends TargetPropertyConfig<CoordinationMode> {
+
+    @Override
+    public CoordinationMode initialize() {
+        return CoordinationMode.CENTRALIZED;
+    }
+
+    @Override
+    public CoordinationMode parse(Element value) {
+        return (CoordinationMode) UnionType.COORDINATION_UNION.forName(ASTUtils.elementToSingleString(value));
+    }
+
+    @Override
+    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {}
+
+    @Override
+    public Element export() {
+        return ASTUtils.toElement(this.value.toString());
+    }
+
+    /**
+     * Enumeration of coordination types.
+     *
+     * @author Marten Lohstroh
+     */
+    public enum CoordinationMode {
+        CENTRALIZED,
+        DECENTRALIZED;
+
+        /** Return the name in lower case. */
+        @Override
+        public String toString() {
+            return this.name().toLowerCase();
+        }
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/CoordinationOptionsConfig.java b/core/src/main/java/org/lflang/target/CoordinationOptionsConfig.java
new file mode 100644
index 0000000000..755ffc73ff
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/CoordinationOptionsConfig.java
@@ -0,0 +1,118 @@
+package org.lflang.target;
+
+import org.lflang.TargetConfig;
+
+import org.lflang.TargetProperty.DictionaryElement;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.KeyValuePairs;
+import org.lflang.lf.LfFactory;
+import org.lflang.lf.Model;
+import org.lflang.target.CoordinationOptionsConfig.CoordinationOptions;
+import org.lflang.target.property.type.DictionaryType;
+import org.lflang.target.property.type.PrimitiveType;
+import org.lflang.target.property.type.TargetPropertyType;
+import org.lflang.validation.ValidationReporter;
+
+public class CoordinationOptionsConfig extends TargetPropertyConfig<CoordinationOptions> {
+
+    @Override
+    public CoordinationOptions initialize() {
+        return new CoordinationOptions();
+    }
+
+    @Override
+    public CoordinationOptions parse(Element value) {
+        var options = new CoordinationOptions();
+        for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+            CoordinationOption option =
+                (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT.forName(entry.getName());
+            switch (option) {
+            case ADVANCE_MESSAGE_INTERVAL:
+                options.advanceMessageInterval =
+                    ASTUtils.toTimeValue(entry.getValue());
+                break;
+            default:
+                break;
+            }
+        }
+        return options;
+    }
+
+    @Override
+    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+        // FIXME
+    }
+
+    @Override
+    public Element export() {
+        Element e = LfFactory.eINSTANCE.createElement();
+        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+        for (CoordinationOption opt : CoordinationOption.values()) {
+            KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+            pair.setName(opt.toString());
+            switch (opt) {
+            case ADVANCE_MESSAGE_INTERVAL:
+                if (this.value.advanceMessageInterval == null) {
+                    continue;
+                }
+                pair.setValue(
+                    ASTUtils.toElement(value.advanceMessageInterval));
+                break;
+            }
+            kvp.getPairs().add(pair);
+        }
+        e.setKeyvalue(kvp);
+        if (kvp.getPairs().isEmpty()) {
+            return null;
+        }
+        return e;
+    }
+
+    /** Settings related to coordination of federated execution. */
+    public static class CoordinationOptions {
+
+        /**
+         * For centralized coordination, if a federate has a physical action that can trigger an output,
+         * directly or indirectly, then it will send NET (next event tag) messages to the RTI
+         * periodically as its physical clock advances. This option sets the amount of time to wait
+         * between sending such messages. Increasing this value results in downstream federates that lag
+         * further behind physical time (if the "after" delays are insufficient). The default is null,
+         * which means it is up the implementation to choose an interval.
+         */
+        public TimeValue advanceMessageInterval = null;
+    }
+
+    /**
+     * Coordination options.
+     *
+     * @author Edward A. Lee
+     */
+    public enum CoordinationOption implements DictionaryElement {
+        ADVANCE_MESSAGE_INTERVAL("advance-message-interval", PrimitiveType.TIME_VALUE);
+
+        public final PrimitiveType type;
+
+        private final String description;
+
+        private CoordinationOption(String alias, PrimitiveType type) {
+            this.description = alias;
+            this.type = type;
+        }
+
+        /** Return the description of this dictionary element. */
+        @Override
+        public String toString() {
+            return this.description;
+        }
+
+        /** Return the type associated with this dictionary element. */
+        public TargetPropertyType getType() {
+            return this.type;
+        }
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/DockerConfig.java b/core/src/main/java/org/lflang/target/DockerConfig.java
index 3853ceb1c7..ebc319b768 100644
--- a/core/src/main/java/org/lflang/target/DockerConfig.java
+++ b/core/src/main/java/org/lflang/target/DockerConfig.java
@@ -1,28 +1,65 @@
 package org.lflang.target;
 
-import org.lflang.MessageReporter;
+
+import java.util.Properties;
+
 import org.lflang.TargetConfig;
+import org.lflang.TargetProperty;
+import org.lflang.TargetPropertyConfig;
 import org.lflang.TargetProperty.DictionaryElement;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.KeyValuePairs;
+import org.lflang.lf.LfFactory;
+import org.lflang.target.DockerConfig.DockerOptions;
+import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.TargetPropertyType;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.Model;
-import org.lflang.target.DockerConfig.DockerOption;
-import org.lflang.target.property.type.TargetPropertyType;
-import org.lflang.validation.LFValidator.ValidationReporter;
+import org.lflang.validation.ValidationReporter;
+
 
-public class DockerConfig implements TargetPropertyConfig<DockerOption> {
+public class DockerConfig extends TargetPropertyConfig<DockerOptions> {
 
     @Override
-    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
+    public DockerOptions initialize() {
+        return new DockerOptions(false);
+    }
 
+    @Override
+    public void update(Properties cliArgs) {
+        var key = TargetProperty.DOCKER.toString();
+        if (cliArgs.containsKey(key)) {
+            var arg = cliArgs.getProperty(key);
+            if (Boolean.parseBoolean(arg)) {
+                this.value.enabled = true;
+            } else {
+                this.value.enabled = false;
+            }
+        }
     }
 
     @Override
-    public DockerOption parse(Element value) {
-        return null;
+    public DockerOptions parse(Element value) {
+        var options = new DockerOptions(false);
+        if (value.getLiteral() != null) {
+            if (ASTUtils.toBoolean(value)) {
+                options.enabled = true;
+            }
+        } else {
+            for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+                DockerOption option = (DockerOption) DictionaryType.DOCKER_DICT.forName(entry.getName());
+                switch (option) {
+                case FROM:
+                    options.from = ASTUtils.elementToSingleString(entry.getValue());
+                    break;
+                default:
+                    break;
+                }
+            }
+        }
+        return options;
     }
 
     @Override
@@ -31,10 +68,65 @@ public void validate(KeyValuePair pair, Model ast, TargetConfig config, Validati
     }
 
     @Override
-    public Element getPropertyElement(TargetConfig config) {
-        return null;
+    public Element export() {
+        if (!this.value.enabled) {
+            return null;
+        } else if (this.value.equals(new DockerOptions(true))) {
+            // default configuration
+            return ASTUtils.toElement(true);
+        } else {
+            Element e = LfFactory.eINSTANCE.createElement();
+            KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+            for (DockerOption opt : DockerOption.values()) {
+                KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+                pair.setName(opt.toString());
+                switch (opt) {
+                case FROM:
+                    if (this.value.from == null) {
+                        continue;
+                    }
+                    pair.setValue(ASTUtils.toElement(this.value.from));
+                    break;
+                }
+                kvp.getPairs().add(pair);
+            }
+            e.setKeyvalue(kvp);
+            if (kvp.getPairs().isEmpty()) {
+                return null;
+            }
+            return e;
+        }
     }
 
+    /** Settings related to Docker options. */
+    public static class DockerOptions {
+
+        public boolean enabled;
+
+        public DockerOptions(boolean enabled) {
+            this.enabled = enabled;
+        }
+
+        /**
+         * The base image and tag from which to build the Docker image. The default is "alpine:latest".
+         */
+        public String from = "alpine:latest";
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            DockerOptions that = (DockerOptions) o;
+            return from.equals(that.from);
+        }
+    }
+
+
+
     /**
      * Docker options.
      *
diff --git a/core/src/main/java/org/lflang/target/FastConfigurator.java b/core/src/main/java/org/lflang/target/FastModeConfig.java
similarity index 80%
rename from core/src/main/java/org/lflang/target/FastConfigurator.java
rename to core/src/main/java/org/lflang/target/FastModeConfig.java
index d9e4696167..72ded2c473 100644
--- a/core/src/main/java/org/lflang/target/FastConfigurator.java
+++ b/core/src/main/java/org/lflang/target/FastModeConfig.java
@@ -1,6 +1,5 @@
 package org.lflang.target;
 
-import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
@@ -11,13 +10,13 @@
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
 import org.lflang.lf.Reactor;
-import org.lflang.validation.LFValidator.ValidationReporter;
+import org.lflang.validation.ValidationReporter;
 
-public class FastConfigurator implements TargetPropertyConfig<Boolean> {
+public class FastModeConfig extends TargetPropertyConfig<Boolean> {
 
     @Override
-    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
-        config.fastMode = this.parse(value);
+    public Boolean initialize() {
+        return false;
     }
 
     @Override
@@ -58,7 +57,8 @@ public void validate(KeyValuePair pair, Model ast, TargetConfig config, Validati
     }
 
     @Override
-    public Element getPropertyElement(TargetConfig config) {
-        return ASTUtils.toElement(config.fastMode);
+    public Element export() {
+        return ASTUtils.toElement(this.value);
     }
+
 }
diff --git a/core/src/main/java/org/lflang/target/KeepaliveConfigurator.java b/core/src/main/java/org/lflang/target/KeepaliveConfig.java
similarity index 58%
rename from core/src/main/java/org/lflang/target/KeepaliveConfigurator.java
rename to core/src/main/java/org/lflang/target/KeepaliveConfig.java
index 9753084e16..c7059b946d 100644
--- a/core/src/main/java/org/lflang/target/KeepaliveConfigurator.java
+++ b/core/src/main/java/org/lflang/target/KeepaliveConfig.java
@@ -1,21 +1,32 @@
 package org.lflang.target;
 
-import org.lflang.MessageReporter;
+import java.util.Properties;
+
 import org.lflang.Target;
 import org.lflang.TargetConfig;
+import org.lflang.TargetProperty;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
-import org.lflang.validation.LFValidator.ValidationReporter;
+import org.lflang.validation.ValidationReporter;
+
+public class KeepaliveConfig extends TargetPropertyConfig<Boolean> {
 
-public class KeepaliveConfigurator implements TargetPropertyConfig<Boolean> {
+    @Override
+    public Boolean initialize() {
+        return false;
+    }
 
     @Override
-    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
-        config.keepalive = this.parse(value);
+    public void update(Properties cliArgs) {
+        super.update(cliArgs);
+        var key = TargetProperty.KEEPALIVE.toString();
+        if (cliArgs.containsKey(key)) {
+            this.override(Boolean.parseBoolean(cliArgs.getProperty(TargetProperty.KEEPALIVE.description)));
+        }
     }
 
     @Override
@@ -23,7 +34,6 @@ public Boolean parse(Element value) {
         return ASTUtils.toBoolean(value);
     }
 
-
     @Override
     public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
         if (pair != null && config.target == Target.CPP) {
@@ -36,7 +46,7 @@ public void validate(KeyValuePair pair, Model ast, TargetConfig config, Validati
     }
 
     @Override
-    public Element getPropertyElement(TargetConfig config) {
-        return ASTUtils.toElement(config.keepalive);
+    public Element export() {
+        return ASTUtils.toElement(this.value);
     }
 }
diff --git a/core/src/main/java/org/lflang/target/PlatformConfig.java b/core/src/main/java/org/lflang/target/PlatformConfig.java
new file mode 100644
index 0000000000..28b8d82a33
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/PlatformConfig.java
@@ -0,0 +1,253 @@
+package org.lflang.target;
+
+import java.util.Arrays;
+
+import org.lflang.TargetConfig;
+import org.lflang.TargetProperty;
+import org.lflang.TargetProperty.DictionaryElement;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.KeyValuePairs;
+import org.lflang.lf.LfFactory;
+import org.lflang.lf.LfPackage.Literals;
+import org.lflang.target.PlatformConfig.PlatformOptions;
+import org.lflang.target.property.type.DictionaryType;
+import org.lflang.target.property.type.PrimitiveType;
+import org.lflang.target.property.type.TargetPropertyType;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.Model;
+import org.lflang.target.property.type.UnionType;
+import org.lflang.validation.ValidationReporter;
+
+public class PlatformConfig extends TargetPropertyConfig<PlatformOptions> {
+
+    @Override
+    public PlatformOptions initialize() {
+        return new PlatformOptions();
+    }
+
+    @Override
+    public PlatformOptions parse(Element value) { // FIXME: pass in err
+        var config = new PlatformOptions();
+        if (value.getLiteral() != null) {
+            config.platform =
+                (Platform) UnionType.PLATFORM_UNION.forName(ASTUtils.elementToSingleString(value));
+            if (config.platform == null) {
+                String s =
+                    "Unidentified Platform Type, LF supports the following platform types: "
+                        + Arrays.asList(Platform.values());
+                //err.at(value).error(s);
+                throw new AssertionError(s);
+            }
+        } else {
+            for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+                PlatformOption option =
+                    (PlatformOption) DictionaryType.PLATFORM_DICT.forName(entry.getName());
+                switch (option) {
+                case NAME -> {
+                    Platform p =
+                        (Platform)
+                            UnionType.PLATFORM_UNION.forName(
+                                ASTUtils.elementToSingleString(entry.getValue()));
+                    if (p == null) {
+                        String s =
+                            "Unidentified Platform Type, LF supports the following platform types: "
+                                + Arrays.asList(Platform.values());
+                        //err.at(entry).error(s); // FIXME
+                        throw new AssertionError(s);
+                    }
+                    config.platform = p;
+                }
+                case BAUDRATE -> config.baudRate = ASTUtils.toInteger(entry.getValue());
+                case BOARD -> config.board = ASTUtils.elementToSingleString(entry.getValue());
+                case FLASH -> config.flash = ASTUtils.toBoolean(entry.getValue());
+                case PORT -> config.port = ASTUtils.elementToSingleString(entry.getValue());
+                case USER_THREADS -> config.userThreads = ASTUtils.toInteger(entry.getValue());
+                default -> {
+                }
+                }
+            }
+        }
+        // If the platform does not support threading, disable it.
+//        if (!config.platform.isMultiThreaded()) {
+//            config.threading = false; // FIXME: this should instead be dealt with in the validator
+//        }
+        return config;
+    }
+
+    @Override
+    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+        var threading = TargetProperty.getKeyValuePair(ast, TargetProperty.THREADING);
+        if (threading != null) {
+            if (pair != null && ASTUtils.toBoolean(threading.getValue())) {
+                var lit = ASTUtils.elementToSingleString(pair.getValue());
+                var dic = pair.getValue().getKeyvalue();
+                if (lit != null && lit.equalsIgnoreCase(Platform.RP2040.toString())) {
+                    reporter.error(
+                        "Platform " + Platform.RP2040 + " does not support threading",
+                        pair,
+                        Literals.KEY_VALUE_PAIR__VALUE);
+                }
+                if (dic != null) {
+                    var rp =
+                        dic.getPairs().stream()
+                            .filter(
+                                kv ->
+                                    kv.getName().equalsIgnoreCase("name")
+                                        && ASTUtils.elementToSingleString(kv.getValue())
+                                        .equalsIgnoreCase(Platform.RP2040.toString()))
+                            .findFirst();
+                    rp.ifPresent(keyValuePair -> reporter.error(
+                        "Platform " + Platform.RP2040 + " does not support threading",
+                        keyValuePair,
+                        Literals.KEY_VALUE_PAIR__VALUE));
+                }
+            }
+        }
+    }
+
+    @Override
+    public Element export() {
+        Element e = LfFactory.eINSTANCE.createElement();
+        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+        for (PlatformOption opt : PlatformOption.values()) {
+            KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+            pair.setName(opt.toString());
+            switch (opt) {
+            case NAME -> pair.setValue(ASTUtils.toElement(value.platform.toString()));
+            case BAUDRATE -> pair.setValue(ASTUtils.toElement(value.baudRate));
+            case BOARD -> pair.setValue(ASTUtils.toElement(value.board));
+            case FLASH -> pair.setValue(ASTUtils.toElement(value.flash));
+            case PORT -> pair.setValue(ASTUtils.toElement(value.port));
+            case USER_THREADS -> pair.setValue(ASTUtils.toElement(value.userThreads));
+            }
+            kvp.getPairs().add(pair);
+        }
+        e.setKeyvalue(kvp);
+        if (kvp.getPairs().isEmpty()) {
+            return null;
+        }
+        return e;
+    }
+
+
+    /** Settings related to Platform Options. */
+    public static class PlatformOptions {
+
+        /**
+         * The base platform we build our LF Files on. Should be set to AUTO by default unless
+         * developing for specific OS/Embedded Platform
+         */
+        public Platform platform = Platform.AUTO;
+
+        /**
+         * The string value used to determine what type of embedded board we work with and can be used
+         * to simplify the build process. This string has the form "board_name[:option]*" (zero or more
+         * options separated by colons). For example, "pico:usb" specifies a Raspberry Pi Pico where
+         * stdin and stdout go through a USB serial port.
+         */
+        public String board = null;
+
+        /**
+         * The string value used to determine the port on which to flash the compiled program (i.e.
+         * /dev/cu.usbmodem21301)
+         */
+        public String port = null;
+
+        /**
+         * The baud rate used as a parameter to certain embedded platforms. 9600 is a standard rate
+         * amongst systems like Arduino, so it's the default value.
+         */
+        public int baudRate = 9600;
+
+        /**
+         * The boolean statement used to determine whether we should automatically attempt to flash once
+         * we compile. This may require the use of board and port values depending on the infrastructure
+         * you use to flash the boards.
+         */
+        public boolean flash = false;
+
+        /**
+         * The int value is used to determine the number of needed threads for the user application in
+         * Zephyr.
+         */
+        public int userThreads = 0;
+    }
+
+
+    /** Enumeration of supported platforms */
+    public enum Platform {
+        AUTO,
+        ARDUINO,
+        NRF52("Nrf52", true),
+        RP2040("Rp2040", false),
+        LINUX("Linux", true),
+        MAC("Darwin", true),
+        ZEPHYR("Zephyr", true),
+        WINDOWS("Windows", true);
+
+        final String cMakeName;
+
+        private boolean multiThreaded = true;
+
+        Platform() {
+            this.cMakeName = this.toString();
+        }
+
+        Platform(String cMakeName, boolean isMultiThreaded) {
+            this.cMakeName = cMakeName;
+            this.multiThreaded = isMultiThreaded;
+        }
+
+        /** Return the name in lower case. */
+        @Override
+        public String toString() {
+            return this.name().toLowerCase();
+        }
+
+        /** Get the CMake name for the platform. */
+        public String getcMakeName() {
+            return this.cMakeName;
+        }
+
+        public boolean isMultiThreaded() {
+            return this.multiThreaded;
+        }
+    }
+
+    /**
+     * Platform options.
+     *
+     * @author Anirudh Rengarajan
+     */
+    public enum PlatformOption implements DictionaryElement {
+        NAME("name", PrimitiveType.STRING),
+        BAUDRATE("baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER),
+        BOARD("board", PrimitiveType.STRING),
+        FLASH("flash", PrimitiveType.BOOLEAN),
+        PORT("port", PrimitiveType.STRING),
+        USER_THREADS("user-threads", PrimitiveType.NON_NEGATIVE_INTEGER);
+
+        public final PrimitiveType type;
+
+        private final String description;
+
+        PlatformOption(String alias, PrimitiveType type) {
+            this.description = alias;
+            this.type = type;
+        }
+
+        /** Return the description of this dictionary element. */
+        @Override
+        public String toString() {
+            return this.description;
+        }
+
+        /** Return the type associated with this dictionary element. */
+        public TargetPropertyType getType() {
+            return this.type;
+        }
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/PlatformConfigurator.java b/core/src/main/java/org/lflang/target/PlatformConfigurator.java
deleted file mode 100644
index 542323efe1..0000000000
--- a/core/src/main/java/org/lflang/target/PlatformConfigurator.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package org.lflang.target;
-
-import org.lflang.MessageReporter;
-import org.lflang.TargetConfig;
-import org.lflang.TargetProperty;
-import org.lflang.TargetProperty.DictionaryElement;
-import org.lflang.ast.ASTUtils;
-import org.lflang.lf.LfPackage.Literals;
-import org.lflang.target.property.type.PrimitiveType;
-import org.lflang.target.property.type.TargetPropertyType;
-import org.lflang.TargetPropertyConfig;
-import org.lflang.lf.Element;
-import org.lflang.lf.KeyValuePair;
-import org.lflang.lf.Model;
-import org.lflang.target.PlatformConfigurator.PlatformOption;
-import org.lflang.validation.LFValidator.ValidationReporter;
-
-public class PlatformConfigurator implements TargetPropertyConfig<PlatformOption> {
-
-    @Override
-    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
-
-    }
-
-    @Override
-    public PlatformOption parse(Element value) {
-        return null;
-    }
-
-    @Override
-    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
-        var threading = TargetProperty.getKeyValuePair(ast, TargetProperty.THREADING);
-        if (threading != null) {
-            if (pair != null && ASTUtils.toBoolean(threading.getValue())) {
-                var lit = ASTUtils.elementToSingleString(pair.getValue());
-                var dic = pair.getValue().getKeyvalue();
-                if (lit != null && lit.equalsIgnoreCase(Platform.RP2040.toString())) {
-                    reporter.error(
-                        "Platform " + Platform.RP2040 + " does not support threading",
-                        pair,
-                        Literals.KEY_VALUE_PAIR__VALUE);
-                }
-                if (dic != null) {
-                    var rp =
-                        dic.getPairs().stream()
-                            .filter(
-                                kv ->
-                                    kv.getName().equalsIgnoreCase("name")
-                                        && ASTUtils.elementToSingleString(kv.getValue())
-                                        .equalsIgnoreCase(Platform.RP2040.toString()))
-                            .findFirst();
-                    if (rp.isPresent()) {
-                        reporter.error(
-                            "Platform " + Platform.RP2040 + " does not support threading",
-                            rp.get(),
-                            Literals.KEY_VALUE_PAIR__VALUE);
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public Element getPropertyElement(TargetConfig config) {
-        return null;
-    }
-
-    /** Enumeration of supported platforms */
-    public enum Platform {
-        AUTO,
-        ARDUINO,
-        NRF52("Nrf52", true),
-        RP2040("Rp2040", false),
-        LINUX("Linux", true),
-        MAC("Darwin", true),
-        ZEPHYR("Zephyr", true),
-        WINDOWS("Windows", true);
-
-        String cMakeName;
-
-        private boolean multiThreaded = true;
-
-        Platform() {
-            this.cMakeName = this.toString();
-        }
-
-        Platform(String cMakeName, boolean isMultiThreaded) {
-            this.cMakeName = cMakeName;
-            this.multiThreaded = isMultiThreaded;
-        }
-
-        /** Return the name in lower case. */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
-
-        /** Get the CMake name for the platform. */
-        public String getcMakeName() {
-            return this.cMakeName;
-        }
-
-        public boolean isMultiThreaded() {
-            return this.multiThreaded;
-        }
-    }
-
-    /**
-     * Platform options.
-     *
-     * @author Anirudh Rengarajan
-     */
-    public enum PlatformOption implements DictionaryElement {
-        NAME("name", PrimitiveType.STRING),
-        BAUDRATE("baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER),
-        BOARD("board", PrimitiveType.STRING),
-        FLASH("flash", PrimitiveType.BOOLEAN),
-        PORT("port", PrimitiveType.STRING),
-        USER_THREADS("user-threads", PrimitiveType.NON_NEGATIVE_INTEGER);
-
-        public final PrimitiveType type;
-
-        private final String description;
-
-        private PlatformOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
-
-        /** Return the description of this dictionary element. */
-        @Override
-        public String toString() {
-            return this.description;
-        }
-
-        /** Return the type associated with this dictionary element. */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
-    }
-
-}
diff --git a/core/src/main/java/org/lflang/target/Ros2DependenciesConfigurator.java b/core/src/main/java/org/lflang/target/Ros2DependenciesConfig.java
similarity index 69%
rename from core/src/main/java/org/lflang/target/Ros2DependenciesConfigurator.java
rename to core/src/main/java/org/lflang/target/Ros2DependenciesConfig.java
index f1c6ac9eae..176cc3d6bc 100644
--- a/core/src/main/java/org/lflang/target/Ros2DependenciesConfigurator.java
+++ b/core/src/main/java/org/lflang/target/Ros2DependenciesConfig.java
@@ -1,5 +1,7 @@
 package org.lflang.target;
 
+import java.util.List;
+
 import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
@@ -9,18 +11,19 @@
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
-import org.lflang.validation.LFValidator.ValidationReporter;
+import org.lflang.validation.ValidationReporter;
 
-public class Ros2DependenciesConfigurator implements TargetPropertyConfig<Boolean> {
+public class Ros2DependenciesConfig extends TargetPropertyConfig<List<String>> {
 
-    @Override
-    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
 
+    @Override
+    public List<String> initialize() {
+        return null; // FIXME
     }
 
     @Override
-    public Boolean parse(Element value) {
-        return null;
+    public List parse(Element value) {
+        return ASTUtils.elementToListOfStrings(value);
     }
 
     @Override
@@ -35,7 +38,8 @@ public void validate(KeyValuePair pair, Model ast, TargetConfig config, Validati
     }
 
     @Override
-    public Element getPropertyElement(TargetConfig config) {
-        return null;
+    public Element export() {
+        return ASTUtils.toElement(value);
     }
+
 }
diff --git a/core/src/main/java/org/lflang/target/SchedulerConfigurator.java b/core/src/main/java/org/lflang/target/SchedulerConfig.java
similarity index 79%
rename from core/src/main/java/org/lflang/target/SchedulerConfigurator.java
rename to core/src/main/java/org/lflang/target/SchedulerConfig.java
index 5bedf0494a..9f90ea6d6c 100644
--- a/core/src/main/java/org/lflang/target/SchedulerConfigurator.java
+++ b/core/src/main/java/org/lflang/target/SchedulerConfig.java
@@ -2,33 +2,55 @@
 
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Properties;
 
 import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
+import org.lflang.TargetProperty;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
-import org.lflang.target.SchedulerConfigurator.SchedulerOption;
+
+import org.lflang.target.SchedulerConfig.SchedulerOption;
 import org.lflang.target.property.type.UnionType;
-import org.lflang.validation.LFValidator.ValidationReporter;
+import org.lflang.validation.ValidationReporter;
+
 
 import com.google.common.collect.ImmutableList;
 
-public class SchedulerConfigurator implements TargetPropertyConfig<SchedulerOption> {
+public class SchedulerConfig extends TargetPropertyConfig<SchedulerOption> {
 
     @Override
-    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
-                config.schedulerType = this.parse(value);
+    public SchedulerOption initialize() {
+        return SchedulerOption.getDefault();
+    }
 
+    @Override
+    public void update(Properties cliArgs) {
+        super.update(cliArgs);
+        var key = TargetProperty.SCHEDULER.toString();
+        if (cliArgs.containsKey(key)) {
+            value = SchedulerOption.valueOf(cliArgs.getProperty("scheduler"));
+        }
     }
 
     @Override
     public SchedulerOption parse(Element value) {
-        return (SchedulerOption)
+        var scheduler = (SchedulerOption)
             UnionType.SCHEDULER_UNION.forName(ASTUtils.elementToSingleString(value));
+        if (scheduler != null) {
+            return scheduler;
+        } else {
+            return SchedulerOption.getDefault();
+        }
+    }
+
+    @Override
+    public Element export() {
+        return ASTUtils.toElement(this.value.toString());
     }
 
     @Override
@@ -65,10 +87,6 @@ public void validate(KeyValuePair pair, Model ast, TargetConfig config, Validati
 
     }
 
-    @Override
-    public Element getPropertyElement(TargetConfig config) {
-        return ASTUtils.toElement(config.schedulerType.toString());
-    }
 
     /**
      * Supported schedulers.
@@ -86,9 +104,9 @@ public enum SchedulerOption {
                 Path.of("data_collection.h"))),
         GEDF_NP(true), // Global EDF non-preemptive
         GEDF_NP_CI(true); // Global EDF non-preemptive with chain ID
-        // PEDF_NP(true);    // Partitioned EDF non-preemptive (FIXME: To be re-added in a future PR)
 
-        /** Indicate whether or not the scheduler prioritizes reactions by deadline. */
+
+        /** Indicate whether the scheduler prioritizes reactions by deadline. */
         private final boolean prioritizesDeadline;
 
         /** Relative paths to files required by this scheduler. */
diff --git a/core/src/main/java/org/lflang/target/TracingConfigurator.java b/core/src/main/java/org/lflang/target/TracingConfig.java
similarity index 72%
rename from core/src/main/java/org/lflang/target/TracingConfigurator.java
rename to core/src/main/java/org/lflang/target/TracingConfig.java
index ef47b9ad5d..926291e348 100644
--- a/core/src/main/java/org/lflang/target/TracingConfigurator.java
+++ b/core/src/main/java/org/lflang/target/TracingConfig.java
@@ -1,14 +1,15 @@
 package org.lflang.target;
 
-import org.lflang.MessageReporter;
+import java.util.Objects;
+
 import org.lflang.TargetConfig;
-import org.lflang.TargetConfig.TracingOptions;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.DictionaryElement;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.target.TracingConfig.TracingOptions;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.TargetPropertyType;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -16,23 +17,22 @@
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
-import org.lflang.validation.LFValidator.ValidationReporter;
+import org.lflang.validation.ValidationReporter;
+
+public class TracingConfig extends TargetPropertyConfig<TracingOptions> {
 
-public class TracingConfigurator implements TargetPropertyConfig<TracingOptions> {
 
     @Override
-    public void parseIntoTargetConfig(TargetConfig config, Element value, MessageReporter err) {
-        config.tracing = parse(value);
+    public TracingOptions initialize() {
+        return new TracingOptions();
     }
 
     @Override
     public TracingOptions parse(Element value) {
         var options = new TracingOptions();
         if (value.getLiteral() != null) {
-            if (ASTUtils.toBoolean(value)) {
-                return options;
-            } else {
-                return null;
+            if (!ASTUtils.toBoolean(value)) {
+                options.enabled = false;
             }
         } else {
             for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
@@ -46,8 +46,8 @@ public TracingOptions parse(Element value) {
                     break;
                 }
             }
-            return options;
         }
+        return options;
     }
 
     @Override
@@ -71,10 +71,10 @@ public void validate(KeyValuePair pair, Model ast, TargetConfig config, Validati
     }
 
     @Override
-    public Element getPropertyElement(TargetConfig config) {
-        if (config.tracing == null) {
+    public Element export() {
+        if (this.value.isEnabled()) {
             return null;
-        } else if (config.tracing.equals(new TracingOptions())) {
+        } else if (this.value.equals(new TracingOptions())) {
             // default values
             return ASTUtils.toElement(true);
         } else {
@@ -85,10 +85,10 @@ public Element getPropertyElement(TargetConfig config) {
                 pair.setName(opt.toString());
                 switch (opt) {
                 case TRACE_FILE_NAME:
-                    if (config.tracing.traceFileName == null) {
+                    if (this.value.traceFileName == null) {
                         continue;
                     }
-                    pair.setValue(ASTUtils.toElement(config.tracing.traceFileName));
+                    pair.setValue(ASTUtils.toElement(this.value.traceFileName));
                 }
                 kvp.getPairs().add(pair);
             }
@@ -100,6 +100,35 @@ public Element getPropertyElement(TargetConfig config) {
         }
     }
 
+    /** Settings related to tracing options. */
+    public static class TracingOptions {
+
+        protected boolean enabled = true;
+
+        /**
+         * The name to use as the root of the trace file produced. This defaults to the name of the .lf
+         * file.
+         */
+        public String traceFileName = null;
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            TracingOptions that = (TracingOptions) o;
+            return Objects.equals(traceFileName, that.traceFileName); // traceFileName may be null
+        }
+
+        public boolean isEnabled() {
+            return enabled;
+        }
+    }
+
+
     /**
      * Tracing options.
      *
diff --git a/core/src/main/java/org/lflang/target/property/BuildCommandsConfig.java b/core/src/main/java/org/lflang/target/property/BuildCommandsConfig.java
new file mode 100644
index 0000000000..22458f8a76
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/BuildCommandsConfig.java
@@ -0,0 +1,27 @@
+package org.lflang.target.property;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+
+public class BuildCommandsConfig extends TargetPropertyConfig<List<String>> {
+
+    @Override
+    public List<String> initialize() {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public List<String> parse(Element value) {
+        return ASTUtils.elementToListOfStrings(value);
+    }
+
+    @Override
+    public Element export() {
+        return ASTUtils.toElement(this.value.toString());
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeConfig.java b/core/src/main/java/org/lflang/target/property/BuildTypeConfig.java
new file mode 100644
index 0000000000..28e2e37cfe
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeConfig.java
@@ -0,0 +1,38 @@
+package org.lflang.target.property;
+
+import java.util.Properties;
+
+import org.lflang.TargetProperty;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.target.property.BuildConfig.BuildType;
+import org.lflang.target.property.type.UnionType;
+
+public class BuildTypeConfig extends TargetPropertyConfig<BuildType> {
+
+    @Override
+    public Element export() {
+        return ASTUtils.toElement(this.value.toString());
+    }
+
+    @Override
+    public BuildType initialize() {
+        return BuildType.RELEASE;
+    }
+
+    @Override
+    public BuildType parse(Element value) {
+        return (BuildType) UnionType.BUILD_TYPE_UNION.forName(ASTUtils.elementToSingleString(value));
+    }
+
+    @Override
+    public void update(Properties cliArgs) {
+        super.update(cliArgs);
+        var key = TargetProperty.BUILD_TYPE.toString();
+        if (cliArgs.containsKey(key)) {
+            this.value =
+                (BuildType) UnionType.BUILD_TYPE_UNION.forName(cliArgs.getProperty(key));
+        }
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsConfig.java b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsConfig.java
new file mode 100644
index 0000000000..9e984318a4
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsConfig.java
@@ -0,0 +1,157 @@
+package org.lflang.target.property;
+
+import org.lflang.TargetConfig;
+import org.lflang.TargetProperty.DictionaryElement;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.TimeUnit;
+import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.KeyValuePairs;
+import org.lflang.lf.LfFactory;
+import org.lflang.lf.Model;
+import org.lflang.target.property.ClockSyncOptionsConfig.ClockSyncOptions;
+import org.lflang.target.property.type.DictionaryType;
+import org.lflang.target.property.type.PrimitiveType;
+import org.lflang.target.property.type.TargetPropertyType;
+import org.lflang.validation.ValidationReporter;
+
+public class ClockSyncOptionsConfig extends TargetPropertyConfig<ClockSyncOptions> {
+
+    @Override
+    public ClockSyncOptions initialize() {
+        return new ClockSyncOptions();
+    }
+
+    @Override
+    public ClockSyncOptions parse(Element value) {
+        var options = new ClockSyncOptions();
+        for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+            ClockSyncOption option =
+                (ClockSyncOption) DictionaryType.CLOCK_SYNC_OPTION_DICT.forName(entry.getName());
+            switch (option) {
+            case ATTENUATION -> options.attenuation = ASTUtils.toInteger(entry.getValue());
+            case COLLECT_STATS -> options.collectStats = ASTUtils.toBoolean(entry.getValue());
+            case LOCAL_FEDERATES_ON ->
+                options.localFederatesOn = ASTUtils.toBoolean(entry.getValue());
+            case PERIOD -> options.period = ASTUtils.toTimeValue(entry.getValue());
+            case TEST_OFFSET -> options.testOffset = ASTUtils.toTimeValue(entry.getValue());
+            case TRIALS -> options.trials = ASTUtils.toInteger(entry.getValue());
+            default -> {
+            }
+            }
+        }
+        return options;
+    }
+
+    @Override
+    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+
+    }
+
+    @Override
+    public Element export() {
+        Element e = LfFactory.eINSTANCE.createElement();
+        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+        for (ClockSyncOption opt : ClockSyncOption.values()) {
+            KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+            pair.setName(opt.toString());
+            switch (opt) {
+            case ATTENUATION -> pair.setValue(ASTUtils.toElement(value.attenuation));
+            case COLLECT_STATS -> pair.setValue(ASTUtils.toElement(value.collectStats));
+            case LOCAL_FEDERATES_ON -> pair.setValue(ASTUtils.toElement(value.localFederatesOn));
+            case PERIOD -> {
+                if (value.period == null) {
+                    continue; // don't set if null
+                }
+                pair.setValue(ASTUtils.toElement(value.period));
+            }
+            case TEST_OFFSET -> {
+                if (value.testOffset == null) {
+                    continue; // don't set if null
+                }
+                pair.setValue(ASTUtils.toElement(value.testOffset));
+            }
+            case TRIALS -> pair.setValue(ASTUtils.toElement(value.trials));
+            }
+            kvp.getPairs().add(pair);
+        }
+        e.setKeyvalue(kvp);
+        // kvp will never be empty
+        return e;
+    }
+
+    /** Settings related to clock synchronization. */
+    public static class ClockSyncOptions {
+
+        /**
+         * Dampen the adjustments to the clock synchronization offset by this rate. The default is 10.
+         */
+        public int attenuation = 10;
+
+        /**
+         * Whether to collect statistics while performing clock synchronization. This setting is only
+         * considered when clock synchronization has been activated. The default is true.
+         */
+        public boolean collectStats = true;
+
+        /** Enable clock synchronization for federates on the same machine. Default is false. */
+        public boolean localFederatesOn = false;
+
+        /**
+         * Interval at which clock synchronization is initiated by the RTI (will be passed to it as an
+         * argument on the command-line). The default is 5 milliseconds.
+         */
+        public TimeValue period = new TimeValue(5, TimeUnit.MILLI);
+
+        /**
+         * Indicate the number of exchanges to be had per each clock synchronization round. See
+         * /lib/core/federated/clock-sync.h for more details. The default is 10.
+         */
+        public int trials = 10;
+
+        /**
+         * Used to create an artificial clock synchronization error for the purpose of testing. The
+         * default is null.
+         */
+        public TimeValue testOffset;
+    }
+
+
+
+    /**
+     * Clock synchronization options.
+     *
+     * @author Marten Lohstroh
+     */
+    public enum ClockSyncOption implements DictionaryElement {
+        ATTENUATION("attenuation", PrimitiveType.NON_NEGATIVE_INTEGER),
+        LOCAL_FEDERATES_ON("local-federates-on", PrimitiveType.BOOLEAN),
+        PERIOD("period", PrimitiveType.TIME_VALUE),
+        TEST_OFFSET("test-offset", PrimitiveType.TIME_VALUE),
+        TRIALS("trials", PrimitiveType.NON_NEGATIVE_INTEGER),
+        COLLECT_STATS("collect-stats", PrimitiveType.BOOLEAN);
+
+        public final PrimitiveType type;
+
+        private final String description;
+
+        ClockSyncOption(String alias, PrimitiveType type) {
+            this.description = alias;
+            this.type = type;
+        }
+
+        /** Return the description of this dictionary element. */
+        @Override
+        public String toString() {
+            return this.description;
+        }
+
+        /** Return the type associated with this dictionary element. */
+        public TargetPropertyType getType() {
+            return this.type;
+        }
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/property/type/DictionaryType.java b/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
index e26d2ba122..7f4ba7e44f 100644
--- a/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
+++ b/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
@@ -10,11 +10,11 @@
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
-import org.lflang.target.ClockSyncConfigurator.ClockSyncOption;
-import org.lflang.target.CoordinationConfig.CoordinationOption;
+import org.lflang.target.CoordinationOptionsConfig.CoordinationOption;
 import org.lflang.target.DockerConfig.DockerOption;
-import org.lflang.target.PlatformConfigurator.PlatformOption;
-import org.lflang.target.TracingConfigurator.TracingOption;
+import org.lflang.target.PlatformConfig.PlatformOption;
+import org.lflang.target.TracingConfig.TracingOption;
+import org.lflang.target.property.ClockSyncOptionsConfig.ClockSyncOption;
 import org.lflang.validation.LFValidator;
 
 /**
diff --git a/core/src/main/java/org/lflang/target/property/type/UnionType.java b/core/src/main/java/org/lflang/target/property/type/UnionType.java
index 51ef4debb4..4703605b09 100644
--- a/core/src/main/java/org/lflang/target/property/type/UnionType.java
+++ b/core/src/main/java/org/lflang/target/property/type/UnionType.java
@@ -8,11 +8,11 @@
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
-import org.lflang.target.ClockSyncConfigurator.ClockSyncMode;
-import org.lflang.target.CoordinationConfig.CoordinationType;
+import org.lflang.target.ClockSyncModeConfig.ClockSyncMode;
+import org.lflang.target.CoordinationModeConfig.CoordinationMode;
 import org.lflang.target.LoggingConfigurator.LogLevel;
-import org.lflang.target.PlatformConfigurator.Platform;
-import org.lflang.target.SchedulerConfigurator.SchedulerOption;
+import org.lflang.target.PlatformConfig.Platform;
+import org.lflang.target.SchedulerConfig.SchedulerOption;
 import org.lflang.target.property.BuildConfig.BuildType;
 import org.lflang.validation.LFValidator;
 
@@ -27,7 +27,7 @@ public enum UnionType implements TargetPropertyType {
         Arrays.asList(PrimitiveType.STRING, DictionaryType.PLATFORM_DICT), null),
     FILE_OR_FILE_ARRAY(Arrays.asList(PrimitiveType.FILE, ArrayType.FILE_ARRAY), null),
     BUILD_TYPE_UNION(Arrays.asList(BuildType.values()), null),
-    COORDINATION_UNION(Arrays.asList(CoordinationType.values()), CoordinationType.CENTRALIZED),
+    COORDINATION_UNION(Arrays.asList(CoordinationMode.values()), CoordinationMode.CENTRALIZED),
     SCHEDULER_UNION(Arrays.asList(SchedulerOption.values()), SchedulerOption.getDefault()),
     LOGGING_UNION(Arrays.asList(LogLevel.values()), LogLevel.INFO),
     PLATFORM_UNION(Arrays.asList(Platform.values()), Platform.AUTO),
diff --git a/core/src/main/java/org/lflang/util/ArduinoUtil.java b/core/src/main/java/org/lflang/util/ArduinoUtil.java
index 13f854f9c7..4903f8c719 100644
--- a/core/src/main/java/org/lflang/util/ArduinoUtil.java
+++ b/core/src/main/java/org/lflang/util/ArduinoUtil.java
@@ -68,11 +68,11 @@ private LFCommand arduinoCompileCommand(FileConfig fileConfig, TargetConfig targ
         var fileWriter = new FileWriter(testScript.getAbsoluteFile(), true);
         BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
         String board =
-            targetConfig.platformOptions.board != null
-                ? targetConfig.platformOptions.board
+            targetConfig.platformOptions.get().board != null
+                ? targetConfig.platformOptions.get().board
                 : "arduino:avr:leonardo";
         String isThreaded =
-            targetConfig.platformOptions.board.contains("mbed")
+            targetConfig.platformOptions.get().board.contains("mbed")
                 ? "-DLF_THREADED"
                 : "-DLF_UNTHREADED";
         bufferedWriter.write(
@@ -122,8 +122,8 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
             "SUCCESS: Compiling generated code for "
                 + fileConfig.name
                 + " finished with no errors.");
-    if (targetConfig.platformOptions.flash) {
-      if (targetConfig.platformOptions.port != null) {
+    if (targetConfig.platformOptions.get().flash) {
+      if (targetConfig.platformOptions.get().port != null) {
         messageReporter.nowhere().info("Invoking flash command for Arduino");
         LFCommand flash =
             commandFactory.createCommand(
@@ -131,9 +131,9 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
                 List.of(
                     "upload",
                     "-b",
-                    targetConfig.platformOptions.board,
+                    targetConfig.platformOptions.get().board,
                     "-p",
-                    targetConfig.platformOptions.port),
+                    targetConfig.platformOptions.get().port),
                 fileConfig.getSrcGenPath());
         if (flash == null) {
           messageReporter.nowhere().error("Could not create arduino-cli flash command.");
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt
index 45a39eb68a..bd0d0a3a46 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt
@@ -13,6 +13,7 @@ import org.lflang.lf.TriggerRef
 import org.lflang.lf.VarRef
 import org.lflang.lf.Visibility
 import org.lflang.lf.WidthSpec
+import org.lflang.target.LoggingConfigurator.LogLevel
 
 /*************
  * Copyright (c) 2019-2021, TU Dresden.
@@ -67,12 +68,10 @@ fun Expression.toCppCode(inferredType: InferredType? = null): String =
 
 
 /**
- * Convert a value to a time representation in C++ code*
+ * Convert a value to a time representation in C++ code
  *
  * If the value evaluates to 0, it is interpreted as a time.
  *
- * @param outerContext A flag indicating whether to generate code for the scope of the outer reactor class.
- *                    This should be set to false if called from code generators for the inner class.
  */
 fun Expression?.toCppTime(): String =
     this?.toCppCode(inferredType = InferredType.time()) ?: "reactor::Duration::zero()"
@@ -140,13 +139,13 @@ val InferredType.cppType: String
 
 
 /** Convert a log level to a severity number understood by the reactor-cpp runtime. */
-val TargetProperty.LogLevel.severity
+val LogLevel.severity
     get() = when (this) {
-        TargetProperty.LogLevel.ERROR -> 1
-        TargetProperty.LogLevel.WARN  -> 2
-        TargetProperty.LogLevel.INFO  -> 3
-        TargetProperty.LogLevel.LOG   -> 4
-        TargetProperty.LogLevel.DEBUG -> 4
+        LogLevel.ERROR -> 1
+        LogLevel.WARN  -> 2
+        LogLevel.INFO  -> 3
+        LogLevel.LOG   -> 4
+        LogLevel.DEBUG -> 4
     }
 
 fun Reactor.hasBankIndexParameter() = parameters.firstOrNull { it.name == "bank_index" } != null
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
index e2106456b8..eefa2fa0cd 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
@@ -25,7 +25,7 @@ abstract class CppPlatformGenerator(protected val generator: CppGenerator) {
 
     protected val cmakeArgs: List<String>
         get() = listOf(
-            "-DCMAKE_BUILD_TYPE=${targetConfig.cmakeBuildType}",
+            "-DCMAKE_BUILD_TYPE=${targetConfig.buildType}",
             "-DREACTOR_CPP_VALIDATE=${if (targetConfig.noRuntimeValidation) "OFF" else "ON"}",
             "-DREACTOR_CPP_PRINT_STATISTICS=${if (targetConfig.printStatistics) "ON" else "OFF"}",
             "-DREACTOR_CPP_TRACE=${if (targetConfig.tracing != null) "ON" else "OFF"}",
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
index b4e00262aa..d49ed3d2b6 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
@@ -60,7 +60,7 @@ class CppRos2PackageGenerator(generator: CppGenerator, private val nodeName: Str
                 |set(CMAKE_CXX_STANDARD_REQUIRED ON)
                 |set(CMAKE_CXX_EXTENSIONS OFF)
                 |
-                |set(DEFAULT_BUILD_TYPE "${targetConfig.cmakeBuildType}")
+                |set(DEFAULT_BUILD_TYPE "${targetConfig.buildType}")
                 |if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
                 |set    (CMAKE_BUILD_TYPE "$S{DEFAULT_BUILD_TYPE}" CACHE STRING "Choose the type of build." FORCE)
                 |endif()
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
index 1464d6514f..c64ef9b47f 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
@@ -79,7 +79,7 @@ class CppStandaloneCmakeGenerator(private val targetConfig: TargetConfig, privat
             |include($S{CMAKE_ROOT}/Modules/ExternalProject.cmake)
             |include(GNUInstallDirs)
             |
-            |set(DEFAULT_BUILD_TYPE "${targetConfig.cmakeBuildType}")
+            |set(DEFAULT_BUILD_TYPE "${targetConfig.buildType}")
             |if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
             |set    (CMAKE_BUILD_TYPE "$S{DEFAULT_BUILD_TYPE}" CACHE STRING "Choose the type of build." FORCE)
             |endif()
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
index 45fa65f4f5..192a5c62a4 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
@@ -1,6 +1,6 @@
 package org.lflang.generator.cpp
 
-import org.lflang.TargetProperty
+import org.lflang.target.property.BuildConfig.BuildType
 import org.lflang.generator.CodeMap
 import org.lflang.generator.LFGeneratorContext
 import org.lflang.toUnixString
@@ -130,9 +130,9 @@ class CppStandaloneGenerator(generator: CppGenerator) :
         return 0
     }
 
-    private fun buildTypeToCmakeConfig(type: TargetProperty.BuildType?) = when (type) {
+    private fun buildTypeToCmakeConfig(type: BuildType?) = when (type) {
         null                          -> "Release"
-        TargetProperty.BuildType.TEST -> "Debug"
+        BuildType.TEST -> "Debug"
         else                          -> type.toString()
     }
 
@@ -141,7 +141,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
         if (version.compareVersion("3.12.0") < 0) {
             messageReporter.nowhere().warning("CMAKE is older than version 3.12. Parallel building is not supported.")
             makeArgs =
-                listOf("--build", ".", "--target", target, "--config", targetConfig.cmakeBuildType?.toString() ?: "Release")
+                listOf("--build", ".", "--target", target, "--config", targetConfig.buildType?.toString() ?: "Release")
         } else {
             val cores = Runtime.getRuntime().availableProcessors()
             makeArgs = listOf(
@@ -152,7 +152,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
                 "--parallel",
                 cores.toString(),
                 "--config",
-                buildTypeToCmakeConfig(targetConfig.cmakeBuildType)
+                buildTypeToCmakeConfig(targetConfig.buildType.get())
             )
         }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustCargoTomlEmitter.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustCargoTomlEmitter.kt
index a4b9ba0548..2a733438ec 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustCargoTomlEmitter.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustCargoTomlEmitter.kt
@@ -24,7 +24,7 @@
 
 package org.lflang.generator.rust
 
-import org.lflang.TargetProperty.BuildType.*
+import org.lflang.target.property.BuildConfig.BuildType.*
 import org.lflang.escapeStringLiteral
 import org.lflang.generator.PrependOperator.rangeTo
 import org.lflang.joinWithCommas
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
index 41128800e3..b733db66de 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
@@ -26,7 +26,7 @@ package org.lflang.generator.rust
 
 import org.eclipse.emf.ecore.resource.Resource
 import org.lflang.Target
-import org.lflang.TargetProperty.BuildType
+import org.lflang.target.property.BuildConfig.BuildType
 import org.lflang.generator.GeneratorUtils.canGenerate
 import org.lflang.generator.CodeMap
 import org.lflang.generator.GeneratorBase
@@ -96,7 +96,7 @@ class RustGenerator(
         val args = mutableListOf<String>().apply {
             this += "build"
 
-            val buildType = targetConfig.rust.buildType
+            val buildType = targetConfig.rust.getBuildType(context.targetConfig.buildType)
             if (buildType == BuildType.RELEASE) {
                 this += "--release"
             } else if (buildType != BuildType.DEBUG) {
@@ -125,7 +125,7 @@ class RustGenerator(
 
         if (cargoReturnCode == 0) {
             // We still have to copy the compiled binary to the destination folder.
-            val buildType = targetConfig.rust.buildType
+            val buildType = targetConfig.rust.getBuildType(context.targetConfig.buildType)
             val binaryPath = validator.metadata?.targetDirectory!!
                 .resolve(buildType.cargoProfileName)
                 .resolve(fileConfig.executable.fileName)
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
index b2bacb0ce3..9b3d9208c8 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
@@ -26,7 +26,7 @@
 package org.lflang.generator.rust
 
 import org.lflang.*
-import org.lflang.TargetProperty.BuildType
+import org.lflang.target.property.BuildConfig.BuildType
 import org.lflang.ast.ASTUtils
 import org.lflang.generator.*
 import org.lflang.lf.*
@@ -519,7 +519,7 @@ object RustModelBuilder {
 
     private fun TargetConfig.toRustProperties(): RustTargetProperties =
         RustTargetProperties(
-            keepAlive = this.keepalive,
+            keepAlive = this.keepalive.get(),
             timeout = this.timeout?.toRustTimeExpr(),
             timeoutLf = this.timeout,
             singleFile = this.singleFileProject,
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
index fc8b942a2f..2d1376fae9 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
@@ -4,7 +4,6 @@ import org.lflang.MessageReporter
 import org.lflang.TargetConfig
 import org.lflang.generator.PrependOperator
 import org.lflang.generator.getTargetInitializer
-import org.lflang.joinWithLn
 import org.lflang.lf.Parameter
 import org.lflang.lf.Reactor
 import java.util.*
@@ -78,7 +77,7 @@ class TSConstructorGenerator(
 
     // Generate code for setting target configurations.
     private fun generateTargetConfigurations(targetConfig: TargetConfig): String {
-        val interval = targetConfig.coordinationOptions.advance_message_interval
+        val interval = targetConfig.coordinationOptions.get().advanceMessageInterval
         return if ((reactor.isMain) && interval != null) {
             "this.setAdvanceMessageInterval(${interval.toTsTime()})"
         } else ""
diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index 12e83dadac..784286e1f0 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -26,7 +26,7 @@
 
 import org.lflang.TargetProperty;
 import org.lflang.target.LoggingConfigurator.LogLevel;
-import org.lflang.target.PlatformConfigurator.Platform;
+import org.lflang.target.PlatformConfig.Platform;
 import org.lflang.tests.TestRegistry.TestCategory;
 
 /**
@@ -68,9 +68,9 @@ public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
     test.getContext().getArgs().setProperty("tracing", "false");
     test.getContext().getTargetConfig().setByUser.add(TargetProperty.THREADING);
     test.getContext().getTargetConfig().threading = false;
-    test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
-    test.getContext().getTargetConfig().platformOptions.flash = false;
-    test.getContext().getTargetConfig().platformOptions.board = "qemu_cortex_m3";
+    test.getContext().getTargetConfig().platformOptions.get().platform = Platform.ZEPHYR;
+    test.getContext().getTargetConfig().platformOptions.get().flash = false;
+    test.getContext().getTargetConfig().platformOptions.get().board = "qemu_cortex_m3";
 
     // FIXME: Zephyr  emulations fails with debug log-levels.
     test.getContext().getTargetConfig().logLevel = LogLevel.WARN;
@@ -80,9 +80,9 @@ public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
 
   public static boolean makeZephyrCompatible(LFTest test) {
     test.getContext().getArgs().setProperty("tracing", "false");
-    test.getContext().getTargetConfig().platformOptions.platform = Platform.ZEPHYR;
-    test.getContext().getTargetConfig().platformOptions.flash = false;
-    test.getContext().getTargetConfig().platformOptions.board = "qemu_cortex_m3";
+    test.getContext().getTargetConfig().platformOptions.get().platform = Platform.ZEPHYR;
+    test.getContext().getTargetConfig().platformOptions.get().flash = false;
+    test.getContext().getTargetConfig().platformOptions.get().board = "qemu_cortex_m3";
 
     // FIXME: Zephyr  emulations fails with debug log-levels.
     test.getContext().getTargetConfig().logLevel = LogLevel.WARN;

From ab439109823b91a55b92a4808c3b9648aad7be82 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Sat, 16 Sep 2023 11:04:36 +0200
Subject: [PATCH 0876/1114] Exclude Zephyr board tests from the other C
 regression tests

---
 core/src/testFixtures/java/org/lflang/tests/Configurators.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index 4191687278..5929f2a5af 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -115,6 +115,7 @@ public static boolean compatibleWithThreadingOff(TestCategory category) {
             || category == TestCategory.ARDUINO
             || category == TestCategory.VERIFIER
             || category == TestCategory.ZEPHYR_UNTHREADED
+            || category == TestCategory.ZEPHYR_BOARDS
             || category == TestCategory.ZEPHYR_THREADED;
 
     // SERIALIZATION and TARGET tests are excluded on Windows.

From 9c18925bc3b83e27956ddd958f295ba9ff6fdfe4 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Sat, 16 Sep 2023 11:12:35 +0200
Subject: [PATCH 0877/1114] Bump Zephyr to 3.4.0

---
 .github/actions/setup-zephyr/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/setup-zephyr/action.yml b/.github/actions/setup-zephyr/action.yml
index 32cd307172..f414609105 100644
--- a/.github/actions/setup-zephyr/action.yml
+++ b/.github/actions/setup-zephyr/action.yml
@@ -6,7 +6,7 @@ runs:
     - name: Setup environment variables
       run: |
         echo "SDK_VERSION=0.16.1" >> $GITHUB_ENV
-        echo "ZEPHYR_VERSION=3.3.0" >> $GITHUB_ENV
+        echo "ZEPHYR_VERSION=3.4.0" >> $GITHUB_ENV
       shell: bash
     - name: Dependencies
       run: |

From 56375242aa93b9ff78df1b265ec1ac04c65d39e5 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Sat, 16 Sep 2023 12:30:25 +0200
Subject: [PATCH 0878/1114] Exclude Zephyr board tests from CCpp tests

---
 .../integrationTest/java/org/lflang/tests/runtime/CCppTest.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java
index 6324098963..3bbbda7dad 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java
@@ -44,6 +44,7 @@ private static boolean isExcludedFromCCpp(TestCategory category) {
         isMac() && (category == TestCategory.DOCKER_FEDERATED || category == TestCategory.DOCKER);
     excluded |= category == TestCategory.ZEPHYR_UNTHREADED;
     excluded |= category == TestCategory.ZEPHYR_THREADED;
+    excluded |= category == TestCategory.ZEPHYR_BOARDS;
     excluded |= category == TestCategory.ARDUINO;
     excluded |= category == TestCategory.NO_INLINING;
     excluded |= category == TestCategory.VERIFIER;

From 626d6188abd59fd757b8371a72754f8e24cd0130 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Sat, 16 Sep 2023 12:42:34 +0200
Subject: [PATCH 0879/1114] Update Zephyr CI

---
 .github/workflows/c-zephyr-tests.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index 49c073d03b..eb170bafcf 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -41,7 +41,9 @@ jobs:
         if: ${{ inputs.runtime-ref }}
       - name: Run Zephyr smoke tests
         run: |
-          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildZephyr* core:integrationTestCodeCoverageReport
+          ./gradlew core:integrationTest \
+            --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrUnthreaded* \
+            --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrThreaded* core:integrationTestCodeCoverageReport
           ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
           rm -r test/C/src-gen
       - name: Run basic tests
@@ -54,6 +56,10 @@ jobs:
           ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildConcurrent* core:integrationTestCodeCoverageReport
           ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
           rm -r test/C/src-gen
+      - name: Run Zephyr board tests
+        run: |
+          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildZephyBoard core:integrationTestCodeCoverageReport
+          rm -r test/C/src-gen
       - name: Report to CodeCov
         uses: ./.github/actions/report-code-coverage
         with:

From eac5f219313cd511eb27179ac3cadcecd8e02bd6 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Sat, 16 Sep 2023 12:46:16 +0200
Subject: [PATCH 0880/1114] Zephyr v3.4.0

---
 .../src/main/java/org/lflang/generator/c/CCmakeGenerator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index ea1db3713e..717f0714f5 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -144,8 +144,8 @@ CodeBuilder generateCMakeCode(
           cMakeCode.pr("# Selecting default board");
           cMakeCode.pr("set(BOARD qemu_cortex_m3)");
         }
-        cMakeCode.pr("# We recommend Zephyr v3.3.0 but we are compatible with older versions also");
-        cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} 3.3.0)");
+        cMakeCode.pr("# We recommend Zephyr v3.4.0 but we are compatible with older versions also");
+        cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} 3.4.0)");
         cMakeCode.newLine();
         cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
         cMakeCode.newLine();

From c627127eb60df43e60531f922afbf02567650c6d Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Sat, 16 Sep 2023 12:49:33 +0200
Subject: [PATCH 0881/1114] Update STM32 test

---
 test/C/src/zephyr/boards/STM32.lf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/C/src/zephyr/boards/STM32.lf b/test/C/src/zephyr/boards/STM32.lf
index c849ea0f30..409f169b85 100644
--- a/test/C/src/zephyr/boards/STM32.lf
+++ b/test/C/src/zephyr/boards/STM32.lf
@@ -1,6 +1,8 @@
 target C {
-  platform: "Zephyr",
-  board: stm32f4_disco
+  platform: {
+    name: Zephyr,
+    board: stm32f4_disco
+  }
 }
 
 main reactor {

From 9b02b6cba6530115e3ad67eccd288625b77a8ba9 Mon Sep 17 00:00:00 2001
From: erling <erling.jellum@gmail.com>
Date: Sat, 16 Sep 2023 12:50:14 +0200
Subject: [PATCH 0882/1114] Update
 core/src/main/resources/lib/platform/zephyr/boards/nrf52dk_nrf52832.overlay

Co-authored-by: Marten Lohstroh <marten@berkeley.edu>
---
 .../lib/platform/zephyr/boards/nrf52dk_nrf52832.overlay         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/platform/zephyr/boards/nrf52dk_nrf52832.overlay b/core/src/main/resources/lib/platform/zephyr/boards/nrf52dk_nrf52832.overlay
index 30472cd1fb..0c88903dc5 100644
--- a/core/src/main/resources/lib/platform/zephyr/boards/nrf52dk_nrf52832.overlay
+++ b/core/src/main/resources/lib/platform/zephyr/boards/nrf52dk_nrf52832.overlay
@@ -1,3 +1,3 @@
 &timer1 {
 	status = "okay";
-};
\ No newline at end of file
+};

From 137a1499221439649875e17bad39d0a133b4f556 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Sat, 16 Sep 2023 14:36:54 +0200
Subject: [PATCH 0883/1114] Typo in CI

---
 .github/workflows/c-zephyr-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index eb170bafcf..200b35e30f 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -58,7 +58,7 @@ jobs:
           rm -r test/C/src-gen
       - name: Run Zephyr board tests
         run: |
-          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildZephyBoard core:integrationTestCodeCoverageReport
+          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildZephyBoards* core:integrationTestCodeCoverageReport
           rm -r test/C/src-gen
       - name: Report to CodeCov
         uses: ./.github/actions/report-code-coverage

From 7d3905fe97c397991a70a98bb2ab5e77b388fe49 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Sat, 16 Sep 2023 15:31:09 +0200
Subject: [PATCH 0884/1114] Another typo...

---
 .github/workflows/c-zephyr-tests.yml                            | 2 +-
 .../java/org/lflang/tests/runtime/CZephyrTest.java              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index 200b35e30f..16001457fb 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -58,7 +58,7 @@ jobs:
           rm -r test/C/src-gen
       - name: Run Zephyr board tests
         run: |
-          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildZephyBoards* core:integrationTestCodeCoverageReport
+          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrBoards* core:integrationTestCodeCoverageReport
           rm -r test/C/src-gen
       - name: Report to CodeCov
         uses: ./.github/actions/report-code-coverage
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java
index 6ab2490abe..08b18b2a72 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java
@@ -56,7 +56,7 @@ public void buildZephyrUnthreadedTests() {
   }
 
   @Test
-  public void buildZephyrBoardTests() {
+  public void buildZephyrBoardsTests() {
     Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
     super.runTestsFor(
         List.of(Target.C),

From 486377c395426dd9eac6496c227ed5335afe75dc Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Mon, 18 Sep 2023 14:41:32 +0200
Subject: [PATCH 0885/1114] Added test for unconnected outputs

---
 core/src/main/resources/lib/c/reactor-c |  2 +-
 test/C/src/UnconnectedOutput.lf         | 34 +++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 test/C/src/UnconnectedOutput.lf

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 7e031ec140..f0bd1bc653 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 7e031ec1400fbebc1f90a7ce41fa10ffa40549d2
+Subproject commit f0bd1bc6533e4b47f2af9d4e9d8613fa5e670be0
diff --git a/test/C/src/UnconnectedOutput.lf b/test/C/src/UnconnectedOutput.lf
new file mode 100644
index 0000000000..96a8fb3e7a
--- /dev/null
+++ b/test/C/src/UnconnectedOutput.lf
@@ -0,0 +1,34 @@
+// Success here is not segfaulting.
+target C {
+    timeout: 10 ms
+}
+reactor B(bank_index: int = 0) {
+  input in:int
+  output out_problem:int
+  reaction(in) -> out_problem {=
+    lf_set(out_problem, self->bank_index);
+  =}
+}
+reactor A {
+  input in:int
+  output out1:int
+  output out2:int
+  output out3:int
+  
+  b = new[3] B()
+  (in)+ -> b.in
+  b.out_problem -> out1, out2, out3
+}
+main reactor {
+  m = new A()
+  timer t(0, 10 ms)
+  reaction(t) -> m.in {=
+    lf_set(m.in, 42);
+  =}
+  reaction(m.out3) {=
+    lf_print("out3 = %d", m.out3->value);
+    if (m.out3->value != 2) {
+      lf_print_error_and_exit("Expected 2.");
+    }
+  =}
+}

From f40157950be906b99771ca77251daaa727fe1e5c Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@eecs.berkeley.edu>
Date: Mon, 18 Sep 2023 15:01:05 +0200
Subject: [PATCH 0886/1114] Formatted

---
 test/C/src/UnconnectedOutput.lf | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/test/C/src/UnconnectedOutput.lf b/test/C/src/UnconnectedOutput.lf
index 96a8fb3e7a..571e6f1a04 100644
--- a/test/C/src/UnconnectedOutput.lf
+++ b/test/C/src/UnconnectedOutput.lf
@@ -1,30 +1,36 @@
 // Success here is not segfaulting.
 target C {
-    timeout: 10 ms
+  timeout: 10 ms
 }
+
 reactor B(bank_index: int = 0) {
-  input in:int
-  output out_problem:int
+  input in: int
+  output out_problem: int
+
   reaction(in) -> out_problem {=
     lf_set(out_problem, self->bank_index);
   =}
 }
+
 reactor A {
-  input in:int
-  output out1:int
-  output out2:int
-  output out3:int
-  
+  input in: int
+  output out1: int
+  output out2: int
+  output out3: int
+
   b = new[3] B()
   (in)+ -> b.in
   b.out_problem -> out1, out2, out3
 }
+
 main reactor {
   m = new A()
   timer t(0, 10 ms)
+
   reaction(t) -> m.in {=
     lf_set(m.in, 42);
   =}
+
   reaction(m.out3) {=
     lf_print("out3 = %d", m.out3->value);
     if (m.out3->value != 2) {

From 666a3ec347617bf5716651eceea7fce89a8e2fd4 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 18 Sep 2023 20:47:59 +0200
Subject: [PATCH 0887/1114] pull in
 https://github.com/lf-lang/reactor-cpp/pull/53

---
 core/src/main/resources/lib/cpp/reactor-cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/cpp/reactor-cpp b/core/src/main/resources/lib/cpp/reactor-cpp
index 521f1d852b..997421c0d3 160000
--- a/core/src/main/resources/lib/cpp/reactor-cpp
+++ b/core/src/main/resources/lib/cpp/reactor-cpp
@@ -1 +1 @@
-Subproject commit 521f1d852b6b3dc5850d3dcfc669ea812296db94
+Subproject commit 997421c0d35ef609b7ae202b4cbf2db38b884d12

From 57f92aa125140ebf5451499bc8fb7a35f002b10a Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 18 Sep 2023 20:48:22 +0200
Subject: [PATCH 0888/1114] improve shutdown tests

---
 test/Cpp/src/Starve.lf       | 24 ++++++++++++++++++++++++
 test/Cpp/src/TimeLimit.lf    | 29 ++++++++++++++++++++++++++---
 test/Cpp/src/Timeout_Test.lf | 16 ++++++++++++----
 3 files changed, 62 insertions(+), 7 deletions(-)
 create mode 100644 test/Cpp/src/Starve.lf

diff --git a/test/Cpp/src/Starve.lf b/test/Cpp/src/Starve.lf
new file mode 100644
index 0000000000..ba9c45d998
--- /dev/null
+++ b/test/Cpp/src/Starve.lf
@@ -0,0 +1,24 @@
+target Cpp
+
+main reactor {
+  timer t(1 s)
+  logical action after_shutdown: void
+
+  reaction(t) -> after_shutdown {=
+    reactor::log::Info() << "Timer triggered at " << get_tag();
+  =}
+
+  reaction(shutdown) -> after_shutdown {=
+    reactor::log::Info() << "Shutdown triggered at " << get_tag();
+    if(get_elapsed_logical_time() != 1s || get_microstep() != 1) {
+      reactor::log::Error() << "Shutdown invoked at wrong tag";
+      exit(2);
+    }
+    after_shutdown.schedule();
+  =}
+
+  reaction(after_shutdown) {=
+    reactor::log::Error() << "Executed a reaction after shutdown";
+          exit(1);
+  =}
+}
diff --git a/test/Cpp/src/TimeLimit.lf b/test/Cpp/src/TimeLimit.lf
index 1d11882740..28cb3894ef 100644
--- a/test/Cpp/src/TimeLimit.lf
+++ b/test/Cpp/src/TimeLimit.lf
@@ -19,23 +19,39 @@ reactor Clock(offset: time = 0, period: time = 1 sec) {
 reactor Destination {
   input x: int
   state s: int = 1
+  state shutdown_invoked: bool = false
+  input check_shutdown: void
 
   reaction(x) {=
     //std::cout << "Received " << *x.get() << '\n';
     if (*x.get() != s) {
-      std::cerr << "Error: Expected " << s << " and got " << *x.get() << '\n';
+      reactor::log::Error() << "Expected " << s << " and got " << *x.get();
       exit(1);
     }
+    if (*x.get() == 12 && !shutdown_invoked) {
+      reactor::log::Error() << "Shutdown wasn't invoked!";
+    }
     s++;
   =}
 
   reaction(shutdown) {=
     std::cout << "**** shutdown reaction invoked.\n";
+    shutdown_invoked = true;
+    if(get_microstep() != 1) {
+      reactor::log::Error() << "Expected microstep == 1, but got " << get_microstep();
+      exit(2);
+    }
     if (s != 12) {
-      std::cerr << "ERROR: Expected 12 but got " << s << '\n';
+      reactor::log::Error() << "Expected 12 but got " << s;
       exit(1);
     }
   =}
+
+  reaction(check_shutdown) {=
+    if (!shutdown_invoked) {
+      reactor::log::Error() << "Shutdown wasn't invoked!";
+    }
+  =}
 }
 
 main reactor TimeLimit(period: time = 1 sec) {
@@ -44,7 +60,14 @@ main reactor TimeLimit(period: time = 1 sec) {
   d = new Destination()
   c.y -> d.x
 
-  reaction(stop) {=
+  logical action check: void
+
+  reaction(stop) -> check {=
     environment()->sync_shutdown();
+    check.schedule();
+  =}
+
+  reaction(check) -> d.check_shutdown {=
+    d.check_shutdown.set();
   =}
 }
diff --git a/test/Cpp/src/Timeout_Test.lf b/test/Cpp/src/Timeout_Test.lf
index aac8a04934..6c0224941c 100644
--- a/test/Cpp/src/Timeout_Test.lf
+++ b/test/Cpp/src/Timeout_Test.lf
@@ -15,6 +15,8 @@ reactor Consumer {
   input in: int
   state success: bool = false
 
+  logical action after_shutdown: void
+
   reaction(in) {=
     auto current{get_elapsed_logical_time()};
     if(current > 11ms ){
@@ -25,15 +27,21 @@ reactor Consumer {
     }
   =}
 
-  reaction(shutdown) {=
-    reactor::log::Info() << "Shutdown invoked at " << get_elapsed_logical_time();
-    if((get_elapsed_logical_time() == 11ms ) && (success == true)){
+  reaction(shutdown) -> after_shutdown {=
+    reactor::log::Info() << "Shutdown invoked at tag " << get_tag();
+    if((get_elapsed_logical_time() == 11ms ) && get_microstep() == 0 && (success == true)){
       reactor::log::Info() << "SUCCESS: successfully enforced timeout.";
+      after_shutdown.schedule();
     } else {
-      reactor::log::Error() << "Shutdown invoked at: " << get_elapsed_logical_time() << ". Failed to enforce timeout.";
+      reactor::log::Error() << "Failed to enforce timeout at the correct tag.";
       exit(1);
     }
   =}
+
+  reaction(after_shutdown) {=
+    reactor::log::Error() << "Executed a reaction after timeout.";
+    exit(2);
+  =}
 }
 
 main reactor Timeout_Test {

From f7386ed8148102d8b85a4ae5c2d5d73b96d00aa2 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 20 Sep 2023 16:41:54 +0200
Subject: [PATCH 0889/1114] update reactor-cpp, improve and add tests

---
 core/src/main/resources/lib/cpp/reactor-cpp |  2 +-
 test/Cpp/src/ShutdownAsync.lf               | 28 +++++++++
 test/Cpp/src/ShutdownSync.lf                | 25 ++++++++
 test/Cpp/src/Starve.lf                      |  2 +-
 test/Cpp/src/StarveZero.lf                  | 19 ++++++
 test/Cpp/src/Timeout_Test.lf                | 52 ----------------
 test/Cpp/src/properties/Timeout.lf          | 66 ++++++++++++++++-----
 test/Cpp/src/properties/TimeoutZero.lf      | 28 +++------
 8 files changed, 132 insertions(+), 90 deletions(-)
 create mode 100644 test/Cpp/src/ShutdownAsync.lf
 create mode 100644 test/Cpp/src/ShutdownSync.lf
 create mode 100644 test/Cpp/src/StarveZero.lf
 delete mode 100644 test/Cpp/src/Timeout_Test.lf

diff --git a/core/src/main/resources/lib/cpp/reactor-cpp b/core/src/main/resources/lib/cpp/reactor-cpp
index 997421c0d3..fa685f1db9 160000
--- a/core/src/main/resources/lib/cpp/reactor-cpp
+++ b/core/src/main/resources/lib/cpp/reactor-cpp
@@ -1 +1 @@
-Subproject commit 997421c0d35ef609b7ae202b4cbf2db38b884d12
+Subproject commit fa685f1db99b1652e39a5cf3c6356a8db26b52bb
diff --git a/test/Cpp/src/ShutdownAsync.lf b/test/Cpp/src/ShutdownAsync.lf
new file mode 100644
index 0000000000..c1ec5ed8e5
--- /dev/null
+++ b/test/Cpp/src/ShutdownAsync.lf
@@ -0,0 +1,28 @@
+target Cpp
+
+main reactor {
+  logical action check_shutdown
+  timer request_shutdown(1 ms)
+  timer after_shutdown(2 ms)
+
+  reaction(request_shutdown) -> check_shutdown {=
+    // async_shutdown can be called from external threads to shutdown
+    // at the next possible tag. If it is called from a reaction, the
+    // next possible tag should always be the next microstep.
+    environment()->async_shutdown();
+    check_shutdown.schedule();
+  =}
+
+  reaction(shutdown, check_shutdown) {=
+    if (!(shutdown.is_present() && check_shutdown.is_present())) {
+      reactor::log::Error() << "shutdown was not triggered at the expcetd tag";
+      exit(1);
+    }
+    reactor::log::Info() << "Success!";
+  =}
+
+  reaction(after_shutdown) {=
+    reactor::log::Error() << "triggered a reaction after shutdown";
+    exit(2);
+  =}
+}
diff --git a/test/Cpp/src/ShutdownSync.lf b/test/Cpp/src/ShutdownSync.lf
new file mode 100644
index 0000000000..a07e4f2a59
--- /dev/null
+++ b/test/Cpp/src/ShutdownSync.lf
@@ -0,0 +1,25 @@
+target Cpp
+
+main reactor {
+  logical action check_shutdown
+  timer request_shutdown(1 ms)
+  timer after_shutdown(2 ms)
+
+  reaction(request_shutdown) -> check_shutdown {=
+    environment()->sync_shutdown();
+    check_shutdown.schedule();
+  =}
+
+  reaction(shutdown, check_shutdown) {=
+    if (!(shutdown.is_present() && check_shutdown.is_present())) {
+      reactor::log::Error() << "shutdown was not triggered at the expcetd tag";
+      exit(1);
+    }
+    reactor::log::Info() << "Success!";
+  =}
+
+  reaction(after_shutdown) {=
+    reactor::log::Error() << "triggered a reaction after shutdown";
+    exit(2);
+  =}
+}
diff --git a/test/Cpp/src/Starve.lf b/test/Cpp/src/Starve.lf
index ba9c45d998..73f4e4ecfc 100644
--- a/test/Cpp/src/Starve.lf
+++ b/test/Cpp/src/Starve.lf
@@ -19,6 +19,6 @@ main reactor {
 
   reaction(after_shutdown) {=
     reactor::log::Error() << "Executed a reaction after shutdown";
-          exit(1);
+    exit(1);
   =}
 }
diff --git a/test/Cpp/src/StarveZero.lf b/test/Cpp/src/StarveZero.lf
new file mode 100644
index 0000000000..e7463f6424
--- /dev/null
+++ b/test/Cpp/src/StarveZero.lf
@@ -0,0 +1,19 @@
+target Cpp
+
+main reactor {
+  logical action after_shutdown: void
+
+  reaction(shutdown) -> after_shutdown {=
+    reactor::log::Info() << "Shutdown triggered at " << get_tag();
+    if(get_elapsed_logical_time() != 0s || get_microstep() != 1) {
+      reactor::log::Error() << "Shutdown invoked at wrong tag";
+      exit(2);
+    }
+    after_shutdown.schedule();
+  =}
+
+  reaction(after_shutdown) {=
+    reactor::log::Error() << "Executed a reaction after shutdown";
+    exit(1);
+  =}
+}
diff --git a/test/Cpp/src/Timeout_Test.lf b/test/Cpp/src/Timeout_Test.lf
deleted file mode 100644
index 6c0224941c..0000000000
--- a/test/Cpp/src/Timeout_Test.lf
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * A test for the timeout functionality in Lingua Franca.
- *
- * @author Maiko Brants TU Dresden
- *
- * Modeled after the C version of this test.
- */
-target Cpp {
-  timeout: 11 msec
-}
-
-import Sender from "lib/LoopedActionSender.lf"
-
-reactor Consumer {
-  input in: int
-  state success: bool = false
-
-  logical action after_shutdown: void
-
-  reaction(in) {=
-    auto current{get_elapsed_logical_time()};
-    if(current > 11ms ){
-      reactor::log::Error() << "Received at: " << current.count() << ". Failed to enforce timeout.";
-      exit(1);
-    } else if(current == 11ms) {
-      success=true;
-    }
-  =}
-
-  reaction(shutdown) -> after_shutdown {=
-    reactor::log::Info() << "Shutdown invoked at tag " << get_tag();
-    if((get_elapsed_logical_time() == 11ms ) && get_microstep() == 0 && (success == true)){
-      reactor::log::Info() << "SUCCESS: successfully enforced timeout.";
-      after_shutdown.schedule();
-    } else {
-      reactor::log::Error() << "Failed to enforce timeout at the correct tag.";
-      exit(1);
-    }
-  =}
-
-  reaction(after_shutdown) {=
-    reactor::log::Error() << "Executed a reaction after timeout.";
-    exit(2);
-  =}
-}
-
-main reactor Timeout_Test {
-  consumer = new Consumer()
-  producer = new Sender(take_a_break_after=10, break_interval = 1 msec)
-
-  producer.out -> consumer.in
-}
diff --git a/test/Cpp/src/properties/Timeout.lf b/test/Cpp/src/properties/Timeout.lf
index a278d6d712..95d60963f5 100644
--- a/test/Cpp/src/properties/Timeout.lf
+++ b/test/Cpp/src/properties/Timeout.lf
@@ -1,31 +1,65 @@
+/**
+ * A test for the timeout functionality in Lingua Franca.
+ *
+ * @author Maiko Brants TU Dresden
+ *
+ * Modeled after the C version of this test.
+ */
 target Cpp {
-  timeout: 1 sec
+  timeout: 11 msec
 }
 
-main reactor {
-  timer t(1 sec, 1 sec)
+import Sender from "../lib/LoopedActionSender.lf"
+
+reactor Consumer {
+  input in: int
+  state success: bool = false
 
-  state triggered: bool = false
+  logical action after_shutdown: void
 
-  reaction(t) {=
-    triggered = true;
-    if (get_elapsed_logical_time() != 1s) {
-      std::cout << "ERROR: triggered reaction at an unexpected tag";
+  timer check_shutdown(11 ms)
+
+  reaction(in) {=
+    auto current{get_elapsed_logical_time()};
+    if(current > 11ms ){
+      reactor::log::Error() << "Received at: " << current.count() << ". Failed to enforce timeout.";
       exit(1);
+    } else if(current == 11ms) {
+      success=true;
     }
   =}
 
-  reaction(shutdown) {=
-    if (get_elapsed_logical_time() != 1s || get_microstep() != 0) {
-      std::cout << "ERROR: shutdown invoked at an unexpected tag";
-      exit(2);
+  reaction(shutdown) -> after_shutdown {=
+    reactor::log::Info() << "Shutdown invoked at tag " << get_tag();
+    if((get_elapsed_logical_time() == 11ms ) && get_microstep() == 0 && (success == true)){
+      reactor::log::Info() << "SUCCESS: successfully enforced timeout.";
+      after_shutdown.schedule();
+    } else {
+      reactor::log::Error() << "Failed to enforce timeout at the correct tag.";
+      exit(1);
     }
+  =}
 
-    if (triggered) {
-      std::cout << "SUCCESS!\n";
-    } else {
-      std::cout << "ERROR: reaction was not invoked!\n";
+  reaction(check_shutdown, shutdown) {=
+    if (check_shutdown.is_present() && !shutdown.is_present()) {
+      reactor::log::Error() << "Shutdown was not triggered at the expected tag";
       exit(2);
     }
+    if (!check_shutdown.is_present() && shutdown.is_present()) {
+      reactor::log::Error() << "Shutdown was triggered at an unxpected tag: " << get_tag();
+      exit(2);
+    }
+  =}
+
+  reaction(after_shutdown) {=
+    reactor::log::Error() << "Executed a reaction after timeout.";
+    exit(2);
   =}
 }
+
+main reactor {
+  consumer = new Consumer()
+  producer = new Sender(take_a_break_after=10, break_interval = 1 msec)
+
+  producer.out -> consumer.in
+}
diff --git a/test/Cpp/src/properties/TimeoutZero.lf b/test/Cpp/src/properties/TimeoutZero.lf
index 3aa45c7203..7f32565788 100644
--- a/test/Cpp/src/properties/TimeoutZero.lf
+++ b/test/Cpp/src/properties/TimeoutZero.lf
@@ -1,31 +1,19 @@
 target Cpp {
-  timeout: 0 sec
+  timeout: 0 s
 }
 
 main reactor {
-  timer t(0, 1 sec)
+  timer should_never_trigger(1 s)
 
-  state triggered: bool = false
-
-  reaction(t) {=
-    triggered = true;
-    if (get_elapsed_logical_time() != 0s) {
-      std::cout << "ERROR: triggered reaction at an unexpected tag";
+  reaction(startup, shutdown) {=
+    if (!(startup.is_present() && shutdown.is_present())) {
+      reactor::log::Error() << "Shutdown was not triggered at startup";
       exit(1);
     }
   =}
 
-  reaction(shutdown) {=
-    if (get_elapsed_logical_time() != 0s || get_microstep() != 0) {
-      std::cout << "ERROR: shutdown invoked at an unexpected tag";
-      exit(2);
-    }
-
-    if (triggered) {
-      std::cout << "SUCCESS!\n";
-    } else {
-      std::cout << "ERROR: reaction was not invoked!\n";
-      exit(2);
-    }
+  reaction(should_never_trigger) {=
+    reactor::log::Error() << "Executed a reaction after timeout.";
+    exit(2);
   =}
 }

From 7b5f0a9ce82a4b5eb5261dd66f5f72d308f0a00e Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Fri, 22 Sep 2023 11:49:53 +0200
Subject: [PATCH 0890/1114] add lsp dependency on
 de.cau.cs.kieler.klighd.incremental

This should stabilize the diagram generation in VS Code.

See https://github.com/lf-lang/vscode-lingua-franca/issues/103 and this comment:
https://github.com/lf-lang/vscode-lingua-franca/issues/103#issuecomment-1731023470
---
 lsp/build.gradle | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lsp/build.gradle b/lsp/build.gradle
index 772f618db1..65215162b7 100644
--- a/lsp/build.gradle
+++ b/lsp/build.gradle
@@ -10,6 +10,13 @@ dependencies {
         exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt.*'
         exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
     }
+
+    // This dependency ensures correct animations and bookkeeping during updates
+    // See https://github.com/lf-lang/vscode-lingua-franca/issues/103#issuecomment-1731023470
+    implementation ("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.incremental:$klighdVersion") {
+        exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt.*'
+        exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
+    }
 }
 
 application {

From d61d3e650334afdd4526c44ebccbbda5a87fa427 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Fri, 22 Sep 2023 16:43:51 +0200
Subject: [PATCH 0891/1114] add synthesis option to control if reactors are
 expanded by default

---
 .../lflang/diagram/synthesis/LinguaFrancaSynthesis.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index b51822c9a5..0c6c88d8d5 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -257,6 +257,9 @@ public class LinguaFrancaSynthesis extends AbstractDiagramSynthesis<Model> {
       SynthesisOption.<Integer>createRangeOption("Reactor Parameter/Variable Columns", 1, 10, 1)
           .setCategory(APPEARANCE);
 
+  public static final SynthesisOption DEFAULT_EXPAND_ALL =
+      SynthesisOption.createCheckOption("Expand reactors by default", false);
+
   public static final SynthesisOption FIXED_PORT_SIDE =
       SynthesisOption.createCheckOption("Fixed Port Sides", true).setCategory(LAYOUT);
   public static final SynthesisOption SPACING =
@@ -273,6 +276,7 @@ public class LinguaFrancaSynthesis extends AbstractDiagramSynthesis<Model> {
   public List<SynthesisOption> getDisplayedSynthesisOptions() {
     return List.of(
         SHOW_ALL_REACTORS,
+        DEFAULT_EXPAND_ALL,
         MemorizingExpandCollapseAction.MEMORIZE_EXPANSION_STATES,
         CYCLE_DETECTION,
         APPEARANCE,
@@ -1019,18 +1023,16 @@ private Collection<KNode> transformReactorNetwork(
     TriggerInstance<?> reset = null;
 
     // Transform instances
-    int index = 0;
     for (ReactorInstance child : reactorInstance.children) {
       Boolean expansionState = MemorizingExpandCollapseAction.getExpansionState(child);
       Collection<KNode> rNodes =
           createReactorNode(
               child,
-              expansionState != null ? expansionState : false,
+              expansionState != null ? expansionState : getBooleanValue(DEFAULT_EXPAND_ALL),
               inputPorts,
               outputPorts,
               allReactorNodes);
       nodes.addAll(rNodes);
-      index++;
     }
 
     // Create timers

From b7ee795dffb8222756fa88dddc89b7e4f5b7322c Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Fri, 22 Sep 2023 17:06:32 +0200
Subject: [PATCH 0892/1114] Removed "Reaction level" diagram synthesis option

Fixes https://github.com/lf-lang/lingua-franca/issues/2017
---
 .../synthesis/LinguaFrancaSynthesis.java       |  3 ---
 .../styles/LinguaFrancaShapeExtensions.java    | 18 ------------------
 2 files changed, 21 deletions(-)

diff --git a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index b51822c9a5..1c992557b6 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -237,8 +237,6 @@ public class LinguaFrancaSynthesis extends AbstractDiagramSynthesis<Model> {
       SynthesisOption.createCheckOption("Multiport Widths", false).setCategory(APPEARANCE);
   public static final SynthesisOption SHOW_REACTION_CODE =
       SynthesisOption.createCheckOption("Reaction Code", false).setCategory(APPEARANCE);
-  public static final SynthesisOption SHOW_REACTION_LEVEL =
-      SynthesisOption.createCheckOption("Reaction Level", false).setCategory(APPEARANCE);
   public static final SynthesisOption SHOW_REACTION_ORDER_EDGES =
       SynthesisOption.createCheckOption("Reaction Order Edges", false).setCategory(APPEARANCE);
   public static final SynthesisOption SHOW_REACTOR_HOST =
@@ -287,7 +285,6 @@ public List<SynthesisOption> getDisplayedSynthesisOptions() {
         SHOW_PORT_NAMES,
         SHOW_MULTIPORT_WIDTH,
         SHOW_REACTION_CODE,
-        SHOW_REACTION_LEVEL,
         SHOW_REACTION_ORDER_EDGES,
         SHOW_REACTOR_HOST,
         SHOW_INSTANCE_NAMES,
diff --git a/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java b/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
index b8ee69fa1c..88d15db4f6 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
@@ -72,7 +72,6 @@
 import org.eclipse.elk.graph.properties.Property;
 import org.eclipse.xtext.xbase.lib.Extension;
 import org.eclipse.xtext.xbase.lib.Functions.Function1;
-import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.Pair;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
 import org.lflang.ast.ASTUtils;
@@ -424,23 +423,6 @@ public KPolygon addReactionFigure(KNode node, ReactionInstance reaction) {
       DiagramSyntheses.suppressSelectability(textToAdd);
     }
 
-    // optional reaction level
-    if (getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTION_LEVEL)) {
-      // Force calculation of levels for reactions. This calculation
-      // will only be done once. Note that if this fails due to a causality loop,
-      // then some reactions will have level -1.
-      try {
-        String levels = IterableExtensions.join(reaction.getLevels(), ", ");
-        KText levelsText =
-            _kContainerRenderingExtensions.addText(contentContainer, ("level: " + levels));
-        _kRenderingExtensions.setFontBold(levelsText, false);
-        _linguaFrancaStyleExtensions.noSelectionStyle(levelsText);
-        DiagramSyntheses.suppressSelectability(levelsText);
-      } catch (Exception ex) {
-        // If the graph has cycles, the above fails. Continue without showing levels.
-      }
-    }
-
     // optional code content
     boolean hasCode =
         getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTION_CODE)

From 52180e2e1e04d02b920c633930c3f5da469de41a Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Fri, 22 Sep 2023 17:11:38 +0200
Subject: [PATCH 0893/1114] Avoid null pointer exception in diagrams with
 bodyless reactions

---
 .../diagram/synthesis/styles/LinguaFrancaShapeExtensions.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java b/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
index b8ee69fa1c..893d7df47b 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
@@ -444,6 +444,7 @@ public KPolygon addReactionFigure(KNode node, ReactionInstance reaction) {
     // optional code content
     boolean hasCode =
         getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTION_CODE)
+            && reaction.getDefinition().getCode() != null
             && !StringExtensions.isNullOrEmpty(reaction.getDefinition().getCode().getBody());
     if (hasCode) {
       KText hasCodeText =

From 18d83214feeb03d96f79d607261fcbee7fb9d00e Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Fri, 22 Sep 2023 17:57:56 +0200
Subject: [PATCH 0894/1114] Removed stray print statement

---
 core/src/main/java/org/lflang/AttributeUtils.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/AttributeUtils.java b/core/src/main/java/org/lflang/AttributeUtils.java
index 7e7b445d9c..147a4b6d0d 100644
--- a/core/src/main/java/org/lflang/AttributeUtils.java
+++ b/core/src/main/java/org/lflang/AttributeUtils.java
@@ -110,9 +110,6 @@ public static Attribute findAttributeByName(EObject node, String name) {
    */
   public static List<Attribute> findAttributesByName(EObject node, String name) {
     List<Attribute> attrs = getAttributes(node);
-    if (!attrs.isEmpty()) {
-      System.out.println("Fun");
-    }
     return attrs.stream()
         .filter(
             it ->

From 9edab375febce6a03a2d11b90c32d889990e42c1 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 22 Sep 2023 16:14:11 -0700
Subject: [PATCH 0895/1114] Fix ArrayAsParameter.lf

---
 test/Python/src/ArrayAsParameter.lf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/Python/src/ArrayAsParameter.lf b/test/Python/src/ArrayAsParameter.lf
index b794008a7c..58b4cb50e3 100644
--- a/test/Python/src/ArrayAsParameter.lf
+++ b/test/Python/src/ArrayAsParameter.lf
@@ -1,7 +1,7 @@
 # Source has an array as a parameter, the elements of which it passes to Print.
 target Python
 
-reactor Source(sequence(0, 1, 2)) {
+reactor Source(sequence = [0, 1, 2]) {
   output out
   state count = 0
   logical action next
@@ -36,7 +36,7 @@ reactor Print {
 }
 
 main reactor ArrayAsParameter {
-  s = new Source(sequence(1, 2, 3, 4))
+  s = new Source(sequence = [1, 2, 3, 4])
   p = new Print()
   s.out -> p._in
 }

From c71e923906a578b5e069b14e21ee7f9b3d3b45a5 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 23 Sep 2023 16:39:59 -0700
Subject: [PATCH 0896/1114] Update action.yml

---
 .github/actions/prepare-build-env/action.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/actions/prepare-build-env/action.yml b/.github/actions/prepare-build-env/action.yml
index 682be37dbb..933bfce680 100644
--- a/.github/actions/prepare-build-env/action.yml
+++ b/.github/actions/prepare-build-env/action.yml
@@ -11,3 +11,10 @@ runs:
       uses: gradle/gradle-build-action@v2.8.0
       with:
         cache-read-only: false
+   - name: Download Gradle Wrapper and print version
+     run: |
+        # Retry 3 times before the steps actually fails
+        (echo "==== Gradle Wrapper Download Attempt: 1 ====" && ./gradlew --version) || \
+        (echo "==== Gradle Wrapper Download Attempt: 2 ====" && ./gradlew --version) || \
+        (echo "==== Gradle Wrapper Download Attempt: 3 ====" && ./gradlew --version) || \
+        (echo "==== Gradle Wrapper Download Failed ====" && exit 1)

From 43d6360489d4440672bf2699da72c4a67e747a00 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 23 Sep 2023 16:46:27 -0700
Subject: [PATCH 0897/1114] Yaml is not a programming language

---
 .github/actions/prepare-build-env/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/prepare-build-env/action.yml b/.github/actions/prepare-build-env/action.yml
index 933bfce680..b512736020 100644
--- a/.github/actions/prepare-build-env/action.yml
+++ b/.github/actions/prepare-build-env/action.yml
@@ -11,8 +11,8 @@ runs:
       uses: gradle/gradle-build-action@v2.8.0
       with:
         cache-read-only: false
-   - name: Download Gradle Wrapper and print version
-     run: |
+    - name: Download Gradle Wrapper and print version
+      run: |
         # Retry 3 times before the steps actually fails
         (echo "==== Gradle Wrapper Download Attempt: 1 ====" && ./gradlew --version) || \
         (echo "==== Gradle Wrapper Download Attempt: 2 ====" && ./gradlew --version) || \

From 02e754899c1fda83429f76f230c251ee40cf9cba Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 23 Sep 2023 16:51:07 -0700
Subject: [PATCH 0898/1114] Update action.yml

---
 .github/actions/prepare-build-env/action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/actions/prepare-build-env/action.yml b/.github/actions/prepare-build-env/action.yml
index b512736020..a626eabd19 100644
--- a/.github/actions/prepare-build-env/action.yml
+++ b/.github/actions/prepare-build-env/action.yml
@@ -18,3 +18,4 @@ runs:
         (echo "==== Gradle Wrapper Download Attempt: 2 ====" && ./gradlew --version) || \
         (echo "==== Gradle Wrapper Download Attempt: 3 ====" && ./gradlew --version) || \
         (echo "==== Gradle Wrapper Download Failed ====" && exit 1)
+      shell: bash

From 3ab626924bc8e286677e75d26b4752825218ecf1 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 23 Sep 2023 17:24:12 -0700
Subject: [PATCH 0899/1114] Add input to specify working dir

---
 .github/actions/prepare-build-env/action.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/actions/prepare-build-env/action.yml b/.github/actions/prepare-build-env/action.yml
index a626eabd19..b8104c370b 100644
--- a/.github/actions/prepare-build-env/action.yml
+++ b/.github/actions/prepare-build-env/action.yml
@@ -1,5 +1,11 @@
 name: Set up build environment
 description: Set up Java and Gradle (including caching).
+
+inputs:
+  lingua-franca-dir:
+    description: 'Path to the lingua-franca directory'
+    required: false
+
 runs:
   using: "composite"
   steps:
@@ -12,6 +18,7 @@ runs:
       with:
         cache-read-only: false
     - name: Download Gradle Wrapper and print version
+      working-directory: ${{ inputs.lingua-franca-dir }}
       run: |
         # Retry 3 times before the steps actually fails
         (echo "==== Gradle Wrapper Download Attempt: 1 ====" && ./gradlew --version) || \

From afb1718bc83008df757ea45d9b93b0b8c0fc5dea Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 23 Sep 2023 17:28:28 -0700
Subject: [PATCH 0900/1114] Update action.yml

---
 .github/actions/prepare-build-env/action.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/actions/prepare-build-env/action.yml b/.github/actions/prepare-build-env/action.yml
index b8104c370b..2c9da78679 100644
--- a/.github/actions/prepare-build-env/action.yml
+++ b/.github/actions/prepare-build-env/action.yml
@@ -17,12 +17,12 @@ runs:
       uses: gradle/gradle-build-action@v2.8.0
       with:
         cache-read-only: false
-    - name: Download Gradle Wrapper and print version
+    - name: Download Gradle and print version
       working-directory: ${{ inputs.lingua-franca-dir }}
       run: |
         # Retry 3 times before the steps actually fails
-        (echo "==== Gradle Wrapper Download Attempt: 1 ====" && ./gradlew --version) || \
-        (echo "==== Gradle Wrapper Download Attempt: 2 ====" && ./gradlew --version) || \
-        (echo "==== Gradle Wrapper Download Attempt: 3 ====" && ./gradlew --version) || \
-        (echo "==== Gradle Wrapper Download Failed ====" && exit 1)
+        (echo "==== Gradle Download Attempt: 1 ====" && ./gradlew --version) || \
+        (echo "==== Gradle Download Attempt: 2 ====" && ./gradlew --version) || \
+        (echo "==== Gradle Download Attempt: 3 ====" && ./gradlew --version) || \
+        (echo "==== Gradle Download Failed ====" && exit 1)
       shell: bash

From 50e33f0b96a2c61c1cb180cba8e40c7160bc59bf Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 23 Sep 2023 23:12:54 -0700
Subject: [PATCH 0901/1114] Bump Gradle from 8.1.1 to 8.3

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2c3425d49e..93ac3e13b9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225
+distributionUrl=https://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 05bb01869676e1d0b1701e1e66a556d8fd39eea8 Mon Sep 17 00:00:00 2001
From: Christian Menard <Christian.Menard@tu-dresden.de>
Date: Mon, 25 Sep 2023 09:47:19 +0200
Subject: [PATCH 0902/1114] Sleep between attempts

---
 .github/actions/prepare-build-env/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/prepare-build-env/action.yml b/.github/actions/prepare-build-env/action.yml
index 2c9da78679..7584d5cd27 100644
--- a/.github/actions/prepare-build-env/action.yml
+++ b/.github/actions/prepare-build-env/action.yml
@@ -22,7 +22,7 @@ runs:
       run: |
         # Retry 3 times before the steps actually fails
         (echo "==== Gradle Download Attempt: 1 ====" && ./gradlew --version) || \
-        (echo "==== Gradle Download Attempt: 2 ====" && ./gradlew --version) || \
-        (echo "==== Gradle Download Attempt: 3 ====" && ./gradlew --version) || \
+        (sleep 30 && echo "==== Gradle Download Attempt: 2 ====" && ./gradlew --version) || \
+        (sleep 30 && echo "==== Gradle Download Attempt: 3 ====" && ./gradlew --version) || \
         (echo "==== Gradle Download Failed ====" && exit 1)
       shell: bash

From da00390c33e77483fa1b3ff4b43d218dfcba9463 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 25 Sep 2023 10:04:44 +0200
Subject: [PATCH 0903/1114] bump gradle plugin versions

---
 buildSrc/build.gradle      | 2 +-
 buildSrc/gradle.properties | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 7c2d942ef8..3a0866f164 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -18,5 +18,5 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     implementation "com.diffplug.spotless:spotless-plugin-gradle:$spotlessVersion"
 
-    implementation "gradle.plugin.com.github.johnrengelman:shadow:$shadowJarVersion"
+    implementation "com.github.johnrengelman:shadow:$shadowJarVersion"
 }
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index a8cd2581d4..a6e3b64311 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -1,6 +1,6 @@
 [versions]
-spotlessVersion=6.11.0
+spotlessVersion=6.21.0
 spotlessLibVersion=2.30.0
-kotlinVersion=1.6.21
-shadowJarVersion=7.1.2
-spotbugsPluginVersion=5.1.3
\ No newline at end of file
+kotlinVersion=1.9.0
+shadowJarVersion=8.1.1
+spotbugsPluginVersion=5.1.3

From 470e8ee553d4a97cf6b44d0e653f41d887cea6ba Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 25 Sep 2023 14:11:50 +0200
Subject: [PATCH 0904/1114] Fixed error reporting bug introduced in #2006

---
 .../testFixtures/java/org/lflang/tests/LFTest.java | 14 ++++++++++----
 .../java/org/lflang/tests/TestBase.java            |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/LFTest.java b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
index e99fee4b54..1fa4184237 100644
--- a/core/src/testFixtures/java/org/lflang/tests/LFTest.java
+++ b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
@@ -39,6 +39,12 @@ public class LFTest implements Comparable<LFTest> {
   /** String builder for collecting issues encountered during test execution. */
   private final StringBuilder issues = new StringBuilder();
 
+  /** Reference to System.out for restoring the default output. */
+  private static final PrintStream out = System.out;
+
+  /** Reference to System.err for restoring the default output. */
+  private static final PrintStream err = System.err;
+
   private long executionTimeNanoseconds;
 
   /**
@@ -71,11 +77,11 @@ public void redirectOutputs() {
   }
 
   /** End output redirection. */
-  public void restoreOutputs() {
+  public static void restoreOutputs() {
     System.out.flush();
     System.err.flush();
-    System.setOut(System.out);
-    System.setErr(System.err);
+    System.setOut(out);
+    System.setErr(err);
   }
 
   /**
@@ -130,7 +136,7 @@ public boolean hasPassed() {
     return result == Result.TEST_PASS;
   }
 
-  /** Compile a string that contains all collected errors and return it. */
+  /** Print a report of all the collected errors. */
   public void reportErrors() {
     if (this.hasFailed()) {
       System.out.println(
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index ee0d72ff02..04a699068c 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -328,7 +328,7 @@ private static void checkAndReportFailures(Set<LFTest> tests) {
     var passed = tests.stream().filter(LFTest::hasPassed).toList();
     var s = new StringBuffer();
     s.append(THIN_LINE);
-    s.append("Passing: ").append(passed.size()).append("/").append(tests.size()).append("%n");
+    s.append(String.format("Passing: %d/%d%n", passed.size(), tests.size()));
     s.append(THIN_LINE);
     passed.forEach(
         test ->

From 15368c78cab1181c212e99bc6206b58c520e460a Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 25 Sep 2023 12:44:11 -0700
Subject: [PATCH 0905/1114] Incremental changes

---
 .../main/java/org/lflang/TargetConfig.java    | 13 +++----
 .../main/java/org/lflang/TargetProperty.java  | 17 +--------
 .../java/org/lflang/TargetPropertyConfig.java | 10 +++++
 .../federated/extensions/CExtensionUtils.java |  2 +-
 .../federated/generator/FedFileConfig.java    |  2 +-
 .../lflang/generator/c/CCmakeGenerator.java   |  4 +-
 .../org/lflang/generator/c/CGenerator.java    |  8 ++--
 .../lflang/target/Ros2DependenciesConfig.java |  3 +-
 .../java/org/lflang/target/TracingConfig.java | 24 +++++++++---
 .../property/type/CmakeIncludeConfig.java     | 37 +++++++++++++++++++
 .../generator/cpp/CppRos2PackageGenerator.kt  |  2 +-
 .../cpp/CppStandaloneCmakeGenerator.kt        |  2 +-
 12 files changed, 85 insertions(+), 39 deletions(-)
 create mode 100644 core/src/main/java/org/lflang/target/property/type/CmakeIncludeConfig.java

diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index ffd2c426b3..78b0d050aa 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -43,14 +43,14 @@
 import org.lflang.target.FastModeConfig;
 import org.lflang.target.KeepaliveConfig;
 import org.lflang.target.PlatformConfig;
+import org.lflang.target.Ros2DependenciesConfig;
 import org.lflang.target.SchedulerConfig;
 import org.lflang.target.TracingConfig;
-import org.lflang.target.TracingConfig.TracingOptions;
 import org.lflang.target.property.BuildCommandsConfig;
 import org.lflang.target.LoggingConfigurator.LogLevel;
-import org.lflang.target.SchedulerConfig.SchedulerOption;
 import org.lflang.target.property.ClockSyncOptionsConfig;
 import org.lflang.target.property.BuildTypeConfig;
+import org.lflang.target.property.type.CmakeIncludeConfig;
 
 /**
  * A class for keeping the current target configuration.
@@ -115,10 +115,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
       this.compiler = cliArgs.getProperty("target-compiler");
       this.setByUser.add(TargetProperty.COMPILER);
     }
-    if (cliArgs.containsKey("tracing")) {
-      this.tracing.override(new TracingOptions());
-      this.setByUser.add(TargetProperty.TRACING);
-    }
+
 
     if (cliArgs.containsKey("target-flags")) {
       this.compilerFlags.clear();
@@ -164,7 +161,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
   public BuildTypeConfig buildType = new BuildTypeConfig();
 
   /** Optional additional extensions to include in the generated CMakeLists.txt. */
-  public List<String> cmakeIncludes = new ArrayList<>();
+  public CmakeIncludeConfig cmakeIncludes = new CmakeIncludeConfig();
 
   /** The compiler to invoke, unless a build command has been specified. */
   public String compiler = "";
@@ -247,7 +244,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
   public boolean ros2 = false;
 
   /** Additional ROS2 packages that the LF program depends on. */
-  public List<String> ros2Dependencies = null;
+  public Ros2DependenciesConfig ros2Dependencies = new Ros2DependenciesConfig();
 
   /** The version of the runtime library to be used in the generated target. */
   public String runtimeVersion = null;
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index ff459ce747..c09a0979c9 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -108,17 +108,7 @@ public enum TargetProperty {
           "cmake-include",
           UnionType.FILE_OR_FILE_ARRAY,
           Arrays.asList(Target.CPP, Target.C, Target.CCPP),
-          (config) -> ASTUtils.toElement(config.cmakeIncludes),
-          (config, value, err) -> {
-              config.cmakeIncludes = ASTUtils.elementToListOfStrings(value);
-          },
-          // FIXME: This merging of lists is potentially dangerous since
-          // the incoming list of cmake-includes can belong to a .lf file that is
-          // located in a different location, and keeping just filename
-          // strings like this without absolute paths is incorrect.
-          (config, value, err) -> {
-              config.cmakeIncludes.addAll(ASTUtils.elementToListOfStrings(value));
-          }),
+          (TargetConfig config) -> config.cmakeIncludes),
       /** Directive to specify the target compiler. */
       COMPILER(
           "compiler",
@@ -304,10 +294,7 @@ public enum TargetProperty {
           "ros2-dependencies",
           ArrayType.STRING_ARRAY,
           List.of(Target.CPP),
-          (config) -> ASTUtils.toElement(config.ros2Dependencies),
-          (config, value, err) -> {
-              config.ros2Dependencies = ASTUtils.elementToListOfStrings(value);
-          }),
+          (TargetConfig config) -> config.platformOptions),
 
       /** Directive for specifying a specific version of the reactor runtime library. */
       RUNTIME_VERSION(
diff --git a/core/src/main/java/org/lflang/TargetPropertyConfig.java b/core/src/main/java/org/lflang/TargetPropertyConfig.java
index d6dcccd523..3a637d8616 100644
--- a/core/src/main/java/org/lflang/TargetPropertyConfig.java
+++ b/core/src/main/java/org/lflang/TargetPropertyConfig.java
@@ -7,6 +7,15 @@
 import org.lflang.lf.Model;
 import org.lflang.validation.ValidationReporter;
 
+/**
+ * Extend this class to manage a non-trivial target property configuration, i.e.:
+ * <ul>
+ *     <li>it requires additional validation (override {@code validate});</li>
+ *     <li>it uses elaborate datastructures (define as inner classes); or</li>
+ *     <li>it performs non-trivial updates (override {@code update}.</li>
+ * </ul>
+ * @param <T> The type of the configuration value.
+ */
 public abstract class TargetPropertyConfig<T> { //implements TargetPropertyConfigurator<T> {
 
   protected T value = initialize();
@@ -32,6 +41,7 @@ public void set(Element value, MessageReporter err) {
   }
 
   public void update(Element value, MessageReporter err) {
+    this.setByUser = true;
     this.set(value, err);
   }
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 2b622d3b46..7ae00b3608 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -292,7 +292,7 @@ public static void generateCMakeInclude(FederateInstance federate, FedFileConfig
       srcWriter.write(cmakeIncludeCode.getCode());
     }
 
-    federate.targetConfig.cmakeIncludes.add(
+    federate.targetConfig.cmakeIncludes.get().add(
         fileConfig.getSrcPath().relativize(cmakeIncludePath).toString());
     federate.targetConfig.setByUser.add(TargetProperty.CMAKE_INCLUDE);
   }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java b/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
index cb12c90a7d..8ec7776cd4 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
@@ -102,7 +102,7 @@ public void doClean() throws IOException {
   public void relativizePaths(FedTargetConfig targetConfig) {
     relativizePathList(targetConfig.protoFiles);
     relativizePathList(targetConfig.files);
-    relativizePathList(targetConfig.cmakeIncludes);
+    relativizePathList(targetConfig.cmakeIncludes.get());
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 6af1b1fc57..3deb90c18f 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -218,7 +218,7 @@ CodeBuilder generateCMakeCode(
     cMakeCode.pr("set(CMAKE_CXX_STANDARD 17)");
     cMakeCode.pr("set(CMAKE_CXX_STANDARD_REQUIRED ON)");
     cMakeCode.newLine();
-    if (!targetConfig.cmakeIncludes.isEmpty()) {
+    if (!targetConfig.cmakeIncludes.get().isEmpty()) {
       // The user might be using the non-keyword form of
       // target_link_libraries. Ideally we would detect whether they are
       // doing that, but it is easier to just always have a deprecation
@@ -401,7 +401,7 @@ CodeBuilder generateCMakeCode(
     cMakeCode.newLine();
 
     // Add the include file
-    for (String includeFile : targetConfig.cmakeIncludes) {
+    for (String includeFile : targetConfig.cmakeIncludes.get()) {
       cMakeCode.pr("include(\"" + Path.of(includeFile).getFileName() + "\")");
     }
     cMakeCode.newLine();
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index f4b1b9043f..70a2056f13 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -745,11 +745,11 @@ private void inspectReactorEResource(ReactorDecl reactor) {
         // Merge the CMake includes from the imported file into the target config
         lfResource
             .getTargetConfig()
-            .cmakeIncludes
+            .cmakeIncludes.get()
             .forEach(
                 incl -> {
-                  if (!this.targetConfig.cmakeIncludes.contains(incl)) {
-                    this.targetConfig.cmakeIncludes.add(incl);
+                  if (!this.targetConfig.cmakeIncludes.get().contains(incl)) {
+                    this.targetConfig.cmakeIncludes.get().add(incl);
                   }
                 });
       }
@@ -770,7 +770,7 @@ protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
     var destination = this.fileConfig.getSrcGenPath();
 
     FileUtil.copyFilesOrDirectories(
-        targetConfig.cmakeIncludes, destination, fileConfig, messageReporter, true);
+        targetConfig.cmakeIncludes.get(), destination, fileConfig, messageReporter, true);
 
     // FIXME: Unclear what the following does, but it does not appear to belong here.
     if (!StringExtensions.isNullOrEmpty(targetConfig.fedSetupPreamble)) {
diff --git a/core/src/main/java/org/lflang/target/Ros2DependenciesConfig.java b/core/src/main/java/org/lflang/target/Ros2DependenciesConfig.java
index 176cc3d6bc..c8fb599a85 100644
--- a/core/src/main/java/org/lflang/target/Ros2DependenciesConfig.java
+++ b/core/src/main/java/org/lflang/target/Ros2DependenciesConfig.java
@@ -1,5 +1,6 @@
 package org.lflang.target;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.lflang.MessageReporter;
@@ -18,7 +19,7 @@ public class Ros2DependenciesConfig extends TargetPropertyConfig<List<String>> {
 
     @Override
     public List<String> initialize() {
-        return null; // FIXME
+        return new ArrayList<>();
     }
 
     @Override
diff --git a/core/src/main/java/org/lflang/target/TracingConfig.java b/core/src/main/java/org/lflang/target/TracingConfig.java
index 926291e348..cee56c3ddd 100644
--- a/core/src/main/java/org/lflang/target/TracingConfig.java
+++ b/core/src/main/java/org/lflang/target/TracingConfig.java
@@ -1,6 +1,7 @@
 package org.lflang.target;
 
 import java.util.Objects;
+import java.util.Properties;
 
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
@@ -24,12 +25,21 @@ public class TracingConfig extends TargetPropertyConfig<TracingOptions> {
 
     @Override
     public TracingOptions initialize() {
-        return new TracingOptions();
+        return new TracingOptions(false);
+    }
+
+    @Override
+    public void update(Properties cliArgs) {
+        super.update(cliArgs);
+        var key = TargetProperty.TRACING.toString();
+        if (cliArgs.containsKey(key)) {
+            this.value.enabled = true;
+        }
     }
 
     @Override
     public TracingOptions parse(Element value) {
-        var options = new TracingOptions();
+        var options = new TracingOptions(false);
         if (value.getLiteral() != null) {
             if (!ASTUtils.toBoolean(value)) {
                 options.enabled = false;
@@ -72,9 +82,9 @@ public void validate(KeyValuePair pair, Model ast, TargetConfig config, Validati
 
     @Override
     public Element export() {
-        if (this.value.isEnabled()) {
+        if (!this.value.isEnabled()) {
             return null;
-        } else if (this.value.equals(new TracingOptions())) {
+        } else if (this.value.equals(new TracingOptions(true))) {
             // default values
             return ASTUtils.toElement(true);
         } else {
@@ -103,7 +113,11 @@ public Element export() {
     /** Settings related to tracing options. */
     public static class TracingOptions {
 
-        protected boolean enabled = true;
+        protected boolean enabled = false;
+
+        TracingOptions(boolean enabled) {
+            this.enabled = enabled;
+        }
 
         /**
          * The name to use as the root of the trace file produced. This defaults to the name of the .lf
diff --git a/core/src/main/java/org/lflang/target/property/type/CmakeIncludeConfig.java b/core/src/main/java/org/lflang/target/property/type/CmakeIncludeConfig.java
new file mode 100644
index 0000000000..ebfac71d55
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/type/CmakeIncludeConfig.java
@@ -0,0 +1,37 @@
+package org.lflang.target.property.type;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.lflang.MessageReporter;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+
+public class CmakeIncludeConfig extends TargetPropertyConfig<List<String>> {
+
+    @Override
+    public List<String> initialize() {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public void update(Element value, MessageReporter err) {
+        super.update(value, err);
+        // FIXME: This merging of lists is potentially dangerous since
+        // the incoming list of cmake-includes can belong to a .lf file that is
+        // located in a different location, and keeping just filename
+        // strings like this without absolute paths is incorrect.
+        this.value.addAll(ASTUtils.elementToListOfStrings(value));
+    }
+
+    @Override
+    protected List<String> parse(Element value) {
+        return ASTUtils.elementToListOfStrings(value);
+    }
+
+    @Override
+    public Element export() {
+        return ASTUtils.toElement(this.value);
+    }
+}
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
index d49ed3d2b6..aaca9b4378 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
@@ -47,7 +47,7 @@ class CppRos2PackageGenerator(generator: CppGenerator, private val nodeName: Str
 
     fun generatePackageCmake(sources: List<Path>): String {
         // Resolve path to the cmake include files if any was provided
-        val includeFiles = targetConfig.cmakeIncludes?.map { fileConfig.srcPath.resolve(it).toUnixString() }
+        val includeFiles = targetConfig.cmakeIncludes.get()?.map { fileConfig.srcPath.resolve(it).toUnixString() }
 
         return with(PrependOperator) {
             with(CppGenerator) {
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
index c64ef9b47f..86f3486cb1 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
@@ -133,7 +133,7 @@ class CppStandaloneCmakeGenerator(private val targetConfig: TargetConfig, privat
 
     fun generateCmake(sources: List<Path>): String {
         // Resolve path to the cmake include files if any was provided
-        val includeFiles = targetConfig.cmakeIncludes?.map { fileConfig.srcPath.resolve(it).toUnixString() }
+        val includeFiles = targetConfig.cmakeIncludes.get()?.map { fileConfig.srcPath.resolve(it).toUnixString() }
 
         val reactorCppTarget = when {
             targetConfig.externalRuntimePath != null -> "reactor-cpp"

From 6d2ce1c18243526f88ee34f93d05dbe645cf6218 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Fri, 22 Sep 2023 11:07:15 +0200
Subject: [PATCH 0906/1114] Use the actual reaction name in the reaction
 instance

---
 .../java/org/lflang/generator/ReactionInstance.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/ReactionInstance.java b/core/src/main/java/org/lflang/generator/ReactionInstance.java
index fc1325e51d..385dbd6da8 100644
--- a/core/src/main/java/org/lflang/generator/ReactionInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactionInstance.java
@@ -29,6 +29,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+import org.eclipse.xtext.xbase.lib.StringExtensions;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Action;
@@ -352,14 +353,20 @@ public List<TimeValue> getInferredDeadlinesList() {
   }
 
   /**
-   * Return the name of this reaction, which is 'reaction_n', where n is replaced by the reaction
-   * index.
+   * Return the name of this reaction.
+   *
+   * <p>If the reaction is not named, this returns 'reaction_n', where n is replaced by the reaction
+   * index + 1.
    *
    * @return The name of this reaction.
    */
   @Override
   public String getName() {
-    return "reaction_" + this.index;
+    if (StringExtensions.isNullOrEmpty(getDefinition().getName())) {
+      return "reaction_" + (this.index + 1);
+    } else {
+      return getDefinition().getName();
+    }
   }
 
   /**

From 62f6d29d97a70c5e8336b7d83ef345d8aa2b33c3 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 26 Sep 2023 21:39:41 -0700
Subject: [PATCH 0907/1114] More refactoring

---
 cli/lfc/src/main/java/org/lflang/cli/Lfc.java |   2 +-
 .../lflang/tests/runtime/CSchedulerTest.java  |   2 +-
 .../lflang/tests/runtime/CVerifierTest.java   |   2 +-
 .../main/java/org/lflang/TargetConfig.java    | 134 +++--
 .../main/java/org/lflang/TargetProperty.java  | 544 +++---------------
 .../java/org/lflang/TargetPropertyConfig.java |  48 +-
 .../main/java/org/lflang/ast/ASTUtils.java    |   2 +-
 .../federated/extensions/CExtension.java      |   2 +-
 .../federated/extensions/CExtensionUtils.java |  30 +-
 .../extensions/FedTargetExtension.java        |   2 +-
 .../federated/extensions/PythonExtension.java |   2 +-
 .../federated/extensions/TSExtension.java     |   2 +-
 .../federated/generator/FedASTUtils.java      |   2 +-
 .../federated/generator/FedFileConfig.java    |   4 +-
 .../federated/generator/FedGenerator.java     |   4 +-
 .../launcher/FedLauncherGenerator.java        |   2 +-
 .../org/lflang/generator/GeneratorUtils.java  |   2 +-
 .../org/lflang/generator/LFGenerator.java     |   2 +-
 .../lflang/generator/c/CCmakeGenerator.java   |   6 +-
 .../org/lflang/generator/c/CCompiler.java     |  14 +-
 .../org/lflang/generator/c/CGenerator.java    |  40 +-
 .../generator/c/CMainFunctionGenerator.java   |   8 +-
 .../generator/c/CPreambleGenerator.java       |  14 +-
 .../generator/c/CTriggerObjectsGenerator.java |   4 +-
 .../generator/python/PythonGenerator.java     |   8 +-
 .../generator/rust/CargoDependencySpec.java   |  10 +-
 .../generator/rust/RustTargetConfig.java      |  61 +-
 .../lflang/target/LoggingConfigurator.java    |  23 -
 .../lflang/target/property/AuthProperty.java  |  16 +
 .../property/BuildCommandsProperty.java       |  40 ++
 ...TypeConfig.java => BuildTypeProperty.java} |  14 +-
 .../property/CargoDependenciesProperty.java   |  57 ++
 .../property/CargoFeaturesProperty.java       |  15 +
 .../ClockSyncModeProperty.java}               |  27 +-
 ...fig.java => ClockSyncOptionsProperty.java} |  19 +-
 ...eConfig.java => CmakeIncludeProperty.java} |  16 +-
 .../property/CompileDefinitionsConfig.java    |  38 ++
 .../property/CompilerFlagsProperty.java       |  15 +
 .../CoordinationModeProperty.java}            |  19 +-
 .../CoordinationOptionsProperty.java}         |  21 +-
 .../DefaultBooleanProperty.java}              |  14 +-
 .../property/DefaultFileListProperty.java     |  39 ++
 .../target/property/DefaultStringConfig.java  |  33 ++
 ...ig.java => DefaultStringListProperty.java} |  11 +-
 .../DockerProperty.java}                      |  21 +-
 .../ExportDependencyGraphProperty.java        |  14 +
 .../target/property/ExportToYamlProperty.java |  14 +
 .../property/ExternalRuntimePathConfig.java   |  14 +
 .../FastProperty.java}                        |  28 +-
 .../lflang/target/property/FilesProperty.java |  14 +
 .../KeepaliveProperty.java}                   |  30 +-
 .../target/property/LoggingProperty.java      |  58 ++
 .../target/property/NoCompileProperty.java    |  15 +
 .../property/NoRuntimeValidationProperty.java |  14 +
 .../PlatformProperty.java}                    |  18 +-
 .../property/PrintStatisticsProperty.java     |  14 +
 .../target/property/ProtobufsProperty.java    |  14 +
 .../Ros2DependenciesProperty.java}            |  16 +-
 .../lflang/target/property/Ros2Property.java  |  14 +
 .../property/RuntimeVersionProperty.java      |  13 +
 .../target/property/RustIncludeProperty.java  |  97 ++++
 .../SchedulerProperty.java}                   |  20 +-
 .../property/SingleFileProjectProperty.java   |  14 +
 .../target/property/ThreadingProperty.java    |  19 +
 .../target/property/TimeOutProperty.java      |  39 ++
 .../TracingProperty.java}                     |  18 +-
 .../target/property/VerifyProperty.java       |  15 +
 .../target/property/WorkersProperty.java      |  37 ++
 .../target/property/type/ArrayType.java       |  12 +-
 .../target/property/type/CompilerConfig.java  |  14 +
 .../target/property/type/DictionaryType.java  |  26 +-
 .../target/property/type/PrimitiveType.java   |  26 +-
 .../property/type/StringDictionaryType.java   |  12 +-
 .../property/type/TargetPropertyType.java     |  17 +-
 .../target/property/type/UnionType.java       |  25 +-
 .../org/lflang/validation/LFValidator.java    |  15 +-
 .../lflang/validation/ValidationReporter.java |   1 +
 .../validation/ValidatorMessageReporter.java  |   3 +
 .../org/lflang/generator/cpp/CppExtensions.kt |   2 +-
 .../org/lflang/generator/cpp/CppGenerator.kt  |   9 +-
 .../generator/cpp/CppPlatformGenerator.kt     |   4 +-
 .../generator/cpp/CppRos2NodeGenerator.kt     |   2 +-
 .../generator/cpp/CppRos2PackageGenerator.kt  |   2 +-
 .../cpp/CppStandaloneCmakeGenerator.kt        |   6 +-
 .../org/lflang/generator/rust/RustModel.kt    |   2 +-
 .../java/org/lflang/tests/Configurators.java  |   8 +-
 86 files changed, 1225 insertions(+), 901 deletions(-)
 delete mode 100644 core/src/main/java/org/lflang/target/LoggingConfigurator.java
 create mode 100644 core/src/main/java/org/lflang/target/property/AuthProperty.java
 create mode 100644 core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
 rename core/src/main/java/org/lflang/target/property/{BuildTypeConfig.java => BuildTypeProperty.java} (72%)
 create mode 100644 core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
 create mode 100644 core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
 rename core/src/main/java/org/lflang/target/{ClockSyncModeConfig.java => property/ClockSyncModeProperty.java} (76%)
 rename core/src/main/java/org/lflang/target/property/{ClockSyncOptionsConfig.java => ClockSyncOptionsProperty.java} (92%)
 rename core/src/main/java/org/lflang/target/property/{type/CmakeIncludeConfig.java => CmakeIncludeProperty.java} (69%)
 create mode 100644 core/src/main/java/org/lflang/target/property/CompileDefinitionsConfig.java
 create mode 100644 core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
 rename core/src/main/java/org/lflang/target/{CoordinationModeConfig.java => property/CoordinationModeProperty.java} (69%)
 rename core/src/main/java/org/lflang/target/{CoordinationOptionsConfig.java => property/CoordinationOptionsProperty.java} (87%)
 rename core/src/main/java/org/lflang/target/{AuthConfig.java => property/DefaultBooleanProperty.java} (53%)
 create mode 100644 core/src/main/java/org/lflang/target/property/DefaultFileListProperty.java
 create mode 100644 core/src/main/java/org/lflang/target/property/DefaultStringConfig.java
 rename core/src/main/java/org/lflang/target/property/{BuildCommandsConfig.java => DefaultStringListProperty.java} (61%)
 rename core/src/main/java/org/lflang/target/{DockerConfig.java => property/DockerProperty.java} (89%)
 create mode 100644 core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
 create mode 100644 core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
 create mode 100644 core/src/main/java/org/lflang/target/property/ExternalRuntimePathConfig.java
 rename core/src/main/java/org/lflang/target/{FastModeConfig.java => property/FastProperty.java} (77%)
 create mode 100644 core/src/main/java/org/lflang/target/property/FilesProperty.java
 rename core/src/main/java/org/lflang/target/{KeepaliveConfig.java => property/KeepaliveProperty.java} (61%)
 create mode 100644 core/src/main/java/org/lflang/target/property/LoggingProperty.java
 create mode 100644 core/src/main/java/org/lflang/target/property/NoCompileProperty.java
 create mode 100644 core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
 rename core/src/main/java/org/lflang/target/{PlatformConfig.java => property/PlatformProperty.java} (95%)
 create mode 100644 core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
 create mode 100644 core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
 rename core/src/main/java/org/lflang/target/{Ros2DependenciesConfig.java => property/Ros2DependenciesProperty.java} (73%)
 create mode 100644 core/src/main/java/org/lflang/target/property/Ros2Property.java
 create mode 100644 core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
 create mode 100644 core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
 rename core/src/main/java/org/lflang/target/{SchedulerConfig.java => property/SchedulerProperty.java} (90%)
 create mode 100644 core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
 create mode 100644 core/src/main/java/org/lflang/target/property/ThreadingProperty.java
 create mode 100644 core/src/main/java/org/lflang/target/property/TimeOutProperty.java
 rename core/src/main/java/org/lflang/target/{TracingConfig.java => property/TracingProperty.java} (91%)
 create mode 100644 core/src/main/java/org/lflang/target/property/VerifyProperty.java
 create mode 100644 core/src/main/java/org/lflang/target/property/WorkersProperty.java
 create mode 100644 core/src/main/java/org/lflang/target/property/type/CompilerConfig.java

diff --git a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
index eb30503aca..82b1979c16 100644
--- a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
+++ b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
@@ -50,7 +50,7 @@ public class Lfc extends CliBase {
       description = "Clean before building.")
   private boolean clean;
 
-  @Option(names = "--target-compiler", description = "Target compiler to invoke.")
+  @Option(names = "--compiler", description = "Target compiler to invoke.")
   private String targetCompiler;
 
   @Option(
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
index f6032227f8..09a11faa6f 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
@@ -3,7 +3,7 @@
 import java.util.EnumSet;
 import org.junit.jupiter.api.Test;
 import org.lflang.Target;
-import org.lflang.target.SchedulerConfig.SchedulerOption;
+import org.lflang.target.property.SchedulerProperty.SchedulerOption;
 import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry.TestCategory;
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
index d9bde8b3ed..4ac734d314 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
@@ -21,7 +21,7 @@ public void runVerifierTests() {
         Message.DESC_VERIFIER,
         TestRegistry.TestCategory.VERIFIER::equals,
         test -> {
-          test.getContext().getTargetConfig().verify = true;
+          test.getContext().getTargetConfig().verify.override(true);
           return true;
         },
         TestLevel.BUILD,
diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index 78b0d050aa..cfa95768ec 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -25,32 +25,50 @@
 package org.lflang;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+
 import org.lflang.generator.LFGeneratorContext.BuildParm;
 import org.lflang.generator.rust.RustTargetConfig;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.TargetDecl;
-import org.lflang.target.AuthConfig;
-import org.lflang.target.ClockSyncModeConfig;
-import org.lflang.target.CoordinationModeConfig;
-import org.lflang.target.CoordinationOptionsConfig;
-import org.lflang.target.DockerConfig;
-import org.lflang.target.FastModeConfig;
-import org.lflang.target.KeepaliveConfig;
-import org.lflang.target.PlatformConfig;
-import org.lflang.target.Ros2DependenciesConfig;
-import org.lflang.target.SchedulerConfig;
-import org.lflang.target.TracingConfig;
-import org.lflang.target.property.BuildCommandsConfig;
-import org.lflang.target.LoggingConfigurator.LogLevel;
-import org.lflang.target.property.ClockSyncOptionsConfig;
-import org.lflang.target.property.BuildTypeConfig;
-import org.lflang.target.property.type.CmakeIncludeConfig;
+import org.lflang.target.property.AuthProperty;
+import org.lflang.target.property.ClockSyncModeProperty;
+import org.lflang.target.property.CoordinationModeProperty;
+import org.lflang.target.property.CoordinationOptionsProperty;
+import org.lflang.target.property.DockerProperty;
+import org.lflang.target.property.FastProperty;
+import org.lflang.target.property.KeepaliveProperty;
+import org.lflang.target.property.PlatformProperty;
+import org.lflang.target.property.Ros2DependenciesProperty;
+import org.lflang.target.property.SchedulerProperty;
+import org.lflang.target.property.LoggingProperty;
+import org.lflang.target.property.LoggingProperty.LogLevel;
+import org.lflang.target.property.TracingProperty;
+import org.lflang.target.property.BuildCommandsProperty;
+import org.lflang.target.property.ClockSyncOptionsProperty;
+import org.lflang.target.property.BuildTypeProperty;
+import org.lflang.target.property.CompilerFlagsProperty;
+import org.lflang.target.property.ExportDependencyGraphProperty;
+import org.lflang.target.property.ExportToYamlProperty;
+import org.lflang.target.property.FilesProperty;
+import org.lflang.target.property.NoCompileProperty;
+import org.lflang.target.property.NoRuntimeValidationProperty;
+import org.lflang.target.property.PrintStatisticsProperty;
+import org.lflang.target.property.ProtobufsProperty;
+import org.lflang.target.property.Ros2Property;
+import org.lflang.target.property.RuntimeVersionProperty;
+import org.lflang.target.property.SingleFileProjectProperty;
+import org.lflang.target.property.ThreadingProperty;
+import org.lflang.target.property.TimeOutProperty;
+import org.lflang.target.property.WorkersProperty;
+import org.lflang.target.property.CmakeIncludeProperty;
+import org.lflang.target.property.type.CompileDefinitionsConfig;
+import org.lflang.target.property.type.CompilerConfig;
+import org.lflang.target.property.type.ExternalRuntimePathConfig;
+import org.lflang.target.property.type.VerifyProperty;
 
 /**
  * A class for keeping the current target configuration.
@@ -88,6 +106,8 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
       TargetProperty.set(this, pairs != null ? pairs : List.of(), messageReporter);
     }
 
+    // FIXME: work these into the TargetProperty.set call above.
+
     if (cliArgs != null) {
       TargetProperty.override(this, cliArgs, messageReporter);
     }
@@ -111,11 +131,6 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
       this.threading = Boolean.parseBoolean(cliArgs.getProperty("threading"));
       this.setByUser.add(TargetProperty.THREADING);
     }
-    if (cliArgs.containsKey("target-compiler")) {
-      this.compiler = cliArgs.getProperty("target-compiler");
-      this.setByUser.add(TargetProperty.COMPILER);
-    }
-
 
     if (cliArgs.containsKey("target-flags")) {
       this.compilerFlags.clear();
@@ -147,24 +162,24 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
    * designated compiler. A common usage of this target property is to set the command to build on
    * the basis of a Makefile.
    */
-  public BuildCommandsConfig buildCommands = new BuildCommandsConfig();
+  public BuildCommandsProperty buildCommands = new BuildCommandsProperty();
 
   /**
    * The mode of clock synchronization to be used in federated programs. The default is 'initial'.
    */
-  public final ClockSyncModeConfig clockSync = new ClockSyncModeConfig();
+  public final ClockSyncModeProperty clockSync = new ClockSyncModeProperty();
 
   /** Clock sync options. */
-  public final ClockSyncOptionsConfig clockSyncOptions = new ClockSyncOptionsConfig();
+  public final ClockSyncOptionsProperty clockSyncOptions = new ClockSyncOptionsProperty();
 
   /** Parameter passed to cmake. The default is 'Release'. */
-  public BuildTypeConfig buildType = new BuildTypeConfig();
+  public BuildTypeProperty buildType = new BuildTypeProperty();
 
   /** Optional additional extensions to include in the generated CMakeLists.txt. */
-  public CmakeIncludeConfig cmakeIncludes = new CmakeIncludeConfig();
+  public CmakeIncludeProperty cmakeIncludes = new CmakeIncludeProperty();
 
   /** The compiler to invoke, unless a build command has been specified. */
-  public String compiler = "";
+  public CompilerConfig compiler = new CompilerConfig();
 
   /** Additional sources to add to the compile command if appropriate. */
   public List<String> compileAdditionalSources = new ArrayList<>();
@@ -175,55 +190,55 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
    * <p>The first string is the definition itself, and the second string is the value to attribute
    * to that definition, if any. The second value could be left empty.
    */
-  public Map<String, String> compileDefinitions = new HashMap<>();
+  public CompileDefinitionsConfig compileDefinitions = new CompileDefinitionsConfig();
 
   /** Flags to pass to the compiler, unless a build command has been specified. */
-  public List<String> compilerFlags = new ArrayList<>();
+  public CompilerFlagsProperty compilerFlags = new CompilerFlagsProperty();
 
   /**
    * The type of coordination used during the execution of a federated program. The default is
    * 'centralized'.
    */
-  public CoordinationModeConfig coordination = new CoordinationModeConfig();
+  public CoordinationModeProperty coordination = new CoordinationModeProperty();
 
   /** Docker options. */
-  public DockerConfig dockerOptions = new DockerConfig();
+  public DockerProperty dockerOptions = new DockerProperty();
 
   /** Coordination options. */
-  public CoordinationOptionsConfig coordinationOptions = new CoordinationOptionsConfig();
+  public CoordinationOptionsProperty coordinationOptions = new CoordinationOptionsProperty();
 
   /** Link to an external runtime library instead of the default one. */
-  public String externalRuntimePath = null;
+  public ExternalRuntimePathConfig externalRuntimePath = new ExternalRuntimePathConfig();
 
   /**
    * If true, configure the execution environment such that it does not wait for physical time to
    * match logical time. The default is false.
    */
-  public FastModeConfig fastMode = new FastModeConfig();
+  public FastProperty fastMode = new FastProperty();
 
   /** List of files to be copied to src-gen. */
-  public List<String> files = new ArrayList<>();
+  public FilesProperty files = new FilesProperty();
 
   /**
    * If true, configure the execution environment to keep executing if there are no more events on
    * the event queue. The default is false.
    */
-  public KeepaliveConfig keepalive = new KeepaliveConfig();
+  public KeepaliveProperty keepalive = new KeepaliveProperty();
 
   /** The level of logging during execution. The default is INFO. */
-  public LogLevel logLevel = LogLevel.INFO;
+  public LoggingProperty logLevel = new LoggingProperty();
 
   /** Flags to pass to the linker, unless a build command has been specified. */
   public String linkerFlags = "";
 
   /** If true, do not invoke the target compiler or build command. The default is false. */
-  public boolean noCompile = false;
+  public NoCompileProperty noCompile = new NoCompileProperty();
 
   /** If true, do not perform runtime validation. The default is false. */
-  public boolean noRuntimeValidation = false;
+  public NoRuntimeValidationProperty noRuntimeValidation = new NoRuntimeValidationProperty();
 
   /** If true, check the generated verification model. The default is false. */
-  public boolean verify = false;
+  public VerifyProperty verify = new VerifyProperty();
 
   /**
    * Set the target platform config. This tells the build system what platform-specific support
@@ -232,46 +247,46 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
    * <p>This is now a wrapped class to account for overloaded definitions of defining platform
    * (either a string or dictionary of values)
    */
-  public PlatformConfig platformOptions = new PlatformConfig();
+  public PlatformProperty platformOptions = new PlatformProperty();
 
   /** If true, instruct the runtime to collect and print execution statistics. */
-  public boolean printStatistics = false;
+  public PrintStatisticsProperty printStatistics = new PrintStatisticsProperty();
 
   /** List of proto files to be processed by the code generator. */
-  public List<String> protoFiles = new ArrayList<>();
+  public ProtobufsProperty protoFiles = new ProtobufsProperty();
 
   /** If true, generate ROS2 specific code. */
-  public boolean ros2 = false;
+  public Ros2Property ros2 = new Ros2Property();
 
   /** Additional ROS2 packages that the LF program depends on. */
-  public Ros2DependenciesConfig ros2Dependencies = new Ros2DependenciesConfig();
+  public Ros2DependenciesProperty ros2Dependencies = new Ros2DependenciesProperty();
 
   /** The version of the runtime library to be used in the generated target. */
-  public String runtimeVersion = null;
+  public RuntimeVersionProperty runtimeVersion = new RuntimeVersionProperty();
 
   /** Whether all reactors are to be generated into a single target language file. */
-  public boolean singleFileProject = false;
+  public SingleFileProjectProperty singleFileProject = new SingleFileProjectProperty();
 
   /** What runtime scheduler to use. */
-  public SchedulerConfig schedulerType = new SchedulerConfig();
+  public SchedulerProperty schedulerType = new SchedulerProperty();
 
   /**
    * The number of worker threads to deploy. The default is zero, which indicates that the runtime
    * is allowed to freely choose the number of workers.
    */
-  public int workers = 0;
+  public WorkersProperty workers = new WorkersProperty();
 
   /** Indicate whether HMAC authentication is used. */
-  public AuthConfig auth = new AuthConfig();
+  public AuthProperty auth = new AuthProperty();
 
   /** Indicate whether the runtime should use multithreaded execution. */
-  public boolean threading = true;
+  public ThreadingProperty threading = new ThreadingProperty();
 
   /** The timeout to be observed during execution of the program. */
-  public TimeValue timeout;
+  public TimeOutProperty timeout = new TimeOutProperty();
 
   /** If non-null, configure the runtime environment to perform tracing. The default is null. */
-  public TracingConfig tracing = new TracingConfig();
+  public TracingProperty tracing = new TracingProperty();
 
   /**
    * If true, the resulting binary will output a graph visualizing all reaction dependencies.
@@ -279,7 +294,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
    * <p>This option is currently only used for C++ and Rust. This export function is a valuable tool
    * for debugging LF programs and helps to understand the dependencies inferred by the runtime.
    */
-  public boolean exportDependencyGraph = false;
+  public ExportDependencyGraphProperty exportDependencyGraph = new ExportDependencyGraphProperty();
 
   /**
    * If true, the resulting binary will output a yaml file describing the whole reactor structure of
@@ -288,7 +303,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
    * <p>This option is currently only used for C++. This export function is a valuable tool for
    * debugging LF programs and performing external analysis.
    */
-  public boolean exportToYaml = false;
+  public ExportToYamlProperty exportToYaml = new ExportToYamlProperty();
 
   /** Rust-specific configuration. */
   public final RustTargetConfig rust =
@@ -297,9 +312,4 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
   /** Path to a C file used by the Python target to setup federated execution. */
   public String fedSetupPreamble = null; // FIXME: https://issue.lf-lang.org/1558
 
-
-
-
-
-
 }
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index c09a0979c9..11a9f44253 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -36,21 +36,14 @@
 import org.lflang.generator.InvalidLfSourceException;
 import org.lflang.generator.rust.CargoDependencySpec;
 import org.lflang.generator.rust.CargoDependencySpec.CargoDependenciesPropertyType;
-import org.lflang.lf.Array;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.Model;
 import org.lflang.lf.TargetDecl;
-import org.lflang.target.LoggingConfigurator.LogLevel;
-import org.lflang.target.property.type.ArrayType;
-import org.lflang.target.property.type.DictionaryType;
-import org.lflang.target.property.type.StringDictionaryType;
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.target.property.type.PrimitiveType;
-import org.lflang.target.property.type.UnionType;
-import org.lflang.util.FileUtil;
 import org.lflang.util.StringUtil;
 import org.lflang.validation.ValidationReporter;
 
@@ -61,42 +54,22 @@
  * @author Marten Lohstroh
  */
 public enum TargetProperty {
-  /** Directive to allow including OpenSSL libraries and process HMAC authentication. */
-      AUTH(
-          "auth",
-          PrimitiveType.BOOLEAN,
-          Arrays.asList(Target.C, Target.CCPP),
-          (TargetConfig config) -> config.auth),
-
-      /** Directive to let the generator use the custom build command. */
-      BUILD(
-          "build",
-          UnionType.STRING_OR_STRING_ARRAY,
-          Arrays.asList(Target.C, Target.CCPP),
-          (TargetConfig config) -> config.buildCommands),
+
+    /** Directive to allow including OpenSSL libraries and process HMAC authentication. */
+    AUTH(config -> config.auth),
+  /** Directive to let the generator use the custom build command. */
+  BUILD(config -> config.buildCommands),
 
       /**
        * Directive to specify the target build type such as 'Release' or 'Debug'. This is also used in
        * the Rust target to select a Cargo profile.
        */
-      BUILD_TYPE(
-          "build-type",
-          UnionType.BUILD_TYPE_UNION,
-          Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Rust),
-          (TargetConfig config) -> config.buildType),
+      BUILD_TYPE(config -> config.buildType),
 
       /** Directive to let the federate execution handle clock synchronization in software. */
-      CLOCK_SYNC(
-          "clock-sync",
-          UnionType.CLOCK_SYNC_UNION,
-          Arrays.asList(Target.C, Target.CCPP, Target.Python),
-          (TargetConfig config) -> config.clockSync),
+      CLOCK_SYNC(config -> config.clockSync),
       /** Key-value pairs giving options for clock synchronization. */
-      CLOCK_SYNC_OPTIONS(
-          "clock-sync-options",
-          DictionaryType.CLOCK_SYNC_OPTION_DICT,
-          Arrays.asList(Target.C, Target.CCPP, Target.Python),
-          (TargetConfig config) -> config.clockSyncOptions),
+      CLOCK_SYNC_OPTIONS(config -> config.clockSyncOptions),
 
       /**
        * Directive to specify a cmake to be included by the generated build systems.
@@ -104,292 +77,106 @@ public enum TargetProperty {
        * <p>This gives full control over the C/C++ build as any cmake parameters can be adjusted in the
        * included file.
        */
-      CMAKE_INCLUDE(
-          "cmake-include",
-          UnionType.FILE_OR_FILE_ARRAY,
-          Arrays.asList(Target.CPP, Target.C, Target.CCPP),
-          (TargetConfig config) -> config.cmakeIncludes),
+      CMAKE_INCLUDE(config -> config.cmakeIncludes),
       /** Directive to specify the target compiler. */
-      COMPILER(
-          "compiler",
-          PrimitiveType.STRING,
-          Target.ALL,
-          (config) -> ASTUtils.toElement(config.compiler),
-          (config, value, err) -> {
-              config.compiler = ASTUtils.elementToSingleString(value);
-          }),
-
+      COMPILER(config -> config.compiler),
       /** Directive to specify compile-time definitions. */
-      COMPILE_DEFINITIONS(
-          "compile-definitions",
-          StringDictionaryType.COMPILE_DEFINITION,
-          Arrays.asList(Target.C, Target.CCPP, Target.Python),
-          (config) -> ASTUtils.toElement(config.compileDefinitions),
-          (config, value, err) -> {
-              config.compileDefinitions = ASTUtils.elementToStringMaps(value);
-          }),
-
+      COMPILE_DEFINITIONS(config -> config.compileDefinitions),
       /**
        * Directive to generate a Dockerfile. This is either a boolean, true or false, or a dictionary of
        * options.
        */
-      DOCKER(
-          "docker",
-          UnionType.DOCKER_UNION,
-          Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS),
-          (TargetConfig config) -> config.dockerOptions),
+    /** Directive to specify the coordination mode */
+    COORDINATION(config -> config.coordination),
+    /** Key-value pairs giving options for clock synchronization. */
+    COORDINATION_OPTIONS(config -> config.coordinationOptions),
 
+    DOCKER(config -> config.dockerOptions),
       /** Directive for specifying a path to an external runtime to be used for the compiled binary. */
-      EXTERNAL_RUNTIME_PATH(
-          "external-runtime-path",
-          PrimitiveType.STRING,
-          List.of(Target.CPP),
-          (config) -> ASTUtils.toElement(config.externalRuntimePath),
-          (config, value, err) -> {
-              config.externalRuntimePath = ASTUtils.elementToSingleString(value);
-          }),
-
+      EXTERNAL_RUNTIME_PATH(config -> config.externalRuntimePath),
       /**
        * Directive to let the execution engine allow logical time to elapse faster than physical time.
        */
-      FAST(
-          "fast",
-          PrimitiveType.BOOLEAN,
-          Target.ALL,
-          (TargetConfig config) -> config.fastMode),
+      FAST(config -> config.fastMode),
       /**
        * Directive to stage particular files on the class path to be processed by the code generator.
        */
-      FILES(
-          "files",
-          UnionType.FILE_OR_FILE_ARRAY,
-          List.of(Target.C, Target.CCPP, Target.Python),
-          (config) -> ASTUtils.toElement(config.files),
-          (config, value, err) -> {
-              config.files = ASTUtils.elementToListOfStrings(value);
-          },
-          (config, value, err) -> {
-              config.files.addAll(ASTUtils.elementToListOfStrings(value));
-          }),
+      FILES(config -> config.files),
 
       /** Flags to be passed on to the target compiler. */
-      FLAGS(
-          "flags",
-          UnionType.STRING_OR_STRING_ARRAY,
-          Arrays.asList(Target.C, Target.CCPP),
-          (config) -> ASTUtils.toElement(config.compilerFlags),
-          (config, value, err) -> {
-              config.compilerFlags = ASTUtils.elementToListOfStrings(value);
-          }),
-
-      /** Directive to specify the coordination mode */
-      COORDINATION(
-          "coordination",
-          UnionType.COORDINATION_UNION,
-          Arrays.asList(Target.C, Target.CCPP, Target.Python),
-          (TargetConfig config) -> config.coordination),
-      /** Key-value pairs giving options for clock synchronization. */
-      COORDINATION_OPTIONS(
-          "coordination-options",
-          DictionaryType.COORDINATION_OPTION_DICT,
-          Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS),
-          (TargetConfig config) -> config.coordinationOptions),
+      FLAGS(config -> config.compilerFlags),
 
       /**
        * Directive to let the execution engine remain active also if there are no more events in the
        * event queue.
        */
-      KEEPALIVE(
-          "keepalive",
-          PrimitiveType.BOOLEAN,
-          Target.ALL,
-          (TargetConfig config) -> config.keepalive),
+      KEEPALIVE(config -> config.keepalive),
 
       /** Directive to specify the grain at which to report log messages during execution. */
-      LOGGING(
-          "logging",
-          UnionType.LOGGING_UNION,
-          Target.ALL,
-          (config) -> ASTUtils.toElement(config.logLevel.toString()),
-          (config, value, err) -> {
-              config.logLevel =
-                  (LogLevel) UnionType.LOGGING_UNION.forName(ASTUtils.elementToSingleString(value));
-          }),
+      LOGGING(config -> config.logLevel),
 
       /** Directive to not invoke the target compiler. */
-      NO_COMPILE(
-          "no-compile",
-          PrimitiveType.BOOLEAN,
-          Arrays.asList(Target.C, Target.CPP, Target.CCPP, Target.Python),
-          (config) -> ASTUtils.toElement(config.noCompile),
-          (config, value, err) -> {
-              config.noCompile = ASTUtils.toBoolean(value);
-          }),
+      NO_COMPILE(config -> config.noCompile),
 
       /** Directive to disable validation of reactor rules at runtime. */
-      NO_RUNTIME_VALIDATION(
-          "no-runtime-validation",
-          PrimitiveType.BOOLEAN,
-          Arrays.asList(Target.CPP),
-          (config) -> ASTUtils.toElement(config.noRuntimeValidation),
-          (config, value, err) -> {
-              config.noRuntimeValidation = ASTUtils.toBoolean(value);
-          }),
-
-      /** Directive to check the generated verification model. */
-      VERIFY(
-          "verify",
-          PrimitiveType.BOOLEAN,
-          Arrays.asList(Target.C),
-          (config) -> ASTUtils.toElement(config.verify),
-          (config, value, err) -> {
-              config.verify = ASTUtils.toBoolean(value);
-          }),
+      NO_RUNTIME_VALIDATION(config -> config.noRuntimeValidation),
 
       /**
        * Directive to specify the platform for cross code generation. This is either a string of the
        * platform or a dictionary of options that includes the string name.
        */
-      PLATFORM(
-          "platform",
-          UnionType.PLATFORM_STRING_OR_DICTIONARY,
-          Target.ALL,
-          (TargetConfig config) -> config.platformOptions),
+      PLATFORM((TargetConfig config) -> config.platformOptions),
 
       /** Directive to instruct the runtime to collect and print execution statistics. */
-      PRINT_STATISTICS(
-          "print-statistics",
-          PrimitiveType.BOOLEAN,
-          Arrays.asList(Target.CPP),
-          (config) -> ASTUtils.toElement(config.printStatistics),
-          (config, value, err) -> {
-              config.printStatistics = ASTUtils.toBoolean(value);
-          }),
+      PRINT_STATISTICS(config -> config.printStatistics),
 
       /**
        * Directive for specifying .proto files that need to be compiled and their code included in the
        * sources.
        */
-      PROTOBUFS(
-          "protobufs",
-          UnionType.FILE_OR_FILE_ARRAY,
-          Arrays.asList(Target.C, Target.CCPP, Target.TS, Target.Python),
-          (config) -> ASTUtils.toElement(config.protoFiles),
-          (config, value, err) -> {
-              config.protoFiles = ASTUtils.elementToListOfStrings(value);
-          }),
+      PROTOBUFS(config -> config.protoFiles),
 
       /** Directive to specify that ROS2 specific code is generated, */
-      ROS2(
-          "ros2",
-          PrimitiveType.BOOLEAN,
-          List.of(Target.CPP),
-          (config) -> ASTUtils.toElement(config.ros2),
-          (config, value, err) -> {
-              config.ros2 = ASTUtils.toBoolean(value);
-          }),
+      ROS2(config -> config.ros2),
 
       /** Directive to specify additional ROS2 packages that this LF program depends on. */
-      ROS2_DEPENDENCIES(
-          "ros2-dependencies",
-          ArrayType.STRING_ARRAY,
-          List.of(Target.CPP),
-          (TargetConfig config) -> config.platformOptions),
+      ROS2_DEPENDENCIES((TargetConfig config) -> config.ros2Dependencies),
 
       /** Directive for specifying a specific version of the reactor runtime library. */
-      RUNTIME_VERSION(
-          "runtime-version",
-          PrimitiveType.STRING,
-          Arrays.asList(Target.CPP),
-          (config) -> ASTUtils.toElement(config.runtimeVersion),
-          (config, value, err) -> {
-              config.runtimeVersion = ASTUtils.elementToSingleString(value);
-          }),
+      RUNTIME_VERSION(config -> config.runtimeVersion),
 
       /** Directive for specifying a specific runtime scheduler, if supported. */
-      SCHEDULER(
-          "scheduler",
-          UnionType.SCHEDULER_UNION,
-          Arrays.asList(Target.C, Target.CCPP, Target.Python),
-          (TargetConfig config) -> config.schedulerType
-          ),
+      SCHEDULER((TargetConfig config) -> config.schedulerType),
       /** Directive to specify that all code is generated in a single file. */
-      SINGLE_FILE_PROJECT(
-          "single-file-project",
-          PrimitiveType.BOOLEAN,
-          List.of(Target.Rust),
-          (config) -> ASTUtils.toElement(config.singleFileProject),
-          (config, value, err) -> {
-              config.singleFileProject = ASTUtils.toBoolean(value);
-          }),
+      SINGLE_FILE_PROJECT(config -> config.singleFileProject),
 
       /** Directive to indicate whether the runtime should use multi-threading. */
-      THREADING(
-          "threading",
-          PrimitiveType.BOOLEAN,
-          List.of(Target.C, Target.CCPP, Target.Python),
-          (config) -> ASTUtils.toElement(config.threading),
-          (config, value, err) -> {
-              config.threading = ASTUtils.toBoolean(value);
-          }),
+      THREADING(config -> config.threading),
+    /** Directive to check the generated verification model. */
+    VERIFY(config -> config.verify),
 
       /** Directive to specify the number of worker threads used by the runtime. */
-      WORKERS(
-          "workers",
-          PrimitiveType.NON_NEGATIVE_INTEGER,
-          List.of(Target.C, Target.CCPP, Target.Python, Target.CPP, Target.Rust),
-          (config) -> ASTUtils.toElement(config.workers),
-          (config, value, err) -> {
-              config.workers = ASTUtils.toInteger(value);
-          }),
+      WORKERS(config -> config.workers),
 
       /** Directive to specify the execution timeout. */
-      TIMEOUT(
-          "timeout",
-          PrimitiveType.TIME_VALUE,
-          Target.ALL,
-          (config) -> ASTUtils.toElement(config.timeout),
-          (config, value, err) -> {
-              config.timeout = ASTUtils.toTimeValue(value);
-          },
-          (config, value, err) -> {
-              config.timeout = ASTUtils.toTimeValue(value);
-          }),
+      TIMEOUT(config -> config.timeout),
 
       /** Directive to enable tracing. */
-      TRACING(
-          "tracing",
-          UnionType.TRACING_UNION,
-          Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Python),
-          (TargetConfig config) -> config.tracing),
+      TRACING(config -> config.tracing),
 
       /**
        * Directive to let the runtime export its internal dependency graph.
        *
        * <p>This is a debugging feature and currently only used for C++ and Rust programs.
        */
-      EXPORT_DEPENDENCY_GRAPH(
-          "export-dependency-graph",
-          PrimitiveType.BOOLEAN,
-          List.of(Target.CPP, Target.Rust),
-          (config) -> ASTUtils.toElement(config.exportDependencyGraph),
-          (config, value, err) -> {
-              config.exportDependencyGraph = ASTUtils.toBoolean(value);
-          }),
+      EXPORT_DEPENDENCY_GRAPH(config -> config.exportDependencyGraph),
 
       /**
        * Directive to let the runtime export the program structure to a yaml file.
        *
        * <p>This is a debugging feature and currently only used for C++ programs.
        */
-      EXPORT_TO_YAML(
-          "export-to-yaml",
-          PrimitiveType.BOOLEAN,
-          List.of(Target.CPP),
-          (config) -> ASTUtils.toElement(config.exportToYaml),
-          (config, value, err) -> {
-              config.exportToYaml = ASTUtils.toBoolean(value);
-          }),
+      EXPORT_TO_YAML(config -> config.exportToYaml),
 
       /**
        * List of module files to link into the crate as top-level. For instance, a {@code target Rust {
@@ -397,61 +184,10 @@ public enum TargetProperty {
        * the generated {@code main.rs} will include it with a {@code mod foo;}. If one of the paths is a
        * directory, it must contain a {@code mod.rs} file, and all its contents are copied.
        */
-      RUST_INCLUDE(
-          "rust-include",
-          UnionType.FILE_OR_FILE_ARRAY,
-          List.of(Target.Rust),
-          (config) -> {
-              // do not check paths here, and simply copy the absolute path over
-              List<Path> paths = config.rust.getRustTopLevelModules();
-              if (paths.isEmpty()) {
-                  return null;
-              } else if (paths.size() == 1) {
-                  return ASTUtils.toElement(paths.get(0).toString());
-              } else {
-                  Element e = LfFactory.eINSTANCE.createElement();
-                  Array arr = LfFactory.eINSTANCE.createArray();
-                  for (Path p : paths) {
-                      arr.getElements().add(ASTUtils.toElement(p.toString()));
-                  }
-                  e.setArray(arr);
-                  return e;
-              }
-          },
-          (config, value, err) -> {
-              Path referencePath;
-              try {
-                  referencePath = FileUtil.toPath(value.eResource().getURI()).toAbsolutePath();
-              } catch (IllegalArgumentException e) {
-                  err.at(value).error("Invalid path? " + e.getMessage());
-                  throw e;
-              }
-
-              // we'll resolve relative paths to check that the files
-              // are as expected.
-
-              if (value.getLiteral() != null) {
-                  Path resolved = referencePath.resolveSibling(StringUtil.removeQuotes(value.getLiteral()));
-
-                  config.rust.addAndCheckTopLevelModule(resolved, value, err);
-              } else if (value.getArray() != null) {
-                  for (Element element : value.getArray().getElements()) {
-                      String literal = StringUtil.removeQuotes(element.getLiteral());
-                      Path resolved = referencePath.resolveSibling(literal);
-                      config.rust.addAndCheckTopLevelModule(resolved, element, err);
-                  }
-              }
-          }),
+      RUST_INCLUDE(config -> config.rust.rustTopLevelModules),
 
       /** Directive for specifying Cargo features of the generated program to enable. */
-      CARGO_FEATURES(
-          "cargo-features",
-          ArrayType.STRING_ARRAY,
-          List.of(Target.Rust),
-          (config) -> ASTUtils.toElement(config.rust.getCargoFeatures()),
-          (config, value, err) -> {
-              config.rust.setCargoFeatures(ASTUtils.elementToListOfStrings(value));
-          }),
+      CARGO_FEATURES(config -> config.rust.cargoFeatures),
 
       /**
        * Dependency specifications for Cargo. This property looks like this:
@@ -478,30 +214,7 @@ public enum TargetProperty {
        * }
        * }</pre>
        */
-      CARGO_DEPENDENCIES(
-          "cargo-dependencies",
-          CargoDependenciesPropertyType.INSTANCE,
-          List.of(Target.Rust),
-          (config) -> {
-              var deps = config.rust.getCargoDependencies();
-              if (deps.size() == 0) {
-                  return null;
-              } else {
-                  Element e = LfFactory.eINSTANCE.createElement();
-                  KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-                  for (var ent : deps.entrySet()) {
-                      KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                      pair.setName(ent.getKey());
-                      pair.setValue(CargoDependencySpec.extractSpec(ent.getValue()));
-                      kvp.getPairs().add(pair);
-                  }
-                  e.setKeyvalue(kvp);
-                  return e;
-              }
-          },
-          (config, value, err) -> {
-              config.rust.setCargoDependencies(CargoDependencySpec.parseAll(value));
-          }),
+      CARGO_DEPENDENCIES(config -> config.rust.cargoDependencies),
 
       /**
        * Directs the C or Python target to include the associated C file used for setting up federated
@@ -515,160 +228,28 @@ public enum TargetProperty {
           (config, value, err) ->
               config.fedSetupPreamble = StringUtil.removeQuotes(ASTUtils.elementToSingleString(value)));
 
+  public final PropertyGetter propertyGetter;
 
-  /** String representation of this target property. */
-  public final String description;
-
-  /**
-   * List of targets that support this property. If a property is used for a target that does not
-   * support it, a warning reported during validation.
-   */
-  public final List<Target> supportedBy;
-
-  /** The type of values that can be assigned to this property. */
-  public final TargetPropertyType type;
-
-  /**
-   * Function that given a configuration object and an Element AST node sets the configuration. It
-   * is assumed that validation already occurred, so this code should be straightforward.
-   */
-  public final PropertyParser setter;
-
-  private final PropertyValidator validator;
-
-
-    /**
-   * Function that given a configuration object and an Element AST node sets the configuration. It
-   * is assumed that validation already occurred, so this code should be straightforward.
-   */
-  public final PropertyParser updater;
-
-
-  @FunctionalInterface
-  private interface ConfigGetter<T> {
+    @FunctionalInterface
+  private interface PropertyGetter<T> {
       TargetPropertyConfig<T> get(TargetConfig config);
   }
 
-  @FunctionalInterface
-  private interface  PropertyValidator {
-      void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter);
-  }
-
-  @FunctionalInterface
-  private interface PropertyParser {
-
-    /**
-     * Parse the given element into the given target config. May use the error reporter to report
-     * format errors.
-     */
-    void parseIntoTargetConfig(TargetConfig config, Element element, MessageReporter err);
-  }
-
-  public final PropertyGetter getter;
-
-  @FunctionalInterface
-  private interface PropertyGetter {
-
-    /**
-     * Read this property from the target config and build an element which represents it for the
-     * AST. May return null if the given value of this property is the same as the default.
-     */
-    Element getPropertyElement(TargetConfig config);
-  }
-
-  /**
-   * Private constructor for target properties.
-   *
-   * @param description String representation of this property.
-   * @param type The type that values assigned to this property should conform to.
-   * @param supportedBy List of targets that support this property.
-   * @param setter Function for configuration updates.
-   */
-  TargetProperty(
-      String description,
-      TargetPropertyType type,
-      List<Target> supportedBy,
-      PropertyGetter getter,
-      PropertyParser setter) {
-    this.description = description;
-    this.type = type;
-    this.supportedBy = supportedBy;
-    this.getter = getter;
-    this.setter = setter;
-    this.updater = setter; // (Re)set by default
-      this.validator = (pair, ast, config, validator) -> {};
-  }
-
-  TargetProperty(String description, TargetPropertyType type, List<Target> supportedBy,
-      ConfigGetter g) {
-      this.description = description;
-      this.type = type;
-      this.supportedBy = supportedBy;
-      this.setter = (TargetConfig config, Element element, MessageReporter err) -> {
-          g.get(config).set(element, err);
-      };
-      this.updater = (TargetConfig config, Element element, MessageReporter err) -> {
-          g.get(config).set(element, err);
-      };
-
-      this.getter = (TargetConfig config) -> {
-          return g.get(config).export();
-      };
-
-      this.validator = (KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) -> {
-          g.get(config).validate(pair, ast, config, reporter);
-      };
-  }
-
-  /**
-   * Private constructor for target properties. This will take an additional {@code updater}, which
-   * will be used to merge target properties from imported resources.
-   *
-   * @param description String representation of this property.
-   * @param type The type that values assigned to this property should conform to.
-   * @param supportedBy List of targets that support this property.
-   * @param setter Function for setting configuration values.
-   * @param updater Function for updating configuration values.
-   */
-  TargetProperty(
-      String description,
-      TargetPropertyType type,
-      List<Target> supportedBy,
-      PropertyGetter getter,
-      PropertyParser setter,
-      PropertyParser updater) {
-    this.description = description;
-    this.type = type;
-    this.supportedBy = supportedBy;
-    this.getter = getter;
-    this.setter = setter;
-    this.updater = updater;
-      this.validator = (pair, ast, config, validator) -> {};
-  }
-
-  /**
-   * Return the name of the property in lingua franca. This is suitable for use as a key in a target
-   * properties block. It may be an invalid identifier in other languages (may contains dashes
-   * {@code -}).
-   */
-  public String getDisplayName() {
-    return description;
+  TargetProperty(PropertyGetter propertyGetter) {
+    this.propertyGetter = propertyGetter;
   }
 
   public static void override(TargetConfig config, Properties properties, MessageReporter err) {
-      properties.keySet().forEach(
-          key -> {
-              TargetProperty p = forName(key.toString());
-              if (p != null) {
-                  // Mark the specified target property as set by the user
-                  config.setByUser.add(p);
-                  try {
-                      // FIXME: p.setter.parseIntoTargetConfig(config, properties.get(key), err);
-                  } catch (InvalidLfSourceException e) {
-                      err.at(e.getNode()).error(e.getProblem());
-                  }
+      for (Object key : properties.keySet()) {
+          TargetProperty p = forName(key.toString());
+          if (p != null) {
+              try {
+                  p.propertyGetter.get(config).override(properties.get(key));
+              } catch (InvalidLfSourceException e) {
+                  err.at(e.getNode()).error(e.getProblem());
               }
-          });
+          }
+      }
   }
 
   /**
@@ -744,7 +325,7 @@ public static KeyValuePair getKeyValuePair(Model ast, TargetProperty property) {
     }
 
     public void validate(KeyValuePairs pairs, Model ast, TargetConfig config, ValidationReporter reporter) {
-      this.validator.validate(getKeyValuePair(pairs, this), ast, config, reporter);
+      this.propertyGetter.get(config).validate(getKeyValuePair(pairs, this), ast, config, reporter);
     }
 
   /**
@@ -801,7 +382,7 @@ public static void updateOne(
       List<KeyValuePair> properties,
       MessageReporter err) {
     properties.stream()
-        .filter(p -> p.getName().equals(property.getDisplayName()))
+        .filter(p -> {return p.getName().equals(property.toString());})
         .findFirst()
         .map(KeyValuePair::getValue)
         .ifPresent(value -> property.updater.parseIntoTargetConfig(config, value, err));
@@ -825,10 +406,13 @@ public static List<TargetProperty> getOptions() {
     return Arrays.asList(TargetProperty.values());
   }
 
-  /** Return the description. */
+    /**
+     * Return the name of the property in as it appears in the target declaration.
+     * It may be an invalid identifier in other languages (may contains dashes {@code -}).
+     */
   @Override
   public String toString() {
-    return this.description;
+    return this.name().toLowerCase().replaceAll("_", "-");
   }
 
   /** Interface for dictionary elements. It associates an entry with a type. */
diff --git a/core/src/main/java/org/lflang/TargetPropertyConfig.java b/core/src/main/java/org/lflang/TargetPropertyConfig.java
index 3a637d8616..d32aab84ce 100644
--- a/core/src/main/java/org/lflang/TargetPropertyConfig.java
+++ b/core/src/main/java/org/lflang/TargetPropertyConfig.java
@@ -1,10 +1,13 @@
 package org.lflang;
 
+import java.util.List;
 import java.util.Properties;
 
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
+import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.validation.ValidationReporter;
 
 /**
@@ -16,17 +19,25 @@
  * </ul>
  * @param <T> The type of the configuration value.
  */
-public abstract class TargetPropertyConfig<T> { //implements TargetPropertyConfigurator<T> {
+public abstract class TargetPropertyConfig<T> {
 
   protected T value = initialize();
 
   protected boolean setByUser;
 
-  public void override(T value) { // FIXME: do all overrides imply setByUser?
+  /* The type of values that can be assigned to this property. */
+  public final TargetPropertyType type;
+
+  public TargetPropertyConfig(TargetPropertyType type) {
+    this.type = type;
+  }
+
+  public void override(T value) {
+    this.setByUser = true;
     this.value = value;
   }
 
-  public abstract T initialize();
+  public abstract T initialize(); // FIXME: rename to initialValue
 
   /**
    * Parse the given element into the given target config. May use the error reporter to report
@@ -40,14 +51,14 @@ public void set(Element value, MessageReporter err) {
     }
   }
 
-  public void update(Element value, MessageReporter err) {
+  public void update(Element value, MessageReporter err) { // FIXME: diff with override??
     this.setByUser = true;
     this.set(value, err);
   }
 
   public void update(Properties cliArgs) {
     this.setByUser = true;
-  }
+  } // FIXME: this is incomplete
 
   /**
    * Return the current configuration.
@@ -58,8 +69,32 @@ public T get() {
 
   protected abstract T parse(Element value);
 
+  public abstract List<Target> supportedTargets();
+
+  public final boolean isSupported(Target target) {
+    if (supportedTargets().contains(target)) {
+      return true;
+    }
+    return false;
+  }
+
   // FIXME: config may not be needed.
   public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+    // Check whether the property is supported by the target.
+    if (!this.isSupported(config.target)) {
+      reporter.warning(
+          "The target parameter: "
+              + pair.getName()
+              + " is not supported by the "
+              + config.target
+              + " target and will thus be ignored.",
+          pair,
+          Literals.KEY_VALUE_PAIR__NAME);
+    }
+
+    if (!this.type.check(pair.getValue(), pair.getName(), reporter)) {
+      reporter.error("Target property '" + pair.getName() + "' is required to be " + type + ".", pair, Literals.KEY_VALUE_PAIR__VALUE);
+    }
 
   }
 
@@ -72,4 +107,7 @@ public void validate(KeyValuePair pair, Model ast, TargetConfig config, Validati
   public boolean isSetByUser() {
     return setByUser;
   }
+
+  @Override
+  public String toString() { return value.toString(); }
 }
diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 057f0c9494..390f964369 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -614,7 +614,7 @@ public static ReactorInstance createMainReactorInstance(
       if (breadth == 0) {
         messageReporter.nowhere().warning("The program has no reactions");
       } else {
-        targetConfig.compileDefinitions.put(
+        targetConfig.compileDefinitions.get().put(
             "LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth()));
       }
       return main;
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 3deefb3757..78a1abc910 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -57,7 +57,7 @@
 import org.lflang.lf.Port;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
-import org.lflang.target.CoordinationModeConfig.CoordinationMode;
+import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
 
 /**
  * An extension class to the CGenerator that enables certain federated functionalities.
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 7ae00b3608..6bc46556c8 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -23,8 +23,8 @@
 import org.lflang.lf.Expression;
 import org.lflang.lf.Input;
 import org.lflang.lf.ParameterReference;
-import org.lflang.target.ClockSyncModeConfig.ClockSyncMode;
-import org.lflang.target.property.ClockSyncOptionsConfig.ClockSyncOptions;
+import org.lflang.target.property.ClockSyncModeProperty.ClockSyncMode;
+import org.lflang.target.property.ClockSyncOptionsProperty.ClockSyncOptions;
 
 public class CExtensionUtils {
 
@@ -174,15 +174,15 @@ public static void handleCompileDefinitions(
       RtiConfig rtiConfig,
       MessageReporter messageReporter) {
     federate.targetConfig.setByUser.add(TargetProperty.COMPILE_DEFINITIONS);
-    federate.targetConfig.compileDefinitions.put("FEDERATED", "");
-    federate.targetConfig.compileDefinitions.put(
+    federate.targetConfig.compileDefinitions.get().put("FEDERATED", "");
+    federate.targetConfig.compileDefinitions.get().put(
         "FEDERATED_" + federate.targetConfig.coordination.toString().toUpperCase(), "");
     if (federate.targetConfig.auth.get()) {
-      federate.targetConfig.compileDefinitions.put("FEDERATED_AUTHENTICATED", "");
+      federate.targetConfig.compileDefinitions.get().put("FEDERATED_AUTHENTICATED", "");
     }
-    federate.targetConfig.compileDefinitions.put(
+    federate.targetConfig.compileDefinitions.get().put(
         "NUMBER_OF_FEDERATES", String.valueOf(numOfFederates));
-    federate.targetConfig.compileDefinitions.put("EXECUTABLE_PREAMBLE", "");
+    federate.targetConfig.compileDefinitions.get().put("EXECUTABLE_PREAMBLE", "");
 
     handleAdvanceMessageInterval(federate);
 
@@ -193,7 +193,7 @@ private static void handleAdvanceMessageInterval(FederateInstance federate) {
     var advanceMessageInterval = federate.targetConfig.coordinationOptions.get().advanceMessageInterval;
     federate.targetConfig.setByUser.remove(TargetProperty.COORDINATION_OPTIONS);
     if (advanceMessageInterval != null) {
-      federate.targetConfig.compileDefinitions.put(
+      federate.targetConfig.compileDefinitions.get().put(
           "ADVANCE_MESSAGE_INTERVAL", String.valueOf(advanceMessageInterval.toNanoSeconds()));
     }
   }
@@ -229,7 +229,7 @@ public static void initializeClockSynchronization(
           // flags
           // FIXME: This is probably going to fail on MacOS (especially using clang)
           // because libm functions are builtin
-          federate.targetConfig.compilerFlags.add("-lm");
+          federate.targetConfig.compilerFlags.get().add("-lm");
           federate.targetConfig.setByUser.add(TargetProperty.FLAGS);
         }
         messageReporter
@@ -254,18 +254,18 @@ public static void addClockSyncCompileDefinitions(FederateInstance federate) {
     ClockSyncMode mode = federate.targetConfig.clockSync.get();
     ClockSyncOptions options = federate.targetConfig.clockSyncOptions.get();
 
-    federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_INITIAL", "");
-    federate.targetConfig.compileDefinitions.put(
+    federate.targetConfig.compileDefinitions.get().put("_LF_CLOCK_SYNC_INITIAL", "");
+    federate.targetConfig.compileDefinitions.get().put(
         "_LF_CLOCK_SYNC_PERIOD_NS", String.valueOf(options.period.toNanoSeconds()));
-    federate.targetConfig.compileDefinitions.put(
+    federate.targetConfig.compileDefinitions.get().put(
         "_LF_CLOCK_SYNC_EXCHANGES_PER_INTERVAL", String.valueOf(options.trials));
-    federate.targetConfig.compileDefinitions.put(
+    federate.targetConfig.compileDefinitions.get().put(
         "_LF_CLOCK_SYNC_ATTENUATION", String.valueOf(options.attenuation));
 
     if (mode == ClockSyncMode.ON) {
-      federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_ON", "");
+      federate.targetConfig.compileDefinitions.get().put("_LF_CLOCK_SYNC_ON", "");
       if (options.collectStats) {
-        federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_COLLECT_STATS", "");
+        federate.targetConfig.compileDefinitions.get().put("_LF_CLOCK_SYNC_COLLECT_STATS", "");
       }
     }
   }
diff --git a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
index 9c2c4168f9..4b20b09ba5 100644
--- a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
@@ -13,7 +13,7 @@
 import org.lflang.lf.Reaction;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
-import org.lflang.target.CoordinationModeConfig.CoordinationMode;
+import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
 
 public interface FedTargetExtension {
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
index abf51be552..ab05d80f7e 100644
--- a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
@@ -42,7 +42,7 @@
 import org.lflang.lf.Action;
 import org.lflang.lf.Reaction;
 import org.lflang.lf.VarRef;
-import org.lflang.target.CoordinationModeConfig.CoordinationMode;
+import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
 
 /**
  * An extension class to the PythonGenerator that enables certain federated functionalities.
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index d10932265b..2505686ec4 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -25,7 +25,7 @@
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
-import org.lflang.target.CoordinationModeConfig.CoordinationMode;
+import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
 
 public class TSExtension implements FedTargetExtension {
   @Override
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 210365b261..b970b15cd6 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -70,7 +70,7 @@
 import org.lflang.lf.Type;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
-import org.lflang.target.CoordinationModeConfig.CoordinationMode;
+import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
 
 /**
  * A helper class for AST transformations needed for federated execution.
diff --git a/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java b/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
index 8ec7776cd4..00e49baa7d 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
@@ -100,8 +100,8 @@ public void doClean() throws IOException {
    * the generated .lf file for the federate.
    */
   public void relativizePaths(FedTargetConfig targetConfig) {
-    relativizePathList(targetConfig.protoFiles);
-    relativizePathList(targetConfig.files);
+    relativizePathList(targetConfig.protoFiles.get());
+    relativizePathList(targetConfig.files.get());
     relativizePathList(targetConfig.cmakeIncludes.get());
   }
 
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 0feee8144f..f3b74c495d 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -58,7 +58,7 @@
 import org.lflang.lf.Reactor;
 import org.lflang.lf.TargetDecl;
 import org.lflang.lf.VarRef;
-import org.lflang.target.CoordinationModeConfig.CoordinationMode;
+import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
 import org.lflang.util.Averager;
 
 public class FedGenerator {
@@ -153,7 +153,7 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
     }
 
     // Do not invoke target code generators if --no-compile flag is used.
-    if (context.getTargetConfig().noCompile) {
+    if (context.getTargetConfig().noCompile.get()) {
       context.finish(Status.GENERATED, lf2lfCodeMapMap);
       return false;
     }
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index 7532ff1c66..da4081b753 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -37,7 +37,7 @@
 import org.lflang.TargetConfig;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
-import org.lflang.target.ClockSyncModeConfig.ClockSyncMode;
+import org.lflang.target.property.ClockSyncModeProperty.ClockSyncMode;
 
 /**
  * Utility class that can be used to create a launcher for federated LF programs.
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index 469ba28b46..bac3ff1e5c 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -64,7 +64,7 @@ public static void accommodatePhysicalActionsIfPresent(
           String message =
               String.format(
                   "Setting %s to true because of the physical action %s.",
-                  TargetProperty.KEEPALIVE.getDisplayName(), action.getName());
+                  TargetProperty.KEEPALIVE, action.getName());
           messageReporter.at(action).warning(message);
           return;
         }
diff --git a/core/src/main/java/org/lflang/generator/LFGenerator.java b/core/src/main/java/org/lflang/generator/LFGenerator.java
index 84a13f6fc8..2af1a27f83 100644
--- a/core/src/main/java/org/lflang/generator/LFGenerator.java
+++ b/core/src/main/java/org/lflang/generator/LFGenerator.java
@@ -181,7 +181,7 @@ private void runVerifierIfPropertiesDetected(Resource resource, LFGeneratorConte
       uclidGenerator.doGenerate(resource, lfContext);
 
       // Check the generated uclid files.
-      if (uclidGenerator.targetConfig.verify) {
+      if (uclidGenerator.targetConfig.verify.get()) {
 
         // Check if Uclid5 and Z3 are installed.
         if (!execInstalled("uclid", "--help", "uclid 0.9.5")
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 3deb90c18f..471bd78dcf 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -35,7 +35,7 @@
 import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
 import org.lflang.generator.CodeBuilder;
-import org.lflang.target.PlatformConfig.Platform;
+import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.util.FileUtil;
 
 /**
@@ -366,7 +366,7 @@ CodeBuilder generateCMakeCode(
     }
 
     // link protobuf
-    if (!targetConfig.protoFiles.isEmpty()) {
+    if (!targetConfig.protoFiles.get().isEmpty()) {
       cMakeCode.pr("include(FindPackageHandleStandardArgs)");
       cMakeCode.pr("FIND_PATH( PROTOBUF_INCLUDE_DIR protobuf-c/protobuf-c.h)");
       cMakeCode.pr(
@@ -385,7 +385,7 @@ CodeBuilder generateCMakeCode(
 
     // Set the compiler flags
     // We can detect a few common libraries and use the proper target_link_libraries to find them
-    for (String compilerFlag : targetConfig.compilerFlags) {
+    for (String compilerFlag : targetConfig.compilerFlags.get()) {
       messageReporter
           .nowhere()
           .warning(
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index f35b698c51..65ddfaa398 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -41,7 +41,7 @@
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.target.property.BuildConfig;
-import org.lflang.target.PlatformConfig.Platform;
+import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.util.FileUtil;
 import org.lflang.util.LFCommand;
 
@@ -122,10 +122,10 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
     if (targetConfig.compiler != null) {
       if (cppMode) {
         // Set the CXX environment variable to change the C++ compiler.
-        compile.replaceEnvironmentVariable("CXX", targetConfig.compiler);
+        compile.replaceEnvironmentVariable("CXX", targetConfig.compiler.get());
       } else {
         // Set the CC environment variable to change the C compiler.
-        compile.replaceEnvironmentVariable("CC", targetConfig.compiler);
+        compile.replaceEnvironmentVariable("CC", targetConfig.compiler.get());
       }
     }
 
@@ -217,7 +217,7 @@ public LFCommand compileCmakeCommand() {
   }
 
   static Stream<String> cmakeCompileDefinitions(TargetConfig targetConfig) {
-    return targetConfig.compileDefinitions.entrySet().stream()
+    return targetConfig.compileDefinitions.get().entrySet().stream()
         .map(entry -> "-D" + entry.getKey() + "=" + entry.getValue());
   }
 
@@ -404,11 +404,11 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
     }
 
     // Add compile definitions
-    targetConfig.compileDefinitions.forEach(
+    targetConfig.compileDefinitions.get().forEach(
         (key, value) -> compileArgs.add("-D" + key + "=" + value));
 
     // Finally, add the compiler flags in target parameters (if any)
-    compileArgs.addAll(targetConfig.compilerFlags);
+    compileArgs.addAll(targetConfig.compilerFlags.get());
 
     // Only set the output file name if it hasn't already been set
     // using a target property or Args line flag.
@@ -426,7 +426,7 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
     }
 
     LFCommand command =
-        commandFactory.createCommand(targetConfig.compiler, compileArgs, fileConfig.getOutPath());
+        commandFactory.createCommand(targetConfig.compiler.get(), compileArgs, fileConfig.getOutPath());
     if (command == null) {
       messageReporter
           .nowhere()
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 70a2056f13..d00578d9c5 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -54,7 +54,7 @@
 import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
-import org.lflang.target.PlatformConfig.PlatformOption;
+import org.lflang.target.property.PlatformProperty.PlatformOption;
 import org.lflang.ast.ASTUtils;
 import org.lflang.ast.DelayedConnectionTransformation;
 import org.lflang.federated.extensions.CExtensionUtils;
@@ -88,8 +88,8 @@
 import org.lflang.lf.ReactorDecl;
 import org.lflang.lf.StateVar;
 import org.lflang.lf.Variable;
-import org.lflang.target.PlatformConfig.Platform;
-import org.lflang.target.SchedulerConfig.SchedulerOption;
+import org.lflang.target.property.PlatformProperty.Platform;
+import org.lflang.target.property.SchedulerProperty.SchedulerOption;
 import org.lflang.util.ArduinoUtil;
 import org.lflang.util.FileUtil;
 
@@ -466,7 +466,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
         Exceptions.sneakyThrow(e);
       }
-      if (!targetConfig.noCompile) {
+      if (!targetConfig.noCompile.get()) {
         ArduinoUtil arduinoUtil = new ArduinoUtil(context, commandFactory, messageReporter);
         arduinoUtil.buildArduino(fileConfig, targetConfig);
         context.finish(GeneratorResult.Status.COMPILED, null);
@@ -502,8 +502,8 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     // take over and do the rest of compilation.
     try {
       String compileDefs =
-          targetConfig.compileDefinitions.keySet().stream()
-                  .map(key -> key + "=" + targetConfig.compileDefinitions.get(key))
+          targetConfig.compileDefinitions.get().keySet().stream()
+                  .map(key -> key + "=" + targetConfig.compileDefinitions.get().get(key))
                   .collect(Collectors.joining("\n"))
               + "\n";
       FileUtil.writeToFile(
@@ -517,8 +517,8 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     // immediately compile the generated code.
     try {
       String compileDefs =
-          targetConfig.compileDefinitions.keySet().stream()
-              .map(key -> "\"-D" + key + "=" + targetConfig.compileDefinitions.get(key) + "\"")
+          targetConfig.compileDefinitions.get().keySet().stream()
+              .map(key -> "\"-D" + key + "=" + targetConfig.compileDefinitions.get().get(key) + "\"")
               .collect(Collectors.joining(",\n"));
       String settings = "{\n" + "\"cmake.configureArgs\": [\n" + compileDefs + "\n]\n}\n";
       Path vscodePath = fileConfig.getSrcGenPath().resolve(".vscode");
@@ -537,7 +537,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
 
     // If this code generator is directly compiling the code, compile it now so that we
     // clean it up after, removing the #line directives after errors have been reported.
-    if (!targetConfig.noCompile
+    if (!targetConfig.noCompile.get()
         && targetConfig.dockerOptions == null
         && IterableExtensions.isNullOrEmpty(targetConfig.buildCommands.get())
         // This code is unreachable in LSP_FAST mode, so that check is omitted.
@@ -581,7 +581,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
 
     // If a build directive has been given, invoke it now.
     // Note that the code does not get cleaned in this case.
-    if (!targetConfig.noCompile) {
+    if (!targetConfig.noCompile.get()) {
       if (!IterableExtensions.isNullOrEmpty(targetConfig.buildCommands.get())) {
         CUtil.runBuildCommand(
             fileConfig,
@@ -1959,15 +1959,15 @@ protected DockerGenerator getDockerGenerator(LFGeneratorContext context) {
   // Perform set up that does not generate code
   protected void setUpGeneralParameters() {
     accommodatePhysicalActionsIfPresent();
-    targetConfig.compileDefinitions.put(
-        "LOG_LEVEL", String.valueOf(targetConfig.logLevel.ordinal()));
+    targetConfig.compileDefinitions.get().put(
+        "LOG_LEVEL", String.valueOf(targetConfig.logLevel.get().ordinal()));
     targetConfig.compileAdditionalSources.addAll(CCoreFilesUtils.getCTargetSrc());
     // Create the main reactor instance if there is a main reactor.
     this.main =
         ASTUtils.createMainReactorInstance(mainDef, reactors, messageReporter, targetConfig);
     if (hasModalReactors) {
       // So that each separate compile knows about modal reactors, do this:
-      targetConfig.compileDefinitions.put("MODAL_REACTORS", "TRUE");
+      targetConfig.compileDefinitions.get().put("MODAL_REACTORS", "TRUE");
     }
     if (targetConfig.threading
         && targetConfig.platformOptions.get().platform == Platform.ARDUINO
@@ -1983,7 +1983,7 @@ protected void setUpGeneralParameters() {
     }
 
     if (targetConfig.platformOptions.get().platform == Platform.ARDUINO
-        && !targetConfig.noCompile
+        && !targetConfig.noCompile.get()
         && targetConfig.platformOptions.get().board == null) {
       messageReporter
           .nowhere()
@@ -1992,13 +1992,13 @@ protected void setUpGeneralParameters() {
                   + " board name (FQBN) in the target property. For example, platform: {name:"
                   + " arduino, board: arduino:avr:leonardo}. Entering \"no-compile\" mode and"
                   + " generating target code only.");
-      targetConfig.noCompile = true;
+      targetConfig.noCompile.override(true);
     }
 
     if (targetConfig.platformOptions.get().platform == Platform.ZEPHYR
         && targetConfig.threading
         && targetConfig.platformOptions.get().userThreads >= 0) {
-      targetConfig.compileDefinitions.put(
+      targetConfig.compileDefinitions.get().put(
           PlatformOption.USER_THREADS.name(),
           String.valueOf(targetConfig.platformOptions.get().userThreads));
     } else if (targetConfig.platformOptions.get().userThreads > 0) {
@@ -2012,8 +2012,8 @@ protected void setUpGeneralParameters() {
     if (targetConfig.threading) { // FIXME: This logic is duplicated in CMake
       pickScheduler();
       // FIXME: this and pickScheduler should be combined.
-      targetConfig.compileDefinitions.put("SCHEDULER", targetConfig.schedulerType.get().name());
-      targetConfig.compileDefinitions.put(
+      targetConfig.compileDefinitions.get().put("SCHEDULER", targetConfig.schedulerType.get().name());
+      targetConfig.compileDefinitions.get().put(
           "NUMBER_OF_WORKERS", String.valueOf(targetConfig.workers));
     }
     pickCompilePlatform();
@@ -2021,7 +2021,7 @@ protected void setUpGeneralParameters() {
 
   protected void handleProtoFiles() {
     // Handle .proto files.
-    for (String file : targetConfig.protoFiles) {
+    for (String file : targetConfig.protoFiles.get()) {
       this.processProtoFile(file);
     }
   }
@@ -2054,7 +2054,7 @@ protected String generateTopLevelPreambles(Reactor reactor) {
         .flatMap(it -> ASTUtils.allFileLevelPreambles(it).stream())
         .collect(Collectors.toSet())
         .forEach(it -> builder.pr(toText(it.getCode())));
-    for (String file : targetConfig.protoFiles) {
+    for (String file : targetConfig.protoFiles.get()) {
       var dotIndex = file.lastIndexOf(".");
       var rootFilename = file;
       if (dotIndex > 0) {
diff --git a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
index 9dd130471c..824de835b8 100644
--- a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import org.lflang.TargetConfig;
 import org.lflang.generator.CodeBuilder;
-import org.lflang.target.PlatformConfig.Platform;
+import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.util.StringUtil;
 
 public class CMainFunctionGenerator {
@@ -105,10 +105,10 @@ private void parseTargetParameters() {
       runCommand.add("-k");
       runCommand.add("true");
     }
-    if (targetConfig.timeout != null) {
+    if (targetConfig.timeout.get() != null) {
       runCommand.add("-o");
-      runCommand.add(targetConfig.timeout.getMagnitude() + "");
-      runCommand.add(targetConfig.timeout.unit.getCanonicalName());
+      runCommand.add(targetConfig.timeout.get().getMagnitude() + "");
+      runCommand.add(targetConfig.timeout.get().unit.getCanonicalName());
     }
     // The runCommand has a first entry that is ignored but needed.
     if (runCommand.size() > 0) {
diff --git a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
index da3794d44e..fd087e081a 100644
--- a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
@@ -5,7 +5,7 @@
 import java.nio.file.Path;
 import org.lflang.TargetConfig;
 import org.lflang.generator.CodeBuilder;
-import org.lflang.target.PlatformConfig.Platform;
+import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.util.StringUtil;
 
 /**
@@ -61,7 +61,7 @@ public static String generateIncludeStatements(TargetConfig targetConfig, boolea
 
   public static String generateDefineDirectives(
       TargetConfig targetConfig, Path srcGenPath, boolean hasModalReactors) {
-    int logLevel = targetConfig.logLevel.ordinal();
+    int logLevel = targetConfig.logLevel.get().ordinal();
     var coordinationType = targetConfig.coordination;
     var tracing = targetConfig.tracing.get();
     CodeBuilder code = new CodeBuilder();
@@ -70,7 +70,7 @@ public static String generateDefineDirectives(
     code.pr("#define TARGET_FILES_DIRECTORY " + addDoubleQuotes(srcGenPath.toString()));
 
     if (tracing != null) {
-      targetConfig.compileDefinitions.put("LF_TRACE", tracing.traceFileName);
+      targetConfig.compileDefinitions.get().put("LF_TRACE", tracing.traceFileName);
     }
     // if (clockSyncIsOn) {
     //     code.pr(generateClockSyncDefineDirective(
@@ -79,14 +79,14 @@ public static String generateDefineDirectives(
     //     ));
     // }
     if (targetConfig.threading) {
-      targetConfig.compileDefinitions.put("LF_THREADED", "1");
+      targetConfig.compileDefinitions.get().put("LF_THREADED", "1");
     } else {
-      targetConfig.compileDefinitions.put("LF_UNTHREADED", "1");
+      targetConfig.compileDefinitions.get().put("LF_UNTHREADED", "1");
     }
     if (targetConfig.threading) {
-      targetConfig.compileDefinitions.put("LF_THREADED", "1");
+      targetConfig.compileDefinitions.get().put("LF_THREADED", "1");
     } else {
-      targetConfig.compileDefinitions.put("LF_UNTHREADED", "1");
+      targetConfig.compileDefinitions.get().put("LF_UNTHREADED", "1");
     }
     code.newLine();
     return code.toString();
diff --git a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 25ab8b59b9..7bdb13706f 100644
--- a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -23,7 +23,7 @@
 import org.lflang.generator.ReactorInstance;
 import org.lflang.generator.RuntimeRange;
 import org.lflang.generator.SendRange;
-import org.lflang.target.LoggingConfigurator.LogLevel;
+import org.lflang.target.property.LoggingProperty.LogLevel;
 
 /**
  * Generate code for the "_lf_initialize_trigger_objects" function
@@ -879,7 +879,7 @@ private static String deferredReactionOutputs(
     // val selfRef = CUtil.reactorRef(reaction.getParent());
     var name = reaction.getParent().getFullName();
     // Insert a string name to facilitate debugging.
-    if (targetConfig.logLevel.compareTo(LogLevel.LOG) >= 0) {
+    if (targetConfig.logLevel.get().compareTo(LogLevel.LOG) >= 0) {
       code.pr(
           CUtil.reactionRef(reaction)
               + ".name = "
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index 16615bb59e..e9998d268c 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -107,9 +107,9 @@ public PythonGenerator(LFGeneratorContext context) {
   private PythonGenerator(
       LFGeneratorContext context, PythonTypes types, CCmakeGenerator cmakeGenerator) {
     super(context, false, types, cmakeGenerator, new PythonDelayBodyGenerator(types));
-    this.targetConfig.compiler = "gcc";
-    this.targetConfig.compilerFlags = new ArrayList<>();
-    this.targetConfig.linkerFlags = "";
+    this.targetConfig.compiler.override("gcc"); // FIXME: why?
+    this.targetConfig.compilerFlags.get().clear();
+    this.targetConfig.linkerFlags = ""; // FIXME: why?
     this.types = types;
   }
 
@@ -277,7 +277,7 @@ protected String generateTopLevelPreambles(Reactor ignored) {
 
   @Override
   protected void handleProtoFiles() {
-    for (String name : targetConfig.protoFiles) {
+    for (String name : targetConfig.protoFiles.get()) {
       this.processProtoFile(name);
       int dotIndex = name.lastIndexOf(".");
       String rootFilename = dotIndex > 0 ? name.substring(0, dotIndex) : name;
diff --git a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
index c1e6fad3f3..02976257fd 100644
--- a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
+++ b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
@@ -44,6 +44,7 @@
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.util.StringUtil;
 import org.lflang.validation.LFValidator;
+import org.lflang.validation.ValidationReporter;
 
 /**
  * Info about a cargo dependency. See {@link TargetProperty#CARGO_DEPENDENCIES}.
@@ -278,17 +279,20 @@ public boolean validate(Element e) {
     }
 
     @Override
-    public void check(Element element, String name, LFValidator v) {
+    public boolean check(Element element, String name, ValidationReporter v) {
+      var valid = true;
       for (KeyValuePair pair : element.getKeyvalue().getPairs()) {
         try {
           parseValue(pair);
         } catch (InvalidLfSourceException e) {
-          MessageReporter messageReporter = v.getErrorReporter();
           EObject object = e.getNode();
           String message = e.getProblem();
-          messageReporter.at(object).error(message);
+          // FIXME: use ValidatorMessageReporter
+          // v.at(object).error(message);
+          valid = false;
         }
       }
+      return valid;
     }
 
     @Override
diff --git a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
index dc9a766ba8..c453763399 100644
--- a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
+++ b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
@@ -24,16 +24,11 @@
 
 package org.lflang.generator.rust;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.eclipse.emf.ecore.EObject;
-import org.lflang.MessageReporter;
 import org.lflang.target.property.BuildConfig.BuildType;
-import org.lflang.target.property.BuildTypeConfig;
+import org.lflang.target.property.BuildTypeProperty;
+import org.lflang.target.property.CargoDependenciesProperty;
+import org.lflang.target.property.CargoFeaturesProperty;
+import org.lflang.target.property.RustIncludeProperty;
 
 /**
  * Rust-specific part of a {@link org.lflang.TargetConfig}.
@@ -43,60 +38,20 @@
 public final class RustTargetConfig {
 
   /** List of Cargo features of the generated crate to enable. */
-  private List<String> cargoFeatures = new ArrayList<>();
+  public final CargoFeaturesProperty cargoFeatures = new CargoFeaturesProperty();
 
   /** Map of Cargo dependency to dependency properties. */
-  private Map<String, CargoDependencySpec> cargoDependencies = new HashMap<>();
+  public final CargoDependenciesProperty cargoDependencies = new CargoDependenciesProperty();
 
   /** List of top-level modules, those are absolute paths. */
-  private final List<Path> rustTopLevelModules = new ArrayList<>();
+  public final RustIncludeProperty rustTopLevelModules = new RustIncludeProperty();
 
   /** Cargo profile, default is debug (corresponds to cargo dev profile). */
   private BuildType profile = BuildType.DEBUG;
 
-  public void setCargoFeatures(List<String> cargoFeatures) {
-    this.cargoFeatures = cargoFeatures;
-  }
-
-  public void setCargoDependencies(Map<String, CargoDependencySpec> cargoDependencies) {
-    this.cargoDependencies = cargoDependencies;
-  }
-
-  public void addAndCheckTopLevelModule(Path path, EObject errorOwner, MessageReporter err) {
-    String fileName = path.getFileName().toString();
-    if (!Files.exists(path)) {
-      err.at(errorOwner).error("File not found");
-    } else if (Files.isRegularFile(path) && !fileName.endsWith(".rs")) {
-      err.at(errorOwner).error("Not a rust file");
-    } else if (fileName.equals("main.rs")) {
-      err.at(errorOwner).error("Cannot use 'main.rs' as a module name (reserved)");
-    } else if (fileName.equals("reactors") || fileName.equals("reactors.rs")) {
-      err.at(errorOwner).error("Cannot use 'reactors' as a module name (reserved)");
-    } else if (Files.isDirectory(path) && !Files.exists(path.resolve("mod.rs"))) {
-      err.at(errorOwner).error("Cannot find module descriptor in directory");
-    }
-    this.rustTopLevelModules.add(path);
-  }
-
-  public List<String> getCargoFeatures() {
-    return cargoFeatures;
-  }
-
-  /** Returns a map of cargo dependencies. */
-  public Map<String, CargoDependencySpec> getCargoDependencies() {
-    return cargoDependencies;
-  }
-
-  /**
-   * Returns the list of top-level module files to include in main.rs. Those files were checked to
-   * exists previously.
-   */
-  public List<Path> getRustTopLevelModules() {
-    return rustTopLevelModules;
-  }
 
   /** The build type to use. Corresponds to a Cargo profile. */
-  public BuildType getBuildType(BuildTypeConfig cmakeBuildType) {
+  public BuildType getBuildType(BuildTypeProperty cmakeBuildType) {
     // FIXME: this is because Rust uses a different default.
     // Can we just use the same?
     if (cmakeBuildType.isSetByUser()) {
diff --git a/core/src/main/java/org/lflang/target/LoggingConfigurator.java b/core/src/main/java/org/lflang/target/LoggingConfigurator.java
deleted file mode 100644
index 5f0b537fd8..0000000000
--- a/core/src/main/java/org/lflang/target/LoggingConfigurator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.lflang.target;
-
-public class LoggingConfigurator {
-
-    /**
-     * Log levels in descending order of severity.
-     *
-     * @author Marten Lohstroh
-     */
-    public enum LogLevel {
-        ERROR,
-        WARN,
-        INFO,
-        LOG,
-        DEBUG;
-
-        /** Return the name in lower case. */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
-    }
-}
diff --git a/core/src/main/java/org/lflang/target/property/AuthProperty.java b/core/src/main/java/org/lflang/target/property/AuthProperty.java
new file mode 100644
index 0000000000..6106948282
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/AuthProperty.java
@@ -0,0 +1,16 @@
+package org.lflang.target.property;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.lflang.Target;
+import org.lflang.target.property.DefaultBooleanProperty;
+
+public class AuthProperty extends DefaultBooleanProperty {
+
+    @Override
+    public List<Target> supportedTargets() {
+        return Arrays.asList(Target.C, Target.CCPP);
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
new file mode 100644
index 0000000000..33d46e7639
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
@@ -0,0 +1,40 @@
+package org.lflang.target.property;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.lflang.Target;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.target.property.type.UnionType;
+
+public class BuildCommandsProperty extends TargetPropertyConfig<List<String>> {
+
+
+    public BuildCommandsProperty() {
+        super(UnionType.STRING_OR_STRING_ARRAY);
+    }
+
+    @Override
+    public List<String> initialize() {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public List<String> parse(Element value) {
+        return ASTUtils.elementToListOfStrings(value);
+    }
+
+    @Override
+    public List<Target> supportedTargets() {
+        return Arrays.asList(Target.C, Target.CCPP);
+    }
+
+    @Override
+    public Element export() {
+        return ASTUtils.toElement(this.value.toString());
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeConfig.java b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
similarity index 72%
rename from core/src/main/java/org/lflang/target/property/BuildTypeConfig.java
rename to core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
index 28e2e37cfe..eeca094465 100644
--- a/core/src/main/java/org/lflang/target/property/BuildTypeConfig.java
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
@@ -1,7 +1,10 @@
 package org.lflang.target.property;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Properties;
 
+import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
@@ -9,7 +12,11 @@
 import org.lflang.target.property.BuildConfig.BuildType;
 import org.lflang.target.property.type.UnionType;
 
-public class BuildTypeConfig extends TargetPropertyConfig<BuildType> {
+public class BuildTypeProperty extends TargetPropertyConfig<BuildType> {
+
+    public BuildTypeProperty() {
+        super(UnionType.BUILD_TYPE_UNION);
+    }
 
     @Override
     public Element export() {
@@ -26,6 +33,11 @@ public BuildType parse(Element value) {
         return (BuildType) UnionType.BUILD_TYPE_UNION.forName(ASTUtils.elementToSingleString(value));
     }
 
+    @Override
+    public List<Target> supportedTargets() {
+        return Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Rust);
+    }
+
     @Override
     public void update(Properties cliArgs) {
         super.update(cliArgs);
diff --git a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
new file mode 100644
index 0000000000..40f957d6c0
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
@@ -0,0 +1,57 @@
+package org.lflang.target.property;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.lflang.Target;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.generator.rust.CargoDependencySpec;
+import org.lflang.generator.rust.CargoDependencySpec.CargoDependenciesPropertyType;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.KeyValuePairs;
+import org.lflang.lf.LfFactory;
+
+public class CargoDependenciesProperty extends TargetPropertyConfig<Map<String, CargoDependencySpec>> {
+
+    public CargoDependenciesProperty() {
+        super(CargoDependenciesPropertyType.INSTANCE);
+    }
+
+    @Override
+    public Map<String, CargoDependencySpec> initialize() {
+        return new HashMap<>();
+    }
+
+    @Override
+    protected Map<String, CargoDependencySpec> parse(Element value) {
+        return CargoDependencySpec.parseAll(value);
+    }
+
+    @Override
+    public List<Target> supportedTargets() {
+        return Arrays.asList(Target.Rust);
+    }
+
+    @Override
+    public Element export() {
+        var deps = this.value;
+        if (deps.size() == 0) {
+            return null;
+        } else {
+            Element e = LfFactory.eINSTANCE.createElement();
+            KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+            for (var ent : deps.entrySet()) {
+                KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+                pair.setName(ent.getKey());
+                pair.setValue(CargoDependencySpec.extractSpec(ent.getValue()));
+                kvp.getPairs().add(pair);
+            }
+            e.setKeyvalue(kvp);
+            return e;
+        }
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java b/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
new file mode 100644
index 0000000000..e870154681
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
@@ -0,0 +1,15 @@
+package org.lflang.target.property;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.lflang.Target;
+
+public class CargoFeaturesProperty extends DefaultStringListProperty {
+
+    @Override
+    public List<Target> supportedTargets() {
+        return Arrays.asList(Target.Rust);
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/ClockSyncModeConfig.java b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
similarity index 76%
rename from core/src/main/java/org/lflang/target/ClockSyncModeConfig.java
rename to core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
index f0372002db..dd541fed0f 100644
--- a/core/src/main/java/org/lflang/target/ClockSyncModeConfig.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
@@ -1,6 +1,11 @@
-package org.lflang.target;
+package org.lflang.target.property;
 
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
@@ -9,12 +14,16 @@
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
 import org.lflang.lf.Reactor;
-import org.lflang.target.ClockSyncModeConfig.ClockSyncMode;
+import org.lflang.target.property.ClockSyncModeProperty.ClockSyncMode;
 import org.lflang.target.property.type.UnionType;
 import org.lflang.validation.ValidationReporter;
 
-public class ClockSyncModeConfig extends TargetPropertyConfig<ClockSyncMode> {
+public class ClockSyncModeProperty extends TargetPropertyConfig<ClockSyncMode> {
+
 
+    public ClockSyncModeProperty() {
+        super(UnionType.CLOCK_SYNC_UNION);
+    }
 
     @Override
     public ClockSyncMode initialize() {
@@ -27,15 +36,17 @@ public ClockSyncMode parse(Element value) {
         UnionType.CLOCK_SYNC_UNION.validate(value);
         var mode = (ClockSyncMode)
             UnionType.CLOCK_SYNC_UNION.forName(ASTUtils.elementToSingleString(value));
-        if (mode != null) {
-            return mode;
-        } else {
-            return ClockSyncMode.INIT;
-        }
+        return Objects.requireNonNullElse(mode, ClockSyncMode.INIT);
+    }
+
+    @Override
+    public List<Target> supportedTargets() {
+        return Arrays.asList(Target.C, Target.CCPP, Target.Python);
     }
 
     @Override
     public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+        super.validate(pair, ast, config, reporter);
         if (pair != null) {
             boolean federatedExists = false;
             for (Reactor reactor : ast.getReactors()) {
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsConfig.java b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
similarity index 92%
rename from core/src/main/java/org/lflang/target/property/ClockSyncOptionsConfig.java
rename to core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
index 9e984318a4..4b790b409f 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsConfig.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
@@ -1,6 +1,9 @@
 package org.lflang.target.property;
 
-import org.lflang.TargetConfig;
+import java.util.Arrays;
+import java.util.List;
+
+import org.lflang.Target;
 import org.lflang.TargetProperty.DictionaryElement;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.TimeUnit;
@@ -10,14 +13,16 @@
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
-import org.lflang.lf.Model;
-import org.lflang.target.property.ClockSyncOptionsConfig.ClockSyncOptions;
+import org.lflang.target.property.ClockSyncOptionsProperty.ClockSyncOptions;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.TargetPropertyType;
-import org.lflang.validation.ValidationReporter;
 
-public class ClockSyncOptionsConfig extends TargetPropertyConfig<ClockSyncOptions> {
+public class ClockSyncOptionsProperty extends TargetPropertyConfig<ClockSyncOptions> {
+
+    public ClockSyncOptionsProperty() {
+        super(DictionaryType.CLOCK_SYNC_OPTION_DICT);
+    }
 
     @Override
     public ClockSyncOptions initialize() {
@@ -46,8 +51,8 @@ public ClockSyncOptions parse(Element value) {
     }
 
     @Override
-    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
-
+    public List<Target> supportedTargets() {
+        return Arrays.asList(Target.C, Target.CCPP, Target.Python);
     }
 
     @Override
diff --git a/core/src/main/java/org/lflang/target/property/type/CmakeIncludeConfig.java b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
similarity index 69%
rename from core/src/main/java/org/lflang/target/property/type/CmakeIncludeConfig.java
rename to core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
index ebfac71d55..4dd02b840b 100644
--- a/core/src/main/java/org/lflang/target/property/type/CmakeIncludeConfig.java
+++ b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
@@ -1,14 +1,21 @@
-package org.lflang.target.property.type;
+package org.lflang.target.property;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.lflang.MessageReporter;
+import org.lflang.Target;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
+import org.lflang.target.property.type.UnionType;
 
-public class CmakeIncludeConfig extends TargetPropertyConfig<List<String>> {
+public class CmakeIncludeProperty extends TargetPropertyConfig<List<String>> {
+
+    public CmakeIncludeProperty() {
+        super(UnionType.FILE_OR_FILE_ARRAY);
+    }
 
     @Override
     public List<String> initialize() {
@@ -30,6 +37,11 @@ protected List<String> parse(Element value) {
         return ASTUtils.elementToListOfStrings(value);
     }
 
+    @Override
+    public List<Target> supportedTargets() {
+        return Arrays.asList(Target.CPP, Target.C, Target.CCPP);
+    }
+
     @Override
     public Element export() {
         return ASTUtils.toElement(this.value);
diff --git a/core/src/main/java/org/lflang/target/property/CompileDefinitionsConfig.java b/core/src/main/java/org/lflang/target/property/CompileDefinitionsConfig.java
new file mode 100644
index 0000000000..773bb7298a
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/CompileDefinitionsConfig.java
@@ -0,0 +1,38 @@
+package org.lflang.target.property.type;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.lflang.Target;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+
+public class CompileDefinitionsConfig extends TargetPropertyConfig<Map<String, String>> {
+
+    public CompileDefinitionsConfig() {
+        super(StringDictionaryType.COMPILE_DEFINITION);
+    }
+
+    @Override
+    public Map<String, String> initialize() {
+        return new HashMap<>();
+    }
+
+    @Override
+    protected Map<String, String> parse(Element value) {
+        return ASTUtils.elementToStringMaps(value);
+    }
+
+    @Override
+    public List<Target> supportedTargets() {
+        return Arrays.asList(Target.C, Target.CCPP, Target.Python);
+    }
+
+    @Override
+    public Element export() {
+        return ASTUtils.toElement(this.value);
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
new file mode 100644
index 0000000000..da1df83b44
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
@@ -0,0 +1,15 @@
+package org.lflang.target.property;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.lflang.Target;
+
+public class CompilerFlagsProperty extends DefaultStringListProperty {
+
+    @Override
+    public List<Target> supportedTargets() {
+        return Arrays.asList(Target.C, Target.CCPP);
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/CoordinationModeConfig.java b/core/src/main/java/org/lflang/target/property/CoordinationModeProperty.java
similarity index 69%
rename from core/src/main/java/org/lflang/target/CoordinationModeConfig.java
rename to core/src/main/java/org/lflang/target/property/CoordinationModeProperty.java
index b541b4a164..75397af897 100644
--- a/core/src/main/java/org/lflang/target/CoordinationModeConfig.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationModeProperty.java
@@ -1,16 +1,24 @@
-package org.lflang.target;
+package org.lflang.target.property;
 
+import java.util.Arrays;
+import java.util.List;
+
+import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.Model;
-import org.lflang.target.CoordinationModeConfig.CoordinationMode;
+import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
 import org.lflang.target.property.type.UnionType;
 import org.lflang.validation.ValidationReporter;
 
-public class CoordinationModeConfig extends TargetPropertyConfig<CoordinationMode> {
+public class CoordinationModeProperty extends TargetPropertyConfig<CoordinationMode> {
+
+    public CoordinationModeProperty() {
+        super(UnionType.COORDINATION_UNION);
+    }
 
     @Override
     public CoordinationMode initialize() {
@@ -22,6 +30,11 @@ public CoordinationMode parse(Element value) {
         return (CoordinationMode) UnionType.COORDINATION_UNION.forName(ASTUtils.elementToSingleString(value));
     }
 
+    @Override
+    public List<Target> supportedTargets() {
+        return Arrays.asList(Target.C, Target.CCPP, Target.Python);
+    }
+
     @Override
     public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {}
 
diff --git a/core/src/main/java/org/lflang/target/CoordinationOptionsConfig.java b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
similarity index 87%
rename from core/src/main/java/org/lflang/target/CoordinationOptionsConfig.java
rename to core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
index 755ffc73ff..3f0ea42e04 100644
--- a/core/src/main/java/org/lflang/target/CoordinationOptionsConfig.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
@@ -1,7 +1,9 @@
-package org.lflang.target;
+package org.lflang.target.property;
 
-import org.lflang.TargetConfig;
+import java.util.Arrays;
+import java.util.List;
 
+import org.lflang.Target;
 import org.lflang.TargetProperty.DictionaryElement;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.TimeValue;
@@ -10,14 +12,17 @@
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
-import org.lflang.lf.Model;
-import org.lflang.target.CoordinationOptionsConfig.CoordinationOptions;
+
+import org.lflang.target.property.CoordinationOptionsProperty.CoordinationOptions;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.TargetPropertyType;
-import org.lflang.validation.ValidationReporter;
 
-public class CoordinationOptionsConfig extends TargetPropertyConfig<CoordinationOptions> {
+public class CoordinationOptionsProperty extends TargetPropertyConfig<CoordinationOptions> {
+
+    public CoordinationOptionsProperty() {
+        super(DictionaryType.COORDINATION_OPTION_DICT);
+    }
 
     @Override
     public CoordinationOptions initialize() {
@@ -43,8 +48,8 @@ public CoordinationOptions parse(Element value) {
     }
 
     @Override
-    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
-        // FIXME
+    public List<Target> supportedTargets() {
+        return Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS);
     }
 
     @Override
diff --git a/core/src/main/java/org/lflang/target/AuthConfig.java b/core/src/main/java/org/lflang/target/property/DefaultBooleanProperty.java
similarity index 53%
rename from core/src/main/java/org/lflang/target/AuthConfig.java
rename to core/src/main/java/org/lflang/target/property/DefaultBooleanProperty.java
index 2c97897f7b..e546e704bb 100644
--- a/core/src/main/java/org/lflang/target/AuthConfig.java
+++ b/core/src/main/java/org/lflang/target/property/DefaultBooleanProperty.java
@@ -1,10 +1,17 @@
-package org.lflang.target;
+package org.lflang.target.property;
+
 
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
+import org.lflang.target.property.type.PrimitiveType;
+
 
-public class AuthConfig extends TargetPropertyConfig<Boolean> {
+public abstract class DefaultBooleanProperty extends TargetPropertyConfig<Boolean> {
+
+    public DefaultBooleanProperty() {
+        super(PrimitiveType.BOOLEAN);
+    }
 
     @Override
     public Boolean initialize() {
@@ -18,7 +25,6 @@ public Boolean parse(Element value) {
 
     @Override
     public Element export() {
-        return ASTUtils.toElement(this.value.toString());
+        return ASTUtils.toElement(value);
     }
-
 }
diff --git a/core/src/main/java/org/lflang/target/property/DefaultFileListProperty.java b/core/src/main/java/org/lflang/target/property/DefaultFileListProperty.java
new file mode 100644
index 0000000000..b69b053ea3
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/DefaultFileListProperty.java
@@ -0,0 +1,39 @@
+package org.lflang.target.property;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.target.property.type.UnionType;
+
+
+public abstract class DefaultFileListProperty extends TargetPropertyConfig<List<String>> {
+
+    public DefaultFileListProperty() {
+        super(UnionType.FILE_OR_FILE_ARRAY);
+    }
+
+    @Override
+    public void override(List<String> value) { // FIXME: should this be override or update?
+        this.setByUser = true;
+        this.value.addAll(value);
+    }
+
+    @Override
+    public List<String> initialize() {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public List<String> parse(Element value) {
+        return ASTUtils.elementToListOfStrings(value);
+    }
+
+    @Override
+    public Element export() {
+        return ASTUtils.toElement(value);
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/property/DefaultStringConfig.java b/core/src/main/java/org/lflang/target/property/DefaultStringConfig.java
new file mode 100644
index 0000000000..094c7c1728
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/DefaultStringConfig.java
@@ -0,0 +1,33 @@
+package org.lflang.target.property;
+
+
+import java.util.List;
+
+import org.lflang.Target;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.target.property.type.PrimitiveType;
+
+
+public abstract class DefaultStringConfig extends TargetPropertyConfig<String> {
+
+    public DefaultStringConfig() {
+        super(PrimitiveType.STRING);
+    }
+
+    @Override
+    public String initialize() {
+        return "";
+    }
+
+    @Override
+    public String parse(Element value) {
+        return ASTUtils.elementToSingleString(value);
+    }
+
+    @Override
+    public Element export() {
+        return ASTUtils.toElement(value);
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/property/BuildCommandsConfig.java b/core/src/main/java/org/lflang/target/property/DefaultStringListProperty.java
similarity index 61%
rename from core/src/main/java/org/lflang/target/property/BuildCommandsConfig.java
rename to core/src/main/java/org/lflang/target/property/DefaultStringListProperty.java
index 22458f8a76..e7bb90b4cb 100644
--- a/core/src/main/java/org/lflang/target/property/BuildCommandsConfig.java
+++ b/core/src/main/java/org/lflang/target/property/DefaultStringListProperty.java
@@ -1,13 +1,20 @@
 package org.lflang.target.property;
 
+
 import java.util.ArrayList;
 import java.util.List;
 
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
+import org.lflang.target.property.type.UnionType;
+
 
-public class BuildCommandsConfig extends TargetPropertyConfig<List<String>> {
+public abstract class DefaultStringListProperty extends TargetPropertyConfig<List<String>> {
+
+    public DefaultStringListProperty() {
+        super(UnionType.STRING_OR_STRING_ARRAY);
+    }
 
     @Override
     public List<String> initialize() {
@@ -21,7 +28,7 @@ public List<String> parse(Element value) {
 
     @Override
     public Element export() {
-        return ASTUtils.toElement(this.value.toString());
+        return ASTUtils.toElement(value);
     }
 
 }
diff --git a/core/src/main/java/org/lflang/target/DockerConfig.java b/core/src/main/java/org/lflang/target/property/DockerProperty.java
similarity index 89%
rename from core/src/main/java/org/lflang/target/DockerConfig.java
rename to core/src/main/java/org/lflang/target/property/DockerProperty.java
index ebc319b768..b5136cfd7b 100644
--- a/core/src/main/java/org/lflang/target/DockerConfig.java
+++ b/core/src/main/java/org/lflang/target/property/DockerProperty.java
@@ -1,26 +1,31 @@
-package org.lflang.target;
+package org.lflang.target.property;
 
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Properties;
 
-import org.lflang.TargetConfig;
+import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.TargetProperty.DictionaryElement;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
-import org.lflang.target.DockerConfig.DockerOptions;
+import org.lflang.target.property.DockerProperty.DockerOptions;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
-import org.lflang.lf.Model;
-import org.lflang.validation.ValidationReporter;
+import org.lflang.target.property.type.UnionType;
 
 
-public class DockerConfig extends TargetPropertyConfig<DockerOptions> {
+public class DockerProperty extends TargetPropertyConfig<DockerOptions> {
+
+    public DockerProperty() {
+        super(UnionType.DOCKER_UNION);
+    }
 
     @Override
     public DockerOptions initialize() {
@@ -63,8 +68,8 @@ public DockerOptions parse(Element value) {
     }
 
     @Override
-    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
-
+    public List<Target> supportedTargets() {
+        return Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS);
     }
 
     @Override
diff --git a/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java b/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
new file mode 100644
index 0000000000..b71ba34311
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
@@ -0,0 +1,14 @@
+package org.lflang.target.property;
+
+import java.util.List;
+
+import org.lflang.Target;
+
+public class ExportDependencyGraphProperty extends DefaultBooleanProperty {
+
+    @Override
+    public List<Target> supportedTargets() {
+        return List.of(Target.CPP, Target.Rust);
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java b/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
new file mode 100644
index 0000000000..6abb07ccd3
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
@@ -0,0 +1,14 @@
+package org.lflang.target.property;
+
+import java.util.List;
+
+import org.lflang.Target;
+
+public class ExportToYamlProperty extends DefaultBooleanProperty {
+
+    @Override
+    public List<Target> supportedTargets() {
+        return List.of(Target.CPP);
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathConfig.java b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathConfig.java
new file mode 100644
index 0000000000..0e606019a4
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathConfig.java
@@ -0,0 +1,14 @@
+package org.lflang.target.property.type;
+
+import java.util.List;
+
+import org.lflang.Target;
+import org.lflang.target.property.DefaultStringConfig;
+
+public class ExternalRuntimePathConfig extends DefaultStringConfig {
+
+    @Override
+    public List<Target> supportedTargets() {
+        return List.of(Target.CPP);
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/FastModeConfig.java b/core/src/main/java/org/lflang/target/property/FastProperty.java
similarity index 77%
rename from core/src/main/java/org/lflang/target/FastModeConfig.java
rename to core/src/main/java/org/lflang/target/property/FastProperty.java
index 72ded2c473..f15493068b 100644
--- a/core/src/main/java/org/lflang/target/FastModeConfig.java
+++ b/core/src/main/java/org/lflang/target/property/FastProperty.java
@@ -1,27 +1,24 @@
-package org.lflang.target;
+package org.lflang.target.property;
 
+import java.util.List;
+
+import org.lflang.Target;
 import org.lflang.TargetConfig;
-import org.lflang.TargetPropertyConfig;
-import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Action;
 import org.lflang.lf.ActionOrigin;
-import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
 import org.lflang.lf.Reactor;
-import org.lflang.validation.ValidationReporter;
+import org.lflang.target.property.DefaultBooleanProperty;
 
-public class FastModeConfig extends TargetPropertyConfig<Boolean> {
+import org.lflang.validation.ValidationReporter;
 
-    @Override
-    public Boolean initialize() {
-        return false;
-    }
+public class FastProperty extends DefaultBooleanProperty {
 
     @Override
-    public Boolean parse(Element value) {
-        return ASTUtils.toBoolean(value);
+    public List<Target> supportedTargets() {
+        return Target.ALL;
     }
 
     @Override
@@ -53,12 +50,5 @@ public void validate(KeyValuePair pair, Model ast, TargetConfig config, Validati
                 }
             }
         }
-
     }
-
-    @Override
-    public Element export() {
-        return ASTUtils.toElement(this.value);
-    }
-
 }
diff --git a/core/src/main/java/org/lflang/target/property/FilesProperty.java b/core/src/main/java/org/lflang/target/property/FilesProperty.java
new file mode 100644
index 0000000000..61750c8c37
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/FilesProperty.java
@@ -0,0 +1,14 @@
+package org.lflang.target.property;
+
+import java.util.List;
+
+import org.lflang.Target;
+
+public class FilesProperty extends DefaultFileListProperty {
+
+    @Override
+    public List<Target> supportedTargets() {
+        return List.of(Target.C, Target.CCPP, Target.Python);
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/KeepaliveConfig.java b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
similarity index 61%
rename from core/src/main/java/org/lflang/target/KeepaliveConfig.java
rename to core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
index c7059b946d..4c1db334a5 100644
--- a/core/src/main/java/org/lflang/target/KeepaliveConfig.java
+++ b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
@@ -1,41 +1,37 @@
-package org.lflang.target;
+package org.lflang.target.property;
 
+import static org.lflang.TargetProperty.KEEPALIVE;
+
+import java.util.List;
 import java.util.Properties;
 
 import org.lflang.Target;
 import org.lflang.TargetConfig;
-import org.lflang.TargetProperty;
-import org.lflang.TargetPropertyConfig;
-import org.lflang.ast.ASTUtils;
-import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
+import org.lflang.target.property.DefaultBooleanProperty;
 import org.lflang.validation.ValidationReporter;
 
-public class KeepaliveConfig extends TargetPropertyConfig<Boolean> {
-
-    @Override
-    public Boolean initialize() {
-        return false;
-    }
+public class KeepaliveProperty extends DefaultBooleanProperty {
 
     @Override
     public void update(Properties cliArgs) {
         super.update(cliArgs);
-        var key = TargetProperty.KEEPALIVE.toString();
+        var key = KEEPALIVE.toString();
         if (cliArgs.containsKey(key)) {
-            this.override(Boolean.parseBoolean(cliArgs.getProperty(TargetProperty.KEEPALIVE.description)));
+            this.override(Boolean.parseBoolean(cliArgs.getProperty(KEEPALIVE.toString())));
         }
     }
 
     @Override
-    public Boolean parse(Element value) {
-        return ASTUtils.toBoolean(value);
+    public List<Target> supportedTargets() {
+        return Target.ALL;
     }
 
     @Override
     public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+        super.validate(pair, ast, config, reporter);
         if (pair != null && config.target == Target.CPP) {
             reporter.warning(
                 "The keepalive property is inferred automatically by the C++ "
@@ -45,8 +41,4 @@ public void validate(KeyValuePair pair, Model ast, TargetConfig config, Validati
         }
     }
 
-    @Override
-    public Element export() {
-        return ASTUtils.toElement(this.value);
-    }
 }
diff --git a/core/src/main/java/org/lflang/target/property/LoggingProperty.java b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
new file mode 100644
index 0000000000..386b712402
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
@@ -0,0 +1,58 @@
+package org.lflang.target.property;
+
+
+import java.util.List;
+
+import org.lflang.Target;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.target.property.LoggingProperty.LogLevel;
+import org.lflang.target.property.type.UnionType;
+
+public class LoggingProperty extends TargetPropertyConfig<LogLevel> {
+
+    public LoggingProperty() {
+        super(UnionType.LOGGING_UNION);
+    }
+
+    @Override
+    public LogLevel initialize() {
+        return LogLevel.INFO;
+    }
+
+    @Override
+    protected LogLevel parse(Element value) {
+        return (LogLevel) UnionType.LOGGING_UNION.forName(ASTUtils.elementToSingleString(value));
+    }
+
+    @Override
+    public List<Target> supportedTargets() {
+        return Target.ALL;
+    }
+
+    @Override
+    public Element export() {
+        return ASTUtils.toElement(value.toString());
+    }
+
+    /**
+     * Log levels in descending order of severity.
+     *
+     * @author Marten Lohstroh
+     */
+    public enum LogLevel {
+        ERROR,
+        WARN,
+        INFO,
+        LOG,
+        DEBUG;
+
+        /** Return the name in lower case. */
+        @Override
+        public String toString() {
+            return this.name().toLowerCase();
+        }
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
new file mode 100644
index 0000000000..1e7ac01ef2
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
@@ -0,0 +1,15 @@
+package org.lflang.target.property;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.lflang.Target;
+
+public class NoCompileProperty extends DefaultBooleanProperty {
+
+    @Override
+    public List<Target> supportedTargets() {
+        return Arrays.asList(Target.C, Target.CPP, Target.CCPP, Target.Python);
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java b/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
new file mode 100644
index 0000000000..d5132341d6
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
@@ -0,0 +1,14 @@
+package org.lflang.target.property;
+
+import java.util.List;
+
+import org.lflang.Target;
+
+public class NoRuntimeValidationProperty extends DefaultBooleanProperty {
+
+    @Override
+    public List<Target> supportedTargets() {
+        return List.of(Target.CPP);
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/PlatformConfig.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
similarity index 95%
rename from core/src/main/java/org/lflang/target/PlatformConfig.java
rename to core/src/main/java/org/lflang/target/property/PlatformProperty.java
index 28b8d82a33..2980d96964 100644
--- a/core/src/main/java/org/lflang/target/PlatformConfig.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -1,7 +1,9 @@
-package org.lflang.target;
+package org.lflang.target.property;
 
 import java.util.Arrays;
+import java.util.List;
 
+import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.DictionaryElement;
@@ -9,7 +11,7 @@
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.LfPackage.Literals;
-import org.lflang.target.PlatformConfig.PlatformOptions;
+import org.lflang.target.property.PlatformProperty.PlatformOptions;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.TargetPropertyType;
@@ -20,7 +22,11 @@
 import org.lflang.target.property.type.UnionType;
 import org.lflang.validation.ValidationReporter;
 
-public class PlatformConfig extends TargetPropertyConfig<PlatformOptions> {
+public class PlatformProperty extends TargetPropertyConfig<PlatformOptions> {
+
+    public PlatformProperty() {
+        super(UnionType.PLATFORM_STRING_OR_DICTIONARY);
+    }
 
     @Override
     public PlatformOptions initialize() {
@@ -76,8 +82,14 @@ public PlatformOptions parse(Element value) { // FIXME: pass in err
         return config;
     }
 
+    @Override
+    public List<Target> supportedTargets() {
+        return Target.ALL;
+    }
+
     @Override
     public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+        super.validate(pair, ast, config, reporter);
         var threading = TargetProperty.getKeyValuePair(ast, TargetProperty.THREADING);
         if (threading != null) {
             if (pair != null && ASTUtils.toBoolean(threading.getValue())) {
diff --git a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
new file mode 100644
index 0000000000..019eb1eb22
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
@@ -0,0 +1,14 @@
+package org.lflang.target.property;
+
+import java.util.List;
+
+import org.lflang.Target;
+
+public class PrintStatisticsProperty extends DefaultBooleanProperty {
+
+    @Override
+    public List<Target> supportedTargets() {
+        return List.of(Target.CPP);
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java b/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
new file mode 100644
index 0000000000..bf17e49383
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
@@ -0,0 +1,14 @@
+package org.lflang.target.property;
+
+import java.util.List;
+
+import org.lflang.Target;
+
+public class ProtobufsProperty extends DefaultFileListProperty {
+
+    @Override
+    public List<Target> supportedTargets() {
+        return List.of(Target.C, Target.CCPP, Target.TS, Target.Python);
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/Ros2DependenciesConfig.java b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
similarity index 73%
rename from core/src/main/java/org/lflang/target/Ros2DependenciesConfig.java
rename to core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
index c8fb599a85..2f5450dd12 100644
--- a/core/src/main/java/org/lflang/target/Ros2DependenciesConfig.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
@@ -1,9 +1,9 @@
-package org.lflang.target;
+package org.lflang.target.property;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.lflang.MessageReporter;
+import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.TargetPropertyConfig;
@@ -12,10 +12,14 @@
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
+import org.lflang.target.property.type.ArrayType;
 import org.lflang.validation.ValidationReporter;
 
-public class Ros2DependenciesConfig extends TargetPropertyConfig<List<String>> {
+public class Ros2DependenciesProperty extends TargetPropertyConfig<List<String>> {
 
+    public Ros2DependenciesProperty() {
+        super(ArrayType.STRING_ARRAY);
+    }
 
     @Override
     public List<String> initialize() {
@@ -27,8 +31,14 @@ public List parse(Element value) {
         return ASTUtils.elementToListOfStrings(value);
     }
 
+    @Override
+    public List<Target> supportedTargets() {
+        return List.of(Target.CPP);
+    }
+
     @Override
     public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+        super.validate(pair, ast, config, reporter);
         var ros2enabled = TargetProperty.getKeyValuePair(ast, TargetProperty.ROS2);
         if (pair != null && (ros2enabled == null || !ASTUtils.toBoolean(ros2enabled.getValue()))) {
             reporter.warning(
diff --git a/core/src/main/java/org/lflang/target/property/Ros2Property.java b/core/src/main/java/org/lflang/target/property/Ros2Property.java
new file mode 100644
index 0000000000..39fc2e78e8
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/Ros2Property.java
@@ -0,0 +1,14 @@
+package org.lflang.target.property;
+
+import java.util.List;
+
+import org.lflang.Target;
+
+public class Ros2Property extends DefaultBooleanProperty {
+
+    @Override
+    public List<Target> supportedTargets() {
+        return List.of(Target.CPP);
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
new file mode 100644
index 0000000000..2be751f27c
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
@@ -0,0 +1,13 @@
+package org.lflang.target.property;
+
+import java.util.List;
+
+import org.lflang.Target;
+
+public class RuntimeVersionProperty extends DefaultStringConfig {
+
+    @Override
+    public List<Target> supportedTargets() {
+        return List.of(Target.CPP);
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
new file mode 100644
index 0000000000..79fb107be9
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
@@ -0,0 +1,97 @@
+package org.lflang.target.property;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.lflang.MessageReporter;
+import org.lflang.Target;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Array;
+import org.lflang.lf.Element;
+import org.lflang.lf.LfFactory;
+import org.lflang.target.property.type.UnionType;
+import org.lflang.util.FileUtil;
+import org.lflang.util.StringUtil;
+
+public class RustIncludeProperty extends TargetPropertyConfig<List<Path>> {
+
+    public RustIncludeProperty() {
+        super(UnionType.FILE_OR_FILE_ARRAY);
+    }
+
+    @Override
+    public List<Target> supportedTargets() {
+        return List.of(Target.Rust);
+    }
+
+    @Override
+    public List<Path> initialize() {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public List<Path> parse(Element value) {
+        Path referencePath;
+        try {
+            referencePath = FileUtil.toPath(value.eResource().getURI()).toAbsolutePath();
+        } catch (IllegalArgumentException e) {
+            // FIXME: need err
+            //err.at(value).error("Invalid path? " + e.getMessage());
+            throw e;
+        }
+
+        // we'll resolve relative paths to check that the files
+        // are as expected.
+
+        if (value.getLiteral() != null) {
+            Path resolved = referencePath.resolveSibling(StringUtil.removeQuotes(value.getLiteral()));
+            this.addAndCheckTopLevelModule(resolved, value, err);
+        } else if (value.getArray() != null) {
+            for (Element element : value.getArray().getElements()) {
+                String literal = StringUtil.removeQuotes(element.getLiteral());
+                Path resolved = referencePath.resolveSibling(literal);
+                this.addAndCheckTopLevelModule(resolved, element, err);
+            }
+        }
+    }
+
+    @Override
+    public Element export() {
+        // do not check paths here, and simply copy the absolute path over
+        List<Path> paths = this.value;
+        if (paths.isEmpty()) {
+            return null;
+        } else if (paths.size() == 1) {
+            return ASTUtils.toElement(paths.get(0).toString());
+        } else {
+            Element e = LfFactory.eINSTANCE.createElement();
+            Array arr = LfFactory.eINSTANCE.createArray();
+            for (Path p : paths) {
+                arr.getElements().add(ASTUtils.toElement(p.toString()));
+            }
+            e.setArray(arr);
+            return e;
+        }
+    }
+
+    private void addAndCheckTopLevelModule(Path path, EObject errorOwner, MessageReporter err) {
+        String fileName = path.getFileName().toString();
+        if (!Files.exists(path)) {
+            err.at(errorOwner).error("File not found");
+        } else if (Files.isRegularFile(path) && !fileName.endsWith(".rs")) {
+            err.at(errorOwner).error("Not a rust file");
+        } else if (fileName.equals("main.rs")) {
+            err.at(errorOwner).error("Cannot use 'main.rs' as a module name (reserved)");
+        } else if (fileName.equals("reactors") || fileName.equals("reactors.rs")) {
+            err.at(errorOwner).error("Cannot use 'reactors' as a module name (reserved)");
+        } else if (Files.isDirectory(path) && !Files.exists(path.resolve("mod.rs"))) {
+            err.at(errorOwner).error("Cannot find module descriptor in directory");
+        }
+        this.value.add(path);
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/SchedulerConfig.java b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
similarity index 90%
rename from core/src/main/java/org/lflang/target/SchedulerConfig.java
rename to core/src/main/java/org/lflang/target/property/SchedulerProperty.java
index 9f90ea6d6c..66a6d83b47 100644
--- a/core/src/main/java/org/lflang/target/SchedulerConfig.java
+++ b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
@@ -1,10 +1,11 @@
-package org.lflang.target;
+package org.lflang.target.property;
 
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
 
-import org.lflang.MessageReporter;
+import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.TargetPropertyConfig;
@@ -14,14 +15,19 @@
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
 
-import org.lflang.target.SchedulerConfig.SchedulerOption;
+import org.lflang.target.property.SchedulerProperty.SchedulerOption;
 import org.lflang.target.property.type.UnionType;
 import org.lflang.validation.ValidationReporter;
 
 
 import com.google.common.collect.ImmutableList;
 
-public class SchedulerConfig extends TargetPropertyConfig<SchedulerOption> {
+public class SchedulerProperty extends TargetPropertyConfig<SchedulerOption> {
+
+
+    public SchedulerProperty() {
+        super(UnionType.SCHEDULER_UNION);
+    }
 
     @Override
     public SchedulerOption initialize() {
@@ -48,6 +54,11 @@ public SchedulerOption parse(Element value) {
         }
     }
 
+    @Override
+    public List<Target> supportedTargets() {
+        return Arrays.asList(Target.C, Target.CCPP, Target.Python);
+    }
+
     @Override
     public Element export() {
         return ASTUtils.toElement(this.value.toString());
@@ -55,6 +66,7 @@ public Element export() {
 
     @Override
     public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
+        super.validate(pair, ast, config, reporter);
         if (pair != null) {
             String schedulerName = ASTUtils.elementToSingleString(pair.getValue());
             try {
diff --git a/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java b/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
new file mode 100644
index 0000000000..f779be00a1
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
@@ -0,0 +1,14 @@
+package org.lflang.target.property;
+
+import java.util.List;
+
+import org.lflang.Target;
+
+public class SingleFileProjectProperty extends DefaultBooleanProperty {
+
+    @Override
+    public List<Target> supportedTargets() {
+        return List.of(Target.Rust);
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/property/ThreadingProperty.java b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
new file mode 100644
index 0000000000..023480ed28
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
@@ -0,0 +1,19 @@
+package org.lflang.target.property;
+
+import java.util.List;
+
+import org.lflang.Target;
+
+public class ThreadingProperty extends DefaultBooleanProperty {
+
+    @Override
+    public List<Target> supportedTargets() {
+        return List.of(Target.C, Target.CCPP, Target.Python);
+    }
+
+
+    @Override
+    public Boolean initialize() {
+        return true;
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
new file mode 100644
index 0000000000..6aec1948fd
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
@@ -0,0 +1,39 @@
+package org.lflang.target.property;
+
+
+import java.util.List;
+
+import org.lflang.Target;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.TimeValue;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.target.property.type.PrimitiveType;
+
+
+public class TimeOutProperty extends TargetPropertyConfig<TimeValue> {
+
+    public TimeOutProperty() {
+        super(PrimitiveType.TIME_VALUE);
+    }
+
+    @Override
+    public TimeValue initialize() {
+        return null;
+    }
+
+    @Override
+    public TimeValue parse(Element value) {
+        return ASTUtils.toTimeValue(value);
+    }
+
+    @Override
+    public List<Target> supportedTargets() {
+        return Target.ALL;
+    }
+
+    @Override
+    public Element export() {
+        return ASTUtils.toElement(value);
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/TracingConfig.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
similarity index 91%
rename from core/src/main/java/org/lflang/target/TracingConfig.java
rename to core/src/main/java/org/lflang/target/property/TracingProperty.java
index cee56c3ddd..1bca01000d 100644
--- a/core/src/main/java/org/lflang/target/TracingConfig.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -1,13 +1,15 @@
-package org.lflang.target;
+package org.lflang.target.property;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.Properties;
 
+import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.DictionaryElement;
 import org.lflang.TargetPropertyConfig;
-import org.lflang.target.TracingConfig.TracingOptions;
+import org.lflang.target.property.TracingProperty.TracingOptions;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.TargetPropertyType;
@@ -18,11 +20,16 @@
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
+import org.lflang.target.property.type.UnionType;
 import org.lflang.validation.ValidationReporter;
 
-public class TracingConfig extends TargetPropertyConfig<TracingOptions> {
+public class TracingProperty extends TargetPropertyConfig<TracingOptions> {
 
 
+    public TracingProperty() {
+        super(UnionType.TRACING_UNION);
+    }
+
     @Override
     public TracingOptions initialize() {
         return new TracingOptions(false);
@@ -60,6 +67,11 @@ public TracingOptions parse(Element value) {
         return options;
     }
 
+    @Override
+    public List<Target> supportedTargets() {
+        return List.of(Target.C, Target.CCPP, Target.CPP, Target.Python);
+    }
+
     @Override
     public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
         if (pair != null && this.parse(pair.getValue()) != null) {
diff --git a/core/src/main/java/org/lflang/target/property/VerifyProperty.java b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
new file mode 100644
index 0000000000..0a6549bbc3
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
@@ -0,0 +1,15 @@
+package org.lflang.target.property.type;
+
+import java.util.List;
+
+import org.lflang.Target;
+import org.lflang.target.property.DefaultBooleanProperty;
+
+public class VerifyProperty extends DefaultBooleanProperty {
+
+    @Override
+    public List<Target> supportedTargets() {
+        return List.of(Target.C);
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/property/WorkersProperty.java b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
new file mode 100644
index 0000000000..50e1a8bc0e
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
@@ -0,0 +1,37 @@
+package org.lflang.target.property;
+
+import java.util.List;
+
+import org.lflang.Target;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.target.property.type.PrimitiveType;
+
+public class WorkersProperty extends TargetPropertyConfig<Integer> {
+
+    public WorkersProperty() {
+        super(PrimitiveType.NON_NEGATIVE_INTEGER);
+    }
+
+    @Override
+    public Integer initialize() {
+        return 0;
+    }
+
+    @Override
+    protected Integer parse(Element value) {
+        return ASTUtils.toInteger(value);
+    }
+
+    @Override
+    public List<Target> supportedTargets() {
+        return List.of(Target.C, Target.CCPP, Target.Python, Target.CPP, Target.Rust);
+    }
+
+    @Override
+    public Element export() {
+        return ASTUtils.toElement(value);
+    }
+
+}
diff --git a/core/src/main/java/org/lflang/target/property/type/ArrayType.java b/core/src/main/java/org/lflang/target/property/type/ArrayType.java
index 8b6621535a..9a40560047 100644
--- a/core/src/main/java/org/lflang/target/property/type/ArrayType.java
+++ b/core/src/main/java/org/lflang/target/property/type/ArrayType.java
@@ -5,6 +5,7 @@
 import org.lflang.lf.Array;
 import org.lflang.lf.Element;
 import org.lflang.validation.LFValidator;
+import org.lflang.validation.ValidationReporter;
 
 /**
  * An array type of which the elements confirm to a given type.
@@ -32,16 +33,17 @@ private ArrayType(TargetPropertyType type) {
      * the correct type.
      */
     @Override
-    public void check(Element e, String name, LFValidator v) {
+    public boolean check(Element e, String name, ValidationReporter v) {
         Array array = e.getArray();
-        if (array == null) {
-            TargetPropertyType.produceError(name, this.toString(), v);
-        } else {
+        if (array != null) {
             List<Element> elements = array.getElements();
+            var valid = true;
             for (int i = 0; i < elements.size(); i++) {
-                this.type.check(elements.get(i), name + "[" + i + "]", v);
+                valid &= this.type.check(elements.get(i), name + "[" + i + "]", v);
             }
+            return valid;
         }
+        return false;
     }
 
     /** Return true of the given element is an array. */
diff --git a/core/src/main/java/org/lflang/target/property/type/CompilerConfig.java b/core/src/main/java/org/lflang/target/property/type/CompilerConfig.java
new file mode 100644
index 0000000000..80248bb0d6
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/type/CompilerConfig.java
@@ -0,0 +1,14 @@
+package org.lflang.target.property.type;
+
+import java.util.List;
+
+import org.lflang.Target;
+import org.lflang.target.property.DefaultStringConfig;
+
+public class CompilerConfig extends DefaultStringConfig {
+
+    @Override
+    public List<Target> supportedTargets() {
+        return Target.ALL;
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/property/type/DictionaryType.java b/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
index 7f4ba7e44f..97691d2248 100644
--- a/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
+++ b/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
@@ -10,12 +10,12 @@
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
-import org.lflang.target.CoordinationOptionsConfig.CoordinationOption;
-import org.lflang.target.DockerConfig.DockerOption;
-import org.lflang.target.PlatformConfig.PlatformOption;
-import org.lflang.target.TracingConfig.TracingOption;
-import org.lflang.target.property.ClockSyncOptionsConfig.ClockSyncOption;
-import org.lflang.validation.LFValidator;
+import org.lflang.target.property.CoordinationOptionsProperty.CoordinationOption;
+import org.lflang.target.property.DockerProperty.DockerOption;
+import org.lflang.target.property.PlatformProperty.PlatformOption;
+import org.lflang.target.property.TracingProperty.TracingOption;
+import org.lflang.target.property.ClockSyncOptionsProperty.ClockSyncOption;
+import org.lflang.validation.ValidationReporter;
 
 /**
  * A dictionary type with a predefined set of possible keys and assignable types.
@@ -53,11 +53,10 @@ public DictionaryElement forName(String name) {
 
     /** Recursively check that the passed in element conforms to the rules of this dictionary. */
     @Override
-    public void check(Element e, String name, LFValidator v) {
+    public boolean check(Element e, String name, ValidationReporter v) {
         KeyValuePairs kv = e.getKeyvalue();
-        if (kv == null) {
-            TargetPropertyType.produceError(name, this.toString(), v);
-        } else {
+        if (kv != null) {
+            var valid = true;
             for (KeyValuePair pair : kv.getPairs()) {
                 String key = pair.getName();
                 Element val = pair.getValue();
@@ -68,13 +67,14 @@ public void check(Element e, String name, LFValidator v) {
                 if (match.isPresent()) {
                     // Make sure the type is correct, too.
                     TargetPropertyType type = match.get().getType();
-                    type.check(val, name + "." + key, v);
+                    valid &= type.check(val, name + "." + key, v);
                 } else {
-                    // No match found; report error.
-                    TargetPropertyType.produceError(name, this.toString(), v);
+                    valid = false;
                 }
+                return valid;
             }
         }
+        return false;
     }
 
     /** Return true if the given element represents a dictionary, false otherwise. */
diff --git a/core/src/main/java/org/lflang/target/property/type/PrimitiveType.java b/core/src/main/java/org/lflang/target/property/type/PrimitiveType.java
index 0e3a6a5be3..868669243d 100644
--- a/core/src/main/java/org/lflang/target/property/type/PrimitiveType.java
+++ b/core/src/main/java/org/lflang/target/property/type/PrimitiveType.java
@@ -4,7 +4,7 @@
 
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
-import org.lflang.validation.LFValidator;
+import org.lflang.validation.ValidationReporter;
 
 /**
  * Primitive types for target properties, each with a description used in error messages and
@@ -64,12 +64,12 @@ public enum PrimitiveType implements TargetPropertyType {
      * @param description A textual description of the type that should start with "a/an".
      * @param validator A predicate that returns true if a given Element conforms to this type.
      */
-    private PrimitiveType(String description, Predicate<Element> validator) {
+    PrimitiveType(String description, Predicate<Element> validator) {
         this.description = description;
         this.validator = validator;
     }
 
-    /** Return true if the the given Element is a valid instance of this type. */
+    /** Return true if the given Element is a valid instance of this type. */
     public boolean validate(Element e) {
         return this.validator.test(e);
     }
@@ -82,24 +82,8 @@ public boolean validate(Element e) {
      * @param name The name of the target property.
      * @param v The LFValidator to append errors to.
      */
-    public void check(Element e, String name, LFValidator v) {
-        if (!this.validate(e)) {
-            TargetPropertyType.produceError(name, this.description, v);
-        }
-        // If this is a file, perform an additional check to make sure
-        // the file actually exists.
-        // FIXME: premature because we first need a mechanism for looking up files!
-        // Looking in the same directory is too restrictive. Disabling this check for now.
-      /*
-      if (this == FILE) {
-          String file = ASTUtils.toSingleString(e);
-
-          if (!FileConfig.fileExists(file, FileConfig.toPath(e.eResource().getURI()).toFile().getParent())) {
-              v.targetPropertyWarnings
-                      .add("Could not find file: '" + file + "'.");
-          }
-      }
-      */
+    public boolean check(Element e, String name, ValidationReporter v) {
+        return this.validate(e);
     }
 
     /** Return a textual description of this type. */
diff --git a/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java b/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java
index cec3a7f9df..dda0d6065e 100644
--- a/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java
+++ b/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java
@@ -4,6 +4,7 @@
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.validation.LFValidator;
+import org.lflang.validation.ValidationReporter;
 
 /** Dictionary type that allows for keys that will be interpreted as strings and string values. */
 public enum StringDictionaryType implements TargetPropertyType {
@@ -18,18 +19,19 @@ public boolean validate(Element e) {
     }
 
     @Override
-    public void check(Element e, String name, LFValidator v) {
+    public boolean check(Element e, String name, ValidationReporter v) {
         KeyValuePairs kv = e.getKeyvalue();
-        if (kv == null) {
-            TargetPropertyType.produceError(name, this.toString(), v);
-        } else {
+        if (kv != null) {
+            var valid = true;
             for (KeyValuePair pair : kv.getPairs()) {
                 String key = pair.getName();
                 Element val = pair.getValue();
 
                 // Make sure the type is string
-                PrimitiveType.STRING.check(val, name + "." + key, v);
+                valid &= PrimitiveType.STRING.check(val, name + "." + key, v);
             }
+            return valid;
         }
+        return false;
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java b/core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java
index 390d4aa1e7..06f0a5cbbb 100644
--- a/core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java
+++ b/core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java
@@ -5,6 +5,7 @@
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.validation.LFValidator;
+import org.lflang.validation.ValidationReporter;
 
 /**
  * An interface for types associated with target properties.
@@ -14,7 +15,7 @@
 public interface TargetPropertyType {
 
     /**
-     * Return true if the the given Element is a valid instance of this type.
+     * Return true if the given Element is a valid instance of this type.
      *
      * @param e The Element to validate.
      * @return True if the element conforms to this type, false otherwise.
@@ -29,20 +30,8 @@ public interface TargetPropertyType {
      * @param name The name of the target property.
      * @param v A reference to the validator to report errors to.
      */
-    public void check(Element e, String name, LFValidator v);
+    public boolean check(Element e, String name, ValidationReporter v);
 
-    /**
-     * Helper function to produce an error during type checking.
-     *
-     * @param name The description of the target property.
-     * @param description The description of the type.
-     * @param v A reference to the validator to report errors to.
-     */
-    public static void produceError(String name, String description, LFValidator v) {
-
-        v.reportTargetPropertyError(
-            "Target property '" + name + "' is required to be " + description + ".");
-    }
 }
 
 
diff --git a/core/src/main/java/org/lflang/target/property/type/UnionType.java b/core/src/main/java/org/lflang/target/property/type/UnionType.java
index 4703605b09..351eef2b8e 100644
--- a/core/src/main/java/org/lflang/target/property/type/UnionType.java
+++ b/core/src/main/java/org/lflang/target/property/type/UnionType.java
@@ -8,13 +8,13 @@
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
-import org.lflang.target.ClockSyncModeConfig.ClockSyncMode;
-import org.lflang.target.CoordinationModeConfig.CoordinationMode;
-import org.lflang.target.LoggingConfigurator.LogLevel;
-import org.lflang.target.PlatformConfig.Platform;
-import org.lflang.target.SchedulerConfig.SchedulerOption;
+import org.lflang.target.property.ClockSyncModeProperty.ClockSyncMode;
+import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
+import org.lflang.target.property.PlatformProperty.Platform;
+import org.lflang.target.property.SchedulerProperty.SchedulerOption;
 import org.lflang.target.property.BuildConfig.BuildType;
-import org.lflang.validation.LFValidator;
+import org.lflang.target.property.LoggingProperty.LogLevel;
+import org.lflang.validation.ValidationReporter;
 
 /**
  * A type that can assume one of several types.
@@ -64,24 +64,23 @@ public Enum<?> forName(String name) {
 
     /** Recursively check that the passed in element conforms to the rules of this union. */
     @Override
-    public void check(Element e, String name, LFValidator v) {
+    public boolean check(Element e, String name, ValidationReporter v) {
         Optional<Enum<?>> match = this.match(e);
+        var found = false;
         if (match.isPresent()) {
             // Go deeper if the element is an array or dictionary.
             Enum<?> type = match.get();
             if (type instanceof DictionaryType) {
-                ((DictionaryType) type).check(e, name, v);
+                found = ((DictionaryType) type).check(e, name, v);
             } else if (type instanceof ArrayType) {
-                ((ArrayType) type).check(e, name, v);
+                found = ((ArrayType) type).check(e, name, v);
             } else if (type instanceof PrimitiveType) {
-                ((PrimitiveType) type).check(e, name, v);
+                found = ((PrimitiveType) type).check(e, name, v);
             } else if (!(type instanceof Enum<?>)) {
                 throw new RuntimeException("Encountered an unknown type.");
             }
-        } else {
-            // No match found; report error.
-            TargetPropertyType.produceError(name, this.toString(), v);
         }
+        return found;
     }
 
     /**
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index dddb837917..a742b8185d 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -550,20 +550,7 @@ public void checkKeyValuePair(KeyValuePair param) {
                 + options,
             Literals.KEY_VALUE_PAIR__NAME);
       } else {
-        // Check whether the property is supported by the target.
-        if (!prop.supportedBy.contains(this.target)) {
-          warning(
-              "The target parameter: "
-                  + param.getName()
-                  + " is not supported by the "
-                  + this.target
-                  + " target and will thus be ignored.",
-              Literals.KEY_VALUE_PAIR__NAME);
-        }
 
-        // Run checks on the property. After running the check, errors/warnings
-        // are retrievable from the targetPropertyErrors collection.
-        prop.type.check(param.getValue(), param.getName(), this);
       }
 
       // Retrieve the errors that resulted from the check.
@@ -1121,7 +1108,7 @@ public void checkTargetDecl(TargetDecl target) throws IOException {
   public void checkTargetProperties(KeyValuePairs targetProperties) {
     Arrays.stream(TargetProperty.values()).forEach(p -> {
       p.validate(targetProperties, this.info.model, this.targetConfig,
-          new ValidationReporter() {
+          new ValidationReporter() { // FIXME: this is redundant because there already is a ValidatorMessageReporter class that I was unaware of.
             @Override
             public void error(String message, EObject source, EStructuralFeature feature) {
               error(message, source, feature);
diff --git a/core/src/main/java/org/lflang/validation/ValidationReporter.java b/core/src/main/java/org/lflang/validation/ValidationReporter.java
index ddd25754e3..a2eba3a7ee 100644
--- a/core/src/main/java/org/lflang/validation/ValidationReporter.java
+++ b/core/src/main/java/org/lflang/validation/ValidationReporter.java
@@ -7,4 +7,5 @@ public interface ValidationReporter {
     void error(String message, EObject source, EStructuralFeature feature);
 
     void warning(String message, EObject source, EStructuralFeature feature);
+
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/lflang/validation/ValidatorMessageReporter.java b/core/src/main/java/org/lflang/validation/ValidatorMessageReporter.java
index 3ef4e05798..387ad37a0f 100644
--- a/core/src/main/java/org/lflang/validation/ValidatorMessageReporter.java
+++ b/core/src/main/java/org/lflang/validation/ValidatorMessageReporter.java
@@ -84,6 +84,9 @@ protected void report(Path path, Range range, DiagnosticSeverity severity, Strin
     reportOnNode(validatorState.getCurrentObject(), severity, fullMessage);
   }
 
+
+
+
   @Override
   protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
     switch (severity) {
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt
index bd0d0a3a46..4a1215a5f2 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt
@@ -13,7 +13,7 @@ import org.lflang.lf.TriggerRef
 import org.lflang.lf.VarRef
 import org.lflang.lf.Visibility
 import org.lflang.lf.WidthSpec
-import org.lflang.target.LoggingConfigurator.LogLevel
+import org.lflang.target.LoggingProperty.LogLevel
 
 /*************
  * Copyright (c) 2019-2021, TU Dresden.
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
index 359811e8d9..e4041e4a41 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
@@ -105,8 +105,7 @@ class CppGenerator(
         }
     }
 
-    private fun fetchReactorCpp() {
-        val version = targetConfig.runtimeVersion
+    private fun fetchReactorCpp(version: String) {
         val libPath = fileConfig.srcGenBasePath.resolve("reactor-cpp-$version")
         // abort if the directory already exists
         if (Files.isDirectory(libPath)) {
@@ -134,9 +133,9 @@ class CppGenerator(
             true)
 
         // copy or download reactor-cpp
-        if (targetConfig.externalRuntimePath == null) {
-            if (targetConfig.runtimeVersion != null) {
-                fetchReactorCpp()
+        if (!targetConfig.externalRuntimePath.isSetByUser) {
+            if (targetConfig.runtimeVersion.isSetByUser) {
+                fetchReactorCpp(targetConfig.runtimeVersion.get())
             } else {
                 FileUtil.copyFromClassPath(
                     "$libDir/reactor-cpp",
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
index eefa2fa0cd..07e11cfc18 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
@@ -26,8 +26,8 @@ abstract class CppPlatformGenerator(protected val generator: CppGenerator) {
     protected val cmakeArgs: List<String>
         get() = listOf(
             "-DCMAKE_BUILD_TYPE=${targetConfig.buildType}",
-            "-DREACTOR_CPP_VALIDATE=${if (targetConfig.noRuntimeValidation) "OFF" else "ON"}",
-            "-DREACTOR_CPP_PRINT_STATISTICS=${if (targetConfig.printStatistics) "ON" else "OFF"}",
+            "-DREACTOR_CPP_VALIDATE=${if (targetConfig.noRuntimeValidation.get()) "OFF" else "ON"}",
+            "-DREACTOR_CPP_PRINT_STATISTICS=${if (targetConfig.printStatistics.get()) "ON" else "OFF"}",
             "-DREACTOR_CPP_TRACE=${if (targetConfig.tracing != null) "ON" else "OFF"}",
             "-DREACTOR_CPP_LOG_LEVEL=${targetConfig.logLevel.severity}",
             "-DLF_SRC_PKG_PATH=${fileConfig.srcPkgPath}",
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
index f3fac39e42..3284f14924 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
@@ -59,7 +59,7 @@ class CppRos2NodeGenerator(
             |  : Node("$nodeName", node_options) {
             |  unsigned workers = ${if (targetConfig.workers != 0) targetConfig.workers else "std::thread::hardware_concurrency()"};
             |  bool fast{${targetConfig.fastMode}};
-            |  reactor::Duration lf_timeout{${targetConfig.timeout?.toCppCode() ?: "reactor::Duration::max()"}};
+            |  reactor::Duration lf_timeout{${targetConfig.timeout.get()?.toCppCode() ?: "reactor::Duration::max()"}};
             |
             |  // provide a globally accessible reference to this node
             |  // FIXME: this is pretty hacky...
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
index aaca9b4378..4d34e69d31 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
@@ -9,7 +9,7 @@ import java.nio.file.Path
 class CppRos2PackageGenerator(generator: CppGenerator, private val nodeName: String) {
     private val fileConfig = generator.fileConfig
     private val targetConfig = generator.targetConfig
-    val reactorCppSuffix = targetConfig.runtimeVersion ?: "default"
+    val reactorCppSuffix = targetConfig.runtimeVersion.get() ?: "default"
     val reactorCppName = "reactor-cpp-$reactorCppSuffix"
     private val dependencies =
         listOf("rclcpp", "rclcpp_components", reactorCppName) + (targetConfig.ros2Dependencies ?: listOf<String>())
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
index 86f3486cb1..732536e2af 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
@@ -136,9 +136,9 @@ class CppStandaloneCmakeGenerator(private val targetConfig: TargetConfig, privat
         val includeFiles = targetConfig.cmakeIncludes.get()?.map { fileConfig.srcPath.resolve(it).toUnixString() }
 
         val reactorCppTarget = when {
-            targetConfig.externalRuntimePath != null -> "reactor-cpp"
-            targetConfig.runtimeVersion != null      -> "reactor-cpp-${targetConfig.runtimeVersion}"
-            else                                     -> "reactor-cpp-default"
+            targetConfig.externalRuntimePath.isSetByUser -> "reactor-cpp"
+            targetConfig.runtimeVersion.isSetByUser      -> "reactor-cpp-${targetConfig.runtimeVersion}"
+            else                                         -> "reactor-cpp-default"
         }
 
         return with(PrependOperator) {
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
index 9b3d9208c8..d2bef81a4f 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
@@ -477,7 +477,7 @@ object RustModelBuilder {
         if (userSpec == null) {
             // default configuration for the runtime crate
 
-            val userRtVersion: String? = targetConfig.runtimeVersion
+            val userRtVersion: String? = targetConfig.runtimeVersion.get()
             // enable parallel feature if asked
             val parallelFeature = listOf(PARALLEL_RT_FEATURE).takeIf { targetConfig.threading }
 
diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index 784286e1f0..436e9585ca 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -25,8 +25,8 @@
 package org.lflang.tests;
 
 import org.lflang.TargetProperty;
-import org.lflang.target.LoggingConfigurator.LogLevel;
-import org.lflang.target.PlatformConfig.Platform;
+import org.lflang.target.property.PlatformProperty.Platform;
+import org.lflang.target.property.LoggingProperty.LogLevel;
 import org.lflang.tests.TestRegistry.TestCategory;
 
 /**
@@ -73,7 +73,7 @@ public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
     test.getContext().getTargetConfig().platformOptions.get().board = "qemu_cortex_m3";
 
     // FIXME: Zephyr  emulations fails with debug log-levels.
-    test.getContext().getTargetConfig().logLevel = LogLevel.WARN;
+    test.getContext().getTargetConfig().logLevel.override(LogLevel.WARN);
     test.getContext().getArgs().setProperty("logging", "warning");
     return true;
   }
@@ -85,7 +85,7 @@ public static boolean makeZephyrCompatible(LFTest test) {
     test.getContext().getTargetConfig().platformOptions.get().board = "qemu_cortex_m3";
 
     // FIXME: Zephyr  emulations fails with debug log-levels.
-    test.getContext().getTargetConfig().logLevel = LogLevel.WARN;
+    test.getContext().getTargetConfig().logLevel.override(LogLevel.WARN);
     test.getContext().getArgs().setProperty("logging", "warning");
 
     return true;

From ce8199a3f8da3a6df6fff026388585788c309b42 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 26 Sep 2023 22:50:15 -0700
Subject: [PATCH 0908/1114] Checkpoint after fixing most issues in
 TargetProperty

---
 .../main/java/org/lflang/TargetConfig.java    |  15 +-
 .../main/java/org/lflang/TargetProperty.java  | 666 +++++++++---------
 .../java/org/lflang/TargetPropertyConfig.java |   4 +-
 .../org/lflang/generator/GeneratorUtils.java  |   2 +-
 .../lflang/target/property/AuthProperty.java  |   1 -
 .../property/BuildCommandsProperty.java       |   2 +-
 .../target/property/BuildTypeProperty.java    |   2 +-
 .../property/CargoDependenciesProperty.java   |   2 +-
 .../property/ClockSyncModeProperty.java       |   2 +-
 .../property/ClockSyncOptionsProperty.java    |   2 +-
 .../target/property/CmakeIncludeProperty.java |   2 +-
 .../property/CompileDefinitionsConfig.java    |   2 +-
 .../property/CoordinationModeProperty.java    |   2 +-
 .../property/CoordinationOptionsProperty.java |   2 +-
 .../property/DefaultBooleanProperty.java      |   2 +-
 .../property/DefaultFileListProperty.java     |   2 +-
 .../target/property/DefaultStringConfig.java  |   2 +-
 .../property/DefaultStringListProperty.java   |   2 +-
 .../target/property/DockerProperty.java       |   2 +-
 .../target/property/LoggingProperty.java      |   2 +-
 .../target/property/PlatformProperty.java     |   2 +-
 .../property/Ros2DependenciesProperty.java    |   2 +-
 .../target/property/RustIncludeProperty.java  |   2 +-
 .../target/property/SchedulerProperty.java    |   2 +-
 .../target/property/ThreadingProperty.java    |   2 +-
 .../target/property/TimeOutProperty.java      |   2 +-
 .../target/property/TracingProperty.java      |   2 +-
 .../target/property/WorkersProperty.java      |   2 +-
 28 files changed, 364 insertions(+), 370 deletions(-)

diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index cfa95768ec..7641c8ec8f 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -40,6 +40,7 @@
 import org.lflang.target.property.CoordinationOptionsProperty;
 import org.lflang.target.property.DockerProperty;
 import org.lflang.target.property.FastProperty;
+import org.lflang.target.property.FedSetupProperty;
 import org.lflang.target.property.KeepaliveProperty;
 import org.lflang.target.property.PlatformProperty;
 import org.lflang.target.property.Ros2DependenciesProperty;
@@ -103,21 +104,13 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
     this(target);
     if (target.getConfig() != null) {
       List<KeyValuePair> pairs = target.getConfig().getPairs();
-      TargetProperty.set(this, pairs != null ? pairs : List.of(), messageReporter);
+      TargetProperty.setAll(this, pairs != null ? pairs : List.of(), messageReporter);
     }
 
-    // FIXME: work these into the TargetProperty.set call above.
-
     if (cliArgs != null) {
-      TargetProperty.override(this, cliArgs, messageReporter);
+      TargetProperty.overrideAll(this, cliArgs, messageReporter);
     }
 
-    if (cliArgs.containsKey("no-compile")) {
-      this.noCompile = true;
-    }
-    if (cliArgs.containsKey("verify")) {
-      this.verify = true;
-    }
 
     if (cliArgs.containsKey("logging")) {
       this.logLevel = LogLevel.valueOf(cliArgs.getProperty("logging").toUpperCase());
@@ -310,6 +303,6 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
       new RustTargetConfig(); // FIXME: https://issue.lf-lang.org/1558
 
   /** Path to a C file used by the Python target to setup federated execution. */
-  public String fedSetupPreamble = null; // FIXME: https://issue.lf-lang.org/1558
+  public FedSetupProperty fedSetupPreamble = new FedSetupProperty();
 
 }
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 11a9f44253..51c3924fef 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -34,17 +34,12 @@
 
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.InvalidLfSourceException;
-import org.lflang.generator.rust.CargoDependencySpec;
-import org.lflang.generator.rust.CargoDependencySpec.CargoDependenciesPropertyType;
-import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.Model;
 import org.lflang.lf.TargetDecl;
 import org.lflang.target.property.type.TargetPropertyType;
-import org.lflang.target.property.type.PrimitiveType;
-import org.lflang.util.StringUtil;
 import org.lflang.validation.ValidationReporter;
 
 /**
@@ -57,367 +52,374 @@ public enum TargetProperty {
 
     /** Directive to allow including OpenSSL libraries and process HMAC authentication. */
     AUTH(config -> config.auth),
-  /** Directive to let the generator use the custom build command. */
-  BUILD(config -> config.buildCommands),
-
-      /**
-       * Directive to specify the target build type such as 'Release' or 'Debug'. This is also used in
-       * the Rust target to select a Cargo profile.
-       */
-      BUILD_TYPE(config -> config.buildType),
-
-      /** Directive to let the federate execution handle clock synchronization in software. */
-      CLOCK_SYNC(config -> config.clockSync),
-      /** Key-value pairs giving options for clock synchronization. */
-      CLOCK_SYNC_OPTIONS(config -> config.clockSyncOptions),
-
-      /**
-       * Directive to specify a cmake to be included by the generated build systems.
-       *
-       * <p>This gives full control over the C/C++ build as any cmake parameters can be adjusted in the
-       * included file.
-       */
-      CMAKE_INCLUDE(config -> config.cmakeIncludes),
-      /** Directive to specify the target compiler. */
-      COMPILER(config -> config.compiler),
-      /** Directive to specify compile-time definitions. */
-      COMPILE_DEFINITIONS(config -> config.compileDefinitions),
-      /**
-       * Directive to generate a Dockerfile. This is either a boolean, true or false, or a dictionary of
-       * options.
-       */
+    /** Directive to let the generator use the custom build command. */
+    BUILD(config -> config.buildCommands),
+
+    /**
+     * Directive to specify the target build type such as 'Release' or 'Debug'. This is also used in
+     * the Rust target to select a Cargo profile.
+     */
+    BUILD_TYPE(config -> config.buildType),
+
+    /** Directive to let the federate execution handle clock synchronization in software. */
+    CLOCK_SYNC(config -> config.clockSync),
+    /** Key-value pairs giving options for clock synchronization. */
+    CLOCK_SYNC_OPTIONS(config -> config.clockSyncOptions),
+
+    /**
+     * Directive to specify a cmake to be included by the generated build systems.
+     *
+     * <p>This gives full control over the C/C++ build as any cmake parameters can be adjusted in
+     * the
+     * included file.
+     */
+    CMAKE_INCLUDE(config -> config.cmakeIncludes),
+    /** Directive to specify the target compiler. */
+    COMPILER(config -> config.compiler),
+    /** Directive to specify compile-time definitions. */
+    COMPILE_DEFINITIONS(config -> config.compileDefinitions),
+    /**
+     * Directive to generate a Dockerfile. This is either a boolean, true or false, or a dictionary of
+     * options.
+     */
     /** Directive to specify the coordination mode */
     COORDINATION(config -> config.coordination),
     /** Key-value pairs giving options for clock synchronization. */
     COORDINATION_OPTIONS(config -> config.coordinationOptions),
 
     DOCKER(config -> config.dockerOptions),
-      /** Directive for specifying a path to an external runtime to be used for the compiled binary. */
-      EXTERNAL_RUNTIME_PATH(config -> config.externalRuntimePath),
-      /**
-       * Directive to let the execution engine allow logical time to elapse faster than physical time.
-       */
-      FAST(config -> config.fastMode),
-      /**
-       * Directive to stage particular files on the class path to be processed by the code generator.
-       */
-      FILES(config -> config.files),
-
-      /** Flags to be passed on to the target compiler. */
-      FLAGS(config -> config.compilerFlags),
-
-      /**
-       * Directive to let the execution engine remain active also if there are no more events in the
-       * event queue.
-       */
-      KEEPALIVE(config -> config.keepalive),
-
-      /** Directive to specify the grain at which to report log messages during execution. */
-      LOGGING(config -> config.logLevel),
-
-      /** Directive to not invoke the target compiler. */
-      NO_COMPILE(config -> config.noCompile),
-
-      /** Directive to disable validation of reactor rules at runtime. */
-      NO_RUNTIME_VALIDATION(config -> config.noRuntimeValidation),
-
-      /**
-       * Directive to specify the platform for cross code generation. This is either a string of the
-       * platform or a dictionary of options that includes the string name.
-       */
-      PLATFORM((TargetConfig config) -> config.platformOptions),
-
-      /** Directive to instruct the runtime to collect and print execution statistics. */
-      PRINT_STATISTICS(config -> config.printStatistics),
-
-      /**
-       * Directive for specifying .proto files that need to be compiled and their code included in the
-       * sources.
-       */
-      PROTOBUFS(config -> config.protoFiles),
-
-      /** Directive to specify that ROS2 specific code is generated, */
-      ROS2(config -> config.ros2),
-
-      /** Directive to specify additional ROS2 packages that this LF program depends on. */
-      ROS2_DEPENDENCIES((TargetConfig config) -> config.ros2Dependencies),
-
-      /** Directive for specifying a specific version of the reactor runtime library. */
-      RUNTIME_VERSION(config -> config.runtimeVersion),
-
-      /** Directive for specifying a specific runtime scheduler, if supported. */
-      SCHEDULER((TargetConfig config) -> config.schedulerType),
-      /** Directive to specify that all code is generated in a single file. */
-      SINGLE_FILE_PROJECT(config -> config.singleFileProject),
-
-      /** Directive to indicate whether the runtime should use multi-threading. */
-      THREADING(config -> config.threading),
+    /** Directive for specifying a path to an external runtime to be used for the compiled binary. */
+    EXTERNAL_RUNTIME_PATH(config -> config.externalRuntimePath),
+    /**
+     * Directive to let the execution engine allow logical time to elapse faster than physical time.
+     */
+    FAST(config -> config.fastMode),
+    /**
+     * Directive to stage particular files on the class path to be processed by the code generator.
+     */
+    FILES(config -> config.files),
+
+    /** Flags to be passed on to the target compiler. */
+    FLAGS(config -> config.compilerFlags),
+
+    /**
+     * Directive to let the execution engine remain active also if there are no more events in the
+     * event queue.
+     */
+    KEEPALIVE(config -> config.keepalive),
+
+    /** Directive to specify the grain at which to report log messages during execution. */
+    LOGGING(config -> config.logLevel),
+
+    /** Directive to not invoke the target compiler. */
+    NO_COMPILE(config -> config.noCompile),
+
+    /** Directive to disable validation of reactor rules at runtime. */
+    NO_RUNTIME_VALIDATION(config -> config.noRuntimeValidation),
+
+    /**
+     * Directive to specify the platform for cross code generation. This is either a string of the
+     * platform or a dictionary of options that includes the string name.
+     */
+    PLATFORM((TargetConfig config) -> config.platformOptions),
+
+    /** Directive to instruct the runtime to collect and print execution statistics. */
+    PRINT_STATISTICS(config -> config.printStatistics),
+
+    /**
+     * Directive for specifying .proto files that need to be compiled and their code included in the
+     * sources.
+     */
+    PROTOBUFS(config -> config.protoFiles),
+
+    /** Directive to specify that ROS2 specific code is generated, */
+    ROS2(config -> config.ros2),
+
+    /** Directive to specify additional ROS2 packages that this LF program depends on. */
+    ROS2_DEPENDENCIES((TargetConfig config) -> config.ros2Dependencies),
+
+    /** Directive for specifying a specific version of the reactor runtime library. */
+    RUNTIME_VERSION(config -> config.runtimeVersion),
+
+    /** Directive for specifying a specific runtime scheduler, if supported. */
+    SCHEDULER((TargetConfig config) -> config.schedulerType),
+    /** Directive to specify that all code is generated in a single file. */
+    SINGLE_FILE_PROJECT(config -> config.singleFileProject),
+
+    /** Directive to indicate whether the runtime should use multi-threading. */
+    THREADING(config -> config.threading),
     /** Directive to check the generated verification model. */
     VERIFY(config -> config.verify),
 
-      /** Directive to specify the number of worker threads used by the runtime. */
-      WORKERS(config -> config.workers),
-
-      /** Directive to specify the execution timeout. */
-      TIMEOUT(config -> config.timeout),
-
-      /** Directive to enable tracing. */
-      TRACING(config -> config.tracing),
-
-      /**
-       * Directive to let the runtime export its internal dependency graph.
-       *
-       * <p>This is a debugging feature and currently only used for C++ and Rust programs.
-       */
-      EXPORT_DEPENDENCY_GRAPH(config -> config.exportDependencyGraph),
-
-      /**
-       * Directive to let the runtime export the program structure to a yaml file.
-       *
-       * <p>This is a debugging feature and currently only used for C++ programs.
-       */
-      EXPORT_TO_YAML(config -> config.exportToYaml),
-
-      /**
-       * List of module files to link into the crate as top-level. For instance, a {@code target Rust {
-       * rust-modules: [ "foo.rs" ] }} will cause the file to be copied into the generated project, and
-       * the generated {@code main.rs} will include it with a {@code mod foo;}. If one of the paths is a
-       * directory, it must contain a {@code mod.rs} file, and all its contents are copied.
-       */
-      RUST_INCLUDE(config -> config.rust.rustTopLevelModules),
-
-      /** Directive for specifying Cargo features of the generated program to enable. */
-      CARGO_FEATURES(config -> config.rust.cargoFeatures),
-
-      /**
-       * Dependency specifications for Cargo. This property looks like this:
-       *
-       * <pre>{@code
-       * cargo-dependencies: {
-       *    // Name-of-the-crate: "version"
-       *    rand: "0.8",
-       *    // Equivalent to using an explicit map:
-       *    rand: {
-       *      version: "0.8"
-       *    },
-       *    // The map allows specifying more details
-       *    rand: {
-       *      // A path to a local unpublished crate.
-       *      // Note 'path' is mutually exclusive with 'version'.
-       *      path: "/home/me/Git/local-rand-clone"
-       *    },
-       *    rand: {
-       *      version: "0.8",
-       *      // you can specify cargo features
-       *      features: ["some-cargo-feature",]
-       *    }
-       * }
-       * }</pre>
-       */
-      CARGO_DEPENDENCIES(config -> config.rust.cargoDependencies),
-
-      /**
-       * Directs the C or Python target to include the associated C file used for setting up federated
-       * execution before processing the first tag.
-       */
-      FED_SETUP(
-          "_fed_setup",
-          PrimitiveType.FILE,
-          Arrays.asList(Target.C, Target.CCPP, Target.Python),
-          (config) -> ASTUtils.toElement(config.fedSetupPreamble),
-          (config, value, err) ->
-              config.fedSetupPreamble = StringUtil.removeQuotes(ASTUtils.elementToSingleString(value)));
-
-  public final PropertyGetter propertyGetter;
+    /** Directive to specify the number of worker threads used by the runtime. */
+    WORKERS(config -> config.workers),
+
+    /** Directive to specify the execution timeout. */
+    TIMEOUT(config -> config.timeout),
+
+    /** Directive to enable tracing. */
+    TRACING(config -> config.tracing),
+
+    /**
+     * Directive to let the runtime export its internal dependency graph.
+     *
+     * <p>This is a debugging feature and currently only used for C++ and Rust programs.
+     */
+    EXPORT_DEPENDENCY_GRAPH(config -> config.exportDependencyGraph),
+
+    /**
+     * Directive to let the runtime export the program structure to a yaml file.
+     *
+     * <p>This is a debugging feature and currently only used for C++ programs.
+     */
+    EXPORT_TO_YAML(config -> config.exportToYaml),
+
+    /**
+     * List of module files to link into the crate as top-level. For instance, a
+     * {@code target Rust {
+     * rust-modules: [ "foo.rs" ] }} will cause the file to be copied into the generated project,
+     * and
+     * the generated {@code main.rs} will include it with a {@code mod foo;}. If one of the paths is
+     * a
+     * directory, it must contain a {@code mod.rs} file, and all its contents are copied.
+     */
+    RUST_INCLUDE(config -> config.rust.rustTopLevelModules),
+
+    /** Directive for specifying Cargo features of the generated program to enable. */
+    CARGO_FEATURES(config -> config.rust.cargoFeatures),
+
+    /**
+     * Dependency specifications for Cargo. This property looks like this:
+     *
+     * <pre>{@code
+     * cargo-dependencies: {
+     *    // Name-of-the-crate: "version"
+     *    rand: "0.8",
+     *    // Equivalent to using an explicit map:
+     *    rand: {
+     *      version: "0.8"
+     *    },
+     *    // The map allows specifying more details
+     *    rand: {
+     *      // A path to a local unpublished crate.
+     *      // Note 'path' is mutually exclusive with 'version'.
+     *      path: "/home/me/Git/local-rand-clone"
+     *    },
+     *    rand: {
+     *      version: "0.8",
+     *      // you can specify cargo features
+     *      features: ["some-cargo-feature",]
+     *    }
+     * }
+     * }</pre>
+     */
+    CARGO_DEPENDENCIES(config -> config.rust.cargoDependencies),
+
+    /**
+     * Directs the C or Python target to include the associated C file used for setting up federated
+     * execution before processing the first tag.
+     */
+    FED_SETUP(config -> config.fedSetupPreamble);
+
+    public final PropertyGetter get;
 
     @FunctionalInterface
-  private interface PropertyGetter<T> {
-      TargetPropertyConfig<T> get(TargetConfig config);
-  }
-
-  TargetProperty(PropertyGetter propertyGetter) {
-    this.propertyGetter = propertyGetter;
-  }
-
-  public static void override(TargetConfig config, Properties properties, MessageReporter err) {
-      for (Object key : properties.keySet()) {
-          TargetProperty p = forName(key.toString());
-          if (p != null) {
-              try {
-                  p.propertyGetter.get(config).override(properties.get(key));
-              } catch (InvalidLfSourceException e) {
-                  err.at(e.getNode()).error(e.getProblem());
-              }
-          }
-      }
-  }
-
-  /**
-   * Set the given configuration using the given target properties.
-   *
-   * @param config The configuration object to update.
-   * @param properties AST node that holds all the target properties.
-   * @param err Error reporter on which property format errors will be reported
-   */
-  public static void set(TargetConfig config, List<KeyValuePair> properties, MessageReporter err) {
-    properties.forEach(
-        property -> {
-          TargetProperty p = forName(property.getName());
-          if (p != null) {
-            // Mark the specified target property as set by the user
-            config.setByUser.add(p);
-            try {
-              p.setter.parseIntoTargetConfig(config, property.getValue(), err);
-            } catch (InvalidLfSourceException e) {
-              err.at(e.getNode()).error(e.getProblem());
+    private interface PropertyGetter<T> {
+
+        TargetPropertyConfig<T> get(TargetConfig config);
+    }
+
+    TargetProperty(PropertyGetter propertyGetter) {
+        this.get = propertyGetter;
+    }
+
+    public static void overrideAll(TargetConfig config, Properties properties, MessageReporter err) {
+        for (Object key : properties.keySet()) {
+            TargetProperty p = forName(key.toString());
+            if (p != null) {
+                try {
+                    p.get.get(config).override(properties.get(key));
+                } catch (InvalidLfSourceException e) {
+                    err.at(e.getNode()).error(e.getProblem());
+                }
             }
-          }
-        });
-  }
-
-  /**
-   * Extracts all properties as a list of key-value pairs from a TargetConfig. Only extracts
-   * properties explicitly set by user.
-   *
-   * @param config The TargetConfig to extract from.
-   * @return The extracted properties.
-   */
-  public static List<KeyValuePair> extractProperties(TargetConfig config) {
-    var res = new LinkedList<KeyValuePair>();
-    for (TargetProperty p : config.setByUser) {
-      KeyValuePair kv = LfFactory.eINSTANCE.createKeyValuePair();
-      kv.setName(p.toString());
-      kv.setValue(p.getter.getPropertyElement(config));
-      if (kv.getValue() != null) res.add(kv);
+        }
     }
-    return res;
-  }
-
-  /**
-   * Constructs a TargetDecl by extracting the fields of the given TargetConfig.
-   *
-   * @param target The target to generate for.
-   * @param config The TargetConfig to extract from.
-   * @return A generated TargetDecl.
-   */
-  public static TargetDecl extractTargetDecl(Target target, TargetConfig config) {
-    TargetDecl decl = LfFactory.eINSTANCE.createTargetDecl();
-    KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-    for (KeyValuePair p : extractProperties(config)) {
-      kvp.getPairs().add(p);
+
+    /**
+     * Set the given configuration using the given target properties.
+     *
+     * @param config The configuration object to update.
+     * @param properties AST node that holds all the target properties.
+     * @param err Error reporter on which property format errors will be reported
+     */
+    public static void setAll(TargetConfig config, List<KeyValuePair> properties, MessageReporter err) {
+        properties.forEach(
+            property -> {
+                TargetProperty p = forName(property.getName());
+                if (p != null) {
+                    try {
+                        p.get.get(config).set(property.getValue(), err);
+                    } catch (InvalidLfSourceException e) {
+                        err.at(e.getNode()).error(e.getProblem());
+                    }
+                }
+            });
+    }
+
+    /**
+     * Extracts all properties as a list of key-value pairs from a TargetConfig. Only extracts
+     * properties explicitly set by user.
+     *
+     * @param config The TargetConfig to extract from.
+     * @return The extracted properties.
+     */
+    public static List<KeyValuePair> extractProperties(TargetConfig config) {
+        var res = new LinkedList<KeyValuePair>();
+        for (TargetProperty p : config.setByUser) { // FIXME: do not use setByUser
+            KeyValuePair kv = LfFactory.eINSTANCE.createKeyValuePair();
+            kv.setName(p.toString());
+            kv.setValue(p.get.get(config).export());
+            if (kv.getValue() != null) {
+                res.add(kv);
+            }
+        }
+        return res;
+    }
+
+    /**
+     * Constructs a TargetDecl by extracting the fields of the given TargetConfig.
+     *
+     * @param target The target to generate for.
+     * @param config The TargetConfig to extract from.
+     * @return A generated TargetDecl.
+     */
+    public static TargetDecl extractTargetDecl(Target target, TargetConfig config) {
+        TargetDecl decl = LfFactory.eINSTANCE.createTargetDecl();
+        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+        for (KeyValuePair p : extractProperties(config)) {
+            kvp.getPairs().add(p);
+        }
+        decl.setName(target.toString());
+        decl.setConfig(kvp);
+        return decl;
     }
-    decl.setName(target.toString());
-    decl.setConfig(kvp);
-    return decl;
-  }
 
     public static KeyValuePair getKeyValuePair(KeyValuePairs targetProperties, TargetProperty property) {
         List<KeyValuePair> properties =
             targetProperties.getPairs().stream()
-                .filter(pair -> pair.getName().equals(property.description))
+                .filter(pair -> pair.getName().equals(property.toString()))
                 .toList();
         assert (properties.size() <= 1);
         return properties.size() > 0 ? properties.get(0) : null;
     }
 
     public static KeyValuePair getKeyValuePair(Model ast, TargetProperty property) {
-      return getKeyValuePair(ast.getTarget().getConfig(), property);
+        return getKeyValuePair(ast.getTarget().getConfig(), property);
     }
 
     public void validate(KeyValuePairs pairs, Model ast, TargetConfig config, ValidationReporter reporter) {
-      this.propertyGetter.get(config).validate(getKeyValuePair(pairs, this), ast, config, reporter);
+        this.get.get(config).validate(getKeyValuePair(pairs, this), ast, config, reporter);
     }
 
-  /**
-   * Update the given configuration using the given target properties.
-   *
-   * @param config The configuration object to update.
-   * @param properties AST node that holds all the target properties.
-   * @param relativePath The path from the main resource to the resource from which the new
-   *     properties originate.
-   */
-  public static void update(
-      TargetConfig config, List<KeyValuePair> properties, Path relativePath, MessageReporter err) {
-    properties.forEach(
-        property -> {
-          TargetProperty p = forName(property.getName());
-          if (p != null) {
-            // Mark the specified target property as set by the user
-            config.setByUser.add(p);
-            var value = property.getValue();
-            if (property.getName().equals("files")) {
-              var array = LfFactory.eINSTANCE.createArray();
-              ASTUtils.elementToListOfStrings(property.getValue()).stream()
-                  .map(relativePath::resolve) // assume all paths are relative
-                  .map(Objects::toString)
-                  .map(
-                      s -> {
-                        var element = LfFactory.eINSTANCE.createElement();
-                        element.setLiteral(s);
-                        return element;
-                      })
-                  .forEach(array.getElements()::add);
-              value = LfFactory.eINSTANCE.createElement();
-              value.setArray(array);
-            }
-            p.updater.parseIntoTargetConfig(config, value, err);
-          }
-        });
-  }
-
-  /**
-   * Update one of the target properties, given by 'propertyName'. For convenience, a list of target
-   * properties (e.g., taken from a file or resource) can be passed without any filtering. This
-   * function will do nothing if the list of target properties doesn't include the property given by
-   * 'propertyName'.
-   *
-   * @param config The target config to apply the update to.
-   * @param property The target property.
-   * @param properties AST node that holds all the target properties.
-   * @param err Error reporter on which property format errors will be reported
-   */
-  public static void updateOne(
-      TargetConfig config,
-      TargetProperty property,
-      List<KeyValuePair> properties,
-      MessageReporter err) {
-    properties.stream()
-        .filter(p -> {return p.getName().equals(property.toString());})
-        .findFirst()
-        .map(KeyValuePair::getValue)
-        .ifPresent(value -> property.updater.parseIntoTargetConfig(config, value, err));
-  }
-
-  /**
-   * Return the entry that matches the given string.
-   *
-   * @param name The string to match against.
-   */
-  public static TargetProperty forName(String name) {
-    return Target.match(name, TargetProperty.values());
-  }
-
-  /**
-   * Return a list with all target properties.
-   *
-   * @return All existing target properties.
-   */
-  public static List<TargetProperty> getOptions() {
-    return Arrays.asList(TargetProperty.values());
-  }
+    /**
+     * Update the given configuration using the given target properties.
+     *
+     * @param config The configuration object to update.
+     * @param properties AST node that holds all the target properties.
+     * @param relativePath The path from the main resource to the resource from which the new
+     * properties originate.
+     */
+    public static void update(
+        TargetConfig config, List<KeyValuePair> properties, Path relativePath, MessageReporter err) {
+        properties.forEach(
+            property -> {
+                TargetProperty p = forName(property.getName());
+                if (p != null) {
+                    // Mark the specified target property as set by the user
+                    config.setByUser.add(p);
+                    var value = property.getValue();
+                    if (property.getName().equals("files")) {
+                        var array = LfFactory.eINSTANCE.createArray();
+                        ASTUtils.elementToListOfStrings(property.getValue()).stream()
+                            .map(relativePath::resolve) // assume all paths are relative
+                            .map(Objects::toString)
+                            .map(
+                                s -> {
+                                    var element = LfFactory.eINSTANCE.createElement();
+                                    element.setLiteral(s);
+                                    return element;
+                                })
+                            .forEach(array.getElements()::add);
+                        value = LfFactory.eINSTANCE.createElement();
+                        value.setArray(array);
+                    }
+                    // FIXME: figure out different between update and override
+                    // p.updater.parseIntoTargetConfig(config, value, err);
+                }
+            });
+    }
+
+    /**
+     * Update one of the target properties, given by 'propertyName'. For convenience, a list of
+     * target
+     * properties (e.g., taken from a file or resource) can be passed without any filtering. This
+     * function will do nothing if the list of target properties doesn't include the property given
+     * by
+     * 'propertyName'.
+     *
+     * @param config The target config to apply the update to.
+     * @param property The target property.
+     * @param properties AST node that holds all the target properties.
+     * @param err Error reporter on which property format errors will be reported
+     */
+    public static void updateOne(
+        TargetConfig config,
+        TargetProperty property,
+        List<KeyValuePair> properties,
+        MessageReporter err) {
+        // FIXME
+//        properties.stream()
+//            .filter(p -> {return p.getName().equals(property.toString());})
+//            .findFirst()
+//            .map(KeyValuePair::getValue)
+//            .ifPresent(value -> property.updater.parseIntoTargetConfig(config, value, err));
+    }
+
+    /**
+     * Return the entry that matches the given string.
+     *
+     * @param name The string to match against.
+     */
+    public static TargetProperty forName(String name) {
+        return Target.match(name, TargetProperty.values());
+    }
+
+    /**
+     * Return a list with all target properties.
+     *
+     * @return All existing target properties.
+     */
+    public static List<TargetProperty> getOptions() {
+        return Arrays.asList(TargetProperty.values());
+    }
 
     /**
      * Return the name of the property in as it appears in the target declaration.
      * It may be an invalid identifier in other languages (may contains dashes {@code -}).
      */
-  @Override
-  public String toString() {
-    return this.name().toLowerCase().replaceAll("_", "-");
-  }
+    @Override
+    public String toString() {
+        // Work around because this sole property does not follow the naming convention.
+        if (this.equals(FED_SETUP)) {
+            return "_fed_setup";
+        }
+        return this.name().toLowerCase().replaceAll("_", "-");
+    }
 
-  /** Interface for dictionary elements. It associates an entry with a type. */
-  public interface DictionaryElement {
+    /** Interface for dictionary elements. It associates an entry with a type. */
+    public interface DictionaryElement {
 
-    TargetPropertyType getType();
-  }
+        TargetPropertyType getType();
+    }
 }
diff --git a/core/src/main/java/org/lflang/TargetPropertyConfig.java b/core/src/main/java/org/lflang/TargetPropertyConfig.java
index d32aab84ce..44752d5e4e 100644
--- a/core/src/main/java/org/lflang/TargetPropertyConfig.java
+++ b/core/src/main/java/org/lflang/TargetPropertyConfig.java
@@ -21,7 +21,7 @@
  */
 public abstract class TargetPropertyConfig<T> {
 
-  protected T value = initialize();
+  protected T value = initialValue();
 
   protected boolean setByUser;
 
@@ -37,7 +37,7 @@ public void override(T value) {
     this.value = value;
   }
 
-  public abstract T initialize(); // FIXME: rename to initialValue
+  public abstract T initialValue();
 
   /**
    * Parse the given element into the given target config. May use the error reporter to report
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index bac3ff1e5c..b281a98026 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -123,7 +123,7 @@ public static LFResource getLFResource(
     var targetConfig = new TargetConfig(target);
     if (config != null) {
       List<KeyValuePair> pairs = config.getPairs();
-      TargetProperty.set(targetConfig, pairs != null ? pairs : List.of(), messageReporter);
+      TargetProperty.setAll(targetConfig, pairs != null ? pairs : List.of(), messageReporter);
     }
     FileConfig fc =
         LFGenerator.createFileConfig(
diff --git a/core/src/main/java/org/lflang/target/property/AuthProperty.java b/core/src/main/java/org/lflang/target/property/AuthProperty.java
index 6106948282..d20ad37c2c 100644
--- a/core/src/main/java/org/lflang/target/property/AuthProperty.java
+++ b/core/src/main/java/org/lflang/target/property/AuthProperty.java
@@ -4,7 +4,6 @@
 import java.util.List;
 
 import org.lflang.Target;
-import org.lflang.target.property.DefaultBooleanProperty;
 
 public class AuthProperty extends DefaultBooleanProperty {
 
diff --git a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
index 33d46e7639..3bb2b7873e 100644
--- a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
@@ -18,7 +18,7 @@ public BuildCommandsProperty() {
     }
 
     @Override
-    public List<String> initialize() {
+    public List<String> initialValue() {
         return new ArrayList<>();
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
index eeca094465..23e3ed2f12 100644
--- a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
@@ -24,7 +24,7 @@ public Element export() {
     }
 
     @Override
-    public BuildType initialize() {
+    public BuildType initialValue() {
         return BuildType.RELEASE;
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
index 40f957d6c0..51bf43b379 100644
--- a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
@@ -21,7 +21,7 @@ public CargoDependenciesProperty() {
     }
 
     @Override
-    public Map<String, CargoDependencySpec> initialize() {
+    public Map<String, CargoDependencySpec> initialValue() {
         return new HashMap<>();
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
index dd541fed0f..3d7eb6923a 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
@@ -26,7 +26,7 @@ public ClockSyncModeProperty() {
     }
 
     @Override
-    public ClockSyncMode initialize() {
+    public ClockSyncMode initialValue() {
         return ClockSyncMode.INIT;
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
index 4b790b409f..8767d0d503 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
@@ -25,7 +25,7 @@ public ClockSyncOptionsProperty() {
     }
 
     @Override
-    public ClockSyncOptions initialize() {
+    public ClockSyncOptions initialValue() {
         return new ClockSyncOptions();
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
index 4dd02b840b..5a5b96ed37 100644
--- a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
@@ -18,7 +18,7 @@ public CmakeIncludeProperty() {
     }
 
     @Override
-    public List<String> initialize() {
+    public List<String> initialValue() {
         return new ArrayList<>();
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/CompileDefinitionsConfig.java b/core/src/main/java/org/lflang/target/property/CompileDefinitionsConfig.java
index 773bb7298a..92f6b569df 100644
--- a/core/src/main/java/org/lflang/target/property/CompileDefinitionsConfig.java
+++ b/core/src/main/java/org/lflang/target/property/CompileDefinitionsConfig.java
@@ -17,7 +17,7 @@ public CompileDefinitionsConfig() {
     }
 
     @Override
-    public Map<String, String> initialize() {
+    public Map<String, String> initialValue() {
         return new HashMap<>();
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationModeProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationModeProperty.java
index 75397af897..3a02e7a7b4 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationModeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationModeProperty.java
@@ -21,7 +21,7 @@ public CoordinationModeProperty() {
     }
 
     @Override
-    public CoordinationMode initialize() {
+    public CoordinationMode initialValue() {
         return CoordinationMode.CENTRALIZED;
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
index 3f0ea42e04..a61e54831b 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
@@ -25,7 +25,7 @@ public CoordinationOptionsProperty() {
     }
 
     @Override
-    public CoordinationOptions initialize() {
+    public CoordinationOptions initialValue() {
         return new CoordinationOptions();
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/DefaultBooleanProperty.java b/core/src/main/java/org/lflang/target/property/DefaultBooleanProperty.java
index e546e704bb..088cf71cf4 100644
--- a/core/src/main/java/org/lflang/target/property/DefaultBooleanProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DefaultBooleanProperty.java
@@ -14,7 +14,7 @@ public DefaultBooleanProperty() {
     }
 
     @Override
-    public Boolean initialize() {
+    public Boolean initialValue() {
         return false;
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/DefaultFileListProperty.java b/core/src/main/java/org/lflang/target/property/DefaultFileListProperty.java
index b69b053ea3..5323c0ac78 100644
--- a/core/src/main/java/org/lflang/target/property/DefaultFileListProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DefaultFileListProperty.java
@@ -23,7 +23,7 @@ public void override(List<String> value) { // FIXME: should this be override or
     }
 
     @Override
-    public List<String> initialize() {
+    public List<String> initialValue() {
         return new ArrayList<>();
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/DefaultStringConfig.java b/core/src/main/java/org/lflang/target/property/DefaultStringConfig.java
index 094c7c1728..a4a909ea20 100644
--- a/core/src/main/java/org/lflang/target/property/DefaultStringConfig.java
+++ b/core/src/main/java/org/lflang/target/property/DefaultStringConfig.java
@@ -17,7 +17,7 @@ public DefaultStringConfig() {
     }
 
     @Override
-    public String initialize() {
+    public String initialValue() {
         return "";
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/DefaultStringListProperty.java b/core/src/main/java/org/lflang/target/property/DefaultStringListProperty.java
index e7bb90b4cb..936b724cbd 100644
--- a/core/src/main/java/org/lflang/target/property/DefaultStringListProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DefaultStringListProperty.java
@@ -17,7 +17,7 @@ public DefaultStringListProperty() {
     }
 
     @Override
-    public List<String> initialize() {
+    public List<String> initialValue() {
         return new ArrayList<>();
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/DockerProperty.java b/core/src/main/java/org/lflang/target/property/DockerProperty.java
index b5136cfd7b..5676584915 100644
--- a/core/src/main/java/org/lflang/target/property/DockerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DockerProperty.java
@@ -28,7 +28,7 @@ public DockerProperty() {
     }
 
     @Override
-    public DockerOptions initialize() {
+    public DockerOptions initialValue() {
         return new DockerOptions(false);
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/LoggingProperty.java b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
index 386b712402..8a4a1fabc9 100644
--- a/core/src/main/java/org/lflang/target/property/LoggingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
@@ -17,7 +17,7 @@ public LoggingProperty() {
     }
 
     @Override
-    public LogLevel initialize() {
+    public LogLevel initialValue() {
         return LogLevel.INFO;
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index 2980d96964..3ef0cf5581 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -29,7 +29,7 @@ public PlatformProperty() {
     }
 
     @Override
-    public PlatformOptions initialize() {
+    public PlatformOptions initialValue() {
         return new PlatformOptions();
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
index 2f5450dd12..f2be54b1ab 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
@@ -22,7 +22,7 @@ public Ros2DependenciesProperty() {
     }
 
     @Override
-    public List<String> initialize() {
+    public List<String> initialValue() {
         return new ArrayList<>();
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
index 79fb107be9..d95fa2a68d 100644
--- a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
@@ -30,7 +30,7 @@ public List<Target> supportedTargets() {
     }
 
     @Override
-    public List<Path> initialize() {
+    public List<Path> initialValue() {
         return new ArrayList<>();
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
index 66a6d83b47..5a81e4486c 100644
--- a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
@@ -30,7 +30,7 @@ public SchedulerProperty() {
     }
 
     @Override
-    public SchedulerOption initialize() {
+    public SchedulerOption initialValue() {
         return SchedulerOption.getDefault();
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/ThreadingProperty.java b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
index 023480ed28..b0abbae4c6 100644
--- a/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
@@ -13,7 +13,7 @@ public List<Target> supportedTargets() {
 
 
     @Override
-    public Boolean initialize() {
+    public Boolean initialValue() {
         return true;
     }
 }
diff --git a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
index 6aec1948fd..da84484ea2 100644
--- a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
@@ -18,7 +18,7 @@ public TimeOutProperty() {
     }
 
     @Override
-    public TimeValue initialize() {
+    public TimeValue initialValue() {
         return null;
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index 1bca01000d..9484b380d3 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -31,7 +31,7 @@ public TracingProperty() {
     }
 
     @Override
-    public TracingOptions initialize() {
+    public TracingOptions initialValue() {
         return new TracingOptions(false);
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/WorkersProperty.java b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
index 50e1a8bc0e..a28a5a9ec0 100644
--- a/core/src/main/java/org/lflang/target/property/WorkersProperty.java
+++ b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
@@ -15,7 +15,7 @@ public WorkersProperty() {
     }
 
     @Override
-    public Integer initialize() {
+    public Integer initialValue() {
         return 0;
     }
 

From 413f8a1b590e09401b66be14668748fdcc79f2fc Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 27 Sep 2023 00:40:53 -0700
Subject: [PATCH 0909/1114] Fixes and cleanups

---
 .../main/java/org/lflang/TargetConfig.java    | 50 ++----------
 .../main/java/org/lflang/TargetProperty.java  | 80 +++++++------------
 .../java/org/lflang/TargetPropertyConfig.java | 35 ++++----
 .../federated/generator/FedTargetConfig.java  |  4 +-
 .../org/lflang/generator/GeneratorUtils.java  |  2 +-
 .../generator/rust/RustTargetConfig.java      |  2 +-
 .../property/BuildCommandsProperty.java       |  4 +-
 .../target/property/BuildTypeProperty.java    |  4 +-
 .../property/CargoDependenciesProperty.java   |  4 +-
 .../property/ClockSyncModeProperty.java       |  4 +-
 .../property/ClockSyncOptionsProperty.java    |  4 +-
 .../target/property/CmakeIncludeProperty.java | 28 ++++---
 .../property/CompileDefinitionsConfig.java    |  4 +-
 .../property/CoordinationModeProperty.java    |  4 +-
 .../property/CoordinationOptionsProperty.java |  4 +-
 .../property/DefaultBooleanProperty.java      | 10 ++-
 .../property/DefaultFileListProperty.java     |  6 +-
 .../target/property/DefaultStringConfig.java  | 10 ++-
 .../property/DefaultStringListProperty.java   | 33 +++++++-
 .../target/property/DockerProperty.java       |  4 +-
 .../property/ExternalRuntimePathConfig.java   | 14 ----
 .../property/ExternalRuntimePathProperty.java | 13 +++
 .../target/property/LoggingProperty.java      | 12 ++-
 .../target/property/PlatformProperty.java     |  4 +-
 .../property/Ros2DependenciesProperty.java    |  4 +-
 .../target/property/RustIncludeProperty.java  |  4 +-
 .../target/property/SchedulerProperty.java    |  4 +-
 .../target/property/TimeOutProperty.java      |  4 +-
 .../target/property/TracingProperty.java      |  6 +-
 .../target/property/WorkersProperty.java      | 10 ++-
 .../org/lflang/generator/cpp/CppGenerator.kt  |  4 +-
 .../cpp/CppStandaloneCmakeGenerator.kt        |  6 +-
 32 files changed, 190 insertions(+), 191 deletions(-)
 delete mode 100644 core/src/main/java/org/lflang/target/property/ExternalRuntimePathConfig.java
 create mode 100644 core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java

diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index 7641c8ec8f..72d3077ad3 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -25,12 +25,10 @@
 package org.lflang;
 
 import java.util.ArrayList;
-import java.util.HashSet;
+
 import java.util.List;
 import java.util.Properties;
-import java.util.Set;
 
-import org.lflang.generator.LFGeneratorContext.BuildParm;
 import org.lflang.generator.rust.RustTargetConfig;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.TargetDecl;
@@ -46,7 +44,6 @@
 import org.lflang.target.property.Ros2DependenciesProperty;
 import org.lflang.target.property.SchedulerProperty;
 import org.lflang.target.property.LoggingProperty;
-import org.lflang.target.property.LoggingProperty.LogLevel;
 import org.lflang.target.property.TracingProperty;
 import org.lflang.target.property.BuildCommandsProperty;
 import org.lflang.target.property.ClockSyncOptionsProperty;
@@ -68,7 +65,7 @@
 import org.lflang.target.property.CmakeIncludeProperty;
 import org.lflang.target.property.type.CompileDefinitionsConfig;
 import org.lflang.target.property.type.CompilerConfig;
-import org.lflang.target.property.type.ExternalRuntimePathConfig;
+import org.lflang.target.property.ExternalRuntimePathProperty;
 import org.lflang.target.property.type.VerifyProperty;
 
 /**
@@ -104,52 +101,15 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
     this(target);
     if (target.getConfig() != null) {
       List<KeyValuePair> pairs = target.getConfig().getPairs();
-      TargetProperty.setAll(this, pairs != null ? pairs : List.of(), messageReporter);
+      TargetProperty.load(this, pairs != null ? pairs : List.of(), messageReporter);
     }
 
     if (cliArgs != null) {
-      TargetProperty.overrideAll(this, cliArgs, messageReporter);
-    }
-
-
-    if (cliArgs.containsKey("logging")) {
-      this.logLevel = LogLevel.valueOf(cliArgs.getProperty("logging").toUpperCase());
-      this.setByUser.add(TargetProperty.LOGGING);
-    }
-    if (cliArgs.containsKey("workers")) {
-      this.workers = Integer.parseInt(cliArgs.getProperty("workers"));
-      this.setByUser.add(TargetProperty.WORKERS);
-    }
-    if (cliArgs.containsKey("threading")) {
-      this.threading = Boolean.parseBoolean(cliArgs.getProperty("threading"));
-      this.setByUser.add(TargetProperty.THREADING);
+      TargetProperty.load(this, cliArgs, messageReporter);
     }
 
-    if (cliArgs.containsKey("target-flags")) {
-      this.compilerFlags.clear();
-      if (!cliArgs.getProperty("target-flags").isEmpty()) {
-        this.compilerFlags.addAll(List.of(cliArgs.getProperty("target-flags").split(" ")));
-      }
-      this.setByUser.add(TargetProperty.FLAGS);
-    }
-    if (cliArgs.containsKey("runtime-version")) {
-      this.runtimeVersion = cliArgs.getProperty("runtime-version");
-      this.setByUser.add(TargetProperty.RUNTIME_VERSION);
-    }
-    if (cliArgs.containsKey("external-runtime-path")) {
-      this.externalRuntimePath = cliArgs.getProperty("external-runtime-path");
-      this.setByUser.add(TargetProperty.EXTERNAL_RUNTIME_PATH);
-    }
-
-    if (cliArgs.containsKey(BuildParm.PRINT_STATISTICS.getKey())) {
-      this.printStatistics = true;
-      this.setByUser.add(TargetProperty.PRINT_STATISTICS);
-    }
   }
 
-  /** Keep track of every target property that is explicitly set by the user. */
-  public Set<TargetProperty> setByUser = new HashSet<>();
-
   /**
    * A list of custom build commands that replace the default build process of directly invoking a
    * designated compiler. A common usage of this target property is to set the command to build on
@@ -201,7 +161,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
   public CoordinationOptionsProperty coordinationOptions = new CoordinationOptionsProperty();
 
   /** Link to an external runtime library instead of the default one. */
-  public ExternalRuntimePathConfig externalRuntimePath = new ExternalRuntimePathConfig();
+  public ExternalRuntimePathProperty externalRuntimePath = new ExternalRuntimePathProperty();
 
   /**
    * If true, configure the execution environment such that it does not wait for physical time to
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 51c3924fef..c5d1b2d11c 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -31,6 +31,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Properties;
+import java.util.stream.Collectors;
 
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.InvalidLfSourceException;
@@ -78,15 +79,15 @@ public enum TargetProperty {
     COMPILER(config -> config.compiler),
     /** Directive to specify compile-time definitions. */
     COMPILE_DEFINITIONS(config -> config.compileDefinitions),
-    /**
-     * Directive to generate a Dockerfile. This is either a boolean, true or false, or a dictionary of
-     * options.
-     */
+
     /** Directive to specify the coordination mode */
     COORDINATION(config -> config.coordination),
     /** Key-value pairs giving options for clock synchronization. */
     COORDINATION_OPTIONS(config -> config.coordinationOptions),
-
+    /**
+     * Directive to generate a Dockerfile. This is either a boolean, true or false, or a dictionary of
+     * options.
+     */
     DOCKER(config -> config.dockerOptions),
     /** Directive for specifying a path to an external runtime to be used for the compiled binary. */
     EXTERNAL_RUNTIME_PATH(config -> config.externalRuntimePath),
@@ -221,24 +222,23 @@ public enum TargetProperty {
      */
     FED_SETUP(config -> config.fedSetupPreamble);
 
-    public final PropertyGetter get;
+    public final ConfigLoader property;
 
     @FunctionalInterface
-    private interface PropertyGetter<T> {
-
-        TargetPropertyConfig<T> get(TargetConfig config);
+    private interface ConfigLoader {
+        TargetPropertyConfig<?> of(TargetConfig config);
     }
 
-    TargetProperty(PropertyGetter propertyGetter) {
-        this.get = propertyGetter;
+    TargetProperty(ConfigLoader property) {
+        this.property = property;
     }
 
-    public static void overrideAll(TargetConfig config, Properties properties, MessageReporter err) {
+    public static void load(TargetConfig config, Properties properties, MessageReporter err) {
         for (Object key : properties.keySet()) {
             TargetProperty p = forName(key.toString());
             if (p != null) {
                 try {
-                    p.get.get(config).override(properties.get(key));
+                    p.property.of(config).set(properties.get(key).toString(), err);
                 } catch (InvalidLfSourceException e) {
                     err.at(e.getNode()).error(e.getProblem());
                 }
@@ -253,13 +253,13 @@ public static void overrideAll(TargetConfig config, Properties properties, Messa
      * @param properties AST node that holds all the target properties.
      * @param err Error reporter on which property format errors will be reported
      */
-    public static void setAll(TargetConfig config, List<KeyValuePair> properties, MessageReporter err) {
+    public static void load(TargetConfig config, List<KeyValuePair> properties, MessageReporter err) {
         properties.forEach(
             property -> {
                 TargetProperty p = forName(property.getName());
                 if (p != null) {
                     try {
-                        p.get.get(config).set(property.getValue(), err);
+                        p.property.of(config).set(property.getValue(), err);
                     } catch (InvalidLfSourceException e) {
                         err.at(e.getNode()).error(e.getProblem());
                     }
@@ -276,10 +276,10 @@ public static void setAll(TargetConfig config, List<KeyValuePair> properties, Me
      */
     public static List<KeyValuePair> extractProperties(TargetConfig config) {
         var res = new LinkedList<KeyValuePair>();
-        for (TargetProperty p : config.setByUser) { // FIXME: do not use setByUser
+        for (TargetProperty p : TargetProperty.loaded(config)) {
             KeyValuePair kv = LfFactory.eINSTANCE.createKeyValuePair();
             kv.setName(p.toString());
-            kv.setValue(p.get.get(config).export());
+            kv.setValue(p.property.of(config).toAstElement());
             if (kv.getValue() != null) {
                 res.add(kv);
             }
@@ -287,6 +287,12 @@ public static List<KeyValuePair> extractProperties(TargetConfig config) {
         return res;
     }
 
+    public static List<TargetProperty> loaded(TargetConfig config) {
+        return Arrays.stream(TargetProperty.values()).filter(
+            it -> it.property.of(config).isSet()
+        ).collect(Collectors.toList());
+    }
+
     /**
      * Constructs a TargetDecl by extracting the fields of the given TargetConfig.
      *
@@ -305,12 +311,12 @@ public static TargetDecl extractTargetDecl(Target target, TargetConfig config) {
         return decl;
     }
 
-    public static KeyValuePair getKeyValuePair(KeyValuePairs targetProperties, TargetProperty property) {
+    private static KeyValuePair getKeyValuePair(KeyValuePairs targetProperties, TargetProperty property) {
         List<KeyValuePair> properties =
             targetProperties.getPairs().stream()
                 .filter(pair -> pair.getName().equals(property.toString()))
                 .toList();
-        assert (properties.size() <= 1);
+        assert properties.size() <= 1;
         return properties.size() > 0 ? properties.get(0) : null;
     }
 
@@ -319,7 +325,7 @@ public static KeyValuePair getKeyValuePair(Model ast, TargetProperty property) {
     }
 
     public void validate(KeyValuePairs pairs, Model ast, TargetConfig config, ValidationReporter reporter) {
-        this.get.get(config).validate(getKeyValuePair(pairs, this), ast, config, reporter);
+        this.property.of(config).validate(getKeyValuePair(pairs, this), ast, config, reporter);
     }
 
     /**
@@ -336,8 +342,6 @@ public static void update(
             property -> {
                 TargetProperty p = forName(property.getName());
                 if (p != null) {
-                    // Mark the specified target property as set by the user
-                    config.setByUser.add(p);
                     var value = property.getValue();
                     if (property.getName().equals("files")) {
                         var array = LfFactory.eINSTANCE.createArray();
@@ -354,38 +358,11 @@ public static void update(
                         value = LfFactory.eINSTANCE.createElement();
                         value.setArray(array);
                     }
-                    // FIXME: figure out different between update and override
-                    // p.updater.parseIntoTargetConfig(config, value, err);
+                    p.property.of(config).set(value, err);
                 }
             });
     }
 
-    /**
-     * Update one of the target properties, given by 'propertyName'. For convenience, a list of
-     * target
-     * properties (e.g., taken from a file or resource) can be passed without any filtering. This
-     * function will do nothing if the list of target properties doesn't include the property given
-     * by
-     * 'propertyName'.
-     *
-     * @param config The target config to apply the update to.
-     * @param property The target property.
-     * @param properties AST node that holds all the target properties.
-     * @param err Error reporter on which property format errors will be reported
-     */
-    public static void updateOne(
-        TargetConfig config,
-        TargetProperty property,
-        List<KeyValuePair> properties,
-        MessageReporter err) {
-        // FIXME
-//        properties.stream()
-//            .filter(p -> {return p.getName().equals(property.toString());})
-//            .findFirst()
-//            .map(KeyValuePair::getValue)
-//            .ifPresent(value -> property.updater.parseIntoTargetConfig(config, value, err));
-    }
-
     /**
      * Return the entry that matches the given string.
      *
@@ -410,7 +387,7 @@ public static List<TargetProperty> getOptions() {
      */
     @Override
     public String toString() {
-        // Work around because this sole property does not follow the naming convention.
+        // Workaround because this sole property does not follow the naming convention.
         if (this.equals(FED_SETUP)) {
             return "_fed_setup";
         }
@@ -419,7 +396,6 @@ public String toString() {
 
     /** Interface for dictionary elements. It associates an entry with a type. */
     public interface DictionaryElement {
-
         TargetPropertyType getType();
     }
 }
diff --git a/core/src/main/java/org/lflang/TargetPropertyConfig.java b/core/src/main/java/org/lflang/TargetPropertyConfig.java
index 44752d5e4e..99be6d6b04 100644
--- a/core/src/main/java/org/lflang/TargetPropertyConfig.java
+++ b/core/src/main/java/org/lflang/TargetPropertyConfig.java
@@ -1,7 +1,6 @@
 package org.lflang;
 
 import java.util.List;
-import java.util.Properties;
 
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -23,7 +22,7 @@ public abstract class TargetPropertyConfig<T> {
 
   protected T value = initialValue();
 
-  protected boolean setByUser;
+  protected boolean isSet;
 
   /* The type of values that can be assigned to this property. */
   public final TargetPropertyType type;
@@ -33,7 +32,7 @@ public TargetPropertyConfig(TargetPropertyType type) {
   }
 
   public void override(T value) {
-    this.setByUser = true;
+    this.isSet = true;
     this.value = value;
   }
 
@@ -44,21 +43,25 @@ public void override(T value) {
    * format errors.
    */
   public void set(Element value, MessageReporter err) {
-    var parsed = this.parse(value); // FIXME pass in error reporter. Maybe also rename to load?
+    var parsed = this.fromAst(value, err);
     if (parsed != null) {
-      this.setByUser = true;
+      this.isSet = true;
       this.value = parsed;
     }
   }
 
-  public void update(Element value, MessageReporter err) { // FIXME: diff with override??
-    this.setByUser = true;
-    this.set(value, err);
+  public void set(String value, MessageReporter err) {
+    var parsed = this.fromString(value, err);
+    if (parsed != null) {
+      this.isSet = true;
+      this.value = parsed;
+    }
   }
 
-  public void update(Properties cliArgs) {
-    this.setByUser = true;
-  } // FIXME: this is incomplete
+  public void reset() {
+    this.value = initialValue();
+    this.isSet = false;
+  }
 
   /**
    * Return the current configuration.
@@ -67,7 +70,9 @@ public T get() {
     return value;
   }
 
-  protected abstract T parse(Element value);
+  protected abstract T fromAst(Element value, MessageReporter err);
+
+  protected abstract T fromString(String value, MessageReporter err);
 
   public abstract List<Target> supportedTargets();
 
@@ -102,10 +107,10 @@ public void validate(KeyValuePair pair, Model ast, TargetConfig config, Validati
    * Read this property from the target config and build an element which represents it for the AST.
    * May return null if the given value of this property is the same as the default.
    */
-  public abstract Element export();
+  public abstract Element toAstElement();
 
-  public boolean isSetByUser() {
-    return setByUser;
+  public boolean isSet() {
+    return isSet;
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
index 4eef59c7e9..87b4fec960 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
@@ -75,7 +75,7 @@ private Path getRelativePath(Resource source, Resource target) {
 
   /** Method for the removal of things that should not appear in the target config of a federate. */
   private void clearPropertiesToIgnore() {
-    this.setByUser.remove(TargetProperty.CLOCK_SYNC);
-    this.setByUser.remove(TargetProperty.CLOCK_SYNC_OPTIONS);
+    this.clockSync.reset();
+    this.clockSyncOptions.reset();
   }
 }
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index b281a98026..545d8576a9 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -123,7 +123,7 @@ public static LFResource getLFResource(
     var targetConfig = new TargetConfig(target);
     if (config != null) {
       List<KeyValuePair> pairs = config.getPairs();
-      TargetProperty.setAll(targetConfig, pairs != null ? pairs : List.of(), messageReporter);
+      TargetProperty.load(targetConfig, pairs != null ? pairs : List.of(), messageReporter);
     }
     FileConfig fc =
         LFGenerator.createFileConfig(
diff --git a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
index c453763399..7d13203c86 100644
--- a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
+++ b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
@@ -54,7 +54,7 @@ public final class RustTargetConfig {
   public BuildType getBuildType(BuildTypeProperty cmakeBuildType) {
     // FIXME: this is because Rust uses a different default.
     // Can we just use the same?
-    if (cmakeBuildType.isSetByUser()) {
+    if (cmakeBuildType.isSet()) {
       return cmakeBuildType.get();
     }
     return profile;
diff --git a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
index 3bb2b7873e..2285d13a27 100644
--- a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
@@ -23,7 +23,7 @@ public List<String> initialValue() {
     }
 
     @Override
-    public List<String> parse(Element value) {
+    public List<String> fromAstElement(Element value) {
         return ASTUtils.elementToListOfStrings(value);
     }
 
@@ -33,7 +33,7 @@ public List<Target> supportedTargets() {
     }
 
     @Override
-    public Element export() {
+    public Element toAstElement() {
         return ASTUtils.toElement(this.value.toString());
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
index 23e3ed2f12..1ce941c42b 100644
--- a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
@@ -19,7 +19,7 @@ public BuildTypeProperty() {
     }
 
     @Override
-    public Element export() {
+    public Element toAstElement() {
         return ASTUtils.toElement(this.value.toString());
     }
 
@@ -29,7 +29,7 @@ public BuildType initialValue() {
     }
 
     @Override
-    public BuildType parse(Element value) {
+    public BuildType fromAstElement(Element value) {
         return (BuildType) UnionType.BUILD_TYPE_UNION.forName(ASTUtils.elementToSingleString(value));
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
index 51bf43b379..9672567c7f 100644
--- a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
@@ -26,7 +26,7 @@ public Map<String, CargoDependencySpec> initialValue() {
     }
 
     @Override
-    protected Map<String, CargoDependencySpec> parse(Element value) {
+    protected Map<String, CargoDependencySpec> fromAstElement(Element value) {
         return CargoDependencySpec.parseAll(value);
     }
 
@@ -36,7 +36,7 @@ public List<Target> supportedTargets() {
     }
 
     @Override
-    public Element export() {
+    public Element toAstElement() {
         var deps = this.value;
         if (deps.size() == 0) {
             return null;
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
index 3d7eb6923a..d9d8d14810 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
@@ -31,7 +31,7 @@ public ClockSyncMode initialValue() {
     }
 
     @Override
-    public ClockSyncMode parse(Element value) {
+    public ClockSyncMode fromAstElement(Element value) {
 
         UnionType.CLOCK_SYNC_UNION.validate(value);
         var mode = (ClockSyncMode)
@@ -64,7 +64,7 @@ public void validate(KeyValuePair pair, Model ast, TargetConfig config, Validati
     }
 
     @Override
-    public Element export() {
+    public Element toAstElement() {
         return ASTUtils.toElement(this.value.toString());
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
index 8767d0d503..1d658a67e6 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
@@ -30,7 +30,7 @@ public ClockSyncOptions initialValue() {
     }
 
     @Override
-    public ClockSyncOptions parse(Element value) {
+    public ClockSyncOptions fromAstElement(Element value) {
         var options = new ClockSyncOptions();
         for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
             ClockSyncOption option =
@@ -56,7 +56,7 @@ public List<Target> supportedTargets() {
     }
 
     @Override
-    public Element export() {
+    public Element toAstElement() {
         Element e = LfFactory.eINSTANCE.createElement();
         KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
         for (ClockSyncOption opt : ClockSyncOption.values()) {
diff --git a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
index 5a5b96ed37..29ff2f8f6d 100644
--- a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
@@ -22,28 +22,38 @@ public List<String> initialValue() {
         return new ArrayList<>();
     }
 
+
     @Override
-    public void update(Element value, MessageReporter err) {
-        super.update(value, err);
-        // FIXME: This merging of lists is potentially dangerous since
-        // the incoming list of cmake-includes can belong to a .lf file that is
-        // located in a different location, and keeping just filename
-        // strings like this without absolute paths is incorrect.
-        this.value.addAll(ASTUtils.elementToListOfStrings(value));
+    public void set(Element value, MessageReporter err) {
+        if (!this.isSet) {
+            super.set(value, err);
+        } else {
+            // NOTE: This merging of lists is potentially dangerous since
+            // the incoming list of cmake-includes can belong to a .lf file that is
+            // located in a different location, and keeping just filename
+            // strings like this without absolute paths is incorrect.
+            this.value.addAll(ASTUtils.elementToListOfStrings(value));
+        }
+
     }
 
     @Override
-    protected List<String> parse(Element value) {
+    protected List<String> fromAst(Element value, MessageReporter err) {
         return ASTUtils.elementToListOfStrings(value);
     }
 
+    @Override
+    protected List<String> fromString(String value, MessageReporter err) {
+        return null; // FIXME: not sure about this one
+    }
+
     @Override
     public List<Target> supportedTargets() {
         return Arrays.asList(Target.CPP, Target.C, Target.CCPP);
     }
 
     @Override
-    public Element export() {
+    public Element toAstElement() {
         return ASTUtils.toElement(this.value);
     }
 }
diff --git a/core/src/main/java/org/lflang/target/property/CompileDefinitionsConfig.java b/core/src/main/java/org/lflang/target/property/CompileDefinitionsConfig.java
index 92f6b569df..d5927c1a0b 100644
--- a/core/src/main/java/org/lflang/target/property/CompileDefinitionsConfig.java
+++ b/core/src/main/java/org/lflang/target/property/CompileDefinitionsConfig.java
@@ -22,7 +22,7 @@ public Map<String, String> initialValue() {
     }
 
     @Override
-    protected Map<String, String> parse(Element value) {
+    protected Map<String, String> fromAstElement(Element value) {
         return ASTUtils.elementToStringMaps(value);
     }
 
@@ -32,7 +32,7 @@ public List<Target> supportedTargets() {
     }
 
     @Override
-    public Element export() {
+    public Element toAstElement() {
         return ASTUtils.toElement(this.value);
     }
 }
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationModeProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationModeProperty.java
index 3a02e7a7b4..96efe0de31 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationModeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationModeProperty.java
@@ -26,7 +26,7 @@ public CoordinationMode initialValue() {
     }
 
     @Override
-    public CoordinationMode parse(Element value) {
+    public CoordinationMode fromAstElement(Element value) {
         return (CoordinationMode) UnionType.COORDINATION_UNION.forName(ASTUtils.elementToSingleString(value));
     }
 
@@ -39,7 +39,7 @@ public List<Target> supportedTargets() {
     public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {}
 
     @Override
-    public Element export() {
+    public Element toAstElement() {
         return ASTUtils.toElement(this.value.toString());
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
index a61e54831b..2844e4e0f2 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
@@ -30,7 +30,7 @@ public CoordinationOptions initialValue() {
     }
 
     @Override
-    public CoordinationOptions parse(Element value) {
+    public CoordinationOptions fromAstElement(Element value) {
         var options = new CoordinationOptions();
         for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
             CoordinationOption option =
@@ -53,7 +53,7 @@ public List<Target> supportedTargets() {
     }
 
     @Override
-    public Element export() {
+    public Element toAstElement() {
         Element e = LfFactory.eINSTANCE.createElement();
         KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
         for (CoordinationOption opt : CoordinationOption.values()) {
diff --git a/core/src/main/java/org/lflang/target/property/DefaultBooleanProperty.java b/core/src/main/java/org/lflang/target/property/DefaultBooleanProperty.java
index 088cf71cf4..4e141f624e 100644
--- a/core/src/main/java/org/lflang/target/property/DefaultBooleanProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DefaultBooleanProperty.java
@@ -1,6 +1,7 @@
 package org.lflang.target.property;
 
 
+import org.lflang.MessageReporter;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
@@ -19,12 +20,17 @@ public Boolean initialValue() {
     }
 
     @Override
-    public Boolean parse(Element value) {
+    public Boolean fromAst(Element value, MessageReporter err) {
         return ASTUtils.toBoolean(value);
     }
 
     @Override
-    public Element export() {
+    protected Boolean fromString(String value, MessageReporter err) {
+        return Boolean.parseBoolean(value);
+    }
+
+    @Override
+    public Element toAstElement() {
         return ASTUtils.toElement(value);
     }
 }
diff --git a/core/src/main/java/org/lflang/target/property/DefaultFileListProperty.java b/core/src/main/java/org/lflang/target/property/DefaultFileListProperty.java
index 5323c0ac78..a743c5b218 100644
--- a/core/src/main/java/org/lflang/target/property/DefaultFileListProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DefaultFileListProperty.java
@@ -18,7 +18,7 @@ public DefaultFileListProperty() {
 
     @Override
     public void override(List<String> value) { // FIXME: should this be override or update?
-        this.setByUser = true;
+        this.isSet = true;
         this.value.addAll(value);
     }
 
@@ -28,12 +28,12 @@ public List<String> initialValue() {
     }
 
     @Override
-    public List<String> parse(Element value) {
+    public List<String> fromAstElement(Element value) {
         return ASTUtils.elementToListOfStrings(value);
     }
 
     @Override
-    public Element export() {
+    public Element toAstElement() {
         return ASTUtils.toElement(value);
     }
 }
diff --git a/core/src/main/java/org/lflang/target/property/DefaultStringConfig.java b/core/src/main/java/org/lflang/target/property/DefaultStringConfig.java
index a4a909ea20..c81efba9d2 100644
--- a/core/src/main/java/org/lflang/target/property/DefaultStringConfig.java
+++ b/core/src/main/java/org/lflang/target/property/DefaultStringConfig.java
@@ -3,6 +3,7 @@
 
 import java.util.List;
 
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
@@ -22,12 +23,17 @@ public String initialValue() {
     }
 
     @Override
-    public String parse(Element value) {
+    public String fromAst(Element value, MessageReporter err) {
         return ASTUtils.elementToSingleString(value);
     }
 
     @Override
-    public Element export() {
+    protected String fromString(String value, MessageReporter err) {
+        return value;
+    }
+
+    @Override
+    public Element toAstElement() {
         return ASTUtils.toElement(value);
     }
 }
diff --git a/core/src/main/java/org/lflang/target/property/DefaultStringListProperty.java b/core/src/main/java/org/lflang/target/property/DefaultStringListProperty.java
index 936b724cbd..fcbd5ced73 100644
--- a/core/src/main/java/org/lflang/target/property/DefaultStringListProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DefaultStringListProperty.java
@@ -4,12 +4,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.lflang.MessageReporter;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.UnionType;
 
-
+/**
+ * Note: {@code set} implements an "append" semantics.
+ */
 public abstract class DefaultStringListProperty extends TargetPropertyConfig<List<String>> {
 
     public DefaultStringListProperty() {
@@ -22,12 +25,36 @@ public List<String> initialValue() {
     }
 
     @Override
-    public List<String> parse(Element value) {
+    public void set(Element value, MessageReporter err) {
+        if (!this.isSet) {
+            super.set(value, err);
+        } else {
+            this.value.addAll(this.fromAst(value, err));
+        }
+    }
+
+    @Override
+    public void set(String string, MessageReporter err) {
+        if (!this.isSet) {
+            super.set(string, err);
+        } else {
+            this.value.addAll(this.fromString(string, err));
+        }
+    }
+
+    @Override
+    public List<String> fromAst(Element value, MessageReporter err) {
         return ASTUtils.elementToListOfStrings(value);
     }
 
     @Override
-    public Element export() {
+    protected List<String> fromString(String value, MessageReporter err) {
+        return List.of(value.split(" "));
+    }
+
+
+    @Override
+    public Element toAstElement() {
         return ASTUtils.toElement(value);
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/DockerProperty.java b/core/src/main/java/org/lflang/target/property/DockerProperty.java
index 5676584915..c3890c786b 100644
--- a/core/src/main/java/org/lflang/target/property/DockerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DockerProperty.java
@@ -46,7 +46,7 @@ public void update(Properties cliArgs) {
     }
 
     @Override
-    public DockerOptions parse(Element value) {
+    public DockerOptions fromAstElement(Element value) {
         var options = new DockerOptions(false);
         if (value.getLiteral() != null) {
             if (ASTUtils.toBoolean(value)) {
@@ -73,7 +73,7 @@ public List<Target> supportedTargets() {
     }
 
     @Override
-    public Element export() {
+    public Element toAstElement() {
         if (!this.value.enabled) {
             return null;
         } else if (this.value.equals(new DockerOptions(true))) {
diff --git a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathConfig.java b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathConfig.java
deleted file mode 100644
index 0e606019a4..0000000000
--- a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathConfig.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.lflang.target.property.type;
-
-import java.util.List;
-
-import org.lflang.Target;
-import org.lflang.target.property.DefaultStringConfig;
-
-public class ExternalRuntimePathConfig extends DefaultStringConfig {
-
-    @Override
-    public List<Target> supportedTargets() {
-        return List.of(Target.CPP);
-    }
-}
diff --git a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
new file mode 100644
index 0000000000..a7e4c7a18c
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
@@ -0,0 +1,13 @@
+package org.lflang.target.property;
+
+import java.util.List;
+
+import org.lflang.Target;
+
+public class ExternalRuntimePathProperty extends DefaultStringConfig {
+
+    @Override
+    public List<Target> supportedTargets() {
+        return List.of(Target.CPP);
+    }
+}
diff --git a/core/src/main/java/org/lflang/target/property/LoggingProperty.java b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
index 8a4a1fabc9..50d7420a30 100644
--- a/core/src/main/java/org/lflang/target/property/LoggingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
@@ -1,8 +1,8 @@
 package org.lflang.target.property;
 
-
 import java.util.List;
 
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
@@ -22,8 +22,12 @@ public LogLevel initialValue() {
     }
 
     @Override
-    protected LogLevel parse(Element value) {
-        return (LogLevel) UnionType.LOGGING_UNION.forName(ASTUtils.elementToSingleString(value));
+    protected LogLevel fromAst(Element value, MessageReporter err) {
+        return fromString(ASTUtils.elementToSingleString(value), err);
+    }
+
+    protected LogLevel fromString(String string, MessageReporter err) {
+        return LogLevel.valueOf(string.toUpperCase());
     }
 
     @Override
@@ -32,7 +36,7 @@ public List<Target> supportedTargets() {
     }
 
     @Override
-    public Element export() {
+    public Element toAstElement() {
         return ASTUtils.toElement(value.toString());
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index 3ef0cf5581..aca5e46c2f 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -34,7 +34,7 @@ public PlatformOptions initialValue() {
     }
 
     @Override
-    public PlatformOptions parse(Element value) { // FIXME: pass in err
+    public PlatformOptions fromAstElement(Element value) { // FIXME: pass in err
         var config = new PlatformOptions();
         if (value.getLiteral() != null) {
             config.platform =
@@ -120,7 +120,7 @@ public void validate(KeyValuePair pair, Model ast, TargetConfig config, Validati
     }
 
     @Override
-    public Element export() {
+    public Element toAstElement() {
         Element e = LfFactory.eINSTANCE.createElement();
         KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
         for (PlatformOption opt : PlatformOption.values()) {
diff --git a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
index f2be54b1ab..4da5a94feb 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
@@ -27,7 +27,7 @@ public List<String> initialValue() {
     }
 
     @Override
-    public List parse(Element value) {
+    public List fromAstElement(Element value) {
         return ASTUtils.elementToListOfStrings(value);
     }
 
@@ -49,7 +49,7 @@ public void validate(KeyValuePair pair, Model ast, TargetConfig config, Validati
     }
 
     @Override
-    public Element export() {
+    public Element toAstElement() {
         return ASTUtils.toElement(value);
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
index d95fa2a68d..5bb31617bd 100644
--- a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
@@ -35,7 +35,7 @@ public List<Path> initialValue() {
     }
 
     @Override
-    public List<Path> parse(Element value) {
+    public List<Path> fromAstElement(Element value) {
         Path referencePath;
         try {
             referencePath = FileUtil.toPath(value.eResource().getURI()).toAbsolutePath();
@@ -61,7 +61,7 @@ public List<Path> parse(Element value) {
     }
 
     @Override
-    public Element export() {
+    public Element toAstElement() {
         // do not check paths here, and simply copy the absolute path over
         List<Path> paths = this.value;
         if (paths.isEmpty()) {
diff --git a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
index 5a81e4486c..99000267d0 100644
--- a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
@@ -44,7 +44,7 @@ public void update(Properties cliArgs) {
     }
 
     @Override
-    public SchedulerOption parse(Element value) {
+    public SchedulerOption fromAstElement(Element value) {
         var scheduler = (SchedulerOption)
             UnionType.SCHEDULER_UNION.forName(ASTUtils.elementToSingleString(value));
         if (scheduler != null) {
@@ -60,7 +60,7 @@ public List<Target> supportedTargets() {
     }
 
     @Override
-    public Element export() {
+    public Element toAstElement() {
         return ASTUtils.toElement(this.value.toString());
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
index da84484ea2..7ef3947727 100644
--- a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
@@ -23,7 +23,7 @@ public TimeValue initialValue() {
     }
 
     @Override
-    public TimeValue parse(Element value) {
+    public TimeValue fromAstElement(Element value) {
         return ASTUtils.toTimeValue(value);
     }
 
@@ -33,7 +33,7 @@ public List<Target> supportedTargets() {
     }
 
     @Override
-    public Element export() {
+    public Element toAstElement() {
         return ASTUtils.toElement(value);
     }
 }
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index 9484b380d3..cfdb4ad024 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -45,7 +45,7 @@ public void update(Properties cliArgs) {
     }
 
     @Override
-    public TracingOptions parse(Element value) {
+    public TracingOptions fromAstElement(Element value) {
         var options = new TracingOptions(false);
         if (value.getLiteral() != null) {
             if (!ASTUtils.toBoolean(value)) {
@@ -74,7 +74,7 @@ public List<Target> supportedTargets() {
 
     @Override
     public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
-        if (pair != null && this.parse(pair.getValue()) != null) {
+        if (pair != null && this.fromAstElement(pair.getValue()) != null) {
             // If tracing is anything but "false" and threading is off, error.
             var threading = TargetProperty.getKeyValuePair(ast, TargetProperty.THREADING);
             if (threading != null) {
@@ -93,7 +93,7 @@ public void validate(KeyValuePair pair, Model ast, TargetConfig config, Validati
     }
 
     @Override
-    public Element export() {
+    public Element toAstElement() {
         if (!this.value.isEnabled()) {
             return null;
         } else if (this.value.equals(new TracingOptions(true))) {
diff --git a/core/src/main/java/org/lflang/target/property/WorkersProperty.java b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
index a28a5a9ec0..8b4a77a931 100644
--- a/core/src/main/java/org/lflang/target/property/WorkersProperty.java
+++ b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
@@ -20,7 +21,12 @@ public Integer initialValue() {
     }
 
     @Override
-    protected Integer parse(Element value) {
+    protected Integer fromString(String value, MessageReporter err) {
+        return Integer.parseInt(value); // FIXME: check for exception
+    }
+
+    @Override
+    protected Integer fromAst(Element value, MessageReporter err) {
         return ASTUtils.toInteger(value);
     }
 
@@ -30,7 +36,7 @@ public List<Target> supportedTargets() {
     }
 
     @Override
-    public Element export() {
+    public Element toAstElement() {
         return ASTUtils.toElement(value);
     }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
index e4041e4a41..55aaeebd8b 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
@@ -133,8 +133,8 @@ class CppGenerator(
             true)
 
         // copy or download reactor-cpp
-        if (!targetConfig.externalRuntimePath.isSetByUser) {
-            if (targetConfig.runtimeVersion.isSetByUser) {
+        if (!targetConfig.externalRuntimePath.isSet) {
+            if (targetConfig.runtimeVersion.isSet) {
                 fetchReactorCpp(targetConfig.runtimeVersion.get())
             } else {
                 FileUtil.copyFromClassPath(
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
index 732536e2af..61e3375c36 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
@@ -136,9 +136,9 @@ class CppStandaloneCmakeGenerator(private val targetConfig: TargetConfig, privat
         val includeFiles = targetConfig.cmakeIncludes.get()?.map { fileConfig.srcPath.resolve(it).toUnixString() }
 
         val reactorCppTarget = when {
-            targetConfig.externalRuntimePath.isSetByUser -> "reactor-cpp"
-            targetConfig.runtimeVersion.isSetByUser      -> "reactor-cpp-${targetConfig.runtimeVersion}"
-            else                                         -> "reactor-cpp-default"
+            targetConfig.externalRuntimePath.isSet -> "reactor-cpp"
+            targetConfig.runtimeVersion.isSet      -> "reactor-cpp-${targetConfig.runtimeVersion}"
+            else                                   -> "reactor-cpp-default"
         }
 
         return with(PrependOperator) {

From 4e91b43de978224bf095d4a28724041c9a9143da Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 27 Sep 2023 14:30:47 +0200
Subject: [PATCH 0910/1114] update verifier tests

---
 test/C/src/verifier/ADASModel.lf        | 2 +-
 test/C/src/verifier/AircraftDoor.lf     | 2 +-
 test/C/src/verifier/Alarm.lf            | 2 +-
 test/C/src/verifier/PingPongVerifier.lf | 2 +-
 test/C/src/verifier/Ring.lf             | 2 +-
 test/C/src/verifier/SafeSend.lf         | 2 +-
 test/C/src/verifier/TrainDoor.lf        | 2 +-
 test/C/src/verifier/UnsafeSend.lf       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/C/src/verifier/ADASModel.lf b/test/C/src/verifier/ADASModel.lf
index e0e960a894..85b70fdabd 100644
--- a/test/C/src/verifier/ADASModel.lf
+++ b/test/C/src/verifier/ADASModel.lf
@@ -82,7 +82,7 @@ reactor Dashboard {
 @property(
     name = "responsive",
     tactic = "bmc",
-    spec = "G[0, 10 ms]((ADASModel_l_reaction_0 && (F[0](ADASModel_p_requestStop == 1))) ==> (F[0, 55 ms]( ADASModel_b_brakesApplied == 1 )))",
+    spec = "G[0, 10 ms]((ADASModel_l_reaction_1 && (F[0](ADASModel_p_requestStop == 1))) ==> (F[0, 55 ms]( ADASModel_b_brakesApplied == 1 )))",
     expect = true)
 main reactor ADASModel {
   c = new Camera()
diff --git a/test/C/src/verifier/AircraftDoor.lf b/test/C/src/verifier/AircraftDoor.lf
index 168bcca437..a696ff0f5d 100644
--- a/test/C/src/verifier/AircraftDoor.lf
+++ b/test/C/src/verifier/AircraftDoor.lf
@@ -37,7 +37,7 @@ reactor Door {
 @property(
     name = "vision_works",
     tactic = "bmc",
-    spec = "((AircraftDoor_vision_ramp == 0) ==> (G[0 sec](AircraftDoor_door_reaction_0 ==> (AircraftDoor_door_doorOpen == 1))))",
+    spec = "((AircraftDoor_vision_ramp == 0) ==> (G[0 sec](AircraftDoor_door_reaction_1 ==> (AircraftDoor_door_doorOpen == 1))))",
     expect = true)
 main reactor AircraftDoor {
   controller = new Controller()
diff --git a/test/C/src/verifier/Alarm.lf b/test/C/src/verifier/Alarm.lf
index 6449f8d626..c9e33730f7 100644
--- a/test/C/src/verifier/Alarm.lf
+++ b/test/C/src/verifier/Alarm.lf
@@ -31,7 +31,7 @@ reactor Controller {
 @property(
     name = "machine_stops_within_1_sec",
     tactic = "bmc",
-    spec = "G[0, 1 sec]((Alarm_c_reaction_0) ==> F(0, 1 sec](Alarm_c_reaction_1)))",
+    spec = "G[0, 1 sec]((Alarm_c_reaction_1) ==> F(0, 1 sec](Alarm_c_reaction_2)))",
     expect = true)
 main reactor {
   c = new Controller()
diff --git a/test/C/src/verifier/PingPongVerifier.lf b/test/C/src/verifier/PingPongVerifier.lf
index b69f99aa3a..dac49b7c82 100644
--- a/test/C/src/verifier/PingPongVerifier.lf
+++ b/test/C/src/verifier/PingPongVerifier.lf
@@ -58,7 +58,7 @@ reactor Pong {
 @property(
     name = "no_two_consecutive_pings",
     tactic = "bmc",
-    spec = "G[0, 4 nsec](PingPongVerifier_ping_reaction_1 ==> X(!PingPongVerifier_ping_reaction_1))",
+    spec = "G[0, 4 nsec](PingPongVerifier_ping_reaction_2 ==> X(!PingPongVerifier_ping_reaction_2))",
     expect = false)
 main reactor PingPongVerifier {
   ping = new Ping()
diff --git a/test/C/src/verifier/Ring.lf b/test/C/src/verifier/Ring.lf
index ac0c03907f..4e962a96cf 100644
--- a/test/C/src/verifier/Ring.lf
+++ b/test/C/src/verifier/Ring.lf
@@ -36,7 +36,7 @@ reactor Node {
 @property(
     name = "full_circle",
     tactic = "bmc",
-    spec = "F[0, 10 nsec](Ring_s_reaction_2)",
+    spec = "F[0, 10 nsec](Ring_s_reaction_3)",
     expect = true)
 main reactor {
   s = new Source()
diff --git a/test/C/src/verifier/SafeSend.lf b/test/C/src/verifier/SafeSend.lf
index 29b77dd43c..814a381a23 100644
--- a/test/C/src/verifier/SafeSend.lf
+++ b/test/C/src/verifier/SafeSend.lf
@@ -50,7 +50,7 @@ reactor Server {
 @property(
     name = "success",
     tactic = "bmc",
-    spec = "(F[0, 1 sec](SafeSend_c_reaction_1))",
+    spec = "(F[0, 1 sec](SafeSend_c_reaction_2))",
     expect = true)
 main reactor {
   c = new Client()
diff --git a/test/C/src/verifier/TrainDoor.lf b/test/C/src/verifier/TrainDoor.lf
index 176f83cbf9..8a02d254e7 100644
--- a/test/C/src/verifier/TrainDoor.lf
+++ b/test/C/src/verifier/TrainDoor.lf
@@ -31,7 +31,7 @@ reactor Door {
 @property(
     name = "train_does_not_move_until_door_closes",
     tactic = "bmc",
-    spec = "(!TrainDoor_t_reaction_0)U[0, 1 sec](TrainDoor_d_reaction_0)",
+    spec = "(!TrainDoor_t_reaction_1)U[0, 1 sec](TrainDoor_d_reaction_1)",
     expect = false)
 main reactor {
   c = new Controller()
diff --git a/test/C/src/verifier/UnsafeSend.lf b/test/C/src/verifier/UnsafeSend.lf
index 2033888ae4..befede79de 100644
--- a/test/C/src/verifier/UnsafeSend.lf
+++ b/test/C/src/verifier/UnsafeSend.lf
@@ -50,7 +50,7 @@ reactor Server {
 @property(
     name = "success",
     tactic = "bmc",
-    spec = "(F[0, 5 nsec](UnsafeSend_c_reaction_1))",
+    spec = "(F[0, 5 nsec](UnsafeSend_c_reaction_2))",
     expect = false)
 main reactor {
   c = new Client()

From faccada92796f08260f9b54e59b804620f20a489 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 27 Sep 2023 14:44:30 +0200
Subject: [PATCH 0911/1114] move invocation of verifier to GeneratorBase

---
 .../org/lflang/generator/GeneratorBase.java   | 116 ++++++++++++++++--
 .../org/lflang/generator/LFGenerator.java     | 106 ----------------
 2 files changed, 104 insertions(+), 118 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 9a31d5d235..c8ec05755f 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -26,14 +26,13 @@
 
 import com.google.common.base.Objects;
 import com.google.common.collect.Iterables;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -41,20 +40,17 @@
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
+import org.lflang.AttributeUtils;
 import org.lflang.FileConfig;
 import org.lflang.MainConflictChecker;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
+import org.lflang.analyses.uclid.UclidGenerator;
 import org.lflang.ast.ASTUtils;
 import org.lflang.ast.AstTransformation;
 import org.lflang.graph.InstantiationGraph;
-import org.lflang.lf.Connection;
-import org.lflang.lf.Instantiation;
-import org.lflang.lf.LfFactory;
-import org.lflang.lf.Mode;
-import org.lflang.lf.Reaction;
-import org.lflang.lf.Reactor;
+import org.lflang.lf.*;
 import org.lflang.util.FileUtil;
 import org.lflang.validation.AbstractLFValidator;
 
@@ -182,6 +178,12 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     // Markers mark problems in the Eclipse IDE when running in integrated mode.
     messageReporter.clearHistory();
 
+    // If "-c" or "--clean" is specified, delete any existing generated directories.
+    cleanIfNeeded(context);
+
+    // If @property annotations are used, run the LF verifier.
+    runVerifierIfPropertiesDetected(resource, context);
+
     ASTUtils.setMainName(context.getFileConfig().resource, context.getFileConfig().name);
 
     createMainInstantiation();
@@ -596,6 +598,96 @@ public void reportCommandErrors(String stderr) {
     }
   }
 
+  /** Check if a clean was requested from the standalone compiler and perform the clean step. */
+  protected void cleanIfNeeded(LFGeneratorContext context) {
+    if (context.getArgs().containsKey("clean")) {
+      try {
+        context.getFileConfig().doClean();
+      } catch (IOException e) {
+        System.err.println("WARNING: IO Error during clean");
+      }
+    }
+  }
+
+  /**
+   * Check if @property is used. If so, instantiate a UclidGenerator. The verification model needs
+   * to be generated before the target code since code generation changes LF program (desugar
+   * connections, etc.).
+   */
+  private void runVerifierIfPropertiesDetected(Resource resource, LFGeneratorContext lfContext) {
+    Optional<Reactor> mainOpt = ASTUtils.getMainReactor(resource);
+    if (mainOpt.isEmpty()) return;
+    Reactor main = mainOpt.get();
+    final MessageReporter messageReporter = lfContext.getErrorReporter();
+    List<Attribute> properties =
+        AttributeUtils.getAttributes(main).stream()
+            .filter(attr -> attr.getAttrName().equals("property"))
+            .collect(Collectors.toList());
+    if (properties.size() > 0) {
+
+      // Provide a warning.
+      messageReporter
+          .nowhere()
+          .warning(
+              "Verification using \"@property\" and \"--verify\" is an experimental feature. Use"
+                  + " with caution.");
+
+      // Generate uclid files.
+      UclidGenerator uclidGenerator = new UclidGenerator(lfContext, properties);
+      uclidGenerator.doGenerate(resource, lfContext);
+
+      // Check the generated uclid files.
+      if (uclidGenerator.targetConfig.verify) {
+
+        // Check if Uclid5 and Z3 are installed.
+        if (!execInstalled("uclid", "--help", "uclid 0.9.5")
+            || !execInstalled("z3", "--version", "Z3 version")) {
+          messageReporter
+              .nowhere()
+              .error(
+                  "Fail to check the generated verification models because Uclid5 or Z3 is not"
+                      + " installed.");
+        } else {
+          // Run the Uclid tool.
+          uclidGenerator.runner.run();
+        }
+
+      } else {
+        messageReporter
+            .nowhere()
+            .warning(
+                "The \"verify\" target property is set to false. Skip checking the verification"
+                    + " model. To check the generated verification models, set the \"verify\""
+                    + " target property to true or pass \"--verify\" to the lfc command");
+      }
+    }
+  }
+
+  /**
+   * A helper function for checking if a dependency is installed on the command line.
+   *
+   * @param binaryName The name of the binary
+   * @param arg An argument following the binary name
+   * @param expectedSubstring An expected substring in the output
+   * @return
+   */
+  public static boolean execInstalled(String binaryName, String arg, String expectedSubstring) {
+    ProcessBuilder processBuilder = new ProcessBuilder(binaryName, arg);
+    try {
+      Process process = processBuilder.start();
+      BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+      String line;
+      while ((line = reader.readLine()) != null) {
+        if (line.contains(expectedSubstring)) {
+          return true;
+        }
+      }
+    } catch (IOException e) {
+      return false; // binary not present
+    }
+    return false;
+  }
+
   private void reportIssue(StringBuilder message, Integer lineNumber, Path path, int severity) {
     DiagnosticSeverity convertedSeverity =
         severity == IMarker.SEVERITY_ERROR ? DiagnosticSeverity.Error : DiagnosticSeverity.Warning;
diff --git a/core/src/main/java/org/lflang/generator/LFGenerator.java b/core/src/main/java/org/lflang/generator/LFGenerator.java
index 84a13f6fc8..701c57fb5a 100644
--- a/core/src/main/java/org/lflang/generator/LFGenerator.java
+++ b/core/src/main/java/org/lflang/generator/LFGenerator.java
@@ -2,24 +2,17 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Injector;
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.nio.file.Path;
 import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.AbstractGenerator;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 import org.eclipse.xtext.generator.IGeneratorContext;
 import org.eclipse.xtext.util.RuntimeIOException;
-import org.lflang.AttributeUtils;
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.analyses.uclid.UclidGenerator;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedASTUtils;
 import org.lflang.federated.generator.FedFileConfig;
@@ -34,8 +27,6 @@
 import org.lflang.generator.rust.RustGenerator;
 import org.lflang.generator.ts.TSFileConfig;
 import org.lflang.generator.ts.TSGenerator;
-import org.lflang.lf.Attribute;
-import org.lflang.lf.Reactor;
 import org.lflang.scoping.LFGlobalScopeProvider;
 
 /** Generates code from your model files on save. */
@@ -117,13 +108,6 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorCont
       }
 
     } else {
-
-      // If "-c" or "--clean" is specified, delete any existing generated directories.
-      cleanIfNeeded(lfContext);
-
-      // If @property annotations are used, run the LF verifier.
-      runVerifierIfPropertiesDetected(resource, lfContext);
-
       final GeneratorBase generator = createGenerator(lfContext);
 
       if (generator != null) {
@@ -141,94 +125,4 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorCont
   public boolean errorsOccurred() {
     return generatorErrorsOccurred;
   }
-
-  /** Check if a clean was requested from the standalone compiler and perform the clean step. */
-  protected void cleanIfNeeded(LFGeneratorContext context) {
-    if (context.getArgs().containsKey("clean")) {
-      try {
-        context.getFileConfig().doClean();
-      } catch (IOException e) {
-        System.err.println("WARNING: IO Error during clean");
-      }
-    }
-  }
-
-  /**
-   * Check if @property is used. If so, instantiate a UclidGenerator. The verification model needs
-   * to be generated before the target code since code generation changes LF program (desugar
-   * connections, etc.).
-   */
-  private void runVerifierIfPropertiesDetected(Resource resource, LFGeneratorContext lfContext) {
-    Optional<Reactor> mainOpt = ASTUtils.getMainReactor(resource);
-    if (mainOpt.isEmpty()) return;
-    Reactor main = mainOpt.get();
-    final MessageReporter messageReporter = lfContext.getErrorReporter();
-    List<Attribute> properties =
-        AttributeUtils.getAttributes(main).stream()
-            .filter(attr -> attr.getAttrName().equals("property"))
-            .collect(Collectors.toList());
-    if (properties.size() > 0) {
-
-      // Provide a warning.
-      messageReporter
-          .nowhere()
-          .warning(
-              "Verification using \"@property\" and \"--verify\" is an experimental feature. Use"
-                  + " with caution.");
-
-      // Generate uclid files.
-      UclidGenerator uclidGenerator = new UclidGenerator(lfContext, properties);
-      uclidGenerator.doGenerate(resource, lfContext);
-
-      // Check the generated uclid files.
-      if (uclidGenerator.targetConfig.verify) {
-
-        // Check if Uclid5 and Z3 are installed.
-        if (!execInstalled("uclid", "--help", "uclid 0.9.5")
-            || !execInstalled("z3", "--version", "Z3 version")) {
-          messageReporter
-              .nowhere()
-              .error(
-                  "Fail to check the generated verification models because Uclid5 or Z3 is not"
-                      + " installed.");
-        } else {
-          // Run the Uclid tool.
-          uclidGenerator.runner.run();
-        }
-
-      } else {
-        messageReporter
-            .nowhere()
-            .warning(
-                "The \"verify\" target property is set to false. Skip checking the verification"
-                    + " model. To check the generated verification models, set the \"verify\""
-                    + " target property to true or pass \"--verify\" to the lfc command");
-      }
-    }
-  }
-
-  /**
-   * A helper function for checking if a dependency is installed on the command line.
-   *
-   * @param binaryName The name of the binary
-   * @param arg An argument following the binary name
-   * @param expectedSubstring An expected substring in the output
-   * @return
-   */
-  public static boolean execInstalled(String binaryName, String arg, String expectedSubstring) {
-    ProcessBuilder processBuilder = new ProcessBuilder(binaryName, arg);
-    try {
-      Process process = processBuilder.start();
-      BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
-      String line;
-      while ((line = reader.readLine()) != null) {
-        if (line.contains(expectedSubstring)) {
-          return true;
-        }
-      }
-    } catch (IOException e) {
-      return false; // binary not present
-    }
-    return false;
-  }
 }

From 5d22a1aaba23ee6df565c360e92fa726f7129a88 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 27 Sep 2023 16:05:12 +0200
Subject: [PATCH 0912/1114] no need to use a custom mechanism for detecting if
 tools are installed

---
 .../org/lflang/generator/GeneratorBase.java   | 45 ++++---------------
 1 file changed, 9 insertions(+), 36 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index c8ec05755f..12194f5993 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -26,9 +26,7 @@
 
 import com.google.common.base.Objects;
 import com.google.common.collect.Iterables;
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
@@ -178,6 +176,13 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     // Markers mark problems in the Eclipse IDE when running in integrated mode.
     messageReporter.clearHistory();
 
+    // Configure the command factory
+    commandFactory.setVerbose();
+    if (Objects.equal(context.getMode(), LFGeneratorContext.Mode.STANDALONE)
+        && context.getArgs().containsKey("quiet")) {
+      commandFactory.setQuiet();
+    }
+
     // If "-c" or "--clean" is specified, delete any existing generated directories.
     cleanIfNeeded(context);
 
@@ -196,13 +201,6 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
       }
     }
 
-    // Configure the command factory
-    commandFactory.setVerbose();
-    if (Objects.equal(context.getMode(), LFGeneratorContext.Mode.STANDALONE)
-        && context.getArgs().containsKey("quiet")) {
-      commandFactory.setQuiet();
-    }
-
     // Process target files. Copy each of them into the src-gen dir.
     // FIXME: Should we do this here? This doesn't make sense for federates the way it is
     // done here.
@@ -640,8 +638,8 @@ private void runVerifierIfPropertiesDetected(Resource resource, LFGeneratorConte
       if (uclidGenerator.targetConfig.verify) {
 
         // Check if Uclid5 and Z3 are installed.
-        if (!execInstalled("uclid", "--help", "uclid 0.9.5")
-            || !execInstalled("z3", "--version", "Z3 version")) {
+        if (commandFactory.createCommand("uclid", List.of()) == null
+            || commandFactory.createCommand("z3", List.of()) == null) {
           messageReporter
               .nowhere()
               .error(
@@ -663,31 +661,6 @@ private void runVerifierIfPropertiesDetected(Resource resource, LFGeneratorConte
     }
   }
 
-  /**
-   * A helper function for checking if a dependency is installed on the command line.
-   *
-   * @param binaryName The name of the binary
-   * @param arg An argument following the binary name
-   * @param expectedSubstring An expected substring in the output
-   * @return
-   */
-  public static boolean execInstalled(String binaryName, String arg, String expectedSubstring) {
-    ProcessBuilder processBuilder = new ProcessBuilder(binaryName, arg);
-    try {
-      Process process = processBuilder.start();
-      BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
-      String line;
-      while ((line = reader.readLine()) != null) {
-        if (line.contains(expectedSubstring)) {
-          return true;
-        }
-      }
-    } catch (IOException e) {
-      return false; // binary not present
-    }
-    return false;
-  }
-
   private void reportIssue(StringBuilder message, Integer lineNumber, Path path, int severity) {
     DiagnosticSeverity convertedSeverity =
         severity == IMarker.SEVERITY_ERROR ? DiagnosticSeverity.Error : DiagnosticSeverity.Warning;

From 788ddd8eb882c005f36fea85bc7c415fa64eb5a1 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 27 Sep 2023 16:05:59 +0200
Subject: [PATCH 0913/1114] don't exit, but report an error message

---
 .../lflang/analyses/uclid/UclidRunner.java    | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidRunner.java b/core/src/main/java/org/lflang/analyses/uclid/UclidRunner.java
index b2fe3ecc71..201127af3d 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidRunner.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidRunner.java
@@ -13,6 +13,7 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.lflang.MessageReporter;
 import org.lflang.analyses.statespace.StateInfo;
 import org.lflang.analyses.statespace.Tag;
 import org.lflang.generator.GeneratorCommandFactory;
@@ -21,21 +22,18 @@
 /** (EXPERIMENTAL) Runner for Uclid5 models. */
 public class UclidRunner {
 
-  /** A list of paths to the generated files */
-  List<Path> filePaths;
-
-  /** The directory where the generated files are placed */
-  public Path outputDir;
-
   /** A factory for compiler commands. */
   GeneratorCommandFactory commandFactory;
 
   /** A UclidGenerator instance */
   UclidGenerator generator;
 
+  MessageReporter reporter;
+
   // Constructor
   public UclidRunner(UclidGenerator generator) {
     this.generator = generator;
+    this.reporter = generator.context.getErrorReporter();
     this.commandFactory =
         new GeneratorCommandFactory(
             generator.context.getErrorReporter(), generator.context.getFileConfig());
@@ -175,7 +173,7 @@ public void run() {
       command.run();
 
       String output = command.getOutput().toString();
-      boolean valid = !output.contains("FAILED");
+      boolean valid = !output.contains("failed");
       if (valid) {
         System.out.println("Valid!");
       } else {
@@ -213,7 +211,7 @@ public void run() {
             info.display();
           }
         } catch (IOException e) {
-          System.out.println("ERROR: Not able to read from " + path.toString());
+          reporter.nowhere().error("Not able to read from " + path);
         }
       }
 
@@ -223,12 +221,13 @@ public void run() {
       if (expect != null) {
         boolean expectValid = Boolean.parseBoolean(expect);
         if (expectValid != valid) {
-          System.out.println(
-              "ERROR: The expected result does not match the actual result. Expected: "
-                  + expectValid
-                  + ", Result: "
-                  + valid);
-          System.exit(1);
+          reporter
+              .nowhere()
+              .error(
+                  "ERROR: The expected result does not match the actual result. Expected: "
+                      + expectValid
+                      + ", Result: "
+                      + valid);
         }
       }
     }

From c8212948186a0dabfe63919edc8163c8dceec453 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 27 Sep 2023 16:18:38 +0200
Subject: [PATCH 0914/1114] @label is now an LF attribute

---
 .../org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index fff1ccf873..834f8f8f0f 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -221,7 +221,7 @@ public class LinguaFrancaSynthesis extends AbstractDiagramSynthesis<Model> {
       SynthesisOption.createCheckOption("Dependency Cycle Detection", true);
 
   public static final SynthesisOption SHOW_USER_LABELS =
-      SynthesisOption.createCheckOption("User Labels (@label in JavaDoc)", true)
+      SynthesisOption.createCheckOption("User Labels (@label attribute)", true)
           .setCategory(APPEARANCE);
   public static final SynthesisOption SHOW_HYPERLINKS =
       SynthesisOption.createCheckOption("Expand/Collapse Hyperlinks", false)

From bf92355235e8a33be9eba6210c5ea356a22fbb9d Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 27 Sep 2023 16:24:33 +0200
Subject: [PATCH 0915/1114] add an option for displaying reaction names in
 diagrams

---
 .../diagram/synthesis/LinguaFrancaSynthesis.java    |  4 ++++
 .../styles/LinguaFrancaShapeExtensions.java         | 13 +++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index 834f8f8f0f..51682e1f23 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -237,6 +237,9 @@ public class LinguaFrancaSynthesis extends AbstractDiagramSynthesis<Model> {
       SynthesisOption.createCheckOption("Multiport Widths", false).setCategory(APPEARANCE);
   public static final SynthesisOption SHOW_REACTION_CODE =
       SynthesisOption.createCheckOption("Reaction Code", false).setCategory(APPEARANCE);
+
+  public static final SynthesisOption SHOW_REACTION_NAMES =
+      SynthesisOption.createCheckOption("Reaction Names", false).setCategory(APPEARANCE);
   public static final SynthesisOption SHOW_REACTION_ORDER_EDGES =
       SynthesisOption.createCheckOption("Reaction Order Edges", false).setCategory(APPEARANCE);
   public static final SynthesisOption SHOW_REACTOR_HOST =
@@ -288,6 +291,7 @@ public List<SynthesisOption> getDisplayedSynthesisOptions() {
         USE_ALTERNATIVE_DASH_PATTERN,
         SHOW_PORT_NAMES,
         SHOW_MULTIPORT_WIDTH,
+        SHOW_REACTION_NAMES,
         SHOW_REACTION_CODE,
         SHOW_REACTION_ORDER_EDGES,
         SHOW_REACTOR_HOST,
diff --git a/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java b/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
index 37e82250ea..379e07afc3 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
@@ -414,10 +414,15 @@ public KPolygon addReactionFigure(KNode node, ReactionInstance reaction) {
         minHeight);
     _kContainerRenderingExtensions.setGridPlacement(contentContainer, 1);
 
-    if (reactor.reactions.size() > 1) {
-      KText textToAdd =
-          _kContainerRenderingExtensions.addText(
-              contentContainer, Integer.toString(reactor.reactions.indexOf(reaction) + 1));
+    // Display the reaction name or its index.
+    String reactionText = null;
+    if (getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTION_NAMES)) {
+      reactionText = reaction.getName();
+    } else if (reactor.reactions.size() > 1) {
+      reactionText = Integer.toString(reactor.reactions.indexOf(reaction) + 1);
+    }
+    if (!StringExtensions.isNullOrEmpty(reactionText)) {
+      KText textToAdd = _kContainerRenderingExtensions.addText(contentContainer, reactionText);
       _kRenderingExtensions.setFontBold(textToAdd, true);
       _linguaFrancaStyleExtensions.noSelectionStyle(textToAdd);
       DiagramSyntheses.suppressSelectability(textToAdd);

From cf50460f599e10ea57dea79034fafccaf6311a60 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 27 Sep 2023 17:00:32 +0200
Subject: [PATCH 0916/1114] fix string that is matched to check if verification
 was successful

---
 core/src/main/java/org/lflang/analyses/uclid/UclidRunner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidRunner.java b/core/src/main/java/org/lflang/analyses/uclid/UclidRunner.java
index 201127af3d..4ec0703c79 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidRunner.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidRunner.java
@@ -173,7 +173,7 @@ public void run() {
       command.run();
 
       String output = command.getOutput().toString();
-      boolean valid = !output.contains("failed");
+      boolean valid = output.contains("PASSED");
       if (valid) {
         System.out.println("Valid!");
       } else {

From 159b94ad65de568c129381b83592b321d073ad36 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 27 Sep 2023 21:02:57 -0700
Subject: [PATCH 0917/1114] Various fixes

---
 .../lflang/cli/StandaloneMessageReporter.java |   6 +-
 cli/lfc/src/main/java/org/lflang/cli/Lfc.java |   2 +-
 .../org/lflang/tests/runtime/CppRos2Test.java |   2 +-
 .../org/lflang/DefaultMessageReporter.java    |   4 +-
 .../main/java/org/lflang/MessageReporter.java |   6 +-
 .../java/org/lflang/MessageReporterBase.java  |  13 +-
 .../main/java/org/lflang/TargetConfig.java    |  41 +-
 .../main/java/org/lflang/TargetProperty.java  | 737 ++++++++++--------
 .../java/org/lflang/TargetPropertyConfig.java |  59 +-
 .../org/lflang/analyses/statespace/Event.java |   4 +-
 .../statespace/StateSpaceExplorer.java        |  43 +-
 .../main/java/org/lflang/ast/ASTUtils.java    |   6 +-
 .../util/SynthesisMessageReporter.java        |   4 +-
 .../federated/extensions/CExtension.java      |   8 +-
 .../federated/extensions/CExtensionUtils.java |  64 +-
 .../federated/generator/FedGenerator.java     |   3 +-
 .../LineAdjustingMessageReporter.java         |  10 +-
 .../SynchronizedMessageReporter.java          |   3 +-
 .../FedROS2CPPSerialization.java              |   2 +-
 .../org/lflang/generator/GeneratorBase.java   |   5 +-
 .../org/lflang/generator/GeneratorUtils.java  |   6 +-
 .../LanguageServerMessageReporter.java        |   4 +-
 .../lflang/generator/c/CCmakeGenerator.java   |  10 +-
 .../org/lflang/generator/c/CCompiler.java     |   9 +-
 .../c/CEnvironmentFunctionGenerator.java      |   3 +-
 .../org/lflang/generator/c/CGenerator.java    |  60 +-
 .../generator/c/CPreambleGenerator.java       |   6 +-
 .../generator/c/CTriggerObjectsGenerator.java |   2 +-
 .../generator/python/PythonGenerator.java     |   5 +-
 .../generator/rust/CargoDependencySpec.java   |   7 +-
 .../generator/rust/RustTargetConfig.java      |   2 -
 .../lflang/target/property/AuthProperty.java  |  10 +-
 .../property/BuildCommandsProperty.java       |  55 +-
 .../lflang/target/property/BuildConfig.java   |  46 +-
 .../target/property/BuildTypeProperty.java    |  65 +-
 .../property/CargoDependenciesProperty.java   |  85 +-
 .../property/CargoFeaturesProperty.java       |  10 +-
 .../property/ClockSyncModeProperty.java       | 127 ++-
 .../property/ClockSyncOptionsProperty.java    | 248 +++---
 .../target/property/CmakeIncludeProperty.java |  83 +-
 .../property/CompileDefinitionsConfig.java    |  38 -
 .../property/CompileDefinitionsProperty.java  |  44 ++
 .../property/CompilerFlagsProperty.java       |  10 +-
 .../target/property/CompilerProperty.java     |  12 +
 .../property/CoordinationModeProperty.java    |  80 +-
 .../property/CoordinationOptionsProperty.java | 170 ++--
 .../property/DefaultBooleanProperty.java      |  48 +-
 .../property/DefaultFileListProperty.java     |  58 +-
 .../target/property/DefaultStringConfig.java  |  51 +-
 .../property/DefaultStringListProperty.java   |  86 +-
 .../target/property/DockerProperty.java       | 237 +++---
 .../ExportDependencyGraphProperty.java        |  10 +-
 .../target/property/ExportToYamlProperty.java |  10 +-
 .../property/ExternalRuntimePathProperty.java |   9 +-
 .../lflang/target/property/FastProperty.java  |  66 +-
 .../target/property/FedSetupProperty.java     |  42 +
 .../lflang/target/property/FilesProperty.java |  10 +-
 .../target/property/KeepaliveProperty.java    |  48 +-
 .../target/property/LoggingProperty.java      |  90 ++-
 .../target/property/NoCompileProperty.java    |  10 +-
 .../property/NoRuntimeValidationProperty.java |  10 +-
 .../target/property/PlatformProperty.java     | 441 +++++------
 .../property/PrintStatisticsProperty.java     |  10 +-
 .../target/property/ProtobufsProperty.java    |  10 +-
 .../property/Ros2DependenciesProperty.java    |  75 +-
 .../lflang/target/property/Ros2Property.java  |  10 +-
 .../property/RuntimeVersionProperty.java      |   9 +-
 .../target/property/RustIncludeProperty.java  | 140 ++--
 .../target/property/SchedulerProperty.java    | 226 +++---
 .../property/SingleFileProjectProperty.java   |  10 +-
 .../target/property/ThreadingProperty.java    |  18 +-
 .../target/property/TimeOutProperty.java      |  55 +-
 .../target/property/TracingProperty.java      | 278 ++++---
 .../target/property/VerifyProperty.java       |  10 +-
 .../target/property/WorkersProperty.java      |  58 +-
 .../target/property/type/ArrayType.java       |  96 ++-
 .../target/property/type/CompilerConfig.java  |  14 -
 .../target/property/type/DictionaryType.java  | 127 ++-
 .../target/property/type/PrimitiveType.java   | 153 ++--
 .../property/type/StringDictionaryType.java   |  47 +-
 .../property/type/TargetPropertyType.java     |  43 +-
 .../target/property/type/UnionType.java       | 203 +++--
 .../org/lflang/validation/LFValidator.java    |  73 +-
 .../lflang/validation/ValidationReporter.java |  11 -
 .../validation/ValidatorMessageReporter.java  |  13 +-
 .../org/lflang/generator/cpp/CppExtensions.kt |  14 +-
 .../org/lflang/generator/cpp/CppGenerator.kt  |   4 +-
 .../generator/cpp/CppPlatformGenerator.kt     |   2 +-
 .../generator/cpp/CppRos2NodeGenerator.kt     |   2 +-
 .../generator/cpp/CppStandaloneGenerator.kt   |   2 +-
 .../cpp/CppStandaloneMainGenerator.kt         |  10 +-
 .../lflang/generator/rust/RustGenerator.kt    |   8 +-
 .../org/lflang/generator/rust/RustModel.kt    |  26 +-
 .../org/lflang/generator/ts/TSGenerator.kt    |  14 +-
 .../ts/TSParameterPreambleGenerator.kt        |   5 +-
 .../compiler/LinguaFrancaValidationTest.java  |  41 +-
 .../java/org/lflang/tests/Configurators.java  |   9 +-
 97 files changed, 2613 insertions(+), 2658 deletions(-)
 delete mode 100644 core/src/main/java/org/lflang/target/property/CompileDefinitionsConfig.java
 create mode 100644 core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
 create mode 100644 core/src/main/java/org/lflang/target/property/CompilerProperty.java
 create mode 100644 core/src/main/java/org/lflang/target/property/FedSetupProperty.java
 delete mode 100644 core/src/main/java/org/lflang/target/property/type/CompilerConfig.java
 delete mode 100644 core/src/main/java/org/lflang/validation/ValidationReporter.java

diff --git a/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java b/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java
index 1ecffbdedb..91eed67715 100644
--- a/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java
+++ b/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java
@@ -30,6 +30,7 @@
 import com.google.inject.Inject;
 import java.nio.file.Path;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.diagnostics.Severity;
 import org.lflang.MessageReporterBase;
@@ -52,8 +53,9 @@ static Severity convertSeverity(DiagnosticSeverity severity) {
   }
 
   @Override
-  protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
-    issueAcceptor.accept(convertSeverity(severity), message, node, null, 0, null);
+  protected void reportOnNode(
+      EObject node, EStructuralFeature feature, DiagnosticSeverity severity, String message) {
+    issueAcceptor.accept(convertSeverity(severity), message, node, feature, 0, null);
   }
 
   @Override
diff --git a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
index 82b1979c16..66130238d3 100644
--- a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
+++ b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
@@ -10,11 +10,11 @@
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
 import org.eclipse.xtext.util.CancelIndicator;
 import org.lflang.FileConfig;
-import org.lflang.target.property.type.UnionType;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.LFGeneratorContext.BuildParm;
 import org.lflang.generator.MainContext;
+import org.lflang.target.property.type.UnionType;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
index 4b0dc28cec..a0ad550577 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
@@ -30,7 +30,7 @@ public void runWithRos2() {
         Message.DESC_ROS2,
         it -> true,
         it -> {
-          it.getContext().getTargetConfig().ros2 = true;
+          it.getContext().getTargetConfig().ros2.override(true);
           return true;
         },
         TestLevel.EXECUTION,
diff --git a/core/src/main/java/org/lflang/DefaultMessageReporter.java b/core/src/main/java/org/lflang/DefaultMessageReporter.java
index 9ea3ede28a..0f83571e60 100644
--- a/core/src/main/java/org/lflang/DefaultMessageReporter.java
+++ b/core/src/main/java/org/lflang/DefaultMessageReporter.java
@@ -2,6 +2,7 @@
 
 import java.nio.file.Path;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.lflang.generator.Range;
 
@@ -18,7 +19,8 @@ protected void report(Path path, Range range, DiagnosticSeverity severity, Strin
   }
 
   @Override
-  protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+  protected void reportOnNode(
+      EObject node, EStructuralFeature feature, DiagnosticSeverity severity, String message) {
     reportWithoutPosition(severity, message);
   }
 
diff --git a/core/src/main/java/org/lflang/MessageReporter.java b/core/src/main/java/org/lflang/MessageReporter.java
index 949c708592..16148c059a 100644
--- a/core/src/main/java/org/lflang/MessageReporter.java
+++ b/core/src/main/java/org/lflang/MessageReporter.java
@@ -2,6 +2,7 @@
 
 import java.nio.file.Path;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.lflang.generator.Position;
 import org.lflang.generator.Range;
@@ -31,7 +32,10 @@ public interface MessageReporter {
   Stage2 at(Path file, Range range);
 
   /** Position the message on the given node (must be non-null). */
-  Stage2 at(EObject object);
+  Stage2 at(EObject node);
+
+  /** Position the message on the given node and structural feature (both must be non-null). */
+  Stage2 at(EObject node, EStructuralFeature feature);
 
   /**
    * Position the message in the file (non-null), at an unknown line. Implementations usually will
diff --git a/core/src/main/java/org/lflang/MessageReporterBase.java b/core/src/main/java/org/lflang/MessageReporterBase.java
index 0ee7b0286e..b195a80319 100644
--- a/core/src/main/java/org/lflang/MessageReporterBase.java
+++ b/core/src/main/java/org/lflang/MessageReporterBase.java
@@ -2,6 +2,7 @@
 
 import java.nio.file.Path;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.lflang.generator.Range;
 
@@ -42,6 +43,11 @@ public Stage2 at(EObject node) {
     return wrap((severity, message) -> reportOnNode(node, severity, message));
   }
 
+  @Override
+  public Stage2 at(EObject node, EStructuralFeature feature) {
+    return null;
+  }
+
   @Override
   public Stage2 nowhere() {
     return wrap(this::reportWithoutPosition);
@@ -55,7 +61,12 @@ protected abstract void report(
       Path path, Range range, DiagnosticSeverity severity, String message);
 
   /** Implementation of the reporting methods that use a node as position. */
-  protected abstract void reportOnNode(EObject node, DiagnosticSeverity severity, String message);
+  protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+    reportOnNode(node, null, severity, message);
+  }
+
+  protected abstract void reportOnNode(
+      EObject node, EStructuralFeature feature, DiagnosticSeverity severity, String message);
 
   /** Implementation of the reporting methods for {@link #nowhere()}. */
   protected abstract void reportWithoutPosition(DiagnosticSeverity severity, String message);
diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index 72d3077ad3..06fa8008b0 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -25,47 +25,45 @@
 package org.lflang;
 
 import java.util.ArrayList;
-
 import java.util.List;
 import java.util.Properties;
-
 import org.lflang.generator.rust.RustTargetConfig;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.TargetDecl;
 import org.lflang.target.property.AuthProperty;
+import org.lflang.target.property.BuildCommandsProperty;
+import org.lflang.target.property.BuildTypeProperty;
 import org.lflang.target.property.ClockSyncModeProperty;
+import org.lflang.target.property.ClockSyncOptionsProperty;
+import org.lflang.target.property.CmakeIncludeProperty;
+import org.lflang.target.property.CompileDefinitionsProperty;
+import org.lflang.target.property.CompilerFlagsProperty;
+import org.lflang.target.property.CompilerProperty;
 import org.lflang.target.property.CoordinationModeProperty;
 import org.lflang.target.property.CoordinationOptionsProperty;
 import org.lflang.target.property.DockerProperty;
+import org.lflang.target.property.ExportDependencyGraphProperty;
+import org.lflang.target.property.ExportToYamlProperty;
+import org.lflang.target.property.ExternalRuntimePathProperty;
 import org.lflang.target.property.FastProperty;
 import org.lflang.target.property.FedSetupProperty;
+import org.lflang.target.property.FilesProperty;
 import org.lflang.target.property.KeepaliveProperty;
-import org.lflang.target.property.PlatformProperty;
-import org.lflang.target.property.Ros2DependenciesProperty;
-import org.lflang.target.property.SchedulerProperty;
 import org.lflang.target.property.LoggingProperty;
-import org.lflang.target.property.TracingProperty;
-import org.lflang.target.property.BuildCommandsProperty;
-import org.lflang.target.property.ClockSyncOptionsProperty;
-import org.lflang.target.property.BuildTypeProperty;
-import org.lflang.target.property.CompilerFlagsProperty;
-import org.lflang.target.property.ExportDependencyGraphProperty;
-import org.lflang.target.property.ExportToYamlProperty;
-import org.lflang.target.property.FilesProperty;
 import org.lflang.target.property.NoCompileProperty;
 import org.lflang.target.property.NoRuntimeValidationProperty;
+import org.lflang.target.property.PlatformProperty;
 import org.lflang.target.property.PrintStatisticsProperty;
 import org.lflang.target.property.ProtobufsProperty;
+import org.lflang.target.property.Ros2DependenciesProperty;
 import org.lflang.target.property.Ros2Property;
 import org.lflang.target.property.RuntimeVersionProperty;
+import org.lflang.target.property.SchedulerProperty;
 import org.lflang.target.property.SingleFileProjectProperty;
 import org.lflang.target.property.ThreadingProperty;
 import org.lflang.target.property.TimeOutProperty;
+import org.lflang.target.property.TracingProperty;
 import org.lflang.target.property.WorkersProperty;
-import org.lflang.target.property.CmakeIncludeProperty;
-import org.lflang.target.property.type.CompileDefinitionsConfig;
-import org.lflang.target.property.type.CompilerConfig;
-import org.lflang.target.property.ExternalRuntimePathProperty;
 import org.lflang.target.property.type.VerifyProperty;
 
 /**
@@ -107,7 +105,6 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
     if (cliArgs != null) {
       TargetProperty.load(this, cliArgs, messageReporter);
     }
-
   }
 
   /**
@@ -132,7 +129,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
   public CmakeIncludeProperty cmakeIncludes = new CmakeIncludeProperty();
 
   /** The compiler to invoke, unless a build command has been specified. */
-  public CompilerConfig compiler = new CompilerConfig();
+  public CompilerProperty compiler = new CompilerProperty();
 
   /** Additional sources to add to the compile command if appropriate. */
   public List<String> compileAdditionalSources = new ArrayList<>();
@@ -143,7 +140,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
    * <p>The first string is the definition itself, and the second string is the value to attribute
    * to that definition, if any. The second value could be left empty.
    */
-  public CompileDefinitionsConfig compileDefinitions = new CompileDefinitionsConfig();
+  public CompileDefinitionsProperty compileDefinitions = new CompileDefinitionsProperty();
 
   /** Flags to pass to the compiler, unless a build command has been specified. */
   public CompilerFlagsProperty compilerFlags = new CompilerFlagsProperty();
@@ -259,10 +256,8 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
   public ExportToYamlProperty exportToYaml = new ExportToYamlProperty();
 
   /** Rust-specific configuration. */
-  public final RustTargetConfig rust =
-      new RustTargetConfig(); // FIXME: https://issue.lf-lang.org/1558
+  public final RustTargetConfig rust = new RustTargetConfig();
 
   /** Path to a C file used by the Python target to setup federated execution. */
   public FedSetupProperty fedSetupPreamble = new FedSetupProperty();
-
 }
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index c5d1b2d11c..005405bc49 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -32,7 +32,6 @@
 import java.util.Objects;
 import java.util.Properties;
 import java.util.stream.Collectors;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.InvalidLfSourceException;
 import org.lflang.lf.KeyValuePair;
@@ -40,8 +39,45 @@
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.Model;
 import org.lflang.lf.TargetDecl;
+import org.lflang.target.property.AuthProperty;
+import org.lflang.target.property.BuildCommandsProperty;
+import org.lflang.target.property.BuildTypeProperty;
+import org.lflang.target.property.CargoDependenciesProperty;
+import org.lflang.target.property.CargoFeaturesProperty;
+import org.lflang.target.property.ClockSyncModeProperty;
+import org.lflang.target.property.ClockSyncOptionsProperty;
+import org.lflang.target.property.CmakeIncludeProperty;
+import org.lflang.target.property.CompileDefinitionsProperty;
+import org.lflang.target.property.CompilerFlagsProperty;
+import org.lflang.target.property.CompilerProperty;
+import org.lflang.target.property.CoordinationModeProperty;
+import org.lflang.target.property.CoordinationOptionsProperty;
+import org.lflang.target.property.DockerProperty;
+import org.lflang.target.property.ExportDependencyGraphProperty;
+import org.lflang.target.property.ExportToYamlProperty;
+import org.lflang.target.property.ExternalRuntimePathProperty;
+import org.lflang.target.property.FastProperty;
+import org.lflang.target.property.FedSetupProperty;
+import org.lflang.target.property.FilesProperty;
+import org.lflang.target.property.KeepaliveProperty;
+import org.lflang.target.property.LoggingProperty;
+import org.lflang.target.property.NoCompileProperty;
+import org.lflang.target.property.NoRuntimeValidationProperty;
+import org.lflang.target.property.PlatformProperty;
+import org.lflang.target.property.PrintStatisticsProperty;
+import org.lflang.target.property.ProtobufsProperty;
+import org.lflang.target.property.Ros2DependenciesProperty;
+import org.lflang.target.property.RuntimeVersionProperty;
+import org.lflang.target.property.RustIncludeProperty;
+import org.lflang.target.property.SchedulerProperty;
+import org.lflang.target.property.SingleFileProjectProperty;
+import org.lflang.target.property.ThreadingProperty;
+import org.lflang.target.property.TimeOutProperty;
+import org.lflang.target.property.TracingProperty;
+import org.lflang.target.property.WorkersProperty;
 import org.lflang.target.property.type.TargetPropertyType;
-import org.lflang.validation.ValidationReporter;
+import org.lflang.target.property.type.VerifyProperty;
+import org.lflang.validation.ValidatorMessageReporter;
 
 /**
  * A target properties along with a type and a list of supporting targets that supports it, as well
@@ -51,351 +87,372 @@
  */
 public enum TargetProperty {
 
-    /** Directive to allow including OpenSSL libraries and process HMAC authentication. */
-    AUTH(config -> config.auth),
-    /** Directive to let the generator use the custom build command. */
-    BUILD(config -> config.buildCommands),
-
-    /**
-     * Directive to specify the target build type such as 'Release' or 'Debug'. This is also used in
-     * the Rust target to select a Cargo profile.
-     */
-    BUILD_TYPE(config -> config.buildType),
-
-    /** Directive to let the federate execution handle clock synchronization in software. */
-    CLOCK_SYNC(config -> config.clockSync),
-    /** Key-value pairs giving options for clock synchronization. */
-    CLOCK_SYNC_OPTIONS(config -> config.clockSyncOptions),
-
-    /**
-     * Directive to specify a cmake to be included by the generated build systems.
-     *
-     * <p>This gives full control over the C/C++ build as any cmake parameters can be adjusted in
-     * the
-     * included file.
-     */
-    CMAKE_INCLUDE(config -> config.cmakeIncludes),
-    /** Directive to specify the target compiler. */
-    COMPILER(config -> config.compiler),
-    /** Directive to specify compile-time definitions. */
-    COMPILE_DEFINITIONS(config -> config.compileDefinitions),
-
-    /** Directive to specify the coordination mode */
-    COORDINATION(config -> config.coordination),
-    /** Key-value pairs giving options for clock synchronization. */
-    COORDINATION_OPTIONS(config -> config.coordinationOptions),
-    /**
-     * Directive to generate a Dockerfile. This is either a boolean, true or false, or a dictionary of
-     * options.
-     */
-    DOCKER(config -> config.dockerOptions),
-    /** Directive for specifying a path to an external runtime to be used for the compiled binary. */
-    EXTERNAL_RUNTIME_PATH(config -> config.externalRuntimePath),
-    /**
-     * Directive to let the execution engine allow logical time to elapse faster than physical time.
-     */
-    FAST(config -> config.fastMode),
-    /**
-     * Directive to stage particular files on the class path to be processed by the code generator.
-     */
-    FILES(config -> config.files),
-
-    /** Flags to be passed on to the target compiler. */
-    FLAGS(config -> config.compilerFlags),
-
-    /**
-     * Directive to let the execution engine remain active also if there are no more events in the
-     * event queue.
-     */
-    KEEPALIVE(config -> config.keepalive),
-
-    /** Directive to specify the grain at which to report log messages during execution. */
-    LOGGING(config -> config.logLevel),
-
-    /** Directive to not invoke the target compiler. */
-    NO_COMPILE(config -> config.noCompile),
-
-    /** Directive to disable validation of reactor rules at runtime. */
-    NO_RUNTIME_VALIDATION(config -> config.noRuntimeValidation),
-
-    /**
-     * Directive to specify the platform for cross code generation. This is either a string of the
-     * platform or a dictionary of options that includes the string name.
-     */
-    PLATFORM((TargetConfig config) -> config.platformOptions),
-
-    /** Directive to instruct the runtime to collect and print execution statistics. */
-    PRINT_STATISTICS(config -> config.printStatistics),
-
-    /**
-     * Directive for specifying .proto files that need to be compiled and their code included in the
-     * sources.
-     */
-    PROTOBUFS(config -> config.protoFiles),
-
-    /** Directive to specify that ROS2 specific code is generated, */
-    ROS2(config -> config.ros2),
-
-    /** Directive to specify additional ROS2 packages that this LF program depends on. */
-    ROS2_DEPENDENCIES((TargetConfig config) -> config.ros2Dependencies),
-
-    /** Directive for specifying a specific version of the reactor runtime library. */
-    RUNTIME_VERSION(config -> config.runtimeVersion),
-
-    /** Directive for specifying a specific runtime scheduler, if supported. */
-    SCHEDULER((TargetConfig config) -> config.schedulerType),
-    /** Directive to specify that all code is generated in a single file. */
-    SINGLE_FILE_PROJECT(config -> config.singleFileProject),
-
-    /** Directive to indicate whether the runtime should use multi-threading. */
-    THREADING(config -> config.threading),
-    /** Directive to check the generated verification model. */
-    VERIFY(config -> config.verify),
-
-    /** Directive to specify the number of worker threads used by the runtime. */
-    WORKERS(config -> config.workers),
-
-    /** Directive to specify the execution timeout. */
-    TIMEOUT(config -> config.timeout),
-
-    /** Directive to enable tracing. */
-    TRACING(config -> config.tracing),
-
-    /**
-     * Directive to let the runtime export its internal dependency graph.
-     *
-     * <p>This is a debugging feature and currently only used for C++ and Rust programs.
-     */
-    EXPORT_DEPENDENCY_GRAPH(config -> config.exportDependencyGraph),
-
-    /**
-     * Directive to let the runtime export the program structure to a yaml file.
-     *
-     * <p>This is a debugging feature and currently only used for C++ programs.
-     */
-    EXPORT_TO_YAML(config -> config.exportToYaml),
-
-    /**
-     * List of module files to link into the crate as top-level. For instance, a
-     * {@code target Rust {
-     * rust-modules: [ "foo.rs" ] }} will cause the file to be copied into the generated project,
-     * and
-     * the generated {@code main.rs} will include it with a {@code mod foo;}. If one of the paths is
-     * a
-     * directory, it must contain a {@code mod.rs} file, and all its contents are copied.
-     */
-    RUST_INCLUDE(config -> config.rust.rustTopLevelModules),
-
-    /** Directive for specifying Cargo features of the generated program to enable. */
-    CARGO_FEATURES(config -> config.rust.cargoFeatures),
-
-    /**
-     * Dependency specifications for Cargo. This property looks like this:
-     *
-     * <pre>{@code
-     * cargo-dependencies: {
-     *    // Name-of-the-crate: "version"
-     *    rand: "0.8",
-     *    // Equivalent to using an explicit map:
-     *    rand: {
-     *      version: "0.8"
-     *    },
-     *    // The map allows specifying more details
-     *    rand: {
-     *      // A path to a local unpublished crate.
-     *      // Note 'path' is mutually exclusive with 'version'.
-     *      path: "/home/me/Git/local-rand-clone"
-     *    },
-     *    rand: {
-     *      version: "0.8",
-     *      // you can specify cargo features
-     *      features: ["some-cargo-feature",]
-     *    }
-     * }
-     * }</pre>
-     */
-    CARGO_DEPENDENCIES(config -> config.rust.cargoDependencies),
-
-    /**
-     * Directs the C or Python target to include the associated C file used for setting up federated
-     * execution before processing the first tag.
-     */
-    FED_SETUP(config -> config.fedSetupPreamble);
-
-    public final ConfigLoader property;
-
-    @FunctionalInterface
-    private interface ConfigLoader {
-        TargetPropertyConfig<?> of(TargetConfig config);
-    }
-
-    TargetProperty(ConfigLoader property) {
-        this.property = property;
+  /** Directive to allow including OpenSSL libraries and process HMAC authentication. */
+  AUTH(AuthProperty.class, config -> config.auth),
+  /** Directive to let the generator use the custom build command. */
+  BUILD(BuildCommandsProperty.class, config -> config.buildCommands),
+
+  /**
+   * Directive to specify the target build type such as 'Release' or 'Debug'. This is also used in
+   * the Rust target to select a Cargo profile.
+   */
+  BUILD_TYPE(BuildTypeProperty.class, config -> config.buildType),
+
+  /** Directive to let the federate execution handle clock synchronization in software. */
+  CLOCK_SYNC(ClockSyncModeProperty.class, config -> config.clockSync),
+  /** Key-value pairs giving options for clock synchronization. */
+  CLOCK_SYNC_OPTIONS(ClockSyncOptionsProperty.class, config -> config.clockSyncOptions),
+
+  /**
+   * Directive to specify a cmake to be included by the generated build systems.
+   *
+   * <p>This gives full control over the C/C++ build as any cmake parameters can be adjusted in the
+   * included file.
+   */
+  CMAKE_INCLUDE(CmakeIncludeProperty.class, config -> config.cmakeIncludes),
+  /** Directive to specify the target compiler. */
+  COMPILER(CompilerProperty.class, config -> config.compiler),
+  /** Directive to specify compile-time definitions. */
+  COMPILE_DEFINITIONS(CompileDefinitionsProperty.class, config -> config.compileDefinitions),
+
+  /** Directive to specify the coordination mode */
+  COORDINATION(CoordinationModeProperty.class, config -> config.coordination),
+  /** Key-value pairs giving options for clock synchronization. */
+  COORDINATION_OPTIONS(CoordinationOptionsProperty.class, config -> config.coordinationOptions),
+  /**
+   * Directive to generate a Dockerfile. This is either a boolean, true or false, or a dictionary of
+   * options.
+   */
+  DOCKER(DockerProperty.class, config -> config.dockerOptions),
+  /** Directive for specifying a path to an external runtime to be used for the compiled binary. */
+  EXTERNAL_RUNTIME_PATH(ExternalRuntimePathProperty.class, config -> config.externalRuntimePath),
+  /**
+   * Directive to let the execution engine allow logical time to elapse faster than physical time.
+   */
+  FAST(FastProperty.class, config -> config.fastMode),
+  /**
+   * Directive to stage particular files on the class path to be processed by the code generator.
+   */
+  FILES(FilesProperty.class, config -> config.files),
+
+  /** Flags to be passed on to the target compiler. */
+  FLAGS(CompilerFlagsProperty.class, config -> config.compilerFlags),
+
+  /**
+   * Directive to let the execution engine remain active also if there are no more events in the
+   * event queue.
+   */
+  KEEPALIVE(KeepaliveProperty.class, config -> config.keepalive),
+
+  /** Directive to specify the grain at which to report log messages during execution. */
+  LOGGING(LoggingProperty.class, config -> config.logLevel),
+
+  /** Directive to not invoke the target compiler. */
+  NO_COMPILE(NoCompileProperty.class, config -> config.noCompile),
+
+  /** Directive to disable validation of reactor rules at runtime. */
+  NO_RUNTIME_VALIDATION(NoRuntimeValidationProperty.class, config -> config.noRuntimeValidation),
+
+  /**
+   * Directive to specify the platform for cross code generation. This is either a string of the
+   * platform or a dictionary of options that includes the string name.
+   */
+  PLATFORM(PlatformProperty.class, config -> config.platformOptions),
+
+  /** Directive to instruct the runtime to collect and print execution statistics. */
+  PRINT_STATISTICS(PrintStatisticsProperty.class, config -> config.printStatistics),
+
+  /**
+   * Directive for specifying .proto files that need to be compiled and their code included in the
+   * sources.
+   */
+  PROTOBUFS(ProtobufsProperty.class, config -> config.protoFiles),
+
+  /** Directive to specify that ROS2 specific code is generated, */
+  ROS2(Ros2DependenciesProperty.class, config -> config.ros2),
+
+  /** Directive to specify additional ROS2 packages that this LF program depends on. */
+  ROS2_DEPENDENCIES(Ros2DependenciesProperty.class, config -> config.ros2Dependencies),
+
+  /** Directive for specifying a specific version of the reactor runtime library. */
+  RUNTIME_VERSION(RuntimeVersionProperty.class, config -> config.runtimeVersion),
+
+  /** Directive for specifying a specific runtime scheduler, if supported. */
+  SCHEDULER(SchedulerProperty.class, config -> config.schedulerType),
+  /** Directive to specify that all code is generated in a single file. */
+  SINGLE_FILE_PROJECT(SingleFileProjectProperty.class, config -> config.singleFileProject),
+
+  /** Directive to indicate whether the runtime should use multi-threading. */
+  THREADING(ThreadingProperty.class, config -> config.threading),
+  /** Directive to check the generated verification model. */
+  VERIFY(VerifyProperty.class, config -> config.verify),
+
+  /** Directive to specify the number of worker threads used by the runtime. */
+  WORKERS(WorkersProperty.class, config -> config.workers),
+
+  /** Directive to specify the execution timeout. */
+  TIMEOUT(TimeOutProperty.class, config -> config.timeout),
+
+  /** Directive to enable tracing. */
+  TRACING(TracingProperty.class, config -> config.tracing),
+
+  /**
+   * Directive to let the runtime export its internal dependency graph.
+   *
+   * <p>This is a debugging feature and currently only used for C++ and Rust programs.
+   */
+  EXPORT_DEPENDENCY_GRAPH(
+      ExportDependencyGraphProperty.class, config -> config.exportDependencyGraph),
+
+  /**
+   * Directive to let the runtime export the program structure to a yaml file.
+   *
+   * <p>This is a debugging feature and currently only used for C++ programs.
+   */
+  EXPORT_TO_YAML(ExportToYamlProperty.class, config -> config.exportToYaml),
+
+  /**
+   * List of module files to link into the crate as top-level. For instance, a {@code target Rust {
+   * rust-modules: [ "foo.rs" ] }} will cause the file to be copied into the generated project, and
+   * the generated {@code main.rs} will include it with a {@code mod foo;}. If one of the paths is a
+   * directory, it must contain a {@code mod.rs} file, and all its contents are copied.
+   */
+  RUST_INCLUDE(RustIncludeProperty.class, config -> config.rust.rustTopLevelModules),
+
+  /** Directive for specifying Cargo features of the generated program to enable. */
+  CARGO_FEATURES(CargoFeaturesProperty.class, config -> config.rust.cargoFeatures),
+
+  /**
+   * Dependency specifications for Cargo. This property looks like this:
+   *
+   * <pre>{@code
+   * cargo-dependencies: {
+   *    // Name-of-the-crate: "version"
+   *    rand: "0.8",
+   *    // Equivalent to using an explicit map:
+   *    rand: {
+   *      version: "0.8"
+   *    },
+   *    // The map allows specifying more details
+   *    rand: {
+   *      // A path to a local unpublished crate.
+   *      // Note 'path' is mutually exclusive with 'version'.
+   *      path: "/home/me/Git/local-rand-clone"
+   *    },
+   *    rand: {
+   *      version: "0.8",
+   *      // you can specify cargo features
+   *      features: ["some-cargo-feature",]
+   *    }
+   * }
+   * }</pre>
+   */
+  CARGO_DEPENDENCIES(CargoDependenciesProperty.class, config -> config.rust.cargoDependencies),
+
+  /**
+   * Directs the C or Python target to include the associated C file used for setting up federated
+   * execution before processing the first tag.
+   */
+  FED_SETUP(FedSetupProperty.class, config -> config.fedSetupPreamble);
+
+  public final ConfigLoader property;
+
+  public final Class<? extends TargetPropertyConfig<?>> propertyClass;
+
+  @FunctionalInterface
+  private interface ConfigLoader {
+    TargetPropertyConfig<?> of(TargetConfig config);
+  }
+
+  TargetProperty(Class<? extends TargetPropertyConfig<?>> cls, ConfigLoader property) {
+    this.propertyClass = cls;
+    this.property = property;
+  }
+
+  public static TargetPropertyConfig<?> getPropertyInstance(TargetProperty p) {
+    try {
+      return p.propertyClass.newInstance();
+    } catch (InstantiationException e) {
+      throw new RuntimeException(e);
+    } catch (IllegalAccessException e) {
+      throw new RuntimeException(e);
     }
-
-    public static void load(TargetConfig config, Properties properties, MessageReporter err) {
-        for (Object key : properties.keySet()) {
-            TargetProperty p = forName(key.toString());
-            if (p != null) {
-                try {
-                    p.property.of(config).set(properties.get(key).toString(), err);
-                } catch (InvalidLfSourceException e) {
-                    err.at(e.getNode()).error(e.getProblem());
-                }
-            }
+  }
+
+  public static void load(TargetConfig config, Properties properties, MessageReporter err) {
+    for (Object key : properties.keySet()) {
+      TargetProperty p = forName(key.toString());
+      if (p != null) {
+        try {
+          p.property.of(config).set(properties.get(key).toString(), err);
+        } catch (InvalidLfSourceException e) {
+          err.at(e.getNode()).error(e.getProblem());
         }
+      }
     }
-
-    /**
-     * Set the given configuration using the given target properties.
-     *
-     * @param config The configuration object to update.
-     * @param properties AST node that holds all the target properties.
-     * @param err Error reporter on which property format errors will be reported
-     */
-    public static void load(TargetConfig config, List<KeyValuePair> properties, MessageReporter err) {
-        properties.forEach(
-            property -> {
-                TargetProperty p = forName(property.getName());
-                if (p != null) {
-                    try {
-                        p.property.of(config).set(property.getValue(), err);
-                    } catch (InvalidLfSourceException e) {
-                        err.at(e.getNode()).error(e.getProblem());
-                    }
-                }
-            });
-    }
-
-    /**
-     * Extracts all properties as a list of key-value pairs from a TargetConfig. Only extracts
-     * properties explicitly set by user.
-     *
-     * @param config The TargetConfig to extract from.
-     * @return The extracted properties.
-     */
-    public static List<KeyValuePair> extractProperties(TargetConfig config) {
-        var res = new LinkedList<KeyValuePair>();
-        for (TargetProperty p : TargetProperty.loaded(config)) {
-            KeyValuePair kv = LfFactory.eINSTANCE.createKeyValuePair();
-            kv.setName(p.toString());
-            kv.setValue(p.property.of(config).toAstElement());
-            if (kv.getValue() != null) {
-                res.add(kv);
+  }
+
+  /**
+   * Set the given configuration using the given target properties.
+   *
+   * @param config The configuration object to update.
+   * @param properties AST node that holds all the target properties.
+   * @param err Error reporter on which property format errors will be reported
+   */
+  public static void load(TargetConfig config, List<KeyValuePair> properties, MessageReporter err) {
+    properties.forEach(
+        property -> {
+          TargetProperty p = forName(property.getName());
+          if (p != null) {
+            try {
+              p.property.of(config).set(property.getValue(), err);
+            } catch (InvalidLfSourceException e) {
+              err.at(e.getNode()).error(e.getProblem());
             }
-        }
-        return res;
-    }
-
-    public static List<TargetProperty> loaded(TargetConfig config) {
-        return Arrays.stream(TargetProperty.values()).filter(
-            it -> it.property.of(config).isSet()
-        ).collect(Collectors.toList());
-    }
-
-    /**
-     * Constructs a TargetDecl by extracting the fields of the given TargetConfig.
-     *
-     * @param target The target to generate for.
-     * @param config The TargetConfig to extract from.
-     * @return A generated TargetDecl.
-     */
-    public static TargetDecl extractTargetDecl(Target target, TargetConfig config) {
-        TargetDecl decl = LfFactory.eINSTANCE.createTargetDecl();
-        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-        for (KeyValuePair p : extractProperties(config)) {
-            kvp.getPairs().add(p);
-        }
-        decl.setName(target.toString());
-        decl.setConfig(kvp);
-        return decl;
+          }
+        });
+  }
+
+  /**
+   * Extracts all properties as a list of key-value pairs from a TargetConfig. Only extracts
+   * properties explicitly set by user.
+   *
+   * @param config The TargetConfig to extract from.
+   * @return The extracted properties.
+   */
+  public static List<KeyValuePair> extractProperties(TargetConfig config) {
+    var res = new LinkedList<KeyValuePair>();
+    for (TargetProperty p : TargetProperty.loaded(config)) {
+      KeyValuePair kv = LfFactory.eINSTANCE.createKeyValuePair();
+      kv.setName(p.toString());
+      kv.setValue(p.property.of(config).toAstElement());
+      if (kv.getValue() != null) {
+        res.add(kv);
+      }
     }
-
-    private static KeyValuePair getKeyValuePair(KeyValuePairs targetProperties, TargetProperty property) {
-        List<KeyValuePair> properties =
-            targetProperties.getPairs().stream()
-                .filter(pair -> pair.getName().equals(property.toString()))
-                .toList();
-        assert properties.size() <= 1;
-        return properties.size() > 0 ? properties.get(0) : null;
-    }
-
-    public static KeyValuePair getKeyValuePair(Model ast, TargetProperty property) {
-        return getKeyValuePair(ast.getTarget().getConfig(), property);
-    }
-
-    public void validate(KeyValuePairs pairs, Model ast, TargetConfig config, ValidationReporter reporter) {
-        this.property.of(config).validate(getKeyValuePair(pairs, this), ast, config, reporter);
+    return res;
+  }
+
+  public static List<TargetProperty> loaded(TargetConfig config) {
+    return Arrays.stream(TargetProperty.values())
+        .filter(it -> it.property.of(config).isSet())
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Constructs a TargetDecl by extracting the fields of the given TargetConfig.
+   *
+   * @param target The target to generate for.
+   * @param config The TargetConfig to extract from.
+   * @return A generated TargetDecl.
+   */
+  public static TargetDecl extractTargetDecl(Target target, TargetConfig config) {
+    TargetDecl decl = LfFactory.eINSTANCE.createTargetDecl();
+    KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+    for (KeyValuePair p : extractProperties(config)) {
+      kvp.getPairs().add(p);
     }
-
-    /**
-     * Update the given configuration using the given target properties.
-     *
-     * @param config The configuration object to update.
-     * @param properties AST node that holds all the target properties.
-     * @param relativePath The path from the main resource to the resource from which the new
-     * properties originate.
-     */
-    public static void update(
-        TargetConfig config, List<KeyValuePair> properties, Path relativePath, MessageReporter err) {
-        properties.forEach(
-            property -> {
-                TargetProperty p = forName(property.getName());
-                if (p != null) {
-                    var value = property.getValue();
-                    if (property.getName().equals("files")) {
-                        var array = LfFactory.eINSTANCE.createArray();
-                        ASTUtils.elementToListOfStrings(property.getValue()).stream()
-                            .map(relativePath::resolve) // assume all paths are relative
-                            .map(Objects::toString)
-                            .map(
-                                s -> {
-                                    var element = LfFactory.eINSTANCE.createElement();
-                                    element.setLiteral(s);
-                                    return element;
-                                })
-                            .forEach(array.getElements()::add);
-                        value = LfFactory.eINSTANCE.createElement();
-                        value.setArray(array);
-                    }
-                    p.property.of(config).set(value, err);
-                }
+    decl.setName(target.toString());
+    decl.setConfig(kvp);
+    return decl;
+  }
+
+  private static KeyValuePair getKeyValuePair(
+      KeyValuePairs targetProperties, TargetProperty property) {
+    List<KeyValuePair> properties =
+        targetProperties.getPairs().stream()
+            .filter(pair -> pair.getName().equals(property.toString()))
+            .toList();
+    assert properties.size() <= 1;
+    return properties.size() > 0 ? properties.get(0) : null;
+  }
+
+  public static KeyValuePair getKeyValuePair(Model ast, TargetProperty property) {
+    return getKeyValuePair(ast.getTarget().getConfig(), property);
+  }
+
+  public static void validate(
+      KeyValuePairs pairs, Model ast, TargetConfig config, ValidatorMessageReporter reporter) {
+    Arrays.stream(TargetProperty.values())
+        .forEach(
+            p -> {
+              var pair = getKeyValuePair(pairs, p);
+              if (pair != null) {
+                p.property.of(config).checkSupport(pair, config, reporter);
+                p.property.of(config).checkType(pair, config, reporter);
+                p.property.of(config).validate(pair, ast, config, reporter);
+              }
             });
+  }
+
+  /**
+   * Update the given configuration using the given target properties.
+   *
+   * @param config The configuration object to update.
+   * @param properties AST node that holds all the target properties.
+   * @param relativePath The path from the main resource to the resource from which the new
+   *     properties originate.
+   */
+  public static void update(
+      TargetConfig config, List<KeyValuePair> properties, Path relativePath, MessageReporter err) {
+    properties.forEach(
+        property -> {
+          TargetProperty p = forName(property.getName());
+          if (p != null) {
+            var value = property.getValue();
+            if (property.getName().equals("files")) {
+              var array = LfFactory.eINSTANCE.createArray();
+              ASTUtils.elementToListOfStrings(property.getValue()).stream()
+                  .map(relativePath::resolve) // assume all paths are relative
+                  .map(Objects::toString)
+                  .map(
+                      s -> {
+                        var element = LfFactory.eINSTANCE.createElement();
+                        element.setLiteral(s);
+                        return element;
+                      })
+                  .forEach(array.getElements()::add);
+              value = LfFactory.eINSTANCE.createElement();
+              value.setArray(array);
+            }
+            p.property.of(config).set(value, err);
+          }
+        });
+  }
+
+  /**
+   * Return the entry that matches the given string.
+   *
+   * @param name The string to match against.
+   */
+  public static TargetProperty forName(String name) {
+    return Target.match(name, TargetProperty.values());
+  }
+
+  /**
+   * Return a list with all target properties.
+   *
+   * @return All existing target properties.
+   */
+  public static List<TargetProperty> getOptions() {
+    return Arrays.asList(TargetProperty.values());
+  }
+
+  /**
+   * Return the name of the property in as it appears in the target declaration. It may be an
+   * invalid identifier in other languages (may contains dashes {@code -}).
+   */
+  @Override
+  public String toString() {
+    // Workaround because this sole property does not follow the naming convention.
+    if (this.equals(FED_SETUP)) {
+      return "_fed_setup";
     }
+    return this.name().toLowerCase().replaceAll("_", "-");
+  }
 
-    /**
-     * Return the entry that matches the given string.
-     *
-     * @param name The string to match against.
-     */
-    public static TargetProperty forName(String name) {
-        return Target.match(name, TargetProperty.values());
-    }
-
-    /**
-     * Return a list with all target properties.
-     *
-     * @return All existing target properties.
-     */
-    public static List<TargetProperty> getOptions() {
-        return Arrays.asList(TargetProperty.values());
-    }
-
-    /**
-     * Return the name of the property in as it appears in the target declaration.
-     * It may be an invalid identifier in other languages (may contains dashes {@code -}).
-     */
-    @Override
-    public String toString() {
-        // Workaround because this sole property does not follow the naming convention.
-        if (this.equals(FED_SETUP)) {
-            return "_fed_setup";
-        }
-        return this.name().toLowerCase().replaceAll("_", "-");
-    }
-
-    /** Interface for dictionary elements. It associates an entry with a type. */
-    public interface DictionaryElement {
-        TargetPropertyType getType();
-    }
+  /** Interface for dictionary elements. It associates an entry with a type. */
+  public interface DictionaryElement {
+    TargetPropertyType getType();
+  }
 }
diff --git a/core/src/main/java/org/lflang/TargetPropertyConfig.java b/core/src/main/java/org/lflang/TargetPropertyConfig.java
index 99be6d6b04..4382d0ecf4 100644
--- a/core/src/main/java/org/lflang/TargetPropertyConfig.java
+++ b/core/src/main/java/org/lflang/TargetPropertyConfig.java
@@ -1,21 +1,15 @@
 package org.lflang;
 
 import java.util.List;
-
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
 import org.lflang.target.property.type.TargetPropertyType;
-import org.lflang.validation.ValidationReporter;
 
 /**
- * Extend this class to manage a non-trivial target property configuration, i.e.:
- * <ul>
- *     <li>it requires additional validation (override {@code validate});</li>
- *     <li>it uses elaborate datastructures (define as inner classes); or</li>
- *     <li>it performs non-trivial updates (override {@code update}.</li>
- * </ul>
+ * Extend this class to manage the configuration of a target property.
+ *
  * @param <T> The type of the configuration value.
  */
 public abstract class TargetPropertyConfig<T> {
@@ -63,9 +57,7 @@ public void reset() {
     this.isSet = false;
   }
 
-  /**
-   * Return the current configuration.
-   */
+  /** Return the current configuration. */
   public T get() {
     return value;
   }
@@ -77,30 +69,33 @@ public T get() {
   public abstract List<Target> supportedTargets();
 
   public final boolean isSupported(Target target) {
-    if (supportedTargets().contains(target)) {
-      return true;
-    }
-    return false;
+    return supportedTargets().contains(target);
+  }
+
+  public void validate(
+      KeyValuePair pair, Model ast, TargetConfig config, MessageReporter reporter) {
+    // FIXME: Make abstract?
+    // FIXME: consider not passing in config
   }
 
-  // FIXME: config may not be needed.
-  public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
-    // Check whether the property is supported by the target.
+  public void checkSupport(KeyValuePair pair, TargetConfig config, MessageReporter reporter) {
     if (!this.isSupported(config.target)) {
-      reporter.warning(
-          "The target parameter: "
-              + pair.getName()
-              + " is not supported by the "
-              + config.target
-              + " target and will thus be ignored.",
-          pair,
-          Literals.KEY_VALUE_PAIR__NAME);
+      reporter
+          .at(pair, Literals.KEY_VALUE_PAIR__NAME)
+          .warning(
+              String.format(
+                  "The target parameter: %s is not supported by the %s target and will thus be"
+                      + " ignored.",
+                  pair.getName(), config.target));
     }
+  }
 
+  public void checkType(KeyValuePair pair, TargetConfig config, MessageReporter reporter) {
     if (!this.type.check(pair.getValue(), pair.getName(), reporter)) {
-      reporter.error("Target property '" + pair.getName() + "' is required to be " + type + ".", pair, Literals.KEY_VALUE_PAIR__VALUE);
+      reporter
+          .at(pair, Literals.KEY_VALUE_PAIR__VALUE)
+          .error("Target property '" + pair.getName() + "' is required to be " + type + ".");
     }
-
   }
 
   /**
@@ -114,5 +109,11 @@ public boolean isSet() {
   }
 
   @Override
-  public String toString() { return value.toString(); }
+  public String toString() {
+    return value.toString();
+  }
+
+  public void markSet() {
+    this.isSet = true;
+  }
 }
diff --git a/core/src/main/java/org/lflang/analyses/statespace/Event.java b/core/src/main/java/org/lflang/analyses/statespace/Event.java
index d8613e5138..7f8b54b20b 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/Event.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/Event.java
@@ -5,7 +5,7 @@
 /** A node in the state space diagram representing a step in the execution of an LF program. */
 public class Event implements Comparable<Event> {
 
-  private TriggerInstance trigger;
+  private final TriggerInstance<?> trigger;
   private Tag tag;
 
   public Event(TriggerInstance trigger, Tag tag) {
@@ -45,7 +45,7 @@ public Tag getTag() {
     return tag;
   }
 
-  public TriggerInstance getTrigger() {
+  public TriggerInstance<?> getTrigger() {
     return trigger;
   }
 }
diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
index 48f407914f..40f4a521ea 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
@@ -4,6 +4,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.stream.Collectors;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.generator.ActionInstance;
@@ -91,37 +92,36 @@ public void explore(Tag horizon, boolean findLoop) {
     boolean stop = true;
     if (this.eventQ.size() > 0) {
       stop = false;
-      currentTag = (eventQ.peek()).getTag();
+      currentTag = eventQ.peek().getTag();
     }
 
     // A list of reactions invoked at the current logical tag
     Set<ReactionInstance> reactionsInvoked;
-    // A temporary list of reactions processed in the current LOOP ITERATION
-    Set<ReactionInstance> reactionsTemp;
 
     while (!stop) {
 
       // Pop the events from the earliest tag off the event queue.
-      ArrayList<Event> currentEvents = new ArrayList<Event>();
-      // FIXME: Use stream methods here?
-      while (eventQ.size() > 0 && eventQ.peek().getTag().compareTo(currentTag) == 0) {
-        Event e = eventQ.poll();
-        currentEvents.add(e);
-      }
+
+      final var now = currentTag;
+      var currentEvents =
+          eventQ.stream()
+              .filter(e -> e.getTag().equals(now))
+              .collect(Collectors.toCollection(ArrayList::new));
 
       // Collect all the reactions invoked in this current LOOP ITERATION
       // triggered by the earliest events.
       // Using a hash set here to make sure the reactions invoked
       // are unique. Sometimes multiple events can trigger the same reaction,
       // and we do not want to record duplicate reaction invocations.
-      reactionsTemp = new HashSet<ReactionInstance>();
+
+      // A temporary list of reactions processed in the current LOOP ITERATION
+      Set<ReactionInstance> reactionsTemp = new HashSet<>();
       for (Event e : currentEvents) {
         Set<ReactionInstance> dependentReactions = e.getTrigger().getDependentReactions();
         reactionsTemp.addAll(dependentReactions);
 
         // If the event is a timer firing, enqueue the next firing.
-        if (e.getTrigger() instanceof TimerInstance) {
-          TimerInstance timer = (TimerInstance) e.getTrigger();
+        if (e.getTrigger() instanceof TimerInstance timer) {
           eventQ.add(
               new Event(
                   timer,
@@ -185,22 +185,21 @@ public void explore(Tag horizon, boolean findLoop) {
         //// Now we are done with the node at the previous tag,
         //// work on the new node at the current timestamp.
         // Copy the reactions in reactionsTemp.
-        reactionsInvoked = new HashSet<ReactionInstance>(reactionsTemp);
+        reactionsInvoked = new HashSet<>(reactionsTemp);
 
         // Create a new state in the SSD for the current tag,
         // add the reactions triggered to the state,
         // and add a snapshot of the event queue (with new events
         // generated by reaction invocations in the curren tag)
         // to the state.
-        StateSpaceNode node =
+
+        // Initialize currentNode.
+        currentNode =
             new StateSpaceNode(
                 currentTag, // Current tag
                 reactionsInvoked, // Reactions invoked at this tag
-                new ArrayList<Event>(eventQ) // A snapshot of the event queue
+                new ArrayList<>(eventQ) // A snapshot of the event queue
                 );
-
-        // Initialize currentNode.
-        currentNode = node;
       }
       // When we advance to a new TIMESTAMP (not a new tag),
       // create a new node in the state space diagram
@@ -248,7 +247,7 @@ else if (previousTag != null && currentTag.timestamp > previousTag.timestamp) {
         //// Now we are done with the node at the previous tag,
         //// work on the new node at the current timestamp.
         // Copy the reactions in reactionsTemp.
-        reactionsInvoked = new HashSet<ReactionInstance>(reactionsTemp);
+        reactionsInvoked = new HashSet<>(reactionsTemp);
 
         // Create a new state in the SSD for the current tag,
         // add the reactions triggered to the state,
@@ -259,7 +258,7 @@ else if (previousTag != null && currentTag.timestamp > previousTag.timestamp) {
             new StateSpaceNode(
                 currentTag, // Current tag
                 reactionsInvoked, // Reactions invoked at this tag
-                new ArrayList<Event>(eventQ) // A snapshot of the event queue
+                new ArrayList<>(eventQ) // A snapshot of the event queue
                 );
 
         // Update the previous node.
@@ -274,7 +273,7 @@ else if (previousTag != null && currentTag.timestamp == previousTag.timestamp) {
         // to the existing state space node.
         currentNode.getReactionsInvoked().addAll(reactionsTemp);
         // Update the eventQ snapshot.
-        currentNode.setEventQcopy(new ArrayList<Event>(eventQ));
+        currentNode.setEventQcopy(new ArrayList<>(eventQ));
       } else {
         throw new AssertionError("Unreachable");
       }
@@ -313,7 +312,5 @@ else if (previousTag != null && currentTag.timestamp == previousTag.timestamp) {
     // that means there is only one node in the diagram.
     // Set the current node as the head.
     if (this.diagram.head == null) this.diagram.head = currentNode;
-
-    return;
   }
 }
diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 390f964369..fc054e5018 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -614,8 +614,10 @@ public static ReactorInstance createMainReactorInstance(
       if (breadth == 0) {
         messageReporter.nowhere().warning("The program has no reactions");
       } else {
-        targetConfig.compileDefinitions.get().put(
-            "LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth()));
+        targetConfig
+            .compileDefinitions
+            .get()
+            .put("LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth()));
       }
       return main;
     }
diff --git a/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisMessageReporter.java b/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisMessageReporter.java
index dea894d833..dab0eb6265 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisMessageReporter.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/util/SynthesisMessageReporter.java
@@ -29,6 +29,7 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.lflang.MessageReporterBase;
 import org.lflang.generator.Range;
@@ -55,7 +56,8 @@ protected void report(Path path, Range range, DiagnosticSeverity severity, Strin
   }
 
   @Override
-  protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+  protected void reportOnNode(
+      EObject node, EStructuralFeature feature, DiagnosticSeverity severity, String message) {
     reportWithoutPosition(severity, message);
   }
 }
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 78a1abc910..07dce71ca1 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -36,7 +36,6 @@
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetProperty;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedASTUtils;
@@ -83,18 +82,15 @@ public void initializeTargetConfig(
     generateCMakeInclude(federate, fileConfig);
 
     federate.targetConfig.keepalive.override(true);
-    federate.targetConfig.setByUser.add(TargetProperty.KEEPALIVE);
 
     // If there are federates, copy the required files for that.
     // Also, create the RTI C file and the launcher script.
     // Handle target parameters.
     // If the program is federated, then ensure that threading is enabled.
-    federate.targetConfig.threading = true;
-    federate.targetConfig.setByUser.add(TargetProperty.THREADING);
+    federate.targetConfig.threading.override(true);
 
     // Include the fed setup file for this federate in the target property
-    federate.targetConfig.fedSetupPreamble = getPreamblePath(federate);
-    federate.targetConfig.setByUser.add(TargetProperty.FED_SETUP);
+    federate.targetConfig.fedSetupPreamble.override(getPreamblePath(federate));
   }
 
   /** Generate a cmake-include file for {@code federate} if needed. */
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 6bc46556c8..bbb7cc8b88 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -8,7 +8,6 @@
 import java.util.regex.Pattern;
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
@@ -173,16 +172,15 @@ public static void handleCompileDefinitions(
       int numOfFederates,
       RtiConfig rtiConfig,
       MessageReporter messageReporter) {
-    federate.targetConfig.setByUser.add(TargetProperty.COMPILE_DEFINITIONS);
-    federate.targetConfig.compileDefinitions.get().put("FEDERATED", "");
-    federate.targetConfig.compileDefinitions.get().put(
-        "FEDERATED_" + federate.targetConfig.coordination.toString().toUpperCase(), "");
+    var defs = federate.targetConfig.compileDefinitions.get();
+    defs.put("FEDERATED", "");
+    defs.put("FEDERATED_" + federate.targetConfig.coordination.toString().toUpperCase(), "");
     if (federate.targetConfig.auth.get()) {
-      federate.targetConfig.compileDefinitions.get().put("FEDERATED_AUTHENTICATED", "");
+      defs.put("FEDERATED_AUTHENTICATED", "");
     }
-    federate.targetConfig.compileDefinitions.get().put(
-        "NUMBER_OF_FEDERATES", String.valueOf(numOfFederates));
-    federate.targetConfig.compileDefinitions.get().put("EXECUTABLE_PREAMBLE", "");
+    defs.put("NUMBER_OF_FEDERATES", String.valueOf(numOfFederates));
+    defs.put("EXECUTABLE_PREAMBLE", "");
+    federate.targetConfig.compileDefinitions.markSet();
 
     handleAdvanceMessageInterval(federate);
 
@@ -190,11 +188,15 @@ public static void handleCompileDefinitions(
   }
 
   private static void handleAdvanceMessageInterval(FederateInstance federate) {
-    var advanceMessageInterval = federate.targetConfig.coordinationOptions.get().advanceMessageInterval;
-    federate.targetConfig.setByUser.remove(TargetProperty.COORDINATION_OPTIONS);
+    var advanceMessageInterval =
+        federate.targetConfig.coordinationOptions.get().advanceMessageInterval;
+    federate.targetConfig.coordinationOptions.reset();
     if (advanceMessageInterval != null) {
-      federate.targetConfig.compileDefinitions.get().put(
-          "ADVANCE_MESSAGE_INTERVAL", String.valueOf(advanceMessageInterval.toNanoSeconds()));
+      federate
+          .targetConfig
+          .compileDefinitions
+          .get()
+          .put("ADVANCE_MESSAGE_INTERVAL", String.valueOf(advanceMessageInterval.toNanoSeconds()));
     }
   }
 
@@ -225,12 +227,8 @@ public static void initializeClockSynchronization(
               .nowhere()
               .info("Will collect clock sync statistics for federate " + federate.id);
           // Add libm to the compiler flags
-          // FIXME: This is a linker flag not compile flag but we don't have a way to add linker
-          // flags
-          // FIXME: This is probably going to fail on MacOS (especially using clang)
-          // because libm functions are builtin
           federate.targetConfig.compilerFlags.get().add("-lm");
-          federate.targetConfig.setByUser.add(TargetProperty.FLAGS);
+          federate.targetConfig.compilerFlags.markSet();
         }
         messageReporter
             .nowhere()
@@ -255,12 +253,21 @@ public static void addClockSyncCompileDefinitions(FederateInstance federate) {
     ClockSyncOptions options = federate.targetConfig.clockSyncOptions.get();
 
     federate.targetConfig.compileDefinitions.get().put("_LF_CLOCK_SYNC_INITIAL", "");
-    federate.targetConfig.compileDefinitions.get().put(
-        "_LF_CLOCK_SYNC_PERIOD_NS", String.valueOf(options.period.toNanoSeconds()));
-    federate.targetConfig.compileDefinitions.get().put(
-        "_LF_CLOCK_SYNC_EXCHANGES_PER_INTERVAL", String.valueOf(options.trials));
-    federate.targetConfig.compileDefinitions.get().put(
-        "_LF_CLOCK_SYNC_ATTENUATION", String.valueOf(options.attenuation));
+    federate
+        .targetConfig
+        .compileDefinitions
+        .get()
+        .put("_LF_CLOCK_SYNC_PERIOD_NS", String.valueOf(options.period.toNanoSeconds()));
+    federate
+        .targetConfig
+        .compileDefinitions
+        .get()
+        .put("_LF_CLOCK_SYNC_EXCHANGES_PER_INTERVAL", String.valueOf(options.trials));
+    federate
+        .targetConfig
+        .compileDefinitions
+        .get()
+        .put("_LF_CLOCK_SYNC_ATTENUATION", String.valueOf(options.attenuation));
 
     if (mode == ClockSyncMode.ON) {
       federate.targetConfig.compileDefinitions.get().put("_LF_CLOCK_SYNC_ON", "");
@@ -292,9 +299,12 @@ public static void generateCMakeInclude(FederateInstance federate, FedFileConfig
       srcWriter.write(cmakeIncludeCode.getCode());
     }
 
-    federate.targetConfig.cmakeIncludes.get().add(
-        fileConfig.getSrcPath().relativize(cmakeIncludePath).toString());
-    federate.targetConfig.setByUser.add(TargetProperty.CMAKE_INCLUDE);
+    federate
+        .targetConfig
+        .cmakeIncludes
+        .get()
+        .add(fileConfig.getSrcPath().relativize(cmakeIncludePath).toString());
+    federate.targetConfig.cmakeIncludes.markSet();
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index f3b74c495d..2990cbc169 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -693,6 +693,7 @@ private void replaceFedConnection(FedConnectionInstance connection, Resource res
       }
     }
 
-    FedASTUtils.makeCommunication(connection, resource, targetConfig.coordination.get(), messageReporter);
+    FedASTUtils.makeCommunication(
+        connection, resource, targetConfig.coordination.get(), messageReporter);
   }
 }
diff --git a/core/src/main/java/org/lflang/federated/generator/LineAdjustingMessageReporter.java b/core/src/main/java/org/lflang/federated/generator/LineAdjustingMessageReporter.java
index 9a08f007cb..6579e4e7da 100644
--- a/core/src/main/java/org/lflang/federated/generator/LineAdjustingMessageReporter.java
+++ b/core/src/main/java/org/lflang/federated/generator/LineAdjustingMessageReporter.java
@@ -3,6 +3,7 @@
 import java.nio.file.Path;
 import java.util.Map;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.lflang.MessageReporter;
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.Position;
@@ -19,8 +20,13 @@ public LineAdjustingMessageReporter(MessageReporter parent, Map<Path, CodeMap> c
   }
 
   @Override
-  public Stage2 at(EObject object) {
-    return parent.at(object);
+  public Stage2 at(EObject node, EStructuralFeature feature) {
+    return parent.at(node, feature);
+  }
+
+  @Override
+  public Stage2 at(EObject node) {
+    return parent.at(node);
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/federated/generator/SynchronizedMessageReporter.java b/core/src/main/java/org/lflang/federated/generator/SynchronizedMessageReporter.java
index e51a118d70..6583ba97ab 100644
--- a/core/src/main/java/org/lflang/federated/generator/SynchronizedMessageReporter.java
+++ b/core/src/main/java/org/lflang/federated/generator/SynchronizedMessageReporter.java
@@ -2,6 +2,7 @@
 
 import java.nio.file.Path;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.lflang.MessageReporter;
 import org.lflang.MessageReporterBase;
@@ -17,7 +18,7 @@ public SynchronizedMessageReporter(MessageReporter parent) {
 
   @Override
   protected synchronized void reportOnNode(
-      EObject node, DiagnosticSeverity severity, String message) {
+      EObject node, EStructuralFeature feature, DiagnosticSeverity severity, String message) {
     parent.at(node).report(severity, message);
   }
 
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
index 4807f42fbc..48e9e2ec92 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
@@ -52,7 +52,7 @@ public boolean isCompatible(GeneratorBase generator) {
           .nowhere()
           .error("ROS serialization is currently only supported for the C target.");
       return false;
-    } else if (!generator.getTargetConfig().compiler.equalsIgnoreCase("g++")) {
+    } else if (!generator.getTargetConfig().compiler.get().equalsIgnoreCase("g++")) {
       generator
           .messageReporter
           .nowhere()
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 9a31d5d235..ae75109aa6 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -252,7 +252,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
 
     // Check for the existence and support of watchdogs
     hasWatchdogs = IterableExtensions.exists(reactors, it -> !it.getWatchdogs().isEmpty());
-    checkWatchdogSupport(targetConfig.threading && getTarget() == Target.C);
+    checkWatchdogSupport(targetConfig.threading.get() && getTarget() == Target.C);
     additionalPostProcessingForModes();
   }
 
@@ -318,7 +318,8 @@ protected void setReactorsAndInstantiationGraph(LFGeneratorContext.Mode mode) {
    */
   protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
     var dst = this.context.getFileConfig().getSrcGenPath();
-    FileUtil.copyFilesOrDirectories(targetConfig.files, dst, fileConfig, messageReporter, false);
+    FileUtil.copyFilesOrDirectories(
+        targetConfig.files.get(), dst, fileConfig, messageReporter, false);
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index 545d8576a9..b7a35ca6a2 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -55,11 +55,9 @@ public static void accommodatePhysicalActionsIfPresent(
     for (Resource resource : resources) {
       for (Action action : findAll(resource, Action.class)) {
         if (action.getOrigin() == ActionOrigin.PHYSICAL
-            &&
-            // Check if the user has explicitly set keepalive to false
-            !targetConfig.setByUser.contains(TargetProperty.KEEPALIVE)
+            && !targetConfig.keepalive.isSet()
             && !targetConfig.keepalive.get()) {
-          // If not, set it to true
+          // Keepalive was explicitly set to false; set it to true.
           targetConfig.keepalive.override(true);
           String message =
               String.format(
diff --git a/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java b/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java
index 0fd51333b1..a9fcff9f22 100644
--- a/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java
+++ b/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java
@@ -8,6 +8,7 @@
 import java.util.Optional;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.lsp4j.PublishDiagnosticsParams;
@@ -47,7 +48,8 @@ public LanguageServerMessageReporter(EObject parseRoot) {
   }
 
   @Override
-  protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+  protected void reportOnNode(
+      EObject node, EStructuralFeature feature, DiagnosticSeverity severity, String message) {
     reportWithoutPosition(severity, message);
   }
 
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 471bd78dcf..0c9b273467 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -251,7 +251,9 @@ CodeBuilder generateCMakeCode(
 
     if (targetConfig.platformOptions.get().platform != Platform.AUTO) {
       cMakeCode.pr(
-          "set(CMAKE_SYSTEM_NAME " + targetConfig.platformOptions.get().platform.getcMakeName() + ")");
+          "set(CMAKE_SYSTEM_NAME "
+              + targetConfig.platformOptions.get().platform.getcMakeName()
+              + ")");
     }
     cMakeCode.newLine();
 
@@ -326,7 +328,7 @@ CodeBuilder generateCMakeCode(
       cMakeCode.newLine();
     }
 
-    if (targetConfig.threading) {
+    if (targetConfig.threading.get()) {
       // If threaded computation is requested, add the threads option.
       cMakeCode.pr("# Find threads and link to it");
       cMakeCode.pr("find_package(Threads REQUIRED)");
@@ -344,7 +346,7 @@ CodeBuilder generateCMakeCode(
 
     // Add additional flags so runtime can distinguish between multi-threaded and single-threaded
     // mode
-    if (targetConfig.threading) {
+    if (targetConfig.threading.get()) {
       cMakeCode.pr("# Set flag to indicate a multi-threaded runtime");
       cMakeCode.pr("target_compile_definitions( ${LF_MAIN_TARGET} PUBLIC LF_THREADED=1)");
     } else {
@@ -355,7 +357,7 @@ CodeBuilder generateCMakeCode(
 
     if (CppMode) cMakeCode.pr("enable_language(CXX)");
 
-    if (targetConfig.compiler != null && !targetConfig.compiler.isBlank()) {
+    if (!targetConfig.compiler.isSet()) {
       if (CppMode) {
         // Set the CXX compiler to what the user has requested.
         cMakeCode.pr("set(CMAKE_CXX_COMPILER " + targetConfig.compiler + ")");
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index 65ddfaa398..deabdc42a5 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -404,8 +404,10 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
     }
 
     // Add compile definitions
-    targetConfig.compileDefinitions.get().forEach(
-        (key, value) -> compileArgs.add("-D" + key + "=" + value));
+    targetConfig
+        .compileDefinitions
+        .get()
+        .forEach((key, value) -> compileArgs.add("-D" + key + "=" + value));
 
     // Finally, add the compiler flags in target parameters (if any)
     compileArgs.addAll(targetConfig.compilerFlags.get());
@@ -426,7 +428,8 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
     }
 
     LFCommand command =
-        commandFactory.createCommand(targetConfig.compiler.get(), compileArgs, fileConfig.getOutPath());
+        commandFactory.createCommand(
+            targetConfig.compiler.get(), compileArgs, fileConfig.getOutPath());
     if (command == null) {
       messageReporter
           .nowhere()
diff --git a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
index 90a09b3dc1..d04eae4540 100644
--- a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -95,8 +95,7 @@ private String generateCreateEnvironments() {
           if (enclave.isMainOrFederated()) {
             traceFileName = "\"" + tracing.traceFileName + ".lft\"";
           } else {
-            traceFileName =
-                "\"" + tracing.traceFileName + enclave.getName() + ".lft\"";
+            traceFileName = "\"" + tracing.traceFileName + enclave.getName() + ".lft\"";
           }
         } else {
           if (enclave.isMainOrFederated()) {
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index d00578d9c5..4ee4b0f6d3 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -53,8 +53,6 @@
 import org.lflang.FileConfig;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
-import org.lflang.TargetProperty;
-import org.lflang.target.property.PlatformProperty.PlatformOption;
 import org.lflang.ast.ASTUtils;
 import org.lflang.ast.DelayedConnectionTransformation;
 import org.lflang.federated.extensions.CExtensionUtils;
@@ -89,6 +87,7 @@
 import org.lflang.lf.StateVar;
 import org.lflang.lf.Variable;
 import org.lflang.target.property.PlatformProperty.Platform;
+import org.lflang.target.property.PlatformProperty.PlatformOption;
 import org.lflang.target.property.SchedulerProperty.SchedulerOption;
 import org.lflang.util.ArduinoUtil;
 import org.lflang.util.FileUtil;
@@ -347,9 +346,8 @@ public void accommodatePhysicalActionsIfPresent() {
           // If the unthreaded runtime is not requested by the user, use the threaded runtime
           // instead
           // because it is the only one currently capable of handling asynchronous events.
-          if (!targetConfig.threading
-              && !targetConfig.setByUser.contains(TargetProperty.THREADING)) {
-            targetConfig.threading = true;
+          if (!targetConfig.threading.get() && !targetConfig.threading.isSet()) {
+            targetConfig.threading.override(true);
             String message =
                 "Using the threaded C runtime to allow for asynchronous handling of physical action"
                     + " "
@@ -459,7 +457,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
       try {
         Path include = fileConfig.getSrcGenPath().resolve("include/");
         Path src = fileConfig.getSrcGenPath().resolve("src/");
-        FileUtil.arduinoDeleteHelper(src, targetConfig.threading);
+        FileUtil.arduinoDeleteHelper(src, targetConfig.threading.get());
         FileUtil.relativeIncludeHelper(src, include, messageReporter);
         FileUtil.relativeIncludeHelper(include, include, messageReporter);
       } catch (IOException e) {
@@ -518,7 +516,8 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     try {
       String compileDefs =
           targetConfig.compileDefinitions.get().keySet().stream()
-              .map(key -> "\"-D" + key + "=" + targetConfig.compileDefinitions.get().get(key) + "\"")
+              .map(
+                  key -> "\"-D" + key + "=" + targetConfig.compileDefinitions.get().get(key) + "\"")
               .collect(Collectors.joining(",\n"));
       String settings = "{\n" + "\"cmake.configureArgs\": [\n" + compileDefs + "\n]\n}\n";
       Path vscodePath = fileConfig.getSrcGenPath().resolve(".vscode");
@@ -698,7 +697,7 @@ private void pickScheduler() {
     if (!targetConfig.schedulerType.get().prioritizesDeadline()) {
       // Check if a deadline is assigned to any reaction
       if (hasDeadlines(reactors)) {
-        if (!targetConfig.setByUser.contains(TargetProperty.SCHEDULER)) {
+        if (!targetConfig.schedulerType.isSet()) {
           targetConfig.schedulerType.override(SchedulerOption.GEDF_NP);
         }
       }
@@ -745,7 +744,8 @@ private void inspectReactorEResource(ReactorDecl reactor) {
         // Merge the CMake includes from the imported file into the target config
         lfResource
             .getTargetConfig()
-            .cmakeIncludes.get()
+            .cmakeIncludes
+            .get()
             .forEach(
                 incl -> {
                   if (!this.targetConfig.cmakeIncludes.get().contains(incl)) {
@@ -772,12 +772,10 @@ protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
     FileUtil.copyFilesOrDirectories(
         targetConfig.cmakeIncludes.get(), destination, fileConfig, messageReporter, true);
 
-    // FIXME: Unclear what the following does, but it does not appear to belong here.
-    if (!StringExtensions.isNullOrEmpty(targetConfig.fedSetupPreamble)) {
+    if (!StringExtensions.isNullOrEmpty(targetConfig.fedSetupPreamble.get())) {
       try {
-        FileUtil.copyFile(
-            fileConfig.srcFile.getParent().resolve(targetConfig.fedSetupPreamble),
-            destination.resolve(targetConfig.fedSetupPreamble));
+        var file = targetConfig.fedSetupPreamble.get();
+        FileUtil.copyFile(fileConfig.srcFile.getParent().resolve(file), destination.resolve(file));
       } catch (IOException e) {
         messageReporter
             .nowhere()
@@ -1959,8 +1957,10 @@ protected DockerGenerator getDockerGenerator(LFGeneratorContext context) {
   // Perform set up that does not generate code
   protected void setUpGeneralParameters() {
     accommodatePhysicalActionsIfPresent();
-    targetConfig.compileDefinitions.get().put(
-        "LOG_LEVEL", String.valueOf(targetConfig.logLevel.get().ordinal()));
+    targetConfig
+        .compileDefinitions
+        .get()
+        .put("LOG_LEVEL", String.valueOf(targetConfig.logLevel.get().ordinal()));
     targetConfig.compileAdditionalSources.addAll(CCoreFilesUtils.getCTargetSrc());
     // Create the main reactor instance if there is a main reactor.
     this.main =
@@ -1969,7 +1969,7 @@ protected void setUpGeneralParameters() {
       // So that each separate compile knows about modal reactors, do this:
       targetConfig.compileDefinitions.get().put("MODAL_REACTORS", "TRUE");
     }
-    if (targetConfig.threading
+    if (targetConfig.threading.get()
         && targetConfig.platformOptions.get().platform == Platform.ARDUINO
         && (targetConfig.platformOptions.get().board == null
             || !targetConfig.platformOptions.get().board.contains("mbed"))) {
@@ -1979,7 +1979,7 @@ protected void setUpGeneralParameters() {
           .info(
               "Threading is incompatible on your current Arduino flavor. Setting threading to"
                   + " false.");
-      targetConfig.threading = false;
+      targetConfig.threading.override(false);
     }
 
     if (targetConfig.platformOptions.get().platform == Platform.ARDUINO
@@ -1996,11 +1996,14 @@ protected void setUpGeneralParameters() {
     }
 
     if (targetConfig.platformOptions.get().platform == Platform.ZEPHYR
-        && targetConfig.threading
+        && targetConfig.threading.get()
         && targetConfig.platformOptions.get().userThreads >= 0) {
-      targetConfig.compileDefinitions.get().put(
-          PlatformOption.USER_THREADS.name(),
-          String.valueOf(targetConfig.platformOptions.get().userThreads));
+      targetConfig
+          .compileDefinitions
+          .get()
+          .put(
+              PlatformOption.USER_THREADS.name(),
+              String.valueOf(targetConfig.platformOptions.get().userThreads));
     } else if (targetConfig.platformOptions.get().userThreads > 0) {
       messageReporter
           .nowhere()
@@ -2009,12 +2012,17 @@ protected void setUpGeneralParameters() {
                   + " This option will be ignored.");
     }
 
-    if (targetConfig.threading) { // FIXME: This logic is duplicated in CMake
+    if (targetConfig.threading.get()) { // FIXME: This logic is duplicated in CMake
       pickScheduler();
       // FIXME: this and pickScheduler should be combined.
-      targetConfig.compileDefinitions.get().put("SCHEDULER", targetConfig.schedulerType.get().name());
-      targetConfig.compileDefinitions.get().put(
-          "NUMBER_OF_WORKERS", String.valueOf(targetConfig.workers));
+      targetConfig
+          .compileDefinitions
+          .get()
+          .put("SCHEDULER", targetConfig.schedulerType.get().name());
+      targetConfig
+          .compileDefinitions
+          .get()
+          .put("NUMBER_OF_WORKERS", String.valueOf(targetConfig.workers));
     }
     pickCompilePlatform();
   }
diff --git a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
index fd087e081a..fbba2f01a0 100644
--- a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
@@ -37,7 +37,7 @@ public static String generateIncludeStatements(TargetConfig targetConfig, boolea
         .forEach(it -> code.pr("#include " + StringUtil.addDoubleQuotes(it)));
     code.pr("#include \"include/core/reactor.h\"");
     code.pr("#include \"include/core/reactor_common.h\"");
-    if (targetConfig.threading) {
+    if (targetConfig.threading.get()) {
       code.pr("#include \"include/core/threaded/scheduler.h\"");
     }
 
@@ -78,12 +78,12 @@ public static String generateDefineDirectives(
     //         targetConfig.clockSyncOptions
     //     ));
     // }
-    if (targetConfig.threading) {
+    if (targetConfig.threading.get()) {
       targetConfig.compileDefinitions.get().put("LF_THREADED", "1");
     } else {
       targetConfig.compileDefinitions.get().put("LF_UNTHREADED", "1");
     }
-    if (targetConfig.threading) {
+    if (targetConfig.threading.get()) {
       targetConfig.compileDefinitions.get().put("LF_THREADED", "1");
     } else {
       targetConfig.compileDefinitions.get().put("LF_UNTHREADED", "1");
diff --git a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 7bdb13706f..b7485eb5bd 100644
--- a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -100,7 +100,7 @@ public static String generateInitializeTriggerObjects(
   /** Generate code to initialize the scheduler for the threaded C runtime. */
   public static String generateSchedulerInitializerMain(
       ReactorInstance main, TargetConfig targetConfig) {
-    if (!targetConfig.threading) {
+    if (!targetConfig.threading.get()) {
       return "";
     }
     var code = new CodeBuilder();
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index e9998d268c..92d0f8a840 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -39,7 +39,6 @@
 import org.lflang.AttributeUtils;
 import org.lflang.FileConfig;
 import org.lflang.Target;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.CodeMap;
@@ -366,8 +365,8 @@ public boolean isOSCompatible() {
   public void doGenerate(Resource resource, LFGeneratorContext context) {
     // Set the threading to false by default, unless the user has
     // specifically asked for it.
-    if (!targetConfig.setByUser.contains(TargetProperty.THREADING)) {
-      targetConfig.threading = false;
+    if (!targetConfig.threading.isSet()) {
+      targetConfig.threading.override(false);
     }
     int cGeneratedPercentProgress = (IntegratedBuilder.VALIDATED_PERCENT_PROGRESS + 100) / 2;
     code.pr(
diff --git a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
index 02976257fd..50bf482024 100644
--- a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
+++ b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
@@ -43,8 +43,6 @@
 import org.lflang.lf.LfFactory;
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.util.StringUtil;
-import org.lflang.validation.LFValidator;
-import org.lflang.validation.ValidationReporter;
 
 /**
  * Info about a cargo dependency. See {@link TargetProperty#CARGO_DEPENDENCIES}.
@@ -279,7 +277,7 @@ public boolean validate(Element e) {
     }
 
     @Override
-    public boolean check(Element element, String name, ValidationReporter v) {
+    public boolean check(Element element, String name, MessageReporter v) {
       var valid = true;
       for (KeyValuePair pair : element.getKeyvalue().getPairs()) {
         try {
@@ -287,8 +285,7 @@ public boolean check(Element element, String name, ValidationReporter v) {
         } catch (InvalidLfSourceException e) {
           EObject object = e.getNode();
           String message = e.getProblem();
-          // FIXME: use ValidatorMessageReporter
-          // v.at(object).error(message);
+          v.at(object).error(message);
           valid = false;
         }
       }
diff --git a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
index 7d13203c86..bc287260fd 100644
--- a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
+++ b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
@@ -49,7 +49,6 @@ public final class RustTargetConfig {
   /** Cargo profile, default is debug (corresponds to cargo dev profile). */
   private BuildType profile = BuildType.DEBUG;
 
-
   /** The build type to use. Corresponds to a Cargo profile. */
   public BuildType getBuildType(BuildTypeProperty cmakeBuildType) {
     // FIXME: this is because Rust uses a different default.
@@ -59,5 +58,4 @@ public BuildType getBuildType(BuildTypeProperty cmakeBuildType) {
     }
     return profile;
   }
-
 }
diff --git a/core/src/main/java/org/lflang/target/property/AuthProperty.java b/core/src/main/java/org/lflang/target/property/AuthProperty.java
index d20ad37c2c..03eeb124a6 100644
--- a/core/src/main/java/org/lflang/target/property/AuthProperty.java
+++ b/core/src/main/java/org/lflang/target/property/AuthProperty.java
@@ -2,14 +2,12 @@
 
 import java.util.Arrays;
 import java.util.List;
-
 import org.lflang.Target;
 
 public class AuthProperty extends DefaultBooleanProperty {
 
-    @Override
-    public List<Target> supportedTargets() {
-        return Arrays.asList(Target.C, Target.CCPP);
-    }
-
+  @Override
+  public List<Target> supportedTargets() {
+    return Arrays.asList(Target.C, Target.CCPP);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
index 2285d13a27..1005001ef6 100644
--- a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
@@ -12,29 +12,32 @@
 
 public class BuildCommandsProperty extends TargetPropertyConfig<List<String>> {
 
-
-    public BuildCommandsProperty() {
-        super(UnionType.STRING_OR_STRING_ARRAY);
-    }
-
-    @Override
-    public List<String> initialValue() {
-        return new ArrayList<>();
-    }
-
-    @Override
-    public List<String> fromAstElement(Element value) {
-        return ASTUtils.elementToListOfStrings(value);
-    }
-
-    @Override
-    public List<Target> supportedTargets() {
-        return Arrays.asList(Target.C, Target.CCPP);
-    }
-
-    @Override
-    public Element toAstElement() {
-        return ASTUtils.toElement(this.value.toString());
-    }
-
+  public BuildCommandsProperty() {
+    super(UnionType.STRING_OR_STRING_ARRAY);
+  }
+
+  @Override
+  public List<String> initialValue() {
+    return new ArrayList<>();
+  }
+
+  @Override
+  public List<String> fromAst(Element value, MessageReporter err) {
+    return ASTUtils.elementToListOfStrings(value);
+  }
+
+  @Override
+  protected List<String> fromString(String value, MessageReporter err) {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public List<Target> supportedTargets() {
+    return Arrays.asList(Target.C, Target.CCPP);
+  }
+
+  @Override
+  public Element toAstElement() {
+    return ASTUtils.toElement(this.value.toString());
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/BuildConfig.java b/core/src/main/java/org/lflang/target/property/BuildConfig.java
index e9af8402c9..5d1ea7c8e3 100644
--- a/core/src/main/java/org/lflang/target/property/BuildConfig.java
+++ b/core/src/main/java/org/lflang/target/property/BuildConfig.java
@@ -2,31 +2,31 @@
 
 public class BuildConfig {
 
-    /**
-     * Enumeration of Cmake build types. These are also mapped to Cargo profiles for the Rust target
-     * (see {@link org.lflang.generator.rust.RustTargetConfig})
-     *
-     * @author Christian Menard
-     */
-    public enum BuildType {
-        RELEASE("Release"),
-        DEBUG("Debug"),
-        TEST("Test"),
-        REL_WITH_DEB_INFO("RelWithDebInfo"),
-        MIN_SIZE_REL("MinSizeRel");
+  /**
+   * Enumeration of Cmake build types. These are also mapped to Cargo profiles for the Rust target
+   * (see {@link org.lflang.generator.rust.RustTargetConfig})
+   *
+   * @author Christian Menard
+   */
+  public enum BuildType {
+    RELEASE("Release"),
+    DEBUG("Debug"),
+    TEST("Test"),
+    REL_WITH_DEB_INFO("RelWithDebInfo"),
+    MIN_SIZE_REL("MinSizeRel");
 
-        /** Alias used in toString method. */
-        private final String alias;
+    /** Alias used in toString method. */
+    private final String alias;
 
-        /** Private constructor for Cmake build types. */
-        BuildType(String alias) {
-            this.alias = alias;
-        }
+    /** Private constructor for Cmake build types. */
+    BuildType(String alias) {
+      this.alias = alias;
+    }
 
-        /** Return the alias. */
-        @Override
-        public String toString() {
-            return this.alias;
-        }
+    /** Return the alias. */
+    @Override
+    public String toString() {
+      return this.alias;
     }
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
index 1ce941c42b..d4d3e2cee6 100644
--- a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
@@ -2,10 +2,8 @@
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Properties;
-
+import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetProperty;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
@@ -14,37 +12,32 @@
 
 public class BuildTypeProperty extends TargetPropertyConfig<BuildType> {
 
-    public BuildTypeProperty() {
-        super(UnionType.BUILD_TYPE_UNION);
-    }
-
-    @Override
-    public Element toAstElement() {
-        return ASTUtils.toElement(this.value.toString());
-    }
-
-    @Override
-    public BuildType initialValue() {
-        return BuildType.RELEASE;
-    }
-
-    @Override
-    public BuildType fromAstElement(Element value) {
-        return (BuildType) UnionType.BUILD_TYPE_UNION.forName(ASTUtils.elementToSingleString(value));
-    }
-
-    @Override
-    public List<Target> supportedTargets() {
-        return Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Rust);
-    }
-
-    @Override
-    public void update(Properties cliArgs) {
-        super.update(cliArgs);
-        var key = TargetProperty.BUILD_TYPE.toString();
-        if (cliArgs.containsKey(key)) {
-            this.value =
-                (BuildType) UnionType.BUILD_TYPE_UNION.forName(cliArgs.getProperty(key));
-        }
-    }
+  public BuildTypeProperty() {
+    super(UnionType.BUILD_TYPE_UNION);
+  }
+
+  @Override
+  public Element toAstElement() {
+    return ASTUtils.toElement(this.value.toString());
+  }
+
+  @Override
+  public BuildType initialValue() {
+    return BuildType.RELEASE;
+  }
+
+  @Override
+  public BuildType fromAst(Element value, MessageReporter err) {
+    return fromString(ASTUtils.elementToSingleString(value), err);
+  }
+
+  @Override
+  protected BuildType fromString(String value, MessageReporter err) {
+    return (BuildType) UnionType.BUILD_TYPE_UNION.forName(value);
+  }
+
+  @Override
+  public List<Target> supportedTargets() {
+    return Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Rust);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
index 9672567c7f..431bac4935 100644
--- a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
@@ -4,7 +4,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.generator.rust.CargoDependencySpec;
@@ -14,44 +14,49 @@
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
 
-public class CargoDependenciesProperty extends TargetPropertyConfig<Map<String, CargoDependencySpec>> {
-
-    public CargoDependenciesProperty() {
-        super(CargoDependenciesPropertyType.INSTANCE);
-    }
-
-    @Override
-    public Map<String, CargoDependencySpec> initialValue() {
-        return new HashMap<>();
-    }
-
-    @Override
-    protected Map<String, CargoDependencySpec> fromAstElement(Element value) {
-        return CargoDependencySpec.parseAll(value);
+public class CargoDependenciesProperty
+    extends TargetPropertyConfig<Map<String, CargoDependencySpec>> {
+
+  public CargoDependenciesProperty() {
+    super(CargoDependenciesPropertyType.INSTANCE);
+  }
+
+  @Override
+  public Map<String, CargoDependencySpec> initialValue() {
+    return new HashMap<>();
+  }
+
+  @Override
+  protected Map<String, CargoDependencySpec> fromAst(Element value, MessageReporter err) {
+    return CargoDependencySpec.parseAll(value);
+  }
+
+  @Override
+  protected Map<String, CargoDependencySpec> fromString(String value, MessageReporter err) {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public List<Target> supportedTargets() {
+    return Arrays.asList(Target.Rust);
+  }
+
+  @Override
+  public Element toAstElement() {
+    var deps = this.value;
+    if (deps.size() == 0) {
+      return null;
+    } else {
+      Element e = LfFactory.eINSTANCE.createElement();
+      KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+      for (var ent : deps.entrySet()) {
+        KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+        pair.setName(ent.getKey());
+        pair.setValue(CargoDependencySpec.extractSpec(ent.getValue()));
+        kvp.getPairs().add(pair);
+      }
+      e.setKeyvalue(kvp);
+      return e;
     }
-
-    @Override
-    public List<Target> supportedTargets() {
-        return Arrays.asList(Target.Rust);
-    }
-
-    @Override
-    public Element toAstElement() {
-        var deps = this.value;
-        if (deps.size() == 0) {
-            return null;
-        } else {
-            Element e = LfFactory.eINSTANCE.createElement();
-            KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-            for (var ent : deps.entrySet()) {
-                KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                pair.setName(ent.getKey());
-                pair.setValue(CargoDependencySpec.extractSpec(ent.getValue()));
-                kvp.getPairs().add(pair);
-            }
-            e.setKeyvalue(kvp);
-            return e;
-        }
-    }
-
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java b/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
index e870154681..92d8d498be 100644
--- a/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
@@ -2,14 +2,12 @@
 
 import java.util.Arrays;
 import java.util.List;
-
 import org.lflang.Target;
 
 public class CargoFeaturesProperty extends DefaultStringListProperty {
 
-    @Override
-    public List<Target> supportedTargets() {
-        return Arrays.asList(Target.Rust);
-    }
-
+  @Override
+  public List<Target> supportedTargets() {
+    return Arrays.asList(Target.Rust);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
index d9d8d14810..2e286f4bec 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
@@ -1,10 +1,8 @@
 package org.lflang.target.property;
 
-
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetPropertyConfig;
@@ -16,79 +14,78 @@
 import org.lflang.lf.Reactor;
 import org.lflang.target.property.ClockSyncModeProperty.ClockSyncMode;
 import org.lflang.target.property.type.UnionType;
-import org.lflang.validation.ValidationReporter;
 
 public class ClockSyncModeProperty extends TargetPropertyConfig<ClockSyncMode> {
 
+  public ClockSyncModeProperty() {
+    super(UnionType.CLOCK_SYNC_UNION);
+  }
 
-    public ClockSyncModeProperty() {
-        super(UnionType.CLOCK_SYNC_UNION);
-    }
+  @Override
+  public ClockSyncMode initialValue() {
+    return ClockSyncMode.INIT;
+  }
 
-    @Override
-    public ClockSyncMode initialValue() {
-        return ClockSyncMode.INIT;
-    }
+  @Override
+  public ClockSyncMode fromAst(Element value, MessageReporter err) {
+    UnionType.CLOCK_SYNC_UNION.validate(value);
+    var mode = fromString(ASTUtils.elementToSingleString(value), err);
+    return Objects.requireNonNullElse(mode, ClockSyncMode.INIT);
+  }
 
-    @Override
-    public ClockSyncMode fromAstElement(Element value) {
+  @Override
+  protected ClockSyncMode fromString(String value, MessageReporter err) {
+    return (ClockSyncMode) UnionType.CLOCK_SYNC_UNION.forName(value);
+  }
 
-        UnionType.CLOCK_SYNC_UNION.validate(value);
-        var mode = (ClockSyncMode)
-            UnionType.CLOCK_SYNC_UNION.forName(ASTUtils.elementToSingleString(value));
-        return Objects.requireNonNullElse(mode, ClockSyncMode.INIT);
-    }
+  @Override
+  public List<Target> supportedTargets() {
+    return List.of(Target.C, Target.CCPP, Target.Python);
+  }
 
-    @Override
-    public List<Target> supportedTargets() {
-        return Arrays.asList(Target.C, Target.CCPP, Target.Python);
-    }
-
-    @Override
-    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
-        super.validate(pair, ast, config, reporter);
-        if (pair != null) {
-            boolean federatedExists = false;
-            for (Reactor reactor : ast.getReactors()) {
-                if (reactor.isFederated()) {
-                    federatedExists = true;
-                }
-            }
-            if (!federatedExists) {
-                reporter.warning(
-                    "The clock-sync target property is incompatible with non-federated programs.",
-                    pair,
-                    Literals.KEY_VALUE_PAIR__NAME);
-            }
+  @Override
+  public void validate(
+      KeyValuePair pair, Model ast, TargetConfig config, MessageReporter reporter) {
+    super.validate(pair, ast, config, reporter);
+    if (pair != null) {
+      boolean federatedExists = false;
+      for (Reactor reactor : ast.getReactors()) {
+        if (reactor.isFederated()) {
+          federatedExists = true;
         }
+      }
+      if (!federatedExists) {
+        reporter
+            .at(pair, Literals.KEY_VALUE_PAIR__NAME)
+            .warning("The clock-sync target property is incompatible with non-federated programs.");
+      }
     }
+  }
 
-    @Override
-    public Element toAstElement() {
-        return ASTUtils.toElement(this.value.toString());
-    }
-
-
+  @Override
+  public Element toAstElement() {
+    return ASTUtils.toElement(this.value.toString());
+  }
 
-    /**
-     * Enumeration of clock synchronization modes.
-     *
-     * <ul>
-     *   <li>OFF: The clock synchronization is universally off.
-     *   <li>STARTUP: Clock synchronization occurs at startup only.
-     *   <li>ON: Clock synchronization occurs at startup and at runtime.
-     * </ul>
-     *
-     * @author Edward A. Lee
-     */
-    public enum ClockSyncMode {
-        OFF,
-        INIT,
-        ON;
-        /** Return the name in lower case. */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
+  /**
+   * Enumeration of clock synchronization modes.
+   *
+   * <ul>
+   *   <li>OFF: The clock synchronization is universally off.
+   *   <li>STARTUP: Clock synchronization occurs at startup only.
+   *   <li>ON: Clock synchronization occurs at startup and at runtime.
+   * </ul>
+   *
+   * @author Edward A. Lee
+   */
+  public enum ClockSyncMode {
+    OFF,
+    INIT,
+    ON;
+    /** Return the name in lower case. */
+    @Override
+    public String toString() {
+      return this.name().toLowerCase();
     }
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
index 1d658a67e6..4f13bf5878 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
@@ -2,7 +2,7 @@
 
 import java.util.Arrays;
 import java.util.List;
-
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetProperty.DictionaryElement;
 import org.lflang.TargetPropertyConfig;
@@ -20,143 +20,143 @@
 
 public class ClockSyncOptionsProperty extends TargetPropertyConfig<ClockSyncOptions> {
 
-    public ClockSyncOptionsProperty() {
-        super(DictionaryType.CLOCK_SYNC_OPTION_DICT);
-    }
-
-    @Override
-    public ClockSyncOptions initialValue() {
-        return new ClockSyncOptions();
+  public ClockSyncOptionsProperty() {
+    super(DictionaryType.CLOCK_SYNC_OPTION_DICT);
+  }
+
+  @Override
+  public ClockSyncOptions initialValue() {
+    return new ClockSyncOptions();
+  }
+
+  @Override
+  public ClockSyncOptions fromAst(Element value, MessageReporter err) {
+    var options = new ClockSyncOptions();
+    for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+      ClockSyncOption option =
+          (ClockSyncOption) DictionaryType.CLOCK_SYNC_OPTION_DICT.forName(entry.getName());
+      switch (option) {
+        case ATTENUATION -> options.attenuation = ASTUtils.toInteger(entry.getValue());
+        case COLLECT_STATS -> options.collectStats = ASTUtils.toBoolean(entry.getValue());
+        case LOCAL_FEDERATES_ON -> options.localFederatesOn = ASTUtils.toBoolean(entry.getValue());
+        case PERIOD -> options.period = ASTUtils.toTimeValue(entry.getValue());
+        case TEST_OFFSET -> options.testOffset = ASTUtils.toTimeValue(entry.getValue());
+        case TRIALS -> options.trials = ASTUtils.toInteger(entry.getValue());
+        default -> {}
+      }
     }
-
-    @Override
-    public ClockSyncOptions fromAstElement(Element value) {
-        var options = new ClockSyncOptions();
-        for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-            ClockSyncOption option =
-                (ClockSyncOption) DictionaryType.CLOCK_SYNC_OPTION_DICT.forName(entry.getName());
-            switch (option) {
-            case ATTENUATION -> options.attenuation = ASTUtils.toInteger(entry.getValue());
-            case COLLECT_STATS -> options.collectStats = ASTUtils.toBoolean(entry.getValue());
-            case LOCAL_FEDERATES_ON ->
-                options.localFederatesOn = ASTUtils.toBoolean(entry.getValue());
-            case PERIOD -> options.period = ASTUtils.toTimeValue(entry.getValue());
-            case TEST_OFFSET -> options.testOffset = ASTUtils.toTimeValue(entry.getValue());
-            case TRIALS -> options.trials = ASTUtils.toInteger(entry.getValue());
-            default -> {
-            }
-            }
+    return options;
+  }
+
+  @Override
+  protected ClockSyncOptions fromString(String value, MessageReporter err) {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public List<Target> supportedTargets() {
+    return Arrays.asList(Target.C, Target.CCPP, Target.Python);
+  }
+
+  @Override
+  public Element toAstElement() {
+    Element e = LfFactory.eINSTANCE.createElement();
+    KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+    for (ClockSyncOption opt : ClockSyncOption.values()) {
+      KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+      pair.setName(opt.toString());
+      switch (opt) {
+        case ATTENUATION -> pair.setValue(ASTUtils.toElement(value.attenuation));
+        case COLLECT_STATS -> pair.setValue(ASTUtils.toElement(value.collectStats));
+        case LOCAL_FEDERATES_ON -> pair.setValue(ASTUtils.toElement(value.localFederatesOn));
+        case PERIOD -> {
+          if (value.period == null) {
+            continue; // don't set if null
+          }
+          pair.setValue(ASTUtils.toElement(value.period));
         }
-        return options;
-    }
-
-    @Override
-    public List<Target> supportedTargets() {
-        return Arrays.asList(Target.C, Target.CCPP, Target.Python);
-    }
-
-    @Override
-    public Element toAstElement() {
-        Element e = LfFactory.eINSTANCE.createElement();
-        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-        for (ClockSyncOption opt : ClockSyncOption.values()) {
-            KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-            pair.setName(opt.toString());
-            switch (opt) {
-            case ATTENUATION -> pair.setValue(ASTUtils.toElement(value.attenuation));
-            case COLLECT_STATS -> pair.setValue(ASTUtils.toElement(value.collectStats));
-            case LOCAL_FEDERATES_ON -> pair.setValue(ASTUtils.toElement(value.localFederatesOn));
-            case PERIOD -> {
-                if (value.period == null) {
-                    continue; // don't set if null
-                }
-                pair.setValue(ASTUtils.toElement(value.period));
-            }
-            case TEST_OFFSET -> {
-                if (value.testOffset == null) {
-                    continue; // don't set if null
-                }
-                pair.setValue(ASTUtils.toElement(value.testOffset));
-            }
-            case TRIALS -> pair.setValue(ASTUtils.toElement(value.trials));
-            }
-            kvp.getPairs().add(pair);
+        case TEST_OFFSET -> {
+          if (value.testOffset == null) {
+            continue; // don't set if null
+          }
+          pair.setValue(ASTUtils.toElement(value.testOffset));
         }
-        e.setKeyvalue(kvp);
-        // kvp will never be empty
-        return e;
-    }
-
-    /** Settings related to clock synchronization. */
-    public static class ClockSyncOptions {
-
-        /**
-         * Dampen the adjustments to the clock synchronization offset by this rate. The default is 10.
-         */
-        public int attenuation = 10;
-
-        /**
-         * Whether to collect statistics while performing clock synchronization. This setting is only
-         * considered when clock synchronization has been activated. The default is true.
-         */
-        public boolean collectStats = true;
-
-        /** Enable clock synchronization for federates on the same machine. Default is false. */
-        public boolean localFederatesOn = false;
-
-        /**
-         * Interval at which clock synchronization is initiated by the RTI (will be passed to it as an
-         * argument on the command-line). The default is 5 milliseconds.
-         */
-        public TimeValue period = new TimeValue(5, TimeUnit.MILLI);
-
-        /**
-         * Indicate the number of exchanges to be had per each clock synchronization round. See
-         * /lib/core/federated/clock-sync.h for more details. The default is 10.
-         */
-        public int trials = 10;
-
-        /**
-         * Used to create an artificial clock synchronization error for the purpose of testing. The
-         * default is null.
-         */
-        public TimeValue testOffset;
+        case TRIALS -> pair.setValue(ASTUtils.toElement(value.trials));
+      }
+      kvp.getPairs().add(pair);
     }
+    e.setKeyvalue(kvp);
+    // kvp will never be empty
+    return e;
+  }
 
+  /** Settings related to clock synchronization. */
+  public static class ClockSyncOptions {
 
+    /**
+     * Dampen the adjustments to the clock synchronization offset by this rate. The default is 10.
+     */
+    public int attenuation = 10;
 
     /**
-     * Clock synchronization options.
-     *
-     * @author Marten Lohstroh
+     * Whether to collect statistics while performing clock synchronization. This setting is only
+     * considered when clock synchronization has been activated. The default is true.
      */
-    public enum ClockSyncOption implements DictionaryElement {
-        ATTENUATION("attenuation", PrimitiveType.NON_NEGATIVE_INTEGER),
-        LOCAL_FEDERATES_ON("local-federates-on", PrimitiveType.BOOLEAN),
-        PERIOD("period", PrimitiveType.TIME_VALUE),
-        TEST_OFFSET("test-offset", PrimitiveType.TIME_VALUE),
-        TRIALS("trials", PrimitiveType.NON_NEGATIVE_INTEGER),
-        COLLECT_STATS("collect-stats", PrimitiveType.BOOLEAN);
+    public boolean collectStats = true;
 
-        public final PrimitiveType type;
+    /** Enable clock synchronization for federates on the same machine. Default is false. */
+    public boolean localFederatesOn = false;
 
-        private final String description;
+    /**
+     * Interval at which clock synchronization is initiated by the RTI (will be passed to it as an
+     * argument on the command-line). The default is 5 milliseconds.
+     */
+    public TimeValue period = new TimeValue(5, TimeUnit.MILLI);
 
-        ClockSyncOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
+    /**
+     * Indicate the number of exchanges to be had per each clock synchronization round. See
+     * /lib/core/federated/clock-sync.h for more details. The default is 10.
+     */
+    public int trials = 10;
 
-        /** Return the description of this dictionary element. */
-        @Override
-        public String toString() {
-            return this.description;
-        }
+    /**
+     * Used to create an artificial clock synchronization error for the purpose of testing. The
+     * default is null.
+     */
+    public TimeValue testOffset;
+  }
+
+  /**
+   * Clock synchronization options.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum ClockSyncOption implements DictionaryElement {
+    ATTENUATION("attenuation", PrimitiveType.NON_NEGATIVE_INTEGER),
+    LOCAL_FEDERATES_ON("local-federates-on", PrimitiveType.BOOLEAN),
+    PERIOD("period", PrimitiveType.TIME_VALUE),
+    TEST_OFFSET("test-offset", PrimitiveType.TIME_VALUE),
+    TRIALS("trials", PrimitiveType.NON_NEGATIVE_INTEGER),
+    COLLECT_STATS("collect-stats", PrimitiveType.BOOLEAN);
+
+    public final PrimitiveType type;
+
+    private final String description;
+
+    ClockSyncOption(String alias, PrimitiveType type) {
+      this.description = alias;
+      this.type = type;
+    }
 
-        /** Return the type associated with this dictionary element. */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
+    /** Return the description of this dictionary element. */
+    @Override
+    public String toString() {
+      return this.description;
     }
 
+    /** Return the type associated with this dictionary element. */
+    public TargetPropertyType getType() {
+      return this.type;
+    }
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
index 29ff2f8f6d..6ffcb81336 100644
--- a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetPropertyConfig;
@@ -13,47 +12,45 @@
 
 public class CmakeIncludeProperty extends TargetPropertyConfig<List<String>> {
 
-    public CmakeIncludeProperty() {
-        super(UnionType.FILE_OR_FILE_ARRAY);
-    }
-
-    @Override
-    public List<String> initialValue() {
-        return new ArrayList<>();
-    }
-
-
-    @Override
-    public void set(Element value, MessageReporter err) {
-        if (!this.isSet) {
-            super.set(value, err);
-        } else {
-            // NOTE: This merging of lists is potentially dangerous since
-            // the incoming list of cmake-includes can belong to a .lf file that is
-            // located in a different location, and keeping just filename
-            // strings like this without absolute paths is incorrect.
-            this.value.addAll(ASTUtils.elementToListOfStrings(value));
-        }
-
-    }
-
-    @Override
-    protected List<String> fromAst(Element value, MessageReporter err) {
-        return ASTUtils.elementToListOfStrings(value);
-    }
-
-    @Override
-    protected List<String> fromString(String value, MessageReporter err) {
-        return null; // FIXME: not sure about this one
-    }
-
-    @Override
-    public List<Target> supportedTargets() {
-        return Arrays.asList(Target.CPP, Target.C, Target.CCPP);
-    }
-
-    @Override
-    public Element toAstElement() {
-        return ASTUtils.toElement(this.value);
+  public CmakeIncludeProperty() {
+    super(UnionType.FILE_OR_FILE_ARRAY);
+  }
+
+  @Override
+  public List<String> initialValue() {
+    return new ArrayList<>();
+  }
+
+  @Override
+  public void set(Element value, MessageReporter err) {
+    if (!this.isSet) {
+      super.set(value, err);
+    } else {
+      // NOTE: This merging of lists is potentially dangerous since
+      // the incoming list of cmake-includes can belong to a .lf file that is
+      // located in a different location, and keeping just filename
+      // strings like this without absolute paths is incorrect.
+      this.value.addAll(ASTUtils.elementToListOfStrings(value));
     }
+  }
+
+  @Override
+  protected List<String> fromAst(Element value, MessageReporter err) {
+    return ASTUtils.elementToListOfStrings(value);
+  }
+
+  @Override
+  protected List<String> fromString(String value, MessageReporter err) {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public List<Target> supportedTargets() {
+    return Arrays.asList(Target.CPP, Target.C, Target.CCPP);
+  }
+
+  @Override
+  public Element toAstElement() {
+    return ASTUtils.toElement(this.value);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/CompileDefinitionsConfig.java b/core/src/main/java/org/lflang/target/property/CompileDefinitionsConfig.java
deleted file mode 100644
index d5927c1a0b..0000000000
--- a/core/src/main/java/org/lflang/target/property/CompileDefinitionsConfig.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.lflang.target.property.type;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.lflang.Target;
-import org.lflang.TargetPropertyConfig;
-import org.lflang.ast.ASTUtils;
-import org.lflang.lf.Element;
-
-public class CompileDefinitionsConfig extends TargetPropertyConfig<Map<String, String>> {
-
-    public CompileDefinitionsConfig() {
-        super(StringDictionaryType.COMPILE_DEFINITION);
-    }
-
-    @Override
-    public Map<String, String> initialValue() {
-        return new HashMap<>();
-    }
-
-    @Override
-    protected Map<String, String> fromAstElement(Element value) {
-        return ASTUtils.elementToStringMaps(value);
-    }
-
-    @Override
-    public List<Target> supportedTargets() {
-        return Arrays.asList(Target.C, Target.CCPP, Target.Python);
-    }
-
-    @Override
-    public Element toAstElement() {
-        return ASTUtils.toElement(this.value);
-    }
-}
diff --git a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
new file mode 100644
index 0000000000..8b77b37935
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
@@ -0,0 +1,44 @@
+package org.lflang.target.property;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.lflang.MessageReporter;
+import org.lflang.Target;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.target.property.type.StringDictionaryType;
+
+public class CompileDefinitionsProperty extends TargetPropertyConfig<Map<String, String>> {
+
+  public CompileDefinitionsProperty() {
+    super(StringDictionaryType.COMPILE_DEFINITION);
+  }
+
+  @Override
+  public Map<String, String> initialValue() {
+    return new HashMap<>();
+  }
+
+  @Override
+  protected Map<String, String> fromAst(Element value, MessageReporter err) {
+    return ASTUtils.elementToStringMaps(value);
+  }
+
+  @Override
+  protected Map<String, String> fromString(String value, MessageReporter err) {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public List<Target> supportedTargets() {
+    return Arrays.asList(Target.C, Target.CCPP, Target.Python);
+  }
+
+  @Override
+  public Element toAstElement() {
+    return ASTUtils.toElement(this.value);
+  }
+}
diff --git a/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
index da1df83b44..df7ec8c9d8 100644
--- a/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
@@ -2,14 +2,12 @@
 
 import java.util.Arrays;
 import java.util.List;
-
 import org.lflang.Target;
 
 public class CompilerFlagsProperty extends DefaultStringListProperty {
 
-    @Override
-    public List<Target> supportedTargets() {
-        return Arrays.asList(Target.C, Target.CCPP);
-    }
-
+  @Override
+  public List<Target> supportedTargets() {
+    return Arrays.asList(Target.C, Target.CCPP);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/CompilerProperty.java b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
new file mode 100644
index 0000000000..9c35d5d260
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
@@ -0,0 +1,12 @@
+package org.lflang.target.property;
+
+import java.util.List;
+import org.lflang.Target;
+
+public class CompilerProperty extends DefaultStringConfig {
+
+  @Override
+  public List<Target> supportedTargets() {
+    return Target.ALL;
+  }
+}
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationModeProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationModeProperty.java
index 96efe0de31..357ea9a818 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationModeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationModeProperty.java
@@ -2,7 +2,7 @@
 
 import java.util.Arrays;
 import java.util.List;
-
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetPropertyConfig;
@@ -12,51 +12,55 @@
 import org.lflang.lf.Model;
 import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
 import org.lflang.target.property.type.UnionType;
-import org.lflang.validation.ValidationReporter;
 
 public class CoordinationModeProperty extends TargetPropertyConfig<CoordinationMode> {
 
-    public CoordinationModeProperty() {
-        super(UnionType.COORDINATION_UNION);
-    }
+  public CoordinationModeProperty() {
+    super(UnionType.COORDINATION_UNION);
+  }
 
-    @Override
-    public CoordinationMode initialValue() {
-        return CoordinationMode.CENTRALIZED;
-    }
+  @Override
+  public CoordinationMode initialValue() {
+    return CoordinationMode.CENTRALIZED;
+  }
 
-    @Override
-    public CoordinationMode fromAstElement(Element value) {
-        return (CoordinationMode) UnionType.COORDINATION_UNION.forName(ASTUtils.elementToSingleString(value));
-    }
+  @Override
+  public CoordinationMode fromAst(Element value, MessageReporter err) {
+    return fromString(ASTUtils.elementToSingleString(value), err);
+  }
 
-    @Override
-    public List<Target> supportedTargets() {
-        return Arrays.asList(Target.C, Target.CCPP, Target.Python);
-    }
+  @Override
+  protected CoordinationMode fromString(String value, MessageReporter err) {
+    return (CoordinationMode) UnionType.COORDINATION_UNION.forName(value);
+  }
 
-    @Override
-    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {}
+  @Override
+  public List<Target> supportedTargets() {
+    return Arrays.asList(Target.C, Target.CCPP, Target.Python);
+  }
 
-    @Override
-    public Element toAstElement() {
-        return ASTUtils.toElement(this.value.toString());
-    }
+  @Override
+  public void validate(
+      KeyValuePair pair, Model ast, TargetConfig config, MessageReporter reporter) {}
 
-    /**
-     * Enumeration of coordination types.
-     *
-     * @author Marten Lohstroh
-     */
-    public enum CoordinationMode {
-        CENTRALIZED,
-        DECENTRALIZED;
-
-        /** Return the name in lower case. */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
-    }
+  @Override
+  public Element toAstElement() {
+    return ASTUtils.toElement(this.value.toString());
+  }
 
+  /**
+   * Enumeration of coordination types.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum CoordinationMode {
+    CENTRALIZED,
+    DECENTRALIZED;
+
+    /** Return the name in lower case. */
+    @Override
+    public String toString() {
+      return this.name().toLowerCase();
+    }
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
index 2844e4e0f2..23af1705ba 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
@@ -2,7 +2,8 @@
 
 import java.util.Arrays;
 import java.util.List;
-
+import java.util.Objects;
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetProperty.DictionaryElement;
 import org.lflang.TargetPropertyConfig;
@@ -12,7 +13,6 @@
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
-
 import org.lflang.target.property.CoordinationOptionsProperty.CoordinationOptions;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.PrimitiveType;
@@ -20,104 +20,100 @@
 
 public class CoordinationOptionsProperty extends TargetPropertyConfig<CoordinationOptions> {
 
-    public CoordinationOptionsProperty() {
-        super(DictionaryType.COORDINATION_OPTION_DICT);
-    }
-
-    @Override
-    public CoordinationOptions initialValue() {
-        return new CoordinationOptions();
+  public CoordinationOptionsProperty() {
+    super(DictionaryType.COORDINATION_OPTION_DICT);
+  }
+
+  @Override
+  public CoordinationOptions initialValue() {
+    return new CoordinationOptions();
+  }
+
+  @Override
+  public CoordinationOptions fromAst(Element value, MessageReporter err) {
+    var options = new CoordinationOptions();
+    for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+      CoordinationOption option =
+          (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT.forName(entry.getName());
+      if (Objects.requireNonNull(option) == CoordinationOption.ADVANCE_MESSAGE_INTERVAL) {
+        options.advanceMessageInterval = ASTUtils.toTimeValue(entry.getValue());
+      }
     }
-
-    @Override
-    public CoordinationOptions fromAstElement(Element value) {
-        var options = new CoordinationOptions();
-        for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-            CoordinationOption option =
-                (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT.forName(entry.getName());
-            switch (option) {
-            case ADVANCE_MESSAGE_INTERVAL:
-                options.advanceMessageInterval =
-                    ASTUtils.toTimeValue(entry.getValue());
-                break;
-            default:
-                break;
-            }
+    return options;
+  }
+
+  @Override
+  protected CoordinationOptions fromString(String value, MessageReporter err) {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public List<Target> supportedTargets() {
+    return Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS);
+  }
+
+  @Override
+  public Element toAstElement() {
+    Element e = LfFactory.eINSTANCE.createElement();
+    KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+    for (CoordinationOption opt : CoordinationOption.values()) {
+      KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+      pair.setName(opt.toString());
+      if (opt == CoordinationOption.ADVANCE_MESSAGE_INTERVAL) {
+        if (this.value.advanceMessageInterval == null) {
+          continue;
         }
-        return options;
+        pair.setValue(ASTUtils.toElement(value.advanceMessageInterval));
+      }
+      kvp.getPairs().add(pair);
     }
-
-    @Override
-    public List<Target> supportedTargets() {
-        return Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS);
+    e.setKeyvalue(kvp);
+    if (kvp.getPairs().isEmpty()) {
+      return null;
     }
+    return e;
+  }
 
-    @Override
-    public Element toAstElement() {
-        Element e = LfFactory.eINSTANCE.createElement();
-        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-        for (CoordinationOption opt : CoordinationOption.values()) {
-            KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-            pair.setName(opt.toString());
-            switch (opt) {
-            case ADVANCE_MESSAGE_INTERVAL:
-                if (this.value.advanceMessageInterval == null) {
-                    continue;
-                }
-                pair.setValue(
-                    ASTUtils.toElement(value.advanceMessageInterval));
-                break;
-            }
-            kvp.getPairs().add(pair);
-        }
-        e.setKeyvalue(kvp);
-        if (kvp.getPairs().isEmpty()) {
-            return null;
-        }
-        return e;
-    }
-
-    /** Settings related to coordination of federated execution. */
-    public static class CoordinationOptions {
-
-        /**
-         * For centralized coordination, if a federate has a physical action that can trigger an output,
-         * directly or indirectly, then it will send NET (next event tag) messages to the RTI
-         * periodically as its physical clock advances. This option sets the amount of time to wait
-         * between sending such messages. Increasing this value results in downstream federates that lag
-         * further behind physical time (if the "after" delays are insufficient). The default is null,
-         * which means it is up the implementation to choose an interval.
-         */
-        public TimeValue advanceMessageInterval = null;
-    }
+  /** Settings related to coordination of federated execution. */
+  public static class CoordinationOptions {
 
     /**
-     * Coordination options.
-     *
-     * @author Edward A. Lee
+     * For centralized coordination, if a federate has a physical action that can trigger an output,
+     * directly or indirectly, then it will send NET (next event tag) messages to the RTI
+     * periodically as its physical clock advances. This option sets the amount of time to wait
+     * between sending such messages. Increasing this value results in downstream federates that lag
+     * further behind physical time (if the "after" delays are insufficient). The default is null,
+     * which means it is up the implementation to choose an interval.
      */
-    public enum CoordinationOption implements DictionaryElement {
-        ADVANCE_MESSAGE_INTERVAL("advance-message-interval", PrimitiveType.TIME_VALUE);
+    public TimeValue advanceMessageInterval = null;
+  }
 
-        public final PrimitiveType type;
+  /**
+   * Coordination options.
+   *
+   * @author Edward A. Lee
+   */
+  public enum CoordinationOption implements DictionaryElement {
+    ADVANCE_MESSAGE_INTERVAL("advance-message-interval", PrimitiveType.TIME_VALUE);
 
-        private final String description;
+    public final PrimitiveType type;
 
-        private CoordinationOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
+    private final String description;
 
-        /** Return the description of this dictionary element. */
-        @Override
-        public String toString() {
-            return this.description;
-        }
+    CoordinationOption(String alias, PrimitiveType type) {
+      this.description = alias;
+      this.type = type;
+    }
 
-        /** Return the type associated with this dictionary element. */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
+    /** Return the description of this dictionary element. */
+    @Override
+    public String toString() {
+      return this.description;
     }
 
+    /** Return the type associated with this dictionary element. */
+    public TargetPropertyType getType() {
+      return this.type;
+    }
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/DefaultBooleanProperty.java b/core/src/main/java/org/lflang/target/property/DefaultBooleanProperty.java
index 4e141f624e..2a5b29eeb5 100644
--- a/core/src/main/java/org/lflang/target/property/DefaultBooleanProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DefaultBooleanProperty.java
@@ -1,36 +1,34 @@
 package org.lflang.target.property;
 
-
 import org.lflang.MessageReporter;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
 
-
 public abstract class DefaultBooleanProperty extends TargetPropertyConfig<Boolean> {
 
-    public DefaultBooleanProperty() {
-        super(PrimitiveType.BOOLEAN);
-    }
-
-    @Override
-    public Boolean initialValue() {
-        return false;
-    }
-
-    @Override
-    public Boolean fromAst(Element value, MessageReporter err) {
-        return ASTUtils.toBoolean(value);
-    }
-
-    @Override
-    protected Boolean fromString(String value, MessageReporter err) {
-        return Boolean.parseBoolean(value);
-    }
-
-    @Override
-    public Element toAstElement() {
-        return ASTUtils.toElement(value);
-    }
+  public DefaultBooleanProperty() {
+    super(PrimitiveType.BOOLEAN);
+  }
+
+  @Override
+  public Boolean initialValue() {
+    return false;
+  }
+
+  @Override
+  public Boolean fromAst(Element value, MessageReporter err) {
+    return ASTUtils.toBoolean(value);
+  }
+
+  @Override
+  protected Boolean fromString(String value, MessageReporter err) {
+    return Boolean.parseBoolean(value);
+  }
+
+  @Override
+  public Element toAstElement() {
+    return ASTUtils.toElement(value);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/DefaultFileListProperty.java b/core/src/main/java/org/lflang/target/property/DefaultFileListProperty.java
index a743c5b218..cf35d54ea7 100644
--- a/core/src/main/java/org/lflang/target/property/DefaultFileListProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DefaultFileListProperty.java
@@ -1,39 +1,45 @@
 package org.lflang.target.property;
 
-
 import java.util.ArrayList;
 import java.util.List;
-
+import org.lflang.MessageReporter;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.UnionType;
 
-
 public abstract class DefaultFileListProperty extends TargetPropertyConfig<List<String>> {
 
-    public DefaultFileListProperty() {
-        super(UnionType.FILE_OR_FILE_ARRAY);
-    }
-
-    @Override
-    public void override(List<String> value) { // FIXME: should this be override or update?
-        this.isSet = true;
-        this.value.addAll(value);
-    }
-
-    @Override
-    public List<String> initialValue() {
-        return new ArrayList<>();
-    }
-
-    @Override
-    public List<String> fromAstElement(Element value) {
-        return ASTUtils.elementToListOfStrings(value);
-    }
-
-    @Override
-    public Element toAstElement() {
-        return ASTUtils.toElement(value);
+  public DefaultFileListProperty() {
+    super(UnionType.FILE_OR_FILE_ARRAY);
+  }
+
+  @Override
+  public List<String> initialValue() {
+    return new ArrayList<>();
+  }
+
+  @Override
+  public void set(Element value, MessageReporter err) {
+    if (!this.isSet) {
+      super.set(value, err);
+    } else {
+      this.value.addAll(fromAst(value, err));
     }
+  }
+
+  @Override
+  public List<String> fromAst(Element value, MessageReporter err) {
+    return ASTUtils.elementToListOfStrings(value);
+  }
+
+  @Override
+  protected List<String> fromString(String value, MessageReporter err) {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public Element toAstElement() {
+    return ASTUtils.toElement(value);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/DefaultStringConfig.java b/core/src/main/java/org/lflang/target/property/DefaultStringConfig.java
index c81efba9d2..fde1825686 100644
--- a/core/src/main/java/org/lflang/target/property/DefaultStringConfig.java
+++ b/core/src/main/java/org/lflang/target/property/DefaultStringConfig.java
@@ -1,39 +1,34 @@
 package org.lflang.target.property;
 
-
-import java.util.List;
-
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
 
-
 public abstract class DefaultStringConfig extends TargetPropertyConfig<String> {
 
-    public DefaultStringConfig() {
-        super(PrimitiveType.STRING);
-    }
-
-    @Override
-    public String initialValue() {
-        return "";
-    }
-
-    @Override
-    public String fromAst(Element value, MessageReporter err) {
-        return ASTUtils.elementToSingleString(value);
-    }
-
-    @Override
-    protected String fromString(String value, MessageReporter err) {
-        return value;
-    }
-
-    @Override
-    public Element toAstElement() {
-        return ASTUtils.toElement(value);
-    }
+  public DefaultStringConfig() {
+    super(PrimitiveType.STRING);
+  }
+
+  @Override
+  public String initialValue() {
+    return "";
+  }
+
+  @Override
+  public String fromAst(Element value, MessageReporter err) {
+    return ASTUtils.elementToSingleString(value);
+  }
+
+  @Override
+  protected String fromString(String value, MessageReporter err) {
+    return value;
+  }
+
+  @Override
+  public Element toAstElement() {
+    return ASTUtils.toElement(value);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/DefaultStringListProperty.java b/core/src/main/java/org/lflang/target/property/DefaultStringListProperty.java
index fcbd5ced73..549496bb7e 100644
--- a/core/src/main/java/org/lflang/target/property/DefaultStringListProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DefaultStringListProperty.java
@@ -1,61 +1,55 @@
 package org.lflang.target.property;
 
-
 import java.util.ArrayList;
 import java.util.List;
-
 import org.lflang.MessageReporter;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.UnionType;
 
-/**
- * Note: {@code set} implements an "append" semantics.
- */
+/** Note: {@code set} implements an "append" semantics. */
 public abstract class DefaultStringListProperty extends TargetPropertyConfig<List<String>> {
 
-    public DefaultStringListProperty() {
-        super(UnionType.STRING_OR_STRING_ARRAY);
-    }
-
-    @Override
-    public List<String> initialValue() {
-        return new ArrayList<>();
+  public DefaultStringListProperty() {
+    super(UnionType.STRING_OR_STRING_ARRAY);
+  }
+
+  @Override
+  public List<String> initialValue() {
+    return new ArrayList<>();
+  }
+
+  @Override
+  public void set(Element value, MessageReporter err) {
+    if (!this.isSet) {
+      super.set(value, err);
+    } else {
+      this.value.addAll(this.fromAst(value, err));
     }
-
-    @Override
-    public void set(Element value, MessageReporter err) {
-        if (!this.isSet) {
-            super.set(value, err);
-        } else {
-            this.value.addAll(this.fromAst(value, err));
-        }
-    }
-
-    @Override
-    public void set(String string, MessageReporter err) {
-        if (!this.isSet) {
-            super.set(string, err);
-        } else {
-            this.value.addAll(this.fromString(string, err));
-        }
+  }
+
+  @Override
+  public void set(String string, MessageReporter err) {
+    if (!this.isSet) {
+      super.set(string, err);
+    } else {
+      this.value.addAll(this.fromString(string, err));
     }
-
-    @Override
-    public List<String> fromAst(Element value, MessageReporter err) {
-        return ASTUtils.elementToListOfStrings(value);
-    }
-
-    @Override
-    protected List<String> fromString(String value, MessageReporter err) {
-        return List.of(value.split(" "));
-    }
-
-
-    @Override
-    public Element toAstElement() {
-        return ASTUtils.toElement(value);
-    }
-
+  }
+
+  @Override
+  public List<String> fromAst(Element value, MessageReporter err) {
+    return ASTUtils.elementToListOfStrings(value);
+  }
+
+  @Override
+  protected List<String> fromString(String value, MessageReporter err) {
+    return List.of(value.split(" "));
+  }
+
+  @Override
+  public Element toAstElement() {
+    return ASTUtils.toElement(value);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/DockerProperty.java b/core/src/main/java/org/lflang/target/property/DockerProperty.java
index c3890c786b..83864ac96e 100644
--- a/core/src/main/java/org/lflang/target/property/DockerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DockerProperty.java
@@ -1,163 +1,144 @@
 package org.lflang.target.property;
 
-
 import java.util.Arrays;
 import java.util.List;
-import java.util.Properties;
-
+import java.util.Objects;
+import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetProperty;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.TargetProperty.DictionaryElement;
+import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
 import org.lflang.target.property.DockerProperty.DockerOptions;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.TargetPropertyType;
-import org.lflang.lf.Element;
-import org.lflang.lf.KeyValuePair;
 import org.lflang.target.property.type.UnionType;
 
-
 public class DockerProperty extends TargetPropertyConfig<DockerOptions> {
 
-    public DockerProperty() {
-        super(UnionType.DOCKER_UNION);
-    }
-
-    @Override
-    public DockerOptions initialValue() {
-        return new DockerOptions(false);
-    }
-
-    @Override
-    public void update(Properties cliArgs) {
-        var key = TargetProperty.DOCKER.toString();
-        if (cliArgs.containsKey(key)) {
-            var arg = cliArgs.getProperty(key);
-            if (Boolean.parseBoolean(arg)) {
-                this.value.enabled = true;
-            } else {
-                this.value.enabled = false;
-            }
+  public DockerProperty() {
+    super(UnionType.DOCKER_UNION);
+  }
+
+  @Override
+  public DockerOptions initialValue() {
+    return new DockerOptions(false);
+  }
+
+  @Override
+  public DockerOptions fromAst(Element value, MessageReporter err) {
+    var options = new DockerOptions(false);
+    if (value.getLiteral() != null) {
+      if (ASTUtils.toBoolean(value)) {
+        options.enabled = true;
+      }
+    } else {
+      for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+        DockerOption option = (DockerOption) DictionaryType.DOCKER_DICT.forName(entry.getName());
+        if (Objects.requireNonNull(option) == DockerOption.FROM) {
+          options.from = ASTUtils.elementToSingleString(entry.getValue());
         }
+      }
     }
-
-    @Override
-    public DockerOptions fromAstElement(Element value) {
-        var options = new DockerOptions(false);
-        if (value.getLiteral() != null) {
-            if (ASTUtils.toBoolean(value)) {
-                options.enabled = true;
-            }
-        } else {
-            for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                DockerOption option = (DockerOption) DictionaryType.DOCKER_DICT.forName(entry.getName());
-                switch (option) {
-                case FROM:
-                    options.from = ASTUtils.elementToSingleString(entry.getValue());
-                    break;
-                default:
-                    break;
-                }
-            }
+    return options;
+  }
+
+  @Override
+  protected DockerOptions fromString(String value, MessageReporter err) {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public List<Target> supportedTargets() {
+    return Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS);
+  }
+
+  @Override
+  public Element toAstElement() {
+    if (!this.value.enabled) {
+      return null;
+    } else if (this.value.equals(new DockerOptions(true))) {
+      // default configuration
+      return ASTUtils.toElement(true);
+    } else {
+      Element e = LfFactory.eINSTANCE.createElement();
+      KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+      for (DockerOption opt : DockerOption.values()) {
+        KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+        pair.setName(opt.toString());
+        if (opt == DockerOption.FROM) {
+          if (this.value.from == null) {
+            continue;
+          }
+          pair.setValue(ASTUtils.toElement(this.value.from));
         }
-        return options;
+        kvp.getPairs().add(pair);
+      }
+      e.setKeyvalue(kvp);
+      if (kvp.getPairs().isEmpty()) {
+        return null;
+      }
+      return e;
     }
+  }
 
-    @Override
-    public List<Target> supportedTargets() {
-        return Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS);
-    }
+  /** Settings related to Docker options. */
+  public static class DockerOptions {
 
-    @Override
-    public Element toAstElement() {
-        if (!this.value.enabled) {
-            return null;
-        } else if (this.value.equals(new DockerOptions(true))) {
-            // default configuration
-            return ASTUtils.toElement(true);
-        } else {
-            Element e = LfFactory.eINSTANCE.createElement();
-            KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-            for (DockerOption opt : DockerOption.values()) {
-                KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                pair.setName(opt.toString());
-                switch (opt) {
-                case FROM:
-                    if (this.value.from == null) {
-                        continue;
-                    }
-                    pair.setValue(ASTUtils.toElement(this.value.from));
-                    break;
-                }
-                kvp.getPairs().add(pair);
-            }
-            e.setKeyvalue(kvp);
-            if (kvp.getPairs().isEmpty()) {
-                return null;
-            }
-            return e;
-        }
-    }
-
-    /** Settings related to Docker options. */
-    public static class DockerOptions {
-
-        public boolean enabled;
-
-        public DockerOptions(boolean enabled) {
-            this.enabled = enabled;
-        }
+    public boolean enabled;
 
-        /**
-         * The base image and tag from which to build the Docker image. The default is "alpine:latest".
-         */
-        public String from = "alpine:latest";
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            DockerOptions that = (DockerOptions) o;
-            return from.equals(that.from);
-        }
+    public DockerOptions(boolean enabled) {
+      this.enabled = enabled;
     }
 
-
-
     /**
-     * Docker options.
-     *
-     * @author Edward A. Lee
+     * The base image and tag from which to build the Docker image. The default is "alpine:latest".
      */
-    public enum DockerOption implements DictionaryElement {
-        FROM("FROM", PrimitiveType.STRING);
+    public String from = "alpine:latest";
 
-        public final PrimitiveType type;
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      DockerOptions that = (DockerOptions) o;
+      return from.equals(that.from);
+    }
+  }
 
-        private final String description;
+  /**
+   * Docker options.
+   *
+   * @author Edward A. Lee
+   */
+  public enum DockerOption implements DictionaryElement {
+    FROM("FROM", PrimitiveType.STRING);
 
-        private DockerOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
+    public final PrimitiveType type;
 
-        /** Return the description of this dictionary element. */
-        @Override
-        public String toString() {
-            return this.description;
-        }
+    private final String description;
 
-        /** Return the type associated with this dictionary element. */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
+    DockerOption(String alias, PrimitiveType type) {
+      this.description = alias;
+      this.type = type;
+    }
+
+    /** Return the description of this dictionary element. */
+    @Override
+    public String toString() {
+      return this.description;
+    }
+
+    /** Return the type associated with this dictionary element. */
+    public TargetPropertyType getType() {
+      return this.type;
     }
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java b/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
index b71ba34311..8e38f8881f 100644
--- a/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
@@ -1,14 +1,12 @@
 package org.lflang.target.property;
 
 import java.util.List;
-
 import org.lflang.Target;
 
 public class ExportDependencyGraphProperty extends DefaultBooleanProperty {
 
-    @Override
-    public List<Target> supportedTargets() {
-        return List.of(Target.CPP, Target.Rust);
-    }
-
+  @Override
+  public List<Target> supportedTargets() {
+    return List.of(Target.CPP, Target.Rust);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java b/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
index 6abb07ccd3..d67fad9788 100644
--- a/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
@@ -1,14 +1,12 @@
 package org.lflang.target.property;
 
 import java.util.List;
-
 import org.lflang.Target;
 
 public class ExportToYamlProperty extends DefaultBooleanProperty {
 
-    @Override
-    public List<Target> supportedTargets() {
-        return List.of(Target.CPP);
-    }
-
+  @Override
+  public List<Target> supportedTargets() {
+    return List.of(Target.CPP);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
index a7e4c7a18c..92532597ba 100644
--- a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
@@ -1,13 +1,12 @@
 package org.lflang.target.property;
 
 import java.util.List;
-
 import org.lflang.Target;
 
 public class ExternalRuntimePathProperty extends DefaultStringConfig {
 
-    @Override
-    public List<Target> supportedTargets() {
-        return List.of(Target.CPP);
-    }
+  @Override
+  public List<Target> supportedTargets() {
+    return List.of(Target.CPP);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/FastProperty.java b/core/src/main/java/org/lflang/target/property/FastProperty.java
index f15493068b..0f343472b3 100644
--- a/core/src/main/java/org/lflang/target/property/FastProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FastProperty.java
@@ -1,7 +1,7 @@
 package org.lflang.target.property;
 
 import java.util.List;
-
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.lf.Action;
@@ -10,45 +10,41 @@
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
 import org.lflang.lf.Reactor;
-import org.lflang.target.property.DefaultBooleanProperty;
-
-import org.lflang.validation.ValidationReporter;
 
 public class FastProperty extends DefaultBooleanProperty {
 
-    @Override
-    public List<Target> supportedTargets() {
-        return Target.ALL;
-    }
+  @Override
+  public List<Target> supportedTargets() {
+    return Target.ALL;
+  }
 
-    @Override
-    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
-        if (pair != null) {
-            // Check for federated
-            for (Reactor reactor : ast.getReactors()) {
-                // Check to see if the program has a federated reactor
-                if (reactor.isFederated()) {
-                    reporter.error(
-                        "The fast target property is incompatible with federated programs.",
-                        pair,
-                        Literals.KEY_VALUE_PAIR__NAME);
-                    break;
-                }
-            }
+  @Override
+  public void validate(
+      KeyValuePair pair, Model ast, TargetConfig config, MessageReporter reporter) {
+    if (pair != null) {
+      // Check for federated
+      for (Reactor reactor : ast.getReactors()) {
+        // Check to see if the program has a federated reactor
+        if (reactor.isFederated()) {
+          reporter
+              .at(pair, Literals.KEY_VALUE_PAIR__NAME)
+              .error("The fast target property is incompatible with federated programs.");
+          break;
+        }
+      }
 
-            // Check for physical actions
-            for (Reactor reactor : ast.getReactors()) {
-                // Check to see if the program has a physical action in a reactor
-                for (Action action : reactor.getActions()) {
-                    if (action.getOrigin().equals(ActionOrigin.PHYSICAL)) {
-                        reporter.error(
-                            "The fast target property is incompatible with physical actions.",
-                            pair,
-                            Literals.KEY_VALUE_PAIR__NAME);
-                        break;
-                    }
-                }
-            }
+      // Check for physical actions
+      for (Reactor reactor : ast.getReactors()) {
+        // Check to see if the program has a physical action in a reactor
+        for (Action action : reactor.getActions()) {
+          if (action.getOrigin().equals(ActionOrigin.PHYSICAL)) {
+            reporter
+                .at(pair, Literals.KEY_VALUE_PAIR__NAME)
+                .error("The fast target property is incompatible with physical actions.");
+            break;
+          }
         }
+      }
     }
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/FedSetupProperty.java b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
new file mode 100644
index 0000000000..fb7290c680
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
@@ -0,0 +1,42 @@
+package org.lflang.target.property;
+
+import java.util.List;
+import org.lflang.MessageReporter;
+import org.lflang.Target;
+import org.lflang.TargetPropertyConfig;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.target.property.type.PrimitiveType;
+import org.lflang.util.StringUtil;
+
+public class FedSetupProperty extends TargetPropertyConfig<String> {
+
+  public FedSetupProperty() {
+    super(PrimitiveType.FILE);
+  }
+
+  @Override
+  public String initialValue() {
+    return null;
+  }
+
+  @Override
+  protected String fromAst(Element value, MessageReporter err) {
+    return StringUtil.removeQuotes(ASTUtils.elementToSingleString(value));
+  }
+
+  @Override
+  protected String fromString(String value, MessageReporter err) {
+    return value;
+  }
+
+  @Override
+  public List<Target> supportedTargets() {
+    return List.of(Target.C, Target.CCPP, Target.Python);
+  }
+
+  @Override
+  public Element toAstElement() {
+    return ASTUtils.toElement(value);
+  }
+}
diff --git a/core/src/main/java/org/lflang/target/property/FilesProperty.java b/core/src/main/java/org/lflang/target/property/FilesProperty.java
index 61750c8c37..8723a8441c 100644
--- a/core/src/main/java/org/lflang/target/property/FilesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FilesProperty.java
@@ -1,14 +1,12 @@
 package org.lflang.target.property;
 
 import java.util.List;
-
 import org.lflang.Target;
 
 public class FilesProperty extends DefaultFileListProperty {
 
-    @Override
-    public List<Target> supportedTargets() {
-        return List.of(Target.C, Target.CCPP, Target.Python);
-    }
-
+  @Override
+  public List<Target> supportedTargets() {
+    return List.of(Target.C, Target.CCPP, Target.Python);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
index 4c1db334a5..8490b74d2f 100644
--- a/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
+++ b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
@@ -1,44 +1,30 @@
 package org.lflang.target.property;
 
-import static org.lflang.TargetProperty.KEEPALIVE;
-
 import java.util.List;
-import java.util.Properties;
-
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
-import org.lflang.target.property.DefaultBooleanProperty;
-import org.lflang.validation.ValidationReporter;
 
 public class KeepaliveProperty extends DefaultBooleanProperty {
 
-    @Override
-    public void update(Properties cliArgs) {
-        super.update(cliArgs);
-        var key = KEEPALIVE.toString();
-        if (cliArgs.containsKey(key)) {
-            this.override(Boolean.parseBoolean(cliArgs.getProperty(KEEPALIVE.toString())));
-        }
-    }
-
-    @Override
-    public List<Target> supportedTargets() {
-        return Target.ALL;
+  @Override
+  public List<Target> supportedTargets() {
+    return Target.ALL;
+  }
+
+  @Override
+  public void validate(
+      KeyValuePair pair, Model ast, TargetConfig config, MessageReporter reporter) {
+    super.validate(pair, ast, config, reporter);
+    if (pair != null && config.target == Target.CPP) {
+      reporter
+          .at(pair, Literals.KEY_VALUE_PAIR__NAME)
+          .warning(
+              "The keepalive property is inferred automatically by the C++ "
+                  + "runtime and the value given here is ignored");
     }
-
-    @Override
-    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
-        super.validate(pair, ast, config, reporter);
-        if (pair != null && config.target == Target.CPP) {
-            reporter.warning(
-                "The keepalive property is inferred automatically by the C++ "
-                    + "runtime and the value given here is ignored",
-                pair,
-                Literals.KEY_VALUE_PAIR__NAME);
-        }
-    }
-
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/LoggingProperty.java b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
index 50d7420a30..7930adce4d 100644
--- a/core/src/main/java/org/lflang/target/property/LoggingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
@@ -1,7 +1,6 @@
 package org.lflang.target.property;
 
 import java.util.List;
-
 import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetPropertyConfig;
@@ -12,51 +11,50 @@
 
 public class LoggingProperty extends TargetPropertyConfig<LogLevel> {
 
-    public LoggingProperty() {
-        super(UnionType.LOGGING_UNION);
-    }
-
+  public LoggingProperty() {
+    super(UnionType.LOGGING_UNION);
+  }
+
+  @Override
+  public LogLevel initialValue() {
+    return LogLevel.INFO;
+  }
+
+  @Override
+  protected LogLevel fromAst(Element value, MessageReporter err) {
+    return fromString(ASTUtils.elementToSingleString(value), err);
+  }
+
+  protected LogLevel fromString(String string, MessageReporter err) {
+    return LogLevel.valueOf(string.toUpperCase());
+  }
+
+  @Override
+  public List<Target> supportedTargets() {
+    return Target.ALL;
+  }
+
+  @Override
+  public Element toAstElement() {
+    return ASTUtils.toElement(value.toString());
+  }
+
+  /**
+   * Log levels in descending order of severity.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum LogLevel {
+    ERROR,
+    WARN,
+    INFO,
+    LOG,
+    DEBUG;
+
+    /** Return the name in lower case. */
     @Override
-    public LogLevel initialValue() {
-        return LogLevel.INFO;
+    public String toString() {
+      return this.name().toLowerCase();
     }
-
-    @Override
-    protected LogLevel fromAst(Element value, MessageReporter err) {
-        return fromString(ASTUtils.elementToSingleString(value), err);
-    }
-
-    protected LogLevel fromString(String string, MessageReporter err) {
-        return LogLevel.valueOf(string.toUpperCase());
-    }
-
-    @Override
-    public List<Target> supportedTargets() {
-        return Target.ALL;
-    }
-
-    @Override
-    public Element toAstElement() {
-        return ASTUtils.toElement(value.toString());
-    }
-
-    /**
-     * Log levels in descending order of severity.
-     *
-     * @author Marten Lohstroh
-     */
-    public enum LogLevel {
-        ERROR,
-        WARN,
-        INFO,
-        LOG,
-        DEBUG;
-
-        /** Return the name in lower case. */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
-    }
-
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
index 1e7ac01ef2..555cbfaa3e 100644
--- a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
+++ b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
@@ -2,14 +2,12 @@
 
 import java.util.Arrays;
 import java.util.List;
-
 import org.lflang.Target;
 
 public class NoCompileProperty extends DefaultBooleanProperty {
 
-    @Override
-    public List<Target> supportedTargets() {
-        return Arrays.asList(Target.C, Target.CPP, Target.CCPP, Target.Python);
-    }
-
+  @Override
+  public List<Target> supportedTargets() {
+    return Arrays.asList(Target.C, Target.CPP, Target.CCPP, Target.Python);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java b/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
index d5132341d6..d183484195 100644
--- a/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
+++ b/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
@@ -1,14 +1,12 @@
 package org.lflang.target.property;
 
 import java.util.List;
-
 import org.lflang.Target;
 
 public class NoRuntimeValidationProperty extends DefaultBooleanProperty {
 
-    @Override
-    public List<Target> supportedTargets() {
-        return List.of(Target.CPP);
-    }
-
+  @Override
+  public List<Target> supportedTargets() {
+    return List.of(Target.CPP);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index aca5e46c2f..efd7887127 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -2,264 +2,265 @@
 
 import java.util.Arrays;
 import java.util.List;
-
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.DictionaryElement;
+import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.LfPackage.Literals;
+import org.lflang.lf.Model;
 import org.lflang.target.property.PlatformProperty.PlatformOptions;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.TargetPropertyType;
-import org.lflang.TargetPropertyConfig;
-import org.lflang.lf.Element;
-import org.lflang.lf.KeyValuePair;
-import org.lflang.lf.Model;
 import org.lflang.target.property.type.UnionType;
-import org.lflang.validation.ValidationReporter;
 
 public class PlatformProperty extends TargetPropertyConfig<PlatformOptions> {
 
-    public PlatformProperty() {
-        super(UnionType.PLATFORM_STRING_OR_DICTIONARY);
-    }
-
-    @Override
-    public PlatformOptions initialValue() {
-        return new PlatformOptions();
-    }
-
-    @Override
-    public PlatformOptions fromAstElement(Element value) { // FIXME: pass in err
-        var config = new PlatformOptions();
-        if (value.getLiteral() != null) {
-            config.platform =
-                (Platform) UnionType.PLATFORM_UNION.forName(ASTUtils.elementToSingleString(value));
-            if (config.platform == null) {
-                String s =
-                    "Unidentified Platform Type, LF supports the following platform types: "
-                        + Arrays.asList(Platform.values());
-                //err.at(value).error(s);
-                throw new AssertionError(s);
-            }
-        } else {
-            for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                PlatformOption option =
-                    (PlatformOption) DictionaryType.PLATFORM_DICT.forName(entry.getName());
-                switch (option) {
-                case NAME -> {
-                    Platform p =
-                        (Platform)
-                            UnionType.PLATFORM_UNION.forName(
-                                ASTUtils.elementToSingleString(entry.getValue()));
-                    if (p == null) {
-                        String s =
-                            "Unidentified Platform Type, LF supports the following platform types: "
-                                + Arrays.asList(Platform.values());
-                        //err.at(entry).error(s); // FIXME
-                        throw new AssertionError(s);
-                    }
-                    config.platform = p;
-                }
-                case BAUDRATE -> config.baudRate = ASTUtils.toInteger(entry.getValue());
-                case BOARD -> config.board = ASTUtils.elementToSingleString(entry.getValue());
-                case FLASH -> config.flash = ASTUtils.toBoolean(entry.getValue());
-                case PORT -> config.port = ASTUtils.elementToSingleString(entry.getValue());
-                case USER_THREADS -> config.userThreads = ASTUtils.toInteger(entry.getValue());
-                default -> {
-                }
-                }
-            }
-        }
-        // If the platform does not support threading, disable it.
-//        if (!config.platform.isMultiThreaded()) {
-//            config.threading = false; // FIXME: this should instead be dealt with in the validator
-//        }
-        return config;
-    }
-
-    @Override
-    public List<Target> supportedTargets() {
-        return Target.ALL;
-    }
-
-    @Override
-    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
-        super.validate(pair, ast, config, reporter);
-        var threading = TargetProperty.getKeyValuePair(ast, TargetProperty.THREADING);
-        if (threading != null) {
-            if (pair != null && ASTUtils.toBoolean(threading.getValue())) {
-                var lit = ASTUtils.elementToSingleString(pair.getValue());
-                var dic = pair.getValue().getKeyvalue();
-                if (lit != null && lit.equalsIgnoreCase(Platform.RP2040.toString())) {
-                    reporter.error(
-                        "Platform " + Platform.RP2040 + " does not support threading",
-                        pair,
-                        Literals.KEY_VALUE_PAIR__VALUE);
-                }
-                if (dic != null) {
-                    var rp =
-                        dic.getPairs().stream()
-                            .filter(
-                                kv ->
-                                    kv.getName().equalsIgnoreCase("name")
-                                        && ASTUtils.elementToSingleString(kv.getValue())
-                                        .equalsIgnoreCase(Platform.RP2040.toString()))
-                            .findFirst();
-                    rp.ifPresent(keyValuePair -> reporter.error(
-                        "Platform " + Platform.RP2040 + " does not support threading",
-                        keyValuePair,
-                        Literals.KEY_VALUE_PAIR__VALUE));
-                }
+  public PlatformProperty() {
+    super(UnionType.PLATFORM_STRING_OR_DICTIONARY);
+  }
+
+  @Override
+  public PlatformOptions initialValue() {
+    return new PlatformOptions();
+  }
+
+  @Override
+  public PlatformOptions fromAst(Element value, MessageReporter err) {
+    var config = new PlatformOptions();
+    if (value.getLiteral() != null) {
+      config.platform =
+          (Platform) UnionType.PLATFORM_UNION.forName(ASTUtils.elementToSingleString(value));
+      if (config.platform == null) {
+        String s =
+            "Unidentified Platform Type, LF supports the following platform types: "
+                + Arrays.asList(Platform.values());
+        // err.at(value).error(s);
+        throw new AssertionError(s);
+      }
+    } else {
+      for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+        PlatformOption option =
+            (PlatformOption) DictionaryType.PLATFORM_DICT.forName(entry.getName());
+        switch (option) {
+          case NAME -> {
+            Platform p =
+                (Platform)
+                    UnionType.PLATFORM_UNION.forName(
+                        ASTUtils.elementToSingleString(entry.getValue()));
+            if (p == null) {
+              String s =
+                  "Unidentified Platform Type, LF supports the following platform types: "
+                      + Arrays.asList(Platform.values());
+              err.at(entry).error(s);
+              throw new AssertionError(s);
             }
+            config.platform = p;
+          }
+          case BAUDRATE -> config.baudRate = ASTUtils.toInteger(entry.getValue());
+          case BOARD -> config.board = ASTUtils.elementToSingleString(entry.getValue());
+          case FLASH -> config.flash = ASTUtils.toBoolean(entry.getValue());
+          case PORT -> config.port = ASTUtils.elementToSingleString(entry.getValue());
+          case USER_THREADS -> config.userThreads = ASTUtils.toInteger(entry.getValue());
+          default -> {}
         }
+      }
     }
 
-    @Override
-    public Element toAstElement() {
-        Element e = LfFactory.eINSTANCE.createElement();
-        KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-        for (PlatformOption opt : PlatformOption.values()) {
-            KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-            pair.setName(opt.toString());
-            switch (opt) {
-            case NAME -> pair.setValue(ASTUtils.toElement(value.platform.toString()));
-            case BAUDRATE -> pair.setValue(ASTUtils.toElement(value.baudRate));
-            case BOARD -> pair.setValue(ASTUtils.toElement(value.board));
-            case FLASH -> pair.setValue(ASTUtils.toElement(value.flash));
-            case PORT -> pair.setValue(ASTUtils.toElement(value.port));
-            case USER_THREADS -> pair.setValue(ASTUtils.toElement(value.userThreads));
-            }
-            kvp.getPairs().add(pair);
+    return config;
+  }
+
+  @Override
+  protected PlatformOptions fromString(String value, MessageReporter err) {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public List<Target> supportedTargets() {
+    return Target.ALL;
+  }
+
+  @Override
+  public void validate(
+      KeyValuePair pair, Model ast, TargetConfig config, MessageReporter reporter) {
+    super.validate(pair, ast, config, reporter);
+
+    var threading = TargetProperty.getKeyValuePair(ast, TargetProperty.THREADING);
+    if (threading != null) {
+      if (pair != null && ASTUtils.toBoolean(threading.getValue())) {
+        var lit = ASTUtils.elementToSingleString(pair.getValue());
+        var dic = pair.getValue().getKeyvalue();
+        if (lit != null && lit.equalsIgnoreCase(Platform.RP2040.toString())) {
+          reporter
+              .at(pair, Literals.KEY_VALUE_PAIR__VALUE)
+              .error("Platform " + Platform.RP2040 + " does not support threading");
         }
-        e.setKeyvalue(kvp);
-        if (kvp.getPairs().isEmpty()) {
-            return null;
+        if (dic != null) {
+          var rp =
+              dic.getPairs().stream()
+                  .filter(
+                      kv ->
+                          kv.getName().equalsIgnoreCase("name")
+                              && ASTUtils.elementToSingleString(kv.getValue())
+                                  .equalsIgnoreCase(Platform.RP2040.toString()))
+                  .findFirst();
+          rp.ifPresent(
+              keyValuePair ->
+                  reporter
+                      .at(keyValuePair, Literals.KEY_VALUE_PAIR__VALUE)
+                      .error("Platform " + Platform.RP2040 + " does not support threading"));
         }
-        return e;
+      }
     }
-
-
-    /** Settings related to Platform Options. */
-    public static class PlatformOptions {
-
-        /**
-         * The base platform we build our LF Files on. Should be set to AUTO by default unless
-         * developing for specific OS/Embedded Platform
-         */
-        public Platform platform = Platform.AUTO;
-
-        /**
-         * The string value used to determine what type of embedded board we work with and can be used
-         * to simplify the build process. This string has the form "board_name[:option]*" (zero or more
-         * options separated by colons). For example, "pico:usb" specifies a Raspberry Pi Pico where
-         * stdin and stdout go through a USB serial port.
-         */
-        public String board = null;
-
-        /**
-         * The string value used to determine the port on which to flash the compiled program (i.e.
-         * /dev/cu.usbmodem21301)
-         */
-        public String port = null;
-
-        /**
-         * The baud rate used as a parameter to certain embedded platforms. 9600 is a standard rate
-         * amongst systems like Arduino, so it's the default value.
-         */
-        public int baudRate = 9600;
-
-        /**
-         * The boolean statement used to determine whether we should automatically attempt to flash once
-         * we compile. This may require the use of board and port values depending on the infrastructure
-         * you use to flash the boards.
-         */
-        public boolean flash = false;
-
-        /**
-         * The int value is used to determine the number of needed threads for the user application in
-         * Zephyr.
-         */
-        public int userThreads = 0;
+  }
+
+  @Override
+  public Element toAstElement() {
+    Element e = LfFactory.eINSTANCE.createElement();
+    KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+    for (PlatformOption opt : PlatformOption.values()) {
+      KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+      pair.setName(opt.toString());
+      switch (opt) {
+        case NAME -> pair.setValue(ASTUtils.toElement(value.platform.toString()));
+        case BAUDRATE -> pair.setValue(ASTUtils.toElement(value.baudRate));
+        case BOARD -> pair.setValue(ASTUtils.toElement(value.board));
+        case FLASH -> pair.setValue(ASTUtils.toElement(value.flash));
+        case PORT -> pair.setValue(ASTUtils.toElement(value.port));
+        case USER_THREADS -> pair.setValue(ASTUtils.toElement(value.userThreads));
+      }
+      kvp.getPairs().add(pair);
     }
+    e.setKeyvalue(kvp);
+    if (kvp.getPairs().isEmpty()) {
+      return null;
+    }
+    return e;
+  }
 
+  /** Settings related to Platform Options. */
+  public static class PlatformOptions { // FIXME: use a record for this
 
-    /** Enumeration of supported platforms */
-    public enum Platform {
-        AUTO,
-        ARDUINO,
-        NRF52("Nrf52", true),
-        RP2040("Rp2040", false),
-        LINUX("Linux", true),
-        MAC("Darwin", true),
-        ZEPHYR("Zephyr", true),
-        WINDOWS("Windows", true);
-
-        final String cMakeName;
-
-        private boolean multiThreaded = true;
-
-        Platform() {
-            this.cMakeName = this.toString();
-        }
+    /**
+     * The base platform we build our LF Files on. Should be set to AUTO by default unless
+     * developing for specific OS/Embedded Platform
+     */
+    public Platform platform = Platform.AUTO;
 
-        Platform(String cMakeName, boolean isMultiThreaded) {
-            this.cMakeName = cMakeName;
-            this.multiThreaded = isMultiThreaded;
-        }
+    /**
+     * The string value used to determine what type of embedded board we work with and can be used
+     * to simplify the build process. This string has the form "board_name[:option]*" (zero or more
+     * options separated by colons). For example, "pico:usb" specifies a Raspberry Pi Pico where
+     * stdin and stdout go through a USB serial port.
+     */
+    public String board = null;
 
-        /** Return the name in lower case. */
-        @Override
-        public String toString() {
-            return this.name().toLowerCase();
-        }
+    /**
+     * The string value used to determine the port on which to flash the compiled program (i.e.
+     * /dev/cu.usbmodem21301)
+     */
+    public String port = null;
 
-        /** Get the CMake name for the platform. */
-        public String getcMakeName() {
-            return this.cMakeName;
-        }
+    /**
+     * The baud rate used as a parameter to certain embedded platforms. 9600 is a standard rate
+     * amongst systems like Arduino, so it's the default value.
+     */
+    public int baudRate = 9600;
 
-        public boolean isMultiThreaded() {
-            return this.multiThreaded;
-        }
-    }
+    /**
+     * The boolean statement used to determine whether we should automatically attempt to flash once
+     * we compile. This may require the use of board and port values depending on the infrastructure
+     * you use to flash the boards.
+     */
+    public boolean flash = false;
 
     /**
-     * Platform options.
-     *
-     * @author Anirudh Rengarajan
+     * The int value is used to determine the number of needed threads for the user application in
+     * Zephyr.
      */
-    public enum PlatformOption implements DictionaryElement {
-        NAME("name", PrimitiveType.STRING),
-        BAUDRATE("baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER),
-        BOARD("board", PrimitiveType.STRING),
-        FLASH("flash", PrimitiveType.BOOLEAN),
-        PORT("port", PrimitiveType.STRING),
-        USER_THREADS("user-threads", PrimitiveType.NON_NEGATIVE_INTEGER);
+    public int userThreads = 0;
+  }
+
+  /** Enumeration of supported platforms */
+  public enum Platform {
+    AUTO,
+    ARDUINO,
+    NRF52("Nrf52", true),
+    RP2040("Rp2040", false),
+    LINUX("Linux", true),
+    MAC("Darwin", true),
+    ZEPHYR("Zephyr", true),
+    WINDOWS("Windows", true);
+
+    final String cMakeName;
+
+    private boolean multiThreaded =
+        true; // FIXME: this is never read. If we set it, we can simplify the validator method in
+    // the encapsulating class.
+
+    Platform() {
+      this.cMakeName = this.toString();
+    }
 
-        public final PrimitiveType type;
+    Platform(String cMakeName, boolean isMultiThreaded) {
+      this.cMakeName = cMakeName;
+      this.multiThreaded = isMultiThreaded;
+    }
 
-        private final String description;
+    /** Return the name in lower case. */
+    @Override
+    public String toString() {
+      return this.name().toLowerCase();
+    }
 
-        PlatformOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
+    /** Get the CMake name for the platform. */
+    public String getcMakeName() {
+      return this.cMakeName;
+    }
 
-        /** Return the description of this dictionary element. */
-        @Override
-        public String toString() {
-            return this.description;
-        }
+    public boolean isMultiThreaded() {
+      return this.multiThreaded;
+    }
+  }
+
+  /**
+   * Platform options.
+   *
+   * @author Anirudh Rengarajan
+   */
+  public enum PlatformOption implements DictionaryElement {
+    NAME("name", PrimitiveType.STRING),
+    BAUDRATE("baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER),
+    BOARD("board", PrimitiveType.STRING),
+    FLASH("flash", PrimitiveType.BOOLEAN),
+    PORT("port", PrimitiveType.STRING),
+    USER_THREADS("user-threads", PrimitiveType.NON_NEGATIVE_INTEGER);
+
+    public final PrimitiveType type;
+
+    private final String description;
+
+    PlatformOption(String alias, PrimitiveType type) {
+      this.description = alias;
+      this.type = type;
+    }
 
-        /** Return the type associated with this dictionary element. */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
+    /** Return the description of this dictionary element. */
+    @Override
+    public String toString() {
+      return this.description;
     }
 
+    /** Return the type associated with this dictionary element. */
+    public TargetPropertyType getType() {
+      return this.type;
+    }
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
index 019eb1eb22..7cd00e165a 100644
--- a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
@@ -1,14 +1,12 @@
 package org.lflang.target.property;
 
 import java.util.List;
-
 import org.lflang.Target;
 
 public class PrintStatisticsProperty extends DefaultBooleanProperty {
 
-    @Override
-    public List<Target> supportedTargets() {
-        return List.of(Target.CPP);
-    }
-
+  @Override
+  public List<Target> supportedTargets() {
+    return List.of(Target.CPP);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java b/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
index bf17e49383..00bcc10772 100644
--- a/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
@@ -1,14 +1,12 @@
 package org.lflang.target.property;
 
 import java.util.List;
-
 import org.lflang.Target;
 
 public class ProtobufsProperty extends DefaultFileListProperty {
 
-    @Override
-    public List<Target> supportedTargets() {
-        return List.of(Target.C, Target.CCPP, Target.TS, Target.Python);
-    }
-
+  @Override
+  public List<Target> supportedTargets() {
+    return List.of(Target.C, Target.CCPP, Target.TS, Target.Python);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
index 4da5a94feb..58deea240d 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
@@ -2,7 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
@@ -13,44 +13,47 @@
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
 import org.lflang.target.property.type.ArrayType;
-import org.lflang.validation.ValidationReporter;
 
 public class Ros2DependenciesProperty extends TargetPropertyConfig<List<String>> {
 
-    public Ros2DependenciesProperty() {
-        super(ArrayType.STRING_ARRAY);
-    }
-
-    @Override
-    public List<String> initialValue() {
-        return new ArrayList<>();
-    }
-
-    @Override
-    public List fromAstElement(Element value) {
-        return ASTUtils.elementToListOfStrings(value);
-    }
-
-    @Override
-    public List<Target> supportedTargets() {
-        return List.of(Target.CPP);
-    }
-
-    @Override
-    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
-        super.validate(pair, ast, config, reporter);
-        var ros2enabled = TargetProperty.getKeyValuePair(ast, TargetProperty.ROS2);
-        if (pair != null && (ros2enabled == null || !ASTUtils.toBoolean(ros2enabled.getValue()))) {
-            reporter.warning(
-                "Ignoring ros2-dependencies as ros2 compilation is disabled",
-                pair,
-                Literals.KEY_VALUE_PAIR__NAME);
-        }
-    }
-
-    @Override
-    public Element toAstElement() {
-        return ASTUtils.toElement(value);
+  public Ros2DependenciesProperty() {
+    super(ArrayType.STRING_ARRAY);
+  }
+
+  @Override
+  public List<String> initialValue() {
+    return new ArrayList<>();
+  }
+
+  @Override
+  public List<String> fromAst(Element value, MessageReporter err) {
+    return ASTUtils.elementToListOfStrings(value);
+  }
+
+  @Override
+  protected List<String> fromString(String value, MessageReporter err) {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public List<Target> supportedTargets() {
+    return List.of(Target.CPP);
+  }
+
+  @Override
+  public void validate(
+      KeyValuePair pair, Model ast, TargetConfig config, MessageReporter reporter) {
+    super.validate(pair, ast, config, reporter);
+    var ros2enabled = TargetProperty.getKeyValuePair(ast, TargetProperty.ROS2);
+    if (pair != null && (ros2enabled == null || !ASTUtils.toBoolean(ros2enabled.getValue()))) {
+      reporter
+          .at(pair, Literals.KEY_VALUE_PAIR__NAME)
+          .warning("Ignoring ros2-dependencies as ros2 compilation is disabled");
     }
+  }
 
+  @Override
+  public Element toAstElement() {
+    return ASTUtils.toElement(value);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/Ros2Property.java b/core/src/main/java/org/lflang/target/property/Ros2Property.java
index 39fc2e78e8..1a5bf9728d 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2Property.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2Property.java
@@ -1,14 +1,12 @@
 package org.lflang.target.property;
 
 import java.util.List;
-
 import org.lflang.Target;
 
 public class Ros2Property extends DefaultBooleanProperty {
 
-    @Override
-    public List<Target> supportedTargets() {
-        return List.of(Target.CPP);
-    }
-
+  @Override
+  public List<Target> supportedTargets() {
+    return List.of(Target.CPP);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
index 2be751f27c..27bbffb737 100644
--- a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
@@ -1,13 +1,12 @@
 package org.lflang.target.property;
 
 import java.util.List;
-
 import org.lflang.Target;
 
 public class RuntimeVersionProperty extends DefaultStringConfig {
 
-    @Override
-    public List<Target> supportedTargets() {
-        return List.of(Target.CPP);
-    }
+  @Override
+  public List<Target> supportedTargets() {
+    return List.of(Target.CPP);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
index 5bb31617bd..853ff81ac8 100644
--- a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
@@ -4,9 +4,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetPropertyConfig;
@@ -20,78 +18,90 @@
 
 public class RustIncludeProperty extends TargetPropertyConfig<List<Path>> {
 
-    public RustIncludeProperty() {
-        super(UnionType.FILE_OR_FILE_ARRAY);
-    }
+  public RustIncludeProperty() {
+    super(UnionType.FILE_OR_FILE_ARRAY);
+  }
 
-    @Override
-    public List<Target> supportedTargets() {
-        return List.of(Target.Rust);
-    }
+  @Override
+  public List<Target> supportedTargets() {
+    return List.of(Target.Rust);
+  }
 
-    @Override
-    public List<Path> initialValue() {
-        return new ArrayList<>();
-    }
+  @Override
+  public List<Path> initialValue() {
+    return new ArrayList<>();
+  }
 
-    @Override
-    public List<Path> fromAstElement(Element value) {
-        Path referencePath;
-        try {
-            referencePath = FileUtil.toPath(value.eResource().getURI()).toAbsolutePath();
-        } catch (IllegalArgumentException e) {
-            // FIXME: need err
-            //err.at(value).error("Invalid path? " + e.getMessage());
-            throw e;
-        }
+  @Override
+  public List<Path> fromAst(Element value, MessageReporter err) {
+    var list = new ArrayList<Path>();
+    Path referencePath;
+    try {
+      referencePath = FileUtil.toPath(value.eResource().getURI()).toAbsolutePath();
+    } catch (IllegalArgumentException e) {
+      err.at(value).error("Invalid path? " + e.getMessage());
+      throw e;
+    }
 
-        // we'll resolve relative paths to check that the files
-        // are as expected.
+    // we'll resolve relative paths to check that the files
+    // are as expected.
 
-        if (value.getLiteral() != null) {
-            Path resolved = referencePath.resolveSibling(StringUtil.removeQuotes(value.getLiteral()));
-            this.addAndCheckTopLevelModule(resolved, value, err);
-        } else if (value.getArray() != null) {
-            for (Element element : value.getArray().getElements()) {
-                String literal = StringUtil.removeQuotes(element.getLiteral());
-                Path resolved = referencePath.resolveSibling(literal);
-                this.addAndCheckTopLevelModule(resolved, element, err);
-            }
+    if (value.getLiteral() != null) {
+      Path resolved = referencePath.resolveSibling(StringUtil.removeQuotes(value.getLiteral()));
+      if (this.checkTopLevelModule(resolved, value, err)) {
+        list.add(resolved);
+      }
+    } else if (value.getArray() != null) {
+      for (Element element : value.getArray().getElements()) {
+        String literal = StringUtil.removeQuotes(element.getLiteral());
+        Path resolved = referencePath.resolveSibling(literal);
+        if (this.checkTopLevelModule(resolved, value, err)) {
+          list.add(resolved);
         }
+      }
     }
+    return list;
+  }
 
-    @Override
-    public Element toAstElement() {
-        // do not check paths here, and simply copy the absolute path over
-        List<Path> paths = this.value;
-        if (paths.isEmpty()) {
-            return null;
-        } else if (paths.size() == 1) {
-            return ASTUtils.toElement(paths.get(0).toString());
-        } else {
-            Element e = LfFactory.eINSTANCE.createElement();
-            Array arr = LfFactory.eINSTANCE.createArray();
-            for (Path p : paths) {
-                arr.getElements().add(ASTUtils.toElement(p.toString()));
-            }
-            e.setArray(arr);
-            return e;
-        }
+  @Override
+  protected List<Path> fromString(String value, MessageReporter err) {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public Element toAstElement() {
+    // do not check paths here, and simply copy the absolute path over
+    List<Path> paths = this.value;
+    if (paths.isEmpty()) {
+      return null;
+    } else if (paths.size() == 1) {
+      return ASTUtils.toElement(paths.get(0).toString());
+    } else {
+      Element e = LfFactory.eINSTANCE.createElement();
+      Array arr = LfFactory.eINSTANCE.createArray();
+      for (Path p : paths) {
+        arr.getElements().add(ASTUtils.toElement(p.toString()));
+      }
+      e.setArray(arr);
+      return e;
     }
+  }
 
-    private void addAndCheckTopLevelModule(Path path, EObject errorOwner, MessageReporter err) {
-        String fileName = path.getFileName().toString();
-        if (!Files.exists(path)) {
-            err.at(errorOwner).error("File not found");
-        } else if (Files.isRegularFile(path) && !fileName.endsWith(".rs")) {
-            err.at(errorOwner).error("Not a rust file");
-        } else if (fileName.equals("main.rs")) {
-            err.at(errorOwner).error("Cannot use 'main.rs' as a module name (reserved)");
-        } else if (fileName.equals("reactors") || fileName.equals("reactors.rs")) {
-            err.at(errorOwner).error("Cannot use 'reactors' as a module name (reserved)");
-        } else if (Files.isDirectory(path) && !Files.exists(path.resolve("mod.rs"))) {
-            err.at(errorOwner).error("Cannot find module descriptor in directory");
-        }
-        this.value.add(path);
+  private boolean checkTopLevelModule(Path path, EObject errorOwner, MessageReporter err) {
+    String fileName = path.getFileName().toString();
+    if (!Files.exists(path)) {
+      err.at(errorOwner).error("File not found");
+    } else if (Files.isRegularFile(path) && !fileName.endsWith(".rs")) {
+      err.at(errorOwner).error("Not a rust file");
+    } else if (fileName.equals("main.rs")) {
+      err.at(errorOwner).error("Cannot use 'main.rs' as a module name (reserved)");
+    } else if (fileName.equals("reactors") || fileName.equals("reactors.rs")) {
+      err.at(errorOwner).error("Cannot use 'reactors' as a module name (reserved)");
+    } else if (Files.isDirectory(path) && !Files.exists(path.resolve("mod.rs"))) {
+      err.at(errorOwner).error("Cannot find module descriptor in directory");
+    } else {
+      return true;
     }
+    return false;
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
index 99000267d0..f2747456c2 100644
--- a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
@@ -1,151 +1,137 @@
 package org.lflang.target.property;
 
+import com.google.common.collect.ImmutableList;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Properties;
-
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
-import org.lflang.TargetProperty;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
-
 import org.lflang.target.property.SchedulerProperty.SchedulerOption;
 import org.lflang.target.property.type.UnionType;
-import org.lflang.validation.ValidationReporter;
-
-
-import com.google.common.collect.ImmutableList;
 
 public class SchedulerProperty extends TargetPropertyConfig<SchedulerOption> {
 
-
-    public SchedulerProperty() {
-        super(UnionType.SCHEDULER_UNION);
-    }
-
-    @Override
-    public SchedulerOption initialValue() {
-        return SchedulerOption.getDefault();
+  public SchedulerProperty() {
+    super(UnionType.SCHEDULER_UNION);
+  }
+
+  @Override
+  public SchedulerOption initialValue() {
+    return SchedulerOption.getDefault();
+  }
+
+  @Override
+  public SchedulerOption fromAst(Element value, MessageReporter err) {
+    var scheduler = fromString(ASTUtils.elementToSingleString(value), err);
+    if (scheduler != null) {
+      return scheduler;
+    } else {
+      return SchedulerOption.getDefault();
     }
-
-    @Override
-    public void update(Properties cliArgs) {
-        super.update(cliArgs);
-        var key = TargetProperty.SCHEDULER.toString();
-        if (cliArgs.containsKey(key)) {
-            value = SchedulerOption.valueOf(cliArgs.getProperty("scheduler"));
+  }
+
+  @Override
+  protected SchedulerOption fromString(String value, MessageReporter err) {
+    return (SchedulerOption) UnionType.SCHEDULER_UNION.forName(value);
+  }
+
+  @Override
+  public List<Target> supportedTargets() {
+    return Arrays.asList(Target.C, Target.CCPP, Target.Python);
+  }
+
+  @Override
+  public Element toAstElement() {
+    return ASTUtils.toElement(this.value.toString());
+  }
+
+  @Override
+  public void validate(
+      KeyValuePair pair, Model ast, TargetConfig config, MessageReporter reporter) {
+    super.validate(pair, ast, config, reporter);
+    if (pair != null) {
+      String schedulerName = ASTUtils.elementToSingleString(pair.getValue());
+      try {
+        if (!SchedulerOption.valueOf(schedulerName).prioritizesDeadline()) {
+          // Check if a deadline is assigned to any reaction
+          // Filter reactors that contain at least one reaction that
+          // has a deadline handler.
+          if (ast.getReactors().stream()
+              .anyMatch(
+                  // Filter reactors that contain at least one reaction that
+                  // has a deadline handler.
+                  reactor ->
+                      ASTUtils.allReactions(reactor).stream()
+                          .anyMatch(reaction -> reaction.getDeadline() != null))) {
+            reporter
+                .at(pair, Literals.KEY_VALUE_PAIR__VALUE)
+                .warning(
+                    "This program contains deadlines, but the chosen "
+                        + schedulerName
+                        + " scheduler does not prioritize reaction execution "
+                        + "based on deadlines. This might result in a sub-optimal "
+                        + "scheduling.");
+          }
         }
+      } catch (IllegalArgumentException e) {
+        // the given scheduler is invalid, but this is already checked by
+        // checkTargetProperties
+      }
     }
-
-    @Override
-    public SchedulerOption fromAstElement(Element value) {
-        var scheduler = (SchedulerOption)
-            UnionType.SCHEDULER_UNION.forName(ASTUtils.elementToSingleString(value));
-        if (scheduler != null) {
-            return scheduler;
-        } else {
-            return SchedulerOption.getDefault();
-        }
+  }
+
+  /**
+   * Supported schedulers.
+   *
+   * @author Soroush Bateni
+   */
+  public enum SchedulerOption {
+    NP(false), // Non-preemptive
+    ADAPTIVE(
+        false,
+        List.of(
+            Path.of("scheduler_adaptive.c"),
+            Path.of("worker_assignments.h"),
+            Path.of("worker_states.h"),
+            Path.of("data_collection.h"))),
+    GEDF_NP(true), // Global EDF non-preemptive
+    GEDF_NP_CI(true); // Global EDF non-preemptive with chain ID
+
+    /** Indicate whether the scheduler prioritizes reactions by deadline. */
+    private final boolean prioritizesDeadline;
+
+    /** Relative paths to files required by this scheduler. */
+    private final List<Path> relativePaths;
+
+    SchedulerOption(boolean prioritizesDeadline) {
+      this(prioritizesDeadline, null);
     }
 
-    @Override
-    public List<Target> supportedTargets() {
-        return Arrays.asList(Target.C, Target.CCPP, Target.Python);
+    SchedulerOption(boolean prioritizesDeadline, List<Path> relativePaths) {
+      this.prioritizesDeadline = prioritizesDeadline;
+      this.relativePaths = relativePaths;
     }
 
-    @Override
-    public Element toAstElement() {
-        return ASTUtils.toElement(this.value.toString());
+    /** Return true if the scheduler prioritizes reactions by deadline. */
+    public boolean prioritizesDeadline() {
+      return this.prioritizesDeadline;
     }
 
-    @Override
-    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
-        super.validate(pair, ast, config, reporter);
-        if (pair != null) {
-            String schedulerName = ASTUtils.elementToSingleString(pair.getValue());
-            try {
-                if (!SchedulerOption.valueOf(schedulerName).prioritizesDeadline()) {
-                    // Check if a deadline is assigned to any reaction
-                    // Filter reactors that contain at least one reaction that
-                    // has a deadline handler.
-                    if (ast.getReactors().stream()
-                        .anyMatch(
-                            // Filter reactors that contain at least one reaction that
-                            // has a deadline handler.
-                            reactor ->
-                                ASTUtils.allReactions(reactor).stream()
-                                    .anyMatch(reaction -> reaction.getDeadline() != null))) {
-                        reporter.warning(
-                            "This program contains deadlines, but the chosen "
-                                + schedulerName
-                                + " scheduler does not prioritize reaction execution "
-                                + "based on deadlines. This might result in a sub-optimal "
-                                + "scheduling.",
-                            pair,
-                            Literals.KEY_VALUE_PAIR__VALUE);
-                    }
-                }
-            } catch (IllegalArgumentException e) {
-                // the given scheduler is invalid, but this is already checked by
-                // checkTargetProperties
-            }
-        }
-
+    public List<Path> getRelativePaths() {
+      return relativePaths != null
+          ? ImmutableList.copyOf(relativePaths)
+          : List.of(Path.of("scheduler_" + this + ".c"));
     }
 
-
-    /**
-     * Supported schedulers.
-     *
-     * @author Soroush Bateni
-     */
-    public enum SchedulerOption {
-        NP(false), // Non-preemptive
-        ADAPTIVE(
-            false,
-            List.of(
-                Path.of("scheduler_adaptive.c"),
-                Path.of("worker_assignments.h"),
-                Path.of("worker_states.h"),
-                Path.of("data_collection.h"))),
-        GEDF_NP(true), // Global EDF non-preemptive
-        GEDF_NP_CI(true); // Global EDF non-preemptive with chain ID
-
-
-        /** Indicate whether the scheduler prioritizes reactions by deadline. */
-        private final boolean prioritizesDeadline;
-
-        /** Relative paths to files required by this scheduler. */
-        private final List<Path> relativePaths;
-
-        SchedulerOption(boolean prioritizesDeadline) {
-            this(prioritizesDeadline, null);
-        }
-
-        SchedulerOption(boolean prioritizesDeadline, List<Path> relativePaths) {
-            this.prioritizesDeadline = prioritizesDeadline;
-            this.relativePaths = relativePaths;
-        }
-
-        /** Return true if the scheduler prioritizes reactions by deadline. */
-        public boolean prioritizesDeadline() {
-            return this.prioritizesDeadline;
-        }
-
-        public List<Path> getRelativePaths() {
-            return relativePaths != null
-                ? ImmutableList.copyOf(relativePaths)
-                : List.of(Path.of("scheduler_" + this + ".c"));
-        }
-
-        public static SchedulerOption getDefault() {
-            return NP;
-        }
+    public static SchedulerOption getDefault() {
+      return NP;
     }
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java b/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
index f779be00a1..3e68141ab4 100644
--- a/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
@@ -1,14 +1,12 @@
 package org.lflang.target.property;
 
 import java.util.List;
-
 import org.lflang.Target;
 
 public class SingleFileProjectProperty extends DefaultBooleanProperty {
 
-    @Override
-    public List<Target> supportedTargets() {
-        return List.of(Target.Rust);
-    }
-
+  @Override
+  public List<Target> supportedTargets() {
+    return List.of(Target.Rust);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/ThreadingProperty.java b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
index b0abbae4c6..7f596160df 100644
--- a/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
@@ -1,19 +1,17 @@
 package org.lflang.target.property;
 
 import java.util.List;
-
 import org.lflang.Target;
 
 public class ThreadingProperty extends DefaultBooleanProperty {
 
-    @Override
-    public List<Target> supportedTargets() {
-        return List.of(Target.C, Target.CCPP, Target.Python);
-    }
-
+  @Override
+  public List<Target> supportedTargets() {
+    return List.of(Target.C, Target.CCPP, Target.Python);
+  }
 
-    @Override
-    public Boolean initialValue() {
-        return true;
-    }
+  @Override
+  public Boolean initialValue() {
+    return true;
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
index 7ef3947727..55c591f8a0 100644
--- a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
@@ -1,8 +1,7 @@
 package org.lflang.target.property;
 
-
 import java.util.List;
-
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetPropertyConfig;
 import org.lflang.TimeValue;
@@ -10,30 +9,34 @@
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
 
-
 public class TimeOutProperty extends TargetPropertyConfig<TimeValue> {
 
-    public TimeOutProperty() {
-        super(PrimitiveType.TIME_VALUE);
-    }
-
-    @Override
-    public TimeValue initialValue() {
-        return null;
-    }
-
-    @Override
-    public TimeValue fromAstElement(Element value) {
-        return ASTUtils.toTimeValue(value);
-    }
-
-    @Override
-    public List<Target> supportedTargets() {
-        return Target.ALL;
-    }
-
-    @Override
-    public Element toAstElement() {
-        return ASTUtils.toElement(value);
-    }
+  public TimeOutProperty() {
+    super(PrimitiveType.TIME_VALUE);
+  }
+
+  @Override
+  public TimeValue initialValue() {
+    return null;
+  }
+
+  @Override
+  public TimeValue fromAst(Element value, MessageReporter err) {
+    return ASTUtils.toTimeValue(value);
+  }
+
+  @Override
+  protected TimeValue fromString(String value, MessageReporter err) {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public List<Target> supportedTargets() {
+    return Target.ALL;
+  }
+
+  @Override
+  public Element toAstElement() {
+    return ASTUtils.toElement(value);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index cfdb4ad024..3d6cca84ad 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -2,17 +2,12 @@
 
 import java.util.List;
 import java.util.Objects;
-import java.util.Properties;
-
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.DictionaryElement;
 import org.lflang.TargetPropertyConfig;
-import org.lflang.target.property.TracingProperty.TracingOptions;
-import org.lflang.target.property.type.DictionaryType;
-import org.lflang.target.property.type.PrimitiveType;
-import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -20,167 +15,162 @@
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
+import org.lflang.target.property.TracingProperty.TracingOptions;
+import org.lflang.target.property.type.DictionaryType;
+import org.lflang.target.property.type.PrimitiveType;
+import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.target.property.type.UnionType;
-import org.lflang.validation.ValidationReporter;
 
 public class TracingProperty extends TargetPropertyConfig<TracingOptions> {
 
-
-    public TracingProperty() {
-        super(UnionType.TRACING_UNION);
-    }
-
-    @Override
-    public TracingOptions initialValue() {
-        return new TracingOptions(false);
-    }
-
-    @Override
-    public void update(Properties cliArgs) {
-        super.update(cliArgs);
-        var key = TargetProperty.TRACING.toString();
-        if (cliArgs.containsKey(key)) {
-            this.value.enabled = true;
-        }
-    }
-
-    @Override
-    public TracingOptions fromAstElement(Element value) {
-        var options = new TracingOptions(false);
-        if (value.getLiteral() != null) {
-            if (!ASTUtils.toBoolean(value)) {
-                options.enabled = false;
-            }
-        } else {
-            for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
-                TracingOption option =
-                    (TracingOption) DictionaryType.TRACING_DICT.forName(entry.getName());
-                switch (option) {
-                case TRACE_FILE_NAME:
-                    options.traceFileName = ASTUtils.elementToSingleString(entry.getValue());
-                    break;
-                default:
-                    break;
-                }
-            }
+  public TracingProperty() {
+    super(UnionType.TRACING_UNION);
+  }
+
+  @Override
+  public TracingOptions initialValue() {
+    return new TracingOptions(false);
+  }
+
+  @Override
+  public TracingOptions fromAst(Element value, MessageReporter err) {
+    var options = new TracingOptions(false);
+    if (value.getLiteral() != null) {
+      if (!ASTUtils.toBoolean(value)) {
+        options.enabled = false;
+      }
+    } else {
+      for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+        TracingOption option = (TracingOption) DictionaryType.TRACING_DICT.forName(entry.getName());
+        switch (option) {
+          case TRACE_FILE_NAME:
+            options.traceFileName = ASTUtils.elementToSingleString(entry.getValue());
+            break;
+          default:
+            break;
         }
-        return options;
-    }
-
-    @Override
-    public List<Target> supportedTargets() {
-        return List.of(Target.C, Target.CCPP, Target.CPP, Target.Python);
+      }
     }
-
-    @Override
-    public void validate(KeyValuePair pair, Model ast, TargetConfig config, ValidationReporter reporter) {
-        if (pair != null && this.fromAstElement(pair.getValue()) != null) {
-            // If tracing is anything but "false" and threading is off, error.
-            var threading = TargetProperty.getKeyValuePair(ast, TargetProperty.THREADING);
-            if (threading != null) {
-                if (!ASTUtils.toBoolean(threading.getValue())) {
-                    reporter.error(
-                        "Cannot enable tracing because threading support is disabled",
-                        pair,
-                        Literals.KEY_VALUE_PAIR__NAME);
-                    reporter.error(
-                        "Cannot disable treading support because tracing is enabled",
-                        threading,
-                        Literals.KEY_VALUE_PAIR__NAME);
-                }
-            }
+    return options;
+  }
+
+  @Override
+  protected TracingOptions fromString(String value, MessageReporter err) {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public List<Target> supportedTargets() {
+    return List.of(Target.C, Target.CCPP, Target.CPP, Target.Python);
+  }
+
+  @Override
+  public void validate(
+      KeyValuePair pair, Model ast, TargetConfig config, MessageReporter reporter) {
+    if (pair != null && this.fromAst(pair.getValue(), reporter) != null) {
+      // If tracing is anything but "false" and threading is off, error.
+      var threading = TargetProperty.getKeyValuePair(ast, TargetProperty.THREADING);
+      if (threading != null) {
+        if (!ASTUtils.toBoolean(threading.getValue())) {
+          reporter
+              .at(pair, Literals.KEY_VALUE_PAIR__NAME)
+              .error("Cannot enable tracing because threading support is disabled");
+          reporter
+              .at(threading, Literals.KEY_VALUE_PAIR__NAME)
+              .error("Cannot disable treading support because tracing is enabled");
         }
+      }
     }
-
-    @Override
-    public Element toAstElement() {
-        if (!this.value.isEnabled()) {
-            return null;
-        } else if (this.value.equals(new TracingOptions(true))) {
-            // default values
-            return ASTUtils.toElement(true);
-        } else {
-            Element e = LfFactory.eINSTANCE.createElement();
-            KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-            for (TracingOption opt : TracingOption.values()) {
-                KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
-                pair.setName(opt.toString());
-                switch (opt) {
-                case TRACE_FILE_NAME:
-                    if (this.value.traceFileName == null) {
-                        continue;
-                    }
-                    pair.setValue(ASTUtils.toElement(this.value.traceFileName));
-                }
-                kvp.getPairs().add(pair);
-            }
-            e.setKeyvalue(kvp);
-            if (kvp.getPairs().isEmpty()) {
-                return null;
+  }
+
+  @Override
+  public Element toAstElement() {
+    if (!this.value.isEnabled()) {
+      return null;
+    } else if (this.value.equals(new TracingOptions(true))) {
+      // default values
+      return ASTUtils.toElement(true);
+    } else {
+      Element e = LfFactory.eINSTANCE.createElement();
+      KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+      for (TracingOption opt : TracingOption.values()) {
+        KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
+        pair.setName(opt.toString());
+        switch (opt) {
+          case TRACE_FILE_NAME:
+            if (this.value.traceFileName == null) {
+              continue;
             }
-            return e;
+            pair.setValue(ASTUtils.toElement(this.value.traceFileName));
         }
+        kvp.getPairs().add(pair);
+      }
+      e.setKeyvalue(kvp);
+      if (kvp.getPairs().isEmpty()) {
+        return null;
+      }
+      return e;
     }
+  }
 
-    /** Settings related to tracing options. */
-    public static class TracingOptions {
+  /** Settings related to tracing options. */
+  public static class TracingOptions {
 
-        protected boolean enabled = false;
+    protected boolean enabled = false;
 
-        TracingOptions(boolean enabled) {
-            this.enabled = enabled;
-        }
-
-        /**
-         * The name to use as the root of the trace file produced. This defaults to the name of the .lf
-         * file.
-         */
-        public String traceFileName = null;
+    TracingOptions(boolean enabled) {
+      this.enabled = enabled;
+    }
 
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            TracingOptions that = (TracingOptions) o;
-            return Objects.equals(traceFileName, that.traceFileName); // traceFileName may be null
-        }
+    /**
+     * The name to use as the root of the trace file produced. This defaults to the name of the .lf
+     * file.
+     */
+    public String traceFileName = null;
 
-        public boolean isEnabled() {
-            return enabled;
-        }
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      TracingOptions that = (TracingOptions) o;
+      return Objects.equals(traceFileName, that.traceFileName); // traceFileName may be null
     }
 
+    public boolean isEnabled() {
+      return enabled;
+    }
+  }
 
-    /**
-     * Tracing options.
-     *
-     * @author Edward A. Lee
-     */
-    public enum TracingOption implements DictionaryElement {
-        TRACE_FILE_NAME("trace-file-name", PrimitiveType.STRING);
+  /**
+   * Tracing options.
+   *
+   * @author Edward A. Lee
+   */
+  public enum TracingOption implements DictionaryElement {
+    TRACE_FILE_NAME("trace-file-name", PrimitiveType.STRING);
 
-        public final PrimitiveType type;
+    public final PrimitiveType type;
 
-        private final String description;
+    private final String description;
 
-        private TracingOption(String alias, PrimitiveType type) {
-            this.description = alias;
-            this.type = type;
-        }
+    private TracingOption(String alias, PrimitiveType type) {
+      this.description = alias;
+      this.type = type;
+    }
 
-        /** Return the description of this dictionary element. */
-        @Override
-        public String toString() {
-            return this.description;
-        }
+    /** Return the description of this dictionary element. */
+    @Override
+    public String toString() {
+      return this.description;
+    }
 
-        /** Return the type associated with this dictionary element. */
-        public TargetPropertyType getType() {
-            return this.type;
-        }
+    /** Return the type associated with this dictionary element. */
+    public TargetPropertyType getType() {
+      return this.type;
     }
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/VerifyProperty.java b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
index 0a6549bbc3..62116fc851 100644
--- a/core/src/main/java/org/lflang/target/property/VerifyProperty.java
+++ b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
@@ -1,15 +1,13 @@
 package org.lflang.target.property.type;
 
 import java.util.List;
-
 import org.lflang.Target;
 import org.lflang.target.property.DefaultBooleanProperty;
 
 public class VerifyProperty extends DefaultBooleanProperty {
 
-    @Override
-    public List<Target> supportedTargets() {
-        return List.of(Target.C);
-    }
-
+  @Override
+  public List<Target> supportedTargets() {
+    return List.of(Target.C);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/WorkersProperty.java b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
index 8b4a77a931..1ea091e567 100644
--- a/core/src/main/java/org/lflang/target/property/WorkersProperty.java
+++ b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
@@ -1,7 +1,6 @@
 package org.lflang.target.property;
 
 import java.util.List;
-
 import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetPropertyConfig;
@@ -11,33 +10,32 @@
 
 public class WorkersProperty extends TargetPropertyConfig<Integer> {
 
-    public WorkersProperty() {
-        super(PrimitiveType.NON_NEGATIVE_INTEGER);
-    }
-
-    @Override
-    public Integer initialValue() {
-        return 0;
-    }
-
-    @Override
-    protected Integer fromString(String value, MessageReporter err) {
-        return Integer.parseInt(value); // FIXME: check for exception
-    }
-
-    @Override
-    protected Integer fromAst(Element value, MessageReporter err) {
-        return ASTUtils.toInteger(value);
-    }
-
-    @Override
-    public List<Target> supportedTargets() {
-        return List.of(Target.C, Target.CCPP, Target.Python, Target.CPP, Target.Rust);
-    }
-
-    @Override
-    public Element toAstElement() {
-        return ASTUtils.toElement(value);
-    }
-
+  public WorkersProperty() {
+    super(PrimitiveType.NON_NEGATIVE_INTEGER);
+  }
+
+  @Override
+  public Integer initialValue() {
+    return 0;
+  }
+
+  @Override
+  protected Integer fromString(String value, MessageReporter err) {
+    return Integer.parseInt(value); // FIXME: check for exception
+  }
+
+  @Override
+  protected Integer fromAst(Element value, MessageReporter err) {
+    return ASTUtils.toInteger(value);
+  }
+
+  @Override
+  public List<Target> supportedTargets() {
+    return List.of(Target.C, Target.CCPP, Target.Python, Target.CPP, Target.Rust);
+  }
+
+  @Override
+  public Element toAstElement() {
+    return ASTUtils.toElement(value);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/type/ArrayType.java b/core/src/main/java/org/lflang/target/property/type/ArrayType.java
index 9a40560047..742292c3c7 100644
--- a/core/src/main/java/org/lflang/target/property/type/ArrayType.java
+++ b/core/src/main/java/org/lflang/target/property/type/ArrayType.java
@@ -1,11 +1,9 @@
 package org.lflang.target.property.type;
 
 import java.util.List;
-
+import org.lflang.MessageReporter;
 import org.lflang.lf.Array;
 import org.lflang.lf.Element;
-import org.lflang.validation.LFValidator;
-import org.lflang.validation.ValidationReporter;
 
 /**
  * An array type of which the elements confirm to a given type.
@@ -13,51 +11,51 @@
  * @author Marten Lohstroh
  */
 public enum ArrayType implements TargetPropertyType {
-    STRING_ARRAY(PrimitiveType.STRING),
-    FILE_ARRAY(PrimitiveType.FILE);
-
-    /** Type parameter of this array type. */
-    public TargetPropertyType type;
-
-    /**
-     * Private constructor to create a new array type.
-     *
-     * @param type The type of elements in the array.
-     */
-    private ArrayType(TargetPropertyType type) {
-        this.type = type;
-    }
-
-    /**
-     * Check that the passed in element represents an array and ensure that its elements are all of
-     * the correct type.
-     */
-    @Override
-    public boolean check(Element e, String name, ValidationReporter v) {
-        Array array = e.getArray();
-        if (array != null) {
-            List<Element> elements = array.getElements();
-            var valid = true;
-            for (int i = 0; i < elements.size(); i++) {
-                valid &= this.type.check(elements.get(i), name + "[" + i + "]", v);
-            }
-            return valid;
-        }
-        return false;
-    }
-
-    /** Return true of the given element is an array. */
-    @Override
-    public boolean validate(Element e) {
-        if (e.getArray() != null) {
-            return true;
-        }
-        return false;
+  STRING_ARRAY(PrimitiveType.STRING),
+  FILE_ARRAY(PrimitiveType.FILE);
+
+  /** Type parameter of this array type. */
+  public TargetPropertyType type;
+
+  /**
+   * Private constructor to create a new array type.
+   *
+   * @param type The type of elements in the array.
+   */
+  private ArrayType(TargetPropertyType type) {
+    this.type = type;
+  }
+
+  /**
+   * Check that the passed in element represents an array and ensure that its elements are all of
+   * the correct type.
+   */
+  @Override
+  public boolean check(Element e, String name, MessageReporter r) {
+    Array array = e.getArray();
+    if (array != null) {
+      List<Element> elements = array.getElements();
+      var valid = true;
+      for (int i = 0; i < elements.size(); i++) {
+        valid &= this.type.check(elements.get(i), name + "[" + i + "]", r);
+      }
+      return valid;
     }
-
-    /** Return a human-readable description of this type. */
-    @Override
-    public String toString() {
-        return "an array of which each element is " + this.type.toString();
+    return false;
+  }
+
+  /** Return true of the given element is an array. */
+  @Override
+  public boolean validate(Element e) {
+    if (e.getArray() != null) {
+      return true;
     }
-}
\ No newline at end of file
+    return false;
+  }
+
+  /** Return a human-readable description of this type. */
+  @Override
+  public String toString() {
+    return "an array of which each element is " + this.type.toString();
+  }
+}
diff --git a/core/src/main/java/org/lflang/target/property/type/CompilerConfig.java b/core/src/main/java/org/lflang/target/property/type/CompilerConfig.java
deleted file mode 100644
index 80248bb0d6..0000000000
--- a/core/src/main/java/org/lflang/target/property/type/CompilerConfig.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.lflang.target.property.type;
-
-import java.util.List;
-
-import org.lflang.Target;
-import org.lflang.target.property.DefaultStringConfig;
-
-public class CompilerConfig extends DefaultStringConfig {
-
-    @Override
-    public List<Target> supportedTargets() {
-        return Target.ALL;
-    }
-}
diff --git a/core/src/main/java/org/lflang/target/property/type/DictionaryType.java b/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
index 97691d2248..cbcb58d4c8 100644
--- a/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
+++ b/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
@@ -4,18 +4,17 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetProperty.DictionaryElement;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
+import org.lflang.target.property.ClockSyncOptionsProperty.ClockSyncOption;
 import org.lflang.target.property.CoordinationOptionsProperty.CoordinationOption;
 import org.lflang.target.property.DockerProperty.DockerOption;
 import org.lflang.target.property.PlatformProperty.PlatformOption;
 import org.lflang.target.property.TracingProperty.TracingOption;
-import org.lflang.target.property.ClockSyncOptionsProperty.ClockSyncOption;
-import org.lflang.validation.ValidationReporter;
 
 /**
  * A dictionary type with a predefined set of possible keys and assignable types.
@@ -23,73 +22,73 @@
  * @author Marten Lohstroh
  */
 public enum DictionaryType implements TargetPropertyType {
-    CLOCK_SYNC_OPTION_DICT(Arrays.asList(ClockSyncOption.values())),
-    DOCKER_DICT(Arrays.asList(DockerOption.values())),
-    PLATFORM_DICT(Arrays.asList(PlatformOption.values())),
-    COORDINATION_OPTION_DICT(Arrays.asList(CoordinationOption.values())),
-    TRACING_DICT(Arrays.asList(TracingOption.values()));
+  CLOCK_SYNC_OPTION_DICT(Arrays.asList(ClockSyncOption.values())),
+  DOCKER_DICT(Arrays.asList(DockerOption.values())),
+  PLATFORM_DICT(Arrays.asList(PlatformOption.values())),
+  COORDINATION_OPTION_DICT(Arrays.asList(CoordinationOption.values())),
+  TRACING_DICT(Arrays.asList(TracingOption.values()));
 
-    /** The keys and assignable types that are allowed in this dictionary. */
-    public List<DictionaryElement> options;
+  /** The keys and assignable types that are allowed in this dictionary. */
+  public List<DictionaryElement> options;
 
-    /**
-     * A dictionary type restricted to sets of predefined keys and types of values.
-     *
-     * @param options The dictionary elements allowed by this type.
-     */
-    private DictionaryType(List<DictionaryElement> options) {
-        this.options = options;
-    }
+  /**
+   * A dictionary type restricted to sets of predefined keys and types of values.
+   *
+   * @param options The dictionary elements allowed by this type.
+   */
+  private DictionaryType(List<DictionaryElement> options) {
+    this.options = options;
+  }
 
-    /**
-     * Return the dictionary element of which the key matches the given string.
-     *
-     * @param name The string to match against.
-     * @return The matching dictionary element (or null if there is none).
-     */
-    public DictionaryElement forName(String name) {
-        return Target.match(name, options);
-    }
+  /**
+   * Return the dictionary element of which the key matches the given string.
+   *
+   * @param name The string to match against.
+   * @return The matching dictionary element (or null if there is none).
+   */
+  public DictionaryElement forName(String name) {
+    return Target.match(name, options);
+  }
 
-    /** Recursively check that the passed in element conforms to the rules of this dictionary. */
-    @Override
-    public boolean check(Element e, String name, ValidationReporter v) {
-        KeyValuePairs kv = e.getKeyvalue();
-        if (kv != null) {
-            var valid = true;
-            for (KeyValuePair pair : kv.getPairs()) {
-                String key = pair.getName();
-                Element val = pair.getValue();
-                Optional<DictionaryElement> match =
-                    this.options.stream()
-                        .filter(element -> key.equalsIgnoreCase(element.toString()))
-                        .findAny();
-                if (match.isPresent()) {
-                    // Make sure the type is correct, too.
-                    TargetPropertyType type = match.get().getType();
-                    valid &= type.check(val, name + "." + key, v);
-                } else {
-                    valid = false;
-                }
-                return valid;
-            }
+  /** Recursively check that the passed in element conforms to the rules of this dictionary. */
+  @Override
+  public boolean check(Element e, String name, MessageReporter v) {
+    KeyValuePairs kv = e.getKeyvalue();
+    if (kv != null) {
+      var valid = true;
+      for (KeyValuePair pair : kv.getPairs()) {
+        String key = pair.getName();
+        Element val = pair.getValue();
+        Optional<DictionaryElement> match =
+            this.options.stream()
+                .filter(element -> key.equalsIgnoreCase(element.toString()))
+                .findAny();
+        if (match.isPresent()) {
+          // Make sure the type is correct, too.
+          TargetPropertyType type = match.get().getType();
+          valid &= type.check(val, name + "." + key, v);
+        } else {
+          valid = false;
         }
-        return false;
+        return valid;
+      }
     }
+    return false;
+  }
 
-    /** Return true if the given element represents a dictionary, false otherwise. */
-    @Override
-    public boolean validate(Element e) {
-        if (e.getKeyvalue() != null) {
-            return true;
-        }
-        return false;
+  /** Return true if the given element represents a dictionary, false otherwise. */
+  @Override
+  public boolean validate(Element e) {
+    if (e.getKeyvalue() != null) {
+      return true;
     }
+    return false;
+  }
 
-    /** Return a human-readable description of this type. */
-    @Override
-    public String toString() {
-        return "a dictionary with one or more of the following keys: "
-            + options.stream().map(option -> option.toString()).collect(Collectors.joining(", "));
-    }
-}
\ No newline at end of file
+  /** Return a human-readable description of this type. */
+  @Override
+  public String toString() {
+    return "a dictionary with one or more of the following keys: "
+        + options.stream().map(option -> option.toString()).collect(Collectors.joining(", "));
+  }
+}
diff --git a/core/src/main/java/org/lflang/target/property/type/PrimitiveType.java b/core/src/main/java/org/lflang/target/property/type/PrimitiveType.java
index 868669243d..8afc08c12f 100644
--- a/core/src/main/java/org/lflang/target/property/type/PrimitiveType.java
+++ b/core/src/main/java/org/lflang/target/property/type/PrimitiveType.java
@@ -1,10 +1,9 @@
 package org.lflang.target.property.type;
 
 import java.util.function.Predicate;
-
+import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
-import org.lflang.validation.ValidationReporter;
 
 /**
  * Primitive types for target properties, each with a description used in error messages and
@@ -13,86 +12,86 @@
  * @author Marten Lohstroh
  */
 public enum PrimitiveType implements TargetPropertyType {
-    BOOLEAN(
-        "'true' or 'false'",
-        v ->
-            ASTUtils.elementToSingleString(v).equalsIgnoreCase("true")
-                || ASTUtils.elementToSingleString(v).equalsIgnoreCase("false")),
-    INTEGER(
-        "an integer",
-        v -> {
-            try {
-                Integer.parseInt(ASTUtils.elementToSingleString(v));
-            } catch (NumberFormatException e) {
-                return false;
-            }
-            return true;
-        }),
-    NON_NEGATIVE_INTEGER(
-        "a non-negative integer",
-        v -> {
-            try {
-                int result = Integer.parseInt(ASTUtils.elementToSingleString(v));
-                if (result < 0) return false;
-            } catch (NumberFormatException e) {
-                return false;
-            }
-            return true;
-        }),
-    TIME_VALUE(
-        "a time value with units",
-        v ->
-            v.getKeyvalue() == null
-                && v.getArray() == null
-                && v.getLiteral() == null
-                && v.getId() == null
-                && (v.getTime() == 0 || v.getUnit() != null)),
-    STRING(
-        "a string",
-        v -> v.getLiteral() != null && !isCharLiteral(v.getLiteral()) || v.getId() != null),
-    FILE("a path to a file", STRING.validator);
+  BOOLEAN(
+      "'true' or 'false'",
+      v ->
+          ASTUtils.elementToSingleString(v).equalsIgnoreCase("true")
+              || ASTUtils.elementToSingleString(v).equalsIgnoreCase("false")),
+  INTEGER(
+      "an integer",
+      v -> {
+        try {
+          Integer.parseInt(ASTUtils.elementToSingleString(v));
+        } catch (NumberFormatException e) {
+          return false;
+        }
+        return true;
+      }),
+  NON_NEGATIVE_INTEGER(
+      "a non-negative integer",
+      v -> {
+        try {
+          int result = Integer.parseInt(ASTUtils.elementToSingleString(v));
+          if (result < 0) return false;
+        } catch (NumberFormatException e) {
+          return false;
+        }
+        return true;
+      }),
+  TIME_VALUE(
+      "a time value with units",
+      v ->
+          v.getKeyvalue() == null
+              && v.getArray() == null
+              && v.getLiteral() == null
+              && v.getId() == null
+              && (v.getTime() == 0 || v.getUnit() != null)),
+  STRING(
+      "a string",
+      v -> v.getLiteral() != null && !isCharLiteral(v.getLiteral()) || v.getId() != null),
+  FILE("a path to a file", STRING.validator);
 
-    /** A description of this type, featured in error messages. */
-    private final String description;
+  /** A description of this type, featured in error messages. */
+  private final String description;
 
-    /** A predicate for determining whether a given Element conforms to this type. */
-    public final Predicate<Element> validator;
+  /** A predicate for determining whether a given Element conforms to this type. */
+  public final Predicate<Element> validator;
 
-    /**
-     * Private constructor to create a new primitive type.
-     *
-     * @param description A textual description of the type that should start with "a/an".
-     * @param validator A predicate that returns true if a given Element conforms to this type.
-     */
-    PrimitiveType(String description, Predicate<Element> validator) {
-        this.description = description;
-        this.validator = validator;
-    }
+  /**
+   * Private constructor to create a new primitive type.
+   *
+   * @param description A textual description of the type that should start with "a/an".
+   * @param validator A predicate that returns true if a given Element conforms to this type.
+   */
+  PrimitiveType(String description, Predicate<Element> validator) {
+    this.description = description;
+    this.validator = validator;
+  }
 
-    /** Return true if the given Element is a valid instance of this type. */
-    public boolean validate(Element e) {
-        return this.validator.test(e);
-    }
+  /** Return true if the given Element is a valid instance of this type. */
+  public boolean validate(Element e) {
+    return this.validator.test(e);
+  }
 
-    /**
-     * Check (recursively) the given Element against its associated type(s) and add found problems
-     * to the given list of errors.
-     *
-     * @param e The element to type check.
-     * @param name The name of the target property.
-     * @param v The LFValidator to append errors to.
-     */
-    public boolean check(Element e, String name, ValidationReporter v) {
-        return this.validate(e);
-    }
+  /**
+   * Check (recursively) the given Element against its associated type(s) and add found problems to
+   * the given list of errors.
+   *
+   * @param e The element to type check.
+   * @param name The name of the target property.
+   * @param v The LFValidator to append errors to.
+   */
+  public boolean check(Element e, String name, MessageReporter v) {
+    return this.validate(e);
+  }
 
-    /** Return a textual description of this type. */
-    @Override
-    public String toString() {
-        return this.description;
-    }
+  /** Return a textual description of this type. */
+  @Override
+  public String toString() {
+    return this.description;
+  }
 
-    private static boolean isCharLiteral(String s) {
-        return s.length() > 2 && '\'' == s.charAt(0) && '\'' == s.charAt(s.length() - 1);
-    }
+  private static boolean isCharLiteral(String s) {
+    return s.length() > 2 && '\'' == s.charAt(0) && '\'' == s.charAt(s.length() - 1);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java b/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java
index dda0d6065e..8047b56bd1 100644
--- a/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java
+++ b/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java
@@ -1,37 +1,36 @@
 package org.lflang.target.property.type;
 
+import org.lflang.MessageReporter;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
-import org.lflang.validation.LFValidator;
-import org.lflang.validation.ValidationReporter;
 
 /** Dictionary type that allows for keys that will be interpreted as strings and string values. */
 public enum StringDictionaryType implements TargetPropertyType {
-    COMPILE_DEFINITION();
+  COMPILE_DEFINITION();
 
-    @Override
-    public boolean validate(Element e) {
-        if (e.getKeyvalue() != null) {
-            return true;
-        }
-        return false;
+  @Override
+  public boolean validate(Element e) {
+    if (e.getKeyvalue() != null) {
+      return true;
     }
+    return false;
+  }
 
-    @Override
-    public boolean check(Element e, String name, ValidationReporter v) {
-        KeyValuePairs kv = e.getKeyvalue();
-        if (kv != null) {
-            var valid = true;
-            for (KeyValuePair pair : kv.getPairs()) {
-                String key = pair.getName();
-                Element val = pair.getValue();
+  @Override
+  public boolean check(Element e, String name, MessageReporter v) {
+    KeyValuePairs kv = e.getKeyvalue();
+    if (kv != null) {
+      var valid = true;
+      for (KeyValuePair pair : kv.getPairs()) {
+        String key = pair.getName();
+        Element val = pair.getValue();
 
-                // Make sure the type is string
-                valid &= PrimitiveType.STRING.check(val, name + "." + key, v);
-            }
-            return valid;
-        }
-        return false;
+        // Make sure the type is string
+        valid &= PrimitiveType.STRING.check(val, name + "." + key, v);
+      }
+      return valid;
     }
-}
\ No newline at end of file
+    return false;
+  }
+}
diff --git a/core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java b/core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java
index 06f0a5cbbb..d4c5009262 100644
--- a/core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java
+++ b/core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java
@@ -1,11 +1,7 @@
 package org.lflang.target.property.type;
 
-import java.util.function.Predicate;
-
-import org.lflang.ast.ASTUtils;
+import org.lflang.MessageReporter;
 import org.lflang.lf.Element;
-import org.lflang.validation.LFValidator;
-import org.lflang.validation.ValidationReporter;
 
 /**
  * An interface for types associated with target properties.
@@ -14,24 +10,21 @@
  */
 public interface TargetPropertyType {
 
-    /**
-     * Return true if the given Element is a valid instance of this type.
-     *
-     * @param e The Element to validate.
-     * @return True if the element conforms to this type, false otherwise.
-     */
-    public boolean validate(Element e);
-
-    /**
-     * Check (recursively) the given Element against its associated type(s) and add found problems
-     * to the given list of errors.
-     *
-     * @param e The Element to type check.
-     * @param name The name of the target property.
-     * @param v A reference to the validator to report errors to.
-     */
-    public boolean check(Element e, String name, ValidationReporter v);
-
+  /**
+   * Return true if the given Element is a valid instance of this type.
+   *
+   * @param e The Element to validate.
+   * @return True if the element conforms to this type, false otherwise.
+   */
+  public boolean validate(Element e);
+
+  /**
+   * Check (recursively) the given Element against its associated type(s) and add found problems to
+   * the given list of errors.
+   *
+   * @param e The Element to type check.
+   * @param name The name of the target property.
+   * @param r A reference to the validator to report errors to.
+   */
+  public boolean check(Element e, String name, MessageReporter r);
 }
-
-
diff --git a/core/src/main/java/org/lflang/target/property/type/UnionType.java b/core/src/main/java/org/lflang/target/property/type/UnionType.java
index 351eef2b8e..2e046e68ae 100644
--- a/core/src/main/java/org/lflang/target/property/type/UnionType.java
+++ b/core/src/main/java/org/lflang/target/property/type/UnionType.java
@@ -4,17 +4,16 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
+import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
+import org.lflang.target.property.BuildConfig.BuildType;
 import org.lflang.target.property.ClockSyncModeProperty.ClockSyncMode;
 import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
+import org.lflang.target.property.LoggingProperty.LogLevel;
 import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.target.property.SchedulerProperty.SchedulerOption;
-import org.lflang.target.property.BuildConfig.BuildType;
-import org.lflang.target.property.LoggingProperty.LogLevel;
-import org.lflang.validation.ValidationReporter;
 
 /**
  * A type that can assume one of several types.
@@ -22,115 +21,115 @@
  * @author Marten Lohstroh
  */
 public enum UnionType implements TargetPropertyType {
-    STRING_OR_STRING_ARRAY(Arrays.asList(PrimitiveType.STRING, ArrayType.STRING_ARRAY), null),
-    PLATFORM_STRING_OR_DICTIONARY(
-        Arrays.asList(PrimitiveType.STRING, DictionaryType.PLATFORM_DICT), null),
-    FILE_OR_FILE_ARRAY(Arrays.asList(PrimitiveType.FILE, ArrayType.FILE_ARRAY), null),
-    BUILD_TYPE_UNION(Arrays.asList(BuildType.values()), null),
-    COORDINATION_UNION(Arrays.asList(CoordinationMode.values()), CoordinationMode.CENTRALIZED),
-    SCHEDULER_UNION(Arrays.asList(SchedulerOption.values()), SchedulerOption.getDefault()),
-    LOGGING_UNION(Arrays.asList(LogLevel.values()), LogLevel.INFO),
-    PLATFORM_UNION(Arrays.asList(Platform.values()), Platform.AUTO),
-    CLOCK_SYNC_UNION(Arrays.asList(ClockSyncMode.values()), ClockSyncMode.INIT),
-    DOCKER_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.DOCKER_DICT), null),
-    TRACING_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.TRACING_DICT), null);
+  STRING_OR_STRING_ARRAY(Arrays.asList(PrimitiveType.STRING, ArrayType.STRING_ARRAY), null),
+  PLATFORM_STRING_OR_DICTIONARY(
+      Arrays.asList(PrimitiveType.STRING, DictionaryType.PLATFORM_DICT), null),
+  FILE_OR_FILE_ARRAY(Arrays.asList(PrimitiveType.FILE, ArrayType.FILE_ARRAY), null),
+  BUILD_TYPE_UNION(Arrays.asList(BuildType.values()), null),
+  COORDINATION_UNION(Arrays.asList(CoordinationMode.values()), CoordinationMode.CENTRALIZED),
+  SCHEDULER_UNION(Arrays.asList(SchedulerOption.values()), SchedulerOption.getDefault()),
+  LOGGING_UNION(Arrays.asList(LogLevel.values()), LogLevel.INFO),
+  PLATFORM_UNION(Arrays.asList(Platform.values()), Platform.AUTO),
+  CLOCK_SYNC_UNION(Arrays.asList(ClockSyncMode.values()), ClockSyncMode.INIT),
+  DOCKER_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.DOCKER_DICT), null),
+  TRACING_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.TRACING_DICT), null);
 
-    /** The constituents of this type union. */
-    public final List<Enum<?>> options;
+  /** The constituents of this type union. */
+  public final List<Enum<?>> options;
 
-    /** The default type, if there is one. */
-    private final Enum<?> defaultOption;
+  /** The default type, if there is one. */
+  private final Enum<?> defaultOption;
 
-    /**
-     * Private constructor for creating unions types.
-     *
-     * @param options The types that that are part of the union.
-     * @param defaultOption The default type.
-     */
-    private UnionType(List<Enum<?>> options, Enum<?> defaultOption) {
-        this.options = options;
-        this.defaultOption = defaultOption;
-    }
+  /**
+   * Private constructor for creating unions types.
+   *
+   * @param options The types that that are part of the union.
+   * @param defaultOption The default type.
+   */
+  private UnionType(List<Enum<?>> options, Enum<?> defaultOption) {
+    this.options = options;
+    this.defaultOption = defaultOption;
+  }
 
-    /**
-     * Return the type among those in this type union that matches the given name.
-     *
-     * @param name The string to match against.
-     * @return The matching dictionary element (or null if there is none).
-     */
-    public Enum<?> forName(String name) {
-        return Target.match(name, options);
-    }
+  /**
+   * Return the type among those in this type union that matches the given name.
+   *
+   * @param name The string to match against.
+   * @return The matching dictionary element (or null if there is none).
+   */
+  public Enum<?> forName(String name) {
+    return Target.match(name, options);
+  }
 
-    /** Recursively check that the passed in element conforms to the rules of this union. */
-    @Override
-    public boolean check(Element e, String name, ValidationReporter v) {
-        Optional<Enum<?>> match = this.match(e);
-        var found = false;
-        if (match.isPresent()) {
-            // Go deeper if the element is an array or dictionary.
-            Enum<?> type = match.get();
-            if (type instanceof DictionaryType) {
-                found = ((DictionaryType) type).check(e, name, v);
-            } else if (type instanceof ArrayType) {
-                found = ((ArrayType) type).check(e, name, v);
-            } else if (type instanceof PrimitiveType) {
-                found = ((PrimitiveType) type).check(e, name, v);
-            } else if (!(type instanceof Enum<?>)) {
-                throw new RuntimeException("Encountered an unknown type.");
-            }
-        }
-        return found;
+  /** Recursively check that the passed in element conforms to the rules of this union. */
+  @Override
+  public boolean check(Element e, String name, MessageReporter r) {
+    Optional<Enum<?>> match = this.match(e);
+    var found = false;
+    if (match.isPresent()) {
+      // Go deeper if the element is an array or dictionary.
+      Enum<?> type = match.get();
+      if (type instanceof DictionaryType) {
+        found = ((DictionaryType) type).check(e, name, r);
+      } else if (type instanceof ArrayType) {
+        found = ((ArrayType) type).check(e, name, r);
+      } else if (type instanceof PrimitiveType) {
+        found = ((PrimitiveType) type).check(e, name, r);
+      } else if (!(type instanceof Enum<?>)) {
+        throw new RuntimeException("Encountered an unknown type.");
+      }
     }
+    return found;
+  }
 
-    /**
-     * Internal method for matching a given element against the allowable types.
-     *
-     * @param e AST node that represents the value of a target property.
-     * @return The matching type wrapped in an Optional object.
-     */
-    private Optional<Enum<?>> match(Element e) {
-        return this.options.stream()
-            .filter(
-                option -> {
-                    if (option instanceof TargetPropertyType) {
-                        return ((TargetPropertyType) option).validate(e);
-                    } else {
-                        return ASTUtils.elementToSingleString(e).equalsIgnoreCase(option.toString());
-                    }
-                })
-            .findAny();
-    }
+  /**
+   * Internal method for matching a given element against the allowable types.
+   *
+   * @param e AST node that represents the value of a target property.
+   * @return The matching type wrapped in an Optional object.
+   */
+  private Optional<Enum<?>> match(Element e) {
+    return this.options.stream()
+        .filter(
+            option -> {
+              if (option instanceof TargetPropertyType) {
+                return ((TargetPropertyType) option).validate(e);
+              } else {
+                return ASTUtils.elementToSingleString(e).equalsIgnoreCase(option.toString());
+              }
+            })
+        .findAny();
+  }
 
-    /**
-     * Return true if this union has an option that matches the given element.
-     *
-     * @param e The element to match against this type.
-     */
-    @Override
-    public boolean validate(Element e) {
-        if (this.match(e).isPresent()) {
-            return true;
-        }
-        return false;
+  /**
+   * Return true if this union has an option that matches the given element.
+   *
+   * @param e The element to match against this type.
+   */
+  @Override
+  public boolean validate(Element e) {
+    if (this.match(e).isPresent()) {
+      return true;
     }
+    return false;
+  }
 
-    /**
-     * Return a human-readable description of this type. If three is a default option, then indicate
-     * it.
-     */
-    @Override
-    public String toString() {
-        return "one of the following: "
-            + options.stream()
+  /**
+   * Return a human-readable description of this type. If three is a default option, then indicate
+   * it.
+   */
+  @Override
+  public String toString() {
+    return "one of the following: "
+        + options.stream()
             .map(
                 option -> {
-                    if (option == this.defaultOption) {
-                        return option.toString() + " (default)";
-                    } else {
-                        return option.toString();
-                    }
+                  if (option == this.defaultOption) {
+                    return option.toString() + " (default)";
+                  } else {
+                    return option.toString();
+                  }
                 })
             .collect(Collectors.joining(", "));
-    }
-}
\ No newline at end of file
+  }
+}
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index a742b8185d..eb2f0be22d 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -85,7 +85,6 @@
 import org.lflang.lf.Initializer;
 import org.lflang.lf.Input;
 import org.lflang.lf.Instantiation;
-import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Literal;
@@ -529,43 +528,6 @@ public void checkInstantiation(Instantiation instantiation) {
     }
   }
 
-  /** Check target parameters, which are key-value pairs. */
-  @Check(CheckType.FAST)
-  public void checkKeyValuePair(KeyValuePair param) {
-    // Check only if the container's container is a Target.
-    if (param.eContainer().eContainer() instanceof TargetDecl) {
-      TargetProperty prop = TargetProperty.forName(param.getName());
-
-      // Make sure the key is valid.
-      if (prop == null) {
-        String options =
-            TargetProperty.getOptions().stream()
-                .map(p -> p.description)
-                .sorted()
-                .collect(Collectors.joining(", "));
-        warning(
-            "Unrecognized target parameter: "
-                + param.getName()
-                + ". Recognized parameters are: "
-                + options,
-            Literals.KEY_VALUE_PAIR__NAME);
-      } else {
-
-      }
-
-      // Retrieve the errors that resulted from the check.
-      for (String it : targetPropertyErrors) {
-        error(it, Literals.KEY_VALUE_PAIR__VALUE);
-      }
-      targetPropertyErrors.clear();
-
-      for (String it : targetPropertyWarnings) {
-        error(it, Literals.KEY_VALUE_PAIR__VALUE);
-      }
-      targetPropertyWarnings.clear();
-    }
-  }
-
   @Check(CheckType.FAST)
   public void checkModel(Model model) {
     // Since we're doing a fast check, we only want to update
@@ -1096,7 +1058,6 @@ public void checkTargetDecl(TargetDecl target) throws IOException {
     if (Character.isDigit(lfFileName.charAt(0))) {
       errorReporter.nowhere().error("LF file names must not start with a number");
     }
-
   }
 
   /**
@@ -1106,29 +1067,8 @@ public void checkTargetDecl(TargetDecl target) throws IOException {
    */
   @Check(CheckType.NORMAL)
   public void checkTargetProperties(KeyValuePairs targetProperties) {
-    Arrays.stream(TargetProperty.values()).forEach(p -> {
-      p.validate(targetProperties, this.info.model, this.targetConfig,
-          new ValidationReporter() { // FIXME: this is redundant because there already is a ValidatorMessageReporter class that I was unaware of.
-            @Override
-            public void error(String message, EObject source, EStructuralFeature feature) {
-              error(message, source, feature);
-            }
-
-            @Override
-            public void warning(String message, EObject source, EStructuralFeature feature) {
-              warning(message, source, feature);
-            }
-          });
-    });
-  }
-
-  private KeyValuePair getKeyValuePair(KeyValuePairs targetProperties, TargetProperty property) {
-    List<KeyValuePair> properties =
-        targetProperties.getPairs().stream()
-            .filter(pair -> pair.getName().equals(property.description))
-            .toList();
-    assert (properties.size() <= 1);
-    return properties.size() > 0 ? properties.get(0) : null;
+    TargetProperty.validate(
+        targetProperties, this.info.model, this.targetConfig, getErrorReporter());
   }
 
   @Check(CheckType.FAST)
@@ -1543,11 +1483,6 @@ public ValidationMessageAcceptor getMessageAcceptor() {
     return messageAcceptor == null ? this : messageAcceptor;
   }
 
-  /** Report an error on the value of a target property */
-  public void reportTargetPropertyError(String message) {
-    this.targetPropertyErrors.add(message);
-  }
-
   //////////////////////////////////////////////////////////////
   //// Protected methods.
 
@@ -1848,10 +1783,6 @@ private boolean sameType(Type type1, Type type2) {
   /** The declared target. */
   private Target target;
 
-  private List<String> targetPropertyErrors = new ArrayList<>();
-
-  private List<String> targetPropertyWarnings = new ArrayList<>();
-
   //////////////////////////////////////////////////////////////
   //// Private static constants.
 
diff --git a/core/src/main/java/org/lflang/validation/ValidationReporter.java b/core/src/main/java/org/lflang/validation/ValidationReporter.java
deleted file mode 100644
index a2eba3a7ee..0000000000
--- a/core/src/main/java/org/lflang/validation/ValidationReporter.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.lflang.validation;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public interface ValidationReporter {
-    void error(String message, EObject source, EStructuralFeature feature);
-
-    void warning(String message, EObject source, EStructuralFeature feature);
-
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/lflang/validation/ValidatorMessageReporter.java b/core/src/main/java/org/lflang/validation/ValidatorMessageReporter.java
index 387ad37a0f..36a796c81b 100644
--- a/core/src/main/java/org/lflang/validation/ValidatorMessageReporter.java
+++ b/core/src/main/java/org/lflang/validation/ValidatorMessageReporter.java
@@ -28,6 +28,7 @@
 
 import java.nio.file.Path;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
 import org.lflang.MessageReporterBase;
@@ -84,18 +85,16 @@ protected void report(Path path, Range range, DiagnosticSeverity severity, Strin
     reportOnNode(validatorState.getCurrentObject(), severity, fullMessage);
   }
 
-
-
-
   @Override
-  protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+  protected void reportOnNode(
+      EObject node, EStructuralFeature feature, DiagnosticSeverity severity, String message) {
     switch (severity) {
       case Error -> acceptor.acceptError(
-          message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+          message, node, feature, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
       case Warning -> acceptor.acceptWarning(
-          message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+          message, node, feature, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
       case Information, Hint -> acceptor.acceptInfo(
-          message, node, null, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
+          message, node, feature, ValidationMessageAcceptor.INSIGNIFICANT_INDEX, null);
     }
   }
 }
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt
index 4a1215a5f2..b525c8e481 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt
@@ -13,7 +13,7 @@ import org.lflang.lf.TriggerRef
 import org.lflang.lf.VarRef
 import org.lflang.lf.Visibility
 import org.lflang.lf.WidthSpec
-import org.lflang.target.LoggingProperty.LogLevel
+import org.lflang.target.property.LoggingProperty
 
 /*************
  * Copyright (c) 2019-2021, TU Dresden.
@@ -139,13 +139,13 @@ val InferredType.cppType: String
 
 
 /** Convert a log level to a severity number understood by the reactor-cpp runtime. */
-val LogLevel.severity
+val LoggingProperty.LogLevel.severity
     get() = when (this) {
-        LogLevel.ERROR -> 1
-        LogLevel.WARN  -> 2
-        LogLevel.INFO  -> 3
-        LogLevel.LOG   -> 4
-        LogLevel.DEBUG -> 4
+        LoggingProperty.LogLevel.ERROR -> 1
+        LoggingProperty.LogLevel.WARN -> 2
+        LoggingProperty.LogLevel.INFO -> 3
+        LoggingProperty.LogLevel.LOG   -> 4
+        LoggingProperty.LogLevel.DEBUG -> 4
     }
 
 fun Reactor.hasBankIndexParameter() = parameters.firstOrNull { it.name == "bank_index" } != null
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
index 55aaeebd8b..b98dc1d79c 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
@@ -71,7 +71,7 @@ class CppGenerator(
 
         // create a platform-specific generator
         val platformGenerator: CppPlatformGenerator =
-            if (targetConfig.ros2) CppRos2Generator(this) else CppStandaloneGenerator(this)
+            if (targetConfig.ros2.get()) CppRos2Generator(this) else CppStandaloneGenerator(this)
 
         // generate all core files
         generateFiles(platformGenerator.srcGenPath)
@@ -79,7 +79,7 @@ class CppGenerator(
         // generate platform specific files
         platformGenerator.generatePlatformFiles()
 
-        if (targetConfig.noCompile || errorsOccurred()) {
+        if (targetConfig.noCompile.get() || errorsOccurred()) {
             println("Exiting before invoking target compiler.")
             context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, codeMaps))
         } else if (context.mode == Mode.LSP_MEDIUM) {
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
index 07e11cfc18..68e226cbbf 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
@@ -29,7 +29,7 @@ abstract class CppPlatformGenerator(protected val generator: CppGenerator) {
             "-DREACTOR_CPP_VALIDATE=${if (targetConfig.noRuntimeValidation.get()) "OFF" else "ON"}",
             "-DREACTOR_CPP_PRINT_STATISTICS=${if (targetConfig.printStatistics.get()) "ON" else "OFF"}",
             "-DREACTOR_CPP_TRACE=${if (targetConfig.tracing != null) "ON" else "OFF"}",
-            "-DREACTOR_CPP_LOG_LEVEL=${targetConfig.logLevel.severity}",
+            "-DREACTOR_CPP_LOG_LEVEL=${targetConfig.logLevel.get().severity}",
             "-DLF_SRC_PKG_PATH=${fileConfig.srcPkgPath}",
         )
 }
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
index 3284f14924..ae9925d5e5 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
@@ -57,7 +57,7 @@ class CppRos2NodeGenerator(
             |
             |$nodeName::$nodeName(const rclcpp::NodeOptions& node_options)
             |  : Node("$nodeName", node_options) {
-            |  unsigned workers = ${if (targetConfig.workers != 0) targetConfig.workers else "std::thread::hardware_concurrency()"};
+            |  unsigned workers = ${if (targetConfig.workers.get() != 0) targetConfig.workers.get() else "std::thread::hardware_concurrency()"};
             |  bool fast{${targetConfig.fastMode}};
             |  reactor::Duration lf_timeout{${targetConfig.timeout.get()?.toCppCode() ?: "reactor::Duration::max()"}};
             |
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
index 192a5c62a4..94b18181a4 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
@@ -172,7 +172,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
 
         // prepare cmake
         if (targetConfig.compiler != null) {
-            cmd.setEnvironmentVariable("CXX", targetConfig.compiler)
+            cmd.setEnvironmentVariable("CXX", targetConfig.compiler.get())
         }
         return cmd
     }
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt
index 07cd3f8ba2..41679daf4e 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt
@@ -58,9 +58,9 @@ class CppStandaloneMainGenerator(
             |int main(int argc, char **argv) {
             |  cxxopts::Options options("${fileConfig.name}", "Reactor Program");
             |
-            |  unsigned workers = ${if (targetConfig.workers != 0) targetConfig.workers else "std::thread::hardware_concurrency()"};
-            |  bool fast{${targetConfig.fastMode}};
-            |  reactor::Duration timeout = ${targetConfig.timeout?.toCppCode() ?: "reactor::Duration::max()"};
+            |  unsigned workers = ${if (targetConfig.workers.isSet) targetConfig.workers.get() else "std::thread::hardware_concurrency()"};
+            |  bool fast{${targetConfig.fastMode.get()}};
+            |  reactor::Duration timeout = ${if (targetConfig.timeout.isSet) targetConfig.timeout.get().toCppCode() else "reactor::Duration::max()"};
             |  
             |  // the timeout variable needs to be tested beyond fitting the Duration-type 
             |  options
@@ -96,8 +96,8 @@ class CppStandaloneMainGenerator(
             |
             |  // assemble reactor program
             |  e.assemble();
-        ${" |".. if (targetConfig.exportDependencyGraph) "e.export_dependency_graph(\"${main.name}.dot\");" else ""}
-        ${" |".. if (targetConfig.exportToYaml) "e.dump_to_yaml(\"${main.name}.yaml\");" else ""}
+        ${" |".. if (targetConfig.exportDependencyGraph.get()) "e.export_dependency_graph(\"${main.name}.dot\");" else ""}
+        ${" |".. if (targetConfig.exportToYaml.get()) "e.dump_to_yaml(\"${main.name}.yaml\");" else ""}
             |
             |  // start execution
             |  auto thread = e.startup();
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
index b733db66de..bf4a84f9f3 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
@@ -78,7 +78,7 @@ class RustGenerator(
         val gen = RustModelBuilder.makeGenerationInfo(targetConfig, reactors, messageReporter)
         val codeMaps: Map<Path, CodeMap> = RustEmitter.generateRustProject(fileConfig, gen)
 
-        if (targetConfig.noCompile || errorsOccurred()) {
+        if (targetConfig.noCompile.get() || errorsOccurred()) {
             context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, codeMaps))
             println("Exiting before invoking target compiler.")
         } else {
@@ -104,12 +104,12 @@ class RustGenerator(
                 this += buildType.cargoProfileName
             }
 
-            if (targetConfig.rust.cargoFeatures.isNotEmpty()) {
+            if (targetConfig.rust.cargoFeatures.get().isNotEmpty()) {
                 this += "--features"
-                this += targetConfig.rust.cargoFeatures.joinWithCommas()
+                this += targetConfig.rust.cargoFeatures.get().joinWithCommas()
             }
 
-            this += targetConfig.compilerFlags
+            this += targetConfig.compilerFlags.get()
 
             this += listOf("--message-format", "json-diagnostic-rendered-ansi")
         }
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
index d2bef81a4f..b3d69ea548 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
@@ -428,7 +428,7 @@ object RustModelBuilder {
         val mainReactor = reactorsInfos.lastOrNull { it.isMain } ?: reactorsInfos.last()
 
 
-        val dependencies = targetConfig.rust.cargoDependencies.toMutableMap()
+        val dependencies = targetConfig.rust.cargoDependencies.get().toMutableMap()
         dependencies.compute(RustEmitterBase.runtimeCrateFullName) { _, spec ->
             computeDefaultRuntimeConfiguration(spec, targetConfig, messageReporter)
         }
@@ -439,8 +439,8 @@ object RustModelBuilder {
                 version = "1.0.0",
                 authors = listOf(System.getProperty("user.name")),
                 dependencies = dependencies,
-                modulesToIncludeInMain = targetConfig.rust.rustTopLevelModules,
-                enabledCargoFeatures = targetConfig.rust.cargoFeatures.toSet()
+                modulesToIncludeInMain = targetConfig.rust.rustTopLevelModules.get(),
+                enabledCargoFeatures = targetConfig.rust.cargoFeatures.get().toSet()
             ),
             reactors = reactorsInfos,
             mainReactor = mainReactor,
@@ -479,14 +479,14 @@ object RustModelBuilder {
 
             val userRtVersion: String? = targetConfig.runtimeVersion.get()
             // enable parallel feature if asked
-            val parallelFeature = listOf(PARALLEL_RT_FEATURE).takeIf { targetConfig.threading }
+            val parallelFeature = listOf(PARALLEL_RT_FEATURE).takeIf { targetConfig.threading.get() }
 
             val spec = newCargoSpec(
                 features = parallelFeature,
             )
 
             if (targetConfig.externalRuntimePath != null) {
-                spec.localPath = targetConfig.externalRuntimePath
+                spec.localPath = targetConfig.externalRuntimePath.get()
             } else if (userRtVersion != null) {
                 spec.gitRepo = RustEmitterBase.runtimeGitUrl
                 spec.rev = userRtVersion
@@ -497,7 +497,7 @@ object RustModelBuilder {
             return spec
         } else {
             if (targetConfig.externalRuntimePath != null) {
-                userSpec.localPath = targetConfig.externalRuntimePath
+                userSpec.localPath = targetConfig.externalRuntimePath.get()
             }
 
             if (userSpec.localPath == null && userSpec.gitRepo == null) {
@@ -505,11 +505,11 @@ object RustModelBuilder {
             }
 
             // enable parallel feature if asked
-            if (targetConfig.threading) {
+            if (targetConfig.threading.get()) {
                 userSpec.features += PARALLEL_RT_FEATURE
             }
 
-            if (!targetConfig.threading && PARALLEL_RT_FEATURE in userSpec.features) {
+            if (!targetConfig.threading.get() && PARALLEL_RT_FEATURE in userSpec.features) {
                 messageReporter.nowhere().warning("Threading cannot be disabled as it was enabled manually as a runtime feature.")
             }
 
@@ -520,11 +520,11 @@ object RustModelBuilder {
     private fun TargetConfig.toRustProperties(): RustTargetProperties =
         RustTargetProperties(
             keepAlive = this.keepalive.get(),
-            timeout = this.timeout?.toRustTimeExpr(),
-            timeoutLf = this.timeout,
-            singleFile = this.singleFileProject,
-            workers = this.workers,
-            dumpDependencyGraph = this.exportDependencyGraph,
+            timeout = this.timeout.get()?.toRustTimeExpr(),
+            timeoutLf = this.timeout.get(),
+            singleFile = this.singleFileProject.get(),
+            workers = this.workers.get(),
+            dumpDependencyGraph = this.exportDependencyGraph.get(),
         )
 
     private fun makeReactorInfos(reactors: List<Reactor>): List<ReactorInfo> =
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
index a9f1e60be4..c4a3213bdc 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -94,8 +94,8 @@ class TSGenerator(
 
     init {
         // Set defaults for federate compilation.
-        targetConfig.compiler = "gcc"
-        targetConfig.compilerFlags.add("-O2")
+        targetConfig.compiler.override("gcc")
+        targetConfig.compilerFlags.get().add("-O2")
     }
 
     /** Generate TypeScript code from the Lingua Franca model contained by the
@@ -131,7 +131,7 @@ class TSGenerator(
         // For small programs, everything up until this point is virtually instantaneous. This is the point where cancellation,
         // progress reporting, and IDE responsiveness become real considerations.
 
-        if (context.mode != LFGeneratorContext.Mode.LSP_MEDIUM && targetConfig.noCompile) {
+        if (context.mode != LFGeneratorContext.Mode.LSP_MEDIUM && targetConfig.noCompile.get()) {
             context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, null))
         } else {
             context.reportProgress(
@@ -142,7 +142,7 @@ class TSGenerator(
                 context.unsuccessfulFinish()
                 return
             }
-            if (targetConfig.protoFiles.size != 0) {
+            if (targetConfig.protoFiles.get().size != 0) {
                 protoc()
             } else {
                 println("No .proto files have been imported. Skipping protocol buffer compilation.")
@@ -246,7 +246,7 @@ class TSGenerator(
         val tsCode = StringBuilder()
 
         val preambleGenerator = TSImportPreambleGenerator(fileConfig.srcFile,
-            targetConfig.protoFiles, preambles)
+            targetConfig.protoFiles.get(), preambles)
         tsCode.append(preambleGenerator.generatePreamble())
 
         val parameterGenerator = TSParameterPreambleGenerator(fileConfig, targetConfig, reactors)
@@ -348,7 +348,7 @@ class TSGenerator(
     }
 
     private fun installProtoBufsIfNeeded(pnpmIsAvailable: Boolean, cwd: Path, cancelIndicator: CancelIndicator) {
-        if (targetConfig.protoFiles.size != 0) {
+        if (targetConfig.protoFiles.get().size != 0) {
             commandFactory.createCommand(
                 if (pnpmIsAvailable) "pnpm" else "npm",
                 listOf("install", "google-protobuf"),
@@ -375,7 +375,7 @@ class TSGenerator(
                 "--ts_out=$tsOutPath"
             )
         )
-        protocArgs.addAll(targetConfig.protoFiles)
+        protocArgs.addAll(targetConfig.protoFiles.get())
         val protoc = commandFactory.createCommand("protoc", protocArgs, fileConfig.srcPath)
 
         if (protoc == null) {
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
index 305369832e..dc68c7f2f9 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
@@ -27,7 +27,6 @@ package org.lflang.generator.ts
 
 import org.lflang.FileConfig
 import org.lflang.TargetConfig
-import org.lflang.joinWithCommasLn
 import org.lflang.joinWithLn
 import org.lflang.lf.Parameter
 import org.lflang.lf.Reactor
@@ -50,7 +49,7 @@ class TSParameterPreambleGenerator(
 ) {
 
     private fun getTimeoutTimeValue(): String =
-        targetConfig.timeout?.toTsTime() ?: "undefined"
+        targetConfig.timeout.get()?.toTsTime() ?: "undefined"
 
     private fun getParameters(): List<Parameter> {
         var mainReactor: Reactor? = null
@@ -236,7 +235,7 @@ class TSParameterPreambleGenerator(
         |        throw new Error("'logging' command line argument is malformed.");
         |    }
         |} else {
-        |    Log.global.level = Log.levels.${targetConfig.logLevel.name}; // Default from target property.
+        |    Log.global.level = Log.levels.${targetConfig.logLevel.get().name}; // Default from target property.
         |}
         |
         |// Help parameter (not a constructor parameter, but a command line option)
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 628d8cef4b..498fcecdc9 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -46,16 +46,16 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.lflang.Target;
 import org.lflang.TargetProperty;
-import org.lflang.target.property.type.ArrayType;
 import org.lflang.TargetProperty.DictionaryElement;
 import org.lflang.TimeValue;
 import org.lflang.lf.LfPackage;
 import org.lflang.lf.Model;
 import org.lflang.lf.Visibility;
+import org.lflang.target.property.type.ArrayType;
 import org.lflang.target.property.type.DictionaryType;
+import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.StringDictionaryType;
 import org.lflang.target.property.type.TargetPropertyType;
-import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.UnionType;
 import org.lflang.tests.LFInjectorProvider;
 import org.lflang.util.StringUtil;
@@ -1444,7 +1444,7 @@ private List<String> synthesizeExamples(TargetPropertyType type, boolean correct
    * the resulting model.
    */
   private Model createModel(TargetProperty key, String value) throws Exception {
-    String target = key.supportedBy.get(0).getDisplayName();
+    var target = TargetProperty.getPropertyInstance(key).supportedTargets().stream().findFirst();
     return parseWithoutError(
         """
                 target %s {%s: %s};
@@ -1461,22 +1461,23 @@ private Model createModel(TargetProperty key, String value) throws Exception {
   public Collection<DynamicTest> checkTargetProperties() throws Exception {
     List<DynamicTest> result = new ArrayList<>();
 
-    for (TargetProperty prop : TargetProperty.getOptions()) {
-      if (prop == TargetProperty.CARGO_DEPENDENCIES) {
+    for (TargetProperty property : TargetProperty.getOptions()) {
+      if (property == TargetProperty.CARGO_DEPENDENCIES) {
         // we test that separately as it has better error messages
         continue;
       }
-      List<String> knownCorrect = synthesizeExamples(prop.type, true);
+      var type = TargetProperty.getPropertyInstance(property).type;
+      List<String> knownCorrect = synthesizeExamples(type, true);
 
       for (String it : knownCorrect) {
         var test =
             DynamicTest.dynamicTest(
-                "Property %s (%s) - known good assignment: %s".formatted(prop, prop.type, it),
+                "Property %s (%s) - known good assignment: %s".formatted(property, type, it),
                 () -> {
-                  Model model = createModel(prop, it);
+                  Model model = createModel(property, it);
                   validator.assertNoErrors(model);
                   // Also make sure warnings are produced when files are not present.
-                  if (prop.type == PrimitiveType.FILE) {
+                  if (type == PrimitiveType.FILE) {
                     validator.assertWarning(
                         model,
                         LfPackage.eINSTANCE.getKeyValuePair(),
@@ -1502,47 +1503,47 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
       //                ]
       //            }
 
-      List<String> knownIncorrect = synthesizeExamples(prop.type, false);
+      List<String> knownIncorrect = synthesizeExamples(type, false);
       if (!(knownIncorrect == null || knownIncorrect.isEmpty())) {
         for (String it : knownIncorrect) {
           var test =
               DynamicTest.dynamicTest(
-                  "Property %s (%s) - known bad assignment: %s".formatted(prop, prop.type, it),
+                  "Property %s (%s) - known bad assignment: %s".formatted(property, type, it),
                   () -> {
-                    if (prop.type instanceof StringDictionaryType) {
+                    if (type instanceof StringDictionaryType) {
                       validator.assertError(
-                          createModel(prop, it),
+                          createModel(property, it),
                           LfPackage.eINSTANCE.getKeyValuePair(),
                           null,
-                          String.format("Target property '%s.", prop),
+                          String.format("Target property '%s.", property),
                           "' is required to be a string.");
                     } else {
                       validator.assertError(
-                          createModel(prop, it),
+                          createModel(property, it),
                           LfPackage.eINSTANCE.getKeyValuePair(),
                           null,
                           String.format(
-                              "Target property '%s' is required to be %s.", prop, prop.type));
+                              "Target property '%s' is required to be %s.", property, type));
                     }
                   });
           result.add(test);
         }
       } else {
         // No type was synthesized. It must be a composite type.
-        List<List<Object>> list = compositeTypeToKnownBad.get(prop.type);
+        List<List<Object>> list = compositeTypeToKnownBad.get(type);
         if (list != null) {
           for (List<Object> it : list) {
             var test =
                 DynamicTest.dynamicTest(
-                    "Property %s (%s) - known bad assignment: %s".formatted(prop, prop.type, it),
+                    "Property %s (%s) - known bad assignment: %s".formatted(property, type, it),
                     () ->
                         validator.assertError(
-                            createModel(prop, it.get(0).toString()),
+                            createModel(property, it.get(0).toString()),
                             LfPackage.eINSTANCE.getKeyValuePair(),
                             null,
                             String.format(
                                 "Target property '%s%s' is required to be %s.",
-                                prop, it.get(1), it.get(2))));
+                                property, it.get(1), it.get(2))));
             result.add(test);
           }
         }
diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index 436e9585ca..0bd79016ca 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -24,9 +24,8 @@
 
 package org.lflang.tests;
 
-import org.lflang.TargetProperty;
-import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.target.property.LoggingProperty.LogLevel;
+import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.tests.TestRegistry.TestCategory;
 
 /**
@@ -66,8 +65,8 @@ public static boolean disableThreading(LFTest test) {
 
   public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
     test.getContext().getArgs().setProperty("tracing", "false");
-    test.getContext().getTargetConfig().setByUser.add(TargetProperty.THREADING);
-    test.getContext().getTargetConfig().threading = false;
+    test.getContext().getTargetConfig().threading.override(false);
+    // FIXME: use a record and override.
     test.getContext().getTargetConfig().platformOptions.get().platform = Platform.ZEPHYR;
     test.getContext().getTargetConfig().platformOptions.get().flash = false;
     test.getContext().getTargetConfig().platformOptions.get().board = "qemu_cortex_m3";
@@ -118,7 +117,7 @@ public static boolean compatibleWithThreadingOff(TestCategory category) {
             || category == TestCategory.ZEPHYR_THREADED;
 
     // SERIALIZATION and TARGET tests are excluded on Windows.
-    excluded |= TestBase.isWindows() && (category == TestCategory.TARGET);
+    excluded |= TestBase.isWindows() && category == TestCategory.TARGET;
     return !excluded;
   }
 }

From 39b0161289efbb5740d2f2d10d915ce3c1276248 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 27 Sep 2023 21:40:36 -0700
Subject: [PATCH 0918/1114] Apply formatter

---
 core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index e3c03da378..c24fc60ac2 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -328,7 +328,8 @@ CodeBuilder generateCMakeCode(
       cMakeCode.newLine();
     }
 
-    if (targetConfig.threading.get() && targetConfig.platformOptions.get().platform != Platform.ZEPHYR) {
+    if (targetConfig.threading.get()
+        && targetConfig.platformOptions.get().platform != Platform.ZEPHYR) {
       // If threaded computation is requested, add the threads option.
       cMakeCode.pr("# Find threads and link to it");
       cMakeCode.pr("find_package(Threads REQUIRED)");

From 3eb35de90ff3af25815732ccdef72cf5181c0e8c Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 28 Sep 2023 00:43:53 -0700
Subject: [PATCH 0919/1114] Some fixes and a fixme

---
 .../main/java/org/lflang/TargetProperty.java  | 27 ++++++++++++++++---
 .../launcher/FedLauncherGenerator.java        |  2 +-
 .../org/lflang/generator/c/CGenerator.java    |  4 +--
 .../generator/c/CPreambleGenerator.java       |  7 +++--
 .../generator/cpp/CppPlatformGenerator.kt     |  2 +-
 .../compiler/LinguaFrancaValidationTest.java  |  7 ++---
 6 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 005405bc49..25a705ea0a 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -37,6 +37,7 @@
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
+import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
 import org.lflang.lf.TargetDecl;
 import org.lflang.target.property.AuthProperty;
@@ -333,6 +334,11 @@ public static List<KeyValuePair> extractProperties(TargetConfig config) {
     return res;
   }
 
+  /**
+   * Return all the target properties that have been set.
+   *
+   * @param config The configuration to find the properties in.
+   */
   public static List<TargetProperty> loaded(TargetConfig config) {
     return Arrays.stream(TargetProperty.values())
         .filter(it -> it.property.of(config).isSet())
@@ -373,14 +379,27 @@ public static KeyValuePair getKeyValuePair(Model ast, TargetProperty property) {
 
   public static void validate(
       KeyValuePairs pairs, Model ast, TargetConfig config, ValidatorMessageReporter reporter) {
-    Arrays.stream(TargetProperty.values())
+    pairs.getPairs().stream()
         .forEach(
-            p -> {
-              var pair = getKeyValuePair(pairs, p);
-              if (pair != null) {
+            pair -> {
+              var match =
+                  Arrays.stream(TargetProperty.values())
+                      .filter(prop -> prop.name().equalsIgnoreCase(pair.getName()))
+                      .findAny();
+              if (match.isPresent()) {
+                var p = match.get();
                 p.property.of(config).checkSupport(pair, config, reporter);
                 p.property.of(config).checkType(pair, config, reporter);
                 p.property.of(config).validate(pair, ast, config, reporter);
+              } else {
+                // FIXME: not showing up...
+                reporter
+                    .at(pair, Literals.KEY_VALUE_PAIR__NAME)
+                    .warning(
+                        "Unrecognized target parameter: "
+                            + pair.getName()
+                            + ". Recognized parameters are: "
+                            + TargetProperty.values());
               }
             });
   }
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index da4081b753..61d3deef77 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -337,7 +337,7 @@ private String getRtiCommand(List<FederateInstance> federates, boolean isRemote)
     if (targetConfig.auth.get()) {
       commands.add("                        -a \\");
     }
-    if (targetConfig.tracing != null) {
+    if (targetConfig.tracing.get().isEnabled()) {
       commands.add("                        -t \\");
     }
     commands.addAll(
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 4ee4b0f6d3..6138f6d54a 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -1404,7 +1404,7 @@ private void recordBuiltinTriggers(ReactorInstance instance) {
           foundOne = true;
           enclaveInfo.numShutdownReactions += reactor.getTotalWidth();
 
-          if (targetConfig.tracing != null) {
+          if (targetConfig.tracing.get().isEnabled()) {
             var description = CUtil.getShortenedName(reactor);
             var reactorRef = CUtil.reactorRef(reactor);
             var envTraceRef = CUtil.getEnvironmentStruct(reactor) + ".trace";
@@ -1687,7 +1687,7 @@ public static String variableStructType(TriggerInstance<?> portOrAction) {
    * @param instance The reactor instance.
    */
   private void generateTraceTableEntries(ReactorInstance instance) {
-    if (targetConfig.tracing != null) {
+    if (targetConfig.tracing.get().isEnabled()) {
       initializeTriggerObjects.pr(CTracingGenerator.generateTraceTableEntries(instance));
     }
   }
diff --git a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
index fbba2f01a0..0c0cc7c911 100644
--- a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
@@ -26,7 +26,7 @@
 public class CPreambleGenerator {
   /** Add necessary source files specific to the target language. */
   public static String generateIncludeStatements(TargetConfig targetConfig, boolean cppMode) {
-    var tracing = targetConfig.tracing;
+
     CodeBuilder code = new CodeBuilder();
     if (cppMode || targetConfig.platformOptions.get().platform == Platform.ARDUINO) {
       code.pr("extern \"C\" {");
@@ -41,7 +41,7 @@ public static String generateIncludeStatements(TargetConfig targetConfig, boolea
       code.pr("#include \"include/core/threaded/scheduler.h\"");
     }
 
-    if (tracing != null) {
+    if (targetConfig.tracing.get().isEnabled()) {
       code.pr("#include \"include/core/trace.h\"");
     }
     code.pr("#include \"include/core/mixed_radix.h\"");
@@ -62,14 +62,13 @@ public static String generateIncludeStatements(TargetConfig targetConfig, boolea
   public static String generateDefineDirectives(
       TargetConfig targetConfig, Path srcGenPath, boolean hasModalReactors) {
     int logLevel = targetConfig.logLevel.get().ordinal();
-    var coordinationType = targetConfig.coordination;
     var tracing = targetConfig.tracing.get();
     CodeBuilder code = new CodeBuilder();
     // TODO: Get rid of all of these
     code.pr("#define LOG_LEVEL " + logLevel);
     code.pr("#define TARGET_FILES_DIRECTORY " + addDoubleQuotes(srcGenPath.toString()));
 
-    if (tracing != null) {
+    if (tracing.isEnabled()) {
       targetConfig.compileDefinitions.get().put("LF_TRACE", tracing.traceFileName);
     }
     // if (clockSyncIsOn) {
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
index 68e226cbbf..8e44d95940 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
@@ -28,7 +28,7 @@ abstract class CppPlatformGenerator(protected val generator: CppGenerator) {
             "-DCMAKE_BUILD_TYPE=${targetConfig.buildType}",
             "-DREACTOR_CPP_VALIDATE=${if (targetConfig.noRuntimeValidation.get()) "OFF" else "ON"}",
             "-DREACTOR_CPP_PRINT_STATISTICS=${if (targetConfig.printStatistics.get()) "ON" else "OFF"}",
-            "-DREACTOR_CPP_TRACE=${if (targetConfig.tracing != null) "ON" else "OFF"}",
+            "-DREACTOR_CPP_TRACE=${if (targetConfig.tracing.get().isEnabled) "ON" else "OFF"}",
             "-DREACTOR_CPP_LOG_LEVEL=${targetConfig.logLevel.get().severity}",
             "-DLF_SRC_PKG_PATH=${fileConfig.srcPkgPath}",
         )
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 498fcecdc9..5039b92ab8 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -1444,7 +1444,8 @@ private List<String> synthesizeExamples(TargetPropertyType type, boolean correct
    * the resulting model.
    */
   private Model createModel(TargetProperty key, String value) throws Exception {
-    var target = TargetProperty.getPropertyInstance(key).supportedTargets().stream().findFirst();
+    var target =
+        TargetProperty.getPropertyInstance(key).supportedTargets().stream().findFirst().get();
     return parseWithoutError(
         """
                 target %s {%s: %s};
@@ -1781,13 +1782,13 @@ public void testOverflowingDeadline() throws Exception {
   public void testInvalidTargetParam() throws Exception {
     String testCase =
         """
-                target C { beefyDesktop: true }
+                target C { foobarbaz: true }
                 main reactor {}
             """;
     List<Issue> issues = validator.validate(parseWithoutError(testCase));
     Assertions.assertTrue(
         issues.size() == 1
-            && issues.get(0).getMessage().contains("Unrecognized target parameter: beefyDesktop"));
+            && issues.get(0).getMessage().contains("Unrecognized target parameter: foobarbaz"));
   }
 
   @Test

From a3531a18a90cbd1dde5b1279f01802984b7fd8a4 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 28 Sep 2023 11:29:13 +0200
Subject: [PATCH 0920/1114] fix NPE

---
 core/src/main/java/org/lflang/generator/c/CGenerator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 6138f6d54a..e0726cd21e 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -634,7 +634,7 @@ private void generateCodeFor(String lfModuleName) throws IOException {
 
       code.pr(envFuncGen.generateDefinitions());
 
-      if (targetConfig.fedSetupPreamble != null) {
+      if (targetConfig.fedSetupPreamble.isSet()) {
         if (targetLanguageIsCpp()) code.pr("extern \"C\" {");
         code.pr("#include \"" + targetConfig.fedSetupPreamble + "\"");
         if (targetLanguageIsCpp()) code.pr("}");

From b7b457dfe6e1ed926db92dd6052968f6374c80e6 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 28 Sep 2023 11:30:12 +0200
Subject: [PATCH 0921/1114] IntelliJ code suggestions

---
 core/src/main/java/org/lflang/TargetProperty.java             | 4 +---
 .../org/lflang/tests/compiler/LinguaFrancaValidationTest.java | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 25a705ea0a..d87df988c6 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -273,9 +273,7 @@ private interface ConfigLoader {
   public static TargetPropertyConfig<?> getPropertyInstance(TargetProperty p) {
     try {
       return p.propertyClass.newInstance();
-    } catch (InstantiationException e) {
-      throw new RuntimeException(e);
-    } catch (IllegalAccessException e) {
+    } catch (InstantiationException | IllegalAccessException e) {
       throw new RuntimeException(e);
     }
   }
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 5039b92ab8..e012eb6788 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -1350,7 +1350,7 @@ private List<String> synthesizeExamples(UnionType type, boolean correct) {
     if (correct) {
       for (Enum<?> it : type.options) {
         if (it instanceof TargetPropertyType) {
-          synthesizeExamples((TargetPropertyType) it, correct).forEach(ex -> examples.add(ex));
+          examples.addAll(synthesizeExamples((TargetPropertyType) it, correct));
         } else {
           examples.add(it.toString());
         }
@@ -1358,7 +1358,7 @@ private List<String> synthesizeExamples(UnionType type, boolean correct) {
     } else {
       // Return some obviously bad examples for the common
       // case where the options are from an ordinary Enum<?>.
-      if (!type.options.stream().anyMatch(it -> it instanceof TargetPropertyType)) {
+      if (type.options.stream().noneMatch(it -> it instanceof TargetPropertyType)) {
         return List.of("foo", "\"bar\"", "1", "-1", "{x: 42}", "[1, 2, 3]");
       }
     }

From c617b49e993a1cbcf30b57a765d84cd5869b442d Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 28 Sep 2023 11:52:20 +0200
Subject: [PATCH 0922/1114] fix error reporting on estructural elements

---
 core/src/main/java/org/lflang/MessageReporterBase.java | 2 +-
 core/src/main/java/org/lflang/TargetProperty.java      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/MessageReporterBase.java b/core/src/main/java/org/lflang/MessageReporterBase.java
index b195a80319..edd39d2799 100644
--- a/core/src/main/java/org/lflang/MessageReporterBase.java
+++ b/core/src/main/java/org/lflang/MessageReporterBase.java
@@ -45,7 +45,7 @@ public Stage2 at(EObject node) {
 
   @Override
   public Stage2 at(EObject node, EStructuralFeature feature) {
-    return null;
+    return wrap((severity, message) -> reportOnNode(node, feature, severity, message));
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index d87df988c6..84dfbd0c17 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -390,7 +390,6 @@ public static void validate(
                 p.property.of(config).checkType(pair, config, reporter);
                 p.property.of(config).validate(pair, ast, config, reporter);
               } else {
-                // FIXME: not showing up...
                 reporter
                     .at(pair, Literals.KEY_VALUE_PAIR__NAME)
                     .warning(

From ed6d91b518377e6ac1780489a6532252591ffdc1 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 28 Sep 2023 11:55:10 +0200
Subject: [PATCH 0923/1114] correctly list all the valid target properties

---
 .../main/java/org/lflang/TargetProperty.java   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 84dfbd0c17..508a6332ec 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -270,6 +270,17 @@ private interface ConfigLoader {
     this.property = property;
   }
 
+  /**
+   * Return key ot the property as it will be used in LF code.
+   *
+   * <p>Keys are of the form <code>foo-bar</code>.
+   *
+   * @return the property's key
+   */
+  public String getKey() {
+    return name().toLowerCase().replace('_', '-');
+  }
+
   public static TargetPropertyConfig<?> getPropertyInstance(TargetProperty p) {
     try {
       return p.propertyClass.newInstance();
@@ -375,6 +386,11 @@ public static KeyValuePair getKeyValuePair(Model ast, TargetProperty property) {
     return getKeyValuePair(ast.getTarget().getConfig(), property);
   }
 
+  /** Return a list containing the keys of all properties */
+  public static List<String> getPropertyKeys() {
+    return Arrays.stream(TargetProperty.values()).map(TargetProperty::getKey).toList();
+  }
+
   public static void validate(
       KeyValuePairs pairs, Model ast, TargetConfig config, ValidatorMessageReporter reporter) {
     pairs.getPairs().stream()
@@ -396,7 +412,7 @@ public static void validate(
                         "Unrecognized target parameter: "
                             + pair.getName()
                             + ". Recognized parameters are: "
-                            + TargetProperty.values());
+                            + getPropertyKeys());
               }
             });
   }

From 20d911b4d63b42ca69b180cb5c29c19a3c17271b Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 28 Sep 2023 11:59:17 +0200
Subject: [PATCH 0924/1114] null safety

---
 core/src/main/java/org/lflang/TargetPropertyConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/TargetPropertyConfig.java b/core/src/main/java/org/lflang/TargetPropertyConfig.java
index 4382d0ecf4..35fc6936a5 100644
--- a/core/src/main/java/org/lflang/TargetPropertyConfig.java
+++ b/core/src/main/java/org/lflang/TargetPropertyConfig.java
@@ -110,7 +110,7 @@ public boolean isSet() {
 
   @Override
   public String toString() {
-    return value.toString();
+    return value == null ? null : value.toString();
   }
 
   public void markSet() {

From b3e6d9639fd914a18d7104fb71361e07719f8d39 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 28 Sep 2023 08:36:59 -0700
Subject: [PATCH 0925/1114] Fix conflict

---
 core/src/main/java/org/lflang/TargetProperty.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 508a6332ec..7740516559 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -25,6 +25,7 @@
 
 package org.lflang;
 
+import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.LinkedList;
@@ -283,8 +284,8 @@ public String getKey() {
 
   public static TargetPropertyConfig<?> getPropertyInstance(TargetProperty p) {
     try {
-      return p.propertyClass.newInstance();
-    } catch (InstantiationException | IllegalAccessException e) {
+      return p.propertyClass.getDeclaredConstructor().newInstance();
+    } catch (ReflectiveOperationException e) {
       throw new RuntimeException(e);
     }
   }

From a22550bcaabbf4dd0c6b48d228aa3b8ec92dadc3 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 29 Sep 2023 00:16:52 -0700
Subject: [PATCH 0926/1114] Minor bugfixes

---
 .../main/java/org/lflang/TargetConfig.java    | 71 ++++++++++---------
 .../main/java/org/lflang/TargetProperty.java  |  6 +-
 .../federated/generator/FedGenerator.java     |  7 +-
 .../federated/generator/FedTargetConfig.java  |  3 +-
 .../target/property/DockerProperty.java       |  1 +
 .../target/property/TracingProperty.java      |  4 +-
 .../target/property/type/UnionType.java       |  2 +
 .../compiler/LinguaFrancaValidationTest.java  | 21 ++----
 8 files changed, 56 insertions(+), 59 deletions(-)

diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index 06fa8008b0..4e35f7a587 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -99,7 +99,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
     this(target);
     if (target.getConfig() != null) {
       List<KeyValuePair> pairs = target.getConfig().getPairs();
-      TargetProperty.load(this, pairs != null ? pairs : List.of(), messageReporter);
+      TargetProperty.load(this, pairs, messageReporter);
     }
 
     if (cliArgs != null) {
@@ -112,7 +112,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
    * designated compiler. A common usage of this target property is to set the command to build on
    * the basis of a Makefile.
    */
-  public BuildCommandsProperty buildCommands = new BuildCommandsProperty();
+  public final BuildCommandsProperty buildCommands = new BuildCommandsProperty();
 
   /**
    * The mode of clock synchronization to be used in federated programs. The default is 'initial'.
@@ -123,16 +123,16 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
   public final ClockSyncOptionsProperty clockSyncOptions = new ClockSyncOptionsProperty();
 
   /** Parameter passed to cmake. The default is 'Release'. */
-  public BuildTypeProperty buildType = new BuildTypeProperty();
+  public final BuildTypeProperty buildType = new BuildTypeProperty();
 
   /** Optional additional extensions to include in the generated CMakeLists.txt. */
-  public CmakeIncludeProperty cmakeIncludes = new CmakeIncludeProperty();
+  public final CmakeIncludeProperty cmakeIncludes = new CmakeIncludeProperty();
 
   /** The compiler to invoke, unless a build command has been specified. */
-  public CompilerProperty compiler = new CompilerProperty();
+  public final CompilerProperty compiler = new CompilerProperty();
 
   /** Additional sources to add to the compile command if appropriate. */
-  public List<String> compileAdditionalSources = new ArrayList<>();
+  public final List<String> compileAdditionalSources = new ArrayList<>();
 
   /**
    * Additional (preprocessor) definitions to add to the compile command if appropriate.
@@ -140,55 +140,55 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
    * <p>The first string is the definition itself, and the second string is the value to attribute
    * to that definition, if any. The second value could be left empty.
    */
-  public CompileDefinitionsProperty compileDefinitions = new CompileDefinitionsProperty();
+  public final CompileDefinitionsProperty compileDefinitions = new CompileDefinitionsProperty();
 
   /** Flags to pass to the compiler, unless a build command has been specified. */
-  public CompilerFlagsProperty compilerFlags = new CompilerFlagsProperty();
+  public final CompilerFlagsProperty compilerFlags = new CompilerFlagsProperty();
 
   /**
    * The type of coordination used during the execution of a federated program. The default is
    * 'centralized'.
    */
-  public CoordinationModeProperty coordination = new CoordinationModeProperty();
+  public final CoordinationModeProperty coordination = new CoordinationModeProperty();
 
   /** Docker options. */
-  public DockerProperty dockerOptions = new DockerProperty();
+  public final DockerProperty dockerOptions = new DockerProperty();
 
   /** Coordination options. */
-  public CoordinationOptionsProperty coordinationOptions = new CoordinationOptionsProperty();
+  public final CoordinationOptionsProperty coordinationOptions = new CoordinationOptionsProperty();
 
   /** Link to an external runtime library instead of the default one. */
-  public ExternalRuntimePathProperty externalRuntimePath = new ExternalRuntimePathProperty();
+  public final ExternalRuntimePathProperty externalRuntimePath = new ExternalRuntimePathProperty();
 
   /**
    * If true, configure the execution environment such that it does not wait for physical time to
    * match logical time. The default is false.
    */
-  public FastProperty fastMode = new FastProperty();
+  public final FastProperty fastMode = new FastProperty();
 
   /** List of files to be copied to src-gen. */
-  public FilesProperty files = new FilesProperty();
+  public final FilesProperty files = new FilesProperty();
 
   /**
    * If true, configure the execution environment to keep executing if there are no more events on
    * the event queue. The default is false.
    */
-  public KeepaliveProperty keepalive = new KeepaliveProperty();
+  public final KeepaliveProperty keepalive = new KeepaliveProperty();
 
   /** The level of logging during execution. The default is INFO. */
-  public LoggingProperty logLevel = new LoggingProperty();
+  public final LoggingProperty logLevel = new LoggingProperty();
 
   /** Flags to pass to the linker, unless a build command has been specified. */
   public String linkerFlags = "";
 
   /** If true, do not invoke the target compiler or build command. The default is false. */
-  public NoCompileProperty noCompile = new NoCompileProperty();
+  public final NoCompileProperty noCompile = new NoCompileProperty();
 
   /** If true, do not perform runtime validation. The default is false. */
-  public NoRuntimeValidationProperty noRuntimeValidation = new NoRuntimeValidationProperty();
+  public final NoRuntimeValidationProperty noRuntimeValidation = new NoRuntimeValidationProperty();
 
   /** If true, check the generated verification model. The default is false. */
-  public VerifyProperty verify = new VerifyProperty();
+  public final VerifyProperty verify = new VerifyProperty();
 
   /**
    * Set the target platform config. This tells the build system what platform-specific support
@@ -197,46 +197,46 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
    * <p>This is now a wrapped class to account for overloaded definitions of defining platform
    * (either a string or dictionary of values)
    */
-  public PlatformProperty platformOptions = new PlatformProperty();
+  public final PlatformProperty platformOptions = new PlatformProperty();
 
   /** If true, instruct the runtime to collect and print execution statistics. */
-  public PrintStatisticsProperty printStatistics = new PrintStatisticsProperty();
+  public final PrintStatisticsProperty printStatistics = new PrintStatisticsProperty();
 
   /** List of proto files to be processed by the code generator. */
-  public ProtobufsProperty protoFiles = new ProtobufsProperty();
+  public final ProtobufsProperty protoFiles = new ProtobufsProperty();
 
   /** If true, generate ROS2 specific code. */
-  public Ros2Property ros2 = new Ros2Property();
+  public final Ros2Property ros2 = new Ros2Property();
 
   /** Additional ROS2 packages that the LF program depends on. */
-  public Ros2DependenciesProperty ros2Dependencies = new Ros2DependenciesProperty();
+  public final Ros2DependenciesProperty ros2Dependencies = new Ros2DependenciesProperty();
 
   /** The version of the runtime library to be used in the generated target. */
-  public RuntimeVersionProperty runtimeVersion = new RuntimeVersionProperty();
+  public final RuntimeVersionProperty runtimeVersion = new RuntimeVersionProperty();
 
   /** Whether all reactors are to be generated into a single target language file. */
-  public SingleFileProjectProperty singleFileProject = new SingleFileProjectProperty();
+  public final SingleFileProjectProperty singleFileProject = new SingleFileProjectProperty();
 
   /** What runtime scheduler to use. */
-  public SchedulerProperty schedulerType = new SchedulerProperty();
+  public final SchedulerProperty schedulerType = new SchedulerProperty();
 
   /**
    * The number of worker threads to deploy. The default is zero, which indicates that the runtime
    * is allowed to freely choose the number of workers.
    */
-  public WorkersProperty workers = new WorkersProperty();
+  public final WorkersProperty workers = new WorkersProperty();
 
   /** Indicate whether HMAC authentication is used. */
-  public AuthProperty auth = new AuthProperty();
+  public final AuthProperty auth = new AuthProperty();
 
   /** Indicate whether the runtime should use multithreaded execution. */
-  public ThreadingProperty threading = new ThreadingProperty();
+  public final ThreadingProperty threading = new ThreadingProperty();
 
   /** The timeout to be observed during execution of the program. */
-  public TimeOutProperty timeout = new TimeOutProperty();
+  public final TimeOutProperty timeout = new TimeOutProperty();
 
   /** If non-null, configure the runtime environment to perform tracing. The default is null. */
-  public TracingProperty tracing = new TracingProperty();
+  public final TracingProperty tracing = new TracingProperty();
 
   /**
    * If true, the resulting binary will output a graph visualizing all reaction dependencies.
@@ -244,7 +244,8 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
    * <p>This option is currently only used for C++ and Rust. This export function is a valuable tool
    * for debugging LF programs and helps to understand the dependencies inferred by the runtime.
    */
-  public ExportDependencyGraphProperty exportDependencyGraph = new ExportDependencyGraphProperty();
+  public final ExportDependencyGraphProperty exportDependencyGraph =
+      new ExportDependencyGraphProperty();
 
   /**
    * If true, the resulting binary will output a yaml file describing the whole reactor structure of
@@ -253,11 +254,11 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
    * <p>This option is currently only used for C++. This export function is a valuable tool for
    * debugging LF programs and performing external analysis.
    */
-  public ExportToYamlProperty exportToYaml = new ExportToYamlProperty();
+  public final ExportToYamlProperty exportToYaml = new ExportToYamlProperty();
 
   /** Rust-specific configuration. */
   public final RustTargetConfig rust = new RustTargetConfig();
 
   /** Path to a C file used by the Python target to setup federated execution. */
-  public FedSetupProperty fedSetupPreamble = new FedSetupProperty();
+  public final FedSetupProperty fedSetupPreamble = new FedSetupProperty();
 }
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 7740516559..a5095b9d45 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -25,7 +25,6 @@
 
 package org.lflang;
 
-import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.LinkedList;
@@ -311,6 +310,9 @@ public static void load(TargetConfig config, Properties properties, MessageRepor
    * @param err Error reporter on which property format errors will be reported
    */
   public static void load(TargetConfig config, List<KeyValuePair> properties, MessageReporter err) {
+    if (properties == null) {
+      return;
+    }
     properties.forEach(
         property -> {
           TargetProperty p = forName(property.getName());
@@ -399,7 +401,7 @@ public static void validate(
             pair -> {
               var match =
                   Arrays.stream(TargetProperty.values())
-                      .filter(prop -> prop.name().equalsIgnoreCase(pair.getName()))
+                      .filter(prop -> prop.toString().equalsIgnoreCase(pair.getName()))
                       .findAny();
               if (match.isPresent()) {
                 var p = match.get();
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index b23ef6a085..91583b8865 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -193,11 +193,14 @@ private void generateLaunchScript() {
    * @param subContexts The subcontexts in which the federates have been compiled.
    */
   private void createDockerFiles(LFGeneratorContext context, List<SubContext> subContexts) {
-    if (context.getTargetConfig().dockerOptions == null) return;
+    if (!context.getTargetConfig().dockerOptions.isSet()) return;
     final List<DockerData> services = new ArrayList<>();
     // 1. create a Dockerfile for each federate
     for (SubContext subContext : subContexts) { // Inherit Docker options from main context
-      subContext.getTargetConfig().dockerOptions = context.getTargetConfig().dockerOptions;
+      subContext
+          .getTargetConfig()
+          .dockerOptions
+          .override(context.getTargetConfig().dockerOptions.get());
       var dockerGenerator = dockerGeneratorFactory(subContext);
       var dockerData = dockerGenerator.generateDockerData();
       try {
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
index 87b4fec960..852cb762e1 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
@@ -36,7 +36,8 @@ public FedTargetConfig(LFGeneratorContext context, Resource federateResource) {
     mergeImportedConfig(
         federateResource, context.getFileConfig().resource, context.getErrorReporter());
 
-    clearPropertiesToIgnore();
+    clearPropertiesToIgnore(); // FIXME: add boolean inherit() function to TargetPropertyConfig
+    // instead
 
     ((FedFileConfig) context.getFileConfig()).relativizePaths(this);
   }
diff --git a/core/src/main/java/org/lflang/target/property/DockerProperty.java b/core/src/main/java/org/lflang/target/property/DockerProperty.java
index 83864ac96e..82171a81cb 100644
--- a/core/src/main/java/org/lflang/target/property/DockerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DockerProperty.java
@@ -38,6 +38,7 @@ public DockerOptions fromAst(Element value, MessageReporter err) {
       }
     } else {
       for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+        options.enabled = true;
         DockerOption option = (DockerOption) DictionaryType.DOCKER_DICT.forName(entry.getName());
         if (Objects.requireNonNull(option) == DockerOption.FROM) {
           options.from = ASTUtils.elementToSingleString(entry.getValue());
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index 3d6cca84ad..4bb9c54d40 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -36,8 +36,8 @@ public TracingOptions initialValue() {
   public TracingOptions fromAst(Element value, MessageReporter err) {
     var options = new TracingOptions(false);
     if (value.getLiteral() != null) {
-      if (!ASTUtils.toBoolean(value)) {
-        options.enabled = false;
+      if (ASTUtils.toBoolean(value)) {
+        options.enabled = true;
       }
     } else {
       for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
diff --git a/core/src/main/java/org/lflang/target/property/type/UnionType.java b/core/src/main/java/org/lflang/target/property/type/UnionType.java
index 2e046e68ae..511f0b7d9c 100644
--- a/core/src/main/java/org/lflang/target/property/type/UnionType.java
+++ b/core/src/main/java/org/lflang/target/property/type/UnionType.java
@@ -77,6 +77,8 @@ public boolean check(Element e, String name, MessageReporter r) {
         found = ((PrimitiveType) type).check(e, name, r);
       } else if (!(type instanceof Enum<?>)) {
         throw new RuntimeException("Encountered an unknown type.");
+      } else {
+        found = true;
       }
     }
     return found;
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index e012eb6788..db0bb6428d 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -1489,21 +1489,6 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
         result.add(test);
       }
 
-      // Extra checks for filenames. (This piece of code was commented out in the original xtend
-      // file)
-      // Temporarily disabled because we need a more sophisticated check that looks for files in
-      // different places.
-      //            if (prop.type == prop.type == ArrayType.FILE_ARRAY ||
-      //                prop.type == UnionType.FILE_OR_FILE_ARRAY) {
-      //                val model = prop.createModel(
-      //                    synthesizeExamples(ArrayType.FILE_ARRAY, true).get(0))
-      //                primitiveTypeToKnownGood.get(PrimitiveType.FILE).forEach [
-      //                    model.assertWarning(
-      //                        LfPackage.eINSTANCE.keyValuePair,
-      //                        null, '''Could not find file: '«it.withoutQuotes»'.''')
-      //                ]
-      //            }
-
       List<String> knownIncorrect = synthesizeExamples(type, false);
       if (!(knownIncorrect == null || knownIncorrect.isEmpty())) {
         for (String it : knownIncorrect) {
@@ -1537,14 +1522,16 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
             var test =
                 DynamicTest.dynamicTest(
                     "Property %s (%s) - known bad assignment: %s".formatted(property, type, it),
-                    () ->
+                    () -> {
+                        System.out.println(it);
                         validator.assertError(
                             createModel(property, it.get(0).toString()),
                             LfPackage.eINSTANCE.getKeyValuePair(),
                             null,
                             String.format(
                                 "Target property '%s%s' is required to be %s.",
-                                property, it.get(1), it.get(2))));
+                                property, it.get(1), it.get(2)));
+                    });
             result.add(test);
           }
         }

From 44abb6b19dd9e06ebea36fce659e8ff5df85f22d Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 29 Sep 2023 00:31:35 -0700
Subject: [PATCH 0927/1114] Only generate docker when enabled

---
 .../lflang/federated/generator/FedGenerator.java |  7 ++++---
 .../org/lflang/generator/c/CDockerGenerator.java |  2 +-
 .../java/org/lflang/generator/c/CGenerator.java  |  4 ++--
 .../org/lflang/generator/ts/TSGenerator.kt       |  2 +-
 .../compiler/LinguaFrancaValidationTest.java     | 16 ++++++++--------
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 91583b8865..67540c745f 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -193,7 +193,7 @@ private void generateLaunchScript() {
    * @param subContexts The subcontexts in which the federates have been compiled.
    */
   private void createDockerFiles(LFGeneratorContext context, List<SubContext> subContexts) {
-    if (!context.getTargetConfig().dockerOptions.isSet()) return;
+    if (!context.getTargetConfig().dockerOptions.get().enabled) return;
     final List<DockerData> services = new ArrayList<>();
     // 1. create a Dockerfile for each federate
     for (SubContext subContext : subContexts) { // Inherit Docker options from main context
@@ -294,7 +294,8 @@ private Map<Path, CodeMap> compileFederates(
                 new LineAdjustingMessageReporter(threadSafeErrorReporter, lf2lfCodeMapMap);
 
             var props = new Properties();
-            if (targetConfig.dockerOptions != null && targetConfig.target.buildsUsingDocker()) {
+            if (targetConfig.dockerOptions.get().enabled
+                && targetConfig.target.buildsUsingDocker()) {
               props.put("no-compile", "true");
             }
             props.put("docker", "false");
@@ -420,7 +421,7 @@ private void analyzeFederates(Reactor federation, LFGeneratorContext context) {
       rtiConfig.setHost(federation.getHost().getAddr());
     }
     // If the federation is dockerized, use "rti" as the hostname.
-    if (rtiConfig.getHost().equals("localhost") && targetConfig.dockerOptions != null) {
+    if (rtiConfig.getHost().equals("localhost") && targetConfig.dockerOptions.get().enabled) {
       rtiConfig.setHost("rti");
     }
 
diff --git a/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java b/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
index f6dc1bf200..0474b06ea9 100644
--- a/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
@@ -35,7 +35,7 @@ protected String generateDockerFileContent() {
             : StringUtil.joinObjects(config.buildCommands.get(), " ");
     var compiler = config.target == Target.CCPP ? "g++" : "gcc";
     var baseImage = DEFAULT_BASE_IMAGE;
-    if (config.dockerOptions != null && config.dockerOptions.get().from != null) {
+    if (config.dockerOptions.get().enabled && config.dockerOptions.get().from != null) {
       baseImage = config.dockerOptions.get().from;
     }
     return String.join(
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index e0726cd21e..f6a2daa7ae 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -419,7 +419,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     }
 
     // Create docker file.
-    if (targetConfig.dockerOptions != null && mainDef != null) {
+    if (targetConfig.dockerOptions.get().enabled && mainDef != null) {
       try {
         var dockerData = getDockerGenerator(context).generateDockerData();
         dockerData.writeDockerFile();
@@ -537,7 +537,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     // If this code generator is directly compiling the code, compile it now so that we
     // clean it up after, removing the #line directives after errors have been reported.
     if (!targetConfig.noCompile.get()
-        && targetConfig.dockerOptions == null
+        && !targetConfig.dockerOptions.get().enabled
         && IterableExtensions.isNullOrEmpty(targetConfig.buildCommands.get())
         // This code is unreachable in LSP_FAST mode, so that check is omitted.
         && context.getMode() != LFGeneratorContext.Mode.LSP_MEDIUM) {
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
index c4a3213bdc..add6402ed3 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -123,7 +123,7 @@ class TSGenerator(
 
         val codeMaps = HashMap<Path, CodeMap>()
         generateCode(codeMaps, resource.model.preambles)
-        if (targetConfig.dockerOptions != null) {
+        if (targetConfig.dockerOptions.get().enabled) {
             val dockerData = TSDockerGenerator(context).generateDockerData();
             dockerData.writeDockerFile()
             DockerComposeGenerator(context).writeDockerComposeFile(listOf(dockerData))
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index db0bb6428d..6b9e9fa4a2 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -1523,14 +1523,14 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
                 DynamicTest.dynamicTest(
                     "Property %s (%s) - known bad assignment: %s".formatted(property, type, it),
                     () -> {
-                        System.out.println(it);
-                        validator.assertError(
-                            createModel(property, it.get(0).toString()),
-                            LfPackage.eINSTANCE.getKeyValuePair(),
-                            null,
-                            String.format(
-                                "Target property '%s%s' is required to be %s.",
-                                property, it.get(1), it.get(2)));
+                      System.out.println(it);
+                      validator.assertError(
+                          createModel(property, it.get(0).toString()),
+                          LfPackage.eINSTANCE.getKeyValuePair(),
+                          null,
+                          String.format(
+                              "Target property '%s%s' is required to be %s.",
+                              property, it.get(1), it.get(2)));
                     });
             result.add(test);
           }

From 43479be4ff357584ac0ad13b903675633f05784a Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Fri, 29 Sep 2023 16:28:45 +0200
Subject: [PATCH 0928/1114] clean up build types, no need for a separate config
 class

---
 .../org/lflang/generator/c/CCompiler.java     |  4 +--
 .../generator/rust/RustTargetConfig.java      |  4 +--
 .../lflang/target/property/BuildConfig.java   | 32 -------------------
 .../target/property/BuildTypeProperty.java    | 30 ++++++++++++++++-
 .../target/property/type/UnionType.java       |  4 +--
 .../generator/cpp/CppStandaloneGenerator.kt   |  2 +-
 .../generator/rust/RustCargoTomlEmitter.kt    |  2 +-
 .../lflang/generator/rust/RustGenerator.kt    |  2 +-
 .../org/lflang/generator/rust/RustModel.kt    |  2 +-
 9 files changed, 39 insertions(+), 43 deletions(-)
 delete mode 100644 core/src/main/java/org/lflang/target/property/BuildConfig.java

diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index deabdc42a5..a8bfa1f328 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -40,7 +40,7 @@
 import org.lflang.generator.GeneratorCommandFactory;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGeneratorContext;
-import org.lflang.target.property.BuildConfig;
+import org.lflang.target.property.BuildTypeProperty;
 import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.util.FileUtil;
 import org.lflang.util.LFCommand;
@@ -261,7 +261,7 @@ private static List<String> cmakeOptions(TargetConfig targetConfig, FileConfig f
   }
 
   /** Return the cmake config name corresponding to a given build type. */
-  private String buildTypeToCmakeConfig(BuildConfig.BuildType type) {
+  private String buildTypeToCmakeConfig(BuildTypeProperty.BuildType type) {
     if (type == null) {
       return "Release";
     }
diff --git a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
index bc287260fd..006163db13 100644
--- a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
+++ b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
@@ -24,7 +24,7 @@
 
 package org.lflang.generator.rust;
 
-import org.lflang.target.property.BuildConfig.BuildType;
+import org.lflang.target.property.BuildTypeProperty.BuildType;
 import org.lflang.target.property.BuildTypeProperty;
 import org.lflang.target.property.CargoDependenciesProperty;
 import org.lflang.target.property.CargoFeaturesProperty;
@@ -47,7 +47,7 @@ public final class RustTargetConfig {
   public final RustIncludeProperty rustTopLevelModules = new RustIncludeProperty();
 
   /** Cargo profile, default is debug (corresponds to cargo dev profile). */
-  private BuildType profile = BuildType.DEBUG;
+  private BuildType profile = BuildTypeProperty.BuildType.DEBUG;
 
   /** The build type to use. Corresponds to a Cargo profile. */
   public BuildType getBuildType(BuildTypeProperty cmakeBuildType) {
diff --git a/core/src/main/java/org/lflang/target/property/BuildConfig.java b/core/src/main/java/org/lflang/target/property/BuildConfig.java
deleted file mode 100644
index 5d1ea7c8e3..0000000000
--- a/core/src/main/java/org/lflang/target/property/BuildConfig.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.lflang.target.property;
-
-public class BuildConfig {
-
-  /**
-   * Enumeration of Cmake build types. These are also mapped to Cargo profiles for the Rust target
-   * (see {@link org.lflang.generator.rust.RustTargetConfig})
-   *
-   * @author Christian Menard
-   */
-  public enum BuildType {
-    RELEASE("Release"),
-    DEBUG("Debug"),
-    TEST("Test"),
-    REL_WITH_DEB_INFO("RelWithDebInfo"),
-    MIN_SIZE_REL("MinSizeRel");
-
-    /** Alias used in toString method. */
-    private final String alias;
-
-    /** Private constructor for Cmake build types. */
-    BuildType(String alias) {
-      this.alias = alias;
-    }
-
-    /** Return the alias. */
-    @Override
-    public String toString() {
-      return this.alias;
-    }
-  }
-}
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
index d4d3e2cee6..3007c9391c 100644
--- a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
@@ -7,7 +7,7 @@
 import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
-import org.lflang.target.property.BuildConfig.BuildType;
+import org.lflang.target.property.BuildTypeProperty.BuildType;
 import org.lflang.target.property.type.UnionType;
 
 public class BuildTypeProperty extends TargetPropertyConfig<BuildType> {
@@ -40,4 +40,32 @@ protected BuildType fromString(String value, MessageReporter err) {
   public List<Target> supportedTargets() {
     return Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Rust);
   }
+
+  /**
+   * Enumeration of Cmake build types. These are also mapped to Cargo profiles for the Rust target
+   * (see {@link org.lflang.generator.rust.RustTargetConfig})
+   *
+   * @author Christian Menard
+   */
+  public enum BuildType {
+    RELEASE("Release"),
+    DEBUG("Debug"),
+    TEST("Test"),
+    REL_WITH_DEB_INFO("RelWithDebInfo"),
+    MIN_SIZE_REL("MinSizeRel");
+
+    /** Alias used in toString method. */
+    private final String alias;
+
+    /** Private constructor for Cmake build types. */
+    BuildType(String alias) {
+      this.alias = alias;
+    }
+
+    /** Return the alias. */
+    @Override
+    public String toString() {
+      return this.alias;
+    }
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/type/UnionType.java b/core/src/main/java/org/lflang/target/property/type/UnionType.java
index 511f0b7d9c..a4f1cdbb36 100644
--- a/core/src/main/java/org/lflang/target/property/type/UnionType.java
+++ b/core/src/main/java/org/lflang/target/property/type/UnionType.java
@@ -8,7 +8,7 @@
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
-import org.lflang.target.property.BuildConfig.BuildType;
+import org.lflang.target.property.BuildTypeProperty;
 import org.lflang.target.property.ClockSyncModeProperty.ClockSyncMode;
 import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
 import org.lflang.target.property.LoggingProperty.LogLevel;
@@ -25,7 +25,7 @@ public enum UnionType implements TargetPropertyType {
   PLATFORM_STRING_OR_DICTIONARY(
       Arrays.asList(PrimitiveType.STRING, DictionaryType.PLATFORM_DICT), null),
   FILE_OR_FILE_ARRAY(Arrays.asList(PrimitiveType.FILE, ArrayType.FILE_ARRAY), null),
-  BUILD_TYPE_UNION(Arrays.asList(BuildType.values()), null),
+  BUILD_TYPE_UNION(Arrays.asList(BuildTypeProperty.BuildType.values()), null),
   COORDINATION_UNION(Arrays.asList(CoordinationMode.values()), CoordinationMode.CENTRALIZED),
   SCHEDULER_UNION(Arrays.asList(SchedulerOption.values()), SchedulerOption.getDefault()),
   LOGGING_UNION(Arrays.asList(LogLevel.values()), LogLevel.INFO),
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
index 94b18181a4..b7c9bd8982 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
@@ -1,6 +1,6 @@
 package org.lflang.generator.cpp
 
-import org.lflang.target.property.BuildConfig.BuildType
+import org.lflang.target.property.BuildTypeProperty.BuildType
 import org.lflang.generator.CodeMap
 import org.lflang.generator.LFGeneratorContext
 import org.lflang.toUnixString
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustCargoTomlEmitter.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustCargoTomlEmitter.kt
index 2a733438ec..e7690e78e5 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustCargoTomlEmitter.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustCargoTomlEmitter.kt
@@ -24,7 +24,7 @@
 
 package org.lflang.generator.rust
 
-import org.lflang.target.property.BuildConfig.BuildType.*
+import org.lflang.target.property.BuildTypeProperty.BuildType.*
 import org.lflang.escapeStringLiteral
 import org.lflang.generator.PrependOperator.rangeTo
 import org.lflang.joinWithCommas
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
index bf4a84f9f3..0c11c1538e 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
@@ -26,7 +26,7 @@ package org.lflang.generator.rust
 
 import org.eclipse.emf.ecore.resource.Resource
 import org.lflang.Target
-import org.lflang.target.property.BuildConfig.BuildType
+import org.lflang.target.property.BuildTypeProperty.BuildType
 import org.lflang.generator.GeneratorUtils.canGenerate
 import org.lflang.generator.CodeMap
 import org.lflang.generator.GeneratorBase
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
index b3d69ea548..eaa1e93fec 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
@@ -26,7 +26,7 @@
 package org.lflang.generator.rust
 
 import org.lflang.*
-import org.lflang.target.property.BuildConfig.BuildType
+import org.lflang.target.property.BuildTypeProperty.BuildType
 import org.lflang.ast.ASTUtils
 import org.lflang.generator.*
 import org.lflang.lf.*

From d9a05a052f2b1abae2eee3fbd8f90ee8f8124da4 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Fri, 29 Sep 2023 16:54:36 +0200
Subject: [PATCH 0929/1114] cleanup

---
 core/src/main/java/org/lflang/TargetProperty.java        | 4 ++--
 core/src/main/java/org/lflang/TargetPropertyConfig.java  | 8 ++++----
 .../java/org/lflang/target/property/type/ArrayType.java  | 9 +++------
 .../org/lflang/target/property/type/DictionaryType.java  | 2 +-
 .../lflang/target/property/type/TargetPropertyType.java  | 4 ++--
 .../java/org/lflang/target/property/type/UnionType.java  | 2 +-
 6 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index a5095b9d45..118afbdd44 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -405,8 +405,8 @@ public static void validate(
                       .findAny();
               if (match.isPresent()) {
                 var p = match.get();
-                p.property.of(config).checkSupport(pair, config, reporter);
-                p.property.of(config).checkType(pair, config, reporter);
+                p.property.of(config).checkSupport(pair, config.target, reporter);
+                p.property.of(config).checkType(pair, reporter);
                 p.property.of(config).validate(pair, ast, config, reporter);
               } else {
                 reporter
diff --git a/core/src/main/java/org/lflang/TargetPropertyConfig.java b/core/src/main/java/org/lflang/TargetPropertyConfig.java
index 35fc6936a5..4a41df7b39 100644
--- a/core/src/main/java/org/lflang/TargetPropertyConfig.java
+++ b/core/src/main/java/org/lflang/TargetPropertyConfig.java
@@ -78,19 +78,19 @@ public void validate(
     // FIXME: consider not passing in config
   }
 
-  public void checkSupport(KeyValuePair pair, TargetConfig config, MessageReporter reporter) {
-    if (!this.isSupported(config.target)) {
+  public void checkSupport(KeyValuePair pair, Target target, MessageReporter reporter) {
+    if (!this.isSupported(target)) {
       reporter
           .at(pair, Literals.KEY_VALUE_PAIR__NAME)
           .warning(
               String.format(
                   "The target parameter: %s is not supported by the %s target and will thus be"
                       + " ignored.",
-                  pair.getName(), config.target));
+                  pair.getName(), target));
     }
   }
 
-  public void checkType(KeyValuePair pair, TargetConfig config, MessageReporter reporter) {
+  public void checkType(KeyValuePair pair, MessageReporter reporter) {
     if (!this.type.check(pair.getValue(), pair.getName(), reporter)) {
       reporter
           .at(pair, Literals.KEY_VALUE_PAIR__VALUE)
diff --git a/core/src/main/java/org/lflang/target/property/type/ArrayType.java b/core/src/main/java/org/lflang/target/property/type/ArrayType.java
index 742292c3c7..96d176f54d 100644
--- a/core/src/main/java/org/lflang/target/property/type/ArrayType.java
+++ b/core/src/main/java/org/lflang/target/property/type/ArrayType.java
@@ -15,14 +15,14 @@ public enum ArrayType implements TargetPropertyType {
   FILE_ARRAY(PrimitiveType.FILE);
 
   /** Type parameter of this array type. */
-  public TargetPropertyType type;
+  public final TargetPropertyType type;
 
   /**
    * Private constructor to create a new array type.
    *
    * @param type The type of elements in the array.
    */
-  private ArrayType(TargetPropertyType type) {
+  ArrayType(TargetPropertyType type) {
     this.type = type;
   }
 
@@ -47,10 +47,7 @@ public boolean check(Element e, String name, MessageReporter r) {
   /** Return true of the given element is an array. */
   @Override
   public boolean validate(Element e) {
-    if (e.getArray() != null) {
-      return true;
-    }
-    return false;
+    return e.getArray() != null;
   }
 
   /** Return a human-readable description of this type. */
diff --git a/core/src/main/java/org/lflang/target/property/type/DictionaryType.java b/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
index cbcb58d4c8..0c15ffe0be 100644
--- a/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
+++ b/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
@@ -36,7 +36,7 @@ public enum DictionaryType implements TargetPropertyType {
    *
    * @param options The dictionary elements allowed by this type.
    */
-  private DictionaryType(List<DictionaryElement> options) {
+  DictionaryType(List<DictionaryElement> options) {
     this.options = options;
   }
 
diff --git a/core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java b/core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java
index d4c5009262..7c555e743c 100644
--- a/core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java
+++ b/core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java
@@ -16,7 +16,7 @@ public interface TargetPropertyType {
    * @param e The Element to validate.
    * @return True if the element conforms to this type, false otherwise.
    */
-  public boolean validate(Element e);
+  boolean validate(Element e);
 
   /**
    * Check (recursively) the given Element against its associated type(s) and add found problems to
@@ -26,5 +26,5 @@ public interface TargetPropertyType {
    * @param name The name of the target property.
    * @param r A reference to the validator to report errors to.
    */
-  public boolean check(Element e, String name, MessageReporter r);
+  boolean check(Element e, String name, MessageReporter r);
 }
diff --git a/core/src/main/java/org/lflang/target/property/type/UnionType.java b/core/src/main/java/org/lflang/target/property/type/UnionType.java
index a4f1cdbb36..979a6b7011 100644
--- a/core/src/main/java/org/lflang/target/property/type/UnionType.java
+++ b/core/src/main/java/org/lflang/target/property/type/UnionType.java
@@ -46,7 +46,7 @@ public enum UnionType implements TargetPropertyType {
    * @param options The types that that are part of the union.
    * @param defaultOption The default type.
    */
-  private UnionType(List<Enum<?>> options, Enum<?> defaultOption) {
+  UnionType(List<Enum<?>> options, Enum<?> defaultOption) {
     this.options = options;
     this.defaultOption = defaultOption;
   }

From 1760afc11d5cd7b2447a8b11ca63acf769f92274 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 29 Sep 2023 10:58:01 -0700
Subject: [PATCH 0930/1114] Minor fixes

---
 .../org/lflang/federated/extensions/CExtensionUtils.java     | 2 +-
 .../org/lflang/generator/cpp/CppRos2PackageGenerator.kt      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index bbb7cc8b88..daf075ed45 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -174,7 +174,7 @@ public static void handleCompileDefinitions(
       MessageReporter messageReporter) {
     var defs = federate.targetConfig.compileDefinitions.get();
     defs.put("FEDERATED", "");
-    defs.put("FEDERATED_" + federate.targetConfig.coordination.toString().toUpperCase(), "");
+    defs.put("FEDERATED_" + federate.targetConfig.coordination.get().toString().toUpperCase(), "");
     if (federate.targetConfig.auth.get()) {
       defs.put("FEDERATED_AUTHENTICATED", "");
     }
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
index 4d34e69d31..49311d121a 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
@@ -9,10 +9,11 @@ import java.nio.file.Path
 class CppRos2PackageGenerator(generator: CppGenerator, private val nodeName: String) {
     private val fileConfig = generator.fileConfig
     private val targetConfig = generator.targetConfig
-    val reactorCppSuffix = targetConfig.runtimeVersion.get() ?: "default"
+    val reactorCppSuffix: String = if (targetConfig.runtimeVersion.isSet) targetConfig.runtimeVersion.get() else "default"
     val reactorCppName = "reactor-cpp-$reactorCppSuffix"
     private val dependencies =
-        listOf("rclcpp", "rclcpp_components", reactorCppName) + (targetConfig.ros2Dependencies ?: listOf<String>())
+        listOf("rclcpp", "rclcpp_components", reactorCppName) + (
+                if (targetConfig.ros2Dependencies.isSet) targetConfig.ros2Dependencies.get() else listOf<String>())
 
     @Suppress("PrivatePropertyName") // allows us to use capital S as variable name below
     private val S = '$' // a little trick to escape the dollar sign with $S

From 341912d3b31c22c72b44fd4393cecf60981d55c4 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 29 Sep 2023 12:47:56 -0700
Subject: [PATCH 0931/1114] Fix docker problem

---
 .../lflang/federated/generator/FedGenerator.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 67540c745f..3921438e08 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -59,6 +59,7 @@
 import org.lflang.lf.TargetDecl;
 import org.lflang.lf.VarRef;
 import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
+import org.lflang.target.property.DockerProperty.DockerOptions;
 import org.lflang.util.Averager;
 
 public class FedGenerator {
@@ -293,18 +294,17 @@ private Map<Path, CodeMap> compileFederates(
             MessageReporter subContextMessageReporter =
                 new LineAdjustingMessageReporter(threadSafeErrorReporter, lf2lfCodeMapMap);
 
-            var props = new Properties();
-            if (targetConfig.dockerOptions.get().enabled
-                && targetConfig.target.buildsUsingDocker()) {
-              props.put("no-compile", "true");
-            }
-            props.put("docker", "false");
-
             TargetConfig subConfig =
                 new TargetConfig(
-                    props,
+                    new Properties(),
                     GeneratorUtils.findTargetDecl(subFileConfig.resource),
                     subContextMessageReporter);
+            if (targetConfig.dockerOptions.get().enabled
+                && targetConfig.target.buildsUsingDocker()) {
+              subConfig.noCompile.override(true);
+            }
+            subConfig.dockerOptions.get().enabled = false;
+
             SubContext subContext =
                 new SubContext(context, IntegratedBuilder.VALIDATED_PERCENT_PROGRESS, 100) {
                   @Override

From af926162a9f62ea86fdc359085b799ca5c6abe20 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 29 Sep 2023 13:41:50 -0700
Subject: [PATCH 0932/1114] Another obscure nullcheck

---
 .../main/java/org/lflang/generator/c/CPreambleGenerator.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
index 0c0cc7c911..95146df77b 100644
--- a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
@@ -49,7 +49,7 @@ public static String generateIncludeStatements(TargetConfig targetConfig, boolea
     code.pr("#include \"include/core/environment.h\"");
 
     code.pr("int lf_reactor_c_main(int argc, const char* argv[]);");
-    if (targetConfig.fedSetupPreamble != null) {
+    if (!targetConfig.fedSetupPreamble.isSet()) {
       code.pr("#include \"include/core/federated/federate.h\"");
       code.pr("#include \"include/core/federated/net_common.h\"");
     }

From 282b4895673e6db6f5883b06b3c65257a39af58b Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 29 Sep 2023 13:42:22 -0700
Subject: [PATCH 0933/1114] Remove negation

---
 .../main/java/org/lflang/generator/c/CPreambleGenerator.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
index 95146df77b..6a241b37aa 100644
--- a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
@@ -49,7 +49,7 @@ public static String generateIncludeStatements(TargetConfig targetConfig, boolea
     code.pr("#include \"include/core/environment.h\"");
 
     code.pr("int lf_reactor_c_main(int argc, const char* argv[]);");
-    if (!targetConfig.fedSetupPreamble.isSet()) {
+    if (targetConfig.fedSetupPreamble.isSet()) {
       code.pr("#include \"include/core/federated/federate.h\"");
       code.pr("#include \"include/core/federated/net_common.h\"");
     }

From dd2b6e8d5f664396e93f6aea4d73124a25ce4d50 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 29 Sep 2023 16:46:11 -0700
Subject: [PATCH 0934/1114] Fix Rust issue

---
 .../org/lflang/federated/generator/FedGenerator.java     | 1 -
 .../java/org/lflang/generator/rust/RustTargetConfig.java | 2 +-
 .../main/kotlin/org/lflang/generator/rust/RustModel.kt   | 9 ++++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 3921438e08..c1524d48e0 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -59,7 +59,6 @@
 import org.lflang.lf.TargetDecl;
 import org.lflang.lf.VarRef;
 import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
-import org.lflang.target.property.DockerProperty.DockerOptions;
 import org.lflang.util.Averager;
 
 public class FedGenerator {
diff --git a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
index 006163db13..e67dc59dcb 100644
--- a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
+++ b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
@@ -24,8 +24,8 @@
 
 package org.lflang.generator.rust;
 
-import org.lflang.target.property.BuildTypeProperty.BuildType;
 import org.lflang.target.property.BuildTypeProperty;
+import org.lflang.target.property.BuildTypeProperty.BuildType;
 import org.lflang.target.property.CargoDependenciesProperty;
 import org.lflang.target.property.CargoFeaturesProperty;
 import org.lflang.target.property.RustIncludeProperty;
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
index eaa1e93fec..2ab9af11e8 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
@@ -477,7 +477,6 @@ object RustModelBuilder {
         if (userSpec == null) {
             // default configuration for the runtime crate
 
-            val userRtVersion: String? = targetConfig.runtimeVersion.get()
             // enable parallel feature if asked
             val parallelFeature = listOf(PARALLEL_RT_FEATURE).takeIf { targetConfig.threading.get() }
 
@@ -485,18 +484,18 @@ object RustModelBuilder {
                 features = parallelFeature,
             )
 
-            if (targetConfig.externalRuntimePath != null) {
+            if (targetConfig.externalRuntimePath.isSet) {
                 spec.localPath = targetConfig.externalRuntimePath.get()
-            } else if (userRtVersion != null) {
+            } else if (targetConfig.runtimeVersion.isSet) {
                 spec.gitRepo = RustEmitterBase.runtimeGitUrl
-                spec.rev = userRtVersion
+                spec.rev = targetConfig.runtimeVersion.get()
             } else {
                 spec.useDefaultRuntimePath()
             }
 
             return spec
         } else {
-            if (targetConfig.externalRuntimePath != null) {
+            if (targetConfig.externalRuntimePath.isSet) {
                 userSpec.localPath = targetConfig.externalRuntimePath.get()
             }
 

From 79e3a6a05d20c2b90a662eb173aa9fc7a4a5cfcc Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 29 Sep 2023 18:57:11 -0700
Subject: [PATCH 0935/1114] Point to epoch message-reporter branch

---
 .github/workflows/build.yml                               | 1 +
 core/src/testFixtures/java/org/lflang/tests/TestBase.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index da1990ca3f..f444bc02f8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,4 +36,5 @@ jobs:
     with:
       lingua-franca-ref: ${{ github.head_ref || github.ref_name }}
       lingua-franca-repo: ${{ github.event.pull_request.head.repo.full_name }}
+      epoch-ref: message-reporter
       upload-artifacts: false
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index 04a699068c..df97b3ea5d 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -438,7 +438,7 @@ private void validate(LFTest test) throws TestError {
   /** Override to add some LFC arguments to all runs of this test class. */
   protected void addExtraLfcArgs(Properties args, TargetConfig targetConfig) {
     args.setProperty("build-type", "Test");
-    if (targetConfig.logLevel == null) args.setProperty("logging", "Debug");
+    if (!targetConfig.logLevel.isSet()) args.setProperty("logging", "Debug");
   }
 
   /**

From 3b216d83e343ecb2a71ccb491faacc2c7d5b36c6 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 30 Sep 2023 14:49:09 -0700
Subject: [PATCH 0936/1114] Various bug fixes and improved, more localized
 error reporting

---
 .../main/java/org/lflang/TargetProperty.java  |  3 +-
 .../target/property/type/ArrayType.java       |  2 +-
 .../target/property/type/DictionaryType.java  |  2 +-
 .../target/property/type/PrimitiveType.java   |  8 +-
 .../property/type/StringDictionaryType.java   |  8 +-
 .../target/property/type/UnionType.java       |  3 +-
 .../compiler/LinguaFrancaValidationTest.java  | 83 ++++++++++---------
 7 files changed, 62 insertions(+), 47 deletions(-)

diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 118afbdd44..fe6e37bde1 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -68,6 +68,7 @@
 import org.lflang.target.property.PrintStatisticsProperty;
 import org.lflang.target.property.ProtobufsProperty;
 import org.lflang.target.property.Ros2DependenciesProperty;
+import org.lflang.target.property.Ros2Property;
 import org.lflang.target.property.RuntimeVersionProperty;
 import org.lflang.target.property.RustIncludeProperty;
 import org.lflang.target.property.SchedulerProperty;
@@ -170,7 +171,7 @@ public enum TargetProperty {
   PROTOBUFS(ProtobufsProperty.class, config -> config.protoFiles),
 
   /** Directive to specify that ROS2 specific code is generated, */
-  ROS2(Ros2DependenciesProperty.class, config -> config.ros2),
+  ROS2(Ros2Property.class, config -> config.ros2),
 
   /** Directive to specify additional ROS2 packages that this LF program depends on. */
   ROS2_DEPENDENCIES(Ros2DependenciesProperty.class, config -> config.ros2Dependencies),
diff --git a/core/src/main/java/org/lflang/target/property/type/ArrayType.java b/core/src/main/java/org/lflang/target/property/type/ArrayType.java
index 96d176f54d..5b0bd9202e 100644
--- a/core/src/main/java/org/lflang/target/property/type/ArrayType.java
+++ b/core/src/main/java/org/lflang/target/property/type/ArrayType.java
@@ -37,7 +37,7 @@ public boolean check(Element e, String name, MessageReporter r) {
       List<Element> elements = array.getElements();
       var valid = true;
       for (int i = 0; i < elements.size(); i++) {
-        valid &= this.type.check(elements.get(i), name + "[" + i + "]", r);
+        valid &= this.type.check(elements.get(i), "Entry", r);
       }
       return valid;
     }
diff --git a/core/src/main/java/org/lflang/target/property/type/DictionaryType.java b/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
index 0c15ffe0be..63107eb98c 100644
--- a/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
+++ b/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
@@ -66,7 +66,7 @@ public boolean check(Element e, String name, MessageReporter v) {
         if (match.isPresent()) {
           // Make sure the type is correct, too.
           TargetPropertyType type = match.get().getType();
-          valid &= type.check(val, name + "." + key, v);
+          valid &= type.check(val, "Entry", v);
         } else {
           valid = false;
         }
diff --git a/core/src/main/java/org/lflang/target/property/type/PrimitiveType.java b/core/src/main/java/org/lflang/target/property/type/PrimitiveType.java
index 8afc08c12f..95427f9700 100644
--- a/core/src/main/java/org/lflang/target/property/type/PrimitiveType.java
+++ b/core/src/main/java/org/lflang/target/property/type/PrimitiveType.java
@@ -82,7 +82,13 @@ public boolean validate(Element e) {
    * @param v The LFValidator to append errors to.
    */
   public boolean check(Element e, String name, MessageReporter v) {
-    return this.validate(e);
+    var valid = this.validate(e);
+    if (!valid) {
+      v.at(e).error(String.format("%s is required to be %s.", name, this));
+      return false;
+    } else {
+      return true;
+    }
   }
 
   /** Return a textual description of this type. */
diff --git a/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java b/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java
index 8047b56bd1..886fb79e14 100644
--- a/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java
+++ b/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java
@@ -27,10 +27,16 @@ public boolean check(Element e, String name, MessageReporter v) {
         Element val = pair.getValue();
 
         // Make sure the type is string
-        valid &= PrimitiveType.STRING.check(val, name + "." + key, v);
+        valid &= PrimitiveType.STRING.check(val, "Entry", v);
       }
       return valid;
     }
     return false;
   }
+
+  @Override
+  public String toString() {
+    return "a dictionary that maps strings keys to string values";
+  }
+
 }
diff --git a/core/src/main/java/org/lflang/target/property/type/UnionType.java b/core/src/main/java/org/lflang/target/property/type/UnionType.java
index 979a6b7011..8b51f972c9 100644
--- a/core/src/main/java/org/lflang/target/property/type/UnionType.java
+++ b/core/src/main/java/org/lflang/target/property/type/UnionType.java
@@ -67,6 +67,7 @@ public boolean check(Element e, String name, MessageReporter r) {
     Optional<Enum<?>> match = this.match(e);
     var found = false;
     if (match.isPresent()) {
+      found = true;
       // Go deeper if the element is an array or dictionary.
       Enum<?> type = match.get();
       if (type instanceof DictionaryType) {
@@ -77,8 +78,6 @@ public boolean check(Element e, String name, MessageReporter r) {
         found = ((PrimitiveType) type).check(e, name, r);
       } else if (!(type instanceof Enum<?>)) {
         throw new RuntimeException("Encountered an unknown type.");
-      } else {
-        found = true;
       }
     }
     return found;
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 6b9e9fa4a2..26cc8af11f 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -1285,43 +1285,43 @@ public void recognizeHostNames() throws Exception {
       Map.of(
           ArrayType.STRING_ARRAY,
               List.of(
-                  List.of("[1 msec]", "[0]", PrimitiveType.STRING),
-                  List.of("[foo, {bar: baz}]", "[1]", PrimitiveType.STRING),
-                  List.of("{bar: baz}", "", ArrayType.STRING_ARRAY)),
+                  List.of("[1 msec]", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
+                  List.of("[foo, {bar: baz}]", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
+                  List.of("{bar: baz}", LfPackage.eINSTANCE.getKeyValuePair(), ArrayType.STRING_ARRAY)),
           UnionType.STRING_OR_STRING_ARRAY,
               List.of(
-                  List.of("[1 msec]", "[0]", PrimitiveType.STRING),
-                  List.of("[foo, {bar: baz}]", "[1]", PrimitiveType.STRING),
-                  List.of("{bar: baz}", "", UnionType.STRING_OR_STRING_ARRAY)),
+                  List.of("[1 msec]", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
+                  List.of("[foo, {bar: baz}]", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
+                  List.of("{bar: baz}", LfPackage.eINSTANCE.getKeyValuePair(), UnionType.STRING_OR_STRING_ARRAY)),
           UnionType.PLATFORM_STRING_OR_DICTIONARY,
               List.of(
-                  List.of("[bar, baz]", "", UnionType.PLATFORM_STRING_OR_DICTIONARY),
-                  List.of("{name: [1, 2, 3]}", ".name", PrimitiveType.STRING),
-                  List.of("{name: {bar: baz}}", ".name", PrimitiveType.STRING),
-                  List.of("{board: [1, 2, 3]}", ".board", PrimitiveType.STRING),
-                  List.of("{board: {bar: baz}}", ".board", PrimitiveType.STRING),
+                  List.of("[bar, baz]", LfPackage.eINSTANCE.getKeyValuePair(), UnionType.PLATFORM_STRING_OR_DICTIONARY),
+                  List.of("{name: [1, 2, 3]}", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
+                  List.of("{name: {bar: baz}}", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
+                  List.of("{board: [1, 2, 3]}", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
+                  List.of("{board: {bar: baz}}", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
                   List.of(
-                      "{baud-rate: [1, 2, 3]}", ".baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER),
+                      "{baud-rate: [1, 2, 3]}", LfPackage.eINSTANCE.getElement(), PrimitiveType.NON_NEGATIVE_INTEGER),
                   List.of(
-                      "{baud-rate: {bar: baz}}", ".baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER)),
+                      "{baud-rate: {bar: baz}}", LfPackage.eINSTANCE.getElement(), PrimitiveType.NON_NEGATIVE_INTEGER)),
           UnionType.FILE_OR_FILE_ARRAY,
               List.of(
-                  List.of("[1 msec]", "[0]", PrimitiveType.FILE),
-                  List.of("[foo, {bar: baz}]", "[1]", PrimitiveType.FILE),
-                  List.of("{bar: baz}", "", UnionType.FILE_OR_FILE_ARRAY)),
+                  List.of("[1 msec]", LfPackage.eINSTANCE.getElement(), PrimitiveType.FILE),
+                  List.of("[foo, {bar: baz}]", LfPackage.eINSTANCE.getElement(), PrimitiveType.FILE),
+                  List.of("{bar: baz}", LfPackage.eINSTANCE.getKeyValuePair(), UnionType.FILE_OR_FILE_ARRAY)),
           UnionType.DOCKER_UNION,
               List.of(
-                  List.of("foo", "", UnionType.DOCKER_UNION),
-                  List.of("[1]", "", UnionType.DOCKER_UNION),
-                  List.of("{bar: baz}", "", DictionaryType.DOCKER_DICT),
-                  List.of("{FROM: [1, 2, 3]}", ".FROM", PrimitiveType.STRING)),
+                  List.of("foo", LfPackage.eINSTANCE.getKeyValuePair(), UnionType.DOCKER_UNION),
+                  List.of("[1]", LfPackage.eINSTANCE.getKeyValuePair(), UnionType.DOCKER_UNION),
+                  List.of("{bar: baz}", LfPackage.eINSTANCE.getKeyValuePair(), DictionaryType.DOCKER_DICT),
+                  List.of("{FROM: [1, 2, 3]}", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING)),
           UnionType.TRACING_UNION,
               List.of(
-                  List.of("foo", "", UnionType.TRACING_UNION),
-                  List.of("[1]", "", UnionType.TRACING_UNION),
-                  List.of("{bar: baz}", "", DictionaryType.TRACING_DICT),
+                  List.of("foo", LfPackage.eINSTANCE.getKeyValuePair(), UnionType.TRACING_UNION),
+                  List.of("[1]", LfPackage.eINSTANCE.getKeyValuePair(), UnionType.TRACING_UNION),
+                  List.of("{bar: baz}", LfPackage.eINSTANCE.getKeyValuePair(), DictionaryType.TRACING_DICT),
                   List.of(
-                      "{trace-file-name: [1, 2, 3]}", ".trace-file-name", PrimitiveType.STRING)));
+                      "{trace-file-name: [1, 2, 3]}", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING)));
 
   /**
    * Given an array type, return a list of good or bad examples, depending on the value of the
@@ -1496,21 +1496,12 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
               DynamicTest.dynamicTest(
                   "Property %s (%s) - known bad assignment: %s".formatted(property, type, it),
                   () -> {
-                    if (type instanceof StringDictionaryType) {
-                      validator.assertError(
-                          createModel(property, it),
-                          LfPackage.eINSTANCE.getKeyValuePair(),
-                          null,
-                          String.format("Target property '%s.", property),
-                          "' is required to be a string.");
-                    } else {
                       validator.assertError(
                           createModel(property, it),
                           LfPackage.eINSTANCE.getKeyValuePair(),
                           null,
                           String.format(
                               "Target property '%s' is required to be %s.", property, type));
-                    }
                   });
           result.add(test);
         }
@@ -1524,14 +1515,26 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
                     "Property %s (%s) - known bad assignment: %s".formatted(property, type, it),
                     () -> {
                       System.out.println(it);
-                      validator.assertError(
-                          createModel(property, it.get(0).toString()),
-                          LfPackage.eINSTANCE.getKeyValuePair(),
-                          null,
-                          String.format(
-                              "Target property '%s%s' is required to be %s.",
-                              property, it.get(1), it.get(2)));
+                      //var issues = validator.validate(createModel(property, it.get(0).toString()));
+                      if (it.get(1).equals(LfPackage.eINSTANCE.getElement())) {
+                        validator.assertError(
+                            createModel(property, it.get(0).toString()),
+                            LfPackage.eINSTANCE.getElement(),
+                            null,
+                            String.format(
+                                "Entry is required to be %s.", it.get(2)));
+                      } else {
+                        validator.assertError(
+                            createModel(property, it.get(0).toString()),
+                            LfPackage.eINSTANCE.getKeyValuePair(),
+                            null,
+                            String.format(
+                                "Target property '%s' is required to be %s.", property, type));
+                      }
+
                     });
+            // String.format(
+            //                              "Target property '%s' is required to be %s.", property, type)
             result.add(test);
           }
         }

From 20e7b3f5a9e33014b97b7553d178a63ef6684769 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 30 Sep 2023 15:06:46 -0700
Subject: [PATCH 0937/1114] Apply formatter

---
 .../property/type/StringDictionaryType.java   |  1 -
 .../compiler/LinguaFrancaValidationTest.java  | 88 +++++++++++++------
 2 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java b/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java
index 886fb79e14..afe44cabf2 100644
--- a/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java
+++ b/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java
@@ -38,5 +38,4 @@ public boolean check(Element e, String name, MessageReporter v) {
   public String toString() {
     return "a dictionary that maps strings keys to string values";
   }
-
 }
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 26cc8af11f..43154df8b5 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -1286,42 +1286,74 @@ public void recognizeHostNames() throws Exception {
           ArrayType.STRING_ARRAY,
               List.of(
                   List.of("[1 msec]", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
-                  List.of("[foo, {bar: baz}]", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
-                  List.of("{bar: baz}", LfPackage.eINSTANCE.getKeyValuePair(), ArrayType.STRING_ARRAY)),
+                  List.of(
+                      "[foo, {bar: baz}]", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
+                  List.of(
+                      "{bar: baz}", LfPackage.eINSTANCE.getKeyValuePair(), ArrayType.STRING_ARRAY)),
           UnionType.STRING_OR_STRING_ARRAY,
               List.of(
                   List.of("[1 msec]", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
-                  List.of("[foo, {bar: baz}]", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
-                  List.of("{bar: baz}", LfPackage.eINSTANCE.getKeyValuePair(), UnionType.STRING_OR_STRING_ARRAY)),
+                  List.of(
+                      "[foo, {bar: baz}]", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
+                  List.of(
+                      "{bar: baz}",
+                      LfPackage.eINSTANCE.getKeyValuePair(),
+                      UnionType.STRING_OR_STRING_ARRAY)),
           UnionType.PLATFORM_STRING_OR_DICTIONARY,
               List.of(
-                  List.of("[bar, baz]", LfPackage.eINSTANCE.getKeyValuePair(), UnionType.PLATFORM_STRING_OR_DICTIONARY),
-                  List.of("{name: [1, 2, 3]}", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
-                  List.of("{name: {bar: baz}}", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
-                  List.of("{board: [1, 2, 3]}", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
-                  List.of("{board: {bar: baz}}", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
                   List.of(
-                      "{baud-rate: [1, 2, 3]}", LfPackage.eINSTANCE.getElement(), PrimitiveType.NON_NEGATIVE_INTEGER),
+                      "[bar, baz]",
+                      LfPackage.eINSTANCE.getKeyValuePair(),
+                      UnionType.PLATFORM_STRING_OR_DICTIONARY),
+                  List.of(
+                      "{name: [1, 2, 3]}", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
+                  List.of(
+                      "{name: {bar: baz}}", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
+                  List.of(
+                      "{board: [1, 2, 3]}", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
+                  List.of(
+                      "{board: {bar: baz}}",
+                      LfPackage.eINSTANCE.getElement(),
+                      PrimitiveType.STRING),
+                  List.of(
+                      "{baud-rate: [1, 2, 3]}",
+                      LfPackage.eINSTANCE.getElement(),
+                      PrimitiveType.NON_NEGATIVE_INTEGER),
                   List.of(
-                      "{baud-rate: {bar: baz}}", LfPackage.eINSTANCE.getElement(), PrimitiveType.NON_NEGATIVE_INTEGER)),
+                      "{baud-rate: {bar: baz}}",
+                      LfPackage.eINSTANCE.getElement(),
+                      PrimitiveType.NON_NEGATIVE_INTEGER)),
           UnionType.FILE_OR_FILE_ARRAY,
               List.of(
                   List.of("[1 msec]", LfPackage.eINSTANCE.getElement(), PrimitiveType.FILE),
-                  List.of("[foo, {bar: baz}]", LfPackage.eINSTANCE.getElement(), PrimitiveType.FILE),
-                  List.of("{bar: baz}", LfPackage.eINSTANCE.getKeyValuePair(), UnionType.FILE_OR_FILE_ARRAY)),
+                  List.of(
+                      "[foo, {bar: baz}]", LfPackage.eINSTANCE.getElement(), PrimitiveType.FILE),
+                  List.of(
+                      "{bar: baz}",
+                      LfPackage.eINSTANCE.getKeyValuePair(),
+                      UnionType.FILE_OR_FILE_ARRAY)),
           UnionType.DOCKER_UNION,
               List.of(
                   List.of("foo", LfPackage.eINSTANCE.getKeyValuePair(), UnionType.DOCKER_UNION),
                   List.of("[1]", LfPackage.eINSTANCE.getKeyValuePair(), UnionType.DOCKER_UNION),
-                  List.of("{bar: baz}", LfPackage.eINSTANCE.getKeyValuePair(), DictionaryType.DOCKER_DICT),
-                  List.of("{FROM: [1, 2, 3]}", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING)),
+                  List.of(
+                      "{bar: baz}",
+                      LfPackage.eINSTANCE.getKeyValuePair(),
+                      DictionaryType.DOCKER_DICT),
+                  List.of(
+                      "{FROM: [1, 2, 3]}", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING)),
           UnionType.TRACING_UNION,
               List.of(
                   List.of("foo", LfPackage.eINSTANCE.getKeyValuePair(), UnionType.TRACING_UNION),
                   List.of("[1]", LfPackage.eINSTANCE.getKeyValuePair(), UnionType.TRACING_UNION),
-                  List.of("{bar: baz}", LfPackage.eINSTANCE.getKeyValuePair(), DictionaryType.TRACING_DICT),
                   List.of(
-                      "{trace-file-name: [1, 2, 3]}", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING)));
+                      "{bar: baz}",
+                      LfPackage.eINSTANCE.getKeyValuePair(),
+                      DictionaryType.TRACING_DICT),
+                  List.of(
+                      "{trace-file-name: [1, 2, 3]}",
+                      LfPackage.eINSTANCE.getElement(),
+                      PrimitiveType.STRING)));
 
   /**
    * Given an array type, return a list of good or bad examples, depending on the value of the
@@ -1496,12 +1528,12 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
               DynamicTest.dynamicTest(
                   "Property %s (%s) - known bad assignment: %s".formatted(property, type, it),
                   () -> {
-                      validator.assertError(
-                          createModel(property, it),
-                          LfPackage.eINSTANCE.getKeyValuePair(),
-                          null,
-                          String.format(
-                              "Target property '%s' is required to be %s.", property, type));
+                    validator.assertError(
+                        createModel(property, it),
+                        LfPackage.eINSTANCE.getKeyValuePair(),
+                        null,
+                        String.format(
+                            "Target property '%s' is required to be %s.", property, type));
                   });
           result.add(test);
         }
@@ -1515,14 +1547,14 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
                     "Property %s (%s) - known bad assignment: %s".formatted(property, type, it),
                     () -> {
                       System.out.println(it);
-                      //var issues = validator.validate(createModel(property, it.get(0).toString()));
+                      // var issues = validator.validate(createModel(property,
+                      // it.get(0).toString()));
                       if (it.get(1).equals(LfPackage.eINSTANCE.getElement())) {
                         validator.assertError(
                             createModel(property, it.get(0).toString()),
                             LfPackage.eINSTANCE.getElement(),
                             null,
-                            String.format(
-                                "Entry is required to be %s.", it.get(2)));
+                            String.format("Entry is required to be %s.", it.get(2)));
                       } else {
                         validator.assertError(
                             createModel(property, it.get(0).toString()),
@@ -1531,10 +1563,10 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
                             String.format(
                                 "Target property '%s' is required to be %s.", property, type));
                       }
-
                     });
             // String.format(
-            //                              "Target property '%s' is required to be %s.", property, type)
+            //                              "Target property '%s' is required to be %s.", property,
+            // type)
             result.add(test);
           }
         }

From 97a3924794337e0341c8c342b2a78636f93edb80 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 30 Sep 2023 16:01:34 -0700
Subject: [PATCH 0938/1114] Change CLI arg

---
 cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java b/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java
index fd65ffad78..07f717ccbb 100644
--- a/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java
+++ b/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java
@@ -276,7 +276,7 @@ public void testGeneratorArgs(@TempDir Path tempDir) throws IOException {
       "--build-type",
       "Release",
       "--clean",
-      "--target-compiler",
+      "--compiler",
       "gcc",
       "--external-runtime-path",
       "src",

From b56085302e95d8feec4e506a6baada274684cf29 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 30 Sep 2023 17:49:20 -0700
Subject: [PATCH 0939/1114] Adjust compiler CLI arg

---
 cli/lfc/src/main/java/org/lflang/cli/Lfc.java                 | 2 +-
 cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java          | 4 ++--
 .../main/java/org/lflang/generator/LFGeneratorContext.java    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
index 66130238d3..6409b7c0ba 100644
--- a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
+++ b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
@@ -261,7 +261,7 @@ public Properties getGeneratorArgs() {
     }
 
     if (targetCompiler != null) {
-      props.setProperty(BuildParm.TARGET_COMPILER.getKey(), targetCompiler);
+      props.setProperty(BuildParm.COMPILER.getKey(), targetCompiler);
     }
 
     if (quiet) {
diff --git a/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java b/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java
index 07f717ccbb..2408971256 100644
--- a/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java
+++ b/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java
@@ -67,7 +67,7 @@ public class LfcCliTest {
             "properties": {
                 "build-type": "Release",
                 "clean": true,
-                "target-compiler": "gcc",
+                "compiler": "gcc",
                 "external-runtime-path": "src",
                 "federated": true,
                 "logging": "info",
@@ -246,7 +246,7 @@ public void verifyGeneratorArgs(Path tempDir, String[] args) {
               Properties properties = fixture.lfc.getGeneratorArgs();
               assertEquals(properties.getProperty(BuildParm.BUILD_TYPE.getKey()), "Release");
               assertEquals(properties.getProperty(BuildParm.CLEAN.getKey()), "true");
-              assertEquals(properties.getProperty(BuildParm.TARGET_COMPILER.getKey()), "gcc");
+              assertEquals(properties.getProperty(BuildParm.COMPILER.getKey()), "gcc");
               assertEquals(properties.getProperty(BuildParm.EXTERNAL_RUNTIME_PATH.getKey()), "src");
               assertEquals(properties.getProperty(BuildParm.LOGGING.getKey()), "info");
               assertEquals(properties.getProperty(BuildParm.LINT.getKey()), "true");
diff --git a/core/src/main/java/org/lflang/generator/LFGeneratorContext.java b/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
index 4353e3c46e..142a51a209 100644
--- a/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
+++ b/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
@@ -35,7 +35,7 @@ enum BuildParm {
     RTI("Specify the location of the RTI."),
     RUNTIME_VERSION("Specify the version of the runtime library used for compiling LF programs."),
     SCHEDULER("Specify the runtime scheduler (if supported)."),
-    TARGET_COMPILER("Target compiler to invoke."),
+    COMPILER("Target compiler to invoke."),
     THREADING("Specify whether the runtime should use multi-threading (true/false)."),
     VERSION("Print version information."),
     WORKERS("Specify the default number of worker threads.");

From e98fc812531c6a1713b5cf1f9a06a6f35931504f Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 30 Sep 2023 22:41:04 -0700
Subject: [PATCH 0940/1114] Improve API and add comments

---
 .../org/lflang/AbstractTargetProperty.java    | 189 ++++++++++++++++++
 .../main/java/org/lflang/TargetConfig.java    |   4 +-
 .../main/java/org/lflang/TargetProperty.java  |  14 +-
 .../java/org/lflang/TargetPropertyConfig.java | 119 -----------
 .../federated/extensions/CExtension.java      |   2 +-
 .../federated/extensions/CExtensionUtils.java |  27 ++-
 .../extensions/FedTargetExtension.java        |   2 +-
 .../federated/extensions/PythonExtension.java |   2 +-
 .../federated/extensions/TSExtension.java     |   2 +-
 .../federated/generator/FedASTUtils.java      |   2 +-
 .../federated/generator/FedGenerator.java     |   2 +-
 .../property/AbstractBooleanProperty.java     |  34 ++++
 ...rty.java => AbstractFileListProperty.java} |  20 +-
 .../target/property/AbstractStringConfig.java |  34 ++++
 .../property/AbstractStringListProperty.java  |  61 ++++++
 .../lflang/target/property/AuthProperty.java  |   2 +-
 .../property/BuildCommandsProperty.java       |  12 +-
 .../target/property/BuildTypeProperty.java    |  14 +-
 .../property/CargoDependenciesProperty.java   |  12 +-
 .../property/CargoFeaturesProperty.java       |   2 +-
 .../property/ClockSyncModeProperty.java       |  22 +-
 .../property/ClockSyncOptionsProperty.java    |  26 +--
 .../target/property/CmakeIncludeProperty.java |  24 ++-
 .../property/CompileDefinitionsProperty.java  |  18 +-
 .../property/CompilerFlagsProperty.java       |   2 +-
 .../target/property/CompilerProperty.java     |   2 +-
 .../property/CoordinationOptionsProperty.java |  14 +-
 ...roperty.java => CoordinationProperty.java} |  25 +--
 .../property/DefaultBooleanProperty.java      |  34 ----
 .../target/property/DefaultStringConfig.java  |  34 ----
 .../property/DefaultStringListProperty.java   |  55 -----
 .../target/property/DockerProperty.java       |  22 +-
 .../ExportDependencyGraphProperty.java        |   2 +-
 .../target/property/ExportToYamlProperty.java |   2 +-
 .../property/ExternalRuntimePathProperty.java |   2 +-
 .../lflang/target/property/FastProperty.java  |   6 +-
 .../target/property/FedSetupProperty.java     |  14 +-
 .../lflang/target/property/FilesProperty.java |   2 +-
 .../target/property/KeepaliveProperty.java    |  10 +-
 .../target/property/LoggingProperty.java      |  12 +-
 .../target/property/NoCompileProperty.java    |   2 +-
 .../property/NoRuntimeValidationProperty.java |   2 +-
 .../target/property/PlatformProperty.java     |  34 ++--
 .../property/PrintStatisticsProperty.java     |   2 +-
 .../target/property/ProtobufsProperty.java    |   2 +-
 .../property/Ros2DependenciesProperty.java    |  17 +-
 .../lflang/target/property/Ros2Property.java  |   2 +-
 .../property/RuntimeVersionProperty.java      |   2 +-
 .../target/property/RustIncludeProperty.java  |  26 +--
 .../target/property/SchedulerProperty.java    |  19 +-
 .../property/SingleFileProjectProperty.java   |   2 +-
 .../target/property/ThreadingProperty.java    |   2 +-
 .../target/property/TimeOutProperty.java      |  12 +-
 .../target/property/TracingProperty.java      |  26 ++-
 .../target/property/VerifyProperty.java       |   4 +-
 .../target/property/WorkersProperty.java      |  14 +-
 .../target/property/type/UnionType.java       |   2 +-
 57 files changed, 557 insertions(+), 497 deletions(-)
 create mode 100644 core/src/main/java/org/lflang/AbstractTargetProperty.java
 delete mode 100644 core/src/main/java/org/lflang/TargetPropertyConfig.java
 create mode 100644 core/src/main/java/org/lflang/target/property/AbstractBooleanProperty.java
 rename core/src/main/java/org/lflang/target/property/{DefaultFileListProperty.java => AbstractFileListProperty.java} (51%)
 create mode 100644 core/src/main/java/org/lflang/target/property/AbstractStringConfig.java
 create mode 100644 core/src/main/java/org/lflang/target/property/AbstractStringListProperty.java
 rename core/src/main/java/org/lflang/target/property/{CoordinationModeProperty.java => CoordinationProperty.java} (56%)
 delete mode 100644 core/src/main/java/org/lflang/target/property/DefaultBooleanProperty.java
 delete mode 100644 core/src/main/java/org/lflang/target/property/DefaultStringConfig.java
 delete mode 100644 core/src/main/java/org/lflang/target/property/DefaultStringListProperty.java

diff --git a/core/src/main/java/org/lflang/AbstractTargetProperty.java b/core/src/main/java/org/lflang/AbstractTargetProperty.java
new file mode 100644
index 0000000000..bb39cd3943
--- /dev/null
+++ b/core/src/main/java/org/lflang/AbstractTargetProperty.java
@@ -0,0 +1,189 @@
+package org.lflang;
+
+import java.util.List;
+import org.lflang.lf.Element;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.LfPackage.Literals;
+import org.lflang.lf.Model;
+import org.lflang.target.property.type.TargetPropertyType;
+
+/**
+ * A base class for target properties.
+ *
+ * <p>After implementing this class to create a new target property, add a corresponding entry to
+ * {@code TargetConfig} and hook it into the {@code TargetProperty} enum.
+ *
+ * @param <T> The data type of the value assigned to the target property.
+ */
+public abstract class AbstractTargetProperty<T> {
+
+  /** The type of values that can be assigned to this property. */
+  public final TargetPropertyType type;
+
+  /** Whether (after initialization) this property has been set. */
+  protected boolean isSet;
+
+  /**
+   * The value assigned to the target property, initialized using the {@code initialValue()} method.
+   */
+  private T value = initialValue();
+
+  /**
+   * Construct a new target property.
+   *
+   * @param type The type of the value that can be assigned to the property.
+   */
+  public AbstractTargetProperty(TargetPropertyType type) {
+    this.type = type;
+  }
+
+  /**
+   * If this target property is not supported by the given target, report a warning through the
+   * message reporter at the location of the given key-value pair.
+   *
+   * @param pair The ast node that matches this target property.
+   * @param target The target to check against.
+   * @param reporter The reporter to issue a warning through if this property is not supported by
+   *     the given target.
+   */
+  public void checkSupport(KeyValuePair pair, Target target, MessageReporter reporter) {
+    if (!this.isSupported(target)) {
+      reporter
+          .at(pair, Literals.KEY_VALUE_PAIR__NAME)
+          .warning(
+              String.format(
+                  "The target parameter: %s is not supported by the %s target and will thus be"
+                      + " ignored.",
+                  pair.getName(), target));
+    }
+  }
+
+  /**
+   * If the given key-value pair does not match the type required by this target property, report an
+   * error through the given reporter.
+   *
+   * @param pair The ast node that matches this target property.
+   * @param reporter The reporter to issue an error through if the given key-value pair does not
+   *     match the type required by this property.
+   */
+  public void checkType(KeyValuePair pair, MessageReporter reporter) {
+    if (!this.type.check(pair.getValue(), pair.getName(), reporter)) {
+      reporter
+          .at(pair, Literals.KEY_VALUE_PAIR__VALUE)
+          .error("Target property '" + pair.getName() + "' is required to be " + type + ".");
+    }
+  }
+
+  /**
+   * Return {@code true} if this target property has been set (past initialization), {@code false}
+   * otherwise.
+   */
+  public boolean isSet() {
+    return isSet;
+  }
+
+  /**
+   * Return {@code true} if this target property is supported by the given target, {@code false}
+   * otherwise.
+   *
+   * @param target The target to check against.
+   */
+  public final boolean isSupported(Target target) {
+    return supportedTargets().contains(target);
+  }
+
+  /**
+   * Manually override the value of this target property.
+   *
+   * @param value The value to assign to this target property.
+   */
+  public void override(T value) {
+    this.isSet = true;
+    this.value = value;
+  }
+
+  /** Reset this target property to its initial value. */
+  public void reset() {
+    this.value = initialValue();
+    this.isSet = false;
+  }
+
+  /**
+   * Parse the given AST node into the given target config. Encountered errors are reported via the
+   * given reporter.
+   *
+   * @param node The AST node to derive a newly assigned value from.
+   * @param reporter A reporter for reporting errors.
+   */
+  public void set(Element node, MessageReporter reporter) {
+    var parsed = this.fromAst(node, reporter);
+    if (parsed != null) {
+      this.isSet = true;
+      this.value = parsed;
+    }
+  }
+
+  /**
+   * Parse the given element into the given target config. May use the error reporter to report
+   * format errors.
+   */
+  public void set(String value, MessageReporter err) {
+    var parsed = this.fromString(value, err);
+    if (parsed != null) {
+      this.isSet = true;
+      this.value = parsed;
+    }
+  }
+
+  @Override
+  public String toString() {
+    return value == null ? null : value.toString(); // FIXME: do not return null
+  }
+
+  /**
+   * Override this method to implement additional checks. The base implementation does nothing.
+   *
+   * <p>This method is meant to perform additional validation above and beyond checking target
+   * support and type checking which are done automatically.
+   *
+   * @param pair The key-value pair to type check.
+   * @param ast The root of the abstract syntax tree.
+   * @param reporter A reporter for reporting errors.
+   */
+  public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {}
+
+  /** Return the initial value to assign to this target property. */
+  public abstract T initialValue();
+
+  /** Return the value currently assigned to this target property. */
+  public T get() {
+    return value;
+  }
+
+  /**
+   * Given an AST node, produce a corresponding value that is assignable to this target property, or
+   * report an error via the given reporter in case any problems are encountered.
+   *
+   * @param node The AST node to derive a value of type {@code T} from.
+   * @param reporter A reporter for reporting errors.
+   * @return A value of type {@code T}.
+   */
+  protected abstract T fromAst(Element node, MessageReporter reporter);
+
+  /**
+   * Given a string, produce a corresponding value that is assignable to this target property, or
+   * report an error via the given reporter in case any problems are encountered.
+   *
+   * @param string The string to derive a value of type {@code T} from.
+   * @param reporter A reporter for reporting errors.
+   * @return A value of type {@code T}.
+   */
+  protected abstract T fromString(String string, MessageReporter reporter);
+
+  public abstract List<Target> supportedTargets();
+
+  /**
+   * Return an AST node that represents this target property and the value currently assigned to it.
+   */
+  public abstract Element toAstElement();
+}
diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/TargetConfig.java
index 4e35f7a587..6a0958fbca 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/TargetConfig.java
@@ -39,8 +39,8 @@
 import org.lflang.target.property.CompileDefinitionsProperty;
 import org.lflang.target.property.CompilerFlagsProperty;
 import org.lflang.target.property.CompilerProperty;
-import org.lflang.target.property.CoordinationModeProperty;
 import org.lflang.target.property.CoordinationOptionsProperty;
+import org.lflang.target.property.CoordinationProperty;
 import org.lflang.target.property.DockerProperty;
 import org.lflang.target.property.ExportDependencyGraphProperty;
 import org.lflang.target.property.ExportToYamlProperty;
@@ -149,7 +149,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
    * The type of coordination used during the execution of a federated program. The default is
    * 'centralized'.
    */
-  public final CoordinationModeProperty coordination = new CoordinationModeProperty();
+  public final CoordinationProperty coordination = new CoordinationProperty();
 
   /** Docker options. */
   public final DockerProperty dockerOptions = new DockerProperty();
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index fe6e37bde1..81b22ff7ba 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -51,8 +51,8 @@
 import org.lflang.target.property.CompileDefinitionsProperty;
 import org.lflang.target.property.CompilerFlagsProperty;
 import org.lflang.target.property.CompilerProperty;
-import org.lflang.target.property.CoordinationModeProperty;
 import org.lflang.target.property.CoordinationOptionsProperty;
+import org.lflang.target.property.CoordinationProperty;
 import org.lflang.target.property.DockerProperty;
 import org.lflang.target.property.ExportDependencyGraphProperty;
 import org.lflang.target.property.ExportToYamlProperty;
@@ -118,7 +118,7 @@ public enum TargetProperty {
   COMPILE_DEFINITIONS(CompileDefinitionsProperty.class, config -> config.compileDefinitions),
 
   /** Directive to specify the coordination mode */
-  COORDINATION(CoordinationModeProperty.class, config -> config.coordination),
+  COORDINATION(CoordinationProperty.class, config -> config.coordination),
   /** Key-value pairs giving options for clock synchronization. */
   COORDINATION_OPTIONS(CoordinationOptionsProperty.class, config -> config.coordinationOptions),
   /**
@@ -259,14 +259,14 @@ public enum TargetProperty {
 
   public final ConfigLoader property;
 
-  public final Class<? extends TargetPropertyConfig<?>> propertyClass;
+  public final Class<? extends AbstractTargetProperty<?>> propertyClass;
 
   @FunctionalInterface
   private interface ConfigLoader {
-    TargetPropertyConfig<?> of(TargetConfig config);
+    AbstractTargetProperty<?> of(TargetConfig config);
   }
 
-  TargetProperty(Class<? extends TargetPropertyConfig<?>> cls, ConfigLoader property) {
+  TargetProperty(Class<? extends AbstractTargetProperty<?>> cls, ConfigLoader property) {
     this.propertyClass = cls;
     this.property = property;
   }
@@ -282,7 +282,7 @@ public String getKey() {
     return name().toLowerCase().replace('_', '-');
   }
 
-  public static TargetPropertyConfig<?> getPropertyInstance(TargetProperty p) {
+  public static AbstractTargetProperty<?> getPropertyInstance(TargetProperty p) {
     try {
       return p.propertyClass.getDeclaredConstructor().newInstance();
     } catch (ReflectiveOperationException e) {
@@ -408,7 +408,7 @@ public static void validate(
                 var p = match.get();
                 p.property.of(config).checkSupport(pair, config.target, reporter);
                 p.property.of(config).checkType(pair, reporter);
-                p.property.of(config).validate(pair, ast, config, reporter);
+                p.property.of(config).validate(pair, ast, reporter);
               } else {
                 reporter
                     .at(pair, Literals.KEY_VALUE_PAIR__NAME)
diff --git a/core/src/main/java/org/lflang/TargetPropertyConfig.java b/core/src/main/java/org/lflang/TargetPropertyConfig.java
deleted file mode 100644
index 4a41df7b39..0000000000
--- a/core/src/main/java/org/lflang/TargetPropertyConfig.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.lflang;
-
-import java.util.List;
-import org.lflang.lf.Element;
-import org.lflang.lf.KeyValuePair;
-import org.lflang.lf.LfPackage.Literals;
-import org.lflang.lf.Model;
-import org.lflang.target.property.type.TargetPropertyType;
-
-/**
- * Extend this class to manage the configuration of a target property.
- *
- * @param <T> The type of the configuration value.
- */
-public abstract class TargetPropertyConfig<T> {
-
-  protected T value = initialValue();
-
-  protected boolean isSet;
-
-  /* The type of values that can be assigned to this property. */
-  public final TargetPropertyType type;
-
-  public TargetPropertyConfig(TargetPropertyType type) {
-    this.type = type;
-  }
-
-  public void override(T value) {
-    this.isSet = true;
-    this.value = value;
-  }
-
-  public abstract T initialValue();
-
-  /**
-   * Parse the given element into the given target config. May use the error reporter to report
-   * format errors.
-   */
-  public void set(Element value, MessageReporter err) {
-    var parsed = this.fromAst(value, err);
-    if (parsed != null) {
-      this.isSet = true;
-      this.value = parsed;
-    }
-  }
-
-  public void set(String value, MessageReporter err) {
-    var parsed = this.fromString(value, err);
-    if (parsed != null) {
-      this.isSet = true;
-      this.value = parsed;
-    }
-  }
-
-  public void reset() {
-    this.value = initialValue();
-    this.isSet = false;
-  }
-
-  /** Return the current configuration. */
-  public T get() {
-    return value;
-  }
-
-  protected abstract T fromAst(Element value, MessageReporter err);
-
-  protected abstract T fromString(String value, MessageReporter err);
-
-  public abstract List<Target> supportedTargets();
-
-  public final boolean isSupported(Target target) {
-    return supportedTargets().contains(target);
-  }
-
-  public void validate(
-      KeyValuePair pair, Model ast, TargetConfig config, MessageReporter reporter) {
-    // FIXME: Make abstract?
-    // FIXME: consider not passing in config
-  }
-
-  public void checkSupport(KeyValuePair pair, Target target, MessageReporter reporter) {
-    if (!this.isSupported(target)) {
-      reporter
-          .at(pair, Literals.KEY_VALUE_PAIR__NAME)
-          .warning(
-              String.format(
-                  "The target parameter: %s is not supported by the %s target and will thus be"
-                      + " ignored.",
-                  pair.getName(), target));
-    }
-  }
-
-  public void checkType(KeyValuePair pair, MessageReporter reporter) {
-    if (!this.type.check(pair.getValue(), pair.getName(), reporter)) {
-      reporter
-          .at(pair, Literals.KEY_VALUE_PAIR__VALUE)
-          .error("Target property '" + pair.getName() + "' is required to be " + type + ".");
-    }
-  }
-
-  /**
-   * Read this property from the target config and build an element which represents it for the AST.
-   * May return null if the given value of this property is the same as the default.
-   */
-  public abstract Element toAstElement();
-
-  public boolean isSet() {
-    return isSet;
-  }
-
-  @Override
-  public String toString() {
-    return value == null ? null : value.toString();
-  }
-
-  public void markSet() {
-    this.isSet = true;
-  }
-}
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 07dce71ca1..f5de233de4 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -56,7 +56,7 @@
 import org.lflang.lf.Port;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
-import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
+import org.lflang.target.property.CoordinationProperty.CoordinationMode;
 
 /**
  * An extension class to the CGenerator that enables certain federated functionalities.
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index daf075ed45..7712093240 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -172,15 +172,17 @@ public static void handleCompileDefinitions(
       int numOfFederates,
       RtiConfig rtiConfig,
       MessageReporter messageReporter) {
-    var defs = federate.targetConfig.compileDefinitions.get();
-    defs.put("FEDERATED", "");
-    defs.put("FEDERATED_" + federate.targetConfig.coordination.get().toString().toUpperCase(), "");
+    var definitions = federate.targetConfig.compileDefinitions;
+    definitions.add("FEDERATED", "");
+    definitions.add(
+        String.format(
+            "FEDERATED_%s", federate.targetConfig.coordination.get().toString().toUpperCase()),
+        "");
     if (federate.targetConfig.auth.get()) {
-      defs.put("FEDERATED_AUTHENTICATED", "");
+      definitions.add("FEDERATED_AUTHENTICATED", "");
     }
-    defs.put("NUMBER_OF_FEDERATES", String.valueOf(numOfFederates));
-    defs.put("EXECUTABLE_PREAMBLE", "");
-    federate.targetConfig.compileDefinitions.markSet();
+    definitions.add("NUMBER_OF_FEDERATES", String.valueOf(numOfFederates));
+    definitions.add("EXECUTABLE_PREAMBLE", "");
 
     handleAdvanceMessageInterval(federate);
 
@@ -227,8 +229,7 @@ public static void initializeClockSynchronization(
               .nowhere()
               .info("Will collect clock sync statistics for federate " + federate.id);
           // Add libm to the compiler flags
-          federate.targetConfig.compilerFlags.get().add("-lm");
-          federate.targetConfig.compilerFlags.markSet();
+          federate.targetConfig.compilerFlags.add("-lm");
         }
         messageReporter
             .nowhere()
@@ -299,12 +300,8 @@ public static void generateCMakeInclude(FederateInstance federate, FedFileConfig
       srcWriter.write(cmakeIncludeCode.getCode());
     }
 
-    federate
-        .targetConfig
-        .cmakeIncludes
-        .get()
-        .add(fileConfig.getSrcPath().relativize(cmakeIncludePath).toString());
-    federate.targetConfig.cmakeIncludes.markSet();
+    federate.targetConfig.cmakeIncludes.add(
+        fileConfig.getSrcPath().relativize(cmakeIncludePath).toString());
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
index 4b20b09ba5..a580ec693a 100644
--- a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
@@ -13,7 +13,7 @@
 import org.lflang.lf.Reaction;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
-import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
+import org.lflang.target.property.CoordinationProperty.CoordinationMode;
 
 public interface FedTargetExtension {
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
index ab05d80f7e..c0fae10f32 100644
--- a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
@@ -42,7 +42,7 @@
 import org.lflang.lf.Action;
 import org.lflang.lf.Reaction;
 import org.lflang.lf.VarRef;
-import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
+import org.lflang.target.property.CoordinationProperty.CoordinationMode;
 
 /**
  * An extension class to the PythonGenerator that enables certain federated functionalities.
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 2505686ec4..a2a2e54ebd 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -25,7 +25,7 @@
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
-import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
+import org.lflang.target.property.CoordinationProperty.CoordinationMode;
 
 public class TSExtension implements FedTargetExtension {
   @Override
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index b970b15cd6..28290a1a6d 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -70,7 +70,7 @@
 import org.lflang.lf.Type;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
-import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
+import org.lflang.target.property.CoordinationProperty.CoordinationMode;
 
 /**
  * A helper class for AST transformations needed for federated execution.
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index c1524d48e0..af3f383e2c 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -58,7 +58,7 @@
 import org.lflang.lf.Reactor;
 import org.lflang.lf.TargetDecl;
 import org.lflang.lf.VarRef;
-import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
+import org.lflang.target.property.CoordinationProperty.CoordinationMode;
 import org.lflang.util.Averager;
 
 public class FedGenerator {
diff --git a/core/src/main/java/org/lflang/target/property/AbstractBooleanProperty.java b/core/src/main/java/org/lflang/target/property/AbstractBooleanProperty.java
new file mode 100644
index 0000000000..8d65a0674b
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/AbstractBooleanProperty.java
@@ -0,0 +1,34 @@
+package org.lflang.target.property;
+
+import org.lflang.AbstractTargetProperty;
+import org.lflang.MessageReporter;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.target.property.type.PrimitiveType;
+
+public abstract class AbstractBooleanProperty extends AbstractTargetProperty<Boolean> {
+
+  public AbstractBooleanProperty() {
+    super(PrimitiveType.BOOLEAN);
+  }
+
+  @Override
+  public Boolean initialValue() {
+    return false;
+  }
+
+  @Override
+  public Boolean fromAst(Element node, MessageReporter reporter) {
+    return ASTUtils.toBoolean(node);
+  }
+
+  @Override
+  protected Boolean fromString(String string, MessageReporter reporter) {
+    return Boolean.parseBoolean(string);
+  }
+
+  @Override
+  public Element toAstElement() {
+    return ASTUtils.toElement(get());
+  }
+}
diff --git a/core/src/main/java/org/lflang/target/property/DefaultFileListProperty.java b/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java
similarity index 51%
rename from core/src/main/java/org/lflang/target/property/DefaultFileListProperty.java
rename to core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java
index cf35d54ea7..cd462ab2ec 100644
--- a/core/src/main/java/org/lflang/target/property/DefaultFileListProperty.java
+++ b/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java
@@ -2,15 +2,15 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.UnionType;
 
-public abstract class DefaultFileListProperty extends TargetPropertyConfig<List<String>> {
+public abstract class AbstractFileListProperty extends AbstractTargetProperty<List<String>> {
 
-  public DefaultFileListProperty() {
+  public AbstractFileListProperty() {
     super(UnionType.FILE_OR_FILE_ARRAY);
   }
 
@@ -20,26 +20,26 @@ public List<String> initialValue() {
   }
 
   @Override
-  public void set(Element value, MessageReporter err) {
+  public void set(Element node, MessageReporter reporter) {
     if (!this.isSet) {
-      super.set(value, err);
+      super.set(node, reporter);
     } else {
-      this.value.addAll(fromAst(value, err));
+      this.get().addAll(fromAst(node, reporter));
     }
   }
 
   @Override
-  public List<String> fromAst(Element value, MessageReporter err) {
-    return ASTUtils.elementToListOfStrings(value);
+  public List<String> fromAst(Element node, MessageReporter reporter) {
+    return ASTUtils.elementToListOfStrings(node);
   }
 
   @Override
-  protected List<String> fromString(String value, MessageReporter err) {
+  protected List<String> fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
   @Override
   public Element toAstElement() {
-    return ASTUtils.toElement(value);
+    return ASTUtils.toElement(get());
   }
 }
diff --git a/core/src/main/java/org/lflang/target/property/AbstractStringConfig.java b/core/src/main/java/org/lflang/target/property/AbstractStringConfig.java
new file mode 100644
index 0000000000..619a7f135d
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/AbstractStringConfig.java
@@ -0,0 +1,34 @@
+package org.lflang.target.property;
+
+import org.lflang.AbstractTargetProperty;
+import org.lflang.MessageReporter;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.target.property.type.PrimitiveType;
+
+public abstract class AbstractStringConfig extends AbstractTargetProperty<String> {
+
+  public AbstractStringConfig() {
+    super(PrimitiveType.STRING);
+  }
+
+  @Override
+  public String initialValue() {
+    return "";
+  }
+
+  @Override
+  public String fromAst(Element node, MessageReporter reporter) {
+    return ASTUtils.elementToSingleString(node);
+  }
+
+  @Override
+  protected String fromString(String string, MessageReporter reporter) {
+    return string;
+  }
+
+  @Override
+  public Element toAstElement() {
+    return ASTUtils.toElement(this.get());
+  }
+}
diff --git a/core/src/main/java/org/lflang/target/property/AbstractStringListProperty.java b/core/src/main/java/org/lflang/target/property/AbstractStringListProperty.java
new file mode 100644
index 0000000000..43afc06e91
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/AbstractStringListProperty.java
@@ -0,0 +1,61 @@
+package org.lflang.target.property;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.lflang.AbstractTargetProperty;
+import org.lflang.MessageReporter;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+import org.lflang.target.property.type.UnionType;
+
+/** Note: {@code set} implements an "append" semantics. */
+public abstract class AbstractStringListProperty extends AbstractTargetProperty<List<String>> {
+
+  public AbstractStringListProperty() {
+    super(UnionType.STRING_OR_STRING_ARRAY);
+  }
+
+  public void add(String entry) {
+    this.isSet = true;
+    var value = this.get();
+    value.add(entry);
+  }
+
+  @Override
+  public List<String> initialValue() {
+    return new ArrayList<>();
+  }
+
+  @Override
+  public void set(Element node, MessageReporter reporter) {
+    if (!this.isSet) {
+      super.set(node, reporter);
+    } else {
+      this.get().addAll(this.fromAst(node, reporter));
+    }
+  }
+
+  @Override
+  public void set(String string, MessageReporter err) {
+    if (!this.isSet) {
+      super.set(string, err);
+    } else {
+      this.get().addAll(this.fromString(string, err));
+    }
+  }
+
+  @Override
+  public List<String> fromAst(Element node, MessageReporter reporter) {
+    return ASTUtils.elementToListOfStrings(node);
+  }
+
+  @Override
+  protected List<String> fromString(String string, MessageReporter reporter) {
+    return List.of(string.split(" "));
+  }
+
+  @Override
+  public Element toAstElement() {
+    return ASTUtils.toElement(get());
+  }
+}
diff --git a/core/src/main/java/org/lflang/target/property/AuthProperty.java b/core/src/main/java/org/lflang/target/property/AuthProperty.java
index 03eeb124a6..f8132c116f 100644
--- a/core/src/main/java/org/lflang/target/property/AuthProperty.java
+++ b/core/src/main/java/org/lflang/target/property/AuthProperty.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-public class AuthProperty extends DefaultBooleanProperty {
+public class AuthProperty extends AbstractBooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
index 1005001ef6..da459ab500 100644
--- a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
@@ -3,14 +3,14 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.UnionType;
 
-public class BuildCommandsProperty extends TargetPropertyConfig<List<String>> {
+public class BuildCommandsProperty extends AbstractTargetProperty<List<String>> {
 
   public BuildCommandsProperty() {
     super(UnionType.STRING_OR_STRING_ARRAY);
@@ -22,12 +22,12 @@ public List<String> initialValue() {
   }
 
   @Override
-  public List<String> fromAst(Element value, MessageReporter err) {
-    return ASTUtils.elementToListOfStrings(value);
+  public List<String> fromAst(Element node, MessageReporter reporter) {
+    return ASTUtils.elementToListOfStrings(node);
   }
 
   @Override
-  protected List<String> fromString(String value, MessageReporter err) {
+  protected List<String> fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
@@ -38,6 +38,6 @@ public List<Target> supportedTargets() {
 
   @Override
   public Element toAstElement() {
-    return ASTUtils.toElement(this.value.toString());
+    return ASTUtils.toElement(this.get().toString());
   }
 }
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
index 3007c9391c..86e79f4c99 100644
--- a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
@@ -2,15 +2,15 @@
 
 import java.util.Arrays;
 import java.util.List;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.BuildTypeProperty.BuildType;
 import org.lflang.target.property.type.UnionType;
 
-public class BuildTypeProperty extends TargetPropertyConfig<BuildType> {
+public class BuildTypeProperty extends AbstractTargetProperty<BuildType> {
 
   public BuildTypeProperty() {
     super(UnionType.BUILD_TYPE_UNION);
@@ -18,7 +18,7 @@ public BuildTypeProperty() {
 
   @Override
   public Element toAstElement() {
-    return ASTUtils.toElement(this.value.toString());
+    return ASTUtils.toElement(this.get().toString());
   }
 
   @Override
@@ -27,13 +27,13 @@ public BuildType initialValue() {
   }
 
   @Override
-  public BuildType fromAst(Element value, MessageReporter err) {
-    return fromString(ASTUtils.elementToSingleString(value), err);
+  public BuildType fromAst(Element node, MessageReporter reporter) {
+    return fromString(ASTUtils.elementToSingleString(node), reporter);
   }
 
   @Override
-  protected BuildType fromString(String value, MessageReporter err) {
-    return (BuildType) UnionType.BUILD_TYPE_UNION.forName(value);
+  protected BuildType fromString(String string, MessageReporter reporter) {
+    return (BuildType) UnionType.BUILD_TYPE_UNION.forName(string);
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
index 431bac4935..5761073267 100644
--- a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
@@ -4,9 +4,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.generator.rust.CargoDependencySpec;
 import org.lflang.generator.rust.CargoDependencySpec.CargoDependenciesPropertyType;
 import org.lflang.lf.Element;
@@ -15,7 +15,7 @@
 import org.lflang.lf.LfFactory;
 
 public class CargoDependenciesProperty
-    extends TargetPropertyConfig<Map<String, CargoDependencySpec>> {
+    extends AbstractTargetProperty<Map<String, CargoDependencySpec>> {
 
   public CargoDependenciesProperty() {
     super(CargoDependenciesPropertyType.INSTANCE);
@@ -27,12 +27,12 @@ public Map<String, CargoDependencySpec> initialValue() {
   }
 
   @Override
-  protected Map<String, CargoDependencySpec> fromAst(Element value, MessageReporter err) {
-    return CargoDependencySpec.parseAll(value);
+  protected Map<String, CargoDependencySpec> fromAst(Element node, MessageReporter reporter) {
+    return CargoDependencySpec.parseAll(node);
   }
 
   @Override
-  protected Map<String, CargoDependencySpec> fromString(String value, MessageReporter err) {
+  protected Map<String, CargoDependencySpec> fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
@@ -43,7 +43,7 @@ public List<Target> supportedTargets() {
 
   @Override
   public Element toAstElement() {
-    var deps = this.value;
+    var deps = this.get();
     if (deps.size() == 0) {
       return null;
     } else {
diff --git a/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java b/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
index 92d8d498be..290b0961d3 100644
--- a/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-public class CargoFeaturesProperty extends DefaultStringListProperty {
+public class CargoFeaturesProperty extends AbstractStringListProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
index 2e286f4bec..1b18b20817 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
@@ -2,10 +2,9 @@
 
 import java.util.List;
 import java.util.Objects;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetConfig;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -15,7 +14,7 @@
 import org.lflang.target.property.ClockSyncModeProperty.ClockSyncMode;
 import org.lflang.target.property.type.UnionType;
 
-public class ClockSyncModeProperty extends TargetPropertyConfig<ClockSyncMode> {
+public class ClockSyncModeProperty extends AbstractTargetProperty<ClockSyncMode> {
 
   public ClockSyncModeProperty() {
     super(UnionType.CLOCK_SYNC_UNION);
@@ -27,15 +26,15 @@ public ClockSyncMode initialValue() {
   }
 
   @Override
-  public ClockSyncMode fromAst(Element value, MessageReporter err) {
-    UnionType.CLOCK_SYNC_UNION.validate(value);
-    var mode = fromString(ASTUtils.elementToSingleString(value), err);
+  public ClockSyncMode fromAst(Element node, MessageReporter reporter) {
+    UnionType.CLOCK_SYNC_UNION.validate(node);
+    var mode = fromString(ASTUtils.elementToSingleString(node), reporter);
     return Objects.requireNonNullElse(mode, ClockSyncMode.INIT);
   }
 
   @Override
-  protected ClockSyncMode fromString(String value, MessageReporter err) {
-    return (ClockSyncMode) UnionType.CLOCK_SYNC_UNION.forName(value);
+  protected ClockSyncMode fromString(String string, MessageReporter reporter) {
+    return (ClockSyncMode) UnionType.CLOCK_SYNC_UNION.forName(string);
   }
 
   @Override
@@ -44,9 +43,8 @@ public List<Target> supportedTargets() {
   }
 
   @Override
-  public void validate(
-      KeyValuePair pair, Model ast, TargetConfig config, MessageReporter reporter) {
-    super.validate(pair, ast, config, reporter);
+  public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
+    super.validate(pair, ast, reporter);
     if (pair != null) {
       boolean federatedExists = false;
       for (Reactor reactor : ast.getReactors()) {
@@ -64,7 +62,7 @@ public void validate(
 
   @Override
   public Element toAstElement() {
-    return ASTUtils.toElement(this.value.toString());
+    return ASTUtils.toElement(this.get().toString());
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
index 4f13bf5878..6428580624 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
@@ -2,10 +2,10 @@
 
 import java.util.Arrays;
 import java.util.List;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetProperty.DictionaryElement;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
@@ -18,7 +18,7 @@
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.TargetPropertyType;
 
-public class ClockSyncOptionsProperty extends TargetPropertyConfig<ClockSyncOptions> {
+public class ClockSyncOptionsProperty extends AbstractTargetProperty<ClockSyncOptions> {
 
   public ClockSyncOptionsProperty() {
     super(DictionaryType.CLOCK_SYNC_OPTION_DICT);
@@ -30,9 +30,9 @@ public ClockSyncOptions initialValue() {
   }
 
   @Override
-  public ClockSyncOptions fromAst(Element value, MessageReporter err) {
+  public ClockSyncOptions fromAst(Element node, MessageReporter reporter) {
     var options = new ClockSyncOptions();
-    for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+    for (KeyValuePair entry : node.getKeyvalue().getPairs()) {
       ClockSyncOption option =
           (ClockSyncOption) DictionaryType.CLOCK_SYNC_OPTION_DICT.forName(entry.getName());
       switch (option) {
@@ -49,7 +49,7 @@ public ClockSyncOptions fromAst(Element value, MessageReporter err) {
   }
 
   @Override
-  protected ClockSyncOptions fromString(String value, MessageReporter err) {
+  protected ClockSyncOptions fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
@@ -66,22 +66,22 @@ public Element toAstElement() {
       KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
       pair.setName(opt.toString());
       switch (opt) {
-        case ATTENUATION -> pair.setValue(ASTUtils.toElement(value.attenuation));
-        case COLLECT_STATS -> pair.setValue(ASTUtils.toElement(value.collectStats));
-        case LOCAL_FEDERATES_ON -> pair.setValue(ASTUtils.toElement(value.localFederatesOn));
+        case ATTENUATION -> pair.setValue(ASTUtils.toElement(get().attenuation));
+        case COLLECT_STATS -> pair.setValue(ASTUtils.toElement(get().collectStats));
+        case LOCAL_FEDERATES_ON -> pair.setValue(ASTUtils.toElement(get().localFederatesOn));
         case PERIOD -> {
-          if (value.period == null) {
+          if (get().period == null) {
             continue; // don't set if null
           }
-          pair.setValue(ASTUtils.toElement(value.period));
+          pair.setValue(ASTUtils.toElement(get().period));
         }
         case TEST_OFFSET -> {
-          if (value.testOffset == null) {
+          if (get().testOffset == null) {
             continue; // don't set if null
           }
-          pair.setValue(ASTUtils.toElement(value.testOffset));
+          pair.setValue(ASTUtils.toElement(get().testOffset));
         }
-        case TRIALS -> pair.setValue(ASTUtils.toElement(value.trials));
+        case TRIALS -> pair.setValue(ASTUtils.toElement(get().trials));
       }
       kvp.getPairs().add(pair);
     }
diff --git a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
index 6ffcb81336..179a80e7a6 100644
--- a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
@@ -3,44 +3,50 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.UnionType;
 
-public class CmakeIncludeProperty extends TargetPropertyConfig<List<String>> {
+public class CmakeIncludeProperty extends AbstractTargetProperty<List<String>> {
 
   public CmakeIncludeProperty() {
     super(UnionType.FILE_OR_FILE_ARRAY);
   }
 
+  public void add(String entry) {
+    this.isSet = true;
+    var value = this.get();
+    value.add(entry);
+  }
+
   @Override
   public List<String> initialValue() {
     return new ArrayList<>();
   }
 
   @Override
-  public void set(Element value, MessageReporter err) {
+  public void set(Element node, MessageReporter reporter) {
     if (!this.isSet) {
-      super.set(value, err);
+      super.set(node, reporter);
     } else {
       // NOTE: This merging of lists is potentially dangerous since
       // the incoming list of cmake-includes can belong to a .lf file that is
       // located in a different location, and keeping just filename
       // strings like this without absolute paths is incorrect.
-      this.value.addAll(ASTUtils.elementToListOfStrings(value));
+      this.get().addAll(ASTUtils.elementToListOfStrings(node));
     }
   }
 
   @Override
-  protected List<String> fromAst(Element value, MessageReporter err) {
-    return ASTUtils.elementToListOfStrings(value);
+  protected List<String> fromAst(Element node, MessageReporter reporter) {
+    return ASTUtils.elementToListOfStrings(node);
   }
 
   @Override
-  protected List<String> fromString(String value, MessageReporter err) {
+  protected List<String> fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
@@ -51,6 +57,6 @@ public List<Target> supportedTargets() {
 
   @Override
   public Element toAstElement() {
-    return ASTUtils.toElement(this.value);
+    return ASTUtils.toElement(this.get());
   }
 }
diff --git a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
index 8b77b37935..584091d15c 100644
--- a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
@@ -4,31 +4,37 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.StringDictionaryType;
 
-public class CompileDefinitionsProperty extends TargetPropertyConfig<Map<String, String>> {
+public class CompileDefinitionsProperty extends AbstractTargetProperty<Map<String, String>> {
 
   public CompileDefinitionsProperty() {
     super(StringDictionaryType.COMPILE_DEFINITION);
   }
 
+  public void add(String k, String v) {
+    this.isSet = true;
+    var value = this.get();
+    value.put(k, v);
+  }
+
   @Override
   public Map<String, String> initialValue() {
     return new HashMap<>();
   }
 
   @Override
-  protected Map<String, String> fromAst(Element value, MessageReporter err) {
-    return ASTUtils.elementToStringMaps(value);
+  protected Map<String, String> fromAst(Element node, MessageReporter reporter) {
+    return ASTUtils.elementToStringMaps(node);
   }
 
   @Override
-  protected Map<String, String> fromString(String value, MessageReporter err) {
+  protected Map<String, String> fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
@@ -39,6 +45,6 @@ public List<Target> supportedTargets() {
 
   @Override
   public Element toAstElement() {
-    return ASTUtils.toElement(this.value);
+    return ASTUtils.toElement(this.get());
   }
 }
diff --git a/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
index df7ec8c9d8..4ebd7a6131 100644
--- a/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-public class CompilerFlagsProperty extends DefaultStringListProperty {
+public class CompilerFlagsProperty extends AbstractStringListProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/CompilerProperty.java b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
index 9c35d5d260..286938df10 100644
--- a/core/src/main/java/org/lflang/target/property/CompilerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-public class CompilerProperty extends DefaultStringConfig {
+public class CompilerProperty extends AbstractStringConfig {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
index 23af1705ba..7d01e5af7d 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
@@ -3,10 +3,10 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetProperty.DictionaryElement;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
@@ -18,7 +18,7 @@
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.TargetPropertyType;
 
-public class CoordinationOptionsProperty extends TargetPropertyConfig<CoordinationOptions> {
+public class CoordinationOptionsProperty extends AbstractTargetProperty<CoordinationOptions> {
 
   public CoordinationOptionsProperty() {
     super(DictionaryType.COORDINATION_OPTION_DICT);
@@ -30,9 +30,9 @@ public CoordinationOptions initialValue() {
   }
 
   @Override
-  public CoordinationOptions fromAst(Element value, MessageReporter err) {
+  public CoordinationOptions fromAst(Element node, MessageReporter reporter) {
     var options = new CoordinationOptions();
-    for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+    for (KeyValuePair entry : node.getKeyvalue().getPairs()) {
       CoordinationOption option =
           (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT.forName(entry.getName());
       if (Objects.requireNonNull(option) == CoordinationOption.ADVANCE_MESSAGE_INTERVAL) {
@@ -43,7 +43,7 @@ public CoordinationOptions fromAst(Element value, MessageReporter err) {
   }
 
   @Override
-  protected CoordinationOptions fromString(String value, MessageReporter err) {
+  protected CoordinationOptions fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
@@ -60,10 +60,10 @@ public Element toAstElement() {
       KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
       pair.setName(opt.toString());
       if (opt == CoordinationOption.ADVANCE_MESSAGE_INTERVAL) {
-        if (this.value.advanceMessageInterval == null) {
+        if (this.get().advanceMessageInterval == null) {
           continue;
         }
-        pair.setValue(ASTUtils.toElement(value.advanceMessageInterval));
+        pair.setValue(ASTUtils.toElement(get().advanceMessageInterval));
       }
       kvp.getPairs().add(pair);
     }
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationModeProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
similarity index 56%
rename from core/src/main/java/org/lflang/target/property/CoordinationModeProperty.java
rename to core/src/main/java/org/lflang/target/property/CoordinationProperty.java
index 357ea9a818..d550fe5dc2 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationModeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
@@ -2,20 +2,17 @@
 
 import java.util.Arrays;
 import java.util.List;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetConfig;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
-import org.lflang.lf.KeyValuePair;
-import org.lflang.lf.Model;
-import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
+import org.lflang.target.property.CoordinationProperty.CoordinationMode;
 import org.lflang.target.property.type.UnionType;
 
-public class CoordinationModeProperty extends TargetPropertyConfig<CoordinationMode> {
+public class CoordinationProperty extends AbstractTargetProperty<CoordinationMode> {
 
-  public CoordinationModeProperty() {
+  public CoordinationProperty() {
     super(UnionType.COORDINATION_UNION);
   }
 
@@ -25,13 +22,13 @@ public CoordinationMode initialValue() {
   }
 
   @Override
-  public CoordinationMode fromAst(Element value, MessageReporter err) {
-    return fromString(ASTUtils.elementToSingleString(value), err);
+  public CoordinationMode fromAst(Element node, MessageReporter reporter) {
+    return fromString(ASTUtils.elementToSingleString(node), reporter);
   }
 
   @Override
-  protected CoordinationMode fromString(String value, MessageReporter err) {
-    return (CoordinationMode) UnionType.COORDINATION_UNION.forName(value);
+  protected CoordinationMode fromString(String string, MessageReporter reporter) {
+    return (CoordinationMode) UnionType.COORDINATION_UNION.forName(string);
   }
 
   @Override
@@ -39,13 +36,9 @@ public List<Target> supportedTargets() {
     return Arrays.asList(Target.C, Target.CCPP, Target.Python);
   }
 
-  @Override
-  public void validate(
-      KeyValuePair pair, Model ast, TargetConfig config, MessageReporter reporter) {}
-
   @Override
   public Element toAstElement() {
-    return ASTUtils.toElement(this.value.toString());
+    return ASTUtils.toElement(this.get().toString());
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/target/property/DefaultBooleanProperty.java b/core/src/main/java/org/lflang/target/property/DefaultBooleanProperty.java
deleted file mode 100644
index 2a5b29eeb5..0000000000
--- a/core/src/main/java/org/lflang/target/property/DefaultBooleanProperty.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.lflang.target.property;
-
-import org.lflang.MessageReporter;
-import org.lflang.TargetPropertyConfig;
-import org.lflang.ast.ASTUtils;
-import org.lflang.lf.Element;
-import org.lflang.target.property.type.PrimitiveType;
-
-public abstract class DefaultBooleanProperty extends TargetPropertyConfig<Boolean> {
-
-  public DefaultBooleanProperty() {
-    super(PrimitiveType.BOOLEAN);
-  }
-
-  @Override
-  public Boolean initialValue() {
-    return false;
-  }
-
-  @Override
-  public Boolean fromAst(Element value, MessageReporter err) {
-    return ASTUtils.toBoolean(value);
-  }
-
-  @Override
-  protected Boolean fromString(String value, MessageReporter err) {
-    return Boolean.parseBoolean(value);
-  }
-
-  @Override
-  public Element toAstElement() {
-    return ASTUtils.toElement(value);
-  }
-}
diff --git a/core/src/main/java/org/lflang/target/property/DefaultStringConfig.java b/core/src/main/java/org/lflang/target/property/DefaultStringConfig.java
deleted file mode 100644
index fde1825686..0000000000
--- a/core/src/main/java/org/lflang/target/property/DefaultStringConfig.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.lflang.target.property;
-
-import org.lflang.MessageReporter;
-import org.lflang.TargetPropertyConfig;
-import org.lflang.ast.ASTUtils;
-import org.lflang.lf.Element;
-import org.lflang.target.property.type.PrimitiveType;
-
-public abstract class DefaultStringConfig extends TargetPropertyConfig<String> {
-
-  public DefaultStringConfig() {
-    super(PrimitiveType.STRING);
-  }
-
-  @Override
-  public String initialValue() {
-    return "";
-  }
-
-  @Override
-  public String fromAst(Element value, MessageReporter err) {
-    return ASTUtils.elementToSingleString(value);
-  }
-
-  @Override
-  protected String fromString(String value, MessageReporter err) {
-    return value;
-  }
-
-  @Override
-  public Element toAstElement() {
-    return ASTUtils.toElement(value);
-  }
-}
diff --git a/core/src/main/java/org/lflang/target/property/DefaultStringListProperty.java b/core/src/main/java/org/lflang/target/property/DefaultStringListProperty.java
deleted file mode 100644
index 549496bb7e..0000000000
--- a/core/src/main/java/org/lflang/target/property/DefaultStringListProperty.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.lflang.target.property;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.lflang.MessageReporter;
-import org.lflang.TargetPropertyConfig;
-import org.lflang.ast.ASTUtils;
-import org.lflang.lf.Element;
-import org.lflang.target.property.type.UnionType;
-
-/** Note: {@code set} implements an "append" semantics. */
-public abstract class DefaultStringListProperty extends TargetPropertyConfig<List<String>> {
-
-  public DefaultStringListProperty() {
-    super(UnionType.STRING_OR_STRING_ARRAY);
-  }
-
-  @Override
-  public List<String> initialValue() {
-    return new ArrayList<>();
-  }
-
-  @Override
-  public void set(Element value, MessageReporter err) {
-    if (!this.isSet) {
-      super.set(value, err);
-    } else {
-      this.value.addAll(this.fromAst(value, err));
-    }
-  }
-
-  @Override
-  public void set(String string, MessageReporter err) {
-    if (!this.isSet) {
-      super.set(string, err);
-    } else {
-      this.value.addAll(this.fromString(string, err));
-    }
-  }
-
-  @Override
-  public List<String> fromAst(Element value, MessageReporter err) {
-    return ASTUtils.elementToListOfStrings(value);
-  }
-
-  @Override
-  protected List<String> fromString(String value, MessageReporter err) {
-    return List.of(value.split(" "));
-  }
-
-  @Override
-  public Element toAstElement() {
-    return ASTUtils.toElement(value);
-  }
-}
diff --git a/core/src/main/java/org/lflang/target/property/DockerProperty.java b/core/src/main/java/org/lflang/target/property/DockerProperty.java
index 82171a81cb..fb8b7d3920 100644
--- a/core/src/main/java/org/lflang/target/property/DockerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DockerProperty.java
@@ -3,10 +3,10 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetProperty.DictionaryElement;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -18,7 +18,7 @@
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.target.property.type.UnionType;
 
-public class DockerProperty extends TargetPropertyConfig<DockerOptions> {
+public class DockerProperty extends AbstractTargetProperty<DockerOptions> {
 
   public DockerProperty() {
     super(UnionType.DOCKER_UNION);
@@ -30,14 +30,14 @@ public DockerOptions initialValue() {
   }
 
   @Override
-  public DockerOptions fromAst(Element value, MessageReporter err) {
+  public DockerOptions fromAst(Element node, MessageReporter reporter) {
     var options = new DockerOptions(false);
-    if (value.getLiteral() != null) {
-      if (ASTUtils.toBoolean(value)) {
+    if (node.getLiteral() != null) {
+      if (ASTUtils.toBoolean(node)) {
         options.enabled = true;
       }
     } else {
-      for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+      for (KeyValuePair entry : node.getKeyvalue().getPairs()) {
         options.enabled = true;
         DockerOption option = (DockerOption) DictionaryType.DOCKER_DICT.forName(entry.getName());
         if (Objects.requireNonNull(option) == DockerOption.FROM) {
@@ -49,7 +49,7 @@ public DockerOptions fromAst(Element value, MessageReporter err) {
   }
 
   @Override
-  protected DockerOptions fromString(String value, MessageReporter err) {
+  protected DockerOptions fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
@@ -60,9 +60,9 @@ public List<Target> supportedTargets() {
 
   @Override
   public Element toAstElement() {
-    if (!this.value.enabled) {
+    if (!this.get().enabled) {
       return null;
-    } else if (this.value.equals(new DockerOptions(true))) {
+    } else if (this.get().equals(new DockerOptions(true))) {
       // default configuration
       return ASTUtils.toElement(true);
     } else {
@@ -72,10 +72,10 @@ public Element toAstElement() {
         KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
         pair.setName(opt.toString());
         if (opt == DockerOption.FROM) {
-          if (this.value.from == null) {
+          if (this.get().from == null) {
             continue;
           }
-          pair.setValue(ASTUtils.toElement(this.value.from));
+          pair.setValue(ASTUtils.toElement(this.get().from));
         }
         kvp.getPairs().add(pair);
       }
diff --git a/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java b/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
index 8e38f8881f..427f4eab17 100644
--- a/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-public class ExportDependencyGraphProperty extends DefaultBooleanProperty {
+public class ExportDependencyGraphProperty extends AbstractBooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java b/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
index d67fad9788..f9349afa6d 100644
--- a/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-public class ExportToYamlProperty extends DefaultBooleanProperty {
+public class ExportToYamlProperty extends AbstractBooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
index 92532597ba..fa418aa29b 100644
--- a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-public class ExternalRuntimePathProperty extends DefaultStringConfig {
+public class ExternalRuntimePathProperty extends AbstractStringConfig {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/FastProperty.java b/core/src/main/java/org/lflang/target/property/FastProperty.java
index 0f343472b3..941ae2ed04 100644
--- a/core/src/main/java/org/lflang/target/property/FastProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FastProperty.java
@@ -3,7 +3,6 @@
 import java.util.List;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetConfig;
 import org.lflang.lf.Action;
 import org.lflang.lf.ActionOrigin;
 import org.lflang.lf.KeyValuePair;
@@ -11,7 +10,7 @@
 import org.lflang.lf.Model;
 import org.lflang.lf.Reactor;
 
-public class FastProperty extends DefaultBooleanProperty {
+public class FastProperty extends AbstractBooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
@@ -19,8 +18,7 @@ public List<Target> supportedTargets() {
   }
 
   @Override
-  public void validate(
-      KeyValuePair pair, Model ast, TargetConfig config, MessageReporter reporter) {
+  public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
     if (pair != null) {
       // Check for federated
       for (Reactor reactor : ast.getReactors()) {
diff --git a/core/src/main/java/org/lflang/target/property/FedSetupProperty.java b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
index fb7290c680..3b2c539d47 100644
--- a/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
@@ -1,15 +1,15 @@
 package org.lflang.target.property;
 
 import java.util.List;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.util.StringUtil;
 
-public class FedSetupProperty extends TargetPropertyConfig<String> {
+public class FedSetupProperty extends AbstractTargetProperty<String> {
 
   public FedSetupProperty() {
     super(PrimitiveType.FILE);
@@ -21,13 +21,13 @@ public String initialValue() {
   }
 
   @Override
-  protected String fromAst(Element value, MessageReporter err) {
-    return StringUtil.removeQuotes(ASTUtils.elementToSingleString(value));
+  protected String fromAst(Element node, MessageReporter reporter) {
+    return StringUtil.removeQuotes(ASTUtils.elementToSingleString(node));
   }
 
   @Override
-  protected String fromString(String value, MessageReporter err) {
-    return value;
+  protected String fromString(String string, MessageReporter reporter) {
+    return string;
   }
 
   @Override
@@ -37,6 +37,6 @@ public List<Target> supportedTargets() {
 
   @Override
   public Element toAstElement() {
-    return ASTUtils.toElement(value);
+    return ASTUtils.toElement(get());
   }
 }
diff --git a/core/src/main/java/org/lflang/target/property/FilesProperty.java b/core/src/main/java/org/lflang/target/property/FilesProperty.java
index 8723a8441c..d7d5578431 100644
--- a/core/src/main/java/org/lflang/target/property/FilesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FilesProperty.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-public class FilesProperty extends DefaultFileListProperty {
+public class FilesProperty extends AbstractFileListProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
index 8490b74d2f..3c85a9c478 100644
--- a/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
+++ b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
@@ -3,12 +3,12 @@
 import java.util.List;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetConfig;
+import org.lflang.ast.ASTUtils;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
 
-public class KeepaliveProperty extends DefaultBooleanProperty {
+public class KeepaliveProperty extends AbstractBooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
@@ -16,10 +16,8 @@ public List<Target> supportedTargets() {
   }
 
   @Override
-  public void validate(
-      KeyValuePair pair, Model ast, TargetConfig config, MessageReporter reporter) {
-    super.validate(pair, ast, config, reporter);
-    if (pair != null && config.target == Target.CPP) {
+  public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
+    if (pair != null && ASTUtils.getTarget(ast) == Target.CPP) {
       reporter
           .at(pair, Literals.KEY_VALUE_PAIR__NAME)
           .warning(
diff --git a/core/src/main/java/org/lflang/target/property/LoggingProperty.java b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
index 7930adce4d..9c59b03f4d 100644
--- a/core/src/main/java/org/lflang/target/property/LoggingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
@@ -1,15 +1,15 @@
 package org.lflang.target.property;
 
 import java.util.List;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.LoggingProperty.LogLevel;
 import org.lflang.target.property.type.UnionType;
 
-public class LoggingProperty extends TargetPropertyConfig<LogLevel> {
+public class LoggingProperty extends AbstractTargetProperty<LogLevel> {
 
   public LoggingProperty() {
     super(UnionType.LOGGING_UNION);
@@ -21,11 +21,11 @@ public LogLevel initialValue() {
   }
 
   @Override
-  protected LogLevel fromAst(Element value, MessageReporter err) {
-    return fromString(ASTUtils.elementToSingleString(value), err);
+  protected LogLevel fromAst(Element node, MessageReporter reporter) {
+    return fromString(ASTUtils.elementToSingleString(node), reporter);
   }
 
-  protected LogLevel fromString(String string, MessageReporter err) {
+  protected LogLevel fromString(String string, MessageReporter reporter) {
     return LogLevel.valueOf(string.toUpperCase());
   }
 
@@ -36,7 +36,7 @@ public List<Target> supportedTargets() {
 
   @Override
   public Element toAstElement() {
-    return ASTUtils.toElement(value.toString());
+    return ASTUtils.toElement(get().toString());
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
index 555cbfaa3e..fa8c949d6f 100644
--- a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
+++ b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-public class NoCompileProperty extends DefaultBooleanProperty {
+public class NoCompileProperty extends AbstractBooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java b/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
index d183484195..dd0e91613c 100644
--- a/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
+++ b/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-public class NoRuntimeValidationProperty extends DefaultBooleanProperty {
+public class NoRuntimeValidationProperty extends AbstractBooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index efd7887127..78ac245a61 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -2,12 +2,11 @@
 
 import java.util.Arrays;
 import java.util.List;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.DictionaryElement;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -21,7 +20,7 @@
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.target.property.type.UnionType;
 
-public class PlatformProperty extends TargetPropertyConfig<PlatformOptions> {
+public class PlatformProperty extends AbstractTargetProperty<PlatformOptions> {
 
   public PlatformProperty() {
     super(UnionType.PLATFORM_STRING_OR_DICTIONARY);
@@ -33,11 +32,11 @@ public PlatformOptions initialValue() {
   }
 
   @Override
-  public PlatformOptions fromAst(Element value, MessageReporter err) {
+  public PlatformOptions fromAst(Element node, MessageReporter reporter) {
     var config = new PlatformOptions();
-    if (value.getLiteral() != null) {
+    if (node.getLiteral() != null) {
       config.platform =
-          (Platform) UnionType.PLATFORM_UNION.forName(ASTUtils.elementToSingleString(value));
+          (Platform) UnionType.PLATFORM_UNION.forName(ASTUtils.elementToSingleString(node));
       if (config.platform == null) {
         String s =
             "Unidentified Platform Type, LF supports the following platform types: "
@@ -46,7 +45,7 @@ public PlatformOptions fromAst(Element value, MessageReporter err) {
         throw new AssertionError(s);
       }
     } else {
-      for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+      for (KeyValuePair entry : node.getKeyvalue().getPairs()) {
         PlatformOption option =
             (PlatformOption) DictionaryType.PLATFORM_DICT.forName(entry.getName());
         switch (option) {
@@ -59,7 +58,7 @@ public PlatformOptions fromAst(Element value, MessageReporter err) {
               String s =
                   "Unidentified Platform Type, LF supports the following platform types: "
                       + Arrays.asList(Platform.values());
-              err.at(entry).error(s);
+              reporter.at(entry).error(s);
               throw new AssertionError(s);
             }
             config.platform = p;
@@ -78,7 +77,7 @@ public PlatformOptions fromAst(Element value, MessageReporter err) {
   }
 
   @Override
-  protected PlatformOptions fromString(String value, MessageReporter err) {
+  protected PlatformOptions fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
@@ -88,10 +87,7 @@ public List<Target> supportedTargets() {
   }
 
   @Override
-  public void validate(
-      KeyValuePair pair, Model ast, TargetConfig config, MessageReporter reporter) {
-    super.validate(pair, ast, config, reporter);
-
+  public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
     var threading = TargetProperty.getKeyValuePair(ast, TargetProperty.THREADING);
     if (threading != null) {
       if (pair != null && ASTUtils.toBoolean(threading.getValue())) {
@@ -129,12 +125,12 @@ public Element toAstElement() {
       KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
       pair.setName(opt.toString());
       switch (opt) {
-        case NAME -> pair.setValue(ASTUtils.toElement(value.platform.toString()));
-        case BAUDRATE -> pair.setValue(ASTUtils.toElement(value.baudRate));
-        case BOARD -> pair.setValue(ASTUtils.toElement(value.board));
-        case FLASH -> pair.setValue(ASTUtils.toElement(value.flash));
-        case PORT -> pair.setValue(ASTUtils.toElement(value.port));
-        case USER_THREADS -> pair.setValue(ASTUtils.toElement(value.userThreads));
+        case NAME -> pair.setValue(ASTUtils.toElement(get().platform.toString()));
+        case BAUDRATE -> pair.setValue(ASTUtils.toElement(get().baudRate));
+        case BOARD -> pair.setValue(ASTUtils.toElement(get().board));
+        case FLASH -> pair.setValue(ASTUtils.toElement(get().flash));
+        case PORT -> pair.setValue(ASTUtils.toElement(get().port));
+        case USER_THREADS -> pair.setValue(ASTUtils.toElement(get().userThreads));
       }
       kvp.getPairs().add(pair);
     }
diff --git a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
index 7cd00e165a..c100f3fc2c 100644
--- a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-public class PrintStatisticsProperty extends DefaultBooleanProperty {
+public class PrintStatisticsProperty extends AbstractBooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java b/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
index 00bcc10772..d8e0541bff 100644
--- a/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-public class ProtobufsProperty extends DefaultFileListProperty {
+public class ProtobufsProperty extends AbstractFileListProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
index 58deea240d..4545b64c5c 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
@@ -2,11 +2,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -14,7 +13,7 @@
 import org.lflang.lf.Model;
 import org.lflang.target.property.type.ArrayType;
 
-public class Ros2DependenciesProperty extends TargetPropertyConfig<List<String>> {
+public class Ros2DependenciesProperty extends AbstractTargetProperty<List<String>> {
 
   public Ros2DependenciesProperty() {
     super(ArrayType.STRING_ARRAY);
@@ -26,12 +25,12 @@ public List<String> initialValue() {
   }
 
   @Override
-  public List<String> fromAst(Element value, MessageReporter err) {
-    return ASTUtils.elementToListOfStrings(value);
+  public List<String> fromAst(Element node, MessageReporter reporter) {
+    return ASTUtils.elementToListOfStrings(node);
   }
 
   @Override
-  protected List<String> fromString(String value, MessageReporter err) {
+  protected List<String> fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
@@ -41,9 +40,7 @@ public List<Target> supportedTargets() {
   }
 
   @Override
-  public void validate(
-      KeyValuePair pair, Model ast, TargetConfig config, MessageReporter reporter) {
-    super.validate(pair, ast, config, reporter);
+  public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
     var ros2enabled = TargetProperty.getKeyValuePair(ast, TargetProperty.ROS2);
     if (pair != null && (ros2enabled == null || !ASTUtils.toBoolean(ros2enabled.getValue()))) {
       reporter
@@ -54,6 +51,6 @@ public void validate(
 
   @Override
   public Element toAstElement() {
-    return ASTUtils.toElement(value);
+    return ASTUtils.toElement(get());
   }
 }
diff --git a/core/src/main/java/org/lflang/target/property/Ros2Property.java b/core/src/main/java/org/lflang/target/property/Ros2Property.java
index 1a5bf9728d..b768f67d5d 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2Property.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2Property.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-public class Ros2Property extends DefaultBooleanProperty {
+public class Ros2Property extends AbstractBooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
index 27bbffb737..c46a5db83e 100644
--- a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-public class RuntimeVersionProperty extends DefaultStringConfig {
+public class RuntimeVersionProperty extends AbstractStringConfig {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
index 853ff81ac8..c448cba296 100644
--- a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
@@ -5,9 +5,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.emf.ecore.EObject;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Array;
 import org.lflang.lf.Element;
@@ -16,7 +16,7 @@
 import org.lflang.util.FileUtil;
 import org.lflang.util.StringUtil;
 
-public class RustIncludeProperty extends TargetPropertyConfig<List<Path>> {
+public class RustIncludeProperty extends AbstractTargetProperty<List<Path>> {
 
   public RustIncludeProperty() {
     super(UnionType.FILE_OR_FILE_ARRAY);
@@ -33,29 +33,29 @@ public List<Path> initialValue() {
   }
 
   @Override
-  public List<Path> fromAst(Element value, MessageReporter err) {
+  public List<Path> fromAst(Element node, MessageReporter reporter) {
     var list = new ArrayList<Path>();
     Path referencePath;
     try {
-      referencePath = FileUtil.toPath(value.eResource().getURI()).toAbsolutePath();
+      referencePath = FileUtil.toPath(node.eResource().getURI()).toAbsolutePath();
     } catch (IllegalArgumentException e) {
-      err.at(value).error("Invalid path? " + e.getMessage());
+      reporter.at(node).error("Invalid path? " + e.getMessage());
       throw e;
     }
 
     // we'll resolve relative paths to check that the files
     // are as expected.
 
-    if (value.getLiteral() != null) {
-      Path resolved = referencePath.resolveSibling(StringUtil.removeQuotes(value.getLiteral()));
-      if (this.checkTopLevelModule(resolved, value, err)) {
+    if (node.getLiteral() != null) {
+      Path resolved = referencePath.resolveSibling(StringUtil.removeQuotes(node.getLiteral()));
+      if (this.checkTopLevelModule(resolved, node, reporter)) {
         list.add(resolved);
       }
-    } else if (value.getArray() != null) {
-      for (Element element : value.getArray().getElements()) {
+    } else if (node.getArray() != null) {
+      for (Element element : node.getArray().getElements()) {
         String literal = StringUtil.removeQuotes(element.getLiteral());
         Path resolved = referencePath.resolveSibling(literal);
-        if (this.checkTopLevelModule(resolved, value, err)) {
+        if (this.checkTopLevelModule(resolved, node, reporter)) {
           list.add(resolved);
         }
       }
@@ -64,14 +64,14 @@ public List<Path> fromAst(Element value, MessageReporter err) {
   }
 
   @Override
-  protected List<Path> fromString(String value, MessageReporter err) {
+  protected List<Path> fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
   @Override
   public Element toAstElement() {
     // do not check paths here, and simply copy the absolute path over
-    List<Path> paths = this.value;
+    List<Path> paths = this.get();
     if (paths.isEmpty()) {
       return null;
     } else if (paths.size() == 1) {
diff --git a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
index f2747456c2..55b574e4b0 100644
--- a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
@@ -4,10 +4,9 @@
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetConfig;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -16,7 +15,7 @@
 import org.lflang.target.property.SchedulerProperty.SchedulerOption;
 import org.lflang.target.property.type.UnionType;
 
-public class SchedulerProperty extends TargetPropertyConfig<SchedulerOption> {
+public class SchedulerProperty extends AbstractTargetProperty<SchedulerOption> {
 
   public SchedulerProperty() {
     super(UnionType.SCHEDULER_UNION);
@@ -28,8 +27,8 @@ public SchedulerOption initialValue() {
   }
 
   @Override
-  public SchedulerOption fromAst(Element value, MessageReporter err) {
-    var scheduler = fromString(ASTUtils.elementToSingleString(value), err);
+  public SchedulerOption fromAst(Element node, MessageReporter reporter) {
+    var scheduler = fromString(ASTUtils.elementToSingleString(node), reporter);
     if (scheduler != null) {
       return scheduler;
     } else {
@@ -38,8 +37,8 @@ public SchedulerOption fromAst(Element value, MessageReporter err) {
   }
 
   @Override
-  protected SchedulerOption fromString(String value, MessageReporter err) {
-    return (SchedulerOption) UnionType.SCHEDULER_UNION.forName(value);
+  protected SchedulerOption fromString(String string, MessageReporter reporter) {
+    return (SchedulerOption) UnionType.SCHEDULER_UNION.forName(string);
   }
 
   @Override
@@ -49,13 +48,11 @@ public List<Target> supportedTargets() {
 
   @Override
   public Element toAstElement() {
-    return ASTUtils.toElement(this.value.toString());
+    return ASTUtils.toElement(this.get().toString());
   }
 
   @Override
-  public void validate(
-      KeyValuePair pair, Model ast, TargetConfig config, MessageReporter reporter) {
-    super.validate(pair, ast, config, reporter);
+  public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
     if (pair != null) {
       String schedulerName = ASTUtils.elementToSingleString(pair.getValue());
       try {
diff --git a/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java b/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
index 3e68141ab4..651526a642 100644
--- a/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-public class SingleFileProjectProperty extends DefaultBooleanProperty {
+public class SingleFileProjectProperty extends AbstractBooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/ThreadingProperty.java b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
index 7f596160df..483eb26603 100644
--- a/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-public class ThreadingProperty extends DefaultBooleanProperty {
+public class ThreadingProperty extends AbstractBooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
index 55c591f8a0..d5bd2310bf 100644
--- a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
@@ -1,15 +1,15 @@
 package org.lflang.target.property;
 
 import java.util.List;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
 
-public class TimeOutProperty extends TargetPropertyConfig<TimeValue> {
+public class TimeOutProperty extends AbstractTargetProperty<TimeValue> {
 
   public TimeOutProperty() {
     super(PrimitiveType.TIME_VALUE);
@@ -21,12 +21,12 @@ public TimeValue initialValue() {
   }
 
   @Override
-  public TimeValue fromAst(Element value, MessageReporter err) {
-    return ASTUtils.toTimeValue(value);
+  public TimeValue fromAst(Element node, MessageReporter reporter) {
+    return ASTUtils.toTimeValue(node);
   }
 
   @Override
-  protected TimeValue fromString(String value, MessageReporter err) {
+  protected TimeValue fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
@@ -37,6 +37,6 @@ public List<Target> supportedTargets() {
 
   @Override
   public Element toAstElement() {
-    return ASTUtils.toElement(value);
+    return ASTUtils.toElement(get());
   }
 }
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index 4bb9c54d40..1505d14a59 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -2,12 +2,11 @@
 
 import java.util.List;
 import java.util.Objects;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.TargetProperty.DictionaryElement;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -21,7 +20,7 @@
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.target.property.type.UnionType;
 
-public class TracingProperty extends TargetPropertyConfig<TracingOptions> {
+public class TracingProperty extends AbstractTargetProperty<TracingOptions> {
 
   public TracingProperty() {
     super(UnionType.TRACING_UNION);
@@ -33,14 +32,14 @@ public TracingOptions initialValue() {
   }
 
   @Override
-  public TracingOptions fromAst(Element value, MessageReporter err) {
+  public TracingOptions fromAst(Element node, MessageReporter reporter) {
     var options = new TracingOptions(false);
-    if (value.getLiteral() != null) {
-      if (ASTUtils.toBoolean(value)) {
+    if (node.getLiteral() != null) {
+      if (ASTUtils.toBoolean(node)) {
         options.enabled = true;
       }
     } else {
-      for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
+      for (KeyValuePair entry : node.getKeyvalue().getPairs()) {
         TracingOption option = (TracingOption) DictionaryType.TRACING_DICT.forName(entry.getName());
         switch (option) {
           case TRACE_FILE_NAME:
@@ -55,7 +54,7 @@ public TracingOptions fromAst(Element value, MessageReporter err) {
   }
 
   @Override
-  protected TracingOptions fromString(String value, MessageReporter err) {
+  protected TracingOptions fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
@@ -65,8 +64,7 @@ public List<Target> supportedTargets() {
   }
 
   @Override
-  public void validate(
-      KeyValuePair pair, Model ast, TargetConfig config, MessageReporter reporter) {
+  public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
     if (pair != null && this.fromAst(pair.getValue(), reporter) != null) {
       // If tracing is anything but "false" and threading is off, error.
       var threading = TargetProperty.getKeyValuePair(ast, TargetProperty.THREADING);
@@ -85,9 +83,9 @@ public void validate(
 
   @Override
   public Element toAstElement() {
-    if (!this.value.isEnabled()) {
+    if (!this.get().isEnabled()) {
       return null;
-    } else if (this.value.equals(new TracingOptions(true))) {
+    } else if (this.get().equals(new TracingOptions(true))) {
       // default values
       return ASTUtils.toElement(true);
     } else {
@@ -98,10 +96,10 @@ public Element toAstElement() {
         pair.setName(opt.toString());
         switch (opt) {
           case TRACE_FILE_NAME:
-            if (this.value.traceFileName == null) {
+            if (this.get().traceFileName == null) {
               continue;
             }
-            pair.setValue(ASTUtils.toElement(this.value.traceFileName));
+            pair.setValue(ASTUtils.toElement(this.get().traceFileName));
         }
         kvp.getPairs().add(pair);
       }
diff --git a/core/src/main/java/org/lflang/target/property/VerifyProperty.java b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
index 62116fc851..1065e4e147 100644
--- a/core/src/main/java/org/lflang/target/property/VerifyProperty.java
+++ b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
@@ -2,9 +2,9 @@
 
 import java.util.List;
 import org.lflang.Target;
-import org.lflang.target.property.DefaultBooleanProperty;
+import org.lflang.target.property.AbstractBooleanProperty;
 
-public class VerifyProperty extends DefaultBooleanProperty {
+public class VerifyProperty extends AbstractBooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/WorkersProperty.java b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
index 1ea091e567..823c6d8369 100644
--- a/core/src/main/java/org/lflang/target/property/WorkersProperty.java
+++ b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
@@ -1,14 +1,14 @@
 package org.lflang.target.property;
 
 import java.util.List;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetPropertyConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
 
-public class WorkersProperty extends TargetPropertyConfig<Integer> {
+public class WorkersProperty extends AbstractTargetProperty<Integer> {
 
   public WorkersProperty() {
     super(PrimitiveType.NON_NEGATIVE_INTEGER);
@@ -20,13 +20,13 @@ public Integer initialValue() {
   }
 
   @Override
-  protected Integer fromString(String value, MessageReporter err) {
-    return Integer.parseInt(value); // FIXME: check for exception
+  protected Integer fromString(String string, MessageReporter reporter) {
+    return Integer.parseInt(string); // FIXME: check for exception
   }
 
   @Override
-  protected Integer fromAst(Element value, MessageReporter err) {
-    return ASTUtils.toInteger(value);
+  protected Integer fromAst(Element node, MessageReporter reporter) {
+    return ASTUtils.toInteger(node);
   }
 
   @Override
@@ -36,6 +36,6 @@ public List<Target> supportedTargets() {
 
   @Override
   public Element toAstElement() {
-    return ASTUtils.toElement(value);
+    return ASTUtils.toElement(get());
   }
 }
diff --git a/core/src/main/java/org/lflang/target/property/type/UnionType.java b/core/src/main/java/org/lflang/target/property/type/UnionType.java
index 8b51f972c9..b044455115 100644
--- a/core/src/main/java/org/lflang/target/property/type/UnionType.java
+++ b/core/src/main/java/org/lflang/target/property/type/UnionType.java
@@ -10,7 +10,7 @@
 import org.lflang.lf.Element;
 import org.lflang.target.property.BuildTypeProperty;
 import org.lflang.target.property.ClockSyncModeProperty.ClockSyncMode;
-import org.lflang.target.property.CoordinationModeProperty.CoordinationMode;
+import org.lflang.target.property.CoordinationProperty.CoordinationMode;
 import org.lflang.target.property.LoggingProperty.LogLevel;
 import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.target.property.SchedulerProperty.SchedulerOption;

From 8703527b331d0f839d9c5b56d33ec88c17ddf616 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 30 Sep 2023 22:42:54 -0700
Subject: [PATCH 0941/1114] Address FIXME

---
 core/src/main/java/org/lflang/AbstractTargetProperty.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/AbstractTargetProperty.java b/core/src/main/java/org/lflang/AbstractTargetProperty.java
index bb39cd3943..c36e147a32 100644
--- a/core/src/main/java/org/lflang/AbstractTargetProperty.java
+++ b/core/src/main/java/org/lflang/AbstractTargetProperty.java
@@ -137,7 +137,7 @@ public void set(String value, MessageReporter err) {
 
   @Override
   public String toString() {
-    return value == null ? null : value.toString(); // FIXME: do not return null
+    return value == null ? "" : value.toString();
   }
 
   /**

From 21ce2e4bc0d4f6ebc5c98c43ed0a6fdfe63dafec Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 30 Sep 2023 22:45:24 -0700
Subject: [PATCH 0942/1114] Add comment

---
 core/src/main/java/org/lflang/AbstractTargetProperty.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/main/java/org/lflang/AbstractTargetProperty.java b/core/src/main/java/org/lflang/AbstractTargetProperty.java
index c36e147a32..49a603e443 100644
--- a/core/src/main/java/org/lflang/AbstractTargetProperty.java
+++ b/core/src/main/java/org/lflang/AbstractTargetProperty.java
@@ -180,6 +180,9 @@ public T get() {
    */
   protected abstract T fromString(String string, MessageReporter reporter);
 
+  /**
+   * Return a list of targets that support this target property.
+   */
   public abstract List<Target> supportedTargets();
 
   /**

From c1b2ff71917d1e54d9c6eeca8f4fe5824b09e1aa Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 30 Sep 2023 22:47:48 -0700
Subject: [PATCH 0943/1114] Move TargetConfig class

---
 .../java/org/lflang/tests/runtime/PythonTest.java           | 2 +-
 .../org/lflang/tests/serialization/SerializationTest.java   | 2 +-
 core/src/main/java/org/lflang/TargetProperty.java           | 1 +
 core/src/main/java/org/lflang/ast/ASTUtils.java             | 2 +-
 .../java/org/lflang/federated/generator/FedGenerator.java   | 2 +-
 .../org/lflang/federated/generator/FedTargetConfig.java     | 2 +-
 .../org/lflang/federated/generator/FederateInstance.java    | 2 +-
 .../org/lflang/federated/launcher/FedLauncherGenerator.java | 2 +-
 core/src/main/java/org/lflang/generator/GeneratorBase.java  | 2 +-
 core/src/main/java/org/lflang/generator/GeneratorUtils.java | 2 +-
 .../main/java/org/lflang/generator/LFGeneratorContext.java  | 2 +-
 core/src/main/java/org/lflang/generator/LFResource.java     | 2 +-
 core/src/main/java/org/lflang/generator/MainContext.java    | 2 +-
 core/src/main/java/org/lflang/generator/SubContext.java     | 2 +-
 .../main/java/org/lflang/generator/c/CCmakeGenerator.java   | 2 +-
 core/src/main/java/org/lflang/generator/c/CCompiler.java    | 2 +-
 .../lflang/generator/c/CEnvironmentFunctionGenerator.java   | 2 +-
 core/src/main/java/org/lflang/generator/c/CGenerator.java   | 2 +-
 .../java/org/lflang/generator/c/CMainFunctionGenerator.java | 2 +-
 .../java/org/lflang/generator/c/CPreambleGenerator.java     | 2 +-
 .../java/org/lflang/generator/c/CReactionGenerator.java     | 2 +-
 .../org/lflang/generator/c/CTriggerObjectsGenerator.java    | 2 +-
 core/src/main/java/org/lflang/generator/c/CUtil.java        | 2 +-
 .../lflang/generator/python/PythonPreambleGenerator.java    | 2 +-
 .../java/org/lflang/generator/rust/RustTargetConfig.java    | 3 ++-
 .../src/main/java/org/lflang/{ => target}/TargetConfig.java | 6 +++++-
 core/src/main/java/org/lflang/util/ArduinoUtil.java         | 2 +-
 core/src/main/java/org/lflang/validation/LFValidator.java   | 2 +-
 .../kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt | 2 +-
 .../kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt | 2 +-
 .../org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt | 2 +-
 .../org/lflang/generator/cpp/CppStandaloneMainGenerator.kt  | 2 +-
 .../main/kotlin/org/lflang/generator/rust/RustFileConfig.kt | 1 -
 core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt | 1 +
 .../org/lflang/generator/ts/TSConstructorGenerator.kt       | 2 +-
 .../org/lflang/generator/ts/TSParameterPreambleGenerator.kt | 2 +-
 .../kotlin/org/lflang/generator/ts/TSReactorGenerator.kt    | 1 +
 core/src/testFixtures/java/org/lflang/tests/TestBase.java   | 2 +-
 38 files changed, 42 insertions(+), 35 deletions(-)
 rename core/src/main/java/org/lflang/{ => target}/TargetConfig.java (98%)

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
index 5b72c406d9..c227018d16 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
@@ -29,7 +29,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.lflang.Target;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.tests.RuntimeTest;
 
 /**
diff --git a/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java b/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
index 8f92c63437..d72495e540 100644
--- a/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.lflang.Target;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry.TestCategory;
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 81b22ff7ba..96b93073cb 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -40,6 +40,7 @@
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
 import org.lflang.lf.TargetDecl;
+import org.lflang.target.TargetConfig;
 import org.lflang.target.property.AuthProperty;
 import org.lflang.target.property.BuildCommandsProperty;
 import org.lflang.target.property.BuildTypeProperty;
diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index fc054e5018..694cddfb00 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -61,7 +61,7 @@
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.generator.CodeMap;
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index af3f383e2c..ad7b4f7137 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -31,7 +31,7 @@
 import org.lflang.LFStandaloneSetup;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.launcher.FedLauncherGenerator;
 import org.lflang.federated.launcher.RtiConfig;
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
index 852cb762e1..74e3893b02 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
@@ -5,7 +5,7 @@
 import java.nio.file.Path;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.lflang.MessageReporter;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGeneratorContext;
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index 1b3f9f5669..9602f98047 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -37,7 +37,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.lflang.MessageReporter;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.serialization.SupportedSerializers;
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index 61d3deef77..d9a7417964 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -34,7 +34,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.lflang.MessageReporter;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
 import org.lflang.target.property.ClockSyncModeProperty.ClockSyncMode;
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 183dd6a0e5..544a31cabd 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -43,7 +43,7 @@
 import org.lflang.MainConflictChecker;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.analyses.uclid.UclidGenerator;
 import org.lflang.ast.ASTUtils;
 import org.lflang.ast.AstTransformation;
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index b7a35ca6a2..deca5153ac 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -12,7 +12,7 @@
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.LFGeneratorContext.Mode;
diff --git a/core/src/main/java/org/lflang/generator/LFGeneratorContext.java b/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
index 142a51a209..03b050f9a3 100644
--- a/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
+++ b/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
@@ -8,7 +8,7 @@
 import org.eclipse.xtext.generator.IGeneratorContext;
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 
 /**
  * An {@code LFGeneratorContext} is the context of a Lingua Franca build process. It is the point of
diff --git a/core/src/main/java/org/lflang/generator/LFResource.java b/core/src/main/java/org/lflang/generator/LFResource.java
index 42367dd24f..02fe98d032 100644
--- a/core/src/main/java/org/lflang/generator/LFResource.java
+++ b/core/src/main/java/org/lflang/generator/LFResource.java
@@ -2,7 +2,7 @@
 
 import org.eclipse.emf.ecore.resource.Resource;
 import org.lflang.FileConfig;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 
 /**
  * A class that keeps metadata for discovered resources during code generation and the supporting
diff --git a/core/src/main/java/org/lflang/generator/MainContext.java b/core/src/main/java/org/lflang/generator/MainContext.java
index 7357929c06..cfd92cb527 100644
--- a/core/src/main/java/org/lflang/generator/MainContext.java
+++ b/core/src/main/java/org/lflang/generator/MainContext.java
@@ -11,7 +11,7 @@
 import org.lflang.DefaultMessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.generator.IntegratedBuilder.ReportProgress;
 
 /**
diff --git a/core/src/main/java/org/lflang/generator/SubContext.java b/core/src/main/java/org/lflang/generator/SubContext.java
index 9c2bb24e5c..5c0198ec6e 100644
--- a/core/src/main/java/org/lflang/generator/SubContext.java
+++ b/core/src/main/java/org/lflang/generator/SubContext.java
@@ -4,7 +4,7 @@
 import org.eclipse.xtext.util.CancelIndicator;
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 
 /**
  * A {@code SubContext} is the context of a process within a build process. For example, compilation
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index c24fc60ac2..8fd4ad0077 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -33,7 +33,7 @@
 import java.util.stream.Stream;
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.util.FileUtil;
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index a8bfa1f328..b917082431 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -35,7 +35,7 @@
 import java.util.stream.Stream;
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.generator.GeneratorBase;
 import org.lflang.generator.GeneratorCommandFactory;
 import org.lflang.generator.GeneratorUtils;
diff --git a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
index d04eae4540..a559d1188c 100644
--- a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -2,7 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ReactorInstance;
 
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index f6a2daa7ae..ee04d6d795 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -52,7 +52,7 @@
 import org.eclipse.xtext.xbase.lib.StringExtensions;
 import org.lflang.FileConfig;
 import org.lflang.Target;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.ast.DelayedConnectionTransformation;
 import org.lflang.federated.extensions.CExtensionUtils;
diff --git a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
index 824de835b8..4b48277726 100644
--- a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
@@ -2,7 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.util.StringUtil;
diff --git a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
index 6a241b37aa..954102a9cf 100644
--- a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
@@ -3,7 +3,7 @@
 import static org.lflang.util.StringUtil.addDoubleQuotes;
 
 import java.nio.file.Path;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.util.StringUtil;
diff --git a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
index c43cfa61f0..d55e74ab9a 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
@@ -11,7 +11,7 @@
 import java.util.Set;
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.extensions.CExtensionUtils;
 import org.lflang.generator.CodeBuilder;
diff --git a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 0db0c8c351..43391623df 100644
--- a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -14,7 +14,7 @@
 import java.util.HashSet;
 import java.util.stream.Collectors;
 import org.lflang.AttributeUtils;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.extensions.CExtensionUtils;
 import org.lflang.generator.CodeBuilder;
diff --git a/core/src/main/java/org/lflang/generator/c/CUtil.java b/core/src/main/java/org/lflang/generator/c/CUtil.java
index a92ef82c93..b3fa8ab04c 100644
--- a/core/src/main/java/org/lflang/generator/c/CUtil.java
+++ b/core/src/main/java/org/lflang/generator/c/CUtil.java
@@ -39,7 +39,7 @@
 import org.lflang.FileConfig;
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.GeneratorCommandFactory;
diff --git a/core/src/main/java/org/lflang/generator/python/PythonPreambleGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonPreambleGenerator.java
index bd1291425f..bf304c3106 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonPreambleGenerator.java
@@ -3,7 +3,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.c.CPreambleGenerator;
diff --git a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
index e67dc59dcb..9ad8b08716 100644
--- a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
+++ b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
@@ -24,6 +24,7 @@
 
 package org.lflang.generator.rust;
 
+import org.lflang.target.TargetConfig;
 import org.lflang.target.property.BuildTypeProperty;
 import org.lflang.target.property.BuildTypeProperty.BuildType;
 import org.lflang.target.property.CargoDependenciesProperty;
@@ -31,7 +32,7 @@
 import org.lflang.target.property.RustIncludeProperty;
 
 /**
- * Rust-specific part of a {@link org.lflang.TargetConfig}.
+ * Rust-specific part of a {@link TargetConfig}.
  *
  * @author Clément Fournier - TU Dresden, INSA Rennes
  */
diff --git a/core/src/main/java/org/lflang/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
similarity index 98%
rename from core/src/main/java/org/lflang/TargetConfig.java
rename to core/src/main/java/org/lflang/target/TargetConfig.java
index 6a0958fbca..ba44b39b2b 100644
--- a/core/src/main/java/org/lflang/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -22,11 +22,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
-package org.lflang;
+package org.lflang.target;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
+
+import org.lflang.MessageReporter;
+import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.generator.rust.RustTargetConfig;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.TargetDecl;
diff --git a/core/src/main/java/org/lflang/util/ArduinoUtil.java b/core/src/main/java/org/lflang/util/ArduinoUtil.java
index 4903f8c719..04fd119131 100644
--- a/core/src/main/java/org/lflang/util/ArduinoUtil.java
+++ b/core/src/main/java/org/lflang/util/ArduinoUtil.java
@@ -8,7 +8,7 @@
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.generator.GeneratorCommandFactory;
 import org.lflang.generator.LFGeneratorContext;
 
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 6d93ef2492..5c269ae310 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -59,7 +59,7 @@
 import org.lflang.InferredType;
 import org.lflang.ModelInfo;
 import org.lflang.Target;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
index 8e44d95940..82b881ea25 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
@@ -1,7 +1,7 @@
 package org.lflang.generator.cpp
 
 import org.lflang.MessageReporter
-import org.lflang.TargetConfig
+import org.lflang.target.TargetConfig
 import org.lflang.generator.GeneratorCommandFactory
 import org.lflang.generator.LFGeneratorContext
 import org.lflang.toDefinition
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
index ae9925d5e5..15c523e4f8 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
@@ -1,6 +1,6 @@
 package org.lflang.generator.cpp
 
-import org.lflang.TargetConfig
+import org.lflang.target.TargetConfig
 import org.lflang.lf.Reactor
 import org.lflang.toUnixString
 
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
index 61e3375c36..b456145342 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
@@ -25,7 +25,7 @@
 package org.lflang.generator.cpp
 
 import org.lflang.FileConfig
-import org.lflang.TargetConfig
+import org.lflang.target.TargetConfig
 import org.lflang.generator.PrependOperator
 import org.lflang.joinWithLn
 import org.lflang.toUnixString
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt
index 41679daf4e..0504be555c 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt
@@ -1,6 +1,6 @@
 package org.lflang.generator.cpp
 
-import org.lflang.TargetConfig
+import org.lflang.target.TargetConfig
 import org.lflang.generator.PrependOperator
 import org.lflang.inferredType
 import org.lflang.lf.Parameter
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustFileConfig.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustFileConfig.kt
index 6e12986e03..9c68cd3f85 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustFileConfig.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustFileConfig.kt
@@ -26,7 +26,6 @@ package org.lflang.generator.rust
 
 import org.eclipse.emf.ecore.resource.Resource
 import org.lflang.FileConfig
-import org.lflang.TargetConfig
 import org.lflang.camelToSnakeCase
 import org.lflang.generator.CodeMap
 import org.lflang.util.FileUtil
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
index 2ab9af11e8..f0fbf1ad10 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
@@ -31,6 +31,7 @@ import org.lflang.ast.ASTUtils
 import org.lflang.generator.*
 import org.lflang.lf.*
 import org.lflang.lf.Timer
+import org.lflang.target.TargetConfig
 import java.nio.file.Path
 import java.util.*
 
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
index 2d1376fae9..fe25d3207b 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
@@ -1,7 +1,7 @@
 package org.lflang.generator.ts
 
 import org.lflang.MessageReporter
-import org.lflang.TargetConfig
+import org.lflang.target.TargetConfig
 import org.lflang.generator.PrependOperator
 import org.lflang.generator.getTargetInitializer
 import org.lflang.lf.Parameter
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
index dc68c7f2f9..4efc48d045 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
@@ -26,7 +26,7 @@
 package org.lflang.generator.ts
 
 import org.lflang.FileConfig
-import org.lflang.TargetConfig
+import org.lflang.target.TargetConfig
 import org.lflang.joinWithLn
 import org.lflang.lf.Parameter
 import org.lflang.lf.Reactor
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
index 73da56bf4c..f9520bbecb 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSReactorGenerator.kt
@@ -3,6 +3,7 @@ package org.lflang.generator.ts
 import org.lflang.*
 import org.lflang.generator.PrependOperator
 import org.lflang.lf.*
+import org.lflang.target.TargetConfig
 import java.util.*
 
 /**
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index df97b3ea5d..23fdac9afa 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -39,7 +39,7 @@
 import org.lflang.LFRuntimeModule;
 import org.lflang.LFStandaloneSetup;
 import org.lflang.Target;
-import org.lflang.TargetConfig;
+import org.lflang.target.TargetConfig;
 import org.lflang.generator.GeneratorResult;
 import org.lflang.generator.LFGenerator;
 import org.lflang.generator.LFGeneratorContext;

From 764bde2d70614a948879cbc591a8a3ab79c56ec1 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 30 Sep 2023 23:31:36 -0700
Subject: [PATCH 0944/1114] Comments and minor changes

---
 .../org/lflang/AbstractTargetProperty.java    |  4 +--
 .../main/java/org/lflang/TargetProperty.java  | 33 +++++++++++--------
 .../main/java/org/lflang/ast/ASTUtils.java    |  2 +-
 .../federated/generator/FedGenerator.java     |  2 +-
 .../federated/generator/FedTargetConfig.java  |  2 +-
 .../federated/generator/FederateInstance.java |  2 +-
 .../launcher/FedLauncherGenerator.java        |  2 +-
 .../org/lflang/generator/GeneratorBase.java   |  2 +-
 .../org/lflang/generator/GeneratorUtils.java  |  5 +--
 .../org/lflang/generator/MainContext.java     |  2 +-
 .../lflang/generator/c/CCmakeGenerator.java   |  2 +-
 .../org/lflang/generator/c/CCompiler.java     |  2 +-
 .../c/CEnvironmentFunctionGenerator.java      |  2 +-
 .../org/lflang/generator/c/CGenerator.java    |  2 +-
 .../generator/c/CMainFunctionGenerator.java   |  2 +-
 .../generator/c/CPreambleGenerator.java       |  2 +-
 .../generator/c/CReactionGenerator.java       |  2 +-
 .../generator/c/CTriggerObjectsGenerator.java |  2 +-
 .../java/org/lflang/generator/c/CUtil.java    |  2 +-
 .../python/PythonPreambleGenerator.java       |  2 +-
 .../java/org/lflang/target/TargetConfig.java  |  7 ++--
 .../property/ClockSyncOptionsProperty.java    |  2 +-
 .../property/CoordinationOptionsProperty.java |  2 +-
 .../target/property/DockerProperty.java       |  2 +-
 .../target/property/PlatformProperty.java     |  2 +-
 .../target/property/TracingProperty.java      |  2 +-
 .../target/property/type/DictionaryType.java  |  6 +++-
 .../java/org/lflang/util/ArduinoUtil.java     |  2 +-
 .../org/lflang/validation/LFValidator.java    |  9 ++---
 .../compiler/LinguaFrancaValidationTest.java  |  2 +-
 .../java/org/lflang/tests/TestBase.java       |  2 +-
 31 files changed, 59 insertions(+), 55 deletions(-)

diff --git a/core/src/main/java/org/lflang/AbstractTargetProperty.java b/core/src/main/java/org/lflang/AbstractTargetProperty.java
index 49a603e443..2ed2ebb752 100644
--- a/core/src/main/java/org/lflang/AbstractTargetProperty.java
+++ b/core/src/main/java/org/lflang/AbstractTargetProperty.java
@@ -180,9 +180,7 @@ public T get() {
    */
   protected abstract T fromString(String string, MessageReporter reporter);
 
-  /**
-   * Return a list of targets that support this target property.
-   */
+  /** Return a list of targets that support this target property. */
   public abstract List<Target> supportedTargets();
 
   /**
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 96b93073cb..c2e948da6b 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -78,7 +78,6 @@
 import org.lflang.target.property.TimeOutProperty;
 import org.lflang.target.property.TracingProperty;
 import org.lflang.target.property.WorkersProperty;
-import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.target.property.type.VerifyProperty;
 import org.lflang.validation.ValidatorMessageReporter;
 
@@ -360,7 +359,7 @@ public static List<TargetProperty> loaded(TargetConfig config) {
   }
 
   /**
-   * Constructs a TargetDecl by extracting the fields of the given TargetConfig.
+   * Constructs a {@code TargetDecl} by extracting the fields of the given {@code TargetConfig}.
    *
    * @param target The target to generate for.
    * @param config The TargetConfig to extract from.
@@ -377,8 +376,15 @@ public static TargetDecl extractTargetDecl(Target target, TargetConfig config) {
     return decl;
   }
 
-  private static KeyValuePair getKeyValuePair(
-      KeyValuePairs targetProperties, TargetProperty property) {
+  /**
+   * Retrieve a key-value pair from the given AST that matches the given target property.
+   *
+   * @param ast The AST retrieve the key-value pair from.
+   * @param property The target property of interest.
+   * @return The found key-value pair, or {@code null} if no matching pair could be found.
+   */
+  public static KeyValuePair getKeyValuePair(Model ast, TargetProperty property) {
+    var targetProperties = ast.getTarget().getConfig();
     List<KeyValuePair> properties =
         targetProperties.getPairs().stream()
             .filter(pair -> pair.getName().equals(property.toString()))
@@ -387,15 +393,19 @@ private static KeyValuePair getKeyValuePair(
     return properties.size() > 0 ? properties.get(0) : null;
   }
 
-  public static KeyValuePair getKeyValuePair(Model ast, TargetProperty property) {
-    return getKeyValuePair(ast.getTarget().getConfig(), property);
-  }
-
   /** Return a list containing the keys of all properties */
   public static List<String> getPropertyKeys() {
-    return Arrays.stream(TargetProperty.values()).map(TargetProperty::getKey).toList();
+    return Arrays.stream(TargetProperty.values()).map(TargetProperty::toString).toList();
   }
 
+  /**
+   * Validate the given key-value pairs and report issues via the given reporter.
+   *
+   * @param pairs The key-value pairs to validate.
+   * @param ast The root node of the AST from which the key-value pairs were taken.
+   * @param config A target configuration used to retrieve the corresponding target properties.
+   * @param reporter A reporter to report errors and warnings through.
+   */
   public static void validate(
       KeyValuePairs pairs, Model ast, TargetConfig config, ValidatorMessageReporter reporter) {
     pairs.getPairs().stream()
@@ -487,9 +497,4 @@ public String toString() {
     }
     return this.name().toLowerCase().replaceAll("_", "-");
   }
-
-  /** Interface for dictionary elements. It associates an entry with a type. */
-  public interface DictionaryElement {
-    TargetPropertyType getType();
-  }
 }
diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 694cddfb00..132682a84a 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -61,7 +61,6 @@
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.target.TargetConfig;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.generator.CodeMap;
@@ -102,6 +101,7 @@
 import org.lflang.lf.Watchdog;
 import org.lflang.lf.WidthSpec;
 import org.lflang.lf.WidthTerm;
+import org.lflang.target.TargetConfig;
 import org.lflang.util.StringUtil;
 
 /**
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index ad7b4f7137..9bad080b7a 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -31,7 +31,6 @@
 import org.lflang.LFStandaloneSetup;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.target.TargetConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.launcher.FedLauncherGenerator;
 import org.lflang.federated.launcher.RtiConfig;
@@ -58,6 +57,7 @@
 import org.lflang.lf.Reactor;
 import org.lflang.lf.TargetDecl;
 import org.lflang.lf.VarRef;
+import org.lflang.target.TargetConfig;
 import org.lflang.target.property.CoordinationProperty.CoordinationMode;
 import org.lflang.util.Averager;
 
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
index 74e3893b02..aa0a054907 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
@@ -5,10 +5,10 @@
 import java.nio.file.Path;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.lflang.MessageReporter;
-import org.lflang.target.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGeneratorContext;
+import org.lflang.target.TargetConfig;
 import org.lflang.util.FileUtil;
 
 /**
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
index 9602f98047..799a403601 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateInstance.java
@@ -37,7 +37,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.lflang.MessageReporter;
-import org.lflang.target.TargetConfig;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.serialization.SupportedSerializers;
@@ -64,6 +63,7 @@
 import org.lflang.lf.TriggerRef;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
+import org.lflang.target.TargetConfig;
 
 /**
  * Class that represents an instance of a federate, i.e., a reactor that is instantiated at the top
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index d9a7417964..bc4ec28087 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -34,9 +34,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.lflang.MessageReporter;
-import org.lflang.target.TargetConfig;
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
+import org.lflang.target.TargetConfig;
 import org.lflang.target.property.ClockSyncModeProperty.ClockSyncMode;
 
 /**
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 544a31cabd..31e3408266 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -43,12 +43,12 @@
 import org.lflang.MainConflictChecker;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.target.TargetConfig;
 import org.lflang.analyses.uclid.UclidGenerator;
 import org.lflang.ast.ASTUtils;
 import org.lflang.ast.AstTransformation;
 import org.lflang.graph.InstantiationGraph;
 import org.lflang.lf.*;
+import org.lflang.target.TargetConfig;
 import org.lflang.util.FileUtil;
 import org.lflang.validation.AbstractLFValidator;
 
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index deca5153ac..e7f1c6b89c 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -12,7 +12,7 @@
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
-import org.lflang.target.TargetConfig;
+import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.LFGeneratorContext.Mode;
@@ -23,6 +23,7 @@
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.TargetDecl;
+import org.lflang.target.TargetConfig;
 
 /**
  * A helper class with functions that may be useful for code generators. This is created to ease our
@@ -118,7 +119,7 @@ public static LFResource getLFResource(
       MessageReporter messageReporter) {
     var target = ASTUtils.targetDecl(resource);
     KeyValuePairs config = target.getConfig();
-    var targetConfig = new TargetConfig(target);
+    var targetConfig = new TargetConfig(Target.fromDecl(target));
     if (config != null) {
       List<KeyValuePair> pairs = config.getPairs();
       TargetProperty.load(targetConfig, pairs != null ? pairs : List.of(), messageReporter);
diff --git a/core/src/main/java/org/lflang/generator/MainContext.java b/core/src/main/java/org/lflang/generator/MainContext.java
index cfd92cb527..dbe34946e3 100644
--- a/core/src/main/java/org/lflang/generator/MainContext.java
+++ b/core/src/main/java/org/lflang/generator/MainContext.java
@@ -11,8 +11,8 @@
 import org.lflang.DefaultMessageReporter;
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
-import org.lflang.target.TargetConfig;
 import org.lflang.generator.IntegratedBuilder.ReportProgress;
+import org.lflang.target.TargetConfig;
 
 /**
  * A {@code MainContext} is an {@code LFGeneratorContext} that is not nested in any other generator
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 8fd4ad0077..df6e6abb57 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -33,8 +33,8 @@
 import java.util.stream.Stream;
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
-import org.lflang.target.TargetConfig;
 import org.lflang.generator.CodeBuilder;
+import org.lflang.target.TargetConfig;
 import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.util.FileUtil;
 
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index b917082431..55d5cb2b3b 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -35,11 +35,11 @@
 import java.util.stream.Stream;
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
-import org.lflang.target.TargetConfig;
 import org.lflang.generator.GeneratorBase;
 import org.lflang.generator.GeneratorCommandFactory;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGeneratorContext;
+import org.lflang.target.TargetConfig;
 import org.lflang.target.property.BuildTypeProperty;
 import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.util.FileUtil;
diff --git a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
index a559d1188c..39569d0725 100644
--- a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -2,9 +2,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.lflang.target.TargetConfig;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ReactorInstance;
+import org.lflang.target.TargetConfig;
 
 /**
  * This class is in charge of code generating functions and global variables related to the
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index ee04d6d795..90c9b41080 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -52,7 +52,6 @@
 import org.eclipse.xtext.xbase.lib.StringExtensions;
 import org.lflang.FileConfig;
 import org.lflang.Target;
-import org.lflang.target.TargetConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.ast.DelayedConnectionTransformation;
 import org.lflang.federated.extensions.CExtensionUtils;
@@ -86,6 +85,7 @@
 import org.lflang.lf.ReactorDecl;
 import org.lflang.lf.StateVar;
 import org.lflang.lf.Variable;
+import org.lflang.target.TargetConfig;
 import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.target.property.PlatformProperty.PlatformOption;
 import org.lflang.target.property.SchedulerProperty.SchedulerOption;
diff --git a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
index 4b48277726..e8c58bd92f 100644
--- a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
@@ -2,8 +2,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.lflang.target.TargetConfig;
 import org.lflang.generator.CodeBuilder;
+import org.lflang.target.TargetConfig;
 import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.util.StringUtil;
 
diff --git a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
index 954102a9cf..c0cda07b3f 100644
--- a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
@@ -3,8 +3,8 @@
 import static org.lflang.util.StringUtil.addDoubleQuotes;
 
 import java.nio.file.Path;
-import org.lflang.target.TargetConfig;
 import org.lflang.generator.CodeBuilder;
+import org.lflang.target.TargetConfig;
 import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.util.StringUtil;
 
diff --git a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
index d55e74ab9a..b5db35ce92 100644
--- a/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
@@ -11,7 +11,6 @@
 import java.util.Set;
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
-import org.lflang.target.TargetConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.extensions.CExtensionUtils;
 import org.lflang.generator.CodeBuilder;
@@ -33,6 +32,7 @@
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
 import org.lflang.lf.Watchdog;
+import org.lflang.target.TargetConfig;
 import org.lflang.util.StringUtil;
 
 public class CReactionGenerator {
diff --git a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 43391623df..8cd050b8a0 100644
--- a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -14,7 +14,6 @@
 import java.util.HashSet;
 import java.util.stream.Collectors;
 import org.lflang.AttributeUtils;
-import org.lflang.target.TargetConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.extensions.CExtensionUtils;
 import org.lflang.generator.CodeBuilder;
@@ -23,6 +22,7 @@
 import org.lflang.generator.ReactorInstance;
 import org.lflang.generator.RuntimeRange;
 import org.lflang.generator.SendRange;
+import org.lflang.target.TargetConfig;
 import org.lflang.target.property.LoggingProperty.LogLevel;
 
 /**
diff --git a/core/src/main/java/org/lflang/generator/c/CUtil.java b/core/src/main/java/org/lflang/generator/c/CUtil.java
index b3fa8ab04c..b3bd6d2c24 100644
--- a/core/src/main/java/org/lflang/generator/c/CUtil.java
+++ b/core/src/main/java/org/lflang/generator/c/CUtil.java
@@ -39,7 +39,6 @@
 import org.lflang.FileConfig;
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
-import org.lflang.target.TargetConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.GeneratorCommandFactory;
@@ -54,6 +53,7 @@
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
 import org.lflang.lf.WidthTerm;
+import org.lflang.target.TargetConfig;
 import org.lflang.util.FileUtil;
 import org.lflang.util.LFCommand;
 
diff --git a/core/src/main/java/org/lflang/generator/python/PythonPreambleGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonPreambleGenerator.java
index bf304c3106..305b2a78b7 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonPreambleGenerator.java
@@ -3,11 +3,11 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import org.lflang.target.TargetConfig;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.c.CPreambleGenerator;
 import org.lflang.lf.Preamble;
+import org.lflang.target.TargetConfig;
 
 /**
  * Generates user-defined preambles and #define and #include directives for the Python target.
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index ba44b39b2b..2347ccba62 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -27,7 +27,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
-
 import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetProperty;
@@ -87,8 +86,8 @@ public class TargetConfig {
    *
    * @param target AST node of a target declaration.
    */
-  public TargetConfig(TargetDecl target) { // FIXME: eliminate this constructor if we can
-    this.target = Target.fromDecl(target);
+  public TargetConfig(Target target) {
+    this.target = target;
   }
 
   /**
@@ -100,7 +99,7 @@ public TargetConfig(TargetDecl target) { // FIXME: eliminate this constructor if
    * @param messageReporter An error reporter to report problems.
    */
   public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messageReporter) {
-    this(target);
+    this(Target.fromDecl(target));
     if (target.getConfig() != null) {
       List<KeyValuePair> pairs = target.getConfig().getPairs();
       TargetProperty.load(this, pairs, messageReporter);
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
index 6428580624..e994ab1035 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
@@ -5,7 +5,6 @@
 import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetProperty.DictionaryElement;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
@@ -15,6 +14,7 @@
 import org.lflang.lf.LfFactory;
 import org.lflang.target.property.ClockSyncOptionsProperty.ClockSyncOptions;
 import org.lflang.target.property.type.DictionaryType;
+import org.lflang.target.property.type.DictionaryType.DictionaryElement;
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.TargetPropertyType;
 
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
index 7d01e5af7d..348b6f31b7 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
@@ -6,7 +6,6 @@
 import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetProperty.DictionaryElement;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
@@ -15,6 +14,7 @@
 import org.lflang.lf.LfFactory;
 import org.lflang.target.property.CoordinationOptionsProperty.CoordinationOptions;
 import org.lflang.target.property.type.DictionaryType;
+import org.lflang.target.property.type.DictionaryType.DictionaryElement;
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.TargetPropertyType;
 
diff --git a/core/src/main/java/org/lflang/target/property/DockerProperty.java b/core/src/main/java/org/lflang/target/property/DockerProperty.java
index fb8b7d3920..ffd488f07a 100644
--- a/core/src/main/java/org/lflang/target/property/DockerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DockerProperty.java
@@ -6,7 +6,6 @@
 import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetProperty.DictionaryElement;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -14,6 +13,7 @@
 import org.lflang.lf.LfFactory;
 import org.lflang.target.property.DockerProperty.DockerOptions;
 import org.lflang.target.property.type.DictionaryType;
+import org.lflang.target.property.type.DictionaryType.DictionaryElement;
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.target.property.type.UnionType;
diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index 78ac245a61..3087a72c66 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -6,7 +6,6 @@
 import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetProperty;
-import org.lflang.TargetProperty.DictionaryElement;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -16,6 +15,7 @@
 import org.lflang.lf.Model;
 import org.lflang.target.property.PlatformProperty.PlatformOptions;
 import org.lflang.target.property.type.DictionaryType;
+import org.lflang.target.property.type.DictionaryType.DictionaryElement;
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.target.property.type.UnionType;
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index 1505d14a59..314e989868 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -6,7 +6,6 @@
 import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.TargetProperty;
-import org.lflang.TargetProperty.DictionaryElement;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -16,6 +15,7 @@
 import org.lflang.lf.Model;
 import org.lflang.target.property.TracingProperty.TracingOptions;
 import org.lflang.target.property.type.DictionaryType;
+import org.lflang.target.property.type.DictionaryType.DictionaryElement;
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.target.property.type.UnionType;
diff --git a/core/src/main/java/org/lflang/target/property/type/DictionaryType.java b/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
index 63107eb98c..10522a09b1 100644
--- a/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
+++ b/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
@@ -6,7 +6,6 @@
 import java.util.stream.Collectors;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetProperty.DictionaryElement;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
@@ -91,4 +90,9 @@ public String toString() {
     return "a dictionary with one or more of the following keys: "
         + options.stream().map(option -> option.toString()).collect(Collectors.joining(", "));
   }
+
+  /** Interface for dictionary elements. It associates an entry with a type. */
+  public interface DictionaryElement {
+    TargetPropertyType getType();
+  }
 }
diff --git a/core/src/main/java/org/lflang/util/ArduinoUtil.java b/core/src/main/java/org/lflang/util/ArduinoUtil.java
index 04fd119131..3423e80ac7 100644
--- a/core/src/main/java/org/lflang/util/ArduinoUtil.java
+++ b/core/src/main/java/org/lflang/util/ArduinoUtil.java
@@ -8,9 +8,9 @@
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
-import org.lflang.target.TargetConfig;
 import org.lflang.generator.GeneratorCommandFactory;
 import org.lflang.generator.LFGeneratorContext;
+import org.lflang.target.TargetConfig;
 
 /**
  * Utilities for Building using Arduino CLI.
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 5c269ae310..2f0faf28a2 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -59,7 +59,6 @@
 import org.lflang.InferredType;
 import org.lflang.ModelInfo;
 import org.lflang.Target;
-import org.lflang.target.TargetConfig;
 import org.lflang.TargetProperty;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
@@ -115,6 +114,7 @@
 import org.lflang.lf.Visibility;
 import org.lflang.lf.WidthSpec;
 import org.lflang.lf.WidthTerm;
+import org.lflang.target.TargetConfig;
 import org.lflang.util.FileUtil;
 
 /**
@@ -132,8 +132,6 @@
  */
 public class LFValidator extends BaseLFValidator {
 
-  private TargetConfig targetConfig;
-
   // The methods annotated with @Check are automatically invoked on AST nodes matching the types of
   // their arguments. CheckType.FAST ensures that these checks run whenever a file is modified;
   // when CheckType.NORMAL is used, the check is run upon saving.
@@ -1061,8 +1059,7 @@ public void checkTargetDecl(TargetDecl target) throws IOException {
     if (targetOpt.isEmpty()) {
       error("Unrecognized target: " + target.getName(), Literals.TARGET_DECL__NAME);
     } else {
-      this.target = targetOpt.get(); // FIXME: remove
-      this.targetConfig = new TargetConfig(target);
+      this.target = targetOpt.get();
     }
     String lfFileName = FileUtil.nameWithoutExtension(target.eResource());
     if (Character.isDigit(lfFileName.charAt(0))) {
@@ -1078,7 +1075,7 @@ public void checkTargetDecl(TargetDecl target) throws IOException {
   @Check(CheckType.NORMAL)
   public void checkTargetProperties(KeyValuePairs targetProperties) {
     TargetProperty.validate(
-        targetProperties, this.info.model, this.targetConfig, getErrorReporter());
+        targetProperties, this.info.model, new TargetConfig(this.target), getErrorReporter());
   }
 
   @Check(CheckType.FAST)
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 43154df8b5..2762d360c9 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -46,13 +46,13 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.lflang.Target;
 import org.lflang.TargetProperty;
-import org.lflang.TargetProperty.DictionaryElement;
 import org.lflang.TimeValue;
 import org.lflang.lf.LfPackage;
 import org.lflang.lf.Model;
 import org.lflang.lf.Visibility;
 import org.lflang.target.property.type.ArrayType;
 import org.lflang.target.property.type.DictionaryType;
+import org.lflang.target.property.type.DictionaryType.DictionaryElement;
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.StringDictionaryType;
 import org.lflang.target.property.type.TargetPropertyType;
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index 23fdac9afa..64bcdbe42e 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -39,12 +39,12 @@
 import org.lflang.LFRuntimeModule;
 import org.lflang.LFStandaloneSetup;
 import org.lflang.Target;
-import org.lflang.target.TargetConfig;
 import org.lflang.generator.GeneratorResult;
 import org.lflang.generator.LFGenerator;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.LFGeneratorContext.BuildParm;
 import org.lflang.generator.MainContext;
+import org.lflang.target.TargetConfig;
 import org.lflang.tests.Configurators.Configurator;
 import org.lflang.tests.LFTest.Result;
 import org.lflang.tests.TestRegistry.TestCategory;

From f3aeb44b04baeaae7a12b4e0ee87a57fe3deaa13 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sat, 30 Sep 2023 23:52:44 -0700
Subject: [PATCH 0945/1114] API rename

---
 .../main/java/org/lflang/ast/ASTUtils.java    |  1 -
 .../federated/extensions/CExtensionUtils.java | 26 ++++++++-----------
 .../property/CompileDefinitionsProperty.java  |  2 +-
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 132682a84a..623ec24e23 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -616,7 +616,6 @@ public static ReactorInstance createMainReactorInstance(
       } else {
         targetConfig
             .compileDefinitions
-            .get()
             .put("LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth()));
       }
       return main;
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 7712093240..6ba7320b09 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -54,14 +54,14 @@ public static String initializeTriggersForNetworkActions(
         var trigger = CUtil.actionRef(actionInstance, null);
         code.pr(
             "_lf_action_table["
-                + (actionTableCount++)
+                + actionTableCount++
                 + "] = (lf_action_base_t*)&"
                 + trigger
                 + "; \\");
         if (federate.zeroDelayNetworkMessageActions.contains(action)) {
           code.pr(
               "_lf_zero_delay_action_table["
-                  + (zeroDelayActionTableCount++)
+                  + zeroDelayActionTableCount++
                   + "] = (lf_action_base_t*)&"
                   + trigger
                   + "; \\");
@@ -114,7 +114,7 @@ public static String stpStructs(FederateInstance federate) {
               "staa_lst["
                   + i
                   + "]->actions["
-                  + (tableCount++)
+                  + tableCount++
                   + "] = _lf_action_table["
                   + federate.networkMessageActions.indexOf(action)
                   + "];");
@@ -173,16 +173,16 @@ public static void handleCompileDefinitions(
       RtiConfig rtiConfig,
       MessageReporter messageReporter) {
     var definitions = federate.targetConfig.compileDefinitions;
-    definitions.add("FEDERATED", "");
-    definitions.add(
+    definitions.put("FEDERATED", "");
+    definitions.put(
         String.format(
             "FEDERATED_%s", federate.targetConfig.coordination.get().toString().toUpperCase()),
         "");
     if (federate.targetConfig.auth.get()) {
-      definitions.add("FEDERATED_AUTHENTICATED", "");
+      definitions.put("FEDERATED_AUTHENTICATED", "");
     }
-    definitions.add("NUMBER_OF_FEDERATES", String.valueOf(numOfFederates));
-    definitions.add("EXECUTABLE_PREAMBLE", "");
+    definitions.put("NUMBER_OF_FEDERATES", String.valueOf(numOfFederates));
+    definitions.put("EXECUTABLE_PREAMBLE", "");
 
     handleAdvanceMessageInterval(federate);
 
@@ -197,7 +197,6 @@ private static void handleAdvanceMessageInterval(FederateInstance federate) {
       federate
           .targetConfig
           .compileDefinitions
-          .get()
           .put("ADVANCE_MESSAGE_INTERVAL", String.valueOf(advanceMessageInterval.toNanoSeconds()));
     }
   }
@@ -253,27 +252,24 @@ public static void addClockSyncCompileDefinitions(FederateInstance federate) {
     ClockSyncMode mode = federate.targetConfig.clockSync.get();
     ClockSyncOptions options = federate.targetConfig.clockSyncOptions.get();
 
-    federate.targetConfig.compileDefinitions.get().put("_LF_CLOCK_SYNC_INITIAL", "");
+    federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_INITIAL", "");
     federate
         .targetConfig
         .compileDefinitions
-        .get()
         .put("_LF_CLOCK_SYNC_PERIOD_NS", String.valueOf(options.period.toNanoSeconds()));
     federate
         .targetConfig
         .compileDefinitions
-        .get()
         .put("_LF_CLOCK_SYNC_EXCHANGES_PER_INTERVAL", String.valueOf(options.trials));
     federate
         .targetConfig
         .compileDefinitions
-        .get()
         .put("_LF_CLOCK_SYNC_ATTENUATION", String.valueOf(options.attenuation));
 
     if (mode == ClockSyncMode.ON) {
-      federate.targetConfig.compileDefinitions.get().put("_LF_CLOCK_SYNC_ON", "");
+      federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_ON", "");
       if (options.collectStats) {
-        federate.targetConfig.compileDefinitions.get().put("_LF_CLOCK_SYNC_COLLECT_STATS", "");
+        federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_COLLECT_STATS", "");
       }
     }
   }
diff --git a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
index 584091d15c..a754b2ce4a 100644
--- a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
@@ -17,7 +17,7 @@ public CompileDefinitionsProperty() {
     super(StringDictionaryType.COMPILE_DEFINITION);
   }
 
-  public void add(String k, String v) {
+  public void put(String k, String v) {
     this.isSet = true;
     var value = this.get();
     value.put(k, v);

From 1ec7765f3e80e50e051a11b63a8167917b54daff Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 1 Oct 2023 00:00:11 -0700
Subject: [PATCH 0946/1114] Apply formatter

---
 .../main/java/org/lflang/ast/ASTUtils.java    |  5 ++--
 .../federated/extensions/CExtensionUtils.java | 24 +++++++------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 623ec24e23..d30dae6189 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -614,9 +614,8 @@ public static ReactorInstance createMainReactorInstance(
       if (breadth == 0) {
         messageReporter.nowhere().warning("The program has no reactions");
       } else {
-        targetConfig
-            .compileDefinitions
-            .put("LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth()));
+        targetConfig.compileDefinitions.put(
+            "LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth()));
       }
       return main;
     }
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 6ba7320b09..db0cb2d0b4 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -194,10 +194,8 @@ private static void handleAdvanceMessageInterval(FederateInstance federate) {
         federate.targetConfig.coordinationOptions.get().advanceMessageInterval;
     federate.targetConfig.coordinationOptions.reset();
     if (advanceMessageInterval != null) {
-      federate
-          .targetConfig
-          .compileDefinitions
-          .put("ADVANCE_MESSAGE_INTERVAL", String.valueOf(advanceMessageInterval.toNanoSeconds()));
+      federate.targetConfig.compileDefinitions.put(
+          "ADVANCE_MESSAGE_INTERVAL", String.valueOf(advanceMessageInterval.toNanoSeconds()));
     }
   }
 
@@ -253,18 +251,12 @@ public static void addClockSyncCompileDefinitions(FederateInstance federate) {
     ClockSyncOptions options = federate.targetConfig.clockSyncOptions.get();
 
     federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_INITIAL", "");
-    federate
-        .targetConfig
-        .compileDefinitions
-        .put("_LF_CLOCK_SYNC_PERIOD_NS", String.valueOf(options.period.toNanoSeconds()));
-    federate
-        .targetConfig
-        .compileDefinitions
-        .put("_LF_CLOCK_SYNC_EXCHANGES_PER_INTERVAL", String.valueOf(options.trials));
-    federate
-        .targetConfig
-        .compileDefinitions
-        .put("_LF_CLOCK_SYNC_ATTENUATION", String.valueOf(options.attenuation));
+    federate.targetConfig.compileDefinitions.put(
+        "_LF_CLOCK_SYNC_PERIOD_NS", String.valueOf(options.period.toNanoSeconds()));
+    federate.targetConfig.compileDefinitions.put(
+        "_LF_CLOCK_SYNC_EXCHANGES_PER_INTERVAL", String.valueOf(options.trials));
+    federate.targetConfig.compileDefinitions.put(
+        "_LF_CLOCK_SYNC_ATTENUATION", String.valueOf(options.attenuation));
 
     if (mode == ClockSyncMode.ON) {
       federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_ON", "");

From 881b4d6e9c84bbd7b030ad85238a64391a4383fe Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 1 Oct 2023 01:10:23 -0700
Subject: [PATCH 0947/1114] Bugfix

---
 .../main/java/org/lflang/AbstractTargetProperty.java   |  2 +-
 core/src/main/java/org/lflang/TargetProperty.java      | 10 +++++++---
 .../main/java/org/lflang/validation/LFValidator.java   |  7 +++++--
 .../tests/compiler/LinguaFrancaValidationTest.java     |  4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/org/lflang/AbstractTargetProperty.java b/core/src/main/java/org/lflang/AbstractTargetProperty.java
index 2ed2ebb752..03a7e7d305 100644
--- a/core/src/main/java/org/lflang/AbstractTargetProperty.java
+++ b/core/src/main/java/org/lflang/AbstractTargetProperty.java
@@ -52,7 +52,7 @@ public void checkSupport(KeyValuePair pair, Target target, MessageReporter repor
           .at(pair, Literals.KEY_VALUE_PAIR__NAME)
           .warning(
               String.format(
-                  "The target parameter: %s is not supported by the %s target and will thus be"
+                  "The target property: %s is not supported by the %s target and will thus be"
                       + " ignored.",
                   pair.getName(), target));
     }
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index c2e948da6b..e3deb50a3f 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -395,7 +395,11 @@ public static KeyValuePair getKeyValuePair(Model ast, TargetProperty property) {
 
   /** Return a list containing the keys of all properties */
   public static List<String> getPropertyKeys() {
-    return Arrays.stream(TargetProperty.values()).map(TargetProperty::toString).toList();
+    return Arrays.stream(TargetProperty.values())
+        .map(TargetProperty::toString)
+        .filter(it -> !it.startsWith("_"))
+        .sorted()
+        .toList();
   }
 
   /**
@@ -424,9 +428,9 @@ public static void validate(
                 reporter
                     .at(pair, Literals.KEY_VALUE_PAIR__NAME)
                     .warning(
-                        "Unrecognized target parameter: "
+                        "Unrecognized target property: "
                             + pair.getName()
-                            + ". Recognized parameters are: "
+                            + ". Recognized properties are: "
                             + getPropertyKeys());
               }
             });
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 2f0faf28a2..51701ed7a0 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -1074,8 +1074,11 @@ public void checkTargetDecl(TargetDecl target) throws IOException {
    */
   @Check(CheckType.NORMAL)
   public void checkTargetProperties(KeyValuePairs targetProperties) {
-    TargetProperty.validate(
-        targetProperties, this.info.model, new TargetConfig(this.target), getErrorReporter());
+    if (targetProperties.eContainer() instanceof TargetDecl) {
+      // Only validate the target properties, not dictionaries that may be part of their values.
+      TargetProperty.validate(
+          targetProperties, this.info.model, new TargetConfig(this.target), getErrorReporter());
+    }
   }
 
   @Check(CheckType.FAST)
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 2762d360c9..3240677a07 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -1810,7 +1810,7 @@ public void testInvalidTargetParam() throws Exception {
     List<Issue> issues = validator.validate(parseWithoutError(testCase));
     Assertions.assertTrue(
         issues.size() == 1
-            && issues.get(0).getMessage().contains("Unrecognized target parameter: foobarbaz"));
+            && issues.get(0).getMessage().contains("Unrecognized target property: foobarbaz"));
   }
 
   @Test
@@ -1827,7 +1827,7 @@ public void testTargetParamNotSupportedForTarget() throws Exception {
                 .get(0)
                 .getMessage()
                 .contains(
-                    "The target parameter: build"
+                    "The target property: build"
                         + " is not supported by the Python target and will thus be ignored."));
   }
 

From 5194bf1ed2b62cf3ad0d17e1ca5c4042de88033e Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 1 Oct 2023 16:36:04 -0700
Subject: [PATCH 0948/1114] Fix another mysterious federated execution bug

---
 .../java/org/lflang/federated/extensions/CExtension.java    | 6 ++++--
 .../org/lflang/federated/extensions/CExtensionUtils.java    | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index f5de233de4..fcec922584 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -796,7 +796,9 @@ private String generateCodeToInitializeFederate(FederateInstance federate, RtiCo
   private String generateCodeForPhysicalActions(
       FederateInstance federate, MessageReporter messageReporter) {
     CodeBuilder code = new CodeBuilder();
-    if (federate.targetConfig.coordination.equals(CoordinationMode.CENTRALIZED)) {
+    var coordinationMode = federate.targetConfig.coordination.get();
+    var coordinationOptions = federate.targetConfig.coordinationOptions.get();
+    if (coordinationMode.equals(CoordinationMode.CENTRALIZED)) {
       // If this program uses centralized coordination then check
       // for outputs that depend on physical actions so that null messages can be
       // sent to the RTI.
@@ -819,7 +821,7 @@ private String generateCodeForPhysicalActions(
       }
       if (minDelay != TimeValue.MAX_VALUE) {
         // Unless silenced, issue a warning.
-        if (federate.targetConfig.coordinationOptions.get().advanceMessageInterval == null) {
+        if (coordinationOptions.advanceMessageInterval == null) {
           String message =
               String.join(
                   "\n",
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index db0cb2d0b4..4cc93c2258 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -192,7 +192,6 @@ public static void handleCompileDefinitions(
   private static void handleAdvanceMessageInterval(FederateInstance federate) {
     var advanceMessageInterval =
         federate.targetConfig.coordinationOptions.get().advanceMessageInterval;
-    federate.targetConfig.coordinationOptions.reset();
     if (advanceMessageInterval != null) {
       federate.targetConfig.compileDefinitions.put(
           "ADVANCE_MESSAGE_INTERVAL", String.valueOf(advanceMessageInterval.toNanoSeconds()));

From ba8b4d4e688b5e2b79b45f15cc6897aec8801a91 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 1 Oct 2023 22:01:05 -0700
Subject: [PATCH 0949/1114] Typo fixes and address warning

---
 .../diagram/synthesis/styles/LinguaFrancaShapeExtensions.java   | 2 +-
 .../diagram/synthesis/styles/LinguaFrancaStyleExtensions.java   | 2 +-
 .../kotlin/org/lflang/generator/rust/RustMainFileEmitter.kt     | 2 +-
 test/README.md                                                  | 2 +-
 test/Rust/src/concurrent/Workers.lf                             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java b/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
index 37e82250ea..6fdd158890 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
@@ -85,7 +85,7 @@
 import org.lflang.lf.StateVar;
 
 /**
- * Extension class that provides shapes and figures for the Lingua France diagram synthesis.
+ * Extension class that provides shapes and figures for the Lingua Franca diagram synthesis.
  *
  * @author Alexander Schulz-Rosengarten
  */
diff --git a/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaStyleExtensions.java b/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaStyleExtensions.java
index 6eb2cfd7f0..1973738d5a 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaStyleExtensions.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaStyleExtensions.java
@@ -59,7 +59,7 @@
 import org.lflang.diagram.synthesis.AbstractSynthesisExtensions;
 
 /**
- * Extension class that provides styles and coloring for the Lingua France diagram synthesis.
+ * Extension class that provides styles and coloring for the Lingua Franca diagram synthesis.
  *
  * @author Alexander Schulz-Rosengarten
  */
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustMainFileEmitter.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustMainFileEmitter.kt
index fb54556a2c..69c6fd0ccb 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustMainFileEmitter.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustMainFileEmitter.kt
@@ -81,7 +81,7 @@ ${"         |"..gen.crate.modulesToIncludeInMain.joinWithLn { "mod ${it.fileName
             |    if !cfg!(debug_assertions) && level < LevelFilter::Info {
             |        warn!("Log level {} is not active because this application was built in release mode.", level);
             |        warn!("Use a debug build to enable this level.");
-            |        warn!("In Lingua France, use the target property `build-type: Debug` (the default).");
+            |        warn!("In Lingua Franca, use the target property `build-type: Debug` (the default).");
             |    }
             |
             |    let mut builder = env_logger::Builder::from_env(env_logger::Env::default());
diff --git a/test/README.md b/test/README.md
index 2292f25320..52e647c72a 100644
--- a/test/README.md
+++ b/test/README.md
@@ -1,6 +1,6 @@
 # LF integration tests
 
-**Integration tests** are complete Lingua France programs that are compiled and executed automatically. A test passes if it successfully compiles and runs to completion with normal termination (return code 0). These tests are located in a subdirectory corresponding to their target language.
+**Integration tests** are complete Lingua Franca programs that are compiled and executed automatically. A test passes if it successfully compiles and runs to completion with normal termination (return code 0). These tests are located in a subdirectory corresponding to their target language.
 
 ### Running from the command line
 
diff --git a/test/Rust/src/concurrent/Workers.lf b/test/Rust/src/concurrent/Workers.lf
index 9f2afa1f43..69157f5927 100644
--- a/test/Rust/src/concurrent/Workers.lf
+++ b/test/Rust/src/concurrent/Workers.lf
@@ -4,7 +4,7 @@ target Rust {
 
 main reactor {
   reaction(startup) {=
-    if (ctx.num_workers() != 16) {
+    if ctx.num_workers() != 16 {
       panic!("Expected to have 16 workers.");
     } else {
       println!("Using 16 workers.");

From 1dfa337520a242036a19b521c1bdad07d251b94f Mon Sep 17 00:00:00 2001
From: Shaokai Lin <shaokai_lin@126.com>
Date: Sun, 1 Oct 2023 22:47:25 -0700
Subject: [PATCH 0950/1114] Fix state space explorer

---
 .../analyses/statespace/StateSpaceExplorer.java      | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
index 40f4a521ea..6b869e7ebd 100644
--- a/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
+++ b/core/src/main/java/org/lflang/analyses/statespace/StateSpaceExplorer.java
@@ -4,7 +4,6 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.stream.Collectors;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.generator.ActionInstance;
@@ -101,12 +100,11 @@ public void explore(Tag horizon, boolean findLoop) {
     while (!stop) {
 
       // Pop the events from the earliest tag off the event queue.
-
-      final var now = currentTag;
-      var currentEvents =
-          eventQ.stream()
-              .filter(e -> e.getTag().equals(now))
-              .collect(Collectors.toCollection(ArrayList::new));
+      ArrayList<Event> currentEvents = new ArrayList<Event>();
+      while (eventQ.size() > 0 && eventQ.peek().getTag().compareTo(currentTag) == 0) {
+        Event e = eventQ.poll();
+        currentEvents.add(e);
+      }
 
       // Collect all the reactions invoked in this current LOOP ITERATION
       // triggered by the earliest events.

From 8e4feee8073cd924d52ae5e786fc9049ddc91446 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 10:43:12 +0200
Subject: [PATCH 0951/1114] Fix rust tests

---
 .../main/kotlin/org/lflang/generator/rust/RustGenerator.kt | 2 +-
 .../src/main/kotlin/org/lflang/generator/rust/RustModel.kt | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
index 0c11c1538e..3ea93a72e1 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
@@ -127,7 +127,7 @@ class RustGenerator(
             // We still have to copy the compiled binary to the destination folder.
             val buildType = targetConfig.rust.getBuildType(context.targetConfig.buildType)
             val binaryPath = validator.metadata?.targetDirectory!!
-                .resolve(buildType.cargoProfileName)
+                .resolve(buildType.cargoTargetDirectory)
                 .resolve(fileConfig.executable.fileName)
             val destPath = fileConfig.executable
 
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
index f0fbf1ad10..6a2370d09b 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
@@ -721,6 +721,13 @@ val BuildType.cargoProfileName: String
         BuildType.MIN_SIZE_REL      -> "release-with-min-size"
     }
 
+/** Return the target directory in which cargo places the compiled binary. */
+val BuildType.cargoTargetDirectory: String
+    get() = when (this) {
+        BuildType.TEST -> "debug"
+        else           -> cargoProfileName
+    }
+
 /** Just the constructor of [CargoDependencySpec], but allows using named arguments. */
 fun newCargoSpec(
     version: String? = null,

From f0b81868cd6015eaee6e7ada9dec2883fda4def5 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 11:33:49 +0200
Subject: [PATCH 0952/1114] fix Cpp build types

---
 .../org/lflang/generator/cpp/CppStandaloneGenerator.kt | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
index b7c9bd8982..6eda39d7b4 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
@@ -130,18 +130,12 @@ class CppStandaloneGenerator(generator: CppGenerator) :
         return 0
     }
 
-    private fun buildTypeToCmakeConfig(type: BuildType?) = when (type) {
-        null                          -> "Release"
-        BuildType.TEST -> "Debug"
-        else                          -> type.toString()
-    }
-
     private fun createMakeCommand(buildPath: Path, version: String, target: String): LFCommand {
         val makeArgs: List<String>
         if (version.compareVersion("3.12.0") < 0) {
             messageReporter.nowhere().warning("CMAKE is older than version 3.12. Parallel building is not supported.")
             makeArgs =
-                listOf("--build", ".", "--target", target, "--config", targetConfig.buildType?.toString() ?: "Release")
+                listOf("--build", ".", "--target", target, "--config", targetConfig.buildType.toString())
         } else {
             val cores = Runtime.getRuntime().availableProcessors()
             makeArgs = listOf(
@@ -152,7 +146,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
                 "--parallel",
                 cores.toString(),
                 "--config",
-                buildTypeToCmakeConfig(targetConfig.buildType.get())
+                targetConfig.buildType.toString()
             )
         }
 

From 1a31e115a8df14b859d770d899469bccfc445dfc Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 11:34:02 +0200
Subject: [PATCH 0953/1114] fix test reports

---
 core/src/testFixtures/java/org/lflang/tests/LFTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/LFTest.java b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
index 1fa4184237..cb92de3663 100644
--- a/core/src/testFixtures/java/org/lflang/tests/LFTest.java
+++ b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
@@ -258,9 +258,9 @@ private Thread recordStream(StringBuffer builder, InputStream inputStream) {
               int len;
               char[] buf = new char[1024];
               while ((len = reader.read(buf)) > 0) {
-                if (Runtime.getRuntime().freeMemory() < Runtime.getRuntime().totalMemory() / 2) {
+                if (Runtime.getRuntime().freeMemory() < Runtime.getRuntime().maxMemory() / 2) {
                   builder.delete(0, builder.length() / 2);
-                  builder.insert(0, "[earlier messages were removed to free up memory]%n");
+                  builder.insert(0, "[earlier messages were removed to free up memory]\n");
                 }
                 builder.append(buf, 0, len);
               }

From caa3bd87d38849ec34bb128f1234052881008ae4 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 11:38:52 +0200
Subject: [PATCH 0954/1114] map the Test build type to the debug cargo profile

---
 .../kotlin/org/lflang/generator/rust/RustGenerator.kt    | 2 +-
 .../main/kotlin/org/lflang/generator/rust/RustModel.kt   | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
index 3ea93a72e1..0c11c1538e 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
@@ -127,7 +127,7 @@ class RustGenerator(
             // We still have to copy the compiled binary to the destination folder.
             val buildType = targetConfig.rust.getBuildType(context.targetConfig.buildType)
             val binaryPath = validator.metadata?.targetDirectory!!
-                .resolve(buildType.cargoTargetDirectory)
+                .resolve(buildType.cargoProfileName)
                 .resolve(fileConfig.executable.fileName)
             val destPath = fileConfig.executable
 
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
index 6a2370d09b..12a17e84c6 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
@@ -715,19 +715,12 @@ private val TypeParm.identifier: String
 val BuildType.cargoProfileName: String
     get() = when (this) {
         BuildType.DEBUG             -> "debug"
-        BuildType.TEST              -> "test"
+        BuildType.TEST              -> "debug"  // The LF build type "Test" requires a debug build
         BuildType.RELEASE           -> "release"
         BuildType.REL_WITH_DEB_INFO -> "release-with-debug-info"
         BuildType.MIN_SIZE_REL      -> "release-with-min-size"
     }
 
-/** Return the target directory in which cargo places the compiled binary. */
-val BuildType.cargoTargetDirectory: String
-    get() = when (this) {
-        BuildType.TEST -> "debug"
-        else           -> cargoProfileName
-    }
-
 /** Just the constructor of [CargoDependencySpec], but allows using named arguments. */
 fun newCargoSpec(
     version: String? = null,

From 27a310b0529e745dbf06a946a5cbf1d6a2e72749 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 11:48:18 +0200
Subject: [PATCH 0955/1114] move TargetProperty to org.lflang.target

---
 .../org/lflang/federated/generator/FedTargetConfig.java    | 2 +-
 .../org/lflang/federated/generator/FedTargetEmitter.java   | 2 +-
 .../lflang/federated/launcher/FedLauncherGenerator.java    | 2 +-
 .../src/main/java/org/lflang/generator/GeneratorUtils.java | 2 +-
 .../org/lflang/generator/rust/CargoDependencySpec.java     | 2 +-
 core/src/main/java/org/lflang/target/TargetConfig.java     | 1 -
 .../main/java/org/lflang/{ => target}/TargetProperty.java  | 7 +++++--
 .../java/org/lflang/target/property/PlatformProperty.java  | 2 +-
 .../lflang/target/property/Ros2DependenciesProperty.java   | 2 +-
 .../java/org/lflang/target/property/TracingProperty.java   | 2 +-
 core/src/main/java/org/lflang/validation/LFValidator.java  | 2 +-
 .../lflang/tests/compiler/LinguaFrancaValidationTest.java  | 2 +-
 12 files changed, 15 insertions(+), 13 deletions(-)
 rename core/src/main/java/org/lflang/{ => target}/TargetProperty.java (99%)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
index aa0a054907..645a6ba4e8 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
@@ -5,7 +5,7 @@
 import java.nio.file.Path;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
+import org.lflang.target.TargetProperty;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.target.TargetConfig;
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
index 2e9b26a7ff..c298f970f1 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
+import org.lflang.target.TargetProperty;
 import org.lflang.ast.FormattingUtil;
 import org.lflang.federated.extensions.FedTargetExtensionFactory;
 import org.lflang.federated.launcher.RtiConfig;
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index bc4ec28087..68517e3e98 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -7,7 +7,7 @@
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  *
- * 2. Redistributions in binary formimport org.lflang.TargetProperty.ClockSyncMode; must reproduce the above copyright notice,
+ * 2. Redistributions in binary formimport org.lflang.target.TargetProperty.ClockSyncMode; must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
  *
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index e7f1c6b89c..08700ba9df 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -13,7 +13,7 @@
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetProperty;
+import org.lflang.target.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.LFGeneratorContext.Mode;
 import org.lflang.lf.Action;
diff --git a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
index 50bf482024..82043e0c9d 100644
--- a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
+++ b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
@@ -33,7 +33,7 @@
 import java.util.stream.Collectors;
 import org.eclipse.emf.ecore.EObject;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
+import org.lflang.target.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.InvalidLfSourceException;
 import org.lflang.lf.Array;
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 2347ccba62..31e46c0179 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -29,7 +29,6 @@
 import java.util.Properties;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetProperty;
 import org.lflang.generator.rust.RustTargetConfig;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.TargetDecl;
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/target/TargetProperty.java
similarity index 99%
rename from core/src/main/java/org/lflang/TargetProperty.java
rename to core/src/main/java/org/lflang/target/TargetProperty.java
index e3deb50a3f..d398600f99 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/target/TargetProperty.java
@@ -23,7 +23,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
 
-package org.lflang;
+package org.lflang.target;
 
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -32,6 +32,10 @@
 import java.util.Objects;
 import java.util.Properties;
 import java.util.stream.Collectors;
+
+import org.lflang.AbstractTargetProperty;
+import org.lflang.MessageReporter;
+import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.InvalidLfSourceException;
 import org.lflang.lf.KeyValuePair;
@@ -40,7 +44,6 @@
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
 import org.lflang.lf.TargetDecl;
-import org.lflang.target.TargetConfig;
 import org.lflang.target.property.AuthProperty;
 import org.lflang.target.property.BuildCommandsProperty;
 import org.lflang.target.property.BuildTypeProperty;
diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index 3087a72c66..22b6b1ddbd 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -5,7 +5,7 @@
 import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetProperty;
+import org.lflang.target.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
diff --git a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
index 4545b64c5c..73e2d0ffd4 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
@@ -5,7 +5,7 @@
 import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetProperty;
+import org.lflang.target.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index 314e989868..50fb92afc9 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -5,7 +5,7 @@
 import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.TargetProperty;
+import org.lflang.target.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 51701ed7a0..56609e18b0 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -59,7 +59,7 @@
 import org.lflang.InferredType;
 import org.lflang.ModelInfo;
 import org.lflang.Target;
-import org.lflang.TargetProperty;
+import org.lflang.target.TargetProperty;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.serialization.SupportedSerializers;
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 3240677a07..a8a9a6eec2 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -45,7 +45,7 @@
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.lflang.Target;
-import org.lflang.TargetProperty;
+import org.lflang.target.TargetProperty;
 import org.lflang.TimeValue;
 import org.lflang.lf.LfPackage;
 import org.lflang.lf.Model;

From be85c7d8334c1d3d64695574d744b9ecedf3a542 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 13:33:37 +0200
Subject: [PATCH 0956/1114] unify handling of C++ target properties

---
 .../kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt     | 2 +-
 .../org/lflang/generator/cpp/CppStandaloneMainGenerator.kt      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
index 15c523e4f8..e117a11b5a 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
@@ -59,7 +59,7 @@ class CppRos2NodeGenerator(
             |  : Node("$nodeName", node_options) {
             |  unsigned workers = ${if (targetConfig.workers.get() != 0) targetConfig.workers.get() else "std::thread::hardware_concurrency()"};
             |  bool fast{${targetConfig.fastMode}};
-            |  reactor::Duration lf_timeout{${targetConfig.timeout.get()?.toCppCode() ?: "reactor::Duration::max()"}};
+            |  reactor::Duration lf_timeout{${if (targetConfig.timeout.isSet) targetConfig.timeout.get().toCppCode() else "reactor::Duration::max()"}};
             |
             |  // provide a globally accessible reference to this node
             |  // FIXME: this is pretty hacky...
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt
index 0504be555c..9fb16455fe 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt
@@ -58,7 +58,7 @@ class CppStandaloneMainGenerator(
             |int main(int argc, char **argv) {
             |  cxxopts::Options options("${fileConfig.name}", "Reactor Program");
             |
-            |  unsigned workers = ${if (targetConfig.workers.isSet) targetConfig.workers.get() else "std::thread::hardware_concurrency()"};
+            |  unsigned workers = ${if (targetConfig.workers.get() != 0) targetConfig.workers.get() else "std::thread::hardware_concurrency()"};
             |  bool fast{${targetConfig.fastMode.get()}};
             |  reactor::Duration timeout = ${if (targetConfig.timeout.isSet) targetConfig.timeout.get().toCppCode() else "reactor::Duration::max()"};
             |  

From aefe79f09e6192eac830b17ef678faf5ca7e9c10 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 13:34:10 +0200
Subject: [PATCH 0957/1114] fix test reporting

---
 core/src/testFixtures/java/org/lflang/tests/LFTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/LFTest.java b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
index cb92de3663..fabe1fd695 100644
--- a/core/src/testFixtures/java/org/lflang/tests/LFTest.java
+++ b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
@@ -258,9 +258,10 @@ private Thread recordStream(StringBuffer builder, InputStream inputStream) {
               int len;
               char[] buf = new char[1024];
               while ((len = reader.read(buf)) > 0) {
-                if (Runtime.getRuntime().freeMemory() < Runtime.getRuntime().maxMemory() / 2) {
+                if (builder.length() > Runtime.getRuntime().maxMemory() / 4) {
                   builder.delete(0, builder.length() / 2);
                   builder.insert(0, "[earlier messages were removed to free up memory]\n");
+                  builder.trimToSize();
                 }
                 builder.append(buf, 0, len);
               }

From ae16b457518318f759b1d771aa19634a471c5f85 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 13:37:57 +0200
Subject: [PATCH 0958/1114] fix "Test" build type for C++ on Windows

---
 .../org/lflang/generator/cpp/CppStandaloneGenerator.kt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
index 6eda39d7b4..a64b29b88c 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
@@ -3,6 +3,7 @@ package org.lflang.generator.cpp
 import org.lflang.target.property.BuildTypeProperty.BuildType
 import org.lflang.generator.CodeMap
 import org.lflang.generator.LFGeneratorContext
+import org.lflang.target.TargetProperty
 import org.lflang.toUnixString
 import org.lflang.util.FileUtil
 import org.lflang.util.LFCommand
@@ -130,12 +131,17 @@ class CppStandaloneGenerator(generator: CppGenerator) :
         return 0
     }
 
+    private fun buildTypeToCmakeConfig(type: BuildType) = when (type) {
+        BuildType.TEST -> "Debug"
+        else           -> type.toString()
+    }
+
     private fun createMakeCommand(buildPath: Path, version: String, target: String): LFCommand {
         val makeArgs: List<String>
         if (version.compareVersion("3.12.0") < 0) {
             messageReporter.nowhere().warning("CMAKE is older than version 3.12. Parallel building is not supported.")
             makeArgs =
-                listOf("--build", ".", "--target", target, "--config", targetConfig.buildType.toString())
+                listOf("--build", ".", "--target", target, "--config", buildTypeToCmakeConfig(targetConfig.buildType.get()))
         } else {
             val cores = Runtime.getRuntime().availableProcessors()
             makeArgs = listOf(
@@ -146,7 +152,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
                 "--parallel",
                 cores.toString(),
                 "--config",
-                targetConfig.buildType.toString()
+                buildTypeToCmakeConfig(targetConfig.buildType.get())
             )
         }
 

From 0dce26aae0145cbc9637167886b0517c80fb78a4 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 14:36:13 +0200
Subject: [PATCH 0959/1114] create a cargo profile for LF tests

---
 .../kotlin/org/lflang/generator/rust/RustCargoTomlEmitter.kt  | 4 ++++
 core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustCargoTomlEmitter.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustCargoTomlEmitter.kt
index e7690e78e5..00749e17e9 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustCargoTomlEmitter.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustCargoTomlEmitter.kt
@@ -74,6 +74,10 @@ ${"         |"..crate.dependencies.asIterable().joinWithLn { (name, spec) -> nam
             |inherits = "release"
             |debug = true
             |
+            |[profile.${TEST.cargoProfileName}] # use `build-type: $TEST`
+            |inherits = "dev"
+            |debug = true
+            |
         """.trimMargin()
     }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
index 12a17e84c6..5be75ace24 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
@@ -715,7 +715,7 @@ private val TypeParm.identifier: String
 val BuildType.cargoProfileName: String
     get() = when (this) {
         BuildType.DEBUG             -> "debug"
-        BuildType.TEST              -> "debug"  // The LF build type "Test" requires a debug build
+        BuildType.TEST              -> "lf-test"
         BuildType.RELEASE           -> "release"
         BuildType.REL_WITH_DEB_INFO -> "release-with-debug-info"
         BuildType.MIN_SIZE_REL      -> "release-with-min-size"

From 845d32d9427b72c5d3185d739d1a633a0160b7da Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 14:37:09 +0200
Subject: [PATCH 0960/1114] formatting

---
 .../java/org/lflang/federated/generator/FedTargetConfig.java    | 2 +-
 .../java/org/lflang/federated/generator/FedTargetEmitter.java   | 2 +-
 core/src/main/java/org/lflang/generator/GeneratorUtils.java     | 2 +-
 .../java/org/lflang/generator/rust/CargoDependencySpec.java     | 2 +-
 core/src/main/java/org/lflang/target/TargetProperty.java        | 1 -
 .../main/java/org/lflang/target/property/PlatformProperty.java  | 2 +-
 .../org/lflang/target/property/Ros2DependenciesProperty.java    | 2 +-
 .../main/java/org/lflang/target/property/TracingProperty.java   | 2 +-
 core/src/main/java/org/lflang/validation/LFValidator.java       | 2 +-
 .../org/lflang/tests/compiler/LinguaFrancaValidationTest.java   | 2 +-
 10 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
index 645a6ba4e8..7b468013cc 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
@@ -5,10 +5,10 @@
 import java.nio.file.Path;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.lflang.MessageReporter;
-import org.lflang.target.TargetProperty;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.TargetProperty;
 import org.lflang.util.FileUtil;
 
 /**
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
index c298f970f1..bbfc16bfd2 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
@@ -2,11 +2,11 @@
 
 import java.io.IOException;
 import org.lflang.MessageReporter;
-import org.lflang.target.TargetProperty;
 import org.lflang.ast.FormattingUtil;
 import org.lflang.federated.extensions.FedTargetExtensionFactory;
 import org.lflang.federated.launcher.RtiConfig;
 import org.lflang.generator.LFGeneratorContext;
+import org.lflang.target.TargetProperty;
 
 public class FedTargetEmitter {
 
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index 08700ba9df..9c4c1f0270 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -13,7 +13,6 @@
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.target.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.LFGeneratorContext.Mode;
 import org.lflang.lf.Action;
@@ -24,6 +23,7 @@
 import org.lflang.lf.Reactor;
 import org.lflang.lf.TargetDecl;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.TargetProperty;
 
 /**
  * A helper class with functions that may be useful for code generators. This is created to ease our
diff --git a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
index 82043e0c9d..f3620c0575 100644
--- a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
+++ b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
@@ -33,7 +33,6 @@
 import java.util.stream.Collectors;
 import org.eclipse.emf.ecore.EObject;
 import org.lflang.MessageReporter;
-import org.lflang.target.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.InvalidLfSourceException;
 import org.lflang.lf.Array;
@@ -41,6 +40,7 @@
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
+import org.lflang.target.TargetProperty;
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.util.StringUtil;
 
diff --git a/core/src/main/java/org/lflang/target/TargetProperty.java b/core/src/main/java/org/lflang/target/TargetProperty.java
index d398600f99..621623a813 100644
--- a/core/src/main/java/org/lflang/target/TargetProperty.java
+++ b/core/src/main/java/org/lflang/target/TargetProperty.java
@@ -32,7 +32,6 @@
 import java.util.Objects;
 import java.util.Properties;
 import java.util.stream.Collectors;
-
 import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index 22b6b1ddbd..e670ad8305 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -5,7 +5,6 @@
 import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.target.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -13,6 +12,7 @@
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
+import org.lflang.target.TargetProperty;
 import org.lflang.target.property.PlatformProperty.PlatformOptions;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.DictionaryType.DictionaryElement;
diff --git a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
index 73e2d0ffd4..755911602b 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
@@ -5,12 +5,12 @@
 import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.target.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
+import org.lflang.target.TargetProperty;
 import org.lflang.target.property.type.ArrayType;
 
 public class Ros2DependenciesProperty extends AbstractTargetProperty<List<String>> {
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index 50fb92afc9..10dde00371 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -5,7 +5,6 @@
 import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.target.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -13,6 +12,7 @@
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
+import org.lflang.target.TargetProperty;
 import org.lflang.target.property.TracingProperty.TracingOptions;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.DictionaryType.DictionaryElement;
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 56609e18b0..7c961fc00c 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -59,7 +59,6 @@
 import org.lflang.InferredType;
 import org.lflang.ModelInfo;
 import org.lflang.Target;
-import org.lflang.target.TargetProperty;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.serialization.SupportedSerializers;
@@ -115,6 +114,7 @@
 import org.lflang.lf.WidthSpec;
 import org.lflang.lf.WidthTerm;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.TargetProperty;
 import org.lflang.util.FileUtil;
 
 /**
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index a8a9a6eec2..56aaa9636a 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -45,11 +45,11 @@
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.lflang.Target;
-import org.lflang.target.TargetProperty;
 import org.lflang.TimeValue;
 import org.lflang.lf.LfPackage;
 import org.lflang.lf.Model;
 import org.lflang.lf.Visibility;
+import org.lflang.target.TargetProperty;
 import org.lflang.target.property.type.ArrayType;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.DictionaryType.DictionaryElement;

From f31c33132ddafab7bb53ee55f4862c2d27bba951 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 14:59:28 +0200
Subject: [PATCH 0961/1114] add changes to checked in Cargo.toml

---
 test/Rust/src-gen/Cargo.toml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/Rust/src-gen/Cargo.toml b/test/Rust/src-gen/Cargo.toml
index 171ccb64ee..ad2d186081 100644
--- a/test/Rust/src-gen/Cargo.toml
+++ b/test/Rust/src-gen/Cargo.toml
@@ -25,3 +25,8 @@ opt-level = "s"
 [profile.release-with-debug-info] # use `build-type: RelWithDebInfo`
 inherits = "release"
 debug = true
+
+[profile.lf-test] # use `build-type: Test`
+inherits = "dev"
+debug = true
+

From ce25d75f096783a1cc4f8621501b9982a25f2182 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 15:18:43 +0200
Subject: [PATCH 0962/1114] compare the value of the property, not the property

---
 .../java/org/lflang/federated/extensions/TSExtension.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index a2a2e54ebd..e3e0789d36 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -198,9 +198,8 @@ public String generatePreamble(
             upstreamConnectionDelays.stream().collect(Collectors.joining(",")));
   }
 
-  private TimeValue getMinOutputDelay(
-      FederateInstance federate, FedFileConfig fileConfig, MessageReporter messageReporter) {
-    if (federate.targetConfig.coordination.equals(CoordinationMode.CENTRALIZED)) {
+  private TimeValue getMinOutputDelay(FederateInstance federate, MessageReporter messageReporter) {
+    if (federate.targetConfig.coordination.get() == CoordinationMode.CENTRALIZED) {
       // If this program uses centralized coordination then check
       // for outputs that depend on physical actions so that null messages can be
       // sent to the RTI.

From b23f028bea1a94f2ff928e4879bfc07837a810ce Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 15:19:03 +0200
Subject: [PATCH 0963/1114] cleanup

---
 .../federated/extensions/TSExtension.java      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index e3e0789d36..7484adeb16 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -161,7 +161,7 @@ public String generatePreamble(
       FedFileConfig fileConfig,
       RtiConfig rtiConfig,
       MessageReporter messageReporter) {
-    var minOutputDelay = getMinOutputDelay(federate, fileConfig, messageReporter);
+    var minOutputDelay = getMinOutputDelay(federate, messageReporter);
     var upstreamConnectionDelays = getUpstreamConnectionDelays(federate);
     return """
         const defaultFederateConfig: __FederateConfig = {
@@ -195,7 +195,7 @@ public String generatePreamble(
             federate.sendsTo.keySet().stream()
                 .map(e -> String.valueOf(e.id))
                 .collect(Collectors.joining(",")),
-            upstreamConnectionDelays.stream().collect(Collectors.joining(",")));
+            String.join(",", upstreamConnectionDelays));
   }
 
   private TimeValue getMinOutputDelay(FederateInstance federate, MessageReporter messageReporter) {
@@ -250,26 +250,26 @@ private List<String> getUpstreamConnectionDelays(FederateInstance federate) {
     List<String> candidates = new ArrayList<>();
     if (!federate.dependsOn.keySet().isEmpty()) {
       for (FederateInstance upstreamFederate : federate.dependsOn.keySet()) {
-        String element = "[";
+        StringBuilder element = new StringBuilder("[");
         var delays = federate.dependsOn.get(upstreamFederate);
         int cnt = 0;
         if (delays != null) {
           for (Expression delay : delays) {
             if (delay == null) {
-              element += "TimeValue.never()";
+              element.append("TimeValue.never()");
             } else {
-              element += getNetworkDelayLiteral(delay);
+              element.append(getNetworkDelayLiteral(delay));
             }
             cnt++;
             if (cnt != delays.size()) {
-              element += ", ";
+              element.append(", ");
             }
           }
         } else {
-          element += "TimeValue.never()";
+          element.append("TimeValue.never()");
         }
-        element += "]";
-        candidates.add(element);
+        element.append("]");
+        candidates.add(element.toString());
       }
     }
     return candidates;

From dbcc17f56c68351a71662271fbc2759a245f08d2 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 15:20:29 +0200
Subject: [PATCH 0964/1114] build profile tests don't work, as we overwrite the
 profile to Test

---
 test/Rust/src/target/BuildProfileDefaultIsDev.lf | 10 ----------
 test/Rust/src/target/BuildProfileRelease.lf      | 12 ------------
 2 files changed, 22 deletions(-)
 delete mode 100644 test/Rust/src/target/BuildProfileDefaultIsDev.lf
 delete mode 100644 test/Rust/src/target/BuildProfileRelease.lf

diff --git a/test/Rust/src/target/BuildProfileDefaultIsDev.lf b/test/Rust/src/target/BuildProfileDefaultIsDev.lf
deleted file mode 100644
index 083794bdfc..0000000000
--- a/test/Rust/src/target/BuildProfileDefaultIsDev.lf
+++ /dev/null
@@ -1,10 +0,0 @@
-// Tests that the default build profile is dev. A proxy for checking this is to check that debug
-// assertions are enabled.
-target Rust
-
-main reactor {
-  reaction(startup) {=
-    assert!(cfg!(debug_assertions), "debug assertions should be enabled");
-    println!("success");
-  =}
-}
diff --git a/test/Rust/src/target/BuildProfileRelease.lf b/test/Rust/src/target/BuildProfileRelease.lf
deleted file mode 100644
index da19c0bc79..0000000000
--- a/test/Rust/src/target/BuildProfileRelease.lf
+++ /dev/null
@@ -1,12 +0,0 @@
-// Tests that the we can enable the release profile A proxy for checking this is to check that debug
-// assertions are disabled.
-target Rust {
-  build-type: "Release"
-}
-
-main reactor {
-  reaction(startup) {=
-    assert!(!cfg!(debug_assertions), "debug assertions should be disabled");
-    println!("success");
-  =}
-}

From df803f6382fbd30102f91d94e676fe2f911b375e Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 16:09:56 +0200
Subject: [PATCH 0965/1114] cleanup

---
 .../launcher/FedLauncherGenerator.java        |  2 +-
 .../org/lflang/generator/GeneratorBase.java   | 16 +++++++++++--
 .../target/property/TracingProperty.java      | 23 ++++++++-----------
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index 68517e3e98..368d01311f 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -7,7 +7,7 @@
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  *
- * 2. Redistributions in binary formimport org.lflang.target.TargetProperty.ClockSyncMode; must reproduce the above copyright notice,
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
  *
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 31e3408266..0ba80a494c 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -29,7 +29,13 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.emf.ecore.EObject;
@@ -47,7 +53,13 @@
 import org.lflang.ast.ASTUtils;
 import org.lflang.ast.AstTransformation;
 import org.lflang.graph.InstantiationGraph;
-import org.lflang.lf.*;
+import org.lflang.lf.Attribute;
+import org.lflang.lf.Connection;
+import org.lflang.lf.Instantiation;
+import org.lflang.lf.LfFactory;
+import org.lflang.lf.Mode;
+import org.lflang.lf.Reaction;
+import org.lflang.lf.Reactor;
 import org.lflang.target.TargetConfig;
 import org.lflang.util.FileUtil;
 import org.lflang.validation.AbstractLFValidator;
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index 10dde00371..779ae9f68b 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -41,12 +41,8 @@ public TracingOptions fromAst(Element node, MessageReporter reporter) {
     } else {
       for (KeyValuePair entry : node.getKeyvalue().getPairs()) {
         TracingOption option = (TracingOption) DictionaryType.TRACING_DICT.forName(entry.getName());
-        switch (option) {
-          case TRACE_FILE_NAME:
-            options.traceFileName = ASTUtils.elementToSingleString(entry.getValue());
-            break;
-          default:
-            break;
+        if (Objects.requireNonNull(option) == TracingOption.TRACE_FILE_NAME) {
+          options.traceFileName = ASTUtils.elementToSingleString(entry.getValue());
         }
       }
     }
@@ -94,12 +90,11 @@ public Element toAstElement() {
       for (TracingOption opt : TracingOption.values()) {
         KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
         pair.setName(opt.toString());
-        switch (opt) {
-          case TRACE_FILE_NAME:
-            if (this.get().traceFileName == null) {
-              continue;
-            }
-            pair.setValue(ASTUtils.toElement(this.get().traceFileName));
+        if (opt == TracingOption.TRACE_FILE_NAME) {
+          if (this.get().traceFileName == null) {
+            continue;
+          }
+          pair.setValue(ASTUtils.toElement(this.get().traceFileName));
         }
         kvp.getPairs().add(pair);
       }
@@ -114,7 +109,7 @@ public Element toAstElement() {
   /** Settings related to tracing options. */
   public static class TracingOptions {
 
-    protected boolean enabled = false;
+    protected boolean enabled;
 
     TracingOptions(boolean enabled) {
       this.enabled = enabled;
@@ -155,7 +150,7 @@ public enum TracingOption implements DictionaryElement {
 
     private final String description;
 
-    private TracingOption(String alias, PrimitiveType type) {
+    TracingOption(String alias, PrimitiveType type) {
       this.description = alias;
       this.type = type;
     }

From 2322dfdb9cd3c6218421ed229e39b06d2bf4f97a Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 16:10:35 +0200
Subject: [PATCH 0966/1114] keepalive is not supported in C++ anymore

---
 .../target/property/KeepaliveProperty.java     | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
index 3c85a9c478..0e61ccbe68 100644
--- a/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
+++ b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
@@ -1,28 +1,12 @@
 package org.lflang.target.property;
 
 import java.util.List;
-import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.ast.ASTUtils;
-import org.lflang.lf.KeyValuePair;
-import org.lflang.lf.LfPackage.Literals;
-import org.lflang.lf.Model;
 
 public class KeepaliveProperty extends AbstractBooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
-    return Target.ALL;
-  }
-
-  @Override
-  public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
-    if (pair != null && ASTUtils.getTarget(ast) == Target.CPP) {
-      reporter
-          .at(pair, Literals.KEY_VALUE_PAIR__NAME)
-          .warning(
-              "The keepalive property is inferred automatically by the C++ "
-                  + "runtime and the value given here is ignored");
-    }
+    return List.of(Target.C, Target.CCPP, Target.Python, Target.TS, Target.Rust);
   }
 }

From 1370097a975858ade95ba7ece672b8a72aa7dd54 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 16:16:55 +0200
Subject: [PATCH 0967/1114] fast works fine with physical actions in C++

---
 .../lflang/target/property/FastProperty.java  | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/lflang/target/property/FastProperty.java b/core/src/main/java/org/lflang/target/property/FastProperty.java
index 941ae2ed04..80898e5417 100644
--- a/core/src/main/java/org/lflang/target/property/FastProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FastProperty.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Action;
 import org.lflang.lf.ActionOrigin;
 import org.lflang.lf.KeyValuePair;
@@ -31,15 +32,22 @@ public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
         }
       }
 
-      // Check for physical actions
-      for (Reactor reactor : ast.getReactors()) {
-        // Check to see if the program has a physical action in a reactor
-        for (Action action : reactor.getActions()) {
-          if (action.getOrigin().equals(ActionOrigin.PHYSICAL)) {
-            reporter
-                .at(pair, Literals.KEY_VALUE_PAIR__NAME)
-                .error("The fast target property is incompatible with physical actions.");
-            break;
+      final var target = ASTUtils.getTarget(ast);
+      if (target != Target.CPP) {
+        // Check for physical actions
+        for (Reactor reactor : ast.getReactors()) {
+          // Check to see if the program has a physical action in a reactor
+          for (Action action : reactor.getActions()) {
+            if (action.getOrigin().equals(ActionOrigin.PHYSICAL)) {
+              reporter
+                  .at(pair, Literals.KEY_VALUE_PAIR__NAME)
+                  .error(
+                      String.format(
+                          "In the %s target, the fast target property is incompatible with physical"
+                              + " actions.",
+                          target.toString()));
+              break;
+            }
           }
         }
       }

From 6961686fb4107d199c39278ef9f77b19cb7115d0 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 16:25:03 +0200
Subject: [PATCH 0968/1114] rust also supports threading

---
 .../main/java/org/lflang/target/property/ThreadingProperty.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/target/property/ThreadingProperty.java b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
index 483eb26603..bfc7881c25 100644
--- a/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
@@ -7,7 +7,7 @@ public class ThreadingProperty extends AbstractBooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
-    return List.of(Target.C, Target.CCPP, Target.Python);
+    return List.of(Target.C, Target.CCPP, Target.Python, Target.Rust);
   }
 
   @Override

From 9362bb8ceda65c178d7732d212ee4637d5c501ce Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 16:40:37 +0200
Subject: [PATCH 0969/1114] externa-runtime-path and runtime-version are
 supported by Rust

---
 .../org/lflang/target/property/ExternalRuntimePathProperty.java | 2 +-
 .../java/org/lflang/target/property/RuntimeVersionProperty.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
index fa418aa29b..8db19aee3c 100644
--- a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
@@ -7,6 +7,6 @@ public class ExternalRuntimePathProperty extends AbstractStringConfig {
 
   @Override
   public List<Target> supportedTargets() {
-    return List.of(Target.CPP);
+    return List.of(Target.CPP, Target.Rust);
   }
 }
diff --git a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
index c46a5db83e..19835dcbd8 100644
--- a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
@@ -7,6 +7,6 @@ public class RuntimeVersionProperty extends AbstractStringConfig {
 
   @Override
   public List<Target> supportedTargets() {
-    return List.of(Target.CPP);
+    return List.of(Target.CPP, Target.Rust);
   }
 }

From 66933e4da39b6c87092ebc22f7b796a9f28c4aff Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 2 Oct 2023 19:13:18 +0200
Subject: [PATCH 0970/1114] properly report unknown platforms

Fixes https://github.com/lf-lang/lingua-franca/issues/1919
---
 .../target/property/PlatformProperty.java     | 75 ++++++++-----------
 .../compiler/LinguaFrancaValidationTest.java  | 19 +++++
 2 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index e670ad8305..054d2f7861 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -2,6 +2,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
@@ -22,6 +23,10 @@
 
 public class PlatformProperty extends AbstractTargetProperty<PlatformOptions> {
 
+  public static final String UNKNOW_PLATFORM =
+      "Unidentified Platform Type, LF supports the following platform types: "
+          + Arrays.asList(Platform.values());
+
   public PlatformProperty() {
     super(UnionType.PLATFORM_STRING_OR_DICTIONARY);
   }
@@ -34,41 +39,25 @@ public PlatformOptions initialValue() {
   @Override
   public PlatformOptions fromAst(Element node, MessageReporter reporter) {
     var config = new PlatformOptions();
-    if (node.getLiteral() != null) {
+    if (node.getLiteral() != null || node.getId() != null) {
       config.platform =
           (Platform) UnionType.PLATFORM_UNION.forName(ASTUtils.elementToSingleString(node));
-      if (config.platform == null) {
-        String s =
-            "Unidentified Platform Type, LF supports the following platform types: "
-                + Arrays.asList(Platform.values());
-        // err.at(value).error(s);
-        throw new AssertionError(s);
-      }
     } else {
       for (KeyValuePair entry : node.getKeyvalue().getPairs()) {
         PlatformOption option =
             (PlatformOption) DictionaryType.PLATFORM_DICT.forName(entry.getName());
         switch (option) {
           case NAME -> {
-            Platform p =
+            config.platform =
                 (Platform)
                     UnionType.PLATFORM_UNION.forName(
                         ASTUtils.elementToSingleString(entry.getValue()));
-            if (p == null) {
-              String s =
-                  "Unidentified Platform Type, LF supports the following platform types: "
-                      + Arrays.asList(Platform.values());
-              reporter.at(entry).error(s);
-              throw new AssertionError(s);
-            }
-            config.platform = p;
           }
           case BAUDRATE -> config.baudRate = ASTUtils.toInteger(entry.getValue());
           case BOARD -> config.board = ASTUtils.elementToSingleString(entry.getValue());
           case FLASH -> config.flash = ASTUtils.toBoolean(entry.getValue());
           case PORT -> config.port = ASTUtils.elementToSingleString(entry.getValue());
           case USER_THREADS -> config.userThreads = ASTUtils.toInteger(entry.getValue());
-          default -> {}
         }
       }
     }
@@ -88,33 +77,35 @@ public List<Target> supportedTargets() {
 
   @Override
   public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
-    var threading = TargetProperty.getKeyValuePair(ast, TargetProperty.THREADING);
-    if (threading != null) {
-      if (pair != null && ASTUtils.toBoolean(threading.getValue())) {
-        var lit = ASTUtils.elementToSingleString(pair.getValue());
-        var dic = pair.getValue().getKeyvalue();
-        if (lit != null && lit.equalsIgnoreCase(Platform.RP2040.toString())) {
-          reporter
-              .at(pair, Literals.KEY_VALUE_PAIR__VALUE)
-              .error("Platform " + Platform.RP2040 + " does not support threading");
-        }
-        if (dic != null) {
-          var rp =
-              dic.getPairs().stream()
-                  .filter(
-                      kv ->
-                          kv.getName().equalsIgnoreCase("name")
-                              && ASTUtils.elementToSingleString(kv.getValue())
-                                  .equalsIgnoreCase(Platform.RP2040.toString()))
-                  .findFirst();
-          rp.ifPresent(
-              keyValuePair ->
-                  reporter
-                      .at(keyValuePair, Literals.KEY_VALUE_PAIR__VALUE)
-                      .error("Platform " + Platform.RP2040 + " does not support threading"));
+    final var node = pair.getValue();
+    Platform platform = null;
+    if (node.getLiteral() != null || node.getId() != null) {
+      platform = (Platform) UnionType.PLATFORM_UNION.forName(ASTUtils.elementToSingleString(node));
+      if (platform == null) {
+        reporter.at(pair, Literals.KEY_VALUE_PAIR__VALUE).error(UNKNOW_PLATFORM);
+      }
+    } else {
+      for (KeyValuePair entry : node.getKeyvalue().getPairs()) {
+        PlatformOption option =
+            (PlatformOption) DictionaryType.PLATFORM_DICT.forName(entry.getName());
+        if (Objects.requireNonNull(option) == PlatformOption.NAME) {
+          platform =
+              (Platform)
+                  UnionType.PLATFORM_UNION.forName(
+                      ASTUtils.elementToSingleString(entry.getValue()));
+          if (platform == null) {
+            reporter.at(entry, Literals.KEY_VALUE_PAIR__VALUE).error(UNKNOW_PLATFORM);
+          }
         }
       }
     }
+
+    var threading = TargetProperty.getKeyValuePair(ast, TargetProperty.THREADING);
+    if (threading != null && platform == Platform.RP2040) {
+      reporter
+          .at(pair, Literals.KEY_VALUE_PAIR__VALUE)
+          .error("Platform " + Platform.RP2040 + " does not support threading");
+    }
   }
 
   @Override
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 56aaa9636a..073e7e1705 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -50,6 +50,8 @@
 import org.lflang.lf.Model;
 import org.lflang.lf.Visibility;
 import org.lflang.target.TargetProperty;
+import org.lflang.target.property.PlatformProperty;
+import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.target.property.type.ArrayType;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.DictionaryType.DictionaryElement;
@@ -1610,6 +1612,23 @@ public void checkCargoDependencyProperty() throws Exception {
         "Expected an array of strings for key 'features'");
   }
 
+  @Test
+  public void checkPlatformProperty() throws Exception {
+    validator.assertNoErrors(createModel(TargetProperty.PLATFORM, Platform.ARDUINO.toString()));
+    validator.assertNoErrors(
+        createModel(TargetProperty.PLATFORM, String.format("{name: %s}", Platform.ZEPHYR)));
+    validator.assertError(
+        createModel(TargetProperty.PLATFORM, "foobar"),
+        LfPackage.eINSTANCE.getKeyValuePair(),
+        null,
+        PlatformProperty.UNKNOW_PLATFORM);
+    validator.assertError(
+        createModel(TargetProperty.PLATFORM, "{ name: foobar }"),
+        LfPackage.eINSTANCE.getKeyValuePair(),
+        null,
+        PlatformProperty.UNKNOW_PLATFORM);
+  }
+
   @Test
   public void testImportedCyclicReactor() throws Exception {
     // File tempFile = File.createTempFile("lf-validation", ".lf");

From 6a85ee071d1765c7976a962efbe5a6cf770c5f3b Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 2 Oct 2023 11:55:14 -0700
Subject: [PATCH 0971/1114] Address review comment

---
 .../main/java/org/lflang/target/property/CompilerProperty.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/target/property/CompilerProperty.java b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
index 286938df10..85d3690fcf 100644
--- a/core/src/main/java/org/lflang/target/property/CompilerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
@@ -7,6 +7,6 @@ public class CompilerProperty extends AbstractStringConfig {
 
   @Override
   public List<Target> supportedTargets() {
-    return Target.ALL;
+    return List.of(Target.C, Target.CCPP, Target.CPP);
   }
 }

From 5d499c8bf15042d040ee12de7b117f976c989c59 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 2 Oct 2023 11:57:25 -0700
Subject: [PATCH 0972/1114] Address another review comment

---
 .../main/java/org/lflang/target/property/PlatformProperty.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index 054d2f7861..70204cef25 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -72,7 +72,7 @@ protected PlatformOptions fromString(String string, MessageReporter reporter) {
 
   @Override
   public List<Target> supportedTargets() {
-    return Target.ALL;
+    return List.of(Target.C);
   }
 
   @Override

From 876491c717789a5cc606f23d82e404f13f8f91a1 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 2 Oct 2023 11:58:30 -0700
Subject: [PATCH 0973/1114] Remove copypasta

---
 .../main/kotlin/org/lflang/generator/ts/TSGenerator.kt    | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
index add6402ed3..38e601a8f7 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -91,13 +91,7 @@ class TSGenerator(
                 = (IntegratedBuilder.GENERATED_PERCENT_PROGRESS + IntegratedBuilder.COMPILED_PERCENT_PROGRESS) / 2
 
     }
-
-    init {
-        // Set defaults for federate compilation.
-        targetConfig.compiler.override("gcc")
-        targetConfig.compilerFlags.get().add("-O2")
-    }
-
+    
     /** Generate TypeScript code from the Lingua Franca model contained by the
      *  specified resource. This is the main entry point for code
      *  generation.

From 2a046f1577815c42dde921ee6c9a7bbf5fcd0751 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 2 Oct 2023 12:20:45 -0700
Subject: [PATCH 0974/1114] Debugging

---
 .../org/lflang/generator/python/PythonGenerator.java   | 10 +++++-----
 .../main/kotlin/org/lflang/generator/ts/TSGenerator.kt |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index 92d0f8a840..19a2cedd08 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -363,11 +363,11 @@ public boolean isOSCompatible() {
    */
   @Override
   public void doGenerate(Resource resource, LFGeneratorContext context) {
-    // Set the threading to false by default, unless the user has
-    // specifically asked for it.
-    if (!targetConfig.threading.isSet()) {
-      targetConfig.threading.override(false);
-    }
+//    // Set the threading to false by default, unless the user has
+//    // specifically asked for it.
+//    if (!targetConfig.threading.isSet()) {
+//      targetConfig.threading.override(false);
+//    }
     int cGeneratedPercentProgress = (IntegratedBuilder.VALIDATED_PERCENT_PROGRESS + 100) / 2;
     code.pr(
         PythonPreambleGenerator.generateCIncludeStatements(
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
index 38e601a8f7..999b8fba54 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -91,7 +91,7 @@ class TSGenerator(
                 = (IntegratedBuilder.GENERATED_PERCENT_PROGRESS + IntegratedBuilder.COMPILED_PERCENT_PROGRESS) / 2
 
     }
-    
+
     /** Generate TypeScript code from the Lingua Franca model contained by the
      *  specified resource. This is the main entry point for code
      *  generation.

From 237b506e4977790bacd569735c0042fc2cad1d79 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 2 Oct 2023 14:42:12 -0700
Subject: [PATCH 0975/1114] Mostly formatting

---
 .../lflang/federated/generator/FedTargetConfig.java   |  3 +--
 .../org/lflang/generator/python/PythonGenerator.java  | 11 +++--------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
index 7b468013cc..705a2dbcec 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
@@ -36,8 +36,7 @@ public FedTargetConfig(LFGeneratorContext context, Resource federateResource) {
     mergeImportedConfig(
         federateResource, context.getFileConfig().resource, context.getErrorReporter());
 
-    clearPropertiesToIgnore(); // FIXME: add boolean inherit() function to TargetPropertyConfig
-    // instead
+    clearPropertiesToIgnore();
 
     ((FedFileConfig) context.getFileConfig()).relativizePaths(this);
   }
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index 19a2cedd08..ab9092575d 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -363,11 +363,6 @@ public boolean isOSCompatible() {
    */
   @Override
   public void doGenerate(Resource resource, LFGeneratorContext context) {
-//    // Set the threading to false by default, unless the user has
-//    // specifically asked for it.
-//    if (!targetConfig.threading.isSet()) {
-//      targetConfig.threading.override(false);
-//    }
     int cGeneratedPercentProgress = (IntegratedBuilder.VALIDATED_PERCENT_PROGRESS + 100) / 2;
     code.pr(
         PythonPreambleGenerator.generateCIncludeStatements(
@@ -443,7 +438,6 @@ protected void generateReaction(
    * left to Python code to allow for more liberal state variable assignments.
    *
    * @param instance The reactor class instance
-   * @return Initialization code fore state variables of instance
    */
   @Override
   protected void generateStateVariableInitializations(ReactorInstance instance) {
@@ -604,14 +598,15 @@ private static String generateCmakeInstall(FileConfig fileConfig) {
     return """
               if(WIN32)
                 file(GENERATE OUTPUT <fileName>.bat CONTENT
-                  "@echo off\n\
+                  "@echo off
+            \
                   ${Python_EXECUTABLE} <pyMainName> %*"
                 )
                 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/<fileName>.bat DESTINATION ${CMAKE_INSTALL_BINDIR})
               else()
                 file(GENERATE OUTPUT <fileName> CONTENT
                     "#!/bin/sh\\n\\
-                    ${Python_EXECUTABLE} <pyMainName> \\\"$@\\\""
+                    ${Python_EXECUTABLE} <pyMainName> \\"$@\\""
                 )
                 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/<fileName> DESTINATION ${CMAKE_INSTALL_BINDIR})
               endif()

From f30a57f4e15958fef062d520120de5089bb6ea83 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 2 Oct 2023 16:19:47 -0700
Subject: [PATCH 0976/1114] Proof of concept of target properties without enum

---
 .../org/lflang/AbstractTargetProperty.java    |  3 ++
 .../java/org/lflang/target/TargetConfig.java  | 28 +++++++++++++++++++
 .../org/lflang/target/TargetProperty.java     | 10 +++----
 .../lflang/target/property/AuthProperty.java  |  5 ++++
 .../property/BuildCommandsProperty.java       |  5 ++++
 .../target/property/BuildTypeProperty.java    |  5 ++++
 .../property/CargoDependenciesProperty.java   |  5 ++++
 .../property/CargoFeaturesProperty.java       |  5 ++++
 .../property/ClockSyncModeProperty.java       |  5 ++++
 .../property/ClockSyncOptionsProperty.java    |  5 ++++
 .../target/property/CmakeIncludeProperty.java |  5 ++++
 .../property/CompileDefinitionsProperty.java  |  5 ++++
 .../property/CompilerFlagsProperty.java       |  5 ++++
 .../target/property/CompilerProperty.java     |  5 ++++
 .../property/CoordinationOptionsProperty.java |  5 ++++
 .../target/property/CoordinationProperty.java |  5 ++++
 .../target/property/DockerProperty.java       |  5 ++++
 .../ExportDependencyGraphProperty.java        |  5 ++++
 .../target/property/ExportToYamlProperty.java |  5 ++++
 .../property/ExternalRuntimePathProperty.java |  5 ++++
 .../lflang/target/property/FastProperty.java  |  5 ++++
 .../target/property/FedSetupProperty.java     |  5 ++++
 .../lflang/target/property/FilesProperty.java |  5 ++++
 .../target/property/KeepaliveProperty.java    |  5 ++++
 .../target/property/LoggingProperty.java      |  5 ++++
 .../target/property/NoCompileProperty.java    |  5 ++++
 .../property/NoRuntimeValidationProperty.java |  5 ++++
 .../target/property/PlatformProperty.java     |  5 ++++
 .../property/PrintStatisticsProperty.java     |  5 ++++
 .../target/property/ProtobufsProperty.java    |  5 ++++
 .../property/Ros2DependenciesProperty.java    |  5 ++++
 .../lflang/target/property/Ros2Property.java  |  5 ++++
 .../property/RuntimeVersionProperty.java      |  5 ++++
 .../target/property/RustIncludeProperty.java  |  5 ++++
 .../target/property/SchedulerProperty.java    |  5 ++++
 .../property/SingleFileProjectProperty.java   |  5 ++++
 .../target/property/ThreadingProperty.java    |  5 ++++
 .../target/property/TimeOutProperty.java      |  5 ++++
 .../target/property/TracingProperty.java      |  5 ++++
 .../target/property/VerifyProperty.java       |  5 ++++
 .../target/property/WorkersProperty.java      |  5 ++++
 41 files changed, 226 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/lflang/AbstractTargetProperty.java b/core/src/main/java/org/lflang/AbstractTargetProperty.java
index 03a7e7d305..1ec4d187f0 100644
--- a/core/src/main/java/org/lflang/AbstractTargetProperty.java
+++ b/core/src/main/java/org/lflang/AbstractTargetProperty.java
@@ -187,4 +187,7 @@ public T get() {
    * Return an AST node that represents this target property and the value currently assigned to it.
    */
   public abstract Element toAstElement();
+
+  /** Return the name of this target property (in kebab case). */
+  public abstract String name();
 }
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 31e46c0179..fe5430197b 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -25,8 +25,11 @@
 package org.lflang.target;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
+import java.util.stream.Collectors;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.generator.rust.RustTargetConfig;
@@ -263,4 +266,29 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
 
   /** Path to a C file used by the Python target to setup federated execution. */
   public final FedSetupProperty fedSetupPreamble = new FedSetupProperty();
+
+  public static List<AbstractTargetProperty<?>> getAllTargetProperties(Object object) {
+    var fields = object.getClass().getDeclaredFields();
+
+    List properties =
+        Arrays.stream(fields)
+            .filter(f -> AbstractTargetProperty.class.isAssignableFrom(f.getType()))
+            .map(
+                f -> {
+                  try {
+                    return (AbstractTargetProperty) f.get(object);
+                  } catch (IllegalAccessException e) {
+                    throw new RuntimeException(e);
+                  }
+                })
+            .collect(Collectors.toList());
+
+    return properties;
+  }
+
+  public List<AbstractTargetProperty<?>> getAllTargetProperties() {
+    var properties = TargetConfig.getAllTargetProperties(this);
+    properties.addAll(TargetConfig.getAllTargetProperties(this.rust));
+    return properties;
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/TargetProperty.java b/core/src/main/java/org/lflang/target/TargetProperty.java
index 621623a813..50761efd1b 100644
--- a/core/src/main/java/org/lflang/target/TargetProperty.java
+++ b/core/src/main/java/org/lflang/target/TargetProperty.java
@@ -418,14 +418,14 @@ public static void validate(
         .forEach(
             pair -> {
               var match =
-                  Arrays.stream(TargetProperty.values())
-                      .filter(prop -> prop.toString().equalsIgnoreCase(pair.getName()))
+                  config.getAllTargetProperties().stream()
+                      .filter(prop -> prop.name().equalsIgnoreCase(pair.getName()))
                       .findAny();
               if (match.isPresent()) {
                 var p = match.get();
-                p.property.of(config).checkSupport(pair, config.target, reporter);
-                p.property.of(config).checkType(pair, reporter);
-                p.property.of(config).validate(pair, ast, reporter);
+                p.checkSupport(pair, config.target, reporter);
+                p.checkType(pair, reporter);
+                p.validate(pair, ast, reporter);
               } else {
                 reporter
                     .at(pair, Literals.KEY_VALUE_PAIR__NAME)
diff --git a/core/src/main/java/org/lflang/target/property/AuthProperty.java b/core/src/main/java/org/lflang/target/property/AuthProperty.java
index f8132c116f..6540d0780f 100644
--- a/core/src/main/java/org/lflang/target/property/AuthProperty.java
+++ b/core/src/main/java/org/lflang/target/property/AuthProperty.java
@@ -10,4 +10,9 @@ public class AuthProperty extends AbstractBooleanProperty {
   public List<Target> supportedTargets() {
     return Arrays.asList(Target.C, Target.CCPP);
   }
+
+  @Override
+  public String name() {
+    return "auth";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
index da459ab500..cb46e4864c 100644
--- a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
@@ -40,4 +40,9 @@ public List<Target> supportedTargets() {
   public Element toAstElement() {
     return ASTUtils.toElement(this.get().toString());
   }
+
+  @Override
+  public String name() {
+    return "build";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
index 86e79f4c99..f69f40e94a 100644
--- a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
@@ -36,6 +36,11 @@ protected BuildType fromString(String string, MessageReporter reporter) {
     return (BuildType) UnionType.BUILD_TYPE_UNION.forName(string);
   }
 
+  @Override
+  public String name() {
+    return "build-type";
+  }
+
   @Override
   public List<Target> supportedTargets() {
     return Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Rust);
diff --git a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
index 5761073267..b349541183 100644
--- a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
@@ -59,4 +59,9 @@ public Element toAstElement() {
       return e;
     }
   }
+
+  @Override
+  public String name() {
+    return "cargo-dependencies";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java b/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
index 290b0961d3..ac1d299d08 100644
--- a/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
@@ -10,4 +10,9 @@ public class CargoFeaturesProperty extends AbstractStringListProperty {
   public List<Target> supportedTargets() {
     return Arrays.asList(Target.Rust);
   }
+
+  @Override
+  public String name() {
+    return "cargo-features";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
index 1b18b20817..ce7bd3f6d8 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
@@ -65,6 +65,11 @@ public Element toAstElement() {
     return ASTUtils.toElement(this.get().toString());
   }
 
+  @Override
+  public String name() {
+    return "clock-sync";
+  }
+
   /**
    * Enumeration of clock synchronization modes.
    *
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
index e994ab1035..6227efe33f 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
@@ -90,6 +90,11 @@ public Element toAstElement() {
     return e;
   }
 
+  @Override
+  public String name() {
+    return "clock-sync-options";
+  }
+
   /** Settings related to clock synchronization. */
   public static class ClockSyncOptions {
 
diff --git a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
index 179a80e7a6..90b1c5c297 100644
--- a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
@@ -59,4 +59,9 @@ public List<Target> supportedTargets() {
   public Element toAstElement() {
     return ASTUtils.toElement(this.get());
   }
+
+  @Override
+  public String name() {
+    return "cmake-include";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
index a754b2ce4a..6c3a826f30 100644
--- a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
@@ -47,4 +47,9 @@ public List<Target> supportedTargets() {
   public Element toAstElement() {
     return ASTUtils.toElement(this.get());
   }
+
+  @Override
+  public String name() {
+    return "compile-definitions";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
index 4ebd7a6131..acd12748ba 100644
--- a/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
@@ -10,4 +10,9 @@ public class CompilerFlagsProperty extends AbstractStringListProperty {
   public List<Target> supportedTargets() {
     return Arrays.asList(Target.C, Target.CCPP);
   }
+
+  @Override
+  public String name() {
+    return "compiler-flags";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/CompilerProperty.java b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
index 85d3690fcf..0be8df2f76 100644
--- a/core/src/main/java/org/lflang/target/property/CompilerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
@@ -9,4 +9,9 @@ public class CompilerProperty extends AbstractStringConfig {
   public List<Target> supportedTargets() {
     return List.of(Target.C, Target.CCPP, Target.CPP);
   }
+
+  @Override
+  public String name() {
+    return "compiler";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
index 348b6f31b7..60575e3c01 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
@@ -74,6 +74,11 @@ public Element toAstElement() {
     return e;
   }
 
+  @Override
+  public String name() {
+    return "coordination-options";
+  }
+
   /** Settings related to coordination of federated execution. */
   public static class CoordinationOptions {
 
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
index d550fe5dc2..65b9f7fbb8 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
@@ -41,6 +41,11 @@ public Element toAstElement() {
     return ASTUtils.toElement(this.get().toString());
   }
 
+  @Override
+  public String name() {
+    return "coordination";
+  }
+
   /**
    * Enumeration of coordination types.
    *
diff --git a/core/src/main/java/org/lflang/target/property/DockerProperty.java b/core/src/main/java/org/lflang/target/property/DockerProperty.java
index ffd488f07a..89ab7bef06 100644
--- a/core/src/main/java/org/lflang/target/property/DockerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DockerProperty.java
@@ -87,6 +87,11 @@ public Element toAstElement() {
     }
   }
 
+  @Override
+  public String name() {
+    return "docker";
+  }
+
   /** Settings related to Docker options. */
   public static class DockerOptions {
 
diff --git a/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java b/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
index 427f4eab17..761eded16c 100644
--- a/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
@@ -9,4 +9,9 @@ public class ExportDependencyGraphProperty extends AbstractBooleanProperty {
   public List<Target> supportedTargets() {
     return List.of(Target.CPP, Target.Rust);
   }
+
+  @Override
+  public String name() {
+    return "export-dependency-graph";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java b/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
index f9349afa6d..a4aebb4d16 100644
--- a/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
@@ -9,4 +9,9 @@ public class ExportToYamlProperty extends AbstractBooleanProperty {
   public List<Target> supportedTargets() {
     return List.of(Target.CPP);
   }
+
+  @Override
+  public String name() {
+    return "export-to-yaml";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
index 8db19aee3c..6c704974ac 100644
--- a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
@@ -9,4 +9,9 @@ public class ExternalRuntimePathProperty extends AbstractStringConfig {
   public List<Target> supportedTargets() {
     return List.of(Target.CPP, Target.Rust);
   }
+
+  @Override
+  public String name() {
+    return "external-runtime-path";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/FastProperty.java b/core/src/main/java/org/lflang/target/property/FastProperty.java
index 80898e5417..9d019386b5 100644
--- a/core/src/main/java/org/lflang/target/property/FastProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FastProperty.java
@@ -18,6 +18,11 @@ public List<Target> supportedTargets() {
     return Target.ALL;
   }
 
+  @Override
+  public String name() {
+    return "fast";
+  }
+
   @Override
   public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
     if (pair != null) {
diff --git a/core/src/main/java/org/lflang/target/property/FedSetupProperty.java b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
index 3b2c539d47..83ede21100 100644
--- a/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
@@ -39,4 +39,9 @@ public List<Target> supportedTargets() {
   public Element toAstElement() {
     return ASTUtils.toElement(get());
   }
+
+  @Override
+  public String name() {
+    return "_fed_setup"; // FIXME: follow kebab case convention
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/FilesProperty.java b/core/src/main/java/org/lflang/target/property/FilesProperty.java
index d7d5578431..d0819fbac5 100644
--- a/core/src/main/java/org/lflang/target/property/FilesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FilesProperty.java
@@ -9,4 +9,9 @@ public class FilesProperty extends AbstractFileListProperty {
   public List<Target> supportedTargets() {
     return List.of(Target.C, Target.CCPP, Target.Python);
   }
+
+  @Override
+  public String name() {
+    return "files";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
index 0e61ccbe68..d40c5ccccd 100644
--- a/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
+++ b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
@@ -9,4 +9,9 @@ public class KeepaliveProperty extends AbstractBooleanProperty {
   public List<Target> supportedTargets() {
     return List.of(Target.C, Target.CCPP, Target.Python, Target.TS, Target.Rust);
   }
+
+  @Override
+  public String name() {
+    return "keepalive";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/LoggingProperty.java b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
index 9c59b03f4d..554bfbebeb 100644
--- a/core/src/main/java/org/lflang/target/property/LoggingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
@@ -39,6 +39,11 @@ public Element toAstElement() {
     return ASTUtils.toElement(get().toString());
   }
 
+  @Override
+  public String name() {
+    return "logging";
+  }
+
   /**
    * Log levels in descending order of severity.
    *
diff --git a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
index fa8c949d6f..12728f02e9 100644
--- a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
+++ b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
@@ -10,4 +10,9 @@ public class NoCompileProperty extends AbstractBooleanProperty {
   public List<Target> supportedTargets() {
     return Arrays.asList(Target.C, Target.CPP, Target.CCPP, Target.Python);
   }
+
+  @Override
+  public String name() {
+    return "no-compile";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java b/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
index dd0e91613c..e7fe466d29 100644
--- a/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
+++ b/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
@@ -9,4 +9,9 @@ public class NoRuntimeValidationProperty extends AbstractBooleanProperty {
   public List<Target> supportedTargets() {
     return List.of(Target.CPP);
   }
+
+  @Override
+  public String name() {
+    return "no-runtime-validation";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index 70204cef25..310cedcd63 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -132,6 +132,11 @@ public Element toAstElement() {
     return e;
   }
 
+  @Override
+  public String name() {
+    return "platform";
+  }
+
   /** Settings related to Platform Options. */
   public static class PlatformOptions { // FIXME: use a record for this
 
diff --git a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
index c100f3fc2c..928ca07dbc 100644
--- a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
@@ -9,4 +9,9 @@ public class PrintStatisticsProperty extends AbstractBooleanProperty {
   public List<Target> supportedTargets() {
     return List.of(Target.CPP);
   }
+
+  @Override
+  public String name() {
+    return "print-statistics";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java b/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
index d8e0541bff..7fe1dcc94b 100644
--- a/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
@@ -9,4 +9,9 @@ public class ProtobufsProperty extends AbstractFileListProperty {
   public List<Target> supportedTargets() {
     return List.of(Target.C, Target.CCPP, Target.TS, Target.Python);
   }
+
+  @Override
+  public String name() {
+    return "protobufs";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
index 755911602b..63db20f871 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
@@ -53,4 +53,9 @@ public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
   public Element toAstElement() {
     return ASTUtils.toElement(get());
   }
+
+  @Override
+  public String name() {
+    return "ros2-dependencies";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/Ros2Property.java b/core/src/main/java/org/lflang/target/property/Ros2Property.java
index b768f67d5d..51027779ea 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2Property.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2Property.java
@@ -9,4 +9,9 @@ public class Ros2Property extends AbstractBooleanProperty {
   public List<Target> supportedTargets() {
     return List.of(Target.CPP);
   }
+
+  @Override
+  public String name() {
+    return "ros2";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
index 19835dcbd8..36758e8339 100644
--- a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
@@ -9,4 +9,9 @@ public class RuntimeVersionProperty extends AbstractStringConfig {
   public List<Target> supportedTargets() {
     return List.of(Target.CPP, Target.Rust);
   }
+
+  @Override
+  public String name() {
+    return "runtime-version";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
index c448cba296..b375c68e82 100644
--- a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
@@ -87,6 +87,11 @@ public Element toAstElement() {
     }
   }
 
+  @Override
+  public String name() {
+    return "rust-include";
+  }
+
   private boolean checkTopLevelModule(Path path, EObject errorOwner, MessageReporter err) {
     String fileName = path.getFileName().toString();
     if (!Files.exists(path)) {
diff --git a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
index 55b574e4b0..e4613fa0a1 100644
--- a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
@@ -51,6 +51,11 @@ public Element toAstElement() {
     return ASTUtils.toElement(this.get().toString());
   }
 
+  @Override
+  public String name() {
+    return "scheduler";
+  }
+
   @Override
   public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
     if (pair != null) {
diff --git a/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java b/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
index 651526a642..51d2f058b0 100644
--- a/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
@@ -9,4 +9,9 @@ public class SingleFileProjectProperty extends AbstractBooleanProperty {
   public List<Target> supportedTargets() {
     return List.of(Target.Rust);
   }
+
+  @Override
+  public String name() {
+    return "single-file-project";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/ThreadingProperty.java b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
index bfc7881c25..bf5a39f36e 100644
--- a/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
@@ -10,6 +10,11 @@ public List<Target> supportedTargets() {
     return List.of(Target.C, Target.CCPP, Target.Python, Target.Rust);
   }
 
+  @Override
+  public String name() {
+    return "threading";
+  }
+
   @Override
   public Boolean initialValue() {
     return true;
diff --git a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
index d5bd2310bf..faa6051320 100644
--- a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
@@ -39,4 +39,9 @@ public List<Target> supportedTargets() {
   public Element toAstElement() {
     return ASTUtils.toElement(get());
   }
+
+  @Override
+  public String name() {
+    return "timeout";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index 779ae9f68b..2eb2c1c7cd 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -106,6 +106,11 @@ public Element toAstElement() {
     }
   }
 
+  @Override
+  public String name() {
+    return "tracing";
+  }
+
   /** Settings related to tracing options. */
   public static class TracingOptions {
 
diff --git a/core/src/main/java/org/lflang/target/property/VerifyProperty.java b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
index 1065e4e147..5294c5cc80 100644
--- a/core/src/main/java/org/lflang/target/property/VerifyProperty.java
+++ b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
@@ -10,4 +10,9 @@ public class VerifyProperty extends AbstractBooleanProperty {
   public List<Target> supportedTargets() {
     return List.of(Target.C);
   }
+
+  @Override
+  public String name() {
+    return "verify";
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/WorkersProperty.java b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
index 823c6d8369..00812da4c1 100644
--- a/core/src/main/java/org/lflang/target/property/WorkersProperty.java
+++ b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
@@ -38,4 +38,9 @@ public List<Target> supportedTargets() {
   public Element toAstElement() {
     return ASTUtils.toElement(get());
   }
+
+  @Override
+  public String name() {
+    return "workers";
+  }
 }

From ec56234220901a199e54519478e976b5963401b1 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 2 Oct 2023 17:56:02 -0700
Subject: [PATCH 0977/1114] Removal of enums

---
 .../org/lflang/AbstractTargetProperty.java    |  21 ++
 .../org/lflang/generator/GeneratorUtils.java  |   2 +-
 .../java/org/lflang/target/TargetConfig.java  |  48 +--
 .../org/lflang/target/TargetProperty.java     | 318 ++----------------
 .../lflang/target/property/AuthProperty.java  |   1 +
 .../property/BuildCommandsProperty.java       |   1 +
 .../target/property/BuildTypeProperty.java    |   4 +
 .../property/CargoDependenciesProperty.java   |  25 ++
 .../property/CargoFeaturesProperty.java       |   1 +
 .../property/ClockSyncModeProperty.java       |   1 +
 .../property/ClockSyncOptionsProperty.java    |   1 +
 .../target/property/CmakeIncludeProperty.java |   6 +
 .../property/CompileDefinitionsProperty.java  |   1 +
 .../property/CompilerFlagsProperty.java       |   1 +
 .../target/property/CompilerProperty.java     |   1 +
 .../property/CoordinationOptionsProperty.java |   1 +
 .../target/property/CoordinationProperty.java |   1 +
 .../target/property/DockerProperty.java       |   4 +
 .../ExportDependencyGraphProperty.java        |   5 +
 .../target/property/ExportToYamlProperty.java |   5 +
 .../property/ExternalRuntimePathProperty.java |   1 +
 .../lflang/target/property/FastProperty.java  |   1 +
 .../target/property/FedSetupProperty.java     |   4 +
 .../lflang/target/property/FilesProperty.java |   1 +
 .../target/property/KeepaliveProperty.java    |   4 +
 .../target/property/LoggingProperty.java      |   1 +
 .../target/property/NoCompileProperty.java    |   1 +
 .../property/NoRuntimeValidationProperty.java |   1 +
 .../target/property/PlatformProperty.java     |   6 +-
 .../property/PrintStatisticsProperty.java     |   1 +
 .../target/property/ProtobufsProperty.java    |   4 +
 .../property/Ros2DependenciesProperty.java    |   3 +-
 .../lflang/target/property/Ros2Property.java  |   1 +
 .../property/RuntimeVersionProperty.java      |   1 +
 .../target/property/RustIncludeProperty.java  |   6 +
 .../target/property/SchedulerProperty.java    |   1 +
 .../property/SingleFileProjectProperty.java   |   1 +
 .../target/property/ThreadingProperty.java    |   1 +
 .../target/property/TimeOutProperty.java      |   1 +
 .../target/property/TracingProperty.java      |   3 +-
 .../target/property/VerifyProperty.java       |   1 +
 .../target/property/WorkersProperty.java      |   1 +
 .../compiler/LinguaFrancaValidationTest.java  |  27 +-
 43 files changed, 183 insertions(+), 337 deletions(-)

diff --git a/core/src/main/java/org/lflang/AbstractTargetProperty.java b/core/src/main/java/org/lflang/AbstractTargetProperty.java
index 1ec4d187f0..53d0ccd4bd 100644
--- a/core/src/main/java/org/lflang/AbstractTargetProperty.java
+++ b/core/src/main/java/org/lflang/AbstractTargetProperty.java
@@ -1,6 +1,8 @@
 package org.lflang;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
@@ -190,4 +192,23 @@ public T get() {
 
   /** Return the name of this target property (in kebab case). */
   public abstract String name();
+
+  public static List<AbstractTargetProperty> getAllTargetProperties(Object object) {
+    var fields = object.getClass().getDeclaredFields();
+
+    List<AbstractTargetProperty> properties =
+        Arrays.stream(fields)
+            .filter(f -> AbstractTargetProperty.class.isAssignableFrom(f.getType()))
+            .map(
+                f -> {
+                  try {
+                    return (AbstractTargetProperty) f.get(object);
+                  } catch (IllegalAccessException e) {
+                    throw new RuntimeException(e);
+                  }
+                })
+            .collect(Collectors.toList());
+
+    return properties;
+  }
 }
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index 9c4c1f0270..e2a6e89928 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -63,7 +63,7 @@ public static void accommodatePhysicalActionsIfPresent(
           String message =
               String.format(
                   "Setting %s to true because of the physical action %s.",
-                  TargetProperty.KEEPALIVE, action.getName());
+                  targetConfig.keepalive.name(), action.getName());
           messageReporter.at(action).warning(message);
           return;
         }
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index fe5430197b..23906a80ab 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -25,8 +25,8 @@
 package org.lflang.target;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.stream.Collectors;
 import org.lflang.AbstractTargetProperty;
@@ -83,6 +83,11 @@ public class TargetConfig {
   /** The target of this configuration (e.g., C, TypeScript, Python). */
   public final Target target;
 
+  /** Private constructor used to create a target config that is not tied to a particular target. */
+  private TargetConfig() {
+    this.target = null;
+  }
+
   /**
    * Create a new target configuration based on the given target declaration AST node only.
    *
@@ -267,28 +272,29 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
   /** Path to a C file used by the Python target to setup federated execution. */
   public final FedSetupProperty fedSetupPreamble = new FedSetupProperty();
 
-  public static List<AbstractTargetProperty<?>> getAllTargetProperties(Object object) {
-    var fields = object.getClass().getDeclaredFields();
-
-    List properties =
-        Arrays.stream(fields)
-            .filter(f -> AbstractTargetProperty.class.isAssignableFrom(f.getType()))
-            .map(
-                f -> {
-                  try {
-                    return (AbstractTargetProperty) f.get(object);
-                  } catch (IllegalAccessException e) {
-                    throw new RuntimeException(e);
-                  }
-                })
-            .collect(Collectors.toList());
-
+  public List<AbstractTargetProperty> getAllTargetProperties() {
+    var properties = AbstractTargetProperty.getAllTargetProperties(this);
+    properties.addAll(AbstractTargetProperty.getAllTargetProperties(this.rust));
     return properties;
   }
 
-  public List<AbstractTargetProperty<?>> getAllTargetProperties() {
-    var properties = TargetConfig.getAllTargetProperties(this);
-    properties.addAll(TargetConfig.getAllTargetProperties(this.rust));
-    return properties;
+  public static List<AbstractTargetProperty> getUserTargetProperties() {
+    var config = new TargetConfig();
+    var properties = AbstractTargetProperty.getAllTargetProperties(config);
+    properties.addAll(AbstractTargetProperty.getAllTargetProperties(config));
+    return properties.stream()
+        .filter(it -> !it.name().startsWith("_"))
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Return the target property in this target config that matches the given string.
+   *
+   * @param name The string to match against.
+   */
+  public Optional<AbstractTargetProperty> forName(String name) {
+    return this.getAllTargetProperties().stream()
+        .filter(c -> c.name().equalsIgnoreCase(name))
+        .findFirst();
   }
 }
diff --git a/core/src/main/java/org/lflang/target/TargetProperty.java b/core/src/main/java/org/lflang/target/TargetProperty.java
index 50761efd1b..fd85287440 100644
--- a/core/src/main/java/org/lflang/target/TargetProperty.java
+++ b/core/src/main/java/org/lflang/target/TargetProperty.java
@@ -26,7 +26,6 @@
 package org.lflang.target;
 
 import java.nio.file.Path;
-import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
@@ -43,44 +42,6 @@
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
 import org.lflang.lf.TargetDecl;
-import org.lflang.target.property.AuthProperty;
-import org.lflang.target.property.BuildCommandsProperty;
-import org.lflang.target.property.BuildTypeProperty;
-import org.lflang.target.property.CargoDependenciesProperty;
-import org.lflang.target.property.CargoFeaturesProperty;
-import org.lflang.target.property.ClockSyncModeProperty;
-import org.lflang.target.property.ClockSyncOptionsProperty;
-import org.lflang.target.property.CmakeIncludeProperty;
-import org.lflang.target.property.CompileDefinitionsProperty;
-import org.lflang.target.property.CompilerFlagsProperty;
-import org.lflang.target.property.CompilerProperty;
-import org.lflang.target.property.CoordinationOptionsProperty;
-import org.lflang.target.property.CoordinationProperty;
-import org.lflang.target.property.DockerProperty;
-import org.lflang.target.property.ExportDependencyGraphProperty;
-import org.lflang.target.property.ExportToYamlProperty;
-import org.lflang.target.property.ExternalRuntimePathProperty;
-import org.lflang.target.property.FastProperty;
-import org.lflang.target.property.FedSetupProperty;
-import org.lflang.target.property.FilesProperty;
-import org.lflang.target.property.KeepaliveProperty;
-import org.lflang.target.property.LoggingProperty;
-import org.lflang.target.property.NoCompileProperty;
-import org.lflang.target.property.NoRuntimeValidationProperty;
-import org.lflang.target.property.PlatformProperty;
-import org.lflang.target.property.PrintStatisticsProperty;
-import org.lflang.target.property.ProtobufsProperty;
-import org.lflang.target.property.Ros2DependenciesProperty;
-import org.lflang.target.property.Ros2Property;
-import org.lflang.target.property.RuntimeVersionProperty;
-import org.lflang.target.property.RustIncludeProperty;
-import org.lflang.target.property.SchedulerProperty;
-import org.lflang.target.property.SingleFileProjectProperty;
-import org.lflang.target.property.ThreadingProperty;
-import org.lflang.target.property.TimeOutProperty;
-import org.lflang.target.property.TracingProperty;
-import org.lflang.target.property.WorkersProperty;
-import org.lflang.target.property.type.VerifyProperty;
 import org.lflang.validation.ValidatorMessageReporter;
 
 /**
@@ -89,215 +50,14 @@
  *
  * @author Marten Lohstroh
  */
-public enum TargetProperty {
-
-  /** Directive to allow including OpenSSL libraries and process HMAC authentication. */
-  AUTH(AuthProperty.class, config -> config.auth),
-  /** Directive to let the generator use the custom build command. */
-  BUILD(BuildCommandsProperty.class, config -> config.buildCommands),
-
-  /**
-   * Directive to specify the target build type such as 'Release' or 'Debug'. This is also used in
-   * the Rust target to select a Cargo profile.
-   */
-  BUILD_TYPE(BuildTypeProperty.class, config -> config.buildType),
-
-  /** Directive to let the federate execution handle clock synchronization in software. */
-  CLOCK_SYNC(ClockSyncModeProperty.class, config -> config.clockSync),
-  /** Key-value pairs giving options for clock synchronization. */
-  CLOCK_SYNC_OPTIONS(ClockSyncOptionsProperty.class, config -> config.clockSyncOptions),
-
-  /**
-   * Directive to specify a cmake to be included by the generated build systems.
-   *
-   * <p>This gives full control over the C/C++ build as any cmake parameters can be adjusted in the
-   * included file.
-   */
-  CMAKE_INCLUDE(CmakeIncludeProperty.class, config -> config.cmakeIncludes),
-  /** Directive to specify the target compiler. */
-  COMPILER(CompilerProperty.class, config -> config.compiler),
-  /** Directive to specify compile-time definitions. */
-  COMPILE_DEFINITIONS(CompileDefinitionsProperty.class, config -> config.compileDefinitions),
-
-  /** Directive to specify the coordination mode */
-  COORDINATION(CoordinationProperty.class, config -> config.coordination),
-  /** Key-value pairs giving options for clock synchronization. */
-  COORDINATION_OPTIONS(CoordinationOptionsProperty.class, config -> config.coordinationOptions),
-  /**
-   * Directive to generate a Dockerfile. This is either a boolean, true or false, or a dictionary of
-   * options.
-   */
-  DOCKER(DockerProperty.class, config -> config.dockerOptions),
-  /** Directive for specifying a path to an external runtime to be used for the compiled binary. */
-  EXTERNAL_RUNTIME_PATH(ExternalRuntimePathProperty.class, config -> config.externalRuntimePath),
-  /**
-   * Directive to let the execution engine allow logical time to elapse faster than physical time.
-   */
-  FAST(FastProperty.class, config -> config.fastMode),
-  /**
-   * Directive to stage particular files on the class path to be processed by the code generator.
-   */
-  FILES(FilesProperty.class, config -> config.files),
-
-  /** Flags to be passed on to the target compiler. */
-  FLAGS(CompilerFlagsProperty.class, config -> config.compilerFlags),
-
-  /**
-   * Directive to let the execution engine remain active also if there are no more events in the
-   * event queue.
-   */
-  KEEPALIVE(KeepaliveProperty.class, config -> config.keepalive),
-
-  /** Directive to specify the grain at which to report log messages during execution. */
-  LOGGING(LoggingProperty.class, config -> config.logLevel),
-
-  /** Directive to not invoke the target compiler. */
-  NO_COMPILE(NoCompileProperty.class, config -> config.noCompile),
-
-  /** Directive to disable validation of reactor rules at runtime. */
-  NO_RUNTIME_VALIDATION(NoRuntimeValidationProperty.class, config -> config.noRuntimeValidation),
-
-  /**
-   * Directive to specify the platform for cross code generation. This is either a string of the
-   * platform or a dictionary of options that includes the string name.
-   */
-  PLATFORM(PlatformProperty.class, config -> config.platformOptions),
-
-  /** Directive to instruct the runtime to collect and print execution statistics. */
-  PRINT_STATISTICS(PrintStatisticsProperty.class, config -> config.printStatistics),
-
-  /**
-   * Directive for specifying .proto files that need to be compiled and their code included in the
-   * sources.
-   */
-  PROTOBUFS(ProtobufsProperty.class, config -> config.protoFiles),
-
-  /** Directive to specify that ROS2 specific code is generated, */
-  ROS2(Ros2Property.class, config -> config.ros2),
-
-  /** Directive to specify additional ROS2 packages that this LF program depends on. */
-  ROS2_DEPENDENCIES(Ros2DependenciesProperty.class, config -> config.ros2Dependencies),
-
-  /** Directive for specifying a specific version of the reactor runtime library. */
-  RUNTIME_VERSION(RuntimeVersionProperty.class, config -> config.runtimeVersion),
-
-  /** Directive for specifying a specific runtime scheduler, if supported. */
-  SCHEDULER(SchedulerProperty.class, config -> config.schedulerType),
-  /** Directive to specify that all code is generated in a single file. */
-  SINGLE_FILE_PROJECT(SingleFileProjectProperty.class, config -> config.singleFileProject),
-
-  /** Directive to indicate whether the runtime should use multi-threading. */
-  THREADING(ThreadingProperty.class, config -> config.threading),
-  /** Directive to check the generated verification model. */
-  VERIFY(VerifyProperty.class, config -> config.verify),
-
-  /** Directive to specify the number of worker threads used by the runtime. */
-  WORKERS(WorkersProperty.class, config -> config.workers),
-
-  /** Directive to specify the execution timeout. */
-  TIMEOUT(TimeOutProperty.class, config -> config.timeout),
-
-  /** Directive to enable tracing. */
-  TRACING(TracingProperty.class, config -> config.tracing),
-
-  /**
-   * Directive to let the runtime export its internal dependency graph.
-   *
-   * <p>This is a debugging feature and currently only used for C++ and Rust programs.
-   */
-  EXPORT_DEPENDENCY_GRAPH(
-      ExportDependencyGraphProperty.class, config -> config.exportDependencyGraph),
-
-  /**
-   * Directive to let the runtime export the program structure to a yaml file.
-   *
-   * <p>This is a debugging feature and currently only used for C++ programs.
-   */
-  EXPORT_TO_YAML(ExportToYamlProperty.class, config -> config.exportToYaml),
-
-  /**
-   * List of module files to link into the crate as top-level. For instance, a {@code target Rust {
-   * rust-modules: [ "foo.rs" ] }} will cause the file to be copied into the generated project, and
-   * the generated {@code main.rs} will include it with a {@code mod foo;}. If one of the paths is a
-   * directory, it must contain a {@code mod.rs} file, and all its contents are copied.
-   */
-  RUST_INCLUDE(RustIncludeProperty.class, config -> config.rust.rustTopLevelModules),
-
-  /** Directive for specifying Cargo features of the generated program to enable. */
-  CARGO_FEATURES(CargoFeaturesProperty.class, config -> config.rust.cargoFeatures),
-
-  /**
-   * Dependency specifications for Cargo. This property looks like this:
-   *
-   * <pre>{@code
-   * cargo-dependencies: {
-   *    // Name-of-the-crate: "version"
-   *    rand: "0.8",
-   *    // Equivalent to using an explicit map:
-   *    rand: {
-   *      version: "0.8"
-   *    },
-   *    // The map allows specifying more details
-   *    rand: {
-   *      // A path to a local unpublished crate.
-   *      // Note 'path' is mutually exclusive with 'version'.
-   *      path: "/home/me/Git/local-rand-clone"
-   *    },
-   *    rand: {
-   *      version: "0.8",
-   *      // you can specify cargo features
-   *      features: ["some-cargo-feature",]
-   *    }
-   * }
-   * }</pre>
-   */
-  CARGO_DEPENDENCIES(CargoDependenciesProperty.class, config -> config.rust.cargoDependencies),
-
-  /**
-   * Directs the C or Python target to include the associated C file used for setting up federated
-   * execution before processing the first tag.
-   */
-  FED_SETUP(FedSetupProperty.class, config -> config.fedSetupPreamble);
-
-  public final ConfigLoader property;
-
-  public final Class<? extends AbstractTargetProperty<?>> propertyClass;
-
-  @FunctionalInterface
-  private interface ConfigLoader {
-    AbstractTargetProperty<?> of(TargetConfig config);
-  }
-
-  TargetProperty(Class<? extends AbstractTargetProperty<?>> cls, ConfigLoader property) {
-    this.propertyClass = cls;
-    this.property = property;
-  }
-
-  /**
-   * Return key ot the property as it will be used in LF code.
-   *
-   * <p>Keys are of the form <code>foo-bar</code>.
-   *
-   * @return the property's key
-   */
-  public String getKey() {
-    return name().toLowerCase().replace('_', '-');
-  }
-
-  public static AbstractTargetProperty<?> getPropertyInstance(TargetProperty p) {
-    try {
-      return p.propertyClass.getDeclaredConstructor().newInstance();
-    } catch (ReflectiveOperationException e) {
-      throw new RuntimeException(e);
-    }
-  }
+public class TargetProperty {
 
   public static void load(TargetConfig config, Properties properties, MessageReporter err) {
     for (Object key : properties.keySet()) {
-      TargetProperty p = forName(key.toString());
-      if (p != null) {
+      var p = config.forName(key.toString());
+      if (p.isPresent()) {
         try {
-          p.property.of(config).set(properties.get(key).toString(), err);
+          p.get().set(properties.get(key).toString(), err);
         } catch (InvalidLfSourceException e) {
           err.at(e.getNode()).error(e.getProblem());
         }
@@ -318,10 +78,10 @@ public static void load(TargetConfig config, List<KeyValuePair> properties, Mess
     }
     properties.forEach(
         property -> {
-          TargetProperty p = forName(property.getName());
-          if (p != null) {
+          var p = config.forName(property.getName());
+          if (p.isPresent()) {
             try {
-              p.property.of(config).set(property.getValue(), err);
+              p.get().set(property.getValue(), err);
             } catch (InvalidLfSourceException e) {
               err.at(e.getNode()).error(e.getProblem());
             }
@@ -338,10 +98,10 @@ public static void load(TargetConfig config, List<KeyValuePair> properties, Mess
    */
   public static List<KeyValuePair> extractProperties(TargetConfig config) {
     var res = new LinkedList<KeyValuePair>();
-    for (TargetProperty p : TargetProperty.loaded(config)) {
+    for (AbstractTargetProperty p : TargetProperty.loaded(config)) {
       KeyValuePair kv = LfFactory.eINSTANCE.createKeyValuePair();
-      kv.setName(p.toString());
-      kv.setValue(p.property.of(config).toAstElement());
+      kv.setName(p.name());
+      kv.setValue(p.toAstElement());
       if (kv.getValue() != null) {
         res.add(kv);
       }
@@ -354,9 +114,9 @@ public static List<KeyValuePair> extractProperties(TargetConfig config) {
    *
    * @param config The configuration to find the properties in.
    */
-  public static List<TargetProperty> loaded(TargetConfig config) {
-    return Arrays.stream(TargetProperty.values())
-        .filter(it -> it.property.of(config).isSet())
+  public static List<AbstractTargetProperty> loaded(TargetConfig config) {
+    return config.getAllTargetProperties().stream()
+        .filter(p -> p.isSet())
         .collect(Collectors.toList());
   }
 
@@ -385,25 +145,16 @@ public static TargetDecl extractTargetDecl(Target target, TargetConfig config) {
    * @param property The target property of interest.
    * @return The found key-value pair, or {@code null} if no matching pair could be found.
    */
-  public static KeyValuePair getKeyValuePair(Model ast, TargetProperty property) {
+  public static KeyValuePair getKeyValuePair(Model ast, AbstractTargetProperty property) {
     var targetProperties = ast.getTarget().getConfig();
     List<KeyValuePair> properties =
         targetProperties.getPairs().stream()
-            .filter(pair -> pair.getName().equals(property.toString()))
+            .filter(pair -> pair.getName().equals(property.name()))
             .toList();
     assert properties.size() <= 1;
     return properties.size() > 0 ? properties.get(0) : null;
   }
 
-  /** Return a list containing the keys of all properties */
-  public static List<String> getPropertyKeys() {
-    return Arrays.stream(TargetProperty.values())
-        .map(TargetProperty::toString)
-        .filter(it -> !it.startsWith("_"))
-        .sorted()
-        .toList();
-  }
-
   /**
    * Validate the given key-value pairs and report issues via the given reporter.
    *
@@ -433,7 +184,7 @@ public static void validate(
                         "Unrecognized target property: "
                             + pair.getName()
                             + ". Recognized properties are: "
-                            + getPropertyKeys());
+                            + TargetConfig.getUserTargetProperties());
               }
             });
   }
@@ -450,8 +201,8 @@ public static void update(
       TargetConfig config, List<KeyValuePair> properties, Path relativePath, MessageReporter err) {
     properties.forEach(
         property -> {
-          TargetProperty p = forName(property.getName());
-          if (p != null) {
+          var p = config.forName(property.getName());
+          if (p.isPresent()) {
             var value = property.getValue();
             if (property.getName().equals("files")) {
               var array = LfFactory.eINSTANCE.createArray();
@@ -468,39 +219,8 @@ public static void update(
               value = LfFactory.eINSTANCE.createElement();
               value.setArray(array);
             }
-            p.property.of(config).set(value, err);
+            p.get().set(value, err);
           }
         });
   }
-
-  /**
-   * Return the entry that matches the given string.
-   *
-   * @param name The string to match against.
-   */
-  public static TargetProperty forName(String name) {
-    return Target.match(name, TargetProperty.values());
-  }
-
-  /**
-   * Return a list with all target properties.
-   *
-   * @return All existing target properties.
-   */
-  public static List<TargetProperty> getOptions() {
-    return Arrays.asList(TargetProperty.values());
-  }
-
-  /**
-   * Return the name of the property in as it appears in the target declaration. It may be an
-   * invalid identifier in other languages (may contains dashes {@code -}).
-   */
-  @Override
-  public String toString() {
-    // Workaround because this sole property does not follow the naming convention.
-    if (this.equals(FED_SETUP)) {
-      return "_fed_setup";
-    }
-    return this.name().toLowerCase().replaceAll("_", "-");
-  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/AuthProperty.java b/core/src/main/java/org/lflang/target/property/AuthProperty.java
index 6540d0780f..a3e9ee6b1f 100644
--- a/core/src/main/java/org/lflang/target/property/AuthProperty.java
+++ b/core/src/main/java/org/lflang/target/property/AuthProperty.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import org.lflang.Target;
 
+/** Directive to allow including OpenSSL libraries and process HMAC authentication. */
 public class AuthProperty extends AbstractBooleanProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
index cb46e4864c..78c320d09f 100644
--- a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
@@ -10,6 +10,7 @@
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.UnionType;
 
+/** Directive to let the generator use the custom build command. */
 public class BuildCommandsProperty extends AbstractTargetProperty<List<String>> {
 
   public BuildCommandsProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
index f69f40e94a..97ffcd560c 100644
--- a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
@@ -10,6 +10,10 @@
 import org.lflang.target.property.BuildTypeProperty.BuildType;
 import org.lflang.target.property.type.UnionType;
 
+/**
+ * Directive to specify the target build type such as 'Release' or 'Debug'. This is also used in the
+ * Rust target to select a Cargo profile.
+ */
 public class BuildTypeProperty extends AbstractTargetProperty<BuildType> {
 
   public BuildTypeProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
index b349541183..bfc948cbd8 100644
--- a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
@@ -14,6 +14,31 @@
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
 
+/**
+ * Dependency specifications for Cargo. This property looks like this:
+ *
+ * <pre>{@code
+ * cargo-dependencies: {
+ *    // Name-of-the-crate: "version"
+ *    rand: "0.8",
+ *    // Equivalent to using an explicit map:
+ *    rand: {
+ *      version: "0.8"
+ *    },
+ *    // The map allows specifying more details
+ *    rand: {
+ *      // A path to a local unpublished crate.
+ *      // Note 'path' is mutually exclusive with 'version'.
+ *      path: "/home/me/Git/local-rand-clone"
+ *    },
+ *    rand: {
+ *      version: "0.8",
+ *      // you can specify cargo features
+ *      features: ["some-cargo-feature",]
+ *    }
+ * }
+ * }</pre>
+ */
 public class CargoDependenciesProperty
     extends AbstractTargetProperty<Map<String, CargoDependencySpec>> {
 
diff --git a/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java b/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
index ac1d299d08..afe9d7efc9 100644
--- a/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import org.lflang.Target;
 
+/** Directive for specifying Cargo features of the generated program to enable. */
 public class CargoFeaturesProperty extends AbstractStringListProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
index ce7bd3f6d8..224cbe1a2f 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
@@ -14,6 +14,7 @@
 import org.lflang.target.property.ClockSyncModeProperty.ClockSyncMode;
 import org.lflang.target.property.type.UnionType;
 
+/** Directive to let the federate execution handle clock synchronization in software. */
 public class ClockSyncModeProperty extends AbstractTargetProperty<ClockSyncMode> {
 
   public ClockSyncModeProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
index 6227efe33f..b0909c2689 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
@@ -18,6 +18,7 @@
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.TargetPropertyType;
 
+/** Key-value pairs giving options for clock synchronization. */
 public class ClockSyncOptionsProperty extends AbstractTargetProperty<ClockSyncOptions> {
 
   public ClockSyncOptionsProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
index 90b1c5c297..7413bf8728 100644
--- a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
@@ -10,6 +10,12 @@
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.UnionType;
 
+/**
+ * Directive to specify a cmake to be included by the generated build systems.
+ *
+ * <p>This gives full control over the C/C++ build as any cmake parameters can be adjusted in the
+ * included file.
+ */
 public class CmakeIncludeProperty extends AbstractTargetProperty<List<String>> {
 
   public CmakeIncludeProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
index 6c3a826f30..ff4aa30e11 100644
--- a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
@@ -11,6 +11,7 @@
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.StringDictionaryType;
 
+/** Directive to specify compile-time definitions. */
 public class CompileDefinitionsProperty extends AbstractTargetProperty<Map<String, String>> {
 
   public CompileDefinitionsProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
index acd12748ba..ebae420a1b 100644
--- a/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import org.lflang.Target;
 
+/** Flags to be passed on to the target compiler. */
 public class CompilerFlagsProperty extends AbstractStringListProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/CompilerProperty.java b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
index 0be8df2f76..d9ce97ce50 100644
--- a/core/src/main/java/org/lflang/target/property/CompilerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
+/** Directive to specify the target compiler. */
 public class CompilerProperty extends AbstractStringConfig {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
index 60575e3c01..c2d4e94b90 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
@@ -18,6 +18,7 @@
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.TargetPropertyType;
 
+/** Key-value pairs giving options for clock synchronization. */
 public class CoordinationOptionsProperty extends AbstractTargetProperty<CoordinationOptions> {
 
   public CoordinationOptionsProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
index 65b9f7fbb8..4837a68317 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
@@ -10,6 +10,7 @@
 import org.lflang.target.property.CoordinationProperty.CoordinationMode;
 import org.lflang.target.property.type.UnionType;
 
+/** Directive to specify the coordination mode */
 public class CoordinationProperty extends AbstractTargetProperty<CoordinationMode> {
 
   public CoordinationProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/DockerProperty.java b/core/src/main/java/org/lflang/target/property/DockerProperty.java
index 89ab7bef06..ea09ae836e 100644
--- a/core/src/main/java/org/lflang/target/property/DockerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DockerProperty.java
@@ -18,6 +18,10 @@
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.target.property.type.UnionType;
 
+/**
+ * Directive to generate a Dockerfile. This is either a boolean, true or false, or a dictionary of
+ * options.
+ */
 public class DockerProperty extends AbstractTargetProperty<DockerOptions> {
 
   public DockerProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java b/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
index 761eded16c..ae79262988 100644
--- a/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
@@ -3,6 +3,11 @@
 import java.util.List;
 import org.lflang.Target;
 
+/**
+ * Directive to let the runtime export its internal dependency graph.
+ *
+ * <p>This is a debugging feature and currently only used for C++ and Rust programs.
+ */
 public class ExportDependencyGraphProperty extends AbstractBooleanProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java b/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
index a4aebb4d16..ed83f76787 100644
--- a/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
@@ -3,6 +3,11 @@
 import java.util.List;
 import org.lflang.Target;
 
+/**
+ * Directive to let the runtime export the program structure to a yaml file.
+ *
+ * <p>This is a debugging feature and currently only used for C++ programs.
+ */
 public class ExportToYamlProperty extends AbstractBooleanProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
index 6c704974ac..68540cc948 100644
--- a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
+/** Directive for specifying a path to an external runtime to be used for the compiled binary. */
 public class ExternalRuntimePathProperty extends AbstractStringConfig {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/FastProperty.java b/core/src/main/java/org/lflang/target/property/FastProperty.java
index 9d019386b5..b24b032ce7 100644
--- a/core/src/main/java/org/lflang/target/property/FastProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FastProperty.java
@@ -11,6 +11,7 @@
 import org.lflang.lf.Model;
 import org.lflang.lf.Reactor;
 
+/** Directive to let the execution engine allow logical time to elapse faster than physical time. */
 public class FastProperty extends AbstractBooleanProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/FedSetupProperty.java b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
index 83ede21100..1fde72bdc1 100644
--- a/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
@@ -9,6 +9,10 @@
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.util.StringUtil;
 
+/**
+ * Directs the C or Python target to include the associated C file used for setting up federated
+ * execution before processing the first tag.
+ */
 public class FedSetupProperty extends AbstractTargetProperty<String> {
 
   public FedSetupProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/FilesProperty.java b/core/src/main/java/org/lflang/target/property/FilesProperty.java
index d0819fbac5..77159fcddb 100644
--- a/core/src/main/java/org/lflang/target/property/FilesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FilesProperty.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
+/** Directive to stage particular files on the class path to be processed by the code generator. */
 public class FilesProperty extends AbstractFileListProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
index d40c5ccccd..787c8967e2 100644
--- a/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
+++ b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
@@ -3,6 +3,10 @@
 import java.util.List;
 import org.lflang.Target;
 
+/**
+ * Directive to let the execution engine remain active also if there are no more events in the event
+ * queue.
+ */
 public class KeepaliveProperty extends AbstractBooleanProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/LoggingProperty.java b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
index 554bfbebeb..f90179d67d 100644
--- a/core/src/main/java/org/lflang/target/property/LoggingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
@@ -9,6 +9,7 @@
 import org.lflang.target.property.LoggingProperty.LogLevel;
 import org.lflang.target.property.type.UnionType;
 
+/** Directive to specify the grain at which to report log messages during execution. */
 public class LoggingProperty extends AbstractTargetProperty<LogLevel> {
 
   public LoggingProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
index 12728f02e9..66d6e877a9 100644
--- a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
+++ b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import org.lflang.Target;
 
+/** Directive to not invoke the target compiler. */
 public class NoCompileProperty extends AbstractBooleanProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java b/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
index e7fe466d29..a3beacb951 100644
--- a/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
+++ b/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
+/** Directive to disable validation of reactor rules at runtime. */
 public class NoRuntimeValidationProperty extends AbstractBooleanProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index 310cedcd63..75aa611a4f 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -21,6 +21,10 @@
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.target.property.type.UnionType;
 
+/**
+ * Directive to specify the platform for cross code generation. This is either a string of the
+ * platform or a dictionary of options that includes the string name.
+ */
 public class PlatformProperty extends AbstractTargetProperty<PlatformOptions> {
 
   public static final String UNKNOW_PLATFORM =
@@ -100,7 +104,7 @@ public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
       }
     }
 
-    var threading = TargetProperty.getKeyValuePair(ast, TargetProperty.THREADING);
+    var threading = TargetProperty.getKeyValuePair(ast, new ThreadingProperty());
     if (threading != null && platform == Platform.RP2040) {
       reporter
           .at(pair, Literals.KEY_VALUE_PAIR__VALUE)
diff --git a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
index 928ca07dbc..8f6fa48445 100644
--- a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
+/** Directive to instruct the runtime to collect and print execution statistics. */
 public class PrintStatisticsProperty extends AbstractBooleanProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java b/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
index 7fe1dcc94b..79bd510f21 100644
--- a/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
@@ -3,6 +3,10 @@
 import java.util.List;
 import org.lflang.Target;
 
+/**
+ * Directive for specifying .proto files that need to be compiled and their code included in the
+ * sources.
+ */
 public class ProtobufsProperty extends AbstractFileListProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
index 63db20f871..ce766942dc 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
@@ -13,6 +13,7 @@
 import org.lflang.target.TargetProperty;
 import org.lflang.target.property.type.ArrayType;
 
+/** Directive to specify additional ROS2 packages that this LF program depends on. */
 public class Ros2DependenciesProperty extends AbstractTargetProperty<List<String>> {
 
   public Ros2DependenciesProperty() {
@@ -41,7 +42,7 @@ public List<Target> supportedTargets() {
 
   @Override
   public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
-    var ros2enabled = TargetProperty.getKeyValuePair(ast, TargetProperty.ROS2);
+    var ros2enabled = TargetProperty.getKeyValuePair(ast, new Ros2Property());
     if (pair != null && (ros2enabled == null || !ASTUtils.toBoolean(ros2enabled.getValue()))) {
       reporter
           .at(pair, Literals.KEY_VALUE_PAIR__NAME)
diff --git a/core/src/main/java/org/lflang/target/property/Ros2Property.java b/core/src/main/java/org/lflang/target/property/Ros2Property.java
index 51027779ea..4b797e8fa7 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2Property.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2Property.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
+/** Directive to specify that ROS2 specific code is generated. */
 public class Ros2Property extends AbstractBooleanProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
index 36758e8339..68c41f8c81 100644
--- a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
+/** Directive for specifying a specific version of the reactor runtime library. */
 public class RuntimeVersionProperty extends AbstractStringConfig {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
index b375c68e82..110b94d977 100644
--- a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
@@ -16,6 +16,12 @@
 import org.lflang.util.FileUtil;
 import org.lflang.util.StringUtil;
 
+/**
+ * List of module files to link into the crate as top-level. For instance, a {@code target Rust {
+ * rust-modules: [ "foo.rs" ] }} will cause the file to be copied into the generated project, and
+ * the generated {@code main.rs} will include it with a {@code mod foo;}. If one of the paths is a
+ * directory, it must contain a {@code mod.rs} file, and all its contents are copied.
+ */
 public class RustIncludeProperty extends AbstractTargetProperty<List<Path>> {
 
   public RustIncludeProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
index e4613fa0a1..ff280fc18e 100644
--- a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
@@ -15,6 +15,7 @@
 import org.lflang.target.property.SchedulerProperty.SchedulerOption;
 import org.lflang.target.property.type.UnionType;
 
+/** Directive for specifying a specific runtime scheduler, if supported. */
 public class SchedulerProperty extends AbstractTargetProperty<SchedulerOption> {
 
   public SchedulerProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java b/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
index 51d2f058b0..7434907305 100644
--- a/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
+/** Directive to specify that all code is generated in a single file. */
 public class SingleFileProjectProperty extends AbstractBooleanProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/ThreadingProperty.java b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
index bf5a39f36e..4bbcf3aba6 100644
--- a/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
+/** Directive to indicate whether the runtime should use multi-threading. */
 public class ThreadingProperty extends AbstractBooleanProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
index faa6051320..a43ef6c059 100644
--- a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
@@ -9,6 +9,7 @@
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
 
+/** Directive to specify the execution timeout. */
 public class TimeOutProperty extends AbstractTargetProperty<TimeValue> {
 
   public TimeOutProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index 2eb2c1c7cd..9f0835a9c6 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -20,6 +20,7 @@
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.target.property.type.UnionType;
 
+/** Directive to enable tracing. */
 public class TracingProperty extends AbstractTargetProperty<TracingOptions> {
 
   public TracingProperty() {
@@ -63,7 +64,7 @@ public List<Target> supportedTargets() {
   public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
     if (pair != null && this.fromAst(pair.getValue(), reporter) != null) {
       // If tracing is anything but "false" and threading is off, error.
-      var threading = TargetProperty.getKeyValuePair(ast, TargetProperty.THREADING);
+      var threading = TargetProperty.getKeyValuePair(ast, new ThreadingProperty());
       if (threading != null) {
         if (!ASTUtils.toBoolean(threading.getValue())) {
           reporter
diff --git a/core/src/main/java/org/lflang/target/property/VerifyProperty.java b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
index 5294c5cc80..793ee4c280 100644
--- a/core/src/main/java/org/lflang/target/property/VerifyProperty.java
+++ b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
@@ -4,6 +4,7 @@
 import org.lflang.Target;
 import org.lflang.target.property.AbstractBooleanProperty;
 
+/** Directive to check the generated verification model. */
 public class VerifyProperty extends AbstractBooleanProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/WorkersProperty.java b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
index 00812da4c1..f0b8b9fcda 100644
--- a/core/src/main/java/org/lflang/target/property/WorkersProperty.java
+++ b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
@@ -8,6 +8,7 @@
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
 
+/** Directive to specify the number of worker threads used by the runtime. */
 public class WorkersProperty extends AbstractTargetProperty<Integer> {
 
   public WorkersProperty() {
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 073e7e1705..2fd89a499e 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -44,12 +44,14 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.lflang.AbstractTargetProperty;
 import org.lflang.Target;
 import org.lflang.TimeValue;
 import org.lflang.lf.LfPackage;
 import org.lflang.lf.Model;
 import org.lflang.lf.Visibility;
-import org.lflang.target.TargetProperty;
+import org.lflang.target.TargetConfig;
+import org.lflang.target.property.CargoDependenciesProperty;
 import org.lflang.target.property.PlatformProperty;
 import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.target.property.type.ArrayType;
@@ -1477,9 +1479,8 @@ private List<String> synthesizeExamples(TargetPropertyType type, boolean correct
    * Create an LF program with the given key and value as a target property, parse it, and return
    * the resulting model.
    */
-  private Model createModel(TargetProperty key, String value) throws Exception {
-    var target =
-        TargetProperty.getPropertyInstance(key).supportedTargets().stream().findFirst().get();
+  private Model createModel(AbstractTargetProperty property, String value) throws Exception {
+    var target = property.supportedTargets().stream().findFirst().get();
     return parseWithoutError(
         """
                 target %s {%s: %s};
@@ -1488,7 +1489,7 @@ private Model createModel(TargetProperty key, String value) throws Exception {
                     y = new Y()
                 }
             """
-            .formatted(target, key, value));
+            .formatted(target, property.name(), value));
   }
 
   /** Perform checks on target properties. */
@@ -1496,12 +1497,12 @@ private Model createModel(TargetProperty key, String value) throws Exception {
   public Collection<DynamicTest> checkTargetProperties() throws Exception {
     List<DynamicTest> result = new ArrayList<>();
 
-    for (TargetProperty property : TargetProperty.getOptions()) {
-      if (property == TargetProperty.CARGO_DEPENDENCIES) {
+    for (AbstractTargetProperty property : TargetConfig.getUserTargetProperties()) {
+      if (property instanceof CargoDependenciesProperty) {
         // we test that separately as it has better error messages
         continue;
       }
-      var type = TargetProperty.getPropertyInstance(property).type;
+      var type = property.type;
       List<String> knownCorrect = synthesizeExamples(type, true);
 
       for (String it : knownCorrect) {
@@ -1579,7 +1580,7 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
 
   @Test
   public void checkCargoDependencyProperty() throws Exception {
-    TargetProperty prop = TargetProperty.CARGO_DEPENDENCIES;
+    CargoDependenciesProperty prop = new CargoDependenciesProperty();
     List<String> knownCorrect =
         List.of(
             "{}",
@@ -1614,16 +1615,16 @@ public void checkCargoDependencyProperty() throws Exception {
 
   @Test
   public void checkPlatformProperty() throws Exception {
-    validator.assertNoErrors(createModel(TargetProperty.PLATFORM, Platform.ARDUINO.toString()));
+    validator.assertNoErrors(createModel(new PlatformProperty(), Platform.ARDUINO.toString()));
     validator.assertNoErrors(
-        createModel(TargetProperty.PLATFORM, String.format("{name: %s}", Platform.ZEPHYR)));
+        createModel(new PlatformProperty(), String.format("{name: %s}", Platform.ZEPHYR)));
     validator.assertError(
-        createModel(TargetProperty.PLATFORM, "foobar"),
+        createModel(new PlatformProperty(), "foobar"),
         LfPackage.eINSTANCE.getKeyValuePair(),
         null,
         PlatformProperty.UNKNOW_PLATFORM);
     validator.assertError(
-        createModel(TargetProperty.PLATFORM, "{ name: foobar }"),
+        createModel(new PlatformProperty(), "{ name: foobar }"),
         LfPackage.eINSTANCE.getKeyValuePair(),
         null,
         PlatformProperty.UNKNOW_PLATFORM);

From c3a1e709b1741b789cf9641f003fc3c93fc27ff8 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Tue, 3 Oct 2023 12:29:54 +0200
Subject: [PATCH 0978/1114] Generate default values for the user-configurable
 CMake flags

---
 .../lflang/generator/c/CCmakeGenerator.java   | 17 +++++++++
 .../org/lflang/generator/c/CCompiler.java     | 10 -----
 .../lflang/generator/c/CDockerGenerator.java  |  5 +--
 .../org/lflang/generator/c/CGenerator.java    | 38 -------------------
 4 files changed, 18 insertions(+), 52 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 717f0714f5..9650b0f201 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -254,6 +254,23 @@ CodeBuilder generateCMakeCode(
           "set(CMAKE_SYSTEM_NAME " + targetConfig.platformOptions.platform.getcMakeName() + ")");
     }
     cMakeCode.newLine();
+    cMakeCode.pr("# Set default values for build parameters\n");
+    targetConfig.compileDefinitions.forEach((key, value) -> {
+      if (key.equals("LF_THREADED") || key.equals("LF_UNTHREADED")) {
+        cMakeCode.pr("if (NOT DEFINED LF_THREADED AND NOT DEFINED LF_UNTHREADED)\n");
+        cMakeCode.indent();
+        cMakeCode.pr("set("+key + " " + value + ")\n");
+        cMakeCode.unindent();
+        cMakeCode.pr("endif()\n");
+      } else {
+        cMakeCode.pr("if (NOT DEFINED "+key+")\n");
+        cMakeCode.indent();
+        cMakeCode.pr("set("+key + " " + value + ")\n");
+        cMakeCode.unindent();
+        cMakeCode.pr("endif()\n");
+      }
+    }
+    );
 
     // Setup main target for different platforms
     switch (targetConfig.platformOptions.platform) {
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index 0933d95594..01531a4739 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -216,14 +216,8 @@ public LFCommand compileCmakeCommand() {
     return command;
   }
 
-  static Stream<String> cmakeCompileDefinitions(TargetConfig targetConfig) {
-    return targetConfig.compileDefinitions.entrySet().stream()
-        .map(entry -> "-D" + entry.getKey() + "=" + entry.getValue());
-  }
-
   private static List<String> cmakeOptions(TargetConfig targetConfig, FileConfig fileConfig) {
     List<String> arguments = new ArrayList<>();
-    cmakeCompileDefinitions(targetConfig).forEachOrdered(arguments::add);
     String separator = File.separator;
     String maybeQuote = ""; // Windows seems to require extra level of quoting.
     String srcPath = fileConfig.srcPath.toString(); // Windows requires escaping the backslashes.
@@ -403,10 +397,6 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
       compileArgs.add(FileUtil.toUnixString(relativePath));
     }
 
-    // Add compile definitions
-    targetConfig.compileDefinitions.forEach(
-        (key, value) -> compileArgs.add("-D" + key + "=" + value));
-
     // Finally, add the compiler flags in target parameters (if any)
     compileArgs.addAll(targetConfig.compilerFlags);
 
diff --git a/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java b/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
index f52e23a949..c09e019841 100644
--- a/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
@@ -68,10 +68,7 @@ protected String generateDefaultCompileCommand() {
         "\n",
         "RUN set -ex && \\",
         "mkdir bin && \\",
-        "cmake "
-            + CCompiler.cmakeCompileDefinitions(context.getTargetConfig())
-                .collect(Collectors.joining(" "))
-            + " -S src-gen -B bin && \\",
+        "cmake -S src-gen -B bin && \\",
         "cd bin && \\",
         "make all");
   }
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index f6faa499a2..ce56fa328d 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -496,44 +496,6 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
       return;
     }
 
-    // Dump the additional compile definitions to a file to keep the generated project
-    // self-contained. In this way, third-party build tools like PlatformIO, west, arduino-cli can
-    // take over and do the rest of compilation.
-    try {
-      String compileDefs =
-          targetConfig.compileDefinitions.keySet().stream()
-                  .map(key -> key + "=" + targetConfig.compileDefinitions.get(key))
-                  .collect(Collectors.joining("\n"))
-              + "\n";
-      FileUtil.writeToFile(
-          compileDefs,
-          Path.of(fileConfig.getSrcGenPath() + File.separator + "CompileDefinitions.txt"));
-    } catch (IOException e) {
-      Exceptions.sneakyThrow(e);
-    }
-
-    // Create a .vscode/settings.json file in the target directory so that VSCode can
-    // immediately compile the generated code.
-    try {
-      String compileDefs =
-          targetConfig.compileDefinitions.keySet().stream()
-              .map(key -> "\"-D" + key + "=" + targetConfig.compileDefinitions.get(key) + "\"")
-              .collect(Collectors.joining(",\n"));
-      String settings = "{\n" + "\"cmake.configureArgs\": [\n" + compileDefs + "\n]\n}\n";
-      Path vscodePath = fileConfig.getSrcGenPath().resolve(".vscode");
-      if (!Files.exists(vscodePath)) Files.createDirectory(vscodePath);
-      FileUtil.writeToFile(
-          settings,
-          Path.of(
-              fileConfig.getSrcGenPath()
-                  + File.separator
-                  + ".vscode"
-                  + File.separator
-                  + "settings.json"));
-    } catch (IOException e) {
-      Exceptions.sneakyThrow(e);
-    }
-
     // If this code generator is directly compiling the code, compile it now so that we
     // clean it up after, removing the #line directives after errors have been reported.
     if (!targetConfig.noCompile

From 0776d506ec674e63f953a96c272fa0e01b613e4f Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Tue, 3 Oct 2023 13:55:19 +0200
Subject: [PATCH 0979/1114] Apply spotless

---
 .../lflang/generator/c/CCmakeGenerator.java   | 32 +++++++++----------
 .../org/lflang/generator/c/CCompiler.java     |  1 -
 .../lflang/generator/c/CDockerGenerator.java  |  1 -
 .../org/lflang/generator/c/CGenerator.java    |  1 -
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 9650b0f201..9ead9441a0 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -255,22 +255,22 @@ CodeBuilder generateCMakeCode(
     }
     cMakeCode.newLine();
     cMakeCode.pr("# Set default values for build parameters\n");
-    targetConfig.compileDefinitions.forEach((key, value) -> {
-      if (key.equals("LF_THREADED") || key.equals("LF_UNTHREADED")) {
-        cMakeCode.pr("if (NOT DEFINED LF_THREADED AND NOT DEFINED LF_UNTHREADED)\n");
-        cMakeCode.indent();
-        cMakeCode.pr("set("+key + " " + value + ")\n");
-        cMakeCode.unindent();
-        cMakeCode.pr("endif()\n");
-      } else {
-        cMakeCode.pr("if (NOT DEFINED "+key+")\n");
-        cMakeCode.indent();
-        cMakeCode.pr("set("+key + " " + value + ")\n");
-        cMakeCode.unindent();
-        cMakeCode.pr("endif()\n");
-      }
-    }
-    );
+    targetConfig.compileDefinitions.forEach(
+        (key, value) -> {
+          if (key.equals("LF_THREADED") || key.equals("LF_UNTHREADED")) {
+            cMakeCode.pr("if (NOT DEFINED LF_THREADED AND NOT DEFINED LF_UNTHREADED)\n");
+            cMakeCode.indent();
+            cMakeCode.pr("set(" + key + " " + value + ")\n");
+            cMakeCode.unindent();
+            cMakeCode.pr("endif()\n");
+          } else {
+            cMakeCode.pr("if (NOT DEFINED " + key + ")\n");
+            cMakeCode.indent();
+            cMakeCode.pr("set(" + key + " " + value + ")\n");
+            cMakeCode.unindent();
+            cMakeCode.pr("endif()\n");
+          }
+        });
 
     // Setup main target for different platforms
     switch (targetConfig.platformOptions.platform) {
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index 01531a4739..2bd5601fd5 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -32,7 +32,6 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Stream;
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
 import org.lflang.TargetConfig;
diff --git a/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java b/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
index c09e019841..43bf08bfac 100644
--- a/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
@@ -1,6 +1,5 @@
 package org.lflang.generator.c;
 
-import java.util.stream.Collectors;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.lflang.Target;
 import org.lflang.generator.DockerGenerator;
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index ce56fa328d..5520ce0887 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -38,7 +38,6 @@
 import com.google.common.collect.Iterables;
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;

From 858d57a3d8718f15cc82760c7f413e153d6307fc Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Tue, 3 Oct 2023 17:38:06 +0200
Subject: [PATCH 0980/1114] Fix CMake flags when there is no value

---
 .../org/lflang/generator/c/CCmakeGenerator.java     | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 9ead9441a0..b5555255e6 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -259,17 +259,14 @@ CodeBuilder generateCMakeCode(
         (key, value) -> {
           if (key.equals("LF_THREADED") || key.equals("LF_UNTHREADED")) {
             cMakeCode.pr("if (NOT DEFINED LF_THREADED AND NOT DEFINED LF_UNTHREADED)\n");
-            cMakeCode.indent();
-            cMakeCode.pr("set(" + key + " " + value + ")\n");
-            cMakeCode.unindent();
-            cMakeCode.pr("endif()\n");
           } else {
             cMakeCode.pr("if (NOT DEFINED " + key + ")\n");
-            cMakeCode.indent();
-            cMakeCode.pr("set(" + key + " " + value + ")\n");
-            cMakeCode.unindent();
-            cMakeCode.pr("endif()\n");
           }
+          cMakeCode.indent();
+          cMakeCode.pr("set(" + key + " " + (value.isEmpty() ? "TRUE" : value) + ")\n");
+          cMakeCode.unindent();
+          cMakeCode.pr("endif()\n");
+
         });
 
     // Setup main target for different platforms

From f7e7825536815f83a474d8ce2c140242a88b6501 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Tue, 3 Oct 2023 19:17:51 +0200
Subject: [PATCH 0981/1114] Make cmake flag handling more robust

---
 .../main/java/org/lflang/generator/c/CCmakeGenerator.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index b5555255e6..2808a13336 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -263,10 +263,13 @@ CodeBuilder generateCMakeCode(
             cMakeCode.pr("if (NOT DEFINED " + key + ")\n");
           }
           cMakeCode.indent();
-          cMakeCode.pr("set(" + key + " " + (value.isEmpty() ? "TRUE" : value) + ")\n");
+          var v = "TRUE";
+          if (value != null && !value.isEmpty()) {
+            v = value;
+          }
+          cMakeCode.pr("set(" + key + " " + v + ")\n");
           cMakeCode.unindent();
           cMakeCode.pr("endif()\n");
-
         });
 
     // Setup main target for different platforms

From 45b31b833ed4cf0b0f7c1f42a243078dca10fd83 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 3 Oct 2023 23:57:47 -0700
Subject: [PATCH 0982/1114] Bugfixes and improvements in the handling of types

---
 cli/lfc/src/main/java/org/lflang/cli/Lfc.java | 10 ++-
 .../lflang/tests/runtime/CSchedulerTest.java  | 12 ++-
 .../org/lflang/AbstractTargetProperty.java    |  6 +-
 .../federated/extensions/CExtension.java      |  2 +-
 .../federated/extensions/CExtensionUtils.java |  2 +-
 .../extensions/FedTargetExtension.java        |  2 +-
 .../federated/extensions/PythonExtension.java |  2 +-
 .../federated/extensions/TSExtension.java     |  2 +-
 .../federated/generator/FedASTUtils.java      |  2 +-
 .../federated/generator/FedGenerator.java     |  2 +-
 .../launcher/FedLauncherGenerator.java        |  2 +-
 .../lflang/generator/c/CCmakeGenerator.java   |  2 +-
 .../org/lflang/generator/c/CCompiler.java     |  6 +-
 .../org/lflang/generator/c/CGenerator.java    | 10 +--
 .../generator/c/CMainFunctionGenerator.java   |  2 +-
 .../generator/c/CPreambleGenerator.java       |  5 +-
 .../generator/c/CTriggerObjectsGenerator.java |  2 +-
 .../python/PythonPreambleGenerator.java       |  3 +-
 .../generator/rust/CargoDependencySpec.java   |  2 +-
 .../generator/rust/RustTargetConfig.java      |  5 +-
 .../java/org/lflang/target/TargetConfig.java  |  5 +-
 .../property/AbstractBooleanProperty.java     |  3 +-
 .../property/AbstractFileListProperty.java    |  3 +-
 .../target/property/AbstractStringConfig.java |  2 +-
 .../property/AbstractStringListProperty.java  |  3 +-
 .../property/BuildCommandsProperty.java       |  2 +-
 .../target/property/BuildTypeProperty.java    | 40 ++-------
 .../property/CargoDependenciesProperty.java   |  7 +-
 .../property/ClockSyncModeProperty.java       | 34 ++-----
 .../property/ClockSyncOptionsProperty.java    |  3 +-
 .../target/property/CmakeIncludeProperty.java |  2 +-
 .../property/CompileDefinitionsProperty.java  |  3 +-
 .../property/CoordinationOptionsProperty.java |  3 +-
 .../target/property/CoordinationProperty.java | 27 ++----
 .../target/property/DockerProperty.java       |  2 +-
 .../target/property/FedSetupProperty.java     |  2 +-
 .../target/property/LoggingProperty.java      | 29 ++----
 .../target/property/PlatformProperty.java     | 88 +++----------------
 .../property/Ros2DependenciesProperty.java    |  2 +-
 .../target/property/RustIncludeProperty.java  |  2 +-
 .../target/property/SchedulerProperty.java    | 72 +++------------
 .../target/property/TimeOutProperty.java      |  2 +-
 .../target/property/TracingProperty.java      |  2 +-
 .../target/property/WorkersProperty.java      |  2 +-
 .../target/property/type/DictionaryType.java  | 14 ++-
 .../target/property/type/UnionType.java       | 79 ++++-------------
 .../org/lflang/generator/cpp/CppExtensions.kt | 14 +--
 .../generator/cpp/CppStandaloneGenerator.kt   |  3 +-
 .../generator/rust/RustCargoTomlEmitter.kt    | 10 +--
 .../lflang/generator/rust/RustGenerator.kt    |  6 +-
 .../org/lflang/generator/rust/RustModel.kt    |  2 +-
 .../compiler/LinguaFrancaValidationTest.java  | 29 +++---
 .../java/org/lflang/tests/Configurators.java  |  4 +-
 53 files changed, 175 insertions(+), 407 deletions(-)

diff --git a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
index 6409b7c0ba..48cc85b7d0 100644
--- a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
+++ b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
@@ -14,7 +14,9 @@
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.LFGeneratorContext.BuildParm;
 import org.lflang.generator.MainContext;
-import org.lflang.target.property.type.UnionType;
+import org.lflang.target.property.type.BuildTypeType;
+import org.lflang.target.property.type.LoggingType;
+import org.lflang.target.property.type.SchedulerType;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 
@@ -222,7 +224,7 @@ public Properties getGeneratorArgs() {
 
     if (buildType != null) {
       // Validate build type.
-      if (UnionType.BUILD_TYPE_UNION.forName(buildType) == null) {
+      if (new BuildTypeType().forName(buildType) == null) {
         reporter.printFatalErrorAndExit(buildType + ": Invalid build type.");
       }
       props.setProperty(BuildParm.BUILD_TYPE.getKey(), buildType);
@@ -242,7 +244,7 @@ public Properties getGeneratorArgs() {
 
     if (logging != null) {
       // Validate log level.
-      if (UnionType.LOGGING_UNION.forName(logging) == null) {
+      if (new LoggingType().forName(logging) == null) {
         reporter.printFatalErrorAndExit(logging + ": Invalid log level.");
       }
       props.setProperty(BuildParm.LOGGING.getKey(), logging);
@@ -282,7 +284,7 @@ public Properties getGeneratorArgs() {
 
     if (scheduler != null) {
       // Validate scheduler.
-      if (UnionType.SCHEDULER_UNION.forName(scheduler) == null) {
+      if (new SchedulerType().forName(scheduler) == null) {
         reporter.printFatalErrorAndExit(scheduler + ": Invalid scheduler.");
       }
       props.setProperty(BuildParm.SCHEDULER.getKey(), scheduler);
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
index 09a11faa6f..e8c13d73b0 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
@@ -3,7 +3,7 @@
 import java.util.EnumSet;
 import org.junit.jupiter.api.Test;
 import org.lflang.Target;
-import org.lflang.target.property.SchedulerProperty.SchedulerOption;
+import org.lflang.target.property.type.SchedulerType.Scheduler;
 import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry.TestCategory;
@@ -35,23 +35,21 @@ public void runWithNonDefaultSchedulers() {
 
     if (name != null) {
       var option =
-          EnumSet.allOf(SchedulerOption.class).stream()
-              .filter(it -> it.name().equals(name))
-              .findFirst();
+          EnumSet.allOf(Scheduler.class).stream().filter(it -> it.name().equals(name)).findFirst();
       if (option.isPresent()) {
         this.runTest(option.get(), categories);
       } else {
         throw new RuntimeException("Cannot find runtime scheduler called " + name);
       }
     } else {
-      for (SchedulerOption scheduler : EnumSet.allOf(SchedulerOption.class)) {
-        if (scheduler == SchedulerOption.getDefault()) continue;
+      for (Scheduler scheduler : EnumSet.allOf(Scheduler.class)) {
+        if (scheduler == Scheduler.getDefault()) continue;
         this.runTest(scheduler, categories);
       }
     }
   }
 
-  private void runTest(SchedulerOption scheduler, EnumSet<TestCategory> categories) {
+  private void runTest(Scheduler scheduler, EnumSet<TestCategory> categories) {
     this.runTestsForTargets(
         Message.DESC_SCHED_SWAPPING + scheduler.toString() + ".",
         categories::contains,
diff --git a/core/src/main/java/org/lflang/AbstractTargetProperty.java b/core/src/main/java/org/lflang/AbstractTargetProperty.java
index 53d0ccd4bd..cdef9ddce6 100644
--- a/core/src/main/java/org/lflang/AbstractTargetProperty.java
+++ b/core/src/main/java/org/lflang/AbstractTargetProperty.java
@@ -17,10 +17,10 @@
  *
  * @param <T> The data type of the value assigned to the target property.
  */
-public abstract class AbstractTargetProperty<T> {
+public abstract class AbstractTargetProperty<T, S extends TargetPropertyType> {
 
   /** The type of values that can be assigned to this property. */
-  public final TargetPropertyType type;
+  public final S type;
 
   /** Whether (after initialization) this property has been set. */
   protected boolean isSet;
@@ -35,7 +35,7 @@ public abstract class AbstractTargetProperty<T> {
    *
    * @param type The type of the value that can be assigned to the property.
    */
-  public AbstractTargetProperty(TargetPropertyType type) {
+  public AbstractTargetProperty(S type) {
     this.type = type;
   }
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index fcec922584..eafc0ae68b 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -56,7 +56,7 @@
 import org.lflang.lf.Port;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
-import org.lflang.target.property.CoordinationProperty.CoordinationMode;
+import org.lflang.target.property.type.CoordinationModeType.CoordinationMode;
 
 /**
  * An extension class to the CGenerator that enables certain federated functionalities.
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 4cc93c2258..2903977c1e 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -22,8 +22,8 @@
 import org.lflang.lf.Expression;
 import org.lflang.lf.Input;
 import org.lflang.lf.ParameterReference;
-import org.lflang.target.property.ClockSyncModeProperty.ClockSyncMode;
 import org.lflang.target.property.ClockSyncOptionsProperty.ClockSyncOptions;
+import org.lflang.target.property.type.ClockSyncModeType.ClockSyncMode;
 
 public class CExtensionUtils {
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
index a580ec693a..7afafa105c 100644
--- a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
@@ -13,7 +13,7 @@
 import org.lflang.lf.Reaction;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
-import org.lflang.target.property.CoordinationProperty.CoordinationMode;
+import org.lflang.target.property.type.CoordinationModeType.CoordinationMode;
 
 public interface FedTargetExtension {
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
index c0fae10f32..25c7198fe9 100644
--- a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
@@ -42,7 +42,7 @@
 import org.lflang.lf.Action;
 import org.lflang.lf.Reaction;
 import org.lflang.lf.VarRef;
-import org.lflang.target.property.CoordinationProperty.CoordinationMode;
+import org.lflang.target.property.type.CoordinationModeType.CoordinationMode;
 
 /**
  * An extension class to the PythonGenerator that enables certain federated functionalities.
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 7484adeb16..e1b79de941 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -25,7 +25,7 @@
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
-import org.lflang.target.property.CoordinationProperty.CoordinationMode;
+import org.lflang.target.property.type.CoordinationModeType.CoordinationMode;
 
 public class TSExtension implements FedTargetExtension {
   @Override
diff --git a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
index 28290a1a6d..9d4dad046d 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedASTUtils.java
@@ -70,7 +70,7 @@
 import org.lflang.lf.Type;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
-import org.lflang.target.property.CoordinationProperty.CoordinationMode;
+import org.lflang.target.property.type.CoordinationModeType.CoordinationMode;
 
 /**
  * A helper class for AST transformations needed for federated execution.
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 9bad080b7a..168bb0a8fd 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -58,7 +58,7 @@
 import org.lflang.lf.TargetDecl;
 import org.lflang.lf.VarRef;
 import org.lflang.target.TargetConfig;
-import org.lflang.target.property.CoordinationProperty.CoordinationMode;
+import org.lflang.target.property.type.CoordinationModeType.CoordinationMode;
 import org.lflang.util.Averager;
 
 public class FedGenerator {
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index 368d01311f..99e942a45c 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -37,7 +37,7 @@
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
 import org.lflang.target.TargetConfig;
-import org.lflang.target.property.ClockSyncModeProperty.ClockSyncMode;
+import org.lflang.target.property.type.ClockSyncModeType.ClockSyncMode;
 
 /**
  * Utility class that can be used to create a launcher for federated LF programs.
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index df6e6abb57..e760e7ff7a 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -35,7 +35,7 @@
 import org.lflang.MessageReporter;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.target.TargetConfig;
-import org.lflang.target.property.PlatformProperty.Platform;
+import org.lflang.target.property.type.PlatformType.Platform;
 import org.lflang.util.FileUtil;
 
 /**
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index 55d5cb2b3b..6466f3f26e 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -40,8 +40,8 @@
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.target.TargetConfig;
-import org.lflang.target.property.BuildTypeProperty;
-import org.lflang.target.property.PlatformProperty.Platform;
+import org.lflang.target.property.type.BuildTypeType.BuildType;
+import org.lflang.target.property.type.PlatformType.Platform;
 import org.lflang.util.FileUtil;
 import org.lflang.util.LFCommand;
 
@@ -261,7 +261,7 @@ private static List<String> cmakeOptions(TargetConfig targetConfig, FileConfig f
   }
 
   /** Return the cmake config name corresponding to a given build type. */
-  private String buildTypeToCmakeConfig(BuildTypeProperty.BuildType type) {
+  private String buildTypeToCmakeConfig(BuildType type) {
     if (type == null) {
       return "Release";
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 90c9b41080..7a10616c7b 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -86,9 +86,9 @@
 import org.lflang.lf.StateVar;
 import org.lflang.lf.Variable;
 import org.lflang.target.TargetConfig;
-import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.target.property.PlatformProperty.PlatformOption;
-import org.lflang.target.property.SchedulerProperty.SchedulerOption;
+import org.lflang.target.property.type.PlatformType.Platform;
+import org.lflang.target.property.type.SchedulerType.Scheduler;
 import org.lflang.util.ArduinoUtil;
 import org.lflang.util.FileUtil;
 
@@ -698,7 +698,7 @@ private void pickScheduler() {
       // Check if a deadline is assigned to any reaction
       if (hasDeadlines(reactors)) {
         if (!targetConfig.schedulerType.isSet()) {
-          targetConfig.schedulerType.override(SchedulerOption.GEDF_NP);
+          targetConfig.schedulerType.override(Scheduler.GEDF_NP);
         }
       }
     }
@@ -2042,9 +2042,7 @@ public String generateDirectives() {
     CodeBuilder code = new CodeBuilder();
     code.prComment("Code generated by the Lingua Franca compiler from:");
     code.prComment("file:/" + FileUtil.toUnixString(fileConfig.srcFile));
-    code.pr(
-        CPreambleGenerator.generateDefineDirectives(
-            targetConfig, fileConfig.getSrcGenPath(), hasModalReactors));
+    code.pr(CPreambleGenerator.generateDefineDirectives(targetConfig, fileConfig.getSrcGenPath()));
     code.pr(CPreambleGenerator.generateIncludeStatements(targetConfig, CCppMode));
     return code.toString();
   }
diff --git a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
index e8c58bd92f..1ef7280834 100644
--- a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.target.TargetConfig;
-import org.lflang.target.property.PlatformProperty.Platform;
+import org.lflang.target.property.type.PlatformType.Platform;
 import org.lflang.util.StringUtil;
 
 public class CMainFunctionGenerator {
diff --git a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
index c0cda07b3f..df26dbb943 100644
--- a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
@@ -5,7 +5,7 @@
 import java.nio.file.Path;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.target.TargetConfig;
-import org.lflang.target.property.PlatformProperty.Platform;
+import org.lflang.target.property.type.PlatformType.Platform;
 import org.lflang.util.StringUtil;
 
 /**
@@ -59,8 +59,7 @@ public static String generateIncludeStatements(TargetConfig targetConfig, boolea
     return code.toString();
   }
 
-  public static String generateDefineDirectives(
-      TargetConfig targetConfig, Path srcGenPath, boolean hasModalReactors) {
+  public static String generateDefineDirectives(TargetConfig targetConfig, Path srcGenPath) {
     int logLevel = targetConfig.logLevel.get().ordinal();
     var tracing = targetConfig.tracing.get();
     CodeBuilder code = new CodeBuilder();
diff --git a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 8cd050b8a0..29cf3a682d 100644
--- a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -23,7 +23,7 @@
 import org.lflang.generator.RuntimeRange;
 import org.lflang.generator.SendRange;
 import org.lflang.target.TargetConfig;
-import org.lflang.target.property.LoggingProperty.LogLevel;
+import org.lflang.target.property.type.LoggingType.LogLevel;
 
 /**
  * Generate code for the "_lf_initialize_trigger_objects" function
diff --git a/core/src/main/java/org/lflang/generator/python/PythonPreambleGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonPreambleGenerator.java
index 305b2a78b7..8194f78c63 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonPreambleGenerator.java
@@ -37,8 +37,7 @@ public static String generateCDefineDirectives(
       TargetConfig targetConfig, Path srcGenPath, boolean hasModalReactors) {
     // TODO: Delete all of this. It is not used.
     CodeBuilder code = new CodeBuilder();
-    code.pr(
-        CPreambleGenerator.generateDefineDirectives(targetConfig, srcGenPath, hasModalReactors));
+    code.pr(CPreambleGenerator.generateDefineDirectives(targetConfig, srcGenPath));
     return code.toString();
   }
 
diff --git a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
index f3620c0575..d30ae87255 100644
--- a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
+++ b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
@@ -269,7 +269,7 @@ public static final class CargoDependenciesPropertyType implements TargetPropert
 
     public static final TargetPropertyType INSTANCE = new CargoDependenciesPropertyType();
 
-    private CargoDependenciesPropertyType() {}
+    public CargoDependenciesPropertyType() {}
 
     @Override
     public boolean validate(Element e) {
diff --git a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
index 9ad8b08716..3bced7afa2 100644
--- a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
+++ b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
@@ -26,10 +26,11 @@
 
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.BuildTypeProperty;
-import org.lflang.target.property.BuildTypeProperty.BuildType;
 import org.lflang.target.property.CargoDependenciesProperty;
 import org.lflang.target.property.CargoFeaturesProperty;
 import org.lflang.target.property.RustIncludeProperty;
+import org.lflang.target.property.type.BuildTypeType;
+import org.lflang.target.property.type.BuildTypeType.BuildType;
 
 /**
  * Rust-specific part of a {@link TargetConfig}.
@@ -48,7 +49,7 @@ public final class RustTargetConfig {
   public final RustIncludeProperty rustTopLevelModules = new RustIncludeProperty();
 
   /** Cargo profile, default is debug (corresponds to cargo dev profile). */
-  private BuildType profile = BuildTypeProperty.BuildType.DEBUG;
+  private BuildType profile = BuildTypeType.BuildType.DEBUG;
 
   /** The build type to use. Corresponds to a Cargo profile. */
   public BuildType getBuildType(BuildTypeProperty cmakeBuildType) {
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 23906a80ab..8067161b0c 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -275,13 +275,14 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
   public List<AbstractTargetProperty> getAllTargetProperties() {
     var properties = AbstractTargetProperty.getAllTargetProperties(this);
     properties.addAll(AbstractTargetProperty.getAllTargetProperties(this.rust));
-    return properties;
+    return properties.stream()
+        .sorted((p1, p2) -> p1.name().compareTo(p2.name()))
+        .collect(Collectors.toList());
   }
 
   public static List<AbstractTargetProperty> getUserTargetProperties() {
     var config = new TargetConfig();
     var properties = AbstractTargetProperty.getAllTargetProperties(config);
-    properties.addAll(AbstractTargetProperty.getAllTargetProperties(config));
     return properties.stream()
         .filter(it -> !it.name().startsWith("_"))
         .collect(Collectors.toList());
diff --git a/core/src/main/java/org/lflang/target/property/AbstractBooleanProperty.java b/core/src/main/java/org/lflang/target/property/AbstractBooleanProperty.java
index 8d65a0674b..91530c9db7 100644
--- a/core/src/main/java/org/lflang/target/property/AbstractBooleanProperty.java
+++ b/core/src/main/java/org/lflang/target/property/AbstractBooleanProperty.java
@@ -6,7 +6,8 @@
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
 
-public abstract class AbstractBooleanProperty extends AbstractTargetProperty<Boolean> {
+public abstract class AbstractBooleanProperty
+    extends AbstractTargetProperty<Boolean, PrimitiveType> {
 
   public AbstractBooleanProperty() {
     super(PrimitiveType.BOOLEAN);
diff --git a/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java b/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java
index cd462ab2ec..3d866c62fe 100644
--- a/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java
+++ b/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java
@@ -8,7 +8,8 @@
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.UnionType;
 
-public abstract class AbstractFileListProperty extends AbstractTargetProperty<List<String>> {
+public abstract class AbstractFileListProperty
+    extends AbstractTargetProperty<List<String>, UnionType> {
 
   public AbstractFileListProperty() {
     super(UnionType.FILE_OR_FILE_ARRAY);
diff --git a/core/src/main/java/org/lflang/target/property/AbstractStringConfig.java b/core/src/main/java/org/lflang/target/property/AbstractStringConfig.java
index 619a7f135d..d4dcb9a3d3 100644
--- a/core/src/main/java/org/lflang/target/property/AbstractStringConfig.java
+++ b/core/src/main/java/org/lflang/target/property/AbstractStringConfig.java
@@ -6,7 +6,7 @@
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
 
-public abstract class AbstractStringConfig extends AbstractTargetProperty<String> {
+public abstract class AbstractStringConfig extends AbstractTargetProperty<String, PrimitiveType> {
 
   public AbstractStringConfig() {
     super(PrimitiveType.STRING);
diff --git a/core/src/main/java/org/lflang/target/property/AbstractStringListProperty.java b/core/src/main/java/org/lflang/target/property/AbstractStringListProperty.java
index 43afc06e91..71ffbe500b 100644
--- a/core/src/main/java/org/lflang/target/property/AbstractStringListProperty.java
+++ b/core/src/main/java/org/lflang/target/property/AbstractStringListProperty.java
@@ -9,7 +9,8 @@
 import org.lflang.target.property.type.UnionType;
 
 /** Note: {@code set} implements an "append" semantics. */
-public abstract class AbstractStringListProperty extends AbstractTargetProperty<List<String>> {
+public abstract class AbstractStringListProperty
+    extends AbstractTargetProperty<List<String>, UnionType> {
 
   public AbstractStringListProperty() {
     super(UnionType.STRING_OR_STRING_ARRAY);
diff --git a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
index 78c320d09f..8010b2869a 100644
--- a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
@@ -11,7 +11,7 @@
 import org.lflang.target.property.type.UnionType;
 
 /** Directive to let the generator use the custom build command. */
-public class BuildCommandsProperty extends AbstractTargetProperty<List<String>> {
+public class BuildCommandsProperty extends AbstractTargetProperty<List<String>, UnionType> {
 
   public BuildCommandsProperty() {
     super(UnionType.STRING_OR_STRING_ARRAY);
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
index 97ffcd560c..c613ac5c42 100644
--- a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
@@ -7,17 +7,17 @@
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
-import org.lflang.target.property.BuildTypeProperty.BuildType;
-import org.lflang.target.property.type.UnionType;
+import org.lflang.target.property.type.BuildTypeType;
+import org.lflang.target.property.type.BuildTypeType.BuildType;
 
 /**
  * Directive to specify the target build type such as 'Release' or 'Debug'. This is also used in the
  * Rust target to select a Cargo profile.
  */
-public class BuildTypeProperty extends AbstractTargetProperty<BuildType> {
+public class BuildTypeProperty extends AbstractTargetProperty<BuildType, BuildTypeType> {
 
   public BuildTypeProperty() {
-    super(UnionType.BUILD_TYPE_UNION);
+    super(new BuildTypeType());
   }
 
   @Override
@@ -27,7 +27,7 @@ public Element toAstElement() {
 
   @Override
   public BuildType initialValue() {
-    return BuildType.RELEASE;
+    return BuildTypeType.BuildType.RELEASE;
   }
 
   @Override
@@ -37,7 +37,7 @@ public BuildType fromAst(Element node, MessageReporter reporter) {
 
   @Override
   protected BuildType fromString(String string, MessageReporter reporter) {
-    return (BuildType) UnionType.BUILD_TYPE_UNION.forName(string);
+    return ((BuildTypeType) this.type).forName(string);
   }
 
   @Override
@@ -49,32 +49,4 @@ public String name() {
   public List<Target> supportedTargets() {
     return Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Rust);
   }
-
-  /**
-   * Enumeration of Cmake build types. These are also mapped to Cargo profiles for the Rust target
-   * (see {@link org.lflang.generator.rust.RustTargetConfig})
-   *
-   * @author Christian Menard
-   */
-  public enum BuildType {
-    RELEASE("Release"),
-    DEBUG("Debug"),
-    TEST("Test"),
-    REL_WITH_DEB_INFO("RelWithDebInfo"),
-    MIN_SIZE_REL("MinSizeRel");
-
-    /** Alias used in toString method. */
-    private final String alias;
-
-    /** Private constructor for Cmake build types. */
-    BuildType(String alias) {
-      this.alias = alias;
-    }
-
-    /** Return the alias. */
-    @Override
-    public String toString() {
-      return this.alias;
-    }
-  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
index bfc948cbd8..859b697a13 100644
--- a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
@@ -40,11 +40,12 @@
  * }</pre>
  */
 public class CargoDependenciesProperty
-    extends AbstractTargetProperty<Map<String, CargoDependencySpec>> {
+    extends AbstractTargetProperty<
+        Map<String, CargoDependencySpec>, CargoDependenciesPropertyType> {
 
   public CargoDependenciesProperty() {
-    super(CargoDependenciesPropertyType.INSTANCE);
-  }
+    super(new CargoDependenciesPropertyType());
+  } // FIXME
 
   @Override
   public Map<String, CargoDependencySpec> initialValue() {
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
index 224cbe1a2f..cfed672d81 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
@@ -11,14 +11,15 @@
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
 import org.lflang.lf.Reactor;
-import org.lflang.target.property.ClockSyncModeProperty.ClockSyncMode;
-import org.lflang.target.property.type.UnionType;
+import org.lflang.target.property.type.ClockSyncModeType;
+import org.lflang.target.property.type.ClockSyncModeType.ClockSyncMode;
 
 /** Directive to let the federate execution handle clock synchronization in software. */
-public class ClockSyncModeProperty extends AbstractTargetProperty<ClockSyncMode> {
+public class ClockSyncModeProperty
+    extends AbstractTargetProperty<ClockSyncMode, ClockSyncModeType> {
 
   public ClockSyncModeProperty() {
-    super(UnionType.CLOCK_SYNC_UNION);
+    super(new ClockSyncModeType());
   }
 
   @Override
@@ -28,14 +29,13 @@ public ClockSyncMode initialValue() {
 
   @Override
   public ClockSyncMode fromAst(Element node, MessageReporter reporter) {
-    UnionType.CLOCK_SYNC_UNION.validate(node);
     var mode = fromString(ASTUtils.elementToSingleString(node), reporter);
     return Objects.requireNonNullElse(mode, ClockSyncMode.INIT);
   }
 
   @Override
   protected ClockSyncMode fromString(String string, MessageReporter reporter) {
-    return (ClockSyncMode) UnionType.CLOCK_SYNC_UNION.forName(string);
+    return this.type.forName(string);
   }
 
   @Override
@@ -70,26 +70,4 @@ public Element toAstElement() {
   public String name() {
     return "clock-sync";
   }
-
-  /**
-   * Enumeration of clock synchronization modes.
-   *
-   * <ul>
-   *   <li>OFF: The clock synchronization is universally off.
-   *   <li>STARTUP: Clock synchronization occurs at startup only.
-   *   <li>ON: Clock synchronization occurs at startup and at runtime.
-   * </ul>
-   *
-   * @author Edward A. Lee
-   */
-  public enum ClockSyncMode {
-    OFF,
-    INIT,
-    ON;
-    /** Return the name in lower case. */
-    @Override
-    public String toString() {
-      return this.name().toLowerCase();
-    }
-  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
index b0909c2689..6cb0d76d8a 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
@@ -19,7 +19,8 @@
 import org.lflang.target.property.type.TargetPropertyType;
 
 /** Key-value pairs giving options for clock synchronization. */
-public class ClockSyncOptionsProperty extends AbstractTargetProperty<ClockSyncOptions> {
+public class ClockSyncOptionsProperty
+    extends AbstractTargetProperty<ClockSyncOptions, DictionaryType> {
 
   public ClockSyncOptionsProperty() {
     super(DictionaryType.CLOCK_SYNC_OPTION_DICT);
diff --git a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
index 7413bf8728..4c4a8fa108 100644
--- a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
@@ -16,7 +16,7 @@
  * <p>This gives full control over the C/C++ build as any cmake parameters can be adjusted in the
  * included file.
  */
-public class CmakeIncludeProperty extends AbstractTargetProperty<List<String>> {
+public class CmakeIncludeProperty extends AbstractTargetProperty<List<String>, UnionType> {
 
   public CmakeIncludeProperty() {
     super(UnionType.FILE_OR_FILE_ARRAY);
diff --git a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
index ff4aa30e11..88eb50fd0c 100644
--- a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
@@ -12,7 +12,8 @@
 import org.lflang.target.property.type.StringDictionaryType;
 
 /** Directive to specify compile-time definitions. */
-public class CompileDefinitionsProperty extends AbstractTargetProperty<Map<String, String>> {
+public class CompileDefinitionsProperty
+    extends AbstractTargetProperty<Map<String, String>, StringDictionaryType> {
 
   public CompileDefinitionsProperty() {
     super(StringDictionaryType.COMPILE_DEFINITION);
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
index c2d4e94b90..a84506eedf 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
@@ -19,7 +19,8 @@
 import org.lflang.target.property.type.TargetPropertyType;
 
 /** Key-value pairs giving options for clock synchronization. */
-public class CoordinationOptionsProperty extends AbstractTargetProperty<CoordinationOptions> {
+public class CoordinationOptionsProperty
+    extends AbstractTargetProperty<CoordinationOptions, DictionaryType> {
 
   public CoordinationOptionsProperty() {
     super(DictionaryType.COORDINATION_OPTION_DICT);
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
index 4837a68317..c751b5e802 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
@@ -7,14 +7,15 @@
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
-import org.lflang.target.property.CoordinationProperty.CoordinationMode;
-import org.lflang.target.property.type.UnionType;
+import org.lflang.target.property.type.CoordinationModeType;
+import org.lflang.target.property.type.CoordinationModeType.CoordinationMode;
 
 /** Directive to specify the coordination mode */
-public class CoordinationProperty extends AbstractTargetProperty<CoordinationMode> {
+public class CoordinationProperty
+    extends AbstractTargetProperty<CoordinationMode, CoordinationModeType> {
 
   public CoordinationProperty() {
-    super(UnionType.COORDINATION_UNION);
+    super(new CoordinationModeType());
   }
 
   @Override
@@ -29,7 +30,7 @@ public CoordinationMode fromAst(Element node, MessageReporter reporter) {
 
   @Override
   protected CoordinationMode fromString(String string, MessageReporter reporter) {
-    return (CoordinationMode) UnionType.COORDINATION_UNION.forName(string);
+    return ((CoordinationModeType) this.type).forName(string);
   }
 
   @Override
@@ -46,20 +47,4 @@ public Element toAstElement() {
   public String name() {
     return "coordination";
   }
-
-  /**
-   * Enumeration of coordination types.
-   *
-   * @author Marten Lohstroh
-   */
-  public enum CoordinationMode {
-    CENTRALIZED,
-    DECENTRALIZED;
-
-    /** Return the name in lower case. */
-    @Override
-    public String toString() {
-      return this.name().toLowerCase();
-    }
-  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/DockerProperty.java b/core/src/main/java/org/lflang/target/property/DockerProperty.java
index ea09ae836e..998c38d082 100644
--- a/core/src/main/java/org/lflang/target/property/DockerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DockerProperty.java
@@ -22,7 +22,7 @@
  * Directive to generate a Dockerfile. This is either a boolean, true or false, or a dictionary of
  * options.
  */
-public class DockerProperty extends AbstractTargetProperty<DockerOptions> {
+public class DockerProperty extends AbstractTargetProperty<DockerOptions, UnionType> {
 
   public DockerProperty() {
     super(UnionType.DOCKER_UNION);
diff --git a/core/src/main/java/org/lflang/target/property/FedSetupProperty.java b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
index 1fde72bdc1..5334e1c9be 100644
--- a/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
@@ -13,7 +13,7 @@
  * Directs the C or Python target to include the associated C file used for setting up federated
  * execution before processing the first tag.
  */
-public class FedSetupProperty extends AbstractTargetProperty<String> {
+public class FedSetupProperty extends AbstractTargetProperty<String, PrimitiveType> {
 
   public FedSetupProperty() {
     super(PrimitiveType.FILE);
diff --git a/core/src/main/java/org/lflang/target/property/LoggingProperty.java b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
index f90179d67d..2cddd285ca 100644
--- a/core/src/main/java/org/lflang/target/property/LoggingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
@@ -6,19 +6,19 @@
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
-import org.lflang.target.property.LoggingProperty.LogLevel;
-import org.lflang.target.property.type.UnionType;
+import org.lflang.target.property.type.LoggingType;
+import org.lflang.target.property.type.LoggingType.LogLevel;
 
 /** Directive to specify the grain at which to report log messages during execution. */
-public class LoggingProperty extends AbstractTargetProperty<LogLevel> {
+public class LoggingProperty extends AbstractTargetProperty<LogLevel, LoggingType> {
 
   public LoggingProperty() {
-    super(UnionType.LOGGING_UNION);
+    super(new LoggingType());
   }
 
   @Override
   public LogLevel initialValue() {
-    return LogLevel.INFO;
+    return LogLevel.getDefault();
   }
 
   @Override
@@ -44,23 +44,4 @@ public Element toAstElement() {
   public String name() {
     return "logging";
   }
-
-  /**
-   * Log levels in descending order of severity.
-   *
-   * @author Marten Lohstroh
-   */
-  public enum LogLevel {
-    ERROR,
-    WARN,
-    INFO,
-    LOG,
-    DEBUG;
-
-    /** Return the name in lower case. */
-    @Override
-    public String toString() {
-      return this.name().toLowerCase();
-    }
-  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index 75aa611a4f..4eb7f780c2 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -1,8 +1,6 @@
 package org.lflang.target.property;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
@@ -17,6 +15,8 @@
 import org.lflang.target.property.PlatformProperty.PlatformOptions;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.DictionaryType.DictionaryElement;
+import org.lflang.target.property.type.PlatformType;
+import org.lflang.target.property.type.PlatformType.Platform;
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.target.property.type.UnionType;
@@ -25,11 +25,11 @@
  * Directive to specify the platform for cross code generation. This is either a string of the
  * platform or a dictionary of options that includes the string name.
  */
-public class PlatformProperty extends AbstractTargetProperty<PlatformOptions> {
+public class PlatformProperty extends AbstractTargetProperty<PlatformOptions, UnionType> {
 
-  public static final String UNKNOW_PLATFORM =
+  public static final String UNKNOWN_PLATFORM =
       "Unidentified Platform Type, LF supports the following platform types: "
-          + Arrays.asList(Platform.values());
+          + new PlatformType().optionsList();
 
   public PlatformProperty() {
     super(UnionType.PLATFORM_STRING_OR_DICTIONARY);
@@ -44,18 +44,18 @@ public PlatformOptions initialValue() {
   public PlatformOptions fromAst(Element node, MessageReporter reporter) {
     var config = new PlatformOptions();
     if (node.getLiteral() != null || node.getId() != null) {
-      config.platform =
-          (Platform) UnionType.PLATFORM_UNION.forName(ASTUtils.elementToSingleString(node));
+      config.platform = new PlatformType().forName(ASTUtils.elementToSingleString(node));
     } else {
       for (KeyValuePair entry : node.getKeyvalue().getPairs()) {
         PlatformOption option =
             (PlatformOption) DictionaryType.PLATFORM_DICT.forName(entry.getName());
+        if (option == null) {
+          continue; // FIXME: should not be necessary
+        }
         switch (option) {
           case NAME -> {
             config.platform =
-                (Platform)
-                    UnionType.PLATFORM_UNION.forName(
-                        ASTUtils.elementToSingleString(entry.getValue()));
+                new PlatformType().forName(ASTUtils.elementToSingleString(entry.getValue()));
           }
           case BAUDRATE -> config.baudRate = ASTUtils.toInteger(entry.getValue());
           case BOARD -> config.board = ASTUtils.elementToSingleString(entry.getValue());
@@ -81,31 +81,9 @@ public List<Target> supportedTargets() {
 
   @Override
   public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
-    final var node = pair.getValue();
-    Platform platform = null;
-    if (node.getLiteral() != null || node.getId() != null) {
-      platform = (Platform) UnionType.PLATFORM_UNION.forName(ASTUtils.elementToSingleString(node));
-      if (platform == null) {
-        reporter.at(pair, Literals.KEY_VALUE_PAIR__VALUE).error(UNKNOW_PLATFORM);
-      }
-    } else {
-      for (KeyValuePair entry : node.getKeyvalue().getPairs()) {
-        PlatformOption option =
-            (PlatformOption) DictionaryType.PLATFORM_DICT.forName(entry.getName());
-        if (Objects.requireNonNull(option) == PlatformOption.NAME) {
-          platform =
-              (Platform)
-                  UnionType.PLATFORM_UNION.forName(
-                      ASTUtils.elementToSingleString(entry.getValue()));
-          if (platform == null) {
-            reporter.at(entry, Literals.KEY_VALUE_PAIR__VALUE).error(UNKNOW_PLATFORM);
-          }
-        }
-      }
-    }
-
+    var config = fromAst(pair.getValue(), reporter);
     var threading = TargetProperty.getKeyValuePair(ast, new ThreadingProperty());
-    if (threading != null && platform == Platform.RP2040) {
+    if (threading != null && config.platform == Platform.RP2040) {
       reporter
           .at(pair, Literals.KEY_VALUE_PAIR__VALUE)
           .error("Platform " + Platform.RP2040 + " does not support threading");
@@ -184,48 +162,6 @@ public static class PlatformOptions { // FIXME: use a record for this
     public int userThreads = 0;
   }
 
-  /** Enumeration of supported platforms */
-  public enum Platform {
-    AUTO,
-    ARDUINO,
-    NRF52("Nrf52", true),
-    RP2040("Rp2040", false),
-    LINUX("Linux", true),
-    MAC("Darwin", true),
-    ZEPHYR("Zephyr", true),
-    WINDOWS("Windows", true);
-
-    final String cMakeName;
-
-    private boolean multiThreaded =
-        true; // FIXME: this is never read. If we set it, we can simplify the validator method in
-    // the encapsulating class.
-
-    Platform() {
-      this.cMakeName = this.toString();
-    }
-
-    Platform(String cMakeName, boolean isMultiThreaded) {
-      this.cMakeName = cMakeName;
-      this.multiThreaded = isMultiThreaded;
-    }
-
-    /** Return the name in lower case. */
-    @Override
-    public String toString() {
-      return this.name().toLowerCase();
-    }
-
-    /** Get the CMake name for the platform. */
-    public String getcMakeName() {
-      return this.cMakeName;
-    }
-
-    public boolean isMultiThreaded() {
-      return this.multiThreaded;
-    }
-  }
-
   /**
    * Platform options.
    *
diff --git a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
index ce766942dc..5f55913bca 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
@@ -14,7 +14,7 @@
 import org.lflang.target.property.type.ArrayType;
 
 /** Directive to specify additional ROS2 packages that this LF program depends on. */
-public class Ros2DependenciesProperty extends AbstractTargetProperty<List<String>> {
+public class Ros2DependenciesProperty extends AbstractTargetProperty<List<String>, ArrayType> {
 
   public Ros2DependenciesProperty() {
     super(ArrayType.STRING_ARRAY);
diff --git a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
index 110b94d977..478cc7e5e7 100644
--- a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
@@ -22,7 +22,7 @@
  * the generated {@code main.rs} will include it with a {@code mod foo;}. If one of the paths is a
  * directory, it must contain a {@code mod.rs} file, and all its contents are copied.
  */
-public class RustIncludeProperty extends AbstractTargetProperty<List<Path>> {
+public class RustIncludeProperty extends AbstractTargetProperty<List<Path>, UnionType> {
 
   public RustIncludeProperty() {
     super(UnionType.FILE_OR_FILE_ARRAY);
diff --git a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
index ff280fc18e..813504f880 100644
--- a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
@@ -1,7 +1,5 @@
 package org.lflang.target.property;
 
-import com.google.common.collect.ImmutableList;
-import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
 import org.lflang.AbstractTargetProperty;
@@ -12,34 +10,34 @@
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
-import org.lflang.target.property.SchedulerProperty.SchedulerOption;
-import org.lflang.target.property.type.UnionType;
+import org.lflang.target.property.type.SchedulerType;
+import org.lflang.target.property.type.SchedulerType.Scheduler;
 
 /** Directive for specifying a specific runtime scheduler, if supported. */
-public class SchedulerProperty extends AbstractTargetProperty<SchedulerOption> {
+public class SchedulerProperty extends AbstractTargetProperty<Scheduler, SchedulerType> {
 
   public SchedulerProperty() {
-    super(UnionType.SCHEDULER_UNION);
+    super(new SchedulerType());
   }
 
   @Override
-  public SchedulerOption initialValue() {
-    return SchedulerOption.getDefault();
+  public Scheduler initialValue() {
+    return Scheduler.getDefault();
   }
 
   @Override
-  public SchedulerOption fromAst(Element node, MessageReporter reporter) {
+  public Scheduler fromAst(Element node, MessageReporter reporter) {
     var scheduler = fromString(ASTUtils.elementToSingleString(node), reporter);
     if (scheduler != null) {
       return scheduler;
     } else {
-      return SchedulerOption.getDefault();
+      return Scheduler.getDefault();
     }
   }
 
   @Override
-  protected SchedulerOption fromString(String string, MessageReporter reporter) {
-    return (SchedulerOption) UnionType.SCHEDULER_UNION.forName(string);
+  protected Scheduler fromString(String string, MessageReporter reporter) {
+    return this.type.forName(string);
   }
 
   @Override
@@ -62,7 +60,7 @@ public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
     if (pair != null) {
       String schedulerName = ASTUtils.elementToSingleString(pair.getValue());
       try {
-        if (!SchedulerOption.valueOf(schedulerName).prioritizesDeadline()) {
+        if (!Scheduler.valueOf(schedulerName).prioritizesDeadline()) {
           // Check if a deadline is assigned to any reaction
           // Filter reactors that contain at least one reaction that
           // has a deadline handler.
@@ -89,52 +87,4 @@ public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
       }
     }
   }
-
-  /**
-   * Supported schedulers.
-   *
-   * @author Soroush Bateni
-   */
-  public enum SchedulerOption {
-    NP(false), // Non-preemptive
-    ADAPTIVE(
-        false,
-        List.of(
-            Path.of("scheduler_adaptive.c"),
-            Path.of("worker_assignments.h"),
-            Path.of("worker_states.h"),
-            Path.of("data_collection.h"))),
-    GEDF_NP(true), // Global EDF non-preemptive
-    GEDF_NP_CI(true); // Global EDF non-preemptive with chain ID
-
-    /** Indicate whether the scheduler prioritizes reactions by deadline. */
-    private final boolean prioritizesDeadline;
-
-    /** Relative paths to files required by this scheduler. */
-    private final List<Path> relativePaths;
-
-    SchedulerOption(boolean prioritizesDeadline) {
-      this(prioritizesDeadline, null);
-    }
-
-    SchedulerOption(boolean prioritizesDeadline, List<Path> relativePaths) {
-      this.prioritizesDeadline = prioritizesDeadline;
-      this.relativePaths = relativePaths;
-    }
-
-    /** Return true if the scheduler prioritizes reactions by deadline. */
-    public boolean prioritizesDeadline() {
-      return this.prioritizesDeadline;
-    }
-
-    public List<Path> getRelativePaths() {
-      return relativePaths != null
-          ? ImmutableList.copyOf(relativePaths)
-          : List.of(Path.of("scheduler_" + this + ".c"));
-    }
-
-    public static SchedulerOption getDefault() {
-      return NP;
-    }
-  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
index a43ef6c059..bef95c7ff6 100644
--- a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
@@ -10,7 +10,7 @@
 import org.lflang.target.property.type.PrimitiveType;
 
 /** Directive to specify the execution timeout. */
-public class TimeOutProperty extends AbstractTargetProperty<TimeValue> {
+public class TimeOutProperty extends AbstractTargetProperty<TimeValue, PrimitiveType> {
 
   public TimeOutProperty() {
     super(PrimitiveType.TIME_VALUE);
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index 9f0835a9c6..114f6deebf 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -21,7 +21,7 @@
 import org.lflang.target.property.type.UnionType;
 
 /** Directive to enable tracing. */
-public class TracingProperty extends AbstractTargetProperty<TracingOptions> {
+public class TracingProperty extends AbstractTargetProperty<TracingOptions, UnionType> {
 
   public TracingProperty() {
     super(UnionType.TRACING_UNION);
diff --git a/core/src/main/java/org/lflang/target/property/WorkersProperty.java b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
index f0b8b9fcda..057be50e56 100644
--- a/core/src/main/java/org/lflang/target/property/WorkersProperty.java
+++ b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
@@ -9,7 +9,7 @@
 import org.lflang.target.property.type.PrimitiveType;
 
 /** Directive to specify the number of worker threads used by the runtime. */
-public class WorkersProperty extends AbstractTargetProperty<Integer> {
+public class WorkersProperty extends AbstractTargetProperty<Integer, PrimitiveType> {
 
   public WorkersProperty() {
     super(PrimitiveType.NON_NEGATIVE_INTEGER);
diff --git a/core/src/main/java/org/lflang/target/property/type/DictionaryType.java b/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
index 10522a09b1..00aae0a870 100644
--- a/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
+++ b/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
@@ -9,6 +9,7 @@
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
+import org.lflang.lf.LfPackage.Literals;
 import org.lflang.target.property.ClockSyncOptionsProperty.ClockSyncOption;
 import org.lflang.target.property.CoordinationOptionsProperty.CoordinationOption;
 import org.lflang.target.property.DockerProperty.DockerOption;
@@ -67,6 +68,12 @@ public boolean check(Element e, String name, MessageReporter v) {
           TargetPropertyType type = match.get().getType();
           valid &= type.check(val, "Entry", v);
         } else {
+          v.at(pair, Literals.KEY_VALUE_PAIR__NAME)
+              .error(
+                  "Unrecognized key: "
+                      + pair.getName()
+                      + ". Recognized properties are: "
+                      + keysList());
           valid = false;
         }
         return valid;
@@ -87,8 +94,11 @@ public boolean validate(Element e) {
   /** Return a human-readable description of this type. */
   @Override
   public String toString() {
-    return "a dictionary with one or more of the following keys: "
-        + options.stream().map(option -> option.toString()).collect(Collectors.joining(", "));
+    return "a dictionary with one or more of the following keys: " + keysList();
+  }
+
+  public String keysList() {
+    return options.stream().map(option -> option.toString()).collect(Collectors.joining(", "));
   }
 
   /** Interface for dictionary elements. It associates an entry with a type. */
diff --git a/core/src/main/java/org/lflang/target/property/type/UnionType.java b/core/src/main/java/org/lflang/target/property/type/UnionType.java
index b044455115..66abb1d1ef 100644
--- a/core/src/main/java/org/lflang/target/property/type/UnionType.java
+++ b/core/src/main/java/org/lflang/target/property/type/UnionType.java
@@ -6,14 +6,7 @@
 import java.util.stream.Collectors;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
-import org.lflang.target.property.BuildTypeProperty;
-import org.lflang.target.property.ClockSyncModeProperty.ClockSyncMode;
-import org.lflang.target.property.CoordinationProperty.CoordinationMode;
-import org.lflang.target.property.LoggingProperty.LogLevel;
-import org.lflang.target.property.PlatformProperty.Platform;
-import org.lflang.target.property.SchedulerProperty.SchedulerOption;
 
 /**
  * A type that can assume one of several types.
@@ -21,34 +14,22 @@
  * @author Marten Lohstroh
  */
 public enum UnionType implements TargetPropertyType {
-  STRING_OR_STRING_ARRAY(Arrays.asList(PrimitiveType.STRING, ArrayType.STRING_ARRAY), null),
-  PLATFORM_STRING_OR_DICTIONARY(
-      Arrays.asList(PrimitiveType.STRING, DictionaryType.PLATFORM_DICT), null),
-  FILE_OR_FILE_ARRAY(Arrays.asList(PrimitiveType.FILE, ArrayType.FILE_ARRAY), null),
-  BUILD_TYPE_UNION(Arrays.asList(BuildTypeProperty.BuildType.values()), null),
-  COORDINATION_UNION(Arrays.asList(CoordinationMode.values()), CoordinationMode.CENTRALIZED),
-  SCHEDULER_UNION(Arrays.asList(SchedulerOption.values()), SchedulerOption.getDefault()),
-  LOGGING_UNION(Arrays.asList(LogLevel.values()), LogLevel.INFO),
-  PLATFORM_UNION(Arrays.asList(Platform.values()), Platform.AUTO),
-  CLOCK_SYNC_UNION(Arrays.asList(ClockSyncMode.values()), ClockSyncMode.INIT),
-  DOCKER_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.DOCKER_DICT), null),
-  TRACING_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.TRACING_DICT), null);
+  STRING_OR_STRING_ARRAY(Arrays.asList(PrimitiveType.STRING, ArrayType.STRING_ARRAY)),
+  PLATFORM_STRING_OR_DICTIONARY(List.of(new PlatformType(), DictionaryType.PLATFORM_DICT)),
+  FILE_OR_FILE_ARRAY(Arrays.asList(PrimitiveType.FILE, ArrayType.FILE_ARRAY)),
+  DOCKER_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.DOCKER_DICT)),
+  TRACING_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.TRACING_DICT));
 
   /** The constituents of this type union. */
-  public final List<Enum<?>> options;
-
-  /** The default type, if there is one. */
-  private final Enum<?> defaultOption;
+  public final List<TargetPropertyType> options;
 
   /**
    * Private constructor for creating unions types.
    *
-   * @param options The types that that are part of the union.
-   * @param defaultOption The default type.
+   * @param options The types that are part of the union.
    */
-  UnionType(List<Enum<?>> options, Enum<?> defaultOption) {
+  UnionType(List<TargetPropertyType> options) {
     this.options = options;
-    this.defaultOption = defaultOption;
   }
 
   /**
@@ -57,30 +38,18 @@ public enum UnionType implements TargetPropertyType {
    * @param name The string to match against.
    * @return The matching dictionary element (or null if there is none).
    */
-  public Enum<?> forName(String name) {
+  public TargetPropertyType forName(String name) {
     return Target.match(name, options);
   }
 
   /** Recursively check that the passed in element conforms to the rules of this union. */
   @Override
   public boolean check(Element e, String name, MessageReporter r) {
-    Optional<Enum<?>> match = this.match(e);
-    var found = false;
+    var match = this.match(e);
     if (match.isPresent()) {
-      found = true;
-      // Go deeper if the element is an array or dictionary.
-      Enum<?> type = match.get();
-      if (type instanceof DictionaryType) {
-        found = ((DictionaryType) type).check(e, name, r);
-      } else if (type instanceof ArrayType) {
-        found = ((ArrayType) type).check(e, name, r);
-      } else if (type instanceof PrimitiveType) {
-        found = ((PrimitiveType) type).check(e, name, r);
-      } else if (!(type instanceof Enum<?>)) {
-        throw new RuntimeException("Encountered an unknown type.");
-      }
+      return match.get().check(e, name, r);
     }
-    return found;
+    return false;
   }
 
   /**
@@ -89,17 +58,8 @@ public boolean check(Element e, String name, MessageReporter r) {
    * @param e AST node that represents the value of a target property.
    * @return The matching type wrapped in an Optional object.
    */
-  private Optional<Enum<?>> match(Element e) {
-    return this.options.stream()
-        .filter(
-            option -> {
-              if (option instanceof TargetPropertyType) {
-                return ((TargetPropertyType) option).validate(e);
-              } else {
-                return ASTUtils.elementToSingleString(e).equalsIgnoreCase(option.toString());
-              }
-            })
-        .findAny();
+  private Optional<TargetPropertyType> match(Element e) {
+    return this.options.stream().filter(option -> option.validate(e)).findAny();
   }
 
   /**
@@ -122,15 +82,6 @@ public boolean validate(Element e) {
   @Override
   public String toString() {
     return "one of the following: "
-        + options.stream()
-            .map(
-                option -> {
-                  if (option == this.defaultOption) {
-                    return option.toString() + " (default)";
-                  } else {
-                    return option.toString();
-                  }
-                })
-            .collect(Collectors.joining(", "));
+        + options.stream().map(option -> option.toString()).collect(Collectors.joining(", "));
   }
 }
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt
index b525c8e481..d444b3083e 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppExtensions.kt
@@ -13,7 +13,7 @@ import org.lflang.lf.TriggerRef
 import org.lflang.lf.VarRef
 import org.lflang.lf.Visibility
 import org.lflang.lf.WidthSpec
-import org.lflang.target.property.LoggingProperty
+import org.lflang.target.property.type.LoggingType.LogLevel
 
 /*************
  * Copyright (c) 2019-2021, TU Dresden.
@@ -139,13 +139,13 @@ val InferredType.cppType: String
 
 
 /** Convert a log level to a severity number understood by the reactor-cpp runtime. */
-val LoggingProperty.LogLevel.severity
+val LogLevel.severity
     get() = when (this) {
-        LoggingProperty.LogLevel.ERROR -> 1
-        LoggingProperty.LogLevel.WARN -> 2
-        LoggingProperty.LogLevel.INFO -> 3
-        LoggingProperty.LogLevel.LOG   -> 4
-        LoggingProperty.LogLevel.DEBUG -> 4
+        LogLevel.ERROR -> 1
+        LogLevel.WARN -> 2
+        LogLevel.INFO -> 3
+        LogLevel.LOG   -> 4
+        LogLevel.DEBUG -> 4
     }
 
 fun Reactor.hasBankIndexParameter() = parameters.firstOrNull { it.name == "bank_index" } != null
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
index a64b29b88c..8d21e05282 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
@@ -1,9 +1,8 @@
 package org.lflang.generator.cpp
 
-import org.lflang.target.property.BuildTypeProperty.BuildType
 import org.lflang.generator.CodeMap
 import org.lflang.generator.LFGeneratorContext
-import org.lflang.target.TargetProperty
+import org.lflang.target.property.type.BuildTypeType.BuildType
 import org.lflang.toUnixString
 import org.lflang.util.FileUtil
 import org.lflang.util.LFCommand
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustCargoTomlEmitter.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustCargoTomlEmitter.kt
index 00749e17e9..c1a016af74 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustCargoTomlEmitter.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustCargoTomlEmitter.kt
@@ -24,7 +24,7 @@
 
 package org.lflang.generator.rust
 
-import org.lflang.target.property.BuildTypeProperty.BuildType.*
+import org.lflang.target.property.type.BuildTypeType.BuildType
 import org.lflang.escapeStringLiteral
 import org.lflang.generator.PrependOperator.rangeTo
 import org.lflang.joinWithCommas
@@ -62,19 +62,19 @@ ${"         |"..crate.dependencies.asIterable().joinWithLn { (name, spec) -> nam
             |[features]
             |cli=["clap"]
             |
-            |[profile.${RELEASE.cargoProfileName}] # use `build-type: $RELEASE`
+            |[profile.${BuildType.RELEASE.cargoProfileName}] # use `build-type: ${BuildType.RELEASE}`
             |lto = "thin"
             |codegen-units = 1
             |
-            |[profile.${MIN_SIZE_REL.cargoProfileName}] # use `build-type: $MIN_SIZE_REL`
+            |[profile.${BuildType.MIN_SIZE_REL.cargoProfileName}] # use `build-type: ${BuildType.MIN_SIZE_REL}`
             |inherits = "release"
             |opt-level = "s"
             |
-            |[profile.${REL_WITH_DEB_INFO.cargoProfileName}] # use `build-type: $REL_WITH_DEB_INFO`
+            |[profile.${BuildType.REL_WITH_DEB_INFO.cargoProfileName}] # use `build-type: ${BuildType.REL_WITH_DEB_INFO}`
             |inherits = "release"
             |debug = true
             |
-            |[profile.${TEST.cargoProfileName}] # use `build-type: $TEST`
+            |[profile.${BuildType.TEST.cargoProfileName}] # use `build-type: ${BuildType.TEST}`
             |inherits = "dev"
             |debug = true
             |
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
index 0c11c1538e..b7d438d0dc 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
@@ -26,7 +26,6 @@ package org.lflang.generator.rust
 
 import org.eclipse.emf.ecore.resource.Resource
 import org.lflang.Target
-import org.lflang.target.property.BuildTypeProperty.BuildType
 import org.lflang.generator.GeneratorUtils.canGenerate
 import org.lflang.generator.CodeMap
 import org.lflang.generator.GeneratorBase
@@ -37,6 +36,7 @@ import org.lflang.generator.TargetTypes
 
 import org.lflang.joinWithCommas
 import org.lflang.scoping.LFGlobalScopeProvider
+import org.lflang.target.property.type.BuildTypeType
 import org.lflang.util.FileUtil
 import java.nio.file.Files
 import java.nio.file.Path
@@ -97,9 +97,9 @@ class RustGenerator(
             this += "build"
 
             val buildType = targetConfig.rust.getBuildType(context.targetConfig.buildType)
-            if (buildType == BuildType.RELEASE) {
+            if (buildType == BuildTypeType.BuildType.RELEASE) {
                 this += "--release"
-            } else if (buildType != BuildType.DEBUG) {
+            } else if (buildType != BuildTypeType.BuildType.DEBUG) {
                 this += "--profile"
                 this += buildType.cargoProfileName
             }
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
index 5be75ace24..52f0e19608 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
@@ -26,7 +26,7 @@
 package org.lflang.generator.rust
 
 import org.lflang.*
-import org.lflang.target.property.BuildTypeProperty.BuildType
+import org.lflang.target.property.type.BuildTypeType.BuildType
 import org.lflang.ast.ASTUtils
 import org.lflang.generator.*
 import org.lflang.lf.*
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 2fd89a499e..5d9267ddfb 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -53,10 +53,10 @@
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.CargoDependenciesProperty;
 import org.lflang.target.property.PlatformProperty;
-import org.lflang.target.property.PlatformProperty.Platform;
 import org.lflang.target.property.type.ArrayType;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.DictionaryType.DictionaryElement;
+import org.lflang.target.property.type.PlatformType.Platform;
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.StringDictionaryType;
 import org.lflang.target.property.type.TargetPropertyType;
@@ -1384,12 +1384,8 @@ private List<String> synthesizeExamples(ArrayType type, boolean correct) {
   private List<String> synthesizeExamples(UnionType type, boolean correct) {
     List<String> examples = new LinkedList<>();
     if (correct) {
-      for (Enum<?> it : type.options) {
-        if (it instanceof TargetPropertyType) {
-          examples.addAll(synthesizeExamples((TargetPropertyType) it, correct));
-        } else {
-          examples.add(it.toString());
-        }
+      for (var it : type.options) {
+        examples.addAll(synthesizeExamples(it, correct));
       }
     } else {
       // Return some obviously bad examples for the common
@@ -1469,7 +1465,7 @@ private List<String> synthesizeExamples(TargetPropertyType type, boolean correct
       } else if (type instanceof StringDictionaryType) {
         return synthesizeExamples((StringDictionaryType) type, correct);
       } else {
-        Assertions.fail("Encountered an unknown type: " + type);
+        // Assertions.fail("Encountered an unknown type: " + type);
       }
     }
     return new LinkedList<>();
@@ -1511,6 +1507,8 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
                 "Property %s (%s) - known good assignment: %s".formatted(property, type, it),
                 () -> {
                   Model model = createModel(property, it);
+                  System.out.println(property.name());
+                  System.out.println(it.toString());
                   validator.assertNoErrors(model);
                   // Also make sure warnings are produced when files are not present.
                   if (type == PrimitiveType.FILE) {
@@ -1529,14 +1527,15 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
         for (String it : knownIncorrect) {
           var test =
               DynamicTest.dynamicTest(
-                  "Property %s (%s) - known bad assignment: %s".formatted(property, type, it),
+                  "Property %s (%s) - known bad assignment: %s"
+                      .formatted(property.name(), type, it),
                   () -> {
                     validator.assertError(
                         createModel(property, it),
                         LfPackage.eINSTANCE.getKeyValuePair(),
                         null,
                         String.format(
-                            "Target property '%s' is required to be %s.", property, type));
+                            "Target property '%s' is required to be %s.", property.name(), type));
                   });
           result.add(test);
         }
@@ -1547,7 +1546,8 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
           for (List<Object> it : list) {
             var test =
                 DynamicTest.dynamicTest(
-                    "Property %s (%s) - known bad assignment: %s".formatted(property, type, it),
+                    "Property %s (%s) - known bad assignment: %s"
+                        .formatted(property.name(), type, it),
                     () -> {
                       System.out.println(it);
                       // var issues = validator.validate(createModel(property,
@@ -1564,7 +1564,8 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
                             LfPackage.eINSTANCE.getKeyValuePair(),
                             null,
                             String.format(
-                                "Target property '%s' is required to be %s.", property, type));
+                                "Target property '%s' is required to be %s.",
+                                property.name(), type));
                       }
                     });
             // String.format(
@@ -1622,12 +1623,12 @@ public void checkPlatformProperty() throws Exception {
         createModel(new PlatformProperty(), "foobar"),
         LfPackage.eINSTANCE.getKeyValuePair(),
         null,
-        PlatformProperty.UNKNOW_PLATFORM);
+        PlatformProperty.UNKNOWN_PLATFORM);
     validator.assertError(
         createModel(new PlatformProperty(), "{ name: foobar }"),
         LfPackage.eINSTANCE.getKeyValuePair(),
         null,
-        PlatformProperty.UNKNOW_PLATFORM);
+        PlatformProperty.UNKNOWN_PLATFORM);
   }
 
   @Test
diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index 93b0743e2b..7191efe494 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -24,8 +24,8 @@
 
 package org.lflang.tests;
 
-import org.lflang.target.property.LoggingProperty.LogLevel;
-import org.lflang.target.property.PlatformProperty.Platform;
+import org.lflang.target.property.type.LoggingType.LogLevel;
+import org.lflang.target.property.type.PlatformType.Platform;
 import org.lflang.tests.TestRegistry.TestCategory;
 
 /**

From 2d47aebd4fe15444510d3561338fd0938113b88a Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 3 Oct 2023 23:58:58 -0700
Subject: [PATCH 0983/1114] Custom types for composite target properties

---
 .../target/property/type/BuildTypeType.java   | 51 +++++++++++++++
 .../property/type/ClockSyncModeType.java      | 33 ++++++++++
 .../property/type/CoordinationModeType.java   | 32 ++++++++++
 .../target/property/type/LoggingType.java     | 34 ++++++++++
 .../target/property/type/OptionsType.java     | 60 ++++++++++++++++++
 .../target/property/type/PlatformType.java    | 56 +++++++++++++++++
 .../target/property/type/SchedulerType.java   | 62 +++++++++++++++++++
 7 files changed, 328 insertions(+)
 create mode 100644 core/src/main/java/org/lflang/target/property/type/BuildTypeType.java
 create mode 100644 core/src/main/java/org/lflang/target/property/type/ClockSyncModeType.java
 create mode 100644 core/src/main/java/org/lflang/target/property/type/CoordinationModeType.java
 create mode 100644 core/src/main/java/org/lflang/target/property/type/LoggingType.java
 create mode 100644 core/src/main/java/org/lflang/target/property/type/OptionsType.java
 create mode 100644 core/src/main/java/org/lflang/target/property/type/PlatformType.java
 create mode 100644 core/src/main/java/org/lflang/target/property/type/SchedulerType.java

diff --git a/core/src/main/java/org/lflang/target/property/type/BuildTypeType.java b/core/src/main/java/org/lflang/target/property/type/BuildTypeType.java
new file mode 100644
index 0000000000..8045eb9229
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/type/BuildTypeType.java
@@ -0,0 +1,51 @@
+package org.lflang.target.property.type;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.lflang.target.property.type.BuildTypeType.BuildType;
+
+/** Enumeration of supported platforms */
+public class BuildTypeType extends OptionsType<BuildType> {
+
+  @Override
+  protected Class<BuildType> enumClass() {
+    return BuildType.class;
+  }
+
+  /**
+   * Enumeration of Cmake build types. These are also mapped to Cargo profiles for the Rust target
+   * (see {@link org.lflang.generator.rust.RustTargetConfig})
+   *
+   * @author Christian Menard
+   */
+  public enum BuildType {
+    RELEASE("Release"),
+    DEBUG("Debug"),
+    TEST("Test"),
+    REL_WITH_DEB_INFO("RelWithDebInfo"),
+    MIN_SIZE_REL("MinSizeRel");
+
+    /** Alias used in toString method. */
+    private final String alias;
+
+    /** Private constructor for Cmake build types. */
+    BuildType(String alias) {
+      this.alias = alias;
+    }
+
+    /** Return the alias. */
+    @Override
+    public String toString() {
+      return this.alias;
+    }
+
+    public static List<BuildType> optionsList() {
+      return Arrays.stream(BuildType.values()).collect(Collectors.toList());
+    }
+
+    public static BuildType getDefault() {
+      return BuildType.DEBUG;
+    }
+  }
+}
diff --git a/core/src/main/java/org/lflang/target/property/type/ClockSyncModeType.java b/core/src/main/java/org/lflang/target/property/type/ClockSyncModeType.java
new file mode 100644
index 0000000000..72ec1f8d1a
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/type/ClockSyncModeType.java
@@ -0,0 +1,33 @@
+package org.lflang.target.property.type;
+
+import org.lflang.target.property.type.ClockSyncModeType.ClockSyncMode;
+
+public class ClockSyncModeType extends OptionsType<ClockSyncMode> {
+
+  @Override
+  protected Class<ClockSyncMode> enumClass() {
+    return ClockSyncMode.class;
+  }
+
+  /**
+   * Enumeration of clock synchronization modes.
+   *
+   * <ul>
+   *   <li>OFF: The clock synchronization is universally off.
+   *   <li>STARTUP: Clock synchronization occurs at startup only.
+   *   <li>ON: Clock synchronization occurs at startup and at runtime.
+   * </ul>
+   *
+   * @author Edward A. Lee
+   */
+  public enum ClockSyncMode {
+    OFF,
+    INIT,
+    ON;
+    /** Return the name in lower case. */
+    @Override
+    public String toString() {
+      return this.name().toLowerCase();
+    }
+  }
+}
diff --git a/core/src/main/java/org/lflang/target/property/type/CoordinationModeType.java b/core/src/main/java/org/lflang/target/property/type/CoordinationModeType.java
new file mode 100644
index 0000000000..67e0f9b433
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/type/CoordinationModeType.java
@@ -0,0 +1,32 @@
+package org.lflang.target.property.type;
+
+import org.lflang.target.property.type.CoordinationModeType.CoordinationMode;
+
+/** Enumeration of supported platforms */
+public class CoordinationModeType extends OptionsType<CoordinationMode> {
+
+  @Override
+  protected Class<CoordinationMode> enumClass() {
+    return CoordinationMode.class;
+  }
+
+  /**
+   * Enumeration of coordination types.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum CoordinationMode {
+    CENTRALIZED,
+    DECENTRALIZED;
+
+    /** Return the name in lower case. */
+    @Override
+    public String toString() {
+      return this.name().toLowerCase();
+    }
+
+    public static CoordinationMode getDefault() {
+      return CoordinationMode.CENTRALIZED;
+    }
+  }
+}
diff --git a/core/src/main/java/org/lflang/target/property/type/LoggingType.java b/core/src/main/java/org/lflang/target/property/type/LoggingType.java
new file mode 100644
index 0000000000..aad6e2627d
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/type/LoggingType.java
@@ -0,0 +1,34 @@
+package org.lflang.target.property.type;
+
+import org.lflang.target.property.type.LoggingType.LogLevel;
+
+public class LoggingType extends OptionsType<LogLevel> {
+
+  @Override
+  protected Class<LogLevel> enumClass() {
+    return LogLevel.class;
+  }
+
+  /**
+   * Log levels in descending order of severity.
+   *
+   * @author Marten Lohstroh
+   */
+  public enum LogLevel {
+    ERROR,
+    WARN,
+    INFO,
+    LOG,
+    DEBUG;
+
+    /** Return the name in lower case. */
+    @Override
+    public String toString() {
+      return this.name().toLowerCase();
+    }
+
+    public static LogLevel getDefault() {
+      return LogLevel.INFO;
+    }
+  }
+}
diff --git a/core/src/main/java/org/lflang/target/property/type/OptionsType.java b/core/src/main/java/org/lflang/target/property/type/OptionsType.java
new file mode 100644
index 0000000000..0fac71696f
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/type/OptionsType.java
@@ -0,0 +1,60 @@
+package org.lflang.target.property.type;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.lflang.MessageReporter;
+import org.lflang.ast.ASTUtils;
+import org.lflang.lf.Element;
+
+public abstract class OptionsType<T extends Enum<?>> implements TargetPropertyType {
+
+  public final List<T> optionsList() {
+    return Arrays.stream(enumClass().getEnumConstants()).collect(Collectors.toList());
+  }
+
+  protected abstract Class<T> enumClass();
+
+  @Override
+  public boolean validate(Element e) {
+    if (e.getKeyvalue() != null) {
+      return false; // Not a literal.
+    }
+    return optionsList().stream()
+        .anyMatch(v -> v.toString().equalsIgnoreCase(ASTUtils.elementToSingleString(e)));
+  }
+
+  public String optionsString() {
+    return optionsList().stream().map(v -> v.toString()).collect(Collectors.joining(", "));
+  }
+
+  @Override
+  public boolean check(Element e, String name, MessageReporter r) {
+    var valid = this.validate(e);
+    if (!valid) {
+      r.at(e).error(String.format("%s is required to be %s.", name, this));
+      return false;
+    } else {
+      return true;
+    }
+  }
+
+  @Override
+  public String toString() {
+    return "a choice of " + this.optionsString();
+  }
+
+  /**
+   * Return option among those listed that matches the given name.
+   *
+   * @param name The string to match against.
+   * @return The matching option (or null if there is none).
+   */
+  public T forName(String name) {
+    var match = optionsList().stream().filter(o -> o.toString().equalsIgnoreCase(name)).findFirst();
+    if (match.isPresent()) {
+      return match.get();
+    }
+    return null;
+  }
+}
diff --git a/core/src/main/java/org/lflang/target/property/type/PlatformType.java b/core/src/main/java/org/lflang/target/property/type/PlatformType.java
new file mode 100644
index 0000000000..6382291c61
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/type/PlatformType.java
@@ -0,0 +1,56 @@
+package org.lflang.target.property.type;
+
+import org.lflang.target.property.type.PlatformType.Platform;
+
+/** Enumeration of supported platforms */
+public class PlatformType extends OptionsType<Platform> {
+
+  @Override
+  protected Class<Platform> enumClass() {
+    return Platform.class;
+  }
+
+  public enum Platform {
+    AUTO,
+    ARDUINO, // FIXME: not multithreaded
+    NRF52("Nrf52", true),
+    RP2040("Rp2040", false),
+    LINUX("Linux", true),
+    MAC("Darwin", true),
+    ZEPHYR("Zephyr", true),
+    WINDOWS("Windows", true);
+
+    final String cMakeName;
+
+    private final boolean multiThreaded;
+
+    Platform() {
+      this.cMakeName = this.toString();
+      this.multiThreaded = true;
+    }
+
+    Platform(String cMakeName, boolean isMultiThreaded) {
+      this.cMakeName = cMakeName;
+      this.multiThreaded = isMultiThreaded;
+    }
+
+    /** Return the name in lower case. */
+    @Override
+    public String toString() {
+      return this.name().toLowerCase();
+    }
+
+    /** Get the CMake name for the platform. */
+    public String getcMakeName() {
+      return this.cMakeName;
+    }
+
+    public boolean isMultiThreaded() {
+      return this.multiThreaded;
+    }
+
+    public Platform getDefault() {
+      return Platform.AUTO;
+    }
+  }
+}
diff --git a/core/src/main/java/org/lflang/target/property/type/SchedulerType.java b/core/src/main/java/org/lflang/target/property/type/SchedulerType.java
new file mode 100644
index 0000000000..4edc45d515
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/type/SchedulerType.java
@@ -0,0 +1,62 @@
+package org.lflang.target.property.type;
+
+import com.google.common.collect.ImmutableList;
+import java.nio.file.Path;
+import java.util.List;
+import org.lflang.target.property.type.SchedulerType.Scheduler;
+
+public class SchedulerType extends OptionsType<Scheduler> {
+
+  @Override
+  protected Class<Scheduler> enumClass() {
+    return Scheduler.class;
+  }
+
+  /**
+   * Supported schedulers.
+   *
+   * @author Soroush Bateni
+   */
+  public enum Scheduler {
+    NP(false), // Non-preemptive
+    ADAPTIVE(
+        false,
+        List.of(
+            Path.of("scheduler_adaptive.c"),
+            Path.of("worker_assignments.h"),
+            Path.of("worker_states.h"),
+            Path.of("data_collection.h"))),
+    GEDF_NP(true), // Global EDF non-preemptive
+    GEDF_NP_CI(true); // Global EDF non-preemptive with chain ID
+
+    /** Indicate whether the scheduler prioritizes reactions by deadline. */
+    private final boolean prioritizesDeadline;
+
+    /** Relative paths to files required by this scheduler. */
+    private final List<Path> relativePaths;
+
+    Scheduler(boolean prioritizesDeadline) {
+      this(prioritizesDeadline, null);
+    }
+
+    Scheduler(boolean prioritizesDeadline, List<Path> relativePaths) {
+      this.prioritizesDeadline = prioritizesDeadline;
+      this.relativePaths = relativePaths;
+    }
+
+    /** Return true if the scheduler prioritizes reactions by deadline. */
+    public boolean prioritizesDeadline() {
+      return this.prioritizesDeadline;
+    }
+
+    public List<Path> getRelativePaths() {
+      return relativePaths != null
+          ? ImmutableList.copyOf(relativePaths)
+          : List.of(Path.of("scheduler_" + this + ".c"));
+    }
+
+    public static Scheduler getDefault() {
+      return Scheduler.NP;
+    }
+  }
+}

From 769afbd8c46e88c128e93151d5d338e566682dea Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 4 Oct 2023 00:48:31 -0700
Subject: [PATCH 0984/1114] More bugfixes

---
 .../org/lflang/target/property/PlatformProperty.java   | 10 +++-------
 .../tests/compiler/LinguaFrancaValidationTest.java     |  7 ++++---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index 4eb7f780c2..f81062115d 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -27,10 +27,6 @@
  */
 public class PlatformProperty extends AbstractTargetProperty<PlatformOptions, UnionType> {
 
-  public static final String UNKNOWN_PLATFORM =
-      "Unidentified Platform Type, LF supports the following platform types: "
-          + new PlatformType().optionsList();
-
   public PlatformProperty() {
     super(UnionType.PLATFORM_STRING_OR_DICTIONARY);
   }
@@ -168,18 +164,18 @@ public static class PlatformOptions { // FIXME: use a record for this
    * @author Anirudh Rengarajan
    */
   public enum PlatformOption implements DictionaryElement {
-    NAME("name", PrimitiveType.STRING),
+    NAME("name", new PlatformType()),
     BAUDRATE("baud-rate", PrimitiveType.NON_NEGATIVE_INTEGER),
     BOARD("board", PrimitiveType.STRING),
     FLASH("flash", PrimitiveType.BOOLEAN),
     PORT("port", PrimitiveType.STRING),
     USER_THREADS("user-threads", PrimitiveType.NON_NEGATIVE_INTEGER);
 
-    public final PrimitiveType type;
+    public final TargetPropertyType type;
 
     private final String description;
 
-    PlatformOption(String alias, PrimitiveType type) {
+    PlatformOption(String alias, TargetPropertyType type) {
       this.description = alias;
       this.type = type;
     }
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 5d9267ddfb..da67f16812 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -56,6 +56,7 @@
 import org.lflang.target.property.type.ArrayType;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.DictionaryType.DictionaryElement;
+import org.lflang.target.property.type.PlatformType;
 import org.lflang.target.property.type.PlatformType.Platform;
 import org.lflang.target.property.type.PrimitiveType;
 import org.lflang.target.property.type.StringDictionaryType;
@@ -1623,12 +1624,12 @@ public void checkPlatformProperty() throws Exception {
         createModel(new PlatformProperty(), "foobar"),
         LfPackage.eINSTANCE.getKeyValuePair(),
         null,
-        PlatformProperty.UNKNOWN_PLATFORM);
+        new PlatformType().toString());
     validator.assertError(
         createModel(new PlatformProperty(), "{ name: foobar }"),
-        LfPackage.eINSTANCE.getKeyValuePair(),
+        LfPackage.eINSTANCE.getElement(),
         null,
-        PlatformProperty.UNKNOWN_PLATFORM);
+        new PlatformType().toString());
   }
 
   @Test

From 52e2c4266e68d2093fd88ac231b42f44df50e7fe Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 4 Oct 2023 10:18:00 +0200
Subject: [PATCH 0985/1114] use regular font for reaction names

---
 .../diagram/synthesis/styles/LinguaFrancaShapeExtensions.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java b/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
index 379e07afc3..27c1af4cc3 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
@@ -423,7 +423,9 @@ public KPolygon addReactionFigure(KNode node, ReactionInstance reaction) {
     }
     if (!StringExtensions.isNullOrEmpty(reactionText)) {
       KText textToAdd = _kContainerRenderingExtensions.addText(contentContainer, reactionText);
-      _kRenderingExtensions.setFontBold(textToAdd, true);
+      if (!getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTION_NAMES)) {
+        _kRenderingExtensions.setFontBold(textToAdd, true);
+      }
       _linguaFrancaStyleExtensions.noSelectionStyle(textToAdd);
       DiagramSyntheses.suppressSelectability(textToAdd);
     }

From 375dbc91a8944c308831bc8747577f91919ebc24 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Wed, 4 Oct 2023 11:28:04 +0200
Subject: [PATCH 0986/1114] Rename C scheduler target property to SCHED_NP,
 SCHED_ADAPTIVE etc and remove deprecated C schedulers

---
 cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java   |  6 +++---
 .../java/org/lflang/tests/runtime/CSchedulerTest.java  |  2 +-
 core/src/main/java/org/lflang/TargetProperty.java      | 10 ++++------
 .../main/java/org/lflang/generator/c/CGenerator.java   |  4 ++--
 test/C/src/federated/DistributedCountDecentralized.lf  |  3 ++-
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java b/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java
index fd65ffad78..453f3417fd 100644
--- a/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java
+++ b/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java
@@ -77,7 +77,7 @@ public class LfcCliTest {
                 "quiet": true,
                 "rti": "path/to/rti",
                 "runtime-version": "rs",
-                "scheduler": "GEDF_NP",
+                "scheduler": "SCHED_GEDF_NP",
                 "threading": false,
                 "workers": "1"
             }
@@ -257,7 +257,7 @@ public void verifyGeneratorArgs(Path tempDir, String[] args) {
                   properties.getProperty(BuildParm.RTI.getKey()),
                   "path" + File.separator + "to" + File.separator + "rti");
               assertEquals(properties.getProperty(BuildParm.RUNTIME_VERSION.getKey()), "rs");
-              assertEquals(properties.getProperty(BuildParm.SCHEDULER.getKey()), "GEDF_NP");
+              assertEquals(properties.getProperty(BuildParm.SCHEDULER.getKey()), "SCHED_GEDF_NP");
               assertEquals(properties.getProperty(BuildParm.THREADING.getKey()), "false");
               assertEquals(properties.getProperty(BuildParm.WORKERS.getKey()), "1");
             });
@@ -292,7 +292,7 @@ public void testGeneratorArgs(@TempDir Path tempDir) throws IOException {
       "--runtime-version",
       "rs",
       "--scheduler",
-      "GEDF_NP",
+      "SCHED_GEDF_NP",
       "--threading",
       "false",
       "--workers",
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
index fd2345723f..9fd3ef5407 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
@@ -18,7 +18,7 @@ public CSchedulerTest() {
   /**
    * Swap the default runtime scheduler with other supported versions and run all the supported
    * tests. Only run tests for a specific non-default scheduler if specified using a system property
-   * (e.g., -Dscheduler=GEDF_NP).
+   * (e.g., -Dscheduler=SCHED_GEDF_NP).
    */
   @Test
   public void runWithNonDefaultSchedulers() {
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index d494e1d760..e5cdb06bec 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -1789,17 +1789,15 @@ public boolean isMultiThreaded() {
    * @author Soroush Bateni
    */
   public enum SchedulerOption {
-    NP(false), // Non-preemptive
-    ADAPTIVE(
+    SCHED_NP(false), // Non-preemptive
+    SCHED_ADAPTIVE(
         false,
         List.of(
             Path.of("scheduler_adaptive.c"),
             Path.of("worker_assignments.h"),
             Path.of("worker_states.h"),
             Path.of("data_collection.h"))),
-    GEDF_NP(true), // Global EDF non-preemptive
-    GEDF_NP_CI(true); // Global EDF non-preemptive with chain ID
-    // PEDF_NP(true);    // Partitioned EDF non-preemptive (FIXME: To be re-added in a future PR)
+    SCHED_GEDF_NP(true); // Global EDF non-preemptive
 
     /** Indicate whether or not the scheduler prioritizes reactions by deadline. */
     private final boolean prioritizesDeadline;
@@ -1828,7 +1826,7 @@ public List<Path> getRelativePaths() {
     }
 
     public static SchedulerOption getDefault() {
-      return NP;
+      return SCHED_NP;
     }
   }
 
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index f6faa499a2..56edf0fd2f 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -693,12 +693,12 @@ protected String getConflictingConnectionsInModalReactorsBody(String source, Str
   /** Set the scheduler type in the target config as needed. */
   private void pickScheduler() {
     // Don't use a scheduler that does not prioritize reactions based on deadlines
-    // if the program contains a deadline (handler). Use the GEDF_NP scheduler instead.
+    // if the program contains a deadline (handler). Use the SCHED_GEDF_NP scheduler instead.
     if (!targetConfig.schedulerType.prioritizesDeadline()) {
       // Check if a deadline is assigned to any reaction
       if (hasDeadlines(reactors)) {
         if (!targetConfig.setByUser.contains(TargetProperty.SCHEDULER)) {
-          targetConfig.schedulerType = TargetProperty.SchedulerOption.GEDF_NP;
+          targetConfig.schedulerType = TargetProperty.SchedulerOption.SCHED_GEDF_NP;
         }
       }
     }
diff --git a/test/C/src/federated/DistributedCountDecentralized.lf b/test/C/src/federated/DistributedCountDecentralized.lf
index b06f56fb9b..e24e1c880a 100644
--- a/test/C/src/federated/DistributedCountDecentralized.lf
+++ b/test/C/src/federated/DistributedCountDecentralized.lf
@@ -10,7 +10,8 @@ target C {
   clock-sync: on,
   clock-sync-options: {
     local-federates-on: true
-  }
+  },
+  scheduler: SCHED_ADAPTIVE
 }
 
 import Count from "../lib/Count.lf"

From acb2151ae314aa418cf82efb8c3dcc3c0de5accf Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Wed, 4 Oct 2023 11:33:30 +0200
Subject: [PATCH 0987/1114] On a second thought. Keep oringal name, prepend
 with SCHED in the compile def

---
 cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java      | 6 +++---
 .../java/org/lflang/tests/runtime/CSchedulerTest.java     | 2 +-
 core/src/main/java/org/lflang/TargetProperty.java         | 8 ++++----
 core/src/main/java/org/lflang/generator/c/CGenerator.java | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java b/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java
index 453f3417fd..fd65ffad78 100644
--- a/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java
+++ b/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java
@@ -77,7 +77,7 @@ public class LfcCliTest {
                 "quiet": true,
                 "rti": "path/to/rti",
                 "runtime-version": "rs",
-                "scheduler": "SCHED_GEDF_NP",
+                "scheduler": "GEDF_NP",
                 "threading": false,
                 "workers": "1"
             }
@@ -257,7 +257,7 @@ public void verifyGeneratorArgs(Path tempDir, String[] args) {
                   properties.getProperty(BuildParm.RTI.getKey()),
                   "path" + File.separator + "to" + File.separator + "rti");
               assertEquals(properties.getProperty(BuildParm.RUNTIME_VERSION.getKey()), "rs");
-              assertEquals(properties.getProperty(BuildParm.SCHEDULER.getKey()), "SCHED_GEDF_NP");
+              assertEquals(properties.getProperty(BuildParm.SCHEDULER.getKey()), "GEDF_NP");
               assertEquals(properties.getProperty(BuildParm.THREADING.getKey()), "false");
               assertEquals(properties.getProperty(BuildParm.WORKERS.getKey()), "1");
             });
@@ -292,7 +292,7 @@ public void testGeneratorArgs(@TempDir Path tempDir) throws IOException {
       "--runtime-version",
       "rs",
       "--scheduler",
-      "SCHED_GEDF_NP",
+      "GEDF_NP",
       "--threading",
       "false",
       "--workers",
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
index 9fd3ef5407..fd2345723f 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
@@ -18,7 +18,7 @@ public CSchedulerTest() {
   /**
    * Swap the default runtime scheduler with other supported versions and run all the supported
    * tests. Only run tests for a specific non-default scheduler if specified using a system property
-   * (e.g., -Dscheduler=SCHED_GEDF_NP).
+   * (e.g., -Dscheduler=GEDF_NP).
    */
   @Test
   public void runWithNonDefaultSchedulers() {
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index e5cdb06bec..721de639b8 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -1789,15 +1789,15 @@ public boolean isMultiThreaded() {
    * @author Soroush Bateni
    */
   public enum SchedulerOption {
-    SCHED_NP(false), // Non-preemptive
-    SCHED_ADAPTIVE(
+    NP(false), // Non-preemptive
+    ADAPTIVE(
         false,
         List.of(
             Path.of("scheduler_adaptive.c"),
             Path.of("worker_assignments.h"),
             Path.of("worker_states.h"),
             Path.of("data_collection.h"))),
-    SCHED_GEDF_NP(true); // Global EDF non-preemptive
+    GEDF_NP(true); // Global EDF non-preemptive
 
     /** Indicate whether or not the scheduler prioritizes reactions by deadline. */
     private final boolean prioritizesDeadline;
@@ -1826,7 +1826,7 @@ public List<Path> getRelativePaths() {
     }
 
     public static SchedulerOption getDefault() {
-      return SCHED_NP;
+      return NP;
     }
   }
 
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 56edf0fd2f..0800f237b9 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -693,12 +693,12 @@ protected String getConflictingConnectionsInModalReactorsBody(String source, Str
   /** Set the scheduler type in the target config as needed. */
   private void pickScheduler() {
     // Don't use a scheduler that does not prioritize reactions based on deadlines
-    // if the program contains a deadline (handler). Use the SCHED_GEDF_NP scheduler instead.
+    // if the program contains a deadline (handler). Use the GEDF_NP scheduler instead.
     if (!targetConfig.schedulerType.prioritizesDeadline()) {
       // Check if a deadline is assigned to any reaction
       if (hasDeadlines(reactors)) {
         if (!targetConfig.setByUser.contains(TargetProperty.SCHEDULER)) {
-          targetConfig.schedulerType = TargetProperty.SchedulerOption.SCHED_GEDF_NP;
+          targetConfig.schedulerType = TargetProperty.SchedulerOption.GEDF_NP;
         }
       }
     }
@@ -2011,7 +2011,7 @@ protected void setUpGeneralParameters() {
     if (targetConfig.threading) { // FIXME: This logic is duplicated in CMake
       pickScheduler();
       // FIXME: this and pickScheduler should be combined.
-      targetConfig.compileDefinitions.put("SCHEDULER", targetConfig.schedulerType.name());
+      targetConfig.compileDefinitions.put("SCHEDULER", "SCHED_" + targetConfig.schedulerType.name());
       targetConfig.compileDefinitions.put(
           "NUMBER_OF_WORKERS", String.valueOf(targetConfig.workers));
     }

From 81ab060b03c57929c4349b94b5c6926b0f43b82b Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Wed, 4 Oct 2023 11:34:40 +0200
Subject: [PATCH 0988/1114] Bump reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index f0bd1bc653..42e9c29c65 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit f0bd1bc6533e4b47f2af9d4e9d8613fa5e670be0
+Subproject commit 42e9c29c659072d12c7fda99af95a556f08fb208

From b5219a24476d7be4872ab2996c7121fe342edb17 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Wed, 4 Oct 2023 11:44:24 +0200
Subject: [PATCH 0989/1114] Spotless and improvement

---
 core/src/main/java/org/lflang/TargetProperty.java         | 4 ++++
 core/src/main/java/org/lflang/generator/c/CGenerator.java | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 721de639b8..23fb078797 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -1828,6 +1828,10 @@ public List<Path> getRelativePaths() {
     public static SchedulerOption getDefault() {
       return NP;
     }
+
+    public String getSchedulerCompileDef() {
+      return "SCHED_" + this.name();
+    }
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 0800f237b9..9eac554de4 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -2011,7 +2011,8 @@ protected void setUpGeneralParameters() {
     if (targetConfig.threading) { // FIXME: This logic is duplicated in CMake
       pickScheduler();
       // FIXME: this and pickScheduler should be combined.
-      targetConfig.compileDefinitions.put("SCHEDULER", "SCHED_" + targetConfig.schedulerType.name());
+      targetConfig.compileDefinitions.put(
+          "SCHEDULER", targetConfig.schedulerType.getSchedulerCompileDef());
       targetConfig.compileDefinitions.put(
           "NUMBER_OF_WORKERS", String.valueOf(targetConfig.workers));
     }

From bc6572120c3a335fe9ab71d92c7bfa343e5840f9 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Wed, 4 Oct 2023 11:44:33 +0200
Subject: [PATCH 0990/1114] Spotless

---
 test/C/src/federated/DistributedCountDecentralized.lf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/C/src/federated/DistributedCountDecentralized.lf b/test/C/src/federated/DistributedCountDecentralized.lf
index e24e1c880a..bd3d504ded 100644
--- a/test/C/src/federated/DistributedCountDecentralized.lf
+++ b/test/C/src/federated/DistributedCountDecentralized.lf
@@ -11,7 +11,7 @@ target C {
   clock-sync-options: {
     local-federates-on: true
   },
-  scheduler: SCHED_ADAPTIVE
+  scheduler: ADAPTIVE
 }
 
 import Count from "../lib/Count.lf"

From ebddf5d4bc6d43be148ae4e1724c5071b513e841 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Wed, 4 Oct 2023 13:45:59 +0200
Subject: [PATCH 0991/1114] reduce font size of reaction names

---
 .../synthesis/styles/LinguaFrancaShapeExtensions.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java b/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
index 27c1af4cc3..6e51969b40 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/styles/LinguaFrancaShapeExtensions.java
@@ -423,7 +423,11 @@ public KPolygon addReactionFigure(KNode node, ReactionInstance reaction) {
     }
     if (!StringExtensions.isNullOrEmpty(reactionText)) {
       KText textToAdd = _kContainerRenderingExtensions.addText(contentContainer, reactionText);
-      if (!getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTION_NAMES)) {
+      if (getBooleanValue(LinguaFrancaSynthesis.SHOW_REACTION_NAMES)) {
+        // show reaction names in normal font and slightly smaller (like port names)
+        _kRenderingExtensions.setFontSize(textToAdd, 8);
+      } else {
+        // show the reaction index in bold font
         _kRenderingExtensions.setFontBold(textToAdd, true);
       }
       _linguaFrancaStyleExtensions.noSelectionStyle(textToAdd);

From 66d2a7ed01a8330be440839b042f79ad5e9d09a2 Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Wed, 4 Oct 2023 17:33:45 +0200
Subject: [PATCH 0992/1114] diagrams: Properly initialized serializer for
 initialization assignments

Fixes #2029
---
 .../diagram/synthesis/LinguaFrancaSynthesis.java    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index fff1ccf873..fb04bb56b6 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -269,6 +269,12 @@ public class LinguaFrancaSynthesis extends AbstractDiagramSynthesis<Model> {
 
   public static final DisplayedActionData EXPAND_ALL =
       DisplayedActionData.create(ExpandAllReactorsAction.ID, "Show all Details");
+  
+  //-------------------------------------------------------------------------
+  
+  private final ToLf serializer = new ToLf();
+    
+  //-------------------------------------------------------------------------
 
   @Override
   public List<SynthesisOption> getDisplayedSynthesisOptions() {
@@ -314,6 +320,9 @@ public KNode transform(final Model model) {
     setLayoutOption(rootNode, CoreOptions.ALGORITHM, LayeredOptions.ALGORITHM_ID);
     setLayoutOption(rootNode, CoreOptions.DIRECTION, Direction.RIGHT);
     setLayoutOption(rootNode, CoreOptions.PADDING, new ElkPadding(0));
+    
+    // Set target for serializer
+    serializer.setTarget(ASTUtils.getTarget(model));
 
     try {
       // Find main
@@ -1491,7 +1500,7 @@ private String createParameterLabel(ParameterInstance param) {
     if (param.getOverride() != null) {
       b.append(" = ");
       var init = param.getActualValue();
-      b.append(new ToLf().doSwitch(init));
+      b.append(serializer.doSwitch(init));
     }
     return b.toString();
   }
@@ -1522,7 +1531,7 @@ private String createStateVariableLabel(StateVar variable) {
       b.append(":").append(t.toOriginalText());
     }
     if (variable.getInit() != null) {
-      b.append(new ToLf().doSwitch(variable.getInit()));
+      b.append(serializer.doSwitch(variable.getInit()));
     }
     return b.toString();
   }

From 6218f9325016a2ec7b0d6064721c20dd35f415cf Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Wed, 4 Oct 2023 17:46:55 +0200
Subject: [PATCH 0993/1114] diagrams: Fixed serialization of parameter
 initialization

Fixes #2010
---
 .../lflang/diagram/synthesis/LinguaFrancaSynthesis.java    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index fb04bb56b6..5d4d17288f 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -1495,11 +1495,10 @@ private String createParameterLabel(ParameterInstance param) {
     b.append(param.getName());
     String t = param.type.toOriginalText();
     if (!StringExtensions.isNullOrEmpty(t)) {
-      b.append(": ").append(t);
+      b.append(":").append(t);
     }
-    if (param.getOverride() != null) {
-      b.append(" = ");
-      var init = param.getActualValue();
+    var init = param.getActualValue();
+    if (init != null) {
       b.append(serializer.doSwitch(init));
     }
     return b.toString();

From 8da314784109c5b731d3a468b72eb98ba5ae3702 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 4 Oct 2023 14:29:06 -0700
Subject: [PATCH 0994/1114] Fix unit tests

---
 core/src/main/java/org/lflang/AbstractTargetProperty.java     | 2 +-
 .../org/lflang/tests/compiler/LinguaFrancaValidationTest.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/AbstractTargetProperty.java b/core/src/main/java/org/lflang/AbstractTargetProperty.java
index cdef9ddce6..5a64918e3d 100644
--- a/core/src/main/java/org/lflang/AbstractTargetProperty.java
+++ b/core/src/main/java/org/lflang/AbstractTargetProperty.java
@@ -195,7 +195,7 @@ public T get() {
 
   public static List<AbstractTargetProperty> getAllTargetProperties(Object object) {
     var fields = object.getClass().getDeclaredFields();
-
+    // FIXME: also collect inherited properties.
     List<AbstractTargetProperty> properties =
         Arrays.stream(fields)
             .filter(f -> AbstractTargetProperty.class.isAssignableFrom(f.getType()))
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index da67f16812..695be5abee 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -1311,9 +1311,9 @@ public void recognizeHostNames() throws Exception {
                       LfPackage.eINSTANCE.getKeyValuePair(),
                       UnionType.PLATFORM_STRING_OR_DICTIONARY),
                   List.of(
-                      "{name: [1, 2, 3]}", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
+                      "{name: [1, 2, 3]}", LfPackage.eINSTANCE.getElement(), new PlatformType()),
                   List.of(
-                      "{name: {bar: baz}}", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
+                      "{name: {bar: baz}}", LfPackage.eINSTANCE.getElement(), new PlatformType()),
                   List.of(
                       "{board: [1, 2, 3]}", LfPackage.eINSTANCE.getElement(), PrimitiveType.STRING),
                   List.of(

From 902aa010fa10b8ea35c04b5621f8d08255346ee2 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 4 Oct 2023 21:10:22 -0700
Subject: [PATCH 0995/1114] Redesign based on feedback from @oowekyala

---
 .../lflang/tests/runtime/CVerifierTest.java   |   3 +-
 .../org/lflang/tests/runtime/CppRos2Test.java |   3 +-
 .../org/lflang/AbstractTargetProperty.java    |  21 --
 .../main/java/org/lflang/ast/ASTUtils.java    |   7 +-
 .../federated/extensions/CExtension.java      |  22 +-
 .../federated/extensions/CExtensionUtils.java |  63 +++--
 .../federated/extensions/TSExtension.java     |   7 +-
 .../federated/generator/FedFileConfig.java    |   9 +-
 .../federated/generator/FedGenerator.java     |  25 +-
 .../federated/generator/FedTargetConfig.java  |   6 +-
 .../launcher/FedLauncherGenerator.java        |  28 ++-
 .../FedROS2CPPSerialization.java              |   3 +-
 .../org/lflang/generator/GeneratorBase.java   |   9 +-
 .../org/lflang/generator/GeneratorUtils.java  |   9 +-
 .../lflang/generator/c/CCmakeGenerator.java   |  64 ++---
 .../org/lflang/generator/c/CCompiler.java     |  46 ++--
 .../lflang/generator/c/CDockerGenerator.java  |  11 +-
 .../c/CEnvironmentFunctionGenerator.java      |   3 +-
 .../org/lflang/generator/c/CGenerator.java    | 165 +++++++-----
 .../generator/c/CMainFunctionGenerator.java   |  22 +-
 .../generator/c/CPreambleGenerator.java       |  37 +--
 .../generator/c/CTriggerObjectsGenerator.java |   6 +-
 .../java/org/lflang/generator/c/CUtil.java    |   6 +-
 .../generator/python/PythonGenerator.java     |   9 +-
 .../generator/rust/RustTargetConfig.java      |  30 +--
 .../java/org/lflang/target/TargetConfig.java  | 235 ++++++------------
 .../org/lflang/target/TargetProperty.java     |   8 +-
 .../property/BuildCommandsProperty.java       |   6 +-
 .../property/ClockSyncModeProperty.java       |   2 +-
 .../property/CompileDefinitionsProperty.java  |   7 +-
 .../property/CompilerFlagsProperty.java       |   2 +-
 .../target/property/CompilerProperty.java     |   2 +-
 .../target/property/CoordinationProperty.java |   5 +-
 .../ExportDependencyGraphProperty.java        |   5 +-
 .../target/property/ExportToYamlProperty.java |   6 +-
 .../property/ExternalRuntimePathProperty.java |   5 +-
 .../lflang/target/property/FastProperty.java  |   5 +-
 .../target/property/KeepaliveProperty.java    |   4 +-
 .../target/property/LoggingProperty.java      |   5 +-
 .../target/property/NoCompileProperty.java    |   2 +-
 .../property/NoRuntimeValidationProperty.java |   2 +-
 .../property/PrintStatisticsProperty.java     |   2 +-
 .../lflang/target/property/Ros2Property.java  |   2 +-
 .../target/property/SchedulerProperty.java    |   2 +-
 .../target/property/TimeOutProperty.java      |   2 +-
 .../target/property/TracingProperty.java      |   2 +-
 .../target/property/VerifyProperty.java       |   2 +-
 .../target/property/WorkersProperty.java      |   5 +-
 .../java/org/lflang/util/ArduinoUtil.java     |  15 +-
 .../org/lflang/generator/cpp/CppGenerator.kt  |  21 +-
 .../generator/cpp/CppPlatformGenerator.kt     |  15 +-
 .../generator/cpp/CppRos2NodeGenerator.kt     |   9 +-
 .../generator/cpp/CppRos2PackageGenerator.kt  |  12 +-
 .../cpp/CppStandaloneCmakeGenerator.kt        |  14 +-
 .../generator/cpp/CppStandaloneGenerator.kt   |  10 +-
 .../cpp/CppStandaloneMainGenerator.kt         |  17 +-
 .../lflang/generator/rust/RustGenerator.kt    |  16 +-
 .../org/lflang/generator/rust/RustModel.kt    |  47 ++--
 .../generator/ts/TSConstructorGenerator.kt    |   3 +-
 .../org/lflang/generator/ts/TSGenerator.kt    |  15 +-
 .../ts/TSParameterPreambleGenerator.kt        |  12 +-
 .../compiler/LinguaFrancaValidationTest.java  |   2 +-
 .../java/org/lflang/tests/Configurators.java  |  21 +-
 .../java/org/lflang/tests/TestBase.java       |   3 +-
 64 files changed, 618 insertions(+), 546 deletions(-)

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
index 4ac734d314..7140eca72f 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
@@ -4,6 +4,7 @@
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.lflang.Target;
+import org.lflang.target.property.type.VerifyProperty;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry;
 
@@ -21,7 +22,7 @@ public void runVerifierTests() {
         Message.DESC_VERIFIER,
         TestRegistry.TestCategory.VERIFIER::equals,
         test -> {
-          test.getContext().getTargetConfig().verify.override(true);
+          test.getContext().getTargetConfig().override(new VerifyProperty(), true);
           return true;
         },
         TestLevel.BUILD,
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
index a0ad550577..427eb07650 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
@@ -5,6 +5,7 @@
 import org.lflang.Target;
 import org.lflang.lf.Element;
 import org.lflang.lf.LfFactory;
+import org.lflang.target.property.Ros2Property;
 import org.lflang.tests.TestBase;
 
 /**
@@ -30,7 +31,7 @@ public void runWithRos2() {
         Message.DESC_ROS2,
         it -> true,
         it -> {
-          it.getContext().getTargetConfig().ros2.override(true);
+          it.getContext().getTargetConfig().override(new Ros2Property(), true);
           return true;
         },
         TestLevel.EXECUTION,
diff --git a/core/src/main/java/org/lflang/AbstractTargetProperty.java b/core/src/main/java/org/lflang/AbstractTargetProperty.java
index 5a64918e3d..9b854a660e 100644
--- a/core/src/main/java/org/lflang/AbstractTargetProperty.java
+++ b/core/src/main/java/org/lflang/AbstractTargetProperty.java
@@ -1,8 +1,6 @@
 package org.lflang;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
@@ -192,23 +190,4 @@ public T get() {
 
   /** Return the name of this target property (in kebab case). */
   public abstract String name();
-
-  public static List<AbstractTargetProperty> getAllTargetProperties(Object object) {
-    var fields = object.getClass().getDeclaredFields();
-    // FIXME: also collect inherited properties.
-    List<AbstractTargetProperty> properties =
-        Arrays.stream(fields)
-            .filter(f -> AbstractTargetProperty.class.isAssignableFrom(f.getType()))
-            .map(
-                f -> {
-                  try {
-                    return (AbstractTargetProperty) f.get(object);
-                  } catch (IllegalAccessException e) {
-                    throw new RuntimeException(e);
-                  }
-                })
-            .collect(Collectors.toList());
-
-    return properties;
-  }
 }
diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index d30dae6189..59189f1d24 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -102,6 +102,7 @@
 import org.lflang.lf.WidthSpec;
 import org.lflang.lf.WidthTerm;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.property.CompileDefinitionsProperty;
 import org.lflang.util.StringUtil;
 
 /**
@@ -614,8 +615,10 @@ public static ReactorInstance createMainReactorInstance(
       if (breadth == 0) {
         messageReporter.nowhere().warning("The program has no reactions");
       } else {
-        targetConfig.compileDefinitions.put(
-            "LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth()));
+        // FIXME: not marking the property as set!
+        targetConfig
+            .get(new CompileDefinitionsProperty())
+            .put("LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth()));
       }
       return main;
     }
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index eafc0ae68b..955b561071 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -56,6 +56,12 @@
 import org.lflang.lf.Port;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
+import org.lflang.target.property.ClockSyncOptionsProperty;
+import org.lflang.target.property.CoordinationOptionsProperty;
+import org.lflang.target.property.CoordinationProperty;
+import org.lflang.target.property.FedSetupProperty;
+import org.lflang.target.property.KeepaliveProperty;
+import org.lflang.target.property.ThreadingProperty;
 import org.lflang.target.property.type.CoordinationModeType.CoordinationMode;
 
 /**
@@ -81,16 +87,16 @@ public void initializeTargetConfig(
 
     generateCMakeInclude(federate, fileConfig);
 
-    federate.targetConfig.keepalive.override(true);
+    federate.targetConfig.override(new KeepaliveProperty(), true);
 
     // If there are federates, copy the required files for that.
     // Also, create the RTI C file and the launcher script.
     // Handle target parameters.
     // If the program is federated, then ensure that threading is enabled.
-    federate.targetConfig.threading.override(true);
+    federate.targetConfig.override(new ThreadingProperty(), true);
 
     // Include the fed setup file for this federate in the target property
-    federate.targetConfig.fedSetupPreamble.override(getPreamblePath(federate));
+    federate.targetConfig.override(new FedSetupProperty(), getPreamblePath(federate));
   }
 
   /** Generate a cmake-include file for {@code federate} if needed. */
@@ -676,7 +682,7 @@ private String generateCodeToInitializeFederate(FederateInstance federate, RtiCo
                 "lf_cond_init(&logical_time_changed, &env->mutex);")));
 
     // Find the STA (A.K.A. the global STP offset) for this federate.
-    if (federate.targetConfig.coordination.get() == CoordinationMode.DECENTRALIZED) {
+    if (federate.targetConfig.get(new CoordinationProperty()) == CoordinationMode.DECENTRALIZED) {
       var reactor = ASTUtils.toDefinition(federate.instantiation.getReactorClass());
       var stpParam =
           reactor.getParameters().stream()
@@ -736,12 +742,12 @@ private String generateCodeToInitializeFederate(FederateInstance federate, RtiCo
     }
 
     // If a test clock offset has been specified, insert code to set it here.
-    if (federate.targetConfig.clockSyncOptions.get().testOffset != null) {
+    if (federate.targetConfig.get(new ClockSyncOptionsProperty()).testOffset != null) {
       code.pr(
           "lf_set_physical_clock_offset((1 + "
               + federate.id
               + ") * "
-              + federate.targetConfig.clockSyncOptions.get().testOffset.toNanoSeconds()
+              + federate.targetConfig.get(new ClockSyncOptionsProperty()).testOffset.toNanoSeconds()
               + "LL);");
     }
 
@@ -796,8 +802,8 @@ private String generateCodeToInitializeFederate(FederateInstance federate, RtiCo
   private String generateCodeForPhysicalActions(
       FederateInstance federate, MessageReporter messageReporter) {
     CodeBuilder code = new CodeBuilder();
-    var coordinationMode = federate.targetConfig.coordination.get();
-    var coordinationOptions = federate.targetConfig.coordinationOptions.get();
+    var coordinationMode = federate.targetConfig.get(new CoordinationProperty());
+    var coordinationOptions = federate.targetConfig.get(new CoordinationOptionsProperty());
     if (coordinationMode.equals(CoordinationMode.CENTRALIZED)) {
       // If this program uses centralized coordination then check
       // for outputs that depend on physical actions so that null messages can be
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 2903977c1e..7f17673d28 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -22,7 +22,15 @@
 import org.lflang.lf.Expression;
 import org.lflang.lf.Input;
 import org.lflang.lf.ParameterReference;
+import org.lflang.target.property.AuthProperty;
+import org.lflang.target.property.ClockSyncModeProperty;
+import org.lflang.target.property.ClockSyncOptionsProperty;
 import org.lflang.target.property.ClockSyncOptionsProperty.ClockSyncOptions;
+import org.lflang.target.property.CmakeIncludeProperty;
+import org.lflang.target.property.CompileDefinitionsProperty;
+import org.lflang.target.property.CompilerFlagsProperty;
+import org.lflang.target.property.CoordinationOptionsProperty;
+import org.lflang.target.property.CoordinationProperty;
 import org.lflang.target.property.type.ClockSyncModeType.ClockSyncMode;
 
 public class CExtensionUtils {
@@ -172,13 +180,14 @@ public static void handleCompileDefinitions(
       int numOfFederates,
       RtiConfig rtiConfig,
       MessageReporter messageReporter) {
-    var definitions = federate.targetConfig.compileDefinitions;
+    var definitions = federate.targetConfig.get(new CompileDefinitionsProperty());
     definitions.put("FEDERATED", "");
     definitions.put(
         String.format(
-            "FEDERATED_%s", federate.targetConfig.coordination.get().toString().toUpperCase()),
+            "FEDERATED_%s",
+            federate.targetConfig.get(new CoordinationProperty()).toString().toUpperCase()),
         "");
-    if (federate.targetConfig.auth.get()) {
+    if (federate.targetConfig.get(new AuthProperty())) {
       definitions.put("FEDERATED_AUTHENTICATED", "");
     }
     definitions.put("NUMBER_OF_FEDERATES", String.valueOf(numOfFederates));
@@ -191,17 +200,19 @@ public static void handleCompileDefinitions(
 
   private static void handleAdvanceMessageInterval(FederateInstance federate) {
     var advanceMessageInterval =
-        federate.targetConfig.coordinationOptions.get().advanceMessageInterval;
+        federate.targetConfig.get(new CoordinationOptionsProperty()).advanceMessageInterval;
     if (advanceMessageInterval != null) {
-      federate.targetConfig.compileDefinitions.put(
-          "ADVANCE_MESSAGE_INTERVAL", String.valueOf(advanceMessageInterval.toNanoSeconds()));
+      federate
+          .targetConfig
+          .get(new CompileDefinitionsProperty())
+          .put("ADVANCE_MESSAGE_INTERVAL", String.valueOf(advanceMessageInterval.toNanoSeconds()));
     }
   }
 
   static boolean clockSyncIsOn(FederateInstance federate, RtiConfig rtiConfig) {
-    return federate.targetConfig.clockSync.get() != ClockSyncMode.OFF
+    return federate.targetConfig.get(new ClockSyncModeProperty()) != ClockSyncMode.OFF
         && (!rtiConfig.getHost().equals(federate.host)
-            || federate.targetConfig.clockSyncOptions.get().localFederatesOn);
+            || federate.targetConfig.get(new ClockSyncOptionsProperty()).localFederatesOn);
   }
 
   /**
@@ -219,13 +230,16 @@ public static void initializeClockSynchronization(
       messageReporter
           .nowhere()
           .info("Initial clock synchronization is enabled for federate " + federate.id);
-      if (federate.targetConfig.clockSync.get() == ClockSyncMode.ON) {
-        if (federate.targetConfig.clockSyncOptions.get().collectStats) {
+      if (federate.targetConfig.get(new ClockSyncModeProperty()) == ClockSyncMode.ON) {
+        if (federate.targetConfig.get(new ClockSyncOptionsProperty()).collectStats) {
           messageReporter
               .nowhere()
               .info("Will collect clock sync statistics for federate " + federate.id);
           // Add libm to the compiler flags
-          federate.targetConfig.compilerFlags.add("-lm");
+          federate
+              .targetConfig
+              .get(new CompilerFlagsProperty())
+              .add("-lm"); // FIXME: add without marking as set
         }
         messageReporter
             .nowhere()
@@ -246,21 +260,18 @@ public static void initializeClockSynchronization(
    */
   public static void addClockSyncCompileDefinitions(FederateInstance federate) {
 
-    ClockSyncMode mode = federate.targetConfig.clockSync.get();
-    ClockSyncOptions options = federate.targetConfig.clockSyncOptions.get();
-
-    federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_INITIAL", "");
-    federate.targetConfig.compileDefinitions.put(
-        "_LF_CLOCK_SYNC_PERIOD_NS", String.valueOf(options.period.toNanoSeconds()));
-    federate.targetConfig.compileDefinitions.put(
-        "_LF_CLOCK_SYNC_EXCHANGES_PER_INTERVAL", String.valueOf(options.trials));
-    federate.targetConfig.compileDefinitions.put(
-        "_LF_CLOCK_SYNC_ATTENUATION", String.valueOf(options.attenuation));
+    ClockSyncMode mode = federate.targetConfig.get(new ClockSyncModeProperty());
+    ClockSyncOptions options = federate.targetConfig.get(new ClockSyncOptionsProperty());
+    final var defs = federate.targetConfig.get(new CompileDefinitionsProperty());
+    defs.put("_LF_CLOCK_SYNC_INITIAL", "");
+    defs.put("_LF_CLOCK_SYNC_PERIOD_NS", String.valueOf(options.period.toNanoSeconds()));
+    defs.put("_LF_CLOCK_SYNC_EXCHANGES_PER_INTERVAL", String.valueOf(options.trials));
+    defs.put("_LF_CLOCK_SYNC_ATTENUATION", String.valueOf(options.attenuation));
 
     if (mode == ClockSyncMode.ON) {
-      federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_ON", "");
+      defs.put("_LF_CLOCK_SYNC_ON", "");
       if (options.collectStats) {
-        federate.targetConfig.compileDefinitions.put("_LF_CLOCK_SYNC_COLLECT_STATS", "");
+        defs.put("_LF_CLOCK_SYNC_COLLECT_STATS", ""); // FIXME: more puts
       }
     }
   }
@@ -287,8 +298,10 @@ public static void generateCMakeInclude(FederateInstance federate, FedFileConfig
       srcWriter.write(cmakeIncludeCode.getCode());
     }
 
-    federate.targetConfig.cmakeIncludes.add(
-        fileConfig.getSrcPath().relativize(cmakeIncludePath).toString());
+    federate
+        .targetConfig
+        .get(new CmakeIncludeProperty())
+        .add(fileConfig.getSrcPath().relativize(cmakeIncludePath).toString());
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index e1b79de941..bf3337d913 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -25,6 +25,8 @@
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
 import org.lflang.lf.Variable;
+import org.lflang.target.property.CoordinationOptionsProperty;
+import org.lflang.target.property.CoordinationProperty;
 import org.lflang.target.property.type.CoordinationModeType.CoordinationMode;
 
 public class TSExtension implements FedTargetExtension {
@@ -199,7 +201,7 @@ public String generatePreamble(
   }
 
   private TimeValue getMinOutputDelay(FederateInstance federate, MessageReporter messageReporter) {
-    if (federate.targetConfig.coordination.get() == CoordinationMode.CENTRALIZED) {
+    if (federate.targetConfig.get(new CoordinationProperty()) == CoordinationMode.CENTRALIZED) {
       // If this program uses centralized coordination then check
       // for outputs that depend on physical actions so that null messages can be
       // sent to the RTI.
@@ -222,7 +224,8 @@ private TimeValue getMinOutputDelay(FederateInstance federate, MessageReporter m
       }
       if (minOutputDelay != TimeValue.MAX_VALUE) {
         // Unless silenced, issue a warning.
-        if (federate.targetConfig.coordinationOptions.get().advanceMessageInterval == null) {
+        if (federate.targetConfig.get(new CoordinationOptionsProperty()).advanceMessageInterval
+            == null) {
           String message =
               String.join(
                   "\n",
diff --git a/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java b/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
index 00e49baa7d..f23d0c7a81 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
@@ -32,6 +32,9 @@
 import java.util.List;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.lflang.FileConfig;
+import org.lflang.target.property.CmakeIncludeProperty;
+import org.lflang.target.property.FilesProperty;
+import org.lflang.target.property.ProtobufsProperty;
 import org.lflang.util.FileUtil;
 
 /**
@@ -100,9 +103,9 @@ public void doClean() throws IOException {
    * the generated .lf file for the federate.
    */
   public void relativizePaths(FedTargetConfig targetConfig) {
-    relativizePathList(targetConfig.protoFiles.get());
-    relativizePathList(targetConfig.files.get());
-    relativizePathList(targetConfig.cmakeIncludes.get());
+    relativizePathList(targetConfig.get(new ProtobufsProperty()));
+    relativizePathList(targetConfig.get(new FilesProperty()));
+    relativizePathList(targetConfig.get(new CmakeIncludeProperty()));
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 168bb0a8fd..afa7e30627 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -58,6 +58,10 @@
 import org.lflang.lf.TargetDecl;
 import org.lflang.lf.VarRef;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.property.CoordinationProperty;
+import org.lflang.target.property.DockerProperty;
+import org.lflang.target.property.KeepaliveProperty;
+import org.lflang.target.property.NoCompileProperty;
 import org.lflang.target.property.type.CoordinationModeType.CoordinationMode;
 import org.lflang.util.Averager;
 
@@ -121,7 +125,7 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
     // In a federated execution, we need keepalive to be true,
     // otherwise a federate could exit simply because it hasn't received
     // any messages.
-    targetConfig.keepalive.override(true);
+    targetConfig.override(new KeepaliveProperty(), true);
 
     // Process command-line arguments
     processCLIArguments(context);
@@ -153,7 +157,7 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
     }
 
     // Do not invoke target code generators if --no-compile flag is used.
-    if (context.getTargetConfig().noCompile.get()) {
+    if (context.getTargetConfig().get(new NoCompileProperty())) {
       context.finish(Status.GENERATED, lf2lfCodeMapMap);
       return false;
     }
@@ -193,14 +197,13 @@ private void generateLaunchScript() {
    * @param subContexts The subcontexts in which the federates have been compiled.
    */
   private void createDockerFiles(LFGeneratorContext context, List<SubContext> subContexts) {
-    if (!context.getTargetConfig().dockerOptions.get().enabled) return;
+    if (!context.getTargetConfig().get(new DockerProperty()).enabled) return;
     final List<DockerData> services = new ArrayList<>();
     // 1. create a Dockerfile for each federate
     for (SubContext subContext : subContexts) { // Inherit Docker options from main context
       subContext
           .getTargetConfig()
-          .dockerOptions
-          .override(context.getTargetConfig().dockerOptions.get());
+          .override(new DockerProperty(), context.getTargetConfig().get(new DockerProperty()));
       var dockerGenerator = dockerGeneratorFactory(subContext);
       var dockerData = dockerGenerator.generateDockerData();
       try {
@@ -298,11 +301,11 @@ private Map<Path, CodeMap> compileFederates(
                     new Properties(),
                     GeneratorUtils.findTargetDecl(subFileConfig.resource),
                     subContextMessageReporter);
-            if (targetConfig.dockerOptions.get().enabled
+            if (targetConfig.get(new DockerProperty()).enabled
                 && targetConfig.target.buildsUsingDocker()) {
-              subConfig.noCompile.override(true);
+              subConfig.override(new NoCompileProperty(), true);
             }
-            subConfig.dockerOptions.get().enabled = false;
+            subConfig.get(new DockerProperty()).enabled = false;
 
             SubContext subContext =
                 new SubContext(context, IntegratedBuilder.VALIDATED_PERCENT_PROGRESS, 100) {
@@ -420,7 +423,7 @@ private void analyzeFederates(Reactor federation, LFGeneratorContext context) {
       rtiConfig.setHost(federation.getHost().getAddr());
     }
     // If the federation is dockerized, use "rti" as the hostname.
-    if (rtiConfig.getHost().equals("localhost") && targetConfig.dockerOptions.get().enabled) {
+    if (rtiConfig.getHost().equals("localhost") && targetConfig.get(new DockerProperty()).enabled) {
       rtiConfig.setHost("rti");
     }
 
@@ -676,7 +679,7 @@ private void replaceOneToManyConnection(
    */
   private void replaceFedConnection(FedConnectionInstance connection, Resource resource) {
     if (!connection.getDefinition().isPhysical()
-        && targetConfig.coordination.get() != CoordinationMode.DECENTRALIZED) {
+        && targetConfig.get(new CoordinationProperty()) != CoordinationMode.DECENTRALIZED) {
       // Map the delays on connections between federates.
       Set<Expression> dependsOnDelays =
           connection.dstFederate.dependsOn.computeIfAbsent(
@@ -701,6 +704,6 @@ private void replaceFedConnection(FedConnectionInstance connection, Resource res
     }
 
     FedASTUtils.makeCommunication(
-        connection, resource, targetConfig.coordination.get(), messageReporter);
+        connection, resource, targetConfig.get(new CoordinationProperty()), messageReporter);
   }
 }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
index 705a2dbcec..008ee3f85c 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
@@ -9,6 +9,8 @@
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.target.TargetConfig;
 import org.lflang.target.TargetProperty;
+import org.lflang.target.property.ClockSyncModeProperty;
+import org.lflang.target.property.ClockSyncOptionsProperty;
 import org.lflang.util.FileUtil;
 
 /**
@@ -75,7 +77,7 @@ private Path getRelativePath(Resource source, Resource target) {
 
   /** Method for the removal of things that should not appear in the target config of a federate. */
   private void clearPropertiesToIgnore() {
-    this.clockSync.reset();
-    this.clockSyncOptions.reset();
+    this.reset(new ClockSyncModeProperty());
+    this.reset(new ClockSyncOptionsProperty());
   }
 }
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index 99e942a45c..8a8efbf0aa 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -37,6 +37,10 @@
 import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.property.AuthProperty;
+import org.lflang.target.property.ClockSyncModeProperty;
+import org.lflang.target.property.ClockSyncOptionsProperty;
+import org.lflang.target.property.TracingProperty;
 import org.lflang.target.property.type.ClockSyncModeType.ClockSyncMode;
 
 /**
@@ -334,22 +338,30 @@ private String getRtiCommand(List<FederateInstance> federates, boolean isRemote)
     } else {
       commands.add("RTI -i ${FEDERATION_ID} \\");
     }
-    if (targetConfig.auth.get()) {
+    if (targetConfig.get(new AuthProperty())) {
       commands.add("                        -a \\");
     }
-    if (targetConfig.tracing.get().isEnabled()) {
+    if (targetConfig.get(new TracingProperty()).isEnabled()) {
       commands.add("                        -t \\");
     }
     commands.addAll(
         List.of(
             "                        -n " + federates.size() + " \\",
-            "                        -c " + targetConfig.clockSync.get().toString() + " \\"));
-    if (targetConfig.clockSync.get().equals(ClockSyncMode.ON)) {
-      commands.add("period " + targetConfig.clockSyncOptions.get().period.toNanoSeconds() + " \\");
+            "                        -c "
+                + targetConfig.get(new ClockSyncModeProperty()).toString()
+                + " \\"));
+    if (targetConfig.get(new ClockSyncModeProperty()).equals(ClockSyncMode.ON)) {
+      commands.add(
+          "period "
+              + targetConfig.get(new ClockSyncOptionsProperty()).period.toNanoSeconds()
+              + " \\");
     }
-    if (targetConfig.clockSync.get().equals(ClockSyncMode.ON)
-        || targetConfig.clockSync.get().equals(ClockSyncMode.INIT)) {
-      commands.add("exchanges-per-interval " + targetConfig.clockSyncOptions.get().trials + " \\");
+    if (targetConfig.get(new ClockSyncModeProperty()).equals(ClockSyncMode.ON)
+        || targetConfig.get(new ClockSyncModeProperty()).equals(ClockSyncMode.INIT)) {
+      commands.add(
+          "exchanges-per-interval "
+              + targetConfig.get(new ClockSyncOptionsProperty()).trials
+              + " \\");
     }
     commands.add("&");
     return String.join("\n", commands);
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
index 48e9e2ec92..2dc54a235a 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
@@ -29,6 +29,7 @@
 
 import org.lflang.Target;
 import org.lflang.generator.GeneratorBase;
+import org.lflang.target.property.CompilerProperty;
 
 /**
  * Enables support for ROS 2 serialization in C/C++ code.
@@ -52,7 +53,7 @@ public boolean isCompatible(GeneratorBase generator) {
           .nowhere()
           .error("ROS serialization is currently only supported for the C target.");
       return false;
-    } else if (!generator.getTargetConfig().compiler.get().equalsIgnoreCase("g++")) {
+    } else if (!generator.getTargetConfig().get(new CompilerProperty()).equalsIgnoreCase("g++")) {
       generator
           .messageReporter
           .nowhere()
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 0ba80a494c..64e6e6aec6 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -61,6 +61,9 @@
 import org.lflang.lf.Reaction;
 import org.lflang.lf.Reactor;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.property.FilesProperty;
+import org.lflang.target.property.ThreadingProperty;
+import org.lflang.target.property.type.VerifyProperty;
 import org.lflang.util.FileUtil;
 import org.lflang.validation.AbstractLFValidator;
 
@@ -264,7 +267,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
 
     // Check for the existence and support of watchdogs
     hasWatchdogs = IterableExtensions.exists(reactors, it -> !it.getWatchdogs().isEmpty());
-    checkWatchdogSupport(targetConfig.threading.get() && getTarget() == Target.C);
+    checkWatchdogSupport(targetConfig.get(new ThreadingProperty()) && getTarget() == Target.C);
     additionalPostProcessingForModes();
   }
 
@@ -331,7 +334,7 @@ protected void setReactorsAndInstantiationGraph(LFGeneratorContext.Mode mode) {
   protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
     var dst = this.context.getFileConfig().getSrcGenPath();
     FileUtil.copyFilesOrDirectories(
-        targetConfig.files.get(), dst, fileConfig, messageReporter, false);
+        targetConfig.get(new FilesProperty()), dst, fileConfig, messageReporter, false);
   }
 
   /**
@@ -648,7 +651,7 @@ private void runVerifierIfPropertiesDetected(Resource resource, LFGeneratorConte
       uclidGenerator.doGenerate(resource, lfContext);
 
       // Check the generated uclid files.
-      if (uclidGenerator.targetConfig.verify.get()) {
+      if (uclidGenerator.targetConfig.get(new VerifyProperty())) {
 
         // Check if Uclid5 and Z3 are installed.
         if (commandFactory.createCommand("uclid", List.of()) == null
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index e2a6e89928..4ee4f070b2 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -24,6 +24,7 @@
 import org.lflang.lf.TargetDecl;
 import org.lflang.target.TargetConfig;
 import org.lflang.target.TargetProperty;
+import org.lflang.target.property.KeepaliveProperty;
 
 /**
  * A helper class with functions that may be useful for code generators. This is created to ease our
@@ -56,14 +57,14 @@ public static void accommodatePhysicalActionsIfPresent(
     for (Resource resource : resources) {
       for (Action action : findAll(resource, Action.class)) {
         if (action.getOrigin() == ActionOrigin.PHYSICAL
-            && !targetConfig.keepalive.isSet()
-            && !targetConfig.keepalive.get()) {
+            && !targetConfig.isSet(new KeepaliveProperty())
+            && !targetConfig.get(new KeepaliveProperty())) {
           // Keepalive was explicitly set to false; set it to true.
-          targetConfig.keepalive.override(true);
+          targetConfig.override(new KeepaliveProperty(), true);
           String message =
               String.format(
                   "Setting %s to true because of the physical action %s.",
-                  targetConfig.keepalive.name(), action.getName());
+                  new KeepaliveProperty().name(), action.getName());
           messageReporter.at(action).warning(message);
           return;
         }
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index e760e7ff7a..1eff36adb5 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -35,6 +35,15 @@
 import org.lflang.MessageReporter;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.property.AuthProperty;
+import org.lflang.target.property.BuildCommandsProperty;
+import org.lflang.target.property.CmakeIncludeProperty;
+import org.lflang.target.property.CompilerFlagsProperty;
+import org.lflang.target.property.CompilerProperty;
+import org.lflang.target.property.PlatformProperty;
+import org.lflang.target.property.ProtobufsProperty;
+import org.lflang.target.property.ThreadingProperty;
+import org.lflang.target.property.WorkersProperty;
 import org.lflang.target.property.type.PlatformType.Platform;
 import org.lflang.util.FileUtil;
 
@@ -118,8 +127,9 @@ CodeBuilder generateCMakeCode(
     //  rp2040 <board_name> : <stdio_opt>
     //  arduino
     String[] boardProperties = {};
-    if (targetConfig.platformOptions.get().board != null) {
-      boardProperties = targetConfig.platformOptions.get().board.trim().split(":");
+    var platformOptions = targetConfig.get(new PlatformProperty());
+    if (platformOptions.board != null) {
+      boardProperties = platformOptions.board.trim().split(":");
       // Ignore whitespace
       for (int i = 0; i < boardProperties.length; i++) {
         boardProperties[i] = boardProperties[i].trim();
@@ -132,14 +142,14 @@ CodeBuilder generateCMakeCode(
     cMakeCode.pr("cmake_minimum_required(VERSION " + MIN_CMAKE_VERSION + ")");
 
     // Setup the project header for different platforms
-    switch (targetConfig.platformOptions.get().platform) {
+    switch (platformOptions.platform) {
       case ZEPHYR:
         cMakeCode.pr("# Set default configuration file. To add custom configurations,");
         cMakeCode.pr("# pass -- -DOVERLAY_CONFIG=my_config.prj to either cmake or west");
         cMakeCode.pr("set(CONF_FILE prj_lf.conf)");
-        if (targetConfig.platformOptions.get().board != null) {
+        if (platformOptions.board != null) {
           cMakeCode.pr("# Selecting board specified in target property");
-          cMakeCode.pr("set(BOARD " + targetConfig.platformOptions.get().board + ")");
+          cMakeCode.pr("set(BOARD " + platformOptions.board + ")");
         } else {
           cMakeCode.pr("# Selecting default board");
           cMakeCode.pr("set(BOARD qemu_cortex_m3)");
@@ -175,7 +185,7 @@ CodeBuilder generateCMakeCode(
         cMakeCode.pr("project(" + executableName + " LANGUAGES C CXX ASM)");
         cMakeCode.newLine();
         // board type for rp2040 based boards
-        if (targetConfig.platformOptions.get().board != null) {
+        if (platformOptions.board != null) {
           if (boardProperties.length < 1 || boardProperties[0].equals("")) {
             cMakeCode.pr("set(PICO_BOARD pico)");
           } else {
@@ -218,7 +228,7 @@ CodeBuilder generateCMakeCode(
     cMakeCode.pr("set(CMAKE_CXX_STANDARD 17)");
     cMakeCode.pr("set(CMAKE_CXX_STANDARD_REQUIRED ON)");
     cMakeCode.newLine();
-    if (!targetConfig.cmakeIncludes.get().isEmpty()) {
+    if (!targetConfig.get(new CmakeIncludeProperty()).isEmpty()) {
       // The user might be using the non-keyword form of
       // target_link_libraries. Ideally we would detect whether they are
       // doing that, but it is easier to just always have a deprecation
@@ -231,7 +241,7 @@ CodeBuilder generateCMakeCode(
     }
 
     // Set the build type
-    cMakeCode.pr("set(DEFAULT_BUILD_TYPE " + targetConfig.buildType + ")\n");
+    cMakeCode.pr("set(DEFAULT_BUILD_TYPE " + targetConfig.get(new BuildCommandsProperty()) + ")\n");
     cMakeCode.pr("if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)\n");
     cMakeCode.pr(
         "    set(CMAKE_BUILD_TYPE ${DEFAULT_BUILD_TYPE} CACHE STRING \"Choose the type of build.\""
@@ -249,16 +259,13 @@ CodeBuilder generateCMakeCode(
       cMakeCode.newLine();
     }
 
-    if (targetConfig.platformOptions.get().platform != Platform.AUTO) {
-      cMakeCode.pr(
-          "set(CMAKE_SYSTEM_NAME "
-              + targetConfig.platformOptions.get().platform.getcMakeName()
-              + ")");
+    if (platformOptions.platform != Platform.AUTO) {
+      cMakeCode.pr("set(CMAKE_SYSTEM_NAME " + platformOptions.platform.getcMakeName() + ")");
     }
     cMakeCode.newLine();
 
     // Setup main target for different platforms
-    switch (targetConfig.platformOptions.get().platform) {
+    switch (platformOptions.platform) {
       case ZEPHYR:
         cMakeCode.pr(
             setUpMainTargetZephyr(
@@ -298,12 +305,12 @@ CodeBuilder generateCMakeCode(
     cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/utils)");
 
     // post target definition board configurations
-    switch (targetConfig.platformOptions.get().platform) {
+    switch (platformOptions.platform) {
       case RP2040:
         // set stdio output
         boolean usb = true;
         boolean uart = true;
-        if (targetConfig.platformOptions.get().board != null && boardProperties.length > 1) {
+        if (platformOptions.board != null && boardProperties.length > 1) {
           uart = !boardProperties[1].equals("usb");
           usb = !boardProperties[1].equals("uart");
         }
@@ -312,12 +319,12 @@ CodeBuilder generateCMakeCode(
         break;
     }
 
-    if (targetConfig.auth.get()) {
+    if (targetConfig.get(new AuthProperty())) {
       // If security is requested, add the auth option.
       var osName = System.getProperty("os.name").toLowerCase();
       // if platform target was set, use given platform instead
-      if (targetConfig.platformOptions.get().platform != Platform.AUTO) {
-        osName = targetConfig.platformOptions.get().platform.toString();
+      if (platformOptions.platform != Platform.AUTO) {
+        osName = platformOptions.platform.toString();
       }
       if (osName.contains("mac")) {
         cMakeCode.pr("set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)");
@@ -328,8 +335,7 @@ CodeBuilder generateCMakeCode(
       cMakeCode.newLine();
     }
 
-    if (targetConfig.threading.get()
-        && targetConfig.platformOptions.get().platform != Platform.ZEPHYR) {
+    if (targetConfig.get(new ThreadingProperty()) && platformOptions.platform != Platform.ZEPHYR) {
       // If threaded computation is requested, add the threads option.
       cMakeCode.pr("# Find threads and link to it");
       cMakeCode.pr("find_package(Threads REQUIRED)");
@@ -339,11 +345,11 @@ CodeBuilder generateCMakeCode(
 
     // Add additional flags so runtime can distinguish between multi-threaded and single-threaded
     // mode
-    if (targetConfig.threading.get()) {
+    if (targetConfig.get(new ThreadingProperty())) {
       cMakeCode.pr("# Set the number of workers to enable threading/tracing");
       cMakeCode.pr(
           "target_compile_definitions(${LF_MAIN_TARGET} PUBLIC NUMBER_OF_WORKERS="
-              + targetConfig.workers
+              + targetConfig.get(new WorkersProperty())
               + ")");
       cMakeCode.newLine();
       cMakeCode.pr("# Set flag to indicate a multi-threaded runtime");
@@ -356,18 +362,18 @@ CodeBuilder generateCMakeCode(
 
     if (CppMode) cMakeCode.pr("enable_language(CXX)");
 
-    if (!targetConfig.compiler.isSet()) {
+    if (!targetConfig.isSet(new CompilerProperty())) {
       if (CppMode) {
         // Set the CXX compiler to what the user has requested.
-        cMakeCode.pr("set(CMAKE_CXX_COMPILER " + targetConfig.compiler + ")");
+        cMakeCode.pr("set(CMAKE_CXX_COMPILER " + targetConfig.get(new CompilerProperty()) + ")");
       } else {
-        cMakeCode.pr("set(CMAKE_C_COMPILER " + targetConfig.compiler + ")");
+        cMakeCode.pr("set(CMAKE_C_COMPILER " + targetConfig.get(new CompilerProperty()) + ")");
       }
       cMakeCode.newLine();
     }
 
     // link protobuf
-    if (!targetConfig.protoFiles.get().isEmpty()) {
+    if (!targetConfig.get(new ProtobufsProperty()).isEmpty()) {
       cMakeCode.pr("include(FindPackageHandleStandardArgs)");
       cMakeCode.pr("FIND_PATH( PROTOBUF_INCLUDE_DIR protobuf-c/protobuf-c.h)");
       cMakeCode.pr(
@@ -386,7 +392,7 @@ CodeBuilder generateCMakeCode(
 
     // Set the compiler flags
     // We can detect a few common libraries and use the proper target_link_libraries to find them
-    for (String compilerFlag : targetConfig.compilerFlags.get()) {
+    for (String compilerFlag : targetConfig.get(new CompilerFlagsProperty())) {
       messageReporter
           .nowhere()
           .warning(
@@ -402,7 +408,7 @@ CodeBuilder generateCMakeCode(
     cMakeCode.newLine();
 
     // Add the include file
-    for (String includeFile : targetConfig.cmakeIncludes.get()) {
+    for (String includeFile : targetConfig.get(new CmakeIncludeProperty())) {
       cMakeCode.pr("include(\"" + Path.of(includeFile).getFileName() + "\")");
     }
     cMakeCode.newLine();
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index 6466f3f26e..8336a83ebe 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -40,6 +40,11 @@
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.property.BuildTypeProperty;
+import org.lflang.target.property.CompileDefinitionsProperty;
+import org.lflang.target.property.CompilerFlagsProperty;
+import org.lflang.target.property.CompilerProperty;
+import org.lflang.target.property.PlatformProperty;
 import org.lflang.target.property.type.BuildTypeType.BuildType;
 import org.lflang.target.property.type.PlatformType.Platform;
 import org.lflang.util.FileUtil;
@@ -119,13 +124,13 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
     }
 
     // Use the user-specified compiler if any
-    if (targetConfig.compiler != null) {
+    if (targetConfig.get(new CompilerProperty()) != null) {
       if (cppMode) {
         // Set the CXX environment variable to change the C++ compiler.
-        compile.replaceEnvironmentVariable("CXX", targetConfig.compiler.get());
+        compile.replaceEnvironmentVariable("CXX", targetConfig.get(new CompilerProperty()));
       } else {
         // Set the CC environment variable to change the C compiler.
-        compile.replaceEnvironmentVariable("CC", targetConfig.compiler.get());
+        compile.replaceEnvironmentVariable("CC", targetConfig.get(new CompilerProperty()));
       }
     }
 
@@ -136,7 +141,10 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
         && !outputContainsKnownCMakeErrors(compile.getErrors())) {
       messageReporter
           .nowhere()
-          .error(targetConfig.compiler + " failed with error code " + cMakeReturnCode);
+          .error(
+              targetConfig.get(new CompilerProperty())
+                  + " failed with error code "
+                  + cMakeReturnCode);
     }
 
     // For warnings (vs. errors), the return code is 0.
@@ -159,7 +167,10 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
           && !outputContainsKnownCMakeErrors(build.getErrors())) {
         messageReporter
             .nowhere()
-            .error(targetConfig.compiler + " failed with error code " + makeReturnCode);
+            .error(
+                targetConfig.get(new CompilerProperty())
+                    + " failed with error code "
+                    + makeReturnCode);
       }
 
       // For warnings (vs. errors), the return code is 0.
@@ -179,8 +190,8 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
                     + " finished with no errors.");
       }
 
-      if (targetConfig.platformOptions.get().platform == Platform.ZEPHYR
-          && targetConfig.platformOptions.get().flash) {
+      if (targetConfig.get(new PlatformProperty()).platform == Platform.ZEPHYR
+          && targetConfig.get(new PlatformProperty()).flash) {
         messageReporter.nowhere().info("Invoking flash command for Zephyr");
         LFCommand flash = buildWestFlashCommand();
         int flashRet = flash.run();
@@ -217,7 +228,7 @@ public LFCommand compileCmakeCommand() {
   }
 
   static Stream<String> cmakeCompileDefinitions(TargetConfig targetConfig) {
-    return targetConfig.compileDefinitions.get().entrySet().stream()
+    return targetConfig.get(new CompileDefinitionsProperty()).entrySet().stream()
         .map(entry -> "-D" + entry.getKey() + "=" + entry.getValue());
   }
 
@@ -237,8 +248,8 @@ private static List<String> cmakeOptions(TargetConfig targetConfig, FileConfig f
     arguments.addAll(
         List.of(
             "-DCMAKE_BUILD_TYPE="
-                + ((targetConfig.buildType != null)
-                    ? targetConfig.buildType.toString()
+                + ((targetConfig.get(new BuildTypeProperty()) != null)
+                    ? targetConfig.get(new BuildTypeProperty()).toString()
                     : "Release"),
             "-DCMAKE_INSTALL_PREFIX=" + FileUtil.toUnixString(fileConfig.getOutPath()),
             "-DCMAKE_INSTALL_BINDIR="
@@ -295,7 +306,7 @@ public LFCommand buildCmakeCommand() {
                 "--parallel",
                 cores,
                 "--config",
-                buildTypeToCmakeConfig(targetConfig.buildType.get())),
+                buildTypeToCmakeConfig(targetConfig.get(new BuildTypeProperty()))),
             buildPath);
     if (command == null) {
       messageReporter
@@ -316,7 +327,7 @@ public LFCommand buildCmakeCommand() {
   public LFCommand buildWestFlashCommand() {
     // Set the build directory to be "build"
     Path buildPath = fileConfig.getSrcGenPath().resolve("build");
-    String board = targetConfig.platformOptions.get().board;
+    String board = targetConfig.get(new PlatformProperty()).board;
     LFCommand cmd;
     if (board == null || board.startsWith("qemu") || board.equals("native_posix")) {
       cmd = commandFactory.createCommand("west", List.of("build", "-t", "run"), buildPath);
@@ -349,7 +360,7 @@ private boolean outputContainsKnownCMakeErrors(String CMakeOutput) {
     // Check if the error thrown is due to the wrong compiler
     if (CMakeOutput.contains("The CMAKE_C_COMPILER is set to a C++ compiler")) {
       // If so, print an appropriate error message
-      if (targetConfig.compiler != null) {
+      if (targetConfig.get(new CompilerProperty()) != null) {
         messageReporter
             .nowhere()
             .error(
@@ -405,12 +416,11 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
 
     // Add compile definitions
     targetConfig
-        .compileDefinitions
-        .get()
+        .get(new CompileDefinitionsProperty())
         .forEach((key, value) -> compileArgs.add("-D" + key + "=" + value));
 
     // Finally, add the compiler flags in target parameters (if any)
-    compileArgs.addAll(targetConfig.compilerFlags.get());
+    compileArgs.addAll(targetConfig.get(new CompilerFlagsProperty()));
 
     // Only set the output file name if it hasn't already been set
     // using a target property or Args line flag.
@@ -429,7 +439,7 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
 
     LFCommand command =
         commandFactory.createCommand(
-            targetConfig.compiler.get(), compileArgs, fileConfig.getOutPath());
+            targetConfig.get(new CompilerProperty()), compileArgs, fileConfig.getOutPath());
     if (command == null) {
       messageReporter
           .nowhere()
@@ -448,7 +458,7 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
    *     .cpp files instead of .c files and uses a C++ compiler to compiler the code.
    */
   static String getTargetFileName(String fileName, boolean cppMode, TargetConfig targetConfig) {
-    if (targetConfig.platformOptions.get().platform == Platform.ARDUINO) {
+    if (targetConfig.get(new PlatformProperty()).platform == Platform.ARDUINO) {
       return fileName + ".ino";
     }
     if (cppMode) {
diff --git a/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java b/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
index 0474b06ea9..fb040d7dc0 100644
--- a/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
@@ -5,6 +5,8 @@
 import org.lflang.Target;
 import org.lflang.generator.DockerGenerator;
 import org.lflang.generator.LFGeneratorContext;
+import org.lflang.target.property.BuildCommandsProperty;
+import org.lflang.target.property.DockerProperty;
 import org.lflang.util.StringUtil;
 
 /**
@@ -30,13 +32,14 @@ protected String generateDockerFileContent() {
     var lfModuleName = context.getFileConfig().name;
     var config = context.getTargetConfig();
     var compileCommand =
-        IterableExtensions.isNullOrEmpty(config.buildCommands.get())
+        IterableExtensions.isNullOrEmpty(config.get(new BuildCommandsProperty()))
             ? generateDefaultCompileCommand()
-            : StringUtil.joinObjects(config.buildCommands.get(), " ");
+            : StringUtil.joinObjects(config.get(new BuildCommandsProperty()), " ");
     var compiler = config.target == Target.CCPP ? "g++" : "gcc";
     var baseImage = DEFAULT_BASE_IMAGE;
-    if (config.dockerOptions.get().enabled && config.dockerOptions.get().from != null) {
-      baseImage = config.dockerOptions.get().from;
+    var dockerConf = config.get(new DockerProperty());
+    if (dockerConf.enabled && dockerConf.from != null) {
+      baseImage = dockerConf.from;
     }
     return String.join(
         "\n",
diff --git a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
index 39569d0725..b09d29c330 100644
--- a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -5,6 +5,7 @@
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.property.TracingProperty;
 
 /**
  * This class is in charge of code generating functions and global variables related to the
@@ -89,7 +90,7 @@ private String generateCreateEnvironments() {
 
       // Figure out the name of the trace file
       String traceFileName = "NULL";
-      var tracing = targetConfig.tracing.get();
+      var tracing = targetConfig.get(new TracingProperty());
       if (tracing.isEnabled()) {
         if (tracing.traceFileName != null) {
           if (enclave.isMainOrFederated()) {
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 7a10616c7b..46e584656f 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -86,7 +86,20 @@
 import org.lflang.lf.StateVar;
 import org.lflang.lf.Variable;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.property.BuildCommandsProperty;
+import org.lflang.target.property.CmakeIncludeProperty;
+import org.lflang.target.property.CompileDefinitionsProperty;
+import org.lflang.target.property.DockerProperty;
+import org.lflang.target.property.FedSetupProperty;
+import org.lflang.target.property.LoggingProperty;
+import org.lflang.target.property.NoCompileProperty;
+import org.lflang.target.property.PlatformProperty;
 import org.lflang.target.property.PlatformProperty.PlatformOption;
+import org.lflang.target.property.ProtobufsProperty;
+import org.lflang.target.property.SchedulerProperty;
+import org.lflang.target.property.ThreadingProperty;
+import org.lflang.target.property.TracingProperty;
+import org.lflang.target.property.WorkersProperty;
 import org.lflang.target.property.type.PlatformType.Platform;
 import org.lflang.target.property.type.SchedulerType.Scheduler;
 import org.lflang.util.ArduinoUtil;
@@ -346,8 +359,9 @@ public void accommodatePhysicalActionsIfPresent() {
           // If the unthreaded runtime is not requested by the user, use the threaded runtime
           // instead
           // because it is the only one currently capable of handling asynchronous events.
-          if (!targetConfig.threading.get() && !targetConfig.threading.isSet()) {
-            targetConfig.threading.override(true);
+          var threading = new ThreadingProperty();
+          if (!targetConfig.get(threading) && !targetConfig.isSet(threading)) {
+            targetConfig.override(threading, true);
             String message =
                 "Using the threaded C runtime to allow for asynchronous handling of physical action"
                     + " "
@@ -419,7 +433,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     }
 
     // Create docker file.
-    if (targetConfig.dockerOptions.get().enabled && mainDef != null) {
+    if (targetConfig.get(new DockerProperty()).enabled && mainDef != null) {
       try {
         var dockerData = getDockerGenerator(context).generateDockerData();
         dockerData.writeDockerFile();
@@ -430,7 +444,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     }
 
     // If cmake is requested, generate the CMakeLists.txt
-    if (targetConfig.platformOptions.get().platform != Platform.ARDUINO) {
+    if (targetConfig.get(new PlatformProperty()).platform != Platform.ARDUINO) {
       var cmakeFile = fileConfig.getSrcGenPath() + File.separator + "CMakeLists.txt";
       var sources =
           allTypeParameterizedReactors()
@@ -457,14 +471,14 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
       try {
         Path include = fileConfig.getSrcGenPath().resolve("include/");
         Path src = fileConfig.getSrcGenPath().resolve("src/");
-        FileUtil.arduinoDeleteHelper(src, targetConfig.threading.get());
+        FileUtil.arduinoDeleteHelper(src, targetConfig.get(new ThreadingProperty()));
         FileUtil.relativeIncludeHelper(src, include, messageReporter);
         FileUtil.relativeIncludeHelper(include, include, messageReporter);
       } catch (IOException e) {
         //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
         Exceptions.sneakyThrow(e);
       }
-      if (!targetConfig.noCompile.get()) {
+      if (!targetConfig.get(new NoCompileProperty())) {
         ArduinoUtil arduinoUtil = new ArduinoUtil(context, commandFactory, messageReporter);
         arduinoUtil.buildArduino(fileConfig, targetConfig);
         context.finish(GeneratorResult.Status.COMPILED, null);
@@ -499,9 +513,10 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     // self-contained. In this way, third-party build tools like PlatformIO, west, arduino-cli can
     // take over and do the rest of compilation.
     try {
+      var defs = targetConfig.get(new CompileDefinitionsProperty());
       String compileDefs =
-          targetConfig.compileDefinitions.get().keySet().stream()
-                  .map(key -> key + "=" + targetConfig.compileDefinitions.get().get(key))
+          defs.keySet().stream()
+                  .map(key -> key + "=" + defs.get(key))
                   .collect(Collectors.joining("\n"))
               + "\n";
       FileUtil.writeToFile(
@@ -514,10 +529,10 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     // Create a .vscode/settings.json file in the target directory so that VSCode can
     // immediately compile the generated code.
     try {
+      var defs = targetConfig.get(new CompileDefinitionsProperty());
       String compileDefs =
-          targetConfig.compileDefinitions.get().keySet().stream()
-              .map(
-                  key -> "\"-D" + key + "=" + targetConfig.compileDefinitions.get().get(key) + "\"")
+          defs.keySet().stream()
+              .map(key -> "\"-D" + key + "=" + defs.get(key) + "\"")
               .collect(Collectors.joining(",\n"));
       String settings = "{\n" + "\"cmake.configureArgs\": [\n" + compileDefs + "\n]\n}\n";
       Path vscodePath = fileConfig.getSrcGenPath().resolve(".vscode");
@@ -536,9 +551,9 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
 
     // If this code generator is directly compiling the code, compile it now so that we
     // clean it up after, removing the #line directives after errors have been reported.
-    if (!targetConfig.noCompile.get()
-        && !targetConfig.dockerOptions.get().enabled
-        && IterableExtensions.isNullOrEmpty(targetConfig.buildCommands.get())
+    if (!targetConfig.get(new NoCompileProperty())
+        && !targetConfig.get(new DockerProperty()).enabled
+        && IterableExtensions.isNullOrEmpty(targetConfig.get(new BuildCommandsProperty()))
         // This code is unreachable in LSP_FAST mode, so that check is omitted.
         && context.getMode() != LFGeneratorContext.Mode.LSP_MEDIUM) {
       // FIXME: Currently, a lack of main is treated as a request to not produce
@@ -580,8 +595,8 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
 
     // If a build directive has been given, invoke it now.
     // Note that the code does not get cleaned in this case.
-    if (!targetConfig.noCompile.get()) {
-      if (!IterableExtensions.isNullOrEmpty(targetConfig.buildCommands.get())) {
+    if (!targetConfig.get(new NoCompileProperty())) {
+      if (!IterableExtensions.isNullOrEmpty(targetConfig.get(new BuildCommandsProperty()))) {
         CUtil.runBuildCommand(
             fileConfig,
             targetConfig,
@@ -634,9 +649,9 @@ private void generateCodeFor(String lfModuleName) throws IOException {
 
       code.pr(envFuncGen.generateDefinitions());
 
-      if (targetConfig.fedSetupPreamble.isSet()) {
+      if (targetConfig.isSet(new FedSetupProperty())) {
         if (targetLanguageIsCpp()) code.pr("extern \"C\" {");
-        code.pr("#include \"" + targetConfig.fedSetupPreamble + "\"");
+        code.pr("#include \"" + targetConfig.get(new FedSetupProperty()) + "\"");
         if (targetLanguageIsCpp()) code.pr("}");
       }
 
@@ -653,7 +668,7 @@ private void generateCodeFor(String lfModuleName) throws IOException {
       // is set to decentralized) or, if there are
       // downstream federates, will notify the RTI
       // that the specified logical time is complete.
-      if (CCppMode || targetConfig.platformOptions.get().platform == Platform.ARDUINO)
+      if (CCppMode || targetConfig.get(new PlatformProperty()).platform == Platform.ARDUINO)
         code.pr("extern \"C\"");
       code.pr(
           String.join(
@@ -694,11 +709,11 @@ protected String getConflictingConnectionsInModalReactorsBody(String source, Str
   private void pickScheduler() {
     // Don't use a scheduler that does not prioritize reactions based on deadlines
     // if the program contains a deadline (handler). Use the GEDF_NP scheduler instead.
-    if (!targetConfig.schedulerType.get().prioritizesDeadline()) {
+    if (!targetConfig.get(new SchedulerProperty()).prioritizesDeadline()) {
       // Check if a deadline is assigned to any reaction
       if (hasDeadlines(reactors)) {
-        if (!targetConfig.schedulerType.isSet()) {
-          targetConfig.schedulerType.override(Scheduler.GEDF_NP);
+        if (!targetConfig.isSet(new SchedulerProperty())) {
+          targetConfig.override(new SchedulerProperty(), Scheduler.GEDF_NP);
         }
       }
     }
@@ -742,14 +757,14 @@ private void inspectReactorEResource(ReactorDecl reactor) {
         // Copy the user files and cmake-includes to the src-gen path of the main .lf file
         copyUserFiles(lfResource.getTargetConfig(), lfResource.getFileConfig());
         // Merge the CMake includes from the imported file into the target config
+        final var cmakeIncludes = this.targetConfig.get(new CmakeIncludeProperty());
         lfResource
             .getTargetConfig()
-            .cmakeIncludes
-            .get()
+            .get(new CmakeIncludeProperty())
             .forEach(
                 incl -> {
-                  if (!this.targetConfig.cmakeIncludes.get().contains(incl)) {
-                    this.targetConfig.cmakeIncludes.get().add(incl);
+                  if (!cmakeIncludes.contains(incl)) {
+                    cmakeIncludes.add(incl);
                   }
                 });
       }
@@ -770,16 +785,20 @@ protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
     var destination = this.fileConfig.getSrcGenPath();
 
     FileUtil.copyFilesOrDirectories(
-        targetConfig.cmakeIncludes.get(), destination, fileConfig, messageReporter, true);
+        targetConfig.get(new CmakeIncludeProperty()),
+        destination,
+        fileConfig,
+        messageReporter,
+        true);
 
-    if (!StringExtensions.isNullOrEmpty(targetConfig.fedSetupPreamble.get())) {
+    if (!StringExtensions.isNullOrEmpty(targetConfig.get(new FedSetupProperty()))) {
       try {
-        var file = targetConfig.fedSetupPreamble.get();
+        var file = targetConfig.get(new FedSetupProperty());
         FileUtil.copyFile(fileConfig.srcFile.getParent().resolve(file), destination.resolve(file));
       } catch (IOException e) {
         messageReporter
             .nowhere()
-            .error("Failed to find _fed_setup file " + targetConfig.fedSetupPreamble);
+            .error("Failed to find _fed_setup file " + targetConfig.get(new FedSetupProperty()));
       }
     }
   }
@@ -897,8 +916,8 @@ private void generateReactorChildren(
   private void pickCompilePlatform() {
     var osName = System.getProperty("os.name").toLowerCase();
     // if platform target was set, use given platform instead
-    if (targetConfig.platformOptions.get().platform != Platform.AUTO) {
-      osName = targetConfig.platformOptions.get().platform.toString();
+    if (targetConfig.get(new PlatformProperty()).platform != Platform.AUTO) {
+      osName = targetConfig.get(new PlatformProperty()).platform.toString();
     } else if (Stream.of("mac", "darwin", "win", "nux").noneMatch(osName::contains)) {
       messageReporter.nowhere().error("Platform " + osName + " is not supported");
     }
@@ -909,7 +928,7 @@ protected void copyTargetFiles() throws IOException {
     // Copy the core lib
     String coreLib = LFGeneratorContext.BuildParm.EXTERNAL_RUNTIME_PATH.getValue(context);
     Path dest = fileConfig.getSrcGenPath();
-    if (targetConfig.platformOptions.get().platform == Platform.ARDUINO) {
+    if (targetConfig.get(new PlatformProperty()).platform == Platform.ARDUINO) {
       dest = dest.resolve("src");
     }
     if (coreLib != null) {
@@ -920,7 +939,7 @@ protected void copyTargetFiles() throws IOException {
     }
 
     // For the Zephyr target, copy default config and board files.
-    if (targetConfig.platformOptions.get().platform == Platform.ZEPHYR) {
+    if (targetConfig.get(new PlatformProperty()).platform == Platform.ZEPHYR) {
       FileUtil.copyFromClassPath(
           "/lib/platform/zephyr/boards", fileConfig.getSrcGenPath(), false, false);
       FileUtil.copyFileFromClassPath(
@@ -931,7 +950,7 @@ protected void copyTargetFiles() throws IOException {
     }
 
     // For the pico src-gen, copy over vscode configurations for debugging
-    if (targetConfig.platformOptions.get().platform == Platform.RP2040) {
+    if (targetConfig.get(new PlatformProperty()).platform == Platform.RP2040) {
       Path vscodePath = fileConfig.getSrcGenPath().resolve(".vscode");
       // If pico-sdk-path not defined, this can be used to pull the sdk into src-gen
       FileUtil.copyFileFromClassPath(
@@ -978,7 +997,7 @@ private void generateReactorClass(TypeParameterizedReactor tpr) throws IOExcepti
         fileConfig.getSrcGenPath().resolve(headerName),
         true);
     var extension =
-        targetConfig.platformOptions.get().platform == Platform.ARDUINO
+        targetConfig.get(new PlatformProperty()).platform == Platform.ARDUINO
             ? ".ino"
             : CCppMode ? ".cpp" : ".c";
     FileUtil.writeToFile(
@@ -1404,7 +1423,7 @@ private void recordBuiltinTriggers(ReactorInstance instance) {
           foundOne = true;
           enclaveInfo.numShutdownReactions += reactor.getTotalWidth();
 
-          if (targetConfig.tracing.get().isEnabled()) {
+          if (targetConfig.get(new TracingProperty()).isEnabled()) {
             var description = CUtil.getShortenedName(reactor);
             var reactorRef = CUtil.reactorRef(reactor);
             var envTraceRef = CUtil.getEnvironmentStruct(reactor) + ".trace";
@@ -1687,7 +1706,7 @@ public static String variableStructType(TriggerInstance<?> portOrAction) {
    * @param instance The reactor instance.
    */
   private void generateTraceTableEntries(ReactorInstance instance) {
-    if (targetConfig.tracing.get().isEnabled()) {
+    if (targetConfig.get(new TracingProperty()).isEnabled()) {
       initializeTriggerObjects.pr(CTracingGenerator.generateTraceTableEntries(instance));
     }
   }
@@ -1958,33 +1977,39 @@ protected DockerGenerator getDockerGenerator(LFGeneratorContext context) {
   protected void setUpGeneralParameters() {
     accommodatePhysicalActionsIfPresent();
     targetConfig
-        .compileDefinitions
-        .get()
-        .put("LOG_LEVEL", String.valueOf(targetConfig.logLevel.get().ordinal()));
+        .get(new CompileDefinitionsProperty())
+        .put(
+            "LOG_LEVEL",
+            String.valueOf(
+                targetConfig
+                    .get(new LoggingProperty())
+                    .ordinal())); // FIXME: put without marking as set
     targetConfig.compileAdditionalSources.addAll(CCoreFilesUtils.getCTargetSrc());
     // Create the main reactor instance if there is a main reactor.
     this.main =
         ASTUtils.createMainReactorInstance(mainDef, reactors, messageReporter, targetConfig);
     if (hasModalReactors) {
       // So that each separate compile knows about modal reactors, do this:
-      targetConfig.compileDefinitions.get().put("MODAL_REACTORS", "TRUE");
+      targetConfig
+          .get(new CompileDefinitionsProperty())
+          .put("MODAL_REACTORS", "TRUE"); // FIXME: put without marking as set
     }
-    if (targetConfig.threading.get()
-        && targetConfig.platformOptions.get().platform == Platform.ARDUINO
-        && (targetConfig.platformOptions.get().board == null
-            || !targetConfig.platformOptions.get().board.contains("mbed"))) {
+    final var platformOptions = targetConfig.get(new PlatformProperty());
+    if (targetConfig.get(new ThreadingProperty())
+        && platformOptions.platform == Platform.ARDUINO
+        && (platformOptions.board == null || !platformOptions.board.contains("mbed"))) {
       // non-MBED boards should not use threading
       messageReporter
           .nowhere()
           .info(
               "Threading is incompatible on your current Arduino flavor. Setting threading to"
                   + " false.");
-      targetConfig.threading.override(false);
+      targetConfig.override(new ThreadingProperty(), false);
     }
 
-    if (targetConfig.platformOptions.get().platform == Platform.ARDUINO
-        && !targetConfig.noCompile.get()
-        && targetConfig.platformOptions.get().board == null) {
+    if (platformOptions.platform == Platform.ARDUINO
+        && !targetConfig.get(new NoCompileProperty())
+        && platformOptions.board == null) {
       messageReporter
           .nowhere()
           .info(
@@ -1992,19 +2017,16 @@ protected void setUpGeneralParameters() {
                   + " board name (FQBN) in the target property. For example, platform: {name:"
                   + " arduino, board: arduino:avr:leonardo}. Entering \"no-compile\" mode and"
                   + " generating target code only.");
-      targetConfig.noCompile.override(true);
+      targetConfig.override(new NoCompileProperty(), true);
     }
 
-    if (targetConfig.platformOptions.get().platform == Platform.ZEPHYR
-        && targetConfig.threading.get()
-        && targetConfig.platformOptions.get().userThreads >= 0) {
+    if (platformOptions.platform == Platform.ZEPHYR
+        && targetConfig.get(new ThreadingProperty())
+        && platformOptions.userThreads >= 0) {
       targetConfig
-          .compileDefinitions
-          .get()
-          .put(
-              PlatformOption.USER_THREADS.name(),
-              String.valueOf(targetConfig.platformOptions.get().userThreads));
-    } else if (targetConfig.platformOptions.get().userThreads > 0) {
+          .get(new CompileDefinitionsProperty())
+          .put(PlatformOption.USER_THREADS.name(), String.valueOf(platformOptions.userThreads));
+    } else if (platformOptions.userThreads > 0) {
       messageReporter
           .nowhere()
           .warning(
@@ -2012,24 +2034,29 @@ protected void setUpGeneralParameters() {
                   + " This option will be ignored.");
     }
 
-    if (targetConfig.threading.get()) { // FIXME: This logic is duplicated in CMake
+    if (targetConfig.get(new ThreadingProperty())) { // FIXME: This logic is duplicated in CMake
       pickScheduler();
       // FIXME: this and pickScheduler should be combined.
       targetConfig
-          .compileDefinitions
-          .get()
-          .put("SCHEDULER", targetConfig.schedulerType.get().name());
+          .get(new CompileDefinitionsProperty())
+          .put(
+              "SCHEDULER",
+              targetConfig
+                  .get(new SchedulerProperty())
+                  .name()); // FIXME: put without marking as set
       targetConfig
-          .compileDefinitions
-          .get()
-          .put("NUMBER_OF_WORKERS", String.valueOf(targetConfig.workers));
+          .get(new CompileDefinitionsProperty())
+          .put(
+              "NUMBER_OF_WORKERS",
+              String.valueOf(
+                  targetConfig.get(new WorkersProperty()))); // FIXME: put without marking as set
     }
     pickCompilePlatform();
   }
 
   protected void handleProtoFiles() {
     // Handle .proto files.
-    for (String file : targetConfig.protoFiles.get()) {
+    for (String file : targetConfig.get(new ProtobufsProperty())) {
       this.processProtoFile(file);
     }
   }
@@ -2060,7 +2087,7 @@ protected String generateTopLevelPreambles(Reactor reactor) {
         .flatMap(it -> ASTUtils.allFileLevelPreambles(it).stream())
         .collect(Collectors.toSet())
         .forEach(it -> builder.pr(toText(it.getCode())));
-    for (String file : targetConfig.protoFiles.get()) {
+    for (String file : targetConfig.get(new ProtobufsProperty())) {
       var dotIndex = file.lastIndexOf(".");
       var rootFilename = file;
       if (dotIndex > 0) {
diff --git a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
index 1ef7280834..65168e078a 100644
--- a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
@@ -4,6 +4,10 @@
 import java.util.List;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.property.FastProperty;
+import org.lflang.target.property.KeepaliveProperty;
+import org.lflang.target.property.PlatformProperty;
+import org.lflang.target.property.TimeOutProperty;
 import org.lflang.target.property.type.PlatformType.Platform;
 import org.lflang.util.StringUtil;
 
@@ -33,7 +37,7 @@ public String generateCode() {
 
   /** Generate the {@code main} function. */
   private String generateMainFunction() {
-    if (targetConfig.platformOptions.get().platform == Platform.ARDUINO) {
+    if (targetConfig.get(new PlatformProperty()).platform == Platform.ARDUINO) {
       /**
        * By default, we must have a serial begin line prior to calling lf_reactor_c_main due to
        * internal debugging messages requiring a print buffer. For the future, we can check whether
@@ -48,12 +52,12 @@ private String generateMainFunction() {
           "}\n",
           "// Arduino setup() and loop() functions",
           "void setup() {",
-          "\tSerial.begin(" + targetConfig.platformOptions.get().baudRate + ");",
+          "\tSerial.begin(" + targetConfig.get(new PlatformProperty()).baudRate + ");",
           "\tlf_register_print_function(&_lf_arduino_print_message_function, LOG_LEVEL);",
           "\tlf_reactor_c_main(0, NULL);",
           "}\n",
           "void loop() {}");
-    } else if (targetConfig.platformOptions.get().platform == Platform.ZEPHYR) {
+    } else if (targetConfig.get(new PlatformProperty()).platform == Platform.ZEPHYR) {
       // The Zephyr "runtime" does not terminate when main returns.
       //  Rather, {@code exit} should be called explicitly.
       return String.join(
@@ -62,7 +66,7 @@ private String generateMainFunction() {
           "   int res = lf_reactor_c_main(0, NULL);",
           "   exit(res);",
           "}");
-    } else if (targetConfig.platformOptions.get().platform == Platform.RP2040) {
+    } else if (targetConfig.get(new PlatformProperty()).platform == Platform.RP2040) {
       // Pico platform cannot use command line args.
       return String.join("\n", "int main(void) {", "   return lf_reactor_c_main(0, NULL);", "}");
     } else {
@@ -97,18 +101,18 @@ private String generateSetDefaultCliOption() {
 
   /** Parse the target parameters and set flags to the runCommand accordingly. */
   private void parseTargetParameters() {
-    if (targetConfig.fastMode.get()) {
+    if (targetConfig.get(new FastProperty())) {
       runCommand.add("-f");
       runCommand.add("true");
     }
-    if (targetConfig.keepalive.get()) {
+    if (targetConfig.get(new KeepaliveProperty())) {
       runCommand.add("-k");
       runCommand.add("true");
     }
-    if (targetConfig.timeout.get() != null) {
+    if (targetConfig.get(new TimeOutProperty()) != null) {
       runCommand.add("-o");
-      runCommand.add(targetConfig.timeout.get().getMagnitude() + "");
-      runCommand.add(targetConfig.timeout.get().unit.getCanonicalName());
+      runCommand.add(targetConfig.get(new TimeOutProperty()).getMagnitude() + "");
+      runCommand.add(targetConfig.get(new TimeOutProperty()).unit.getCanonicalName());
     }
     // The runCommand has a first entry that is ignored but needed.
     if (runCommand.size() > 0) {
diff --git a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
index df26dbb943..18c783a4f5 100644
--- a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
@@ -5,6 +5,12 @@
 import java.nio.file.Path;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.property.CompileDefinitionsProperty;
+import org.lflang.target.property.FedSetupProperty;
+import org.lflang.target.property.LoggingProperty;
+import org.lflang.target.property.PlatformProperty;
+import org.lflang.target.property.ThreadingProperty;
+import org.lflang.target.property.TracingProperty;
 import org.lflang.target.property.type.PlatformType.Platform;
 import org.lflang.util.StringUtil;
 
@@ -28,7 +34,7 @@ public class CPreambleGenerator {
   public static String generateIncludeStatements(TargetConfig targetConfig, boolean cppMode) {
 
     CodeBuilder code = new CodeBuilder();
-    if (cppMode || targetConfig.platformOptions.get().platform == Platform.ARDUINO) {
+    if (cppMode || targetConfig.get(new PlatformProperty()).platform == Platform.ARDUINO) {
       code.pr("extern \"C\" {");
     }
     code.pr("#include <limits.h>");
@@ -37,11 +43,11 @@ public static String generateIncludeStatements(TargetConfig targetConfig, boolea
         .forEach(it -> code.pr("#include " + StringUtil.addDoubleQuotes(it)));
     code.pr("#include \"include/core/reactor.h\"");
     code.pr("#include \"include/core/reactor_common.h\"");
-    if (targetConfig.threading.get()) {
+    if (targetConfig.get(new ThreadingProperty())) {
       code.pr("#include \"include/core/threaded/scheduler.h\"");
     }
 
-    if (targetConfig.tracing.get().isEnabled()) {
+    if (targetConfig.get(new TracingProperty()).isEnabled()) {
       code.pr("#include \"include/core/trace.h\"");
     }
     code.pr("#include \"include/core/mixed_radix.h\"");
@@ -49,26 +55,28 @@ public static String generateIncludeStatements(TargetConfig targetConfig, boolea
     code.pr("#include \"include/core/environment.h\"");
 
     code.pr("int lf_reactor_c_main(int argc, const char* argv[]);");
-    if (targetConfig.fedSetupPreamble.isSet()) {
+    if (targetConfig.isSet(new FedSetupProperty())) {
       code.pr("#include \"include/core/federated/federate.h\"");
       code.pr("#include \"include/core/federated/net_common.h\"");
     }
-    if (cppMode || targetConfig.platformOptions.get().platform == Platform.ARDUINO) {
+    if (cppMode || targetConfig.get(new PlatformProperty()).platform == Platform.ARDUINO) {
       code.pr("}");
     }
     return code.toString();
   }
 
   public static String generateDefineDirectives(TargetConfig targetConfig, Path srcGenPath) {
-    int logLevel = targetConfig.logLevel.get().ordinal();
-    var tracing = targetConfig.tracing.get();
+    int logLevel = targetConfig.get(new LoggingProperty()).ordinal();
+    var tracing = targetConfig.get(new TracingProperty());
     CodeBuilder code = new CodeBuilder();
     // TODO: Get rid of all of these
     code.pr("#define LOG_LEVEL " + logLevel);
     code.pr("#define TARGET_FILES_DIRECTORY " + addDoubleQuotes(srcGenPath.toString()));
 
     if (tracing.isEnabled()) {
-      targetConfig.compileDefinitions.get().put("LF_TRACE", tracing.traceFileName);
+      targetConfig
+          .get(new CompileDefinitionsProperty())
+          .put("LF_TRACE", tracing.traceFileName); // FIXME: put without marking as set
     }
     // if (clockSyncIsOn) {
     //     code.pr(generateClockSyncDefineDirective(
@@ -76,15 +84,16 @@ public static String generateDefineDirectives(TargetConfig targetConfig, Path sr
     //         targetConfig.clockSyncOptions
     //     ));
     // }
-    if (targetConfig.threading.get()) {
-      targetConfig.compileDefinitions.get().put("LF_THREADED", "1");
+    final var defs = targetConfig.get(new CompileDefinitionsProperty());
+    if (targetConfig.get(new ThreadingProperty())) {
+      defs.put("LF_THREADED", "1");
     } else {
-      targetConfig.compileDefinitions.get().put("LF_UNTHREADED", "1");
+      defs.put("LF_UNTHREADED", "1");
     }
-    if (targetConfig.threading.get()) {
-      targetConfig.compileDefinitions.get().put("LF_THREADED", "1");
+    if (targetConfig.get(new ThreadingProperty())) {
+      defs.put("LF_THREADED", "1");
     } else {
-      targetConfig.compileDefinitions.get().put("LF_UNTHREADED", "1");
+      defs.put("LF_UNTHREADED", "1");
     }
     code.newLine();
     return code.toString();
diff --git a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 29cf3a682d..9b52667b58 100644
--- a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -23,6 +23,8 @@
 import org.lflang.generator.RuntimeRange;
 import org.lflang.generator.SendRange;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.property.LoggingProperty;
+import org.lflang.target.property.ThreadingProperty;
 import org.lflang.target.property.type.LoggingType.LogLevel;
 
 /**
@@ -100,7 +102,7 @@ public static String generateInitializeTriggerObjects(
   /** Generate code to initialize the scheduler for the threaded C runtime. */
   public static String generateSchedulerInitializerMain(
       ReactorInstance main, TargetConfig targetConfig) {
-    if (!targetConfig.threading.get()) {
+    if (!targetConfig.get(new ThreadingProperty())) {
       return "";
     }
     var code = new CodeBuilder();
@@ -883,7 +885,7 @@ private static String deferredReactionOutputs(
     // val selfRef = CUtil.reactorRef(reaction.getParent());
     var name = reaction.getParent().getFullName();
     // Insert a string name to facilitate debugging.
-    if (targetConfig.logLevel.get().compareTo(LogLevel.LOG) >= 0) {
+    if (targetConfig.get(new LoggingProperty()).compareTo(LogLevel.LOG) >= 0) {
       code.pr(
           CUtil.reactionRef(reaction)
               + ".name = "
diff --git a/core/src/main/java/org/lflang/generator/c/CUtil.java b/core/src/main/java/org/lflang/generator/c/CUtil.java
index b3bd6d2c24..8ed5f41671 100644
--- a/core/src/main/java/org/lflang/generator/c/CUtil.java
+++ b/core/src/main/java/org/lflang/generator/c/CUtil.java
@@ -54,6 +54,7 @@
 import org.lflang.lf.Variable;
 import org.lflang.lf.WidthTerm;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.property.BuildCommandsProperty;
 import org.lflang.util.FileUtil;
 import org.lflang.util.LFCommand;
 
@@ -614,7 +615,8 @@ public static void runBuildCommand(
       ReportCommandErrors reportCommandErrors,
       LFGeneratorContext.Mode mode) {
     List<LFCommand> commands =
-        getCommands(targetConfig.buildCommands.get(), commandFactory, fileConfig.srcPath);
+        getCommands(
+            targetConfig.get(new BuildCommandsProperty()), commandFactory, fileConfig.srcPath);
     // If the build command could not be found, abort.
     // An error has already been reported in createCommand.
     if (commands.stream().anyMatch(Objects::isNull)) return;
@@ -631,7 +633,7 @@ public static void runBuildCommand(
                     // FIXME: Why is the content of stderr not provided to the user in this error
                     // message?
                     "Build command \"%s\" failed with error code %d.",
-                    targetConfig.buildCommands, returnCode));
+                    targetConfig.get(new BuildCommandsProperty()), returnCode));
         return;
       }
       // For warnings (vs. errors), the return code is 0.
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index ab9092575d..ca291f1d3e 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -59,6 +59,9 @@
 import org.lflang.lf.Port;
 import org.lflang.lf.Reaction;
 import org.lflang.lf.Reactor;
+import org.lflang.target.property.CompilerFlagsProperty;
+import org.lflang.target.property.CompilerProperty;
+import org.lflang.target.property.ProtobufsProperty;
 import org.lflang.util.FileUtil;
 import org.lflang.util.LFCommand;
 import org.lflang.util.StringUtil;
@@ -106,8 +109,8 @@ public PythonGenerator(LFGeneratorContext context) {
   private PythonGenerator(
       LFGeneratorContext context, PythonTypes types, CCmakeGenerator cmakeGenerator) {
     super(context, false, types, cmakeGenerator, new PythonDelayBodyGenerator(types));
-    this.targetConfig.compiler.override("gcc"); // FIXME: why?
-    this.targetConfig.compilerFlags.get().clear();
+    this.targetConfig.override(new CompilerProperty(), "gcc"); // FIXME: why?
+    this.targetConfig.get(new CompilerFlagsProperty()).clear();
     this.targetConfig.linkerFlags = ""; // FIXME: why?
     this.types = types;
   }
@@ -276,7 +279,7 @@ protected String generateTopLevelPreambles(Reactor ignored) {
 
   @Override
   protected void handleProtoFiles() {
-    for (String name : targetConfig.protoFiles.get()) {
+    for (String name : targetConfig.get(new ProtobufsProperty())) {
       this.processProtoFile(name);
       int dotIndex = name.lastIndexOf(".");
       String rootFilename = dotIndex > 0 ? name.substring(0, dotIndex) : name;
diff --git a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
index 3bced7afa2..76dba1f2c9 100644
--- a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
+++ b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
@@ -24,40 +24,22 @@
 
 package org.lflang.generator.rust;
 
+import org.lflang.Target;
 import org.lflang.target.TargetConfig;
-import org.lflang.target.property.BuildTypeProperty;
 import org.lflang.target.property.CargoDependenciesProperty;
 import org.lflang.target.property.CargoFeaturesProperty;
 import org.lflang.target.property.RustIncludeProperty;
-import org.lflang.target.property.type.BuildTypeType;
-import org.lflang.target.property.type.BuildTypeType.BuildType;
 
 /**
  * Rust-specific part of a {@link TargetConfig}.
  *
  * @author Clément Fournier - TU Dresden, INSA Rennes
  */
-public final class RustTargetConfig {
+public final class RustTargetConfig extends TargetConfig {
 
-  /** List of Cargo features of the generated crate to enable. */
-  public final CargoFeaturesProperty cargoFeatures = new CargoFeaturesProperty();
-
-  /** Map of Cargo dependency to dependency properties. */
-  public final CargoDependenciesProperty cargoDependencies = new CargoDependenciesProperty();
-
-  /** List of top-level modules, those are absolute paths. */
-  public final RustIncludeProperty rustTopLevelModules = new RustIncludeProperty();
-
-  /** Cargo profile, default is debug (corresponds to cargo dev profile). */
-  private BuildType profile = BuildTypeType.BuildType.DEBUG;
-
-  /** The build type to use. Corresponds to a Cargo profile. */
-  public BuildType getBuildType(BuildTypeProperty cmakeBuildType) {
-    // FIXME: this is because Rust uses a different default.
-    // Can we just use the same?
-    if (cmakeBuildType.isSet()) {
-      return cmakeBuildType.get();
-    }
-    return profile;
+  public RustTargetConfig() {
+    super(Target.Rust);
+    register(
+        new CargoFeaturesProperty(), new CargoDependenciesProperty(), new RustIncludeProperty());
   }
 }
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 8067161b0c..868a5f3f9b 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -25,14 +25,18 @@
 package org.lflang.target;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Properties;
+import java.util.Set;
 import java.util.stream.Collectors;
 import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.generator.rust.RustTargetConfig;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.TargetDecl;
 import org.lflang.target.property.AuthProperty;
@@ -69,6 +73,7 @@
 import org.lflang.target.property.TimeOutProperty;
 import org.lflang.target.property.TracingProperty;
 import org.lflang.target.property.WorkersProperty;
+import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.target.property.type.VerifyProperty;
 
 /**
@@ -83,11 +88,6 @@ public class TargetConfig {
   /** The target of this configuration (e.g., C, TypeScript, Python). */
   public final Target target;
 
-  /** Private constructor used to create a target config that is not tied to a particular target. */
-  private TargetConfig() {
-    this.target = null;
-  }
-
   /**
    * Create a new target configuration based on the given target declaration AST node only.
    *
@@ -95,6 +95,44 @@ private TargetConfig() {
    */
   public TargetConfig(Target target) {
     this.target = target;
+
+    this.register(
+        new AuthProperty(),
+        new BuildCommandsProperty(),
+        new BuildTypeProperty(),
+        new ClockSyncModeProperty(),
+        new ClockSyncOptionsProperty(),
+        new CmakeIncludeProperty(),
+        new CompileDefinitionsProperty(),
+        new CompilerFlagsProperty(),
+        new CompilerProperty(),
+        new CoordinationOptionsProperty(),
+        new CoordinationProperty(),
+        new DockerProperty(),
+        new ExportDependencyGraphProperty(),
+        new ExportToYamlProperty(),
+        new ExternalRuntimePathProperty(),
+        new FastProperty(),
+        new FilesProperty(),
+        new KeepaliveProperty(),
+        new LoggingProperty(),
+        new NoCompileProperty(),
+        new NoRuntimeValidationProperty(),
+        new PlatformProperty(),
+        new PrintStatisticsProperty(),
+        new ProtobufsProperty(),
+        new Ros2DependenciesProperty(),
+        new Ros2Property(),
+        new RuntimeVersionProperty(),
+        new SchedulerProperty(),
+        new SingleFileProjectProperty(),
+        new ThreadingProperty(),
+        new TimeOutProperty(),
+        new TracingProperty(),
+        new VerifyProperty(),
+        new WorkersProperty());
+
+    this.register(new FedSetupProperty());
   }
 
   /**
@@ -117,174 +155,51 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
     }
   }
 
-  /**
-   * A list of custom build commands that replace the default build process of directly invoking a
-   * designated compiler. A common usage of this target property is to set the command to build on
-   * the basis of a Makefile.
-   */
-  public final BuildCommandsProperty buildCommands = new BuildCommandsProperty();
-
-  /**
-   * The mode of clock synchronization to be used in federated programs. The default is 'initial'.
-   */
-  public final ClockSyncModeProperty clockSync = new ClockSyncModeProperty();
-
-  /** Clock sync options. */
-  public final ClockSyncOptionsProperty clockSyncOptions = new ClockSyncOptionsProperty();
-
-  /** Parameter passed to cmake. The default is 'Release'. */
-  public final BuildTypeProperty buildType = new BuildTypeProperty();
-
-  /** Optional additional extensions to include in the generated CMakeLists.txt. */
-  public final CmakeIncludeProperty cmakeIncludes = new CmakeIncludeProperty();
-
-  /** The compiler to invoke, unless a build command has been specified. */
-  public final CompilerProperty compiler = new CompilerProperty();
-
   /** Additional sources to add to the compile command if appropriate. */
   public final List<String> compileAdditionalSources = new ArrayList<>();
 
-  /**
-   * Additional (preprocessor) definitions to add to the compile command if appropriate.
-   *
-   * <p>The first string is the definition itself, and the second string is the value to attribute
-   * to that definition, if any. The second value could be left empty.
-   */
-  public final CompileDefinitionsProperty compileDefinitions = new CompileDefinitionsProperty();
-
-  /** Flags to pass to the compiler, unless a build command has been specified. */
-  public final CompilerFlagsProperty compilerFlags = new CompilerFlagsProperty();
-
-  /**
-   * The type of coordination used during the execution of a federated program. The default is
-   * 'centralized'.
-   */
-  public final CoordinationProperty coordination = new CoordinationProperty();
-
-  /** Docker options. */
-  public final DockerProperty dockerOptions = new DockerProperty();
-
-  /** Coordination options. */
-  public final CoordinationOptionsProperty coordinationOptions = new CoordinationOptionsProperty();
-
-  /** Link to an external runtime library instead of the default one. */
-  public final ExternalRuntimePathProperty externalRuntimePath = new ExternalRuntimePathProperty();
-
-  /**
-   * If true, configure the execution environment such that it does not wait for physical time to
-   * match logical time. The default is false.
-   */
-  public final FastProperty fastMode = new FastProperty();
-
-  /** List of files to be copied to src-gen. */
-  public final FilesProperty files = new FilesProperty();
-
-  /**
-   * If true, configure the execution environment to keep executing if there are no more events on
-   * the event queue. The default is false.
-   */
-  public final KeepaliveProperty keepalive = new KeepaliveProperty();
-
-  /** The level of logging during execution. The default is INFO. */
-  public final LoggingProperty logLevel = new LoggingProperty();
-
   /** Flags to pass to the linker, unless a build command has been specified. */
   public String linkerFlags = "";
 
-  /** If true, do not invoke the target compiler or build command. The default is false. */
-  public final NoCompileProperty noCompile = new NoCompileProperty();
-
-  /** If true, do not perform runtime validation. The default is false. */
-  public final NoRuntimeValidationProperty noRuntimeValidation = new NoRuntimeValidationProperty();
-
-  /** If true, check the generated verification model. The default is false. */
-  public final VerifyProperty verify = new VerifyProperty();
-
-  /**
-   * Set the target platform config. This tells the build system what platform-specific support
-   * files it needs to incorporate at compile time.
-   *
-   * <p>This is now a wrapped class to account for overloaded definitions of defining platform
-   * (either a string or dictionary of values)
-   */
-  public final PlatformProperty platformOptions = new PlatformProperty();
-
-  /** If true, instruct the runtime to collect and print execution statistics. */
-  public final PrintStatisticsProperty printStatistics = new PrintStatisticsProperty();
+  private final Map<AbstractTargetProperty<?, ?>, Object> properties = new HashMap<>();
 
-  /** List of proto files to be processed by the code generator. */
-  public final ProtobufsProperty protoFiles = new ProtobufsProperty();
-
-  /** If true, generate ROS2 specific code. */
-  public final Ros2Property ros2 = new Ros2Property();
-
-  /** Additional ROS2 packages that the LF program depends on. */
-  public final Ros2DependenciesProperty ros2Dependencies = new Ros2DependenciesProperty();
-
-  /** The version of the runtime library to be used in the generated target. */
-  public final RuntimeVersionProperty runtimeVersion = new RuntimeVersionProperty();
-
-  /** Whether all reactors are to be generated into a single target language file. */
-  public final SingleFileProjectProperty singleFileProject = new SingleFileProjectProperty();
-
-  /** What runtime scheduler to use. */
-  public final SchedulerProperty schedulerType = new SchedulerProperty();
-
-  /**
-   * The number of worker threads to deploy. The default is zero, which indicates that the runtime
-   * is allowed to freely choose the number of workers.
-   */
-  public final WorkersProperty workers = new WorkersProperty();
+  private final Set<AbstractTargetProperty<?, ?>> setProperties = new HashSet<>();
 
-  /** Indicate whether HMAC authentication is used. */
-  public final AuthProperty auth = new AuthProperty();
-
-  /** Indicate whether the runtime should use multithreaded execution. */
-  public final ThreadingProperty threading = new ThreadingProperty();
-
-  /** The timeout to be observed during execution of the program. */
-  public final TimeOutProperty timeout = new TimeOutProperty();
-
-  /** If non-null, configure the runtime environment to perform tracing. The default is null. */
-  public final TracingProperty tracing = new TracingProperty();
+  public void register(AbstractTargetProperty<?, ?>... properties) {
+    Arrays.stream(properties)
+        .forEach(property -> this.properties.put(property, property.initialValue()));
+  }
 
-  /**
-   * If true, the resulting binary will output a graph visualizing all reaction dependencies.
-   *
-   * <p>This option is currently only used for C++ and Rust. This export function is a valuable tool
-   * for debugging LF programs and helps to understand the dependencies inferred by the runtime.
-   */
-  public final ExportDependencyGraphProperty exportDependencyGraph =
-      new ExportDependencyGraphProperty();
+  public <T, S extends TargetPropertyType> void override(
+      AbstractTargetProperty<T, S> property, T value) {
+    this.setProperties.add(property);
+    this.properties.put(property, value);
+  }
 
-  /**
-   * If true, the resulting binary will output a yaml file describing the whole reactor structure of
-   * the program.
-   *
-   * <p>This option is currently only used for C++. This export function is a valuable tool for
-   * debugging LF programs and performing external analysis.
-   */
-  public final ExportToYamlProperty exportToYaml = new ExportToYamlProperty();
+  public void reset(AbstractTargetProperty property) {
+    this.properties.remove(property);
+    this.setProperties.remove(property);
+  }
 
-  /** Rust-specific configuration. */
-  public final RustTargetConfig rust = new RustTargetConfig();
+  @SuppressWarnings("unchecked")
+  public <T, S extends TargetPropertyType> T get(AbstractTargetProperty<T, S> property) {
+    return (T) properties.get(property);
+  }
 
-  /** Path to a C file used by the Python target to setup federated execution. */
-  public final FedSetupProperty fedSetupPreamble = new FedSetupProperty();
+  public boolean isSet(AbstractTargetProperty<?, ?> property) {
+    return this.setProperties.contains(property);
+  }
 
-  public List<AbstractTargetProperty> getAllTargetProperties() {
-    var properties = AbstractTargetProperty.getAllTargetProperties(this);
-    properties.addAll(AbstractTargetProperty.getAllTargetProperties(this.rust));
-    return properties.stream()
-        .sorted((p1, p2) -> p1.name().compareTo(p2.name()))
-        .collect(Collectors.toList());
+  public String listOfRegisteredProperties() {
+    return getRegisteredProperties().stream()
+        .map(p -> p.toString())
+        .filter(s -> !s.startsWith("_"))
+        .collect(Collectors.joining(", "));
   }
 
-  public static List<AbstractTargetProperty> getUserTargetProperties() {
-    var config = new TargetConfig();
-    var properties = AbstractTargetProperty.getAllTargetProperties(config);
-    return properties.stream()
-        .filter(it -> !it.name().startsWith("_"))
+  public List<AbstractTargetProperty> getRegisteredProperties() {
+    return this.properties.keySet().stream()
+        .sorted((p1, p2) -> p1.getClass().getName().compareTo(p2.getClass().getName()))
         .collect(Collectors.toList());
   }
 
@@ -294,7 +209,7 @@ public static List<AbstractTargetProperty> getUserTargetProperties() {
    * @param name The string to match against.
    */
   public Optional<AbstractTargetProperty> forName(String name) {
-    return this.getAllTargetProperties().stream()
+    return this.getRegisteredProperties().stream()
         .filter(c -> c.name().equalsIgnoreCase(name))
         .findFirst();
   }
diff --git a/core/src/main/java/org/lflang/target/TargetProperty.java b/core/src/main/java/org/lflang/target/TargetProperty.java
index fd85287440..c47386981d 100644
--- a/core/src/main/java/org/lflang/target/TargetProperty.java
+++ b/core/src/main/java/org/lflang/target/TargetProperty.java
@@ -115,8 +115,8 @@ public static List<KeyValuePair> extractProperties(TargetConfig config) {
    * @param config The configuration to find the properties in.
    */
   public static List<AbstractTargetProperty> loaded(TargetConfig config) {
-    return config.getAllTargetProperties().stream()
-        .filter(p -> p.isSet())
+    return config.getRegisteredProperties().stream()
+        .filter(p -> config.isSet(p))
         .collect(Collectors.toList());
   }
 
@@ -169,7 +169,7 @@ public static void validate(
         .forEach(
             pair -> {
               var match =
-                  config.getAllTargetProperties().stream()
+                  config.getRegisteredProperties().stream()
                       .filter(prop -> prop.name().equalsIgnoreCase(pair.getName()))
                       .findAny();
               if (match.isPresent()) {
@@ -184,7 +184,7 @@ public static void validate(
                         "Unrecognized target property: "
                             + pair.getName()
                             + ". Recognized properties are: "
-                            + TargetConfig.getUserTargetProperties());
+                            + config.listOfRegisteredProperties());
               }
             });
   }
diff --git a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
index 8010b2869a..29a35fb2b9 100644
--- a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
@@ -10,7 +10,11 @@
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.UnionType;
 
-/** Directive to let the generator use the custom build command. */
+/**
+ * A list of custom build commands that replace the default build process of directly invoking a
+ * designated compiler. A common usage of this target property is to set the command to build on the
+ * basis of a Makefile.
+ */
 public class BuildCommandsProperty extends AbstractTargetProperty<List<String>, UnionType> {
 
   public BuildCommandsProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
index cfed672d81..bc7fa61f09 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
@@ -14,7 +14,7 @@
 import org.lflang.target.property.type.ClockSyncModeType;
 import org.lflang.target.property.type.ClockSyncModeType.ClockSyncMode;
 
-/** Directive to let the federate execution handle clock synchronization in software. */
+/** The mode of clock synchronization to be used in federated programs. The default is 'initial'. */
 public class ClockSyncModeProperty
     extends AbstractTargetProperty<ClockSyncMode, ClockSyncModeType> {
 
diff --git a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
index 88eb50fd0c..ab7a7772d9 100644
--- a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
@@ -11,7 +11,12 @@
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.StringDictionaryType;
 
-/** Directive to specify compile-time definitions. */
+/**
+ * Additional (preprocessor) definitions to add to the compile command if appropriate.
+ *
+ * <p>The first string is the definition itself, and the second string is the value to attribute to
+ * that definition, if any. The second value could be left empty.
+ */
 public class CompileDefinitionsProperty
     extends AbstractTargetProperty<Map<String, String>, StringDictionaryType> {
 
diff --git a/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
index ebae420a1b..8f9aee85ca 100644
--- a/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-/** Flags to be passed on to the target compiler. */
+/** Flags to pass to the compiler, unless a build command has been specified. */
 public class CompilerFlagsProperty extends AbstractStringListProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/CompilerProperty.java b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
index d9ce97ce50..635a66e421 100644
--- a/core/src/main/java/org/lflang/target/property/CompilerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-/** Directive to specify the target compiler. */
+/** The compiler to invoke, unless a build command has been specified. */
 public class CompilerProperty extends AbstractStringConfig {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
index c751b5e802..3163154a91 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
@@ -10,7 +10,10 @@
 import org.lflang.target.property.type.CoordinationModeType;
 import org.lflang.target.property.type.CoordinationModeType.CoordinationMode;
 
-/** Directive to specify the coordination mode */
+/**
+ * The type of coordination used during the execution of a federated program. The default is
+ * 'centralized'.
+ */
 public class CoordinationProperty
     extends AbstractTargetProperty<CoordinationMode, CoordinationModeType> {
 
diff --git a/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java b/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
index ae79262988..0f8c80ae6d 100644
--- a/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
@@ -4,9 +4,10 @@
 import org.lflang.Target;
 
 /**
- * Directive to let the runtime export its internal dependency graph.
+ * If true, the resulting binary will output a graph visualizing all reaction dependencies.
  *
- * <p>This is a debugging feature and currently only used for C++ and Rust programs.
+ * <p>This option is currently only used for C++ and Rust. This export function is a valuable tool
+ * for debugging LF programs and helps to understand the dependencies inferred by the runtime.
  */
 public class ExportDependencyGraphProperty extends AbstractBooleanProperty {
 
diff --git a/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java b/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
index ed83f76787..437b6d333f 100644
--- a/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
@@ -4,9 +4,11 @@
 import org.lflang.Target;
 
 /**
- * Directive to let the runtime export the program structure to a yaml file.
+ * If true, the resulting binary will output a yaml file describing the whole reactor structure of
+ * the program.
  *
- * <p>This is a debugging feature and currently only used for C++ programs.
+ * <p>This option is currently only used for C++. This export function is a valuable tool for
+ * debugging LF programs and performing external analysis.
  */
 public class ExportToYamlProperty extends AbstractBooleanProperty {
 
diff --git a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
index 68540cc948..615e7c9e55 100644
--- a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
@@ -3,7 +3,10 @@
 import java.util.List;
 import org.lflang.Target;
 
-/** Directive for specifying a path to an external runtime to be used for the compiled binary. */
+/**
+ * Directive for specifying a path to an external runtime libray to link to instead of the default
+ * one.
+ */
 public class ExternalRuntimePathProperty extends AbstractStringConfig {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/FastProperty.java b/core/src/main/java/org/lflang/target/property/FastProperty.java
index b24b032ce7..e57a13e46d 100644
--- a/core/src/main/java/org/lflang/target/property/FastProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FastProperty.java
@@ -11,7 +11,10 @@
 import org.lflang.lf.Model;
 import org.lflang.lf.Reactor;
 
-/** Directive to let the execution engine allow logical time to elapse faster than physical time. */
+/**
+ * If true, configure the execution environment such that it does not wait for physical time to
+ * match logical time. The default is false.
+ */
 public class FastProperty extends AbstractBooleanProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
index 787c8967e2..da6d994c1d 100644
--- a/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
+++ b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
@@ -4,8 +4,8 @@
 import org.lflang.Target;
 
 /**
- * Directive to let the execution engine remain active also if there are no more events in the event
- * queue.
+ * If true, configure the execution environment to keep executing if there are no more events on the
+ * event queue. The default is false.
  */
 public class KeepaliveProperty extends AbstractBooleanProperty {
 
diff --git a/core/src/main/java/org/lflang/target/property/LoggingProperty.java b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
index 2cddd285ca..0784166762 100644
--- a/core/src/main/java/org/lflang/target/property/LoggingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
@@ -9,7 +9,10 @@
 import org.lflang.target.property.type.LoggingType;
 import org.lflang.target.property.type.LoggingType.LogLevel;
 
-/** Directive to specify the grain at which to report log messages during execution. */
+/**
+ * Directive to specify the grain at which to report log messages during execution. The default is
+ * INFO.
+ */
 public class LoggingProperty extends AbstractTargetProperty<LogLevel, LoggingType> {
 
   public LoggingProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
index 66d6e877a9..b1a6a375b0 100644
--- a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
+++ b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-/** Directive to not invoke the target compiler. */
+/** If true, do not invoke the target compiler or build command. The default is false. */
 public class NoCompileProperty extends AbstractBooleanProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java b/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
index a3beacb951..e9176d6680 100644
--- a/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
+++ b/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-/** Directive to disable validation of reactor rules at runtime. */
+/** If true, do not perform runtime validation. The default is false. */
 public class NoRuntimeValidationProperty extends AbstractBooleanProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
index 8f6fa48445..c722a8530d 100644
--- a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-/** Directive to instruct the runtime to collect and print execution statistics. */
+/** If true, instruct the runtime to collect and print execution statistics. */
 public class PrintStatisticsProperty extends AbstractBooleanProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/Ros2Property.java b/core/src/main/java/org/lflang/target/property/Ros2Property.java
index 4b797e8fa7..c4fd562ac6 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2Property.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2Property.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.lflang.Target;
 
-/** Directive to specify that ROS2 specific code is generated. */
+/** If true, generate ROS2 specific code. */
 public class Ros2Property extends AbstractBooleanProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
index 813504f880..c3438d44e6 100644
--- a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
@@ -13,7 +13,7 @@
 import org.lflang.target.property.type.SchedulerType;
 import org.lflang.target.property.type.SchedulerType.Scheduler;
 
-/** Directive for specifying a specific runtime scheduler, if supported. */
+/** Directive for specifying the use of a specific runtime scheduler. */
 public class SchedulerProperty extends AbstractTargetProperty<Scheduler, SchedulerType> {
 
   public SchedulerProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
index bef95c7ff6..d2575ae561 100644
--- a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
@@ -9,7 +9,7 @@
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
 
-/** Directive to specify the execution timeout. */
+/** The timeout to be observed during execution of the program. */
 public class TimeOutProperty extends AbstractTargetProperty<TimeValue, PrimitiveType> {
 
   public TimeOutProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index 114f6deebf..0c69a7fd5e 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -20,7 +20,7 @@
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.target.property.type.UnionType;
 
-/** Directive to enable tracing. */
+/** Directive to configure the runtime environment to perform tracing. */
 public class TracingProperty extends AbstractTargetProperty<TracingOptions, UnionType> {
 
   public TracingProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/VerifyProperty.java b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
index 793ee4c280..c26421dc03 100644
--- a/core/src/main/java/org/lflang/target/property/VerifyProperty.java
+++ b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
@@ -4,7 +4,7 @@
 import org.lflang.Target;
 import org.lflang.target.property.AbstractBooleanProperty;
 
-/** Directive to check the generated verification model. */
+/** If true, check the generated verification model. The default is false. */
 public class VerifyProperty extends AbstractBooleanProperty {
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/WorkersProperty.java b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
index 057be50e56..19a433e8db 100644
--- a/core/src/main/java/org/lflang/target/property/WorkersProperty.java
+++ b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
@@ -8,7 +8,10 @@
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
 
-/** Directive to specify the number of worker threads used by the runtime. */
+/**
+ * The number of worker threads to deploy. The default is zero, which indicates that the runtime is
+ * allowed to freely choose the number of workers.
+ */
 public class WorkersProperty extends AbstractTargetProperty<Integer, PrimitiveType> {
 
   public WorkersProperty() {
diff --git a/core/src/main/java/org/lflang/util/ArduinoUtil.java b/core/src/main/java/org/lflang/util/ArduinoUtil.java
index 3423e80ac7..a94097ee54 100644
--- a/core/src/main/java/org/lflang/util/ArduinoUtil.java
+++ b/core/src/main/java/org/lflang/util/ArduinoUtil.java
@@ -11,6 +11,7 @@
 import org.lflang.generator.GeneratorCommandFactory;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.property.PlatformProperty;
 
 /**
  * Utilities for Building using Arduino CLI.
@@ -68,11 +69,11 @@ private LFCommand arduinoCompileCommand(FileConfig fileConfig, TargetConfig targ
         var fileWriter = new FileWriter(testScript.getAbsoluteFile(), true);
         BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
         String board =
-            targetConfig.platformOptions.get().board != null
-                ? targetConfig.platformOptions.get().board
+            targetConfig.get(new PlatformProperty()).board != null
+                ? targetConfig.get(new PlatformProperty()).board
                 : "arduino:avr:leonardo";
         String isThreaded =
-            targetConfig.platformOptions.get().board.contains("mbed")
+            targetConfig.get(new PlatformProperty()).board.contains("mbed")
                 ? "-DLF_THREADED"
                 : "-DLF_UNTHREADED";
         bufferedWriter.write(
@@ -122,8 +123,8 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
             "SUCCESS: Compiling generated code for "
                 + fileConfig.name
                 + " finished with no errors.");
-    if (targetConfig.platformOptions.get().flash) {
-      if (targetConfig.platformOptions.get().port != null) {
+    if (targetConfig.get(new PlatformProperty()).flash) {
+      if (targetConfig.get(new PlatformProperty()).port != null) {
         messageReporter.nowhere().info("Invoking flash command for Arduino");
         LFCommand flash =
             commandFactory.createCommand(
@@ -131,9 +132,9 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
                 List.of(
                     "upload",
                     "-b",
-                    targetConfig.platformOptions.get().board,
+                    targetConfig.get(new PlatformProperty()).board,
                     "-p",
-                    targetConfig.platformOptions.get().port),
+                    targetConfig.get(new PlatformProperty()).port),
                 fileConfig.getSrcGenPath());
         if (flash == null) {
           messageReporter.nowhere().error("Could not create arduino-cli flash command.");
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
index b98dc1d79c..e2796c337b 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
@@ -28,16 +28,15 @@ package org.lflang.generator.cpp
 
 import org.eclipse.emf.ecore.resource.Resource
 import org.lflang.Target
-import org.lflang.generator.CodeMap
-import org.lflang.generator.GeneratorBase
-import org.lflang.generator.GeneratorResult
+import org.lflang.generator.*
 import org.lflang.generator.GeneratorUtils.canGenerate
-import org.lflang.generator.IntegratedBuilder
-import org.lflang.generator.LFGeneratorContext
 import org.lflang.generator.LFGeneratorContext.Mode
-import org.lflang.generator.TargetTypes
 import org.lflang.isGeneric
 import org.lflang.scoping.LFGlobalScopeProvider
+import org.lflang.target.property.ExternalRuntimePathProperty
+import org.lflang.target.property.NoCompileProperty
+import org.lflang.target.property.Ros2Property
+import org.lflang.target.property.RuntimeVersionProperty
 import org.lflang.util.FileUtil
 import java.nio.file.Files
 import java.nio.file.Path
@@ -71,7 +70,7 @@ class CppGenerator(
 
         // create a platform-specific generator
         val platformGenerator: CppPlatformGenerator =
-            if (targetConfig.ros2.get()) CppRos2Generator(this) else CppStandaloneGenerator(this)
+            if (targetConfig.get(Ros2Property())) CppRos2Generator(this) else CppStandaloneGenerator(this)
 
         // generate all core files
         generateFiles(platformGenerator.srcGenPath)
@@ -79,7 +78,7 @@ class CppGenerator(
         // generate platform specific files
         platformGenerator.generatePlatformFiles()
 
-        if (targetConfig.noCompile.get() || errorsOccurred()) {
+        if (targetConfig.get(NoCompileProperty()) || errorsOccurred()) {
             println("Exiting before invoking target compiler.")
             context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, codeMaps))
         } else if (context.mode == Mode.LSP_MEDIUM) {
@@ -133,9 +132,9 @@ class CppGenerator(
             true)
 
         // copy or download reactor-cpp
-        if (!targetConfig.externalRuntimePath.isSet) {
-            if (targetConfig.runtimeVersion.isSet) {
-                fetchReactorCpp(targetConfig.runtimeVersion.get())
+        if (!targetConfig.isSet(ExternalRuntimePathProperty())) {
+            if (targetConfig.isSet(RuntimeVersionProperty())) {
+                fetchReactorCpp(targetConfig.get(RuntimeVersionProperty()))
             } else {
                 FileUtil.copyFromClassPath(
                     "$libDir/reactor-cpp",
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
index 82b881ea25..1c11055573 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
@@ -4,6 +4,11 @@ import org.lflang.MessageReporter
 import org.lflang.target.TargetConfig
 import org.lflang.generator.GeneratorCommandFactory
 import org.lflang.generator.LFGeneratorContext
+import org.lflang.target.property.BuildTypeProperty
+import org.lflang.target.property.LoggingProperty
+import org.lflang.target.property.NoRuntimeValidationProperty
+import org.lflang.target.property.PrintStatisticsProperty
+import org.lflang.target.property.TracingProperty
 import org.lflang.toDefinition
 import java.nio.file.Path
 
@@ -25,11 +30,11 @@ abstract class CppPlatformGenerator(protected val generator: CppGenerator) {
 
     protected val cmakeArgs: List<String>
         get() = listOf(
-            "-DCMAKE_BUILD_TYPE=${targetConfig.buildType}",
-            "-DREACTOR_CPP_VALIDATE=${if (targetConfig.noRuntimeValidation.get()) "OFF" else "ON"}",
-            "-DREACTOR_CPP_PRINT_STATISTICS=${if (targetConfig.printStatistics.get()) "ON" else "OFF"}",
-            "-DREACTOR_CPP_TRACE=${if (targetConfig.tracing.get().isEnabled) "ON" else "OFF"}",
-            "-DREACTOR_CPP_LOG_LEVEL=${targetConfig.logLevel.get().severity}",
+            "-DCMAKE_BUILD_TYPE=${targetConfig.get(BuildTypeProperty())}",
+            "-DREACTOR_CPP_VALIDATE=${if (targetConfig.get(NoRuntimeValidationProperty())) "OFF" else "ON"}",
+            "-DREACTOR_CPP_PRINT_STATISTICS=${if (targetConfig.get(PrintStatisticsProperty())) "ON" else "OFF"}",
+            "-DREACTOR_CPP_TRACE=${if (targetConfig.get(TracingProperty()).isEnabled) "ON" else "OFF"}",
+            "-DREACTOR_CPP_LOG_LEVEL=${targetConfig.get(LoggingProperty()).severity}",
             "-DLF_SRC_PKG_PATH=${fileConfig.srcPkgPath}",
         )
 }
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
index e117a11b5a..f3078bc5b3 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
@@ -2,6 +2,9 @@ package org.lflang.generator.cpp
 
 import org.lflang.target.TargetConfig
 import org.lflang.lf.Reactor
+import org.lflang.target.property.FastProperty
+import org.lflang.target.property.TimeOutProperty
+import org.lflang.target.property.WorkersProperty
 import org.lflang.toUnixString
 
 /** A C++ code generator for creating a ROS2 node from a main reactor definition */
@@ -57,9 +60,9 @@ class CppRos2NodeGenerator(
             |
             |$nodeName::$nodeName(const rclcpp::NodeOptions& node_options)
             |  : Node("$nodeName", node_options) {
-            |  unsigned workers = ${if (targetConfig.workers.get() != 0) targetConfig.workers.get() else "std::thread::hardware_concurrency()"};
-            |  bool fast{${targetConfig.fastMode}};
-            |  reactor::Duration lf_timeout{${if (targetConfig.timeout.isSet) targetConfig.timeout.get().toCppCode() else "reactor::Duration::max()"}};
+            |  unsigned workers = ${if (targetConfig.get(WorkersProperty()) != 0) targetConfig.get(WorkersProperty()) else "std::thread::hardware_concurrency()"};
+            |  bool fast{${targetConfig.get(FastProperty())}};
+            |  reactor::Duration lf_timeout{${if (targetConfig.isSet(TimeOutProperty())) targetConfig.get(TimeOutProperty()).toCppCode() else "reactor::Duration::max()"}};
             |
             |  // provide a globally accessible reference to this node
             |  // FIXME: this is pretty hacky...
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
index 49311d121a..83f1d0d57a 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
@@ -2,6 +2,10 @@ package org.lflang.generator.cpp
 
 import org.lflang.generator.PrependOperator
 import org.lflang.joinWithLn
+import org.lflang.target.property.BuildTypeProperty
+import org.lflang.target.property.CmakeIncludeProperty
+import org.lflang.target.property.Ros2DependenciesProperty
+import org.lflang.target.property.RuntimeVersionProperty
 import org.lflang.toUnixString
 import java.nio.file.Path
 
@@ -9,11 +13,11 @@ import java.nio.file.Path
 class CppRos2PackageGenerator(generator: CppGenerator, private val nodeName: String) {
     private val fileConfig = generator.fileConfig
     private val targetConfig = generator.targetConfig
-    val reactorCppSuffix: String = if (targetConfig.runtimeVersion.isSet) targetConfig.runtimeVersion.get() else "default"
+    val reactorCppSuffix: String = if (targetConfig.isSet(RuntimeVersionProperty())) targetConfig.get(RuntimeVersionProperty()) else "default"
     val reactorCppName = "reactor-cpp-$reactorCppSuffix"
     private val dependencies =
         listOf("rclcpp", "rclcpp_components", reactorCppName) + (
-                if (targetConfig.ros2Dependencies.isSet) targetConfig.ros2Dependencies.get() else listOf<String>())
+                if (targetConfig.isSet(Ros2DependenciesProperty())) targetConfig.get(Ros2DependenciesProperty()) else listOf<String>())
 
     @Suppress("PrivatePropertyName") // allows us to use capital S as variable name below
     private val S = '$' // a little trick to escape the dollar sign with $S
@@ -48,7 +52,7 @@ class CppRos2PackageGenerator(generator: CppGenerator, private val nodeName: Str
 
     fun generatePackageCmake(sources: List<Path>): String {
         // Resolve path to the cmake include files if any was provided
-        val includeFiles = targetConfig.cmakeIncludes.get()?.map { fileConfig.srcPath.resolve(it).toUnixString() }
+        val includeFiles = targetConfig.get(CmakeIncludeProperty())?.map { fileConfig.srcPath.resolve(it).toUnixString() }
 
         return with(PrependOperator) {
             with(CppGenerator) {
@@ -61,7 +65,7 @@ class CppRos2PackageGenerator(generator: CppGenerator, private val nodeName: Str
                 |set(CMAKE_CXX_STANDARD_REQUIRED ON)
                 |set(CMAKE_CXX_EXTENSIONS OFF)
                 |
-                |set(DEFAULT_BUILD_TYPE "${targetConfig.buildType}")
+                |set(DEFAULT_BUILD_TYPE "${targetConfig.get(BuildTypeProperty())}")
                 |if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
                 |set    (CMAKE_BUILD_TYPE "$S{DEFAULT_BUILD_TYPE}" CACHE STRING "Choose the type of build." FORCE)
                 |endif()
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
index b456145342..22ea6e19c0 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
@@ -28,6 +28,10 @@ import org.lflang.FileConfig
 import org.lflang.target.TargetConfig
 import org.lflang.generator.PrependOperator
 import org.lflang.joinWithLn
+import org.lflang.target.property.BuildTypeProperty
+import org.lflang.target.property.CmakeIncludeProperty
+import org.lflang.target.property.ExternalRuntimePathProperty
+import org.lflang.target.property.RuntimeVersionProperty
 import org.lflang.toUnixString
 import java.nio.file.Path
 
@@ -79,7 +83,7 @@ class CppStandaloneCmakeGenerator(private val targetConfig: TargetConfig, privat
             |include($S{CMAKE_ROOT}/Modules/ExternalProject.cmake)
             |include(GNUInstallDirs)
             |
-            |set(DEFAULT_BUILD_TYPE "${targetConfig.buildType}")
+            |set(DEFAULT_BUILD_TYPE "${targetConfig.get(BuildTypeProperty())}")
             |if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
             |set    (CMAKE_BUILD_TYPE "$S{DEFAULT_BUILD_TYPE}" CACHE STRING "Choose the type of build." FORCE)
             |endif()
@@ -133,11 +137,11 @@ class CppStandaloneCmakeGenerator(private val targetConfig: TargetConfig, privat
 
     fun generateCmake(sources: List<Path>): String {
         // Resolve path to the cmake include files if any was provided
-        val includeFiles = targetConfig.cmakeIncludes.get()?.map { fileConfig.srcPath.resolve(it).toUnixString() }
+        val includeFiles = targetConfig.get(CmakeIncludeProperty())?.map { fileConfig.srcPath.resolve(it).toUnixString() }
 
         val reactorCppTarget = when {
-            targetConfig.externalRuntimePath.isSet -> "reactor-cpp"
-            targetConfig.runtimeVersion.isSet      -> "reactor-cpp-${targetConfig.runtimeVersion}"
+            targetConfig.isSet(ExternalRuntimePathProperty()) -> "reactor-cpp"
+            targetConfig.isSet(RuntimeVersionProperty())      -> "reactor-cpp-${targetConfig.get(RuntimeVersionProperty())}"
             else                                   -> "reactor-cpp-default"
         }
 
@@ -146,7 +150,7 @@ class CppStandaloneCmakeGenerator(private val targetConfig: TargetConfig, privat
                 |cmake_minimum_required(VERSION 3.5)
                 |project(${fileConfig.name} VERSION 0.0.0 LANGUAGES CXX)
                 |
-                |${if (targetConfig.externalRuntimePath != null) "find_package(reactor-cpp PATHS ${targetConfig.externalRuntimePath})" else ""}
+                |${if (targetConfig.get(ExternalRuntimePathProperty()) != null) "find_package(reactor-cpp PATHS ${targetConfig.get(ExternalRuntimePathProperty())})" else ""}
                 |
                 |set(LF_MAIN_TARGET ${fileConfig.name})
                 |
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
index 8d21e05282..5f7adb4ae5 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
@@ -2,6 +2,8 @@ package org.lflang.generator.cpp
 
 import org.lflang.generator.CodeMap
 import org.lflang.generator.LFGeneratorContext
+import org.lflang.target.property.BuildTypeProperty
+import org.lflang.target.property.CompilerProperty
 import org.lflang.target.property.type.BuildTypeType.BuildType
 import org.lflang.toUnixString
 import org.lflang.util.FileUtil
@@ -140,7 +142,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
         if (version.compareVersion("3.12.0") < 0) {
             messageReporter.nowhere().warning("CMAKE is older than version 3.12. Parallel building is not supported.")
             makeArgs =
-                listOf("--build", ".", "--target", target, "--config", buildTypeToCmakeConfig(targetConfig.buildType.get()))
+                listOf("--build", ".", "--target", target, "--config", buildTypeToCmakeConfig(targetConfig.get(BuildTypeProperty())))
         } else {
             val cores = Runtime.getRuntime().availableProcessors()
             makeArgs = listOf(
@@ -151,7 +153,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
                 "--parallel",
                 cores.toString(),
                 "--config",
-                buildTypeToCmakeConfig(targetConfig.buildType.get())
+                buildTypeToCmakeConfig(targetConfig.get(BuildTypeProperty()))
             )
         }
 
@@ -170,8 +172,8 @@ class CppStandaloneGenerator(generator: CppGenerator) :
         )
 
         // prepare cmake
-        if (targetConfig.compiler != null) {
-            cmd.setEnvironmentVariable("CXX", targetConfig.compiler.get())
+        if (targetConfig.get(CompilerProperty()) != null) {
+            cmd.setEnvironmentVariable("CXX", targetConfig.get(CompilerProperty()))
         }
         return cmd
     }
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt
index 9fb16455fe..c288222e25 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt
@@ -5,6 +5,11 @@ import org.lflang.generator.PrependOperator
 import org.lflang.inferredType
 import org.lflang.lf.Parameter
 import org.lflang.lf.Reactor
+import org.lflang.target.property.ExportDependencyGraphProperty
+import org.lflang.target.property.ExportToYamlProperty
+import org.lflang.target.property.FastProperty
+import org.lflang.target.property.TimeOutProperty
+import org.lflang.target.property.WorkersProperty
 import org.lflang.toUnixString
 
 /** C++ code generator responsible for generating the main file including the main() function */
@@ -58,9 +63,9 @@ class CppStandaloneMainGenerator(
             |int main(int argc, char **argv) {
             |  cxxopts::Options options("${fileConfig.name}", "Reactor Program");
             |
-            |  unsigned workers = ${if (targetConfig.workers.get() != 0) targetConfig.workers.get() else "std::thread::hardware_concurrency()"};
-            |  bool fast{${targetConfig.fastMode.get()}};
-            |  reactor::Duration timeout = ${if (targetConfig.timeout.isSet) targetConfig.timeout.get().toCppCode() else "reactor::Duration::max()"};
+            |  unsigned workers = ${if (targetConfig.get(WorkersProperty()) != 0) targetConfig.get(WorkersProperty()) else "std::thread::hardware_concurrency()"};
+            |  bool fast{${targetConfig.get(FastProperty())}};
+            |  reactor::Duration timeout = ${if (targetConfig.isSet(TimeOutProperty())) targetConfig.get(TimeOutProperty()).toCppCode() else "reactor::Duration::max()"};
             |  
             |  // the timeout variable needs to be tested beyond fitting the Duration-type 
             |  options
@@ -68,7 +73,7 @@ class CppStandaloneMainGenerator(
             |    .add_options()
             |      ("w,workers", "the number of worker threads used by the scheduler", cxxopts::value<unsigned>(workers)->default_value(std::to_string(workers)), "'unsigned'")
             |      ("o,timeout", "Time after which the execution is aborted.", cxxopts::value<reactor::Duration>(timeout)->default_value(time_to_string(timeout)), "'FLOAT UNIT'")
-            |      ("f,fast", "Allow logical time to run faster than physical time.", cxxopts::value<bool>(fast)->default_value("${targetConfig.fastMode}"))
+            |      ("f,fast", "Allow logical time to run faster than physical time.", cxxopts::value<bool>(fast)->default_value("${targetConfig.get(FastProperty())}"))
             |      ("help", "Print help");
             |      
         ${" |"..main.parameters.joinToString("\n\n") { generateParameterParser(it) }}
@@ -96,8 +101,8 @@ class CppStandaloneMainGenerator(
             |
             |  // assemble reactor program
             |  e.assemble();
-        ${" |".. if (targetConfig.exportDependencyGraph.get()) "e.export_dependency_graph(\"${main.name}.dot\");" else ""}
-        ${" |".. if (targetConfig.exportToYaml.get()) "e.dump_to_yaml(\"${main.name}.yaml\");" else ""}
+        ${" |".. if (targetConfig.get(ExportDependencyGraphProperty())) "e.export_dependency_graph(\"${main.name}.dot\");" else ""}
+        ${" |".. if (targetConfig.get(ExportToYamlProperty())) "e.dump_to_yaml(\"${main.name}.yaml\");" else ""}
             |
             |  // start execution
             |  auto thread = e.startup();
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
index b7d438d0dc..b9fc1a58db 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
@@ -36,6 +36,10 @@ import org.lflang.generator.TargetTypes
 
 import org.lflang.joinWithCommas
 import org.lflang.scoping.LFGlobalScopeProvider
+import org.lflang.target.property.BuildTypeProperty
+import org.lflang.target.property.CargoFeaturesProperty
+import org.lflang.target.property.CompilerFlagsProperty
+import org.lflang.target.property.NoCompileProperty
 import org.lflang.target.property.type.BuildTypeType
 import org.lflang.util.FileUtil
 import java.nio.file.Files
@@ -78,7 +82,7 @@ class RustGenerator(
         val gen = RustModelBuilder.makeGenerationInfo(targetConfig, reactors, messageReporter)
         val codeMaps: Map<Path, CodeMap> = RustEmitter.generateRustProject(fileConfig, gen)
 
-        if (targetConfig.noCompile.get() || errorsOccurred()) {
+        if (targetConfig.get(NoCompileProperty()) || errorsOccurred()) {
             context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, codeMaps))
             println("Exiting before invoking target compiler.")
         } else {
@@ -96,7 +100,7 @@ class RustGenerator(
         val args = mutableListOf<String>().apply {
             this += "build"
 
-            val buildType = targetConfig.rust.getBuildType(context.targetConfig.buildType)
+            val buildType = targetConfig.get(BuildTypeProperty())
             if (buildType == BuildTypeType.BuildType.RELEASE) {
                 this += "--release"
             } else if (buildType != BuildTypeType.BuildType.DEBUG) {
@@ -104,12 +108,12 @@ class RustGenerator(
                 this += buildType.cargoProfileName
             }
 
-            if (targetConfig.rust.cargoFeatures.get().isNotEmpty()) {
+            if (targetConfig.get(CargoFeaturesProperty()).isNotEmpty()) {
                 this += "--features"
-                this += targetConfig.rust.cargoFeatures.get().joinWithCommas()
+                this += targetConfig.get(CargoFeaturesProperty()).joinWithCommas()
             }
 
-            this += targetConfig.compilerFlags.get()
+            this += targetConfig.get(CompilerFlagsProperty())
 
             this += listOf("--message-format", "json-diagnostic-rendered-ansi")
         }
@@ -125,7 +129,7 @@ class RustGenerator(
 
         if (cargoReturnCode == 0) {
             // We still have to copy the compiled binary to the destination folder.
-            val buildType = targetConfig.rust.getBuildType(context.targetConfig.buildType)
+            val buildType = targetConfig.get(BuildTypeProperty())
             val binaryPath = validator.metadata?.targetDirectory!!
                 .resolve(buildType.cargoProfileName)
                 .resolve(fileConfig.executable.fileName)
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
index 52f0e19608..82e0fc842c 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
@@ -32,6 +32,17 @@ import org.lflang.generator.*
 import org.lflang.lf.*
 import org.lflang.lf.Timer
 import org.lflang.target.TargetConfig
+import org.lflang.target.property.CargoDependenciesProperty
+import org.lflang.target.property.CargoFeaturesProperty
+import org.lflang.target.property.ExportDependencyGraphProperty
+import org.lflang.target.property.ExternalRuntimePathProperty
+import org.lflang.target.property.KeepaliveProperty
+import org.lflang.target.property.RuntimeVersionProperty
+import org.lflang.target.property.RustIncludeProperty
+import org.lflang.target.property.SingleFileProjectProperty
+import org.lflang.target.property.ThreadingProperty
+import org.lflang.target.property.TimeOutProperty
+import org.lflang.target.property.WorkersProperty
 import java.nio.file.Path
 import java.util.*
 
@@ -429,7 +440,7 @@ object RustModelBuilder {
         val mainReactor = reactorsInfos.lastOrNull { it.isMain } ?: reactorsInfos.last()
 
 
-        val dependencies = targetConfig.rust.cargoDependencies.get().toMutableMap()
+        val dependencies = targetConfig.get(CargoDependenciesProperty()).toMutableMap()
         dependencies.compute(RustEmitterBase.runtimeCrateFullName) { _, spec ->
             computeDefaultRuntimeConfiguration(spec, targetConfig, messageReporter)
         }
@@ -440,8 +451,8 @@ object RustModelBuilder {
                 version = "1.0.0",
                 authors = listOf(System.getProperty("user.name")),
                 dependencies = dependencies,
-                modulesToIncludeInMain = targetConfig.rust.rustTopLevelModules.get(),
-                enabledCargoFeatures = targetConfig.rust.cargoFeatures.get().toSet()
+                modulesToIncludeInMain = targetConfig.get(RustIncludeProperty()),
+                enabledCargoFeatures = targetConfig.get(CargoFeaturesProperty()).toSet()
             ),
             reactors = reactorsInfos,
             mainReactor = mainReactor,
@@ -479,25 +490,25 @@ object RustModelBuilder {
             // default configuration for the runtime crate
 
             // enable parallel feature if asked
-            val parallelFeature = listOf(PARALLEL_RT_FEATURE).takeIf { targetConfig.threading.get() }
+            val parallelFeature = listOf(PARALLEL_RT_FEATURE).takeIf { targetConfig.get(ThreadingProperty()) }
 
             val spec = newCargoSpec(
                 features = parallelFeature,
             )
 
-            if (targetConfig.externalRuntimePath.isSet) {
-                spec.localPath = targetConfig.externalRuntimePath.get()
-            } else if (targetConfig.runtimeVersion.isSet) {
+            if (targetConfig.isSet(ExternalRuntimePathProperty())) {
+                spec.localPath = targetConfig.get(ExternalRuntimePathProperty())
+            } else if (targetConfig.isSet(RuntimeVersionProperty())) {
                 spec.gitRepo = RustEmitterBase.runtimeGitUrl
-                spec.rev = targetConfig.runtimeVersion.get()
+                spec.rev = targetConfig.get(RuntimeVersionProperty())
             } else {
                 spec.useDefaultRuntimePath()
             }
 
             return spec
         } else {
-            if (targetConfig.externalRuntimePath.isSet) {
-                userSpec.localPath = targetConfig.externalRuntimePath.get()
+            if (targetConfig.isSet(ExternalRuntimePathProperty())) {
+                userSpec.localPath = targetConfig.get(ExternalRuntimePathProperty())
             }
 
             if (userSpec.localPath == null && userSpec.gitRepo == null) {
@@ -505,11 +516,11 @@ object RustModelBuilder {
             }
 
             // enable parallel feature if asked
-            if (targetConfig.threading.get()) {
+            if (targetConfig.get(ThreadingProperty())) {
                 userSpec.features += PARALLEL_RT_FEATURE
             }
 
-            if (!targetConfig.threading.get() && PARALLEL_RT_FEATURE in userSpec.features) {
+            if (!targetConfig.get(ThreadingProperty()) && PARALLEL_RT_FEATURE in userSpec.features) {
                 messageReporter.nowhere().warning("Threading cannot be disabled as it was enabled manually as a runtime feature.")
             }
 
@@ -519,12 +530,12 @@ object RustModelBuilder {
 
     private fun TargetConfig.toRustProperties(): RustTargetProperties =
         RustTargetProperties(
-            keepAlive = this.keepalive.get(),
-            timeout = this.timeout.get()?.toRustTimeExpr(),
-            timeoutLf = this.timeout.get(),
-            singleFile = this.singleFileProject.get(),
-            workers = this.workers.get(),
-            dumpDependencyGraph = this.exportDependencyGraph.get(),
+            keepAlive = this.get(KeepaliveProperty()),
+            timeout = this.get(TimeOutProperty())?.toRustTimeExpr(),
+            timeoutLf = this.get(TimeOutProperty()),
+            singleFile = this.get(SingleFileProjectProperty()),
+            workers = this.get(WorkersProperty()),
+            dumpDependencyGraph = this.get(ExportDependencyGraphProperty()),
         )
 
     private fun makeReactorInfos(reactors: List<Reactor>): List<ReactorInfo> =
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
index fe25d3207b..af945f1d88 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
@@ -6,6 +6,7 @@ import org.lflang.generator.PrependOperator
 import org.lflang.generator.getTargetInitializer
 import org.lflang.lf.Parameter
 import org.lflang.lf.Reactor
+import org.lflang.target.property.CoordinationOptionsProperty
 import java.util.*
 
 /**
@@ -77,7 +78,7 @@ class TSConstructorGenerator(
 
     // Generate code for setting target configurations.
     private fun generateTargetConfigurations(targetConfig: TargetConfig): String {
-        val interval = targetConfig.coordinationOptions.get().advanceMessageInterval
+        val interval = targetConfig.get(CoordinationOptionsProperty()).advanceMessageInterval
         return if ((reactor.isMain) && interval != null) {
             "this.setAdvanceMessageInterval(${interval.toTsTime()})"
         } else ""
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
index 999b8fba54..7aafa6ad5a 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -35,6 +35,9 @@ import org.lflang.generator.GeneratorUtils.canGenerate
 import org.lflang.lf.Preamble
 import org.lflang.model
 import org.lflang.scoping.LFGlobalScopeProvider
+import org.lflang.target.property.DockerProperty
+import org.lflang.target.property.NoCompileProperty
+import org.lflang.target.property.ProtobufsProperty
 import org.lflang.util.FileUtil
 import java.nio.file.Files
 import java.nio.file.Path
@@ -117,7 +120,7 @@ class TSGenerator(
 
         val codeMaps = HashMap<Path, CodeMap>()
         generateCode(codeMaps, resource.model.preambles)
-        if (targetConfig.dockerOptions.get().enabled) {
+        if (targetConfig.get(DockerProperty()).enabled) {
             val dockerData = TSDockerGenerator(context).generateDockerData();
             dockerData.writeDockerFile()
             DockerComposeGenerator(context).writeDockerComposeFile(listOf(dockerData))
@@ -125,7 +128,7 @@ class TSGenerator(
         // For small programs, everything up until this point is virtually instantaneous. This is the point where cancellation,
         // progress reporting, and IDE responsiveness become real considerations.
 
-        if (context.mode != LFGeneratorContext.Mode.LSP_MEDIUM && targetConfig.noCompile.get()) {
+        if (context.mode != LFGeneratorContext.Mode.LSP_MEDIUM && targetConfig.get(NoCompileProperty())) {
             context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, null))
         } else {
             context.reportProgress(
@@ -136,7 +139,7 @@ class TSGenerator(
                 context.unsuccessfulFinish()
                 return
             }
-            if (targetConfig.protoFiles.get().size != 0) {
+            if (targetConfig.get(ProtobufsProperty()).size != 0) {
                 protoc()
             } else {
                 println("No .proto files have been imported. Skipping protocol buffer compilation.")
@@ -240,7 +243,7 @@ class TSGenerator(
         val tsCode = StringBuilder()
 
         val preambleGenerator = TSImportPreambleGenerator(fileConfig.srcFile,
-            targetConfig.protoFiles.get(), preambles)
+            targetConfig.get(ProtobufsProperty()), preambles)
         tsCode.append(preambleGenerator.generatePreamble())
 
         val parameterGenerator = TSParameterPreambleGenerator(fileConfig, targetConfig, reactors)
@@ -342,7 +345,7 @@ class TSGenerator(
     }
 
     private fun installProtoBufsIfNeeded(pnpmIsAvailable: Boolean, cwd: Path, cancelIndicator: CancelIndicator) {
-        if (targetConfig.protoFiles.get().size != 0) {
+        if (targetConfig.get(ProtobufsProperty()).size != 0) {
             commandFactory.createCommand(
                 if (pnpmIsAvailable) "pnpm" else "npm",
                 listOf("install", "google-protobuf"),
@@ -369,7 +372,7 @@ class TSGenerator(
                 "--ts_out=$tsOutPath"
             )
         )
-        protocArgs.addAll(targetConfig.protoFiles.get())
+        protocArgs.addAll(targetConfig.get(ProtobufsProperty()))
         val protoc = commandFactory.createCommand("protoc", protocArgs, fileConfig.srcPath)
 
         if (protoc == null) {
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
index 4efc48d045..e4e59ffc40 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
@@ -30,6 +30,10 @@ import org.lflang.target.TargetConfig
 import org.lflang.joinWithLn
 import org.lflang.lf.Parameter
 import org.lflang.lf.Reactor
+import org.lflang.target.property.FastProperty
+import org.lflang.target.property.KeepaliveProperty
+import org.lflang.target.property.LoggingProperty
+import org.lflang.target.property.TimeOutProperty
 import java.util.StringJoiner
 
 /**
@@ -49,7 +53,7 @@ class TSParameterPreambleGenerator(
 ) {
 
     private fun getTimeoutTimeValue(): String =
-        targetConfig.timeout.get()?.toTsTime() ?: "undefined"
+        targetConfig.get(TimeOutProperty())?.toTsTime() ?: "undefined"
 
     private fun getParameters(): List<Parameter> {
         var mainReactor: Reactor? = null
@@ -162,8 +166,8 @@ class TSParameterPreambleGenerator(
         val codeText = """
         |// ************* App Parameters
         |let __timeout: TimeValue | undefined = ${getTimeoutTimeValue()};
-        |let __keepAlive: boolean = ${targetConfig.keepalive};
-        |let __fast: boolean = ${targetConfig.fastMode};
+        |let __keepAlive: boolean = ${targetConfig.get(KeepaliveProperty())};
+        |let __fast: boolean = ${targetConfig.get(FastProperty())};
         |let __federationID: string = 'Unidentified Federation'
         |
         |let __noStart = false; // If set to true, don't start the app.
@@ -235,7 +239,7 @@ class TSParameterPreambleGenerator(
         |        throw new Error("'logging' command line argument is malformed.");
         |    }
         |} else {
-        |    Log.global.level = Log.levels.${targetConfig.logLevel.get().name}; // Default from target property.
+        |    Log.global.level = Log.levels.${targetConfig.get(LoggingProperty()).name}; // Default from target property.
         |}
         |
         |// Help parameter (not a constructor parameter, but a command line option)
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 695be5abee..8123bff865 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -1494,7 +1494,7 @@ private Model createModel(AbstractTargetProperty property, String value) throws
   public Collection<DynamicTest> checkTargetProperties() throws Exception {
     List<DynamicTest> result = new ArrayList<>();
 
-    for (AbstractTargetProperty property : TargetConfig.getUserTargetProperties()) {
+    for (AbstractTargetProperty property : (new TargetConfig(Target.C)).getRegisteredProperties()) {
       if (property instanceof CargoDependenciesProperty) {
         // we test that separately as it has better error messages
         continue;
diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index 7191efe494..7febf6cefc 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -24,6 +24,9 @@
 
 package org.lflang.tests;
 
+import org.lflang.target.property.LoggingProperty;
+import org.lflang.target.property.PlatformProperty;
+import org.lflang.target.property.ThreadingProperty;
 import org.lflang.target.property.type.LoggingType.LogLevel;
 import org.lflang.target.property.type.PlatformType.Platform;
 import org.lflang.tests.TestRegistry.TestCategory;
@@ -65,26 +68,26 @@ public static boolean disableThreading(LFTest test) {
 
   public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
     test.getContext().getArgs().setProperty("tracing", "false");
-    test.getContext().getTargetConfig().threading.override(false);
+    test.getContext().getTargetConfig().override(new ThreadingProperty(), false);
     // FIXME: use a record and override.
-    test.getContext().getTargetConfig().platformOptions.get().platform = Platform.ZEPHYR;
-    test.getContext().getTargetConfig().platformOptions.get().flash = false;
-    test.getContext().getTargetConfig().platformOptions.get().board = "qemu_cortex_m3";
+    test.getContext().getTargetConfig().get(new PlatformProperty()).platform = Platform.ZEPHYR;
+    test.getContext().getTargetConfig().get(new PlatformProperty()).flash = false;
+    test.getContext().getTargetConfig().get(new PlatformProperty()).board = "qemu_cortex_m3";
 
     // FIXME: Zephyr  emulations fails with debug log-levels.
-    test.getContext().getTargetConfig().logLevel.override(LogLevel.WARN);
+    test.getContext().getTargetConfig().override(new LoggingProperty(), LogLevel.WARN);
     test.getContext().getArgs().setProperty("logging", "warning");
     return true;
   }
 
   public static boolean makeZephyrCompatible(LFTest test) {
     test.getContext().getArgs().setProperty("tracing", "false");
-    test.getContext().getTargetConfig().platformOptions.get().platform = Platform.ZEPHYR;
-    test.getContext().getTargetConfig().platformOptions.get().flash = false;
-    test.getContext().getTargetConfig().platformOptions.get().board = "qemu_cortex_m3";
+    test.getContext().getTargetConfig().get(new PlatformProperty()).platform = Platform.ZEPHYR;
+    test.getContext().getTargetConfig().get(new PlatformProperty()).flash = false;
+    test.getContext().getTargetConfig().get(new PlatformProperty()).board = "qemu_cortex_m3";
 
     // FIXME: Zephyr  emulations fails with debug log-levels.
-    test.getContext().getTargetConfig().logLevel.override(LogLevel.WARN);
+    test.getContext().getTargetConfig().override(new LoggingProperty(), LogLevel.WARN);
     test.getContext().getArgs().setProperty("logging", "warning");
 
     return true;
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index 64bcdbe42e..2e125ffaa2 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -45,6 +45,7 @@
 import org.lflang.generator.LFGeneratorContext.BuildParm;
 import org.lflang.generator.MainContext;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.property.LoggingProperty;
 import org.lflang.tests.Configurators.Configurator;
 import org.lflang.tests.LFTest.Result;
 import org.lflang.tests.TestRegistry.TestCategory;
@@ -438,7 +439,7 @@ private void validate(LFTest test) throws TestError {
   /** Override to add some LFC arguments to all runs of this test class. */
   protected void addExtraLfcArgs(Properties args, TargetConfig targetConfig) {
     args.setProperty("build-type", "Test");
-    if (!targetConfig.logLevel.isSet()) args.setProperty("logging", "Debug");
+    if (!targetConfig.isSet(new LoggingProperty())) args.setProperty("logging", "Debug");
   }
 
   /**

From 9aec15284fbee14aa82771bddb6f9e74edfa5490 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 5 Oct 2023 00:29:38 -0700
Subject: [PATCH 0996/1114] Further refactoring. Next: fixes and cleanup.

---
 .../org/lflang/AbstractTargetProperty.java    | 109 +++++++-----------
 .../federated/generator/FedTargetConfig.java  |  43 ++++++-
 .../org/lflang/generator/GeneratorUtils.java  |   3 +-
 .../java/org/lflang/target/TargetConfig.java  |  65 ++++++++++-
 .../org/lflang/target/TargetProperty.java     |  86 +-------------
 .../property/AbstractBooleanProperty.java     |   4 +-
 .../property/AbstractFileListProperty.java    |  13 +--
 .../target/property/AbstractStringConfig.java |   4 +-
 .../property/AbstractStringListProperty.java  |  31 ++---
 .../property/BuildCommandsProperty.java       |   4 +-
 .../target/property/BuildTypeProperty.java    |   4 +-
 .../property/CargoDependenciesProperty.java   |   7 +-
 .../property/ClockSyncModeProperty.java       |   4 +-
 .../property/ClockSyncOptionsProperty.java    |  18 +--
 .../target/property/CmakeIncludeProperty.java |  24 ++--
 .../property/CompileDefinitionsProperty.java  |  12 +-
 .../property/CoordinationOptionsProperty.java |   6 +-
 .../target/property/CoordinationProperty.java |   4 +-
 .../target/property/DockerProperty.java       |  10 +-
 .../target/property/FedSetupProperty.java     |   4 +-
 .../target/property/LoggingProperty.java      |   4 +-
 .../target/property/PlatformProperty.java     |  14 +--
 .../property/Ros2DependenciesProperty.java    |   4 +-
 .../target/property/RustIncludeProperty.java  |  11 +-
 .../target/property/SchedulerProperty.java    |   4 +-
 .../target/property/TimeOutProperty.java      |   4 +-
 .../target/property/TracingProperty.java      |  10 +-
 .../target/property/WorkersProperty.java      |   4 +-
 28 files changed, 241 insertions(+), 269 deletions(-)

diff --git a/core/src/main/java/org/lflang/AbstractTargetProperty.java b/core/src/main/java/org/lflang/AbstractTargetProperty.java
index 9b854a660e..19745ba27f 100644
--- a/core/src/main/java/org/lflang/AbstractTargetProperty.java
+++ b/core/src/main/java/org/lflang/AbstractTargetProperty.java
@@ -5,6 +5,7 @@
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
+import org.lflang.target.TargetConfig;
 import org.lflang.target.property.type.TargetPropertyType;
 
 /**
@@ -17,17 +18,9 @@
  */
 public abstract class AbstractTargetProperty<T, S extends TargetPropertyType> {
 
-  /** The type of values that can be assigned to this property. */
+  /** The type of values assignable to this target property. */
   public final S type;
 
-  /** Whether (after initialization) this property has been set. */
-  protected boolean isSet;
-
-  /**
-   * The value assigned to the target property, initialized using the {@code initialValue()} method.
-   */
-  private T value = initialValue();
-
   /**
    * Construct a new target property.
    *
@@ -74,14 +67,6 @@ public void checkType(KeyValuePair pair, MessageReporter reporter) {
     }
   }
 
-  /**
-   * Return {@code true} if this target property has been set (past initialization), {@code false}
-   * otherwise.
-   */
-  public boolean isSet() {
-    return isSet;
-  }
-
   /**
    * Return {@code true} if this target property is supported by the given target, {@code false}
    * otherwise.
@@ -92,52 +77,37 @@ public final boolean isSupported(Target target) {
     return supportedTargets().contains(target);
   }
 
-  /**
-   * Manually override the value of this target property.
-   *
-   * @param value The value to assign to this target property.
-   */
-  public void override(T value) {
-    this.isSet = true;
-    this.value = value;
-  }
-
-  /** Reset this target property to its initial value. */
-  public void reset() {
-    this.value = initialValue();
-    this.isSet = false;
-  }
-
-  /**
-   * Parse the given AST node into the given target config. Encountered errors are reported via the
-   * given reporter.
-   *
-   * @param node The AST node to derive a newly assigned value from.
-   * @param reporter A reporter for reporting errors.
-   */
-  public void set(Element node, MessageReporter reporter) {
-    var parsed = this.fromAst(node, reporter);
-    if (parsed != null) {
-      this.isSet = true;
-      this.value = parsed;
-    }
-  }
-
-  /**
-   * Parse the given element into the given target config. May use the error reporter to report
-   * format errors.
-   */
-  public void set(String value, MessageReporter err) {
-    var parsed = this.fromString(value, err);
-    if (parsed != null) {
-      this.isSet = true;
-      this.value = parsed;
-    }
-  }
+  //  /**
+  //   * Parse the given AST node into the given target config. Encountered errors are reported via
+  // the
+  //   * given reporter.
+  //   *
+  //   * @param node The AST node to derive a newly assigned value from.
+  //   * @param reporter A reporter for reporting errors.
+  //   */
+  //  public void set(Element node, MessageReporter reporter) {
+  //    var parsed = this.fromAst(node, reporter);
+  //    if (parsed != null) {
+  //      this.isSet = true;
+  //      this.value = parsed;
+  //    }
+  //  }
+
+  //  /**
+  //   * Parse the given element into the given target config. May use the error reporter to report
+  //   * format errors.
+  //   */
+  //  public void set(String value, MessageReporter err) {
+  //    var parsed = this.fromString(value, err);
+  //    if (parsed != null) {
+  //      this.isSet = true;
+  //      this.value = parsed;
+  //    }
+  //  }
 
   @Override
   public String toString() {
-    return value == null ? "" : value.toString();
+    return this.name();
   }
 
   /**
@@ -155,11 +125,6 @@ public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {}
   /** Return the initial value to assign to this target property. */
   public abstract T initialValue();
 
-  /** Return the value currently assigned to this target property. */
-  public T get() {
-    return value;
-  }
-
   /**
    * Given an AST node, produce a corresponding value that is assignable to this target property, or
    * report an error via the given reporter in case any problems are encountered.
@@ -186,8 +151,20 @@ public T get() {
   /**
    * Return an AST node that represents this target property and the value currently assigned to it.
    */
-  public abstract Element toAstElement();
+  public abstract Element toAstElement(T value);
 
   /** Return the name of this target property (in kebab case). */
   public abstract String name();
+
+  protected void update(TargetConfig config, T value) {
+    config.set(this, value);
+  }
+
+  public void update(TargetConfig config, Element node, MessageReporter reporter) {
+    this.update(config, fromAst(node, reporter));
+  }
+
+  public void update(TargetConfig config, String value, MessageReporter reporter) {
+    this.update(config, fromString(value, reporter));
+  }
 }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
index 008ee3f85c..7283ae5261 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
@@ -3,12 +3,16 @@
 import static org.lflang.ast.ASTUtils.convertToEmptyListIfNull;
 
 import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.lflang.MessageReporter;
+import org.lflang.ast.ASTUtils;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGeneratorContext;
+import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.LfFactory;
 import org.lflang.target.TargetConfig;
-import org.lflang.target.TargetProperty;
 import org.lflang.target.property.ClockSyncModeProperty;
 import org.lflang.target.property.ClockSyncOptionsProperty;
 import org.lflang.util.FileUtil;
@@ -60,7 +64,7 @@ private void mergeImportedConfig(
       var targetProperties = importedTargetDecl.getConfig();
       if (targetProperties != null) {
         // Merge properties
-        TargetProperty.update(
+        update(
             this,
             convertToEmptyListIfNull(targetProperties.getPairs()),
             getRelativePath(mainResource, federateResource),
@@ -80,4 +84,39 @@ private void clearPropertiesToIgnore() {
     this.reset(new ClockSyncModeProperty());
     this.reset(new ClockSyncOptionsProperty());
   }
+
+  /**
+   * Update the given configuration using the given target properties.
+   *
+   * @param config The configuration object to update.
+   * @param pairs AST node that holds all the target properties.
+   * @param relativePath The path from the main resource to the resource from which the new
+   *     properties originate.
+   */
+  public void update(
+      TargetConfig config, List<KeyValuePair> pairs, Path relativePath, MessageReporter err) {
+    pairs.forEach(
+        pair -> {
+          var p = config.forName(pair.getName());
+          if (p.isPresent()) {
+            var value = pair.getValue();
+            if (pair.getName().equals("files")) {
+              var array = LfFactory.eINSTANCE.createArray();
+              ASTUtils.elementToListOfStrings(pair.getValue()).stream()
+                  .map(relativePath::resolve) // assume all paths are relative
+                  .map(Objects::toString)
+                  .map(
+                      s -> {
+                        var element = LfFactory.eINSTANCE.createElement();
+                        element.setLiteral(s);
+                        return element;
+                      })
+                  .forEach(array.getElements()::add);
+              value = LfFactory.eINSTANCE.createElement();
+              value.setArray(array);
+            }
+            p.get().update(this, value, err);
+          }
+        });
+  }
 }
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index 4ee4f070b2..e846bb03dc 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -23,7 +23,6 @@
 import org.lflang.lf.Reactor;
 import org.lflang.lf.TargetDecl;
 import org.lflang.target.TargetConfig;
-import org.lflang.target.TargetProperty;
 import org.lflang.target.property.KeepaliveProperty;
 
 /**
@@ -123,7 +122,7 @@ public static LFResource getLFResource(
     var targetConfig = new TargetConfig(Target.fromDecl(target));
     if (config != null) {
       List<KeyValuePair> pairs = config.getPairs();
-      TargetProperty.load(targetConfig, pairs != null ? pairs : List.of(), messageReporter);
+      targetConfig.load(pairs != null ? pairs : List.of(), messageReporter);
     }
     FileConfig fc =
         LFGenerator.createFileConfig(
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 868a5f3f9b..f58a3e1ed3 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -147,11 +147,11 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
     this(Target.fromDecl(target));
     if (target.getConfig() != null) {
       List<KeyValuePair> pairs = target.getConfig().getPairs();
-      TargetProperty.load(this, pairs, messageReporter);
+      this.load(pairs, messageReporter);
     }
 
     if (cliArgs != null) {
-      TargetProperty.load(this, cliArgs, messageReporter);
+      this.load(cliArgs, messageReporter);
     }
   }
 
@@ -161,7 +161,7 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
   /** Flags to pass to the linker, unless a build command has been specified. */
   public String linkerFlags = "";
 
-  private final Map<AbstractTargetProperty<?, ?>, Object> properties = new HashMap<>();
+  protected final Map<AbstractTargetProperty<?, ?>, Object> properties = new HashMap<>();
 
   private final Set<AbstractTargetProperty<?, ?>> setProperties = new HashSet<>();
 
@@ -170,22 +170,33 @@ public void register(AbstractTargetProperty<?, ?>... properties) {
         .forEach(property -> this.properties.put(property, property.initialValue()));
   }
 
+  /**
+   * Manually override the value of this target property.
+   *
+   * @param value The value to assign to this target property.
+   */
   public <T, S extends TargetPropertyType> void override(
       AbstractTargetProperty<T, S> property, T value) {
     this.setProperties.add(property);
     this.properties.put(property, value);
   }
 
-  public void reset(AbstractTargetProperty property) {
+  /** Reset this target property to its initial value (and mark it as unset). */
+  public void reset(AbstractTargetProperty<?, ?> property) {
     this.properties.remove(property);
     this.setProperties.remove(property);
   }
 
+  /** Return the value currently assigned to the given target property. */
   @SuppressWarnings("unchecked")
   public <T, S extends TargetPropertyType> T get(AbstractTargetProperty<T, S> property) {
     return (T) properties.get(property);
   }
 
+  /**
+   * Return {@code true} if this target property has been set (past initialization), {@code false}
+   * otherwise.
+   */
   public boolean isSet(AbstractTargetProperty<?, ?> property) {
     return this.setProperties.contains(property);
   }
@@ -197,7 +208,7 @@ public String listOfRegisteredProperties() {
         .collect(Collectors.joining(", "));
   }
 
-  public List<AbstractTargetProperty> getRegisteredProperties() {
+  public List<AbstractTargetProperty<?, ?>> getRegisteredProperties() {
     return this.properties.keySet().stream()
         .sorted((p1, p2) -> p1.getClass().getName().compareTo(p2.getClass().getName()))
         .collect(Collectors.toList());
@@ -208,9 +219,51 @@ public List<AbstractTargetProperty> getRegisteredProperties() {
    *
    * @param name The string to match against.
    */
-  public Optional<AbstractTargetProperty> forName(String name) {
+  public Optional<AbstractTargetProperty<?, ?>> forName(String name) {
     return this.getRegisteredProperties().stream()
         .filter(c -> c.name().equalsIgnoreCase(name))
         .findFirst();
   }
+
+  public void load(Properties properties, MessageReporter err) {
+    for (Object key : properties.keySet()) {
+      var p = this.forName(key.toString());
+      if (p.isPresent()) {
+        var property = p.get();
+        property.update(this, (String) properties.get(key), err);
+      } else {
+        throw new RuntimeException("Attempting to load unrecognized target property");
+      }
+    }
+  }
+
+  /**
+   * Set the configuration using the given pairs from the AST.
+   *
+   * @param pairs AST node that holds all the target properties.
+   * @param err Error reporter on which property format errors will be reported
+   */
+  public void load(List<KeyValuePair> pairs, MessageReporter err) {
+    if (pairs == null) {
+      return;
+    }
+    pairs.forEach(
+        pair -> {
+          var p = forName(pair.getName());
+          if (p.isPresent()) {
+            var property = p.get();
+            property.update(this, pair.getValue(), err);
+          }
+        });
+  }
+
+  public <T, S extends TargetPropertyType> void set(
+      AbstractTargetProperty<T, S> property, T value) {
+    this.setProperties.add(property);
+    this.properties.put(property, value);
+  }
+
+  public void markSet(AbstractTargetProperty property) {
+    this.setProperties.add(property);
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/TargetProperty.java b/core/src/main/java/org/lflang/target/TargetProperty.java
index c47386981d..7f24e131f5 100644
--- a/core/src/main/java/org/lflang/target/TargetProperty.java
+++ b/core/src/main/java/org/lflang/target/TargetProperty.java
@@ -25,17 +25,11 @@
 
 package org.lflang.target;
 
-import java.nio.file.Path;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Objects;
-import java.util.Properties;
 import java.util.stream.Collectors;
 import org.lflang.AbstractTargetProperty;
-import org.lflang.MessageReporter;
 import org.lflang.Target;
-import org.lflang.ast.ASTUtils;
-import org.lflang.generator.InvalidLfSourceException;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
@@ -52,43 +46,6 @@
  */
 public class TargetProperty {
 
-  public static void load(TargetConfig config, Properties properties, MessageReporter err) {
-    for (Object key : properties.keySet()) {
-      var p = config.forName(key.toString());
-      if (p.isPresent()) {
-        try {
-          p.get().set(properties.get(key).toString(), err);
-        } catch (InvalidLfSourceException e) {
-          err.at(e.getNode()).error(e.getProblem());
-        }
-      }
-    }
-  }
-
-  /**
-   * Set the given configuration using the given target properties.
-   *
-   * @param config The configuration object to update.
-   * @param properties AST node that holds all the target properties.
-   * @param err Error reporter on which property format errors will be reported
-   */
-  public static void load(TargetConfig config, List<KeyValuePair> properties, MessageReporter err) {
-    if (properties == null) {
-      return;
-    }
-    properties.forEach(
-        property -> {
-          var p = config.forName(property.getName());
-          if (p.isPresent()) {
-            try {
-              p.get().set(property.getValue(), err);
-            } catch (InvalidLfSourceException e) {
-              err.at(e.getNode()).error(e.getProblem());
-            }
-          }
-        });
-  }
-
   /**
    * Extracts all properties as a list of key-value pairs from a TargetConfig. Only extracts
    * properties explicitly set by user.
@@ -96,12 +53,13 @@ public static void load(TargetConfig config, List<KeyValuePair> properties, Mess
    * @param config The TargetConfig to extract from.
    * @return The extracted properties.
    */
-  public static List<KeyValuePair> extractProperties(TargetConfig config) {
+  public static List<KeyValuePair> extractProperties(
+      TargetConfig config) { // FIXME: move to TargetConfig
     var res = new LinkedList<KeyValuePair>();
     for (AbstractTargetProperty p : TargetProperty.loaded(config)) {
       KeyValuePair kv = LfFactory.eINSTANCE.createKeyValuePair();
       kv.setName(p.name());
-      kv.setValue(p.toAstElement());
+      kv.setValue(p.toAstElement(config.get(p)));
       if (kv.getValue() != null) {
         res.add(kv);
       }
@@ -114,7 +72,8 @@ public static List<KeyValuePair> extractProperties(TargetConfig config) {
    *
    * @param config The configuration to find the properties in.
    */
-  public static List<AbstractTargetProperty> loaded(TargetConfig config) {
+  public static List<AbstractTargetProperty> loaded(
+      TargetConfig config) { // FIXME: move to target config
     return config.getRegisteredProperties().stream()
         .filter(p -> config.isSet(p))
         .collect(Collectors.toList());
@@ -188,39 +147,4 @@ public static void validate(
               }
             });
   }
-
-  /**
-   * Update the given configuration using the given target properties.
-   *
-   * @param config The configuration object to update.
-   * @param properties AST node that holds all the target properties.
-   * @param relativePath The path from the main resource to the resource from which the new
-   *     properties originate.
-   */
-  public static void update(
-      TargetConfig config, List<KeyValuePair> properties, Path relativePath, MessageReporter err) {
-    properties.forEach(
-        property -> {
-          var p = config.forName(property.getName());
-          if (p.isPresent()) {
-            var value = property.getValue();
-            if (property.getName().equals("files")) {
-              var array = LfFactory.eINSTANCE.createArray();
-              ASTUtils.elementToListOfStrings(property.getValue()).stream()
-                  .map(relativePath::resolve) // assume all paths are relative
-                  .map(Objects::toString)
-                  .map(
-                      s -> {
-                        var element = LfFactory.eINSTANCE.createElement();
-                        element.setLiteral(s);
-                        return element;
-                      })
-                  .forEach(array.getElements()::add);
-              value = LfFactory.eINSTANCE.createElement();
-              value.setArray(array);
-            }
-            p.get().set(value, err);
-          }
-        });
-  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/AbstractBooleanProperty.java b/core/src/main/java/org/lflang/target/property/AbstractBooleanProperty.java
index 91530c9db7..9e6c2bc56c 100644
--- a/core/src/main/java/org/lflang/target/property/AbstractBooleanProperty.java
+++ b/core/src/main/java/org/lflang/target/property/AbstractBooleanProperty.java
@@ -29,7 +29,7 @@ protected Boolean fromString(String string, MessageReporter reporter) {
   }
 
   @Override
-  public Element toAstElement() {
-    return ASTUtils.toElement(get());
+  public Element toAstElement(Boolean value) {
+    return ASTUtils.toElement(value);
   }
 }
diff --git a/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java b/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java
index 3d866c62fe..bcdab64c96 100644
--- a/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java
+++ b/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java
@@ -6,6 +6,7 @@
 import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
+import org.lflang.target.TargetConfig;
 import org.lflang.target.property.type.UnionType;
 
 public abstract class AbstractFileListProperty
@@ -21,11 +22,9 @@ public List<String> initialValue() {
   }
 
   @Override
-  public void set(Element node, MessageReporter reporter) {
-    if (!this.isSet) {
-      super.set(node, reporter);
-    } else {
-      this.get().addAll(fromAst(node, reporter));
+  public void update(TargetConfig config, Element node, MessageReporter reporter) {
+    if (config.isSet(this)) {
+      config.get(this).addAll(fromAst(node, reporter));
     }
   }
 
@@ -40,7 +39,7 @@ protected List<String> fromString(String string, MessageReporter reporter) {
   }
 
   @Override
-  public Element toAstElement() {
-    return ASTUtils.toElement(get());
+  public Element toAstElement(List<String> value) {
+    return ASTUtils.toElement(value);
   }
 }
diff --git a/core/src/main/java/org/lflang/target/property/AbstractStringConfig.java b/core/src/main/java/org/lflang/target/property/AbstractStringConfig.java
index d4dcb9a3d3..a82bbd0e26 100644
--- a/core/src/main/java/org/lflang/target/property/AbstractStringConfig.java
+++ b/core/src/main/java/org/lflang/target/property/AbstractStringConfig.java
@@ -28,7 +28,7 @@ protected String fromString(String string, MessageReporter reporter) {
   }
 
   @Override
-  public Element toAstElement() {
-    return ASTUtils.toElement(this.get());
+  public Element toAstElement(String value) {
+    return ASTUtils.toElement(value);
   }
 }
diff --git a/core/src/main/java/org/lflang/target/property/AbstractStringListProperty.java b/core/src/main/java/org/lflang/target/property/AbstractStringListProperty.java
index 71ffbe500b..b0f78109ed 100644
--- a/core/src/main/java/org/lflang/target/property/AbstractStringListProperty.java
+++ b/core/src/main/java/org/lflang/target/property/AbstractStringListProperty.java
@@ -6,6 +6,7 @@
 import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
+import org.lflang.target.TargetConfig;
 import org.lflang.target.property.type.UnionType;
 
 /** Note: {@code set} implements an "append" semantics. */
@@ -16,10 +17,9 @@ public AbstractStringListProperty() {
     super(UnionType.STRING_OR_STRING_ARRAY);
   }
 
-  public void add(String entry) {
-    this.isSet = true;
-    var value = this.get();
-    value.add(entry);
+  public void add(TargetConfig config, String entry) {
+    config.markSet(this);
+    config.get(this).add(entry);
   }
 
   @Override
@@ -28,20 +28,9 @@ public List<String> initialValue() {
   }
 
   @Override
-  public void set(Element node, MessageReporter reporter) {
-    if (!this.isSet) {
-      super.set(node, reporter);
-    } else {
-      this.get().addAll(this.fromAst(node, reporter));
-    }
-  }
-
-  @Override
-  public void set(String string, MessageReporter err) {
-    if (!this.isSet) {
-      super.set(string, err);
-    } else {
-      this.get().addAll(this.fromString(string, err));
+  public void update(TargetConfig config, Element node, MessageReporter reporter) {
+    if (config.isSet(this)) {
+      config.get(this).addAll(fromAst(node, reporter));
     }
   }
 
@@ -52,11 +41,11 @@ public List<String> fromAst(Element node, MessageReporter reporter) {
 
   @Override
   protected List<String> fromString(String string, MessageReporter reporter) {
-    return List.of(string.split(" "));
+    return List.of(string.split(" ")); // FIXME: this does not look right
   }
 
   @Override
-  public Element toAstElement() {
-    return ASTUtils.toElement(get());
+  public Element toAstElement(List<String> value) {
+    return ASTUtils.toElement(value);
   }
 }
diff --git a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
index 29a35fb2b9..19ccaba064 100644
--- a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
@@ -42,8 +42,8 @@ public List<Target> supportedTargets() {
   }
 
   @Override
-  public Element toAstElement() {
-    return ASTUtils.toElement(this.get().toString());
+  public Element toAstElement(List<String> value) {
+    return ASTUtils.toElement(value);
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
index c613ac5c42..48def1278c 100644
--- a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
@@ -21,8 +21,8 @@ public BuildTypeProperty() {
   }
 
   @Override
-  public Element toAstElement() {
-    return ASTUtils.toElement(this.get().toString());
+  public Element toAstElement(BuildType value) {
+    return ASTUtils.toElement(value.toString());
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
index 859b697a13..95a95790c1 100644
--- a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
@@ -68,14 +68,13 @@ public List<Target> supportedTargets() {
   }
 
   @Override
-  public Element toAstElement() {
-    var deps = this.get();
-    if (deps.size() == 0) {
+  public Element toAstElement(Map<String, CargoDependencySpec> value) {
+    if (value.size() == 0) {
       return null;
     } else {
       Element e = LfFactory.eINSTANCE.createElement();
       KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-      for (var ent : deps.entrySet()) {
+      for (var ent : value.entrySet()) {
         KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
         pair.setName(ent.getKey());
         pair.setValue(CargoDependencySpec.extractSpec(ent.getValue()));
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
index bc7fa61f09..06863f3a01 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
@@ -62,8 +62,8 @@ public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
   }
 
   @Override
-  public Element toAstElement() {
-    return ASTUtils.toElement(this.get().toString());
+  public Element toAstElement(ClockSyncMode value) {
+    return ASTUtils.toElement(value.toString());
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
index 6cb0d76d8a..d84fefe76c 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
@@ -61,29 +61,29 @@ public List<Target> supportedTargets() {
   }
 
   @Override
-  public Element toAstElement() {
+  public Element toAstElement(ClockSyncOptions value) {
     Element e = LfFactory.eINSTANCE.createElement();
     KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
     for (ClockSyncOption opt : ClockSyncOption.values()) {
       KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
       pair.setName(opt.toString());
       switch (opt) {
-        case ATTENUATION -> pair.setValue(ASTUtils.toElement(get().attenuation));
-        case COLLECT_STATS -> pair.setValue(ASTUtils.toElement(get().collectStats));
-        case LOCAL_FEDERATES_ON -> pair.setValue(ASTUtils.toElement(get().localFederatesOn));
+        case ATTENUATION -> pair.setValue(ASTUtils.toElement(value.attenuation));
+        case COLLECT_STATS -> pair.setValue(ASTUtils.toElement(value.collectStats));
+        case LOCAL_FEDERATES_ON -> pair.setValue(ASTUtils.toElement(value.localFederatesOn));
         case PERIOD -> {
-          if (get().period == null) {
+          if (value.period == null) {
             continue; // don't set if null
           }
-          pair.setValue(ASTUtils.toElement(get().period));
+          pair.setValue(ASTUtils.toElement(value.period));
         }
         case TEST_OFFSET -> {
-          if (get().testOffset == null) {
+          if (value.testOffset == null) {
             continue; // don't set if null
           }
-          pair.setValue(ASTUtils.toElement(get().testOffset));
+          pair.setValue(ASTUtils.toElement(value.testOffset));
         }
-        case TRIALS -> pair.setValue(ASTUtils.toElement(get().trials));
+        case TRIALS -> pair.setValue(ASTUtils.toElement(value.trials));
       }
       kvp.getPairs().add(pair);
     }
diff --git a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
index 4c4a8fa108..5ab3133599 100644
--- a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
@@ -8,6 +8,7 @@
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
+import org.lflang.target.TargetConfig;
 import org.lflang.target.property.type.UnionType;
 
 /**
@@ -22,10 +23,9 @@ public CmakeIncludeProperty() {
     super(UnionType.FILE_OR_FILE_ARRAY);
   }
 
-  public void add(String entry) {
-    this.isSet = true;
-    var value = this.get();
-    value.add(entry);
+  public void add(TargetConfig config, String entry) {
+    config.markSet(this);
+    config.get(this).add(entry);
   }
 
   @Override
@@ -34,15 +34,9 @@ public List<String> initialValue() {
   }
 
   @Override
-  public void set(Element node, MessageReporter reporter) {
-    if (!this.isSet) {
-      super.set(node, reporter);
-    } else {
-      // NOTE: This merging of lists is potentially dangerous since
-      // the incoming list of cmake-includes can belong to a .lf file that is
-      // located in a different location, and keeping just filename
-      // strings like this without absolute paths is incorrect.
-      this.get().addAll(ASTUtils.elementToListOfStrings(node));
+  public void update(TargetConfig config, Element node, MessageReporter reporter) {
+    if (config.isSet(this)) {
+      config.get(this).addAll(fromAst(node, reporter));
     }
   }
 
@@ -62,8 +56,8 @@ public List<Target> supportedTargets() {
   }
 
   @Override
-  public Element toAstElement() {
-    return ASTUtils.toElement(this.get());
+  public Element toAstElement(List<String> value) {
+    return ASTUtils.toElement(value);
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
index ab7a7772d9..5ee2642393 100644
--- a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
@@ -9,6 +9,7 @@
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
+import org.lflang.target.TargetConfig;
 import org.lflang.target.property.type.StringDictionaryType;
 
 /**
@@ -24,10 +25,9 @@ public CompileDefinitionsProperty() {
     super(StringDictionaryType.COMPILE_DEFINITION);
   }
 
-  public void put(String k, String v) {
-    this.isSet = true;
-    var value = this.get();
-    value.put(k, v);
+  public void put(TargetConfig config, String k, String v) {
+    config.markSet(this);
+    config.get(this).put(k, v);
   }
 
   @Override
@@ -51,8 +51,8 @@ public List<Target> supportedTargets() {
   }
 
   @Override
-  public Element toAstElement() {
-    return ASTUtils.toElement(this.get());
+  public Element toAstElement(Map<String, String> value) {
+    return ASTUtils.toElement(value);
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
index a84506eedf..c7247627e0 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
@@ -55,17 +55,17 @@ public List<Target> supportedTargets() {
   }
 
   @Override
-  public Element toAstElement() {
+  public Element toAstElement(CoordinationOptions value) {
     Element e = LfFactory.eINSTANCE.createElement();
     KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
     for (CoordinationOption opt : CoordinationOption.values()) {
       KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
       pair.setName(opt.toString());
       if (opt == CoordinationOption.ADVANCE_MESSAGE_INTERVAL) {
-        if (this.get().advanceMessageInterval == null) {
+        if (value.advanceMessageInterval == null) {
           continue;
         }
-        pair.setValue(ASTUtils.toElement(get().advanceMessageInterval));
+        pair.setValue(ASTUtils.toElement(value.advanceMessageInterval));
       }
       kvp.getPairs().add(pair);
     }
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
index 3163154a91..361960f934 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
@@ -42,8 +42,8 @@ public List<Target> supportedTargets() {
   }
 
   @Override
-  public Element toAstElement() {
-    return ASTUtils.toElement(this.get().toString());
+  public Element toAstElement(CoordinationMode value) {
+    return ASTUtils.toElement(value.toString());
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/DockerProperty.java b/core/src/main/java/org/lflang/target/property/DockerProperty.java
index 998c38d082..67a454528d 100644
--- a/core/src/main/java/org/lflang/target/property/DockerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DockerProperty.java
@@ -63,10 +63,10 @@ public List<Target> supportedTargets() {
   }
 
   @Override
-  public Element toAstElement() {
-    if (!this.get().enabled) {
+  public Element toAstElement(DockerOptions value) {
+    if (!value.enabled) {
       return null;
-    } else if (this.get().equals(new DockerOptions(true))) {
+    } else if (value.equals(new DockerOptions(true))) {
       // default configuration
       return ASTUtils.toElement(true);
     } else {
@@ -76,10 +76,10 @@ public Element toAstElement() {
         KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
         pair.setName(opt.toString());
         if (opt == DockerOption.FROM) {
-          if (this.get().from == null) {
+          if (value.from == null) {
             continue;
           }
-          pair.setValue(ASTUtils.toElement(this.get().from));
+          pair.setValue(ASTUtils.toElement(value.from));
         }
         kvp.getPairs().add(pair);
       }
diff --git a/core/src/main/java/org/lflang/target/property/FedSetupProperty.java b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
index 5334e1c9be..e49d2b535e 100644
--- a/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
@@ -40,8 +40,8 @@ public List<Target> supportedTargets() {
   }
 
   @Override
-  public Element toAstElement() {
-    return ASTUtils.toElement(get());
+  public Element toAstElement(String value) {
+    return ASTUtils.toElement(value);
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/LoggingProperty.java b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
index 0784166762..e7d40d49a5 100644
--- a/core/src/main/java/org/lflang/target/property/LoggingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
@@ -39,8 +39,8 @@ public List<Target> supportedTargets() {
   }
 
   @Override
-  public Element toAstElement() {
-    return ASTUtils.toElement(get().toString());
+  public Element toAstElement(LogLevel value) {
+    return ASTUtils.toElement(value.toString());
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index f81062115d..02d37b6ca0 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -87,19 +87,19 @@ public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
   }
 
   @Override
-  public Element toAstElement() {
+  public Element toAstElement(PlatformOptions value) {
     Element e = LfFactory.eINSTANCE.createElement();
     KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
     for (PlatformOption opt : PlatformOption.values()) {
       KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
       pair.setName(opt.toString());
       switch (opt) {
-        case NAME -> pair.setValue(ASTUtils.toElement(get().platform.toString()));
-        case BAUDRATE -> pair.setValue(ASTUtils.toElement(get().baudRate));
-        case BOARD -> pair.setValue(ASTUtils.toElement(get().board));
-        case FLASH -> pair.setValue(ASTUtils.toElement(get().flash));
-        case PORT -> pair.setValue(ASTUtils.toElement(get().port));
-        case USER_THREADS -> pair.setValue(ASTUtils.toElement(get().userThreads));
+        case NAME -> pair.setValue(ASTUtils.toElement(value.platform.toString()));
+        case BAUDRATE -> pair.setValue(ASTUtils.toElement(value.baudRate));
+        case BOARD -> pair.setValue(ASTUtils.toElement(value.board));
+        case FLASH -> pair.setValue(ASTUtils.toElement(value.flash));
+        case PORT -> pair.setValue(ASTUtils.toElement(value.port));
+        case USER_THREADS -> pair.setValue(ASTUtils.toElement(value.userThreads));
       }
       kvp.getPairs().add(pair);
     }
diff --git a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
index 5f55913bca..d64df016a6 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
@@ -51,8 +51,8 @@ public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
   }
 
   @Override
-  public Element toAstElement() {
-    return ASTUtils.toElement(get());
+  public Element toAstElement(List<String> value) {
+    return ASTUtils.toElement(value);
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
index 478cc7e5e7..851bf7030f 100644
--- a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
@@ -75,17 +75,16 @@ protected List<Path> fromString(String string, MessageReporter reporter) {
   }
 
   @Override
-  public Element toAstElement() {
+  public Element toAstElement(List<Path> value) {
     // do not check paths here, and simply copy the absolute path over
-    List<Path> paths = this.get();
-    if (paths.isEmpty()) {
+    if (value.isEmpty()) {
       return null;
-    } else if (paths.size() == 1) {
-      return ASTUtils.toElement(paths.get(0).toString());
+    } else if (value.size() == 1) {
+      return ASTUtils.toElement(value.get(0).toString());
     } else {
       Element e = LfFactory.eINSTANCE.createElement();
       Array arr = LfFactory.eINSTANCE.createArray();
-      for (Path p : paths) {
+      for (Path p : value) {
         arr.getElements().add(ASTUtils.toElement(p.toString()));
       }
       e.setArray(arr);
diff --git a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
index c3438d44e6..14de36e2da 100644
--- a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
@@ -46,8 +46,8 @@ public List<Target> supportedTargets() {
   }
 
   @Override
-  public Element toAstElement() {
-    return ASTUtils.toElement(this.get().toString());
+  public Element toAstElement(Scheduler value) {
+    return ASTUtils.toElement(value.toString());
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
index d2575ae561..2a118a3851 100644
--- a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
@@ -37,8 +37,8 @@ public List<Target> supportedTargets() {
   }
 
   @Override
-  public Element toAstElement() {
-    return ASTUtils.toElement(get());
+  public Element toAstElement(TimeValue value) {
+    return ASTUtils.toElement(value);
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index 0c69a7fd5e..ce8470a512 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -79,10 +79,10 @@ public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
   }
 
   @Override
-  public Element toAstElement() {
-    if (!this.get().isEnabled()) {
+  public Element toAstElement(TracingOptions value) {
+    if (!value.isEnabled()) {
       return null;
-    } else if (this.get().equals(new TracingOptions(true))) {
+    } else if (value.equals(new TracingOptions(true))) {
       // default values
       return ASTUtils.toElement(true);
     } else {
@@ -92,10 +92,10 @@ public Element toAstElement() {
         KeyValuePair pair = LfFactory.eINSTANCE.createKeyValuePair();
         pair.setName(opt.toString());
         if (opt == TracingOption.TRACE_FILE_NAME) {
-          if (this.get().traceFileName == null) {
+          if (value.traceFileName == null) {
             continue;
           }
-          pair.setValue(ASTUtils.toElement(this.get().traceFileName));
+          pair.setValue(ASTUtils.toElement(value.traceFileName));
         }
         kvp.getPairs().add(pair);
       }
diff --git a/core/src/main/java/org/lflang/target/property/WorkersProperty.java b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
index 19a433e8db..88e9292322 100644
--- a/core/src/main/java/org/lflang/target/property/WorkersProperty.java
+++ b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
@@ -39,8 +39,8 @@ public List<Target> supportedTargets() {
   }
 
   @Override
-  public Element toAstElement() {
-    return ASTUtils.toElement(get());
+  public Element toAstElement(Integer value) {
+    return ASTUtils.toElement(value);
   }
 
   @Override

From 475306e6efe97fb0ba9fec4f06df57fa6460fb25 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Thu, 5 Oct 2023 10:56:52 +0200
Subject: [PATCH 0997/1114] Fixed trimming of the recorded test output

This fixes a bug in our test framework. It seems like
`Runtime.getRuntime().freeMemory()` does not indicate the total memory that can
still be allocated, but only the free memory that is already allocated by the
runtime. Therefore, the recorded output was often cut prematurely.
This fix only considers the size of the recorded string buffer. It also makes
sure, that the buffer is trimmed after deleting elements.
---
 .../testFixtures/java/org/lflang/tests/LFTest.java    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/LFTest.java b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
index 1fa4184237..b003a95264 100644
--- a/core/src/testFixtures/java/org/lflang/tests/LFTest.java
+++ b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
@@ -258,11 +258,16 @@ private Thread recordStream(StringBuffer builder, InputStream inputStream) {
               int len;
               char[] buf = new char[1024];
               while ((len = reader.read(buf)) > 0) {
-                if (Runtime.getRuntime().freeMemory() < Runtime.getRuntime().totalMemory() / 2) {
+                builder.append(buf, 0, len);
+                // If the buffer gets too large, then we delete the first half of the buffer
+                // and trim it down in size. It is important to decide what "too large" means.
+                // Here we take 1/4 of the total memory available to the Java runtime as a rule of
+                // thumb.
+                if (builder.length() > Runtime.getRuntime().totalMemory() / 4) {
                   builder.delete(0, builder.length() / 2);
-                  builder.insert(0, "[earlier messages were removed to free up memory]%n");
+                  builder.insert(0, "[earlier messages were removed to free up memory]\n");
+                  builder.trimToSize();
                 }
-                builder.append(buf, 0, len);
               }
             } catch (IOException e) {
               throw new RuntimeIOException(e);

From ef4cf8106ff229ee28f18ba57b7654a05df96000 Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Thu, 5 Oct 2023 12:07:58 +0200
Subject: [PATCH 0998/1114] Fixed formatting

---
 .../diagram/synthesis/LinguaFrancaSynthesis.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
index 5d4d17288f..4b0d710cca 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -269,12 +269,12 @@ public class LinguaFrancaSynthesis extends AbstractDiagramSynthesis<Model> {
 
   public static final DisplayedActionData EXPAND_ALL =
       DisplayedActionData.create(ExpandAllReactorsAction.ID, "Show all Details");
-  
-  //-------------------------------------------------------------------------
-  
+
+  // -------------------------------------------------------------------------
+
   private final ToLf serializer = new ToLf();
-    
-  //-------------------------------------------------------------------------
+
+  // -------------------------------------------------------------------------
 
   @Override
   public List<SynthesisOption> getDisplayedSynthesisOptions() {
@@ -320,7 +320,7 @@ public KNode transform(final Model model) {
     setLayoutOption(rootNode, CoreOptions.ALGORITHM, LayeredOptions.ALGORITHM_ID);
     setLayoutOption(rootNode, CoreOptions.DIRECTION, Direction.RIGHT);
     setLayoutOption(rootNode, CoreOptions.PADDING, new ElkPadding(0));
-    
+
     // Set target for serializer
     serializer.setTarget(ASTUtils.getTarget(model));
 

From 31bcde35b8b8659f06fd305a3be0365e3d0decf4 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Thu, 5 Oct 2023 12:39:31 +0200
Subject: [PATCH 0999/1114] Do not explicitly specify a scheduler

---
 core/src/main/resources/lib/c/reactor-c               | 2 +-
 test/C/src/federated/DistributedCountDecentralized.lf | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 42e9c29c65..b6c4886aa9 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 42e9c29c659072d12c7fda99af95a556f08fb208
+Subproject commit b6c4886aa9269c09b10b83a5558a21f2658ebcc7
diff --git a/test/C/src/federated/DistributedCountDecentralized.lf b/test/C/src/federated/DistributedCountDecentralized.lf
index bd3d504ded..ad5a323dfb 100644
--- a/test/C/src/federated/DistributedCountDecentralized.lf
+++ b/test/C/src/federated/DistributedCountDecentralized.lf
@@ -11,7 +11,6 @@ target C {
   clock-sync-options: {
     local-federates-on: true
   },
-  scheduler: ADAPTIVE
 }
 
 import Count from "../lib/Count.lf"

From ce0d7c408a21c8bd1ec38ffbf9ea643ba9f6d108 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Thu, 5 Oct 2023 13:21:04 +0200
Subject: [PATCH 1000/1114] Spotless

---
 test/C/src/federated/DistributedCountDecentralized.lf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/C/src/federated/DistributedCountDecentralized.lf b/test/C/src/federated/DistributedCountDecentralized.lf
index ad5a323dfb..b06f56fb9b 100644
--- a/test/C/src/federated/DistributedCountDecentralized.lf
+++ b/test/C/src/federated/DistributedCountDecentralized.lf
@@ -10,7 +10,7 @@ target C {
   clock-sync: on,
   clock-sync-options: {
     local-federates-on: true
-  },
+  }
 }
 
 import Count from "../lib/Count.lf"

From 02472ae69f972b726cbdfc12fd235eec97731821 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@berkeley.edu>
Date: Thu, 5 Oct 2023 04:45:33 -0700
Subject: [PATCH 1001/1114] Align reactor-c to main

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index f0bd1bc653..76d1562550 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit f0bd1bc6533e4b47f2af9d4e9d8613fa5e670be0
+Subproject commit 76d15625500fdb14f0cef182bb2ecbdfa362196a

From 506f4871062764e8d0b5b618df836b5750d2a8c5 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Thu, 5 Oct 2023 20:36:18 +0200
Subject: [PATCH 1002/1114] Bump reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index b6c4886aa9..eefa45a98a 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit b6c4886aa9269c09b10b83a5558a21f2658ebcc7
+Subproject commit eefa45a98a024e288ae9abb33a93b7be1dddaecc

From 2c98113f3ad8677d49ceb9f0a2905596bc536d14 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 5 Oct 2023 23:27:49 -0700
Subject: [PATCH 1003/1114] Move Rust target properties

---
 .../generator/rust/RustTargetConfig.java      |  8 ++---
 .../java/org/lflang/target/TargetConfig.java  |  6 ++++
 .../compiler/LinguaFrancaValidationTest.java  | 30 ++++++++++---------
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
index 76dba1f2c9..7a13216046 100644
--- a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
+++ b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
@@ -24,7 +24,6 @@
 
 package org.lflang.generator.rust;
 
-import org.lflang.Target;
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.CargoDependenciesProperty;
 import org.lflang.target.property.CargoFeaturesProperty;
@@ -35,11 +34,10 @@
  *
  * @author Clément Fournier - TU Dresden, INSA Rennes
  */
-public final class RustTargetConfig extends TargetConfig {
+public final class RustTargetConfig {
 
-  public RustTargetConfig() {
-    super(Target.Rust);
-    register(
+  public RustTargetConfig(TargetConfig parent) {
+    parent.register(
         new CargoFeaturesProperty(), new CargoDependenciesProperty(), new RustIncludeProperty());
   }
 }
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index f58a3e1ed3..524266f802 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -42,6 +42,8 @@
 import org.lflang.target.property.AuthProperty;
 import org.lflang.target.property.BuildCommandsProperty;
 import org.lflang.target.property.BuildTypeProperty;
+import org.lflang.target.property.CargoDependenciesProperty;
+import org.lflang.target.property.CargoFeaturesProperty;
 import org.lflang.target.property.ClockSyncModeProperty;
 import org.lflang.target.property.ClockSyncOptionsProperty;
 import org.lflang.target.property.CmakeIncludeProperty;
@@ -67,6 +69,7 @@
 import org.lflang.target.property.Ros2DependenciesProperty;
 import org.lflang.target.property.Ros2Property;
 import org.lflang.target.property.RuntimeVersionProperty;
+import org.lflang.target.property.RustIncludeProperty;
 import org.lflang.target.property.SchedulerProperty;
 import org.lflang.target.property.SingleFileProjectProperty;
 import org.lflang.target.property.ThreadingProperty;
@@ -133,6 +136,9 @@ public TargetConfig(Target target) {
         new WorkersProperty());
 
     this.register(new FedSetupProperty());
+
+    this.register(
+        new CargoFeaturesProperty(), new CargoDependenciesProperty(), new RustIncludeProperty());
   }
 
   /**
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 8123bff865..f015b017b9 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -1476,8 +1476,8 @@ private List<String> synthesizeExamples(TargetPropertyType type, boolean correct
    * Create an LF program with the given key and value as a target property, parse it, and return
    * the resulting model.
    */
-  private Model createModel(AbstractTargetProperty property, String value) throws Exception {
-    var target = property.supportedTargets().stream().findFirst().get();
+  private Model createModel(Target target, AbstractTargetProperty property, String value)
+      throws Exception {
     return parseWithoutError(
         """
                 target %s {%s: %s};
@@ -1507,7 +1507,7 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
             DynamicTest.dynamicTest(
                 "Property %s (%s) - known good assignment: %s".formatted(property, type, it),
                 () -> {
-                  Model model = createModel(property, it);
+                  Model model = createModel(Target.C, property, it);
                   System.out.println(property.name());
                   System.out.println(it.toString());
                   validator.assertNoErrors(model);
@@ -1532,7 +1532,7 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
                       .formatted(property.name(), type, it),
                   () -> {
                     validator.assertError(
-                        createModel(property, it),
+                        createModel(Target.C, property, it),
                         LfPackage.eINSTANCE.getKeyValuePair(),
                         null,
                         String.format(
@@ -1555,13 +1555,13 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
                       // it.get(0).toString()));
                       if (it.get(1).equals(LfPackage.eINSTANCE.getElement())) {
                         validator.assertError(
-                            createModel(property, it.get(0).toString()),
+                            createModel(Target.C, property, it.get(0).toString()),
                             LfPackage.eINSTANCE.getElement(),
                             null,
                             String.format("Entry is required to be %s.", it.get(2)));
                       } else {
                         validator.assertError(
-                            createModel(property, it.get(0).toString()),
+                            createModel(Target.C, property, it.get(0).toString()),
                             LfPackage.eINSTANCE.getKeyValuePair(),
                             null,
                             String.format(
@@ -1590,26 +1590,26 @@ public void checkCargoDependencyProperty() throws Exception {
             "{ dep: { version: \"8.2\"} }",
             "{ dep: { version: \"8.2\", features: [\"foo\"]} }");
     for (String it : knownCorrect) {
-      validator.assertNoErrors(createModel(prop, it));
+      validator.assertNoErrors(createModel(Target.Rust, prop, it));
     }
 
     //                                               vvvvvvvvvvv
     validator.assertError(
-        createModel(prop, "{ dep: {/*empty*/} }"),
+        createModel(Target.C, prop, "{ dep: {/*empty*/} }"),
         LfPackage.eINSTANCE.getKeyValuePairs(),
         null,
         "Must specify one of 'version', 'path', or 'git'");
 
     //                                                vvvvvvvvvvv
     validator.assertError(
-        createModel(prop, "{ dep: { unknown_key: \"\"} }"),
+        createModel(Target.C, prop, "{ dep: { unknown_key: \"\"} }"),
         LfPackage.eINSTANCE.getKeyValuePair(),
         null,
         "Unknown key: 'unknown_key'");
 
     //                                                          vvvv
     validator.assertError(
-        createModel(prop, "{ dep: { features: \"\" } }"),
+        createModel(Target.C, prop, "{ dep: { features: \"\" } }"),
         LfPackage.eINSTANCE.getElement(),
         null,
         "Expected an array of strings for key 'features'");
@@ -1617,16 +1617,18 @@ public void checkCargoDependencyProperty() throws Exception {
 
   @Test
   public void checkPlatformProperty() throws Exception {
-    validator.assertNoErrors(createModel(new PlatformProperty(), Platform.ARDUINO.toString()));
     validator.assertNoErrors(
-        createModel(new PlatformProperty(), String.format("{name: %s}", Platform.ZEPHYR)));
+        createModel(Target.C, new PlatformProperty(), Platform.ARDUINO.toString()));
+    validator.assertNoErrors(
+        createModel(
+            Target.C, new PlatformProperty(), String.format("{name: %s}", Platform.ZEPHYR)));
     validator.assertError(
-        createModel(new PlatformProperty(), "foobar"),
+        createModel(Target.C, new PlatformProperty(), "foobar"),
         LfPackage.eINSTANCE.getKeyValuePair(),
         null,
         new PlatformType().toString());
     validator.assertError(
-        createModel(new PlatformProperty(), "{ name: foobar }"),
+        createModel(Target.C, new PlatformProperty(), "{ name: foobar }"),
         LfPackage.eINSTANCE.getElement(),
         null,
         new PlatformType().toString());

From 2f97533d03030032611935a271be27f457633db9 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Fri, 6 Oct 2023 17:20:14 +0200
Subject: [PATCH 1004/1114] Bump reactor-c

---
 core/src/main/resources/lib/c/reactor-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index eefa45a98a..5bbdefd558 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit eefa45a98a024e288ae9abb33a93b7be1dddaecc
+Subproject commit 5bbdefd558b2504cd6fd8e881132b11efdce498b

From 08bbc0efef1dd45d6361d92d9cff8da3de3512bb Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Tue, 10 Oct 2023 12:44:40 +0200
Subject: [PATCH 1005/1114] Fixed bug in the C++ reaction dependency analysis

This pulls in https://github.com/lf-lang/reactor-cpp/pull/54 and adds a couple
of testcases.
---
 core/src/main/resources/lib/cpp/reactor-cpp   |  2 +-
 test/Cpp/src/ReactionOrder.lf                 | 34 ++++++++++++
 .../enclave/EnclaveCommunicationHierarchy.lf  | 52 +++++++++++++++++++
 .../EnclaveCommunicationPhysicalHierarchy.lf  | 52 +++++++++++++++++++
 test/Cpp/src/enclave/EnclaveReactionOrder.lf  | 14 +++++
 5 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 test/Cpp/src/ReactionOrder.lf
 create mode 100644 test/Cpp/src/enclave/EnclaveCommunicationHierarchy.lf
 create mode 100644 test/Cpp/src/enclave/EnclaveCommunicationPhysicalHierarchy.lf
 create mode 100644 test/Cpp/src/enclave/EnclaveReactionOrder.lf

diff --git a/core/src/main/resources/lib/cpp/reactor-cpp b/core/src/main/resources/lib/cpp/reactor-cpp
index fa685f1db9..3b25ffe3e2 160000
--- a/core/src/main/resources/lib/cpp/reactor-cpp
+++ b/core/src/main/resources/lib/cpp/reactor-cpp
@@ -1 +1 @@
-Subproject commit fa685f1db99b1652e39a5cf3c6356a8db26b52bb
+Subproject commit 3b25ffe3e270ab10181552a7e08ba37a471d8868
diff --git a/test/Cpp/src/ReactionOrder.lf b/test/Cpp/src/ReactionOrder.lf
new file mode 100644
index 0000000000..0427423d49
--- /dev/null
+++ b/test/Cpp/src/ReactionOrder.lf
@@ -0,0 +1,34 @@
+target Cpp
+
+reactor Src {
+  output out: unsigned
+
+  reaction(startup) -> out {=
+    out.set(42);
+  =}
+}
+
+reactor Sink {
+  input in: unsigned
+
+  reaction(startup) in {=
+    if (!in.is_present()) {
+      reactor::log::Error() << "Received no value";
+      exit(1);
+    }
+    if(*in.get() != 42) {
+      reactor::log::Error() << "Received an unexpected value";
+      exit(1);
+    }
+  =}
+
+  reaction(shutdown) {=
+    reactor::log::Info() << "Success!";
+  =}
+}
+
+main reactor ReactionOrder {
+  src = new Src()
+  sink = new Sink()
+  src.out -> sink.in
+}
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationHierarchy.lf b/test/Cpp/src/enclave/EnclaveCommunicationHierarchy.lf
new file mode 100644
index 0000000000..05556839f9
--- /dev/null
+++ b/test/Cpp/src/enclave/EnclaveCommunicationHierarchy.lf
@@ -0,0 +1,52 @@
+target Cpp {
+  timeout: 1 s,
+  workers: 1
+}
+
+reactor Src {
+  timer t(0, 100 ms)
+  output out: int
+  state counter: int = 0
+
+  reaction(t) -> out {=
+    out.set(counter++);
+  =}
+}
+
+reactor Sink {
+  input in: int
+  state received: bool = false
+
+  reaction(in) {=
+    received = true;
+    auto value = *in.get();
+    reactor::log::Info() << "Received " << value;
+    auto expected = 100ms * value;
+    if (get_elapsed_logical_time() != expected) {
+      reactor::log::Error() << "Expecded value at " << expected << " but received it at " << get_elapsed_logical_time();
+      exit(1);
+    }
+  =}
+
+  reaction(shutdown) {=
+    if(!received) {
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
+    }
+  =}
+}
+
+reactor WrappedSink {
+  input in: int
+  sinkinner = new Sink()
+  in -> sinkinner.in
+}
+
+main reactor {
+  @enclave
+  src = new Src()
+  @enclave
+  sink = new WrappedSink()
+
+  src.out -> sink.in
+}
diff --git a/test/Cpp/src/enclave/EnclaveCommunicationPhysicalHierarchy.lf b/test/Cpp/src/enclave/EnclaveCommunicationPhysicalHierarchy.lf
new file mode 100644
index 0000000000..b294a49509
--- /dev/null
+++ b/test/Cpp/src/enclave/EnclaveCommunicationPhysicalHierarchy.lf
@@ -0,0 +1,52 @@
+target Cpp {
+  timeout: 1 s,
+  workers: 1
+}
+
+reactor Src {
+  timer t(0, 100 ms)
+  output out: int
+  state counter: int = 0
+
+  reaction(t) -> out {=
+    out.set(counter++);
+  =}
+}
+
+reactor Sink {
+  input in: int
+  state received: bool = false
+
+  reaction(in) {=
+    received = true;
+    auto value = *in.get();
+    reactor::log::Info() << "Received " << value << " at " << get_elapsed_logical_time();
+    auto expected = 100ms * value;
+    if (get_elapsed_logical_time() < expected) {
+      reactor::log::Error() << "Expecded value not before " << expected;
+      exit(1);
+    }
+  =}
+
+  reaction(shutdown) {=
+    if(!received) {
+      reactor::log::Error() << "Nothing received.";
+      exit(1);
+    }
+  =}
+}
+
+reactor WrappedSrc {
+  output out: int
+  @enclave
+  src = new Src()
+  src.out ~> out
+}
+
+main reactor {
+  src = new WrappedSrc()
+  @enclave
+  sink = new Sink()
+
+  src.out -> sink.in
+}
diff --git a/test/Cpp/src/enclave/EnclaveReactionOrder.lf b/test/Cpp/src/enclave/EnclaveReactionOrder.lf
new file mode 100644
index 0000000000..765959ff39
--- /dev/null
+++ b/test/Cpp/src/enclave/EnclaveReactionOrder.lf
@@ -0,0 +1,14 @@
+target Cpp
+
+import Src, Sink from "../ReactionOrder.lf"
+
+reactor ReactionOrder {
+  src = new Src()
+  sink = new Sink()
+  src.out -> sink.in
+}
+
+main reactor {
+  @enclave
+  test = new ReactionOrder()
+}

From 1114ab747d036db9bc23eb35310db0700bb2e802 Mon Sep 17 00:00:00 2001
From: Tang Keke <axmmisaka@users.noreply.github.com>
Date: Thu, 12 Oct 2023 02:59:54 -0700
Subject: [PATCH 1006/1114] Remove ulog from tsconfig

This is to accommodate https://github.com/lf-lang/reactor-ts/pull/237
---
 core/src/main/resources/lib/ts/tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/ts/tsconfig.json b/core/src/main/resources/lib/ts/tsconfig.json
index 3d51d35052..ae7bb7804a 100644
--- a/core/src/main/resources/lib/ts/tsconfig.json
+++ b/core/src/main/resources/lib/ts/tsconfig.json
@@ -3,7 +3,7 @@
         "allowJs": true,
         "target": "esnext",
         "module": "CommonJS",
-        "types": ["node", "@lf-lang/reactor-ts", "ulog", "microtime", "command-line-args", "command-line-usage"],
+        "types": ["node", "@lf-lang/reactor-ts", "microtime", "command-line-args", "command-line-usage"],
         "typeRoots": ["./node_modules/@types/", "./node_modules/@lf-lang/reactor-ts/src/core/@types/"],
         "esModuleInterop": true,
         "isolatedModules": true,

From 23d65a53dc1a1b6ae6188cae4ff38d7f1c0d8e57 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 12 Oct 2023 23:31:52 -0700
Subject: [PATCH 1007/1114] Fix more failing unit tests

---
 .../main/java/org/lflang/AbstractTargetProperty.java   | 10 ++++++++++
 .../org/lflang/federated/generator/FedGenerator.java   |  5 ++++-
 core/src/main/java/org/lflang/target/TargetConfig.java |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/AbstractTargetProperty.java b/core/src/main/java/org/lflang/AbstractTargetProperty.java
index 19745ba27f..7723beafab 100644
--- a/core/src/main/java/org/lflang/AbstractTargetProperty.java
+++ b/core/src/main/java/org/lflang/AbstractTargetProperty.java
@@ -167,4 +167,14 @@ public void update(TargetConfig config, Element node, MessageReporter reporter)
   public void update(TargetConfig config, String value, MessageReporter reporter) {
     this.update(config, fromString(value, reporter));
   }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj.getClass().getName().equals(this.getClass().getName());
+  }
+
+  @Override
+  public int hashCode() {
+    return this.getClass().getName().hashCode();
+  }
 }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index afa7e30627..6eee6656ee 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -422,8 +422,11 @@ private void analyzeFederates(Reactor federation, LFGeneratorContext context) {
         && !federation.getHost().getAddr().equals("localhost")) {
       rtiConfig.setHost(federation.getHost().getAddr());
     }
+
+    var d = new DockerProperty();
+    var x = targetConfig.get(d);
     // If the federation is dockerized, use "rti" as the hostname.
-    if (rtiConfig.getHost().equals("localhost") && targetConfig.get(new DockerProperty()).enabled) {
+    if (rtiConfig.getHost().equals("localhost") && x.enabled) {
       rtiConfig.setHost("rti");
     }
 
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 524266f802..7c416eb376 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -189,7 +189,7 @@ public <T, S extends TargetPropertyType> void override(
 
   /** Reset this target property to its initial value (and mark it as unset). */
   public void reset(AbstractTargetProperty<?, ?> property) {
-    this.properties.remove(property);
+    this.properties.put(property, property.initialValue());
     this.setProperties.remove(property);
   }
 

From a3effa11b611b82b2a93788ae95511b9a41fd330 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 13 Oct 2023 11:44:29 -0700
Subject: [PATCH 1008/1114] Add missing hierarhical-bin target property

---
 .../org/lflang/generator/MainContext.java     |  6 +++---
 .../java/org/lflang/target/TargetConfig.java  |  4 +++-
 .../property/HierarchicalBinProperty.java     | 21 +++++++++++++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java

diff --git a/core/src/main/java/org/lflang/generator/MainContext.java b/core/src/main/java/org/lflang/generator/MainContext.java
index dbe34946e3..ebd4d2552e 100644
--- a/core/src/main/java/org/lflang/generator/MainContext.java
+++ b/core/src/main/java/org/lflang/generator/MainContext.java
@@ -13,6 +13,7 @@
 import org.lflang.MessageReporter;
 import org.lflang.generator.IntegratedBuilder.ReportProgress;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.property.HierarchicalBinProperty;
 
 /**
  * A {@code MainContext} is an {@code LFGeneratorContext} that is not nested in any other generator
@@ -93,9 +94,8 @@ public MainContext(
     this.args = args;
 
     try {
-      var useHierarchicalBin =
-          args.containsKey("hierarchical-bin")
-              && Boolean.parseBoolean(args.getProperty("hierarchical-bin"));
+      var key = new HierarchicalBinProperty().name();
+      var useHierarchicalBin = args.contains(key) && Boolean.parseBoolean(args.getProperty(key));
       fileConfig =
           Objects.requireNonNull(
               LFGenerator.createFileConfig(
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 7c416eb376..f89bc98809 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -59,6 +59,7 @@
 import org.lflang.target.property.FastProperty;
 import org.lflang.target.property.FedSetupProperty;
 import org.lflang.target.property.FilesProperty;
+import org.lflang.target.property.HierarchicalBinProperty;
 import org.lflang.target.property.KeepaliveProperty;
 import org.lflang.target.property.LoggingProperty;
 import org.lflang.target.property.NoCompileProperty;
@@ -117,6 +118,7 @@ public TargetConfig(Target target) {
         new ExternalRuntimePathProperty(),
         new FastProperty(),
         new FilesProperty(),
+        new HierarchicalBinProperty(),
         new KeepaliveProperty(),
         new LoggingProperty(),
         new NoCompileProperty(),
@@ -238,7 +240,7 @@ public void load(Properties properties, MessageReporter err) {
         var property = p.get();
         property.update(this, (String) properties.get(key), err);
       } else {
-        throw new RuntimeException("Attempting to load unrecognized target property");
+        throw new RuntimeException("Attempting to load unrecognized target property: " + key);
       }
     }
   }
diff --git a/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java b/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
new file mode 100644
index 0000000000..8dfa87bdc7
--- /dev/null
+++ b/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
@@ -0,0 +1,21 @@
+package org.lflang.target.property;
+
+import java.util.Arrays;
+import java.util.List;
+import org.lflang.Target;
+
+/**
+ * Whether the bin directory should have a flat or hierarchical organization. It is flat by default.
+ */
+public class HierarchicalBinProperty extends AbstractBooleanProperty {
+
+  @Override
+  public List<Target> supportedTargets() {
+    return Arrays.asList(Target.C, Target.CCPP);
+  }
+
+  @Override
+  public String name() {
+    return "hierarchical-bin";
+  }
+}

From 062f31d8fa8bc864593b0881caeb74839443de67 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 13 Oct 2023 22:46:38 -0700
Subject: [PATCH 1009/1114] More fixes

---
 .../org/lflang/AbstractTargetProperty.java    | 33 +++----------------
 .../property/AbstractFileListProperty.java    | 14 +++++++-
 .../target/property/CmakeIncludeProperty.java | 14 +++++++-
 3 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/core/src/main/java/org/lflang/AbstractTargetProperty.java b/core/src/main/java/org/lflang/AbstractTargetProperty.java
index 7723beafab..861753d6a5 100644
--- a/core/src/main/java/org/lflang/AbstractTargetProperty.java
+++ b/core/src/main/java/org/lflang/AbstractTargetProperty.java
@@ -77,34 +77,6 @@ public final boolean isSupported(Target target) {
     return supportedTargets().contains(target);
   }
 
-  //  /**
-  //   * Parse the given AST node into the given target config. Encountered errors are reported via
-  // the
-  //   * given reporter.
-  //   *
-  //   * @param node The AST node to derive a newly assigned value from.
-  //   * @param reporter A reporter for reporting errors.
-  //   */
-  //  public void set(Element node, MessageReporter reporter) {
-  //    var parsed = this.fromAst(node, reporter);
-  //    if (parsed != null) {
-  //      this.isSet = true;
-  //      this.value = parsed;
-  //    }
-  //  }
-
-  //  /**
-  //   * Parse the given element into the given target config. May use the error reporter to report
-  //   * format errors.
-  //   */
-  //  public void set(String value, MessageReporter err) {
-  //    var parsed = this.fromString(value, err);
-  //    if (parsed != null) {
-  //      this.isSet = true;
-  //      this.value = parsed;
-  //    }
-  //  }
-
   @Override
   public String toString() {
     return this.name();
@@ -168,6 +140,11 @@ public void update(TargetConfig config, String value, MessageReporter reporter)
     this.update(config, fromString(value, reporter));
   }
 
+  /**
+   * Return true if the given object is an instance of a class with the same name.
+   *
+   * @param obj The object to compare this instance to.
+   */
   @Override
   public boolean equals(Object obj) {
     return obj.getClass().getName().equals(this.getClass().getName());
diff --git a/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java b/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java
index bcdab64c96..d7bf5a4748 100644
--- a/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java
+++ b/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java
@@ -23,8 +23,20 @@ public List<String> initialValue() {
 
   @Override
   public void update(TargetConfig config, Element node, MessageReporter reporter) {
+    var files = fromAst(node, reporter);
+    var existing = config.get(this);
     if (config.isSet(this)) {
-      config.get(this).addAll(fromAst(node, reporter));
+      files.stream()
+          .forEach(
+              f -> {
+                if (!existing.contains(f)) {
+                  existing.add(f);
+                }
+              });
+
+    } else {
+      config.get(this).addAll(files);
+      config.markSet(this);
     }
   }
 
diff --git a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
index 5ab3133599..c6f441255e 100644
--- a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
@@ -35,8 +35,20 @@ public List<String> initialValue() {
 
   @Override
   public void update(TargetConfig config, Element node, MessageReporter reporter) {
+    var files = fromAst(node, reporter);
+    var existing = config.get(this);
     if (config.isSet(this)) {
-      config.get(this).addAll(fromAst(node, reporter));
+      files.stream()
+          .forEach(
+              f -> {
+                if (!existing.contains(f)) {
+                  existing.add(f);
+                }
+              });
+
+    } else {
+      config.get(this).addAll(files);
+      config.markSet(this);
     }
   }
 

From 0493e87d546c37808d6a6127f2d456217acc93fe Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@berkeley.edu>
Date: Sat, 14 Oct 2023 09:37:10 -0700
Subject: [PATCH 1010/1114] Handle unknown width for multiports

---
 core/src/main/java/org/lflang/ast/ASTUtils.java      |  3 +++
 .../java/org/lflang/generator/ReactorInstance.java   | 12 +++++++++++-
 .../main/java/org/lflang/validation/LFValidator.java |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 057f0c9494..5f3fc4e78a 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -1479,6 +1479,9 @@ public static int width(WidthSpec spec, List<Instantiation> instantiations) {
         } else {
           return -1;
         }
+      } else if (term.getCode() != null) {
+        // The width is given in target language code, so we can't know what it is.
+        return -1;
       } else if (term.getWidth() > 0) {
         result += term.getWidth();
       } else {
diff --git a/core/src/main/java/org/lflang/generator/ReactorInstance.java b/core/src/main/java/org/lflang/generator/ReactorInstance.java
index 68a869b8b9..994ebed5f3 100644
--- a/core/src/main/java/org/lflang/generator/ReactorInstance.java
+++ b/core/src/main/java/org/lflang/generator/ReactorInstance.java
@@ -964,7 +964,17 @@ private void establishPortConnections() {
       RuntimeRange<PortInstance> dst = dstRanges.next();
 
       while (true) {
-        if (dst.width == src.width) {
+        if (dst.width <= -1 || src.width <= -1) {
+          // The width on one side or the other is not known.  Make all possible connections.
+          connectPortInstances(src, dst, connection);
+          if (dstRanges.hasNext()) {
+            dst = dstRanges.next();
+          } else if (srcRanges.hasNext()) {
+            src = srcRanges.next();
+          } else {
+            break;
+          }
+        } else if (dst.width == src.width) {
           connectPortInstances(src, dst, connection);
           if (!dstRanges.hasNext()) {
             if (srcRanges.hasNext()) {
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 755d28a42b..10a41ecc45 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -313,7 +313,7 @@ public void checkConnection(Connection connection) {
     for (VarRef port : connection.getRightPorts()) {
       int width = inferPortWidth(port, null, null); // null args imply incomplete check.
       if (width < 0 || rightWidth < 0) {
-        // Cannot determine the width of the left ports.
+        // Cannot determine the width of the right ports.
         rightWidth = -1;
       } else {
         rightWidth += width;

From 856a5868cf81bd03f947f6239135be6cbb8136a1 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@berkeley.edu>
Date: Sat, 14 Oct 2023 14:23:47 -0700
Subject: [PATCH 1011/1114] More guards against unknown widths

---
 core/src/main/java/org/lflang/generator/RuntimeRange.java | 2 ++
 core/src/main/java/org/lflang/generator/SendRange.java    | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/RuntimeRange.java b/core/src/main/java/org/lflang/generator/RuntimeRange.java
index d684a41bd9..8f2997e7ec 100644
--- a/core/src/main/java/org/lflang/generator/RuntimeRange.java
+++ b/core/src/main/java/org/lflang/generator/RuntimeRange.java
@@ -270,6 +270,8 @@ public List<NamedInstance<?>> iterationOrder() {
    * if there is no overlap.
    */
   public RuntimeRange<?> overlap(RuntimeRange<?> range) {
+    // If either width is unknown, return this range.
+    if (width < 0 || range.width < 0) return this;
     if (!overlaps(range)) return null;
     int newStart = Math.max(start, range.start);
     int newEnd = Math.min(start + width, range.start + range.width);
diff --git a/core/src/main/java/org/lflang/generator/SendRange.java b/core/src/main/java/org/lflang/generator/SendRange.java
index 5e7f406f1e..68ad178709 100644
--- a/core/src/main/java/org/lflang/generator/SendRange.java
+++ b/core/src/main/java/org/lflang/generator/SendRange.java
@@ -106,8 +106,11 @@ public SendRange(
    */
   public void addDestination(RuntimeRange<PortInstance> dst) {
     if (dst.width % width != 0) {
-      throw new IllegalArgumentException(
-          "Destination range width is not a multiple of sender's width");
+      // Throw an exception only if both widths are known.
+      if (dst.width >= 0 && width >= 0) {
+        throw new IllegalArgumentException(
+                "Destination range width is not a multiple of sender's width");
+      }
     }
     destinations.add(dst);
     // Void any precomputed number of destinations.

From 794d667ca1805cb7967e47ff52d56852d371ba92 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@berkeley.edu>
Date: Sat, 14 Oct 2023 14:40:46 -0700
Subject: [PATCH 1012/1114] Apply spotless

---
 core/src/main/java/org/lflang/generator/SendRange.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/SendRange.java b/core/src/main/java/org/lflang/generator/SendRange.java
index 68ad178709..9562fb0228 100644
--- a/core/src/main/java/org/lflang/generator/SendRange.java
+++ b/core/src/main/java/org/lflang/generator/SendRange.java
@@ -109,7 +109,7 @@ public void addDestination(RuntimeRange<PortInstance> dst) {
       // Throw an exception only if both widths are known.
       if (dst.width >= 0 && width >= 0) {
         throw new IllegalArgumentException(
-                "Destination range width is not a multiple of sender's width");
+            "Destination range width is not a multiple of sender's width");
       }
     }
     destinations.add(dst);

From de53b8f9007f88ac5410c7025aef39799d2260b4 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 15 Oct 2023 00:12:13 -0700
Subject: [PATCH 1013/1114] Fixes that illustrate the trouble with modifiable
 target properties. Better fix needed.

---
 .../org/lflang/federated/extensions/CExtensionUtils.java  | 8 ++++----
 .../main/java/org/lflang/generator/c/CCmakeGenerator.java | 6 +++---
 core/src/main/java/org/lflang/generator/c/CCompiler.java  | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 7f17673d28..77678e64f4 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -192,6 +192,7 @@ public static void handleCompileDefinitions(
     }
     definitions.put("NUMBER_OF_FEDERATES", String.valueOf(numOfFederates));
     definitions.put("EXECUTABLE_PREAMBLE", "");
+    federate.targetConfig.markSet(new CompileDefinitionsProperty());
 
     handleAdvanceMessageInterval(federate);
 
@@ -298,10 +299,9 @@ public static void generateCMakeInclude(FederateInstance federate, FedFileConfig
       srcWriter.write(cmakeIncludeCode.getCode());
     }
 
-    federate
-        .targetConfig
-        .get(new CmakeIncludeProperty())
-        .add(fileConfig.getSrcPath().relativize(cmakeIncludePath).toString());
+    new CmakeIncludeProperty()
+        .add(
+            federate.targetConfig, fileConfig.getSrcPath().relativize(cmakeIncludePath).toString());
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 1eff36adb5..ad90148bec 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -36,7 +36,7 @@
 import org.lflang.generator.CodeBuilder;
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.AuthProperty;
-import org.lflang.target.property.BuildCommandsProperty;
+import org.lflang.target.property.BuildTypeProperty;
 import org.lflang.target.property.CmakeIncludeProperty;
 import org.lflang.target.property.CompilerFlagsProperty;
 import org.lflang.target.property.CompilerProperty;
@@ -241,7 +241,7 @@ CodeBuilder generateCMakeCode(
     }
 
     // Set the build type
-    cMakeCode.pr("set(DEFAULT_BUILD_TYPE " + targetConfig.get(new BuildCommandsProperty()) + ")\n");
+    cMakeCode.pr("set(DEFAULT_BUILD_TYPE " + targetConfig.get(new BuildTypeProperty()) + ")\n");
     cMakeCode.pr("if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)\n");
     cMakeCode.pr(
         "    set(CMAKE_BUILD_TYPE ${DEFAULT_BUILD_TYPE} CACHE STRING \"Choose the type of build.\""
@@ -362,7 +362,7 @@ CodeBuilder generateCMakeCode(
 
     if (CppMode) cMakeCode.pr("enable_language(CXX)");
 
-    if (!targetConfig.isSet(new CompilerProperty())) {
+    if (targetConfig.isSet(new CompilerProperty())) {
       if (CppMode) {
         // Set the CXX compiler to what the user has requested.
         cMakeCode.pr("set(CMAKE_CXX_COMPILER " + targetConfig.get(new CompilerProperty()) + ")");
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index 8336a83ebe..d108ae3fec 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -248,7 +248,7 @@ private static List<String> cmakeOptions(TargetConfig targetConfig, FileConfig f
     arguments.addAll(
         List.of(
             "-DCMAKE_BUILD_TYPE="
-                + ((targetConfig.get(new BuildTypeProperty()) != null)
+                + (targetConfig.isSet(new BuildTypeProperty())
                     ? targetConfig.get(new BuildTypeProperty()).toString()
                     : "Release"),
             "-DCMAKE_INSTALL_PREFIX=" + FileUtil.toUnixString(fileConfig.getOutPath()),

From 6ca42652517fbac04fa00abac2208a4a115ecf30 Mon Sep 17 00:00:00 2001
From: Tang Keke <axmmisaka@users.noreply.github.com>
Date: Thu, 12 Oct 2023 13:51:06 -0700
Subject: [PATCH 1014/1114] Adaptations: Remove references to Log.global and
 Log.levels

---
 .../ts/TSParameterPreambleGenerator.kt        | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
index 305369832e..b6508ef3d4 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
@@ -74,7 +74,7 @@ class TSParameterPreambleGenerator(
                 |    if (__processedCLArgs.${parameter.name} !== null) {
                 |        __CL${parameter.name} = __processedCLArgs.${parameter.name};
                 |    } else {
-                |        Log.global.error(__clUsage);
+                |        Log.error(null, () => __clUsage);
                 |        throw new Error("Custom '${parameter.name}' command line argument is malformed.");
                 |    }
                 |}
@@ -94,7 +94,7 @@ class TSParameterPreambleGenerator(
             """
                 |if (__processedCLArgs.${parameter.name} !== undefined && __processedCLArgs.${parameter.name} !== null
                 |    && !__noStart) {
-                |    Log.global.info("'${parameter.name}' property overridden by command line argument.");
+                |    Log.info(null, () => "'${parameter.name}' property overridden by command line argument.");
                 |}"""
         }
 
@@ -183,7 +183,7 @@ class TSParameterPreambleGenerator(
         |try {
         |    __processedCLArgs =  commandLineArgs(__customCommandLineArgs) as __ProcessedCommandLineArgs & __customCLTypeExtension;
         |} catch (e){
-        |    Log.global.error(__clUsage);
+        |    Log.error(null, () => __clUsage);
         |    throw new Error("Command line argument parsing failed with: " + e);
         |}
         |
@@ -192,7 +192,7 @@ class TSParameterPreambleGenerator(
         |    if (__processedCLArgs.fast !== null) {
         |        __fast = __processedCLArgs.fast;
         |    } else {
-        |        Log.global.error(__clUsage);
+        |        Log.error(null, () => __clUsage);
         |        throw new Error("'fast' command line argument is malformed.");
         |    }
         |}
@@ -202,7 +202,7 @@ class TSParameterPreambleGenerator(
         |    if (__processedCLArgs.id !== null) {
         |        __federationID = __processedCLArgs.id;
         |    } else {
-        |        Log.global.error(__clUsage);
+        |        Log.error(null, () => __clUsage);
         |        throw new Error("'id (federationID)' command line argument is malformed.");
         |    }
         |}
@@ -212,7 +212,7 @@ class TSParameterPreambleGenerator(
         |    if (__processedCLArgs.keepalive !== null) {
         |        __keepAlive = __processedCLArgs.keepalive;
         |    } else {
-        |        Log.global.error(__clUsage);
+        |        Log.error(null, () => __clUsage);
         |        throw new Error("'keepalive' command line argument is malformed.");
         |    }
         |}
@@ -222,7 +222,7 @@ class TSParameterPreambleGenerator(
         |    if (__processedCLArgs.timeout !== null) {
         |        __timeout = __processedCLArgs.timeout;
         |    } else {
-        |        Log.global.error(__clUsage);
+        |        Log.error(null, () => __clUsage);
         |        throw new Error("'timeout' command line argument is malformed.");
         |    }
         |}
@@ -230,20 +230,20 @@ class TSParameterPreambleGenerator(
         |// Logging parameter (not a constructor parameter, but a command line option)
         |if (__processedCLArgs.logging !== undefined) {
         |    if (__processedCLArgs.logging !== null) {
-        |        Log.global.level = __processedCLArgs.logging;
+        |        Log.setLevel(__processedCLArgs.logging);
         |    } else {
-        |        Log.global.error(__clUsage);
+        |        Log.error(null, () => __clUsage);
         |        throw new Error("'logging' command line argument is malformed.");
         |    }
         |} else {
-        |    Log.global.level = Log.levels.${targetConfig.logLevel.name}; // Default from target property.
+        |    Log.setLevel(Log.LogLevel.${targetConfig.logLevel.name}); // Default from target property.
         |}
         |
         |// Help parameter (not a constructor parameter, but a command line option)
         |// NOTE: this arg has to be checked after logging, because the help mode should
         |// suppress debug statements from it changes logging
         |if (__processedCLArgs.help === true) {
-        |    Log.global.error(__clUsage);
+        |    Log.error(null, () => __clUsage);
         |    __noStart = true;
         |    // Don't execute the app if the help flag is given.
         |}
@@ -255,23 +255,23 @@ class TSParameterPreambleGenerator(
         |// Runtime command line arguments 
         |if (__processedCLArgs.fast !== undefined && __processedCLArgs.fast !== null
         |    && !__noStart) {
-        |    Log.global.info("'fast' property overridden by command line argument.");
+        |    Log.info(null, () => "'fast' property overridden by command line argument.");
         |}
         |if (__processedCLArgs.id !== undefined && __processedCLArgs.id !== null
         |    && !__noStart) {
-        |    Log.global.info("'id (federationID)' property overridden by command line argument.");
+        |    Log.info(null, () => "'id (federationID)' property overridden by command line argument.");
         |}
         |if (__processedCLArgs.keepalive !== undefined && __processedCLArgs.keepalive !== null
         |    && !__noStart) {
-        |    Log.global.info("'keepalive' property overridden by command line argument.");
+        |    Log.info(null, () => "'keepalive' property overridden by command line argument.");
         |}
         |if (__processedCLArgs.timeout !== undefined && __processedCLArgs.timeout !== null
         |    && !__noStart) {
-        |    Log.global.info("'timeout' property overridden by command line argument.");
+        |    Log.info(null, () => "'timeout' property overridden by command line argument.");
         |}
         |if (__processedCLArgs.logging !== undefined && __processedCLArgs.logging !== null
         |    && !__noStart) {
-        |     Log.global.info("'logging' property overridden by command line argument.");
+        |     Log.info(null, () => "'logging' property overridden by command line argument.");
         |}
         |
         |// Custom command line arguments

From 8a3472cc42798be24b3a162ce01c709905ab4a08 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 12 Oct 2023 18:10:12 -0700
Subject: [PATCH 1015/1114] Update package.json

---
 core/src/main/resources/lib/ts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/ts/package.json b/core/src/main/resources/lib/ts/package.json
index 04978d7322..fc063d791e 100644
--- a/core/src/main/resources/lib/ts/package.json
+++ b/core/src/main/resources/lib/ts/package.json
@@ -2,7 +2,7 @@
     "name": "LinguaFrancaDefault",
     "type": "commonjs",
     "dependencies": {
-        "@lf-lang/reactor-ts": "^0.6.0",
+        "@lf-lang/reactor-ts": "git://github.com/lf-lang/reactor-ts.git#master",
         "command-line-args": "^5.1.1",
         "command-line-usage": "^6.1.3"
     },

From f1f1735577ac6353219b7c1678509dfe672a3bc9 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 15 Oct 2023 13:09:59 -0700
Subject: [PATCH 1016/1114] API improvements

---
 .../org/lflang/AbstractTargetProperty.java    |  8 ++--
 .../federated/extensions/CExtensionUtils.java | 12 ++++--
 .../federated/generator/FedTargetConfig.java  |  2 +
 .../property/AbstractFileListProperty.java    | 24 +++++-------
 .../property/AbstractStringListProperty.java  | 17 ++++----
 .../target/property/CmakeIncludeProperty.java | 39 +------------------
 .../property/CompileDefinitionsProperty.java  |  9 ++---
 7 files changed, 39 insertions(+), 72 deletions(-)

diff --git a/core/src/main/java/org/lflang/AbstractTargetProperty.java b/core/src/main/java/org/lflang/AbstractTargetProperty.java
index 861753d6a5..2f88198a32 100644
--- a/core/src/main/java/org/lflang/AbstractTargetProperty.java
+++ b/core/src/main/java/org/lflang/AbstractTargetProperty.java
@@ -132,16 +132,18 @@ protected void update(TargetConfig config, T value) {
     config.set(this, value);
   }
 
-  public void update(TargetConfig config, Element node, MessageReporter reporter) {
+  public final void update(TargetConfig config, Element node, MessageReporter reporter) {
     this.update(config, fromAst(node, reporter));
   }
 
-  public void update(TargetConfig config, String value, MessageReporter reporter) {
+  public final void update(TargetConfig config, String value, MessageReporter reporter) {
     this.update(config, fromString(value, reporter));
   }
 
   /**
-   * Return true if the given object is an instance of a class with the same name.
+   * Return true if the given object is an instance of a class with the same name. FIXME: make this
+   * a singleton class and remove this override https://www.baeldung.com/kotlin/singleton-classes
+   * https://stackoverflow.com/questions/24214148/java-getinstance-vs-static
    *
    * @param obj The object to compare this instance to.
    */
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 77678e64f4..25d02824f4 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.List;
 import java.util.regex.Pattern;
 import org.lflang.InferredType;
@@ -180,7 +181,8 @@ public static void handleCompileDefinitions(
       int numOfFederates,
       RtiConfig rtiConfig,
       MessageReporter messageReporter) {
-    var definitions = federate.targetConfig.get(new CompileDefinitionsProperty());
+
+    var definitions = new HashMap<String, String>();
     definitions.put("FEDERATED", "");
     definitions.put(
         String.format(
@@ -192,7 +194,8 @@ public static void handleCompileDefinitions(
     }
     definitions.put("NUMBER_OF_FEDERATES", String.valueOf(numOfFederates));
     definitions.put("EXECUTABLE_PREAMBLE", "");
-    federate.targetConfig.markSet(new CompileDefinitionsProperty());
+
+    new CompileDefinitionsProperty().update(federate.targetConfig, definitions);
 
     handleAdvanceMessageInterval(federate);
 
@@ -300,8 +303,9 @@ public static void generateCMakeInclude(FederateInstance federate, FedFileConfig
     }
 
     new CmakeIncludeProperty()
-        .add(
-            federate.targetConfig, fileConfig.getSrcPath().relativize(cmakeIncludePath).toString());
+        .update(
+            federate.targetConfig,
+            List.of(fileConfig.getSrcPath().relativize(cmakeIncludePath).toString()));
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
index 7283ae5261..fc4df6e121 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
@@ -101,6 +101,8 @@ public void update(
           if (p.isPresent()) {
             var value = pair.getValue();
             if (pair.getName().equals("files")) {
+              // FIXME: this logic doesn't really belong here.
+              // Also: what about other target properties that have paths?
               var array = LfFactory.eINSTANCE.createArray();
               ASTUtils.elementToListOfStrings(pair.getValue()).stream()
                   .map(relativePath::resolve) // assume all paths are relative
diff --git a/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java b/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java
index d7bf5a4748..0fd7087136 100644
--- a/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java
+++ b/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java
@@ -22,26 +22,22 @@ public List<String> initialValue() {
   }
 
   @Override
-  public void update(TargetConfig config, Element node, MessageReporter reporter) {
-    var files = fromAst(node, reporter);
+  public void update(TargetConfig config, List<String> value) {
+    var files = new ArrayList<>(value);
     var existing = config.get(this);
     if (config.isSet(this)) {
-      files.stream()
-          .forEach(
-              f -> {
-                if (!existing.contains(f)) {
-                  existing.add(f);
-                }
-              });
-
-    } else {
-      config.get(this).addAll(files);
-      config.markSet(this);
+      existing.forEach(
+          f -> {
+            if (!files.contains(f)) {
+              files.add(f);
+            }
+          });
     }
+    config.set(this, files.stream().sorted(String::compareTo).toList());
   }
 
   @Override
-  public List<String> fromAst(Element node, MessageReporter reporter) {
+  protected List<String> fromAst(Element node, MessageReporter reporter) {
     return ASTUtils.elementToListOfStrings(node);
   }
 
diff --git a/core/src/main/java/org/lflang/target/property/AbstractStringListProperty.java b/core/src/main/java/org/lflang/target/property/AbstractStringListProperty.java
index b0f78109ed..ba5e99c22e 100644
--- a/core/src/main/java/org/lflang/target/property/AbstractStringListProperty.java
+++ b/core/src/main/java/org/lflang/target/property/AbstractStringListProperty.java
@@ -17,21 +17,24 @@ public AbstractStringListProperty() {
     super(UnionType.STRING_OR_STRING_ARRAY);
   }
 
-  public void add(TargetConfig config, String entry) {
-    config.markSet(this);
-    config.get(this).add(entry);
-  }
-
   @Override
   public List<String> initialValue() {
     return new ArrayList<>();
   }
 
   @Override
-  public void update(TargetConfig config, Element node, MessageReporter reporter) {
+  public void update(TargetConfig config, List<String> value) {
+    var files = new ArrayList<>(value);
+    var existing = config.get(this);
     if (config.isSet(this)) {
-      config.get(this).addAll(fromAst(node, reporter));
+      existing.forEach(
+          f -> {
+            if (!files.contains(f)) {
+              files.add(f);
+            }
+          });
     }
+    config.set(this, files.stream().sorted(String::compareTo).toList());
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
index c6f441255e..07937a632e 100644
--- a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
@@ -1,15 +1,11 @@
 package org.lflang.target.property;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
-import org.lflang.target.TargetConfig;
-import org.lflang.target.property.type.UnionType;
 
 /**
  * Directive to specify a cmake to be included by the generated build systems.
@@ -17,40 +13,7 @@
  * <p>This gives full control over the C/C++ build as any cmake parameters can be adjusted in the
  * included file.
  */
-public class CmakeIncludeProperty extends AbstractTargetProperty<List<String>, UnionType> {
-
-  public CmakeIncludeProperty() {
-    super(UnionType.FILE_OR_FILE_ARRAY);
-  }
-
-  public void add(TargetConfig config, String entry) {
-    config.markSet(this);
-    config.get(this).add(entry);
-  }
-
-  @Override
-  public List<String> initialValue() {
-    return new ArrayList<>();
-  }
-
-  @Override
-  public void update(TargetConfig config, Element node, MessageReporter reporter) {
-    var files = fromAst(node, reporter);
-    var existing = config.get(this);
-    if (config.isSet(this)) {
-      files.stream()
-          .forEach(
-              f -> {
-                if (!existing.contains(f)) {
-                  existing.add(f);
-                }
-              });
-
-    } else {
-      config.get(this).addAll(files);
-      config.markSet(this);
-    }
-  }
+public class CmakeIncludeProperty extends AbstractFileListProperty {
 
   @Override
   protected List<String> fromAst(Element node, MessageReporter reporter) {
diff --git a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
index 5ee2642393..fd439b7519 100644
--- a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
@@ -1,7 +1,6 @@
 package org.lflang.target.property;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.lflang.AbstractTargetProperty;
@@ -25,14 +24,12 @@ public CompileDefinitionsProperty() {
     super(StringDictionaryType.COMPILE_DEFINITION);
   }
 
-  public void put(TargetConfig config, String k, String v) {
-    config.markSet(this);
-    config.get(this).put(k, v);
-  }
+  @Override
+  public void update(TargetConfig config, Map<String, String> value) {}
 
   @Override
   public Map<String, String> initialValue() {
-    return new HashMap<>();
+    return Map.of();
   }
 
   @Override

From f02ff3f47143a8135f859017b3285ab551558924 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 15 Oct 2023 15:07:20 -0700
Subject: [PATCH 1017/1114] Address immutability exceptions

---
 .../org/lflang/cli/LfcIssueReportingTest.kt   | 17 +--------
 .../main/java/org/lflang/ast/ASTUtils.java    | 10 +++---
 .../org/lflang/generator/c/CGenerator.java    | 36 +++++++------------
 .../generator/c/CPreambleGenerator.java       | 18 +++++-----
 4 files changed, 28 insertions(+), 53 deletions(-)

diff --git a/cli/lfc/src/test/kotlin/org/lflang/cli/LfcIssueReportingTest.kt b/cli/lfc/src/test/kotlin/org/lflang/cli/LfcIssueReportingTest.kt
index 21cdaf3043..8589cddc8a 100644
--- a/cli/lfc/src/test/kotlin/org/lflang/cli/LfcIssueReportingTest.kt
+++ b/cli/lfc/src/test/kotlin/org/lflang/cli/LfcIssueReportingTest.kt
@@ -47,22 +47,7 @@ class SpyPrintStream {
 
 
 class LfcIssueReportingTest {
-    /*
-        Note: when executing these tests in Intellij, I get the following error:
-
-            java.lang.SecurityException: class "org.eclipse.core.runtime.IPath"'s
-             signer information does not match signer information of other classes
-             in the same package
-
-        To fix this:
-        - Go into File > Project Structure (CTRL+MAJ+S)
-        - Open the "Modules" tab
-        - Select the module org.lflang/lfc/test in the tree view
-        - Open the "Dependencies" tab
-        - Remove the dependency org.eclipse.platform:org.eclipse.equinox.common (it will have Provided scope)
-     */
-
-
+    
     @Test
     fun testSimpleWarning() {
         doTest(fileBaseName = "simpleWarning")
diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 59189f1d24..472ce87d88 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -615,10 +615,12 @@ public static ReactorInstance createMainReactorInstance(
       if (breadth == 0) {
         messageReporter.nowhere().warning("The program has no reactions");
       } else {
-        // FIXME: not marking the property as set!
-        targetConfig
-            .get(new CompileDefinitionsProperty())
-            .put("LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth()));
+        new CompileDefinitionsProperty()
+            .update(
+                targetConfig,
+                Map.of(
+                    "LF_REACTION_GRAPH_BREADTH",
+                    String.valueOf(reactionInstanceGraph.getBreadth())));
       }
       return main;
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 46e584656f..93925abc8b 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -41,8 +41,10 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -1976,23 +1978,18 @@ protected DockerGenerator getDockerGenerator(LFGeneratorContext context) {
   // Perform set up that does not generate code
   protected void setUpGeneralParameters() {
     accommodatePhysicalActionsIfPresent();
-    targetConfig
-        .get(new CompileDefinitionsProperty())
-        .put(
-            "LOG_LEVEL",
-            String.valueOf(
-                targetConfig
-                    .get(new LoggingProperty())
-                    .ordinal())); // FIXME: put without marking as set
+    new CompileDefinitionsProperty()
+        .update(
+            targetConfig,
+            Map.of("LOG_LEVEL", String.valueOf(targetConfig.get(new LoggingProperty()).ordinal())));
+
     targetConfig.compileAdditionalSources.addAll(CCoreFilesUtils.getCTargetSrc());
     // Create the main reactor instance if there is a main reactor.
     this.main =
         ASTUtils.createMainReactorInstance(mainDef, reactors, messageReporter, targetConfig);
     if (hasModalReactors) {
       // So that each separate compile knows about modal reactors, do this:
-      targetConfig
-          .get(new CompileDefinitionsProperty())
-          .put("MODAL_REACTORS", "TRUE"); // FIXME: put without marking as set
+      new CompileDefinitionsProperty().update(targetConfig, Map.of("MODAL_REACTORS", "TRUE"));
     }
     final var platformOptions = targetConfig.get(new PlatformProperty());
     if (targetConfig.get(new ThreadingProperty())
@@ -2037,19 +2034,10 @@ protected void setUpGeneralParameters() {
     if (targetConfig.get(new ThreadingProperty())) { // FIXME: This logic is duplicated in CMake
       pickScheduler();
       // FIXME: this and pickScheduler should be combined.
-      targetConfig
-          .get(new CompileDefinitionsProperty())
-          .put(
-              "SCHEDULER",
-              targetConfig
-                  .get(new SchedulerProperty())
-                  .name()); // FIXME: put without marking as set
-      targetConfig
-          .get(new CompileDefinitionsProperty())
-          .put(
-              "NUMBER_OF_WORKERS",
-              String.valueOf(
-                  targetConfig.get(new WorkersProperty()))); // FIXME: put without marking as set
+      var map = new HashMap<String, String>();
+      map.put("SCHEDULER", targetConfig.get(new SchedulerProperty()).name());
+      map.put("NUMBER_OF_WORKERS", String.valueOf(targetConfig.get(new WorkersProperty())));
+      new CompileDefinitionsProperty().update(targetConfig, map);
     }
     pickCompilePlatform();
   }
diff --git a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
index 18c783a4f5..d4b084d6bb 100644
--- a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
@@ -3,6 +3,7 @@
 import static org.lflang.util.StringUtil.addDoubleQuotes;
 
 import java.nio.file.Path;
+import java.util.HashMap;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.CompileDefinitionsProperty;
@@ -72,11 +73,9 @@ public static String generateDefineDirectives(TargetConfig targetConfig, Path sr
     // TODO: Get rid of all of these
     code.pr("#define LOG_LEVEL " + logLevel);
     code.pr("#define TARGET_FILES_DIRECTORY " + addDoubleQuotes(srcGenPath.toString()));
-
+    final var definitions = new HashMap<String, String>();
     if (tracing.isEnabled()) {
-      targetConfig
-          .get(new CompileDefinitionsProperty())
-          .put("LF_TRACE", tracing.traceFileName); // FIXME: put without marking as set
+      definitions.put("LF_TRACE", tracing.traceFileName);
     }
     // if (clockSyncIsOn) {
     //     code.pr(generateClockSyncDefineDirective(
@@ -84,17 +83,18 @@ public static String generateDefineDirectives(TargetConfig targetConfig, Path sr
     //         targetConfig.clockSyncOptions
     //     ));
     // }
-    final var defs = targetConfig.get(new CompileDefinitionsProperty());
+
     if (targetConfig.get(new ThreadingProperty())) {
-      defs.put("LF_THREADED", "1");
+      definitions.put("LF_THREADED", "1");
     } else {
-      defs.put("LF_UNTHREADED", "1");
+      definitions.put("LF_UNTHREADED", "1");
     }
     if (targetConfig.get(new ThreadingProperty())) {
-      defs.put("LF_THREADED", "1");
+      definitions.put("LF_THREADED", "1");
     } else {
-      defs.put("LF_UNTHREADED", "1");
+      definitions.put("LF_UNTHREADED", "1");
     }
+    new CompileDefinitionsProperty().update(targetConfig, definitions);
     code.newLine();
     return code.toString();
   }

From 32101a3cbafedcbfce8cce8fa179f02c70b145d4 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 15 Oct 2023 16:17:29 -0700
Subject: [PATCH 1018/1114] More immutability exceptions

---
 .../org/lflang/federated/extensions/CExtensionUtils.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 25d02824f4..e61f230a78 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -266,7 +266,8 @@ public static void addClockSyncCompileDefinitions(FederateInstance federate) {
 
     ClockSyncMode mode = federate.targetConfig.get(new ClockSyncModeProperty());
     ClockSyncOptions options = federate.targetConfig.get(new ClockSyncOptionsProperty());
-    final var defs = federate.targetConfig.get(new CompileDefinitionsProperty());
+    final var defs = new HashMap<String, String>();
+
     defs.put("_LF_CLOCK_SYNC_INITIAL", "");
     defs.put("_LF_CLOCK_SYNC_PERIOD_NS", String.valueOf(options.period.toNanoSeconds()));
     defs.put("_LF_CLOCK_SYNC_EXCHANGES_PER_INTERVAL", String.valueOf(options.trials));
@@ -275,9 +276,10 @@ public static void addClockSyncCompileDefinitions(FederateInstance federate) {
     if (mode == ClockSyncMode.ON) {
       defs.put("_LF_CLOCK_SYNC_ON", "");
       if (options.collectStats) {
-        defs.put("_LF_CLOCK_SYNC_COLLECT_STATS", ""); // FIXME: more puts
+        defs.put("_LF_CLOCK_SYNC_COLLECT_STATS", "");
       }
     }
+    new CompileDefinitionsProperty().update(federate.targetConfig, defs);
   }
 
   /** Generate a file to be included by CMake. */

From e4c3e068bf64dec7e34b57b60df88028e8ae013b Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 15 Oct 2023 17:53:57 -0700
Subject: [PATCH 1019/1114] More fixes

---
 .../lflang/tests/runtime/CVerifierTest.java   |  2 +-
 .../org/lflang/tests/runtime/CppRos2Test.java |  2 +-
 .../org/lflang/AbstractTargetProperty.java    |  6 +++++-
 .../federated/extensions/CExtension.java      |  6 +++---
 .../federated/generator/FedFileConfig.java    | 13 ++++++------
 .../federated/generator/FedGenerator.java     | 11 +++++-----
 .../org/lflang/generator/GeneratorUtils.java  |  3 ++-
 .../org/lflang/generator/c/CGenerator.java    |  8 ++++----
 .../generator/python/PythonGenerator.java     |  4 ++--
 .../java/org/lflang/target/TargetConfig.java  | 20 +++----------------
 .../java/org/lflang/tests/Configurators.java  |  6 +++---
 11 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
index 7140eca72f..86d61464b0 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
@@ -22,7 +22,7 @@ public void runVerifierTests() {
         Message.DESC_VERIFIER,
         TestRegistry.TestCategory.VERIFIER::equals,
         test -> {
-          test.getContext().getTargetConfig().override(new VerifyProperty(), true);
+          new VerifyProperty().override(test.getContext().getTargetConfig(), true);
           return true;
         },
         TestLevel.BUILD,
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
index 427eb07650..efb051944b 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
@@ -31,7 +31,7 @@ public void runWithRos2() {
         Message.DESC_ROS2,
         it -> true,
         it -> {
-          it.getContext().getTargetConfig().override(new Ros2Property(), true);
+          new Ros2Property().override(it.getContext().getTargetConfig(), true);
           return true;
         },
         TestLevel.EXECUTION,
diff --git a/core/src/main/java/org/lflang/AbstractTargetProperty.java b/core/src/main/java/org/lflang/AbstractTargetProperty.java
index 2f88198a32..f2575f6cf9 100644
--- a/core/src/main/java/org/lflang/AbstractTargetProperty.java
+++ b/core/src/main/java/org/lflang/AbstractTargetProperty.java
@@ -128,10 +128,14 @@ public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {}
   /** Return the name of this target property (in kebab case). */
   public abstract String name();
 
-  protected void update(TargetConfig config, T value) {
+  public final void override(TargetConfig config, T value) {
     config.set(this, value);
   }
 
+  protected void update(TargetConfig config, T value) {
+    override(config, value);
+  }
+
   public final void update(TargetConfig config, Element node, MessageReporter reporter) {
     this.update(config, fromAst(node, reporter));
   }
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 955b561071..ba5f67f76c 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -87,16 +87,16 @@ public void initializeTargetConfig(
 
     generateCMakeInclude(federate, fileConfig);
 
-    federate.targetConfig.override(new KeepaliveProperty(), true);
+    new KeepaliveProperty().override(federate.targetConfig, true);
 
     // If there are federates, copy the required files for that.
     // Also, create the RTI C file and the launcher script.
     // Handle target parameters.
     // If the program is federated, then ensure that threading is enabled.
-    federate.targetConfig.override(new ThreadingProperty(), true);
+    new ThreadingProperty().override(federate.targetConfig, true);
 
     // Include the fed setup file for this federate in the target property
-    federate.targetConfig.override(new FedSetupProperty(), getPreamblePath(federate));
+    new FedSetupProperty().override(federate.targetConfig, getPreamblePath(federate));
   }
 
   /** Generate a cmake-include file for {@code federate} if needed. */
diff --git a/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java b/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
index f23d0c7a81..9e5e103c8f 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
@@ -103,9 +103,11 @@ public void doClean() throws IOException {
    * the generated .lf file for the federate.
    */
   public void relativizePaths(FedTargetConfig targetConfig) {
-    relativizePathList(targetConfig.get(new ProtobufsProperty()));
-    relativizePathList(targetConfig.get(new FilesProperty()));
-    relativizePathList(targetConfig.get(new CmakeIncludeProperty()));
+    List.of(new ProtobufsProperty(), new FilesProperty(), new CmakeIncludeProperty())
+        .forEach(
+            p -> {
+              p.override(targetConfig, relativizePathList(targetConfig.get(p)));
+            });
   }
 
   /**
@@ -113,11 +115,10 @@ public void relativizePaths(FedTargetConfig targetConfig) {
    *
    * @param paths The paths to relativize.
    */
-  private void relativizePathList(List<String> paths) {
+  private List<String> relativizePathList(List<String> paths) {
     List<String> tempList = new ArrayList<>();
     paths.forEach(f -> tempList.add(relativizePath(Paths.get(f))));
-    paths.clear();
-    paths.addAll(tempList);
+    return tempList;
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 6eee6656ee..aa645a932f 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -125,7 +125,7 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
     // In a federated execution, we need keepalive to be true,
     // otherwise a federate could exit simply because it hasn't received
     // any messages.
-    targetConfig.override(new KeepaliveProperty(), true);
+    new KeepaliveProperty().override(targetConfig, true);
 
     // Process command-line arguments
     processCLIArguments(context);
@@ -201,9 +201,10 @@ private void createDockerFiles(LFGeneratorContext context, List<SubContext> subC
     final List<DockerData> services = new ArrayList<>();
     // 1. create a Dockerfile for each federate
     for (SubContext subContext : subContexts) { // Inherit Docker options from main context
-      subContext
-          .getTargetConfig()
-          .override(new DockerProperty(), context.getTargetConfig().get(new DockerProperty()));
+
+      new DockerProperty()
+          .override(
+              subContext.getTargetConfig(), context.getTargetConfig().get(new DockerProperty()));
       var dockerGenerator = dockerGeneratorFactory(subContext);
       var dockerData = dockerGenerator.generateDockerData();
       try {
@@ -303,7 +304,7 @@ private Map<Path, CodeMap> compileFederates(
                     subContextMessageReporter);
             if (targetConfig.get(new DockerProperty()).enabled
                 && targetConfig.target.buildsUsingDocker()) {
-              subConfig.override(new NoCompileProperty(), true);
+              new NoCompileProperty().override(subConfig, true);
             }
             subConfig.get(new DockerProperty()).enabled = false;
 
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index e846bb03dc..1b4c0f9fa2 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -59,7 +59,8 @@ public static void accommodatePhysicalActionsIfPresent(
             && !targetConfig.isSet(new KeepaliveProperty())
             && !targetConfig.get(new KeepaliveProperty())) {
           // Keepalive was explicitly set to false; set it to true.
-          targetConfig.override(new KeepaliveProperty(), true);
+
+          new KeepaliveProperty().override(targetConfig, true);
           String message =
               String.format(
                   "Setting %s to true because of the physical action %s.",
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 93925abc8b..a39281b790 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -363,7 +363,7 @@ public void accommodatePhysicalActionsIfPresent() {
           // because it is the only one currently capable of handling asynchronous events.
           var threading = new ThreadingProperty();
           if (!targetConfig.get(threading) && !targetConfig.isSet(threading)) {
-            targetConfig.override(threading, true);
+            threading.override(targetConfig, true);
             String message =
                 "Using the threaded C runtime to allow for asynchronous handling of physical action"
                     + " "
@@ -715,7 +715,7 @@ private void pickScheduler() {
       // Check if a deadline is assigned to any reaction
       if (hasDeadlines(reactors)) {
         if (!targetConfig.isSet(new SchedulerProperty())) {
-          targetConfig.override(new SchedulerProperty(), Scheduler.GEDF_NP);
+          new SchedulerProperty().override(targetConfig, Scheduler.GEDF_NP);
         }
       }
     }
@@ -2001,7 +2001,7 @@ protected void setUpGeneralParameters() {
           .info(
               "Threading is incompatible on your current Arduino flavor. Setting threading to"
                   + " false.");
-      targetConfig.override(new ThreadingProperty(), false);
+      new ThreadingProperty().override(targetConfig, false);
     }
 
     if (platformOptions.platform == Platform.ARDUINO
@@ -2014,7 +2014,7 @@ protected void setUpGeneralParameters() {
                   + " board name (FQBN) in the target property. For example, platform: {name:"
                   + " arduino, board: arduino:avr:leonardo}. Entering \"no-compile\" mode and"
                   + " generating target code only.");
-      targetConfig.override(new NoCompileProperty(), true);
+      new NoCompileProperty().override(targetConfig, true);
     }
 
     if (platformOptions.platform == Platform.ZEPHYR
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index ca291f1d3e..72b3d59e5e 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -109,8 +109,8 @@ public PythonGenerator(LFGeneratorContext context) {
   private PythonGenerator(
       LFGeneratorContext context, PythonTypes types, CCmakeGenerator cmakeGenerator) {
     super(context, false, types, cmakeGenerator, new PythonDelayBodyGenerator(types));
-    this.targetConfig.override(new CompilerProperty(), "gcc"); // FIXME: why?
-    this.targetConfig.get(new CompilerFlagsProperty()).clear();
+    new CompilerProperty().override(this.targetConfig, "gcc"); // FIXME: why?
+    this.targetConfig.reset(new CompilerFlagsProperty());
     this.targetConfig.linkerFlags = ""; // FIXME: why?
     this.types = types;
   }
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index f89bc98809..085b3ca06c 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -26,6 +26,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -178,17 +179,6 @@ public void register(AbstractTargetProperty<?, ?>... properties) {
         .forEach(property -> this.properties.put(property, property.initialValue()));
   }
 
-  /**
-   * Manually override the value of this target property.
-   *
-   * @param value The value to assign to this target property.
-   */
-  public <T, S extends TargetPropertyType> void override(
-      AbstractTargetProperty<T, S> property, T value) {
-    this.setProperties.add(property);
-    this.properties.put(property, value);
-  }
-
   /** Reset this target property to its initial value (and mark it as unset). */
   public void reset(AbstractTargetProperty<?, ?> property) {
     this.properties.put(property, property.initialValue());
@@ -211,14 +201,14 @@ public boolean isSet(AbstractTargetProperty<?, ?> property) {
 
   public String listOfRegisteredProperties() {
     return getRegisteredProperties().stream()
-        .map(p -> p.toString())
+        .map(AbstractTargetProperty::toString)
         .filter(s -> !s.startsWith("_"))
         .collect(Collectors.joining(", "));
   }
 
   public List<AbstractTargetProperty<?, ?>> getRegisteredProperties() {
     return this.properties.keySet().stream()
-        .sorted((p1, p2) -> p1.getClass().getName().compareTo(p2.getClass().getName()))
+        .sorted(Comparator.comparing(p -> p.getClass().getName()))
         .collect(Collectors.toList());
   }
 
@@ -270,8 +260,4 @@ public <T, S extends TargetPropertyType> void set(
     this.setProperties.add(property);
     this.properties.put(property, value);
   }
-
-  public void markSet(AbstractTargetProperty property) {
-    this.setProperties.add(property);
-  }
 }
diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index 7febf6cefc..397904fc9d 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -68,14 +68,14 @@ public static boolean disableThreading(LFTest test) {
 
   public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
     test.getContext().getArgs().setProperty("tracing", "false");
-    test.getContext().getTargetConfig().override(new ThreadingProperty(), false);
+    new ThreadingProperty().override(test.getContext().getTargetConfig(), false);
     // FIXME: use a record and override.
     test.getContext().getTargetConfig().get(new PlatformProperty()).platform = Platform.ZEPHYR;
     test.getContext().getTargetConfig().get(new PlatformProperty()).flash = false;
     test.getContext().getTargetConfig().get(new PlatformProperty()).board = "qemu_cortex_m3";
 
     // FIXME: Zephyr  emulations fails with debug log-levels.
-    test.getContext().getTargetConfig().override(new LoggingProperty(), LogLevel.WARN);
+    new LoggingProperty().override(test.getContext().getTargetConfig(), LogLevel.WARN);
     test.getContext().getArgs().setProperty("logging", "warning");
     return true;
   }
@@ -87,7 +87,7 @@ public static boolean makeZephyrCompatible(LFTest test) {
     test.getContext().getTargetConfig().get(new PlatformProperty()).board = "qemu_cortex_m3";
 
     // FIXME: Zephyr  emulations fails with debug log-levels.
-    test.getContext().getTargetConfig().override(new LoggingProperty(), LogLevel.WARN);
+    new LoggingProperty().override(test.getContext().getTargetConfig(), LogLevel.WARN);
     test.getContext().getArgs().setProperty("logging", "warning");
 
     return true;

From 1fc2af574d3c7b6dfa24f299ba3142099858e370 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 15 Oct 2023 18:29:54 -0700
Subject: [PATCH 1020/1114] Fix compile definitions

---
 .../property/CompileDefinitionsProperty.java      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
index fd439b7519..d65b608940 100644
--- a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
@@ -1,6 +1,7 @@
 package org.lflang.target.property;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.lflang.AbstractTargetProperty;
@@ -25,7 +26,19 @@ public CompileDefinitionsProperty() {
   }
 
   @Override
-  public void update(TargetConfig config, Map<String, String> value) {}
+  public void update(TargetConfig config, Map<String, String> value) {
+    var pairs = new HashMap<>(value);
+    var existing = config.get(this);
+    if (config.isSet(this)) {
+      existing.forEach(
+          (k, v) -> {
+            if (!pairs.containsKey(k)) {
+              pairs.put(k, v);
+            }
+          });
+    }
+    config.set(this, pairs);
+  }
 
   @Override
   public Map<String, String> initialValue() {

From 75e0c7ffa83c8c8a9ac67782aca00ab29ab247fc Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 15 Oct 2023 21:20:14 -0700
Subject: [PATCH 1021/1114] Fixed CmakeInclude handling

---
 .../org/lflang/AbstractTargetProperty.java    | 27 ++++++++++++
 .../org/lflang/generator/c/CGenerator.java    | 13 ++----
 .../java/org/lflang/target/TargetConfig.java  | 23 ++++++++++
 .../org/lflang/target/TargetProperty.java     | 43 +------------------
 .../target/property/PlatformProperty.java     |  3 +-
 .../property/Ros2DependenciesProperty.java    |  3 +-
 .../target/property/TracingProperty.java      |  3 +-
 7 files changed, 58 insertions(+), 57 deletions(-)

diff --git a/core/src/main/java/org/lflang/AbstractTargetProperty.java b/core/src/main/java/org/lflang/AbstractTargetProperty.java
index f2575f6cf9..f8ff90e78a 100644
--- a/core/src/main/java/org/lflang/AbstractTargetProperty.java
+++ b/core/src/main/java/org/lflang/AbstractTargetProperty.java
@@ -1,6 +1,7 @@
 package org.lflang;
 
 import java.util.List;
+import java.util.Optional;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
@@ -125,6 +126,15 @@ public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {}
    */
   public abstract Element toAstElement(T value);
 
+  public Optional<Element> astElementFromConfig(TargetConfig config) {
+    var value = toAstElement(config.get(this));
+    if (value != null) {
+      return Optional.of(value);
+    } else {
+      return Optional.empty();
+    }
+  }
+
   /** Return the name of this target property (in kebab case). */
   public abstract String name();
 
@@ -160,4 +170,21 @@ public boolean equals(Object obj) {
   public int hashCode() {
     return this.getClass().getName().hashCode();
   }
+
+  /**
+   * Retrieve a key-value pair from the given AST that matches the given target property.
+   *
+   * @param ast The AST retrieve the key-value pair from.
+   * @param property The target property of interest.
+   * @return The found key-value pair, or {@code null} if no matching pair could be found.
+   */
+  public static KeyValuePair getKeyValuePair(Model ast, AbstractTargetProperty<?, ?> property) {
+    var targetProperties = ast.getTarget().getConfig();
+    List<KeyValuePair> properties =
+        targetProperties.getPairs().stream()
+            .filter(pair -> pair.getName().equals(property.name()))
+            .toList();
+    assert properties.size() <= 1;
+    return properties.size() > 0 ? properties.get(0) : null;
+  }
 }
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index a39281b790..5258008b3b 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -759,16 +759,9 @@ private void inspectReactorEResource(ReactorDecl reactor) {
         // Copy the user files and cmake-includes to the src-gen path of the main .lf file
         copyUserFiles(lfResource.getTargetConfig(), lfResource.getFileConfig());
         // Merge the CMake includes from the imported file into the target config
-        final var cmakeIncludes = this.targetConfig.get(new CmakeIncludeProperty());
-        lfResource
-            .getTargetConfig()
-            .get(new CmakeIncludeProperty())
-            .forEach(
-                incl -> {
-                  if (!cmakeIncludes.contains(incl)) {
-                    cmakeIncludes.add(incl);
-                  }
-                });
+        new CmakeIncludeProperty()
+            .update(
+                this.targetConfig, lfResource.getTargetConfig().get(new CmakeIncludeProperty()));
       }
     }
   }
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 085b3ca06c..1331005760 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -29,6 +29,7 @@
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -39,6 +40,7 @@
 import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.LfFactory;
 import org.lflang.lf.TargetDecl;
 import org.lflang.target.property.AuthProperty;
 import org.lflang.target.property.BuildCommandsProperty;
@@ -260,4 +262,25 @@ public <T, S extends TargetPropertyType> void set(
     this.setProperties.add(property);
     this.properties.put(property, value);
   }
+
+  /**
+   * Extracts all properties as a list of key-value pairs from a TargetConfig. Only extracts
+   * properties explicitly set by user.
+   *
+   * @param config The TargetConfig to extract from.
+   * @return The extracted properties.
+   */
+  public static List<KeyValuePair> extractProperties(TargetConfig config) {
+    var res = new LinkedList<KeyValuePair>();
+    for (AbstractTargetProperty<?, ?> p : TargetProperty.loaded(config)) {
+      KeyValuePair kv = LfFactory.eINSTANCE.createKeyValuePair();
+      var element = p.astElementFromConfig(config);
+      if (element.isPresent()) {
+        kv.setName(p.name());
+        kv.setValue(element.get());
+        res.add(kv);
+      }
+    }
+    return res;
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/TargetProperty.java b/core/src/main/java/org/lflang/target/TargetProperty.java
index 7f24e131f5..5caf4db8b2 100644
--- a/core/src/main/java/org/lflang/target/TargetProperty.java
+++ b/core/src/main/java/org/lflang/target/TargetProperty.java
@@ -25,7 +25,6 @@
 
 package org.lflang.target;
 
-import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.lflang.AbstractTargetProperty;
@@ -46,33 +45,12 @@
  */
 public class TargetProperty {
 
-  /**
-   * Extracts all properties as a list of key-value pairs from a TargetConfig. Only extracts
-   * properties explicitly set by user.
-   *
-   * @param config The TargetConfig to extract from.
-   * @return The extracted properties.
-   */
-  public static List<KeyValuePair> extractProperties(
-      TargetConfig config) { // FIXME: move to TargetConfig
-    var res = new LinkedList<KeyValuePair>();
-    for (AbstractTargetProperty p : TargetProperty.loaded(config)) {
-      KeyValuePair kv = LfFactory.eINSTANCE.createKeyValuePair();
-      kv.setName(p.name());
-      kv.setValue(p.toAstElement(config.get(p)));
-      if (kv.getValue() != null) {
-        res.add(kv);
-      }
-    }
-    return res;
-  }
-
   /**
    * Return all the target properties that have been set.
    *
    * @param config The configuration to find the properties in.
    */
-  public static List<AbstractTargetProperty> loaded(
+  public static List<AbstractTargetProperty<?, ?>> loaded(
       TargetConfig config) { // FIXME: move to target config
     return config.getRegisteredProperties().stream()
         .filter(p -> config.isSet(p))
@@ -89,7 +67,7 @@ public static List<AbstractTargetProperty> loaded(
   public static TargetDecl extractTargetDecl(Target target, TargetConfig config) {
     TargetDecl decl = LfFactory.eINSTANCE.createTargetDecl();
     KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-    for (KeyValuePair p : extractProperties(config)) {
+    for (KeyValuePair p : TargetConfig.extractProperties(config)) {
       kvp.getPairs().add(p);
     }
     decl.setName(target.toString());
@@ -97,23 +75,6 @@ public static TargetDecl extractTargetDecl(Target target, TargetConfig config) {
     return decl;
   }
 
-  /**
-   * Retrieve a key-value pair from the given AST that matches the given target property.
-   *
-   * @param ast The AST retrieve the key-value pair from.
-   * @param property The target property of interest.
-   * @return The found key-value pair, or {@code null} if no matching pair could be found.
-   */
-  public static KeyValuePair getKeyValuePair(Model ast, AbstractTargetProperty property) {
-    var targetProperties = ast.getTarget().getConfig();
-    List<KeyValuePair> properties =
-        targetProperties.getPairs().stream()
-            .filter(pair -> pair.getName().equals(property.name()))
-            .toList();
-    assert properties.size() <= 1;
-    return properties.size() > 0 ? properties.get(0) : null;
-  }
-
   /**
    * Validate the given key-value pairs and report issues via the given reporter.
    *
diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index 02d37b6ca0..55c8110dec 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -11,7 +11,6 @@
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
-import org.lflang.target.TargetProperty;
 import org.lflang.target.property.PlatformProperty.PlatformOptions;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.DictionaryType.DictionaryElement;
@@ -78,7 +77,7 @@ public List<Target> supportedTargets() {
   @Override
   public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
     var config = fromAst(pair.getValue(), reporter);
-    var threading = TargetProperty.getKeyValuePair(ast, new ThreadingProperty());
+    var threading = AbstractTargetProperty.getKeyValuePair(ast, new ThreadingProperty());
     if (threading != null && config.platform == Platform.RP2040) {
       reporter
           .at(pair, Literals.KEY_VALUE_PAIR__VALUE)
diff --git a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
index d64df016a6..426d8c02a0 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
@@ -10,7 +10,6 @@
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
-import org.lflang.target.TargetProperty;
 import org.lflang.target.property.type.ArrayType;
 
 /** Directive to specify additional ROS2 packages that this LF program depends on. */
@@ -42,7 +41,7 @@ public List<Target> supportedTargets() {
 
   @Override
   public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
-    var ros2enabled = TargetProperty.getKeyValuePair(ast, new Ros2Property());
+    var ros2enabled = AbstractTargetProperty.getKeyValuePair(ast, new Ros2Property());
     if (pair != null && (ros2enabled == null || !ASTUtils.toBoolean(ros2enabled.getValue()))) {
       reporter
           .at(pair, Literals.KEY_VALUE_PAIR__NAME)
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index ce8470a512..b6ac6b4325 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -12,7 +12,6 @@
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
-import org.lflang.target.TargetProperty;
 import org.lflang.target.property.TracingProperty.TracingOptions;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.DictionaryType.DictionaryElement;
@@ -64,7 +63,7 @@ public List<Target> supportedTargets() {
   public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
     if (pair != null && this.fromAst(pair.getValue(), reporter) != null) {
       // If tracing is anything but "false" and threading is off, error.
-      var threading = TargetProperty.getKeyValuePair(ast, new ThreadingProperty());
+      var threading = AbstractTargetProperty.getKeyValuePair(ast, new ThreadingProperty());
       if (threading != null) {
         if (!ASTUtils.toBoolean(threading.getValue())) {
           reporter

From 499e158f04696ec177b365bd9349102e67c615b8 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 15 Oct 2023 21:52:11 -0700
Subject: [PATCH 1022/1114] Address another FIXME

---
 .../org/lflang/AbstractTargetProperty.java    | 21 +++++++++++++++++++
 .../federated/extensions/CExtensionUtils.java |  5 +----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/AbstractTargetProperty.java b/core/src/main/java/org/lflang/AbstractTargetProperty.java
index f8ff90e78a..5034c2819e 100644
--- a/core/src/main/java/org/lflang/AbstractTargetProperty.java
+++ b/core/src/main/java/org/lflang/AbstractTargetProperty.java
@@ -142,14 +142,35 @@ public final void override(TargetConfig config, T value) {
     config.set(this, value);
   }
 
+  /**
+   * Update the given configuration using the given value. The default implementation simply assigns
+   * the given value, overriding whatever value might have been assigned before.
+   *
+   * @param config The configuration to update.
+   * @param value The value to perform the update with.
+   */
   protected void update(TargetConfig config, T value) {
     override(config, value);
   }
 
+  /**
+   * Update the given configuration based on the given corresponding AST node.
+   *
+   * @param config The configuration to update.
+   * @param node The node to perform the update with.
+   * @param reporter A reporter to report issues.
+   */
   public final void update(TargetConfig config, Element node, MessageReporter reporter) {
     this.update(config, fromAst(node, reporter));
   }
 
+  /**
+   * Update the given configuration based on the given corresponding AST node.
+   *
+   * @param config The configuration to update.
+   * @param value The node to perform the update with.
+   * @param reporter A reporter to report issues.
+   */
   public final void update(TargetConfig config, String value, MessageReporter reporter) {
     this.update(config, fromString(value, reporter));
   }
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index e61f230a78..f18e73ae8c 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -240,10 +240,7 @@ public static void initializeClockSynchronization(
               .nowhere()
               .info("Will collect clock sync statistics for federate " + federate.id);
           // Add libm to the compiler flags
-          federate
-              .targetConfig
-              .get(new CompilerFlagsProperty())
-              .add("-lm"); // FIXME: add without marking as set
+          new CompilerFlagsProperty().update(federate.targetConfig, List.of("-lm"));
         }
         messageReporter
             .nowhere()

From a90f44e2fb6e1ee86d36d8a3be54aef837f5f5fb Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 15 Oct 2023 22:32:17 -0700
Subject: [PATCH 1023/1114] Further refactoring

---
 ...argetProperty.java => TargetProperty.java} |  12 +-
 .../federated/generator/FedTargetEmitter.java |   4 +-
 .../generator/python/PythonGenerator.java     |   1 -
 .../generator/rust/CargoDependencySpec.java   |   3 +-
 .../java/org/lflang/target/TargetConfig.java  |  94 ++++++++++++---
 .../org/lflang/target/TargetProperty.java     | 111 ------------------
 .../lflang/target/property/AuthProperty.java  |   2 +-
 ...leanProperty.java => BooleanProperty.java} |   7 +-
 .../property/BuildCommandsProperty.java       |   4 +-
 .../target/property/BuildTypeProperty.java    |   4 +-
 .../property/CargoDependenciesProperty.java   |   5 +-
 .../property/CargoFeaturesProperty.java       |   2 +-
 .../property/ClockSyncModeProperty.java       |   5 +-
 .../property/ClockSyncOptionsProperty.java    |   5 +-
 .../target/property/CmakeIncludeProperty.java |   2 +-
 .../property/CompileDefinitionsProperty.java  |   4 +-
 .../property/CompilerFlagsProperty.java       |   2 +-
 .../target/property/CompilerProperty.java     |   2 +-
 .../property/CoordinationOptionsProperty.java |   4 +-
 .../target/property/CoordinationProperty.java |   5 +-
 .../target/property/DockerProperty.java       |   4 +-
 .../ExportDependencyGraphProperty.java        |   2 +-
 .../target/property/ExportToYamlProperty.java |   2 +-
 .../property/ExternalRuntimePathProperty.java |   2 +-
 .../lflang/target/property/FastProperty.java  |   2 +-
 .../target/property/FedSetupProperty.java     |   4 +-
 ...istProperty.java => FileListProperty.java} |   7 +-
 .../lflang/target/property/FilesProperty.java |   2 +-
 .../property/HierarchicalBinProperty.java     |   2 +-
 .../target/property/KeepaliveProperty.java    |   2 +-
 .../target/property/LoggingProperty.java      |   4 +-
 .../target/property/NoCompileProperty.java    |   2 +-
 .../property/NoRuntimeValidationProperty.java |   2 +-
 .../target/property/PlatformProperty.java     |   6 +-
 .../property/PrintStatisticsProperty.java     |   2 +-
 .../target/property/ProtobufsProperty.java    |   2 +-
 .../property/Ros2DependenciesProperty.java    |   6 +-
 .../lflang/target/property/Ros2Property.java  |   2 +-
 .../property/RuntimeVersionProperty.java      |   2 +-
 .../target/property/RustIncludeProperty.java  |   4 +-
 .../target/property/SchedulerProperty.java    |   4 +-
 .../property/SingleFileProjectProperty.java   |   2 +-
 ...tProperty.java => StringListProperty.java} |   7 +-
 ...tStringConfig.java => StringProperty.java} |   6 +-
 .../target/property/ThreadingProperty.java    |   2 +-
 .../target/property/TimeOutProperty.java      |   4 +-
 .../target/property/TracingProperty.java      |   6 +-
 .../target/property/VerifyProperty.java       |   4 +-
 .../target/property/WorkersProperty.java      |   4 +-
 .../org/lflang/validation/LFValidator.java    |   3 +-
 .../compiler/LinguaFrancaValidationTest.java  |   7 +-
 51 files changed, 162 insertions(+), 226 deletions(-)
 rename core/src/main/java/org/lflang/{AbstractTargetProperty.java => TargetProperty.java} (94%)
 delete mode 100644 core/src/main/java/org/lflang/target/TargetProperty.java
 rename core/src/main/java/org/lflang/target/property/{AbstractBooleanProperty.java => BooleanProperty.java} (77%)
 rename core/src/main/java/org/lflang/target/property/{AbstractFileListProperty.java => FileListProperty.java} (86%)
 rename core/src/main/java/org/lflang/target/property/{AbstractStringListProperty.java => StringListProperty.java} (86%)
 rename core/src/main/java/org/lflang/target/property/{AbstractStringConfig.java => StringProperty.java} (78%)

diff --git a/core/src/main/java/org/lflang/AbstractTargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
similarity index 94%
rename from core/src/main/java/org/lflang/AbstractTargetProperty.java
rename to core/src/main/java/org/lflang/TargetProperty.java
index 5034c2819e..7c47afde72 100644
--- a/core/src/main/java/org/lflang/AbstractTargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -10,14 +10,12 @@
 import org.lflang.target.property.type.TargetPropertyType;
 
 /**
- * A base class for target properties.
- *
- * <p>After implementing this class to create a new target property, add a corresponding entry to
- * {@code TargetConfig} and hook it into the {@code TargetProperty} enum.
+ * A abstract base class for target properties.
  *
  * @param <T> The data type of the value assigned to the target property.
+ * @author Marten Lohstroh
  */
-public abstract class AbstractTargetProperty<T, S extends TargetPropertyType> {
+public abstract class TargetProperty<T, S extends TargetPropertyType> {
 
   /** The type of values assignable to this target property. */
   public final S type;
@@ -27,7 +25,7 @@ public abstract class AbstractTargetProperty<T, S extends TargetPropertyType> {
    *
    * @param type The type of the value that can be assigned to the property.
    */
-  public AbstractTargetProperty(S type) {
+  public TargetProperty(S type) {
     this.type = type;
   }
 
@@ -199,7 +197,7 @@ public int hashCode() {
    * @param property The target property of interest.
    * @return The found key-value pair, or {@code null} if no matching pair could be found.
    */
-  public static KeyValuePair getKeyValuePair(Model ast, AbstractTargetProperty<?, ?> property) {
+  public static KeyValuePair getKeyValuePair(Model ast, TargetProperty<?, ?> property) {
     var targetProperties = ast.getTarget().getConfig();
     List<KeyValuePair> properties =
         targetProperties.getPairs().stream()
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
index bbfc16bfd2..ff273e7ead 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
@@ -6,7 +6,6 @@
 import org.lflang.federated.extensions.FedTargetExtensionFactory;
 import org.lflang.federated.launcher.RtiConfig;
 import org.lflang.generator.LFGeneratorContext;
-import org.lflang.target.TargetProperty;
 
 public class FedTargetEmitter {
 
@@ -28,7 +27,6 @@ String generateTarget(
             context, numOfFederates, federate, fileConfig, messageReporter, rtiConfig);
 
     return FormattingUtil.renderer(federate.targetConfig.target)
-        .apply(
-            TargetProperty.extractTargetDecl(federate.targetConfig.target, federate.targetConfig));
+        .apply(federate.targetConfig.extractTargetDecl());
   }
 }
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index 72b3d59e5e..c9b82b9e5b 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -111,7 +111,6 @@ private PythonGenerator(
     super(context, false, types, cmakeGenerator, new PythonDelayBodyGenerator(types));
     new CompilerProperty().override(this.targetConfig, "gcc"); // FIXME: why?
     this.targetConfig.reset(new CompilerFlagsProperty());
-    this.targetConfig.linkerFlags = ""; // FIXME: why?
     this.types = types;
   }
 
diff --git a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
index d30ae87255..4b5f3f5565 100644
--- a/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
+++ b/core/src/main/java/org/lflang/generator/rust/CargoDependencySpec.java
@@ -40,12 +40,11 @@
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
-import org.lflang.target.TargetProperty;
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.util.StringUtil;
 
 /**
- * Info about a cargo dependency. See {@link TargetProperty#CARGO_DEPENDENCIES}.
+ * Info about a cargo dependency. See {@link org.lflang.target.property.CargoDependenciesProperty}.
  *
  * @author Clément Fournier - TU Dresden, INSA Rennes
  */
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 1331005760..93c8111c6b 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -36,11 +36,14 @@
 import java.util.Properties;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.lf.KeyValuePair;
+import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
+import org.lflang.lf.LfPackage.Literals;
+import org.lflang.lf.Model;
 import org.lflang.lf.TargetDecl;
 import org.lflang.target.property.AuthProperty;
 import org.lflang.target.property.BuildCommandsProperty;
@@ -82,6 +85,7 @@
 import org.lflang.target.property.WorkersProperty;
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.target.property.type.VerifyProperty;
+import org.lflang.validation.ValidatorMessageReporter;
 
 /**
  * A class for keeping the current target configuration.
@@ -169,27 +173,24 @@ public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messa
   /** Additional sources to add to the compile command if appropriate. */
   public final List<String> compileAdditionalSources = new ArrayList<>();
 
-  /** Flags to pass to the linker, unless a build command has been specified. */
-  public String linkerFlags = "";
+  protected final Map<TargetProperty<?, ?>, Object> properties = new HashMap<>();
 
-  protected final Map<AbstractTargetProperty<?, ?>, Object> properties = new HashMap<>();
+  private final Set<TargetProperty<?, ?>> setProperties = new HashSet<>();
 
-  private final Set<AbstractTargetProperty<?, ?>> setProperties = new HashSet<>();
-
-  public void register(AbstractTargetProperty<?, ?>... properties) {
+  public void register(TargetProperty<?, ?>... properties) {
     Arrays.stream(properties)
         .forEach(property -> this.properties.put(property, property.initialValue()));
   }
 
   /** Reset this target property to its initial value (and mark it as unset). */
-  public void reset(AbstractTargetProperty<?, ?> property) {
+  public void reset(TargetProperty<?, ?> property) {
     this.properties.put(property, property.initialValue());
     this.setProperties.remove(property);
   }
 
   /** Return the value currently assigned to the given target property. */
   @SuppressWarnings("unchecked")
-  public <T, S extends TargetPropertyType> T get(AbstractTargetProperty<T, S> property) {
+  public <T, S extends TargetPropertyType> T get(TargetProperty<T, S> property) {
     return (T) properties.get(property);
   }
 
@@ -197,18 +198,18 @@ public <T, S extends TargetPropertyType> T get(AbstractTargetProperty<T, S> prop
    * Return {@code true} if this target property has been set (past initialization), {@code false}
    * otherwise.
    */
-  public boolean isSet(AbstractTargetProperty<?, ?> property) {
+  public boolean isSet(TargetProperty<?, ?> property) {
     return this.setProperties.contains(property);
   }
 
   public String listOfRegisteredProperties() {
     return getRegisteredProperties().stream()
-        .map(AbstractTargetProperty::toString)
+        .map(TargetProperty::toString)
         .filter(s -> !s.startsWith("_"))
         .collect(Collectors.joining(", "));
   }
 
-  public List<AbstractTargetProperty<?, ?>> getRegisteredProperties() {
+  public List<TargetProperty<?, ?>> getRegisteredProperties() {
     return this.properties.keySet().stream()
         .sorted(Comparator.comparing(p -> p.getClass().getName()))
         .collect(Collectors.toList());
@@ -219,7 +220,7 @@ public String listOfRegisteredProperties() {
    *
    * @param name The string to match against.
    */
-  public Optional<AbstractTargetProperty<?, ?>> forName(String name) {
+  public Optional<TargetProperty<?, ?>> forName(String name) {
     return this.getRegisteredProperties().stream()
         .filter(c -> c.name().equalsIgnoreCase(name))
         .findFirst();
@@ -257,8 +258,7 @@ public void load(List<KeyValuePair> pairs, MessageReporter err) {
         });
   }
 
-  public <T, S extends TargetPropertyType> void set(
-      AbstractTargetProperty<T, S> property, T value) {
+  public <T, S extends TargetPropertyType> void set(TargetProperty<T, S> property, T value) {
     this.setProperties.add(property);
     this.properties.put(property, value);
   }
@@ -272,7 +272,7 @@ public <T, S extends TargetPropertyType> void set(
    */
   public static List<KeyValuePair> extractProperties(TargetConfig config) {
     var res = new LinkedList<KeyValuePair>();
-    for (AbstractTargetProperty<?, ?> p : TargetProperty.loaded(config)) {
+    for (TargetProperty<?, ?> p : loaded(config)) {
       KeyValuePair kv = LfFactory.eINSTANCE.createKeyValuePair();
       var element = p.astElementFromConfig(config);
       if (element.isPresent()) {
@@ -283,4 +283,66 @@ public static List<KeyValuePair> extractProperties(TargetConfig config) {
     }
     return res;
   }
+
+  /**
+   * Return all the target properties that have been set.
+   *
+   * @param config The configuration to find the properties in.
+   */
+  public static List<TargetProperty<?, ?>> loaded(
+      TargetConfig config) { // FIXME: move to target config
+    return config.getRegisteredProperties().stream()
+        .filter(p -> config.isSet(p))
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Construct a {@code TargetDecl} by extracting the fields of the given {@code TargetConfig}.
+   *
+   * @return A generated TargetDecl.
+   */
+  public TargetDecl extractTargetDecl() {
+    TargetDecl decl = LfFactory.eINSTANCE.createTargetDecl();
+    KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
+    for (KeyValuePair p : extractProperties(this)) {
+      kvp.getPairs().add(p);
+    }
+    decl.setName(target.toString());
+    decl.setConfig(kvp);
+    return decl;
+  }
+
+  /**
+   * Validate the given key-value pairs and report issues via the given reporter.
+   *
+   * @param pairs The key-value pairs to validate.
+   * @param ast The root node of the AST from which the key-value pairs were taken.
+   * @param config A target configuration used to retrieve the corresponding target properties.
+   * @param reporter A reporter to report errors and warnings through.
+   */
+  public static void validate(
+      KeyValuePairs pairs, Model ast, TargetConfig config, ValidatorMessageReporter reporter) {
+    pairs.getPairs().stream()
+        .forEach(
+            pair -> {
+              var match =
+                  config.getRegisteredProperties().stream()
+                      .filter(prop -> prop.name().equalsIgnoreCase(pair.getName()))
+                      .findAny();
+              if (match.isPresent()) {
+                var p = match.get();
+                p.checkSupport(pair, config.target, reporter);
+                p.checkType(pair, reporter);
+                p.validate(pair, ast, reporter);
+              } else {
+                reporter
+                    .at(pair, Literals.KEY_VALUE_PAIR__NAME)
+                    .warning(
+                        "Unrecognized target property: "
+                            + pair.getName()
+                            + ". Recognized properties are: "
+                            + config.listOfRegisteredProperties());
+              }
+            });
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/TargetProperty.java b/core/src/main/java/org/lflang/target/TargetProperty.java
deleted file mode 100644
index 5caf4db8b2..0000000000
--- a/core/src/main/java/org/lflang/target/TargetProperty.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*************
- * Copyright (c) 2019, The University of California at Berkeley.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- ***************/
-
-package org.lflang.target;
-
-import java.util.List;
-import java.util.stream.Collectors;
-import org.lflang.AbstractTargetProperty;
-import org.lflang.Target;
-import org.lflang.lf.KeyValuePair;
-import org.lflang.lf.KeyValuePairs;
-import org.lflang.lf.LfFactory;
-import org.lflang.lf.LfPackage.Literals;
-import org.lflang.lf.Model;
-import org.lflang.lf.TargetDecl;
-import org.lflang.validation.ValidatorMessageReporter;
-
-/**
- * A target properties along with a type and a list of supporting targets that supports it, as well
- * as a function for configuration updates.
- *
- * @author Marten Lohstroh
- */
-public class TargetProperty {
-
-  /**
-   * Return all the target properties that have been set.
-   *
-   * @param config The configuration to find the properties in.
-   */
-  public static List<AbstractTargetProperty<?, ?>> loaded(
-      TargetConfig config) { // FIXME: move to target config
-    return config.getRegisteredProperties().stream()
-        .filter(p -> config.isSet(p))
-        .collect(Collectors.toList());
-  }
-
-  /**
-   * Constructs a {@code TargetDecl} by extracting the fields of the given {@code TargetConfig}.
-   *
-   * @param target The target to generate for.
-   * @param config The TargetConfig to extract from.
-   * @return A generated TargetDecl.
-   */
-  public static TargetDecl extractTargetDecl(Target target, TargetConfig config) {
-    TargetDecl decl = LfFactory.eINSTANCE.createTargetDecl();
-    KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
-    for (KeyValuePair p : TargetConfig.extractProperties(config)) {
-      kvp.getPairs().add(p);
-    }
-    decl.setName(target.toString());
-    decl.setConfig(kvp);
-    return decl;
-  }
-
-  /**
-   * Validate the given key-value pairs and report issues via the given reporter.
-   *
-   * @param pairs The key-value pairs to validate.
-   * @param ast The root node of the AST from which the key-value pairs were taken.
-   * @param config A target configuration used to retrieve the corresponding target properties.
-   * @param reporter A reporter to report errors and warnings through.
-   */
-  public static void validate(
-      KeyValuePairs pairs, Model ast, TargetConfig config, ValidatorMessageReporter reporter) {
-    pairs.getPairs().stream()
-        .forEach(
-            pair -> {
-              var match =
-                  config.getRegisteredProperties().stream()
-                      .filter(prop -> prop.name().equalsIgnoreCase(pair.getName()))
-                      .findAny();
-              if (match.isPresent()) {
-                var p = match.get();
-                p.checkSupport(pair, config.target, reporter);
-                p.checkType(pair, reporter);
-                p.validate(pair, ast, reporter);
-              } else {
-                reporter
-                    .at(pair, Literals.KEY_VALUE_PAIR__NAME)
-                    .warning(
-                        "Unrecognized target property: "
-                            + pair.getName()
-                            + ". Recognized properties are: "
-                            + config.listOfRegisteredProperties());
-              }
-            });
-  }
-}
diff --git a/core/src/main/java/org/lflang/target/property/AuthProperty.java b/core/src/main/java/org/lflang/target/property/AuthProperty.java
index a3e9ee6b1f..26088b1d97 100644
--- a/core/src/main/java/org/lflang/target/property/AuthProperty.java
+++ b/core/src/main/java/org/lflang/target/property/AuthProperty.java
@@ -5,7 +5,7 @@
 import org.lflang.Target;
 
 /** Directive to allow including OpenSSL libraries and process HMAC authentication. */
-public class AuthProperty extends AbstractBooleanProperty {
+public class AuthProperty extends BooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/AbstractBooleanProperty.java b/core/src/main/java/org/lflang/target/property/BooleanProperty.java
similarity index 77%
rename from core/src/main/java/org/lflang/target/property/AbstractBooleanProperty.java
rename to core/src/main/java/org/lflang/target/property/BooleanProperty.java
index 9e6c2bc56c..b8ab9f7cb9 100644
--- a/core/src/main/java/org/lflang/target/property/AbstractBooleanProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BooleanProperty.java
@@ -1,15 +1,14 @@
 package org.lflang.target.property;
 
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
+import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
 
-public abstract class AbstractBooleanProperty
-    extends AbstractTargetProperty<Boolean, PrimitiveType> {
+public abstract class BooleanProperty extends TargetProperty<Boolean, PrimitiveType> {
 
-  public AbstractBooleanProperty() {
+  public BooleanProperty() {
     super(PrimitiveType.BOOLEAN);
   }
 
diff --git a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
index 19ccaba064..8049f02668 100644
--- a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
@@ -3,9 +3,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.UnionType;
@@ -15,7 +15,7 @@
  * designated compiler. A common usage of this target property is to set the command to build on the
  * basis of a Makefile.
  */
-public class BuildCommandsProperty extends AbstractTargetProperty<List<String>, UnionType> {
+public class BuildCommandsProperty extends TargetProperty<List<String>, UnionType> {
 
   public BuildCommandsProperty() {
     super(UnionType.STRING_OR_STRING_ARRAY);
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
index 48def1278c..66ac8273b1 100644
--- a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
@@ -2,9 +2,9 @@
 
 import java.util.Arrays;
 import java.util.List;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.BuildTypeType;
@@ -14,7 +14,7 @@
  * Directive to specify the target build type such as 'Release' or 'Debug'. This is also used in the
  * Rust target to select a Cargo profile.
  */
-public class BuildTypeProperty extends AbstractTargetProperty<BuildType, BuildTypeType> {
+public class BuildTypeProperty extends TargetProperty<BuildType, BuildTypeType> {
 
   public BuildTypeProperty() {
     super(new BuildTypeType());
diff --git a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
index 95a95790c1..17bbadd732 100644
--- a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
@@ -4,9 +4,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.generator.rust.CargoDependencySpec;
 import org.lflang.generator.rust.CargoDependencySpec.CargoDependenciesPropertyType;
 import org.lflang.lf.Element;
@@ -40,8 +40,7 @@
  * }</pre>
  */
 public class CargoDependenciesProperty
-    extends AbstractTargetProperty<
-        Map<String, CargoDependencySpec>, CargoDependenciesPropertyType> {
+    extends TargetProperty<Map<String, CargoDependencySpec>, CargoDependenciesPropertyType> {
 
   public CargoDependenciesProperty() {
     super(new CargoDependenciesPropertyType());
diff --git a/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java b/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
index afe9d7efc9..d9c050dec9 100644
--- a/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
@@ -5,7 +5,7 @@
 import org.lflang.Target;
 
 /** Directive for specifying Cargo features of the generated program to enable. */
-public class CargoFeaturesProperty extends AbstractStringListProperty {
+public class CargoFeaturesProperty extends StringListProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
index 06863f3a01..584ddc4856 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
@@ -2,9 +2,9 @@
 
 import java.util.List;
 import java.util.Objects;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -15,8 +15,7 @@
 import org.lflang.target.property.type.ClockSyncModeType.ClockSyncMode;
 
 /** The mode of clock synchronization to be used in federated programs. The default is 'initial'. */
-public class ClockSyncModeProperty
-    extends AbstractTargetProperty<ClockSyncMode, ClockSyncModeType> {
+public class ClockSyncModeProperty extends TargetProperty<ClockSyncMode, ClockSyncModeType> {
 
   public ClockSyncModeProperty() {
     super(new ClockSyncModeType());
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
index d84fefe76c..92ef3fdafd 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
@@ -2,9 +2,9 @@
 
 import java.util.Arrays;
 import java.util.List;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
@@ -19,8 +19,7 @@
 import org.lflang.target.property.type.TargetPropertyType;
 
 /** Key-value pairs giving options for clock synchronization. */
-public class ClockSyncOptionsProperty
-    extends AbstractTargetProperty<ClockSyncOptions, DictionaryType> {
+public class ClockSyncOptionsProperty extends TargetProperty<ClockSyncOptions, DictionaryType> {
 
   public ClockSyncOptionsProperty() {
     super(DictionaryType.CLOCK_SYNC_OPTION_DICT);
diff --git a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
index 07937a632e..b5ca6a6970 100644
--- a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
@@ -13,7 +13,7 @@
  * <p>This gives full control over the C/C++ build as any cmake parameters can be adjusted in the
  * included file.
  */
-public class CmakeIncludeProperty extends AbstractFileListProperty {
+public class CmakeIncludeProperty extends FileListProperty {
 
   @Override
   protected List<String> fromAst(Element node, MessageReporter reporter) {
diff --git a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
index d65b608940..51e9ed34ae 100644
--- a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
@@ -4,9 +4,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.TargetConfig;
@@ -19,7 +19,7 @@
  * that definition, if any. The second value could be left empty.
  */
 public class CompileDefinitionsProperty
-    extends AbstractTargetProperty<Map<String, String>, StringDictionaryType> {
+    extends TargetProperty<Map<String, String>, StringDictionaryType> {
 
   public CompileDefinitionsProperty() {
     super(StringDictionaryType.COMPILE_DEFINITION);
diff --git a/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
index 8f9aee85ca..8902f605f2 100644
--- a/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
@@ -5,7 +5,7 @@
 import org.lflang.Target;
 
 /** Flags to pass to the compiler, unless a build command has been specified. */
-public class CompilerFlagsProperty extends AbstractStringListProperty {
+public class CompilerFlagsProperty extends StringListProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/CompilerProperty.java b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
index 635a66e421..daa9b50b28 100644
--- a/core/src/main/java/org/lflang/target/property/CompilerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
@@ -4,7 +4,7 @@
 import org.lflang.Target;
 
 /** The compiler to invoke, unless a build command has been specified. */
-public class CompilerProperty extends AbstractStringConfig {
+public class CompilerProperty extends StringProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
index c7247627e0..e82b43ffc6 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
@@ -3,9 +3,9 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
@@ -20,7 +20,7 @@
 
 /** Key-value pairs giving options for clock synchronization. */
 public class CoordinationOptionsProperty
-    extends AbstractTargetProperty<CoordinationOptions, DictionaryType> {
+    extends TargetProperty<CoordinationOptions, DictionaryType> {
 
   public CoordinationOptionsProperty() {
     super(DictionaryType.COORDINATION_OPTION_DICT);
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
index 361960f934..83068bbe19 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
@@ -2,9 +2,9 @@
 
 import java.util.Arrays;
 import java.util.List;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.CoordinationModeType;
@@ -14,8 +14,7 @@
  * The type of coordination used during the execution of a federated program. The default is
  * 'centralized'.
  */
-public class CoordinationProperty
-    extends AbstractTargetProperty<CoordinationMode, CoordinationModeType> {
+public class CoordinationProperty extends TargetProperty<CoordinationMode, CoordinationModeType> {
 
   public CoordinationProperty() {
     super(new CoordinationModeType());
diff --git a/core/src/main/java/org/lflang/target/property/DockerProperty.java b/core/src/main/java/org/lflang/target/property/DockerProperty.java
index 67a454528d..e3b0e0bbd4 100644
--- a/core/src/main/java/org/lflang/target/property/DockerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DockerProperty.java
@@ -3,9 +3,9 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -22,7 +22,7 @@
  * Directive to generate a Dockerfile. This is either a boolean, true or false, or a dictionary of
  * options.
  */
-public class DockerProperty extends AbstractTargetProperty<DockerOptions, UnionType> {
+public class DockerProperty extends TargetProperty<DockerOptions, UnionType> {
 
   public DockerProperty() {
     super(UnionType.DOCKER_UNION);
diff --git a/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java b/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
index 0f8c80ae6d..87628d2a9c 100644
--- a/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
@@ -9,7 +9,7 @@
  * <p>This option is currently only used for C++ and Rust. This export function is a valuable tool
  * for debugging LF programs and helps to understand the dependencies inferred by the runtime.
  */
-public class ExportDependencyGraphProperty extends AbstractBooleanProperty {
+public class ExportDependencyGraphProperty extends BooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java b/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
index 437b6d333f..bd6d975ed7 100644
--- a/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
@@ -10,7 +10,7 @@
  * <p>This option is currently only used for C++. This export function is a valuable tool for
  * debugging LF programs and performing external analysis.
  */
-public class ExportToYamlProperty extends AbstractBooleanProperty {
+public class ExportToYamlProperty extends BooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
index 615e7c9e55..36bace7002 100644
--- a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
@@ -7,7 +7,7 @@
  * Directive for specifying a path to an external runtime libray to link to instead of the default
  * one.
  */
-public class ExternalRuntimePathProperty extends AbstractStringConfig {
+public class ExternalRuntimePathProperty extends StringProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/FastProperty.java b/core/src/main/java/org/lflang/target/property/FastProperty.java
index e57a13e46d..c4106f525e 100644
--- a/core/src/main/java/org/lflang/target/property/FastProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FastProperty.java
@@ -15,7 +15,7 @@
  * If true, configure the execution environment such that it does not wait for physical time to
  * match logical time. The default is false.
  */
-public class FastProperty extends AbstractBooleanProperty {
+public class FastProperty extends BooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/FedSetupProperty.java b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
index e49d2b535e..b532448bfd 100644
--- a/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
@@ -1,9 +1,9 @@
 package org.lflang.target.property;
 
 import java.util.List;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
@@ -13,7 +13,7 @@
  * Directs the C or Python target to include the associated C file used for setting up federated
  * execution before processing the first tag.
  */
-public class FedSetupProperty extends AbstractTargetProperty<String, PrimitiveType> {
+public class FedSetupProperty extends TargetProperty<String, PrimitiveType> {
 
   public FedSetupProperty() {
     super(PrimitiveType.FILE);
diff --git a/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java b/core/src/main/java/org/lflang/target/property/FileListProperty.java
similarity index 86%
rename from core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java
rename to core/src/main/java/org/lflang/target/property/FileListProperty.java
index 0fd7087136..0baaadec0c 100644
--- a/core/src/main/java/org/lflang/target/property/AbstractFileListProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FileListProperty.java
@@ -2,17 +2,16 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
+import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.type.UnionType;
 
-public abstract class AbstractFileListProperty
-    extends AbstractTargetProperty<List<String>, UnionType> {
+public abstract class FileListProperty extends TargetProperty<List<String>, UnionType> {
 
-  public AbstractFileListProperty() {
+  public FileListProperty() {
     super(UnionType.FILE_OR_FILE_ARRAY);
   }
 
diff --git a/core/src/main/java/org/lflang/target/property/FilesProperty.java b/core/src/main/java/org/lflang/target/property/FilesProperty.java
index 77159fcddb..cb56324958 100644
--- a/core/src/main/java/org/lflang/target/property/FilesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FilesProperty.java
@@ -4,7 +4,7 @@
 import org.lflang.Target;
 
 /** Directive to stage particular files on the class path to be processed by the code generator. */
-public class FilesProperty extends AbstractFileListProperty {
+public class FilesProperty extends FileListProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java b/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
index 8dfa87bdc7..5fc3a856e8 100644
--- a/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
+++ b/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
@@ -7,7 +7,7 @@
 /**
  * Whether the bin directory should have a flat or hierarchical organization. It is flat by default.
  */
-public class HierarchicalBinProperty extends AbstractBooleanProperty {
+public class HierarchicalBinProperty extends BooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
index da6d994c1d..76a1515632 100644
--- a/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
+++ b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
@@ -7,7 +7,7 @@
  * If true, configure the execution environment to keep executing if there are no more events on the
  * event queue. The default is false.
  */
-public class KeepaliveProperty extends AbstractBooleanProperty {
+public class KeepaliveProperty extends BooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/LoggingProperty.java b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
index e7d40d49a5..080697ffee 100644
--- a/core/src/main/java/org/lflang/target/property/LoggingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
@@ -1,9 +1,9 @@
 package org.lflang.target.property;
 
 import java.util.List;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.LoggingType;
@@ -13,7 +13,7 @@
  * Directive to specify the grain at which to report log messages during execution. The default is
  * INFO.
  */
-public class LoggingProperty extends AbstractTargetProperty<LogLevel, LoggingType> {
+public class LoggingProperty extends TargetProperty<LogLevel, LoggingType> {
 
   public LoggingProperty() {
     super(new LoggingType());
diff --git a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
index b1a6a375b0..b0b7513c21 100644
--- a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
+++ b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
@@ -5,7 +5,7 @@
 import org.lflang.Target;
 
 /** If true, do not invoke the target compiler or build command. The default is false. */
-public class NoCompileProperty extends AbstractBooleanProperty {
+public class NoCompileProperty extends BooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java b/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
index e9176d6680..216bfe8491 100644
--- a/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
+++ b/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
@@ -4,7 +4,7 @@
 import org.lflang.Target;
 
 /** If true, do not perform runtime validation. The default is false. */
-public class NoRuntimeValidationProperty extends AbstractBooleanProperty {
+public class NoRuntimeValidationProperty extends BooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index 55c8110dec..73287acd83 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -1,9 +1,9 @@
 package org.lflang.target.property;
 
 import java.util.List;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -24,7 +24,7 @@
  * Directive to specify the platform for cross code generation. This is either a string of the
  * platform or a dictionary of options that includes the string name.
  */
-public class PlatformProperty extends AbstractTargetProperty<PlatformOptions, UnionType> {
+public class PlatformProperty extends TargetProperty<PlatformOptions, UnionType> {
 
   public PlatformProperty() {
     super(UnionType.PLATFORM_STRING_OR_DICTIONARY);
@@ -77,7 +77,7 @@ public List<Target> supportedTargets() {
   @Override
   public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
     var config = fromAst(pair.getValue(), reporter);
-    var threading = AbstractTargetProperty.getKeyValuePair(ast, new ThreadingProperty());
+    var threading = TargetProperty.getKeyValuePair(ast, new ThreadingProperty());
     if (threading != null && config.platform == Platform.RP2040) {
       reporter
           .at(pair, Literals.KEY_VALUE_PAIR__VALUE)
diff --git a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
index c722a8530d..d682f40a6a 100644
--- a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
@@ -4,7 +4,7 @@
 import org.lflang.Target;
 
 /** If true, instruct the runtime to collect and print execution statistics. */
-public class PrintStatisticsProperty extends AbstractBooleanProperty {
+public class PrintStatisticsProperty extends BooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java b/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
index 79bd510f21..426723a93a 100644
--- a/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
@@ -7,7 +7,7 @@
  * Directive for specifying .proto files that need to be compiled and their code included in the
  * sources.
  */
-public class ProtobufsProperty extends AbstractFileListProperty {
+public class ProtobufsProperty extends FileListProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
index 426d8c02a0..ca5bfc1ffd 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
@@ -2,9 +2,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -13,7 +13,7 @@
 import org.lflang.target.property.type.ArrayType;
 
 /** Directive to specify additional ROS2 packages that this LF program depends on. */
-public class Ros2DependenciesProperty extends AbstractTargetProperty<List<String>, ArrayType> {
+public class Ros2DependenciesProperty extends TargetProperty<List<String>, ArrayType> {
 
   public Ros2DependenciesProperty() {
     super(ArrayType.STRING_ARRAY);
@@ -41,7 +41,7 @@ public List<Target> supportedTargets() {
 
   @Override
   public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
-    var ros2enabled = AbstractTargetProperty.getKeyValuePair(ast, new Ros2Property());
+    var ros2enabled = TargetProperty.getKeyValuePair(ast, new Ros2Property());
     if (pair != null && (ros2enabled == null || !ASTUtils.toBoolean(ros2enabled.getValue()))) {
       reporter
           .at(pair, Literals.KEY_VALUE_PAIR__NAME)
diff --git a/core/src/main/java/org/lflang/target/property/Ros2Property.java b/core/src/main/java/org/lflang/target/property/Ros2Property.java
index c4fd562ac6..a9c0b02431 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2Property.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2Property.java
@@ -4,7 +4,7 @@
 import org.lflang.Target;
 
 /** If true, generate ROS2 specific code. */
-public class Ros2Property extends AbstractBooleanProperty {
+public class Ros2Property extends BooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
index 68c41f8c81..ceb93cfc52 100644
--- a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
@@ -4,7 +4,7 @@
 import org.lflang.Target;
 
 /** Directive for specifying a specific version of the reactor runtime library. */
-public class RuntimeVersionProperty extends AbstractStringConfig {
+public class RuntimeVersionProperty extends StringProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
index 851bf7030f..62dcb6a49d 100644
--- a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
@@ -5,9 +5,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.emf.ecore.EObject;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Array;
 import org.lflang.lf.Element;
@@ -22,7 +22,7 @@
  * the generated {@code main.rs} will include it with a {@code mod foo;}. If one of the paths is a
  * directory, it must contain a {@code mod.rs} file, and all its contents are copied.
  */
-public class RustIncludeProperty extends AbstractTargetProperty<List<Path>, UnionType> {
+public class RustIncludeProperty extends TargetProperty<List<Path>, UnionType> {
 
   public RustIncludeProperty() {
     super(UnionType.FILE_OR_FILE_ARRAY);
diff --git a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
index 14de36e2da..d981009f58 100644
--- a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
@@ -2,9 +2,9 @@
 
 import java.util.Arrays;
 import java.util.List;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -14,7 +14,7 @@
 import org.lflang.target.property.type.SchedulerType.Scheduler;
 
 /** Directive for specifying the use of a specific runtime scheduler. */
-public class SchedulerProperty extends AbstractTargetProperty<Scheduler, SchedulerType> {
+public class SchedulerProperty extends TargetProperty<Scheduler, SchedulerType> {
 
   public SchedulerProperty() {
     super(new SchedulerType());
diff --git a/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java b/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
index 7434907305..952c0c9f01 100644
--- a/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
@@ -4,7 +4,7 @@
 import org.lflang.Target;
 
 /** Directive to specify that all code is generated in a single file. */
-public class SingleFileProjectProperty extends AbstractBooleanProperty {
+public class SingleFileProjectProperty extends BooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/AbstractStringListProperty.java b/core/src/main/java/org/lflang/target/property/StringListProperty.java
similarity index 86%
rename from core/src/main/java/org/lflang/target/property/AbstractStringListProperty.java
rename to core/src/main/java/org/lflang/target/property/StringListProperty.java
index ba5e99c22e..1a010e0ea8 100644
--- a/core/src/main/java/org/lflang/target/property/AbstractStringListProperty.java
+++ b/core/src/main/java/org/lflang/target/property/StringListProperty.java
@@ -2,18 +2,17 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
+import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.type.UnionType;
 
 /** Note: {@code set} implements an "append" semantics. */
-public abstract class AbstractStringListProperty
-    extends AbstractTargetProperty<List<String>, UnionType> {
+public abstract class StringListProperty extends TargetProperty<List<String>, UnionType> {
 
-  public AbstractStringListProperty() {
+  public StringListProperty() {
     super(UnionType.STRING_OR_STRING_ARRAY);
   }
 
diff --git a/core/src/main/java/org/lflang/target/property/AbstractStringConfig.java b/core/src/main/java/org/lflang/target/property/StringProperty.java
similarity index 78%
rename from core/src/main/java/org/lflang/target/property/AbstractStringConfig.java
rename to core/src/main/java/org/lflang/target/property/StringProperty.java
index a82bbd0e26..a3536ffff4 100644
--- a/core/src/main/java/org/lflang/target/property/AbstractStringConfig.java
+++ b/core/src/main/java/org/lflang/target/property/StringProperty.java
@@ -1,14 +1,14 @@
 package org.lflang.target.property;
 
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
+import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
 
-public abstract class AbstractStringConfig extends AbstractTargetProperty<String, PrimitiveType> {
+public abstract class StringProperty extends TargetProperty<String, PrimitiveType> {
 
-  public AbstractStringConfig() {
+  public StringProperty() {
     super(PrimitiveType.STRING);
   }
 
diff --git a/core/src/main/java/org/lflang/target/property/ThreadingProperty.java b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
index 4bbcf3aba6..0071899c81 100644
--- a/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
@@ -4,7 +4,7 @@
 import org.lflang.Target;
 
 /** Directive to indicate whether the runtime should use multi-threading. */
-public class ThreadingProperty extends AbstractBooleanProperty {
+public class ThreadingProperty extends BooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
index 2a118a3851..b853822e12 100644
--- a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
@@ -1,16 +1,16 @@
 package org.lflang.target.property;
 
 import java.util.List;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
 
 /** The timeout to be observed during execution of the program. */
-public class TimeOutProperty extends AbstractTargetProperty<TimeValue, PrimitiveType> {
+public class TimeOutProperty extends TargetProperty<TimeValue, PrimitiveType> {
 
   public TimeOutProperty() {
     super(PrimitiveType.TIME_VALUE);
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index b6ac6b4325..b0298a500f 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -2,9 +2,9 @@
 
 import java.util.List;
 import java.util.Objects;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
@@ -20,7 +20,7 @@
 import org.lflang.target.property.type.UnionType;
 
 /** Directive to configure the runtime environment to perform tracing. */
-public class TracingProperty extends AbstractTargetProperty<TracingOptions, UnionType> {
+public class TracingProperty extends TargetProperty<TracingOptions, UnionType> {
 
   public TracingProperty() {
     super(UnionType.TRACING_UNION);
@@ -63,7 +63,7 @@ public List<Target> supportedTargets() {
   public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
     if (pair != null && this.fromAst(pair.getValue(), reporter) != null) {
       // If tracing is anything but "false" and threading is off, error.
-      var threading = AbstractTargetProperty.getKeyValuePair(ast, new ThreadingProperty());
+      var threading = TargetProperty.getKeyValuePair(ast, new ThreadingProperty());
       if (threading != null) {
         if (!ASTUtils.toBoolean(threading.getValue())) {
           reporter
diff --git a/core/src/main/java/org/lflang/target/property/VerifyProperty.java b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
index c26421dc03..99317847f7 100644
--- a/core/src/main/java/org/lflang/target/property/VerifyProperty.java
+++ b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
@@ -2,10 +2,10 @@
 
 import java.util.List;
 import org.lflang.Target;
-import org.lflang.target.property.AbstractBooleanProperty;
+import org.lflang.target.property.BooleanProperty;
 
 /** If true, check the generated verification model. The default is false. */
-public class VerifyProperty extends AbstractBooleanProperty {
+public class VerifyProperty extends BooleanProperty {
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/WorkersProperty.java b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
index 88e9292322..fab1b4bb82 100644
--- a/core/src/main/java/org/lflang/target/property/WorkersProperty.java
+++ b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
@@ -1,9 +1,9 @@
 package org.lflang.target.property;
 
 import java.util.List;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
@@ -12,7 +12,7 @@
  * The number of worker threads to deploy. The default is zero, which indicates that the runtime is
  * allowed to freely choose the number of workers.
  */
-public class WorkersProperty extends AbstractTargetProperty<Integer, PrimitiveType> {
+public class WorkersProperty extends TargetProperty<Integer, PrimitiveType> {
 
   public WorkersProperty() {
     super(PrimitiveType.NON_NEGATIVE_INTEGER);
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 7c961fc00c..218d5e1d4d 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -114,7 +114,6 @@
 import org.lflang.lf.WidthSpec;
 import org.lflang.lf.WidthTerm;
 import org.lflang.target.TargetConfig;
-import org.lflang.target.TargetProperty;
 import org.lflang.util.FileUtil;
 
 /**
@@ -1076,7 +1075,7 @@ public void checkTargetDecl(TargetDecl target) throws IOException {
   public void checkTargetProperties(KeyValuePairs targetProperties) {
     if (targetProperties.eContainer() instanceof TargetDecl) {
       // Only validate the target properties, not dictionaries that may be part of their values.
-      TargetProperty.validate(
+      TargetConfig.validate(
           targetProperties, this.info.model, new TargetConfig(this.target), getErrorReporter());
     }
   }
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index f015b017b9..3b434ebb4e 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -44,8 +44,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.lflang.AbstractTargetProperty;
 import org.lflang.Target;
+import org.lflang.TargetProperty;
 import org.lflang.TimeValue;
 import org.lflang.lf.LfPackage;
 import org.lflang.lf.Model;
@@ -1476,8 +1476,7 @@ private List<String> synthesizeExamples(TargetPropertyType type, boolean correct
    * Create an LF program with the given key and value as a target property, parse it, and return
    * the resulting model.
    */
-  private Model createModel(Target target, AbstractTargetProperty property, String value)
-      throws Exception {
+  private Model createModel(Target target, TargetProperty property, String value) throws Exception {
     return parseWithoutError(
         """
                 target %s {%s: %s};
@@ -1494,7 +1493,7 @@ private Model createModel(Target target, AbstractTargetProperty property, String
   public Collection<DynamicTest> checkTargetProperties() throws Exception {
     List<DynamicTest> result = new ArrayList<>();
 
-    for (AbstractTargetProperty property : (new TargetConfig(Target.C)).getRegisteredProperties()) {
+    for (TargetProperty property : (new TargetConfig(Target.C)).getRegisteredProperties()) {
       if (property instanceof CargoDependenciesProperty) {
         // we test that separately as it has better error messages
         continue;

From 7a63360ccf75c58da1db512d1c2119999348c5cc Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 15 Oct 2023 22:36:11 -0700
Subject: [PATCH 1024/1114] Address FIXME

---
 .../src/main/java/org/lflang/target/TargetConfig.java | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 93c8111c6b..9ba312b2e8 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -272,7 +272,7 @@ public <T, S extends TargetPropertyType> void set(TargetProperty<T, S> property,
    */
   public static List<KeyValuePair> extractProperties(TargetConfig config) {
     var res = new LinkedList<KeyValuePair>();
-    for (TargetProperty<?, ?> p : loaded(config)) {
+    for (TargetProperty<?, ?> p : config.loaded()) {
       KeyValuePair kv = LfFactory.eINSTANCE.createKeyValuePair();
       var element = p.astElementFromConfig(config);
       if (element.isPresent()) {
@@ -286,13 +286,10 @@ public static List<KeyValuePair> extractProperties(TargetConfig config) {
 
   /**
    * Return all the target properties that have been set.
-   *
-   * @param config The configuration to find the properties in.
    */
-  public static List<TargetProperty<?, ?>> loaded(
-      TargetConfig config) { // FIXME: move to target config
-    return config.getRegisteredProperties().stream()
-        .filter(p -> config.isSet(p))
+  public List<TargetProperty<?, ?>> loaded() {
+    return getRegisteredProperties().stream()
+        .filter(this::isSet)
         .collect(Collectors.toList());
   }
 

From 99c4cd1617d23c9bb3f73fe7b6aa522bf99b6d47 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 15 Oct 2023 22:44:41 -0700
Subject: [PATCH 1025/1114] Apply formatter

---
 core/src/main/java/org/lflang/target/TargetConfig.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 9ba312b2e8..e5a95352de 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -284,13 +284,9 @@ public static List<KeyValuePair> extractProperties(TargetConfig config) {
     return res;
   }
 
-  /**
-   * Return all the target properties that have been set.
-   */
+  /** Return all the target properties that have been set. */
   public List<TargetProperty<?, ?>> loaded() {
-    return getRegisteredProperties().stream()
-        .filter(this::isSet)
-        .collect(Collectors.toList());
+    return getRegisteredProperties().stream().filter(this::isSet).collect(Collectors.toList());
   }
 
   /**

From 5134a47081aa4bce344ad9d37c2a39fce50b31f2 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 16 Oct 2023 12:29:14 -0700
Subject: [PATCH 1026/1114] Fix merge artifacts

---
 .../lflang/generator/c/CCmakeGenerator.java   | 35 ++++++++++---------
 .../org/lflang/generator/c/CCompiler.java     |  1 -
 .../target/property/type/SchedulerType.java   |  4 +++
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 5b0cec4964..7456327e33 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -38,6 +38,7 @@
 import org.lflang.target.property.AuthProperty;
 import org.lflang.target.property.BuildTypeProperty;
 import org.lflang.target.property.CmakeIncludeProperty;
+import org.lflang.target.property.CompileDefinitionsProperty;
 import org.lflang.target.property.CompilerFlagsProperty;
 import org.lflang.target.property.CompilerProperty;
 import org.lflang.target.property.PlatformProperty;
@@ -264,22 +265,24 @@ CodeBuilder generateCMakeCode(
     }
     cMakeCode.newLine();
     cMakeCode.pr("# Set default values for build parameters\n");
-    targetConfig.compileDefinitions.forEach(
-        (key, value) -> {
-          if (key.equals("LF_THREADED") || key.equals("LF_UNTHREADED")) {
-            cMakeCode.pr("if (NOT DEFINED LF_THREADED AND NOT DEFINED LF_UNTHREADED)\n");
-          } else {
-            cMakeCode.pr("if (NOT DEFINED " + key + ")\n");
-          }
-          cMakeCode.indent();
-          var v = "TRUE";
-          if (value != null && !value.isEmpty()) {
-            v = value;
-          }
-          cMakeCode.pr("set(" + key + " " + v + ")\n");
-          cMakeCode.unindent();
-          cMakeCode.pr("endif()\n");
-        });
+    targetConfig
+        .get(new CompileDefinitionsProperty())
+        .forEach(
+            (key, value) -> {
+              if (key.equals("LF_THREADED") || key.equals("LF_UNTHREADED")) {
+                cMakeCode.pr("if (NOT DEFINED LF_THREADED AND NOT DEFINED LF_UNTHREADED)\n");
+              } else {
+                cMakeCode.pr("if (NOT DEFINED " + key + ")\n");
+              }
+              cMakeCode.indent();
+              var v = "TRUE";
+              if (value != null && !value.isEmpty()) {
+                v = value;
+              }
+              cMakeCode.pr("set(" + key + " " + v + ")\n");
+              cMakeCode.unindent();
+              cMakeCode.pr("endif()\n");
+            });
 
     // Setup main target for different platforms
     switch (platformOptions.platform) {
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index db8434ed57..7317f06fdb 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -40,7 +40,6 @@
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.BuildTypeProperty;
-import org.lflang.target.property.CompileDefinitionsProperty;
 import org.lflang.target.property.CompilerFlagsProperty;
 import org.lflang.target.property.CompilerProperty;
 import org.lflang.target.property.PlatformProperty;
diff --git a/core/src/main/java/org/lflang/target/property/type/SchedulerType.java b/core/src/main/java/org/lflang/target/property/type/SchedulerType.java
index 4edc45d515..d6b9816ad3 100644
--- a/core/src/main/java/org/lflang/target/property/type/SchedulerType.java
+++ b/core/src/main/java/org/lflang/target/property/type/SchedulerType.java
@@ -58,5 +58,9 @@ public List<Path> getRelativePaths() {
     public static Scheduler getDefault() {
       return Scheduler.NP;
     }
+
+    public String getSchedulerCompileDef() {
+      return "SCHED_" + this.name();
+    }
   }
 }

From b802c78a1094ecdbb6530f79343c7d47aa20e7d3 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 16 Oct 2023 14:27:36 -0700
Subject: [PATCH 1027/1114] Start registering target properties in code
 generator

---
 core/src/main/java/org/lflang/TargetProperty.java     | 10 +++++++---
 .../lflang/federated/extensions/CExtensionUtils.java  |  2 +-
 .../federated/launcher/FedLauncherGenerator.java      |  2 +-
 .../java/org/lflang/generator/c/CCmakeGenerator.java  |  2 +-
 .../java/org/lflang/generator/c/CDockerGenerator.java |  4 ++--
 .../main/java/org/lflang/generator/c/CGenerator.java  | 10 ++++++++--
 core/src/main/java/org/lflang/generator/c/CUtil.java  |  4 ++--
 .../src/main/java/org/lflang/target/TargetConfig.java |  2 --
 .../java/org/lflang/target/property/AuthProperty.java | 11 ++++++++++-
 .../org/lflang/target/property/BooleanProperty.java   |  2 +-
 .../lflang/target/property/BuildCommandsProperty.java |  9 +++++++--
 11 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 7c47afde72..a59b3fb9f2 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -136,6 +136,12 @@ public Optional<Element> astElementFromConfig(TargetConfig config) {
   /** Return the name of this target property (in kebab case). */
   public abstract String name();
 
+  /**
+   * Replace the value assigned to this target property in the given config with the given value.
+   *
+   * @param config The configuration to change.
+   * @param value The new value to assign.
+   */
   public final void override(TargetConfig config, T value) {
     config.set(this, value);
   }
@@ -174,9 +180,7 @@ public final void update(TargetConfig config, String value, MessageReporter repo
   }
 
   /**
-   * Return true if the given object is an instance of a class with the same name. FIXME: make this
-   * a singleton class and remove this override https://www.baeldung.com/kotlin/singleton-classes
-   * https://stackoverflow.com/questions/24214148/java-getinstance-vs-static
+   * Return true if the given object is an instance of a class with the same name.
    *
    * @param obj The object to compare this instance to.
    */
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index f18e73ae8c..3b670a4295 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -189,7 +189,7 @@ public static void handleCompileDefinitions(
             "FEDERATED_%s",
             federate.targetConfig.get(new CoordinationProperty()).toString().toUpperCase()),
         "");
-    if (federate.targetConfig.get(new AuthProperty())) {
+    if (federate.targetConfig.get(AuthProperty.INSTANCE)) {
       definitions.put("FEDERATED_AUTHENTICATED", "");
     }
     definitions.put("NUMBER_OF_FEDERATES", String.valueOf(numOfFederates));
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index 8a8efbf0aa..5b17cb5f52 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -338,7 +338,7 @@ private String getRtiCommand(List<FederateInstance> federates, boolean isRemote)
     } else {
       commands.add("RTI -i ${FEDERATION_ID} \\");
     }
-    if (targetConfig.get(new AuthProperty())) {
+    if (targetConfig.get(AuthProperty.INSTANCE)) {
       commands.add("                        -a \\");
     }
     if (targetConfig.get(new TracingProperty()).isEnabled()) {
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 7456327e33..de79c06b37 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -339,7 +339,7 @@ CodeBuilder generateCMakeCode(
         break;
     }
 
-    if (targetConfig.get(new AuthProperty())) {
+    if (targetConfig.get(AuthProperty.INSTANCE)) {
       // If security is requested, add the auth option.
       var osName = System.getProperty("os.name").toLowerCase();
       // if platform target was set, use given platform instead
diff --git a/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java b/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
index b626cc24fd..8b3adf0dfa 100644
--- a/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
@@ -31,9 +31,9 @@ protected String generateDockerFileContent() {
     var lfModuleName = context.getFileConfig().name;
     var config = context.getTargetConfig();
     var compileCommand =
-        IterableExtensions.isNullOrEmpty(config.get(new BuildCommandsProperty()))
+        IterableExtensions.isNullOrEmpty(config.get(BuildCommandsProperty.INSTANCE))
             ? generateDefaultCompileCommand()
-            : StringUtil.joinObjects(config.get(new BuildCommandsProperty()), " ");
+            : StringUtil.joinObjects(config.get(BuildCommandsProperty.INSTANCE), " ");
     var compiler = config.target == Target.CCPP ? "g++" : "gcc";
     var baseImage = DEFAULT_BASE_IMAGE;
     var dockerConf = config.get(new DockerProperty());
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index fd5be6fabe..8bfd3fa840 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -87,6 +87,7 @@
 import org.lflang.lf.StateVar;
 import org.lflang.lf.Variable;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.property.AuthProperty;
 import org.lflang.target.property.BuildCommandsProperty;
 import org.lflang.target.property.CmakeIncludeProperty;
 import org.lflang.target.property.CompileDefinitionsProperty;
@@ -404,6 +405,7 @@ protected boolean isOSCompatible() {
   @Override
   public void doGenerate(Resource resource, LFGeneratorContext context) {
     super.doGenerate(resource, context);
+    registerTargetProperties();
     if (!GeneratorUtils.canGenerate(errorsOccurred(), mainDef, messageReporter, context)) return;
     if (!isOSCompatible()) return; // Incompatible OS and configuration
 
@@ -514,7 +516,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     // clean it up after, removing the #line directives after errors have been reported.
     if (!targetConfig.get(new NoCompileProperty())
         && !targetConfig.get(new DockerProperty()).enabled
-        && IterableExtensions.isNullOrEmpty(targetConfig.get(new BuildCommandsProperty()))
+        && IterableExtensions.isNullOrEmpty(targetConfig.get(BuildCommandsProperty.INSTANCE))
         // This code is unreachable in LSP_FAST mode, so that check is omitted.
         && context.getMode() != LFGeneratorContext.Mode.LSP_MEDIUM) {
       // FIXME: Currently, a lack of main is treated as a request to not produce
@@ -557,7 +559,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     // If a build directive has been given, invoke it now.
     // Note that the code does not get cleaned in this case.
     if (!targetConfig.get(new NoCompileProperty())) {
-      if (!IterableExtensions.isNullOrEmpty(targetConfig.get(new BuildCommandsProperty()))) {
+      if (!IterableExtensions.isNullOrEmpty(targetConfig.get(BuildCommandsProperty.INSTANCE))) {
         CUtil.runBuildCommand(
             fileConfig,
             targetConfig,
@@ -578,6 +580,10 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     GeneratorUtils.refreshProject(resource, context.getMode());
   }
 
+  private void registerTargetProperties() {
+    context.getTargetConfig().register(AuthProperty.INSTANCE, BuildCommandsProperty.INSTANCE);
+  }
+
   private void generateCodeFor(String lfModuleName) throws IOException {
     code.pr(generateDirectives());
     code.pr(new CMainFunctionGenerator(targetConfig).generateCode());
diff --git a/core/src/main/java/org/lflang/generator/c/CUtil.java b/core/src/main/java/org/lflang/generator/c/CUtil.java
index 8ed5f41671..37d088c044 100644
--- a/core/src/main/java/org/lflang/generator/c/CUtil.java
+++ b/core/src/main/java/org/lflang/generator/c/CUtil.java
@@ -616,7 +616,7 @@ public static void runBuildCommand(
       LFGeneratorContext.Mode mode) {
     List<LFCommand> commands =
         getCommands(
-            targetConfig.get(new BuildCommandsProperty()), commandFactory, fileConfig.srcPath);
+            targetConfig.get(BuildCommandsProperty.INSTANCE), commandFactory, fileConfig.srcPath);
     // If the build command could not be found, abort.
     // An error has already been reported in createCommand.
     if (commands.stream().anyMatch(Objects::isNull)) return;
@@ -633,7 +633,7 @@ public static void runBuildCommand(
                     // FIXME: Why is the content of stderr not provided to the user in this error
                     // message?
                     "Build command \"%s\" failed with error code %d.",
-                    targetConfig.get(new BuildCommandsProperty()), returnCode));
+                    targetConfig.get(BuildCommandsProperty.INSTANCE), returnCode));
         return;
       }
       // For warnings (vs. errors), the return code is 0.
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index e5a95352de..23f7df9591 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -108,8 +108,6 @@ public TargetConfig(Target target) {
     this.target = target;
 
     this.register(
-        new AuthProperty(),
-        new BuildCommandsProperty(),
         new BuildTypeProperty(),
         new ClockSyncModeProperty(),
         new ClockSyncOptionsProperty(),
diff --git a/core/src/main/java/org/lflang/target/property/AuthProperty.java b/core/src/main/java/org/lflang/target/property/AuthProperty.java
index 26088b1d97..662049ebc5 100644
--- a/core/src/main/java/org/lflang/target/property/AuthProperty.java
+++ b/core/src/main/java/org/lflang/target/property/AuthProperty.java
@@ -5,7 +5,16 @@
 import org.lflang.Target;
 
 /** Directive to allow including OpenSSL libraries and process HMAC authentication. */
-public class AuthProperty extends BooleanProperty {
+public final class AuthProperty extends BooleanProperty {
+
+  /**
+   * Singleton target property instance.
+   */
+  public static final AuthProperty INSTANCE = new AuthProperty();
+
+  private AuthProperty() {
+    super();
+  }
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/BooleanProperty.java b/core/src/main/java/org/lflang/target/property/BooleanProperty.java
index b8ab9f7cb9..adf1314480 100644
--- a/core/src/main/java/org/lflang/target/property/BooleanProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BooleanProperty.java
@@ -8,7 +8,7 @@
 
 public abstract class BooleanProperty extends TargetProperty<Boolean, PrimitiveType> {
 
-  public BooleanProperty() {
+  protected BooleanProperty() {
     super(PrimitiveType.BOOLEAN);
   }
 
diff --git a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
index 8049f02668..728b446e55 100644
--- a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
@@ -15,9 +15,14 @@
  * designated compiler. A common usage of this target property is to set the command to build on the
  * basis of a Makefile.
  */
-public class BuildCommandsProperty extends TargetProperty<List<String>, UnionType> {
+public final class BuildCommandsProperty extends TargetProperty<List<String>, UnionType> {
 
-  public BuildCommandsProperty() {
+  /**
+   * Singleton target property instance.
+   */
+  public static final BuildCommandsProperty INSTANCE = new BuildCommandsProperty();
+
+  private BuildCommandsProperty() {
     super(UnionType.STRING_OR_STRING_ARRAY);
   }
 

From 3e061d3d6309387ac66d32e9b78bc01548e3151e Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 16 Oct 2023 14:28:48 -0700
Subject: [PATCH 1028/1114] Apply formatter

---
 core/src/main/java/org/lflang/target/TargetConfig.java        | 2 --
 .../main/java/org/lflang/target/property/AuthProperty.java    | 4 +---
 .../org/lflang/target/property/BuildCommandsProperty.java     | 4 +---
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 23f7df9591..1581e8191b 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -45,8 +45,6 @@
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
 import org.lflang.lf.TargetDecl;
-import org.lflang.target.property.AuthProperty;
-import org.lflang.target.property.BuildCommandsProperty;
 import org.lflang.target.property.BuildTypeProperty;
 import org.lflang.target.property.CargoDependenciesProperty;
 import org.lflang.target.property.CargoFeaturesProperty;
diff --git a/core/src/main/java/org/lflang/target/property/AuthProperty.java b/core/src/main/java/org/lflang/target/property/AuthProperty.java
index 662049ebc5..fd760153b5 100644
--- a/core/src/main/java/org/lflang/target/property/AuthProperty.java
+++ b/core/src/main/java/org/lflang/target/property/AuthProperty.java
@@ -7,9 +7,7 @@
 /** Directive to allow including OpenSSL libraries and process HMAC authentication. */
 public final class AuthProperty extends BooleanProperty {
 
-  /**
-   * Singleton target property instance.
-   */
+  /** Singleton target property instance. */
   public static final AuthProperty INSTANCE = new AuthProperty();
 
   private AuthProperty() {
diff --git a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
index 728b446e55..e5a31daf65 100644
--- a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
@@ -17,9 +17,7 @@
  */
 public final class BuildCommandsProperty extends TargetProperty<List<String>, UnionType> {
 
-  /**
-   * Singleton target property instance.
-   */
+  /** Singleton target property instance. */
   public static final BuildCommandsProperty INSTANCE = new BuildCommandsProperty();
 
   private BuildCommandsProperty() {

From ea73eba55b7d4f17c7f94414fda991aa965af395 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 16 Oct 2023 16:54:58 -0700
Subject: [PATCH 1029/1114] Adjustments to ensure proper initialization of the
 target config

---
 core/src/main/java/org/lflang/Target.java     | 38 ++++++++++++++++
 .../main/java/org/lflang/TargetProperty.java  |  2 +-
 .../main/java/org/lflang/ast/ASTUtils.java    | 10 ++---
 .../federated/extensions/CExtension.java      |  8 +++-
 .../federated/extensions/CExtensionUtils.java | 27 ++++++------
 .../federated/generator/FedFileConfig.java    |  2 +-
 .../federated/generator/FedGenerator.java     |  6 ++-
 .../federated/generator/FedTargetConfig.java  | 14 ++++--
 .../launcher/FedLauncherGenerator.java        | 12 +++---
 .../org/lflang/generator/MainContext.java     |  2 +-
 .../lflang/generator/c/CCmakeGenerator.java   | 10 ++---
 .../org/lflang/generator/c/CCompiler.java     |  8 ++--
 .../org/lflang/generator/c/CGenerator.java    | 27 +++++-------
 .../generator/c/CPreambleGenerator.java       |  2 +-
 .../generator/python/PythonGenerator.java     |  2 +-
 .../generator/rust/RustTargetConfig.java      | 43 -------------------
 .../java/org/lflang/target/TargetConfig.java  | 42 ++++++++----------
 .../target/property/BuildTypeProperty.java    |  5 ++-
 .../property/CargoDependenciesProperty.java   |  7 ++-
 .../property/CargoFeaturesProperty.java       |  7 +++
 .../property/ClockSyncModeProperty.java       |  5 ++-
 .../property/ClockSyncOptionsProperty.java    |  5 ++-
 .../target/property/CmakeIncludeProperty.java |  7 +++
 .../property/CompileDefinitionsProperty.java  |  5 ++-
 .../property/CompilerFlagsProperty.java       |  7 +++
 .../org/lflang/generator/cpp/CppGenerator.kt  |  5 +--
 .../generator/cpp/CppPlatformGenerator.kt     |  2 +-
 .../generator/cpp/CppRos2PackageGenerator.kt  |  4 +-
 .../cpp/CppStandaloneCmakeGenerator.kt        |  4 +-
 .../generator/cpp/CppStandaloneGenerator.kt   |  4 +-
 .../lflang/generator/rust/RustGenerator.kt    | 23 +++-------
 .../org/lflang/generator/rust/RustModel.kt    |  4 +-
 .../compiler/LinguaFrancaValidationTest.java  |  6 +--
 33 files changed, 184 insertions(+), 171 deletions(-)
 delete mode 100644 core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java

diff --git a/core/src/main/java/org/lflang/Target.java b/core/src/main/java/org/lflang/Target.java
index dc1a78d65f..0d73df15a1 100644
--- a/core/src/main/java/org/lflang/Target.java
+++ b/core/src/main/java/org/lflang/Target.java
@@ -26,6 +26,18 @@
 import java.util.Set;
 import net.jcip.annotations.Immutable;
 import org.lflang.lf.TargetDecl;
+import org.lflang.target.TargetConfig;
+import org.lflang.target.property.AuthProperty;
+import org.lflang.target.property.BuildCommandsProperty;
+import org.lflang.target.property.BuildTypeProperty;
+import org.lflang.target.property.CargoDependenciesProperty;
+import org.lflang.target.property.CargoFeaturesProperty;
+import org.lflang.target.property.ClockSyncModeProperty;
+import org.lflang.target.property.ClockSyncOptionsProperty;
+import org.lflang.target.property.CmakeIncludeProperty;
+import org.lflang.target.property.CompileDefinitionsProperty;
+import org.lflang.target.property.CompilerFlagsProperty;
+import org.lflang.target.property.RustIncludeProperty;
 
 /**
  * Enumeration of targets and their associated properties.
@@ -546,4 +558,30 @@ public static Target fromDecl(TargetDecl targetDecl) {
     return Target.forName(name)
         .orElseThrow(() -> new RuntimeException("Invalid target name '" + name + "'"));
   }
+
+  public void initialize(TargetConfig config) {
+    switch (this) {
+      case C, CCPP -> config.register(
+          AuthProperty.INSTANCE,
+          BuildCommandsProperty.INSTANCE,
+          BuildTypeProperty.INSTANCE,
+          ClockSyncModeProperty.INSTANCE,
+          ClockSyncOptionsProperty.INSTANCE,
+          CmakeIncludeProperty.INSTANCE,
+          CompileDefinitionsProperty.INSTANCE,
+          CompilerFlagsProperty.INSTANCE);
+      case CPP -> config.register(BuildTypeProperty.INSTANCE, CmakeIncludeProperty.INSTANCE);
+      case Python -> config.register(
+          ClockSyncModeProperty.INSTANCE,
+          ClockSyncOptionsProperty.INSTANCE,
+          CompileDefinitionsProperty.INSTANCE);
+      case Rust -> config.register(
+          BuildTypeProperty.INSTANCE,
+          CargoDependenciesProperty.INSTANCE,
+          CargoFeaturesProperty.INSTANCE,
+          CmakeIncludeProperty.INSTANCE,
+          CompileDefinitionsProperty.INSTANCE,
+          new RustIncludeProperty());
+    }
+  }
 }
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index a59b3fb9f2..4de4ecc5cb 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -25,7 +25,7 @@ public abstract class TargetProperty<T, S extends TargetPropertyType> {
    *
    * @param type The type of the value that can be assigned to the property.
    */
-  public TargetProperty(S type) {
+  protected TargetProperty(S type) {
     this.type = type;
   }
 
diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index 472ce87d88..ed2141dbe2 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -615,12 +615,10 @@ public static ReactorInstance createMainReactorInstance(
       if (breadth == 0) {
         messageReporter.nowhere().warning("The program has no reactions");
       } else {
-        new CompileDefinitionsProperty()
-            .update(
-                targetConfig,
-                Map.of(
-                    "LF_REACTION_GRAPH_BREADTH",
-                    String.valueOf(reactionInstanceGraph.getBreadth())));
+        CompileDefinitionsProperty.INSTANCE.update(
+            targetConfig,
+            Map.of(
+                "LF_REACTION_GRAPH_BREADTH", String.valueOf(reactionInstanceGraph.getBreadth())));
       }
       return main;
     }
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index ba5f67f76c..21b44588ce 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -742,12 +742,16 @@ private String generateCodeToInitializeFederate(FederateInstance federate, RtiCo
     }
 
     // If a test clock offset has been specified, insert code to set it here.
-    if (federate.targetConfig.get(new ClockSyncOptionsProperty()).testOffset != null) {
+    if (federate.targetConfig.get(ClockSyncOptionsProperty.INSTANCE).testOffset != null) {
       code.pr(
           "lf_set_physical_clock_offset((1 + "
               + federate.id
               + ") * "
-              + federate.targetConfig.get(new ClockSyncOptionsProperty()).testOffset.toNanoSeconds()
+              + federate
+                  .targetConfig
+                  .get(ClockSyncOptionsProperty.INSTANCE)
+                  .testOffset
+                  .toNanoSeconds()
               + "LL);");
     }
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 3b670a4295..59f2d59a65 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -195,7 +195,7 @@ public static void handleCompileDefinitions(
     definitions.put("NUMBER_OF_FEDERATES", String.valueOf(numOfFederates));
     definitions.put("EXECUTABLE_PREAMBLE", "");
 
-    new CompileDefinitionsProperty().update(federate.targetConfig, definitions);
+    CompileDefinitionsProperty.INSTANCE.update(federate.targetConfig, definitions);
 
     handleAdvanceMessageInterval(federate);
 
@@ -208,15 +208,15 @@ private static void handleAdvanceMessageInterval(FederateInstance federate) {
     if (advanceMessageInterval != null) {
       federate
           .targetConfig
-          .get(new CompileDefinitionsProperty())
+          .get(CompileDefinitionsProperty.INSTANCE)
           .put("ADVANCE_MESSAGE_INTERVAL", String.valueOf(advanceMessageInterval.toNanoSeconds()));
     }
   }
 
   static boolean clockSyncIsOn(FederateInstance federate, RtiConfig rtiConfig) {
-    return federate.targetConfig.get(new ClockSyncModeProperty()) != ClockSyncMode.OFF
+    return federate.targetConfig.get(ClockSyncModeProperty.INSTANCE) != ClockSyncMode.OFF
         && (!rtiConfig.getHost().equals(federate.host)
-            || federate.targetConfig.get(new ClockSyncOptionsProperty()).localFederatesOn);
+            || federate.targetConfig.get(ClockSyncOptionsProperty.INSTANCE).localFederatesOn);
   }
 
   /**
@@ -234,13 +234,13 @@ public static void initializeClockSynchronization(
       messageReporter
           .nowhere()
           .info("Initial clock synchronization is enabled for federate " + federate.id);
-      if (federate.targetConfig.get(new ClockSyncModeProperty()) == ClockSyncMode.ON) {
-        if (federate.targetConfig.get(new ClockSyncOptionsProperty()).collectStats) {
+      if (federate.targetConfig.get(ClockSyncModeProperty.INSTANCE) == ClockSyncMode.ON) {
+        if (federate.targetConfig.get(ClockSyncOptionsProperty.INSTANCE).collectStats) {
           messageReporter
               .nowhere()
               .info("Will collect clock sync statistics for federate " + federate.id);
           // Add libm to the compiler flags
-          new CompilerFlagsProperty().update(federate.targetConfig, List.of("-lm"));
+          CompilerFlagsProperty.INSTANCE.update(federate.targetConfig, List.of("-lm"));
         }
         messageReporter
             .nowhere()
@@ -261,8 +261,8 @@ public static void initializeClockSynchronization(
    */
   public static void addClockSyncCompileDefinitions(FederateInstance federate) {
 
-    ClockSyncMode mode = federate.targetConfig.get(new ClockSyncModeProperty());
-    ClockSyncOptions options = federate.targetConfig.get(new ClockSyncOptionsProperty());
+    ClockSyncMode mode = federate.targetConfig.get(ClockSyncModeProperty.INSTANCE);
+    ClockSyncOptions options = federate.targetConfig.get(ClockSyncOptionsProperty.INSTANCE);
     final var defs = new HashMap<String, String>();
 
     defs.put("_LF_CLOCK_SYNC_INITIAL", "");
@@ -276,7 +276,7 @@ public static void addClockSyncCompileDefinitions(FederateInstance federate) {
         defs.put("_LF_CLOCK_SYNC_COLLECT_STATS", "");
       }
     }
-    new CompileDefinitionsProperty().update(federate.targetConfig, defs);
+    CompileDefinitionsProperty.INSTANCE.update(federate.targetConfig, defs);
   }
 
   /** Generate a file to be included by CMake. */
@@ -301,10 +301,9 @@ public static void generateCMakeInclude(FederateInstance federate, FedFileConfig
       srcWriter.write(cmakeIncludeCode.getCode());
     }
 
-    new CmakeIncludeProperty()
-        .update(
-            federate.targetConfig,
-            List.of(fileConfig.getSrcPath().relativize(cmakeIncludePath).toString()));
+    CmakeIncludeProperty.INSTANCE.update(
+        federate.targetConfig,
+        List.of(fileConfig.getSrcPath().relativize(cmakeIncludePath).toString()));
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java b/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
index 9e5e103c8f..a8e5c3a4ff 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
@@ -103,7 +103,7 @@ public void doClean() throws IOException {
    * the generated .lf file for the federate.
    */
   public void relativizePaths(FedTargetConfig targetConfig) {
-    List.of(new ProtobufsProperty(), new FilesProperty(), new CmakeIncludeProperty())
+    List.of(new ProtobufsProperty(), new FilesProperty(), CmakeIncludeProperty.INSTANCE)
         .forEach(
             p -> {
               p.override(targetConfig, relativizePathList(targetConfig.get(p)));
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index aa645a932f..cb89639f57 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -299,8 +299,8 @@ private Map<Path, CodeMap> compileFederates(
 
             TargetConfig subConfig =
                 new TargetConfig(
-                    new Properties(),
                     GeneratorUtils.findTargetDecl(subFileConfig.resource),
+                    new Properties(),
                     subContextMessageReporter);
             if (targetConfig.get(new DockerProperty()).enabled
                 && targetConfig.target.buildsUsingDocker()) {
@@ -473,7 +473,9 @@ private List<FederateInstance> getFederateInstances(
       // Assign an integer ID to the federate.
       int federateID = federates.size();
       var resource = instantiation.getReactorClass().eResource();
-      var federateTargetConfig = new FedTargetConfig(context, resource);
+      var federateTargetConfig =
+          new FedTargetConfig(
+              context, resource); // FIXME: Based on the target, need to load properties.
       FederateInstance federateInstance =
           new FederateInstance(
               instantiation, federateID, i, bankWidth, federateTargetConfig, messageReporter);
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
index fc4df6e121..1a9d8188d9 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
@@ -7,6 +7,7 @@
 import java.util.Objects;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.lflang.MessageReporter;
+import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGeneratorContext;
@@ -15,6 +16,7 @@
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.ClockSyncModeProperty;
 import org.lflang.target.property.ClockSyncOptionsProperty;
+import org.lflang.target.property.FedSetupProperty;
 import org.lflang.util.FileUtil;
 
 /**
@@ -33,12 +35,16 @@ public class FedTargetConfig extends TargetConfig {
    * @param federateResource The resource in which to find the reactor class of the federate.
    */
   public FedTargetConfig(LFGeneratorContext context, Resource federateResource) {
-    // Create target config based on the main .lf file
+    // Create target config based on the main .lf file (but with the target of the federate,
+    // which could be different).
     super(
+        Target.fromDecl(GeneratorUtils.findTargetDecl(federateResource)),
+        GeneratorUtils.findTargetDecl(context.getFileConfig().resource).getConfig(),
         context.getArgs(),
-        GeneratorUtils.findTargetDecl(context.getFileConfig().resource),
         context.getErrorReporter());
 
+    this.register(new FedSetupProperty());
+
     mergeImportedConfig(
         federateResource, context.getFileConfig().resource, context.getErrorReporter());
 
@@ -81,8 +87,8 @@ private Path getRelativePath(Resource source, Resource target) {
 
   /** Method for the removal of things that should not appear in the target config of a federate. */
   private void clearPropertiesToIgnore() {
-    this.reset(new ClockSyncModeProperty());
-    this.reset(new ClockSyncOptionsProperty());
+    this.reset(ClockSyncModeProperty.INSTANCE);
+    this.reset(ClockSyncOptionsProperty.INSTANCE);
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index 5b17cb5f52..f289918b7d 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -348,19 +348,19 @@ private String getRtiCommand(List<FederateInstance> federates, boolean isRemote)
         List.of(
             "                        -n " + federates.size() + " \\",
             "                        -c "
-                + targetConfig.get(new ClockSyncModeProperty()).toString()
+                + targetConfig.get(ClockSyncModeProperty.INSTANCE).toString()
                 + " \\"));
-    if (targetConfig.get(new ClockSyncModeProperty()).equals(ClockSyncMode.ON)) {
+    if (targetConfig.get(ClockSyncModeProperty.INSTANCE).equals(ClockSyncMode.ON)) {
       commands.add(
           "period "
-              + targetConfig.get(new ClockSyncOptionsProperty()).period.toNanoSeconds()
+              + targetConfig.get(ClockSyncOptionsProperty.INSTANCE).period.toNanoSeconds()
               + " \\");
     }
-    if (targetConfig.get(new ClockSyncModeProperty()).equals(ClockSyncMode.ON)
-        || targetConfig.get(new ClockSyncModeProperty()).equals(ClockSyncMode.INIT)) {
+    if (targetConfig.get(ClockSyncModeProperty.INSTANCE).equals(ClockSyncMode.ON)
+        || targetConfig.get(ClockSyncModeProperty.INSTANCE).equals(ClockSyncMode.INIT)) {
       commands.add(
           "exchanges-per-interval "
-              + targetConfig.get(new ClockSyncOptionsProperty()).trials
+              + targetConfig.get(ClockSyncOptionsProperty.INSTANCE).trials
               + " \\");
     }
     commands.add("&");
diff --git a/core/src/main/java/org/lflang/generator/MainContext.java b/core/src/main/java/org/lflang/generator/MainContext.java
index ebd4d2552e..cf4add1d37 100644
--- a/core/src/main/java/org/lflang/generator/MainContext.java
+++ b/core/src/main/java/org/lflang/generator/MainContext.java
@@ -165,6 +165,6 @@ public void reportProgress(String message, int percentage) {
    */
   public void loadTargetConfig() {
     this.targetConfig =
-        new TargetConfig(args, GeneratorUtils.findTargetDecl(fileConfig.resource), messageReporter);
+        new TargetConfig(GeneratorUtils.findTargetDecl(fileConfig.resource), args, messageReporter);
   }
 }
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index de79c06b37..3c35d078bc 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -229,7 +229,7 @@ CodeBuilder generateCMakeCode(
     cMakeCode.pr("set(CMAKE_CXX_STANDARD 17)");
     cMakeCode.pr("set(CMAKE_CXX_STANDARD_REQUIRED ON)");
     cMakeCode.newLine();
-    if (!targetConfig.get(new CmakeIncludeProperty()).isEmpty()) {
+    if (!targetConfig.get(CmakeIncludeProperty.INSTANCE).isEmpty()) {
       // The user might be using the non-keyword form of
       // target_link_libraries. Ideally we would detect whether they are
       // doing that, but it is easier to just always have a deprecation
@@ -242,7 +242,7 @@ CodeBuilder generateCMakeCode(
     }
 
     // Set the build type
-    cMakeCode.pr("set(DEFAULT_BUILD_TYPE " + targetConfig.get(new BuildTypeProperty()) + ")\n");
+    cMakeCode.pr("set(DEFAULT_BUILD_TYPE " + targetConfig.get(BuildTypeProperty.INSTANCE) + ")\n");
     cMakeCode.pr("if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)\n");
     cMakeCode.pr(
         "    set(CMAKE_BUILD_TYPE ${DEFAULT_BUILD_TYPE} CACHE STRING \"Choose the type of build.\""
@@ -266,7 +266,7 @@ CodeBuilder generateCMakeCode(
     cMakeCode.newLine();
     cMakeCode.pr("# Set default values for build parameters\n");
     targetConfig
-        .get(new CompileDefinitionsProperty())
+        .get(CompileDefinitionsProperty.INSTANCE)
         .forEach(
             (key, value) -> {
               if (key.equals("LF_THREADED") || key.equals("LF_UNTHREADED")) {
@@ -412,7 +412,7 @@ CodeBuilder generateCMakeCode(
 
     // Set the compiler flags
     // We can detect a few common libraries and use the proper target_link_libraries to find them
-    for (String compilerFlag : targetConfig.get(new CompilerFlagsProperty())) {
+    for (String compilerFlag : targetConfig.get(CompilerFlagsProperty.INSTANCE)) {
       messageReporter
           .nowhere()
           .warning(
@@ -428,7 +428,7 @@ CodeBuilder generateCMakeCode(
     cMakeCode.newLine();
 
     // Add the include file
-    for (String includeFile : targetConfig.get(new CmakeIncludeProperty())) {
+    for (String includeFile : targetConfig.get(CmakeIncludeProperty.INSTANCE)) {
       cMakeCode.pr("include(\"" + Path.of(includeFile).getFileName() + "\")");
     }
     cMakeCode.newLine();
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index 7317f06fdb..d0f175dafc 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -240,8 +240,8 @@ private static List<String> cmakeOptions(TargetConfig targetConfig, FileConfig f
     arguments.addAll(
         List.of(
             "-DCMAKE_BUILD_TYPE="
-                + (targetConfig.isSet(new BuildTypeProperty())
-                    ? targetConfig.get(new BuildTypeProperty()).toString()
+                + (targetConfig.isSet(BuildTypeProperty.INSTANCE)
+                    ? targetConfig.get(BuildTypeProperty.INSTANCE).toString()
                     : "Release"),
             "-DCMAKE_INSTALL_PREFIX=" + FileUtil.toUnixString(fileConfig.getOutPath()),
             "-DCMAKE_INSTALL_BINDIR="
@@ -298,7 +298,7 @@ public LFCommand buildCmakeCommand() {
                 "--parallel",
                 cores,
                 "--config",
-                buildTypeToCmakeConfig(targetConfig.get(new BuildTypeProperty()))),
+                buildTypeToCmakeConfig(targetConfig.get(BuildTypeProperty.INSTANCE))),
             buildPath);
     if (command == null) {
       messageReporter
@@ -407,7 +407,7 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
     }
 
     // Finally, add the compiler flags in target parameters (if any)
-    compileArgs.addAll(targetConfig.get(new CompilerFlagsProperty()));
+    compileArgs.addAll(targetConfig.get(CompilerFlagsProperty.INSTANCE));
 
     // Only set the output file name if it hasn't already been set
     // using a target property or Args line flag.
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 8bfd3fa840..077fecdb9e 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -87,7 +87,6 @@
 import org.lflang.lf.StateVar;
 import org.lflang.lf.Variable;
 import org.lflang.target.TargetConfig;
-import org.lflang.target.property.AuthProperty;
 import org.lflang.target.property.BuildCommandsProperty;
 import org.lflang.target.property.CmakeIncludeProperty;
 import org.lflang.target.property.CompileDefinitionsProperty;
@@ -405,7 +404,7 @@ protected boolean isOSCompatible() {
   @Override
   public void doGenerate(Resource resource, LFGeneratorContext context) {
     super.doGenerate(resource, context);
-    registerTargetProperties();
+
     if (!GeneratorUtils.canGenerate(errorsOccurred(), mainDef, messageReporter, context)) return;
     if (!isOSCompatible()) return; // Incompatible OS and configuration
 
@@ -580,10 +579,6 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     GeneratorUtils.refreshProject(resource, context.getMode());
   }
 
-  private void registerTargetProperties() {
-    context.getTargetConfig().register(AuthProperty.INSTANCE, BuildCommandsProperty.INSTANCE);
-  }
-
   private void generateCodeFor(String lfModuleName) throws IOException {
     code.pr(generateDirectives());
     code.pr(new CMainFunctionGenerator(targetConfig).generateCode());
@@ -724,9 +719,8 @@ private void inspectReactorEResource(ReactorDecl reactor) {
         // Copy the user files and cmake-includes to the src-gen path of the main .lf file
         copyUserFiles(lfResource.getTargetConfig(), lfResource.getFileConfig());
         // Merge the CMake includes from the imported file into the target config
-        new CmakeIncludeProperty()
-            .update(
-                this.targetConfig, lfResource.getTargetConfig().get(new CmakeIncludeProperty()));
+        CmakeIncludeProperty.INSTANCE.update(
+            this.targetConfig, lfResource.getTargetConfig().get(CmakeIncludeProperty.INSTANCE));
       }
     }
   }
@@ -745,7 +739,7 @@ protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
     var destination = this.fileConfig.getSrcGenPath();
 
     FileUtil.copyFilesOrDirectories(
-        targetConfig.get(new CmakeIncludeProperty()),
+        targetConfig.get(CmakeIncludeProperty.INSTANCE),
         destination,
         fileConfig,
         messageReporter,
@@ -1936,10 +1930,9 @@ protected DockerGenerator getDockerGenerator(LFGeneratorContext context) {
   // Perform set up that does not generate code
   protected void setUpGeneralParameters() {
     accommodatePhysicalActionsIfPresent();
-    new CompileDefinitionsProperty()
-        .update(
-            targetConfig,
-            Map.of("LOG_LEVEL", String.valueOf(targetConfig.get(new LoggingProperty()).ordinal())));
+    CompileDefinitionsProperty.INSTANCE.update(
+        targetConfig,
+        Map.of("LOG_LEVEL", String.valueOf(targetConfig.get(new LoggingProperty()).ordinal())));
 
     targetConfig.compileAdditionalSources.addAll(CCoreFilesUtils.getCTargetSrc());
     // Create the main reactor instance if there is a main reactor.
@@ -1947,7 +1940,7 @@ protected void setUpGeneralParameters() {
         ASTUtils.createMainReactorInstance(mainDef, reactors, messageReporter, targetConfig);
     if (hasModalReactors) {
       // So that each separate compile knows about modal reactors, do this:
-      new CompileDefinitionsProperty().update(targetConfig, Map.of("MODAL_REACTORS", "TRUE"));
+      CompileDefinitionsProperty.INSTANCE.update(targetConfig, Map.of("MODAL_REACTORS", "TRUE"));
     }
     final var platformOptions = targetConfig.get(new PlatformProperty());
     if (targetConfig.get(new ThreadingProperty())
@@ -1979,7 +1972,7 @@ protected void setUpGeneralParameters() {
         && targetConfig.get(new ThreadingProperty())
         && platformOptions.userThreads >= 0) {
       targetConfig
-          .get(new CompileDefinitionsProperty())
+          .get(CompileDefinitionsProperty.INSTANCE)
           .put(PlatformOption.USER_THREADS.name(), String.valueOf(platformOptions.userThreads));
     } else if (platformOptions.userThreads > 0) {
       messageReporter
@@ -1995,7 +1988,7 @@ protected void setUpGeneralParameters() {
       var map = new HashMap<String, String>();
       map.put("SCHEDULER", targetConfig.get(new SchedulerProperty()).getSchedulerCompileDef());
       map.put("NUMBER_OF_WORKERS", String.valueOf(targetConfig.get(new WorkersProperty())));
-      new CompileDefinitionsProperty().update(targetConfig, map);
+      CompileDefinitionsProperty.INSTANCE.update(targetConfig, map);
     }
     pickCompilePlatform();
   }
diff --git a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
index d4b084d6bb..187c90e651 100644
--- a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
@@ -94,7 +94,7 @@ public static String generateDefineDirectives(TargetConfig targetConfig, Path sr
     } else {
       definitions.put("LF_UNTHREADED", "1");
     }
-    new CompileDefinitionsProperty().update(targetConfig, definitions);
+    CompileDefinitionsProperty.INSTANCE.update(targetConfig, definitions);
     code.newLine();
     return code.toString();
   }
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index c9b82b9e5b..4321b4c4e2 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -110,7 +110,7 @@ private PythonGenerator(
       LFGeneratorContext context, PythonTypes types, CCmakeGenerator cmakeGenerator) {
     super(context, false, types, cmakeGenerator, new PythonDelayBodyGenerator(types));
     new CompilerProperty().override(this.targetConfig, "gcc"); // FIXME: why?
-    this.targetConfig.reset(new CompilerFlagsProperty());
+    this.targetConfig.reset(CompilerFlagsProperty.INSTANCE);
     this.types = types;
   }
 
diff --git a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java b/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
deleted file mode 100644
index 7a13216046..0000000000
--- a/core/src/main/java/org/lflang/generator/rust/RustTargetConfig.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2021, TU Dresden.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.lflang.generator.rust;
-
-import org.lflang.target.TargetConfig;
-import org.lflang.target.property.CargoDependenciesProperty;
-import org.lflang.target.property.CargoFeaturesProperty;
-import org.lflang.target.property.RustIncludeProperty;
-
-/**
- * Rust-specific part of a {@link TargetConfig}.
- *
- * @author Clément Fournier - TU Dresden, INSA Rennes
- */
-public final class RustTargetConfig {
-
-  public RustTargetConfig(TargetConfig parent) {
-    parent.register(
-        new CargoFeaturesProperty(), new CargoDependenciesProperty(), new RustIncludeProperty());
-  }
-}
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 1581e8191b..5ad61e20e2 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -45,14 +45,6 @@
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
 import org.lflang.lf.TargetDecl;
-import org.lflang.target.property.BuildTypeProperty;
-import org.lflang.target.property.CargoDependenciesProperty;
-import org.lflang.target.property.CargoFeaturesProperty;
-import org.lflang.target.property.ClockSyncModeProperty;
-import org.lflang.target.property.ClockSyncOptionsProperty;
-import org.lflang.target.property.CmakeIncludeProperty;
-import org.lflang.target.property.CompileDefinitionsProperty;
-import org.lflang.target.property.CompilerFlagsProperty;
 import org.lflang.target.property.CompilerProperty;
 import org.lflang.target.property.CoordinationOptionsProperty;
 import org.lflang.target.property.CoordinationProperty;
@@ -61,7 +53,6 @@
 import org.lflang.target.property.ExportToYamlProperty;
 import org.lflang.target.property.ExternalRuntimePathProperty;
 import org.lflang.target.property.FastProperty;
-import org.lflang.target.property.FedSetupProperty;
 import org.lflang.target.property.FilesProperty;
 import org.lflang.target.property.HierarchicalBinProperty;
 import org.lflang.target.property.KeepaliveProperty;
@@ -74,7 +65,6 @@
 import org.lflang.target.property.Ros2DependenciesProperty;
 import org.lflang.target.property.Ros2Property;
 import org.lflang.target.property.RuntimeVersionProperty;
-import org.lflang.target.property.RustIncludeProperty;
 import org.lflang.target.property.SchedulerProperty;
 import org.lflang.target.property.SingleFileProjectProperty;
 import org.lflang.target.property.ThreadingProperty;
@@ -105,13 +95,11 @@ public class TargetConfig {
   public TargetConfig(Target target) {
     this.target = target;
 
+    // Register target-specific properties
+    target.initialize(this);
+
+    // Register general-purpose properties
     this.register(
-        new BuildTypeProperty(),
-        new ClockSyncModeProperty(),
-        new ClockSyncOptionsProperty(),
-        new CmakeIncludeProperty(),
-        new CompileDefinitionsProperty(),
-        new CompilerFlagsProperty(),
         new CompilerProperty(),
         new CoordinationOptionsProperty(),
         new CoordinationProperty(),
@@ -139,25 +127,29 @@ public TargetConfig(Target target) {
         new TracingProperty(),
         new VerifyProperty(),
         new WorkersProperty());
+  }
 
-    this.register(new FedSetupProperty());
-
-    this.register(
-        new CargoFeaturesProperty(), new CargoDependenciesProperty(), new RustIncludeProperty());
+  public TargetConfig(TargetDecl target, Properties cliArgs, MessageReporter messageReporter) {
+    this(Target.fromDecl(target), target.getConfig(), cliArgs, messageReporter);
   }
 
   /**
    * Create a new target configuration based on the given commandline arguments and target
    * declaration AST node.
    *
+   * @param target The target of this configuration.
+   * @param properties The key-value pairs that represent the target properties.
    * @param cliArgs Arguments passed on the commandline.
-   * @param target AST node of a target declaration.
    * @param messageReporter An error reporter to report problems.
    */
-  public TargetConfig(Properties cliArgs, TargetDecl target, MessageReporter messageReporter) {
-    this(Target.fromDecl(target));
-    if (target.getConfig() != null) {
-      List<KeyValuePair> pairs = target.getConfig().getPairs();
+  public TargetConfig(
+      Target target,
+      KeyValuePairs properties,
+      Properties cliArgs,
+      MessageReporter messageReporter) {
+    this(target);
+    if (properties != null) {
+      List<KeyValuePair> pairs = properties.getPairs();
       this.load(pairs, messageReporter);
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
index 66ac8273b1..5ed41eb99d 100644
--- a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
@@ -16,7 +16,10 @@
  */
 public class BuildTypeProperty extends TargetProperty<BuildType, BuildTypeType> {
 
-  public BuildTypeProperty() {
+  /** Singleton target property instance. */
+  public static final BuildTypeProperty INSTANCE = new BuildTypeProperty();
+
+  private BuildTypeProperty() {
     super(new BuildTypeType());
   }
 
diff --git a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
index 17bbadd732..a719d7dbd0 100644
--- a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
@@ -42,9 +42,12 @@
 public class CargoDependenciesProperty
     extends TargetProperty<Map<String, CargoDependencySpec>, CargoDependenciesPropertyType> {
 
-  public CargoDependenciesProperty() {
+  /** Singleton target property instance. */
+  public static final CargoDependenciesProperty INSTANCE = new CargoDependenciesProperty();
+
+  private CargoDependenciesProperty() {
     super(new CargoDependenciesPropertyType());
-  } // FIXME
+  }
 
   @Override
   public Map<String, CargoDependencySpec> initialValue() {
diff --git a/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java b/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
index d9c050dec9..0d17ef360d 100644
--- a/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
@@ -7,6 +7,13 @@
 /** Directive for specifying Cargo features of the generated program to enable. */
 public class CargoFeaturesProperty extends StringListProperty {
 
+  /** Singleton target property instance. */
+  public static final CargoFeaturesProperty INSTANCE = new CargoFeaturesProperty();
+
+  private CargoFeaturesProperty() {
+    super();
+  }
+
   @Override
   public List<Target> supportedTargets() {
     return Arrays.asList(Target.Rust);
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
index 584ddc4856..89562e10cb 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
@@ -17,7 +17,10 @@
 /** The mode of clock synchronization to be used in federated programs. The default is 'initial'. */
 public class ClockSyncModeProperty extends TargetProperty<ClockSyncMode, ClockSyncModeType> {
 
-  public ClockSyncModeProperty() {
+  /** Singleton target property instance. */
+  public static final ClockSyncModeProperty INSTANCE = new ClockSyncModeProperty();
+
+  private ClockSyncModeProperty() {
     super(new ClockSyncModeType());
   }
 
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
index 92ef3fdafd..4d65c58ccb 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
@@ -21,7 +21,10 @@
 /** Key-value pairs giving options for clock synchronization. */
 public class ClockSyncOptionsProperty extends TargetProperty<ClockSyncOptions, DictionaryType> {
 
-  public ClockSyncOptionsProperty() {
+  /** Singleton target property instance. */
+  public static final ClockSyncOptionsProperty INSTANCE = new ClockSyncOptionsProperty();
+
+  private ClockSyncOptionsProperty() {
     super(DictionaryType.CLOCK_SYNC_OPTION_DICT);
   }
 
diff --git a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
index b5ca6a6970..b7006b7f37 100644
--- a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
@@ -15,6 +15,13 @@
  */
 public class CmakeIncludeProperty extends FileListProperty {
 
+  /** Singleton target property instance. */
+  public static final CmakeIncludeProperty INSTANCE = new CmakeIncludeProperty();
+
+  private CmakeIncludeProperty() {
+    super();
+  }
+
   @Override
   protected List<String> fromAst(Element node, MessageReporter reporter) {
     return ASTUtils.elementToListOfStrings(node);
diff --git a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
index 51e9ed34ae..831f25682c 100644
--- a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
@@ -21,7 +21,10 @@
 public class CompileDefinitionsProperty
     extends TargetProperty<Map<String, String>, StringDictionaryType> {
 
-  public CompileDefinitionsProperty() {
+  /** Singleton target property instance. */
+  public static final CompileDefinitionsProperty INSTANCE = new CompileDefinitionsProperty();
+
+  private CompileDefinitionsProperty() {
     super(StringDictionaryType.COMPILE_DEFINITION);
   }
 
diff --git a/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
index 8902f605f2..e5d061a436 100644
--- a/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
@@ -7,6 +7,13 @@
 /** Flags to pass to the compiler, unless a build command has been specified. */
 public class CompilerFlagsProperty extends StringListProperty {
 
+  /** Singleton target property instance. */
+  public static final CompilerFlagsProperty INSTANCE = new CompilerFlagsProperty();
+
+  private CompilerFlagsProperty() {
+    super();
+  }
+
   @Override
   public List<Target> supportedTargets() {
     return Arrays.asList(Target.C, Target.CCPP);
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
index e2796c337b..ce338a8f40 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
@@ -33,10 +33,7 @@ import org.lflang.generator.GeneratorUtils.canGenerate
 import org.lflang.generator.LFGeneratorContext.Mode
 import org.lflang.isGeneric
 import org.lflang.scoping.LFGlobalScopeProvider
-import org.lflang.target.property.ExternalRuntimePathProperty
-import org.lflang.target.property.NoCompileProperty
-import org.lflang.target.property.Ros2Property
-import org.lflang.target.property.RuntimeVersionProperty
+import org.lflang.target.property.*
 import org.lflang.util.FileUtil
 import java.nio.file.Files
 import java.nio.file.Path
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
index 1c11055573..92278526a6 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
@@ -30,7 +30,7 @@ abstract class CppPlatformGenerator(protected val generator: CppGenerator) {
 
     protected val cmakeArgs: List<String>
         get() = listOf(
-            "-DCMAKE_BUILD_TYPE=${targetConfig.get(BuildTypeProperty())}",
+            "-DCMAKE_BUILD_TYPE=${targetConfig.get(BuildTypeProperty.INSTANCE)}",
             "-DREACTOR_CPP_VALIDATE=${if (targetConfig.get(NoRuntimeValidationProperty())) "OFF" else "ON"}",
             "-DREACTOR_CPP_PRINT_STATISTICS=${if (targetConfig.get(PrintStatisticsProperty())) "ON" else "OFF"}",
             "-DREACTOR_CPP_TRACE=${if (targetConfig.get(TracingProperty()).isEnabled) "ON" else "OFF"}",
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
index 83f1d0d57a..5f3aac1a84 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
@@ -52,7 +52,7 @@ class CppRos2PackageGenerator(generator: CppGenerator, private val nodeName: Str
 
     fun generatePackageCmake(sources: List<Path>): String {
         // Resolve path to the cmake include files if any was provided
-        val includeFiles = targetConfig.get(CmakeIncludeProperty())?.map { fileConfig.srcPath.resolve(it).toUnixString() }
+        val includeFiles = targetConfig.get(CmakeIncludeProperty.INSTANCE)?.map { fileConfig.srcPath.resolve(it).toUnixString() }
 
         return with(PrependOperator) {
             with(CppGenerator) {
@@ -65,7 +65,7 @@ class CppRos2PackageGenerator(generator: CppGenerator, private val nodeName: Str
                 |set(CMAKE_CXX_STANDARD_REQUIRED ON)
                 |set(CMAKE_CXX_EXTENSIONS OFF)
                 |
-                |set(DEFAULT_BUILD_TYPE "${targetConfig.get(BuildTypeProperty())}")
+                |set(DEFAULT_BUILD_TYPE "${targetConfig.get(BuildTypeProperty.INSTANCE)}")
                 |if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
                 |set    (CMAKE_BUILD_TYPE "$S{DEFAULT_BUILD_TYPE}" CACHE STRING "Choose the type of build." FORCE)
                 |endif()
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
index 22ea6e19c0..3048ccd5a0 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
@@ -83,7 +83,7 @@ class CppStandaloneCmakeGenerator(private val targetConfig: TargetConfig, privat
             |include($S{CMAKE_ROOT}/Modules/ExternalProject.cmake)
             |include(GNUInstallDirs)
             |
-            |set(DEFAULT_BUILD_TYPE "${targetConfig.get(BuildTypeProperty())}")
+            |set(DEFAULT_BUILD_TYPE "${targetConfig.get(BuildTypeProperty.INSTANCE)}")
             |if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
             |set    (CMAKE_BUILD_TYPE "$S{DEFAULT_BUILD_TYPE}" CACHE STRING "Choose the type of build." FORCE)
             |endif()
@@ -137,7 +137,7 @@ class CppStandaloneCmakeGenerator(private val targetConfig: TargetConfig, privat
 
     fun generateCmake(sources: List<Path>): String {
         // Resolve path to the cmake include files if any was provided
-        val includeFiles = targetConfig.get(CmakeIncludeProperty())?.map { fileConfig.srcPath.resolve(it).toUnixString() }
+        val includeFiles = targetConfig.get(CmakeIncludeProperty.INSTANCE)?.map { fileConfig.srcPath.resolve(it).toUnixString() }
 
         val reactorCppTarget = when {
             targetConfig.isSet(ExternalRuntimePathProperty()) -> "reactor-cpp"
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
index 5f7adb4ae5..a4f689dc97 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
@@ -142,7 +142,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
         if (version.compareVersion("3.12.0") < 0) {
             messageReporter.nowhere().warning("CMAKE is older than version 3.12. Parallel building is not supported.")
             makeArgs =
-                listOf("--build", ".", "--target", target, "--config", buildTypeToCmakeConfig(targetConfig.get(BuildTypeProperty())))
+                listOf("--build", ".", "--target", target, "--config", buildTypeToCmakeConfig(targetConfig.get(BuildTypeProperty.INSTANCE)))
         } else {
             val cores = Runtime.getRuntime().availableProcessors()
             makeArgs = listOf(
@@ -153,7 +153,7 @@ class CppStandaloneGenerator(generator: CppGenerator) :
                 "--parallel",
                 cores.toString(),
                 "--config",
-                buildTypeToCmakeConfig(targetConfig.get(BuildTypeProperty()))
+                buildTypeToCmakeConfig(targetConfig.get(BuildTypeProperty.INSTANCE))
             )
         }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
index b9fc1a58db..c664c5308f 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
@@ -26,20 +26,11 @@ package org.lflang.generator.rust
 
 import org.eclipse.emf.ecore.resource.Resource
 import org.lflang.Target
+import org.lflang.generator.*
 import org.lflang.generator.GeneratorUtils.canGenerate
-import org.lflang.generator.CodeMap
-import org.lflang.generator.GeneratorBase
-import org.lflang.generator.GeneratorResult
-import org.lflang.generator.IntegratedBuilder
-import org.lflang.generator.LFGeneratorContext
-import org.lflang.generator.TargetTypes
-
 import org.lflang.joinWithCommas
 import org.lflang.scoping.LFGlobalScopeProvider
-import org.lflang.target.property.BuildTypeProperty
-import org.lflang.target.property.CargoFeaturesProperty
-import org.lflang.target.property.CompilerFlagsProperty
-import org.lflang.target.property.NoCompileProperty
+import org.lflang.target.property.*
 import org.lflang.target.property.type.BuildTypeType
 import org.lflang.util.FileUtil
 import java.nio.file.Files
@@ -100,7 +91,7 @@ class RustGenerator(
         val args = mutableListOf<String>().apply {
             this += "build"
 
-            val buildType = targetConfig.get(BuildTypeProperty())
+            val buildType = targetConfig.get(BuildTypeProperty.INSTANCE)
             if (buildType == BuildTypeType.BuildType.RELEASE) {
                 this += "--release"
             } else if (buildType != BuildTypeType.BuildType.DEBUG) {
@@ -108,12 +99,12 @@ class RustGenerator(
                 this += buildType.cargoProfileName
             }
 
-            if (targetConfig.get(CargoFeaturesProperty()).isNotEmpty()) {
+            if (targetConfig.get(CargoFeaturesProperty.INSTANCE).isNotEmpty()) {
                 this += "--features"
-                this += targetConfig.get(CargoFeaturesProperty()).joinWithCommas()
+                this += targetConfig.get(CargoFeaturesProperty.INSTANCE).joinWithCommas()
             }
 
-            this += targetConfig.get(CompilerFlagsProperty())
+            this += targetConfig.get(CompilerFlagsProperty.INSTANCE)
 
             this += listOf("--message-format", "json-diagnostic-rendered-ansi")
         }
@@ -129,7 +120,7 @@ class RustGenerator(
 
         if (cargoReturnCode == 0) {
             // We still have to copy the compiled binary to the destination folder.
-            val buildType = targetConfig.get(BuildTypeProperty())
+            val buildType = targetConfig.get(BuildTypeProperty.INSTANCE)
             val binaryPath = validator.metadata?.targetDirectory!!
                 .resolve(buildType.cargoProfileName)
                 .resolve(fileConfig.executable.fileName)
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
index 82e0fc842c..d65b816d2f 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
@@ -440,7 +440,7 @@ object RustModelBuilder {
         val mainReactor = reactorsInfos.lastOrNull { it.isMain } ?: reactorsInfos.last()
 
 
-        val dependencies = targetConfig.get(CargoDependenciesProperty()).toMutableMap()
+        val dependencies = targetConfig.get(CargoDependenciesProperty.INSTANCE).toMutableMap()
         dependencies.compute(RustEmitterBase.runtimeCrateFullName) { _, spec ->
             computeDefaultRuntimeConfiguration(spec, targetConfig, messageReporter)
         }
@@ -452,7 +452,7 @@ object RustModelBuilder {
                 authors = listOf(System.getProperty("user.name")),
                 dependencies = dependencies,
                 modulesToIncludeInMain = targetConfig.get(RustIncludeProperty()),
-                enabledCargoFeatures = targetConfig.get(CargoFeaturesProperty()).toSet()
+                enabledCargoFeatures = targetConfig.get(CargoFeaturesProperty.INSTANCE).toSet()
             ),
             reactors = reactorsInfos,
             mainReactor = mainReactor,
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 3b434ebb4e..88b2633943 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -1581,7 +1581,7 @@ public Collection<DynamicTest> checkTargetProperties() throws Exception {
 
   @Test
   public void checkCargoDependencyProperty() throws Exception {
-    CargoDependenciesProperty prop = new CargoDependenciesProperty();
+    CargoDependenciesProperty prop = CargoDependenciesProperty.INSTANCE;
     List<String> knownCorrect =
         List.of(
             "{}",
@@ -1840,7 +1840,7 @@ public void testInvalidTargetParam() throws Exception {
   public void testTargetParamNotSupportedForTarget() throws Exception {
     String testCase =
         """
-                target Python { build: "" }
+                target Python { cargo-features: "" }
                 main reactor {}
             """;
     List<Issue> issues = validator.validate(parseWithoutError(testCase));
@@ -1850,7 +1850,7 @@ public void testTargetParamNotSupportedForTarget() throws Exception {
                 .get(0)
                 .getMessage()
                 .contains(
-                    "The target property: build"
+                    "The target property: cargo-features"
                         + " is not supported by the Python target and will thus be ignored."));
   }
 

From 46eb4f9a3d9b147362a37d3fd3501ecfd709fb24 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 16 Oct 2023 18:05:26 -0700
Subject: [PATCH 1030/1114] Moved more property initializations

---
 core/src/main/java/org/lflang/Target.java     | 46 +++++++++++++++++--
 .../federated/extensions/CExtension.java      |  9 ++--
 .../federated/extensions/CExtensionUtils.java |  4 +-
 .../federated/extensions/TSExtension.java     |  4 +-
 .../federated/generator/FedFileConfig.java    |  2 +-
 .../federated/generator/FedGenerator.java     | 23 +++++-----
 .../FedROS2CPPSerialization.java              |  5 +-
 .../org/lflang/generator/GeneratorBase.java   |  2 +-
 .../org/lflang/generator/GeneratorUtils.java  |  8 ++--
 .../org/lflang/generator/MainContext.java     |  2 +-
 .../lflang/generator/c/CCmakeGenerator.java   |  6 +--
 .../org/lflang/generator/c/CCompiler.java     | 14 +++---
 .../lflang/generator/c/CDockerGenerator.java  |  2 +-
 .../org/lflang/generator/c/CGenerator.java    | 16 +++----
 .../generator/c/CMainFunctionGenerator.java   |  4 +-
 .../generator/c/CPreambleGenerator.java       |  2 +-
 .../generator/c/CTriggerObjectsGenerator.java |  2 +-
 .../generator/python/PythonGenerator.java     |  2 +-
 .../java/org/lflang/target/TargetConfig.java  | 26 ++---------
 .../target/property/BuildTypeProperty.java    |  4 +-
 .../property/CargoDependenciesProperty.java   |  2 +-
 .../property/CargoFeaturesProperty.java       |  2 +-
 .../property/ClockSyncModeProperty.java       |  2 +-
 .../property/ClockSyncOptionsProperty.java    |  3 +-
 .../target/property/CmakeIncludeProperty.java |  2 +-
 .../property/CompileDefinitionsProperty.java  |  2 +-
 .../property/CompilerFlagsProperty.java       |  2 +-
 .../target/property/CompilerProperty.java     |  9 +++-
 .../property/CoordinationOptionsProperty.java |  7 ++-
 .../target/property/CoordinationProperty.java |  8 +++-
 .../target/property/DockerProperty.java       |  7 ++-
 .../ExportDependencyGraphProperty.java        |  9 +++-
 .../target/property/ExportToYamlProperty.java |  9 +++-
 .../property/ExternalRuntimePathProperty.java |  9 +++-
 .../lflang/target/property/FastProperty.java  |  9 +++-
 .../lflang/target/property/FilesProperty.java |  9 +++-
 .../property/HierarchicalBinProperty.java     |  9 +++-
 .../target/property/KeepaliveProperty.java    |  9 +++-
 .../target/property/LoggingProperty.java      |  7 ++-
 .../target/property/NoCompileProperty.java    |  9 +++-
 .../target/property/RustIncludeProperty.java  |  7 ++-
 .../org/lflang/generator/cpp/CppGenerator.kt  |  4 +-
 .../generator/cpp/CppPlatformGenerator.kt     |  2 +-
 .../generator/cpp/CppRos2NodeGenerator.kt     |  2 +-
 .../cpp/CppStandaloneCmakeGenerator.kt        |  4 +-
 .../generator/cpp/CppStandaloneGenerator.kt   |  4 +-
 .../cpp/CppStandaloneMainGenerator.kt         |  8 ++--
 .../lflang/generator/rust/RustGenerator.kt    |  2 +-
 .../org/lflang/generator/rust/RustModel.kt    | 14 +++---
 .../org/lflang/generator/ts/TSGenerator.kt    | 11 +++--
 .../ts/TSParameterPreambleGenerator.kt        |  6 +--
 .../java/org/lflang/tests/Configurators.java  |  4 +-
 .../java/org/lflang/tests/TestBase.java       |  2 +-
 53 files changed, 241 insertions(+), 137 deletions(-)

diff --git a/core/src/main/java/org/lflang/Target.java b/core/src/main/java/org/lflang/Target.java
index 0d73df15a1..edfd0bda2d 100644
--- a/core/src/main/java/org/lflang/Target.java
+++ b/core/src/main/java/org/lflang/Target.java
@@ -37,6 +37,16 @@
 import org.lflang.target.property.CmakeIncludeProperty;
 import org.lflang.target.property.CompileDefinitionsProperty;
 import org.lflang.target.property.CompilerFlagsProperty;
+import org.lflang.target.property.CompilerProperty;
+import org.lflang.target.property.CoordinationOptionsProperty;
+import org.lflang.target.property.CoordinationProperty;
+import org.lflang.target.property.DockerProperty;
+import org.lflang.target.property.ExportDependencyGraphProperty;
+import org.lflang.target.property.ExportToYamlProperty;
+import org.lflang.target.property.ExternalRuntimePathProperty;
+import org.lflang.target.property.FilesProperty;
+import org.lflang.target.property.HierarchicalBinProperty;
+import org.lflang.target.property.KeepaliveProperty;
 import org.lflang.target.property.RustIncludeProperty;
 
 /**
@@ -569,19 +579,47 @@ public void initialize(TargetConfig config) {
           ClockSyncOptionsProperty.INSTANCE,
           CmakeIncludeProperty.INSTANCE,
           CompileDefinitionsProperty.INSTANCE,
-          CompilerFlagsProperty.INSTANCE);
-      case CPP -> config.register(BuildTypeProperty.INSTANCE, CmakeIncludeProperty.INSTANCE);
+          CompilerFlagsProperty.INSTANCE,
+          CompilerProperty.INSTANCE,
+          CoordinationOptionsProperty.INSTANCE,
+          CoordinationProperty.INSTANCE,
+          DockerProperty.INSTANCE,
+          FilesProperty.INSTANCE,
+          HierarchicalBinProperty.INSTANCE,
+          KeepaliveProperty.INSTANCE);
+      case CPP -> config.register(
+          BuildTypeProperty.INSTANCE,
+          CmakeIncludeProperty.INSTANCE,
+          CompilerProperty.INSTANCE,
+          ExportDependencyGraphProperty.INSTANCE,
+          ExportToYamlProperty.INSTANCE,
+          ExternalRuntimePathProperty.INSTANCE);
       case Python -> config.register(
+          BuildTypeProperty.INSTANCE,
           ClockSyncModeProperty.INSTANCE,
           ClockSyncOptionsProperty.INSTANCE,
-          CompileDefinitionsProperty.INSTANCE);
+          CompileDefinitionsProperty.INSTANCE,
+          CoordinationOptionsProperty.INSTANCE,
+          CoordinationProperty.INSTANCE,
+          DockerProperty.INSTANCE,
+          FilesProperty.INSTANCE,
+          KeepaliveProperty.INSTANCE);
       case Rust -> config.register(
           BuildTypeProperty.INSTANCE,
           CargoDependenciesProperty.INSTANCE,
           CargoFeaturesProperty.INSTANCE,
           CmakeIncludeProperty.INSTANCE,
           CompileDefinitionsProperty.INSTANCE,
-          new RustIncludeProperty());
+          CompilerFlagsProperty.INSTANCE,
+          ExportDependencyGraphProperty.INSTANCE,
+          ExternalRuntimePathProperty.INSTANCE,
+          RustIncludeProperty.INSTANCE,
+          KeepaliveProperty.INSTANCE);
+      case TS -> config.register(
+          CoordinationOptionsProperty.INSTANCE,
+          CoordinationProperty.INSTANCE,
+          DockerProperty.INSTANCE,
+          KeepaliveProperty.INSTANCE);
     }
   }
 }
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 21b44588ce..ca0552b85e 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -87,7 +87,7 @@ public void initializeTargetConfig(
 
     generateCMakeInclude(federate, fileConfig);
 
-    new KeepaliveProperty().override(federate.targetConfig, true);
+    KeepaliveProperty.INSTANCE.override(federate.targetConfig, true);
 
     // If there are federates, copy the required files for that.
     // Also, create the RTI C file and the launcher script.
@@ -682,7 +682,8 @@ private String generateCodeToInitializeFederate(FederateInstance federate, RtiCo
                 "lf_cond_init(&logical_time_changed, &env->mutex);")));
 
     // Find the STA (A.K.A. the global STP offset) for this federate.
-    if (federate.targetConfig.get(new CoordinationProperty()) == CoordinationMode.DECENTRALIZED) {
+    if (federate.targetConfig.get(CoordinationProperty.INSTANCE)
+        == CoordinationMode.DECENTRALIZED) {
       var reactor = ASTUtils.toDefinition(federate.instantiation.getReactorClass());
       var stpParam =
           reactor.getParameters().stream()
@@ -806,8 +807,8 @@ private String generateCodeToInitializeFederate(FederateInstance federate, RtiCo
   private String generateCodeForPhysicalActions(
       FederateInstance federate, MessageReporter messageReporter) {
     CodeBuilder code = new CodeBuilder();
-    var coordinationMode = federate.targetConfig.get(new CoordinationProperty());
-    var coordinationOptions = federate.targetConfig.get(new CoordinationOptionsProperty());
+    var coordinationMode = federate.targetConfig.get(CoordinationProperty.INSTANCE);
+    var coordinationOptions = federate.targetConfig.get(CoordinationOptionsProperty.INSTANCE);
     if (coordinationMode.equals(CoordinationMode.CENTRALIZED)) {
       // If this program uses centralized coordination then check
       // for outputs that depend on physical actions so that null messages can be
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 59f2d59a65..6f535da595 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -187,7 +187,7 @@ public static void handleCompileDefinitions(
     definitions.put(
         String.format(
             "FEDERATED_%s",
-            federate.targetConfig.get(new CoordinationProperty()).toString().toUpperCase()),
+            federate.targetConfig.get(CoordinationProperty.INSTANCE).toString().toUpperCase()),
         "");
     if (federate.targetConfig.get(AuthProperty.INSTANCE)) {
       definitions.put("FEDERATED_AUTHENTICATED", "");
@@ -204,7 +204,7 @@ public static void handleCompileDefinitions(
 
   private static void handleAdvanceMessageInterval(FederateInstance federate) {
     var advanceMessageInterval =
-        federate.targetConfig.get(new CoordinationOptionsProperty()).advanceMessageInterval;
+        federate.targetConfig.get(CoordinationOptionsProperty.INSTANCE).advanceMessageInterval;
     if (advanceMessageInterval != null) {
       federate
           .targetConfig
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index bf3337d913..88579137d3 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -201,7 +201,7 @@ public String generatePreamble(
   }
 
   private TimeValue getMinOutputDelay(FederateInstance federate, MessageReporter messageReporter) {
-    if (federate.targetConfig.get(new CoordinationProperty()) == CoordinationMode.CENTRALIZED) {
+    if (federate.targetConfig.get(CoordinationProperty.INSTANCE) == CoordinationMode.CENTRALIZED) {
       // If this program uses centralized coordination then check
       // for outputs that depend on physical actions so that null messages can be
       // sent to the RTI.
@@ -224,7 +224,7 @@ private TimeValue getMinOutputDelay(FederateInstance federate, MessageReporter m
       }
       if (minOutputDelay != TimeValue.MAX_VALUE) {
         // Unless silenced, issue a warning.
-        if (federate.targetConfig.get(new CoordinationOptionsProperty()).advanceMessageInterval
+        if (federate.targetConfig.get(CoordinationOptionsProperty.INSTANCE).advanceMessageInterval
             == null) {
           String message =
               String.join(
diff --git a/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java b/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
index a8e5c3a4ff..f3db2573c7 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
@@ -103,7 +103,7 @@ public void doClean() throws IOException {
    * the generated .lf file for the federate.
    */
   public void relativizePaths(FedTargetConfig targetConfig) {
-    List.of(new ProtobufsProperty(), new FilesProperty(), CmakeIncludeProperty.INSTANCE)
+    List.of(new ProtobufsProperty(), FilesProperty.INSTANCE, CmakeIncludeProperty.INSTANCE)
         .forEach(
             p -> {
               p.override(targetConfig, relativizePathList(targetConfig.get(p)));
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index cb89639f57..682d12d1eb 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -125,7 +125,7 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
     // In a federated execution, we need keepalive to be true,
     // otherwise a federate could exit simply because it hasn't received
     // any messages.
-    new KeepaliveProperty().override(targetConfig, true);
+    KeepaliveProperty.INSTANCE.override(targetConfig, true);
 
     // Process command-line arguments
     processCLIArguments(context);
@@ -157,7 +157,7 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
     }
 
     // Do not invoke target code generators if --no-compile flag is used.
-    if (context.getTargetConfig().get(new NoCompileProperty())) {
+    if (context.getTargetConfig().get(NoCompileProperty.INSTANCE)) {
       context.finish(Status.GENERATED, lf2lfCodeMapMap);
       return false;
     }
@@ -197,14 +197,13 @@ private void generateLaunchScript() {
    * @param subContexts The subcontexts in which the federates have been compiled.
    */
   private void createDockerFiles(LFGeneratorContext context, List<SubContext> subContexts) {
-    if (!context.getTargetConfig().get(new DockerProperty()).enabled) return;
+    if (!context.getTargetConfig().get(DockerProperty.INSTANCE).enabled) return;
     final List<DockerData> services = new ArrayList<>();
     // 1. create a Dockerfile for each federate
     for (SubContext subContext : subContexts) { // Inherit Docker options from main context
 
-      new DockerProperty()
-          .override(
-              subContext.getTargetConfig(), context.getTargetConfig().get(new DockerProperty()));
+      DockerProperty.INSTANCE.override(
+          subContext.getTargetConfig(), context.getTargetConfig().get(DockerProperty.INSTANCE));
       var dockerGenerator = dockerGeneratorFactory(subContext);
       var dockerData = dockerGenerator.generateDockerData();
       try {
@@ -302,11 +301,11 @@ private Map<Path, CodeMap> compileFederates(
                     GeneratorUtils.findTargetDecl(subFileConfig.resource),
                     new Properties(),
                     subContextMessageReporter);
-            if (targetConfig.get(new DockerProperty()).enabled
+            if (targetConfig.get(DockerProperty.INSTANCE).enabled
                 && targetConfig.target.buildsUsingDocker()) {
-              new NoCompileProperty().override(subConfig, true);
+              NoCompileProperty.INSTANCE.override(subConfig, true);
             }
-            subConfig.get(new DockerProperty()).enabled = false;
+            subConfig.get(DockerProperty.INSTANCE).enabled = false;
 
             SubContext subContext =
                 new SubContext(context, IntegratedBuilder.VALIDATED_PERCENT_PROGRESS, 100) {
@@ -424,7 +423,7 @@ private void analyzeFederates(Reactor federation, LFGeneratorContext context) {
       rtiConfig.setHost(federation.getHost().getAddr());
     }
 
-    var d = new DockerProperty();
+    var d = DockerProperty.INSTANCE;
     var x = targetConfig.get(d);
     // If the federation is dockerized, use "rti" as the hostname.
     if (rtiConfig.getHost().equals("localhost") && x.enabled) {
@@ -685,7 +684,7 @@ private void replaceOneToManyConnection(
    */
   private void replaceFedConnection(FedConnectionInstance connection, Resource resource) {
     if (!connection.getDefinition().isPhysical()
-        && targetConfig.get(new CoordinationProperty()) != CoordinationMode.DECENTRALIZED) {
+        && targetConfig.get(CoordinationProperty.INSTANCE) != CoordinationMode.DECENTRALIZED) {
       // Map the delays on connections between federates.
       Set<Expression> dependsOnDelays =
           connection.dstFederate.dependsOn.computeIfAbsent(
@@ -710,6 +709,6 @@ private void replaceFedConnection(FedConnectionInstance connection, Resource res
     }
 
     FedASTUtils.makeCommunication(
-        connection, resource, targetConfig.get(new CoordinationProperty()), messageReporter);
+        connection, resource, targetConfig.get(CoordinationProperty.INSTANCE), messageReporter);
   }
 }
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
index 2dc54a235a..225d519d77 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
@@ -53,7 +53,10 @@ public boolean isCompatible(GeneratorBase generator) {
           .nowhere()
           .error("ROS serialization is currently only supported for the C target.");
       return false;
-    } else if (!generator.getTargetConfig().get(new CompilerProperty()).equalsIgnoreCase("g++")) {
+    } else if (!generator
+        .getTargetConfig()
+        .get(CompilerProperty.INSTANCE)
+        .equalsIgnoreCase("g++")) {
       generator
           .messageReporter
           .nowhere()
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 64e6e6aec6..50cad851d5 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -334,7 +334,7 @@ protected void setReactorsAndInstantiationGraph(LFGeneratorContext.Mode mode) {
   protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
     var dst = this.context.getFileConfig().getSrcGenPath();
     FileUtil.copyFilesOrDirectories(
-        targetConfig.get(new FilesProperty()), dst, fileConfig, messageReporter, false);
+        targetConfig.get(FilesProperty.INSTANCE), dst, fileConfig, messageReporter, false);
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index 1b4c0f9fa2..1ce0cac900 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -56,15 +56,15 @@ public static void accommodatePhysicalActionsIfPresent(
     for (Resource resource : resources) {
       for (Action action : findAll(resource, Action.class)) {
         if (action.getOrigin() == ActionOrigin.PHYSICAL
-            && !targetConfig.isSet(new KeepaliveProperty())
-            && !targetConfig.get(new KeepaliveProperty())) {
+            && !targetConfig.isSet(KeepaliveProperty.INSTANCE)
+            && !targetConfig.get(KeepaliveProperty.INSTANCE)) {
           // Keepalive was explicitly set to false; set it to true.
 
-          new KeepaliveProperty().override(targetConfig, true);
+          KeepaliveProperty.INSTANCE.override(targetConfig, true);
           String message =
               String.format(
                   "Setting %s to true because of the physical action %s.",
-                  new KeepaliveProperty().name(), action.getName());
+                  KeepaliveProperty.INSTANCE.name(), action.getName());
           messageReporter.at(action).warning(message);
           return;
         }
diff --git a/core/src/main/java/org/lflang/generator/MainContext.java b/core/src/main/java/org/lflang/generator/MainContext.java
index cf4add1d37..4e9dad4765 100644
--- a/core/src/main/java/org/lflang/generator/MainContext.java
+++ b/core/src/main/java/org/lflang/generator/MainContext.java
@@ -94,7 +94,7 @@ public MainContext(
     this.args = args;
 
     try {
-      var key = new HierarchicalBinProperty().name();
+      var key = HierarchicalBinProperty.INSTANCE.name();
       var useHierarchicalBin = args.contains(key) && Boolean.parseBoolean(args.getProperty(key));
       fileConfig =
           Objects.requireNonNull(
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 3c35d078bc..af98735fe5 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -382,12 +382,12 @@ CodeBuilder generateCMakeCode(
 
     if (CppMode) cMakeCode.pr("enable_language(CXX)");
 
-    if (targetConfig.isSet(new CompilerProperty())) {
+    if (targetConfig.isSet(CompilerProperty.INSTANCE)) {
       if (CppMode) {
         // Set the CXX compiler to what the user has requested.
-        cMakeCode.pr("set(CMAKE_CXX_COMPILER " + targetConfig.get(new CompilerProperty()) + ")");
+        cMakeCode.pr("set(CMAKE_CXX_COMPILER " + targetConfig.get(CompilerProperty.INSTANCE) + ")");
       } else {
-        cMakeCode.pr("set(CMAKE_C_COMPILER " + targetConfig.get(new CompilerProperty()) + ")");
+        cMakeCode.pr("set(CMAKE_C_COMPILER " + targetConfig.get(CompilerProperty.INSTANCE) + ")");
       }
       cMakeCode.newLine();
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index d0f175dafc..ba84d74af8 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -122,13 +122,13 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
     }
 
     // Use the user-specified compiler if any
-    if (targetConfig.get(new CompilerProperty()) != null) {
+    if (targetConfig.isSet(CompilerProperty.INSTANCE)) {
       if (cppMode) {
         // Set the CXX environment variable to change the C++ compiler.
-        compile.replaceEnvironmentVariable("CXX", targetConfig.get(new CompilerProperty()));
+        compile.replaceEnvironmentVariable("CXX", targetConfig.get(CompilerProperty.INSTANCE));
       } else {
         // Set the CC environment variable to change the C compiler.
-        compile.replaceEnvironmentVariable("CC", targetConfig.get(new CompilerProperty()));
+        compile.replaceEnvironmentVariable("CC", targetConfig.get(CompilerProperty.INSTANCE));
       }
     }
 
@@ -140,7 +140,7 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
       messageReporter
           .nowhere()
           .error(
-              targetConfig.get(new CompilerProperty())
+              targetConfig.get(CompilerProperty.INSTANCE)
                   + " failed with error code "
                   + cMakeReturnCode);
     }
@@ -166,7 +166,7 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
         messageReporter
             .nowhere()
             .error(
-                targetConfig.get(new CompilerProperty())
+                targetConfig.get(CompilerProperty.INSTANCE)
                     + " failed with error code "
                     + makeReturnCode);
       }
@@ -352,7 +352,7 @@ private boolean outputContainsKnownCMakeErrors(String CMakeOutput) {
     // Check if the error thrown is due to the wrong compiler
     if (CMakeOutput.contains("The CMAKE_C_COMPILER is set to a C++ compiler")) {
       // If so, print an appropriate error message
-      if (targetConfig.get(new CompilerProperty()) != null) {
+      if (targetConfig.get(CompilerProperty.INSTANCE) != null) {
         messageReporter
             .nowhere()
             .error(
@@ -426,7 +426,7 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
 
     LFCommand command =
         commandFactory.createCommand(
-            targetConfig.get(new CompilerProperty()), compileArgs, fileConfig.getOutPath());
+            targetConfig.get(CompilerProperty.INSTANCE), compileArgs, fileConfig.getOutPath());
     if (command == null) {
       messageReporter
           .nowhere()
diff --git a/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java b/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
index 8b3adf0dfa..4f2cb10f1d 100644
--- a/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
@@ -36,7 +36,7 @@ protected String generateDockerFileContent() {
             : StringUtil.joinObjects(config.get(BuildCommandsProperty.INSTANCE), " ");
     var compiler = config.target == Target.CCPP ? "g++" : "gcc";
     var baseImage = DEFAULT_BASE_IMAGE;
-    var dockerConf = config.get(new DockerProperty());
+    var dockerConf = config.get(DockerProperty.INSTANCE);
     if (dockerConf.enabled && dockerConf.from != null) {
       baseImage = dockerConf.from;
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 077fecdb9e..20a49452c3 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -435,7 +435,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     }
 
     // Create docker file.
-    if (targetConfig.get(new DockerProperty()).enabled && mainDef != null) {
+    if (targetConfig.get(DockerProperty.INSTANCE).enabled && mainDef != null) {
       try {
         var dockerData = getDockerGenerator(context).generateDockerData();
         dockerData.writeDockerFile();
@@ -480,7 +480,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
         Exceptions.sneakyThrow(e);
       }
-      if (!targetConfig.get(new NoCompileProperty())) {
+      if (!targetConfig.get(NoCompileProperty.INSTANCE)) {
         ArduinoUtil arduinoUtil = new ArduinoUtil(context, commandFactory, messageReporter);
         arduinoUtil.buildArduino(fileConfig, targetConfig);
         context.finish(GeneratorResult.Status.COMPILED, null);
@@ -513,8 +513,8 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
 
     // If this code generator is directly compiling the code, compile it now so that we
     // clean it up after, removing the #line directives after errors have been reported.
-    if (!targetConfig.get(new NoCompileProperty())
-        && !targetConfig.get(new DockerProperty()).enabled
+    if (!targetConfig.get(NoCompileProperty.INSTANCE)
+        && !targetConfig.get(DockerProperty.INSTANCE).enabled
         && IterableExtensions.isNullOrEmpty(targetConfig.get(BuildCommandsProperty.INSTANCE))
         // This code is unreachable in LSP_FAST mode, so that check is omitted.
         && context.getMode() != LFGeneratorContext.Mode.LSP_MEDIUM) {
@@ -557,7 +557,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
 
     // If a build directive has been given, invoke it now.
     // Note that the code does not get cleaned in this case.
-    if (!targetConfig.get(new NoCompileProperty())) {
+    if (!targetConfig.get(NoCompileProperty.INSTANCE)) {
       if (!IterableExtensions.isNullOrEmpty(targetConfig.get(BuildCommandsProperty.INSTANCE))) {
         CUtil.runBuildCommand(
             fileConfig,
@@ -1932,7 +1932,7 @@ protected void setUpGeneralParameters() {
     accommodatePhysicalActionsIfPresent();
     CompileDefinitionsProperty.INSTANCE.update(
         targetConfig,
-        Map.of("LOG_LEVEL", String.valueOf(targetConfig.get(new LoggingProperty()).ordinal())));
+        Map.of("LOG_LEVEL", String.valueOf(targetConfig.get(LoggingProperty.INSTANCE).ordinal())));
 
     targetConfig.compileAdditionalSources.addAll(CCoreFilesUtils.getCTargetSrc());
     // Create the main reactor instance if there is a main reactor.
@@ -1956,7 +1956,7 @@ protected void setUpGeneralParameters() {
     }
 
     if (platformOptions.platform == Platform.ARDUINO
-        && !targetConfig.get(new NoCompileProperty())
+        && !targetConfig.get(NoCompileProperty.INSTANCE)
         && platformOptions.board == null) {
       messageReporter
           .nowhere()
@@ -1965,7 +1965,7 @@ protected void setUpGeneralParameters() {
                   + " board name (FQBN) in the target property. For example, platform: {name:"
                   + " arduino, board: arduino:avr:leonardo}. Entering \"no-compile\" mode and"
                   + " generating target code only.");
-      new NoCompileProperty().override(targetConfig, true);
+      NoCompileProperty.INSTANCE.override(targetConfig, true);
     }
 
     if (platformOptions.platform == Platform.ZEPHYR
diff --git a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
index 65168e078a..0cac08f682 100644
--- a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
@@ -101,11 +101,11 @@ private String generateSetDefaultCliOption() {
 
   /** Parse the target parameters and set flags to the runCommand accordingly. */
   private void parseTargetParameters() {
-    if (targetConfig.get(new FastProperty())) {
+    if (targetConfig.get(FastProperty.INSTANCE)) {
       runCommand.add("-f");
       runCommand.add("true");
     }
-    if (targetConfig.get(new KeepaliveProperty())) {
+    if (targetConfig.get(KeepaliveProperty.INSTANCE)) {
       runCommand.add("-k");
       runCommand.add("true");
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
index 187c90e651..14de2ae16d 100644
--- a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
@@ -67,7 +67,7 @@ public static String generateIncludeStatements(TargetConfig targetConfig, boolea
   }
 
   public static String generateDefineDirectives(TargetConfig targetConfig, Path srcGenPath) {
-    int logLevel = targetConfig.get(new LoggingProperty()).ordinal();
+    int logLevel = targetConfig.get(LoggingProperty.INSTANCE).ordinal();
     var tracing = targetConfig.get(new TracingProperty());
     CodeBuilder code = new CodeBuilder();
     // TODO: Get rid of all of these
diff --git a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 9b52667b58..16130a3152 100644
--- a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -885,7 +885,7 @@ private static String deferredReactionOutputs(
     // val selfRef = CUtil.reactorRef(reaction.getParent());
     var name = reaction.getParent().getFullName();
     // Insert a string name to facilitate debugging.
-    if (targetConfig.get(new LoggingProperty()).compareTo(LogLevel.LOG) >= 0) {
+    if (targetConfig.get(LoggingProperty.INSTANCE).compareTo(LogLevel.LOG) >= 0) {
       code.pr(
           CUtil.reactionRef(reaction)
               + ".name = "
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index 4321b4c4e2..c2b8421bb9 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -109,7 +109,7 @@ public PythonGenerator(LFGeneratorContext context) {
   private PythonGenerator(
       LFGeneratorContext context, PythonTypes types, CCmakeGenerator cmakeGenerator) {
     super(context, false, types, cmakeGenerator, new PythonDelayBodyGenerator(types));
-    new CompilerProperty().override(this.targetConfig, "gcc"); // FIXME: why?
+    CompilerProperty.INSTANCE.override(this.targetConfig, "gcc"); // FIXME: why?
     this.targetConfig.reset(CompilerFlagsProperty.INSTANCE);
     this.types = types;
   }
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 5ad61e20e2..32d06ff5fb 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -45,17 +45,7 @@
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
 import org.lflang.lf.TargetDecl;
-import org.lflang.target.property.CompilerProperty;
-import org.lflang.target.property.CoordinationOptionsProperty;
-import org.lflang.target.property.CoordinationProperty;
-import org.lflang.target.property.DockerProperty;
-import org.lflang.target.property.ExportDependencyGraphProperty;
-import org.lflang.target.property.ExportToYamlProperty;
-import org.lflang.target.property.ExternalRuntimePathProperty;
 import org.lflang.target.property.FastProperty;
-import org.lflang.target.property.FilesProperty;
-import org.lflang.target.property.HierarchicalBinProperty;
-import org.lflang.target.property.KeepaliveProperty;
 import org.lflang.target.property.LoggingProperty;
 import org.lflang.target.property.NoCompileProperty;
 import org.lflang.target.property.NoRuntimeValidationProperty;
@@ -100,19 +90,9 @@ public TargetConfig(Target target) {
 
     // Register general-purpose properties
     this.register(
-        new CompilerProperty(),
-        new CoordinationOptionsProperty(),
-        new CoordinationProperty(),
-        new DockerProperty(),
-        new ExportDependencyGraphProperty(),
-        new ExportToYamlProperty(),
-        new ExternalRuntimePathProperty(),
-        new FastProperty(),
-        new FilesProperty(),
-        new HierarchicalBinProperty(),
-        new KeepaliveProperty(),
-        new LoggingProperty(),
-        new NoCompileProperty(),
+        FastProperty.INSTANCE,
+        LoggingProperty.INSTANCE,
+        NoCompileProperty.INSTANCE,
         new NoRuntimeValidationProperty(),
         new PlatformProperty(),
         new PrintStatisticsProperty(),
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
index 5ed41eb99d..93e44d2715 100644
--- a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
@@ -14,7 +14,7 @@
  * Directive to specify the target build type such as 'Release' or 'Debug'. This is also used in the
  * Rust target to select a Cargo profile.
  */
-public class BuildTypeProperty extends TargetProperty<BuildType, BuildTypeType> {
+public final class BuildTypeProperty extends TargetProperty<BuildType, BuildTypeType> {
 
   /** Singleton target property instance. */
   public static final BuildTypeProperty INSTANCE = new BuildTypeProperty();
@@ -30,7 +30,7 @@ public Element toAstElement(BuildType value) {
 
   @Override
   public BuildType initialValue() {
-    return BuildTypeType.BuildType.RELEASE;
+    return BuildType.DEBUG;
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
index a719d7dbd0..16c4fac5ce 100644
--- a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
@@ -39,7 +39,7 @@
  * }
  * }</pre>
  */
-public class CargoDependenciesProperty
+public final class CargoDependenciesProperty
     extends TargetProperty<Map<String, CargoDependencySpec>, CargoDependenciesPropertyType> {
 
   /** Singleton target property instance. */
diff --git a/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java b/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
index 0d17ef360d..02308b9bc4 100644
--- a/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
@@ -5,7 +5,7 @@
 import org.lflang.Target;
 
 /** Directive for specifying Cargo features of the generated program to enable. */
-public class CargoFeaturesProperty extends StringListProperty {
+public final class CargoFeaturesProperty extends StringListProperty {
 
   /** Singleton target property instance. */
   public static final CargoFeaturesProperty INSTANCE = new CargoFeaturesProperty();
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
index 89562e10cb..70195d9de6 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
@@ -15,7 +15,7 @@
 import org.lflang.target.property.type.ClockSyncModeType.ClockSyncMode;
 
 /** The mode of clock synchronization to be used in federated programs. The default is 'initial'. */
-public class ClockSyncModeProperty extends TargetProperty<ClockSyncMode, ClockSyncModeType> {
+public final class ClockSyncModeProperty extends TargetProperty<ClockSyncMode, ClockSyncModeType> {
 
   /** Singleton target property instance. */
   public static final ClockSyncModeProperty INSTANCE = new ClockSyncModeProperty();
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
index 4d65c58ccb..b962f45d8e 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
@@ -19,7 +19,8 @@
 import org.lflang.target.property.type.TargetPropertyType;
 
 /** Key-value pairs giving options for clock synchronization. */
-public class ClockSyncOptionsProperty extends TargetProperty<ClockSyncOptions, DictionaryType> {
+public final class ClockSyncOptionsProperty
+    extends TargetProperty<ClockSyncOptions, DictionaryType> {
 
   /** Singleton target property instance. */
   public static final ClockSyncOptionsProperty INSTANCE = new ClockSyncOptionsProperty();
diff --git a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
index b7006b7f37..a8e4cc0527 100644
--- a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
@@ -13,7 +13,7 @@
  * <p>This gives full control over the C/C++ build as any cmake parameters can be adjusted in the
  * included file.
  */
-public class CmakeIncludeProperty extends FileListProperty {
+public final class CmakeIncludeProperty extends FileListProperty {
 
   /** Singleton target property instance. */
   public static final CmakeIncludeProperty INSTANCE = new CmakeIncludeProperty();
diff --git a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
index 831f25682c..2bab9c7722 100644
--- a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
@@ -18,7 +18,7 @@
  * <p>The first string is the definition itself, and the second string is the value to attribute to
  * that definition, if any. The second value could be left empty.
  */
-public class CompileDefinitionsProperty
+public final class CompileDefinitionsProperty
     extends TargetProperty<Map<String, String>, StringDictionaryType> {
 
   /** Singleton target property instance. */
diff --git a/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
index e5d061a436..b5f4e24a28 100644
--- a/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
@@ -5,7 +5,7 @@
 import org.lflang.Target;
 
 /** Flags to pass to the compiler, unless a build command has been specified. */
-public class CompilerFlagsProperty extends StringListProperty {
+public final class CompilerFlagsProperty extends StringListProperty {
 
   /** Singleton target property instance. */
   public static final CompilerFlagsProperty INSTANCE = new CompilerFlagsProperty();
diff --git a/core/src/main/java/org/lflang/target/property/CompilerProperty.java b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
index daa9b50b28..5701155fb0 100644
--- a/core/src/main/java/org/lflang/target/property/CompilerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
@@ -4,7 +4,14 @@
 import org.lflang.Target;
 
 /** The compiler to invoke, unless a build command has been specified. */
-public class CompilerProperty extends StringProperty {
+public final class CompilerProperty extends StringProperty {
+
+  /** Singleton target property instance. */
+  public static final CompilerProperty INSTANCE = new CompilerProperty();
+
+  private CompilerProperty() {
+    super();
+  }
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
index e82b43ffc6..129c710b37 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
@@ -19,10 +19,13 @@
 import org.lflang.target.property.type.TargetPropertyType;
 
 /** Key-value pairs giving options for clock synchronization. */
-public class CoordinationOptionsProperty
+public final class CoordinationOptionsProperty
     extends TargetProperty<CoordinationOptions, DictionaryType> {
 
-  public CoordinationOptionsProperty() {
+  /** Singleton target property instance. */
+  public static final CoordinationOptionsProperty INSTANCE = new CoordinationOptionsProperty();
+
+  private CoordinationOptionsProperty() {
     super(DictionaryType.COORDINATION_OPTION_DICT);
   }
 
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
index 83068bbe19..abe044e943 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
@@ -14,9 +14,13 @@
  * The type of coordination used during the execution of a federated program. The default is
  * 'centralized'.
  */
-public class CoordinationProperty extends TargetProperty<CoordinationMode, CoordinationModeType> {
+public final class CoordinationProperty
+    extends TargetProperty<CoordinationMode, CoordinationModeType> {
 
-  public CoordinationProperty() {
+  /** Singleton target property instance. */
+  public static final CoordinationProperty INSTANCE = new CoordinationProperty();
+
+  private CoordinationProperty() {
     super(new CoordinationModeType());
   }
 
diff --git a/core/src/main/java/org/lflang/target/property/DockerProperty.java b/core/src/main/java/org/lflang/target/property/DockerProperty.java
index e3b0e0bbd4..2132c6cd78 100644
--- a/core/src/main/java/org/lflang/target/property/DockerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DockerProperty.java
@@ -22,9 +22,12 @@
  * Directive to generate a Dockerfile. This is either a boolean, true or false, or a dictionary of
  * options.
  */
-public class DockerProperty extends TargetProperty<DockerOptions, UnionType> {
+public final class DockerProperty extends TargetProperty<DockerOptions, UnionType> {
 
-  public DockerProperty() {
+  /** Singleton target property instance. */
+  public static final DockerProperty INSTANCE = new DockerProperty();
+
+  private DockerProperty() {
     super(UnionType.DOCKER_UNION);
   }
 
diff --git a/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java b/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
index 87628d2a9c..e06295cbb9 100644
--- a/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
@@ -9,7 +9,14 @@
  * <p>This option is currently only used for C++ and Rust. This export function is a valuable tool
  * for debugging LF programs and helps to understand the dependencies inferred by the runtime.
  */
-public class ExportDependencyGraphProperty extends BooleanProperty {
+public final class ExportDependencyGraphProperty extends BooleanProperty {
+
+  /** Singleton target property instance. */
+  public static final ExportDependencyGraphProperty INSTANCE = new ExportDependencyGraphProperty();
+
+  private ExportDependencyGraphProperty() {
+    super();
+  }
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java b/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
index bd6d975ed7..5abe77895d 100644
--- a/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
@@ -10,7 +10,14 @@
  * <p>This option is currently only used for C++. This export function is a valuable tool for
  * debugging LF programs and performing external analysis.
  */
-public class ExportToYamlProperty extends BooleanProperty {
+public final class ExportToYamlProperty extends BooleanProperty {
+
+  /** Singleton target property instance. */
+  public static final ExportToYamlProperty INSTANCE = new ExportToYamlProperty();
+
+  private ExportToYamlProperty() {
+    super();
+  }
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
index 36bace7002..ff6ae354c5 100644
--- a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
@@ -7,7 +7,14 @@
  * Directive for specifying a path to an external runtime libray to link to instead of the default
  * one.
  */
-public class ExternalRuntimePathProperty extends StringProperty {
+public final class ExternalRuntimePathProperty extends StringProperty {
+
+  /** Singleton target property instance. */
+  public static final ExternalRuntimePathProperty INSTANCE = new ExternalRuntimePathProperty();
+
+  private ExternalRuntimePathProperty() {
+    super();
+  }
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/FastProperty.java b/core/src/main/java/org/lflang/target/property/FastProperty.java
index c4106f525e..fee019c94e 100644
--- a/core/src/main/java/org/lflang/target/property/FastProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FastProperty.java
@@ -15,7 +15,14 @@
  * If true, configure the execution environment such that it does not wait for physical time to
  * match logical time. The default is false.
  */
-public class FastProperty extends BooleanProperty {
+public final class FastProperty extends BooleanProperty {
+
+  /** Singleton target property instance. */
+  public static final FastProperty INSTANCE = new FastProperty();
+
+  private FastProperty() {
+    super();
+  }
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/FilesProperty.java b/core/src/main/java/org/lflang/target/property/FilesProperty.java
index cb56324958..c3dff093fc 100644
--- a/core/src/main/java/org/lflang/target/property/FilesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FilesProperty.java
@@ -4,7 +4,14 @@
 import org.lflang.Target;
 
 /** Directive to stage particular files on the class path to be processed by the code generator. */
-public class FilesProperty extends FileListProperty {
+public final class FilesProperty extends FileListProperty {
+
+  /** Singleton target property instance. */
+  public static final FilesProperty INSTANCE = new FilesProperty();
+
+  private FilesProperty() {
+    super();
+  }
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java b/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
index 5fc3a856e8..5fa11e7f37 100644
--- a/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
+++ b/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
@@ -7,7 +7,14 @@
 /**
  * Whether the bin directory should have a flat or hierarchical organization. It is flat by default.
  */
-public class HierarchicalBinProperty extends BooleanProperty {
+public final class HierarchicalBinProperty extends BooleanProperty {
+
+  /** Singleton target property instance. */
+  public static final HierarchicalBinProperty INSTANCE = new HierarchicalBinProperty();
+
+  private HierarchicalBinProperty() {
+    super();
+  }
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
index 76a1515632..8b639179c8 100644
--- a/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
+++ b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
@@ -7,7 +7,14 @@
  * If true, configure the execution environment to keep executing if there are no more events on the
  * event queue. The default is false.
  */
-public class KeepaliveProperty extends BooleanProperty {
+public final class KeepaliveProperty extends BooleanProperty {
+
+  /** Singleton target property instance. */
+  public static final KeepaliveProperty INSTANCE = new KeepaliveProperty();
+
+  private KeepaliveProperty() {
+    super();
+  }
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/LoggingProperty.java b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
index 080697ffee..051b17c5de 100644
--- a/core/src/main/java/org/lflang/target/property/LoggingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
@@ -13,9 +13,12 @@
  * Directive to specify the grain at which to report log messages during execution. The default is
  * INFO.
  */
-public class LoggingProperty extends TargetProperty<LogLevel, LoggingType> {
+public final class LoggingProperty extends TargetProperty<LogLevel, LoggingType> {
 
-  public LoggingProperty() {
+  /** Singleton target property instance. */
+  public static final LoggingProperty INSTANCE = new LoggingProperty();
+
+  private LoggingProperty() {
     super(new LoggingType());
   }
 
diff --git a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
index b0b7513c21..6e06552c8f 100644
--- a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
+++ b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
@@ -5,7 +5,14 @@
 import org.lflang.Target;
 
 /** If true, do not invoke the target compiler or build command. The default is false. */
-public class NoCompileProperty extends BooleanProperty {
+public final class NoCompileProperty extends BooleanProperty {
+
+  /** Singleton target property instance. */
+  public static final NoCompileProperty INSTANCE = new NoCompileProperty();
+
+  private NoCompileProperty() {
+    super();
+  }
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
index 62dcb6a49d..a5ba132010 100644
--- a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
@@ -22,9 +22,12 @@
  * the generated {@code main.rs} will include it with a {@code mod foo;}. If one of the paths is a
  * directory, it must contain a {@code mod.rs} file, and all its contents are copied.
  */
-public class RustIncludeProperty extends TargetProperty<List<Path>, UnionType> {
+public final class RustIncludeProperty extends TargetProperty<List<Path>, UnionType> {
 
-  public RustIncludeProperty() {
+  /** Singleton target property instance. */
+  public static final RustIncludeProperty INSTANCE = new RustIncludeProperty();
+
+  private RustIncludeProperty() {
     super(UnionType.FILE_OR_FILE_ARRAY);
   }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
index ce338a8f40..119fa5e449 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
@@ -75,7 +75,7 @@ class CppGenerator(
         // generate platform specific files
         platformGenerator.generatePlatformFiles()
 
-        if (targetConfig.get(NoCompileProperty()) || errorsOccurred()) {
+        if (targetConfig.get(NoCompileProperty.INSTANCE) || errorsOccurred()) {
             println("Exiting before invoking target compiler.")
             context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, codeMaps))
         } else if (context.mode == Mode.LSP_MEDIUM) {
@@ -129,7 +129,7 @@ class CppGenerator(
             true)
 
         // copy or download reactor-cpp
-        if (!targetConfig.isSet(ExternalRuntimePathProperty())) {
+        if (!targetConfig.isSet(ExternalRuntimePathProperty.INSTANCE)) {
             if (targetConfig.isSet(RuntimeVersionProperty())) {
                 fetchReactorCpp(targetConfig.get(RuntimeVersionProperty()))
             } else {
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
index 92278526a6..735d94a130 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
@@ -34,7 +34,7 @@ abstract class CppPlatformGenerator(protected val generator: CppGenerator) {
             "-DREACTOR_CPP_VALIDATE=${if (targetConfig.get(NoRuntimeValidationProperty())) "OFF" else "ON"}",
             "-DREACTOR_CPP_PRINT_STATISTICS=${if (targetConfig.get(PrintStatisticsProperty())) "ON" else "OFF"}",
             "-DREACTOR_CPP_TRACE=${if (targetConfig.get(TracingProperty()).isEnabled) "ON" else "OFF"}",
-            "-DREACTOR_CPP_LOG_LEVEL=${targetConfig.get(LoggingProperty()).severity}",
+            "-DREACTOR_CPP_LOG_LEVEL=${targetConfig.get(LoggingProperty.INSTANCE).severity}",
             "-DLF_SRC_PKG_PATH=${fileConfig.srcPkgPath}",
         )
 }
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
index f3078bc5b3..e9f042d93d 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
@@ -61,7 +61,7 @@ class CppRos2NodeGenerator(
             |$nodeName::$nodeName(const rclcpp::NodeOptions& node_options)
             |  : Node("$nodeName", node_options) {
             |  unsigned workers = ${if (targetConfig.get(WorkersProperty()) != 0) targetConfig.get(WorkersProperty()) else "std::thread::hardware_concurrency()"};
-            |  bool fast{${targetConfig.get(FastProperty())}};
+            |  bool fast{${targetConfig.get(FastProperty.INSTANCE)}};
             |  reactor::Duration lf_timeout{${if (targetConfig.isSet(TimeOutProperty())) targetConfig.get(TimeOutProperty()).toCppCode() else "reactor::Duration::max()"}};
             |
             |  // provide a globally accessible reference to this node
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
index 3048ccd5a0..c767aa892b 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
@@ -140,7 +140,7 @@ class CppStandaloneCmakeGenerator(private val targetConfig: TargetConfig, privat
         val includeFiles = targetConfig.get(CmakeIncludeProperty.INSTANCE)?.map { fileConfig.srcPath.resolve(it).toUnixString() }
 
         val reactorCppTarget = when {
-            targetConfig.isSet(ExternalRuntimePathProperty()) -> "reactor-cpp"
+            targetConfig.isSet(ExternalRuntimePathProperty.INSTANCE) -> "reactor-cpp"
             targetConfig.isSet(RuntimeVersionProperty())      -> "reactor-cpp-${targetConfig.get(RuntimeVersionProperty())}"
             else                                   -> "reactor-cpp-default"
         }
@@ -150,7 +150,7 @@ class CppStandaloneCmakeGenerator(private val targetConfig: TargetConfig, privat
                 |cmake_minimum_required(VERSION 3.5)
                 |project(${fileConfig.name} VERSION 0.0.0 LANGUAGES CXX)
                 |
-                |${if (targetConfig.get(ExternalRuntimePathProperty()) != null) "find_package(reactor-cpp PATHS ${targetConfig.get(ExternalRuntimePathProperty())})" else ""}
+                |${if (targetConfig.get(ExternalRuntimePathProperty.INSTANCE) != null) "find_package(reactor-cpp PATHS ${targetConfig.get(ExternalRuntimePathProperty.INSTANCE)})" else ""}
                 |
                 |set(LF_MAIN_TARGET ${fileConfig.name})
                 |
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
index a4f689dc97..dd03db376d 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneGenerator.kt
@@ -172,8 +172,8 @@ class CppStandaloneGenerator(generator: CppGenerator) :
         )
 
         // prepare cmake
-        if (targetConfig.get(CompilerProperty()) != null) {
-            cmd.setEnvironmentVariable("CXX", targetConfig.get(CompilerProperty()))
+        if (targetConfig.isSet(CompilerProperty.INSTANCE)) {
+            cmd.setEnvironmentVariable("CXX", targetConfig.get(CompilerProperty.INSTANCE))
         }
         return cmd
     }
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt
index c288222e25..e0ee61a755 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt
@@ -64,7 +64,7 @@ class CppStandaloneMainGenerator(
             |  cxxopts::Options options("${fileConfig.name}", "Reactor Program");
             |
             |  unsigned workers = ${if (targetConfig.get(WorkersProperty()) != 0) targetConfig.get(WorkersProperty()) else "std::thread::hardware_concurrency()"};
-            |  bool fast{${targetConfig.get(FastProperty())}};
+            |  bool fast{${targetConfig.get(FastProperty.INSTANCE)}};
             |  reactor::Duration timeout = ${if (targetConfig.isSet(TimeOutProperty())) targetConfig.get(TimeOutProperty()).toCppCode() else "reactor::Duration::max()"};
             |  
             |  // the timeout variable needs to be tested beyond fitting the Duration-type 
@@ -73,7 +73,7 @@ class CppStandaloneMainGenerator(
             |    .add_options()
             |      ("w,workers", "the number of worker threads used by the scheduler", cxxopts::value<unsigned>(workers)->default_value(std::to_string(workers)), "'unsigned'")
             |      ("o,timeout", "Time after which the execution is aborted.", cxxopts::value<reactor::Duration>(timeout)->default_value(time_to_string(timeout)), "'FLOAT UNIT'")
-            |      ("f,fast", "Allow logical time to run faster than physical time.", cxxopts::value<bool>(fast)->default_value("${targetConfig.get(FastProperty())}"))
+            |      ("f,fast", "Allow logical time to run faster than physical time.", cxxopts::value<bool>(fast)->default_value("${targetConfig.get(FastProperty.INSTANCE)}"))
             |      ("help", "Print help");
             |      
         ${" |"..main.parameters.joinToString("\n\n") { generateParameterParser(it) }}
@@ -101,8 +101,8 @@ class CppStandaloneMainGenerator(
             |
             |  // assemble reactor program
             |  e.assemble();
-        ${" |".. if (targetConfig.get(ExportDependencyGraphProperty())) "e.export_dependency_graph(\"${main.name}.dot\");" else ""}
-        ${" |".. if (targetConfig.get(ExportToYamlProperty())) "e.dump_to_yaml(\"${main.name}.yaml\");" else ""}
+        ${" |".. if (targetConfig.get(ExportDependencyGraphProperty.INSTANCE)) "e.export_dependency_graph(\"${main.name}.dot\");" else ""}
+        ${" |".. if (targetConfig.get(ExportToYamlProperty.INSTANCE)) "e.dump_to_yaml(\"${main.name}.yaml\");" else ""}
             |
             |  // start execution
             |  auto thread = e.startup();
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
index c664c5308f..a3ae57ba21 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
@@ -73,7 +73,7 @@ class RustGenerator(
         val gen = RustModelBuilder.makeGenerationInfo(targetConfig, reactors, messageReporter)
         val codeMaps: Map<Path, CodeMap> = RustEmitter.generateRustProject(fileConfig, gen)
 
-        if (targetConfig.get(NoCompileProperty()) || errorsOccurred()) {
+        if (targetConfig.get(NoCompileProperty.INSTANCE) || errorsOccurred()) {
             context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, codeMaps))
             println("Exiting before invoking target compiler.")
         } else {
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
index d65b816d2f..7b3e6637a3 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
@@ -451,7 +451,7 @@ object RustModelBuilder {
                 version = "1.0.0",
                 authors = listOf(System.getProperty("user.name")),
                 dependencies = dependencies,
-                modulesToIncludeInMain = targetConfig.get(RustIncludeProperty()),
+                modulesToIncludeInMain = targetConfig.get(RustIncludeProperty.INSTANCE),
                 enabledCargoFeatures = targetConfig.get(CargoFeaturesProperty.INSTANCE).toSet()
             ),
             reactors = reactorsInfos,
@@ -496,8 +496,8 @@ object RustModelBuilder {
                 features = parallelFeature,
             )
 
-            if (targetConfig.isSet(ExternalRuntimePathProperty())) {
-                spec.localPath = targetConfig.get(ExternalRuntimePathProperty())
+            if (targetConfig.isSet(ExternalRuntimePathProperty.INSTANCE)) {
+                spec.localPath = targetConfig.get(ExternalRuntimePathProperty.INSTANCE)
             } else if (targetConfig.isSet(RuntimeVersionProperty())) {
                 spec.gitRepo = RustEmitterBase.runtimeGitUrl
                 spec.rev = targetConfig.get(RuntimeVersionProperty())
@@ -507,8 +507,8 @@ object RustModelBuilder {
 
             return spec
         } else {
-            if (targetConfig.isSet(ExternalRuntimePathProperty())) {
-                userSpec.localPath = targetConfig.get(ExternalRuntimePathProperty())
+            if (targetConfig.isSet(ExternalRuntimePathProperty.INSTANCE)) {
+                userSpec.localPath = targetConfig.get(ExternalRuntimePathProperty.INSTANCE)
             }
 
             if (userSpec.localPath == null && userSpec.gitRepo == null) {
@@ -530,12 +530,12 @@ object RustModelBuilder {
 
     private fun TargetConfig.toRustProperties(): RustTargetProperties =
         RustTargetProperties(
-            keepAlive = this.get(KeepaliveProperty()),
+            keepAlive = this.get(KeepaliveProperty.INSTANCE),
             timeout = this.get(TimeOutProperty())?.toRustTimeExpr(),
             timeoutLf = this.get(TimeOutProperty()),
             singleFile = this.get(SingleFileProjectProperty()),
             workers = this.get(WorkersProperty()),
-            dumpDependencyGraph = this.get(ExportDependencyGraphProperty()),
+            dumpDependencyGraph = this.get(ExportDependencyGraphProperty.INSTANCE),
         )
 
     private fun makeReactorInfos(reactors: List<Reactor>): List<ReactorInfo> =
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
index 7aafa6ad5a..759aa559cd 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -38,6 +38,7 @@ import org.lflang.scoping.LFGlobalScopeProvider
 import org.lflang.target.property.DockerProperty
 import org.lflang.target.property.NoCompileProperty
 import org.lflang.target.property.ProtobufsProperty
+import org.lflang.target.property.type.PrimitiveType
 import org.lflang.util.FileUtil
 import java.nio.file.Files
 import java.nio.file.Path
@@ -120,7 +121,7 @@ class TSGenerator(
 
         val codeMaps = HashMap<Path, CodeMap>()
         generateCode(codeMaps, resource.model.preambles)
-        if (targetConfig.get(DockerProperty()).enabled) {
+        if (targetConfig.get(DockerProperty.INSTANCE).enabled) {
             val dockerData = TSDockerGenerator(context).generateDockerData();
             dockerData.writeDockerFile()
             DockerComposeGenerator(context).writeDockerComposeFile(listOf(dockerData))
@@ -128,7 +129,7 @@ class TSGenerator(
         // For small programs, everything up until this point is virtually instantaneous. This is the point where cancellation,
         // progress reporting, and IDE responsiveness become real considerations.
 
-        if (context.mode != LFGeneratorContext.Mode.LSP_MEDIUM && targetConfig.get(NoCompileProperty())) {
+        if (context.mode != LFGeneratorContext.Mode.LSP_MEDIUM && targetConfig.get(NoCompileProperty.INSTANCE)) {
             context.finish(GeneratorResult.GENERATED_NO_EXECUTABLE.apply(context, null))
         } else {
             context.reportProgress(
@@ -147,7 +148,7 @@ class TSGenerator(
             val parsingContext = SubContext(context, COLLECTED_DEPENDENCIES_PERCENT_PROGRESS, 100)
             val validator = TSValidator(fileConfig, messageReporter, codeMaps)
             if (!context.cancelIndicator.isCanceled) {
-                if (context.mode == LFGeneratorContext.Mode.LSP_MEDIUM) {
+                if (context.mode == LFGeneratorContext.Mode.LSP_MEDIUM || targetConfig.get(NoCompileProperty.INSTANCE)) {
                     if (!passesChecks(validator, parsingContext)) {
                         context.unsuccessfulFinish();
                         return;
@@ -278,7 +279,9 @@ class TSGenerator(
      * Return whether it is advisable to install dependencies.
      */
     private fun shouldCollectDependencies(context: LFGeneratorContext): Boolean =
-        context.mode != LFGeneratorContext.Mode.LSP_MEDIUM || !fileConfig.srcGenPkgPath.resolve("node_modules").toFile().exists()
+        (context.mode != LFGeneratorContext.Mode.LSP_MEDIUM
+                && !targetConfig.get(NoCompileProperty.INSTANCE))
+                || !fileConfig.srcGenPkgPath.resolve("node_modules").toFile().exists()
 
     /**
      * Collect the dependencies in package.json and their
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
index e4e59ffc40..bbb6611805 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
@@ -166,8 +166,8 @@ class TSParameterPreambleGenerator(
         val codeText = """
         |// ************* App Parameters
         |let __timeout: TimeValue | undefined = ${getTimeoutTimeValue()};
-        |let __keepAlive: boolean = ${targetConfig.get(KeepaliveProperty())};
-        |let __fast: boolean = ${targetConfig.get(FastProperty())};
+        |let __keepAlive: boolean = ${targetConfig.get(KeepaliveProperty.INSTANCE)};
+        |let __fast: boolean = ${targetConfig.get(FastProperty.INSTANCE)};
         |let __federationID: string = 'Unidentified Federation'
         |
         |let __noStart = false; // If set to true, don't start the app.
@@ -239,7 +239,7 @@ class TSParameterPreambleGenerator(
         |        throw new Error("'logging' command line argument is malformed.");
         |    }
         |} else {
-        |    Log.global.level = Log.levels.${targetConfig.get(LoggingProperty()).name}; // Default from target property.
+        |    Log.global.level = Log.levels.${targetConfig.get(LoggingProperty.INSTANCE).name}; // Default from target property.
         |}
         |
         |// Help parameter (not a constructor parameter, but a command line option)
diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index 397904fc9d..65fb9b9975 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -75,7 +75,7 @@ public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
     test.getContext().getTargetConfig().get(new PlatformProperty()).board = "qemu_cortex_m3";
 
     // FIXME: Zephyr  emulations fails with debug log-levels.
-    new LoggingProperty().override(test.getContext().getTargetConfig(), LogLevel.WARN);
+    LoggingProperty.INSTANCE.override(test.getContext().getTargetConfig(), LogLevel.WARN);
     test.getContext().getArgs().setProperty("logging", "warning");
     return true;
   }
@@ -87,7 +87,7 @@ public static boolean makeZephyrCompatible(LFTest test) {
     test.getContext().getTargetConfig().get(new PlatformProperty()).board = "qemu_cortex_m3";
 
     // FIXME: Zephyr  emulations fails with debug log-levels.
-    new LoggingProperty().override(test.getContext().getTargetConfig(), LogLevel.WARN);
+    LoggingProperty.INSTANCE.override(test.getContext().getTargetConfig(), LogLevel.WARN);
     test.getContext().getArgs().setProperty("logging", "warning");
 
     return true;
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index 2e125ffaa2..d9d36b2ea7 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -439,7 +439,7 @@ private void validate(LFTest test) throws TestError {
   /** Override to add some LFC arguments to all runs of this test class. */
   protected void addExtraLfcArgs(Properties args, TargetConfig targetConfig) {
     args.setProperty("build-type", "Test");
-    if (!targetConfig.isSet(new LoggingProperty())) args.setProperty("logging", "Debug");
+    if (!targetConfig.isSet(LoggingProperty.INSTANCE)) args.setProperty("logging", "Debug");
   }
 
   /**

From f3115342cca8a6dc242ccfaf768474e9fb8dfc14 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 16 Oct 2023 18:10:50 -0700
Subject: [PATCH 1031/1114] Fix build problem

---
 core/src/main/java/org/lflang/Target.java                | 4 +++-
 core/src/main/java/org/lflang/target/TargetConfig.java   | 2 --
 .../org/lflang/target/property/BuildTypeProperty.java    | 2 +-
 .../target/property/NoRuntimeValidationProperty.java     | 9 ++++++++-
 .../org/lflang/generator/cpp/CppPlatformGenerator.kt     | 2 +-
 .../org/lflang/generator/ts/TSConstructorGenerator.kt    | 2 +-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/lflang/Target.java b/core/src/main/java/org/lflang/Target.java
index edfd0bda2d..3dcaa4c804 100644
--- a/core/src/main/java/org/lflang/Target.java
+++ b/core/src/main/java/org/lflang/Target.java
@@ -47,6 +47,7 @@
 import org.lflang.target.property.FilesProperty;
 import org.lflang.target.property.HierarchicalBinProperty;
 import org.lflang.target.property.KeepaliveProperty;
+import org.lflang.target.property.NoRuntimeValidationProperty;
 import org.lflang.target.property.RustIncludeProperty;
 
 /**
@@ -586,7 +587,8 @@ public void initialize(TargetConfig config) {
           DockerProperty.INSTANCE,
           FilesProperty.INSTANCE,
           HierarchicalBinProperty.INSTANCE,
-          KeepaliveProperty.INSTANCE);
+          KeepaliveProperty.INSTANCE,
+          NoRuntimeValidationProperty.INSTANCE);
       case CPP -> config.register(
           BuildTypeProperty.INSTANCE,
           CmakeIncludeProperty.INSTANCE,
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 32d06ff5fb..efbf3eb6a4 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -48,7 +48,6 @@
 import org.lflang.target.property.FastProperty;
 import org.lflang.target.property.LoggingProperty;
 import org.lflang.target.property.NoCompileProperty;
-import org.lflang.target.property.NoRuntimeValidationProperty;
 import org.lflang.target.property.PlatformProperty;
 import org.lflang.target.property.PrintStatisticsProperty;
 import org.lflang.target.property.ProtobufsProperty;
@@ -93,7 +92,6 @@ public TargetConfig(Target target) {
         FastProperty.INSTANCE,
         LoggingProperty.INSTANCE,
         NoCompileProperty.INSTANCE,
-        new NoRuntimeValidationProperty(),
         new PlatformProperty(),
         new PrintStatisticsProperty(),
         new ProtobufsProperty(),
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
index 93e44d2715..94559a490a 100644
--- a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
@@ -40,7 +40,7 @@ public BuildType fromAst(Element node, MessageReporter reporter) {
 
   @Override
   protected BuildType fromString(String string, MessageReporter reporter) {
-    return ((BuildTypeType) this.type).forName(string);
+    return this.type.forName(string);
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java b/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
index 216bfe8491..a6eb771d2f 100644
--- a/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
+++ b/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
@@ -4,7 +4,14 @@
 import org.lflang.Target;
 
 /** If true, do not perform runtime validation. The default is false. */
-public class NoRuntimeValidationProperty extends BooleanProperty {
+public final class NoRuntimeValidationProperty extends BooleanProperty {
+
+  /** Singleton target property instance. */
+  public static final NoRuntimeValidationProperty INSTANCE = new NoRuntimeValidationProperty();
+
+  private NoRuntimeValidationProperty() {
+    super();
+  }
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
index 735d94a130..a9afc8a376 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
@@ -31,7 +31,7 @@ abstract class CppPlatformGenerator(protected val generator: CppGenerator) {
     protected val cmakeArgs: List<String>
         get() = listOf(
             "-DCMAKE_BUILD_TYPE=${targetConfig.get(BuildTypeProperty.INSTANCE)}",
-            "-DREACTOR_CPP_VALIDATE=${if (targetConfig.get(NoRuntimeValidationProperty())) "OFF" else "ON"}",
+            "-DREACTOR_CPP_VALIDATE=${if (targetConfig.get(NoRuntimeValidationProperty.INSTANCE)) "OFF" else "ON"}",
             "-DREACTOR_CPP_PRINT_STATISTICS=${if (targetConfig.get(PrintStatisticsProperty())) "ON" else "OFF"}",
             "-DREACTOR_CPP_TRACE=${if (targetConfig.get(TracingProperty()).isEnabled) "ON" else "OFF"}",
             "-DREACTOR_CPP_LOG_LEVEL=${targetConfig.get(LoggingProperty.INSTANCE).severity}",
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
index af945f1d88..1be7a51e30 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSConstructorGenerator.kt
@@ -78,7 +78,7 @@ class TSConstructorGenerator(
 
     // Generate code for setting target configurations.
     private fun generateTargetConfigurations(targetConfig: TargetConfig): String {
-        val interval = targetConfig.get(CoordinationOptionsProperty()).advanceMessageInterval
+        val interval = targetConfig.get(CoordinationOptionsProperty.INSTANCE).advanceMessageInterval
         return if ((reactor.isMain) && interval != null) {
             "this.setAdvanceMessageInterval(${interval.toTsTime()})"
         } else ""

From 2159a1e874e6d316dfd85729969d3be3d774f071 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 16 Oct 2023 18:21:04 -0700
Subject: [PATCH 1032/1114] Fix broken unit test

---
 core/src/main/java/org/lflang/Target.java      |  4 +++-
 .../lflang/generator/c/CCmakeGenerator.java    |  2 +-
 .../java/org/lflang/generator/c/CCompiler.java |  8 ++++----
 .../org/lflang/generator/c/CGenerator.java     | 18 +++++++++---------
 .../generator/c/CMainFunctionGenerator.java    |  8 ++++----
 .../lflang/generator/c/CPreambleGenerator.java |  4 ++--
 .../java/org/lflang/target/TargetConfig.java   |  2 --
 .../target/property/PlatformProperty.java      |  7 +++++--
 .../main/java/org/lflang/util/ArduinoUtil.java | 14 +++++++-------
 .../compiler/LinguaFrancaValidationTest.java   | 14 +++++++-------
 .../java/org/lflang/tests/Configurators.java   | 12 ++++++------
 11 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/core/src/main/java/org/lflang/Target.java b/core/src/main/java/org/lflang/Target.java
index 3dcaa4c804..9ec0998bd3 100644
--- a/core/src/main/java/org/lflang/Target.java
+++ b/core/src/main/java/org/lflang/Target.java
@@ -48,6 +48,7 @@
 import org.lflang.target.property.HierarchicalBinProperty;
 import org.lflang.target.property.KeepaliveProperty;
 import org.lflang.target.property.NoRuntimeValidationProperty;
+import org.lflang.target.property.PlatformProperty;
 import org.lflang.target.property.RustIncludeProperty;
 
 /**
@@ -588,7 +589,8 @@ public void initialize(TargetConfig config) {
           FilesProperty.INSTANCE,
           HierarchicalBinProperty.INSTANCE,
           KeepaliveProperty.INSTANCE,
-          NoRuntimeValidationProperty.INSTANCE);
+          NoRuntimeValidationProperty.INSTANCE,
+          PlatformProperty.INSTANCE);
       case CPP -> config.register(
           BuildTypeProperty.INSTANCE,
           CmakeIncludeProperty.INSTANCE,
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index af98735fe5..0eeb27dd34 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -128,7 +128,7 @@ CodeBuilder generateCMakeCode(
     //  rp2040 <board_name> : <stdio_opt>
     //  arduino
     String[] boardProperties = {};
-    var platformOptions = targetConfig.get(new PlatformProperty());
+    var platformOptions = targetConfig.get(PlatformProperty.INSTANCE);
     if (platformOptions.board != null) {
       boardProperties = platformOptions.board.trim().split(":");
       // Ignore whitespace
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index ba84d74af8..c46230caa2 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -188,8 +188,8 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
                     + " finished with no errors.");
       }
 
-      if (targetConfig.get(new PlatformProperty()).platform == Platform.ZEPHYR
-          && targetConfig.get(new PlatformProperty()).flash) {
+      if (targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ZEPHYR
+          && targetConfig.get(PlatformProperty.INSTANCE).flash) {
         messageReporter.nowhere().info("Invoking flash command for Zephyr");
         LFCommand flash = buildWestFlashCommand();
         int flashRet = flash.run();
@@ -319,7 +319,7 @@ public LFCommand buildCmakeCommand() {
   public LFCommand buildWestFlashCommand() {
     // Set the build directory to be "build"
     Path buildPath = fileConfig.getSrcGenPath().resolve("build");
-    String board = targetConfig.get(new PlatformProperty()).board;
+    String board = targetConfig.get(PlatformProperty.INSTANCE).board;
     LFCommand cmd;
     if (board == null || board.startsWith("qemu") || board.equals("native_posix")) {
       cmd = commandFactory.createCommand("west", List.of("build", "-t", "run"), buildPath);
@@ -445,7 +445,7 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
    *     .cpp files instead of .c files and uses a C++ compiler to compiler the code.
    */
   static String getTargetFileName(String fileName, boolean cppMode, TargetConfig targetConfig) {
-    if (targetConfig.get(new PlatformProperty()).platform == Platform.ARDUINO) {
+    if (targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO) {
       return fileName + ".ino";
     }
     if (cppMode) {
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 20a49452c3..fd93686166 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -446,7 +446,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     }
 
     // If cmake is requested, generate the CMakeLists.txt
-    if (targetConfig.get(new PlatformProperty()).platform != Platform.ARDUINO) {
+    if (targetConfig.get(PlatformProperty.INSTANCE).platform != Platform.ARDUINO) {
       var cmakeFile = fileConfig.getSrcGenPath() + File.separator + "CMakeLists.txt";
       var sources =
           allTypeParameterizedReactors()
@@ -630,7 +630,7 @@ private void generateCodeFor(String lfModuleName) throws IOException {
       // is set to decentralized) or, if there are
       // downstream federates, will notify the RTI
       // that the specified logical time is complete.
-      if (CCppMode || targetConfig.get(new PlatformProperty()).platform == Platform.ARDUINO)
+      if (CCppMode || targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO)
         code.pr("extern \"C\"");
       code.pr(
           String.join(
@@ -870,8 +870,8 @@ private void generateReactorChildren(
   private void pickCompilePlatform() {
     var osName = System.getProperty("os.name").toLowerCase();
     // if platform target was set, use given platform instead
-    if (targetConfig.get(new PlatformProperty()).platform != Platform.AUTO) {
-      osName = targetConfig.get(new PlatformProperty()).platform.toString();
+    if (targetConfig.get(PlatformProperty.INSTANCE).platform != Platform.AUTO) {
+      osName = targetConfig.get(PlatformProperty.INSTANCE).platform.toString();
     } else if (Stream.of("mac", "darwin", "win", "nux").noneMatch(osName::contains)) {
       messageReporter.nowhere().error("Platform " + osName + " is not supported");
     }
@@ -882,7 +882,7 @@ protected void copyTargetFiles() throws IOException {
     // Copy the core lib
     String coreLib = LFGeneratorContext.BuildParm.EXTERNAL_RUNTIME_PATH.getValue(context);
     Path dest = fileConfig.getSrcGenPath();
-    if (targetConfig.get(new PlatformProperty()).platform == Platform.ARDUINO) {
+    if (targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO) {
       dest = dest.resolve("src");
     }
     if (coreLib != null) {
@@ -893,7 +893,7 @@ protected void copyTargetFiles() throws IOException {
     }
 
     // For the Zephyr target, copy default config and board files.
-    if (targetConfig.get(new PlatformProperty()).platform == Platform.ZEPHYR) {
+    if (targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ZEPHYR) {
       FileUtil.copyFromClassPath(
           "/lib/platform/zephyr/boards", fileConfig.getSrcGenPath(), false, false);
       FileUtil.copyFileFromClassPath(
@@ -904,7 +904,7 @@ protected void copyTargetFiles() throws IOException {
     }
 
     // For the pico src-gen, copy over vscode configurations for debugging
-    if (targetConfig.get(new PlatformProperty()).platform == Platform.RP2040) {
+    if (targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.RP2040) {
       Path vscodePath = fileConfig.getSrcGenPath().resolve(".vscode");
       // If pico-sdk-path not defined, this can be used to pull the sdk into src-gen
       FileUtil.copyFileFromClassPath(
@@ -951,7 +951,7 @@ private void generateReactorClass(TypeParameterizedReactor tpr) throws IOExcepti
         fileConfig.getSrcGenPath().resolve(headerName),
         true);
     var extension =
-        targetConfig.get(new PlatformProperty()).platform == Platform.ARDUINO
+        targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO
             ? ".ino"
             : CCppMode ? ".cpp" : ".c";
     FileUtil.writeToFile(
@@ -1942,7 +1942,7 @@ protected void setUpGeneralParameters() {
       // So that each separate compile knows about modal reactors, do this:
       CompileDefinitionsProperty.INSTANCE.update(targetConfig, Map.of("MODAL_REACTORS", "TRUE"));
     }
-    final var platformOptions = targetConfig.get(new PlatformProperty());
+    final var platformOptions = targetConfig.get(PlatformProperty.INSTANCE);
     if (targetConfig.get(new ThreadingProperty())
         && platformOptions.platform == Platform.ARDUINO
         && (platformOptions.board == null || !platformOptions.board.contains("mbed"))) {
diff --git a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
index 0cac08f682..a6fc315d3a 100644
--- a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
@@ -37,7 +37,7 @@ public String generateCode() {
 
   /** Generate the {@code main} function. */
   private String generateMainFunction() {
-    if (targetConfig.get(new PlatformProperty()).platform == Platform.ARDUINO) {
+    if (targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO) {
       /**
        * By default, we must have a serial begin line prior to calling lf_reactor_c_main due to
        * internal debugging messages requiring a print buffer. For the future, we can check whether
@@ -52,12 +52,12 @@ private String generateMainFunction() {
           "}\n",
           "// Arduino setup() and loop() functions",
           "void setup() {",
-          "\tSerial.begin(" + targetConfig.get(new PlatformProperty()).baudRate + ");",
+          "\tSerial.begin(" + targetConfig.get(PlatformProperty.INSTANCE).baudRate + ");",
           "\tlf_register_print_function(&_lf_arduino_print_message_function, LOG_LEVEL);",
           "\tlf_reactor_c_main(0, NULL);",
           "}\n",
           "void loop() {}");
-    } else if (targetConfig.get(new PlatformProperty()).platform == Platform.ZEPHYR) {
+    } else if (targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ZEPHYR) {
       // The Zephyr "runtime" does not terminate when main returns.
       //  Rather, {@code exit} should be called explicitly.
       return String.join(
@@ -66,7 +66,7 @@ private String generateMainFunction() {
           "   int res = lf_reactor_c_main(0, NULL);",
           "   exit(res);",
           "}");
-    } else if (targetConfig.get(new PlatformProperty()).platform == Platform.RP2040) {
+    } else if (targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.RP2040) {
       // Pico platform cannot use command line args.
       return String.join("\n", "int main(void) {", "   return lf_reactor_c_main(0, NULL);", "}");
     } else {
diff --git a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
index 14de2ae16d..dd0b5c5591 100644
--- a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
@@ -35,7 +35,7 @@ public class CPreambleGenerator {
   public static String generateIncludeStatements(TargetConfig targetConfig, boolean cppMode) {
 
     CodeBuilder code = new CodeBuilder();
-    if (cppMode || targetConfig.get(new PlatformProperty()).platform == Platform.ARDUINO) {
+    if (cppMode || targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO) {
       code.pr("extern \"C\" {");
     }
     code.pr("#include <limits.h>");
@@ -60,7 +60,7 @@ public static String generateIncludeStatements(TargetConfig targetConfig, boolea
       code.pr("#include \"include/core/federated/federate.h\"");
       code.pr("#include \"include/core/federated/net_common.h\"");
     }
-    if (cppMode || targetConfig.get(new PlatformProperty()).platform == Platform.ARDUINO) {
+    if (cppMode || targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO) {
       code.pr("}");
     }
     return code.toString();
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index efbf3eb6a4..9a4e8f530f 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -48,7 +48,6 @@
 import org.lflang.target.property.FastProperty;
 import org.lflang.target.property.LoggingProperty;
 import org.lflang.target.property.NoCompileProperty;
-import org.lflang.target.property.PlatformProperty;
 import org.lflang.target.property.PrintStatisticsProperty;
 import org.lflang.target.property.ProtobufsProperty;
 import org.lflang.target.property.Ros2DependenciesProperty;
@@ -92,7 +91,6 @@ public TargetConfig(Target target) {
         FastProperty.INSTANCE,
         LoggingProperty.INSTANCE,
         NoCompileProperty.INSTANCE,
-        new PlatformProperty(),
         new PrintStatisticsProperty(),
         new ProtobufsProperty(),
         new Ros2DependenciesProperty(),
diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index 73287acd83..988ae43ccd 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -24,9 +24,12 @@
  * Directive to specify the platform for cross code generation. This is either a string of the
  * platform or a dictionary of options that includes the string name.
  */
-public class PlatformProperty extends TargetProperty<PlatformOptions, UnionType> {
+public final class PlatformProperty extends TargetProperty<PlatformOptions, UnionType> {
 
-  public PlatformProperty() {
+  /** Singleton target property instance. */
+  public static final PlatformProperty INSTANCE = new PlatformProperty();
+
+  private PlatformProperty() {
     super(UnionType.PLATFORM_STRING_OR_DICTIONARY);
   }
 
diff --git a/core/src/main/java/org/lflang/util/ArduinoUtil.java b/core/src/main/java/org/lflang/util/ArduinoUtil.java
index a94097ee54..17331d986d 100644
--- a/core/src/main/java/org/lflang/util/ArduinoUtil.java
+++ b/core/src/main/java/org/lflang/util/ArduinoUtil.java
@@ -69,11 +69,11 @@ private LFCommand arduinoCompileCommand(FileConfig fileConfig, TargetConfig targ
         var fileWriter = new FileWriter(testScript.getAbsoluteFile(), true);
         BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
         String board =
-            targetConfig.get(new PlatformProperty()).board != null
-                ? targetConfig.get(new PlatformProperty()).board
+            targetConfig.get(PlatformProperty.INSTANCE).board != null
+                ? targetConfig.get(PlatformProperty.INSTANCE).board
                 : "arduino:avr:leonardo";
         String isThreaded =
-            targetConfig.get(new PlatformProperty()).board.contains("mbed")
+            targetConfig.get(PlatformProperty.INSTANCE).board.contains("mbed")
                 ? "-DLF_THREADED"
                 : "-DLF_UNTHREADED";
         bufferedWriter.write(
@@ -123,8 +123,8 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
             "SUCCESS: Compiling generated code for "
                 + fileConfig.name
                 + " finished with no errors.");
-    if (targetConfig.get(new PlatformProperty()).flash) {
-      if (targetConfig.get(new PlatformProperty()).port != null) {
+    if (targetConfig.get(PlatformProperty.INSTANCE).flash) {
+      if (targetConfig.get(PlatformProperty.INSTANCE).port != null) {
         messageReporter.nowhere().info("Invoking flash command for Arduino");
         LFCommand flash =
             commandFactory.createCommand(
@@ -132,9 +132,9 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
                 List.of(
                     "upload",
                     "-b",
-                    targetConfig.get(new PlatformProperty()).board,
+                    targetConfig.get(PlatformProperty.INSTANCE).board,
                     "-p",
-                    targetConfig.get(new PlatformProperty()).port),
+                    targetConfig.get(PlatformProperty.INSTANCE).port),
                 fileConfig.getSrcGenPath());
         if (flash == null) {
           messageReporter.nowhere().error("Could not create arduino-cli flash command.");
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 88b2633943..037a779a77 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -1594,21 +1594,21 @@ public void checkCargoDependencyProperty() throws Exception {
 
     //                                               vvvvvvvvvvv
     validator.assertError(
-        createModel(Target.C, prop, "{ dep: {/*empty*/} }"),
+        createModel(Target.Rust, prop, "{ dep: {/*empty*/} }"),
         LfPackage.eINSTANCE.getKeyValuePairs(),
         null,
         "Must specify one of 'version', 'path', or 'git'");
 
     //                                                vvvvvvvvvvv
     validator.assertError(
-        createModel(Target.C, prop, "{ dep: { unknown_key: \"\"} }"),
+        createModel(Target.Rust, prop, "{ dep: { unknown_key: \"\"} }"),
         LfPackage.eINSTANCE.getKeyValuePair(),
         null,
         "Unknown key: 'unknown_key'");
 
     //                                                          vvvv
     validator.assertError(
-        createModel(Target.C, prop, "{ dep: { features: \"\" } }"),
+        createModel(Target.Rust, prop, "{ dep: { features: \"\" } }"),
         LfPackage.eINSTANCE.getElement(),
         null,
         "Expected an array of strings for key 'features'");
@@ -1617,17 +1617,17 @@ public void checkCargoDependencyProperty() throws Exception {
   @Test
   public void checkPlatformProperty() throws Exception {
     validator.assertNoErrors(
-        createModel(Target.C, new PlatformProperty(), Platform.ARDUINO.toString()));
+        createModel(Target.C, PlatformProperty.INSTANCE, Platform.ARDUINO.toString()));
     validator.assertNoErrors(
         createModel(
-            Target.C, new PlatformProperty(), String.format("{name: %s}", Platform.ZEPHYR)));
+            Target.C, PlatformProperty.INSTANCE, String.format("{name: %s}", Platform.ZEPHYR)));
     validator.assertError(
-        createModel(Target.C, new PlatformProperty(), "foobar"),
+        createModel(Target.C, PlatformProperty.INSTANCE, "foobar"),
         LfPackage.eINSTANCE.getKeyValuePair(),
         null,
         new PlatformType().toString());
     validator.assertError(
-        createModel(Target.C, new PlatformProperty(), "{ name: foobar }"),
+        createModel(Target.C, PlatformProperty.INSTANCE, "{ name: foobar }"),
         LfPackage.eINSTANCE.getElement(),
         null,
         new PlatformType().toString());
diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index 65fb9b9975..5134ad2df7 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -70,9 +70,9 @@ public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
     test.getContext().getArgs().setProperty("tracing", "false");
     new ThreadingProperty().override(test.getContext().getTargetConfig(), false);
     // FIXME: use a record and override.
-    test.getContext().getTargetConfig().get(new PlatformProperty()).platform = Platform.ZEPHYR;
-    test.getContext().getTargetConfig().get(new PlatformProperty()).flash = false;
-    test.getContext().getTargetConfig().get(new PlatformProperty()).board = "qemu_cortex_m3";
+    test.getContext().getTargetConfig().get(PlatformProperty.INSTANCE).platform = Platform.ZEPHYR;
+    test.getContext().getTargetConfig().get(PlatformProperty.INSTANCE).flash = false;
+    test.getContext().getTargetConfig().get(PlatformProperty.INSTANCE).board = "qemu_cortex_m3";
 
     // FIXME: Zephyr  emulations fails with debug log-levels.
     LoggingProperty.INSTANCE.override(test.getContext().getTargetConfig(), LogLevel.WARN);
@@ -82,9 +82,9 @@ public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
 
   public static boolean makeZephyrCompatible(LFTest test) {
     test.getContext().getArgs().setProperty("tracing", "false");
-    test.getContext().getTargetConfig().get(new PlatformProperty()).platform = Platform.ZEPHYR;
-    test.getContext().getTargetConfig().get(new PlatformProperty()).flash = false;
-    test.getContext().getTargetConfig().get(new PlatformProperty()).board = "qemu_cortex_m3";
+    test.getContext().getTargetConfig().get(PlatformProperty.INSTANCE).platform = Platform.ZEPHYR;
+    test.getContext().getTargetConfig().get(PlatformProperty.INSTANCE).flash = false;
+    test.getContext().getTargetConfig().get(PlatformProperty.INSTANCE).board = "qemu_cortex_m3";
 
     // FIXME: Zephyr  emulations fails with debug log-levels.
     LoggingProperty.INSTANCE.override(test.getContext().getTargetConfig(), LogLevel.WARN);

From d8a9ac8fc89a35b8f071e890be3ef1e30d0db651 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 16 Oct 2023 18:49:02 -0700
Subject: [PATCH 1033/1114] More progress towards moving target property
 registration

---
 .../org/lflang/tests/runtime/CppRos2Test.java |  2 +-
 core/src/main/java/org/lflang/Target.java     | 23 +++++++++++++++----
 .../federated/generator/FedFileConfig.java    |  2 +-
 .../lflang/generator/c/CCmakeGenerator.java   |  2 +-
 .../org/lflang/generator/c/CGenerator.java    |  4 ++--
 .../generator/python/PythonGenerator.java     |  2 +-
 .../java/org/lflang/target/TargetConfig.java  | 10 --------
 .../property/PrintStatisticsProperty.java     |  9 +++++++-
 .../target/property/ProtobufsProperty.java    |  9 +++++++-
 .../property/Ros2DependenciesProperty.java    |  9 +++++---
 .../lflang/target/property/Ros2Property.java  |  9 +++++++-
 .../property/RuntimeVersionProperty.java      |  9 +++++++-
 .../target/property/SchedulerProperty.java    |  2 +-
 .../org/lflang/generator/cpp/CppGenerator.kt  |  6 ++---
 .../generator/cpp/CppPlatformGenerator.kt     |  2 +-
 .../generator/cpp/CppRos2PackageGenerator.kt  |  4 ++--
 .../cpp/CppStandaloneCmakeGenerator.kt        |  2 +-
 .../org/lflang/generator/rust/RustModel.kt    |  4 ++--
 .../org/lflang/generator/ts/TSGenerator.kt    |  8 +++----
 19 files changed, 76 insertions(+), 42 deletions(-)

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
index efb051944b..b21a932bdd 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
@@ -31,7 +31,7 @@ public void runWithRos2() {
         Message.DESC_ROS2,
         it -> true,
         it -> {
-          new Ros2Property().override(it.getContext().getTargetConfig(), true);
+          Ros2Property.INSTANCE.override(it.getContext().getTargetConfig(), true);
           return true;
         },
         TestLevel.EXECUTION,
diff --git a/core/src/main/java/org/lflang/Target.java b/core/src/main/java/org/lflang/Target.java
index 9ec0998bd3..166a047526 100644
--- a/core/src/main/java/org/lflang/Target.java
+++ b/core/src/main/java/org/lflang/Target.java
@@ -49,6 +49,11 @@
 import org.lflang.target.property.KeepaliveProperty;
 import org.lflang.target.property.NoRuntimeValidationProperty;
 import org.lflang.target.property.PlatformProperty;
+import org.lflang.target.property.PrintStatisticsProperty;
+import org.lflang.target.property.ProtobufsProperty;
+import org.lflang.target.property.Ros2DependenciesProperty;
+import org.lflang.target.property.Ros2Property;
+import org.lflang.target.property.RuntimeVersionProperty;
 import org.lflang.target.property.RustIncludeProperty;
 
 /**
@@ -590,14 +595,19 @@ public void initialize(TargetConfig config) {
           HierarchicalBinProperty.INSTANCE,
           KeepaliveProperty.INSTANCE,
           NoRuntimeValidationProperty.INSTANCE,
-          PlatformProperty.INSTANCE);
+          PlatformProperty.INSTANCE,
+          ProtobufsProperty.INSTANCE);
       case CPP -> config.register(
           BuildTypeProperty.INSTANCE,
           CmakeIncludeProperty.INSTANCE,
           CompilerProperty.INSTANCE,
           ExportDependencyGraphProperty.INSTANCE,
           ExportToYamlProperty.INSTANCE,
-          ExternalRuntimePathProperty.INSTANCE);
+          ExternalRuntimePathProperty.INSTANCE,
+          PrintStatisticsProperty.INSTANCE,
+          Ros2DependenciesProperty.INSTANCE,
+          Ros2Property.INSTANCE,
+          RuntimeVersionProperty.INSTANCE);
       case Python -> config.register(
           BuildTypeProperty.INSTANCE,
           ClockSyncModeProperty.INSTANCE,
@@ -607,7 +617,8 @@ public void initialize(TargetConfig config) {
           CoordinationProperty.INSTANCE,
           DockerProperty.INSTANCE,
           FilesProperty.INSTANCE,
-          KeepaliveProperty.INSTANCE);
+          KeepaliveProperty.INSTANCE,
+          ProtobufsProperty.INSTANCE);
       case Rust -> config.register(
           BuildTypeProperty.INSTANCE,
           CargoDependenciesProperty.INSTANCE,
@@ -618,12 +629,14 @@ public void initialize(TargetConfig config) {
           ExportDependencyGraphProperty.INSTANCE,
           ExternalRuntimePathProperty.INSTANCE,
           RustIncludeProperty.INSTANCE,
-          KeepaliveProperty.INSTANCE);
+          KeepaliveProperty.INSTANCE,
+          RuntimeVersionProperty.INSTANCE);
       case TS -> config.register(
           CoordinationOptionsProperty.INSTANCE,
           CoordinationProperty.INSTANCE,
           DockerProperty.INSTANCE,
-          KeepaliveProperty.INSTANCE);
+          KeepaliveProperty.INSTANCE,
+          ProtobufsProperty.INSTANCE);
     }
   }
 }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java b/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
index f3db2573c7..f7e8657b71 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
@@ -103,7 +103,7 @@ public void doClean() throws IOException {
    * the generated .lf file for the federate.
    */
   public void relativizePaths(FedTargetConfig targetConfig) {
-    List.of(new ProtobufsProperty(), FilesProperty.INSTANCE, CmakeIncludeProperty.INSTANCE)
+    List.of(ProtobufsProperty.INSTANCE, FilesProperty.INSTANCE, CmakeIncludeProperty.INSTANCE)
         .forEach(
             p -> {
               p.override(targetConfig, relativizePathList(targetConfig.get(p)));
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 0eeb27dd34..95b548088a 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -393,7 +393,7 @@ CodeBuilder generateCMakeCode(
     }
 
     // link protobuf
-    if (!targetConfig.get(new ProtobufsProperty()).isEmpty()) {
+    if (!targetConfig.get(ProtobufsProperty.INSTANCE).isEmpty()) {
       cMakeCode.pr("include(FindPackageHandleStandardArgs)");
       cMakeCode.pr("FIND_PATH( PROTOBUF_INCLUDE_DIR protobuf-c/protobuf-c.h)");
       cMakeCode.pr(
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index fd93686166..82ed04e96f 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -1995,7 +1995,7 @@ protected void setUpGeneralParameters() {
 
   protected void handleProtoFiles() {
     // Handle .proto files.
-    for (String file : targetConfig.get(new ProtobufsProperty())) {
+    for (String file : targetConfig.get(ProtobufsProperty.INSTANCE)) {
       this.processProtoFile(file);
     }
   }
@@ -2026,7 +2026,7 @@ protected String generateTopLevelPreambles(Reactor reactor) {
         .flatMap(it -> ASTUtils.allFileLevelPreambles(it).stream())
         .collect(Collectors.toSet())
         .forEach(it -> builder.pr(toText(it.getCode())));
-    for (String file : targetConfig.get(new ProtobufsProperty())) {
+    for (String file : targetConfig.get(ProtobufsProperty.INSTANCE)) {
       var dotIndex = file.lastIndexOf(".");
       var rootFilename = file;
       if (dotIndex > 0) {
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index c2b8421bb9..fe7e3b6bf4 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -278,7 +278,7 @@ protected String generateTopLevelPreambles(Reactor ignored) {
 
   @Override
   protected void handleProtoFiles() {
-    for (String name : targetConfig.get(new ProtobufsProperty())) {
+    for (String name : targetConfig.get(ProtobufsProperty.INSTANCE)) {
       this.processProtoFile(name);
       int dotIndex = name.lastIndexOf(".");
       String rootFilename = dotIndex > 0 ? name.substring(0, dotIndex) : name;
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 9a4e8f530f..bc19efbb1a 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -48,11 +48,6 @@
 import org.lflang.target.property.FastProperty;
 import org.lflang.target.property.LoggingProperty;
 import org.lflang.target.property.NoCompileProperty;
-import org.lflang.target.property.PrintStatisticsProperty;
-import org.lflang.target.property.ProtobufsProperty;
-import org.lflang.target.property.Ros2DependenciesProperty;
-import org.lflang.target.property.Ros2Property;
-import org.lflang.target.property.RuntimeVersionProperty;
 import org.lflang.target.property.SchedulerProperty;
 import org.lflang.target.property.SingleFileProjectProperty;
 import org.lflang.target.property.ThreadingProperty;
@@ -91,11 +86,6 @@ public TargetConfig(Target target) {
         FastProperty.INSTANCE,
         LoggingProperty.INSTANCE,
         NoCompileProperty.INSTANCE,
-        new PrintStatisticsProperty(),
-        new ProtobufsProperty(),
-        new Ros2DependenciesProperty(),
-        new Ros2Property(),
-        new RuntimeVersionProperty(),
         new SchedulerProperty(),
         new SingleFileProjectProperty(),
         new ThreadingProperty(),
diff --git a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
index d682f40a6a..78b2ffd681 100644
--- a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
@@ -4,7 +4,14 @@
 import org.lflang.Target;
 
 /** If true, instruct the runtime to collect and print execution statistics. */
-public class PrintStatisticsProperty extends BooleanProperty {
+public final class PrintStatisticsProperty extends BooleanProperty {
+
+  /** Singleton target property instance. */
+  public static final PrintStatisticsProperty INSTANCE = new PrintStatisticsProperty();
+
+  private PrintStatisticsProperty() {
+    super();
+  }
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java b/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
index 426723a93a..6845fb4c77 100644
--- a/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
@@ -7,7 +7,14 @@
  * Directive for specifying .proto files that need to be compiled and their code included in the
  * sources.
  */
-public class ProtobufsProperty extends FileListProperty {
+public final class ProtobufsProperty extends FileListProperty {
+
+  /** Singleton target property instance. */
+  public static final ProtobufsProperty INSTANCE = new ProtobufsProperty();
+
+  private ProtobufsProperty() {
+    super();
+  }
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
index ca5bfc1ffd..7dcd052083 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
@@ -13,9 +13,12 @@
 import org.lflang.target.property.type.ArrayType;
 
 /** Directive to specify additional ROS2 packages that this LF program depends on. */
-public class Ros2DependenciesProperty extends TargetProperty<List<String>, ArrayType> {
+public final class Ros2DependenciesProperty extends TargetProperty<List<String>, ArrayType> {
 
-  public Ros2DependenciesProperty() {
+  /** Singleton target property instance. */
+  public static final Ros2DependenciesProperty INSTANCE = new Ros2DependenciesProperty();
+
+  private Ros2DependenciesProperty() {
     super(ArrayType.STRING_ARRAY);
   }
 
@@ -41,7 +44,7 @@ public List<Target> supportedTargets() {
 
   @Override
   public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
-    var ros2enabled = TargetProperty.getKeyValuePair(ast, new Ros2Property());
+    var ros2enabled = TargetProperty.getKeyValuePair(ast, Ros2Property.INSTANCE);
     if (pair != null && (ros2enabled == null || !ASTUtils.toBoolean(ros2enabled.getValue()))) {
       reporter
           .at(pair, Literals.KEY_VALUE_PAIR__NAME)
diff --git a/core/src/main/java/org/lflang/target/property/Ros2Property.java b/core/src/main/java/org/lflang/target/property/Ros2Property.java
index a9c0b02431..f764fa9ce4 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2Property.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2Property.java
@@ -4,7 +4,14 @@
 import org.lflang.Target;
 
 /** If true, generate ROS2 specific code. */
-public class Ros2Property extends BooleanProperty {
+public final class Ros2Property extends BooleanProperty {
+
+  /** Singleton target property instance. */
+  public static final Ros2Property INSTANCE = new Ros2Property();
+
+  private Ros2Property() {
+    super();
+  }
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
index ceb93cfc52..eda304a216 100644
--- a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
@@ -4,7 +4,14 @@
 import org.lflang.Target;
 
 /** Directive for specifying a specific version of the reactor runtime library. */
-public class RuntimeVersionProperty extends StringProperty {
+public final class RuntimeVersionProperty extends StringProperty {
+
+  /** Singleton target property instance. */
+  public static final RuntimeVersionProperty INSTANCE = new RuntimeVersionProperty();
+
+  private RuntimeVersionProperty() {
+    super();
+  }
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
index d981009f58..7889c23e29 100644
--- a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
@@ -14,7 +14,7 @@
 import org.lflang.target.property.type.SchedulerType.Scheduler;
 
 /** Directive for specifying the use of a specific runtime scheduler. */
-public class SchedulerProperty extends TargetProperty<Scheduler, SchedulerType> {
+public final class SchedulerProperty extends TargetProperty<Scheduler, SchedulerType> {
 
   public SchedulerProperty() {
     super(new SchedulerType());
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
index 119fa5e449..ec97ea9b80 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
@@ -67,7 +67,7 @@ class CppGenerator(
 
         // create a platform-specific generator
         val platformGenerator: CppPlatformGenerator =
-            if (targetConfig.get(Ros2Property())) CppRos2Generator(this) else CppStandaloneGenerator(this)
+            if (targetConfig.get(Ros2Property.INSTANCE)) CppRos2Generator(this) else CppStandaloneGenerator(this)
 
         // generate all core files
         generateFiles(platformGenerator.srcGenPath)
@@ -130,8 +130,8 @@ class CppGenerator(
 
         // copy or download reactor-cpp
         if (!targetConfig.isSet(ExternalRuntimePathProperty.INSTANCE)) {
-            if (targetConfig.isSet(RuntimeVersionProperty())) {
-                fetchReactorCpp(targetConfig.get(RuntimeVersionProperty()))
+            if (targetConfig.isSet(RuntimeVersionProperty.INSTANCE)) {
+                fetchReactorCpp(targetConfig.get(RuntimeVersionProperty.INSTANCE))
             } else {
                 FileUtil.copyFromClassPath(
                     "$libDir/reactor-cpp",
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
index a9afc8a376..f52bf0a9f3 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
@@ -32,7 +32,7 @@ abstract class CppPlatformGenerator(protected val generator: CppGenerator) {
         get() = listOf(
             "-DCMAKE_BUILD_TYPE=${targetConfig.get(BuildTypeProperty.INSTANCE)}",
             "-DREACTOR_CPP_VALIDATE=${if (targetConfig.get(NoRuntimeValidationProperty.INSTANCE)) "OFF" else "ON"}",
-            "-DREACTOR_CPP_PRINT_STATISTICS=${if (targetConfig.get(PrintStatisticsProperty())) "ON" else "OFF"}",
+            "-DREACTOR_CPP_PRINT_STATISTICS=${if (targetConfig.get(PrintStatisticsProperty.INSTANCE)) "ON" else "OFF"}",
             "-DREACTOR_CPP_TRACE=${if (targetConfig.get(TracingProperty()).isEnabled) "ON" else "OFF"}",
             "-DREACTOR_CPP_LOG_LEVEL=${targetConfig.get(LoggingProperty.INSTANCE).severity}",
             "-DLF_SRC_PKG_PATH=${fileConfig.srcPkgPath}",
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
index 5f3aac1a84..ea7568e2c4 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2PackageGenerator.kt
@@ -13,11 +13,11 @@ import java.nio.file.Path
 class CppRos2PackageGenerator(generator: CppGenerator, private val nodeName: String) {
     private val fileConfig = generator.fileConfig
     private val targetConfig = generator.targetConfig
-    val reactorCppSuffix: String = if (targetConfig.isSet(RuntimeVersionProperty())) targetConfig.get(RuntimeVersionProperty()) else "default"
+    val reactorCppSuffix: String = if (targetConfig.isSet(RuntimeVersionProperty.INSTANCE)) targetConfig.get(RuntimeVersionProperty.INSTANCE) else "default"
     val reactorCppName = "reactor-cpp-$reactorCppSuffix"
     private val dependencies =
         listOf("rclcpp", "rclcpp_components", reactorCppName) + (
-                if (targetConfig.isSet(Ros2DependenciesProperty())) targetConfig.get(Ros2DependenciesProperty()) else listOf<String>())
+                if (targetConfig.isSet(Ros2DependenciesProperty.INSTANCE)) targetConfig.get(Ros2DependenciesProperty.INSTANCE) else listOf<String>())
 
     @Suppress("PrivatePropertyName") // allows us to use capital S as variable name below
     private val S = '$' // a little trick to escape the dollar sign with $S
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
index c767aa892b..26790cc48d 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
@@ -141,7 +141,7 @@ class CppStandaloneCmakeGenerator(private val targetConfig: TargetConfig, privat
 
         val reactorCppTarget = when {
             targetConfig.isSet(ExternalRuntimePathProperty.INSTANCE) -> "reactor-cpp"
-            targetConfig.isSet(RuntimeVersionProperty())      -> "reactor-cpp-${targetConfig.get(RuntimeVersionProperty())}"
+            targetConfig.isSet(RuntimeVersionProperty.INSTANCE)      -> "reactor-cpp-${targetConfig.get(RuntimeVersionProperty.INSTANCE)}"
             else                                   -> "reactor-cpp-default"
         }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
index 7b3e6637a3..bd69d96f0a 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
@@ -498,9 +498,9 @@ object RustModelBuilder {
 
             if (targetConfig.isSet(ExternalRuntimePathProperty.INSTANCE)) {
                 spec.localPath = targetConfig.get(ExternalRuntimePathProperty.INSTANCE)
-            } else if (targetConfig.isSet(RuntimeVersionProperty())) {
+            } else if (targetConfig.isSet(RuntimeVersionProperty.INSTANCE)) {
                 spec.gitRepo = RustEmitterBase.runtimeGitUrl
-                spec.rev = targetConfig.get(RuntimeVersionProperty())
+                spec.rev = targetConfig.get(RuntimeVersionProperty.INSTANCE)
             } else {
                 spec.useDefaultRuntimePath()
             }
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
index 759aa559cd..8c764ae58d 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -140,7 +140,7 @@ class TSGenerator(
                 context.unsuccessfulFinish()
                 return
             }
-            if (targetConfig.get(ProtobufsProperty()).size != 0) {
+            if (targetConfig.get(ProtobufsProperty.INSTANCE).size != 0) {
                 protoc()
             } else {
                 println("No .proto files have been imported. Skipping protocol buffer compilation.")
@@ -244,7 +244,7 @@ class TSGenerator(
         val tsCode = StringBuilder()
 
         val preambleGenerator = TSImportPreambleGenerator(fileConfig.srcFile,
-            targetConfig.get(ProtobufsProperty()), preambles)
+            targetConfig.get(ProtobufsProperty.INSTANCE), preambles)
         tsCode.append(preambleGenerator.generatePreamble())
 
         val parameterGenerator = TSParameterPreambleGenerator(fileConfig, targetConfig, reactors)
@@ -348,7 +348,7 @@ class TSGenerator(
     }
 
     private fun installProtoBufsIfNeeded(pnpmIsAvailable: Boolean, cwd: Path, cancelIndicator: CancelIndicator) {
-        if (targetConfig.get(ProtobufsProperty()).size != 0) {
+        if (targetConfig.get(ProtobufsProperty.INSTANCE).size != 0) {
             commandFactory.createCommand(
                 if (pnpmIsAvailable) "pnpm" else "npm",
                 listOf("install", "google-protobuf"),
@@ -375,7 +375,7 @@ class TSGenerator(
                 "--ts_out=$tsOutPath"
             )
         )
-        protocArgs.addAll(targetConfig.get(ProtobufsProperty()))
+        protocArgs.addAll(targetConfig.get(ProtobufsProperty.INSTANCE))
         val protoc = commandFactory.createCommand("protoc", protocArgs, fileConfig.srcPath)
 
         if (protoc == null) {

From 5d898289b8af3e3f049d9fa29e956cfa18a42812 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 17 Oct 2023 00:42:17 -0700
Subject: [PATCH 1034/1114] Move registration of remaining target properties to
 Target class

---
 .../lflang/tests/runtime/CVerifierTest.java   |  2 +-
 core/src/main/java/org/lflang/Target.java     | 28 ++++++++++++---
 .../federated/extensions/CExtension.java      |  4 +--
 .../federated/generator/FedTargetConfig.java  |  2 +-
 .../launcher/FedLauncherGenerator.java        |  2 +-
 .../org/lflang/generator/GeneratorBase.java   |  4 +--
 .../lflang/generator/c/CCmakeGenerator.java   |  7 ++--
 .../c/CEnvironmentFunctionGenerator.java      |  2 +-
 .../org/lflang/generator/c/CGenerator.java    | 36 +++++++++----------
 .../generator/c/CMainFunctionGenerator.java   |  6 ++--
 .../generator/c/CPreambleGenerator.java       | 12 +++----
 .../generator/c/CTriggerObjectsGenerator.java |  2 +-
 .../java/org/lflang/target/TargetConfig.java  | 14 ++------
 .../target/property/FedSetupProperty.java     |  5 ++-
 .../target/property/PlatformProperty.java     |  2 +-
 .../target/property/SchedulerProperty.java    |  5 ++-
 .../property/SingleFileProjectProperty.java   |  9 ++++-
 .../target/property/ThreadingProperty.java    |  7 ++++
 .../target/property/TimeOutProperty.java      |  5 ++-
 .../target/property/TracingProperty.java      |  7 ++--
 .../target/property/VerifyProperty.java       |  9 ++++-
 .../target/property/WorkersProperty.java      |  7 ++--
 .../generator/cpp/CppRos2NodeGenerator.kt     |  4 +--
 .../cpp/CppStandaloneMainGenerator.kt         |  4 +--
 .../org/lflang/generator/rust/RustModel.kt    | 14 ++++----
 .../ts/TSParameterPreambleGenerator.kt        |  2 +-
 .../java/org/lflang/tests/Configurators.java  |  2 +-
 27 files changed, 125 insertions(+), 78 deletions(-)

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
index 86d61464b0..e888854318 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
@@ -22,7 +22,7 @@ public void runVerifierTests() {
         Message.DESC_VERIFIER,
         TestRegistry.TestCategory.VERIFIER::equals,
         test -> {
-          new VerifyProperty().override(test.getContext().getTargetConfig(), true);
+          VerifyProperty.INSTANCE.override(test.getContext().getTargetConfig(), true);
           return true;
         },
         TestLevel.BUILD,
diff --git a/core/src/main/java/org/lflang/Target.java b/core/src/main/java/org/lflang/Target.java
index 166a047526..33ddf7ea6e 100644
--- a/core/src/main/java/org/lflang/Target.java
+++ b/core/src/main/java/org/lflang/Target.java
@@ -55,6 +55,12 @@
 import org.lflang.target.property.Ros2Property;
 import org.lflang.target.property.RuntimeVersionProperty;
 import org.lflang.target.property.RustIncludeProperty;
+import org.lflang.target.property.SchedulerProperty;
+import org.lflang.target.property.SingleFileProjectProperty;
+import org.lflang.target.property.ThreadingProperty;
+import org.lflang.target.property.TracingProperty;
+import org.lflang.target.property.WorkersProperty;
+import org.lflang.target.property.type.VerifyProperty;
 
 /**
  * Enumeration of targets and their associated properties.
@@ -596,7 +602,12 @@ public void initialize(TargetConfig config) {
           KeepaliveProperty.INSTANCE,
           NoRuntimeValidationProperty.INSTANCE,
           PlatformProperty.INSTANCE,
-          ProtobufsProperty.INSTANCE);
+          ProtobufsProperty.INSTANCE,
+          SchedulerProperty.INSTANCE,
+          ThreadingProperty.INSTANCE,
+          TracingProperty.INSTANCE,
+          VerifyProperty.INSTANCE,
+          WorkersProperty.INSTANCE);
       case CPP -> config.register(
           BuildTypeProperty.INSTANCE,
           CmakeIncludeProperty.INSTANCE,
@@ -607,7 +618,9 @@ public void initialize(TargetConfig config) {
           PrintStatisticsProperty.INSTANCE,
           Ros2DependenciesProperty.INSTANCE,
           Ros2Property.INSTANCE,
-          RuntimeVersionProperty.INSTANCE);
+          RuntimeVersionProperty.INSTANCE,
+          TracingProperty.INSTANCE,
+          WorkersProperty.INSTANCE);
       case Python -> config.register(
           BuildTypeProperty.INSTANCE,
           ClockSyncModeProperty.INSTANCE,
@@ -618,7 +631,11 @@ public void initialize(TargetConfig config) {
           DockerProperty.INSTANCE,
           FilesProperty.INSTANCE,
           KeepaliveProperty.INSTANCE,
-          ProtobufsProperty.INSTANCE);
+          ProtobufsProperty.INSTANCE,
+          SchedulerProperty.INSTANCE,
+          ThreadingProperty.INSTANCE,
+          TracingProperty.INSTANCE,
+          WorkersProperty.INSTANCE);
       case Rust -> config.register(
           BuildTypeProperty.INSTANCE,
           CargoDependenciesProperty.INSTANCE,
@@ -630,7 +647,10 @@ public void initialize(TargetConfig config) {
           ExternalRuntimePathProperty.INSTANCE,
           RustIncludeProperty.INSTANCE,
           KeepaliveProperty.INSTANCE,
-          RuntimeVersionProperty.INSTANCE);
+          RuntimeVersionProperty.INSTANCE,
+          SingleFileProjectProperty.INSTANCE,
+          ThreadingProperty.INSTANCE,
+          WorkersProperty.INSTANCE);
       case TS -> config.register(
           CoordinationOptionsProperty.INSTANCE,
           CoordinationProperty.INSTANCE,
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index ca0552b85e..1d50d14825 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -93,10 +93,10 @@ public void initializeTargetConfig(
     // Also, create the RTI C file and the launcher script.
     // Handle target parameters.
     // If the program is federated, then ensure that threading is enabled.
-    new ThreadingProperty().override(federate.targetConfig, true);
+    ThreadingProperty.INSTANCE.override(federate.targetConfig, true);
 
     // Include the fed setup file for this federate in the target property
-    new FedSetupProperty().override(federate.targetConfig, getPreamblePath(federate));
+    FedSetupProperty.INSTANCE.override(federate.targetConfig, getPreamblePath(federate));
   }
 
   /** Generate a cmake-include file for {@code federate} if needed. */
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
index 1a9d8188d9..4a618d0823 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
@@ -43,7 +43,7 @@ public FedTargetConfig(LFGeneratorContext context, Resource federateResource) {
         context.getArgs(),
         context.getErrorReporter());
 
-    this.register(new FedSetupProperty());
+    this.register(FedSetupProperty.INSTANCE);
 
     mergeImportedConfig(
         federateResource, context.getFileConfig().resource, context.getErrorReporter());
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index f289918b7d..0986ad78dc 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -341,7 +341,7 @@ private String getRtiCommand(List<FederateInstance> federates, boolean isRemote)
     if (targetConfig.get(AuthProperty.INSTANCE)) {
       commands.add("                        -a \\");
     }
-    if (targetConfig.get(new TracingProperty()).isEnabled()) {
+    if (targetConfig.get(TracingProperty.INSTANCE).isEnabled()) {
       commands.add("                        -t \\");
     }
     commands.addAll(
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 50cad851d5..c44767fed9 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -267,7 +267,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
 
     // Check for the existence and support of watchdogs
     hasWatchdogs = IterableExtensions.exists(reactors, it -> !it.getWatchdogs().isEmpty());
-    checkWatchdogSupport(targetConfig.get(new ThreadingProperty()) && getTarget() == Target.C);
+    checkWatchdogSupport(targetConfig.get(ThreadingProperty.INSTANCE) && getTarget() == Target.C);
     additionalPostProcessingForModes();
   }
 
@@ -651,7 +651,7 @@ private void runVerifierIfPropertiesDetected(Resource resource, LFGeneratorConte
       uclidGenerator.doGenerate(resource, lfContext);
 
       // Check the generated uclid files.
-      if (uclidGenerator.targetConfig.get(new VerifyProperty())) {
+      if (uclidGenerator.targetConfig.get(VerifyProperty.INSTANCE)) {
 
         // Check if Uclid5 and Z3 are installed.
         if (commandFactory.createCommand("uclid", List.of()) == null
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 95b548088a..c860f685a8 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -355,7 +355,8 @@ CodeBuilder generateCMakeCode(
       cMakeCode.newLine();
     }
 
-    if (targetConfig.get(new ThreadingProperty()) && platformOptions.platform != Platform.ZEPHYR) {
+    if (targetConfig.get(ThreadingProperty.INSTANCE)
+        && platformOptions.platform != Platform.ZEPHYR) {
       // If threaded computation is requested, add the threads option.
       cMakeCode.pr("# Find threads and link to it");
       cMakeCode.pr("find_package(Threads REQUIRED)");
@@ -365,11 +366,11 @@ CodeBuilder generateCMakeCode(
 
     // Add additional flags so runtime can distinguish between multi-threaded and single-threaded
     // mode
-    if (targetConfig.get(new ThreadingProperty())) {
+    if (targetConfig.get(ThreadingProperty.INSTANCE)) {
       cMakeCode.pr("# Set the number of workers to enable threading/tracing");
       cMakeCode.pr(
           "target_compile_definitions(${LF_MAIN_TARGET} PUBLIC NUMBER_OF_WORKERS="
-              + targetConfig.get(new WorkersProperty())
+              + targetConfig.get(WorkersProperty.INSTANCE)
               + ")");
       cMakeCode.newLine();
       cMakeCode.pr("# Set flag to indicate a multi-threaded runtime");
diff --git a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
index b09d29c330..9b01a5a429 100644
--- a/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CEnvironmentFunctionGenerator.java
@@ -90,7 +90,7 @@ private String generateCreateEnvironments() {
 
       // Figure out the name of the trace file
       String traceFileName = "NULL";
-      var tracing = targetConfig.get(new TracingProperty());
+      var tracing = targetConfig.get(TracingProperty.INSTANCE);
       if (tracing.isEnabled()) {
         if (tracing.traceFileName != null) {
           if (enclave.isMainOrFederated()) {
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 82ed04e96f..f3b1fb8f2a 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -360,7 +360,7 @@ public void accommodatePhysicalActionsIfPresent() {
           // If the unthreaded runtime is not requested by the user, use the threaded runtime
           // instead
           // because it is the only one currently capable of handling asynchronous events.
-          var threading = new ThreadingProperty();
+          var threading = ThreadingProperty.INSTANCE;
           if (!targetConfig.get(threading) && !targetConfig.isSet(threading)) {
             threading.override(targetConfig, true);
             String message =
@@ -473,7 +473,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
       try {
         Path include = fileConfig.getSrcGenPath().resolve("include/");
         Path src = fileConfig.getSrcGenPath().resolve("src/");
-        FileUtil.arduinoDeleteHelper(src, targetConfig.get(new ThreadingProperty()));
+        FileUtil.arduinoDeleteHelper(src, targetConfig.get(ThreadingProperty.INSTANCE));
         FileUtil.relativeIncludeHelper(src, include, messageReporter);
         FileUtil.relativeIncludeHelper(include, include, messageReporter);
       } catch (IOException e) {
@@ -611,9 +611,9 @@ private void generateCodeFor(String lfModuleName) throws IOException {
 
       code.pr(envFuncGen.generateDefinitions());
 
-      if (targetConfig.isSet(new FedSetupProperty())) {
+      if (targetConfig.isSet(FedSetupProperty.INSTANCE)) {
         if (targetLanguageIsCpp()) code.pr("extern \"C\" {");
-        code.pr("#include \"" + targetConfig.get(new FedSetupProperty()) + "\"");
+        code.pr("#include \"" + targetConfig.get(FedSetupProperty.INSTANCE) + "\"");
         if (targetLanguageIsCpp()) code.pr("}");
       }
 
@@ -671,11 +671,11 @@ protected String getConflictingConnectionsInModalReactorsBody(String source, Str
   private void pickScheduler() {
     // Don't use a scheduler that does not prioritize reactions based on deadlines
     // if the program contains a deadline (handler). Use the GEDF_NP scheduler instead.
-    if (!targetConfig.get(new SchedulerProperty()).prioritizesDeadline()) {
+    if (!targetConfig.get(SchedulerProperty.INSTANCE).prioritizesDeadline()) {
       // Check if a deadline is assigned to any reaction
       if (hasDeadlines(reactors)) {
-        if (!targetConfig.isSet(new SchedulerProperty())) {
-          new SchedulerProperty().override(targetConfig, Scheduler.GEDF_NP);
+        if (!targetConfig.isSet(SchedulerProperty.INSTANCE)) {
+          SchedulerProperty.INSTANCE.override(targetConfig, Scheduler.GEDF_NP);
         }
       }
     }
@@ -745,14 +745,14 @@ protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
         messageReporter,
         true);
 
-    if (!StringExtensions.isNullOrEmpty(targetConfig.get(new FedSetupProperty()))) {
+    if (!StringExtensions.isNullOrEmpty(targetConfig.get(FedSetupProperty.INSTANCE))) {
       try {
-        var file = targetConfig.get(new FedSetupProperty());
+        var file = targetConfig.get(FedSetupProperty.INSTANCE);
         FileUtil.copyFile(fileConfig.srcFile.getParent().resolve(file), destination.resolve(file));
       } catch (IOException e) {
         messageReporter
             .nowhere()
-            .error("Failed to find _fed_setup file " + targetConfig.get(new FedSetupProperty()));
+            .error("Failed to find _fed_setup file " + targetConfig.get(FedSetupProperty.INSTANCE));
       }
     }
   }
@@ -1377,7 +1377,7 @@ private void recordBuiltinTriggers(ReactorInstance instance) {
           foundOne = true;
           enclaveInfo.numShutdownReactions += reactor.getTotalWidth();
 
-          if (targetConfig.get(new TracingProperty()).isEnabled()) {
+          if (targetConfig.get(TracingProperty.INSTANCE).isEnabled()) {
             var description = CUtil.getShortenedName(reactor);
             var reactorRef = CUtil.reactorRef(reactor);
             var envTraceRef = CUtil.getEnvironmentStruct(reactor) + ".trace";
@@ -1660,7 +1660,7 @@ public static String variableStructType(TriggerInstance<?> portOrAction) {
    * @param instance The reactor instance.
    */
   private void generateTraceTableEntries(ReactorInstance instance) {
-    if (targetConfig.get(new TracingProperty()).isEnabled()) {
+    if (targetConfig.get(TracingProperty.INSTANCE).isEnabled()) {
       initializeTriggerObjects.pr(CTracingGenerator.generateTraceTableEntries(instance));
     }
   }
@@ -1943,7 +1943,7 @@ protected void setUpGeneralParameters() {
       CompileDefinitionsProperty.INSTANCE.update(targetConfig, Map.of("MODAL_REACTORS", "TRUE"));
     }
     final var platformOptions = targetConfig.get(PlatformProperty.INSTANCE);
-    if (targetConfig.get(new ThreadingProperty())
+    if (targetConfig.get(ThreadingProperty.INSTANCE)
         && platformOptions.platform == Platform.ARDUINO
         && (platformOptions.board == null || !platformOptions.board.contains("mbed"))) {
       // non-MBED boards should not use threading
@@ -1952,7 +1952,7 @@ protected void setUpGeneralParameters() {
           .info(
               "Threading is incompatible on your current Arduino flavor. Setting threading to"
                   + " false.");
-      new ThreadingProperty().override(targetConfig, false);
+      ThreadingProperty.INSTANCE.override(targetConfig, false);
     }
 
     if (platformOptions.platform == Platform.ARDUINO
@@ -1969,7 +1969,7 @@ protected void setUpGeneralParameters() {
     }
 
     if (platformOptions.platform == Platform.ZEPHYR
-        && targetConfig.get(new ThreadingProperty())
+        && targetConfig.get(ThreadingProperty.INSTANCE)
         && platformOptions.userThreads >= 0) {
       targetConfig
           .get(CompileDefinitionsProperty.INSTANCE)
@@ -1982,12 +1982,12 @@ protected void setUpGeneralParameters() {
                   + " This option will be ignored.");
     }
 
-    if (targetConfig.get(new ThreadingProperty())) { // FIXME: This logic is duplicated in CMake
+    if (targetConfig.get(ThreadingProperty.INSTANCE)) { // FIXME: This logic is duplicated in CMake
       pickScheduler();
       // FIXME: this and pickScheduler should be combined.
       var map = new HashMap<String, String>();
-      map.put("SCHEDULER", targetConfig.get(new SchedulerProperty()).getSchedulerCompileDef());
-      map.put("NUMBER_OF_WORKERS", String.valueOf(targetConfig.get(new WorkersProperty())));
+      map.put("SCHEDULER", targetConfig.get(SchedulerProperty.INSTANCE).getSchedulerCompileDef());
+      map.put("NUMBER_OF_WORKERS", String.valueOf(targetConfig.get(WorkersProperty.INSTANCE)));
       CompileDefinitionsProperty.INSTANCE.update(targetConfig, map);
     }
     pickCompilePlatform();
diff --git a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
index a6fc315d3a..03d340ffd3 100644
--- a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
@@ -109,10 +109,10 @@ private void parseTargetParameters() {
       runCommand.add("-k");
       runCommand.add("true");
     }
-    if (targetConfig.get(new TimeOutProperty()) != null) {
+    if (targetConfig.isSet(TimeOutProperty.INSTANCE)) {
       runCommand.add("-o");
-      runCommand.add(targetConfig.get(new TimeOutProperty()).getMagnitude() + "");
-      runCommand.add(targetConfig.get(new TimeOutProperty()).unit.getCanonicalName());
+      runCommand.add(targetConfig.get(TimeOutProperty.INSTANCE).getMagnitude() + "");
+      runCommand.add(targetConfig.get(TimeOutProperty.INSTANCE).unit.getCanonicalName());
     }
     // The runCommand has a first entry that is ignored but needed.
     if (runCommand.size() > 0) {
diff --git a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
index dd0b5c5591..b55aad3792 100644
--- a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
@@ -44,11 +44,11 @@ public static String generateIncludeStatements(TargetConfig targetConfig, boolea
         .forEach(it -> code.pr("#include " + StringUtil.addDoubleQuotes(it)));
     code.pr("#include \"include/core/reactor.h\"");
     code.pr("#include \"include/core/reactor_common.h\"");
-    if (targetConfig.get(new ThreadingProperty())) {
+    if (targetConfig.get(ThreadingProperty.INSTANCE)) {
       code.pr("#include \"include/core/threaded/scheduler.h\"");
     }
 
-    if (targetConfig.get(new TracingProperty()).isEnabled()) {
+    if (targetConfig.get(TracingProperty.INSTANCE).isEnabled()) {
       code.pr("#include \"include/core/trace.h\"");
     }
     code.pr("#include \"include/core/mixed_radix.h\"");
@@ -56,7 +56,7 @@ public static String generateIncludeStatements(TargetConfig targetConfig, boolea
     code.pr("#include \"include/core/environment.h\"");
 
     code.pr("int lf_reactor_c_main(int argc, const char* argv[]);");
-    if (targetConfig.isSet(new FedSetupProperty())) {
+    if (targetConfig.isSet(FedSetupProperty.INSTANCE)) {
       code.pr("#include \"include/core/federated/federate.h\"");
       code.pr("#include \"include/core/federated/net_common.h\"");
     }
@@ -68,7 +68,7 @@ public static String generateIncludeStatements(TargetConfig targetConfig, boolea
 
   public static String generateDefineDirectives(TargetConfig targetConfig, Path srcGenPath) {
     int logLevel = targetConfig.get(LoggingProperty.INSTANCE).ordinal();
-    var tracing = targetConfig.get(new TracingProperty());
+    var tracing = targetConfig.get(TracingProperty.INSTANCE);
     CodeBuilder code = new CodeBuilder();
     // TODO: Get rid of all of these
     code.pr("#define LOG_LEVEL " + logLevel);
@@ -84,12 +84,12 @@ public static String generateDefineDirectives(TargetConfig targetConfig, Path sr
     //     ));
     // }
 
-    if (targetConfig.get(new ThreadingProperty())) {
+    if (targetConfig.get(ThreadingProperty.INSTANCE)) {
       definitions.put("LF_THREADED", "1");
     } else {
       definitions.put("LF_UNTHREADED", "1");
     }
-    if (targetConfig.get(new ThreadingProperty())) {
+    if (targetConfig.get(ThreadingProperty.INSTANCE)) {
       definitions.put("LF_THREADED", "1");
     } else {
       definitions.put("LF_UNTHREADED", "1");
diff --git a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
index 16130a3152..8dcbda1e3a 100644
--- a/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
@@ -102,7 +102,7 @@ public static String generateInitializeTriggerObjects(
   /** Generate code to initialize the scheduler for the threaded C runtime. */
   public static String generateSchedulerInitializerMain(
       ReactorInstance main, TargetConfig targetConfig) {
-    if (!targetConfig.get(new ThreadingProperty())) {
+    if (!targetConfig.get(ThreadingProperty.INSTANCE)) {
       return "";
     }
     var code = new CodeBuilder();
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index bc19efbb1a..f22090e810 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -48,14 +48,9 @@
 import org.lflang.target.property.FastProperty;
 import org.lflang.target.property.LoggingProperty;
 import org.lflang.target.property.NoCompileProperty;
-import org.lflang.target.property.SchedulerProperty;
-import org.lflang.target.property.SingleFileProjectProperty;
-import org.lflang.target.property.ThreadingProperty;
 import org.lflang.target.property.TimeOutProperty;
 import org.lflang.target.property.TracingProperty;
-import org.lflang.target.property.WorkersProperty;
 import org.lflang.target.property.type.TargetPropertyType;
-import org.lflang.target.property.type.VerifyProperty;
 import org.lflang.validation.ValidatorMessageReporter;
 
 /**
@@ -86,13 +81,8 @@ public TargetConfig(Target target) {
         FastProperty.INSTANCE,
         LoggingProperty.INSTANCE,
         NoCompileProperty.INSTANCE,
-        new SchedulerProperty(),
-        new SingleFileProjectProperty(),
-        new ThreadingProperty(),
-        new TimeOutProperty(),
-        new TracingProperty(),
-        new VerifyProperty(),
-        new WorkersProperty());
+        TimeOutProperty.INSTANCE,
+        TracingProperty.INSTANCE);
   }
 
   public TargetConfig(TargetDecl target, Properties cliArgs, MessageReporter messageReporter) {
diff --git a/core/src/main/java/org/lflang/target/property/FedSetupProperty.java b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
index b532448bfd..48c6544fb7 100644
--- a/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
@@ -15,7 +15,10 @@
  */
 public class FedSetupProperty extends TargetProperty<String, PrimitiveType> {
 
-  public FedSetupProperty() {
+  /** Singleton target property instance. */
+  public static final FedSetupProperty INSTANCE = new FedSetupProperty();
+
+  private FedSetupProperty() {
     super(PrimitiveType.FILE);
   }
 
diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index 988ae43ccd..04de0d6562 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -80,7 +80,7 @@ public List<Target> supportedTargets() {
   @Override
   public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
     var config = fromAst(pair.getValue(), reporter);
-    var threading = TargetProperty.getKeyValuePair(ast, new ThreadingProperty());
+    var threading = TargetProperty.getKeyValuePair(ast, ThreadingProperty.INSTANCE);
     if (threading != null && config.platform == Platform.RP2040) {
       reporter
           .at(pair, Literals.KEY_VALUE_PAIR__VALUE)
diff --git a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
index 7889c23e29..404235b722 100644
--- a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
@@ -16,7 +16,10 @@
 /** Directive for specifying the use of a specific runtime scheduler. */
 public final class SchedulerProperty extends TargetProperty<Scheduler, SchedulerType> {
 
-  public SchedulerProperty() {
+  /** Singleton target property instance. */
+  public static final SchedulerProperty INSTANCE = new SchedulerProperty();
+
+  private SchedulerProperty() {
     super(new SchedulerType());
   }
 
diff --git a/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java b/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
index 952c0c9f01..a20646531b 100644
--- a/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
@@ -4,7 +4,14 @@
 import org.lflang.Target;
 
 /** Directive to specify that all code is generated in a single file. */
-public class SingleFileProjectProperty extends BooleanProperty {
+public final class SingleFileProjectProperty extends BooleanProperty {
+
+  /** Singleton target property instance. */
+  public static final SingleFileProjectProperty INSTANCE = new SingleFileProjectProperty();
+
+  private SingleFileProjectProperty() {
+    super();
+  }
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/ThreadingProperty.java b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
index 0071899c81..db970ffc11 100644
--- a/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
@@ -6,6 +6,13 @@
 /** Directive to indicate whether the runtime should use multi-threading. */
 public class ThreadingProperty extends BooleanProperty {
 
+  /** Singleton target property instance. */
+  public static final ThreadingProperty INSTANCE = new ThreadingProperty();
+
+  private ThreadingProperty() {
+    super();
+  }
+
   @Override
   public List<Target> supportedTargets() {
     return List.of(Target.C, Target.CCPP, Target.Python, Target.Rust);
diff --git a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
index b853822e12..a27553c2a7 100644
--- a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
@@ -12,7 +12,10 @@
 /** The timeout to be observed during execution of the program. */
 public class TimeOutProperty extends TargetProperty<TimeValue, PrimitiveType> {
 
-  public TimeOutProperty() {
+  /** Singleton target property instance. */
+  public static final TimeOutProperty INSTANCE = new TimeOutProperty();
+
+  private TimeOutProperty() {
     super(PrimitiveType.TIME_VALUE);
   }
 
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index b0298a500f..8d6ff8e17a 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -22,7 +22,10 @@
 /** Directive to configure the runtime environment to perform tracing. */
 public class TracingProperty extends TargetProperty<TracingOptions, UnionType> {
 
-  public TracingProperty() {
+  /** Singleton target property instance. */
+  public static final TracingProperty INSTANCE = new TracingProperty();
+
+  private TracingProperty() {
     super(UnionType.TRACING_UNION);
   }
 
@@ -63,7 +66,7 @@ public List<Target> supportedTargets() {
   public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
     if (pair != null && this.fromAst(pair.getValue(), reporter) != null) {
       // If tracing is anything but "false" and threading is off, error.
-      var threading = TargetProperty.getKeyValuePair(ast, new ThreadingProperty());
+      var threading = TargetProperty.getKeyValuePair(ast, ThreadingProperty.INSTANCE);
       if (threading != null) {
         if (!ASTUtils.toBoolean(threading.getValue())) {
           reporter
diff --git a/core/src/main/java/org/lflang/target/property/VerifyProperty.java b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
index 99317847f7..086e19ecce 100644
--- a/core/src/main/java/org/lflang/target/property/VerifyProperty.java
+++ b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
@@ -5,7 +5,14 @@
 import org.lflang.target.property.BooleanProperty;
 
 /** If true, check the generated verification model. The default is false. */
-public class VerifyProperty extends BooleanProperty {
+public final class VerifyProperty extends BooleanProperty {
+
+  /** Singleton target property instance. */
+  public static final VerifyProperty INSTANCE = new VerifyProperty();
+
+  private VerifyProperty() {
+    super();
+  }
 
   @Override
   public List<Target> supportedTargets() {
diff --git a/core/src/main/java/org/lflang/target/property/WorkersProperty.java b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
index fab1b4bb82..d613f04dc2 100644
--- a/core/src/main/java/org/lflang/target/property/WorkersProperty.java
+++ b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
@@ -12,9 +12,12 @@
  * The number of worker threads to deploy. The default is zero, which indicates that the runtime is
  * allowed to freely choose the number of workers.
  */
-public class WorkersProperty extends TargetProperty<Integer, PrimitiveType> {
+public final class WorkersProperty extends TargetProperty<Integer, PrimitiveType> {
 
-  public WorkersProperty() {
+  /** Singleton target property instance. */
+  public static final WorkersProperty INSTANCE = new WorkersProperty();
+
+  private WorkersProperty() {
     super(PrimitiveType.NON_NEGATIVE_INTEGER);
   }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
index e9f042d93d..69629f06db 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2NodeGenerator.kt
@@ -60,9 +60,9 @@ class CppRos2NodeGenerator(
             |
             |$nodeName::$nodeName(const rclcpp::NodeOptions& node_options)
             |  : Node("$nodeName", node_options) {
-            |  unsigned workers = ${if (targetConfig.get(WorkersProperty()) != 0) targetConfig.get(WorkersProperty()) else "std::thread::hardware_concurrency()"};
+            |  unsigned workers = ${if (targetConfig.get(WorkersProperty.INSTANCE) != 0) targetConfig.get(WorkersProperty.INSTANCE) else "std::thread::hardware_concurrency()"};
             |  bool fast{${targetConfig.get(FastProperty.INSTANCE)}};
-            |  reactor::Duration lf_timeout{${if (targetConfig.isSet(TimeOutProperty())) targetConfig.get(TimeOutProperty()).toCppCode() else "reactor::Duration::max()"}};
+            |  reactor::Duration lf_timeout{${if (targetConfig.isSet(TimeOutProperty.INSTANCE)) targetConfig.get(TimeOutProperty.INSTANCE).toCppCode() else "reactor::Duration::max()"}};
             |
             |  // provide a globally accessible reference to this node
             |  // FIXME: this is pretty hacky...
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt
index e0ee61a755..870f9ee267 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt
@@ -63,9 +63,9 @@ class CppStandaloneMainGenerator(
             |int main(int argc, char **argv) {
             |  cxxopts::Options options("${fileConfig.name}", "Reactor Program");
             |
-            |  unsigned workers = ${if (targetConfig.get(WorkersProperty()) != 0) targetConfig.get(WorkersProperty()) else "std::thread::hardware_concurrency()"};
+            |  unsigned workers = ${if (targetConfig.get(WorkersProperty.INSTANCE) != 0) targetConfig.get(WorkersProperty.INSTANCE) else "std::thread::hardware_concurrency()"};
             |  bool fast{${targetConfig.get(FastProperty.INSTANCE)}};
-            |  reactor::Duration timeout = ${if (targetConfig.isSet(TimeOutProperty())) targetConfig.get(TimeOutProperty()).toCppCode() else "reactor::Duration::max()"};
+            |  reactor::Duration timeout = ${if (targetConfig.isSet(TimeOutProperty.INSTANCE)) targetConfig.get(TimeOutProperty.INSTANCE).toCppCode() else "reactor::Duration::max()"};
             |  
             |  // the timeout variable needs to be tested beyond fitting the Duration-type 
             |  options
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
index bd69d96f0a..060a3b1772 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustModel.kt
@@ -490,7 +490,7 @@ object RustModelBuilder {
             // default configuration for the runtime crate
 
             // enable parallel feature if asked
-            val parallelFeature = listOf(PARALLEL_RT_FEATURE).takeIf { targetConfig.get(ThreadingProperty()) }
+            val parallelFeature = listOf(PARALLEL_RT_FEATURE).takeIf { targetConfig.get(ThreadingProperty.INSTANCE) }
 
             val spec = newCargoSpec(
                 features = parallelFeature,
@@ -516,11 +516,11 @@ object RustModelBuilder {
             }
 
             // enable parallel feature if asked
-            if (targetConfig.get(ThreadingProperty())) {
+            if (targetConfig.get(ThreadingProperty.INSTANCE)) {
                 userSpec.features += PARALLEL_RT_FEATURE
             }
 
-            if (!targetConfig.get(ThreadingProperty()) && PARALLEL_RT_FEATURE in userSpec.features) {
+            if (!targetConfig.get(ThreadingProperty.INSTANCE) && PARALLEL_RT_FEATURE in userSpec.features) {
                 messageReporter.nowhere().warning("Threading cannot be disabled as it was enabled manually as a runtime feature.")
             }
 
@@ -531,10 +531,10 @@ object RustModelBuilder {
     private fun TargetConfig.toRustProperties(): RustTargetProperties =
         RustTargetProperties(
             keepAlive = this.get(KeepaliveProperty.INSTANCE),
-            timeout = this.get(TimeOutProperty())?.toRustTimeExpr(),
-            timeoutLf = this.get(TimeOutProperty()),
-            singleFile = this.get(SingleFileProjectProperty()),
-            workers = this.get(WorkersProperty()),
+            timeout = this.get(TimeOutProperty.INSTANCE)?.toRustTimeExpr(),
+            timeoutLf = this.get(TimeOutProperty.INSTANCE),
+            singleFile = this.get(SingleFileProjectProperty.INSTANCE),
+            workers = this.get(WorkersProperty.INSTANCE),
             dumpDependencyGraph = this.get(ExportDependencyGraphProperty.INSTANCE),
         )
 
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
index bbb6611805..971fd22a62 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
@@ -53,7 +53,7 @@ class TSParameterPreambleGenerator(
 ) {
 
     private fun getTimeoutTimeValue(): String =
-        targetConfig.get(TimeOutProperty())?.toTsTime() ?: "undefined"
+        targetConfig.get(TimeOutProperty.INSTANCE)?.toTsTime() ?: "undefined"
 
     private fun getParameters(): List<Parameter> {
         var mainReactor: Reactor? = null
diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index 5134ad2df7..9885985e01 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -68,7 +68,7 @@ public static boolean disableThreading(LFTest test) {
 
   public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
     test.getContext().getArgs().setProperty("tracing", "false");
-    new ThreadingProperty().override(test.getContext().getTargetConfig(), false);
+    ThreadingProperty.INSTANCE.override(test.getContext().getTargetConfig(), false);
     // FIXME: use a record and override.
     test.getContext().getTargetConfig().get(PlatformProperty.INSTANCE).platform = Platform.ZEPHYR;
     test.getContext().getTargetConfig().get(PlatformProperty.INSTANCE).flash = false;

From 33dc1b1a791d2fa4813a86678ed588e8141b314c Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 17 Oct 2023 14:46:32 -0700
Subject: [PATCH 1035/1114] Fixes to deal with PythonGenerator accessing
 (through CGenerator) properties that it does not support

---
 core/src/main/java/org/lflang/Target.java     |   2 +
 .../main/java/org/lflang/TargetProperty.java  |  34 --
 .../lflang/generator/c/CCmakeGenerator.java   | 362 +++++++++---------
 .../org/lflang/generator/c/CCompiler.java     |  13 +-
 .../org/lflang/generator/c/CGenerator.java    | 223 +++++------
 .../generator/c/CMainFunctionGenerator.java   |  84 ++--
 .../generator/c/CPreambleGenerator.java       |  10 +-
 .../java/org/lflang/target/TargetConfig.java  |  35 +-
 .../lflang/target/property/AuthProperty.java  |   9 -
 .../property/BuildCommandsProperty.java       |   7 -
 .../target/property/BuildTypeProperty.java    |   8 -
 .../property/CargoDependenciesProperty.java   |   8 -
 .../property/CargoFeaturesProperty.java       |   9 -
 .../property/ClockSyncModeProperty.java       |   7 -
 .../property/ClockSyncOptionsProperty.java    |   8 -
 .../target/property/CmakeIncludeProperty.java |   7 -
 .../property/CompileDefinitionsProperty.java  |   8 -
 .../property/CompilerFlagsProperty.java       |   9 -
 .../target/property/CompilerProperty.java     |   8 -
 .../property/CoordinationOptionsProperty.java |   8 -
 .../target/property/CoordinationProperty.java |   8 -
 .../target/property/DockerProperty.java       |   8 -
 .../ExportDependencyGraphProperty.java        |   8 -
 .../target/property/ExportToYamlProperty.java |   8 -
 .../property/ExternalRuntimePathProperty.java |   8 -
 .../lflang/target/property/FastProperty.java  |   6 -
 .../target/property/FedSetupProperty.java     |   7 -
 .../lflang/target/property/FilesProperty.java |   8 -
 .../property/HierarchicalBinProperty.java     |   9 -
 .../target/property/KeepaliveProperty.java    |   8 -
 .../target/property/LoggingProperty.java      |   7 -
 .../target/property/NoCompileProperty.java    |   9 -
 .../property/NoRuntimeValidationProperty.java |   8 -
 .../target/property/PlatformProperty.java     |  24 +-
 .../property/PrintStatisticsProperty.java     |   8 -
 .../target/property/ProtobufsProperty.java    |   8 -
 .../property/Ros2DependenciesProperty.java    |   6 -
 .../lflang/target/property/Ros2Property.java  |   8 -
 .../property/RuntimeVersionProperty.java      |   8 -
 .../target/property/RustIncludeProperty.java  |   6 -
 .../target/property/SchedulerProperty.java    |   8 -
 .../property/SingleFileProjectProperty.java   |   8 -
 .../target/property/ThreadingProperty.java    |   8 -
 .../target/property/TimeOutProperty.java      |   7 -
 .../target/property/TracingProperty.java      |   7 -
 .../target/property/VerifyProperty.java       |   7 -
 .../target/property/WorkersProperty.java      |   7 -
 .../compiler/LinguaFrancaValidationTest.java  |  31 +-
 48 files changed, 425 insertions(+), 687 deletions(-)

diff --git a/core/src/main/java/org/lflang/Target.java b/core/src/main/java/org/lflang/Target.java
index 33ddf7ea6e..774d802c05 100644
--- a/core/src/main/java/org/lflang/Target.java
+++ b/core/src/main/java/org/lflang/Target.java
@@ -622,6 +622,8 @@ public void initialize(TargetConfig config) {
           TracingProperty.INSTANCE,
           WorkersProperty.INSTANCE);
       case Python -> config.register(
+          AuthProperty.INSTANCE,
+          BuildCommandsProperty.INSTANCE,
           BuildTypeProperty.INSTANCE,
           ClockSyncModeProperty.INSTANCE,
           ClockSyncOptionsProperty.INSTANCE,
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 4de4ecc5cb..0f388eda08 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -29,27 +29,6 @@ protected TargetProperty(S type) {
     this.type = type;
   }
 
-  /**
-   * If this target property is not supported by the given target, report a warning through the
-   * message reporter at the location of the given key-value pair.
-   *
-   * @param pair The ast node that matches this target property.
-   * @param target The target to check against.
-   * @param reporter The reporter to issue a warning through if this property is not supported by
-   *     the given target.
-   */
-  public void checkSupport(KeyValuePair pair, Target target, MessageReporter reporter) {
-    if (!this.isSupported(target)) {
-      reporter
-          .at(pair, Literals.KEY_VALUE_PAIR__NAME)
-          .warning(
-              String.format(
-                  "The target property: %s is not supported by the %s target and will thus be"
-                      + " ignored.",
-                  pair.getName(), target));
-    }
-  }
-
   /**
    * If the given key-value pair does not match the type required by this target property, report an
    * error through the given reporter.
@@ -66,16 +45,6 @@ public void checkType(KeyValuePair pair, MessageReporter reporter) {
     }
   }
 
-  /**
-   * Return {@code true} if this target property is supported by the given target, {@code false}
-   * otherwise.
-   *
-   * @param target The target to check against.
-   */
-  public final boolean isSupported(Target target) {
-    return supportedTargets().contains(target);
-  }
-
   @Override
   public String toString() {
     return this.name();
@@ -116,9 +85,6 @@ public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {}
    */
   protected abstract T fromString(String string, MessageReporter reporter);
 
-  /** Return a list of targets that support this target property. */
-  public abstract List<Target> supportedTargets();
-
   /**
    * Return an AST node that represents this target property and the value currently assigned to it.
    */
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index c860f685a8..ce03c21d8f 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -32,9 +32,8 @@
 import java.util.List;
 import java.util.stream.Stream;
 import org.lflang.FileConfig;
-import org.lflang.MessageReporter;
 import org.lflang.generator.CodeBuilder;
-import org.lflang.target.TargetConfig;
+import org.lflang.generator.LFGeneratorContext;
 import org.lflang.target.property.AuthProperty;
 import org.lflang.target.property.BuildTypeProperty;
 import org.lflang.target.property.CmakeIncludeProperty;
@@ -42,6 +41,7 @@
 import org.lflang.target.property.CompilerFlagsProperty;
 import org.lflang.target.property.CompilerProperty;
 import org.lflang.target.property.PlatformProperty;
+import org.lflang.target.property.PlatformProperty.PlatformOptions;
 import org.lflang.target.property.ProtobufsProperty;
 import org.lflang.target.property.ThreadingProperty;
 import org.lflang.target.property.WorkersProperty;
@@ -95,25 +95,24 @@ public CCmakeGenerator(
    * will be reported in the 'errorReporter'.
    *
    * @param sources A list of .c files to build.
-   * @param executableName The name of the output executable.
-   * @param messageReporter Used to report errors.
    * @param CppMode Indicate if the compilation should happen in C++ mode
    * @param hasMain Indicate if the .lf file has a main reactor or not. If not, a library target
    *     will be created instead of an executable.
    * @param cMakeExtras CMake-specific code that should be appended to the CMakeLists.txt.
-   * @param targetConfig The TargetConfig instance to use.
+   * @param context The context of the code generator.
    * @return The content of the CMakeLists.txt.
    */
   CodeBuilder generateCMakeCode(
       List<String> sources,
-      String executableName,
-      MessageReporter messageReporter,
       boolean CppMode,
       boolean hasMain,
       String cMakeExtras,
-      TargetConfig targetConfig) {
+      LFGeneratorContext context) {
     CodeBuilder cMakeCode = new CodeBuilder();
 
+    var targetConfig = context.getTargetConfig();
+    var messageReporter = context.getErrorReporter();
+
     List<String> additionalSources = new ArrayList<>();
     for (String file : targetConfig.compileAdditionalSources) {
       var relativePath =
@@ -122,84 +121,13 @@ CodeBuilder generateCMakeCode(
               .relativize(fileConfig.getSrcGenPath().resolve(Paths.get(file)));
       additionalSources.add(FileUtil.toUnixString(relativePath));
     }
-    // Parse board option of the platform target property
-    // Specified as a series of colon spaced options
-    // Board syntax
-    //  rp2040 <board_name> : <stdio_opt>
-    //  arduino
-    String[] boardProperties = {};
-    var platformOptions = targetConfig.get(PlatformProperty.INSTANCE);
-    if (platformOptions.board != null) {
-      boardProperties = platformOptions.board.trim().split(":");
-      // Ignore whitespace
-      for (int i = 0; i < boardProperties.length; i++) {
-        boardProperties[i] = boardProperties[i].trim();
-      }
-    }
 
     additionalSources.addAll(this.additionalSources);
     cMakeCode.newLine();
 
     cMakeCode.pr("cmake_minimum_required(VERSION " + MIN_CMAKE_VERSION + ")");
 
-    // Setup the project header for different platforms
-    switch (platformOptions.platform) {
-      case ZEPHYR:
-        cMakeCode.pr("# Set default configuration file. To add custom configurations,");
-        cMakeCode.pr("# pass -- -DOVERLAY_CONFIG=my_config.prj to either cmake or west");
-        cMakeCode.pr("set(CONF_FILE prj_lf.conf)");
-        if (platformOptions.board != null) {
-          cMakeCode.pr("# Selecting board specified in target property");
-          cMakeCode.pr("set(BOARD " + platformOptions.board + ")");
-        } else {
-          cMakeCode.pr("# Selecting default board");
-          cMakeCode.pr("set(BOARD qemu_cortex_m3)");
-        }
-        cMakeCode.pr("# We recommend Zephyr v3.4.0 but we are compatible with older versions also");
-        cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} 3.4.0)");
-        cMakeCode.newLine();
-        cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
-        cMakeCode.newLine();
-        break;
-      case RP2040:
-        // Attempt to set PICO_SDK_PATH if it is not already set.
-        if (System.getenv("PICO_SDK_PATH") == null) {
-          Path picoSDKPath = fileConfig.srcPkgPath.resolve("pico-sdk");
-          if (Files.isDirectory(picoSDKPath)) {
-            messageReporter
-                .nowhere()
-                .info(
-                    "pico-sdk library found at "
-                        + picoSDKPath.toString()
-                        + ". You can override this by setting PICO_SDK_PATH.");
-            cMakeCode.pr("# Define the root of the pico-sdk library.");
-            cMakeCode.pr("set(PICO_SDK_PATH " + picoSDKPath + ")");
-          } else {
-            messageReporter
-                .nowhere()
-                .warning(
-                    "No PICO_SDK_PATH environment variable and no pico-sdk directory "
-                        + "at the package root directory. Pico SDK will not be found.");
-          }
-        }
-        cMakeCode.pr("include(pico_sdk_import.cmake)");
-        cMakeCode.pr("project(" + executableName + " LANGUAGES C CXX ASM)");
-        cMakeCode.newLine();
-        // board type for rp2040 based boards
-        if (platformOptions.board != null) {
-          if (boardProperties.length < 1 || boardProperties[0].equals("")) {
-            cMakeCode.pr("set(PICO_BOARD pico)");
-          } else {
-            cMakeCode.pr("set(PICO_BOARD \"" + boardProperties[0] + "\")");
-          }
-        }
-        // remove warnings for rp2040 only to make debug easier
-        cMakeCode.pr("set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -w\")");
-        break;
-      default:
-        cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
-        cMakeCode.newLine();
-    }
+    preTargetDefinitionPlatformConfig(context, hasMain, sources, cMakeCode);
 
     // The Test build type is the Debug type plus coverage generation
     cMakeCode.pr("if(CMAKE_BUILD_TYPE STREQUAL \"Test\")");
@@ -229,7 +157,8 @@ CodeBuilder generateCMakeCode(
     cMakeCode.pr("set(CMAKE_CXX_STANDARD 17)");
     cMakeCode.pr("set(CMAKE_CXX_STANDARD_REQUIRED ON)");
     cMakeCode.newLine();
-    if (!targetConfig.get(CmakeIncludeProperty.INSTANCE).isEmpty()) {
+    if (targetConfig.isSet(CmakeIncludeProperty.INSTANCE)
+        && !targetConfig.get(CmakeIncludeProperty.INSTANCE).isEmpty()) {
       // The user might be using the non-keyword form of
       // target_link_libraries. Ideally we would detect whether they are
       // doing that, but it is easier to just always have a deprecation
@@ -260,54 +189,6 @@ CodeBuilder generateCMakeCode(
       cMakeCode.newLine();
     }
 
-    if (platformOptions.platform != Platform.AUTO) {
-      cMakeCode.pr("set(CMAKE_SYSTEM_NAME " + platformOptions.platform.getcMakeName() + ")");
-    }
-    cMakeCode.newLine();
-    cMakeCode.pr("# Set default values for build parameters\n");
-    targetConfig
-        .get(CompileDefinitionsProperty.INSTANCE)
-        .forEach(
-            (key, value) -> {
-              if (key.equals("LF_THREADED") || key.equals("LF_UNTHREADED")) {
-                cMakeCode.pr("if (NOT DEFINED LF_THREADED AND NOT DEFINED LF_UNTHREADED)\n");
-              } else {
-                cMakeCode.pr("if (NOT DEFINED " + key + ")\n");
-              }
-              cMakeCode.indent();
-              var v = "TRUE";
-              if (value != null && !value.isEmpty()) {
-                v = value;
-              }
-              cMakeCode.pr("set(" + key + " " + v + ")\n");
-              cMakeCode.unindent();
-              cMakeCode.pr("endif()\n");
-            });
-
-    // Setup main target for different platforms
-    switch (platformOptions.platform) {
-      case ZEPHYR:
-        cMakeCode.pr(
-            setUpMainTargetZephyr(
-                hasMain,
-                executableName,
-                Stream.concat(additionalSources.stream(), sources.stream())));
-        break;
-      case RP2040:
-        cMakeCode.pr(
-            setUpMainTargetRp2040(
-                hasMain,
-                executableName,
-                Stream.concat(additionalSources.stream(), sources.stream())));
-        break;
-      default:
-        cMakeCode.pr(
-            setUpMainTarget.getCmakeCode(
-                hasMain,
-                executableName,
-                Stream.concat(additionalSources.stream(), sources.stream())));
-    }
-
     // Ensure that the math library is linked
     cMakeCode.pr("find_library(MATH_LIBRARY m)");
     cMakeCode.pr("if(MATH_LIBRARY)");
@@ -324,45 +205,9 @@ CodeBuilder generateCMakeCode(
     cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/modal_models)");
     cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/utils)");
 
-    // post target definition board configurations
-    switch (platformOptions.platform) {
-      case RP2040:
-        // set stdio output
-        boolean usb = true;
-        boolean uart = true;
-        if (platformOptions.board != null && boardProperties.length > 1) {
-          uart = !boardProperties[1].equals("usb");
-          usb = !boardProperties[1].equals("uart");
-        }
-        cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} " + (usb ? 1 : 0) + ")");
-        cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} " + (uart ? 1 : 0) + ")");
-        break;
-    }
-
-    if (targetConfig.get(AuthProperty.INSTANCE)) {
-      // If security is requested, add the auth option.
-      var osName = System.getProperty("os.name").toLowerCase();
-      // if platform target was set, use given platform instead
-      if (platformOptions.platform != Platform.AUTO) {
-        osName = platformOptions.platform.toString();
-      }
-      if (osName.contains("mac")) {
-        cMakeCode.pr("set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)");
-      }
-      cMakeCode.pr("# Find OpenSSL and link to it");
-      cMakeCode.pr("find_package(OpenSSL REQUIRED)");
-      cMakeCode.pr("target_link_libraries( ${LF_MAIN_TARGET} PRIVATE OpenSSL::SSL)");
-      cMakeCode.newLine();
-    }
+    buildParameterDefaults(cMakeCode, context);
 
-    if (targetConfig.get(ThreadingProperty.INSTANCE)
-        && platformOptions.platform != Platform.ZEPHYR) {
-      // If threaded computation is requested, add the threads option.
-      cMakeCode.pr("# Find threads and link to it");
-      cMakeCode.pr("find_package(Threads REQUIRED)");
-      cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE Threads::Threads)");
-      cMakeCode.newLine();
-    }
+    postTargetDefinitionPlatformConfig(cMakeCode, context);
 
     // Add additional flags so runtime can distinguish between multi-threaded and single-threaded
     // mode
@@ -428,18 +273,191 @@ CodeBuilder generateCMakeCode(
     cMakeCode.pr(installCode);
     cMakeCode.newLine();
 
-    // Add the include file
-    for (String includeFile : targetConfig.get(CmakeIncludeProperty.INSTANCE)) {
-      cMakeCode.pr("include(\"" + Path.of(includeFile).getFileName() + "\")");
+    if (targetConfig.isSet(CmakeIncludeProperty.INSTANCE)) {
+      // Add the include file
+      for (String includeFile : targetConfig.get(CmakeIncludeProperty.INSTANCE)) {
+        cMakeCode.pr("include(\"" + Path.of(includeFile).getFileName() + "\")");
+      }
+      cMakeCode.newLine();
     }
-    cMakeCode.newLine();
-
     cMakeCode.pr(cMakeExtras);
     cMakeCode.newLine();
 
     return cMakeCode;
   }
 
+  private void postTargetDefinitionPlatformConfig(
+      CodeBuilder cMakeCode, LFGeneratorContext context) {
+    var targetConfig = context.getTargetConfig();
+
+    var platformOptions = new PlatformOptions();
+    if (targetConfig.isSet(PlatformProperty.INSTANCE)) {
+      platformOptions = targetConfig.get(PlatformProperty.INSTANCE);
+    }
+    // post target definition board configurations
+    switch (platformOptions.platform) {
+      case RP2040:
+        // set stdio output
+        boolean usb = true;
+        boolean uart = true;
+        var boardProperties = platformOptions.boardArray();
+        if (boardProperties.length > 1) {
+          uart = !boardProperties[1].equals("usb");
+          usb = !boardProperties[1].equals("uart");
+        }
+        cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} " + (usb ? 1 : 0) + ")");
+        cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} " + (uart ? 1 : 0) + ")");
+        break;
+    }
+
+    if (targetConfig.get(AuthProperty.INSTANCE)) {
+      // If security is requested, add the auth option.
+      var osName = System.getProperty("os.name").toLowerCase();
+      // if platform target was set, use given platform instead
+      if (platformOptions.platform != Platform.AUTO) {
+        osName = platformOptions.platform.toString();
+      }
+      if (osName.contains("mac")) {
+        cMakeCode.pr("set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)");
+      }
+      cMakeCode.pr("# Find OpenSSL and link to it");
+      cMakeCode.pr("find_package(OpenSSL REQUIRED)");
+      cMakeCode.pr("target_link_libraries( ${LF_MAIN_TARGET} PRIVATE OpenSSL::SSL)");
+      cMakeCode.newLine();
+    }
+
+    if (targetConfig.get(ThreadingProperty.INSTANCE)
+        && platformOptions.platform != Platform.ZEPHYR) {
+      // If threaded computation is requested, add the threads option.
+      cMakeCode.pr("# Find threads and link to it");
+      cMakeCode.pr("find_package(Threads REQUIRED)");
+      cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE Threads::Threads)");
+      cMakeCode.newLine();
+    }
+  }
+
+  private void buildParameterDefaults(CodeBuilder cMakeCode, LFGeneratorContext context) {
+    cMakeCode.newLine();
+    cMakeCode.pr("# Set default values for build parameters\n");
+    context
+        .getTargetConfig()
+        .get(CompileDefinitionsProperty.INSTANCE)
+        .forEach(
+            (key, value) -> {
+              if (key.equals("LF_THREADED") || key.equals("LF_UNTHREADED")) {
+                cMakeCode.pr("if (NOT DEFINED LF_THREADED AND NOT DEFINED LF_UNTHREADED)\n");
+              } else {
+                cMakeCode.pr("if (NOT DEFINED " + key + ")\n");
+              }
+              cMakeCode.indent();
+              var v = "TRUE";
+              if (value != null && !value.isEmpty()) {
+                v = value;
+              }
+              cMakeCode.pr("set(" + key + " " + v + ")\n");
+              cMakeCode.unindent();
+              cMakeCode.pr("endif()\n");
+            });
+  }
+
+  private void preTargetDefinitionPlatformConfig(
+      LFGeneratorContext context, boolean hasMain, List<String> sources, CodeBuilder cMakeCode) {
+    var targetConfig = context.getTargetConfig();
+    var messageReporter = context.getErrorReporter();
+    var executableName = context.getFileConfig().name;
+    var platformOptions = new PlatformOptions();
+    if (targetConfig.isSet(PlatformProperty.INSTANCE)) {
+      platformOptions = targetConfig.get(PlatformProperty.INSTANCE);
+    }
+
+    // Setup the project header for different platforms
+    switch (platformOptions.platform) {
+      case ZEPHYR:
+        cMakeCode.pr("# Set default configuration file. To add custom configurations,");
+        cMakeCode.pr("# pass -- -DOVERLAY_CONFIG=my_config.prj to either cmake or west");
+        cMakeCode.pr("set(CONF_FILE prj_lf.conf)");
+        if (platformOptions.board != null) {
+          cMakeCode.pr("# Selecting board specified in target property");
+          cMakeCode.pr("set(BOARD " + platformOptions.board + ")");
+        } else {
+          cMakeCode.pr("# Selecting default board");
+          cMakeCode.pr("set(BOARD qemu_cortex_m3)");
+        }
+        cMakeCode.pr("# We recommend Zephyr v3.4.0 but we are compatible with older versions also");
+        cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} 3.4.0)");
+        cMakeCode.newLine();
+        cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
+        cMakeCode.newLine();
+        break;
+      case RP2040:
+        // Attempt to set PICO_SDK_PATH if it is not already set.
+        if (System.getenv("PICO_SDK_PATH") == null) {
+          Path picoSDKPath = fileConfig.srcPkgPath.resolve("pico-sdk");
+          if (Files.isDirectory(picoSDKPath)) {
+            messageReporter
+                .nowhere()
+                .info(
+                    "pico-sdk library found at "
+                        + picoSDKPath.toString()
+                        + ". You can override this by setting PICO_SDK_PATH.");
+            cMakeCode.pr("# Define the root of the pico-sdk library.");
+            cMakeCode.pr("set(PICO_SDK_PATH " + picoSDKPath + ")");
+          } else {
+            messageReporter
+                .nowhere()
+                .warning(
+                    "No PICO_SDK_PATH environment variable and no pico-sdk directory "
+                        + "at the package root directory. Pico SDK will not be found.");
+          }
+        }
+        cMakeCode.pr("include(pico_sdk_import.cmake)");
+        cMakeCode.pr("project(" + executableName + " LANGUAGES C CXX ASM)");
+        cMakeCode.newLine();
+        var boardProperties = platformOptions.boardArray();
+        // board type for rp2040 based boards
+        if (boardProperties.length < 1 || boardProperties[0].equals("")) {
+          cMakeCode.pr("set(PICO_BOARD pico)");
+        } else {
+          cMakeCode.pr("set(PICO_BOARD \"" + boardProperties[0] + "\")");
+        }
+
+        // remove warnings for rp2040 only to make debug easier
+        cMakeCode.pr("set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -w\")");
+        break;
+      default:
+        cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
+        cMakeCode.newLine();
+    }
+
+    if (platformOptions.platform != Platform.AUTO) {
+      cMakeCode.pr("set(CMAKE_SYSTEM_NAME " + platformOptions.platform.getcMakeName() + ")");
+    }
+
+    // Setup main target for different platforms
+    switch (platformOptions.platform) {
+      case ZEPHYR:
+        cMakeCode.pr(
+            setUpMainTargetZephyr(
+                hasMain,
+                executableName,
+                Stream.concat(additionalSources.stream(), sources.stream())));
+        break;
+      case RP2040:
+        cMakeCode.pr(
+            setUpMainTargetRp2040(
+                hasMain,
+                executableName,
+                Stream.concat(additionalSources.stream(), sources.stream())));
+        break;
+      default:
+        cMakeCode.pr(
+            setUpMainTarget.getCmakeCode(
+                hasMain,
+                executableName,
+                Stream.concat(additionalSources.stream(), sources.stream())));
+    }
+  }
+
   /** Provide a strategy for configuring the main target of the CMake build. */
   public interface SetUpMainTarget {
     // Implementation note: This indirection is necessary because the Python
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index c46230caa2..f050b4d84f 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -445,13 +445,18 @@ public LFCommand compileCCommand(String fileToCompile, boolean noBinary) {
    *     .cpp files instead of .c files and uses a C++ compiler to compiler the code.
    */
   static String getTargetFileName(String fileName, boolean cppMode, TargetConfig targetConfig) {
-    if (targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO) {
-      return fileName + ".ino";
+    return fileName + getFileExtension(cppMode, targetConfig);
+  }
+
+  static String getFileExtension(boolean cppMode, TargetConfig targetConfig) {
+    if (targetConfig.isSet(PlatformProperty.INSTANCE)
+        && targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO) {
+      return ".ino";
     }
     if (cppMode) {
       // If the C++ mode is enabled, use a .cpp extension
-      return fileName + ".cpp";
+      return ".cpp";
     }
-    return fileName + ".c";
+    return ".c";
   }
 }
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index f3b1fb8f2a..a13cd3c440 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -50,7 +50,6 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
 import org.lflang.FileConfig;
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
@@ -74,6 +73,7 @@
 import org.lflang.generator.TargetTypes;
 import org.lflang.generator.TimerInstance;
 import org.lflang.generator.TriggerInstance;
+import org.lflang.generator.python.PythonGenerator;
 import org.lflang.lf.Action;
 import org.lflang.lf.ActionOrigin;
 import org.lflang.lf.Input;
@@ -315,7 +315,7 @@ public class CGenerator extends GeneratorBase {
   private int watchdogCount = 0;
 
   // Indicate whether the generator is in Cpp mode or not
-  private final boolean CCppMode;
+  private final boolean cppMode;
 
   private final CTypes types;
 
@@ -323,13 +323,13 @@ public class CGenerator extends GeneratorBase {
 
   protected CGenerator(
       LFGeneratorContext context,
-      boolean CCppMode,
+      boolean cppMode,
       CTypes types,
       CCmakeGenerator cmakeGenerator,
       DelayBodyGenerator delayConnectionBodyGenerator) {
     super(context);
     this.fileConfig = (CFileConfig) context.getFileConfig();
-    this.CCppMode = CCppMode;
+    this.cppMode = cppMode;
     this.types = types;
     this.cmakeGenerator = cmakeGenerator;
 
@@ -381,7 +381,7 @@ public void accommodatePhysicalActionsIfPresent() {
    */
   protected boolean isOSCompatible() {
     if (GeneratorUtils.isHostWindows()) {
-      if (CCppMode) {
+      if (cppMode) {
         messageReporter
             .nowhere()
             .error(
@@ -418,7 +418,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
 
     // Derive target filename from the .lf filename.
     var lfModuleName = fileConfig.name;
-    var cFilename = CCompiler.getTargetFileName(lfModuleName, this.CCppMode, targetConfig);
+    var cFilename = CCompiler.getTargetFileName(lfModuleName, this.cppMode, targetConfig);
     var targetFile = fileConfig.getSrcGenPath() + File.separator + cFilename;
     try {
       generateCodeFor(lfModuleName);
@@ -446,30 +446,23 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     }
 
     // If cmake is requested, generate the CMakeLists.txt
-    if (targetConfig.get(PlatformProperty.INSTANCE).platform != Platform.ARDUINO) {
+    if (!targetConfig.isSet(PlatformProperty.INSTANCE)) {
       var cmakeFile = fileConfig.getSrcGenPath() + File.separator + "CMakeLists.txt";
       var sources =
           allTypeParameterizedReactors()
               .map(CUtil::getName)
-              .map(it -> it + (CCppMode ? ".cpp" : ".c"))
+              .map(it -> it + (cppMode ? ".cpp" : ".c"))
               .collect(Collectors.toCollection(ArrayList::new));
       sources.add(cFilename);
       var cmakeCode =
-          cmakeGenerator.generateCMakeCode(
-              sources,
-              lfModuleName,
-              messageReporter,
-              CCppMode,
-              mainDef != null,
-              cMakeExtras,
-              targetConfig);
+          cmakeGenerator.generateCMakeCode(sources, cppMode, mainDef != null, cMakeExtras, context);
       try {
         cmakeCode.writeToFile(cmakeFile);
       } catch (IOException e) {
         //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
         Exceptions.sneakyThrow(e);
       }
-    } else {
+    } else if (targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO) {
       try {
         Path include = fileConfig.getSrcGenPath().resolve("include/");
         Path src = fileConfig.getSrcGenPath().resolve("src/");
@@ -530,7 +523,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
       var generator =
           this; // FIXME: currently only passed to report errors with line numbers in the Eclipse
       // IDE
-      var CppMode = CCppMode;
+      var CppMode = cppMode;
       // generatingContext.reportProgress(
       //     String.format("Generated code for %d/%d executables. Compiling...", federateCount,
       // federates.size()),
@@ -630,7 +623,8 @@ private void generateCodeFor(String lfModuleName) throws IOException {
       // is set to decentralized) or, if there are
       // downstream federates, will notify the RTI
       // that the specified logical time is complete.
-      if (CCppMode || targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO)
+      if (!(this instanceof PythonGenerator)
+          && (cppMode || targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO))
         code.pr("extern \"C\"");
       code.pr(
           String.join(
@@ -738,22 +732,24 @@ protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
     // Must use class variable to determine destination!
     var destination = this.fileConfig.getSrcGenPath();
 
-    FileUtil.copyFilesOrDirectories(
-        targetConfig.get(CmakeIncludeProperty.INSTANCE),
-        destination,
-        fileConfig,
-        messageReporter,
-        true);
+    if (!(this instanceof PythonGenerator)) {
+      FileUtil.copyFilesOrDirectories(
+          targetConfig.get(CmakeIncludeProperty.INSTANCE),
+          destination,
+          fileConfig,
+          messageReporter,
+          true);
+    }
 
-    if (!StringExtensions.isNullOrEmpty(targetConfig.get(FedSetupProperty.INSTANCE))) {
-      try {
-        var file = targetConfig.get(FedSetupProperty.INSTANCE);
-        FileUtil.copyFile(fileConfig.srcFile.getParent().resolve(file), destination.resolve(file));
-      } catch (IOException e) {
-        messageReporter
-            .nowhere()
-            .error("Failed to find _fed_setup file " + targetConfig.get(FedSetupProperty.INSTANCE));
-      }
+    try {
+      var file = targetConfig.get(FedSetupProperty.INSTANCE);
+      FileUtil.copyFile(fileConfig.srcFile.getParent().resolve(file), destination.resolve(file));
+    } catch (IOException e) {
+      messageReporter
+          .nowhere()
+          .error("Failed to find _fed_setup file " + targetConfig.get(FedSetupProperty.INSTANCE));
+    } catch (IllegalArgumentException e) {
+      // No FedSetupProperty defined.
     }
   }
 
@@ -882,36 +878,42 @@ protected void copyTargetFiles() throws IOException {
     // Copy the core lib
     String coreLib = LFGeneratorContext.BuildParm.EXTERNAL_RUNTIME_PATH.getValue(context);
     Path dest = fileConfig.getSrcGenPath();
-    if (targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO) {
-      dest = dest.resolve("src");
+
+    if (targetConfig.isSet(PlatformProperty.INSTANCE)) {
+      var platform = targetConfig.get(PlatformProperty.INSTANCE).platform;
+      switch (platform) {
+        case ARDUINO -> {
+          // For Arduino, alter the destination directory.
+          dest = dest.resolve("src");
+        }
+        case ZEPHYR -> {
+          // For the Zephyr target, copy default config and board files.
+          FileUtil.copyFromClassPath(
+              "/lib/platform/zephyr/boards", fileConfig.getSrcGenPath(), false, false);
+          FileUtil.copyFileFromClassPath(
+              "/lib/platform/zephyr/prj_lf.conf", fileConfig.getSrcGenPath(), true);
+
+          FileUtil.copyFileFromClassPath(
+              "/lib/platform/zephyr/Kconfig", fileConfig.getSrcGenPath(), true);
+        }
+        case RP2040 -> {
+          // For the pico src-gen, copy over vscode configurations for debugging
+          Path vscodePath = fileConfig.getSrcGenPath().resolve(".vscode");
+          // If pico-sdk-path not defined, this can be used to pull the sdk into src-gen
+          FileUtil.copyFileFromClassPath(
+              "/lib/platform/rp2040/pico_sdk_import.cmake", fileConfig.getSrcGenPath(), true);
+          // VS Code configurations
+          FileUtil.copyFileFromClassPath("/lib/platform/rp2040/launch.json", vscodePath, true);
+        }
+      }
     }
+
     if (coreLib != null) {
       FileUtil.copyDirectoryContents(Path.of(coreLib), dest, true);
     } else {
       FileUtil.copyFromClassPath("/lib/c/reactor-c/core", dest, true, false);
       FileUtil.copyFromClassPath("/lib/c/reactor-c/lib", dest, true, false);
     }
-
-    // For the Zephyr target, copy default config and board files.
-    if (targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ZEPHYR) {
-      FileUtil.copyFromClassPath(
-          "/lib/platform/zephyr/boards", fileConfig.getSrcGenPath(), false, false);
-      FileUtil.copyFileFromClassPath(
-          "/lib/platform/zephyr/prj_lf.conf", fileConfig.getSrcGenPath(), true);
-
-      FileUtil.copyFileFromClassPath(
-          "/lib/platform/zephyr/Kconfig", fileConfig.getSrcGenPath(), true);
-    }
-
-    // For the pico src-gen, copy over vscode configurations for debugging
-    if (targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.RP2040) {
-      Path vscodePath = fileConfig.getSrcGenPath().resolve(".vscode");
-      // If pico-sdk-path not defined, this can be used to pull the sdk into src-gen
-      FileUtil.copyFileFromClassPath(
-          "/lib/platform/rp2040/pico_sdk_import.cmake", fileConfig.getSrcGenPath(), true);
-      // VS Code configurations
-      FileUtil.copyFileFromClassPath("/lib/platform/rp2040/launch.json", vscodePath, true);
-    }
   }
 
   ////////////////////////////////////////////
@@ -950,10 +952,7 @@ private void generateReactorClass(TypeParameterizedReactor tpr) throws IOExcepti
         CodeMap.fromGeneratedCode(header.toString()).getGeneratedCode(),
         fileConfig.getSrcGenPath().resolve(headerName),
         true);
-    var extension =
-        targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO
-            ? ".ino"
-            : CCppMode ? ".cpp" : ".c";
+    var extension = CCompiler.getFileExtension(cppMode, targetConfig);
     FileUtil.writeToFile(
         CodeMap.fromGeneratedCode(src.toString()).getGeneratedCode(),
         fileConfig.getSrcGenPath().resolve(CUtil.getName(tpr) + extension),
@@ -962,14 +961,14 @@ private void generateReactorClass(TypeParameterizedReactor tpr) throws IOExcepti
 
   protected void generateReactorClassHeaders(
       TypeParameterizedReactor tpr, String headerName, CodeBuilder header, CodeBuilder src) {
-    if (CCppMode) {
+    if (cppMode) {
       src.pr("extern \"C\" {");
       header.pr("extern \"C\" {");
     }
     header.pr("#include \"include/core/reactor.h\"");
     src.pr("#include \"include/api/api.h\"");
     generateIncludes(tpr);
-    if (CCppMode) {
+    if (cppMode) {
       src.pr("}");
       header.pr("}");
     }
@@ -1942,55 +1941,59 @@ protected void setUpGeneralParameters() {
       // So that each separate compile knows about modal reactors, do this:
       CompileDefinitionsProperty.INSTANCE.update(targetConfig, Map.of("MODAL_REACTORS", "TRUE"));
     }
-    final var platformOptions = targetConfig.get(PlatformProperty.INSTANCE);
-    if (targetConfig.get(ThreadingProperty.INSTANCE)
-        && platformOptions.platform == Platform.ARDUINO
-        && (platformOptions.board == null || !platformOptions.board.contains("mbed"))) {
-      // non-MBED boards should not use threading
-      messageReporter
-          .nowhere()
-          .info(
-              "Threading is incompatible on your current Arduino flavor. Setting threading to"
-                  + " false.");
-      ThreadingProperty.INSTANCE.override(targetConfig, false);
-    }
+    if (!(this instanceof PythonGenerator)) {
 
-    if (platformOptions.platform == Platform.ARDUINO
-        && !targetConfig.get(NoCompileProperty.INSTANCE)
-        && platformOptions.board == null) {
-      messageReporter
-          .nowhere()
-          .info(
-              "To enable compilation for the Arduino platform, you must specify the fully-qualified"
-                  + " board name (FQBN) in the target property. For example, platform: {name:"
-                  + " arduino, board: arduino:avr:leonardo}. Entering \"no-compile\" mode and"
-                  + " generating target code only.");
-      NoCompileProperty.INSTANCE.override(targetConfig, true);
-    }
+      final var platformOptions = targetConfig.get(PlatformProperty.INSTANCE);
+      if (targetConfig.get(ThreadingProperty.INSTANCE)
+          && platformOptions.platform == Platform.ARDUINO
+          && (platformOptions.board == null || !platformOptions.board.contains("mbed"))) {
+        // non-MBED boards should not use threading
+        messageReporter
+            .nowhere()
+            .info(
+                "Threading is incompatible on your current Arduino flavor. Setting threading to"
+                    + " false.");
+        ThreadingProperty.INSTANCE.override(targetConfig, false);
+      }
 
-    if (platformOptions.platform == Platform.ZEPHYR
-        && targetConfig.get(ThreadingProperty.INSTANCE)
-        && platformOptions.userThreads >= 0) {
-      targetConfig
-          .get(CompileDefinitionsProperty.INSTANCE)
-          .put(PlatformOption.USER_THREADS.name(), String.valueOf(platformOptions.userThreads));
-    } else if (platformOptions.userThreads > 0) {
-      messageReporter
-          .nowhere()
-          .warning(
-              "Specifying user threads is only for threaded Lingua Franca on the Zephyr platform."
-                  + " This option will be ignored.");
-    }
+      if (platformOptions.platform == Platform.ARDUINO
+          && !targetConfig.get(NoCompileProperty.INSTANCE)
+          && platformOptions.board == null) {
+        messageReporter
+            .nowhere()
+            .info(
+                "To enable compilation for the Arduino platform, you must specify the"
+                    + " fully-qualified board name (FQBN) in the target property. For example,"
+                    + " platform: {name: arduino, board: arduino:avr:leonardo}. Entering"
+                    + " \"no-compile\" mode and generating target code only.");
+        NoCompileProperty.INSTANCE.override(targetConfig, true);
+      }
 
-    if (targetConfig.get(ThreadingProperty.INSTANCE)) { // FIXME: This logic is duplicated in CMake
-      pickScheduler();
-      // FIXME: this and pickScheduler should be combined.
-      var map = new HashMap<String, String>();
-      map.put("SCHEDULER", targetConfig.get(SchedulerProperty.INSTANCE).getSchedulerCompileDef());
-      map.put("NUMBER_OF_WORKERS", String.valueOf(targetConfig.get(WorkersProperty.INSTANCE)));
-      CompileDefinitionsProperty.INSTANCE.update(targetConfig, map);
+      if (platformOptions.platform == Platform.ZEPHYR
+          && targetConfig.get(ThreadingProperty.INSTANCE)
+          && platformOptions.userThreads >= 0) {
+        targetConfig
+            .get(CompileDefinitionsProperty.INSTANCE)
+            .put(PlatformOption.USER_THREADS.name(), String.valueOf(platformOptions.userThreads));
+      } else if (platformOptions.userThreads > 0) {
+        messageReporter
+            .nowhere()
+            .warning(
+                "Specifying user threads is only for threaded Lingua Franca on the Zephyr platform."
+                    + " This option will be ignored.");
+      }
+
+      if (targetConfig.get(
+          ThreadingProperty.INSTANCE)) { // FIXME: This logic is duplicated in CMake
+        pickScheduler();
+        // FIXME: this and pickScheduler should be combined.
+        var map = new HashMap<String, String>();
+        map.put("SCHEDULER", targetConfig.get(SchedulerProperty.INSTANCE).getSchedulerCompileDef());
+        map.put("NUMBER_OF_WORKERS", String.valueOf(targetConfig.get(WorkersProperty.INSTANCE)));
+        CompileDefinitionsProperty.INSTANCE.update(targetConfig, map);
+      }
+      pickCompilePlatform();
     }
-    pickCompilePlatform();
   }
 
   protected void handleProtoFiles() {
@@ -2009,7 +2012,7 @@ public String generateDirectives() {
     code.prComment("Code generated by the Lingua Franca compiler from:");
     code.prComment("file:/" + FileUtil.toUnixString(fileConfig.srcFile));
     code.pr(CPreambleGenerator.generateDefineDirectives(targetConfig, fileConfig.getSrcGenPath()));
-    code.pr(CPreambleGenerator.generateIncludeStatements(targetConfig, CCppMode));
+    code.pr(CPreambleGenerator.generateIncludeStatements(targetConfig, cppMode));
     return code.toString();
   }
 
@@ -2040,7 +2043,7 @@ protected String generateTopLevelPreambles(Reactor reactor) {
   }
 
   protected boolean targetLanguageIsCpp() {
-    return CCppMode;
+    return cppMode;
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
index 03d340ffd3..dd5dbc9121 100644
--- a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
@@ -37,44 +37,52 @@ public String generateCode() {
 
   /** Generate the {@code main} function. */
   private String generateMainFunction() {
-    if (targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO) {
-      /**
-       * By default, we must have a serial begin line prior to calling lf_reactor_c_main due to
-       * internal debugging messages requiring a print buffer. For the future, we can check whether
-       * internal LF logging is enabled or not before removing this line. - Logging
-       */
-      return String.join(
-          "\n",
-          "\nvoid _lf_arduino_print_message_function(const char* format, va_list args) {",
-          "\tchar buf[128];",
-          "\tvsnprintf(buf, 128, format, args);",
-          "\tSerial.print(buf);",
-          "}\n",
-          "// Arduino setup() and loop() functions",
-          "void setup() {",
-          "\tSerial.begin(" + targetConfig.get(PlatformProperty.INSTANCE).baudRate + ");",
-          "\tlf_register_print_function(&_lf_arduino_print_message_function, LOG_LEVEL);",
-          "\tlf_reactor_c_main(0, NULL);",
-          "}\n",
-          "void loop() {}");
-    } else if (targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ZEPHYR) {
-      // The Zephyr "runtime" does not terminate when main returns.
-      //  Rather, {@code exit} should be called explicitly.
-      return String.join(
-          "\n",
-          "void main(void) {",
-          "   int res = lf_reactor_c_main(0, NULL);",
-          "   exit(res);",
-          "}");
-    } else if (targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.RP2040) {
-      // Pico platform cannot use command line args.
-      return String.join("\n", "int main(void) {", "   return lf_reactor_c_main(0, NULL);", "}");
-    } else {
-      return String.join(
-          "\n",
-          "int main(int argc, const char* argv[]) {",
-          "    return lf_reactor_c_main(argc, argv);",
-          "}");
+    var platform = Platform.AUTO;
+    if (targetConfig.isSet(PlatformProperty.INSTANCE)) {
+      platform = targetConfig.get(PlatformProperty.INSTANCE).platform;
+    }
+    switch (platform) {
+      case ARDUINO -> {
+        /**
+         * By default, we must have a serial begin line prior to calling lf_reactor_c_main due to
+         * internal debugging messages requiring a print buffer. For the future, we can check
+         * whether internal LF logging is enabled or not before removing this line. - Logging
+         */
+        return String.join(
+            "\n",
+            "\nvoid _lf_arduino_print_message_function(const char* format, va_list args) {",
+            "\tchar buf[128];",
+            "\tvsnprintf(buf, 128, format, args);",
+            "\tSerial.print(buf);",
+            "}\n",
+            "// Arduino setup() and loop() functions",
+            "void setup() {",
+            "\tSerial.begin(" + targetConfig.get(PlatformProperty.INSTANCE).baudRate + ");",
+            "\tlf_register_print_function(&_lf_arduino_print_message_function, LOG_LEVEL);",
+            "\tlf_reactor_c_main(0, NULL);",
+            "}\n",
+            "void loop() {}");
+      }
+      case ZEPHYR -> {
+        // The Zephyr "runtime" does not terminate when main returns.
+        //  Rather, {@code exit} should be called explicitly.
+        return String.join(
+            "\n",
+            "void main(void) {",
+            "   int res = lf_reactor_c_main(0, NULL);",
+            "   exit(res);",
+            "}");
+      }
+      case RP2040 -> {
+        return String.join("\n", "int main(void) {", "   return lf_reactor_c_main(0, NULL);", "}");
+      }
+      default -> {
+        return String.join(
+            "\n",
+            "int main(int argc, const char* argv[]) {",
+            "    return lf_reactor_c_main(argc, argv);",
+            "}");
+      }
     }
   }
 
diff --git a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
index b55aad3792..58319a4f3b 100644
--- a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
@@ -31,11 +31,15 @@
  * @author Anirudh Rengarajan
  */
 public class CPreambleGenerator {
+
+  private static boolean arduinoBased(TargetConfig targetConfig) {
+    return targetConfig.isSet(PlatformProperty.INSTANCE)
+        && targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO;
+  }
   /** Add necessary source files specific to the target language. */
   public static String generateIncludeStatements(TargetConfig targetConfig, boolean cppMode) {
-
     CodeBuilder code = new CodeBuilder();
-    if (cppMode || targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO) {
+    if (cppMode || arduinoBased(targetConfig)) {
       code.pr("extern \"C\" {");
     }
     code.pr("#include <limits.h>");
@@ -60,7 +64,7 @@ public static String generateIncludeStatements(TargetConfig targetConfig, boolea
       code.pr("#include \"include/core/federated/federate.h\"");
       code.pr("#include \"include/core/federated/net_common.h\"");
     }
-    if (cppMode || targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO) {
+    if (cppMode || arduinoBased(targetConfig)) {
       code.pr("}");
     }
     return code.toString();
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index f22090e810..0e6a7999fb 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -134,8 +134,16 @@ public void reset(TargetProperty<?, ?> property) {
 
   /** Return the value currently assigned to the given target property. */
   @SuppressWarnings("unchecked")
-  public <T, S extends TargetPropertyType> T get(TargetProperty<T, S> property) {
-    return (T) properties.get(property);
+  public <T, S extends TargetPropertyType> T get(TargetProperty<T, S> property)
+      throws IllegalArgumentException {
+    var value = properties.get(property);
+    if (value != null) {
+      return (T) value;
+    }
+    throw new IllegalArgumentException(
+        String.format(
+            "Attempting to access target property '%s', which is not supported by the %s target.",
+            property.name(), this.target));
   }
 
   /**
@@ -239,14 +247,14 @@ public static List<KeyValuePair> extractProperties(TargetConfig config) {
    * @return A generated TargetDecl.
    */
   public TargetDecl extractTargetDecl() {
-    TargetDecl decl = LfFactory.eINSTANCE.createTargetDecl();
+    TargetDecl declaration = LfFactory.eINSTANCE.createTargetDecl();
     KeyValuePairs kvp = LfFactory.eINSTANCE.createKeyValuePairs();
     for (KeyValuePair p : extractProperties(this)) {
       kvp.getPairs().add(p);
     }
-    decl.setName(target.toString());
-    decl.setConfig(kvp);
-    return decl;
+    declaration.setName(target.toString());
+    declaration.setConfig(kvp);
+    return declaration;
   }
 
   /**
@@ -259,7 +267,8 @@ public TargetDecl extractTargetDecl() {
    */
   public static void validate(
       KeyValuePairs pairs, Model ast, TargetConfig config, ValidatorMessageReporter reporter) {
-    pairs.getPairs().stream()
+    pairs
+        .getPairs()
         .forEach(
             pair -> {
               var match =
@@ -268,17 +277,19 @@ public static void validate(
                       .findAny();
               if (match.isPresent()) {
                 var p = match.get();
-                p.checkSupport(pair, config.target, reporter);
                 p.checkType(pair, reporter);
                 p.validate(pair, ast, reporter);
               } else {
                 reporter
                     .at(pair, Literals.KEY_VALUE_PAIR__NAME)
                     .warning(
-                        "Unrecognized target property: "
-                            + pair.getName()
-                            + ". Recognized properties are: "
-                            + config.listOfRegisteredProperties());
+                        String.format(
+                            "The target property '%s' is not supported by the %s target and will"
+                                + " thus be ignored.",
+                            pair.getName(), config.target));
+                reporter
+                    .at(pair, Literals.KEY_VALUE_PAIR__NAME)
+                    .info("Recognized properties are: " + config.listOfRegisteredProperties());
               }
             });
   }
diff --git a/core/src/main/java/org/lflang/target/property/AuthProperty.java b/core/src/main/java/org/lflang/target/property/AuthProperty.java
index fd760153b5..e7e173e791 100644
--- a/core/src/main/java/org/lflang/target/property/AuthProperty.java
+++ b/core/src/main/java/org/lflang/target/property/AuthProperty.java
@@ -1,9 +1,5 @@
 package org.lflang.target.property;
 
-import java.util.Arrays;
-import java.util.List;
-import org.lflang.Target;
-
 /** Directive to allow including OpenSSL libraries and process HMAC authentication. */
 public final class AuthProperty extends BooleanProperty {
 
@@ -14,11 +10,6 @@ private AuthProperty() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return Arrays.asList(Target.C, Target.CCPP);
-  }
-
   @Override
   public String name() {
     return "auth";
diff --git a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
index e5a31daf65..8d7df554a1 100644
--- a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
@@ -1,10 +1,8 @@
 package org.lflang.target.property;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
@@ -39,11 +37,6 @@ protected List<String> fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return Arrays.asList(Target.C, Target.CCPP);
-  }
-
   @Override
   public Element toAstElement(List<String> value) {
     return ASTUtils.toElement(value);
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
index 94559a490a..0adfb98024 100644
--- a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
@@ -1,9 +1,6 @@
 package org.lflang.target.property;
 
-import java.util.Arrays;
-import java.util.List;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
@@ -47,9 +44,4 @@ protected BuildType fromString(String string, MessageReporter reporter) {
   public String name() {
     return "build-type";
   }
-
-  @Override
-  public List<Target> supportedTargets() {
-    return Arrays.asList(Target.C, Target.CCPP, Target.CPP, Target.Rust);
-  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
index 16c4fac5ce..d33d344b51 100644
--- a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
@@ -1,11 +1,8 @@
 package org.lflang.target.property;
 
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.generator.rust.CargoDependencySpec;
 import org.lflang.generator.rust.CargoDependencySpec.CargoDependenciesPropertyType;
@@ -64,11 +61,6 @@ protected Map<String, CargoDependencySpec> fromString(String string, MessageRepo
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return Arrays.asList(Target.Rust);
-  }
-
   @Override
   public Element toAstElement(Map<String, CargoDependencySpec> value) {
     if (value.size() == 0) {
diff --git a/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java b/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
index 02308b9bc4..762def85ff 100644
--- a/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoFeaturesProperty.java
@@ -1,9 +1,5 @@
 package org.lflang.target.property;
 
-import java.util.Arrays;
-import java.util.List;
-import org.lflang.Target;
-
 /** Directive for specifying Cargo features of the generated program to enable. */
 public final class CargoFeaturesProperty extends StringListProperty {
 
@@ -14,11 +10,6 @@ private CargoFeaturesProperty() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return Arrays.asList(Target.Rust);
-  }
-
   @Override
   public String name() {
     return "cargo-features";
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
index 70195d9de6..526983a09c 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
@@ -1,9 +1,7 @@
 package org.lflang.target.property;
 
-import java.util.List;
 import java.util.Objects;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
@@ -40,11 +38,6 @@ protected ClockSyncMode fromString(String string, MessageReporter reporter) {
     return this.type.forName(string);
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.C, Target.CCPP, Target.Python);
-  }
-
   @Override
   public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
     super.validate(pair, ast, reporter);
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
index b962f45d8e..4e87412ff4 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
@@ -1,9 +1,6 @@
 package org.lflang.target.property;
 
-import java.util.Arrays;
-import java.util.List;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
@@ -58,11 +55,6 @@ protected ClockSyncOptions fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return Arrays.asList(Target.C, Target.CCPP, Target.Python);
-  }
-
   @Override
   public Element toAstElement(ClockSyncOptions value) {
     Element e = LfFactory.eINSTANCE.createElement();
diff --git a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
index a8e4cc0527..a47379fef1 100644
--- a/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
@@ -1,9 +1,7 @@
 package org.lflang.target.property;
 
-import java.util.Arrays;
 import java.util.List;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 
@@ -32,11 +30,6 @@ protected List<String> fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return Arrays.asList(Target.CPP, Target.C, Target.CCPP);
-  }
-
   @Override
   public Element toAstElement(List<String> value) {
     return ASTUtils.toElement(value);
diff --git a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
index 2bab9c7722..f1b2d2c4ed 100644
--- a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
@@ -1,11 +1,8 @@
 package org.lflang.target.property;
 
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
@@ -58,11 +55,6 @@ protected Map<String, String> fromString(String string, MessageReporter reporter
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return Arrays.asList(Target.C, Target.CCPP, Target.Python);
-  }
-
   @Override
   public Element toAstElement(Map<String, String> value) {
     return ASTUtils.toElement(value);
diff --git a/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
index b5f4e24a28..d137cc769f 100644
--- a/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompilerFlagsProperty.java
@@ -1,9 +1,5 @@
 package org.lflang.target.property;
 
-import java.util.Arrays;
-import java.util.List;
-import org.lflang.Target;
-
 /** Flags to pass to the compiler, unless a build command has been specified. */
 public final class CompilerFlagsProperty extends StringListProperty {
 
@@ -14,11 +10,6 @@ private CompilerFlagsProperty() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return Arrays.asList(Target.C, Target.CCPP);
-  }
-
   @Override
   public String name() {
     return "compiler-flags";
diff --git a/core/src/main/java/org/lflang/target/property/CompilerProperty.java b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
index 5701155fb0..f1ed1f2ebf 100644
--- a/core/src/main/java/org/lflang/target/property/CompilerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
@@ -1,8 +1,5 @@
 package org.lflang.target.property;
 
-import java.util.List;
-import org.lflang.Target;
-
 /** The compiler to invoke, unless a build command has been specified. */
 public final class CompilerProperty extends StringProperty {
 
@@ -13,11 +10,6 @@ private CompilerProperty() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.C, Target.CCPP, Target.CPP);
-  }
-
   @Override
   public String name() {
     return "compiler";
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
index 129c710b37..e8848ea933 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
@@ -1,10 +1,7 @@
 package org.lflang.target.property;
 
-import java.util.Arrays;
-import java.util.List;
 import java.util.Objects;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
@@ -52,11 +49,6 @@ protected CoordinationOptions fromString(String string, MessageReporter reporter
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS);
-  }
-
   @Override
   public Element toAstElement(CoordinationOptions value) {
     Element e = LfFactory.eINSTANCE.createElement();
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
index abe044e943..ed57cbedef 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
@@ -1,9 +1,6 @@
 package org.lflang.target.property;
 
-import java.util.Arrays;
-import java.util.List;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
@@ -39,11 +36,6 @@ protected CoordinationMode fromString(String string, MessageReporter reporter) {
     return ((CoordinationModeType) this.type).forName(string);
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return Arrays.asList(Target.C, Target.CCPP, Target.Python);
-  }
-
   @Override
   public Element toAstElement(CoordinationMode value) {
     return ASTUtils.toElement(value.toString());
diff --git a/core/src/main/java/org/lflang/target/property/DockerProperty.java b/core/src/main/java/org/lflang/target/property/DockerProperty.java
index 2132c6cd78..6e01b980eb 100644
--- a/core/src/main/java/org/lflang/target/property/DockerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DockerProperty.java
@@ -1,10 +1,7 @@
 package org.lflang.target.property;
 
-import java.util.Arrays;
-import java.util.List;
 import java.util.Objects;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
@@ -60,11 +57,6 @@ protected DockerOptions fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return Arrays.asList(Target.C, Target.CCPP, Target.Python, Target.TS);
-  }
-
   @Override
   public Element toAstElement(DockerOptions value) {
     if (!value.enabled) {
diff --git a/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java b/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
index e06295cbb9..56a7935fee 100644
--- a/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExportDependencyGraphProperty.java
@@ -1,8 +1,5 @@
 package org.lflang.target.property;
 
-import java.util.List;
-import org.lflang.Target;
-
 /**
  * If true, the resulting binary will output a graph visualizing all reaction dependencies.
  *
@@ -18,11 +15,6 @@ private ExportDependencyGraphProperty() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.CPP, Target.Rust);
-  }
-
   @Override
   public String name() {
     return "export-dependency-graph";
diff --git a/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java b/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
index 5abe77895d..e592c3d8ec 100644
--- a/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
@@ -1,8 +1,5 @@
 package org.lflang.target.property;
 
-import java.util.List;
-import org.lflang.Target;
-
 /**
  * If true, the resulting binary will output a yaml file describing the whole reactor structure of
  * the program.
@@ -19,11 +16,6 @@ private ExportToYamlProperty() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.CPP);
-  }
-
   @Override
   public String name() {
     return "export-to-yaml";
diff --git a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
index ff6ae354c5..b07b7dd60e 100644
--- a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
@@ -1,8 +1,5 @@
 package org.lflang.target.property;
 
-import java.util.List;
-import org.lflang.Target;
-
 /**
  * Directive for specifying a path to an external runtime libray to link to instead of the default
  * one.
@@ -16,11 +13,6 @@ private ExternalRuntimePathProperty() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.CPP, Target.Rust);
-  }
-
   @Override
   public String name() {
     return "external-runtime-path";
diff --git a/core/src/main/java/org/lflang/target/property/FastProperty.java b/core/src/main/java/org/lflang/target/property/FastProperty.java
index fee019c94e..b48ab9e6f7 100644
--- a/core/src/main/java/org/lflang/target/property/FastProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FastProperty.java
@@ -1,6 +1,5 @@
 package org.lflang.target.property;
 
-import java.util.List;
 import org.lflang.MessageReporter;
 import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
@@ -24,11 +23,6 @@ private FastProperty() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return Target.ALL;
-  }
-
   @Override
   public String name() {
     return "fast";
diff --git a/core/src/main/java/org/lflang/target/property/FedSetupProperty.java b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
index 48c6544fb7..f19594c2ec 100644
--- a/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
@@ -1,8 +1,6 @@
 package org.lflang.target.property;
 
-import java.util.List;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
@@ -37,11 +35,6 @@ protected String fromString(String string, MessageReporter reporter) {
     return string;
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.C, Target.CCPP, Target.Python);
-  }
-
   @Override
   public Element toAstElement(String value) {
     return ASTUtils.toElement(value);
diff --git a/core/src/main/java/org/lflang/target/property/FilesProperty.java b/core/src/main/java/org/lflang/target/property/FilesProperty.java
index c3dff093fc..877939c41d 100644
--- a/core/src/main/java/org/lflang/target/property/FilesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FilesProperty.java
@@ -1,8 +1,5 @@
 package org.lflang.target.property;
 
-import java.util.List;
-import org.lflang.Target;
-
 /** Directive to stage particular files on the class path to be processed by the code generator. */
 public final class FilesProperty extends FileListProperty {
 
@@ -13,11 +10,6 @@ private FilesProperty() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.C, Target.CCPP, Target.Python);
-  }
-
   @Override
   public String name() {
     return "files";
diff --git a/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java b/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
index 5fa11e7f37..dbd3a1ed6f 100644
--- a/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
+++ b/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
@@ -1,9 +1,5 @@
 package org.lflang.target.property;
 
-import java.util.Arrays;
-import java.util.List;
-import org.lflang.Target;
-
 /**
  * Whether the bin directory should have a flat or hierarchical organization. It is flat by default.
  */
@@ -16,11 +12,6 @@ private HierarchicalBinProperty() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return Arrays.asList(Target.C, Target.CCPP);
-  }
-
   @Override
   public String name() {
     return "hierarchical-bin";
diff --git a/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
index 8b639179c8..ee073abbe0 100644
--- a/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
+++ b/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
@@ -1,8 +1,5 @@
 package org.lflang.target.property;
 
-import java.util.List;
-import org.lflang.Target;
-
 /**
  * If true, configure the execution environment to keep executing if there are no more events on the
  * event queue. The default is false.
@@ -16,11 +13,6 @@ private KeepaliveProperty() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.C, Target.CCPP, Target.Python, Target.TS, Target.Rust);
-  }
-
   @Override
   public String name() {
     return "keepalive";
diff --git a/core/src/main/java/org/lflang/target/property/LoggingProperty.java b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
index 051b17c5de..ef6d47cbb9 100644
--- a/core/src/main/java/org/lflang/target/property/LoggingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
@@ -1,8 +1,6 @@
 package org.lflang.target.property;
 
-import java.util.List;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
@@ -36,11 +34,6 @@ protected LogLevel fromString(String string, MessageReporter reporter) {
     return LogLevel.valueOf(string.toUpperCase());
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return Target.ALL;
-  }
-
   @Override
   public Element toAstElement(LogLevel value) {
     return ASTUtils.toElement(value.toString());
diff --git a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
index 6e06552c8f..906899ca92 100644
--- a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
+++ b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
@@ -1,9 +1,5 @@
 package org.lflang.target.property;
 
-import java.util.Arrays;
-import java.util.List;
-import org.lflang.Target;
-
 /** If true, do not invoke the target compiler or build command. The default is false. */
 public final class NoCompileProperty extends BooleanProperty {
 
@@ -14,11 +10,6 @@ private NoCompileProperty() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return Arrays.asList(Target.C, Target.CPP, Target.CCPP, Target.Python);
-  }
-
   @Override
   public String name() {
     return "no-compile";
diff --git a/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java b/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
index a6eb771d2f..81720c4960 100644
--- a/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
+++ b/core/src/main/java/org/lflang/target/property/NoRuntimeValidationProperty.java
@@ -1,8 +1,5 @@
 package org.lflang.target.property;
 
-import java.util.List;
-import org.lflang.Target;
-
 /** If true, do not perform runtime validation. The default is false. */
 public final class NoRuntimeValidationProperty extends BooleanProperty {
 
@@ -13,11 +10,6 @@ private NoRuntimeValidationProperty() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.CPP);
-  }
-
   @Override
   public String name() {
     return "no-runtime-validation";
diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index 04de0d6562..67dffe336b 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -1,8 +1,6 @@
 package org.lflang.target.property;
 
-import java.util.List;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
@@ -72,11 +70,6 @@ protected PlatformOptions fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.C);
-  }
-
   @Override
   public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
     var config = fromAst(pair.getValue(), reporter);
@@ -158,6 +151,23 @@ public static class PlatformOptions { // FIXME: use a record for this
      * Zephyr.
      */
     public int userThreads = 0;
+
+    public String[] boardArray() {
+      // Parse board option of the platform target property
+      // Specified as a series of colon spaced options
+      // Board syntax
+      //  rp2040 <board_name> : <stdio_opt>
+      //  arduino
+      String[] boardProperties = {};
+      if (this.board != null) {
+        boardProperties = this.board.trim().split(":");
+        // Ignore whitespace
+        for (int i = 0; i < boardProperties.length; i++) {
+          boardProperties[i] = boardProperties[i].trim();
+        }
+      }
+      return boardProperties;
+    }
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
index 78b2ffd681..a193e25417 100644
--- a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
@@ -1,8 +1,5 @@
 package org.lflang.target.property;
 
-import java.util.List;
-import org.lflang.Target;
-
 /** If true, instruct the runtime to collect and print execution statistics. */
 public final class PrintStatisticsProperty extends BooleanProperty {
 
@@ -13,11 +10,6 @@ private PrintStatisticsProperty() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.CPP);
-  }
-
   @Override
   public String name() {
     return "print-statistics";
diff --git a/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java b/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
index 6845fb4c77..c70049e3d3 100644
--- a/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ProtobufsProperty.java
@@ -1,8 +1,5 @@
 package org.lflang.target.property;
 
-import java.util.List;
-import org.lflang.Target;
-
 /**
  * Directive for specifying .proto files that need to be compiled and their code included in the
  * sources.
@@ -16,11 +13,6 @@ private ProtobufsProperty() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.C, Target.CCPP, Target.TS, Target.Python);
-  }
-
   @Override
   public String name() {
     return "protobufs";
diff --git a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
index 7dcd052083..620970ec00 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
@@ -37,11 +36,6 @@ protected List<String> fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.CPP);
-  }
-
   @Override
   public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
     var ros2enabled = TargetProperty.getKeyValuePair(ast, Ros2Property.INSTANCE);
diff --git a/core/src/main/java/org/lflang/target/property/Ros2Property.java b/core/src/main/java/org/lflang/target/property/Ros2Property.java
index f764fa9ce4..9138e0aca7 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2Property.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2Property.java
@@ -1,8 +1,5 @@
 package org.lflang.target.property;
 
-import java.util.List;
-import org.lflang.Target;
-
 /** If true, generate ROS2 specific code. */
 public final class Ros2Property extends BooleanProperty {
 
@@ -13,11 +10,6 @@ private Ros2Property() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.CPP);
-  }
-
   @Override
   public String name() {
     return "ros2";
diff --git a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
index eda304a216..be82a06848 100644
--- a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
@@ -1,8 +1,5 @@
 package org.lflang.target.property;
 
-import java.util.List;
-import org.lflang.Target;
-
 /** Directive for specifying a specific version of the reactor runtime library. */
 public final class RuntimeVersionProperty extends StringProperty {
 
@@ -13,11 +10,6 @@ private RuntimeVersionProperty() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.CPP, Target.Rust);
-  }
-
   @Override
   public String name() {
     return "runtime-version";
diff --git a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
index a5ba132010..a2d9001e26 100644
--- a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import org.eclipse.emf.ecore.EObject;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Array;
@@ -31,11 +30,6 @@ private RustIncludeProperty() {
     super(UnionType.FILE_OR_FILE_ARRAY);
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.Rust);
-  }
-
   @Override
   public List<Path> initialValue() {
     return new ArrayList<>();
diff --git a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
index 404235b722..d4c64d2dc3 100644
--- a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
@@ -1,9 +1,6 @@
 package org.lflang.target.property;
 
-import java.util.Arrays;
-import java.util.List;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
@@ -43,11 +40,6 @@ protected Scheduler fromString(String string, MessageReporter reporter) {
     return this.type.forName(string);
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return Arrays.asList(Target.C, Target.CCPP, Target.Python);
-  }
-
   @Override
   public Element toAstElement(Scheduler value) {
     return ASTUtils.toElement(value.toString());
diff --git a/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java b/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
index a20646531b..21d795526b 100644
--- a/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SingleFileProjectProperty.java
@@ -1,8 +1,5 @@
 package org.lflang.target.property;
 
-import java.util.List;
-import org.lflang.Target;
-
 /** Directive to specify that all code is generated in a single file. */
 public final class SingleFileProjectProperty extends BooleanProperty {
 
@@ -13,11 +10,6 @@ private SingleFileProjectProperty() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.Rust);
-  }
-
   @Override
   public String name() {
     return "single-file-project";
diff --git a/core/src/main/java/org/lflang/target/property/ThreadingProperty.java b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
index db970ffc11..f953dc8f1d 100644
--- a/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ThreadingProperty.java
@@ -1,8 +1,5 @@
 package org.lflang.target.property;
 
-import java.util.List;
-import org.lflang.Target;
-
 /** Directive to indicate whether the runtime should use multi-threading. */
 public class ThreadingProperty extends BooleanProperty {
 
@@ -13,11 +10,6 @@ private ThreadingProperty() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.C, Target.CCPP, Target.Python, Target.Rust);
-  }
-
   @Override
   public String name() {
     return "threading";
diff --git a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
index a27553c2a7..1fb4071184 100644
--- a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
@@ -1,8 +1,6 @@
 package org.lflang.target.property;
 
-import java.util.List;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
@@ -34,11 +32,6 @@ protected TimeValue fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return Target.ALL;
-  }
-
   @Override
   public Element toAstElement(TimeValue value) {
     return ASTUtils.toElement(value);
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index 8d6ff8e17a..b236bcad04 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -1,9 +1,7 @@
 package org.lflang.target.property;
 
-import java.util.List;
 import java.util.Objects;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
@@ -57,11 +55,6 @@ protected TracingOptions fromString(String string, MessageReporter reporter) {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.C, Target.CCPP, Target.CPP, Target.Python);
-  }
-
   @Override
   public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
     if (pair != null && this.fromAst(pair.getValue(), reporter) != null) {
diff --git a/core/src/main/java/org/lflang/target/property/VerifyProperty.java b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
index 086e19ecce..f13d60a4b7 100644
--- a/core/src/main/java/org/lflang/target/property/VerifyProperty.java
+++ b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
@@ -1,7 +1,5 @@
 package org.lflang.target.property.type;
 
-import java.util.List;
-import org.lflang.Target;
 import org.lflang.target.property.BooleanProperty;
 
 /** If true, check the generated verification model. The default is false. */
@@ -14,11 +12,6 @@ private VerifyProperty() {
     super();
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.C);
-  }
-
   @Override
   public String name() {
     return "verify";
diff --git a/core/src/main/java/org/lflang/target/property/WorkersProperty.java b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
index d613f04dc2..79a86a4c79 100644
--- a/core/src/main/java/org/lflang/target/property/WorkersProperty.java
+++ b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
@@ -1,8 +1,6 @@
 package org.lflang.target.property;
 
-import java.util.List;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
@@ -36,11 +34,6 @@ protected Integer fromAst(Element node, MessageReporter reporter) {
     return ASTUtils.toInteger(node);
   }
 
-  @Override
-  public List<Target> supportedTargets() {
-    return List.of(Target.C, Target.CCPP, Target.Python, Target.CPP, Target.Rust);
-  }
-
   @Override
   public Element toAstElement(Integer value) {
     return ASTUtils.toElement(value);
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 037a779a77..fb3e4a2e27 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -1830,10 +1830,15 @@ public void testInvalidTargetParam() throws Exception {
                 target C { foobarbaz: true }
                 main reactor {}
             """;
-    List<Issue> issues = validator.validate(parseWithoutError(testCase));
-    Assertions.assertTrue(
-        issues.size() == 1
-            && issues.get(0).getMessage().contains("Unrecognized target property: foobarbaz"));
+    var model = parseWithoutError(testCase);
+    List<Issue> issues = validator.validate(model);
+    Assertions.assertTrue(issues.size() == 2);
+    validator.assertWarning(
+        model,
+        LfPackage.eINSTANCE.getKeyValuePair(),
+        null,
+        "The target property 'foobarbaz' is not supported by the C target and will thus be"
+            + " ignored.");
   }
 
   @Test
@@ -1843,15 +1848,15 @@ public void testTargetParamNotSupportedForTarget() throws Exception {
                 target Python { cargo-features: "" }
                 main reactor {}
             """;
-    List<Issue> issues = validator.validate(parseWithoutError(testCase));
-    Assertions.assertTrue(
-        issues.size() == 1
-            && issues
-                .get(0)
-                .getMessage()
-                .contains(
-                    "The target property: cargo-features"
-                        + " is not supported by the Python target and will thus be ignored."));
+    var model = parseWithoutError(testCase);
+    List<Issue> issues = validator.validate(model);
+    Assertions.assertTrue(issues.size() == 2);
+    validator.assertWarning(
+        model,
+        LfPackage.eINSTANCE.getKeyValuePair(),
+        null,
+        "The target property 'cargo-features' is not supported by the Python target and will thus"
+            + " be ignored.");
   }
 
   @Test

From b131cba90520b222e662b76c8158c72124dd081f Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 17 Oct 2023 14:50:29 -0700
Subject: [PATCH 1036/1114] Fix compilation

---
 .../kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
index f52bf0a9f3..220770b6a9 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppPlatformGenerator.kt
@@ -33,7 +33,7 @@ abstract class CppPlatformGenerator(protected val generator: CppGenerator) {
             "-DCMAKE_BUILD_TYPE=${targetConfig.get(BuildTypeProperty.INSTANCE)}",
             "-DREACTOR_CPP_VALIDATE=${if (targetConfig.get(NoRuntimeValidationProperty.INSTANCE)) "OFF" else "ON"}",
             "-DREACTOR_CPP_PRINT_STATISTICS=${if (targetConfig.get(PrintStatisticsProperty.INSTANCE)) "ON" else "OFF"}",
-            "-DREACTOR_CPP_TRACE=${if (targetConfig.get(TracingProperty()).isEnabled) "ON" else "OFF"}",
+            "-DREACTOR_CPP_TRACE=${if (targetConfig.get(TracingProperty.INSTANCE).isEnabled) "ON" else "OFF"}",
             "-DREACTOR_CPP_LOG_LEVEL=${targetConfig.get(LoggingProperty.INSTANCE).severity}",
             "-DLF_SRC_PKG_PATH=${fileConfig.srcPkgPath}",
         )

From 47686d44c38db310d12e3f82b010f3cfc7c8b79b Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 17 Oct 2023 16:23:28 -0700
Subject: [PATCH 1037/1114] Minor fixes

---
 .../org/lflang/cli/DiagramGenerationTest.java    |  2 +-
 .../java/org/lflang/tests/RunSingleTest.java     |  2 +-
 .../java/org/lflang/tests/RuntimeTest.java       |  2 +-
 .../java/org/lflang/tests/lsp/LspTests.java      |  2 +-
 .../org/lflang/tests/runtime/CArduinoTest.java   |  2 +-
 .../java/org/lflang/tests/runtime/CCppTest.java  |  2 +-
 .../org/lflang/tests/runtime/CSchedulerTest.java |  2 +-
 .../java/org/lflang/tests/runtime/CTest.java     |  2 +-
 .../org/lflang/tests/runtime/CVerifierTest.java  |  2 +-
 .../org/lflang/tests/runtime/CZephyrTest.java    |  2 +-
 .../org/lflang/tests/runtime/CppRos2Test.java    |  2 +-
 .../java/org/lflang/tests/runtime/CppTest.java   |  2 +-
 .../org/lflang/tests/runtime/PythonTest.java     |  2 +-
 .../java/org/lflang/tests/runtime/RustTest.java  |  2 +-
 .../org/lflang/tests/runtime/TypeScriptTest.java |  2 +-
 .../tests/serialization/SerializationTest.java   |  2 +-
 core/src/main/java/org/lflang/ModelInfo.java     |  1 +
 .../lflang/analyses/uclid/UclidGenerator.java    |  2 +-
 core/src/main/java/org/lflang/ast/ASTUtils.java  |  2 +-
 .../main/java/org/lflang/ast/FormattingUtil.java |  2 +-
 core/src/main/java/org/lflang/ast/IsEqual.java   |  2 +-
 core/src/main/java/org/lflang/ast/ToLf.java      |  2 +-
 .../lflang/federated/extensions/CExtension.java  |  2 +-
 .../extensions/FedTargetExtensionFactory.java    |  2 +-
 .../lflang/federated/generator/FedGenerator.java |  2 +-
 .../federated/generator/FedTargetConfig.java     |  2 +-
 .../FedNativePythonSerialization.java            |  2 +-
 .../serialization/FedROS2CPPSerialization.java   |  2 +-
 .../java/org/lflang/generator/GeneratorBase.java | 12 +++++++-----
 .../org/lflang/generator/GeneratorUtils.java     |  2 +-
 .../java/org/lflang/generator/LFGenerator.java   |  2 +-
 .../org/lflang/generator/c/CActionGenerator.java |  2 +-
 .../org/lflang/generator/c/CDockerGenerator.java |  2 +-
 .../java/org/lflang/generator/c/CGenerator.java  |  2 +-
 .../org/lflang/generator/c/CPortGenerator.java   |  2 +-
 .../lflang/generator/python/PythonGenerator.java |  2 +-
 .../python/PythonReactionGenerator.java          |  2 +-
 .../java/org/lflang/{ => target}/Target.java     |  3 +--
 .../java/org/lflang/target/TargetConfig.java     | 16 ++++++++--------
 .../org/lflang/target/property/FastProperty.java |  2 +-
 .../target/property/type/DictionaryType.java     |  2 +-
 .../lflang/target/property/type/UnionType.java   |  2 +-
 .../java/org/lflang/validation/LFValidator.java  |  2 +-
 .../org/lflang/generator/cpp/CppGenerator.kt     |  2 +-
 .../org/lflang/generator/rust/RustGenerator.kt   |  2 +-
 .../org/lflang/generator/ts/TSGenerator.kt       |  3 +--
 .../compiler/LinguaFrancaValidationTest.java     |  2 +-
 .../lflang/tests/compiler/RoundTripTests.java    |  2 +-
 .../java/org/lflang/tests/TestBase.java          |  2 +-
 .../java/org/lflang/tests/TestRegistry.java      |  2 +-
 50 files changed, 63 insertions(+), 62 deletions(-)
 rename core/src/main/java/org/lflang/{ => target}/Target.java (99%)

diff --git a/cli/lfd/src/test/java/org/lflang/cli/DiagramGenerationTest.java b/cli/lfd/src/test/java/org/lflang/cli/DiagramGenerationTest.java
index 2fcb332fe6..73c5aafd58 100644
--- a/cli/lfd/src/test/java/org/lflang/cli/DiagramGenerationTest.java
+++ b/cli/lfd/src/test/java/org/lflang/cli/DiagramGenerationTest.java
@@ -23,8 +23,8 @@
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
-import org.lflang.Target;
 import org.lflang.lf.Model;
+import org.lflang.target.Target;
 import org.lflang.tests.LFInjectorProvider;
 import org.lflang.tests.LFTest;
 import org.lflang.tests.TestRegistry;
diff --git a/core/src/integrationTest/java/org/lflang/tests/RunSingleTest.java b/core/src/integrationTest/java/org/lflang/tests/RunSingleTest.java
index fe813823bd..dc04a717c4 100644
--- a/core/src/integrationTest/java/org/lflang/tests/RunSingleTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/RunSingleTest.java
@@ -32,7 +32,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.junit.jupiter.api.Test;
-import org.lflang.Target;
+import org.lflang.target.Target;
 import org.lflang.tests.runtime.CCppTest;
 import org.lflang.tests.runtime.CTest;
 import org.lflang.tests.runtime.CppTest;
diff --git a/core/src/integrationTest/java/org/lflang/tests/RuntimeTest.java b/core/src/integrationTest/java/org/lflang/tests/RuntimeTest.java
index 8f0ccdc8fd..add74ef30d 100644
--- a/core/src/integrationTest/java/org/lflang/tests/RuntimeTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/RuntimeTest.java
@@ -4,8 +4,8 @@
 import java.util.List;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
-import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
+import org.lflang.target.Target;
 import org.lflang.tests.TestRegistry.TestCategory;
 
 /**
diff --git a/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java b/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java
index 964963bd0e..6b92b46754 100644
--- a/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java
+++ b/core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java
@@ -14,9 +14,9 @@
 import org.eclipse.lsp4j.Diagnostic;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.lflang.Target;
 import org.lflang.generator.IntegratedBuilder;
 import org.lflang.generator.LanguageServerMessageReporter;
+import org.lflang.target.Target;
 import org.lflang.tests.LFTest;
 import org.lflang.tests.LfInjectedTestBase;
 import org.lflang.tests.TestBase;
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CArduinoTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CArduinoTest.java
index b8ae804a09..6a5abdf41d 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CArduinoTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CArduinoTest.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
-import org.lflang.Target;
+import org.lflang.target.Target;
 import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry.TestCategory;
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java
index 3bbbda7dad..47c4708114 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java
@@ -2,8 +2,8 @@
 
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
-import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
+import org.lflang.target.Target;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry.TestCategory;
 
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
index e8c13d73b0..3f48a22f29 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
@@ -2,7 +2,7 @@
 
 import java.util.EnumSet;
 import org.junit.jupiter.api.Test;
-import org.lflang.Target;
+import org.lflang.target.Target;
 import org.lflang.target.property.type.SchedulerType.Scheduler;
 import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CTest.java
index 8da7d6117d..88c4aa89cf 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CTest.java
@@ -27,7 +27,7 @@
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.lflang.Target;
+import org.lflang.target.Target;
 import org.lflang.tests.RuntimeTest;
 
 /**
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
index e888854318..949b66276c 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
-import org.lflang.Target;
+import org.lflang.target.Target;
 import org.lflang.target.property.type.VerifyProperty;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry;
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java
index 08b18b2a72..2529710b80 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java
@@ -27,7 +27,7 @@
 import java.util.List;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
-import org.lflang.Target;
+import org.lflang.target.Target;
 import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry.TestCategory;
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
index b21a932bdd..9970b18424 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
@@ -2,9 +2,9 @@
 
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
-import org.lflang.Target;
 import org.lflang.lf.Element;
 import org.lflang.lf.LfFactory;
+import org.lflang.target.Target;
 import org.lflang.target.property.Ros2Property;
 import org.lflang.tests.TestBase;
 
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CppTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CppTest.java
index b284e8b7af..59e26fca69 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CppTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CppTest.java
@@ -27,7 +27,7 @@
 package org.lflang.tests.runtime;
 
 import org.junit.jupiter.api.Test;
-import org.lflang.Target;
+import org.lflang.target.Target;
 import org.lflang.tests.RuntimeTest;
 
 /**
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
index c227018d16..35ea43fdfa 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
@@ -28,7 +28,7 @@
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.lflang.Target;
+import org.lflang.target.Target;
 import org.lflang.target.TargetConfig;
 import org.lflang.tests.RuntimeTest;
 
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/RustTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/RustTest.java
index 75c1de4e15..3db509bb32 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/RustTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/RustTest.java
@@ -25,7 +25,7 @@
 package org.lflang.tests.runtime;
 
 import org.junit.jupiter.api.Test;
-import org.lflang.Target;
+import org.lflang.target.Target;
 import org.lflang.tests.RuntimeTest;
 
 /** */
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/TypeScriptTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/TypeScriptTest.java
index 8fb223fe07..bc107af40b 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/TypeScriptTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/TypeScriptTest.java
@@ -2,7 +2,7 @@
 
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
-import org.lflang.Target;
+import org.lflang.target.Target;
 import org.lflang.tests.RuntimeTest;
 
 /**
diff --git a/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java b/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
index d72495e540..ba6c3188a0 100644
--- a/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
@@ -3,7 +3,7 @@
 import java.util.Properties;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
-import org.lflang.Target;
+import org.lflang.target.Target;
 import org.lflang.target.TargetConfig;
 import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
diff --git a/core/src/main/java/org/lflang/ModelInfo.java b/core/src/main/java/org/lflang/ModelInfo.java
index 765cebb916..24f62c550d 100644
--- a/core/src/main/java/org/lflang/ModelInfo.java
+++ b/core/src/main/java/org/lflang/ModelInfo.java
@@ -47,6 +47,7 @@
 import org.lflang.lf.ParameterReference;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.STP;
+import org.lflang.target.Target;
 import org.lflang.util.FileUtil;
 
 /**
diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
index c563356edf..b3e7984133 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -37,7 +37,6 @@
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.lflang.Target;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.analyses.c.AstUtils;
@@ -76,6 +75,7 @@
 import org.lflang.lf.Connection;
 import org.lflang.lf.Expression;
 import org.lflang.lf.Time;
+import org.lflang.target.Target;
 import org.lflang.util.StringUtil;
 
 /** (EXPERIMENTAL) Generator for Uclid5 models. */
diff --git a/core/src/main/java/org/lflang/ast/ASTUtils.java b/core/src/main/java/org/lflang/ast/ASTUtils.java
index ed2141dbe2..257d387843 100644
--- a/core/src/main/java/org/lflang/ast/ASTUtils.java
+++ b/core/src/main/java/org/lflang/ast/ASTUtils.java
@@ -60,7 +60,6 @@
 import org.eclipse.xtext.xbase.lib.StringExtensions;
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.generator.CodeMap;
@@ -101,6 +100,7 @@
 import org.lflang.lf.Watchdog;
 import org.lflang.lf.WidthSpec;
 import org.lflang.lf.WidthTerm;
+import org.lflang.target.Target;
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.CompileDefinitionsProperty;
 import org.lflang.util.StringUtil;
diff --git a/core/src/main/java/org/lflang/ast/FormattingUtil.java b/core/src/main/java/org/lflang/ast/FormattingUtil.java
index 113bcb27c8..ff5e786b5a 100644
--- a/core/src/main/java/org/lflang/ast/FormattingUtil.java
+++ b/core/src/main/java/org/lflang/ast/FormattingUtil.java
@@ -9,8 +9,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.eclipse.emf.ecore.EObject;
-import org.lflang.Target;
 import org.lflang.lf.Model;
+import org.lflang.target.Target;
 
 /**
  * Utility functions that determine the specific behavior of the LF formatter.
diff --git a/core/src/main/java/org/lflang/ast/IsEqual.java b/core/src/main/java/org/lflang/ast/IsEqual.java
index 9ac2a0a389..693abdcdb9 100644
--- a/core/src/main/java/org/lflang/ast/IsEqual.java
+++ b/core/src/main/java/org/lflang/ast/IsEqual.java
@@ -7,7 +7,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import org.eclipse.emf.ecore.EObject;
-import org.lflang.Target;
 import org.lflang.TimeUnit;
 import org.lflang.lf.Action;
 import org.lflang.lf.Array;
@@ -64,6 +63,7 @@
 import org.lflang.lf.WidthSpec;
 import org.lflang.lf.WidthTerm;
 import org.lflang.lf.util.LfSwitch;
+import org.lflang.target.Target;
 
 /**
  * Switch class that checks if subtrees of the AST are semantically equivalent to each other. Return
diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
index dd8096a5e3..722e791a5f 100644
--- a/core/src/main/java/org/lflang/ast/ToLf.java
+++ b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -20,7 +20,6 @@
 import org.eclipse.xtext.nodemodel.INode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.lflang.Target;
 import org.lflang.ast.MalleableString.Builder;
 import org.lflang.ast.MalleableString.Joiner;
 import org.lflang.lf.Action;
@@ -79,6 +78,7 @@
 import org.lflang.lf.WidthSpec;
 import org.lflang.lf.WidthTerm;
 import org.lflang.lf.util.LfSwitch;
+import org.lflang.target.Target;
 import org.lflang.util.StringUtil;
 
 /**
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index 1d50d14825..b7191b9072 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -35,7 +35,6 @@
 import java.util.List;
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedASTUtils;
@@ -56,6 +55,7 @@
 import org.lflang.lf.Port;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.VarRef;
+import org.lflang.target.Target;
 import org.lflang.target.property.ClockSyncOptionsProperty;
 import org.lflang.target.property.CoordinationOptionsProperty;
 import org.lflang.target.property.CoordinationProperty;
diff --git a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtensionFactory.java b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtensionFactory.java
index 612aa02f7c..114735307f 100644
--- a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtensionFactory.java
+++ b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtensionFactory.java
@@ -1,6 +1,6 @@
 package org.lflang.federated.extensions;
 
-import org.lflang.Target;
+import org.lflang.target.Target;
 
 /**
  * Class for instantiating target extensions.
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 682d12d1eb..07b887c5ab 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -30,7 +30,6 @@
 import org.lflang.FileConfig;
 import org.lflang.LFStandaloneSetup;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.launcher.FedLauncherGenerator;
 import org.lflang.federated.launcher.RtiConfig;
@@ -57,6 +56,7 @@
 import org.lflang.lf.Reactor;
 import org.lflang.lf.TargetDecl;
 import org.lflang.lf.VarRef;
+import org.lflang.target.Target;
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.CoordinationProperty;
 import org.lflang.target.property.DockerProperty;
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
index 4a618d0823..bfc8dd6194 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
@@ -7,12 +7,12 @@
 import java.util.Objects;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfFactory;
+import org.lflang.target.Target;
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.ClockSyncModeProperty;
 import org.lflang.target.property.ClockSyncOptionsProperty;
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java
index 7e6b7b2869..f9f863a306 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedNativePythonSerialization.java
@@ -27,8 +27,8 @@
 
 package org.lflang.federated.serialization;
 
-import org.lflang.Target;
 import org.lflang.generator.GeneratorBase;
+import org.lflang.target.Target;
 
 /**
  * Enables support for Python pickle serialization.
diff --git a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
index 225d519d77..447b509582 100644
--- a/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
+++ b/core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
@@ -27,8 +27,8 @@
 
 package org.lflang.federated.serialization;
 
-import org.lflang.Target;
 import org.lflang.generator.GeneratorBase;
+import org.lflang.target.Target;
 import org.lflang.target.property.CompilerProperty;
 
 /**
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index c44767fed9..b194c72c5e 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -48,7 +48,6 @@
 import org.lflang.FileConfig;
 import org.lflang.MainConflictChecker;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.analyses.uclid.UclidGenerator;
 import org.lflang.ast.ASTUtils;
 import org.lflang.ast.AstTransformation;
@@ -60,6 +59,7 @@
 import org.lflang.lf.Mode;
 import org.lflang.lf.Reaction;
 import org.lflang.lf.Reactor;
+import org.lflang.target.Target;
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.FilesProperty;
 import org.lflang.target.property.ThreadingProperty;
@@ -267,7 +267,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
 
     // Check for the existence and support of watchdogs
     hasWatchdogs = IterableExtensions.exists(reactors, it -> !it.getWatchdogs().isEmpty());
-    checkWatchdogSupport(targetConfig.get(ThreadingProperty.INSTANCE) && getTarget() == Target.C);
+    checkWatchdogSupport(getTarget() == Target.C && targetConfig.get(ThreadingProperty.INSTANCE));
     additionalPostProcessingForModes();
   }
 
@@ -332,9 +332,11 @@ protected void setReactorsAndInstantiationGraph(LFGeneratorContext.Mode mode) {
    * @param fileConfig The fileConfig used to make the copy and resolve paths.
    */
   protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
-    var dst = this.context.getFileConfig().getSrcGenPath();
-    FileUtil.copyFilesOrDirectories(
-        targetConfig.get(FilesProperty.INSTANCE), dst, fileConfig, messageReporter, false);
+    if (targetConfig.isSet(FilesProperty.INSTANCE)) {
+      var dst = this.context.getFileConfig().getSrcGenPath();
+      FileUtil.copyFilesOrDirectories(
+          targetConfig.get(FilesProperty.INSTANCE), dst, fileConfig, messageReporter, false);
+    }
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
index 1ce0cac900..43854e9217 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorUtils.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorUtils.java
@@ -12,7 +12,6 @@
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.LFGeneratorContext.Mode;
 import org.lflang.lf.Action;
@@ -22,6 +21,7 @@
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.Reactor;
 import org.lflang.lf.TargetDecl;
+import org.lflang.target.Target;
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.KeepaliveProperty;
 
diff --git a/core/src/main/java/org/lflang/generator/LFGenerator.java b/core/src/main/java/org/lflang/generator/LFGenerator.java
index 701c57fb5a..a7776c7b57 100644
--- a/core/src/main/java/org/lflang/generator/LFGenerator.java
+++ b/core/src/main/java/org/lflang/generator/LFGenerator.java
@@ -12,7 +12,6 @@
 import org.eclipse.xtext.util.RuntimeIOException;
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedASTUtils;
 import org.lflang.federated.generator.FedFileConfig;
@@ -28,6 +27,7 @@
 import org.lflang.generator.ts.TSFileConfig;
 import org.lflang.generator.ts.TSGenerator;
 import org.lflang.scoping.LFGlobalScopeProvider;
+import org.lflang.target.Target;
 
 /** Generates code from your model files on save. */
 public class LFGenerator extends AbstractGenerator {
diff --git a/core/src/main/java/org/lflang/generator/c/CActionGenerator.java b/core/src/main/java/org/lflang/generator/c/CActionGenerator.java
index 83f47a3afc..8189a1db4a 100644
--- a/core/src/main/java/org/lflang/generator/c/CActionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CActionGenerator.java
@@ -4,12 +4,12 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.ActionInstance;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Action;
+import org.lflang.target.Target;
 
 /**
  * Generates code for actions (logical or physical) for the C and CCpp target.
diff --git a/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java b/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
index 4f2cb10f1d..77fbc9dfe3 100644
--- a/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CDockerGenerator.java
@@ -1,9 +1,9 @@
 package org.lflang.generator.c;
 
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.lflang.Target;
 import org.lflang.generator.DockerGenerator;
 import org.lflang.generator.LFGeneratorContext;
+import org.lflang.target.Target;
 import org.lflang.target.property.BuildCommandsProperty;
 import org.lflang.target.property.DockerProperty;
 import org.lflang.util.StringUtil;
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index a13cd3c440..d367b49d7b 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -51,7 +51,6 @@
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.lflang.FileConfig;
-import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.ast.DelayedConnectionTransformation;
 import org.lflang.federated.extensions.CExtensionUtils;
@@ -86,6 +85,7 @@
 import org.lflang.lf.ReactorDecl;
 import org.lflang.lf.StateVar;
 import org.lflang.lf.Variable;
+import org.lflang.target.Target;
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.BuildCommandsProperty;
 import org.lflang.target.property.CmakeIncludeProperty;
diff --git a/core/src/main/java/org/lflang/generator/c/CPortGenerator.java b/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
index eafec3dce0..945a204a8e 100644
--- a/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPortGenerator.java
@@ -4,7 +4,6 @@
 
 import org.lflang.AttributeUtils;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.PortInstance;
@@ -12,6 +11,7 @@
 import org.lflang.lf.Output;
 import org.lflang.lf.Port;
 import org.lflang.lf.ReactorDecl;
+import org.lflang.target.Target;
 
 /**
  * Generates C code to declare and initialize ports.
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index fe7e3b6bf4..9236e5e87d 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -38,7 +38,6 @@
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.lflang.AttributeUtils;
 import org.lflang.FileConfig;
-import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.CodeMap;
@@ -59,6 +58,7 @@
 import org.lflang.lf.Port;
 import org.lflang.lf.Reaction;
 import org.lflang.lf.Reactor;
+import org.lflang.target.Target;
 import org.lflang.target.property.CompilerFlagsProperty;
 import org.lflang.target.property.CompilerProperty;
 import org.lflang.target.property.ProtobufsProperty;
diff --git a/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
index c65d4ad3de..cd008cba8d 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonReactionGenerator.java
@@ -6,7 +6,6 @@
 import java.util.Set;
 import org.lflang.AttributeUtils;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ReactionInstance;
@@ -28,6 +27,7 @@
 import org.lflang.lf.ReactorDecl;
 import org.lflang.lf.TriggerRef;
 import org.lflang.lf.VarRef;
+import org.lflang.target.Target;
 import org.lflang.util.StringUtil;
 
 public class PythonReactionGenerator {
diff --git a/core/src/main/java/org/lflang/Target.java b/core/src/main/java/org/lflang/target/Target.java
similarity index 99%
rename from core/src/main/java/org/lflang/Target.java
rename to core/src/main/java/org/lflang/target/Target.java
index 774d802c05..91e4e3c8f0 100644
--- a/core/src/main/java/org/lflang/Target.java
+++ b/core/src/main/java/org/lflang/target/Target.java
@@ -15,7 +15,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lflang;
+package org.lflang.target;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -26,7 +26,6 @@
 import java.util.Set;
 import net.jcip.annotations.Immutable;
 import org.lflang.lf.TargetDecl;
-import org.lflang.target.TargetConfig;
 import org.lflang.target.property.AuthProperty;
 import org.lflang.target.property.BuildCommandsProperty;
 import org.lflang.target.property.BuildTypeProperty;
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 0e6a7999fb..0aa1f38bcc 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -37,7 +37,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
@@ -136,14 +135,15 @@ public void reset(TargetProperty<?, ?> property) {
   @SuppressWarnings("unchecked")
   public <T, S extends TargetPropertyType> T get(TargetProperty<T, S> property)
       throws IllegalArgumentException {
-    var value = properties.get(property);
-    if (value != null) {
+    if (properties.containsKey(property)) {
+      var value = properties.get(property);
       return (T) value;
+    } else {
+      throw new IllegalArgumentException(
+          String.format(
+              "Attempting to access target property '%s', which is not supported by the %s target.",
+              property.name(), this.target));
     }
-    throw new IllegalArgumentException(
-        String.format(
-            "Attempting to access target property '%s', which is not supported by the %s target.",
-            property.name(), this.target));
   }
 
   /**
@@ -185,7 +185,7 @@ public void load(Properties properties, MessageReporter err) {
         var property = p.get();
         property.update(this, (String) properties.get(key), err);
       } else {
-        throw new RuntimeException("Attempting to load unrecognized target property: " + key);
+        err.nowhere().warning("Attempting to load unrecognized target property: " + key);
       }
     }
   }
diff --git a/core/src/main/java/org/lflang/target/property/FastProperty.java b/core/src/main/java/org/lflang/target/property/FastProperty.java
index b48ab9e6f7..d2509b81c3 100644
--- a/core/src/main/java/org/lflang/target/property/FastProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FastProperty.java
@@ -1,7 +1,6 @@
 package org.lflang.target.property;
 
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Action;
 import org.lflang.lf.ActionOrigin;
@@ -9,6 +8,7 @@
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
 import org.lflang.lf.Reactor;
+import org.lflang.target.Target;
 
 /**
  * If true, configure the execution environment such that it does not wait for physical time to
diff --git a/core/src/main/java/org/lflang/target/property/type/DictionaryType.java b/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
index 00aae0a870..1dc8e057e6 100644
--- a/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
+++ b/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
@@ -5,11 +5,11 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfPackage.Literals;
+import org.lflang.target.Target;
 import org.lflang.target.property.ClockSyncOptionsProperty.ClockSyncOption;
 import org.lflang.target.property.CoordinationOptionsProperty.CoordinationOption;
 import org.lflang.target.property.DockerProperty.DockerOption;
diff --git a/core/src/main/java/org/lflang/target/property/type/UnionType.java b/core/src/main/java/org/lflang/target/property/type/UnionType.java
index 66abb1d1ef..dc53fc26b5 100644
--- a/core/src/main/java/org/lflang/target/property/type/UnionType.java
+++ b/core/src/main/java/org/lflang/target/property/type/UnionType.java
@@ -5,8 +5,8 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 import org.lflang.MessageReporter;
-import org.lflang.Target;
 import org.lflang.lf.Element;
+import org.lflang.target.Target;
 
 /**
  * A type that can assume one of several types.
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 218d5e1d4d..bd98c4b416 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -58,7 +58,6 @@
 import org.lflang.AttributeUtils;
 import org.lflang.InferredType;
 import org.lflang.ModelInfo;
-import org.lflang.Target;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.serialization.SupportedSerializers;
@@ -113,6 +112,7 @@
 import org.lflang.lf.Visibility;
 import org.lflang.lf.WidthSpec;
 import org.lflang.lf.WidthTerm;
+import org.lflang.target.Target;
 import org.lflang.target.TargetConfig;
 import org.lflang.util.FileUtil;
 
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
index ec97ea9b80..ea8826ec15 100644
--- a/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/cpp/CppGenerator.kt
@@ -27,7 +27,7 @@
 package org.lflang.generator.cpp
 
 import org.eclipse.emf.ecore.resource.Resource
-import org.lflang.Target
+import org.lflang.target.Target
 import org.lflang.generator.*
 import org.lflang.generator.GeneratorUtils.canGenerate
 import org.lflang.generator.LFGeneratorContext.Mode
diff --git a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
index a3ae57ba21..b37fe1b2a1 100644
--- a/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/rust/RustGenerator.kt
@@ -25,7 +25,7 @@
 package org.lflang.generator.rust
 
 import org.eclipse.emf.ecore.resource.Resource
-import org.lflang.Target
+import org.lflang.target.Target
 import org.lflang.generator.*
 import org.lflang.generator.GeneratorUtils.canGenerate
 import org.lflang.joinWithCommas
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
index 8c764ae58d..f5cc708384 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -27,7 +27,7 @@ package org.lflang.generator.ts
 
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.xtext.util.CancelIndicator
-import org.lflang.Target
+import org.lflang.target.Target
 import org.lflang.TimeValue
 import org.lflang.ast.DelayedConnectionTransformation
 import org.lflang.generator.*
@@ -38,7 +38,6 @@ import org.lflang.scoping.LFGlobalScopeProvider
 import org.lflang.target.property.DockerProperty
 import org.lflang.target.property.NoCompileProperty
 import org.lflang.target.property.ProtobufsProperty
-import org.lflang.target.property.type.PrimitiveType
 import org.lflang.util.FileUtil
 import java.nio.file.Files
 import java.nio.file.Path
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index fb3e4a2e27..89582b475d 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -44,12 +44,12 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.lflang.Target;
 import org.lflang.TargetProperty;
 import org.lflang.TimeValue;
 import org.lflang.lf.LfPackage;
 import org.lflang.lf.Model;
 import org.lflang.lf.Visibility;
+import org.lflang.target.Target;
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.CargoDependenciesProperty;
 import org.lflang.target.property.PlatformProperty;
diff --git a/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java b/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
index 9dc4957f2c..3be9ec6b07 100644
--- a/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/RoundTripTests.java
@@ -19,11 +19,11 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
-import org.lflang.Target;
 import org.lflang.ast.FormattingUtil;
 import org.lflang.ast.IsEqual;
 import org.lflang.ast.LfParsingHelper;
 import org.lflang.lf.Model;
+import org.lflang.target.Target;
 import org.lflang.tests.LFInjectorProvider;
 import org.lflang.tests.LFTest;
 import org.lflang.tests.LfParsingTestHelper;
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index d9d36b2ea7..73fb9155d5 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -38,12 +38,12 @@
 import org.lflang.FileConfig;
 import org.lflang.LFRuntimeModule;
 import org.lflang.LFStandaloneSetup;
-import org.lflang.Target;
 import org.lflang.generator.GeneratorResult;
 import org.lflang.generator.LFGenerator;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.LFGeneratorContext.BuildParm;
 import org.lflang.generator.MainContext;
+import org.lflang.target.Target;
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.LoggingProperty;
 import org.lflang.tests.Configurators.Configurator;
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
index 06024a3e29..92876aa5f6 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
@@ -27,8 +27,8 @@
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.lflang.LFResourceProvider;
-import org.lflang.Target;
 import org.lflang.lf.Reactor;
+import org.lflang.target.Target;
 import org.lflang.tests.TestBase.TestLevel;
 
 /**

From 50e3780d6c2d31023215650a4fe9a225a1a86d42 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 17 Oct 2023 17:33:34 -0700
Subject: [PATCH 1038/1114] Undo refactoring of CCmakeGenerator because its
 just too far gone

---
 .../lflang/generator/c/CCmakeGenerator.java   | 353 +++++++++---------
 .../org/lflang/generator/c/CGenerator.java    |   4 +
 2 files changed, 172 insertions(+), 185 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index ce03c21d8f..ea783b162a 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -32,8 +32,10 @@
 import java.util.List;
 import java.util.stream.Stream;
 import org.lflang.FileConfig;
+import org.lflang.MessageReporter;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.LFGeneratorContext;
+import org.lflang.target.TargetConfig;
 import org.lflang.target.property.AuthProperty;
 import org.lflang.target.property.BuildTypeProperty;
 import org.lflang.target.property.CmakeIncludeProperty;
@@ -41,7 +43,6 @@
 import org.lflang.target.property.CompilerFlagsProperty;
 import org.lflang.target.property.CompilerProperty;
 import org.lflang.target.property.PlatformProperty;
-import org.lflang.target.property.PlatformProperty.PlatformOptions;
 import org.lflang.target.property.ProtobufsProperty;
 import org.lflang.target.property.ThreadingProperty;
 import org.lflang.target.property.WorkersProperty;
@@ -108,8 +109,9 @@ CodeBuilder generateCMakeCode(
       boolean hasMain,
       String cMakeExtras,
       LFGeneratorContext context) {
-    CodeBuilder cMakeCode = new CodeBuilder();
 
+    CodeBuilder cMakeCode = new CodeBuilder();
+    var executableName = context.getFileConfig().name;
     var targetConfig = context.getTargetConfig();
     var messageReporter = context.getErrorReporter();
 
@@ -121,13 +123,84 @@ CodeBuilder generateCMakeCode(
               .relativize(fileConfig.getSrcGenPath().resolve(Paths.get(file)));
       additionalSources.add(FileUtil.toUnixString(relativePath));
     }
+    // Parse board option of the platform target property
+    // Specified as a series of colon spaced options
+    // Board syntax
+    //  rp2040 <board_name> : <stdio_opt>
+    //  arduino
+    String[] boardProperties = {};
+    var platformOptions = targetConfig.get(PlatformProperty.INSTANCE);
+    if (platformOptions.board != null) {
+      boardProperties = platformOptions.board.trim().split(":");
+      // Ignore whitespace
+      for (int i = 0; i < boardProperties.length; i++) {
+        boardProperties[i] = boardProperties[i].trim();
+      }
+    }
 
     additionalSources.addAll(this.additionalSources);
     cMakeCode.newLine();
 
     cMakeCode.pr("cmake_minimum_required(VERSION " + MIN_CMAKE_VERSION + ")");
 
-    preTargetDefinitionPlatformConfig(context, hasMain, sources, cMakeCode);
+    // Setup the project header for different platforms
+    switch (platformOptions.platform) {
+      case ZEPHYR:
+        cMakeCode.pr("# Set default configuration file. To add custom configurations,");
+        cMakeCode.pr("# pass -- -DOVERLAY_CONFIG=my_config.prj to either cmake or west");
+        cMakeCode.pr("set(CONF_FILE prj_lf.conf)");
+        if (platformOptions.board != null) {
+          cMakeCode.pr("# Selecting board specified in target property");
+          cMakeCode.pr("set(BOARD " + platformOptions.board + ")");
+        } else {
+          cMakeCode.pr("# Selecting default board");
+          cMakeCode.pr("set(BOARD qemu_cortex_m3)");
+        }
+        cMakeCode.pr("# We recommend Zephyr v3.4.0 but we are compatible with older versions also");
+        cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} 3.4.0)");
+        cMakeCode.newLine();
+        cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
+        cMakeCode.newLine();
+        break;
+      case RP2040:
+        // Attempt to set PICO_SDK_PATH if it is not already set.
+        if (System.getenv("PICO_SDK_PATH") == null) {
+          Path picoSDKPath = fileConfig.srcPkgPath.resolve("pico-sdk");
+          if (Files.isDirectory(picoSDKPath)) {
+            messageReporter
+                .nowhere()
+                .info(
+                    "pico-sdk library found at "
+                        + picoSDKPath.toString()
+                        + ". You can override this by setting PICO_SDK_PATH.");
+            cMakeCode.pr("# Define the root of the pico-sdk library.");
+            cMakeCode.pr("set(PICO_SDK_PATH " + picoSDKPath + ")");
+          } else {
+            messageReporter
+                .nowhere()
+                .warning(
+                    "No PICO_SDK_PATH environment variable and no pico-sdk directory "
+                        + "at the package root directory. Pico SDK will not be found.");
+          }
+        }
+        cMakeCode.pr("include(pico_sdk_import.cmake)");
+        cMakeCode.pr("project(" + executableName + " LANGUAGES C CXX ASM)");
+        cMakeCode.newLine();
+        // board type for rp2040 based boards
+        if (platformOptions.board != null) {
+          if (boardProperties.length < 1 || boardProperties[0].equals("")) {
+            cMakeCode.pr("set(PICO_BOARD pico)");
+          } else {
+            cMakeCode.pr("set(PICO_BOARD \"" + boardProperties[0] + "\")");
+          }
+        }
+        // remove warnings for rp2040 only to make debug easier
+        cMakeCode.pr("set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -w\")");
+        break;
+      default:
+        cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
+        cMakeCode.newLine();
+    }
 
     // The Test build type is the Debug type plus coverage generation
     cMakeCode.pr("if(CMAKE_BUILD_TYPE STREQUAL \"Test\")");
@@ -157,8 +230,7 @@ CodeBuilder generateCMakeCode(
     cMakeCode.pr("set(CMAKE_CXX_STANDARD 17)");
     cMakeCode.pr("set(CMAKE_CXX_STANDARD_REQUIRED ON)");
     cMakeCode.newLine();
-    if (targetConfig.isSet(CmakeIncludeProperty.INSTANCE)
-        && !targetConfig.get(CmakeIncludeProperty.INSTANCE).isEmpty()) {
+    if (!targetConfig.get(CmakeIncludeProperty.INSTANCE).isEmpty()) {
       // The user might be using the non-keyword form of
       // target_link_libraries. Ideally we would detect whether they are
       // doing that, but it is easier to just always have a deprecation
@@ -189,6 +261,54 @@ CodeBuilder generateCMakeCode(
       cMakeCode.newLine();
     }
 
+    if (platformOptions.platform != Platform.AUTO) {
+      cMakeCode.pr("set(CMAKE_SYSTEM_NAME " + platformOptions.platform.getcMakeName() + ")");
+    }
+    cMakeCode.newLine();
+    cMakeCode.pr("# Set default values for build parameters\n");
+    targetConfig
+        .get(CompileDefinitionsProperty.INSTANCE)
+        .forEach(
+            (key, value) -> {
+              if (key.equals("LF_THREADED") || key.equals("LF_UNTHREADED")) {
+                cMakeCode.pr("if (NOT DEFINED LF_THREADED AND NOT DEFINED LF_UNTHREADED)\n");
+              } else {
+                cMakeCode.pr("if (NOT DEFINED " + key + ")\n");
+              }
+              cMakeCode.indent();
+              var v = "TRUE";
+              if (value != null && !value.isEmpty()) {
+                v = value;
+              }
+              cMakeCode.pr("set(" + key + " " + v + ")\n");
+              cMakeCode.unindent();
+              cMakeCode.pr("endif()\n");
+            });
+
+    // Setup main target for different platforms
+    switch (platformOptions.platform) {
+      case ZEPHYR:
+        cMakeCode.pr(
+            setUpMainTargetZephyr(
+                hasMain,
+                executableName,
+                Stream.concat(additionalSources.stream(), sources.stream())));
+        break;
+      case RP2040:
+        cMakeCode.pr(
+            setUpMainTargetRp2040(
+                hasMain,
+                executableName,
+                Stream.concat(additionalSources.stream(), sources.stream())));
+        break;
+      default:
+        cMakeCode.pr(
+            setUpMainTarget.getCmakeCode(
+                hasMain,
+                executableName,
+                Stream.concat(additionalSources.stream(), sources.stream())));
+    }
+
     // Ensure that the math library is linked
     cMakeCode.pr("find_library(MATH_LIBRARY m)");
     cMakeCode.pr("if(MATH_LIBRARY)");
@@ -205,9 +325,45 @@ CodeBuilder generateCMakeCode(
     cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/modal_models)");
     cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/utils)");
 
-    buildParameterDefaults(cMakeCode, context);
+    // post target definition board configurations
+    switch (platformOptions.platform) {
+      case RP2040:
+        // set stdio output
+        boolean usb = true;
+        boolean uart = true;
+        if (platformOptions.board != null && boardProperties.length > 1) {
+          uart = !boardProperties[1].equals("usb");
+          usb = !boardProperties[1].equals("uart");
+        }
+        cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} " + (usb ? 1 : 0) + ")");
+        cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} " + (uart ? 1 : 0) + ")");
+        break;
+    }
 
-    postTargetDefinitionPlatformConfig(cMakeCode, context);
+    if (targetConfig.get(AuthProperty.INSTANCE)) {
+      // If security is requested, add the auth option.
+      var osName = System.getProperty("os.name").toLowerCase();
+      // if platform target was set, use given platform instead
+      if (platformOptions.platform != Platform.AUTO) {
+        osName = platformOptions.platform.toString();
+      }
+      if (osName.contains("mac")) {
+        cMakeCode.pr("set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)");
+      }
+      cMakeCode.pr("# Find OpenSSL and link to it");
+      cMakeCode.pr("find_package(OpenSSL REQUIRED)");
+      cMakeCode.pr("target_link_libraries( ${LF_MAIN_TARGET} PRIVATE OpenSSL::SSL)");
+      cMakeCode.newLine();
+    }
+
+    if (targetConfig.get(ThreadingProperty.INSTANCE)
+        && platformOptions.platform != Platform.ZEPHYR) {
+      // If threaded computation is requested, add the threads option.
+      cMakeCode.pr("# Find threads and link to it");
+      cMakeCode.pr("find_package(Threads REQUIRED)");
+      cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE Threads::Threads)");
+      cMakeCode.newLine();
+    }
 
     // Add additional flags so runtime can distinguish between multi-threaded and single-threaded
     // mode
@@ -273,189 +429,16 @@ CodeBuilder generateCMakeCode(
     cMakeCode.pr(installCode);
     cMakeCode.newLine();
 
-    if (targetConfig.isSet(CmakeIncludeProperty.INSTANCE)) {
-      // Add the include file
-      for (String includeFile : targetConfig.get(CmakeIncludeProperty.INSTANCE)) {
-        cMakeCode.pr("include(\"" + Path.of(includeFile).getFileName() + "\")");
-      }
-      cMakeCode.newLine();
+    // Add the include file
+    for (String includeFile : targetConfig.get(CmakeIncludeProperty.INSTANCE)) {
+      cMakeCode.pr("include(\"" + Path.of(includeFile).getFileName() + "\")");
     }
-    cMakeCode.pr(cMakeExtras);
     cMakeCode.newLine();
 
-    return cMakeCode;
-  }
-
-  private void postTargetDefinitionPlatformConfig(
-      CodeBuilder cMakeCode, LFGeneratorContext context) {
-    var targetConfig = context.getTargetConfig();
-
-    var platformOptions = new PlatformOptions();
-    if (targetConfig.isSet(PlatformProperty.INSTANCE)) {
-      platformOptions = targetConfig.get(PlatformProperty.INSTANCE);
-    }
-    // post target definition board configurations
-    switch (platformOptions.platform) {
-      case RP2040:
-        // set stdio output
-        boolean usb = true;
-        boolean uart = true;
-        var boardProperties = platformOptions.boardArray();
-        if (boardProperties.length > 1) {
-          uart = !boardProperties[1].equals("usb");
-          usb = !boardProperties[1].equals("uart");
-        }
-        cMakeCode.pr("pico_enable_stdio_usb(${LF_MAIN_TARGET} " + (usb ? 1 : 0) + ")");
-        cMakeCode.pr("pico_enable_stdio_uart(${LF_MAIN_TARGET} " + (uart ? 1 : 0) + ")");
-        break;
-    }
-
-    if (targetConfig.get(AuthProperty.INSTANCE)) {
-      // If security is requested, add the auth option.
-      var osName = System.getProperty("os.name").toLowerCase();
-      // if platform target was set, use given platform instead
-      if (platformOptions.platform != Platform.AUTO) {
-        osName = platformOptions.platform.toString();
-      }
-      if (osName.contains("mac")) {
-        cMakeCode.pr("set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)");
-      }
-      cMakeCode.pr("# Find OpenSSL and link to it");
-      cMakeCode.pr("find_package(OpenSSL REQUIRED)");
-      cMakeCode.pr("target_link_libraries( ${LF_MAIN_TARGET} PRIVATE OpenSSL::SSL)");
-      cMakeCode.newLine();
-    }
-
-    if (targetConfig.get(ThreadingProperty.INSTANCE)
-        && platformOptions.platform != Platform.ZEPHYR) {
-      // If threaded computation is requested, add the threads option.
-      cMakeCode.pr("# Find threads and link to it");
-      cMakeCode.pr("find_package(Threads REQUIRED)");
-      cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE Threads::Threads)");
-      cMakeCode.newLine();
-    }
-  }
-
-  private void buildParameterDefaults(CodeBuilder cMakeCode, LFGeneratorContext context) {
+    cMakeCode.pr(cMakeExtras);
     cMakeCode.newLine();
-    cMakeCode.pr("# Set default values for build parameters\n");
-    context
-        .getTargetConfig()
-        .get(CompileDefinitionsProperty.INSTANCE)
-        .forEach(
-            (key, value) -> {
-              if (key.equals("LF_THREADED") || key.equals("LF_UNTHREADED")) {
-                cMakeCode.pr("if (NOT DEFINED LF_THREADED AND NOT DEFINED LF_UNTHREADED)\n");
-              } else {
-                cMakeCode.pr("if (NOT DEFINED " + key + ")\n");
-              }
-              cMakeCode.indent();
-              var v = "TRUE";
-              if (value != null && !value.isEmpty()) {
-                v = value;
-              }
-              cMakeCode.pr("set(" + key + " " + v + ")\n");
-              cMakeCode.unindent();
-              cMakeCode.pr("endif()\n");
-            });
-  }
-
-  private void preTargetDefinitionPlatformConfig(
-      LFGeneratorContext context, boolean hasMain, List<String> sources, CodeBuilder cMakeCode) {
-    var targetConfig = context.getTargetConfig();
-    var messageReporter = context.getErrorReporter();
-    var executableName = context.getFileConfig().name;
-    var platformOptions = new PlatformOptions();
-    if (targetConfig.isSet(PlatformProperty.INSTANCE)) {
-      platformOptions = targetConfig.get(PlatformProperty.INSTANCE);
-    }
-
-    // Setup the project header for different platforms
-    switch (platformOptions.platform) {
-      case ZEPHYR:
-        cMakeCode.pr("# Set default configuration file. To add custom configurations,");
-        cMakeCode.pr("# pass -- -DOVERLAY_CONFIG=my_config.prj to either cmake or west");
-        cMakeCode.pr("set(CONF_FILE prj_lf.conf)");
-        if (platformOptions.board != null) {
-          cMakeCode.pr("# Selecting board specified in target property");
-          cMakeCode.pr("set(BOARD " + platformOptions.board + ")");
-        } else {
-          cMakeCode.pr("# Selecting default board");
-          cMakeCode.pr("set(BOARD qemu_cortex_m3)");
-        }
-        cMakeCode.pr("# We recommend Zephyr v3.4.0 but we are compatible with older versions also");
-        cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} 3.4.0)");
-        cMakeCode.newLine();
-        cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
-        cMakeCode.newLine();
-        break;
-      case RP2040:
-        // Attempt to set PICO_SDK_PATH if it is not already set.
-        if (System.getenv("PICO_SDK_PATH") == null) {
-          Path picoSDKPath = fileConfig.srcPkgPath.resolve("pico-sdk");
-          if (Files.isDirectory(picoSDKPath)) {
-            messageReporter
-                .nowhere()
-                .info(
-                    "pico-sdk library found at "
-                        + picoSDKPath.toString()
-                        + ". You can override this by setting PICO_SDK_PATH.");
-            cMakeCode.pr("# Define the root of the pico-sdk library.");
-            cMakeCode.pr("set(PICO_SDK_PATH " + picoSDKPath + ")");
-          } else {
-            messageReporter
-                .nowhere()
-                .warning(
-                    "No PICO_SDK_PATH environment variable and no pico-sdk directory "
-                        + "at the package root directory. Pico SDK will not be found.");
-          }
-        }
-        cMakeCode.pr("include(pico_sdk_import.cmake)");
-        cMakeCode.pr("project(" + executableName + " LANGUAGES C CXX ASM)");
-        cMakeCode.newLine();
-        var boardProperties = platformOptions.boardArray();
-        // board type for rp2040 based boards
-        if (boardProperties.length < 1 || boardProperties[0].equals("")) {
-          cMakeCode.pr("set(PICO_BOARD pico)");
-        } else {
-          cMakeCode.pr("set(PICO_BOARD \"" + boardProperties[0] + "\")");
-        }
-
-        // remove warnings for rp2040 only to make debug easier
-        cMakeCode.pr("set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -w\")");
-        break;
-      default:
-        cMakeCode.pr("project(" + executableName + " LANGUAGES C)");
-        cMakeCode.newLine();
-    }
 
-    if (platformOptions.platform != Platform.AUTO) {
-      cMakeCode.pr("set(CMAKE_SYSTEM_NAME " + platformOptions.platform.getcMakeName() + ")");
-    }
-
-    // Setup main target for different platforms
-    switch (platformOptions.platform) {
-      case ZEPHYR:
-        cMakeCode.pr(
-            setUpMainTargetZephyr(
-                hasMain,
-                executableName,
-                Stream.concat(additionalSources.stream(), sources.stream())));
-        break;
-      case RP2040:
-        cMakeCode.pr(
-            setUpMainTargetRp2040(
-                hasMain,
-                executableName,
-                Stream.concat(additionalSources.stream(), sources.stream())));
-        break;
-      default:
-        cMakeCode.pr(
-            setUpMainTarget.getCmakeCode(
-                hasMain,
-                executableName,
-                Stream.concat(additionalSources.stream(), sources.stream())));
-    }
+    return cMakeCode;
   }
 
   /** Provide a strategy for configuring the main target of the CMake build. */
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index d367b49d7b..20d097138e 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -405,6 +405,10 @@ protected boolean isOSCompatible() {
   public void doGenerate(Resource resource, LFGeneratorContext context) {
     super.doGenerate(resource, context);
 
+    // Ensure that all target properties are loaded (subclasses might serve targets that do not
+    // support all of them (e.g., PythonGenerator).
+    Target.C.initialize(context.getTargetConfig());
+
     if (!GeneratorUtils.canGenerate(errorsOccurred(), mainDef, messageReporter, context)) return;
     if (!isOSCompatible()) return; // Incompatible OS and configuration
 

From 3a7da58503a6223d896a8ff16a181b51cd302488 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 17 Oct 2023 23:12:28 -0700
Subject: [PATCH 1039/1114] More fixes

---
 .../org/lflang/federated/generator/FedFileConfig.java  |  4 +++-
 .../java/org/lflang/generator/c/CCmakeGenerator.java   |  2 --
 .../main/java/org/lflang/generator/c/CGenerator.java   | 10 ++++------
 .../org/lflang/generator/python/PythonGenerator.java   |  2 ++
 .../Python/src/multiport/MultiportFromBankHierarchy.lf |  1 +
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java b/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
index f7e8657b71..97331fb14f 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
@@ -106,7 +106,9 @@ public void relativizePaths(FedTargetConfig targetConfig) {
     List.of(ProtobufsProperty.INSTANCE, FilesProperty.INSTANCE, CmakeIncludeProperty.INSTANCE)
         .forEach(
             p -> {
-              p.override(targetConfig, relativizePathList(targetConfig.get(p)));
+              if (targetConfig.isSet(p)) {
+                p.override(targetConfig, relativizePathList(targetConfig.get(p)));
+              }
             });
   }
 
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index ea783b162a..5076f654fa 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -32,10 +32,8 @@
 import java.util.List;
 import java.util.stream.Stream;
 import org.lflang.FileConfig;
-import org.lflang.MessageReporter;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.LFGeneratorContext;
-import org.lflang.target.TargetConfig;
 import org.lflang.target.property.AuthProperty;
 import org.lflang.target.property.BuildTypeProperty;
 import org.lflang.target.property.CmakeIncludeProperty;
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 20d097138e..3597933a73 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -405,10 +405,6 @@ protected boolean isOSCompatible() {
   public void doGenerate(Resource resource, LFGeneratorContext context) {
     super.doGenerate(resource, context);
 
-    // Ensure that all target properties are loaded (subclasses might serve targets that do not
-    // support all of them (e.g., PythonGenerator).
-    Target.C.initialize(context.getTargetConfig());
-
     if (!GeneratorUtils.canGenerate(errorsOccurred(), mainDef, messageReporter, context)) return;
     if (!isOSCompatible()) return; // Incompatible OS and configuration
 
@@ -717,8 +713,10 @@ private void inspectReactorEResource(ReactorDecl reactor) {
         // Copy the user files and cmake-includes to the src-gen path of the main .lf file
         copyUserFiles(lfResource.getTargetConfig(), lfResource.getFileConfig());
         // Merge the CMake includes from the imported file into the target config
-        CmakeIncludeProperty.INSTANCE.update(
-            this.targetConfig, lfResource.getTargetConfig().get(CmakeIncludeProperty.INSTANCE));
+        if (lfResource.getTargetConfig().isSet(CmakeIncludeProperty.INSTANCE)) {
+          CmakeIncludeProperty.INSTANCE.update(
+              this.targetConfig, lfResource.getTargetConfig().get(CmakeIncludeProperty.INSTANCE));
+        }
       }
     }
   }
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index 9236e5e87d..b64eb831a0 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -109,6 +109,8 @@ public PythonGenerator(LFGeneratorContext context) {
   private PythonGenerator(
       LFGeneratorContext context, PythonTypes types, CCmakeGenerator cmakeGenerator) {
     super(context, false, types, cmakeGenerator, new PythonDelayBodyGenerator(types));
+    // Add the C target properties because they are used in the C code generator.
+    Target.C.initialize(context.getTargetConfig());
     CompilerProperty.INSTANCE.override(this.targetConfig, "gcc"); // FIXME: why?
     this.targetConfig.reset(CompilerFlagsProperty.INSTANCE);
     this.types = types;
diff --git a/test/Python/src/multiport/MultiportFromBankHierarchy.lf b/test/Python/src/multiport/MultiportFromBankHierarchy.lf
index 20a66f2e1f..83c33e2284 100644
--- a/test/Python/src/multiport/MultiportFromBankHierarchy.lf
+++ b/test/Python/src/multiport/MultiportFromBankHierarchy.lf
@@ -11,6 +11,7 @@ reactor Source(bank_index=0) {
   output out
 
   reaction(startup) -> out {=
+        +++++;
     out.set(self.bank_index)
   =}
 }

From 0d5a49e6d44a782cbfafd37b3deca125bdcf30f6 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 17 Oct 2023 23:20:30 -0700
Subject: [PATCH 1040/1114] Move no-runtime-validation target property to cpp

---
 core/src/main/java/org/lflang/target/Target.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/target/Target.java b/core/src/main/java/org/lflang/target/Target.java
index 91e4e3c8f0..c4cc869fed 100644
--- a/core/src/main/java/org/lflang/target/Target.java
+++ b/core/src/main/java/org/lflang/target/Target.java
@@ -599,7 +599,6 @@ public void initialize(TargetConfig config) {
           FilesProperty.INSTANCE,
           HierarchicalBinProperty.INSTANCE,
           KeepaliveProperty.INSTANCE,
-          NoRuntimeValidationProperty.INSTANCE,
           PlatformProperty.INSTANCE,
           ProtobufsProperty.INSTANCE,
           SchedulerProperty.INSTANCE,
@@ -614,6 +613,7 @@ public void initialize(TargetConfig config) {
           ExportDependencyGraphProperty.INSTANCE,
           ExportToYamlProperty.INSTANCE,
           ExternalRuntimePathProperty.INSTANCE,
+          NoRuntimeValidationProperty.INSTANCE,
           PrintStatisticsProperty.INSTANCE,
           Ros2DependenciesProperty.INSTANCE,
           Ros2Property.INSTANCE,

From 10ca8d7809e215510d6dca7e41bf72ae4a703ea5 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 17 Oct 2023 23:26:05 -0700
Subject: [PATCH 1041/1114] Add auth to TypeScript

---
 core/src/main/java/org/lflang/target/Target.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/lflang/target/Target.java b/core/src/main/java/org/lflang/target/Target.java
index c4cc869fed..b68b80794d 100644
--- a/core/src/main/java/org/lflang/target/Target.java
+++ b/core/src/main/java/org/lflang/target/Target.java
@@ -653,6 +653,7 @@ public void initialize(TargetConfig config) {
           ThreadingProperty.INSTANCE,
           WorkersProperty.INSTANCE);
       case TS -> config.register(
+          AuthProperty.INSTANCE,
           CoordinationOptionsProperty.INSTANCE,
           CoordinationProperty.INSTANCE,
           DockerProperty.INSTANCE,

From b5c45f21fe6d2ade9c26b24c5852e286b27a2b75 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 17 Oct 2023 23:43:37 -0700
Subject: [PATCH 1042/1114] Add getOrDefault method as convenience

---
 .../federated/launcher/FedLauncherGenerator.java   | 14 +++++++-------
 core/src/main/java/org/lflang/target/Target.java   |  1 -
 .../main/java/org/lflang/target/TargetConfig.java  |  8 ++++++++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index 0986ad78dc..c559a433db 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -338,26 +338,26 @@ private String getRtiCommand(List<FederateInstance> federates, boolean isRemote)
     } else {
       commands.add("RTI -i ${FEDERATION_ID} \\");
     }
-    if (targetConfig.get(AuthProperty.INSTANCE)) {
+    if (targetConfig.getOrDefault(AuthProperty.INSTANCE)) {
       commands.add("                        -a \\");
     }
-    if (targetConfig.get(TracingProperty.INSTANCE).isEnabled()) {
+    if (targetConfig.getOrDefault(TracingProperty.INSTANCE).isEnabled()) {
       commands.add("                        -t \\");
     }
     commands.addAll(
         List.of(
             "                        -n " + federates.size() + " \\",
             "                        -c "
-                + targetConfig.get(ClockSyncModeProperty.INSTANCE).toString()
+                + targetConfig.getOrDefault(ClockSyncModeProperty.INSTANCE).toString()
                 + " \\"));
-    if (targetConfig.get(ClockSyncModeProperty.INSTANCE).equals(ClockSyncMode.ON)) {
+    if (targetConfig.getOrDefault(ClockSyncModeProperty.INSTANCE).equals(ClockSyncMode.ON)) {
       commands.add(
           "period "
-              + targetConfig.get(ClockSyncOptionsProperty.INSTANCE).period.toNanoSeconds()
+              + targetConfig.getOrDefault(ClockSyncOptionsProperty.INSTANCE).period.toNanoSeconds()
               + " \\");
     }
-    if (targetConfig.get(ClockSyncModeProperty.INSTANCE).equals(ClockSyncMode.ON)
-        || targetConfig.get(ClockSyncModeProperty.INSTANCE).equals(ClockSyncMode.INIT)) {
+    if (targetConfig.getOrDefault(ClockSyncModeProperty.INSTANCE).equals(ClockSyncMode.ON)
+        || targetConfig.getOrDefault(ClockSyncModeProperty.INSTANCE).equals(ClockSyncMode.INIT)) {
       commands.add(
           "exchanges-per-interval "
               + targetConfig.get(ClockSyncOptionsProperty.INSTANCE).trials
diff --git a/core/src/main/java/org/lflang/target/Target.java b/core/src/main/java/org/lflang/target/Target.java
index b68b80794d..c4cc869fed 100644
--- a/core/src/main/java/org/lflang/target/Target.java
+++ b/core/src/main/java/org/lflang/target/Target.java
@@ -653,7 +653,6 @@ public void initialize(TargetConfig config) {
           ThreadingProperty.INSTANCE,
           WorkersProperty.INSTANCE);
       case TS -> config.register(
-          AuthProperty.INSTANCE,
           CoordinationOptionsProperty.INSTANCE,
           CoordinationProperty.INSTANCE,
           DockerProperty.INSTANCE,
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 0aa1f38bcc..dc55f74d09 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -146,6 +146,14 @@ public <T, S extends TargetPropertyType> T get(TargetProperty<T, S> property)
     }
   }
 
+  public <T, S extends TargetPropertyType> T getOrDefault(TargetProperty<T, S> property) {
+    try {
+      return get(property);
+    } catch (IllegalArgumentException e) {
+      return property.initialValue();
+    }
+  }
+
   /**
    * Return {@code true} if this target property has been set (past initialization), {@code false}
    * otherwise.

From e3926fc0e33f7980fbcf6edfec6b3afdf2609b13 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 17 Oct 2023 23:51:26 -0700
Subject: [PATCH 1043/1114] Missed another get

---
 .../org/lflang/federated/launcher/FedLauncherGenerator.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index c559a433db..45446d7796 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -360,7 +360,7 @@ private String getRtiCommand(List<FederateInstance> federates, boolean isRemote)
         || targetConfig.getOrDefault(ClockSyncModeProperty.INSTANCE).equals(ClockSyncMode.INIT)) {
       commands.add(
           "exchanges-per-interval "
-              + targetConfig.get(ClockSyncOptionsProperty.INSTANCE).trials
+              + targetConfig.getOrDefault(ClockSyncOptionsProperty.INSTANCE).trials
               + " \\");
     }
     commands.add("&");

From 39588e69eb8c1301965c5d63b635c6b1b8883d0d Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 18 Oct 2023 00:18:22 -0700
Subject: [PATCH 1044/1114] Different way of addressing entanglement of Python
 and C codegen

---
 .../main/java/org/lflang/generator/c/CCmakeGenerator.java   | 6 +++---
 .../java/org/lflang/generator/python/PythonGenerator.java   | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index 5076f654fa..fe24d9a7e7 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -127,7 +127,7 @@ CodeBuilder generateCMakeCode(
     //  rp2040 <board_name> : <stdio_opt>
     //  arduino
     String[] boardProperties = {};
-    var platformOptions = targetConfig.get(PlatformProperty.INSTANCE);
+    var platformOptions = targetConfig.getOrDefault(PlatformProperty.INSTANCE);
     if (platformOptions.board != null) {
       boardProperties = platformOptions.board.trim().split(":");
       // Ignore whitespace
@@ -228,7 +228,7 @@ CodeBuilder generateCMakeCode(
     cMakeCode.pr("set(CMAKE_CXX_STANDARD 17)");
     cMakeCode.pr("set(CMAKE_CXX_STANDARD_REQUIRED ON)");
     cMakeCode.newLine();
-    if (!targetConfig.get(CmakeIncludeProperty.INSTANCE).isEmpty()) {
+    if (!targetConfig.getOrDefault(CmakeIncludeProperty.INSTANCE).isEmpty()) {
       // The user might be using the non-keyword form of
       // target_link_libraries. Ideally we would detect whether they are
       // doing that, but it is easier to just always have a deprecation
@@ -428,7 +428,7 @@ CodeBuilder generateCMakeCode(
     cMakeCode.newLine();
 
     // Add the include file
-    for (String includeFile : targetConfig.get(CmakeIncludeProperty.INSTANCE)) {
+    for (String includeFile : targetConfig.getOrDefault(CmakeIncludeProperty.INSTANCE)) {
       cMakeCode.pr("include(\"" + Path.of(includeFile).getFileName() + "\")");
     }
     cMakeCode.newLine();
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index b64eb831a0..e4477d2d0d 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -110,7 +110,6 @@ private PythonGenerator(
       LFGeneratorContext context, PythonTypes types, CCmakeGenerator cmakeGenerator) {
     super(context, false, types, cmakeGenerator, new PythonDelayBodyGenerator(types));
     // Add the C target properties because they are used in the C code generator.
-    Target.C.initialize(context.getTargetConfig());
     CompilerProperty.INSTANCE.override(this.targetConfig, "gcc"); // FIXME: why?
     this.targetConfig.reset(CompilerFlagsProperty.INSTANCE);
     this.types = types;

From 077e577a57e5c04b8b87459370f5574dedb0d707 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 18 Oct 2023 00:31:18 -0700
Subject: [PATCH 1045/1114] Resolving more Python/C issues

---
 .../java/org/lflang/generator/c/CCompiler.java    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index f050b4d84f..493b0be331 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -43,6 +43,7 @@
 import org.lflang.target.property.CompilerFlagsProperty;
 import org.lflang.target.property.CompilerProperty;
 import org.lflang.target.property.PlatformProperty;
+import org.lflang.target.property.PlatformProperty.PlatformOptions;
 import org.lflang.target.property.type.BuildTypeType.BuildType;
 import org.lflang.target.property.type.PlatformType.Platform;
 import org.lflang.util.FileUtil;
@@ -187,11 +188,10 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
                     + fileConfig.name
                     + " finished with no errors.");
       }
-
-      if (targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ZEPHYR
-          && targetConfig.get(PlatformProperty.INSTANCE).flash) {
+      var options = targetConfig.getOrDefault(PlatformProperty.INSTANCE);
+      if (options.platform == Platform.ZEPHYR && options.flash) {
         messageReporter.nowhere().info("Invoking flash command for Zephyr");
-        LFCommand flash = buildWestFlashCommand();
+        LFCommand flash = buildWestFlashCommand(options);
         int flashRet = flash.run();
         if (flashRet != 0) {
           messageReporter.nowhere().error("West flash command failed with error code " + flashRet);
@@ -316,10 +316,10 @@ public LFCommand buildCmakeCommand() {
    * qemu_* Return a flash command which runs the target as an emulation If ordinary target, return
    * {@code west flash}
    */
-  public LFCommand buildWestFlashCommand() {
+  public LFCommand buildWestFlashCommand(PlatformOptions options) {
     // Set the build directory to be "build"
     Path buildPath = fileConfig.getSrcGenPath().resolve("build");
-    String board = targetConfig.get(PlatformProperty.INSTANCE).board;
+    String board = options.board;
     LFCommand cmd;
     if (board == null || board.startsWith("qemu") || board.equals("native_posix")) {
       cmd = commandFactory.createCommand("west", List.of("build", "-t", "run"), buildPath);
@@ -449,8 +449,7 @@ static String getTargetFileName(String fileName, boolean cppMode, TargetConfig t
   }
 
   static String getFileExtension(boolean cppMode, TargetConfig targetConfig) {
-    if (targetConfig.isSet(PlatformProperty.INSTANCE)
-        && targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO) {
+    if (targetConfig.getOrDefault(PlatformProperty.INSTANCE).platform == Platform.ARDUINO) {
       return ".ino";
     }
     if (cppMode) {

From a92232e6e2df2620301029fcdfef3ea85a52addb Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 18 Oct 2023 13:27:53 -0700
Subject: [PATCH 1046/1114] Fix issue that was masked by #1859; fixed #1859

---
 .../src/main/java/org/lflang/cli/CliBase.java | 18 +++++++++++++--
 .../kotlin/org/lflang/cli/ReportingUtil.kt    | 10 ++++++---
 .../federated/extensions/CExtension.java      | 22 ++++++++-----------
 .../federated/extensions/CExtensionUtils.java |  6 ++---
 .../extensions/FedTargetExtension.java        |  6 ++---
 .../federated/extensions/PythonExtension.java |  8 +++----
 .../federated/extensions/TSExtension.java     |  6 ++---
 .../federated/generator/FedEmitter.java       |  6 ++---
 .../federated/generator/FedGenerator.java     |  8 +++----
 .../federated/generator/FedImportEmitter.java |  2 +-
 .../generator/FedPreambleEmitter.java         |  2 +-
 .../federated/generator/FedTargetEmitter.java |  2 +-
 ...tConfig.java => FederateTargetConfig.java} |  9 +++-----
 ...eConfig.java => FederationFileConfig.java} | 17 ++++++--------
 .../federated/launcher/BuildConfig.java       |  6 ++---
 .../federated/launcher/CBuildConfig.java      |  4 ++--
 .../launcher/FedLauncherGenerator.java        |  8 +++----
 .../federated/launcher/PyBuildConfig.java     |  4 ++--
 .../federated/launcher/TsBuildConfig.java     |  4 ++--
 .../org/lflang/generator/LFGenerator.java     |  4 ++--
 .../org/lflang/generator/c/CCompiler.java     | 14 ++----------
 .../org/lflang/generator/c/CGenerator.java    |  6 ++---
 .../java/org/lflang/target/TargetConfig.java  |  8 +++++++
 .../tests/compiler/TargetConfigTests.java     |  6 +++--
 .../multiport/MultiportFromBankHierarchy.lf   |  1 -
 25 files changed, 95 insertions(+), 92 deletions(-)
 rename core/src/main/java/org/lflang/federated/generator/{FedTargetConfig.java => FederateTargetConfig.java} (94%)
 rename core/src/main/java/org/lflang/federated/generator/{FedFileConfig.java => FederationFileConfig.java} (88%)

diff --git a/cli/base/src/main/java/org/lflang/cli/CliBase.java b/cli/base/src/main/java/org/lflang/cli/CliBase.java
index 3e95afb334..f8c014ec46 100644
--- a/cli/base/src/main/java/org/lflang/cli/CliBase.java
+++ b/cli/base/src/main/java/org/lflang/cli/CliBase.java
@@ -223,7 +223,10 @@ protected Path getOutputRoot() {
   /** If some errors were collected, print them and abort execution. Otherwise, return. */
   protected void exitIfCollectedErrors() {
     if (issueCollector.getErrorsOccurred()) {
-      // if there are errors, don't print warnings.
+
+      // Print warnings if there are any.
+      printWarningsIfAny();
+
       List<LfIssue> errors = printErrorsIfAny();
       String cause = errors.size() + " previous error";
       if (errors.size() > 1) {
@@ -234,7 +237,18 @@ protected void exitIfCollectedErrors() {
   }
 
   /**
-   * If any errors were collected, print them, then return them.
+   * If any warnings were collected, print them, then return them.
+   *
+   * @return A list of collected warnings.
+   */
+  public List<LfIssue> printWarningsIfAny() {
+    List<LfIssue> errors = issueCollector.getWarnings();
+    errors.forEach(reporter::printIssue);
+    return errors;
+  }
+
+  /**
+   * If any warnings were collected, print them, then return them.
    *
    * @return A list of collected errors.
    */
diff --git a/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt b/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt
index b7c4826bdf..e2cc147ec2 100644
--- a/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt
+++ b/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt
@@ -176,7 +176,7 @@ data class LfIssue(
 @Singleton // one instance per injector
 class IssueCollector {
     private val map = mutableMapOf<Severity, MutableSet<LfIssue>>()
-    /** Whether any errors occurred.*/
+    /** Whether any errors occurred. */
     val errorsOccurred: Boolean get() = map[Severity.ERROR]?.isNotEmpty() == true
 
     fun accept(issue: LfIssue) {
@@ -184,9 +184,13 @@ class IssueCollector {
         set += issue
     }
 
-    /** Sorted list of all errors.*/
+    /** Sorted list of all errors. */
     val errors: List<LfIssue> get() = map[Severity.ERROR].orEmpty().sorted()
-    /** Sorted list of all issues.*/
+
+    /** Sorted list of all warnings. */
+    val warnings: List<LfIssue> get() = map[Severity.WARNING].orEmpty().sorted()
+
+    /** Sorted list of all issues. */
     val allIssues: List<LfIssue> get() = map.values.flatten().sorted()
 }
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
index b7191b9072..7b6f1054f1 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -39,8 +39,8 @@
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedASTUtils;
 import org.lflang.federated.generator.FedConnectionInstance;
-import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
+import org.lflang.federated.generator.FederationFileConfig;
 import org.lflang.federated.launcher.RtiConfig;
 import org.lflang.federated.serialization.FedROS2CPPSerialization;
 import org.lflang.generator.CodeBuilder;
@@ -78,7 +78,7 @@ public void initializeTargetConfig(
       LFGeneratorContext context,
       int numOfFederates,
       FederateInstance federate,
-      FedFileConfig fileConfig,
+      FederationFileConfig fileConfig,
       MessageReporter messageReporter,
       RtiConfig rtiConfig)
       throws IOException {
@@ -100,7 +100,7 @@ public void initializeTargetConfig(
   }
 
   /** Generate a cmake-include file for {@code federate} if needed. */
-  protected void generateCMakeInclude(FederateInstance federate, FedFileConfig fileConfig)
+  protected void generateCMakeInclude(FederateInstance federate, FederationFileConfig fileConfig)
       throws IOException {
     CExtensionUtils.generateCMakeInclude(federate, fileConfig);
   }
@@ -485,7 +485,7 @@ public String getNetworkBufferType() {
   /** Put the C preamble in a {@code include/_federate.name + _preamble.h} file. */
   protected final void writePreambleFile(
       FederateInstance federate,
-      FedFileConfig fileConfig,
+      FederationFileConfig fileConfig,
       RtiConfig rtiConfig,
       MessageReporter messageReporter)
       throws IOException {
@@ -505,7 +505,7 @@ protected final void writePreambleFile(
   @Override
   public String generatePreamble(
       FederateInstance federate,
-      FedFileConfig fileConfig,
+      FederationFileConfig fileConfig,
       RtiConfig rtiConfig,
       MessageReporter messageReporter)
       throws IOException {
@@ -594,7 +594,7 @@ protected String makePreamble(
 
   /** Generate preamble code needed for enabled serializers of the federate. */
   protected String generateSerializationIncludes(
-      FederateInstance federate, FedFileConfig fileConfig) {
+      FederateInstance federate, FederationFileConfig fileConfig) {
     return CExtensionUtils.generateSerializationIncludes(federate);
   }
 
@@ -741,18 +741,14 @@ private String generateCodeToInitializeFederate(FederateInstance federate, RtiCo
               "    _fed.sockets_for_outbound_p2p_connections[i] = -1;",
               "}"));
     }
-
+    var clockSyncOptions = federate.targetConfig.getOrDefault(ClockSyncOptionsProperty.INSTANCE);
     // If a test clock offset has been specified, insert code to set it here.
-    if (federate.targetConfig.get(ClockSyncOptionsProperty.INSTANCE).testOffset != null) {
+    if (clockSyncOptions.testOffset != null) {
       code.pr(
           "lf_set_physical_clock_offset((1 + "
               + federate.id
               + ") * "
-              + federate
-                  .targetConfig
-                  .get(ClockSyncOptionsProperty.INSTANCE)
-                  .testOffset
-                  .toNanoSeconds()
+              + clockSyncOptions.testOffset.toNanoSeconds()
               + "LL);");
     }
 
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
index 6f535da595..2b60e60c11 100644
--- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
@@ -10,8 +10,8 @@
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
-import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
+import org.lflang.federated.generator.FederationFileConfig;
 import org.lflang.federated.launcher.RtiConfig;
 import org.lflang.federated.serialization.FedROS2CPPSerialization;
 import org.lflang.federated.serialization.SupportedSerializers;
@@ -280,8 +280,8 @@ public static void addClockSyncCompileDefinitions(FederateInstance federate) {
   }
 
   /** Generate a file to be included by CMake. */
-  public static void generateCMakeInclude(FederateInstance federate, FedFileConfig fileConfig)
-      throws IOException {
+  public static void generateCMakeInclude(
+      FederateInstance federate, FederationFileConfig fileConfig) throws IOException {
     Files.createDirectories(fileConfig.getSrcPath().resolve("include"));
 
     Path cmakeIncludePath =
diff --git a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
index 7afafa105c..e708c117d7 100644
--- a/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/FedTargetExtension.java
@@ -4,8 +4,8 @@
 import org.lflang.InferredType;
 import org.lflang.MessageReporter;
 import org.lflang.federated.generator.FedConnectionInstance;
-import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
+import org.lflang.federated.generator.FederationFileConfig;
 import org.lflang.federated.launcher.RtiConfig;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.lf.Action;
@@ -30,7 +30,7 @@ void initializeTargetConfig(
       LFGeneratorContext context,
       int numOfFederates,
       FederateInstance federate,
-      FedFileConfig fileConfig,
+      FederationFileConfig fileConfig,
       MessageReporter messageReporter,
       RtiConfig rtiConfig)
       throws IOException;
@@ -112,7 +112,7 @@ default void annotateReaction(Reaction reaction) {}
    */
   String generatePreamble(
       FederateInstance federate,
-      FedFileConfig fileConfig,
+      FederationFileConfig fileConfig,
       RtiConfig rtiConfig,
       MessageReporter messageReporter)
       throws IOException;
diff --git a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
index 25c7198fe9..d6dc3ce44a 100644
--- a/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
@@ -31,8 +31,8 @@
 import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedConnectionInstance;
-import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
+import org.lflang.federated.generator.FederationFileConfig;
 import org.lflang.federated.launcher.RtiConfig;
 import org.lflang.federated.serialization.FedNativePythonSerialization;
 import org.lflang.federated.serialization.FedSerialization;
@@ -52,11 +52,11 @@
 public class PythonExtension extends CExtension {
 
   @Override
-  protected void generateCMakeInclude(FederateInstance federate, FedFileConfig fileConfig) {}
+  protected void generateCMakeInclude(FederateInstance federate, FederationFileConfig fileConfig) {}
 
   @Override
   protected String generateSerializationIncludes(
-      FederateInstance federate, FedFileConfig fileConfig) {
+      FederateInstance federate, FederationFileConfig fileConfig) {
     CodeBuilder code = new CodeBuilder();
     for (SupportedSerializers serialization : federate.enabledSerializers) {
       switch (serialization) {
@@ -189,7 +189,7 @@ public void annotateReaction(Reaction reaction) {
   @Override
   public String generatePreamble(
       FederateInstance federate,
-      FedFileConfig fileConfig,
+      FederationFileConfig fileConfig,
       RtiConfig rtiConfig,
       MessageReporter messageReporter)
       throws IOException {
diff --git a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
index 88579137d3..9b0abce29f 100644
--- a/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+++ b/core/src/main/java/org/lflang/federated/extensions/TSExtension.java
@@ -11,8 +11,8 @@
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedASTUtils;
 import org.lflang.federated.generator.FedConnectionInstance;
-import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
+import org.lflang.federated.generator.FederationFileConfig;
 import org.lflang.federated.launcher.RtiConfig;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.ReactorInstance;
@@ -35,7 +35,7 @@ public void initializeTargetConfig(
       LFGeneratorContext context,
       int numOfFederates,
       FederateInstance federate,
-      FedFileConfig fileConfig,
+      FederationFileConfig fileConfig,
       MessageReporter messageReporter,
       RtiConfig rtiConfig) {}
 
@@ -160,7 +160,7 @@ public String getNetworkBufferType() {
   @Override
   public String generatePreamble(
       FederateInstance federate,
-      FedFileConfig fileConfig,
+      FederationFileConfig fileConfig,
       RtiConfig rtiConfig,
       MessageReporter messageReporter) {
     var minOutputDelay = getMinOutputDelay(federate, messageReporter);
diff --git a/core/src/main/java/org/lflang/federated/generator/FedEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
index 91f85bd340..5d6452df77 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedEmitter.java
@@ -14,13 +14,13 @@
 /** Helper class to generate code for federates. */
 public class FedEmitter {
 
-  private final FedFileConfig fileConfig;
+  private final FederationFileConfig fileConfig;
   private final Reactor originalMainReactor;
   private final MessageReporter messageReporter;
   private final RtiConfig rtiConfig;
 
   public FedEmitter(
-      FedFileConfig fileConfig,
+      FederationFileConfig fileConfig,
       Reactor originalMainReactor,
       MessageReporter messageReporter,
       RtiConfig rtiConfig) {
@@ -66,7 +66,7 @@ Map<Path, CodeMap> generateFederate(
     return codeMapMap;
   }
 
-  public static Path lfFilePath(FedFileConfig fileConfig, FederateInstance federate) {
+  public static Path lfFilePath(FederationFileConfig fileConfig, FederateInstance federate) {
     return fileConfig.getSrcPath().resolve(federate.name + ".lf");
   }
 }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 07b887c5ab..3e56aa1ba0 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -77,7 +77,7 @@ public class FedGenerator {
    * File configuration to be used during the LF code generation stage (not the target code
    * generation stage of individual federates).
    */
-  private final FedFileConfig fileConfig;
+  private final FederationFileConfig fileConfig;
 
   /** Configuration of the RTI. */
   final RtiConfig rtiConfig = new RtiConfig();
@@ -105,7 +105,7 @@ public class FedGenerator {
    * reporter.
    */
   public FedGenerator(LFGeneratorContext context) {
-    this.fileConfig = (FedFileConfig) context.getFileConfig();
+    this.fileConfig = (FederationFileConfig) context.getFileConfig();
     this.targetConfig = context.getTargetConfig();
     this.messageReporter = context.getErrorReporter();
   }
@@ -472,9 +472,7 @@ private List<FederateInstance> getFederateInstances(
       // Assign an integer ID to the federate.
       int federateID = federates.size();
       var resource = instantiation.getReactorClass().eResource();
-      var federateTargetConfig =
-          new FedTargetConfig(
-              context, resource); // FIXME: Based on the target, need to load properties.
+      var federateTargetConfig = new FederateTargetConfig(context, resource);
       FederateInstance federateInstance =
           new FederateInstance(
               instantiation, federateID, i, bankWidth, federateTargetConfig, messageReporter);
diff --git a/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java
index 57eed50eb7..59b2fae58b 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedImportEmitter.java
@@ -20,7 +20,7 @@ public class FedImportEmitter {
   private static final Set<Import> visitedImports = new HashSet<>();
 
   /** Generate import statements for {@code federate}. */
-  String generateImports(FederateInstance federate, FedFileConfig fileConfig) {
+  String generateImports(FederateInstance federate, FederationFileConfig fileConfig) {
     var imports =
         ((Model) federate.instantiation.eContainer().eContainer())
             .getImports().stream().filter(federate::references).toList();
diff --git a/core/src/main/java/org/lflang/federated/generator/FedPreambleEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedPreambleEmitter.java
index 7966bc73dd..c74a605138 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedPreambleEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedPreambleEmitter.java
@@ -21,7 +21,7 @@ public FedPreambleEmitter() {}
    */
   String generatePreamble(
       FederateInstance federate,
-      FedFileConfig fileConfig,
+      FederationFileConfig fileConfig,
       RtiConfig rtiConfig,
       MessageReporter messageReporter)
       throws IOException {
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java b/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
index ff273e7ead..53f3823f72 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedTargetEmitter.java
@@ -13,7 +13,7 @@ String generateTarget(
       LFGeneratorContext context,
       int numOfFederates,
       FederateInstance federate,
-      FedFileConfig fileConfig,
+      FederationFileConfig fileConfig,
       MessageReporter messageReporter,
       RtiConfig rtiConfig)
       throws IOException {
diff --git a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java b/core/src/main/java/org/lflang/federated/generator/FederateTargetConfig.java
similarity index 94%
rename from core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
rename to core/src/main/java/org/lflang/federated/generator/FederateTargetConfig.java
index bfc8dd6194..556c3988da 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedTargetConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateTargetConfig.java
@@ -16,7 +16,6 @@
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.ClockSyncModeProperty;
 import org.lflang.target.property.ClockSyncOptionsProperty;
-import org.lflang.target.property.FedSetupProperty;
 import org.lflang.util.FileUtil;
 
 /**
@@ -25,7 +24,7 @@
  *
  * @author Marten Lohstroh
  */
-public class FedTargetConfig extends TargetConfig {
+public class FederateTargetConfig extends TargetConfig {
 
   /**
    * Create a configuration for a federate given a main context and the resource in which the class
@@ -34,7 +33,7 @@ public class FedTargetConfig extends TargetConfig {
    * @param context The generator context.
    * @param federateResource The resource in which to find the reactor class of the federate.
    */
-  public FedTargetConfig(LFGeneratorContext context, Resource federateResource) {
+  public FederateTargetConfig(LFGeneratorContext context, Resource federateResource) {
     // Create target config based on the main .lf file (but with the target of the federate,
     // which could be different).
     super(
@@ -43,14 +42,12 @@ public FedTargetConfig(LFGeneratorContext context, Resource federateResource) {
         context.getArgs(),
         context.getErrorReporter());
 
-    this.register(FedSetupProperty.INSTANCE);
-
     mergeImportedConfig(
         federateResource, context.getFileConfig().resource, context.getErrorReporter());
 
     clearPropertiesToIgnore();
 
-    ((FedFileConfig) context.getFileConfig()).relativizePaths(this);
+    ((FederationFileConfig) context.getFileConfig()).relativizePaths(this);
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java b/core/src/main/java/org/lflang/federated/generator/FederationFileConfig.java
similarity index 88%
rename from core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
rename to core/src/main/java/org/lflang/federated/generator/FederationFileConfig.java
index 97331fb14f..d8946a2ad2 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedFileConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederationFileConfig.java
@@ -38,20 +38,19 @@
 import org.lflang.util.FileUtil;
 
 /**
- * A subclass of @see FileConfig that extends the base functionality to add support for compiling
- * federated LF programs. The code generator should create one instance of this class for each
- * federate.
+ * A subclass of {@see FileConfig} that extends the base functionality to add support for compiling
+ * federated LF programs.
  *
  * @author Soroush Bateni
  */
-public class FedFileConfig extends FileConfig {
+public class FederationFileConfig extends FileConfig {
 
-  public FedFileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchicalBin)
+  public FederationFileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchicalBin)
       throws IOException {
     super(resource, srcGenBasePath, useHierarchicalBin);
   }
 
-  public FedFileConfig(FileConfig fileConfig) throws IOException {
+  public FederationFileConfig(FileConfig fileConfig) throws IOException {
     super(fileConfig.resource, fileConfig.getSrcGenBasePath(), fileConfig.useHierarchicalBin);
   }
 
@@ -102,13 +101,11 @@ public void doClean() throws IOException {
    * Relativize target properties that involve paths like files and cmake-include to be relative to
    * the generated .lf file for the federate.
    */
-  public void relativizePaths(FedTargetConfig targetConfig) {
+  public void relativizePaths(FederateTargetConfig targetConfig) {
     List.of(ProtobufsProperty.INSTANCE, FilesProperty.INSTANCE, CmakeIncludeProperty.INSTANCE)
         .forEach(
             p -> {
-              if (targetConfig.isSet(p)) {
-                p.override(targetConfig, relativizePathList(targetConfig.get(p)));
-              }
+              p.override(targetConfig, relativizePathList(targetConfig.get(p)));
             });
   }
 
diff --git a/core/src/main/java/org/lflang/federated/launcher/BuildConfig.java b/core/src/main/java/org/lflang/federated/launcher/BuildConfig.java
index 48b297da01..4863346217 100644
--- a/core/src/main/java/org/lflang/federated/launcher/BuildConfig.java
+++ b/core/src/main/java/org/lflang/federated/launcher/BuildConfig.java
@@ -1,8 +1,8 @@
 package org.lflang.federated.launcher;
 
 import org.lflang.MessageReporter;
-import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
+import org.lflang.federated.generator.FederationFileConfig;
 
 /** A collection of methods used for building target code for federates. */
 public abstract class BuildConfig {
@@ -14,7 +14,7 @@ public abstract class BuildConfig {
   protected final MessageReporter messageReporter;
 
   /** The file configuration of the federation that the federate belongs to. */
-  protected final FedFileConfig fileConfig;
+  protected final FederationFileConfig fileConfig;
 
   /**
    * Create a new build configuration.
@@ -24,7 +24,7 @@ public abstract class BuildConfig {
    * @param messageReporter An error reporter to report problems.
    */
   public BuildConfig(
-      FederateInstance federate, FedFileConfig fileConfig, MessageReporter messageReporter) {
+      FederateInstance federate, FederationFileConfig fileConfig, MessageReporter messageReporter) {
     this.messageReporter = messageReporter;
     this.federate = federate;
     this.fileConfig = fileConfig;
diff --git a/core/src/main/java/org/lflang/federated/launcher/CBuildConfig.java b/core/src/main/java/org/lflang/federated/launcher/CBuildConfig.java
index 698da57b89..341ad3a066 100644
--- a/core/src/main/java/org/lflang/federated/launcher/CBuildConfig.java
+++ b/core/src/main/java/org/lflang/federated/launcher/CBuildConfig.java
@@ -27,8 +27,8 @@
 
 import java.io.File;
 import org.lflang.MessageReporter;
-import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
+import org.lflang.federated.generator.FederationFileConfig;
 import org.lflang.generator.c.CCompiler;
 
 /**
@@ -41,7 +41,7 @@
 public class CBuildConfig extends BuildConfig {
 
   public CBuildConfig(
-      FederateInstance federate, FedFileConfig fileConfig, MessageReporter messageReporter) {
+      FederateInstance federate, FederationFileConfig fileConfig, MessageReporter messageReporter) {
     super(federate, fileConfig, messageReporter);
   }
 
diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index 45446d7796..ac827ceda7 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -34,8 +34,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.lflang.MessageReporter;
-import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
+import org.lflang.federated.generator.FederationFileConfig;
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.AuthProperty;
 import org.lflang.target.property.ClockSyncModeProperty;
@@ -51,7 +51,7 @@
  */
 public class FedLauncherGenerator {
   protected TargetConfig targetConfig;
-  protected FedFileConfig fileConfig;
+  protected FederationFileConfig fileConfig;
   protected MessageReporter messageReporter;
 
   /**
@@ -61,7 +61,7 @@ public class FedLauncherGenerator {
    *     generation
    */
   public FedLauncherGenerator(
-      TargetConfig targetConfig, FedFileConfig fileConfig, MessageReporter messageReporter) {
+      TargetConfig targetConfig, FederationFileConfig fileConfig, MessageReporter messageReporter) {
     this.targetConfig = targetConfig;
     this.fileConfig = fileConfig;
     this.messageReporter = messageReporter;
@@ -527,7 +527,7 @@ private String getFedLocalLaunchCode(
    * @param fileConfig The file configuration of the federation to which the federate belongs.
    */
   private BuildConfig getBuildConfig(
-      FederateInstance federate, FedFileConfig fileConfig, MessageReporter messageReporter) {
+      FederateInstance federate, FederationFileConfig fileConfig, MessageReporter messageReporter) {
     return switch (federate.targetConfig.target) {
       case C, CCPP -> new CBuildConfig(federate, fileConfig, messageReporter);
       case Python -> new PyBuildConfig(federate, fileConfig, messageReporter);
diff --git a/core/src/main/java/org/lflang/federated/launcher/PyBuildConfig.java b/core/src/main/java/org/lflang/federated/launcher/PyBuildConfig.java
index 98f1c16ad6..00cf3a84dc 100644
--- a/core/src/main/java/org/lflang/federated/launcher/PyBuildConfig.java
+++ b/core/src/main/java/org/lflang/federated/launcher/PyBuildConfig.java
@@ -1,13 +1,13 @@
 package org.lflang.federated.launcher;
 
 import org.lflang.MessageReporter;
-import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
+import org.lflang.federated.generator.FederationFileConfig;
 
 public class PyBuildConfig extends BuildConfig {
 
   public PyBuildConfig(
-      FederateInstance federate, FedFileConfig fileConfig, MessageReporter messageReporter) {
+      FederateInstance federate, FederationFileConfig fileConfig, MessageReporter messageReporter) {
     super(federate, fileConfig, messageReporter);
   }
 
diff --git a/core/src/main/java/org/lflang/federated/launcher/TsBuildConfig.java b/core/src/main/java/org/lflang/federated/launcher/TsBuildConfig.java
index 82a0e2c7ae..43b5b476f4 100644
--- a/core/src/main/java/org/lflang/federated/launcher/TsBuildConfig.java
+++ b/core/src/main/java/org/lflang/federated/launcher/TsBuildConfig.java
@@ -26,8 +26,8 @@
 package org.lflang.federated.launcher;
 
 import org.lflang.MessageReporter;
-import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FederateInstance;
+import org.lflang.federated.generator.FederationFileConfig;
 
 /**
  * Utility class that can be used to create a launcher for federated LF programs that are written in
@@ -40,7 +40,7 @@
 public class TsBuildConfig extends BuildConfig {
 
   public TsBuildConfig(
-      FederateInstance federate, FedFileConfig fileConfig, MessageReporter messageReporter) {
+      FederateInstance federate, FederationFileConfig fileConfig, MessageReporter messageReporter) {
     super(federate, fileConfig, messageReporter);
   }
 
diff --git a/core/src/main/java/org/lflang/generator/LFGenerator.java b/core/src/main/java/org/lflang/generator/LFGenerator.java
index a7776c7b57..b43254f1ae 100644
--- a/core/src/main/java/org/lflang/generator/LFGenerator.java
+++ b/core/src/main/java/org/lflang/generator/LFGenerator.java
@@ -14,8 +14,8 @@
 import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
 import org.lflang.federated.generator.FedASTUtils;
-import org.lflang.federated.generator.FedFileConfig;
 import org.lflang.federated.generator.FedGenerator;
+import org.lflang.federated.generator.FederationFileConfig;
 import org.lflang.generator.c.CFileConfig;
 import org.lflang.generator.c.CGenerator;
 import org.lflang.generator.cpp.CppFileConfig;
@@ -52,7 +52,7 @@ public static FileConfig createFileConfig(
 
     try {
       if (FedASTUtils.findFederatedReactor(resource) != null) {
-        return new FedFileConfig(resource, srcGenBasePath, useHierarchicalBin);
+        return new FederationFileConfig(resource, srcGenBasePath, useHierarchicalBin);
       }
 
       return switch (target) {
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index 493b0be331..46e6175983 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -138,12 +138,7 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
     if (cMakeReturnCode != 0
         && context.getMode() == LFGeneratorContext.Mode.STANDALONE
         && !outputContainsKnownCMakeErrors(compile.getErrors())) {
-      messageReporter
-          .nowhere()
-          .error(
-              targetConfig.get(CompilerProperty.INSTANCE)
-                  + " failed with error code "
-                  + cMakeReturnCode);
+      messageReporter.nowhere().error("CMake failed with error code " + cMakeReturnCode);
     }
 
     // For warnings (vs. errors), the return code is 0.
@@ -164,12 +159,7 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
       if (makeReturnCode != 0
           && context.getMode() == LFGeneratorContext.Mode.STANDALONE
           && !outputContainsKnownCMakeErrors(build.getErrors())) {
-        messageReporter
-            .nowhere()
-            .error(
-                targetConfig.get(CompilerProperty.INSTANCE)
-                    + " failed with error code "
-                    + makeReturnCode);
+        messageReporter.nowhere().error("CMake failed with error code " + makeReturnCode);
       }
 
       // For warnings (vs. errors), the return code is 0.
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 3597933a73..d367b49d7b 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -713,10 +713,8 @@ private void inspectReactorEResource(ReactorDecl reactor) {
         // Copy the user files and cmake-includes to the src-gen path of the main .lf file
         copyUserFiles(lfResource.getTargetConfig(), lfResource.getFileConfig());
         // Merge the CMake includes from the imported file into the target config
-        if (lfResource.getTargetConfig().isSet(CmakeIncludeProperty.INSTANCE)) {
-          CmakeIncludeProperty.INSTANCE.update(
-              this.targetConfig, lfResource.getTargetConfig().get(CmakeIncludeProperty.INSTANCE));
-        }
+        CmakeIncludeProperty.INSTANCE.update(
+            this.targetConfig, lfResource.getTargetConfig().get(CmakeIncludeProperty.INSTANCE));
       }
     }
   }
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index dc55f74d09..35bfec5023 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -45,6 +45,7 @@
 import org.lflang.lf.Model;
 import org.lflang.lf.TargetDecl;
 import org.lflang.target.property.FastProperty;
+import org.lflang.target.property.FedSetupProperty;
 import org.lflang.target.property.LoggingProperty;
 import org.lflang.target.property.NoCompileProperty;
 import org.lflang.target.property.TimeOutProperty;
@@ -103,6 +104,10 @@ public TargetConfig(
       Properties cliArgs,
       MessageReporter messageReporter) {
     this(target);
+
+    // Load target properties for internal use.
+    this.register(FedSetupProperty.INSTANCE);
+
     if (properties != null) {
       List<KeyValuePair> pairs = properties.getPairs();
       this.load(pairs, messageReporter);
@@ -214,6 +219,9 @@ public void load(List<KeyValuePair> pairs, MessageReporter err) {
           if (p.isPresent()) {
             var property = p.get();
             property.update(this, pair.getValue(), err);
+          } else {
+            err.nowhere()
+                .warning("Attempting to load unrecognized target property: " + pair.getName());
           }
         });
   }
diff --git a/core/src/test/java/org/lflang/tests/compiler/TargetConfigTests.java b/core/src/test/java/org/lflang/tests/compiler/TargetConfigTests.java
index 8288d17876..dd5e4b882d 100644
--- a/core/src/test/java/org/lflang/tests/compiler/TargetConfigTests.java
+++ b/core/src/test/java/org/lflang/tests/compiler/TargetConfigTests.java
@@ -14,7 +14,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.io.TempDir;
-import org.lflang.federated.generator.FedFileConfig;
+import org.lflang.federated.generator.FederationFileConfig;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.LFGenerator;
 import org.lflang.generator.LFGeneratorContext.Mode;
@@ -97,7 +97,9 @@ public void testFederation(@TempDir Path tempDir) throws Exception {
 
     String lfSrc =
         Files.readAllLines(
-                ((FedFileConfig) context.getFileConfig()).getSrcPath().resolve("federate__a.lf"))
+                ((FederationFileConfig) context.getFileConfig())
+                    .getSrcPath()
+                    .resolve("federate__a.lf"))
             .stream()
             .reduce("\n", String::concat);
     Model federate = parser.parse(lfSrc);
diff --git a/test/Python/src/multiport/MultiportFromBankHierarchy.lf b/test/Python/src/multiport/MultiportFromBankHierarchy.lf
index 83c33e2284..20a66f2e1f 100644
--- a/test/Python/src/multiport/MultiportFromBankHierarchy.lf
+++ b/test/Python/src/multiport/MultiportFromBankHierarchy.lf
@@ -11,7 +11,6 @@ reactor Source(bank_index=0) {
   output out
 
   reaction(startup) -> out {=
-        +++++;
     out.set(self.bank_index)
   =}
 }

From 48f791cbfa5899dcbb307d7f90b44fa07c7edac3 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 18 Oct 2023 14:46:01 -0700
Subject: [PATCH 1047/1114] Fix unit tests

---
 .../main/java/org/lflang/generator/c/CGenerator.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index d367b49d7b..0dead892db 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -732,7 +732,7 @@ protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
     // Must use class variable to determine destination!
     var destination = this.fileConfig.getSrcGenPath();
 
-    if (!(this instanceof PythonGenerator)) {
+    if (targetConfig.isSet(CmakeIncludeProperty.INSTANCE)) {
       FileUtil.copyFilesOrDirectories(
           targetConfig.get(CmakeIncludeProperty.INSTANCE),
           destination,
@@ -743,13 +743,13 @@ protected void copyUserFiles(TargetConfig targetConfig, FileConfig fileConfig) {
 
     try {
       var file = targetConfig.get(FedSetupProperty.INSTANCE);
-      FileUtil.copyFile(fileConfig.srcFile.getParent().resolve(file), destination.resolve(file));
+      if (file != null) {
+        FileUtil.copyFile(fileConfig.srcFile.getParent().resolve(file), destination.resolve(file));
+      }
     } catch (IOException e) {
       messageReporter
           .nowhere()
           .error("Failed to find _fed_setup file " + targetConfig.get(FedSetupProperty.INSTANCE));
-    } catch (IllegalArgumentException e) {
-      // No FedSetupProperty defined.
     }
   }
 
@@ -1941,7 +1941,7 @@ protected void setUpGeneralParameters() {
       // So that each separate compile knows about modal reactors, do this:
       CompileDefinitionsProperty.INSTANCE.update(targetConfig, Map.of("MODAL_REACTORS", "TRUE"));
     }
-    if (!(this instanceof PythonGenerator)) {
+    if (targetConfig.isSet(PlatformProperty.INSTANCE)) {
 
       final var platformOptions = targetConfig.get(PlatformProperty.INSTANCE);
       if (targetConfig.get(ThreadingProperty.INSTANCE)

From 6b0637a447bac5a2c7d23f5965ff11a598429c74 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 18 Oct 2023 15:20:20 -0700
Subject: [PATCH 1048/1114] Move registration to main constructor

---
 core/src/main/java/org/lflang/target/TargetConfig.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 35bfec5023..82f42965db 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -76,6 +76,9 @@ public TargetConfig(Target target) {
     // Register target-specific properties
     target.initialize(this);
 
+    // Register target properties for internal use.
+    this.register(FedSetupProperty.INSTANCE);
+
     // Register general-purpose properties
     this.register(
         FastProperty.INSTANCE,
@@ -105,9 +108,6 @@ public TargetConfig(
       MessageReporter messageReporter) {
     this(target);
 
-    // Load target properties for internal use.
-    this.register(FedSetupProperty.INSTANCE);
-
     if (properties != null) {
       List<KeyValuePair> pairs = properties.getPairs();
       this.load(pairs, messageReporter);

From 6958d737d47961c7fee17f18dbee3f91e46686ae Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 18 Oct 2023 15:29:37 -0700
Subject: [PATCH 1049/1114] Only copy cmake includes if set

---
 core/src/main/java/org/lflang/generator/c/CGenerator.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 0dead892db..f052048228 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -713,8 +713,10 @@ private void inspectReactorEResource(ReactorDecl reactor) {
         // Copy the user files and cmake-includes to the src-gen path of the main .lf file
         copyUserFiles(lfResource.getTargetConfig(), lfResource.getFileConfig());
         // Merge the CMake includes from the imported file into the target config
-        CmakeIncludeProperty.INSTANCE.update(
-            this.targetConfig, lfResource.getTargetConfig().get(CmakeIncludeProperty.INSTANCE));
+        if (lfResource.getTargetConfig().isSet(CmakeIncludeProperty.INSTANCE)) {
+          CmakeIncludeProperty.INSTANCE.update(
+              this.targetConfig, lfResource.getTargetConfig().get(CmakeIncludeProperty.INSTANCE));
+        }
       }
     }
   }

From 3eaae53a5f73d3ac3ea92936e6c60c205a01c335 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 18 Oct 2023 16:57:23 -0700
Subject: [PATCH 1050/1114] Bring back reverted Python fix

---
 .../org/lflang/federated/generator/FederationFileConfig.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/federated/generator/FederationFileConfig.java b/core/src/main/java/org/lflang/federated/generator/FederationFileConfig.java
index d8946a2ad2..c714c0586a 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederationFileConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederationFileConfig.java
@@ -105,7 +105,9 @@ public void relativizePaths(FederateTargetConfig targetConfig) {
     List.of(ProtobufsProperty.INSTANCE, FilesProperty.INSTANCE, CmakeIncludeProperty.INSTANCE)
         .forEach(
             p -> {
-              p.override(targetConfig, relativizePathList(targetConfig.get(p)));
+              if (targetConfig.isSet(p)) {
+                p.override(targetConfig, relativizePathList(targetConfig.get(p)));
+              }
             });
   }
 

From 7223686f1a51eb074139fb6e17e97da02fde8a81 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 18 Oct 2023 17:10:43 -0700
Subject: [PATCH 1051/1114] Fix bug that prevented files from being copied

---
 core/src/main/java/org/lflang/generator/c/CGenerator.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index f052048228..c85fee17c6 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -445,8 +445,11 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
       }
     }
 
+    var isArduino =
+        targetConfig.getOrDefault(PlatformProperty.INSTANCE).platform == Platform.ARDUINO;
+
     // If cmake is requested, generate the CMakeLists.txt
-    if (!targetConfig.isSet(PlatformProperty.INSTANCE)) {
+    if (!isArduino) {
       var cmakeFile = fileConfig.getSrcGenPath() + File.separator + "CMakeLists.txt";
       var sources =
           allTypeParameterizedReactors()
@@ -462,7 +465,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
         //noinspection ThrowableNotThrown,ResultOfMethodCallIgnored
         Exceptions.sneakyThrow(e);
       }
-    } else if (targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO) {
+    } else {
       try {
         Path include = fileConfig.getSrcGenPath().resolve("include/");
         Path src = fileConfig.getSrcGenPath().resolve("src/");

From d889a9c8d12492d48d5d3ca75464d96d42dc0e9f Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 18 Oct 2023 22:28:13 -0700
Subject: [PATCH 1052/1114] Address fixme

---
 .../lflang/generator/c/CCmakeGenerator.java   |  28 ++---
 .../org/lflang/generator/c/CCompiler.java     |   6 +-
 .../org/lflang/generator/c/CGenerator.java    |  27 ++---
 .../generator/c/CMainFunctionGenerator.java   |   4 +-
 .../generator/c/CPreambleGenerator.java       |   2 +-
 .../target/property/PlatformProperty.java     | 104 +++++++++---------
 .../java/org/lflang/util/ArduinoUtil.java     |  14 +--
 .../java/org/lflang/tests/Configurators.java  |  31 ++++--
 8 files changed, 117 insertions(+), 99 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
index fe24d9a7e7..f3e4afeee8 100644
--- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -128,8 +128,8 @@ CodeBuilder generateCMakeCode(
     //  arduino
     String[] boardProperties = {};
     var platformOptions = targetConfig.getOrDefault(PlatformProperty.INSTANCE);
-    if (platformOptions.board != null) {
-      boardProperties = platformOptions.board.trim().split(":");
+    if (platformOptions.board() != null) {
+      boardProperties = platformOptions.board().trim().split(":");
       // Ignore whitespace
       for (int i = 0; i < boardProperties.length; i++) {
         boardProperties[i] = boardProperties[i].trim();
@@ -142,14 +142,14 @@ CodeBuilder generateCMakeCode(
     cMakeCode.pr("cmake_minimum_required(VERSION " + MIN_CMAKE_VERSION + ")");
 
     // Setup the project header for different platforms
-    switch (platformOptions.platform) {
+    switch (platformOptions.platform()) {
       case ZEPHYR:
         cMakeCode.pr("# Set default configuration file. To add custom configurations,");
         cMakeCode.pr("# pass -- -DOVERLAY_CONFIG=my_config.prj to either cmake or west");
         cMakeCode.pr("set(CONF_FILE prj_lf.conf)");
-        if (platformOptions.board != null) {
+        if (platformOptions.board() != null) {
           cMakeCode.pr("# Selecting board specified in target property");
-          cMakeCode.pr("set(BOARD " + platformOptions.board + ")");
+          cMakeCode.pr("set(BOARD " + platformOptions.board() + ")");
         } else {
           cMakeCode.pr("# Selecting default board");
           cMakeCode.pr("set(BOARD qemu_cortex_m3)");
@@ -185,7 +185,7 @@ CodeBuilder generateCMakeCode(
         cMakeCode.pr("project(" + executableName + " LANGUAGES C CXX ASM)");
         cMakeCode.newLine();
         // board type for rp2040 based boards
-        if (platformOptions.board != null) {
+        if (platformOptions.board() != null) {
           if (boardProperties.length < 1 || boardProperties[0].equals("")) {
             cMakeCode.pr("set(PICO_BOARD pico)");
           } else {
@@ -259,8 +259,8 @@ CodeBuilder generateCMakeCode(
       cMakeCode.newLine();
     }
 
-    if (platformOptions.platform != Platform.AUTO) {
-      cMakeCode.pr("set(CMAKE_SYSTEM_NAME " + platformOptions.platform.getcMakeName() + ")");
+    if (platformOptions.platform() != Platform.AUTO) {
+      cMakeCode.pr("set(CMAKE_SYSTEM_NAME " + platformOptions.platform().getcMakeName() + ")");
     }
     cMakeCode.newLine();
     cMakeCode.pr("# Set default values for build parameters\n");
@@ -284,7 +284,7 @@ CodeBuilder generateCMakeCode(
             });
 
     // Setup main target for different platforms
-    switch (platformOptions.platform) {
+    switch (platformOptions.platform()) {
       case ZEPHYR:
         cMakeCode.pr(
             setUpMainTargetZephyr(
@@ -324,12 +324,12 @@ CodeBuilder generateCMakeCode(
     cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/core/utils)");
 
     // post target definition board configurations
-    switch (platformOptions.platform) {
+    switch (platformOptions.platform()) {
       case RP2040:
         // set stdio output
         boolean usb = true;
         boolean uart = true;
-        if (platformOptions.board != null && boardProperties.length > 1) {
+        if (platformOptions.board() != null && boardProperties.length > 1) {
           uart = !boardProperties[1].equals("usb");
           usb = !boardProperties[1].equals("uart");
         }
@@ -342,8 +342,8 @@ CodeBuilder generateCMakeCode(
       // If security is requested, add the auth option.
       var osName = System.getProperty("os.name").toLowerCase();
       // if platform target was set, use given platform instead
-      if (platformOptions.platform != Platform.AUTO) {
-        osName = platformOptions.platform.toString();
+      if (platformOptions.platform() != Platform.AUTO) {
+        osName = platformOptions.platform().toString();
       }
       if (osName.contains("mac")) {
         cMakeCode.pr("set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)");
@@ -355,7 +355,7 @@ CodeBuilder generateCMakeCode(
     }
 
     if (targetConfig.get(ThreadingProperty.INSTANCE)
-        && platformOptions.platform != Platform.ZEPHYR) {
+        && platformOptions.platform() != Platform.ZEPHYR) {
       // If threaded computation is requested, add the threads option.
       cMakeCode.pr("# Find threads and link to it");
       cMakeCode.pr("find_package(Threads REQUIRED)");
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index 46e6175983..69067fc14d 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -179,7 +179,7 @@ public boolean runCCompiler(GeneratorBase generator, LFGeneratorContext context)
                     + " finished with no errors.");
       }
       var options = targetConfig.getOrDefault(PlatformProperty.INSTANCE);
-      if (options.platform == Platform.ZEPHYR && options.flash) {
+      if (options.platform() == Platform.ZEPHYR && options.flash()) {
         messageReporter.nowhere().info("Invoking flash command for Zephyr");
         LFCommand flash = buildWestFlashCommand(options);
         int flashRet = flash.run();
@@ -309,7 +309,7 @@ public LFCommand buildCmakeCommand() {
   public LFCommand buildWestFlashCommand(PlatformOptions options) {
     // Set the build directory to be "build"
     Path buildPath = fileConfig.getSrcGenPath().resolve("build");
-    String board = options.board;
+    String board = options.board();
     LFCommand cmd;
     if (board == null || board.startsWith("qemu") || board.equals("native_posix")) {
       cmd = commandFactory.createCommand("west", List.of("build", "-t", "run"), buildPath);
@@ -439,7 +439,7 @@ static String getTargetFileName(String fileName, boolean cppMode, TargetConfig t
   }
 
   static String getFileExtension(boolean cppMode, TargetConfig targetConfig) {
-    if (targetConfig.getOrDefault(PlatformProperty.INSTANCE).platform == Platform.ARDUINO) {
+    if (targetConfig.getOrDefault(PlatformProperty.INSTANCE).platform() == Platform.ARDUINO) {
       return ".ino";
     }
     if (cppMode) {
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index c85fee17c6..d4c6917f62 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -446,7 +446,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     }
 
     var isArduino =
-        targetConfig.getOrDefault(PlatformProperty.INSTANCE).platform == Platform.ARDUINO;
+        targetConfig.getOrDefault(PlatformProperty.INSTANCE).platform() == Platform.ARDUINO;
 
     // If cmake is requested, generate the CMakeLists.txt
     if (!isArduino) {
@@ -627,7 +627,8 @@ private void generateCodeFor(String lfModuleName) throws IOException {
       // downstream federates, will notify the RTI
       // that the specified logical time is complete.
       if (!(this instanceof PythonGenerator)
-          && (cppMode || targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO))
+          && (cppMode
+              || targetConfig.get(PlatformProperty.INSTANCE).platform() == Platform.ARDUINO))
         code.pr("extern \"C\"");
       code.pr(
           String.join(
@@ -871,8 +872,8 @@ private void generateReactorChildren(
   private void pickCompilePlatform() {
     var osName = System.getProperty("os.name").toLowerCase();
     // if platform target was set, use given platform instead
-    if (targetConfig.get(PlatformProperty.INSTANCE).platform != Platform.AUTO) {
-      osName = targetConfig.get(PlatformProperty.INSTANCE).platform.toString();
+    if (targetConfig.get(PlatformProperty.INSTANCE).platform() != Platform.AUTO) {
+      osName = targetConfig.get(PlatformProperty.INSTANCE).platform().toString();
     } else if (Stream.of("mac", "darwin", "win", "nux").noneMatch(osName::contains)) {
       messageReporter.nowhere().error("Platform " + osName + " is not supported");
     }
@@ -885,7 +886,7 @@ protected void copyTargetFiles() throws IOException {
     Path dest = fileConfig.getSrcGenPath();
 
     if (targetConfig.isSet(PlatformProperty.INSTANCE)) {
-      var platform = targetConfig.get(PlatformProperty.INSTANCE).platform;
+      var platform = targetConfig.get(PlatformProperty.INSTANCE).platform();
       switch (platform) {
         case ARDUINO -> {
           // For Arduino, alter the destination directory.
@@ -1950,8 +1951,8 @@ protected void setUpGeneralParameters() {
 
       final var platformOptions = targetConfig.get(PlatformProperty.INSTANCE);
       if (targetConfig.get(ThreadingProperty.INSTANCE)
-          && platformOptions.platform == Platform.ARDUINO
-          && (platformOptions.board == null || !platformOptions.board.contains("mbed"))) {
+          && platformOptions.platform() == Platform.ARDUINO
+          && (platformOptions.board() == null || !platformOptions.board().contains("mbed"))) {
         // non-MBED boards should not use threading
         messageReporter
             .nowhere()
@@ -1961,9 +1962,9 @@ protected void setUpGeneralParameters() {
         ThreadingProperty.INSTANCE.override(targetConfig, false);
       }
 
-      if (platformOptions.platform == Platform.ARDUINO
+      if (platformOptions.platform() == Platform.ARDUINO
           && !targetConfig.get(NoCompileProperty.INSTANCE)
-          && platformOptions.board == null) {
+          && platformOptions.board() == null) {
         messageReporter
             .nowhere()
             .info(
@@ -1974,13 +1975,13 @@ protected void setUpGeneralParameters() {
         NoCompileProperty.INSTANCE.override(targetConfig, true);
       }
 
-      if (platformOptions.platform == Platform.ZEPHYR
+      if (platformOptions.platform() == Platform.ZEPHYR
           && targetConfig.get(ThreadingProperty.INSTANCE)
-          && platformOptions.userThreads >= 0) {
+          && platformOptions.userThreads() >= 0) {
         targetConfig
             .get(CompileDefinitionsProperty.INSTANCE)
-            .put(PlatformOption.USER_THREADS.name(), String.valueOf(platformOptions.userThreads));
-      } else if (platformOptions.userThreads > 0) {
+            .put(PlatformOption.USER_THREADS.name(), String.valueOf(platformOptions.userThreads()));
+      } else if (platformOptions.userThreads() > 0) {
         messageReporter
             .nowhere()
             .warning(
diff --git a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
index dd5dbc9121..ebfff5a234 100644
--- a/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
@@ -39,7 +39,7 @@ public String generateCode() {
   private String generateMainFunction() {
     var platform = Platform.AUTO;
     if (targetConfig.isSet(PlatformProperty.INSTANCE)) {
-      platform = targetConfig.get(PlatformProperty.INSTANCE).platform;
+      platform = targetConfig.get(PlatformProperty.INSTANCE).platform();
     }
     switch (platform) {
       case ARDUINO -> {
@@ -57,7 +57,7 @@ private String generateMainFunction() {
             "}\n",
             "// Arduino setup() and loop() functions",
             "void setup() {",
-            "\tSerial.begin(" + targetConfig.get(PlatformProperty.INSTANCE).baudRate + ");",
+            "\tSerial.begin(" + targetConfig.get(PlatformProperty.INSTANCE).baudRate() + ");",
             "\tlf_register_print_function(&_lf_arduino_print_message_function, LOG_LEVEL);",
             "\tlf_reactor_c_main(0, NULL);",
             "}\n",
diff --git a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
index 58319a4f3b..d76e86fc86 100644
--- a/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
@@ -34,7 +34,7 @@ public class CPreambleGenerator {
 
   private static boolean arduinoBased(TargetConfig targetConfig) {
     return targetConfig.isSet(PlatformProperty.INSTANCE)
-        && targetConfig.get(PlatformProperty.INSTANCE).platform == Platform.ARDUINO;
+        && targetConfig.get(PlatformProperty.INSTANCE).platform() == Platform.ARDUINO;
   }
   /** Add necessary source files specific to the target language. */
   public static String generateIncludeStatements(TargetConfig targetConfig, boolean cppMode) {
diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index 67dffe336b..1a43ddd26c 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -33,14 +33,19 @@ private PlatformProperty() {
 
   @Override
   public PlatformOptions initialValue() {
-    return new PlatformOptions();
+    return new PlatformOptions(Platform.AUTO, null, null, 9600, false, 0);
   }
 
   @Override
   public PlatformOptions fromAst(Element node, MessageReporter reporter) {
-    var config = new PlatformOptions();
+    var platform = Platform.AUTO;
+    String board = null;
+    String port = null;
+    var baudRate = 9600;
+    var flash = false;
+    var userThreads = 0;
     if (node.getLiteral() != null || node.getId() != null) {
-      config.platform = new PlatformType().forName(ASTUtils.elementToSingleString(node));
+      platform = new PlatformType().forName(ASTUtils.elementToSingleString(node));
     } else {
       for (KeyValuePair entry : node.getKeyvalue().getPairs()) {
         PlatformOption option =
@@ -50,19 +55,17 @@ public PlatformOptions fromAst(Element node, MessageReporter reporter) {
         }
         switch (option) {
           case NAME -> {
-            config.platform =
-                new PlatformType().forName(ASTUtils.elementToSingleString(entry.getValue()));
+            platform = new PlatformType().forName(ASTUtils.elementToSingleString(entry.getValue()));
           }
-          case BAUDRATE -> config.baudRate = ASTUtils.toInteger(entry.getValue());
-          case BOARD -> config.board = ASTUtils.elementToSingleString(entry.getValue());
-          case FLASH -> config.flash = ASTUtils.toBoolean(entry.getValue());
-          case PORT -> config.port = ASTUtils.elementToSingleString(entry.getValue());
-          case USER_THREADS -> config.userThreads = ASTUtils.toInteger(entry.getValue());
+          case BAUDRATE -> baudRate = ASTUtils.toInteger(entry.getValue());
+          case BOARD -> board = ASTUtils.elementToSingleString(entry.getValue());
+          case FLASH -> flash = ASTUtils.toBoolean(entry.getValue());
+          case PORT -> port = ASTUtils.elementToSingleString(entry.getValue());
+          case USER_THREADS -> userThreads = ASTUtils.toInteger(entry.getValue());
         }
       }
     }
-
-    return config;
+    return new PlatformOptions(platform, board, port, baudRate, flash, userThreads);
   }
 
   @Override
@@ -111,46 +114,43 @@ public String name() {
   }
 
   /** Settings related to Platform Options. */
-  public static class PlatformOptions { // FIXME: use a record for this
-
-    /**
-     * The base platform we build our LF Files on. Should be set to AUTO by default unless
-     * developing for specific OS/Embedded Platform
-     */
-    public Platform platform = Platform.AUTO;
-
-    /**
-     * The string value used to determine what type of embedded board we work with and can be used
-     * to simplify the build process. This string has the form "board_name[:option]*" (zero or more
-     * options separated by colons). For example, "pico:usb" specifies a Raspberry Pi Pico where
-     * stdin and stdout go through a USB serial port.
-     */
-    public String board = null;
-
-    /**
-     * The string value used to determine the port on which to flash the compiled program (i.e.
-     * /dev/cu.usbmodem21301)
-     */
-    public String port = null;
-
-    /**
-     * The baud rate used as a parameter to certain embedded platforms. 9600 is a standard rate
-     * amongst systems like Arduino, so it's the default value.
-     */
-    public int baudRate = 9600;
-
-    /**
-     * The boolean statement used to determine whether we should automatically attempt to flash once
-     * we compile. This may require the use of board and port values depending on the infrastructure
-     * you use to flash the boards.
-     */
-    public boolean flash = false;
-
-    /**
-     * The int value is used to determine the number of needed threads for the user application in
-     * Zephyr.
-     */
-    public int userThreads = 0;
+  public record PlatformOptions(
+      /**
+       * The base platform we build our LF Files on. Should be set to AUTO by default unless
+       * developing for specific OS/Embedded Platform
+       */
+      Platform platform,
+      /**
+       * The string value used to determine what type of embedded board we work with and can be used
+       * to simplify the build process. This string has the form "board_name[:option]*" (zero or
+       * more options separated by colons). For example, "pico:usb" specifies a Raspberry Pi Pico
+       * where stdin and stdout go through a USB serial port.
+       */
+      String board,
+
+      /**
+       * The string value used to determine the port on which to flash the compiled program (i.e.
+       * /dev/cu.usbmodem21301)
+       */
+      String port,
+
+      /**
+       * The baud rate used as a parameter to certain embedded platforms. 9600 is a standard rate
+       * amongst systems like Arduino, so it's the default value.
+       */
+      int baudRate,
+
+      /**
+       * Whether we should automatically attempt to flash once we compile. This may require the use
+       * of board and port values depending on the infrastructure you use to flash the boards.
+       */
+      boolean flash,
+
+      /**
+       * The baud rate used as a parameter to certain embedded platforms. 9600 is a standard rate
+       * amongst systems like Arduino, so it's the default value.
+       */
+      int userThreads) {
 
     public String[] boardArray() {
       // Parse board option of the platform target property
diff --git a/core/src/main/java/org/lflang/util/ArduinoUtil.java b/core/src/main/java/org/lflang/util/ArduinoUtil.java
index 17331d986d..75da247a12 100644
--- a/core/src/main/java/org/lflang/util/ArduinoUtil.java
+++ b/core/src/main/java/org/lflang/util/ArduinoUtil.java
@@ -69,11 +69,11 @@ private LFCommand arduinoCompileCommand(FileConfig fileConfig, TargetConfig targ
         var fileWriter = new FileWriter(testScript.getAbsoluteFile(), true);
         BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
         String board =
-            targetConfig.get(PlatformProperty.INSTANCE).board != null
-                ? targetConfig.get(PlatformProperty.INSTANCE).board
+            targetConfig.get(PlatformProperty.INSTANCE).board() != null
+                ? targetConfig.get(PlatformProperty.INSTANCE).board()
                 : "arduino:avr:leonardo";
         String isThreaded =
-            targetConfig.get(PlatformProperty.INSTANCE).board.contains("mbed")
+            targetConfig.get(PlatformProperty.INSTANCE).board().contains("mbed")
                 ? "-DLF_THREADED"
                 : "-DLF_UNTHREADED";
         bufferedWriter.write(
@@ -123,8 +123,8 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
             "SUCCESS: Compiling generated code for "
                 + fileConfig.name
                 + " finished with no errors.");
-    if (targetConfig.get(PlatformProperty.INSTANCE).flash) {
-      if (targetConfig.get(PlatformProperty.INSTANCE).port != null) {
+    if (targetConfig.get(PlatformProperty.INSTANCE).flash()) {
+      if (targetConfig.get(PlatformProperty.INSTANCE).port() != null) {
         messageReporter.nowhere().info("Invoking flash command for Arduino");
         LFCommand flash =
             commandFactory.createCommand(
@@ -132,9 +132,9 @@ public void buildArduino(FileConfig fileConfig, TargetConfig targetConfig) {
                 List.of(
                     "upload",
                     "-b",
-                    targetConfig.get(PlatformProperty.INSTANCE).board,
+                    targetConfig.get(PlatformProperty.INSTANCE).board(),
                     "-p",
-                    targetConfig.get(PlatformProperty.INSTANCE).port),
+                    targetConfig.get(PlatformProperty.INSTANCE).port()),
                 fileConfig.getSrcGenPath());
         if (flash == null) {
           messageReporter.nowhere().error("Could not create arduino-cli flash command.");
diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index 9885985e01..7cff60a65b 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -26,6 +26,7 @@
 
 import org.lflang.target.property.LoggingProperty;
 import org.lflang.target.property.PlatformProperty;
+import org.lflang.target.property.PlatformProperty.PlatformOptions;
 import org.lflang.target.property.ThreadingProperty;
 import org.lflang.target.property.type.LoggingType.LogLevel;
 import org.lflang.target.property.type.PlatformType.Platform;
@@ -67,12 +68,20 @@ public static boolean disableThreading(LFTest test) {
   }
 
   public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
+
     test.getContext().getArgs().setProperty("tracing", "false");
     ThreadingProperty.INSTANCE.override(test.getContext().getTargetConfig(), false);
-    // FIXME: use a record and override.
-    test.getContext().getTargetConfig().get(PlatformProperty.INSTANCE).platform = Platform.ZEPHYR;
-    test.getContext().getTargetConfig().get(PlatformProperty.INSTANCE).flash = false;
-    test.getContext().getTargetConfig().get(PlatformProperty.INSTANCE).board = "qemu_cortex_m3";
+    var targetConfig = test.getContext().getTargetConfig();
+    var platform = targetConfig.get(PlatformProperty.INSTANCE);
+    PlatformProperty.INSTANCE.override(
+        targetConfig,
+        new PlatformOptions(
+            Platform.ZEPHYR,
+            "qemu_cortex_m3",
+            platform.port(),
+            platform.baudRate(),
+            false,
+            platform.userThreads()));
 
     // FIXME: Zephyr  emulations fails with debug log-levels.
     LoggingProperty.INSTANCE.override(test.getContext().getTargetConfig(), LogLevel.WARN);
@@ -82,9 +91,17 @@ public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
 
   public static boolean makeZephyrCompatible(LFTest test) {
     test.getContext().getArgs().setProperty("tracing", "false");
-    test.getContext().getTargetConfig().get(PlatformProperty.INSTANCE).platform = Platform.ZEPHYR;
-    test.getContext().getTargetConfig().get(PlatformProperty.INSTANCE).flash = false;
-    test.getContext().getTargetConfig().get(PlatformProperty.INSTANCE).board = "qemu_cortex_m3";
+    var targetConfig = test.getContext().getTargetConfig();
+    var platform = targetConfig.get(PlatformProperty.INSTANCE);
+    PlatformProperty.INSTANCE.override(
+        targetConfig,
+        new PlatformOptions(
+            Platform.ZEPHYR,
+            "qemu_cortex_m3",
+            platform.port(),
+            platform.baudRate(),
+            false,
+            platform.userThreads()));
 
     // FIXME: Zephyr  emulations fails with debug log-levels.
     LoggingProperty.INSTANCE.override(test.getContext().getTargetConfig(), LogLevel.WARN);

From df93ae18ac52e7974ef59b68909414512c5c1e42 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Thu, 19 Oct 2023 11:50:28 +0200
Subject: [PATCH 1053/1114] Add CI testing of lf-west-template also

---
 .github/workflows/c-zephyr-tests.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index 16001457fb..127dfb698c 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -60,6 +60,15 @@ jobs:
         run: |
           ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrBoards* core:integrationTestCodeCoverageReport
           rm -r test/C/src-gen
+      - name: Run lf-west-template tests
+        run: |
+          git clone https://github.com/lf-lang/lf-west-template && cd lf-west-template
+          pip3 install west
+          cd application
+          west lfc src/HelloWorld.lf --build 
+          west lfc src/NrfBlinky.lf --build 
+          west lfc src/NrfToggleGPIO.lf --build 
+      
       - name: Report to CodeCov
         uses: ./.github/actions/report-code-coverage
         with:

From 7086df565ad27947e3a977ec84ac87967e606fb4 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Thu, 19 Oct 2023 15:03:43 +0200
Subject: [PATCH 1054/1114] Remove other tests

---
 .github/workflows/all-targets.yml    | 48 +++++++++++++-------------
 .github/workflows/c-tests.yml        | 32 +++++++++---------
 .github/workflows/c-zephyr-tests.yml | 50 ++++++++++++++--------------
 3 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/.github/workflows/all-targets.yml b/.github/workflows/all-targets.yml
index 4068bc2576..15bb064188 100644
--- a/.github/workflows/all-targets.yml
+++ b/.github/workflows/all-targets.yml
@@ -27,27 +27,27 @@ jobs:
     needs: check-diff
     if: ${{ needs.check-diff.outputs.run_c == 'true' }}
 
-  cpp:
-    uses: ./.github/workflows/only-cpp.yml
-    needs: check-diff
-    if: ${{ needs.check-diff.outputs.run_cpp == 'true' }}
-
-  py:
-    uses: ./.github/workflows/only-py.yml
-    needs: check-diff
-    if: ${{ needs.check-diff.outputs.run_py == 'true' || needs.check-diff.outputs.run_c == 'true' }}
-
-  rs:
-    uses: ./.github/workflows/only-rs.yml
-    needs: check-diff
-    if: ${{ needs.check-diff.outputs.run_rs == 'true' }}
-
-  ts:
-    uses: ./.github/workflows/only-ts.yml
-    needs: check-diff
-    if: ${{ needs.check-diff.outputs.run_ts == 'true' }}
-
-  serialization:
-    if: ${{ needs.check-diff.outputs.run_c == 'true' || needs.check-diff.outputs.run_py == 'true' || needs.check-diff.outputs.run_ts == 'true' }}
-    needs: check-diff
-    uses: ./.github/workflows/serialization-tests.yml
+  # cpp:
+  #   uses: ./.github/workflows/only-cpp.yml
+  #   needs: check-diff
+  #   if: ${{ needs.check-diff.outputs.run_cpp == 'true' }}
+
+  # py:
+  #   uses: ./.github/workflows/only-py.yml
+  #   needs: check-diff
+  #   if: ${{ needs.check-diff.outputs.run_py == 'true' || needs.check-diff.outputs.run_c == 'true' }}
+
+  # rs:
+  #   uses: ./.github/workflows/only-rs.yml
+  #   needs: check-diff
+  #   if: ${{ needs.check-diff.outputs.run_rs == 'true' }}
+
+  # ts:
+  #   uses: ./.github/workflows/only-ts.yml
+  #   needs: check-diff
+  #   if: ${{ needs.check-diff.outputs.run_ts == 'true' }}
+
+  # serialization:
+  #   if: ${{ needs.check-diff.outputs.run_c == 'true' || needs.check-diff.outputs.run_py == 'true' || needs.check-diff.outputs.run_ts == 'true' }}
+  #   needs: check-diff
+  #   uses: ./.github/workflows/serialization-tests.yml
diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml
index 60acaec10a..d19a62edc0 100644
--- a/.github/workflows/c-tests.yml
+++ b/.github/workflows/c-tests.yml
@@ -53,19 +53,19 @@ jobs:
       - name: Install RTI
         uses: ./.github/actions/install-rti
         if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }}
-      - name: Perform tests for C target with default scheduler
-        run: ./gradlew targetTest -Ptarget=C
-        if: ${{ !inputs.use-cpp && !inputs.scheduler }}
-      - name: Perform tests for C target with specified scheduler (no LSP tests)
-        run: |
-          echo "Specified scheduler: ${{ inputs.scheduler }}"
-          ./gradlew targetTest -Ptarget=C -Dscheduler=${{ inputs.scheduler }}
-        if: ${{ !inputs.use-cpp && inputs.scheduler }}
-      - name: Perform tests for CCpp target with default scheduler
-        run: ./gradlew targetTest -Ptarget=CCpp
-        if: ${{ inputs.use-cpp && !inputs.scheduler }}
-      - name: Report to CodeCov
-        uses: ./.github/actions/report-code-coverage
-        with:
-          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-        if: ${{ github.repository == 'lf-lang/lingua-franca' }}
+      # - name: Perform tests for C target with default scheduler
+      #   run: ./gradlew targetTest -Ptarget=C
+      #   if: ${{ !inputs.use-cpp && !inputs.scheduler }}
+      # - name: Perform tests for C target with specified scheduler (no LSP tests)
+      #   run: |
+      #     echo "Specified scheduler: ${{ inputs.scheduler }}"
+      #     ./gradlew targetTest -Ptarget=C -Dscheduler=${{ inputs.scheduler }}
+      #   if: ${{ !inputs.use-cpp && inputs.scheduler }}
+      # - name: Perform tests for CCpp target with default scheduler
+      #   run: ./gradlew targetTest -Ptarget=CCpp
+      #   if: ${{ inputs.use-cpp && !inputs.scheduler }}
+      # - name: Report to CodeCov
+      #   uses: ./.github/actions/report-code-coverage
+      #   with:
+      #     files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+      #   if: ${{ github.repository == 'lf-lang/lingua-franca' }}
diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index 127dfb698c..8251c0e5ff 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -38,33 +38,33 @@ jobs:
           repository: lf-lang/reactor-c
           path: core/src/main/resources/lib/c/reactor-c
           ref: ${{ inputs.runtime-ref }}
-        if: ${{ inputs.runtime-ref }}
-      - name: Run Zephyr smoke tests
-        run: |
-          ./gradlew core:integrationTest \
-            --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrUnthreaded* \
-            --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrThreaded* core:integrationTestCodeCoverageReport
-          ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
-          rm -r test/C/src-gen
-      - name: Run basic tests
-        run: |
-          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildBasic* core:integrationTestCodeCoverageReport
-          ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
-          rm -r test/C/src-gen
-      - name: Run concurrent tests
-        run: |
-          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildConcurrent* core:integrationTestCodeCoverageReport
-          ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
-          rm -r test/C/src-gen
-      - name: Run Zephyr board tests
-        run: |
-          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrBoards* core:integrationTestCodeCoverageReport
-          rm -r test/C/src-gen
+        # if: ${{ inputs.runtime-ref }}
+      # - name: Run Zephyr smoke tests
+      #   run: |
+      #     ./gradlew core:integrationTest \
+      #       --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrUnthreaded* \
+      #       --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrThreaded* core:integrationTestCodeCoverageReport
+      #     ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
+      #     rm -r test/C/src-gen
+      # - name: Run basic tests
+      #   run: |
+      #     ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildBasic* core:integrationTestCodeCoverageReport
+      #     ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
+      #     rm -r test/C/src-gen
+      # - name: Run concurrent tests
+      #   run: |
+      #     ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildConcurrent* core:integrationTestCodeCoverageReport
+      #     ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
+      #     rm -r test/C/src-gen
+      # - name: Run Zephyr board tests
+      #   run: |
+      #     ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrBoards* core:integrationTestCodeCoverageReport
+      #     rm -r test/C/src-gen
       - name: Run lf-west-template tests
         run: |
-          git clone https://github.com/lf-lang/lf-west-template && cd lf-west-template
-          pip3 install west
-          cd application
+          git clone https://github.com/lf-lang/lf-west-template
+          cd lf-west-template
+          west update
           west lfc src/HelloWorld.lf --build 
           west lfc src/NrfBlinky.lf --build 
           west lfc src/NrfToggleGPIO.lf --build 

From e6ea27bfc188406d31469d6221d1e01bbc20e6a6 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Thu, 19 Oct 2023 15:55:47 +0200
Subject: [PATCH 1055/1114] Spotless

---
 .github/workflows/c-zephyr-tests.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index 8251c0e5ff..6c5bdd82bd 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -65,10 +65,9 @@ jobs:
           git clone https://github.com/lf-lang/lf-west-template
           cd lf-west-template
           west update
-          west lfc src/HelloWorld.lf --build 
-          west lfc src/NrfBlinky.lf --build 
-          west lfc src/NrfToggleGPIO.lf --build 
-      
+          west lfc src/HelloWorld.lf --build
+          west lfc src/NrfBlinky.lf --build
+          west lfc src/NrfToggleGPIO.lf --build
       - name: Report to CodeCov
         uses: ./.github/actions/report-code-coverage
         with:

From 60dddaf06a2fc9ed9d1aacbeef674996111639f0 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Thu, 19 Oct 2023 18:12:19 +0200
Subject: [PATCH 1056/1114] Need to pass the path to lfc to west lfc

---
 .github/workflows/c-zephyr-tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index 6c5bdd82bd..dbfb8d7d2c 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -65,9 +65,9 @@ jobs:
           git clone https://github.com/lf-lang/lf-west-template
           cd lf-west-template
           west update
-          west lfc src/HelloWorld.lf --build
-          west lfc src/NrfBlinky.lf --build
-          west lfc src/NrfToggleGPIO.lf --build
+          west lfc src/HelloWorld.lf --lfc ../bin/lfc-dev --build
+          west lfc src/NrfBlinky.lf --lfc ../bin/lfc-dev --build
+          west lfc src/NrfToggleGPIO.lf --lfc ../bin/lfc-dev --build
       - name: Report to CodeCov
         uses: ./.github/actions/report-code-coverage
         with:

From df91be0dfd988b5ff9351d9aa4152f87067e9125 Mon Sep 17 00:00:00 2001
From: axmmisaka <6500159+axmmisaka@users.noreply.github.com>
Date: Thu, 19 Oct 2023 13:33:02 -0700
Subject: [PATCH 1057/1114] Update LSP Test CI, use pwsh to remove all
 g++/clang++ in PATH instead of hardcode

After GitHub bumped its Windows Actions runner image, our LSP CI is failing, because Chololatey doesn't have g++ anymore. While the runner image is an absolute disaster (refusal to remove Strawberry Perl being one, see https://github.com/actions/runner-images/issues/5459), we still need to use it, and thus still need to come up with a more robust way of uninstalling g++/clang++.

This commit removes hardcoded g++ locations, instead it uses `Get-Command` in powershell to locate `g++` and delete all of them.
---
 .github/workflows/lsp-tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/lsp-tests.yml b/.github/workflows/lsp-tests.yml
index 5acd262925..da71be458d 100644
--- a/.github/workflows/lsp-tests.yml
+++ b/.github/workflows/lsp-tests.yml
@@ -34,10 +34,10 @@ jobs:
         run: brew uninstall --ignore-dependencies gcc
         if: ${{ runner.os == 'macOS' }}
       - name: Uninstall packages Windows
+        shell: pwsh
         run: |
-          del "C:\ProgramData\Chocolatey\bin\g++.exe"
-          del "C:\Strawberry\c\bin\g++.exe"
-          del "C:\Program Files\LLVM\bin\clang++.exe"
+          try { $exes=Get-Command "g++" -All; $exes | Remove-Item; } catch { "There is no g++ present in pwsh PATH." }
+          try { $exes=Get-Command "clang++" -All; $exes | Remove-Item; } catch { "There is no clang++ present in pwsh PATH." }
         if: ${{ runner.os == 'Windows' }}
       - name: Setup Node.js environment
         uses: actions/setup-node@v3

From 40a81308dbc1144e7076d511ecebca90db8ae030 Mon Sep 17 00:00:00 2001
From: axmmisaka <6500159+axmmisaka@users.noreply.github.com>
Date: Thu, 19 Oct 2023 17:57:49 -0700
Subject: [PATCH 1058/1114] CI updated to include commit SHA in version number
 when creating nightly build

---
 .github/workflows/nightly-build.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 44232bd948..ca721dd280 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -17,6 +17,10 @@ jobs:
           fetch-depth: 0
       - name: Prepare build environment
         uses: ./.github/actions/prepare-build-env
+      - name: Modify property file to contain the commit SHA
+        shell: bash
+        run: >
+          sed --regexp-extended --in-place "s/^(VERSION = .*)$/\1@$(git rev-parse --short HEAD)/" core/src/main/resources/org/lflang/StringsBundle.properties
       - name: Build and package lf cli tools (nightly build)
         shell: bash
         run: |

From e791a2cb1ec23e9720d11cd1d49a0943f9956022 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Mon, 23 Oct 2023 22:11:02 +0200
Subject: [PATCH 1059/1114] Fix lf-west-template test

---
 .github/workflows/c-zephyr-tests.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index dbfb8d7d2c..e7ea2e2c67 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -60,14 +60,14 @@ jobs:
       #   run: |
       #     ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrBoards* core:integrationTestCodeCoverageReport
       #     rm -r test/C/src-gen
-      - name: Run lf-west-template tests
+      - name: Smoke test of lf-west-template
         run: |
           git clone https://github.com/lf-lang/lf-west-template
           cd lf-west-template
           west update
-          west lfc src/HelloWorld.lf --lfc ../bin/lfc-dev --build
-          west lfc src/NrfBlinky.lf --lfc ../bin/lfc-dev --build
-          west lfc src/NrfToggleGPIO.lf --lfc ../bin/lfc-dev --build
+          west lfc apps/src/HelloWorld.lf --lfc ../bin/lfc-dev --build
+          west lfc apps/src/NrfBlinky.lf --lfc ../bin/lfc-dev --build
+          west lfc apps/src/NrfToggleGPIO.lf --lfc ../bin/lfc-dev --build
       - name: Report to CodeCov
         uses: ./.github/actions/report-code-coverage
         with:

From c3364d7b2e7ded20314f88fe350058e3f656826c Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Mon, 23 Oct 2023 22:25:44 +0200
Subject: [PATCH 1060/1114] Update lf-west-template testing

---
 .github/workflows/c-zephyr-tests.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index e7ea2e2c67..8a010eea60 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -62,12 +62,13 @@ jobs:
       #     rm -r test/C/src-gen
       - name: Smoke test of lf-west-template
         run: |
-          git clone https://github.com/lf-lang/lf-west-template
-          cd lf-west-template
+          export LFC=../bin/lfc-dev
+          git clone https://github.com/lf-lang/lf-west-template && cd lf-west-template
           west update
-          west lfc apps/src/HelloWorld.lf --lfc ../bin/lfc-dev --build
-          west lfc apps/src/NrfBlinky.lf --lfc ../bin/lfc-dev --build
-          west lfc apps/src/NrfToggleGPIO.lf --lfc ../bin/lfc-dev --build
+          west lfc apps/HelloWorld/src/HelloWorld.lf --lfc $LFC --build "-p always"
+          west lfc apps/NrfBlinky/src/NrfBlinky.lf --lfc $LFC --build "-p always"
+          west lfc apps/NrfBlinky/src/NrfToggleGPIO.lf --lfc $LFC --build "-p always"
+          west build -b qemu_cortex_m3 -p always apps/HelloZephyr
       - name: Report to CodeCov
         uses: ./.github/actions/report-code-coverage
         with:

From e4fbb08cf0a49b99091e3a2ef9828ba379172600 Mon Sep 17 00:00:00 2001
From: Kagamihara Nadeshiko <nabeshiko@suika.EECS.Berkeley.EDU>
Date: Mon, 23 Oct 2023 14:59:04 -0700
Subject: [PATCH 1061/1114] Cleanup CI workflow, apply @erlingj suggestions

---
 .github/workflows/nightly-build.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index ca721dd280..199f15ba23 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -19,8 +19,10 @@ jobs:
         uses: ./.github/actions/prepare-build-env
       - name: Modify property file to contain the commit SHA
         shell: bash
-        run: >
-          sed --regexp-extended --in-place "s/^(VERSION = .*)$/\1@$(git rev-parse --short HEAD)/" core/src/main/resources/org/lflang/StringsBundle.properties
+        run: |
+          TIMESTAMP="$(date +'%Y-%m-%d')"
+          SHA="$(git rev-parse --short HEAD)"
+          sed --regexp-extended --in-place "s/^(VERSION = .*)$/\1 ${SHA} ${TIMESTAMP}/" core/src/main/resources/org/lflang/StringsBundle.properties
       - name: Build and package lf cli tools (nightly build)
         shell: bash
         run: |

From 47cae6b668e5a70edb7f6f34a3bfc111d92bcf3b Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Tue, 24 Oct 2023 15:11:52 +0200
Subject: [PATCH 1062/1114] Use lf-west-template to install zephyr in
 setup-zephyr action also

---
 .github/actions/setup-zephyr/action.yml | 9 ++++-----
 .github/workflows/c-zephyr-tests.yml    | 3 ---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/actions/setup-zephyr/action.yml b/.github/actions/setup-zephyr/action.yml
index f414609105..1ac798f4ca 100644
--- a/.github/actions/setup-zephyr/action.yml
+++ b/.github/actions/setup-zephyr/action.yml
@@ -27,14 +27,13 @@ runs:
         cd "/opt/zephyr-sdk-${{env.SDK_VERSION}}"
         sudo ./setup.sh -t all -h -c
       shell: bash
-    - name: Download and install Zephyr RTOS
+    - name: Download and install Zephyr RTOS with the lf-west-template
       run: |
           cd $HOME
-          west init zephyrproject --mr "v${{env.ZEPHYR_VERSION}}"
-          cd zephyrproject
+          git clone https://github.com/lf-lang/lf-west-template && cd lf-west-template
           west update
           west zephyr-export
-          pip install -r zephyr/scripts/requirements.txt
-          echo "ZEPHYR_BASE=$HOME/zephyrproject/zephyr" >> $GITHUB_ENV
+          pip install -r deps/zephyr/scripts/requirements.txt
+          echo "ZEPHYR_BASE=$HOME/lf-west-template/deps/zephyr" >> $GITHUB_ENV
           echo "ZEPHYR_SDK_INSTALL_DIR=/opt/zephyr-sdk-${{env.SDK_VERSION}}/" >> $GITHUB_ENV
       shell: bash
diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index dbfb8d7d2c..d7e06b1295 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -62,9 +62,6 @@ jobs:
       #     rm -r test/C/src-gen
       - name: Run lf-west-template tests
         run: |
-          git clone https://github.com/lf-lang/lf-west-template
-          cd lf-west-template
-          west update
           west lfc src/HelloWorld.lf --lfc ../bin/lfc-dev --build
           west lfc src/NrfBlinky.lf --lfc ../bin/lfc-dev --build
           west lfc src/NrfToggleGPIO.lf --lfc ../bin/lfc-dev --build

From 03aee351e9230bde4ed6989c800b12aaa9cf5229 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Tue, 24 Oct 2023 15:17:40 +0200
Subject: [PATCH 1063/1114] Bump Zephyr to v3.5.0 and SDK to 0.16.3

---
 .github/actions/setup-zephyr/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/setup-zephyr/action.yml b/.github/actions/setup-zephyr/action.yml
index 4e79ac5c2e..96acc64a2b 100644
--- a/.github/actions/setup-zephyr/action.yml
+++ b/.github/actions/setup-zephyr/action.yml
@@ -5,8 +5,8 @@ runs:
   steps:
     - name: Setup environment variables
       run: |
-        echo "SDK_VERSION=0.16.1" >> $GITHUB_ENV
-        echo "ZEPHYR_VERSION=3.4.0" >> $GITHUB_ENV
+        echo "SDK_VERSION=0.16.3" >> $GITHUB_ENV
+        echo "ZEPHYR_VERSION=3.5.0" >> $GITHUB_ENV
       shell: bash
     - name: Dependencies
       run: |

From eaf203388f188ee4a30d67f4476ef135cd065153 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Tue, 24 Oct 2023 15:27:34 +0200
Subject: [PATCH 1064/1114] Fix paths

---
 .github/workflows/c-zephyr-tests.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index f76754b0fa..3ee9b7e986 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -62,12 +62,11 @@ jobs:
       #     rm -r test/C/src-gen
       - name: Smoke test of lf-west-template
         run: |
-          export LFC=../bin/lfc-dev
-          cd $LF_WEST_TEMPLATE_BASE
-          west lfc apps/HelloWorld/src/HelloWorld.lf --lfc $LFC --build "-p always"
-          west lfc apps/NrfBlinky/src/NrfBlinky.lf --lfc $LFC --build "-p always"
-          west lfc apps/NrfBlinky/src/NrfToggleGPIO.lf --lfc $LFC --build "-p always"
-          west build -b qemu_cortex_m3 -p always apps/HelloZephyr
+          export LFC=bin/lfc-dev
+          west lfc $LF_WEST_TEMPLATE_BASE/apps/HelloWorld/src/HelloWorld.lf --lfc $LFC --build "-p always"
+          west lfc $LF_WEST_TEMPLATE_BASE/apps/NrfBlinky/src/NrfBlinky.lf --lfc $LFC --build "-p always"
+          west lfc $LF_WEST_TEMPLATE_BASE/apps/NrfBlinky/src/NrfToggleGPIO.lf --lfc $LFC --build "-p always"
+          west build -b qemu_cortex_m3 -p always $LF_WEST_TEMPLATE_BASE/apps/HelloZephyr
       - name: Report to CodeCov
         uses: ./.github/actions/report-code-coverage
         with:

From d22227b253925a16302b2fb49fa15a4248eac291 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Tue, 24 Oct 2023 16:11:48 +0200
Subject: [PATCH 1065/1114] Need to be inside lf-west-template to run west lfc

---
 .github/workflows/c-zephyr-tests.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index 3ee9b7e986..f285fd5ee9 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -62,11 +62,12 @@ jobs:
       #     rm -r test/C/src-gen
       - name: Smoke test of lf-west-template
         run: |
-          export LFC=bin/lfc-dev
-          west lfc $LF_WEST_TEMPLATE_BASE/apps/HelloWorld/src/HelloWorld.lf --lfc $LFC --build "-p always"
-          west lfc $LF_WEST_TEMPLATE_BASE/apps/NrfBlinky/src/NrfBlinky.lf --lfc $LFC --build "-p always"
-          west lfc $LF_WEST_TEMPLATE_BASE/apps/NrfBlinky/src/NrfToggleGPIO.lf --lfc $LFC --build "-p always"
-          west build -b qemu_cortex_m3 -p always $LF_WEST_TEMPLATE_BASE/apps/HelloZephyr
+          export LFC=$(pwd)/bin/lfc-dev
+          cd $LF_WEST_TEMPLATE_BASE
+          west lfc apps/HelloWorld/src/HelloWorld.lf --lfc $LFC --build "-p always"
+          west lfc apps/NrfBlinky/src/NrfBlinky.lf --lfc $LFC --build "-p always"
+          west lfc apps/NrfBlinky/src/NrfToggleGPIO.lf --lfc $LFC --build "-p always"
+          west build -b qemu_cortex_m3 -p always apps/HelloZephyr
       - name: Report to CodeCov
         uses: ./.github/actions/report-code-coverage
         with:

From 6ccd78642b0ea69019afbdfb733cf864a4897e5a Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Tue, 24 Oct 2023 16:41:42 +0200
Subject: [PATCH 1066/1114] CI

---
 .github/workflows/c-zephyr-tests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index f285fd5ee9..182fcd8ef0 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -64,6 +64,8 @@ jobs:
         run: |
           export LFC=$(pwd)/bin/lfc-dev
           cd $LF_WEST_TEMPLATE_BASE
+          west update
+          west zephyr-export
           west lfc apps/HelloWorld/src/HelloWorld.lf --lfc $LFC --build "-p always"
           west lfc apps/NrfBlinky/src/NrfBlinky.lf --lfc $LFC --build "-p always"
           west lfc apps/NrfBlinky/src/NrfToggleGPIO.lf --lfc $LFC --build "-p always"

From 811a3b54a1fd2868a61c16ad40f4d2e603a3cd43 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Tue, 24 Oct 2023 17:03:26 +0200
Subject: [PATCH 1067/1114] Go back to v3.4.0 and SDK 0.16.1

---
 .github/actions/setup-zephyr/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/setup-zephyr/action.yml b/.github/actions/setup-zephyr/action.yml
index 96acc64a2b..4e79ac5c2e 100644
--- a/.github/actions/setup-zephyr/action.yml
+++ b/.github/actions/setup-zephyr/action.yml
@@ -5,8 +5,8 @@ runs:
   steps:
     - name: Setup environment variables
       run: |
-        echo "SDK_VERSION=0.16.3" >> $GITHUB_ENV
-        echo "ZEPHYR_VERSION=3.5.0" >> $GITHUB_ENV
+        echo "SDK_VERSION=0.16.1" >> $GITHUB_ENV
+        echo "ZEPHYR_VERSION=3.4.0" >> $GITHUB_ENV
       shell: bash
     - name: Dependencies
       run: |

From 02b44389731ce45e97621abb5147a4ffc7f3d350 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Tue, 24 Oct 2023 17:05:24 +0200
Subject: [PATCH 1068/1114] Make sure we set the correct ZEPHYR_BASE

---
 .github/actions/setup-zephyr/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/setup-zephyr/action.yml b/.github/actions/setup-zephyr/action.yml
index 4e79ac5c2e..c3d61dc401 100644
--- a/.github/actions/setup-zephyr/action.yml
+++ b/.github/actions/setup-zephyr/action.yml
@@ -35,6 +35,6 @@ runs:
           west zephyr-export
           pip install -r deps/zephyr/scripts/requirements.txt
           echo "LF_WEST_TEMPLATE_BASE=$HOME/lf-west-template" >> $GITHUB_ENV
-          echo "ZEPHYR_BASE=$LF_WEST_TEMPLATE_BASE/deps/zephyr" >> $GITHUB_ENV
+          echo "ZEPHYR_BASE=$HOME/lf-west-template/deps/zephyr" >> $GITHUB_ENV
           echo "ZEPHYR_SDK_INSTALL_DIR=/opt/zephyr-sdk-${{env.SDK_VERSION}}/" >> $GITHUB_ENV
       shell: bash

From b7acd2f36ae1e5e0f2cf9b52f37764a82625ced1 Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Tue, 24 Oct 2023 17:20:25 +0200
Subject: [PATCH 1069/1114] Bug fixed. Move to 0.16.3

---
 .github/actions/setup-zephyr/action.yml | 3 +--
 .github/workflows/c-zephyr-tests.yml    | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/actions/setup-zephyr/action.yml b/.github/actions/setup-zephyr/action.yml
index c3d61dc401..06baf10907 100644
--- a/.github/actions/setup-zephyr/action.yml
+++ b/.github/actions/setup-zephyr/action.yml
@@ -5,8 +5,7 @@ runs:
   steps:
     - name: Setup environment variables
       run: |
-        echo "SDK_VERSION=0.16.1" >> $GITHUB_ENV
-        echo "ZEPHYR_VERSION=3.4.0" >> $GITHUB_ENV
+        echo "SDK_VERSION=0.16.3" >> $GITHUB_ENV
       shell: bash
     - name: Dependencies
       run: |
diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index 182fcd8ef0..f285fd5ee9 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -64,8 +64,6 @@ jobs:
         run: |
           export LFC=$(pwd)/bin/lfc-dev
           cd $LF_WEST_TEMPLATE_BASE
-          west update
-          west zephyr-export
           west lfc apps/HelloWorld/src/HelloWorld.lf --lfc $LFC --build "-p always"
           west lfc apps/NrfBlinky/src/NrfBlinky.lf --lfc $LFC --build "-p always"
           west lfc apps/NrfBlinky/src/NrfToggleGPIO.lf --lfc $LFC --build "-p always"

From 38fabfbdaba3abe51cae12c61e002c3335f5d21d Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Tue, 24 Oct 2023 17:37:35 +0200
Subject: [PATCH 1070/1114] Add back removed CI tests

---
 .github/workflows/all-targets.yml    | 48 ++++++++++++++--------------
 .github/workflows/c-tests.yml        | 32 +++++++++----------
 .github/workflows/c-zephyr-tests.yml | 44 ++++++++++++-------------
 3 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/.github/workflows/all-targets.yml b/.github/workflows/all-targets.yml
index 15bb064188..4068bc2576 100644
--- a/.github/workflows/all-targets.yml
+++ b/.github/workflows/all-targets.yml
@@ -27,27 +27,27 @@ jobs:
     needs: check-diff
     if: ${{ needs.check-diff.outputs.run_c == 'true' }}
 
-  # cpp:
-  #   uses: ./.github/workflows/only-cpp.yml
-  #   needs: check-diff
-  #   if: ${{ needs.check-diff.outputs.run_cpp == 'true' }}
-
-  # py:
-  #   uses: ./.github/workflows/only-py.yml
-  #   needs: check-diff
-  #   if: ${{ needs.check-diff.outputs.run_py == 'true' || needs.check-diff.outputs.run_c == 'true' }}
-
-  # rs:
-  #   uses: ./.github/workflows/only-rs.yml
-  #   needs: check-diff
-  #   if: ${{ needs.check-diff.outputs.run_rs == 'true' }}
-
-  # ts:
-  #   uses: ./.github/workflows/only-ts.yml
-  #   needs: check-diff
-  #   if: ${{ needs.check-diff.outputs.run_ts == 'true' }}
-
-  # serialization:
-  #   if: ${{ needs.check-diff.outputs.run_c == 'true' || needs.check-diff.outputs.run_py == 'true' || needs.check-diff.outputs.run_ts == 'true' }}
-  #   needs: check-diff
-  #   uses: ./.github/workflows/serialization-tests.yml
+  cpp:
+    uses: ./.github/workflows/only-cpp.yml
+    needs: check-diff
+    if: ${{ needs.check-diff.outputs.run_cpp == 'true' }}
+
+  py:
+    uses: ./.github/workflows/only-py.yml
+    needs: check-diff
+    if: ${{ needs.check-diff.outputs.run_py == 'true' || needs.check-diff.outputs.run_c == 'true' }}
+
+  rs:
+    uses: ./.github/workflows/only-rs.yml
+    needs: check-diff
+    if: ${{ needs.check-diff.outputs.run_rs == 'true' }}
+
+  ts:
+    uses: ./.github/workflows/only-ts.yml
+    needs: check-diff
+    if: ${{ needs.check-diff.outputs.run_ts == 'true' }}
+
+  serialization:
+    if: ${{ needs.check-diff.outputs.run_c == 'true' || needs.check-diff.outputs.run_py == 'true' || needs.check-diff.outputs.run_ts == 'true' }}
+    needs: check-diff
+    uses: ./.github/workflows/serialization-tests.yml
diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml
index d19a62edc0..60acaec10a 100644
--- a/.github/workflows/c-tests.yml
+++ b/.github/workflows/c-tests.yml
@@ -53,19 +53,19 @@ jobs:
       - name: Install RTI
         uses: ./.github/actions/install-rti
         if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }}
-      # - name: Perform tests for C target with default scheduler
-      #   run: ./gradlew targetTest -Ptarget=C
-      #   if: ${{ !inputs.use-cpp && !inputs.scheduler }}
-      # - name: Perform tests for C target with specified scheduler (no LSP tests)
-      #   run: |
-      #     echo "Specified scheduler: ${{ inputs.scheduler }}"
-      #     ./gradlew targetTest -Ptarget=C -Dscheduler=${{ inputs.scheduler }}
-      #   if: ${{ !inputs.use-cpp && inputs.scheduler }}
-      # - name: Perform tests for CCpp target with default scheduler
-      #   run: ./gradlew targetTest -Ptarget=CCpp
-      #   if: ${{ inputs.use-cpp && !inputs.scheduler }}
-      # - name: Report to CodeCov
-      #   uses: ./.github/actions/report-code-coverage
-      #   with:
-      #     files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
-      #   if: ${{ github.repository == 'lf-lang/lingua-franca' }}
+      - name: Perform tests for C target with default scheduler
+        run: ./gradlew targetTest -Ptarget=C
+        if: ${{ !inputs.use-cpp && !inputs.scheduler }}
+      - name: Perform tests for C target with specified scheduler (no LSP tests)
+        run: |
+          echo "Specified scheduler: ${{ inputs.scheduler }}"
+          ./gradlew targetTest -Ptarget=C -Dscheduler=${{ inputs.scheduler }}
+        if: ${{ !inputs.use-cpp && inputs.scheduler }}
+      - name: Perform tests for CCpp target with default scheduler
+        run: ./gradlew targetTest -Ptarget=CCpp
+        if: ${{ inputs.use-cpp && !inputs.scheduler }}
+      - name: Report to CodeCov
+        uses: ./.github/actions/report-code-coverage
+        with:
+          files: core/build/reports/jacoco/integrationTestCodeCoverageReport/integrationTestCodeCoverageReport.xml
+        if: ${{ github.repository == 'lf-lang/lingua-franca' }}
diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
index f285fd5ee9..443dd347af 100644
--- a/.github/workflows/c-zephyr-tests.yml
+++ b/.github/workflows/c-zephyr-tests.yml
@@ -38,28 +38,28 @@ jobs:
           repository: lf-lang/reactor-c
           path: core/src/main/resources/lib/c/reactor-c
           ref: ${{ inputs.runtime-ref }}
-        # if: ${{ inputs.runtime-ref }}
-      # - name: Run Zephyr smoke tests
-      #   run: |
-      #     ./gradlew core:integrationTest \
-      #       --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrUnthreaded* \
-      #       --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrThreaded* core:integrationTestCodeCoverageReport
-      #     ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
-      #     rm -r test/C/src-gen
-      # - name: Run basic tests
-      #   run: |
-      #     ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildBasic* core:integrationTestCodeCoverageReport
-      #     ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
-      #     rm -r test/C/src-gen
-      # - name: Run concurrent tests
-      #   run: |
-      #     ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildConcurrent* core:integrationTestCodeCoverageReport
-      #     ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
-      #     rm -r test/C/src-gen
-      # - name: Run Zephyr board tests
-      #   run: |
-      #     ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrBoards* core:integrationTestCodeCoverageReport
-      #     rm -r test/C/src-gen
+        if: ${{ inputs.runtime-ref }}
+      - name: Run Zephyr smoke tests
+        run: |
+          ./gradlew core:integrationTest \
+            --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrUnthreaded* \
+            --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrThreaded* core:integrationTestCodeCoverageReport
+          ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
+          rm -r test/C/src-gen
+      - name: Run basic tests
+        run: |
+          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildBasic* core:integrationTestCodeCoverageReport
+          ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
+          rm -r test/C/src-gen
+      - name: Run concurrent tests
+        run: |
+          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildConcurrent* core:integrationTestCodeCoverageReport
+          ./.github/scripts/run-zephyr-tests.sh test/C/src-gen
+          rm -r test/C/src-gen
+      - name: Run Zephyr board tests
+        run: |
+          ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrBoards* core:integrationTestCodeCoverageReport
+          rm -r test/C/src-gen
       - name: Smoke test of lf-west-template
         run: |
           export LFC=$(pwd)/bin/lfc-dev

From ad9e6b9d224ff153678c7a78a29cbe6fa4201f2b Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 24 Oct 2023 22:09:42 -0700
Subject: [PATCH 1071/1114] Added contributors with > 100 commits

---
 CITATION.cff                                | 78 +++++++++++++++++++++
 core/src/main/resources/lib/c/reactor-c     |  2 +-
 core/src/main/resources/lib/cpp/reactor-cpp |  2 +-
 3 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 CITATION.cff

diff --git a/CITATION.cff b/CITATION.cff
new file mode 100644
index 0000000000..ab07b187a7
--- /dev/null
+++ b/CITATION.cff
@@ -0,0 +1,78 @@
+cff-version: 1.2.0
+title: Lingua Franca
+message: >-
+  If you use this software, please cite it using the
+  metadata from this file.
+type: software
+authors:
+  - given-names: Marten
+    family-names: Lohstroh
+    email: marten@berkeley.edu
+    affiliation: UC Berkeley
+    orcid: 'https://orcid.org/0000-0001-8833-4117'
+  - given-names: Edward
+    family-names: Lee
+    email: eal@berkeley.edu
+    affiliation: UC Berkeley
+    orcid: 'https://orcid.org/0000-0002-5663-0584'
+  - given-names: Soroush
+    family-names: Bateni
+    email: soroosh129@gmail.com
+    affiliation: UT Dallas
+    orcid: 'https://orcid.org/0000-0002-5448-3664'
+  - given-names: Christian
+    family-names: Menard
+    email: christian.menard@tu-dresden.de
+    affiliation: TU Dresden
+    orcid: 'https://orcid.org/0000-0002-7134-8384'
+  - given-names: Peter
+    family-names: Donovan
+    email: peterdonovan@berkeley.edu
+    affiliation: UC Berkeley
+  - given-names: Clément
+    family-names: Fournier
+    email: clement.fournier@tu-dresden.de
+    affiliation: TU Dresden
+  - given-names: Hou Seng (Steven)
+    family-names: Wong
+    email: housengw@berkeley.edu
+    affiliation: UC Berkeley
+  - given-names: Alexander
+    family-names: Schulz-Rosengarten
+    email: als@informatik.uni-kiel.de
+    affiliation: Kiel University
+  - given-names: Erling Rennemo
+    family-names: Jellum
+    email: erling.r.jellum@ntnu.no
+    affiliation: NTNU
+   - given-names: Hokeun
+    family-names: Kim
+    email: hokeun@berkeley.edu
+    affiliation: UC Berkeley
+   - given-names: Matt
+    family-names: Weber
+    email: matt.weber@berkeley.edu
+    affiliation: UC Berkeley
+   - given-names: Shaokai
+    family-names: Lin
+    email: shaokai@berkeley.edu
+    affiliation: UC Berkeley
+   - given-names: Anirudh
+    family-names: Rengarajan
+    email: arengarajan@berkeley.edu
+    affiliation: UC Berkeley
+repository-code: 'https://github.com/lf-lang/lingua-franca'
+url: 'https://lf-lang.org/'
+abstract: >-
+  Lingua Franca is a polyglot coordination language for building complex
+  systems in a component-wise fashion with worry-free deterministic
+  concurrency, zero-effort distribution, and time as a first-class citizen.
+keywords:
+  - coordination languages
+  - polyglot
+  - deterministic concurrency
+  - distributed systems
+  - embedded systems
+  - cloud computing
+  - realtime computing
+license: BSD-2-Clause
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index 5bbdefd558..f0bd1bc653 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit 5bbdefd558b2504cd6fd8e881132b11efdce498b
+Subproject commit f0bd1bc6533e4b47f2af9d4e9d8613fa5e670be0
diff --git a/core/src/main/resources/lib/cpp/reactor-cpp b/core/src/main/resources/lib/cpp/reactor-cpp
index 3b25ffe3e2..fa685f1db9 160000
--- a/core/src/main/resources/lib/cpp/reactor-cpp
+++ b/core/src/main/resources/lib/cpp/reactor-cpp
@@ -1 +1 @@
-Subproject commit 3b25ffe3e270ab10181552a7e08ba37a471d8868
+Subproject commit fa685f1db99b1652e39a5cf3c6356a8db26b52bb

From 4c90913f8e1d5b5637ee660fa44bfe336a29b258 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 24 Oct 2023 23:34:39 -0700
Subject: [PATCH 1072/1114] Fix submodules

---
 core/src/main/resources/lib/c/reactor-c     | 2 +-
 core/src/main/resources/lib/cpp/reactor-cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index f0bd1bc653..5bbdefd558 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit f0bd1bc6533e4b47f2af9d4e9d8613fa5e670be0
+Subproject commit 5bbdefd558b2504cd6fd8e881132b11efdce498b
diff --git a/core/src/main/resources/lib/cpp/reactor-cpp b/core/src/main/resources/lib/cpp/reactor-cpp
index fa685f1db9..3b25ffe3e2 160000
--- a/core/src/main/resources/lib/cpp/reactor-cpp
+++ b/core/src/main/resources/lib/cpp/reactor-cpp
@@ -1 +1 @@
-Subproject commit fa685f1db99b1652e39a5cf3c6356a8db26b52bb
+Subproject commit 3b25ffe3e270ab10181552a7e08ba37a471d8868

From 75ccd6c3a94cb6e06234bbd99129d434c35f57d1 Mon Sep 17 00:00:00 2001
From: "Dongha (Jake) Kim" <74869052+Jakio815@users.noreply.github.com>
Date: Thu, 26 Oct 2023 13:19:34 -0700
Subject: [PATCH 1073/1114] Update README.md

---
 .github/workflows/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index a33af6b6a0..783212d886 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -1,9 +1,9 @@
 # Lingua Franca workflows
 
 ## Continuous Integration
-The main CI configuration can be found in [ci.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/ci.yml) and gets triggered by pushes to `master` and by pushes to branches involved in an open pull request.
+The main two CI configurations can be found in [all-misc.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-misc.yml) and [all-targets.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-targets.yml). The [all-misc.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-misc.yml) does the non-target specific tests, and [all-targets.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-targets.yml) does the target specific tests. They get triggered by pushes to `master` and by pushes to branches involved in an open pull request.
 
-**NOTE: [ci.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/ci.yml) references these workflows with respect to master (signified by the "@master" suffix). If you edit a workflow and want your changes reflected in the CI run for your pull request, then make sure that the workflow of your feature branch gets invoked instead of the one on master (and change back to "@master" before merging so that the feature branch can be safely deleted).**
+**NOTE: [all-misc.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-misc.yml) and [all-targets.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-targets.yml) references these workflows with respect to master. If you edit a workflow and want your changes reflected in the CI run for your pull request, then make sure that the workflow of your feature branch gets invoked instead of the one on master.**
 
 ### Benchmark tests
 The [benchmark-tests.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/lfc-tests.yml) workflow compiles and runs benchmarks for a given target. The purpose of this workflow is not to gather performance results but to ensure that the benchmark programs remain functional. This workflow has one (optional) argument:

From 5041522895549e3c039e50ce6c9523ecc66b5a6d Mon Sep 17 00:00:00 2001
From: "Dongha (Jake) Kim" <74869052+Jakio815@users.noreply.github.com>
Date: Thu, 26 Oct 2023 16:10:58 -0700
Subject: [PATCH 1074/1114] Apply suggestions from code review

Co-authored-by: Marten Lohstroh <marten@berkeley.edu>
---
 .github/workflows/README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index 783212d886..b23f2dc79b 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -1,9 +1,8 @@
 # Lingua Franca workflows
 
 ## Continuous Integration
-The main two CI configurations can be found in [all-misc.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-misc.yml) and [all-targets.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-targets.yml). The [all-misc.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-misc.yml) does the non-target specific tests, and [all-targets.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-targets.yml) does the target specific tests. They get triggered by pushes to `master` and by pushes to branches involved in an open pull request.
+The main two CI configurations can be found in [all-misc.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-misc.yml) and [all-targets.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-targets.yml). The [all-misc.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-misc.yml) workflow runs the non-target specific tests, and [all-targets.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-targets.yml) workflow runs the target specific tests. They get triggered by pushes to `master` and by pushes to branches involved in an open pull request.
 
-**NOTE: [all-misc.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-misc.yml) and [all-targets.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-targets.yml) references these workflows with respect to master. If you edit a workflow and want your changes reflected in the CI run for your pull request, then make sure that the workflow of your feature branch gets invoked instead of the one on master.**
 
 ### Benchmark tests
 The [benchmark-tests.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/lfc-tests.yml) workflow compiles and runs benchmarks for a given target. The purpose of this workflow is not to gather performance results but to ensure that the benchmark programs remain functional. This workflow has one (optional) argument:

From 10aab13f903b77ee5ae4f8fea279abffd76fda77 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 26 Oct 2023 16:52:20 -0700
Subject: [PATCH 1075/1114] Update CITATION.cff

---
 CITATION.cff | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CITATION.cff b/CITATION.cff
index ab07b187a7..ef269311e3 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -66,7 +66,7 @@ url: 'https://lf-lang.org/'
 abstract: >-
   Lingua Franca is a polyglot coordination language for building complex
   systems in a component-wise fashion with worry-free deterministic
-  concurrency, zero-effort distribution, and time as a first-class citizen.
+  concurrency, low-effort distribution, and time as a first-class citizen.
 keywords:
   - coordination languages
   - polyglot

From 3fd65197b30bfd2e91acc4b2aced16ae7476b25a Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 29 Oct 2023 01:38:01 -0700
Subject: [PATCH 1076/1114] Handling of JSON input

---
 .../src/main/java/org/lflang/cli/CliBase.java | 134 ++++++++----------
 cli/lfc/src/main/java/org/lflang/cli/Lfc.java |  96 +++++--------
 .../test/java/org/lflang/cli/LfcCliTest.java  |  57 +++++---
 .../lflang/tests/runtime/CSchedulerTest.java  |   2 +-
 .../lflang/tests/runtime/CVerifierTest.java   |   2 +-
 .../org/lflang/tests/runtime/PythonTest.java  |   7 +-
 .../serialization/SerializationTest.java      |   7 +-
 core/src/main/java/org/lflang/FileConfig.java |  18 ++-
 .../main/java/org/lflang/TargetProperty.java  |  25 +++-
 .../federated/generator/FedGenerator.java     |  43 ++----
 .../org/lflang/generator/GeneratorBase.java   |   6 +-
 .../lflang/generator/IntegratedBuilder.java   |   3 +-
 .../lflang/generator/LFGeneratorContext.java  |  46 +-----
 .../org/lflang/generator/MainContext.java     |  16 +--
 .../java/org/lflang/generator/SubContext.java |   3 +-
 .../java/org/lflang/generator/Validator.java  |   2 +-
 .../org/lflang/generator/c/CGenerator.java    |  10 +-
 .../main/java/org/lflang/target/Target.java   |   2 +-
 .../java/org/lflang/target/TargetConfig.java  |  49 +++----
 .../target/property/BuildTypeProperty.java    |  16 +++
 .../target/property/CompilerProperty.java     |   7 +
 .../property/ExternalRuntimePathProperty.java |   8 ++
 .../property/HierarchicalBinProperty.java     |  18 +++
 .../target/property/LoggingProperty.java      |   6 +
 .../target/property/NoCompileProperty.java    |   7 +
 .../property/PrintStatisticsProperty.java     |   7 +
 .../property/RuntimeVersionProperty.java      |   7 +
 .../target/property/SchedulerProperty.java    |   6 +
 .../target/property/TracingProperty.java      |  20 +++
 .../target/property/VerifyProperty.java       |   8 +-
 .../target/property/WorkersProperty.java      |   6 +
 .../org/lflang/validation/LFValidator.java    |   3 +-
 .../org/lflang/generator/ts/TSGenerator.kt    |  11 +-
 .../java/org/lflang/tests/Configurators.java  |  26 ++--
 .../java/org/lflang/tests/TestBase.java       |  35 ++---
 35 files changed, 388 insertions(+), 331 deletions(-)

diff --git a/cli/base/src/main/java/org/lflang/cli/CliBase.java b/cli/base/src/main/java/org/lflang/cli/CliBase.java
index f8c014ec46..4e6f107cc4 100644
--- a/cli/base/src/main/java/org/lflang/cli/CliBase.java
+++ b/cli/base/src/main/java/org/lflang/cli/CliBase.java
@@ -1,6 +1,5 @@
 package org.lflang.cli;
 
-import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
@@ -17,8 +16,6 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
 import java.util.stream.Collectors;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -62,10 +59,10 @@ static class MutuallyExclusive {
     protected List<Path> files;
 
     @Option(names = "--json", description = "JSON object containing CLI arguments.")
-    private String jsonString;
+    String jsonString;
 
     @Option(names = "--json-file", description = "JSON file containing CLI arguments.")
-    private Path jsonFile;
+    Path jsonFile;
 
     @Option(names = "--stdin", description = "Read paths to Lingua Franca programs from stdin.")
     private boolean stdin;
@@ -99,6 +96,8 @@ static class MutuallyExclusive {
   /** Injected resource validator. */
   @Inject private IResourceValidator validator;
 
+  private JsonObject jsonObject;
+
   protected static void cliMain(
       String toolName, Class<? extends CliBase> toolClass, Io io, String[] args) {
     // Injector used to obtain Main instance.
@@ -123,27 +122,7 @@ public void doExecute(Io io, String[] args) {
    * the Runnable interface, is instantiated.
    */
   public void run() {
-    // If args are given in a json file, store its contents in jsonString.
-    if (topLevelArg.jsonFile != null) {
-      try {
-        topLevelArg.jsonString =
-            new String(Files.readAllBytes(io.getWd().resolve(topLevelArg.jsonFile)));
-      } catch (IOException e) {
-        reporter.printFatalErrorAndExit("No such file: " + topLevelArg.jsonFile);
-      }
-    }
-    // If args are given in a json string, unpack them and re-run
-    // picocli argument validation.
-    if (topLevelArg.jsonString != null) {
-      // Unpack args from json string.
-      String[] args = jsonStringToArgs(topLevelArg.jsonString);
-      // Execute application on unpacked args.
-      CommandLine cmd = spec.commandLine();
-      cmd.execute(args);
-      // If args are already unpacked, invoke tool-specific logic.
-    } else {
-      doRun();
-    }
+    doRun();
   }
 
   /*
@@ -183,6 +162,23 @@ protected List<Path> getInputPaths() {
       }
       if (line == null) return List.of();
       return List.of(Path.of(line));
+    } else if (topLevelArg.jsonFile != null || topLevelArg.jsonString != null) {
+      paths = new ArrayList<>();
+      var filesObj = getJsonObject().get("src");
+      if (filesObj != null) {
+        if (filesObj.isJsonPrimitive()) {
+          paths = List.of(Path.of(filesObj.getAsString()));
+        } else if (filesObj.isJsonArray()) {
+          paths =
+              filesObj.getAsJsonArray().asList().stream()
+                  .map(e -> Path.of(e.getAsString()))
+                  .collect(Collectors.toUnmodifiableList());
+        } else {
+          reporter.printFatalErrorAndExit("JSON Parse Exception: field \"src\" not found.");
+        }
+      } else {
+        reporter.printFatalErrorAndExit("No source files specified in given JSON.");
+      }
     } else {
       paths = topLevelArg.files.stream().map(io.getWd()::resolve).collect(Collectors.toList());
     }
@@ -196,6 +192,29 @@ protected List<Path> getInputPaths() {
     return paths;
   }
 
+  protected final JsonObject getJsonObject() {
+    if (jsonObject != null) {
+      return jsonObject;
+    }
+    var jsonString = topLevelArg.jsonString;
+    // If args are given in a json file, store its contents in jsonString.
+    if (topLevelArg.jsonFile != null) {
+      try {
+        jsonString = new String(Files.readAllBytes(io.getWd().resolve(topLevelArg.jsonFile)));
+      } catch (IOException e) {
+        reporter.printFatalErrorAndExit("No such file: " + topLevelArg.jsonFile);
+      }
+    }
+    if (jsonString != null) {
+      try {
+        jsonObject = JsonParser.parseString(jsonString).getAsJsonObject();
+      } catch (JsonParseException e) {
+        messageReporter.nowhere().error((String.format("Invalid JSON string:%n %s", jsonString)));
+      }
+    }
+    return jsonObject;
+  }
+
   protected final boolean stdinMode() {
     return topLevelArg.stdin;
   }
@@ -207,16 +226,29 @@ protected final boolean stdinMode() {
    */
   protected Path getOutputRoot() {
     Path root = null;
+    Path path = null;
+
     if (!outputPath.toString().isEmpty()) {
+      path = outputPath;
+    } else {
+      var json = getJsonObject();
+      if (json != null) {
+        var obj = json.get("out");
+        if (obj != null) {
+          path = Path.of(obj.getAsString());
+        }
+      }
+    }
+
+    if (path != null) {
       root = io.getWd().resolve(outputPath).normalize();
-      if (!Files.exists(root)) { // FIXME: Create it instead?
+      if (!Files.exists(root)) {
         reporter.printFatalErrorAndExit(root + ": Output location does not exist.");
       }
       if (!Files.isDirectory(root)) {
         reporter.printFatalErrorAndExit(root + ": Output location is not a directory.");
       }
     }
-
     return root;
   }
 
@@ -307,50 +339,4 @@ public Resource getResource(Path path) {
       return null;
     }
   }
-
-  private String[] jsonStringToArgs(String jsonString) {
-    ArrayList<String> argsList = new ArrayList<>();
-    JsonObject jsonObject = new JsonObject();
-
-    // Parse JSON string and get top-level JSON object.
-    try {
-      jsonObject = JsonParser.parseString(jsonString).getAsJsonObject();
-    } catch (JsonParseException e) {
-      reporter.printFatalErrorAndExit(String.format("Invalid JSON string:%n %s", jsonString));
-    }
-    // Append input paths.
-    JsonElement src = jsonObject.get("src");
-    if (src == null) {
-      reporter.printFatalErrorAndExit("JSON Parse Exception: field \"src\" not found.");
-    }
-    assert src != null;
-    argsList.add(src.getAsString());
-    // Append output path if given.
-    JsonElement out = jsonObject.get("out");
-    if (out != null) {
-      argsList.add("--output-path");
-      argsList.add(out.getAsString());
-    }
-
-    // If there are no other properties, return args array.
-    JsonElement properties = jsonObject.get("properties");
-    if (properties != null) {
-      // Get the remaining properties.
-      Set<Entry<String, JsonElement>> entrySet = properties.getAsJsonObject().entrySet();
-      // Append the remaining properties to the args array.
-      for (Entry<String, JsonElement> entry : entrySet) {
-        String property = entry.getKey();
-        String value = entry.getValue().getAsString();
-
-        // Append option.
-        argsList.add("--" + property);
-        // Append argument for non-boolean options.
-        if (!value.equals("true") || property.equals("threading")) {
-          argsList.add(value);
-        }
-      }
-    }
-
-    return argsList.toArray(new String[0]);
-  }
 }
diff --git a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
index 48cc85b7d0..fce3d08e23 100644
--- a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
+++ b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
@@ -4,15 +4,14 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-import java.util.Properties;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.GeneratorDelegate;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
 import org.eclipse.xtext.util.CancelIndicator;
 import org.lflang.FileConfig;
 import org.lflang.ast.ASTUtils;
+import org.lflang.generator.GeneratorArguments;
 import org.lflang.generator.LFGeneratorContext;
-import org.lflang.generator.LFGeneratorContext.BuildParm;
 import org.lflang.generator.MainContext;
 import org.lflang.target.property.type.BuildTypeType;
 import org.lflang.target.property.type.LoggingType;
@@ -150,21 +149,21 @@ public static void main(Io io, final String... args) {
   public void doRun() {
     List<Path> paths = getInputPaths();
     final Path outputRoot = getOutputRoot();
-    // Hard code the props based on the options we want.
-    Properties properties = this.getGeneratorArgs();
+    var args = this.getArgs();
 
     try {
       // Invoke the generator on all input file paths.
-      invokeGenerator(paths, outputRoot, properties);
+      invokeGenerator(paths, outputRoot, args);
     } catch (RuntimeException e) {
       reporter.printFatalErrorAndExit("An unexpected error occurred:", e);
     }
   }
 
   /** Invoke the code generator on the given validated file paths. */
-  private void invokeGenerator(List<Path> files, Path root, Properties properties) {
+  private void invokeGenerator(List<Path> files, Path root, GeneratorArguments args) {
     for (Path path : files) {
       path = toAbsolutePath(path);
+
       String outputPath = getActualOutputPath(root, path).toString();
       this.fileAccess.setOutputPath(outputPath);
 
@@ -186,11 +185,14 @@ private void invokeGenerator(List<Path> files, Path root, Properties properties)
               LFGeneratorContext.Mode.STANDALONE,
               CancelIndicator.NullImpl,
               (m, p) -> {},
-              properties,
+              args,
               resource,
               this.fileAccess,
               fileConfig -> messageReporter);
 
+      // Exit if there were problems creating the main context.
+      exitIfCollectedErrors();
+
       try {
         this.generator.generate(resource, this.fileAccess, context);
       } catch (Exception e) {
@@ -214,90 +216,64 @@ private Path getActualOutputPath(Path root, Path path) {
     }
   }
 
-  /**
-   * Filter the command-line arguments needed by the code generator, and return them as properties.
-   *
-   * @return Properties for the code generator.
-   */
-  public Properties getGeneratorArgs() {
-    Properties props = new Properties();
-
+  /** Check the values of the commandline arguments and return them. */
+  public GeneratorArguments getArgs() {
+    var args = new GeneratorArguments();
     if (buildType != null) {
       // Validate build type.
-      if (new BuildTypeType().forName(buildType) == null) {
+      var resolved = new BuildTypeType().forName(buildType);
+      if (resolved == null) {
         reporter.printFatalErrorAndExit(buildType + ": Invalid build type.");
       }
-      props.setProperty(BuildParm.BUILD_TYPE.getKey(), buildType);
-    }
-
-    if (clean) {
-      props.setProperty(BuildParm.CLEAN.getKey(), "true");
+      args.buildType = resolved;
     }
 
+    args.clean = clean;
+    args.compiler = targetCompiler;
     if (externalRuntimePath != null) {
-      props.setProperty(BuildParm.EXTERNAL_RUNTIME_PATH.getKey(), externalRuntimePath.toString());
+      args.externalRuntimeUri = externalRuntimePath.toUri();
     }
 
-    if (lint) {
-      props.setProperty(BuildParm.LINT.getKey(), "true");
-    }
+    args.jsonObject = getJsonObject();
+
+    args.lint = lint;
 
     if (logging != null) {
       // Validate log level.
-      if (new LoggingType().forName(logging) == null) {
+      var resolved = new LoggingType().forName(logging);
+      if (resolved == null) {
         reporter.printFatalErrorAndExit(logging + ": Invalid log level.");
       }
-      props.setProperty(BuildParm.LOGGING.getKey(), logging);
-    }
-
-    if (printStatistics) {
-      props.setProperty(BuildParm.PRINT_STATISTICS.getKey(), "true");
-    }
-
-    if (noCompile) {
-      props.setProperty(BuildParm.NO_COMPILE.getKey(), "true");
-    }
-
-    if (verify) {
-      props.setProperty(BuildParm.VERIFY.getKey(), "true");
-    }
-
-    if (targetCompiler != null) {
-      props.setProperty(BuildParm.COMPILER.getKey(), targetCompiler);
+      args.logging = resolved;
     }
 
-    if (quiet) {
-      props.setProperty(BuildParm.QUIET.getKey(), "true");
-    }
+    args.noCompile = noCompile;
+    args.printStatistics = printStatistics;
+    args.quiet = quiet;
 
     if (rti != null) {
       // Validate RTI path.
       if (!Files.exists(io.getWd().resolve(rti))) {
         reporter.printFatalErrorAndExit(rti + ": Invalid RTI path.");
       }
-      props.setProperty(BuildParm.RTI.getKey(), rti.toString());
+      args.rti = rti.toUri();
     }
 
-    if (runtimeVersion != null) {
-      props.setProperty(BuildParm.RUNTIME_VERSION.getKey(), runtimeVersion);
-    }
+    args.runtimeVersion = runtimeVersion;
 
     if (scheduler != null) {
       // Validate scheduler.
-      if (new SchedulerType().forName(scheduler) == null) {
+      var resolved = new SchedulerType().forName(scheduler);
+      if (resolved == null) {
         reporter.printFatalErrorAndExit(scheduler + ": Invalid scheduler.");
       }
-      props.setProperty(BuildParm.SCHEDULER.getKey(), scheduler);
+      args.scheduler = resolved;
     }
 
-    if (threading != null) {
-      props.setProperty(BuildParm.THREADING.getKey(), threading);
-    }
-
-    if (workers != null) {
-      props.setProperty(BuildParm.WORKERS.getKey(), workers.toString());
-    }
+    args.threading = Boolean.parseBoolean(threading);
+    args.verify = verify;
+    args.workers = workers;
 
-    return props;
+    return args;
   }
 }
diff --git a/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java b/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java
index 2408971256..2c796d3434 100644
--- a/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java
+++ b/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java
@@ -32,16 +32,19 @@
 import static org.lflang.cli.TestUtils.isDirectory;
 import static org.lflang.cli.TestUtils.isRegularFile;
 
+import com.google.gson.JsonParser;
 import com.google.inject.Injector;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.Properties;
+import java.nio.file.Paths;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.lflang.LocalStrings;
 import org.lflang.cli.TestUtils.TempDirBuilder;
-import org.lflang.generator.LFGeneratorContext.BuildParm;
+import org.lflang.target.property.type.BuildTypeType.BuildType;
+import org.lflang.target.property.type.LoggingType.LogLevel;
+import org.lflang.target.property.type.SchedulerType.Scheduler;
 
 /**
  * @author Clément Fournier
@@ -243,23 +246,37 @@ public void verifyGeneratorArgs(Path tempDir, String[] args) {
         .verify(
             result -> {
               // Don't validate execution because args are dummy args.
-              Properties properties = fixture.lfc.getGeneratorArgs();
-              assertEquals(properties.getProperty(BuildParm.BUILD_TYPE.getKey()), "Release");
-              assertEquals(properties.getProperty(BuildParm.CLEAN.getKey()), "true");
-              assertEquals(properties.getProperty(BuildParm.COMPILER.getKey()), "gcc");
-              assertEquals(properties.getProperty(BuildParm.EXTERNAL_RUNTIME_PATH.getKey()), "src");
-              assertEquals(properties.getProperty(BuildParm.LOGGING.getKey()), "info");
-              assertEquals(properties.getProperty(BuildParm.LINT.getKey()), "true");
-              assertEquals(properties.getProperty(BuildParm.NO_COMPILE.getKey()), "true");
-              assertEquals(properties.getProperty(BuildParm.PRINT_STATISTICS.getKey()), "true");
-              assertEquals(properties.getProperty(BuildParm.QUIET.getKey()), "true");
+              var genArgs = fixture.lfc.getArgs();
+              assertEquals(BuildType.RELEASE, genArgs.buildType);
+              assertEquals(true, genArgs.clean);
+              assertEquals("gcc", genArgs.compiler);
+              assertEquals("src", Path.of(genArgs.externalRuntimeUri).getFileName().toString());
+              assertEquals(LogLevel.INFO, genArgs.logging);
+              assertEquals(true, genArgs.lint);
+              assertEquals(true, genArgs.noCompile);
+              assertEquals(true, genArgs.printStatistics);
+              assertEquals(true, genArgs.quiet);
               assertEquals(
-                  properties.getProperty(BuildParm.RTI.getKey()),
-                  "path" + File.separator + "to" + File.separator + "rti");
-              assertEquals(properties.getProperty(BuildParm.RUNTIME_VERSION.getKey()), "rs");
-              assertEquals(properties.getProperty(BuildParm.SCHEDULER.getKey()), "GEDF_NP");
-              assertEquals(properties.getProperty(BuildParm.THREADING.getKey()), "false");
-              assertEquals(properties.getProperty(BuildParm.WORKERS.getKey()), "1");
+                  Path.of("path", "to", "rti"),
+                  Path.of(new File("").getAbsolutePath()).relativize(Paths.get(genArgs.rti)));
+              assertEquals("rs", genArgs.runtimeVersion);
+              assertEquals(Scheduler.GEDF_NP, genArgs.scheduler);
+              assertEquals(false, genArgs.threading);
+              assertEquals(1, genArgs.workers);
+            });
+  }
+
+  public void verifyJsonGeneratorArgs(Path tempDir, String[] args) {
+    LfcOneShotTestFixture fixture = new LfcOneShotTestFixture();
+
+    fixture
+        .run(tempDir, args)
+        .verify(
+            result -> {
+              // Don't validate execution because args are dummy args.
+              var genArgs = fixture.lfc.getArgs();
+              assertEquals(
+                  JsonParser.parseString(JSON_STRING).getAsJsonObject(), genArgs.jsonObject);
             });
   }
 
@@ -308,7 +325,7 @@ public void testGeneratorArgsJsonString(@TempDir Path tempDir) throws IOExceptio
     dir.mkdirs("path/to/rti");
 
     String[] args = {"--json", JSON_STRING};
-    verifyGeneratorArgs(tempDir, args);
+    verifyJsonGeneratorArgs(tempDir, args);
   }
 
   @Test
@@ -319,7 +336,7 @@ public void testGeneratorArgsJsonFile(@TempDir Path tempDir) throws IOException
     dir.mkdirs("path/to/rti");
 
     String[] args = {"--json-file", "src/test.json"};
-    verifyGeneratorArgs(tempDir, args);
+    verifyJsonGeneratorArgs(tempDir, args);
   }
 
   static class LfcTestFixture extends CliToolTestFixture {
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
index 3f48a22f29..6ba74d3bdd 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
@@ -54,7 +54,7 @@ private void runTest(Scheduler scheduler, EnumSet<TestCategory> categories) {
         Message.DESC_SCHED_SWAPPING + scheduler.toString() + ".",
         categories::contains,
         test -> {
-          test.getContext().getArgs().setProperty("scheduler", scheduler.toString());
+          test.getContext().getArgs().scheduler = scheduler;
           return Configurators.noChanges(test);
         },
         TestLevel.EXECUTION,
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
index 949b66276c..0486ddb0c1 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.lflang.target.Target;
-import org.lflang.target.property.type.VerifyProperty;
+import org.lflang.target.property.VerifyProperty;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry;
 
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
index 35ea43fdfa..17db439518 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
@@ -24,12 +24,13 @@
  ***************/
 package org.lflang.tests.runtime;
 
-import java.util.Properties;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.lflang.generator.GeneratorArguments;
 import org.lflang.target.Target;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.property.type.BuildTypeType.BuildType;
 import org.lflang.tests.RuntimeTest;
 
 /**
@@ -48,12 +49,12 @@ public PythonTest() {
   }
 
   @Override
-  protected void addExtraLfcArgs(Properties args, TargetConfig targetConfig) {
+  protected void addExtraLfcArgs(GeneratorArguments args, TargetConfig targetConfig) {
     super.addExtraLfcArgs(args, targetConfig);
     if (System.getProperty("os.name").startsWith("Windows")) {
       // Use the RelWithDebInfo build type on Windows as the Debug/Test build type produces linker
       // Errors in CI
-      args.setProperty("build-type", "RelWithDebInfo");
+      args.buildType = BuildType.REL_WITH_DEB_INFO;
     }
   }
 
diff --git a/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java b/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
index ba6c3188a0..01c377c59c 100644
--- a/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
@@ -1,10 +1,11 @@
 package org.lflang.tests.serialization;
 
-import java.util.Properties;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
+import org.lflang.generator.GeneratorArguments;
 import org.lflang.target.Target;
 import org.lflang.target.TargetConfig;
+import org.lflang.target.property.type.BuildTypeType.BuildType;
 import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry.TestCategory;
@@ -16,10 +17,10 @@ protected SerializationTest() {
   }
 
   @Override
-  protected void addExtraLfcArgs(Properties args, TargetConfig targetConfig) {
+  protected void addExtraLfcArgs(GeneratorArguments args, TargetConfig targetConfig) {
     super.addExtraLfcArgs(args, targetConfig);
     // Use the Debug build type as coverage generation does not work for the serialization tests
-    args.setProperty("build-type", "Debug");
+    args.buildType = BuildType.DEBUG;
   }
 
   @Test
diff --git a/core/src/main/java/org/lflang/FileConfig.java b/core/src/main/java/org/lflang/FileConfig.java
index eb2d53c655..bc565870f8 100644
--- a/core/src/main/java/org/lflang/FileConfig.java
+++ b/core/src/main/java/org/lflang/FileConfig.java
@@ -1,5 +1,9 @@
 package org.lflang;
 
+import static org.eclipse.emf.common.util.URI.createFileURI;
+
+import com.google.inject.Provider;
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -10,7 +14,9 @@
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
+import org.eclipse.xtext.resource.XtextResourceSet;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.util.FileUtil;
 import org.lflang.util.LFCommand;
@@ -149,7 +155,7 @@ public FileConfig(Resource resource, Path srcGenBasePath, boolean useHierarchica
   }
 
   /** Get the directory a resource is located in relative to the root package */
-  public Path getDirectory(Resource r) throws IOException {
+  public Path getDirectory(Resource r) {
     return getSubPkgPath(FileUtil.toPath(r).getParent());
   }
 
@@ -255,7 +261,7 @@ public void doClean() throws IOException {
     FileUtil.deleteDirectory(modelGenBasePath);
   }
 
-  private static Path getPkgPath(Resource resource) throws IOException {
+  private static Path getPkgPath(Resource resource) {
     if (resource.getURI().isPlatform()) {
       // We are in the RCA.
       Path srcFile = FileUtil.toPath(resource);
@@ -309,4 +315,12 @@ protected String getExecutableExtension() {
   public Path getExecutable() {
     return binPath.resolve(name + getExecutableExtension());
   }
+
+  public static Resource getResource(File file, Provider<ResourceSet> resourceSetProvider) {
+    return resourceSetProvider.get().getResource(createFileURI(file.getAbsolutePath()), true);
+  }
+
+  public static Resource getResource(Path path, XtextResourceSet xtextResourceSet) {
+    return xtextResourceSet.getResource(createFileURI(path.toAbsolutePath().toString()), true);
+  }
 }
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/TargetProperty.java
index 0f388eda08..5fd4122794 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/TargetProperty.java
@@ -1,7 +1,9 @@
 package org.lflang;
 
+import com.google.gson.JsonObject;
 import java.util.List;
 import java.util.Optional;
+import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
@@ -112,6 +114,15 @@ public final void override(TargetConfig config, T value) {
     config.set(this, value);
   }
 
+  public void update(TargetConfig config, GeneratorArguments args, MessageReporter reporter) {
+    var value = value(args);
+    if (value != null) {
+      update(config, value);
+    } else if (args.jsonObject != null) {
+      update(config, fromJSON(args.jsonObject, reporter));
+    }
+  }
+
   /**
    * Update the given configuration using the given value. The default implementation simply assigns
    * the given value, overriding whatever value might have been assigned before.
@@ -119,7 +130,7 @@ public final void override(TargetConfig config, T value) {
    * @param config The configuration to update.
    * @param value The value to perform the update with.
    */
-  protected void update(TargetConfig config, T value) {
+  public void update(TargetConfig config, T value) {
     override(config, value);
   }
 
@@ -160,6 +171,14 @@ public int hashCode() {
     return this.getClass().getName().hashCode();
   }
 
+  protected T fromJSON(JsonObject jsonObject, MessageReporter reporter) {
+    T value = null;
+    if (jsonObject.has(name())) {
+      value = this.fromString(jsonObject.get(name()).getAsString(), reporter);
+    }
+    return value;
+  }
+
   /**
    * Retrieve a key-value pair from the given AST that matches the given target property.
    *
@@ -176,4 +195,8 @@ public static KeyValuePair getKeyValuePair(Model ast, TargetProperty<?, ?> prope
     assert properties.size() <= 1;
     return properties.size() > 0 ? properties.get(0) : null;
   }
+
+  public T value(GeneratorArguments args) {
+    return null;
+  }
 }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 3e56aa1ba0..9a28233b58 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -4,6 +4,7 @@
 
 import com.google.inject.Injector;
 import java.io.IOException;
+import java.net.URI;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -12,15 +13,11 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
@@ -36,12 +33,12 @@
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.DockerData;
 import org.lflang.generator.FedDockerComposeGenerator;
+import org.lflang.generator.GeneratorArguments;
 import org.lflang.generator.GeneratorResult.Status;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.IntegratedBuilder;
 import org.lflang.generator.LFGenerator;
 import org.lflang.generator.LFGeneratorContext;
-import org.lflang.generator.LFGeneratorContext.BuildParm;
 import org.lflang.generator.MixedRadixInt;
 import org.lflang.generator.PortInstance;
 import org.lflang.generator.ReactionInstanceGraph;
@@ -227,7 +224,7 @@ private void createDockerFiles(LFGeneratorContext context, List<SubContext> subC
    * @param context Context in which the generator operates
    */
   private void cleanIfNeeded(LFGeneratorContext context) {
-    if (context.getArgs().containsKey(BuildParm.CLEAN.getKey())) {
+    if (context.getArgs().clean) {
       try {
         fileConfig.doClean();
       } catch (IOException e) {
@@ -286,11 +283,7 @@ private Map<Path, CodeMap> compileFederates(
       final int id = i;
       compileThreadPool.execute(
           () -> {
-            Resource res =
-                rs.getResource(
-                    URI.createFileURI(
-                        FedEmitter.lfFilePath(fileConfig, fed).toAbsolutePath().toString()),
-                    true);
+            Resource res = FileConfig.getResource(FedEmitter.lfFilePath(fileConfig, fed), rs);
             FileConfig subFileConfig =
                 LFGenerator.createFileConfig(res, fileConfig.getSrcGenPath(), true);
             MessageReporter subContextMessageReporter =
@@ -299,7 +292,7 @@ private Map<Path, CodeMap> compileFederates(
             TargetConfig subConfig =
                 new TargetConfig(
                     GeneratorUtils.findTargetDecl(subFileConfig.resource),
-                    new Properties(),
+                    new GeneratorArguments(),
                     subContextMessageReporter);
             if (targetConfig.get(DockerProperty.INSTANCE).enabled
                 && targetConfig.target.buildsUsingDocker()) {
@@ -365,7 +358,7 @@ public TargetConfig getTargetConfig() {
    * @param context Context of the build process.
    */
   private void processCLIArguments(LFGeneratorContext context) {
-    if (context.getArgs().containsKey("rti")) {
+    if (context.getArgs().rti != null) {
       setFederationRTIProperties(context);
     }
   }
@@ -376,27 +369,15 @@ private void processCLIArguments(LFGeneratorContext context) {
    * @param context Context of the build process.
    */
   private void setFederationRTIProperties(LFGeneratorContext context) {
-    String rtiAddr = context.getArgs().getProperty("rti");
-    Pattern pattern =
-        Pattern.compile(
-            "([a-zA-Z\\d]+@)?([a-zA-Z\\d]+\\.?[a-z]{2,}|\\d+\\.\\d+\\.\\d+\\.\\d+):?(\\d+)?");
-    Matcher matcher = pattern.matcher(rtiAddr);
-
-    if (!matcher.find()) {
-      return;
-    }
-
-    // the user match group contains a trailing "@" which needs to be removed.
-    String userWithAt = matcher.group(1);
-    String user = (userWithAt == null) ? null : userWithAt.substring(0, userWithAt.length() - 1);
-    String host = matcher.group(2);
-    String port = matcher.group(3);
-
+    URI rtiAddr = context.getArgs().rti;
+    var host = rtiAddr.getHost();
+    var port = rtiAddr.getPort();
+    var user = rtiAddr.getUserInfo();
     if (host != null) {
       rtiConfig.setHost(host);
     }
-    if (port != null) {
-      rtiConfig.setPort(Integer.parseInt(port));
+    if (port >= 0) {
+      rtiConfig.setPort(port);
     }
     if (user != null) {
       rtiConfig.setUser(user);
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index b194c72c5e..1594347f5b 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -63,7 +63,7 @@
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.FilesProperty;
 import org.lflang.target.property.ThreadingProperty;
-import org.lflang.target.property.type.VerifyProperty;
+import org.lflang.target.property.VerifyProperty;
 import org.lflang.util.FileUtil;
 import org.lflang.validation.AbstractLFValidator;
 
@@ -194,7 +194,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     // Configure the command factory
     commandFactory.setVerbose();
     if (Objects.equal(context.getMode(), LFGeneratorContext.Mode.STANDALONE)
-        && context.getArgs().containsKey("quiet")) {
+        && context.getArgs().quiet) {
       commandFactory.setQuiet();
     }
 
@@ -616,7 +616,7 @@ public void reportCommandErrors(String stderr) {
 
   /** Check if a clean was requested from the standalone compiler and perform the clean step. */
   protected void cleanIfNeeded(LFGeneratorContext context) {
-    if (context.getArgs().containsKey("clean")) {
+    if (context.getArgs().clean) {
       try {
         context.getFileConfig().doClean();
       } catch (IOException e) {
diff --git a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
index 41ad7a4c3d..d0c3cbea74 100644
--- a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
+++ b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
@@ -4,7 +4,6 @@
 import com.google.inject.Provider;
 import java.nio.file.Path;
 import java.util.List;
-import java.util.Properties;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -110,7 +109,7 @@ private GeneratorResult doGenerate(
             mustComplete ? Mode.LSP_SLOW : LFGeneratorContext.Mode.LSP_MEDIUM,
             cancelIndicator,
             reportProgress,
-            new Properties(),
+            new GeneratorArguments(),
             resource,
             fileAccess,
             fileConfig -> new LanguageServerMessageReporter(resource.getContents().get(0)));
diff --git a/core/src/main/java/org/lflang/generator/LFGeneratorContext.java b/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
index 03b050f9a3..faa1363536 100644
--- a/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
+++ b/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
@@ -2,7 +2,6 @@
 
 import java.nio.file.Path;
 import java.util.Map;
-import java.util.Properties;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 import org.eclipse.xtext.generator.IGeneratorContext;
@@ -18,49 +17,6 @@
  */
 public interface LFGeneratorContext extends IGeneratorContext {
 
-  /** Enumeration of keys used to parameterize the build process. */
-  enum BuildParm {
-    BUILD_TYPE("The build type to use"),
-    CLEAN("Clean before building."),
-    EXTERNAL_RUNTIME_PATH("Specify an external runtime library to be used by the compiled binary."),
-    FEDERATED("Treat main reactor as federated."),
-    HELP("Display this information."),
-    LOGGING("The logging level to use by the generated binary"),
-    LINT("Enable or disable linting of generated code."),
-    NO_COMPILE("Do not invoke target compiler."),
-    VERIFY("Check the generated verification model."),
-    OUTPUT_PATH("Specify the root output directory."),
-    PRINT_STATISTICS("Instruct the runtime to collect and print statistics."),
-    QUIET("Suppress output of the target compiler and other commands"),
-    RTI("Specify the location of the RTI."),
-    RUNTIME_VERSION("Specify the version of the runtime library used for compiling LF programs."),
-    SCHEDULER("Specify the runtime scheduler (if supported)."),
-    COMPILER("Target compiler to invoke."),
-    THREADING("Specify whether the runtime should use multi-threading (true/false)."),
-    VERSION("Print version information."),
-    WORKERS("Specify the default number of worker threads.");
-
-    public final String description;
-
-    BuildParm(String description) {
-      this.description = description;
-    }
-
-    /** Return the string to use as the key to store a value relating to this parameter. */
-    public String getKey() {
-      return this.name().toLowerCase().replace('_', '-');
-    }
-
-    /**
-     * Return the value corresponding to this parameter or {@code null} if there is none.
-     *
-     * @param context The context passed to the code generator.
-     */
-    public String getValue(LFGeneratorContext context) {
-      return context.getArgs().getProperty(this.getKey());
-    }
-  }
-
   enum Mode {
     STANDALONE,
     EPOCH,
@@ -77,7 +33,7 @@ enum Mode {
   Mode getMode();
 
   /** Return any arguments that will override target properties. */
-  Properties getArgs();
+  GeneratorArguments getArgs();
 
   /** Get the error reporter for this context; construct one if it hasn't been constructed yet. */
   MessageReporter getErrorReporter();
diff --git a/core/src/main/java/org/lflang/generator/MainContext.java b/core/src/main/java/org/lflang/generator/MainContext.java
index 4e9dad4765..e2696142da 100644
--- a/core/src/main/java/org/lflang/generator/MainContext.java
+++ b/core/src/main/java/org/lflang/generator/MainContext.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.util.Objects;
-import java.util.Properties;
 import java.util.function.Function;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
@@ -13,7 +12,6 @@
 import org.lflang.MessageReporter;
 import org.lflang.generator.IntegratedBuilder.ReportProgress;
 import org.lflang.target.TargetConfig;
-import org.lflang.target.property.HierarchicalBinProperty;
 
 /**
  * A {@code MainContext} is an {@code LFGeneratorContext} that is not nested in any other generator
@@ -41,7 +39,7 @@ public class MainContext implements LFGeneratorContext {
   /** The result of the code generation process. */
   private GeneratorResult result = null;
 
-  private final Properties args;
+  private final GeneratorArguments args;
   private final MessageReporter messageReporter;
 
   /**
@@ -58,7 +56,7 @@ public MainContext(
         mode,
         cancelIndicator,
         (message, completion) -> {},
-        new Properties(),
+        new GeneratorArguments(),
         resource,
         fsa,
         (mode == Mode.EPOCH && EPOCH_ERROR_REPORTER_CONSTRUCTOR != null)
@@ -84,7 +82,7 @@ public MainContext(
       Mode mode,
       CancelIndicator cancelIndicator,
       ReportProgress reportProgress,
-      Properties args,
+      GeneratorArguments args,
       Resource resource,
       IFileSystemAccess2 fsa,
       Function<FileConfig, MessageReporter> constructErrorReporter) {
@@ -94,12 +92,12 @@ public MainContext(
     this.args = args;
 
     try {
-      var key = HierarchicalBinProperty.INSTANCE.name();
-      var useHierarchicalBin = args.contains(key) && Boolean.parseBoolean(args.getProperty(key));
       fileConfig =
           Objects.requireNonNull(
               LFGenerator.createFileConfig(
-                  resource, FileConfig.getSrcGenRoot(fsa), useHierarchicalBin));
+                  resource,
+                  FileConfig.getSrcGenRoot(fsa),
+                  Objects.requireNonNullElse(args.hierarchicalBin, false)));
     } catch (IOException e) {
       throw new RuntimeIOException("Error during FileConfig instantiation", e);
     }
@@ -120,7 +118,7 @@ public Mode getMode() {
   }
 
   @Override
-  public Properties getArgs() {
+  public GeneratorArguments getArgs() {
     return args;
   }
 
diff --git a/core/src/main/java/org/lflang/generator/SubContext.java b/core/src/main/java/org/lflang/generator/SubContext.java
index 5c0198ec6e..ec9bcc774c 100644
--- a/core/src/main/java/org/lflang/generator/SubContext.java
+++ b/core/src/main/java/org/lflang/generator/SubContext.java
@@ -1,6 +1,5 @@
 package org.lflang.generator;
 
-import java.util.Properties;
 import org.eclipse.xtext.util.CancelIndicator;
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
@@ -50,7 +49,7 @@ public Mode getMode() {
   }
 
   @Override
-  public Properties getArgs() {
+  public GeneratorArguments getArgs() {
     return containingContext.getArgs();
   }
 
diff --git a/core/src/main/java/org/lflang/generator/Validator.java b/core/src/main/java/org/lflang/generator/Validator.java
index 33eaec4238..468d1a8a87 100644
--- a/core/src/main/java/org/lflang/generator/Validator.java
+++ b/core/src/main/java/org/lflang/generator/Validator.java
@@ -91,7 +91,7 @@ public final void doValidate(LFGeneratorContext context)
    * @param context The context of the current build.
    */
   private boolean validationEnabled(LFGeneratorContext context) {
-    return context.getArgs().containsKey("lint") || validationEnabledByDefault(context);
+    return context.getArgs().lint || validationEnabledByDefault(context);
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index d4c6917f62..acb3fbabe5 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -39,6 +39,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
@@ -881,10 +882,7 @@ private void pickCompilePlatform() {
 
   /** Copy target-specific header file to the src-gen directory. */
   protected void copyTargetFiles() throws IOException {
-    // Copy the core lib
-    String coreLib = LFGeneratorContext.BuildParm.EXTERNAL_RUNTIME_PATH.getValue(context);
     Path dest = fileConfig.getSrcGenPath();
-
     if (targetConfig.isSet(PlatformProperty.INSTANCE)) {
       var platform = targetConfig.get(PlatformProperty.INSTANCE).platform();
       switch (platform) {
@@ -914,8 +912,10 @@ protected void copyTargetFiles() throws IOException {
       }
     }
 
-    if (coreLib != null) {
-      FileUtil.copyDirectoryContents(Path.of(coreLib), dest, true);
+    // Copy the core lib
+    if (context.getArgs().externalRuntimeUri != null) {
+      Path coreLib = Paths.get(context.getArgs().externalRuntimeUri);
+      FileUtil.copyDirectoryContents(coreLib, dest, true);
     } else {
       FileUtil.copyFromClassPath("/lib/c/reactor-c/core", dest, true, false);
       FileUtil.copyFromClassPath("/lib/c/reactor-c/lib", dest, true, false);
diff --git a/core/src/main/java/org/lflang/target/Target.java b/core/src/main/java/org/lflang/target/Target.java
index c4cc869fed..36685236fa 100644
--- a/core/src/main/java/org/lflang/target/Target.java
+++ b/core/src/main/java/org/lflang/target/Target.java
@@ -58,8 +58,8 @@
 import org.lflang.target.property.SingleFileProjectProperty;
 import org.lflang.target.property.ThreadingProperty;
 import org.lflang.target.property.TracingProperty;
+import org.lflang.target.property.VerifyProperty;
 import org.lflang.target.property.WorkersProperty;
-import org.lflang.target.property.type.VerifyProperty;
 
 /**
  * Enumeration of targets and their associated properties.
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 82f42965db..2f6b401c15 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -33,11 +33,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Properties;
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.lflang.MessageReporter;
 import org.lflang.TargetProperty;
+import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
@@ -88,8 +88,8 @@ public TargetConfig(Target target) {
         TracingProperty.INSTANCE);
   }
 
-  public TargetConfig(TargetDecl target, Properties cliArgs, MessageReporter messageReporter) {
-    this(Target.fromDecl(target), target.getConfig(), cliArgs, messageReporter);
+  public TargetConfig(TargetDecl target, GeneratorArguments args, MessageReporter messageReporter) {
+    this(Target.fromDecl(target), target.getConfig(), args, messageReporter);
   }
 
   /**
@@ -98,24 +98,24 @@ public TargetConfig(TargetDecl target, Properties cliArgs, MessageReporter messa
    *
    * @param target The target of this configuration.
    * @param properties The key-value pairs that represent the target properties.
-   * @param cliArgs Arguments passed on the commandline.
+   * @param args Arguments passed on the commandline.
    * @param messageReporter An error reporter to report problems.
    */
   public TargetConfig(
       Target target,
       KeyValuePairs properties,
-      Properties cliArgs,
+      GeneratorArguments args,
       MessageReporter messageReporter) {
     this(target);
 
+    // Load properties from file
     if (properties != null) {
       List<KeyValuePair> pairs = properties.getPairs();
       this.load(pairs, messageReporter);
     }
 
-    if (cliArgs != null) {
-      this.load(cliArgs, messageReporter);
-    }
+    // Load properties from CLI args
+    load(args, messageReporter);
   }
 
   /** Additional sources to add to the compile command if appropriate. */
@@ -191,16 +191,13 @@ public String listOfRegisteredProperties() {
         .findFirst();
   }
 
-  public void load(Properties properties, MessageReporter err) {
-    for (Object key : properties.keySet()) {
-      var p = this.forName(key.toString());
-      if (p.isPresent()) {
-        var property = p.get();
-        property.update(this, (String) properties.get(key), err);
-      } else {
-        err.nowhere().warning("Attempting to load unrecognized target property: " + key);
-      }
-    }
+  public void load(GeneratorArguments args, MessageReporter err) {
+    this.properties
+        .keySet()
+        .forEach(
+            p -> {
+              p.update(this, args, err);
+            });
   }
 
   /**
@@ -227,8 +224,10 @@ public void load(List<KeyValuePair> pairs, MessageReporter err) {
   }
 
   public <T, S extends TargetPropertyType> void set(TargetProperty<T, S> property, T value) {
-    this.setProperties.add(property);
-    this.properties.put(property, value);
+    if (value != null) {
+      this.setProperties.add(property);
+      this.properties.put(property, value);
+    }
   }
 
   /**
@@ -278,17 +277,15 @@ public TargetDecl extractTargetDecl() {
    *
    * @param pairs The key-value pairs to validate.
    * @param ast The root node of the AST from which the key-value pairs were taken.
-   * @param config A target configuration used to retrieve the corresponding target properties.
    * @param reporter A reporter to report errors and warnings through.
    */
-  public static void validate(
-      KeyValuePairs pairs, Model ast, TargetConfig config, ValidatorMessageReporter reporter) {
+  public void validate(KeyValuePairs pairs, Model ast, ValidatorMessageReporter reporter) {
     pairs
         .getPairs()
         .forEach(
             pair -> {
               var match =
-                  config.getRegisteredProperties().stream()
+                  this.getRegisteredProperties().stream()
                       .filter(prop -> prop.name().equalsIgnoreCase(pair.getName()))
                       .findAny();
               if (match.isPresent()) {
@@ -302,10 +299,10 @@ public static void validate(
                         String.format(
                             "The target property '%s' is not supported by the %s target and will"
                                 + " thus be ignored.",
-                            pair.getName(), config.target));
+                            pair.getName(), this.target));
                 reporter
                     .at(pair, Literals.KEY_VALUE_PAIR__NAME)
-                    .info("Recognized properties are: " + config.listOfRegisteredProperties());
+                    .info("Recognized properties are: " + this.listOfRegisteredProperties());
               }
             });
   }
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
index 0adfb98024..4c9b8dc890 100644
--- a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
@@ -3,7 +3,9 @@
 import org.lflang.MessageReporter;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
+import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.Element;
+import org.lflang.target.TargetConfig;
 import org.lflang.target.property.type.BuildTypeType;
 import org.lflang.target.property.type.BuildTypeType.BuildType;
 
@@ -44,4 +46,18 @@ protected BuildType fromString(String string, MessageReporter reporter) {
   public String name() {
     return "build-type";
   }
+
+  @Override
+  public void update(TargetConfig config, GeneratorArguments args, MessageReporter reporter) {
+    if (args.buildType != null) {
+      config.set(this, args.buildType);
+    } else if (args.jsonObject != null) {
+      config.set(this, fromJSON(args.jsonObject, reporter));
+    }
+  }
+
+  @Override
+  public BuildType value(GeneratorArguments args) {
+    return args.buildType;
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/CompilerProperty.java b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
index f1ed1f2ebf..efff3c23f0 100644
--- a/core/src/main/java/org/lflang/target/property/CompilerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
@@ -1,5 +1,7 @@
 package org.lflang.target.property;
 
+import org.lflang.generator.GeneratorArguments;
+
 /** The compiler to invoke, unless a build command has been specified. */
 public final class CompilerProperty extends StringProperty {
 
@@ -14,4 +16,9 @@ private CompilerProperty() {
   public String name() {
     return "compiler";
   }
+
+  @Override
+  public String value(GeneratorArguments args) {
+    return args.compiler;
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
index b07b7dd60e..2829bfd6d9 100644
--- a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
@@ -1,5 +1,8 @@
 package org.lflang.target.property;
 
+import java.nio.file.Paths;
+import org.lflang.generator.GeneratorArguments;
+
 /**
  * Directive for specifying a path to an external runtime libray to link to instead of the default
  * one.
@@ -17,4 +20,9 @@ private ExternalRuntimePathProperty() {
   public String name() {
     return "external-runtime-path";
   }
+
+  @Override
+  public String value(GeneratorArguments args) {
+    return Paths.get(args.externalRuntimeUri).toString();
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java b/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
index dbd3a1ed6f..8b77cc14c0 100644
--- a/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
+++ b/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
@@ -1,5 +1,9 @@
 package org.lflang.target.property;
 
+import org.lflang.MessageReporter;
+import org.lflang.generator.GeneratorArguments;
+import org.lflang.target.TargetConfig;
+
 /**
  * Whether the bin directory should have a flat or hierarchical organization. It is flat by default.
  */
@@ -16,4 +20,18 @@ private HierarchicalBinProperty() {
   public String name() {
     return "hierarchical-bin";
   }
+
+  @Override
+  public void update(TargetConfig config, GeneratorArguments args, MessageReporter reporter) {
+    if (args.hierarchicalBin != null) {
+      config.set(this, args.hierarchicalBin);
+    } else if (args.jsonObject != null) {
+      config.set(this, fromJSON(args.jsonObject, reporter));
+    }
+  }
+
+  @Override
+  public Boolean value(GeneratorArguments args) {
+    return args.hierarchicalBin;
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/LoggingProperty.java b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
index ef6d47cbb9..1edd6799c0 100644
--- a/core/src/main/java/org/lflang/target/property/LoggingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
@@ -3,6 +3,7 @@
 import org.lflang.MessageReporter;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
+import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.LoggingType;
 import org.lflang.target.property.type.LoggingType.LogLevel;
@@ -43,4 +44,9 @@ public Element toAstElement(LogLevel value) {
   public String name() {
     return "logging";
   }
+
+  @Override
+  public LogLevel value(GeneratorArguments args) {
+    return args.logging;
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
index 906899ca92..862aea76a2 100644
--- a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
+++ b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
@@ -1,5 +1,7 @@
 package org.lflang.target.property;
 
+import org.lflang.generator.GeneratorArguments;
+
 /** If true, do not invoke the target compiler or build command. The default is false. */
 public final class NoCompileProperty extends BooleanProperty {
 
@@ -14,4 +16,9 @@ private NoCompileProperty() {
   public String name() {
     return "no-compile";
   }
+
+  @Override
+  public Boolean value(GeneratorArguments args) {
+    return args.noCompile;
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
index a193e25417..682c49e61f 100644
--- a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
@@ -1,5 +1,7 @@
 package org.lflang.target.property;
 
+import org.lflang.generator.GeneratorArguments;
+
 /** If true, instruct the runtime to collect and print execution statistics. */
 public final class PrintStatisticsProperty extends BooleanProperty {
 
@@ -14,4 +16,9 @@ private PrintStatisticsProperty() {
   public String name() {
     return "print-statistics";
   }
+
+  @Override
+  public Boolean value(GeneratorArguments args) {
+    return args.printStatistics;
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
index be82a06848..320bdb7a5f 100644
--- a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
@@ -1,5 +1,7 @@
 package org.lflang.target.property;
 
+import org.lflang.generator.GeneratorArguments;
+
 /** Directive for specifying a specific version of the reactor runtime library. */
 public final class RuntimeVersionProperty extends StringProperty {
 
@@ -14,4 +16,9 @@ private RuntimeVersionProperty() {
   public String name() {
     return "runtime-version";
   }
+
+  @Override
+  public String value(GeneratorArguments args) {
+    return args.runtimeVersion;
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
index d4c64d2dc3..27c7c25cb3 100644
--- a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
@@ -3,6 +3,7 @@
 import org.lflang.MessageReporter;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
+import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
@@ -82,4 +83,9 @@ public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
       }
     }
   }
+
+  @Override
+  public Scheduler value(GeneratorArguments args) {
+    return args.scheduler;
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index b236bcad04..5ccb9b5c86 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -4,12 +4,14 @@
 import org.lflang.MessageReporter;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
+import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
+import org.lflang.target.TargetConfig;
 import org.lflang.target.property.TracingProperty.TracingOptions;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.DictionaryType.DictionaryElement;
@@ -107,6 +109,24 @@ public String name() {
     return "tracing";
   }
 
+  @Override
+  public void update(TargetConfig config, TracingOptions value) {
+    if (value.traceFileName == null) {
+      value.traceFileName = config.get(this).traceFileName;
+    }
+    config.set(this, value);
+  }
+
+  @Override
+  public TracingOptions value(GeneratorArguments args) {
+    if (args.tracing != null) {
+      if (args.tracing) {
+        return new TracingOptions(true);
+      }
+    }
+    return null;
+  }
+
   /** Settings related to tracing options. */
   public static class TracingOptions {
 
diff --git a/core/src/main/java/org/lflang/target/property/VerifyProperty.java b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
index f13d60a4b7..601823c485 100644
--- a/core/src/main/java/org/lflang/target/property/VerifyProperty.java
+++ b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
@@ -1,6 +1,6 @@
-package org.lflang.target.property.type;
+package org.lflang.target.property;
 
-import org.lflang.target.property.BooleanProperty;
+import org.lflang.generator.GeneratorArguments;
 
 /** If true, check the generated verification model. The default is false. */
 public final class VerifyProperty extends BooleanProperty {
@@ -16,4 +16,8 @@ private VerifyProperty() {
   public String name() {
     return "verify";
   }
+
+  public Boolean value(GeneratorArguments args) {
+    return args.verify;
+  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/WorkersProperty.java b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
index 79a86a4c79..5f8c236279 100644
--- a/core/src/main/java/org/lflang/target/property/WorkersProperty.java
+++ b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
@@ -3,6 +3,7 @@
 import org.lflang.MessageReporter;
 import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
+import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
 
@@ -43,4 +44,9 @@ public Element toAstElement(Integer value) {
   public String name() {
     return "workers";
   }
+
+  @Override
+  public Integer value(GeneratorArguments args) {
+    return args.workers;
+  }
 }
diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index bd98c4b416..1b23bfe63d 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -1075,8 +1075,7 @@ public void checkTargetDecl(TargetDecl target) throws IOException {
   public void checkTargetProperties(KeyValuePairs targetProperties) {
     if (targetProperties.eContainer() instanceof TargetDecl) {
       // Only validate the target properties, not dictionaries that may be part of their values.
-      TargetConfig.validate(
-          targetProperties, this.info.model, new TargetConfig(this.target), getErrorReporter());
+      new TargetConfig(this.target).validate(targetProperties, this.info.model, getErrorReporter());
     }
   }
 
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
index f5cc708384..9fdc2c4546 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -178,13 +178,12 @@ class TSGenerator(
      * Update package.json according to given build parameters.
      */
     private fun updatePackageConfig(context: LFGeneratorContext) {
-        var rtPath = LFGeneratorContext.BuildParm.EXTERNAL_RUNTIME_PATH.getValue(context)
-        val rtVersion = LFGeneratorContext.BuildParm.RUNTIME_VERSION.getValue(context)
+        var rtUri = context.args.externalRuntimeUri
+        val rtVersion = context.args.runtimeVersion
         val sb = StringBuffer("");
         val manifest = fileConfig.srcGenPath.resolve("package.json");
         val rtRegex = Regex("(\"@lf-lang/reactor-ts\")(.+)")
-        if (rtPath != null) rtPath = formatRuntimePath(rtPath)
-        if (rtPath != null || rtVersion != null) {
+        if (rtUri != null || rtVersion != null) {
             devMode = true;
         }
         manifest.toFile().forEachLine {
@@ -192,8 +191,8 @@ class TSGenerator(
             if (line.contains(rtRegex) && line.contains(RUNTIME_URL)) {
                 devMode = true;
             }
-            if (rtPath != null) {
-                line = line.replace(rtRegex, "$1: \"$rtPath\",")
+            if (rtUri != null) {
+                line = line.replace(rtRegex, "$1: \"$rtUri\",")
             } else if (rtVersion != null) {
                 line = line.replace(rtRegex, "$1: \"$RUNTIME_URL#$rtVersion\",")
             }
diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index 7cff60a65b..37bc939294 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -24,10 +24,8 @@
 
 package org.lflang.tests;
 
-import org.lflang.target.property.LoggingProperty;
 import org.lflang.target.property.PlatformProperty;
 import org.lflang.target.property.PlatformProperty.PlatformOptions;
-import org.lflang.target.property.ThreadingProperty;
 import org.lflang.target.property.type.LoggingType.LogLevel;
 import org.lflang.target.property.type.PlatformType.Platform;
 import org.lflang.tests.TestRegistry.TestCategory;
@@ -62,15 +60,18 @@ public interface Configurator {
    * @return True if successful, false otherwise.
    */
   public static boolean disableThreading(LFTest test) {
-    test.getContext().getArgs().setProperty("threading", "false");
-    test.getContext().getArgs().setProperty("workers", "1");
+    test.getContext().getArgs().threading = false;
+    test.getContext().getArgs().workers = 1;
     return true;
   }
 
   public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
 
-    test.getContext().getArgs().setProperty("tracing", "false");
-    ThreadingProperty.INSTANCE.override(test.getContext().getTargetConfig(), false);
+    // NOTE: Zephyr emulations fails with debug log-levels.
+    test.getContext().getArgs().logging = LogLevel.WARN;
+    test.getContext().getArgs().tracing = false;
+    test.getContext().getArgs().threading = false;
+
     var targetConfig = test.getContext().getTargetConfig();
     var platform = targetConfig.get(PlatformProperty.INSTANCE);
     PlatformProperty.INSTANCE.override(
@@ -83,14 +84,14 @@ public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
             false,
             platform.userThreads()));
 
-    // FIXME: Zephyr  emulations fails with debug log-levels.
-    LoggingProperty.INSTANCE.override(test.getContext().getTargetConfig(), LogLevel.WARN);
-    test.getContext().getArgs().setProperty("logging", "warning");
     return true;
   }
 
   public static boolean makeZephyrCompatible(LFTest test) {
-    test.getContext().getArgs().setProperty("tracing", "false");
+    // NOTE: Zephyr emulations fails with debug log-levels.
+    test.getContext().getArgs().logging = LogLevel.WARN;
+    test.getContext().getArgs().tracing = false;
+
     var targetConfig = test.getContext().getTargetConfig();
     var platform = targetConfig.get(PlatformProperty.INSTANCE);
     PlatformProperty.INSTANCE.override(
@@ -102,11 +103,6 @@ public static boolean makeZephyrCompatible(LFTest test) {
             platform.baudRate(),
             false,
             platform.userThreads()));
-
-    // FIXME: Zephyr  emulations fails with debug log-levels.
-    LoggingProperty.INSTANCE.override(test.getContext().getTargetConfig(), LogLevel.WARN);
-    test.getContext().getArgs().setProperty("logging", "warning");
-
     return true;
   }
   /**
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index 73fb9155d5..51d028388a 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -13,19 +13,19 @@
 import java.io.StringWriter;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.xtext.diagnostics.Severity;
@@ -38,14 +38,16 @@
 import org.lflang.FileConfig;
 import org.lflang.LFRuntimeModule;
 import org.lflang.LFStandaloneSetup;
+import org.lflang.generator.GeneratorArguments;
 import org.lflang.generator.GeneratorResult;
 import org.lflang.generator.LFGenerator;
 import org.lflang.generator.LFGeneratorContext;
-import org.lflang.generator.LFGeneratorContext.BuildParm;
 import org.lflang.generator.MainContext;
 import org.lflang.target.Target;
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.LoggingProperty;
+import org.lflang.target.property.type.BuildTypeType.BuildType;
+import org.lflang.target.property.type.LoggingType.LogLevel;
 import org.lflang.tests.Configurators.Configurator;
 import org.lflang.tests.LFTest.Result;
 import org.lflang.tests.TestRegistry.TestCategory;
@@ -357,25 +359,26 @@ private static void checkAndReportFailures(Set<LFTest> tests) {
    * @param configurator The configurator to apply to the test.
    */
   private void configure(LFTest test, Configurator configurator) throws TestError {
-    var props = new Properties();
-    props.setProperty("hierarchical-bin", "true");
+
+    var args = new GeneratorArguments();
+    args.hierarchicalBin = true;
 
     var sysProps = System.getProperties();
     // Set the external-runtime-path property if it was specified.
     if (sysProps.containsKey("runtime")) {
       var rt = sysProps.get("runtime").toString();
       if (!rt.isEmpty()) {
-        props.setProperty(BuildParm.EXTERNAL_RUNTIME_PATH.getKey(), rt);
+        try {
+          args.externalRuntimeUri = new URI(rt);
+        } catch (URISyntaxException e) {
+          throw new RuntimeException(e);
+        }
         System.out.println("Using runtime: " + sysProps.get("runtime").toString());
       }
     } else {
       System.out.println("Using default runtime.");
     }
-
-    var r =
-        resourceSetProvider
-            .get()
-            .getResource(URI.createFileURI(test.getSrcPath().toFile().getAbsolutePath()), true);
+    var r = FileConfig.getResource(test.getSrcPath().toFile(), resourceSetProvider);
 
     if (r.getErrors().size() > 0) {
       String message =
@@ -394,11 +397,11 @@ private void configure(LFTest test, Configurator configurator) throws TestError
             LFGeneratorContext.Mode.STANDALONE,
             CancelIndicator.NullImpl,
             (m, p) -> {},
-            props,
+            new GeneratorArguments(),
             r,
             fileAccess,
             fileConfig -> new DefaultMessageReporter());
-    addExtraLfcArgs(props, context.getTargetConfig());
+    addExtraLfcArgs(args, context.getTargetConfig());
 
     test.configure(context);
 
@@ -437,9 +440,9 @@ private void validate(LFTest test) throws TestError {
   }
 
   /** Override to add some LFC arguments to all runs of this test class. */
-  protected void addExtraLfcArgs(Properties args, TargetConfig targetConfig) {
-    args.setProperty("build-type", "Test");
-    if (!targetConfig.isSet(LoggingProperty.INSTANCE)) args.setProperty("logging", "Debug");
+  protected void addExtraLfcArgs(GeneratorArguments args, TargetConfig targetConfig) {
+    args.buildType = BuildType.TEST;
+    if (!targetConfig.isSet(LoggingProperty.INSTANCE)) args.logging = LogLevel.DEBUG;
   }
 
   /**

From 960f1ba8cf13bb4fc37aebaed46a84f6be839a58 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 29 Oct 2023 11:23:25 -0700
Subject: [PATCH 1077/1114] Minor fixes

---
 cli/base/src/main/java/org/lflang/cli/CliBase.java   | 12 ++++++------
 .../kotlin/org/lflang/generator/ts/TSGenerator.kt    |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cli/base/src/main/java/org/lflang/cli/CliBase.java b/cli/base/src/main/java/org/lflang/cli/CliBase.java
index 4e6f107cc4..d37fdee14e 100644
--- a/cli/base/src/main/java/org/lflang/cli/CliBase.java
+++ b/cli/base/src/main/java/org/lflang/cli/CliBase.java
@@ -68,13 +68,12 @@ static class MutuallyExclusive {
     private boolean stdin;
   }
 
-  @ArgGroup(exclusive = true, multiplicity = "1")
+  @ArgGroup(multiplicity = "1")
   MutuallyExclusive topLevelArg;
 
   @Option(
       names = {"-o", "--output-path"},
       defaultValue = "",
-      fallbackValue = "",
       description = "Specify the root output directory.")
   private Path outputPath;
 
@@ -172,12 +171,13 @@ protected List<Path> getInputPaths() {
           paths =
               filesObj.getAsJsonArray().asList().stream()
                   .map(e -> Path.of(e.getAsString()))
-                  .collect(Collectors.toUnmodifiableList());
+                  .toList();
         } else {
-          reporter.printFatalErrorAndExit("JSON Parse Exception: field \"src\" not found.");
+          reporter.printFatalErrorAndExit(
+              "JSON Parse Exception: field \"src\" must be a string or an array of strings.");
         }
       } else {
-        reporter.printFatalErrorAndExit("No source files specified in given JSON.");
+        reporter.printFatalErrorAndExit("JSON Parse Exception: field \"src\" not found.");
       }
     } else {
       paths = topLevelArg.files.stream().map(io.getWd()::resolve).collect(Collectors.toList());
@@ -209,7 +209,7 @@ protected final JsonObject getJsonObject() {
       try {
         jsonObject = JsonParser.parseString(jsonString).getAsJsonObject();
       } catch (JsonParseException e) {
-        messageReporter.nowhere().error((String.format("Invalid JSON string:%n %s", jsonString)));
+        messageReporter.nowhere().error(String.format("Invalid JSON string:%n %s", jsonString));
       }
     }
     return jsonObject;
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
index 9fdc2c4546..61af132ba7 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -41,7 +41,8 @@ import org.lflang.target.property.ProtobufsProperty
 import org.lflang.util.FileUtil
 import java.nio.file.Files
 import java.nio.file.Path
-import java.util.*
+import java.util.LinkedList
+import kotlin.collections.HashMap
 
 private const val NO_NPM_MESSAGE = "The TypeScript target requires npm >= 6.14.4. " +
         "For installation instructions, see: https://www.npmjs.com/get-npm. \n" +

From 38f3377662c8ac4c4495f5589b23b4d10798e1f7 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 29 Oct 2023 11:46:18 -0700
Subject: [PATCH 1078/1114] Added missing class

---
 .../lflang/generator/GeneratorArguments.java  | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 core/src/main/java/org/lflang/generator/GeneratorArguments.java

diff --git a/core/src/main/java/org/lflang/generator/GeneratorArguments.java b/core/src/main/java/org/lflang/generator/GeneratorArguments.java
new file mode 100644
index 0000000000..e57982b52d
--- /dev/null
+++ b/core/src/main/java/org/lflang/generator/GeneratorArguments.java
@@ -0,0 +1,90 @@
+package org.lflang.generator;
+
+import com.google.gson.JsonObject;
+import java.net.URI;
+import org.lflang.target.property.type.BuildTypeType.BuildType;
+import org.lflang.target.property.type.LoggingType.LogLevel;
+import org.lflang.target.property.type.SchedulerType.Scheduler;
+
+public class GeneratorArguments {
+
+  /**
+   * @see org.lflang.target.property.BuildTypeProperty
+   */
+  public BuildType buildType;
+
+  /** Whether to clean before building. */
+  public boolean clean;
+
+  /**
+   * @see org.lflang.target.property.ExternalRuntimePathProperty
+   */
+  public URI externalRuntimeUri;
+
+  /**
+   * @see org.lflang.target.property.HierarchicalBinProperty
+   */
+  public Boolean hierarchicalBin;
+
+  /** Generator arguments and target properties, if they were passed to the application. */
+  public JsonObject jsonObject;
+
+  /** For enabling or disabling the linting of generated code */
+  public boolean lint;
+
+  /**
+   * @see org.lflang.target.property.LoggingProperty
+   */
+  public LogLevel logging;
+
+  /**
+   * @see org.lflang.target.property.PrintStatisticsProperty
+   */
+  public Boolean printStatistics;
+
+  /**
+   * @see org.lflang.target.property.NoCompileProperty
+   */
+  public Boolean noCompile;
+
+  /**
+   * @see org.lflang.target.property.VerifyProperty
+   */
+  public Boolean verify;
+
+  /**
+   * @see org.lflang.target.property.CompilerProperty
+   */
+  public String compiler;
+
+  /** Whether to suppress output of the target compiler and other commands. */
+  public boolean quiet;
+
+  /** The location of the rti. */
+  public URI rti;
+
+  /**
+   * @see org.lflang.target.property.RuntimeVersionProperty
+   */
+  public String runtimeVersion;
+
+  /**
+   * @see org.lflang.target.property.SchedulerProperty
+   */
+  public Scheduler scheduler;
+
+  /**
+   * @see org.lflang.target.property.SchedulerProperty
+   */
+  public Boolean threading;
+
+  /**
+   * @see org.lflang.target.property.SchedulerProperty
+   */
+  public Boolean tracing; // FIXME add CLI arg for this
+
+  /**
+   * @see org.lflang.target.property.WorkersProperty
+   */
+  public Integer workers;
+}

From 8a8c929bf03dd1415a533e0696291f24b3a918c4 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 29 Oct 2023 11:56:40 -0700
Subject: [PATCH 1079/1114] Fix merge artifact

---
 .../org/lflang/generator/ts/TSParameterPreambleGenerator.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
index e555a81477..8aa818f57e 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSParameterPreambleGenerator.kt
@@ -239,7 +239,7 @@ class TSParameterPreambleGenerator(
         |        throw new Error("'logging' command line argument is malformed.");
         |    }
         |} else {
-        |    Log.setLevel(Log.LogLevel.${${targetConfig.get(LoggingProperty.INSTANCE).name}); // Default from target property.
+        |    Log.setLevel(Log.LogLevel.${targetConfig.get(LoggingProperty.INSTANCE).name}); // Default from target property.
         |}
         |
         |// Help parameter (not a constructor parameter, but a command line option)

From db5646df30bb70ce873889525227f9696893e69a Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 29 Oct 2023 17:18:28 -0700
Subject: [PATCH 1080/1114] Check for null

---
 .../lflang/target/property/ExternalRuntimePathProperty.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
index 2829bfd6d9..04a98e0098 100644
--- a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
@@ -23,6 +23,9 @@ public String name() {
 
   @Override
   public String value(GeneratorArguments args) {
-    return Paths.get(args.externalRuntimeUri).toString();
+    if (args.externalRuntimeUri != null) {
+      return Paths.get(args.externalRuntimeUri).toString();
+    }
+    return null;
   }
 }

From 5f74a13533c5f7bdc05665f5f00cb232ab9daeaf Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 29 Oct 2023 18:42:29 -0700
Subject: [PATCH 1081/1114] Use release build type for Py/Win

---
 .../java/org/lflang/tests/runtime/PythonTest.java               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
index 17db439518..3712d7b3ed 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
@@ -54,7 +54,7 @@ protected void addExtraLfcArgs(GeneratorArguments args, TargetConfig targetConfi
     if (System.getProperty("os.name").startsWith("Windows")) {
       // Use the RelWithDebInfo build type on Windows as the Debug/Test build type produces linker
       // Errors in CI
-      args.buildType = BuildType.REL_WITH_DEB_INFO;
+      args.buildType = BuildType.RELEASE;
     }
   }
 

From cab78d48fcf7e8a0ee584f737cd381c4fd224ba9 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 29 Oct 2023 19:07:25 -0700
Subject: [PATCH 1082/1114] Set args before using them

---
 .../java/org/lflang/tests/runtime/PythonTest.java      |  7 +++----
 .../lflang/tests/serialization/SerializationTest.java  |  5 ++---
 .../testFixtures/java/org/lflang/tests/TestBase.java   | 10 +++-------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
index 3712d7b3ed..c760deb563 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
@@ -29,7 +29,6 @@
 import org.junit.jupiter.api.Test;
 import org.lflang.generator.GeneratorArguments;
 import org.lflang.target.Target;
-import org.lflang.target.TargetConfig;
 import org.lflang.target.property.type.BuildTypeType.BuildType;
 import org.lflang.tests.RuntimeTest;
 
@@ -49,12 +48,12 @@ public PythonTest() {
   }
 
   @Override
-  protected void addExtraLfcArgs(GeneratorArguments args, TargetConfig targetConfig) {
-    super.addExtraLfcArgs(args, targetConfig);
+  protected void addExtraLfcArgs(GeneratorArguments args) {
+    super.addExtraLfcArgs(args);
     if (System.getProperty("os.name").startsWith("Windows")) {
       // Use the RelWithDebInfo build type on Windows as the Debug/Test build type produces linker
       // Errors in CI
-      args.buildType = BuildType.RELEASE;
+      args.buildType = BuildType.REL_WITH_DEB_INFO;
     }
   }
 
diff --git a/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java b/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
index 01c377c59c..43f2444694 100644
--- a/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
@@ -4,7 +4,6 @@
 import org.junit.jupiter.api.Test;
 import org.lflang.generator.GeneratorArguments;
 import org.lflang.target.Target;
-import org.lflang.target.TargetConfig;
 import org.lflang.target.property.type.BuildTypeType.BuildType;
 import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
@@ -17,8 +16,8 @@ protected SerializationTest() {
   }
 
   @Override
-  protected void addExtraLfcArgs(GeneratorArguments args, TargetConfig targetConfig) {
-    super.addExtraLfcArgs(args, targetConfig);
+  protected void addExtraLfcArgs(GeneratorArguments args) {
+    super.addExtraLfcArgs(args);
     // Use the Debug build type as coverage generation does not work for the serialization tests
     args.buildType = BuildType.DEBUG;
   }
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index 51d028388a..c651c72889 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -44,8 +44,6 @@
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.MainContext;
 import org.lflang.target.Target;
-import org.lflang.target.TargetConfig;
-import org.lflang.target.property.LoggingProperty;
 import org.lflang.target.property.type.BuildTypeType.BuildType;
 import org.lflang.target.property.type.LoggingType.LogLevel;
 import org.lflang.tests.Configurators.Configurator;
@@ -392,6 +390,7 @@ private void configure(LFTest test, Configurator configurator) throws TestError
         FileConfig.findPackageRoot(test.getSrcPath(), s -> {})
             .resolve(FileConfig.DEFAULT_SRC_GEN_DIR)
             .toString());
+    addExtraLfcArgs(args);
     var context =
         new MainContext(
             LFGeneratorContext.Mode.STANDALONE,
@@ -401,12 +400,9 @@ private void configure(LFTest test, Configurator configurator) throws TestError
             r,
             fileAccess,
             fileConfig -> new DefaultMessageReporter());
-    addExtraLfcArgs(args, context.getTargetConfig());
 
     test.configure(context);
 
-    // Reload in case target properties have changed.
-    context.loadTargetConfig();
     // Update the test by applying the configuration. E.g., to carry out an AST transformation.
     if (configurator != null) {
       if (!configurator.configure(test)) {
@@ -440,9 +436,9 @@ private void validate(LFTest test) throws TestError {
   }
 
   /** Override to add some LFC arguments to all runs of this test class. */
-  protected void addExtraLfcArgs(GeneratorArguments args, TargetConfig targetConfig) {
+  protected void addExtraLfcArgs(GeneratorArguments args) {
     args.buildType = BuildType.TEST;
-    if (!targetConfig.isSet(LoggingProperty.INSTANCE)) args.logging = LogLevel.DEBUG;
+    args.logging = LogLevel.DEBUG;
   }
 
   /**

From 6df9434d2be156575d49cac1a82cf296f6e20f0b Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 29 Oct 2023 19:42:12 -0700
Subject: [PATCH 1083/1114] Try building with Release again

---
 .../java/org/lflang/tests/runtime/PythonTest.java               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
index c760deb563..02c145c922 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
@@ -53,7 +53,7 @@ protected void addExtraLfcArgs(GeneratorArguments args) {
     if (System.getProperty("os.name").startsWith("Windows")) {
       // Use the RelWithDebInfo build type on Windows as the Debug/Test build type produces linker
       // Errors in CI
-      args.buildType = BuildType.REL_WITH_DEB_INFO;
+      args.buildType = BuildType.RELEASE;
     }
   }
 

From 264393e012f30e58eb89d5d6d98a1ba41e098a61 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 29 Oct 2023 20:48:40 -0700
Subject: [PATCH 1084/1114] Bugfix and output useful for debugging

---
 .../org/lflang/analyses/uclid/UclidGenerator.java     |  2 +-
 .../main/java/org/lflang/generator/GeneratorBase.java |  7 ++++---
 .../src/main/java/org/lflang/target/TargetConfig.java | 11 +++++++++++
 .../testFixtures/java/org/lflang/tests/TestBase.java  |  7 +++++--
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
index b3e7984133..540a2b5c81 100644
--- a/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/core/src/main/java/org/lflang/analyses/uclid/UclidGenerator.java
@@ -188,7 +188,7 @@ public UclidGenerator(LFGeneratorContext context, List<Attribute> properties) {
   public void doGenerate(Resource resource, LFGeneratorContext context) {
 
     // Reuse parts of doGenerate() from GeneratorBase.
-    super.printInfo(context.getMode());
+    super.printInfo(context);
     ASTUtils.setMainName(context.getFileConfig().resource, context.getFileConfig().name);
     super.createMainInstantiation();
     super.setReactorsAndInstantiationGraph(context.getMode());
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 1594347f5b..e67397cffb 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -185,7 +185,7 @@ protected void registerTransformation(AstTransformation transformation) {
    */
   public void doGenerate(Resource resource, LFGeneratorContext context) {
 
-    printInfo(context.getMode());
+    printInfo(context);
 
     // Clear any IDE markers that may have been created by a previous build.
     // Markers mark problems in the Eclipse IDE when running in integrated mode.
@@ -692,14 +692,15 @@ private void reportIssue(StringBuilder message, Integer lineNumber, Path path, i
    * Print to stdout information about what source file is being generated, what mode the generator
    * is in, and where the generated sources are to be put.
    */
-  public void printInfo(LFGeneratorContext.Mode mode) {
+  public void printInfo(LFGeneratorContext context) {
     messageReporter
         .nowhere()
         .info("Generating code for: " + context.getFileConfig().resource.getURI().toString());
-    messageReporter.nowhere().info("Generation mode: " + mode);
+    messageReporter.nowhere().info("Generation mode: " + context.getMode());
     messageReporter
         .nowhere()
         .info("Generating sources into: " + context.getFileConfig().getSrcGenPath());
+    messageReporter.nowhere().info(context.getTargetConfig().settings());
   }
 
   /** Get the buffer type used for network messages */
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 2f6b401c15..3ab8423fd5 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -230,6 +230,17 @@ public <T, S extends TargetPropertyType> void set(TargetProperty<T, S> property,
     }
   }
 
+  public String settings() {
+    var s = new StringBuffer("Target Configuration:\n");
+    this.properties.keySet().stream()
+        .filter(p -> this.setProperties.contains(p))
+        .forEach(
+            p -> {
+              s.append(String.format("      - %s: %s\n", p.name(), this.get(p).toString()));
+            });
+    return s.toString();
+  }
+
   /**
    * Extracts all properties as a list of key-value pairs from a TargetConfig. Only extracts
    * properties explicitly set by user.
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index c651c72889..ae3a2867bf 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -169,7 +169,7 @@ protected TestBase(List<Target> targets) {
    * @param selected A predicate that given a test category returns whether it should be included in
    *     this test run or not.
    * @param configurator A procedure for configuring the tests.
-   * @param copy Whether or not to work on copies of tests in the test. registry.
+   * @param copy Whether to work on copies of tests in the test. registry.
    */
   protected final void runTestsAndPrintResults(
       Target target,
@@ -396,13 +396,16 @@ private void configure(LFTest test, Configurator configurator) throws TestError
             LFGeneratorContext.Mode.STANDALONE,
             CancelIndicator.NullImpl,
             (m, p) -> {},
-            new GeneratorArguments(),
+            args,
             r,
             fileAccess,
             fileConfig -> new DefaultMessageReporter());
 
     test.configure(context);
 
+    // Reload in case target properties have changed.
+    context.loadTargetConfig();
+
     // Update the test by applying the configuration. E.g., to carry out an AST transformation.
     if (configurator != null) {
       if (!configurator.configure(test)) {

From 78e992ef041007aaa233edf885f549ef6486db31 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Sun, 29 Oct 2023 21:06:35 -0700
Subject: [PATCH 1085/1114] Minor fixes

---
 .../java/org/lflang/tests/runtime/PythonTest.java     |  2 +-
 .../src/main/java/org/lflang/target/TargetConfig.java |  7 ++++---
 .../org/lflang/target/property/BuildTypeProperty.java | 10 ----------
 .../target/property/HierarchicalBinProperty.java      | 11 -----------
 4 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
index 02c145c922..c760deb563 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
@@ -53,7 +53,7 @@ protected void addExtraLfcArgs(GeneratorArguments args) {
     if (System.getProperty("os.name").startsWith("Windows")) {
       // Use the RelWithDebInfo build type on Windows as the Debug/Test build type produces linker
       // Errors in CI
-      args.buildType = BuildType.RELEASE;
+      args.buildType = BuildType.REL_WITH_DEB_INFO;
     }
   }
 
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 3ab8423fd5..9b0f14817c 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -231,14 +231,15 @@ public <T, S extends TargetPropertyType> void set(TargetProperty<T, S> property,
   }
 
   public String settings() {
-    var s = new StringBuffer("Target Configuration:\n");
+    var sb = new StringBuffer("Target Configuration:\n");
     this.properties.keySet().stream()
         .filter(p -> this.setProperties.contains(p))
         .forEach(
             p -> {
-              s.append(String.format("      - %s: %s\n", p.name(), this.get(p).toString()));
+              sb.append(String.format("      - %s: %s\n", p.name(), this.get(p).toString()));
             });
-    return s.toString();
+    sb.setLength(sb.length() - 1);
+    return sb.toString();
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
index 4c9b8dc890..6ed75f23e2 100644
--- a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
@@ -5,7 +5,6 @@
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.Element;
-import org.lflang.target.TargetConfig;
 import org.lflang.target.property.type.BuildTypeType;
 import org.lflang.target.property.type.BuildTypeType.BuildType;
 
@@ -47,15 +46,6 @@ public String name() {
     return "build-type";
   }
 
-  @Override
-  public void update(TargetConfig config, GeneratorArguments args, MessageReporter reporter) {
-    if (args.buildType != null) {
-      config.set(this, args.buildType);
-    } else if (args.jsonObject != null) {
-      config.set(this, fromJSON(args.jsonObject, reporter));
-    }
-  }
-
   @Override
   public BuildType value(GeneratorArguments args) {
     return args.buildType;
diff --git a/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java b/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
index 8b77cc14c0..c18c398c7c 100644
--- a/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
+++ b/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
@@ -1,8 +1,6 @@
 package org.lflang.target.property;
 
-import org.lflang.MessageReporter;
 import org.lflang.generator.GeneratorArguments;
-import org.lflang.target.TargetConfig;
 
 /**
  * Whether the bin directory should have a flat or hierarchical organization. It is flat by default.
@@ -21,15 +19,6 @@ public String name() {
     return "hierarchical-bin";
   }
 
-  @Override
-  public void update(TargetConfig config, GeneratorArguments args, MessageReporter reporter) {
-    if (args.hierarchicalBin != null) {
-      config.set(this, args.hierarchicalBin);
-    } else if (args.jsonObject != null) {
-      config.set(this, fromJSON(args.jsonObject, reporter));
-    }
-  }
-
   @Override
   public Boolean value(GeneratorArguments args) {
     return args.hierarchicalBin;

From 8cf38490df161ed16bdd8bda0959c5dd35f57330 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 30 Oct 2023 11:48:15 -0700
Subject: [PATCH 1086/1114] Reload after reconfiguration

---
 core/src/testFixtures/java/org/lflang/tests/TestBase.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index ae3a2867bf..3512255fa3 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -403,15 +403,15 @@ private void configure(LFTest test, Configurator configurator) throws TestError
 
     test.configure(context);
 
-    // Reload in case target properties have changed.
-    context.loadTargetConfig();
-
     // Update the test by applying the configuration. E.g., to carry out an AST transformation.
     if (configurator != null) {
       if (!configurator.configure(test)) {
         throw new TestError("Test configuration unsuccessful.", Result.CONFIG_FAIL);
       }
     }
+
+    // Reload in case target properties have changed.
+    context.loadTargetConfig();
   }
 
   /** Validate the given test. Throw an TestError if validation failed. */

From 6fdf06599ef17b183ed95508834a99016c019d8b Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 30 Oct 2023 12:36:04 -0700
Subject: [PATCH 1087/1114] Attempt to fix threading problems in Python target

---
 .../lflang/generator/python/PythonDelayBodyGenerator.java    | 4 ++--
 .../java/org/lflang/generator/python/PythonGenerator.java    | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/python/PythonDelayBodyGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonDelayBodyGenerator.java
index 38cf6b72e2..a950dbd718 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonDelayBodyGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonDelayBodyGenerator.java
@@ -39,7 +39,7 @@ public String generateDelayBody(Action action, VarRef port) {
       return String.join(
           "\n",
           "// Create a token.",
-          "#if NUMBER_OF_WORKERS > 0",
+          "#ifdef LF_THREADED",
           "// Need to lock the mutex first.",
           "lf_mutex_lock(&mutex);",
           "#endif",
@@ -49,7 +49,7 @@ public String generateDelayBody(Action action, VarRef port) {
               + value
               + ", 1);",
           "Py_INCREF(" + value + ");",
-          "#if NUMBER_OF_WORKERS > 0",
+          "#ifdef LF_THREADED",
           "lf_mutex_unlock(&mutex);",
           "#endif",
           "",
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index e4477d2d0d..60d40275f0 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -62,6 +62,7 @@
 import org.lflang.target.property.CompilerFlagsProperty;
 import org.lflang.target.property.CompilerProperty;
 import org.lflang.target.property.ProtobufsProperty;
+import org.lflang.target.property.ThreadingProperty;
 import org.lflang.util.FileUtil;
 import org.lflang.util.LFCommand;
 import org.lflang.util.StringUtil;
@@ -111,6 +112,10 @@ private PythonGenerator(
     super(context, false, types, cmakeGenerator, new PythonDelayBodyGenerator(types));
     // Add the C target properties because they are used in the C code generator.
     CompilerProperty.INSTANCE.override(this.targetConfig, "gcc"); // FIXME: why?
+    if (!targetConfig.isSet(ThreadingProperty.INSTANCE)) {
+      // Disable threading by default.
+      targetConfig.set(ThreadingProperty.INSTANCE, false);
+    }
     this.targetConfig.reset(CompilerFlagsProperty.INSTANCE);
     this.types = types;
   }

From 79059cb8475417260ecd3941ba98177765445ab0 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Mon, 30 Oct 2023 20:55:32 +0100
Subject: [PATCH 1088/1114] Python: Generated after-delay use mutex on
 env-struct

---
 .../lflang/generator/python/PythonDelayBodyGenerator.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/python/PythonDelayBodyGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonDelayBodyGenerator.java
index a950dbd718..2feb887bf7 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonDelayBodyGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonDelayBodyGenerator.java
@@ -39,9 +39,9 @@ public String generateDelayBody(Action action, VarRef port) {
       return String.join(
           "\n",
           "// Create a token.",
-          "#ifdef LF_THREADED",
+          "#if defined(LF_THREADED)",
           "// Need to lock the mutex first.",
-          "lf_mutex_lock(&mutex);",
+          "lf_mutex_lock(&self->base.environment->mutex);",
           "#endif",
           "lf_token_t* t = _lf_new_token((token_type_t*)"
               + action.getName()
@@ -49,8 +49,8 @@ public String generateDelayBody(Action action, VarRef port) {
               + value
               + ", 1);",
           "Py_INCREF(" + value + ");",
-          "#ifdef LF_THREADED",
-          "lf_mutex_unlock(&mutex);",
+          "#if defined(LF_THREADED)",
+          "lf_mutex_unlock(&self->base.environment->mutex);",
           "#endif",
           "",
           "// Pass the token along",

From ca4f7f24c0a2a2a781c46154c1a83bc315e3a98b Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 30 Oct 2023 16:39:05 -0700
Subject: [PATCH 1089/1114] Update CITATION.cff

Fix indentation
---
 CITATION.cff | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CITATION.cff b/CITATION.cff
index ef269311e3..6ae628258b 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -45,19 +45,19 @@ authors:
     family-names: Jellum
     email: erling.r.jellum@ntnu.no
     affiliation: NTNU
-   - given-names: Hokeun
+  - given-names: Hokeun
     family-names: Kim
     email: hokeun@berkeley.edu
     affiliation: UC Berkeley
-   - given-names: Matt
+  - given-names: Matt
     family-names: Weber
     email: matt.weber@berkeley.edu
     affiliation: UC Berkeley
-   - given-names: Shaokai
+  - given-names: Shaokai
     family-names: Lin
     email: shaokai@berkeley.edu
     affiliation: UC Berkeley
-   - given-names: Anirudh
+  - given-names: Anirudh
     family-names: Rengarajan
     email: arengarajan@berkeley.edu
     affiliation: UC Berkeley

From d447e342048a9ead8d670d346ce10f3430dd0008 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 30 Oct 2023 16:57:04 -0700
Subject: [PATCH 1090/1114] Use threading by default in Python

---
 .../java/org/lflang/generator/python/PythonGenerator.java     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index 60d40275f0..9f5f65a35b 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -112,10 +112,6 @@ private PythonGenerator(
     super(context, false, types, cmakeGenerator, new PythonDelayBodyGenerator(types));
     // Add the C target properties because they are used in the C code generator.
     CompilerProperty.INSTANCE.override(this.targetConfig, "gcc"); // FIXME: why?
-    if (!targetConfig.isSet(ThreadingProperty.INSTANCE)) {
-      // Disable threading by default.
-      targetConfig.set(ThreadingProperty.INSTANCE, false);
-    }
     this.targetConfig.reset(CompilerFlagsProperty.INSTANCE);
     this.types = types;
   }

From c96a7941026e93756795ded5f99eef8d803144aa Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 30 Oct 2023 17:55:24 -0700
Subject: [PATCH 1091/1114] Clean up dealings with target configurations and
 transformation in the test framework

---
 .../java/org/lflang/tests/RuntimeTest.java    | 15 +++++-
 .../lflang/tests/runtime/CArduinoTest.java    |  2 +
 .../org/lflang/tests/runtime/CCppTest.java    |  4 +-
 .../lflang/tests/runtime/CSchedulerTest.java  | 10 ++--
 .../lflang/tests/runtime/CVerifierTest.java   |  6 ++-
 .../org/lflang/tests/runtime/CZephyrTest.java |  6 +++
 .../org/lflang/tests/runtime/CppRos2Test.java |  6 ++-
 .../serialization/SerializationTest.java      |  3 ++
 .../generator/python/PythonGenerator.java     |  1 -
 .../java/org/lflang/tests/Configurators.java  | 47 ++++++++++---------
 .../java/org/lflang/tests/LFTest.java         |  3 +-
 .../java/org/lflang/tests/TestBase.java       | 43 +++++++++++------
 .../java/org/lflang/tests/Transformers.java   | 21 +++++++++
 13 files changed, 118 insertions(+), 49 deletions(-)
 create mode 100644 core/src/testFixtures/java/org/lflang/tests/Transformers.java

diff --git a/core/src/integrationTest/java/org/lflang/tests/RuntimeTest.java b/core/src/integrationTest/java/org/lflang/tests/RuntimeTest.java
index add74ef30d..36aca85be9 100644
--- a/core/src/integrationTest/java/org/lflang/tests/RuntimeTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/RuntimeTest.java
@@ -58,6 +58,7 @@ public void runBasicTests() {
     runTestsForTargets(
         Message.DESC_BASIC,
         TestCategory.BASIC::equals,
+        Transformers::noChanges,
         Configurators::noChanges,
         TestLevel.EXECUTION,
         false);
@@ -68,6 +69,7 @@ public void runGenericsTests() {
     runTestsForTargets(
         Message.DESC_GENERICS,
         TestCategory.GENERICS::equals,
+        Transformers::noChanges,
         Configurators::noChanges,
         TestLevel.EXECUTION,
         false);
@@ -78,6 +80,7 @@ public void runTargetSpecificTests() {
     runTestsForTargets(
         Message.DESC_TARGET_SPECIFIC,
         TestCategory.TARGET::equals,
+        Transformers::noChanges,
         Configurators::noChanges,
         TestLevel.EXECUTION,
         false);
@@ -88,6 +91,7 @@ public void runMultiportTests() {
     runTestsForTargets(
         Message.DESC_MULTIPORT,
         TestCategory.MULTIPORT::equals,
+        Transformers::noChanges,
         Configurators::noChanges,
         TestLevel.EXECUTION,
         false);
@@ -109,7 +113,8 @@ public void runAsFederated() {
         List.of(Target.C),
         Message.DESC_AS_FEDERATED,
         categories::contains,
-        it -> ASTUtils.makeFederated(it.getFileConfig().resource),
+        it -> ASTUtils.makeFederated(it),
+        Configurators::noChanges,
         TestLevel.EXECUTION,
         true);
   }
@@ -119,6 +124,7 @@ public void runConcurrentTests() {
     runTestsForTargets(
         Message.DESC_CONCURRENT,
         TestCategory.CONCURRENT::equals,
+        Transformers::noChanges,
         Configurators::noChanges,
         TestLevel.EXECUTION,
         false);
@@ -130,6 +136,7 @@ public void runFederatedTests() {
     runTestsForTargets(
         Message.DESC_FEDERATED,
         TestCategory.FEDERATED::equals,
+        Transformers::noChanges,
         Configurators::noChanges,
         TestLevel.EXECUTION,
         false);
@@ -141,6 +148,7 @@ public void runModalTests() {
     runTestsForTargets(
         Message.DESC_MODAL,
         TestCategory.MODAL_MODELS::equals,
+        Transformers::noChanges,
         Configurators::noChanges,
         TestLevel.EXECUTION,
         false);
@@ -152,6 +160,7 @@ public void runNoInliningTests() {
     runTestsForTargets(
         Message.DESC_MODAL,
         TestCategory.NO_INLINING::equals,
+        Transformers::noChanges,
         Configurators::noChanges,
         TestLevel.EXECUTION,
         false);
@@ -168,6 +177,7 @@ public void runDockerTests() {
     runTestsForTargets(
         Message.DESC_DOCKER,
         TestCategory.DOCKER::equals,
+        Transformers::noChanges,
         Configurators::noChanges,
         TestLevel.EXECUTION,
         false);
@@ -186,6 +196,7 @@ public void runDockerFederatedTests() {
     runTestsForTargets(
         Message.DESC_DOCKER_FEDERATED,
         TestCategory.DOCKER_FEDERATED::equals,
+        Transformers::noChanges,
         Configurators::noChanges,
         TestLevel.EXECUTION,
         false);
@@ -197,6 +208,7 @@ public void runWithThreadingOff() {
     this.runTestsForTargets(
         Message.DESC_SINGLE_THREADED,
         Configurators::compatibleWithThreadingOff,
+        Transformers::noChanges,
         Configurators::disableThreading,
         TestLevel.EXECUTION,
         true);
@@ -209,6 +221,7 @@ public void runEnclaveTests() {
     runTestsForTargets(
         Message.DESC_ENCLAVE,
         TestCategory.ENCLAVE::equals,
+        Transformers::noChanges,
         Configurators::noChanges,
         TestLevel.EXECUTION,
         false);
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CArduinoTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CArduinoTest.java
index 6a5abdf41d..0b6968f069 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CArduinoTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CArduinoTest.java
@@ -7,6 +7,7 @@
 import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry.TestCategory;
+import org.lflang.tests.Transformers;
 
 /**
  * Collection of Arduino tests for the C target.
@@ -26,6 +27,7 @@ public void buildArduinoTests() {
         List.of(Target.C),
         Message.DESC_ARDUINO,
         TestCategory.ARDUINO::equals,
+        Transformers::noChanges,
         Configurators::noChanges,
         TestLevel.BUILD,
         false);
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java
index 47c4708114..cd890517f7 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CCppTest.java
@@ -4,6 +4,7 @@
 import org.junit.jupiter.api.Test;
 import org.lflang.ast.ASTUtils;
 import org.lflang.target.Target;
+import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry.TestCategory;
 
@@ -31,7 +32,8 @@ public void runAsCCpp() {
     runTestsForTargets(
         Message.DESC_AS_CCPP,
         CCppTest::isExcludedFromCCpp,
-        it -> ASTUtils.changeTargetName(it.getFileConfig().resource, Target.CCPP.getDisplayName()),
+        resource -> ASTUtils.changeTargetName(resource, Target.CCPP.getDisplayName()),
+        Configurators::noChanges,
         TestLevel.EXECUTION,
         true);
   }
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
index 6ba74d3bdd..0e241a1dd8 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CSchedulerTest.java
@@ -3,10 +3,11 @@
 import java.util.EnumSet;
 import org.junit.jupiter.api.Test;
 import org.lflang.target.Target;
+import org.lflang.target.property.SchedulerProperty;
 import org.lflang.target.property.type.SchedulerType.Scheduler;
-import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry.TestCategory;
+import org.lflang.tests.Transformers;
 
 /** */
 public class CSchedulerTest extends TestBase {
@@ -53,9 +54,10 @@ private void runTest(Scheduler scheduler, EnumSet<TestCategory> categories) {
     this.runTestsForTargets(
         Message.DESC_SCHED_SWAPPING + scheduler.toString() + ".",
         categories::contains,
-        test -> {
-          test.getContext().getArgs().scheduler = scheduler;
-          return Configurators.noChanges(test);
+        Transformers::noChanges,
+        config -> {
+          SchedulerProperty.INSTANCE.override(config, scheduler);
+          return true;
         },
         TestLevel.EXECUTION,
         true);
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
index 0486ddb0c1..ddc6697ce9 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CVerifierTest.java
@@ -7,6 +7,7 @@
 import org.lflang.target.property.VerifyProperty;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry;
+import org.lflang.tests.Transformers;
 
 public class CVerifierTest extends TestBase {
   protected CVerifierTest() {
@@ -21,8 +22,9 @@ public void runVerifierTests() {
         List.of(Target.C),
         Message.DESC_VERIFIER,
         TestRegistry.TestCategory.VERIFIER::equals,
-        test -> {
-          VerifyProperty.INSTANCE.override(test.getContext().getTargetConfig(), true);
+        Transformers::noChanges,
+        config -> {
+          VerifyProperty.INSTANCE.override(config, true);
           return true;
         },
         TestLevel.BUILD,
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java
index 2529710b80..a4e8035eed 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java
@@ -31,6 +31,7 @@
 import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry.TestCategory;
+import org.lflang.tests.Transformers;
 
 /**
  * Collection of Zephyr tests for the C target.
@@ -50,6 +51,7 @@ public void buildZephyrUnthreadedTests() {
         List.of(Target.C),
         Message.DESC_ZEPHYR,
         TestCategory.ZEPHYR_UNTHREADED::equals,
+        Transformers::noChanges,
         Configurators::makeZephyrCompatibleUnthreaded,
         TestLevel.BUILD,
         false);
@@ -62,6 +64,7 @@ public void buildZephyrBoardsTests() {
         List.of(Target.C),
         Message.DESC_ZEPHYR,
         TestCategory.ZEPHYR_BOARDS::equals,
+        Transformers::noChanges,
         Configurators::noChanges,
         TestLevel.BUILD,
         false);
@@ -74,6 +77,7 @@ public void buildZephyrThreadedTests() {
         List.of(Target.C),
         Message.DESC_ZEPHYR,
         TestCategory.ZEPHYR_THREADED::equals,
+        Transformers::noChanges,
         Configurators::makeZephyrCompatible,
         TestLevel.BUILD,
         false);
@@ -86,6 +90,7 @@ public void buildBasicTests() {
         List.of(Target.C),
         Message.DESC_BASIC,
         TestCategory.BASIC::equals,
+        Transformers::noChanges,
         Configurators::makeZephyrCompatibleUnthreaded,
         TestLevel.BUILD,
         false);
@@ -99,6 +104,7 @@ public void buildConcurrentTests() {
         List.of(Target.C),
         Message.DESC_CONCURRENT,
         TestCategory.CONCURRENT::equals,
+        Transformers::noChanges,
         Configurators::makeZephyrCompatible,
         TestLevel.BUILD,
         false);
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
index 9970b18424..334f9ef7aa 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/CppRos2Test.java
@@ -7,6 +7,7 @@
 import org.lflang.target.Target;
 import org.lflang.target.property.Ros2Property;
 import org.lflang.tests.TestBase;
+import org.lflang.tests.Transformers;
 
 /**
  * Run C++ tests using the ROS2 platform.
@@ -30,8 +31,9 @@ public void runWithRos2() {
     runTestsForTargets(
         Message.DESC_ROS2,
         it -> true,
-        it -> {
-          Ros2Property.INSTANCE.override(it.getContext().getTargetConfig(), true);
+        Transformers::noChanges,
+        config -> {
+          Ros2Property.INSTANCE.override(config, true);
           return true;
         },
         TestLevel.EXECUTION,
diff --git a/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java b/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
index 43f2444694..ac33289ebd 100644
--- a/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
@@ -8,6 +8,7 @@
 import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
 import org.lflang.tests.TestRegistry.TestCategory;
+import org.lflang.tests.Transformers;
 
 public class SerializationTest extends TestBase {
 
@@ -28,6 +29,7 @@ public void runSerializationTestsWithThreadingOff() {
     runTestsForTargets(
         Message.DESC_SERIALIZATION,
         TestCategory.SERIALIZATION::equals,
+        Transformers::noChanges,
         Configurators::disableThreading,
         TestLevel.EXECUTION,
         false);
@@ -39,6 +41,7 @@ public void runSerializationTests() {
     runTestsForTargets(
         Message.DESC_SERIALIZATION,
         TestCategory.SERIALIZATION::equals,
+        Transformers::noChanges,
         Configurators::noChanges,
         TestLevel.EXECUTION,
         false);
diff --git a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
index 9f5f65a35b..e4477d2d0d 100644
--- a/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+++ b/core/src/main/java/org/lflang/generator/python/PythonGenerator.java
@@ -62,7 +62,6 @@
 import org.lflang.target.property.CompilerFlagsProperty;
 import org.lflang.target.property.CompilerProperty;
 import org.lflang.target.property.ProtobufsProperty;
-import org.lflang.target.property.ThreadingProperty;
 import org.lflang.util.FileUtil;
 import org.lflang.util.LFCommand;
 import org.lflang.util.StringUtil;
diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index 37bc939294..c415c66c76 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -24,8 +24,13 @@
 
 package org.lflang.tests;
 
+import org.lflang.target.TargetConfig;
+import org.lflang.target.property.LoggingProperty;
 import org.lflang.target.property.PlatformProperty;
 import org.lflang.target.property.PlatformProperty.PlatformOptions;
+import org.lflang.target.property.ThreadingProperty;
+import org.lflang.target.property.TracingProperty;
+import org.lflang.target.property.WorkersProperty;
 import org.lflang.target.property.type.LoggingType.LogLevel;
 import org.lflang.target.property.type.PlatformType.Platform;
 import org.lflang.tests.TestRegistry.TestCategory;
@@ -38,7 +43,7 @@
  */
 public class Configurators {
 
-  /** Test configuration function. */
+  /** Function to adapts a given target configuration. */
   @FunctionalInterface
   public interface Configurator {
 
@@ -46,7 +51,7 @@ public interface Configurator {
      * Apply a side effect to the given test case to change its default configuration. Return true
      * if configuration succeeded, false otherwise.
      */
-    boolean configure(LFTest test);
+    boolean configure(TargetConfig config);
   }
 
   /**
@@ -56,26 +61,25 @@ public interface Configurator {
    * unthreaded runtime. For targets that do not distinguish threaded and unthreaded runtime, the
    * number of workers is set to 1.
    *
-   * @param test The test to configure.
+   * @param config The target configuration to alter.
    * @return True if successful, false otherwise.
    */
-  public static boolean disableThreading(LFTest test) {
-    test.getContext().getArgs().threading = false;
-    test.getContext().getArgs().workers = 1;
+  public static boolean disableThreading(TargetConfig config) {
+    ThreadingProperty.INSTANCE.override(config, false);
+    WorkersProperty.INSTANCE.override(config, 1);
     return true;
   }
 
-  public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
+  public static boolean makeZephyrCompatibleUnthreaded(TargetConfig config) {
 
     // NOTE: Zephyr emulations fails with debug log-levels.
-    test.getContext().getArgs().logging = LogLevel.WARN;
-    test.getContext().getArgs().tracing = false;
-    test.getContext().getArgs().threading = false;
+    LoggingProperty.INSTANCE.override(config, LogLevel.WARN);
+    TracingProperty.INSTANCE.override(config, TracingProperty.INSTANCE.initialValue());
+    ThreadingProperty.INSTANCE.override(config, false);
 
-    var targetConfig = test.getContext().getTargetConfig();
-    var platform = targetConfig.get(PlatformProperty.INSTANCE);
+    var platform = config.get(PlatformProperty.INSTANCE);
     PlatformProperty.INSTANCE.override(
-        targetConfig,
+        config,
         new PlatformOptions(
             Platform.ZEPHYR,
             "qemu_cortex_m3",
@@ -87,15 +91,14 @@ public static boolean makeZephyrCompatibleUnthreaded(LFTest test) {
     return true;
   }
 
-  public static boolean makeZephyrCompatible(LFTest test) {
+  public static boolean makeZephyrCompatible(TargetConfig config) {
     // NOTE: Zephyr emulations fails with debug log-levels.
-    test.getContext().getArgs().logging = LogLevel.WARN;
-    test.getContext().getArgs().tracing = false;
+    LoggingProperty.INSTANCE.override(config, LogLevel.WARN);
+    TracingProperty.INSTANCE.override(config, TracingProperty.INSTANCE.initialValue());
 
-    var targetConfig = test.getContext().getTargetConfig();
-    var platform = targetConfig.get(PlatformProperty.INSTANCE);
+    var platform = config.get(PlatformProperty.INSTANCE);
     PlatformProperty.INSTANCE.override(
-        targetConfig,
+        config,
         new PlatformOptions(
             Platform.ZEPHYR,
             "qemu_cortex_m3",
@@ -108,15 +111,15 @@ public static boolean makeZephyrCompatible(LFTest test) {
   /**
    * Make no changes to the configuration.
    *
-   * @param ignoredTest The test to configure.
+   * @param config The target configuration.
    * @return True
    */
-  public static boolean noChanges(LFTest ignoredTest) {
+  public static boolean noChanges(TargetConfig config) {
     return true;
   }
 
   /** Given a test category, return true if it is compatible with single-threaded execution. */
-  public static boolean compatibleWithThreadingOff(TestCategory category) {
+  public static boolean compatibleWithThreadingOff(TestCategory category) { // FIXME: move this
 
     // CONCURRENT, FEDERATED, DOCKER_FEDERATED, DOCKER
     // are not compatible with single-threaded execution.
diff --git a/core/src/testFixtures/java/org/lflang/tests/LFTest.java b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
index b003a95264..dc293e64c0 100644
--- a/core/src/testFixtures/java/org/lflang/tests/LFTest.java
+++ b/core/src/testFixtures/java/org/lflang/tests/LFTest.java
@@ -173,7 +173,7 @@ public void markPassed() {
     execLog.clear();
   }
 
-  void configure(LFGeneratorContext context) {
+  void loadContext(LFGeneratorContext context) {
     this.context = context;
   }
 
@@ -194,6 +194,7 @@ private static void printIfNotEmpty(String header, String message) {
   public enum Result {
     UNKNOWN("No information available."),
     CONFIG_FAIL("Could not apply configuration."),
+    TRANSFORM_FAIL("Could not apply transformation."),
     PARSE_FAIL("Unable to parse test."),
     VALIDATE_FAIL("Unable to validate test."),
     CODE_GEN_FAIL("Error while generating code for test."),
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index 3512255fa3..e8e07f1c09 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -49,6 +49,7 @@
 import org.lflang.tests.Configurators.Configurator;
 import org.lflang.tests.LFTest.Result;
 import org.lflang.tests.TestRegistry.TestCategory;
+import org.lflang.tests.Transformers.Transformer;
 import org.lflang.util.FileUtil;
 import org.lflang.util.LFCommand;
 
@@ -175,6 +176,7 @@ protected final void runTestsAndPrintResults(
       Target target,
       Predicate<TestCategory> selected,
       TestLevel level,
+      Transformer transformer,
       Configurator configurator,
       boolean copy) {
     var categories = Arrays.stream(TestCategory.values()).filter(selected).toList();
@@ -182,7 +184,7 @@ protected final void runTestsAndPrintResults(
       System.out.println(category.getHeader());
       var tests = testRegistry.getRegisteredTests(target, category, copy);
       try {
-        validateAndRun(tests, configurator, level);
+        validateAndRun(tests, transformer, configurator, level);
       } catch (IOException e) {
         throw new RuntimeIOException(e);
       }
@@ -203,11 +205,12 @@ protected final void runTestsAndPrintResults(
   protected void runTestsForTargets(
       String description,
       Predicate<TestCategory> selected,
+      Transformer transformer,
       Configurator configurator,
       TestLevel level,
       boolean copy) {
     for (Target target : this.targets) {
-      runTestsFor(List.of(target), description, selected, configurator, level, copy);
+      runTestsFor(List.of(target), description, selected, transformer, configurator, level, copy);
     }
   }
 
@@ -225,12 +228,13 @@ protected void runTestsFor(
       List<Target> subset,
       String description,
       Predicate<TestCategory> selected,
+      Transformer transformer,
       Configurator configurator,
       TestLevel level,
       boolean copy) {
     for (Target target : subset) {
       printTestHeader(target, description);
-      runTestsAndPrintResults(target, selected, level, configurator, copy);
+      runTestsAndPrintResults(target, selected, level, transformer, configurator, copy);
     }
   }
 
@@ -296,7 +300,7 @@ public static void runSingleTestAndPrintResults(
 
     Set<LFTest> tests = Set.of(test);
     try {
-      runner.validateAndRun(tests, t -> true, level);
+      runner.validateAndRun(tests, Transformers::noChanges, Configurators::noChanges, level);
     } catch (IOException e) {
       throw new RuntimeIOException(e);
     }
@@ -350,13 +354,15 @@ private static void checkAndReportFailures(Set<LFTest> tests) {
   }
 
   /**
-   * Configure a test by applying the given configurator and return a generator context. If the
-   * configurator was not applied successfully, throw an AssertionError.
+   * Prepare a test by applying the given transformer and configurator. If either of them was not
+   * applied successfully, throw an AssertionError.
    *
    * @param test the test to configure.
+   * @param transformer The transformer to apply to the test.
    * @param configurator The configurator to apply to the test.
    */
-  private void configure(LFTest test, Configurator configurator) throws TestError {
+  private void prepare(LFTest test, Transformer transformer, Configurator configurator)
+      throws TestError {
 
     var args = new GeneratorArguments();
     args.hierarchicalBin = true;
@@ -401,17 +407,22 @@ private void configure(LFTest test, Configurator configurator) throws TestError
             fileAccess,
             fileConfig -> new DefaultMessageReporter());
 
-    test.configure(context);
+    // Update the test by applying the transformation.
+    if (transformer != null) {
+      if (!transformer.transform(test.getFileConfig().resource)) {
+        throw new TestError("Test transformation unsuccessful.", Result.TRANSFORM_FAIL);
+      }
+    }
 
-    // Update the test by applying the configuration. E.g., to carry out an AST transformation.
+    // Reload the context because properties may have changed as part of the transformation.
+    test.loadContext(context);
+
+    // Update the configuration using the configurator.
     if (configurator != null) {
-      if (!configurator.configure(test)) {
+      if (!configurator.configure(test.getContext().getTargetConfig())) {
         throw new TestError("Test configuration unsuccessful.", Result.CONFIG_FAIL);
       }
     }
-
-    // Reload in case target properties have changed.
-    context.loadTargetConfig();
   }
 
   /** Validate the given test. Throw an TestError if validation failed. */
@@ -642,11 +653,13 @@ private ProcessBuilder getExecCommand(LFTest test) throws TestError {
    * have been run.
    *
    * @param tests A set of tests to run.
+   * @param transformer A procedure for transforming the tests.
    * @param configurator A procedure for configuring the tests.
    * @param level The level of testing.
    * @throws IOException If initial file configuration fails
    */
-  private void validateAndRun(Set<LFTest> tests, Configurator configurator, TestLevel level)
+  private void validateAndRun(
+      Set<LFTest> tests, Transformer transformer, Configurator configurator, TestLevel level)
       throws IOException {
     final var x = 78f / tests.size();
     var marks = 0;
@@ -655,7 +668,7 @@ private void validateAndRun(Set<LFTest> tests, Configurator configurator, TestLe
     for (var test : tests) {
       try {
         test.redirectOutputs();
-        configure(test, configurator);
+        prepare(test, transformer, configurator);
         validate(test);
         generateCode(test);
         if (level == TestLevel.EXECUTION) {
diff --git a/core/src/testFixtures/java/org/lflang/tests/Transformers.java b/core/src/testFixtures/java/org/lflang/tests/Transformers.java
new file mode 100644
index 0000000000..77131e6165
--- /dev/null
+++ b/core/src/testFixtures/java/org/lflang/tests/Transformers.java
@@ -0,0 +1,21 @@
+package org.lflang.tests;
+
+import org.eclipse.emf.ecore.resource.Resource;
+
+public class Transformers {
+
+  /** Function to adapts a given resource. */
+  @FunctionalInterface
+  public interface Transformer {
+
+    /**
+     * Apply a side effect to the given test case to change its resource. Return true if
+     * transformation succeeded, false otherwise.
+     */
+    boolean transform(Resource resource);
+  }
+
+  public static boolean noChanges(Resource resource) {
+    return true;
+  }
+}

From 9bca9a09ae41f0925d1254980262bb2224a6b967 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 30 Oct 2023 18:03:12 -0700
Subject: [PATCH 1092/1114] Fix NPE

---
 .../testFixtures/java/org/lflang/tests/TestBase.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index e8e07f1c09..09cfc6f6c0 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -382,11 +382,11 @@ private void prepare(LFTest test, Transformer transformer, Configurator configur
     } else {
       System.out.println("Using default runtime.");
     }
-    var r = FileConfig.getResource(test.getSrcPath().toFile(), resourceSetProvider);
+    var resource = FileConfig.getResource(test.getSrcPath().toFile(), resourceSetProvider);
 
-    if (r.getErrors().size() > 0) {
+    if (resource.getErrors().size() > 0) {
       String message =
-          r.getErrors().stream()
+          resource.getErrors().stream()
               .map(Diagnostic::toString)
               .collect(Collectors.joining(System.lineSeparator()));
       throw new TestError(message, Result.PARSE_FAIL);
@@ -403,13 +403,13 @@ private void prepare(LFTest test, Transformer transformer, Configurator configur
             CancelIndicator.NullImpl,
             (m, p) -> {},
             args,
-            r,
+            resource,
             fileAccess,
             fileConfig -> new DefaultMessageReporter());
 
     // Update the test by applying the transformation.
     if (transformer != null) {
-      if (!transformer.transform(test.getFileConfig().resource)) {
+      if (!transformer.transform(resource)) {
         throw new TestError("Test transformation unsuccessful.", Result.TRANSFORM_FAIL);
       }
     }

From 5ba08355198bbbb53319f43814949d6507e96d1c Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 30 Oct 2023 19:12:19 -0700
Subject: [PATCH 1093/1114] Exclude enclave tests from singleThreaded tests

---
 .../java/org/lflang/tests/RuntimeTest.java    | 26 ++++++++++++++++++-
 .../java/org/lflang/tests/Configurators.java  | 24 -----------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/core/src/integrationTest/java/org/lflang/tests/RuntimeTest.java b/core/src/integrationTest/java/org/lflang/tests/RuntimeTest.java
index 36aca85be9..12c71eed7c 100644
--- a/core/src/integrationTest/java/org/lflang/tests/RuntimeTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/RuntimeTest.java
@@ -207,7 +207,7 @@ public void runWithThreadingOff() {
     Assumptions.assumeTrue(supportsSingleThreadedExecution(), Message.NO_SINGLE_THREADED_SUPPORT);
     this.runTestsForTargets(
         Message.DESC_SINGLE_THREADED,
-        Configurators::compatibleWithThreadingOff,
+        RuntimeTest::compatibleWithThreadingOff,
         Transformers::noChanges,
         Configurators::disableThreading,
         TestLevel.EXECUTION,
@@ -226,4 +226,28 @@ public void runEnclaveTests() {
         TestLevel.EXECUTION,
         false);
   }
+
+  /** Given a test category, return true if it is compatible with single-threaded execution. */
+  public static boolean compatibleWithThreadingOff(TestCategory category) {
+
+    // CONCURRENT, FEDERATED, DOCKER_FEDERATED, DOCKER
+    // are not compatible with single-threaded execution.
+    // ARDUINO and ZEPHYR have their own test suites, so we don't need to rerun.
+    boolean excluded =
+        category == TestCategory.CONCURRENT
+            || category == TestCategory.SERIALIZATION
+            || category == TestCategory.FEDERATED
+            || category == TestCategory.DOCKER_FEDERATED
+            || category == TestCategory.DOCKER
+            || category == TestCategory.ENCLAVE
+            || category == TestCategory.ARDUINO
+            || category == TestCategory.VERIFIER
+            || category == TestCategory.ZEPHYR_UNTHREADED
+            || category == TestCategory.ZEPHYR_BOARDS
+            || category == TestCategory.ZEPHYR_THREADED;
+
+    // SERIALIZATION and TARGET tests are excluded on Windows.
+    excluded |= isWindows() && category == TestCategory.TARGET;
+    return !excluded;
+  }
 }
diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index c415c66c76..ddad28eb21 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -33,7 +33,6 @@
 import org.lflang.target.property.WorkersProperty;
 import org.lflang.target.property.type.LoggingType.LogLevel;
 import org.lflang.target.property.type.PlatformType.Platform;
-import org.lflang.tests.TestRegistry.TestCategory;
 
 /**
  * Configuration procedures for {@link TestBase} methods.
@@ -117,27 +116,4 @@ public static boolean makeZephyrCompatible(TargetConfig config) {
   public static boolean noChanges(TargetConfig config) {
     return true;
   }
-
-  /** Given a test category, return true if it is compatible with single-threaded execution. */
-  public static boolean compatibleWithThreadingOff(TestCategory category) { // FIXME: move this
-
-    // CONCURRENT, FEDERATED, DOCKER_FEDERATED, DOCKER
-    // are not compatible with single-threaded execution.
-    // ARDUINO and ZEPHYR have their own test suites, so we don't need to rerun.
-    boolean excluded =
-        category == TestCategory.CONCURRENT
-            || category == TestCategory.SERIALIZATION
-            || category == TestCategory.FEDERATED
-            || category == TestCategory.DOCKER_FEDERATED
-            || category == TestCategory.DOCKER
-            || category == TestCategory.ARDUINO
-            || category == TestCategory.VERIFIER
-            || category == TestCategory.ZEPHYR_UNTHREADED
-            || category == TestCategory.ZEPHYR_BOARDS
-            || category == TestCategory.ZEPHYR_THREADED;
-
-    // SERIALIZATION and TARGET tests are excluded on Windows.
-    excluded |= TestBase.isWindows() && category == TestCategory.TARGET;
-    return !excluded;
-  }
 }

From 90eefebcd27fc0b087a4f5b7ebc2e8b851c6bfed Mon Sep 17 00:00:00 2001
From: Erling Rennemo Jellum <erling.r.jellum@ntnu.no>
Date: Tue, 31 Oct 2023 09:32:20 +0100
Subject: [PATCH 1094/1114] Zephyr tests: Do not touch the tracing parameter.
 Compile, but dont run the tests which include tracing or other file IO

---
 .github/scripts/run-zephyr-tests.sh                           | 4 ++--
 .../src/testFixtures/java/org/lflang/tests/Configurators.java | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/scripts/run-zephyr-tests.sh b/.github/scripts/run-zephyr-tests.sh
index f394ae9409..20dddda94c 100755
--- a/.github/scripts/run-zephyr-tests.sh
+++ b/.github/scripts/run-zephyr-tests.sh
@@ -8,8 +8,8 @@ num_successes=0
 num_failures=0
 failed_tests=""
 
-# Skip
-skip=("FileReader" "FilePkgReader" "Tracing" "ThreadedThreaded")
+# Skip tests doing file IO and tracing
+skip=("FileReader" "FilePkgReader" "Tracing" "ThreadedThreaded" "CountTest" "AsyncCallback")
 
 find_kconfig_folders() {
     if [ -f "$folder/CMakeLists.txt" ]; then
diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index ddad28eb21..554b284002 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -72,9 +72,8 @@ public static boolean disableThreading(TargetConfig config) {
   public static boolean makeZephyrCompatibleUnthreaded(TargetConfig config) {
 
     // NOTE: Zephyr emulations fails with debug log-levels.
+    disableThreading(config);
     LoggingProperty.INSTANCE.override(config, LogLevel.WARN);
-    TracingProperty.INSTANCE.override(config, TracingProperty.INSTANCE.initialValue());
-    ThreadingProperty.INSTANCE.override(config, false);
 
     var platform = config.get(PlatformProperty.INSTANCE);
     PlatformProperty.INSTANCE.override(
@@ -93,7 +92,6 @@ public static boolean makeZephyrCompatibleUnthreaded(TargetConfig config) {
   public static boolean makeZephyrCompatible(TargetConfig config) {
     // NOTE: Zephyr emulations fails with debug log-levels.
     LoggingProperty.INSTANCE.override(config, LogLevel.WARN);
-    TracingProperty.INSTANCE.override(config, TracingProperty.INSTANCE.initialValue());
 
     var platform = config.get(PlatformProperty.INSTANCE);
     PlatformProperty.INSTANCE.override(

From f69c7058003190452777bf84eb5acc57d7b4d53f Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 31 Oct 2023 10:11:09 -0700
Subject: [PATCH 1095/1114] Apply formatter

---
 core/src/testFixtures/java/org/lflang/tests/Configurators.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/Configurators.java b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
index 554b284002..5576f33dba 100644
--- a/core/src/testFixtures/java/org/lflang/tests/Configurators.java
+++ b/core/src/testFixtures/java/org/lflang/tests/Configurators.java
@@ -29,7 +29,6 @@
 import org.lflang.target.property.PlatformProperty;
 import org.lflang.target.property.PlatformProperty.PlatformOptions;
 import org.lflang.target.property.ThreadingProperty;
-import org.lflang.target.property.TracingProperty;
 import org.lflang.target.property.WorkersProperty;
 import org.lflang.target.property.type.LoggingType.LogLevel;
 import org.lflang.target.property.type.PlatformType.Platform;

From 8018f7f2744f4522878056fc6317548a6ef08b27 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 1 Nov 2023 12:16:00 -0700
Subject: [PATCH 1096/1114] Moved TargetProperty class and added validation for
 tracing target property along with a test

---
 .../org/lflang/generator/GeneratorBase.java   |  5 -----
 .../java/org/lflang/target/TargetConfig.java  |  6 ++----
 .../target/property/BooleanProperty.java      |  1 -
 .../property/BuildCommandsProperty.java       |  1 -
 .../target/property/BuildTypeProperty.java    |  1 -
 .../property/CargoDependenciesProperty.java   |  1 -
 .../property/ClockSyncModeProperty.java       |  1 -
 .../property/ClockSyncOptionsProperty.java    |  1 -
 .../property/CompileDefinitionsProperty.java  |  1 -
 .../property/CoordinationOptionsProperty.java |  1 -
 .../target/property/CoordinationProperty.java |  1 -
 .../target/property/DockerProperty.java       |  1 -
 .../target/property/FedSetupProperty.java     |  1 -
 .../target/property/FileListProperty.java     |  1 -
 .../target/property/LoggingProperty.java      |  1 -
 .../target/property/PlatformProperty.java     |  1 -
 .../property/Ros2DependenciesProperty.java    |  1 -
 .../target/property/RustIncludeProperty.java  |  1 -
 .../target/property/SchedulerProperty.java    |  1 -
 .../target/property/StringListProperty.java   |  1 -
 .../target/property/StringProperty.java       |  1 -
 .../{ => target/property}/TargetProperty.java |  3 ++-
 .../target/property/TimeOutProperty.java      |  1 -
 .../target/property/TracingProperty.java      |  9 ++++++++-
 .../target/property/WorkersProperty.java      |  1 -
 .../compiler/LinguaFrancaValidationTest.java  | 19 ++++++++++++++++++-
 26 files changed, 30 insertions(+), 33 deletions(-)
 rename core/src/main/java/org/lflang/{ => target/property}/TargetProperty.java (98%)

diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index e67397cffb..430b0a25d5 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -703,11 +703,6 @@ public void printInfo(LFGeneratorContext context) {
     messageReporter.nowhere().info(context.getTargetConfig().settings());
   }
 
-  /** Get the buffer type used for network messages */
-  public String getNetworkBufferType() {
-    return "";
-  }
-
   /** Return the Targets enum for the current target */
   public abstract Target getTarget();
 }
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 9b0f14817c..27d6d6c768 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -36,7 +36,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
@@ -48,8 +47,8 @@
 import org.lflang.target.property.FedSetupProperty;
 import org.lflang.target.property.LoggingProperty;
 import org.lflang.target.property.NoCompileProperty;
+import org.lflang.target.property.TargetProperty;
 import org.lflang.target.property.TimeOutProperty;
-import org.lflang.target.property.TracingProperty;
 import org.lflang.target.property.type.TargetPropertyType;
 import org.lflang.validation.ValidatorMessageReporter;
 
@@ -84,8 +83,7 @@ public TargetConfig(Target target) {
         FastProperty.INSTANCE,
         LoggingProperty.INSTANCE,
         NoCompileProperty.INSTANCE,
-        TimeOutProperty.INSTANCE,
-        TracingProperty.INSTANCE);
+        TimeOutProperty.INSTANCE);
   }
 
   public TargetConfig(TargetDecl target, GeneratorArguments args, MessageReporter messageReporter) {
diff --git a/core/src/main/java/org/lflang/target/property/BooleanProperty.java b/core/src/main/java/org/lflang/target/property/BooleanProperty.java
index adf1314480..ee12963a3a 100644
--- a/core/src/main/java/org/lflang/target/property/BooleanProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BooleanProperty.java
@@ -1,7 +1,6 @@
 package org.lflang.target.property;
 
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
diff --git a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
index 8d7df554a1..93a5e8f6e6 100644
--- a/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildCommandsProperty.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.UnionType;
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
index 6ed75f23e2..33f31c19f9 100644
--- a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
@@ -1,7 +1,6 @@
 package org.lflang.target.property;
 
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.Element;
diff --git a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
index d33d344b51..764ab70c11 100644
--- a/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CargoDependenciesProperty.java
@@ -3,7 +3,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.generator.rust.CargoDependencySpec;
 import org.lflang.generator.rust.CargoDependencySpec.CargoDependenciesPropertyType;
 import org.lflang.lf.Element;
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
index 526983a09c..115b781366 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
@@ -2,7 +2,6 @@
 
 import java.util.Objects;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
diff --git a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
index 4e87412ff4..b5d08eaedd 100644
--- a/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
@@ -1,7 +1,6 @@
 package org.lflang.target.property;
 
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.TimeUnit;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
diff --git a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
index f1b2d2c4ed..05bfd6d988 100644
--- a/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompileDefinitionsProperty.java
@@ -3,7 +3,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.TargetConfig;
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
index e8848ea933..9d0767ee31 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationOptionsProperty.java
@@ -2,7 +2,6 @@
 
 import java.util.Objects;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
diff --git a/core/src/main/java/org/lflang/target/property/CoordinationProperty.java b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
index ed57cbedef..6809aeb99d 100644
--- a/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CoordinationProperty.java
@@ -1,7 +1,6 @@
 package org.lflang.target.property;
 
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.CoordinationModeType;
diff --git a/core/src/main/java/org/lflang/target/property/DockerProperty.java b/core/src/main/java/org/lflang/target/property/DockerProperty.java
index 6e01b980eb..fc72cf245c 100644
--- a/core/src/main/java/org/lflang/target/property/DockerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/DockerProperty.java
@@ -2,7 +2,6 @@
 
 import java.util.Objects;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
diff --git a/core/src/main/java/org/lflang/target/property/FedSetupProperty.java b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
index f19594c2ec..d6bd3e517f 100644
--- a/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FedSetupProperty.java
@@ -1,7 +1,6 @@
 package org.lflang.target.property;
 
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
diff --git a/core/src/main/java/org/lflang/target/property/FileListProperty.java b/core/src/main/java/org/lflang/target/property/FileListProperty.java
index 0baaadec0c..3409fcde8f 100644
--- a/core/src/main/java/org/lflang/target/property/FileListProperty.java
+++ b/core/src/main/java/org/lflang/target/property/FileListProperty.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.TargetConfig;
diff --git a/core/src/main/java/org/lflang/target/property/LoggingProperty.java b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
index 1edd6799c0..c539b82734 100644
--- a/core/src/main/java/org/lflang/target/property/LoggingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
@@ -1,7 +1,6 @@
 package org.lflang.target.property;
 
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.Element;
diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
index 1a43ddd26c..98867d23e2 100644
--- a/core/src/main/java/org/lflang/target/property/PlatformProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -1,7 +1,6 @@
 package org.lflang.target.property;
 
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
diff --git a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
index 620970ec00..ec21d58027 100644
--- a/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
+++ b/core/src/main/java/org/lflang/target/property/Ros2DependenciesProperty.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
diff --git a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
index a2d9001e26..ee80e96409 100644
--- a/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RustIncludeProperty.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import org.eclipse.emf.ecore.EObject;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Array;
 import org.lflang.lf.Element;
diff --git a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
index 27c7c25cb3..8c92d73ff4 100644
--- a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
@@ -1,7 +1,6 @@
 package org.lflang.target.property;
 
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.Element;
diff --git a/core/src/main/java/org/lflang/target/property/StringListProperty.java b/core/src/main/java/org/lflang/target/property/StringListProperty.java
index 1a010e0ea8..7fe58820e7 100644
--- a/core/src/main/java/org/lflang/target/property/StringListProperty.java
+++ b/core/src/main/java/org/lflang/target/property/StringListProperty.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.TargetConfig;
diff --git a/core/src/main/java/org/lflang/target/property/StringProperty.java b/core/src/main/java/org/lflang/target/property/StringProperty.java
index a3536ffff4..1d80dc78e2 100644
--- a/core/src/main/java/org/lflang/target/property/StringProperty.java
+++ b/core/src/main/java/org/lflang/target/property/StringProperty.java
@@ -1,7 +1,6 @@
 package org.lflang.target.property;
 
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
diff --git a/core/src/main/java/org/lflang/TargetProperty.java b/core/src/main/java/org/lflang/target/property/TargetProperty.java
similarity index 98%
rename from core/src/main/java/org/lflang/TargetProperty.java
rename to core/src/main/java/org/lflang/target/property/TargetProperty.java
index 5fd4122794..41372dc6b8 100644
--- a/core/src/main/java/org/lflang/TargetProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TargetProperty.java
@@ -1,8 +1,9 @@
-package org.lflang;
+package org.lflang.target.property;
 
 import com.google.gson.JsonObject;
 import java.util.List;
 import java.util.Optional;
+import org.lflang.MessageReporter;
 import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
diff --git a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
index 1fb4071184..edb9818fb8 100644
--- a/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
@@ -1,7 +1,6 @@
 package org.lflang.target.property;
 
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.TimeValue;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.Element;
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index 5ccb9b5c86..3c35049c59 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -2,7 +2,6 @@
 
 import java.util.Objects;
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.Element;
@@ -11,6 +10,7 @@
 import org.lflang.lf.LfFactory;
 import org.lflang.lf.LfPackage.Literals;
 import org.lflang.lf.Model;
+import org.lflang.target.Target;
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.TracingProperty.TracingOptions;
 import org.lflang.target.property.type.DictionaryType;
@@ -73,6 +73,13 @@ public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
         }
       }
     }
+    if (ASTUtils.getTarget(ast).equals(Target.CPP) && pair.getValue().getKeyvalue() != null) {
+      reporter
+          .at(pair, Literals.KEY_VALUE_PAIR__VALUE)
+          .warning(
+              "The C++ target only supports 'true' or 'false' and ignores additional"
+                  + " configuration");
+    }
   }
 
   @Override
diff --git a/core/src/main/java/org/lflang/target/property/WorkersProperty.java b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
index 5f8c236279..b61fa21aaa 100644
--- a/core/src/main/java/org/lflang/target/property/WorkersProperty.java
+++ b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
@@ -1,7 +1,6 @@
 package org.lflang.target.property;
 
 import org.lflang.MessageReporter;
-import org.lflang.TargetProperty;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.Element;
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 89582b475d..169cfa3480 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -44,7 +44,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.lflang.TargetProperty;
 import org.lflang.TimeValue;
 import org.lflang.lf.LfPackage;
 import org.lflang.lf.Model;
@@ -53,6 +52,7 @@
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.CargoDependenciesProperty;
 import org.lflang.target.property.PlatformProperty;
+import org.lflang.target.property.TargetProperty;
 import org.lflang.target.property.type.ArrayType;
 import org.lflang.target.property.type.DictionaryType;
 import org.lflang.target.property.type.DictionaryType.DictionaryElement;
@@ -108,6 +108,23 @@ private Model parseWithError(String s) throws Exception {
     return model;
   }
 
+  /** Ensure that duplicate identifiers for actions reported. */
+  @Test
+  public void tracingOptionsCpp() throws Exception {
+    String testCase =
+        """
+                target Cpp{
+                  tracing: {trace-file-name: "Bar"}
+                };
+                main reactor {}
+            """;
+    validator.assertWarning(
+        parseWithoutError(testCase),
+        LfPackage.eINSTANCE.getKeyValuePair(),
+        null,
+        "The C++ target only supports 'true' or 'false'");
+  }
+
   /** Ensure that duplicate identifiers for actions reported. */
   @Test
   public void duplicateVariable() throws Exception {

From 06d575f672a28ad2f7da9ee05bd1d9e85721b4e6 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 1 Nov 2023 12:44:59 -0700
Subject: [PATCH 1097/1114] Point workflow back to Epoch master

---
 .github/workflows/build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f444bc02f8..da1990ca3f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,5 +36,4 @@ jobs:
     with:
       lingua-franca-ref: ${{ github.head_ref || github.ref_name }}
       lingua-franca-repo: ${{ github.event.pull_request.head.repo.full_name }}
-      epoch-ref: message-reporter
       upload-artifacts: false

From 12870248959f1aaed896475e9d3e2ea0ee2efeb2 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Wed, 1 Nov 2023 14:08:40 -0700
Subject: [PATCH 1098/1114] Address FIXME

---
 cli/lfc/src/main/java/org/lflang/cli/Lfc.java |  7 +++++
 .../lflang/generator/GeneratorArguments.java  |  3 ++-
 .../java/org/lflang/target/TargetConfig.java  | 26 +++++++++----------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
index fce3d08e23..b46cc1ea68 100644
--- a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
+++ b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
@@ -120,6 +120,12 @@ public class Lfc extends CliBase {
       description = "Specify whether the runtime should use multi-threading" + " (true/false).")
   private String threading;
 
+  @Option(
+      names = {"--tracing"},
+      arity = "0",
+      description = "Specify whether to enable run-time tracing (if supported).")
+  private boolean tracing;
+
   @Option(
       names = {"-w", "--workers"},
       description = "Specify the default number of worker threads.")
@@ -271,6 +277,7 @@ public GeneratorArguments getArgs() {
     }
 
     args.threading = Boolean.parseBoolean(threading);
+    args.tracing = tracing;
     args.verify = verify;
     args.workers = workers;
 
diff --git a/core/src/main/java/org/lflang/generator/GeneratorArguments.java b/core/src/main/java/org/lflang/generator/GeneratorArguments.java
index e57982b52d..cb6ef5d674 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorArguments.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorArguments.java
@@ -6,6 +6,7 @@
 import org.lflang.target.property.type.LoggingType.LogLevel;
 import org.lflang.target.property.type.SchedulerType.Scheduler;
 
+/** */
 public class GeneratorArguments {
 
   /**
@@ -81,7 +82,7 @@ public class GeneratorArguments {
   /**
    * @see org.lflang.target.property.SchedulerProperty
    */
-  public Boolean tracing; // FIXME add CLI arg for this
+  public Boolean tracing;
 
   /**
    * @see org.lflang.target.property.WorkersProperty
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 27d6d6c768..2609b4ca0a 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -205,20 +205,20 @@ public void load(GeneratorArguments args, MessageReporter err) {
    * @param err Error reporter on which property format errors will be reported
    */
   public void load(List<KeyValuePair> pairs, MessageReporter err) {
-    if (pairs == null) {
-      return;
+    if (pairs != null) {
+
+      pairs.forEach(
+          pair -> {
+            var p = forName(pair.getName());
+            if (p.isPresent()) {
+              var property = p.get();
+              property.update(this, pair.getValue(), err);
+            } else {
+              err.nowhere()
+                  .warning("Attempting to load unrecognized target property: " + pair.getName());
+            }
+          });
     }
-    pairs.forEach(
-        pair -> {
-          var p = forName(pair.getName());
-          if (p.isPresent()) {
-            var property = p.get();
-            property.update(this, pair.getValue(), err);
-          } else {
-            err.nowhere()
-                .warning("Attempting to load unrecognized target property: " + pair.getName());
-          }
-        });
   }
 
   public <T, S extends TargetPropertyType> void set(TargetProperty<T, S> property, T value) {

From 9603e4c97ace8eb25894b242c4f6520e05f4e934 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 2 Nov 2023 17:17:24 -0700
Subject: [PATCH 1099/1114] Revise GeneratorArguments and deal with JSON

---
 cli/lfc/src/main/java/org/lflang/cli/Lfc.java | 167 ++++++++++++++----
 .../test/java/org/lflang/cli/LfcCliTest.java  |  53 ++++--
 .../org/lflang/tests/runtime/PythonTest.java  |   9 +-
 .../serialization/SerializationTest.java      |   9 +-
 .../federated/generator/FedGenerator.java     |   8 +-
 .../lflang/generator/GeneratorArguments.java  | 117 ++++--------
 .../org/lflang/generator/GeneratorBase.java   |   4 +-
 .../lflang/generator/IntegratedBuilder.java   |   7 +-
 .../org/lflang/generator/MainContext.java     |   4 +-
 .../java/org/lflang/generator/Validator.java  |   2 +-
 .../org/lflang/generator/c/CGenerator.java    |   4 +-
 .../main/java/org/lflang/target/Target.java   |   3 +-
 .../java/org/lflang/target/TargetConfig.java  |  49 +++--
 .../target/property/BuildTypeProperty.java    |   6 -
 .../target/property/CompilerProperty.java     |   7 -
 .../property/ExternalRuntimePathProperty.java |  16 +-
 .../property/HierarchicalBinProperty.java     |   7 -
 .../target/property/LoggingProperty.java      |   6 -
 .../target/property/NoCompileProperty.java    |   7 -
 .../property/PrintStatisticsProperty.java     |   7 -
 .../property/RuntimeVersionProperty.java      |   7 -
 .../target/property/SchedulerProperty.java    |   6 -
 .../target/property/TargetProperty.java       |  30 ++--
 .../target/property/TracingProperty.java      |  13 +-
 .../target/property/VerifyProperty.java       |   6 -
 .../target/property/WorkersProperty.java      |   6 -
 .../org/lflang/generator/ts/TSGenerator.kt    |   3 +-
 .../compiler/LinguaFrancaValidationTest.java  |   3 +-
 .../java/org/lflang/tests/TestBase.java       |  70 +++++---
 29 files changed, 329 insertions(+), 307 deletions(-)

diff --git a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
index b46cc1ea68..c76516b002 100644
--- a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
+++ b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
@@ -1,21 +1,41 @@
 package org.lflang.cli;
 
 import com.google.inject.Inject;
+import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.GeneratorDelegate;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
 import org.eclipse.xtext.util.CancelIndicator;
 import org.lflang.FileConfig;
 import org.lflang.ast.ASTUtils;
+import org.lflang.generator.Argument;
 import org.lflang.generator.GeneratorArguments;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.MainContext;
+import org.lflang.target.property.BuildTypeProperty;
+import org.lflang.target.property.CompilerProperty;
+import org.lflang.target.property.HierarchicalBinProperty;
+import org.lflang.target.property.LoggingProperty;
+import org.lflang.target.property.NoCompileProperty;
+import org.lflang.target.property.PrintStatisticsProperty;
+import org.lflang.target.property.RuntimeVersionProperty;
+import org.lflang.target.property.SchedulerProperty;
+import org.lflang.target.property.ThreadingProperty;
+import org.lflang.target.property.TracingProperty;
+import org.lflang.target.property.TracingProperty.TracingOptions;
+import org.lflang.target.property.VerifyProperty;
+import org.lflang.target.property.WorkersProperty;
 import org.lflang.target.property.type.BuildTypeType;
+import org.lflang.target.property.type.BuildTypeType.BuildType;
 import org.lflang.target.property.type.LoggingType;
+import org.lflang.target.property.type.LoggingType.LogLevel;
 import org.lflang.target.property.type.SchedulerType;
+import org.lflang.target.property.type.SchedulerType.Scheduler;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 
@@ -65,38 +85,46 @@ public class Lfc extends CliBase {
       description = "Treat main reactor as federated.")
   private boolean federated;
 
-  @Option(names = "--logging", description = "The logging level to use by the generated binary")
+  @Option(
+      names = {"--hierarchical-bin"},
+      arity = "0",
+      description =
+          "Organize the generated binaries hierarchically, reflecting the structure of the source"
+              + " tree.")
+  private Boolean hierarchicalBin;
+
+  @Option(names = "--logging", description = "The logging level to use by the generated binary.")
   private String logging;
 
   @Option(
       names = {"-l", "--lint"},
       arity = "0",
       description = "Enable linting of generated code.")
-  private boolean lint;
+  private Boolean lint;
 
   @Option(
       names = {"-n", "--no-compile"},
       arity = "0",
       description = "Do not invoke target compiler.")
-  private boolean noCompile;
+  private Boolean noCompile;
 
   @Option(
       names = {"--verify"},
       arity = "0",
       description = "Run the generated verification models.")
-  private boolean verify;
+  private Boolean verify;
 
   @Option(
       names = {"--print-statistics"},
       arity = "0",
       description = "Instruct the runtime to collect and print statistics.")
-  private boolean printStatistics;
+  private Boolean printStatistics;
 
   @Option(
       names = {"-q", "--quiet"},
       arity = "0",
       description = "Suppress output of the target compiler and other commands")
-  private boolean quiet;
+  private Boolean quiet;
 
   @Option(
       names = {"-r", "--rti"},
@@ -124,7 +152,7 @@ public class Lfc extends CliBase {
       names = {"--tracing"},
       arity = "0",
       description = "Specify whether to enable run-time tracing (if supported).")
-  private boolean tracing;
+  private Boolean tracing;
 
   @Option(
       names = {"-w", "--workers"},
@@ -213,6 +241,7 @@ private void invokeGenerator(List<Path> files, Path root, GeneratorArguments arg
     }
   }
 
+  /** Return a resolved path that designates where to write files to. */
   private Path getActualOutputPath(Path root, Path path) {
     if (root != null) {
       return root.resolve("src-gen");
@@ -222,65 +251,127 @@ private Path getActualOutputPath(Path root, Path path) {
     }
   }
 
-  /** Check the values of the commandline arguments and return them. */
-  public GeneratorArguments getArgs() {
-    var args = new GeneratorArguments();
+  /**
+   * Return a build type if one has been specified via the CLI arguments, or {@code null} otherwise.
+   */
+  private BuildType getBuildType() {
+    BuildType resolved = null;
     if (buildType != null) {
       // Validate build type.
-      var resolved = new BuildTypeType().forName(buildType);
+      resolved = new BuildTypeType().forName(buildType);
       if (resolved == null) {
         reporter.printFatalErrorAndExit(buildType + ": Invalid build type.");
       }
-      args.buildType = resolved;
-    }
-
-    args.clean = clean;
-    args.compiler = targetCompiler;
-    if (externalRuntimePath != null) {
-      args.externalRuntimeUri = externalRuntimePath.toUri();
     }
+    return resolved;
+  }
 
-    args.jsonObject = getJsonObject();
-
-    args.lint = lint;
-
+  /**
+   * Return a log level if one has been specified via the CLI arguments, or {@code null} otherwise.
+   */
+  private LogLevel getLogging() {
+    LogLevel resolved = null;
     if (logging != null) {
       // Validate log level.
-      var resolved = new LoggingType().forName(logging);
+      resolved = new LoggingType().forName(logging);
       if (resolved == null) {
         reporter.printFatalErrorAndExit(logging + ": Invalid log level.");
       }
-      args.logging = resolved;
     }
+    return resolved;
+  }
 
-    args.noCompile = noCompile;
-    args.printStatistics = printStatistics;
-    args.quiet = quiet;
-
+  /**
+   * Return a URI that points to the RTI if one has been specified via the CLI arguments, or {@code
+   * null} otherwise.
+   */
+  private URI getRtiUri() {
+    URI uri = null;
     if (rti != null) {
       // Validate RTI path.
       if (!Files.exists(io.getWd().resolve(rti))) {
         reporter.printFatalErrorAndExit(rti + ": Invalid RTI path.");
       }
-      args.rti = rti.toUri();
+      uri = rti.toUri();
     }
+    return uri;
+  }
 
-    args.runtimeVersion = runtimeVersion;
-
+  /** Return a scheduler one has been specified via the CLI arguments, or {@code null} otherwise. */
+  private Scheduler getScheduler() {
+    Scheduler resolved = null;
     if (scheduler != null) {
       // Validate scheduler.
-      var resolved = new SchedulerType().forName(scheduler);
+      resolved = new SchedulerType().forName(scheduler);
       if (resolved == null) {
         reporter.printFatalErrorAndExit(scheduler + ": Invalid scheduler.");
       }
-      args.scheduler = resolved;
     }
+    return resolved;
+  }
 
-    args.threading = Boolean.parseBoolean(threading);
-    args.tracing = tracing;
-    args.verify = verify;
-    args.workers = workers;
+  /**
+   * Return a URI that points to an external runtime if one has been specified via the CLI
+   * arguments, or {@code null} otherwise.
+   */
+  private URI getExternalRuntimeUri() {
+    URI externalRuntimeUri = null;
+    if (externalRuntimePath != null) {
+      externalRuntimeUri = externalRuntimePath.toUri();
+    }
+    return externalRuntimeUri;
+  }
+
+  /**
+   * Return tracing options if tracing has been explicitly disabled or enabled via the CLI
+   * arguments, or {@code null} otherwise.
+   */
+  private TracingOptions getTracingOptions() {
+    if (tracing != null) {
+      return new TracingOptions(tracing);
+    } else {
+      return null;
+    }
+  }
+
+  /** Return whether threading has been enabled via the CLI arguments, or {@code null} otherwise. */
+  private Boolean getThreading() {
+    if (threading != null) {
+      return Boolean.parseBoolean(threading);
+    } else {
+      return null;
+    }
+  }
+
+  /** Check the values of the commandline arguments and return them. */
+  public GeneratorArguments getArgs() {
+
+    List<Argument<?>> args = new ArrayList<>();
+
+    if (buildType != null) {
+      args.add(new Argument<>(BuildTypeProperty.INSTANCE, getBuildType()));
+    }
 
-    return args;
+    return new GeneratorArguments(
+        Objects.requireNonNullElse(clean, false),
+        getExternalRuntimeUri(),
+        Objects.requireNonNullElse(hierarchicalBin, false),
+        getJsonObject(),
+        Objects.requireNonNullElse(lint, false),
+        Objects.requireNonNullElse(quiet, false),
+        getRtiUri(),
+        List.of(
+            new Argument<>(BuildTypeProperty.INSTANCE, getBuildType()),
+            new Argument<>(CompilerProperty.INSTANCE, targetCompiler),
+            new Argument<>(HierarchicalBinProperty.INSTANCE, hierarchicalBin),
+            new Argument<>(LoggingProperty.INSTANCE, getLogging()),
+            new Argument<>(PrintStatisticsProperty.INSTANCE, printStatistics),
+            new Argument<>(NoCompileProperty.INSTANCE, noCompile),
+            new Argument<>(VerifyProperty.INSTANCE, verify),
+            new Argument<>(RuntimeVersionProperty.INSTANCE, runtimeVersion),
+            new Argument<>(SchedulerProperty.INSTANCE, getScheduler()),
+            new Argument<>(ThreadingProperty.INSTANCE, getThreading()),
+            new Argument<>(TracingProperty.INSTANCE, getTracingOptions()),
+            new Argument<>(WorkersProperty.INSTANCE, workers)));
   }
 }
diff --git a/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java b/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java
index 2c796d3434..ef7a7676c8 100644
--- a/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java
+++ b/cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java
@@ -42,6 +42,17 @@
 import org.junit.jupiter.api.io.TempDir;
 import org.lflang.LocalStrings;
 import org.lflang.cli.TestUtils.TempDirBuilder;
+import org.lflang.generator.GeneratorArguments;
+import org.lflang.target.property.BuildTypeProperty;
+import org.lflang.target.property.CompilerProperty;
+import org.lflang.target.property.LoggingProperty;
+import org.lflang.target.property.NoCompileProperty;
+import org.lflang.target.property.PrintStatisticsProperty;
+import org.lflang.target.property.RuntimeVersionProperty;
+import org.lflang.target.property.SchedulerProperty;
+import org.lflang.target.property.TargetProperty;
+import org.lflang.target.property.ThreadingProperty;
+import org.lflang.target.property.WorkersProperty;
 import org.lflang.target.property.type.BuildTypeType.BuildType;
 import org.lflang.target.property.type.LoggingType.LogLevel;
 import org.lflang.target.property.type.SchedulerType.Scheduler;
@@ -247,25 +258,37 @@ public void verifyGeneratorArgs(Path tempDir, String[] args) {
             result -> {
               // Don't validate execution because args are dummy args.
               var genArgs = fixture.lfc.getArgs();
-              assertEquals(BuildType.RELEASE, genArgs.buildType);
-              assertEquals(true, genArgs.clean);
-              assertEquals("gcc", genArgs.compiler);
-              assertEquals("src", Path.of(genArgs.externalRuntimeUri).getFileName().toString());
-              assertEquals(LogLevel.INFO, genArgs.logging);
-              assertEquals(true, genArgs.lint);
-              assertEquals(true, genArgs.noCompile);
-              assertEquals(true, genArgs.printStatistics);
-              assertEquals(true, genArgs.quiet);
+              checkOverrideValue(genArgs, BuildTypeProperty.INSTANCE, BuildType.RELEASE);
+              checkOverrideValue(genArgs, CompilerProperty.INSTANCE, "gcc");
+              checkOverrideValue(genArgs, LoggingProperty.INSTANCE, LogLevel.INFO);
+              checkOverrideValue(genArgs, NoCompileProperty.INSTANCE, true);
+              checkOverrideValue(genArgs, PrintStatisticsProperty.INSTANCE, true);
+              checkOverrideValue(genArgs, RuntimeVersionProperty.INSTANCE, "rs");
+              checkOverrideValue(genArgs, SchedulerProperty.INSTANCE, Scheduler.GEDF_NP);
+              checkOverrideValue(genArgs, ThreadingProperty.INSTANCE, false);
+              checkOverrideValue(genArgs, WorkersProperty.INSTANCE, 1);
+
+              assertEquals(true, genArgs.clean());
+              assertEquals("src", Path.of(genArgs.externalRuntimeUri()).getFileName().toString());
+              assertEquals(true, genArgs.lint());
+              assertEquals(true, genArgs.quiet());
               assertEquals(
                   Path.of("path", "to", "rti"),
-                  Path.of(new File("").getAbsolutePath()).relativize(Paths.get(genArgs.rti)));
-              assertEquals("rs", genArgs.runtimeVersion);
-              assertEquals(Scheduler.GEDF_NP, genArgs.scheduler);
-              assertEquals(false, genArgs.threading);
-              assertEquals(1, genArgs.workers);
+                  Path.of(new File("").getAbsolutePath()).relativize(Paths.get(genArgs.rti())));
             });
   }
 
+  private void checkOverrideValue(
+      GeneratorArguments args, TargetProperty<?, ?> property, Object expected) {
+    var value =
+        args.overrides().stream()
+            .filter(a -> a.property().equals(property))
+            .findFirst()
+            .get()
+            .value();
+    assertEquals(expected, value);
+  }
+
   public void verifyJsonGeneratorArgs(Path tempDir, String[] args) {
     LfcOneShotTestFixture fixture = new LfcOneShotTestFixture();
 
@@ -276,7 +299,7 @@ public void verifyJsonGeneratorArgs(Path tempDir, String[] args) {
               // Don't validate execution because args are dummy args.
               var genArgs = fixture.lfc.getArgs();
               assertEquals(
-                  JsonParser.parseString(JSON_STRING).getAsJsonObject(), genArgs.jsonObject);
+                  JsonParser.parseString(JSON_STRING).getAsJsonObject(), genArgs.jsonObject());
             });
   }
 
diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
index c760deb563..5880a30f46 100644
--- a/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
@@ -27,8 +27,9 @@
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.lflang.generator.GeneratorArguments;
 import org.lflang.target.Target;
+import org.lflang.target.TargetConfig;
+import org.lflang.target.property.BuildTypeProperty;
 import org.lflang.target.property.type.BuildTypeType.BuildType;
 import org.lflang.tests.RuntimeTest;
 
@@ -48,12 +49,12 @@ public PythonTest() {
   }
 
   @Override
-  protected void addExtraLfcArgs(GeneratorArguments args) {
-    super.addExtraLfcArgs(args);
+  protected void applyDefaultConfiguration(TargetConfig config) {
+    super.applyDefaultConfiguration(config);
     if (System.getProperty("os.name").startsWith("Windows")) {
       // Use the RelWithDebInfo build type on Windows as the Debug/Test build type produces linker
       // Errors in CI
-      args.buildType = BuildType.REL_WITH_DEB_INFO;
+      BuildTypeProperty.INSTANCE.override(config, BuildType.REL_WITH_DEB_INFO);
     }
   }
 
diff --git a/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java b/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
index ac33289ebd..735441dba6 100644
--- a/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
+++ b/core/src/integrationTest/java/org/lflang/tests/serialization/SerializationTest.java
@@ -2,8 +2,9 @@
 
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
-import org.lflang.generator.GeneratorArguments;
 import org.lflang.target.Target;
+import org.lflang.target.TargetConfig;
+import org.lflang.target.property.BuildTypeProperty;
 import org.lflang.target.property.type.BuildTypeType.BuildType;
 import org.lflang.tests.Configurators;
 import org.lflang.tests.TestBase;
@@ -17,10 +18,10 @@ protected SerializationTest() {
   }
 
   @Override
-  protected void addExtraLfcArgs(GeneratorArguments args) {
-    super.addExtraLfcArgs(args);
+  protected void applyDefaultConfiguration(TargetConfig config) {
+    super.applyDefaultConfiguration(config);
     // Use the Debug build type as coverage generation does not work for the serialization tests
-    args.buildType = BuildType.DEBUG;
+    BuildTypeProperty.INSTANCE.override(config, BuildType.DEBUG);
   }
 
   @Test
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index 9a28233b58..e070c68c8d 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -224,7 +224,7 @@ private void createDockerFiles(LFGeneratorContext context, List<SubContext> subC
    * @param context Context in which the generator operates
    */
   private void cleanIfNeeded(LFGeneratorContext context) {
-    if (context.getArgs().clean) {
+    if (context.getArgs().clean()) {
       try {
         fileConfig.doClean();
       } catch (IOException e) {
@@ -292,7 +292,7 @@ private Map<Path, CodeMap> compileFederates(
             TargetConfig subConfig =
                 new TargetConfig(
                     GeneratorUtils.findTargetDecl(subFileConfig.resource),
-                    new GeneratorArguments(),
+                    GeneratorArguments.none(),
                     subContextMessageReporter);
             if (targetConfig.get(DockerProperty.INSTANCE).enabled
                 && targetConfig.target.buildsUsingDocker()) {
@@ -358,7 +358,7 @@ public TargetConfig getTargetConfig() {
    * @param context Context of the build process.
    */
   private void processCLIArguments(LFGeneratorContext context) {
-    if (context.getArgs().rti != null) {
+    if (context.getArgs().rti() != null) {
       setFederationRTIProperties(context);
     }
   }
@@ -369,7 +369,7 @@ private void processCLIArguments(LFGeneratorContext context) {
    * @param context Context of the build process.
    */
   private void setFederationRTIProperties(LFGeneratorContext context) {
-    URI rtiAddr = context.getArgs().rti;
+    URI rtiAddr = context.getArgs().rti();
     var host = rtiAddr.getHost();
     var port = rtiAddr.getPort();
     var user = rtiAddr.getUserInfo();
diff --git a/core/src/main/java/org/lflang/generator/GeneratorArguments.java b/core/src/main/java/org/lflang/generator/GeneratorArguments.java
index cb6ef5d674..8600804485 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorArguments.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorArguments.java
@@ -2,90 +2,35 @@
 
 import com.google.gson.JsonObject;
 import java.net.URI;
-import org.lflang.target.property.type.BuildTypeType.BuildType;
-import org.lflang.target.property.type.LoggingType.LogLevel;
-import org.lflang.target.property.type.SchedulerType.Scheduler;
-
-/** */
-public class GeneratorArguments {
-
-  /**
-   * @see org.lflang.target.property.BuildTypeProperty
-   */
-  public BuildType buildType;
-
-  /** Whether to clean before building. */
-  public boolean clean;
-
-  /**
-   * @see org.lflang.target.property.ExternalRuntimePathProperty
-   */
-  public URI externalRuntimeUri;
-
-  /**
-   * @see org.lflang.target.property.HierarchicalBinProperty
-   */
-  public Boolean hierarchicalBin;
-
-  /** Generator arguments and target properties, if they were passed to the application. */
-  public JsonObject jsonObject;
-
-  /** For enabling or disabling the linting of generated code */
-  public boolean lint;
-
-  /**
-   * @see org.lflang.target.property.LoggingProperty
-   */
-  public LogLevel logging;
-
-  /**
-   * @see org.lflang.target.property.PrintStatisticsProperty
-   */
-  public Boolean printStatistics;
-
-  /**
-   * @see org.lflang.target.property.NoCompileProperty
-   */
-  public Boolean noCompile;
-
-  /**
-   * @see org.lflang.target.property.VerifyProperty
-   */
-  public Boolean verify;
-
-  /**
-   * @see org.lflang.target.property.CompilerProperty
-   */
-  public String compiler;
-
-  /** Whether to suppress output of the target compiler and other commands. */
-  public boolean quiet;
-
-  /** The location of the rti. */
-  public URI rti;
-
-  /**
-   * @see org.lflang.target.property.RuntimeVersionProperty
-   */
-  public String runtimeVersion;
-
-  /**
-   * @see org.lflang.target.property.SchedulerProperty
-   */
-  public Scheduler scheduler;
-
-  /**
-   * @see org.lflang.target.property.SchedulerProperty
-   */
-  public Boolean threading;
-
-  /**
-   * @see org.lflang.target.property.SchedulerProperty
-   */
-  public Boolean tracing;
-
-  /**
-   * @see org.lflang.target.property.WorkersProperty
-   */
-  public Integer workers;
+import java.util.List;
+
+/**
+ * Arguments to be passed from the command-line interface to the code generators.
+ *
+ * <p>
+ *
+ * @param clean Whether to clean before building.
+ * @param externalRuntimeUri FIXME: change type of
+ *     org.lflang.target.property.ExternalRuntimePathProperty to URI
+ * @param jsonObject Generator arguments and target properties in JSON format.
+ * @param lint For enabling or disabling the linting of generated code.
+ * @param quiet Whether to suppress output of the target compiler and other commands.
+ * @param rti The location of the rti.
+ * @param overrides List of arguments that are meant to override target properties
+ * @author Marten Lohstroh
+ */
+public record GeneratorArguments(
+    boolean clean,
+    URI externalRuntimeUri,
+    boolean hierarchicalBin,
+    JsonObject jsonObject,
+    boolean lint,
+    boolean quiet,
+    URI rti,
+    List<Argument<?>> overrides) {
+
+  /** Return a record with none of the arguments set. */
+  public static GeneratorArguments none() {
+    return new GeneratorArguments(false, null, false, null, false, false, null, List.of());
+  }
 }
diff --git a/core/src/main/java/org/lflang/generator/GeneratorBase.java b/core/src/main/java/org/lflang/generator/GeneratorBase.java
index 430b0a25d5..c1851ec361 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorBase.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorBase.java
@@ -194,7 +194,7 @@ public void doGenerate(Resource resource, LFGeneratorContext context) {
     // Configure the command factory
     commandFactory.setVerbose();
     if (Objects.equal(context.getMode(), LFGeneratorContext.Mode.STANDALONE)
-        && context.getArgs().quiet) {
+        && context.getArgs().quiet()) {
       commandFactory.setQuiet();
     }
 
@@ -616,7 +616,7 @@ public void reportCommandErrors(String stderr) {
 
   /** Check if a clean was requested from the standalone compiler and perform the clean step. */
   protected void cleanIfNeeded(LFGeneratorContext context) {
-    if (context.getArgs().clean) {
+    if (context.getArgs().clean()) {
       try {
         context.getFileConfig().doClean();
       } catch (IOException e) {
diff --git a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
index d0c3cbea74..1e88a15817 100644
--- a/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
+++ b/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
@@ -109,7 +109,7 @@ private GeneratorResult doGenerate(
             mustComplete ? Mode.LSP_SLOW : LFGeneratorContext.Mode.LSP_MEDIUM,
             cancelIndicator,
             reportProgress,
-            new GeneratorArguments(),
+            getArgs(),
             resource,
             fileAccess,
             fileConfig -> new LanguageServerMessageReporter(resource.getContents().get(0)));
@@ -135,4 +135,9 @@ static DiagnosticSeverity convertSeverity(Severity severity) {
       case IGNORE -> DiagnosticSeverity.Hint;
     };
   }
+
+  /** Return arguments to feed to the code generator. Currently, no arguments are being set. */
+  protected GeneratorArguments getArgs() {
+    return GeneratorArguments.none();
+  }
 }
diff --git a/core/src/main/java/org/lflang/generator/MainContext.java b/core/src/main/java/org/lflang/generator/MainContext.java
index e2696142da..b3455b37e2 100644
--- a/core/src/main/java/org/lflang/generator/MainContext.java
+++ b/core/src/main/java/org/lflang/generator/MainContext.java
@@ -56,7 +56,7 @@ public MainContext(
         mode,
         cancelIndicator,
         (message, completion) -> {},
-        new GeneratorArguments(),
+        GeneratorArguments.none(),
         resource,
         fsa,
         (mode == Mode.EPOCH && EPOCH_ERROR_REPORTER_CONSTRUCTOR != null)
@@ -97,7 +97,7 @@ public MainContext(
               LFGenerator.createFileConfig(
                   resource,
                   FileConfig.getSrcGenRoot(fsa),
-                  Objects.requireNonNullElse(args.hierarchicalBin, false)));
+                  Objects.requireNonNullElse(args.hierarchicalBin(), false)));
     } catch (IOException e) {
       throw new RuntimeIOException("Error during FileConfig instantiation", e);
     }
diff --git a/core/src/main/java/org/lflang/generator/Validator.java b/core/src/main/java/org/lflang/generator/Validator.java
index 468d1a8a87..955b37599a 100644
--- a/core/src/main/java/org/lflang/generator/Validator.java
+++ b/core/src/main/java/org/lflang/generator/Validator.java
@@ -91,7 +91,7 @@ public final void doValidate(LFGeneratorContext context)
    * @param context The context of the current build.
    */
   private boolean validationEnabled(LFGeneratorContext context) {
-    return context.getArgs().lint || validationEnabledByDefault(context);
+    return context.getArgs().lint() || validationEnabledByDefault(context);
   }
 
   /**
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index acb3fbabe5..1c277f5d29 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -913,8 +913,8 @@ protected void copyTargetFiles() throws IOException {
     }
 
     // Copy the core lib
-    if (context.getArgs().externalRuntimeUri != null) {
-      Path coreLib = Paths.get(context.getArgs().externalRuntimeUri);
+    if (context.getArgs().externalRuntimeUri() != null) {
+      Path coreLib = Paths.get(context.getArgs().externalRuntimeUri());
       FileUtil.copyDirectoryContents(coreLib, dest, true);
     } else {
       FileUtil.copyFromClassPath("/lib/c/reactor-c/core", dest, true, false);
diff --git a/core/src/main/java/org/lflang/target/Target.java b/core/src/main/java/org/lflang/target/Target.java
index 36685236fa..98fd3179d2 100644
--- a/core/src/main/java/org/lflang/target/Target.java
+++ b/core/src/main/java/org/lflang/target/Target.java
@@ -657,7 +657,8 @@ public void initialize(TargetConfig config) {
           CoordinationProperty.INSTANCE,
           DockerProperty.INSTANCE,
           KeepaliveProperty.INSTANCE,
-          ProtobufsProperty.INSTANCE);
+          ProtobufsProperty.INSTANCE,
+          RuntimeVersionProperty.INSTANCE);
     }
   }
 }
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 2609b4ca0a..671c6b8955 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -24,6 +24,7 @@
  ***************/
 package org.lflang.target;
 
+import com.google.gson.JsonObject;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -112,10 +113,36 @@ public TargetConfig(
       this.load(pairs, messageReporter);
     }
 
+    // Load properties from Json
+    load(args.jsonObject(), messageReporter);
+
     // Load properties from CLI args
     load(args, messageReporter);
   }
 
+  private void load(JsonObject jsonObject, MessageReporter messageReporter) {
+    if (jsonObject != null && jsonObject.has("properties")) {
+      var map = jsonObject.getAsJsonObject("properties").asMap();
+      map.keySet()
+          .forEach(
+              name -> {
+                var property = this.forName(name);
+                if (property.isPresent()) {
+                  property.get().update(this, map.get(name), messageReporter);
+                } else {
+                  reportUnsupportedTargetProperty(name, messageReporter.nowhere());
+                }
+              });
+    }
+  }
+
+  public void reportUnsupportedTargetProperty(String name, MessageReporter.Stage2 stage2) {
+    stage2.warning(
+        String.format(
+            "The target property '%s' is not supported by the %s target and is thus ignored.",
+            name, this.target));
+  }
+
   /** Additional sources to add to the compile command if appropriate. */
   public final List<String> compileAdditionalSources = new ArrayList<>();
 
@@ -189,13 +216,14 @@ public String listOfRegisteredProperties() {
         .findFirst();
   }
 
+  /**
+   * Load overrides passed in as CLI arguments.
+   *
+   * @param args List of overrides that may or may not be set
+   * @param err Message reporter to report attempts to set unsupported target properties.
+   */
   public void load(GeneratorArguments args, MessageReporter err) {
-    this.properties
-        .keySet()
-        .forEach(
-            p -> {
-              p.update(this, args, err);
-            });
+    args.overrides().stream().forEach(a -> a.update(this, err));
   }
 
   /**
@@ -303,13 +331,8 @@ public void validate(KeyValuePairs pairs, Model ast, ValidatorMessageReporter re
                 p.checkType(pair, reporter);
                 p.validate(pair, ast, reporter);
               } else {
-                reporter
-                    .at(pair, Literals.KEY_VALUE_PAIR__NAME)
-                    .warning(
-                        String.format(
-                            "The target property '%s' is not supported by the %s target and will"
-                                + " thus be ignored.",
-                            pair.getName(), this.target));
+                reportUnsupportedTargetProperty(
+                    pair.getName(), reporter.at(pair, Literals.KEY_VALUE_PAIR__NAME));
                 reporter
                     .at(pair, Literals.KEY_VALUE_PAIR__NAME)
                     .info("Recognized properties are: " + this.listOfRegisteredProperties());
diff --git a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
index 33f31c19f9..1de0363246 100644
--- a/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
+++ b/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
@@ -2,7 +2,6 @@
 
 import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
-import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.BuildTypeType;
 import org.lflang.target.property.type.BuildTypeType.BuildType;
@@ -44,9 +43,4 @@ protected BuildType fromString(String string, MessageReporter reporter) {
   public String name() {
     return "build-type";
   }
-
-  @Override
-  public BuildType value(GeneratorArguments args) {
-    return args.buildType;
-  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/CompilerProperty.java b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
index efff3c23f0..f1ed1f2ebf 100644
--- a/core/src/main/java/org/lflang/target/property/CompilerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/CompilerProperty.java
@@ -1,7 +1,5 @@
 package org.lflang.target.property;
 
-import org.lflang.generator.GeneratorArguments;
-
 /** The compiler to invoke, unless a build command has been specified. */
 public final class CompilerProperty extends StringProperty {
 
@@ -16,9 +14,4 @@ private CompilerProperty() {
   public String name() {
     return "compiler";
   }
-
-  @Override
-  public String value(GeneratorArguments args) {
-    return args.compiler;
-  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
index 04a98e0098..14ee05b18f 100644
--- a/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
+++ b/core/src/main/java/org/lflang/target/property/ExternalRuntimePathProperty.java
@@ -1,8 +1,5 @@
 package org.lflang.target.property;
 
-import java.nio.file.Paths;
-import org.lflang.generator.GeneratorArguments;
-
 /**
  * Directive for specifying a path to an external runtime libray to link to instead of the default
  * one.
@@ -21,11 +18,10 @@ public String name() {
     return "external-runtime-path";
   }
 
-  @Override
-  public String value(GeneratorArguments args) {
-    if (args.externalRuntimeUri != null) {
-      return Paths.get(args.externalRuntimeUri).toString();
-    }
-    return null;
-  }
+  //  public String value(GeneratorArguments args) {
+  //    if (args.externalRuntimeUri() != null) {
+  //      return Paths.get(args.externalRuntimeUri()).toString();
+  //    }
+  //    return null;
+  //  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java b/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
index c18c398c7c..dbd3a1ed6f 100644
--- a/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
+++ b/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
@@ -1,7 +1,5 @@
 package org.lflang.target.property;
 
-import org.lflang.generator.GeneratorArguments;
-
 /**
  * Whether the bin directory should have a flat or hierarchical organization. It is flat by default.
  */
@@ -18,9 +16,4 @@ private HierarchicalBinProperty() {
   public String name() {
     return "hierarchical-bin";
   }
-
-  @Override
-  public Boolean value(GeneratorArguments args) {
-    return args.hierarchicalBin;
-  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/LoggingProperty.java b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
index c539b82734..f47a7d7f6e 100644
--- a/core/src/main/java/org/lflang/target/property/LoggingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/LoggingProperty.java
@@ -2,7 +2,6 @@
 
 import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
-import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.LoggingType;
 import org.lflang.target.property.type.LoggingType.LogLevel;
@@ -43,9 +42,4 @@ public Element toAstElement(LogLevel value) {
   public String name() {
     return "logging";
   }
-
-  @Override
-  public LogLevel value(GeneratorArguments args) {
-    return args.logging;
-  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
index 862aea76a2..906899ca92 100644
--- a/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
+++ b/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
@@ -1,7 +1,5 @@
 package org.lflang.target.property;
 
-import org.lflang.generator.GeneratorArguments;
-
 /** If true, do not invoke the target compiler or build command. The default is false. */
 public final class NoCompileProperty extends BooleanProperty {
 
@@ -16,9 +14,4 @@ private NoCompileProperty() {
   public String name() {
     return "no-compile";
   }
-
-  @Override
-  public Boolean value(GeneratorArguments args) {
-    return args.noCompile;
-  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
index 682c49e61f..a193e25417 100644
--- a/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
+++ b/core/src/main/java/org/lflang/target/property/PrintStatisticsProperty.java
@@ -1,7 +1,5 @@
 package org.lflang.target.property;
 
-import org.lflang.generator.GeneratorArguments;
-
 /** If true, instruct the runtime to collect and print execution statistics. */
 public final class PrintStatisticsProperty extends BooleanProperty {
 
@@ -16,9 +14,4 @@ private PrintStatisticsProperty() {
   public String name() {
     return "print-statistics";
   }
-
-  @Override
-  public Boolean value(GeneratorArguments args) {
-    return args.printStatistics;
-  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
index 320bdb7a5f..be82a06848 100644
--- a/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
+++ b/core/src/main/java/org/lflang/target/property/RuntimeVersionProperty.java
@@ -1,7 +1,5 @@
 package org.lflang.target.property;
 
-import org.lflang.generator.GeneratorArguments;
-
 /** Directive for specifying a specific version of the reactor runtime library. */
 public final class RuntimeVersionProperty extends StringProperty {
 
@@ -16,9 +14,4 @@ private RuntimeVersionProperty() {
   public String name() {
     return "runtime-version";
   }
-
-  @Override
-  public String value(GeneratorArguments args) {
-    return args.runtimeVersion;
-  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
index 8c92d73ff4..52bc48cc0b 100644
--- a/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
+++ b/core/src/main/java/org/lflang/target/property/SchedulerProperty.java
@@ -2,7 +2,6 @@
 
 import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
-import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
@@ -82,9 +81,4 @@ public void validate(KeyValuePair pair, Model ast, MessageReporter reporter) {
       }
     }
   }
-
-  @Override
-  public Scheduler value(GeneratorArguments args) {
-    return args.scheduler;
-  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/TargetProperty.java b/core/src/main/java/org/lflang/target/property/TargetProperty.java
index 41372dc6b8..556de91e63 100644
--- a/core/src/main/java/org/lflang/target/property/TargetProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TargetProperty.java
@@ -1,10 +1,9 @@
 package org.lflang.target.property;
 
-import com.google.gson.JsonObject;
+import com.google.gson.JsonElement;
 import java.util.List;
 import java.util.Optional;
 import org.lflang.MessageReporter;
-import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.LfPackage.Literals;
@@ -13,7 +12,7 @@
 import org.lflang.target.property.type.TargetPropertyType;
 
 /**
- * A abstract base class for target properties.
+ * An abstract base class for target properties.
  *
  * @param <T> The data type of the value assigned to the target property.
  * @author Marten Lohstroh
@@ -115,15 +114,6 @@ public final void override(TargetConfig config, T value) {
     config.set(this, value);
   }
 
-  public void update(TargetConfig config, GeneratorArguments args, MessageReporter reporter) {
-    var value = value(args);
-    if (value != null) {
-      update(config, value);
-    } else if (args.jsonObject != null) {
-      update(config, fromJSON(args.jsonObject, reporter));
-    }
-  }
-
   /**
    * Update the given configuration using the given value. The default implementation simply assigns
    * the given value, overriding whatever value might have been assigned before.
@@ -146,6 +136,10 @@ public final void update(TargetConfig config, Element node, MessageReporter repo
     this.update(config, fromAst(node, reporter));
   }
 
+  public final void update(TargetConfig config, JsonElement element, MessageReporter reporter) {
+    this.update(config, fromJSON(element, reporter));
+  }
+
   /**
    * Update the given configuration based on the given corresponding AST node.
    *
@@ -172,10 +166,12 @@ public int hashCode() {
     return this.getClass().getName().hashCode();
   }
 
-  protected T fromJSON(JsonObject jsonObject, MessageReporter reporter) {
+  protected T fromJSON(JsonElement element, MessageReporter reporter) {
     T value = null;
-    if (jsonObject.has(name())) {
-      value = this.fromString(jsonObject.get(name()).getAsString(), reporter);
+    if (element.isJsonPrimitive()) {
+      value = this.fromString(element.getAsString(), reporter);
+    } else {
+      reporter.nowhere().error("Encountered non-primitive JSON element; no method for handling it");
     }
     return value;
   }
@@ -196,8 +192,4 @@ public static KeyValuePair getKeyValuePair(Model ast, TargetProperty<?, ?> prope
     assert properties.size() <= 1;
     return properties.size() > 0 ? properties.get(0) : null;
   }
-
-  public T value(GeneratorArguments args) {
-    return null;
-  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/TracingProperty.java b/core/src/main/java/org/lflang/target/property/TracingProperty.java
index 3c35049c59..a403c906a9 100644
--- a/core/src/main/java/org/lflang/target/property/TracingProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TracingProperty.java
@@ -3,7 +3,6 @@
 import java.util.Objects;
 import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
-import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.Element;
 import org.lflang.lf.KeyValuePair;
 import org.lflang.lf.KeyValuePairs;
@@ -124,22 +123,12 @@ public void update(TargetConfig config, TracingOptions value) {
     config.set(this, value);
   }
 
-  @Override
-  public TracingOptions value(GeneratorArguments args) {
-    if (args.tracing != null) {
-      if (args.tracing) {
-        return new TracingOptions(true);
-      }
-    }
-    return null;
-  }
-
   /** Settings related to tracing options. */
   public static class TracingOptions {
 
     protected boolean enabled;
 
-    TracingOptions(boolean enabled) {
+    public TracingOptions(boolean enabled) {
       this.enabled = enabled;
     }
 
diff --git a/core/src/main/java/org/lflang/target/property/VerifyProperty.java b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
index 601823c485..c86314f1c2 100644
--- a/core/src/main/java/org/lflang/target/property/VerifyProperty.java
+++ b/core/src/main/java/org/lflang/target/property/VerifyProperty.java
@@ -1,7 +1,5 @@
 package org.lflang.target.property;
 
-import org.lflang.generator.GeneratorArguments;
-
 /** If true, check the generated verification model. The default is false. */
 public final class VerifyProperty extends BooleanProperty {
 
@@ -16,8 +14,4 @@ private VerifyProperty() {
   public String name() {
     return "verify";
   }
-
-  public Boolean value(GeneratorArguments args) {
-    return args.verify;
-  }
 }
diff --git a/core/src/main/java/org/lflang/target/property/WorkersProperty.java b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
index b61fa21aaa..defbf97740 100644
--- a/core/src/main/java/org/lflang/target/property/WorkersProperty.java
+++ b/core/src/main/java/org/lflang/target/property/WorkersProperty.java
@@ -2,7 +2,6 @@
 
 import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
-import org.lflang.generator.GeneratorArguments;
 import org.lflang.lf.Element;
 import org.lflang.target.property.type.PrimitiveType;
 
@@ -43,9 +42,4 @@ public Element toAstElement(Integer value) {
   public String name() {
     return "workers";
   }
-
-  @Override
-  public Integer value(GeneratorArguments args) {
-    return args.workers;
-  }
 }
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
index 61af132ba7..995bbf2a84 100644
--- a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
+++ b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -38,6 +38,7 @@ import org.lflang.scoping.LFGlobalScopeProvider
 import org.lflang.target.property.DockerProperty
 import org.lflang.target.property.NoCompileProperty
 import org.lflang.target.property.ProtobufsProperty
+import org.lflang.target.property.RuntimeVersionProperty
 import org.lflang.util.FileUtil
 import java.nio.file.Files
 import java.nio.file.Path
@@ -180,7 +181,7 @@ class TSGenerator(
      */
     private fun updatePackageConfig(context: LFGeneratorContext) {
         var rtUri = context.args.externalRuntimeUri
-        val rtVersion = context.args.runtimeVersion
+        val rtVersion = context.targetConfig.get(RuntimeVersionProperty.INSTANCE)
         val sb = StringBuffer("");
         val manifest = fileConfig.srcGenPath.resolve("package.json");
         val rtRegex = Regex("(\"@lf-lang/reactor-ts\")(.+)")
diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 169cfa3480..6e78ac803d 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -1854,8 +1854,7 @@ public void testInvalidTargetParam() throws Exception {
         model,
         LfPackage.eINSTANCE.getKeyValuePair(),
         null,
-        "The target property 'foobarbaz' is not supported by the C target and will thus be"
-            + " ignored.");
+        "The target property 'foobarbaz' is not supported by the C target and is thus ignored.");
   }
 
   @Test
diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index 09cfc6f6c0..f9feae0fa2 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -44,6 +44,9 @@
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.MainContext;
 import org.lflang.target.Target;
+import org.lflang.target.TargetConfig;
+import org.lflang.target.property.BuildTypeProperty;
+import org.lflang.target.property.LoggingProperty;
 import org.lflang.target.property.type.BuildTypeType.BuildType;
 import org.lflang.target.property.type.LoggingType.LogLevel;
 import org.lflang.tests.Configurators.Configurator;
@@ -200,7 +203,7 @@ protected final void runTestsAndPrintResults(
    * @param selected A predicate that given a test category returns whether it should be included in
    *     this test run or not.
    * @param configurator A procedure for configuring the tests.
-   * @param copy Whether or not to work on copies of tests in the test. registry.
+   * @param copy Whether to work on copies of tests in the test. registry.
    */
   protected void runTestsForTargets(
       String description,
@@ -364,24 +367,6 @@ private static void checkAndReportFailures(Set<LFTest> tests) {
   private void prepare(LFTest test, Transformer transformer, Configurator configurator)
       throws TestError {
 
-    var args = new GeneratorArguments();
-    args.hierarchicalBin = true;
-
-    var sysProps = System.getProperties();
-    // Set the external-runtime-path property if it was specified.
-    if (sysProps.containsKey("runtime")) {
-      var rt = sysProps.get("runtime").toString();
-      if (!rt.isEmpty()) {
-        try {
-          args.externalRuntimeUri = new URI(rt);
-        } catch (URISyntaxException e) {
-          throw new RuntimeException(e);
-        }
-        System.out.println("Using runtime: " + sysProps.get("runtime").toString());
-      }
-    } else {
-      System.out.println("Using default runtime.");
-    }
     var resource = FileConfig.getResource(test.getSrcPath().toFile(), resourceSetProvider);
 
     if (resource.getErrors().size() > 0) {
@@ -396,13 +381,12 @@ private void prepare(LFTest test, Transformer transformer, Configurator configur
         FileConfig.findPackageRoot(test.getSrcPath(), s -> {})
             .resolve(FileConfig.DEFAULT_SRC_GEN_DIR)
             .toString());
-    addExtraLfcArgs(args);
     var context =
         new MainContext(
             LFGeneratorContext.Mode.STANDALONE,
             CancelIndicator.NullImpl,
             (m, p) -> {},
-            args,
+            getGeneratorArguments(),
             resource,
             fileAccess,
             fileConfig -> new DefaultMessageReporter());
@@ -417,7 +401,9 @@ private void prepare(LFTest test, Transformer transformer, Configurator configur
     // Reload the context because properties may have changed as part of the transformation.
     test.loadContext(context);
 
-    // Update the configuration using the configurator.
+    applyDefaultConfiguration(test.getContext().getTargetConfig());
+
+    // Update the configuration using the supplied configurator.
     if (configurator != null) {
       if (!configurator.configure(test.getContext().getTargetConfig())) {
         throw new TestError("Test configuration unsuccessful.", Result.CONFIG_FAIL);
@@ -425,6 +411,40 @@ private void prepare(LFTest test, Transformer transformer, Configurator configur
     }
   }
 
+  /** Return a URI pointing to an external runtime if there is one, {@code null} otherwise. */
+  private URI getExternalRuntimeUri() {
+    var sysProps = System.getProperties();
+    URI uri = null;
+    // Set the external-runtime-path property if it was specified.
+    if (sysProps.containsKey("runtime")) {
+      var rt = sysProps.get("runtime").toString();
+      if (!rt.isEmpty()) {
+        try {
+          uri = new URI(rt);
+        } catch (URISyntaxException e) {
+          throw new RuntimeException(e);
+        }
+        System.out.println("Using runtime: " + sysProps.get("runtime").toString());
+      }
+    } else {
+      System.out.println("Using default runtime.");
+    }
+    return uri;
+  }
+
+  /** Return generator arguments suitable for testing. */
+  protected GeneratorArguments getGeneratorArguments() {
+    return new GeneratorArguments(
+        false,
+        getExternalRuntimeUri(), // Passed in as parameter to Gradle.
+        true, // To avoid name clashes in the bin directory.
+        null,
+        false,
+        false,
+        null,
+        List.of());
+  }
+
   /** Validate the given test. Throw an TestError if validation failed. */
   private void validate(LFTest test) throws TestError {
     // Validate the resource and store issues in the test object.
@@ -450,9 +470,9 @@ private void validate(LFTest test) throws TestError {
   }
 
   /** Override to add some LFC arguments to all runs of this test class. */
-  protected void addExtraLfcArgs(GeneratorArguments args) {
-    args.buildType = BuildType.TEST;
-    args.logging = LogLevel.DEBUG;
+  protected void applyDefaultConfiguration(TargetConfig config) {
+    BuildTypeProperty.INSTANCE.override(config, BuildType.TEST);
+    LoggingProperty.INSTANCE.override(config, LogLevel.DEBUG);
   }
 
   /**

From b0ba0b4643d4ca3e01c629e64431b7ace1554a44 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 2 Nov 2023 17:19:37 -0700
Subject: [PATCH 1100/1114] Add Argument class

---
 .../java/org/lflang/generator/Argument.java    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 core/src/main/java/org/lflang/generator/Argument.java

diff --git a/core/src/main/java/org/lflang/generator/Argument.java b/core/src/main/java/org/lflang/generator/Argument.java
new file mode 100644
index 0000000000..60f5117d4a
--- /dev/null
+++ b/core/src/main/java/org/lflang/generator/Argument.java
@@ -0,0 +1,18 @@
+package org.lflang.generator;
+
+import org.lflang.MessageReporter;
+import org.lflang.target.TargetConfig;
+import org.lflang.target.property.TargetProperty;
+
+public record Argument<T>(TargetProperty<T, ?> property, T value) {
+
+  public void update(TargetConfig config, MessageReporter reporter) {
+    if (value != null) {
+      if (!config.forName(property.name()).isPresent()) {
+        config.reportUnsupportedTargetProperty(property().name(), reporter.nowhere());
+      } else {
+        property.update(config, value);
+      }
+    }
+  }
+}

From df817eee1061c811af4fd1ef3959ceab559beac7 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 2 Nov 2023 18:26:24 -0700
Subject: [PATCH 1101/1114] Fix unit test

---
 .../org/lflang/tests/compiler/LinguaFrancaValidationTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
index 6e78ac803d..a29655e4de 100644
--- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
@@ -1871,8 +1871,8 @@ public void testTargetParamNotSupportedForTarget() throws Exception {
         model,
         LfPackage.eINSTANCE.getKeyValuePair(),
         null,
-        "The target property 'cargo-features' is not supported by the Python target and will thus"
-            + " be ignored.");
+        "The target property 'cargo-features' is not supported by the Python target and is thus"
+            + " ignored.");
   }
 
   @Test

From b0bc88d37acee63d8e8b5f613347f44718e76a08 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 2 Nov 2023 20:18:49 -0700
Subject: [PATCH 1102/1114] Update
 core/src/main/java/org/lflang/validation/LFValidator.java

---
 core/src/main/java/org/lflang/validation/LFValidator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 3a9207a3f4..4b81555710 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -1074,7 +1074,7 @@ public void checkTargetDecl(TargetDecl target) throws IOException {
   @Check(CheckType.NORMAL)
   public void checkTargetProperties(KeyValuePairs targetProperties) {
     if (targetProperties.eContainer() instanceof TargetDecl) {
-      // Only validate the target properties, not dictionaries that may be part of their values.
+      // Skip dictionaries that may be part of a target property value because type checking is done recursively.
       new TargetConfig(this.target).validate(targetProperties, this.info.model, getErrorReporter());
     }
   }

From 180ee5229595a409777d0922125da34d12aed06d Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 2 Nov 2023 20:30:30 -0700
Subject: [PATCH 1103/1114] Cleanup

---
 cli/lfc/src/main/java/org/lflang/cli/Lfc.java | 24 +++-----
 core/src/main/java/org/lflang/FileConfig.java | 12 ++++
 .../federated/generator/FedGenerator.java     |  5 +-
 .../generator/FederateTargetConfig.java       |  3 +-
 .../java/org/lflang/generator/Argument.java   | 14 +++++
 .../lflang/generator/GeneratorArguments.java  |  3 +-
 .../org/lflang/generator/MainContext.java     |  4 +-
 .../org/lflang/generator/c/CCompiler.java     |  6 ++
 .../main/java/org/lflang/target/Target.java   |  2 -
 .../java/org/lflang/target/TargetConfig.java  | 60 +++++++++++++++----
 .../property/HierarchicalBinProperty.java     | 19 ------
 .../target/property/TargetProperty.java       |  3 +-
 12 files changed, 96 insertions(+), 59 deletions(-)
 delete mode 100644 core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java

diff --git a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
index c76516b002..163c1f4099 100644
--- a/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
+++ b/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
@@ -4,9 +4,7 @@
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.GeneratorDelegate;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
@@ -19,7 +17,6 @@
 import org.lflang.generator.MainContext;
 import org.lflang.target.property.BuildTypeProperty;
 import org.lflang.target.property.CompilerProperty;
-import org.lflang.target.property.HierarchicalBinProperty;
 import org.lflang.target.property.LoggingProperty;
 import org.lflang.target.property.NoCompileProperty;
 import org.lflang.target.property.PrintStatisticsProperty;
@@ -91,7 +88,7 @@ public class Lfc extends CliBase {
       description =
           "Organize the generated binaries hierarchically, reflecting the structure of the source"
               + " tree.")
-  private Boolean hierarchicalBin;
+  private boolean hierarchicalBin;
 
   @Option(names = "--logging", description = "The logging level to use by the generated binary.")
   private String logging;
@@ -100,7 +97,7 @@ public class Lfc extends CliBase {
       names = {"-l", "--lint"},
       arity = "0",
       description = "Enable linting of generated code.")
-  private Boolean lint;
+  private boolean lint;
 
   @Option(
       names = {"-n", "--no-compile"},
@@ -124,7 +121,7 @@ public class Lfc extends CliBase {
       names = {"-q", "--quiet"},
       arity = "0",
       description = "Suppress output of the target compiler and other commands")
-  private Boolean quiet;
+  private boolean quiet;
 
   @Option(
       names = {"-r", "--rti"},
@@ -346,24 +343,17 @@ private Boolean getThreading() {
   /** Check the values of the commandline arguments and return them. */
   public GeneratorArguments getArgs() {
 
-    List<Argument<?>> args = new ArrayList<>();
-
-    if (buildType != null) {
-      args.add(new Argument<>(BuildTypeProperty.INSTANCE, getBuildType()));
-    }
-
     return new GeneratorArguments(
-        Objects.requireNonNullElse(clean, false),
+        clean,
         getExternalRuntimeUri(),
-        Objects.requireNonNullElse(hierarchicalBin, false),
+        hierarchicalBin,
         getJsonObject(),
-        Objects.requireNonNullElse(lint, false),
-        Objects.requireNonNullElse(quiet, false),
+        lint,
+        quiet,
         getRtiUri(),
         List.of(
             new Argument<>(BuildTypeProperty.INSTANCE, getBuildType()),
             new Argument<>(CompilerProperty.INSTANCE, targetCompiler),
-            new Argument<>(HierarchicalBinProperty.INSTANCE, hierarchicalBin),
             new Argument<>(LoggingProperty.INSTANCE, getLogging()),
             new Argument<>(PrintStatisticsProperty.INSTANCE, printStatistics),
             new Argument<>(NoCompileProperty.INSTANCE, noCompile),
diff --git a/core/src/main/java/org/lflang/FileConfig.java b/core/src/main/java/org/lflang/FileConfig.java
index bc565870f8..5d402b1463 100644
--- a/core/src/main/java/org/lflang/FileConfig.java
+++ b/core/src/main/java/org/lflang/FileConfig.java
@@ -316,10 +316,22 @@ public Path getExecutable() {
     return binPath.resolve(name + getExecutableExtension());
   }
 
+  /**
+   * Return a resource obtained from the given resource set provider that matches the given file.
+   *
+   * @param file The file to find a matching resource for.
+   * @param resourceSetProvider The resource set provider used to look up the resource.
+   */
   public static Resource getResource(File file, Provider<ResourceSet> resourceSetProvider) {
     return resourceSetProvider.get().getResource(createFileURI(file.getAbsolutePath()), true);
   }
 
+  /**
+   * Return a resource obtained from the given resource set that matches the given path.
+   *
+   * @param path The path to find a matching resource for.
+   * @param xtextResourceSet The resource set used to look up the resource.
+   */
   public static Resource getResource(Path path, XtextResourceSet xtextResourceSet) {
     return xtextResourceSet.getResource(createFileURI(path.toAbsolutePath().toString()), true);
   }
diff --git a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
index e070c68c8d..f6bbac3b3f 100644
--- a/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
+++ b/core/src/main/java/org/lflang/federated/generator/FedGenerator.java
@@ -404,10 +404,9 @@ private void analyzeFederates(Reactor federation, LFGeneratorContext context) {
       rtiConfig.setHost(federation.getHost().getAddr());
     }
 
-    var d = DockerProperty.INSTANCE;
-    var x = targetConfig.get(d);
     // If the federation is dockerized, use "rti" as the hostname.
-    if (rtiConfig.getHost().equals("localhost") && x.enabled) {
+    if (rtiConfig.getHost().equals("localhost")
+        && targetConfig.get(DockerProperty.INSTANCE).enabled) {
       rtiConfig.setHost("rti");
     }
 
diff --git a/core/src/main/java/org/lflang/federated/generator/FederateTargetConfig.java b/core/src/main/java/org/lflang/federated/generator/FederateTargetConfig.java
index 556c3988da..6fc29f7164 100644
--- a/core/src/main/java/org/lflang/federated/generator/FederateTargetConfig.java
+++ b/core/src/main/java/org/lflang/federated/generator/FederateTargetConfig.java
@@ -98,14 +98,13 @@ private void clearPropertiesToIgnore() {
    */
   public void update(
       TargetConfig config, List<KeyValuePair> pairs, Path relativePath, MessageReporter err) {
+    // FIXME: https://issue.lf-lang.org/2080
     pairs.forEach(
         pair -> {
           var p = config.forName(pair.getName());
           if (p.isPresent()) {
             var value = pair.getValue();
             if (pair.getName().equals("files")) {
-              // FIXME: this logic doesn't really belong here.
-              // Also: what about other target properties that have paths?
               var array = LfFactory.eINSTANCE.createArray();
               ASTUtils.elementToListOfStrings(pair.getValue()).stream()
                   .map(relativePath::resolve) // assume all paths are relative
diff --git a/core/src/main/java/org/lflang/generator/Argument.java b/core/src/main/java/org/lflang/generator/Argument.java
index 60f5117d4a..82dc850f97 100644
--- a/core/src/main/java/org/lflang/generator/Argument.java
+++ b/core/src/main/java/org/lflang/generator/Argument.java
@@ -4,8 +4,22 @@
 import org.lflang.target.TargetConfig;
 import org.lflang.target.property.TargetProperty;
 
+/**
+ * A record that ties a target property to a value obtained as a parameter to a compilation run.
+ *
+ * @param property A target property.
+ * @param value The value to assign to it.
+ * @param <T> The type of the value.
+ * @author Marten Lohstroh
+ */
 public record Argument<T>(TargetProperty<T, ?> property, T value) {
 
+  /**
+   * Update the target configuration if the value of this argument is not {@code null}.
+   *
+   * @param config The target configuration to update.
+   * @param reporter An error reporter to report the use of unsupported target properties.
+   */
   public void update(TargetConfig config, MessageReporter reporter) {
     if (value != null) {
       if (!config.forName(property.name()).isPresent()) {
diff --git a/core/src/main/java/org/lflang/generator/GeneratorArguments.java b/core/src/main/java/org/lflang/generator/GeneratorArguments.java
index 8600804485..d44cf217d0 100644
--- a/core/src/main/java/org/lflang/generator/GeneratorArguments.java
+++ b/core/src/main/java/org/lflang/generator/GeneratorArguments.java
@@ -5,13 +5,14 @@
 import java.util.List;
 
 /**
- * Arguments to be passed from the command-line interface to the code generators.
+ * Arguments to be passed to a code generator.
  *
  * <p>
  *
  * @param clean Whether to clean before building.
  * @param externalRuntimeUri FIXME: change type of
  *     org.lflang.target.property.ExternalRuntimePathProperty to URI
+ * @param hierarchicalBin Whether the bin directory should have a flat or hierarchical organization.
  * @param jsonObject Generator arguments and target properties in JSON format.
  * @param lint For enabling or disabling the linting of generated code.
  * @param quiet Whether to suppress output of the target compiler and other commands.
diff --git a/core/src/main/java/org/lflang/generator/MainContext.java b/core/src/main/java/org/lflang/generator/MainContext.java
index b3455b37e2..e670c5696d 100644
--- a/core/src/main/java/org/lflang/generator/MainContext.java
+++ b/core/src/main/java/org/lflang/generator/MainContext.java
@@ -95,9 +95,7 @@ public MainContext(
       fileConfig =
           Objects.requireNonNull(
               LFGenerator.createFileConfig(
-                  resource,
-                  FileConfig.getSrcGenRoot(fsa),
-                  Objects.requireNonNullElse(args.hierarchicalBin(), false)));
+                  resource, FileConfig.getSrcGenRoot(fsa), args.hierarchicalBin()));
     } catch (IOException e) {
       throw new RuntimeIOException("Error during FileConfig instantiation", e);
     }
diff --git a/core/src/main/java/org/lflang/generator/c/CCompiler.java b/core/src/main/java/org/lflang/generator/c/CCompiler.java
index 69067fc14d..8673856af8 100644
--- a/core/src/main/java/org/lflang/generator/c/CCompiler.java
+++ b/core/src/main/java/org/lflang/generator/c/CCompiler.java
@@ -438,6 +438,12 @@ static String getTargetFileName(String fileName, boolean cppMode, TargetConfig t
     return fileName + getFileExtension(cppMode, targetConfig);
   }
 
+  /**
+   * Return the file extension of the output source files.
+   *
+   * @param cppMode Whether we are building C code using a C++ compiler.
+   * @param targetConfig The target configuration that parameterizes the build process.
+   */
   static String getFileExtension(boolean cppMode, TargetConfig targetConfig) {
     if (targetConfig.getOrDefault(PlatformProperty.INSTANCE).platform() == Platform.ARDUINO) {
       return ".ino";
diff --git a/core/src/main/java/org/lflang/target/Target.java b/core/src/main/java/org/lflang/target/Target.java
index 98fd3179d2..eb2cedd588 100644
--- a/core/src/main/java/org/lflang/target/Target.java
+++ b/core/src/main/java/org/lflang/target/Target.java
@@ -44,7 +44,6 @@
 import org.lflang.target.property.ExportToYamlProperty;
 import org.lflang.target.property.ExternalRuntimePathProperty;
 import org.lflang.target.property.FilesProperty;
-import org.lflang.target.property.HierarchicalBinProperty;
 import org.lflang.target.property.KeepaliveProperty;
 import org.lflang.target.property.NoRuntimeValidationProperty;
 import org.lflang.target.property.PlatformProperty;
@@ -597,7 +596,6 @@ public void initialize(TargetConfig config) {
           CoordinationProperty.INSTANCE,
           DockerProperty.INSTANCE,
           FilesProperty.INSTANCE,
-          HierarchicalBinProperty.INSTANCE,
           KeepaliveProperty.INSTANCE,
           PlatformProperty.INSTANCE,
           ProtobufsProperty.INSTANCE,
diff --git a/core/src/main/java/org/lflang/target/TargetConfig.java b/core/src/main/java/org/lflang/target/TargetConfig.java
index 671c6b8955..584b4e4694 100644
--- a/core/src/main/java/org/lflang/target/TargetConfig.java
+++ b/core/src/main/java/org/lflang/target/TargetConfig.java
@@ -87,6 +87,14 @@ public TargetConfig(Target target) {
         TimeOutProperty.INSTANCE);
   }
 
+  /**
+   * Create a new target configuration based on the given target declaration AST node and the
+   * arguments passed to the code generator.
+   *
+   * @param target AST node of a target declaration.
+   * @param args The arguments passed to the code generator.
+   * @param messageReporter An error reporter.
+   */
   public TargetConfig(TargetDecl target, GeneratorArguments args, MessageReporter messageReporter) {
     this(Target.fromDecl(target), target.getConfig(), args, messageReporter);
   }
@@ -136,6 +144,12 @@ private void load(JsonObject jsonObject, MessageReporter messageReporter) {
     }
   }
 
+  /**
+   * Report that a target property is not supported by the current target.
+   *
+   * @param name The name of the unsupported target property.
+   * @param stage2 The second stage an the error reporter through which to report the warning.
+   */
   public void reportUnsupportedTargetProperty(String name, MessageReporter.Stage2 stage2) {
     stage2.warning(
         String.format(
@@ -146,10 +160,17 @@ public void reportUnsupportedTargetProperty(String name, MessageReporter.Stage2
   /** Additional sources to add to the compile command if appropriate. */
   public final List<String> compileAdditionalSources = new ArrayList<>();
 
+  /** Map of target properties */
   protected final Map<TargetProperty<?, ?>, Object> properties = new HashMap<>();
 
+  /** Set of target properties that have been assigned a value */
   private final Set<TargetProperty<?, ?>> setProperties = new HashSet<>();
 
+  /**
+   * Register target properties and assign them their initial value.
+   *
+   * @param properties The target properties to register.
+   */
   public void register(TargetProperty<?, ?>... properties) {
     Arrays.stream(properties)
         .forEach(property -> this.properties.put(property, property.initialValue()));
@@ -176,6 +197,15 @@ public <T, S extends TargetPropertyType> T get(TargetProperty<T, S> property)
     }
   }
 
+  /**
+   * Return the value currently assigned to the given target property, or its default value if none
+   * been set.
+   *
+   * @param property The property to get the value of
+   * @return The current value, or the initial value of none was assigned.
+   * @param <T> The Java type of the returned value.
+   * @param <S> The LF type of the returned value.
+   */
   public <T, S extends TargetPropertyType> T getOrDefault(TargetProperty<T, S> property) {
     try {
       return get(property);
@@ -192,6 +222,7 @@ public boolean isSet(TargetProperty<?, ?> property) {
     return this.setProperties.contains(property);
   }
 
+  /** Return the target properties that are currently registered. */
   public String listOfRegisteredProperties() {
     return getRegisteredProperties().stream()
         .map(TargetProperty::toString)
@@ -199,6 +230,7 @@ public String listOfRegisteredProperties() {
         .collect(Collectors.joining(", "));
   }
 
+  /** Return the target properties that are currently registered. */
   public List<TargetProperty<?, ?>> getRegisteredProperties() {
     return this.properties.keySet().stream()
         .sorted(Comparator.comparing(p -> p.getClass().getName()))
@@ -223,14 +255,14 @@ public String listOfRegisteredProperties() {
    * @param err Message reporter to report attempts to set unsupported target properties.
    */
   public void load(GeneratorArguments args, MessageReporter err) {
-    args.overrides().stream().forEach(a -> a.update(this, err));
+    args.overrides().forEach(a -> a.update(this, err));
   }
 
   /**
-   * Set the configuration using the given pairs from the AST.
+   * Update the configuration using the given pairs from the AST.
    *
    * @param pairs AST node that holds all the target properties.
-   * @param err Error reporter on which property format errors will be reported
+   * @param err A message reporter for reporting errors and warnings.
    */
   public void load(List<KeyValuePair> pairs, MessageReporter err) {
     if (pairs != null) {
@@ -242,13 +274,20 @@ public void load(List<KeyValuePair> pairs, MessageReporter err) {
               var property = p.get();
               property.update(this, pair.getValue(), err);
             } else {
-              err.nowhere()
-                  .warning("Attempting to load unrecognized target property: " + pair.getName());
+              reportUnsupportedTargetProperty(pair.getName(), err.nowhere());
             }
           });
     }
   }
 
+  /**
+   * Assign the given value to the given target property.
+   *
+   * @param property The target property to assign the value to.
+   * @param value The value to assign to the target property.
+   * @param <T> The Java type of the value.
+   * @param <S> The LF type of the value.
+   */
   public <T, S extends TargetPropertyType> void set(TargetProperty<T, S> property, T value) {
     if (value != null) {
       this.setProperties.add(property);
@@ -256,21 +295,20 @@ public <T, S extends TargetPropertyType> void set(TargetProperty<T, S> property,
     }
   }
 
+  /** Return a description of the current settings. */
   public String settings() {
     var sb = new StringBuffer("Target Configuration:\n");
     this.properties.keySet().stream()
-        .filter(p -> this.setProperties.contains(p))
+        .filter(this.setProperties::contains)
         .forEach(
-            p -> {
-              sb.append(String.format("      - %s: %s\n", p.name(), this.get(p).toString()));
-            });
+            p -> sb.append(String.format("      - %s: %s\n", p.name(), this.get(p).toString())));
     sb.setLength(sb.length() - 1);
     return sb.toString();
   }
 
   /**
-   * Extracts all properties as a list of key-value pairs from a TargetConfig. Only extracts
-   * properties explicitly set by user.
+   * Extract all properties as a list of key-value pairs from a TargetConfig. The returned list only
+   * includes properties that were explicitly set.
    *
    * @param config The TargetConfig to extract from.
    * @return The extracted properties.
diff --git a/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java b/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
deleted file mode 100644
index dbd3a1ed6f..0000000000
--- a/core/src/main/java/org/lflang/target/property/HierarchicalBinProperty.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.lflang.target.property;
-
-/**
- * Whether the bin directory should have a flat or hierarchical organization. It is flat by default.
- */
-public final class HierarchicalBinProperty extends BooleanProperty {
-
-  /** Singleton target property instance. */
-  public static final HierarchicalBinProperty INSTANCE = new HierarchicalBinProperty();
-
-  private HierarchicalBinProperty() {
-    super();
-  }
-
-  @Override
-  public String name() {
-    return "hierarchical-bin";
-  }
-}
diff --git a/core/src/main/java/org/lflang/target/property/TargetProperty.java b/core/src/main/java/org/lflang/target/property/TargetProperty.java
index 556de91e63..1f3dc5182e 100644
--- a/core/src/main/java/org/lflang/target/property/TargetProperty.java
+++ b/core/src/main/java/org/lflang/target/property/TargetProperty.java
@@ -14,7 +14,8 @@
 /**
  * An abstract base class for target properties.
  *
- * @param <T> The data type of the value assigned to the target property.
+ * @param <T> The Java type of the value assigned to the target property.
+ * @param <S> The LF type of the value assigned to the target property.
  * @author Marten Lohstroh
  */
 public abstract class TargetProperty<T, S extends TargetPropertyType> {

From 2b94c5d45bd74ac0c9434f59b86b0e1985a0e620 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 2 Nov 2023 20:34:39 -0700
Subject: [PATCH 1104/1114] Add back tests that were accidentally deleted

---
 test/Rust/src/target/BuildProfileDefaultIsDev.lf | 10 ++++++++++
 test/Rust/src/target/BuildProfileRelease.lf      | 13 +++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 test/Rust/src/target/BuildProfileDefaultIsDev.lf
 create mode 100644 test/Rust/src/target/BuildProfileRelease.lf

diff --git a/test/Rust/src/target/BuildProfileDefaultIsDev.lf b/test/Rust/src/target/BuildProfileDefaultIsDev.lf
new file mode 100644
index 0000000000..083794bdfc
--- /dev/null
+++ b/test/Rust/src/target/BuildProfileDefaultIsDev.lf
@@ -0,0 +1,10 @@
+// Tests that the default build profile is dev. A proxy for checking this is to check that debug
+// assertions are enabled.
+target Rust
+
+main reactor {
+  reaction(startup) {=
+    assert!(cfg!(debug_assertions), "debug assertions should be enabled");
+    println!("success");
+  =}
+}
diff --git a/test/Rust/src/target/BuildProfileRelease.lf b/test/Rust/src/target/BuildProfileRelease.lf
new file mode 100644
index 0000000000..0d9b607270
--- /dev/null
+++ b/test/Rust/src/target/BuildProfileRelease.lf
@@ -0,0 +1,13 @@
+// Tests that the we can enable the release profile A proxy for checking this is to check that debug
+// assertions are disabled.
+target Rust {
+    build-type: "Release"
+  }
+  
+  main reactor {
+    reaction(startup) {=
+      assert!(!cfg!(debug_assertions), "debug assertions should be disabled");
+      println!("success");
+    =}
+  }
+  
\ No newline at end of file

From 335d028dcc02c78ab3476b4b7bf367583c7abae6 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 2 Nov 2023 20:35:40 -0700
Subject: [PATCH 1105/1114] Apply formatter

---
 .../org/lflang/validation/LFValidator.java    |  3 ++-
 test/Rust/src/target/BuildProfileRelease.lf   | 19 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/lflang/validation/LFValidator.java b/core/src/main/java/org/lflang/validation/LFValidator.java
index 4b81555710..def6bcc8de 100644
--- a/core/src/main/java/org/lflang/validation/LFValidator.java
+++ b/core/src/main/java/org/lflang/validation/LFValidator.java
@@ -1074,7 +1074,8 @@ public void checkTargetDecl(TargetDecl target) throws IOException {
   @Check(CheckType.NORMAL)
   public void checkTargetProperties(KeyValuePairs targetProperties) {
     if (targetProperties.eContainer() instanceof TargetDecl) {
-      // Skip dictionaries that may be part of a target property value because type checking is done recursively.
+      // Skip dictionaries that may be part of a target property value because type checking is done
+      // recursively.
       new TargetConfig(this.target).validate(targetProperties, this.info.model, getErrorReporter());
     }
   }
diff --git a/test/Rust/src/target/BuildProfileRelease.lf b/test/Rust/src/target/BuildProfileRelease.lf
index 0d9b607270..da19c0bc79 100644
--- a/test/Rust/src/target/BuildProfileRelease.lf
+++ b/test/Rust/src/target/BuildProfileRelease.lf
@@ -1,13 +1,12 @@
 // Tests that the we can enable the release profile A proxy for checking this is to check that debug
 // assertions are disabled.
 target Rust {
-    build-type: "Release"
-  }
-  
-  main reactor {
-    reaction(startup) {=
-      assert!(!cfg!(debug_assertions), "debug assertions should be disabled");
-      println!("success");
-    =}
-  }
-  
\ No newline at end of file
+  build-type: "Release"
+}
+
+main reactor {
+  reaction(startup) {=
+    assert!(!cfg!(debug_assertions), "debug assertions should be disabled");
+    println!("success");
+  =}
+}

From a9f60c3775f9be834379492477a0855755b2f16f Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 2 Nov 2023 21:07:32 -0700
Subject: [PATCH 1106/1114] Do not touch build type of tests that explicitly
 set it

---
 core/src/testFixtures/java/org/lflang/tests/TestBase.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
index f9feae0fa2..b2d5475efa 100644
--- a/core/src/testFixtures/java/org/lflang/tests/TestBase.java
+++ b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -469,9 +469,11 @@ private void validate(LFTest test) throws TestError {
     }
   }
 
-  /** Override to add some LFC arguments to all runs of this test class. */
+  /** Adjust target configuration for all runs of this test class. */
   protected void applyDefaultConfiguration(TargetConfig config) {
-    BuildTypeProperty.INSTANCE.override(config, BuildType.TEST);
+    if (!config.isSet(BuildTypeProperty.INSTANCE)) {
+      config.set(BuildTypeProperty.INSTANCE, BuildType.TEST);
+    }
     LoggingProperty.INSTANCE.override(config, LogLevel.DEBUG);
   }
 

From c29595b321f943982d6d4b2f94d7bf0bf0df1b64 Mon Sep 17 00:00:00 2001
From: Omer Majeed <omer.majeed@magnition.io>
Date: Tue, 19 Sep 2023 02:49:38 +0500
Subject: [PATCH 1107/1114] parent_bank_index and parent params made available
 when initializing nested child reactors

---
 .../org/lflang/generator/TargetTypes.java     | 14 ++++++++
 .../org/lflang/generator/c/CGenerator.java    | 11 +++++++
 .../generator/c/CParameterGenerator.java      | 32 ++++++++++++++++++-
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/TargetTypes.java b/core/src/main/java/org/lflang/generator/TargetTypes.java
index 65552edc59..f48dacb93d 100644
--- a/core/src/main/java/org/lflang/generator/TargetTypes.java
+++ b/core/src/main/java/org/lflang/generator/TargetTypes.java
@@ -216,6 +216,20 @@ default String getTargetInitializer(Initializer init, Type type) {
     }
   }
 
+  /**
+   * Returns true if given initializer is a code expression otherwise returns false
+   *
+   * @param init Initializer node (nullable)
+   */
+  default Boolean checkForCodeExp(Initializer init) {
+    var single = ASTUtils.asSingleExpr(init);
+    if ((single != null) && (single instanceof CodeExpr)) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
   /**
    * Returns the representation of the given expression in target code. The given type, if non-null,
    * may inform the code generation.
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 1c277f5d29..fdb0642732 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -594,6 +594,8 @@ private void generateCodeFor(String lfModuleName) throws IOException {
               "\n",
               "int bank_index;",
               "SUPPRESS_UNUSED_WARNING(bank_index);",
+              "int parent_bank_index;",
+              "SUPPRESS_UNUSED_WARNING(parent_bank_index);",
               "int watchdog_number = 0;",
               "SUPPRESS_UNUSED_WARNING(watchdog_number);"));
       // Add counters for modal initialization
@@ -1680,6 +1682,7 @@ public void generateReactorInstance(ReactorInstance instance) {
     var fullName = instance.getFullName();
     initializeTriggerObjects.pr(
         "// ***** Start initializing " + fullName + " of class " + reactorClass.getName());
+
     // Generate the instance self struct containing parameters, state variables,
     // and outputs (the "self" struct).
     initializeTriggerObjects.pr(
@@ -1853,12 +1856,20 @@ private void generateModeStructure(ReactorInstance instance) {
    */
   protected void generateParameterInitialization(ReactorInstance instance) {
     var selfRef = CUtil.reactorRef(instance);
+    ReactorInstance parent = instance.getParent();
     // Set the local bank_index variable so that initializers can use it.
     initializeTriggerObjects.pr(
         "bank_index = "
             + CUtil.bankIndex(instance)
             + ";"
             + " SUPPRESS_UNUSED_WARNING(bank_index);");
+    if (parent != null) {
+      initializeTriggerObjects.pr(
+          "parent_bank_index = "
+              + CUtil.bankIndex(parent)
+              + ";"
+              + " SUPPRESS_UNUSED_WARNING(parent_bank_index);");
+    }
     for (ParameterInstance parameter : instance.parameters) {
       // NOTE: we now use the resolved literal value. For better efficiency, we could
       // store constants in a global array and refer to its elements to avoid duplicate
diff --git a/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java b/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java
index 21a4803a5f..dbd56a7ed2 100644
--- a/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java
@@ -1,8 +1,12 @@
 package org.lflang.generator.c;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ParameterInstance;
+import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Initializer;
 import org.lflang.lf.Parameter;
 
@@ -24,10 +28,36 @@ public static String getInitializer(ParameterInstance p) {
     if (p.getName().equals("bank_index") && p.getOverride() == null) {
       return CUtil.bankIndex(p.getParent());
     }
+    String initializer = null;
 
     CTypes ctypes = CTypes.generateParametersIn(p.getParent().getParent());
     Initializer values = p.getActualValue();
-    return ctypes.getTargetInitializer(values, p.getDefinition().getType());
+    initializer = ctypes.getTargetInitializer(values, p.getDefinition().getType());
+
+    // If Initializer is a code expression
+    // parse for parent parameter values being used inside expressions
+    // Look for <parent-param> encapsulated inside ${ <parent-param> }
+    if (ctypes.checkForCodeExp(values)) {
+      ReactorInstance parent = p.getParent().getParent();
+      if (parent != null) {
+        for (ParameterInstance parameter : parent.parameters) {
+          String search_param = "(\\$\\{\s*" + parameter.getName() + "\s*\\})";
+          Pattern pt = Pattern.compile(search_param);
+          Matcher m = pt.matcher(initializer);
+
+          if (m.find()) {
+            StringBuilder tmp_init = new StringBuilder();
+            do {
+              String replacement = CUtil.reactorRef(parent) + "->" + parameter.getName();
+              m.appendReplacement(tmp_init, replacement);
+            } while (m.find());
+            m.appendTail(tmp_init);
+            initializer = tmp_init.toString();
+          }
+        }
+      }
+    }
+    return initializer;
   }
 
   /**

From 578f47984c58466aa83229dae2b5ec2bf7603922 Mon Sep 17 00:00:00 2001
From: Omer Majeed <omer.majeed@magnition.io>
Date: Tue, 19 Sep 2023 17:30:15 +0500
Subject: [PATCH 1108/1114] removed parent_bank_index changes, parent's
 variable made available inside code expression is enough of a change

---
 .../main/java/org/lflang/generator/c/CGenerator.java   | 10 ----------
 .../org/lflang/generator/c/CParameterGenerator.java    |  1 -
 2 files changed, 11 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index fdb0642732..cbc8504484 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -594,8 +594,6 @@ private void generateCodeFor(String lfModuleName) throws IOException {
               "\n",
               "int bank_index;",
               "SUPPRESS_UNUSED_WARNING(bank_index);",
-              "int parent_bank_index;",
-              "SUPPRESS_UNUSED_WARNING(parent_bank_index);",
               "int watchdog_number = 0;",
               "SUPPRESS_UNUSED_WARNING(watchdog_number);"));
       // Add counters for modal initialization
@@ -1856,20 +1854,12 @@ private void generateModeStructure(ReactorInstance instance) {
    */
   protected void generateParameterInitialization(ReactorInstance instance) {
     var selfRef = CUtil.reactorRef(instance);
-    ReactorInstance parent = instance.getParent();
     // Set the local bank_index variable so that initializers can use it.
     initializeTriggerObjects.pr(
         "bank_index = "
             + CUtil.bankIndex(instance)
             + ";"
             + " SUPPRESS_UNUSED_WARNING(bank_index);");
-    if (parent != null) {
-      initializeTriggerObjects.pr(
-          "parent_bank_index = "
-              + CUtil.bankIndex(parent)
-              + ";"
-              + " SUPPRESS_UNUSED_WARNING(parent_bank_index);");
-    }
     for (ParameterInstance parameter : instance.parameters) {
       // NOTE: we now use the resolved literal value. For better efficiency, we could
       // store constants in a global array and refer to its elements to avoid duplicate
diff --git a/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java b/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java
index dbd56a7ed2..83657809d6 100644
--- a/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java
@@ -2,7 +2,6 @@
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ParameterInstance;

From 32033ffcf8e5c967f7c6d3e7940680ffff2123b7 Mon Sep 17 00:00:00 2001
From: Omer Majeed <omer.majeed@magnition.io>
Date: Tue, 19 Sep 2023 17:31:27 +0500
Subject: [PATCH 1109/1114] removed accidentally added new line

---
 core/src/main/java/org/lflang/generator/c/CGenerator.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index cbc8504484..1c277f5d29 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -1680,7 +1680,6 @@ public void generateReactorInstance(ReactorInstance instance) {
     var fullName = instance.getFullName();
     initializeTriggerObjects.pr(
         "// ***** Start initializing " + fullName + " of class " + reactorClass.getName());
-
     // Generate the instance self struct containing parameters, state variables,
     // and outputs (the "self" struct).
     initializeTriggerObjects.pr(

From b7397496d2bc31c93400df96245b7149623dd816 Mon Sep 17 00:00:00 2001
From: Omer Majeed <omer.majeed@magnition.io>
Date: Fri, 3 Nov 2023 21:10:50 +0500
Subject: [PATCH 1110/1114] expose self pointer of parent to children during
 initialization

---
 .../org/lflang/generator/TargetTypes.java     | 14 ---------
 .../org/lflang/generator/c/CGenerator.java    |  8 +++++
 .../generator/c/CParameterGenerator.java      | 30 +------------------
 3 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/TargetTypes.java b/core/src/main/java/org/lflang/generator/TargetTypes.java
index f48dacb93d..65552edc59 100644
--- a/core/src/main/java/org/lflang/generator/TargetTypes.java
+++ b/core/src/main/java/org/lflang/generator/TargetTypes.java
@@ -216,20 +216,6 @@ default String getTargetInitializer(Initializer init, Type type) {
     }
   }
 
-  /**
-   * Returns true if given initializer is a code expression otherwise returns false
-   *
-   * @param init Initializer node (nullable)
-   */
-  default Boolean checkForCodeExp(Initializer init) {
-    var single = ASTUtils.asSingleExpr(init);
-    if ((single != null) && (single instanceof CodeExpr)) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-
   /**
    * Returns the representation of the given expression in target code. The given type, if non-null,
    * may inform the code generation.
diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 1c277f5d29..21d097d023 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -1725,6 +1725,14 @@ public void generateReactorInstance(ReactorInstance instance) {
       // Need to do this for each of the builders into which the code writes.
       startTimeStep.startScopedBlock(child);
       initializeTriggerObjects.startScopedBlock(child);
+      // Generate the parent self struct for children to access its params
+        initializeTriggerObjects.pr(
+            CUtil.selfType(instance)
+                + " *self = " +
+            CUtil.reactorRefName(instance)
+                + "["
+                + CUtil.runtimeIndex(instance)
+                + "];");
       generateReactorInstance(child);
       initializeTriggerObjects.endScopedBlock();
       startTimeStep.endScopedBlock();
diff --git a/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java b/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java
index 83657809d6..27fd9d6234 100644
--- a/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java
@@ -1,7 +1,5 @@
 package org.lflang.generator.c;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ParameterInstance;
@@ -27,36 +25,10 @@ public static String getInitializer(ParameterInstance p) {
     if (p.getName().equals("bank_index") && p.getOverride() == null) {
       return CUtil.bankIndex(p.getParent());
     }
-    String initializer = null;
 
     CTypes ctypes = CTypes.generateParametersIn(p.getParent().getParent());
     Initializer values = p.getActualValue();
-    initializer = ctypes.getTargetInitializer(values, p.getDefinition().getType());
-
-    // If Initializer is a code expression
-    // parse for parent parameter values being used inside expressions
-    // Look for <parent-param> encapsulated inside ${ <parent-param> }
-    if (ctypes.checkForCodeExp(values)) {
-      ReactorInstance parent = p.getParent().getParent();
-      if (parent != null) {
-        for (ParameterInstance parameter : parent.parameters) {
-          String search_param = "(\\$\\{\s*" + parameter.getName() + "\s*\\})";
-          Pattern pt = Pattern.compile(search_param);
-          Matcher m = pt.matcher(initializer);
-
-          if (m.find()) {
-            StringBuilder tmp_init = new StringBuilder();
-            do {
-              String replacement = CUtil.reactorRef(parent) + "->" + parameter.getName();
-              m.appendReplacement(tmp_init, replacement);
-            } while (m.find());
-            m.appendTail(tmp_init);
-            initializer = tmp_init.toString();
-          }
-        }
-      }
-    }
-    return initializer;
+    return ctypes.getTargetInitializer(values, p.getDefinition().getType());
   }
 
   /**

From 3e88f680dca324abe7b546b166009a708c8851b9 Mon Sep 17 00:00:00 2001
From: Omer Majeed <omer.majeed@magnition.io>
Date: Fri, 3 Nov 2023 21:12:39 +0500
Subject: [PATCH 1111/1114] remove unnecessary import

---
 .../main/java/org/lflang/generator/c/CParameterGenerator.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java b/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java
index 27fd9d6234..21a4803a5f 100644
--- a/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CParameterGenerator.java
@@ -3,7 +3,6 @@
 import org.lflang.ast.ASTUtils;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.ParameterInstance;
-import org.lflang.generator.ReactorInstance;
 import org.lflang.lf.Initializer;
 import org.lflang.lf.Parameter;
 

From cdf27410d3a169b23cf5bf0a0dcee9b90b777b7d Mon Sep 17 00:00:00 2001
From: Omer Majeed <omer.majeed@magnition.io>
Date: Fri, 3 Nov 2023 21:16:05 +0500
Subject: [PATCH 1112/1114] updated indentation as per exisitng norm

---
 core/src/main/java/org/lflang/generator/c/CGenerator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index 21d097d023..cc3a383500 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -1728,8 +1728,8 @@ public void generateReactorInstance(ReactorInstance instance) {
       // Generate the parent self struct for children to access its params
         initializeTriggerObjects.pr(
             CUtil.selfType(instance)
-                + " *self = " +
-            CUtil.reactorRefName(instance)
+                + " *self = "
+                + CUtil.reactorRefName(instance)
                 + "["
                 + CUtil.runtimeIndex(instance)
                 + "];");

From 0893ceb1071b9d9aff234b6f24db70c22f348610 Mon Sep 17 00:00:00 2001
From: Omer Majeed <omer.majeed@magnition.io>
Date: Sat, 4 Nov 2023 01:21:11 +0500
Subject: [PATCH 1113/1114] test lf code to demonstrate use of parent variables
 within code expression when declaring child reactors

---
 test/C/src/ParentParamsAccessToChildInit.lf | 24 +++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 test/C/src/ParentParamsAccessToChildInit.lf

diff --git a/test/C/src/ParentParamsAccessToChildInit.lf b/test/C/src/ParentParamsAccessToChildInit.lf
new file mode 100644
index 0000000000..e1f0eb4aa4
--- /dev/null
+++ b/test/C/src/ParentParamsAccessToChildInit.lf
@@ -0,0 +1,24 @@
+target C;
+preamble {=
+    extern int child_ids[10];
+=}
+
+reactor Child (bank_index:int = 0, parent_index:int = 0, value:int = 0) {
+    preamble {=
+        int child_ids[10] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
+    =}
+    reaction (startup) {=
+        printf("Child bank_index:%d parent_index:%d value:%d\n", self->bank_index, self->parent_index, self->value);
+    =}
+}
+
+reactor Parent (bank_index:int = 0, n_parents:int = 0, n_children:int = 1) {
+    c = new [n_children] Child (parent_index = {=self->bank_index=}, value = {=child_ids[(self->bank_index * self->n_children + bank_index) % (sizeof(child_ids) / sizeof(*child_ids))]=})
+    reaction (startup) {=
+        printf("Parent[%d/%d] bank_index:%d\n", self->bank_index + 1, self->n_parents, self->bank_index);
+    =}
+}
+
+main reactor ParentParamsAccessToChildInit (n_parents:int = 2, per_parent_n_children:int = 3) {
+    p = new [n_parents] Parent (n_parents = n_parents, n_children = per_parent_n_children);
+}
\ No newline at end of file

From 7b0bd7ea3c0f942b696c9a2b0632fbfba81d80bb Mon Sep 17 00:00:00 2001
From: Omer Majeed <omer.majeed@magnition.io>
Date: Sat, 4 Nov 2023 01:36:22 +0500
Subject: [PATCH 1114/1114] spotlessApply to fix the indentation

---
 .../org/lflang/generator/c/CGenerator.java    | 14 +++----
 test/C/src/ParentParamsAccessToChildInit.lf   | 41 +++++++++++--------
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/c/CGenerator.java b/core/src/main/java/org/lflang/generator/c/CGenerator.java
index cc3a383500..4d77463c4f 100644
--- a/core/src/main/java/org/lflang/generator/c/CGenerator.java
+++ b/core/src/main/java/org/lflang/generator/c/CGenerator.java
@@ -1726,13 +1726,13 @@ public void generateReactorInstance(ReactorInstance instance) {
       startTimeStep.startScopedBlock(child);
       initializeTriggerObjects.startScopedBlock(child);
       // Generate the parent self struct for children to access its params
-        initializeTriggerObjects.pr(
-            CUtil.selfType(instance)
-                + " *self = "
-                + CUtil.reactorRefName(instance)
-                + "["
-                + CUtil.runtimeIndex(instance)
-                + "];");
+      initializeTriggerObjects.pr(
+          CUtil.selfType(instance)
+              + " *self = "
+              + CUtil.reactorRefName(instance)
+              + "["
+              + CUtil.runtimeIndex(instance)
+              + "];");
       generateReactorInstance(child);
       initializeTriggerObjects.endScopedBlock();
       startTimeStep.endScopedBlock();
diff --git a/test/C/src/ParentParamsAccessToChildInit.lf b/test/C/src/ParentParamsAccessToChildInit.lf
index e1f0eb4aa4..8325d65150 100644
--- a/test/C/src/ParentParamsAccessToChildInit.lf
+++ b/test/C/src/ParentParamsAccessToChildInit.lf
@@ -1,24 +1,31 @@
-target C;
+target C
+
 preamble {=
-    extern int child_ids[10];
+  extern int child_ids[10];
 =}
 
-reactor Child (bank_index:int = 0, parent_index:int = 0, value:int = 0) {
-    preamble {=
-        int child_ids[10] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-    =}
-    reaction (startup) {=
-        printf("Child bank_index:%d parent_index:%d value:%d\n", self->bank_index, self->parent_index, self->value);
-    =}
+reactor Child(bank_index: int = 0, parent_index: int = 0, value: int = 0) {
+  preamble {=
+    int child_ids[10] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
+  =}
+
+  reaction(startup) {=
+    printf("Child bank_index:%d parent_index:%d value:%d\n", self->bank_index, self->parent_index, self->value);
+  =}
 }
 
-reactor Parent (bank_index:int = 0, n_parents:int = 0, n_children:int = 1) {
-    c = new [n_children] Child (parent_index = {=self->bank_index=}, value = {=child_ids[(self->bank_index * self->n_children + bank_index) % (sizeof(child_ids) / sizeof(*child_ids))]=})
-    reaction (startup) {=
-        printf("Parent[%d/%d] bank_index:%d\n", self->bank_index + 1, self->n_parents, self->bank_index);
-    =}
+reactor Parent(bank_index: int = 0, n_parents: int = 0, n_children: int = 1) {
+  c = new[n_children] Child(
+      parent_index=bank_index,
+      value = {=
+        child_ids[(self->bank_index * self->n_children + bank_index) % (sizeof(child_ids) / sizeof(*child_ids))]
+      =})
+
+  reaction(startup) {=
+    printf("Parent[%d/%d] bank_index:%d\n", self->bank_index + 1, self->n_parents, self->bank_index);
+  =}
 }
 
-main reactor ParentParamsAccessToChildInit (n_parents:int = 2, per_parent_n_children:int = 3) {
-    p = new [n_parents] Parent (n_parents = n_parents, n_children = per_parent_n_children);
-}
\ No newline at end of file
+main reactor ParentParamsAccessToChildInit(n_parents: int = 2, per_parent_n_children: int = 3) {
+  p = new[n_parents] Parent(n_parents=n_parents, n_children=per_parent_n_children)
+}